diff --git a/com.discord/apktool.yml b/com.discord/apktool.yml
index f626599b27..5c24e08d02 100644
--- a/com.discord/apktool.yml
+++ b/com.discord/apktool.yml
@@ -1,5 +1,5 @@
 !!brut.androlib.meta.MetaInfo
-apkFileName: com.discord-974.apk
+apkFileName: com.discord-975.apk
 compressionType: false
 doNotCompress:
 - arsc
@@ -181,5 +181,5 @@ usesFramework:
   tag: null
 version: 2.4.1-197d46-SNAPSHOT
 versionInfo:
-  versionCode: '974'
-  versionName: 9.7.4
+  versionCode: '975'
+  versionName: 9.7.5
diff --git a/com.discord/assets/crashlytics-build.properties b/com.discord/assets/crashlytics-build.properties
index 810f43e455..75c89bb8f4 100644
--- a/com.discord/assets/crashlytics-build.properties
+++ b/com.discord/assets/crashlytics-build.properties
@@ -3,9 +3,9 @@
 #
 #Do NOT modify, delete, or commit to source control!
 #
-#Fri Oct 18 23:40:32 UTC 2019
-version_name=9.7.4
+#Wed Oct 23 00:23:09 UTC 2019
+version_name=9.7.5
 package_name=com.discord
-build_id=ba847789-d51c-4ffe-ae92-0a37a0f6bfe3
-version_code=974
+build_id=7da12d57-7e3e-419f-8d90-7c0f18819a5b
+version_code=975
 app_name=com.discord
diff --git a/com.discord/original/AndroidManifest.xml b/com.discord/original/AndroidManifest.xml
index d1053cb22e..28517be269 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 b9275349be..71f06dd5ec 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="#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="#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="#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
deleted file mode 100644
index f1f505718e..0000000000
--- a/com.discord/res/drawable-anydpi-v21/drawable_stream_feedback_face_happy_color.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?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
deleted file mode 100644
index 6c9eb00b71..0000000000
--- a/com.discord/res/drawable-anydpi-v21/drawable_stream_feedback_face_happy_grayscale.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?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
deleted file mode 100644
index 546b2767c3..0000000000
--- a/com.discord/res/drawable-anydpi-v21/drawable_stream_feedback_face_neutral_color.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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
deleted file mode 100644
index ed816a9bd4..0000000000
--- a/com.discord/res/drawable-anydpi-v21/drawable_stream_feedback_face_neutral_grayscale.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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
deleted file mode 100644
index 1c81dcfb6a..0000000000
--- a/com.discord/res/drawable-anydpi-v21/drawable_stream_feedback_face_sad_color.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?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
deleted file mode 100644
index ee055a45cf..0000000000
--- a/com.discord/res/drawable-anydpi-v21/drawable_stream_feedback_face_sad_grayscale.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?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 e4371e08d3..b4ab39c519 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="#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" />
+    <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" />
 </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 a3829b0cd8..6562901407 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="#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" />
+    <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" />
 </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
deleted file mode 100644
index 722d803835..0000000000
--- a/com.discord/res/drawable-anydpi-v21/ic_chevron_down_white_12dp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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 1c719315f9..9db2a59201 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="#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" />
+    <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" />
 </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 cec56a65b3..82478a135c 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="#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" />
+    <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" />
 </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
deleted file mode 100644
index 1fd84d2cba..0000000000
--- a/com.discord/res/drawable-anydpi-v21/ic_warning_icon_24dp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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 a3f92dfe53..9004ecf8a2 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="#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="#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="#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 12d983e5cb..08583dbb4e 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="#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="#fff47fff" android:pathData="M61.714,25.581H47.229C44.314,25.581 42,27.884 42,30.783C42,36.411 37.457,40.93 31.8,40.93H27.086C22.114,40.93 18,45.023 18,49.969V64.806C9.514,64.806 2.571,71.713 2.571,80.155V103.008H61.714V25.581Z" />
     <path android:fillColor="#ffffffff" android:pathData="M21.686,18.845C24.005,18.845 25.886,16.974 25.886,14.667C25.886,12.359 24.005,10.488 21.686,10.488C19.366,10.488 17.486,12.359 17.486,14.667C17.486,16.974 19.366,18.845 21.686,18.845Z" />
     <path android:fillColor="#ff202225" android:pathData="M21.686,16.799C22.869,16.799 23.829,15.844 23.829,14.667C23.829,13.489 22.869,12.535 21.686,12.535C20.502,12.535 19.543,13.489 19.543,14.667C19.543,15.844 20.502,16.799 21.686,16.799Z" />
     <path android:fillColor="#ffffffff" android:pathData="M36.429,18.845C38.748,18.845 40.629,16.974 40.629,14.667C40.629,12.359 38.748,10.488 36.429,10.488C34.109,10.488 32.229,12.359 32.229,14.667C32.229,16.974 34.109,18.845 36.429,18.845Z" />
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 a9ecd97bfc..a7d5161935 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="#ffff73fa" android:pathData="M88.465,42.45V72.682H129.915L141.361,84.095V42.45H88.465Z" />
+    <path android:fillColor="#fff47fff" 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="#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="#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="#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
deleted file mode 100644
index b3941f69b1..0000000000
--- a/com.discord/res/drawable-anydpi-v24/$drawable_stream_ended__0.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?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
deleted file mode 100644
index 98751d1b95..0000000000
--- a/com.discord/res/drawable-anydpi-v24/drawable_stream_ended.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?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_steam.xml b/com.discord/res/drawable-anydpi-v24/ic_steam.xml
deleted file mode 100644
index 2ac7c326d4..0000000000
--- a/com.discord/res/drawable-anydpi-v24/ic_steam.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector android:height="36.0dip" android:width="36.0dip" android:viewportWidth="36.0" android:viewportHeight="36.0"
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#ff1f2a33" android:pathData="M33.9792 17.8c0 8.837-7.163 16-16 16s-16-7.163-16-16 7.163-16 16-16 16 7.163 16 16" android:fillType="evenOdd" />
-    <group android:translateX="1.0" android:translateY="7.6">
-        <path android:fillColor="#ffffffff" android:pathData="M22.2606 9.3224c-1.645 0-2.98-1.334-2.98-2.981 0-1.646 1.335-2.982 2.98-2.982 1.647 0 2.982 1.336 2.982 2.982 0 1.647-1.335 2.981-2.982 2.981m-0.006 0.995 c-2.188 0-3.968-1.781-3.968-3.97 0-2.187 1.78-3.968 3.968-3.968 2.188 0 3.969 1.781 3.969 3.968 0 2.189-1.781 3.97-3.969 3.97m-6.877 7.307c-0.713 1.708-2.679 2.519-4.388 1.808-0.788-0.329-1.383-0.929-1.727-1.645l1.939 0.802 c1.26 0.525 2.706-0.072 3.23-1.33 0.526 -1.259-0.07-2.705-1.33-3.229l-2.004-0.829c0.773-0.293 1.652-0.304 2.474 0.037 0.828 0.344 1.47 0.992 1.811 1.82 0.341 0.828 0.34 1.741-0.005 2.566m-28.318-8.065c-1.287-0.535-2.065-1.785-2.065-3.1 0-0.43 0.083 -0.865 0.259 -1.285 0.71 -1.708 2.678-2.519 4.385-1.808 0.806 0.335 1.406 0.95 1.747 1.684l-1.984-0.82c-1.258-0.524-2.704 0.071 -3.23 1.33-0.524 1.259 0.072 2.707 1.33 3.231l1.991 0.822 c-0.793 0.289 -1.651 0.274 -2.433-0.054m35.195-9.167c-3.285 0-5.957 2.671-5.957 5.955 0 0.027 0 0.053 0.002 0.078l-3.838 5.564c-0.621-0.027-1.245 0.081 -1.836 0.325 -0.261 0.106 -0.505 0.237 -0.735 0.387 l-17.293-7.149c-0.291-1.346-1.212-2.534-2.576-3.104-2.214-0.921-4.764 0.13 -5.687 2.344-0.922 2.212 0.129 4.763 2.342 5.685 1.072 0.447 2.253 0.449 3.328 0.008 0.247-0.103 0.48 -0.229 0.703 -0.369l17.332 7.165c0.299 1.333 1.216 2.504 2.568 3.067 2.214 0.923 4.765-0.129 5.687-2.34 0.239 -0.577 0.351 -1.183 0.334 -1.788l5.491-3.917c0.045 0.001 0.09 0.002 0.135 0.002 3.285 0 5.956-2.673 5.956-5.958 0-3.284-2.671-5.956-5.956-5.956" android:fillType="evenOdd" />
-    </group>
-    <path android:pathData="M33.9792 17.8c0 8.837-7.163 16-16 16s-16-7.163-16-16 7.163-16 16-16 16 7.163 16 16z" android:strokeColor="#ff12181e" android:strokeWidth="1.6" android:strokeLineCap="round" android:strokeLineJoin="round" android:fillType="evenOdd" />
-    <path android:pathData="M0 0h36v36H0z" android:fillType="evenOdd" />
-</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
deleted file mode 100644
index f04b7414b2..0000000000
--- a/com.discord/res/drawable-anydpi-v24/ic_stop_stream_v2.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?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 f1c6c7665d..ff9c9b5de1 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
deleted file mode 100644
index 6ca4a8cd68..0000000000
Binary files a/com.discord/res/drawable-hdpi/drawable_stream_ended.png and /dev/null 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
deleted file mode 100644
index 9c9329d5cb..0000000000
Binary files a/com.discord/res/drawable-hdpi/drawable_stream_feedback_face_happy_color.png and /dev/null 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
deleted file mode 100644
index dbf3147e20..0000000000
Binary files a/com.discord/res/drawable-hdpi/drawable_stream_feedback_face_happy_grayscale.png and /dev/null 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
deleted file mode 100644
index ad39aa44f4..0000000000
Binary files a/com.discord/res/drawable-hdpi/drawable_stream_feedback_face_neutral_color.png and /dev/null 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
deleted file mode 100644
index 08b217e176..0000000000
Binary files a/com.discord/res/drawable-hdpi/drawable_stream_feedback_face_neutral_grayscale.png and /dev/null 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
deleted file mode 100644
index eee03d5547..0000000000
Binary files a/com.discord/res/drawable-hdpi/drawable_stream_feedback_face_sad_color.png and /dev/null 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
deleted file mode 100644
index 27fde5e3b6..0000000000
Binary files a/com.discord/res/drawable-hdpi/drawable_stream_feedback_face_sad_grayscale.png and /dev/null differ
diff --git a/com.discord/res/drawable-hdpi/ic_account_youtube.png b/com.discord/res/drawable-hdpi/ic_account_youtube.png
index fe668842d0..028d5402bb 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 e389e0f2a5..9d0d6189a5 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 9be6dbb0e5..1261217556 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
deleted file mode 100644
index b4eb4fdb71..0000000000
Binary files a/com.discord/res/drawable-hdpi/ic_chevron_down_white_12dp.png and /dev/null 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 189eeb41dd..1243435b0e 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_steam.png b/com.discord/res/drawable-hdpi/ic_steam.png
deleted file mode 100644
index d6ce0edb38..0000000000
Binary files a/com.discord/res/drawable-hdpi/ic_steam.png and /dev/null 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
deleted file mode 100644
index 5d73e634a4..0000000000
Binary files a/com.discord/res/drawable-hdpi/ic_stop_stream_v2.png and /dev/null 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 d15c09e2b5..8b246759af 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
deleted file mode 100644
index 70465d7f55..0000000000
Binary files a/com.discord/res/drawable-hdpi/ic_warning_icon_24dp.png and /dev/null 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 f82ea9aa2b..454f7f59c1 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 0b6588e470..e5a71283c0 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 b338699c5f..33cb7be953 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 06e261d01f..d26691a2bf 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
deleted file mode 100644
index 0035077dd4..0000000000
Binary files a/com.discord/res/drawable-ldpi/drawable_stream_ended.png and /dev/null 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
deleted file mode 100644
index 833ff43823..0000000000
Binary files a/com.discord/res/drawable-ldpi/drawable_stream_feedback_face_happy_color.png and /dev/null 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
deleted file mode 100644
index da46b990a4..0000000000
Binary files a/com.discord/res/drawable-ldpi/drawable_stream_feedback_face_happy_grayscale.png and /dev/null 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
deleted file mode 100644
index fe3c45a570..0000000000
Binary files a/com.discord/res/drawable-ldpi/drawable_stream_feedback_face_neutral_color.png and /dev/null 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
deleted file mode 100644
index 7021643100..0000000000
Binary files a/com.discord/res/drawable-ldpi/drawable_stream_feedback_face_neutral_grayscale.png and /dev/null 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
deleted file mode 100644
index c2a2b114f5..0000000000
Binary files a/com.discord/res/drawable-ldpi/drawable_stream_feedback_face_sad_color.png and /dev/null 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
deleted file mode 100644
index 1ff88a1195..0000000000
Binary files a/com.discord/res/drawable-ldpi/drawable_stream_feedback_face_sad_grayscale.png and /dev/null 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 2326b49fe3..ffd94d061c 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 e389e0f2a5..9d0d6189a5 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
deleted file mode 100644
index dcd0341aa9..0000000000
Binary files a/com.discord/res/drawable-ldpi/ic_chevron_down_white_12dp.png and /dev/null 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 d4ca532a61..9cda8bd3e1 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_steam.png b/com.discord/res/drawable-ldpi/ic_steam.png
deleted file mode 100644
index db0a2371d0..0000000000
Binary files a/com.discord/res/drawable-ldpi/ic_steam.png and /dev/null 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
deleted file mode 100644
index c30d027449..0000000000
Binary files a/com.discord/res/drawable-ldpi/ic_stop_stream_v2.png and /dev/null 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 4d227faa2f..9c105f653b 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
deleted file mode 100644
index aa5ca8c52c..0000000000
Binary files a/com.discord/res/drawable-ldpi/ic_warning_icon_24dp.png and /dev/null 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 1ba3e6afcf..47c66c9197 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 42a7d64218..5a38fccccf 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 82f86420a8..e326af3f5d 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 bf624bad5f..3fb0d16ac1 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
deleted file mode 100644
index b8159e4f24..0000000000
Binary files a/com.discord/res/drawable-mdpi/drawable_stream_ended.png and /dev/null 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
deleted file mode 100644
index e0ea52888a..0000000000
Binary files a/com.discord/res/drawable-mdpi/drawable_stream_feedback_face_happy_color.png and /dev/null 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
deleted file mode 100644
index 87bc290ef2..0000000000
Binary files a/com.discord/res/drawable-mdpi/drawable_stream_feedback_face_happy_grayscale.png and /dev/null 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
deleted file mode 100644
index f8d16091e7..0000000000
Binary files a/com.discord/res/drawable-mdpi/drawable_stream_feedback_face_neutral_color.png and /dev/null 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
deleted file mode 100644
index 376e2cfdf1..0000000000
Binary files a/com.discord/res/drawable-mdpi/drawable_stream_feedback_face_neutral_grayscale.png and /dev/null 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
deleted file mode 100644
index 700a40bbc4..0000000000
Binary files a/com.discord/res/drawable-mdpi/drawable_stream_feedback_face_sad_color.png and /dev/null 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
deleted file mode 100644
index 5492189b7e..0000000000
Binary files a/com.discord/res/drawable-mdpi/drawable_stream_feedback_face_sad_grayscale.png and /dev/null 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 b8fa3bf6a5..a84ec786e3 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 70982538b1..2851120adf 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
deleted file mode 100644
index 2d039c2be8..0000000000
Binary files a/com.discord/res/drawable-mdpi/ic_chevron_down_white_12dp.png and /dev/null 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 001d26db55..889c8d5318 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_steam.png b/com.discord/res/drawable-mdpi/ic_steam.png
deleted file mode 100644
index 687d0ba7fa..0000000000
Binary files a/com.discord/res/drawable-mdpi/ic_steam.png and /dev/null 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
deleted file mode 100644
index 70ed9c2f1b..0000000000
Binary files a/com.discord/res/drawable-mdpi/ic_stop_stream_v2.png and /dev/null 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 64dc3d208f..cabddde490 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
deleted file mode 100644
index f2364f0722..0000000000
Binary files a/com.discord/res/drawable-mdpi/ic_warning_icon_24dp.png and /dev/null 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 8d35d1d388..626226dd42 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 a7660a165d..696466a640 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 6b74b5fd9a..279099be68 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 6c06f24fbe..6888b236fa 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
deleted file mode 100644
index 006a67fc64..0000000000
Binary files a/com.discord/res/drawable-xhdpi/drawable_stream_ended.png and /dev/null 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
deleted file mode 100644
index 83115f23e8..0000000000
Binary files a/com.discord/res/drawable-xhdpi/drawable_stream_feedback_face_happy_color.png and /dev/null 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
deleted file mode 100644
index 584923961b..0000000000
Binary files a/com.discord/res/drawable-xhdpi/drawable_stream_feedback_face_happy_grayscale.png and /dev/null 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
deleted file mode 100644
index 9fcc29a6da..0000000000
Binary files a/com.discord/res/drawable-xhdpi/drawable_stream_feedback_face_neutral_color.png and /dev/null 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
deleted file mode 100644
index ab2fb67e23..0000000000
Binary files a/com.discord/res/drawable-xhdpi/drawable_stream_feedback_face_neutral_grayscale.png and /dev/null 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
deleted file mode 100644
index 0a6c310d4d..0000000000
Binary files a/com.discord/res/drawable-xhdpi/drawable_stream_feedback_face_sad_color.png and /dev/null 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
deleted file mode 100644
index 39529e1425..0000000000
Binary files a/com.discord/res/drawable-xhdpi/drawable_stream_feedback_face_sad_grayscale.png and /dev/null 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 70982538b1..2851120adf 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 8f2981840a..49f5a2e372 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
deleted file mode 100644
index f0eecadaf9..0000000000
Binary files a/com.discord/res/drawable-xhdpi/ic_chevron_down_white_12dp.png and /dev/null 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 749ddebcd6..77c240aa00 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_steam.png b/com.discord/res/drawable-xhdpi/ic_steam.png
deleted file mode 100644
index 700aeeb60f..0000000000
Binary files a/com.discord/res/drawable-xhdpi/ic_steam.png and /dev/null 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
deleted file mode 100644
index deb825eab7..0000000000
Binary files a/com.discord/res/drawable-xhdpi/ic_stop_stream_v2.png and /dev/null 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 82aa4d09fe..e42eaacf23 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
deleted file mode 100644
index dd6896b5e2..0000000000
Binary files a/com.discord/res/drawable-xhdpi/ic_warning_icon_24dp.png and /dev/null 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 a750f20edf..371c6f323a 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 5478a00a62..af39b1a52b 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 3641008d1e..92f1346fbd 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 deca158ae2..b70c5e681d 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
deleted file mode 100644
index 9d0defedde..0000000000
Binary files a/com.discord/res/drawable-xxhdpi/drawable_stream_ended.png and /dev/null 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
deleted file mode 100644
index c4dbbf7dc2..0000000000
Binary files a/com.discord/res/drawable-xxhdpi/drawable_stream_feedback_face_happy_color.png and /dev/null 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
deleted file mode 100644
index 4678a4b7d8..0000000000
Binary files a/com.discord/res/drawable-xxhdpi/drawable_stream_feedback_face_happy_grayscale.png and /dev/null 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
deleted file mode 100644
index 545c2b6ec1..0000000000
Binary files a/com.discord/res/drawable-xxhdpi/drawable_stream_feedback_face_neutral_color.png and /dev/null 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
deleted file mode 100644
index c93be2c6a2..0000000000
Binary files a/com.discord/res/drawable-xxhdpi/drawable_stream_feedback_face_neutral_grayscale.png and /dev/null 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
deleted file mode 100644
index 27acae65ad..0000000000
Binary files a/com.discord/res/drawable-xxhdpi/drawable_stream_feedback_face_sad_color.png and /dev/null 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
deleted file mode 100644
index 9eaf731e7f..0000000000
Binary files a/com.discord/res/drawable-xxhdpi/drawable_stream_feedback_face_sad_grayscale.png and /dev/null 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 9be6dbb0e5..1261217556 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 ba125bff4c..0b5f1896ab 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
deleted file mode 100644
index 00f5a68893..0000000000
Binary files a/com.discord/res/drawable-xxhdpi/ic_chevron_down_white_12dp.png and /dev/null 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 35f140e3ea..3806d30244 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_steam.png b/com.discord/res/drawable-xxhdpi/ic_steam.png
deleted file mode 100644
index 37dc0518dd..0000000000
Binary files a/com.discord/res/drawable-xxhdpi/ic_steam.png and /dev/null 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
deleted file mode 100644
index c805f08944..0000000000
Binary files a/com.discord/res/drawable-xxhdpi/ic_stop_stream_v2.png and /dev/null 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 87e0f90b2e..9de0ba8fde 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
deleted file mode 100644
index e5faf864fe..0000000000
Binary files a/com.discord/res/drawable-xxhdpi/ic_warning_icon_24dp.png and /dev/null 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 1433af01af..daad649a16 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 6f96960f0a..c375738a92 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 59fdbecaa4..22bac4a608 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 17075b0e26..006fbad1e0 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
deleted file mode 100644
index 1f666ee9a3..0000000000
Binary files a/com.discord/res/drawable-xxxhdpi/drawable_stream_ended.png and /dev/null 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
deleted file mode 100644
index 683832bba6..0000000000
Binary files a/com.discord/res/drawable-xxxhdpi/drawable_stream_feedback_face_happy_color.png and /dev/null 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
deleted file mode 100644
index 80e7b84799..0000000000
Binary files a/com.discord/res/drawable-xxxhdpi/drawable_stream_feedback_face_happy_grayscale.png and /dev/null 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
deleted file mode 100644
index 76eb429d41..0000000000
Binary files a/com.discord/res/drawable-xxxhdpi/drawable_stream_feedback_face_neutral_color.png and /dev/null 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
deleted file mode 100644
index fb0ea86192..0000000000
Binary files a/com.discord/res/drawable-xxxhdpi/drawable_stream_feedback_face_neutral_grayscale.png and /dev/null 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
deleted file mode 100644
index 91a79fd3e3..0000000000
Binary files a/com.discord/res/drawable-xxxhdpi/drawable_stream_feedback_face_sad_color.png and /dev/null 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
deleted file mode 100644
index d5f096773d..0000000000
Binary files a/com.discord/res/drawable-xxxhdpi/drawable_stream_feedback_face_sad_grayscale.png and /dev/null 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 8f2981840a..49f5a2e372 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 e328983825..00a485984e 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
deleted file mode 100644
index 5d09fdacb1..0000000000
Binary files a/com.discord/res/drawable-xxxhdpi/ic_chevron_down_white_12dp.png and /dev/null 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 5355ee8e3f..34f9f308ee 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_steam.png b/com.discord/res/drawable-xxxhdpi/ic_steam.png
deleted file mode 100644
index c9dcc9fa1b..0000000000
Binary files a/com.discord/res/drawable-xxxhdpi/ic_steam.png and /dev/null 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
deleted file mode 100644
index 44d8386a25..0000000000
Binary files a/com.discord/res/drawable-xxxhdpi/ic_stop_stream_v2.png and /dev/null 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 113b9e31a3..7d60b11f89 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
deleted file mode 100644
index 6a00669c07..0000000000
Binary files a/com.discord/res/drawable-xxxhdpi/ic_warning_icon_24dp.png and /dev/null 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 3e6ac6751d..b5209e22f9 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 982c661509..d9e0b6caee 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 8bbd85cfbe..9e58e7ed0a 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
deleted file mode 100644
index c73fcaeba7..0000000000
--- a/com.discord/res/drawable/drawable_button_primary_700.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_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
deleted file mode 100644
index 063b1aa835..0000000000
--- a/com.discord/res/drawable/drawable_button_primary_700_neutral.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?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
deleted file mode 100644
index 6071631add..0000000000
--- a/com.discord/res/drawable/drawable_button_primary_700_pressed.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?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/view_video_call_participant.xml b/com.discord/res/layout-v17/view_video_call_participant.xml
index 476a8236c4..3b89ebc48b 100644
--- a/com.discord/res/layout-v17/view_video_call_participant.xml
+++ b/com.discord/res/layout-v17/view_video_call_participant.xml
@@ -5,7 +5,6 @@
         <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
deleted file mode 100644
index e6b87f2bbd..0000000000
--- a/com.discord/res/layout-v17/voice_user_list_item_user.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?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_friends_add.xml b/com.discord/res/layout-v17/widget_friends_add.xml
index b8f17c0c1e..2cd835929e 100644
--- a/com.discord/res/layout-v17/widget_friends_add.xml
+++ b/com.discord/res/layout-v17/widget_friends_add.xml
@@ -2,7 +2,7 @@
 <RelativeLayout style="@style/UiKit.ViewGroup.Page"
   xmlns:android="http://schemas.android.com/apk/res/android">
     <com.google.android.material.appbar.AppBarLayout android:id="@id/action_bar_toolbar_layout" style="@style/AppTheme.AppBarLayout.Flat">
-        <androidx.appcompat.widget.Toolbar android:background="?primary_630" style="@style/AppTheme.Toolbar" />
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme.Toolbar" />
     </com.google.android.material.appbar.AppBarLayout>
     <LinearLayout android:id="@id/friends_add_container" android:layout_below="@id/action_bar_toolbar_layout" style="@style/UiKit.ViewGroup.LinearLayout">
         <TextView android:paddingBottom="@dimen/uikit_spacing_medium" android:text="@string/add_friend_add_manually" style="@style/UiKit.Settings.Item.Header" />
diff --git a/com.discord/res/layout-v17/widget_spectate_report_problem.xml b/com.discord/res/layout-v17/widget_spectate_report_problem.xml
deleted file mode 100644
index 25d102c170..0000000000
--- a/com.discord/res/layout-v17/widget_spectate_report_problem.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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
deleted file mode 100644
index 2a7affa256..0000000000
--- a/com.discord/res/layout-v17/widget_spectate_stream_full.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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
deleted file mode 100644
index 4c2d8b8ddd..0000000000
--- a/com.discord/res/layout-v17/widget_stream_feedback_dialog.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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 d92cfe9004..5800faedff 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: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">
+    <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">
         <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 d63a40a5c8..c07d19d08e 100644
--- a/com.discord/res/layout-v17/widget_user_sheet.xml
+++ b/com.discord/res/layout-v17/widget_user_sheet.xml
@@ -30,18 +30,15 @@
             <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_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_connections_divider" android:visibility="gone" style="@style/UiKit.Divider" />
+        <TextView android:id="@id/user_sheet_connections_header" android:visibility="gone" android:text="@string/connections" style="@style/UiKit.Settings.Item.Header" />
+        <com.discord.widgets.user.profile.UserProfileConnectionsView android:id="@id/user_sheet_connections_view" android:visibility="gone" 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" />
-        <View android:id="@id/user_sheet_developer_divider" android:layout_marginTop="@dimen/uikit_spacing_large" style="@style/UiKit.Divider" />
+        <View android:id="@id/user_sheet_developer_divider" style="@style/UiKit.Divider" />
         <TextView android:id="@id/user_sheet_developer_header" android:text="@string/developer_mode" style="@style/UiKit.Settings.Item.Header" />
         <TextView android:id="@id/user_sheet_copy_id" android:visibility="gone" android:text="@string/copy_id" android:drawableLeft="?ic_copy" android:drawableStart="?ic_copy" style="@style/UiKit.Settings.Item.Icon" />
     </LinearLayout>
diff --git a/com.discord/res/layout-v21/widget_user_sheet.xml b/com.discord/res/layout-v21/widget_user_sheet.xml
index ca57195764..37d4bbbfd7 100644
--- a/com.discord/res/layout-v21/widget_user_sheet.xml
+++ b/com.discord/res/layout-v21/widget_user_sheet.xml
@@ -30,18 +30,15 @@
             <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_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_connections_divider" android:visibility="gone" style="@style/UiKit.Divider" />
+        <TextView android:id="@id/user_sheet_connections_header" android:visibility="gone" android:text="@string/connections" style="@style/UiKit.Settings.Item.Header" />
+        <com.discord.widgets.user.profile.UserProfileConnectionsView android:id="@id/user_sheet_connections_view" android:visibility="gone" 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" />
-        <View android:id="@id/user_sheet_developer_divider" android:layout_marginTop="@dimen/uikit_spacing_large" style="@style/UiKit.Divider" />
+        <View android:id="@id/user_sheet_developer_divider" style="@style/UiKit.Divider" />
         <TextView android:id="@id/user_sheet_developer_header" android:text="@string/developer_mode" style="@style/UiKit.Settings.Item.Header" />
         <TextView android:id="@id/user_sheet_copy_id" android:visibility="gone" android:text="@string/copy_id" android:drawableLeft="?ic_copy" android:drawableStart="?ic_copy" style="@style/UiKit.Settings.Item.Icon" />
     </LinearLayout>
diff --git a/com.discord/res/layout/stream_feedback_spinner_item.xml b/com.discord/res/layout/stream_feedback_spinner_item.xml
deleted file mode 100644
index 8628d2a48f..0000000000
--- a/com.discord/res/layout/stream_feedback_spinner_item.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?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/view_golive_stream.xml b/com.discord/res/layout/view_golive_stream.xml
deleted file mode 100644
index 905e918dbf..0000000000
--- a/com.discord/res/layout/view_golive_stream.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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 68c73b0b0d..4fd7a7ba26 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: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" />
+    <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" />
 </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 27ae17461a..1ccd416894 100644
--- a/com.discord/res/layout/view_video_call_participant.xml
+++ b/com.discord/res/layout/view_video_call_participant.xml
@@ -5,7 +5,6 @@
         <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 3ac2ea8de6..1e25b91458 100644
--- a/com.discord/res/layout/voice_user_list_item_user.xml
+++ b/com.discord/res/layout/voice_user_list_item_user.xml
@@ -3,7 +3,6 @@
   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_friends_add.xml b/com.discord/res/layout/widget_friends_add.xml
index d3164ef92c..33396199c0 100644
--- a/com.discord/res/layout/widget_friends_add.xml
+++ b/com.discord/res/layout/widget_friends_add.xml
@@ -2,7 +2,7 @@
 <RelativeLayout style="@style/UiKit.ViewGroup.Page"
   xmlns:android="http://schemas.android.com/apk/res/android">
     <com.google.android.material.appbar.AppBarLayout android:id="@id/action_bar_toolbar_layout" style="@style/AppTheme.AppBarLayout.Flat">
-        <androidx.appcompat.widget.Toolbar android:background="?primary_630" style="@style/AppTheme.Toolbar" />
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme.Toolbar" />
     </com.google.android.material.appbar.AppBarLayout>
     <LinearLayout android:id="@id/friends_add_container" android:layout_below="@id/action_bar_toolbar_layout" style="@style/UiKit.ViewGroup.LinearLayout">
         <TextView android:paddingBottom="@dimen/uikit_spacing_medium" android:text="@string/add_friend_add_manually" style="@style/UiKit.Settings.Item.Header" />
diff --git a/com.discord/res/layout/widget_server_boost_confirmation.xml b/com.discord/res/layout/widget_server_boost_confirmation.xml
index 983368f0f7..cc60e81332 100644
--- a/com.discord/res/layout/widget_server_boost_confirmation.xml
+++ b/com.discord/res/layout/widget_server_boost_confirmation.xml
@@ -20,6 +20,7 @@
                             </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
deleted file mode 100644
index a975b2ac06..0000000000
--- a/com.discord/res/layout/widget_spectate.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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
deleted file mode 100644
index 38bc786853..0000000000
--- a/com.discord/res/layout/widget_spectate_controls.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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
deleted file mode 100644
index c050d0a3e4..0000000000
--- a/com.discord/res/layout/widget_spectate_report_problem.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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
deleted file mode 100644
index 51c3e558a3..0000000000
--- a/com.discord/res/layout/widget_spectate_stream_full.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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
deleted file mode 100644
index 96669a226f..0000000000
--- a/com.discord/res/layout/widget_spectators.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?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
deleted file mode 100644
index 26f2c71fa4..0000000000
--- a/com.discord/res/layout/widget_stream_feedback_dialog.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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 ffb62276d8..df08f14bee 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: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">
+    <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">
         <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_info.xml b/com.discord/res/layout/widget_user_info.xml
deleted file mode 100644
index ccadc4bc72..0000000000
--- a/com.discord/res/layout/widget_user_info.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.ScrollView.Page"
-  xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <LinearLayout android:paddingBottom="@dimen/uikit_spacing_xxlarge" android:focusableInTouchMode="true" style="@style/UiKit.ViewGroup.LinearLayout">
-        <FrameLayout android:id="@id/user_info_rich_presence_container" android:visibility="gone" style="@style/UiKit.ViewGroup" />
-        <View android:id="@id/user_info_activity_divider" android:visibility="gone" android:layout_marginTop="@dimen/uikit_spacing_large" style="@style/UiKit.Settings.Divider" />
-        <TextView 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" app:counterEnabled="true" app:counterMaxLength="256" style="@style/UiKit.Form.Field.EditText.Wrap">
-            <EditText android:id="@id/user_info_notes" 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_info_identities_divider" style="@style/UiKit.Settings.Divider" />
-        <TextView android:id="@id/user_info_identities_header" android:text="@string/connected_accounts" style="@style/UiKit.Settings.Item.Header" />
-        <androidx.recyclerview.widget.RecyclerView android:id="@id/platform_identities_list" android:paddingBottom="@dimen/uikit_spacing_xxlarge" style="@style/UiKit.ViewGroup.RecyclerView" />
-    </LinearLayout>
-</androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_user_info_adapter_item_connected_account.xml b/com.discord/res/layout/widget_user_info_adapter_item_connected_account.xml
deleted file mode 100644
index dca772f93e..0000000000
--- a/com.discord/res/layout/widget_user_info_adapter_item_connected_account.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout android:background="?selectableItemBackground" android:padding="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.ConstraintLayout"
-  xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <ImageView android:layout_gravity="center_vertical" android:id="@id/connected_account_img" android:layout_width="@dimen/connected_account_img_size" android:layout_height="@dimen/connected_account_img_size" android:contentDescription="@string/sample_empty_string" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.ImageView" />
-    <TextView android:id="@id/connected_account_name" android:layout_width="0.0dip" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:singleLine="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toRightOf="@id/connected_account_img" app:layout_constraintRight_toLeftOf="@id/connected_account_link_img" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.TextView.Large" />
-    <ImageView android:id="@id/connected_account_link_img" android:src="?ic_open_in_new_24dp" android:contentDescription="@string/open_link" android:alpha="0.6" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.ImageView" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_user_mutual_friends.xml b/com.discord/res/layout/widget_user_mutual_friends.xml
index d6a65751b1..d803a6fc06 100644
--- a/com.discord/res/layout/widget_user_mutual_friends.xml
+++ b/com.discord/res/layout/widget_user_mutual_friends.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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">
+    <com.google.android.material.appbar.AppBarLayout 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" />
diff --git a/com.discord/res/layout/widget_user_mutual_guilds.xml b/com.discord/res/layout/widget_user_mutual_guilds.xml
index a3d64f8d33..66adac98cd 100644
--- a/com.discord/res/layout/widget_user_mutual_guilds.xml
+++ b/com.discord/res/layout/widget_user_mutual_guilds.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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">
+    <com.google.android.material.appbar.AppBarLayout 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" />
diff --git a/com.discord/res/layout/widget_user_profile.xml b/com.discord/res/layout/widget_user_profile.xml
deleted file mode 100644
index 82747ba295..0000000000
--- a/com.discord/res/layout/widget_user_profile.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout style="@style/UiKit.ViewGroup.Page"
-  xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <com.google.android.material.appbar.AppBarLayout android:background="?primary_630" style="@style/AppTheme.AppBarLayout">
-        <com.google.android.material.appbar.CollapsingToolbarLayout style="@style/AppTheme.CollapsingToolbarLayout">
-            <LinearLayout android:gravity="center" android:paddingBottom="@dimen/uikit_spacing_small" android:layout_marginTop="?actionBarSize" app:layout_collapseMode="parallax" style="@style/UiKit.ViewGroup.LinearLayout">
-                <com.discord.widgets.user.profile.UserProfileHeaderView android:id="@id/user_profile_header_view" android:layout_width="fill_parent" android:layout_height="wrap_content" app:user_profile_header_background_color="?primary_630" />
-                <LinearLayout android:id="@id/user_profile_friend_request_incoming_container" android:visibility="gone" android:layout_width="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
-                    <Button android:id="@id/user_profile_friend_request_ignore_btn" android:text="@string/friend_request_ignore" style="@style/UiKit.Button.Grey.Fit" />
-                    <Button android:id="@id/user_profile_friend_request_accept_btn" android:text="@string/friend_request_accept" style="@style/UiKit.Button.Green.Fit" />
-                </LinearLayout>
-                <Button android:id="@id/user_profile_friend_request" android:visibility="gone" android:layout_marginBottom="@dimen/uikit_spacing_large" android:minWidth="152.0dip" android:text="@string/add_friend" style="@style/UiKit.Button.Green.Fit" />
-                <Button android:id="@id/user_profile_friend_request_sent_btn" android:visibility="gone" android:layout_marginBottom="@dimen/uikit_spacing_large" android:minWidth="152.0dip" android:text="@string/add_friend_button_after" style="@style/UiKit.Button.Green.Fit.Outline" />
-            </LinearLayout>
-            <androidx.appcompat.widget.Toolbar android:background="?primary_630" style="@style/AppTheme.Toolbar" />
-        </com.google.android.material.appbar.CollapsingToolbarLayout>
-        <com.google.android.material.tabs.TabLayout android:id="@id/action_bar_tabs" style="@style/UiKit.Tabs" />
-    </com.google.android.material.appbar.AppBarLayout>
-    <com.discord.utilities.simple_pager.SimplePager android:id="@id/user_profile_view_pager" style="@style/AppTheme.AppBarScrollingViewBehavior" />
-    <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@id/user_profile_send_message_fab" android:src="@drawable/ic_chat_bubble_white_24dp" style="@style/Settings.FloatingActionButton" />
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_user_sheet.xml b/com.discord/res/layout/widget_user_sheet.xml
index c5dd7da5f3..4c05c1b834 100644
--- a/com.discord/res/layout/widget_user_sheet.xml
+++ b/com.discord/res/layout/widget_user_sheet.xml
@@ -30,18 +30,15 @@
             <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_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_connections_divider" android:visibility="gone" style="@style/UiKit.Divider" />
+        <TextView android:id="@id/user_sheet_connections_header" android:visibility="gone" android:text="@string/connections" style="@style/UiKit.Settings.Item.Header" />
+        <com.discord.widgets.user.profile.UserProfileConnectionsView android:id="@id/user_sheet_connections_view" android:visibility="gone" 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" />
-        <View android:id="@id/user_sheet_developer_divider" android:layout_marginTop="@dimen/uikit_spacing_large" style="@style/UiKit.Divider" />
+        <View android:id="@id/user_sheet_developer_divider" style="@style/UiKit.Divider" />
         <TextView android:id="@id/user_sheet_developer_header" android:text="@string/developer_mode" style="@style/UiKit.Settings.Item.Header" />
         <TextView android:id="@id/user_sheet_copy_id" android:visibility="gone" android:text="@string/copy_id" android:drawableLeft="?ic_copy" android:drawableStart="?ic_copy" style="@style/UiKit.Settings.Item.Icon" />
     </LinearLayout>
diff --git a/com.discord/res/menu/menu_spectate.xml b/com.discord/res/menu/menu_spectate.xml
deleted file mode 100644
index a2159216f2..0000000000
--- a/com.discord/res/menu/menu_spectate.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?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/menu/menu_user_profile.xml b/com.discord/res/menu/menu_user_profile.xml
deleted file mode 100644
index 3290de15dd..0000000000
--- a/com.discord/res/menu/menu_user_profile.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?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:id="@id/menu_user_profile_message" android:orderInCategory="1" android:title="@string/send_message" app:showAsAction="never" />
-    <item android:id="@id/menu_user_profile_block" android:orderInCategory="3" android:title="@string/block" app:showAsAction="never" />
-</menu>
\ No newline at end of file
diff --git a/com.discord/res/menu/menu_user_profile_blocked.xml b/com.discord/res/menu/menu_user_profile_blocked.xml
deleted file mode 100644
index dbe7764f31..0000000000
--- a/com.discord/res/menu/menu_user_profile_blocked.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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:id="@id/menu_user_profile_unblock" android:orderInCategory="1" android:title="@string/unblock" app:showAsAction="never" />
-</menu>
\ No newline at end of file
diff --git a/com.discord/res/menu/menu_user_profile_friended.xml b/com.discord/res/menu/menu_user_profile_friended.xml
deleted file mode 100644
index ee3a696d51..0000000000
--- a/com.discord/res/menu/menu_user_profile_friended.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?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:id="@id/menu_user_profile_message" android:orderInCategory="1" android:title="@string/send_message" app:showAsAction="never" />
-    <item android:id="@id/menu_user_profile_remove_friend" android:orderInCategory="2" android:title="@string/remove_friend" app:showAsAction="never" />
-</menu>
\ No newline at end of file
diff --git a/com.discord/res/menu/menu_user_profile_incoming.xml b/com.discord/res/menu/menu_user_profile_incoming.xml
deleted file mode 100644
index 1c2b83a6f2..0000000000
--- a/com.discord/res/menu/menu_user_profile_incoming.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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:id="@id/menu_user_profile_message" android:orderInCategory="1" android:title="@string/send_message" app:showAsAction="never" />
-    <item android:id="@id/menu_user_profile_ignore" android:orderInCategory="2" android:title="@string/friend_request_ignore" app:showAsAction="never" />
-    <item android:id="@id/menu_user_profile_block" android:orderInCategory="3" android:title="@string/block" app:showAsAction="never" />
-</menu>
\ No newline at end of file
diff --git a/com.discord/res/menu/menu_user_profile_outgoing.xml b/com.discord/res/menu/menu_user_profile_outgoing.xml
deleted file mode 100644
index 00d1cf5bde..0000000000
--- a/com.discord/res/menu/menu_user_profile_outgoing.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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:id="@id/menu_user_profile_message" android:orderInCategory="1" android:title="@string/send_message" app:showAsAction="never" />
-    <item android:id="@id/menu_user_profile_cancel" android:orderInCategory="2" android:title="@string/cancel" app:showAsAction="never" />
-    <item android:id="@id/menu_user_profile_block" android:orderInCategory="3" android:title="@string/block" app:showAsAction="never" />
-</menu>
\ No newline at end of file
diff --git a/com.discord/res/values-bg/plurals.xml b/com.discord/res/values-bg/plurals.xml
index 220a401089..ecd684a66f 100644
--- a/com.discord/res/values-bg/plurals.xml
+++ b/com.discord/res/values-bg/plurals.xml
@@ -302,6 +302,14 @@
         <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>
@@ -531,6 +539,10 @@
         <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>
@@ -543,11 +555,15 @@
         <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_mobile_months">
+    <plurals name="premium_guild_subscription_duration_months">
         <item quantity="other">%d месеца</item>
         <item quantity="one">%d месец</item>
     </plurals>
@@ -571,6 +587,10 @@
         <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 eb5395a531..e315ebd065 100644
--- a/com.discord/res/values-bg/strings.xml
+++ b/com.discord/res/values-bg/strings.xml
@@ -638,6 +638,7 @@
     <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>
@@ -694,6 +695,8 @@
     <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,11 +714,13 @@
     <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>
@@ -737,10 +742,6 @@
     <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>
@@ -1790,8 +1791,11 @@ 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>
@@ -2144,7 +2148,9 @@ 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>
@@ -2161,12 +2167,16 @@ 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">Статус на усилване на сървър</string>
+    <string name="guild_settings_premium_guild_title">Статус на усилване на Nitro сървър</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>
@@ -2176,7 +2186,6 @@ 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>
@@ -2840,6 +2849,7 @@ 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>
@@ -2962,6 +2972,7 @@ 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>
@@ -3194,7 +3205,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">Купи подарък</string>
+    <string name="payment_modal_button_premium_gift">Купи %1$s</string>
     <string name="payment_modal_one_month">1 месец</string>
     <string name="payment_modal_one_year">1 година</string>
     <string name="payment_modal_per_month">На месец</string>
@@ -3305,6 +3316,9 @@ 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>
@@ -3327,6 +3341,7 @@ 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>
@@ -3365,20 +3380,41 @@ 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>
@@ -3391,32 +3427,44 @@ 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_mobile">%1$s</string>
+    <string name="premium_guild_subscription_duration">%1$s</string>
     <string name="premium_guild_subscription_error_mobile">Появи се грешка при опит за усилване. Моля те, опитай пак.</string>
     <string name="premium_guild_subscription_error_rate_limit_days">Изглежда, че си на изчакване. Моля, изчакай **%1$s и %2$s**, преди да опиташ пак</string>
     <string name="premium_guild_subscription_error_rate_limit_hours">Изглежда, че си на изчакване. Моля, изчакай **%1$s и %2$s**, преди да опиташ пак</string>
     <string name="premium_guild_subscription_error_rate_limit_minutes">Изглежда, че си на изчакване. Моля, изчакай **%1$s**, преди да опиташ пак</string>
     <string name="premium_guild_subscription_no_next_tier">Този сървър е напълно зареден! Продължавай да усилващ!</string>
+    <string name="premium_guild_subscription_notice">Усилванията на сървър с Nitro са тук! Събери общността си, за да усилиш своя сървър.</string>
     <string name="premium_guild_subscription_notice_button">Виж нива и бонуси</string>
+    <string name="premium_guild_subscription_notice_small_guild">Усилванията на сървър с Nitro са тук! Събери приятелите си, за да усилиш своя сървър.</string>
     <string name="premium_guild_subscription_remove_button">Премахни усилване</string>
     <string name="premium_guild_subscription_remove_error_mobile">Появи се грешка при опит за премахване на усилването. Моля те, опитай пак.</string>
     <string name="premium_guild_subscription_select_server_button">Избери сървър</string>
-    <string name="premium_guild_tier_0">Няма ниво</string>
+    <string name="premium_guild_subscription_subscriber_count_tooltip">%1$s</string>
+    <string name="premium_guild_subscription_subtitle">"Използвай твоите Nitro сили, за да усили сървъра, към който се присъедини! Усилването на сървъра го кара да напредва към по-горни нива. Всяко ниво дава колективни бонуси за целия сървър.
+ Усилването на сървър активира 7-дневно изчакване. Не можеш да усилиш друг сървър, докато не изтече това изчакване дори и да си премахнеш усилването. [Научи повече за усилване на сървъри с Nitro.](%1$s)"</string>
+    <string name="premium_guild_subscription_subtitle_mobile_1">Използвай твоите Nitro сили, за да усили сървъра, към който се присъедини! Усилването на сървъра го кара да напредва към по-горни нива. Всяко ниво дава колективни бонуси за целия сървър.</string>
+    <string name="premium_guild_subscription_subtitle_mobile_2">Усилването на сървър активира 7-дневно изчакване. Не можеш да усилиш друг сървър, докато не изтече това изчакване дори и да си премахнеш усилването. [Научи повече за усилване на сървъри с Nitro.](%1$s)</string>
+    <string name="premium_guild_subscription_title">Усилване на сървър с Nitro</string>
+    <string name="premium_guild_subscription_tooltip">Nitro усилване от %1$s</string>
     <string name="premium_guild_tier_1">Ниво 1</string>
     <string name="premium_guild_tier_2">Ниво 2</string>
     <string name="premium_guild_tier_3">Ниво 3</string>
+    <string name="premium_guild_unsubscribe_confirm_blurb">Наистина ли искаш да премахнеш Nitro усилването от:</string>
     <string name="premium_guild_unsubscribe_confirm_confirmation">Да, премахни усилване</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning">Този сървър ще изгуби напредъка си, ако премахнеш твоето усилване.</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning_days">Този сървър ще изгуби напредъка си, ако премахнеш твоето усилване. **Твоето усилване все още е на изчакване. То ще бъде достъпно след %1$s и %2$s.**</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning_hours">Този сървър ще изгуби напредъка си, ако премахнеш твоето усилване. **Твоето усилване все още е на изчакване. Той ще бъде достъпен след %1$s и %2$s.**</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning_minutes">Този сървър ще изгуби напредъка си, ако премахнеш твоето усилване. **Твоето усилване все още е на изчакване. Той ще бъде достъпен след %1$s.**</string>
+    <string name="premium_guild_unsubscribe_confirm_header">Премахни Nitro усилване?</string>
     <string name="premium_included">Включени в Nitro:</string>
     <string name="premium_info_monthly">%1$s (месечно) настъпва на %2$s.</string>
     <string name="premium_month_subscription">**%1$s%2$s %3$s** / месец</string>
@@ -3429,6 +3477,7 @@ 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>
@@ -3443,6 +3492,7 @@ 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>
@@ -3461,10 +3511,26 @@ 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>
@@ -4024,6 +4090,8 @@ 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 348f877679..91a5929515 100644
--- a/com.discord/res/values-cs/plurals.xml
+++ b/com.discord/res/values-cs/plurals.xml
@@ -342,6 +342,16 @@
         <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>
@@ -602,6 +612,10 @@
         <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>
@@ -616,11 +630,16 @@
         <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_mobile_months">
+    <plurals name="premium_guild_subscription_duration_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>
@@ -645,6 +664,10 @@
         <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 4eea266b05..3d08d51d1c 100644
--- a/com.discord/res/values-cs/strings.xml
+++ b/com.discord/res/values-cs/strings.xml
@@ -618,6 +618,7 @@ 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>
@@ -674,6 +675,8 @@ 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>
@@ -691,11 +694,13 @@ 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>
@@ -717,10 +722,6 @@ 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>
@@ -1768,8 +1769,11 @@ 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>
@@ -2120,7 +2124,9 @@ 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>
@@ -2137,12 +2143,16 @@ 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</string>
+    <string name="guild_settings_premium_guild_title">Stav vylepšení serveru Nitrem</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>
@@ -2152,7 +2162,6 @@ Ztraceno: %2$s"</string>
 
 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>
@@ -2814,6 +2823,7 @@ 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>
@@ -2937,6 +2947,7 @@ 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>
@@ -3167,7 +3178,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 dárek</string>
+    <string name="payment_modal_button_premium_gift">Koupit %1$s</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>
@@ -3278,6 +3289,9 @@ 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>
@@ -3300,6 +3314,7 @@ 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>
@@ -3338,20 +3353,41 @@ 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>
@@ -3364,32 +3400,44 @@ 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_mobile">%1$s</string>
+    <string name="premium_guild_subscription_duration">%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_tier_0">Žádná úroveň</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_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>
@@ -3401,6 +3449,7 @@ Své předplatné můžeš kdykoliv obnovit."</string>
     <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>
@@ -3415,6 +3464,7 @@ Své předplatné můžeš kdykoliv obnovit."</string>
     <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>
@@ -3433,10 +3483,26 @@ Své předplatné můžeš kdykoliv obnovit."</string>
     <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>
@@ -3986,6 +4052,8 @@ 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 2887b1889e..07db959c6c 100644
--- a/com.discord/res/values-da/plurals.xml
+++ b/com.discord/res/values-da/plurals.xml
@@ -291,6 +291,14 @@
         <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>
@@ -520,6 +528,10 @@
         <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>
@@ -532,11 +544,15 @@
         <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_mobile_months">
+    <plurals name="premium_guild_subscription_duration_months">
         <item quantity="other">%d måneder</item>
         <item quantity="one">%d Måned</item>
     </plurals>
@@ -560,6 +576,10 @@
         <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 4a0eb1c6de..8f2da6b379 100644
--- a/com.discord/res/values-da/strings.xml
+++ b/com.discord/res/values-da/strings.xml
@@ -614,6 +614,7 @@ 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>
@@ -671,6 +672,8 @@ 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>
@@ -688,11 +691,13 @@ 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>
@@ -714,10 +719,6 @@ 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>
@@ -1759,8 +1760,11 @@ 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>
@@ -2112,7 +2116,9 @@ 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>
@@ -2129,12 +2135,16 @@ 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">Serverboost status</string>
+    <string name="guild_settings_premium_guild_title">Nitro 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>
@@ -2144,7 +2154,6 @@ Tabt: %2$s"</string>
 
 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>
@@ -2801,6 +2810,7 @@ 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>
@@ -2924,6 +2934,7 @@ 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>
@@ -3153,7 +3164,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 gave</string>
+    <string name="payment_modal_button_premium_gift">Køb %1$s</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>
@@ -3263,6 +3274,9 @@ 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>
@@ -3285,6 +3299,7 @@ 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>
@@ -3323,20 +3338,41 @@ 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>
@@ -3349,32 +3385,44 @@ 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_mobile">%1$s</string>
+    <string name="premium_guild_subscription_duration">%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_tier_0">Ingen niveau</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_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>
@@ -3387,6 +3435,7 @@ 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>
@@ -3401,6 +3450,7 @@ 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>
@@ -3419,10 +3469,26 @@ 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>
@@ -3964,6 +4030,8 @@ 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 5ef5b6ffad..759dcef103 100644
--- a/com.discord/res/values-de/plurals.xml
+++ b/com.discord/res/values-de/plurals.xml
@@ -302,6 +302,14 @@
         <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>
@@ -531,6 +539,10 @@
         <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>
@@ -539,11 +551,15 @@
         <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_mobile_months">
+    <plurals name="premium_guild_subscription_duration_months">
         <item quantity="other">%d Monate</item>
         <item quantity="one">%d Monat</item>
     </plurals>
@@ -567,6 +583,10 @@
         <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 6251946b1c..cb1ce43952 100644
--- a/com.discord/res/values-de/strings.xml
+++ b/com.discord/res/values-de/strings.xml
@@ -600,6 +600,7 @@ 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>
@@ -658,6 +659,8 @@ 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>
@@ -675,11 +678,13 @@ 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>
@@ -701,10 +706,6 @@ 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>
@@ -1756,8 +1757,11 @@ 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>
@@ -2107,7 +2111,9 @@ 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>
@@ -2124,12 +2130,16 @@ 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">Server-Boost-Status</string>
+    <string name="guild_settings_premium_guild_title">Boost-Status des Nitro-Servers</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>
@@ -2139,7 +2149,6 @@ Verloren: %2$s"</string>
 
 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>
@@ -2793,6 +2802,7 @@ 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>
@@ -2915,6 +2925,7 @@ 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>
@@ -3144,7 +3155,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">Geschenk kaufen</string>
+    <string name="payment_modal_button_premium_gift">%1$s 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>
@@ -3257,6 +3268,9 @@ 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>
@@ -3279,6 +3293,7 @@ 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>
@@ -3317,20 +3332,41 @@ 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>
@@ -3342,32 +3378,44 @@ 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_mobile">%1$s</string>
+    <string name="premium_guild_subscription_duration">%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_tier_0">Kein Level</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_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>
@@ -3380,6 +3428,7 @@ Du kannst jederzeit wieder ein Abonnement abschließen."</string>
     <string name="premium_payment_confirmation_blurb_regular">Dir wurde nun die Macht der erweiterten Chat-Zusatzfunktionen verliehen. Also worauf wartest du noch? Die Chats erwarten dich!</string>
     <string name="premium_payment_confirmation_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>
@@ -3394,6 +3443,7 @@ Du kannst jederzeit wieder ein Abonnement abschließen."</string>
     <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>
@@ -3412,10 +3462,26 @@ Du kannst jederzeit wieder ein Abonnement abschließen."</string>
     <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>
@@ -3970,6 +4036,8 @@ 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 93e3b6613d..d1d004ddb0 100644
--- a/com.discord/res/values-el/plurals.xml
+++ b/com.discord/res/values-el/plurals.xml
@@ -302,6 +302,14 @@
         <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>
@@ -531,6 +539,10 @@
         <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>
@@ -543,11 +555,15 @@
         <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_mobile_months">
+    <plurals name="premium_guild_subscription_duration_months">
         <item quantity="other">%d Μήνες</item>
         <item quantity="one">%d Μήνας</item>
     </plurals>
@@ -571,6 +587,10 @@
         <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 26bd555a03..7a699cd4dc 100644
--- a/com.discord/res/values-el/strings.xml
+++ b/com.discord/res/values-el/strings.xml
@@ -633,6 +633,7 @@
     <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,6 +692,8 @@
     <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>
@@ -708,11 +711,13 @@
     <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>
@@ -734,10 +739,6 @@
     <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>
@@ -1785,8 +1786,11 @@ 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>
@@ -2139,7 +2143,9 @@ 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>
@@ -2156,12 +2162,16 @@ 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">Κατάσταση ενίσχυσης διακομιστή</string>
+    <string name="guild_settings_premium_guild_title">Κατάσταση Nitro ενίσχυσης διακομιστή</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>
@@ -2171,7 +2181,6 @@ 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>
@@ -2832,6 +2841,7 @@ 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>
@@ -2955,6 +2965,7 @@ 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>
@@ -3187,7 +3198,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">Αγορά δώρου</string>
+    <string name="payment_modal_button_premium_gift">Αγορά %1$s</string>
     <string name="payment_modal_one_month">1 μήνας</string>
     <string name="payment_modal_one_year">1 χρόνος</string>
     <string name="payment_modal_per_month">Το μήνα</string>
@@ -3298,6 +3309,9 @@ 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>
@@ -3320,6 +3334,7 @@ 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>
@@ -3358,20 +3373,41 @@ 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>
@@ -3384,32 +3420,44 @@ 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_mobile">%1$s</string>
+    <string name="premium_guild_subscription_duration">%1$s</string>
     <string name="premium_guild_subscription_error_mobile">Υπήρξε ένα πρόβλημα κατά την προσπάθειά σας να ενισχύσετε. Παρακαλούμε προσπαθήστε ξανά.</string>
     <string name="premium_guild_subscription_error_rate_limit_days">Φαίνεται πως δεν έχει τελειώσει ακόμα η αντίστροφη μέτρηση. Παρακαλώ περιμένετε **%1$s και %2$s** πριν προσπαθήσετε ξανά</string>
     <string name="premium_guild_subscription_error_rate_limit_hours">Φαίνεται πως δεν έχει τελειώσει ακόμα η αντίστροφη μέτρηση. Παρακαλώ περιμένετε **%1$s και %2$s** πριν προσπαθήσετε ξανά</string>
     <string name="premium_guild_subscription_error_rate_limit_minutes">Φαίνεται πως δεν έχει τελειώσει ακόμα η αντίστροφη μέτρηση. Παρακαλώ περιμένετε **%1$s** πριν προσπαθήσετε ξανά</string>
     <string name="premium_guild_subscription_no_next_tier">Αυτός ο διακομιστής είναι πλήρως ενισχυμένος! Συνεχίστε να ενισχύετε!</string>
+    <string name="premium_guild_subscription_notice">Οι Nitro Ενισχύσεις Διακομιστή είναι εδώ! Μαζέψτε την κοινότητά σας για να ενισχύσει τον διακομιστή σας.</string>
     <string name="premium_guild_subscription_notice_button">Δείτε τα Επίπεδα &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_tier_0">Κανένα Επίπεδο</string>
+    <string name="premium_guild_subscription_subscriber_count_tooltip">%1$s</string>
+    <string name="premium_guild_subscription_subtitle">"Χρησιμοποιείστε τις Nitro δυνάμεις σας για να ενισχύσετε έναν διακομιστή που μόλις γίνατε μέλος! Η ενίσχυση ενός διακομιστή του επιτρέπει να ανέβει επίπεδα. Κάθε επίπεδο προσφέρει συλλογικά προνόμια για ολόκληρο τον διακομιστή.
+ Η ενίσχυση ενός διακομιστή ενεργοποιεί μια αντίστροφη μέτρηση διάρκειας 7 ημερών. Δεν μπορείτε να ενισχύσετε έναν άλλο διακομιστή μέχρι να τελειώσει αυτή η αντίστροφη μέτρηση, ακόμα και αν αφαιρέσετε την ενίσχυσή σας. [Μάθετε περισσότερα για τη Nitro Ενίσχυση Διακομιστή.](%1$s)"</string>
+    <string name="premium_guild_subscription_subtitle_mobile_1">Χρησιμοποιείστε τις Nitro δυνάμεις σας για να ενισχύσετε έναν διακομιστή που μόλις γίνατε μέλος! Η ενίσχυση ενός διακομιστή του επιτρέπει να ανέβει επίπεδα. Κάθε επίπεδο προσφέρει συλλογικά προνόμια για ολόκληρο τον διακομιστή.</string>
+    <string name="premium_guild_subscription_subtitle_mobile_2">Η ενίσχυση ενός διακομιστή ενεργοποιεί μια αντίστροφη μέτρηση διάρκειας 7 ημερών. Δεν μπορείτε να ενισχύσετε έναν άλλο διακομιστή μέχρι να τελειώσει αυτή η αντίστροφη μέτρηση, ακόμα και αν αφαιρέσετε την ενίσχυσή σας. [Μάθετε περισσότερα για τη Nitro Ενίσχυση Διακομιστή.](%1$s)</string>
+    <string name="premium_guild_subscription_title">Nitro Ενίσχυση Διακομιστή</string>
+    <string name="premium_guild_subscription_tooltip">Nitro ενίσχυση από %1$s</string>
     <string name="premium_guild_tier_1">Επίπεδο 1</string>
     <string name="premium_guild_tier_2">Επίπεδο 2</string>
     <string name="premium_guild_tier_3">Επίπεδο 3</string>
+    <string name="premium_guild_unsubscribe_confirm_blurb">Είστε σίγουροι ότι θέλετε να αφαιρέσετε τη Nitro Ενίσχυσή σας από τον/την:</string>
     <string name="premium_guild_unsubscribe_confirm_confirmation">Ναι, Αφαίρεση Ενίσχυσης</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning">Αυτός ο διακομιστής θα χάσει την πρόοδό του εάν αφαιρέσετε την ενίσχυσή σας.</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning_days">Αυτός ο διακομιστής θα χάσει την πρόοδό του εάν αφαιρέσετε την ενίσχυσή σας. **Η ενίσχυσή σας είναι ακόμα σε αντίστροφη μέτρηση. Θα είναι διαθέσιμη σε %1$s και %2$s.**</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning_hours">Αυτός ο διακομιστής θα χάσει την πρόοδό του εάν αφαιρέσετε την ενίσχυσή σας. **Η ενίσχυσή σας είναι ακόμα σε αντίστροφη μέτρηση. Θα είναι διαθέσιμη σε %1$s και %2$s.**</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning_minutes">Αυτός ο διακομιστής θα χάσει την πρόοδό του εάν αφαιρέσετε την ενίσχυσή σας. **Η ενίσχυσή σας είναι ακόμα σε αντίστροφη μέτρηση. Θα είναι διαθέσιμη σε %1$s.**</string>
+    <string name="premium_guild_unsubscribe_confirm_header">Αφαίρεση της Nitro Ενίσχυσης;</string>
     <string name="premium_included">Περιλαμβάνονται στο Nitro:</string>
     <string name="premium_info_monthly">%1$s (μηνιαία) συμβαίνει στις %2$s.</string>
     <string name="premium_month_subscription">**%1$s%2$s %3$s** / μήνα</string>
@@ -3422,6 +3470,7 @@ 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>
@@ -3436,6 +3485,7 @@ 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>
@@ -3454,10 +3504,26 @@ 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>
@@ -4019,6 +4085,8 @@ 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 a7b1354e5a..6211791e13 100644
--- a/com.discord/res/values-es-rES/plurals.xml
+++ b/com.discord/res/values-es-rES/plurals.xml
@@ -302,6 +302,14 @@
         <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>
@@ -531,6 +539,10 @@
         <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>
@@ -543,11 +555,15 @@
         <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_mobile_months">
+    <plurals name="premium_guild_subscription_duration_months">
         <item quantity="other">%d meses</item>
         <item quantity="one">%d mes</item>
     </plurals>
@@ -571,6 +587,10 @@
         <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 6550f7a29b..a1176a6166 100644
--- a/com.discord/res/values-es-rES/strings.xml
+++ b/com.discord/res/values-es-rES/strings.xml
@@ -593,6 +593,7 @@ 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>
@@ -650,6 +651,8 @@ 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>
@@ -667,11 +670,13 @@ 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>
@@ -693,10 +698,6 @@ 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>
@@ -1736,8 +1737,11 @@ 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>
@@ -2090,7 +2094,9 @@ 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>
@@ -2107,12 +2113,16 @@ 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</string>
+    <string name="guild_settings_premium_guild_title">Estado de mejora del servidor de Nitro</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>
@@ -2122,7 +2132,6 @@ Perdidos: %2$s"</string>
 
 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>
@@ -2788,6 +2797,7 @@ 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>
@@ -2910,6 +2920,7 @@ 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>
@@ -3141,7 +3152,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 regalo</string>
+    <string name="payment_modal_button_premium_gift">Comprar %1$s</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>
@@ -3252,6 +3263,9 @@ 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>
@@ -3274,6 +3288,7 @@ 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>
@@ -3312,20 +3327,41 @@ 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>
@@ -3338,32 +3374,44 @@ 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_mobile">%1$s</string>
+    <string name="premium_guild_subscription_duration">%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_tier_0">Sin nivel</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_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>
@@ -3376,6 +3424,7 @@ Puedes reanudar tu suscripción en cualquier momento."</string>
     <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>
@@ -3390,6 +3439,7 @@ Puedes reanudar tu suscripción en cualquier momento."</string>
     <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>
@@ -3408,10 +3458,26 @@ Puedes reanudar tu suscripción en cualquier momento."</string>
     <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>
@@ -3968,6 +4034,8 @@ 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 a895784760..2157b2cd03 100644
--- a/com.discord/res/values-fi/plurals.xml
+++ b/com.discord/res/values-fi/plurals.xml
@@ -302,6 +302,14 @@
         <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>
@@ -531,6 +539,10 @@
         <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>
@@ -543,11 +555,15 @@
         <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_mobile_months">
+    <plurals name="premium_guild_subscription_duration_months">
         <item quantity="other">%d kuukautta</item>
         <item quantity="one">%d kuukausi</item>
     </plurals>
@@ -571,6 +587,10 @@
         <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 93776da933..02bc611c78 100644
--- a/com.discord/res/values-fi/strings.xml
+++ b/com.discord/res/values-fi/strings.xml
@@ -631,6 +631,7 @@ 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>
@@ -686,6 +687,8 @@ 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>
@@ -703,11 +706,13 @@ 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>
@@ -729,10 +734,6 @@ 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>
@@ -1792,8 +1793,11 @@ 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>
@@ -2147,7 +2151,9 @@ 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>
@@ -2164,12 +2170,16 @@ 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 nostatustila</string>
+    <string name="guild_settings_premium_guild_title">Palvelimen Nitro-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>
@@ -2179,7 +2189,6 @@ Menetetty: %2$s"</string>
 
 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>
@@ -2844,6 +2853,7 @@ 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>
@@ -2967,6 +2977,7 @@ 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>
@@ -3199,7 +3210,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 lahja</string>
+    <string name="payment_modal_button_premium_gift">Osta %1$s</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>
@@ -3310,6 +3321,9 @@ 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>
@@ -3332,6 +3346,7 @@ 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>
@@ -3370,20 +3385,41 @@ 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>
@@ -3396,32 +3432,44 @@ 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_mobile">%1$s</string>
+    <string name="premium_guild_subscription_duration">%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_tier_0">Ei tasoa</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_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>
@@ -3434,6 +3482,7 @@ Voit käynnistää tilauksen uudelleen milloin tahansa."</string>
     <string name="premium_payment_confirmation_blurb_regular">Olet nyt avannut tehostettujen keskusteluetujen voiman. Lopeta siis tämän lukeminen ja lähde keskustelemaan!</string>
     <string name="premium_payment_confirmation_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>
@@ -3448,6 +3497,7 @@ Voit käynnistää tilauksen uudelleen milloin tahansa."</string>
     <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>
@@ -3466,10 +3516,26 @@ Voit käynnistää tilauksen uudelleen milloin tahansa."</string>
     <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>
@@ -4031,6 +4097,8 @@ 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 aa8bf73dad..aa51ab3eb3 100644
--- a/com.discord/res/values-fr/plurals.xml
+++ b/com.discord/res/values-fr/plurals.xml
@@ -314,6 +314,14 @@
         <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>
@@ -543,6 +551,10 @@
         <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>
@@ -555,11 +567,15 @@
         <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_mobile_months">
+    <plurals name="premium_guild_subscription_duration_months">
         <item quantity="other">%d mois</item>
         <item quantity="one">%d mois</item>
     </plurals>
@@ -583,6 +599,10 @@
         <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 d708d59306..40e8d33368 100644
--- a/com.discord/res/values-fr/strings.xml
+++ b/com.discord/res/values-fr/strings.xml
@@ -626,6 +626,7 @@ 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>
@@ -681,6 +682,8 @@ 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>
@@ -698,11 +701,13 @@ 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>
@@ -724,10 +729,6 @@ 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>
@@ -1788,8 +1789,11 @@ 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>
@@ -2140,7 +2144,9 @@ 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>
@@ -2157,12 +2163,16 @@ 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</string>
+    <string name="guild_settings_premium_guild_title">État des boosts de serveur Nitro</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>
@@ -2172,7 +2182,6 @@ Perdus : %2$s"</string>
 
 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>
@@ -2829,6 +2838,7 @@ 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>
@@ -2951,6 +2961,7 @@ 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>
@@ -3180,7 +3191,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 un cadeau</string>
+    <string name="payment_modal_button_premium_gift">Acheter %1$s</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>
@@ -3290,6 +3301,9 @@ 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>
@@ -3312,6 +3326,7 @@ 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>
@@ -3350,20 +3365,41 @@ 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>
@@ -3376,32 +3412,44 @@ 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_mobile">%1$s</string>
+    <string name="premium_guild_subscription_duration">%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_tier_0">Pas de niveau</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_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>
@@ -3414,6 +3462,7 @@ 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>
@@ -3428,6 +3477,7 @@ 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>
@@ -3446,10 +3496,26 @@ 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>
@@ -4001,6 +4067,8 @@ 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 e23485fdfb..d259e736eb 100644
--- a/com.discord/res/values-hr/plurals.xml
+++ b/com.discord/res/values-hr/plurals.xml
@@ -337,6 +337,16 @@
         <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>
@@ -586,6 +596,11 @@
         <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>
@@ -599,12 +614,16 @@
         <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_mobile_months">
+    <plurals name="premium_guild_subscription_duration_months">
         <item quantity="other">%d mjeseci</item>
         <item quantity="one">%d mjesec</item>
         <item quantity="few">%d mjeseca</item>
@@ -633,6 +652,11 @@
         <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 e352d16336..15ea4299b6 100644
--- a/com.discord/res/values-hr/strings.xml
+++ b/com.discord/res/values-hr/strings.xml
@@ -600,6 +600,7 @@ 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>
@@ -656,6 +657,8 @@ 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>
@@ -673,11 +676,13 @@ 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>
@@ -699,10 +704,6 @@ 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>
@@ -1722,8 +1723,11 @@ 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>
@@ -2072,7 +2076,9 @@ 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>
@@ -2089,12 +2095,16 @@ 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 boostanja servera</string>
+    <string name="guild_settings_premium_guild_title">Status Nitro boosta za server</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>
@@ -2104,7 +2114,6 @@ izgubljeno: %2$s"</string>
 
 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>
@@ -2764,6 +2773,7 @@ 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>
@@ -2887,6 +2897,7 @@ 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>
@@ -3119,7 +3130,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 dar</string>
+    <string name="payment_modal_button_premium_gift">Kupi %1$s</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>
@@ -3230,6 +3241,9 @@ 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>
@@ -3252,6 +3266,7 @@ 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>
@@ -3289,20 +3304,41 @@ 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>
@@ -3315,32 +3351,44 @@ 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_mobile">%1$s</string>
+    <string name="premium_guild_subscription_duration">%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_tier_0">Nema nijedne razine</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_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>
@@ -3353,6 +3401,7 @@ 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>
@@ -3367,6 +3416,7 @@ 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>
@@ -3385,10 +3435,26 @@ 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>
@@ -3934,6 +4000,8 @@ 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 c77d3e74da..7518fd77ab 100644
--- a/com.discord/res/values-hu/plurals.xml
+++ b/com.discord/res/values-hu/plurals.xml
@@ -302,6 +302,14 @@
         <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>
@@ -531,6 +539,10 @@
         <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>
@@ -543,11 +555,15 @@
         <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_mobile_months">
+    <plurals name="premium_guild_subscription_duration_months">
         <item quantity="other">%d hónap</item>
         <item quantity="one">%d hónap</item>
     </plurals>
@@ -571,6 +587,10 @@
         <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 ee8c21fd0c..8488f96084 100644
--- a/com.discord/res/values-hu/strings.xml
+++ b/com.discord/res/values-hu/strings.xml
@@ -625,6 +625,7 @@ 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>
@@ -681,6 +682,8 @@ 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>
@@ -698,11 +701,13 @@ 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>
@@ -724,10 +729,6 @@ 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>
@@ -1778,8 +1779,11 @@ 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>
@@ -2132,7 +2136,9 @@ 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>
@@ -2149,12 +2155,16 @@ 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">Szervergyorsítás állapota</string>
+    <string name="guild_settings_premium_guild_title">Nitro-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>
@@ -2164,7 +2174,6 @@ Elvesztett: %2$s"</string>
 
 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>
@@ -2830,6 +2839,7 @@ 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>
@@ -2953,6 +2963,7 @@ 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>
@@ -3186,7 +3197,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">Vásárold meg az ajándékot</string>
+    <string name="payment_modal_button_premium_gift">%1$s vásárlás</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>
@@ -3297,6 +3308,9 @@ 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>
@@ -3319,6 +3333,7 @@ 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>
@@ -3357,20 +3372,41 @@ 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>
@@ -3383,32 +3419,44 @@ 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_mobile">%1$s</string>
+    <string name="premium_guild_subscription_duration">%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_tier_0">Nincs szint</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_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>
@@ -3421,6 +3469,7 @@ 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>
@@ -3435,6 +3484,7 @@ 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>
@@ -3454,10 +3504,26 @@ 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>
@@ -4015,6 +4081,8 @@ 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 8c1c28633a..53e36cdfa3 100644
--- a/com.discord/res/values-it/plurals.xml
+++ b/com.discord/res/values-it/plurals.xml
@@ -290,6 +290,14 @@
         <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>
@@ -519,6 +527,10 @@
         <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>
@@ -531,11 +543,15 @@
         <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_mobile_months">
+    <plurals name="premium_guild_subscription_duration_months">
         <item quantity="other">%d mesi</item>
         <item quantity="one">%d mese</item>
     </plurals>
@@ -559,6 +575,10 @@
         <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 4543342c7c..59cbcf01ae 100644
--- a/com.discord/res/values-it/strings.xml
+++ b/com.discord/res/values-it/strings.xml
@@ -613,6 +613,7 @@ 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>
@@ -670,6 +671,8 @@ 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>
@@ -687,11 +690,13 @@ 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>
@@ -713,9 +718,6 @@ 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>
@@ -1767,8 +1769,11 @@ 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>
@@ -2119,7 +2124,9 @@ 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>
@@ -2136,12 +2143,16 @@ 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</string>
+    <string name="guild_settings_premium_guild_title">Stato potenziamento del server Nitro</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>
@@ -2151,7 +2162,6 @@ Persi: %2$s"</string>
 
 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>
@@ -2813,6 +2823,7 @@ 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>
@@ -2936,6 +2947,7 @@ 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>
@@ -3168,7 +3180,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 regalo</string>
+    <string name="payment_modal_button_premium_gift">Acquista %1$s</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>
@@ -3280,6 +3292,9 @@ 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>
@@ -3302,6 +3317,7 @@ 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>
@@ -3340,20 +3356,41 @@ 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>
@@ -3366,32 +3403,44 @@ 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_mobile">%1$s</string>
+    <string name="premium_guild_subscription_duration">%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_tier_0">Nessun livello</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_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>
@@ -3404,6 +3453,7 @@ 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>
@@ -3418,6 +3468,7 @@ 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>
@@ -3436,9 +3487,25 @@ 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>
@@ -3994,6 +4061,8 @@ 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 0dbd2879fb..b26f37a055 100644
--- a/com.discord/res/values-ja/plurals.xml
+++ b/com.discord/res/values-ja/plurals.xml
@@ -302,6 +302,14 @@
         <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>
@@ -532,6 +540,10 @@
         <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>
@@ -544,11 +556,15 @@
         <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_mobile_months">
+    <plurals name="premium_guild_subscription_duration_months">
         <item quantity="other">%d 月</item>
         <item quantity="one">%d 月</item>
     </plurals>
@@ -572,6 +588,10 @@
         <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 e957cdc2e0..43fbbb6f7e 100644
--- a/com.discord/res/values-ja/strings.xml
+++ b/com.discord/res/values-ja/strings.xml
@@ -635,6 +635,7 @@
     <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,6 +693,8 @@
     <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>
@@ -709,11 +712,13 @@
     <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>
@@ -735,10 +740,6 @@
     <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,8 +1801,11 @@
     <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>
@@ -2155,7 +2159,9 @@
     <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>
@@ -2172,12 +2178,16 @@
     <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">サーバーのブースト状態</string>
+    <string name="guild_settings_premium_guild_title">Nitroサーバーのブースト状態</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,7 +2197,6 @@
 
 あなたのサイトを閲覧することができるユーザーにアクセスできる場合、&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>
@@ -2856,6 +2865,7 @@ 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>
@@ -2979,6 +2989,7 @@ 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>
@@ -3212,7 +3223,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">ギフトを購入</string>
+    <string name="payment_modal_button_premium_gift">%1$sを購入</string>
     <string name="payment_modal_one_month">1月</string>
     <string name="payment_modal_one_year">1年</string>
     <string name="payment_modal_per_month">月額</string>
@@ -3324,6 +3335,9 @@ 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>
@@ -3346,6 +3360,7 @@ 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>
@@ -3384,20 +3399,41 @@ 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>
@@ -3410,32 +3446,44 @@ 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_mobile">%1$s</string>
+    <string name="premium_guild_subscription_duration">%1$s</string>
     <string name="premium_guild_subscription_error_mobile">ブーストしようとした際にエラーが発生しました。もう一度お試しください。</string>
     <string name="premium_guild_subscription_error_rate_limit_days">クールダウン中のようです。**%1$s と %2$s** 待ってからやり直してください</string>
     <string name="premium_guild_subscription_error_rate_limit_hours">クールダウン中のようです。**%1$s と %2$s** 待ってからやり直してください</string>
     <string name="premium_guild_subscription_error_rate_limit_minutes">クールダウン中のようです。**%1$s** 待ってからやり直してください</string>
     <string name="premium_guild_subscription_no_next_tier">このサーバーは最高までパワーアップしています！その調子です！</string>
+    <string name="premium_guild_subscription_notice">Nitroサーバーブーストはここです！コミュニティを集めて、サーバーをブーストしましょう。</string>
     <string name="premium_guild_subscription_notice_button">レベルと特典を確認</string>
+    <string name="premium_guild_subscription_notice_small_guild">Nitroサーバーブーストはここです！友だちを集めて、サーバーをブーストしましょう。</string>
     <string name="premium_guild_subscription_remove_button">ブーストを削除</string>
     <string name="premium_guild_subscription_remove_error_mobile">ブーストを削除しようとした際にエラーが発生しました。もう一度お試しください。</string>
     <string name="premium_guild_subscription_select_server_button">サーバーを選択</string>
-    <string name="premium_guild_tier_0">レベルなし</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_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>
@@ -3448,6 +3496,7 @@ 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>
@@ -3462,6 +3511,7 @@ 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>
@@ -3480,10 +3530,26 @@ 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>
@@ -4042,6 +4108,8 @@ 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 15d407994b..a69f0271d9 100644
--- a/com.discord/res/values-ko/plurals.xml
+++ b/com.discord/res/values-ko/plurals.xml
@@ -310,6 +310,14 @@
         <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>
@@ -551,6 +559,10 @@
         <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>
@@ -563,11 +575,15 @@
         <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_mobile_months">
+    <plurals name="premium_guild_subscription_duration_months">
         <item quantity="other">%d개월</item>
         <item quantity="one">%d개월</item>
     </plurals>
@@ -591,6 +607,10 @@
         <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 aa7b1f37bb..9897ebc8c7 100644
--- a/com.discord/res/values-ko/strings.xml
+++ b/com.discord/res/values-ko/strings.xml
@@ -640,6 +640,7 @@
     <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,6 +696,8 @@
     <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,11 +715,13 @@
     <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,10 +743,6 @@
     <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,8 +1802,11 @@ 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>
@@ -2157,7 +2161,9 @@ 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>
@@ -2174,12 +2180,16 @@ 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">서버 부스트 상태</string>
+    <string name="guild_settings_premium_guild_title">Nitro 서버 부스트 상태</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>
@@ -2189,7 +2199,6 @@ 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>
@@ -2858,6 +2867,7 @@ 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>
@@ -2982,6 +2992,7 @@ 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>
@@ -3215,7 +3226,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">선물 구입하기</string>
+    <string name="payment_modal_button_premium_gift">%1$s 구입하기</string>
     <string name="payment_modal_one_month">1달</string>
     <string name="payment_modal_one_year">1년</string>
     <string name="payment_modal_per_month">매월</string>
@@ -3327,6 +3338,9 @@ 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>
@@ -3350,6 +3364,7 @@ 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>
@@ -3388,20 +3403,41 @@ 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>
@@ -3414,32 +3450,44 @@ 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_mobile">%1$s</string>
+    <string name="premium_guild_subscription_duration">%1$s</string>
     <string name="premium_guild_subscription_error_mobile">부스트 중 오류가 발생했어요. 다시 시도해 주세요.</string>
     <string name="premium_guild_subscription_error_rate_limit_days">쿨다운 상태신 것 같아요. **%1$s %2$s** 후 다시 시도해 주세요.</string>
     <string name="premium_guild_subscription_error_rate_limit_hours">쿨다운 상태신 것 같아요. **%1$s %2$s** 후 다시 시도해 주세요.</string>
     <string name="premium_guild_subscription_error_rate_limit_minutes">쿨다운 상태신 것 같아요. **%1$s**후 다시 시도해 주세요.</string>
     <string name="premium_guild_subscription_no_next_tier">서버가 아주 강해졌어요! 계속 부스팅하세요!</string>
+    <string name="premium_guild_subscription_notice">Nitro 서버 부스트가 생겼어요! 커뮤니티와 함께 서버를 부스트하세요.</string>
     <string name="premium_guild_subscription_notice_button">레벨과 특전 보기</string>
+    <string name="premium_guild_subscription_notice_small_guild">Nitro 서버 부스트가 생겼어요! 친구들과 함께 서버를 부스트하세요.</string>
     <string name="premium_guild_subscription_remove_button">부스트 제거하기</string>
     <string name="premium_guild_subscription_remove_error_mobile">부스트 제거 중 오류가 발생했어요. 다시 시도해 주세요.</string>
     <string name="premium_guild_subscription_select_server_button">서버 선택하기</string>
-    <string name="premium_guild_tier_0">레벨 없음</string>
+    <string name="premium_guild_subscription_subscriber_count_tooltip">%1$s</string>
+    <string name="premium_guild_subscription_subtitle">"Nitro 파워로 참가한 서버를 부스트하세요! 서버를 부스트하면 레벨을 올릴 수 있어요. 레벨이 오를 때마다 서버 전체가 특전을 받을 수 있답니다.
+ 서버 부스트에는 7일 쿨다운 기간이 있어요. 부스트를 제거하더라도 쿨다운 기간이 끝날 때까지는 다른 서버를 부스트할 수 없어요. [Nitro 서버 부스팅에 대해 자세히 알아보세요.](%1$s)"</string>
+    <string name="premium_guild_subscription_subtitle_mobile_1">Nitro 파워로 참가한 서버를 부스트하세요! 서버를 부스트하면 레벨을 올릴 수 있어요. 레벨이 오를 때마다 서버 전체가 특전을 받을 수 있답니다.</string>
+    <string name="premium_guild_subscription_subtitle_mobile_2">서버 부스트에는 7일 쿨다운 기간이 있어요. 부스트를 제거하더라도 쿨다운 기간이 끝날 때까지는 다른 서버를 부스트할 수 없어요. [Nitro 서버 부스팅에 대해 자세히 알아보세요.](%1$s)</string>
+    <string name="premium_guild_subscription_title">Nitro 서버 부스트</string>
+    <string name="premium_guild_subscription_tooltip">Nitro 부스트 시작 날짜: %1$s</string>
     <string name="premium_guild_tier_1">레벨 1</string>
     <string name="premium_guild_tier_2">레벨 2</string>
     <string name="premium_guild_tier_3">레벨 3</string>
+    <string name="premium_guild_unsubscribe_confirm_blurb">정말 이 서버에서 Nitro 부스트를 제거하시겠어요?</string>
     <string name="premium_guild_unsubscribe_confirm_confirmation">부스트 제거하기</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning">부스트를 제거하면 서버의 진행 상황이 내려가요.</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning_days">부스트를 제거하면 서버의 진행 상황이 내려가요. **부스트가 아직 쿨다운 상태예요. %1$s %2$s 후 다시 부스트할 수 있어요.**</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning_hours">부스트를 제거하면 서버의 진행 상황이 내려가요. **부스트가 아직 쿨다운 상태예요. %1$s %2$s 후 다시 부스트할 수 있어요.**</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning_minutes">부스트를 제거하면 서버의 진행 상황이 내려가요. **부스트가 아직 쿨다운 상태예요. %1$s 후 다시 부스트할 수 있어요.**</string>
+    <string name="premium_guild_unsubscribe_confirm_header">Nitro 부스트를 제거할까요?</string>
     <string name="premium_included">Nitro에 포함되는 혜택:</string>
     <string name="premium_info_monthly">(매월) 청구액: %1$s 청구일: %2$s.</string>
     <string name="premium_month_subscription">매월 **%1$s%2$s %3$s**</string>
@@ -3452,6 +3500,7 @@ 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>
@@ -3466,6 +3515,7 @@ 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>
@@ -3484,10 +3534,26 @@ 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>
@@ -4050,6 +4116,8 @@ 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 69b0ad45db..a47121a30b 100644
--- a/com.discord/res/values-lt/plurals.xml
+++ b/com.discord/res/values-lt/plurals.xml
@@ -302,6 +302,14 @@
         <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>
@@ -531,6 +539,10 @@
         <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>
@@ -543,11 +555,15 @@
         <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_mobile_months">
+    <plurals name="premium_guild_subscription_duration_months">
         <item quantity="other">%d mėn.</item>
         <item quantity="one">%d mėn.</item>
     </plurals>
@@ -571,6 +587,10 @@
         <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 a8931738a0..da00185bd1 100644
--- a/com.discord/res/values-lt/strings.xml
+++ b/com.discord/res/values-lt/strings.xml
@@ -627,6 +627,7 @@ 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>
@@ -683,6 +684,8 @@ 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>
@@ -700,11 +703,13 @@ 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>
@@ -726,10 +731,6 @@ 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>
@@ -1782,8 +1783,11 @@ 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>
@@ -2136,7 +2140,9 @@ 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>
@@ -2153,12 +2159,16 @@ 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">Serverio stiprinimo būsena</string>
+    <string name="guild_settings_premium_guild_title">Nitro 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>
@@ -2168,7 +2178,6 @@ Pasitraukė: %2$s"</string>
 
 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>
@@ -2834,6 +2843,7 @@ 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>
@@ -2958,6 +2968,7 @@ 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>
@@ -3191,7 +3202,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 dovaną</string>
+    <string name="payment_modal_button_premium_gift">Pirkti %1$s</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>
@@ -3300,6 +3311,9 @@ 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>
@@ -3322,6 +3336,7 @@ 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>
@@ -3360,20 +3375,41 @@ 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>
@@ -3386,32 +3422,44 @@ 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_mobile">%1$s</string>
+    <string name="premium_guild_subscription_duration">%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_tier_0">Lygio nėra</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_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>
@@ -3424,6 +3472,7 @@ 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>
@@ -3438,6 +3487,7 @@ 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>
@@ -3456,10 +3506,26 @@ 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>
@@ -4020,6 +4086,8 @@ 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 90b3101c00..4a4947da84 100644
--- a/com.discord/res/values-nl/plurals.xml
+++ b/com.discord/res/values-nl/plurals.xml
@@ -302,6 +302,14 @@
         <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>
@@ -523,6 +531,10 @@
         <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>
@@ -535,11 +547,15 @@
         <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_mobile_months">
+    <plurals name="premium_guild_subscription_duration_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 2e1d6b2c06..2cf1180f3a 100644
--- a/com.discord/res/values-nl/strings.xml
+++ b/com.discord/res/values-nl/strings.xml
@@ -601,6 +601,7 @@ 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>
@@ -653,6 +654,8 @@ 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>
@@ -670,11 +673,13 @@ 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>
@@ -696,10 +701,6 @@ 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>
@@ -1745,8 +1746,11 @@ 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>
@@ -2097,7 +2101,9 @@ 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>
@@ -2114,12 +2120,16 @@ 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">Serverbooststatus</string>
+    <string name="guild_settings_premium_guild_title">Status Nitro-serverboost</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>
@@ -2129,7 +2139,6 @@ Verloren: %2$s"</string>
 
 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>
@@ -2779,6 +2788,7 @@ 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>
@@ -2900,6 +2910,7 @@ 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>
@@ -3129,7 +3140,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">Cadeau kopen</string>
+    <string name="payment_modal_button_premium_gift">Koop %1$s</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>
@@ -3238,6 +3249,9 @@ 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>
@@ -3260,6 +3274,7 @@ 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>
@@ -3298,20 +3313,41 @@ 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>
@@ -3324,32 +3360,43 @@ 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_mobile">%1$s</string>
+    <string name="premium_guild_subscription_duration">%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_tier_0">Geen niveau</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_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>
@@ -3361,6 +3408,7 @@ 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>
@@ -3375,6 +3423,7 @@ 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>
@@ -3393,10 +3442,26 @@ 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>
@@ -3939,6 +4004,8 @@ 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 14691625bc..9951aac9df 100644
--- a/com.discord/res/values-no/plurals.xml
+++ b/com.discord/res/values-no/plurals.xml
@@ -291,6 +291,14 @@
         <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>
@@ -520,6 +528,10 @@
         <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>
@@ -532,11 +544,15 @@
         <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_mobile_months">
+    <plurals name="premium_guild_subscription_duration_months">
         <item quantity="other">%d Måneder</item>
         <item quantity="one">%d Måned</item>
     </plurals>
@@ -560,6 +576,10 @@
         <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 1ef124448c..6d8412d488 100644
--- a/com.discord/res/values-no/strings.xml
+++ b/com.discord/res/values-no/strings.xml
@@ -578,6 +578,7 @@ 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>
@@ -634,6 +635,8 @@ 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>
@@ -651,11 +654,13 @@ 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>
@@ -677,10 +682,6 @@ 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>
@@ -1705,8 +1706,11 @@ 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>
@@ -2057,7 +2061,9 @@ 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>
@@ -2074,12 +2080,16 @@ 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">Server Boost-status</string>
+    <string name="guild_settings_premium_guild_title">Nitro 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>
@@ -2089,7 +2099,6 @@ Mistet: %2$s"</string>
 
 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>
@@ -2748,6 +2757,7 @@ 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>
@@ -2872,6 +2882,7 @@ 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>
@@ -3105,7 +3116,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 gave</string>
+    <string name="payment_modal_button_premium_gift">Kjøp %1$s</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>
@@ -3215,6 +3226,9 @@ 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>
@@ -3237,6 +3251,7 @@ 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>
@@ -3274,20 +3289,40 @@ 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>
@@ -3300,32 +3335,43 @@ 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_mobile">%1$s</string>
+    <string name="premium_guild_subscription_duration">%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_tier_0">Ingen nivå</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_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>
@@ -3338,6 +3384,7 @@ 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>
@@ -3352,6 +3399,7 @@ 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>
@@ -3370,10 +3418,26 @@ 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>
@@ -3921,6 +3985,8 @@ 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 8727004f7c..f558f25359 100644
--- a/com.discord/res/values-pl/plurals.xml
+++ b/com.discord/res/values-pl/plurals.xml
@@ -331,6 +331,16 @@
         <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>
@@ -582,6 +592,11 @@
         <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>
@@ -596,12 +611,16 @@
         <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_mobile_months">
+    <plurals name="premium_guild_subscription_duration_months">
         <item quantity="other">%d miesięcy</item>
         <item quantity="one">%d miesiąc</item>
         <item quantity="few">%d miesiące</item>
@@ -630,6 +649,11 @@
         <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 4cf7d1b97d..96c1334247 100644
--- a/com.discord/res/values-pl/strings.xml
+++ b/com.discord/res/values-pl/strings.xml
@@ -627,6 +627,7 @@ 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>
@@ -684,6 +685,8 @@ 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>
@@ -701,11 +704,13 @@ 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>
@@ -727,10 +732,6 @@ 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>
@@ -1779,8 +1780,11 @@ 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>
@@ -2132,7 +2136,9 @@ 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>
@@ -2149,12 +2155,16 @@ 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</string>
+    <string name="guild_settings_premium_guild_title">Status ulepszeń serwera Nitro</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>
@@ -2164,7 +2174,6 @@ Utracono: %2$s"</string>
 
 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>
@@ -2830,6 +2839,7 @@ 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>
@@ -2954,6 +2964,7 @@ 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>
@@ -3187,7 +3198,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 prezent</string>
+    <string name="payment_modal_button_premium_gift">Kup %1$s</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>
@@ -3297,6 +3308,9 @@ 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>
@@ -3319,6 +3333,7 @@ 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>
@@ -3357,20 +3372,41 @@ 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>
@@ -3383,32 +3419,44 @@ 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_mobile">%1$s</string>
+    <string name="premium_guild_subscription_duration">%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_tier_0">Brak poziomu</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_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>
@@ -3421,6 +3469,7 @@ 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>
@@ -3435,6 +3484,7 @@ 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>
@@ -3453,10 +3503,26 @@ 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>
@@ -4017,6 +4083,8 @@ 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 87c1c5aeb7..b471ffde1a 100644
--- a/com.discord/res/values-pt-rBR/plurals.xml
+++ b/com.discord/res/values-pt-rBR/plurals.xml
@@ -286,6 +286,14 @@
         <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>
@@ -515,6 +523,10 @@
         <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>
@@ -527,11 +539,15 @@
         <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_mobile_months">
+    <plurals name="premium_guild_subscription_duration_months">
         <item quantity="other">%d meses</item>
         <item quantity="one">%d mês</item>
     </plurals>
@@ -555,6 +571,10 @@
         <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 aed0831d59..a04a0ed160 100644
--- a/com.discord/res/values-pt-rBR/strings.xml
+++ b/com.discord/res/values-pt-rBR/strings.xml
@@ -622,6 +622,7 @@ 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>
@@ -679,6 +680,8 @@ 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>
@@ -696,11 +699,13 @@ 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>
@@ -722,10 +727,6 @@ 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>
@@ -1780,8 +1781,11 @@ 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>
@@ -2135,7 +2139,9 @@ 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>
@@ -2152,12 +2158,16 @@ 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 impulsionamento do servidor</string>
+    <string name="guild_settings_premium_guild_title">Estado do impulso de servidor Nitro</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>
@@ -2167,7 +2177,6 @@ Perdeu: %2$s"</string>
 
 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>
@@ -2831,6 +2840,7 @@ 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>
@@ -2954,6 +2964,7 @@ 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>
@@ -3187,7 +3198,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 presente</string>
+    <string name="payment_modal_button_premium_gift">Comprar %1$s</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>
@@ -3298,6 +3309,9 @@ 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>
@@ -3320,6 +3334,7 @@ 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>
@@ -3358,20 +3373,41 @@ 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>
@@ -3384,32 +3420,44 @@ 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_mobile">%1$s</string>
+    <string name="premium_guild_subscription_duration">%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_tier_0">Nenhum nível</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_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>
@@ -3422,6 +3470,7 @@ Você pode voltar a assinar a qualquer momento."</string>
     <string name="premium_payment_confirmation_blurb_regular">Você recebeu a bênção das vantagens no bate-papo. Para de ler isso e vai conversar!</string>
     <string name="premium_payment_confirmation_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>
@@ -3436,6 +3485,7 @@ Você pode voltar a assinar a qualquer momento."</string>
     <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>
@@ -3454,10 +3504,26 @@ Você pode voltar a assinar a qualquer momento."</string>
     <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>
@@ -4017,6 +4083,8 @@ 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 7592e475d2..c4b433c176 100644
--- a/com.discord/res/values-ro/plurals.xml
+++ b/com.discord/res/values-ro/plurals.xml
@@ -290,6 +290,14 @@
         <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>
@@ -519,6 +527,10 @@
         <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>
@@ -531,11 +543,15 @@
         <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_mobile_months">
+    <plurals name="premium_guild_subscription_duration_months">
         <item quantity="other">%d luni</item>
         <item quantity="one">lună</item>
     </plurals>
@@ -559,6 +575,10 @@
         <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 1a8e17bc87..0d1f8bc5f8 100644
--- a/com.discord/res/values-ro/strings.xml
+++ b/com.discord/res/values-ro/strings.xml
@@ -607,6 +607,7 @@ 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>
@@ -663,6 +664,8 @@ 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>
@@ -680,11 +683,13 @@ 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>
@@ -706,10 +711,6 @@ 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>
@@ -1753,8 +1754,11 @@ 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>
@@ -2107,7 +2111,9 @@ 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>
@@ -2124,12 +2130,16 @@ 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</string>
+    <string name="guild_settings_premium_guild_title">Status boost server cu Nitro</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>
@@ -2139,7 +2149,6 @@ Pierduți: %2$s"</string>
 
 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>
@@ -2805,6 +2814,7 @@ 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>
@@ -2928,6 +2938,7 @@ 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>
@@ -3160,7 +3171,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ă cadou</string>
+    <string name="payment_modal_button_premium_gift">Cumpără %1$s</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>
@@ -3271,6 +3282,9 @@ 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>
@@ -3293,6 +3307,7 @@ 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>
@@ -3331,20 +3346,41 @@ 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>
@@ -3357,32 +3393,44 @@ 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_mobile">%1$s</string>
+    <string name="premium_guild_subscription_duration">%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_tier_0">Niciun nivel</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_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>
@@ -3395,6 +3443,7 @@ 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>
@@ -3409,6 +3458,7 @@ 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>
@@ -3428,10 +3478,26 @@ 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>
@@ -3988,6 +4054,8 @@ 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 547e33ce94..e19f0bdca8 100644
--- a/com.discord/res/values-ru/plurals.xml
+++ b/com.discord/res/values-ru/plurals.xml
@@ -322,6 +322,16 @@
         <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>
@@ -582,6 +592,11 @@
         <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>
@@ -597,12 +612,17 @@
         <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_mobile_months">
+    <plurals name="premium_guild_subscription_duration_months">
         <item quantity="other">%d месяцев</item>
         <item quantity="one">%d месяц</item>
         <item quantity="few">%d месяца</item>
@@ -628,6 +648,11 @@
         <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 3a8128c685..854ec7e517 100644
--- a/com.discord/res/values-ru/strings.xml
+++ b/com.discord/res/values-ru/strings.xml
@@ -640,6 +640,7 @@
     <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,6 +700,8 @@
     <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,11 +719,13 @@
     <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,10 +747,6 @@
     <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>
@@ -1814,8 +1815,11 @@
     <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>
@@ -2169,7 +2173,9 @@
     <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>
@@ -2186,12 +2192,16 @@
     <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">Состояние усиления сервера</string>
+    <string name="guild_settings_premium_guild_title">Состояние Nitro-усиления сервера</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>
@@ -2201,7 +2211,6 @@
 
 Если у вас есть доступ к пользователям сайта, то вы также можете добавить &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>
@@ -2867,6 +2876,7 @@
     <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>
@@ -2991,6 +3001,7 @@
     <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>
@@ -3224,7 +3235,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">Купить подарок</string>
+    <string name="payment_modal_button_premium_gift">Оформить подписку на %1$s</string>
     <string name="payment_modal_one_month">1 месяц</string>
     <string name="payment_modal_one_year">1 год</string>
     <string name="payment_modal_per_month">В месяц</string>
@@ -3337,6 +3348,9 @@
 Вы можете возобновить подписку в любое время."</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,6 +3373,7 @@
     <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>
@@ -3397,20 +3412,41 @@
     <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>
@@ -3423,32 +3459,44 @@
     <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_mobile">%1$s</string>
+    <string name="premium_guild_subscription_duration">%1$s</string>
     <string name="premium_guild_subscription_error_mobile">Возникла ошибка при попытке усиления. Попробуйте ещё раз.</string>
     <string name="premium_guild_subscription_error_rate_limit_days">Ваша способность усиления серверов пока не восстановилась. Подождите **%1$s и %2$s** и попробуйте ещё раз.</string>
     <string name="premium_guild_subscription_error_rate_limit_hours">Ваша способность усиления серверов пока не восстановилась. Подождите **%1$s и %2$s** и попробуйте ещё раз.</string>
     <string name="premium_guild_subscription_error_rate_limit_minutes">Ваша способность усиления серверов пока не восстановилась. Подождите **%1$s** и попробуйте ещё раз.</string>
     <string name="premium_guild_subscription_no_next_tier">Сервер на пике своих возможностей! Не прекращайте усиление!</string>
+    <string name="premium_guild_subscription_notice">Nitro-усиления сервера уже доступны! Соберитесь всем сообществом и усильте свой сервер.</string>
     <string name="premium_guild_subscription_notice_button">Уровни и бонусы</string>
+    <string name="premium_guild_subscription_notice_small_guild">Nitro-усиления сервера уже доступны! Соберите друзей и усильте свой сервер.</string>
     <string name="premium_guild_subscription_remove_button">Отменить усиление</string>
     <string name="premium_guild_subscription_remove_error_mobile">Возникла ошибка при попытке отмены усиления. Попробуйте ещё раз.</string>
     <string name="premium_guild_subscription_select_server_button">Выбрать сервер</string>
-    <string name="premium_guild_tier_0">Нет уровня</string>
+    <string name="premium_guild_subscription_subscriber_count_tooltip">%1$s</string>
+    <string name="premium_guild_subscription_subtitle">"Используйте мощь Nitro, чтобы усилить любимый сервер! Чем больше усилений получит сервер, тем выше будет его уровень. А каждый новый уровень даёт бонусы заодно и всем тем, кто на сервере!
+ Усиление сервера можно проводить не чаще одного раза в 7 дней. Вы не сможете усилить другой сервер, пока эта возможность не восстановится, даже если прекратите усиливать текущий сервер. [Подробнее об усилении сервера с помощью Nitro.](%1$s)"</string>
+    <string name="premium_guild_subscription_subtitle_mobile_1">Используйте мощь Nitro, чтобы усилить любимый сервер! Чем больше усилений получит сервер, тем выше будет его уровень. А каждый новый уровень даёт бонусы заодно и всем тем, кто на сервере!</string>
+    <string name="premium_guild_subscription_subtitle_mobile_2">Усиление сервера можно проводить не чаще одного раза в 7 дней. Вы не сможете усилить другой сервер, пока эта возможность не восстановится, даже если прекратите усиливать текущий сервер. [Подробнее о Nitro-усилении сервера.](%1$s)</string>
+    <string name="premium_guild_subscription_title">Nitro-усиление сервера</string>
+    <string name="premium_guild_subscription_tooltip">Nitro-усиление с %1$s</string>
     <string name="premium_guild_tier_1">1-й уровень</string>
     <string name="premium_guild_tier_2">2-й уровень</string>
     <string name="premium_guild_tier_3">3-й уровень</string>
+    <string name="premium_guild_unsubscribe_confirm_blurb">Проверьте, хотите ли вы отменить Nitro-усиление этого сервера:</string>
     <string name="premium_guild_unsubscribe_confirm_confirmation">Да, отменить усиление</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning">Если вы отмените усиление, сервер потеряет прогресс.</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning_days">Если вы отмените усиление, сервер потеряет прогресс. **Ваша способность усиления серверов ещё восстанавливается. Усиление будет доступно через %1$s и %2$s.**</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning_hours">Если вы отмените усиление, сервер потеряет прогресс. **Ваша способность усиления серверов ещё восстанавливается. Усиление будет доступно через %1$s и %2$s.**</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning_minutes">Если вы отмените усиление, сервер потеряет прогресс. **Ваша способность усиления серверов ещё восстанавливается. Усиление будет доступно через %1$s.**</string>
+    <string name="premium_guild_unsubscribe_confirm_header">Отменить Nitro-усиление?</string>
     <string name="premium_included">Nitro включает:</string>
     <string name="premium_info_monthly">Сумма %1$s (ежемесячный платёж) будет списана %2$s</string>
     <string name="premium_month_subscription">**%1$s%2$s %3$s** / месяц</string>
@@ -3461,6 +3509,7 @@
     <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>
@@ -3475,6 +3524,7 @@
     <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>
@@ -3493,10 +3543,26 @@
     <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>
@@ -4059,6 +4125,8 @@
     <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 425b0d9f46..3dc84323e8 100644
--- a/com.discord/res/values-sv-rSE/plurals.xml
+++ b/com.discord/res/values-sv-rSE/plurals.xml
@@ -302,6 +302,14 @@
         <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>
@@ -531,6 +539,10 @@
         <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>
@@ -543,11 +555,15 @@
         <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_mobile_months">
+    <plurals name="premium_guild_subscription_duration_months">
         <item quantity="other">%d månader</item>
         <item quantity="one">%d månad</item>
     </plurals>
@@ -571,6 +587,10 @@
         <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 44cdbf48ed..df59bc0b65 100644
--- a/com.discord/res/values-sv-rSE/strings.xml
+++ b/com.discord/res/values-sv-rSE/strings.xml
@@ -581,6 +581,7 @@ 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>
@@ -637,6 +638,8 @@ 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>
@@ -654,11 +657,13 @@ 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>
@@ -680,10 +685,6 @@ 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>
@@ -1720,8 +1721,11 @@ 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>
@@ -2074,7 +2078,9 @@ 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>
@@ -2091,12 +2097,16 @@ 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">Serverbooststatus</string>
+    <string name="guild_settings_premium_guild_title">Nitro-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>
@@ -2106,7 +2116,6 @@ Förlorade: %2$s"</string>
 
 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>
@@ -2768,6 +2777,7 @@ 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>
@@ -2891,6 +2901,7 @@ 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>
@@ -3122,7 +3133,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 gåva</string>
+    <string name="payment_modal_button_premium_gift">Köp %1$s</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>
@@ -3233,6 +3244,9 @@ 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>
@@ -3255,6 +3269,7 @@ 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>
@@ -3293,20 +3308,41 @@ 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>
@@ -3319,32 +3355,44 @@ 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_mobile">%1$s</string>
+    <string name="premium_guild_subscription_duration">%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_tier_0">Ingen nivå</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_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>
@@ -3357,6 +3405,7 @@ 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>
@@ -3371,6 +3420,7 @@ 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>
@@ -3390,10 +3440,26 @@ 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>
@@ -3945,6 +4011,8 @@ 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 a664e36e4f..589a8d153c 100644
--- a/com.discord/res/values-th/plurals.xml
+++ b/com.discord/res/values-th/plurals.xml
@@ -302,6 +302,14 @@
         <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>
@@ -531,6 +539,10 @@
         <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>
@@ -543,11 +555,15 @@
         <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_mobile_months">
+    <plurals name="premium_guild_subscription_duration_months">
         <item quantity="other">%d เดือน</item>
         <item quantity="one">%d เดือน</item>
     </plurals>
@@ -571,6 +587,10 @@
         <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 c0bd0a1d4b..30902ddd95 100644
--- a/com.discord/res/values-th/strings.xml
+++ b/com.discord/res/values-th/strings.xml
@@ -633,6 +633,7 @@
     <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>
@@ -690,6 +691,8 @@
     <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>
@@ -707,11 +710,13 @@
     <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>
@@ -733,10 +738,6 @@
     <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>
@@ -1789,8 +1790,11 @@ 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>
@@ -2144,7 +2148,9 @@ 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>
@@ -2161,12 +2167,16 @@ 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">สถานะการบูสต์เซิร์ฟเวอร์</string>
+    <string name="guild_settings_premium_guild_title">สถานะการบูสต์เซิร์ฟเวอร์ Nitro</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>
@@ -2176,7 +2186,6 @@ 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>
@@ -2843,6 +2852,7 @@ 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>
@@ -2967,6 +2977,7 @@ 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>
@@ -3200,7 +3211,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">ซื้อของขวัญ</string>
+    <string name="payment_modal_button_premium_gift">ซื้อ %1$s</string>
     <string name="payment_modal_one_month">1 เดือน</string>
     <string name="payment_modal_one_year">1 ปี</string>
     <string name="payment_modal_per_month">ต่อเดือน</string>
@@ -3310,6 +3321,9 @@ 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>
@@ -3332,6 +3346,7 @@ 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>
@@ -3370,20 +3385,41 @@ 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>
@@ -3396,32 +3432,44 @@ 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_mobile">%1$s</string>
+    <string name="premium_guild_subscription_duration">%1$s</string>
     <string name="premium_guild_subscription_error_mobile">เกิดความผิดพลาดในการบูสต์ โปรดลองอีกครั้ง</string>
     <string name="premium_guild_subscription_error_rate_limit_days">ดูเหมือนคุณกำลังคูลดาวน์ โปรดรอ **%1$s และ %2$s** ก่อนลองอีกครั้ง</string>
     <string name="premium_guild_subscription_error_rate_limit_hours">ดูเหมือนคุณกำลังคูลดาวน์ โปรดรอ **%1$s และ %2$s** ก่อนลองอีกครั้ง</string>
     <string name="premium_guild_subscription_error_rate_limit_minutes">ดูเหมือนคุณกำลังคูลดาวน์ โปรดรอ **%1$s** ก่อนลองอีกครั้ง</string>
     <string name="premium_guild_subscription_no_next_tier">เซิร์ฟเวอร์เพิ่มพลังเต็มที่! บูสต์ต่อไป!</string>
+    <string name="premium_guild_subscription_notice">การบูสต์เซิร์ฟเวอร์ Nitro อยู่ @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_tier_0">ไม่มีระดับ</string>
+    <string name="premium_guild_subscription_subscriber_count_tooltip">%1$s</string>
+    <string name="premium_guild_subscription_subtitle">"ใช้พลัง Nitro ของคุณบูสต์เซิร์ฟเวอร์ที่คุณเข้าร่วม! การบูสต์เซิร์ฟเวอร์ทำให้สามารถขึ้นสู่ระดับต่อไป แต่ละระดับมอบสิทธิประโยชน์สะสมสำหรับเซิร์ฟเวอร์ทั้งหมด
+ การบูสต์เซิร์ฟเวอร์เปิดการคูลดาวน์นาน 7 วัน คุณอาจไม่บูสต์เซิร์ฟเวอร์อื่นจนกระทั่งคูลดาวน์เสร็จแม้ว่าคุณจะระงับการบูสต์ก็ตาม [เรียนรู้เพิ่มเติมเกี่ยวกับการบูสต์เซิร์ฟเวอร์ Nitro](%1$s)"</string>
+    <string name="premium_guild_subscription_subtitle_mobile_1">ใช้พลัง Nitro ของคุณบูสต์เซิร์ฟเวอร์ที่คุณเข้าร่วม! การบูสต์เซิร์ฟเวอร์ทำให้สามารถขึ้นสู่ระดับต่อไป แต่ละระดับมอบสิทธิประโยชน์สะสมสำหรับเซิร์ฟเวอร์ทั้งหมด</string>
+    <string name="premium_guild_subscription_subtitle_mobile_2">การบูสต์เซิร์ฟเวอร์เปิดการคูลดาวน์นาน 7 วัน คุณอาจไม่บูสต์เซิร์ฟเวอร์อื่นจนกระทั่งคูลดาวน์เสร็จแม้ว่าคุณจะระงับการบูสต์ก็ตาม [เรียนรู้เพิ่มเติมเกี่ยวกับการบูสต์เซิร์ฟเวอร์ Nitro](%1$s)</string>
+    <string name="premium_guild_subscription_title">การบูสต์เซิร์ฟเวอร์ Nitro</string>
+    <string name="premium_guild_subscription_tooltip">การบูสต์ Nitro ตั้งแต่ %1$s</string>
     <string name="premium_guild_tier_1">ระดับ 1</string>
     <string name="premium_guild_tier_2">ระดับ 2</string>
     <string name="premium_guild_tier_3">ระดับ 3</string>
+    <string name="premium_guild_unsubscribe_confirm_blurb">คุณแน่ใจหรือว่าต้องการระงับบูสต์ Nitro จาก:</string>
     <string name="premium_guild_unsubscribe_confirm_confirmation">ใช่ ระงับการบูสต์</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning">เซิร์ฟเวอร์นี้จะเสียการเพิ่มระดับหากคุณระงับการบูสต์</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning_days">เซิร์ฟเวอร์นี้จะเสียการเพิ่มระดับหากคุณระงับการบูสต์ **การบูสต์ของคุณยังอยู่ระหว่างคูลดาวน์ จะพร้อมใน %1$s และ %2$s.**</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning_hours">เซิร์ฟเวอร์นี้จะเสียการเพิ่มระดับหากคุณระงับการบูสต์ **การบูสต์ของคุณยังอยู่ระหว่างคูลดาวน์ จะพร้อมใน %1$s และ %2$s.**</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning_minutes">เซิร์ฟเวอร์นี้จะเสียการเพิ่มระดับหากคุณระงับการบูสต์ **การบูสต์ของคุณยังอยู่ระหว่างคูลดาวน์ จะพร้อมใน %1$s **</string>
+    <string name="premium_guild_unsubscribe_confirm_header">ระงับการบูสต์ Nitro หรือไม่?</string>
     <string name="premium_included">รวมอยู่ใน Nitro:</string>
     <string name="premium_info_monthly">%1$s (รายเดือน) เกิดขึ้นเมื่อ %2$s</string>
     <string name="premium_month_subscription">**%1$s%2$s %3$s** / เดือน</string>
@@ -3433,6 +3481,7 @@ 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>
@@ -3447,6 +3496,7 @@ 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>
@@ -3465,10 +3515,26 @@ 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>
@@ -4029,6 +4095,8 @@ 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 73725394f2..812cdeb8af 100644
--- a/com.discord/res/values-tr/plurals.xml
+++ b/com.discord/res/values-tr/plurals.xml
@@ -294,6 +294,14 @@
         <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>
@@ -523,6 +531,10 @@
         <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>
@@ -535,11 +547,15 @@
         <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_mobile_months">
+    <plurals name="premium_guild_subscription_duration_months">
         <item quantity="other">%d Ay</item>
         <item quantity="one">%d Ay</item>
     </plurals>
@@ -563,6 +579,10 @@
         <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 d8e10a268b..b8c49cd620 100644
--- a/com.discord/res/values-tr/strings.xml
+++ b/com.discord/res/values-tr/strings.xml
@@ -626,6 +626,7 @@ 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>
@@ -682,6 +683,8 @@ 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>
@@ -699,11 +702,13 @@ 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>
@@ -725,10 +730,6 @@ 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>
@@ -1775,8 +1776,11 @@ 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>
@@ -2127,7 +2131,9 @@ 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>
@@ -2144,12 +2150,16 @@ 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">Sunucu Takviyesi Durumu</string>
+    <string name="guild_settings_premium_guild_title">Nitro 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>
@@ -2159,7 +2169,6 @@ Kaybedilen: %2$s"</string>
 
 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>
@@ -2827,6 +2836,7 @@ 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>
@@ -2951,6 +2961,7 @@ 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>
@@ -3183,7 +3194,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">Hediye satın al</string>
+    <string name="payment_modal_button_premium_gift">%1$s 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>
@@ -3293,6 +3304,9 @@ 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>
@@ -3315,6 +3329,7 @@ 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>
@@ -3353,20 +3368,41 @@ 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>
@@ -3379,32 +3415,44 @@ 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_mobile">%1$s</string>
+    <string name="premium_guild_subscription_duration">%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_tier_0">Seviye yok</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_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>
@@ -3417,6 +3465,7 @@ 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>
@@ -3431,6 +3480,7 @@ 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>
@@ -3449,10 +3499,26 @@ 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>
@@ -4012,6 +4078,8 @@ 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 c6cb61d0e6..3b6261f858 100644
--- a/com.discord/res/values-uk/plurals.xml
+++ b/com.discord/res/values-uk/plurals.xml
@@ -341,6 +341,14 @@
         <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>
@@ -595,6 +603,11 @@
         <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>
@@ -610,12 +623,17 @@
         <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_mobile_months">
+    <plurals name="premium_guild_subscription_duration_months">
         <item quantity="other">%d місяців</item>
         <item quantity="one">%d місяць</item>
         <item quantity="few">%dмісяці</item>
@@ -642,6 +660,11 @@
         <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 04ab325ec7..395edfe5f0 100644
--- a/com.discord/res/values-uk/strings.xml
+++ b/com.discord/res/values-uk/strings.xml
@@ -640,6 +640,7 @@
     <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,6 +697,8 @@
     <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>
@@ -713,11 +716,13 @@
     <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,10 +744,6 @@
     <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,8 +1803,11 @@ 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>
@@ -2156,7 +2160,9 @@ 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>
@@ -2173,12 +2179,16 @@ 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">Стан прискорення сервера</string>
+    <string name="guild_settings_premium_guild_title">Стан прискорення сервера Nitro</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>
@@ -2188,7 +2198,6 @@ 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>
@@ -2856,6 +2865,7 @@ 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>
@@ -2980,6 +2990,7 @@ 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>
@@ -3212,7 +3223,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">Купити подарунок</string>
+    <string name="payment_modal_button_premium_gift">Купити %1$s</string>
     <string name="payment_modal_one_month">1 місяць</string>
     <string name="payment_modal_one_year">1 рік</string>
     <string name="payment_modal_per_month">За місяць</string>
@@ -3327,6 +3338,9 @@ 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>
@@ -3349,6 +3363,7 @@ 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>
@@ -3387,20 +3402,41 @@ 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>
@@ -3413,32 +3449,44 @@ 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_mobile">%1$s</string>
+    <string name="premium_guild_subscription_duration">%1$s</string>
     <string name="premium_guild_subscription_error_mobile">Під час спроби прискорення виникла помилка. Спробуй ще раз.</string>
     <string name="premium_guild_subscription_error_rate_limit_days">Схоже, ця можливість у тебе на відновленні. Зачекай ще **%1$s та %2$s**, а потім спробуй ще раз.</string>
     <string name="premium_guild_subscription_error_rate_limit_hours">Схоже, ця можливість у тебе на відновленні. Зачекай ще **%1$s та %2$s**, а потім спробуй ще раз.</string>
     <string name="premium_guild_subscription_error_rate_limit_minutes">Схоже, ця можливість у тебе на відновленні. Зачекай ще **%1$s**, а потім спробуй ще раз.</string>
     <string name="premium_guild_subscription_no_next_tier">Цей сервер повністю підсилений! Продовжуй прискорювати!</string>
+    <string name="premium_guild_subscription_notice">"Прискорення сервера Nitro вже тут! Об'єднай свою спільноту, щоб прискорити свій сервер."</string>
     <string name="premium_guild_subscription_notice_button">Дивитися рівні та переваги</string>
+    <string name="premium_guild_subscription_notice_small_guild">"Прискорення сервера Nitro вже тут! Об'єднай своїх друзів, щоб прискорити свій сервер."</string>
     <string name="premium_guild_subscription_remove_button">Відкликати прискорення</string>
     <string name="premium_guild_subscription_remove_error_mobile">Під час спроби відкликати прискорення виникла помилка. Спробуй ще раз.</string>
     <string name="premium_guild_subscription_select_server_button">Вибери сервер</string>
-    <string name="premium_guild_tier_0">Немає рівня</string>
+    <string name="premium_guild_subscription_subscriber_count_tooltip">%1$s</string>
+    <string name="premium_guild_subscription_subtitle">"Використай потужність Nitro, щоб прискорити сервер, до якого ти приєднався! Прискорення сервера дозволяє йому переходити на нові рівні. Кожен рівень надає колективні переваги для всього сервера.
+ Прискорення сервера активує відновлення терміном 7 днів. Ти не зможеш прискорити інший сервер до завершення цього відновлення, навіть якщо ти відкличеш своє поточне прискорення. [Дізнатися більше про прискорення сервера Nitro.](%1$s)"</string>
+    <string name="premium_guild_subscription_subtitle_mobile_1">Використай потужність Nitro, щоб прискорити сервер, до якого ти приєднався! Прискорення сервера дозволяє йому переходити на нові рівні. Кожен рівень надає колективні переваги для всього сервера.</string>
+    <string name="premium_guild_subscription_subtitle_mobile_2">Прискорення сервера активує відновлення з терміном 7 днів. Ти не зможеш прискорити інший сервер до завершення цього відновлення, навіть якщо ти відкликаєш своє поточне прискорення. [Дізнатися більше про прискорення сервера Nitro.](%1$s)</string>
+    <string name="premium_guild_subscription_title">Прискорення сервера Nitro</string>
+    <string name="premium_guild_subscription_tooltip">Прискорення Nitro з %1$s</string>
     <string name="premium_guild_tier_1">Рівень 1</string>
     <string name="premium_guild_tier_2">Рівень 2</string>
     <string name="premium_guild_tier_3">Рівень 3</string>
+    <string name="premium_guild_unsubscribe_confirm_blurb">Ти дійсно хочеш відкликати своє прискорення Nitro з сервера:</string>
     <string name="premium_guild_unsubscribe_confirm_confirmation">Так, відкликати прискорення</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning">Цей сервер утратить прогрес, якщо ти відкликаєш своє прискорення.</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning_days">Цей сервер утратить прогрес, якщо ти відкликаєш своє прискорення. **Твоє прискорення ще відновлюється. Воно буде доступне за %1$s і %2$s.**</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning_hours">Цей сервер утратить прогрес, якщо ти відкликаєш своє прискорення. **Твоє прискорення ще відновлюється. Воно буде доступне за %1$s і %2$s.**</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning_minutes">Цей сервер утратить прогрес, якщо ти відкликаєш своє прискорення. **Твоє прискорення ще відновлюється. Воно буде доступне за %1$s.**</string>
+    <string name="premium_guild_unsubscribe_confirm_header">Відкликати прискорення Nitro?</string>
     <string name="premium_included">До Nitro входить:</string>
     <string name="premium_info_monthly">%1$s (щомісячно) %2$s.</string>
     <string name="premium_month_subscription">**%1$s%2$s %3$s** / Місяць</string>
@@ -3450,6 +3498,7 @@ 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>
@@ -3464,6 +3513,7 @@ 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>
@@ -3483,10 +3533,26 @@ 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>
@@ -4049,6 +4115,8 @@ 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-v21/styles.xml b/com.discord/res/values-v21/styles.xml
index 26a32852ba..99bbb69f7e 100644
--- a/com.discord/res/values-v21/styles.xml
+++ b/com.discord/res/values-v21/styles.xml
@@ -62,6 +62,7 @@
         <item name="status_white_outline">@drawable/drawable_uikit_primary_100_button_outline</item>
         <item name="ternaryCheckboxDisabledColor">@color/primary_630_alpha_60</item>
         <item name="theme_name">dark</item>
+        <item name="toolbarColor">@color/primary_630</item>
     </style>
     <style name="AppTheme.Dialog.Popup" parent="@style/Theme.AppCompat.Dialog">
         <item name="android:windowBackground">@drawable/drawable_bg_dialog_popup</item>
diff --git a/com.discord/res/values-v23/styles.xml b/com.discord/res/values-v23/styles.xml
index a1bea907b1..07ddabe203 100644
--- a/com.discord/res/values-v23/styles.xml
+++ b/com.discord/res/values-v23/styles.xml
@@ -57,6 +57,7 @@
         <item name="status_white_outline">@drawable/drawable_uikit_status_primary_300_button_outline</item>
         <item name="ternaryCheckboxDisabledColor">@color/primary_100_alpha_60</item>
         <item name="theme_name">light</item>
+        <item name="toolbarColor">@color/white</item>
     </style>
     <style name="Base.TextAppearance.AppCompat.Widget.ActionBar.Menu" parent="@android:style/TextAppearance.Material.Widget.ActionBar.Menu" />
     <style name="Base.TextAppearance.AppCompat.Widget.Button.Inverse" parent="@android:style/TextAppearance.Material.Widget.Button.Inverse" />
diff --git a/com.discord/res/values-vi/plurals.xml b/com.discord/res/values-vi/plurals.xml
index 15ed48a188..eabad0cc7d 100644
--- a/com.discord/res/values-vi/plurals.xml
+++ b/com.discord/res/values-vi/plurals.xml
@@ -302,6 +302,14 @@
         <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>
@@ -531,6 +539,10 @@
         <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>
@@ -543,11 +555,15 @@
         <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_mobile_months">
+    <plurals name="premium_guild_subscription_duration_months">
         <item quantity="other">%d Tháng</item>
         <item quantity="one">%d Tháng</item>
     </plurals>
@@ -571,6 +587,10 @@
         <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 1ed89226e1..af7e7e8632 100644
--- a/com.discord/res/values-vi/strings.xml
+++ b/com.discord/res/values-vi/strings.xml
@@ -629,6 +629,7 @@ 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>
@@ -682,6 +683,8 @@ 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>
@@ -699,11 +702,13 @@ 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>
@@ -725,10 +730,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_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>
@@ -1773,8 +1774,11 @@ 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>
@@ -2127,7 +2131,9 @@ 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>
@@ -2144,12 +2150,16 @@ 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ủ</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_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>
@@ -2159,7 +2169,6 @@ Mất đi: %2$s"</string>
 
 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>
@@ -2821,6 +2830,7 @@ 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>
@@ -2943,6 +2953,7 @@ 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>
@@ -3175,7 +3186,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 Quà</string>
+    <string name="payment_modal_button_premium_gift">Mua %1$s</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>
@@ -3285,6 +3296,9 @@ 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>
@@ -3307,6 +3321,7 @@ 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>
@@ -3345,20 +3360,41 @@ 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>
@@ -3371,32 +3407,44 @@ 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_mobile">%1$s</string>
+    <string name="premium_guild_subscription_duration">%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_tier_0">Không Có Cấp</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_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>
@@ -3409,6 +3457,7 @@ 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>
@@ -3423,6 +3472,7 @@ 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>
@@ -3441,10 +3491,26 @@ 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>
@@ -3996,6 +4062,8 @@ 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 3672b9f5d9..fd39c3a6d9 100644
--- a/com.discord/res/values-zh-rCN/plurals.xml
+++ b/com.discord/res/values-zh-rCN/plurals.xml
@@ -302,6 +302,14 @@
         <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>
@@ -531,6 +539,10 @@
         <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>
@@ -543,11 +555,15 @@
         <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_mobile_months">
+    <plurals name="premium_guild_subscription_duration_months">
         <item quantity="other">%d 个月</item>
         <item quantity="one">%d 个月</item>
     </plurals>
@@ -571,6 +587,10 @@
         <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 985ad20a5a..980bd870cf 100644
--- a/com.discord/res/values-zh-rCN/strings.xml
+++ b/com.discord/res/values-zh-rCN/strings.xml
@@ -641,6 +641,7 @@
     <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,6 +699,8 @@
     <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,11 +718,13 @@
     <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>
@@ -741,10 +746,6 @@
     <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>
@@ -1797,8 +1798,11 @@
     <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>
@@ -2152,7 +2156,9 @@
     <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>
@@ -2169,12 +2175,16 @@
     <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">服务器助力状态</string>
+    <string name="guild_settings_premium_guild_title">Nitro 服务器助力状态</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>
@@ -2184,7 +2194,6 @@
 
 如果您拥有网站的用户权限的话，您还可以添加 &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>
@@ -2851,6 +2860,7 @@
     <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>
@@ -2974,6 +2984,7 @@
     <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>
@@ -3207,7 +3218,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">购买礼物</string>
+    <string name="payment_modal_button_premium_gift">购买 %1$s</string>
     <string name="payment_modal_one_month">1 个月</string>
     <string name="payment_modal_one_year">1 年</string>
     <string name="payment_modal_per_month">每月</string>
@@ -3320,6 +3331,9 @@
 您可以随时重新订阅。"</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>
@@ -3342,6 +3356,7 @@
     <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>
@@ -3380,20 +3395,41 @@
     <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>
@@ -3406,32 +3442,44 @@
     <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_mobile">%1$s</string>
+    <string name="premium_guild_subscription_duration">%1$s</string>
     <string name="premium_guild_subscription_error_mobile">尝试助力时出错。请重试。</string>
     <string name="premium_guild_subscription_error_rate_limit_days">看来您还在冷却中。请耐心等待 **%1$s %2$s**，然后再试一次</string>
     <string name="premium_guild_subscription_error_rate_limit_hours">看来您还在冷却中。请耐心等待 **%1$s %2$s**，然后再试一次</string>
     <string name="premium_guild_subscription_error_rate_limit_minutes">看来您还在冷却中。请耐心等待 **%1$s**，然后再试一次</string>
     <string name="premium_guild_subscription_no_next_tier">该服务器已完全充能！继续助力吧！</string>
+    <string name="premium_guild_subscription_notice">Nitro 服务器助力盛大登场啦！动员自己的社区，为您的服务器助力吧。</string>
     <string name="premium_guild_subscription_notice_button">查看等级和特权</string>
+    <string name="premium_guild_subscription_notice_small_guild">Nitro 服务器助力盛大登场啦！动员自己的好友，为您的服务器助力吧。</string>
     <string name="premium_guild_subscription_remove_button">移除助力</string>
     <string name="premium_guild_subscription_remove_error_mobile">在移除助力时出错。请重试。</string>
     <string name="premium_guild_subscription_select_server_button">选择服务器</string>
-    <string name="premium_guild_tier_0">无等级</string>
+    <string name="premium_guild_subscription_subscriber_count_tooltip">%1$s</string>
+    <string name="premium_guild_subscription_subtitle">"使用自己的 Nitro 力量，为您加入的一个服务器助力！服务器获得助力后，就能取得等级进展。每达成一个等级，就能让全服集体享受特权。
+ 进行服务器助力后，会激活为期 7 天的冷却期。在冷却结束之前，即使您移除该服务器的助力，也不能为另一个服务器助力。[了解 Nitro 服务器助力详情。](%1$s)"</string>
+    <string name="premium_guild_subscription_subtitle_mobile_1">使用自己的 Nitro 力量，为您加入的一个服务器助力！服务器获得助力后，就能取得等级进展。每达成一个等级，就能让全服集体享受特权。</string>
+    <string name="premium_guild_subscription_subtitle_mobile_2">进行服务器助力后，会激活为期 7 天的冷却期。在冷却结束之前，即使您移除该服务器的助力，也不能为另一个服务器助力。[了解 Nitro 服务器助力详情。](%1$s)</string>
+    <string name="premium_guild_subscription_title">Nitro 服务器助力</string>
+    <string name="premium_guild_subscription_tooltip">Nitro 助力始于 %1$s</string>
     <string name="premium_guild_tier_1">等级 1</string>
     <string name="premium_guild_tier_2">等级 2</string>
     <string name="premium_guild_tier_3">等级 3</string>
+    <string name="premium_guild_unsubscribe_confirm_blurb">您是否确定要将 Nitro 助力移除出:</string>
     <string name="premium_guild_unsubscribe_confirm_confirmation">是的，移除助力</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning">如果您移除助力，该服务器会损失进度。</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning_days">如果您移除助力，该服务器会损失进度。 **您的助力尚在冷却中。助力将在 %1$s %2$s 后可用。**</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning_hours">如果您移除助力，该服务器会损失进度。 **您的助力尚在冷却中。助力将在 %1$s %2$s 后可用。**</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning_minutes">如果您移除助力，该服务器会损失进度。 **您的助力尚在冷却中。助力将在 %1$s 后可用。**</string>
+    <string name="premium_guild_unsubscribe_confirm_header">要移除 Nitro 助力吗？</string>
     <string name="premium_included">Nitro 中包含：</string>
     <string name="premium_info_monthly">%1$s（月费）将于%2$s收取。</string>
     <string name="premium_month_subscription">**%1$s%2$s %3$s**/ 月</string>
@@ -3444,6 +3492,7 @@
     <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>
@@ -3458,6 +3507,7 @@
     <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>
@@ -3476,10 +3526,26 @@
     <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>
@@ -4040,6 +4106,8 @@ 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 97d67a79a0..00f299dbbd 100644
--- a/com.discord/res/values-zh-rTW/plurals.xml
+++ b/com.discord/res/values-zh-rTW/plurals.xml
@@ -302,6 +302,14 @@
         <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>
@@ -531,6 +539,10 @@
         <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>
@@ -543,11 +555,15 @@
         <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_mobile_months">
+    <plurals name="premium_guild_subscription_duration_months">
         <item quantity="other">%d 個月</item>
         <item quantity="one">%d 個月</item>
     </plurals>
@@ -571,6 +587,10 @@
         <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 346f390844..0ff00c0e23 100644
--- a/com.discord/res/values-zh-rTW/strings.xml
+++ b/com.discord/res/values-zh-rTW/strings.xml
@@ -639,6 +639,7 @@
     <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,6 +698,8 @@
     <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,11 +717,13 @@
     <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,10 +745,6 @@
     <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>
@@ -1799,8 +1800,11 @@
     <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>
@@ -2155,7 +2159,9 @@
     <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>
@@ -2172,12 +2178,16 @@
     <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">伺服器加成狀態</string>
+    <string name="guild_settings_premium_guild_title">Nitro 伺服器加成狀態</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,7 +2197,6 @@
 
 如果您擁有存取個人網站的權限，您便可以變動增加 &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>
@@ -2853,6 +2862,7 @@
     <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>
@@ -2976,6 +2986,7 @@
     <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>
@@ -3209,7 +3220,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">購買禮物</string>
+    <string name="payment_modal_button_premium_gift">購買 %1$s</string>
     <string name="payment_modal_one_month">1 個月</string>
     <string name="payment_modal_one_year">1 年</string>
     <string name="payment_modal_per_month">每個月</string>
@@ -3319,6 +3330,9 @@
 您可於任何時候重啟您的訂閱。"</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>
@@ -3341,6 +3355,7 @@
     <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>
@@ -3379,20 +3394,41 @@
     <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>
@@ -3405,32 +3441,44 @@
     <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_mobile">%1$s</string>
+    <string name="premium_guild_subscription_duration">%1$s</string>
     <string name="premium_guild_subscription_error_mobile">試圖加成時發生錯誤，請重試。</string>
     <string name="premium_guild_subscription_error_rate_limit_days">看來您還處於冷卻時間。請等到 **%1$s %2$s**後再試一次</string>
     <string name="premium_guild_subscription_error_rate_limit_hours">看來您還處於冷卻時間。請等到 **%1$s %2$s**後再試一次</string>
     <string name="premium_guild_subscription_error_rate_limit_minutes">看來您還處於冷卻時間。請等到 **%1$s**後再試一次</string>
     <string name="premium_guild_subscription_no_next_tier">這個伺服器已經能量滿滿！繼續加成吧！</string>
+    <string name="premium_guild_subscription_notice">Nitro 伺服器加成來了！集結您的社群成員一起加成伺服器吧。</string>
     <string name="premium_guild_subscription_notice_button">查看等級與福利</string>
+    <string name="premium_guild_subscription_notice_small_guild">Nitro 伺服器加成來了！集結您的好友一起加成伺服器吧。</string>
     <string name="premium_guild_subscription_remove_button">移除加成</string>
     <string name="premium_guild_subscription_remove_error_mobile">試圖移除加成時發生錯誤，請重試。</string>
     <string name="premium_guild_subscription_select_server_button">選擇伺服器</string>
-    <string name="premium_guild_tier_0">沒有等級</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_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>
@@ -3443,6 +3491,7 @@
     <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>
@@ -3457,6 +3506,7 @@
     <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>
@@ -3475,10 +3525,26 @@
     <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>
@@ -4041,6 +4107,8 @@
     <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 653ca85857..4b58e2ba20 100644
--- a/com.discord/res/values/attrs.xml
+++ b/com.discord/res/values/attrs.xml
@@ -895,7 +895,6 @@
     </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" />
@@ -1390,6 +1389,7 @@
     <attr name="titleTextAppearance" format="reference" />
     <attr name="titleTextColor" format="color" />
     <attr name="titleTextStyle" format="reference" />
+    <attr name="toolbarColor" format="reference|color" />
     <attr name="toolbarId" format="reference" />
     <attr name="toolbarNavigationButtonStyle" format="reference" />
     <attr name="toolbarStyle" format="reference" />
diff --git a/com.discord/res/values/colors.xml b/com.discord/res/values/colors.xml
index 43d940bd01..c27f427862 100644
--- a/com.discord/res/values/colors.xml
+++ b/com.discord/res/values/colors.xml
@@ -19,7 +19,6 @@
     <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 e03e3b5dc1..f96806c9ec 100644
--- a/com.discord/res/values/ids.xml
+++ b/com.discord/res/values/ids.xml
@@ -116,7 +116,6 @@
     <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" />
@@ -212,6 +211,7 @@
     <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" />
@@ -521,7 +521,6 @@
     <item type="id" name="connected_account_divider" />
     <item type="id" name="connected_account_extra_info" />
     <item type="id" name="connected_account_img" />
-    <item type="id" name="connected_account_link_img" />
     <item type="id" name="connected_account_name" />
     <item type="id" name="connected_account_sync_friends_switch" />
     <item type="id" name="connected_list_header" />
@@ -750,10 +749,6 @@
     <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" />
@@ -1077,15 +1072,7 @@
     <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" />
-    <item type="id" name="menu_user_profile_ignore" />
-    <item type="id" name="menu_user_profile_message" />
-    <item type="id" name="menu_user_profile_remove_friend" />
-    <item type="id" name="menu_user_profile_unblock" />
     <item type="id" name="message" />
     <item type="id" name="mfa_description_text" />
     <item type="id" name="mfa_download_body" />
@@ -1172,7 +1159,6 @@
     <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" />
@@ -1227,7 +1213,6 @@
     <item type="id" name="perm_req_text" />
     <item type="id" name="permissions_container" />
     <item type="id" name="permissions_req_btn" />
-    <item type="id" name="platform_identities_list" />
     <item type="id" name="popup_attachment" />
     <item type="id" name="popup_body" />
     <item type="id" name="popup_close_btn" />
@@ -1304,16 +1289,6 @@
     <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" />
@@ -1726,12 +1701,6 @@
     <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" />
@@ -1752,15 +1721,6 @@
     <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" />
@@ -1850,11 +1810,6 @@
     <item type="id" name="user_captcha_verify_button" />
     <item type="id" name="user_captcha_verify_button_anchor" />
     <item type="id" name="user_captcha_verify_button_cancel" />
-    <item type="id" name="user_info_activity_divider" />
-    <item type="id" name="user_info_identities_divider" />
-    <item type="id" name="user_info_identities_header" />
-    <item type="id" name="user_info_notes" />
-    <item type="id" name="user_info_rich_presence_container" />
     <item type="id" name="user_limit_seekbar" />
     <item type="id" name="user_list_item_avatar" />
     <item type="id" name="user_list_item_name" />
@@ -1866,9 +1821,7 @@
     <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" />
@@ -1900,24 +1853,14 @@
     <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" />
-    <item type="id" name="user_profile_friend_request_incoming_container" />
-    <item type="id" name="user_profile_friend_request_sent_btn" />
     <item type="id" name="user_profile_header_badges_recycler" />
     <item type="id" name="user_profile_header_custom_status" />
     <item type="id" name="user_profile_header_name_wrap" />
     <item type="id" name="user_profile_header_primary_name" />
     <item type="id" name="user_profile_header_secondary_name" />
-    <item type="id" name="user_profile_header_view" />
-    <item type="id" name="user_profile_send_message_fab" />
-    <item type="id" name="user_profile_view_pager" />
     <item type="id" name="user_selected_checkbox" />
     <item type="id" name="user_settings_mfa_enable_input_digits" />
     <item type="id" name="user_settings_profile_header_view" />
-    <item type="id" name="user_sheet_actions_divider" />
-    <item type="id" name="user_sheet_actions_header" />
     <item type="id" name="user_sheet_activity_divider" />
     <item type="id" name="user_sheet_add_friend_action_button" />
     <item type="id" name="user_sheet_admin_view" />
@@ -1946,7 +1889,6 @@
     <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" />
     <item type="id" name="user_sheet_profile_actions_divider" />
     <item type="id" name="user_sheet_profile_header_view" />
@@ -2013,7 +1955,6 @@
     <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 f916af0ea7..528ee1188d 100644
--- a/com.discord/res/values/plurals.xml
+++ b/com.discord/res/values/plurals.xml
@@ -88,10 +88,6 @@
         <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>
@@ -459,10 +455,6 @@
         <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>
@@ -583,25 +575,12 @@
         <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_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">
+    <plurals name="premium_guild_perks_modal_header_boost_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">
@@ -624,22 +603,6 @@
         <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>
@@ -664,17 +627,9 @@
         <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>
-    </plurals>
-    <plurals name="premium_guild_subscriptions_renewal_info_quantity">
-        <item quantity="other">Server Boosts</item>
-        <item quantity="one">Server Boost</item>
+        <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 days</item>
@@ -802,8 +757,8 @@
         <item quantity="other">%d People</item>
         <item quantity="one">%d Person</item>
     </plurals>
-    <item type="plurals" name="APKTOOL_DUMMY_72">false</item>
-    <item type="plurals" name="APKTOOL_DUMMY_85">false</item>
-    <item type="plurals" name="APKTOOL_DUMMY_b9">false</item>
-    <item type="plurals" name="APKTOOL_DUMMY_ba">false</item>
+    <item type="plurals" name="APKTOOL_DUMMY_70">false</item>
+    <item type="plurals" name="APKTOOL_DUMMY_83">false</item>
+    <item type="plurals" name="APKTOOL_DUMMY_ae">false</item>
+    <item type="plurals" name="APKTOOL_DUMMY_af">false</item>
 </resources>
diff --git a/com.discord/res/values/public.xml b/com.discord/res/values/public.xml
index 7c7f58c309..9ad55f492d 100644
--- a/com.discord/res/values/public.xml
+++ b/com.discord/res/values/public.xml
@@ -671,379 +671,379 @@
     <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_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="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="toolbarColor" id="0x7f0403c9" />
     <public type="attr" name="toolbarId" id="0x7f0403ca" />
     <public type="attr" name="toolbarNavigationButtonStyle" id="0x7f0403cb" />
     <public type="attr" name="toolbarStyle" id="0x7f0403cc" />
@@ -1139,313 +1139,312 @@
     <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_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="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="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" />
@@ -1802,1178 +1801,1163 @@
     <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="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="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="0x7f080386" />
+    <public type="drawable" name="ic_trash_outline" id="0x7f080399" />
+    <public type="drawable" name="img_gifting_pattern_bg_dark" id="0x7f080426" />
+    <public type="drawable" name="img_gifting_pattern_bg_light" id="0x7f080427" />
+    <public type="drawable" name="img_nitro_classic_pattern" id="0x7f08043b" />
+    <public type="drawable" name="mtrl_snackbar_background" id="0x7f080460" />
+    <public type="drawable" name="mtrl_tabs_default_indicator" id="0x7f080461" />
+    <public type="drawable" name="navigation_empty_icon" id="0x7f080462" />
+    <public type="drawable" name="notification_bg" id="0x7f080464" />
+    <public type="drawable" name="notification_bg_low" id="0x7f080465" />
+    <public type="drawable" name="notification_icon_background" id="0x7f08046a" />
+    <public type="drawable" name="notification_template_icon_bg" id="0x7f08046b" />
+    <public type="drawable" name="notification_template_icon_low_bg" id="0x7f08046c" />
+    <public type="drawable" name="notification_tile_bg" id="0x7f08046d" />
+    <public type="drawable" name="reactions_divider" id="0x7f08046f" />
+    <public type="drawable" name="rich_presence_spotify_play_button" id="0x7f080470" />
+    <public type="drawable" name="tab_dot_selector" id="0x7f080473" />
+    <public type="drawable" name="tab_indicator_default" id="0x7f080474" />
+    <public type="drawable" name="tab_indicator_selected" id="0x7f080475" />
+    <public type="drawable" name="tooltip_frame_dark" id="0x7f080476" />
+    <public type="drawable" name="tooltip_frame_light" id="0x7f080477" />
+    <public type="drawable" name="trash_bg" id="0x7f080478" />
+    <public type="drawable" name="ucrop_shadow_upside" id="0x7f080481" />
+    <public type="drawable" name="ucrop_vector_ic_crop" id="0x7f080482" />
+    <public type="drawable" name="ucrop_vector_loader" id="0x7f080483" />
+    <public type="drawable" name="ucrop_vector_loader_animated" id="0x7f080484" />
     <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="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="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="0x7f080463" />
+    <public type="drawable" name="ripple_brighten" id="0x7f080471" />
+    <public type="drawable" name="ripple_darken" id="0x7f080472" />
+    <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_white_24dp" id="0x7f080381" />
+    <public type="drawable" name="ic_swap_vertical_circle_grey_a60_24dp" id="0x7f080382" />
+    <public type="drawable" name="ic_swap_vertical_circle_white_a60_24dp" id="0x7f080383" />
+    <public type="drawable" name="ic_switch_camera_grey_24dp" id="0x7f080384" />
+    <public type="drawable" name="ic_switch_camera_white_24dp" id="0x7f080385" />
+    <public type="drawable" name="ic_text_channel_grey_24dp" id="0x7f08038e" />
+    <public type="drawable" name="ic_text_channel_white_24dp" id="0x7f08038f" />
+    <public type="drawable" name="ic_text_image_dark_a60_24dp" id="0x7f080390" />
+    <public type="drawable" name="ic_text_image_light_a60_24dp" id="0x7f080391" />
+    <public type="drawable" name="ic_theme_dark_a60_24dp" id="0x7f080392" />
+    <public type="drawable" name="ic_theme_light_a60_24dp" id="0x7f080393" />
+    <public type="drawable" name="ic_timer_dark" id="0x7f080394" />
+    <public type="drawable" name="ic_timer_grey_a60_24dp" id="0x7f080395" />
+    <public type="drawable" name="ic_timer_light" id="0x7f080396" />
+    <public type="drawable" name="ic_timer_white_a60_24dp" id="0x7f080397" />
+    <public type="drawable" name="ic_transfer_red_24dp" id="0x7f080398" />
+    <public type="drawable" name="ic_twitch_white_24dp" id="0x7f08039a" />
+    <public type="drawable" name="ic_twitter_white_18dp" id="0x7f08039b" />
+    <public type="drawable" name="ic_twitter_white_24dp" id="0x7f08039c" />
+    <public type="drawable" name="ic_unban_grey" id="0x7f08039e" />
+    <public type="drawable" name="ic_unread_white_9dp" id="0x7f08039f" />
+    <public type="drawable" name="ic_unread_white_9dp_horiz" id="0x7f0803a0" />
+    <public type="drawable" name="ic_upload_24dp" id="0x7f0803a1" />
+    <public type="drawable" name="ic_upload_image_34dp" id="0x7f0803a2" />
+    <public type="drawable" name="ic_upload_image_40dp" id="0x7f0803a3" />
+    <public type="drawable" name="ic_uploads_file_dark" id="0x7f0803a4" />
+    <public type="drawable" name="ic_uploads_file_light" id="0x7f0803a5" />
+    <public type="drawable" name="ic_uploads_generic_dark" id="0x7f0803a6" />
+    <public type="drawable" name="ic_uploads_generic_light" id="0x7f0803a7" />
+    <public type="drawable" name="ic_uploads_image_dark" id="0x7f0803a8" />
+    <public type="drawable" name="ic_uploads_image_light" id="0x7f0803a9" />
+    <public type="drawable" name="ic_uploads_video_dark" id="0x7f0803aa" />
+    <public type="drawable" name="ic_uploads_video_light" id="0x7f0803ab" />
+    <public type="drawable" name="ic_user_actions_block_grey_a60_24dp" id="0x7f0803ac" />
+    <public type="drawable" name="ic_user_actions_block_white_a60_24dp" id="0x7f0803ad" />
+    <public type="drawable" name="ic_user_actions_remove_friend_grey_a60_24dp" id="0x7f0803ae" />
+    <public type="drawable" name="ic_user_actions_remove_friend_white_a60_24dp" id="0x7f0803af" />
+    <public type="drawable" name="ic_user_actions_unblock_grey_a60_24dp" id="0x7f0803b0" />
+    <public type="drawable" name="ic_user_actions_unblock_white_a60_24dp" id="0x7f0803b1" />
+    <public type="drawable" name="ic_user_premium_guild_subscription" id="0x7f0803b2" />
+    <public type="drawable" name="ic_user_profile_action_add_friend" id="0x7f0803b3" />
+    <public type="drawable" name="ic_user_profile_action_call_grey_a60_24dp" id="0x7f0803b4" />
+    <public type="drawable" name="ic_user_profile_action_call_white_a60_24dp" id="0x7f0803b5" />
+    <public type="drawable" name="ic_user_profile_action_message_grey_a60_24dp" id="0x7f0803b6" />
+    <public type="drawable" name="ic_user_profile_action_message_white_a60_24dp" id="0x7f0803b7" />
+    <public type="drawable" name="ic_user_profile_action_pending" id="0x7f0803b8" />
+    <public type="drawable" name="ic_user_profile_action_video_grey_a60_24dp" id="0x7f0803b9" />
+    <public type="drawable" name="ic_user_profile_action_video_white_a60_24dp" id="0x7f0803ba" />
+    <public type="drawable" name="ic_verified_badge" id="0x7f0803bb" />
+    <public type="drawable" name="ic_verified_badge_banner" id="0x7f0803bc" />
+    <public type="drawable" name="ic_videocam_dark_grey_24dp" id="0x7f0803bd" />
+    <public type="drawable" name="ic_videocam_grey_24dp" id="0x7f0803be" />
+    <public type="drawable" name="ic_videocam_off_grey_24dp" id="0x7f0803bf" />
+    <public type="drawable" name="ic_videocam_off_white_24dp" id="0x7f0803c0" />
+    <public type="drawable" name="ic_videocam_white_24dp" id="0x7f0803c1" />
+    <public type="drawable" name="ic_visibility_grey_24dp" id="0x7f0803c2" />
+    <public type="drawable" name="ic_visibility_off_grey_a60_24dp" id="0x7f0803c3" />
+    <public type="drawable" name="ic_visibility_off_white_a60_24dp" id="0x7f0803c4" />
+    <public type="drawable" name="ic_visibility_white_24dp" id="0x7f0803c5" />
+    <public type="drawable" name="ic_voice_channel_streaming" id="0x7f0803c6" />
+    <public type="drawable" name="ic_voice_quality_average" id="0x7f0803c7" />
+    <public type="drawable" name="ic_voice_quality_bad" id="0x7f0803c8" />
+    <public type="drawable" name="ic_voice_quality_fine" id="0x7f0803c9" />
+    <public type="drawable" name="ic_voice_quality_unknown" id="0x7f0803ca" />
+    <public type="drawable" name="ic_voice_settings_dark_a60_24dp" id="0x7f0803cb" />
+    <public type="drawable" name="ic_voice_settings_light_a60_24dp" id="0x7f0803cc" />
+    <public type="drawable" name="ic_volume_mute_grey_a60_24dp" id="0x7f0803cd" />
+    <public type="drawable" name="ic_volume_mute_white_a60_24dp" id="0x7f0803ce" />
+    <public type="drawable" name="ic_volume_up_dark_grey_24dp" id="0x7f0803cf" />
+    <public type="drawable" name="ic_volume_up_dark_grey_a30_24dp" id="0x7f0803d0" />
+    <public type="drawable" name="ic_volume_up_grey_24dp" id="0x7f0803d1" />
+    <public type="drawable" name="ic_volume_up_grey_a60_24dp" id="0x7f0803d2" />
+    <public type="drawable" name="ic_volume_up_white_24dp" id="0x7f0803d3" />
+    <public type="drawable" name="ic_volume_up_white_a30_24dp" id="0x7f0803d4" />
+    <public type="drawable" name="ic_volume_up_white_a60_24dp" id="0x7f0803d5" />
+    <public type="drawable" name="ic_xbox_white_24dp" id="0x7f0803d6" />
+    <public type="drawable" name="ic_youtube_gaming_white_24dp" id="0x7f0803d7" />
+    <public type="drawable" name="img_addfriends_empty_dark" id="0x7f080402" />
+    <public type="drawable" name="img_addfriends_empty_light" id="0x7f080403" />
+    <public type="drawable" name="img_addfriends_notconnected_dark" id="0x7f080404" />
+    <public type="drawable" name="img_addfriends_notconnected_light" id="0x7f080405" />
+    <public type="drawable" name="img_animated_emoji_upsell" id="0x7f080406" />
+    <public type="drawable" name="img_auth_logo_x_samsung" id="0x7f08040e" />
+    <public type="drawable" name="img_avatar_upsell" id="0x7f08040f" />
+    <public type="drawable" name="img_baddies_dark_theme" id="0x7f080410" />
+    <public type="drawable" name="img_baddies_light_theme" id="0x7f080411" />
+    <public type="drawable" name="img_badge_upsell" id="0x7f080412" />
+    <public type="drawable" name="img_discord_nitro_logo_left" id="0x7f080413" />
+    <public type="drawable" name="img_empty_friends_no_suggestions_dark" id="0x7f080414" />
+    <public type="drawable" name="img_empty_friends_no_suggestions_light" id="0x7f080415" />
+    <public type="drawable" name="img_empty_friends_none_blocked_dark" id="0x7f080416" />
+    <public type="drawable" name="img_empty_friends_none_blocked_light" id="0x7f080417" />
+    <public type="drawable" name="img_empty_friends_none_dark" id="0x7f080418" />
+    <public type="drawable" name="img_empty_friends_none_light" id="0x7f080419" />
+    <public type="drawable" name="img_empty_friends_none_online_dark" id="0x7f08041a" />
+    <public type="drawable" name="img_empty_friends_none_online_light" id="0x7f08041b" />
+    <public type="drawable" name="img_empty_friends_none_pending_dark" id="0x7f08041c" />
+    <public type="drawable" name="img_empty_friends_none_pending_light" id="0x7f08041d" />
+    <public type="drawable" name="img_empty_server_settings_emoji_dark" id="0x7f08041f" />
+    <public type="drawable" name="img_empty_server_settings_emoji_light" id="0x7f080420" />
+    <public type="drawable" name="img_empty_server_settings_invites_dark" id="0x7f080421" />
+    <public type="drawable" name="img_empty_server_settings_invites_light" id="0x7f080422" />
+    <public type="drawable" name="img_forced_update_dark" id="0x7f080423" />
+    <public type="drawable" name="img_forced_update_light" id="0x7f080424" />
+    <public type="drawable" name="img_global_emoji_upsell" id="0x7f08042a" />
+    <public type="drawable" name="img_guild_use_cases" id="0x7f08042b" />
+    <public type="drawable" name="img_item_shop_dark" id="0x7f08042c" />
+    <public type="drawable" name="img_logo_discord_nitro" id="0x7f08042e" />
+    <public type="drawable" name="img_logo_discord_nitro_brand" id="0x7f08042f" />
+    <public type="drawable" name="img_logo_discord_nitro_classic" id="0x7f080430" />
+    <public type="drawable" name="img_logo_nitro" id="0x7f080431" />
+    <public type="drawable" name="img_logo_nitro_classic" id="0x7f080432" />
+    <public type="drawable" name="img_logo_nitro_classic_brand" id="0x7f080433" />
+    <public type="drawable" name="img_logo_nitro_classic_header" id="0x7f080434" />
+    <public type="drawable" name="img_logo_square" id="0x7f080435" />
+    <public type="drawable" name="img_mfa_dark" id="0x7f080436" />
+    <public type="drawable" name="img_mfa_light" id="0x7f080437" />
+    <public type="drawable" name="img_new_tos_dark_theme" id="0x7f080438" />
+    <public type="drawable" name="img_new_tos_light_theme" id="0x7f080439" />
+    <public type="drawable" name="img_nitro_broken_wheel" id="0x7f08043a" />
+    <public type="drawable" name="img_nitro_pattern" id="0x7f08043c" />
+    <public type="drawable" name="img_no_gifts" id="0x7f08043f" />
+    <public type="drawable" name="img_no_mutual_friends_dark" id="0x7f080440" />
+    <public type="drawable" name="img_no_mutual_friends_light" id="0x7f080441" />
+    <public type="drawable" name="img_no_mutual_servers_dark" id="0x7f080442" />
+    <public type="drawable" name="img_no_mutual_servers_light" id="0x7f080443" />
+    <public type="drawable" name="img_no_stream_preview" id="0x7f080444" />
+    <public type="drawable" name="img_no_text_channels_dark" id="0x7f080445" />
+    <public type="drawable" name="img_no_text_channels_light" id="0x7f080446" />
+    <public type="drawable" name="img_nsfw_dark_theme" id="0x7f080447" />
+    <public type="drawable" name="img_nsfw_light_theme" id="0x7f080448" />
+    <public type="drawable" name="img_plus_illo" id="0x7f08044b" />
+    <public type="drawable" name="img_poop_dark" id="0x7f08044c" />
+    <public type="drawable" name="img_poop_light" id="0x7f08044d" />
+    <public type="drawable" name="img_quick_switcher_empty" id="0x7f08044e" />
+    <public type="drawable" name="img_server_nitro_status" id="0x7f08044f" />
+    <public type="drawable" name="img_tag_upsell" id="0x7f080450" />
+    <public type="drawable" name="img_upload_upsell" id="0x7f080451" />
+    <public type="drawable" name="img_verify_email_dark_theme" id="0x7f080452" />
+    <public type="drawable" name="img_verify_email_light_theme" id="0x7f080453" />
+    <public type="drawable" name="img_verify_phone_dark_theme" id="0x7f080454" />
+    <public type="drawable" name="img_verify_phone_light_theme" id="0x7f080455" />
+    <public type="drawable" name="img_wumpus_ball_dark" id="0x7f080459" />
+    <public type="drawable" name="img_wumpus_ball_light" id="0x7f08045a" />
+    <public type="drawable" name="img_wumpus_game_launcher" id="0x7f08045b" />
+    <public type="drawable" name="img_wumpus_jetpack" id="0x7f08045c" />
+    <public type="drawable" name="img_wumpus_riding_wheel" id="0x7f08045d" />
+    <public type="drawable" name="img_wumpus_tophat_dark" id="0x7f08045e" />
+    <public type="drawable" name="img_wumpus_tophat_light" id="0x7f08045f" />
+    <public type="drawable" name="ucrop_ic_angle" id="0x7f080479" />
+    <public type="drawable" name="ucrop_ic_crop" id="0x7f08047a" />
+    <public type="drawable" name="ucrop_ic_cross" id="0x7f08047b" />
+    <public type="drawable" name="ucrop_ic_done" id="0x7f08047c" />
+    <public type="drawable" name="ucrop_ic_next" id="0x7f08047d" />
+    <public type="drawable" name="ucrop_ic_reset" id="0x7f08047e" />
+    <public type="drawable" name="ucrop_ic_rotate" id="0x7f08047f" />
+    <public type="drawable" name="ucrop_ic_scale" id="0x7f080480" />
+    <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="0x7f080466" />
+    <public type="drawable" name="notification_bg_low_pressed" id="0x7f080467" />
+    <public type="drawable" name="notification_bg_normal" id="0x7f080468" />
+    <public type="drawable" name="notification_bg_normal_pressed" id="0x7f080469" />
+    <public type="drawable" name="notify_panel_notification_icon_bg" id="0x7f08046e" />
+    <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="0x7f080458" />
+    <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="0x7f080387" />
+    <public type="drawable" name="ic_ternary_neutral_unchecked" id="0x7f080388" />
+    <public type="drawable" name="ic_ternary_off_checked" id="0x7f080389" />
+    <public type="drawable" name="ic_ternary_off_disabled" id="0x7f08038a" />
+    <public type="drawable" name="ic_ternary_off_unchecked" id="0x7f08038b" />
+    <public type="drawable" name="ic_ternary_on_checked" id="0x7f08038c" />
+    <public type="drawable" name="ic_ternary_on_unchecked" id="0x7f08038d" />
+    <public type="drawable" name="img_empty_no_connections" id="0x7f08041e" />
+    <public type="drawable" name="img_nitro_splash_dark" id="0x7f08043d" />
+    <public type="drawable" name="img_nitro_splash_light" id="0x7f08043e" />
+    <public type="drawable" name="img_permission_prime" id="0x7f08044a" />
+    <public type="drawable" name="img_voice_no_connections_dark" id="0x7f080456" />
+    <public type="drawable" name="img_voice_no_connections_light" id="0x7f080457" />
+    <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="0x7f08039d" />
+    <public type="drawable" name="icon_flag_au" id="0x7f0803da" />
+    <public type="drawable" name="icon_flag_bg" id="0x7f0803db" />
+    <public type="drawable" name="icon_flag_cs" id="0x7f0803dc" />
+    <public type="drawable" name="icon_flag_da" id="0x7f0803dd" />
+    <public type="drawable" name="icon_flag_de" id="0x7f0803de" />
+    <public type="drawable" name="icon_flag_el" id="0x7f0803df" />
+    <public type="drawable" name="icon_flag_en_gb" id="0x7f0803e0" />
+    <public type="drawable" name="icon_flag_en_us" id="0x7f0803e1" />
+    <public type="drawable" name="icon_flag_es_es" id="0x7f0803e2" />
+    <public type="drawable" name="icon_flag_eu" id="0x7f0803e3" />
+    <public type="drawable" name="icon_flag_fi" id="0x7f0803e4" />
+    <public type="drawable" name="icon_flag_fr" id="0x7f0803e5" />
+    <public type="drawable" name="icon_flag_gb" id="0x7f0803e6" />
+    <public type="drawable" name="icon_flag_hk" id="0x7f0803e7" />
+    <public type="drawable" name="icon_flag_hr" id="0x7f0803e8" />
+    <public type="drawable" name="icon_flag_hu" id="0x7f0803e9" />
+    <public type="drawable" name="icon_flag_it" id="0x7f0803ea" />
+    <public type="drawable" name="icon_flag_ja" id="0x7f0803eb" />
+    <public type="drawable" name="icon_flag_ko" id="0x7f0803ec" />
+    <public type="drawable" name="icon_flag_lt" id="0x7f0803ed" />
+    <public type="drawable" name="icon_flag_nl" id="0x7f0803ee" />
+    <public type="drawable" name="icon_flag_no" id="0x7f0803ef" />
+    <public type="drawable" name="icon_flag_pl" id="0x7f0803f0" />
+    <public type="drawable" name="icon_flag_pt_br" id="0x7f0803f1" />
+    <public type="drawable" name="icon_flag_ro" id="0x7f0803f2" />
+    <public type="drawable" name="icon_flag_ru" id="0x7f0803f3" />
+    <public type="drawable" name="icon_flag_sg" id="0x7f0803f4" />
+    <public type="drawable" name="icon_flag_sv_se" id="0x7f0803f5" />
+    <public type="drawable" name="icon_flag_th" id="0x7f0803f6" />
+    <public type="drawable" name="icon_flag_tr" id="0x7f0803f7" />
+    <public type="drawable" name="icon_flag_uk" id="0x7f0803f8" />
+    <public type="drawable" name="icon_flag_unknown" id="0x7f0803f9" />
+    <public type="drawable" name="icon_flag_vi" id="0x7f0803fa" />
+    <public type="drawable" name="icon_flag_zh_cn" id="0x7f0803fb" />
+    <public type="drawable" name="icon_flag_zh_tw" id="0x7f0803fc" />
+    <public type="drawable" name="img_auth_bg_dark" id="0x7f080409" />
+    <public type="drawable" name="img_auth_bg_light" id="0x7f08040a" />
+    <public type="drawable" name="img_gifting_pattern_dark" id="0x7f080428" />
+    <public type="drawable" name="img_gifting_pattern_light" id="0x7f080429" />
+    <public type="drawable" name="img_loading_clyde" id="0x7f08042d" />
+    <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="0x7f0803d8" />
+    <public type="drawable" name="icon_deafened_small" id="0x7f0803d9" />
+    <public type="drawable" name="icon_friends_list" id="0x7f0803fd" />
+    <public type="drawable" name="icon_menu_copy" id="0x7f0803fe" />
+    <public type="drawable" name="icon_more" id="0x7f0803ff" />
+    <public type="drawable" name="icon_muted_small" id="0x7f080400" />
+    <public type="drawable" name="icon_save" id="0x7f080401" />
+    <public type="drawable" name="img_auth_bg_bl" id="0x7f080407" />
+    <public type="drawable" name="img_auth_bg_br" id="0x7f080408" />
+    <public type="drawable" name="img_auth_bg_tr" id="0x7f08040b" />
+    <public type="drawable" name="img_auth_logo" id="0x7f08040c" />
+    <public type="drawable" name="img_auth_logo_small" id="0x7f08040d" />
+    <public type="drawable" name="img_game_presence_nux" id="0x7f080425" />
+    <public type="drawable" name="img_overlay_nux" id="0x7f080449" />
     <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="$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="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="font" name="sourcecodepro_semibold" id="0x7f090000" />
     <public type="font" name="whitney_bold" id="0x7f090001" />
     <public type="font" name="whitney_medium" id="0x7f090002" />
@@ -3105,111 +3089,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="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="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="boost_info_container" id="0x7f0a00e8" />
     <public type="id" name="boost_info_text" id="0x7f0a00e9" />
     <public type="id" name="boost_remove_confirmation_avatar" id="0x7f0a00ea" />
@@ -3533,1634 +3517,1575 @@
     <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="id" name="connected_account_name" id="0x7f0a022b" />
+    <public type="id" name="connected_account_sync_friends_switch" id="0x7f0a022c" />
+    <public type="id" name="connected_list_header" id="0x7f0a022d" />
+    <public type="id" name="connections_empty" id="0x7f0a022e" />
+    <public type="id" name="connections_recycler" id="0x7f0a022f" />
+    <public type="id" name="connections_xbox_digits" id="0x7f0a0230" />
+    <public type="id" name="connections_xbox_login" id="0x7f0a0231" />
+    <public type="id" name="container" id="0x7f0a0232" />
+    <public type="id" name="content" id="0x7f0a0233" />
+    <public type="id" name="contentPanel" id="0x7f0a0234" />
+    <public type="id" name="content_iv" id="0x7f0a0235" />
+    <public type="id" name="content_pager" id="0x7f0a0236" />
+    <public type="id" name="content_tabs" id="0x7f0a0237" />
+    <public type="id" name="continuous" id="0x7f0a0238" />
+    <public type="id" name="coordinator" id="0x7f0a0239" />
+    <public type="id" name="create_channel_name" id="0x7f0a023a" />
+    <public type="id" name="create_channel_name_layout" id="0x7f0a023b" />
+    <public type="id" name="create_channel_private_container" id="0x7f0a023c" />
+    <public type="id" name="create_channel_private_info" id="0x7f0a023d" />
+    <public type="id" name="create_channel_private_switch" id="0x7f0a023e" />
+    <public type="id" name="create_channel_private_title" id="0x7f0a023f" />
+    <public type="id" name="create_channel_role_access_recycler" id="0x7f0a0240" />
+    <public type="id" name="create_channel_role_header" id="0x7f0a0241" />
+    <public type="id" name="create_channel_text_container" id="0x7f0a0242" />
+    <public type="id" name="create_channel_text_radio" id="0x7f0a0243" />
+    <public type="id" name="create_channel_type_container" id="0x7f0a0244" />
+    <public type="id" name="create_channel_voice_container" id="0x7f0a0245" />
+    <public type="id" name="create_channel_voice_radio" id="0x7f0a0246" />
+    <public type="id" name="credit_header" id="0x7f0a0247" />
+    <public type="id" name="credit_icon" id="0x7f0a0248" />
+    <public type="id" name="credit_info" id="0x7f0a0249" />
+    <public type="id" name="credit_info_container" id="0x7f0a024a" />
+    <public type="id" name="credit_nitro" id="0x7f0a024b" />
+    <public type="id" name="credit_nitro_classic" id="0x7f0a024c" />
+    <public type="id" name="credit_nitro_divider" id="0x7f0a024d" />
+    <public type="id" name="credit_time" id="0x7f0a024e" />
+    <public type="id" name="current_bitrate_display" id="0x7f0a024f" />
+    <public type="id" name="current_user_limit_display" id="0x7f0a0250" />
+    <public type="id" name="custom" id="0x7f0a0251" />
+    <public type="id" name="customPanel" id="0x7f0a0252" />
+    <public type="id" name="dark" id="0x7f0a0253" />
+    <public type="id" name="debugging_item_log_message" id="0x7f0a0254" />
+    <public type="id" name="debugging_logs" id="0x7f0a0255" />
+    <public type="id" name="decor_content_parent" id="0x7f0a0256" />
+    <public type="id" name="default_activity_button" id="0x7f0a0257" />
+    <public type="id" name="design_bottom_sheet" id="0x7f0a0258" />
+    <public type="id" name="design_menu_item_action_area" id="0x7f0a0259" />
+    <public type="id" name="design_menu_item_action_area_stub" id="0x7f0a025a" />
+    <public type="id" name="design_menu_item_text" id="0x7f0a025b" />
+    <public type="id" name="design_navigation_view" id="0x7f0a025c" />
+    <public type="id" name="dialog_button" id="0x7f0a025d" />
+    <public type="id" name="dialog_cancel" id="0x7f0a025e" />
+    <public type="id" name="dialog_card" id="0x7f0a025f" />
+    <public type="id" name="dialog_chat_action_header" id="0x7f0a0260" />
+    <public type="id" name="dialog_chat_actions_add_reaction" id="0x7f0a0261" />
+    <public type="id" name="dialog_chat_actions_add_reaction_emojis_list" id="0x7f0a0262" />
+    <public type="id" name="dialog_chat_actions_avatar" id="0x7f0a0263" />
+    <public type="id" name="dialog_chat_actions_copy" id="0x7f0a0264" />
+    <public type="id" name="dialog_chat_actions_copy_id" id="0x7f0a0265" />
+    <public type="id" name="dialog_chat_actions_delete" id="0x7f0a0266" />
+    <public type="id" name="dialog_chat_actions_edit" id="0x7f0a0267" />
+    <public type="id" name="dialog_chat_actions_manage_reactions" id="0x7f0a0268" />
+    <public type="id" name="dialog_chat_actions_pin" id="0x7f0a0269" />
+    <public type="id" name="dialog_chat_actions_profile" id="0x7f0a026a" />
+    <public type="id" name="dialog_chat_actions_remove_all_reactions" id="0x7f0a026b" />
+    <public type="id" name="dialog_chat_actions_resend" id="0x7f0a026c" />
+    <public type="id" name="dialog_chat_actions_share" id="0x7f0a026d" />
+    <public type="id" name="dialog_chat_actions_subtitle" id="0x7f0a026e" />
+    <public type="id" name="dialog_chat_actions_title" id="0x7f0a026f" />
+    <public type="id" name="dialog_delete" id="0x7f0a0270" />
+    <public type="id" name="dialog_save" id="0x7f0a0271" />
+    <public type="id" name="dialog_selections" id="0x7f0a0272" />
+    <public type="id" name="dialog_title" id="0x7f0a0273" />
+    <public type="id" name="dialog_url_actions_copy" id="0x7f0a0274" />
+    <public type="id" name="dialog_url_actions_open" id="0x7f0a0275" />
+    <public type="id" name="dialog_url_actions_share" id="0x7f0a0276" />
+    <public type="id" name="dialog_url_actions_url" id="0x7f0a0277" />
+    <public type="id" name="dimensions" id="0x7f0a0278" />
+    <public type="id" name="dimmer_view" id="0x7f0a0279" />
+    <public type="id" name="direct" id="0x7f0a027a" />
+    <public type="id" name="disableHome" id="0x7f0a027b" />
+    <public type="id" name="disable_delete_body" id="0x7f0a027c" />
+    <public type="id" name="disable_delete_cancel" id="0x7f0a027d" />
+    <public type="id" name="disable_delete_code" id="0x7f0a027e" />
+    <public type="id" name="disable_delete_code_wrap" id="0x7f0a027f" />
+    <public type="id" name="disable_delete_confirm" id="0x7f0a0280" />
+    <public type="id" name="disable_delete_header" id="0x7f0a0281" />
+    <public type="id" name="disable_delete_password" id="0x7f0a0282" />
+    <public type="id" name="disable_delete_password_wrap" id="0x7f0a0283" />
+    <public type="id" name="disconnect_btn" id="0x7f0a0284" />
+    <public type="id" name="edit_account_discriminator" id="0x7f0a0285" />
+    <public type="id" name="edit_account_discriminator_wrap" id="0x7f0a0286" />
+    <public type="id" name="edit_account_email" id="0x7f0a0287" />
+    <public type="id" name="edit_account_email_wrap" id="0x7f0a0288" />
+    <public type="id" name="edit_account_password" id="0x7f0a0289" />
+    <public type="id" name="edit_account_password_wrap" id="0x7f0a028a" />
+    <public type="id" name="edit_account_tag_layout_container" id="0x7f0a028b" />
+    <public type="id" name="edit_account_username" id="0x7f0a028c" />
+    <public type="id" name="edit_account_username_wrap" id="0x7f0a028d" />
+    <public type="id" name="edit_integration_custom_emotes_container" id="0x7f0a028e" />
+    <public type="id" name="edit_integration_custom_emotes_toggle" id="0x7f0a028f" />
+    <public type="id" name="edit_integration_expire_radio_kick_user" id="0x7f0a0290" />
+    <public type="id" name="edit_integration_expire_radio_remove_role" id="0x7f0a0291" />
+    <public type="id" name="edit_integration_expired_sub_container" id="0x7f0a0292" />
+    <public type="id" name="edit_integration_grace_period_container" id="0x7f0a0293" />
+    <public type="id" name="edit_integration_grace_period_radio_14_days" id="0x7f0a0294" />
+    <public type="id" name="edit_integration_grace_period_radio_1_day" id="0x7f0a0295" />
+    <public type="id" name="edit_integration_grace_period_radio_30_days" id="0x7f0a0296" />
+    <public type="id" name="edit_integration_grace_period_radio_3_days" id="0x7f0a0297" />
+    <public type="id" name="edit_integration_grace_period_radio_7_days" id="0x7f0a0298" />
+    <public type="id" name="edit_integration_icon" id="0x7f0a0299" />
+    <public type="id" name="edit_integration_last_sync_time" id="0x7f0a029a" />
+    <public type="id" name="edit_integration_name" id="0x7f0a029b" />
+    <public type="id" name="edit_integration_name_container" id="0x7f0a029c" />
+    <public type="id" name="edit_integration_owner_name" id="0x7f0a029d" />
+    <public type="id" name="edit_integration_save" id="0x7f0a029e" />
+    <public type="id" name="edit_integration_settings_scroll" id="0x7f0a029f" />
+    <public type="id" name="edit_integration_subscriber_count" id="0x7f0a02a0" />
+    <public type="id" name="edit_integration_sync_container" id="0x7f0a02a1" />
+    <public type="id" name="edit_integration_synced_role" id="0x7f0a02a2" />
+    <public type="id" name="edit_integration_synced_role_container" id="0x7f0a02a3" />
+    <public type="id" name="edit_member_administrative_container" id="0x7f0a02a4" />
+    <public type="id" name="edit_member_ban_button" id="0x7f0a02a5" />
+    <public type="id" name="edit_member_kick_button" id="0x7f0a02a6" />
+    <public type="id" name="edit_member_nickname" id="0x7f0a02a7" />
+    <public type="id" name="edit_member_nickname_lock" id="0x7f0a02a8" />
+    <public type="id" name="edit_member_roles_container" id="0x7f0a02a9" />
+    <public type="id" name="edit_member_roles_recycler" id="0x7f0a02aa" />
+    <public type="id" name="edit_member_save" id="0x7f0a02ab" />
+    <public type="id" name="edit_member_transfer_ownership_button" id="0x7f0a02ac" />
+    <public type="id" name="edit_query" id="0x7f0a02ad" />
+    <public type="id" name="edit_role_name" id="0x7f0a02ae" />
+    <public type="id" name="edit_role_save" id="0x7f0a02af" />
+    <public type="id" name="embed_guideline" id="0x7f0a02b0" />
+    <public type="id" name="embed_guideline_right" id="0x7f0a02b1" />
+    <public type="id" name="embed_image_container" id="0x7f0a02b2" />
+    <public type="id" name="emoji_btn" id="0x7f0a02b3" />
+    <public type="id" name="emoji_container" id="0x7f0a02b4" />
+    <public type="id" name="emoji_item_draweeview" id="0x7f0a02b5" />
+    <public type="id" name="emoji_iv" id="0x7f0a02b6" />
+    <public type="id" name="emoji_picker_backspace_icon" id="0x7f0a02b7" />
+    <public type="id" name="emoji_picker_bottom_bar" id="0x7f0a02b8" />
+    <public type="id" name="emoji_picker_search_icon" id="0x7f0a02b9" />
+    <public type="id" name="emoji_picker_tab_layout" id="0x7f0a02ba" />
+    <public type="id" name="emoji_search_bar" id="0x7f0a02bb" />
+    <public type="id" name="empty_results" id="0x7f0a02bc" />
+    <public type="id" name="enable_button" id="0x7f0a02bd" />
+    <public type="id" name="enable_mfa_key_code" id="0x7f0a02be" />
+    <public type="id" name="enable_mfa_key_launch_authy" id="0x7f0a02bf" />
+    <public type="id" name="enable_mfa_key_launch_google_auth" id="0x7f0a02c0" />
+    <public type="id" name="enable_mfa_stepsview" id="0x7f0a02c1" />
+    <public type="id" name="enable_sms_backup_body" id="0x7f0a02c2" />
+    <public type="id" name="enable_sms_backup_cancel" id="0x7f0a02c3" />
+    <public type="id" name="enable_sms_backup_confirm" id="0x7f0a02c4" />
+    <public type="id" name="enable_sms_backup_header" id="0x7f0a02c5" />
+    <public type="id" name="enable_sms_backup_password" id="0x7f0a02c6" />
+    <public type="id" name="enable_sms_backup_password_wrap" id="0x7f0a02c7" />
+    <public type="id" name="end" id="0x7f0a02c8" />
+    <public type="id" name="enterAlways" id="0x7f0a02c9" />
+    <public type="id" name="enterAlwaysCollapsed" id="0x7f0a02ca" />
+    <public type="id" name="error_divider" id="0x7f0a02cb" />
+    <public type="id" name="exitUntilCollapsed" id="0x7f0a02cc" />
+    <public type="id" name="expand_activities_button" id="0x7f0a02cd" />
+    <public type="id" name="expanded_menu" id="0x7f0a02ce" />
+    <public type="id" name="external_share_activity_action_preview" id="0x7f0a02cf" />
+    <public type="id" name="external_share_comment" id="0x7f0a02d0" />
+    <public type="id" name="external_share_list" id="0x7f0a02d1" />
+    <public type="id" name="external_share_search" id="0x7f0a02d2" />
+    <public type="id" name="external_share_search_results" id="0x7f0a02d3" />
+    <public type="id" name="fab_menu_add_category" id="0x7f0a02d4" />
+    <public type="id" name="fab_menu_add_text" id="0x7f0a02d5" />
+    <public type="id" name="fab_menu_add_voice" id="0x7f0a02d6" />
+    <public type="id" name="fab_menu_main" id="0x7f0a02d7" />
+    <public type="id" name="fab_menu_main_fab" id="0x7f0a02d8" />
+    <public type="id" name="fab_menu_table" id="0x7f0a02d9" />
+    <public type="id" name="fatal_crash_app_version" id="0x7f0a02da" />
+    <public type="id" name="fatal_crash_details" id="0x7f0a02db" />
+    <public type="id" name="fatal_crash_device" id="0x7f0a02dc" />
+    <public type="id" name="fatal_crash_os_version" id="0x7f0a02dd" />
+    <public type="id" name="fatal_crash_source" id="0x7f0a02de" />
+    <public type="id" name="fatal_crash_testers_invite" id="0x7f0a02df" />
+    <public type="id" name="fatal_crash_time" id="0x7f0a02e0" />
+    <public type="id" name="file_name_tv" id="0x7f0a02e1" />
+    <public type="id" name="file_subtitle_tv" id="0x7f0a02e2" />
+    <public type="id" name="fill" id="0x7f0a02e3" />
+    <public type="id" name="fill_horizontal" id="0x7f0a02e4" />
+    <public type="id" name="fill_vertical" id="0x7f0a02e5" />
+    <public type="id" name="filled" id="0x7f0a02e6" />
+    <public type="id" name="fitBottomStart" id="0x7f0a02e7" />
+    <public type="id" name="fitCenter" id="0x7f0a02e8" />
+    <public type="id" name="fitEnd" id="0x7f0a02e9" />
+    <public type="id" name="fitStart" id="0x7f0a02ea" />
+    <public type="id" name="fitXY" id="0x7f0a02eb" />
+    <public type="id" name="fixed" id="0x7f0a02ec" />
+    <public type="id" name="flex_end" id="0x7f0a02ed" />
+    <public type="id" name="flex_start" id="0x7f0a02ee" />
+    <public type="id" name="focusCrop" id="0x7f0a02ef" />
+    <public type="id" name="folder_view_folder_image" id="0x7f0a02f0" />
+    <public type="id" name="forever" id="0x7f0a02f1" />
+    <public type="id" name="friend_container" id="0x7f0a02f2" />
+    <public type="id" name="friends_add_container" id="0x7f0a02f3" />
+    <public type="id" name="friends_add_header" id="0x7f0a02f4" />
+    <public type="id" name="friends_add_nearby" id="0x7f0a02f5" />
+    <public type="id" name="friends_add_send" id="0x7f0a02f6" />
+    <public type="id" name="friends_add_text_edit" id="0x7f0a02f7" />
+    <public type="id" name="friends_add_text_edit_wrap" id="0x7f0a02f8" />
+    <public type="id" name="friends_list_item_avatar" id="0x7f0a02f9" />
+    <public type="id" name="friends_list_item_avatar_wrap" id="0x7f0a02fa" />
+    <public type="id" name="friends_list_item_empty" id="0x7f0a02fb" />
+    <public type="id" name="friends_list_item_empty_invite" id="0x7f0a02fc" />
+    <public type="id" name="friends_list_item_empty_no_blocked" id="0x7f0a02fd" />
+    <public type="id" name="friends_list_item_empty_no_friends" id="0x7f0a02fe" />
+    <public type="id" name="friends_list_item_empty_no_online" id="0x7f0a02ff" />
+    <public type="id" name="friends_list_item_empty_no_request" id="0x7f0a0300" />
+    <public type="id" name="friends_list_item_empty_no_suggestions" id="0x7f0a0301" />
+    <public type="id" name="friends_list_item_game" id="0x7f0a0302" />
+    <public type="id" name="friends_list_item_mutual_1" id="0x7f0a0303" />
+    <public type="id" name="friends_list_item_mutual_1_icon" id="0x7f0a0304" />
+    <public type="id" name="friends_list_item_mutual_1_text" id="0x7f0a0305" />
+    <public type="id" name="friends_list_item_mutual_2" id="0x7f0a0306" />
+    <public type="id" name="friends_list_item_mutual_2_icon" id="0x7f0a0307" />
+    <public type="id" name="friends_list_item_mutual_2_text" id="0x7f0a0308" />
+    <public type="id" name="friends_list_item_mutual_3" id="0x7f0a0309" />
+    <public type="id" name="friends_list_item_mutual_3_icon" id="0x7f0a030a" />
+    <public type="id" name="friends_list_item_mutual_3_text" id="0x7f0a030b" />
+    <public type="id" name="friends_list_item_mutual_4" id="0x7f0a030c" />
+    <public type="id" name="friends_list_item_mutual_4_icon" id="0x7f0a030d" />
+    <public type="id" name="friends_list_item_mutual_4_text" id="0x7f0a030e" />
+    <public type="id" name="friends_list_item_mutual_wrap" id="0x7f0a030f" />
+    <public type="id" name="friends_list_item_name" id="0x7f0a0310" />
+    <public type="id" name="friends_list_item_presence" id="0x7f0a0311" />
+    <public type="id" name="friends_list_item_text" id="0x7f0a0312" />
+    <public type="id" name="friends_list_recycler" id="0x7f0a0313" />
+    <public type="id" name="front" id="0x7f0a0314" />
+    <public type="id" name="ghost_view" id="0x7f0a0315" />
+    <public type="id" name="gift_entitlement_code" id="0x7f0a0316" />
+    <public type="id" name="gift_entitlement_code_container" id="0x7f0a0317" />
+    <public type="id" name="gift_entitlement_container" id="0x7f0a0318" />
+    <public type="id" name="gift_entitlement_copy" id="0x7f0a0319" />
+    <public type="id" name="gift_entitlement_divider" id="0x7f0a031a" />
+    <public type="id" name="gift_entitlement_flipper" id="0x7f0a031b" />
+    <public type="id" name="gift_entitlement_generate" id="0x7f0a031c" />
+    <public type="id" name="gift_entitlement_revoke" id="0x7f0a031d" />
+    <public type="id" name="gift_sku_arrow" id="0x7f0a031e" />
+    <public type="id" name="gift_sku_copies" id="0x7f0a031f" />
+    <public type="id" name="gift_sku_icon" id="0x7f0a0320" />
+    <public type="id" name="gift_sku_name" id="0x7f0a0321" />
+    <public type="id" name="global_search_add_a_friend_btn" id="0x7f0a0322" />
+    <public type="id" name="global_search_guild_list" id="0x7f0a0323" />
+    <public type="id" name="global_search_join_guild_btn" id="0x7f0a0324" />
+    <public type="id" name="global_search_recycler" id="0x7f0a0325" />
+    <public type="id" name="global_search_view_flipper" id="0x7f0a0326" />
+    <public type="id" name="gone" id="0x7f0a0327" />
+    <public type="id" name="group_divider" id="0x7f0a0328" />
+    <public type="id" name="group_dm_settings_scroll_view" id="0x7f0a0329" />
+    <public type="id" name="group_invite_friends_chips" id="0x7f0a032a" />
+    <public type="id" name="group_invite_friends_recipients_container" id="0x7f0a032b" />
+    <public type="id" name="group_invite_friends_recycler" id="0x7f0a032c" />
+    <public type="id" name="group_invite_friends_save_fab" id="0x7f0a032d" />
+    <public type="id" name="group_invite_friends_text_to" id="0x7f0a032e" />
+    <public type="id" name="group_invite_friends_view_flipper" id="0x7f0a032f" />
+    <public type="id" name="groups" id="0x7f0a0330" />
+    <public type="id" name="guideline" id="0x7f0a0331" />
+    <public type="id" name="guild_actions_add_create" id="0x7f0a0332" />
+    <public type="id" name="guild_actions_add_create_desc" id="0x7f0a0333" />
+    <public type="id" name="guild_actions_add_join" id="0x7f0a0334" />
+    <public type="id" name="guild_actions_add_join_desc" id="0x7f0a0335" />
+    <public type="id" name="guild_actions_manage_channels_divider" id="0x7f0a0336" />
+    <public type="id" name="guild_actions_overview_boost" id="0x7f0a0337" />
+    <public type="id" name="guild_actions_overview_change_nickname" id="0x7f0a0338" />
+    <public type="id" name="guild_actions_overview_copy_id" id="0x7f0a0339" />
+    <public type="id" name="guild_actions_overview_create_category" id="0x7f0a033a" />
+    <public type="id" name="guild_actions_overview_create_channel" id="0x7f0a033b" />
+    <public type="id" name="guild_actions_overview_header_icon_iv" id="0x7f0a033c" />
+    <public type="id" name="guild_actions_overview_header_icon_tv" id="0x7f0a033d" />
+    <public type="id" name="guild_actions_overview_header_tv" id="0x7f0a033e" />
+    <public type="id" name="guild_actions_overview_leave" id="0x7f0a033f" />
+    <public type="id" name="guild_actions_overview_mark_as_read" id="0x7f0a0340" />
+    <public type="id" name="guild_actions_overview_notifications" id="0x7f0a0341" />
+    <public type="id" name="guild_actions_overview_privacy_cs" id="0x7f0a0342" />
+    <public type="id" name="guild_actions_overview_settings" id="0x7f0a0343" />
+    <public type="id" name="guild_actions_overview_show_hide_muted_channels" id="0x7f0a0344" />
+    <public type="id" name="guild_call_controls" id="0x7f0a0345" />
+    <public type="id" name="guild_call_participant_list" id="0x7f0a0346" />
+    <public type="id" name="guild_call_view_flipper" id="0x7f0a0347" />
+    <public type="id" name="guild_create_guidelines" id="0x7f0a0348" />
+    <public type="id" name="guild_create_icon" id="0x7f0a0349" />
+    <public type="id" name="guild_create_icon_placeholder" id="0x7f0a034a" />
+    <public type="id" name="guild_create_icon_wrap" id="0x7f0a034b" />
+    <public type="id" name="guild_create_name" id="0x7f0a034c" />
+    <public type="id" name="guild_create_regions" id="0x7f0a034d" />
+    <public type="id" name="guild_invite_accept" id="0x7f0a034e" />
+    <public type="id" name="guild_invite_actions" id="0x7f0a034f" />
+    <public type="id" name="guild_invite_cancel" id="0x7f0a0350" />
+    <public type="id" name="guild_invite_channel_spinner" id="0x7f0a0351" />
+    <public type="id" name="guild_invite_empty_results" id="0x7f0a0352" />
+    <public type="id" name="guild_invite_empty_suggestions_container" id="0x7f0a0353" />
+    <public type="id" name="guild_invite_empty_suggestions_invite_link" id="0x7f0a0354" />
+    <public type="id" name="guild_invite_empty_suggestions_invite_share_btn" id="0x7f0a0355" />
+    <public type="id" name="guild_invite_empty_suggestions_settings_edit" id="0x7f0a0356" />
+    <public type="id" name="guild_invite_empty_suggestions_settings_invite_link_subtext" id="0x7f0a0357" />
+    <public type="id" name="guild_invite_expires_after_radiogroup" id="0x7f0a0358" />
+    <public type="id" name="guild_invite_friends_subtitle" id="0x7f0a0359" />
+    <public type="id" name="guild_invite_friends_title" id="0x7f0a035a" />
+    <public type="id" name="guild_invite_generate_link" id="0x7f0a035b" />
+    <public type="id" name="guild_invite_info" id="0x7f0a035c" />
+    <public type="id" name="guild_invite_link" id="0x7f0a035d" />
+    <public type="id" name="guild_invite_max_uses_radiogroup" id="0x7f0a035e" />
+    <public type="id" name="guild_invite_never_expire" id="0x7f0a035f" />
+    <public type="id" name="guild_invite_settings_edit" id="0x7f0a0360" />
+    <public type="id" name="guild_invite_share_btn" id="0x7f0a0361" />
+    <public type="id" name="guild_invite_splash" id="0x7f0a0362" />
+    <public type="id" name="guild_invite_suggestion_list" id="0x7f0a0363" />
+    <public type="id" name="guild_invite_suggestions_flipper" id="0x7f0a0364" />
+    <public type="id" name="guild_invite_temporary_membership" id="0x7f0a0365" />
+    <public type="id" name="guild_join_action_btn" id="0x7f0a0366" />
+    <public type="id" name="guild_join_content" id="0x7f0a0367" />
+    <public type="id" name="guild_join_invite" id="0x7f0a0368" />
+    <public type="id" name="guild_list" id="0x7f0a0369" />
+    <public type="id" name="guild_list_add_hint" id="0x7f0a036a" />
+    <public type="id" name="guild_list_unreads_stub" id="0x7f0a036b" />
+    <public type="id" name="guild_notifications_add_override" id="0x7f0a036c" />
+    <public type="id" name="guild_notifications_channel_list" id="0x7f0a036d" />
+    <public type="id" name="guild_notifications_override_list" id="0x7f0a036e" />
+    <public type="id" name="guild_search_item_avatar" id="0x7f0a036f" />
+    <public type="id" name="guild_search_item_name" id="0x7f0a0370" />
+    <public type="id" name="guild_search_recycler" id="0x7f0a0371" />
+    <public type="id" name="guild_transfer_ownership_acknowledge_check" id="0x7f0a0372" />
+    <public type="id" name="guild_transfer_ownership_cancel" id="0x7f0a0373" />
+    <public type="id" name="guild_transfer_ownership_confirm" id="0x7f0a0374" />
+    <public type="id" name="guild_transfer_ownership_mfa_code" id="0x7f0a0375" />
+    <public type="id" name="guild_transfer_ownership_mfa_wrap" id="0x7f0a0376" />
+    <public type="id" name="guild_view_1" id="0x7f0a0377" />
+    <public type="id" name="guild_view_2" id="0x7f0a0378" />
+    <public type="id" name="guild_view_3" id="0x7f0a0379" />
+    <public type="id" name="guild_view_4" id="0x7f0a037a" />
+    <public type="id" name="guild_view_image" id="0x7f0a037b" />
+    <public type="id" name="guild_view_text" id="0x7f0a037c" />
+    <public type="id" name="guild_views" id="0x7f0a037d" />
+    <public type="id" name="guilds_item_avatar" id="0x7f0a037e" />
+    <public type="id" name="guilds_item_avatar_text" id="0x7f0a037f" />
+    <public type="id" name="guilds_item_avatar_wrap" id="0x7f0a0380" />
+    <public type="id" name="guilds_item_dm_avatar" id="0x7f0a0381" />
+    <public type="id" name="guilds_item_dm_count" id="0x7f0a0382" />
+    <public type="id" name="guilds_item_folder" id="0x7f0a0383" />
+    <public type="id" name="guilds_item_folder_container" id="0x7f0a0384" />
+    <public type="id" name="guilds_item_guild_new_avatar" id="0x7f0a0385" />
+    <public type="id" name="guilds_item_highlight" id="0x7f0a0386" />
+    <public type="id" name="guilds_item_mentions" id="0x7f0a0387" />
+    <public type="id" name="guilds_item_profile_avatar" id="0x7f0a0388" />
+    <public type="id" name="guilds_item_profile_selected" id="0x7f0a0389" />
+    <public type="id" name="guilds_item_selected" id="0x7f0a038a" />
+    <public type="id" name="guilds_item_unread" id="0x7f0a038b" />
+    <public type="id" name="guilds_item_voice" id="0x7f0a038c" />
+    <public type="id" name="hardware" id="0x7f0a038d" />
+    <public type="id" name="header_item_text" id="0x7f0a038e" />
+    <public type="id" name="home" id="0x7f0a038f" />
+    <public type="id" name="homeAsUp" id="0x7f0a0390" />
+    <public type="id" name="icon" id="0x7f0a0391" />
+    <public type="id" name="icon_group" id="0x7f0a0392" />
+    <public type="id" name="icon_only" id="0x7f0a0393" />
+    <public type="id" name="ifRoom" id="0x7f0a0394" />
+    <public type="id" name="image" id="0x7f0a0395" />
+    <public type="id" name="image_bottom_guideline" id="0x7f0a0396" />
+    <public type="id" name="image_view_crop" id="0x7f0a0397" />
+    <public type="id" name="image_view_logo" id="0x7f0a0398" />
+    <public type="id" name="image_view_state_aspect_ratio" id="0x7f0a0399" />
+    <public type="id" name="image_view_state_rotate" id="0x7f0a039a" />
+    <public type="id" name="image_view_state_scale" id="0x7f0a039b" />
+    <public type="id" name="incoming_call_accept_button" id="0x7f0a039c" />
+    <public type="id" name="incoming_call_accept_container" id="0x7f0a039d" />
+    <public type="id" name="incoming_call_accept_text" id="0x7f0a039e" />
+    <public type="id" name="incoming_call_connect_voice_only" id="0x7f0a039f" />
+    <public type="id" name="incoming_call_decline_button" id="0x7f0a03a0" />
+    <public type="id" name="incoming_call_decline_container" id="0x7f0a03a1" />
+    <public type="id" name="incoming_call_status_container" id="0x7f0a03a2" />
+    <public type="id" name="incoming_call_status_primary" id="0x7f0a03a3" />
+    <public type="id" name="incoming_call_status_secondary" id="0x7f0a03a4" />
+    <public type="id" name="incoming_call_top_guideline" id="0x7f0a03a5" />
+    <public type="id" name="incoming_call_users_recycler" id="0x7f0a03a6" />
+    <public type="id" name="info" id="0x7f0a03a7" />
+    <public type="id" name="integration_header_container" id="0x7f0a03a8" />
+    <public type="id" name="integration_header_disabled_overlay" id="0x7f0a03a9" />
+    <public type="id" name="integration_icon" id="0x7f0a03aa" />
+    <public type="id" name="integration_name" id="0x7f0a03ab" />
+    <public type="id" name="integration_name_container" id="0x7f0a03ac" />
+    <public type="id" name="integration_owner_name" id="0x7f0a03ad" />
+    <public type="id" name="integration_settings_icon" id="0x7f0a03ae" />
+    <public type="id" name="integration_sync_switch" id="0x7f0a03af" />
+    <public type="id" name="integration_syncing_progress_bar" id="0x7f0a03b0" />
+    <public type="id" name="integrations_empty_body" id="0x7f0a03b1" />
+    <public type="id" name="integrations_empty_header" id="0x7f0a03b2" />
+    <public type="id" name="integrations_recycler" id="0x7f0a03b3" />
+    <public type="id" name="integrations_view_flipper" id="0x7f0a03b4" />
+    <public type="id" name="invisible" id="0x7f0a03b5" />
+    <public type="id" name="invite_actions_copy" id="0x7f0a03b6" />
+    <public type="id" name="invite_actions_revoke" id="0x7f0a03b7" />
+    <public type="id" name="invite_actions_share" id="0x7f0a03b8" />
+    <public type="id" name="invite_actions_title" id="0x7f0a03b9" />
+    <public type="id" name="invite_avatar" id="0x7f0a03ba" />
+    <public type="id" name="invite_avatar_small" id="0x7f0a03bb" />
+    <public type="id" name="invite_avatar_small_wrap" id="0x7f0a03bc" />
+    <public type="id" name="invite_avatar_wrap" id="0x7f0a03bd" />
+    <public type="id" name="invite_channel" id="0x7f0a03be" />
+    <public type="id" name="invite_code" id="0x7f0a03bf" />
+    <public type="id" name="invite_container" id="0x7f0a03c0" />
+    <public type="id" name="invite_divider" id="0x7f0a03c1" />
+    <public type="id" name="invite_expiration_container" id="0x7f0a03c2" />
+    <public type="id" name="invite_expiration_time" id="0x7f0a03c3" />
+    <public type="id" name="invite_expired_image" id="0x7f0a03c4" />
+    <public type="id" name="invite_expires_label" id="0x7f0a03c5" />
+    <public type="id" name="invite_list_item_avatar" id="0x7f0a03c6" />
+    <public type="id" name="invite_members_online" id="0x7f0a03c7" />
+    <public type="id" name="invite_members_online_wrap" id="0x7f0a03c8" />
+    <public type="id" name="invite_members_total" id="0x7f0a03c9" />
+    <public type="id" name="invite_members_total_wrap" id="0x7f0a03ca" />
+    <public type="id" name="invite_members_wrap" id="0x7f0a03cb" />
+    <public type="id" name="invite_message" id="0x7f0a03cc" />
+    <public type="id" name="invite_name_container" id="0x7f0a03cd" />
+    <public type="id" name="invite_settings_bottom_sheet" id="0x7f0a03ce" />
+    <public type="id" name="invite_settings_icon" id="0x7f0a03cf" />
+    <public type="id" name="invite_title" id="0x7f0a03d0" />
+    <public type="id" name="invite_user_name" id="0x7f0a03d1" />
+    <public type="id" name="invite_uses" id="0x7f0a03d2" />
+    <public type="id" name="invite_uses_label" id="0x7f0a03d3" />
+    <public type="id" name="italic" id="0x7f0a03d4" />
+    <public type="id" name="item_backup_code_tv" id="0x7f0a03d5" />
+    <public type="id" name="item_check_indicator" id="0x7f0a03d6" />
+    <public type="id" name="item_description_tv" id="0x7f0a03d7" />
+    <public type="id" name="item_game_invite_action_btn" id="0x7f0a03d8" />
+    <public type="id" name="item_game_invite_application_name" id="0x7f0a03d9" />
+    <public type="id" name="item_game_invite_cover_image" id="0x7f0a03da" />
+    <public type="id" name="item_game_invite_header" id="0x7f0a03db" />
+    <public type="id" name="item_game_invite_recycler" id="0x7f0a03dc" />
+    <public type="id" name="item_game_invite_status" id="0x7f0a03dd" />
+    <public type="id" name="item_gift_accept_button" id="0x7f0a03de" />
+    <public type="id" name="item_gift_cannot_claim_button" id="0x7f0a03df" />
+    <public type="id" name="item_gift_details" id="0x7f0a03e0" />
+    <public type="id" name="item_gift_expires" id="0x7f0a03e1" />
+    <public type="id" name="item_gift_header" id="0x7f0a03e2" />
+    <public type="id" name="item_gift_image" id="0x7f0a03e3" />
+    <public type="id" name="item_gift_image_background" id="0x7f0a03e4" />
+    <public type="id" name="item_gift_loading_button_placeholder" id="0x7f0a03e5" />
+    <public type="id" name="item_gift_name" id="0x7f0a03e6" />
+    <public type="id" name="item_gift_subtext" id="0x7f0a03e7" />
+    <public type="id" name="item_gift_verify_button" id="0x7f0a03e8" />
+    <public type="id" name="item_group_tv" id="0x7f0a03e9" />
+    <public type="id" name="item_guild_welcome_header" id="0x7f0a03ea" />
+    <public type="id" name="item_guild_welcome_subheader" id="0x7f0a03eb" />
+    <public type="id" name="item_header" id="0x7f0a03ec" />
+    <public type="id" name="item_header_tv" id="0x7f0a03ed" />
+    <public type="id" name="item_icon_iv" id="0x7f0a03ee" />
+    <public type="id" name="item_invite_btn" id="0x7f0a03ef" />
+    <public type="id" name="item_invite_header" id="0x7f0a03f0" />
+    <public type="id" name="item_invite_image" id="0x7f0a03f1" />
+    <public type="id" name="item_invite_image_text" id="0x7f0a03f2" />
+    <public type="id" name="item_invite_join_button" id="0x7f0a03f3" />
+    <public type="id" name="item_invite_joined_button" id="0x7f0a03f4" />
+    <public type="id" name="item_invite_loading_button" id="0x7f0a03f5" />
+    <public type="id" name="item_invite_member_container" id="0x7f0a03f6" />
+    <public type="id" name="item_invite_mention_button" id="0x7f0a03f7" />
+    <public type="id" name="item_invite_name" id="0x7f0a03f8" />
+    <public type="id" name="item_invite_online_dot" id="0x7f0a03f9" />
+    <public type="id" name="item_invite_online_text" id="0x7f0a03fa" />
+    <public type="id" name="item_invite_total_member_dot" id="0x7f0a03fb" />
+    <public type="id" name="item_invite_total_member_text" id="0x7f0a03fc" />
+    <public type="id" name="item_listen_together_album_image" id="0x7f0a03fd" />
+    <public type="id" name="item_listen_together_artist" id="0x7f0a03fe" />
+    <public type="id" name="item_listen_together_container" id="0x7f0a03ff" />
+    <public type="id" name="item_listen_together_header" id="0x7f0a0400" />
+    <public type="id" name="item_listen_together_join" id="0x7f0a0401" />
+    <public type="id" name="item_listen_together_recycler" id="0x7f0a0402" />
+    <public type="id" name="item_listen_together_session_ended" id="0x7f0a0403" />
+    <public type="id" name="item_listen_together_track" id="0x7f0a0404" />
+    <public type="id" name="item_mentions_tv" id="0x7f0a0405" />
+    <public type="id" name="item_name_tv" id="0x7f0a0406" />
+    <public type="id" name="item_sent" id="0x7f0a0407" />
+    <public type="id" name="item_touch_helper_previous_elevation" id="0x7f0a0408" />
+    <public type="id" name="item_unread" id="0x7f0a0409" />
+    <public type="id" name="kick_user_body" id="0x7f0a040a" />
+    <public type="id" name="kick_user_cancel" id="0x7f0a040b" />
+    <public type="id" name="kick_user_confirm" id="0x7f0a040c" />
+    <public type="id" name="kick_user_reason" id="0x7f0a040d" />
+    <public type="id" name="kick_user_title" id="0x7f0a040e" />
+    <public type="id" name="labeled" id="0x7f0a040f" />
+    <public type="id" name="largeLabel" id="0x7f0a0410" />
+    <public type="id" name="launch_btn" id="0x7f0a0411" />
+    <public type="id" name="launch_camera_btn" id="0x7f0a0412" />
+    <public type="id" name="layout_aspect_ratio" id="0x7f0a0413" />
+    <public type="id" name="layout_rotate_wheel" id="0x7f0a0414" />
+    <public type="id" name="layout_scale_wheel" id="0x7f0a0415" />
+    <public type="id" name="left" id="0x7f0a0416" />
+    <public type="id" name="light" id="0x7f0a0417" />
+    <public type="id" name="line1" id="0x7f0a0418" />
+    <public type="id" name="line3" id="0x7f0a0419" />
+    <public type="id" name="list" id="0x7f0a041a" />
+    <public type="id" name="listMode" id="0x7f0a041b" />
+    <public type="id" name="list_item" id="0x7f0a041c" />
+    <public type="id" name="loading_button_progress" id="0x7f0a041d" />
+    <public type="id" name="loading_button_text" id="0x7f0a041e" />
+    <public type="id" name="location" id="0x7f0a041f" />
+    <public type="id" name="lottie_layer_name" id="0x7f0a0420" />
+    <public type="id" name="main_drawer" id="0x7f0a0421" />
+    <public type="id" name="main_input_container" id="0x7f0a0422" />
+    <public type="id" name="main_panel_center" id="0x7f0a0423" />
+    <public type="id" name="main_panel_center_channel_less" id="0x7f0a0424" />
+    <public type="id" name="main_panel_center_channel_less_body" id="0x7f0a0425" />
+    <public type="id" name="main_panel_center_channel_less_title" id="0x7f0a0426" />
+    <public type="id" name="main_panel_center_nsfw" id="0x7f0a0427" />
+    <public type="id" name="main_panel_center_nsfw_anchor_wrap" id="0x7f0a0428" />
+    <public type="id" name="main_panel_center_nsfw_confirm" id="0x7f0a0429" />
+    <public type="id" name="main_panel_center_nsfw_deny" id="0x7f0a042a" />
+    <public type="id" name="main_panel_left" id="0x7f0a042b" />
+    <public type="id" name="main_panel_loading" id="0x7f0a042c" />
+    <public type="id" name="main_panel_right" id="0x7f0a042d" />
+    <public type="id" name="main_toolbar_unread_count" id="0x7f0a042e" />
+    <public type="id" name="manage_reactions_emoji_container" id="0x7f0a042f" />
+    <public type="id" name="manage_reactions_emoji_counter" id="0x7f0a0430" />
+    <public type="id" name="manage_reactions_emoji_emoji_textview" id="0x7f0a0431" />
+    <public type="id" name="manage_reactions_emoji_selected_indicator" id="0x7f0a0432" />
+    <public type="id" name="manage_reactions_emojis_recycler" id="0x7f0a0433" />
+    <public type="id" name="manage_reactions_result_error_img" id="0x7f0a0434" />
+    <public type="id" name="manage_reactions_result_error_text" id="0x7f0a0435" />
+    <public type="id" name="manage_reactions_result_remove_reaction" id="0x7f0a0436" />
+    <public type="id" name="manage_reactions_result_user_avatar" id="0x7f0a0437" />
+    <public type="id" name="manage_reactions_result_user_name" id="0x7f0a0438" />
+    <public type="id" name="manage_reactions_results_recycler" id="0x7f0a0439" />
+    <public type="id" name="masked" id="0x7f0a043a" />
+    <public type="id" name="media_image" id="0x7f0a043b" />
+    <public type="id" name="media_video" id="0x7f0a043c" />
+    <public type="id" name="member_list_item_avatar" id="0x7f0a043d" />
+    <public type="id" name="member_list_item_container" id="0x7f0a043e" />
+    <public type="id" name="member_list_item_lock" id="0x7f0a043f" />
+    <public type="id" name="member_list_item_name" id="0x7f0a0440" />
+    <public type="id" name="member_list_item_overflow" id="0x7f0a0441" />
+    <public type="id" name="member_list_item_roles_recycler" id="0x7f0a0442" />
+    <public type="id" name="menu_add_connections" id="0x7f0a0443" />
+    <public type="id" name="menu_audit_log_sort_actions" id="0x7f0a0444" />
+    <public type="id" name="menu_audit_log_sort_users" id="0x7f0a0445" />
+    <public type="id" name="menu_auth_mfa_backup_codes" id="0x7f0a0446" />
+    <public type="id" name="menu_auth_mfa_info" id="0x7f0a0447" />
+    <public type="id" name="menu_channel_notification_settings" id="0x7f0a0448" />
+    <public type="id" name="menu_channel_settings" id="0x7f0a0449" />
+    <public type="id" name="menu_channel_settings_delete" id="0x7f0a044a" />
+    <public type="id" name="menu_channel_settings_reset" id="0x7f0a044b" />
+    <public type="id" name="menu_chat_add_friend" id="0x7f0a044c" />
+    <public type="id" name="menu_chat_dms_close" id="0x7f0a044d" />
+    <public type="id" name="menu_chat_dms_view_profile" id="0x7f0a044e" />
+    <public type="id" name="menu_chat_group_add" id="0x7f0a044f" />
+    <public type="id" name="menu_chat_group_settings" id="0x7f0a0450" />
+    <public type="id" name="menu_chat_pins" id="0x7f0a0451" />
+    <public type="id" name="menu_chat_search" id="0x7f0a0452" />
+    <public type="id" name="menu_chat_side_panel" id="0x7f0a0453" />
+    <public type="id" name="menu_chat_start_call" id="0x7f0a0454" />
+    <public type="id" name="menu_chat_start_group" id="0x7f0a0455" />
+    <public type="id" name="menu_chat_start_video_call" id="0x7f0a0456" />
+    <public type="id" name="menu_chat_stop_call" id="0x7f0a0457" />
+    <public type="id" name="menu_copy_id" id="0x7f0a0458" />
+    <public type="id" name="menu_crop" id="0x7f0a0459" />
+    <public type="id" name="menu_debugging_filter" id="0x7f0a045a" />
+    <public type="id" name="menu_debugging_share" id="0x7f0a045b" />
+    <public type="id" name="menu_edit_overwrite_delete" id="0x7f0a045c" />
+    <public type="id" name="menu_edit_role_delete" id="0x7f0a045d" />
+    <public type="id" name="menu_filter" id="0x7f0a045e" />
+    <public type="id" name="menu_guild_call_channel_settings" id="0x7f0a045f" />
+    <public type="id" name="menu_guild_call_overlay_launcher" id="0x7f0a0460" />
+    <public type="id" name="menu_guild_call_voice_settings" id="0x7f0a0461" />
+    <public type="id" name="menu_guild_create" id="0x7f0a0462" />
+    <public type="id" name="menu_guild_join" id="0x7f0a0463" />
+    <public type="id" name="menu_leave_group" id="0x7f0a0464" />
+    <public type="id" name="menu_loader" id="0x7f0a0465" />
+    <public type="id" name="menu_media_browser" id="0x7f0a0466" />
+    <public type="id" name="menu_media_download" id="0x7f0a0467" />
+    <public type="id" name="menu_media_share" id="0x7f0a0468" />
+    <public type="id" name="menu_private_call_group_settings" id="0x7f0a0469" />
+    <public type="id" name="menu_private_call_participants" id="0x7f0a046a" />
+    <public type="id" name="menu_private_call_select_camera" id="0x7f0a046b" />
+    <public type="id" name="menu_private_call_toggle_speaker_mode" id="0x7f0a046c" />
+    <public type="id" name="menu_private_call_user_settings" id="0x7f0a046d" />
+    <public type="id" name="menu_private_call_voice_settings" id="0x7f0a046e" />
+    <public type="id" name="menu_send" id="0x7f0a046f" />
+    <public type="id" name="menu_server_settings_delete" id="0x7f0a0470" />
+    <public type="id" name="menu_server_settings_emoji_delete" id="0x7f0a0471" />
+    <public type="id" name="menu_server_settings_members_prune" id="0x7f0a0472" />
+    <public type="id" name="menu_settings_debugging" id="0x7f0a0473" />
+    <public type="id" name="menu_settings_log_out" id="0x7f0a0474" />
+    <public type="id" name="menu_sort_channel" id="0x7f0a0475" />
+    <public type="id" name="menu_sort_done" id="0x7f0a0476" />
+    <public type="id" name="menu_user_mentions_filter" id="0x7f0a0477" />
+    <public type="id" name="message" id="0x7f0a0478" />
+    <public type="id" name="mfa_description_text" id="0x7f0a0479" />
+    <public type="id" name="mfa_download_body" id="0x7f0a047a" />
+    <public type="id" name="mfa_success_enable_sms" id="0x7f0a047b" />
+    <public type="id" name="middle" id="0x7f0a047c" />
+    <public type="id" name="mini" id="0x7f0a047d" />
+    <public type="id" name="mtrl_child_content_container" id="0x7f0a047e" />
+    <public type="id" name="mtrl_internal_children_alpha_tag" id="0x7f0a047f" />
+    <public type="id" name="multiply" id="0x7f0a0480" />
+    <public type="id" name="mute_toggle" id="0x7f0a0481" />
+    <public type="id" name="navigation_header_container" id="0x7f0a0482" />
+    <public type="id" name="navigation_indicator" id="0x7f0a0483" />
+    <public type="id" name="nearby_friends_button_flipper" id="0x7f0a0484" />
+    <public type="id" name="nearby_friends_disable" id="0x7f0a0485" />
+    <public type="id" name="nearby_friends_enable" id="0x7f0a0486" />
+    <public type="id" name="nearby_friends_error" id="0x7f0a0487" />
+    <public type="id" name="nearby_friends_flipper" id="0x7f0a0488" />
+    <public type="id" name="nearby_friends_learn_more" id="0x7f0a0489" />
+    <public type="id" name="nearby_friends_recycler" id="0x7f0a048a" />
+    <public type="id" name="nearby_friends_searching" id="0x7f0a048b" />
+    <public type="id" name="nearby_friends_searching_lottie" id="0x7f0a048c" />
+    <public type="id" name="never" id="0x7f0a048d" />
+    <public type="id" name="news_item_view" id="0x7f0a048e" />
+    <public type="id" name="no_bans_body" id="0x7f0a048f" />
+    <public type="id" name="no_invites_body" id="0x7f0a0490" />
+    <public type="id" name="no_invites_header" id="0x7f0a0491" />
+    <public type="id" name="no_logs_body" id="0x7f0a0492" />
+    <public type="id" name="no_logs_title" id="0x7f0a0493" />
+    <public type="id" name="no_results_text" id="0x7f0a0494" />
+    <public type="id" name="none" id="0x7f0a0495" />
+    <public type="id" name="normal" id="0x7f0a0496" />
+    <public type="id" name="notice_body_container" id="0x7f0a0497" />
+    <public type="id" name="notice_body_text" id="0x7f0a0498" />
+    <public type="id" name="notice_cancel" id="0x7f0a0499" />
+    <public type="id" name="notice_crop" id="0x7f0a049a" />
+    <public type="id" name="notice_header" id="0x7f0a049b" />
+    <public type="id" name="notice_header_container" id="0x7f0a049c" />
+    <public type="id" name="notice_image" id="0x7f0a049d" />
+    <public type="id" name="notice_ok" id="0x7f0a049e" />
+    <public type="id" name="notice_upload" id="0x7f0a049f" />
+    <public type="id" name="notification_background" id="0x7f0a04a0" />
+    <public type="id" name="notification_main_column" id="0x7f0a04a1" />
+    <public type="id" name="notification_main_column_container" id="0x7f0a04a2" />
+    <public type="id" name="nowrap" id="0x7f0a04a3" />
+    <public type="id" name="nux_guild_use_cases_dismiss" id="0x7f0a04a4" />
+    <public type="id" name="nux_guild_use_cases_item_chat_with_friends" id="0x7f0a04a5" />
+    <public type="id" name="nux_guild_use_cases_item_club" id="0x7f0a04a6" />
+    <public type="id" name="nux_guild_use_cases_item_gaming" id="0x7f0a04a7" />
+    <public type="id" name="nux_guild_use_cases_item_join_a_friend" id="0x7f0a04a8" />
+    <public type="id" name="nux_guild_use_cases_item_voice_chat" id="0x7f0a04a9" />
+    <public type="id" name="oauth_application_deauthorize_btn" id="0x7f0a04aa" />
+    <public type="id" name="oauth_application_description_label_tv" id="0x7f0a04ab" />
+    <public type="id" name="oauth_application_description_tv" id="0x7f0a04ac" />
+    <public type="id" name="oauth_application_icon_iv" id="0x7f0a04ad" />
+    <public type="id" name="oauth_application_name_tv" id="0x7f0a04ae" />
+    <public type="id" name="oauth_application_permissions_rv" id="0x7f0a04af" />
+    <public type="id" name="oauth_authorize_application_icon" id="0x7f0a04b0" />
+    <public type="id" name="oauth_authorize_application_name" id="0x7f0a04b1" />
+    <public type="id" name="oauth_authorize_connect_label" id="0x7f0a04b2" />
+    <public type="id" name="oauth_authorize_content" id="0x7f0a04b3" />
+    <public type="id" name="oauth_authorize_deny" id="0x7f0a04b4" />
+    <public type="id" name="oauth_authorize_grant" id="0x7f0a04b5" />
+    <public type="id" name="oauth_authorize_loading" id="0x7f0a04b6" />
+    <public type="id" name="oauth_authorize_loading_cancel" id="0x7f0a04b7" />
+    <public type="id" name="oauth_authorize_not_supported" id="0x7f0a04b8" />
+    <public type="id" name="oauth_authorize_permissions_label_tv" id="0x7f0a04b9" />
+    <public type="id" name="oauth_authorize_permissions_list" id="0x7f0a04ba" />
+    <public type="id" name="oauth_authorize_security_notice" id="0x7f0a04bb" />
+    <public type="id" name="oauth_authorize_unsupported_browser" id="0x7f0a04bc" />
+    <public type="id" name="oauth_authorize_unsupported_cancel" id="0x7f0a04bd" />
+    <public type="id" name="oauth_token_permission_detailed_desc" id="0x7f0a04be" />
+    <public type="id" name="oauth_token_permission_detailed_icon" id="0x7f0a04bf" />
+    <public type="id" name="oauth_token_permission_detailed_name" id="0x7f0a04c0" />
+    <public type="id" name="off" id="0x7f0a04c1" />
+    <public type="id" name="off_disabled_overlay" id="0x7f0a04c2" />
+    <public type="id" name="on" id="0x7f0a04c3" />
+    <public type="id" name="outline" id="0x7f0a04c4" />
+    <public type="id" name="overlay_bubble_iv" id="0x7f0a04c5" />
+    <public type="id" name="overlay_channel_name" id="0x7f0a04c6" />
+    <public type="id" name="overlay_guild_name" id="0x7f0a04c7" />
+    <public type="id" name="overlay_header" id="0x7f0a04c8" />
+    <public type="id" name="overlay_invite_link" id="0x7f0a04c9" />
+    <public type="id" name="overlay_linked_anchor_view" id="0x7f0a04ca" />
+    <public type="id" name="overlay_members_overflow_tv" id="0x7f0a04cb" />
+    <public type="id" name="overlay_members_rv" id="0x7f0a04cc" />
+    <public type="id" name="overlay_menu" id="0x7f0a04cd" />
+    <public type="id" name="overlay_network_icon" id="0x7f0a04ce" />
+    <public type="id" name="overlay_open_app" id="0x7f0a04cf" />
+    <public type="id" name="overlay_switch_channels" id="0x7f0a04d0" />
+    <public type="id" name="packed" id="0x7f0a04d1" />
+    <public type="id" name="page_tabs" id="0x7f0a04d2" />
+    <public type="id" name="parallax" id="0x7f0a04d3" />
+    <public type="id" name="parent" id="0x7f0a04d4" />
+    <public type="id" name="parentPanel" id="0x7f0a04d5" />
+    <public type="id" name="parent_matrix" id="0x7f0a04d6" />
+    <public type="id" name="participant_bg_avatar" id="0x7f0a04d7" />
+    <public type="id" name="participant_bg_letterbox" id="0x7f0a04d8" />
+    <public type="id" name="participant_content_container" id="0x7f0a04d9" />
+    <public type="id" name="participant_video_loading_indicator" id="0x7f0a04da" />
+    <public type="id" name="participant_voice_status_indicator" id="0x7f0a04db" />
+    <public type="id" name="participant_voice_user_view" id="0x7f0a04dc" />
+    <public type="id" name="payment_info_address_1_textinputlayout" id="0x7f0a04dd" />
+    <public type="id" name="payment_info_address_2_textinputlayout" id="0x7f0a04de" />
+    <public type="id" name="payment_info_cancel" id="0x7f0a04df" />
+    <public type="id" name="payment_info_city_edittext" id="0x7f0a04e0" />
+    <public type="id" name="payment_info_city_textinputlayout" id="0x7f0a04e1" />
+    <public type="id" name="payment_info_delete" id="0x7f0a04e2" />
+    <public type="id" name="payment_info_make_default_checkbox" id="0x7f0a04e3" />
+    <public type="id" name="payment_info_name_address_1_edittext" id="0x7f0a04e4" />
+    <public type="id" name="payment_info_name_address_2_edittext" id="0x7f0a04e5" />
+    <public type="id" name="payment_info_name_edittext" id="0x7f0a04e6" />
+    <public type="id" name="payment_info_name_textinputlayout" id="0x7f0a04e7" />
+    <public type="id" name="payment_info_save" id="0x7f0a04e8" />
+    <public type="id" name="payment_info_zip_edittext" id="0x7f0a04e9" />
+    <public type="id" name="payment_info_zip_textinputlayout" id="0x7f0a04ea" />
+    <public type="id" name="payment_method_edit" id="0x7f0a04eb" />
+    <public type="id" name="payment_method_header" id="0x7f0a04ec" />
+    <public type="id" name="payment_method_summary" id="0x7f0a04ed" />
+    <public type="id" name="payment_methods_empty_add" id="0x7f0a04ee" />
+    <public type="id" name="payment_methods_empty_image" id="0x7f0a04ef" />
+    <public type="id" name="payment_methods_empty_subtext" id="0x7f0a04f0" />
+    <public type="id" name="payment_methods_empty_title" id="0x7f0a04f1" />
+    <public type="id" name="payment_methods_loading" id="0x7f0a04f2" />
+    <public type="id" name="payment_methods_recycler" id="0x7f0a04f3" />
+    <public type="id" name="payment_methods_retry" id="0x7f0a04f4" />
+    <public type="id" name="payment_methods_view_flipper" id="0x7f0a04f5" />
+    <public type="id" name="payment_source_edit_address1" id="0x7f0a04f6" />
+    <public type="id" name="payment_source_edit_address2" id="0x7f0a04f7" />
+    <public type="id" name="payment_source_edit_city" id="0x7f0a04f8" />
+    <public type="id" name="payment_source_edit_country" id="0x7f0a04f9" />
+    <public type="id" name="payment_source_edit_default" id="0x7f0a04fa" />
+    <public type="id" name="payment_source_edit_error" id="0x7f0a04fb" />
+    <public type="id" name="payment_source_edit_help" id="0x7f0a04fc" />
+    <public type="id" name="payment_source_edit_name" id="0x7f0a04fd" />
+    <public type="id" name="payment_source_edit_postal_code" id="0x7f0a04fe" />
+    <public type="id" name="payment_source_edit_state" id="0x7f0a04ff" />
+    <public type="id" name="payment_source_summary" id="0x7f0a0500" />
+    <public type="id" name="payment_source_view_icon" id="0x7f0a0501" />
+    <public type="id" name="payment_source_view_icon_wrapper" id="0x7f0a0502" />
+    <public type="id" name="payment_source_view_invalid" id="0x7f0a0503" />
+    <public type="id" name="payment_source_view_premium" id="0x7f0a0504" />
+    <public type="id" name="payment_source_view_subtext" id="0x7f0a0505" />
+    <public type="id" name="payment_source_view_title" id="0x7f0a0506" />
+    <public type="id" name="percent" id="0x7f0a0507" />
+    <public type="id" name="perk_view_content_list_item" id="0x7f0a0508" />
+    <public type="id" name="perks_level_contents_header" id="0x7f0a0509" />
+    <public type="id" name="perks_level_contents_recycler" id="0x7f0a050a" />
+    <public type="id" name="perks_level_header" id="0x7f0a050b" />
+    <public type="id" name="perks_level_header_boosts" id="0x7f0a050c" />
+    <public type="id" name="perks_level_header_text" id="0x7f0a050d" />
+    <public type="id" name="perks_level_header_unlocked" id="0x7f0a050e" />
+    <public type="id" name="perm_req_text" id="0x7f0a050f" />
+    <public type="id" name="permissions_container" id="0x7f0a0510" />
+    <public type="id" name="permissions_req_btn" id="0x7f0a0511" />
+    <public type="id" name="pin" id="0x7f0a0512" />
+    <public type="id" name="popup_attachment" id="0x7f0a0513" />
+    <public type="id" name="popup_body" id="0x7f0a0514" />
+    <public type="id" name="popup_close_btn" id="0x7f0a0515" />
+    <public type="id" name="popup_countdown_progress" id="0x7f0a0516" />
+    <public type="id" name="popup_icon" id="0x7f0a0517" />
+    <public type="id" name="popup_subtitle" id="0x7f0a0518" />
+    <public type="id" name="popup_title" id="0x7f0a0519" />
+    <public type="id" name="premium_perks_upload_text" id="0x7f0a051a" />
+    <public type="id" name="premium_settings_active_subscription" id="0x7f0a051b" />
+    <public type="id" name="premium_settings_credit_container" id="0x7f0a051c" />
+    <public type="id" name="premium_settings_grandfathered" id="0x7f0a051d" />
+    <public type="id" name="premium_settings_legalese" id="0x7f0a051e" />
+    <public type="id" name="premium_settings_nitro" id="0x7f0a051f" />
+    <public type="id" name="premium_settings_nitro_classic" id="0x7f0a0520" />
+    <public type="id" name="premium_settings_nitro_classic_wumpus" id="0x7f0a0521" />
+    <public type="id" name="premium_settings_nitro_wumpus" id="0x7f0a0522" />
+    <public type="id" name="premium_settings_premium_classic_gift" id="0x7f0a0523" />
+    <public type="id" name="premium_settings_premium_classic_monthly" id="0x7f0a0524" />
+    <public type="id" name="premium_settings_premium_classic_yearly" id="0x7f0a0525" />
+    <public type="id" name="premium_settings_premium_gift" id="0x7f0a0526" />
+    <public type="id" name="premium_settings_premium_monthly" id="0x7f0a0527" />
+    <public type="id" name="premium_settings_premium_yearly" id="0x7f0a0528" />
+    <public type="id" name="premium_settings_retry" id="0x7f0a0529" />
+    <public type="id" name="premium_settings_scrollview" id="0x7f0a052a" />
+    <public type="id" name="premium_settings_tier_1_container" id="0x7f0a052b" />
+    <public type="id" name="premium_settings_tier_2_container" id="0x7f0a052c" />
+    <public type="id" name="premium_settings_view_flipper" id="0x7f0a052d" />
+    <public type="id" name="premium_upsell_body" id="0x7f0a052e" />
+    <public type="id" name="premium_upsell_close" id="0x7f0a052f" />
+    <public type="id" name="premium_upsell_dots" id="0x7f0a0530" />
+    <public type="id" name="premium_upsell_header" id="0x7f0a0531" />
+    <public type="id" name="premium_upsell_img" id="0x7f0a0532" />
+    <public type="id" name="premium_upsell_learn_more" id="0x7f0a0533" />
+    <public type="id" name="premium_upsell_viewpager" id="0x7f0a0534" />
+    <public type="id" name="private_call_connect" id="0x7f0a0535" />
+    <public type="id" name="private_call_controls_disconnect" id="0x7f0a0536" />
+    <public type="id" name="private_call_controls_mute" id="0x7f0a0537" />
+    <public type="id" name="private_call_controls_video" id="0x7f0a0538" />
+    <public type="id" name="private_call_participant_list" id="0x7f0a0539" />
+    <public type="id" name="private_call_pip_participant" id="0x7f0a053a" />
+    <public type="id" name="private_call_push_to_talk" id="0x7f0a053b" />
+    <public type="id" name="private_call_status_container" id="0x7f0a053c" />
+    <public type="id" name="private_call_status_primary" id="0x7f0a053d" />
+    <public type="id" name="private_call_status_secondary" id="0x7f0a053e" />
+    <public type="id" name="private_call_top_guideline" id="0x7f0a053f" />
+    <public type="id" name="private_call_video_streams" id="0x7f0a0540" />
+    <public type="id" name="private_call_voice_status_group" id="0x7f0a0541" />
+    <public type="id" name="profile_strip_avatar" id="0x7f0a0542" />
+    <public type="id" name="profile_strip_avatar_image" id="0x7f0a0543" />
+    <public type="id" name="profile_strip_discriminator" id="0x7f0a0544" />
+    <public type="id" name="profile_strip_mentions" id="0x7f0a0545" />
+    <public type="id" name="profile_strip_name" id="0x7f0a0546" />
+    <public type="id" name="profile_strip_search" id="0x7f0a0547" />
+    <public type="id" name="profile_strip_settings" id="0x7f0a0548" />
+    <public type="id" name="profile_strip_status" id="0x7f0a0549" />
+    <public type="id" name="progress_bar" id="0x7f0a054a" />
+    <public type="id" name="progress_cancel_centered" id="0x7f0a054b" />
+    <public type="id" name="progress_cancel_top" id="0x7f0a054c" />
+    <public type="id" name="progress_circular" id="0x7f0a054d" />
+    <public type="id" name="progress_file_image" id="0x7f0a054e" />
+    <public type="id" name="progress_horizontal" id="0x7f0a054f" />
+    <public type="id" name="progress_subtext" id="0x7f0a0550" />
+    <public type="id" name="progress_text" id="0x7f0a0551" />
+    <public type="id" name="prune_user_cancel" id="0x7f0a0552" />
+    <public type="id" name="prune_user_header" id="0x7f0a0553" />
+    <public type="id" name="prune_user_prune" id="0x7f0a0554" />
+    <public type="id" name="prune_users_estimate_text" id="0x7f0a0555" />
+    <public type="id" name="prune_users_history_1_radio" id="0x7f0a0556" />
+    <public type="id" name="prune_users_history_2_radio" id="0x7f0a0557" />
+    <public type="id" name="prune_users_history_3_radio" id="0x7f0a0558" />
+    <public type="id" name="prune_users_loading_progressbar" id="0x7f0a0559" />
+    <public type="id" name="radio" id="0x7f0a055a" />
+    <public type="id" name="reaction_counter_text_1" id="0x7f0a055b" />
+    <public type="id" name="reaction_counter_text_2" id="0x7f0a055c" />
+    <public type="id" name="reaction_counter_text_switcher" id="0x7f0a055d" />
+    <public type="id" name="reaction_emoji_text" id="0x7f0a055e" />
+    <public type="id" name="reaction_quick_add" id="0x7f0a055f" />
+    <public type="id" name="restart" id="0x7f0a0560" />
+    <public type="id" name="result_count" id="0x7f0a0561" />
+    <public type="id" name="results_rv" id="0x7f0a0562" />
+    <public type="id" name="reverse" id="0x7f0a0563" />
+    <public type="id" name="rich_presence_container" id="0x7f0a0564" />
+    <public type="id" name="rich_presence_container_data" id="0x7f0a0565" />
+    <public type="id" name="rich_presence_details" id="0x7f0a0566" />
+    <public type="id" name="rich_presence_header" id="0x7f0a0567" />
+    <public type="id" name="rich_presence_image_large" id="0x7f0a0568" />
+    <public type="id" name="rich_presence_image_small" id="0x7f0a0569" />
+    <public type="id" name="rich_presence_music_duration" id="0x7f0a056a" />
+    <public type="id" name="rich_presence_music_elapsed" id="0x7f0a056b" />
+    <public type="id" name="rich_presence_play_button" id="0x7f0a056c" />
+    <public type="id" name="rich_presence_play_button_text" id="0x7f0a056d" />
+    <public type="id" name="rich_presence_state" id="0x7f0a056e" />
+    <public type="id" name="rich_presence_superbar" id="0x7f0a056f" />
+    <public type="id" name="rich_presence_time" id="0x7f0a0570" />
+    <public type="id" name="rich_presence_title" id="0x7f0a0571" />
+    <public type="id" name="rich_presence_watch_button" id="0x7f0a0572" />
+    <public type="id" name="right" id="0x7f0a0573" />
+    <public type="id" name="right_icon" id="0x7f0a0574" />
+    <public type="id" name="right_side" id="0x7f0a0575" />
+    <public type="id" name="role_item_checked_setting" id="0x7f0a0576" />
+    <public type="id" name="role_settings_add_reactions" id="0x7f0a0577" />
+    <public type="id" name="role_settings_administrator" id="0x7f0a0578" />
+    <public type="id" name="role_settings_attach_files" id="0x7f0a0579" />
+    <public type="id" name="role_settings_ban_members" id="0x7f0a057a" />
+    <public type="id" name="role_settings_change_nickname" id="0x7f0a057b" />
+    <public type="id" name="role_settings_color_disabled_overlay" id="0x7f0a057c" />
+    <public type="id" name="role_settings_color_selector_container" id="0x7f0a057d" />
+    <public type="id" name="role_settings_create_instant_invite" id="0x7f0a057e" />
+    <public type="id" name="role_settings_current_color_display" id="0x7f0a057f" />
+    <public type="id" name="role_settings_edit_name_disabled_overlay" id="0x7f0a0580" />
+    <public type="id" name="role_settings_embed_links" id="0x7f0a0581" />
+    <public type="id" name="role_settings_hoist_checkedsetting" id="0x7f0a0582" />
+    <public type="id" name="role_settings_kick_members" id="0x7f0a0583" />
+    <public type="id" name="role_settings_manage_channels" id="0x7f0a0584" />
+    <public type="id" name="role_settings_manage_emojis" id="0x7f0a0585" />
+    <public type="id" name="role_settings_manage_messages" id="0x7f0a0586" />
+    <public type="id" name="role_settings_manage_nicknames" id="0x7f0a0587" />
+    <public type="id" name="role_settings_manage_roles" id="0x7f0a0588" />
+    <public type="id" name="role_settings_manage_server" id="0x7f0a0589" />
+    <public type="id" name="role_settings_manage_webhooks" id="0x7f0a058a" />
+    <public type="id" name="role_settings_mention_everyone" id="0x7f0a058b" />
+    <public type="id" name="role_settings_mentionable_checkedsetting" id="0x7f0a058c" />
+    <public type="id" name="role_settings_overview_scroll" id="0x7f0a058d" />
+    <public type="id" name="role_settings_read_message_history" id="0x7f0a058e" />
+    <public type="id" name="role_settings_read_messages" id="0x7f0a058f" />
+    <public type="id" name="role_settings_send_messages" id="0x7f0a0590" />
+    <public type="id" name="role_settings_send_tts_messages" id="0x7f0a0591" />
+    <public type="id" name="role_settings_use_external_emojis" id="0x7f0a0592" />
+    <public type="id" name="role_settings_view_audit_log" id="0x7f0a0593" />
+    <public type="id" name="role_settings_voice_connect" id="0x7f0a0594" />
+    <public type="id" name="role_settings_voice_deafen_members" id="0x7f0a0595" />
+    <public type="id" name="role_settings_voice_move_members" id="0x7f0a0596" />
+    <public type="id" name="role_settings_voice_mute_members" id="0x7f0a0597" />
+    <public type="id" name="role_settings_voice_speak" id="0x7f0a0598" />
+    <public type="id" name="role_settings_voice_use_voice_activity" id="0x7f0a0599" />
+    <public type="id" name="role_spinner_item_textview" id="0x7f0a059a" />
+    <public type="id" name="roles_list_add_role_fab" id="0x7f0a059b" />
+    <public type="id" name="rotate_scroll_wheel" id="0x7f0a059c" />
+    <public type="id" name="row" id="0x7f0a059d" />
+    <public type="id" name="row_reverse" id="0x7f0a059e" />
+    <public type="id" name="save_image_matrix" id="0x7f0a059f" />
+    <public type="id" name="save_non_transition_alpha" id="0x7f0a05a0" />
+    <public type="id" name="save_scale_type" id="0x7f0a05a1" />
+    <public type="id" name="scale_scroll_wheel" id="0x7f0a05a2" />
+    <public type="id" name="screen" id="0x7f0a05a3" />
+    <public type="id" name="scroll" id="0x7f0a05a4" />
+    <public type="id" name="scrollIndicatorDown" id="0x7f0a05a5" />
+    <public type="id" name="scrollIndicatorUp" id="0x7f0a05a6" />
+    <public type="id" name="scrollView" id="0x7f0a05a7" />
+    <public type="id" name="scroll_view" id="0x7f0a05a8" />
+    <public type="id" name="scrollable" id="0x7f0a05a9" />
+    <public type="id" name="search_back" id="0x7f0a05aa" />
+    <public type="id" name="search_badge" id="0x7f0a05ab" />
+    <public type="id" name="search_bar" id="0x7f0a05ac" />
+    <public type="id" name="search_button" id="0x7f0a05ad" />
+    <public type="id" name="search_clear" id="0x7f0a05ae" />
+    <public type="id" name="search_close_btn" id="0x7f0a05af" />
+    <public type="id" name="search_edit_frame" id="0x7f0a05b0" />
+    <public type="id" name="search_filter" id="0x7f0a05b1" />
+    <public type="id" name="search_flipper" id="0x7f0a05b2" />
+    <public type="id" name="search_go_btn" id="0x7f0a05b3" />
+    <public type="id" name="search_input" id="0x7f0a05b4" />
+    <public type="id" name="search_mag_icon" id="0x7f0a05b5" />
+    <public type="id" name="search_plate" id="0x7f0a05b6" />
+    <public type="id" name="search_results_list" id="0x7f0a05b7" />
+    <public type="id" name="search_send_query_fab" id="0x7f0a05b8" />
+    <public type="id" name="search_src_text" id="0x7f0a05b9" />
+    <public type="id" name="search_suggestion_item_channel_container" id="0x7f0a05ba" />
+    <public type="id" name="search_suggestion_item_has_container" id="0x7f0a05bb" />
+    <public type="id" name="search_suggestion_item_recent_query_container" id="0x7f0a05bc" />
+    <public type="id" name="search_suggestion_item_user_container" id="0x7f0a05bd" />
+    <public type="id" name="search_suggestions_item_channel_icon" id="0x7f0a05be" />
+    <public type="id" name="search_suggestions_item_channel_text" id="0x7f0a05bf" />
+    <public type="id" name="search_suggestions_item_has_icon" id="0x7f0a05c0" />
+    <public type="id" name="search_suggestions_item_has_text" id="0x7f0a05c1" />
+    <public type="id" name="search_suggestions_item_recent_query_icon" id="0x7f0a05c2" />
+    <public type="id" name="search_suggestions_item_recent_query_text" id="0x7f0a05c3" />
+    <public type="id" name="search_suggestions_recycler" id="0x7f0a05c4" />
+    <public type="id" name="search_voice_btn" id="0x7f0a05c5" />
+    <public type="id" name="select_dialog_listview" id="0x7f0a05c6" />
+    <public type="id" name="selected" id="0x7f0a05c7" />
+    <public type="id" name="selected_checkmark" id="0x7f0a05c8" />
+    <public type="id" name="selection_indicator" id="0x7f0a05c9" />
+    <public type="id" name="send_btn" id="0x7f0a05ca" />
+    <public type="id" name="server_boost_status_empty_text" id="0x7f0a05cb" />
+    <public type="id" name="server_notifications_everyone_switch" id="0x7f0a05cc" />
+    <public type="id" name="server_notifications_frequency_0_radio" id="0x7f0a05cd" />
+    <public type="id" name="server_notifications_frequency_1_radio" id="0x7f0a05ce" />
+    <public type="id" name="server_notifications_frequency_2_radio" id="0x7f0a05cf" />
+    <public type="id" name="server_notifications_frequency_wrap" id="0x7f0a05d0" />
+    <public type="id" name="server_notifications_mute_check" id="0x7f0a05d1" />
+    <public type="id" name="server_notifications_push_switch" id="0x7f0a05d2" />
+    <public type="id" name="server_settings_audit_logs_action_filter" id="0x7f0a05d3" />
+    <public type="id" name="server_settings_audit_logs_action_filter_container" id="0x7f0a05d4" />
+    <public type="id" name="server_settings_audit_logs_recycler" id="0x7f0a05d5" />
+    <public type="id" name="server_settings_audit_logs_user_filter" id="0x7f0a05d6" />
+    <public type="id" name="server_settings_audit_logs_user_filter_container" id="0x7f0a05d7" />
+    <public type="id" name="server_settings_audit_logs_view_flipper" id="0x7f0a05d8" />
+    <public type="id" name="server_settings_audit_logs_view_results_flipper" id="0x7f0a05d9" />
+    <public type="id" name="server_settings_bans_option" id="0x7f0a05da" />
+    <public type="id" name="server_settings_bans_recycler" id="0x7f0a05db" />
+    <public type="id" name="server_settings_bans_search" id="0x7f0a05dc" />
+    <public type="id" name="server_settings_bans_view_flipper" id="0x7f0a05dd" />
+    <public type="id" name="server_settings_channels_create_channel" id="0x7f0a05de" />
+    <public type="id" name="server_settings_channels_sort_actions_category" id="0x7f0a05df" />
+    <public type="id" name="server_settings_channels_sort_actions_text" id="0x7f0a05e0" />
+    <public type="id" name="server_settings_channels_sort_actions_voice" id="0x7f0a05e1" />
+    <public type="id" name="server_settings_channels_text_recycler" id="0x7f0a05e2" />
+    <public type="id" name="server_settings_confirm_disable_integration_body" id="0x7f0a05e3" />
+    <public type="id" name="server_settings_confirm_disable_integration_cancel" id="0x7f0a05e4" />
+    <public type="id" name="server_settings_confirm_disable_integration_confirm" id="0x7f0a05e5" />
+    <public type="id" name="server_settings_confirm_disable_integration_header" id="0x7f0a05e6" />
+    <public type="id" name="server_settings_delete_server_cancel" id="0x7f0a05e7" />
+    <public type="id" name="server_settings_delete_server_confirm" id="0x7f0a05e8" />
+    <public type="id" name="server_settings_delete_server_header" id="0x7f0a05e9" />
+    <public type="id" name="server_settings_delete_server_mfa_code" id="0x7f0a05ea" />
+    <public type="id" name="server_settings_delete_server_mfa_wrap" id="0x7f0a05eb" />
+    <public type="id" name="server_settings_delete_server_text" id="0x7f0a05ec" />
+    <public type="id" name="server_settings_emojis_avatar" id="0x7f0a05ed" />
+    <public type="id" name="server_settings_emojis_container" id="0x7f0a05ee" />
+    <public type="id" name="server_settings_emojis_edit_alias" id="0x7f0a05ef" />
+    <public type="id" name="server_settings_emojis_edit_alias_save" id="0x7f0a05f0" />
+    <public type="id" name="server_settings_emojis_name" id="0x7f0a05f1" />
+    <public type="id" name="server_settings_emojis_option" id="0x7f0a05f2" />
+    <public type="id" name="server_settings_emojis_overflow" id="0x7f0a05f3" />
+    <public type="id" name="server_settings_emojis_username" id="0x7f0a05f4" />
+    <public type="id" name="server_settings_emojis_username_avatar" id="0x7f0a05f5" />
+    <public type="id" name="server_settings_instant_invites_option" id="0x7f0a05f6" />
+    <public type="id" name="server_settings_instant_invites_recycler" id="0x7f0a05f7" />
+    <public type="id" name="server_settings_instant_invites_view_flipper" id="0x7f0a05f8" />
+    <public type="id" name="server_settings_members_header_container" id="0x7f0a05f9" />
+    <public type="id" name="server_settings_members_name_search" id="0x7f0a05fa" />
+    <public type="id" name="server_settings_members_option" id="0x7f0a05fb" />
+    <public type="id" name="server_settings_members_recycler" id="0x7f0a05fc" />
+    <public type="id" name="server_settings_members_roles_spinner" id="0x7f0a05fd" />
+    <public type="id" name="server_settings_members_view_flipper" id="0x7f0a05fe" />
+    <public type="id" name="server_settings_moderation_explicit_1" id="0x7f0a05ff" />
+    <public type="id" name="server_settings_moderation_explicit_2" id="0x7f0a0600" />
+    <public type="id" name="server_settings_moderation_explicit_3" id="0x7f0a0601" />
+    <public type="id" name="server_settings_moderation_verification_1" id="0x7f0a0602" />
+    <public type="id" name="server_settings_moderation_verification_2" id="0x7f0a0603" />
+    <public type="id" name="server_settings_moderation_verification_3" id="0x7f0a0604" />
+    <public type="id" name="server_settings_moderation_verification_4" id="0x7f0a0605" />
+    <public type="id" name="server_settings_moderation_verification_5" id="0x7f0a0606" />
+    <public type="id" name="server_settings_option_audit_log" id="0x7f0a0607" />
+    <public type="id" name="server_settings_option_channels" id="0x7f0a0608" />
+    <public type="id" name="server_settings_option_integrations" id="0x7f0a0609" />
+    <public type="id" name="server_settings_option_moderation" id="0x7f0a060a" />
+    <public type="id" name="server_settings_option_overview" id="0x7f0a060b" />
+    <public type="id" name="server_settings_option_security" id="0x7f0a060c" />
+    <public type="id" name="server_settings_option_vanity_url" id="0x7f0a060d" />
+    <public type="id" name="server_settings_overview_afk_channel" id="0x7f0a060e" />
+    <public type="id" name="server_settings_overview_afk_channel_wrap" id="0x7f0a060f" />
+    <public type="id" name="server_settings_overview_afk_timeout" id="0x7f0a0610" />
+    <public type="id" name="server_settings_overview_afk_timeout_01" id="0x7f0a0611" />
+    <public type="id" name="server_settings_overview_afk_timeout_05" id="0x7f0a0612" />
+    <public type="id" name="server_settings_overview_afk_timeout_15" id="0x7f0a0613" />
+    <public type="id" name="server_settings_overview_afk_timeout_30" id="0x7f0a0614" />
+    <public type="id" name="server_settings_overview_afk_timeout_60" id="0x7f0a0615" />
+    <public type="id" name="server_settings_overview_afk_timeout_wrap" id="0x7f0a0616" />
+    <public type="id" name="server_settings_overview_icon" id="0x7f0a0617" />
+    <public type="id" name="server_settings_overview_icon_label" id="0x7f0a0618" />
+    <public type="id" name="server_settings_overview_icon_name_container" id="0x7f0a0619" />
+    <public type="id" name="server_settings_overview_icon_remove" id="0x7f0a061a" />
+    <public type="id" name="server_settings_overview_icon_text" id="0x7f0a061b" />
+    <public type="id" name="server_settings_overview_name" id="0x7f0a061c" />
+    <public type="id" name="server_settings_overview_notification_all" id="0x7f0a061d" />
+    <public type="id" name="server_settings_overview_notification_only_mentions" id="0x7f0a061e" />
+    <public type="id" name="server_settings_overview_region" id="0x7f0a061f" />
+    <public type="id" name="server_settings_overview_region_flag" id="0x7f0a0620" />
+    <public type="id" name="server_settings_overview_region_item_name" id="0x7f0a0621" />
+    <public type="id" name="server_settings_overview_region_list" id="0x7f0a0622" />
+    <public type="id" name="server_settings_overview_region_wrap" id="0x7f0a0623" />
+    <public type="id" name="server_settings_overview_save" id="0x7f0a0624" />
+    <public type="id" name="server_settings_overview_scroll" id="0x7f0a0625" />
+    <public type="id" name="server_settings_overview_system_channel" id="0x7f0a0626" />
+    <public type="id" name="server_settings_overview_system_channel_boost" id="0x7f0a0627" />
+    <public type="id" name="server_settings_overview_system_channel_join" id="0x7f0a0628" />
+    <public type="id" name="server_settings_overview_system_channel_wrap" id="0x7f0a0629" />
+    <public type="id" name="server_settings_overview_upload_banner" id="0x7f0a062a" />
+    <public type="id" name="server_settings_overview_upload_banner_container" id="0x7f0a062b" />
+    <public type="id" name="server_settings_overview_upload_banner_fab" id="0x7f0a062c" />
+    <public type="id" name="server_settings_overview_upload_banner_learn_more" id="0x7f0a062d" />
+    <public type="id" name="server_settings_overview_upload_banner_nitro_tier" id="0x7f0a062e" />
+    <public type="id" name="server_settings_overview_upload_banner_remove" id="0x7f0a062f" />
+    <public type="id" name="server_settings_overview_upload_banner_unlock" id="0x7f0a0630" />
+    <public type="id" name="server_settings_overview_upload_splash" id="0x7f0a0631" />
+    <public type="id" name="server_settings_overview_upload_splash_container" id="0x7f0a0632" />
+    <public type="id" name="server_settings_overview_upload_splash_fab" id="0x7f0a0633" />
+    <public type="id" name="server_settings_overview_upload_splash_learn_more" id="0x7f0a0634" />
+    <public type="id" name="server_settings_overview_upload_splash_nitro_tier" id="0x7f0a0635" />
+    <public type="id" name="server_settings_overview_upload_splash_remove" id="0x7f0a0636" />
+    <public type="id" name="server_settings_overview_upload_splash_unlock" id="0x7f0a0637" />
+    <public type="id" name="server_settings_role_item_bottom_divider" id="0x7f0a0638" />
+    <public type="id" name="server_settings_role_item_divider_targeted" id="0x7f0a0639" />
+    <public type="id" name="server_settings_role_item_drag_overlay" id="0x7f0a063a" />
+    <public type="id" name="server_settings_role_item_lock_indicator" id="0x7f0a063b" />
+    <public type="id" name="server_settings_role_item_name" id="0x7f0a063c" />
+    <public type="id" name="server_settings_roles_option" id="0x7f0a063d" />
+    <public type="id" name="server_settings_roles_recycler" id="0x7f0a063e" />
+    <public type="id" name="server_settings_section_general_settings" id="0x7f0a063f" />
+    <public type="id" name="server_settings_section_user_management" id="0x7f0a0640" />
+    <public type="id" name="server_settings_section_user_management_divider" id="0x7f0a0641" />
+    <public type="id" name="server_settings_security_dialog_cancel" id="0x7f0a0642" />
+    <public type="id" name="server_settings_security_dialog_confirm" id="0x7f0a0643" />
+    <public type="id" name="server_settings_security_label" id="0x7f0a0644" />
+    <public type="id" name="server_settings_security_server_mfa_code" id="0x7f0a0645" />
+    <public type="id" name="server_settings_security_toggle_mfa_button" id="0x7f0a0646" />
+    <public type="id" name="server_settings_server_icon" id="0x7f0a0647" />
+    <public type="id" name="server_settings_server_icon_text" id="0x7f0a0648" />
+    <public type="id" name="server_settings_server_name" id="0x7f0a0649" />
+    <public type="id" name="server_settings_vanity_input" id="0x7f0a064a" />
+    <public type="id" name="server_settings_vanity_url_current_url" id="0x7f0a064b" />
+    <public type="id" name="server_settings_vanity_url_error_text" id="0x7f0a064c" />
+    <public type="id" name="server_settings_vanity_url_input_container" id="0x7f0a064d" />
+    <public type="id" name="server_settings_vanity_url_loading_indicator" id="0x7f0a064e" />
+    <public type="id" name="server_settings_vanity_url_prefix" id="0x7f0a064f" />
+    <public type="id" name="server_settings_vanity_url_remove" id="0x7f0a0650" />
+    <public type="id" name="server_settings_vanity_url_save" id="0x7f0a0651" />
+    <public type="id" name="setting_button" id="0x7f0a0652" />
+    <public type="id" name="setting_container" id="0x7f0a0653" />
+    <public type="id" name="setting_disabled_overlay" id="0x7f0a0654" />
+    <public type="id" name="setting_label" id="0x7f0a0655" />
+    <public type="id" name="setting_subtext" id="0x7f0a0656" />
+    <public type="id" name="settings_account" id="0x7f0a0657" />
+    <public type="id" name="settings_account_avatar" id="0x7f0a0658" />
+    <public type="id" name="settings_account_avatar_container" id="0x7f0a0659" />
+    <public type="id" name="settings_account_avatar_edit" id="0x7f0a065a" />
+    <public type="id" name="settings_account_avatar_wrap" id="0x7f0a065b" />
+    <public type="id" name="settings_account_change_password" id="0x7f0a065c" />
+    <public type="id" name="settings_account_edit" id="0x7f0a065d" />
+    <public type="id" name="settings_account_email" id="0x7f0a065e" />
+    <public type="id" name="settings_account_mfa_container" id="0x7f0a065f" />
+    <public type="id" name="settings_account_mfa_disabled_container" id="0x7f0a0660" />
+    <public type="id" name="settings_account_mfa_enable" id="0x7f0a0661" />
+    <public type="id" name="settings_account_mfa_enabled_container" id="0x7f0a0662" />
+    <public type="id" name="settings_account_mfa_enabled_header" id="0x7f0a0663" />
+    <public type="id" name="settings_account_mfa_flipper" id="0x7f0a0664" />
+    <public type="id" name="settings_account_mfa_lottie" id="0x7f0a0665" />
+    <public type="id" name="settings_account_mfa_sales_pitch" id="0x7f0a0666" />
+    <public type="id" name="settings_account_private_data_delete" id="0x7f0a0667" />
+    <public type="id" name="settings_account_private_data_disable" id="0x7f0a0668" />
+    <public type="id" name="settings_account_private_data_wrap" id="0x7f0a0669" />
+    <public type="id" name="settings_account_remove_avatar" id="0x7f0a066a" />
+    <public type="id" name="settings_account_remove_two_fa" id="0x7f0a066b" />
+    <public type="id" name="settings_account_save" id="0x7f0a066c" />
+    <public type="id" name="settings_account_scroll" id="0x7f0a066d" />
+    <public type="id" name="settings_account_sms_backup" id="0x7f0a066e" />
+    <public type="id" name="settings_account_sms_phone" id="0x7f0a066f" />
+    <public type="id" name="settings_account_tag" id="0x7f0a0670" />
+    <public type="id" name="settings_account_verification" id="0x7f0a0671" />
+    <public type="id" name="settings_account_verification_resend" id="0x7f0a0672" />
+    <public type="id" name="settings_account_view_backup_codes" id="0x7f0a0673" />
+    <public type="id" name="settings_acknowledgements" id="0x7f0a0674" />
+    <public type="id" name="settings_app_info" id="0x7f0a0675" />
+    <public type="id" name="settings_appearance" id="0x7f0a0676" />
+    <public type="id" name="settings_appearance_font_scale_platform" id="0x7f0a0677" />
+    <public type="id" name="settings_appearance_font_scaling_container" id="0x7f0a0678" />
+    <public type="id" name="settings_appearance_font_scaling_reset" id="0x7f0a0679" />
+    <public type="id" name="settings_appearance_font_scaling_seekbar" id="0x7f0a067a" />
+    <public type="id" name="settings_appearance_font_scaling_seekbar_text_left" id="0x7f0a067b" />
+    <public type="id" name="settings_appearance_font_scaling_seekbar_text_right" id="0x7f0a067c" />
+    <public type="id" name="settings_appearance_sync_switch" id="0x7f0a067d" />
+    <public type="id" name="settings_appearance_theme_dark_radio" id="0x7f0a067e" />
+    <public type="id" name="settings_appearance_theme_light_radio" id="0x7f0a067f" />
+    <public type="id" name="settings_appearance_theme_pure_evil_radio" id="0x7f0a0680" />
+    <public type="id" name="settings_authorized_apps" id="0x7f0a0681" />
+    <public type="id" name="settings_backup_codes_generate" id="0x7f0a0682" />
+    <public type="id" name="settings_backup_codes_info" id="0x7f0a0683" />
+    <public type="id" name="settings_backup_codes_rv" id="0x7f0a0684" />
+    <public type="id" name="settings_behavior" id="0x7f0a0685" />
+    <public type="id" name="settings_behavior_back_button_toggle" id="0x7f0a0686" />
+    <public type="id" name="settings_behavior_browser_switch" id="0x7f0a0687" />
+    <public type="id" name="settings_behavior_dev_mode_switch" id="0x7f0a0688" />
+    <public type="id" name="settings_behavior_shift_send_toggle" id="0x7f0a0689" />
+    <public type="id" name="settings_billing" id="0x7f0a068a" />
+    <public type="id" name="settings_billing_view_pager" id="0x7f0a068b" />
+    <public type="id" name="settings_bitrate_help" id="0x7f0a068c" />
+    <public type="id" name="settings_boost_flipper" id="0x7f0a068d" />
+    <public type="id" name="settings_boost_no_sub_banner" id="0x7f0a068e" />
+    <public type="id" name="settings_boost_no_sub_learn_more" id="0x7f0a068f" />
+    <public type="id" name="settings_boost_no_sub_learn_more_text" id="0x7f0a0690" />
+    <public type="id" name="settings_boost_no_sub_logo" id="0x7f0a0691" />
+    <public type="id" name="settings_boost_recycler" id="0x7f0a0692" />
+    <public type="id" name="settings_boost_retry" id="0x7f0a0693" />
+    <public type="id" name="settings_boost_subtext" id="0x7f0a0694" />
+    <public type="id" name="settings_changelog" id="0x7f0a0695" />
+    <public type="id" name="settings_channel_list_category_item_drag" id="0x7f0a0696" />
+    <public type="id" name="settings_channel_list_category_item_text" id="0x7f0a0697" />
+    <public type="id" name="settings_channel_list_item_drag" id="0x7f0a0698" />
+    <public type="id" name="settings_channel_list_item_hash" id="0x7f0a0699" />
+    <public type="id" name="settings_channel_list_item_name" id="0x7f0a069a" />
+    <public type="id" name="settings_channel_list_item_selected_overlay" id="0x7f0a069b" />
+    <public type="id" name="settings_connections" id="0x7f0a069c" />
+    <public type="id" name="settings_developer_options" id="0x7f0a069d" />
+    <public type="id" name="settings_developer_options_divider" id="0x7f0a069e" />
+    <public type="id" name="settings_developer_options_header" id="0x7f0a069f" />
+    <public type="id" name="settings_game_activity" id="0x7f0a06a0" />
+    <public type="id" name="settings_games_detection_section" id="0x7f0a06a1" />
+    <public type="id" name="settings_games_playing_container" id="0x7f0a06a2" />
+    <public type="id" name="settings_games_playing_icon" id="0x7f0a06a3" />
+    <public type="id" name="settings_games_playing_subtitle" id="0x7f0a06a4" />
+    <public type="id" name="settings_games_playing_title" id="0x7f0a06a5" />
+    <public type="id" name="settings_games_status_cs" id="0x7f0a06a6" />
+    <public type="id" name="settings_games_track_cs" id="0x7f0a06a7" />
+    <public type="id" name="settings_gifting_flipper" id="0x7f0a06a8" />
+    <public type="id" name="settings_gifting_gift_code_input" id="0x7f0a06a9" />
+    <public type="id" name="settings_gifting_gift_code_input_progress" id="0x7f0a06aa" />
+    <public type="id" name="settings_gifting_gift_code_input_wrap" id="0x7f0a06ab" />
+    <public type="id" name="settings_gifting_nitro_classic_learn_more" id="0x7f0a06ac" />
+    <public type="id" name="settings_gifting_nitro_classic_monthly" id="0x7f0a06ad" />
+    <public type="id" name="settings_gifting_nitro_classic_yearly" id="0x7f0a06ae" />
+    <public type="id" name="settings_gifting_nitro_learn_more" id="0x7f0a06af" />
+    <public type="id" name="settings_gifting_nitro_monthly" id="0x7f0a06b0" />
+    <public type="id" name="settings_gifting_nitro_yearly" id="0x7f0a06b1" />
+    <public type="id" name="settings_gifting_retry" id="0x7f0a06b2" />
+    <public type="id" name="settings_giftting_inventory_recycler" id="0x7f0a06b3" />
+    <public type="id" name="settings_group_icon" id="0x7f0a06b4" />
+    <public type="id" name="settings_group_icon_label" id="0x7f0a06b5" />
+    <public type="id" name="settings_group_icon_remove" id="0x7f0a06b6" />
+    <public type="id" name="settings_inapp_notifs_switch" id="0x7f0a06b7" />
+    <public type="id" name="settings_language" id="0x7f0a06b8" />
+    <public type="id" name="settings_language_current" id="0x7f0a06b9" />
+    <public type="id" name="settings_language_current_flag" id="0x7f0a06ba" />
+    <public type="id" name="settings_language_current_text" id="0x7f0a06bb" />
+    <public type="id" name="settings_language_select_item_name" id="0x7f0a06bc" />
+    <public type="id" name="settings_language_select_item_name_localized" id="0x7f0a06bd" />
+    <public type="id" name="settings_language_select_list" id="0x7f0a06be" />
+    <public type="id" name="settings_language_sync_check" id="0x7f0a06bf" />
+    <public type="id" name="settings_nitro" id="0x7f0a06c0" />
+    <public type="id" name="settings_nitro_boosting" id="0x7f0a06c1" />
+    <public type="id" name="settings_nitro_gifting" id="0x7f0a06c2" />
+    <public type="id" name="settings_nitro_settings" id="0x7f0a06c3" />
+    <public type="id" name="settings_notification_os" id="0x7f0a06c4" />
+    <public type="id" name="settings_notification_os_label" id="0x7f0a06c5" />
+    <public type="id" name="settings_notification_switch" id="0x7f0a06c6" />
+    <public type="id" name="settings_notifications" id="0x7f0a06c7" />
+    <public type="id" name="settings_notifications_blink" id="0x7f0a06c8" />
+    <public type="id" name="settings_notifications_enabled" id="0x7f0a06c9" />
+    <public type="id" name="settings_notifications_mute_all" id="0x7f0a06ca" />
+    <public type="id" name="settings_notifications_vibrations" id="0x7f0a06cb" />
+    <public type="id" name="settings_notifications_wake_lock" id="0x7f0a06cc" />
+    <public type="id" name="settings_notifications_wrap" id="0x7f0a06cd" />
+    <public type="id" name="settings_privacy" id="0x7f0a06ce" />
+    <public type="id" name="settings_privacy_basic_service" id="0x7f0a06cf" />
+    <public type="id" name="settings_privacy_controls" id="0x7f0a06d0" />
+    <public type="id" name="settings_privacy_default_restricted_guilds" id="0x7f0a06d1" />
+    <public type="id" name="settings_privacy_defaults_existing_no" id="0x7f0a06d2" />
+    <public type="id" name="settings_privacy_defaults_existing_yes" id="0x7f0a06d3" />
+    <public type="id" name="settings_privacy_explicit_0" id="0x7f0a06d4" />
+    <public type="id" name="settings_privacy_explicit_1" id="0x7f0a06d5" />
+    <public type="id" name="settings_privacy_explicit_2" id="0x7f0a06d6" />
+    <public type="id" name="settings_privacy_friend_source_0" id="0x7f0a06d7" />
+    <public type="id" name="settings_privacy_friend_source_1" id="0x7f0a06d8" />
+    <public type="id" name="settings_privacy_friend_source_2" id="0x7f0a06d9" />
+    <public type="id" name="settings_privacy_personalization" id="0x7f0a06da" />
+    <public type="id" name="settings_privacy_request_data" id="0x7f0a06db" />
+    <public type="id" name="settings_privacy_request_data_link" id="0x7f0a06dc" />
+    <public type="id" name="settings_privacy_statistics" id="0x7f0a06dd" />
+    <public type="id" name="settings_support" id="0x7f0a06de" />
+    <public type="id" name="settings_text_images" id="0x7f0a06df" />
+    <public type="id" name="settings_text_images_allow_animate_emoji_switch" id="0x7f0a06e0" />
+    <public type="id" name="settings_text_images_attachments_toggle" id="0x7f0a06e1" />
+    <public type="id" name="settings_text_images_embeds_toggle" id="0x7f0a06e2" />
+    <public type="id" name="settings_text_images_links_toggle" id="0x7f0a06e3" />
+    <public type="id" name="settings_text_images_sync_toggle" id="0x7f0a06e4" />
+    <public type="id" name="settings_user_limit_help" id="0x7f0a06e5" />
+    <public type="id" name="settings_voice" id="0x7f0a06e6" />
+    <public type="id" name="settings_voice_audio_mode_call" id="0x7f0a06e7" />
+    <public type="id" name="settings_voice_audio_mode_communication" id="0x7f0a06e8" />
+    <public type="id" name="settings_voice_auto_vad_toggle" id="0x7f0a06e9" />
+    <public type="id" name="settings_voice_echo_cancellation_toggle" id="0x7f0a06ea" />
+    <public type="id" name="settings_voice_enable_hardware_scaling_toggle" id="0x7f0a06eb" />
+    <public type="id" name="settings_voice_gain_control_toggle" id="0x7f0a06ec" />
+    <public type="id" name="settings_voice_input_mode_radio_1" id="0x7f0a06ed" />
+    <public type="id" name="settings_voice_input_mode_radio_2" id="0x7f0a06ee" />
+    <public type="id" name="settings_voice_noise_suppression_toggle" id="0x7f0a06ef" />
+    <public type="id" name="settings_voice_opensles_default" id="0x7f0a06f0" />
+    <public type="id" name="settings_voice_opensles_force_disabled" id="0x7f0a06f1" />
+    <public type="id" name="settings_voice_opensles_force_enabled" id="0x7f0a06f2" />
+    <public type="id" name="settings_voice_output_volume" id="0x7f0a06f3" />
+    <public type="id" name="settings_voice_output_volume_wrap" id="0x7f0a06f4" />
+    <public type="id" name="settings_voice_overlay_toggle" id="0x7f0a06f5" />
+    <public type="id" name="settings_voice_overlay_wrap" id="0x7f0a06f6" />
+    <public type="id" name="settings_voice_sensitivity_automatic" id="0x7f0a06f7" />
+    <public type="id" name="settings_voice_sensitivity_header" id="0x7f0a06f8" />
+    <public type="id" name="settings_voice_sensitivity_label" id="0x7f0a06f9" />
+    <public type="id" name="settings_voice_sensitivity_manual" id="0x7f0a06fa" />
+    <public type="id" name="settings_voice_sensitivity_test_button" id="0x7f0a06fb" />
+    <public type="id" name="settings_voice_sensitivity_testing_container" id="0x7f0a06fc" />
+    <public type="id" name="settings_voice_sensitivity_wrap" id="0x7f0a06fd" />
+    <public type="id" name="settings_voice_use_speaker_toggle" id="0x7f0a06fe" />
+    <public type="id" name="settings_voice_video_container" id="0x7f0a06ff" />
+    <public type="id" name="shortcut" id="0x7f0a0700" />
+    <public type="id" name="showCustom" id="0x7f0a0701" />
+    <public type="id" name="showHome" id="0x7f0a0702" />
+    <public type="id" name="showTitle" id="0x7f0a0703" />
+    <public type="id" name="smallLabel" id="0x7f0a0704" />
+    <public type="id" name="snackbar_action" id="0x7f0a0705" />
+    <public type="id" name="snackbar_text" id="0x7f0a0706" />
+    <public type="id" name="snap" id="0x7f0a0707" />
+    <public type="id" name="snapMargins" id="0x7f0a0708" />
+    <public type="id" name="software" id="0x7f0a0709" />
+    <public type="id" name="space_around" id="0x7f0a070a" />
+    <public type="id" name="space_between" id="0x7f0a070b" />
+    <public type="id" name="spacer" id="0x7f0a070c" />
+    <public type="id" name="split_action_bar" id="0x7f0a070d" />
+    <public type="id" name="spread" id="0x7f0a070e" />
+    <public type="id" name="spread_inside" id="0x7f0a070f" />
+    <public type="id" name="src_atop" id="0x7f0a0710" />
+    <public type="id" name="src_in" id="0x7f0a0711" />
+    <public type="id" name="src_over" id="0x7f0a0712" />
+    <public type="id" name="src_toggle" id="0x7f0a0713" />
+    <public type="id" name="standard" id="0x7f0a0714" />
+    <public type="id" name="start" id="0x7f0a0715" />
+    <public type="id" name="state_aspect_ratio" id="0x7f0a0716" />
+    <public type="id" name="state_rotate" id="0x7f0a0717" />
+    <public type="id" name="state_scale" id="0x7f0a0718" />
+    <public type="id" name="status_connectivity" id="0x7f0a0719" />
+    <public type="id" name="status_connectivity_icon" id="0x7f0a071a" />
+    <public type="id" name="status_connectivity_limited" id="0x7f0a071b" />
+    <public type="id" name="status_connectivity_spinner" id="0x7f0a071c" />
+    <public type="id" name="status_connectivity_text" id="0x7f0a071d" />
+    <public type="id" name="status_unread_messages" id="0x7f0a071e" />
+    <public type="id" name="status_unread_messages_mark" id="0x7f0a071f" />
+    <public type="id" name="status_unread_messages_text" id="0x7f0a0720" />
+    <public type="id" name="status_wrap" id="0x7f0a0721" />
+    <public type="id" name="steps_button_container" id="0x7f0a0722" />
+    <public type="id" name="steps_cancel" id="0x7f0a0723" />
+    <public type="id" name="steps_close" id="0x7f0a0724" />
+    <public type="id" name="steps_done" id="0x7f0a0725" />
+    <public type="id" name="steps_next" id="0x7f0a0726" />
+    <public type="id" name="steps_viewpager" id="0x7f0a0727" />
+    <public type="id" name="storage" id="0x7f0a0728" />
+    <public type="id" name="stream_preview_image" id="0x7f0a0729" />
+    <public type="id" name="stream_preview_placeholder" id="0x7f0a072a" />
+    <public type="id" name="stream_preview_placeholder_caption" id="0x7f0a072b" />
+    <public type="id" name="stretch" id="0x7f0a072c" />
+    <public type="id" name="submenuarrow" id="0x7f0a072d" />
+    <public type="id" name="submit_area" id="0x7f0a072e" />
+    <public type="id" name="suggestion_example_answer" id="0x7f0a072f" />
+    <public type="id" name="suggestion_example_container" id="0x7f0a0730" />
+    <public type="id" name="suggestion_example_filter" id="0x7f0a0731" />
+    <public type="id" name="suggestion_example_icon" id="0x7f0a0732" />
+    <public type="id" name="suggestion_item_header" id="0x7f0a0733" />
+    <public type="id" name="suggestion_item_header_history_clear_icon" id="0x7f0a0734" />
+    <public type="id" name="suggestion_item_header_history_divider" id="0x7f0a0735" />
+    <public type="id" name="suggestion_item_header_history_text" id="0x7f0a0736" />
+    <public type="id" name="swipeRefreshLayout" id="0x7f0a0737" />
+    <public type="id" name="switchview" id="0x7f0a0738" />
+    <public type="id" name="tabMode" id="0x7f0a0739" />
+    <public type="id" name="tag_accessibility_actions" id="0x7f0a073a" />
+    <public type="id" name="tag_accessibility_clickable_spans" id="0x7f0a073b" />
+    <public type="id" name="tag_accessibility_heading" id="0x7f0a073c" />
+    <public type="id" name="tag_accessibility_pane_title" id="0x7f0a073d" />
+    <public type="id" name="tag_screen_reader_focusable" id="0x7f0a073e" />
+    <public type="id" name="tag_transition_group" id="0x7f0a073f" />
+    <public type="id" name="tag_unhandled_key_event_manager" id="0x7f0a0740" />
+    <public type="id" name="tag_unhandled_key_listeners" id="0x7f0a0741" />
+    <public type="id" name="take_photo_btn" id="0x7f0a0742" />
+    <public type="id" name="ternary_check_neutral" id="0x7f0a0743" />
+    <public type="id" name="ternary_check_off" id="0x7f0a0744" />
+    <public type="id" name="ternary_check_on" id="0x7f0a0745" />
+    <public type="id" name="test" id="0x7f0a0746" />
+    <public type="id" name="text" id="0x7f0a0747" />
+    <public type="id" name="text2" id="0x7f0a0748" />
+    <public type="id" name="textSpacerNoButtons" id="0x7f0a0749" />
+    <public type="id" name="textSpacerNoTitle" id="0x7f0a074a" />
+    <public type="id" name="textStart" id="0x7f0a074b" />
+    <public type="id" name="text_input" id="0x7f0a074c" />
+    <public type="id" name="text_input_password_toggle" id="0x7f0a074d" />
+    <public type="id" name="text_view_rotate" id="0x7f0a074e" />
+    <public type="id" name="text_view_scale" id="0x7f0a074f" />
+    <public type="id" name="textinput_counter" id="0x7f0a0750" />
+    <public type="id" name="textinput_error" id="0x7f0a0751" />
+    <public type="id" name="textinput_helper_text" id="0x7f0a0752" />
+    <public type="id" name="thumb_iv" id="0x7f0a0753" />
+    <public type="id" name="tile" id="0x7f0a0754" />
+    <public type="id" name="time" id="0x7f0a0755" />
+    <public type="id" name="title" id="0x7f0a0756" />
+    <public type="id" name="titleDividerNoCustom" id="0x7f0a0757" />
+    <public type="id" name="title_template" id="0x7f0a0758" />
+    <public type="id" name="toolbar" id="0x7f0a0759" />
+    <public type="id" name="toolbar_presence" id="0x7f0a075a" />
+    <public type="id" name="toolbar_title" id="0x7f0a075b" />
+    <public type="id" name="toolbar_title_subtext" id="0x7f0a075c" />
+    <public type="id" name="top" id="0x7f0a075d" />
+    <public type="id" name="topPanel" id="0x7f0a075e" />
+    <public type="id" name="torch" id="0x7f0a075f" />
+    <public type="id" name="touch_outside" id="0x7f0a0760" />
+    <public type="id" name="transition_current_scene" id="0x7f0a0761" />
+    <public type="id" name="transition_layout_save" id="0x7f0a0762" />
+    <public type="id" name="transition_position" id="0x7f0a0763" />
+    <public type="id" name="transition_scene_layoutid_cache" id="0x7f0a0764" />
+    <public type="id" name="transition_transform" id="0x7f0a0765" />
+    <public type="id" name="trash_wrap_icon" id="0x7f0a0766" />
+    <public type="id" name="trash_wrap_target_container" id="0x7f0a0767" />
+    <public type="id" name="trash_wrap_target_zone" id="0x7f0a0768" />
+    <public type="id" name="type_iv" id="0x7f0a0769" />
+    <public type="id" name="ucrop" id="0x7f0a076a" />
+    <public type="id" name="ucrop_frame" id="0x7f0a076b" />
+    <public type="id" name="ucrop_photobox" id="0x7f0a076c" />
+    <public type="id" name="uikit_chat_guideline" id="0x7f0a076d" />
+    <public type="id" name="uikit_sheet_header_guideline" id="0x7f0a076e" />
+    <public type="id" name="unhandled_uri_display" id="0x7f0a076f" />
+    <public type="id" name="unhandled_uri_okay" id="0x7f0a0770" />
+    <public type="id" name="uniform" id="0x7f0a0771" />
+    <public type="id" name="unlabeled" id="0x7f0a0772" />
+    <public type="id" name="unread_wrap" id="0x7f0a0773" />
+    <public type="id" name="up" id="0x7f0a0774" />
+    <public type="id" name="upgrade_premium_body" id="0x7f0a0775" />
+    <public type="id" name="upgrade_premium_cancel" id="0x7f0a0776" />
+    <public type="id" name="upgrade_premium_confirm" id="0x7f0a0777" />
+    <public type="id" name="upgrade_premium_error" id="0x7f0a0778" />
+    <public type="id" name="upgrade_premium_header" id="0x7f0a0779" />
+    <public type="id" name="upload_progress_1" id="0x7f0a077a" />
+    <public type="id" name="upload_progress_2" id="0x7f0a077b" />
+    <public type="id" name="upload_progress_3" id="0x7f0a077c" />
+    <public type="id" name="useLogo" id="0x7f0a077d" />
+    <public type="id" name="user_actions_dialog_avatar" id="0x7f0a077e" />
+    <public type="id" name="user_actions_dialog_block_item" id="0x7f0a077f" />
+    <public type="id" name="user_actions_dialog_remove_friend_item" id="0x7f0a0780" />
+    <public type="id" name="user_actions_dialog_unblock_item" id="0x7f0a0781" />
+    <public type="id" name="user_actions_dialog_user_name" id="0x7f0a0782" />
+    <public type="id" name="user_avatar_presence_avatar" id="0x7f0a0783" />
+    <public type="id" name="user_avatar_presence_container" id="0x7f0a0784" />
+    <public type="id" name="user_avatar_presence_indicator" id="0x7f0a0785" />
+    <public type="id" name="user_avatar_presence_padding_image" id="0x7f0a0786" />
+    <public type="id" name="user_captcha_help" id="0x7f0a0787" />
+    <public type="id" name="user_captcha_verify_button" id="0x7f0a0788" />
+    <public type="id" name="user_captcha_verify_button_anchor" id="0x7f0a0789" />
+    <public type="id" name="user_captcha_verify_button_cancel" id="0x7f0a078a" />
+    <public type="id" name="user_limit_seekbar" id="0x7f0a078b" />
+    <public type="id" name="user_list_item_avatar" id="0x7f0a078c" />
+    <public type="id" name="user_list_item_name" id="0x7f0a078d" />
+    <public type="id" name="user_list_item_name_secondary" id="0x7f0a078e" />
+    <public type="id" name="user_list_item_presence" id="0x7f0a078f" />
+    <public type="id" name="user_list_item_presence_wrapper" id="0x7f0a0790" />
+    <public type="id" name="user_mentions_filter_include_everyone" id="0x7f0a0791" />
+    <public type="id" name="user_mentions_filter_include_roles" id="0x7f0a0792" />
+    <public type="id" name="user_mentions_filter_this_server" id="0x7f0a0793" />
+    <public type="id" name="user_mentions_list" id="0x7f0a0794" />
+    <public type="id" name="user_mutual_friends_recycler_view" id="0x7f0a0795" />
+    <public type="id" name="user_mutual_guilds_recycler_view" id="0x7f0a0796" />
+    <public type="id" name="user_phone_add_anchor" id="0x7f0a0797" />
+    <public type="id" name="user_phone_add_country_code" id="0x7f0a0798" />
+    <public type="id" name="user_phone_add_next" id="0x7f0a0799" />
+    <public type="id" name="user_phone_add_number" id="0x7f0a079a" />
+    <public type="id" name="user_phone_add_wrap" id="0x7f0a079b" />
+    <public type="id" name="user_phone_digit_verification" id="0x7f0a079c" />
+    <public type="id" name="user_phone_verify_wrap" id="0x7f0a079d" />
+    <public type="id" name="user_profile_adapter_item_empty" id="0x7f0a079e" />
+    <public type="id" name="user_profile_adapter_item_empty_text" id="0x7f0a079f" />
+    <public type="id" name="user_profile_adapter_item_friend_avatar" id="0x7f0a07a0" />
+    <public type="id" name="user_profile_adapter_item_friend_mutual" id="0x7f0a07a1" />
+    <public type="id" name="user_profile_adapter_item_friend_mutual_image" id="0x7f0a07a2" />
+    <public type="id" name="user_profile_adapter_item_friend_mutual_text" id="0x7f0a07a3" />
+    <public type="id" name="user_profile_adapter_item_friend_presence" id="0x7f0a07a4" />
+    <public type="id" name="user_profile_adapter_item_friend_user_game" id="0x7f0a07a5" />
+    <public type="id" name="user_profile_adapter_item_friend_user_name" id="0x7f0a07a6" />
+    <public type="id" name="user_profile_adapter_item_server_image" id="0x7f0a07a7" />
+    <public type="id" name="user_profile_adapter_item_server_name" id="0x7f0a07a8" />
+    <public type="id" name="user_profile_adapter_item_server_nick" id="0x7f0a07a9" />
+    <public type="id" name="user_profile_adapter_item_server_text" id="0x7f0a07aa" />
+    <public type="id" name="user_profile_adapter_item_server_wrap" id="0x7f0a07ab" />
+    <public type="id" name="user_profile_admin_ban" id="0x7f0a07ac" />
+    <public type="id" name="user_profile_admin_edit_member" id="0x7f0a07ad" />
+    <public type="id" name="user_profile_admin_kick" id="0x7f0a07ae" />
+    <public type="id" name="user_profile_admin_server_deafen" id="0x7f0a07af" />
+    <public type="id" name="user_profile_admin_server_move" id="0x7f0a07b0" />
+    <public type="id" name="user_profile_admin_server_mute" id="0x7f0a07b1" />
+    <public type="id" name="user_profile_avatar_presence" id="0x7f0a07b2" />
+    <public type="id" name="user_profile_connections_mutual_friends_item" id="0x7f0a07b3" />
+    <public type="id" name="user_profile_connections_mutual_guilds_item" id="0x7f0a07b4" />
+    <public type="id" name="user_profile_connections_view_recycler" id="0x7f0a07b5" />
+    <public type="id" name="user_profile_header_badges_recycler" id="0x7f0a07b6" />
+    <public type="id" name="user_profile_header_custom_status" id="0x7f0a07b7" />
+    <public type="id" name="user_profile_header_name_wrap" id="0x7f0a07b8" />
+    <public type="id" name="user_profile_header_primary_name" id="0x7f0a07b9" />
+    <public type="id" name="user_profile_header_secondary_name" id="0x7f0a07ba" />
+    <public type="id" name="user_selected_checkbox" id="0x7f0a07bb" />
+    <public type="id" name="user_settings_mfa_enable_input_digits" id="0x7f0a07bc" />
+    <public type="id" name="user_settings_profile_header_view" id="0x7f0a07bd" />
+    <public type="id" name="user_sheet_activity_divider" id="0x7f0a07be" />
+    <public type="id" name="user_sheet_add_friend_action_button" id="0x7f0a07bf" />
+    <public type="id" name="user_sheet_admin_view" id="0x7f0a07c0" />
+    <public type="id" name="user_sheet_audio_settings_divider" id="0x7f0a07c1" />
+    <public type="id" name="user_sheet_badge_image" id="0x7f0a07c2" />
+    <public type="id" name="user_sheet_call_action_button" id="0x7f0a07c3" />
+    <public type="id" name="user_sheet_connections_divider" id="0x7f0a07c4" />
+    <public type="id" name="user_sheet_connections_header" id="0x7f0a07c5" />
+    <public type="id" name="user_sheet_connections_view" id="0x7f0a07c6" />
+    <public type="id" name="user_sheet_copy_id" id="0x7f0a07c7" />
+    <public type="id" name="user_sheet_developer_divider" id="0x7f0a07c8" />
+    <public type="id" name="user_sheet_developer_header" id="0x7f0a07c9" />
+    <public type="id" name="user_sheet_friend_request_accept_button" id="0x7f0a07ca" />
+    <public type="id" name="user_sheet_friend_request_ignore_button" id="0x7f0a07cb" />
+    <public type="id" name="user_sheet_friend_request_incoming_container" id="0x7f0a07cc" />
+    <public type="id" name="user_sheet_guild_container" id="0x7f0a07cd" />
+    <public type="id" name="user_sheet_guild_divider" id="0x7f0a07ce" />
+    <public type="id" name="user_sheet_guild_header" id="0x7f0a07cf" />
+    <public type="id" name="user_sheet_header" id="0x7f0a07d0" />
+    <public type="id" name="user_sheet_incoming_friend_request_divider" id="0x7f0a07d1" />
+    <public type="id" name="user_sheet_incoming_friend_request_header" id="0x7f0a07d2" />
+    <public type="id" name="user_sheet_message_action_button" id="0x7f0a07d3" />
+    <public type="id" name="user_sheet_more_button" id="0x7f0a07d4" />
+    <public type="id" name="user_sheet_muted" id="0x7f0a07d5" />
+    <public type="id" name="user_sheet_note_divider" id="0x7f0a07d6" />
+    <public type="id" name="user_sheet_note_header" id="0x7f0a07d7" />
+    <public type="id" name="user_sheet_note_text_field" id="0x7f0a07d8" />
+    <public type="id" name="user_sheet_pending_friend_request_action_button" id="0x7f0a07d9" />
+    <public type="id" name="user_sheet_profile_actions_container" id="0x7f0a07da" />
+    <public type="id" name="user_sheet_profile_actions_divider" id="0x7f0a07db" />
+    <public type="id" name="user_sheet_profile_header_view" id="0x7f0a07dc" />
+    <public type="id" name="user_sheet_profile_voice_settings_view" id="0x7f0a07dd" />
+    <public type="id" name="user_sheet_roles_recycler" id="0x7f0a07de" />
+    <public type="id" name="user_sheet_video_action_button" id="0x7f0a07df" />
+    <public type="id" name="user_sheet_volume" id="0x7f0a07e0" />
+    <public type="id" name="user_status_presence_dot" id="0x7f0a07e1" />
+    <public type="id" name="user_status_presence_subtitle" id="0x7f0a07e2" />
+    <public type="id" name="user_status_presence_title" id="0x7f0a07e3" />
+    <public type="id" name="user_status_update_dnd" id="0x7f0a07e4" />
+    <public type="id" name="user_status_update_idle" id="0x7f0a07e5" />
+    <public type="id" name="user_status_update_invisible" id="0x7f0a07e6" />
+    <public type="id" name="user_status_update_online" id="0x7f0a07e7" />
+    <public type="id" name="username_placeholder_end_guideline" id="0x7f0a07e8" />
+    <public type="id" name="verify_digit_1" id="0x7f0a07e9" />
+    <public type="id" name="verify_digit_2" id="0x7f0a07ea" />
+    <public type="id" name="verify_digit_3" id="0x7f0a07eb" />
+    <public type="id" name="verify_digit_4" id="0x7f0a07ec" />
+    <public type="id" name="verify_digit_5" id="0x7f0a07ed" />
+    <public type="id" name="verify_digit_6" id="0x7f0a07ee" />
+    <public type="id" name="view_dialog_confirmation_cancel" id="0x7f0a07ef" />
+    <public type="id" name="view_dialog_confirmation_confirm" id="0x7f0a07f0" />
+    <public type="id" name="view_dialog_confirmation_header" id="0x7f0a07f1" />
+    <public type="id" name="view_dialog_confirmation_text" id="0x7f0a07f2" />
+    <public type="id" name="view_input" id="0x7f0a07f3" />
+    <public type="id" name="view_offset_helper" id="0x7f0a07f4" />
+    <public type="id" name="view_overlay" id="0x7f0a07f5" />
+    <public type="id" name="view_pager" id="0x7f0a07f6" />
+    <public type="id" name="visible" id="0x7f0a07f7" />
+    <public type="id" name="voice" id="0x7f0a07f8" />
+    <public type="id" name="voice_actions_connect" id="0x7f0a07f9" />
+    <public type="id" name="voice_actions_copy_id" id="0x7f0a07fa" />
+    <public type="id" name="voice_actions_disconnect" id="0x7f0a07fb" />
+    <public type="id" name="voice_actions_header" id="0x7f0a07fc" />
+    <public type="id" name="voice_actions_icon" id="0x7f0a07fd" />
+    <public type="id" name="voice_actions_settings" id="0x7f0a07fe" />
+    <public type="id" name="voice_actions_settings_divider" id="0x7f0a07ff" />
+    <public type="id" name="voice_actions_user_count" id="0x7f0a0800" />
+    <public type="id" name="voice_actions_users_recyclerview" id="0x7f0a0801" />
+    <public type="id" name="voice_connected_container" id="0x7f0a0802" />
+    <public type="id" name="voice_connected_description" id="0x7f0a0803" />
+    <public type="id" name="voice_connected_ptt" id="0x7f0a0804" />
+    <public type="id" name="voice_connected_quality" id="0x7f0a0805" />
+    <public type="id" name="voice_connected_status_container" id="0x7f0a0806" />
+    <public type="id" name="voice_connected_text" id="0x7f0a0807" />
+    <public type="id" name="voice_divider" id="0x7f0a0808" />
+    <public type="id" name="voice_expand" id="0x7f0a0809" />
+    <public type="id" name="voice_fullscreen_controls_connect" id="0x7f0a080a" />
+    <public type="id" name="voice_fullscreen_controls_controls_wrap" id="0x7f0a080b" />
+    <public type="id" name="voice_fullscreen_controls_deafen_state" id="0x7f0a080c" />
+    <public type="id" name="voice_fullscreen_controls_disconnect" id="0x7f0a080d" />
+    <public type="id" name="voice_fullscreen_controls_mute_state" id="0x7f0a080e" />
+    <public type="id" name="voice_fullscreen_controls_num_users_connected" id="0x7f0a080f" />
+    <public type="id" name="voice_fullscreen_controls_ptt" id="0x7f0a0810" />
+    <public type="id" name="voice_fullscreen_controls_speaker" id="0x7f0a0811" />
+    <public type="id" name="voice_info_connecting" id="0x7f0a0812" />
+    <public type="id" name="voice_info_overlay" id="0x7f0a0813" />
+    <public type="id" name="voice_info_talking_users" id="0x7f0a0814" />
+    <public type="id" name="voice_info_wrap" id="0x7f0a0815" />
+    <public type="id" name="voice_list_item_user" id="0x7f0a0816" />
+    <public type="id" name="voice_ongoing_container" id="0x7f0a0817" />
+    <public type="id" name="voice_ongoing_user_count_label" id="0x7f0a0818" />
+    <public type="id" name="voice_user_avatar" id="0x7f0a0819" />
+    <public type="id" name="voice_user_list_item_deafen_indicator" id="0x7f0a081a" />
+    <public type="id" name="voice_user_list_item_header_label" id="0x7f0a081b" />
+    <public type="id" name="voice_user_list_item_mute_indicator" id="0x7f0a081c" />
+    <public type="id" name="voice_user_list_item_user_avatar" id="0x7f0a081d" />
+    <public type="id" name="voice_user_list_item_user_name" id="0x7f0a081e" />
+    <public type="id" name="voice_user_name_display" id="0x7f0a081f" />
+    <public type="id" name="web_view" id="0x7f0a0820" />
+    <public type="id" name="welcome_card_invite_friends" id="0x7f0a0821" />
+    <public type="id" name="welcome_card_upload_icon" id="0x7f0a0822" />
+    <public type="id" name="wide" id="0x7f0a0823" />
+    <public type="id" name="widget_add_friend_user_list_item" id="0x7f0a0824" />
+    <public type="id" name="widget_auth_mfa_backup_codes_cancel" id="0x7f0a0825" />
+    <public type="id" name="widget_auth_mfa_backup_codes_edittext" id="0x7f0a0826" />
+    <public type="id" name="widget_auth_mfa_backup_codes_send" id="0x7f0a0827" />
+    <public type="id" name="widget_auth_mfa_info_okay" id="0x7f0a0828" />
+    <public type="id" name="widget_auth_mfa_info_text" id="0x7f0a0829" />
+    <public type="id" name="widget_channel_search_item" id="0x7f0a082a" />
+    <public type="id" name="widget_channel_search_item_remove" id="0x7f0a082b" />
+    <public type="id" name="widget_channel_settings_permissions_overview_members_recycler" id="0x7f0a082c" />
+    <public type="id" name="widget_channel_settings_permissions_overview_roles_recycler" id="0x7f0a082d" />
+    <public type="id" name="widget_channel_topic" id="0x7f0a082e" />
+    <public type="id" name="widget_channels" id="0x7f0a082f" />
+    <public type="id" name="widget_chat_detached" id="0x7f0a0830" />
+    <public type="id" name="widget_chat_input" id="0x7f0a0831" />
+    <public type="id" name="widget_chat_list" id="0x7f0a0832" />
+    <public type="id" name="widget_chat_typing" id="0x7f0a0833" />
+    <public type="id" name="widget_chat_voice" id="0x7f0a0834" />
+    <public type="id" name="widget_collapsed_user_count" id="0x7f0a0835" />
+    <public type="id" name="widget_collapsed_user_imageview" id="0x7f0a0836" />
+    <public type="id" name="widget_connected_list" id="0x7f0a0837" />
+    <public type="id" name="widget_friends_list" id="0x7f0a0838" />
+    <public type="id" name="widget_guilds" id="0x7f0a0839" />
+    <public type="id" name="widget_profile_strip" id="0x7f0a083a" />
+    <public type="id" name="widget_search_results" id="0x7f0a083b" />
+    <public type="id" name="widget_search_suggestions" id="0x7f0a083c" />
+    <public type="id" name="widget_server_settings_channels_container" id="0x7f0a083d" />
+    <public type="id" name="widget_server_settings_emojis_recycler" id="0x7f0a083e" />
+    <public type="id" name="widget_server_settings_emojis_section" id="0x7f0a083f" />
+    <public type="id" name="widget_server_settings_emojis_upload" id="0x7f0a0840" />
+    <public type="id" name="widget_server_settings_emojis_upload_description" id="0x7f0a0841" />
+    <public type="id" name="widget_server_settings_emojis_view_flipper" id="0x7f0a0842" />
+    <public type="id" name="widget_status" id="0x7f0a0843" />
+    <public type="id" name="withText" id="0x7f0a0844" />
+    <public type="id" name="wrap" id="0x7f0a0845" />
+    <public type="id" name="wrap_content" id="0x7f0a0846" />
+    <public type="id" name="wrap_reverse" id="0x7f0a0847" />
+    <public type="id" name="wrapper_controls" id="0x7f0a0848" />
+    <public type="id" name="wrapper_reset_rotate" id="0x7f0a0849" />
+    <public type="id" name="wrapper_rotate_by_angle" id="0x7f0a084a" />
+    <public type="id" name="wrapper_states" id="0x7f0a084b" />
     <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" />
@@ -5282,394 +5207,383 @@
     <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="layout" name="support_simple_spinner_dropdown_item" id="0x7f0d0061" />
+    <public type="layout" name="trash_wrap" id="0x7f0d0062" />
+    <public type="layout" name="ucrop_activity_photobox" id="0x7f0d0063" />
+    <public type="layout" name="ucrop_aspect_ratio" id="0x7f0d0064" />
+    <public type="layout" name="ucrop_controls" id="0x7f0d0065" />
+    <public type="layout" name="ucrop_fragment_photobox" id="0x7f0d0066" />
+    <public type="layout" name="ucrop_layout_rotate_wheel" id="0x7f0d0067" />
+    <public type="layout" name="ucrop_layout_scale_wheel" id="0x7f0d0068" />
+    <public type="layout" name="ucrop_view" id="0x7f0d0069" />
+    <public type="layout" name="user_actions_dialog" id="0x7f0d006a" />
+    <public type="layout" name="user_profile_admin_view" id="0x7f0d006b" />
+    <public type="layout" name="user_profile_connections_view" id="0x7f0d006c" />
+    <public type="layout" name="user_profile_header_badge" id="0x7f0d006d" />
+    <public type="layout" name="user_profile_header_view" id="0x7f0d006e" />
+    <public type="layout" name="user_profile_voice_settings_view" id="0x7f0d006f" />
+    <public type="layout" name="view_account_credit" id="0x7f0d0070" />
+    <public type="layout" name="view_active_subscription" id="0x7f0d0071" />
+    <public type="layout" name="view_add_override_item" id="0x7f0d0072" />
+    <public type="layout" name="view_application_news" id="0x7f0d0073" />
+    <public type="layout" name="view_attachment_preview_item" id="0x7f0d0074" />
+    <public type="layout" name="view_boost_progress_bar" id="0x7f0d0075" />
+    <public type="layout" name="view_boost_status_no_boosts" id="0x7f0d0076" />
+    <public type="layout" name="view_boost_user_settings_perks" id="0x7f0d0077" />
+    <public type="layout" name="view_boxed_button" id="0x7f0d0078" />
+    <public type="layout" name="view_camera_permissions" id="0x7f0d0079" />
+    <public type="layout" name="view_category_override_item" id="0x7f0d007a" />
+    <public type="layout" name="view_channel_override_item" id="0x7f0d007b" />
+    <public type="layout" name="view_chat_action_item" id="0x7f0d007c" />
+    <public type="layout" name="view_chat_embed_game_invite" id="0x7f0d007d" />
+    <public type="layout" name="view_chat_list_actions_emoji_item" id="0x7f0d007e" />
+    <public type="layout" name="view_checkable_role_list_item" id="0x7f0d007f" />
+    <public type="layout" name="view_checkable_role_list_item_themed" id="0x7f0d0080" />
+    <public type="layout" name="view_chip" id="0x7f0d0081" />
+    <public type="layout" name="view_chip_default" id="0x7f0d0082" />
+    <public type="layout" name="view_dialog_confirmation" id="0x7f0d0083" />
+    <public type="layout" name="view_digit_verification" id="0x7f0d0084" />
+    <public type="layout" name="view_edit_payment_info" id="0x7f0d0085" />
+    <public type="layout" name="view_emoji_item" id="0x7f0d0086" />
+    <public type="layout" name="view_file_item" id="0x7f0d0087" />
+    <public type="layout" name="view_gift_entitlement_list_item" id="0x7f0d0088" />
+    <public type="layout" name="view_gift_sku_list_item" id="0x7f0d0089" />
+    <public type="layout" name="view_global_search_item" id="0x7f0d008a" />
+    <public type="layout" name="view_grid_image" id="0x7f0d008b" />
+    <public type="layout" name="view_guild" id="0x7f0d008c" />
+    <public type="layout" name="view_guild_invite_bottom_sheet" id="0x7f0d008d" />
+    <public type="layout" name="view_image" id="0x7f0d008e" />
+    <public type="layout" name="view_input_modal" id="0x7f0d008f" />
+    <public type="layout" name="view_invite_settings_channel_spinner_item" id="0x7f0d0090" />
+    <public type="layout" name="view_invite_settngs_channel_spinner_item_open" id="0x7f0d0091" />
+    <public type="layout" name="view_loading_button" id="0x7f0d0092" />
+    <public type="layout" name="view_nitro_boost_perks" id="0x7f0d0093" />
+    <public type="layout" name="view_nitro_boost_perks_list_item" id="0x7f0d0094" />
+    <public type="layout" name="view_no_gifts_list_item" id="0x7f0d0095" />
+    <public type="layout" name="view_overlay_menu" id="0x7f0d0096" />
+    <public type="layout" name="view_overlay_menu_content" id="0x7f0d0097" />
+    <public type="layout" name="view_premium_settings_perks" id="0x7f0d0098" />
+    <public type="layout" name="view_premium_settings_tier_1" id="0x7f0d0099" />
+    <public type="layout" name="view_premium_settings_tier_2" id="0x7f0d009a" />
+    <public type="layout" name="view_radio_button" id="0x7f0d009b" />
+    <public type="layout" name="view_review_request_modal_image" id="0x7f0d009c" />
+    <public type="layout" name="view_role_item_text" id="0x7f0d009d" />
+    <public type="layout" name="view_server_folder" id="0x7f0d009e" />
+    <public type="layout" name="view_server_settings_icon_name" id="0x7f0d009f" />
+    <public type="layout" name="view_server_settings_notifications" id="0x7f0d00a0" />
+    <public type="layout" name="view_server_settings_region" id="0x7f0d00a1" />
+    <public type="layout" name="view_server_settings_system_channel_wrap" id="0x7f0d00a2" />
+    <public type="layout" name="view_server_settings_upload_banner" id="0x7f0d00a3" />
+    <public type="layout" name="view_server_settings_upload_splash" id="0x7f0d00a4" />
+    <public type="layout" name="view_setting_check" id="0x7f0d00a5" />
+    <public type="layout" name="view_setting_radio" id="0x7f0d00a6" />
+    <public type="layout" name="view_setting_switch" id="0x7f0d00a7" />
+    <public type="layout" name="view_settings_boost_available_listitem" id="0x7f0d00a8" />
+    <public type="layout" name="view_settings_boost_info_listitem" id="0x7f0d00a9" />
+    <public type="layout" name="view_settings_boosted_guild_listitem" id="0x7f0d00aa" />
+    <public type="layout" name="view_settings_gifting_nitro" id="0x7f0d00ab" />
+    <public type="layout" name="view_settings_gifting_nitro_classic" id="0x7f0d00ac" />
+    <public type="layout" name="view_steps" id="0x7f0d00ad" />
+    <public type="layout" name="view_ternary_checkbox" id="0x7f0d00ae" />
+    <public type="layout" name="view_toolbar_title" id="0x7f0d00af" />
+    <public type="layout" name="view_upload_progress" id="0x7f0d00b0" />
+    <public type="layout" name="view_user_avatar_presence" id="0x7f0d00b1" />
+    <public type="layout" name="view_user_list_item" id="0x7f0d00b2" />
+    <public type="layout" name="view_user_status_presence" id="0x7f0d00b3" />
+    <public type="layout" name="view_video_call_participant" id="0x7f0d00b4" />
+    <public type="layout" name="view_voice_user" id="0x7f0d00b5" />
+    <public type="layout" name="voice_controls_view" id="0x7f0d00b6" />
+    <public type="layout" name="voice_user_list_item_divider" id="0x7f0d00b7" />
+    <public type="layout" name="voice_user_list_item_header" id="0x7f0d00b8" />
+    <public type="layout" name="voice_user_list_item_user" id="0x7f0d00b9" />
+    <public type="layout" name="widget_accept_gift_dialog" id="0x7f0d00ba" />
+    <public type="layout" name="widget_add_friend_user_list_item" id="0x7f0d00bb" />
+    <public type="layout" name="widget_audit_log_filter_sheet" id="0x7f0d00bc" />
+    <public type="layout" name="widget_auth_captcha" id="0x7f0d00bd" />
+    <public type="layout" name="widget_auth_header" id="0x7f0d00be" />
+    <public type="layout" name="widget_auth_invite_info" id="0x7f0d00bf" />
+    <public type="layout" name="widget_auth_landing" id="0x7f0d00c0" />
+    <public type="layout" name="widget_auth_landing_samsung" id="0x7f0d00c1" />
+    <public type="layout" name="widget_auth_login" id="0x7f0d00c2" />
+    <public type="layout" name="widget_auth_mfa" id="0x7f0d00c3" />
+    <public type="layout" name="widget_auth_mfa_backup_codes" id="0x7f0d00c4" />
+    <public type="layout" name="widget_auth_mfa_info" id="0x7f0d00c5" />
+    <public type="layout" name="widget_auth_register" id="0x7f0d00c6" />
+    <public type="layout" name="widget_auth_undelete_account" id="0x7f0d00c7" />
+    <public type="layout" name="widget_ban_user" id="0x7f0d00c8" />
+    <public type="layout" name="widget_cancel_premium_dialog" id="0x7f0d00c9" />
+    <public type="layout" name="widget_change_log" id="0x7f0d00ca" />
+    <public type="layout" name="widget_channel_group_dm_settings" id="0x7f0d00cb" />
+    <public type="layout" name="widget_channel_members_list" id="0x7f0d00cc" />
+    <public type="layout" name="widget_channel_members_list_item_header" id="0x7f0d00cd" />
+    <public type="layout" name="widget_channel_members_list_item_loading" id="0x7f0d00ce" />
+    <public type="layout" name="widget_channel_members_list_item_user" id="0x7f0d00cf" />
+    <public type="layout" name="widget_channel_notification_settings" id="0x7f0d00d0" />
+    <public type="layout" name="widget_channel_pinned_messages" id="0x7f0d00d1" />
+    <public type="layout" name="widget_channel_search_item" id="0x7f0d00d2" />
+    <public type="layout" name="widget_channel_search_item_header" id="0x7f0d00d3" />
+    <public type="layout" name="widget_channel_selector" id="0x7f0d00d4" />
+    <public type="layout" name="widget_channel_selector_item" id="0x7f0d00d5" />
+    <public type="layout" name="widget_channel_settings_delete" id="0x7f0d00d6" />
+    <public type="layout" name="widget_channel_settings_edit_permissions" id="0x7f0d00d7" />
+    <public type="layout" name="widget_channel_settings_permissions_add_member" id="0x7f0d00d8" />
+    <public type="layout" name="widget_channel_settings_permissions_add_role" id="0x7f0d00d9" />
+    <public type="layout" name="widget_channel_settings_permissions_overview" id="0x7f0d00da" />
+    <public type="layout" name="widget_channel_topic" id="0x7f0d00db" />
+    <public type="layout" name="widget_channels_list" id="0x7f0d00dc" />
+    <public type="layout" name="widget_channels_list_actions_change_nickname" id="0x7f0d00dd" />
+    <public type="layout" name="widget_channels_list_actions_leave_server" id="0x7f0d00de" />
+    <public type="layout" name="widget_channels_list_item_category" id="0x7f0d00df" />
+    <public type="layout" name="widget_channels_list_item_channel" id="0x7f0d00e0" />
+    <public type="layout" name="widget_channels_list_item_channel_private" id="0x7f0d00e1" />
+    <public type="layout" name="widget_channels_list_item_channel_voice" id="0x7f0d00e2" />
+    <public type="layout" name="widget_channels_list_item_friends" id="0x7f0d00e3" />
+    <public type="layout" name="widget_channels_list_item_header" id="0x7f0d00e4" />
+    <public type="layout" name="widget_channels_list_item_invite" id="0x7f0d00e5" />
+    <public type="layout" name="widget_channels_list_item_mfa" id="0x7f0d00e6" />
+    <public type="layout" name="widget_channels_list_item_text_actions" id="0x7f0d00e7" />
+    <public type="layout" name="widget_channels_list_item_voice_user" id="0x7f0d00e8" />
+    <public type="layout" name="widget_channels_list_unreads" id="0x7f0d00e9" />
+    <public type="layout" name="widget_chat_detached" id="0x7f0d00ea" />
+    <public type="layout" name="widget_chat_input" id="0x7f0d00eb" />
+    <public type="layout" name="widget_chat_input_edit_text" id="0x7f0d00ec" />
+    <public type="layout" name="widget_chat_input_emoji_picker" id="0x7f0d00ed" />
+    <public type="layout" name="widget_chat_input_item" id="0x7f0d00ee" />
+    <public type="layout" name="widget_chat_input_perm_req_files" id="0x7f0d00ef" />
+    <public type="layout" name="widget_chat_input_upload_too_large" id="0x7f0d00f0" />
+    <public type="layout" name="widget_chat_input_verification" id="0x7f0d00f1" />
+    <public type="layout" name="widget_chat_list" id="0x7f0d00f2" />
+    <public type="layout" name="widget_chat_list_actions" id="0x7f0d00f3" />
+    <public type="layout" name="widget_chat_list_adapter_item_application_news" id="0x7f0d00f4" />
+    <public type="layout" name="widget_chat_list_adapter_item_attachment" id="0x7f0d00f5" />
+    <public type="layout" name="widget_chat_list_adapter_item_blocked" id="0x7f0d00f6" />
+    <public type="layout" name="widget_chat_list_adapter_item_divider" id="0x7f0d00f7" />
+    <public type="layout" name="widget_chat_list_adapter_item_embed" id="0x7f0d00f8" />
+    <public type="layout" name="widget_chat_list_adapter_item_embed_field" id="0x7f0d00f9" />
+    <public type="layout" name="widget_chat_list_adapter_item_empty_pins" id="0x7f0d00fa" />
+    <public type="layout" name="widget_chat_list_adapter_item_failed" id="0x7f0d00fb" />
+    <public type="layout" name="widget_chat_list_adapter_item_game_invite" id="0x7f0d00fc" />
+    <public type="layout" name="widget_chat_list_adapter_item_gift" id="0x7f0d00fd" />
+    <public type="layout" name="widget_chat_list_adapter_item_guild_welcome" id="0x7f0d00fe" />
+    <public type="layout" name="widget_chat_list_adapter_item_invite" id="0x7f0d00ff" />
+    <public type="layout" name="widget_chat_list_adapter_item_listen_together" id="0x7f0d0100" />
+    <public type="layout" name="widget_chat_list_adapter_item_loading" id="0x7f0d0101" />
+    <public type="layout" name="widget_chat_list_adapter_item_mention_footer" id="0x7f0d0102" />
+    <public type="layout" name="widget_chat_list_adapter_item_message_header" id="0x7f0d0103" />
+    <public type="layout" name="widget_chat_list_adapter_item_minimal" id="0x7f0d0104" />
+    <public type="layout" name="widget_chat_list_adapter_item_reactions" id="0x7f0d0105" />
+    <public type="layout" name="widget_chat_list_adapter_item_result_count" id="0x7f0d0106" />
+    <public type="layout" name="widget_chat_list_adapter_item_search_empty" id="0x7f0d0107" />
+    <public type="layout" name="widget_chat_list_adapter_item_search_error" id="0x7f0d0108" />
+    <public type="layout" name="widget_chat_list_adapter_item_search_indexing" id="0x7f0d0109" />
+    <public type="layout" name="widget_chat_list_adapter_item_spacer" id="0x7f0d010a" />
+    <public type="layout" name="widget_chat_list_adapter_item_start" id="0x7f0d010b" />
+    <public type="layout" name="widget_chat_list_adapter_item_system" id="0x7f0d010c" />
+    <public type="layout" name="widget_chat_list_adapter_item_text" id="0x7f0d010d" />
+    <public type="layout" name="widget_chat_list_adapter_item_text_divider" id="0x7f0d010e" />
+    <public type="layout" name="widget_chat_list_adapter_item_upload_progress" id="0x7f0d010f" />
+    <public type="layout" name="widget_chat_list_tab_badged" id="0x7f0d0110" />
+    <public type="layout" name="widget_chat_typing_users" id="0x7f0d0111" />
+    <public type="layout" name="widget_chat_voice_list_item_user" id="0x7f0d0112" />
+    <public type="layout" name="widget_client_outdated" id="0x7f0d0113" />
+    <public type="layout" name="widget_collapsed_voice_user_list_item" id="0x7f0d0114" />
+    <public type="layout" name="widget_connections_add_xbox" id="0x7f0d0115" />
+    <public type="layout" name="widget_create_channel" id="0x7f0d0116" />
+    <public type="layout" name="widget_debugging" id="0x7f0d0117" />
+    <public type="layout" name="widget_debugging_adapter_item" id="0x7f0d0118" />
+    <public type="layout" name="widget_disable_delete_account_dialog" id="0x7f0d0119" />
+    <public type="layout" name="widget_edit_role" id="0x7f0d011a" />
+    <public type="layout" name="widget_enable_mfa_steps" id="0x7f0d011b" />
+    <public type="layout" name="widget_enable_sms_backup_dialog" id="0x7f0d011c" />
+    <public type="layout" name="widget_fatal_crash" id="0x7f0d011d" />
+    <public type="layout" name="widget_friends_add" id="0x7f0d011e" />
+    <public type="layout" name="widget_friends_list" id="0x7f0d011f" />
+    <public type="layout" name="widget_friends_list_adapter_item" id="0x7f0d0120" />
+    <public type="layout" name="widget_friends_list_adapter_item_empty" id="0x7f0d0121" />
+    <public type="layout" name="widget_friends_nearby" id="0x7f0d0122" />
+    <public type="layout" name="widget_global_search" id="0x7f0d0123" />
+    <public type="layout" name="widget_global_search_item_divider" id="0x7f0d0124" />
+    <public type="layout" name="widget_global_search_item_dm" id="0x7f0d0125" />
+    <public type="layout" name="widget_global_search_item_guild" id="0x7f0d0126" />
+    <public type="layout" name="widget_group_invite_friends" id="0x7f0d0127" />
+    <public type="layout" name="widget_group_invite_friends_item" id="0x7f0d0128" />
+    <public type="layout" name="widget_guild_actions_add" id="0x7f0d0129" />
+    <public type="layout" name="widget_guild_actions_sheet" id="0x7f0d012a" />
+    <public type="layout" name="widget_guild_call" id="0x7f0d012b" />
+    <public type="layout" name="widget_guild_create" id="0x7f0d012c" />
+    <public type="layout" name="widget_guild_create_region" id="0x7f0d012d" />
+    <public type="layout" name="widget_guild_invite" id="0x7f0d012e" />
+    <public type="layout" name="widget_guild_invite_info" id="0x7f0d012f" />
+    <public type="layout" name="widget_guild_invite_share" id="0x7f0d0130" />
+    <public type="layout" name="widget_guild_invite_share_empty_suggestions" id="0x7f0d0131" />
+    <public type="layout" name="widget_guild_invite_share_item" id="0x7f0d0132" />
+    <public type="layout" name="widget_guild_join" id="0x7f0d0133" />
+    <public type="layout" name="widget_guild_join_invite_examples" id="0x7f0d0134" />
+    <public type="layout" name="widget_guild_search" id="0x7f0d0135" />
+    <public type="layout" name="widget_guild_search_list_item" id="0x7f0d0136" />
+    <public type="layout" name="widget_guild_transfer_ownership" id="0x7f0d0137" />
+    <public type="layout" name="widget_guilds_list" id="0x7f0d0138" />
+    <public type="layout" name="widget_guilds_list_item_divider" id="0x7f0d0139" />
+    <public type="layout" name="widget_guilds_list_item_dm" id="0x7f0d013a" />
+    <public type="layout" name="widget_guilds_list_item_dm_vertical" id="0x7f0d013b" />
+    <public type="layout" name="widget_guilds_list_item_folder" id="0x7f0d013c" />
+    <public type="layout" name="widget_guilds_list_item_guild" id="0x7f0d013d" />
+    <public type="layout" name="widget_guilds_list_item_guild_new" id="0x7f0d013e" />
+    <public type="layout" name="widget_guilds_list_item_guild_unavailable" id="0x7f0d013f" />
+    <public type="layout" name="widget_guilds_list_item_guild_vertical" id="0x7f0d0140" />
+    <public type="layout" name="widget_guilds_list_item_profile" id="0x7f0d0141" />
+    <public type="layout" name="widget_incoming_share" id="0x7f0d0142" />
+    <public type="layout" name="widget_kick_user" id="0x7f0d0143" />
+    <public type="layout" name="widget_main" id="0x7f0d0144" />
+    <public type="layout" name="widget_main_panel_center" id="0x7f0d0145" />
+    <public type="layout" name="widget_main_panel_center_channel_less" id="0x7f0d0146" />
+    <public type="layout" name="widget_main_panel_center_content" id="0x7f0d0147" />
+    <public type="layout" name="widget_main_panel_center_content_unread" id="0x7f0d0148" />
+    <public type="layout" name="widget_main_panel_center_nsfw" id="0x7f0d0149" />
+    <public type="layout" name="widget_main_panel_left" id="0x7f0d014a" />
+    <public type="layout" name="widget_main_panel_loading" id="0x7f0d014b" />
+    <public type="layout" name="widget_main_panel_right" id="0x7f0d014c" />
+    <public type="layout" name="widget_manage_reactions" id="0x7f0d014d" />
+    <public type="layout" name="widget_manage_reactions_emoji" id="0x7f0d014e" />
+    <public type="layout" name="widget_manage_reactions_result_error" id="0x7f0d014f" />
+    <public type="layout" name="widget_manage_reactions_result_loading" id="0x7f0d0150" />
+    <public type="layout" name="widget_manage_reactions_result_user" id="0x7f0d0151" />
+    <public type="layout" name="widget_media" id="0x7f0d0152" />
+    <public type="layout" name="widget_music_rich_presence" id="0x7f0d0153" />
+    <public type="layout" name="widget_notice_dialog" id="0x7f0d0154" />
+    <public type="layout" name="widget_notice_nux_overlay" id="0x7f0d0155" />
+    <public type="layout" name="widget_notice_nux_samsung_link" id="0x7f0d0156" />
+    <public type="layout" name="widget_notice_popup" id="0x7f0d0157" />
+    <public type="layout" name="widget_notice_popup_channel" id="0x7f0d0158" />
+    <public type="layout" name="widget_nux_guild_use_cases" id="0x7f0d0159" />
+    <public type="layout" name="widget_nux_post_registration" id="0x7f0d015a" />
+    <public type="layout" name="widget_oauth_authorize" id="0x7f0d015b" />
+    <public type="layout" name="widget_payment_source_edit_dialog" id="0x7f0d015c" />
+    <public type="layout" name="widget_platform_rich_prescence" id="0x7f0d015d" />
+    <public type="layout" name="widget_premium_upsell" id="0x7f0d015e" />
+    <public type="layout" name="widget_private_call" id="0x7f0d015f" />
+    <public type="layout" name="widget_private_call_controls_view" id="0x7f0d0160" />
+    <public type="layout" name="widget_prune_users" id="0x7f0d0161" />
+    <public type="layout" name="widget_search" id="0x7f0d0162" />
+    <public type="layout" name="widget_search_results" id="0x7f0d0163" />
+    <public type="layout" name="widget_search_suggestion_item_header" id="0x7f0d0164" />
+    <public type="layout" name="widget_search_suggestion_item_header_history" id="0x7f0d0165" />
+    <public type="layout" name="widget_search_suggestions" id="0x7f0d0166" />
+    <public type="layout" name="widget_search_suggestions_item_channel" id="0x7f0d0167" />
+    <public type="layout" name="widget_search_suggestions_item_has" id="0x7f0d0168" />
+    <public type="layout" name="widget_search_suggestions_item_recent_query" id="0x7f0d0169" />
+    <public type="layout" name="widget_search_suggestions_item_suggestion" id="0x7f0d016a" />
+    <public type="layout" name="widget_search_suggestions_item_user" id="0x7f0d016b" />
+    <public type="layout" name="widget_server_boost_confirmation" id="0x7f0d016c" />
+    <public type="layout" name="widget_server_boost_status" id="0x7f0d016d" />
+    <public type="layout" name="widget_server_delete_dialog" id="0x7f0d016e" />
+    <public type="layout" name="widget_server_notification_override_selector" id="0x7f0d016f" />
+    <public type="layout" name="widget_server_notifications" id="0x7f0d0170" />
+    <public type="layout" name="widget_server_remove_boost_confirmation" id="0x7f0d0171" />
+    <public type="layout" name="widget_server_settings" id="0x7f0d0172" />
+    <public type="layout" name="widget_server_settings_audit_log" id="0x7f0d0173" />
+    <public type="layout" name="widget_server_settings_audit_log_filter_action_listitem" id="0x7f0d0174" />
+    <public type="layout" name="widget_server_settings_audit_log_filter_user_listitem" id="0x7f0d0175" />
+    <public type="layout" name="widget_server_settings_audit_log_listitem" id="0x7f0d0176" />
+    <public type="layout" name="widget_server_settings_audit_log_loading_listitem" id="0x7f0d0177" />
+    <public type="layout" name="widget_server_settings_ban_list_item" id="0x7f0d0178" />
+    <public type="layout" name="widget_server_settings_bans" id="0x7f0d0179" />
+    <public type="layout" name="widget_server_settings_channels" id="0x7f0d017a" />
+    <public type="layout" name="widget_server_settings_channels_sort_actions" id="0x7f0d017b" />
+    <public type="layout" name="widget_server_settings_channels_sort_fab_menu" id="0x7f0d017c" />
+    <public type="layout" name="widget_server_settings_confirm_disable_integration" id="0x7f0d017d" />
+    <public type="layout" name="widget_server_settings_edit_integration" id="0x7f0d017e" />
+    <public type="layout" name="widget_server_settings_edit_member" id="0x7f0d017f" />
+    <public type="layout" name="widget_server_settings_edit_role_color_picker" id="0x7f0d0180" />
+    <public type="layout" name="widget_server_settings_emojis" id="0x7f0d0181" />
+    <public type="layout" name="widget_server_settings_emojis_edit" id="0x7f0d0182" />
+    <public type="layout" name="widget_server_settings_emojis_empty" id="0x7f0d0183" />
+    <public type="layout" name="widget_server_settings_emojis_header" id="0x7f0d0184" />
+    <public type="layout" name="widget_server_settings_emojis_item" id="0x7f0d0185" />
+    <public type="layout" name="widget_server_settings_emojis_section" id="0x7f0d0186" />
+    <public type="layout" name="widget_server_settings_instant_invite_actions" id="0x7f0d0187" />
+    <public type="layout" name="widget_server_settings_instant_invite_list_item" id="0x7f0d0188" />
+    <public type="layout" name="widget_server_settings_instant_invites" id="0x7f0d0189" />
+    <public type="layout" name="widget_server_settings_integration_list_item" id="0x7f0d018a" />
+    <public type="layout" name="widget_server_settings_integrations" id="0x7f0d018b" />
+    <public type="layout" name="widget_server_settings_member_list_item" id="0x7f0d018c" />
+    <public type="layout" name="widget_server_settings_members" id="0x7f0d018d" />
+    <public type="layout" name="widget_server_settings_moderation" id="0x7f0d018e" />
+    <public type="layout" name="widget_server_settings_overview" id="0x7f0d018f" />
+    <public type="layout" name="widget_server_settings_overview_afk_timeout" id="0x7f0d0190" />
+    <public type="layout" name="widget_server_settings_overview_region" id="0x7f0d0191" />
+    <public type="layout" name="widget_server_settings_overview_region_item" id="0x7f0d0192" />
+    <public type="layout" name="widget_server_settings_overview_section_afk_channel" id="0x7f0d0193" />
+    <public type="layout" name="widget_server_settings_role_item" id="0x7f0d0194" />
+    <public type="layout" name="widget_server_settings_roles_list" id="0x7f0d0195" />
+    <public type="layout" name="widget_server_settings_security" id="0x7f0d0196" />
+    <public type="layout" name="widget_server_settings_security_dialog" id="0x7f0d0197" />
+    <public type="layout" name="widget_server_settings_vanity_url" id="0x7f0d0198" />
+    <public type="layout" name="widget_settings" id="0x7f0d0199" />
+    <public type="layout" name="widget_settings_account" id="0x7f0d019a" />
+    <public type="layout" name="widget_settings_account_backup_codes" id="0x7f0d019b" />
+    <public type="layout" name="widget_settings_account_change_password" id="0x7f0d019c" />
+    <public type="layout" name="widget_settings_account_edit" id="0x7f0d019d" />
+    <public type="layout" name="widget_settings_appearance" id="0x7f0d019e" />
+    <public type="layout" name="widget_settings_authorized_apps" id="0x7f0d019f" />
+    <public type="layout" name="widget_settings_authorized_apps_list_item" id="0x7f0d01a0" />
+    <public type="layout" name="widget_settings_behavior" id="0x7f0d01a1" />
+    <public type="layout" name="widget_settings_billing" id="0x7f0d01a2" />
+    <public type="layout" name="widget_settings_boost" id="0x7f0d01a3" />
+    <public type="layout" name="widget_settings_connections" id="0x7f0d01a4" />
+    <public type="layout" name="widget_settings_connections_add" id="0x7f0d01a5" />
+    <public type="layout" name="widget_settings_developer" id="0x7f0d01a6" />
+    <public type="layout" name="widget_settings_enable_mfa_download" id="0x7f0d01a7" />
+    <public type="layout" name="widget_settings_enable_mfa_input" id="0x7f0d01a8" />
+    <public type="layout" name="widget_settings_enable_mfa_key" id="0x7f0d01a9" />
+    <public type="layout" name="widget_settings_enable_mfa_success" id="0x7f0d01aa" />
+    <public type="layout" name="widget_settings_games" id="0x7f0d01ab" />
+    <public type="layout" name="widget_settings_gifting" id="0x7f0d01ac" />
+    <public type="layout" name="widget_settings_item_add_connected_account" id="0x7f0d01ad" />
+    <public type="layout" name="widget_settings_item_backup_code" id="0x7f0d01ae" />
+    <public type="layout" name="widget_settings_item_backup_code_header" id="0x7f0d01af" />
+    <public type="layout" name="widget_settings_item_connected_account" id="0x7f0d01b0" />
+    <public type="layout" name="widget_settings_language" id="0x7f0d01b1" />
+    <public type="layout" name="widget_settings_language_select" id="0x7f0d01b2" />
+    <public type="layout" name="widget_settings_language_select_item" id="0x7f0d01b3" />
+    <public type="layout" name="widget_settings_media" id="0x7f0d01b4" />
+    <public type="layout" name="widget_settings_notification_os" id="0x7f0d01b5" />
+    <public type="layout" name="widget_settings_notifications" id="0x7f0d01b6" />
+    <public type="layout" name="widget_settings_payment_methods" id="0x7f0d01b7" />
+    <public type="layout" name="widget_settings_premium" id="0x7f0d01b8" />
+    <public type="layout" name="widget_settings_privacy" id="0x7f0d01b9" />
+    <public type="layout" name="widget_settings_privacy_defaults" id="0x7f0d01ba" />
+    <public type="layout" name="widget_settings_voice" id="0x7f0d01bb" />
+    <public type="layout" name="widget_status" id="0x7f0d01bc" />
+    <public type="layout" name="widget_stream_rich_presence" id="0x7f0d01bd" />
+    <public type="layout" name="widget_text_channel_settings" id="0x7f0d01be" />
+    <public type="layout" name="widget_tos_accept" id="0x7f0d01bf" />
+    <public type="layout" name="widget_upgrade_premium_dialog" id="0x7f0d01c0" />
+    <public type="layout" name="widget_url_actions" id="0x7f0d01c1" />
+    <public type="layout" name="widget_usage_settings_dialog" id="0x7f0d01c2" />
+    <public type="layout" name="widget_user_account_verify" id="0x7f0d01c3" />
+    <public type="layout" name="widget_user_captcha_verify" id="0x7f0d01c4" />
+    <public type="layout" name="widget_user_email_update" id="0x7f0d01c5" />
+    <public type="layout" name="widget_user_email_verify" id="0x7f0d01c6" />
+    <public type="layout" name="widget_user_mentions" id="0x7f0d01c7" />
+    <public type="layout" name="widget_user_mentions_filter" id="0x7f0d01c8" />
+    <public type="layout" name="widget_user_mutual_friends" id="0x7f0d01c9" />
+    <public type="layout" name="widget_user_mutual_guilds" id="0x7f0d01ca" />
+    <public type="layout" name="widget_user_phone_add" id="0x7f0d01cb" />
+    <public type="layout" name="widget_user_phone_verify" id="0x7f0d01cc" />
+    <public type="layout" name="widget_user_profile_adapter_item_empty" id="0x7f0d01cd" />
+    <public type="layout" name="widget_user_profile_adapter_item_friend" id="0x7f0d01ce" />
+    <public type="layout" name="widget_user_profile_adapter_item_friend_mutual_server" id="0x7f0d01cf" />
+    <public type="layout" name="widget_user_profile_adapter_item_server" id="0x7f0d01d0" />
+    <public type="layout" name="widget_user_profile_strip" id="0x7f0d01d1" />
+    <public type="layout" name="widget_user_rich_presence" id="0x7f0d01d2" />
+    <public type="layout" name="widget_user_sheet" id="0x7f0d01d3" />
+    <public type="layout" name="widget_user_status_update" id="0x7f0d01d4" />
+    <public type="layout" name="widget_voice_actions" id="0x7f0d01d5" />
+    <public type="layout" name="widget_voice_call_incoming" id="0x7f0d01d6" />
+    <public type="layout" name="widget_voice_call_inline" id="0x7f0d01d7" />
+    <public type="layout" name="widget_voice_channel_settings" id="0x7f0d01d8" />
+    <public type="layout" name="widget_web_view" id="0x7f0d01d9" />
     <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" />
@@ -5694,16 +5608,10 @@
     <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_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="menu" name="menu_text_channel_settings" id="0x7f0e0018" />
+    <public type="menu" name="menu_user_mentions" id="0x7f0e0019" />
+    <public type="menu" name="menu_voice_channel_settings" id="0x7f0e001a" />
+    <public type="menu" name="ucrop_menu_activity" id="0x7f0e001b" />
     <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" />
@@ -5736,186 +5644,175 @@
     <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="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" />
-    <public type="plurals" name="lfg_listing_age_seconds_time" id="0x7f10007f" />
-    <public type="plurals" name="lfg_num_players_players" id="0x7f100080" />
-    <public type="plurals" name="live_viewers_viewers" id="0x7f100081" />
-    <public type="plurals" name="max_uses_description_mobile_maxUses" id="0x7f100082" />
-    <public type="plurals" name="max_uses_maxUses" id="0x7f100083" />
-    <public type="plurals" name="members_header_members" id="0x7f100084" />
-    <public type="plurals" name="n_days_days" id="0x7f100086" />
-    <public type="plurals" name="new_messages_count" id="0x7f100087" />
-    <public type="plurals" name="new_messages_with_date_count" id="0x7f100088" />
-    <public type="plurals" name="notice_premium_grandfathered_ending_numDays" id="0x7f100089" />
-    <public type="plurals" name="num_channels_num" id="0x7f10008a" />
-    <public type="plurals" name="num_members_subscribers" id="0x7f10008b" />
-    <public type="plurals" name="num_subscribers_subscribers" id="0x7f10008c" />
-    <public type="plurals" name="num_users_num" id="0x7f10008d" />
-    <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_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_b9" id="0x7f1000b9" />
-    <public type="plurals" name="APKTOOL_DUMMY_ba" id="0x7f1000ba" />
+    <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="last_seen_days" id="0x7f10007a" />
+    <public type="plurals" name="lfg_listing_age_hours_time" id="0x7f10007b" />
+    <public type="plurals" name="lfg_listing_age_minutes_time" id="0x7f10007c" />
+    <public type="plurals" name="lfg_listing_age_seconds_time" id="0x7f10007d" />
+    <public type="plurals" name="lfg_num_players_players" id="0x7f10007e" />
+    <public type="plurals" name="live_viewers_viewers" id="0x7f10007f" />
+    <public type="plurals" name="max_uses_description_mobile_maxUses" id="0x7f100080" />
+    <public type="plurals" name="max_uses_maxUses" id="0x7f100081" />
+    <public type="plurals" name="members_header_members" id="0x7f100082" />
+    <public type="plurals" name="n_days_days" id="0x7f100084" />
+    <public type="plurals" name="new_messages_count" id="0x7f100085" />
+    <public type="plurals" name="new_messages_with_date_count" id="0x7f100086" />
+    <public type="plurals" name="notice_premium_grandfathered_ending_numDays" id="0x7f100087" />
+    <public type="plurals" name="num_channels_num" id="0x7f100088" />
+    <public type="plurals" name="num_members_subscribers" id="0x7f100089" />
+    <public type="plurals" name="num_subscribers_subscribers" id="0x7f10008a" />
+    <public type="plurals" name="num_users_num" id="0x7f10008b" />
+    <public type="plurals" name="only_you_can_see_and_delete_these_count" id="0x7f10008c" />
+    <public type="plurals" name="partial_outage_a11y_count" id="0x7f10008d" />
+    <public type="plurals" name="partial_outage_count" id="0x7f10008e" />
+    <public type="plurals" name="premium_code_redemption_confirmation_blurb_numMonths" id="0x7f10008f" />
+    <public type="plurals" name="premium_guild_perks_modal_header_boost_count_subscriptions" id="0x7f100090" />
+    <public type="plurals" name="premium_guild_settings_members_subscribed_needed_number" id="0x7f100091" />
+    <public type="plurals" name="premium_guild_settings_members_subscribed_number" id="0x7f100092" />
+    <public type="plurals" name="premium_guild_settings_x_of_y_subscriptions_numRequired" id="0x7f100093" />
+    <public type="plurals" name="premium_guild_subscribe_confirm_cooldown_warning_days" id="0x7f100094" />
+    <public type="plurals" name="premium_guild_subscription_available_count_num" id="0x7f100095" />
+    <public type="plurals" name="premium_guild_subscription_duration_months" id="0x7f100096" />
+    <public type="plurals" name="premium_guild_subscription_error_rate_limit_days_days" id="0x7f100097" />
+    <public type="plurals" name="premium_guild_subscription_error_rate_limit_days_hours" id="0x7f100098" />
+    <public type="plurals" name="premium_guild_subscription_error_rate_limit_hours_hours" id="0x7f100099" />
+    <public type="plurals" name="premium_guild_subscription_error_rate_limit_hours_minutes" id="0x7f10009a" />
+    <public type="plurals" name="premium_guild_subscription_error_rate_limit_minutes_minutes" id="0x7f10009b" />
+    <public type="plurals" name="premium_guild_subscription_subscriber_count_tooltip_subscriberCount" id="0x7f10009c" />
+    <public type="plurals" name="premium_guild_unsubscribe_confirm_cooldown_warning_days_days" id="0x7f10009d" />
+    <public type="plurals" name="premium_guild_unsubscribe_confirm_cooldown_warning_days_hours" id="0x7f10009e" />
+    <public type="plurals" name="premium_guild_unsubscribe_confirm_cooldown_warning_hours_hours" id="0x7f10009f" />
+    <public type="plurals" name="premium_guild_unsubscribe_confirm_cooldown_warning_hours_minutes" id="0x7f1000a0" />
+    <public type="plurals" name="premium_guild_unsubscribe_confirm_cooldown_warning_minutes_minutes" id="0x7f1000a1" />
+    <public type="plurals" name="premium_payment_plan_label_monthly_intervalCount" id="0x7f1000a2" />
+    <public type="plurals" name="premium_payment_plan_label_yearly_intervalCount" id="0x7f1000a3" />
+    <public type="plurals" name="premium_subscription_credit_count_months_count" id="0x7f1000a4" />
+    <public type="plurals" name="publish_followed_news_fail_body_retryAfter" id="0x7f1000a5" />
+    <public type="plurals" name="reaction_tooltip_1_n_n" id="0x7f1000a6" />
+    <public type="plurals" name="reaction_tooltip_2_n_n" id="0x7f1000a7" />
+    <public type="plurals" name="reaction_tooltip_3_n_n" id="0x7f1000a8" />
+    <public type="plurals" name="reaction_tooltip_n_n" id="0x7f1000a9" />
+    <public type="plurals" name="roles_list_numRoles" id="0x7f1000aa" />
+    <public type="plurals" name="search_hide_blocked_messages_count" id="0x7f1000ab" />
+    <public type="plurals" name="search_num_results_blocked_not_shown_count" id="0x7f1000ac" />
+    <public type="plurals" name="search_still_indexing_hint_count" id="0x7f1000ad" />
+    <public type="plurals" name="spotify_listen_along_title_host_count" id="0x7f1000b0" />
+    <public type="plurals" name="total_results_count" id="0x7f1000b1" />
+    <public type="plurals" name="uploading_files_count" id="0x7f1000b2" />
+    <public type="plurals" name="user_activity_timestamp_end_hours" id="0x7f1000b3" />
+    <public type="plurals" name="user_activity_timestamp_end_minutes" id="0x7f1000b4" />
+    <public type="plurals" name="user_activity_timestamp_end_seconds" id="0x7f1000b5" />
+    <public type="plurals" name="user_activity_timestamp_start_hours" id="0x7f1000b6" />
+    <public type="plurals" name="user_activity_timestamp_start_minutes" id="0x7f1000b7" />
+    <public type="plurals" name="user_activity_timestamp_start_seconds" id="0x7f1000b8" />
+    <public type="plurals" name="user_activity_user_playing_for_days_time" id="0x7f1000b9" />
+    <public type="plurals" name="user_activity_user_playing_for_hours_time" id="0x7f1000ba" />
+    <public type="plurals" name="user_activity_user_playing_for_minutes_time" id="0x7f1000bb" />
+    <public type="plurals" name="user_profile_mutual_friends_count" id="0x7f1000bc" />
+    <public type="plurals" name="user_profile_mutual_guilds_count" 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="APKTOOL_DUMMY_83" id="0x7f100083" />
+    <public type="plurals" name="APKTOOL_DUMMY_ae" id="0x7f1000ae" />
+    <public type="plurals" name="APKTOOL_DUMMY_af" id="0x7f1000af" />
     <public type="raw" name="call_ringing" id="0x7f110000" />
     <public type="raw" name="emoji_1f004" id="0x7f110001" />
     <public type="raw" name="emoji_1f0cf" id="0x7f110002" />
@@ -8368,4583 +8265,4442 @@
     <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_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="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_hint" id="0x7f1205cc" />
+    <public type="string" name="follow_modal_hint_no_perms" id="0x7f1205cd" />
+    <public type="string" name="follow_modal_title" id="0x7f1205ce" />
+    <public type="string" name="follow_modal_too_many_webhooks" id="0x7f1205cf" />
+    <public type="string" name="follow_modal_warning" id="0x7f1205d0" />
+    <public type="string" name="follow_news_chat_input_message" id="0x7f1205d1" />
+    <public type="string" name="follow_news_chat_input_subtitle" id="0x7f1205d2" />
+    <public type="string" name="follow_success_modal_body" id="0x7f1205d3" />
+    <public type="string" name="follow_success_modal_header_01" id="0x7f1205d4" />
+    <public type="string" name="follow_success_modal_header_02" id="0x7f1205d5" />
+    <public type="string" name="follow_success_modal_header_03" id="0x7f1205d6" />
+    <public type="string" name="follow_success_modal_header_04" id="0x7f1205d7" />
+    <public type="string" name="follow_success_modal_header_05" id="0x7f1205d8" />
+    <public type="string" name="follow_success_modal_header_06" id="0x7f1205d9" />
+    <public type="string" name="follow_success_modal_header_07" id="0x7f1205da" />
+    <public type="string" name="follow_success_modal_header_08" id="0x7f1205db" />
+    <public type="string" name="follow_success_modal_header_09" id="0x7f1205dc" />
+    <public type="string" name="follow_success_modal_header_10" id="0x7f1205dd" />
+    <public type="string" name="follower_analytics" id="0x7f1205de" />
+    <public type="string" name="follower_analytics_header" id="0x7f1205df" />
+    <public type="string" name="force_sync" id="0x7f1205e0" />
+    <public type="string" name="forgot_password" id="0x7f1205e1" />
+    <public type="string" name="forgot_password_body" id="0x7f1205e2" />
+    <public type="string" name="form_checkbox_debug_logging" id="0x7f1205e3" />
+    <public type="string" name="form_checkbox_qos" id="0x7f1205e4" />
+    <public type="string" name="form_description_audio_mode_android_call" id="0x7f1205e5" />
+    <public type="string" name="form_description_audio_mode_android_communication" id="0x7f1205e6" />
+    <public type="string" name="form_description_push_afk_timeout" id="0x7f1205e7" />
+    <public type="string" name="form_description_tts" id="0x7f1205e8" />
+    <public type="string" name="form_error_generic" id="0x7f1205e9" />
+    <public type="string" name="form_help_afk_channel" id="0x7f1205ea" />
+    <public type="string" name="form_help_attenuation" id="0x7f1205eb" />
+    <public type="string" name="form_help_automatic_vad" id="0x7f1205ec" />
+    <public type="string" name="form_help_bitrate" id="0x7f1205ed" />
+    <public type="string" name="form_help_certified_voice_processing" id="0x7f1205ee" />
+    <public type="string" name="form_help_channel_permissions" id="0x7f1205ef" />
+    <public type="string" name="form_help_custom_code" id="0x7f1205f0" />
+    <public type="string" name="form_help_debug_logging" id="0x7f1205f1" />
+    <public type="string" name="form_help_default_notification_settings" id="0x7f1205f2" />
+    <public type="string" name="form_help_default_notification_settings_mobile" id="0x7f1205f3" />
+    <public type="string" name="form_help_enable_discoverable" id="0x7f1205f4" />
+    <public type="string" name="form_help_enable_featurable" id="0x7f1205f5" />
+    <public type="string" name="form_help_explicit_content_filter" id="0x7f1205f6" />
+    <public type="string" name="form_help_instant_invite_channel" id="0x7f1205f7" />
+    <public type="string" name="form_help_last_seen" id="0x7f1205f8" />
+    <public type="string" name="form_help_legacy_subsystem" id="0x7f1205f9" />
+    <public type="string" name="form_help_news" id="0x7f1205fa" />
+    <public type="string" name="form_help_nsfw" id="0x7f1205fb" />
+    <public type="string" name="form_help_open_h264" id="0x7f1205fc" />
+    <public type="string" name="form_help_premade_widget" id="0x7f1205fd" />
+    <public type="string" name="form_help_qos" id="0x7f1205fe" />
+    <public type="string" name="form_help_server_banner" id="0x7f1205ff" />
+    <public type="string" name="form_help_server_description" id="0x7f120600" />
+    <public type="string" name="form_help_server_language" id="0x7f120601" />
+    <public type="string" name="form_help_slowmode" id="0x7f120602" />
+    <public type="string" name="form_help_system_channel" id="0x7f120603" />
+    <public type="string" name="form_help_system_channel_join_messages" id="0x7f120604" />
+    <public type="string" name="form_help_system_channel_premium_subscription_messages" id="0x7f120605" />
+    <public type="string" name="form_help_temporary" id="0x7f120606" />
+    <public type="string" name="form_help_user_limit" id="0x7f120607" />
+    <public type="string" name="form_help_verification_level" id="0x7f120608" />
+    <public type="string" name="form_label_afk_channel" id="0x7f120609" />
+    <public type="string" name="form_label_afk_timeout" id="0x7f12060a" />
+    <public type="string" name="form_label_all" id="0x7f12060b" />
+    <public type="string" name="form_label_all_messages" id="0x7f12060c" />
+    <public type="string" name="form_label_android_opensl" id="0x7f12060d" />
+    <public type="string" name="form_label_android_opensl_default" id="0x7f12060e" />
+    <public type="string" name="form_label_android_opensl_default_desc" id="0x7f12060f" />
+    <public type="string" name="form_label_android_opensl_desc" id="0x7f120610" />
+    <public type="string" name="form_label_android_opensl_force_disabled" id="0x7f120611" />
+    <public type="string" name="form_label_android_opensl_force_disabled_desc" id="0x7f120612" />
+    <public type="string" name="form_label_android_opensl_force_enabled" id="0x7f120613" />
+    <public type="string" name="form_label_android_opensl_force_enabled_desc" id="0x7f120614" />
+    <public type="string" name="form_label_attenuation" id="0x7f120615" />
+    <public type="string" name="form_label_audio_mode_android" id="0x7f120616" />
+    <public type="string" name="form_label_audio_mode_android_call" id="0x7f120617" />
+    <public type="string" name="form_label_audio_mode_android_communication" id="0x7f120618" />
+    <public type="string" name="form_label_automatic_vad" id="0x7f120619" />
+    <public type="string" name="form_label_automatic_vad_mobile" id="0x7f12061a" />
+    <public type="string" name="form_label_avatar_size" id="0x7f12061b" />
+    <public type="string" name="form_label_bitrate" id="0x7f12061c" />
+    <public type="string" name="form_label_category_permissions" id="0x7f12061d" />
+    <public type="string" name="form_label_channel_name" id="0x7f12061e" />
+    <public type="string" name="form_label_channel_notifcation_settings" id="0x7f12061f" />
+    <public type="string" name="form_label_channel_permissions" id="0x7f120620" />
+    <public type="string" name="form_label_channel_topic" id="0x7f120621" />
+    <public type="string" name="form_label_channel_voice_permissions" id="0x7f120622" />
+    <public type="string" name="form_label_current_password" id="0x7f120623" />
+    <public type="string" name="form_label_custom_code" id="0x7f120624" />
+    <public type="string" name="form_label_custom_twitch_emoticon" id="0x7f120625" />
+    <public type="string" name="form_label_debug_logs" id="0x7f120626" />
+    <public type="string" name="form_label_default_notification_settings" id="0x7f120627" />
+    <public type="string" name="form_label_delete_message_history" id="0x7f120628" />
+    <public type="string" name="form_label_desktop_notifications" id="0x7f120629" />
+    <public type="string" name="form_label_desktop_only" id="0x7f12062a" />
+    <public type="string" name="form_label_disabled_for_everyone" id="0x7f12062b" />
+    <public type="string" name="form_label_discovery_settings" id="0x7f12062c" />
+    <public type="string" name="form_label_display_names" id="0x7f12062d" />
+    <public type="string" name="form_label_display_users" id="0x7f12062e" />
+    <public type="string" name="form_label_email" id="0x7f12062f" />
+    <public type="string" name="form_label_enable_widget" id="0x7f120630" />
+    <public type="string" name="form_label_expire_grace_period" id="0x7f120631" />
+    <public type="string" name="form_label_explicit_content_filter" id="0x7f120632" />
+    <public type="string" name="form_label_hoist_description" id="0x7f120633" />
+    <public type="string" name="form_label_input" id="0x7f120634" />
+    <public type="string" name="form_label_input_device" id="0x7f120635" />
+    <public type="string" name="form_label_input_mode" id="0x7f120636" />
+    <public type="string" name="form_label_input_sensitivty" id="0x7f120637" />
+    <public type="string" name="form_label_input_volume" id="0x7f120638" />
+    <public type="string" name="form_label_instant_invite" id="0x7f120639" />
+    <public type="string" name="form_label_instant_invite_channel" id="0x7f12063a" />
+    <public type="string" name="form_label_json_api" id="0x7f12063b" />
+    <public type="string" name="form_label_last_seen" id="0x7f12063c" />
+    <public type="string" name="form_label_local_mute" id="0x7f12063d" />
+    <public type="string" name="form_label_max_age" id="0x7f12063e" />
+    <public type="string" name="form_label_max_uses" id="0x7f12063f" />
+    <public type="string" name="form_label_member_add" id="0x7f120640" />
+    <public type="string" name="form_label_membership_expire_behavior" id="0x7f120641" />
+    <public type="string" name="form_label_mentionable" id="0x7f120642" />
+    <public type="string" name="form_label_mentions" id="0x7f120643" />
+    <public type="string" name="form_label_mobile_channel_override_guild_message_notification" id="0x7f120644" />
+    <public type="string" name="form_label_mobile_channel_override_guild_muted" id="0x7f120645" />
+    <public type="string" name="form_label_mobile_channel_override_mute" id="0x7f120646" />
+    <public type="string" name="form_label_mobile_notifications_behavior" id="0x7f120647" />
+    <public type="string" name="form_label_mobile_notifications_blink" id="0x7f120648" />
+    <public type="string" name="form_label_mobile_notifications_call_desc" id="0x7f120649" />
+    <public type="string" name="form_label_mobile_notifications_inapp_desc" id="0x7f12064a" />
+    <public type="string" name="form_label_mobile_notifications_inapp_label" id="0x7f12064b" />
+    <public type="string" name="form_label_mobile_notifications_label" id="0x7f12064c" />
+    <public type="string" name="form_label_mobile_notifications_os_control_jump" id="0x7f12064d" />
+    <public type="string" name="form_label_mobile_notifications_os_control_jump_help" id="0x7f12064e" />
+    <public type="string" name="form_label_mobile_notifications_sound_disable" id="0x7f12064f" />
+    <public type="string" name="form_label_mobile_notifications_sound_message" id="0x7f120650" />
+    <public type="string" name="form_label_mobile_notifications_stream_desc" id="0x7f120651" />
+    <public type="string" name="form_label_mobile_notifications_system_desc" id="0x7f120652" />
+    <public type="string" name="form_label_mobile_notifications_system_hint" id="0x7f120653" />
+    <public type="string" name="form_label_mobile_notifications_system_label" id="0x7f120654" />
+    <public type="string" name="form_label_mobile_notifications_user_label" id="0x7f120655" />
+    <public type="string" name="form_label_mobile_notifications_vibrations" id="0x7f120656" />
+    <public type="string" name="form_label_mobile_notifications_wake_device" id="0x7f120657" />
+    <public type="string" name="form_label_mobile_push_notifications" id="0x7f120658" />
+    <public type="string" name="form_label_mobile_user_notifications_hint" id="0x7f120659" />
+    <public type="string" name="form_label_mobile_user_notifications_label" id="0x7f12065a" />
+    <public type="string" name="form_label_mute_server" id="0x7f12065b" />
+    <public type="string" name="form_label_mute_server_description" id="0x7f12065c" />
+    <public type="string" name="form_label_muted" id="0x7f12065d" />
+    <public type="string" name="form_label_new_password" id="0x7f12065e" />
+    <public type="string" name="form_label_new_user" id="0x7f12065f" />
+    <public type="string" name="form_label_news_channel" id="0x7f120660" />
+    <public type="string" name="form_label_nothing" id="0x7f120661" />
+    <public type="string" name="form_label_notification_frequency" id="0x7f120662" />
+    <public type="string" name="form_label_notification_position" id="0x7f120663" />
+    <public type="string" name="form_label_nsfw" id="0x7f120664" />
+    <public type="string" name="form_label_nsfw_channel" id="0x7f120665" />
+    <public type="string" name="form_label_off" id="0x7f120666" />
+    <public type="string" name="form_label_only_mentions" id="0x7f120667" />
+    <public type="string" name="form_label_output" id="0x7f120668" />
+    <public type="string" name="form_label_output_device" id="0x7f120669" />
+    <public type="string" name="form_label_output_volume" id="0x7f12066a" />
+    <public type="string" name="form_label_overlay_chat_opacity" id="0x7f12066b" />
+    <public type="string" name="form_label_overlay_text_chat_notifications" id="0x7f12066c" />
+    <public type="string" name="form_label_password" id="0x7f12066d" />
+    <public type="string" name="form_label_phone_number" id="0x7f12066e" />
+    <public type="string" name="form_label_premade_widget" id="0x7f12066f" />
+    <public type="string" name="form_label_push_afk_timeout" id="0x7f120670" />
+    <public type="string" name="form_label_qos" id="0x7f120671" />
+    <public type="string" name="form_label_reason_ban" id="0x7f120672" />
+    <public type="string" name="form_label_reason_kick" id="0x7f120673" />
+    <public type="string" name="form_label_report_reason" id="0x7f120674" />
+    <public type="string" name="form_label_role_add" id="0x7f120675" />
+    <public type="string" name="form_label_role_color" id="0x7f120676" />
+    <public type="string" name="form_label_role_enter_name" id="0x7f120677" />
+    <public type="string" name="form_label_role_name" id="0x7f120678" />
+    <public type="string" name="form_label_role_settings" id="0x7f120679" />
+    <public type="string" name="form_label_roles_pro_tip" id="0x7f12067a" />
+    <public type="string" name="form_label_roles_pro_tip_description" id="0x7f12067b" />
+    <public type="string" name="form_label_select_channel" id="0x7f12067c" />
+    <public type="string" name="form_label_send_to" id="0x7f12067d" />
+    <public type="string" name="form_label_sensitivty" id="0x7f12067e" />
+    <public type="string" name="form_label_server_banner" id="0x7f12067f" />
+    <public type="string" name="form_label_server_description" id="0x7f120680" />
+    <public type="string" name="form_label_server_id" id="0x7f120681" />
+    <public type="string" name="form_label_server_language" id="0x7f120682" />
+    <public type="string" name="form_label_server_name" id="0x7f120683" />
+    <public type="string" name="form_label_server_notification_settings" id="0x7f120684" />
+    <public type="string" name="form_label_server_region" id="0x7f120685" />
+    <public type="string" name="form_label_server_settings" id="0x7f120686" />
+    <public type="string" name="form_label_shortcut" id="0x7f120687" />
+    <public type="string" name="form_label_slowmode" id="0x7f120688" />
+    <public type="string" name="form_label_slowmode_cooldown" id="0x7f120689" />
+    <public type="string" name="form_label_slowmode_off" id="0x7f12068a" />
+    <public type="string" name="form_label_stream_volume" id="0x7f12068b" />
+    <public type="string" name="form_label_sub_expire_behavior" id="0x7f12068c" />
+    <public type="string" name="form_label_subsystem" id="0x7f12068d" />
+    <public type="string" name="form_label_suppress_everyone" id="0x7f12068e" />
+    <public type="string" name="form_label_synced_members" id="0x7f12068f" />
+    <public type="string" name="form_label_synced_role" id="0x7f120690" />
+    <public type="string" name="form_label_synced_subs" id="0x7f120691" />
+    <public type="string" name="form_label_system_channel" id="0x7f120692" />
+    <public type="string" name="form_label_system_channel_settings" id="0x7f120693" />
+    <public type="string" name="form_label_temporary" id="0x7f120694" />
+    <public type="string" name="form_label_test_microphone" id="0x7f120695" />
+    <public type="string" name="form_label_tts" id="0x7f120696" />
+    <public type="string" name="form_label_tts_notifications" id="0x7f120697" />
+    <public type="string" name="form_label_user_limit" id="0x7f120698" />
+    <public type="string" name="form_label_username" id="0x7f120699" />
+    <public type="string" name="form_label_username_mobile" id="0x7f12069a" />
+    <public type="string" name="form_label_verification_level" id="0x7f12069b" />
+    <public type="string" name="form_label_video_device" id="0x7f12069c" />
+    <public type="string" name="form_label_video_preview" id="0x7f12069d" />
+    <public type="string" name="form_label_voice_diagnostics" id="0x7f12069e" />
+    <public type="string" name="form_label_voice_processing" id="0x7f12069f" />
+    <public type="string" name="form_label_volume" id="0x7f1206a0" />
+    <public type="string" name="form_missing_required_fields" id="0x7f1206a1" />
+    <public type="string" name="form_placeholder_reason" id="0x7f1206a2" />
+    <public type="string" name="form_placeholder_server_name" id="0x7f1206a3" />
+    <public type="string" name="form_placeholder_username" id="0x7f1206a4" />
+    <public type="string" name="form_report_help_text" id="0x7f1206a5" />
+    <public type="string" name="form_warning_input_sensitivty" id="0x7f1206a6" />
+    <public type="string" name="form_warning_video_preview" id="0x7f1206a7" />
+    <public type="string" name="fr" id="0x7f1206a8" />
+    <public type="string" name="friend_has_been_deleted" id="0x7f1206a9" />
+    <public type="string" name="friend_permitted_source" id="0x7f1206aa" />
+    <public type="string" name="friend_permitted_source_all" id="0x7f1206ab" />
+    <public type="string" name="friend_permitted_source_mutual_friends" id="0x7f1206ac" />
+    <public type="string" name="friend_permitted_source_mutual_guilds" id="0x7f1206ad" />
+    <public type="string" name="friend_request_accept" id="0x7f1206ae" />
+    <public type="string" name="friend_request_cancel" id="0x7f1206af" />
+    <public type="string" name="friend_request_cancelled" id="0x7f1206b0" />
+    <public type="string" name="friend_request_ignore" id="0x7f1206b1" />
+    <public type="string" name="friend_request_ignored" id="0x7f1206b2" />
+    <public type="string" name="friend_request_rate_limited_body" id="0x7f1206b3" />
+    <public type="string" name="friend_request_rate_limited_button" id="0x7f1206b4" />
+    <public type="string" name="friend_request_rate_limited_header" id="0x7f1206b5" />
+    <public type="string" name="friend_request_requires_email_validation_body" id="0x7f1206b6" />
+    <public type="string" name="friend_request_requires_email_validation_button" id="0x7f1206b7" />
+    <public type="string" name="friend_request_requires_email_validation_header" id="0x7f1206b8" />
+    <public type="string" name="friend_request_sent" id="0x7f1206b9" />
+    <public type="string" name="friends" id="0x7f1206ba" />
+    <public type="string" name="friends_column_name" id="0x7f1206bb" />
+    <public type="string" name="friends_column_status" id="0x7f1206bc" />
+    <public type="string" name="friends_empty_state_all" id="0x7f1206bd" />
+    <public type="string" name="friends_empty_state_all_body" id="0x7f1206be" />
+    <public type="string" name="friends_empty_state_all_cta" id="0x7f1206bf" />
+    <public type="string" name="friends_empty_state_all_header" id="0x7f1206c0" />
+    <public type="string" name="friends_empty_state_blocked" id="0x7f1206c1" />
+    <public type="string" name="friends_empty_state_copy" id="0x7f1206c2" />
+    <public type="string" name="friends_empty_state_online" id="0x7f1206c3" />
+    <public type="string" name="friends_empty_state_pending" id="0x7f1206c4" />
+    <public type="string" name="friends_offline_header" id="0x7f1206c5" />
+    <public type="string" name="friends_online" id="0x7f1206c6" />
+    <public type="string" name="friends_online_header" id="0x7f1206c7" />
+    <public type="string" name="friends_pending_request_expand" id="0x7f1206c8" />
+    <public type="string" name="friends_pending_request_expand_collapse" id="0x7f1206c9" />
+    <public type="string" name="friends_pending_request_header" id="0x7f1206ca" />
+    <public type="string" name="friends_request_status_incoming" id="0x7f1206cb" />
+    <public type="string" name="friends_request_status_outgoing" id="0x7f1206cc" />
+    <public type="string" name="friends_row_action_button_accessibility_label_accept" id="0x7f1206cd" />
+    <public type="string" name="friends_row_action_button_accessibility_label_call" id="0x7f1206ce" />
+    <public type="string" name="friends_row_action_button_accessibility_label_decline" id="0x7f1206cf" />
+    <public type="string" name="friends_row_action_button_accessibility_label_message" id="0x7f1206d0" />
+    <public type="string" name="friends_section_add_friend" id="0x7f1206d1" />
+    <public type="string" name="friends_section_all" id="0x7f1206d2" />
+    <public type="string" name="friends_section_online" id="0x7f1206d3" />
+    <public type="string" name="friends_section_pending" id="0x7f1206d4" />
+    <public type="string" name="friends_share" id="0x7f1206d5" />
+    <public type="string" name="friends_share_sheet_scanning_text_bottom" id="0x7f1206d6" />
+    <public type="string" name="friends_share_sheet_scanning_text_top" id="0x7f1206d7" />
+    <public type="string" name="friends_share_tabbar_title" id="0x7f1206d8" />
+    <public type="string" name="full" id="0x7f1206d9" />
+    <public type="string" name="full_screen" id="0x7f1206da" />
+    <public type="string" name="game_action_button_add_to_library" id="0x7f1206db" />
+    <public type="string" name="game_action_button_cannot_install" id="0x7f1206dc" />
+    <public type="string" name="game_action_button_downloading" id="0x7f1206dd" />
+    <public type="string" name="game_action_button_game_not_detected" id="0x7f1206de" />
+    <public type="string" name="game_action_button_install" id="0x7f1206df" />
+    <public type="string" name="game_action_button_locate" id="0x7f1206e0" />
+    <public type="string" name="game_action_button_login_to_buy" id="0x7f1206e1" />
+    <public type="string" name="game_action_button_now_playing" id="0x7f1206e2" />
+    <public type="string" name="game_action_button_paused" id="0x7f1206e3" />
+    <public type="string" name="game_action_button_play" id="0x7f1206e4" />
+    <public type="string" name="game_action_button_play_disabled_desktop_app" id="0x7f1206e5" />
+    <public type="string" name="game_action_button_preorder_wait" id="0x7f1206e6" />
+    <public type="string" name="game_action_button_preorder_wait_tooltip" id="0x7f1206e7" />
+    <public type="string" name="game_action_button_queue" id="0x7f1206e8" />
+    <public type="string" name="game_action_button_queued" id="0x7f1206e9" />
+    <public type="string" name="game_action_button_restricted_in_region" id="0x7f1206ea" />
+    <public type="string" name="game_action_button_unavailable" id="0x7f1206eb" />
+    <public type="string" name="game_action_button_unavailable_tooltip" id="0x7f1206ec" />
+    <public type="string" name="game_action_button_unavailable_tooltip_plural" id="0x7f1206ed" />
+    <public type="string" name="game_action_button_uninstalling_1" id="0x7f1206ee" />
+    <public type="string" name="game_action_button_uninstalling_10" id="0x7f1206ef" />
+    <public type="string" name="game_action_button_uninstalling_2" id="0x7f1206f0" />
+    <public type="string" name="game_action_button_uninstalling_3" id="0x7f1206f1" />
+    <public type="string" name="game_action_button_uninstalling_4" id="0x7f1206f2" />
+    <public type="string" name="game_action_button_uninstalling_5" id="0x7f1206f3" />
+    <public type="string" name="game_action_button_uninstalling_6" id="0x7f1206f4" />
+    <public type="string" name="game_action_button_uninstalling_7" id="0x7f1206f5" />
+    <public type="string" name="game_action_button_uninstalling_8" id="0x7f1206f6" />
+    <public type="string" name="game_action_button_uninstalling_9" id="0x7f1206f7" />
+    <public type="string" name="game_action_button_update" id="0x7f1206f8" />
+    <public type="string" name="game_action_button_view_in_store" id="0x7f1206f9" />
+    <public type="string" name="game_activity" id="0x7f1206fa" />
+    <public type="string" name="game_activity_notifications" id="0x7f1206fb" />
+    <public type="string" name="game_detected" id="0x7f1206fc" />
+    <public type="string" name="game_detection_foreground_android" id="0x7f1206fd" />
+    <public type="string" name="game_detection_foreground_info_android" id="0x7f1206fe" />
+    <public type="string" name="game_detection_modal_info_android" id="0x7f1206ff" />
+    <public type="string" name="game_detection_open_settings" id="0x7f120700" />
+    <public type="string" name="game_detection_service" id="0x7f120701" />
+    <public type="string" name="game_feed_activity_action_play" id="0x7f120702" />
+    <public type="string" name="game_feed_activity_playing_xbox" id="0x7f120703" />
+    <public type="string" name="game_feed_activity_recently_played" id="0x7f120704" />
+    <public type="string" name="game_feed_activity_streaming_twitch" id="0x7f120705" />
+    <public type="string" name="game_feed_current_header_title" id="0x7f120706" />
+    <public type="string" name="game_feed_settings_visibility" id="0x7f120707" />
+    <public type="string" name="game_feed_unknown_player" id="0x7f120708" />
+    <public type="string" name="game_feed_user_played_days_ago" id="0x7f120709" />
+    <public type="string" name="game_feed_user_played_hours_ago" id="0x7f12070a" />
+    <public type="string" name="game_feed_user_played_minutes_ago" id="0x7f12070b" />
+    <public type="string" name="game_feed_user_played_months_ago" id="0x7f12070c" />
+    <public type="string" name="game_feed_user_played_weeks_ago" id="0x7f12070d" />
+    <public type="string" name="game_feed_user_played_years_ago" id="0x7f12070e" />
+    <public type="string" name="game_feed_user_playing_for_days" id="0x7f12070f" />
+    <public type="string" name="game_feed_user_playing_for_hours" id="0x7f120710" />
+    <public type="string" name="game_feed_user_playing_for_minutes" id="0x7f120711" />
+    <public type="string" name="game_feed_user_playing_just_ended" id="0x7f120712" />
+    <public type="string" name="game_feed_user_playing_just_started" id="0x7f120713" />
+    <public type="string" name="game_launch_failed_launch_target_not_found" id="0x7f120714" />
+    <public type="string" name="game_library" id="0x7f120715" />
+    <public type="string" name="game_library_last_played_days" id="0x7f120716" />
+    <public type="string" name="game_library_last_played_hours" id="0x7f120717" />
+    <public type="string" name="game_library_last_played_just_now" id="0x7f120718" />
+    <public type="string" name="game_library_last_played_minutes" id="0x7f120719" />
+    <public type="string" name="game_library_last_played_months" id="0x7f12071a" />
+    <public type="string" name="game_library_last_played_none" id="0x7f12071b" />
+    <public type="string" name="game_library_last_played_playing_now" id="0x7f12071c" />
+    <public type="string" name="game_library_last_played_weeks" id="0x7f12071d" />
+    <public type="string" name="game_library_last_played_years" id="0x7f12071e" />
+    <public type="string" name="game_library_list_header_last_played" id="0x7f12071f" />
+    <public type="string" name="game_library_list_header_name" id="0x7f120720" />
+    <public type="string" name="game_library_list_header_platform" id="0x7f120721" />
+    <public type="string" name="game_library_new" id="0x7f120722" />
+    <public type="string" name="game_library_not_applicable" id="0x7f120723" />
+    <public type="string" name="game_library_notification_game_installed_body" id="0x7f120724" />
+    <public type="string" name="game_library_notification_game_installed_title" id="0x7f120725" />
+    <public type="string" name="game_library_overlay_disabled_tooltip" id="0x7f120726" />
+    <public type="string" name="game_library_private_tooltip" id="0x7f120727" />
+    <public type="string" name="game_library_time_played_hours" id="0x7f120728" />
+    <public type="string" name="game_library_time_played_minutes" id="0x7f120729" />
+    <public type="string" name="game_library_time_played_none" id="0x7f12072a" />
+    <public type="string" name="game_library_time_played_seconds" id="0x7f12072b" />
+    <public type="string" name="game_library_updates_action_move_up" id="0x7f12072c" />
+    <public type="string" name="game_library_updates_action_pause" id="0x7f12072d" />
+    <public type="string" name="game_library_updates_action_remove" id="0x7f12072e" />
+    <public type="string" name="game_library_updates_action_resume" id="0x7f12072f" />
+    <public type="string" name="game_library_updates_header_disk" id="0x7f120730" />
+    <public type="string" name="game_library_updates_header_network" id="0x7f120731" />
+    <public type="string" name="game_library_updates_installing" id="0x7f120732" />
+    <public type="string" name="game_library_updates_installing_hours" id="0x7f120733" />
+    <public type="string" name="game_library_updates_installing_minutes" id="0x7f120734" />
+    <public type="string" name="game_library_updates_installing_seconds" id="0x7f120735" />
+    <public type="string" name="game_library_updates_progress_allocating_disk" id="0x7f120736" />
+    <public type="string" name="game_library_updates_progress_downloading_text_installing" id="0x7f120737" />
+    <public type="string" name="game_library_updates_progress_downloading_text_patching" id="0x7f120738" />
+    <public type="string" name="game_library_updates_progress_finalizing" id="0x7f120739" />
+    <public type="string" name="game_library_updates_progress_finished" id="0x7f12073a" />
+    <public type="string" name="game_library_updates_progress_paused" id="0x7f12073b" />
+    <public type="string" name="game_library_updates_progress_paused_no_transition" id="0x7f12073c" />
+    <public type="string" name="game_library_updates_progress_pausing" id="0x7f12073d" />
+    <public type="string" name="game_library_updates_progress_planning" id="0x7f12073e" />
+    <public type="string" name="game_library_updates_progress_post_install_scripts" id="0x7f12073f" />
+    <public type="string" name="game_library_updates_progress_queued" id="0x7f120740" />
+    <public type="string" name="game_library_updates_progress_queued_no_transition" id="0x7f120741" />
+    <public type="string" name="game_library_updates_progress_repairing" id="0x7f120742" />
+    <public type="string" name="game_library_updates_progress_verifying" id="0x7f120743" />
+    <public type="string" name="game_library_updates_progress_waiting_for_another" id="0x7f120744" />
+    <public type="string" name="game_library_updates_progress_waiting_for_another_no_transition" id="0x7f120745" />
+    <public type="string" name="game_library_updates_updating" id="0x7f120746" />
+    <public type="string" name="game_library_updates_updating_updating_hours" id="0x7f120747" />
+    <public type="string" name="game_library_updates_updating_updating_minutes" id="0x7f120748" />
+    <public type="string" name="game_library_updates_updating_updating_seconds" id="0x7f120749" />
+    <public type="string" name="game_popout_follow" id="0x7f12074a" />
+    <public type="string" name="game_popout_go_to_server" id="0x7f12074b" />
+    <public type="string" name="game_popout_nitro_upsell" id="0x7f12074c" />
+    <public type="string" name="game_popout_no_recent_players" id="0x7f12074d" />
+    <public type="string" name="game_popout_online_in_server" id="0x7f12074e" />
+    <public type="string" name="game_popout_unfollow" id="0x7f12074f" />
+    <public type="string" name="game_popout_view_server" id="0x7f120750" />
+    <public type="string" name="games" id="0x7f120751" />
+    <public type="string" name="gcm_defaultSenderId" id="0x7f120752" />
+    <public type="string" name="general_permissions" id="0x7f120753" />
+    <public type="string" name="generate_a_new_link" id="0x7f120754" />
+    <public type="string" name="get_started" id="0x7f120755" />
+    <public type="string" name="gif" id="0x7f120756" />
+    <public type="string" name="gif_auto_play_label" id="0x7f120757" />
+    <public type="string" name="gif_auto_play_label_mobile" id="0x7f120758" />
+    <public type="string" name="gif_button_label" id="0x7f120759" />
+    <public type="string" name="gif_picker_back_to_top" id="0x7f12075a" />
+    <public type="string" name="gif_picker_favorites" id="0x7f12075b" />
+    <public type="string" name="gif_picker_related_search" id="0x7f12075c" />
+    <public type="string" name="gif_picker_result_type_recent" id="0x7f12075d" />
+    <public type="string" name="gif_picker_result_type_trending_gifs" id="0x7f12075e" />
+    <public type="string" name="gif_tooltip_add_to_favorites" id="0x7f12075f" />
+    <public type="string" name="gif_tooltip_favorited_picker_button" id="0x7f120760" />
+    <public type="string" name="gif_tooltip_remove_from_favorites" id="0x7f120761" />
+    <public type="string" name="gift_code_auth_accept" id="0x7f120762" />
+    <public type="string" name="gift_code_auth_accepting" id="0x7f120763" />
+    <public type="string" name="gift_code_auth_check_verification_again" id="0x7f120764" />
+    <public type="string" name="gift_code_auth_continue_in_browser" id="0x7f120765" />
+    <public type="string" name="gift_code_auth_fetching_user" id="0x7f120766" />
+    <public type="string" name="gift_code_auth_gifted" id="0x7f120767" />
+    <public type="string" name="gift_code_auth_gifted_by" id="0x7f120768" />
+    <public type="string" name="gift_code_auth_gifted_subscription_monthly" id="0x7f120769" />
+    <public type="string" name="gift_code_auth_gifted_subscription_yearly" id="0x7f12076a" />
+    <public type="string" name="gift_code_auth_help_text_claimed" id="0x7f12076b" />
+    <public type="string" name="gift_code_auth_help_text_owned" id="0x7f12076c" />
+    <public type="string" name="gift_code_auth_help_text_verification_required" id="0x7f12076d" />
+    <public type="string" name="gift_code_auth_invalid_body" id="0x7f12076e" />
+    <public type="string" name="gift_code_auth_invalid_tip" id="0x7f12076f" />
+    <public type="string" name="gift_code_auth_invalid_title" id="0x7f120770" />
+    <public type="string" name="gift_code_auth_logged_in_as" id="0x7f120771" />
+    <public type="string" name="gift_code_auth_resolving" id="0x7f120772" />
+    <public type="string" name="gift_code_auth_verification_sent" id="0x7f120773" />
+    <public type="string" name="gift_code_auth_verification_title" id="0x7f120774" />
+    <public type="string" name="gift_code_cannot_accept_body_ios" id="0x7f120775" />
+    <public type="string" name="gift_code_hint" id="0x7f120776" />
+    <public type="string" name="gift_confirmation_body_claimed" id="0x7f120777" />
+    <public type="string" name="gift_confirmation_body_confirm" id="0x7f120778" />
+    <public type="string" name="gift_confirmation_body_confirm_nitro" id="0x7f120779" />
+    <public type="string" name="gift_confirmation_body_error_invoice_open" id="0x7f12077a" />
+    <public type="string" name="gift_confirmation_body_error_nitro_upgrade_downgrade" id="0x7f12077b" />
+    <public type="string" name="gift_confirmation_body_error_subscription_managed" id="0x7f12077c" />
+    <public type="string" name="gift_confirmation_body_invalid" id="0x7f12077d" />
+    <public type="string" name="gift_confirmation_body_owned" id="0x7f12077e" />
+    <public type="string" name="gift_confirmation_body_self_gift_no_payment" id="0x7f12077f" />
+    <public type="string" name="gift_confirmation_body_subscription_monthly_confirm" id="0x7f120780" />
+    <public type="string" name="gift_confirmation_body_subscription_yearly_confirm" id="0x7f120781" />
+    <public type="string" name="gift_confirmation_body_success" id="0x7f120782" />
+    <public type="string" name="gift_confirmation_body_success_generic_subscription_monthly" id="0x7f120783" />
+    <public type="string" name="gift_confirmation_body_success_generic_subscription_yearly" id="0x7f120784" />
+    <public type="string" name="gift_confirmation_body_success_mobile" id="0x7f120785" />
+    <public type="string" name="gift_confirmation_body_success_nitro_classic_mobile" id="0x7f120786" />
+    <public type="string" name="gift_confirmation_body_success_nitro_mobile" id="0x7f120787" />
+    <public type="string" name="gift_confirmation_body_success_premium_tier_1_monthly" id="0x7f120788" />
+    <public type="string" name="gift_confirmation_body_success_premium_tier_1_yearly" id="0x7f120789" />
+    <public type="string" name="gift_confirmation_body_success_premium_tier_2_monthly" id="0x7f12078a" />
+    <public type="string" name="gift_confirmation_body_success_premium_tier_2_yearly" id="0x7f12078b" />
+    <public type="string" name="gift_confirmation_body_unknown_error" id="0x7f12078c" />
+    <public type="string" name="gift_confirmation_button_confirm" id="0x7f12078d" />
+    <public type="string" name="gift_confirmation_button_confirm_mobile" id="0x7f12078e" />
+    <public type="string" name="gift_confirmation_button_confirm_subscription" id="0x7f12078f" />
+    <public type="string" name="gift_confirmation_button_fail" id="0x7f120790" />
+    <public type="string" name="gift_confirmation_button_go_to_library" id="0x7f120791" />
+    <public type="string" name="gift_confirmation_button_noice" id="0x7f120792" />
+    <public type="string" name="gift_confirmation_button_subscription_success" id="0x7f120793" />
+    <public type="string" name="gift_confirmation_button_success_mobile" id="0x7f120794" />
+    <public type="string" name="gift_confirmation_header_confirm" id="0x7f120795" />
+    <public type="string" name="gift_confirmation_header_confirm_nitro" id="0x7f120796" />
+    <public type="string" name="gift_confirmation_header_fail" id="0x7f120797" />
+    <public type="string" name="gift_confirmation_header_success" id="0x7f120798" />
+    <public type="string" name="gift_confirmation_header_success_nitro" id="0x7f120799" />
+    <public type="string" name="gift_confirmation_nitro_time_frame_months" id="0x7f12079a" />
+    <public type="string" name="gift_confirmation_nitro_time_frame_years" id="0x7f12079b" />
+    <public type="string" name="gift_embed_body_claimed_other" id="0x7f12079c" />
+    <public type="string" name="gift_embed_body_claimed_self" id="0x7f12079d" />
+    <public type="string" name="gift_embed_body_claimed_self_mobile" id="0x7f12079e" />
+    <public type="string" name="gift_embed_body_claimed_self_subscription" id="0x7f12079f" />
+    <public type="string" name="gift_embed_body_default" id="0x7f1207a0" />
+    <public type="string" name="gift_embed_body_giveaway" id="0x7f1207a1" />
+    <public type="string" name="gift_embed_body_no_user_default" id="0x7f1207a2" />
+    <public type="string" name="gift_embed_body_no_user_giveaway" id="0x7f1207a3" />
+    <public type="string" name="gift_embed_body_owned" id="0x7f1207a4" />
+    <public type="string" name="gift_embed_body_owned_mobile" id="0x7f1207a5" />
+    <public type="string" name="gift_embed_body_requires_verification" id="0x7f1207a6" />
+    <public type="string" name="gift_embed_body_requires_verification_mobile" id="0x7f1207a7" />
+    <public type="string" name="gift_embed_body_self" id="0x7f1207a8" />
+    <public type="string" name="gift_embed_body_subscription_default_months" id="0x7f1207a9" />
+    <public type="string" name="gift_embed_body_subscription_default_years" id="0x7f1207aa" />
+    <public type="string" name="gift_embed_body_subscription_giveaway" id="0x7f1207ab" />
+    <public type="string" name="gift_embed_body_subscription_mismatch" id="0x7f1207ac" />
+    <public type="string" name="gift_embed_body_subscription_no_user_default_months" id="0x7f1207ad" />
+    <public type="string" name="gift_embed_body_subscription_no_user_default_years" id="0x7f1207ae" />
+    <public type="string" name="gift_embed_body_subscription_no_user_giveaway" id="0x7f1207af" />
+    <public type="string" name="gift_embed_button_accept" id="0x7f1207b0" />
+    <public type="string" name="gift_embed_button_cant_accept" id="0x7f1207b1" />
+    <public type="string" name="gift_embed_button_claimed" id="0x7f1207b2" />
+    <public type="string" name="gift_embed_button_claiming" id="0x7f1207b3" />
+    <public type="string" name="gift_embed_button_owned" id="0x7f1207b4" />
+    <public type="string" name="gift_embed_copies_left" id="0x7f1207b5" />
+    <public type="string" name="gift_embed_expiration" id="0x7f1207b6" />
+    <public type="string" name="gift_embed_header_owner_invalid" id="0x7f1207b7" />
+    <public type="string" name="gift_embed_header_receiver_invalid" id="0x7f1207b8" />
+    <public type="string" name="gift_embed_info_owner_invalid" id="0x7f1207b9" />
+    <public type="string" name="gift_embed_info_receiver_invalid" id="0x7f1207ba" />
+    <public type="string" name="gift_embed_invalid" id="0x7f1207bb" />
+    <public type="string" name="gift_embed_invalid_tagline_other" id="0x7f1207bc" />
+    <public type="string" name="gift_embed_invalid_tagline_self" id="0x7f1207bd" />
+    <public type="string" name="gift_embed_invalid_title_other" id="0x7f1207be" />
+    <public type="string" name="gift_embed_invalid_title_self" id="0x7f1207bf" />
+    <public type="string" name="gift_embed_resolving" id="0x7f1207c0" />
+    <public type="string" name="gift_embed_subscriptions_left" id="0x7f1207c1" />
+    <public type="string" name="gift_embed_title" id="0x7f1207c2" />
+    <public type="string" name="gift_embed_title_self" id="0x7f1207c3" />
+    <public type="string" name="gift_embed_title_subscription" id="0x7f1207c4" />
+    <public type="string" name="gift_embed_title_subscription_self" id="0x7f1207c5" />
+    <public type="string" name="gift_embed_unknown_user" id="0x7f1207c6" />
+    <public type="string" name="gift_inventory" id="0x7f1207c7" />
+    <public type="string" name="gift_inventory_copies" id="0x7f1207c8" />
+    <public type="string" name="gift_inventory_expires_in" id="0x7f1207c9" />
+    <public type="string" name="gift_inventory_expires_in_mobile" id="0x7f1207ca" />
+    <public type="string" name="gift_inventory_generate_help" id="0x7f1207cb" />
+    <public type="string" name="gift_inventory_generate_link" id="0x7f1207cc" />
+    <public type="string" name="gift_inventory_generate_link_ios" id="0x7f1207cd" />
+    <public type="string" name="gift_inventory_hidden" id="0x7f1207ce" />
+    <public type="string" name="gift_inventory_no_gifts" id="0x7f1207cf" />
+    <public type="string" name="gift_inventory_no_gifts_subtext" id="0x7f1207d0" />
+    <public type="string" name="gift_inventory_no_gifts_subtext_mobile" id="0x7f1207d1" />
+    <public type="string" name="gift_inventory_redeem_codes" id="0x7f1207d2" />
+    <public type="string" name="gift_inventory_select_nitro_gift" id="0x7f1207d3" />
+    <public type="string" name="gift_inventory_subscription_months" id="0x7f1207d4" />
+    <public type="string" name="gift_inventory_subscription_years" id="0x7f1207d5" />
+    <public type="string" name="go_live_hardware_acceleration_unavailable" id="0x7f1207d6" />
+    <public type="string" name="go_live_hey" id="0x7f1207d7" />
+    <public type="string" name="go_live_listen" id="0x7f1207d8" />
+    <public type="string" name="go_live_look" id="0x7f1207d9" />
+    <public type="string" name="go_live_modal_application_form_title" id="0x7f1207da" />
+    <public type="string" name="go_live_modal_cta" id="0x7f1207db" />
+    <public type="string" name="go_live_modal_current_channel_form_title" id="0x7f1207dc" />
+    <public type="string" name="go_live_modal_description" id="0x7f1207dd" />
+    <public type="string" name="go_live_modal_overflow_four_or_more_users" id="0x7f1207de" />
+    <public type="string" name="go_live_modal_overflow_three_users" id="0x7f1207df" />
+    <public type="string" name="go_live_modal_overflow_two_users" id="0x7f1207e0" />
+    <public type="string" name="go_live_modal_select_channel_form_title" id="0x7f1207e1" />
+    <public type="string" name="go_live_modal_select_channel_placeholder" id="0x7f1207e2" />
+    <public type="string" name="go_live_modal_title" id="0x7f1207e3" />
+    <public type="string" name="go_live_video_drivers_outdated" id="0x7f1207e4" />
+    <public type="string" name="go_live_viewers_action_sheet_not_spectating" id="0x7f1207e5" />
+    <public type="string" name="go_live_viewers_action_sheet_spectating" id="0x7f1207e6" />
+    <public type="string" name="go_live_viewers_action_sheet_streaming" id="0x7f1207e7" />
+    <public type="string" name="go_to_developer_portal" id="0x7f1207e8" />
+    <public type="string" name="google_api_key" id="0x7f1207e9" />
+    <public type="string" name="google_app_id" id="0x7f1207ea" />
+    <public type="string" name="google_crash_reporting_api_key" id="0x7f1207eb" />
+    <public type="string" name="google_play" id="0x7f1207ec" />
+    <public type="string" name="google_storage_bucket" id="0x7f1207ed" />
+    <public type="string" name="grant_temporary_membership" id="0x7f1207ee" />
+    <public type="string" name="green" id="0x7f1207ef" />
+    <public type="string" name="grey" id="0x7f1207f0" />
+    <public type="string" name="group" id="0x7f1207f1" />
+    <public type="string" name="group_dm" id="0x7f1207f2" />
+    <public type="string" name="group_dm_add_friends" id="0x7f1207f3" />
+    <public type="string" name="group_dm_add_members" id="0x7f1207f4" />
+    <public type="string" name="group_dm_header" id="0x7f1207f5" />
+    <public type="string" name="group_dm_invite_empty" id="0x7f1207f6" />
+    <public type="string" name="group_dm_invite_full_main" id="0x7f1207f7" />
+    <public type="string" name="group_dm_invite_full_sub" id="0x7f1207f8" />
+    <public type="string" name="group_dm_invite_full_sub2" id="0x7f1207f9" />
+    <public type="string" name="group_dm_invite_link_create" id="0x7f1207fa" />
+    <public type="string" name="group_dm_invite_link_example" id="0x7f1207fb" />
+    <public type="string" name="group_dm_invite_link_title" id="0x7f1207fc" />
+    <public type="string" name="group_dm_invite_no_friends" id="0x7f1207fd" />
+    <public type="string" name="group_dm_invite_not_friends" id="0x7f1207fe" />
+    <public type="string" name="group_dm_invite_remaining" id="0x7f1207ff" />
+    <public type="string" name="group_dm_invite_successful_mobile" id="0x7f120800" />
+    <public type="string" name="group_dm_invite_to" id="0x7f120801" />
+    <public type="string" name="group_dm_invite_unselect_users" id="0x7f120802" />
+    <public type="string" name="group_dm_invite_will_fill_mobile" id="0x7f120803" />
+    <public type="string" name="group_dm_invite_with_name" id="0x7f120804" />
+    <public type="string" name="group_dm_search_placeholder" id="0x7f120805" />
+    <public type="string" name="group_dm_settings" id="0x7f120806" />
+    <public type="string" name="group_name" id="0x7f120807" />
+    <public type="string" name="group_owner" id="0x7f120808" />
+    <public type="string" name="groups" id="0x7f120809" />
+    <public type="string" name="guest_lurker_mode_chat_input_body" id="0x7f12080a" />
+    <public type="string" name="guest_lurker_mode_chat_input_header" id="0x7f12080b" />
+    <public type="string" name="guild_analytics_guild_header_tooltip" id="0x7f12080c" />
+    <public type="string" name="guild_discovery_header_e3_games" id="0x7f12080d" />
+    <public type="string" name="guild_discovery_header_games_you_play" id="0x7f12080e" />
+    <public type="string" name="guild_discovery_header_popular_servers" id="0x7f12080f" />
+    <public type="string" name="guild_discovery_header_search_results" id="0x7f120810" />
+    <public type="string" name="guild_discovery_header_trending_games" id="0x7f120811" />
+    <public type="string" name="guild_discovery_search_empty_description" id="0x7f120812" />
+    <public type="string" name="guild_discovery_search_empty_title" id="0x7f120813" />
+    <public type="string" name="guild_discovery_search_header" id="0x7f120814" />
+    <public type="string" name="guild_discovery_search_label" id="0x7f120815" />
+    <public type="string" name="guild_discovery_search_placeholder" id="0x7f120816" />
+    <public type="string" name="guild_discovery_search_press_enter" id="0x7f120817" />
+    <public type="string" name="guild_discovery_tooltip" id="0x7f120818" />
+    <public type="string" name="guild_discovery_trending_game_description" id="0x7f120819" />
+    <public type="string" name="guild_discovery_view_button" id="0x7f12081a" />
+    <public type="string" name="guild_folder_color" id="0x7f12081b" />
+    <public type="string" name="guild_folder_name" id="0x7f12081c" />
+    <public type="string" name="guild_header_hotspot_tooltip" id="0x7f12081d" />
+    <public type="string" name="guild_join_intent_chat" id="0x7f12081e" />
+    <public type="string" name="guild_join_intent_chat_friends" id="0x7f12081f" />
+    <public type="string" name="guild_join_intent_game_help" id="0x7f120820" />
+    <public type="string" name="guild_join_intent_lfg" id="0x7f120821" />
+    <public type="string" name="guild_join_intent_news" id="0x7f120822" />
+    <public type="string" name="guild_join_intent_skip" id="0x7f120823" />
+    <public type="string" name="guild_join_welcome_to_server" id="0x7f120824" />
+    <public type="string" name="guild_join_what_are_you_looking_to_do" id="0x7f120825" />
+    <public type="string" name="guild_members_header" id="0x7f120826" />
+    <public type="string" name="guild_members_search_no_result" id="0x7f120827" />
+    <public type="string" name="guild_message_notifications_only_mentions" id="0x7f120828" />
+    <public type="string" name="guild_muted_help_text" id="0x7f120829" />
+    <public type="string" name="guild_owner" id="0x7f12082a" />
+    <public type="string" name="guild_partnered" id="0x7f12082b" />
+    <public type="string" name="guild_popout_emoji_remaining" id="0x7f12082c" />
+    <public type="string" name="guild_popout_unavailable_flavor" id="0x7f12082d" />
+    <public type="string" name="guild_popout_unavailable_header" id="0x7f12082e" />
+    <public type="string" name="guild_popout_view_server_button" id="0x7f12082f" />
+    <public type="string" name="guild_premium" id="0x7f120830" />
+    <public type="string" name="guild_security_req_mfa_body" id="0x7f120831" />
+    <public type="string" name="guild_security_req_mfa_enable" id="0x7f120832" />
+    <public type="string" name="guild_security_req_mfa_guild_disable" id="0x7f120833" />
+    <public type="string" name="guild_security_req_mfa_guild_enable" id="0x7f120834" />
+    <public type="string" name="guild_security_req_mfa_label" id="0x7f120835" />
+    <public type="string" name="guild_security_req_mfa_turn_off" id="0x7f120836" />
+    <public type="string" name="guild_security_req_mfa_turn_on" id="0x7f120837" />
+    <public type="string" name="guild_settings_action_filter_channel_create" id="0x7f120838" />
+    <public type="string" name="guild_settings_action_filter_channel_delete" id="0x7f120839" />
+    <public type="string" name="guild_settings_action_filter_channel_overwrite_create" id="0x7f12083a" />
+    <public type="string" name="guild_settings_action_filter_channel_overwrite_delete" id="0x7f12083b" />
+    <public type="string" name="guild_settings_action_filter_channel_overwrite_update" id="0x7f12083c" />
+    <public type="string" name="guild_settings_action_filter_channel_update" id="0x7f12083d" />
+    <public type="string" name="guild_settings_action_filter_emoji_create" id="0x7f12083e" />
+    <public type="string" name="guild_settings_action_filter_emoji_delete" id="0x7f12083f" />
+    <public type="string" name="guild_settings_action_filter_emoji_update" id="0x7f120840" />
+    <public type="string" name="guild_settings_action_filter_guild_update" id="0x7f120841" />
+    <public type="string" name="guild_settings_action_filter_invite_create" id="0x7f120842" />
+    <public type="string" name="guild_settings_action_filter_invite_delete" id="0x7f120843" />
+    <public type="string" name="guild_settings_action_filter_invite_update" id="0x7f120844" />
+    <public type="string" name="guild_settings_action_filter_member_ban_add" id="0x7f120845" />
+    <public type="string" name="guild_settings_action_filter_member_ban_remove" id="0x7f120846" />
+    <public type="string" name="guild_settings_action_filter_member_kick" id="0x7f120847" />
+    <public type="string" name="guild_settings_action_filter_member_prune" id="0x7f120848" />
+    <public type="string" name="guild_settings_action_filter_member_role_update" id="0x7f120849" />
+    <public type="string" name="guild_settings_action_filter_member_update" id="0x7f12084a" />
+    <public type="string" name="guild_settings_action_filter_message_delete" id="0x7f12084b" />
+    <public type="string" name="guild_settings_action_filter_role_create" id="0x7f12084c" />
+    <public type="string" name="guild_settings_action_filter_role_delete" id="0x7f12084d" />
+    <public type="string" name="guild_settings_action_filter_role_update" id="0x7f12084e" />
+    <public type="string" name="guild_settings_action_filter_webhook_create" id="0x7f12084f" />
+    <public type="string" name="guild_settings_action_filter_webhook_delete" id="0x7f120850" />
+    <public type="string" name="guild_settings_action_filter_webhook_update" id="0x7f120851" />
+    <public type="string" name="guild_settings_audit_log_channel_bitrate_change" id="0x7f120852" />
+    <public type="string" name="guild_settings_audit_log_channel_bitrate_create" id="0x7f120853" />
+    <public type="string" name="guild_settings_audit_log_channel_category_create" id="0x7f120854" />
+    <public type="string" name="guild_settings_audit_log_channel_delete" id="0x7f120855" />
+    <public type="string" name="guild_settings_audit_log_channel_name_change" id="0x7f120856" />
+    <public type="string" name="guild_settings_audit_log_channel_name_create" id="0x7f120857" />
+    <public type="string" name="guild_settings_audit_log_channel_nsfw_disabled" id="0x7f120858" />
+    <public type="string" name="guild_settings_audit_log_channel_nsfw_enabled" id="0x7f120859" />
+    <public type="string" name="guild_settings_audit_log_channel_overwrite_create" id="0x7f12085a" />
+    <public type="string" name="guild_settings_audit_log_channel_overwrite_delete" id="0x7f12085b" />
+    <public type="string" name="guild_settings_audit_log_channel_overwrite_update" id="0x7f12085c" />
+    <public type="string" name="guild_settings_audit_log_channel_permission_overrides_create" id="0x7f12085d" />
+    <public type="string" name="guild_settings_audit_log_channel_permission_overrides_denied" id="0x7f12085e" />
+    <public type="string" name="guild_settings_audit_log_channel_permission_overrides_granted" id="0x7f12085f" />
+    <public type="string" name="guild_settings_audit_log_channel_position_change" id="0x7f120860" />
+    <public type="string" name="guild_settings_audit_log_channel_position_create" id="0x7f120861" />
+    <public type="string" name="guild_settings_audit_log_channel_rate_limit_per_user_change" id="0x7f120862" />
+    <public type="string" name="guild_settings_audit_log_channel_rate_limit_per_user_create" id="0x7f120863" />
+    <public type="string" name="guild_settings_audit_log_channel_text_create" id="0x7f120864" />
+    <public type="string" name="guild_settings_audit_log_channel_topic_change" id="0x7f120865" />
+    <public type="string" name="guild_settings_audit_log_channel_topic_create" id="0x7f120866" />
+    <public type="string" name="guild_settings_audit_log_channel_type_change" id="0x7f120867" />
+    <public type="string" name="guild_settings_audit_log_channel_type_create" id="0x7f120868" />
+    <public type="string" name="guild_settings_audit_log_channel_update" id="0x7f120869" />
+    <public type="string" name="guild_settings_audit_log_channel_voice_create" id="0x7f12086a" />
+    <public type="string" name="guild_settings_audit_log_common_reason" id="0x7f12086b" />
+    <public type="string" name="guild_settings_audit_log_emoji_create" id="0x7f12086c" />
+    <public type="string" name="guild_settings_audit_log_emoji_delete" id="0x7f12086d" />
+    <public type="string" name="guild_settings_audit_log_emoji_name_change" id="0x7f12086e" />
+    <public type="string" name="guild_settings_audit_log_emoji_name_create" id="0x7f12086f" />
+    <public type="string" name="guild_settings_audit_log_emoji_update" id="0x7f120870" />
+    <public type="string" name="guild_settings_audit_log_guild_afk_channel_id_change" id="0x7f120871" />
+    <public type="string" name="guild_settings_audit_log_guild_afk_channel_id_clear" id="0x7f120872" />
+    <public type="string" name="guild_settings_audit_log_guild_afk_timeout_change" id="0x7f120873" />
+    <public type="string" name="guild_settings_audit_log_guild_banner_hash_change" id="0x7f120874" />
+    <public type="string" name="guild_settings_audit_log_guild_default_message_notifications_change_all_messages" id="0x7f120875" />
+    <public type="string" name="guild_settings_audit_log_guild_default_message_notifications_change_only_mentions" id="0x7f120876" />
+    <public type="string" name="guild_settings_audit_log_guild_description_change" id="0x7f120877" />
+    <public type="string" name="guild_settings_audit_log_guild_description_clear" id="0x7f120878" />
+    <public type="string" name="guild_settings_audit_log_guild_explicit_content_filter_all_members" id="0x7f120879" />
+    <public type="string" name="guild_settings_audit_log_guild_explicit_content_filter_disable" id="0x7f12087a" />
+    <public type="string" name="guild_settings_audit_log_guild_explicit_content_filter_members_without_roles" id="0x7f12087b" />
+    <public type="string" name="guild_settings_audit_log_guild_icon_hash_change" id="0x7f12087c" />
+    <public type="string" name="guild_settings_audit_log_guild_mfa_level_disabled" id="0x7f12087d" />
+    <public type="string" name="guild_settings_audit_log_guild_mfa_level_enabled" id="0x7f12087e" />
+    <public type="string" name="guild_settings_audit_log_guild_name_change" id="0x7f12087f" />
+    <public type="string" name="guild_settings_audit_log_guild_owner_id_change" id="0x7f120880" />
+    <public type="string" name="guild_settings_audit_log_guild_preferred_locale_change" id="0x7f120881" />
+    <public type="string" name="guild_settings_audit_log_guild_region_change" id="0x7f120882" />
+    <public type="string" name="guild_settings_audit_log_guild_splash_hash_change" id="0x7f120883" />
+    <public type="string" name="guild_settings_audit_log_guild_system_channel_id_change" id="0x7f120884" />
+    <public type="string" name="guild_settings_audit_log_guild_system_channel_id_disable" id="0x7f120885" />
+    <public type="string" name="guild_settings_audit_log_guild_update" id="0x7f120886" />
+    <public type="string" name="guild_settings_audit_log_guild_vanity_url_code_change" id="0x7f120887" />
+    <public type="string" name="guild_settings_audit_log_guild_vanity_url_code_delete" id="0x7f120888" />
+    <public type="string" name="guild_settings_audit_log_guild_verification_level_change_high" id="0x7f120889" />
+    <public type="string" name="guild_settings_audit_log_guild_verification_level_change_low" id="0x7f12088a" />
+    <public type="string" name="guild_settings_audit_log_guild_verification_level_change_medium" id="0x7f12088b" />
+    <public type="string" name="guild_settings_audit_log_guild_verification_level_change_none" id="0x7f12088c" />
+    <public type="string" name="guild_settings_audit_log_guild_verification_level_change_very_high" id="0x7f12088d" />
+    <public type="string" name="guild_settings_audit_log_guild_widget_channel_id_change" id="0x7f12088e" />
+    <public type="string" name="guild_settings_audit_log_guild_widget_channel_id_delete" id="0x7f12088f" />
+    <public type="string" name="guild_settings_audit_log_guild_widget_disabled" id="0x7f120890" />
+    <public type="string" name="guild_settings_audit_log_guild_widget_enabled" id="0x7f120891" />
+    <public type="string" name="guild_settings_audit_log_invite_channel_create" id="0x7f120892" />
+    <public type="string" name="guild_settings_audit_log_invite_code_create" id="0x7f120893" />
+    <public type="string" name="guild_settings_audit_log_invite_create" id="0x7f120894" />
+    <public type="string" name="guild_settings_audit_log_invite_delete" id="0x7f120895" />
+    <public type="string" name="guild_settings_audit_log_invite_max_age_create" id="0x7f120896" />
+    <public type="string" name="guild_settings_audit_log_invite_max_age_create_infinite" id="0x7f120897" />
+    <public type="string" name="guild_settings_audit_log_invite_max_uses_create" id="0x7f120898" />
+    <public type="string" name="guild_settings_audit_log_invite_max_uses_create_infinite" id="0x7f120899" />
+    <public type="string" name="guild_settings_audit_log_invite_temporary_off" id="0x7f12089a" />
+    <public type="string" name="guild_settings_audit_log_invite_temporary_on" id="0x7f12089b" />
+    <public type="string" name="guild_settings_audit_log_invite_update" id="0x7f12089c" />
+    <public type="string" name="guild_settings_audit_log_load_more" id="0x7f12089d" />
+    <public type="string" name="guild_settings_audit_log_member_ban_add" id="0x7f12089e" />
+    <public type="string" name="guild_settings_audit_log_member_ban_remove" id="0x7f12089f" />
+    <public type="string" name="guild_settings_audit_log_member_deaf_off" id="0x7f1208a0" />
+    <public type="string" name="guild_settings_audit_log_member_deaf_on" id="0x7f1208a1" />
+    <public type="string" name="guild_settings_audit_log_member_kick" id="0x7f1208a2" />
+    <public type="string" name="guild_settings_audit_log_member_mute_off" id="0x7f1208a3" />
+    <public type="string" name="guild_settings_audit_log_member_mute_on" id="0x7f1208a4" />
+    <public type="string" name="guild_settings_audit_log_member_nick_change" id="0x7f1208a5" />
+    <public type="string" name="guild_settings_audit_log_member_nick_create" id="0x7f1208a6" />
+    <public type="string" name="guild_settings_audit_log_member_nick_delete" id="0x7f1208a7" />
+    <public type="string" name="guild_settings_audit_log_member_prune" id="0x7f1208a8" />
+    <public type="string" name="guild_settings_audit_log_member_prune_delete_days" id="0x7f1208a9" />
+    <public type="string" name="guild_settings_audit_log_member_role_update" id="0x7f1208aa" />
+    <public type="string" name="guild_settings_audit_log_member_roles_add" id="0x7f1208ab" />
+    <public type="string" name="guild_settings_audit_log_member_roles_remove" id="0x7f1208ac" />
+    <public type="string" name="guild_settings_audit_log_member_update" id="0x7f1208ad" />
+    <public type="string" name="guild_settings_audit_log_message_delete" id="0x7f1208ae" />
+    <public type="string" name="guild_settings_audit_log_role_color" id="0x7f1208af" />
+    <public type="string" name="guild_settings_audit_log_role_color_ios" id="0x7f1208b0" />
+    <public type="string" name="guild_settings_audit_log_role_color_none" id="0x7f1208b1" />
+    <public type="string" name="guild_settings_audit_log_role_create" id="0x7f1208b2" />
+    <public type="string" name="guild_settings_audit_log_role_delete" id="0x7f1208b3" />
+    <public type="string" name="guild_settings_audit_log_role_hoist_off" id="0x7f1208b4" />
+    <public type="string" name="guild_settings_audit_log_role_hoist_on" id="0x7f1208b5" />
+    <public type="string" name="guild_settings_audit_log_role_mentionable_off" id="0x7f1208b6" />
+    <public type="string" name="guild_settings_audit_log_role_mentionable_on" id="0x7f1208b7" />
+    <public type="string" name="guild_settings_audit_log_role_name_change" id="0x7f1208b8" />
+    <public type="string" name="guild_settings_audit_log_role_name_create" id="0x7f1208b9" />
+    <public type="string" name="guild_settings_audit_log_role_permissions_denied" id="0x7f1208ba" />
+    <public type="string" name="guild_settings_audit_log_role_permissions_granted" id="0x7f1208bb" />
+    <public type="string" name="guild_settings_audit_log_role_update" id="0x7f1208bc" />
+    <public type="string" name="guild_settings_audit_log_time_at_android" id="0x7f1208bd" />
+    <public type="string" name="guild_settings_audit_log_webhook_avatar" id="0x7f1208be" />
+    <public type="string" name="guild_settings_audit_log_webhook_channel_change" id="0x7f1208bf" />
+    <public type="string" name="guild_settings_audit_log_webhook_channel_create" id="0x7f1208c0" />
+    <public type="string" name="guild_settings_audit_log_webhook_create" id="0x7f1208c1" />
+    <public type="string" name="guild_settings_audit_log_webhook_delete" id="0x7f1208c2" />
+    <public type="string" name="guild_settings_audit_log_webhook_name_change" id="0x7f1208c3" />
+    <public type="string" name="guild_settings_audit_log_webhook_name_create" id="0x7f1208c4" />
+    <public type="string" name="guild_settings_audit_log_webhook_update" id="0x7f1208c5" />
+    <public type="string" name="guild_settings_banner_recommend" id="0x7f1208c6" />
+    <public type="string" name="guild_settings_default_notification_settings_intro" id="0x7f1208c7" />
+    <public type="string" name="guild_settings_default_notification_settings_protip" id="0x7f1208c8" />
+    <public type="string" name="guild_settings_emoji_alias" id="0x7f1208c9" />
+    <public type="string" name="guild_settings_emoji_alias_placeholder" id="0x7f1208ca" />
+    <public type="string" name="guild_settings_emoji_upload_to_server_message" id="0x7f1208cb" />
+    <public type="string" name="guild_settings_enable_discoverable" id="0x7f1208cc" />
+    <public type="string" name="guild_settings_enable_featurable" id="0x7f1208cd" />
+    <public type="string" name="guild_settings_featurable_disabled_tooltip" id="0x7f1208ce" />
+    <public type="string" name="guild_settings_filter_action" id="0x7f1208cf" />
+    <public type="string" name="guild_settings_filter_all" id="0x7f1208d0" />
+    <public type="string" name="guild_settings_filter_all_actions" id="0x7f1208d1" />
+    <public type="string" name="guild_settings_filter_all_users" id="0x7f1208d2" />
+    <public type="string" name="guild_settings_filter_user" id="0x7f1208d3" />
+    <public type="string" name="guild_settings_filtered_action" id="0x7f1208d4" />
+    <public type="string" name="guild_settings_filtered_user" id="0x7f1208d5" />
+    <public type="string" name="guild_settings_follower_analytics" id="0x7f1208d6" />
+    <public type="string" name="guild_settings_follower_analytics_description" id="0x7f1208d7" />
+    <public type="string" name="guild_settings_follower_analytics_empty_body" id="0x7f1208d8" />
+    <public type="string" name="guild_settings_follower_analytics_empty_header" id="0x7f1208d9" />
+    <public type="string" name="guild_settings_follower_analytics_last_updated" id="0x7f1208da" />
+    <public type="string" name="guild_settings_follower_analytics_message_deleted" id="0x7f1208db" />
+    <public type="string" name="guild_settings_follower_analytics_net_gain" id="0x7f1208dc" />
+    <public type="string" name="guild_settings_follower_analytics_net_gain_tooltip" id="0x7f1208dd" />
+    <public type="string" name="guild_settings_follower_analytics_net_servers" id="0x7f1208de" />
+    <public type="string" name="guild_settings_follower_analytics_post" id="0x7f1208df" />
+    <public type="string" name="guild_settings_follower_analytics_reach" id="0x7f1208e0" />
+    <public type="string" name="guild_settings_follower_analytics_reach_tooltip" id="0x7f1208e1" />
+    <public type="string" name="guild_settings_follower_analytics_servers_following" id="0x7f1208e2" />
+    <public type="string" name="guild_settings_follower_analytics_tooltip" id="0x7f1208e3" />
+    <public type="string" name="guild_settings_guild_premium_perk_description_tier_1_animated_guild_icon" id="0x7f1208e4" />
+    <public type="string" name="guild_settings_guild_premium_perk_description_tier_1_audio_quality" id="0x7f1208e5" />
+    <public type="string" name="guild_settings_guild_premium_perk_description_tier_1_emoji" id="0x7f1208e6" />
+    <public type="string" name="guild_settings_guild_premium_perk_description_tier_1_splash" id="0x7f1208e7" />
+    <public type="string" name="guild_settings_guild_premium_perk_description_tier_1_streaming" id="0x7f1208e8" />
+    <public type="string" name="guild_settings_guild_premium_perk_description_tier_2_audio_quality" id="0x7f1208e9" />
+    <public type="string" name="guild_settings_guild_premium_perk_description_tier_2_banner" id="0x7f1208ea" />
+    <public type="string" name="guild_settings_guild_premium_perk_description_tier_2_emoji" id="0x7f1208eb" />
+    <public type="string" name="guild_settings_guild_premium_perk_description_tier_2_streaming" id="0x7f1208ec" />
+    <public type="string" name="guild_settings_guild_premium_perk_description_tier_2_upload_limit" id="0x7f1208ed" />
+    <public type="string" name="guild_settings_guild_premium_perk_description_tier_3_audio_quality" id="0x7f1208ee" />
+    <public type="string" name="guild_settings_guild_premium_perk_description_tier_3_emoji" id="0x7f1208ef" />
+    <public type="string" name="guild_settings_guild_premium_perk_description_tier_3_upload_limit" id="0x7f1208f0" />
+    <public type="string" name="guild_settings_guild_premium_perk_description_tier_3_vanity_url" id="0x7f1208f1" />
+    <public type="string" name="guild_settings_guild_premium_perk_title_tier_1_animated_guild_icon" id="0x7f1208f2" />
+    <public type="string" name="guild_settings_guild_premium_perk_title_tier_1_splash" id="0x7f1208f3" />
+    <public type="string" name="guild_settings_guild_premium_perk_title_tier_1_streaming" id="0x7f1208f4" />
+    <public type="string" name="guild_settings_guild_premium_perk_title_tier_2_banner" id="0x7f1208f5" />
+    <public type="string" name="guild_settings_guild_premium_perk_title_tier_2_streaming" id="0x7f1208f6" />
+    <public type="string" name="guild_settings_guild_premium_perk_title_tier_3_vanity_url" id="0x7f1208f7" />
+    <public type="string" name="guild_settings_guild_premium_perk_title_tier_any_audio_quality" id="0x7f1208f8" />
+    <public type="string" name="guild_settings_guild_premium_perk_title_tier_any_emoji" id="0x7f1208f9" />
+    <public type="string" name="guild_settings_guild_premium_perk_title_tier_any_upload_limit" id="0x7f1208fa" />
+    <public type="string" name="guild_settings_guild_premium_perks_base_perks" id="0x7f1208fb" />
+    <public type="string" name="guild_settings_guild_premium_perks_description_none" id="0x7f1208fc" />
+    <public type="string" name="guild_settings_guild_premium_perks_previous_perks" id="0x7f1208fd" />
+    <public type="string" name="guild_settings_guild_premium_perks_title_none" id="0x7f1208fe" />
+    <public type="string" name="guild_settings_guild_premium_perks_title_tier_1" id="0x7f1208ff" />
+    <public type="string" name="guild_settings_guild_premium_perks_title_tier_2" id="0x7f120900" />
+    <public type="string" name="guild_settings_guild_premium_perks_title_tier_3" id="0x7f120901" />
+    <public type="string" name="guild_settings_icon_recommend" id="0x7f120902" />
+    <public type="string" name="guild_settings_label_audit_log" id="0x7f120903" />
+    <public type="string" name="guild_settings_label_audit_log_empty_body" id="0x7f120904" />
+    <public type="string" name="guild_settings_label_audit_log_empty_title" id="0x7f120905" />
+    <public type="string" name="guild_settings_label_audit_log_error_body" id="0x7f120906" />
+    <public type="string" name="guild_settings_label_audit_log_error_title" id="0x7f120907" />
+    <public type="string" name="guild_settings_members_all_members" id="0x7f120908" />
+    <public type="string" name="guild_settings_members_display_role" id="0x7f120909" />
+    <public type="string" name="guild_settings_members_server_members" id="0x7f12090a" />
+    <public type="string" name="guild_settings_overview_boost_unlock" id="0x7f12090b" />
+    <public type="string" name="guild_settings_overview_boost_unlocked" id="0x7f12090c" />
+    <public type="string" name="guild_settings_overview_notice" id="0x7f12090d" />
+    <public type="string" name="guild_settings_overview_tier_info" id="0x7f12090e" />
+    <public type="string" name="guild_settings_premium_guild_blurb" id="0x7f12090f" />
+    <public type="string" name="guild_settings_premium_guild_close_hint" id="0x7f120910" />
+    <public type="string" name="guild_settings_premium_guild_count_subscribers" id="0x7f120911" />
+    <public type="string" name="guild_settings_premium_guild_tier_requirement" id="0x7f120912" />
+    <public type="string" name="guild_settings_premium_guild_title" id="0x7f120913" />
+    <public type="string" name="guild_settings_premium_guild_unlocked" id="0x7f120914" />
+    <public type="string" name="guild_settings_server_banner" id="0x7f120915" />
+    <public type="string" name="guild_settings_server_invite_background" id="0x7f120916" />
+    <public type="string" name="guild_settings_splash_info" id="0x7f120917" />
+    <public type="string" name="guild_settings_splash_recommend" id="0x7f120918" />
+    <public type="string" name="guild_settings_title_server_widget" id="0x7f120919" />
+    <public type="string" name="guild_settings_widget_embed_help" id="0x7f12091a" />
+    <public type="string" name="guild_settings_widget_enable_widget" id="0x7f12091b" />
+    <public type="string" name="guild_unavailable_body" id="0x7f12091c" />
+    <public type="string" name="guild_unavailable_body_alt" id="0x7f12091d" />
+    <public type="string" name="guild_unavailable_header" id="0x7f12091e" />
+    <public type="string" name="guild_unavailable_title" id="0x7f12091f" />
+    <public type="string" name="guild_unavailable_title_alt" id="0x7f120920" />
+    <public type="string" name="guild_verification_text_account_age" id="0x7f120921" />
+    <public type="string" name="guild_verification_text_member_age" id="0x7f120922" />
+    <public type="string" name="guild_verification_text_not_claimed" id="0x7f120923" />
+    <public type="string" name="guild_verification_text_not_phone_verified" id="0x7f120924" />
+    <public type="string" name="guild_verification_text_not_verified" id="0x7f120925" />
+    <public type="string" name="guild_verified" id="0x7f120926" />
+    <public type="string" name="guild_voice_channel_empty_body_mobile" id="0x7f120927" />
+    <public type="string" name="guild_voice_channel_empty_header_mobile" id="0x7f120928" />
+    <public type="string" name="hardware_acceleration" id="0x7f120929" />
+    <public type="string" name="hardware_acceleration_help_text" id="0x7f12092a" />
+    <public type="string" name="help" id="0x7f12092b" />
+    <public type="string" name="help_desk" id="0x7f12092c" />
+    <public type="string" name="help_missing_manage_roles_permission" id="0x7f12092d" />
+    <public type="string" name="help_missing_permission" id="0x7f12092e" />
+    <public type="string" name="help_role_locked" id="0x7f12092f" />
+    <public type="string" name="help_role_locked_mine" id="0x7f120930" />
+    <public type="string" name="help_singular_permission" id="0x7f120931" />
+    <public type="string" name="hide_bottom_view_on_scroll_behavior" id="0x7f120932" />
+    <public type="string" name="hide_instant_invites_description" id="0x7f120933" />
+    <public type="string" name="hide_instant_invites_label" id="0x7f120934" />
+    <public type="string" name="hide_muted" id="0x7f120935" />
+    <public type="string" name="hide_muted_channels" id="0x7f120936" />
+    <public type="string" name="hide_personal_information_description" id="0x7f120937" />
+    <public type="string" name="hide_personal_information_label" id="0x7f120938" />
+    <public type="string" name="hold_up" id="0x7f120939" />
+    <public type="string" name="home" id="0x7f12093a" />
+    <public type="string" name="how_to_invite_others" id="0x7f12093b" />
+    <public type="string" name="hr" id="0x7f12093c" />
+    <public type="string" name="hu" id="0x7f12093d" />
+    <public type="string" name="hypesquad_attendee_cta" id="0x7f12093e" />
+    <public type="string" name="hypesquad_badge_tooltip" id="0x7f12093f" />
+    <public type="string" name="hypesquad_description_house_1" id="0x7f120940" />
+    <public type="string" name="hypesquad_description_house_2" id="0x7f120941" />
+    <public type="string" name="hypesquad_description_house_3" id="0x7f120942" />
+    <public type="string" name="hypesquad_error_body" id="0x7f120943" />
+    <public type="string" name="hypesquad_error_heading" id="0x7f120944" />
+    <public type="string" name="hypesquad_heading" id="0x7f120945" />
+    <public type="string" name="hypesquad_heading_existing_member" id="0x7f120946" />
+    <public type="string" name="hypesquad_house_1" id="0x7f120947" />
+    <public type="string" name="hypesquad_house_2" id="0x7f120948" />
+    <public type="string" name="hypesquad_house_3" id="0x7f120949" />
+    <public type="string" name="hypesquad_join" id="0x7f12094a" />
+    <public type="string" name="hypesquad_leave_action" id="0x7f12094b" />
+    <public type="string" name="hypesquad_leave_error" id="0x7f12094c" />
+    <public type="string" name="hypesquad_leave_prompt" id="0x7f12094d" />
+    <public type="string" name="hypesquad_membership_heading" id="0x7f12094e" />
+    <public type="string" name="hypesquad_newsletter_warning" id="0x7f12094f" />
+    <public type="string" name="hypesquad_online_badge_tooltip" id="0x7f120950" />
+    <public type="string" name="hypesquad_perk_description_newsletter" id="0x7f120951" />
+    <public type="string" name="hypesquad_perk_description_profile_badge" id="0x7f120952" />
+    <public type="string" name="hypesquad_perk_description_squad_challenges" id="0x7f120953" />
+    <public type="string" name="hypesquad_perk_title_newsletter" id="0x7f120954" />
+    <public type="string" name="hypesquad_perk_title_profile_badge" id="0x7f120955" />
+    <public type="string" name="hypesquad_perk_title_squad_challenges" id="0x7f120956" />
+    <public type="string" name="hypesquad_perks_heading" id="0x7f120957" />
+    <public type="string" name="hypesquad_question_0_prompt" id="0x7f120958" />
+    <public type="string" name="hypesquad_question_0_response_a" id="0x7f120959" />
+    <public type="string" name="hypesquad_question_0_response_b" id="0x7f12095a" />
+    <public type="string" name="hypesquad_question_0_response_c" id="0x7f12095b" />
+    <public type="string" name="hypesquad_question_0_response_d" id="0x7f12095c" />
+    <public type="string" name="hypesquad_question_10_prompt" id="0x7f12095d" />
+    <public type="string" name="hypesquad_question_10_response_a" id="0x7f12095e" />
+    <public type="string" name="hypesquad_question_10_response_b" id="0x7f12095f" />
+    <public type="string" name="hypesquad_question_10_response_c" id="0x7f120960" />
+    <public type="string" name="hypesquad_question_10_response_d" id="0x7f120961" />
+    <public type="string" name="hypesquad_question_11_prompt" id="0x7f120962" />
+    <public type="string" name="hypesquad_question_11_response_a" id="0x7f120963" />
+    <public type="string" name="hypesquad_question_11_response_b" id="0x7f120964" />
+    <public type="string" name="hypesquad_question_11_response_c" id="0x7f120965" />
+    <public type="string" name="hypesquad_question_11_response_d" id="0x7f120966" />
+    <public type="string" name="hypesquad_question_12_prompt" id="0x7f120967" />
+    <public type="string" name="hypesquad_question_12_response_a" id="0x7f120968" />
+    <public type="string" name="hypesquad_question_12_response_b" id="0x7f120969" />
+    <public type="string" name="hypesquad_question_12_response_c" id="0x7f12096a" />
+    <public type="string" name="hypesquad_question_12_response_d" id="0x7f12096b" />
+    <public type="string" name="hypesquad_question_13_prompt" id="0x7f12096c" />
+    <public type="string" name="hypesquad_question_13_response_a" id="0x7f12096d" />
+    <public type="string" name="hypesquad_question_13_response_b" id="0x7f12096e" />
+    <public type="string" name="hypesquad_question_13_response_c" id="0x7f12096f" />
+    <public type="string" name="hypesquad_question_13_response_d" id="0x7f120970" />
+    <public type="string" name="hypesquad_question_14_prompt" id="0x7f120971" />
+    <public type="string" name="hypesquad_question_14_response_a" id="0x7f120972" />
+    <public type="string" name="hypesquad_question_14_response_b" id="0x7f120973" />
+    <public type="string" name="hypesquad_question_14_response_c" id="0x7f120974" />
+    <public type="string" name="hypesquad_question_14_response_d" id="0x7f120975" />
+    <public type="string" name="hypesquad_question_1_prompt" id="0x7f120976" />
+    <public type="string" name="hypesquad_question_1_response_a" id="0x7f120977" />
+    <public type="string" name="hypesquad_question_1_response_b" id="0x7f120978" />
+    <public type="string" name="hypesquad_question_1_response_c" id="0x7f120979" />
+    <public type="string" name="hypesquad_question_1_response_d" id="0x7f12097a" />
+    <public type="string" name="hypesquad_question_2_prompt" id="0x7f12097b" />
+    <public type="string" name="hypesquad_question_2_response_a" id="0x7f12097c" />
+    <public type="string" name="hypesquad_question_2_response_b" id="0x7f12097d" />
+    <public type="string" name="hypesquad_question_2_response_c" id="0x7f12097e" />
+    <public type="string" name="hypesquad_question_2_response_d" id="0x7f12097f" />
+    <public type="string" name="hypesquad_question_3_prompt" id="0x7f120980" />
+    <public type="string" name="hypesquad_question_3_response_a" id="0x7f120981" />
+    <public type="string" name="hypesquad_question_3_response_b" id="0x7f120982" />
+    <public type="string" name="hypesquad_question_3_response_c" id="0x7f120983" />
+    <public type="string" name="hypesquad_question_3_response_d" id="0x7f120984" />
+    <public type="string" name="hypesquad_question_4_prompt" id="0x7f120985" />
+    <public type="string" name="hypesquad_question_4_response_a" id="0x7f120986" />
+    <public type="string" name="hypesquad_question_4_response_b" id="0x7f120987" />
+    <public type="string" name="hypesquad_question_4_response_c" id="0x7f120988" />
+    <public type="string" name="hypesquad_question_4_response_d" id="0x7f120989" />
+    <public type="string" name="hypesquad_question_5_prompt" id="0x7f12098a" />
+    <public type="string" name="hypesquad_question_5_response_a" id="0x7f12098b" />
+    <public type="string" name="hypesquad_question_5_response_b" id="0x7f12098c" />
+    <public type="string" name="hypesquad_question_5_response_c" id="0x7f12098d" />
+    <public type="string" name="hypesquad_question_5_response_d" id="0x7f12098e" />
+    <public type="string" name="hypesquad_question_6_prompt" id="0x7f12098f" />
+    <public type="string" name="hypesquad_question_6_response_a" id="0x7f120990" />
+    <public type="string" name="hypesquad_question_6_response_b" id="0x7f120991" />
+    <public type="string" name="hypesquad_question_6_response_c" id="0x7f120992" />
+    <public type="string" name="hypesquad_question_6_response_d" id="0x7f120993" />
+    <public type="string" name="hypesquad_question_7_prompt" id="0x7f120994" />
+    <public type="string" name="hypesquad_question_7_response_a" id="0x7f120995" />
+    <public type="string" name="hypesquad_question_7_response_b" id="0x7f120996" />
+    <public type="string" name="hypesquad_question_7_response_c" id="0x7f120997" />
+    <public type="string" name="hypesquad_question_7_response_d" id="0x7f120998" />
+    <public type="string" name="hypesquad_question_8_prompt" id="0x7f120999" />
+    <public type="string" name="hypesquad_question_8_response_a" id="0x7f12099a" />
+    <public type="string" name="hypesquad_question_8_response_b" id="0x7f12099b" />
+    <public type="string" name="hypesquad_question_8_response_c" id="0x7f12099c" />
+    <public type="string" name="hypesquad_question_8_response_d" id="0x7f12099d" />
+    <public type="string" name="hypesquad_question_9_prompt" id="0x7f12099e" />
+    <public type="string" name="hypesquad_question_9_response_a" id="0x7f12099f" />
+    <public type="string" name="hypesquad_question_9_response_b" id="0x7f1209a0" />
+    <public type="string" name="hypesquad_question_9_response_c" id="0x7f1209a1" />
+    <public type="string" name="hypesquad_question_9_response_d" id="0x7f1209a2" />
+    <public type="string" name="hypesquad_quiz_body_house_1" id="0x7f1209a3" />
+    <public type="string" name="hypesquad_quiz_body_house_2" id="0x7f1209a4" />
+    <public type="string" name="hypesquad_quiz_body_house_3" id="0x7f1209a5" />
+    <public type="string" name="hypesquad_quiz_cancel" id="0x7f1209a6" />
+    <public type="string" name="hypesquad_quiz_close" id="0x7f1209a7" />
+    <public type="string" name="hypesquad_quiz_completed_modal_title" id="0x7f1209a8" />
+    <public type="string" name="hypesquad_quiz_error_modal_title" id="0x7f1209a9" />
+    <public type="string" name="hypesquad_quiz_next_question" id="0x7f1209aa" />
+    <public type="string" name="hypesquad_quiz_ongoing_modal_title" id="0x7f1209ab" />
+    <public type="string" name="hypesquad_quiz_retry" id="0x7f1209ac" />
+    <public type="string" name="hypesquad_quiz_select_answer" id="0x7f1209ad" />
+    <public type="string" name="hypesquad_quiz_show_my_house" id="0x7f1209ae" />
+    <public type="string" name="hypesquad_quiz_title" id="0x7f1209af" />
+    <public type="string" name="hypesquad_ready_to_rep" id="0x7f1209b0" />
+    <public type="string" name="hypesquad_subheading" id="0x7f1209b1" />
+    <public type="string" name="hypesquad_switch_houses_action" id="0x7f1209b2" />
+    <public type="string" name="hypesquad_switch_houses_prompt" id="0x7f1209b3" />
+    <public type="string" name="hypesquad_unclaimed_account_notice" id="0x7f1209b4" />
+    <public type="string" name="hypesquad_unverified_email_notice" id="0x7f1209b5" />
+    <public type="string" name="hypesquad_your_house" id="0x7f1209b6" />
+    <public type="string" name="i18n_locale_loading_error" id="0x7f1209b7" />
+    <public type="string" name="image" id="0x7f1209b8" />
+    <public type="string" name="images" id="0x7f1209b9" />
+    <public type="string" name="img_alt_attachment_file_type" id="0x7f1209ba" />
+    <public type="string" name="img_alt_emoji" id="0x7f1209bb" />
+    <public type="string" name="img_alt_icon" id="0x7f1209bc" />
+    <public type="string" name="img_alt_logo" id="0x7f1209bd" />
+    <public type="string" name="img_alt_navigate_to" id="0x7f1209be" />
+    <public type="string" name="in_a_voice_channel" id="0x7f1209bf" />
+    <public type="string" name="in_category" id="0x7f1209c0" />
+    <public type="string" name="in_game_voice_settings" id="0x7f1209c1" />
+    <public type="string" name="in_the_call" id="0x7f1209c2" />
+    <public type="string" name="in_the_voice_channel" id="0x7f1209c3" />
+    <public type="string" name="incoming_call" id="0x7f1209c4" />
+    <public type="string" name="incoming_call_dm" id="0x7f1209c5" />
+    <public type="string" name="incoming_call_ellipsis" id="0x7f1209c6" />
+    <public type="string" name="incoming_call_gdm" id="0x7f1209c7" />
+    <public type="string" name="incoming_friend_request" id="0x7f1209c8" />
+    <public type="string" name="incoming_video_call" id="0x7f1209c9" />
+    <public type="string" name="incoming_video_call_ellipsis" id="0x7f1209ca" />
+    <public type="string" name="incompatible_browser" id="0x7f1209cb" />
+    <public type="string" name="inivte_modal_no_thanks" id="0x7f1209cc" />
+    <public type="string" name="inline_attachment_media" id="0x7f1209cd" />
+    <public type="string" name="inline_attachment_media_help" id="0x7f1209ce" />
+    <public type="string" name="inline_embed_media" id="0x7f1209cf" />
+    <public type="string" name="inline_media_label" id="0x7f1209d0" />
+    <public type="string" name="input_mode_ptt" id="0x7f1209d1" />
+    <public type="string" name="input_mode_ptt_limited" id="0x7f1209d2" />
+    <public type="string" name="input_mode_ptt_release_delay" id="0x7f1209d3" />
+    <public type="string" name="input_mode_vad" id="0x7f1209d4" />
+    <public type="string" name="instagram" id="0x7f1209d5" />
+    <public type="string" name="install_location_main" id="0x7f1209d6" />
+    <public type="string" name="instant_invite" id="0x7f1209d7" />
+    <public type="string" name="instant_invite_accept" id="0x7f1209d8" />
+    <public type="string" name="instant_invite_accepted" id="0x7f1209d9" />
+    <public type="string" name="instant_invite_accepting" id="0x7f1209da" />
+    <public type="string" name="instant_invite_ask_for_new_invite" id="0x7f1209db" />
+    <public type="string" name="instant_invite_ask_user_for_new_invite" id="0x7f1209dc" />
+    <public type="string" name="instant_invite_banned" id="0x7f1209dd" />
+    <public type="string" name="instant_invite_banned_info" id="0x7f1209de" />
+    <public type="string" name="instant_invite_code" id="0x7f1209df" />
+    <public type="string" name="instant_invite_expired" id="0x7f1209e0" />
+    <public type="string" name="instant_invite_expires" id="0x7f1209e1" />
+    <public type="string" name="instant_invite_failed_to_generate" id="0x7f1209e2" />
+    <public type="string" name="instant_invite_friends" id="0x7f1209e3" />
+    <public type="string" name="instant_invite_friends_description" id="0x7f1209e4" />
+    <public type="string" name="instant_invite_generate" id="0x7f1209e5" />
+    <public type="string" name="instant_invite_generated_by_widget" id="0x7f1209e6" />
+    <public type="string" name="instant_invite_guild_by_user" id="0x7f1209e7" />
+    <public type="string" name="instant_invite_guild_members_online" id="0x7f1209e8" />
+    <public type="string" name="instant_invite_guild_members_total" id="0x7f1209e9" />
+    <public type="string" name="instant_invite_hidden" id="0x7f1209ea" />
+    <public type="string" name="instant_invite_invalid_channel" id="0x7f1209eb" />
+    <public type="string" name="instant_invite_invite_code" id="0x7f1209ec" />
+    <public type="string" name="instant_invite_inviter" id="0x7f1209ed" />
+    <public type="string" name="instant_invite_join" id="0x7f1209ee" />
+    <public type="string" name="instant_invite_link_share_text" id="0x7f1209ef" />
+    <public type="string" name="instant_invite_looks_like" id="0x7f1209f0" />
+    <public type="string" name="instant_invite_not_allowed" id="0x7f1209f1" />
+    <public type="string" name="instant_invite_popout" id="0x7f1209f2" />
+    <public type="string" name="instant_invite_regenerate" id="0x7f1209f3" />
+    <public type="string" name="instant_invite_resolved_body" id="0x7f1209f4" />
+    <public type="string" name="instant_invite_resolved_title" id="0x7f1209f5" />
+    <public type="string" name="instant_invite_resolving" id="0x7f1209f6" />
+    <public type="string" name="instant_invite_uses" id="0x7f1209f7" />
+    <public type="string" name="instant_invite_you_are_already_a_member_of" id="0x7f1209f8" />
+    <public type="string" name="instant_invite_you_have_been_invited_to_join" id="0x7f1209f9" />
+    <public type="string" name="instant_invite_you_have_been_invited_to_join_by_user" id="0x7f1209fa" />
+    <public type="string" name="instant_invite_you_have_been_invited_to_join_group_dm" id="0x7f1209fb" />
+    <public type="string" name="instant_invites" id="0x7f1209fc" />
+    <public type="string" name="integration_settings" id="0x7f1209fd" />
+    <public type="string" name="integrations" id="0x7f1209fe" />
+    <public type="string" name="integrations_header" id="0x7f1209ff" />
+    <public type="string" name="integrations_pro_tip" id="0x7f120a00" />
+    <public type="string" name="interaction_required_body" id="0x7f120a01" />
+    <public type="string" name="interaction_required_title" id="0x7f120a02" />
+    <public type="string" name="internal_server_error" id="0x7f120a03" />
+    <public type="string" name="invalid_animated_emoji_body" id="0x7f120a04" />
+    <public type="string" name="invalid_animated_emoji_body_upgrade" id="0x7f120a05" />
+    <public type="string" name="invalid_external_emoji_body" id="0x7f120a06" />
+    <public type="string" name="invalid_external_emoji_body_upgrade" id="0x7f120a07" />
+    <public type="string" name="invalid_invite_link_error" id="0x7f120a08" />
+    <public type="string" name="invalid_request_format" id="0x7f120a09" />
+    <public type="string" name="invalid_text_channel" id="0x7f120a0a" />
+    <public type="string" name="invalid_voice_channel" id="0x7f120a0b" />
+    <public type="string" name="invite_banner_does_not_expire" id="0x7f120a0c" />
+    <public type="string" name="invite_banner_invite_to_server" id="0x7f120a0d" />
+    <public type="string" name="invite_banner_share_invite_link_for_access" id="0x7f120a0e" />
+    <public type="string" name="invite_button_accepted" id="0x7f120a0f" />
+    <public type="string" name="invite_button_accepting" id="0x7f120a10" />
+    <public type="string" name="invite_button_expired" id="0x7f120a11" />
+    <public type="string" name="invite_button_expired_owner" id="0x7f120a12" />
+    <public type="string" name="invite_button_invalid" id="0x7f120a13" />
+    <public type="string" name="invite_button_invalid_owner" id="0x7f120a14" />
+    <public type="string" name="invite_button_join" id="0x7f120a15" />
+    <public type="string" name="invite_button_resolving" id="0x7f120a16" />
+    <public type="string" name="invite_button_stream_ended" id="0x7f120a17" />
+    <public type="string" name="invite_button_stream_ended_streamer" id="0x7f120a18" />
+    <public type="string" name="invite_button_stream_watching" id="0x7f120a19" />
+    <public type="string" name="invite_button_streamer" id="0x7f120a1a" />
+    <public type="string" name="invite_button_streaming" id="0x7f120a1b" />
+    <public type="string" name="invite_button_streaming_subtext" id="0x7f120a1c" />
+    <public type="string" name="invite_button_title_invited" id="0x7f120a1d" />
+    <public type="string" name="invite_button_title_invited_group_dm" id="0x7f120a1e" />
+    <public type="string" name="invite_button_title_invited_invalid" id="0x7f120a1f" />
+    <public type="string" name="invite_button_title_invited_lfg_gdm" id="0x7f120a20" />
+    <public type="string" name="invite_button_title_invited_stream" id="0x7f120a21" />
+    <public type="string" name="invite_button_title_inviter" id="0x7f120a22" />
+    <public type="string" name="invite_button_title_inviter_group_dm" id="0x7f120a23" />
+    <public type="string" name="invite_button_title_inviter_invalid" id="0x7f120a24" />
+    <public type="string" name="invite_button_title_inviter_lfg_gdm" id="0x7f120a25" />
+    <public type="string" name="invite_button_title_inviter_stream" id="0x7f120a26" />
+    <public type="string" name="invite_button_title_streaming" id="0x7f120a27" />
+    <public type="string" name="invite_copied" id="0x7f120a28" />
+    <public type="string" name="invite_copy_share_link_header_mobile" id="0x7f120a29" />
+    <public type="string" name="invite_edit_link" id="0x7f120a2a" />
+    <public type="string" name="invite_embed_full_group" id="0x7f120a2b" />
+    <public type="string" name="invite_embed_full_group_spectate" id="0x7f120a2c" />
+    <public type="string" name="invite_embed_game_has_ended" id="0x7f120a2d" />
+    <public type="string" name="invite_embed_game_invite" id="0x7f120a2e" />
+    <public type="string" name="invite_embed_game_not_detected" id="0x7f120a2f" />
+    <public type="string" name="invite_embed_in_group" id="0x7f120a30" />
+    <public type="string" name="invite_embed_invite_to_join" id="0x7f120a31" />
+    <public type="string" name="invite_embed_invite_to_join_group" id="0x7f120a32" />
+    <public type="string" name="invite_embed_invite_to_listen" id="0x7f120a33" />
+    <public type="string" name="invite_embed_invite_to_spectate" id="0x7f120a34" />
+    <public type="string" name="invite_embed_invite_to_watch" id="0x7f120a35" />
+    <public type="string" name="invite_embed_join_via_desktop_app" id="0x7f120a36" />
+    <public type="string" name="invite_embed_joined" id="0x7f120a37" />
+    <public type="string" name="invite_embed_listen_has_ended" id="0x7f120a38" />
+    <public type="string" name="invite_embed_listening_invite" id="0x7f120a39" />
+    <public type="string" name="invite_embed_num_open_slots" id="0x7f120a3a" />
+    <public type="string" name="invite_embed_num_open_slots_android" id="0x7f120a3b" />
+    <public type="string" name="invite_embed_send_invite" id="0x7f120a3c" />
+    <public type="string" name="invite_embed_spectate" id="0x7f120a3d" />
+    <public type="string" name="invite_embed_spectate_via_desktop_app" id="0x7f120a3e" />
+    <public type="string" name="invite_embed_watch_has_ended" id="0x7f120a3f" />
+    <public type="string" name="invite_expired_subtext_mobile" id="0x7f120a40" />
+    <public type="string" name="invite_expires_days" id="0x7f120a41" />
+    <public type="string" name="invite_expires_days_or_uses" id="0x7f120a42" />
+    <public type="string" name="invite_expires_hours" id="0x7f120a43" />
+    <public type="string" name="invite_expires_hours_or_uses" id="0x7f120a44" />
+    <public type="string" name="invite_expires_minutes" id="0x7f120a45" />
+    <public type="string" name="invite_expires_minutes_or_uses" id="0x7f120a46" />
+    <public type="string" name="invite_expires_never" id="0x7f120a47" />
+    <public type="string" name="invite_expires_uses" id="0x7f120a48" />
+    <public type="string" name="invite_footer_link_header" id="0x7f120a49" />
+    <public type="string" name="invite_friend_modal_invite" id="0x7f120a4a" />
+    <public type="string" name="invite_friend_modal_loading" id="0x7f120a4b" />
+    <public type="string" name="invite_friend_modal_no_results" id="0x7f120a4c" />
+    <public type="string" name="invite_friend_modal_retry" id="0x7f120a4d" />
+    <public type="string" name="invite_friend_modal_sent" id="0x7f120a4e" />
+    <public type="string" name="invite_friend_modal_subtitle" id="0x7f120a4f" />
+    <public type="string" name="invite_friend_modal_title" id="0x7f120a50" />
+    <public type="string" name="invite_friends" id="0x7f120a51" />
+    <public type="string" name="invite_invalid_cta" id="0x7f120a52" />
+    <public type="string" name="invite_invalid_error" id="0x7f120a53" />
+    <public type="string" name="invite_link_copied" id="0x7f120a54" />
+    <public type="string" name="invite_link_example_full" id="0x7f120a55" />
+    <public type="string" name="invite_link_example_simple" id="0x7f120a56" />
+    <public type="string" name="invite_link_example_verified" id="0x7f120a57" />
+    <public type="string" name="invite_links_expire_after_1_day" id="0x7f120a58" />
+    <public type="string" name="invite_links_never_expires" id="0x7f120a59" />
+    <public type="string" name="invite_members" id="0x7f120a5a" />
+    <public type="string" name="invite_modal_button" id="0x7f120a5b" />
+    <public type="string" name="invite_modal_error_default" id="0x7f120a5c" />
+    <public type="string" name="invite_modal_error_title" id="0x7f120a5d" />
+    <public type="string" name="invite_modal_open_button" id="0x7f120a5e" />
+    <public type="string" name="invite_never_expires_subtext_mobile" id="0x7f120a5f" />
+    <public type="string" name="invite_no_channels" id="0x7f120a60" />
+    <public type="string" name="invite_no_thanks" id="0x7f120a61" />
+    <public type="string" name="invite_notice_message" id="0x7f120a62" />
+    <public type="string" name="invite_notice_message_part_2" id="0x7f120a63" />
+    <public type="string" name="invite_people" id="0x7f120a64" />
+    <public type="string" name="invite_private_call_heads_up" id="0x7f120a65" />
+    <public type="string" name="invite_search_for_friends" id="0x7f120a66" />
+    <public type="string" name="invite_sent" id="0x7f120a67" />
+    <public type="string" name="invite_settings_expired_description" id="0x7f120a68" />
+    <public type="string" name="invite_settings_title" id="0x7f120a69" />
+    <public type="string" name="invite_share_default" id="0x7f120a6a" />
+    <public type="string" name="invite_share_link_own_server" id="0x7f120a6b" />
+    <public type="string" name="invite_share_link_to_stream" id="0x7f120a6c" />
+    <public type="string" name="invite_stream_footer_link_header" id="0x7f120a6d" />
+    <public type="string" name="invite_stream_header" id="0x7f120a6e" />
+    <public type="string" name="invite_to_server" id="0x7f120a6f" />
+    <public type="string" name="invite_to_server_name" id="0x7f120a70" />
+    <public type="string" name="invite_to_server_name_experiment" id="0x7f120a71" />
+    <public type="string" name="invite_url" id="0x7f120a72" />
+    <public type="string" name="invite_voice_empty_mobile" id="0x7f120a73" />
+    <public type="string" name="invite_your_friends_header_mobile" id="0x7f120a74" />
+    <public type="string" name="invite_your_friends_voice_call_mobile" id="0x7f120a75" />
+    <public type="string" name="invites" id="0x7f120a76" />
+    <public type="string" name="ios_camera" id="0x7f120a77" />
+    <public type="string" name="ios_iap_generic_billing_error" id="0x7f120a78" />
+    <public type="string" name="ios_iap_itunes_error" id="0x7f120a79" />
+    <public type="string" name="ios_iap_manage_subscription_button" id="0x7f120a7a" />
+    <public type="string" name="ios_iap_manage_subscription_desktop" id="0x7f120a7b" />
+    <public type="string" name="ios_iap_restore_subscription_error" id="0x7f120a7c" />
+    <public type="string" name="ios_iap_restore_subscription_none_description" id="0x7f120a7d" />
+    <public type="string" name="ios_iap_restore_subscription_none_title" id="0x7f120a7e" />
+    <public type="string" name="ios_iap_restore_subscription_success" id="0x7f120a7f" />
+    <public type="string" name="ios_iap_testflight_error" id="0x7f120a80" />
+    <public type="string" name="ios_media_keyboard_browse_photo" id="0x7f120a81" />
+    <public type="string" name="ios_media_keyboard_enable_in_settings" id="0x7f120a82" />
+    <public type="string" name="ios_media_keyboard_more_photos" id="0x7f120a83" />
+    <public type="string" name="ios_media_keyboard_no_permission" id="0x7f120a84" />
+    <public type="string" name="ios_media_keyboard_no_photos" id="0x7f120a85" />
+    <public type="string" name="ios_media_keyboard_take_a_photo" id="0x7f120a86" />
+    <public type="string" name="ios_notification_see_full" id="0x7f120a87" />
+    <public type="string" name="ios_profile_in_voice_call" id="0x7f120a88" />
+    <public type="string" name="ios_profile_open_voice_channel" id="0x7f120a89" />
+    <public type="string" name="ios_view_all" id="0x7f120a8a" />
+    <public type="string" name="ip_address_secured" id="0x7f120a8b" />
+    <public type="string" name="ip_authorization_succeeded" id="0x7f120a8c" />
+    <public type="string" name="ip_authorization_succeeded_suggestion" id="0x7f120a8d" />
+    <public type="string" name="it" id="0x7f120a8e" />
+    <public type="string" name="ja" id="0x7f120a8f" />
+    <public type="string" name="join" id="0x7f120a90" />
+    <public type="string" name="join_afk_channel_body" id="0x7f120a91" />
+    <public type="string" name="join_call" id="0x7f120a92" />
+    <public type="string" name="join_server" id="0x7f120a93" />
+    <public type="string" name="join_server_button_body" id="0x7f120a94" />
+    <public type="string" name="join_server_button_cta" id="0x7f120a95" />
+    <public type="string" name="join_server_button_cta_mobile" id="0x7f120a96" />
+    <public type="string" name="join_server_button_cta_mobile_desc" id="0x7f120a97" />
+    <public type="string" name="join_server_button_cta_named" id="0x7f120a98" />
+    <public type="string" name="join_server_description" id="0x7f120a99" />
+    <public type="string" name="join_server_description_mobile" id="0x7f120a9a" />
+    <public type="string" name="join_server_title" id="0x7f120a9b" />
+    <public type="string" name="join_stream" id="0x7f120a9c" />
+    <public type="string" name="join_video_call" id="0x7f120a9d" />
+    <public type="string" name="join_voice" id="0x7f120a9e" />
+    <public type="string" name="join_voice_call" id="0x7f120a9f" />
+    <public type="string" name="join_voice_channel" id="0x7f120aa0" />
+    <public type="string" name="join_voice_channel_cta" id="0x7f120aa1" />
+    <public type="string" name="joined_server" id="0x7f120aa2" />
+    <public type="string" name="joining_server" id="0x7f120aa3" />
+    <public type="string" name="joining_voice_call_will_end_current_call_body" id="0x7f120aa4" />
+    <public type="string" name="joining_voice_channel_will_end_current_call_body" id="0x7f120aa5" />
+    <public type="string" name="joining_will_end_current_call_title" id="0x7f120aa6" />
+    <public type="string" name="jump" id="0x7f120aa7" />
+    <public type="string" name="jump_to_channel" id="0x7f120aa8" />
+    <public type="string" name="jump_to_chat" id="0x7f120aa9" />
+    <public type="string" name="jump_to_last_unread_message" id="0x7f120aaa" />
+    <public type="string" name="jump_to_present" id="0x7f120aab" />
+    <public type="string" name="keep_permissions" id="0x7f120aac" />
+    <public type="string" name="keybind_activate_overlay_chat" id="0x7f120aad" />
+    <public type="string" name="keybind_conflict" id="0x7f120aae" />
+    <public type="string" name="keybind_description_modal_call_accept" id="0x7f120aaf" />
+    <public type="string" name="keybind_description_modal_call_decline" id="0x7f120ab0" />
+    <public type="string" name="keybind_description_modal_call_start" id="0x7f120ab1" />
+    <public type="string" name="keybind_description_modal_create_dm_group" id="0x7f120ab2" />
+    <public type="string" name="keybind_description_modal_create_guild" id="0x7f120ab3" />
+    <public type="string" name="keybind_description_modal_easter_egg" id="0x7f120ab4" />
+    <public type="string" name="keybind_description_modal_find_conversation" id="0x7f120ab5" />
+    <public type="string" name="keybind_description_modal_focus_text_area" id="0x7f120ab6" />
+    <public type="string" name="keybind_description_modal_jump_to_first_unread" id="0x7f120ab7" />
+    <public type="string" name="keybind_description_modal_mark_channel_read" id="0x7f120ab8" />
+    <public type="string" name="keybind_description_modal_mark_server_read" id="0x7f120ab9" />
+    <public type="string" name="keybind_description_modal_navigate_channels" id="0x7f120aba" />
+    <public type="string" name="keybind_description_modal_navigate_servers" id="0x7f120abb" />
+    <public type="string" name="keybind_description_modal_quickswitcher" id="0x7f120abc" />
+    <public type="string" name="keybind_description_modal_return_to_audio_channel" id="0x7f120abd" />
+    <public type="string" name="keybind_description_modal_scroll_chat" id="0x7f120abe" />
+    <public type="string" name="keybind_description_modal_search" id="0x7f120abf" />
+    <public type="string" name="keybind_description_modal_search_emojis" id="0x7f120ac0" />
+    <public type="string" name="keybind_description_modal_search_gifs" id="0x7f120ac1" />
+    <public type="string" name="keybind_description_modal_subtitle" id="0x7f120ac2" />
+    <public type="string" name="keybind_description_modal_title" id="0x7f120ac3" />
+    <public type="string" name="keybind_description_modal_toggle_deafen" id="0x7f120ac4" />
+    <public type="string" name="keybind_description_modal_toggle_help" id="0x7f120ac5" />
+    <public type="string" name="keybind_description_modal_toggle_hotkeys" id="0x7f120ac6" />
+    <public type="string" name="keybind_description_modal_toggle_mentions" id="0x7f120ac7" />
+    <public type="string" name="keybind_description_modal_toggle_mute" id="0x7f120ac8" />
+    <public type="string" name="keybind_description_modal_toggle_pins" id="0x7f120ac9" />
+    <public type="string" name="keybind_description_modal_toggle_previous_guild" id="0x7f120aca" />
+    <public type="string" name="keybind_description_modal_toggle_users" id="0x7f120acb" />
+    <public type="string" name="keybind_description_modal_unread_channels" id="0x7f120acc" />
+    <public type="string" name="keybind_description_modal_unread_mention_channels" id="0x7f120acd" />
+    <public type="string" name="keybind_description_modal_upload_file" id="0x7f120ace" />
+    <public type="string" name="keybind_description_push_to_mute" id="0x7f120acf" />
+    <public type="string" name="keybind_description_push_to_talk" id="0x7f120ad0" />
+    <public type="string" name="keybind_description_push_to_talk_priority" id="0x7f120ad1" />
+    <public type="string" name="keybind_description_toggle_deafen" id="0x7f120ad2" />
+    <public type="string" name="keybind_description_toggle_go_live_streaming" id="0x7f120ad3" />
+    <public type="string" name="keybind_description_toggle_mute" id="0x7f120ad4" />
+    <public type="string" name="keybind_description_toggle_overlay" id="0x7f120ad5" />
+    <public type="string" name="keybind_description_toggle_overlay_input_lock" id="0x7f120ad6" />
+    <public type="string" name="keybind_description_toggle_streamer_mode" id="0x7f120ad7" />
+    <public type="string" name="keybind_description_toggle_voice_mode" id="0x7f120ad8" />
+    <public type="string" name="keybind_description_unassigned" id="0x7f120ad9" />
+    <public type="string" name="keybind_push_to_mute" id="0x7f120ada" />
+    <public type="string" name="keybind_push_to_talk" id="0x7f120adb" />
+    <public type="string" name="keybind_push_to_talk_priority" id="0x7f120adc" />
+    <public type="string" name="keybind_toggle_deafen" id="0x7f120add" />
+    <public type="string" name="keybind_toggle_go_live_streaming" id="0x7f120ade" />
+    <public type="string" name="keybind_toggle_mute" id="0x7f120adf" />
+    <public type="string" name="keybind_toggle_overlay" id="0x7f120ae0" />
+    <public type="string" name="keybind_toggle_overlay_input_lock" id="0x7f120ae1" />
+    <public type="string" name="keybind_toggle_stream_mode" id="0x7f120ae2" />
+    <public type="string" name="keybind_toggle_voice_mode" id="0x7f120ae3" />
+    <public type="string" name="keybind_unassigned" id="0x7f120ae4" />
+    <public type="string" name="keybinds" id="0x7f120ae5" />
+    <public type="string" name="keyboard_behavior_mobile_header" id="0x7f120ae6" />
+    <public type="string" name="keyboard_behavior_mobile_shift_enter_to_send" id="0x7f120ae7" />
+    <public type="string" name="keyboard_behavior_mobile_shift_enter_to_send_hint" id="0x7f120ae8" />
+    <public type="string" name="kick" id="0x7f120ae9" />
+    <public type="string" name="kick_from_server" id="0x7f120aea" />
+    <public type="string" name="kick_members" id="0x7f120aeb" />
+    <public type="string" name="kick_members_description" id="0x7f120aec" />
+    <public type="string" name="kick_user_body" id="0x7f120aed" />
+    <public type="string" name="kick_user_confirmed" id="0x7f120aee" />
+    <public type="string" name="kick_user_error_generic" id="0x7f120aef" />
+    <public type="string" name="kick_user_title" id="0x7f120af0" />
+    <public type="string" name="ko" id="0x7f120af1" />
+    <public type="string" name="label_with_online_status" id="0x7f120af2" />
+    <public type="string" name="language" id="0x7f120af3" />
+    <public type="string" name="language_not_found" id="0x7f120af4" />
+    <public type="string" name="language_select" id="0x7f120af5" />
+    <public type="string" name="language_updated" id="0x7f120af6" />
+    <public type="string" name="languages" id="0x7f120af7" />
+    <public type="string" name="last_seen" id="0x7f120af8" />
+    <public type="string" name="last_selected_voice_channel_body" id="0x7f120af9" />
+    <public type="string" name="last_selected_voice_channel_no" id="0x7f120afa" />
+    <public type="string" name="last_selected_voice_channel_title" id="0x7f120afb" />
+    <public type="string" name="last_selected_voice_channel_yes" id="0x7f120afc" />
+    <public type="string" name="last_sync" id="0x7f120afd" />
+    <public type="string" name="launch_app" id="0x7f120afe" />
+    <public type="string" name="learn_more" id="0x7f120aff" />
+    <public type="string" name="leave_call" id="0x7f120b00" />
+    <public type="string" name="leave_group_dm" id="0x7f120b01" />
+    <public type="string" name="leave_group_dm_body" id="0x7f120b02" />
+    <public type="string" name="leave_group_dm_managed_body" id="0x7f120b03" />
+    <public type="string" name="leave_group_dm_managed_title" id="0x7f120b04" />
+    <public type="string" name="leave_group_dm_title" id="0x7f120b05" />
+    <public type="string" name="leave_server" id="0x7f120b06" />
+    <public type="string" name="leave_server_body" id="0x7f120b07" />
+    <public type="string" name="leave_server_body_mobile" id="0x7f120b08" />
+    <public type="string" name="leave_server_title" id="0x7f120b09" />
+    <public type="string" name="lfg_active_groups" id="0x7f120b0a" />
+    <public type="string" name="lfg_bump_button" id="0x7f120b0b" />
+    <public type="string" name="lfg_bump_cooldown" id="0x7f120b0c" />
+    <public type="string" name="lfg_channel_unavailable" id="0x7f120b0d" />
+    <public type="string" name="lfg_create_a_group" id="0x7f120b0e" />
+    <public type="string" name="lfg_create_button" id="0x7f120b0f" />
+    <public type="string" name="lfg_create_placeholder" id="0x7f120b10" />
+    <public type="string" name="lfg_delete_modal_content" id="0x7f120b11" />
+    <public type="string" name="lfg_delete_modal_title" id="0x7f120b12" />
+    <public type="string" name="lfg_delisted_explanation_completed" id="0x7f120b13" />
+    <public type="string" name="lfg_delisted_explanation_expired" id="0x7f120b14" />
+    <public type="string" name="lfg_delisted_explanation_inactive" id="0x7f120b15" />
+    <public type="string" name="lfg_delisted_explanation_unknown" id="0x7f120b16" />
+    <public type="string" name="lfg_edit_modal_cta" id="0x7f120b17" />
+    <public type="string" name="lfg_edit_modal_description_label" id="0x7f120b18" />
+    <public type="string" name="lfg_edit_modal_group_size_label" id="0x7f120b19" />
+    <public type="string" name="lfg_edit_modal_title" id="0x7f120b1a" />
+    <public type="string" name="lfg_empty_state_note" id="0x7f120b1b" />
+    <public type="string" name="lfg_empty_state_note_2" id="0x7f120b1c" />
+    <public type="string" name="lfg_empty_state_title" id="0x7f120b1d" />
+    <public type="string" name="lfg_expired_banner" id="0x7f120b1e" />
+    <public type="string" name="lfg_group_description_required" id="0x7f120b1f" />
+    <public type="string" name="lfg_group_full" id="0x7f120b20" />
+    <public type="string" name="lfg_groups_looking" id="0x7f120b21" />
+    <public type="string" name="lfg_groups_looking_with_total" id="0x7f120b22" />
+    <public type="string" name="lfg_join_button" id="0x7f120b23" />
+    <public type="string" name="lfg_leave_button" id="0x7f120b24" />
+    <public type="string" name="lfg_listing_age_hours" id="0x7f120b25" />
+    <public type="string" name="lfg_listing_age_minutes" id="0x7f120b26" />
+    <public type="string" name="lfg_listing_age_seconds" id="0x7f120b27" />
+    <public type="string" name="lfg_listings_channel" id="0x7f120b28" />
+    <public type="string" name="lfg_manage_group" id="0x7f120b29" />
+    <public type="string" name="lfg_num_players" id="0x7f120b2a" />
+    <public type="string" name="lfg_relist_button" id="0x7f120b2b" />
+    <public type="string" name="lfg_relist_your_group" id="0x7f120b2c" />
+    <public type="string" name="lfg_relisted" id="0x7f120b2d" />
+    <public type="string" name="lfg_relisted_in_channel" id="0x7f120b2e" />
+    <public type="string" name="lfg_save_button" id="0x7f120b2f" />
+    <public type="string" name="lfg_save_modal_empty_text" id="0x7f120b30" />
+    <public type="string" name="lfg_save_modal_subtitle" id="0x7f120b31" />
+    <public type="string" name="lfg_save_modal_title" id="0x7f120b32" />
+    <public type="string" name="lfg_sidebar_description" id="0x7f120b33" />
+    <public type="string" name="lfg_sidebar_size" id="0x7f120b34" />
+    <public type="string" name="lfg_sidebar_size_number" id="0x7f120b35" />
+    <public type="string" name="lfg_sidebar_status" id="0x7f120b36" />
+    <public type="string" name="lfg_sidebar_status_expired" id="0x7f120b37" />
+    <public type="string" name="lfg_sidebar_status_expired_tooltip" id="0x7f120b38" />
+    <public type="string" name="lfg_something_went_wrong" id="0x7f120b39" />
+    <public type="string" name="lfg_spots_available" id="0x7f120b3a" />
+    <public type="string" name="lfg_unknown_member_tooltip" id="0x7f120b3b" />
+    <public type="string" name="lfg_view_button" id="0x7f120b3c" />
+    <public type="string" name="lfg_your_active_group" id="0x7f120b3d" />
+    <public type="string" name="lfg_your_group" id="0x7f120b3e" />
+    <public type="string" name="library" id="0x7f120b3f" />
+    <public type="string" name="light_blue" id="0x7f120b40" />
+    <public type="string" name="light_green" id="0x7f120b41" />
+    <public type="string" name="light_grey" id="0x7f120b42" />
+    <public type="string" name="link_account" id="0x7f120b43" />
+    <public type="string" name="link_copied" id="0x7f120b44" />
+    <public type="string" name="link_settings" id="0x7f120b45" />
+    <public type="string" name="link_your_discord_account" id="0x7f120b46" />
+    <public type="string" name="link_your_xbox_account_1" id="0x7f120b47" />
+    <public type="string" name="link_your_xbox_account_2" id="0x7f120b48" />
+    <public type="string" name="linux" id="0x7f120b49" />
+    <public type="string" name="listen_on_spotify" id="0x7f120b4a" />
+    <public type="string" name="listening_to" id="0x7f120b4b" />
+    <public type="string" name="listings_permissions" id="0x7f120b4c" />
+    <public type="string" name="live" id="0x7f120b4d" />
+    <public type="string" name="live_beta_description" id="0x7f120b4e" />
+    <public type="string" name="live_on_twitch" id="0x7f120b4f" />
+    <public type="string" name="live_viewers" id="0x7f120b50" />
+    <public type="string" name="load_image_error" id="0x7f120b51" />
+    <public type="string" name="load_more_messages" id="0x7f120b52" />
+    <public type="string" name="load_reactions_error" id="0x7f120b53" />
+    <public type="string" name="loading" id="0x7f120b54" />
+    <public type="string" name="loading_divider" id="0x7f120b55" />
+    <public type="string" name="loading_your_pin" id="0x7f120b56" />
+    <public type="string" name="lobby" id="0x7f120b57" />
+    <public type="string" name="local_push_notification_guild_verification_body" id="0x7f120b58" />
+    <public type="string" name="locale" id="0x7f120b59" />
+    <public type="string" name="login" id="0x7f120b5a" />
+    <public type="string" name="login_body" id="0x7f120b5b" />
+    <public type="string" name="login_title" id="0x7f120b5c" />
+    <public type="string" name="logout" id="0x7f120b5d" />
+    <public type="string" name="lt" id="0x7f120b5e" />
+    <public type="string" name="lurker_mode_chat_input_back_button" id="0x7f120b5f" />
+    <public type="string" name="lurker_mode_chat_input_button" id="0x7f120b60" />
+    <public type="string" name="lurker_mode_chat_input_message" id="0x7f120b61" />
+    <public type="string" name="lurker_mode_chat_input_message_ios" id="0x7f120b62" />
+    <public type="string" name="lurker_mode_view_guild" id="0x7f120b63" />
+    <public type="string" name="lurkers_description" id="0x7f120b64" />
+    <public type="string" name="macos" id="0x7f120b65" />
+    <public type="string" name="magenta" id="0x7f120b66" />
+    <public type="string" name="manage_channel" id="0x7f120b67" />
+    <public type="string" name="manage_channel_description" id="0x7f120b68" />
+    <public type="string" name="manage_channels" id="0x7f120b69" />
+    <public type="string" name="manage_channels_description" id="0x7f120b6a" />
+    <public type="string" name="manage_emojis" id="0x7f120b6b" />
+    <public type="string" name="manage_listings" id="0x7f120b6c" />
+    <public type="string" name="manage_listings_description" id="0x7f120b6d" />
+    <public type="string" name="manage_messages" id="0x7f120b6e" />
+    <public type="string" name="manage_messages_description" id="0x7f120b6f" />
+    <public type="string" name="manage_messages_description_in_announcement_channel" id="0x7f120b70" />
+    <public type="string" name="manage_nicknames" id="0x7f120b71" />
+    <public type="string" name="manage_nicknames_description" id="0x7f120b72" />
+    <public type="string" name="manage_permissions" id="0x7f120b73" />
+    <public type="string" name="manage_permissions_description" id="0x7f120b74" />
+    <public type="string" name="manage_roles" id="0x7f120b75" />
+    <public type="string" name="manage_roles_description" id="0x7f120b76" />
+    <public type="string" name="manage_server" id="0x7f120b77" />
+    <public type="string" name="manage_server_description" id="0x7f120b78" />
+    <public type="string" name="manage_user" id="0x7f120b79" />
+    <public type="string" name="manage_user_shorthand" id="0x7f120b7a" />
+    <public type="string" name="manage_webhooks" id="0x7f120b7b" />
+    <public type="string" name="manage_webhooks_description" id="0x7f120b7c" />
+    <public type="string" name="managed_role_explaination" id="0x7f120b7d" />
+    <public type="string" name="mark_as_read" id="0x7f120b7e" />
+    <public type="string" name="masked_link_body" id="0x7f120b7f" />
+    <public type="string" name="masked_link_cancel" id="0x7f120b80" />
+    <public type="string" name="masked_link_confirm" id="0x7f120b81" />
+    <public type="string" name="masked_link_trust_this_domain" id="0x7f120b82" />
+    <public type="string" name="mature_listing_accept" id="0x7f120b83" />
+    <public type="string" name="mature_listing_decline" id="0x7f120b84" />
+    <public type="string" name="mature_listing_description" id="0x7f120b85" />
+    <public type="string" name="mature_listing_title" id="0x7f120b86" />
+    <public type="string" name="max_age_never" id="0x7f120b87" />
+    <public type="string" name="max_age_never_description_mobile" id="0x7f120b88" />
+    <public type="string" name="max_number_of_uses" id="0x7f120b89" />
+    <public type="string" name="max_uses" id="0x7f120b8a" />
+    <public type="string" name="max_uses_description_mobile" id="0x7f120b8b" />
+    <public type="string" name="max_uses_description_unlimited_uses" id="0x7f120b8c" />
+    <public type="string" name="me" id="0x7f120b8d" />
+    <public type="string" name="media_hint_body" id="0x7f120b8e" />
+    <public type="string" name="media_hint_title" id="0x7f120b8f" />
+    <public type="string" name="member" id="0x7f120b90" />
+    <public type="string" name="member_list" id="0x7f120b91" />
+    <public type="string" name="member_list_hidden" id="0x7f120b92" />
+    <public type="string" name="member_list_server_owner_help" id="0x7f120b93" />
+    <public type="string" name="members" id="0x7f120b94" />
+    <public type="string" name="members_header" id="0x7f120b95" />
+    <public type="string" name="members_matching" id="0x7f120b96" />
+    <public type="string" name="members_search_placeholder" id="0x7f120b97" />
+    <public type="string" name="mention" id="0x7f120b98" />
+    <public type="string" name="mention_everyone" id="0x7f120b99" />
+    <public type="string" name="mention_everyone_autocomplete_description" id="0x7f120b9a" />
+    <public type="string" name="mention_everyone_autocomplete_description_mobile" id="0x7f120b9b" />
+    <public type="string" name="mention_everyone_description" id="0x7f120b9c" />
+    <public type="string" name="mention_here_autocomplete_description" id="0x7f120b9d" />
+    <public type="string" name="mention_here_autocomplete_description_mobile" id="0x7f120b9e" />
+    <public type="string" name="mention_role_autocomplete_description_mobile" id="0x7f120b9f" />
+    <public type="string" name="mention_users_with_role" id="0x7f120ba0" />
+    <public type="string" name="mentions" id="0x7f120ba1" />
+    <public type="string" name="mentions_count" id="0x7f120ba2" />
+    <public type="string" name="message_display_mode_label" id="0x7f120ba3" />
+    <public type="string" name="message_edited" id="0x7f120ba4" />
+    <public type="string" name="message_options" id="0x7f120ba5" />
+    <public type="string" name="message_pinned" id="0x7f120ba6" />
+    <public type="string" name="message_preview" id="0x7f120ba7" />
+    <public type="string" name="message_rate_limited_body" id="0x7f120ba8" />
+    <public type="string" name="message_rate_limited_button" id="0x7f120ba9" />
+    <public type="string" name="message_rate_limited_header" id="0x7f120baa" />
+    <public type="string" name="message_too_long_body" id="0x7f120bab" />
+    <public type="string" name="message_too_long_header" id="0x7f120bac" />
+    <public type="string" name="message_tts" id="0x7f120bad" />
+    <public type="string" name="message_tts_deleted_role" id="0x7f120bae" />
+    <public type="string" name="message_unpinned" id="0x7f120baf" />
+    <public type="string" name="message_warning_mention_everyone_body" id="0x7f120bb0" />
+    <public type="string" name="message_warning_mention_everyone_title" id="0x7f120bb1" />
+    <public type="string" name="messages" id="0x7f120bb2" />
+    <public type="string" name="mfa_sms_add_phone" id="0x7f120bb3" />
+    <public type="string" name="mfa_sms_already_enabled" id="0x7f120bb4" />
+    <public type="string" name="mfa_sms_auth" id="0x7f120bb5" />
+    <public type="string" name="mfa_sms_auth_current_phone" id="0x7f120bb6" />
+    <public type="string" name="mfa_sms_auth_sales_pitch" id="0x7f120bb7" />
+    <public type="string" name="mfa_sms_confirm_remove_action" id="0x7f120bb8" />
+    <public type="string" name="mfa_sms_confirm_remove_body" id="0x7f120bb9" />
+    <public type="string" name="mfa_sms_disabled_partner" id="0x7f120bba" />
+    <public type="string" name="mfa_sms_enable" id="0x7f120bbb" />
+    <public type="string" name="mfa_sms_enable_subheader" id="0x7f120bbc" />
+    <public type="string" name="mfa_sms_phone_number_hide" id="0x7f120bbd" />
+    <public type="string" name="mfa_sms_phone_number_reveal" id="0x7f120bbe" />
+    <public type="string" name="mfa_sms_receive_code" id="0x7f120bbf" />
+    <public type="string" name="mfa_sms_remove" id="0x7f120bc0" />
+    <public type="string" name="mfa_sms_resend" id="0x7f120bc1" />
+    <public type="string" name="microphone_permission_error" id="0x7f120bc2" />
+    <public type="string" name="minimum_size" id="0x7f120bc3" />
+    <public type="string" name="missed_an_update" id="0x7f120bc4" />
+    <public type="string" name="missing_entitlement_modal_body" id="0x7f120bc5" />
+    <public type="string" name="missing_entitlement_modal_body_unknown_application" id="0x7f120bc6" />
+    <public type="string" name="missing_entitlement_modal_header" id="0x7f120bc7" />
+    <public type="string" name="missing_entitlement_modal_header_unknown_application" id="0x7f120bc8" />
+    <public type="string" name="mobile_enable_hardware_scaling" id="0x7f120bc9" />
+    <public type="string" name="mobile_enable_hardware_scaling_desc" id="0x7f120bca" />
+    <public type="string" name="moderation" id="0x7f120bcb" />
+    <public type="string" name="modify_followed_news_header" id="0x7f120bcc" />
+    <public type="string" name="more" id="0x7f120bcd" />
+    <public type="string" name="move_from_category_to" id="0x7f120bce" />
+    <public type="string" name="move_members" id="0x7f120bcf" />
+    <public type="string" name="move_members_description" id="0x7f120bd0" />
+    <public type="string" name="move_to" id="0x7f120bd1" />
+    <public type="string" name="move_to_success" id="0x7f120bd2" />
+    <public type="string" name="mtrl_chip_close_icon_content_description" id="0x7f120bd3" />
+    <public type="string" name="mute" id="0x7f120bd4" />
+    <public type="string" name="mute_category" id="0x7f120bd5" />
+    <public type="string" name="mute_channel" id="0x7f120bd6" />
+    <public type="string" name="mute_channel_old" id="0x7f120bd7" />
+    <public type="string" name="mute_during_work" id="0x7f120bd8" />
+    <public type="string" name="mute_for_an_hour" id="0x7f120bd9" />
+    <public type="string" name="mute_group_dm" id="0x7f120bda" />
+    <public type="string" name="mute_members" id="0x7f120bdb" />
+    <public type="string" name="mutual_friends" id="0x7f120bdc" />
+    <public type="string" name="mutual_guilds" id="0x7f120bdd" />
+    <public type="string" name="n_days" id="0x7f120bde" />
+    <public type="string" name="nearby_scan" id="0x7f120bdf" />
+    <public type="string" name="need_account" id="0x7f120be0" />
+    <public type="string" name="network_error_bad_request" id="0x7f120be1" />
+    <public type="string" name="network_error_cloudflare_intermittent" id="0x7f120be2" />
+    <public type="string" name="network_error_cloudflare_unauthorized" id="0x7f120be3" />
+    <public type="string" name="network_error_connection" id="0x7f120be4" />
+    <public type="string" name="network_error_forbidden" id="0x7f120be5" />
+    <public type="string" name="network_error_request_too_large" id="0x7f120be6" />
+    <public type="string" name="network_error_rest_request" id="0x7f120be7" />
+    <public type="string" name="network_error_ssl" id="0x7f120be8" />
+    <public type="string" name="network_error_unauthorized" id="0x7f120be9" />
+    <public type="string" name="network_error_unknown" id="0x7f120bea" />
+    <public type="string" name="network_error_unknown_host" id="0x7f120beb" />
+    <public type="string" name="network_offline" id="0x7f120bec" />
+    <public type="string" name="nevermind" id="0x7f120bed" />
+    <public type="string" name="new_dm" id="0x7f120bee" />
+    <public type="string" name="new_group_dm" id="0x7f120bef" />
+    <public type="string" name="new_guilds_dm_allowed" id="0x7f120bf0" />
+    <public type="string" name="new_mentions" id="0x7f120bf1" />
+    <public type="string" name="new_messages" id="0x7f120bf2" />
+    <public type="string" name="new_messages_divider" id="0x7f120bf3" />
+    <public type="string" name="new_messages_estimated" id="0x7f120bf4" />
+    <public type="string" name="new_messages_estimated_with_date" id="0x7f120bf5" />
+    <public type="string" name="new_messages_with_date" id="0x7f120bf6" />
+    <public type="string" name="new_override" id="0x7f120bf7" />
+    <public type="string" name="new_permission" id="0x7f120bf8" />
+    <public type="string" name="new_terms_ack" id="0x7f120bf9" />
+    <public type="string" name="new_terms_continue" id="0x7f120bfa" />
+    <public type="string" name="new_terms_description" id="0x7f120bfb" />
+    <public type="string" name="new_terms_title" id="0x7f120bfc" />
+    <public type="string" name="new_unreads" id="0x7f120bfd" />
+    <public type="string" name="news_channel" id="0x7f120bfe" />
+    <public type="string" name="news_channel_edit_news" id="0x7f120bff" />
+    <public type="string" name="news_channel_publish" id="0x7f120c00" />
+    <public type="string" name="news_channel_publish_bump" id="0x7f120c01" />
+    <public type="string" name="news_channel_publish_bump_hide_permanently" id="0x7f120c02" />
+    <public type="string" name="news_channel_publish_news" id="0x7f120c03" />
+    <public type="string" name="news_channel_published" id="0x7f120c04" />
+    <public type="string" name="next" id="0x7f120c05" />
+    <public type="string" name="nickname" id="0x7f120c06" />
+    <public type="string" name="nickname_changed" id="0x7f120c07" />
+    <public type="string" name="nickname_cleared" id="0x7f120c08" />
+    <public type="string" name="nl" id="0x7f120c09" />
+    <public type="string" name="no" id="0x7f120c0a" />
+    <public type="string" name="no_afk_channel" id="0x7f120c0b" />
+    <public type="string" name="no_authorized_apps" id="0x7f120c0c" />
+    <public type="string" name="no_authorized_apps_note" id="0x7f120c0d" />
+    <public type="string" name="no_ban_reason" id="0x7f120c0e" />
+    <public type="string" name="no_bans" id="0x7f120c0f" />
+    <public type="string" name="no_camera_access" id="0x7f120c10" />
+    <public type="string" name="no_category" id="0x7f120c11" />
+    <public type="string" name="no_channel_description" id="0x7f120c12" />
+    <public type="string" name="no_emoji" id="0x7f120c13" />
+    <public type="string" name="no_emoji_body" id="0x7f120c14" />
+    <public type="string" name="no_emoji_search_results" id="0x7f120c15" />
+    <public type="string" name="no_emoji_title" id="0x7f120c16" />
+    <public type="string" name="no_gif_favorites_flavor_favorite_please" id="0x7f120c17" />
+    <public type="string" name="no_gif_favorites_flavor_still_here" id="0x7f120c18" />
+    <public type="string" name="no_gif_favorites_go_favorite" id="0x7f120c19" />
+    <public type="string" name="no_gif_favorites_how_to_favorite" id="0x7f120c1a" />
+    <public type="string" name="no_gif_favorites_where_to_favorite" id="0x7f120c1b" />
+    <public type="string" name="no_gif_search_results" id="0x7f120c1c" />
+    <public type="string" name="no_input_devices" id="0x7f120c1d" />
+    <public type="string" name="no_input_devices_detected" id="0x7f120c1e" />
+    <public type="string" name="no_instant_invite" id="0x7f120c1f" />
+    <public type="string" name="no_integrations" id="0x7f120c20" />
+    <public type="string" name="no_integrations_body" id="0x7f120c21" />
+    <public type="string" name="no_integrations_label" id="0x7f120c22" />
+    <public type="string" name="no_invites_body" id="0x7f120c23" />
+    <public type="string" name="no_invites_caption" id="0x7f120c24" />
+    <public type="string" name="no_invites_label" id="0x7f120c25" />
+    <public type="string" name="no_mail_account_description" id="0x7f120c26" />
+    <public type="string" name="no_mail_account_title" id="0x7f120c27" />
+    <public type="string" name="no_mic_body" id="0x7f120c28" />
+    <public type="string" name="no_mic_title" id="0x7f120c29" />
+    <public type="string" name="no_mutual_friends" id="0x7f120c2a" />
+    <public type="string" name="no_mutual_guilds" id="0x7f120c2b" />
+    <public type="string" name="no_output_devices" id="0x7f120c2c" />
+    <public type="string" name="no_photo_in_camera_roll" id="0x7f120c2d" />
+    <public type="string" name="no_photos_access" id="0x7f120c2e" />
+    <public type="string" name="no_pins_in_channel" id="0x7f120c2f" />
+    <public type="string" name="no_pins_in_dm" id="0x7f120c30" />
+    <public type="string" name="no_private_channels_description" id="0x7f120c31" />
+    <public type="string" name="no_private_channels_title" id="0x7f120c32" />
+    <public type="string" name="no_reactions_body" id="0x7f120c33" />
+    <public type="string" name="no_reactions_header" id="0x7f120c34" />
+    <public type="string" name="no_recent_mentions" id="0x7f120c35" />
+    <public type="string" name="no_send_messages_permission_placeholder" id="0x7f120c36" />
+    <public type="string" name="no_system_channel" id="0x7f120c37" />
+    <public type="string" name="no_text" id="0x7f120c38" />
+    <public type="string" name="no_thanks" id="0x7f120c39" />
+    <public type="string" name="no_user_limit" id="0x7f120c3a" />
+    <public type="string" name="no_video_devices" id="0x7f120c3b" />
+    <public type="string" name="noise_cancellation" id="0x7f120c3c" />
+    <public type="string" name="noise_reduction_none" id="0x7f120c3d" />
+    <public type="string" name="noise_suppression" id="0x7f120c3e" />
+    <public type="string" name="none" id="0x7f120c3f" />
+    <public type="string" name="not_available" id="0x7f120c40" />
+    <public type="string" name="not_enough_guild_members" id="0x7f120c41" />
+    <public type="string" name="not_in_the_call" id="0x7f120c42" />
+    <public type="string" name="not_in_the_voice_channel" id="0x7f120c43" />
+    <public type="string" name="note" id="0x7f120c44" />
+    <public type="string" name="note_placeholder" id="0x7f120c45" />
+    <public type="string" name="note_placeholder_mobile" id="0x7f120c46" />
+    <public type="string" name="notice_application_test_mode" id="0x7f120c47" />
+    <public type="string" name="notice_application_test_mode_go_to_listing" id="0x7f120c48" />
+    <public type="string" name="notice_connect_spotify" id="0x7f120c49" />
+    <public type="string" name="notice_connection_conflict" id="0x7f120c4a" />
+    <public type="string" name="notice_corrupt_installation" id="0x7f120c4b" />
+    <public type="string" name="notice_corrupt_installation_help_link_text" id="0x7f120c4c" />
+    <public type="string" name="notice_detected_off_platform_no_premium_perk_message" id="0x7f120c4d" />
+    <public type="string" name="notice_detected_off_platform_premium_perk_button" id="0x7f120c4e" />
+    <public type="string" name="notice_detected_off_platform_premium_perk_message" id="0x7f120c4f" />
+    <public type="string" name="notice_dispatch_api_error" id="0x7f120c50" />
+    <public type="string" name="notice_dispatch_application_lock_failed" id="0x7f120c51" />
+    <public type="string" name="notice_dispatch_error" id="0x7f120c52" />
+    <public type="string" name="notice_dispatch_error_disk_full" id="0x7f120c53" />
+    <public type="string" name="notice_dispatch_error_disk_low" id="0x7f120c54" />
+    <public type="string" name="notice_dispatch_error_file_name_too_long" id="0x7f120c55" />
+    <public type="string" name="notice_dispatch_error_invalid_drive" id="0x7f120c56" />
+    <public type="string" name="notice_dispatch_error_io_permission_denied" id="0x7f120c57" />
+    <public type="string" name="notice_dispatch_error_no_manifests" id="0x7f120c58" />
+    <public type="string" name="notice_dispatch_error_not_entitled" id="0x7f120c59" />
+    <public type="string" name="notice_dispatch_error_post_install_cancelled" id="0x7f120c5a" />
+    <public type="string" name="notice_dispatch_error_post_install_failed" id="0x7f120c5b" />
+    <public type="string" name="notice_dispatch_error_unwritable" id="0x7f120c5c" />
+    <public type="string" name="notice_dispatch_error_with_code" id="0x7f120c5d" />
+    <public type="string" name="notice_dispatch_install_script_progress" id="0x7f120c5e" />
+    <public type="string" name="notice_dispatch_install_script_progress_with_name" id="0x7f120c5f" />
+    <public type="string" name="notice_hardware_mute" id="0x7f120c60" />
+    <public type="string" name="notice_mfa_sms_backup" id="0x7f120c61" />
+    <public type="string" name="notice_mfa_sms_backup_button" id="0x7f120c62" />
+    <public type="string" name="notice_native_apps" id="0x7f120c63" />
+    <public type="string" name="notice_no_input_detected" id="0x7f120c64" />
+    <public type="string" name="notice_no_input_detected_help_link_text" id="0x7f120c65" />
+    <public type="string" name="notice_no_input_detected_settings" id="0x7f120c66" />
+    <public type="string" name="notice_no_input_detected_settings_link_text" id="0x7f120c67" />
+    <public type="string" name="notice_premium_grandfathered_ended" id="0x7f120c68" />
+    <public type="string" name="notice_premium_grandfathered_ending" id="0x7f120c69" />
+    <public type="string" name="notice_premium_promo_action" id="0x7f120c6a" />
+    <public type="string" name="notice_premium_promo_message" id="0x7f120c6b" />
+    <public type="string" name="notice_scheduled_maintenance" id="0x7f120c6c" />
+    <public type="string" name="notice_spotify_auto_paused" id="0x7f120c6d" />
+    <public type="string" name="notice_streamer_mode_text" id="0x7f120c6e" />
+    <public type="string" name="notice_survey_body" id="0x7f120c6f" />
+    <public type="string" name="notice_survey_button" id="0x7f120c70" />
+    <public type="string" name="notice_survey_prompt" id="0x7f120c71" />
+    <public type="string" name="notice_unclaimed_account" id="0x7f120c72" />
+    <public type="string" name="notice_unverified_account" id="0x7f120c73" />
+    <public type="string" name="notice_video_unsupported_browser" id="0x7f120c74" />
+    <public type="string" name="notice_whats_this" id="0x7f120c75" />
+    <public type="string" name="notification_accepted_friend_request" id="0x7f120c76" />
+    <public type="string" name="notification_body_attachment" id="0x7f120c77" />
+    <public type="string" name="notification_body_start_game" id="0x7f120c78" />
+    <public type="string" name="notification_dismiss" id="0x7f120c79" />
+    <public type="string" name="notification_message_create_dm_activity_join" id="0x7f120c7a" />
+    <public type="string" name="notification_message_create_dm_activity_listen" id="0x7f120c7b" />
+    <public type="string" name="notification_message_create_dm_activity_spectate" id="0x7f120c7c" />
+    <public type="string" name="notification_message_create_group_dm_activity_join" id="0x7f120c7d" />
+    <public type="string" name="notification_message_create_group_dm_activity_listen" id="0x7f120c7e" />
+    <public type="string" name="notification_message_create_group_dm_activity_spectate" id="0x7f120c7f" />
+    <public type="string" name="notification_message_create_guild_activity_join" id="0x7f120c80" />
+    <public type="string" name="notification_message_create_guild_activity_listen" id="0x7f120c81" />
+    <public type="string" name="notification_message_create_guild_activity_spectate" id="0x7f120c82" />
+    <public type="string" name="notification_overrides" id="0x7f120c83" />
+    <public type="string" name="notification_pending_friend_request" id="0x7f120c84" />
+    <public type="string" name="notification_reply" id="0x7f120c85" />
+    <public type="string" name="notification_reply_failed" id="0x7f120c86" />
+    <public type="string" name="notification_reply_success" id="0x7f120c87" />
+    <public type="string" name="notification_settings" id="0x7f120c88" />
+    <public type="string" name="notification_title_discord" id="0x7f120c89" />
+    <public type="string" name="notification_title_start_game" id="0x7f120c8a" />
+    <public type="string" name="notification_voice_status_body" id="0x7f120c8b" />
+    <public type="string" name="notification_voice_status_body_no_status" id="0x7f120c8c" />
+    <public type="string" name="notification_voice_status_title" id="0x7f120c8d" />
+    <public type="string" name="notifications" id="0x7f120c8e" />
+    <public type="string" name="notifications_nuf_body" id="0x7f120c8f" />
+    <public type="string" name="notifications_nuf_cta" id="0x7f120c90" />
+    <public type="string" name="notifications_nuf_title" id="0x7f120c91" />
+    <public type="string" name="nsfw_accept" id="0x7f120c92" />
+    <public type="string" name="nsfw_decline" id="0x7f120c93" />
+    <public type="string" name="nsfw_description" id="0x7f120c94" />
+    <public type="string" name="nsfw_note" id="0x7f120c95" />
+    <public type="string" name="nsfw_title" id="0x7f120c96" />
+    <public type="string" name="nuf_body" id="0x7f120c97" />
+    <public type="string" name="nuf_body_mobile" id="0x7f120c98" />
+    <public type="string" name="nuf_chat_with_friends" id="0x7f120c99" />
+    <public type="string" name="nuf_claim_account_body_1" id="0x7f120c9a" />
+    <public type="string" name="nuf_claim_account_body_2" id="0x7f120c9b" />
+    <public type="string" name="nuf_claim_account_button" id="0x7f120c9c" />
+    <public type="string" name="nuf_claim_account_generic_error" id="0x7f120c9d" />
+    <public type="string" name="nuf_claim_account_title" id="0x7f120c9e" />
+    <public type="string" name="nuf_club_or_interest_group" id="0x7f120c9f" />
+    <public type="string" name="nuf_create_server_body" id="0x7f120ca0" />
+    <public type="string" name="nuf_create_server_button" id="0x7f120ca1" />
+    <public type="string" name="nuf_create_server_error" id="0x7f120ca2" />
+    <public type="string" name="nuf_create_server_note" id="0x7f120ca3" />
+    <public type="string" name="nuf_create_server_title" id="0x7f120ca4" />
+    <public type="string" name="nuf_download_app_body" id="0x7f120ca5" />
+    <public type="string" name="nuf_download_app_button_platform" id="0x7f120ca6" />
+    <public type="string" name="nuf_download_app_button_type" id="0x7f120ca7" />
+    <public type="string" name="nuf_download_app_intro" id="0x7f120ca8" />
+    <public type="string" name="nuf_download_app_title" id="0x7f120ca9" />
+    <public type="string" name="nuf_gaming_community" id="0x7f120caa" />
+    <public type="string" name="nuf_get_started" id="0x7f120cab" />
+    <public type="string" name="nuf_join_a_friend" id="0x7f120cac" />
+    <public type="string" name="nuf_join_server_body_1" id="0x7f120cad" />
+    <public type="string" name="nuf_join_server_body_2" id="0x7f120cae" />
+    <public type="string" name="nuf_join_server_button" id="0x7f120caf" />
+    <public type="string" name="nuf_join_server_input_label" id="0x7f120cb0" />
+    <public type="string" name="nuf_join_server_input_note" id="0x7f120cb1" />
+    <public type="string" name="nuf_join_server_title_1" id="0x7f120cb2" />
+    <public type="string" name="nuf_join_server_title_2" id="0x7f120cb3" />
+    <public type="string" name="nuf_just_look_around" id="0x7f120cb4" />
+    <public type="string" name="nuf_title" id="0x7f120cb5" />
+    <public type="string" name="nuf_title_mobile" id="0x7f120cb6" />
+    <public type="string" name="nuf_voice_chat_while_gaming" id="0x7f120cb7" />
+    <public type="string" name="nuf_welcome_carousel_1_body_mobile" id="0x7f120cb8" />
+    <public type="string" name="nuf_welcome_carousel_1_title_mobile" id="0x7f120cb9" />
+    <public type="string" name="nuf_welcome_carousel_2_body_mobile" id="0x7f120cba" />
+    <public type="string" name="nuf_welcome_carousel_2_title_mobile" id="0x7f120cbb" />
+    <public type="string" name="nuf_welcome_carousel_3_body_mobile" id="0x7f120cbc" />
+    <public type="string" name="nuf_welcome_carousel_3_title_mobile" id="0x7f120cbd" />
+    <public type="string" name="nuf_welcome_carousel_4_body_mobile" id="0x7f120cbe" />
+    <public type="string" name="nuf_welcome_carousel_4_title_mobile" id="0x7f120cbf" />
+    <public type="string" name="nuf_welcome_carousel_5_body_mobile" id="0x7f120cc0" />
+    <public type="string" name="nuf_welcome_carousel_5_title_mobile" id="0x7f120cc1" />
+    <public type="string" name="nuf_what_do_you_want" id="0x7f120cc2" />
+    <public type="string" name="num_channels" id="0x7f120cc3" />
+    <public type="string" name="num_members" id="0x7f120cc4" />
+    <public type="string" name="num_subscribers" id="0x7f120cc5" />
+    <public type="string" name="num_users" id="0x7f120cc6" />
+    <public type="string" name="nux_overlay_description" id="0x7f120cc7" />
+    <public type="string" name="nux_overlay_enable" id="0x7f120cc8" />
+    <public type="string" name="nux_overlay_title" id="0x7f120cc9" />
+    <public type="string" name="nux_post_reg_join_server_description" id="0x7f120cca" />
+    <public type="string" name="nux_post_reg_join_server_skip" id="0x7f120ccb" />
+    <public type="string" name="nux_post_reg_join_server_title" id="0x7f120ccc" />
+    <public type="string" name="nux_samsung_game_presence_link_description" id="0x7f120ccd" />
+    <public type="string" name="nux_samsung_game_presence_link_enable" id="0x7f120cce" />
+    <public type="string" name="nux_samsung_game_presence_link_title" id="0x7f120ccf" />
+    <public type="string" name="oauth2_authorize_error" id="0x7f120cd0" />
+    <public type="string" name="oauth2_connect_to_discord" id="0x7f120cd1" />
+    <public type="string" name="oauth2_insecure_notice" id="0x7f120cd2" />
+    <public type="string" name="oauth2_insecure_read_notice" id="0x7f120cd3" />
+    <public type="string" name="oauth2_label" id="0x7f120cd4" />
+    <public type="string" name="oauth2_message_cta" id="0x7f120cd5" />
+    <public type="string" name="oauth2_message_unknown_error" id="0x7f120cd6" />
+    <public type="string" name="oauth2_request_invalid_scope" id="0x7f120cd7" />
+    <public type="string" name="oauth2_request_missing_param" id="0x7f120cd8" />
+    <public type="string" name="oauth2_secure_notice" id="0x7f120cd9" />
+    <public type="string" name="oauth2_security_notice" id="0x7f120cda" />
+    <public type="string" name="oauth2_title" id="0x7f120cdb" />
+    <public type="string" name="okay" id="0x7f120cdc" />
+    <public type="string" name="one_user_typing" id="0x7f120cdd" />
+    <public type="string" name="ongoing_call" id="0x7f120cde" />
+    <public type="string" name="ongoing_call_connected_users" id="0x7f120cdf" />
+    <public type="string" name="ongoing_call_voice_quality_low" id="0x7f120ce0" />
+    <public type="string" name="ongoing_call_you_are_all_alone" id="0x7f120ce1" />
+    <public type="string" name="only_you_can_see_and_delete_these" id="0x7f120ce2" />
+    <public type="string" name="open" id="0x7f120ce3" />
+    <public type="string" name="open_app" id="0x7f120ce4" />
+    <public type="string" name="open_in_browser" id="0x7f120ce5" />
+    <public type="string" name="open_in_theater" id="0x7f120ce6" />
+    <public type="string" name="open_link" id="0x7f120ce7" />
+    <public type="string" name="open_original_image" id="0x7f120ce8" />
+    <public type="string" name="options" id="0x7f120ce9" />
+    <public type="string" name="orange" id="0x7f120cea" />
+    <public type="string" name="other_options" id="0x7f120ceb" />
+    <public type="string" name="other_reactions" id="0x7f120cec" />
+    <public type="string" name="others_online" id="0x7f120ced" />
+    <public type="string" name="out_of_date_action" id="0x7f120cee" />
+    <public type="string" name="out_of_date_description" id="0x7f120cef" />
+    <public type="string" name="out_of_date_title" id="0x7f120cf0" />
+    <public type="string" name="outgoing_friend_request" id="0x7f120cf1" />
+    <public type="string" name="outgoing_friend_request_delete_msg" id="0x7f120cf2" />
+    <public type="string" name="overlay" id="0x7f120cf3" />
+    <public type="string" name="overlay_channel_chat_hotkey" id="0x7f120cf4" />
+    <public type="string" name="overlay_click_to_jump_to_channel" id="0x7f120cf5" />
+    <public type="string" name="overlay_click_to_unlock" id="0x7f120cf6" />
+    <public type="string" name="overlay_crashed_title" id="0x7f120cf7" />
+    <public type="string" name="overlay_explanation" id="0x7f120cf8" />
+    <public type="string" name="overlay_friend_calling" id="0x7f120cf9" />
+    <public type="string" name="overlay_in_game_preview_header" id="0x7f120cfa" />
+    <public type="string" name="overlay_launch_open_tip" id="0x7f120cfb" />
+    <public type="string" name="overlay_launch_title" id="0x7f120cfc" />
+    <public type="string" name="overlay_link_alert_body" id="0x7f120cfd" />
+    <public type="string" name="overlay_link_alert_secondary" id="0x7f120cfe" />
+    <public type="string" name="overlay_link_alert_title" id="0x7f120cff" />
+    <public type="string" name="overlay_menu_get_invite" id="0x7f120d00" />
+    <public type="string" name="overlay_menu_open_discord" id="0x7f120d01" />
+    <public type="string" name="overlay_menu_switch_channels" id="0x7f120d02" />
+    <public type="string" name="overlay_mobile_required" id="0x7f120d03" />
+    <public type="string" name="overlay_mobile_toggle_desc" id="0x7f120d04" />
+    <public type="string" name="overlay_mobile_toggle_label" id="0x7f120d05" />
+    <public type="string" name="overlay_mobile_unauthed" id="0x7f120d06" />
+    <public type="string" name="overlay_news_go_live_body" id="0x7f120d07" />
+    <public type="string" name="overlay_news_go_live_cta" id="0x7f120d08" />
+    <public type="string" name="overlay_news_text_pinning_body" id="0x7f120d09" />
+    <public type="string" name="overlay_news_text_pinning_tip" id="0x7f120d0a" />
+    <public type="string" name="overlay_news_text_pinning_title" id="0x7f120d0b" />
+    <public type="string" name="overlay_no_results" id="0x7f120d0c" />
+    <public type="string" name="overlay_notification_incoming_call" id="0x7f120d0d" />
+    <public type="string" name="overlay_notification_settings_disabled" id="0x7f120d0e" />
+    <public type="string" name="overlay_notification_settings_position" id="0x7f120d0f" />
+    <public type="string" name="overlay_notifications_bottom_left" id="0x7f120d10" />
+    <public type="string" name="overlay_notifications_bottom_right" id="0x7f120d11" />
+    <public type="string" name="overlay_notifications_disabled" id="0x7f120d12" />
+    <public type="string" name="overlay_notifications_settings" id="0x7f120d13" />
+    <public type="string" name="overlay_notifications_top_left" id="0x7f120d14" />
+    <public type="string" name="overlay_notifications_top_right" id="0x7f120d15" />
+    <public type="string" name="overlay_pin_label_tutorial" id="0x7f120d16" />
+    <public type="string" name="overlay_reload" id="0x7f120d17" />
+    <public type="string" name="overlay_reset_default_layout" id="0x7f120d18" />
+    <public type="string" name="overlay_settings" id="0x7f120d19" />
+    <public type="string" name="overlay_settings_general_tab" id="0x7f120d1a" />
+    <public type="string" name="overlay_settings_title" id="0x7f120d1b" />
+    <public type="string" name="overlay_settings_voice_tab" id="0x7f120d1c" />
+    <public type="string" name="overlay_text_notification_tip" id="0x7f120d1d" />
+    <public type="string" name="overlay_text_notification_tip_unlocked" id="0x7f120d1e" />
+    <public type="string" name="overlay_too_small" id="0x7f120d1f" />
+    <public type="string" name="overlay_unlock_to_answer" id="0x7f120d20" />
+    <public type="string" name="overlay_unlock_to_join" id="0x7f120d21" />
+    <public type="string" name="overlay_user_chat_hotkey" id="0x7f120d22" />
+    <public type="string" name="overlay_voice_channels_empty_state" id="0x7f120d23" />
+    <public type="string" name="overlay_widget_hide_in_game" id="0x7f120d24" />
+    <public type="string" name="overlay_widget_show_in_game" id="0x7f120d25" />
+    <public type="string" name="overview" id="0x7f120d26" />
+    <public type="string" name="overwrite_autocomplete_label" id="0x7f120d27" />
+    <public type="string" name="overwrite_autocomplete_placeholder" id="0x7f120d28" />
+    <public type="string" name="overwrite_no_role_to_add" id="0x7f120d29" />
+    <public type="string" name="pagination_next" id="0x7f120d2a" />
+    <public type="string" name="pagination_page_label" id="0x7f120d2b" />
+    <public type="string" name="pagination_page_of" id="0x7f120d2c" />
+    <public type="string" name="pagination_previous" id="0x7f120d2d" />
+    <public type="string" name="paginator_of_pages" id="0x7f120d2e" />
+    <public type="string" name="partial_outage" id="0x7f120d2f" />
+    <public type="string" name="partial_outage_a11y" id="0x7f120d30" />
+    <public type="string" name="participators" id="0x7f120d31" />
+    <public type="string" name="participators_compared_to_communicators" id="0x7f120d32" />
+    <public type="string" name="partner_badge_tooltip" id="0x7f120d33" />
+    <public type="string" name="party_full" id="0x7f120d34" />
+    <public type="string" name="party_join" id="0x7f120d35" />
+    <public type="string" name="party_joined" id="0x7f120d36" />
+    <public type="string" name="party_locked" id="0x7f120d37" />
+    <public type="string" name="password_length_error" id="0x7f120d38" />
+    <public type="string" name="password_manager" id="0x7f120d39" />
+    <public type="string" name="password_manager_info_android" id="0x7f120d3a" />
+    <public type="string" name="password_manager_open_settings" id="0x7f120d3b" />
+    <public type="string" name="password_manager_open_settings_error" id="0x7f120d3c" />
+    <public type="string" name="password_manager_use" id="0x7f120d3d" />
+    <public type="string" name="password_required" id="0x7f120d3e" />
+    <public type="string" name="password_toggle_content_description" id="0x7f120d3f" />
+    <public type="string" name="paste" id="0x7f120d40" />
+    <public type="string" name="paste_and_send" id="0x7f120d41" />
+    <public type="string" name="path_password_eye" id="0x7f120d42" />
+    <public type="string" name="path_password_eye_mask_strike_through" id="0x7f120d43" />
+    <public type="string" name="path_password_eye_mask_visible" id="0x7f120d44" />
+    <public type="string" name="path_password_strike_through" id="0x7f120d45" />
+    <public type="string" name="pause" id="0x7f120d46" />
+    <public type="string" name="payment_authentication_modal_button" id="0x7f120d47" />
+    <public type="string" name="payment_authentication_modal_button_cancel_payment" id="0x7f120d48" />
+    <public type="string" name="payment_authentication_modal_canceled" id="0x7f120d49" />
+    <public type="string" name="payment_authentication_modal_fail" id="0x7f120d4a" />
+    <public type="string" name="payment_authentication_modal_start" id="0x7f120d4b" />
+    <public type="string" name="payment_authentication_modal_success" id="0x7f120d4c" />
+    <public type="string" name="payment_authentication_modal_title" id="0x7f120d4d" />
+    <public type="string" name="payment_authentication_modal_title_canceled" id="0x7f120d4e" />
+    <public type="string" name="payment_authentication_modal_title_fail" id="0x7f120d4f" />
+    <public type="string" name="payment_authentication_modal_title_success" id="0x7f120d50" />
+    <public type="string" name="payment_modal_button_change_card" id="0x7f120d51" />
+    <public type="string" name="payment_modal_button_change_paypal" id="0x7f120d52" />
+    <public type="string" name="payment_modal_button_premium" id="0x7f120d53" />
+    <public type="string" name="payment_modal_button_premium_gift" id="0x7f120d54" />
+    <public type="string" name="payment_modal_one_month" id="0x7f120d55" />
+    <public type="string" name="payment_modal_one_year" id="0x7f120d56" />
+    <public type="string" name="payment_modal_per_month" id="0x7f120d57" />
+    <public type="string" name="payment_modal_per_year" id="0x7f120d58" />
+    <public type="string" name="payment_modal_subtitle" id="0x7f120d59" />
+    <public type="string" name="payment_modal_title_change_card" id="0x7f120d5a" />
+    <public type="string" name="payment_modal_title_change_paypal" id="0x7f120d5b" />
+    <public type="string" name="payment_modal_title_new_monthly" id="0x7f120d5c" />
+    <public type="string" name="payment_modal_title_new_yearly" id="0x7f120d5d" />
+    <public type="string" name="payment_price_change_body" id="0x7f120d5e" />
+    <public type="string" name="payment_price_change_title" id="0x7f120d5f" />
+    <public type="string" name="payment_source_billing_address" id="0x7f120d60" />
+    <public type="string" name="payment_source_card_ending" id="0x7f120d61" />
+    <public type="string" name="payment_source_card_ending_in" id="0x7f120d62" />
+    <public type="string" name="payment_source_card_expires" id="0x7f120d63" />
+    <public type="string" name="payment_source_card_number" id="0x7f120d64" />
+    <public type="string" name="payment_source_confirm_paypal_details" id="0x7f120d65" />
+    <public type="string" name="payment_source_credit_card" id="0x7f120d66" />
+    <public type="string" name="payment_source_delete" id="0x7f120d67" />
+    <public type="string" name="payment_source_delete_disabled_tooltip" id="0x7f120d68" />
+    <public type="string" name="payment_source_deleted" id="0x7f120d69" />
+    <public type="string" name="payment_source_edit_help_card" id="0x7f120d6a" />
+    <public type="string" name="payment_source_edit_help_paypal" id="0x7f120d6b" />
+    <public type="string" name="payment_source_edit_saved" id="0x7f120d6c" />
+    <public type="string" name="payment_source_edit_select_state" id="0x7f120d6d" />
+    <public type="string" name="payment_source_edit_title" id="0x7f120d6e" />
+    <public type="string" name="payment_source_expiration_date" id="0x7f120d6f" />
+    <public type="string" name="payment_source_expiration_date_placeholder" id="0x7f120d70" />
+    <public type="string" name="payment_source_information" id="0x7f120d71" />
+    <public type="string" name="payment_source_invalid" id="0x7f120d72" />
+    <public type="string" name="payment_source_invalid_help" id="0x7f120d73" />
+    <public type="string" name="payment_source_make_default" id="0x7f120d74" />
+    <public type="string" name="payment_source_name" id="0x7f120d75" />
+    <public type="string" name="payment_source_name_error_required" id="0x7f120d76" />
+    <public type="string" name="payment_source_name_placeholder" id="0x7f120d77" />
+    <public type="string" name="payment_source_payment_request_button_generic" id="0x7f120d78" />
+    <public type="string" name="payment_source_payment_request_button_gpay" id="0x7f120d79" />
+    <public type="string" name="payment_source_payment_request_info_creating" id="0x7f120d7a" />
+    <public type="string" name="payment_source_payment_request_info_loading" id="0x7f120d7b" />
+    <public type="string" name="payment_source_payment_request_info_title" id="0x7f120d7c" />
+    <public type="string" name="payment_source_payment_request_label" id="0x7f120d7d" />
+    <public type="string" name="payment_source_payment_request_unsupported" id="0x7f120d7e" />
+    <public type="string" name="payment_source_paypal" id="0x7f120d7f" />
+    <public type="string" name="payment_source_paypal_account" id="0x7f120d80" />
+    <public type="string" name="payment_source_paypal_details" id="0x7f120d81" />
+    <public type="string" name="payment_source_paypal_loading" id="0x7f120d82" />
+    <public type="string" name="payment_source_paypal_reopen" id="0x7f120d83" />
+    <public type="string" name="payment_source_security_code" id="0x7f120d84" />
+    <public type="string" name="payment_source_title" id="0x7f120d85" />
+    <public type="string" name="payment_source_type" id="0x7f120d86" />
+    <public type="string" name="payment_source_type_select" id="0x7f120d87" />
+    <public type="string" name="payment_sources_add" id="0x7f120d88" />
+    <public type="string" name="payment_steps_go_back" id="0x7f120d89" />
+    <public type="string" name="payment_waiting_for_authentication" id="0x7f120d8a" />
+    <public type="string" name="paypal_account_verifying" id="0x7f120d8b" />
+    <public type="string" name="paypal_callback_error" id="0x7f120d8c" />
+    <public type="string" name="paypal_callback_success" id="0x7f120d8d" />
+    <public type="string" name="pending" id="0x7f120d8e" />
+    <public type="string" name="percentage_since_last_week" id="0x7f120d8f" />
+    <public type="string" name="permission_camera_access_denied" id="0x7f120d90" />
+    <public type="string" name="permission_helpdesk" id="0x7f120d91" />
+    <public type="string" name="permission_media_denied" id="0x7f120d92" />
+    <public type="string" name="permission_media_download_denied" id="0x7f120d93" />
+    <public type="string" name="permission_microphone_denied" id="0x7f120d94" />
+    <public type="string" name="permission_override_allow" id="0x7f120d95" />
+    <public type="string" name="permission_override_deny" id="0x7f120d96" />
+    <public type="string" name="permission_override_passthrough" id="0x7f120d97" />
+    <public type="string" name="permission_overrides" id="0x7f120d98" />
+    <public type="string" name="permissions" id="0x7f120d99" />
+    <public type="string" name="permissions_unsynced" id="0x7f120d9a" />
+    <public type="string" name="permit_usage_android" id="0x7f120d9b" />
+    <public type="string" name="personalization_disable_modal_body" id="0x7f120d9c" />
+    <public type="string" name="personalization_disable_modal_cancel" id="0x7f120d9d" />
+    <public type="string" name="personalization_disable_modal_confirm" id="0x7f120d9e" />
+    <public type="string" name="personalization_disable_modal_title" id="0x7f120d9f" />
+    <public type="string" name="phone" id="0x7f120da0" />
+    <public type="string" name="pick_a_color" id="0x7f120da1" />
+    <public type="string" name="pin" id="0x7f120da2" />
+    <public type="string" name="pin_confirm" id="0x7f120da3" />
+    <public type="string" name="pin_message" id="0x7f120da4" />
+    <public type="string" name="pin_message_body" id="0x7f120da5" />
+    <public type="string" name="pin_message_body_mobile" id="0x7f120da6" />
+    <public type="string" name="pin_message_body_private_channel" id="0x7f120da7" />
+    <public type="string" name="pin_message_title" id="0x7f120da8" />
+    <public type="string" name="pin_message_too_many_body" id="0x7f120da9" />
+    <public type="string" name="pin_message_too_many_body_private_channel" id="0x7f120daa" />
+    <public type="string" name="pin_message_too_many_title" id="0x7f120dab" />
+    <public type="string" name="pinned_messages" id="0x7f120dac" />
+    <public type="string" name="pinned_messages_pro_tip" id="0x7f120dad" />
+    <public type="string" name="pinned_messages_pro_tip_body_channel" id="0x7f120dae" />
+    <public type="string" name="pinned_messages_pro_tip_body_dm" id="0x7f120daf" />
+    <public type="string" name="pinned_messages_pro_tip_body_group_dm" id="0x7f120db0" />
+    <public type="string" name="pins_disabled_nsfw" id="0x7f120db1" />
+    <public type="string" name="pl" id="0x7f120db2" />
+    <public type="string" name="platform_android" id="0x7f120db3" />
+    <public type="string" name="platform_android_version" id="0x7f120db4" />
+    <public type="string" name="platform_ios" id="0x7f120db5" />
+    <public type="string" name="platform_ios_version" id="0x7f120db6" />
+    <public type="string" name="platform_linux" id="0x7f120db7" />
+    <public type="string" name="platform_macos" id="0x7f120db8" />
+    <public type="string" name="platform_windows" id="0x7f120db9" />
+    <public type="string" name="play" id="0x7f120dba" />
+    <public type="string" name="play_full_video" id="0x7f120dbb" />
+    <public type="string" name="play_stream" id="0x7f120dbc" />
+    <public type="string" name="playing_game" id="0x7f120dbd" />
+    <public type="string" name="popout_player" id="0x7f120dbe" />
+    <public type="string" name="popout_player_opened" id="0x7f120dbf" />
+    <public type="string" name="popout_remove_from_top" id="0x7f120dc0" />
+    <public type="string" name="popout_return" id="0x7f120dc1" />
+    <public type="string" name="popout_stay_on_top" id="0x7f120dc2" />
+    <public type="string" name="post_code" id="0x7f120dc3" />
+    <public type="string" name="premium" id="0x7f120dc4" />
+    <public type="string" name="premium_activated" id="0x7f120dc5" />
+    <public type="string" name="premium_alert_error_title" id="0x7f120dc6" />
+    <public type="string" name="premium_badge_tooltip" id="0x7f120dc7" />
+    <public type="string" name="premium_cancel_cancel" id="0x7f120dc8" />
+    <public type="string" name="premium_cancel_cancel_mobile" id="0x7f120dc9" />
+    <public type="string" name="premium_cancel_confirm_body_tier_1" id="0x7f120dca" />
+    <public type="string" name="premium_cancel_confirm_body_tier_1_mobile_part_1" id="0x7f120dcb" />
+    <public type="string" name="premium_cancel_confirm_body_tier_1_mobile_part_2" id="0x7f120dcc" />
+    <public type="string" name="premium_cancel_confirm_body_tier_2" id="0x7f120dcd" />
+    <public type="string" name="premium_cancel_confirm_body_tier_2_mobile_part_1" id="0x7f120dce" />
+    <public type="string" name="premium_cancel_confirm_body_tier_2_mobile_part_2" id="0x7f120dcf" />
+    <public type="string" name="premium_cancel_confirm_mobile" id="0x7f120dd0" />
+    <public type="string" name="premium_cancel_confirm_new" id="0x7f120dd1" />
+    <public type="string" name="premium_cancel_confirm_title" id="0x7f120dd2" />
+    <public type="string" name="premium_cancel_failed_body" id="0x7f120dd3" />
+    <public type="string" name="premium_canceled" id="0x7f120dd4" />
+    <public type="string" name="premium_cant_upgrade_confirm" id="0x7f120dd5" />
+    <public type="string" name="premium_change_discriminator_length_error" id="0x7f120dd6" />
+    <public type="string" name="premium_change_discriminator_modal_body" id="0x7f120dd7" />
+    <public type="string" name="premium_change_discriminator_modal_confirm" id="0x7f120dd8" />
+    <public type="string" name="premium_change_discriminator_modal_header" id="0x7f120dd9" />
+    <public type="string" name="premium_change_discriminator_tooltip" id="0x7f120dda" />
+    <public type="string" name="premium_change_discriminator_zero_error" id="0x7f120ddb" />
+    <public type="string" name="premium_chat_perks_animated_avatar_and_emoji_mobile" id="0x7f120ddc" />
+    <public type="string" name="premium_chat_perks_custom_emoji_mobile" id="0x7f120ddd" />
+    <public type="string" name="premium_chat_perks_description_animated_avatar_and_emoji" id="0x7f120dde" />
+    <public type="string" name="premium_chat_perks_description_badge" id="0x7f120ddf" />
+    <public type="string" name="premium_chat_perks_description_custom_emoji" id="0x7f120de0" />
+    <public type="string" name="premium_chat_perks_description_discriminator" id="0x7f120de1" />
+    <public type="string" name="premium_chat_perks_description_screenshare" id="0x7f120de2" />
+    <public type="string" name="premium_chat_perks_description_streaming" id="0x7f120de3" />
+    <public type="string" name="premium_chat_perks_description_upload_limit" id="0x7f120de4" />
+    <public type="string" name="premium_chat_perks_discriminator_mobile" id="0x7f120de5" />
+    <public type="string" name="premium_chat_perks_premium_guild_subscription" id="0x7f120de6" />
+    <public type="string" name="premium_chat_perks_rep_mobile" id="0x7f120de7" />
+    <public type="string" name="premium_chat_perks_screenshare_mobile" id="0x7f120de8" />
+    <public type="string" name="premium_chat_perks_simple_title" id="0x7f120de9" />
+    <public type="string" name="premium_chat_perks_streaming_mobile" id="0x7f120dea" />
+    <public type="string" name="premium_chat_perks_title_animated_avatar_and_emoji" id="0x7f120deb" />
+    <public type="string" name="premium_chat_perks_title_badge" id="0x7f120dec" />
+    <public type="string" name="premium_chat_perks_title_custom_emoji" id="0x7f120ded" />
+    <public type="string" name="premium_chat_perks_title_discriminator" id="0x7f120dee" />
+    <public type="string" name="premium_chat_perks_title_screenshare" id="0x7f120def" />
+    <public type="string" name="premium_chat_perks_title_streaming" id="0x7f120df0" />
+    <public type="string" name="premium_chat_perks_title_upload_limit" id="0x7f120df1" />
+    <public type="string" name="premium_classic_payment_gift_blurb_mobile" id="0x7f120df2" />
+    <public type="string" name="premium_code_active_until" id="0x7f120df3" />
+    <public type="string" name="premium_code_redemption_confirmation_blurb" id="0x7f120df4" />
+    <public type="string" name="premium_code_redemption_confirmation_button" id="0x7f120df5" />
+    <public type="string" name="premium_expiring_body_boosting" id="0x7f120df6" />
+    <public type="string" name="premium_expiring_body_control" id="0x7f120df7" />
+    <public type="string" name="premium_expiring_body_custom_tag" id="0x7f120df8" />
+    <public type="string" name="premium_expiring_body_emoji" id="0x7f120df9" />
+    <public type="string" name="premium_expiring_body_generic" id="0x7f120dfa" />
+    <public type="string" name="premium_expiring_callout" id="0x7f120dfb" />
+    <public type="string" name="premium_expiring_go_to_settings" id="0x7f120dfc" />
+    <public type="string" name="premium_expiring_title" id="0x7f120dfd" />
+    <public type="string" name="premium_features_chat_perks" id="0x7f120dfe" />
+    <public type="string" name="premium_features_chat_perks_header" id="0x7f120dff" />
+    <public type="string" name="premium_features_enhanced_chat_perks" id="0x7f120e00" />
+    <public type="string" name="premium_features_premium_guild_subscriptions" id="0x7f120e01" />
+    <public type="string" name="premium_game" id="0x7f120e02" />
+    <public type="string" name="premium_gift_button_label" id="0x7f120e03" />
+    <public type="string" name="premium_gift_button_tooltip" id="0x7f120e04" />
+    <public type="string" name="premium_gift_send" id="0x7f120e05" />
+    <public type="string" name="premium_gift_share_link_ios" id="0x7f120e06" />
+    <public type="string" name="premium_gifting_title" id="0x7f120e07" />
+    <public type="string" name="premium_gifting_title_mobile" id="0x7f120e08" />
+    <public type="string" name="premium_grandfathered_monthly" id="0x7f120e09" />
+    <public type="string" name="premium_grandfathered_warning" id="0x7f120e0a" />
+    <public type="string" name="premium_grandfathered_warning_confirm" id="0x7f120e0b" />
+    <public type="string" name="premium_grandfathered_warning_mobile" id="0x7f120e0c" />
+    <public type="string" name="premium_grandfathered_warning_title" id="0x7f120e0d" />
+    <public type="string" name="premium_grandfathered_yearly" id="0x7f120e0e" />
+    <public type="string" name="premium_guild_cooldown_available_countdown" id="0x7f120e0f" />
+    <public type="string" name="premium_guild_features_blurb" id="0x7f120e10" />
+    <public type="string" name="premium_guild_features_customize_guild_description" id="0x7f120e11" />
+    <public type="string" name="premium_guild_features_customize_guild_mobile" id="0x7f120e12" />
+    <public type="string" name="premium_guild_features_customize_guild_title" id="0x7f120e13" />
+    <public type="string" name="premium_guild_features_learn_more_button" id="0x7f120e14" />
+    <public type="string" name="premium_guild_features_learn_more_text" id="0x7f120e15" />
+    <public type="string" name="premium_guild_features_more" id="0x7f120e16" />
+    <public type="string" name="premium_guild_features_new_role_description" id="0x7f120e17" />
+    <public type="string" name="premium_guild_features_new_role_mobile" id="0x7f120e18" />
+    <public type="string" name="premium_guild_features_new_role_title" id="0x7f120e19" />
+    <public type="string" name="premium_guild_features_show_support_description" id="0x7f120e1a" />
+    <public type="string" name="premium_guild_features_show_support_mobile" id="0x7f120e1b" />
+    <public type="string" name="premium_guild_features_show_support_title" id="0x7f120e1c" />
+    <public type="string" name="premium_guild_features_title" id="0x7f120e1d" />
+    <public type="string" name="premium_guild_features_upload_sizes_description" id="0x7f120e1e" />
+    <public type="string" name="premium_guild_features_upload_sizes_mobile" id="0x7f120e1f" />
+    <public type="string" name="premium_guild_features_upload_sizes_title" id="0x7f120e20" />
+    <public type="string" name="premium_guild_features_upsell_banner_subscribe" id="0x7f120e21" />
+    <public type="string" name="premium_guild_features_upsell_banner_upgrade" id="0x7f120e22" />
+    <public type="string" name="premium_guild_header_badge_no_subscribers" id="0x7f120e23" />
+    <public type="string" name="premium_guild_header_badge_no_tier" id="0x7f120e24" />
+    <public type="string" name="premium_guild_header_dropdown_nitro_server_subscribe" id="0x7f120e25" />
+    <public type="string" name="premium_guild_perks_modal_base_perks" id="0x7f120e26" />
+    <public type="string" name="premium_guild_perks_modal_blurb" id="0x7f120e27" />
+    <public type="string" name="premium_guild_perks_modal_blurb_mobile_1" id="0x7f120e28" />
+    <public type="string" name="premium_guild_perks_modal_blurb_mobile_2" id="0x7f120e29" />
+    <public type="string" name="premium_guild_perks_modal_button_get_premium" id="0x7f120e2a" />
+    <public type="string" name="premium_guild_perks_modal_button_subscribe_this_server" id="0x7f120e2b" />
+    <public type="string" name="premium_guild_perks_modal_button_upgrade_to_premium" id="0x7f120e2c" />
+    <public type="string" name="premium_guild_perks_modal_button_upgrade_to_premium_ios_error" id="0x7f120e2d" />
+    <public type="string" name="premium_guild_perks_modal_button_upgrade_to_premium_tooltip" id="0x7f120e2e" />
+    <public type="string" name="premium_guild_perks_modal_header" id="0x7f120e2f" />
+    <public type="string" name="premium_guild_perks_modal_header_boost_count" id="0x7f120e30" />
+    <public type="string" name="premium_guild_perks_modal_level_subscriber_count_tooltip" id="0x7f120e31" />
+    <public type="string" name="premium_guild_perks_modal_manage_your_subscription" id="0x7f120e32" />
+    <public type="string" name="premium_guild_perks_modal_no_tiers" id="0x7f120e33" />
+    <public type="string" name="premium_guild_perks_modal_previous_perks" id="0x7f120e34" />
+    <public type="string" name="premium_guild_perks_modal_tier_zero_surpassed" id="0x7f120e35" />
+    <public type="string" name="premium_guild_perks_modal_tooltip_already_subscribed_this_server" id="0x7f120e36" />
+    <public type="string" name="premium_guild_perks_modal_tooltip_already_used_subscription" id="0x7f120e37" />
+    <public type="string" name="premium_guild_perks_modal_tooltip_cooldown" id="0x7f120e38" />
+    <public type="string" name="premium_guild_perks_modal_tooltip_gift" id="0x7f120e39" />
+    <public type="string" name="premium_guild_settings_members_subscribed" id="0x7f120e3a" />
+    <public type="string" name="premium_guild_settings_members_subscribed_needed" id="0x7f120e3b" />
+    <public type="string" name="premium_guild_settings_x_of_y_subscriptions" id="0x7f120e3c" />
+    <public type="string" name="premium_guild_subscribe_confirm_blurb" id="0x7f120e3d" />
+    <public type="string" name="premium_guild_subscribe_confirm_confirmation" id="0x7f120e3e" />
+    <public type="string" name="premium_guild_subscribe_confirm_confirmation_label" id="0x7f120e3f" />
+    <public type="string" name="premium_guild_subscribe_confirm_cooldown_warning" id="0x7f120e40" />
+    <public type="string" name="premium_guild_subscribe_confirm_header" id="0x7f120e41" />
+    <public type="string" name="premium_guild_subscribe_search_guild_placeholder" id="0x7f120e42" />
+    <public type="string" name="premium_guild_subscribe_select_guild_header" id="0x7f120e43" />
+    <public type="string" name="premium_guild_subscribe_success_thanks" id="0x7f120e44" />
+    <public type="string" name="premium_guild_subscription_available_count" id="0x7f120e45" />
+    <public type="string" name="premium_guild_subscription_duration" id="0x7f120e46" />
+    <public type="string" name="premium_guild_subscription_error_mobile" id="0x7f120e47" />
+    <public type="string" name="premium_guild_subscription_error_rate_limit_days" id="0x7f120e48" />
+    <public type="string" name="premium_guild_subscription_error_rate_limit_hours" id="0x7f120e49" />
+    <public type="string" name="premium_guild_subscription_error_rate_limit_minutes" id="0x7f120e4a" />
+    <public type="string" name="premium_guild_subscription_no_next_tier" id="0x7f120e4b" />
+    <public type="string" name="premium_guild_subscription_notice" id="0x7f120e4c" />
+    <public type="string" name="premium_guild_subscription_notice_button" id="0x7f120e4d" />
+    <public type="string" name="premium_guild_subscription_notice_small_guild" id="0x7f120e4e" />
+    <public type="string" name="premium_guild_subscription_remove_button" id="0x7f120e4f" />
+    <public type="string" name="premium_guild_subscription_remove_error_mobile" id="0x7f120e50" />
+    <public type="string" name="premium_guild_subscription_select_server_button" id="0x7f120e51" />
+    <public type="string" name="premium_guild_subscription_subscriber_count_tooltip" id="0x7f120e52" />
+    <public type="string" name="premium_guild_subscription_subtitle" id="0x7f120e53" />
+    <public type="string" name="premium_guild_subscription_subtitle_mobile_1" id="0x7f120e54" />
+    <public type="string" name="premium_guild_subscription_subtitle_mobile_2" id="0x7f120e55" />
+    <public type="string" name="premium_guild_subscription_title" id="0x7f120e56" />
+    <public type="string" name="premium_guild_subscription_tooltip" id="0x7f120e57" />
+    <public type="string" name="premium_guild_tier_1" id="0x7f120e58" />
+    <public type="string" name="premium_guild_tier_2" id="0x7f120e59" />
+    <public type="string" name="premium_guild_tier_3" id="0x7f120e5a" />
+    <public type="string" name="premium_guild_unsubscribe_confirm_blurb" id="0x7f120e5b" />
+    <public type="string" name="premium_guild_unsubscribe_confirm_confirmation" id="0x7f120e5c" />
+    <public type="string" name="premium_guild_unsubscribe_confirm_cooldown_warning" id="0x7f120e5d" />
+    <public type="string" name="premium_guild_unsubscribe_confirm_cooldown_warning_days" id="0x7f120e5e" />
+    <public type="string" name="premium_guild_unsubscribe_confirm_cooldown_warning_hours" id="0x7f120e5f" />
+    <public type="string" name="premium_guild_unsubscribe_confirm_cooldown_warning_minutes" id="0x7f120e60" />
+    <public type="string" name="premium_guild_unsubscribe_confirm_header" id="0x7f120e61" />
+    <public type="string" name="premium_included" id="0x7f120e62" />
+    <public type="string" name="premium_info_monthly" id="0x7f120e63" />
+    <public type="string" name="premium_info_yearly" id="0x7f120e64" />
+    <public type="string" name="premium_month_subscription" id="0x7f120e65" />
+    <public type="string" name="premium_not_claimed" id="0x7f120e66" />
+    <public type="string" name="premium_not_claimed_body" id="0x7f120e67" />
+    <public type="string" name="premium_not_verified" id="0x7f120e68" />
+    <public type="string" name="premium_not_verified_body" id="0x7f120e69" />
+    <public type="string" name="premium_past_due" id="0x7f120e6a" />
+    <public type="string" name="premium_payment_confirmation_blurb_iap" id="0x7f120e6b" />
+    <public type="string" name="premium_payment_confirmation_blurb_regular" id="0x7f120e6c" />
+    <public type="string" name="premium_payment_confirmation_button_iap" id="0x7f120e6d" />
+    <public type="string" name="premium_payment_confirmation_button_regular" id="0x7f120e6e" />
+    <public type="string" name="premium_payment_gift_blurb" id="0x7f120e6f" />
+    <public type="string" name="premium_payment_gift_blurb_mobile" id="0x7f120e70" />
+    <public type="string" name="premium_payment_gift_subtext" id="0x7f120e71" />
+    <public type="string" name="premium_payment_is_gift" id="0x7f120e72" />
+    <public type="string" name="premium_payment_plan_label_monthly" id="0x7f120e73" />
+    <public type="string" name="premium_payment_plan_label_yearly" id="0x7f120e74" />
+    <public type="string" name="premium_payment_select" id="0x7f120e75" />
+    <public type="string" name="premium_payment_start_trial" id="0x7f120e76" />
+    <public type="string" name="premium_payment_trial_blurb" id="0x7f120e77" />
+    <public type="string" name="premium_payment_trial_note" id="0x7f120e78" />
+    <public type="string" name="premium_payment_trial_two_weeks_free" id="0x7f120e79" />
+    <public type="string" name="premium_plan_month" id="0x7f120e7a" />
+    <public type="string" name="premium_plan_month_tier_1" id="0x7f120e7b" />
+    <public type="string" name="premium_plan_month_tier_2" id="0x7f120e7c" />
+    <public type="string" name="premium_plan_year" id="0x7f120e7d" />
+    <public type="string" name="premium_plan_year_tier_1" id="0x7f120e7e" />
+    <public type="string" name="premium_plan_year_tier_2" id="0x7f120e7f" />
+    <public type="string" name="premium_promo_autocomplete" id="0x7f120e80" />
+    <public type="string" name="premium_promo_description" id="0x7f120e81" />
+    <public type="string" name="premium_promo_title" id="0x7f120e82" />
+    <public type="string" name="premium_required" id="0x7f120e83" />
+    <public type="string" name="premium_required_get_nitro" id="0x7f120e84" />
+    <public type="string" name="premium_restore_subscription_ios" id="0x7f120e85" />
+    <public type="string" name="premium_retention_emoji_picker_description" id="0x7f120e86" />
+    <public type="string" name="premium_retention_emoji_picker_update_payment_information" id="0x7f120e87" />
+    <public type="string" name="premium_settings" id="0x7f120e88" />
+    <public type="string" name="premium_settings_get" id="0x7f120e89" />
+    <public type="string" name="premium_settings_manage" id="0x7f120e8a" />
+    <public type="string" name="premium_subscription_credit" id="0x7f120e8b" />
+    <public type="string" name="premium_subscription_credit_applied_mismatched_plan" id="0x7f120e8c" />
+    <public type="string" name="premium_subscription_credit_applied_on" id="0x7f120e8d" />
+    <public type="string" name="premium_subscription_credit_count_months" id="0x7f120e8e" />
+    <public type="string" name="premium_subscription_policy_hint_ios" id="0x7f120e8f" />
+    <public type="string" name="premium_subscription_policy_ios" id="0x7f120e90" />
+    <public type="string" name="premium_subscription_required_body" id="0x7f120e91" />
+    <public type="string" name="premium_subtitle" id="0x7f120e92" />
+    <public type="string" name="premium_tier_1" id="0x7f120e93" />
+    <public type="string" name="premium_tier_2" id="0x7f120e94" />
+    <public type="string" name="premium_tier_2_subtitle" id="0x7f120e95" />
+    <public type="string" name="premium_tier_2_title" id="0x7f120e96" />
+    <public type="string" name="premium_title" id="0x7f120e97" />
+    <public type="string" name="premium_trial_button" id="0x7f120e98" />
+    <public type="string" name="premium_upgrade_cancel" id="0x7f120e99" />
+    <public type="string" name="premium_upgrade_confirm_body_detailed_month_year" id="0x7f120e9a" />
+    <public type="string" name="premium_upgrade_confirm_body_detailed_month_year_verbose" id="0x7f120e9b" />
+    <public type="string" name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_month" id="0x7f120e9c" />
+    <public type="string" name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_month_verbose" id="0x7f120e9d" />
+    <public type="string" name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_year" id="0x7f120e9e" />
+    <public type="string" name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_year_verbose" id="0x7f120e9f" />
+    <public type="string" name="premium_upgrade_confirm_body_detailed_tier_1_year_tier_2_year" id="0x7f120ea0" />
+    <public type="string" name="premium_upgrade_confirm_body_detailed_tier_1_year_tier_2_year_verbose" id="0x7f120ea1" />
+    <public type="string" name="premium_upgrade_confirm_button" id="0x7f120ea2" />
+    <public type="string" name="premium_upgrade_confirm_button_with_price" id="0x7f120ea3" />
+    <public type="string" name="premium_upgrade_confirm_title" id="0x7f120ea4" />
+    <public type="string" name="premium_upgrade_disabled_already_premium" id="0x7f120ea5" />
+    <public type="string" name="premium_upgrade_disabled_current_tooltip" id="0x7f120ea6" />
+    <public type="string" name="premium_upgrade_disabled_in_trial" id="0x7f120ea7" />
+    <public type="string" name="premium_upgrade_disabled_lower_tier_tooltip" id="0x7f120ea8" />
+    <public type="string" name="premium_upgrade_disabled_title_mobile" id="0x7f120ea9" />
+    <public type="string" name="premium_upgrade_done_body_tier_1" id="0x7f120eaa" />
+    <public type="string" name="premium_upgrade_done_body_tier_2_guild_subscribe" id="0x7f120eab" />
+    <public type="string" name="premium_upgrade_done_button_tier_1" id="0x7f120eac" />
+    <public type="string" name="premium_upgrade_failed_body" id="0x7f120ead" />
+    <public type="string" name="premium_upgrade_required_body" id="0x7f120eae" />
+    <public type="string" name="premium_upload_promo" id="0x7f120eaf" />
+    <public type="string" name="premium_upsell_animated_avatar_active_mobile" id="0x7f120eb0" />
+    <public type="string" name="premium_upsell_animated_avatar_description_mobile" id="0x7f120eb1" />
+    <public type="string" name="premium_upsell_animated_avatar_passive_mobile" id="0x7f120eb2" />
+    <public type="string" name="premium_upsell_animated_emojis_active_mobile" id="0x7f120eb3" />
+    <public type="string" name="premium_upsell_animated_emojis_description_mobile" id="0x7f120eb4" />
+    <public type="string" name="premium_upsell_animated_emojis_passive_mobile" id="0x7f120eb5" />
+    <public type="string" name="premium_upsell_badge_active_mobile" id="0x7f120eb6" />
+    <public type="string" name="premium_upsell_badge_description_mobile" id="0x7f120eb7" />
+    <public type="string" name="premium_upsell_badge_passive_mobile" id="0x7f120eb8" />
+    <public type="string" name="premium_upsell_emoji_active_mobile" id="0x7f120eb9" />
+    <public type="string" name="premium_upsell_emoji_description_mobile" id="0x7f120eba" />
+    <public type="string" name="premium_upsell_emoji_passive_mobile" id="0x7f120ebb" />
+    <public type="string" name="premium_upsell_tag_active_mobile" id="0x7f120ebc" />
+    <public type="string" name="premium_upsell_tag_description_mobile" id="0x7f120ebd" />
+    <public type="string" name="premium_upsell_tag_passive_mobile" id="0x7f120ebe" />
+    <public type="string" name="premium_upsell_upload_active_mobile" id="0x7f120ebf" />
+    <public type="string" name="premium_upsell_upload_description_mobile" id="0x7f120ec0" />
+    <public type="string" name="premium_upsell_upload_passive_mobile" id="0x7f120ec1" />
+    <public type="string" name="premium_year_free_months" id="0x7f120ec2" />
+    <public type="string" name="premium_year_subscription" id="0x7f120ec3" />
+    <public type="string" name="preorder_sku_name" id="0x7f120ec4" />
+    <public type="string" name="preview_chat" id="0x7f120ec5" />
+    <public type="string" name="priority_speaker" id="0x7f120ec6" />
+    <public type="string" name="priority_speaker_description" id="0x7f120ec7" />
+    <public type="string" name="priority_speaker_description_app" id="0x7f120ec8" />
+    <public type="string" name="privacy_and_safety" id="0x7f120ec9" />
+    <public type="string" name="privacy_policy" id="0x7f120eca" />
+    <public type="string" name="privacy_policy_url" id="0x7f120ecb" />
+    <public type="string" name="privacy_settings" id="0x7f120ecc" />
+    <public type="string" name="private_category" id="0x7f120ecd" />
+    <public type="string" name="private_category_note" id="0x7f120ece" />
+    <public type="string" name="private_channel" id="0x7f120ecf" />
+    <public type="string" name="private_channel_note" id="0x7f120ed0" />
+    <public type="string" name="profile" id="0x7f120ed1" />
+    <public type="string" name="project_id" id="0x7f120ed2" />
+    <public type="string" name="prune" id="0x7f120ed3" />
+    <public type="string" name="prune_members" id="0x7f120ed4" />
+    <public type="string" name="pt_br" id="0x7f120ed5" />
+    <public type="string" name="ptt_limited_body" id="0x7f120ed6" />
+    <public type="string" name="ptt_limited_title" id="0x7f120ed7" />
+    <public type="string" name="ptt_limited_warning" id="0x7f120ed8" />
+    <public type="string" name="ptt_permission_body" id="0x7f120ed9" />
+    <public type="string" name="ptt_permission_title" id="0x7f120eda" />
+    <public type="string" name="public_guild_survey_modal_body" id="0x7f120edb" />
+    <public type="string" name="public_guild_survey_modal_header" id="0x7f120edc" />
+    <public type="string" name="publish_followed_news_body" id="0x7f120edd" />
+    <public type="string" name="publish_followed_news_body_reach" id="0x7f120ede" />
+    <public type="string" name="publish_followed_news_body_settings" id="0x7f120edf" />
+    <public type="string" name="publish_followed_news_body_stats" id="0x7f120ee0" />
+    <public type="string" name="publish_followed_news_fail_body" id="0x7f120ee1" />
+    <public type="string" name="publish_followed_news_fail_title" id="0x7f120ee2" />
+    <public type="string" name="publish_followed_news_generic_body" id="0x7f120ee3" />
+    <public type="string" name="purple" id="0x7f120ee4" />
+    <public type="string" name="quality_indicator" id="0x7f120ee5" />
+    <public type="string" name="quick_dm_blocked" id="0x7f120ee6" />
+    <public type="string" name="quick_dm_user" id="0x7f120ee7" />
+    <public type="string" name="quick_launcher_empty_text" id="0x7f120ee8" />
+    <public type="string" name="quick_launcher_empty_text_v2" id="0x7f120ee9" />
+    <public type="string" name="quick_launcher_header" id="0x7f120eea" />
+    <public type="string" name="quick_switcher" id="0x7f120eeb" />
+    <public type="string" name="quickswitcher_drafts" id="0x7f120eec" />
+    <public type="string" name="quickswitcher_empty_cta" id="0x7f120eed" />
+    <public type="string" name="quickswitcher_empty_text" id="0x7f120eee" />
+    <public type="string" name="quickswitcher_last_channel" id="0x7f120eef" />
+    <public type="string" name="quickswitcher_mentions" id="0x7f120ef0" />
+    <public type="string" name="quickswitcher_notice" id="0x7f120ef1" />
+    <public type="string" name="quickswitcher_placeholder" id="0x7f120ef2" />
+    <public type="string" name="quickswitcher_querymode_applications" id="0x7f120ef3" />
+    <public type="string" name="quickswitcher_querymode_guilds" id="0x7f120ef4" />
+    <public type="string" name="quickswitcher_querymode_text_channels" id="0x7f120ef5" />
+    <public type="string" name="quickswitcher_querymode_users" id="0x7f120ef6" />
+    <public type="string" name="quickswitcher_querymode_users_in_guild" id="0x7f120ef7" />
+    <public type="string" name="quickswitcher_querymode_voice_channels" id="0x7f120ef8" />
+    <public type="string" name="quickswitcher_tip_nav" id="0x7f120ef9" />
+    <public type="string" name="quickswitcher_tip_select" id="0x7f120efa" />
+    <public type="string" name="quickswitcher_tutorial_message_search" id="0x7f120efb" />
+    <public type="string" name="quickswitcher_tutorial_message_select" id="0x7f120efc" />
+    <public type="string" name="quickswitcher_unread_channels" id="0x7f120efd" />
+    <public type="string" name="quote_attribution" id="0x7f120efe" />
+    <public type="string" name="quote_attribution_facebook" id="0x7f120eff" />
+    <public type="string" name="quote_attribution_instagram" id="0x7f120f00" />
+    <public type="string" name="rate_limited" id="0x7f120f01" />
+    <public type="string" name="rate_limited_retry_after" id="0x7f120f02" />
+    <public type="string" name="rating_request_body_android" id="0x7f120f03" />
+    <public type="string" name="rating_request_title" id="0x7f120f04" />
+    <public type="string" name="reaction_tooltip_1" id="0x7f120f05" />
+    <public type="string" name="reaction_tooltip_1_n" id="0x7f120f06" />
+    <public type="string" name="reaction_tooltip_2" id="0x7f120f07" />
+    <public type="string" name="reaction_tooltip_2_n" id="0x7f120f08" />
+    <public type="string" name="reaction_tooltip_3" id="0x7f120f09" />
+    <public type="string" name="reaction_tooltip_3_n" id="0x7f120f0a" />
+    <public type="string" name="reaction_tooltip_n" id="0x7f120f0b" />
+    <public type="string" name="reactions" id="0x7f120f0c" />
+    <public type="string" name="reactions_matching" id="0x7f120f0d" />
+    <public type="string" name="read_message_history" id="0x7f120f0e" />
+    <public type="string" name="read_messages" id="0x7f120f0f" />
+    <public type="string" name="read_messages_view_channels" id="0x7f120f10" />
+    <public type="string" name="read_only_channel" id="0x7f120f11" />
+    <public type="string" name="ready" id="0x7f120f12" />
+    <public type="string" name="recent_mentions" id="0x7f120f13" />
+    <public type="string" name="recent_mentions_direct_only" id="0x7f120f14" />
+    <public type="string" name="recent_mentions_everyone_and_direct" id="0x7f120f15" />
+    <public type="string" name="recent_mentions_filter_everyone" id="0x7f120f16" />
+    <public type="string" name="recent_mentions_filter_explain_everything" id="0x7f120f17" />
+    <public type="string" name="recent_mentions_filter_label" id="0x7f120f18" />
+    <public type="string" name="recent_mentions_filter_roles" id="0x7f120f19" />
+    <public type="string" name="recent_mentions_pro_tip" id="0x7f120f1a" />
+    <public type="string" name="recent_mentions_roles_and_direct" id="0x7f120f1b" />
+    <public type="string" name="reconnect" id="0x7f120f1c" />
+    <public type="string" name="reconnecting" id="0x7f120f1d" />
+    <public type="string" name="refund" id="0x7f120f1e" />
+    <public type="string" name="region" id="0x7f120f1f" />
+    <public type="string" name="region_select_footer" id="0x7f120f20" />
+    <public type="string" name="region_select_header" id="0x7f120f21" />
+    <public type="string" name="register" id="0x7f120f22" />
+    <public type="string" name="register_account" id="0x7f120f23" />
+    <public type="string" name="register_body" id="0x7f120f24" />
+    <public type="string" name="register_title" id="0x7f120f25" />
+    <public type="string" name="remaining_participants" id="0x7f120f26" />
+    <public type="string" name="remove" id="0x7f120f27" />
+    <public type="string" name="remove_all_reactions" id="0x7f120f28" />
+    <public type="string" name="remove_all_reactions_confirm_body" id="0x7f120f29" />
+    <public type="string" name="remove_all_reactions_confirm_title" id="0x7f120f2a" />
+    <public type="string" name="remove_friend" id="0x7f120f2b" />
+    <public type="string" name="remove_friend_body" id="0x7f120f2c" />
+    <public type="string" name="remove_friend_title" id="0x7f120f2d" />
+    <public type="string" name="remove_from_group" id="0x7f120f2e" />
+    <public type="string" name="remove_icon" id="0x7f120f2f" />
+    <public type="string" name="remove_keybind" id="0x7f120f30" />
+    <public type="string" name="remove_reaction" id="0x7f120f31" />
+    <public type="string" name="remove_role_or_user" id="0x7f120f32" />
+    <public type="string" name="remove_synced_role" id="0x7f120f33" />
+    <public type="string" name="remove_vanity_url" id="0x7f120f34" />
+    <public type="string" name="render_embeds" id="0x7f120f35" />
+    <public type="string" name="render_embeds_label" id="0x7f120f36" />
+    <public type="string" name="render_reactions" id="0x7f120f37" />
+    <public type="string" name="report" id="0x7f120f38" />
+    <public type="string" name="report_message" id="0x7f120f39" />
+    <public type="string" name="report_server" id="0x7f120f3a" />
+    <public type="string" name="report_title" id="0x7f120f3b" />
+    <public type="string" name="report_user" id="0x7f120f3c" />
+    <public type="string" name="reported" id="0x7f120f3d" />
+    <public type="string" name="request_permission_msg" id="0x7f120f3e" />
+    <public type="string" name="resend" id="0x7f120f3f" />
+    <public type="string" name="resend_code" id="0x7f120f40" />
+    <public type="string" name="resend_email" id="0x7f120f41" />
+    <public type="string" name="resend_message" id="0x7f120f42" />
+    <public type="string" name="resend_verification_email" id="0x7f120f43" />
+    <public type="string" name="reset" id="0x7f120f44" />
+    <public type="string" name="reset_nickname" id="0x7f120f45" />
+    <public type="string" name="reset_notification_override" id="0x7f120f46" />
+    <public type="string" name="reset_notification_settings" id="0x7f120f47" />
+    <public type="string" name="reset_password_title" id="0x7f120f48" />
+    <public type="string" name="reset_to_default" id="0x7f120f49" />
+    <public type="string" name="reset_voice_settings" id="0x7f120f4a" />
+    <public type="string" name="reset_voice_settings_body" id="0x7f120f4b" />
+    <public type="string" name="resubscribe" id="0x7f120f4c" />
+    <public type="string" name="retry" id="0x7f120f4d" />
+    <public type="string" name="return_to_login" id="0x7f120f4e" />
+    <public type="string" name="reversed" id="0x7f120f4f" />
+    <public type="string" name="revoke" id="0x7f120f50" />
+    <public type="string" name="revoke_ban" id="0x7f120f51" />
+    <public type="string" name="ring" id="0x7f120f52" />
+    <public type="string" name="ro" id="0x7f120f53" />
+    <public type="string" name="role_order_updated" id="0x7f120f54" />
+    <public type="string" name="roles" id="0x7f120f55" />
+    <public type="string" name="roles_list" id="0x7f120f56" />
+    <public type="string" name="rtc_connection" id="0x7f120f57" />
+    <public type="string" name="rtc_connection_info" id="0x7f120f58" />
+    <public type="string" name="rtc_connection_state_authenticating" id="0x7f120f59" />
+    <public type="string" name="rtc_connection_state_awaiting_endpoint" id="0x7f120f5a" />
+    <public type="string" name="rtc_connection_state_connecting" id="0x7f120f5b" />
+    <public type="string" name="rtc_connection_state_disconnected" id="0x7f120f5c" />
+    <public type="string" name="rtc_connection_state_ice_checking" id="0x7f120f5d" />
+    <public type="string" name="rtc_connection_state_no_route" id="0x7f120f5e" />
+    <public type="string" name="rtc_connection_state_rtc_connected" id="0x7f120f5f" />
+    <public type="string" name="rtc_connection_state_rtc_connected_loss_rate" id="0x7f120f60" />
+    <public type="string" name="rtc_connection_state_rtc_connecting" id="0x7f120f61" />
+    <public type="string" name="rtc_debug_context" id="0x7f120f62" />
+    <public type="string" name="rtc_debug_open" id="0x7f120f63" />
+    <public type="string" name="rtc_debug_rtp_inbound" id="0x7f120f64" />
+    <public type="string" name="rtc_debug_rtp_outbound" id="0x7f120f65" />
+    <public type="string" name="rtc_debug_screenshare" id="0x7f120f66" />
+    <public type="string" name="rtc_debug_transport" id="0x7f120f67" />
+    <public type="string" name="rtc_debug_users" id="0x7f120f68" />
+    <public type="string" name="ru" id="0x7f120f69" />
+    <public type="string" name="salmon" id="0x7f120f6a" />
+    <public type="string" name="sample_channel_message" id="0x7f120f6b" />
+    <public type="string" name="sample_channel_name" id="0x7f120f6c" />
+    <public type="string" name="sample_channel_name_short" id="0x7f120f6d" />
+    <public type="string" name="sample_channel_search_filter" id="0x7f120f6e" />
+    <public type="string" name="sample_confirmation" id="0x7f120f6f" />
+    <public type="string" name="sample_connected_account" id="0x7f120f70" />
+    <public type="string" name="sample_discrim" id="0x7f120f71" />
+    <public type="string" name="sample_email" id="0x7f120f72" />
+    <public type="string" name="sample_empty_string" id="0x7f120f73" />
+    <public type="string" name="sample_language" id="0x7f120f74" />
+    <public type="string" name="sample_number_9" id="0x7f120f75" />
+    <public type="string" name="sample_number_99" id="0x7f120f76" />
+    <public type="string" name="sample_number_999" id="0x7f120f77" />
+    <public type="string" name="sample_number_9999" id="0x7f120f78" />
+    <public type="string" name="sample_number_bandwidth" id="0x7f120f79" />
+    <public type="string" name="sample_number_ratio" id="0x7f120f7a" />
+    <public type="string" name="sample_online_members" id="0x7f120f7b" />
+    <public type="string" name="sample_server_name" id="0x7f120f7c" />
+    <public type="string" name="sample_server_name_short" id="0x7f120f7d" />
+    <public type="string" name="sample_server_role_name" id="0x7f120f7e" />
+    <public type="string" name="sample_time_duration_minutes" id="0x7f120f7f" />
+    <public type="string" name="sample_time_duration_seconds" id="0x7f120f80" />
+    <public type="string" name="sample_time_pm" id="0x7f120f81" />
+    <public type="string" name="sample_time_stamp" id="0x7f120f82" />
+    <public type="string" name="sample_total_members" id="0x7f120f83" />
+    <public type="string" name="sample_user_generated_link" id="0x7f120f84" />
+    <public type="string" name="sample_user_name" id="0x7f120f85" />
+    <public type="string" name="sample_user_name_discrim" id="0x7f120f86" />
+    <public type="string" name="sample_user_nick" id="0x7f120f87" />
+    <public type="string" name="sample_user_presence" id="0x7f120f88" />
+    <public type="string" name="sample_user_presence_details" id="0x7f120f89" />
+    <public type="string" name="samsung_welcome_screen" id="0x7f120f8a" />
+    <public type="string" name="save" id="0x7f120f8b" />
+    <public type="string" name="save_changes" id="0x7f120f8c" />
+    <public type="string" name="save_media" id="0x7f120f8d" />
+    <public type="string" name="save_media_failure_help_mobile" id="0x7f120f8e" />
+    <public type="string" name="save_media_failure_mobile" id="0x7f120f8f" />
+    <public type="string" name="save_media_success_mobile" id="0x7f120f90" />
+    <public type="string" name="save_new_url" id="0x7f120f91" />
+    <public type="string" name="saved_settings" id="0x7f120f92" />
+    <public type="string" name="scope_activities_read" id="0x7f120f93" />
+    <public type="string" name="scope_activities_read_description" id="0x7f120f94" />
+    <public type="string" name="scope_activities_write" id="0x7f120f95" />
+    <public type="string" name="scope_activities_write_description" id="0x7f120f96" />
+    <public type="string" name="scope_applications_builds_read" id="0x7f120f97" />
+    <public type="string" name="scope_applications_builds_read_description" id="0x7f120f98" />
+    <public type="string" name="scope_applications_builds_upload" id="0x7f120f99" />
+    <public type="string" name="scope_applications_builds_upload_description" id="0x7f120f9a" />
+    <public type="string" name="scope_applications_entitlements" id="0x7f120f9b" />
+    <public type="string" name="scope_applications_entitlements_description" id="0x7f120f9c" />
+    <public type="string" name="scope_applications_store_update" id="0x7f120f9d" />
+    <public type="string" name="scope_applications_store_update_description" id="0x7f120f9e" />
+    <public type="string" name="scope_bot" id="0x7f120f9f" />
+    <public type="string" name="scope_bot_description" id="0x7f120fa0" />
+    <public type="string" name="scope_bot_permissions" id="0x7f120fa1" />
+    <public type="string" name="scope_bot_permissions_description" id="0x7f120fa2" />
+    <public type="string" name="scope_bot_server_placeholder" id="0x7f120fa3" />
+    <public type="string" name="scope_bot_server_placeholder_no_guilds" id="0x7f120fa4" />
+    <public type="string" name="scope_bot_server_selected_label" id="0x7f120fa5" />
+    <public type="string" name="scope_connections" id="0x7f120fa6" />
+    <public type="string" name="scope_connections_empty" id="0x7f120fa7" />
+    <public type="string" name="scope_email" id="0x7f120fa8" />
+    <public type="string" name="scope_email_empty" id="0x7f120fa9" />
+    <public type="string" name="scope_gdm_join" id="0x7f120faa" />
+    <public type="string" name="scope_gdm_join_description" id="0x7f120fab" />
+    <public type="string" name="scope_guilds" id="0x7f120fac" />
+    <public type="string" name="scope_guilds_empty" id="0x7f120fad" />
+    <public type="string" name="scope_guilds_join" id="0x7f120fae" />
+    <public type="string" name="scope_guilds_join_description" id="0x7f120faf" />
+    <public type="string" name="scope_guilds_list_overflow" id="0x7f120fb0" />
+    <public type="string" name="scope_identify" id="0x7f120fb1" />
+    <public type="string" name="scope_messages_read" id="0x7f120fb2" />
+    <public type="string" name="scope_messages_read_description" id="0x7f120fb3" />
+    <public type="string" name="scope_relationships_read" id="0x7f120fb4" />
+    <public type="string" name="scope_relationships_read_description" id="0x7f120fb5" />
+    <public type="string" name="scope_rpc" id="0x7f120fb6" />
+    <public type="string" name="scope_rpc_api" id="0x7f120fb7" />
+    <public type="string" name="scope_rpc_api_description" id="0x7f120fb8" />
+    <public type="string" name="scope_rpc_description" id="0x7f120fb9" />
+    <public type="string" name="scope_rpc_notifications_read" id="0x7f120fba" />
+    <public type="string" name="scope_rpc_notifications_read_description" id="0x7f120fbb" />
+    <public type="string" name="scope_unsupported_on_android" id="0x7f120fbc" />
+    <public type="string" name="scope_unsupported_on_android_description" id="0x7f120fbd" />
+    <public type="string" name="scope_webhook_incoming" id="0x7f120fbe" />
+    <public type="string" name="scope_webhook_incoming_channel_placeholder" id="0x7f120fbf" />
+    <public type="string" name="scope_webhook_incoming_description" id="0x7f120fc0" />
+    <public type="string" name="screen_share_on" id="0x7f120fc1" />
+    <public type="string" name="screen_share_options" id="0x7f120fc2" />
+    <public type="string" name="screenshare_change_windows" id="0x7f120fc3" />
+    <public type="string" name="screenshare_description" id="0x7f120fc4" />
+    <public type="string" name="screenshare_extension_body" id="0x7f120fc5" />
+    <public type="string" name="screenshare_extension_title" id="0x7f120fc6" />
+    <public type="string" name="screenshare_frame_rate" id="0x7f120fc7" />
+    <public type="string" name="screenshare_relaunch" id="0x7f120fc8" />
+    <public type="string" name="screenshare_relaunch_body" id="0x7f120fc9" />
+    <public type="string" name="screenshare_screen" id="0x7f120fca" />
+    <public type="string" name="screenshare_share_screen_or_window" id="0x7f120fcb" />
+    <public type="string" name="screenshare_sound_toggle_label" id="0x7f120fcc" />
+    <public type="string" name="screenshare_source" id="0x7f120fcd" />
+    <public type="string" name="screenshare_stop" id="0x7f120fce" />
+    <public type="string" name="screenshare_stream_game" id="0x7f120fcf" />
+    <public type="string" name="screenshare_stream_quality" id="0x7f120fd0" />
+    <public type="string" name="screenshare_unavailable" id="0x7f120fd1" />
+    <public type="string" name="screenshare_unavailable_download_app" id="0x7f120fd2" />
+    <public type="string" name="screenshare_window" id="0x7f120fd3" />
+    <public type="string" name="search" id="0x7f120fd4" />
+    <public type="string" name="search_actions" id="0x7f120fd5" />
+    <public type="string" name="search_answer_date" id="0x7f120fd6" />
+    <public type="string" name="search_answer_file_name" id="0x7f120fd7" />
+    <public type="string" name="search_answer_file_type" id="0x7f120fd8" />
+    <public type="string" name="search_answer_from" id="0x7f120fd9" />
+    <public type="string" name="search_answer_has" id="0x7f120fda" />
+    <public type="string" name="search_answer_has_attachment" id="0x7f120fdb" />
+    <public type="string" name="search_answer_has_embed" id="0x7f120fdc" />
+    <public type="string" name="search_answer_has_image" id="0x7f120fdd" />
+    <public type="string" name="search_answer_has_link" id="0x7f120fde" />
+    <public type="string" name="search_answer_has_sound" id="0x7f120fdf" />
+    <public type="string" name="search_answer_has_video" id="0x7f120fe0" />
+    <public type="string" name="search_answer_in" id="0x7f120fe1" />
+    <public type="string" name="search_answer_link_from" id="0x7f120fe2" />
+    <public type="string" name="search_answer_mentions" id="0x7f120fe3" />
+    <public type="string" name="search_channels" id="0x7f120fe4" />
+    <public type="string" name="search_channels_no_result" id="0x7f120fe5" />
+    <public type="string" name="search_clear" id="0x7f120fe6" />
+    <public type="string" name="search_clear_history" id="0x7f120fe7" />
+    <public type="string" name="search_country" id="0x7f120fe8" />
+    <public type="string" name="search_date_picker_hint" id="0x7f120fe9" />
+    <public type="string" name="search_dm_still_indexing" id="0x7f120fea" />
+    <public type="string" name="search_dm_with" id="0x7f120feb" />
+    <public type="string" name="search_error" id="0x7f120fec" />
+    <public type="string" name="search_filter_after" id="0x7f120fed" />
+    <public type="string" name="search_filter_before" id="0x7f120fee" />
+    <public type="string" name="search_filter_during" id="0x7f120fef" />
+    <public type="string" name="search_filter_file_name" id="0x7f120ff0" />
+    <public type="string" name="search_filter_file_type" id="0x7f120ff1" />
+    <public type="string" name="search_filter_from" id="0x7f120ff2" />
+    <public type="string" name="search_filter_has" id="0x7f120ff3" />
+    <public type="string" name="search_filter_in" id="0x7f120ff4" />
+    <public type="string" name="search_filter_link_from" id="0x7f120ff5" />
+    <public type="string" name="search_filter_mentions" id="0x7f120ff6" />
+    <public type="string" name="search_filter_on" id="0x7f120ff7" />
+    <public type="string" name="search_for_emoji" id="0x7f120ff8" />
+    <public type="string" name="search_for_empty" id="0x7f120ff9" />
+    <public type="string" name="search_for_value" id="0x7f120ffa" />
+    <public type="string" name="search_from_suggestions" id="0x7f120ffb" />
+    <public type="string" name="search_giphy" id="0x7f120ffc" />
+    <public type="string" name="search_group_header_channels" id="0x7f120ffd" />
+    <public type="string" name="search_group_header_dates" id="0x7f120ffe" />
+    <public type="string" name="search_group_header_file_name" id="0x7f120fff" />
+    <public type="string" name="search_group_header_file_type" id="0x7f121000" />
+    <public type="string" name="search_group_header_from" id="0x7f121001" />
+    <public type="string" name="search_group_header_has" id="0x7f121002" />
+    <public type="string" name="search_group_header_history" id="0x7f121003" />
+    <public type="string" name="search_group_header_link_from" id="0x7f121004" />
+    <public type="string" name="search_group_header_mentions" id="0x7f121005" />
+    <public type="string" name="search_group_header_search_options" id="0x7f121006" />
+    <public type="string" name="search_guild_still_indexing" id="0x7f121007" />
+    <public type="string" name="search_hide_blocked_messages" id="0x7f121008" />
+    <public type="string" name="search_in" id="0x7f121009" />
+    <public type="string" name="search_members" id="0x7f12100a" />
+    <public type="string" name="search_members_no_result" id="0x7f12100b" />
+    <public type="string" name="search_menu_title" id="0x7f12100c" />
+    <public type="string" name="search_no_results" id="0x7f12100d" />
+    <public type="string" name="search_no_results_alt" id="0x7f12100e" />
+    <public type="string" name="search_num_results_blocked_not_shown" id="0x7f12100f" />
+    <public type="string" name="search_pick_date" id="0x7f121010" />
+    <public type="string" name="search_recent" id="0x7f121011" />
+    <public type="string" name="search_relevant" id="0x7f121012" />
+    <public type="string" name="search_roles" id="0x7f121013" />
+    <public type="string" name="search_roles_no_result" id="0x7f121014" />
+    <public type="string" name="search_shortcut_month" id="0x7f121015" />
+    <public type="string" name="search_shortcut_today" id="0x7f121016" />
+    <public type="string" name="search_shortcut_week" id="0x7f121017" />
+    <public type="string" name="search_shortcut_year" id="0x7f121018" />
+    <public type="string" name="search_shortcut_yesterday" id="0x7f121019" />
+    <public type="string" name="search_still_indexing_hint" id="0x7f12101a" />
+    <public type="string" name="search_tenor" id="0x7f12101b" />
+    <public type="string" name="search_with_google" id="0x7f12101c" />
+    <public type="string" name="searching" id="0x7f12101d" />
+    <public type="string" name="security" id="0x7f12101e" />
+    <public type="string" name="select" id="0x7f12101f" />
+    <public type="string" name="select_channel_or_category" id="0x7f121020" />
+    <public type="string" name="select_color" id="0x7f121021" />
+    <public type="string" name="select_emoji" id="0x7f121022" />
+    <public type="string" name="select_picture" id="0x7f121023" />
+    <public type="string" name="select_picture_upload" id="0x7f121024" />
+    <public type="string" name="select_sort_mode" id="0x7f121025" />
+    <public type="string" name="selection_shrink_scale" id="0x7f121026" />
+    <public type="string" name="self_deafened" id="0x7f121027" />
+    <public type="string" name="self_deny_permission_body" id="0x7f121028" />
+    <public type="string" name="self_deny_permission_title" id="0x7f121029" />
+    <public type="string" name="self_muted" id="0x7f12102a" />
+    <public type="string" name="self_xss_header" id="0x7f12102b" />
+    <public type="string" name="self_xss_line_1" id="0x7f12102c" />
+    <public type="string" name="self_xss_line_2" id="0x7f12102d" />
+    <public type="string" name="self_xss_line_3" id="0x7f12102e" />
+    <public type="string" name="self_xss_line_4" id="0x7f12102f" />
+    <public type="string" name="send" id="0x7f121030" />
+    <public type="string" name="send_contents" id="0x7f121031" />
+    <public type="string" name="send_dm" id="0x7f121032" />
+    <public type="string" name="send_message" id="0x7f121033" />
+    <public type="string" name="send_message_failure" id="0x7f121034" />
+    <public type="string" name="send_messages" id="0x7f121035" />
+    <public type="string" name="send_messages_description" id="0x7f121036" />
+    <public type="string" name="send_tts_messages" id="0x7f121037" />
+    <public type="string" name="send_tts_messages_description" id="0x7f121038" />
+    <public type="string" name="server_acronym" id="0x7f121039" />
+    <public type="string" name="server_analytics_description" id="0x7f12103a" />
+    <public type="string" name="server_deafen" id="0x7f12103b" />
+    <public type="string" name="server_deafened" id="0x7f12103c" />
+    <public type="string" name="server_desciption_empty" id="0x7f12103d" />
+    <public type="string" name="server_emoji" id="0x7f12103e" />
+    <public type="string" name="server_folder_mark_as_read" id="0x7f12103f" />
+    <public type="string" name="server_folder_mute" id="0x7f121040" />
+    <public type="string" name="server_folder_placeholder" id="0x7f121041" />
+    <public type="string" name="server_folder_settings" id="0x7f121042" />
+    <public type="string" name="server_icon" id="0x7f121043" />
+    <public type="string" name="server_insights" id="0x7f121044" />
+    <public type="string" name="server_insights_error_message" id="0x7f121045" />
+    <public type="string" name="server_mute" id="0x7f121046" />
+    <public type="string" name="server_mute_dms" id="0x7f121047" />
+    <public type="string" name="server_muted" id="0x7f121048" />
+    <public type="string" name="server_name_required" id="0x7f121049" />
+    <public type="string" name="server_notification" id="0x7f12104a" />
+    <public type="string" name="server_options" id="0x7f12104b" />
+    <public type="string" name="server_overview" id="0x7f12104c" />
+    <public type="string" name="server_ratio_healthy_hook" id="0x7f12104d" />
+    <public type="string" name="server_region_unavailable" id="0x7f12104e" />
+    <public type="string" name="server_settings" id="0x7f12104f" />
+    <public type="string" name="server_settings_updated" id="0x7f121050" />
+    <public type="string" name="server_sort" id="0x7f121051" />
+    <public type="string" name="server_status" id="0x7f121052" />
+    <public type="string" name="server_undeafen" id="0x7f121053" />
+    <public type="string" name="server_unmute" id="0x7f121054" />
+    <public type="string" name="server_voice_mute" id="0x7f121055" />
+    <public type="string" name="server_voice_unmute" id="0x7f121056" />
+    <public type="string" name="servers" id="0x7f121057" />
+    <public type="string" name="servers_management_title" id="0x7f121058" />
+    <public type="string" name="service_connections_disconnect" id="0x7f121059" />
+    <public type="string" name="set_debug_logging" id="0x7f12105a" />
+    <public type="string" name="set_debug_logging_body" id="0x7f12105b" />
+    <public type="string" name="set_invite_link_never_expire" id="0x7f12105c" />
+    <public type="string" name="set_status" id="0x7f12105d" />
+    <public type="string" name="settings" id="0x7f12105e" />
+    <public type="string" name="settings_advanced" id="0x7f12105f" />
+    <public type="string" name="settings_basic" id="0x7f121060" />
+    <public type="string" name="settings_games_add" id="0x7f121061" />
+    <public type="string" name="settings_games_add_game" id="0x7f121062" />
+    <public type="string" name="settings_games_add_new_game" id="0x7f121063" />
+    <public type="string" name="settings_games_added_games_label" id="0x7f121064" />
+    <public type="string" name="settings_games_enable_overlay_label" id="0x7f121065" />
+    <public type="string" name="settings_games_game_to_add" id="0x7f121066" />
+    <public type="string" name="settings_games_hidden_library_applications_label" id="0x7f121067" />
+    <public type="string" name="settings_games_import_explanation" id="0x7f121068" />
+    <public type="string" name="settings_games_import_label" id="0x7f121069" />
+    <public type="string" name="settings_games_last_played" id="0x7f12106a" />
+    <public type="string" name="settings_games_no_game_detected" id="0x7f12106b" />
+    <public type="string" name="settings_games_no_games_header" id="0x7f12106c" />
+    <public type="string" name="settings_games_not_playing" id="0x7f12106d" />
+    <public type="string" name="settings_games_not_seeing_game" id="0x7f12106e" />
+    <public type="string" name="settings_games_now_playing_label" id="0x7f12106f" />
+    <public type="string" name="settings_games_now_playing_state" id="0x7f121070" />
+    <public type="string" name="settings_games_overlay" id="0x7f121071" />
+    <public type="string" name="settings_games_overlay_off" id="0x7f121072" />
+    <public type="string" name="settings_games_overlay_on" id="0x7f121073" />
+    <public type="string" name="settings_games_overlay_warning" id="0x7f121074" />
+    <public type="string" name="settings_games_remove_icon" id="0x7f121075" />
+    <public type="string" name="settings_games_restore_to_library" id="0x7f121076" />
+    <public type="string" name="settings_games_toggle_overlay" id="0x7f121077" />
+    <public type="string" name="settings_games_verified_icon" id="0x7f121078" />
+    <public type="string" name="settings_invite_tip" id="0x7f121079" />
+    <public type="string" name="settings_invite_tip_without_create" id="0x7f12107a" />
+    <public type="string" name="settings_notice_message" id="0x7f12107b" />
+    <public type="string" name="settings_permissions_delete_body" id="0x7f12107c" />
+    <public type="string" name="settings_permissions_delete_title" id="0x7f12107d" />
+    <public type="string" name="settings_permissions_title" id="0x7f12107e" />
+    <public type="string" name="settings_roles_delete_body" id="0x7f12107f" />
+    <public type="string" name="settings_roles_delete_title" id="0x7f121080" />
+    <public type="string" name="settings_roles_helpdesk_link" id="0x7f121081" />
+    <public type="string" name="settings_sync" id="0x7f121082" />
+    <public type="string" name="settings_webhooks_empty_body" id="0x7f121083" />
+    <public type="string" name="settings_webhooks_empty_body_ios" id="0x7f121084" />
+    <public type="string" name="settings_webhooks_empty_title" id="0x7f121085" />
+    <public type="string" name="settings_webhooks_intro" id="0x7f121086" />
+    <public type="string" name="setup" id="0x7f121087" />
+    <public type="string" name="setup_vanity_url" id="0x7f121088" />
+    <public type="string" name="several_users_typing" id="0x7f121089" />
+    <public type="string" name="share" id="0x7f12108a" />
+    <public type="string" name="share_invite_link_for_access" id="0x7f12108b" />
+    <public type="string" name="share_invite_link_for_access_experiment" id="0x7f12108c" />
+    <public type="string" name="share_invite_mobile" id="0x7f12108d" />
+    <public type="string" name="share_link" id="0x7f12108e" />
+    <public type="string" name="share_to" id="0x7f12108f" />
+    <public type="string" name="shortcut_recorder_button" id="0x7f121090" />
+    <public type="string" name="shortcut_recorder_button_edit" id="0x7f121091" />
+    <public type="string" name="shortcut_recorder_button_recording" id="0x7f121092" />
+    <public type="string" name="shortcut_recorder_help" id="0x7f121093" />
+    <public type="string" name="shortcut_recorder_no_bind" id="0x7f121094" />
+    <public type="string" name="show_current_game" id="0x7f121095" />
+    <public type="string" name="show_current_game_desc" id="0x7f121096" />
+    <public type="string" name="show_muted" id="0x7f121097" />
+    <public type="string" name="show_muted_channels" id="0x7f121098" />
+    <public type="string" name="show_spoiler_always" id="0x7f121099" />
+    <public type="string" name="show_spoiler_content" id="0x7f12109a" />
+    <public type="string" name="show_spoiler_content_help" id="0x7f12109b" />
+    <public type="string" name="show_spoiler_on_click" id="0x7f12109c" />
+    <public type="string" name="show_spoiler_on_servers_i_mod" id="0x7f12109d" />
+    <public type="string" name="skip" id="0x7f12109e" />
+    <public type="string" name="skip_all_tips" id="0x7f12109f" />
+    <public type="string" name="sky_blue" id="0x7f1210a0" />
+    <public type="string" name="sort" id="0x7f1210a1" />
+    <public type="string" name="sorting" id="0x7f1210a2" />
+    <public type="string" name="sorting_channels" id="0x7f1210a3" />
+    <public type="string" name="sound_deafen" id="0x7f1210a4" />
+    <public type="string" name="sound_incoming_ring" id="0x7f1210a5" />
+    <public type="string" name="sound_message" id="0x7f1210a6" />
+    <public type="string" name="sound_mute" id="0x7f1210a7" />
+    <public type="string" name="sound_outgoing_ring" id="0x7f1210a8" />
+    <public type="string" name="sound_ptt_activate" id="0x7f1210a9" />
+    <public type="string" name="sound_ptt_deactivate" id="0x7f1210aa" />
+    <public type="string" name="sound_stream_started" id="0x7f1210ab" />
+    <public type="string" name="sound_stream_stopped" id="0x7f1210ac" />
+    <public type="string" name="sound_undeafen" id="0x7f1210ad" />
+    <public type="string" name="sound_unmute" id="0x7f1210ae" />
+    <public type="string" name="sound_user_join" id="0x7f1210af" />
+    <public type="string" name="sound_user_leave" id="0x7f1210b0" />
+    <public type="string" name="sound_user_moved" id="0x7f1210b1" />
+    <public type="string" name="sound_viewer_join" id="0x7f1210b2" />
+    <public type="string" name="sound_viewer_leave" id="0x7f1210b3" />
+    <public type="string" name="sound_voice_disconnected" id="0x7f1210b4" />
+    <public type="string" name="sounds" id="0x7f1210b5" />
+    <public type="string" name="source_message_deleted" id="0x7f1210b6" />
+    <public type="string" name="speak" id="0x7f1210b7" />
+    <public type="string" name="spectators" id="0x7f1210b8" />
+    <public type="string" name="spectators_header" id="0x7f1210b9" />
+    <public type="string" name="spellcheck" id="0x7f1210ba" />
+    <public type="string" name="spoiler" id="0x7f1210bb" />
+    <public type="string" name="spoiler_hide" id="0x7f1210bc" />
+    <public type="string" name="spoiler_mark_selected" id="0x7f1210bd" />
+    <public type="string" name="spoiler_reveal" id="0x7f1210be" />
+    <public type="string" name="spotify_app_download" id="0x7f1210bf" />
+    <public type="string" name="spotify_app_not_found" id="0x7f1210c0" />
+    <public type="string" name="spotify_app_not_opened" id="0x7f1210c1" />
+    <public type="string" name="spotify_connection_info_android" id="0x7f1210c2" />
+    <public type="string" name="spotify_listen_along_host" id="0x7f1210c3" />
+    <public type="string" name="spotify_listen_along_info" id="0x7f1210c4" />
+    <public type="string" name="spotify_listen_along_listener" id="0x7f1210c5" />
+    <public type="string" name="spotify_listen_along_listeners" id="0x7f1210c6" />
+    <public type="string" name="spotify_listen_along_listening_along_count" id="0x7f1210c7" />
+    <public type="string" name="spotify_listen_along_modal_title" id="0x7f1210c8" />
+    <public type="string" name="spotify_listen_along_song_by_artist" id="0x7f1210c9" />
+    <public type="string" name="spotify_listen_along_stop" id="0x7f1210ca" />
+    <public type="string" name="spotify_listen_along_subtitle_listener" id="0x7f1210cb" />
+    <public type="string" name="spotify_listen_along_title_host" id="0x7f1210cc" />
+    <public type="string" name="spotify_listen_along_title_listener" id="0x7f1210cd" />
+    <public type="string" name="spotify_premium_upgrade_body" id="0x7f1210ce" />
+    <public type="string" name="spotify_premium_upgrade_button" id="0x7f1210cf" />
+    <public type="string" name="spotify_premium_upgrade_header" id="0x7f1210d0" />
+    <public type="string" name="staff_badge_tooltip" id="0x7f1210d1" />
+    <public type="string" name="start" id="0x7f1210d2" />
+    <public type="string" name="start_audio_call" id="0x7f1210d3" />
+    <public type="string" name="start_call" id="0x7f1210d4" />
+    <public type="string" name="start_dm_label" id="0x7f1210d5" />
+    <public type="string" name="start_dm_placeholder" id="0x7f1210d6" />
+    <public type="string" name="start_video_call" id="0x7f1210d7" />
+    <public type="string" name="start_voice_call" id="0x7f1210d8" />
+    <public type="string" name="status_bar_notification_info_overflow" id="0x7f1210d9" />
+    <public type="string" name="status_dnd" id="0x7f1210da" />
+    <public type="string" name="status_dnd_help" id="0x7f1210db" />
+    <public type="string" name="status_idle" id="0x7f1210dc" />
+    <public type="string" name="status_invisible" id="0x7f1210dd" />
+    <public type="string" name="status_invisible_helper" id="0x7f1210de" />
+    <public type="string" name="status_offline" id="0x7f1210df" />
+    <public type="string" name="status_online" id="0x7f1210e0" />
+    <public type="string" name="status_online_mobile" id="0x7f1210e1" />
+    <public type="string" name="status_page_url" id="0x7f1210e2" />
+    <public type="string" name="status_streaming" id="0x7f1210e3" />
+    <public type="string" name="status_unknown" id="0x7f1210e4" />
+    <public type="string" name="step_number" id="0x7f1210e5" />
+    <public type="string" name="still_indexing" id="0x7f1210e6" />
+    <public type="string" name="stop_ringing" id="0x7f1210e7" />
+    <public type="string" name="stop_streaming" id="0x7f1210e8" />
+    <public type="string" name="stop_watching" id="0x7f1210e9" />
+    <public type="string" name="storage_permission_denied_msg" id="0x7f1210ea" />
+    <public type="string" name="store_channel" id="0x7f1210eb" />
+    <public type="string" name="store_payment_legalese_monthly" id="0x7f1210ec" />
+    <public type="string" name="store_payment_legalese_yearly" id="0x7f1210ed" />
+    <public type="string" name="stream" id="0x7f1210ee" />
+    <public type="string" name="stream_bad_spectator" id="0x7f1210ef" />
+    <public type="string" name="stream_bad_streamer" id="0x7f1210f0" />
+    <public type="string" name="stream_capture_paused" id="0x7f1210f1" />
+    <public type="string" name="stream_capture_paused_details" id="0x7f1210f2" />
+    <public type="string" name="stream_capture_paused_details_viewer" id="0x7f1210f3" />
+    <public type="string" name="stream_channel_description" id="0x7f1210f4" />
+    <public type="string" name="stream_description" id="0x7f1210f5" />
+    <public type="string" name="stream_ended" id="0x7f1210f6" />
+    <public type="string" name="stream_ended_button" id="0x7f1210f7" />
+    <public type="string" name="stream_ended_no_spectators" id="0x7f1210f8" />
+    <public type="string" name="stream_failed_description" id="0x7f1210f9" />
+    <public type="string" name="stream_failed_title" id="0x7f1210fa" />
+    <public type="string" name="stream_full_modal_body" id="0x7f1210fb" />
+    <public type="string" name="stream_full_modal_header" id="0x7f1210fc" />
+    <public type="string" name="stream_issue_modal_header" id="0x7f1210fd" />
+    <public type="string" name="stream_network_quality_error" id="0x7f1210fe" />
+    <public type="string" name="stream_no_preview" id="0x7f1210ff" />
+    <public type="string" name="stream_playing" id="0x7f121100" />
+    <public type="string" name="stream_preview_loading" id="0x7f121101" />
+    <public type="string" name="stream_preview_paused" id="0x7f121102" />
+    <public type="string" name="stream_preview_paused_subtext" id="0x7f121103" />
+    <public type="string" name="stream_quality_unlock" id="0x7f121104" />
+    <public type="string" name="stream_reconnecting_error" id="0x7f121105" />
+    <public type="string" name="stream_reconnecting_error_subtext" id="0x7f121106" />
+    <public type="string" name="stream_report_a_problem" id="0x7f121107" />
+    <public type="string" name="stream_report_a_problem_post_stream" id="0x7f121108" />
+    <public type="string" name="stream_report_audio_missing" id="0x7f121109" />
+    <public type="string" name="stream_report_audio_poor" id="0x7f12110a" />
+    <public type="string" name="stream_report_black" id="0x7f12110b" />
+    <public type="string" name="stream_report_blurry" id="0x7f12110c" />
+    <public type="string" name="stream_report_ended_audio_missing" id="0x7f12110d" />
+    <public type="string" name="stream_report_ended_audio_poor" id="0x7f12110e" />
+    <public type="string" name="stream_report_ended_black" id="0x7f12110f" />
+    <public type="string" name="stream_report_ended_blurry" id="0x7f121110" />
+    <public type="string" name="stream_report_ended_lagging" id="0x7f121111" />
+    <public type="string" name="stream_report_ended_out_of_sync" id="0x7f121112" />
+    <public type="string" name="stream_report_game_issue" id="0x7f121113" />
+    <public type="string" name="stream_report_label" id="0x7f121114" />
+    <public type="string" name="stream_report_lagging" id="0x7f121115" />
+    <public type="string" name="stream_report_no_issue" id="0x7f121116" />
+    <public type="string" name="stream_report_out_of_sync" id="0x7f121117" />
+    <public type="string" name="stream_report_placeholder" id="0x7f121118" />
+    <public type="string" name="stream_report_problem" id="0x7f121119" />
+    <public type="string" name="stream_report_problem_body" id="0x7f12111a" />
+    <public type="string" name="stream_report_problem_header_mobile" id="0x7f12111b" />
+    <public type="string" name="stream_report_problem_mobile" id="0x7f12111c" />
+    <public type="string" name="stream_report_rating_body" id="0x7f12111d" />
+    <public type="string" name="stream_report_rating_body_streamer" id="0x7f12111e" />
+    <public type="string" name="stream_report_submit" id="0x7f12111f" />
+    <public type="string" name="stream_reported" id="0x7f121120" />
+    <public type="string" name="stream_reported_body" id="0x7f121121" />
+    <public type="string" name="stream_soundshare_failed" id="0x7f121122" />
+    <public type="string" name="streamer_mode" id="0x7f121123" />
+    <public type="string" name="streamer_mode_enabled" id="0x7f121124" />
+    <public type="string" name="streamer_playing" id="0x7f121125" />
+    <public type="string" name="streamer_settings_title" id="0x7f121126" />
+    <public type="string" name="streaming" id="0x7f121127" />
+    <public type="string" name="streaming_a_game" id="0x7f121128" />
+    <public type="string" name="stripe_unable_to_load" id="0x7f121129" />
+    <public type="string" name="sub_enabled_servers" id="0x7f12112a" />
+    <public type="string" name="subscriber_information" id="0x7f12112b" />
+    <public type="string" name="suggestions" id="0x7f12112c" />
+    <public type="string" name="support" id="0x7f12112d" />
+    <public type="string" name="suppress_all_embeds" id="0x7f12112e" />
+    <public type="string" name="suppressed" id="0x7f12112f" />
+    <public type="string" name="suppressed_afk_body" id="0x7f121130" />
+    <public type="string" name="suppressed_afk_title" id="0x7f121131" />
+    <public type="string" name="suppressed_permission_body" id="0x7f121132" />
+    <public type="string" name="sv_se" id="0x7f121133" />
+    <public type="string" name="switch_audio_output" id="0x7f121134" />
+    <public type="string" name="switch_hardware_acceleration" id="0x7f121135" />
+    <public type="string" name="switch_hardware_acceleration_body" id="0x7f121136" />
+    <public type="string" name="switch_subsystem" id="0x7f121137" />
+    <public type="string" name="switch_subsystem_body" id="0x7f121138" />
+    <public type="string" name="switch_to_compact_mode" id="0x7f121139" />
+    <public type="string" name="switch_to_cozy_mode" id="0x7f12113a" />
+    <public type="string" name="switch_to_dark_theme" id="0x7f12113b" />
+    <public type="string" name="switch_to_light_theme" id="0x7f12113c" />
+    <public type="string" name="switch_to_push_to_talk" id="0x7f12113d" />
+    <public type="string" name="switch_to_voice_activity" id="0x7f12113e" />
+    <public type="string" name="sync" id="0x7f12113f" />
+    <public type="string" name="sync_across_clients_appearance_help" id="0x7f121140" />
+    <public type="string" name="sync_across_clients_text" id="0x7f121141" />
+    <public type="string" name="sync_across_clients_text_help" id="0x7f121142" />
+    <public type="string" name="sync_friends" id="0x7f121143" />
+    <public type="string" name="sync_now" id="0x7f121144" />
+    <public type="string" name="sync_permissions" id="0x7f121145" />
+    <public type="string" name="sync_permissions_explanation" id="0x7f121146" />
+    <public type="string" name="sync_revoked" id="0x7f121147" />
+    <public type="string" name="sync_this_account" id="0x7f121148" />
+    <public type="string" name="sync_with" id="0x7f121149" />
+    <public type="string" name="system_keyboard" id="0x7f12114a" />
+    <public type="string" name="system_message_call_missed" id="0x7f12114b" />
+    <public type="string" name="system_message_call_started" id="0x7f12114c" />
+    <public type="string" name="system_message_channel_follow_add" id="0x7f12114d" />
+    <public type="string" name="system_message_channel_follow_add_ios" id="0x7f12114e" />
+    <public type="string" name="system_message_channel_icon_change" id="0x7f12114f" />
+    <public type="string" name="system_message_channel_name_change" id="0x7f121150" />
+    <public type="string" name="system_message_guild_bot_join" id="0x7f121151" />
+    <public type="string" name="system_message_guild_member_join" id="0x7f121152" />
+    <public type="string" name="system_message_guild_member_join_01" id="0x7f121153" />
+    <public type="string" name="system_message_guild_member_join_02" id="0x7f121154" />
+    <public type="string" name="system_message_guild_member_join_03" id="0x7f121155" />
+    <public type="string" name="system_message_guild_member_join_04" id="0x7f121156" />
+    <public type="string" name="system_message_guild_member_join_05" id="0x7f121157" />
+    <public type="string" name="system_message_guild_member_join_06" id="0x7f121158" />
+    <public type="string" name="system_message_guild_member_join_07" id="0x7f121159" />
+    <public type="string" name="system_message_guild_member_join_08" id="0x7f12115a" />
+    <public type="string" name="system_message_guild_member_join_09" id="0x7f12115b" />
+    <public type="string" name="system_message_guild_member_join_10" id="0x7f12115c" />
+    <public type="string" name="system_message_guild_member_join_11" id="0x7f12115d" />
+    <public type="string" name="system_message_guild_member_join_12" id="0x7f12115e" />
+    <public type="string" name="system_message_guild_member_join_13" id="0x7f12115f" />
+    <public type="string" name="system_message_guild_member_join_14" id="0x7f121160" />
+    <public type="string" name="system_message_guild_member_join_15" id="0x7f121161" />
+    <public type="string" name="system_message_guild_member_join_16" id="0x7f121162" />
+    <public type="string" name="system_message_guild_member_join_17" id="0x7f121163" />
+    <public type="string" name="system_message_guild_member_join_18" id="0x7f121164" />
+    <public type="string" name="system_message_guild_member_join_19" id="0x7f121165" />
+    <public type="string" name="system_message_guild_member_join_20" id="0x7f121166" />
+    <public type="string" name="system_message_guild_member_join_21" id="0x7f121167" />
+    <public type="string" name="system_message_guild_member_join_22" id="0x7f121168" />
+    <public type="string" name="system_message_guild_member_join_23" id="0x7f121169" />
+    <public type="string" name="system_message_guild_member_join_24" id="0x7f12116a" />
+    <public type="string" name="system_message_guild_member_join_25" id="0x7f12116b" />
+    <public type="string" name="system_message_guild_member_join_26" id="0x7f12116c" />
+    <public type="string" name="system_message_guild_member_join_27" id="0x7f12116d" />
+    <public type="string" name="system_message_guild_member_join_28" id="0x7f12116e" />
+    <public type="string" name="system_message_guild_member_join_29" id="0x7f12116f" />
+    <public type="string" name="system_message_guild_member_join_30" id="0x7f121170" />
+    <public type="string" name="system_message_guild_member_join_31" id="0x7f121171" />
+    <public type="string" name="system_message_guild_member_join_32" id="0x7f121172" />
+    <public type="string" name="system_message_guild_member_join_33" id="0x7f121173" />
+    <public type="string" name="system_message_guild_member_join_34" id="0x7f121174" />
+    <public type="string" name="system_message_guild_member_join_35" id="0x7f121175" />
+    <public type="string" name="system_message_guild_member_join_36" id="0x7f121176" />
+    <public type="string" name="system_message_guild_member_join_37" id="0x7f121177" />
+    <public type="string" name="system_message_guild_member_join_38" id="0x7f121178" />
+    <public type="string" name="system_message_guild_member_subscribed" id="0x7f121179" />
+    <public type="string" name="system_message_guild_member_subscribed_achieved_tier" id="0x7f12117a" />
+    <public type="string" name="system_message_join_call" id="0x7f12117b" />
+    <public type="string" name="system_message_pinned_message" id="0x7f12117c" />
+    <public type="string" name="system_message_pinned_message_mobile" id="0x7f12117d" />
+    <public type="string" name="system_message_pinned_message_no_cta" id="0x7f12117e" />
+    <public type="string" name="system_message_pinned_message_no_cta_formatted" id="0x7f12117f" />
+    <public type="string" name="system_message_recipient_add" id="0x7f121180" />
+    <public type="string" name="system_message_recipient_remove" id="0x7f121181" />
+    <public type="string" name="system_message_recipient_remove_self" id="0x7f121182" />
+    <public type="string" name="system_permission_grant" id="0x7f121183" />
+    <public type="string" name="system_permission_request_camera" id="0x7f121184" />
+    <public type="string" name="system_permission_request_files" id="0x7f121185" />
+    <public type="string" name="tab_bar" id="0x7f121186" />
+    <public type="string" name="take_photo_or_video" id="0x7f121187" />
+    <public type="string" name="tan" id="0x7f121188" />
+    <public type="string" name="tap_add_nickname" id="0x7f121189" />
+    <public type="string" name="tar_gz" id="0x7f12118a" />
+    <public type="string" name="teal" id="0x7f12118b" />
+    <public type="string" name="temporary_membership_explanation" id="0x7f12118c" />
+    <public type="string" name="terms_of_service" id="0x7f12118d" />
+    <public type="string" name="terms_of_service_url" id="0x7f12118e" />
+    <public type="string" name="terms_privacy" id="0x7f12118f" />
+    <public type="string" name="terms_privacy_opt_in" id="0x7f121190" />
+    <public type="string" name="terms_privacy_opt_in_tooltip" id="0x7f121191" />
+    <public type="string" name="terracotta" id="0x7f121192" />
+    <public type="string" name="test_video" id="0x7f121193" />
+    <public type="string" name="text" id="0x7f121194" />
+    <public type="string" name="text_and_images" id="0x7f121195" />
+    <public type="string" name="text_channel" id="0x7f121196" />
+    <public type="string" name="text_channels" id="0x7f121197" />
+    <public type="string" name="text_channels_matching" id="0x7f121198" />
+    <public type="string" name="text_permissions" id="0x7f121199" />
+    <public type="string" name="textarea_placeholder" id="0x7f12119a" />
+    <public type="string" name="th" id="0x7f12119b" />
+    <public type="string" name="theme" id="0x7f12119c" />
+    <public type="string" name="theme_dark" id="0x7f12119d" />
+    <public type="string" name="theme_light" id="0x7f12119e" />
+    <public type="string" name="theme_pure_evil_title" id="0x7f12119f" />
+    <public type="string" name="theme_pure_evil_updated" id="0x7f1211a0" />
+    <public type="string" name="theme_updated" id="0x7f1211a1" />
+    <public type="string" name="this_server" id="0x7f1211a2" />
+    <public type="string" name="this_server_named" id="0x7f1211a3" />
+    <public type="string" name="three_users_typing" id="0x7f1211a4" />
+    <public type="string" name="timeout_error" id="0x7f1211a5" />
+    <public type="string" name="tip_create_first_server_body3" id="0x7f1211a6" />
+    <public type="string" name="tip_create_first_server_title3" id="0x7f1211a7" />
+    <public type="string" name="tip_create_more_servers_body3" id="0x7f1211a8" />
+    <public type="string" name="tip_create_more_servers_title3" id="0x7f1211a9" />
+    <public type="string" name="tip_direct_messages_body3" id="0x7f1211aa" />
+    <public type="string" name="tip_direct_messages_title3" id="0x7f1211ab" />
+    <public type="string" name="tip_friends_list_body3" id="0x7f1211ac" />
+    <public type="string" name="tip_friends_list_title3" id="0x7f1211ad" />
+    <public type="string" name="tip_instant_invite_body3" id="0x7f1211ae" />
+    <public type="string" name="tip_instant_invite_title3" id="0x7f1211af" />
+    <public type="string" name="tip_organize_by_topic_body3" id="0x7f1211b0" />
+    <public type="string" name="tip_organize_by_topic_title3" id="0x7f1211b1" />
+    <public type="string" name="tip_server_settings_body3" id="0x7f1211b2" />
+    <public type="string" name="tip_server_settings_title3" id="0x7f1211b3" />
+    <public type="string" name="tip_voice_conversations_body3" id="0x7f1211b4" />
+    <public type="string" name="tip_voice_conversations_title3" id="0x7f1211b5" />
+    <public type="string" name="tip_whos_online_body3" id="0x7f1211b6" />
+    <public type="string" name="tip_whos_online_title3" id="0x7f1211b7" />
+    <public type="string" name="tip_writing_messages_body3" id="0x7f1211b8" />
+    <public type="string" name="tip_writing_messages_title3" id="0x7f1211b9" />
+    <public type="string" name="title" id="0x7f1211ba" />
+    <public type="string" name="toast_add_friend" id="0x7f1211bb" />
+    <public type="string" name="toast_image_saved" id="0x7f1211bc" />
+    <public type="string" name="toast_message_copied" id="0x7f1211bd" />
+    <public type="string" name="toast_message_id_copied" id="0x7f1211be" />
+    <public type="string" name="toast_username_saved" id="0x7f1211bf" />
+    <public type="string" name="toggle_camera" id="0x7f1211c0" />
+    <public type="string" name="toggle_deafen" id="0x7f1211c1" />
+    <public type="string" name="toggle_drawer" id="0x7f1211c2" />
+    <public type="string" name="toggle_emoji_keyboard" id="0x7f1211c3" />
+    <public type="string" name="toggle_microphone" id="0x7f1211c4" />
+    <public type="string" name="toggle_mute" id="0x7f1211c5" />
+    <public type="string" name="too_many_animated_emoji" id="0x7f1211c6" />
+    <public type="string" name="too_many_emoji" id="0x7f1211c7" />
+    <public type="string" name="too_many_reactions_alert_body" id="0x7f1211c8" />
+    <public type="string" name="too_many_reactions_alert_header" id="0x7f1211c9" />
+    <public type="string" name="total_members" id="0x7f1211ca" />
+    <public type="string" name="total_results" id="0x7f1211cb" />
+    <public type="string" name="tr" id="0x7f1211cc" />
+    <public type="string" name="transfer" id="0x7f1211cd" />
+    <public type="string" name="transfer_ownership" id="0x7f1211ce" />
+    <public type="string" name="transfer_ownership_acknowledge" id="0x7f1211cf" />
+    <public type="string" name="transfer_ownership_to_user" id="0x7f1211d0" />
+    <public type="string" name="trending_arrow_down" id="0x7f1211d1" />
+    <public type="string" name="trending_arrow_up" id="0x7f1211d2" />
+    <public type="string" name="try_again" id="0x7f1211d3" />
+    <public type="string" name="tts_alls" id="0x7f1211d4" />
+    <public type="string" name="tts_current" id="0x7f1211d5" />
+    <public type="string" name="tts_never" id="0x7f1211d6" />
+    <public type="string" name="tutorial_close" id="0x7f1211d7" />
+    <public type="string" name="tweet_us" id="0x7f1211d8" />
+    <public type="string" name="twitter" id="0x7f1211d9" />
+    <public type="string" name="twitter_page_url" id="0x7f1211da" />
+    <public type="string" name="two_fa" id="0x7f1211db" />
+    <public type="string" name="two_fa_activate" id="0x7f1211dc" />
+    <public type="string" name="two_fa_app_name_authy" id="0x7f1211dd" />
+    <public type="string" name="two_fa_app_name_google_authenticator" id="0x7f1211de" />
+    <public type="string" name="two_fa_auth_code" id="0x7f1211df" />
+    <public type="string" name="two_fa_backup_code_enter" id="0x7f1211e0" />
+    <public type="string" name="two_fa_backup_code_enter_wrong" id="0x7f1211e1" />
+    <public type="string" name="two_fa_backup_code_hint" id="0x7f1211e2" />
+    <public type="string" name="two_fa_backup_code_used" id="0x7f1211e3" />
+    <public type="string" name="two_fa_backup_codes_body" id="0x7f1211e4" />
+    <public type="string" name="two_fa_backup_codes_label" id="0x7f1211e5" />
+    <public type="string" name="two_fa_backup_codes_sales_pitch" id="0x7f1211e6" />
+    <public type="string" name="two_fa_change_account" id="0x7f1211e7" />
+    <public type="string" name="two_fa_code" id="0x7f1211e8" />
+    <public type="string" name="two_fa_disable" id="0x7f1211e9" />
+    <public type="string" name="two_fa_discord_backup_codes" id="0x7f1211ea" />
+    <public type="string" name="two_fa_download_app_body" id="0x7f1211eb" />
+    <public type="string" name="two_fa_download_app_label" id="0x7f1211ec" />
+    <public type="string" name="two_fa_download_codes" id="0x7f1211ed" />
+    <public type="string" name="two_fa_enable" id="0x7f1211ee" />
+    <public type="string" name="two_fa_enable_subheader" id="0x7f1211ef" />
+    <public type="string" name="two_fa_enabled" id="0x7f1211f0" />
+    <public type="string" name="two_fa_enter_sms_token_label" id="0x7f1211f1" />
+    <public type="string" name="two_fa_enter_sms_token_sending" id="0x7f1211f2" />
+    <public type="string" name="two_fa_enter_sms_token_sent" id="0x7f1211f3" />
+    <public type="string" name="two_fa_enter_token_body" id="0x7f1211f4" />
+    <public type="string" name="two_fa_enter_token_label" id="0x7f1211f5" />
+    <public type="string" name="two_fa_generate_codes" id="0x7f1211f6" />
+    <public type="string" name="two_fa_generate_codes_confirm_text" id="0x7f1211f7" />
+    <public type="string" name="two_fa_guild_mfa_warning" id="0x7f1211f8" />
+    <public type="string" name="two_fa_guild_mfa_warning_ios" id="0x7f1211f9" />
+    <public type="string" name="two_fa_guild_mfa_warning_message" id="0x7f1211fa" />
+    <public type="string" name="two_fa_guild_mfa_warning_resolve_button" id="0x7f1211fb" />
+    <public type="string" name="two_fa_ios_delete" id="0x7f1211fc" />
+    <public type="string" name="two_fa_key" id="0x7f1211fd" />
+    <public type="string" name="two_fa_login_body" id="0x7f1211fe" />
+    <public type="string" name="two_fa_login_footer" id="0x7f1211ff" />
+    <public type="string" name="two_fa_login_label" id="0x7f121200" />
+    <public type="string" name="two_fa_modal_setup_header_mobile" id="0x7f121201" />
+    <public type="string" name="two_fa_not_verified" id="0x7f121202" />
+    <public type="string" name="two_fa_qr_body" id="0x7f121203" />
+    <public type="string" name="two_fa_qr_label" id="0x7f121204" />
+    <public type="string" name="two_fa_remove" id="0x7f121205" />
+    <public type="string" name="two_fa_sales_pitch" id="0x7f121206" />
+    <public type="string" name="two_fa_success_body" id="0x7f121207" />
+    <public type="string" name="two_fa_success_body_mobile" id="0x7f121208" />
+    <public type="string" name="two_fa_success_header" id="0x7f121209" />
+    <public type="string" name="two_fa_token_required" id="0x7f12120a" />
+    <public type="string" name="two_fa_use_desktop_app" id="0x7f12120b" />
+    <public type="string" name="two_fa_view_backup_codes" id="0x7f12120c" />
+    <public type="string" name="two_fa_view_codes" id="0x7f12120d" />
+    <public type="string" name="two_users_typing" id="0x7f12120e" />
+    <public type="string" name="ucrop_error_input_data_is_absent" id="0x7f12120f" />
+    <public type="string" name="ucrop_label_edit_photo" id="0x7f121210" />
+    <public type="string" name="ucrop_label_original" id="0x7f121211" />
+    <public type="string" name="ucrop_menu_crop" id="0x7f121212" />
+    <public type="string" name="ucrop_mutate_exception_hint" id="0x7f121213" />
+    <public type="string" name="uk" id="0x7f121214" />
+    <public type="string" name="unable_to_join_channel_full" id="0x7f121215" />
+    <public type="string" name="unable_to_join_voice_unsupported_mobile" id="0x7f121216" />
+    <public type="string" name="unable_to_open_media_chooser" id="0x7f121217" />
+    <public type="string" name="unban" id="0x7f121218" />
+    <public type="string" name="unban_user_body" id="0x7f121219" />
+    <public type="string" name="unban_user_title" id="0x7f12121a" />
+    <public type="string" name="unblock" id="0x7f12121b" />
+    <public type="string" name="unblock_to_jump_body" id="0x7f12121c" />
+    <public type="string" name="unblock_to_jump_title" id="0x7f12121d" />
+    <public type="string" name="uncategorized" id="0x7f12121e" />
+    <public type="string" name="unclaimed_account_body" id="0x7f12121f" />
+    <public type="string" name="unclaimed_account_title" id="0x7f121220" />
+    <public type="string" name="undeafen" id="0x7f121221" />
+    <public type="string" name="unfocus_participant" id="0x7f121222" />
+    <public type="string" name="unhandled_link_body" id="0x7f121223" />
+    <public type="string" name="unhandled_link_title" id="0x7f121224" />
+    <public type="string" name="unified_open_install" id="0x7f121225" />
+    <public type="string" name="unknown_game" id="0x7f121226" />
+    <public type="string" name="unknown_region" id="0x7f121227" />
+    <public type="string" name="unknown_server" id="0x7f121228" />
+    <public type="string" name="unknown_user" id="0x7f121229" />
+    <public type="string" name="unmute" id="0x7f12122a" />
+    <public type="string" name="unmute_category" id="0x7f12122b" />
+    <public type="string" name="unnamed" id="0x7f12122c" />
+    <public type="string" name="unpin" id="0x7f12122d" />
+    <public type="string" name="unpin_confirm" id="0x7f12122e" />
+    <public type="string" name="unpin_message" id="0x7f12122f" />
+    <public type="string" name="unpin_message_body" id="0x7f121230" />
+    <public type="string" name="unpin_message_context_menu_hint" id="0x7f121231" />
+    <public type="string" name="unpin_message_failed_body" id="0x7f121232" />
+    <public type="string" name="unpin_message_failed_title" id="0x7f121233" />
+    <public type="string" name="unpin_message_title" id="0x7f121234" />
+    <public type="string" name="unread_channels" id="0x7f121235" />
+    <public type="string" name="unreads_count" id="0x7f121236" />
+    <public type="string" name="unsupported_browser" id="0x7f121237" />
+    <public type="string" name="unsupported_browser_body" id="0x7f121238" />
+    <public type="string" name="unsupported_browser_details" id="0x7f121239" />
+    <public type="string" name="unsupported_browser_title" id="0x7f12123a" />
+    <public type="string" name="unverified_account_body" id="0x7f12123b" />
+    <public type="string" name="unverified_account_title" id="0x7f12123c" />
+    <public type="string" name="update_available" id="0x7f12123d" />
+    <public type="string" name="update_downloaded" id="0x7f12123e" />
+    <public type="string" name="update_manually" id="0x7f12123f" />
+    <public type="string" name="upgrade_plan" id="0x7f121240" />
+    <public type="string" name="upgrade_yearly" id="0x7f121241" />
+    <public type="string" name="upload" id="0x7f121242" />
+    <public type="string" name="upload_a_media_file" id="0x7f121243" />
+    <public type="string" name="upload_area_cancel_all" id="0x7f121244" />
+    <public type="string" name="upload_area_help" id="0x7f121245" />
+    <public type="string" name="upload_area_invalid_file_type_help" id="0x7f121246" />
+    <public type="string" name="upload_area_invalid_file_type_title" id="0x7f121247" />
+    <public type="string" name="upload_area_leave_a_comment" id="0x7f121248" />
+    <public type="string" name="upload_area_optional" id="0x7f121249" />
+    <public type="string" name="upload_area_title" id="0x7f12124a" />
+    <public type="string" name="upload_area_title_no_confirmation" id="0x7f12124b" />
+    <public type="string" name="upload_area_too_large_help" id="0x7f12124c" />
+    <public type="string" name="upload_area_too_large_title" id="0x7f12124d" />
+    <public type="string" name="upload_area_upload_failed_help" id="0x7f12124e" />
+    <public type="string" name="upload_area_upload_failed_title" id="0x7f12124f" />
+    <public type="string" name="upload_background" id="0x7f121250" />
+    <public type="string" name="upload_debug_log_failure" id="0x7f121251" />
+    <public type="string" name="upload_debug_log_failure_header" id="0x7f121252" />
+    <public type="string" name="upload_debug_log_progress" id="0x7f121253" />
+    <public type="string" name="upload_debug_log_progress_header" id="0x7f121254" />
+    <public type="string" name="upload_debug_log_success" id="0x7f121255" />
+    <public type="string" name="upload_debug_log_success_header" id="0x7f121256" />
+    <public type="string" name="upload_emoji" id="0x7f121257" />
+    <public type="string" name="upload_image" id="0x7f121258" />
+    <public type="string" name="upload_image_body" id="0x7f121259" />
+    <public type="string" name="upload_load_file_failed" id="0x7f12125a" />
+    <public type="string" name="upload_open_file_failed" id="0x7f12125b" />
+    <public type="string" name="upload_process_file_failed" id="0x7f12125c" />
+    <public type="string" name="upload_queued" id="0x7f12125d" />
+    <public type="string" name="upload_uploads_too_large_help" id="0x7f12125e" />
+    <public type="string" name="upload_uploads_too_large_title" id="0x7f12125f" />
+    <public type="string" name="uploaded_by" id="0x7f121260" />
+    <public type="string" name="uploading_files" id="0x7f121261" />
+    <public type="string" name="usage_access" id="0x7f121262" />
+    <public type="string" name="usage_statistics_disable_modal_body" id="0x7f121263" />
+    <public type="string" name="usage_statistics_disable_modal_cancel" id="0x7f121264" />
+    <public type="string" name="usage_statistics_disable_modal_confirm" id="0x7f121265" />
+    <public type="string" name="usage_statistics_disable_modal_title" id="0x7f121266" />
+    <public type="string" name="use_external_emojis" id="0x7f121267" />
+    <public type="string" name="use_external_emojis_description" id="0x7f121268" />
+    <public type="string" name="use_speaker" id="0x7f121269" />
+    <public type="string" name="use_vad" id="0x7f12126a" />
+    <public type="string" name="use_vad_description" id="0x7f12126b" />
+    <public type="string" name="user_activity_accept_invite" id="0x7f12126c" />
+    <public type="string" name="user_activity_action_ask_to_join" id="0x7f12126d" />
+    <public type="string" name="user_activity_action_ask_to_join_user" id="0x7f12126e" />
+    <public type="string" name="user_activity_action_download_app" id="0x7f12126f" />
+    <public type="string" name="user_activity_action_failed_to_launch" id="0x7f121270" />
+    <public type="string" name="user_activity_action_notify_me" id="0x7f121271" />
+    <public type="string" name="user_activity_action_spectate" id="0x7f121272" />
+    <public type="string" name="user_activity_action_spectate_user" id="0x7f121273" />
+    <public type="string" name="user_activity_already_playing" id="0x7f121274" />
+    <public type="string" name="user_activity_already_syncing" id="0x7f121275" />
+    <public type="string" name="user_activity_cannot_join_self" id="0x7f121276" />
+    <public type="string" name="user_activity_cannot_play_self" id="0x7f121277" />
+    <public type="string" name="user_activity_cannot_spectate_self" id="0x7f121278" />
+    <public type="string" name="user_activity_cannot_sync_self" id="0x7f121279" />
+    <public type="string" name="user_activity_chat_invite_education" id="0x7f12127a" />
+    <public type="string" name="user_activity_connect_platform" id="0x7f12127b" />
+    <public type="string" name="user_activity_error_desktop_action" id="0x7f12127c" />
+    <public type="string" name="user_activity_error_desktop_body" id="0x7f12127d" />
+    <public type="string" name="user_activity_error_desktop_title" id="0x7f12127e" />
+    <public type="string" name="user_activity_error_friends_action" id="0x7f12127f" />
+    <public type="string" name="user_activity_error_friends_body" id="0x7f121280" />
+    <public type="string" name="user_activity_error_friends_title" id="0x7f121281" />
+    <public type="string" name="user_activity_header_listening" id="0x7f121282" />
+    <public type="string" name="user_activity_header_live_on_platform" id="0x7f121283" />
+    <public type="string" name="user_activity_header_playing" id="0x7f121284" />
+    <public type="string" name="user_activity_header_playing_on_platform" id="0x7f121285" />
+    <public type="string" name="user_activity_header_streaming_to_server" id="0x7f121286" />
+    <public type="string" name="user_activity_header_watching" id="0x7f121287" />
+    <public type="string" name="user_activity_invite_request_expired" id="0x7f121288" />
+    <public type="string" name="user_activity_invite_request_received" id="0x7f121289" />
+    <public type="string" name="user_activity_invite_request_requested" id="0x7f12128a" />
+    <public type="string" name="user_activity_invite_request_sent" id="0x7f12128b" />
+    <public type="string" name="user_activity_invite_request_waiting" id="0x7f12128c" />
+    <public type="string" name="user_activity_invite_to_join" id="0x7f12128d" />
+    <public type="string" name="user_activity_listen_along" id="0x7f12128e" />
+    <public type="string" name="user_activity_listen_along_description" id="0x7f12128f" />
+    <public type="string" name="user_activity_listening_album" id="0x7f121290" />
+    <public type="string" name="user_activity_listening_artists" id="0x7f121291" />
+    <public type="string" name="user_activity_never_mind" id="0x7f121292" />
+    <public type="string" name="user_activity_not_detected" id="0x7f121293" />
+    <public type="string" name="user_activity_play_on_platform" id="0x7f121294" />
+    <public type="string" name="user_activity_respond_nope" id="0x7f121295" />
+    <public type="string" name="user_activity_respond_yeah" id="0x7f121296" />
+    <public type="string" name="user_activity_state_size" id="0x7f121297" />
+    <public type="string" name="user_activity_timestamp_end" id="0x7f121298" />
+    <public type="string" name="user_activity_timestamp_end_simple" id="0x7f121299" />
+    <public type="string" name="user_activity_timestamp_start" id="0x7f12129a" />
+    <public type="string" name="user_activity_timestamp_start_simple" id="0x7f12129b" />
+    <public type="string" name="user_activity_user_playing_for_days" id="0x7f12129c" />
+    <public type="string" name="user_activity_user_playing_for_hours" id="0x7f12129d" />
+    <public type="string" name="user_activity_user_playing_for_minutes" id="0x7f12129e" />
+    <public type="string" name="user_activity_voice_channel" id="0x7f12129f" />
+    <public type="string" name="user_activity_watch_along" id="0x7f1212a0" />
+    <public type="string" name="user_dm_settings" id="0x7f1212a1" />
+    <public type="string" name="user_dm_settings_help" id="0x7f1212a2" />
+    <public type="string" name="user_dm_settings_question" id="0x7f1212a3" />
+    <public type="string" name="user_explicit_content_filter" id="0x7f1212a4" />
+    <public type="string" name="user_explicit_content_filter_disabled" id="0x7f1212a5" />
+    <public type="string" name="user_explicit_content_filter_disabled_help" id="0x7f1212a6" />
+    <public type="string" name="user_explicit_content_filter_friends_and_non_friends" id="0x7f1212a7" />
+    <public type="string" name="user_explicit_content_filter_friends_and_non_friends_help" id="0x7f1212a8" />
+    <public type="string" name="user_explicit_content_filter_help" id="0x7f1212a9" />
+    <public type="string" name="user_explicit_content_filter_non_friends" id="0x7f1212aa" />
+    <public type="string" name="user_explicit_content_filter_non_friends_help" id="0x7f1212ab" />
+    <public type="string" name="user_has_been_blocked" id="0x7f1212ac" />
+    <public type="string" name="user_has_been_unblocked" id="0x7f1212ad" />
+    <public type="string" name="user_info" id="0x7f1212ae" />
+    <public type="string" name="user_management" id="0x7f1212af" />
+    <public type="string" name="user_popout_message" id="0x7f1212b0" />
+    <public type="string" name="user_popout_settings" id="0x7f1212b1" />
+    <public type="string" name="user_popout_wumpus_tooltip" id="0x7f1212b2" />
+    <public type="string" name="user_profile_add_friend" id="0x7f1212b3" />
+    <public type="string" name="user_profile_audio" id="0x7f1212b4" />
+    <public type="string" name="user_profile_failure_to_open_message" id="0x7f1212b5" />
+    <public type="string" name="user_profile_guild_name_content_description" id="0x7f1212b6" />
+    <public type="string" name="user_profile_incoming_friend_request_dialog_body" id="0x7f1212b7" />
+    <public type="string" name="user_profile_message" id="0x7f1212b8" />
+    <public type="string" name="user_profile_mutual_friends" id="0x7f1212b9" />
+    <public type="string" name="user_profile_mutual_friends_placeholder" id="0x7f1212ba" />
+    <public type="string" name="user_profile_mutual_guilds" id="0x7f1212bb" />
+    <public type="string" name="user_profile_mutual_guilds_placeholder" id="0x7f1212bc" />
+    <public type="string" name="user_profile_pending" id="0x7f1212bd" />
+    <public type="string" name="user_profile_settings_setstatus" 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="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 be8eeaa087..d85f724c23 100644
--- a/com.discord/res/values/strings.xml
+++ b/com.discord/res/values/strings.xml
@@ -156,7 +156,7 @@
     <string name="add_a_role">Add a Role</string>
     <string name="add_a_server">Add a Server</string>
     <string name="add_a_server_mobile">Tap to add a server!</string>
-    <string name="add_by_id">Add by ID</string>
+    <string name="add_by_id">Add Friends</string>
     <string name="add_channel_or_category">Add a Channel or Category</string>
     <string name="add_channel_to_override">Add a channel to override its default notification settings</string>
     <string name="add_content">Add Content</string>
@@ -621,9 +621,7 @@
     <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>
@@ -700,6 +698,7 @@
     <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>
@@ -732,12 +731,10 @@
     <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>
@@ -747,8 +744,6 @@
     <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>
@@ -764,8 +759,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 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_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_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>
@@ -780,18 +775,16 @@
     <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>
@@ -804,45 +797,15 @@
     <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>
@@ -1059,7 +1022,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">ba847789-d51c-4ffe-ae92-0a37a0f6bfe3</string>
+    <string name="com.crashlytics.android.build_id">7da12d57-7e3e-419f-8d90-7c0f18819a5b</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>
@@ -1972,11 +1935,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 Server Boosts for %1$s.</string>
+    <string name="gift_confirmation_body_success_nitro_mobile">Thanks to another generous human, you now have access to enhanced chat perks and a Server Boost for %1$s.</string>
     <string name="gift_confirmation_body_success_premium_tier_1_monthly">Thanks to another generous human, you now have access to enhanced chat perks for %1$s.</string>
     <string name="gift_confirmation_body_success_premium_tier_1_yearly">Thanks to another generous human, you now have access to enhanced chat perks for %1$s.</string>
-    <string name="gift_confirmation_body_success_premium_tier_2_monthly">Thanks to another generous human, you now have access to 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_success_premium_tier_2_monthly">Thanks to another generous human, you now have access to enhanced chat perks and a Server Boost for %1$s.</string>
+    <string name="gift_confirmation_body_success_premium_tier_2_yearly">Thanks to another generous human, you now have access to enhanced chat perks and a Server Boost for %1$s.</string>
     <string name="gift_confirmation_body_unknown_error">Something funky happened and we failed to secure the bag…try again?</string>
     <string name="gift_confirmation_button_confirm">Heck Yeah! Add to Library</string>
     <string name="gift_confirmation_button_confirm_mobile">Gimme</string>
@@ -2123,14 +2086,14 @@ Icon"</string>
     <string name="guild_folder_color">Folder Color</string>
     <string name="guild_folder_name">Folder Name</string>
     <string name="guild_header_hotspot_tooltip">Level up your server by adding a bot!</string>
-    <string name="guild_join_intent_chat">Chat and meet people</string>
+    <string name="guild_join_intent_chat">Chat and chill with other players</string>
     <string name="guild_join_intent_chat_friends">Start a group with friends</string>
     <string name="guild_join_intent_game_help">Get game tips and help</string>
     <string name="guild_join_intent_lfg">Find people to play with</string>
     <string name="guild_join_intent_news">Get game news and updates</string>
     <string name="guild_join_intent_skip">Just looking around for now</string>
     <string name="guild_join_welcome_to_server">Welcome to %1$s!</string>
-    <string name="guild_join_what_are_you_looking_to_do">What are you looking to do?</string>
+    <string name="guild_join_what_are_you_looking_to_do">What are you looking to do here?</string>
     <string name="guild_members_header">%1$s members</string>
     <string name="guild_members_search_no_result">No members were found.</string>
     <string name="guild_message_notifications_only_mentions">Only @mentions</string>
@@ -2346,9 +2309,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 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_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_previous_perks">Boosted servers get everything previous, and —</string>
-    <string name="guild_settings_guild_premium_perks_title_none">No Server Boost</string>
+    <string name="guild_settings_guild_premium_perks_title_none">No Nitro 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>
@@ -2365,17 +2328,14 @@ 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 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_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_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">Server Boost Status</string>
+    <string name="guild_settings_premium_guild_title">Nitro 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>
@@ -2383,24 +2343,6 @@ Additionally, Nitro members get **%4$s free Server Boosts** with their subscript
     <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>
@@ -3091,7 +3033,6 @@ 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>
@@ -3124,7 +3065,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">Never Mind</string>
+    <string name="nevermind">Nevermind</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>
@@ -3247,7 +3188,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 Server Boosts.</string>
+    <string name="notice_premium_grandfathered_ended">Your access to Nitro has expired. Upgrade from Nitro Classic to Nitro for superpowered chat perks and a Server Boost.</string>
     <string name="notice_premium_grandfathered_ending">You only have %1$s left of Nitro! Your subscription downgrades to Nitro Classic on **%2$s**.</string>
     <string name="notice_premium_promo_action">Check it out</string>
     <string name="notice_premium_promo_message">"Support Discord's development and get fun perks!"</string>
@@ -3446,7 +3387,6 @@ 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>
@@ -3485,13 +3425,12 @@ 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 Gift</string>
+    <string name="payment_modal_button_premium_gift">Buy %1$s</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>
@@ -3535,7 +3474,6 @@ 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>
@@ -3608,7 +3546,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 included Server Boosts 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 Server Boost will be removed. You can restart your subscription anytime."</string>
     <string name="premium_cancel_confirm_body_tier_2_mobile_part_1">"Cancellation will take effect at the end of your current billing period. On **%1$s**, you will lose access to Nitro, your Discord Tag will be randomized if you've changed it, and your Server Boost will be removed."</string>
     <string name="premium_cancel_confirm_body_tier_2_mobile_part_2">You can restart your subscription anytime.</string>
     <string name="premium_cancel_confirm_mobile">Cancel Nitro</string>
@@ -3629,7 +3567,6 @@ 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>
@@ -3637,13 +3574,12 @@ 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">Want to keep it simple? Support Discord and get sweet chat perks:</string>
+    <string name="premium_chat_perks_simple_title">Keep it simple - get the base chat perks without a Server Boost.</string>
     <string name="premium_chat_perks_streaming_mobile">Better Go Live streams: Stream at source with Nitro or up to a crisp 1080p 60fps with Nitro Classic</string>
     <string name="premium_chat_perks_title_animated_avatar_and_emoji">Animated Fun</string>
     <string name="premium_chat_perks_title_badge">Rep Your Support</string>
     <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>
@@ -3680,152 +3616,87 @@ 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_mobile">Exclusive Server Booster roles</string>
+    <string name="premium_guild_features_new_role_description">Get a special server role available only to Nitro Server Boosters in your server.</string>
+    <string name="premium_guild_features_new_role_mobile">Exclusive Nitro Server Booster roles</string>
+    <string name="premium_guild_features_new_role_title">Exclusive New Role</string>
+    <string name="premium_guild_features_show_support_description">Boosters get a shiny, new profile badge that changes with their streak.</string>
     <string name="premium_guild_features_show_support_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_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_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_header_badge_no_tier">No Level</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_header_dropdown_nitro_server_subscribe">Nitro Server Boost</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. [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_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_button_get_premium">Get Nitro to Boost!</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_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_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_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_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 Boost this server?</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_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 transferring this Boost to 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 Boosting 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_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_duration">%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">Server Boosts are here! Rally your community to boost your server.</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_button">See Levels &amp; Perks</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_notice_small_guild">Nitro Server Boosts are here! Rally your friends to boost your 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 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_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_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 Boost from:</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_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 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_guild_unsubscribe_confirm_header">Remove Nitro Boost?</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>
@@ -3839,7 +3710,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 Server Boosts.</string>
+    <string name="premium_payment_gift_blurb">Gift your friends [Nitro](onClick) so they get superpower chat perks and a Server Boost.</string>
     <string name="premium_payment_gift_blurb_mobile">Gift someone Nitro to give access to super powered chat perks and Server Boosting. [Learn more about Nitro.](onClick)</string>
     <string name="premium_payment_gift_subtext">This will be a one time charge for the amount of time chosen. You will not be billed monthly.</string>
     <string name="premium_payment_is_gift">You are purchasing a gift.</string>
@@ -3850,10 +3721,6 @@ 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>
@@ -3869,12 +3736,8 @@ 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>
@@ -3883,10 +3746,6 @@ 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>
@@ -3895,10 +3754,15 @@ 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>
@@ -3923,17 +3787,9 @@ 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>
@@ -4495,6 +4351,8 @@ 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>
@@ -4557,9 +4415,6 @@ 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>
@@ -4962,6 +4817,7 @@ Server Insights is an experimental feature and is subject to change or removal i
     <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_settings_setstatus">Set Status</string>
     <string name="user_profile_video">Video</string>
     <string name="user_profile_volume">Volume</string>
     <string name="user_settings">User Settings</string>
@@ -5214,7 +5070,6 @@ 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>
@@ -5223,5 +5078,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_3c7">false</item>
+    <item type="string" name="APKTOOL_DUMMY_3a2">false</item>
 </resources>
diff --git a/com.discord/res/values/styles.xml b/com.discord/res/values/styles.xml
index b318f616c5..3d165c2bbf 100644
--- a/com.discord/res/values/styles.xml
+++ b/com.discord/res/values/styles.xml
@@ -160,6 +160,7 @@
         <item name="status_white_outline">@drawable/drawable_uikit_primary_100_button_outline</item>
         <item name="ternaryCheckboxDisabledColor">@color/primary_630_alpha_60</item>
         <item name="theme_name">dark</item>
+        <item name="toolbarColor">@color/primary_630</item>
     </style>
     <style name="AppTheme.Dark.Base" parent="@style/AppTheme.NoActionBar">
         <item name="anim_boost_confirmation">animations/anim_nitro_boost_confirmation_dark.json</item>
@@ -448,6 +449,7 @@
         <item name="theme_chat_input">#ff000000</item>
         <item name="theme_name">pureEvil</item>
         <item name="theme_status_indicator_color">@color/primary_800</item>
+        <item name="toolbarColor">@color/black</item>
     </style>
     <style name="AppTheme.Dark.Notice" parent="@style/Theme.AppCompat.Dialog">
         <item name="buttonBarNegativeButtonStyle">@style/UiKit.Button.Transparent.Fit</item>
@@ -532,6 +534,7 @@
         <item name="status_white_outline">@drawable/drawable_uikit_status_primary_300_button_outline</item>
         <item name="ternaryCheckboxDisabledColor">@color/primary_100_alpha_60</item>
         <item name="theme_name">light</item>
+        <item name="toolbarColor">@color/white</item>
     </style>
     <style name="AppTheme.Light.Base" parent="@style/AppTheme.NoActionBar">
         <item name="anim_boost_confirmation">animations/anim_nitro_boost_confirmation_light.json</item>
@@ -838,7 +841,7 @@
     <style name="AppTheme.Toolbar" parent="@style/AppTheme">
         <item name="android:theme">@style/AppTheme.ToolbarTheme</item>
         <item name="android:id">@id/action_bar_toolbar</item>
-        <item name="android:background">?colorPrimary</item>
+        <item name="android:background">?toolbarColor</item>
         <item name="android:layout_width">fill_parent</item>
         <item name="android:layout_height">?actionBarSize</item>
         <item name="android:minHeight">?actionBarSize</item>
diff --git a/com.discord/smali/androidx/activity/R$color.smali b/com.discord/smali/androidx/activity/R$color.smali
index 336d5313f9..774f39759f 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 = 0x7f0600b8
+.field public static final notification_action_color_filter:I = 0x7f0600b7
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b9
+.field public static final notification_icon_bg_color:I = 0x7f0600b8
 
-.field public static final ripple_material_light:I = 0x7f0600fb
+.field public static final ripple_material_light:I = 0x7f0600fa
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fd
+.field public static final secondary_text_default_material_light:I = 0x7f0600fc
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/activity/R$drawable.smali b/com.discord/smali/androidx/activity/R$drawable.smali
index 11e21c5c92..7dad73e207 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 = 0x7f080472
+.field public static final notification_action_background:I = 0x7f080463
 
-.field public static final notification_bg:I = 0x7f080473
+.field public static final notification_bg:I = 0x7f080464
 
-.field public static final notification_bg_low:I = 0x7f080474
+.field public static final notification_bg_low:I = 0x7f080465
 
-.field public static final notification_bg_low_normal:I = 0x7f080475
+.field public static final notification_bg_low_normal:I = 0x7f080466
 
-.field public static final notification_bg_low_pressed:I = 0x7f080476
+.field public static final notification_bg_low_pressed:I = 0x7f080467
 
-.field public static final notification_bg_normal:I = 0x7f080477
+.field public static final notification_bg_normal:I = 0x7f080468
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080478
+.field public static final notification_bg_normal_pressed:I = 0x7f080469
 
-.field public static final notification_icon_background:I = 0x7f080479
+.field public static final notification_icon_background:I = 0x7f08046a
 
-.field public static final notification_template_icon_bg:I = 0x7f08047a
+.field public static final notification_template_icon_bg:I = 0x7f08046b
 
-.field public static final notification_template_icon_low_bg:I = 0x7f08047b
+.field public static final notification_template_icon_low_bg:I = 0x7f08046c
 
-.field public static final notification_tile_bg:I = 0x7f08047c
+.field public static final notification_tile_bg:I = 0x7f08046d
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08047d
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08046e
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/activity/R$id.smali b/com.discord/smali/androidx/activity/R$id.smali
index ed6c375de5..3ba3fd6269 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 = 0x7f0a0080
+.field public static final async:I = 0x7f0a007f
 
-.field public static final blocking:I = 0x7f0a00ce
+.field public static final blocking:I = 0x7f0a00cd
 
 .field public static final chronometer:I = 0x7f0a0215
 
-.field public static final dialog_button:I = 0x7f0a025e
+.field public static final dialog_button:I = 0x7f0a025d
 
-.field public static final forever:I = 0x7f0a02f2
+.field public static final forever:I = 0x7f0a02f1
 
-.field public static final icon:I = 0x7f0a0396
+.field public static final icon:I = 0x7f0a0391
 
-.field public static final icon_group:I = 0x7f0a0397
+.field public static final icon_group:I = 0x7f0a0392
 
-.field public static final info:I = 0x7f0a03ac
+.field public static final info:I = 0x7f0a03a7
 
-.field public static final italic:I = 0x7f0a03d9
+.field public static final italic:I = 0x7f0a03d4
 
-.field public static final line1:I = 0x7f0a041d
+.field public static final line1:I = 0x7f0a0418
 
-.field public static final line3:I = 0x7f0a041e
+.field public static final line3:I = 0x7f0a0419
 
-.field public static final normal:I = 0x7f0a04a3
+.field public static final normal:I = 0x7f0a0496
 
-.field public static final notification_background:I = 0x7f0a04ad
+.field public static final notification_background:I = 0x7f0a04a0
 
-.field public static final notification_main_column:I = 0x7f0a04ae
+.field public static final notification_main_column:I = 0x7f0a04a1
 
-.field public static final notification_main_column_container:I = 0x7f0a04af
+.field public static final notification_main_column_container:I = 0x7f0a04a2
 
-.field public static final right_icon:I = 0x7f0a058d
+.field public static final right_icon:I = 0x7f0a0574
 
-.field public static final right_side:I = 0x7f0a058e
+.field public static final right_side:I = 0x7f0a0575
 
-.field public static final tag_accessibility_actions:I = 0x7f0a0762
+.field public static final tag_accessibility_actions:I = 0x7f0a073a
 
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0763
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a073b
 
-.field public static final tag_accessibility_heading:I = 0x7f0a0764
+.field public static final tag_accessibility_heading:I = 0x7f0a073c
 
-.field public static final tag_accessibility_pane_title:I = 0x7f0a0765
+.field public static final tag_accessibility_pane_title:I = 0x7f0a073d
 
-.field public static final tag_screen_reader_focusable:I = 0x7f0a0766
+.field public static final tag_screen_reader_focusable:I = 0x7f0a073e
 
-.field public static final tag_transition_group:I = 0x7f0a0767
+.field public static final tag_transition_group:I = 0x7f0a073f
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0768
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0740
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0769
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0741
 
-.field public static final text:I = 0x7f0a076f
+.field public static final text:I = 0x7f0a0747
 
-.field public static final text2:I = 0x7f0a0770
+.field public static final text2:I = 0x7f0a0748
 
-.field public static final time:I = 0x7f0a077d
+.field public static final time:I = 0x7f0a0755
 
-.field public static final title:I = 0x7f0a077e
+.field public static final title:I = 0x7f0a0756
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/activity/R$string.smali b/com.discord/smali/androidx/activity/R$string.smali
index effe4b8fe6..4ba6c32393 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 = 0x7f121165
+.field public static final status_bar_notification_info_overflow:I = 0x7f1210d9
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/appcompat/R$attr.smali b/com.discord/smali/androidx/appcompat/R$attr.smali
index 285a336762..2bb61740f7 100644
--- a/com.discord/smali/androidx/appcompat/R$attr.smali
+++ b/com.discord/smali/androidx/appcompat/R$attr.smali
@@ -315,207 +315,207 @@
 
 .field public static final layout_keyline:I = 0x7f04024b
 
-.field public static final lineHeight:I = 0x7f04025a
+.field public static final lineHeight:I = 0x7f040259
 
-.field public static final listChoiceBackgroundIndicator:I = 0x7f04025c
+.field public static final listChoiceBackgroundIndicator:I = 0x7f04025b
 
-.field public static final listDividerAlertDialog:I = 0x7f04025d
+.field public static final listDividerAlertDialog:I = 0x7f04025c
 
-.field public static final listItemLayout:I = 0x7f04025e
+.field public static final listItemLayout:I = 0x7f04025d
 
-.field public static final listLayout:I = 0x7f04025f
+.field public static final listLayout:I = 0x7f04025e
 
-.field public static final listMenuViewStyle:I = 0x7f040260
+.field public static final listMenuViewStyle:I = 0x7f04025f
 
-.field public static final listPopupWindowStyle:I = 0x7f040261
+.field public static final listPopupWindowStyle:I = 0x7f040260
 
-.field public static final listPreferredItemHeight:I = 0x7f040262
+.field public static final listPreferredItemHeight:I = 0x7f040261
 
-.field public static final listPreferredItemHeightLarge:I = 0x7f040263
+.field public static final listPreferredItemHeightLarge:I = 0x7f040262
 
-.field public static final listPreferredItemHeightSmall:I = 0x7f040264
+.field public static final listPreferredItemHeightSmall:I = 0x7f040263
 
-.field public static final listPreferredItemPaddingLeft:I = 0x7f040265
+.field public static final listPreferredItemPaddingLeft:I = 0x7f040264
 
-.field public static final listPreferredItemPaddingRight:I = 0x7f040266
+.field public static final listPreferredItemPaddingRight:I = 0x7f040265
 
-.field public static final logo:I = 0x7f040267
+.field public static final logo:I = 0x7f040266
 
-.field public static final logoDescription:I = 0x7f040268
+.field public static final logoDescription:I = 0x7f040267
 
-.field public static final maxButtonHeight:I = 0x7f04027b
+.field public static final maxButtonHeight:I = 0x7f04027a
 
-.field public static final measureWithLargestChild:I = 0x7f04027e
+.field public static final measureWithLargestChild:I = 0x7f04027d
 
-.field public static final multiChoiceItemLayout:I = 0x7f040280
+.field public static final multiChoiceItemLayout:I = 0x7f04027f
 
-.field public static final navigationContentDescription:I = 0x7f040281
+.field public static final navigationContentDescription:I = 0x7f040280
 
-.field public static final navigationIcon:I = 0x7f040282
+.field public static final navigationIcon:I = 0x7f040281
 
-.field public static final navigationMode:I = 0x7f040283
+.field public static final navigationMode:I = 0x7f040282
 
-.field public static final numericModifiers:I = 0x7f040287
+.field public static final numericModifiers:I = 0x7f040286
 
-.field public static final overlapAnchor:I = 0x7f040288
+.field public static final overlapAnchor:I = 0x7f040287
 
-.field public static final paddingBottomNoButtons:I = 0x7f04028c
+.field public static final paddingBottomNoButtons:I = 0x7f04028b
 
-.field public static final paddingEnd:I = 0x7f04028d
+.field public static final paddingEnd:I = 0x7f04028c
 
-.field public static final paddingStart:I = 0x7f04028e
+.field public static final paddingStart:I = 0x7f04028d
 
-.field public static final paddingTopNoTitle:I = 0x7f04028f
+.field public static final paddingTopNoTitle:I = 0x7f04028e
 
-.field public static final panelBackground:I = 0x7f040290
+.field public static final panelBackground:I = 0x7f04028f
 
-.field public static final panelMenuListTheme:I = 0x7f040291
+.field public static final panelMenuListTheme:I = 0x7f040290
 
-.field public static final panelMenuListWidth:I = 0x7f040292
+.field public static final panelMenuListWidth:I = 0x7f040291
 
-.field public static final popupMenuStyle:I = 0x7f04029a
+.field public static final popupMenuStyle:I = 0x7f040299
 
-.field public static final popupTheme:I = 0x7f04029b
+.field public static final popupTheme:I = 0x7f04029a
 
-.field public static final popupWindowStyle:I = 0x7f04029c
+.field public static final popupWindowStyle:I = 0x7f04029b
 
-.field public static final preserveIconSpacing:I = 0x7f04029d
+.field public static final preserveIconSpacing:I = 0x7f04029c
 
-.field public static final progressBarPadding:I = 0x7f0402c9
+.field public static final progressBarPadding:I = 0x7f0402c8
 
-.field public static final progressBarStyle:I = 0x7f0402ca
+.field public static final progressBarStyle:I = 0x7f0402c9
 
-.field public static final queryBackground:I = 0x7f0402cd
+.field public static final queryBackground:I = 0x7f0402cc
 
-.field public static final queryHint:I = 0x7f0402ce
+.field public static final queryHint:I = 0x7f0402cd
 
-.field public static final radioButtonStyle:I = 0x7f0402cf
+.field public static final radioButtonStyle:I = 0x7f0402ce
 
-.field public static final ratingBarStyle:I = 0x7f0402d2
+.field public static final ratingBarStyle:I = 0x7f0402d1
 
-.field public static final ratingBarStyleIndicator:I = 0x7f0402d3
+.field public static final ratingBarStyleIndicator:I = 0x7f0402d2
 
-.field public static final ratingBarStyleSmall:I = 0x7f0402d4
+.field public static final ratingBarStyleSmall:I = 0x7f0402d3
 
-.field public static final searchHintIcon:I = 0x7f0402f9
+.field public static final searchHintIcon:I = 0x7f0402f8
 
-.field public static final searchIcon:I = 0x7f0402fa
+.field public static final searchIcon:I = 0x7f0402f9
 
-.field public static final searchViewStyle:I = 0x7f0402fb
+.field public static final searchViewStyle:I = 0x7f0402fa
 
-.field public static final seekBarStyle:I = 0x7f0402fd
+.field public static final seekBarStyle:I = 0x7f0402fc
 
-.field public static final selectableItemBackground:I = 0x7f0402fe
+.field public static final selectableItemBackground:I = 0x7f0402fd
 
-.field public static final selectableItemBackgroundBorderless:I = 0x7f0402ff
+.field public static final selectableItemBackgroundBorderless:I = 0x7f0402fe
 
-.field public static final showAsAction:I = 0x7f040301
+.field public static final showAsAction:I = 0x7f040300
 
-.field public static final showDividers:I = 0x7f040305
+.field public static final showDividers:I = 0x7f040304
 
-.field public static final showText:I = 0x7f040307
+.field public static final showText:I = 0x7f040306
 
-.field public static final showTitle:I = 0x7f040308
+.field public static final showTitle:I = 0x7f040307
 
-.field public static final singleChoiceItemLayout:I = 0x7f040309
+.field public static final singleChoiceItemLayout:I = 0x7f040308
 
-.field public static final spinBars:I = 0x7f04030f
+.field public static final spinBars:I = 0x7f04030e
 
-.field public static final spinnerDropDownItemStyle:I = 0x7f040310
+.field public static final spinnerDropDownItemStyle:I = 0x7f04030f
 
-.field public static final spinnerStyle:I = 0x7f040311
+.field public static final spinnerStyle:I = 0x7f040310
 
-.field public static final splitTrack:I = 0x7f040312
+.field public static final splitTrack:I = 0x7f040311
 
-.field public static final srcCompat:I = 0x7f040313
+.field public static final srcCompat:I = 0x7f040312
 
-.field public static final state_above_anchor:I = 0x7f040315
+.field public static final state_above_anchor:I = 0x7f040314
 
-.field public static final statusBarBackground:I = 0x7f04031a
+.field public static final statusBarBackground:I = 0x7f040319
 
-.field public static final subMenuArrow:I = 0x7f040321
+.field public static final subMenuArrow:I = 0x7f040320
 
-.field public static final submitBackground:I = 0x7f040322
+.field public static final submitBackground:I = 0x7f040321
 
-.field public static final subtitle:I = 0x7f040323
+.field public static final subtitle:I = 0x7f040322
 
-.field public static final subtitleTextAppearance:I = 0x7f040324
+.field public static final subtitleTextAppearance:I = 0x7f040323
 
-.field public static final subtitleTextColor:I = 0x7f040325
+.field public static final subtitleTextColor:I = 0x7f040324
 
-.field public static final subtitleTextStyle:I = 0x7f040326
+.field public static final subtitleTextStyle:I = 0x7f040325
 
-.field public static final suggestionRowLayout:I = 0x7f040327
+.field public static final suggestionRowLayout:I = 0x7f040326
 
-.field public static final switchMinWidth:I = 0x7f040328
+.field public static final switchMinWidth:I = 0x7f040327
 
-.field public static final switchPadding:I = 0x7f040329
+.field public static final switchPadding:I = 0x7f040328
 
-.field public static final switchStyle:I = 0x7f04032a
+.field public static final switchStyle:I = 0x7f040329
 
-.field public static final switchTextAppearance:I = 0x7f04032b
+.field public static final switchTextAppearance:I = 0x7f04032a
 
-.field public static final textAllCaps:I = 0x7f040349
+.field public static final textAllCaps:I = 0x7f040348
 
-.field public static final textAppearanceLargePopupMenu:I = 0x7f040354
+.field public static final textAppearanceLargePopupMenu:I = 0x7f040353
 
-.field public static final textAppearanceListItem:I = 0x7f040355
+.field public static final textAppearanceListItem:I = 0x7f040354
 
-.field public static final textAppearanceListItemSecondary:I = 0x7f040356
+.field public static final textAppearanceListItemSecondary:I = 0x7f040355
 
-.field public static final textAppearanceListItemSmall:I = 0x7f040357
+.field public static final textAppearanceListItemSmall:I = 0x7f040356
 
-.field public static final textAppearancePopupMenuHeader:I = 0x7f040359
+.field public static final textAppearancePopupMenuHeader:I = 0x7f040358
 
-.field public static final textAppearanceSearchResultSubtitle:I = 0x7f04035a
+.field public static final textAppearanceSearchResultSubtitle:I = 0x7f040359
 
-.field public static final textAppearanceSearchResultTitle:I = 0x7f04035b
+.field public static final textAppearanceSearchResultTitle:I = 0x7f04035a
 
-.field public static final textAppearanceSmallPopupMenu:I = 0x7f04035c
+.field public static final textAppearanceSmallPopupMenu:I = 0x7f04035b
 
-.field public static final textColorAlertDialogListItem:I = 0x7f04035f
+.field public static final textColorAlertDialogListItem:I = 0x7f04035e
 
-.field public static final textColorSearchUrl:I = 0x7f040360
+.field public static final textColorSearchUrl:I = 0x7f04035f
 
-.field public static final theme:I = 0x7f040365
+.field public static final theme:I = 0x7f040364
 
-.field public static final thickness:I = 0x7f0403b6
+.field public static final thickness:I = 0x7f0403b5
 
-.field public static final thumbTextPadding:I = 0x7f0403b7
+.field public static final thumbTextPadding:I = 0x7f0403b6
 
-.field public static final thumbTint:I = 0x7f0403b8
+.field public static final thumbTint:I = 0x7f0403b7
 
-.field public static final thumbTintMode:I = 0x7f0403b9
+.field public static final thumbTintMode:I = 0x7f0403b8
 
-.field public static final tickMark:I = 0x7f0403ba
+.field public static final tickMark:I = 0x7f0403b9
 
-.field public static final tickMarkTint:I = 0x7f0403bb
+.field public static final tickMarkTint:I = 0x7f0403ba
 
-.field public static final tickMarkTintMode:I = 0x7f0403bc
+.field public static final tickMarkTintMode:I = 0x7f0403bb
 
-.field public static final tint:I = 0x7f0403bd
+.field public static final tint:I = 0x7f0403bc
 
-.field public static final tintMode:I = 0x7f0403be
+.field public static final tintMode:I = 0x7f0403bd
 
-.field public static final title:I = 0x7f0403bf
+.field public static final title:I = 0x7f0403be
 
-.field public static final titleMargin:I = 0x7f0403c1
+.field public static final titleMargin:I = 0x7f0403c0
 
-.field public static final titleMarginBottom:I = 0x7f0403c2
+.field public static final titleMarginBottom:I = 0x7f0403c1
 
-.field public static final titleMarginEnd:I = 0x7f0403c3
+.field public static final titleMarginEnd:I = 0x7f0403c2
 
-.field public static final titleMarginStart:I = 0x7f0403c4
+.field public static final titleMarginStart:I = 0x7f0403c3
 
-.field public static final titleMarginTop:I = 0x7f0403c5
+.field public static final titleMarginTop:I = 0x7f0403c4
 
-.field public static final titleMargins:I = 0x7f0403c6
+.field public static final titleMargins:I = 0x7f0403c5
 
-.field public static final titleTextAppearance:I = 0x7f0403c7
+.field public static final titleTextAppearance:I = 0x7f0403c6
 
-.field public static final titleTextColor:I = 0x7f0403c8
+.field public static final titleTextColor:I = 0x7f0403c7
 
-.field public static final titleTextStyle:I = 0x7f0403c9
+.field public static final titleTextStyle:I = 0x7f0403c8
 
 .field public static final toolbarNavigationButtonStyle:I = 0x7f0403cb
 
diff --git a/com.discord/smali/androidx/appcompat/R$color.smali b/com.discord/smali/androidx/appcompat/R$color.smali
index c3ca8ea036..948287ae37 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 = 0x7f060035
+.field public static final bright_foreground_disabled_material_dark:I = 0x7f060034
 
-.field public static final bright_foreground_disabled_material_light:I = 0x7f060036
+.field public static final bright_foreground_disabled_material_light:I = 0x7f060035
 
-.field public static final bright_foreground_inverse_material_dark:I = 0x7f060037
+.field public static final bright_foreground_inverse_material_dark:I = 0x7f060036
 
-.field public static final bright_foreground_inverse_material_light:I = 0x7f060038
+.field public static final bright_foreground_inverse_material_light:I = 0x7f060037
 
-.field public static final bright_foreground_material_dark:I = 0x7f060039
+.field public static final bright_foreground_material_dark:I = 0x7f060038
 
-.field public static final bright_foreground_material_light:I = 0x7f06003a
+.field public static final bright_foreground_material_light:I = 0x7f060039
 
-.field public static final button_material_dark:I = 0x7f060040
+.field public static final button_material_dark:I = 0x7f06003f
 
-.field public static final button_material_light:I = 0x7f060041
+.field public static final button_material_light:I = 0x7f060040
 
-.field public static final dim_foreground_disabled_material_dark:I = 0x7f060069
+.field public static final dim_foreground_disabled_material_dark:I = 0x7f060068
 
-.field public static final dim_foreground_disabled_material_light:I = 0x7f06006a
+.field public static final dim_foreground_disabled_material_light:I = 0x7f060069
 
-.field public static final dim_foreground_material_dark:I = 0x7f06006b
+.field public static final dim_foreground_material_dark:I = 0x7f06006a
 
-.field public static final dim_foreground_material_light:I = 0x7f06006c
+.field public static final dim_foreground_material_light:I = 0x7f06006b
 
-.field public static final error_color_material_dark:I = 0x7f06006d
+.field public static final error_color_material_dark:I = 0x7f06006c
 
-.field public static final error_color_material_light:I = 0x7f06006e
+.field public static final error_color_material_light:I = 0x7f06006d
 
-.field public static final foreground_material_dark:I = 0x7f060073
+.field public static final foreground_material_dark:I = 0x7f060072
 
-.field public static final foreground_material_light:I = 0x7f060074
+.field public static final foreground_material_light:I = 0x7f060073
 
-.field public static final highlighted_text_material_dark:I = 0x7f060083
+.field public static final highlighted_text_material_dark:I = 0x7f060082
 
-.field public static final highlighted_text_material_light:I = 0x7f060084
+.field public static final highlighted_text_material_light:I = 0x7f060083
 
-.field public static final material_blue_grey_800:I = 0x7f060092
+.field public static final material_blue_grey_800:I = 0x7f060091
 
-.field public static final material_blue_grey_900:I = 0x7f060093
+.field public static final material_blue_grey_900:I = 0x7f060092
 
-.field public static final material_blue_grey_950:I = 0x7f060094
+.field public static final material_blue_grey_950:I = 0x7f060093
 
-.field public static final material_deep_teal_200:I = 0x7f060095
+.field public static final material_deep_teal_200:I = 0x7f060094
 
-.field public static final material_deep_teal_500:I = 0x7f060096
+.field public static final material_deep_teal_500:I = 0x7f060095
 
-.field public static final material_grey_100:I = 0x7f060097
+.field public static final material_grey_100:I = 0x7f060096
 
-.field public static final material_grey_300:I = 0x7f060098
+.field public static final material_grey_300:I = 0x7f060097
 
-.field public static final material_grey_50:I = 0x7f060099
+.field public static final material_grey_50:I = 0x7f060098
 
-.field public static final material_grey_600:I = 0x7f06009a
+.field public static final material_grey_600:I = 0x7f060099
 
-.field public static final material_grey_800:I = 0x7f06009b
+.field public static final material_grey_800:I = 0x7f06009a
 
-.field public static final material_grey_850:I = 0x7f06009c
+.field public static final material_grey_850:I = 0x7f06009b
 
-.field public static final material_grey_900:I = 0x7f06009d
+.field public static final material_grey_900:I = 0x7f06009c
 
-.field public static final notification_action_color_filter:I = 0x7f0600b8
+.field public static final notification_action_color_filter:I = 0x7f0600b7
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b9
+.field public static final notification_icon_bg_color:I = 0x7f0600b8
 
-.field public static final primary_dark_material_dark:I = 0x7f0600db
+.field public static final primary_dark_material_dark:I = 0x7f0600da
 
-.field public static final primary_dark_material_light:I = 0x7f0600dc
+.field public static final primary_dark_material_light:I = 0x7f0600db
 
-.field public static final primary_material_dark:I = 0x7f0600ec
+.field public static final primary_material_dark:I = 0x7f0600eb
 
-.field public static final primary_material_light:I = 0x7f0600ed
+.field public static final primary_material_light:I = 0x7f0600ec
 
-.field public static final primary_text_default_material_dark:I = 0x7f0600ee
+.field public static final primary_text_default_material_dark:I = 0x7f0600ed
 
-.field public static final primary_text_default_material_light:I = 0x7f0600ef
+.field public static final primary_text_default_material_light:I = 0x7f0600ee
 
-.field public static final primary_text_disabled_material_dark:I = 0x7f0600f0
+.field public static final primary_text_disabled_material_dark:I = 0x7f0600ef
 
-.field public static final primary_text_disabled_material_light:I = 0x7f0600f1
+.field public static final primary_text_disabled_material_light:I = 0x7f0600f0
 
-.field public static final ripple_material_dark:I = 0x7f0600fa
+.field public static final ripple_material_dark:I = 0x7f0600f9
 
-.field public static final ripple_material_light:I = 0x7f0600fb
+.field public static final ripple_material_light:I = 0x7f0600fa
 
-.field public static final secondary_text_default_material_dark:I = 0x7f0600fc
+.field public static final secondary_text_default_material_dark:I = 0x7f0600fb
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fd
+.field public static final secondary_text_default_material_light:I = 0x7f0600fc
 
-.field public static final secondary_text_disabled_material_dark:I = 0x7f0600fe
+.field public static final secondary_text_disabled_material_dark:I = 0x7f0600fd
 
-.field public static final secondary_text_disabled_material_light:I = 0x7f0600ff
+.field public static final secondary_text_disabled_material_light:I = 0x7f0600fe
 
-.field public static final switch_thumb_disabled_material_dark:I = 0x7f06012e
+.field public static final switch_thumb_disabled_material_dark:I = 0x7f06012d
 
-.field public static final switch_thumb_disabled_material_light:I = 0x7f06012f
+.field public static final switch_thumb_disabled_material_light:I = 0x7f06012e
 
-.field public static final switch_thumb_material_dark:I = 0x7f060130
+.field public static final switch_thumb_material_dark:I = 0x7f06012f
 
-.field public static final switch_thumb_material_light:I = 0x7f060131
+.field public static final switch_thumb_material_light:I = 0x7f060130
 
-.field public static final switch_thumb_normal_material_dark:I = 0x7f060132
+.field public static final switch_thumb_normal_material_dark:I = 0x7f060131
 
-.field public static final switch_thumb_normal_material_light:I = 0x7f060133
+.field public static final switch_thumb_normal_material_light:I = 0x7f060132
 
-.field public static final tooltip_background_dark:I = 0x7f060135
+.field public static final tooltip_background_dark:I = 0x7f060134
 
-.field public static final tooltip_background_light:I = 0x7f060136
+.field public static final tooltip_background_light:I = 0x7f060135
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/appcompat/R$drawable.smali b/com.discord/smali/androidx/appcompat/R$drawable.smali
index 5effaf77d3..75d77510e0 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 = 0x7f080017
+.field public static final abc_ab_share_pack_mtrl_alpha:I = 0x7f080016
 
-.field public static final abc_action_bar_item_background_material:I = 0x7f080018
+.field public static final abc_action_bar_item_background_material:I = 0x7f080017
 
-.field public static final abc_btn_borderless_material:I = 0x7f080019
+.field public static final abc_btn_borderless_material:I = 0x7f080018
 
-.field public static final abc_btn_check_material:I = 0x7f08001a
+.field public static final abc_btn_check_material:I = 0x7f080019
 
-.field public static final abc_btn_check_to_on_mtrl_000:I = 0x7f08001b
+.field public static final abc_btn_check_to_on_mtrl_000:I = 0x7f08001a
 
-.field public static final abc_btn_check_to_on_mtrl_015:I = 0x7f08001c
+.field public static final abc_btn_check_to_on_mtrl_015:I = 0x7f08001b
 
-.field public static final abc_btn_colored_material:I = 0x7f08001d
+.field public static final abc_btn_colored_material:I = 0x7f08001c
 
-.field public static final abc_btn_default_mtrl_shape:I = 0x7f08001e
+.field public static final abc_btn_default_mtrl_shape:I = 0x7f08001d
 
-.field public static final abc_btn_radio_material:I = 0x7f08001f
+.field public static final abc_btn_radio_material:I = 0x7f08001e
 
-.field public static final abc_btn_radio_to_on_mtrl_000:I = 0x7f080020
+.field public static final abc_btn_radio_to_on_mtrl_000:I = 0x7f08001f
 
-.field public static final abc_btn_radio_to_on_mtrl_015:I = 0x7f080021
+.field public static final abc_btn_radio_to_on_mtrl_015:I = 0x7f080020
 
-.field public static final abc_btn_switch_to_on_mtrl_00001:I = 0x7f080022
+.field public static final abc_btn_switch_to_on_mtrl_00001:I = 0x7f080021
 
-.field public static final abc_btn_switch_to_on_mtrl_00012:I = 0x7f080023
+.field public static final abc_btn_switch_to_on_mtrl_00012:I = 0x7f080022
 
-.field public static final abc_cab_background_internal_bg:I = 0x7f080024
+.field public static final abc_cab_background_internal_bg:I = 0x7f080023
 
-.field public static final abc_cab_background_top_material:I = 0x7f080025
+.field public static final abc_cab_background_top_material:I = 0x7f080024
 
-.field public static final abc_cab_background_top_mtrl_alpha:I = 0x7f080026
+.field public static final abc_cab_background_top_mtrl_alpha:I = 0x7f080025
 
-.field public static final abc_control_background_material:I = 0x7f080027
+.field public static final abc_control_background_material:I = 0x7f080026
 
-.field public static final abc_dialog_material_background:I = 0x7f080028
+.field public static final abc_dialog_material_background:I = 0x7f080027
 
-.field public static final abc_edit_text_material:I = 0x7f080029
+.field public static final abc_edit_text_material:I = 0x7f080028
 
-.field public static final abc_ic_ab_back_material:I = 0x7f08002a
+.field public static final abc_ic_ab_back_material:I = 0x7f080029
 
-.field public static final abc_ic_arrow_drop_right_black_24dp:I = 0x7f08002b
+.field public static final abc_ic_arrow_drop_right_black_24dp:I = 0x7f08002a
 
-.field public static final abc_ic_clear_material:I = 0x7f08002c
+.field public static final abc_ic_clear_material:I = 0x7f08002b
 
-.field public static final abc_ic_commit_search_api_mtrl_alpha:I = 0x7f08002d
+.field public static final abc_ic_commit_search_api_mtrl_alpha:I = 0x7f08002c
 
-.field public static final abc_ic_go_search_api_material:I = 0x7f08002e
+.field public static final abc_ic_go_search_api_material:I = 0x7f08002d
 
-.field public static final abc_ic_menu_copy_mtrl_am_alpha:I = 0x7f08002f
+.field public static final abc_ic_menu_copy_mtrl_am_alpha:I = 0x7f08002e
 
-.field public static final abc_ic_menu_cut_mtrl_alpha:I = 0x7f080030
+.field public static final abc_ic_menu_cut_mtrl_alpha:I = 0x7f08002f
 
-.field public static final abc_ic_menu_overflow_material:I = 0x7f080031
+.field public static final abc_ic_menu_overflow_material:I = 0x7f080030
 
-.field public static final abc_ic_menu_paste_mtrl_am_alpha:I = 0x7f080032
+.field public static final abc_ic_menu_paste_mtrl_am_alpha:I = 0x7f080031
 
-.field public static final abc_ic_menu_selectall_mtrl_alpha:I = 0x7f080033
+.field public static final abc_ic_menu_selectall_mtrl_alpha:I = 0x7f080032
 
-.field public static final abc_ic_menu_share_mtrl_alpha:I = 0x7f080034
+.field public static final abc_ic_menu_share_mtrl_alpha:I = 0x7f080033
 
-.field public static final abc_ic_search_api_material:I = 0x7f080035
+.field public static final abc_ic_search_api_material:I = 0x7f080034
 
-.field public static final abc_ic_star_black_16dp:I = 0x7f080036
+.field public static final abc_ic_star_black_16dp:I = 0x7f080035
 
-.field public static final abc_ic_star_black_36dp:I = 0x7f080037
+.field public static final abc_ic_star_black_36dp:I = 0x7f080036
 
-.field public static final abc_ic_star_black_48dp:I = 0x7f080038
+.field public static final abc_ic_star_black_48dp:I = 0x7f080037
 
-.field public static final abc_ic_star_half_black_16dp:I = 0x7f080039
+.field public static final abc_ic_star_half_black_16dp:I = 0x7f080038
 
-.field public static final abc_ic_star_half_black_36dp:I = 0x7f08003a
+.field public static final abc_ic_star_half_black_36dp:I = 0x7f080039
 
-.field public static final abc_ic_star_half_black_48dp:I = 0x7f08003b
+.field public static final abc_ic_star_half_black_48dp:I = 0x7f08003a
 
-.field public static final abc_ic_voice_search_api_material:I = 0x7f08003c
+.field public static final abc_ic_voice_search_api_material:I = 0x7f08003b
 
-.field public static final abc_item_background_holo_dark:I = 0x7f08003d
+.field public static final abc_item_background_holo_dark:I = 0x7f08003c
 
-.field public static final abc_item_background_holo_light:I = 0x7f08003e
+.field public static final abc_item_background_holo_light:I = 0x7f08003d
 
-.field public static final abc_list_divider_material:I = 0x7f08003f
+.field public static final abc_list_divider_material:I = 0x7f08003e
 
-.field public static final abc_list_divider_mtrl_alpha:I = 0x7f080040
+.field public static final abc_list_divider_mtrl_alpha:I = 0x7f08003f
 
-.field public static final abc_list_focused_holo:I = 0x7f080041
+.field public static final abc_list_focused_holo:I = 0x7f080040
 
-.field public static final abc_list_longpressed_holo:I = 0x7f080042
+.field public static final abc_list_longpressed_holo:I = 0x7f080041
 
-.field public static final abc_list_pressed_holo_dark:I = 0x7f080043
+.field public static final abc_list_pressed_holo_dark:I = 0x7f080042
 
-.field public static final abc_list_pressed_holo_light:I = 0x7f080044
+.field public static final abc_list_pressed_holo_light:I = 0x7f080043
 
-.field public static final abc_list_selector_background_transition_holo_dark:I = 0x7f080045
+.field public static final abc_list_selector_background_transition_holo_dark:I = 0x7f080044
 
-.field public static final abc_list_selector_background_transition_holo_light:I = 0x7f080046
+.field public static final abc_list_selector_background_transition_holo_light:I = 0x7f080045
 
-.field public static final abc_list_selector_disabled_holo_dark:I = 0x7f080047
+.field public static final abc_list_selector_disabled_holo_dark:I = 0x7f080046
 
-.field public static final abc_list_selector_disabled_holo_light:I = 0x7f080048
+.field public static final abc_list_selector_disabled_holo_light:I = 0x7f080047
 
-.field public static final abc_list_selector_holo_dark:I = 0x7f080049
+.field public static final abc_list_selector_holo_dark:I = 0x7f080048
 
-.field public static final abc_list_selector_holo_light:I = 0x7f08004a
+.field public static final abc_list_selector_holo_light:I = 0x7f080049
 
-.field public static final abc_menu_hardkey_panel_mtrl_mult:I = 0x7f08004b
+.field public static final abc_menu_hardkey_panel_mtrl_mult:I = 0x7f08004a
 
-.field public static final abc_popup_background_mtrl_mult:I = 0x7f08004c
+.field public static final abc_popup_background_mtrl_mult:I = 0x7f08004b
 
-.field public static final abc_ratingbar_indicator_material:I = 0x7f08004d
+.field public static final abc_ratingbar_indicator_material:I = 0x7f08004c
 
-.field public static final abc_ratingbar_material:I = 0x7f08004e
+.field public static final abc_ratingbar_material:I = 0x7f08004d
 
-.field public static final abc_ratingbar_small_material:I = 0x7f08004f
+.field public static final abc_ratingbar_small_material:I = 0x7f08004e
 
-.field public static final abc_scrubber_control_off_mtrl_alpha:I = 0x7f080050
+.field public static final abc_scrubber_control_off_mtrl_alpha:I = 0x7f08004f
 
-.field public static final abc_scrubber_control_to_pressed_mtrl_000:I = 0x7f080051
+.field public static final abc_scrubber_control_to_pressed_mtrl_000:I = 0x7f080050
 
-.field public static final abc_scrubber_control_to_pressed_mtrl_005:I = 0x7f080052
+.field public static final abc_scrubber_control_to_pressed_mtrl_005:I = 0x7f080051
 
-.field public static final abc_scrubber_primary_mtrl_alpha:I = 0x7f080053
+.field public static final abc_scrubber_primary_mtrl_alpha:I = 0x7f080052
 
-.field public static final abc_scrubber_track_mtrl_alpha:I = 0x7f080054
+.field public static final abc_scrubber_track_mtrl_alpha:I = 0x7f080053
 
-.field public static final abc_seekbar_thumb_material:I = 0x7f080055
+.field public static final abc_seekbar_thumb_material:I = 0x7f080054
 
-.field public static final abc_seekbar_tick_mark_material:I = 0x7f080056
+.field public static final abc_seekbar_tick_mark_material:I = 0x7f080055
 
-.field public static final abc_seekbar_track_material:I = 0x7f080057
+.field public static final abc_seekbar_track_material:I = 0x7f080056
 
-.field public static final abc_spinner_mtrl_am_alpha:I = 0x7f080058
+.field public static final abc_spinner_mtrl_am_alpha:I = 0x7f080057
 
-.field public static final abc_spinner_textfield_background_material:I = 0x7f080059
+.field public static final abc_spinner_textfield_background_material:I = 0x7f080058
 
-.field public static final abc_switch_thumb_material:I = 0x7f08005a
+.field public static final abc_switch_thumb_material:I = 0x7f080059
 
-.field public static final abc_switch_track_mtrl_alpha:I = 0x7f08005b
+.field public static final abc_switch_track_mtrl_alpha:I = 0x7f08005a
 
-.field public static final abc_tab_indicator_material:I = 0x7f08005c
+.field public static final abc_tab_indicator_material:I = 0x7f08005b
 
-.field public static final abc_tab_indicator_mtrl_alpha:I = 0x7f08005d
+.field public static final abc_tab_indicator_mtrl_alpha:I = 0x7f08005c
 
-.field public static final abc_text_cursor_material:I = 0x7f08005e
+.field public static final abc_text_cursor_material:I = 0x7f08005d
 
-.field public static final abc_text_select_handle_left_mtrl_dark:I = 0x7f08005f
+.field public static final abc_text_select_handle_left_mtrl_dark:I = 0x7f08005e
 
-.field public static final abc_text_select_handle_left_mtrl_light:I = 0x7f080060
+.field public static final abc_text_select_handle_left_mtrl_light:I = 0x7f08005f
 
-.field public static final abc_text_select_handle_middle_mtrl_dark:I = 0x7f080061
+.field public static final abc_text_select_handle_middle_mtrl_dark:I = 0x7f080060
 
-.field public static final abc_text_select_handle_middle_mtrl_light:I = 0x7f080062
+.field public static final abc_text_select_handle_middle_mtrl_light:I = 0x7f080061
 
-.field public static final abc_text_select_handle_right_mtrl_dark:I = 0x7f080063
+.field public static final abc_text_select_handle_right_mtrl_dark:I = 0x7f080062
 
-.field public static final abc_text_select_handle_right_mtrl_light:I = 0x7f080064
+.field public static final abc_text_select_handle_right_mtrl_light:I = 0x7f080063
 
-.field public static final abc_textfield_activated_mtrl_alpha:I = 0x7f080065
+.field public static final abc_textfield_activated_mtrl_alpha:I = 0x7f080064
 
-.field public static final abc_textfield_default_mtrl_alpha:I = 0x7f080066
+.field public static final abc_textfield_default_mtrl_alpha:I = 0x7f080065
 
-.field public static final abc_textfield_search_activated_mtrl_alpha:I = 0x7f080067
+.field public static final abc_textfield_search_activated_mtrl_alpha:I = 0x7f080066
 
-.field public static final abc_textfield_search_default_mtrl_alpha:I = 0x7f080068
+.field public static final abc_textfield_search_default_mtrl_alpha:I = 0x7f080067
 
-.field public static final abc_textfield_search_material:I = 0x7f080069
+.field public static final abc_textfield_search_material:I = 0x7f080068
 
-.field public static final abc_vector_test:I = 0x7f08006a
+.field public static final abc_vector_test:I = 0x7f080069
 
-.field public static final notification_action_background:I = 0x7f080472
+.field public static final notification_action_background:I = 0x7f080463
 
-.field public static final notification_bg:I = 0x7f080473
+.field public static final notification_bg:I = 0x7f080464
 
-.field public static final notification_bg_low:I = 0x7f080474
+.field public static final notification_bg_low:I = 0x7f080465
 
-.field public static final notification_bg_low_normal:I = 0x7f080475
+.field public static final notification_bg_low_normal:I = 0x7f080466
 
-.field public static final notification_bg_low_pressed:I = 0x7f080476
+.field public static final notification_bg_low_pressed:I = 0x7f080467
 
-.field public static final notification_bg_normal:I = 0x7f080477
+.field public static final notification_bg_normal:I = 0x7f080468
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080478
+.field public static final notification_bg_normal_pressed:I = 0x7f080469
 
-.field public static final notification_icon_background:I = 0x7f080479
+.field public static final notification_icon_background:I = 0x7f08046a
 
-.field public static final notification_template_icon_bg:I = 0x7f08047a
+.field public static final notification_template_icon_bg:I = 0x7f08046b
 
-.field public static final notification_template_icon_low_bg:I = 0x7f08047b
+.field public static final notification_template_icon_low_bg:I = 0x7f08046c
 
-.field public static final notification_tile_bg:I = 0x7f08047c
+.field public static final notification_tile_bg:I = 0x7f08046d
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08047d
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08046e
 
-.field public static final tooltip_frame_dark:I = 0x7f080485
+.field public static final tooltip_frame_dark:I = 0x7f080476
 
-.field public static final tooltip_frame_light:I = 0x7f080486
+.field public static final tooltip_frame_light:I = 0x7f080477
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/appcompat/R$id.smali b/com.discord/smali/androidx/appcompat/R$id.smali
index cc045ed6ca..7438fb5ecc 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 = 0x7f0a0080
+.field public static final async:I = 0x7f0a007f
 
-.field public static final blocking:I = 0x7f0a00ce
+.field public static final blocking:I = 0x7f0a00cd
 
 .field public static final bottom:I = 0x7f0a0105
 
@@ -69,161 +69,161 @@
 
 .field public static final chronometer:I = 0x7f0a0215
 
-.field public static final content:I = 0x7f0a0234
+.field public static final content:I = 0x7f0a0233
 
-.field public static final contentPanel:I = 0x7f0a0235
+.field public static final contentPanel:I = 0x7f0a0234
 
-.field public static final custom:I = 0x7f0a0252
+.field public static final custom:I = 0x7f0a0251
 
-.field public static final customPanel:I = 0x7f0a0253
+.field public static final customPanel:I = 0x7f0a0252
 
-.field public static final decor_content_parent:I = 0x7f0a0257
+.field public static final decor_content_parent:I = 0x7f0a0256
 
-.field public static final default_activity_button:I = 0x7f0a0258
+.field public static final default_activity_button:I = 0x7f0a0257
 
-.field public static final edit_query:I = 0x7f0a02ae
+.field public static final edit_query:I = 0x7f0a02ad
 
-.field public static final end:I = 0x7f0a02c9
+.field public static final end:I = 0x7f0a02c8
 
-.field public static final expand_activities_button:I = 0x7f0a02ce
+.field public static final expand_activities_button:I = 0x7f0a02cd
 
-.field public static final expanded_menu:I = 0x7f0a02cf
+.field public static final expanded_menu:I = 0x7f0a02ce
 
-.field public static final forever:I = 0x7f0a02f2
+.field public static final forever:I = 0x7f0a02f1
 
-.field public static final group_divider:I = 0x7f0a032d
+.field public static final group_divider:I = 0x7f0a0328
 
-.field public static final home:I = 0x7f0a0394
+.field public static final home:I = 0x7f0a038f
 
-.field public static final icon:I = 0x7f0a0396
+.field public static final icon:I = 0x7f0a0391
 
-.field public static final icon_group:I = 0x7f0a0397
+.field public static final icon_group:I = 0x7f0a0392
 
-.field public static final image:I = 0x7f0a039a
+.field public static final image:I = 0x7f0a0395
 
-.field public static final info:I = 0x7f0a03ac
+.field public static final info:I = 0x7f0a03a7
 
-.field public static final italic:I = 0x7f0a03d9
+.field public static final italic:I = 0x7f0a03d4
 
-.field public static final left:I = 0x7f0a041b
+.field public static final left:I = 0x7f0a0416
 
-.field public static final line1:I = 0x7f0a041d
+.field public static final line1:I = 0x7f0a0418
 
-.field public static final line3:I = 0x7f0a041e
+.field public static final line3:I = 0x7f0a0419
 
-.field public static final listMode:I = 0x7f0a0420
+.field public static final listMode:I = 0x7f0a041b
 
-.field public static final list_item:I = 0x7f0a0421
+.field public static final list_item:I = 0x7f0a041c
 
-.field public static final message:I = 0x7f0a0485
+.field public static final message:I = 0x7f0a0478
 
-.field public static final multiply:I = 0x7f0a048d
+.field public static final multiply:I = 0x7f0a0480
 
-.field public static final none:I = 0x7f0a04a2
+.field public static final none:I = 0x7f0a0495
 
-.field public static final normal:I = 0x7f0a04a3
+.field public static final normal:I = 0x7f0a0496
 
-.field public static final notification_background:I = 0x7f0a04ad
+.field public static final notification_background:I = 0x7f0a04a0
 
-.field public static final notification_main_column:I = 0x7f0a04ae
+.field public static final notification_main_column:I = 0x7f0a04a1
 
-.field public static final notification_main_column_container:I = 0x7f0a04af
+.field public static final notification_main_column_container:I = 0x7f0a04a2
 
-.field public static final parentPanel:I = 0x7f0a04e2
+.field public static final parentPanel:I = 0x7f0a04d5
 
-.field public static final progress_circular:I = 0x7f0a055c
+.field public static final progress_circular:I = 0x7f0a054d
 
-.field public static final progress_horizontal:I = 0x7f0a055e
+.field public static final progress_horizontal:I = 0x7f0a054f
 
-.field public static final radio:I = 0x7f0a0569
+.field public static final radio:I = 0x7f0a055a
 
-.field public static final right:I = 0x7f0a058c
+.field public static final right:I = 0x7f0a0573
 
-.field public static final right_icon:I = 0x7f0a058d
+.field public static final right_icon:I = 0x7f0a0574
 
-.field public static final right_side:I = 0x7f0a058e
+.field public static final right_side:I = 0x7f0a0575
 
-.field public static final screen:I = 0x7f0a05bc
+.field public static final screen:I = 0x7f0a05a3
 
-.field public static final scrollIndicatorDown:I = 0x7f0a05be
+.field public static final scrollIndicatorDown:I = 0x7f0a05a5
 
-.field public static final scrollIndicatorUp:I = 0x7f0a05bf
+.field public static final scrollIndicatorUp:I = 0x7f0a05a6
 
-.field public static final scrollView:I = 0x7f0a05c0
+.field public static final scrollView:I = 0x7f0a05a7
 
-.field public static final search_badge:I = 0x7f0a05c4
+.field public static final search_badge:I = 0x7f0a05ab
 
-.field public static final search_bar:I = 0x7f0a05c5
+.field public static final search_bar:I = 0x7f0a05ac
 
-.field public static final search_button:I = 0x7f0a05c6
+.field public static final search_button:I = 0x7f0a05ad
 
-.field public static final search_close_btn:I = 0x7f0a05c8
+.field public static final search_close_btn:I = 0x7f0a05af
 
-.field public static final search_edit_frame:I = 0x7f0a05c9
+.field public static final search_edit_frame:I = 0x7f0a05b0
 
-.field public static final search_go_btn:I = 0x7f0a05cc
+.field public static final search_go_btn:I = 0x7f0a05b3
 
-.field public static final search_mag_icon:I = 0x7f0a05ce
+.field public static final search_mag_icon:I = 0x7f0a05b5
 
-.field public static final search_plate:I = 0x7f0a05cf
+.field public static final search_plate:I = 0x7f0a05b6
 
-.field public static final search_src_text:I = 0x7f0a05d2
+.field public static final search_src_text:I = 0x7f0a05b9
 
-.field public static final search_voice_btn:I = 0x7f0a05de
+.field public static final search_voice_btn:I = 0x7f0a05c5
 
-.field public static final select_dialog_listview:I = 0x7f0a05df
+.field public static final select_dialog_listview:I = 0x7f0a05c6
 
-.field public static final shortcut:I = 0x7f0a0719
+.field public static final shortcut:I = 0x7f0a0700
 
-.field public static final spacer:I = 0x7f0a0725
+.field public static final spacer:I = 0x7f0a070c
 
-.field public static final split_action_bar:I = 0x7f0a072c
+.field public static final split_action_bar:I = 0x7f0a070d
 
-.field public static final src_atop:I = 0x7f0a072f
+.field public static final src_atop:I = 0x7f0a0710
 
-.field public static final src_in:I = 0x7f0a0730
+.field public static final src_in:I = 0x7f0a0711
 
-.field public static final src_over:I = 0x7f0a0731
+.field public static final src_over:I = 0x7f0a0712
 
-.field public static final start:I = 0x7f0a0734
+.field public static final start:I = 0x7f0a0715
 
-.field public static final submenuarrow:I = 0x7f0a0755
+.field public static final submenuarrow:I = 0x7f0a072d
 
-.field public static final submit_area:I = 0x7f0a0756
+.field public static final submit_area:I = 0x7f0a072e
 
-.field public static final tabMode:I = 0x7f0a0761
+.field public static final tabMode:I = 0x7f0a0739
 
-.field public static final tag_transition_group:I = 0x7f0a0767
+.field public static final tag_transition_group:I = 0x7f0a073f
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0768
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0740
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0769
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0741
 
-.field public static final text:I = 0x7f0a076f
+.field public static final text:I = 0x7f0a0747
 
-.field public static final text2:I = 0x7f0a0770
+.field public static final text2:I = 0x7f0a0748
 
-.field public static final textSpacerNoButtons:I = 0x7f0a0771
+.field public static final textSpacerNoButtons:I = 0x7f0a0749
 
-.field public static final textSpacerNoTitle:I = 0x7f0a0772
+.field public static final textSpacerNoTitle:I = 0x7f0a074a
 
-.field public static final time:I = 0x7f0a077d
+.field public static final time:I = 0x7f0a0755
 
-.field public static final title:I = 0x7f0a077e
+.field public static final title:I = 0x7f0a0756
 
-.field public static final titleDividerNoCustom:I = 0x7f0a077f
+.field public static final titleDividerNoCustom:I = 0x7f0a0757
 
-.field public static final title_template:I = 0x7f0a0780
+.field public static final title_template:I = 0x7f0a0758
 
-.field public static final top:I = 0x7f0a0785
+.field public static final top:I = 0x7f0a075d
 
-.field public static final topPanel:I = 0x7f0a0786
+.field public static final topPanel:I = 0x7f0a075e
 
-.field public static final uniform:I = 0x7f0a0799
+.field public static final uniform:I = 0x7f0a0771
 
-.field public static final up:I = 0x7f0a079c
+.field public static final up:I = 0x7f0a0774
 
-.field public static final wrap_content:I = 0x7f0a0881
+.field public static final wrap_content:I = 0x7f0a0846
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/appcompat/R$layout.smali b/com.discord/smali/androidx/appcompat/R$layout.smali
index 061707435a..aab51392e1 100644
--- a/com.discord/smali/androidx/appcompat/R$layout.smali
+++ b/com.discord/smali/androidx/appcompat/R$layout.smali
@@ -89,7 +89,7 @@
 
 .field public static final select_dialog_singlechoice_material:I = 0x7f0d005a
 
-.field public static final support_simple_spinner_dropdown_item:I = 0x7f0d0062
+.field public static final support_simple_spinner_dropdown_item:I = 0x7f0d0061
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/appcompat/R$string.smali b/com.discord/smali/androidx/appcompat/R$string.smali
index d74594bba2..a4beb2c3d4 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 = 0x7f121098
+.field public static final search_menu_title:I = 0x7f12100c
 
-.field public static final status_bar_notification_info_overflow:I = 0x7f121165
+.field public static final status_bar_notification_info_overflow:I = 0x7f1210d9
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/appcompat/R$styleable.smali b/com.discord/smali/androidx/appcompat/R$styleable.smali
index 2ee5f888bc..fe520c7497 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, 0x7f040315
+    const v6, 0x7f040314
 
     aput v6, v5, v3
 
@@ -1272,15 +1272,15 @@
         0x7f0401d6
         0x7f0401f9
         0x7f040203
-        0x7f040267
-        0x7f040283
-        0x7f04029b
+        0x7f040266
+        0x7f040282
+        0x7f04029a
+        0x7f0402c8
         0x7f0402c9
-        0x7f0402ca
-        0x7f040323
-        0x7f040326
-        0x7f0403bf
-        0x7f0403c9
+        0x7f040322
+        0x7f040325
+        0x7f0403be
+        0x7f0403c8
     .end array-data
 
     :array_1
@@ -1289,8 +1289,8 @@
         0x7f04004c
         0x7f0400b3
         0x7f04015c
-        0x7f040326
-        0x7f0403c9
+        0x7f040325
+        0x7f0403c8
     .end array-data
 
     :array_2
@@ -1304,11 +1304,11 @@
         0x10100f2
         0x7f040079
         0x7f04007a
+        0x7f04025d
         0x7f04025e
-        0x7f04025f
-        0x7f040280
+        0x7f04027f
+        0x7f040307
         0x7f040308
-        0x7f040309
     .end array-data
 
     :array_4
@@ -1338,17 +1338,17 @@
     :array_7
     .array-data 4
         0x1010119
-        0x7f040313
+        0x7f040312
+        0x7f0403bc
         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
-        0x7f04025a
-        0x7f040349
+        0x7f040259
+        0x7f040348
     .end array-data
 
     :array_b
@@ -1450,41 +1450,41 @@
         0x7f040119
         0x7f040168
         0x7f0401e1
+        0x7f04025b
         0x7f04025c
-        0x7f04025d
+        0x7f04025f
         0x7f040260
         0x7f040261
         0x7f040262
         0x7f040263
         0x7f040264
         0x7f040265
-        0x7f040266
+        0x7f04028f
         0x7f040290
         0x7f040291
-        0x7f040292
-        0x7f04029a
-        0x7f04029c
-        0x7f0402cf
+        0x7f040299
+        0x7f04029b
+        0x7f0402ce
+        0x7f0402d1
         0x7f0402d2
         0x7f0402d3
-        0x7f0402d4
-        0x7f0402fb
+        0x7f0402fa
+        0x7f0402fc
         0x7f0402fd
         0x7f0402fe
-        0x7f0402ff
+        0x7f04030f
         0x7f040310
-        0x7f040311
-        0x7f04032a
+        0x7f040329
+        0x7f040353
         0x7f040354
         0x7f040355
         0x7f040356
-        0x7f040357
+        0x7f040358
         0x7f040359
         0x7f04035a
         0x7f04035b
-        0x7f04035c
+        0x7f04035e
         0x7f04035f
-        0x7f040360
         0x7f0403cb
         0x7f0403cc
         0x7f0403cd
@@ -1519,7 +1519,7 @@
     :array_e
     .array-data 4
         0x7f04020a
-        0x7f04031a
+        0x7f040319
     .end array-data
 
     :array_f
@@ -1541,8 +1541,8 @@
         0x7f0400b8
         0x7f040112
         0x7f040150
-        0x7f04030f
-        0x7f0403b6
+        0x7f04030e
+        0x7f0403b5
     .end array-data
 
     :array_11
@@ -1600,8 +1600,8 @@
         0x1010128
         0x7f04010b
         0x7f040110
-        0x7f04027e
-        0x7f040305
+        0x7f04027d
+        0x7f040304
     .end array-data
 
     :array_16
@@ -1650,8 +1650,8 @@
         0x7f0400ce
         0x7f0401dc
         0x7f0401dd
-        0x7f040287
-        0x7f040301
+        0x7f040286
+        0x7f040300
         0x7f0403cf
     .end array-data
 
@@ -1664,21 +1664,21 @@
         0x101012f
         0x1010130
         0x1010131
-        0x7f04029d
-        0x7f040321
+        0x7f04029c
+        0x7f040320
     .end array-data
 
     :array_1b
     .array-data 4
         0x1010176
         0x10102c9
-        0x7f040288
+        0x7f040287
     .end array-data
 
     :array_1c
     .array-data 4
-        0x7f04028c
-        0x7f04028f
+        0x7f04028b
+        0x7f04028e
     .end array-data
 
     :array_1d
@@ -1693,12 +1693,12 @@
         0x7f040155
         0x7f0401de
         0x7f04020d
+        0x7f0402cc
         0x7f0402cd
-        0x7f0402ce
+        0x7f0402f8
         0x7f0402f9
-        0x7f0402fa
-        0x7f040322
-        0x7f040327
+        0x7f040321
+        0x7f040326
         0x7f0403ef
     .end array-data
 
@@ -1708,7 +1708,7 @@
         0x1010176
         0x101017b
         0x1010262
-        0x7f04029b
+        0x7f04029a
     .end array-data
 
     :array_1f
@@ -1726,14 +1726,14 @@
         0x1010124
         0x1010125
         0x1010142
-        0x7f040307
-        0x7f040312
+        0x7f040306
+        0x7f040311
+        0x7f040327
         0x7f040328
-        0x7f040329
-        0x7f04032b
+        0x7f04032a
+        0x7f0403b6
         0x7f0403b7
         0x7f0403b8
-        0x7f0403b9
         0x7f0403d0
         0x7f0403d1
         0x7f0403d2
@@ -1753,7 +1753,7 @@
         0x1010164
         0x10103ac
         0x7f040145
-        0x7f040349
+        0x7f040348
     .end array-data
 
     :array_22
@@ -1769,16 +1769,17 @@
         0x7f0400d2
         0x7f0400d3
         0x7f0400d4
+        0x7f040266
         0x7f040267
-        0x7f040268
-        0x7f04027b
+        0x7f04027a
+        0x7f040280
         0x7f040281
-        0x7f040282
-        0x7f04029b
+        0x7f04029a
+        0x7f040322
         0x7f040323
         0x7f040324
-        0x7f040325
-        0x7f0403bf
+        0x7f0403be
+        0x7f0403c0
         0x7f0403c1
         0x7f0403c2
         0x7f0403c3
@@ -1786,16 +1787,15 @@
         0x7f0403c5
         0x7f0403c6
         0x7f0403c7
-        0x7f0403c8
     .end array-data
 
     :array_23
     .array-data 4
         0x1010000
         0x10100da
+        0x7f04028c
         0x7f04028d
-        0x7f04028e
-        0x7f040365
+        0x7f040364
     .end array-data
 
     :array_24
diff --git a/com.discord/smali/androidx/asynclayoutinflater/R$color.smali b/com.discord/smali/androidx/asynclayoutinflater/R$color.smali
index 8af752bce6..494195c1de 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 = 0x7f0600b8
+.field public static final notification_action_color_filter:I = 0x7f0600b7
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b9
+.field public static final notification_icon_bg_color:I = 0x7f0600b8
 
-.field public static final ripple_material_light:I = 0x7f0600fb
+.field public static final ripple_material_light:I = 0x7f0600fa
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fd
+.field public static final secondary_text_default_material_light:I = 0x7f0600fc
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/asynclayoutinflater/R$drawable.smali b/com.discord/smali/androidx/asynclayoutinflater/R$drawable.smali
index 9e7d4e8ca9..41413cff64 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 = 0x7f080472
+.field public static final notification_action_background:I = 0x7f080463
 
-.field public static final notification_bg:I = 0x7f080473
+.field public static final notification_bg:I = 0x7f080464
 
-.field public static final notification_bg_low:I = 0x7f080474
+.field public static final notification_bg_low:I = 0x7f080465
 
-.field public static final notification_bg_low_normal:I = 0x7f080475
+.field public static final notification_bg_low_normal:I = 0x7f080466
 
-.field public static final notification_bg_low_pressed:I = 0x7f080476
+.field public static final notification_bg_low_pressed:I = 0x7f080467
 
-.field public static final notification_bg_normal:I = 0x7f080477
+.field public static final notification_bg_normal:I = 0x7f080468
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080478
+.field public static final notification_bg_normal_pressed:I = 0x7f080469
 
-.field public static final notification_icon_background:I = 0x7f080479
+.field public static final notification_icon_background:I = 0x7f08046a
 
-.field public static final notification_template_icon_bg:I = 0x7f08047a
+.field public static final notification_template_icon_bg:I = 0x7f08046b
 
-.field public static final notification_template_icon_low_bg:I = 0x7f08047b
+.field public static final notification_template_icon_low_bg:I = 0x7f08046c
 
-.field public static final notification_tile_bg:I = 0x7f08047c
+.field public static final notification_tile_bg:I = 0x7f08046d
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08047d
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08046e
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/asynclayoutinflater/R$id.smali b/com.discord/smali/androidx/asynclayoutinflater/R$id.smali
index d7b4a9c7da..d3b8738b81 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 = 0x7f0a0080
+.field public static final async:I = 0x7f0a007f
 
-.field public static final blocking:I = 0x7f0a00ce
+.field public static final blocking:I = 0x7f0a00cd
 
 .field public static final chronometer:I = 0x7f0a0215
 
-.field public static final forever:I = 0x7f0a02f2
+.field public static final forever:I = 0x7f0a02f1
 
-.field public static final icon:I = 0x7f0a0396
+.field public static final icon:I = 0x7f0a0391
 
-.field public static final icon_group:I = 0x7f0a0397
+.field public static final icon_group:I = 0x7f0a0392
 
-.field public static final info:I = 0x7f0a03ac
+.field public static final info:I = 0x7f0a03a7
 
-.field public static final italic:I = 0x7f0a03d9
+.field public static final italic:I = 0x7f0a03d4
 
-.field public static final line1:I = 0x7f0a041d
+.field public static final line1:I = 0x7f0a0418
 
-.field public static final line3:I = 0x7f0a041e
+.field public static final line3:I = 0x7f0a0419
 
-.field public static final normal:I = 0x7f0a04a3
+.field public static final normal:I = 0x7f0a0496
 
-.field public static final notification_background:I = 0x7f0a04ad
+.field public static final notification_background:I = 0x7f0a04a0
 
-.field public static final notification_main_column:I = 0x7f0a04ae
+.field public static final notification_main_column:I = 0x7f0a04a1
 
-.field public static final notification_main_column_container:I = 0x7f0a04af
+.field public static final notification_main_column_container:I = 0x7f0a04a2
 
-.field public static final right_icon:I = 0x7f0a058d
+.field public static final right_icon:I = 0x7f0a0574
 
-.field public static final right_side:I = 0x7f0a058e
+.field public static final right_side:I = 0x7f0a0575
 
-.field public static final tag_transition_group:I = 0x7f0a0767
+.field public static final tag_transition_group:I = 0x7f0a073f
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0768
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0740
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0769
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0741
 
-.field public static final text:I = 0x7f0a076f
+.field public static final text:I = 0x7f0a0747
 
-.field public static final text2:I = 0x7f0a0770
+.field public static final text2:I = 0x7f0a0748
 
-.field public static final time:I = 0x7f0a077d
+.field public static final time:I = 0x7f0a0755
 
-.field public static final title:I = 0x7f0a077e
+.field public static final title:I = 0x7f0a0756
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/asynclayoutinflater/R$string.smali b/com.discord/smali/androidx/asynclayoutinflater/R$string.smali
index c80e9cb1df..4bcba2a669 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 = 0x7f121165
+.field public static final status_bar_notification_info_overflow:I = 0x7f1210d9
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/browser/R$attr.smali b/com.discord/smali/androidx/browser/R$attr.smali
index 54e67525c4..a9ecb522d7 100644
--- a/com.discord/smali/androidx/browser/R$attr.smali
+++ b/com.discord/smali/androidx/browser/R$attr.smali
@@ -53,7 +53,7 @@
 
 .field public static final layout_keyline:I = 0x7f04024b
 
-.field public static final statusBarBackground:I = 0x7f04031a
+.field public static final statusBarBackground:I = 0x7f040319
 
 .field public static final ttcIndex:I = 0x7f0403d3
 
diff --git a/com.discord/smali/androidx/browser/R$color.smali b/com.discord/smali/androidx/browser/R$color.smali
index 38a7d23f61..a42507f112 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 = 0x7f06003b
+.field public static final browser_actions_bg_grey:I = 0x7f06003a
 
-.field public static final browser_actions_divider_color:I = 0x7f06003c
+.field public static final browser_actions_divider_color:I = 0x7f06003b
 
-.field public static final browser_actions_text_color:I = 0x7f06003d
+.field public static final browser_actions_text_color:I = 0x7f06003c
 
-.field public static final browser_actions_title_color:I = 0x7f06003e
+.field public static final browser_actions_title_color:I = 0x7f06003d
 
-.field public static final notification_action_color_filter:I = 0x7f0600b8
+.field public static final notification_action_color_filter:I = 0x7f0600b7
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b9
+.field public static final notification_icon_bg_color:I = 0x7f0600b8
 
-.field public static final ripple_material_light:I = 0x7f0600fb
+.field public static final ripple_material_light:I = 0x7f0600fa
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fd
+.field public static final secondary_text_default_material_light:I = 0x7f0600fc
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/browser/R$drawable.smali b/com.discord/smali/androidx/browser/R$drawable.smali
index df1408a4ea..ba79969084 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 = 0x7f080472
+.field public static final notification_action_background:I = 0x7f080463
 
-.field public static final notification_bg:I = 0x7f080473
+.field public static final notification_bg:I = 0x7f080464
 
-.field public static final notification_bg_low:I = 0x7f080474
+.field public static final notification_bg_low:I = 0x7f080465
 
-.field public static final notification_bg_low_normal:I = 0x7f080475
+.field public static final notification_bg_low_normal:I = 0x7f080466
 
-.field public static final notification_bg_low_pressed:I = 0x7f080476
+.field public static final notification_bg_low_pressed:I = 0x7f080467
 
-.field public static final notification_bg_normal:I = 0x7f080477
+.field public static final notification_bg_normal:I = 0x7f080468
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080478
+.field public static final notification_bg_normal_pressed:I = 0x7f080469
 
-.field public static final notification_icon_background:I = 0x7f080479
+.field public static final notification_icon_background:I = 0x7f08046a
 
-.field public static final notification_template_icon_bg:I = 0x7f08047a
+.field public static final notification_template_icon_bg:I = 0x7f08046b
 
-.field public static final notification_template_icon_low_bg:I = 0x7f08047b
+.field public static final notification_template_icon_low_bg:I = 0x7f08046c
 
-.field public static final notification_tile_bg:I = 0x7f08047c
+.field public static final notification_tile_bg:I = 0x7f08046d
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08047d
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08046e
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/browser/R$id.smali b/com.discord/smali/androidx/browser/R$id.smali
index 07db866bbb..0cfe8a872d 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 = 0x7f0a0080
+.field public static final async:I = 0x7f0a007f
 
-.field public static final blocking:I = 0x7f0a00ce
+.field public static final blocking:I = 0x7f0a00cd
 
 .field public static final bottom:I = 0x7f0a0105
 
@@ -43,57 +43,57 @@
 
 .field public static final chronometer:I = 0x7f0a0215
 
-.field public static final end:I = 0x7f0a02c9
+.field public static final end:I = 0x7f0a02c8
 
-.field public static final forever:I = 0x7f0a02f2
+.field public static final forever:I = 0x7f0a02f1
 
-.field public static final icon:I = 0x7f0a0396
+.field public static final icon:I = 0x7f0a0391
 
-.field public static final icon_group:I = 0x7f0a0397
+.field public static final icon_group:I = 0x7f0a0392
 
-.field public static final info:I = 0x7f0a03ac
+.field public static final info:I = 0x7f0a03a7
 
-.field public static final italic:I = 0x7f0a03d9
+.field public static final italic:I = 0x7f0a03d4
 
-.field public static final left:I = 0x7f0a041b
+.field public static final left:I = 0x7f0a0416
 
-.field public static final line1:I = 0x7f0a041d
+.field public static final line1:I = 0x7f0a0418
 
-.field public static final line3:I = 0x7f0a041e
+.field public static final line3:I = 0x7f0a0419
 
-.field public static final none:I = 0x7f0a04a2
+.field public static final none:I = 0x7f0a0495
 
-.field public static final normal:I = 0x7f0a04a3
+.field public static final normal:I = 0x7f0a0496
 
-.field public static final notification_background:I = 0x7f0a04ad
+.field public static final notification_background:I = 0x7f0a04a0
 
-.field public static final notification_main_column:I = 0x7f0a04ae
+.field public static final notification_main_column:I = 0x7f0a04a1
 
-.field public static final notification_main_column_container:I = 0x7f0a04af
+.field public static final notification_main_column_container:I = 0x7f0a04a2
 
-.field public static final right:I = 0x7f0a058c
+.field public static final right:I = 0x7f0a0573
 
-.field public static final right_icon:I = 0x7f0a058d
+.field public static final right_icon:I = 0x7f0a0574
 
-.field public static final right_side:I = 0x7f0a058e
+.field public static final right_side:I = 0x7f0a0575
 
-.field public static final start:I = 0x7f0a0734
+.field public static final start:I = 0x7f0a0715
 
-.field public static final tag_transition_group:I = 0x7f0a0767
+.field public static final tag_transition_group:I = 0x7f0a073f
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0768
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0740
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0769
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0741
 
-.field public static final text:I = 0x7f0a076f
+.field public static final text:I = 0x7f0a0747
 
-.field public static final text2:I = 0x7f0a0770
+.field public static final text2:I = 0x7f0a0748
 
-.field public static final time:I = 0x7f0a077d
+.field public static final time:I = 0x7f0a0755
 
-.field public static final title:I = 0x7f0a077e
+.field public static final title:I = 0x7f0a0756
 
-.field public static final top:I = 0x7f0a0785
+.field public static final top:I = 0x7f0a075d
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/browser/R$string.smali b/com.discord/smali/androidx/browser/R$string.smali
index ee5942d875..7afaa83d6c 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 = 0x7f121165
+.field public static final status_bar_notification_info_overflow:I = 0x7f1210d9
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/browser/R$styleable.smali b/com.discord/smali/androidx/browser/R$styleable.smali
index 833f26587f..18fbb14eda 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
-        0x7f04031a
+        0x7f040319
     .end array-data
 
     :array_2
diff --git a/com.discord/smali/androidx/cardview/R$color.smali b/com.discord/smali/androidx/cardview/R$color.smali
index 5490483c92..924f9bdf3a 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 = 0x7f060042
+.field public static final cardview_dark_background:I = 0x7f060041
 
-.field public static final cardview_light_background:I = 0x7f060043
+.field public static final cardview_light_background:I = 0x7f060042
 
-.field public static final cardview_shadow_end_color:I = 0x7f060044
+.field public static final cardview_shadow_end_color:I = 0x7f060043
 
-.field public static final cardview_shadow_start_color:I = 0x7f060045
+.field public static final cardview_shadow_start_color:I = 0x7f060044
 
 
 # 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 7409354147..b38fe610bc 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 = 0x7f0a02c9
+.field public static final end:I = 0x7f0a02c8
 
-.field public static final gone:I = 0x7f0a032c
+.field public static final gone:I = 0x7f0a0327
 
-.field public static final invisible:I = 0x7f0a03ba
+.field public static final invisible:I = 0x7f0a03b5
 
-.field public static final left:I = 0x7f0a041b
+.field public static final left:I = 0x7f0a0416
 
-.field public static final packed:I = 0x7f0a04de
+.field public static final packed:I = 0x7f0a04d1
 
-.field public static final parent:I = 0x7f0a04e1
+.field public static final parent:I = 0x7f0a04d4
 
-.field public static final percent:I = 0x7f0a0515
+.field public static final percent:I = 0x7f0a0507
 
-.field public static final right:I = 0x7f0a058c
+.field public static final right:I = 0x7f0a0573
 
-.field public static final spread:I = 0x7f0a072d
+.field public static final spread:I = 0x7f0a070e
 
-.field public static final spread_inside:I = 0x7f0a072e
+.field public static final spread_inside:I = 0x7f0a070f
 
-.field public static final start:I = 0x7f0a0734
+.field public static final start:I = 0x7f0a0715
 
-.field public static final top:I = 0x7f0a0785
+.field public static final top:I = 0x7f0a075d
 
-.field public static final wrap:I = 0x7f0a0880
+.field public static final wrap:I = 0x7f0a0845
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/coordinatorlayout/R$attr.smali b/com.discord/smali/androidx/coordinatorlayout/R$attr.smali
index d03c9ec62f..99a57d7b91 100644
--- a/com.discord/smali/androidx/coordinatorlayout/R$attr.smali
+++ b/com.discord/smali/androidx/coordinatorlayout/R$attr.smali
@@ -53,7 +53,7 @@
 
 .field public static final layout_keyline:I = 0x7f04024b
 
-.field public static final statusBarBackground:I = 0x7f04031a
+.field public static final statusBarBackground:I = 0x7f040319
 
 .field public static final ttcIndex:I = 0x7f0403d3
 
diff --git a/com.discord/smali/androidx/coordinatorlayout/R$color.smali b/com.discord/smali/androidx/coordinatorlayout/R$color.smali
index 8dde021331..1378ebdda7 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 = 0x7f0600b8
+.field public static final notification_action_color_filter:I = 0x7f0600b7
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b9
+.field public static final notification_icon_bg_color:I = 0x7f0600b8
 
-.field public static final ripple_material_light:I = 0x7f0600fb
+.field public static final ripple_material_light:I = 0x7f0600fa
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fd
+.field public static final secondary_text_default_material_light:I = 0x7f0600fc
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/coordinatorlayout/R$drawable.smali b/com.discord/smali/androidx/coordinatorlayout/R$drawable.smali
index 15e0a9ea4b..e7dd72c505 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 = 0x7f080472
+.field public static final notification_action_background:I = 0x7f080463
 
-.field public static final notification_bg:I = 0x7f080473
+.field public static final notification_bg:I = 0x7f080464
 
-.field public static final notification_bg_low:I = 0x7f080474
+.field public static final notification_bg_low:I = 0x7f080465
 
-.field public static final notification_bg_low_normal:I = 0x7f080475
+.field public static final notification_bg_low_normal:I = 0x7f080466
 
-.field public static final notification_bg_low_pressed:I = 0x7f080476
+.field public static final notification_bg_low_pressed:I = 0x7f080467
 
-.field public static final notification_bg_normal:I = 0x7f080477
+.field public static final notification_bg_normal:I = 0x7f080468
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080478
+.field public static final notification_bg_normal_pressed:I = 0x7f080469
 
-.field public static final notification_icon_background:I = 0x7f080479
+.field public static final notification_icon_background:I = 0x7f08046a
 
-.field public static final notification_template_icon_bg:I = 0x7f08047a
+.field public static final notification_template_icon_bg:I = 0x7f08046b
 
-.field public static final notification_template_icon_low_bg:I = 0x7f08047b
+.field public static final notification_template_icon_low_bg:I = 0x7f08046c
 
-.field public static final notification_tile_bg:I = 0x7f08047c
+.field public static final notification_tile_bg:I = 0x7f08046d
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08047d
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08046e
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/coordinatorlayout/R$id.smali b/com.discord/smali/androidx/coordinatorlayout/R$id.smali
index fb2ad253e2..6f6f228a85 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 = 0x7f0a0080
+.field public static final async:I = 0x7f0a007f
 
-.field public static final blocking:I = 0x7f0a00ce
+.field public static final blocking:I = 0x7f0a00cd
 
 .field public static final bottom:I = 0x7f0a0105
 
 .field public static final chronometer:I = 0x7f0a0215
 
-.field public static final end:I = 0x7f0a02c9
+.field public static final end:I = 0x7f0a02c8
 
-.field public static final forever:I = 0x7f0a02f2
+.field public static final forever:I = 0x7f0a02f1
 
-.field public static final icon:I = 0x7f0a0396
+.field public static final icon:I = 0x7f0a0391
 
-.field public static final icon_group:I = 0x7f0a0397
+.field public static final icon_group:I = 0x7f0a0392
 
-.field public static final info:I = 0x7f0a03ac
+.field public static final info:I = 0x7f0a03a7
 
-.field public static final italic:I = 0x7f0a03d9
+.field public static final italic:I = 0x7f0a03d4
 
-.field public static final left:I = 0x7f0a041b
+.field public static final left:I = 0x7f0a0416
 
-.field public static final line1:I = 0x7f0a041d
+.field public static final line1:I = 0x7f0a0418
 
-.field public static final line3:I = 0x7f0a041e
+.field public static final line3:I = 0x7f0a0419
 
-.field public static final none:I = 0x7f0a04a2
+.field public static final none:I = 0x7f0a0495
 
-.field public static final normal:I = 0x7f0a04a3
+.field public static final normal:I = 0x7f0a0496
 
-.field public static final notification_background:I = 0x7f0a04ad
+.field public static final notification_background:I = 0x7f0a04a0
 
-.field public static final notification_main_column:I = 0x7f0a04ae
+.field public static final notification_main_column:I = 0x7f0a04a1
 
-.field public static final notification_main_column_container:I = 0x7f0a04af
+.field public static final notification_main_column_container:I = 0x7f0a04a2
 
-.field public static final right:I = 0x7f0a058c
+.field public static final right:I = 0x7f0a0573
 
-.field public static final right_icon:I = 0x7f0a058d
+.field public static final right_icon:I = 0x7f0a0574
 
-.field public static final right_side:I = 0x7f0a058e
+.field public static final right_side:I = 0x7f0a0575
 
-.field public static final start:I = 0x7f0a0734
+.field public static final start:I = 0x7f0a0715
 
-.field public static final tag_transition_group:I = 0x7f0a0767
+.field public static final tag_transition_group:I = 0x7f0a073f
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0768
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0740
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0769
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0741
 
-.field public static final text:I = 0x7f0a076f
+.field public static final text:I = 0x7f0a0747
 
-.field public static final text2:I = 0x7f0a0770
+.field public static final text2:I = 0x7f0a0748
 
-.field public static final time:I = 0x7f0a077d
+.field public static final time:I = 0x7f0a0755
 
-.field public static final title:I = 0x7f0a077e
+.field public static final title:I = 0x7f0a0756
 
-.field public static final top:I = 0x7f0a0785
+.field public static final top:I = 0x7f0a075d
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/coordinatorlayout/R$string.smali b/com.discord/smali/androidx/coordinatorlayout/R$string.smali
index 060534fa61..bea50eca78 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 = 0x7f121165
+.field public static final status_bar_notification_info_overflow:I = 0x7f1210d9
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/coordinatorlayout/R$styleable.smali b/com.discord/smali/androidx/coordinatorlayout/R$styleable.smali
index 8c7db40f43..d34fbc19a9 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
-        0x7f04031a
+        0x7f040319
     .end array-data
 
     :array_2
diff --git a/com.discord/smali/androidx/core/R$color.smali b/com.discord/smali/androidx/core/R$color.smali
index 7f1bef044d..c7669e5ea3 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 = 0x7f0600b8
+.field public static final notification_action_color_filter:I = 0x7f0600b7
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b9
+.field public static final notification_icon_bg_color:I = 0x7f0600b8
 
-.field public static final ripple_material_light:I = 0x7f0600fb
+.field public static final ripple_material_light:I = 0x7f0600fa
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fd
+.field public static final secondary_text_default_material_light:I = 0x7f0600fc
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/core/R$drawable.smali b/com.discord/smali/androidx/core/R$drawable.smali
index 5fd0caa176..d482b11761 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 = 0x7f080472
+.field public static final notification_action_background:I = 0x7f080463
 
-.field public static final notification_bg:I = 0x7f080473
+.field public static final notification_bg:I = 0x7f080464
 
-.field public static final notification_bg_low:I = 0x7f080474
+.field public static final notification_bg_low:I = 0x7f080465
 
-.field public static final notification_bg_low_normal:I = 0x7f080475
+.field public static final notification_bg_low_normal:I = 0x7f080466
 
-.field public static final notification_bg_low_pressed:I = 0x7f080476
+.field public static final notification_bg_low_pressed:I = 0x7f080467
 
-.field public static final notification_bg_normal:I = 0x7f080477
+.field public static final notification_bg_normal:I = 0x7f080468
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080478
+.field public static final notification_bg_normal_pressed:I = 0x7f080469
 
-.field public static final notification_icon_background:I = 0x7f080479
+.field public static final notification_icon_background:I = 0x7f08046a
 
-.field public static final notification_template_icon_bg:I = 0x7f08047a
+.field public static final notification_template_icon_bg:I = 0x7f08046b
 
-.field public static final notification_template_icon_low_bg:I = 0x7f08047b
+.field public static final notification_template_icon_low_bg:I = 0x7f08046c
 
-.field public static final notification_tile_bg:I = 0x7f08047c
+.field public static final notification_tile_bg:I = 0x7f08046d
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08047d
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08046e
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/core/R$id.smali b/com.discord/smali/androidx/core/R$id.smali
index ccc26758d9..591cf6fbf3 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 = 0x7f0a0080
+.field public static final async:I = 0x7f0a007f
 
-.field public static final blocking:I = 0x7f0a00ce
+.field public static final blocking:I = 0x7f0a00cd
 
 .field public static final chronometer:I = 0x7f0a0215
 
-.field public static final dialog_button:I = 0x7f0a025e
+.field public static final dialog_button:I = 0x7f0a025d
 
-.field public static final forever:I = 0x7f0a02f2
+.field public static final forever:I = 0x7f0a02f1
 
-.field public static final icon:I = 0x7f0a0396
+.field public static final icon:I = 0x7f0a0391
 
-.field public static final icon_group:I = 0x7f0a0397
+.field public static final icon_group:I = 0x7f0a0392
 
-.field public static final info:I = 0x7f0a03ac
+.field public static final info:I = 0x7f0a03a7
 
-.field public static final italic:I = 0x7f0a03d9
+.field public static final italic:I = 0x7f0a03d4
 
-.field public static final line1:I = 0x7f0a041d
+.field public static final line1:I = 0x7f0a0418
 
-.field public static final line3:I = 0x7f0a041e
+.field public static final line3:I = 0x7f0a0419
 
-.field public static final normal:I = 0x7f0a04a3
+.field public static final normal:I = 0x7f0a0496
 
-.field public static final notification_background:I = 0x7f0a04ad
+.field public static final notification_background:I = 0x7f0a04a0
 
-.field public static final notification_main_column:I = 0x7f0a04ae
+.field public static final notification_main_column:I = 0x7f0a04a1
 
-.field public static final notification_main_column_container:I = 0x7f0a04af
+.field public static final notification_main_column_container:I = 0x7f0a04a2
 
-.field public static final right_icon:I = 0x7f0a058d
+.field public static final right_icon:I = 0x7f0a0574
 
-.field public static final right_side:I = 0x7f0a058e
+.field public static final right_side:I = 0x7f0a0575
 
-.field public static final tag_accessibility_actions:I = 0x7f0a0762
+.field public static final tag_accessibility_actions:I = 0x7f0a073a
 
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0763
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a073b
 
-.field public static final tag_accessibility_heading:I = 0x7f0a0764
+.field public static final tag_accessibility_heading:I = 0x7f0a073c
 
-.field public static final tag_accessibility_pane_title:I = 0x7f0a0765
+.field public static final tag_accessibility_pane_title:I = 0x7f0a073d
 
-.field public static final tag_screen_reader_focusable:I = 0x7f0a0766
+.field public static final tag_screen_reader_focusable:I = 0x7f0a073e
 
-.field public static final tag_transition_group:I = 0x7f0a0767
+.field public static final tag_transition_group:I = 0x7f0a073f
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0768
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0740
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0769
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0741
 
-.field public static final text:I = 0x7f0a076f
+.field public static final text:I = 0x7f0a0747
 
-.field public static final text2:I = 0x7f0a0770
+.field public static final text2:I = 0x7f0a0748
 
-.field public static final time:I = 0x7f0a077d
+.field public static final time:I = 0x7f0a0755
 
-.field public static final title:I = 0x7f0a077e
+.field public static final title:I = 0x7f0a0756
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/core/R$string.smali b/com.discord/smali/androidx/core/R$string.smali
index 01621d2640..c2746ae3f6 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 = 0x7f121165
+.field public static final status_bar_notification_info_overflow:I = 0x7f1210d9
 
 
 # direct methods
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 8385c32bb2..3f2d4638a3 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 114b97c39e..2cb5c6bd2a 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 188a58f0b3..a0508ce5e0 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 6853acf2d6..b3b00fd848 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 6e70392785..d289867fef 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 8fa5c09c79..0f1c7ff793 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/androidx/core/ktx/R$color.smali b/com.discord/smali/androidx/core/ktx/R$color.smali
index cd4b019859..fbf28358ac 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 = 0x7f0600b8
+.field public static final notification_action_color_filter:I = 0x7f0600b7
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b9
+.field public static final notification_icon_bg_color:I = 0x7f0600b8
 
-.field public static final ripple_material_light:I = 0x7f0600fb
+.field public static final ripple_material_light:I = 0x7f0600fa
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fd
+.field public static final secondary_text_default_material_light:I = 0x7f0600fc
 
 
 # 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 14fc48ebf9..2103e14969 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 = 0x7f080472
+.field public static final notification_action_background:I = 0x7f080463
 
-.field public static final notification_bg:I = 0x7f080473
+.field public static final notification_bg:I = 0x7f080464
 
-.field public static final notification_bg_low:I = 0x7f080474
+.field public static final notification_bg_low:I = 0x7f080465
 
-.field public static final notification_bg_low_normal:I = 0x7f080475
+.field public static final notification_bg_low_normal:I = 0x7f080466
 
-.field public static final notification_bg_low_pressed:I = 0x7f080476
+.field public static final notification_bg_low_pressed:I = 0x7f080467
 
-.field public static final notification_bg_normal:I = 0x7f080477
+.field public static final notification_bg_normal:I = 0x7f080468
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080478
+.field public static final notification_bg_normal_pressed:I = 0x7f080469
 
-.field public static final notification_icon_background:I = 0x7f080479
+.field public static final notification_icon_background:I = 0x7f08046a
 
-.field public static final notification_template_icon_bg:I = 0x7f08047a
+.field public static final notification_template_icon_bg:I = 0x7f08046b
 
-.field public static final notification_template_icon_low_bg:I = 0x7f08047b
+.field public static final notification_template_icon_low_bg:I = 0x7f08046c
 
-.field public static final notification_tile_bg:I = 0x7f08047c
+.field public static final notification_tile_bg:I = 0x7f08046d
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08047d
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08046e
 
 
 # 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 c438c322fa..77fd6f5d7e 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 = 0x7f0a0080
+.field public static final async:I = 0x7f0a007f
 
-.field public static final blocking:I = 0x7f0a00ce
+.field public static final blocking:I = 0x7f0a00cd
 
 .field public static final chronometer:I = 0x7f0a0215
 
-.field public static final dialog_button:I = 0x7f0a025e
+.field public static final dialog_button:I = 0x7f0a025d
 
-.field public static final forever:I = 0x7f0a02f2
+.field public static final forever:I = 0x7f0a02f1
 
-.field public static final icon:I = 0x7f0a0396
+.field public static final icon:I = 0x7f0a0391
 
-.field public static final icon_group:I = 0x7f0a0397
+.field public static final icon_group:I = 0x7f0a0392
 
-.field public static final info:I = 0x7f0a03ac
+.field public static final info:I = 0x7f0a03a7
 
-.field public static final italic:I = 0x7f0a03d9
+.field public static final italic:I = 0x7f0a03d4
 
-.field public static final line1:I = 0x7f0a041d
+.field public static final line1:I = 0x7f0a0418
 
-.field public static final line3:I = 0x7f0a041e
+.field public static final line3:I = 0x7f0a0419
 
-.field public static final normal:I = 0x7f0a04a3
+.field public static final normal:I = 0x7f0a0496
 
-.field public static final notification_background:I = 0x7f0a04ad
+.field public static final notification_background:I = 0x7f0a04a0
 
-.field public static final notification_main_column:I = 0x7f0a04ae
+.field public static final notification_main_column:I = 0x7f0a04a1
 
-.field public static final notification_main_column_container:I = 0x7f0a04af
+.field public static final notification_main_column_container:I = 0x7f0a04a2
 
-.field public static final right_icon:I = 0x7f0a058d
+.field public static final right_icon:I = 0x7f0a0574
 
-.field public static final right_side:I = 0x7f0a058e
+.field public static final right_side:I = 0x7f0a0575
 
-.field public static final tag_accessibility_actions:I = 0x7f0a0762
+.field public static final tag_accessibility_actions:I = 0x7f0a073a
 
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0763
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a073b
 
-.field public static final tag_accessibility_heading:I = 0x7f0a0764
+.field public static final tag_accessibility_heading:I = 0x7f0a073c
 
-.field public static final tag_accessibility_pane_title:I = 0x7f0a0765
+.field public static final tag_accessibility_pane_title:I = 0x7f0a073d
 
-.field public static final tag_screen_reader_focusable:I = 0x7f0a0766
+.field public static final tag_screen_reader_focusable:I = 0x7f0a073e
 
-.field public static final tag_transition_group:I = 0x7f0a0767
+.field public static final tag_transition_group:I = 0x7f0a073f
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0768
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0740
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0769
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0741
 
-.field public static final text:I = 0x7f0a076f
+.field public static final text:I = 0x7f0a0747
 
-.field public static final text2:I = 0x7f0a0770
+.field public static final text2:I = 0x7f0a0748
 
-.field public static final time:I = 0x7f0a077d
+.field public static final time:I = 0x7f0a0755
 
-.field public static final title:I = 0x7f0a077e
+.field public static final title:I = 0x7f0a0756
 
 
 # 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 713b3c0dfa..6e3c216b10 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 = 0x7f121165
+.field public static final status_bar_notification_info_overflow:I = 0x7f1210d9
 
 
 # direct methods
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 83daa913b0..e86a094ed0 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 333559bb73..0f6c798fe9 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 72515d5d1f..345156f518 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 dd792a1608..0fea28e8ad 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 77bd473950..095e2c095c 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 6dd59d8569..cef72ccd36 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;->tw:Ljava/nio/charset/Charset;
+    sget-object p1, Lkotlin/text/d;->tx: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;->tw:Ljava/nio/charset/Charset;
+    sget-object p2, Lkotlin/text/d;->tx: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 590a912eee..c32c0bb113 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 d900cbd612..73c97d4cec 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 1b1e71f230..2e47b4800c 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 898f69f733..e125444eab 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/androidx/customview/R$color.smali b/com.discord/smali/androidx/customview/R$color.smali
index d460c1f268..8ed604bc51 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 = 0x7f0600b8
+.field public static final notification_action_color_filter:I = 0x7f0600b7
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b9
+.field public static final notification_icon_bg_color:I = 0x7f0600b8
 
-.field public static final ripple_material_light:I = 0x7f0600fb
+.field public static final ripple_material_light:I = 0x7f0600fa
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fd
+.field public static final secondary_text_default_material_light:I = 0x7f0600fc
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/customview/R$drawable.smali b/com.discord/smali/androidx/customview/R$drawable.smali
index 7a83a65383..3acae1bfff 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 = 0x7f080472
+.field public static final notification_action_background:I = 0x7f080463
 
-.field public static final notification_bg:I = 0x7f080473
+.field public static final notification_bg:I = 0x7f080464
 
-.field public static final notification_bg_low:I = 0x7f080474
+.field public static final notification_bg_low:I = 0x7f080465
 
-.field public static final notification_bg_low_normal:I = 0x7f080475
+.field public static final notification_bg_low_normal:I = 0x7f080466
 
-.field public static final notification_bg_low_pressed:I = 0x7f080476
+.field public static final notification_bg_low_pressed:I = 0x7f080467
 
-.field public static final notification_bg_normal:I = 0x7f080477
+.field public static final notification_bg_normal:I = 0x7f080468
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080478
+.field public static final notification_bg_normal_pressed:I = 0x7f080469
 
-.field public static final notification_icon_background:I = 0x7f080479
+.field public static final notification_icon_background:I = 0x7f08046a
 
-.field public static final notification_template_icon_bg:I = 0x7f08047a
+.field public static final notification_template_icon_bg:I = 0x7f08046b
 
-.field public static final notification_template_icon_low_bg:I = 0x7f08047b
+.field public static final notification_template_icon_low_bg:I = 0x7f08046c
 
-.field public static final notification_tile_bg:I = 0x7f08047c
+.field public static final notification_tile_bg:I = 0x7f08046d
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08047d
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08046e
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/customview/R$id.smali b/com.discord/smali/androidx/customview/R$id.smali
index 2b08742e00..864c879198 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 = 0x7f0a0080
+.field public static final async:I = 0x7f0a007f
 
-.field public static final blocking:I = 0x7f0a00ce
+.field public static final blocking:I = 0x7f0a00cd
 
 .field public static final chronometer:I = 0x7f0a0215
 
-.field public static final dialog_button:I = 0x7f0a025e
+.field public static final dialog_button:I = 0x7f0a025d
 
-.field public static final forever:I = 0x7f0a02f2
+.field public static final forever:I = 0x7f0a02f1
 
-.field public static final icon:I = 0x7f0a0396
+.field public static final icon:I = 0x7f0a0391
 
-.field public static final icon_group:I = 0x7f0a0397
+.field public static final icon_group:I = 0x7f0a0392
 
-.field public static final info:I = 0x7f0a03ac
+.field public static final info:I = 0x7f0a03a7
 
-.field public static final italic:I = 0x7f0a03d9
+.field public static final italic:I = 0x7f0a03d4
 
-.field public static final line1:I = 0x7f0a041d
+.field public static final line1:I = 0x7f0a0418
 
-.field public static final line3:I = 0x7f0a041e
+.field public static final line3:I = 0x7f0a0419
 
-.field public static final normal:I = 0x7f0a04a3
+.field public static final normal:I = 0x7f0a0496
 
-.field public static final notification_background:I = 0x7f0a04ad
+.field public static final notification_background:I = 0x7f0a04a0
 
-.field public static final notification_main_column:I = 0x7f0a04ae
+.field public static final notification_main_column:I = 0x7f0a04a1
 
-.field public static final notification_main_column_container:I = 0x7f0a04af
+.field public static final notification_main_column_container:I = 0x7f0a04a2
 
-.field public static final right_icon:I = 0x7f0a058d
+.field public static final right_icon:I = 0x7f0a0574
 
-.field public static final right_side:I = 0x7f0a058e
+.field public static final right_side:I = 0x7f0a0575
 
-.field public static final tag_accessibility_actions:I = 0x7f0a0762
+.field public static final tag_accessibility_actions:I = 0x7f0a073a
 
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0763
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a073b
 
-.field public static final tag_accessibility_heading:I = 0x7f0a0764
+.field public static final tag_accessibility_heading:I = 0x7f0a073c
 
-.field public static final tag_accessibility_pane_title:I = 0x7f0a0765
+.field public static final tag_accessibility_pane_title:I = 0x7f0a073d
 
-.field public static final tag_screen_reader_focusable:I = 0x7f0a0766
+.field public static final tag_screen_reader_focusable:I = 0x7f0a073e
 
-.field public static final tag_transition_group:I = 0x7f0a0767
+.field public static final tag_transition_group:I = 0x7f0a073f
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0768
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0740
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0769
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0741
 
-.field public static final text:I = 0x7f0a076f
+.field public static final text:I = 0x7f0a0747
 
-.field public static final text2:I = 0x7f0a0770
+.field public static final text2:I = 0x7f0a0748
 
-.field public static final time:I = 0x7f0a077d
+.field public static final time:I = 0x7f0a0755
 
-.field public static final title:I = 0x7f0a077e
+.field public static final title:I = 0x7f0a0756
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/customview/R$string.smali b/com.discord/smali/androidx/customview/R$string.smali
index 12062164db..e4f65e02c8 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 = 0x7f121165
+.field public static final status_bar_notification_info_overflow:I = 0x7f1210d9
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/drawerlayout/R$color.smali b/com.discord/smali/androidx/drawerlayout/R$color.smali
index 4f473c981b..0acf96ef17 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 = 0x7f0600b8
+.field public static final notification_action_color_filter:I = 0x7f0600b7
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b9
+.field public static final notification_icon_bg_color:I = 0x7f0600b8
 
-.field public static final ripple_material_light:I = 0x7f0600fb
+.field public static final ripple_material_light:I = 0x7f0600fa
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fd
+.field public static final secondary_text_default_material_light:I = 0x7f0600fc
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/drawerlayout/R$drawable.smali b/com.discord/smali/androidx/drawerlayout/R$drawable.smali
index bc95aa461a..f31f97db57 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 = 0x7f080472
+.field public static final notification_action_background:I = 0x7f080463
 
-.field public static final notification_bg:I = 0x7f080473
+.field public static final notification_bg:I = 0x7f080464
 
-.field public static final notification_bg_low:I = 0x7f080474
+.field public static final notification_bg_low:I = 0x7f080465
 
-.field public static final notification_bg_low_normal:I = 0x7f080475
+.field public static final notification_bg_low_normal:I = 0x7f080466
 
-.field public static final notification_bg_low_pressed:I = 0x7f080476
+.field public static final notification_bg_low_pressed:I = 0x7f080467
 
-.field public static final notification_bg_normal:I = 0x7f080477
+.field public static final notification_bg_normal:I = 0x7f080468
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080478
+.field public static final notification_bg_normal_pressed:I = 0x7f080469
 
-.field public static final notification_icon_background:I = 0x7f080479
+.field public static final notification_icon_background:I = 0x7f08046a
 
-.field public static final notification_template_icon_bg:I = 0x7f08047a
+.field public static final notification_template_icon_bg:I = 0x7f08046b
 
-.field public static final notification_template_icon_low_bg:I = 0x7f08047b
+.field public static final notification_template_icon_low_bg:I = 0x7f08046c
 
-.field public static final notification_tile_bg:I = 0x7f08047c
+.field public static final notification_tile_bg:I = 0x7f08046d
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08047d
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08046e
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/drawerlayout/R$id.smali b/com.discord/smali/androidx/drawerlayout/R$id.smali
index 6ee56f2ade..31bce56bd1 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 = 0x7f0a0080
+.field public static final async:I = 0x7f0a007f
 
-.field public static final blocking:I = 0x7f0a00ce
+.field public static final blocking:I = 0x7f0a00cd
 
 .field public static final chronometer:I = 0x7f0a0215
 
-.field public static final dialog_button:I = 0x7f0a025e
+.field public static final dialog_button:I = 0x7f0a025d
 
-.field public static final forever:I = 0x7f0a02f2
+.field public static final forever:I = 0x7f0a02f1
 
-.field public static final icon:I = 0x7f0a0396
+.field public static final icon:I = 0x7f0a0391
 
-.field public static final icon_group:I = 0x7f0a0397
+.field public static final icon_group:I = 0x7f0a0392
 
-.field public static final info:I = 0x7f0a03ac
+.field public static final info:I = 0x7f0a03a7
 
-.field public static final italic:I = 0x7f0a03d9
+.field public static final italic:I = 0x7f0a03d4
 
-.field public static final line1:I = 0x7f0a041d
+.field public static final line1:I = 0x7f0a0418
 
-.field public static final line3:I = 0x7f0a041e
+.field public static final line3:I = 0x7f0a0419
 
-.field public static final normal:I = 0x7f0a04a3
+.field public static final normal:I = 0x7f0a0496
 
-.field public static final notification_background:I = 0x7f0a04ad
+.field public static final notification_background:I = 0x7f0a04a0
 
-.field public static final notification_main_column:I = 0x7f0a04ae
+.field public static final notification_main_column:I = 0x7f0a04a1
 
-.field public static final notification_main_column_container:I = 0x7f0a04af
+.field public static final notification_main_column_container:I = 0x7f0a04a2
 
-.field public static final right_icon:I = 0x7f0a058d
+.field public static final right_icon:I = 0x7f0a0574
 
-.field public static final right_side:I = 0x7f0a058e
+.field public static final right_side:I = 0x7f0a0575
 
-.field public static final tag_accessibility_actions:I = 0x7f0a0762
+.field public static final tag_accessibility_actions:I = 0x7f0a073a
 
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0763
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a073b
 
-.field public static final tag_accessibility_heading:I = 0x7f0a0764
+.field public static final tag_accessibility_heading:I = 0x7f0a073c
 
-.field public static final tag_accessibility_pane_title:I = 0x7f0a0765
+.field public static final tag_accessibility_pane_title:I = 0x7f0a073d
 
-.field public static final tag_screen_reader_focusable:I = 0x7f0a0766
+.field public static final tag_screen_reader_focusable:I = 0x7f0a073e
 
-.field public static final tag_transition_group:I = 0x7f0a0767
+.field public static final tag_transition_group:I = 0x7f0a073f
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0768
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0740
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0769
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0741
 
-.field public static final text:I = 0x7f0a076f
+.field public static final text:I = 0x7f0a0747
 
-.field public static final text2:I = 0x7f0a0770
+.field public static final text2:I = 0x7f0a0748
 
-.field public static final time:I = 0x7f0a077d
+.field public static final time:I = 0x7f0a0755
 
-.field public static final title:I = 0x7f0a077e
+.field public static final title:I = 0x7f0a0756
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/drawerlayout/R$string.smali b/com.discord/smali/androidx/drawerlayout/R$string.smali
index cb9e6b87df..2e62c61471 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 = 0x7f121165
+.field public static final status_bar_notification_info_overflow:I = 0x7f1210d9
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/dynamicanimation/R$color.smali b/com.discord/smali/androidx/dynamicanimation/R$color.smali
index 0e03438eb3..eb8e8b4bbd 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 = 0x7f0600b8
+.field public static final notification_action_color_filter:I = 0x7f0600b7
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b9
+.field public static final notification_icon_bg_color:I = 0x7f0600b8
 
-.field public static final ripple_material_light:I = 0x7f0600fb
+.field public static final ripple_material_light:I = 0x7f0600fa
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fd
+.field public static final secondary_text_default_material_light:I = 0x7f0600fc
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/dynamicanimation/R$drawable.smali b/com.discord/smali/androidx/dynamicanimation/R$drawable.smali
index fb98e8584f..36420206dd 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 = 0x7f080472
+.field public static final notification_action_background:I = 0x7f080463
 
-.field public static final notification_bg:I = 0x7f080473
+.field public static final notification_bg:I = 0x7f080464
 
-.field public static final notification_bg_low:I = 0x7f080474
+.field public static final notification_bg_low:I = 0x7f080465
 
-.field public static final notification_bg_low_normal:I = 0x7f080475
+.field public static final notification_bg_low_normal:I = 0x7f080466
 
-.field public static final notification_bg_low_pressed:I = 0x7f080476
+.field public static final notification_bg_low_pressed:I = 0x7f080467
 
-.field public static final notification_bg_normal:I = 0x7f080477
+.field public static final notification_bg_normal:I = 0x7f080468
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080478
+.field public static final notification_bg_normal_pressed:I = 0x7f080469
 
-.field public static final notification_icon_background:I = 0x7f080479
+.field public static final notification_icon_background:I = 0x7f08046a
 
-.field public static final notification_template_icon_bg:I = 0x7f08047a
+.field public static final notification_template_icon_bg:I = 0x7f08046b
 
-.field public static final notification_template_icon_low_bg:I = 0x7f08047b
+.field public static final notification_template_icon_low_bg:I = 0x7f08046c
 
-.field public static final notification_tile_bg:I = 0x7f08047c
+.field public static final notification_tile_bg:I = 0x7f08046d
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08047d
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08046e
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/dynamicanimation/R$id.smali b/com.discord/smali/androidx/dynamicanimation/R$id.smali
index 057d22fa2b..a81358797f 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 = 0x7f0a0080
+.field public static final async:I = 0x7f0a007f
 
-.field public static final blocking:I = 0x7f0a00ce
+.field public static final blocking:I = 0x7f0a00cd
 
 .field public static final chronometer:I = 0x7f0a0215
 
-.field public static final dialog_button:I = 0x7f0a025e
+.field public static final dialog_button:I = 0x7f0a025d
 
-.field public static final forever:I = 0x7f0a02f2
+.field public static final forever:I = 0x7f0a02f1
 
-.field public static final icon:I = 0x7f0a0396
+.field public static final icon:I = 0x7f0a0391
 
-.field public static final icon_group:I = 0x7f0a0397
+.field public static final icon_group:I = 0x7f0a0392
 
-.field public static final info:I = 0x7f0a03ac
+.field public static final info:I = 0x7f0a03a7
 
-.field public static final italic:I = 0x7f0a03d9
+.field public static final italic:I = 0x7f0a03d4
 
-.field public static final line1:I = 0x7f0a041d
+.field public static final line1:I = 0x7f0a0418
 
-.field public static final line3:I = 0x7f0a041e
+.field public static final line3:I = 0x7f0a0419
 
-.field public static final normal:I = 0x7f0a04a3
+.field public static final normal:I = 0x7f0a0496
 
-.field public static final notification_background:I = 0x7f0a04ad
+.field public static final notification_background:I = 0x7f0a04a0
 
-.field public static final notification_main_column:I = 0x7f0a04ae
+.field public static final notification_main_column:I = 0x7f0a04a1
 
-.field public static final notification_main_column_container:I = 0x7f0a04af
+.field public static final notification_main_column_container:I = 0x7f0a04a2
 
-.field public static final right_icon:I = 0x7f0a058d
+.field public static final right_icon:I = 0x7f0a0574
 
-.field public static final right_side:I = 0x7f0a058e
+.field public static final right_side:I = 0x7f0a0575
 
-.field public static final tag_accessibility_actions:I = 0x7f0a0762
+.field public static final tag_accessibility_actions:I = 0x7f0a073a
 
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0763
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a073b
 
-.field public static final tag_accessibility_heading:I = 0x7f0a0764
+.field public static final tag_accessibility_heading:I = 0x7f0a073c
 
-.field public static final tag_accessibility_pane_title:I = 0x7f0a0765
+.field public static final tag_accessibility_pane_title:I = 0x7f0a073d
 
-.field public static final tag_screen_reader_focusable:I = 0x7f0a0766
+.field public static final tag_screen_reader_focusable:I = 0x7f0a073e
 
-.field public static final tag_transition_group:I = 0x7f0a0767
+.field public static final tag_transition_group:I = 0x7f0a073f
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0768
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0740
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0769
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0741
 
-.field public static final text:I = 0x7f0a076f
+.field public static final text:I = 0x7f0a0747
 
-.field public static final text2:I = 0x7f0a0770
+.field public static final text2:I = 0x7f0a0748
 
-.field public static final time:I = 0x7f0a077d
+.field public static final time:I = 0x7f0a0755
 
-.field public static final title:I = 0x7f0a077e
+.field public static final title:I = 0x7f0a0756
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/dynamicanimation/R$string.smali b/com.discord/smali/androidx/dynamicanimation/R$string.smali
index b6d7e75578..bf7327c822 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 = 0x7f121165
+.field public static final status_bar_notification_info_overflow:I = 0x7f1210d9
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/fragment/R$color.smali b/com.discord/smali/androidx/fragment/R$color.smali
index 0afeae4139..374fea0ea5 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 = 0x7f0600b8
+.field public static final notification_action_color_filter:I = 0x7f0600b7
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b9
+.field public static final notification_icon_bg_color:I = 0x7f0600b8
 
-.field public static final ripple_material_light:I = 0x7f0600fb
+.field public static final ripple_material_light:I = 0x7f0600fa
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fd
+.field public static final secondary_text_default_material_light:I = 0x7f0600fc
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/fragment/R$drawable.smali b/com.discord/smali/androidx/fragment/R$drawable.smali
index 86ae190474..b26d50eeee 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 = 0x7f080472
+.field public static final notification_action_background:I = 0x7f080463
 
-.field public static final notification_bg:I = 0x7f080473
+.field public static final notification_bg:I = 0x7f080464
 
-.field public static final notification_bg_low:I = 0x7f080474
+.field public static final notification_bg_low:I = 0x7f080465
 
-.field public static final notification_bg_low_normal:I = 0x7f080475
+.field public static final notification_bg_low_normal:I = 0x7f080466
 
-.field public static final notification_bg_low_pressed:I = 0x7f080476
+.field public static final notification_bg_low_pressed:I = 0x7f080467
 
-.field public static final notification_bg_normal:I = 0x7f080477
+.field public static final notification_bg_normal:I = 0x7f080468
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080478
+.field public static final notification_bg_normal_pressed:I = 0x7f080469
 
-.field public static final notification_icon_background:I = 0x7f080479
+.field public static final notification_icon_background:I = 0x7f08046a
 
-.field public static final notification_template_icon_bg:I = 0x7f08047a
+.field public static final notification_template_icon_bg:I = 0x7f08046b
 
-.field public static final notification_template_icon_low_bg:I = 0x7f08047b
+.field public static final notification_template_icon_low_bg:I = 0x7f08046c
 
-.field public static final notification_tile_bg:I = 0x7f08047c
+.field public static final notification_tile_bg:I = 0x7f08046d
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08047d
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08046e
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/fragment/R$id.smali b/com.discord/smali/androidx/fragment/R$id.smali
index 2dfb894c65..5b7dfe5e15 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 = 0x7f0a0080
+.field public static final async:I = 0x7f0a007f
 
-.field public static final blocking:I = 0x7f0a00ce
+.field public static final blocking:I = 0x7f0a00cd
 
 .field public static final chronometer:I = 0x7f0a0215
 
-.field public static final dialog_button:I = 0x7f0a025e
+.field public static final dialog_button:I = 0x7f0a025d
 
-.field public static final forever:I = 0x7f0a02f2
+.field public static final forever:I = 0x7f0a02f1
 
-.field public static final icon:I = 0x7f0a0396
+.field public static final icon:I = 0x7f0a0391
 
-.field public static final icon_group:I = 0x7f0a0397
+.field public static final icon_group:I = 0x7f0a0392
 
-.field public static final info:I = 0x7f0a03ac
+.field public static final info:I = 0x7f0a03a7
 
-.field public static final italic:I = 0x7f0a03d9
+.field public static final italic:I = 0x7f0a03d4
 
-.field public static final line1:I = 0x7f0a041d
+.field public static final line1:I = 0x7f0a0418
 
-.field public static final line3:I = 0x7f0a041e
+.field public static final line3:I = 0x7f0a0419
 
-.field public static final normal:I = 0x7f0a04a3
+.field public static final normal:I = 0x7f0a0496
 
-.field public static final notification_background:I = 0x7f0a04ad
+.field public static final notification_background:I = 0x7f0a04a0
 
-.field public static final notification_main_column:I = 0x7f0a04ae
+.field public static final notification_main_column:I = 0x7f0a04a1
 
-.field public static final notification_main_column_container:I = 0x7f0a04af
+.field public static final notification_main_column_container:I = 0x7f0a04a2
 
-.field public static final right_icon:I = 0x7f0a058d
+.field public static final right_icon:I = 0x7f0a0574
 
-.field public static final right_side:I = 0x7f0a058e
+.field public static final right_side:I = 0x7f0a0575
 
-.field public static final tag_accessibility_actions:I = 0x7f0a0762
+.field public static final tag_accessibility_actions:I = 0x7f0a073a
 
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0763
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a073b
 
-.field public static final tag_accessibility_heading:I = 0x7f0a0764
+.field public static final tag_accessibility_heading:I = 0x7f0a073c
 
-.field public static final tag_accessibility_pane_title:I = 0x7f0a0765
+.field public static final tag_accessibility_pane_title:I = 0x7f0a073d
 
-.field public static final tag_screen_reader_focusable:I = 0x7f0a0766
+.field public static final tag_screen_reader_focusable:I = 0x7f0a073e
 
-.field public static final tag_transition_group:I = 0x7f0a0767
+.field public static final tag_transition_group:I = 0x7f0a073f
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0768
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0740
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0769
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0741
 
-.field public static final text:I = 0x7f0a076f
+.field public static final text:I = 0x7f0a0747
 
-.field public static final text2:I = 0x7f0a0770
+.field public static final text2:I = 0x7f0a0748
 
-.field public static final time:I = 0x7f0a077d
+.field public static final time:I = 0x7f0a0755
 
-.field public static final title:I = 0x7f0a077e
+.field public static final title:I = 0x7f0a0756
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/fragment/R$string.smali b/com.discord/smali/androidx/fragment/R$string.smali
index 9fb3c262e7..f6e0574861 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 = 0x7f121165
+.field public static final status_bar_notification_info_overflow:I = 0x7f1210d9
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/legacy/coreui/R$attr.smali b/com.discord/smali/androidx/legacy/coreui/R$attr.smali
index b56925fde3..5fe32216df 100644
--- a/com.discord/smali/androidx/legacy/coreui/R$attr.smali
+++ b/com.discord/smali/androidx/legacy/coreui/R$attr.smali
@@ -53,7 +53,7 @@
 
 .field public static final layout_keyline:I = 0x7f04024b
 
-.field public static final statusBarBackground:I = 0x7f04031a
+.field public static final statusBarBackground:I = 0x7f040319
 
 .field public static final ttcIndex:I = 0x7f0403d3
 
diff --git a/com.discord/smali/androidx/legacy/coreui/R$color.smali b/com.discord/smali/androidx/legacy/coreui/R$color.smali
index 3356f42c60..16f7a7edf0 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 = 0x7f0600b8
+.field public static final notification_action_color_filter:I = 0x7f0600b7
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b9
+.field public static final notification_icon_bg_color:I = 0x7f0600b8
 
-.field public static final ripple_material_light:I = 0x7f0600fb
+.field public static final ripple_material_light:I = 0x7f0600fa
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fd
+.field public static final secondary_text_default_material_light:I = 0x7f0600fc
 
 
 # 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 20149986bf..56028e769f 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 = 0x7f080472
+.field public static final notification_action_background:I = 0x7f080463
 
-.field public static final notification_bg:I = 0x7f080473
+.field public static final notification_bg:I = 0x7f080464
 
-.field public static final notification_bg_low:I = 0x7f080474
+.field public static final notification_bg_low:I = 0x7f080465
 
-.field public static final notification_bg_low_normal:I = 0x7f080475
+.field public static final notification_bg_low_normal:I = 0x7f080466
 
-.field public static final notification_bg_low_pressed:I = 0x7f080476
+.field public static final notification_bg_low_pressed:I = 0x7f080467
 
-.field public static final notification_bg_normal:I = 0x7f080477
+.field public static final notification_bg_normal:I = 0x7f080468
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080478
+.field public static final notification_bg_normal_pressed:I = 0x7f080469
 
-.field public static final notification_icon_background:I = 0x7f080479
+.field public static final notification_icon_background:I = 0x7f08046a
 
-.field public static final notification_template_icon_bg:I = 0x7f08047a
+.field public static final notification_template_icon_bg:I = 0x7f08046b
 
-.field public static final notification_template_icon_low_bg:I = 0x7f08047b
+.field public static final notification_template_icon_low_bg:I = 0x7f08046c
 
-.field public static final notification_tile_bg:I = 0x7f08047c
+.field public static final notification_tile_bg:I = 0x7f08046d
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08047d
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08046e
 
 
 # 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 8eb2bd065b..c06b360391 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 = 0x7f0a0080
+.field public static final async:I = 0x7f0a007f
 
-.field public static final blocking:I = 0x7f0a00ce
+.field public static final blocking:I = 0x7f0a00cd
 
 .field public static final bottom:I = 0x7f0a0105
 
 .field public static final chronometer:I = 0x7f0a0215
 
-.field public static final end:I = 0x7f0a02c9
+.field public static final end:I = 0x7f0a02c8
 
-.field public static final forever:I = 0x7f0a02f2
+.field public static final forever:I = 0x7f0a02f1
 
-.field public static final icon:I = 0x7f0a0396
+.field public static final icon:I = 0x7f0a0391
 
-.field public static final icon_group:I = 0x7f0a0397
+.field public static final icon_group:I = 0x7f0a0392
 
-.field public static final info:I = 0x7f0a03ac
+.field public static final info:I = 0x7f0a03a7
 
-.field public static final italic:I = 0x7f0a03d9
+.field public static final italic:I = 0x7f0a03d4
 
-.field public static final left:I = 0x7f0a041b
+.field public static final left:I = 0x7f0a0416
 
-.field public static final line1:I = 0x7f0a041d
+.field public static final line1:I = 0x7f0a0418
 
-.field public static final line3:I = 0x7f0a041e
+.field public static final line3:I = 0x7f0a0419
 
-.field public static final none:I = 0x7f0a04a2
+.field public static final none:I = 0x7f0a0495
 
-.field public static final normal:I = 0x7f0a04a3
+.field public static final normal:I = 0x7f0a0496
 
-.field public static final notification_background:I = 0x7f0a04ad
+.field public static final notification_background:I = 0x7f0a04a0
 
-.field public static final notification_main_column:I = 0x7f0a04ae
+.field public static final notification_main_column:I = 0x7f0a04a1
 
-.field public static final notification_main_column_container:I = 0x7f0a04af
+.field public static final notification_main_column_container:I = 0x7f0a04a2
 
-.field public static final right:I = 0x7f0a058c
+.field public static final right:I = 0x7f0a0573
 
-.field public static final right_icon:I = 0x7f0a058d
+.field public static final right_icon:I = 0x7f0a0574
 
-.field public static final right_side:I = 0x7f0a058e
+.field public static final right_side:I = 0x7f0a0575
 
-.field public static final start:I = 0x7f0a0734
+.field public static final start:I = 0x7f0a0715
 
-.field public static final tag_transition_group:I = 0x7f0a0767
+.field public static final tag_transition_group:I = 0x7f0a073f
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0768
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0740
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0769
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0741
 
-.field public static final text:I = 0x7f0a076f
+.field public static final text:I = 0x7f0a0747
 
-.field public static final text2:I = 0x7f0a0770
+.field public static final text2:I = 0x7f0a0748
 
-.field public static final time:I = 0x7f0a077d
+.field public static final time:I = 0x7f0a0755
 
-.field public static final title:I = 0x7f0a077e
+.field public static final title:I = 0x7f0a0756
 
-.field public static final top:I = 0x7f0a0785
+.field public static final top:I = 0x7f0a075d
 
 
 # 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 7fb240e3f4..c98d89bcb0 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 = 0x7f121165
+.field public static final status_bar_notification_info_overflow:I = 0x7f1210d9
 
 
 # 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 7d1027cfc8..f9abd0c36e 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
-        0x7f04031a
+        0x7f040319
     .end array-data
 
     :array_2
diff --git a/com.discord/smali/androidx/legacy/coreutils/R$color.smali b/com.discord/smali/androidx/legacy/coreutils/R$color.smali
index eb2da11d43..c0f1e86fc1 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 = 0x7f0600b8
+.field public static final notification_action_color_filter:I = 0x7f0600b7
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b9
+.field public static final notification_icon_bg_color:I = 0x7f0600b8
 
-.field public static final ripple_material_light:I = 0x7f0600fb
+.field public static final ripple_material_light:I = 0x7f0600fa
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fd
+.field public static final secondary_text_default_material_light:I = 0x7f0600fc
 
 
 # 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 24e2b9200e..25f1f0dd76 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 = 0x7f080472
+.field public static final notification_action_background:I = 0x7f080463
 
-.field public static final notification_bg:I = 0x7f080473
+.field public static final notification_bg:I = 0x7f080464
 
-.field public static final notification_bg_low:I = 0x7f080474
+.field public static final notification_bg_low:I = 0x7f080465
 
-.field public static final notification_bg_low_normal:I = 0x7f080475
+.field public static final notification_bg_low_normal:I = 0x7f080466
 
-.field public static final notification_bg_low_pressed:I = 0x7f080476
+.field public static final notification_bg_low_pressed:I = 0x7f080467
 
-.field public static final notification_bg_normal:I = 0x7f080477
+.field public static final notification_bg_normal:I = 0x7f080468
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080478
+.field public static final notification_bg_normal_pressed:I = 0x7f080469
 
-.field public static final notification_icon_background:I = 0x7f080479
+.field public static final notification_icon_background:I = 0x7f08046a
 
-.field public static final notification_template_icon_bg:I = 0x7f08047a
+.field public static final notification_template_icon_bg:I = 0x7f08046b
 
-.field public static final notification_template_icon_low_bg:I = 0x7f08047b
+.field public static final notification_template_icon_low_bg:I = 0x7f08046c
 
-.field public static final notification_tile_bg:I = 0x7f08047c
+.field public static final notification_tile_bg:I = 0x7f08046d
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08047d
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08046e
 
 
 # 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 be25b13571..8f6b80625b 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 = 0x7f0a0080
+.field public static final async:I = 0x7f0a007f
 
-.field public static final blocking:I = 0x7f0a00ce
+.field public static final blocking:I = 0x7f0a00cd
 
 .field public static final chronometer:I = 0x7f0a0215
 
-.field public static final forever:I = 0x7f0a02f2
+.field public static final forever:I = 0x7f0a02f1
 
-.field public static final icon:I = 0x7f0a0396
+.field public static final icon:I = 0x7f0a0391
 
-.field public static final icon_group:I = 0x7f0a0397
+.field public static final icon_group:I = 0x7f0a0392
 
-.field public static final info:I = 0x7f0a03ac
+.field public static final info:I = 0x7f0a03a7
 
-.field public static final italic:I = 0x7f0a03d9
+.field public static final italic:I = 0x7f0a03d4
 
-.field public static final line1:I = 0x7f0a041d
+.field public static final line1:I = 0x7f0a0418
 
-.field public static final line3:I = 0x7f0a041e
+.field public static final line3:I = 0x7f0a0419
 
-.field public static final normal:I = 0x7f0a04a3
+.field public static final normal:I = 0x7f0a0496
 
-.field public static final notification_background:I = 0x7f0a04ad
+.field public static final notification_background:I = 0x7f0a04a0
 
-.field public static final notification_main_column:I = 0x7f0a04ae
+.field public static final notification_main_column:I = 0x7f0a04a1
 
-.field public static final notification_main_column_container:I = 0x7f0a04af
+.field public static final notification_main_column_container:I = 0x7f0a04a2
 
-.field public static final right_icon:I = 0x7f0a058d
+.field public static final right_icon:I = 0x7f0a0574
 
-.field public static final right_side:I = 0x7f0a058e
+.field public static final right_side:I = 0x7f0a0575
 
-.field public static final tag_transition_group:I = 0x7f0a0767
+.field public static final tag_transition_group:I = 0x7f0a073f
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0768
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0740
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0769
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0741
 
-.field public static final text:I = 0x7f0a076f
+.field public static final text:I = 0x7f0a0747
 
-.field public static final text2:I = 0x7f0a0770
+.field public static final text2:I = 0x7f0a0748
 
-.field public static final time:I = 0x7f0a077d
+.field public static final time:I = 0x7f0a0755
 
-.field public static final title:I = 0x7f0a077e
+.field public static final title:I = 0x7f0a0756
 
 
 # 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 b4d718576b..7574c8d9ea 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 = 0x7f121165
+.field public static final status_bar_notification_info_overflow:I = 0x7f1210d9
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/lifecycle/extensions/R$attr.smali b/com.discord/smali/androidx/lifecycle/extensions/R$attr.smali
index 8fabc8eb41..2476c11bdf 100644
--- a/com.discord/smali/androidx/lifecycle/extensions/R$attr.smali
+++ b/com.discord/smali/androidx/lifecycle/extensions/R$attr.smali
@@ -53,7 +53,7 @@
 
 .field public static final layout_keyline:I = 0x7f04024b
 
-.field public static final statusBarBackground:I = 0x7f04031a
+.field public static final statusBarBackground:I = 0x7f040319
 
 .field public static final ttcIndex:I = 0x7f0403d3
 
diff --git a/com.discord/smali/androidx/lifecycle/extensions/R$color.smali b/com.discord/smali/androidx/lifecycle/extensions/R$color.smali
index cc4d8228f5..61fc8b367f 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 = 0x7f0600b8
+.field public static final notification_action_color_filter:I = 0x7f0600b7
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b9
+.field public static final notification_icon_bg_color:I = 0x7f0600b8
 
-.field public static final ripple_material_light:I = 0x7f0600fb
+.field public static final ripple_material_light:I = 0x7f0600fa
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fd
+.field public static final secondary_text_default_material_light:I = 0x7f0600fc
 
 
 # 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 6234358e6f..8e60637b12 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 = 0x7f080472
+.field public static final notification_action_background:I = 0x7f080463
 
-.field public static final notification_bg:I = 0x7f080473
+.field public static final notification_bg:I = 0x7f080464
 
-.field public static final notification_bg_low:I = 0x7f080474
+.field public static final notification_bg_low:I = 0x7f080465
 
-.field public static final notification_bg_low_normal:I = 0x7f080475
+.field public static final notification_bg_low_normal:I = 0x7f080466
 
-.field public static final notification_bg_low_pressed:I = 0x7f080476
+.field public static final notification_bg_low_pressed:I = 0x7f080467
 
-.field public static final notification_bg_normal:I = 0x7f080477
+.field public static final notification_bg_normal:I = 0x7f080468
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080478
+.field public static final notification_bg_normal_pressed:I = 0x7f080469
 
-.field public static final notification_icon_background:I = 0x7f080479
+.field public static final notification_icon_background:I = 0x7f08046a
 
-.field public static final notification_template_icon_bg:I = 0x7f08047a
+.field public static final notification_template_icon_bg:I = 0x7f08046b
 
-.field public static final notification_template_icon_low_bg:I = 0x7f08047b
+.field public static final notification_template_icon_low_bg:I = 0x7f08046c
 
-.field public static final notification_tile_bg:I = 0x7f08047c
+.field public static final notification_tile_bg:I = 0x7f08046d
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08047d
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08046e
 
 
 # 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 ffc256c3e1..f899620b0a 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 = 0x7f0a0080
+.field public static final async:I = 0x7f0a007f
 
-.field public static final blocking:I = 0x7f0a00ce
+.field public static final blocking:I = 0x7f0a00cd
 
 .field public static final bottom:I = 0x7f0a0105
 
 .field public static final chronometer:I = 0x7f0a0215
 
-.field public static final end:I = 0x7f0a02c9
+.field public static final end:I = 0x7f0a02c8
 
-.field public static final forever:I = 0x7f0a02f2
+.field public static final forever:I = 0x7f0a02f1
 
-.field public static final icon:I = 0x7f0a0396
+.field public static final icon:I = 0x7f0a0391
 
-.field public static final icon_group:I = 0x7f0a0397
+.field public static final icon_group:I = 0x7f0a0392
 
-.field public static final info:I = 0x7f0a03ac
+.field public static final info:I = 0x7f0a03a7
 
-.field public static final italic:I = 0x7f0a03d9
+.field public static final italic:I = 0x7f0a03d4
 
-.field public static final left:I = 0x7f0a041b
+.field public static final left:I = 0x7f0a0416
 
-.field public static final line1:I = 0x7f0a041d
+.field public static final line1:I = 0x7f0a0418
 
-.field public static final line3:I = 0x7f0a041e
+.field public static final line3:I = 0x7f0a0419
 
-.field public static final none:I = 0x7f0a04a2
+.field public static final none:I = 0x7f0a0495
 
-.field public static final normal:I = 0x7f0a04a3
+.field public static final normal:I = 0x7f0a0496
 
-.field public static final notification_background:I = 0x7f0a04ad
+.field public static final notification_background:I = 0x7f0a04a0
 
-.field public static final notification_main_column:I = 0x7f0a04ae
+.field public static final notification_main_column:I = 0x7f0a04a1
 
-.field public static final notification_main_column_container:I = 0x7f0a04af
+.field public static final notification_main_column_container:I = 0x7f0a04a2
 
-.field public static final right:I = 0x7f0a058c
+.field public static final right:I = 0x7f0a0573
 
-.field public static final right_icon:I = 0x7f0a058d
+.field public static final right_icon:I = 0x7f0a0574
 
-.field public static final right_side:I = 0x7f0a058e
+.field public static final right_side:I = 0x7f0a0575
 
-.field public static final start:I = 0x7f0a0734
+.field public static final start:I = 0x7f0a0715
 
-.field public static final tag_transition_group:I = 0x7f0a0767
+.field public static final tag_transition_group:I = 0x7f0a073f
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0768
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0740
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0769
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0741
 
-.field public static final text:I = 0x7f0a076f
+.field public static final text:I = 0x7f0a0747
 
-.field public static final text2:I = 0x7f0a0770
+.field public static final text2:I = 0x7f0a0748
 
-.field public static final time:I = 0x7f0a077d
+.field public static final time:I = 0x7f0a0755
 
-.field public static final title:I = 0x7f0a077e
+.field public static final title:I = 0x7f0a0756
 
-.field public static final top:I = 0x7f0a0785
+.field public static final top:I = 0x7f0a075d
 
 
 # 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 ce47f1d6f1..887b793969 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 = 0x7f121165
+.field public static final status_bar_notification_info_overflow:I = 0x7f1210d9
 
 
 # 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 1d41e752e1..c7480ba983 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
-        0x7f04031a
+        0x7f040319
     .end array-data
 
     :array_2
diff --git a/com.discord/smali/androidx/loader/R$color.smali b/com.discord/smali/androidx/loader/R$color.smali
index 0e7392eca5..2fad83c3e0 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 = 0x7f0600b8
+.field public static final notification_action_color_filter:I = 0x7f0600b7
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b9
+.field public static final notification_icon_bg_color:I = 0x7f0600b8
 
-.field public static final ripple_material_light:I = 0x7f0600fb
+.field public static final ripple_material_light:I = 0x7f0600fa
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fd
+.field public static final secondary_text_default_material_light:I = 0x7f0600fc
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/loader/R$drawable.smali b/com.discord/smali/androidx/loader/R$drawable.smali
index e37ed42a4f..efcba2b99b 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 = 0x7f080472
+.field public static final notification_action_background:I = 0x7f080463
 
-.field public static final notification_bg:I = 0x7f080473
+.field public static final notification_bg:I = 0x7f080464
 
-.field public static final notification_bg_low:I = 0x7f080474
+.field public static final notification_bg_low:I = 0x7f080465
 
-.field public static final notification_bg_low_normal:I = 0x7f080475
+.field public static final notification_bg_low_normal:I = 0x7f080466
 
-.field public static final notification_bg_low_pressed:I = 0x7f080476
+.field public static final notification_bg_low_pressed:I = 0x7f080467
 
-.field public static final notification_bg_normal:I = 0x7f080477
+.field public static final notification_bg_normal:I = 0x7f080468
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080478
+.field public static final notification_bg_normal_pressed:I = 0x7f080469
 
-.field public static final notification_icon_background:I = 0x7f080479
+.field public static final notification_icon_background:I = 0x7f08046a
 
-.field public static final notification_template_icon_bg:I = 0x7f08047a
+.field public static final notification_template_icon_bg:I = 0x7f08046b
 
-.field public static final notification_template_icon_low_bg:I = 0x7f08047b
+.field public static final notification_template_icon_low_bg:I = 0x7f08046c
 
-.field public static final notification_tile_bg:I = 0x7f08047c
+.field public static final notification_tile_bg:I = 0x7f08046d
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08047d
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08046e
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/loader/R$id.smali b/com.discord/smali/androidx/loader/R$id.smali
index ae12015ad9..62e4f0f019 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 = 0x7f0a0080
+.field public static final async:I = 0x7f0a007f
 
-.field public static final blocking:I = 0x7f0a00ce
+.field public static final blocking:I = 0x7f0a00cd
 
 .field public static final chronometer:I = 0x7f0a0215
 
-.field public static final forever:I = 0x7f0a02f2
+.field public static final forever:I = 0x7f0a02f1
 
-.field public static final icon:I = 0x7f0a0396
+.field public static final icon:I = 0x7f0a0391
 
-.field public static final icon_group:I = 0x7f0a0397
+.field public static final icon_group:I = 0x7f0a0392
 
-.field public static final info:I = 0x7f0a03ac
+.field public static final info:I = 0x7f0a03a7
 
-.field public static final italic:I = 0x7f0a03d9
+.field public static final italic:I = 0x7f0a03d4
 
-.field public static final line1:I = 0x7f0a041d
+.field public static final line1:I = 0x7f0a0418
 
-.field public static final line3:I = 0x7f0a041e
+.field public static final line3:I = 0x7f0a0419
 
-.field public static final normal:I = 0x7f0a04a3
+.field public static final normal:I = 0x7f0a0496
 
-.field public static final notification_background:I = 0x7f0a04ad
+.field public static final notification_background:I = 0x7f0a04a0
 
-.field public static final notification_main_column:I = 0x7f0a04ae
+.field public static final notification_main_column:I = 0x7f0a04a1
 
-.field public static final notification_main_column_container:I = 0x7f0a04af
+.field public static final notification_main_column_container:I = 0x7f0a04a2
 
-.field public static final right_icon:I = 0x7f0a058d
+.field public static final right_icon:I = 0x7f0a0574
 
-.field public static final right_side:I = 0x7f0a058e
+.field public static final right_side:I = 0x7f0a0575
 
-.field public static final tag_transition_group:I = 0x7f0a0767
+.field public static final tag_transition_group:I = 0x7f0a073f
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0768
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0740
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0769
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0741
 
-.field public static final text:I = 0x7f0a076f
+.field public static final text:I = 0x7f0a0747
 
-.field public static final text2:I = 0x7f0a0770
+.field public static final text2:I = 0x7f0a0748
 
-.field public static final time:I = 0x7f0a077d
+.field public static final time:I = 0x7f0a0755
 
-.field public static final title:I = 0x7f0a077e
+.field public static final title:I = 0x7f0a0756
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/loader/R$string.smali b/com.discord/smali/androidx/loader/R$string.smali
index fd17058421..c6d087cd5d 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 = 0x7f121165
+.field public static final status_bar_notification_info_overflow:I = 0x7f1210d9
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/recyclerview/R$attr.smali b/com.discord/smali/androidx/recyclerview/R$attr.smali
index 4b52e49c3f..34f7fde69c 100644
--- a/com.discord/smali/androidx/recyclerview/R$attr.smali
+++ b/com.discord/smali/androidx/recyclerview/R$attr.smali
@@ -65,13 +65,13 @@
 
 .field public static final layout_keyline:I = 0x7f04024b
 
-.field public static final reverseLayout:I = 0x7f0402d7
+.field public static final reverseLayout:I = 0x7f0402d6
 
-.field public static final spanCount:I = 0x7f04030e
+.field public static final spanCount:I = 0x7f04030d
 
-.field public static final stackFromEnd:I = 0x7f040314
+.field public static final stackFromEnd:I = 0x7f040313
 
-.field public static final statusBarBackground:I = 0x7f04031a
+.field public static final statusBarBackground:I = 0x7f040319
 
 .field public static final ttcIndex:I = 0x7f0403d3
 
diff --git a/com.discord/smali/androidx/recyclerview/R$color.smali b/com.discord/smali/androidx/recyclerview/R$color.smali
index 4d787fe4ad..a3cf0aea8c 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 = 0x7f0600b8
+.field public static final notification_action_color_filter:I = 0x7f0600b7
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b9
+.field public static final notification_icon_bg_color:I = 0x7f0600b8
 
-.field public static final ripple_material_light:I = 0x7f0600fb
+.field public static final ripple_material_light:I = 0x7f0600fa
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fd
+.field public static final secondary_text_default_material_light:I = 0x7f0600fc
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/recyclerview/R$drawable.smali b/com.discord/smali/androidx/recyclerview/R$drawable.smali
index c9ac59dc42..47e9aa8c2b 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 = 0x7f080472
+.field public static final notification_action_background:I = 0x7f080463
 
-.field public static final notification_bg:I = 0x7f080473
+.field public static final notification_bg:I = 0x7f080464
 
-.field public static final notification_bg_low:I = 0x7f080474
+.field public static final notification_bg_low:I = 0x7f080465
 
-.field public static final notification_bg_low_normal:I = 0x7f080475
+.field public static final notification_bg_low_normal:I = 0x7f080466
 
-.field public static final notification_bg_low_pressed:I = 0x7f080476
+.field public static final notification_bg_low_pressed:I = 0x7f080467
 
-.field public static final notification_bg_normal:I = 0x7f080477
+.field public static final notification_bg_normal:I = 0x7f080468
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080478
+.field public static final notification_bg_normal_pressed:I = 0x7f080469
 
-.field public static final notification_icon_background:I = 0x7f080479
+.field public static final notification_icon_background:I = 0x7f08046a
 
-.field public static final notification_template_icon_bg:I = 0x7f08047a
+.field public static final notification_template_icon_bg:I = 0x7f08046b
 
-.field public static final notification_template_icon_low_bg:I = 0x7f08047b
+.field public static final notification_template_icon_low_bg:I = 0x7f08046c
 
-.field public static final notification_tile_bg:I = 0x7f08047c
+.field public static final notification_tile_bg:I = 0x7f08046d
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08047d
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08046e
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/recyclerview/R$id.smali b/com.discord/smali/androidx/recyclerview/R$id.smali
index d413496588..66c78b4583 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 = 0x7f0a0080
+.field public static final async:I = 0x7f0a007f
 
-.field public static final blocking:I = 0x7f0a00ce
+.field public static final blocking:I = 0x7f0a00cd
 
 .field public static final bottom:I = 0x7f0a0105
 
 .field public static final chronometer:I = 0x7f0a0215
 
-.field public static final end:I = 0x7f0a02c9
+.field public static final end:I = 0x7f0a02c8
 
-.field public static final forever:I = 0x7f0a02f2
+.field public static final forever:I = 0x7f0a02f1
 
-.field public static final icon:I = 0x7f0a0396
+.field public static final icon:I = 0x7f0a0391
 
-.field public static final icon_group:I = 0x7f0a0397
+.field public static final icon_group:I = 0x7f0a0392
 
-.field public static final info:I = 0x7f0a03ac
+.field public static final info:I = 0x7f0a03a7
 
-.field public static final italic:I = 0x7f0a03d9
+.field public static final italic:I = 0x7f0a03d4
 
-.field public static final item_touch_helper_previous_elevation:I = 0x7f0a040d
+.field public static final item_touch_helper_previous_elevation:I = 0x7f0a0408
 
-.field public static final left:I = 0x7f0a041b
+.field public static final left:I = 0x7f0a0416
 
-.field public static final line1:I = 0x7f0a041d
+.field public static final line1:I = 0x7f0a0418
 
-.field public static final line3:I = 0x7f0a041e
+.field public static final line3:I = 0x7f0a0419
 
-.field public static final none:I = 0x7f0a04a2
+.field public static final none:I = 0x7f0a0495
 
-.field public static final normal:I = 0x7f0a04a3
+.field public static final normal:I = 0x7f0a0496
 
-.field public static final notification_background:I = 0x7f0a04ad
+.field public static final notification_background:I = 0x7f0a04a0
 
-.field public static final notification_main_column:I = 0x7f0a04ae
+.field public static final notification_main_column:I = 0x7f0a04a1
 
-.field public static final notification_main_column_container:I = 0x7f0a04af
+.field public static final notification_main_column_container:I = 0x7f0a04a2
 
-.field public static final right:I = 0x7f0a058c
+.field public static final right:I = 0x7f0a0573
 
-.field public static final right_icon:I = 0x7f0a058d
+.field public static final right_icon:I = 0x7f0a0574
 
-.field public static final right_side:I = 0x7f0a058e
+.field public static final right_side:I = 0x7f0a0575
 
-.field public static final start:I = 0x7f0a0734
+.field public static final start:I = 0x7f0a0715
 
-.field public static final tag_transition_group:I = 0x7f0a0767
+.field public static final tag_transition_group:I = 0x7f0a073f
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0768
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0740
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0769
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0741
 
-.field public static final text:I = 0x7f0a076f
+.field public static final text:I = 0x7f0a0747
 
-.field public static final text2:I = 0x7f0a0770
+.field public static final text2:I = 0x7f0a0748
 
-.field public static final time:I = 0x7f0a077d
+.field public static final time:I = 0x7f0a0755
 
-.field public static final title:I = 0x7f0a077e
+.field public static final title:I = 0x7f0a0756
 
-.field public static final top:I = 0x7f0a0785
+.field public static final top:I = 0x7f0a075d
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/recyclerview/R$string.smali b/com.discord/smali/androidx/recyclerview/R$string.smali
index 7946f999f1..1bb28a9c9c 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 = 0x7f121165
+.field public static final status_bar_notification_info_overflow:I = 0x7f1210d9
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/recyclerview/R$styleable.smali b/com.discord/smali/androidx/recyclerview/R$styleable.smali
index 646d3fd486..8088ac75f4 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
-        0x7f04031a
+        0x7f040319
     .end array-data
 
     :array_2
@@ -288,9 +288,9 @@
         0x7f040135
         0x7f040136
         0x7f04020e
-        0x7f0402d7
-        0x7f04030e
-        0x7f040314
+        0x7f0402d6
+        0x7f04030d
+        0x7f040313
     .end array-data
 .end method
 
diff --git a/com.discord/smali/androidx/room/R$color.smali b/com.discord/smali/androidx/room/R$color.smali
index 49febdfa64..f72cc1a61f 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 = 0x7f0600b8
+.field public static final notification_action_color_filter:I = 0x7f0600b7
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b9
+.field public static final notification_icon_bg_color:I = 0x7f0600b8
 
-.field public static final ripple_material_light:I = 0x7f0600fb
+.field public static final ripple_material_light:I = 0x7f0600fa
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fd
+.field public static final secondary_text_default_material_light:I = 0x7f0600fc
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/room/R$drawable.smali b/com.discord/smali/androidx/room/R$drawable.smali
index adbb381081..eda255eecf 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 = 0x7f080472
+.field public static final notification_action_background:I = 0x7f080463
 
-.field public static final notification_bg:I = 0x7f080473
+.field public static final notification_bg:I = 0x7f080464
 
-.field public static final notification_bg_low:I = 0x7f080474
+.field public static final notification_bg_low:I = 0x7f080465
 
-.field public static final notification_bg_low_normal:I = 0x7f080475
+.field public static final notification_bg_low_normal:I = 0x7f080466
 
-.field public static final notification_bg_low_pressed:I = 0x7f080476
+.field public static final notification_bg_low_pressed:I = 0x7f080467
 
-.field public static final notification_bg_normal:I = 0x7f080477
+.field public static final notification_bg_normal:I = 0x7f080468
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080478
+.field public static final notification_bg_normal_pressed:I = 0x7f080469
 
-.field public static final notification_icon_background:I = 0x7f080479
+.field public static final notification_icon_background:I = 0x7f08046a
 
-.field public static final notification_template_icon_bg:I = 0x7f08047a
+.field public static final notification_template_icon_bg:I = 0x7f08046b
 
-.field public static final notification_template_icon_low_bg:I = 0x7f08047b
+.field public static final notification_template_icon_low_bg:I = 0x7f08046c
 
-.field public static final notification_tile_bg:I = 0x7f08047c
+.field public static final notification_tile_bg:I = 0x7f08046d
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08047d
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08046e
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/room/R$id.smali b/com.discord/smali/androidx/room/R$id.smali
index f7bef689b0..ee59250af5 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 = 0x7f0a0080
+.field public static final async:I = 0x7f0a007f
 
-.field public static final blocking:I = 0x7f0a00ce
+.field public static final blocking:I = 0x7f0a00cd
 
 .field public static final chronometer:I = 0x7f0a0215
 
-.field public static final forever:I = 0x7f0a02f2
+.field public static final forever:I = 0x7f0a02f1
 
-.field public static final icon:I = 0x7f0a0396
+.field public static final icon:I = 0x7f0a0391
 
-.field public static final icon_group:I = 0x7f0a0397
+.field public static final icon_group:I = 0x7f0a0392
 
-.field public static final info:I = 0x7f0a03ac
+.field public static final info:I = 0x7f0a03a7
 
-.field public static final italic:I = 0x7f0a03d9
+.field public static final italic:I = 0x7f0a03d4
 
-.field public static final line1:I = 0x7f0a041d
+.field public static final line1:I = 0x7f0a0418
 
-.field public static final line3:I = 0x7f0a041e
+.field public static final line3:I = 0x7f0a0419
 
-.field public static final normal:I = 0x7f0a04a3
+.field public static final normal:I = 0x7f0a0496
 
-.field public static final notification_background:I = 0x7f0a04ad
+.field public static final notification_background:I = 0x7f0a04a0
 
-.field public static final notification_main_column:I = 0x7f0a04ae
+.field public static final notification_main_column:I = 0x7f0a04a1
 
-.field public static final notification_main_column_container:I = 0x7f0a04af
+.field public static final notification_main_column_container:I = 0x7f0a04a2
 
-.field public static final right_icon:I = 0x7f0a058d
+.field public static final right_icon:I = 0x7f0a0574
 
-.field public static final right_side:I = 0x7f0a058e
+.field public static final right_side:I = 0x7f0a0575
 
-.field public static final tag_transition_group:I = 0x7f0a0767
+.field public static final tag_transition_group:I = 0x7f0a073f
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0768
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0740
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0769
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0741
 
-.field public static final text:I = 0x7f0a076f
+.field public static final text:I = 0x7f0a0747
 
-.field public static final text2:I = 0x7f0a0770
+.field public static final text2:I = 0x7f0a0748
 
-.field public static final time:I = 0x7f0a077d
+.field public static final time:I = 0x7f0a0755
 
-.field public static final title:I = 0x7f0a077e
+.field public static final title:I = 0x7f0a0756
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/room/R$string.smali b/com.discord/smali/androidx/room/R$string.smali
index c961e86945..cb355e213f 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 = 0x7f121165
+.field public static final status_bar_notification_info_overflow:I = 0x7f1210d9
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/slidingpanelayout/R$color.smali b/com.discord/smali/androidx/slidingpanelayout/R$color.smali
index e8aee617e4..65c18e2a8c 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 = 0x7f0600b8
+.field public static final notification_action_color_filter:I = 0x7f0600b7
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b9
+.field public static final notification_icon_bg_color:I = 0x7f0600b8
 
-.field public static final ripple_material_light:I = 0x7f0600fb
+.field public static final ripple_material_light:I = 0x7f0600fa
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fd
+.field public static final secondary_text_default_material_light:I = 0x7f0600fc
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/slidingpanelayout/R$drawable.smali b/com.discord/smali/androidx/slidingpanelayout/R$drawable.smali
index feeb406efd..e64195125f 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 = 0x7f080472
+.field public static final notification_action_background:I = 0x7f080463
 
-.field public static final notification_bg:I = 0x7f080473
+.field public static final notification_bg:I = 0x7f080464
 
-.field public static final notification_bg_low:I = 0x7f080474
+.field public static final notification_bg_low:I = 0x7f080465
 
-.field public static final notification_bg_low_normal:I = 0x7f080475
+.field public static final notification_bg_low_normal:I = 0x7f080466
 
-.field public static final notification_bg_low_pressed:I = 0x7f080476
+.field public static final notification_bg_low_pressed:I = 0x7f080467
 
-.field public static final notification_bg_normal:I = 0x7f080477
+.field public static final notification_bg_normal:I = 0x7f080468
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080478
+.field public static final notification_bg_normal_pressed:I = 0x7f080469
 
-.field public static final notification_icon_background:I = 0x7f080479
+.field public static final notification_icon_background:I = 0x7f08046a
 
-.field public static final notification_template_icon_bg:I = 0x7f08047a
+.field public static final notification_template_icon_bg:I = 0x7f08046b
 
-.field public static final notification_template_icon_low_bg:I = 0x7f08047b
+.field public static final notification_template_icon_low_bg:I = 0x7f08046c
 
-.field public static final notification_tile_bg:I = 0x7f08047c
+.field public static final notification_tile_bg:I = 0x7f08046d
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08047d
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08046e
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/slidingpanelayout/R$id.smali b/com.discord/smali/androidx/slidingpanelayout/R$id.smali
index 343824c6ba..054924c159 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 = 0x7f0a0080
+.field public static final async:I = 0x7f0a007f
 
-.field public static final blocking:I = 0x7f0a00ce
+.field public static final blocking:I = 0x7f0a00cd
 
 .field public static final chronometer:I = 0x7f0a0215
 
-.field public static final forever:I = 0x7f0a02f2
+.field public static final forever:I = 0x7f0a02f1
 
-.field public static final icon:I = 0x7f0a0396
+.field public static final icon:I = 0x7f0a0391
 
-.field public static final icon_group:I = 0x7f0a0397
+.field public static final icon_group:I = 0x7f0a0392
 
-.field public static final info:I = 0x7f0a03ac
+.field public static final info:I = 0x7f0a03a7
 
-.field public static final italic:I = 0x7f0a03d9
+.field public static final italic:I = 0x7f0a03d4
 
-.field public static final line1:I = 0x7f0a041d
+.field public static final line1:I = 0x7f0a0418
 
-.field public static final line3:I = 0x7f0a041e
+.field public static final line3:I = 0x7f0a0419
 
-.field public static final normal:I = 0x7f0a04a3
+.field public static final normal:I = 0x7f0a0496
 
-.field public static final notification_background:I = 0x7f0a04ad
+.field public static final notification_background:I = 0x7f0a04a0
 
-.field public static final notification_main_column:I = 0x7f0a04ae
+.field public static final notification_main_column:I = 0x7f0a04a1
 
-.field public static final notification_main_column_container:I = 0x7f0a04af
+.field public static final notification_main_column_container:I = 0x7f0a04a2
 
-.field public static final right_icon:I = 0x7f0a058d
+.field public static final right_icon:I = 0x7f0a0574
 
-.field public static final right_side:I = 0x7f0a058e
+.field public static final right_side:I = 0x7f0a0575
 
-.field public static final tag_transition_group:I = 0x7f0a0767
+.field public static final tag_transition_group:I = 0x7f0a073f
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0768
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0740
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0769
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0741
 
-.field public static final text:I = 0x7f0a076f
+.field public static final text:I = 0x7f0a0747
 
-.field public static final text2:I = 0x7f0a0770
+.field public static final text2:I = 0x7f0a0748
 
-.field public static final time:I = 0x7f0a077d
+.field public static final time:I = 0x7f0a0755
 
-.field public static final title:I = 0x7f0a077e
+.field public static final title:I = 0x7f0a0756
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/slidingpanelayout/R$string.smali b/com.discord/smali/androidx/slidingpanelayout/R$string.smali
index a89d5e3d46..4e6ebc983f 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 = 0x7f121165
+.field public static final status_bar_notification_info_overflow:I = 0x7f1210d9
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/swiperefreshlayout/R$color.smali b/com.discord/smali/androidx/swiperefreshlayout/R$color.smali
index 78f4be5ead..b7a9e8ba72 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 = 0x7f0600b8
+.field public static final notification_action_color_filter:I = 0x7f0600b7
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b9
+.field public static final notification_icon_bg_color:I = 0x7f0600b8
 
-.field public static final ripple_material_light:I = 0x7f0600fb
+.field public static final ripple_material_light:I = 0x7f0600fa
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fd
+.field public static final secondary_text_default_material_light:I = 0x7f0600fc
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/swiperefreshlayout/R$drawable.smali b/com.discord/smali/androidx/swiperefreshlayout/R$drawable.smali
index 0f1e8b2ff7..0aec50a587 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 = 0x7f080472
+.field public static final notification_action_background:I = 0x7f080463
 
-.field public static final notification_bg:I = 0x7f080473
+.field public static final notification_bg:I = 0x7f080464
 
-.field public static final notification_bg_low:I = 0x7f080474
+.field public static final notification_bg_low:I = 0x7f080465
 
-.field public static final notification_bg_low_normal:I = 0x7f080475
+.field public static final notification_bg_low_normal:I = 0x7f080466
 
-.field public static final notification_bg_low_pressed:I = 0x7f080476
+.field public static final notification_bg_low_pressed:I = 0x7f080467
 
-.field public static final notification_bg_normal:I = 0x7f080477
+.field public static final notification_bg_normal:I = 0x7f080468
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080478
+.field public static final notification_bg_normal_pressed:I = 0x7f080469
 
-.field public static final notification_icon_background:I = 0x7f080479
+.field public static final notification_icon_background:I = 0x7f08046a
 
-.field public static final notification_template_icon_bg:I = 0x7f08047a
+.field public static final notification_template_icon_bg:I = 0x7f08046b
 
-.field public static final notification_template_icon_low_bg:I = 0x7f08047b
+.field public static final notification_template_icon_low_bg:I = 0x7f08046c
 
-.field public static final notification_tile_bg:I = 0x7f08047c
+.field public static final notification_tile_bg:I = 0x7f08046d
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08047d
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08046e
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/swiperefreshlayout/R$id.smali b/com.discord/smali/androidx/swiperefreshlayout/R$id.smali
index 1b4836d0f5..bed6c1353d 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 = 0x7f0a0080
+.field public static final async:I = 0x7f0a007f
 
-.field public static final blocking:I = 0x7f0a00ce
+.field public static final blocking:I = 0x7f0a00cd
 
 .field public static final chronometer:I = 0x7f0a0215
 
-.field public static final forever:I = 0x7f0a02f2
+.field public static final forever:I = 0x7f0a02f1
 
-.field public static final icon:I = 0x7f0a0396
+.field public static final icon:I = 0x7f0a0391
 
-.field public static final icon_group:I = 0x7f0a0397
+.field public static final icon_group:I = 0x7f0a0392
 
-.field public static final info:I = 0x7f0a03ac
+.field public static final info:I = 0x7f0a03a7
 
-.field public static final italic:I = 0x7f0a03d9
+.field public static final italic:I = 0x7f0a03d4
 
-.field public static final line1:I = 0x7f0a041d
+.field public static final line1:I = 0x7f0a0418
 
-.field public static final line3:I = 0x7f0a041e
+.field public static final line3:I = 0x7f0a0419
 
-.field public static final normal:I = 0x7f0a04a3
+.field public static final normal:I = 0x7f0a0496
 
-.field public static final notification_background:I = 0x7f0a04ad
+.field public static final notification_background:I = 0x7f0a04a0
 
-.field public static final notification_main_column:I = 0x7f0a04ae
+.field public static final notification_main_column:I = 0x7f0a04a1
 
-.field public static final notification_main_column_container:I = 0x7f0a04af
+.field public static final notification_main_column_container:I = 0x7f0a04a2
 
-.field public static final right_icon:I = 0x7f0a058d
+.field public static final right_icon:I = 0x7f0a0574
 
-.field public static final right_side:I = 0x7f0a058e
+.field public static final right_side:I = 0x7f0a0575
 
-.field public static final tag_transition_group:I = 0x7f0a0767
+.field public static final tag_transition_group:I = 0x7f0a073f
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0768
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0740
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0769
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0741
 
-.field public static final text:I = 0x7f0a076f
+.field public static final text:I = 0x7f0a0747
 
-.field public static final text2:I = 0x7f0a0770
+.field public static final text2:I = 0x7f0a0748
 
-.field public static final time:I = 0x7f0a077d
+.field public static final time:I = 0x7f0a0755
 
-.field public static final title:I = 0x7f0a077e
+.field public static final title:I = 0x7f0a0756
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/swiperefreshlayout/R$string.smali b/com.discord/smali/androidx/swiperefreshlayout/R$string.smali
index 5e6755a209..22da98eb77 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 = 0x7f121165
+.field public static final status_bar_notification_info_overflow:I = 0x7f1210d9
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/transition/R$color.smali b/com.discord/smali/androidx/transition/R$color.smali
index f300601435..a480e1c78b 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 = 0x7f0600b8
+.field public static final notification_action_color_filter:I = 0x7f0600b7
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b9
+.field public static final notification_icon_bg_color:I = 0x7f0600b8
 
-.field public static final ripple_material_light:I = 0x7f0600fb
+.field public static final ripple_material_light:I = 0x7f0600fa
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fd
+.field public static final secondary_text_default_material_light:I = 0x7f0600fc
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/transition/R$drawable.smali b/com.discord/smali/androidx/transition/R$drawable.smali
index c4b4a9401c..d7364c696e 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 = 0x7f080472
+.field public static final notification_action_background:I = 0x7f080463
 
-.field public static final notification_bg:I = 0x7f080473
+.field public static final notification_bg:I = 0x7f080464
 
-.field public static final notification_bg_low:I = 0x7f080474
+.field public static final notification_bg_low:I = 0x7f080465
 
-.field public static final notification_bg_low_normal:I = 0x7f080475
+.field public static final notification_bg_low_normal:I = 0x7f080466
 
-.field public static final notification_bg_low_pressed:I = 0x7f080476
+.field public static final notification_bg_low_pressed:I = 0x7f080467
 
-.field public static final notification_bg_normal:I = 0x7f080477
+.field public static final notification_bg_normal:I = 0x7f080468
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080478
+.field public static final notification_bg_normal_pressed:I = 0x7f080469
 
-.field public static final notification_icon_background:I = 0x7f080479
+.field public static final notification_icon_background:I = 0x7f08046a
 
-.field public static final notification_template_icon_bg:I = 0x7f08047a
+.field public static final notification_template_icon_bg:I = 0x7f08046b
 
-.field public static final notification_template_icon_low_bg:I = 0x7f08047b
+.field public static final notification_template_icon_low_bg:I = 0x7f08046c
 
-.field public static final notification_tile_bg:I = 0x7f08047c
+.field public static final notification_tile_bg:I = 0x7f08046d
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08047d
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08046e
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/transition/R$id.smali b/com.discord/smali/androidx/transition/R$id.smali
index 41c05b6127..16d7eaf1ff 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 = 0x7f0a0080
+.field public static final async:I = 0x7f0a007f
 
-.field public static final blocking:I = 0x7f0a00ce
+.field public static final blocking:I = 0x7f0a00cd
 
 .field public static final chronometer:I = 0x7f0a0215
 
-.field public static final forever:I = 0x7f0a02f2
+.field public static final forever:I = 0x7f0a02f1
 
-.field public static final ghost_view:I = 0x7f0a0316
+.field public static final ghost_view:I = 0x7f0a0315
 
-.field public static final icon:I = 0x7f0a0396
+.field public static final icon:I = 0x7f0a0391
 
-.field public static final icon_group:I = 0x7f0a0397
+.field public static final icon_group:I = 0x7f0a0392
 
-.field public static final info:I = 0x7f0a03ac
+.field public static final info:I = 0x7f0a03a7
 
-.field public static final italic:I = 0x7f0a03d9
+.field public static final italic:I = 0x7f0a03d4
 
-.field public static final line1:I = 0x7f0a041d
+.field public static final line1:I = 0x7f0a0418
 
-.field public static final line3:I = 0x7f0a041e
+.field public static final line3:I = 0x7f0a0419
 
-.field public static final normal:I = 0x7f0a04a3
+.field public static final normal:I = 0x7f0a0496
 
-.field public static final notification_background:I = 0x7f0a04ad
+.field public static final notification_background:I = 0x7f0a04a0
 
-.field public static final notification_main_column:I = 0x7f0a04ae
+.field public static final notification_main_column:I = 0x7f0a04a1
 
-.field public static final notification_main_column_container:I = 0x7f0a04af
+.field public static final notification_main_column_container:I = 0x7f0a04a2
 
-.field public static final parent_matrix:I = 0x7f0a04e3
+.field public static final parent_matrix:I = 0x7f0a04d6
 
-.field public static final right_icon:I = 0x7f0a058d
+.field public static final right_icon:I = 0x7f0a0574
 
-.field public static final right_side:I = 0x7f0a058e
+.field public static final right_side:I = 0x7f0a0575
 
-.field public static final save_image_matrix:I = 0x7f0a05b8
+.field public static final save_image_matrix:I = 0x7f0a059f
 
-.field public static final save_non_transition_alpha:I = 0x7f0a05b9
+.field public static final save_non_transition_alpha:I = 0x7f0a05a0
 
-.field public static final save_scale_type:I = 0x7f0a05ba
+.field public static final save_scale_type:I = 0x7f0a05a1
 
-.field public static final tag_transition_group:I = 0x7f0a0767
+.field public static final tag_transition_group:I = 0x7f0a073f
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0768
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0740
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0769
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0741
 
-.field public static final text:I = 0x7f0a076f
+.field public static final text:I = 0x7f0a0747
 
-.field public static final text2:I = 0x7f0a0770
+.field public static final text2:I = 0x7f0a0748
 
-.field public static final time:I = 0x7f0a077d
+.field public static final time:I = 0x7f0a0755
 
-.field public static final title:I = 0x7f0a077e
+.field public static final title:I = 0x7f0a0756
 
-.field public static final transition_current_scene:I = 0x7f0a0789
+.field public static final transition_current_scene:I = 0x7f0a0761
 
-.field public static final transition_layout_save:I = 0x7f0a078a
+.field public static final transition_layout_save:I = 0x7f0a0762
 
-.field public static final transition_position:I = 0x7f0a078b
+.field public static final transition_position:I = 0x7f0a0763
 
-.field public static final transition_scene_layoutid_cache:I = 0x7f0a078c
+.field public static final transition_scene_layoutid_cache:I = 0x7f0a0764
 
-.field public static final transition_transform:I = 0x7f0a078d
+.field public static final transition_transform:I = 0x7f0a0765
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/transition/R$string.smali b/com.discord/smali/androidx/transition/R$string.smali
index d3b19629bb..cf7076c9ac 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 = 0x7f121165
+.field public static final status_bar_notification_info_overflow:I = 0x7f1210d9
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/vectordrawable/R$attr.smali b/com.discord/smali/androidx/vectordrawable/R$attr.smali
index 05502fcf0b..71cb00afdf 100644
--- a/com.discord/smali/androidx/vectordrawable/R$attr.smali
+++ b/com.discord/smali/androidx/vectordrawable/R$attr.smali
@@ -53,7 +53,7 @@
 
 .field public static final layout_keyline:I = 0x7f04024b
 
-.field public static final statusBarBackground:I = 0x7f04031a
+.field public static final statusBarBackground:I = 0x7f040319
 
 .field public static final ttcIndex:I = 0x7f0403d3
 
diff --git a/com.discord/smali/androidx/vectordrawable/R$color.smali b/com.discord/smali/androidx/vectordrawable/R$color.smali
index 212f601d3f..132c364527 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 = 0x7f0600b8
+.field public static final notification_action_color_filter:I = 0x7f0600b7
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b9
+.field public static final notification_icon_bg_color:I = 0x7f0600b8
 
-.field public static final ripple_material_light:I = 0x7f0600fb
+.field public static final ripple_material_light:I = 0x7f0600fa
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fd
+.field public static final secondary_text_default_material_light:I = 0x7f0600fc
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/vectordrawable/R$drawable.smali b/com.discord/smali/androidx/vectordrawable/R$drawable.smali
index 343d924b22..39030ad313 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 = 0x7f080472
+.field public static final notification_action_background:I = 0x7f080463
 
-.field public static final notification_bg:I = 0x7f080473
+.field public static final notification_bg:I = 0x7f080464
 
-.field public static final notification_bg_low:I = 0x7f080474
+.field public static final notification_bg_low:I = 0x7f080465
 
-.field public static final notification_bg_low_normal:I = 0x7f080475
+.field public static final notification_bg_low_normal:I = 0x7f080466
 
-.field public static final notification_bg_low_pressed:I = 0x7f080476
+.field public static final notification_bg_low_pressed:I = 0x7f080467
 
-.field public static final notification_bg_normal:I = 0x7f080477
+.field public static final notification_bg_normal:I = 0x7f080468
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080478
+.field public static final notification_bg_normal_pressed:I = 0x7f080469
 
-.field public static final notification_icon_background:I = 0x7f080479
+.field public static final notification_icon_background:I = 0x7f08046a
 
-.field public static final notification_template_icon_bg:I = 0x7f08047a
+.field public static final notification_template_icon_bg:I = 0x7f08046b
 
-.field public static final notification_template_icon_low_bg:I = 0x7f08047b
+.field public static final notification_template_icon_low_bg:I = 0x7f08046c
 
-.field public static final notification_tile_bg:I = 0x7f08047c
+.field public static final notification_tile_bg:I = 0x7f08046d
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08047d
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08046e
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/vectordrawable/R$id.smali b/com.discord/smali/androidx/vectordrawable/R$id.smali
index 4bea355eac..175ce8de5a 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 = 0x7f0a0080
+.field public static final async:I = 0x7f0a007f
 
-.field public static final blocking:I = 0x7f0a00ce
+.field public static final blocking:I = 0x7f0a00cd
 
 .field public static final bottom:I = 0x7f0a0105
 
 .field public static final chronometer:I = 0x7f0a0215
 
-.field public static final end:I = 0x7f0a02c9
+.field public static final end:I = 0x7f0a02c8
 
-.field public static final forever:I = 0x7f0a02f2
+.field public static final forever:I = 0x7f0a02f1
 
-.field public static final icon:I = 0x7f0a0396
+.field public static final icon:I = 0x7f0a0391
 
-.field public static final icon_group:I = 0x7f0a0397
+.field public static final icon_group:I = 0x7f0a0392
 
-.field public static final info:I = 0x7f0a03ac
+.field public static final info:I = 0x7f0a03a7
 
-.field public static final italic:I = 0x7f0a03d9
+.field public static final italic:I = 0x7f0a03d4
 
-.field public static final left:I = 0x7f0a041b
+.field public static final left:I = 0x7f0a0416
 
-.field public static final line1:I = 0x7f0a041d
+.field public static final line1:I = 0x7f0a0418
 
-.field public static final line3:I = 0x7f0a041e
+.field public static final line3:I = 0x7f0a0419
 
-.field public static final none:I = 0x7f0a04a2
+.field public static final none:I = 0x7f0a0495
 
-.field public static final normal:I = 0x7f0a04a3
+.field public static final normal:I = 0x7f0a0496
 
-.field public static final notification_background:I = 0x7f0a04ad
+.field public static final notification_background:I = 0x7f0a04a0
 
-.field public static final notification_main_column:I = 0x7f0a04ae
+.field public static final notification_main_column:I = 0x7f0a04a1
 
-.field public static final notification_main_column_container:I = 0x7f0a04af
+.field public static final notification_main_column_container:I = 0x7f0a04a2
 
-.field public static final right:I = 0x7f0a058c
+.field public static final right:I = 0x7f0a0573
 
-.field public static final right_icon:I = 0x7f0a058d
+.field public static final right_icon:I = 0x7f0a0574
 
-.field public static final right_side:I = 0x7f0a058e
+.field public static final right_side:I = 0x7f0a0575
 
-.field public static final start:I = 0x7f0a0734
+.field public static final start:I = 0x7f0a0715
 
-.field public static final tag_transition_group:I = 0x7f0a0767
+.field public static final tag_transition_group:I = 0x7f0a073f
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0768
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0740
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0769
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0741
 
-.field public static final text:I = 0x7f0a076f
+.field public static final text:I = 0x7f0a0747
 
-.field public static final text2:I = 0x7f0a0770
+.field public static final text2:I = 0x7f0a0748
 
-.field public static final time:I = 0x7f0a077d
+.field public static final time:I = 0x7f0a0755
 
-.field public static final title:I = 0x7f0a077e
+.field public static final title:I = 0x7f0a0756
 
-.field public static final top:I = 0x7f0a0785
+.field public static final top:I = 0x7f0a075d
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/vectordrawable/R$string.smali b/com.discord/smali/androidx/vectordrawable/R$string.smali
index 1b8bf5c7c0..4104453020 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 = 0x7f121165
+.field public static final status_bar_notification_info_overflow:I = 0x7f1210d9
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/vectordrawable/R$styleable.smali b/com.discord/smali/androidx/vectordrawable/R$styleable.smali
index ac24152aa1..18c8c00cf4 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
-        0x7f04031a
+        0x7f040319
     .end array-data
 
     :array_2
diff --git a/com.discord/smali/androidx/viewpager/R$color.smali b/com.discord/smali/androidx/viewpager/R$color.smali
index 4ac72b7939..aa174b891e 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 = 0x7f0600b8
+.field public static final notification_action_color_filter:I = 0x7f0600b7
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b9
+.field public static final notification_icon_bg_color:I = 0x7f0600b8
 
-.field public static final ripple_material_light:I = 0x7f0600fb
+.field public static final ripple_material_light:I = 0x7f0600fa
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fd
+.field public static final secondary_text_default_material_light:I = 0x7f0600fc
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/viewpager/R$drawable.smali b/com.discord/smali/androidx/viewpager/R$drawable.smali
index 45f631e3b8..a487979885 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 = 0x7f080472
+.field public static final notification_action_background:I = 0x7f080463
 
-.field public static final notification_bg:I = 0x7f080473
+.field public static final notification_bg:I = 0x7f080464
 
-.field public static final notification_bg_low:I = 0x7f080474
+.field public static final notification_bg_low:I = 0x7f080465
 
-.field public static final notification_bg_low_normal:I = 0x7f080475
+.field public static final notification_bg_low_normal:I = 0x7f080466
 
-.field public static final notification_bg_low_pressed:I = 0x7f080476
+.field public static final notification_bg_low_pressed:I = 0x7f080467
 
-.field public static final notification_bg_normal:I = 0x7f080477
+.field public static final notification_bg_normal:I = 0x7f080468
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080478
+.field public static final notification_bg_normal_pressed:I = 0x7f080469
 
-.field public static final notification_icon_background:I = 0x7f080479
+.field public static final notification_icon_background:I = 0x7f08046a
 
-.field public static final notification_template_icon_bg:I = 0x7f08047a
+.field public static final notification_template_icon_bg:I = 0x7f08046b
 
-.field public static final notification_template_icon_low_bg:I = 0x7f08047b
+.field public static final notification_template_icon_low_bg:I = 0x7f08046c
 
-.field public static final notification_tile_bg:I = 0x7f08047c
+.field public static final notification_tile_bg:I = 0x7f08046d
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08047d
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08046e
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/viewpager/R$id.smali b/com.discord/smali/androidx/viewpager/R$id.smali
index 98ef9fb1b5..437d77d85d 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 = 0x7f0a0080
+.field public static final async:I = 0x7f0a007f
 
-.field public static final blocking:I = 0x7f0a00ce
+.field public static final blocking:I = 0x7f0a00cd
 
 .field public static final chronometer:I = 0x7f0a0215
 
-.field public static final forever:I = 0x7f0a02f2
+.field public static final forever:I = 0x7f0a02f1
 
-.field public static final icon:I = 0x7f0a0396
+.field public static final icon:I = 0x7f0a0391
 
-.field public static final icon_group:I = 0x7f0a0397
+.field public static final icon_group:I = 0x7f0a0392
 
-.field public static final info:I = 0x7f0a03ac
+.field public static final info:I = 0x7f0a03a7
 
-.field public static final italic:I = 0x7f0a03d9
+.field public static final italic:I = 0x7f0a03d4
 
-.field public static final line1:I = 0x7f0a041d
+.field public static final line1:I = 0x7f0a0418
 
-.field public static final line3:I = 0x7f0a041e
+.field public static final line3:I = 0x7f0a0419
 
-.field public static final normal:I = 0x7f0a04a3
+.field public static final normal:I = 0x7f0a0496
 
-.field public static final notification_background:I = 0x7f0a04ad
+.field public static final notification_background:I = 0x7f0a04a0
 
-.field public static final notification_main_column:I = 0x7f0a04ae
+.field public static final notification_main_column:I = 0x7f0a04a1
 
-.field public static final notification_main_column_container:I = 0x7f0a04af
+.field public static final notification_main_column_container:I = 0x7f0a04a2
 
-.field public static final right_icon:I = 0x7f0a058d
+.field public static final right_icon:I = 0x7f0a0574
 
-.field public static final right_side:I = 0x7f0a058e
+.field public static final right_side:I = 0x7f0a0575
 
-.field public static final tag_transition_group:I = 0x7f0a0767
+.field public static final tag_transition_group:I = 0x7f0a073f
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0768
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0740
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0769
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0741
 
-.field public static final text:I = 0x7f0a076f
+.field public static final text:I = 0x7f0a0747
 
-.field public static final text2:I = 0x7f0a0770
+.field public static final text2:I = 0x7f0a0748
 
-.field public static final time:I = 0x7f0a077d
+.field public static final time:I = 0x7f0a0755
 
-.field public static final title:I = 0x7f0a077e
+.field public static final title:I = 0x7f0a0756
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/viewpager/R$string.smali b/com.discord/smali/androidx/viewpager/R$string.smali
index 58b561ade7..0a6d3007a8 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 = 0x7f121165
+.field public static final status_bar_notification_info_overflow:I = 0x7f1210d9
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/work/CoroutineWorker$startWork$1.smali b/com.discord/smali/androidx/work/CoroutineWorker$startWork$1.smali
index b8da2d0bee..2abbb3c55b 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;->bgy:Lkotlin/Unit;
+    sget-object p2, Lkotlin/Unit;->bgt: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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 d3da99aba0..9e26cb3f0d 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;->DF()Lkotlinx/coroutines/ab;
+    invoke-static {}, Lkotlinx/coroutines/as;->DD()Lkotlinx/coroutines/ab;
 
     move-result-object p1
 
@@ -182,7 +182,7 @@
 
     new-instance v1, Lkotlinx/coroutines/internal/f;
 
-    sget-object v2, Lkotlinx/coroutines/Job;->bkC:Lkotlinx/coroutines/Job$b;
+    sget-object v2, Lkotlinx/coroutines/Job;->bkx: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 dfc7ec5eda..58e7d83dc8 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;->bgv:Lkotlin/m$a;
+    sget-object v2, Lkotlin/m;->bgq: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;->bgv:Lkotlin/m$a;
+    sget-object v2, Lkotlin/m;->bgq: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 6e984de09a..4cfaf3f558 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;->bgv:Lkotlin/m$a;
+    sget-object v2, Lkotlin/m;->bgq: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;->bgv:Lkotlin/m$a;
+    sget-object v2, Lkotlin/m;->bgq: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 861e656b79..9fea3be246 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;->bgv:Lkotlin/m$a;
+    sget-object v2, Lkotlin/m;->bgq: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;->bgv:Lkotlin/m$a;
+    sget-object v2, Lkotlin/m;->bgq: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 3821bd1e14..8013ffca1e 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;->bgv:Lkotlin/m$a;
+    sget-object v2, Lkotlin/m;->bgq: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;->bgv:Lkotlin/m$a;
+    sget-object v2, Lkotlin/m;->bgq:Lkotlin/m$a;
 
     invoke-static {v1}, Lkotlin/n;->createFailure(Ljava/lang/Throwable;)Ljava/lang/Object;
 
diff --git a/com.discord/smali/androidx/work/R$color.smali b/com.discord/smali/androidx/work/R$color.smali
index 684d354b2a..b7944980ff 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 = 0x7f0600b8
+.field public static final notification_action_color_filter:I = 0x7f0600b7
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b9
+.field public static final notification_icon_bg_color:I = 0x7f0600b8
 
-.field public static final ripple_material_light:I = 0x7f0600fb
+.field public static final ripple_material_light:I = 0x7f0600fa
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fd
+.field public static final secondary_text_default_material_light:I = 0x7f0600fc
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/work/R$drawable.smali b/com.discord/smali/androidx/work/R$drawable.smali
index f4b16dbe18..2bf4deb23f 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 = 0x7f080472
+.field public static final notification_action_background:I = 0x7f080463
 
-.field public static final notification_bg:I = 0x7f080473
+.field public static final notification_bg:I = 0x7f080464
 
-.field public static final notification_bg_low:I = 0x7f080474
+.field public static final notification_bg_low:I = 0x7f080465
 
-.field public static final notification_bg_low_normal:I = 0x7f080475
+.field public static final notification_bg_low_normal:I = 0x7f080466
 
-.field public static final notification_bg_low_pressed:I = 0x7f080476
+.field public static final notification_bg_low_pressed:I = 0x7f080467
 
-.field public static final notification_bg_normal:I = 0x7f080477
+.field public static final notification_bg_normal:I = 0x7f080468
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080478
+.field public static final notification_bg_normal_pressed:I = 0x7f080469
 
-.field public static final notification_icon_background:I = 0x7f080479
+.field public static final notification_icon_background:I = 0x7f08046a
 
-.field public static final notification_template_icon_bg:I = 0x7f08047a
+.field public static final notification_template_icon_bg:I = 0x7f08046b
 
-.field public static final notification_template_icon_low_bg:I = 0x7f08047b
+.field public static final notification_template_icon_low_bg:I = 0x7f08046c
 
-.field public static final notification_tile_bg:I = 0x7f08047c
+.field public static final notification_tile_bg:I = 0x7f08046d
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08047d
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08046e
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/work/R$id.smali b/com.discord/smali/androidx/work/R$id.smali
index 18a3ebc78a..94738d94d8 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 = 0x7f0a0080
+.field public static final async:I = 0x7f0a007f
 
-.field public static final blocking:I = 0x7f0a00ce
+.field public static final blocking:I = 0x7f0a00cd
 
 .field public static final chronometer:I = 0x7f0a0215
 
-.field public static final forever:I = 0x7f0a02f2
+.field public static final forever:I = 0x7f0a02f1
 
-.field public static final icon:I = 0x7f0a0396
+.field public static final icon:I = 0x7f0a0391
 
-.field public static final icon_group:I = 0x7f0a0397
+.field public static final icon_group:I = 0x7f0a0392
 
-.field public static final info:I = 0x7f0a03ac
+.field public static final info:I = 0x7f0a03a7
 
-.field public static final italic:I = 0x7f0a03d9
+.field public static final italic:I = 0x7f0a03d4
 
-.field public static final line1:I = 0x7f0a041d
+.field public static final line1:I = 0x7f0a0418
 
-.field public static final line3:I = 0x7f0a041e
+.field public static final line3:I = 0x7f0a0419
 
-.field public static final normal:I = 0x7f0a04a3
+.field public static final normal:I = 0x7f0a0496
 
-.field public static final notification_background:I = 0x7f0a04ad
+.field public static final notification_background:I = 0x7f0a04a0
 
-.field public static final notification_main_column:I = 0x7f0a04ae
+.field public static final notification_main_column:I = 0x7f0a04a1
 
-.field public static final notification_main_column_container:I = 0x7f0a04af
+.field public static final notification_main_column_container:I = 0x7f0a04a2
 
-.field public static final right_icon:I = 0x7f0a058d
+.field public static final right_icon:I = 0x7f0a0574
 
-.field public static final right_side:I = 0x7f0a058e
+.field public static final right_side:I = 0x7f0a0575
 
-.field public static final tag_transition_group:I = 0x7f0a0767
+.field public static final tag_transition_group:I = 0x7f0a073f
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0768
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0740
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0769
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0741
 
-.field public static final text:I = 0x7f0a076f
+.field public static final text:I = 0x7f0a0747
 
-.field public static final text2:I = 0x7f0a0770
+.field public static final text2:I = 0x7f0a0748
 
-.field public static final time:I = 0x7f0a077d
+.field public static final time:I = 0x7f0a0755
 
-.field public static final title:I = 0x7f0a077e
+.field public static final title:I = 0x7f0a0756
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/work/R$string.smali b/com.discord/smali/androidx/work/R$string.smali
index fed7ebb1ab..5378306df9 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 = 0x7f121165
+.field public static final status_bar_notification_info_overflow:I = 0x7f1210d9
 
 
 # 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 a37a80a3ca..ad6ab1fb2c 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 = 0x7f0600b8
+.field public static final notification_action_color_filter:I = 0x7f0600b7
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b9
+.field public static final notification_icon_bg_color:I = 0x7f0600b8
 
-.field public static final ripple_material_light:I = 0x7f0600fb
+.field public static final ripple_material_light:I = 0x7f0600fa
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fd
+.field public static final secondary_text_default_material_light:I = 0x7f0600fc
 
 
 # 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 39fa31354b..d25c2a1717 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 = 0x7f080472
+.field public static final notification_action_background:I = 0x7f080463
 
-.field public static final notification_bg:I = 0x7f080473
+.field public static final notification_bg:I = 0x7f080464
 
-.field public static final notification_bg_low:I = 0x7f080474
+.field public static final notification_bg_low:I = 0x7f080465
 
-.field public static final notification_bg_low_normal:I = 0x7f080475
+.field public static final notification_bg_low_normal:I = 0x7f080466
 
-.field public static final notification_bg_low_pressed:I = 0x7f080476
+.field public static final notification_bg_low_pressed:I = 0x7f080467
 
-.field public static final notification_bg_normal:I = 0x7f080477
+.field public static final notification_bg_normal:I = 0x7f080468
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080478
+.field public static final notification_bg_normal_pressed:I = 0x7f080469
 
-.field public static final notification_icon_background:I = 0x7f080479
+.field public static final notification_icon_background:I = 0x7f08046a
 
-.field public static final notification_template_icon_bg:I = 0x7f08047a
+.field public static final notification_template_icon_bg:I = 0x7f08046b
 
-.field public static final notification_template_icon_low_bg:I = 0x7f08047b
+.field public static final notification_template_icon_low_bg:I = 0x7f08046c
 
-.field public static final notification_tile_bg:I = 0x7f08047c
+.field public static final notification_tile_bg:I = 0x7f08046d
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08047d
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08046e
 
 
 # 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 9b111c9d24..6f2b07de4f 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 = 0x7f0a0080
+.field public static final async:I = 0x7f0a007f
 
-.field public static final blocking:I = 0x7f0a00ce
+.field public static final blocking:I = 0x7f0a00cd
 
 .field public static final chronometer:I = 0x7f0a0215
 
-.field public static final forever:I = 0x7f0a02f2
+.field public static final forever:I = 0x7f0a02f1
 
-.field public static final icon:I = 0x7f0a0396
+.field public static final icon:I = 0x7f0a0391
 
-.field public static final icon_group:I = 0x7f0a0397
+.field public static final icon_group:I = 0x7f0a0392
 
-.field public static final info:I = 0x7f0a03ac
+.field public static final info:I = 0x7f0a03a7
 
-.field public static final italic:I = 0x7f0a03d9
+.field public static final italic:I = 0x7f0a03d4
 
-.field public static final line1:I = 0x7f0a041d
+.field public static final line1:I = 0x7f0a0418
 
-.field public static final line3:I = 0x7f0a041e
+.field public static final line3:I = 0x7f0a0419
 
-.field public static final normal:I = 0x7f0a04a3
+.field public static final normal:I = 0x7f0a0496
 
-.field public static final notification_background:I = 0x7f0a04ad
+.field public static final notification_background:I = 0x7f0a04a0
 
-.field public static final notification_main_column:I = 0x7f0a04ae
+.field public static final notification_main_column:I = 0x7f0a04a1
 
-.field public static final notification_main_column_container:I = 0x7f0a04af
+.field public static final notification_main_column_container:I = 0x7f0a04a2
 
-.field public static final right_icon:I = 0x7f0a058d
+.field public static final right_icon:I = 0x7f0a0574
 
-.field public static final right_side:I = 0x7f0a058e
+.field public static final right_side:I = 0x7f0a0575
 
-.field public static final tag_transition_group:I = 0x7f0a0767
+.field public static final tag_transition_group:I = 0x7f0a073f
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0768
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0740
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0769
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0741
 
-.field public static final text:I = 0x7f0a076f
+.field public static final text:I = 0x7f0a0747
 
-.field public static final text2:I = 0x7f0a0770
+.field public static final text2:I = 0x7f0a0748
 
-.field public static final time:I = 0x7f0a077d
+.field public static final time:I = 0x7f0a0755
 
-.field public static final title:I = 0x7f0a077e
+.field public static final title:I = 0x7f0a0756
 
 
 # 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 d9d2525167..d7e576f8ef 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 = 0x7f121165
+.field public static final status_bar_notification_info_overflow:I = 0x7f1210d9
 
 
 # direct methods
diff --git a/com.discord/smali/b/a$a.smali b/com.discord/smali/b/a$a.smali
index d90d0344e6..8c695ad71f 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 bEe:Lb/a$a;
+.field static final bDZ:Lb/a$a;
 
 
 # direct methods
@@ -39,7 +39,7 @@
 
     invoke-direct {v0}, Lb/a$a;-><init>()V
 
-    sput-object v0, Lb/a$a;->bEe:Lb/a$a;
+    sput-object v0, Lb/a$a;->bDZ: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 d7776e44c6..a6561cf05c 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 bEf:Lb/a$b;
+.field static final bEa:Lb/a$b;
 
 
 # direct methods
@@ -39,7 +39,7 @@
 
     invoke-direct {v0}, Lb/a$b;-><init>()V
 
-    sput-object v0, Lb/a$b;->bEf:Lb/a$b;
+    sput-object v0, Lb/a$b;->bEa: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 fa247cfd23..b626f1866a 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 bEg:Lb/a$c;
+.field static final bEb:Lb/a$c;
 
 
 # direct methods
@@ -39,7 +39,7 @@
 
     invoke-direct {v0}, Lb/a$c;-><init>()V
 
-    sput-object v0, Lb/a$c;->bEg:Lb/a$c;
+    sput-object v0, Lb/a$c;->bEb: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 48fb9426d9..b7eb0f4e40 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 bEh:Lb/a$d;
+.field static final bEc:Lb/a$d;
 
 
 # direct methods
@@ -39,7 +39,7 @@
 
     invoke-direct {v0}, Lb/a$d;-><init>()V
 
-    sput-object v0, Lb/a$d;->bEh:Lb/a$d;
+    sput-object v0, Lb/a$d;->bEc: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 f8d7ab8d1f..bd98f5d710 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 bEi:Lb/a$e;
+.field static final bEd:Lb/a$e;
 
 
 # direct methods
@@ -39,7 +39,7 @@
 
     invoke-direct {v0}, Lb/a$e;-><init>()V
 
-    sput-object v0, Lb/a$e;->bEi:Lb/a$e;
+    sput-object v0, Lb/a$e;->bEd:Lb/a$e;
 
     return-void
 .end method
diff --git a/com.discord/smali/b/a.smali b/com.discord/smali/b/a.smali
index 1342841bac..902003a8f2 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;->bEg:Lb/a$c;
+    sget-object p1, Lb/a$c;->bEb:Lb/a$c;
 
     return-object p1
 
     :cond_0
-    sget-object p1, Lb/a$a;->bEe:Lb/a$a;
+    sget-object p1, Lb/a$a;->bDZ:Lb/a$a;
 
     return-object p1
 
@@ -67,7 +67,7 @@
 
     if-ne p1, p2, :cond_2
 
-    sget-object p1, Lb/a$e;->bEi:Lb/a$e;
+    sget-object p1, Lb/a$e;->bEd:Lb/a$e;
 
     return-object p1
 
@@ -103,7 +103,7 @@
 
     if-eqz p1, :cond_0
 
-    sget-object p1, Lb/a$b;->bEf:Lb/a$b;
+    sget-object p1, Lb/a$b;->bEa: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 82b0262913..c24bc9706c 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 bFx:Z
+.field private bFs: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;->bFx:Z
+    iget-boolean v0, p0, Lb/a/a/a$a;->bFs: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;->bFx:Z
+    iget-boolean v0, p0, Lb/a/a/a$a;->bFs: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;->Kj()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Kh()Lrx/c/f;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/c/f;->Kk()Lrx/c/b;
+    invoke-virtual {p1}, Lrx/c/f;->Ki()Lrx/c/b;
 
     return-void
 .end method
@@ -109,9 +109,9 @@
 
     check-cast p1, Lb/m;
 
-    iget-object v0, p1, Lb/m;->bER:Lokhttp3/Response;
+    iget-object v0, p1, Lb/m;->bEM:Lokhttp3/Response;
 
-    invoke-virtual {v0}, Lokhttp3/Response;->zg()Z
+    invoke-virtual {v0}, Lokhttp3/Response;->ze()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;->bES:Ljava/lang/Object;
+    iget-object p1, p1, Lb/m;->bEN: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;->bFx:Z
+    iput-boolean v0, p0, Lb/a/a/a$a;->bFs: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;->Kj()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Kh()Lrx/c/f;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/c/f;->Kk()Lrx/c/b;
+    invoke-virtual {p1}, Lrx/c/f;->Ki()Lrx/c/b;
 
     return-void
 
     :catch_0
-    invoke-static {}, Lrx/c/f;->Kj()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Kh()Lrx/c/f;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/c/f;->Kk()Lrx/c/b;
+    invoke-virtual {p1}, Lrx/c/f;->Ki()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 3148b2b71b..b6f7a17251 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 bFw:Lrx/Observable$a;
+.field private final bFr: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;->bFw:Lrx/Observable$a;
+    iput-object p1, p0, Lb/a/a/a;->bFr:Lrx/Observable$a;
 
     return-void
 .end method
@@ -63,7 +63,7 @@
 
     check-cast p1, Lrx/Subscriber;
 
-    iget-object v0, p0, Lb/a/a/a;->bFw:Lrx/Observable$a;
+    iget-object v0, p0, Lb/a/a/a;->bFr: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 0facde3a11..29910d542e 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;->Kj()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Kh()Lrx/c/f;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/c/f;->Kk()Lrx/c/b;
+    invoke-virtual {p1}, Lrx/c/f;->Ki()Lrx/c/b;
 
     return-void
 
     :catch_0
-    invoke-static {}, Lrx/c/f;->Kj()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Kh()Lrx/c/f;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/c/f;->Kk()Lrx/c/b;
+    invoke-virtual {p1}, Lrx/c/f;->Ki()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;->Kj()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Kh()Lrx/c/f;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/c/f;->Kk()Lrx/c/b;
+    invoke-virtual {p1}, Lrx/c/f;->Ki()Lrx/c/b;
 
     return-void
 
     :catch_1
-    invoke-static {}, Lrx/c/f;->Kj()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Kh()Lrx/c/f;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/c/f;->Kk()Lrx/c/b;
+    invoke-virtual {p1}, Lrx/c/f;->Ki()Lrx/c/b;
 
     return-void
 
     :catch_2
-    invoke-static {}, Lrx/c/f;->Kj()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Kh()Lrx/c/f;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/c/f;->Kk()Lrx/c/b;
+    invoke-virtual {p1}, Lrx/c/f;->Ki()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;->Kj()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Kh()Lrx/c/f;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/c/f;->Kk()Lrx/c/b;
+    invoke-virtual {p1}, Lrx/c/f;->Ki()Lrx/c/b;
 
     goto :goto_0
 
     :catch_0
-    invoke-static {}, Lrx/c/f;->Kj()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Kh()Lrx/c/f;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/c/f;->Kk()Lrx/c/b;
+    invoke-virtual {p1}, Lrx/c/f;->Ki()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 51f960366b..68860554b8 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 bFA:Lb/a/a/c;
+.field final synthetic bFu:Lb/a/a/b;
 
-.field final synthetic bFz:Lb/a/a/b;
+.field final synthetic bFv:Lb/a/a/c;
 
 
 # direct methods
 .method constructor <init>(Lb/a/a/c;Lb/a/a/b;)V
     .locals 0
 
-    iput-object p1, p0, Lb/a/a/c$1;->bFA:Lb/a/a/c;
+    iput-object p1, p0, Lb/a/a/c$1;->bFv:Lb/a/a/c;
 
-    iput-object p2, p0, Lb/a/a/c$1;->bFz:Lb/a/a/b;
+    iput-object p2, p0, Lb/a/a/c$1;->bFu: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;->bFz:Lb/a/a/b;
+    iget-object v0, p0, Lb/a/a/c$1;->bFu: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;->bFz:Lb/a/a/b;
+    iget-object v0, p0, Lb/a/a/c$1;->bFu: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 1300aeb674..9bd471cced 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 bFy:Lb/b;
+.field private final bFt: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;->bFy:Lb/b;
+    iput-object p1, p0, Lb/a/a/c;->bFt:Lb/b;
 
     return-void
 .end method
@@ -56,9 +56,9 @@
 
     check-cast p1, Lrx/Subscriber;
 
-    iget-object v0, p0, Lb/a/a/c;->bFy:Lb/b;
+    iget-object v0, p0, Lb/a/a/c;->bFt:Lb/b;
 
-    invoke-interface {v0}, Lb/b;->Ir()Lb/b;
+    invoke-interface {v0}, Lb/b;->Ip()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 f9094d9cb8..13e17f36ff 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 bFy:Lb/b;
+.field private final bFt: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;->bFy:Lb/b;
+    iput-object p1, p0, Lb/a/a/d;->bFt:Lb/b;
 
     return-void
 .end method
@@ -56,9 +56,9 @@
 
     check-cast p1, Lrx/Subscriber;
 
-    iget-object v0, p0, Lb/a/a/d;->bFy:Lb/b;
+    iget-object v0, p0, Lb/a/a/d;->bFt:Lb/b;
 
-    invoke-interface {v0}, Lb/b;->Ir()Lb/b;
+    invoke-interface {v0}, Lb/b;->Ip()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;->Iq()Lb/m;
+    invoke-interface {v0}, Lb/b;->Io()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 93a6f64e1b..c01b83c89f 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;->Kj()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Kh()Lrx/c/f;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/c/f;->Kk()Lrx/c/b;
+    invoke-virtual {p1}, Lrx/c/f;->Ki()Lrx/c/b;
 
     return-void
 
     :catch_0
-    invoke-static {}, Lrx/c/f;->Kj()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Kh()Lrx/c/f;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/c/f;->Kk()Lrx/c/b;
+    invoke-virtual {p1}, Lrx/c/f;->Ki()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 6efb8bcf2b..70a559a98e 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 bFw:Lrx/Observable$a;
+.field private final bFr: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;->bFw:Lrx/Observable$a;
+    iput-object p1, p0, Lb/a/a/g;->bFr:Lrx/Observable$a;
 
     return-void
 .end method
@@ -64,7 +64,7 @@
 
     check-cast p1, Lrx/Subscriber;
 
-    iget-object v0, p0, Lb/a/a/g;->bFw:Lrx/Observable$a;
+    iget-object v0, p0, Lb/a/a/g;->bFr: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 df465ca9d9..e7fb7a7bf7 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 bFB:Z
+.field private final bFA:Z
 
-.field private final bFC:Z
+.field private final bFj:Ljava/lang/reflect/Type;
 
-.field private final bFD:Z
+.field private final bFw:Z
 
-.field private final bFE:Z
+.field private final bFx:Z
 
-.field private final bFF:Z
+.field private final bFy:Z
 
-.field private final bFo:Ljava/lang/reflect/Type;
+.field private final bFz:Z
 
 .field private final scheduler:Lrx/Scheduler;
     .annotation runtime Ljavax/annotation/Nullable;
@@ -50,29 +50,29 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lb/a/a/h;->bFo:Ljava/lang/reflect/Type;
+    iput-object p1, p0, Lb/a/a/h;->bFj:Ljava/lang/reflect/Type;
 
     iput-object p2, p0, Lb/a/a/h;->scheduler:Lrx/Scheduler;
 
-    iput-boolean p3, p0, Lb/a/a/h;->bFB:Z
+    iput-boolean p3, p0, Lb/a/a/h;->bFw:Z
 
-    iput-boolean p4, p0, Lb/a/a/h;->bFC:Z
+    iput-boolean p4, p0, Lb/a/a/h;->bFx:Z
 
-    iput-boolean p5, p0, Lb/a/a/h;->bFD:Z
+    iput-boolean p5, p0, Lb/a/a/h;->bFy:Z
 
-    iput-boolean p6, p0, Lb/a/a/h;->bFE:Z
+    iput-boolean p6, p0, Lb/a/a/h;->bFz:Z
 
-    iput-boolean p7, p0, Lb/a/a/h;->bFF:Z
+    iput-boolean p7, p0, Lb/a/a/h;->bFA:Z
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final Is()Ljava/lang/reflect/Type;
+.method public final Iq()Ljava/lang/reflect/Type;
     .locals 1
 
-    iget-object v0, p0, Lb/a/a/h;->bFo:Ljava/lang/reflect/Type;
+    iget-object v0, p0, Lb/a/a/h;->bFj:Ljava/lang/reflect/Type;
 
     return-object v0
 .end method
@@ -88,7 +88,7 @@
         }
     .end annotation
 
-    iget-boolean v0, p0, Lb/a/a/h;->bFB:Z
+    iget-boolean v0, p0, Lb/a/a/h;->bFw: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;->bFC:Z
+    iget-boolean p1, p0, Lb/a/a/h;->bFx:Z
 
     if-eqz p1, :cond_1
 
@@ -115,7 +115,7 @@
     goto :goto_1
 
     :cond_1
-    iget-boolean p1, p0, Lb/a/a/h;->bFD:Z
+    iget-boolean p1, p0, Lb/a/a/h;->bFy:Z
 
     if-eqz p1, :cond_2
 
@@ -142,18 +142,18 @@
     move-result-object p1
 
     :cond_3
-    iget-boolean v0, p0, Lb/a/a/h;->bFE:Z
+    iget-boolean v0, p0, Lb/a/a/h;->bFz:Z
 
     if-eqz v0, :cond_4
 
-    invoke-virtual {p1}, Lrx/Observable;->IR()Lrx/f;
+    invoke-virtual {p1}, Lrx/Observable;->IP()Lrx/f;
 
     move-result-object p1
 
     return-object p1
 
     :cond_4
-    iget-boolean v0, p0, Lb/a/a/h;->bFF:Z
+    iget-boolean v0, p0, Lb/a/a/h;->bFA: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 3cf75b9e23..eba2b9f0bc 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 bFB:Z
+.field private final bFw: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;->bFB:Z
+    iput-boolean v0, p0, Lb/a/a/i;->bFw:Z
 
     return-void
 .end method
 
-.method public static IF()Lb/a/a/i;
+.method public static ID()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;->bFB:Z
+    iget-boolean v3, p0, Lb/a/a/i;->bFw: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;->bFB:Z
+    iget-boolean v7, p0, Lb/a/a/i;->bFw:Z
 
     const/4 v11, 0x0
 
diff --git a/com.discord/smali/b/b.smali b/com.discord/smali/b/b.smali
index e88ce1b14f..916a808168 100644
--- a/com.discord/smali/b/b.smali
+++ b/com.discord/smali/b/b.smali
@@ -19,7 +19,7 @@
 
 
 # virtual methods
-.method public abstract Iq()Lb/m;
+.method public abstract Io()Lb/m;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
@@ -35,7 +35,7 @@
     .end annotation
 .end method
 
-.method public abstract Ir()Lb/b;
+.method public abstract Ip()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 676f09e8f3..e45c854df2 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 bFG:Lokhttp3/MediaType;
+.field private static final bFB:Lokhttp3/MediaType;
 
-.field private static final tw:Ljava/nio/charset/Charset;
+.field private static final tx:Ljava/nio/charset/Charset;
 
 
 # instance fields
-.field private final bFH:Lcom/google/gson/TypeAdapter;
+.field private final bFC: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;->bFG:Lokhttp3/MediaType;
+    sput-object v0, Lb/b/a/b;->bFB:Lokhttp3/MediaType;
 
     const-string v0, "UTF-8"
 
@@ -58,7 +58,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lb/b/a/b;->tw:Ljava/nio/charset/Charset;
+    sput-object v0, Lb/b/a/b;->tx: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;->bFH:Lcom/google/gson/TypeAdapter;
+    iput-object p2, p0, Lb/b/a/b;->bFC: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;->tw:Ljava/nio/charset/Charset;
+    sget-object v3, Lb/b/a/b;->tx: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;->bFH:Lcom/google/gson/TypeAdapter;
+    iget-object v2, p0, Lb/b/a/b;->bFC: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;->bFG:Lokhttp3/MediaType;
+    sget-object p1, Lb/b/a/b;->bFB:Lokhttp3/MediaType;
 
-    invoke-virtual {v0}, Lokio/c;->Gs()Lokio/ByteString;
+    invoke-virtual {v0}, Lokio/c;->Gq()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 693ad27242..6703091453 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 bFH:Lcom/google/gson/TypeAdapter;
+.field private final bFC: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;->bFH:Lcom/google/gson/TypeAdapter;
+    iput-object p2, p0, Lb/b/a/c;->bFC: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;->bsJ:Ljava/io/Reader;
+    iget-object v1, p1, Lokhttp3/x;->bsE: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;->FQ()Lokio/d;
+    invoke-virtual {p1}, Lokhttp3/x;->FO()Lokio/d;
 
     move-result-object v2
 
-    invoke-virtual {p1}, Lokhttp3/x;->FS()Ljava/nio/charset/Charset;
+    invoke-virtual {p1}, Lokhttp3/x;->FQ()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;->bsJ:Ljava/io/Reader;
+    iput-object v1, p1, Lokhttp3/x;->bsE: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;->bFH:Lcom/google/gson/TypeAdapter;
+    iget-object v1, p0, Lb/b/a/c;->bFC: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 47e43869df..ae6179494c 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 bFG:Lokhttp3/MediaType;
+.field private static final bFB:Lokhttp3/MediaType;
 
-.field static final bFI:Lb/b/b/a;
+.field static final bFD: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;->bFI:Lb/b/b/a;
+    sput-object v0, Lb/b/b/a;->bFD: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;->bFG:Lokhttp3/MediaType;
+    sput-object v0, Lb/b/b/a;->bFB:Lokhttp3/MediaType;
 
     return-void
 .end method
@@ -74,7 +74,7 @@
         }
     .end annotation
 
-    sget-object v0, Lb/b/b/a;->bFG:Lokhttp3/MediaType;
+    sget-object v0, Lb/b/b/a;->bFB: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 a7f66d9ba6..1f7f65ff91 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 bFJ:Lb/b/b/b$a;
+.field static final bFE: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;->bFJ:Lb/b/b/b$a;
+    sput-object v0, Lb/b/b/b$a;->bFE:Lb/b/b/b$a;
 
     return-void
 .end method
@@ -64,7 +64,7 @@
 
     check-cast p1, Lokhttp3/x;
 
-    invoke-virtual {p1}, Lokhttp3/x;->FR()Ljava/lang/String;
+    invoke-virtual {p1}, Lokhttp3/x;->FP()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 86838472a0..7ba74b9b3f 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 bFK:Lb/b/b/b$b;
+.field static final bFF: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;->bFK:Lb/b/b/b$b;
+    sput-object v0, Lb/b/b/b$b;->bFF:Lb/b/b/b$b;
 
     return-void
 .end method
@@ -64,7 +64,7 @@
 
     check-cast p1, Lokhttp3/x;
 
-    invoke-virtual {p1}, Lokhttp3/x;->FR()Ljava/lang/String;
+    invoke-virtual {p1}, Lokhttp3/x;->FP()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 ae01f2663d..7ee6c935a0 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 bFL:Lb/b/b/b$c;
+.field static final bFG: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;->bFL:Lb/b/b/b$c;
+    sput-object v0, Lb/b/b/b$c;->bFG:Lb/b/b/b$c;
 
     return-void
 .end method
@@ -64,7 +64,7 @@
 
     check-cast p1, Lokhttp3/x;
 
-    invoke-virtual {p1}, Lokhttp3/x;->FR()Ljava/lang/String;
+    invoke-virtual {p1}, Lokhttp3/x;->FP()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 5cb6d74646..a4795b13cf 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 bFM:Lb/b/b/b$d;
+.field static final bFH: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;->bFM:Lb/b/b/b$d;
+    sput-object v0, Lb/b/b/b$d;->bFH:Lb/b/b/b$d;
 
     return-void
 .end method
@@ -64,7 +64,7 @@
 
     check-cast p1, Lokhttp3/x;
 
-    invoke-virtual {p1}, Lokhttp3/x;->FR()Ljava/lang/String;
+    invoke-virtual {p1}, Lokhttp3/x;->FP()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 3eda24cbb5..ea7110c5bf 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 bFN:Lb/b/b/b$e;
+.field static final bFI: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;->bFN:Lb/b/b/b$e;
+    sput-object v0, Lb/b/b/b$e;->bFI:Lb/b/b/b$e;
 
     return-void
 .end method
@@ -64,7 +64,7 @@
 
     check-cast p1, Lokhttp3/x;
 
-    invoke-virtual {p1}, Lokhttp3/x;->FR()Ljava/lang/String;
+    invoke-virtual {p1}, Lokhttp3/x;->FP()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 08e31ac37d..6e51bed399 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 bFO:Lb/b/b/b$f;
+.field static final bFJ: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;->bFO:Lb/b/b/b$f;
+    sput-object v0, Lb/b/b/b$f;->bFJ:Lb/b/b/b$f;
 
     return-void
 .end method
@@ -64,7 +64,7 @@
 
     check-cast p1, Lokhttp3/x;
 
-    invoke-virtual {p1}, Lokhttp3/x;->FR()Ljava/lang/String;
+    invoke-virtual {p1}, Lokhttp3/x;->FP()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 42db6d6a7c..8c3077dc73 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 bFP:Lb/b/b/b$g;
+.field static final bFK: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;->bFP:Lb/b/b/b$g;
+    sput-object v0, Lb/b/b/b$g;->bFK:Lb/b/b/b$g;
 
     return-void
 .end method
@@ -64,7 +64,7 @@
 
     check-cast p1, Lokhttp3/x;
 
-    invoke-virtual {p1}, Lokhttp3/x;->FR()Ljava/lang/String;
+    invoke-virtual {p1}, Lokhttp3/x;->FP()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 86dd87c81f..579799e343 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 bFQ:Lb/b/b/b$h;
+.field static final bFL: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;->bFQ:Lb/b/b/b$h;
+    sput-object v0, Lb/b/b/b$h;->bFL:Lb/b/b/b$h;
 
     return-void
 .end method
@@ -64,7 +64,7 @@
 
     check-cast p1, Lokhttp3/x;
 
-    invoke-virtual {p1}, Lokhttp3/x;->FR()Ljava/lang/String;
+    invoke-virtual {p1}, Lokhttp3/x;->FP()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 58c0a5e766..350af8fec0 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 bFR:Lb/b/b/b$i;
+.field static final bFM: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;->bFR:Lb/b/b/b$i;
+    sput-object v0, Lb/b/b/b$i;->bFM:Lb/b/b/b$i;
 
     return-void
 .end method
@@ -64,7 +64,7 @@
 
     check-cast p1, Lokhttp3/x;
 
-    invoke-virtual {p1}, Lokhttp3/x;->FR()Ljava/lang/String;
+    invoke-virtual {p1}, Lokhttp3/x;->FP()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 3cbc301f85..5cb16d0d46 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 IG()Lb/b/b/c;
+.method public static IE()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;->bFR:Lb/b/b/b$i;
+    sget-object p1, Lb/b/b/b$i;->bFM:Lb/b/b/b$i;
 
     return-object p1
 
@@ -142,49 +142,49 @@
 
     :cond_9
     :goto_0
-    sget-object p1, Lb/b/b/b$h;->bFQ:Lb/b/b/b$h;
+    sget-object p1, Lb/b/b/b$h;->bFL:Lb/b/b/b$h;
 
     return-object p1
 
     :cond_a
     :goto_1
-    sget-object p1, Lb/b/b/b$g;->bFP:Lb/b/b/b$g;
+    sget-object p1, Lb/b/b/b$g;->bFK:Lb/b/b/b$g;
 
     return-object p1
 
     :cond_b
     :goto_2
-    sget-object p1, Lb/b/b/b$f;->bFO:Lb/b/b/b$f;
+    sget-object p1, Lb/b/b/b$f;->bFJ:Lb/b/b/b$f;
 
     return-object p1
 
     :cond_c
     :goto_3
-    sget-object p1, Lb/b/b/b$e;->bFN:Lb/b/b/b$e;
+    sget-object p1, Lb/b/b/b$e;->bFI:Lb/b/b/b$e;
 
     return-object p1
 
     :cond_d
     :goto_4
-    sget-object p1, Lb/b/b/b$d;->bFM:Lb/b/b/b$d;
+    sget-object p1, Lb/b/b/b$d;->bFH:Lb/b/b/b$d;
 
     return-object p1
 
     :cond_e
     :goto_5
-    sget-object p1, Lb/b/b/b$c;->bFL:Lb/b/b/b$c;
+    sget-object p1, Lb/b/b/b$c;->bFG:Lb/b/b/b$c;
 
     return-object p1
 
     :cond_f
     :goto_6
-    sget-object p1, Lb/b/b/b$b;->bFK:Lb/b/b/b$b;
+    sget-object p1, Lb/b/b/b$b;->bFF:Lb/b/b/b$b;
 
     return-object p1
 
     :cond_10
     :goto_7
-    sget-object p1, Lb/b/b/b$a;->bFJ:Lb/b/b/b$a;
+    sget-object p1, Lb/b/b/b$a;->bFE: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;->bFI:Lb/b/b/a;
+    sget-object p1, Lb/b/b/a;->bFD: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 e6a4b60326..6d019b85f3 100644
--- a/com.discord/smali/b/c.smali
+++ b/com.discord/smali/b/c.smali
@@ -23,7 +23,7 @@
 
 
 # virtual methods
-.method public abstract Is()Ljava/lang/reflect/Type;
+.method public abstract Iq()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 a153a6adeb..80471731b5 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;
-        IH = false
+        IF = false
     .end subannotation
 .end annotation
 
@@ -28,7 +28,7 @@
 
 
 # virtual methods
-.method public abstract IH()Z
+.method public abstract IF()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 48ba17e091..1f0952b813 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;
-        IH = false
+        IF = false
     .end subannotation
 .end annotation
 
@@ -28,5 +28,5 @@
 
 
 # virtual methods
-.method public abstract IH()Z
+.method public abstract IF()Z
 .end method
diff --git a/com.discord/smali/b/c/h.smali b/com.discord/smali/b/c/h.smali
index 902e50111c..4bab899269 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;
-        II = ""
-        IJ = false
+        IG = ""
+        IH = false
     .end subannotation
 .end annotation
 
@@ -29,11 +29,11 @@
 
 
 # virtual methods
-.method public abstract FK()Ljava/lang/String;
+.method public abstract FI()Ljava/lang/String;
 .end method
 
-.method public abstract II()Ljava/lang/String;
+.method public abstract IG()Ljava/lang/String;
 .end method
 
-.method public abstract IJ()Z
+.method public abstract IH()Z
 .end method
diff --git a/com.discord/smali/b/c/q.smali b/com.discord/smali/b/c/q.smali
index 544450f787..69002b4995 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;
-        IK = "binary"
+        II = "binary"
         value = ""
     .end subannotation
 .end annotation
@@ -29,7 +29,7 @@
 
 
 # virtual methods
-.method public abstract IK()Ljava/lang/String;
+.method public abstract II()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 7cf0099603..7742be627e 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;
-        IK = "binary"
+        II = "binary"
     .end subannotation
 .end annotation
 
@@ -28,5 +28,5 @@
 
 
 # virtual methods
-.method public abstract IK()Ljava/lang/String;
+.method public abstract II()Ljava/lang/String;
 .end method
diff --git a/com.discord/smali/b/c/s.smali b/com.discord/smali/b/c/s.smali
index 8fa0aeec49..620b7d341f 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;
-        IH = false
+        IF = false
     .end subannotation
 .end annotation
 
@@ -28,7 +28,7 @@
 
 
 # virtual methods
-.method public abstract IH()Z
+.method public abstract IF()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 a6030ecd7f..42909829a7 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;
-        IH = false
+        IF = false
     .end subannotation
 .end annotation
 
@@ -28,7 +28,7 @@
 
 
 # virtual methods
-.method public abstract IH()Z
+.method public abstract IF()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 83cfe70a67..0ef9e7de91 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;
-        IH = false
+        IF = false
     .end subannotation
 .end annotation
 
@@ -28,5 +28,5 @@
 
 
 # virtual methods
-.method public abstract IH()Z
+.method public abstract IF()Z
 .end method
diff --git a/com.discord/smali/b/c/v.smali b/com.discord/smali/b/c/v.smali
index 7727c4f71a..8a4b67aac1 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;
-        IH = false
+        IF = false
     .end subannotation
 .end annotation
 
@@ -28,5 +28,5 @@
 
 
 # virtual methods
-.method public abstract IH()Z
+.method public abstract IF()Z
 .end method
diff --git a/com.discord/smali/b/f$1.smali b/com.discord/smali/b/f$1.smali
index 51c01496ba..8e471324ac 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 bEk:Ljava/lang/reflect/Type;
+.field final synthetic bEf:Ljava/lang/reflect/Type;
 
-.field final synthetic bEl:Lb/f;
+.field final synthetic bEg:Lb/f;
 
 
 # direct methods
 .method constructor <init>(Lb/f;Ljava/lang/reflect/Type;)V
     .locals 0
 
-    iput-object p1, p0, Lb/f$1;->bEl:Lb/f;
+    iput-object p1, p0, Lb/f$1;->bEg:Lb/f;
 
-    iput-object p2, p0, Lb/f$1;->bEk:Ljava/lang/reflect/Type;
+    iput-object p2, p0, Lb/f$1;->bEf:Ljava/lang/reflect/Type;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -48,10 +48,10 @@
 
 
 # virtual methods
-.method public final Is()Ljava/lang/reflect/Type;
+.method public final Iq()Ljava/lang/reflect/Type;
     .locals 1
 
-    iget-object v0, p0, Lb/f$1;->bEk:Ljava/lang/reflect/Type;
+    iget-object v0, p0, Lb/f$1;->bEf: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 05f505aea4..cf8b536a80 100644
--- a/com.discord/smali/b/f.smali
+++ b/com.discord/smali/b/f.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field static final bEj:Lb/c$a;
+.field static final bEe:Lb/c$a;
 
 
 # direct methods
@@ -15,7 +15,7 @@
 
     invoke-direct {v0}, Lb/f;-><init>()V
 
-    sput-object v0, Lb/f;->bEj:Lb/c$a;
+    sput-object v0, Lb/f;->bEe: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 93f2d91196..78316c0f3d 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 bEk:Ljava/lang/reflect/Type;
+.field final synthetic bEf:Ljava/lang/reflect/Type;
 
-.field final synthetic bEn:Lb/g;
+.field final synthetic bEi:Lb/g;
 
 
 # direct methods
 .method constructor <init>(Lb/g;Ljava/lang/reflect/Type;)V
     .locals 0
 
-    iput-object p1, p0, Lb/g$1;->bEn:Lb/g;
+    iput-object p1, p0, Lb/g$1;->bEi:Lb/g;
 
-    iput-object p2, p0, Lb/g$1;->bEk:Ljava/lang/reflect/Type;
+    iput-object p2, p0, Lb/g$1;->bEf:Ljava/lang/reflect/Type;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -48,10 +48,10 @@
 
 
 # virtual methods
-.method public final Is()Ljava/lang/reflect/Type;
+.method public final Iq()Ljava/lang/reflect/Type;
     .locals 1
 
-    iget-object v0, p0, Lb/g$1;->bEk:Ljava/lang/reflect/Type;
+    iget-object v0, p0, Lb/g$1;->bEf: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;->bEn:Lb/g;
+    iget-object v1, p0, Lb/g$1;->bEi:Lb/g;
 
-    iget-object v1, v1, Lb/g;->bEm:Ljava/util/concurrent/Executor;
+    iget-object v1, v1, Lb/g;->bEh: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 5928f07351..6cfd41e0a9 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 bEr:Lb/m;
+.field final synthetic bEm:Lb/m;
 
-.field final synthetic bEs:Lb/g$a$1;
+.field final synthetic bEn: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;->bEs:Lb/g$a$1;
+    iput-object p1, p0, Lb/g$a$1$1;->bEn:Lb/g$a$1;
 
-    iput-object p2, p0, Lb/g$a$1$1;->bEr:Lb/m;
+    iput-object p2, p0, Lb/g$a$1$1;->bEm: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;->bEs:Lb/g$a$1;
+    iget-object v0, p0, Lb/g$a$1$1;->bEn:Lb/g$a$1;
 
-    iget-object v0, v0, Lb/g$a$1;->bEq:Lb/g$a;
+    iget-object v0, v0, Lb/g$a$1;->bEl:Lb/g$a;
 
-    iget-object v0, v0, Lb/g$a;->bEo:Lb/b;
+    iget-object v0, v0, Lb/g$a;->bEj: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;->bEs:Lb/g$a$1;
+    iget-object v0, p0, Lb/g$a$1$1;->bEn:Lb/g$a$1;
 
-    iget-object v0, v0, Lb/g$a$1;->bEp:Lb/d;
+    iget-object v0, v0, Lb/g$a$1;->bEk: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;->bEs:Lb/g$a$1;
+    iget-object v0, p0, Lb/g$a$1$1;->bEn:Lb/g$a$1;
 
-    iget-object v0, v0, Lb/g$a$1;->bEp:Lb/d;
+    iget-object v0, v0, Lb/g$a$1;->bEk:Lb/d;
 
-    iget-object v1, p0, Lb/g$a$1$1;->bEr:Lb/m;
+    iget-object v1, p0, Lb/g$a$1$1;->bEm: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 7b46a1c35e..20b0d3f994 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 bEs:Lb/g$a$1;
+.field final synthetic bEn:Lb/g$a$1;
 
-.field final synthetic bEt:Ljava/lang/Throwable;
+.field final synthetic bEo: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;->bEs:Lb/g$a$1;
+    iput-object p1, p0, Lb/g$a$1$2;->bEn:Lb/g$a$1;
 
-    iput-object p2, p0, Lb/g$a$1$2;->bEt:Ljava/lang/Throwable;
+    iput-object p2, p0, Lb/g$a$1$2;->bEo: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;->bEs:Lb/g$a$1;
+    iget-object v0, p0, Lb/g$a$1$2;->bEn:Lb/g$a$1;
 
-    iget-object v0, v0, Lb/g$a$1;->bEp:Lb/d;
+    iget-object v0, v0, Lb/g$a$1;->bEk:Lb/d;
 
-    iget-object v1, p0, Lb/g$a$1$2;->bEt:Ljava/lang/Throwable;
+    iget-object v1, p0, Lb/g$a$1$2;->bEo: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 0814470c51..e55058ecbb 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 bEp:Lb/d;
+.field final synthetic bEk:Lb/d;
 
-.field final synthetic bEq:Lb/g$a;
+.field final synthetic bEl:Lb/g$a;
 
 
 # direct methods
 .method constructor <init>(Lb/g$a;Lb/d;)V
     .locals 0
 
-    iput-object p1, p0, Lb/g$a$1;->bEq:Lb/g$a;
+    iput-object p1, p0, Lb/g$a$1;->bEl:Lb/g$a;
 
-    iput-object p2, p0, Lb/g$a$1;->bEp:Lb/d;
+    iput-object p2, p0, Lb/g$a$1;->bEk:Lb/d;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -56,9 +56,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lb/g$a$1;->bEq:Lb/g$a;
+    iget-object v0, p0, Lb/g$a$1;->bEl:Lb/g$a;
 
-    iget-object v0, v0, Lb/g$a;->bEm:Ljava/util/concurrent/Executor;
+    iget-object v0, v0, Lb/g$a;->bEh: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;->bEq:Lb/g$a;
+    iget-object v0, p0, Lb/g$a$1;->bEl:Lb/g$a;
 
-    iget-object v0, v0, Lb/g$a;->bEm:Ljava/util/concurrent/Executor;
+    iget-object v0, v0, Lb/g$a;->bEh: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 eb71f1b635..43b7e0ddd4 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 bEm:Ljava/util/concurrent/Executor;
+.field final bEh:Ljava/util/concurrent/Executor;
 
-.field final bEo:Lb/b;
+.field final bEj: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;->bEm:Ljava/util/concurrent/Executor;
+    iput-object p1, p0, Lb/g$a;->bEh:Ljava/util/concurrent/Executor;
 
-    iput-object p2, p0, Lb/g$a;->bEo:Lb/b;
+    iput-object p2, p0, Lb/g$a;->bEj:Lb/b;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final Iq()Lb/m;
+.method public final Io()Lb/m;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -80,16 +80,16 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lb/g$a;->bEo:Lb/b;
+    iget-object v0, p0, Lb/g$a;->bEj:Lb/b;
 
-    invoke-interface {v0}, Lb/b;->Iq()Lb/m;
+    invoke-interface {v0}, Lb/b;->Io()Lb/m;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final Ir()Lb/b;
+.method public final Ip()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;->bEm:Ljava/util/concurrent/Executor;
+    iget-object v1, p0, Lb/g$a;->bEh:Ljava/util/concurrent/Executor;
 
-    iget-object v2, p0, Lb/g$a;->bEo:Lb/b;
+    iget-object v2, p0, Lb/g$a;->bEj:Lb/b;
 
-    invoke-interface {v2}, Lb/b;->Ir()Lb/b;
+    invoke-interface {v2}, Lb/b;->Ip()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;->bEo:Lb/b;
+    iget-object v0, p0, Lb/g$a;->bEj: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;->bEo:Lb/b;
+    iget-object v0, p0, Lb/g$a;->bEj:Lb/b;
 
     invoke-interface {v0}, Lb/b;->cancel()V
 
@@ -157,7 +157,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lb/g$a;->Ir()Lb/b;
+    invoke-virtual {p0}, Lb/g$a;->Ip()Lb/b;
 
     move-result-object v0
 
@@ -167,7 +167,7 @@
 .method public final isCanceled()Z
     .locals 1
 
-    iget-object v0, p0, Lb/g$a;->bEo:Lb/b;
+    iget-object v0, p0, Lb/g$a;->bEj: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 61013ca94f..be4ee7d5a5 100644
--- a/com.discord/smali/b/g.smali
+++ b/com.discord/smali/b/g.smali
@@ -12,7 +12,7 @@
 
 
 # instance fields
-.field final bEm:Ljava/util/concurrent/Executor;
+.field final bEh:Ljava/util/concurrent/Executor;
 
 
 # direct methods
@@ -21,7 +21,7 @@
 
     invoke-direct {p0}, Lb/c$a;-><init>()V
 
-    iput-object p1, p0, Lb/g;->bEm:Ljava/util/concurrent/Executor;
+    iput-object p1, p0, Lb/g;->bEh: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 0f2956efa7..a3756feb09 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;->bER:Lokhttp3/Response;
+    iget-object v1, p1, Lb/m;->bEM: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;->bER:Lokhttp3/Response;
+    iget-object v1, p1, Lb/m;->bEM: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;->bER:Lokhttp3/Response;
+    iget-object v0, p1, Lb/m;->bEM:Lokhttp3/Response;
 
     iget v0, v0, Lokhttp3/Response;->code:I
 
     iput v0, p0, Lb/h;->code:I
 
-    iget-object v0, p1, Lb/m;->bER:Lokhttp3/Response;
+    iget-object v0, p1, Lb/m;->bEM:Lokhttp3/Response;
 
     iget-object v0, v0, Lokhttp3/Response;->message:Ljava/lang/String;
 
@@ -80,7 +80,7 @@
 
 
 # virtual methods
-.method public final CG()I
+.method public final CE()I
     .locals 1
 
     iget v0, p0, Lb/h;->code:I
@@ -88,7 +88,7 @@
     return v0
 .end method
 
-.method public final It()Lb/m;
+.method public final Ir()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 e0a85591c6..6f48a81f1c 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 bEp:Lb/d;
+.field final synthetic bEk:Lb/d;
 
-.field final synthetic bEy:Lb/i;
+.field final synthetic bEt:Lb/i;
 
 
 # direct methods
 .method constructor <init>(Lb/i;Lb/d;)V
     .locals 0
 
-    iput-object p1, p0, Lb/i$1;->bEy:Lb/i;
+    iput-object p1, p0, Lb/i$1;->bEt:Lb/i;
 
-    iput-object p2, p0, Lb/i$1;->bEp:Lb/d;
+    iput-object p2, p0, Lb/i$1;->bEk: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;->bEp:Lb/d;
+    iget-object v0, p0, Lb/i$1;->bEk: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;->bEy:Lb/i;
+    iget-object p1, p0, Lb/i$1;->bEt: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;->bEp:Lb/d;
+    iget-object p2, p0, Lb/i$1;->bEk: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;->bEp:Lb/d;
+    iget-object p2, p0, Lb/i$1;->bEk: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 9ca1bdaeed..f3417e36fe 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;->FQ()Lokio/d;
+    value = Lb/i$a;->FO()Lokio/d;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -15,14 +15,14 @@
 
 
 # instance fields
-.field final synthetic bEB:Lb/i$a;
+.field final synthetic bEw:Lb/i$a;
 
 
 # direct methods
 .method constructor <init>(Lb/i$a;Lokio/r;)V
     .locals 0
 
-    iput-object p1, p0, Lb/i$a$1;->bEB:Lb/i$a;
+    iput-object p1, p0, Lb/i$a$1;->bEw: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;->bEB:Lb/i$a;
+    iget-object p2, p0, Lb/i$a$1;->bEw:Lb/i$a;
 
-    iput-object p1, p2, Lb/i$a;->bEA:Ljava/io/IOException;
+    iput-object p1, p2, Lb/i$a;->bEv: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 a0f472aca1..c2a3f20442 100644
--- a/com.discord/smali/b/i$a.smali
+++ b/com.discord/smali/b/i$a.smali
@@ -15,9 +15,9 @@
 
 
 # instance fields
-.field bEA:Ljava/io/IOException;
+.field private final bEu:Lokhttp3/x;
 
-.field private final bEz:Lokhttp3/x;
+.field bEv:Ljava/io/IOException;
 
 
 # direct methods
@@ -26,21 +26,21 @@
 
     invoke-direct {p0}, Lokhttp3/x;-><init>()V
 
-    iput-object p1, p0, Lb/i$a;->bEz:Lokhttp3/x;
+    iput-object p1, p0, Lb/i$a;->bEu:Lokhttp3/x;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final FQ()Lokio/d;
+.method public final FO()Lokio/d;
     .locals 2
 
     new-instance v0, Lb/i$a$1;
 
-    iget-object v1, p0, Lb/i$a;->bEz:Lokhttp3/x;
+    iget-object v1, p0, Lb/i$a;->bEu:Lokhttp3/x;
 
-    invoke-virtual {v1}, Lokhttp3/x;->FQ()Lokio/d;
+    invoke-virtual {v1}, Lokhttp3/x;->FO()Lokio/d;
 
     move-result-object v1
 
@@ -56,7 +56,7 @@
 .method public final close()V
     .locals 1
 
-    iget-object v0, p0, Lb/i$a;->bEz:Lokhttp3/x;
+    iget-object v0, p0, Lb/i$a;->bEu: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;->bEz:Lokhttp3/x;
+    iget-object v0, p0, Lb/i$a;->bEu: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;->bEz:Lokhttp3/x;
+    iget-object v0, p0, Lb/i$a;->bEu: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 bcfff195f5..7ba4c05704 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 brE:Lokhttp3/MediaType;
+.field private final brz: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;->brE:Lokhttp3/MediaType;
+    iput-object p1, p0, Lb/i$b;->brz:Lokhttp3/MediaType;
 
     iput-wide p2, p0, Lb/i$b;->contentLength:J
 
@@ -35,7 +35,7 @@
 
 
 # virtual methods
-.method public final FQ()Lokio/d;
+.method public final FO()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;->brE:Lokhttp3/MediaType;
+    iget-object v0, p0, Lb/i$b;->brz:Lokhttp3/MediaType;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/b/i.smali b/com.discord/smali/b/i.smali
index 20ca70c814..e43bc54858 100644
--- a/com.discord/smali/b/i.smali
+++ b/com.discord/smali/b/i.smali
@@ -27,7 +27,7 @@
 
 
 # instance fields
-.field private final bEu:Lb/o;
+.field private final bEp:Lb/o;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lb/o<",
@@ -36,24 +36,24 @@
     .end annotation
 .end field
 
-.field private final bEv:[Ljava/lang/Object;
+.field private final bEq:[Ljava/lang/Object;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private bEw:Lokhttp3/e;
+.field private bEr:Lokhttp3/e;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private bEx:Ljava/lang/Throwable;
+.field private bEs:Ljava/lang/Throwable;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private bsn:Z
+.field private bsi:Z
 
-.field private volatile buv:Z
+.field private volatile buq:Z
 
 
 # direct methods
@@ -75,14 +75,14 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lb/i;->bEu:Lb/o;
+    iput-object p1, p0, Lb/i;->bEp:Lb/o;
 
-    iput-object p2, p0, Lb/i;->bEv:[Ljava/lang/Object;
+    iput-object p2, p0, Lb/i;->bEq:[Ljava/lang/Object;
 
     return-void
 .end method
 
-.method private Iu()Lb/i;
+.method private Is()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;->bEu:Lb/o;
+    iget-object v1, p0, Lb/i;->bEp:Lb/o;
 
-    iget-object v2, p0, Lb/i;->bEv:[Ljava/lang/Object;
+    iget-object v2, p0, Lb/i;->bEq:[Ljava/lang/Object;
 
     invoke-direct {v0, v1, v2}, Lb/i;-><init>(Lb/o;[Ljava/lang/Object;)V
 
     return-object v0
 .end method
 
-.method private Iv()Lokhttp3/e;
+.method private It()Lokhttp3/e;
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -111,17 +111,17 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lb/i;->bEu:Lb/o;
+    iget-object v0, p0, Lb/i;->bEp:Lb/o;
 
-    iget-object v1, p0, Lb/i;->bEv:[Ljava/lang/Object;
+    iget-object v1, p0, Lb/i;->bEq:[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;->bEu:Lb/o;
+    iget-object v1, p0, Lb/i;->bEp:Lb/o;
 
-    iget-object v1, v1, Lb/o;->bEV:Lokhttp3/e$a;
+    iget-object v1, v1, Lb/o;->bEQ:Lokhttp3/e$a;
 
     invoke-interface {v1, v0}, Lokhttp3/e$a;->a(Lokhttp3/w;)Lokhttp3/e;
 
@@ -143,7 +143,7 @@
 
 
 # virtual methods
-.method public final Iq()Lb/m;
+.method public final Io()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;->bsn:Z
+    iget-boolean v0, p0, Lb/i;->bsi:Z
 
     if-nez v0, :cond_4
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lb/i;->bsn:Z
+    iput-boolean v0, p0, Lb/i;->bsi:Z
 
-    iget-object v0, p0, Lb/i;->bEx:Ljava/lang/Throwable;
+    iget-object v0, p0, Lb/i;->bEs:Ljava/lang/Throwable;
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lb/i;->bEx:Ljava/lang/Throwable;
+    iget-object v0, p0, Lb/i;->bEs:Ljava/lang/Throwable;
 
     instance-of v0, v0, Ljava/io/IOException;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lb/i;->bEx:Ljava/lang/Throwable;
+    iget-object v0, p0, Lb/i;->bEs:Ljava/lang/Throwable;
 
     check-cast v0, Ljava/io/IOException;
 
     throw v0
 
     :cond_0
-    iget-object v0, p0, Lb/i;->bEx:Ljava/lang/Throwable;
+    iget-object v0, p0, Lb/i;->bEs:Ljava/lang/Throwable;
 
     check-cast v0, Ljava/lang/RuntimeException;
 
     throw v0
 
     :cond_1
-    iget-object v0, p0, Lb/i;->bEw:Lokhttp3/e;
+    iget-object v0, p0, Lb/i;->bEr: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;->Iv()Lokhttp3/e;
+    invoke-direct {p0}, Lb/i;->It()Lokhttp3/e;
 
     move-result-object v0
 
-    iput-object v0, p0, Lb/i;->bEw:Lokhttp3/e;
+    iput-object v0, p0, Lb/i;->bEr: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;->bEx:Ljava/lang/Throwable;
+    iput-object v0, p0, Lb/i;->bEs: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;->buv:Z
+    iget-boolean v1, p0, Lb/i;->buq:Z
 
     if-eqz v1, :cond_3
 
     invoke-interface {v0}, Lokhttp3/e;->cancel()V
 
     :cond_3
-    invoke-interface {v0}, Lokhttp3/e;->Fd()Lokhttp3/Response;
+    invoke-interface {v0}, Lokhttp3/e;->Fb()Lokhttp3/Response;
 
     move-result-object v0
 
@@ -270,10 +270,10 @@
     throw v0
 .end method
 
-.method public final synthetic Ir()Lb/b;
+.method public final synthetic Ip()Lb/b;
     .locals 1
 
-    invoke-direct {p0}, Lb/i;->Iu()Lb/i;
+    invoke-direct {p0}, Lb/i;->Is()Lb/i;
 
     move-result-object v0
 
@@ -297,17 +297,17 @@
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lb/i;->bsn:Z
+    iget-boolean v0, p0, Lb/i;->bsi:Z
 
     if-nez v0, :cond_3
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lb/i;->bsn:Z
+    iput-boolean v0, p0, Lb/i;->bsi:Z
 
-    iget-object v0, p0, Lb/i;->bEw:Lokhttp3/e;
+    iget-object v0, p0, Lb/i;->bEr:Lokhttp3/e;
 
-    iget-object v1, p0, Lb/i;->bEx:Ljava/lang/Throwable;
+    iget-object v1, p0, Lb/i;->bEs: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;->Iv()Lokhttp3/e;
+    invoke-direct {p0}, Lb/i;->It()Lokhttp3/e;
 
     move-result-object v2
 
-    iput-object v2, p0, Lb/i;->bEw:Lokhttp3/e;
+    iput-object v2, p0, Lb/i;->bEr: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;->bEx:Ljava/lang/Throwable;
+    iput-object v1, p0, Lb/i;->bEs:Ljava/lang/Throwable;
 
     :cond_0
     :goto_0
@@ -347,7 +347,7 @@
     return-void
 
     :cond_1
-    iget-boolean v1, p0, Lb/i;->buv:Z
+    iget-boolean v1, p0, Lb/i;->buq:Z
 
     if-eqz v1, :cond_2
 
@@ -387,12 +387,12 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lb/i;->buv:Z
+    iput-boolean v0, p0, Lb/i;->buq:Z
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lb/i;->bEw:Lokhttp3/e;
+    iget-object v0, p0, Lb/i;->bEr:Lokhttp3/e;
 
     monitor-exit p0
     :try_end_0
@@ -424,7 +424,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lb/i;->Iu()Lb/i;
+    invoke-direct {p0}, Lb/i;->Is()Lb/i;
 
     move-result-object v0
 
@@ -449,9 +449,9 @@
         }
     .end annotation
 
-    iget-object v0, p1, Lokhttp3/Response;->bsD:Lokhttp3/x;
+    iget-object v0, p1, Lokhttp3/Response;->bsy:Lokhttp3/x;
 
-    invoke-virtual {p1}, Lokhttp3/Response;->FO()Lokhttp3/Response$a;
+    invoke-virtual {p1}, Lokhttp3/Response;->FM()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;->bsD:Lokhttp3/x;
+    iput-object v1, p1, Lokhttp3/Response$a;->bsy:Lokhttp3/x;
 
-    invoke-virtual {p1}, Lokhttp3/Response$a;->FP()Lokhttp3/Response;
+    invoke-virtual {p1}, Lokhttp3/Response$a;->FN()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;->bEu:Lb/o;
+    iget-object v0, p0, Lb/i;->bEp:Lb/o;
 
-    iget-object v0, v0, Lb/o;->bFf:Lb/e;
+    iget-object v0, v0, Lb/o;->bFa: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;->bEA:Ljava/io/IOException;
+    iget-object v0, v1, Lb/i$a;->bEv:Ljava/io/IOException;
 
     if-eqz v0, :cond_2
 
-    iget-object p1, v1, Lb/i$a;->bEA:Ljava/io/IOException;
+    iget-object p1, v1, Lb/i$a;->bEv:Ljava/io/IOException;
 
     throw p1
 
@@ -572,7 +572,7 @@
 .method public final isCanceled()Z
     .locals 2
 
-    iget-boolean v0, p0, Lb/i;->buv:Z
+    iget-boolean v0, p0, Lb/i;->buq:Z
 
     const/4 v1, 0x1
 
@@ -584,11 +584,11 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lb/i;->bEw:Lokhttp3/e;
+    iget-object v0, p0, Lb/i;->bEr:Lokhttp3/e;
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lb/i;->bEw:Lokhttp3/e;
+    iget-object v0, p0, Lb/i;->bEr: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 f4419f9119..dbb660ac7f 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;->Iw()Lb/j;
+    value = Lb/j;->Iu()Lb/j;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -23,14 +23,14 @@
 
 
 # instance fields
-.field final synthetic bEC:Lb/j;
+.field final synthetic bEx:Lb/j;
 
 
 # direct methods
 .method constructor <init>(Lb/j;)V
     .locals 0
 
-    iput-object p1, p0, Lb/j$1;->bEC:Lb/j;
+    iput-object p1, p0, Lb/j$1;->bEx:Lb/j;
 
     invoke-direct {p0}, Lb/j;-><init>()V
 
@@ -70,7 +70,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lb/j$1;->bEC:Lb/j;
+    iget-object v1, p0, Lb/j$1;->bEx: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 3f942b908c..2184f16ff5 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;->Ix()Lb/j;
+    value = Lb/j;->Iv()Lb/j;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -23,14 +23,14 @@
 
 
 # instance fields
-.field final synthetic bEC:Lb/j;
+.field final synthetic bEx:Lb/j;
 
 
 # direct methods
 .method constructor <init>(Lb/j;)V
     .locals 0
 
-    iput-object p1, p0, Lb/j$2;->bEC:Lb/j;
+    iput-object p1, p0, Lb/j$2;->bEx: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;->bEC:Lb/j;
+    iget-object v2, p0, Lb/j$2;->bEx: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 a31dc691f2..d33b928f1b 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 bED:Lb/e;
+.field private final bEy: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;->bED:Lb/e;
+    iput-object p1, p0, Lb/j$a;->bEy: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;->bED:Lb/e;
+    iget-object v0, p0, Lb/j$a;->bEy: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;->brI:Lokhttp3/RequestBody;
+    iput-object v0, p1, Lb/l;->brD:Lokhttp3/RequestBody;
 
     return-void
 
diff --git a/com.discord/smali/b/j$b.smali b/com.discord/smali/b/j$b.smali
index 3c2ce3ea5e..2f0ab82257 100644
--- a/com.discord/smali/b/j$b.smali
+++ b/com.discord/smali/b/j$b.smali
@@ -25,7 +25,9 @@
 
 
 # instance fields
-.field private final bEE:Lb/e;
+.field private final bEA:Z
+
+.field private final bEz:Lb/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lb/e<",
@@ -36,8 +38,6 @@
     .end annotation
 .end field
 
-.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;->bEE:Lb/e;
+    iput-object p2, p0, Lb/j$b;->bEz:Lb/e;
 
-    iput-boolean p3, p0, Lb/j$b;->bEF:Z
+    iput-boolean p3, p0, Lb/j$b;->bEA:Z
 
     return-void
 .end method
@@ -101,7 +101,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lb/j$b;->bEE:Lb/e;
+    iget-object v0, p0, Lb/j$b;->bEz: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;->bEF:Z
+    iget-boolean v1, p0, Lb/j$b;->bEA: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 8791aa85ea..39bf4473dc 100644
--- a/com.discord/smali/b/j$c.smali
+++ b/com.discord/smali/b/j$c.smali
@@ -27,7 +27,9 @@
 
 
 # instance fields
-.field private final bEE:Lb/e;
+.field private final bEA:Z
+
+.field private final bEz:Lb/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lb/e<",
@@ -38,8 +40,6 @@
     .end annotation
 .end field
 
-.field private final bEF:Z
-
 
 # direct methods
 .method constructor <init>(Lb/e;Z)V
@@ -56,9 +56,9 @@
 
     invoke-direct {p0}, Lb/j;-><init>()V
 
-    iput-object p1, p0, Lb/j$c;->bEE:Lb/e;
+    iput-object p1, p0, Lb/j$c;->bEz:Lb/e;
 
-    iput-boolean p2, p0, Lb/j$c;->bEF:Z
+    iput-boolean p2, p0, Lb/j$c;->bEA:Z
 
     return-void
 .end method
@@ -118,7 +118,7 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v3, p0, Lb/j$c;->bEE:Lb/e;
+    iget-object v3, p0, Lb/j$c;->bEz: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;->bEF:Z
+    iget-boolean v0, p0, Lb/j$c;->bEA: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;->bEE:Lb/e;
+    iget-object v0, p0, Lb/j$c;->bEz: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 08aa071429..42760fa8eb 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 bEE:Lb/e;
+.field private final bEz: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;->bEE:Lb/e;
+    iput-object p2, p0, Lb/j$d;->bEz:Lb/e;
 
     return-void
 .end method
@@ -97,7 +97,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lb/j$d;->bEE:Lb/e;
+    iget-object v0, p0, Lb/j$d;->bEz: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 c08800b4cb..cae736c7b5 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 bEE:Lb/e;
+.field private final bEz: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;->bEE:Lb/e;
+    iput-object p1, p0, Lb/j$e;->bEz:Lb/e;
 
     return-void
 .end method
@@ -112,7 +112,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v2, p0, Lb/j$e;->bEE:Lb/e;
+    iget-object v2, p0, Lb/j$e;->bEz: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 0c7b37b495..e01f84d6a0 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 bED:Lb/e;
+.field private final bEy:Lb/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lb/e<",
@@ -36,7 +36,7 @@
     .end annotation
 .end field
 
-.field private final brH:Lokhttp3/Headers;
+.field private final brC:Lokhttp3/Headers;
 
 
 # direct methods
@@ -55,9 +55,9 @@
 
     invoke-direct {p0}, Lb/j;-><init>()V
 
-    iput-object p1, p0, Lb/j$f;->brH:Lokhttp3/Headers;
+    iput-object p1, p0, Lb/j$f;->brC:Lokhttp3/Headers;
 
-    iput-object p2, p0, Lb/j$f;->bED:Lb/e;
+    iput-object p2, p0, Lb/j$f;->bEy:Lb/e;
 
     return-void
 .end method
@@ -84,7 +84,7 @@
 
     :cond_0
     :try_start_0
-    iget-object v0, p0, Lb/j$f;->bED:Lb/e;
+    iget-object v0, p0, Lb/j$f;->bEy: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;->brH:Lokhttp3/Headers;
+    iget-object p2, p0, Lb/j$f;->brC: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 c6a2c10c1a..5d83d10557 100644
--- a/com.discord/smali/b/j$g.smali
+++ b/com.discord/smali/b/j$g.smali
@@ -27,7 +27,9 @@
 
 
 # instance fields
-.field private final bEE:Lb/e;
+.field private final bEB:Ljava/lang/String;
+
+.field private final bEz:Lb/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lb/e<",
@@ -38,8 +40,6 @@
     .end annotation
 .end field
 
-.field private final bEG:Ljava/lang/String;
-
 
 # direct methods
 .method constructor <init>(Lb/e;Ljava/lang/String;)V
@@ -58,9 +58,9 @@
 
     invoke-direct {p0}, Lb/j;-><init>()V
 
-    iput-object p1, p0, Lb/j$g;->bEE:Lb/e;
+    iput-object p1, p0, Lb/j$g;->bEz:Lb/e;
 
-    iput-object p2, p0, Lb/j$g;->bEG:Ljava/lang/String;
+    iput-object p2, p0, Lb/j$g;->bEB:Ljava/lang/String;
 
     return-void
 .end method
@@ -156,7 +156,7 @@
 
     const/4 v1, 0x3
 
-    iget-object v3, p0, Lb/j$g;->bEG:Ljava/lang/String;
+    iget-object v3, p0, Lb/j$g;->bEB:Ljava/lang/String;
 
     aput-object v3, v2, v1
 
@@ -164,7 +164,7 @@
 
     move-result-object v1
 
-    iget-object v2, p0, Lb/j$g;->bEE:Lb/e;
+    iget-object v2, p0, Lb/j$g;->bEz: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 3537b43076..852866ee52 100644
--- a/com.discord/smali/b/j$h.smali
+++ b/com.discord/smali/b/j$h.smali
@@ -25,7 +25,9 @@
 
 
 # instance fields
-.field private final bEE:Lb/e;
+.field private final bEA:Z
+
+.field private final bEz:Lb/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lb/e<",
@@ -36,8 +38,6 @@
     .end annotation
 .end field
 
-.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;->bEE:Lb/e;
+    iput-object p2, p0, Lb/j$h;->bEz:Lb/e;
 
-    iput-boolean p3, p0, Lb/j$h;->bEF:Z
+    iput-boolean p3, p0, Lb/j$h;->bEA: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;->bEE:Lb/e;
+    iget-object v1, p0, Lb/j$h;->bEz: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;->bEF:Z
+    iget-boolean v1, p0, Lb/j$h;->bEA:Z
 
-    iget-object v2, p1, Lb/l;->bEL:Ljava/lang/String;
+    iget-object v2, p1, Lb/l;->bEG:Ljava/lang/String;
 
     if-eqz v2, :cond_0
 
-    iget-object v2, p1, Lb/l;->bEL:Ljava/lang/String;
+    iget-object v2, p1, Lb/l;->bEG:Ljava/lang/String;
 
     new-instance v3, Ljava/lang/StringBuilder;
 
@@ -140,7 +140,7 @@
 
     move-result-object p2
 
-    iput-object p2, p1, Lb/l;->bEL:Ljava/lang/String;
+    iput-object p2, p1, Lb/l;->bEG:Ljava/lang/String;
 
     return-void
 
diff --git a/com.discord/smali/b/j$i.smali b/com.discord/smali/b/j$i.smali
index dc9b217790..3345f987d1 100644
--- a/com.discord/smali/b/j$i.smali
+++ b/com.discord/smali/b/j$i.smali
@@ -25,7 +25,9 @@
 
 
 # instance fields
-.field private final bEE:Lb/e;
+.field private final bEA:Z
+
+.field private final bEz:Lb/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lb/e<",
@@ -36,8 +38,6 @@
     .end annotation
 .end field
 
-.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;->bEE:Lb/e;
+    iput-object p2, p0, Lb/j$i;->bEz:Lb/e;
 
-    iput-boolean p3, p0, Lb/j$i;->bEF:Z
+    iput-boolean p3, p0, Lb/j$i;->bEA:Z
 
     return-void
 .end method
@@ -101,7 +101,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lb/j$i;->bEE:Lb/e;
+    iget-object v0, p0, Lb/j$i;->bEz: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;->bEF:Z
+    iget-boolean v1, p0, Lb/j$i;->bEA: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 43a92d6a68..7b208de793 100644
--- a/com.discord/smali/b/j$j.smali
+++ b/com.discord/smali/b/j$j.smali
@@ -27,7 +27,9 @@
 
 
 # instance fields
-.field private final bEE:Lb/e;
+.field private final bEA:Z
+
+.field private final bEz:Lb/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lb/e<",
@@ -38,8 +40,6 @@
     .end annotation
 .end field
 
-.field private final bEF:Z
-
 
 # direct methods
 .method constructor <init>(Lb/e;Z)V
@@ -56,9 +56,9 @@
 
     invoke-direct {p0}, Lb/j;-><init>()V
 
-    iput-object p1, p0, Lb/j$j;->bEE:Lb/e;
+    iput-object p1, p0, Lb/j$j;->bEz:Lb/e;
 
-    iput-boolean p2, p0, Lb/j$j;->bEF:Z
+    iput-boolean p2, p0, Lb/j$j;->bEA:Z
 
     return-void
 .end method
@@ -118,7 +118,7 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v3, p0, Lb/j$j;->bEE:Lb/e;
+    iget-object v3, p0, Lb/j$j;->bEz: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;->bEF:Z
+    iget-boolean v0, p0, Lb/j$j;->bEA: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;->bEE:Lb/e;
+    iget-object v0, p0, Lb/j$j;->bEz: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 1b2e8afa77..dcac26679e 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 bEF:Z
+.field private final bEA:Z
 
-.field private final bEH:Lb/e;
+.field private final bEC: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;->bEH:Lb/e;
+    iput-object p1, p0, Lb/j$k;->bEC:Lb/e;
 
-    iput-boolean p2, p0, Lb/j$k;->bEF:Z
+    iput-boolean p2, p0, Lb/j$k;->bEA:Z
 
     return-void
 .end method
@@ -88,7 +88,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lb/j$k;->bEH:Lb/e;
+    iget-object v0, p0, Lb/j$k;->bEC: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;->bEF:Z
+    iget-boolean v1, p0, Lb/j$k;->bEA: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 9396247b2e..0ff26b2fd4 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 bEI:Lb/j$l;
+.field static final bED:Lb/j$l;
 
 
 # direct methods
@@ -34,7 +34,7 @@
 
     invoke-direct {v0}, Lb/j$l;-><init>()V
 
-    sput-object v0, Lb/j$l;->bEI:Lb/j$l;
+    sput-object v0, Lb/j$l;->bED:Lb/j$l;
 
     return-void
 .end method
@@ -65,7 +65,7 @@
 
     if-eqz p2, :cond_0
 
-    iget-object p1, p1, Lb/l;->bEP:Lokhttp3/MultipartBody$a;
+    iget-object p1, p1, Lb/l;->bEK: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 4ac1d7bcd3..d33c2f3064 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;->bEL:Ljava/lang/String;
+    iput-object p2, p1, Lb/l;->bEG:Ljava/lang/String;
 
     return-void
 .end method
diff --git a/com.discord/smali/b/j.smali b/com.discord/smali/b/j.smali
index d539bed99f..a1b18ae15a 100644
--- a/com.discord/smali/b/j.smali
+++ b/com.discord/smali/b/j.smali
@@ -43,7 +43,7 @@
 
 
 # virtual methods
-.method final Iw()Lb/j;
+.method final Iu()Lb/j;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -61,7 +61,7 @@
     return-object v0
 .end method
 
-.method final Ix()Lb/j;
+.method final Iv()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 8ca1391b7d..4229d7ad82 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 IA()Ljava/util/concurrent/Executor;
+.method public final Iy()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 20c54e4824..838637dede 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 bEJ:Lb/k;
+.field private static final bEE:Lb/k;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    invoke-static {}, Lb/k;->Iz()Lb/k;
+    invoke-static {}, Lb/k;->Ix()Lb/k;
 
     move-result-object v0
 
-    sput-object v0, Lb/k;->bEJ:Lb/k;
+    sput-object v0, Lb/k;->bEE:Lb/k;
 
     return-void
 .end method
@@ -37,15 +37,15 @@
     return-void
 .end method
 
-.method static Iy()Lb/k;
+.method static Iw()Lb/k;
     .locals 1
 
-    sget-object v0, Lb/k;->bEJ:Lb/k;
+    sget-object v0, Lb/k;->bEE:Lb/k;
 
     return-object v0
 .end method
 
-.method private static Iz()Lb/k;
+.method private static Ix()Lb/k;
     .locals 1
 
     :try_start_0
@@ -90,7 +90,7 @@
 
 
 # virtual methods
-.method IA()Ljava/util/concurrent/Executor;
+.method Iy()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;->bEj:Lb/c$a;
+    sget-object p1, Lb/f;->bEe: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 2958e10229..183705dafe 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 brE:Lokhttp3/MediaType;
+.field private final brz: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;->brE:Lokhttp3/MediaType;
+    iput-object p2, p0, Lb/l$a;->brz: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;->brE:Lokhttp3/MediaType;
+    iget-object v0, p0, Lb/l$a;->brz:Lokhttp3/MediaType;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/b/l.smali b/com.discord/smali/b/l.smali
index b39bd512a2..c4d3d53640 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 bre:[C
+.field private static final bqZ:[C
 
 
 # instance fields
-.field private final bEK:Lokhttp3/s;
+.field private final bEF:Lokhttp3/s;
 
-.field bEL:Ljava/lang/String;
+.field bEG:Ljava/lang/String;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private bEM:Lokhttp3/s$a;
+.field private bEH:Lokhttp3/s$a;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private final bEN:Lokhttp3/w$a;
+.field private final bEI:Lokhttp3/w$a;
 
-.field private final bEO:Z
+.field private final bEJ:Z
 
-.field bEP:Lokhttp3/MultipartBody$a;
+.field bEK:Lokhttp3/MultipartBody$a;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private bEQ:Lokhttp3/q$a;
+.field private bEL:Lokhttp3/q$a;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private brE:Lokhttp3/MediaType;
+.field brD:Lokhttp3/RequestBody;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field brI:Lokhttp3/RequestBody;
+.field private brz:Lokhttp3/MediaType;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private final bsq:Ljava/lang/String;
+.field private final bsl:Ljava/lang/String;
 
 
 # direct methods
@@ -65,7 +65,7 @@
 
     fill-array-data v0, :array_0
 
-    sput-object v0, Lb/l;->bre:[C
+    sput-object v0, Lb/l;->bqZ:[C
 
     return-void
 
@@ -107,25 +107,25 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lb/l;->bsq:Ljava/lang/String;
+    iput-object p1, p0, Lb/l;->bsl:Ljava/lang/String;
 
-    iput-object p2, p0, Lb/l;->bEK:Lokhttp3/s;
+    iput-object p2, p0, Lb/l;->bEF:Lokhttp3/s;
 
-    iput-object p3, p0, Lb/l;->bEL:Ljava/lang/String;
+    iput-object p3, p0, Lb/l;->bEG:Ljava/lang/String;
 
     new-instance p1, Lokhttp3/w$a;
 
     invoke-direct {p1}, Lokhttp3/w$a;-><init>()V
 
-    iput-object p1, p0, Lb/l;->bEN:Lokhttp3/w$a;
+    iput-object p1, p0, Lb/l;->bEI:Lokhttp3/w$a;
 
-    iput-object p5, p0, Lb/l;->brE:Lokhttp3/MediaType;
+    iput-object p5, p0, Lb/l;->brz:Lokhttp3/MediaType;
 
-    iput-boolean p6, p0, Lb/l;->bEO:Z
+    iput-boolean p6, p0, Lb/l;->bEJ:Z
 
     if-eqz p4, :cond_0
 
-    iget-object p1, p0, Lb/l;->bEN:Lokhttp3/w$a;
+    iget-object p1, p0, Lb/l;->bEI: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;->bEQ:Lokhttp3/q$a;
+    iput-object p1, p0, Lb/l;->bEL:Lokhttp3/q$a;
 
     return-void
 
@@ -147,11 +147,11 @@
 
     invoke-direct {p1}, Lokhttp3/MultipartBody$a;-><init>()V
 
-    iput-object p1, p0, Lb/l;->bEP:Lokhttp3/MultipartBody$a;
+    iput-object p1, p0, Lb/l;->bEK:Lokhttp3/MultipartBody$a;
 
-    iget-object p1, p0, Lb/l;->bEP:Lokhttp3/MultipartBody$a;
+    iget-object p1, p0, Lb/l;->bEK:Lokhttp3/MultipartBody$a;
 
-    sget-object p2, Lokhttp3/MultipartBody;->bry:Lokhttp3/MediaType;
+    sget-object p2, Lokhttp3/MultipartBody;->brt:Lokhttp3/MediaType;
 
     if-eqz p2, :cond_3
 
@@ -165,7 +165,7 @@
 
     if-eqz p3, :cond_2
 
-    iput-object p2, p1, Lokhttp3/MultipartBody$a;->brG:Lokhttp3/MediaType;
+    iput-object p2, p1, Lokhttp3/MultipartBody$a;->brB: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;->Hi()Z
+    invoke-virtual {v1}, Lokio/c;->Hg()Z
 
     move-result v11
 
@@ -342,7 +342,7 @@
 
     invoke-virtual {v3, v9}, Lokio/c;->du(I)Lokio/c;
 
-    sget-object v12, Lb/l;->bre:[C
+    sget-object v12, Lb/l;->bqZ:[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;->bre:[C
+    sget-object v12, Lb/l;->bqZ:[C
 
     and-int/lit8 v11, v11, 0xf
 
@@ -373,7 +373,7 @@
     goto :goto_2
 
     :cond_7
-    invoke-virtual {v3}, Lokio/c;->Ho()Ljava/lang/String;
+    invoke-virtual {v3}, Lokio/c;->Hm()Ljava/lang/String;
 
     move-result-object p0
 
@@ -383,23 +383,23 @@
 
 
 # virtual methods
-.method final FN()Lokhttp3/w;
+.method final FL()Lokhttp3/w;
     .locals 5
 
-    iget-object v0, p0, Lb/l;->bEM:Lokhttp3/s$a;
+    iget-object v0, p0, Lb/l;->bEH:Lokhttp3/s$a;
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v0}, Lokhttp3/s$a;->Fw()Lokhttp3/s;
+    invoke-virtual {v0}, Lokhttp3/s$a;->Fu()Lokhttp3/s;
 
     move-result-object v0
 
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lb/l;->bEK:Lokhttp3/s;
+    iget-object v0, p0, Lb/l;->bEF:Lokhttp3/s;
 
-    iget-object v1, p0, Lb/l;->bEL:Ljava/lang/String;
+    iget-object v1, p0, Lb/l;->bEG: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;->brI:Lokhttp3/RequestBody;
+    iget-object v1, p0, Lb/l;->brD:Lokhttp3/RequestBody;
 
     if-nez v1, :cond_4
 
-    iget-object v2, p0, Lb/l;->bEQ:Lokhttp3/q$a;
+    iget-object v2, p0, Lb/l;->bEL: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;->bqW:Ljava/util/List;
+    iget-object v2, v2, Lokhttp3/q$a;->bqR: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;->bEP:Lokhttp3/MultipartBody$a;
+    iget-object v2, p0, Lb/l;->bEK:Lokhttp3/MultipartBody$a;
 
     if-eqz v2, :cond_3
 
-    iget-object v1, v2, Lokhttp3/MultipartBody$a;->brF:Ljava/util/List;
+    iget-object v1, v2, Lokhttp3/MultipartBody$a;->brA: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;->brC:Lokio/ByteString;
+    iget-object v3, v2, Lokhttp3/MultipartBody$a;->brx:Lokio/ByteString;
 
-    iget-object v4, v2, Lokhttp3/MultipartBody$a;->brG:Lokhttp3/MediaType;
+    iget-object v4, v2, Lokhttp3/MultipartBody$a;->brB:Lokhttp3/MediaType;
 
-    iget-object v2, v2, Lokhttp3/MultipartBody$a;->brF:Ljava/util/List;
+    iget-object v2, v2, Lokhttp3/MultipartBody$a;->brA: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;->bEO:Z
+    iget-boolean v2, p0, Lb/l;->bEJ:Z
 
     if-eqz v2, :cond_4
 
@@ -477,7 +477,7 @@
 
     :cond_4
     :goto_1
-    iget-object v2, p0, Lb/l;->brE:Lokhttp3/MediaType;
+    iget-object v2, p0, Lb/l;->brz:Lokhttp3/MediaType;
 
     if-eqz v2, :cond_6
 
@@ -492,7 +492,7 @@
     goto :goto_2
 
     :cond_5
-    iget-object v3, p0, Lb/l;->bEN:Lokhttp3/w$a;
+    iget-object v3, p0, Lb/l;->bEI: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;->bEN:Lokhttp3/w$a;
+    iget-object v2, p0, Lb/l;->bEI: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;->bsq:Ljava/lang/String;
+    iget-object v2, p0, Lb/l;->bsl: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;->FN()Lokhttp3/w;
+    invoke-virtual {v0}, Lokhttp3/w$a;->FL()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;->bEK:Lokhttp3/s;
+    iget-object v2, p0, Lb/l;->bEF: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;->bEL:Ljava/lang/String;
+    iget-object v2, p0, Lb/l;->bEG: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;->brE:Lokhttp3/MediaType;
+    iput-object p1, p0, Lb/l;->brz:Lokhttp3/MediaType;
 
     return-void
 
@@ -591,7 +591,7 @@
     throw p1
 
     :cond_1
-    iget-object v0, p0, Lb/l;->bEN:Lokhttp3/w$a;
+    iget-object v0, p0, Lb/l;->bEI: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;->bEL:Ljava/lang/String;
+    iget-object v0, p0, Lb/l;->bEG:Ljava/lang/String;
 
     if-eqz v0, :cond_1
 
-    iget-object v1, p0, Lb/l;->bEK:Lokhttp3/s;
+    iget-object v1, p0, Lb/l;->bEF: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;->bEM:Lokhttp3/s$a;
+    iput-object v0, p0, Lb/l;->bEH:Lokhttp3/s$a;
 
-    iget-object v0, p0, Lb/l;->bEM:Lokhttp3/s$a;
+    iget-object v0, p0, Lb/l;->bEH:Lokhttp3/s$a;
 
     if-eqz v0, :cond_0
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lb/l;->bEL:Ljava/lang/String;
+    iput-object v0, p0, Lb/l;->bEG: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;->bEK:Lokhttp3/s;
+    iget-object p3, p0, Lb/l;->bEF: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;->bEL:Ljava/lang/String;
+    iget-object p3, p0, Lb/l;->bEG: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;->bEM:Lokhttp3/s$a;
+    iget-object p3, p0, Lb/l;->bEH: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;->bEM:Lokhttp3/s$a;
+    iget-object p3, p0, Lb/l;->bEH: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;->bEP:Lokhttp3/MultipartBody$a;
+    iget-object v0, p0, Lb/l;->bEK: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;->bEQ:Lokhttp3/q$a;
+    iget-object p3, p0, Lb/l;->bEL: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;->bEQ:Lokhttp3/q$a;
+    iget-object p3, p0, Lb/l;->bEL: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 a51df7ebd1..0e655835c3 100644
--- a/com.discord/smali/b/m.smali
+++ b/com.discord/smali/b/m.smali
@@ -15,9 +15,9 @@
 
 
 # instance fields
-.field public final bER:Lokhttp3/Response;
+.field public final bEM:Lokhttp3/Response;
 
-.field public final bES:Ljava/lang/Object;
+.field public final bEN:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TT;"
@@ -28,7 +28,7 @@
     .end annotation
 .end field
 
-.field public final bET:Lokhttp3/x;
+.field public final bEO: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;->bER:Lokhttp3/Response;
+    iput-object p1, p0, Lb/m;->bEM:Lokhttp3/Response;
 
-    iput-object p2, p0, Lb/m;->bES:Ljava/lang/Object;
+    iput-object p2, p0, Lb/m;->bEN:Ljava/lang/Object;
 
-    iput-object p3, p0, Lb/m;->bET:Lokhttp3/x;
+    iput-object p3, p0, Lb/m;->bEO: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;->zg()Z
+    invoke-virtual {p1}, Lokhttp3/Response;->ze()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;->zg()Z
+    invoke-virtual {p1}, Lokhttp3/Response;->ze()Z
 
     move-result v0
 
@@ -161,10 +161,10 @@
 
 
 # virtual methods
-.method public final IB()Lokhttp3/Response;
+.method public final Iz()Lokhttp3/Response;
     .locals 1
 
-    iget-object v0, p0, Lb/m;->bER:Lokhttp3/Response;
+    iget-object v0, p0, Lb/m;->bEM: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;->bER:Lokhttp3/Response;
+    iget-object v0, p0, Lb/m;->bEM: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 f70a7a96ad..84f681bbd9 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 bEZ:Lb/k;
+.field private final bEU:Lb/k;
 
-.field final synthetic bFa:Ljava/lang/Class;
+.field final synthetic bEV:Ljava/lang/Class;
 
-.field final synthetic bFb:Lb/n;
+.field final synthetic bEW:Lb/n;
 
 
 # direct methods
 .method constructor <init>(Lb/n;Ljava/lang/Class;)V
     .locals 0
 
-    iput-object p1, p0, Lb/n$1;->bFb:Lb/n;
+    iput-object p1, p0, Lb/n$1;->bEW:Lb/n;
 
-    iput-object p2, p0, Lb/n$1;->bFa:Ljava/lang/Class;
+    iput-object p2, p0, Lb/n$1;->bEV:Ljava/lang/Class;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    invoke-static {}, Lb/k;->Iy()Lb/k;
+    invoke-static {}, Lb/k;->Iw()Lb/k;
 
     move-result-object p1
 
-    iput-object p1, p0, Lb/n$1;->bEZ:Lb/k;
+    iput-object p1, p0, Lb/n$1;->bEU:Lb/k;
 
     return-void
 .end method
@@ -73,7 +73,7 @@
     return-object p1
 
     :cond_0
-    iget-object v0, p0, Lb/n$1;->bEZ:Lb/k;
+    iget-object v0, p0, Lb/n$1;->bEU: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;->bEZ:Lb/k;
+    iget-object v0, p0, Lb/n$1;->bEU:Lb/k;
 
-    iget-object v1, p0, Lb/n$1;->bFa:Ljava/lang/Class;
+    iget-object v1, p0, Lb/n$1;->bEV: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;->bFb:Lb/n;
+    iget-object p1, p0, Lb/n$1;->bEW: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;->bFe:Lb/c;
+    iget-object p1, p1, Lb/o;->bEZ: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 16695887c3..8979a762f2 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 bEK:Lokhttp3/s;
+.field private bEF:Lokhttp3/s;
 
-.field private bEV:Lokhttp3/e$a;
+.field private bEQ:Lokhttp3/e$a;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private final bEW:Ljava/util/List;
+.field private final bER:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -32,7 +32,7 @@
     .end annotation
 .end field
 
-.field private final bEX:Ljava/util/List;
+.field private final bES:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -42,11 +42,11 @@
     .end annotation
 .end field
 
-.field private bEY:Z
+.field private bET:Z
 
-.field private final bEZ:Lb/k;
+.field private final bEU:Lb/k;
 
-.field private bEm:Ljava/util/concurrent/Executor;
+.field private bEh: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;->Iy()Lb/k;
+    invoke-static {}, Lb/k;->Iw()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;->bEW:Ljava/util/List;
+    iput-object v0, p0, Lb/n$a;->bER:Ljava/util/List;
 
     new-instance v0, Ljava/util/ArrayList;
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lb/n$a;->bEX:Ljava/util/List;
+    iput-object v0, p0, Lb/n$a;->bES:Ljava/util/List;
 
-    iput-object p1, p0, Lb/n$a;->bEZ:Lb/k;
+    iput-object p1, p0, Lb/n$a;->bEU:Lb/k;
 
-    iget-object p1, p0, Lb/n$a;->bEW:Ljava/util/List;
+    iget-object p1, p0, Lb/n$a;->bER:Ljava/util/List;
 
     new-instance v0, Lb/a;
 
@@ -97,14 +97,14 @@
 
 
 # virtual methods
-.method public final IC()Lb/n;
+.method public final IA()Lb/n;
     .locals 8
 
-    iget-object v0, p0, Lb/n$a;->bEK:Lokhttp3/s;
+    iget-object v0, p0, Lb/n$a;->bEF:Lokhttp3/s;
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lb/n$a;->bEV:Lokhttp3/e$a;
+    iget-object v0, p0, Lb/n$a;->bEQ: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;->bEm:Ljava/util/concurrent/Executor;
+    iget-object v0, p0, Lb/n$a;->bEh:Ljava/util/concurrent/Executor;
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lb/n$a;->bEZ:Lb/k;
+    iget-object v0, p0, Lb/n$a;->bEU:Lb/k;
 
-    invoke-virtual {v0}, Lb/k;->IA()Ljava/util/concurrent/Executor;
+    invoke-virtual {v0}, Lb/k;->Iy()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;->bEX:Ljava/util/List;
+    iget-object v0, p0, Lb/n$a;->bES:Ljava/util/List;
 
     invoke-direct {v5, v0}, Ljava/util/ArrayList;-><init>(Ljava/util/Collection;)V
 
-    iget-object v0, p0, Lb/n$a;->bEZ:Lb/k;
+    iget-object v0, p0, Lb/n$a;->bEU: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;->bEW:Ljava/util/List;
+    iget-object v0, p0, Lb/n$a;->bER: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;->bEK:Lokhttp3/s;
+    iget-object v3, p0, Lb/n$a;->bEF:Lokhttp3/s;
 
-    iget-boolean v7, p0, Lb/n$a;->bEY:Z
+    iget-boolean v7, p0, Lb/n$a;->bET: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;->bEX:Ljava/util/List;
+    iget-object v0, p0, Lb/n$a;->bES: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;->bEW:Ljava/util/List;
+    iget-object v0, p0, Lb/n$a;->bER: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;->bEV:Lokhttp3/e$a;
+    iput-object p1, p0, Lb/n$a;->bEQ: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;->brh:Ljava/util/List;
+    iget-object p1, v1, Lokhttp3/s;->brc: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;->bEK:Lokhttp3/s;
+    iput-object v1, p0, Lb/n$a;->bEF:Lokhttp3/s;
 
     return-object p0
 
diff --git a/com.discord/smali/b/n.smali b/com.discord/smali/b/n.smali
index 2b71a3c894..1376b56fdf 100644
--- a/com.discord/smali/b/n.smali
+++ b/com.discord/smali/b/n.smali
@@ -12,9 +12,9 @@
 
 
 # instance fields
-.field final bEK:Lokhttp3/s;
+.field final bEF:Lokhttp3/s;
 
-.field private final bEU:Ljava/util/Map;
+.field private final bEP:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -25,9 +25,9 @@
     .end annotation
 .end field
 
-.field final bEV:Lokhttp3/e$a;
+.field final bEQ:Lokhttp3/e$a;
 
-.field final bEW:Ljava/util/List;
+.field final bER:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -37,7 +37,7 @@
     .end annotation
 .end field
 
-.field final bEX:Ljava/util/List;
+.field final bES:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -47,9 +47,9 @@
     .end annotation
 .end field
 
-.field final bEY:Z
+.field final bET:Z
 
-.field final bEm:Ljava/util/concurrent/Executor;
+.field final bEh: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;->bEU:Ljava/util/Map;
+    iput-object v0, p0, Lb/n;->bEP:Ljava/util/Map;
 
-    iput-object p1, p0, Lb/n;->bEV:Lokhttp3/e$a;
+    iput-object p1, p0, Lb/n;->bEQ:Lokhttp3/e$a;
 
-    iput-object p2, p0, Lb/n;->bEK:Lokhttp3/s;
+    iput-object p2, p0, Lb/n;->bEF: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;->bEW:Ljava/util/List;
+    iput-object p1, p0, Lb/n;->bER: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;->bEX:Ljava/util/List;
+    iput-object p1, p0, Lb/n;->bES:Ljava/util/List;
 
-    iput-object p5, p0, Lb/n;->bEm:Ljava/util/concurrent/Executor;
+    iput-object p5, p0, Lb/n;->bEh:Ljava/util/concurrent/Executor;
 
-    iput-boolean p6, p0, Lb/n;->bEY:Z
+    iput-boolean p6, p0, Lb/n;->bET: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;->bEY:Z
+    iget-boolean v0, p0, Lb/n;->bET:Z
 
     const/4 v1, 0x0
 
     if-eqz v0, :cond_1
 
-    invoke-static {}, Lb/k;->Iy()Lb/k;
+    invoke-static {}, Lb/k;->Iw()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;->bEW:Ljava/util/List;
+    iget-object p2, p0, Lb/n;->bER:Ljava/util/List;
 
     const/4 p3, 0x0
 
@@ -225,7 +225,7 @@
 
     add-int/lit8 p2, p2, 0x1
 
-    iget-object p3, p0, Lb/n;->bEW:Ljava/util/List;
+    iget-object p3, p0, Lb/n;->bER: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;->bEW:Ljava/util/List;
+    iget-object v1, p0, Lb/n;->bER: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;->bEW:Ljava/util/List;
+    iget-object p1, p0, Lb/n;->bER: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;->bEW:Ljava/util/List;
+    iget-object v0, p0, Lb/n;->bER: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;->bEW:Ljava/util/List;
+    iget-object p1, p0, Lb/n;->bER: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;->bEW:Ljava/util/List;
+    iget-object v0, p0, Lb/n;->bER: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;->bEh:Lb/a$d;
+    sget-object p1, Lb/a$d;->bEc:Lb/a$d;
 
     return-object p1
 .end method
@@ -390,7 +390,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lb/n;->bEU:Ljava/util/Map;
+    iget-object v0, p0, Lb/n;->bEP: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;->bEU:Ljava/util/Map;
+    iget-object v0, p0, Lb/n;->bEP:Ljava/util/Map;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lb/n;->bEU:Ljava/util/Map;
+    iget-object v1, p0, Lb/n;->bEP: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;->ID()Lb/c;
+    invoke-virtual {v1}, Lb/o$a;->IB()Lb/c;
 
     move-result-object v2
 
-    iput-object v2, v1, Lb/o$a;->bFe:Lb/c;
+    iput-object v2, v1, Lb/o$a;->bEZ:Lb/c;
 
-    iget-object v2, v1, Lb/o$a;->bFe:Lb/c;
+    iget-object v2, v1, Lb/o$a;->bEZ:Lb/c;
 
-    invoke-interface {v2}, Lb/c;->Is()Ljava/lang/reflect/Type;
+    invoke-interface {v2}, Lb/c;->Iq()Ljava/lang/reflect/Type;
 
     move-result-object v2
 
-    iput-object v2, v1, Lb/o$a;->bFo:Ljava/lang/reflect/Type;
+    iput-object v2, v1, Lb/o$a;->bFj:Ljava/lang/reflect/Type;
 
-    iget-object v2, v1, Lb/o$a;->bFo:Ljava/lang/reflect/Type;
+    iget-object v2, v1, Lb/o$a;->bFj: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;->bFo:Ljava/lang/reflect/Type;
+    iget-object v2, v1, Lb/o$a;->bFj:Ljava/lang/reflect/Type;
 
     const-class v3, Lokhttp3/Response;
 
     if-eq v2, v3, :cond_20
 
-    invoke-virtual {v1}, Lb/o$a;->IE()Lb/e;
+    invoke-virtual {v1}, Lb/o$a;->IC()Lb/e;
 
     move-result-object v2
 
-    iput-object v2, v1, Lb/o$a;->bFf:Lb/e;
+    iput-object v2, v1, Lb/o$a;->bFa:Lb/e;
 
-    iget-object v2, v1, Lb/o$a;->bFl:[Ljava/lang/annotation/Annotation;
+    iget-object v2, v1, Lb/o$a;->bFg:[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;->bFo:Ljava/lang/reflect/Type;
+    iget-object v8, v1, Lb/o$a;->bFj: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;->FK()Ljava/lang/String;
+    invoke-interface {v8}, Lb/c/h;->FI()Ljava/lang/String;
 
     move-result-object v7
 
-    invoke-interface {v8}, Lb/c/h;->II()Ljava/lang/String;
+    invoke-interface {v8}, Lb/c/h;->IG()Ljava/lang/String;
 
     move-result-object v9
 
-    invoke-interface {v8}, Lb/c/h;->IJ()Z
+    invoke-interface {v8}, Lb/c/h;->IH()Z
 
     move-result v8
 
@@ -652,7 +652,7 @@
 
     move-result-object v7
 
-    iput-object v7, v1, Lb/o$a;->brH:Lokhttp3/Headers;
+    iput-object v7, v1, Lb/o$a;->brC:Lokhttp3/Headers;
 
     goto :goto_1
 
@@ -672,11 +672,11 @@
 
     if-eqz v9, :cond_d
 
-    iget-boolean v8, v1, Lb/o$a;->bFh:Z
+    iget-boolean v8, v1, Lb/o$a;->bFc:Z
 
     if-nez v8, :cond_c
 
-    iput-boolean v7, v1, Lb/o$a;->bFi:Z
+    iput-boolean v7, v1, Lb/o$a;->bFd:Z
 
     goto :goto_1
 
@@ -696,11 +696,11 @@
 
     if-eqz v8, :cond_f
 
-    iget-boolean v8, v1, Lb/o$a;->bFi:Z
+    iget-boolean v8, v1, Lb/o$a;->bFd:Z
 
     if-nez v8, :cond_e
 
-    iput-boolean v7, v1, Lb/o$a;->bFh:Z
+    iput-boolean v7, v1, Lb/o$a;->bFc:Z
 
     goto :goto_1
 
@@ -722,19 +722,19 @@
     goto/16 :goto_0
 
     :cond_10
-    iget-object v2, v1, Lb/o$a;->bFg:Ljava/lang/String;
+    iget-object v2, v1, Lb/o$a;->bFb:Ljava/lang/String;
 
     if-eqz v2, :cond_1f
 
-    iget-boolean v2, v1, Lb/o$a;->bEO:Z
+    iget-boolean v2, v1, Lb/o$a;->bEJ:Z
 
     if-nez v2, :cond_13
 
-    iget-boolean v2, v1, Lb/o$a;->bFi:Z
+    iget-boolean v2, v1, Lb/o$a;->bFd:Z
 
     if-nez v2, :cond_12
 
-    iget-boolean v2, v1, Lb/o$a;->bFh:Z
+    iget-boolean v2, v1, Lb/o$a;->bFc:Z
 
     if-nez v2, :cond_11
 
@@ -764,20 +764,20 @@
 
     :cond_13
     :goto_2
-    iget-object v2, v1, Lb/o$a;->bFm:[[Ljava/lang/annotation/Annotation;
+    iget-object v2, v1, Lb/o$a;->bFh:[[Ljava/lang/annotation/Annotation;
 
     array-length v2, v2
 
     new-array v3, v2, [Lb/j;
 
-    iput-object v3, v1, Lb/o$a;->bFj:[Lb/j;
+    iput-object v3, v1, Lb/o$a;->bFe:[Lb/j;
 
     const/4 v3, 0x0
 
     :goto_3
     if-ge v3, v2, :cond_16
 
-    iget-object v6, v1, Lb/o$a;->bFn:[Ljava/lang/reflect/Type;
+    iget-object v6, v1, Lb/o$a;->bFi:[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;->bFm:[[Ljava/lang/annotation/Annotation;
+    iget-object v8, v1, Lb/o$a;->bFh:[[Ljava/lang/annotation/Annotation;
 
     aget-object v8, v8, v3
 
     if-eqz v8, :cond_14
 
-    iget-object v9, v1, Lb/o$a;->bFj:[Lb/j;
+    iget-object v9, v1, Lb/o$a;->bFe:[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;->bEL:Ljava/lang/String;
+    iget-object v2, v1, Lb/o$a;->bEG:Ljava/lang/String;
 
     if-nez v2, :cond_18
 
-    iget-boolean v2, v1, Lb/o$a;->bFu:Z
+    iget-boolean v2, v1, Lb/o$a;->bFp:Z
 
     if-eqz v2, :cond_17
 
@@ -845,7 +845,7 @@
 
     new-array v2, v7, [Ljava/lang/Object;
 
-    iget-object v3, v1, Lb/o$a;->bFg:Ljava/lang/String;
+    iget-object v3, v1, Lb/o$a;->bFb:Ljava/lang/String;
 
     aput-object v3, v2, v5
 
@@ -857,19 +857,19 @@
 
     :cond_18
     :goto_4
-    iget-boolean v2, v1, Lb/o$a;->bFh:Z
+    iget-boolean v2, v1, Lb/o$a;->bFc:Z
 
     if-nez v2, :cond_1a
 
-    iget-boolean v2, v1, Lb/o$a;->bFi:Z
+    iget-boolean v2, v1, Lb/o$a;->bFd:Z
 
     if-nez v2, :cond_1a
 
-    iget-boolean v2, v1, Lb/o$a;->bEO:Z
+    iget-boolean v2, v1, Lb/o$a;->bEJ:Z
 
     if-nez v2, :cond_1a
 
-    iget-boolean v2, v1, Lb/o$a;->bFr:Z
+    iget-boolean v2, v1, Lb/o$a;->bFm:Z
 
     if-nez v2, :cond_19
 
@@ -888,11 +888,11 @@
 
     :cond_1a
     :goto_5
-    iget-boolean v2, v1, Lb/o$a;->bFh:Z
+    iget-boolean v2, v1, Lb/o$a;->bFc:Z
 
     if-eqz v2, :cond_1c
 
-    iget-boolean v2, v1, Lb/o$a;->bFp:Z
+    iget-boolean v2, v1, Lb/o$a;->bFk:Z
 
     if-eqz v2, :cond_1b
 
@@ -911,11 +911,11 @@
 
     :cond_1c
     :goto_6
-    iget-boolean v2, v1, Lb/o$a;->bFi:Z
+    iget-boolean v2, v1, Lb/o$a;->bFd:Z
 
     if-eqz v2, :cond_1e
 
-    iget-boolean v2, v1, Lb/o$a;->bFq:Z
+    iget-boolean v2, v1, Lb/o$a;->bFl: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;->bEU:Ljava/util/Map;
+    iget-object v1, p0, Lb/n;->bEP: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;->bFo:Ljava/lang/reflect/Type;
+    iget-object v2, v1, Lb/o$a;->bFj: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 51702a133c..32c3cd8690 100644
--- a/com.discord/smali/b/o$a.smali
+++ b/com.discord/smali/b/o$a.smali
@@ -26,11 +26,11 @@
 
 
 # instance fields
-.field bEL:Ljava/lang/String;
+.field bEG:Ljava/lang/String;
 
-.field bEO:Z
+.field bEJ:Z
 
-.field bFe:Lb/c;
+.field bEZ:Lb/c;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lb/c<",
@@ -39,7 +39,7 @@
     .end annotation
 .end field
 
-.field bFf:Lb/e;
+.field bFa:Lb/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lb/e<",
@@ -49,13 +49,13 @@
     .end annotation
 .end field
 
-.field bFg:Ljava/lang/String;
+.field bFb:Ljava/lang/String;
 
-.field bFh:Z
+.field bFc:Z
 
-.field bFi:Z
+.field bFd:Z
 
-.field bFj:[Lb/j;
+.field bFe:[Lb/j;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "[",
@@ -65,29 +65,29 @@
     .end annotation
 .end field
 
-.field final bFk:Lb/n;
+.field final bFf:Lb/n;
 
-.field final bFl:[Ljava/lang/annotation/Annotation;
+.field final bFg:[Ljava/lang/annotation/Annotation;
 
-.field final bFm:[[Ljava/lang/annotation/Annotation;
+.field final bFh:[[Ljava/lang/annotation/Annotation;
 
-.field final bFn:[Ljava/lang/reflect/Type;
+.field final bFi:[Ljava/lang/reflect/Type;
 
-.field bFo:Ljava/lang/reflect/Type;
+.field bFj:Ljava/lang/reflect/Type;
+
+.field bFk:Z
+
+.field bFl:Z
+
+.field bFm:Z
+
+.field bFn:Z
+
+.field bFo:Z
 
 .field bFp:Z
 
-.field bFq:Z
-
-.field bFr:Z
-
-.field bFs:Z
-
-.field bFt:Z
-
-.field bFu:Z
-
-.field bFv:Ljava/util/Set;
+.field bFq:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -97,11 +97,11 @@
     .end annotation
 .end field
 
-.field final bhs:Ljava/lang/reflect/Method;
+.field final bhn:Ljava/lang/reflect/Method;
 
-.field brE:Lokhttp3/MediaType;
+.field brC:Lokhttp3/Headers;
 
-.field brH:Lokhttp3/Headers;
+.field brz:Lokhttp3/MediaType;
 
 
 # direct methods
@@ -110,27 +110,27 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lb/o$a;->bFk:Lb/n;
+    iput-object p1, p0, Lb/o$a;->bFf:Lb/n;
 
-    iput-object p2, p0, Lb/o$a;->bhs:Ljava/lang/reflect/Method;
+    iput-object p2, p0, Lb/o$a;->bhn: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;->bFl:[Ljava/lang/annotation/Annotation;
+    iput-object p1, p0, Lb/o$a;->bFg:[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;->bFn:[Ljava/lang/reflect/Type;
+    iput-object p1, p0, Lb/o$a;->bFi:[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;->bFm:[[Ljava/lang/annotation/Annotation;
+    iput-object p1, p0, Lb/o$a;->bFh:[[Ljava/lang/annotation/Annotation;
 
     return-void
 .end method
@@ -160,23 +160,23 @@
 
     if-eqz v0, :cond_6
 
-    iget-boolean p3, p0, Lb/o$a;->bFu:Z
+    iget-boolean p3, p0, Lb/o$a;->bFp:Z
 
     if-nez p3, :cond_5
 
-    iget-boolean p3, p0, Lb/o$a;->bFs:Z
+    iget-boolean p3, p0, Lb/o$a;->bFn:Z
 
     if-nez p3, :cond_4
 
-    iget-boolean p3, p0, Lb/o$a;->bFt:Z
+    iget-boolean p3, p0, Lb/o$a;->bFo:Z
 
     if-nez p3, :cond_3
 
-    iget-object p3, p0, Lb/o$a;->bEL:Ljava/lang/String;
+    iget-object p3, p0, Lb/o$a;->bEG:Ljava/lang/String;
 
     if-nez p3, :cond_2
 
-    iput-boolean v2, p0, Lb/o$a;->bFu:Z
+    iput-boolean v2, p0, Lb/o$a;->bFp: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;->bFg:Ljava/lang/String;
+    iget-object p3, p0, Lb/o$a;->bFb:Ljava/lang/String;
 
     aput-object p3, p2, v3
 
@@ -282,19 +282,19 @@
 
     if-eqz v0, :cond_c
 
-    iget-boolean v0, p0, Lb/o$a;->bFt:Z
+    iget-boolean v0, p0, Lb/o$a;->bFo:Z
 
     if-nez v0, :cond_b
 
-    iget-boolean v0, p0, Lb/o$a;->bFu:Z
+    iget-boolean v0, p0, Lb/o$a;->bFp:Z
 
     if-nez v0, :cond_a
 
-    iget-object v0, p0, Lb/o$a;->bEL:Ljava/lang/String;
+    iget-object v0, p0, Lb/o$a;->bEG:Ljava/lang/String;
 
     if-eqz v0, :cond_9
 
-    iput-boolean v2, p0, Lb/o$a;->bFs:Z
+    iput-boolean v2, p0, Lb/o$a;->bFn:Z
 
     check-cast p4, Lb/c/s;
 
@@ -302,7 +302,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lb/o;->bFd:Ljava/util/regex/Pattern;
+    sget-object v1, Lb/o;->bEY: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;->bFv:Ljava/util/Set;
+    iget-object v1, p0, Lb/o$a;->bFq: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;->bFk:Lb/n;
+    iget-object p1, p0, Lb/o$a;->bFf: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;->IH()Z
+    invoke-interface {p4}, Lb/c/s;->IF()Z
 
     move-result p3
 
@@ -341,7 +341,7 @@
     :cond_7
     new-array p2, v4, [Ljava/lang/Object;
 
-    iget-object p3, p0, Lb/o$a;->bEL:Ljava/lang/String;
+    iget-object p3, p0, Lb/o$a;->bEG: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;->bFc:Ljava/util/regex/Pattern;
+    sget-object p3, Lb/o;->bEX: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;->bFg:Ljava/lang/String;
+    iget-object p3, p0, Lb/o$a;->bFb:Ljava/lang/String;
 
     aput-object p3, p2, v3
 
@@ -426,7 +426,7 @@
 
     move-result-object v0
 
-    invoke-interface {p4}, Lb/c/t;->IH()Z
+    invoke-interface {p4}, Lb/c/t;->IF()Z
 
     move-result p4
 
@@ -434,7 +434,7 @@
 
     move-result-object v4
 
-    iput-boolean v2, p0, Lb/o$a;->bFt:Z
+    iput-boolean v2, p0, Lb/o$a;->bFo:Z
 
     const-class v2, Ljava/lang/Iterable;
 
@@ -454,7 +454,7 @@
 
     move-result-object p1
 
-    iget-object p2, p0, Lb/o$a;->bFk:Lb/n;
+    iget-object p2, p0, Lb/o$a;->bFf: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;->Iw()Lb/j;
+    invoke-virtual {p2}, Lb/j$i;->Iu()Lb/j;
 
     move-result-object p1
 
@@ -518,7 +518,7 @@
 
     move-result-object p1
 
-    iget-object p2, p0, Lb/o$a;->bFk:Lb/n;
+    iget-object p2, p0, Lb/o$a;->bFf: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;->Ix()Lb/j;
+    invoke-virtual {p2}, Lb/j$i;->Iv()Lb/j;
 
     move-result-object p1
 
     return-object p1
 
     :cond_f
-    iget-object p1, p0, Lb/o$a;->bFk:Lb/n;
+    iget-object p1, p0, Lb/o$a;->bFf: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;->IH()Z
+    invoke-interface {p4}, Lb/c/v;->IF()Z
 
     move-result p4
 
@@ -562,7 +562,7 @@
 
     move-result-object v0
 
-    iput-boolean v2, p0, Lb/o$a;->bFt:Z
+    iput-boolean v2, p0, Lb/o$a;->bFo:Z
 
     const-class v2, Ljava/lang/Iterable;
 
@@ -582,7 +582,7 @@
 
     move-result-object p1
 
-    iget-object p2, p0, Lb/o$a;->bFk:Lb/n;
+    iget-object p2, p0, Lb/o$a;->bFf: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;->Iw()Lb/j;
+    invoke-virtual {p2}, Lb/j$k;->Iu()Lb/j;
 
     move-result-object p1
 
@@ -646,7 +646,7 @@
 
     move-result-object p1
 
-    iget-object p2, p0, Lb/o$a;->bFk:Lb/n;
+    iget-object p2, p0, Lb/o$a;->bFf: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;->Ix()Lb/j;
+    invoke-virtual {p2}, Lb/j$k;->Iv()Lb/j;
 
     move-result-object p1
 
     return-object p1
 
     :cond_13
-    iget-object p1, p0, Lb/o$a;->bFk:Lb/n;
+    iget-object p1, p0, Lb/o$a;->bFf: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;->bFk:Lb/n;
+    iget-object p2, p0, Lb/o$a;->bFf: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;->IH()Z
+    invoke-interface {p4}, Lb/c/u;->IF()Z
 
     move-result p3
 
@@ -808,7 +808,7 @@
 
     move-result-object p1
 
-    iget-object p2, p0, Lb/o$a;->bFk:Lb/n;
+    iget-object p2, p0, Lb/o$a;->bFf: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;->Iw()Lb/j;
+    invoke-virtual {p2}, Lb/j$d;->Iu()Lb/j;
 
     move-result-object p1
 
@@ -872,7 +872,7 @@
 
     move-result-object p1
 
-    iget-object p2, p0, Lb/o$a;->bFk:Lb/n;
+    iget-object p2, p0, Lb/o$a;->bFf: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;->Ix()Lb/j;
+    invoke-virtual {p2}, Lb/j$d;->Iv()Lb/j;
 
     move-result-object p1
 
     return-object p1
 
     :cond_1b
-    iget-object p1, p0, Lb/o$a;->bFk:Lb/n;
+    iget-object p1, p0, Lb/o$a;->bFf: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;->bFk:Lb/n;
+    iget-object p2, p0, Lb/o$a;->bFf: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;->bFh:Z
+    iget-boolean v0, p0, Lb/o$a;->bFc:Z
 
     if-eqz v0, :cond_24
 
@@ -1008,11 +1008,11 @@
 
     move-result-object v0
 
-    invoke-interface {p4}, Lb/c/c;->IH()Z
+    invoke-interface {p4}, Lb/c/c;->IF()Z
 
     move-result p4
 
-    iput-boolean v2, p0, Lb/o$a;->bFp:Z
+    iput-boolean v2, p0, Lb/o$a;->bFk: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;->bFk:Lb/n;
+    iget-object p2, p0, Lb/o$a;->bFf: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;->Iw()Lb/j;
+    invoke-virtual {p2}, Lb/j$b;->Iu()Lb/j;
 
     move-result-object p1
 
@@ -1100,7 +1100,7 @@
 
     move-result-object p1
 
-    iget-object p2, p0, Lb/o$a;->bFk:Lb/n;
+    iget-object p2, p0, Lb/o$a;->bFf: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;->Ix()Lb/j;
+    invoke-virtual {p2}, Lb/j$b;->Iv()Lb/j;
 
     move-result-object p1
 
     return-object p1
 
     :cond_23
-    iget-object p1, p0, Lb/o$a;->bFk:Lb/n;
+    iget-object p1, p0, Lb/o$a;->bFf: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;->bFh:Z
+    iget-boolean v0, p0, Lb/o$a;->bFc:Z
 
     if-eqz v0, :cond_29
 
@@ -1185,19 +1185,19 @@
 
     move-result-object p1
 
-    iget-object p2, p0, Lb/o$a;->bFk:Lb/n;
+    iget-object p2, p0, Lb/o$a;->bFf: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;->bFp:Z
+    iput-boolean v2, p0, Lb/o$a;->bFk:Z
 
     new-instance p2, Lb/j$c;
 
     check-cast p4, Lb/c/d;
 
-    invoke-interface {p4}, Lb/c/d;->IH()Z
+    invoke-interface {p4}, Lb/c/d;->IF()Z
 
     move-result p3
 
@@ -1260,13 +1260,13 @@
 
     if-eqz v0, :cond_39
 
-    iget-boolean v0, p0, Lb/o$a;->bFi:Z
+    iget-boolean v0, p0, Lb/o$a;->bFd:Z
 
     if-eqz v0, :cond_38
 
     check-cast p4, Lb/c/q;
 
-    iput-boolean v2, p0, Lb/o$a;->bFq:Z
+    iput-boolean v2, p0, Lb/o$a;->bFl: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;->bEI:Lb/j$l;
+    sget-object p1, Lb/j$l;->bED:Lb/j$l;
 
-    invoke-virtual {p1}, Lb/j$l;->Iw()Lb/j;
+    invoke-virtual {p1}, Lb/j$l;->Iu()Lb/j;
 
     move-result-object p1
 
@@ -1383,9 +1383,9 @@
 
     if-eqz p2, :cond_2e
 
-    sget-object p1, Lb/j$l;->bEI:Lb/j$l;
+    sget-object p1, Lb/j$l;->bED:Lb/j$l;
 
-    invoke-virtual {p1}, Lb/j$l;->Ix()Lb/j;
+    invoke-virtual {p1}, Lb/j$l;->Iv()Lb/j;
 
     move-result-object p1
 
@@ -1409,7 +1409,7 @@
 
     if-eqz p2, :cond_30
 
-    sget-object p1, Lb/j$l;->bEI:Lb/j$l;
+    sget-object p1, Lb/j$l;->bED:Lb/j$l;
 
     return-object p1
 
@@ -1455,7 +1455,7 @@
 
     const/4 v0, 0x3
 
-    invoke-interface {p4}, Lb/c/q;->IK()Ljava/lang/String;
+    invoke-interface {p4}, Lb/c/q;->II()Ljava/lang/String;
 
     move-result-object p4
 
@@ -1497,9 +1497,9 @@
 
     if-nez v0, :cond_32
 
-    iget-object p1, p0, Lb/o$a;->bFk:Lb/n;
+    iget-object p1, p0, Lb/o$a;->bFf:Lb/n;
 
-    iget-object v0, p0, Lb/o$a;->bFl:[Ljava/lang/annotation/Annotation;
+    iget-object v0, p0, Lb/o$a;->bFg:[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;->Iw()Lb/j;
+    invoke-virtual {p2}, Lb/j$f;->Iu()Lb/j;
 
     move-result-object p1
 
@@ -1580,9 +1580,9 @@
 
     if-nez v0, :cond_35
 
-    iget-object p1, p0, Lb/o$a;->bFk:Lb/n;
+    iget-object p1, p0, Lb/o$a;->bFf:Lb/n;
 
-    iget-object v0, p0, Lb/o$a;->bFl:[Ljava/lang/annotation/Annotation;
+    iget-object v0, p0, Lb/o$a;->bFg:[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;->Ix()Lb/j;
+    invoke-virtual {p2}, Lb/j$f;->Iv()Lb/j;
 
     move-result-object p1
 
@@ -1616,9 +1616,9 @@
 
     if-nez v0, :cond_37
 
-    iget-object p1, p0, Lb/o$a;->bFk:Lb/n;
+    iget-object p1, p0, Lb/o$a;->bFf:Lb/n;
 
-    iget-object v0, p0, Lb/o$a;->bFl:[Ljava/lang/annotation/Annotation;
+    iget-object v0, p0, Lb/o$a;->bFg:[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;->bFi:Z
+    iget-boolean v0, p0, Lb/o$a;->bFd:Z
 
     if-eqz v0, :cond_3e
 
-    iput-boolean v2, p0, Lb/o$a;->bFq:Z
+    iput-boolean v2, p0, Lb/o$a;->bFl: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;->bFk:Lb/n;
+    iget-object p1, p0, Lb/o$a;->bFf:Lb/n;
 
-    iget-object v0, p0, Lb/o$a;->bFl:[Ljava/lang/annotation/Annotation;
+    iget-object v0, p0, Lb/o$a;->bFg:[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;->IK()Ljava/lang/String;
+    invoke-interface {p4}, Lb/c/r;->II()Ljava/lang/String;
 
     move-result-object p3
 
@@ -1795,22 +1795,22 @@
 
     if-eqz p4, :cond_42
 
-    iget-boolean p4, p0, Lb/o$a;->bFh:Z
+    iget-boolean p4, p0, Lb/o$a;->bFc:Z
 
     if-nez p4, :cond_41
 
-    iget-boolean p4, p0, Lb/o$a;->bFi:Z
+    iget-boolean p4, p0, Lb/o$a;->bFd:Z
 
     if-nez p4, :cond_41
 
-    iget-boolean p4, p0, Lb/o$a;->bFr:Z
+    iget-boolean p4, p0, Lb/o$a;->bFm:Z
 
     if-nez p4, :cond_40
 
     :try_start_0
-    iget-object p4, p0, Lb/o$a;->bFk:Lb/n;
+    iget-object p4, p0, Lb/o$a;->bFf:Lb/n;
 
-    iget-object v0, p0, Lb/o$a;->bFl:[Ljava/lang/annotation/Annotation;
+    iget-object v0, p0, Lb/o$a;->bFg:[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;->bFr:Z
+    iput-boolean v2, p0, Lb/o$a;->bFm:Z
 
     new-instance p2, Lb/j$a;
 
@@ -1893,7 +1893,7 @@
 
 
 # virtual methods
-.method final ID()Lb/c;
+.method final IB()Lb/c;
     .locals 8
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -1903,7 +1903,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lb/o$a;->bhs:Ljava/lang/reflect/Method;
+    iget-object v0, p0, Lb/o$a;->bhn: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;->bhs:Ljava/lang/reflect/Method;
+    iget-object v1, p0, Lb/o$a;->bhn: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;->bFk:Lb/n;
+    iget-object v5, p0, Lb/o$a;->bFf: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;->bEX:Ljava/util/List;
+    iget-object v1, v5, Lb/n;->bES: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;->bEX:Ljava/util/List;
+    iget-object v2, v5, Lb/n;->bES: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;->bEX:Ljava/util/List;
+    iget-object v7, v5, Lb/n;->bES: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;->bEX:Ljava/util/List;
+    iget-object v6, v5, Lb/n;->bES: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;->bEX:Ljava/util/List;
+    iget-object v7, v5, Lb/n;->bES: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 IE()Lb/e;
+.method final IC()Lb/e;
     .locals 8
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -2104,7 +2104,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lb/o$a;->bhs:Ljava/lang/reflect/Method;
+    iget-object v0, p0, Lb/o$a;->bhn: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;->bFk:Lb/n;
+    iget-object v2, p0, Lb/o$a;->bFf:Lb/n;
 
-    iget-object v3, p0, Lb/o$a;->bFo:Ljava/lang/reflect/Type;
+    iget-object v3, p0, Lb/o$a;->bFj: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;->bEW:Ljava/util/List;
+    iget-object v4, v2, Lb/n;->bER:Ljava/util/List;
 
     const/4 v5, 0x0
 
@@ -2135,7 +2135,7 @@
 
     add-int/2addr v4, v1
 
-    iget-object v5, v2, Lb/n;->bEW:Ljava/util/List;
+    iget-object v5, v2, Lb/n;->bER: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;->bEW:Ljava/util/List;
+    iget-object v7, v2, Lb/n;->bER: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;->bEW:Ljava/util/List;
+    iget-object v3, v2, Lb/n;->bER: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;->bEW:Ljava/util/List;
+    iget-object v5, v2, Lb/n;->bER: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;->bFo:Ljava/lang/reflect/Type;
+    iget-object v3, p0, Lb/o$a;->bFj: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;->bhs:Ljava/lang/reflect/Method;
+    iget-object p2, p0, Lb/o$a;->bhn: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;->bhs:Ljava/lang/reflect/Method;
+    iget-object p2, p0, Lb/o$a;->bhn: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;->bFg:Ljava/lang/String;
+    iget-object v0, p0, Lb/o$a;->bFb:Ljava/lang/String;
 
     const/4 v1, 0x0
 
@@ -2438,9 +2438,9 @@
 
     if-nez v0, :cond_3
 
-    iput-object p1, p0, Lb/o$a;->bFg:Ljava/lang/String;
+    iput-object p1, p0, Lb/o$a;->bFb:Ljava/lang/String;
 
-    iput-boolean p3, p0, Lb/o$a;->bEO:Z
+    iput-boolean p3, p0, Lb/o$a;->bEJ:Z
 
     invoke-virtual {p2}, Ljava/lang/String;->isEmpty()Z
 
@@ -2475,7 +2475,7 @@
 
     move-result-object p1
 
-    sget-object p3, Lb/o;->bFc:Ljava/util/regex/Pattern;
+    sget-object p3, Lb/o;->bEX: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;->bEL:Ljava/lang/String;
+    iput-object p2, p0, Lb/o$a;->bEG: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;->bFv:Ljava/util/Set;
+    iput-object p1, p0, Lb/o$a;->bFq:Ljava/util/Set;
 
     return-void
 
@@ -2602,7 +2602,7 @@
 
     if-eqz v5, :cond_0
 
-    iput-object v5, p0, Lb/o$a;->brE:Lokhttp3/MediaType;
+    iput-object v5, p0, Lb/o$a;->brz:Lokhttp3/MediaType;
 
     goto :goto_1
 
@@ -2641,7 +2641,7 @@
     throw p1
 
     :cond_3
-    invoke-virtual {v0}, Lokhttp3/Headers$a;->Fm()Lokhttp3/Headers;
+    invoke-virtual {v0}, Lokhttp3/Headers$a;->Fk()Lokhttp3/Headers;
 
     move-result-object p1
 
diff --git a/com.discord/smali/b/o.smali b/com.discord/smali/b/o.smali
index 2f7ce49f86..541fcfcf4b 100644
--- a/com.discord/smali/b/o.smali
+++ b/com.discord/smali/b/o.smali
@@ -23,21 +23,21 @@
 
 
 # static fields
-.field static final bFc:Ljava/util/regex/Pattern;
+.field static final bEX:Ljava/util/regex/Pattern;
 
-.field static final bFd:Ljava/util/regex/Pattern;
+.field static final bEY:Ljava/util/regex/Pattern;
 
 
 # instance fields
-.field private final bEK:Lokhttp3/s;
+.field private final bEF:Lokhttp3/s;
 
-.field private final bEL:Ljava/lang/String;
+.field private final bEG:Ljava/lang/String;
 
-.field private final bEO:Z
+.field private final bEJ:Z
 
-.field final bEV:Lokhttp3/e$a;
+.field final bEQ:Lokhttp3/e$a;
 
-.field final bFe:Lb/c;
+.field final bEZ:Lb/c;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lb/c<",
@@ -46,7 +46,7 @@
     .end annotation
 .end field
 
-.field final bFf:Lb/e;
+.field final bFa:Lb/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lb/e<",
@@ -56,13 +56,13 @@
     .end annotation
 .end field
 
-.field private final bFg:Ljava/lang/String;
+.field private final bFb:Ljava/lang/String;
 
-.field private final bFh:Z
+.field private final bFc:Z
 
-.field private final bFi:Z
+.field private final bFd:Z
 
-.field private final bFj:[Lb/j;
+.field private final bFe:[Lb/j;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "[",
@@ -72,9 +72,9 @@
     .end annotation
 .end field
 
-.field private final brE:Lokhttp3/MediaType;
+.field private final brC:Lokhttp3/Headers;
 
-.field private final brH:Lokhttp3/Headers;
+.field private final brz:Lokhttp3/MediaType;
 
 
 # direct methods
@@ -87,7 +87,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lb/o;->bFc:Ljava/util/regex/Pattern;
+    sput-object v0, Lb/o;->bEX: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;->bFd:Ljava/util/regex/Pattern;
+    sput-object v0, Lb/o;->bEY: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;->bFk:Lb/n;
+    iget-object v0, p1, Lb/o$a;->bFf:Lb/n;
 
-    iget-object v0, v0, Lb/n;->bEV:Lokhttp3/e$a;
+    iget-object v0, v0, Lb/n;->bEQ:Lokhttp3/e$a;
 
-    iput-object v0, p0, Lb/o;->bEV:Lokhttp3/e$a;
+    iput-object v0, p0, Lb/o;->bEQ:Lokhttp3/e$a;
 
-    iget-object v0, p1, Lb/o$a;->bFe:Lb/c;
+    iget-object v0, p1, Lb/o$a;->bEZ:Lb/c;
 
-    iput-object v0, p0, Lb/o;->bFe:Lb/c;
+    iput-object v0, p0, Lb/o;->bEZ:Lb/c;
 
-    iget-object v0, p1, Lb/o$a;->bFk:Lb/n;
+    iget-object v0, p1, Lb/o$a;->bFf:Lb/n;
 
-    iget-object v0, v0, Lb/n;->bEK:Lokhttp3/s;
+    iget-object v0, v0, Lb/n;->bEF:Lokhttp3/s;
 
-    iput-object v0, p0, Lb/o;->bEK:Lokhttp3/s;
+    iput-object v0, p0, Lb/o;->bEF:Lokhttp3/s;
 
-    iget-object v0, p1, Lb/o$a;->bFf:Lb/e;
+    iget-object v0, p1, Lb/o$a;->bFa:Lb/e;
 
-    iput-object v0, p0, Lb/o;->bFf:Lb/e;
+    iput-object v0, p0, Lb/o;->bFa:Lb/e;
 
-    iget-object v0, p1, Lb/o$a;->bFg:Ljava/lang/String;
+    iget-object v0, p1, Lb/o$a;->bFb:Ljava/lang/String;
 
-    iput-object v0, p0, Lb/o;->bFg:Ljava/lang/String;
+    iput-object v0, p0, Lb/o;->bFb:Ljava/lang/String;
 
-    iget-object v0, p1, Lb/o$a;->bEL:Ljava/lang/String;
+    iget-object v0, p1, Lb/o$a;->bEG:Ljava/lang/String;
 
-    iput-object v0, p0, Lb/o;->bEL:Ljava/lang/String;
+    iput-object v0, p0, Lb/o;->bEG:Ljava/lang/String;
 
-    iget-object v0, p1, Lb/o$a;->brH:Lokhttp3/Headers;
+    iget-object v0, p1, Lb/o$a;->brC:Lokhttp3/Headers;
 
-    iput-object v0, p0, Lb/o;->brH:Lokhttp3/Headers;
+    iput-object v0, p0, Lb/o;->brC:Lokhttp3/Headers;
 
-    iget-object v0, p1, Lb/o$a;->brE:Lokhttp3/MediaType;
+    iget-object v0, p1, Lb/o$a;->brz:Lokhttp3/MediaType;
 
-    iput-object v0, p0, Lb/o;->brE:Lokhttp3/MediaType;
+    iput-object v0, p0, Lb/o;->brz:Lokhttp3/MediaType;
 
-    iget-boolean v0, p1, Lb/o$a;->bEO:Z
+    iget-boolean v0, p1, Lb/o$a;->bEJ:Z
 
-    iput-boolean v0, p0, Lb/o;->bEO:Z
+    iput-boolean v0, p0, Lb/o;->bEJ:Z
 
-    iget-boolean v0, p1, Lb/o$a;->bFh:Z
+    iget-boolean v0, p1, Lb/o$a;->bFc:Z
 
-    iput-boolean v0, p0, Lb/o;->bFh:Z
+    iput-boolean v0, p0, Lb/o;->bFc:Z
 
-    iget-boolean v0, p1, Lb/o$a;->bFi:Z
+    iget-boolean v0, p1, Lb/o$a;->bFd:Z
 
-    iput-boolean v0, p0, Lb/o;->bFi:Z
+    iput-boolean v0, p0, Lb/o;->bFd:Z
 
-    iget-object p1, p1, Lb/o$a;->bFj:[Lb/j;
+    iget-object p1, p1, Lb/o$a;->bFe:[Lb/j;
 
-    iput-object p1, p0, Lb/o;->bFj:[Lb/j;
+    iput-object p1, p0, Lb/o;->bFe:[Lb/j;
 
     return-void
 .end method
@@ -265,7 +265,7 @@
         }
     .end annotation
 
-    sget-object v0, Lb/o;->bFc:Ljava/util/regex/Pattern;
+    sget-object v0, Lb/o;->bEX: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;->bFg:Ljava/lang/String;
+    iget-object v1, p0, Lb/o;->bFb:Ljava/lang/String;
 
-    iget-object v2, p0, Lb/o;->bEK:Lokhttp3/s;
+    iget-object v2, p0, Lb/o;->bEF:Lokhttp3/s;
 
-    iget-object v3, p0, Lb/o;->bEL:Ljava/lang/String;
+    iget-object v3, p0, Lb/o;->bEG:Ljava/lang/String;
 
-    iget-object v4, p0, Lb/o;->brH:Lokhttp3/Headers;
+    iget-object v4, p0, Lb/o;->brC:Lokhttp3/Headers;
 
-    iget-object v5, p0, Lb/o;->brE:Lokhttp3/MediaType;
+    iget-object v5, p0, Lb/o;->brz:Lokhttp3/MediaType;
 
-    iget-boolean v6, p0, Lb/o;->bEO:Z
+    iget-boolean v6, p0, Lb/o;->bEJ:Z
 
-    iget-boolean v7, p0, Lb/o;->bFh:Z
+    iget-boolean v7, p0, Lb/o;->bFc:Z
 
-    iget-boolean v8, p0, Lb/o;->bFi:Z
+    iget-boolean v8, p0, Lb/o;->bFd: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;->bFj:[Lb/j;
+    iget-object v0, p0, Lb/o;->bFe:[Lb/j;
 
     const/4 v1, 0x0
 
@@ -364,7 +364,7 @@
     goto :goto_1
 
     :cond_1
-    invoke-virtual {v9}, Lb/l;->FN()Lokhttp3/w;
+    invoke-virtual {v9}, Lb/l;->FL()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 a4bf24266c..7c739e97c4 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;->aTA:[Ljava/lang/reflect/Type;
+    sget-object v0, Lb/p;->aTw:[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 77281850da..80a0d2c126 100644
--- a/com.discord/smali/b/p.smali
+++ b/com.discord/smali/b/p.smali
@@ -14,7 +14,7 @@
 
 
 # static fields
-.field static final aTA:[Ljava/lang/reflect/Type;
+.field static final aTw:[Ljava/lang/reflect/Type;
 
 
 # direct methods
@@ -25,7 +25,7 @@
 
     new-array v0, v0, [Ljava/lang/reflect/Type;
 
-    sput-object v0, Lb/p;->aTA:[Ljava/lang/reflect/Type;
+    sput-object v0, Lb/p;->aTw:[Ljava/lang/reflect/Type;
 
     return-void
 .end method
@@ -581,7 +581,7 @@
 
     aput-object p0, p2, v1
 
-    sget-object p0, Lb/p;->aTA:[Ljava/lang/reflect/Type;
+    sget-object p0, Lb/p;->aTw:[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;->FQ()Lokio/d;
+    invoke-virtual {p0}, Lokhttp3/x;->FO()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 c0e6438a1a..42fd918851 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 dc3e3841ca..11aeb8be0f 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;->bgy:Lkotlin/Unit;
+    sget-object v7, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     move v11, v6
 
@@ -924,7 +924,7 @@
     goto/16 :goto_8
 
     :cond_b
-    sget-object v2, Lkotlin/Unit;->bgy:Lkotlin/Unit;
+    sget-object v2, Lkotlin/Unit;->bgt: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 3fca56f01c..654f3108b4 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 aYc:Lcom/a/a/a/a;
+.field public static aXY:Lcom/a/a/a/a;
 
 
 # instance fields
@@ -97,13 +97,13 @@
 
     if-nez v2, :cond_2
 
-    invoke-static {}, Lcom/a/a/a/a$a;->Bn()Lcom/a/a/a/a;
+    invoke-static {}, Lcom/a/a/a/a$a;->Bl()Lcom/a/a/a/a;
 
     move-result-object v2
 
     if-eqz v2, :cond_2
 
-    invoke-static {}, Lcom/a/a/a/a$a;->Bn()Lcom/a/a/a/a;
+    invoke-static {}, Lcom/a/a/a/a$a;->Bl()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;->Bn()Lcom/a/a/a/a;
+    invoke-static {}, Lcom/a/a/a/a$a;->Bl()Lcom/a/a/a/a;
 
     move-result-object v2
 
     if-eqz v2, :cond_2
 
-    invoke-static {}, Lcom/a/a/a/a$a;->Bn()Lcom/a/a/a/a;
+    invoke-static {}, Lcom/a/a/a/a$a;->Bl()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;->Bn()Lcom/a/a/a/a;
+    invoke-static {}, Lcom/a/a/a/a$a;->Bl()Lcom/a/a/a/a;
 
     move-result-object v2
 
     if-eqz v2, :cond_2
 
-    invoke-static {}, Lcom/a/a/a/a$a;->Bn()Lcom/a/a/a/a;
+    invoke-static {}, Lcom/a/a/a/a$a;->Bl()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;->Bn()Lcom/a/a/a/a;
+    invoke-static {}, Lcom/a/a/a/a$a;->Bl()Lcom/a/a/a/a;
 
     move-result-object v2
 
     if-eqz v2, :cond_2
 
-    invoke-static {}, Lcom/a/a/a/a$a;->Bn()Lcom/a/a/a/a;
+    invoke-static {}, Lcom/a/a/a/a$a;->Bl()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;->Bn()Lcom/a/a/a/a;
+    invoke-static {}, Lcom/a/a/a/a$a;->Bl()Lcom/a/a/a/a;
 
     move-result-object v2
 
     if-eqz v2, :cond_2
 
-    invoke-static {}, Lcom/a/a/a/a$a;->Bn()Lcom/a/a/a/a;
+    invoke-static {}, Lcom/a/a/a/a$a;->Bl()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;->Bn()Lcom/a/a/a/a;
+    invoke-static {}, Lcom/a/a/a/a$a;->Bl()Lcom/a/a/a/a;
 
     move-result-object v2
 
     if-eqz v2, :cond_2
 
-    invoke-static {}, Lcom/a/a/a/a$a;->Bn()Lcom/a/a/a/a;
+    invoke-static {}, Lcom/a/a/a/a$a;->Bl()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;->Bn()Lcom/a/a/a/a;
+    invoke-static {}, Lcom/a/a/a/a$a;->Bl()Lcom/a/a/a/a;
 
     move-result-object v2
 
     if-eqz v2, :cond_2
 
-    invoke-static {}, Lcom/a/a/a/a$a;->Bn()Lcom/a/a/a/a;
+    invoke-static {}, Lcom/a/a/a/a$a;->Bl()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;->Bn()Lcom/a/a/a/a;
+    invoke-static {}, Lcom/a/a/a/a$a;->Bl()Lcom/a/a/a/a;
 
     move-result-object v2
 
     if-eqz v2, :cond_2
 
-    invoke-static {}, Lcom/a/a/a/a$a;->Bn()Lcom/a/a/a/a;
+    invoke-static {}, Lcom/a/a/a/a$a;->Bl()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 918b4650ff..29611b7182 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 Bn()Lcom/a/a/a/a;
+.method public static Bl()Lcom/a/a/a/a;
     .locals 1
 
-    sget-object v0, Lcom/a/a/a/a$a$a;->aYc:Lcom/a/a/a/a;
+    sget-object v0, Lcom/a/a/a/a$a$a;->aXY: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 98cc67ba63..b4ea0b37fc 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 aYd:Lcom/a/a/a/b;
+.field public static aXZ:Lcom/a/a/a/b;
 
 
 # instance fields
@@ -91,13 +91,13 @@
 
     if-nez v2, :cond_1
 
-    invoke-static {}, Lcom/a/a/a/b$a;->Bo()Lcom/a/a/a/b;
+    invoke-static {}, Lcom/a/a/a/b$a;->Bm()Lcom/a/a/a/b;
 
     move-result-object v2
 
     if-eqz v2, :cond_1
 
-    invoke-static {}, Lcom/a/a/a/b$a;->Bo()Lcom/a/a/a/b;
+    invoke-static {}, Lcom/a/a/a/b$a;->Bm()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;->Bo()Lcom/a/a/a/b;
+    invoke-static {}, Lcom/a/a/a/b$a;->Bm()Lcom/a/a/a/b;
 
     move-result-object v4
 
     if-eqz v4, :cond_1
 
-    invoke-static {}, Lcom/a/a/a/b$a;->Bo()Lcom/a/a/a/b;
+    invoke-static {}, Lcom/a/a/a/b$a;->Bm()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;->Bo()Lcom/a/a/a/b;
+    invoke-static {}, Lcom/a/a/a/b$a;->Bm()Lcom/a/a/a/b;
 
     move-result-object v4
 
     if-eqz v4, :cond_1
 
-    invoke-static {}, Lcom/a/a/a/b$a;->Bo()Lcom/a/a/a/b;
+    invoke-static {}, Lcom/a/a/a/b$a;->Bm()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;->Bo()Lcom/a/a/a/b;
+    invoke-static {}, Lcom/a/a/a/b$a;->Bm()Lcom/a/a/a/b;
 
     move-result-object v4
 
     if-eqz v4, :cond_1
 
-    invoke-static {}, Lcom/a/a/a/b$a;->Bo()Lcom/a/a/a/b;
+    invoke-static {}, Lcom/a/a/a/b$a;->Bm()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;->Bo()Lcom/a/a/a/b;
+    invoke-static {}, Lcom/a/a/a/b$a;->Bm()Lcom/a/a/a/b;
 
     move-result-object v4
 
     if-eqz v4, :cond_1
 
-    invoke-static {}, Lcom/a/a/a/b$a;->Bo()Lcom/a/a/a/b;
+    invoke-static {}, Lcom/a/a/a/b$a;->Bm()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;->Bo()Lcom/a/a/a/b;
+    invoke-static {}, Lcom/a/a/a/b$a;->Bm()Lcom/a/a/a/b;
 
     move-result-object v2
 
     if-eqz v2, :cond_0
 
-    invoke-static {}, Lcom/a/a/a/b$a;->Bo()Lcom/a/a/a/b;
+    invoke-static {}, Lcom/a/a/a/b$a;->Bm()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;->Bo()Lcom/a/a/a/b;
+    invoke-static {}, Lcom/a/a/a/b$a;->Bm()Lcom/a/a/a/b;
 
     move-result-object v4
 
     if-eqz v4, :cond_1
 
-    invoke-static {}, Lcom/a/a/a/b$a;->Bo()Lcom/a/a/a/b;
+    invoke-static {}, Lcom/a/a/a/b$a;->Bm()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;->Bo()Lcom/a/a/a/b;
+    invoke-static {}, Lcom/a/a/a/b$a;->Bm()Lcom/a/a/a/b;
 
     move-result-object v4
 
     if-eqz v4, :cond_1
 
-    invoke-static {}, Lcom/a/a/a/b$a;->Bo()Lcom/a/a/a/b;
+    invoke-static {}, Lcom/a/a/a/b$a;->Bm()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;->Bo()Lcom/a/a/a/b;
+    invoke-static {}, Lcom/a/a/a/b$a;->Bm()Lcom/a/a/a/b;
 
     move-result-object v4
 
     if-eqz v4, :cond_1
 
-    invoke-static {}, Lcom/a/a/a/b$a;->Bo()Lcom/a/a/a/b;
+    invoke-static {}, Lcom/a/a/a/b$a;->Bm()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;->Bo()Lcom/a/a/a/b;
+    invoke-static {}, Lcom/a/a/a/b$a;->Bm()Lcom/a/a/a/b;
 
     move-result-object v4
 
     if-eqz v4, :cond_1
 
-    invoke-static {}, Lcom/a/a/a/b$a;->Bo()Lcom/a/a/a/b;
+    invoke-static {}, Lcom/a/a/a/b$a;->Bm()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 46ff8ec24c..94fc9900e4 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 Bo()Lcom/a/a/a/b;
+.method public static Bm()Lcom/a/a/a/b;
     .locals 1
 
-    sget-object v0, Lcom/a/a/a/b$a$a;->aYd:Lcom/a/a/a/b;
+    sget-object v0, Lcom/a/a/a/b$a$a;->aXZ: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 e10afbecdf..8aed83313d 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;->dn:Z
+    iget-boolean v1, v0, Lcom/adjust/sdk/u;->do: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 c6517a223a..a25df5c807 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;->dn:Z
+    iget-boolean v1, v0, Lcom/adjust/sdk/u;->do: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 7c63b89aca..5bfb2d6af1 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;->dn:Z
+    iget-boolean v1, v0, Lcom/adjust/sdk/av;->do: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 a8a12fa913..81eac8bc01 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;->dn:Z
+    iget-boolean v1, v0, Lcom/adjust/sdk/av;->do: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 5c3f06be8f..741d18f058 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;->cd:Ljava/lang/String;
+    iget-object v0, v0, Lcom/adjust/sdk/t;->ce:Ljava/lang/String;
 
     if-nez v0, :cond_5
 
@@ -804,12 +804,6 @@
 
     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
@@ -820,6 +814,12 @@
 
     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;->cZ:Ljava/lang/String;
+    iput-object p5, v0, Lcom/adjust/sdk/am;->da:Ljava/lang/String;
 
-    iput-wide p1, v0, Lcom/adjust/sdk/am;->dc:J
+    iput-wide p1, v0, Lcom/adjust/sdk/am;->dd: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;->dn:Z
+    iget-boolean v1, p1, Lcom/adjust/sdk/av;->do: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;->dn:Z
+    iget-boolean v1, p1, Lcom/adjust/sdk/av;->do:Z
 
     const/4 v2, 0x0
 
@@ -1335,7 +1335,7 @@
     goto :goto_0
 
     :cond_2
-    iget-boolean v1, p1, Lcom/adjust/sdk/av;->dn:Z
+    iget-boolean v1, p1, Lcom/adjust/sdk/av;->do:Z
 
     if-nez v1, :cond_3
 
@@ -1530,7 +1530,7 @@
 
     move-result-object v4
 
-    iget-object v5, v2, Lcom/adjust/sdk/am;->cV:Lcom/adjust/sdk/am$a;
+    iget-object v5, v2, Lcom/adjust/sdk/am;->cW: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;->bQ:Landroid/net/Uri;
+    iget-object p1, p1, Lcom/adjust/sdk/p;->bR: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;->dn:Z
+    iget-boolean v1, p1, Lcom/adjust/sdk/u;->do:Z
 
     const/4 v2, 0x0
 
@@ -1821,7 +1821,7 @@
     return-void
 
     :cond_0
-    iget-boolean v1, p1, Lcom/adjust/sdk/u;->dn:Z
+    iget-boolean v1, p1, Lcom/adjust/sdk/u;->do:Z
 
     if-nez v1, :cond_1
 
@@ -2414,13 +2414,13 @@
 
     long-to-double v4, v4
 
-    sget-object v8, Lcom/adjust/sdk/az;->dz:Ljava/text/DecimalFormat;
+    sget-object v8, Lcom/adjust/sdk/az;->dA: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;->dz:Ljava/text/DecimalFormat;
+    sget-object v1, Lcom/adjust/sdk/az;->dA: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;->dz:Ljava/text/DecimalFormat;
+    sget-object v4, Lcom/adjust/sdk/az;->dA: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;->dw:Z
+    iget-boolean v0, p0, Lcom/adjust/sdk/ax;->dx: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;->ds:Lcom/adjust/sdk/s;
+    iget-object v0, p0, Lcom/adjust/sdk/ax;->dt: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;->dv:J
+    iget-wide v7, p0, Lcom/adjust/sdk/ax;->dw:J
 
     sget-object v9, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
 
-    iget-object v3, v0, Lcom/adjust/sdk/s;->bX:Ljava/util/concurrent/ScheduledThreadPoolExecutor;
+    iget-object v3, v0, Lcom/adjust/sdk/s;->bY: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;->dt:Ljava/util/concurrent/ScheduledFuture;
+    iput-object v0, p0, Lcom/adjust/sdk/ax;->du:Ljava/util/concurrent/ScheduledFuture;
 
-    iput-boolean v2, p0, Lcom/adjust/sdk/ax;->dw:Z
+    iput-boolean v2, p0, Lcom/adjust/sdk/ax;->dx: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;->dw:Z
+    iget-boolean v1, v0, Lcom/adjust/sdk/ax;->dx:Z
 
     const/4 v2, 0x1
 
@@ -3146,7 +3146,7 @@
     return-void
 
     :cond_0
-    iget-object v1, v0, Lcom/adjust/sdk/ax;->dt:Ljava/util/concurrent/ScheduledFuture;
+    iget-object v1, v0, Lcom/adjust/sdk/ax;->du: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;->dt:Ljava/util/concurrent/ScheduledFuture;
+    iget-object v1, v0, Lcom/adjust/sdk/ax;->du:Ljava/util/concurrent/ScheduledFuture;
 
     invoke-interface {v1, v3}, Ljava/util/concurrent/ScheduledFuture;->cancel(Z)Z
 
-    sget-object v1, Lcom/adjust/sdk/az;->dz:Ljava/text/DecimalFormat;
+    sget-object v1, Lcom/adjust/sdk/az;->dA: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;->dw:Z
+    iput-boolean v2, v0, Lcom/adjust/sdk/ax;->dx:Z
 
     return-void
 .end method
@@ -3288,7 +3288,7 @@
 
     check-cast p1, Lcom/adjust/sdk/at;
 
-    iget-boolean v0, p1, Lcom/adjust/sdk/at;->dr:Z
+    iget-boolean v0, p1, Lcom/adjust/sdk/at;->ds: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 4e5888925b..2d00530221 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 cI:Lcom/adjust/sdk/ac;
+.field final synthetic cJ: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;->cI:Lcom/adjust/sdk/ac;
+    iput-object p1, p0, Lcom/adjust/sdk/ac$1;->cJ: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;->cI:Lcom/adjust/sdk/ac;
+    iget-object v0, p0, Lcom/adjust/sdk/ac$1;->cJ: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 4aea75b15f..3032279a8e 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 cD:I
+.field private cE:I
 
-.field private cE:Z
-
-.field private cF:Ljava/lang/Object;
+.field private cF:Z
 
 .field private cG:Ljava/lang/Object;
 
-.field private cH:Lcom/adjust/sdk/ay;
+.field private cH:Ljava/lang/Object;
+
+.field private cI: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;->cD:I
+    iput v0, p0, Lcom/adjust/sdk/ac;->cE: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;->cG:Ljava/lang/Object;
+    iput-object p1, p0, Lcom/adjust/sdk/ac;->cH:Ljava/lang/Object;
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lcom/adjust/sdk/ac;->cE:Z
+    iput-boolean p1, p0, Lcom/adjust/sdk/ac;->cF: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;->cH:Lcom/adjust/sdk/ay;
+    iput-object p1, p0, Lcom/adjust/sdk/ac;->cI: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;->cG:Ljava/lang/Object;
+    iget-object p1, p0, Lcom/adjust/sdk/ac;->cH: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;->cE:Z
+    iput-boolean v3, p0, Lcom/adjust/sdk/ac;->cF: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;->cF:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/adjust/sdk/ac;->cG: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;->cF:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/adjust/sdk/ac;->cG: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;->cG:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/adjust/sdk/ac;->cH:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    iget-boolean v1, p0, Lcom/adjust/sdk/ac;->cE:Z
+    iget-boolean v1, p0, Lcom/adjust/sdk/ac;->cF:Z
 
     const/4 v2, 0x0
 
@@ -515,7 +515,7 @@
     return-void
 
     :cond_1
-    iget-object v0, p0, Lcom/adjust/sdk/ac;->cH:Lcom/adjust/sdk/ay;
+    iget-object v0, p0, Lcom/adjust/sdk/ac;->cI: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;->cH:Lcom/adjust/sdk/ay;
+    iget-object v0, p0, Lcom/adjust/sdk/ac;->cI:Lcom/adjust/sdk/ay;
 
-    iget v1, p0, Lcom/adjust/sdk/ac;->cD:I
+    iget v1, p0, Lcom/adjust/sdk/ac;->cE:I
 
     int-to-long v1, v1
 
@@ -568,7 +568,7 @@
 .method private ai()V
     .locals 5
 
-    iget-object v0, p0, Lcom/adjust/sdk/ac;->cF:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/adjust/sdk/ac;->cG: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;->cF:Ljava/lang/Object;
+    iput-object v1, p0, Lcom/adjust/sdk/ac;->cG: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;->cG:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/adjust/sdk/ac;->cH:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    iget-boolean v1, p0, Lcom/adjust/sdk/ac;->cE:Z
+    iget-boolean v1, p0, Lcom/adjust/sdk/ac;->cF:Z
 
     if-eqz v1, :cond_0
 
@@ -880,7 +880,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/adjust/sdk/ac;->cF:Ljava/lang/Object;
+    iput-object v0, p0, Lcom/adjust/sdk/ac;->cG: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 a7595f0f0e..b85ffdb8e5 100644
--- a/com.discord/smali/com/adjust/sdk/ad.smali
+++ b/com.discord/smali/com/adjust/sdk/ad.smali
@@ -14,8 +14,6 @@
 
 
 # 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;
@@ -28,7 +26,9 @@
 
 .field public static final enum cP:Lcom/adjust/sdk/ad;
 
-.field private static final synthetic cQ:[Lcom/adjust/sdk/ad;
+.field public static final enum cQ:Lcom/adjust/sdk/ad;
+
+.field private static final synthetic cR:[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;->cJ:Lcom/adjust/sdk/ad;
+    sput-object v0, Lcom/adjust/sdk/ad;->cK: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;->cK:Lcom/adjust/sdk/ad;
+    sput-object v0, Lcom/adjust/sdk/ad;->cL: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;->cL:Lcom/adjust/sdk/ad;
+    sput-object v0, Lcom/adjust/sdk/ad;->cM: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;->cM:Lcom/adjust/sdk/ad;
+    sput-object v0, Lcom/adjust/sdk/ad;->cN: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;->cN:Lcom/adjust/sdk/ad;
+    sput-object v0, Lcom/adjust/sdk/ad;->cO: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;->cO:Lcom/adjust/sdk/ad;
+    sput-object v0, Lcom/adjust/sdk/ad;->cP: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;->cP:Lcom/adjust/sdk/ad;
+    sput-object v0, Lcom/adjust/sdk/ad;->cQ:Lcom/adjust/sdk/ad;
 
     new-array v0, v8, [Lcom/adjust/sdk/ad;
 
-    sget-object v8, Lcom/adjust/sdk/ad;->cJ:Lcom/adjust/sdk/ad;
+    sget-object v8, Lcom/adjust/sdk/ad;->cK:Lcom/adjust/sdk/ad;
 
     aput-object v8, v0, v1
 
-    sget-object v1, Lcom/adjust/sdk/ad;->cK:Lcom/adjust/sdk/ad;
+    sget-object v1, Lcom/adjust/sdk/ad;->cL:Lcom/adjust/sdk/ad;
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/adjust/sdk/ad;->cL:Lcom/adjust/sdk/ad;
+    sget-object v1, Lcom/adjust/sdk/ad;->cM:Lcom/adjust/sdk/ad;
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/adjust/sdk/ad;->cM:Lcom/adjust/sdk/ad;
+    sget-object v1, Lcom/adjust/sdk/ad;->cN:Lcom/adjust/sdk/ad;
 
     aput-object v1, v0, v4
 
-    sget-object v1, Lcom/adjust/sdk/ad;->cN:Lcom/adjust/sdk/ad;
+    sget-object v1, Lcom/adjust/sdk/ad;->cO:Lcom/adjust/sdk/ad;
 
     aput-object v1, v0, v5
 
-    sget-object v1, Lcom/adjust/sdk/ad;->cO:Lcom/adjust/sdk/ad;
+    sget-object v1, Lcom/adjust/sdk/ad;->cP:Lcom/adjust/sdk/ad;
 
     aput-object v1, v0, v6
 
-    sget-object v1, Lcom/adjust/sdk/ad;->cP:Lcom/adjust/sdk/ad;
+    sget-object v1, Lcom/adjust/sdk/ad;->cQ:Lcom/adjust/sdk/ad;
 
     aput-object v1, v0, v7
 
-    sput-object v0, Lcom/adjust/sdk/ad;->cQ:[Lcom/adjust/sdk/ad;
+    sput-object v0, Lcom/adjust/sdk/ad;->cR:[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;->cQ:[Lcom/adjust/sdk/ad;
+    sget-object v0, Lcom/adjust/sdk/ad;->cR:[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 6a83aae8af..773b933d28 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 cU:Ljava/lang/String; = "Error formating log message: %s, with params: %s"
+.field private static cV:Ljava/lang/String; = "Error formating log message: %s, with params: %s"
 
 
 # instance fields
-.field private cR:Lcom/adjust/sdk/ad;
-
-.field private cS:Z
+.field private cS:Lcom/adjust/sdk/ad;
 
 .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
 
-    iput-boolean v0, p0, Lcom/adjust/sdk/ae;->cS:Z
+    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-boolean v1, p0, Lcom/adjust/sdk/ae;->cT:Z
+    iget-boolean v1, p0, Lcom/adjust/sdk/ae;->cU: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;->cS:Z
+    iget-boolean v0, p0, Lcom/adjust/sdk/ae;->cT:Z
 
     if-eqz v0, :cond_0
 
     return-void
 
     :cond_0
-    iput-object p1, p0, Lcom/adjust/sdk/ae;->cR:Lcom/adjust/sdk/ad;
+    iput-object p1, p0, Lcom/adjust/sdk/ae;->cS:Lcom/adjust/sdk/ad;
 
-    iput-boolean p2, p0, Lcom/adjust/sdk/ae;->cT:Z
+    iput-boolean p2, p0, Lcom/adjust/sdk/ae;->cU:Z
 
     return-void
 .end method
@@ -69,14 +69,14 @@
 
     const-string v0, "Adjust"
 
-    iget-boolean v1, p0, Lcom/adjust/sdk/ae;->cT:Z
+    iget-boolean v1, p0, Lcom/adjust/sdk/ae;->cU:Z
 
     if-eqz v1, :cond_0
 
     return-void
 
     :cond_0
-    iget-object v1, p0, Lcom/adjust/sdk/ae;->cR:Lcom/adjust/sdk/ad;
+    iget-object v1, p0, Lcom/adjust/sdk/ae;->cS: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;->cU:Ljava/lang/String;
+    sget-object v3, Lcom/adjust/sdk/ae;->cV: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;->cS:Z
+    iput-boolean v0, p0, Lcom/adjust/sdk/ae;->cT:Z
 
     return-void
 .end method
@@ -141,14 +141,14 @@
 
     const-string v0, "Adjust"
 
-    iget-boolean v1, p0, Lcom/adjust/sdk/ae;->cT:Z
+    iget-boolean v1, p0, Lcom/adjust/sdk/ae;->cU:Z
 
     if-eqz v1, :cond_0
 
     return-void
 
     :cond_0
-    iget-object v1, p0, Lcom/adjust/sdk/ae;->cR:Lcom/adjust/sdk/ad;
+    iget-object v1, p0, Lcom/adjust/sdk/ae;->cS: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;->cU:Ljava/lang/String;
+    sget-object v2, Lcom/adjust/sdk/ae;->cV:Ljava/lang/String;
 
     const/4 v3, 0x2
 
@@ -205,14 +205,14 @@
 
     const-string v0, "Adjust"
 
-    iget-boolean v1, p0, Lcom/adjust/sdk/ae;->cT:Z
+    iget-boolean v1, p0, Lcom/adjust/sdk/ae;->cU:Z
 
     if-eqz v1, :cond_0
 
     return-void
 
     :cond_0
-    iget-object v1, p0, Lcom/adjust/sdk/ae;->cR:Lcom/adjust/sdk/ad;
+    iget-object v1, p0, Lcom/adjust/sdk/ae;->cS: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;->cU:Ljava/lang/String;
+    sget-object v2, Lcom/adjust/sdk/ae;->cV:Ljava/lang/String;
 
     const/4 v3, 0x2
 
@@ -269,14 +269,14 @@
 
     const-string v0, "Adjust"
 
-    iget-boolean v1, p0, Lcom/adjust/sdk/ae;->cT:Z
+    iget-boolean v1, p0, Lcom/adjust/sdk/ae;->cU:Z
 
     if-eqz v1, :cond_0
 
     return-void
 
     :cond_0
-    iget-object v1, p0, Lcom/adjust/sdk/ae;->cR:Lcom/adjust/sdk/ad;
+    iget-object v1, p0, Lcom/adjust/sdk/ae;->cS: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;->cU:Ljava/lang/String;
+    sget-object v2, Lcom/adjust/sdk/ae;->cV:Ljava/lang/String;
 
     const/4 v3, 0x2
 
@@ -333,7 +333,7 @@
 
     const-string v0, "Adjust"
 
-    iget-object v1, p0, Lcom/adjust/sdk/ae;->cR:Lcom/adjust/sdk/ad;
+    iget-object v1, p0, Lcom/adjust/sdk/ae;->cS: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;->cU:Ljava/lang/String;
+    sget-object v2, Lcom/adjust/sdk/ae;->cV:Ljava/lang/String;
 
     const/4 v3, 0x2
 
@@ -390,14 +390,14 @@
 
     const-string v0, "Adjust"
 
-    iget-boolean v1, p0, Lcom/adjust/sdk/ae;->cT:Z
+    iget-boolean v1, p0, Lcom/adjust/sdk/ae;->cU:Z
 
     if-eqz v1, :cond_0
 
     return-void
 
     :cond_0
-    iget-object v1, p0, Lcom/adjust/sdk/ae;->cR:Lcom/adjust/sdk/ad;
+    iget-object v1, p0, Lcom/adjust/sdk/ae;->cS: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;->cU:Ljava/lang/String;
+    sget-object v2, Lcom/adjust/sdk/ae;->cV: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 6288b4fabe..c1afd79356 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 dd:Lcom/adjust/sdk/am;
+.field final synthetic de: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;->dd:Lcom/adjust/sdk/am;
+    iput-object p1, p0, Lcom/adjust/sdk/am$a;->de: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 d96e8a1704..94aecca87d 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 cV:Lcom/adjust/sdk/am$a;
+.field cW:Lcom/adjust/sdk/am$a;
 
-.field private cW:J
+.field private cX:J
 
-.field cX:Ljava/util/Map;
+.field cY:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -39,8 +39,6 @@
     .end annotation
 .end field
 
-.field cY:Ljava/lang/String;
-
 .field cZ:Ljava/lang/String;
 
 .field clickTimeInMilliseconds:J
@@ -49,7 +47,9 @@
 
 .field db:Ljava/lang/String;
 
-.field dc:J
+.field dc:Ljava/lang/String;
+
+.field dd: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;->dc:J
+    iput-wide v0, p0, Lcom/adjust/sdk/am;->dd: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;->cV:Lcom/adjust/sdk/am$a;
+    iput-object p1, p0, Lcom/adjust/sdk/am;->cW: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;->cW:J
+    iput-wide p5, p0, Lcom/adjust/sdk/am;->cX: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;->cj:Ljava/lang/String;
+    iget-object v0, v0, Lcom/adjust/sdk/t;->ck: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;->ck:Ljava/lang/String;
+    iget-object v0, v0, Lcom/adjust/sdk/t;->cl: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;->cl:Ljava/lang/String;
+    iget-object v0, v0, Lcom/adjust/sdk/t;->cm: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;->cm:Ljava/lang/String;
+    iget-object v0, v0, Lcom/adjust/sdk/t;->cn: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;->cn:Ljava/lang/String;
+    iget-object v0, v0, Lcom/adjust/sdk/t;->co: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;->co:Ljava/lang/String;
+    iget-object v0, v0, Lcom/adjust/sdk/t;->cp: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;->cp:Ljava/lang/String;
+    iget-object v0, v0, Lcom/adjust/sdk/t;->cq: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;->cq:Ljava/lang/String;
+    iget-object v0, v0, Lcom/adjust/sdk/t;->cr: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;->cr:Ljava/lang/String;
+    iget-object v0, v0, Lcom/adjust/sdk/t;->cs: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;->cs:Ljava/lang/String;
+    iget-object v0, v0, Lcom/adjust/sdk/t;->ct: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;->ct:Ljava/lang/String;
+    iget-object v0, v0, Lcom/adjust/sdk/t;->cu: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;->cu:Ljava/lang/String;
+    iget-object v0, v0, Lcom/adjust/sdk/t;->cv: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;->cv:Ljava/lang/String;
+    iget-object v0, v0, Lcom/adjust/sdk/t;->cw: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;->cw:Ljava/lang/String;
+    iget-object v0, v0, Lcom/adjust/sdk/t;->cx: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;->cx:Ljava/lang/String;
+    iget-object v0, v0, Lcom/adjust/sdk/t;->cy: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;->cy:Ljava/lang/String;
+    iget-object v0, v0, Lcom/adjust/sdk/t;->cz: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;->cz:Ljava/lang/String;
+    iget-object v0, v0, Lcom/adjust/sdk/t;->cA:Ljava/lang/String;
 
     const-string v1, "vm_isa"
 
@@ -476,7 +476,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/adjust/sdk/az;->dA:Ljava/text/SimpleDateFormat;
+    sget-object v0, Lcom/adjust/sdk/az;->dB: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;->ce:Ljava/lang/Boolean;
+    iget-object v0, v0, Lcom/adjust/sdk/t;->cf: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;->cd:Ljava/lang/String;
+    iget-object v0, v0, Lcom/adjust/sdk/t;->ce: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;->cd:Ljava/lang/String;
+    iget-object v0, v0, Lcom/adjust/sdk/t;->ce: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;->cg:Ljava/lang/String;
+    iget-object v0, v0, Lcom/adjust/sdk/t;->ch: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;->ch:Ljava/lang/String;
+    iget-object v0, v0, Lcom/adjust/sdk/t;->ci: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;->ci:Ljava/lang/String;
+    iget-object v0, v0, Lcom/adjust/sdk/t;->cj: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;->cV:Lcom/adjust/sdk/am$a;
+    iget-object v0, p0, Lcom/adjust/sdk/am;->cW: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;->cV:Lcom/adjust/sdk/am$a;
+    iget-object v0, p0, Lcom/adjust/sdk/am;->cW: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;->cV:Lcom/adjust/sdk/am$a;
+    iget-object v0, p0, Lcom/adjust/sdk/am;->cW: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;->cV:Lcom/adjust/sdk/am$a;
+    iget-object v0, p0, Lcom/adjust/sdk/am;->cW: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;->cV:Lcom/adjust/sdk/am$a;
+    iget-object v0, p0, Lcom/adjust/sdk/am;->cW: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;->cV:Lcom/adjust/sdk/am$a;
+    iget-object v0, p0, Lcom/adjust/sdk/am;->cW: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;->cV:Lcom/adjust/sdk/am$a;
+    iget-object v1, p0, Lcom/adjust/sdk/am;->cW: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;->cA:Ljava/lang/String;
+    iget-object v1, v1, Lcom/adjust/sdk/t;->cB: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;->cB:Ljava/lang/String;
+    iget-object v1, v1, Lcom/adjust/sdk/t;->cC:Ljava/lang/String;
 
     const-string v2, "updated_at"
 
@@ -1045,7 +1045,7 @@
         }
     .end annotation
 
-    iget-wide v0, p0, Lcom/adjust/sdk/am;->cW:J
+    iget-wide v0, p0, Lcom/adjust/sdk/am;->cX: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;->cC:Ljava/util/Map;
+    iget-object v0, v0, Lcom/adjust/sdk/t;->cD: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;->cC:Ljava/util/Map;
+    iget-object v0, v0, Lcom/adjust/sdk/t;->cD: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;->cY:Ljava/lang/String;
+    iget-object v1, p0, Lcom/adjust/sdk/am;->cZ: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;->cX:Ljava/util/Map;
+    iget-object v1, p0, Lcom/adjust/sdk/am;->cY: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;->cZ:Ljava/lang/String;
+    iget-object v1, p0, Lcom/adjust/sdk/am;->da: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;->da:Ljava/lang/String;
+    iget-object v1, p0, Lcom/adjust/sdk/am;->db: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;->db:Ljava/lang/String;
+    iget-object v1, p0, Lcom/adjust/sdk/am;->dc: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;->dc:J
+    iget-wide v1, p0, Lcom/adjust/sdk/am;->dd: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;->dc:J
+    iget-wide v1, p0, Lcom/adjust/sdk/am;->dd: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 3a7c8000bd..2efa5d35e7 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;->cX:Ljava/util/Map;
+    iput-object v7, v10, Lcom/adjust/sdk/am;->cY:Ljava/util/Map;
 
     iput-object v8, v10, Lcom/adjust/sdk/am;->ap:Lcom/adjust/sdk/AdjustAttribution;
 
-    iput-object v9, v10, Lcom/adjust/sdk/am;->cY:Ljava/lang/String;
+    iput-object v9, v10, Lcom/adjust/sdk/am;->cZ: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;->cZ:Ljava/lang/String;
+    iput-object v1, p3, Lcom/adjust/sdk/am;->da:Ljava/lang/String;
 
     iput-wide p1, p3, Lcom/adjust/sdk/am;->clickTimeInMilliseconds:J
 
-    iput-object p0, p3, Lcom/adjust/sdk/am;->da:Ljava/lang/String;
+    iput-object p0, p3, Lcom/adjust/sdk/am;->db: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 cb9b00594c..d2f3c8021e 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 dh:Lcom/adjust/sdk/ao;
+.field final synthetic di: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;->dh:Lcom/adjust/sdk/ao;
+    iput-object p1, p0, Lcom/adjust/sdk/ao$1;->di: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;->dh:Lcom/adjust/sdk/ao;
+    iget-object v1, p0, Lcom/adjust/sdk/ao$1;->di: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;->df:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iput-object v2, v1, Lcom/adjust/sdk/ao;->dg: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;->de:Ljava/util/List;
+    iput-object v4, v1, Lcom/adjust/sdk/ao;->df: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;->de:Ljava/util/List;
+    iput-object v0, v1, Lcom/adjust/sdk/ao;->df:Ljava/util/List;
 
     :goto_0
-    iget-object v0, v1, Lcom/adjust/sdk/ao;->de:Ljava/util/List;
+    iget-object v0, v1, Lcom/adjust/sdk/ao;->df: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;->de:Ljava/util/List;
+    iget-object v1, v1, Lcom/adjust/sdk/ao;->df: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;->de:Ljava/util/List;
+    iput-object v0, v1, Lcom/adjust/sdk/ao;->df: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 b52f96c07a..e682b91a04 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 dh:Lcom/adjust/sdk/ao;
+.field final synthetic di:Lcom/adjust/sdk/ao;
 
-.field final synthetic di:Lcom/adjust/sdk/c;
+.field final synthetic dj: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;->dh:Lcom/adjust/sdk/ao;
+    iput-object p1, p0, Lcom/adjust/sdk/ao$2;->di:Lcom/adjust/sdk/ao;
 
-    iput-object p2, p0, Lcom/adjust/sdk/ao$2;->di:Lcom/adjust/sdk/c;
+    iput-object p2, p0, Lcom/adjust/sdk/ao$2;->dj: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;->dh:Lcom/adjust/sdk/ao;
+    iget-object v0, p0, Lcom/adjust/sdk/ao$2;->di:Lcom/adjust/sdk/ao;
 
-    iget-object v1, p0, Lcom/adjust/sdk/ao$2;->di:Lcom/adjust/sdk/c;
+    iget-object v1, p0, Lcom/adjust/sdk/ao$2;->dj:Lcom/adjust/sdk/c;
 
-    iget-object v2, v0, Lcom/adjust/sdk/ao;->de:Ljava/util/List;
+    iget-object v2, v0, Lcom/adjust/sdk/ao;->df: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;->de:Ljava/util/List;
+    iget-object v4, v0, Lcom/adjust/sdk/ao;->df: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 d66967cb8a..5531e02f09 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 dh:Lcom/adjust/sdk/ao;
+.field final synthetic di: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;->dh:Lcom/adjust/sdk/ao;
+    iput-object p1, p0, Lcom/adjust/sdk/ao$3;->di: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;->dh:Lcom/adjust/sdk/ao;
+    iget-object v0, p0, Lcom/adjust/sdk/ao$3;->di: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 3efaf4fc06..4259b1d9be 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 dh:Lcom/adjust/sdk/ao;
+.field final synthetic di: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;->dh:Lcom/adjust/sdk/ao;
+    iput-object p1, p0, Lcom/adjust/sdk/ao$4;->di: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;->dh:Lcom/adjust/sdk/ao;
+    iget-object v0, p0, Lcom/adjust/sdk/ao$4;->di:Lcom/adjust/sdk/ao;
 
-    iget-object v1, v0, Lcom/adjust/sdk/ao;->de:Ljava/util/List;
+    iget-object v1, v0, Lcom/adjust/sdk/ao;->df: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;->df:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v1, v0, Lcom/adjust/sdk/ao;->dg: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 1b50f38b92..a9f2a90c01 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 dh:Lcom/adjust/sdk/ao;
+.field final synthetic di: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;->dh:Lcom/adjust/sdk/ao;
+    iput-object p1, p0, Lcom/adjust/sdk/ao$5;->di: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;->dh:Lcom/adjust/sdk/ao;
+    iget-object v0, p0, Lcom/adjust/sdk/ao$5;->di: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;->dh:Lcom/adjust/sdk/ao;
+    iget-object v0, p0, Lcom/adjust/sdk/ao$5;->di:Lcom/adjust/sdk/ao;
 
-    iget-object v0, v0, Lcom/adjust/sdk/ao;->df:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v0, v0, Lcom/adjust/sdk/ao;->dg: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;->dh:Lcom/adjust/sdk/ao;
+    iget-object v0, p0, Lcom/adjust/sdk/ao$5;->di: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 d8b4289d53..cc12c9e13a 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 dh:Lcom/adjust/sdk/ao;
+.field final synthetic di:Lcom/adjust/sdk/ao;
 
-.field final synthetic dj:Lcom/adjust/sdk/au;
+.field final synthetic dk: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;->dh:Lcom/adjust/sdk/ao;
+    iput-object p1, p0, Lcom/adjust/sdk/ao$6;->di:Lcom/adjust/sdk/ao;
 
-    iput-object p2, p0, Lcom/adjust/sdk/ao$6;->dj:Lcom/adjust/sdk/au;
+    iput-object p2, p0, Lcom/adjust/sdk/ao$6;->dk: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;->dh:Lcom/adjust/sdk/ao;
+    iget-object v0, p0, Lcom/adjust/sdk/ao$6;->di:Lcom/adjust/sdk/ao;
 
-    iget-object v1, p0, Lcom/adjust/sdk/ao$6;->dj:Lcom/adjust/sdk/au;
+    iget-object v1, p0, Lcom/adjust/sdk/ao$6;->dk: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;->de:Ljava/util/List;
+    iget-object v2, v0, Lcom/adjust/sdk/ao;->df: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 a397436eef..04616d7fe3 100644
--- a/com.discord/smali/com/adjust/sdk/ao.smali
+++ b/com.discord/smali/com/adjust/sdk/ao.smali
@@ -23,9 +23,11 @@
     .end annotation
 .end field
 
+.field private bP:Z
+
 .field context:Landroid/content/Context;
 
-.field de:Ljava/util/List;
+.field df:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -35,11 +37,9 @@
     .end annotation
 .end field
 
-.field df:Ljava/util/concurrent/atomic/AtomicBoolean;
+.field dg:Ljava/util/concurrent/atomic/AtomicBoolean;
 
-.field private dg:Lcom/adjust/sdk/q;
-
-.field private paused:Z
+.field private dh:Lcom/adjust/sdk/q;
 
 
 # direct methods
@@ -68,7 +68,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/adjust/sdk/ao;->dg:Lcom/adjust/sdk/q;
+    iput-object v0, p0, Lcom/adjust/sdk/ao;->dh: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;->paused:Z
+    iput-boolean v0, p0, Lcom/adjust/sdk/ao;->bP:Z
 
     return-void
 .end method
@@ -130,7 +130,7 @@
 
     move-result p2
 
-    iget-object v1, p0, Lcom/adjust/sdk/ao;->dg:Lcom/adjust/sdk/q;
+    iget-object v1, p0, Lcom/adjust/sdk/ao;->dh: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;->dz:Ljava/text/DecimalFormat;
+    sget-object v5, Lcom/adjust/sdk/az;->dA: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;->paused:Z
+    iput-boolean v0, p0, Lcom/adjust/sdk/ao;->bP:Z
 
     return-void
 .end method
@@ -272,7 +272,7 @@
 .method final am()V
     .locals 4
 
-    iget-object v0, p0, Lcom/adjust/sdk/ao;->de:Ljava/util/List;
+    iget-object v0, p0, Lcom/adjust/sdk/ao;->df: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;->paused:Z
+    iget-boolean v0, p0, Lcom/adjust/sdk/ao;->bP:Z
 
     const/4 v1, 0x0
 
@@ -300,7 +300,7 @@
     return-void
 
     :cond_1
-    iget-object v0, p0, Lcom/adjust/sdk/ao;->df:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v0, p0, Lcom/adjust/sdk/ao;->dg: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;->de:Ljava/util/List;
+    iget-object v0, p0, Lcom/adjust/sdk/ao;->df: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;->de:Ljava/util/List;
+    iget-object v3, p0, Lcom/adjust/sdk/ao;->df: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;->de:Ljava/util/List;
+    iget-object v0, p0, Lcom/adjust/sdk/ao;->df: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;->de:Ljava/util/List;
+    iget-object v2, p0, Lcom/adjust/sdk/ao;->df: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;->paused:Z
+    iput-boolean p1, p0, Lcom/adjust/sdk/ao;->bP: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 33c3173951..8540db2ffc 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;->bW:Ljava/util/List;
+    sget-object v1, Lcom/adjust/sdk/r;->bX: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;->bW:Ljava/util/List;
+    sget-object v1, Lcom/adjust/sdk/r;->bX: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 016d2774e1..2cd42bc107 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 di:Lcom/adjust/sdk/c;
+.field final synthetic dj:Lcom/adjust/sdk/c;
 
-.field final synthetic dl:I
+.field final synthetic dm:I
 
-.field final synthetic dm:Lcom/adjust/sdk/aq;
+.field final synthetic dn: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;->dm:Lcom/adjust/sdk/aq;
+    iput-object p1, p0, Lcom/adjust/sdk/aq$1;->dn:Lcom/adjust/sdk/aq;
 
-    iput-object p2, p0, Lcom/adjust/sdk/aq$1;->di:Lcom/adjust/sdk/c;
+    iput-object p2, p0, Lcom/adjust/sdk/aq$1;->dj:Lcom/adjust/sdk/c;
 
-    iput p3, p0, Lcom/adjust/sdk/aq$1;->dl:I
+    iput p3, p0, Lcom/adjust/sdk/aq$1;->dm: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;->dm:Lcom/adjust/sdk/aq;
+    iget-object v0, p0, Lcom/adjust/sdk/aq$1;->dn:Lcom/adjust/sdk/aq;
 
-    iget-object v1, p0, Lcom/adjust/sdk/aq$1;->di:Lcom/adjust/sdk/c;
+    iget-object v1, p0, Lcom/adjust/sdk/aq$1;->dj:Lcom/adjust/sdk/c;
 
-    iget v2, p0, Lcom/adjust/sdk/aq$1;->dl:I
+    iget v2, p0, Lcom/adjust/sdk/aq$1;->dm: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 accbb26c3f..a1c9909894 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 dk:Ljava/lang/ref/WeakReference;
+.field private dl: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;->dk:Ljava/lang/ref/WeakReference;
+    iget-object v0, p0, Lcom/adjust/sdk/aq;->dl: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;->dk:Ljava/lang/ref/WeakReference;
+    iget-object p2, p0, Lcom/adjust/sdk/aq;->dl: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;->dk:Ljava/lang/ref/WeakReference;
+    iget-object p2, p0, Lcom/adjust/sdk/aq;->dl: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;->dk:Ljava/lang/ref/WeakReference;
+    iput-object v0, p0, Lcom/adjust/sdk/aq;->dl: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 7e455dbcef..0743ac141a 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 dn:Z
+.field public do: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 06e0e49300..b9dcd36610 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 do:Lcom/adjust/sdk/c;
+.field final synthetic dp:Lcom/adjust/sdk/c;
 
-.field final synthetic dp:Lcom/adjust/sdk/as;
+.field final synthetic dq: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;->dp:Lcom/adjust/sdk/as;
+    iput-object p1, p0, Lcom/adjust/sdk/as$1;->dq:Lcom/adjust/sdk/as;
 
-    iput-object p2, p0, Lcom/adjust/sdk/as$1;->do:Lcom/adjust/sdk/c;
+    iput-object p2, p0, Lcom/adjust/sdk/as$1;->dp: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;->dp:Lcom/adjust/sdk/as;
+    iget-object v0, p0, Lcom/adjust/sdk/as$1;->dq:Lcom/adjust/sdk/as;
 
-    iget-object v0, v0, Lcom/adjust/sdk/as;->de:Ljava/util/List;
+    iget-object v0, v0, Lcom/adjust/sdk/as;->df:Ljava/util/List;
 
-    iget-object v1, p0, Lcom/adjust/sdk/as$1;->do:Lcom/adjust/sdk/c;
+    iget-object v1, p0, Lcom/adjust/sdk/as$1;->dp: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;->dp:Lcom/adjust/sdk/as;
+    iget-object v0, p0, Lcom/adjust/sdk/as$1;->dq: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;->dp:Lcom/adjust/sdk/as;
+    iget-object v3, p0, Lcom/adjust/sdk/as$1;->dq:Lcom/adjust/sdk/as;
 
-    iget-object v3, v3, Lcom/adjust/sdk/as;->de:Ljava/util/List;
+    iget-object v3, v3, Lcom/adjust/sdk/as;->df: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;->dp:Lcom/adjust/sdk/as;
+    iget-object v0, p0, Lcom/adjust/sdk/as$1;->dq: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;->do:Lcom/adjust/sdk/c;
+    iget-object v2, p0, Lcom/adjust/sdk/as$1;->dp: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;->dp:Lcom/adjust/sdk/as;
+    iget-object v0, p0, Lcom/adjust/sdk/as$1;->dq: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 c759038aaf..f4aaad0534 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 dp:Lcom/adjust/sdk/as;
+.field final synthetic dq: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;->dp:Lcom/adjust/sdk/as;
+    iput-object p1, p0, Lcom/adjust/sdk/as$2;->dq: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;->dp:Lcom/adjust/sdk/as;
+    iget-object v0, v1, Lcom/adjust/sdk/as$2;->dq: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;->dp:Lcom/adjust/sdk/as;
+    iget-object v8, v1, Lcom/adjust/sdk/as$2;->dq: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;->dp:Lcom/adjust/sdk/as;
+    iget-object v2, v1, Lcom/adjust/sdk/as$2;->dq: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 e00724e45b..16b6b55395 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 dp:Lcom/adjust/sdk/as;
+.field final synthetic dq: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;->dp:Lcom/adjust/sdk/as;
+    iput-object p1, p0, Lcom/adjust/sdk/as$3;->dq: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;->dp:Lcom/adjust/sdk/as;
+    iget-object v0, p0, Lcom/adjust/sdk/as$3;->dq:Lcom/adjust/sdk/as;
 
-    iget-boolean v1, v0, Lcom/adjust/sdk/as;->paused:Z
+    iget-boolean v1, v0, Lcom/adjust/sdk/as;->bP:Z
 
     if-nez v1, :cond_1
 
-    iget-object v1, v0, Lcom/adjust/sdk/as;->de:Ljava/util/List;
+    iget-object v1, v0, Lcom/adjust/sdk/as;->df: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;->de:Ljava/util/List;
+    iget-object v1, v0, Lcom/adjust/sdk/as;->df:Ljava/util/List;
 
     const/4 v2, 0x0
 
@@ -74,7 +74,7 @@
     return-void
 
     :cond_0
-    iget-object v1, v0, Lcom/adjust/sdk/as;->dg:Lcom/adjust/sdk/q;
+    iget-object v1, v0, Lcom/adjust/sdk/as;->dh: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;->dz:Ljava/text/DecimalFormat;
+    sget-object v1, Lcom/adjust/sdk/az;->dA: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 b948652620..c3a0ec6d7f 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 dp:Lcom/adjust/sdk/as;
+.field final synthetic dq:Lcom/adjust/sdk/as;
 
-.field final synthetic dq:Lcom/adjust/sdk/c;
+.field final synthetic dr: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;->dp:Lcom/adjust/sdk/as;
+    iput-object p1, p0, Lcom/adjust/sdk/as$4;->dq:Lcom/adjust/sdk/as;
 
-    iput-object p2, p0, Lcom/adjust/sdk/as$4;->dq:Lcom/adjust/sdk/c;
+    iput-object p2, p0, Lcom/adjust/sdk/as$4;->dr: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;->dp:Lcom/adjust/sdk/as;
+    iget-object v0, p0, Lcom/adjust/sdk/as$4;->dq:Lcom/adjust/sdk/as;
 
-    iget-object v1, p0, Lcom/adjust/sdk/as$4;->dq:Lcom/adjust/sdk/c;
+    iget-object v1, p0, Lcom/adjust/sdk/as$4;->dr: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;->dp:Lcom/adjust/sdk/as;
+    iget-object v0, p0, Lcom/adjust/sdk/as$4;->dq: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 10fcb45438..7bd40edadf 100644
--- a/com.discord/smali/com/adjust/sdk/as.smali
+++ b/com.discord/smali/com/adjust/sdk/as.smali
@@ -21,7 +21,9 @@
     .end annotation
 .end field
 
-.field de:Ljava/util/List;
+.field bP:Z
+
+.field df:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -31,9 +33,7 @@
     .end annotation
 .end field
 
-.field dg:Lcom/adjust/sdk/q;
-
-.field paused:Z
+.field dh:Lcom/adjust/sdk/q;
 
 
 # direct methods
@@ -54,7 +54,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/adjust/sdk/as;->dg:Lcom/adjust/sdk/q;
+    iput-object p1, p0, Lcom/adjust/sdk/as;->dh: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;->de:Ljava/util/List;
+    iget-object v11, p0, Lcom/adjust/sdk/as;->df: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;->dr:Z
+    iput-boolean v3, v10, Lcom/adjust/sdk/at;->ds: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;->paused:Z
+    iput-boolean v0, p0, Lcom/adjust/sdk/as;->bP:Z
 
     return-void
 .end method
@@ -385,7 +385,7 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/adjust/sdk/as;->paused:Z
+    iput-boolean v0, p0, Lcom/adjust/sdk/as;->bP: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;->paused:Z
+    iput-boolean p2, p0, Lcom/adjust/sdk/as;->bP:Z
 
     new-instance p2, Ljava/util/ArrayList;
 
     invoke-direct {p2}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object p2, p0, Lcom/adjust/sdk/as;->de:Ljava/util/List;
+    iput-object p2, p0, Lcom/adjust/sdk/as;->df: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 c014ee2d57..b33bf16096 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 dr:Z
+.field ds: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 586f59c649..d540453a27 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 dx:Lcom/adjust/sdk/ax;
+.field final synthetic dy: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;->dx:Lcom/adjust/sdk/ax;
+    iput-object p1, p0, Lcom/adjust/sdk/ax$1;->dy: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;->dx:Lcom/adjust/sdk/ax;
+    iget-object v0, p0, Lcom/adjust/sdk/ax$1;->dy: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;->dx:Lcom/adjust/sdk/ax;
+    iget-object v2, p0, Lcom/adjust/sdk/ax$1;->dy: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;->dx:Lcom/adjust/sdk/ax;
+    iget-object v0, p0, Lcom/adjust/sdk/ax$1;->dy:Lcom/adjust/sdk/ax;
 
-    iget-object v0, v0, Lcom/adjust/sdk/ax;->du:Ljava/lang/Runnable;
+    iget-object v0, v0, Lcom/adjust/sdk/ax;->dv: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 1b03f1a0b4..af5702b953 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 ds:Lcom/adjust/sdk/s;
+.field dt:Lcom/adjust/sdk/s;
 
-.field dt:Ljava/util/concurrent/ScheduledFuture;
+.field du:Ljava/util/concurrent/ScheduledFuture;
 
-.field du:Ljava/lang/Runnable;
+.field dv:Ljava/lang/Runnable;
 
-.field dv:J
+.field dw:J
 
-.field dw:Z
+.field dx: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;->ds:Lcom/adjust/sdk/s;
+    iput-object v0, p0, Lcom/adjust/sdk/ax;->dt:Lcom/adjust/sdk/s;
 
     iput-object p6, p0, Lcom/adjust/sdk/ax;->name:Ljava/lang/String;
 
-    iput-object p1, p0, Lcom/adjust/sdk/ax;->du:Ljava/lang/Runnable;
+    iput-object p1, p0, Lcom/adjust/sdk/ax;->dv:Ljava/lang/Runnable;
 
     iput-wide p2, p0, Lcom/adjust/sdk/ax;->initialDelay:J
 
-    iput-wide p4, p0, Lcom/adjust/sdk/ax;->dv:J
+    iput-wide p4, p0, Lcom/adjust/sdk/ax;->dw:J
 
-    iput-boolean v1, p0, Lcom/adjust/sdk/ax;->dw:Z
+    iput-boolean v1, p0, Lcom/adjust/sdk/ax;->dx: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;->dz:Ljava/text/DecimalFormat;
+    sget-object p1, Lcom/adjust/sdk/az;->dA:Ljava/text/DecimalFormat;
 
     long-to-double p4, p4
 
@@ -65,7 +65,7 @@
 
     move-result-object p1
 
-    sget-object p4, Lcom/adjust/sdk/az;->dz:Ljava/text/DecimalFormat;
+    sget-object p4, Lcom/adjust/sdk/az;->dA: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 1c4264d8bd..82acaa9ef0 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 dy:Lcom/adjust/sdk/ay;
+.field final synthetic dz: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;->dy:Lcom/adjust/sdk/ay;
+    iput-object p1, p0, Lcom/adjust/sdk/ay$1;->dz: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;->dy:Lcom/adjust/sdk/ay;
+    iget-object v0, p0, Lcom/adjust/sdk/ay$1;->dz: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;->dy:Lcom/adjust/sdk/ay;
+    iget-object v2, p0, Lcom/adjust/sdk/ay$1;->dz: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;->dy:Lcom/adjust/sdk/ay;
+    iget-object v0, p0, Lcom/adjust/sdk/ay$1;->dz:Lcom/adjust/sdk/ay;
 
-    iget-object v0, v0, Lcom/adjust/sdk/ay;->du:Ljava/lang/Runnable;
+    iget-object v0, v0, Lcom/adjust/sdk/ay;->dv:Ljava/lang/Runnable;
 
     invoke-interface {v0}, Ljava/lang/Runnable;->run()V
 
-    iget-object v0, p0, Lcom/adjust/sdk/ay$1;->dy:Lcom/adjust/sdk/ay;
+    iget-object v0, p0, Lcom/adjust/sdk/ay$1;->dz:Lcom/adjust/sdk/ay;
 
     const/4 v1, 0x0
 
-    iput-object v1, v0, Lcom/adjust/sdk/ay;->dt:Ljava/util/concurrent/ScheduledFuture;
+    iput-object v1, v0, Lcom/adjust/sdk/ay;->du: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 245a27d6a8..81c7a076e8 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 ds:Lcom/adjust/sdk/s;
+.field private dt:Lcom/adjust/sdk/s;
 
-.field dt:Ljava/util/concurrent/ScheduledFuture;
+.field du:Ljava/util/concurrent/ScheduledFuture;
 
-.field du:Ljava/lang/Runnable;
+.field dv: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;->ds:Lcom/adjust/sdk/s;
+    iput-object v0, p0, Lcom/adjust/sdk/ay;->dt:Lcom/adjust/sdk/s;
 
-    iput-object p1, p0, Lcom/adjust/sdk/ay;->du:Ljava/lang/Runnable;
+    iput-object p1, p0, Lcom/adjust/sdk/ay;->dv: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;->dt:Ljava/util/concurrent/ScheduledFuture;
+    iget-object v0, p0, Lcom/adjust/sdk/ay;->du: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;->dt:Ljava/util/concurrent/ScheduledFuture;
+    iget-object v0, p0, Lcom/adjust/sdk/ay;->du: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;->dt:Ljava/util/concurrent/ScheduledFuture;
+    iput-object v0, p0, Lcom/adjust/sdk/ay;->du: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;->dz:Ljava/text/DecimalFormat;
+    sget-object v0, Lcom/adjust/sdk/az;->dA: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;->ds:Lcom/adjust/sdk/s;
+    iget-object v0, p0, Lcom/adjust/sdk/ay;->dt: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;->dt:Ljava/util/concurrent/ScheduledFuture;
+    iput-object p1, p0, Lcom/adjust/sdk/ay;->du: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 8686de5cda..c47598d6b2 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 dB:Lcom/adjust/sdk/ah;
+.field final synthetic dC: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;->dB:Lcom/adjust/sdk/ah;
+    iput-object p1, p0, Lcom/adjust/sdk/az$2;->dC: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;->dB:Lcom/adjust/sdk/ah;
+    iget-object v0, p0, Lcom/adjust/sdk/az$2;->dC: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 7899b1c3ce..5f860712a1 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/SimpleDateFormat;
+.field public static final dA:Ljava/text/DecimalFormat;
 
-.field public static final dz:Ljava/text/DecimalFormat;
+.field public static final dB:Ljava/text/SimpleDateFormat;
 
 
 # direct methods
@@ -19,7 +19,7 @@
 
     invoke-direct {v0, v1}, Ljava/text/DecimalFormat;-><init>(Ljava/lang/String;)V
 
-    sput-object v0, Lcom/adjust/sdk/az;->dz:Ljava/text/DecimalFormat;
+    sput-object v0, Lcom/adjust/sdk/az;->dA: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;->dA:Ljava/text/SimpleDateFormat;
+    sput-object v0, Lcom/adjust/sdk/az;->dB: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 6411272d2a..a02f0a91d1 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;->dA:Ljava/text/SimpleDateFormat;
+    sget-object v1, Lcom/adjust/sdk/az;->dB: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;->dn:Z
+    iput-boolean v3, p1, Lcom/adjust/sdk/ar;->do:Z
 
     goto :goto_3
 
@@ -597,7 +597,7 @@
 
     move-result-wide v5
 
-    sget-object p0, Lcom/adjust/sdk/az;->dA:Ljava/text/SimpleDateFormat;
+    sget-object p0, Lcom/adjust/sdk/az;->dB: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 ef798cb901..f74ce24c66 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;->cL:Lcom/adjust/sdk/ad;
+    sget-object v0, Lcom/adjust/sdk/ad;->cM: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 c0cd21ae7d..2ca0fc6524 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;->bS:Lcom/adjust/sdk/q;
+    sget-object v0, Lcom/adjust/sdk/q;->bT: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;->bR:Lcom/adjust/sdk/q;
+    sget-object v0, Lcom/adjust/sdk/q;->bS: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 ec1b1ccbe4..2ee8ae594d 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 bP:Lcom/adjust/sdk/o;
+.field final synthetic bQ: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;->bP:Lcom/adjust/sdk/o;
+    iput-object p1, p0, Lcom/adjust/sdk/o$1;->bQ: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;->bP:Lcom/adjust/sdk/o;
+    iget-object v0, p0, Lcom/adjust/sdk/o$1;->bQ: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 f9e3b0ebe2..48384de356 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 bP:Lcom/adjust/sdk/o;
+.field final synthetic bQ: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;->bP:Lcom/adjust/sdk/o;
+    iput-object p1, p0, Lcom/adjust/sdk/o$2;->bQ: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;->bP:Lcom/adjust/sdk/o;
+    iget-object v0, p0, Lcom/adjust/sdk/o$2;->bQ: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 8a508fc1a0..64b7f3c89a 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 bP:Lcom/adjust/sdk/o;
+.field final synthetic bQ: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;->bP:Lcom/adjust/sdk/o;
+    iput-object p1, p0, Lcom/adjust/sdk/o$3;->bQ: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;->bP:Lcom/adjust/sdk/o;
+    iget-object v0, p0, Lcom/adjust/sdk/o$3;->bQ: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;->bP:Lcom/adjust/sdk/o;
+    iget-object v1, p0, Lcom/adjust/sdk/o$3;->bQ: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 7dc07cf73e..806970a17e 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 bP:Lcom/adjust/sdk/o;
+.field final synthetic bQ: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;->bP:Lcom/adjust/sdk/o;
+    iput-object p1, p0, Lcom/adjust/sdk/o$4;->bQ: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;->bP:Lcom/adjust/sdk/o;
+    iget-object v0, p0, Lcom/adjust/sdk/o$4;->bQ: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;->bP:Lcom/adjust/sdk/o;
+    iget-object v1, p0, Lcom/adjust/sdk/o$4;->bQ: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 a1cd67e89f..8f46cdae20 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 bP:Lcom/adjust/sdk/o;
+.field final synthetic bQ: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;->bP:Lcom/adjust/sdk/o;
+    iput-object p1, p0, Lcom/adjust/sdk/o$5;->bQ: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;->bP:Lcom/adjust/sdk/o;
+    iget-object v0, p0, Lcom/adjust/sdk/o$5;->bQ: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;->bP:Lcom/adjust/sdk/o;
+    iget-object v1, p0, Lcom/adjust/sdk/o$5;->bQ: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;->bQ:Landroid/net/Uri;
+    iput-object v1, v2, Lcom/adjust/sdk/p;->bR: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 db9f05f539..4b067d6fc5 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 bP:Lcom/adjust/sdk/o;
+.field final synthetic bQ: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;->bP:Lcom/adjust/sdk/o;
+    iput-object p1, p0, Lcom/adjust/sdk/o$6;->bQ: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;->bP:Lcom/adjust/sdk/o;
+    iget-object v0, p0, Lcom/adjust/sdk/o$6;->bQ:Lcom/adjust/sdk/o;
 
-    iget-boolean v1, v0, Lcom/adjust/sdk/o;->paused:Z
+    iget-boolean v1, v0, Lcom/adjust/sdk/o;->bP: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 39706c734b..b6729797c9 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 paused:Z
+.field bP:Z
 
 
 # direct methods
@@ -88,7 +88,7 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/adjust/sdk/o;->paused:Z
+    iput-boolean v0, p0, Lcom/adjust/sdk/o;->bP:Z
 
     return-void
 .end method
@@ -156,7 +156,7 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/adjust/sdk/o;->paused:Z
+    iput-boolean v0, p0, Lcom/adjust/sdk/o;->bP:Z
 
     return-void
 .end method
@@ -202,7 +202,7 @@
 
     xor-int/lit8 p1, p3, 0x1
 
-    iput-boolean p1, p0, Lcom/adjust/sdk/o;->paused:Z
+    iput-boolean p1, p0, Lcom/adjust/sdk/o;->bP:Z
 
     return-void
 .end method
@@ -237,7 +237,7 @@
 
     div-double/2addr v0, v2
 
-    sget-object v2, Lcom/adjust/sdk/az;->dz:Ljava/text/DecimalFormat;
+    sget-object v2, Lcom/adjust/sdk/az;->dA: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 2adc7f814b..7d04cd1f66 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 bQ:Landroid/net/Uri;
+.field public bR: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 490577a5f0..3c16666860 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 private static final synthetic bV:[Lcom/adjust/sdk/q;
+.field public static final enum bV:Lcom/adjust/sdk/q;
+
+.field private static final synthetic bW:[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;->bR:Lcom/adjust/sdk/q;
+    sput-object v10, Lcom/adjust/sdk/q;->bS: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;->bS:Lcom/adjust/sdk/q;
+    sput-object v0, Lcom/adjust/sdk/q;->bT: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;->bT:Lcom/adjust/sdk/q;
+    sput-object v0, Lcom/adjust/sdk/q;->bU: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;->bU:Lcom/adjust/sdk/q;
+    sput-object v0, Lcom/adjust/sdk/q;->bV:Lcom/adjust/sdk/q;
 
     const/4 v0, 0x4
 
     new-array v0, v0, [Lcom/adjust/sdk/q;
 
-    sget-object v1, Lcom/adjust/sdk/q;->bR:Lcom/adjust/sdk/q;
+    sget-object v1, Lcom/adjust/sdk/q;->bS:Lcom/adjust/sdk/q;
 
     const/4 v2, 0x0
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/adjust/sdk/q;->bS:Lcom/adjust/sdk/q;
+    sget-object v1, Lcom/adjust/sdk/q;->bT:Lcom/adjust/sdk/q;
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/adjust/sdk/q;->bT:Lcom/adjust/sdk/q;
+    sget-object v1, Lcom/adjust/sdk/q;->bU:Lcom/adjust/sdk/q;
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/adjust/sdk/q;->bU:Lcom/adjust/sdk/q;
+    sget-object v1, Lcom/adjust/sdk/q;->bV:Lcom/adjust/sdk/q;
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lcom/adjust/sdk/q;->bV:[Lcom/adjust/sdk/q;
+    sput-object v0, Lcom/adjust/sdk/q;->bW:[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;->bV:[Lcom/adjust/sdk/q;
+    sget-object v0, Lcom/adjust/sdk/q;->bW:[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 fd47146489..88235cf1c9 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 bW:Ljava/util/List;
+.field public static final bX: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;->bW:Ljava/util/List;
+    sput-object v0, Lcom/adjust/sdk/r;->bX: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 13b4fb0d9a..ac5a695ea7 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 cb:Lcom/adjust/sdk/s$1;
+.field final synthetic cc: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;->cb:Lcom/adjust/sdk/s$1;
+    iput-object p1, p0, Lcom/adjust/sdk/s$1$1;->cc: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 d83f7cf74c..70a85b4c4c 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 bZ:Ljava/lang/String;
+.field final synthetic ca:Ljava/lang/String;
 
-.field final synthetic ca:Lcom/adjust/sdk/s;
+.field final synthetic cb: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;->ca:Lcom/adjust/sdk/s;
+    iput-object p1, p0, Lcom/adjust/sdk/s$1;->cb:Lcom/adjust/sdk/s;
 
-    iput-object p2, p0, Lcom/adjust/sdk/s$1;->bZ:Ljava/lang/String;
+    iput-object p2, p0, Lcom/adjust/sdk/s$1;->ca: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;->ca:Lcom/adjust/sdk/s;
+    iget-object v2, p0, Lcom/adjust/sdk/s$1;->cb: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;->bZ:Ljava/lang/String;
+    iget-object v2, p0, Lcom/adjust/sdk/s$1;->ca: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 6fc5b7cfd3..0916ebbdc2 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 bZ:Ljava/lang/String;
+.field final synthetic ca:Ljava/lang/String;
 
-.field final synthetic ca:Lcom/adjust/sdk/s;
+.field final synthetic cb: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;->ca:Lcom/adjust/sdk/s;
+    iput-object p1, p0, Lcom/adjust/sdk/s$2;->cb:Lcom/adjust/sdk/s;
 
-    iput-object p2, p0, Lcom/adjust/sdk/s$2;->bZ:Ljava/lang/String;
+    iput-object p2, p0, Lcom/adjust/sdk/s$2;->ca: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;->bZ:Ljava/lang/String;
+    iget-object p1, p0, Lcom/adjust/sdk/s$2;->ca: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 0de84a3650..bfca99049d 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 ca:Lcom/adjust/sdk/s;
+.field final synthetic cb:Lcom/adjust/sdk/s;
 
-.field private cc:Ljava/lang/Runnable;
+.field private cd: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;->ca:Lcom/adjust/sdk/s;
+    iput-object p1, p0, Lcom/adjust/sdk/s$a;->cb:Lcom/adjust/sdk/s;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p2, p0, Lcom/adjust/sdk/s$a;->cc:Ljava/lang/Runnable;
+    iput-object p2, p0, Lcom/adjust/sdk/s$a;->cd: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;->cc:Ljava/lang/Runnable;
+    iget-object v0, p0, Lcom/adjust/sdk/s$a;->cd: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 e390437d74..2e2f8f3278 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 bX:Ljava/util/concurrent/ScheduledThreadPoolExecutor;
+.field bY:Ljava/util/concurrent/ScheduledThreadPoolExecutor;
 
-.field private final bY:Ljava/util/concurrent/atomic/AtomicInteger;
+.field private final bZ: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;->bY:Ljava/util/concurrent/atomic/AtomicInteger;
+    iput-object v0, p0, Lcom/adjust/sdk/s;->bZ: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;->bX:Ljava/util/concurrent/ScheduledThreadPoolExecutor;
+    iput-object v0, p0, Lcom/adjust/sdk/s;->bY:Ljava/util/concurrent/ScheduledThreadPoolExecutor;
 
     if-nez p2, :cond_0
 
-    iget-object p1, p0, Lcom/adjust/sdk/s;->bX:Ljava/util/concurrent/ScheduledThreadPoolExecutor;
+    iget-object p1, p0, Lcom/adjust/sdk/s;->bY: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;->bX:Ljava/util/concurrent/ScheduledThreadPoolExecutor;
+    iget-object p1, p0, Lcom/adjust/sdk/s;->bY: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;->bX:Ljava/util/concurrent/ScheduledThreadPoolExecutor;
+    iget-object v0, p0, Lcom/adjust/sdk/s;->bY: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;->bX:Ljava/util/concurrent/ScheduledThreadPoolExecutor;
+    iget-object v0, p0, Lcom/adjust/sdk/s;->bY: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 1f5223a9e8..38d178fca6 100644
--- a/com.discord/smali/com/adjust/sdk/t.smali
+++ b/com.discord/smali/com/adjust/sdk/t.smali
@@ -8,7 +8,9 @@
 
 .field cB:Ljava/lang/String;
 
-.field cC:Ljava/util/Map;
+.field cC:Ljava/lang/String;
+
+.field cD:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -19,13 +21,11 @@
     .end annotation
 .end field
 
-.field cd:Ljava/lang/String;
+.field ce:Ljava/lang/String;
 
-.field ce:Ljava/lang/Boolean;
+.field cf:Ljava/lang/Boolean;
 
-.field private cf:Z
-
-.field cg:Ljava/lang/String;
+.field private cg:Z
 
 .field ch:Ljava/lang/String;
 
@@ -82,7 +82,7 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/adjust/sdk/t;->cf:Z
+    iput-boolean v0, p0, Lcom/adjust/sdk/t;->cg: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;->ck:Ljava/lang/String;
+    iput-object v4, p0, Lcom/adjust/sdk/t;->cl: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;->cl:Ljava/lang/String;
+    iput-object v10, p0, Lcom/adjust/sdk/t;->cm:Ljava/lang/String;
 
     sget-object v10, Landroid/os/Build;->MODEL:Ljava/lang/String;
 
-    iput-object v10, p0, Lcom/adjust/sdk/t;->cm:Ljava/lang/String;
+    iput-object v10, p0, Lcom/adjust/sdk/t;->cn:Ljava/lang/String;
 
     sget-object v10, Landroid/os/Build;->MANUFACTURER:Ljava/lang/String;
 
-    iput-object v10, p0, Lcom/adjust/sdk/t;->cn:Ljava/lang/String;
+    iput-object v10, p0, Lcom/adjust/sdk/t;->co:Ljava/lang/String;
 
     const-string v10, "android"
 
-    iput-object v10, p0, Lcom/adjust/sdk/t;->co:Ljava/lang/String;
+    iput-object v10, p0, Lcom/adjust/sdk/t;->cp:Ljava/lang/String;
 
     sget-object v10, Landroid/os/Build$VERSION;->RELEASE:Ljava/lang/String;
 
-    iput-object v10, p0, Lcom/adjust/sdk/t;->cp:Ljava/lang/String;
+    iput-object v10, p0, Lcom/adjust/sdk/t;->cq: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;->cq:Ljava/lang/String;
+    iput-object v10, p0, Lcom/adjust/sdk/t;->cr: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;->cr:Ljava/lang/String;
+    iput-object v4, p0, Lcom/adjust/sdk/t;->cs: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;->cs:Ljava/lang/String;
+    iput-object v1, p0, Lcom/adjust/sdk/t;->ct: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;->ct:Ljava/lang/String;
+    iput-object v9, p0, Lcom/adjust/sdk/t;->cu: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;->cu:Ljava/lang/String;
+    iput-object v1, p0, Lcom/adjust/sdk/t;->cv: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;->cv:Ljava/lang/String;
+    iput-object v1, p0, Lcom/adjust/sdk/t;->cw: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;->cj:Ljava/lang/String;
+    iput-object p2, p0, Lcom/adjust/sdk/t;->ck: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;->cC:Ljava/util/Map;
+    iput-object p2, p0, Lcom/adjust/sdk/t;->cD:Ljava/util/Map;
 
     sget-object p2, Landroid/os/Build;->DISPLAY:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/adjust/sdk/t;->cw:Ljava/lang/String;
+    iput-object p2, p0, Lcom/adjust/sdk/t;->cx: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;->cx:Ljava/lang/String;
+    iput-object p2, p0, Lcom/adjust/sdk/t;->cy:Ljava/lang/String;
 
     sget-object p2, Landroid/os/Build;->ID:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/adjust/sdk/t;->cy:Ljava/lang/String;
+    iput-object p2, p0, Lcom/adjust/sdk/t;->cz: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;->cz:Ljava/lang/String;
+    iput-object p2, p0, Lcom/adjust/sdk/t;->cA: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;->cA:Ljava/lang/String;
+    iput-object p2, p0, Lcom/adjust/sdk/t;->cB: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;->cB:Ljava/lang/String;
+    iput-object p1, p0, Lcom/adjust/sdk/t;->cC:Ljava/lang/String;
 
     return-void
 .end method
@@ -510,7 +510,7 @@
 
     move-result-object p0
 
-    sget-object v0, Lcom/adjust/sdk/az;->dA:Ljava/text/SimpleDateFormat;
+    sget-object v0, Lcom/adjust/sdk/az;->dB:Ljava/text/SimpleDateFormat;
 
     new-instance v1, Ljava/util/Date;
 
@@ -550,7 +550,7 @@
 
     move-result-object p0
 
-    sget-object v0, Lcom/adjust/sdk/az;->dA:Ljava/text/SimpleDateFormat;
+    sget-object v0, Lcom/adjust/sdk/az;->dB: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;->ce:Ljava/lang/Boolean;
+    iput-object v0, p0, Lcom/adjust/sdk/t;->cf: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;->cd:Ljava/lang/String;
+    iput-object v0, p0, Lcom/adjust/sdk/t;->ce:Ljava/lang/String;
 
-    iget-object v0, p0, Lcom/adjust/sdk/t;->cd:Ljava/lang/String;
+    iget-object v0, p0, Lcom/adjust/sdk/t;->ce:Ljava/lang/String;
 
     if-nez v0, :cond_1
 
-    iget-boolean v0, p0, Lcom/adjust/sdk/t;->cf:Z
+    iget-boolean v0, p0, Lcom/adjust/sdk/t;->cg:Z
 
     if-nez v0, :cond_1
 
@@ -668,23 +668,23 @@
 
     move-result-object v1
 
-    iput-object v1, p0, Lcom/adjust/sdk/t;->cg:Ljava/lang/String;
+    iput-object v1, p0, Lcom/adjust/sdk/t;->ch: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;->ch:Ljava/lang/String;
+    iput-object v0, p0, Lcom/adjust/sdk/t;->ci: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;->ci:Ljava/lang/String;
+    iput-object p1, p0, Lcom/adjust/sdk/t;->cj:Ljava/lang/String;
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lcom/adjust/sdk/t;->cf:Z
+    iput-boolean p1, p0, Lcom/adjust/sdk/t;->cg: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 c02a6b53da..3f2067204c 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 dT:Lcom/airbnb/lottie/LottieAnimationView;
+.field final synthetic dU: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;->dT:Lcom/airbnb/lottie/LottieAnimationView;
+    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView$1;->dU: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;->dT:Lcom/airbnb/lottie/LottieAnimationView;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView$1;->dU: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 8d4b8408f9..9a8d955565 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 dT:Lcom/airbnb/lottie/LottieAnimationView;
+.field final synthetic dU: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;->dT:Lcom/airbnb/lottie/LottieAnimationView;
+    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView$2;->dU: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 54872e9d12..1d36557073 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 dU:[I
+.field static final synthetic dV:[I
 
 
 # direct methods
@@ -30,12 +30,12 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/airbnb/lottie/LottieAnimationView$3;->dU:[I
+    sput-object v0, Lcom/airbnb/lottie/LottieAnimationView$3;->dV:[I
 
     :try_start_0
-    sget-object v0, Lcom/airbnb/lottie/LottieAnimationView$3;->dU:[I
+    sget-object v0, Lcom/airbnb/lottie/LottieAnimationView$3;->dV:[I
 
-    sget-object v1, Lcom/airbnb/lottie/n;->fG: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
 
@@ -49,9 +49,9 @@
 
     :catch_0
     :try_start_1
-    sget-object v0, Lcom/airbnb/lottie/LottieAnimationView$3;->dU:[I
+    sget-object v0, Lcom/airbnb/lottie/LottieAnimationView$3;->dV:[I
 
-    sget-object v1, Lcom/airbnb/lottie/n;->fH:Lcom/airbnb/lottie/n;
+    sget-object v1, Lcom/airbnb/lottie/n;->fI: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;->dU:[I
+    sget-object v0, Lcom/airbnb/lottie/LottieAnimationView$3;->dV:[I
 
-    sget-object v1, Lcom/airbnb/lottie/n;->fF: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
 
diff --git a/com.discord/smali/com/airbnb/lottie/LottieAnimationView$SavedState.smali b/com.discord/smali/com/airbnb/lottie/LottieAnimationView$SavedState.smali
index a4aa8a4760..ff3cc77166 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 dK:Ljava/lang/String;
+.field dL:Ljava/lang/String;
 
-.field dL:I
+.field dM:I
 
-.field dV:F
+.field dW:F
 
-.field dW:Ljava/lang/String;
+.field dX:Ljava/lang/String;
 
 .field isAnimating:Z
 
@@ -64,13 +64,13 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView$SavedState;->dK:Ljava/lang/String;
+    iput-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView$SavedState;->dL:Ljava/lang/String;
 
     invoke-virtual {p1}, Landroid/os/Parcel;->readFloat()F
 
     move-result v0
 
-    iput v0, p0, Lcom/airbnb/lottie/LottieAnimationView$SavedState;->dV:F
+    iput v0, p0, Lcom/airbnb/lottie/LottieAnimationView$SavedState;->dW: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;->dW:Ljava/lang/String;
+    iput-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView$SavedState;->dX: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;->dK:Ljava/lang/String;
+    iget-object p2, p0, Lcom/airbnb/lottie/LottieAnimationView$SavedState;->dL:Ljava/lang/String;
 
     invoke-virtual {p1, p2}, Landroid/os/Parcel;->writeString(Ljava/lang/String;)V
 
-    iget p2, p0, Lcom/airbnb/lottie/LottieAnimationView$SavedState;->dV:F
+    iget p2, p0, Lcom/airbnb/lottie/LottieAnimationView$SavedState;->dW: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;->dW:Ljava/lang/String;
+    iget-object p2, p0, Lcom/airbnb/lottie/LottieAnimationView$SavedState;->dX: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 42780a9724..ea61b767c0 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 dH:Lcom/airbnb/lottie/h;
+.field private final dI: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 dI:Lcom/airbnb/lottie/h;
+.field private final dJ: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 dJ:Lcom/airbnb/lottie/f;
+.field private final dK:Lcom/airbnb/lottie/f;
 
-.field private dK:Ljava/lang/String;
+.field private dL:Ljava/lang/String;
 
-.field private dL:I
-
-.field private dM:Z
+.field private dM:I
 
 .field private dN:Z
 
 .field private dO:Z
 
-.field private dP:Lcom/airbnb/lottie/n;
+.field private dP:Z
 
-.field private dQ:Ljava/util/Set;
+.field private dQ:Lcom/airbnb/lottie/n;
+
+.field private dR:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -60,7 +60,7 @@
     .end annotation
 .end field
 
-.field private dR:Lcom/airbnb/lottie/l;
+.field private dS:Lcom/airbnb/lottie/l;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/airbnb/lottie/l<",
@@ -70,7 +70,7 @@
     .end annotation
 .end field
 
-.field private dS:Lcom/airbnb/lottie/d;
+.field private dT: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;->dH:Lcom/airbnb/lottie/h;
+    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dI: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;->dI:Lcom/airbnb/lottie/h;
+    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dJ: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;->dJ:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK: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
 
-    sget-object p1, Lcom/airbnb/lottie/n;->fF:Lcom/airbnb/lottie/n;
+    iput-boolean p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dP:Z
 
-    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dP: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;
 
     new-instance p1, Ljava/util/HashSet;
 
     invoke-direct {p1}, Ljava/util/HashSet;-><init>()V
 
-    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dQ:Ljava/util/Set;
+    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dR: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;->dH:Lcom/airbnb/lottie/h;
+    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dI: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;->dI:Lcom/airbnb/lottie/h;
+    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dJ: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;->dJ:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK: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
 
-    sget-object p1, Lcom/airbnb/lottie/n;->fF:Lcom/airbnb/lottie/n;
+    iput-boolean p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dP:Z
 
-    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dP: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;
 
     new-instance p1, Ljava/util/HashSet;
 
     invoke-direct {p1}, Ljava/util/HashSet;-><init>()V
 
-    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dQ:Ljava/util/Set;
+    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dR: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;->dH:Lcom/airbnb/lottie/h;
+    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dI: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;->dI:Lcom/airbnb/lottie/h;
+    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dJ: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;->dJ:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK: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
 
-    sget-object p1, Lcom/airbnb/lottie/n;->fF:Lcom/airbnb/lottie/n;
+    iput-boolean p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dP:Z
 
-    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dP: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;
 
     new-instance p1, Ljava/util/HashSet;
 
     invoke-direct {p1}, Ljava/util/HashSet;-><init>()V
 
-    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dQ:Ljava/util/Set;
+    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dR: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;->dJ:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK: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;->dR:Lcom/airbnb/lottie/l;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dS:Lcom/airbnb/lottie/l;
 
     if-eqz v0, :cond_0
 
-    iget-object v1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dH: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;->b(Lcom/airbnb/lottie/h;)Lcom/airbnb/lottie/l;
 
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dR:Lcom/airbnb/lottie/l;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dS:Lcom/airbnb/lottie/l;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dI:Lcom/airbnb/lottie/h;
+    iget-object v1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dJ: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;->dU:[I
+    sget-object v0, Lcom/airbnb/lottie/LottieAnimationView$3;->dV:[I
 
-    iget-object v1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dP:Lcom/airbnb/lottie/n;
+    iget-object v1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dQ: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;->dS:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dT:Lcom/airbnb/lottie/d;
 
     const/4 v3, 0x0
 
     if-eqz v0, :cond_1
 
-    iget-boolean v0, v0, Lcom/airbnb/lottie/d;->ek:Z
+    iget-boolean v0, v0, Lcom/airbnb/lottie/d;->el:Z
 
     if-eqz v0, :cond_1
 
@@ -317,11 +317,11 @@
     goto :goto_0
 
     :cond_1
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dS:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dT:Lcom/airbnb/lottie/d;
 
     if-eqz v0, :cond_2
 
-    iget v0, v0, Lcom/airbnb/lottie/d;->el:I
+    iget v0, v0, Lcom/airbnb/lottie/d;->em:I
 
     const/4 v4, 0x4
 
@@ -353,7 +353,7 @@
 .method private f(Z)V
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dJ:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK:Lcom/airbnb/lottie/f;
 
     invoke-virtual {v0, p1}, Lcom/airbnb/lottie/f;->f(Z)V
 
@@ -470,10 +470,10 @@
 
     if-eqz v0, :cond_5
 
-    iput-boolean v2, p0, Lcom/airbnb/lottie/LottieAnimationView;->dN:Z
-
     iput-boolean v2, p0, Lcom/airbnb/lottie/LottieAnimationView;->dO:Z
 
+    iput-boolean v2, p0, Lcom/airbnb/lottie/LottieAnimationView;->dP: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;->dJ:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK: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;->fu:Landroid/graphics/ColorFilter;
+    sget-object v0, Lcom/airbnb/lottie/j;->fv: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;->dJ:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK: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;->dJ:Lcom/airbnb/lottie/f;
+    iget-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK: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;->dS:Lcom/airbnb/lottie/d;
+    iput-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dT:Lcom/airbnb/lottie/d;
 
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dJ:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK: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;->dH: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;->a(Lcom/airbnb/lottie/h;)Lcom/airbnb/lottie/l;
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dI:Lcom/airbnb/lottie/h;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dJ: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;->dR:Lcom/airbnb/lottie/l;
+    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dS: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;->dJ:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK: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;->dM:Z
+    iput-boolean v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dN: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
 
-    iput-boolean v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dM:Z
-
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dJ:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK: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;->fG:Lcom/airbnb/lottie/n;
+    sget-object p1, Lcom/airbnb/lottie/n;->fH: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;->dS:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dT: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;->dS:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dT: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;->dJ:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK:Lcom/airbnb/lottie/f;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/f;->et:Lcom/airbnb/lottie/f/e;
+    iget-object v0, v0, Lcom/airbnb/lottie/f;->eu:Lcom/airbnb/lottie/f/e;
 
-    iget v0, v0, Lcom/airbnb/lottie/f/e;->mi:F
+    iget v0, v0, Lcom/airbnb/lottie/f/e;->mj: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;->dJ:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK:Lcom/airbnb/lottie/f;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/f;->dW:Ljava/lang/String;
+    iget-object v0, v0, Lcom/airbnb/lottie/f;->dX: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;->dJ:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK:Lcom/airbnb/lottie/f;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/f;->et:Lcom/airbnb/lottie/f/e;
+    iget-object v0, v0, Lcom/airbnb/lottie/f;->eu: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;->dJ:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK:Lcom/airbnb/lottie/f;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/f;->et:Lcom/airbnb/lottie/f/e;
+    iget-object v0, v0, Lcom/airbnb/lottie/f;->eu: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;->dJ:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK:Lcom/airbnb/lottie/f;
 
-    iget-object v1, v0, Lcom/airbnb/lottie/f;->dS:Lcom/airbnb/lottie/d;
+    iget-object v1, v0, Lcom/airbnb/lottie/f;->dT:Lcom/airbnb/lottie/d;
 
     if-eqz v1, :cond_0
 
-    iget-object v0, v0, Lcom/airbnb/lottie/f;->dS:Lcom/airbnb/lottie/d;
+    iget-object v0, v0, Lcom/airbnb/lottie/f;->dT:Lcom/airbnb/lottie/d;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/d;->dX:Lcom/airbnb/lottie/m;
+    iget-object v0, v0, Lcom/airbnb/lottie/d;->dY: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;->dJ:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK:Lcom/airbnb/lottie/f;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/f;->et:Lcom/airbnb/lottie/f/e;
+    iget-object v0, v0, Lcom/airbnb/lottie/f;->eu: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;->dJ:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK:Lcom/airbnb/lottie/f;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/f;->et:Lcom/airbnb/lottie/f/e;
+    iget-object v0, v0, Lcom/airbnb/lottie/f;->eu: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;->dJ:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK:Lcom/airbnb/lottie/f;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/f;->et:Lcom/airbnb/lottie/f/e;
+    iget-object v0, v0, Lcom/airbnb/lottie/f;->eu: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;->dJ:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK: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;->dJ:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK:Lcom/airbnb/lottie/f;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/f;->et:Lcom/airbnb/lottie/f/e;
+    iget-object v0, v0, Lcom/airbnb/lottie/f;->eu:Lcom/airbnb/lottie/f/e;
 
-    iget v0, v0, Lcom/airbnb/lottie/f/e;->mf:F
+    iget v0, v0, Lcom/airbnb/lottie/f/e;->mg:F
 
     return v0
 .end method
@@ -940,7 +940,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dJ:Lcom/airbnb/lottie/f;
+    iget-object v1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK: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;->dO:Z
+    iget-boolean v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dP:Z
 
     if-nez v0, :cond_0
 
-    iget-boolean v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dN:Z
+    iget-boolean v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dO:Z
 
     if-eqz v0, :cond_1
 
@@ -972,7 +972,7 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dO:Z
+    iput-boolean v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dP: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;->dJ:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK:Lcom/airbnb/lottie/f;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/f;->et:Lcom/airbnb/lottie/f/e;
+    iget-object v0, v0, Lcom/airbnb/lottie/f;->eu: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;->dM:Z
+    iput-boolean v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dN:Z
 
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dJ:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK:Lcom/airbnb/lottie/f;
 
-    iget-object v1, v0, Lcom/airbnb/lottie/f;->ew:Ljava/util/ArrayList;
+    iget-object v1, v0, Lcom/airbnb/lottie/f;->ex:Ljava/util/ArrayList;
 
     invoke-virtual {v1}, Ljava/util/ArrayList;->clear()V
 
-    iget-object v0, v0, Lcom/airbnb/lottie/f;->et:Lcom/airbnb/lottie/f/e;
+    iget-object v0, v0, Lcom/airbnb/lottie/f;->eu: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;->dN:Z
+    iput-boolean v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dO: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;->dK:Ljava/lang/String;
+    iget-object v0, p1, Lcom/airbnb/lottie/LottieAnimationView$SavedState;->dL:Ljava/lang/String;
 
-    iput-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK:Ljava/lang/String;
+    iput-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dL:Ljava/lang/String;
 
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK:Ljava/lang/String;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dL: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;->dK:Ljava/lang/String;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dL: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;->dL:I
+    iget v0, p1, Lcom/airbnb/lottie/LottieAnimationView$SavedState;->dM:I
 
-    iput v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dL:I
+    iput v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dM:I
 
-    iget v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dL:I
+    iget v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dM: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;->dV:F
+    iget v0, p1, Lcom/airbnb/lottie/LottieAnimationView$SavedState;->dW: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;->dJ:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK:Lcom/airbnb/lottie/f;
 
-    iget-object v1, p1, Lcom/airbnb/lottie/LottieAnimationView$SavedState;->dW:Ljava/lang/String;
+    iget-object v1, p1, Lcom/airbnb/lottie/LottieAnimationView$SavedState;->dX:Ljava/lang/String;
 
-    iput-object v1, v0, Lcom/airbnb/lottie/f;->dW:Ljava/lang/String;
+    iput-object v1, v0, Lcom/airbnb/lottie/f;->dX: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;->dK:Ljava/lang/String;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dL:Ljava/lang/String;
 
-    iput-object v0, v1, Lcom/airbnb/lottie/LottieAnimationView$SavedState;->dK:Ljava/lang/String;
+    iput-object v0, v1, Lcom/airbnb/lottie/LottieAnimationView$SavedState;->dL:Ljava/lang/String;
 
-    iget v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dL:I
+    iget v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dM:I
 
-    iput v0, v1, Lcom/airbnb/lottie/LottieAnimationView$SavedState;->dL:I
+    iput v0, v1, Lcom/airbnb/lottie/LottieAnimationView$SavedState;->dM:I
 
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dJ:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK:Lcom/airbnb/lottie/f;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/f;->et:Lcom/airbnb/lottie/f/e;
+    iget-object v0, v0, Lcom/airbnb/lottie/f;->eu: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;->dV:F
+    iput v0, v1, Lcom/airbnb/lottie/LottieAnimationView$SavedState;->dW:F
 
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dJ:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK:Lcom/airbnb/lottie/f;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/f;->et:Lcom/airbnb/lottie/f/e;
+    iget-object v0, v0, Lcom/airbnb/lottie/f;->eu: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;->dJ:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK:Lcom/airbnb/lottie/f;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/f;->dW:Ljava/lang/String;
+    iget-object v0, v0, Lcom/airbnb/lottie/f;->dX:Ljava/lang/String;
 
-    iput-object v0, v1, Lcom/airbnb/lottie/LottieAnimationView$SavedState;->dW:Ljava/lang/String;
+    iput-object v0, v1, Lcom/airbnb/lottie/LottieAnimationView$SavedState;->dX:Ljava/lang/String;
 
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dJ:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK:Lcom/airbnb/lottie/f;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/f;->et:Lcom/airbnb/lottie/f/e;
+    iget-object v0, v0, Lcom/airbnb/lottie/f;->eu: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;->dJ:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK:Lcom/airbnb/lottie/f;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/f;->et:Lcom/airbnb/lottie/f/e;
+    iget-object v0, v0, Lcom/airbnb/lottie/f;->eu: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;->dJ:Lcom/airbnb/lottie/f;
+    iget-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK: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;->dM:Z
+    iget-boolean p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dN:Z
 
     if-eqz p1, :cond_3
 
@@ -1202,7 +1202,7 @@
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dJ:Lcom/airbnb/lottie/f;
+    iget-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK: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;->dM:Z
+    iput-boolean p2, p0, Lcom/airbnb/lottie/LottieAnimationView;->dN:Z
 
     :goto_0
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dM:Z
+    iput-boolean p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dN:Z
 
     return-void
 
     :cond_2
-    iget-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dJ:Lcom/airbnb/lottie/f;
+    iget-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK:Lcom/airbnb/lottie/f;
 
-    iget-object p1, p1, Lcom/airbnb/lottie/f;->et:Lcom/airbnb/lottie/f/e;
+    iget-object p1, p1, Lcom/airbnb/lottie/f;->eu: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;->dM:Z
+    iput-boolean p2, p0, Lcom/airbnb/lottie/LottieAnimationView;->dN:Z
 
     :cond_3
     return-void
@@ -1242,11 +1242,11 @@
 .method public setAnimation(I)V
     .locals 1
 
-    iput p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dL:I
+    iput p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dM:I
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK:Ljava/lang/String;
+    iput-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dL: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;->dK:Ljava/lang/String;
+    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dL:Ljava/lang/String;
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dL:I
+    iput v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dM: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;->dJ:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK: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;->dS:Lcom/airbnb/lottie/d;
+    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dT:Lcom/airbnb/lottie/d;
 
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dJ:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK: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;->dJ:Lcom/airbnb/lottie/f;
+    iget-object v1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK: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;->dJ:Lcom/airbnb/lottie/f;
+    iget-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK: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;->dQ:Ljava/util/Set;
+    iget-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dR: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;->dJ:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK:Lcom/airbnb/lottie/f;
 
-    iput-object p1, v0, Lcom/airbnb/lottie/f;->eA:Lcom/airbnb/lottie/a;
+    iput-object p1, v0, Lcom/airbnb/lottie/f;->eB:Lcom/airbnb/lottie/a;
 
-    iget-object v1, v0, Lcom/airbnb/lottie/f;->ez:Lcom/airbnb/lottie/b/a;
+    iget-object v1, v0, Lcom/airbnb/lottie/f;->eA:Lcom/airbnb/lottie/b/a;
 
     if-eqz v1, :cond_0
 
-    iget-object v0, v0, Lcom/airbnb/lottie/f;->ez:Lcom/airbnb/lottie/b/a;
+    iget-object v0, v0, Lcom/airbnb/lottie/f;->eA:Lcom/airbnb/lottie/b/a;
 
-    iput-object p1, v0, Lcom/airbnb/lottie/b/a;->hC:Lcom/airbnb/lottie/a;
+    iput-object p1, v0, Lcom/airbnb/lottie/b/a;->hD: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;->dJ:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK: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;->dJ:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK:Lcom/airbnb/lottie/f;
 
-    iput-object p1, v0, Lcom/airbnb/lottie/f;->ey:Lcom/airbnb/lottie/b;
+    iput-object p1, v0, Lcom/airbnb/lottie/f;->ez:Lcom/airbnb/lottie/b;
 
-    iget-object v1, v0, Lcom/airbnb/lottie/f;->ex:Lcom/airbnb/lottie/b/b;
+    iget-object v1, v0, Lcom/airbnb/lottie/f;->ey:Lcom/airbnb/lottie/b/b;
 
     if-eqz v1, :cond_0
 
-    iget-object v0, v0, Lcom/airbnb/lottie/f;->ex:Lcom/airbnb/lottie/b/b;
+    iget-object v0, v0, Lcom/airbnb/lottie/f;->ey:Lcom/airbnb/lottie/b/b;
 
-    iput-object p1, v0, Lcom/airbnb/lottie/b/b;->hG:Lcom/airbnb/lottie/b;
+    iput-object p1, v0, Lcom/airbnb/lottie/b/b;->hH: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;->dJ:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK:Lcom/airbnb/lottie/f;
 
-    iput-object p1, v0, Lcom/airbnb/lottie/f;->dW:Ljava/lang/String;
+    iput-object p1, v0, Lcom/airbnb/lottie/f;->dX: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;->dJ:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK: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;->dJ:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK: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;->dJ:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK: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;->dJ:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK: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;->dJ:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK: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;->dJ:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK: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;->dJ:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK: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;->dJ:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK:Lcom/airbnb/lottie/f;
 
-    iput-boolean p1, v0, Lcom/airbnb/lottie/f;->eE:Z
+    iput-boolean p1, v0, Lcom/airbnb/lottie/f;->eF:Z
 
-    iget-object v1, v0, Lcom/airbnb/lottie/f;->dS:Lcom/airbnb/lottie/d;
+    iget-object v1, v0, Lcom/airbnb/lottie/f;->dT:Lcom/airbnb/lottie/d;
 
     if-eqz v1, :cond_0
 
-    iget-object v0, v0, Lcom/airbnb/lottie/f;->dS:Lcom/airbnb/lottie/d;
+    iget-object v0, v0, Lcom/airbnb/lottie/f;->dT: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;->dJ:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK: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;->dP:Lcom/airbnb/lottie/n;
+    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dQ: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;->dJ:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK: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;->dJ:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK:Lcom/airbnb/lottie/f;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/f;->et:Lcom/airbnb/lottie/f/e;
+    iget-object v0, v0, Lcom/airbnb/lottie/f;->eu: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;->dJ:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK: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;->dJ:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK: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;->dJ:Lcom/airbnb/lottie/f;
+    iget-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK: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;->dJ:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK:Lcom/airbnb/lottie/f;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/f;->et:Lcom/airbnb/lottie/f/e;
+    iget-object v0, v0, Lcom/airbnb/lottie/f;->eu:Lcom/airbnb/lottie/f/e;
 
-    iput p1, v0, Lcom/airbnb/lottie/f/e;->mf:F
+    iput p1, v0, Lcom/airbnb/lottie/f/e;->mg: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;->dJ:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK:Lcom/airbnb/lottie/f;
 
-    iput-object p1, v0, Lcom/airbnb/lottie/f;->eB:Lcom/airbnb/lottie/p;
+    iput-object p1, v0, Lcom/airbnb/lottie/f;->eC: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 3184e8abaa..3d6ef520de 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, 0x7f040315
+    const v7, 0x7f040314
 
     aput v7, v5, v3
 
@@ -1310,15 +1310,15 @@
         0x7f0401d6
         0x7f0401f9
         0x7f040203
-        0x7f040267
-        0x7f040283
-        0x7f04029b
+        0x7f040266
+        0x7f040282
+        0x7f04029a
+        0x7f0402c8
         0x7f0402c9
-        0x7f0402ca
-        0x7f040323
-        0x7f040326
-        0x7f0403bf
-        0x7f0403c9
+        0x7f040322
+        0x7f040325
+        0x7f0403be
+        0x7f0403c8
     .end array-data
 
     :array_1
@@ -1327,8 +1327,8 @@
         0x7f04004c
         0x7f0400b3
         0x7f04015c
-        0x7f040326
-        0x7f0403c9
+        0x7f040325
+        0x7f0403c8
     .end array-data
 
     :array_2
@@ -1342,11 +1342,11 @@
         0x10100f2
         0x7f040079
         0x7f04007a
+        0x7f04025d
         0x7f04025e
-        0x7f04025f
-        0x7f040280
+        0x7f04027f
+        0x7f040307
         0x7f040308
-        0x7f040309
     .end array-data
 
     :array_4
@@ -1376,17 +1376,17 @@
     :array_7
     .array-data 4
         0x1010119
-        0x7f040313
+        0x7f040312
+        0x7f0403bc
         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
-        0x7f04025a
-        0x7f040349
+        0x7f040259
+        0x7f040348
     .end array-data
 
     :array_b
@@ -1488,41 +1488,41 @@
         0x7f040119
         0x7f040168
         0x7f0401e1
+        0x7f04025b
         0x7f04025c
-        0x7f04025d
+        0x7f04025f
         0x7f040260
         0x7f040261
         0x7f040262
         0x7f040263
         0x7f040264
         0x7f040265
-        0x7f040266
+        0x7f04028f
         0x7f040290
         0x7f040291
-        0x7f040292
-        0x7f04029a
-        0x7f04029c
-        0x7f0402cf
+        0x7f040299
+        0x7f04029b
+        0x7f0402ce
+        0x7f0402d1
         0x7f0402d2
         0x7f0402d3
-        0x7f0402d4
-        0x7f0402fb
+        0x7f0402fa
+        0x7f0402fc
         0x7f0402fd
         0x7f0402fe
-        0x7f0402ff
+        0x7f04030f
         0x7f040310
-        0x7f040311
-        0x7f04032a
+        0x7f040329
+        0x7f040353
         0x7f040354
         0x7f040355
         0x7f040356
-        0x7f040357
+        0x7f040358
         0x7f040359
         0x7f04035a
         0x7f04035b
-        0x7f04035c
+        0x7f04035e
         0x7f04035f
-        0x7f040360
         0x7f0403cb
         0x7f0403cc
         0x7f0403cd
@@ -1557,7 +1557,7 @@
     :array_e
     .array-data 4
         0x7f04020a
-        0x7f04031a
+        0x7f040319
     .end array-data
 
     :array_f
@@ -1579,8 +1579,8 @@
         0x7f0400b8
         0x7f040112
         0x7f040150
-        0x7f04030f
-        0x7f0403b6
+        0x7f04030e
+        0x7f0403b5
     .end array-data
 
     :array_11
@@ -1638,8 +1638,8 @@
         0x1010128
         0x7f04010b
         0x7f040110
-        0x7f04027e
-        0x7f040305
+        0x7f04027d
+        0x7f040304
     .end array-data
 
     :array_16
@@ -1658,6 +1658,7 @@
 
     :array_18
     .array-data 4
+        0x7f040268
         0x7f040269
         0x7f04026a
         0x7f04026b
@@ -1671,7 +1672,6 @@
         0x7f040273
         0x7f040274
         0x7f040275
-        0x7f040276
     .end array-data
 
     :array_19
@@ -1706,8 +1706,8 @@
         0x7f0400ce
         0x7f0401dc
         0x7f0401dd
-        0x7f040287
-        0x7f040301
+        0x7f040286
+        0x7f040300
         0x7f0403cf
     .end array-data
 
@@ -1720,21 +1720,21 @@
         0x101012f
         0x1010130
         0x1010131
-        0x7f04029d
-        0x7f040321
+        0x7f04029c
+        0x7f040320
     .end array-data
 
     :array_1c
     .array-data 4
         0x1010176
         0x10102c9
-        0x7f040288
+        0x7f040287
     .end array-data
 
     :array_1d
     .array-data 4
-        0x7f04028c
-        0x7f04028f
+        0x7f04028b
+        0x7f04028e
     .end array-data
 
     :array_1e
@@ -1749,12 +1749,12 @@
         0x7f040155
         0x7f0401de
         0x7f04020d
+        0x7f0402cc
         0x7f0402cd
-        0x7f0402ce
+        0x7f0402f8
         0x7f0402f9
-        0x7f0402fa
-        0x7f040322
-        0x7f040327
+        0x7f040321
+        0x7f040326
         0x7f0403ef
     .end array-data
 
@@ -1764,7 +1764,7 @@
         0x1010176
         0x101017b
         0x1010262
-        0x7f04029b
+        0x7f04029a
     .end array-data
 
     :array_20
@@ -1782,14 +1782,14 @@
         0x1010124
         0x1010125
         0x1010142
-        0x7f040307
-        0x7f040312
+        0x7f040306
+        0x7f040311
+        0x7f040327
         0x7f040328
-        0x7f040329
-        0x7f04032b
+        0x7f04032a
+        0x7f0403b6
         0x7f0403b7
         0x7f0403b8
-        0x7f0403b9
         0x7f0403d0
         0x7f0403d1
         0x7f0403d2
@@ -1809,7 +1809,7 @@
         0x1010164
         0x10103ac
         0x7f040145
-        0x7f040349
+        0x7f040348
     .end array-data
 
     :array_23
@@ -1825,16 +1825,17 @@
         0x7f0400d2
         0x7f0400d3
         0x7f0400d4
+        0x7f040266
         0x7f040267
-        0x7f040268
-        0x7f04027b
+        0x7f04027a
+        0x7f040280
         0x7f040281
-        0x7f040282
-        0x7f04029b
+        0x7f04029a
+        0x7f040322
         0x7f040323
         0x7f040324
-        0x7f040325
-        0x7f0403bf
+        0x7f0403be
+        0x7f0403c0
         0x7f0403c1
         0x7f0403c2
         0x7f0403c3
@@ -1842,16 +1843,15 @@
         0x7f0403c5
         0x7f0403c6
         0x7f0403c7
-        0x7f0403c8
     .end array-data
 
     :array_24
     .array-data 4
         0x1010000
         0x10100da
+        0x7f04028c
         0x7f04028d
-        0x7f04028e
-        0x7f040365
+        0x7f040364
     .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 00fe5d76d4..bf6773ef9c 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 fV:Ljava/util/List;
+.field final fW:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -25,7 +25,7 @@
     .end annotation
 .end field
 
-.field final fW:Lcom/airbnb/lottie/a/a/s;
+.field final fX: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;->fV:Ljava/util/List;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/a/a$a;->fW:Ljava/util/List;
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/a$a;->fW:Lcom/airbnb/lottie/a/a/s;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/a$a;->fX: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 07c3ec55a9..54a8371e9c 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 dJ:Lcom/airbnb/lottie/f;
+.field private final dK:Lcom/airbnb/lottie/f;
 
-.field private final fL:Landroid/graphics/PathMeasure;
+.field private final fM:Landroid/graphics/PathMeasure;
 
-.field private final fM:Landroid/graphics/Path;
+.field private final fN:Landroid/graphics/Path;
 
-.field protected final fN:Lcom/airbnb/lottie/c/c/a;
+.field protected final fO:Lcom/airbnb/lottie/c/c/a;
 
-.field private final fO:Ljava/util/List;
+.field private final fP:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -35,9 +35,9 @@
     .end annotation
 .end field
 
-.field private final fP:[F
+.field private final fQ:[F
 
-.field private final fQ: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<",
@@ -48,7 +48,7 @@
     .end annotation
 .end field
 
-.field private final fR:Lcom/airbnb/lottie/a/b/a;
+.field private final fS: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 fS:Ljava/util/List;
+.field private final fT:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -71,7 +71,7 @@
     .end annotation
 .end field
 
-.field private final fT:Lcom/airbnb/lottie/a/b/a;
+.field private final fU: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 fU:Lcom/airbnb/lottie/a/b/a;
+.field private fV: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;->fL:Landroid/graphics/PathMeasure;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/a/a;->fM: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;->fM:Landroid/graphics/Path;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/a/a;->fN: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;->fO:Ljava/util/List;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/a/a;->fP: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;->dJ:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/a;->dK:Lcom/airbnb/lottie/f;
 
-    iput-object p2, p0, Lcom/airbnb/lottie/a/a/a;->fN:Lcom/airbnb/lottie/c/c/a;
+    iput-object p2, p0, Lcom/airbnb/lottie/a/a/a;->fO: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;->fR:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/a;->fS: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;->fQ:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/a;->fR: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;->fT:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/a;->fU: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;->fT:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/a;->fU: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;->fS:Ljava/util/List;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/a;->fT: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;->fP:[F
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/a;->fQ:[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;->fS:Ljava/util/List;
+    iget-object p4, p0, Lcom/airbnb/lottie/a/a/a;->fT: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;->fR:Lcom/airbnb/lottie/a/b/a;
+    iget-object p3, p0, Lcom/airbnb/lottie/a/a/a;->fS: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;->fQ: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
 
     const/4 p3, 0x0
 
     :goto_2
-    iget-object p4, p0, Lcom/airbnb/lottie/a/a/a;->fS:Ljava/util/List;
+    iget-object p4, p0, Lcom/airbnb/lottie/a/a/a;->fT: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;->fS:Ljava/util/List;
+    iget-object p4, p0, Lcom/airbnb/lottie/a/a/a;->fT: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;->fT: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_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;->fR:Lcom/airbnb/lottie/a/b/a;
+    iget-object p2, p0, Lcom/airbnb/lottie/a/a/a;->fS: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;->fQ: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
 
@@ -315,7 +315,7 @@
 
     if-ge p1, p2, :cond_4
 
-    iget-object p2, p0, Lcom/airbnb/lottie/a/a/a;->fS:Ljava/util/List;
+    iget-object p2, p0, Lcom/airbnb/lottie/a/a/a;->fT: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;->fT:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/a;->fU: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;->fW:Lcom/airbnb/lottie/a/a/s;
+    iget-object v1, p2, Lcom/airbnb/lottie/a/a/a$a;->fX: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;->fV:Ljava/util/List;
+    iget-object v1, p2, Lcom/airbnb/lottie/a/a/a$a;->fW: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;->fV:Ljava/util/List;
+    iget-object v3, p2, Lcom/airbnb/lottie/a/a/a$a;->fW: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;->fL:Landroid/graphics/PathMeasure;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/a;->fM: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;->fL:Landroid/graphics/PathMeasure;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/a;->fM: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;->fL:Landroid/graphics/PathMeasure;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/a/a;->fM: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;->fL:Landroid/graphics/PathMeasure;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/a/a;->fM: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;->fW:Lcom/airbnb/lottie/a/a/s;
+    iget-object v2, p2, Lcom/airbnb/lottie/a/a/a$a;->fX:Lcom/airbnb/lottie/a/a/s;
 
-    iget-object v2, v2, Lcom/airbnb/lottie/a/a/s;->gL:Lcom/airbnb/lottie/a/b/a;
+    iget-object v2, v2, Lcom/airbnb/lottie/a/a/s;->gM: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;->fW:Lcom/airbnb/lottie/a/a/s;
+    iget-object v4, p2, Lcom/airbnb/lottie/a/a/a$a;->fX:Lcom/airbnb/lottie/a/a/s;
 
-    iget-object v4, v4, Lcom/airbnb/lottie/a/a/s;->gJ:Lcom/airbnb/lottie/a/b/a;
+    iget-object v4, v4, Lcom/airbnb/lottie/a/a/s;->gK: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;->fW:Lcom/airbnb/lottie/a/a/s;
+    iget-object v6, p2, Lcom/airbnb/lottie/a/a/a$a;->fX:Lcom/airbnb/lottie/a/a/s;
 
-    iget-object v6, v6, Lcom/airbnb/lottie/a/a/s;->gK:Lcom/airbnb/lottie/a/b/a;
+    iget-object v6, v6, Lcom/airbnb/lottie/a/a/s;->gL: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;->fV:Ljava/util/List;
+    iget-object v2, p2, Lcom/airbnb/lottie/a/a/a$a;->fW: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;->fM:Landroid/graphics/Path;
+    iget-object v8, p0, Lcom/airbnb/lottie/a/a/a;->fN:Landroid/graphics/Path;
 
-    iget-object v9, p2, Lcom/airbnb/lottie/a/a/a$a;->fV:Ljava/util/List;
+    iget-object v9, p2, Lcom/airbnb/lottie/a/a/a$a;->fW: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;->fM:Landroid/graphics/Path;
+    iget-object v8, p0, Lcom/airbnb/lottie/a/a/a;->fN: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;->fL:Landroid/graphics/PathMeasure;
+    iget-object v8, p0, Lcom/airbnb/lottie/a/a/a;->fM:Landroid/graphics/PathMeasure;
 
-    iget-object v9, p0, Lcom/airbnb/lottie/a/a/a;->fM:Landroid/graphics/Path;
+    iget-object v9, p0, Lcom/airbnb/lottie/a/a/a;->fN: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;->fL:Landroid/graphics/PathMeasure;
+    iget-object v8, p0, Lcom/airbnb/lottie/a/a/a;->fM: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;->fM:Landroid/graphics/Path;
+    iget-object v9, p0, Lcom/airbnb/lottie/a/a/a;->fN: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;->fM:Landroid/graphics/Path;
+    iget-object v10, p0, Lcom/airbnb/lottie/a/a/a;->fN: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;->fM:Landroid/graphics/Path;
+    iget-object v9, p0, Lcom/airbnb/lottie/a/a/a;->fN: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;->fR:Lcom/airbnb/lottie/a/b/a;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/a/a;->fS: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;->fQ:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/a;->fR: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;->fS:Ljava/util/List;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/a/a;->fT: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;->fS:Ljava/util/List;
+    iget-object v5, p0, Lcom/airbnb/lottie/a/a/a;->fT: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;->fP:[F
+    iget-object v5, p0, Lcom/airbnb/lottie/a/a/a;->fQ:[F
 
-    iget-object v6, p0, Lcom/airbnb/lottie/a/a/a;->fS:Ljava/util/List;
+    iget-object v6, p0, Lcom/airbnb/lottie/a/a/a;->fT: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;->fP:[F
+    iget-object v5, p0, Lcom/airbnb/lottie/a/a/a;->fQ:[F
 
     aget v6, v5, v4
 
@@ -817,7 +817,7 @@
     goto :goto_1
 
     :cond_3
-    iget-object v5, p0, Lcom/airbnb/lottie/a/a/a;->fP:[F
+    iget-object v5, p0, Lcom/airbnb/lottie/a/a/a;->fQ:[F
 
     aget v6, v5, v4
 
@@ -831,7 +831,7 @@
 
     :cond_4
     :goto_1
-    iget-object v5, p0, Lcom/airbnb/lottie/a/a/a;->fP:[F
+    iget-object v5, p0, Lcom/airbnb/lottie/a/a/a;->fQ:[F
 
     aget v6, v5, v4
 
@@ -844,7 +844,7 @@
     goto :goto_0
 
     :cond_5
-    iget-object v2, p0, Lcom/airbnb/lottie/a/a/a;->fT:Lcom/airbnb/lottie/a/b/a;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/a/a;->fU: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;->fP:[F
+    iget-object v5, p0, Lcom/airbnb/lottie/a/a/a;->fQ:[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;->fU:Lcom/airbnb/lottie/a/b/a;
+    iget-object p3, p0, Lcom/airbnb/lottie/a/a/a;->fV: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;->fO:Ljava/util/List;
+    iget-object p3, p0, Lcom/airbnb/lottie/a/a/a;->fP: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;->fO:Ljava/util/List;
+    iget-object p3, p0, Lcom/airbnb/lottie/a/a/a;->fP: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;->fW:Lcom/airbnb/lottie/a/a/s;
+    iget-object v1, p3, Lcom/airbnb/lottie/a/a/a$a;->fX: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;->fV:Ljava/util/List;
+    iget-object v2, p3, Lcom/airbnb/lottie/a/a/a$a;->fW: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;->fV:Ljava/util/List;
+    iget-object v5, p3, Lcom/airbnb/lottie/a/a/a$a;->fW: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;->fO:Ljava/util/List;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/a/a;->fP: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;->fO:Ljava/util/List;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/a/a;->fP: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;->fV:Ljava/util/List;
+    iget-object v4, v2, Lcom/airbnb/lottie/a/a/a$a;->fW: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;->fV:Ljava/util/List;
+    iget-object v5, v2, Lcom/airbnb/lottie/a/a/a$a;->fW: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;->fQ:Lcom/airbnb/lottie/a/b/a;
+    iget-object p2, p0, Lcom/airbnb/lottie/a/a/a;->fR: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;->eW:Ljava/lang/Integer;
+    sget-object v0, Lcom/airbnb/lottie/j;->eX: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;->fu:Landroid/graphics/ColorFilter;
+    sget-object v0, Lcom/airbnb/lottie/j;->fv: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;->fU:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/a;->fV: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;->fU:Lcom/airbnb/lottie/a/b/a;
+    iput-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;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/a;->fV: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;->fN:Lcom/airbnb/lottie/c/c/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/a;->fO:Lcom/airbnb/lottie/c/c/a;
 
-    iget-object p2, p0, Lcom/airbnb/lottie/a/a/a;->fU:Lcom/airbnb/lottie/a/b/a;
+    iget-object p2, p0, Lcom/airbnb/lottie/a/a/a;->fV: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;->gI:I
+    iget v4, v3, Lcom/airbnb/lottie/a/a/s;->gJ:I
 
-    sget v5, Lcom/airbnb/lottie/c/b/q$a;->jN:I
+    sget v5, Lcom/airbnb/lottie/c/b/q$a;->jO: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;->gI:I
+    iget v5, v3, Lcom/airbnb/lottie/a/a/s;->gJ:I
 
-    sget v6, Lcom/airbnb/lottie/c/b/q$a;->jN:I
+    sget v6, Lcom/airbnb/lottie/c/b/q$a;->jO:I
 
     if-ne v5, v6, :cond_4
 
     if-eqz v1, :cond_3
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/a/a;->fO:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/a;->fP: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;->fV:Ljava/util/List;
+    iget-object v3, v1, Lcom/airbnb/lottie/a/a/a$a;->fW: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;->fO:Ljava/util/List;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/a;->fP: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;->dJ:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/a;->dK: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 30ce15c5cf..a236912a4a 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 fX:Ljava/util/List;
+.field private fY: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;->fX:Ljava/util/List;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/a/b;->fY: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;->fX:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/b;->fY: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;->fX:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/b;->fY: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;->fX:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/b;->fY: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 34e114d614..031f567d59 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 dJ:Lcom/airbnb/lottie/f;
+.field private final dK:Lcom/airbnb/lottie/f;
 
-.field private final fX:Ljava/util/List;
+.field private final fY:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -22,9 +22,9 @@
     .end annotation
 .end field
 
-.field private final fY:Z
+.field private final fZ:Z
 
-.field private fZ:Ljava/util/List;
+.field private ga:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -34,7 +34,7 @@
     .end annotation
 .end field
 
-.field private ga:Lcom/airbnb/lottie/a/b/o;
+.field private gb: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;->fY:Z
+    iget-boolean v4, p3, Lcom/airbnb/lottie/c/b/n;->fZ: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;->dJ:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/d;->dK:Lcom/airbnb/lottie/f;
 
-    iput-boolean p4, p0, Lcom/airbnb/lottie/a/a/d;->fY:Z
+    iput-boolean p4, p0, Lcom/airbnb/lottie/a/a/d;->fZ:Z
 
-    iput-object p5, p0, Lcom/airbnb/lottie/a/a/d;->fX:Ljava/util/List;
+    iput-object p5, p0, Lcom/airbnb/lottie/a/a/d;->fY: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;->ga:Lcom/airbnb/lottie/a/b/o;
+    iput-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;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/d;->gb: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;->ga:Lcom/airbnb/lottie/a/b/o;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/d;->gb: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;->fY:Z
+    iget-boolean v0, p0, Lcom/airbnb/lottie/a/a/d;->fZ: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;->ga:Lcom/airbnb/lottie/a/b/o;
+    iget-object p2, p0, Lcom/airbnb/lottie/a/a/d;->gb: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;->ga:Lcom/airbnb/lottie/a/b/o;
+    iget-object p2, p0, Lcom/airbnb/lottie/a/a/d;->gb:Lcom/airbnb/lottie/a/b/o;
 
-    iget-object p2, p2, Lcom/airbnb/lottie/a/b/o;->hr:Lcom/airbnb/lottie/a/b/a;
+    iget-object p2, p2, Lcom/airbnb/lottie/a/b/o;->hs: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;->ga:Lcom/airbnb/lottie/a/b/o;
+    iget-object p2, p0, Lcom/airbnb/lottie/a/a/d;->gb:Lcom/airbnb/lottie/a/b/o;
 
-    iget-object p2, p2, Lcom/airbnb/lottie/a/b/o;->hr:Lcom/airbnb/lottie/a/b/a;
+    iget-object p2, p2, Lcom/airbnb/lottie/a/b/o;->hs: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;->fX:Ljava/util/List;
+    iget-object p2, p0, Lcom/airbnb/lottie/a/a/d;->fY: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;->fX:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/d;->fY: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;->ga:Lcom/airbnb/lottie/a/b/o;
+    iget-object p2, p0, Lcom/airbnb/lottie/a/a/d;->gb: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;->fX:Ljava/util/List;
+    iget-object p2, p0, Lcom/airbnb/lottie/a/a/d;->fY: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;->fX:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/d;->fY: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;->fX:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/d;->fY: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;->fX:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/d;->fY: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;->ga:Lcom/airbnb/lottie/a/b/o;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/d;->gb: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;->fX:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/d;->fY: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;->fX:Ljava/util/List;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/d;->fY: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;->fX:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/d;->fY: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;->fX:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/d;->fY: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;->dJ:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/d;->dK: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;->fZ:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/d;->ga: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;->fZ:Ljava/util/List;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/a/d;->ga:Ljava/util/List;
 
     const/4 v0, 0x0
 
     :goto_0
-    iget-object v1, p0, Lcom/airbnb/lottie/a/a/d;->fX:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/d;->fY: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;->fX:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/d;->fY: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;->fZ:Ljava/util/List;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/a/d;->ga: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;->fZ:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/d;->ga: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;->ga:Lcom/airbnb/lottie/a/b/o;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/d;->gb: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;->ga:Lcom/airbnb/lottie/a/b/o;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/d;->gb: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;->fY:Z
+    iget-boolean v0, p0, Lcom/airbnb/lottie/a/a/d;->fZ: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;->fX:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/d;->fY: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;->fX:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/d;->fY: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 053749c18a..197e0c9d6a 100644
--- a/com.discord/smali/com/airbnb/lottie/a/a/f.smali
+++ b/com.discord/smali/com/airbnb/lottie/a/a/f.smali
@@ -9,18 +9,7 @@
 
 
 # instance fields
-.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 dK:Lcom/airbnb/lottie/f;
 
 .field private final gc:Lcom/airbnb/lottie/a/b/a;
     .annotation system Ldalvik/annotation/Signature;
@@ -33,11 +22,22 @@
     .end annotation
 .end field
 
-.field private final gd:Lcom/airbnb/lottie/c/b/a;
+.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 final ge:Lcom/airbnb/lottie/c/b/a;
 
-.field private gf:Z
+.field private gf:Lcom/airbnb/lottie/a/a/b;
+
+.field private gg: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;->ge:Lcom/airbnb/lottie/a/a/b;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/a/f;->gf: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;->dJ:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/f;->dK:Lcom/airbnb/lottie/f;
 
-    iget-object p1, p3, Lcom/airbnb/lottie/c/b/a;->iC:Lcom/airbnb/lottie/c/a/f;
+    iget-object p1, p3, Lcom/airbnb/lottie/c/b/a;->iD: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;->gb:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/f;->gc:Lcom/airbnb/lottie/a/b/a;
 
-    iget-object p1, p3, Lcom/airbnb/lottie/c/b/a;->iu:Lcom/airbnb/lottie/c/a/m;
+    iget-object p1, p3, Lcom/airbnb/lottie/c/b/a;->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/f;->gc:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/f;->gd:Lcom/airbnb/lottie/a/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
+    iput-object p3, p0, Lcom/airbnb/lottie/a/a/f;->ge:Lcom/airbnb/lottie/c/b/a;
 
     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;->gb:Lcom/airbnb/lottie/a/b/a;
+    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;
 
     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;->gc:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/f;->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
 
@@ -139,22 +139,22 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/airbnb/lottie/j;->eZ: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/f;->gb: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
 
     return-void
 
     :cond_0
-    sget-object v0, Lcom/airbnb/lottie/j;->fc:Landroid/graphics/PointF;
+    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/f;->gc:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/f;->gd: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;->gI:I
+    iget v1, v0, Lcom/airbnb/lottie/a/a/s;->gJ:I
 
-    sget v2, Lcom/airbnb/lottie/c/b/q$a;->jM:I
+    sget v2, Lcom/airbnb/lottie/c/b/q$a;->jN:I
 
     if-ne v1, v2, :cond_0
 
-    iget-object v1, p0, Lcom/airbnb/lottie/a/a/f;->ge:Lcom/airbnb/lottie/a/a/b;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/f;->gf: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;->gf:Z
+    iput-boolean v0, p0, Lcom/airbnb/lottie/a/a/f;->gg:Z
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/a/f;->dJ:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/f;->dK: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;->gf:Z
+    iget-boolean v1, v0, Lcom/airbnb/lottie/a/a/f;->gg: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;->gd:Lcom/airbnb/lottie/c/b/a;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/a/f;->ge:Lcom/airbnb/lottie/c/b/a;
 
-    iget-boolean v1, v1, Lcom/airbnb/lottie/c/b/a;->fY:Z
+    iget-boolean v1, v1, Lcom/airbnb/lottie/c/b/a;->fZ:Z
 
     const/4 v2, 0x1
 
     if-eqz v1, :cond_1
 
-    iput-boolean v2, v0, Lcom/airbnb/lottie/a/a/f;->gf:Z
+    iput-boolean v2, v0, Lcom/airbnb/lottie/a/a/f;->gg: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;->gb: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;
 
@@ -293,9 +293,9 @@
 
     invoke-virtual {v5}, Landroid/graphics/Path;->reset()V
 
-    iget-object v5, v0, Lcom/airbnb/lottie/a/a/f;->gd:Lcom/airbnb/lottie/c/b/a;
+    iget-object v5, v0, Lcom/airbnb/lottie/a/a/f;->ge:Lcom/airbnb/lottie/c/b/a;
 
-    iget-boolean v5, v5, Lcom/airbnb/lottie/c/b/a;->iD:Z
+    iget-boolean v5, v5, Lcom/airbnb/lottie/c/b/a;->iE: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;->gc:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/a/f;->gd: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;->ge:Lcom/airbnb/lottie/a/a/b;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/a/f;->gf: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;->gf:Z
+    iput-boolean v2, v0, Lcom/airbnb/lottie/a/a/f;->gg: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 2dc11ab31b..8d74f05245 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 dJ:Lcom/airbnb/lottie/f;
+.field private final dK:Lcom/airbnb/lottie/f;
 
-.field private final fN:Lcom/airbnb/lottie/c/c/a;
+.field private final fO:Lcom/airbnb/lottie/c/c/a;
 
-.field private final fR:Lcom/airbnb/lottie/a/b/a;
+.field private final fS: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 fU:Lcom/airbnb/lottie/a/b/a;
+.field private fV: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 fV:Ljava/util/List;
+.field private final fW:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -45,9 +45,9 @@
     .end annotation
 .end field
 
-.field private final fY:Z
+.field private final fZ:Z
 
-.field private final gg: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<",
@@ -89,25 +89,25 @@
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lcom/airbnb/lottie/a/a/g;->fV:Ljava/util/List;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/a/g;->fW:Ljava/util/List;
 
-    iput-object p2, p0, Lcom/airbnb/lottie/a/a/g;->fN:Lcom/airbnb/lottie/c/c/a;
+    iput-object p2, p0, Lcom/airbnb/lottie/a/a/g;->fO: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;->fY:Z
+    iget-boolean v0, p3, Lcom/airbnb/lottie/c/b/m;->fZ:Z
 
-    iput-boolean v0, p0, Lcom/airbnb/lottie/a/a/g;->fY:Z
+    iput-boolean v0, p0, Lcom/airbnb/lottie/a/a/g;->fZ:Z
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/g;->dJ:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/g;->dK:Lcom/airbnb/lottie/f;
 
-    iget-object p1, p3, Lcom/airbnb/lottie/c/b/m;->im:Lcom/airbnb/lottie/c/a/a;
+    iget-object p1, p3, Lcom/airbnb/lottie/c/b/m;->io:Lcom/airbnb/lottie/c/a/a;
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p3, Lcom/airbnb/lottie/c/b/m;->ix:Lcom/airbnb/lottie/c/a/d;
+    iget-object p1, p3, Lcom/airbnb/lottie/c/b/m;->iy: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;->iH:Landroid/graphics/Path$FillType;
+    iget-object v0, p3, Lcom/airbnb/lottie/c/b/m;->iI: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;->im:Lcom/airbnb/lottie/c/a/a;
+    iget-object p1, p3, Lcom/airbnb/lottie/c/b/m;->io: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;->gg:Lcom/airbnb/lottie/a/b/a;
+    iput-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;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/g;->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
 
-    iget-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;
 
     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;->ix:Lcom/airbnb/lottie/c/a/d;
+    iget-object p1, p3, Lcom/airbnb/lottie/c/b/m;->iy: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;->fR:Lcom/airbnb/lottie/a/b/a;
+    iput-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;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/g;->fS: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;->fR:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/g;->fS: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;->gg:Lcom/airbnb/lottie/a/b/a;
+    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;->fR:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/g;->fS: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;->fY:Z
+    iget-boolean v0, p0, Lcom/airbnb/lottie/a/a/g;->fZ: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;->gg:Lcom/airbnb/lottie/a/b/a;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/a/g;->gh: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;->fR:Lcom/airbnb/lottie/a/b/a;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/a/g;->fS: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;->fU:Lcom/airbnb/lottie/a/b/a;
+    iget-object p3, p0, Lcom/airbnb/lottie/a/a/g;->fV: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;->fV:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/g;->fW: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;->fV:Ljava/util/List;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/a/g;->fW: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;->fV:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/g;->fW: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;->fV:Ljava/util/List;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/a/g;->fW: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;->eT: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/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;
 
     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;->eW:Ljava/lang/Integer;
+    sget-object v0, Lcom/airbnb/lottie/j;->eX:Ljava/lang/Integer;
 
     if-ne p1, v0, :cond_1
 
-    iget-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;
 
     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;->fu:Landroid/graphics/ColorFilter;
+    sget-object v0, Lcom/airbnb/lottie/j;->fv: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;->fU:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/g;->fV: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;->fU:Lcom/airbnb/lottie/a/b/a;
+    iput-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;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/g;->fV: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;->fN:Lcom/airbnb/lottie/c/c/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/g;->fO:Lcom/airbnb/lottie/c/c/a;
 
-    iget-object p2, p0, Lcom/airbnb/lottie/a/a/g;->fU:Lcom/airbnb/lottie/a/b/a;
+    iget-object p2, p0, Lcom/airbnb/lottie/a/a/g;->fV: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;->fV:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/g;->fW: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;->dJ:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/g;->dK: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 4345d778e8..76ceff0a0e 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 dJ:Lcom/airbnb/lottie/f;
+.field private final dK:Lcom/airbnb/lottie/f;
 
-.field private final fN:Lcom/airbnb/lottie/c/c/a;
+.field private final fO:Lcom/airbnb/lottie/c/c/a;
 
-.field private final fR:Lcom/airbnb/lottie/a/b/a;
+.field private final fS: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 fU:Lcom/airbnb/lottie/a/b/a;
+.field private fV: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 fV:Ljava/util/List;
+.field private final fW:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -45,9 +45,9 @@
     .end annotation
 .end field
 
-.field private final fY:Z
+.field private final fZ:Z
 
-.field private final gg: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<",
@@ -58,17 +58,17 @@
     .end annotation
 .end field
 
-.field private final gh:Landroidx/collection/LongSparseArray;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Landroidx/collection/LongSparseArray<",
-            "Landroid/graphics/LinearGradient;",
-            ">;"
-        }
-    .end annotation
-.end field
-
 .field private final gi:Landroidx/collection/LongSparseArray;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Landroidx/collection/LongSparseArray<",
+            "Landroid/graphics/LinearGradient;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private final gj:Landroidx/collection/LongSparseArray;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Landroidx/collection/LongSparseArray<",
@@ -78,22 +78,11 @@
     .end annotation
 .end field
 
-.field private final gj:Landroid/graphics/Matrix;
+.field private final gk:Landroid/graphics/Matrix;
 
-.field private final gk:Landroid/graphics/RectF;
+.field private final gl:Landroid/graphics/RectF;
 
-.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 gm:I
 
 .field private final gn:Lcom/airbnb/lottie/a/b/a;
     .annotation system Ldalvik/annotation/Signature;
@@ -106,9 +95,20 @@
     .end annotation
 .end field
 
-.field private go:Lcom/airbnb/lottie/a/b/p;
+.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 final gp:I
+.field private gp:Lcom/airbnb/lottie/a/b/p;
+
+.field private final gq: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;->gh:Landroidx/collection/LongSparseArray;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/a/h;->gi: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;->gi:Landroidx/collection/LongSparseArray;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/a/h;->gj: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;->gj:Landroid/graphics/Matrix;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/a/h;->gk: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;->gk:Landroid/graphics/RectF;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/a/h;->gl: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;->fV:Ljava/util/List;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/a/h;->fW:Ljava/util/List;
 
-    iput-object p2, p0, Lcom/airbnb/lottie/a/a/h;->fN:Lcom/airbnb/lottie/c/c/a;
+    iput-object p2, p0, Lcom/airbnb/lottie/a/a/h;->fO: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;->fY:Z
+    iget-boolean v0, p3, Lcom/airbnb/lottie/c/b/d;->fZ:Z
 
-    iput-boolean v0, p0, Lcom/airbnb/lottie/a/a/h;->fY:Z
+    iput-boolean v0, p0, Lcom/airbnb/lottie/a/a/h;->fZ:Z
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/h;->dJ:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/h;->dK:Lcom/airbnb/lottie/f;
 
-    iget v0, p3, Lcom/airbnb/lottie/c/b/d;->iG:I
+    iget v0, p3, Lcom/airbnb/lottie/c/b/d;->iH:I
 
-    iput v0, p0, Lcom/airbnb/lottie/a/a/h;->gl:I
+    iput v0, p0, Lcom/airbnb/lottie/a/a/h;->gm: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;->iH:Landroid/graphics/Path$FillType;
+    iget-object v1, p3, Lcom/airbnb/lottie/c/b/d;->iI: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;->dS:Lcom/airbnb/lottie/d;
+    iget-object p1, p1, Lcom/airbnb/lottie/f;->dT:Lcom/airbnb/lottie/d;
 
     invoke-virtual {p1}, Lcom/airbnb/lottie/d;->aH()F
 
@@ -201,53 +201,37 @@
 
     float-to-int p1, p1
 
-    iput p1, p0, Lcom/airbnb/lottie/a/a/h;->gp:I
+    iput p1, p0, Lcom/airbnb/lottie/a/a/h;->gq:I
 
-    iget-object p1, p3, Lcom/airbnb/lottie/c/b/d;->iI:Lcom/airbnb/lottie/c/a/c;
+    iget-object p1, p3, Lcom/airbnb/lottie/c/b/d;->iJ: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;->gg:Lcom/airbnb/lottie/a/b/a;
+    iput-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;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/h;->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
 
-    iget-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;
 
     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;->ix:Lcom/airbnb/lottie/c/a/d;
+    iget-object p1, p3, Lcom/airbnb/lottie/c/b/d;->iy: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;->fR:Lcom/airbnb/lottie/a/b/a;
+    iput-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;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/h;->fS: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;->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;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/h;->fS:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {p2, p1}, Lcom/airbnb/lottie/c/c/a;->a(Lcom/airbnb/lottie/a/b/a;)V
 
@@ -267,13 +251,29 @@
 
     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;->go:Lcom/airbnb/lottie/a/b/p;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/h;->gp: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;->gm:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/h;->gn:Lcom/airbnb/lottie/a/b/a;
 
-    iget v0, v0, Lcom/airbnb/lottie/a/b/a;->dV:F
+    iget v0, v0, Lcom/airbnb/lottie/a/b/a;->dW:F
 
-    iget v1, p0, Lcom/airbnb/lottie/a/a/h;->gp:I
+    iget v1, p0, Lcom/airbnb/lottie/a/a/h;->gq:I
 
     int-to-float v1, v1
 
@@ -353,11 +353,11 @@
 
     move-result v0
 
-    iget-object v1, p0, Lcom/airbnb/lottie/a/a/h;->gn:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/h;->go:Lcom/airbnb/lottie/a/b/a;
 
-    iget v1, v1, Lcom/airbnb/lottie/a/b/a;->dV:F
+    iget v1, v1, Lcom/airbnb/lottie/a/b/a;->dW:F
 
-    iget v2, p0, Lcom/airbnb/lottie/a/a/h;->gp:I
+    iget v2, p0, Lcom/airbnb/lottie/a/a/h;->gq:I
 
     int-to-float v2, v2
 
@@ -367,11 +367,11 @@
 
     move-result v1
 
-    iget-object v2, p0, Lcom/airbnb/lottie/a/a/h;->gg:Lcom/airbnb/lottie/a/b/a;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/a/h;->gh:Lcom/airbnb/lottie/a/b/a;
 
-    iget v2, v2, Lcom/airbnb/lottie/a/b/a;->dV:F
+    iget v2, v2, Lcom/airbnb/lottie/a/b/a;->dW:F
 
-    iget v3, p0, Lcom/airbnb/lottie/a/a/h;->gp:I
+    iget v3, p0, Lcom/airbnb/lottie/a/a/h;->gq: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;->fY:Z
+    iget-boolean v2, v0, Lcom/airbnb/lottie/a/a/h;->fZ: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;->fV:Ljava/util/List;
+    iget-object v5, v0, Lcom/airbnb/lottie/a/a/h;->fW: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;->fV:Ljava/util/List;
+    iget-object v6, v0, Lcom/airbnb/lottie/a/a/h;->fW: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;->gk:Landroid/graphics/RectF;
+    iget-object v5, v0, Lcom/airbnb/lottie/a/a/h;->gl: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;->gl:I
+    iget v3, v0, Lcom/airbnb/lottie/a/a/h;->gm:I
 
-    sget v4, Lcom/airbnb/lottie/c/b/f;->iT:I
+    sget v4, Lcom/airbnb/lottie/c/b/f;->iU:I
 
     if-ne v3, v4, :cond_3
 
@@ -482,7 +482,7 @@
 
     move-result v3
 
-    iget-object v4, v0, Lcom/airbnb/lottie/a/a/h;->gh:Landroidx/collection/LongSparseArray;
+    iget-object v4, v0, Lcom/airbnb/lottie/a/a/h;->gi: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;->gm:Lcom/airbnb/lottie/a/b/a;
+    iget-object v3, v0, Lcom/airbnb/lottie/a/a/h;->gn: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;->gn:Lcom/airbnb/lottie/a/b/a;
+    iget-object v4, v0, Lcom/airbnb/lottie/a/a/h;->go: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;->gg:Lcom/airbnb/lottie/a/b/a;
+    iget-object v7, v0, Lcom/airbnb/lottie/a/a/h;->gh: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;->iF:[I
+    iget-object v8, v7, Lcom/airbnb/lottie/c/b/c;->iG:[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;->iE:[F
+    iget-object v15, v7, Lcom/airbnb/lottie/c/b/c;->iF:[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;->gh:Landroidx/collection/LongSparseArray;
+    iget-object v3, v0, Lcom/airbnb/lottie/a/a/h;->gi: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;->gi:Landroidx/collection/LongSparseArray;
+    iget-object v4, v0, Lcom/airbnb/lottie/a/a/h;->gj: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;->gm:Lcom/airbnb/lottie/a/b/a;
+    iget-object v3, v0, Lcom/airbnb/lottie/a/a/h;->gn: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;->gn:Lcom/airbnb/lottie/a/b/a;
+    iget-object v4, v0, Lcom/airbnb/lottie/a/a/h;->go: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;->gg:Lcom/airbnb/lottie/a/b/a;
+    iget-object v7, v0, Lcom/airbnb/lottie/a/a/h;->gh: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;->iF:[I
+    iget-object v8, v7, Lcom/airbnb/lottie/c/b/c;->iG:[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;->iE:[F
+    iget-object v14, v7, Lcom/airbnb/lottie/c/b/c;->iF:[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;->gi:Landroidx/collection/LongSparseArray;
+    iget-object v4, v0, Lcom/airbnb/lottie/a/a/h;->gj: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;->gj:Landroid/graphics/Matrix;
+    iget-object v4, v0, Lcom/airbnb/lottie/a/a/h;->gk: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;->gj:Landroid/graphics/Matrix;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/a/h;->gk: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;->fU:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/a/h;->fV: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;->fR:Lcom/airbnb/lottie/a/b/a;
+    iget-object v4, v0, Lcom/airbnb/lottie/a/a/h;->fS: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;->fV:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/h;->fW: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;->fV:Ljava/util/List;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/a/h;->fW: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;->eW:Ljava/lang/Integer;
+    sget-object v0, Lcom/airbnb/lottie/j;->eX:Ljava/lang/Integer;
 
     if-ne p1, v0, :cond_0
 
-    iget-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;
 
     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;->fu:Landroid/graphics/ColorFilter;
+    sget-object v0, Lcom/airbnb/lottie/j;->fv: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;->fU:Lcom/airbnb/lottie/a/b/a;
+    iput-object v1, p0, Lcom/airbnb/lottie/a/a/h;->fV: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;->fU:Lcom/airbnb/lottie/a/b/a;
+    iput-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;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/h;->fV: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;->fN:Lcom/airbnb/lottie/c/c/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/h;->fO:Lcom/airbnb/lottie/c/c/a;
 
-    iget-object p2, p0, Lcom/airbnb/lottie/a/a/h;->fU:Lcom/airbnb/lottie/a/b/a;
+    iget-object p2, p0, Lcom/airbnb/lottie/a/a/h;->fV: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;->fv:[Ljava/lang/Integer;
+    sget-object v0, Lcom/airbnb/lottie/j;->fw:[Ljava/lang/Integer;
 
     if-ne p1, v0, :cond_5
 
     if-nez p2, :cond_4
 
-    iget-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;
 
     if-eqz p1, :cond_3
 
-    iget-object p2, p0, Lcom/airbnb/lottie/a/a/h;->fN:Lcom/airbnb/lottie/c/c/a;
+    iget-object p2, p0, Lcom/airbnb/lottie/a/a/h;->fO: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;->go:Lcom/airbnb/lottie/a/b/p;
+    iput-object v1, p0, Lcom/airbnb/lottie/a/a/h;->gp: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;->go:Lcom/airbnb/lottie/a/b/p;
+    iput-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;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/h;->gp: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;->fN:Lcom/airbnb/lottie/c/c/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/h;->fO:Lcom/airbnb/lottie/c/c/a;
 
-    iget-object p2, p0, Lcom/airbnb/lottie/a/a/h;->go:Lcom/airbnb/lottie/a/b/p;
+    iget-object p2, p0, Lcom/airbnb/lottie/a/a/h;->gp: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;->fV:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/h;->fW: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;->dJ:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/h;->dK: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 e7ba314ec7..e6f11e4611 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 fY:Z
+.field private final fZ:Z
 
-.field private final gg: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<",
@@ -17,17 +17,17 @@
     .end annotation
 .end field
 
-.field private final gh:Landroidx/collection/LongSparseArray;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Landroidx/collection/LongSparseArray<",
-            "Landroid/graphics/LinearGradient;",
-            ">;"
-        }
-    .end annotation
-.end field
-
 .field private final gi:Landroidx/collection/LongSparseArray;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Landroidx/collection/LongSparseArray<",
+            "Landroid/graphics/LinearGradient;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private final gj:Landroidx/collection/LongSparseArray;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Landroidx/collection/LongSparseArray<",
@@ -37,20 +37,9 @@
     .end annotation
 .end field
 
-.field private final gk:Landroid/graphics/RectF;
+.field private final gl:Landroid/graphics/RectF;
 
-.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 gm:I
 
 .field private final gn:Lcom/airbnb/lottie/a/b/a;
     .annotation system Ldalvik/annotation/Signature;
@@ -63,9 +52,20 @@
     .end annotation
 .end field
 
-.field private go:Lcom/airbnb/lottie/a/b/p;
+.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 final gp:I
+.field private gp:Lcom/airbnb/lottie/a/b/p;
+
+.field private final gq: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;->iO:Lcom/airbnb/lottie/c/b/p$a;
+    iget-object v0, p3, Lcom/airbnb/lottie/c/b/e;->iP: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;->iP:Lcom/airbnb/lottie/c/b/p$b;
+    iget-object v0, p3, Lcom/airbnb/lottie/c/b/e;->iQ: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;->iQ:F
+    iget v6, p3, Lcom/airbnb/lottie/c/b/e;->iR:F
 
-    iget-object v7, p3, Lcom/airbnb/lottie/c/b/e;->ix:Lcom/airbnb/lottie/c/a/d;
+    iget-object v7, p3, Lcom/airbnb/lottie/c/b/e;->iy:Lcom/airbnb/lottie/c/a/d;
 
-    iget-object v8, p3, Lcom/airbnb/lottie/c/b/e;->iN:Lcom/airbnb/lottie/c/a/b;
+    iget-object v8, p3, Lcom/airbnb/lottie/c/b/e;->iO:Lcom/airbnb/lottie/c/a/b;
 
-    iget-object v9, p3, Lcom/airbnb/lottie/c/b/e;->iR:Ljava/util/List;
+    iget-object v9, p3, Lcom/airbnb/lottie/c/b/e;->iS:Ljava/util/List;
 
-    iget-object v10, p3, Lcom/airbnb/lottie/c/b/e;->iS:Lcom/airbnb/lottie/c/a/b;
+    iget-object v10, p3, Lcom/airbnb/lottie/c/b/e;->iT: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;->gh:Landroidx/collection/LongSparseArray;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/a/i;->gi: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;->gi:Landroidx/collection/LongSparseArray;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/a/i;->gj: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;->gk:Landroid/graphics/RectF;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/a/i;->gl: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;->iG:I
+    iget v0, p3, Lcom/airbnb/lottie/c/b/e;->iH:I
 
-    iput v0, p0, Lcom/airbnb/lottie/a/a/i;->gl:I
+    iput v0, p0, Lcom/airbnb/lottie/a/a/i;->gm:I
 
-    iget-boolean v0, p3, Lcom/airbnb/lottie/c/b/e;->fY:Z
+    iget-boolean v0, p3, Lcom/airbnb/lottie/c/b/e;->fZ:Z
 
-    iput-boolean v0, p0, Lcom/airbnb/lottie/a/a/i;->fY:Z
+    iput-boolean v0, p0, Lcom/airbnb/lottie/a/a/i;->fZ:Z
 
-    iget-object p1, p1, Lcom/airbnb/lottie/f;->dS:Lcom/airbnb/lottie/d;
+    iget-object p1, p1, Lcom/airbnb/lottie/f;->dT:Lcom/airbnb/lottie/d;
 
     invoke-virtual {p1}, Lcom/airbnb/lottie/d;->aH()F
 
@@ -146,37 +146,21 @@
 
     float-to-int p1, p1
 
-    iput p1, p0, Lcom/airbnb/lottie/a/a/i;->gp:I
+    iput p1, p0, Lcom/airbnb/lottie/a/a/i;->gq:I
 
-    iget-object p1, p3, Lcom/airbnb/lottie/c/b/e;->iI:Lcom/airbnb/lottie/c/a/c;
+    iget-object p1, p3, Lcom/airbnb/lottie/c/b/e;->iJ: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;->gg:Lcom/airbnb/lottie/a/b/a;
+    iput-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;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/i;->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
 
-    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;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/i;->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
 
@@ -196,13 +180,29 @@
 
     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;->go:Lcom/airbnb/lottie/a/b/p;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/i;->gp: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;->gm:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/i;->gn:Lcom/airbnb/lottie/a/b/a;
 
-    iget v0, v0, Lcom/airbnb/lottie/a/b/a;->dV:F
+    iget v0, v0, Lcom/airbnb/lottie/a/b/a;->dW:F
 
-    iget v1, p0, Lcom/airbnb/lottie/a/a/i;->gp:I
+    iget v1, p0, Lcom/airbnb/lottie/a/a/i;->gq:I
 
     int-to-float v1, v1
 
@@ -282,11 +282,11 @@
 
     move-result v0
 
-    iget-object v1, p0, Lcom/airbnb/lottie/a/a/i;->gn:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/i;->go:Lcom/airbnb/lottie/a/b/a;
 
-    iget v1, v1, Lcom/airbnb/lottie/a/b/a;->dV:F
+    iget v1, v1, Lcom/airbnb/lottie/a/b/a;->dW:F
 
-    iget v2, p0, Lcom/airbnb/lottie/a/a/i;->gp:I
+    iget v2, p0, Lcom/airbnb/lottie/a/a/i;->gq:I
 
     int-to-float v2, v2
 
@@ -296,11 +296,11 @@
 
     move-result v1
 
-    iget-object v2, p0, Lcom/airbnb/lottie/a/a/i;->gg:Lcom/airbnb/lottie/a/b/a;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/a/i;->gh:Lcom/airbnb/lottie/a/b/a;
 
-    iget v2, v2, Lcom/airbnb/lottie/a/b/a;->dV:F
+    iget v2, v2, Lcom/airbnb/lottie/a/b/a;->dW:F
 
-    iget v3, p0, Lcom/airbnb/lottie/a/a/i;->gp:I
+    iget v3, p0, Lcom/airbnb/lottie/a/a/i;->gq: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;->fY:Z
+    iget-boolean v1, v0, Lcom/airbnb/lottie/a/a/i;->fZ:Z
 
     if-eqz v1, :cond_0
 
     return-void
 
     :cond_0
-    iget-object v1, v0, Lcom/airbnb/lottie/a/a/i;->gk:Landroid/graphics/RectF;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/a/i;->gl: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;->gl:I
+    iget v1, v0, Lcom/airbnb/lottie/a/a/i;->gm:I
 
-    sget v2, Lcom/airbnb/lottie/c/b/f;->iT:I
+    sget v2, Lcom/airbnb/lottie/c/b/f;->iU:I
 
     const/high16 v4, 0x40000000    # 2.0f
 
@@ -371,7 +371,7 @@
 
     move-result v1
 
-    iget-object v2, v0, Lcom/airbnb/lottie/a/a/i;->gh:Landroidx/collection/LongSparseArray;
+    iget-object v2, v0, Lcom/airbnb/lottie/a/a/i;->gi: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;->gm:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/a/i;->gn: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;->gn:Lcom/airbnb/lottie/a/b/a;
+    iget-object v2, v0, Lcom/airbnb/lottie/a/a/i;->go: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;->gg:Lcom/airbnb/lottie/a/b/a;
+    iget-object v7, v0, Lcom/airbnb/lottie/a/a/i;->gh: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;->iF:[I
+    iget-object v8, v7, Lcom/airbnb/lottie/c/b/c;->iG:[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;->iE:[F
+    iget-object v15, v7, Lcom/airbnb/lottie/c/b/c;->iF:[F
 
-    iget-object v7, v0, Lcom/airbnb/lottie/a/a/i;->gk:Landroid/graphics/RectF;
+    iget-object v7, v0, Lcom/airbnb/lottie/a/a/i;->gl:Landroid/graphics/RectF;
 
     iget v7, v7, Landroid/graphics/RectF;->left:F
 
-    iget-object v8, v0, Lcom/airbnb/lottie/a/a/i;->gk:Landroid/graphics/RectF;
+    iget-object v8, v0, Lcom/airbnb/lottie/a/a/i;->gl: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;->gk:Landroid/graphics/RectF;
+    iget-object v8, v0, Lcom/airbnb/lottie/a/a/i;->gl:Landroid/graphics/RectF;
 
     iget v8, v8, Landroid/graphics/RectF;->top:F
 
-    iget-object v9, v0, Lcom/airbnb/lottie/a/a/i;->gk:Landroid/graphics/RectF;
+    iget-object v9, v0, Lcom/airbnb/lottie/a/a/i;->gl: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;->gk:Landroid/graphics/RectF;
+    iget-object v8, v0, Lcom/airbnb/lottie/a/a/i;->gl:Landroid/graphics/RectF;
 
     iget v8, v8, Landroid/graphics/RectF;->left:F
 
-    iget-object v9, v0, Lcom/airbnb/lottie/a/a/i;->gk:Landroid/graphics/RectF;
+    iget-object v9, v0, Lcom/airbnb/lottie/a/a/i;->gl: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;->gk:Landroid/graphics/RectF;
+    iget-object v9, v0, Lcom/airbnb/lottie/a/a/i;->gl:Landroid/graphics/RectF;
 
     iget v9, v9, Landroid/graphics/RectF;->top:F
 
-    iget-object v10, v0, Lcom/airbnb/lottie/a/a/i;->gk:Landroid/graphics/RectF;
+    iget-object v10, v0, Lcom/airbnb/lottie/a/a/i;->gl: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;->gh:Landroidx/collection/LongSparseArray;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/a/i;->gi: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;->gi:Landroidx/collection/LongSparseArray;
+    iget-object v2, v0, Lcom/airbnb/lottie/a/a/i;->gj: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;->gm:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/a/i;->gn: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;->gn:Lcom/airbnb/lottie/a/b/a;
+    iget-object v2, v0, Lcom/airbnb/lottie/a/a/i;->go: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;->gg:Lcom/airbnb/lottie/a/b/a;
+    iget-object v7, v0, Lcom/airbnb/lottie/a/a/i;->gh: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;->iF:[I
+    iget-object v8, v7, Lcom/airbnb/lottie/c/b/c;->iG:[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;->iE:[F
+    iget-object v14, v7, Lcom/airbnb/lottie/c/b/c;->iF:[F
 
-    iget-object v7, v0, Lcom/airbnb/lottie/a/a/i;->gk:Landroid/graphics/RectF;
+    iget-object v7, v0, Lcom/airbnb/lottie/a/a/i;->gl:Landroid/graphics/RectF;
 
     iget v7, v7, Landroid/graphics/RectF;->left:F
 
-    iget-object v8, v0, Lcom/airbnb/lottie/a/a/i;->gk:Landroid/graphics/RectF;
+    iget-object v8, v0, Lcom/airbnb/lottie/a/a/i;->gl: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;->gk:Landroid/graphics/RectF;
+    iget-object v8, v0, Lcom/airbnb/lottie/a/a/i;->gl:Landroid/graphics/RectF;
 
     iget v8, v8, Landroid/graphics/RectF;->top:F
 
-    iget-object v9, v0, Lcom/airbnb/lottie/a/a/i;->gk:Landroid/graphics/RectF;
+    iget-object v9, v0, Lcom/airbnb/lottie/a/a/i;->gl: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;->gk:Landroid/graphics/RectF;
+    iget-object v8, v0, Lcom/airbnb/lottie/a/a/i;->gl:Landroid/graphics/RectF;
 
     iget v8, v8, Landroid/graphics/RectF;->left:F
 
-    iget-object v9, v0, Lcom/airbnb/lottie/a/a/i;->gk:Landroid/graphics/RectF;
+    iget-object v9, v0, Lcom/airbnb/lottie/a/a/i;->gl: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;->gk:Landroid/graphics/RectF;
+    iget-object v9, v0, Lcom/airbnb/lottie/a/a/i;->gl:Landroid/graphics/RectF;
 
     iget v9, v9, Landroid/graphics/RectF;->top:F
 
-    iget-object v10, v0, Lcom/airbnb/lottie/a/a/i;->gk:Landroid/graphics/RectF;
+    iget-object v10, v0, Lcom/airbnb/lottie/a/a/i;->gl: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;->gi:Landroidx/collection/LongSparseArray;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/a/i;->gj: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;->fv:[Ljava/lang/Integer;
+    sget-object v0, Lcom/airbnb/lottie/j;->fw:[Ljava/lang/Integer;
 
     if-ne p1, v0, :cond_2
 
     if-nez p2, :cond_1
 
-    iget-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;
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/i;->fN:Lcom/airbnb/lottie/c/c/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/i;->fO:Lcom/airbnb/lottie/c/c/a;
 
-    iget-object p2, p0, Lcom/airbnb/lottie/a/a/i;->go:Lcom/airbnb/lottie/a/b/p;
+    iget-object p2, p0, Lcom/airbnb/lottie/a/a/i;->gp: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;->go:Lcom/airbnb/lottie/a/b/p;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/i;->gp: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;->go:Lcom/airbnb/lottie/a/b/p;
+    iput-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;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/i;->gp: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;->fN:Lcom/airbnb/lottie/c/c/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/i;->fO:Lcom/airbnb/lottie/c/c/a;
 
-    iget-object p2, p0, Lcom/airbnb/lottie/a/a/i;->go:Lcom/airbnb/lottie/a/b/p;
+    iget-object p2, p0, Lcom/airbnb/lottie/a/a/i;->gp: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 fc3160bd18..c1645e522d 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 gt:[I
+.field static final synthetic gu:[I
 
 
 # direct methods
@@ -30,12 +30,12 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/airbnb/lottie/a/a/l$1;->gt:[I
+    sput-object v0, Lcom/airbnb/lottie/a/a/l$1;->gu:[I
 
     :try_start_0
-    sget-object v0, Lcom/airbnb/lottie/a/a/l$1;->gt:[I
+    sget-object v0, Lcom/airbnb/lottie/a/a/l$1;->gu:[I
 
-    sget-object v1, Lcom/airbnb/lottie/c/b/h$a;->je: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
 
@@ -49,9 +49,9 @@
 
     :catch_0
     :try_start_1
-    sget-object v0, Lcom/airbnb/lottie/a/a/l$1;->gt:[I
+    sget-object v0, Lcom/airbnb/lottie/a/a/l$1;->gu:[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;->jg: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;->gt:[I
+    sget-object v0, Lcom/airbnb/lottie/a/a/l$1;->gu:[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;->jh: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;->gt:[I
+    sget-object v0, Lcom/airbnb/lottie/a/a/l$1;->gu:[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;->ji: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;->gt:[I
+    sget-object v0, Lcom/airbnb/lottie/a/a/l$1;->gu:[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;->jj: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 4502209c8d..c0649bf6e4 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 fZ:Ljava/util/List;
+.field private final ga: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:Lcom/airbnb/lottie/c/b/h;
+.field private final gs:Landroid/graphics/Path;
+
+.field private final gt: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;->gq:Landroid/graphics/Path;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/a/l;->gr: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;->gr:Landroid/graphics/Path;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/a/l;->gs: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;->fZ:Ljava/util/List;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/a/l;->ga: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;->gs:Lcom/airbnb/lottie/c/b/h;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/l;->gt: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;->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;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/l;->ga: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;->fZ:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/l;->ga: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;->gr:Landroid/graphics/Path;
+    iget-object v5, p0, Lcom/airbnb/lottie/a/a/l;->gs: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;->gr:Landroid/graphics/Path;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/a/l;->gs: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;->fZ:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/l;->ga: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;->gq:Landroid/graphics/Path;
+    iget-object v4, p0, Lcom/airbnb/lottie/a/a/l;->gr: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;->gq:Landroid/graphics/Path;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/l;->gr: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;->gq:Landroid/graphics/Path;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/l;->gr:Landroid/graphics/Path;
 
-    iget-object v2, p0, Lcom/airbnb/lottie/a/a/l;->gr:Landroid/graphics/Path;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/a/l;->gs: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;->fZ:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/l;->ga: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;->fZ:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/l;->ga: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;->fZ:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/l;->ga: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;->gs:Lcom/airbnb/lottie/c/b/h;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/l;->gt:Lcom/airbnb/lottie/c/b/h;
 
-    iget-boolean v0, v0, Lcom/airbnb/lottie/c/b/h;->fY:Z
+    iget-boolean v0, v0, Lcom/airbnb/lottie/c/b/h;->fZ: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;->gt:[I
+    sget-object v0, Lcom/airbnb/lottie/a/a/l$1;->gu:[I
 
-    iget-object v1, p0, Lcom/airbnb/lottie/a/a/l;->gs:Lcom/airbnb/lottie/c/b/h;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/l;->gt:Lcom/airbnb/lottie/c/b/h;
 
-    iget-object v1, v1, Lcom/airbnb/lottie/c/b/h;->jd:Lcom/airbnb/lottie/c/b/h$a;
+    iget-object v1, v1, Lcom/airbnb/lottie/c/b/h;->je: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;->fZ:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/l;->ga: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;->fZ:Ljava/util/List;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/a/l;->ga: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 2d32cc7daa..8a4186f027 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 gB:[I
+.field static final synthetic gC:[I
 
 
 # direct methods
@@ -30,12 +30,12 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/airbnb/lottie/a/a/n$1;->gB:[I
+    sput-object v0, Lcom/airbnb/lottie/a/a/n$1;->gC:[I
 
     :try_start_0
-    sget-object v0, Lcom/airbnb/lottie/a/a/n$1;->gB:[I
+    sget-object v0, Lcom/airbnb/lottie/a/a/n$1;->gC:[I
 
-    sget-object v1, Lcom/airbnb/lottie/c/b/i$a;->jp: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
 
@@ -49,9 +49,9 @@
 
     :catch_0
     :try_start_1
-    sget-object v0, Lcom/airbnb/lottie/a/a/n$1;->gB:[I
+    sget-object v0, Lcom/airbnb/lottie/a/a/n$1;->gC:[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;->jr: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 a5f386e575..2cadd25ecd 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 dJ:Lcom/airbnb/lottie/f;
+.field private final dK:Lcom/airbnb/lottie/f;
 
-.field private final fY:Z
+.field private final fZ:Z
 
 .field private final gA:Lcom/airbnb/lottie/a/b/a;
     .annotation system Ldalvik/annotation/Signature;
@@ -24,7 +24,18 @@
     .end annotation
 .end field
 
-.field private final gc:Lcom/airbnb/lottie/a/b/a;
+.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;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/airbnb/lottie/a/b/a<",
@@ -35,22 +46,11 @@
     .end annotation
 .end field
 
-.field private ge:Lcom/airbnb/lottie/a/a/b;
+.field private gf:Lcom/airbnb/lottie/a/a/b;
 
-.field private gf:Z
+.field private gg:Z
 
-.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 gv:Lcom/airbnb/lottie/c/b/i$a;
 
 .field private final gw:Lcom/airbnb/lottie/a/b/a;
     .annotation system Ldalvik/annotation/Signature;
@@ -117,39 +117,23 @@
 
     invoke-direct {v0}, Lcom/airbnb/lottie/a/a/b;-><init>()V
 
-    iput-object v0, p0, Lcom/airbnb/lottie/a/a/n;->ge:Lcom/airbnb/lottie/a/a/b;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/a/n;->gf:Lcom/airbnb/lottie/a/a/b;
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/n;->dJ:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/n;->dK: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;->gu:Lcom/airbnb/lottie/c/b/i$a;
+    iget-object p1, p3, Lcom/airbnb/lottie/c/b/i;->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;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/n;->gv:Lcom/airbnb/lottie/c/b/i$a;
 
-    iget-boolean p1, p3, Lcom/airbnb/lottie/c/b/i;->fY:Z
+    iget-boolean p1, p3, Lcom/airbnb/lottie/c/b/i;->fZ:Z
 
-    iput-boolean p1, p0, Lcom/airbnb/lottie/a/a/n;->fY:Z
+    iput-boolean p1, p0, Lcom/airbnb/lottie/a/a/n;->fZ:Z
 
-    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;
+    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;
 
@@ -157,6 +141,44 @@
 
     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;
@@ -173,64 +195,24 @@
 
     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;->gx:Lcom/airbnb/lottie/a/b/a;
+    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;->gz:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/n;->gA: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;->gy:Lcom/airbnb/lottie/a/b/a;
+    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;->gA: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;->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
@@ -239,33 +221,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;->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
+
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/n;->gA: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;->gy:Lcom/airbnb/lottie/a/b/a;
+    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;->gA: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;->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
@@ -274,6 +256,24 @@
 
     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
+
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/n;->gA: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,20 +312,9 @@
         }
     .end annotation
 
-    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
+    if-ne p1, v0, :cond_0
 
     iget-object p1, p0, Lcom/airbnb/lottie/a/a/n;->gw:Lcom/airbnb/lottie/a/b/a;
 
@@ -333,23 +322,34 @@
 
     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;->fc:Landroid/graphics/PointF;
+    sget-object v0, Lcom/airbnb/lottie/j;->fd:Landroid/graphics/PointF;
 
     if-ne p1, v0, :cond_2
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/n;->gc:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/n;->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_2
-    sget-object v0, Lcom/airbnb/lottie/j;->fn:Ljava/lang/Float;
+    sget-object v0, Lcom/airbnb/lottie/j;->fo:Ljava/lang/Float;
 
     if-ne p1, v0, :cond_3
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/a/n;->gx:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/n;->gy: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;->fo:Ljava/lang/Float;
+    sget-object v0, Lcom/airbnb/lottie/j;->fp:Ljava/lang/Float;
 
     if-ne p1, v0, :cond_4
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/n;->gy:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/n;->gz: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;->fp:Ljava/lang/Float;
+    sget-object v0, Lcom/airbnb/lottie/j;->fq:Ljava/lang/Float;
 
     if-ne p1, v0, :cond_5
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/a/n;->gz:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/n;->gA: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;->fq:Ljava/lang/Float;
+    sget-object v0, Lcom/airbnb/lottie/j;->fr:Ljava/lang/Float;
 
     if-ne p1, v0, :cond_6
 
-    iget-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;->gB: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;->gI:I
+    iget v1, v0, Lcom/airbnb/lottie/a/a/s;->gJ:I
 
-    sget v2, Lcom/airbnb/lottie/c/b/q$a;->jM:I
+    sget v2, Lcom/airbnb/lottie/c/b/q$a;->jN:I
 
     if-ne v1, v2, :cond_0
 
-    iget-object v1, p0, Lcom/airbnb/lottie/a/a/n;->ge:Lcom/airbnb/lottie/a/a/b;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/n;->gf: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;->gf:Z
+    iput-boolean v0, p0, Lcom/airbnb/lottie/a/a/n;->gg:Z
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/a/n;->dJ:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/n;->dK: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;->gf:Z
+    iget-boolean v1, v0, Lcom/airbnb/lottie/a/a/n;->gg: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;->fY:Z
+    iget-boolean v1, v0, Lcom/airbnb/lottie/a/a/n;->fZ:Z
 
     const/4 v2, 0x1
 
     if-eqz v1, :cond_1
 
-    iput-boolean v2, v0, Lcom/airbnb/lottie/a/a/n;->gf:Z
+    iput-boolean v2, v0, Lcom/airbnb/lottie/a/a/n;->gg: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;->gB:[I
+    sget-object v1, Lcom/airbnb/lottie/a/a/n$1;->gC:[I
 
-    iget-object v3, v0, Lcom/airbnb/lottie/a/a/n;->gu:Lcom/airbnb/lottie/c/b/i$a;
+    iget-object v3, v0, Lcom/airbnb/lottie/a/a/n;->gv: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;->gv:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/a/n;->gw: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;->gw:Lcom/airbnb/lottie/a/b/a;
+    iget-object v14, v0, Lcom/airbnb/lottie/a/a/n;->gx: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;->gA:Lcom/airbnb/lottie/a/b/a;
+    iget-object v3, v0, Lcom/airbnb/lottie/a/a/n;->gB: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;->gy:Lcom/airbnb/lottie/a/b/a;
+    iget-object v4, v0, Lcom/airbnb/lottie/a/a/n;->gz: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;->gc:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/a/n;->gd: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;->gv:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/a/n;->gw: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;->gw:Lcom/airbnb/lottie/a/b/a;
+    iget-object v2, v0, Lcom/airbnb/lottie/a/a/n;->gx: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;->gy:Lcom/airbnb/lottie/a/b/a;
+    iget-object v9, v0, Lcom/airbnb/lottie/a/a/n;->gz: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;->gx:Lcom/airbnb/lottie/a/b/a;
+    iget-object v11, v0, Lcom/airbnb/lottie/a/a/n;->gy: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;->gz: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_9
 
@@ -944,7 +944,7 @@
     const/4 v13, 0x0
 
     :goto_4
-    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;->gB: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;->gc:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/a/n;->gd: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;->ge:Lcom/airbnb/lottie/a/a/b;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/a/n;->gf: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;->gf:Z
+    iput-boolean v1, v0, Lcom/airbnb/lottie/a/a/n;->gg: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 67c0cc2b41..94d4699af2 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 dJ:Lcom/airbnb/lottie/f;
+.field private final dK:Lcom/airbnb/lottie/f;
 
-.field private final fY:Z
+.field private final fZ:Z
 
-.field private final gC:Lcom/airbnb/lottie/a/b/a;
+.field private final gD:Lcom/airbnb/lottie/a/b/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/airbnb/lottie/a/b/a<",
@@ -24,17 +24,6 @@
     .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 = {
@@ -46,9 +35,20 @@
     .end annotation
 .end field
 
-.field private ge:Lcom/airbnb/lottie/a/a/b;
+.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 gf:Z
+.field private gf:Lcom/airbnb/lottie/a/a/b;
+
+.field private gg: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;->ge:Lcom/airbnb/lottie/a/a/b;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/a/o;->gf: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;->fY:Z
+    iget-boolean v0, p3, Lcom/airbnb/lottie/c/b/j;->fZ:Z
 
-    iput-boolean v0, p0, Lcom/airbnb/lottie/a/a/o;->fY:Z
+    iput-boolean v0, p0, Lcom/airbnb/lottie/a/a/o;->fZ:Z
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/o;->dJ:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/o;->dK:Lcom/airbnb/lottie/f;
 
-    iget-object p1, p3, Lcom/airbnb/lottie/c/b/j;->iu:Lcom/airbnb/lottie/c/a/m;
+    iget-object p1, p3, Lcom/airbnb/lottie/c/b/j;->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/o;->gc:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/o;->gd:Lcom/airbnb/lottie/a/b/a;
 
-    iget-object p1, p3, Lcom/airbnb/lottie/c/b/j;->iC:Lcom/airbnb/lottie/c/a/f;
+    iget-object p1, p3, Lcom/airbnb/lottie/c/b/j;->iD: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;->gb: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;->js:Lcom/airbnb/lottie/c/a/b;
+    iget-object p1, p3, Lcom/airbnb/lottie/c/b/j;->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/o;->gC:Lcom/airbnb/lottie/a/b/a;
+    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;->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;->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;->gC: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
 
     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;->gb: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
+
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/o;->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/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 {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;
 
     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;->fa:Landroid/graphics/PointF;
+    sget-object v0, Lcom/airbnb/lottie/j;->fb: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;->fb:Ljava/lang/Float;
+    sget-object v0, Lcom/airbnb/lottie/j;->fc:Ljava/lang/Float;
 
     if-ne p1, v0, :cond_2
 
-    iget-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;->gD: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;->gI:I
+    iget v1, v0, Lcom/airbnb/lottie/a/a/s;->gJ:I
 
-    sget v2, Lcom/airbnb/lottie/c/b/q$a;->jM:I
+    sget v2, Lcom/airbnb/lottie/c/b/q$a;->jN:I
 
     if-ne v1, v2, :cond_0
 
-    iget-object v1, p0, Lcom/airbnb/lottie/a/a/o;->ge:Lcom/airbnb/lottie/a/a/b;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/o;->gf: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;->gf:Z
+    iput-boolean v0, p0, Lcom/airbnb/lottie/a/a/o;->gg:Z
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/a/o;->dJ:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/o;->dK: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;->gf:Z
+    iget-boolean v0, p0, Lcom/airbnb/lottie/a/a/o;->gg: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;->fY:Z
+    iget-boolean v0, p0, Lcom/airbnb/lottie/a/a/o;->fZ:Z
 
     const/4 v1, 0x1
 
     if-eqz v0, :cond_1
 
-    iput-boolean v1, p0, Lcom/airbnb/lottie/a/a/o;->gf:Z
+    iput-boolean v1, p0, Lcom/airbnb/lottie/a/a/o;->gg: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;->gb:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/o;->gc: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;->gC:Lcom/airbnb/lottie/a/b/a;
+    iget-object v4, p0, Lcom/airbnb/lottie/a/a/o;->gD: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;->gc:Lcom/airbnb/lottie/a/b/a;
+    iget-object v6, p0, Lcom/airbnb/lottie/a/a/o;->gd: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;->ge:Lcom/airbnb/lottie/a/a/b;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/o;->gf: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;->gf:Z
+    iput-boolean v1, p0, Lcom/airbnb/lottie/a/a/o;->gg: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 be089ec1ba..5d898295e0 100644
--- a/com.discord/smali/com/airbnb/lottie/a/a/p.smali
+++ b/com.discord/smali/com/airbnb/lottie/a/a/p.smali
@@ -11,22 +11,11 @@
 
 
 # instance fields
-.field private final dJ:Lcom/airbnb/lottie/f;
+.field private final dK:Lcom/airbnb/lottie/f;
 
-.field private final fN:Lcom/airbnb/lottie/c/c/a;
+.field private final fO:Lcom/airbnb/lottie/c/c/a;
 
-.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 fZ:Z
 
 .field private final gE:Lcom/airbnb/lottie/a/b/a;
     .annotation system Ldalvik/annotation/Signature;
@@ -39,9 +28,20 @@
     .end annotation
 .end field
 
-.field private final gF:Lcom/airbnb/lottie/a/b/o;
+.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 gG:Lcom/airbnb/lottie/a/a/d;
+.field private final gG:Lcom/airbnb/lottie/a/b/o;
+
+.field private gH:Lcom/airbnb/lottie/a/a/d;
 
 .field private final matrix:Landroid/graphics/Matrix;
 
@@ -68,33 +68,17 @@
 
     iput-object v0, p0, Lcom/airbnb/lottie/a/a/p;->path:Landroid/graphics/Path;
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/p;->dJ:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/p;->dK:Lcom/airbnb/lottie/f;
 
-    iput-object p2, p0, Lcom/airbnb/lottie/a/a/p;->fN:Lcom/airbnb/lottie/c/c/a;
+    iput-object p2, p0, Lcom/airbnb/lottie/a/a/p;->fO: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;->fY:Z
+    iget-boolean p1, p3, Lcom/airbnb/lottie/c/b/k;->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
+    iput-boolean p1, p0, Lcom/airbnb/lottie/a/a/p;->fZ:Z
 
     iget-object p1, p3, Lcom/airbnb/lottie/c/b/k;->ju:Lcom/airbnb/lottie/c/a/b;
 
@@ -112,19 +96,35 @@
 
     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/l;
+    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;
 
     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;->gF:Lcom/airbnb/lottie/a/b/o;
+    iput-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;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/p;->gG: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;->gF:Lcom/airbnb/lottie/a/b/o;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/p;->gG: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;->gD:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/p;->gE: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;->gE:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/p;->gF: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;->gF:Lcom/airbnb/lottie/a/b/o;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/a/p;->gG:Lcom/airbnb/lottie/a/b/o;
 
-    iget-object v2, v2, Lcom/airbnb/lottie/a/b/o;->hu:Lcom/airbnb/lottie/a/b/a;
+    iget-object v2, v2, Lcom/airbnb/lottie/a/b/o;->hv: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;->gF:Lcom/airbnb/lottie/a/b/o;
+    iget-object v4, p0, Lcom/airbnb/lottie/a/a/p;->gG:Lcom/airbnb/lottie/a/b/o;
 
-    iget-object v4, v4, Lcom/airbnb/lottie/a/b/o;->hv:Lcom/airbnb/lottie/a/b/a;
+    iget-object v4, v4, Lcom/airbnb/lottie/a/b/o;->hw: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;->gF:Lcom/airbnb/lottie/a/b/o;
+    iget-object v6, p0, Lcom/airbnb/lottie/a/a/p;->gG: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;->gG:Lcom/airbnb/lottie/a/a/d;
+    iget-object v6, p0, Lcom/airbnb/lottie/a/a/p;->gH: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;->gG:Lcom/airbnb/lottie/a/a/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/p;->gH: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;->gF:Lcom/airbnb/lottie/a/b/o;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/p;->gG: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;->fj:Ljava/lang/Float;
+    sget-object v0, Lcom/airbnb/lottie/j;->fk:Ljava/lang/Float;
 
     if-ne p1, v0, :cond_1
 
-    iget-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;->gE: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;->fk:Ljava/lang/Float;
+    sget-object v0, Lcom/airbnb/lottie/j;->fl:Ljava/lang/Float;
 
     if-ne p1, v0, :cond_2
 
-    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;->gF: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;->gG:Lcom/airbnb/lottie/a/a/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/p;->gH: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;->gG:Lcom/airbnb/lottie/a/a/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/p;->gH: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;->dJ:Lcom/airbnb/lottie/f;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/a/p;->dK:Lcom/airbnb/lottie/f;
 
-    iget-object v3, p0, Lcom/airbnb/lottie/a/a/p;->fN:Lcom/airbnb/lottie/c/c/a;
+    iget-object v3, p0, Lcom/airbnb/lottie/a/a/p;->fO:Lcom/airbnb/lottie/c/c/a;
 
-    iget-boolean v5, p0, Lcom/airbnb/lottie/a/a/p;->fY:Z
+    iget-boolean v5, p0, Lcom/airbnb/lottie/a/a/p;->fZ: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;->gG:Lcom/airbnb/lottie/a/a/d;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/p;->gH: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;->dJ:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/p;->dK: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;->gG:Lcom/airbnb/lottie/a/a/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/p;->gH: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;->gD: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;
 
@@ -453,7 +453,7 @@
 
     move-result v1
 
-    iget-object v2, p0, Lcom/airbnb/lottie/a/a/p;->gE:Lcom/airbnb/lottie/a/b/a;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/a/p;->gF: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;->gF:Lcom/airbnb/lottie/a/b/o;
+    iget-object v4, p0, Lcom/airbnb/lottie/a/a/p;->gG: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 1aa4d43570..5562cd7916 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 dJ:Lcom/airbnb/lottie/f;
+.field private final dK:Lcom/airbnb/lottie/f;
 
-.field private final fY:Z
+.field private final fZ:Z
 
-.field private final gH:Lcom/airbnb/lottie/a/b/a;
+.field private final gI: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 ge:Lcom/airbnb/lottie/a/a/b;
+.field private gf:Lcom/airbnb/lottie/a/a/b;
 
-.field private gf:Z
+.field private gg: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;->ge:Lcom/airbnb/lottie/a/a/b;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/a/q;->gf: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;->fY:Z
+    iget-boolean v0, p3, Lcom/airbnb/lottie/c/b/o;->fZ:Z
 
-    iput-boolean v0, p0, Lcom/airbnb/lottie/a/a/q;->fY:Z
+    iput-boolean v0, p0, Lcom/airbnb/lottie/a/a/q;->fZ:Z
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/q;->dJ:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/q;->dK:Lcom/airbnb/lottie/f;
 
-    iget-object p1, p3, Lcom/airbnb/lottie/c/b/o;->jz:Lcom/airbnb/lottie/c/a/h;
+    iget-object p1, p3, Lcom/airbnb/lottie/c/b/o;->jA: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;->gH:Lcom/airbnb/lottie/a/b/a;
+    iput-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;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/q;->gI: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;->gH:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/q;->gI: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;->gI:I
+    iget v1, v0, Lcom/airbnb/lottie/a/a/s;->gJ:I
 
-    sget v2, Lcom/airbnb/lottie/c/b/q$a;->jM:I
+    sget v2, Lcom/airbnb/lottie/c/b/q$a;->jN:I
 
     if-ne v1, v2, :cond_0
 
-    iget-object v1, p0, Lcom/airbnb/lottie/a/a/q;->ge:Lcom/airbnb/lottie/a/a/b;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/q;->gf: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;->gf:Z
+    iput-boolean v0, p0, Lcom/airbnb/lottie/a/a/q;->gg:Z
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/a/q;->dJ:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/q;->dK: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;->gf:Z
+    iget-boolean v0, p0, Lcom/airbnb/lottie/a/a/q;->gg: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;->fY:Z
+    iget-boolean v0, p0, Lcom/airbnb/lottie/a/a/q;->fZ:Z
 
     const/4 v1, 0x1
 
     if-eqz v0, :cond_1
 
-    iput-boolean v1, p0, Lcom/airbnb/lottie/a/a/q;->gf:Z
+    iput-boolean v1, p0, Lcom/airbnb/lottie/a/a/q;->gg: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;->gH:Lcom/airbnb/lottie/a/b/a;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/a/q;->gI: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;->ge:Lcom/airbnb/lottie/a/a/b;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/q;->gf: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;->gf:Z
+    iput-boolean v1, p0, Lcom/airbnb/lottie/a/a/q;->gg: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 16052cc825..995a36148d 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 fN:Lcom/airbnb/lottie/c/c/a;
+.field private final fO:Lcom/airbnb/lottie/c/c/a;
 
-.field private fU:Lcom/airbnb/lottie/a/b/a;
+.field private fV: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 fY:Z
+.field private final fZ:Z
 
-.field private final gg: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<",
@@ -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;->iO:Lcom/airbnb/lottie/c/b/p$a;
+    iget-object v0, p3, Lcom/airbnb/lottie/c/b/p;->iP: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;->iP:Lcom/airbnb/lottie/c/b/p$b;
+    iget-object v0, p3, Lcom/airbnb/lottie/c/b/p;->iQ: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;->iQ:F
+    iget v6, p3, Lcom/airbnb/lottie/c/b/p;->iR:F
 
-    iget-object v7, p3, Lcom/airbnb/lottie/c/b/p;->ix:Lcom/airbnb/lottie/c/a/d;
+    iget-object v7, p3, Lcom/airbnb/lottie/c/b/p;->iy:Lcom/airbnb/lottie/c/a/d;
 
-    iget-object v8, p3, Lcom/airbnb/lottie/c/b/p;->iN:Lcom/airbnb/lottie/c/a/b;
+    iget-object v8, p3, Lcom/airbnb/lottie/c/b/p;->iO:Lcom/airbnb/lottie/c/a/b;
 
-    iget-object v9, p3, Lcom/airbnb/lottie/c/b/p;->iR:Ljava/util/List;
+    iget-object v9, p3, Lcom/airbnb/lottie/c/b/p;->iS:Ljava/util/List;
 
-    iget-object v10, p3, Lcom/airbnb/lottie/c/b/p;->ju:Lcom/airbnb/lottie/c/a/b;
+    iget-object v10, p3, Lcom/airbnb/lottie/c/b/p;->jv: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;->fN:Lcom/airbnb/lottie/c/c/a;
+    iput-object p2, p0, Lcom/airbnb/lottie/a/a/r;->fO: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;->fY:Z
+    iget-boolean p1, p3, Lcom/airbnb/lottie/c/b/p;->fZ:Z
 
-    iput-boolean p1, p0, Lcom/airbnb/lottie/a/a/r;->fY:Z
+    iput-boolean p1, p0, Lcom/airbnb/lottie/a/a/r;->fZ:Z
 
-    iget-object p1, p3, Lcom/airbnb/lottie/c/b/p;->im:Lcom/airbnb/lottie/c/a/a;
+    iget-object p1, p3, Lcom/airbnb/lottie/c/b/p;->io: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;->gg:Lcom/airbnb/lottie/a/b/a;
+    iput-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;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/r;->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
 
-    iget-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;
 
     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;->fY:Z
+    iget-boolean v0, p0, Lcom/airbnb/lottie/a/a/r;->fZ: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;->gg:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/r;->gh: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;->fU:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/r;->fV: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;->fU:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/r;->fV: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;->eU:Ljava/lang/Integer;
+    sget-object v0, Lcom/airbnb/lottie/j;->eV:Ljava/lang/Integer;
 
     if-ne p1, v0, :cond_0
 
-    iget-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;
 
     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;->fu:Landroid/graphics/ColorFilter;
+    sget-object v0, Lcom/airbnb/lottie/j;->fv: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;->fU:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/r;->fV: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;->fU:Lcom/airbnb/lottie/a/b/a;
+    iput-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;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/r;->fV: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;->fN:Lcom/airbnb/lottie/c/c/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/r;->fO:Lcom/airbnb/lottie/c/c/a;
 
-    iget-object p2, p0, Lcom/airbnb/lottie/a/a/r;->gg:Lcom/airbnb/lottie/a/b/a;
+    iget-object p2, p0, Lcom/airbnb/lottie/a/a/r;->gh: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 e666610c8f..0b2efec511 100644
--- a/com.discord/smali/com/airbnb/lottie/a/a/s.smali
+++ b/com.discord/smali/com/airbnb/lottie/a/a/s.smali
@@ -8,20 +8,9 @@
 
 
 # instance fields
-.field public final fY:Z
+.field public final fZ:Z
 
-.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 final gJ:I
 
 .field public final gK:Lcom/airbnb/lottie/a/b/a;
     .annotation system Ldalvik/annotation/Signature;
@@ -45,6 +34,17 @@
     .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,21 +74,13 @@
 
     iput-object v0, p0, Lcom/airbnb/lottie/a/a/s;->name:Ljava/lang/String;
 
-    iget-boolean v0, p2, Lcom/airbnb/lottie/c/b/q;->fY:Z
+    iget-boolean v0, p2, Lcom/airbnb/lottie/c/b/q;->fZ:Z
 
-    iput-boolean v0, p0, Lcom/airbnb/lottie/a/a/s;->fY:Z
+    iput-boolean v0, p0, Lcom/airbnb/lottie/a/a/s;->fZ:Z
 
-    iget v0, p2, Lcom/airbnb/lottie/c/b/q;->gI:I
+    iget v0, p2, Lcom/airbnb/lottie/c/b/q;->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;
+    iput v0, p0, Lcom/airbnb/lottie/a/a/s;->gJ:I
 
     iget-object v0, p2, Lcom/airbnb/lottie/c/b/q;->jL:Lcom/airbnb/lottie/c/a/b;
 
@@ -98,17 +90,21 @@
 
     iput-object v0, p0, Lcom/airbnb/lottie/a/a/s;->gK:Lcom/airbnb/lottie/a/b/a;
 
-    iget-object p2, p2, Lcom/airbnb/lottie/c/b/q;->ju:Lcom/airbnb/lottie/c/a/b;
+    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;
 
     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;->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
+    iput-object p2, p0, Lcom/airbnb/lottie/a/a/s;->gM:Lcom/airbnb/lottie/a/b/a;
 
     iget-object p2, p0, Lcom/airbnb/lottie/a/a/s;->gK:Lcom/airbnb/lottie/a/b/a;
 
@@ -118,9 +114,9 @@
 
     invoke-virtual {p1, p2}, Lcom/airbnb/lottie/c/c/a;->a(Lcom/airbnb/lottie/a/b/a;)V
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/s;->gJ:Lcom/airbnb/lottie/a/b/a;
+    iget-object p2, 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
+    invoke-virtual {p1, p2}, Lcom/airbnb/lottie/c/c/a;->a(Lcom/airbnb/lottie/a/b/a;)V
 
     iget-object p1, p0, Lcom/airbnb/lottie/a/a/s;->gK:Lcom/airbnb/lottie/a/b/a;
 
@@ -130,6 +126,10 @@
 
     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 6bde2ceb8b..2f0e0bebe6 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 dV:F
+.field public dW:F
 
-.field public gM:Z
+.field public gN:Z
 
-.field private final gN:Ljava/util/List;
+.field private final gO:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -38,7 +38,7 @@
     .end annotation
 .end field
 
-.field protected gO:Lcom/airbnb/lottie/g/c;
+.field protected gP:Lcom/airbnb/lottie/g/c;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/airbnb/lottie/g/c<",
@@ -47,15 +47,6 @@
     .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 = {
@@ -65,9 +56,18 @@
     .end annotation
 .end field
 
-.field private gR:F
+.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 gS:Ljava/lang/Object;
+.field private gS:F
+
+.field private gT:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TA;"
@@ -75,10 +75,10 @@
     .end annotation
 .end field
 
-.field private gT:F
-
 .field private gU:F
 
+.field private gV:F
+
 .field final listeners:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -115,25 +115,25 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/airbnb/lottie/a/b/a;->gM:Z
+    iput-boolean v0, p0, Lcom/airbnb/lottie/a/b/a;->gN:Z
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lcom/airbnb/lottie/a/b/a;->dV:F
+    iput v0, p0, Lcom/airbnb/lottie/a/b/a;->dW:F
 
     const/high16 v0, -0x40800000    # -1.0f
 
-    iput v0, p0, Lcom/airbnb/lottie/a/b/a;->gR:F
+    iput v0, p0, Lcom/airbnb/lottie/a/b/a;->gS:F
 
     const/4 v1, 0x0
 
-    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-object v1, p0, Lcom/airbnb/lottie/a/b/a;->gT:Ljava/lang/Object;
 
     iput v0, p0, Lcom/airbnb/lottie/a/b/a;->gU:F
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/b/a;->gN:Ljava/util/List;
+    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;
 
     return-void
 .end method
@@ -141,7 +141,7 @@
 .method private aZ()F
     .locals 2
 
-    iget v0, p0, Lcom/airbnb/lottie/a/b/a;->gT:F
+    iget v0, p0, Lcom/airbnb/lottie/a/b/a;->gU: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;->gN:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/a;->gO: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;->gN:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/a;->gO: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;->gT:F
+    iput v0, p0, Lcom/airbnb/lottie/a/b/a;->gU:F
 
     :cond_1
-    iget v0, p0, Lcom/airbnb/lottie/a/b/a;->gT:F
+    iget v0, p0, Lcom/airbnb/lottie/a/b/a;->gU:F
 
     return v0
 .end method
@@ -207,20 +207,20 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/a;->gO:Lcom/airbnb/lottie/g/c;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/a;->gP:Lcom/airbnb/lottie/g/c;
 
     if-eqz v0, :cond_0
 
     const/4 v1, 0x0
 
-    iput-object v1, v0, Lcom/airbnb/lottie/g/c;->mH:Lcom/airbnb/lottie/a/b/a;
+    iput-object v1, v0, Lcom/airbnb/lottie/g/c;->mI:Lcom/airbnb/lottie/a/b/a;
 
     :cond_0
-    iput-object p1, p0, Lcom/airbnb/lottie/a/b/a;->gO:Lcom/airbnb/lottie/g/c;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/b/a;->gP:Lcom/airbnb/lottie/g/c;
 
     if-eqz p1, :cond_1
 
-    iput-object p0, p1, Lcom/airbnb/lottie/g/c;->mH:Lcom/airbnb/lottie/a/b/a;
+    iput-object p0, p1, Lcom/airbnb/lottie/g/c;->mI: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;->gP:Lcom/airbnb/lottie/g/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/a;->gQ:Lcom/airbnb/lottie/g/a;
 
     if-eqz v0, :cond_0
 
-    iget v1, p0, Lcom/airbnb/lottie/a/b/a;->dV:F
+    iget v1, p0, Lcom/airbnb/lottie/a/b/a;->dW: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;->gP:Lcom/airbnb/lottie/g/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/a;->gQ:Lcom/airbnb/lottie/g/a;
 
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/a;->gN:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/a;->gO: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;->dV:F
+    iget v1, p0, Lcom/airbnb/lottie/a/b/a;->dW: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;->gN:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/b/a;->gO: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;->gN:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/a;->gO: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;->dV:F
+    iget v2, p0, Lcom/airbnb/lottie/a/b/a;->dW: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;->gP:Lcom/airbnb/lottie/g/a;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/b/a;->gQ: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;->gM:Z
+    iget-boolean v0, p0, Lcom/airbnb/lottie/a/b/a;->gN:Z
 
     const/4 v1, 0x0
 
@@ -371,7 +371,7 @@
     return v1
 
     :cond_1
-    iget v1, p0, Lcom/airbnb/lottie/a/b/a;->dV:F
+    iget v1, p0, Lcom/airbnb/lottie/a/b/a;->dW: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;->mt:Landroid/view/animation/Interpolator;
+    iget-object v0, v0, Lcom/airbnb/lottie/g/a;->mu: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;->gU:F
+    iget v0, p0, Lcom/airbnb/lottie/a/b/a;->gV: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;->gN:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/a;->gO: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;->gN:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/a;->gO: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;->gU:F
+    iput v0, p0, Lcom/airbnb/lottie/a/b/a;->gV:F
 
     :cond_1
-    iget v0, p0, Lcom/airbnb/lottie/a/b/a;->gU:F
+    iget v0, p0, Lcom/airbnb/lottie/a/b/a;->gV:F
 
     return v0
 .end method
@@ -502,34 +502,34 @@
 
     move-result v1
 
-    iget-object v2, p0, Lcom/airbnb/lottie/a/b/a;->gO:Lcom/airbnb/lottie/g/c;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/b/a;->gP:Lcom/airbnb/lottie/g/c;
 
     if-nez v2, :cond_0
 
-    iget-object v2, p0, Lcom/airbnb/lottie/a/b/a;->gQ:Lcom/airbnb/lottie/g/a;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/b/a;->gR:Lcom/airbnb/lottie/g/a;
 
     if-ne v0, v2, :cond_0
 
-    iget v2, p0, Lcom/airbnb/lottie/a/b/a;->gR:F
+    iget v2, p0, Lcom/airbnb/lottie/a/b/a;->gS:F
 
     cmpl-float v2, v2, v1
 
     if-nez v2, :cond_0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/a;->gS:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/a;->gT:Ljava/lang/Object;
 
     return-object v0
 
     :cond_0
-    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;->gR:Lcom/airbnb/lottie/g/a;
 
-    iput v1, p0, Lcom/airbnb/lottie/a/b/a;->gR:F
+    iput v1, p0, Lcom/airbnb/lottie/a/b/a;->gS: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;->gS:Ljava/lang/Object;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/b/a;->gT: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;->gN:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/a;->gO: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;->dV:F
+    iget v1, p0, Lcom/airbnb/lottie/a/b/a;->dW:F
 
     cmpl-float v1, p1, v1
 
@@ -590,7 +590,7 @@
     return-void
 
     :cond_3
-    iput p1, p0, Lcom/airbnb/lottie/a/b/a;->dV:F
+    iput p1, p0, Lcom/airbnb/lottie/a/b/a;->dW: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 e89ecf481e..ac02af4ce1 100644
--- a/com.discord/smali/com/airbnb/lottie/a/b/b.smali
+++ b/com.discord/smali/com/airbnb/lottie/a/b/b.smali
@@ -42,15 +42,15 @@
         }
     .end annotation
 
-    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;
+    iget-object v0, p1, Lcom/airbnb/lottie/g/a;->mt:Ljava/lang/Object;
+
+    if-eqz v0, :cond_1
+
+    iget-object v0, p1, Lcom/airbnb/lottie/g/a;->ms:Ljava/lang/Object;
 
     check-cast v0, Ljava/lang/Integer;
 
@@ -58,7 +58,7 @@
 
     move-result v0
 
-    iget-object v1, p1, Lcom/airbnb/lottie/g/a;->ms:Ljava/lang/Object;
+    iget-object v1, p1, Lcom/airbnb/lottie/g/a;->mt: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;->gO:Lcom/airbnb/lottie/g/c;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/b/b;->gP:Lcom/airbnb/lottie/g/c;
 
     if-eqz v2, :cond_0
 
-    iget-object v3, p0, Lcom/airbnb/lottie/a/b/b;->gO:Lcom/airbnb/lottie/g/c;
+    iget-object v3, p0, Lcom/airbnb/lottie/a/b/b;->gP:Lcom/airbnb/lottie/g/c;
 
-    iget v4, p1, Lcom/airbnb/lottie/g/a;->eh:F
+    iget v4, p1, Lcom/airbnb/lottie/g/a;->ei:F
 
-    iget-object p1, p1, Lcom/airbnb/lottie/g/a;->mu:Ljava/lang/Float;
+    iget-object p1, p1, Lcom/airbnb/lottie/g/a;->mv: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;->dV:F
+    iget v10, p0, Lcom/airbnb/lottie/a/b/a;->dW: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 53eb2ecf64..67f5709dc8 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, p0, Lcom/airbnb/lottie/a/b/c;->gO:Lcom/airbnb/lottie/g/c;
+    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;
 
     if-eqz v0, :cond_0
 
-    iget-object v1, p0, Lcom/airbnb/lottie/a/b/c;->gO:Lcom/airbnb/lottie/g/c;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/b/c;->gP:Lcom/airbnb/lottie/g/c;
 
-    iget v2, p1, Lcom/airbnb/lottie/g/a;->eh:F
+    iget v2, p1, Lcom/airbnb/lottie/g/a;->ei:F
 
-    iget-object v0, p1, Lcom/airbnb/lottie/g/a;->mu:Ljava/lang/Float;
+    iget-object v0, p1, Lcom/airbnb/lottie/g/a;->mv:Ljava/lang/Float;
 
     invoke-virtual {v0}, Ljava/lang/Float;->floatValue()F
 
     move-result v3
 
-    iget-object v4, p1, Lcom/airbnb/lottie/g/a;->mr:Ljava/lang/Object;
+    iget-object v4, p1, Lcom/airbnb/lottie/g/a;->ms:Ljava/lang/Object;
 
-    iget-object v5, p1, Lcom/airbnb/lottie/g/a;->ms:Ljava/lang/Object;
+    iget-object v5, p1, Lcom/airbnb/lottie/g/a;->mt: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;->dV:F
+    iget v8, p0, Lcom/airbnb/lottie/a/b/a;->dW:F
 
     move v6, p2
 
@@ -91,7 +91,7 @@
     return p1
 
     :cond_0
-    iget v0, p1, Lcom/airbnb/lottie/g/a;->mv:F
+    iget v0, p1, Lcom/airbnb/lottie/g/a;->mw:F
 
     const v1, -0x358c9d09
 
@@ -99,7 +99,7 @@
 
     if-nez v0, :cond_1
 
-    iget-object v0, p1, Lcom/airbnb/lottie/g/a;->mr:Ljava/lang/Object;
+    iget-object v0, p1, Lcom/airbnb/lottie/g/a;->ms:Ljava/lang/Object;
 
     check-cast v0, Ljava/lang/Float;
 
@@ -107,18 +107,18 @@
 
     move-result v0
 
-    iput v0, p1, Lcom/airbnb/lottie/g/a;->mv:F
+    iput v0, p1, Lcom/airbnb/lottie/g/a;->mw:F
 
     :cond_1
-    iget v0, p1, Lcom/airbnb/lottie/g/a;->mv:F
+    iget v0, p1, Lcom/airbnb/lottie/g/a;->mw:F
 
-    iget v2, p1, Lcom/airbnb/lottie/g/a;->mw:F
+    iget v2, p1, Lcom/airbnb/lottie/g/a;->mx:F
 
     cmpl-float v1, v2, v1
 
     if-nez v1, :cond_2
 
-    iget-object v1, p1, Lcom/airbnb/lottie/g/a;->ms:Ljava/lang/Object;
+    iget-object v1, p1, Lcom/airbnb/lottie/g/a;->mt:Ljava/lang/Object;
 
     check-cast v1, Ljava/lang/Float;
 
@@ -126,10 +126,10 @@
 
     move-result v1
 
-    iput v1, p1, Lcom/airbnb/lottie/g/a;->mw:F
+    iput v1, p1, Lcom/airbnb/lottie/g/a;->mx:F
 
     :cond_2
-    iget p1, p1, Lcom/airbnb/lottie/g/a;->mw:F
+    iget p1, p1, Lcom/airbnb/lottie/g/a;->mx: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 24610b78f0..01301a05dc 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 gV:Lcom/airbnb/lottie/c/b/c;
+.field private final gW: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;->mr: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;
 
@@ -49,7 +49,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object p1, p1, Lcom/airbnb/lottie/c/b/c;->iF:[I
+    iget-object p1, p1, Lcom/airbnb/lottie/c/b/c;->iG:[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;->gV:Lcom/airbnb/lottie/c/b/c;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/b/d;->gW: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;->gV:Lcom/airbnb/lottie/c/b/c;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/d;->gW:Lcom/airbnb/lottie/c/b/c;
 
-    iget-object v1, p1, Lcom/airbnb/lottie/g/a;->mr:Ljava/lang/Object;
+    iget-object v1, p1, Lcom/airbnb/lottie/g/a;->ms:Ljava/lang/Object;
 
     check-cast v1, Lcom/airbnb/lottie/c/b/c;
 
-    iget-object p1, p1, Lcom/airbnb/lottie/g/a;->ms:Ljava/lang/Object;
+    iget-object p1, p1, Lcom/airbnb/lottie/g/a;->mt:Ljava/lang/Object;
 
     check-cast p1, Lcom/airbnb/lottie/c/b/c;
 
-    iget-object v2, v1, Lcom/airbnb/lottie/c/b/c;->iF:[I
+    iget-object v2, v1, Lcom/airbnb/lottie/c/b/c;->iG:[I
 
     array-length v2, v2
 
-    iget-object v3, p1, Lcom/airbnb/lottie/c/b/c;->iF:[I
+    iget-object v3, p1, Lcom/airbnb/lottie/c/b/c;->iG:[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;->iF:[I
+    iget-object v3, v1, Lcom/airbnb/lottie/c/b/c;->iG:[I
 
     array-length v3, v3
 
     if-ge v2, v3, :cond_0
 
-    iget-object v3, v0, Lcom/airbnb/lottie/c/b/c;->iE:[F
+    iget-object v3, v0, Lcom/airbnb/lottie/c/b/c;->iF:[F
 
-    iget-object v4, v1, Lcom/airbnb/lottie/c/b/c;->iE:[F
+    iget-object v4, v1, Lcom/airbnb/lottie/c/b/c;->iF:[F
 
     aget v4, v4, v2
 
-    iget-object v5, p1, Lcom/airbnb/lottie/c/b/c;->iE:[F
+    iget-object v5, p1, Lcom/airbnb/lottie/c/b/c;->iF:[F
 
     aget v5, v5, v2
 
@@ -117,13 +117,13 @@
 
     aput v4, v3, v2
 
-    iget-object v3, v0, Lcom/airbnb/lottie/c/b/c;->iF:[I
+    iget-object v3, v0, Lcom/airbnb/lottie/c/b/c;->iG:[I
 
-    iget-object v4, v1, Lcom/airbnb/lottie/c/b/c;->iF:[I
+    iget-object v4, v1, Lcom/airbnb/lottie/c/b/c;->iG:[I
 
     aget v4, v4, v2
 
-    iget-object v5, p1, Lcom/airbnb/lottie/c/b/c;->iF:[I
+    iget-object v5, p1, Lcom/airbnb/lottie/c/b/c;->iG:[I
 
     aget v5, v5, v2
 
@@ -138,7 +138,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lcom/airbnb/lottie/a/b/d;->gV:Lcom/airbnb/lottie/c/b/c;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/b/d;->gW: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;->iF:[I
+    iget-object v1, v1, Lcom/airbnb/lottie/c/b/c;->iG:[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;->iF:[I
+    iget-object p1, p1, Lcom/airbnb/lottie/c/b/c;->iG:[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 aae6a72248..43266a2798 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, p0, Lcom/airbnb/lottie/a/b/e;->gO:Lcom/airbnb/lottie/g/c;
+    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;
 
     if-eqz v0, :cond_0
 
-    iget-object v1, p0, Lcom/airbnb/lottie/a/b/e;->gO:Lcom/airbnb/lottie/g/c;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/b/e;->gP:Lcom/airbnb/lottie/g/c;
 
-    iget v2, p1, Lcom/airbnb/lottie/g/a;->eh:F
+    iget v2, p1, Lcom/airbnb/lottie/g/a;->ei:F
 
-    iget-object v0, p1, Lcom/airbnb/lottie/g/a;->mu:Ljava/lang/Float;
+    iget-object v0, p1, Lcom/airbnb/lottie/g/a;->mv:Ljava/lang/Float;
 
     invoke-virtual {v0}, Ljava/lang/Float;->floatValue()F
 
     move-result v3
 
-    iget-object v4, p1, Lcom/airbnb/lottie/g/a;->mr:Ljava/lang/Object;
+    iget-object v4, p1, Lcom/airbnb/lottie/g/a;->ms:Ljava/lang/Object;
 
-    iget-object v5, p1, Lcom/airbnb/lottie/g/a;->ms:Ljava/lang/Object;
+    iget-object v5, p1, Lcom/airbnb/lottie/g/a;->mt: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;->dV:F
+    iget v8, p0, Lcom/airbnb/lottie/a/b/a;->dW:F
 
     move v6, p2
 
@@ -91,13 +91,13 @@
     return p1
 
     :cond_0
-    iget v0, p1, Lcom/airbnb/lottie/g/a;->mx:I
+    iget v0, p1, Lcom/airbnb/lottie/g/a;->my:I
 
     const v1, 0x2ec8fb09
 
     if-ne v0, v1, :cond_1
 
-    iget-object v0, p1, Lcom/airbnb/lottie/g/a;->mr:Ljava/lang/Object;
+    iget-object v0, p1, Lcom/airbnb/lottie/g/a;->ms:Ljava/lang/Object;
 
     check-cast v0, Ljava/lang/Integer;
 
@@ -105,16 +105,16 @@
 
     move-result v0
 
-    iput v0, p1, Lcom/airbnb/lottie/g/a;->mx:I
+    iput v0, p1, Lcom/airbnb/lottie/g/a;->my:I
 
     :cond_1
-    iget v0, p1, Lcom/airbnb/lottie/g/a;->mx:I
+    iget v0, p1, Lcom/airbnb/lottie/g/a;->my:I
 
-    iget v2, p1, Lcom/airbnb/lottie/g/a;->my:I
+    iget v2, p1, Lcom/airbnb/lottie/g/a;->mz:I
 
     if-ne v2, v1, :cond_2
 
-    iget-object v1, p1, Lcom/airbnb/lottie/g/a;->ms:Ljava/lang/Object;
+    iget-object v1, p1, Lcom/airbnb/lottie/g/a;->mt:Ljava/lang/Object;
 
     check-cast v1, Ljava/lang/Integer;
 
@@ -122,10 +122,10 @@
 
     move-result v1
 
-    iput v1, p1, Lcom/airbnb/lottie/g/a;->my:I
+    iput v1, p1, Lcom/airbnb/lottie/g/a;->mz:I
 
     :cond_2
-    iget p1, p1, Lcom/airbnb/lottie/g/a;->my:I
+    iget p1, p1, Lcom/airbnb/lottie/g/a;->mz: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 d699b90a99..62c8821dd4 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 gW:Ljava/util/List;
+.field public final gX:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -16,7 +16,7 @@
     .end annotation
 .end field
 
-.field public final gX:Ljava/util/List;
+.field public final gY:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -28,7 +28,7 @@
     .end annotation
 .end field
 
-.field public final gY:Ljava/util/List;
+.field public final gZ:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -53,17 +53,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    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;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/b/g;->gZ:Ljava/util/List;
 
     new-instance v0, Ljava/util/ArrayList;
 
@@ -75,6 +65,16 @@
 
     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;->gW:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/b/g;->gX: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;->iX:Lcom/airbnb/lottie/c/a/h;
+    iget-object v2, v2, Lcom/airbnb/lottie/c/b/g;->iY: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;->ix:Lcom/airbnb/lottie/c/a/d;
+    iget-object v1, v1, Lcom/airbnb/lottie/c/b/g;->iy:Lcom/airbnb/lottie/c/a/d;
 
-    iget-object v2, p0, Lcom/airbnb/lottie/a/b/g;->gX:Ljava/util/List;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/b/g;->gY: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 aa780be2d9..c1c09bd48e 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 gZ:Lcom/airbnb/lottie/g/a;
+.field private final ha: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;->mr:Ljava/lang/Object;
+    iget-object v2, p2, Lcom/airbnb/lottie/g/a;->ms:Ljava/lang/Object;
 
-    iget-object v3, p2, Lcom/airbnb/lottie/g/a;->ms:Ljava/lang/Object;
+    iget-object v3, p2, Lcom/airbnb/lottie/g/a;->mt:Ljava/lang/Object;
 
-    iget-object v4, p2, Lcom/airbnb/lottie/g/a;->mt:Landroid/view/animation/Interpolator;
+    iget-object v4, p2, Lcom/airbnb/lottie/g/a;->mu:Landroid/view/animation/Interpolator;
 
-    iget v5, p2, Lcom/airbnb/lottie/g/a;->eh:F
+    iget v5, p2, Lcom/airbnb/lottie/g/a;->ei:F
 
-    iget-object v6, p2, Lcom/airbnb/lottie/g/a;->mu:Ljava/lang/Float;
+    iget-object v6, p2, Lcom/airbnb/lottie/g/a;->mv: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;->gZ:Lcom/airbnb/lottie/g/a;
+    iput-object p2, p0, Lcom/airbnb/lottie/a/b/h;->ha: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;->mr:Ljava/lang/Object;
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/h;->mr:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/h;->ms:Ljava/lang/Object;
 
     check-cast v0, Landroid/graphics/PointF;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/a/b/h;->ms:Ljava/lang/Object;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/b/h;->mt: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;->ms:Ljava/lang/Object;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/b/h;->mt: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;->ms:Ljava/lang/Object;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/b/h;->mt:Ljava/lang/Object;
 
     if-eqz v1, :cond_1
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/h;->mr:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/h;->ms:Ljava/lang/Object;
 
     check-cast v0, Landroid/graphics/PointF;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/a/b/h;->ms:Ljava/lang/Object;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/b/h;->mt:Ljava/lang/Object;
 
     check-cast v1, Landroid/graphics/PointF;
 
-    iget-object v2, p0, Lcom/airbnb/lottie/a/b/h;->gZ:Lcom/airbnb/lottie/g/a;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/b/h;->ha:Lcom/airbnb/lottie/g/a;
 
-    iget-object v2, v2, Lcom/airbnb/lottie/g/a;->mC:Landroid/graphics/PointF;
+    iget-object v2, v2, Lcom/airbnb/lottie/g/a;->mD:Landroid/graphics/PointF;
 
-    iget-object v3, p0, Lcom/airbnb/lottie/a/b/h;->gZ:Lcom/airbnb/lottie/g/a;
+    iget-object v3, p0, Lcom/airbnb/lottie/a/b/h;->ha:Lcom/airbnb/lottie/g/a;
 
-    iget-object v3, v3, Lcom/airbnb/lottie/g/a;->mD:Landroid/graphics/PointF;
+    iget-object v3, v3, Lcom/airbnb/lottie/g/a;->mE: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 2673ff22cb..7a0a6cd929 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 ha:Landroid/graphics/PointF;
+.field private final hb:Landroid/graphics/PointF;
 
-.field private final hb:[F
+.field private final hc:[F
 
-.field private hc:Lcom/airbnb/lottie/a/b/h;
+.field private hd:Lcom/airbnb/lottie/a/b/h;
 
-.field private hd:Landroid/graphics/PathMeasure;
+.field private he: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;->ha:Landroid/graphics/PointF;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/b/i;->hb:Landroid/graphics/PointF;
 
     const/4 p1, 0x2
 
     new-array p1, p1, [F
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/b/i;->hb:[F
+    iput-object p1, p0, Lcom/airbnb/lottie/a/b/i;->hc:[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;->hd:Landroid/graphics/PathMeasure;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/b/i;->he: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;->mr:Ljava/lang/Object;
+    iget-object p1, p1, Lcom/airbnb/lottie/g/a;->ms:Ljava/lang/Object;
 
     check-cast p1, Landroid/graphics/PointF;
 
     return-object p1
 
     :cond_0
-    iget-object p1, p0, Lcom/airbnb/lottie/a/b/i;->gO:Lcom/airbnb/lottie/g/c;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/b/i;->gP:Lcom/airbnb/lottie/g/c;
 
     if-eqz p1, :cond_1
 
-    iget-object v2, p0, Lcom/airbnb/lottie/a/b/i;->gO:Lcom/airbnb/lottie/g/c;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/b/i;->gP:Lcom/airbnb/lottie/g/c;
 
-    iget v3, v0, Lcom/airbnb/lottie/a/b/h;->eh:F
+    iget v3, v0, Lcom/airbnb/lottie/a/b/h;->ei:F
 
-    iget-object p1, v0, Lcom/airbnb/lottie/a/b/h;->mu:Ljava/lang/Float;
+    iget-object p1, v0, Lcom/airbnb/lottie/a/b/h;->mv:Ljava/lang/Float;
 
     invoke-virtual {p1}, Ljava/lang/Float;->floatValue()F
 
     move-result v4
 
-    iget-object v5, v0, Lcom/airbnb/lottie/a/b/h;->mr:Ljava/lang/Object;
+    iget-object v5, v0, Lcom/airbnb/lottie/a/b/h;->ms:Ljava/lang/Object;
 
-    iget-object v6, v0, Lcom/airbnb/lottie/a/b/h;->ms:Ljava/lang/Object;
+    iget-object v6, v0, Lcom/airbnb/lottie/a/b/h;->mt: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;->dV:F
+    iget v9, p0, Lcom/airbnb/lottie/a/b/a;->dW:F
 
     move v8, p2
 
@@ -117,20 +117,20 @@
     return-object p1
 
     :cond_1
-    iget-object p1, p0, Lcom/airbnb/lottie/a/b/i;->hc:Lcom/airbnb/lottie/a/b/h;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/b/i;->hd: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;->hd:Landroid/graphics/PathMeasure;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/b/i;->he: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;->hc:Lcom/airbnb/lottie/a/b/h;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/b/i;->hd:Lcom/airbnb/lottie/a/b/h;
 
     :cond_2
-    iget-object p1, p0, Lcom/airbnb/lottie/a/b/i;->hd:Landroid/graphics/PathMeasure;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/b/i;->he: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;->hb:[F
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/i;->hc:[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;->ha:Landroid/graphics/PointF;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/b/i;->hb:Landroid/graphics/PointF;
 
-    iget-object p2, p0, Lcom/airbnb/lottie/a/b/i;->hb:[F
+    iget-object p2, p0, Lcom/airbnb/lottie/a/b/i;->hc:[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;->ha:Landroid/graphics/PointF;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/b/i;->hb: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 3313626f51..5c523fb5ce 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 ha:Landroid/graphics/PointF;
+.field private final hb: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;->ha:Landroid/graphics/PointF;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/b/j;->hb: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;->mr:Ljava/lang/Object;
+    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;
 
     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;->ms:Ljava/lang/Object;
+    iget-object v1, p1, Lcom/airbnb/lottie/g/a;->mt:Ljava/lang/Object;
 
     move-object v9, v1
 
     check-cast v9, Landroid/graphics/PointF;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/a/b/j;->gO:Lcom/airbnb/lottie/g/c;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/b/j;->gP:Lcom/airbnb/lottie/g/c;
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/airbnb/lottie/a/b/j;->gO:Lcom/airbnb/lottie/g/c;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/b/j;->gP:Lcom/airbnb/lottie/g/c;
 
-    iget v2, p1, Lcom/airbnb/lottie/g/a;->eh:F
+    iget v2, p1, Lcom/airbnb/lottie/g/a;->ei:F
 
-    iget-object p1, p1, Lcom/airbnb/lottie/g/a;->mu:Ljava/lang/Float;
+    iget-object p1, p1, Lcom/airbnb/lottie/g/a;->mv: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;->dV:F
+    iget v8, p0, Lcom/airbnb/lottie/a/b/a;->dW:F
 
     move-object v4, v0
 
@@ -101,7 +101,7 @@
     return-object p1
 
     :cond_0
-    iget-object p1, p0, Lcom/airbnb/lottie/a/b/j;->ha:Landroid/graphics/PointF;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/b/j;->hb: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;->ha:Landroid/graphics/PointF;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/b/j;->hb: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 cf3c3b00ce..5e5e715b08 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 he:Lcom/airbnb/lottie/g/d;
+.field private final hf: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;->he:Lcom/airbnb/lottie/g/d;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/b/k;->hf: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;->mr:Ljava/lang/Object;
+    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;
 
     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;->ms:Ljava/lang/Object;
+    iget-object v1, p1, Lcom/airbnb/lottie/g/a;->mt: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;->gO:Lcom/airbnb/lottie/g/c;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/b/k;->gP:Lcom/airbnb/lottie/g/c;
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/airbnb/lottie/a/b/k;->gO:Lcom/airbnb/lottie/g/c;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/b/k;->gP:Lcom/airbnb/lottie/g/c;
 
-    iget v2, p1, Lcom/airbnb/lottie/g/a;->eh:F
+    iget v2, p1, Lcom/airbnb/lottie/g/a;->ei:F
 
-    iget-object p1, p1, Lcom/airbnb/lottie/g/a;->mu:Ljava/lang/Float;
+    iget-object p1, p1, Lcom/airbnb/lottie/g/a;->mv: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;->dV:F
+    iget v8, p0, Lcom/airbnb/lottie/a/b/a;->dW:F
 
     move-object v4, v0
 
@@ -101,7 +101,7 @@
     return-object p1
 
     :cond_0
-    iget-object p1, p0, Lcom/airbnb/lottie/a/b/k;->he:Lcom/airbnb/lottie/g/d;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/b/k;->hf: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;->he:Lcom/airbnb/lottie/g/d;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/b/k;->hf: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 1ae48cb21a..0b63e95e58 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 hf:Lcom/airbnb/lottie/c/b/l;
+.field private final hg:Lcom/airbnb/lottie/c/b/l;
 
-.field private final hg:Landroid/graphics/Path;
+.field private final hh: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;->hf:Lcom/airbnb/lottie/c/b/l;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/b/l;->hg: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;->hg:Landroid/graphics/Path;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/b/l;->hh: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;->mr:Ljava/lang/Object;
+    iget-object v0, p1, Lcom/airbnb/lottie/g/a;->ms:Ljava/lang/Object;
 
     check-cast v0, Lcom/airbnb/lottie/c/b/l;
 
-    iget-object p1, p1, Lcom/airbnb/lottie/g/a;->ms:Ljava/lang/Object;
+    iget-object p1, p1, Lcom/airbnb/lottie/g/a;->mt:Ljava/lang/Object;
 
     check-cast p1, 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 v1, p0, Lcom/airbnb/lottie/a/b/l;->hg:Lcom/airbnb/lottie/c/b/l;
 
-    iget-object v2, v1, Lcom/airbnb/lottie/c/b/l;->jx:Landroid/graphics/PointF;
+    iget-object v2, v1, Lcom/airbnb/lottie/c/b/l;->jy: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;->jx:Landroid/graphics/PointF;
+    iput-object v2, v1, Lcom/airbnb/lottie/c/b/l;->jy: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;->jw:Ljava/util/List;
+    iget-object v2, v0, Lcom/airbnb/lottie/c/b/l;->jx:Ljava/util/List;
 
     invoke-interface {v2}, Ljava/util/List;->size()I
 
     move-result v2
 
-    iget-object v4, p1, Lcom/airbnb/lottie/c/b/l;->jw:Ljava/util/List;
+    iget-object v4, p1, Lcom/airbnb/lottie/c/b/l;->jx: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;->jw:Ljava/util/List;
+    iget-object v4, v0, Lcom/airbnb/lottie/c/b/l;->jx: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;->jw:Ljava/util/List;
+    iget-object v4, p1, Lcom/airbnb/lottie/c/b/l;->jx: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;->jw:Ljava/util/List;
+    iget-object v2, v0, Lcom/airbnb/lottie/c/b/l;->jx:Ljava/util/List;
 
     invoke-interface {v2}, Ljava/util/List;->size()I
 
     move-result v2
 
-    iget-object v4, p1, Lcom/airbnb/lottie/c/b/l;->jw:Ljava/util/List;
+    iget-object v4, p1, Lcom/airbnb/lottie/c/b/l;->jx: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;->jw:Ljava/util/List;
+    iget-object v4, v1, Lcom/airbnb/lottie/c/b/l;->jx: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;->jw:Ljava/util/List;
+    iget-object v4, v1, Lcom/airbnb/lottie/c/b/l;->jx: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;->jw:Ljava/util/List;
+    iget-object v5, v1, Lcom/airbnb/lottie/c/b/l;->jx: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;->jw:Ljava/util/List;
+    iget-object v4, v1, Lcom/airbnb/lottie/c/b/l;->jx: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;->jw:Ljava/util/List;
+    iget-object v4, v1, Lcom/airbnb/lottie/c/b/l;->jx: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;->jw:Ljava/util/List;
+    iget-object v5, 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;
+    iget-object v6, v1, Lcom/airbnb/lottie/c/b/l;->jx: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;->jx:Landroid/graphics/PointF;
+    iget-object v2, v0, 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-object v4, p1, Lcom/airbnb/lottie/c/b/l;->jy: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;->jx:Landroid/graphics/PointF;
+    iget-object v4, v1, Lcom/airbnb/lottie/c/b/l;->jy: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;->jx:Landroid/graphics/PointF;
+    iput-object v4, v1, Lcom/airbnb/lottie/c/b/l;->jy:Landroid/graphics/PointF;
 
     :cond_6
-    iget-object v4, v1, Lcom/airbnb/lottie/c/b/l;->jx:Landroid/graphics/PointF;
+    iget-object v4, v1, Lcom/airbnb/lottie/c/b/l;->jy:Landroid/graphics/PointF;
 
     invoke-virtual {v4, v5, v2}, Landroid/graphics/PointF;->set(FF)V
 
-    iget-object v2, v1, Lcom/airbnb/lottie/c/b/l;->jw:Ljava/util/List;
+    iget-object v2, v1, Lcom/airbnb/lottie/c/b/l;->jx: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;->jw:Ljava/util/List;
+    iget-object v3, v0, Lcom/airbnb/lottie/c/b/l;->jx: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;->jw:Ljava/util/List;
+    iget-object v4, p1, Lcom/airbnb/lottie/c/b/l;->jx: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;->hI:Landroid/graphics/PointF;
+    iget-object v5, v3, Lcom/airbnb/lottie/c/a;->hJ:Landroid/graphics/PointF;
 
-    iget-object v6, v3, Lcom/airbnb/lottie/c/a;->hJ:Landroid/graphics/PointF;
+    iget-object v6, v3, Lcom/airbnb/lottie/c/a;->hK:Landroid/graphics/PointF;
 
-    iget-object v3, v3, Lcom/airbnb/lottie/c/a;->hK:Landroid/graphics/PointF;
+    iget-object v3, v3, Lcom/airbnb/lottie/c/a;->hL:Landroid/graphics/PointF;
 
-    iget-object v7, v4, Lcom/airbnb/lottie/c/a;->hI:Landroid/graphics/PointF;
+    iget-object v7, v4, Lcom/airbnb/lottie/c/a;->hJ:Landroid/graphics/PointF;
 
-    iget-object v8, v4, Lcom/airbnb/lottie/c/a;->hJ:Landroid/graphics/PointF;
+    iget-object v8, v4, Lcom/airbnb/lottie/c/a;->hK:Landroid/graphics/PointF;
 
-    iget-object v4, v4, Lcom/airbnb/lottie/c/a;->hK:Landroid/graphics/PointF;
+    iget-object v4, v4, Lcom/airbnb/lottie/c/a;->hL:Landroid/graphics/PointF;
 
-    iget-object v9, v1, Lcom/airbnb/lottie/c/b/l;->jw:Ljava/util/List;
+    iget-object v9, v1, Lcom/airbnb/lottie/c/b/l;->jx: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;->hI:Landroid/graphics/PointF;
+    iget-object v7, v9, Lcom/airbnb/lottie/c/a;->hJ:Landroid/graphics/PointF;
 
     invoke-virtual {v7, v10, v5}, Landroid/graphics/PointF;->set(FF)V
 
-    iget-object v5, v1, Lcom/airbnb/lottie/c/b/l;->jw:Ljava/util/List;
+    iget-object v5, v1, Lcom/airbnb/lottie/c/b/l;->jx: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;->hJ:Landroid/graphics/PointF;
+    iget-object v5, v5, Lcom/airbnb/lottie/c/a;->hK:Landroid/graphics/PointF;
 
     invoke-virtual {v5, v7, v6}, Landroid/graphics/PointF;->set(FF)V
 
-    iget-object v5, v1, Lcom/airbnb/lottie/c/b/l;->jw:Ljava/util/List;
+    iget-object v5, v1, Lcom/airbnb/lottie/c/b/l;->jx: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;->hK:Landroid/graphics/PointF;
+    iget-object v4, v5, Lcom/airbnb/lottie/c/a;->hL: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;->hf:Lcom/airbnb/lottie/c/b/l;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/b/l;->hg:Lcom/airbnb/lottie/c/b/l;
 
-    iget-object p2, p0, Lcom/airbnb/lottie/a/b/l;->hg:Landroid/graphics/Path;
+    iget-object p2, p0, Lcom/airbnb/lottie/a/b/l;->hh: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;->hg:Landroid/graphics/Path;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/b/l;->hh: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 f893976c90..58c675a4cb 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 ha:Landroid/graphics/PointF;
+.field private final hb:Landroid/graphics/PointF;
 
-.field private final hh: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<",
@@ -28,7 +28,7 @@
     .end annotation
 .end field
 
-.field private final hi:Lcom/airbnb/lottie/a/b/a;
+.field private final hj: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;->ha:Landroid/graphics/PointF;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/b/m;->hb:Landroid/graphics/PointF;
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/b/m;->hh:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/b/m;->hi:Lcom/airbnb/lottie/a/b/a;
 
-    iput-object p2, p0, Lcom/airbnb/lottie/a/b/m;->hi:Lcom/airbnb/lottie/a/b/a;
+    iput-object p2, p0, Lcom/airbnb/lottie/a/b/m;->hj:Lcom/airbnb/lottie/a/b/a;
 
-    iget p1, p0, Lcom/airbnb/lottie/a/b/a;->dV:F
+    iget p1, p0, Lcom/airbnb/lottie/a/b/a;->dW: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;->ha:Landroid/graphics/PointF;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/b/m;->hb: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;->ha:Landroid/graphics/PointF;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/m;->hb: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 p1, p0, Lcom/airbnb/lottie/a/b/m;->ha:Landroid/graphics/PointF;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/m;->hj: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, 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;
 
     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;->hi:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/b/m;->hj: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 3d9f4ed726..415fdd2ce8 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;->mr:Ljava/lang/Object;
+    iget-object p1, p1, Lcom/airbnb/lottie/g/a;->ms: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 3b920fcf83..8fd7ea432c 100644
--- a/com.discord/smali/com/airbnb/lottie/a/b/o.smali
+++ b/com.discord/smali/com/airbnb/lottie/a/b/o.smali
@@ -4,30 +4,19 @@
 
 
 # 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:[F
+.field private final hm:Landroid/graphics/Matrix;
 
-.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 private final hn:[F
 
 .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;",
             ">;"
         }
@@ -38,14 +27,25 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/airbnb/lottie/a/b/a<",
-            "Lcom/airbnb/lottie/g/d;",
-            "Lcom/airbnb/lottie/g/d;",
+            "*",
+            "Landroid/graphics/PointF;",
             ">;"
         }
     .end annotation
 .end field
 
 .field public hq:Lcom/airbnb/lottie/a/b/a;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/airbnb/lottie/a/b/a<",
+            "Lcom/airbnb/lottie/g/d;",
+            "Lcom/airbnb/lottie/g/d;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public hr:Lcom/airbnb/lottie/a/b/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/airbnb/lottie/a/b/a<",
@@ -56,7 +56,7 @@
     .end annotation
 .end field
 
-.field public hr:Lcom/airbnb/lottie/a/b/a;
+.field public hs:Lcom/airbnb/lottie/a/b/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/airbnb/lottie/a/b/a<",
@@ -67,11 +67,11 @@
     .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/a;
+.field public hu:Lcom/airbnb/lottie/a/b/c;
+
+.field public hv: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 hv:Lcom/airbnb/lottie/a/b/a;
+.field public hw: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;->is:Lcom/airbnb/lottie/c/a/e;
+    iget-object v0, p1, Lcom/airbnb/lottie/c/a/l;->iu: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;->is:Lcom/airbnb/lottie/c/a/e;
+    iget-object v0, p1, Lcom/airbnb/lottie/c/a/l;->iu: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;->hn: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;->iu:Lcom/airbnb/lottie/c/a/m;
+    iget-object v0, p1, Lcom/airbnb/lottie/c/a/l;->iv: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;->iu:Lcom/airbnb/lottie/c/a/m;
+    iget-object v0, p1, Lcom/airbnb/lottie/c/a/l;->iv: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;->ho: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;->iv:Lcom/airbnb/lottie/c/a/g;
+    iget-object v0, p1, Lcom/airbnb/lottie/c/a/l;->iw: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;->iv:Lcom/airbnb/lottie/c/a/g;
+    iget-object v0, p1, Lcom/airbnb/lottie/c/a/l;->iw: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;->hp: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;->iw:Lcom/airbnb/lottie/c/a/b;
+    iget-object v0, p1, Lcom/airbnb/lottie/c/a/l;->ix: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;->iw:Lcom/airbnb/lottie/c/a/b;
+    iget-object v0, p1, Lcom/airbnb/lottie/c/a/l;->ix: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;->hq:Lcom/airbnb/lottie/a/b/a;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/b/o;->hr:Lcom/airbnb/lottie/a/b/a;
 
-    iget-object v0, p1, Lcom/airbnb/lottie/c/a/l;->iy: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_4
 
@@ -191,7 +191,7 @@
     goto :goto_4
 
     :cond_4
-    iget-object v0, p1, Lcom/airbnb/lottie/c/a/l;->iy: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;
 
@@ -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;->hs: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, 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;
 
     if-eqz v0, :cond_5
 
@@ -210,12 +210,6 @@
 
     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;
@@ -224,25 +218,31 @@
 
     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;->hm:[F
+    iput-object v0, p0, Lcom/airbnb/lottie/a/b/o;->hn:[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:[F
+    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
 
     :goto_5
-    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;->iA: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;->iz: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;
 
@@ -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;->ht:Lcom/airbnb/lottie/a/b/c;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/b/o;->hu:Lcom/airbnb/lottie/a/b/c;
 
-    iget-object v0, p1, Lcom/airbnb/lottie/c/a/l;->ix:Lcom/airbnb/lottie/c/a/d;
+    iget-object v0, p1, Lcom/airbnb/lottie/c/a/l;->iy:Lcom/airbnb/lottie/c/a/d;
 
     if-eqz v0, :cond_7
 
-    iget-object v0, p1, Lcom/airbnb/lottie/c/a/l;->ix:Lcom/airbnb/lottie/c/a/d;
+    iget-object v0, p1, Lcom/airbnb/lottie/c/a/l;->iy: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;->hr:Lcom/airbnb/lottie/a/b/a;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/b/o;->hs:Lcom/airbnb/lottie/a/b/a;
 
     :cond_7
-    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;->iB:Lcom/airbnb/lottie/c/a/b;
 
     if-eqz v0, :cond_8
 
-    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;->iB: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;->hu:Lcom/airbnb/lottie/a/b/a;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/b/o;->hv:Lcom/airbnb/lottie/a/b/a;
 
     goto :goto_7
 
     :cond_8
-    iput-object v1, p0, Lcom/airbnb/lottie/a/b/o;->hu:Lcom/airbnb/lottie/a/b/a;
+    iput-object v1, p0, Lcom/airbnb/lottie/a/b/o;->hv:Lcom/airbnb/lottie/a/b/a;
 
     :goto_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;->iC:Lcom/airbnb/lottie/c/a/b;
 
     if-eqz v0, :cond_9
 
-    iget-object p1, p1, Lcom/airbnb/lottie/c/a/l;->iB:Lcom/airbnb/lottie/c/a/b;
+    iget-object p1, p1, Lcom/airbnb/lottie/c/a/l;->iC: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;->hv:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/b/o;->hw:Lcom/airbnb/lottie/a/b/a;
 
     return-void
 
     :cond_9
-    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;->hw: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;->hm:[F
+    iget-object v1, p0, Lcom/airbnb/lottie/a/b/o;->hn:[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;->ho:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->hp: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;->hp:Lcom/airbnb/lottie/a/b/a;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/b/o;->hq: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;->hq: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_7
 
@@ -438,7 +438,7 @@
 
     move-result v0
 
-    iget-object v2, p0, Lcom/airbnb/lottie/a/b/o;->hn:Lcom/airbnb/lottie/a/b/a;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/b/o;->ho: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;->hr:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->hs: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;->hu: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_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;->hv:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->hw: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;->hn: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_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;->ho: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_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;->hp: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_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;->hq: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_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;->hs: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_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;->ht:Lcom/airbnb/lottie/a/b/c;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->hu:Lcom/airbnb/lottie/a/b/c;
 
     if-eqz v0, :cond_8
 
@@ -556,11 +556,7 @@
 .method public final a(Lcom/airbnb/lottie/c/c/a;)V
     .locals 1
 
-    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;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->hs:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {p1, v0}, Lcom/airbnb/lottie/c/c/a;->a(Lcom/airbnb/lottie/a/b/a;)V
 
@@ -568,7 +564,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;->hn:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->hw:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {p1, v0}, Lcom/airbnb/lottie/c/c/a;->a(Lcom/airbnb/lottie/a/b/a;)V
 
@@ -584,7 +580,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;->hs:Lcom/airbnb/lottie/a/b/c;
+    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
 
@@ -592,6 +588,10 @@
 
     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,39 +607,13 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/airbnb/lottie/j;->eX:Landroid/graphics/PointF;
+    sget-object v0, Lcom/airbnb/lottie/j;->eY:Landroid/graphics/PointF;
 
     if-ne p1, v0, :cond_1
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/b/o;->hn:Lcom/airbnb/lottie/a/b/a;
-
-    if-nez p1, :cond_0
-
-    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;->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
+    if-nez p1, :cond_0
 
     new-instance p1, Lcom/airbnb/lottie/a/b/p;
 
@@ -653,17 +627,43 @@
 
     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;->fd:Lcom/airbnb/lottie/g/d;
+    sget-object v0, Lcom/airbnb/lottie/j;->fe:Lcom/airbnb/lottie/g/d;
 
     if-ne p1, v0, :cond_5
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/b/o;->hp: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_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;->hp: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
 
@@ -685,13 +685,13 @@
     goto/16 :goto_0
 
     :cond_5
-    sget-object v0, Lcom/airbnb/lottie/j;->fe:Ljava/lang/Float;
+    sget-object v0, Lcom/airbnb/lottie/j;->ff:Ljava/lang/Float;
 
     const/4 v1, 0x0
 
     if-ne p1, v0, :cond_7
 
-    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;->hr: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;->hq: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
 
@@ -713,13 +713,13 @@
     goto/16 :goto_0
 
     :cond_7
-    sget-object v0, Lcom/airbnb/lottie/j;->eV:Ljava/lang/Integer;
+    sget-object v0, Lcom/airbnb/lottie/j;->eW:Ljava/lang/Integer;
 
     const/16 v2, 0x64
 
     if-ne p1, v0, :cond_9
 
-    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;->hs: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;->hr:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/b/o;->hs: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;->fr:Ljava/lang/Float;
+    sget-object v0, Lcom/airbnb/lottie/j;->fs:Ljava/lang/Float;
 
     if-ne p1, v0, :cond_b
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->hu: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_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;->hu: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
 
@@ -769,11 +769,11 @@
     goto :goto_0
 
     :cond_b
-    sget-object v0, Lcom/airbnb/lottie/j;->fs:Ljava/lang/Float;
+    sget-object v0, Lcom/airbnb/lottie/j;->ft:Ljava/lang/Float;
 
     if-ne p1, v0, :cond_d
 
-    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;->hw: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;->hv:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/b/o;->hw: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;->ff:Ljava/lang/Float;
+    sget-object v0, Lcom/airbnb/lottie/j;->fg:Ljava/lang/Float;
 
     if-ne p1, v0, :cond_f
 
-    iget-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;
 
     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;->hs:Lcom/airbnb/lottie/a/b/c;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/b/o;->ht:Lcom/airbnb/lottie/a/b/c;
 
     :cond_e
-    iget-object p1, p0, Lcom/airbnb/lottie/a/b/o;->hs: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
 
     goto :goto_0
 
     :cond_f
-    sget-object v0, Lcom/airbnb/lottie/j;->fg:Ljava/lang/Float;
+    sget-object v0, Lcom/airbnb/lottie/j;->fh:Ljava/lang/Float;
 
     if-ne p1, v0, :cond_11
 
-    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;->hu: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;->ht:Lcom/airbnb/lottie/a/b/c;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/b/o;->hu:Lcom/airbnb/lottie/a/b/c;
 
     :cond_10
-    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;->hu: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;->ho:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->hp: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;->hq: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_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;->hs: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 v2, 0x3f800000    # 1.0f
 
     if-eqz v0, :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;->hu: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;->ht:Lcom/airbnb/lottie/a/b/c;
+    iget-object v4, p0, Lcom/airbnb/lottie/a/b/o;->hu: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;->hs:Lcom/airbnb/lottie/a/b/c;
+    iget-object v4, p0, Lcom/airbnb/lottie/a/b/o;->ht: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;->hm:[F
+    iget-object v5, p0, Lcom/airbnb/lottie/a/b/o;->hn:[F
 
     const/4 v6, 0x0
 
@@ -1067,13 +1067,13 @@
 
     aput v2, v5, v11
 
-    iget-object v12, p0, Lcom/airbnb/lottie/a/b/o;->hj:Landroid/graphics/Matrix;
+    iget-object v12, p0, Lcom/airbnb/lottie/a/b/o;->hk: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;->hm:[F
+    iget-object v5, p0, Lcom/airbnb/lottie/a/b/o;->hn:[F
 
     aput v2, v5, v6
 
@@ -1083,13 +1083,13 @@
 
     aput v2, v5, v11
 
-    iget-object v4, p0, Lcom/airbnb/lottie/a/b/o;->hk:Landroid/graphics/Matrix;
+    iget-object v4, p0, Lcom/airbnb/lottie/a/b/o;->hl: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;->hm:[F
+    iget-object v4, p0, Lcom/airbnb/lottie/a/b/o;->hn:[F
 
     aput v0, v4, v6
 
@@ -1101,30 +1101,30 @@
 
     aput v2, v4, v11
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->hl:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->hm: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;->matrix:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->hm: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;->hp: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_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;->hn: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_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 33f0f371fb..1e4631a8ef 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 hw:Lcom/airbnb/lottie/g/b;
+.field private final hx: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 hx:Ljava/lang/Object;
+.field private final hy: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;->hw:Lcom/airbnb/lottie/g/b;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/b/p;->hx: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;->hx:Ljava/lang/Object;
+    iput-object p2, p0, Lcom/airbnb/lottie/a/b/p;->hy: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;->gO:Lcom/airbnb/lottie/g/c;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/p;->gP: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;->gO:Lcom/airbnb/lottie/g/c;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/p;->gP:Lcom/airbnb/lottie/g/c;
 
-    iget-object v4, p0, Lcom/airbnb/lottie/a/b/p;->hx:Ljava/lang/Object;
+    iget-object v4, p0, Lcom/airbnb/lottie/a/b/p;->hy:Ljava/lang/Object;
 
-    iget v5, p0, Lcom/airbnb/lottie/a/b/a;->dV:F
+    iget v5, p0, Lcom/airbnb/lottie/a/b/a;->dW:F
 
-    iget v6, p0, Lcom/airbnb/lottie/a/b/a;->dV:F
+    iget v6, p0, Lcom/airbnb/lottie/a/b/a;->dW:F
 
-    iget v7, p0, Lcom/airbnb/lottie/a/b/a;->dV:F
+    iget v7, p0, Lcom/airbnb/lottie/a/b/a;->dW: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 27147829ac..d49396d0a2 100644
--- a/com.discord/smali/com/airbnb/lottie/b/a.smali
+++ b/com.discord/smali/com/airbnb/lottie/b/a.smali
@@ -5,33 +5,6 @@
 
 # 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<",
@@ -44,6 +17,33 @@
     .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,13 +55,7 @@
 
     invoke-direct {v0}, Lcom/airbnb/lottie/c/i;-><init>()V
 
-    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;
+    iput-object v0, p0, Lcom/airbnb/lottie/b/a;->hz:Lcom/airbnb/lottie/c/i;
 
     new-instance v0, Ljava/util/HashMap;
 
@@ -69,11 +63,17 @@
 
     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;->hD:Ljava/lang/String;
+    iput-object v0, p0, Lcom/airbnb/lottie/b/a;->hE:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/airbnb/lottie/b/a;->hC:Lcom/airbnb/lottie/a;
+    iput-object p2, p0, Lcom/airbnb/lottie/b/a;->hD: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;->hB:Landroid/content/res/AssetManager;
+    iput-object p1, p0, Lcom/airbnb/lottie/b/a;->hC:Landroid/content/res/AssetManager;
 
     return-void
 
@@ -100,7 +100,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/airbnb/lottie/b/a;->hB:Landroid/content/res/AssetManager;
+    iput-object p1, p0, Lcom/airbnb/lottie/b/a;->hC: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 e9d65cbe78..90fcec5858 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 hE:Ljava/lang/Object;
+.field private static final hF:Ljava/lang/Object;
 
 
 # instance fields
 .field public final context:Landroid/content/Context;
 
-.field private hF:Ljava/lang/String;
+.field private hG:Ljava/lang/String;
 
-.field public hG:Lcom/airbnb/lottie/b;
+.field public hH:Lcom/airbnb/lottie/b;
 
-.field private final hH:Ljava/util/Map;
+.field private final hI: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;->hE:Ljava/lang/Object;
+    sput-object v0, Lcom/airbnb/lottie/b/b;->hF: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;->hF:Ljava/lang/String;
+    iput-object p2, p0, Lcom/airbnb/lottie/b/b;->hG: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;->hF:Ljava/lang/String;
+    iget-object p2, p0, Lcom/airbnb/lottie/b/b;->hG: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;->hF:Ljava/lang/String;
+    iget-object v1, p0, Lcom/airbnb/lottie/b/b;->hG: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;->hF:Ljava/lang/String;
+    iput-object p2, p0, Lcom/airbnb/lottie/b/b;->hG: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;->hH:Ljava/util/Map;
+    iput-object p1, p0, Lcom/airbnb/lottie/b/b;->hI: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;->hH:Ljava/util/Map;
+    iput-object p4, p0, Lcom/airbnb/lottie/b/b;->hI:Ljava/util/Map;
 
-    iput-object p3, p0, Lcom/airbnb/lottie/b/b;->hG:Lcom/airbnb/lottie/b;
+    iput-object p3, p0, Lcom/airbnb/lottie/b/b;->hH: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;->hE:Ljava/lang/Object;
+    sget-object v0, Lcom/airbnb/lottie/b/b;->hF:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/airbnb/lottie/b/b;->hH:Ljava/util/Map;
+    iget-object v1, p0, Lcom/airbnb/lottie/b/b;->hI: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;->eS:Landroid/graphics/Bitmap;
+    iput-object p2, p1, Lcom/airbnb/lottie/g;->eT: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;->hH:Ljava/util/Map;
+    iget-object v0, p0, Lcom/airbnb/lottie/b/b;->hI: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;->eS:Landroid/graphics/Bitmap;
+    iget-object v2, v0, Lcom/airbnb/lottie/g;->eT:Landroid/graphics/Bitmap;
 
     if-eqz v2, :cond_1
 
     return-object v2
 
     :cond_1
-    iget-object v2, p0, Lcom/airbnb/lottie/b/b;->hG:Lcom/airbnb/lottie/b;
+    iget-object v2, p0, Lcom/airbnb/lottie/b/b;->hH: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;->eQ:Ljava/lang/String;
+    iget-object v2, v0, Lcom/airbnb/lottie/g;->eR: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;->hF:Ljava/lang/String;
+    iget-object v4, p0, Lcom/airbnb/lottie/b/b;->hG: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;->hF:Ljava/lang/String;
+    iget-object v6, p0, Lcom/airbnb/lottie/b/b;->hG: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 93bc6ea25f..8e3962bee7 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 dC:Z = false
+.field private static dD:Z = false
 
-.field private static dD:[Ljava/lang/String;
+.field private static dE:[Ljava/lang/String;
 
-.field private static dE:[J
-
-.field private static dF:I
+.field private static dF:[J
 
 .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;->dC:Z
+    sget-boolean v0, Lcom/airbnb/lottie/c;->dD:Z
 
     if-nez v0, :cond_0
 
     return-void
 
     :cond_0
-    sget v0, Lcom/airbnb/lottie/c;->dF:I
+    sget v0, Lcom/airbnb/lottie/c;->dG:I
 
     const/16 v1, 0x14
 
     if-ne v0, v1, :cond_1
 
-    sget p0, Lcom/airbnb/lottie/c;->dG:I
+    sget p0, Lcom/airbnb/lottie/c;->dH:I
 
     add-int/lit8 p0, p0, 0x1
 
-    sput p0, Lcom/airbnb/lottie/c;->dG:I
+    sput p0, Lcom/airbnb/lottie/c;->dH:I
 
     return-void
 
     :cond_1
-    sget-object v1, Lcom/airbnb/lottie/c;->dD:[Ljava/lang/String;
+    sget-object v1, Lcom/airbnb/lottie/c;->dE:[Ljava/lang/String;
 
     aput-object p0, v1, v0
 
-    sget-object v1, Lcom/airbnb/lottie/c;->dE:[J
+    sget-object v1, Lcom/airbnb/lottie/c;->dF:[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;->dF:I
+    sget p0, Lcom/airbnb/lottie/c;->dG:I
 
     add-int/lit8 p0, p0, 0x1
 
-    sput p0, Lcom/airbnb/lottie/c;->dF:I
+    sput p0, Lcom/airbnb/lottie/c;->dG: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;->dG:I
+    sget v0, Lcom/airbnb/lottie/c;->dH:I
 
     const/4 v1, 0x0
 
@@ -83,31 +83,31 @@
 
     add-int/lit8 v0, v0, -0x1
 
-    sput v0, Lcom/airbnb/lottie/c;->dG:I
+    sput v0, Lcom/airbnb/lottie/c;->dH:I
 
     return v1
 
     :cond_0
-    sget-boolean v0, Lcom/airbnb/lottie/c;->dC:Z
+    sget-boolean v0, Lcom/airbnb/lottie/c;->dD:Z
 
     if-nez v0, :cond_1
 
     return v1
 
     :cond_1
-    sget v0, Lcom/airbnb/lottie/c;->dF:I
+    sget v0, Lcom/airbnb/lottie/c;->dG:I
 
     add-int/lit8 v0, v0, -0x1
 
-    sput v0, Lcom/airbnb/lottie/c;->dF:I
+    sput v0, Lcom/airbnb/lottie/c;->dG:I
 
     const/4 v1, -0x1
 
     if-eq v0, v1, :cond_3
 
-    sget-object v0, Lcom/airbnb/lottie/c;->dD:[Ljava/lang/String;
+    sget-object v0, Lcom/airbnb/lottie/c;->dE:[Ljava/lang/String;
 
-    sget v1, Lcom/airbnb/lottie/c;->dF:I
+    sget v1, Lcom/airbnb/lottie/c;->dG:I
 
     aget-object v0, v0, v1
 
@@ -123,9 +123,9 @@
 
     move-result-wide v0
 
-    sget-object p0, Lcom/airbnb/lottie/c;->dE:[J
+    sget-object p0, Lcom/airbnb/lottie/c;->dF:[J
 
-    sget v2, Lcom/airbnb/lottie/c;->dF:I
+    sget v2, Lcom/airbnb/lottie/c;->dG: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;->dD:[Ljava/lang/String;
+    sget-object p0, Lcom/airbnb/lottie/c;->dE:[Ljava/lang/String;
 
-    sget v2, Lcom/airbnb/lottie/c;->dF:I
+    sget v2, Lcom/airbnb/lottie/c;->dG: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 c3561d33cb..c54bf674be 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,12 +21,6 @@
 
     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;
@@ -35,6 +29,12 @@
 
     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;->hI:Landroid/graphics/PointF;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/a;->hJ:Landroid/graphics/PointF;
 
-    iput-object p2, p0, Lcom/airbnb/lottie/c/a;->hJ:Landroid/graphics/PointF;
+    iput-object p2, p0, Lcom/airbnb/lottie/c/a;->hK:Landroid/graphics/PointF;
 
-    iput-object p3, p0, Lcom/airbnb/lottie/c/a;->hK:Landroid/graphics/PointF;
+    iput-object p3, p0, Lcom/airbnb/lottie/c/a;->hL: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 bcb74d9bd5..9fbe40b601 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;->gN:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/a/a;->gO: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 b1bbb7558b..d36566e11d 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;->gN:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/a/b;->gO: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 81e3b19efa..19790cd7d9 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;->gN:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/a/c;->gO: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 91d4abf474..f39c90889b 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;->gN:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/a/d;->gO: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 cc4417417c..f8585d3602 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 gN:Ljava/util/List;
+.field private final gO: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;->gN:Ljava/util/List;
+    iput-object v0, p0, Lcom/airbnb/lottie/c/a/e;->gO: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;->gN:Ljava/util/List;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/a/e;->gO:Ljava/util/List;
 
     return-void
 .end method
@@ -89,7 +89,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/a/e;->gN:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/a/e;->gO: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;->gN:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/a/e;->gO: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;->gN:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/a/e;->gO: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;->gN:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/a/e;->gO: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;->gN:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/a/e;->gO: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;->gN:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/a/e;->gO: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 37cb5d0753..1665572f4c 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;->gN:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/a/f;->gO: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 fc80da4776..30f419bcb8 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;->gN:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/a/g;->gO: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 f8c24acbc3..ca56188fa3 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;->gN:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/a/h;->gO: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 3a15fe5c40..57ac42e8d2 100644
--- a/com.discord/smali/com/airbnb/lottie/c/a/i.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/a/i.smali
@@ -19,10 +19,10 @@
 
 
 # instance fields
-.field private final ik:Lcom/airbnb/lottie/c/a/b;
-
 .field private final il:Lcom/airbnb/lottie/c/a/b;
 
+.field private final im:Lcom/airbnb/lottie/c/a/b;
+
 
 # direct methods
 .method public constructor <init>(Lcom/airbnb/lottie/c/a/b;Lcom/airbnb/lottie/c/a/b;)V
@@ -30,9 +30,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/airbnb/lottie/c/a/i;->ik:Lcom/airbnb/lottie/c/a/b;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/a/i;->il:Lcom/airbnb/lottie/c/a/b;
 
-    iput-object p2, p0, Lcom/airbnb/lottie/c/a/i;->il:Lcom/airbnb/lottie/c/a/b;
+    iput-object p2, p0, Lcom/airbnb/lottie/c/a/i;->im: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;->ik:Lcom/airbnb/lottie/c/a/b;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/a/i;->il: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;->il:Lcom/airbnb/lottie/c/a/b;
+    iget-object v2, p0, Lcom/airbnb/lottie/c/a/i;->im: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;->ik: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
 
@@ -81,7 +81,7 @@
 
     if-eqz v0, :cond_0
 
-    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;->im: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 f5f979af28..f0cff621f7 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;->gN:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/a/j;->gO: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 2dfcbca9c1..c7f7a0a396 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/b;
+.field public final iq:Lcom/airbnb/lottie/c/a/a;
 
 .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;->im:Lcom/airbnb/lottie/c/a/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/a/k;->io: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 p2, p0, Lcom/airbnb/lottie/c/a/k;->iq:Lcom/airbnb/lottie/c/a/a;
 
-    iput-object p3, p0, Lcom/airbnb/lottie/c/a/k;->iq:Lcom/airbnb/lottie/c/a/b;
+    iput-object p3, p0, Lcom/airbnb/lottie/c/a/k;->ir:Lcom/airbnb/lottie/c/a/b;
 
-    iput-object p4, p0, Lcom/airbnb/lottie/c/a/k;->ir:Lcom/airbnb/lottie/c/a/b;
+    iput-object p4, p0, Lcom/airbnb/lottie/c/a/k;->is: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 d35336dc1f..f39fc85cad 100644
--- a/com.discord/smali/com/airbnb/lottie/c/a/l.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/a/l.smali
@@ -11,9 +11,11 @@
 
 .field public final iB:Lcom/airbnb/lottie/c/a/b;
 
-.field public final is:Lcom/airbnb/lottie/c/a/e;
+.field public final iC:Lcom/airbnb/lottie/c/a/b;
 
-.field public final iu:Lcom/airbnb/lottie/c/a/m;
+.field public final iu:Lcom/airbnb/lottie/c/a/e;
+
+.field public final iv:Lcom/airbnb/lottie/c/a/m;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/airbnb/lottie/c/a/m<",
@@ -24,13 +26,11 @@
     .end annotation
 .end field
 
-.field public final iv:Lcom/airbnb/lottie/c/a/g;
+.field public final iw:Lcom/airbnb/lottie/c/a/g;
 
-.field public final iw:Lcom/airbnb/lottie/c/a/b;
+.field public final ix:Lcom/airbnb/lottie/c/a/b;
 
-.field public final ix:Lcom/airbnb/lottie/c/a/d;
-
-.field public final iy:Lcom/airbnb/lottie/c/a/b;
+.field public final iy:Lcom/airbnb/lottie/c/a/d;
 
 .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;->is:Lcom/airbnb/lottie/c/a/e;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/a/l;->iu:Lcom/airbnb/lottie/c/a/e;
 
-    iput-object p2, p0, Lcom/airbnb/lottie/c/a/l;->iu:Lcom/airbnb/lottie/c/a/m;
+    iput-object p2, p0, Lcom/airbnb/lottie/c/a/l;->iv:Lcom/airbnb/lottie/c/a/m;
 
-    iput-object p3, p0, Lcom/airbnb/lottie/c/a/l;->iv:Lcom/airbnb/lottie/c/a/g;
+    iput-object p3, p0, Lcom/airbnb/lottie/c/a/l;->iw:Lcom/airbnb/lottie/c/a/g;
 
-    iput-object p4, p0, Lcom/airbnb/lottie/c/a/l;->iw:Lcom/airbnb/lottie/c/a/b;
+    iput-object p4, p0, Lcom/airbnb/lottie/c/a/l;->ix:Lcom/airbnb/lottie/c/a/b;
 
-    iput-object p5, p0, Lcom/airbnb/lottie/c/a/l;->ix:Lcom/airbnb/lottie/c/a/d;
+    iput-object p5, p0, Lcom/airbnb/lottie/c/a/l;->iy:Lcom/airbnb/lottie/c/a/d;
 
-    iput-object p6, p0, Lcom/airbnb/lottie/c/a/l;->iA:Lcom/airbnb/lottie/c/a/b;
+    iput-object p6, p0, Lcom/airbnb/lottie/c/a/l;->iB: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 p7, p0, Lcom/airbnb/lottie/c/a/l;->iC: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 p8, p0, Lcom/airbnb/lottie/c/a/l;->iz:Lcom/airbnb/lottie/c/a/b;
 
-    iput-object p9, p0, Lcom/airbnb/lottie/c/a/l;->iz:Lcom/airbnb/lottie/c/a/b;
+    iput-object p9, p0, Lcom/airbnb/lottie/c/a/l;->iA: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 1ca84d844e..d0865d0ff2 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 gN:Ljava/util/List;
+.field final gO: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;->gN:Ljava/util/List;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/a/n;->gO: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;->gN:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/a/n;->gO: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;->gN:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/a/n;->gO: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;->gN:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/a/n;->gO: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;->gN:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/a/n;->gO: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;->gN:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/a/n;->gO: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;->gN:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/a/n;->gO: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 6ba6fe6ee7..9f4062a2df 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 hT:I = 0x1
+.field public static final hU:I = 0x1
 
-.field public static final hU:I = 0x2
+.field public static final hV:I = 0x2
 
-.field public static final hV:I = 0x3
+.field public static final hW:I = 0x3
 
-.field private static final synthetic hW:[I
+.field private static final synthetic hX:[I
 
 
 # direct methods
@@ -40,25 +40,25 @@
 
     new-array v0, v0, [I
 
-    sget v1, Lcom/airbnb/lottie/c/b$a;->hT:I
+    sget v1, Lcom/airbnb/lottie/c/b$a;->hU:I
 
     const/4 v2, 0x0
 
     aput v1, v0, v2
 
-    sget v1, Lcom/airbnb/lottie/c/b$a;->hU:I
+    sget v1, Lcom/airbnb/lottie/c/b$a;->hV:I
 
     const/4 v2, 0x1
 
     aput v1, v0, v2
 
-    sget v1, Lcom/airbnb/lottie/c/b$a;->hV:I
+    sget v1, Lcom/airbnb/lottie/c/b$a;->hW:I
 
     const/4 v2, 0x2
 
     aput v1, v0, v2
 
-    sput-object v0, Lcom/airbnb/lottie/c/b$a;->hW:[I
+    sput-object v0, Lcom/airbnb/lottie/c/b$a;->hX:[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;->hW:[I
+    sget-object v0, Lcom/airbnb/lottie/c/b$a;->hX:[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 09bd8ae30d..00fdf26ff7 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 hL:Ljava/lang/String;
+.field public final hM:Ljava/lang/String;
 
-.field public final hM:D
-
-.field public final hN:I
+.field public final hN:D
 
 .field public final hO:I
 
-.field public final hP:D
+.field public final hP:I
 
 .field public final hQ:D
 
 .field public final hR:D
 
-.field public final hS:Z
+.field public final hS:D
+
+.field public final hT: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;->hL:Ljava/lang/String;
+    iput-object p2, p0, Lcom/airbnb/lottie/c/b;->hM:Ljava/lang/String;
 
-    iput-wide p3, p0, Lcom/airbnb/lottie/c/b;->hM:D
+    iput-wide p3, p0, Lcom/airbnb/lottie/c/b;->hN:D
 
-    iput p5, p0, Lcom/airbnb/lottie/c/b;->hN:I
+    iput p5, p0, Lcom/airbnb/lottie/c/b;->hO:I
 
-    iput p6, p0, Lcom/airbnb/lottie/c/b;->hO:I
+    iput p6, p0, Lcom/airbnb/lottie/c/b;->hP:I
 
-    iput-wide p7, p0, Lcom/airbnb/lottie/c/b;->hP:D
+    iput-wide p7, p0, Lcom/airbnb/lottie/c/b;->hQ:D
 
-    iput-wide p9, p0, Lcom/airbnb/lottie/c/b;->hQ:D
+    iput-wide p9, p0, Lcom/airbnb/lottie/c/b;->hR: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;->hR:D
+    iput-wide p13, p0, Lcom/airbnb/lottie/c/b;->hS:D
 
-    iput-boolean p15, p0, Lcom/airbnb/lottie/c/b;->hS:Z
+    iput-boolean p15, p0, Lcom/airbnb/lottie/c/b;->hT:Z
 
     return-void
 .end method
@@ -79,7 +79,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lcom/airbnb/lottie/c/b;->hL:Ljava/lang/String;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/b;->hM: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;->hM:D
+    iget-wide v2, p0, Lcom/airbnb/lottie/c/b;->hN: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;->hN:I
+    iget v1, p0, Lcom/airbnb/lottie/c/b;->hO: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;->hO:I
+    iget v1, p0, Lcom/airbnb/lottie/c/b;->hP:I
 
     add-int/2addr v0, v1
 
-    iget-wide v1, p0, Lcom/airbnb/lottie/c/b;->hP:D
+    iget-wide v1, p0, Lcom/airbnb/lottie/c/b;->hQ: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 383369d65e..7ea504e7fe 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 fY:Z
+.field public final fZ:Z
 
-.field public final iC:Lcom/airbnb/lottie/c/a/f;
+.field public final iD:Lcom/airbnb/lottie/c/a/f;
 
-.field public final iD:Z
+.field public final iE:Z
 
-.field public final iu:Lcom/airbnb/lottie/c/a/m;
+.field public final iv: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;->iu:Lcom/airbnb/lottie/c/a/m;
+    iput-object p2, p0, Lcom/airbnb/lottie/c/b/a;->iv:Lcom/airbnb/lottie/c/a/m;
 
-    iput-object p3, p0, Lcom/airbnb/lottie/c/b/a;->iC:Lcom/airbnb/lottie/c/a/f;
+    iput-object p3, p0, Lcom/airbnb/lottie/c/b/a;->iD:Lcom/airbnb/lottie/c/a/f;
 
-    iput-boolean p4, p0, Lcom/airbnb/lottie/c/b/a;->iD:Z
+    iput-boolean p4, p0, Lcom/airbnb/lottie/c/b/a;->iE:Z
 
-    iput-boolean p5, p0, Lcom/airbnb/lottie/c/b/a;->fY:Z
+    iput-boolean p5, p0, Lcom/airbnb/lottie/c/b/a;->fZ: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 88890b5181..3649ed2ee2 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 iE:[F
+.field public final iF:[F
 
-.field public final iF:[I
+.field public final iG:[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;->iE:[F
+    iput-object p1, p0, Lcom/airbnb/lottie/c/b/c;->iF:[F
 
-    iput-object p2, p0, Lcom/airbnb/lottie/c/b/c;->iF:[I
+    iput-object p2, p0, Lcom/airbnb/lottie/c/b/c;->iG:[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 d39bc1c941..f26fa68004 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 fY:Z
+.field public final fZ:Z
 
-.field public final iG:I
+.field public final iH:I
 
-.field public final iH:Landroid/graphics/Path$FillType;
+.field public final iI:Landroid/graphics/Path$FillType;
 
-.field public final iI:Lcom/airbnb/lottie/c/a/c;
-
-.field public final iJ:Lcom/airbnb/lottie/c/a/f;
+.field public final iJ:Lcom/airbnb/lottie/c/a/c;
 
 .field public final iK:Lcom/airbnb/lottie/c/a/f;
 
-.field private final iL:Lcom/airbnb/lottie/c/a/b;
+.field public final iL:Lcom/airbnb/lottie/c/a/f;
 
 .field private final iM:Lcom/airbnb/lottie/c/a/b;
 
-.field public final ix:Lcom/airbnb/lottie/c/a/d;
+.field private final iN:Lcom/airbnb/lottie/c/a/b;
+
+.field public final iy: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;->iG:I
+    iput p2, p0, Lcom/airbnb/lottie/c/b/d;->iH:I
 
-    iput-object p3, p0, Lcom/airbnb/lottie/c/b/d;->iH:Landroid/graphics/Path$FillType;
+    iput-object p3, p0, Lcom/airbnb/lottie/c/b/d;->iI:Landroid/graphics/Path$FillType;
 
-    iput-object p4, p0, Lcom/airbnb/lottie/c/b/d;->iI:Lcom/airbnb/lottie/c/a/c;
+    iput-object p4, p0, Lcom/airbnb/lottie/c/b/d;->iJ:Lcom/airbnb/lottie/c/a/c;
 
-    iput-object p5, p0, Lcom/airbnb/lottie/c/b/d;->ix:Lcom/airbnb/lottie/c/a/d;
+    iput-object p5, p0, Lcom/airbnb/lottie/c/b/d;->iy:Lcom/airbnb/lottie/c/a/d;
 
-    iput-object p6, p0, Lcom/airbnb/lottie/c/b/d;->iJ:Lcom/airbnb/lottie/c/a/f;
+    iput-object p6, p0, Lcom/airbnb/lottie/c/b/d;->iK: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 p7, p0, Lcom/airbnb/lottie/c/b/d;->iL: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-boolean p8, p0, Lcom/airbnb/lottie/c/b/d;->fY:Z
+    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
 
     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 e720fd4ac9..57888ad428 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 fY:Z
+.field public final fZ:Z
 
-.field public final iG:I
+.field public final iH:I
 
-.field public final iI:Lcom/airbnb/lottie/c/a/c;
-
-.field public final iJ:Lcom/airbnb/lottie/c/a/f;
+.field public final iJ:Lcom/airbnb/lottie/c/a/c;
 
 .field public final iK:Lcom/airbnb/lottie/c/a/f;
 
-.field public final iN:Lcom/airbnb/lottie/c/a/b;
+.field public final iL:Lcom/airbnb/lottie/c/a/f;
 
-.field public final iO:Lcom/airbnb/lottie/c/b/p$a;
+.field public final iO:Lcom/airbnb/lottie/c/a/b;
 
-.field public final iP:Lcom/airbnb/lottie/c/b/p$b;
+.field public final iP:Lcom/airbnb/lottie/c/b/p$a;
 
-.field public final iQ:F
+.field public final iQ:Lcom/airbnb/lottie/c/b/p$b;
 
-.field public final iR:Ljava/util/List;
+.field public final iR:F
+
+.field public final iS:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -35,9 +35,9 @@
     .end annotation
 .end field
 
-.field public final iS:Lcom/airbnb/lottie/c/a/b;
+.field public final iT:Lcom/airbnb/lottie/c/a/b;
 
-.field public final ix:Lcom/airbnb/lottie/c/a/d;
+.field public final iy: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;->iG:I
+    iput p2, p0, Lcom/airbnb/lottie/c/b/e;->iH:I
 
-    iput-object p3, p0, Lcom/airbnb/lottie/c/b/e;->iI:Lcom/airbnb/lottie/c/a/c;
+    iput-object p3, p0, Lcom/airbnb/lottie/c/b/e;->iJ:Lcom/airbnb/lottie/c/a/c;
 
-    iput-object p4, p0, Lcom/airbnb/lottie/c/b/e;->ix:Lcom/airbnb/lottie/c/a/d;
+    iput-object p4, p0, Lcom/airbnb/lottie/c/b/e;->iy:Lcom/airbnb/lottie/c/a/d;
 
-    iput-object p5, p0, Lcom/airbnb/lottie/c/b/e;->iJ:Lcom/airbnb/lottie/c/a/f;
+    iput-object p5, p0, Lcom/airbnb/lottie/c/b/e;->iK: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 p6, p0, Lcom/airbnb/lottie/c/b/e;->iL:Lcom/airbnb/lottie/c/a/f;
 
-    iput-object p7, p0, Lcom/airbnb/lottie/c/b/e;->iN:Lcom/airbnb/lottie/c/a/b;
+    iput-object p7, p0, Lcom/airbnb/lottie/c/b/e;->iO:Lcom/airbnb/lottie/c/a/b;
 
-    iput-object p8, p0, Lcom/airbnb/lottie/c/b/e;->iO:Lcom/airbnb/lottie/c/b/p$a;
+    iput-object p8, p0, Lcom/airbnb/lottie/c/b/e;->iP:Lcom/airbnb/lottie/c/b/p$a;
 
-    iput-object p9, p0, Lcom/airbnb/lottie/c/b/e;->iP:Lcom/airbnb/lottie/c/b/p$b;
+    iput-object p9, p0, Lcom/airbnb/lottie/c/b/e;->iQ:Lcom/airbnb/lottie/c/b/p$b;
 
-    iput p10, p0, Lcom/airbnb/lottie/c/b/e;->iQ:F
+    iput p10, p0, Lcom/airbnb/lottie/c/b/e;->iR:F
 
-    iput-object p11, p0, Lcom/airbnb/lottie/c/b/e;->iR:Ljava/util/List;
+    iput-object p11, p0, Lcom/airbnb/lottie/c/b/e;->iS:Ljava/util/List;
 
-    iput-object p12, p0, Lcom/airbnb/lottie/c/b/e;->iS:Lcom/airbnb/lottie/c/a/b;
+    iput-object p12, p0, Lcom/airbnb/lottie/c/b/e;->iT:Lcom/airbnb/lottie/c/a/b;
 
-    iput-boolean p13, p0, Lcom/airbnb/lottie/c/b/e;->fY:Z
+    iput-boolean p13, p0, Lcom/airbnb/lottie/c/b/e;->fZ: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 0b13c8bcf8..3ec657bee8 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 iT:I = 0x1
+.field public static final iU:I = 0x1
 
-.field public static final iU:I = 0x2
+.field public static final iV:I = 0x2
 
-.field private static final synthetic iV:[I
+.field private static final synthetic iW:[I
 
 
 # direct methods
@@ -29,19 +29,19 @@
 
     new-array v0, v0, [I
 
-    sget v1, Lcom/airbnb/lottie/c/b/f;->iT:I
+    sget v1, Lcom/airbnb/lottie/c/b/f;->iU:I
 
     const/4 v2, 0x0
 
     aput v1, v0, v2
 
-    sget v1, Lcom/airbnb/lottie/c/b/f;->iU:I
+    sget v1, Lcom/airbnb/lottie/c/b/f;->iV:I
 
     const/4 v2, 0x1
 
     aput v1, v0, v2
 
-    sput-object v0, Lcom/airbnb/lottie/c/b/f;->iV:[I
+    sput-object v0, Lcom/airbnb/lottie/c/b/f;->iW:[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 52b994a73e..ca2daaa775 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 iZ:I = 0x1
+.field public static final ja:I = 0x1
 
-.field public static final ja:I = 0x2
+.field public static final jb:I = 0x2
 
-.field public static final jb:I = 0x3
+.field public static final jc:I = 0x3
 
-.field private static final synthetic jc:[I
+.field private static final synthetic jd:[I
 
 
 # direct methods
@@ -40,25 +40,25 @@
 
     new-array v0, v0, [I
 
-    sget v1, Lcom/airbnb/lottie/c/b/g$a;->iZ:I
+    sget v1, Lcom/airbnb/lottie/c/b/g$a;->ja:I
 
     const/4 v2, 0x0
 
     aput v1, v0, v2
 
-    sget v1, Lcom/airbnb/lottie/c/b/g$a;->ja:I
+    sget v1, Lcom/airbnb/lottie/c/b/g$a;->jb:I
 
     const/4 v2, 0x1
 
     aput v1, v0, v2
 
-    sget v1, Lcom/airbnb/lottie/c/b/g$a;->jb:I
+    sget v1, Lcom/airbnb/lottie/c/b/g$a;->jc:I
 
     const/4 v2, 0x2
 
     aput v1, v0, v2
 
-    sput-object v0, Lcom/airbnb/lottie/c/b/g$a;->jc:[I
+    sput-object v0, Lcom/airbnb/lottie/c/b/g$a;->jd:[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;->jc:[I
+    sget-object v0, Lcom/airbnb/lottie/c/b/g$a;->jd:[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 39aee3a91b..c68c658d99 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 iW:I
+.field public final iX:I
 
-.field public final iX:Lcom/airbnb/lottie/c/a/h;
+.field public final iY:Lcom/airbnb/lottie/c/a/h;
 
-.field public final iY:Z
+.field public final iZ:Z
 
-.field public final ix:Lcom/airbnb/lottie/c/a/d;
+.field public final iy: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;->iW:I
+    iput p1, p0, Lcom/airbnb/lottie/c/b/g;->iX:I
 
-    iput-object p2, p0, Lcom/airbnb/lottie/c/b/g;->iX:Lcom/airbnb/lottie/c/a/h;
+    iput-object p2, p0, Lcom/airbnb/lottie/c/b/g;->iY:Lcom/airbnb/lottie/c/a/h;
 
-    iput-object p3, p0, Lcom/airbnb/lottie/c/b/g;->ix:Lcom/airbnb/lottie/c/a/d;
+    iput-object p3, p0, Lcom/airbnb/lottie/c/b/g;->iy:Lcom/airbnb/lottie/c/a/d;
 
-    iput-boolean p4, p0, Lcom/airbnb/lottie/c/b/g;->iY:Z
+    iput-boolean p4, p0, Lcom/airbnb/lottie/c/b/g;->iZ: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 d8ecfd7031..a92127bcd0 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,8 +23,6 @@
 
 
 # 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;
@@ -33,7 +31,9 @@
 
 .field public static final enum ji:Lcom/airbnb/lottie/c/b/h$a;
 
-.field private static final synthetic jj:[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;
 
 
 # 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;->je: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;
 
@@ -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;->jf: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;
 
@@ -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;->jg: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;
 
@@ -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;->jh: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;
 
     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;->ji: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;
 
     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;->je: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;
 
     aput-object v6, v0, v1
 
-    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;->jg:Lcom/airbnb/lottie/c/b/h$a;
 
     aput-object v1, v0, v2
 
-    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;->jh:Lcom/airbnb/lottie/c/b/h$a;
 
     aput-object v1, v0, v3
 
-    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;->ji:Lcom/airbnb/lottie/c/b/h$a;
 
     aput-object v1, v0, v4
 
-    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;->jj:Lcom/airbnb/lottie/c/b/h$a;
 
     aput-object v1, v0, v5
 
-    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;->jk:[Lcom/airbnb/lottie/c/b/h$a;
 
     return-void
 .end method
@@ -155,32 +155,32 @@
 
     if-eq p0, v0, :cond_0
 
-    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;->ji:Lcom/airbnb/lottie/c/b/h$a;
-
-    return-object p0
-
-    :cond_1
-    sget-object p0, Lcom/airbnb/lottie/c/b/h$a;->jh:Lcom/airbnb/lottie/c/b/h$a;
-
-    return-object p0
-
-    :cond_2
-    sget-object p0, Lcom/airbnb/lottie/c/b/h$a;->jg:Lcom/airbnb/lottie/c/b/h$a;
-
-    return-object p0
-
-    :cond_3
     sget-object p0, Lcom/airbnb/lottie/c/b/h$a;->jf: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
+    sget-object p0, Lcom/airbnb/lottie/c/b/h$a;->jh:Lcom/airbnb/lottie/c/b/h$a;
+
+    return-object p0
+
+    :cond_3
+    sget-object p0, Lcom/airbnb/lottie/c/b/h$a;->jg: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;
+    sget-object p0, Lcom/airbnb/lottie/c/b/h$a;->jf:Lcom/airbnb/lottie/c/b/h$a;
 
     return-object p0
 .end method
@@ -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;->jj:[Lcom/airbnb/lottie/c/b/h$a;
+    sget-object v0, Lcom/airbnb/lottie/c/b/h$a;->jk:[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 f34df4094a..376dd504c5 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 fY:Z
+.field public final fZ:Z
 
-.field public final jd:Lcom/airbnb/lottie/c/b/h$a;
+.field public final je: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;->jd:Lcom/airbnb/lottie/c/b/h$a;
+    iput-object p2, p0, Lcom/airbnb/lottie/c/b/h;->je:Lcom/airbnb/lottie/c/b/h$a;
 
-    iput-boolean p3, p0, Lcom/airbnb/lottie/c/b/h;->fY:Z
+    iput-boolean p3, p0, Lcom/airbnb/lottie/c/b/h;->fZ: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;->eC:Z
+    iget-boolean p1, p1, Lcom/airbnb/lottie/f;->eD: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;->jd:Lcom/airbnb/lottie/c/b/h$a;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/b/h;->je: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 c8abe133d0..227328ce58 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 private static final synthetic jr:[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;
 
 
 # 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;->jp: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-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;->jq: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;
 
     new-array v0, v3, [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;
+    sget-object v3, Lcom/airbnb/lottie/c/b/i$a;->jq:Lcom/airbnb/lottie/c/b/i$a;
 
     aput-object v3, v0, v1
 
-    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;->jr:Lcom/airbnb/lottie/c/b/i$a;
 
     aput-object v1, v0, v2
 
-    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;->js:[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;->jr:[Lcom/airbnb/lottie/c/b/i$a;
+    sget-object v0, Lcom/airbnb/lottie/c/b/i$a;->js:[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 50ced67feb..1bcb744794 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 fY:Z
+.field public final fZ:Z
 
-.field public final gu:Lcom/airbnb/lottie/c/b/i$a;
+.field public final gv:Lcom/airbnb/lottie/c/b/i$a;
 
-.field public final iu:Lcom/airbnb/lottie/c/a/m;
+.field public final iv:Lcom/airbnb/lottie/c/a/m;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/airbnb/lottie/c/a/m<",
@@ -30,9 +30,7 @@
     .end annotation
 .end field
 
-.field public final iw:Lcom/airbnb/lottie/c/a/b;
-
-.field public final jk:Lcom/airbnb/lottie/c/a/b;
+.field public final ix:Lcom/airbnb/lottie/c/a/b;
 
 .field public final jl:Lcom/airbnb/lottie/c/a/b;
 
@@ -42,6 +40,8 @@
 
 .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;->gu:Lcom/airbnb/lottie/c/b/i$a;
+    iput-object p2, p0, Lcom/airbnb/lottie/c/b/i;->gv:Lcom/airbnb/lottie/c/b/i$a;
 
-    iput-object p3, p0, Lcom/airbnb/lottie/c/b/i;->jk:Lcom/airbnb/lottie/c/a/b;
+    iput-object p3, p0, Lcom/airbnb/lottie/c/b/i;->jl:Lcom/airbnb/lottie/c/a/b;
 
-    iput-object p4, p0, Lcom/airbnb/lottie/c/b/i;->iu:Lcom/airbnb/lottie/c/a/m;
+    iput-object p4, p0, Lcom/airbnb/lottie/c/b/i;->iv:Lcom/airbnb/lottie/c/a/m;
 
-    iput-object p5, p0, Lcom/airbnb/lottie/c/b/i;->iw:Lcom/airbnb/lottie/c/a/b;
+    iput-object p5, p0, Lcom/airbnb/lottie/c/b/i;->ix: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 p6, p0, Lcom/airbnb/lottie/c/b/i;->jm: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 p7, p0, Lcom/airbnb/lottie/c/b/i;->jn: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 p8, p0, Lcom/airbnb/lottie/c/b/i;->jo:Lcom/airbnb/lottie/c/a/b;
 
-    iput-object p9, p0, Lcom/airbnb/lottie/c/b/i;->jo:Lcom/airbnb/lottie/c/a/b;
+    iput-object p9, p0, Lcom/airbnb/lottie/c/b/i;->jp:Lcom/airbnb/lottie/c/a/b;
 
-    iput-boolean p10, p0, Lcom/airbnb/lottie/c/b/i;->fY:Z
+    iput-boolean p10, p0, Lcom/airbnb/lottie/c/b/i;->fZ: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 0908bc9e7f..293e2ce437 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 fY:Z
+.field public final fZ:Z
 
-.field public final iC:Lcom/airbnb/lottie/c/a/f;
+.field public final iD:Lcom/airbnb/lottie/c/a/f;
 
-.field public final iu:Lcom/airbnb/lottie/c/a/m;
+.field public final iv: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 js:Lcom/airbnb/lottie/c/a/b;
+.field public final jt: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;->iu:Lcom/airbnb/lottie/c/a/m;
+    iput-object p2, p0, Lcom/airbnb/lottie/c/b/j;->iv:Lcom/airbnb/lottie/c/a/m;
 
-    iput-object p3, p0, Lcom/airbnb/lottie/c/b/j;->iC:Lcom/airbnb/lottie/c/a/f;
+    iput-object p3, p0, Lcom/airbnb/lottie/c/b/j;->iD:Lcom/airbnb/lottie/c/a/f;
 
-    iput-object p4, p0, Lcom/airbnb/lottie/c/b/j;->js:Lcom/airbnb/lottie/c/a/b;
+    iput-object p4, p0, Lcom/airbnb/lottie/c/b/j;->jt:Lcom/airbnb/lottie/c/a/b;
 
-    iput-boolean p5, p0, Lcom/airbnb/lottie/c/b/j;->fY:Z
+    iput-boolean p5, p0, Lcom/airbnb/lottie/c/b/j;->fZ: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;->iu:Lcom/airbnb/lottie/c/a/m;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/b/j;->iv: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;->iC:Lcom/airbnb/lottie/c/a/f;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/b/j;->iD: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 817d997b69..4682759941 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 fY:Z
-
-.field public final jt:Lcom/airbnb/lottie/c/a/b;
+.field public final fZ:Z
 
 .field public final ju:Lcom/airbnb/lottie/c/a/b;
 
-.field public final jv:Lcom/airbnb/lottie/c/a/l;
+.field public final jv:Lcom/airbnb/lottie/c/a/b;
+
+.field public final jw: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;->jt:Lcom/airbnb/lottie/c/a/b;
+    iput-object p2, p0, Lcom/airbnb/lottie/c/b/k;->ju: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 p3, p0, Lcom/airbnb/lottie/c/b/k;->jv:Lcom/airbnb/lottie/c/a/b;
 
-    iput-object p4, p0, Lcom/airbnb/lottie/c/b/k;->jv:Lcom/airbnb/lottie/c/a/l;
+    iput-object p4, p0, Lcom/airbnb/lottie/c/b/k;->jw:Lcom/airbnb/lottie/c/a/l;
 
-    iput-boolean p5, p0, Lcom/airbnb/lottie/c/b/k;->fY:Z
+    iput-boolean p5, p0, Lcom/airbnb/lottie/c/b/k;->fZ: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 039f87d9c2..874806c648 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 jw:Ljava/util/List;
+.field public final jx:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -14,7 +14,7 @@
     .end annotation
 .end field
 
-.field public jx:Landroid/graphics/PointF;
+.field public jy: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;->jw:Ljava/util/List;
+    iput-object v0, p0, Lcom/airbnb/lottie/c/b/l;->jx: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;->jx:Landroid/graphics/PointF;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/b/l;->jy: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;->jw:Ljava/util/List;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/b/l;->jx: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;->jw:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/b/l;->jx: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 69f8dfb29d..f3f4ca23f1 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 fY:Z
+.field public final fZ:Z
 
-.field public final iH:Landroid/graphics/Path$FillType;
+.field public final iI:Landroid/graphics/Path$FillType;
 
-.field public final im:Lcom/airbnb/lottie/c/a/a;
+.field public final io:Lcom/airbnb/lottie/c/a/a;
 
-.field public final ix:Lcom/airbnb/lottie/c/a/d;
+.field public final iy:Lcom/airbnb/lottie/c/a/d;
 
-.field private final jy:Z
+.field private final jz: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;->jy:Z
+    iput-boolean p2, p0, Lcom/airbnb/lottie/c/b/m;->jz:Z
 
-    iput-object p3, p0, Lcom/airbnb/lottie/c/b/m;->iH:Landroid/graphics/Path$FillType;
+    iput-object p3, p0, Lcom/airbnb/lottie/c/b/m;->iI:Landroid/graphics/Path$FillType;
 
-    iput-object p4, p0, Lcom/airbnb/lottie/c/b/m;->im:Lcom/airbnb/lottie/c/a/a;
+    iput-object p4, p0, Lcom/airbnb/lottie/c/b/m;->io:Lcom/airbnb/lottie/c/a/a;
 
-    iput-object p5, p0, Lcom/airbnb/lottie/c/b/m;->ix:Lcom/airbnb/lottie/c/a/d;
+    iput-object p5, p0, Lcom/airbnb/lottie/c/b/m;->iy:Lcom/airbnb/lottie/c/a/d;
 
-    iput-boolean p6, p0, Lcom/airbnb/lottie/c/b/m;->fY:Z
+    iput-boolean p6, p0, Lcom/airbnb/lottie/c/b/m;->fZ: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;->jy:Z
+    iget-boolean v1, p0, Lcom/airbnb/lottie/c/b/m;->jz: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 317a3e0b81..0432cc2d3d 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 fY:Z
+.field public final fZ: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;->fY:Z
+    iput-boolean p3, p0, Lcom/airbnb/lottie/c/b/n;->fZ: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 7bd6c44dda..1514f2b084 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 fY:Z
+.field public final fZ:Z
 
 .field private final index:I
 
-.field public final jz:Lcom/airbnb/lottie/c/a/h;
+.field public final jA: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;->jz:Lcom/airbnb/lottie/c/a/h;
+    iput-object p3, p0, Lcom/airbnb/lottie/c/b/o;->jA:Lcom/airbnb/lottie/c/a/h;
 
-    iput-boolean p4, p0, Lcom/airbnb/lottie/c/b/o;->fY:Z
+    iput-boolean p4, p0, Lcom/airbnb/lottie/c/b/o;->fZ: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 1ae2b6ccde..a86590ae25 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,10 +15,10 @@
 
 
 # static fields
-.field static final synthetic jA:[I
-
 .field static final synthetic jB:[I
 
+.field static final synthetic jC:[I
+
 
 # direct methods
 .method static constructor <clinit>()V
@@ -32,14 +32,14 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/airbnb/lottie/c/b/p$1;->jB:[I
+    sput-object v0, Lcom/airbnb/lottie/c/b/p$1;->jC:[I
 
     const/4 v0, 0x1
 
     :try_start_0
-    sget-object v1, Lcom/airbnb/lottie/c/b/p$1;->jB:[I
+    sget-object v1, Lcom/airbnb/lottie/c/b/p$1;->jC:[I
 
-    sget-object v2, Lcom/airbnb/lottie/c/b/p$b;->jI:Lcom/airbnb/lottie/c/b/p$b;
+    sget-object v2, Lcom/airbnb/lottie/c/b/p$b;->jJ: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;->jB:[I
+    sget-object v2, Lcom/airbnb/lottie/c/b/p$1;->jC:[I
 
-    sget-object v3, Lcom/airbnb/lottie/c/b/p$b;->jG:Lcom/airbnb/lottie/c/b/p$b;
+    sget-object v3, Lcom/airbnb/lottie/c/b/p$b;->jH: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;->jB:[I
+    sget-object v3, Lcom/airbnb/lottie/c/b/p$1;->jC:[I
 
-    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;->jI: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;->jA:[I
+    sput-object v3, Lcom/airbnb/lottie/c/b/p$1;->jB:[I
 
     :try_start_3
-    sget-object v3, Lcom/airbnb/lottie/c/b/p$1;->jA:[I
+    sget-object v3, Lcom/airbnb/lottie/c/b/p$1;->jB:[I
 
-    sget-object v4, Lcom/airbnb/lottie/c/b/p$a;->jC: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;
 
     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;->jA:[I
+    sget-object v0, Lcom/airbnb/lottie/c/b/p$1;->jB:[I
 
-    sget-object v3, Lcom/airbnb/lottie/c/b/p$a;->jD:Lcom/airbnb/lottie/c/b/p$a;
+    sget-object v3, Lcom/airbnb/lottie/c/b/p$a;->jE: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;->jA:[I
+    sget-object v0, Lcom/airbnb/lottie/c/b/p$1;->jB:[I
 
-    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;->jF: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 56aee7a3ac..c28c206608 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 private static final synthetic jF:[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;
 
 
 # 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;->jC: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;
 
@@ -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;->jD: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;
 
     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;->jE: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;
 
     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;->jC: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;
 
     aput-object v4, v0, v1
 
-    sget-object v1, Lcom/airbnb/lottie/c/b/p$a;->jD: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, v2
 
-    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;->jF:Lcom/airbnb/lottie/c/b/p$a;
 
     aput-object v1, v0, v3
 
-    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;->jG:[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;->jF:[Lcom/airbnb/lottie/c/b/p$a;
+    sget-object v0, Lcom/airbnb/lottie/c/b/p$a;->jG:[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;->jA:[I
+    sget-object v0, Lcom/airbnb/lottie/c/b/p$1;->jB:[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 0faaad750d..c4862c0a5b 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 private static final synthetic jJ:[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;
 
 
 # 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;->jG: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;
 
@@ -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;->jH: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;
 
     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;->jI: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;
 
     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;->jG: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;
 
     aput-object v4, v0, v1
 
-    sget-object v1, Lcom/airbnb/lottie/c/b/p$b;->jH: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, v2
 
-    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;->jJ:Lcom/airbnb/lottie/c/b/p$b;
 
     aput-object v1, v0, v3
 
-    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;->jK:[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;->jJ:[Lcom/airbnb/lottie/c/b/p$b;
+    sget-object v0, Lcom/airbnb/lottie/c/b/p$b;->jK:[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;->jB:[I
+    sget-object v0, Lcom/airbnb/lottie/c/b/p$1;->jC:[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 7b8b0f8fcd..1d4c22425e 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 fY:Z
+.field public final fZ:Z
 
-.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 iR:Ljava/util/List;
+.field public final iS:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -36,11 +36,11 @@
     .end annotation
 .end field
 
-.field public final im:Lcom/airbnb/lottie/c/a/a;
+.field public final io:Lcom/airbnb/lottie/c/a/a;
 
-.field public final ix:Lcom/airbnb/lottie/c/a/d;
+.field public final iy:Lcom/airbnb/lottie/c/a/d;
 
-.field public final ju:Lcom/airbnb/lottie/c/a/b;
+.field public final jv: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;->ju:Lcom/airbnb/lottie/c/a/b;
+    iput-object p2, p0, Lcom/airbnb/lottie/c/b/p;->jv:Lcom/airbnb/lottie/c/a/b;
 
-    iput-object p3, p0, Lcom/airbnb/lottie/c/b/p;->iR:Ljava/util/List;
+    iput-object p3, p0, Lcom/airbnb/lottie/c/b/p;->iS:Ljava/util/List;
 
-    iput-object p4, p0, Lcom/airbnb/lottie/c/b/p;->im:Lcom/airbnb/lottie/c/a/a;
+    iput-object p4, p0, Lcom/airbnb/lottie/c/b/p;->io:Lcom/airbnb/lottie/c/a/a;
 
-    iput-object p5, p0, Lcom/airbnb/lottie/c/b/p;->ix:Lcom/airbnb/lottie/c/a/d;
+    iput-object p5, p0, Lcom/airbnb/lottie/c/b/p;->iy:Lcom/airbnb/lottie/c/a/d;
 
-    iput-object p6, p0, Lcom/airbnb/lottie/c/b/p;->iN:Lcom/airbnb/lottie/c/a/b;
+    iput-object p6, p0, Lcom/airbnb/lottie/c/b/p;->iO:Lcom/airbnb/lottie/c/a/b;
 
-    iput-object p7, p0, Lcom/airbnb/lottie/c/b/p;->iO:Lcom/airbnb/lottie/c/b/p$a;
+    iput-object p7, p0, Lcom/airbnb/lottie/c/b/p;->iP:Lcom/airbnb/lottie/c/b/p$a;
 
-    iput-object p8, p0, Lcom/airbnb/lottie/c/b/p;->iP:Lcom/airbnb/lottie/c/b/p$b;
+    iput-object p8, p0, Lcom/airbnb/lottie/c/b/p;->iQ:Lcom/airbnb/lottie/c/b/p$b;
 
-    iput p9, p0, Lcom/airbnb/lottie/c/b/p;->iQ:F
+    iput p9, p0, Lcom/airbnb/lottie/c/b/p;->iR:F
 
-    iput-boolean p10, p0, Lcom/airbnb/lottie/c/b/p;->fY:Z
+    iput-boolean p10, p0, Lcom/airbnb/lottie/c/b/p;->fZ: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 c91ccb772c..18bd20ca18 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 jM:I = 0x1
+.field public static final jN:I = 0x1
 
-.field public static final jN:I = 0x2
+.field public static final jO:I = 0x2
 
-.field private static final synthetic jO:[I
+.field private static final synthetic jP:[I
 
 
 # direct methods
@@ -38,19 +38,19 @@
 
     new-array v0, v0, [I
 
-    sget v1, Lcom/airbnb/lottie/c/b/q$a;->jM:I
+    sget v1, Lcom/airbnb/lottie/c/b/q$a;->jN:I
 
     const/4 v2, 0x0
 
     aput v1, v0, v2
 
-    sget v1, Lcom/airbnb/lottie/c/b/q$a;->jN:I
+    sget v1, Lcom/airbnb/lottie/c/b/q$a;->jO:I
 
     const/4 v2, 0x1
 
     aput v1, v0, v2
 
-    sput-object v0, Lcom/airbnb/lottie/c/b/q$a;->jO:[I
+    sput-object v0, Lcom/airbnb/lottie/c/b/q$a;->jP:[I
 
     return-void
 .end method
@@ -66,7 +66,7 @@
 
     if-ne p0, v0, :cond_0
 
-    sget p0, Lcom/airbnb/lottie/c/b/q$a;->jN:I
+    sget p0, Lcom/airbnb/lottie/c/b/q$a;->jO:I
 
     return p0
 
@@ -88,7 +88,7 @@
     throw v0
 
     :cond_1
-    sget p0, Lcom/airbnb/lottie/c/b/q$a;->jM:I
+    sget p0, Lcom/airbnb/lottie/c/b/q$a;->jN: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 65aacc1b19..1600fd458c 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 fY:Z
+.field public final fZ:Z
 
-.field public final gI:I
-
-.field public final jK:Lcom/airbnb/lottie/c/a/b;
+.field public final gJ:I
 
 .field public final jL:Lcom/airbnb/lottie/c/a/b;
 
-.field public final ju: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 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;->gI:I
+    iput p2, p0, Lcom/airbnb/lottie/c/b/q;->gJ:I
 
-    iput-object p3, p0, Lcom/airbnb/lottie/c/b/q;->jK:Lcom/airbnb/lottie/c/a/b;
+    iput-object p3, p0, Lcom/airbnb/lottie/c/b/q;->jL: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 p4, p0, Lcom/airbnb/lottie/c/b/q;->jM:Lcom/airbnb/lottie/c/a/b;
 
-    iput-object p5, p0, Lcom/airbnb/lottie/c/b/q;->ju:Lcom/airbnb/lottie/c/a/b;
+    iput-object p5, p0, Lcom/airbnb/lottie/c/b/q;->jv:Lcom/airbnb/lottie/c/a/b;
 
-    iput-boolean p6, p0, Lcom/airbnb/lottie/c/b/q;->fY:Z
+    iput-boolean p6, p0, Lcom/airbnb/lottie/c/b/q;->fZ: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;->jK: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;
 
@@ -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;->jL:Lcom/airbnb/lottie/c/a/b;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/b/q;->jM: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;->ju:Lcom/airbnb/lottie/c/a/b;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/b/q;->jv: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 490bbab45e..f1a7305ba9 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 private final hZ:F
+.field public final hZ:Ljava/lang/String;
+
+.field private final ia: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;->hX:Ljava/lang/String;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/c;->hY: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;->hY:Ljava/lang/String;
+    iput-object p3, p0, Lcom/airbnb/lottie/c/c;->hZ:Ljava/lang/String;
 
-    iput p4, p0, Lcom/airbnb/lottie/c/c;->hZ:F
+    iput p4, p0, Lcom/airbnb/lottie/c/c;->ia: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 4f084c7595..3ded52543b 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 kg:Lcom/airbnb/lottie/a/b/c;
+.field final synthetic kh:Lcom/airbnb/lottie/a/b/c;
 
-.field final synthetic kh:Lcom/airbnb/lottie/c/c/a;
+.field final synthetic ki: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;->kh:Lcom/airbnb/lottie/c/c/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/c/a$1;->ki:Lcom/airbnb/lottie/c/c/a;
 
-    iput-object p2, p0, Lcom/airbnb/lottie/c/c/a$1;->kg:Lcom/airbnb/lottie/a/b/c;
+    iput-object p2, p0, Lcom/airbnb/lottie/c/c/a$1;->kh: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;->kh:Lcom/airbnb/lottie/c/c/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a$1;->ki:Lcom/airbnb/lottie/c/c/a;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/c/c/a$1;->kg:Lcom/airbnb/lottie/a/b/c;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/c/a$1;->kh: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 ff604bd5e5..e2d2fc64d9 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,10 +15,10 @@
 
 
 # static fields
-.field static final synthetic ki:[I
-
 .field static final synthetic kj:[I
 
+.field static final synthetic kk:[I
+
 
 # direct methods
 .method static constructor <clinit>()V
@@ -32,14 +32,14 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/airbnb/lottie/c/c/a$2;->kj:[I
+    sput-object v0, Lcom/airbnb/lottie/c/c/a$2;->kk:[I
 
     const/4 v0, 0x1
 
     :try_start_0
-    sget-object v1, Lcom/airbnb/lottie/c/c/a$2;->kj:[I
+    sget-object v1, Lcom/airbnb/lottie/c/c/a$2;->kk:[I
 
-    sget v2, Lcom/airbnb/lottie/c/b/g$a;->ja:I
+    sget v2, Lcom/airbnb/lottie/c/b/g$a;->jb: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;->kj:[I
+    sget-object v2, Lcom/airbnb/lottie/c/c/a$2;->kk:[I
 
-    sget v3, Lcom/airbnb/lottie/c/b/g$a;->jb:I
+    sget v3, Lcom/airbnb/lottie/c/b/g$a;->jc: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;->kj:[I
+    sget-object v3, Lcom/airbnb/lottie/c/c/a$2;->kk:[I
 
-    sget v4, Lcom/airbnb/lottie/c/b/g$a;->iZ:I
+    sget v4, Lcom/airbnb/lottie/c/b/g$a;->ja: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;->ki:[I
+    sput-object v3, Lcom/airbnb/lottie/c/c/a$2;->kj:[I
 
     :try_start_3
-    sget-object v3, Lcom/airbnb/lottie/c/c/a$2;->ki:[I
+    sget-object v3, Lcom/airbnb/lottie/c/c/a$2;->kj:[I
 
-    sget-object v4, Lcom/airbnb/lottie/c/c/d$a;->kI:Lcom/airbnb/lottie/c/c/d$a;
+    sget-object v4, Lcom/airbnb/lottie/c/c/d$a;->kJ: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;->ki:[I
+    sget-object v0, Lcom/airbnb/lottie/c/c/a$2;->kj:[I
 
-    sget-object v3, Lcom/airbnb/lottie/c/c/d$a;->kE:Lcom/airbnb/lottie/c/c/d$a;
+    sget-object v3, Lcom/airbnb/lottie/c/c/d$a;->kF: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;->ki:[I
+    sget-object v0, Lcom/airbnb/lottie/c/c/a$2;->kj:[I
 
-    sget-object v1, Lcom/airbnb/lottie/c/c/d$a;->kF: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
 
@@ -129,9 +129,9 @@
 
     :catch_5
     :try_start_6
-    sget-object v0, Lcom/airbnb/lottie/c/c/a$2;->ki:[I
+    sget-object v0, Lcom/airbnb/lottie/c/c/a$2;->kj:[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;->kH: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;->ki:[I
+    sget-object v0, Lcom/airbnb/lottie/c/c/a$2;->kj:[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;->kI: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;->ki:[I
+    sget-object v0, Lcom/airbnb/lottie/c/c/a$2;->kj:[I
 
-    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;->kK: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;->ki:[I
+    sget-object v0, Lcom/airbnb/lottie/c/c/a$2;->kj:[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;->kL: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 61307a889d..5b048ddcef 100644
--- a/com.discord/smali/com/airbnb/lottie/c/c/a.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/c/a.smali
@@ -9,11 +9,9 @@
 
 
 # instance fields
-.field final dJ:Lcom/airbnb/lottie/f;
+.field final dK:Lcom/airbnb/lottie/f;
 
-.field final gF:Lcom/airbnb/lottie/a/b/o;
-
-.field private final jP:Landroid/graphics/Paint;
+.field final gG:Lcom/airbnb/lottie/a/b/o;
 
 .field private final jQ:Landroid/graphics/Paint;
 
@@ -23,25 +21,27 @@
 
 .field private final jT:Landroid/graphics/Paint;
 
-.field private final jU:Landroid/graphics/RectF;
+.field private final jU:Landroid/graphics/Paint;
 
 .field private final jV:Landroid/graphics/RectF;
 
 .field private final jW:Landroid/graphics/RectF;
 
-.field private final jX:Ljava/lang/String;
+.field private final jX:Landroid/graphics/RectF;
 
-.field final jY:Landroid/graphics/Matrix;
+.field private final jY:Ljava/lang/String;
 
-.field final jZ:Lcom/airbnb/lottie/c/c/d;
+.field final jZ:Landroid/graphics/Matrix;
 
-.field private ka:Lcom/airbnb/lottie/a/b/g;
+.field final ka:Lcom/airbnb/lottie/c/c/d;
 
-.field private kb:Lcom/airbnb/lottie/c/c/a;
+.field private kb:Lcom/airbnb/lottie/a/b/g;
 
 .field private kc:Lcom/airbnb/lottie/c/c/a;
 
-.field private kd:Ljava/util/List;
+.field private kd:Lcom/airbnb/lottie/c/c/a;
+
+.field private ke:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -51,7 +51,7 @@
     .end annotation
 .end field
 
-.field private final ke:Ljava/util/List;
+.field private final kf:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -61,7 +61,7 @@
     .end annotation
 .end field
 
-.field private kf:Z
+.field private kg: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;->jP: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;
 
@@ -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;->jQ: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;
 
@@ -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;->jR: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;
 
     invoke-direct {v0, v1}, Lcom/airbnb/lottie/a/a;-><init>(I)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;->jT: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;->jT:Landroid/graphics/Paint;
+    iput-object v0, p0, Lcom/airbnb/lottie/c/c/a;->jU:Landroid/graphics/Paint;
 
     new-instance v0, Landroid/graphics/RectF;
 
@@ -138,12 +138,6 @@
 
     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;
@@ -152,29 +146,35 @@
 
     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;->jY:Landroid/graphics/Matrix;
+    iput-object v0, p0, Lcom/airbnb/lottie/c/c/a;->jZ: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;->ke:Ljava/util/List;
+    iput-object v0, p0, Lcom/airbnb/lottie/c/c/a;->kf:Ljava/util/List;
 
-    iput-boolean v1, p0, Lcom/airbnb/lottie/c/c/a;->kf:Z
+    iput-boolean v1, p0, Lcom/airbnb/lottie/c/c/a;->kg:Z
 
-    iput-object p1, p0, Lcom/airbnb/lottie/c/c/a;->dJ:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/c/a;->dK:Lcom/airbnb/lottie/f;
 
-    iput-object p2, p0, Lcom/airbnb/lottie/c/c/a;->jZ:Lcom/airbnb/lottie/c/c/d;
+    iput-object p2, p0, Lcom/airbnb/lottie/c/c/a;->ka: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;->kp:Ljava/lang/String;
+    iget-object v0, p2, Lcom/airbnb/lottie/c/c/d;->kq: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;->jX:Ljava/lang/String;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/c/a;->jY:Ljava/lang/String;
 
-    iget p1, p2, Lcom/airbnb/lottie/c/c/d;->kD:I
+    iget p1, p2, Lcom/airbnb/lottie/c/c/d;->kE:I
 
-    sget v0, Lcom/airbnb/lottie/c/c/d$b;->kO:I
+    sget v0, Lcom/airbnb/lottie/c/c/d$b;->kP:I
 
     if-ne p1, v0, :cond_0
 
-    iget-object p1, p0, Lcom/airbnb/lottie/c/c/a;->jS:Landroid/graphics/Paint;
+    iget-object p1, p0, Lcom/airbnb/lottie/c/c/a;->jT: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;->jS:Landroid/graphics/Paint;
+    iget-object p1, p0, Lcom/airbnb/lottie/c/c/a;->jT: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;->jv:Lcom/airbnb/lottie/c/a/l;
+    iget-object p1, p2, Lcom/airbnb/lottie/c/c/d;->jw: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;->gF:Lcom/airbnb/lottie/a/b/o;
+    iput-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;
+    iget-object p1, p0, Lcom/airbnb/lottie/c/c/a;->gG: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;->gY:Ljava/util/List;
+    iget-object p1, p2, Lcom/airbnb/lottie/c/c/d;->gZ:Ljava/util/List;
 
     if-eqz p1, :cond_2
 
-    iget-object p1, p2, Lcom/airbnb/lottie/c/c/d;->gY:Ljava/util/List;
+    iget-object p1, p2, Lcom/airbnb/lottie/c/c/d;->gZ: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;->gY:Ljava/util/List;
+    iget-object p2, p2, Lcom/airbnb/lottie/c/c/d;->gZ: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;->ka:Lcom/airbnb/lottie/a/b/g;
+    iput-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, p0, Lcom/airbnb/lottie/c/c/a;->kb:Lcom/airbnb/lottie/a/b/g;
 
-    iget-object p1, p1, Lcom/airbnb/lottie/a/b/g;->gW: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;
 
@@ -276,9 +276,9 @@
     goto :goto_1
 
     :cond_1
-    iget-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, p1, Lcom/airbnb/lottie/a/b/g;->gX:Ljava/util/List;
+    iget-object p1, p1, Lcom/airbnb/lottie/a/b/g;->gY: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;->jZ:Lcom/airbnb/lottie/c/c/d;
+    iget-object p1, p0, Lcom/airbnb/lottie/c/c/a;->ka:Lcom/airbnb/lottie/c/c/d;
 
-    iget-object p1, p1, Lcom/airbnb/lottie/c/c/d;->kC:Ljava/util/List;
+    iget-object p1, p1, Lcom/airbnb/lottie/c/c/d;->kD: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;->jZ:Lcom/airbnb/lottie/c/c/d;
+    iget-object p2, p0, Lcom/airbnb/lottie/c/c/a;->ka:Lcom/airbnb/lottie/c/c/d;
 
-    iget-object p2, p2, Lcom/airbnb/lottie/c/c/d;->kC:Ljava/util/List;
+    iget-object p2, p2, Lcom/airbnb/lottie/c/c/d;->kD: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;->gM:Z
+    iput-boolean v1, p1, Lcom/airbnb/lottie/a/b/a;->gN: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;->jT:Landroid/graphics/Paint;
+    iget-object v8, p0, Lcom/airbnb/lottie/c/c/a;->jU: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;->dJ:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->dK:Lcom/airbnb/lottie/f;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/f;->dS:Lcom/airbnb/lottie/d;
+    iget-object v0, v0, Lcom/airbnb/lottie/f;->dT:Lcom/airbnb/lottie/d;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/d;->dX:Lcom/airbnb/lottie/m;
+    iget-object v0, v0, Lcom/airbnb/lottie/d;->dY:Lcom/airbnb/lottie/m;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/c/c/a;->jZ:Lcom/airbnb/lottie/c/c/d;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/c/a;->ka:Lcom/airbnb/lottie/c/c/d;
 
-    iget-object v1, v1, Lcom/airbnb/lottie/c/c/d;->kp:Ljava/lang/String;
+    iget-object v1, v1, Lcom/airbnb/lottie/c/c/d;->kq: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;->kb:Lcom/airbnb/lottie/c/c/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->kc: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;->ka:Lcom/airbnb/lottie/a/b/g;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->kb:Lcom/airbnb/lottie/a/b/g;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, v0, Lcom/airbnb/lottie/a/b/g;->gW:Ljava/util/List;
+    iget-object v0, v0, Lcom/airbnb/lottie/a/b/g;->gX: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;->kd:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->ke:Ljava/util/List;
 
     if-eqz v0, :cond_0
 
     return-void
 
     :cond_0
-    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;->kd: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;->kd:Ljava/util/List;
+    iput-object v0, p0, Lcom/airbnb/lottie/c/c/a;->ke: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;->kd:Ljava/util/List;
+    iput-object v0, p0, Lcom/airbnb/lottie/c/c/a;->ke:Ljava/util/List;
 
-    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;->kd:Lcom/airbnb/lottie/c/c/a;
 
     :goto_0
     if-eqz v0, :cond_2
 
-    iget-object v1, p0, Lcom/airbnb/lottie/c/c/a;->kd:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/c/a;->ke: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;->kc:Lcom/airbnb/lottie/c/c/a;
+    iget-object v0, v0, Lcom/airbnb/lottie/c/c/a;->kd: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;->jX:Ljava/lang/String;
+    iget-object v3, v0, Lcom/airbnb/lottie/c/c/a;->jY: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;->kf:Z
+    iget-boolean v3, v0, Lcom/airbnb/lottie/c/c/a;->kg:Z
 
     if-eqz v3, :cond_15
 
-    iget-object v3, v0, Lcom/airbnb/lottie/c/c/a;->jZ:Lcom/airbnb/lottie/c/c/d;
+    iget-object v3, v0, Lcom/airbnb/lottie/c/c/a;->ka:Lcom/airbnb/lottie/c/c/d;
 
-    iget-boolean v3, v3, Lcom/airbnb/lottie/c/c/d;->fY:Z
+    iget-boolean v3, v3, Lcom/airbnb/lottie/c/c/d;->fZ: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;->kd:Ljava/util/List;
+    iget-object v4, v0, Lcom/airbnb/lottie/c/c/a;->ke: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;->kd:Ljava/util/List;
+    iget-object v7, v0, Lcom/airbnb/lottie/c/c/a;->ke: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;->gF:Lcom/airbnb/lottie/a/b/o;
+    iget-object v7, v7, Lcom/airbnb/lottie/c/c/a;->gG: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;->gF:Lcom/airbnb/lottie/a/b/o;
+    iget-object v3, v0, Lcom/airbnb/lottie/c/c/a;->gG:Lcom/airbnb/lottie/a/b/o;
 
-    iget-object v3, v3, Lcom/airbnb/lottie/a/b/o;->hr:Lcom/airbnb/lottie/a/b/a;
+    iget-object v3, v3, Lcom/airbnb/lottie/a/b/o;->hs: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;->gF:Lcom/airbnb/lottie/a/b/o;
+    iget-object v3, v0, Lcom/airbnb/lottie/c/c/a;->gG:Lcom/airbnb/lottie/a/b/o;
 
-    iget-object v3, v3, Lcom/airbnb/lottie/a/b/o;->hr:Lcom/airbnb/lottie/a/b/a;
+    iget-object v3, v3, Lcom/airbnb/lottie/a/b/o;->hs: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;->gF:Lcom/airbnb/lottie/a/b/o;
+    iget-object v4, v0, Lcom/airbnb/lottie/c/c/a;->gG: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;->jX:Ljava/lang/String;
+    iget-object v1, v0, Lcom/airbnb/lottie/c/c/a;->jY: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;->jZ:Lcom/airbnb/lottie/c/c/d;
+    iget-object v8, v0, Lcom/airbnb/lottie/c/c/a;->ka:Lcom/airbnb/lottie/c/c/d;
 
-    iget v8, v8, Lcom/airbnb/lottie/c/c/d;->kD:I
+    iget v8, v8, Lcom/airbnb/lottie/c/c/d;->kE:I
 
-    sget v11, Lcom/airbnb/lottie/c/c/d$b;->kO:I
+    sget v11, Lcom/airbnb/lottie/c/c/d$b;->kP:I
 
     if-eq v8, v11, :cond_4
 
-    iget-object v8, v0, Lcom/airbnb/lottie/c/c/a;->jV:Landroid/graphics/RectF;
+    iget-object v8, v0, Lcom/airbnb/lottie/c/c/a;->jW: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;->kb:Lcom/airbnb/lottie/c/c/a;
+    iget-object v8, v0, Lcom/airbnb/lottie/c/c/a;->kc:Lcom/airbnb/lottie/c/c/a;
 
-    iget-object v11, v0, Lcom/airbnb/lottie/c/c/a;->jV:Landroid/graphics/RectF;
+    iget-object v11, v0, Lcom/airbnb/lottie/c/c/a;->jW: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;->jV:Landroid/graphics/RectF;
+    iget-object v8, v0, Lcom/airbnb/lottie/c/c/a;->jW: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;->gF:Lcom/airbnb/lottie/a/b/o;
+    iget-object v8, v0, Lcom/airbnb/lottie/c/c/a;->gG: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;->jU:Landroid/graphics/RectF;
+    iget-object v11, v0, Lcom/airbnb/lottie/c/c/a;->jV: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;->ka:Lcom/airbnb/lottie/a/b/g;
+    iget-object v11, v0, Lcom/airbnb/lottie/c/c/a;->kb:Lcom/airbnb/lottie/a/b/g;
 
-    iget-object v11, v11, Lcom/airbnb/lottie/a/b/g;->gY:Ljava/util/List;
+    iget-object v11, v11, Lcom/airbnb/lottie/a/b/g;->gZ: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;->ka:Lcom/airbnb/lottie/a/b/g;
+    iget-object v15, v0, Lcom/airbnb/lottie/c/c/a;->kb:Lcom/airbnb/lottie/a/b/g;
 
-    iget-object v15, v15, Lcom/airbnb/lottie/a/b/g;->gY:Ljava/util/List;
+    iget-object v15, v15, Lcom/airbnb/lottie/a/b/g;->gZ: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;->ka:Lcom/airbnb/lottie/a/b/g;
+    iget-object v10, v0, Lcom/airbnb/lottie/c/c/a;->kb:Lcom/airbnb/lottie/a/b/g;
 
-    iget-object v10, v10, Lcom/airbnb/lottie/a/b/g;->gW:Ljava/util/List;
+    iget-object v10, v10, Lcom/airbnb/lottie/a/b/g;->gX: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;->kj:[I
+    sget-object v9, Lcom/airbnb/lottie/c/c/a$2;->kk:[I
 
-    iget v10, v15, Lcom/airbnb/lottie/c/b/g;->iW:I
+    iget v10, v15, Lcom/airbnb/lottie/c/b/g;->iX: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;->iY:Z
+    iget-boolean v9, v15, Lcom/airbnb/lottie/c/b/g;->iZ: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;->jW:Landroid/graphics/RectF;
+    iget-object v10, v0, Lcom/airbnb/lottie/c/c/a;->jX: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;->jU:Landroid/graphics/RectF;
+    iget-object v9, v0, Lcom/airbnb/lottie/c/c/a;->jV:Landroid/graphics/RectF;
 
-    iget-object v10, v0, Lcom/airbnb/lottie/c/c/a;->jW:Landroid/graphics/RectF;
+    iget-object v10, v0, Lcom/airbnb/lottie/c/c/a;->jX: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;->jU:Landroid/graphics/RectF;
+    iget-object v9, v0, Lcom/airbnb/lottie/c/c/a;->jV:Landroid/graphics/RectF;
 
     iget v10, v9, Landroid/graphics/RectF;->left:F
 
-    iget-object v15, v0, Lcom/airbnb/lottie/c/c/a;->jW:Landroid/graphics/RectF;
+    iget-object v15, v0, Lcom/airbnb/lottie/c/c/a;->jX: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;->jU:Landroid/graphics/RectF;
+    iget-object v15, v0, Lcom/airbnb/lottie/c/c/a;->jV:Landroid/graphics/RectF;
 
     iget v15, v15, Landroid/graphics/RectF;->top:F
 
-    iget-object v12, v0, Lcom/airbnb/lottie/c/c/a;->jW:Landroid/graphics/RectF;
+    iget-object v12, v0, Lcom/airbnb/lottie/c/c/a;->jX: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;->jU:Landroid/graphics/RectF;
+    iget-object v15, v0, Lcom/airbnb/lottie/c/c/a;->jV:Landroid/graphics/RectF;
 
     iget v15, v15, Landroid/graphics/RectF;->right:F
 
-    iget-object v13, v0, Lcom/airbnb/lottie/c/c/a;->jW:Landroid/graphics/RectF;
+    iget-object v13, v0, Lcom/airbnb/lottie/c/c/a;->jX: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;->jU:Landroid/graphics/RectF;
+    iget-object v15, v0, Lcom/airbnb/lottie/c/c/a;->jV:Landroid/graphics/RectF;
 
     iget v15, v15, Landroid/graphics/RectF;->bottom:F
 
-    iget-object v5, v0, Lcom/airbnb/lottie/c/c/a;->jW:Landroid/graphics/RectF;
+    iget-object v5, v0, Lcom/airbnb/lottie/c/c/a;->jX: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;->jU:Landroid/graphics/RectF;
+    iget-object v5, v0, Lcom/airbnb/lottie/c/c/a;->jV: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;->jP:Landroid/graphics/Paint;
+    iget-object v7, v0, Lcom/airbnb/lottie/c/c/a;->jQ: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;->jQ:Landroid/graphics/Paint;
+    iget-object v8, v0, Lcom/airbnb/lottie/c/c/a;->jR: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;->ka:Lcom/airbnb/lottie/a/b/g;
+    iget-object v8, v0, Lcom/airbnb/lottie/c/c/a;->kb:Lcom/airbnb/lottie/a/b/g;
 
-    iget-object v8, v8, Lcom/airbnb/lottie/a/b/g;->gY:Ljava/util/List;
+    iget-object v8, v8, Lcom/airbnb/lottie/a/b/g;->gZ: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;->ka:Lcom/airbnb/lottie/a/b/g;
+    iget-object v8, v0, Lcom/airbnb/lottie/c/c/a;->kb:Lcom/airbnb/lottie/a/b/g;
 
-    iget-object v8, v8, Lcom/airbnb/lottie/a/b/g;->gY:Ljava/util/List;
+    iget-object v8, v8, Lcom/airbnb/lottie/a/b/g;->gZ: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;->ka:Lcom/airbnb/lottie/a/b/g;
+    iget-object v9, v0, Lcom/airbnb/lottie/c/c/a;->kb:Lcom/airbnb/lottie/a/b/g;
 
-    iget-object v9, v9, Lcom/airbnb/lottie/a/b/g;->gW:Ljava/util/List;
+    iget-object v9, v9, Lcom/airbnb/lottie/a/b/g;->gX: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;->ka:Lcom/airbnb/lottie/a/b/g;
+    iget-object v10, v0, Lcom/airbnb/lottie/c/c/a;->kb: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;->gY: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;->kj:[I
+    sget-object v11, Lcom/airbnb/lottie/c/c/a$2;->kk:[I
 
-    iget v12, v8, Lcom/airbnb/lottie/c/b/g;->iW:I
+    iget v12, v8, Lcom/airbnb/lottie/c/b/g;->iX: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;->iY:Z
+    iget-boolean v8, v8, Lcom/airbnb/lottie/c/b/g;->iZ: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;->jP:Landroid/graphics/Paint;
+    iget-object v11, v0, Lcom/airbnb/lottie/c/c/a;->jQ: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;->jP:Landroid/graphics/Paint;
+    iget-object v11, v0, Lcom/airbnb/lottie/c/c/a;->jQ: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;->jP:Landroid/graphics/Paint;
+    iget-object v8, v0, Lcom/airbnb/lottie/c/c/a;->jQ: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;->jR:Landroid/graphics/Paint;
+    iget-object v9, v0, Lcom/airbnb/lottie/c/c/a;->jS: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;->jP:Landroid/graphics/Paint;
+    iget-object v8, v0, Lcom/airbnb/lottie/c/c/a;->jQ: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;->jP:Landroid/graphics/Paint;
+    iget-object v9, v0, Lcom/airbnb/lottie/c/c/a;->jQ: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;->iY:Z
+    iget-boolean v8, v8, Lcom/airbnb/lottie/c/b/g;->iZ: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;->jQ:Landroid/graphics/Paint;
+    iget-object v11, v0, Lcom/airbnb/lottie/c/c/a;->jR: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;->jP:Landroid/graphics/Paint;
+    iget-object v11, v0, Lcom/airbnb/lottie/c/c/a;->jQ: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;->jR:Landroid/graphics/Paint;
+    iget-object v8, v0, Lcom/airbnb/lottie/c/c/a;->jS: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;->jR:Landroid/graphics/Paint;
+    iget-object v9, v0, Lcom/airbnb/lottie/c/c/a;->jS: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;->jQ:Landroid/graphics/Paint;
+    iget-object v11, v0, Lcom/airbnb/lottie/c/c/a;->jR: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;->jP:Landroid/graphics/Paint;
+    iget-object v8, v0, Lcom/airbnb/lottie/c/c/a;->jQ: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;->jP:Landroid/graphics/Paint;
+    iget-object v9, v0, Lcom/airbnb/lottie/c/c/a;->jQ: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;->iY:Z
+    iget-boolean v8, v8, Lcom/airbnb/lottie/c/b/g;->iZ: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;->jR:Landroid/graphics/Paint;
+    iget-object v11, v0, Lcom/airbnb/lottie/c/c/a;->jS: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;->jP:Landroid/graphics/Paint;
+    iget-object v11, v0, Lcom/airbnb/lottie/c/c/a;->jQ: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;->jR:Landroid/graphics/Paint;
+    iget-object v8, v0, Lcom/airbnb/lottie/c/c/a;->jS: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;->jR:Landroid/graphics/Paint;
+    iget-object v9, v0, Lcom/airbnb/lottie/c/c/a;->jS: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;->jR:Landroid/graphics/Paint;
+    iget-object v9, v0, Lcom/airbnb/lottie/c/c/a;->jS: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;->jS:Landroid/graphics/Paint;
+    iget-object v8, v0, Lcom/airbnb/lottie/c/c/a;->jT: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;->kb:Lcom/airbnb/lottie/c/c/a;
+    iget-object v4, v0, Lcom/airbnb/lottie/c/c/a;->kc: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;->jX:Ljava/lang/String;
+    iget-object v1, v0, Lcom/airbnb/lottie/c/c/a;->jY: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;->jX:Ljava/lang/String;
+    iget-object v1, v0, Lcom/airbnb/lottie/c/c/a;->jY: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;->jY:Landroid/graphics/Matrix;
+    iget-object p1, p0, Lcom/airbnb/lottie/c/c/a;->jZ: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;->kd:Ljava/util/List;
+    iget-object p1, p0, Lcom/airbnb/lottie/c/c/a;->ke: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;->jY:Landroid/graphics/Matrix;
+    iget-object p2, p0, Lcom/airbnb/lottie/c/c/a;->jZ:Landroid/graphics/Matrix;
 
-    iget-object p3, p0, Lcom/airbnb/lottie/c/c/a;->kd:Ljava/util/List;
+    iget-object p3, p0, Lcom/airbnb/lottie/c/c/a;->ke: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;->gF:Lcom/airbnb/lottie/a/b/o;
+    iget-object p3, p3, Lcom/airbnb/lottie/c/c/a;->gG: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;->kc:Lcom/airbnb/lottie/c/c/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/c/c/a;->kd:Lcom/airbnb/lottie/c/c/a;
 
     if-eqz p1, :cond_1
 
-    iget-object p2, p0, Lcom/airbnb/lottie/c/c/a;->jY:Landroid/graphics/Matrix;
+    iget-object p2, p0, Lcom/airbnb/lottie/c/c/a;->jZ:Landroid/graphics/Matrix;
 
-    iget-object p1, p1, Lcom/airbnb/lottie/c/c/a;->gF:Lcom/airbnb/lottie/a/b/o;
+    iget-object p1, p1, Lcom/airbnb/lottie/c/c/a;->gG: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;->jY:Landroid/graphics/Matrix;
+    iget-object p1, p0, Lcom/airbnb/lottie/c/c/a;->jZ:Landroid/graphics/Matrix;
 
-    iget-object p2, p0, Lcom/airbnb/lottie/c/c/a;->gF:Lcom/airbnb/lottie/a/b/o;
+    iget-object p2, p0, Lcom/airbnb/lottie/c/c/a;->gG: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;->ke:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->kf: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;->jZ:Lcom/airbnb/lottie/c/c/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->ka:Lcom/airbnb/lottie/c/c/d;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/c/c/d;->kp:Ljava/lang/String;
+    iget-object v0, v0, Lcom/airbnb/lottie/c/c/d;->kq: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;->jZ:Lcom/airbnb/lottie/c/c/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->ka:Lcom/airbnb/lottie/c/c/d;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/c/c/d;->kp:Ljava/lang/String;
+    iget-object v0, v0, Lcom/airbnb/lottie/c/c/d;->kq: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;->jZ:Lcom/airbnb/lottie/c/c/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->ka:Lcom/airbnb/lottie/c/c/d;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/c/c/d;->kp:Ljava/lang/String;
+    iget-object v0, v0, Lcom/airbnb/lottie/c/c/d;->kq: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;->jZ:Lcom/airbnb/lottie/c/c/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->ka:Lcom/airbnb/lottie/c/c/d;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/c/c/d;->kp:Ljava/lang/String;
+    iget-object v0, v0, Lcom/airbnb/lottie/c/c/d;->kq: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;->jZ:Lcom/airbnb/lottie/c/c/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->ka:Lcom/airbnb/lottie/c/c/d;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/c/c/d;->kp:Ljava/lang/String;
+    iget-object v0, v0, Lcom/airbnb/lottie/c/c/d;->kq: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;->jZ:Lcom/airbnb/lottie/c/c/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->ka:Lcom/airbnb/lottie/c/c/d;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/c/c/d;->kp:Ljava/lang/String;
+    iget-object v0, v0, Lcom/airbnb/lottie/c/c/d;->kq: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;->gF:Lcom/airbnb/lottie/a/b/o;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->gG: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;->dJ:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->dK: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;->ke:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->kf: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;->kb: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
@@ -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;->kc:Lcom/airbnb/lottie/c/c/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/c/a;->kd: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;->kf:Z
+    iget-boolean v0, p0, Lcom/airbnb/lottie/c/c/a;->kg:Z
 
     if-eq p1, v0, :cond_0
 
-    iput-boolean p1, p0, Lcom/airbnb/lottie/c/c/a;->kf:Z
+    iput-boolean p1, p0, Lcom/airbnb/lottie/c/c/a;->kg:Z
 
-    iget-object p1, p0, Lcom/airbnb/lottie/c/c/a;->dJ:Lcom/airbnb/lottie/f;
+    iget-object p1, p0, Lcom/airbnb/lottie/c/c/a;->dK: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;->jZ:Lcom/airbnb/lottie/c/c/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->ka:Lcom/airbnb/lottie/c/c/d;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/c/c/d;->kp:Ljava/lang/String;
+    iget-object v0, v0, Lcom/airbnb/lottie/c/c/d;->kq: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;->gF:Lcom/airbnb/lottie/a/b/o;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->gG:Lcom/airbnb/lottie/a/b/o;
 
-    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;->hs:Lcom/airbnb/lottie/a/b/a;
 
     if-eqz v1, :cond_0
 
-    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;->hs: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;->hu: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_1
 
-    iget-object v1, v0, Lcom/airbnb/lottie/a/b/o;->hu: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_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;->hw:Lcom/airbnb/lottie/a/b/a;
 
     if-eqz v1, :cond_2
 
-    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;->hw: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;->hn: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_3
 
-    iget-object v1, v0, Lcom/airbnb/lottie/a/b/o;->hn: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_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;->hp:Lcom/airbnb/lottie/a/b/a;
 
     if-eqz v1, :cond_4
 
-    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;->hp: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;->hp: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_5
 
-    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;->hq: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;->hq: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_6
 
-    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;->hr: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;->hs: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_7
 
-    iget-object v1, v0, Lcom/airbnb/lottie/a/b/o;->hs:Lcom/airbnb/lottie/a/b/c;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/b/o;->ht: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;->ht:Lcom/airbnb/lottie/a/b/c;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/b/o;->hu:Lcom/airbnb/lottie/a/b/c;
 
     if-eqz v1, :cond_8
 
-    iget-object v0, v0, Lcom/airbnb/lottie/a/b/o;->ht:Lcom/airbnb/lottie/a/b/c;
+    iget-object v0, v0, Lcom/airbnb/lottie/a/b/o;->hu: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;->ka:Lcom/airbnb/lottie/a/b/g;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->kb: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;->ka:Lcom/airbnb/lottie/a/b/g;
+    iget-object v2, p0, Lcom/airbnb/lottie/c/c/a;->kb:Lcom/airbnb/lottie/a/b/g;
 
-    iget-object v2, v2, Lcom/airbnb/lottie/a/b/g;->gW:Ljava/util/List;
+    iget-object v2, v2, Lcom/airbnb/lottie/a/b/g;->gX: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;->ka:Lcom/airbnb/lottie/a/b/g;
+    iget-object v2, p0, Lcom/airbnb/lottie/c/c/a;->kb:Lcom/airbnb/lottie/a/b/g;
 
-    iget-object v2, v2, Lcom/airbnb/lottie/a/b/g;->gW:Ljava/util/List;
+    iget-object v2, v2, Lcom/airbnb/lottie/a/b/g;->gX: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;->jZ:Lcom/airbnb/lottie/c/c/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->ka:Lcom/airbnb/lottie/c/c/d;
 
-    iget v0, v0, Lcom/airbnb/lottie/c/c/d;->kw:F
+    iget v0, v0, Lcom/airbnb/lottie/c/c/d;->kx:F
 
     const/4 v2, 0x0
 
@@ -1976,22 +1976,22 @@
 
     if-eqz v0, :cond_a
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->jZ:Lcom/airbnb/lottie/c/c/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->ka:Lcom/airbnb/lottie/c/c/d;
 
-    iget v0, v0, Lcom/airbnb/lottie/c/c/d;->kw:F
+    iget v0, v0, Lcom/airbnb/lottie/c/c/d;->kx:F
 
     div-float/2addr p1, v0
 
     :cond_a
-    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->kb:Lcom/airbnb/lottie/c/c/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->kc:Lcom/airbnb/lottie/c/c/a;
 
     if-eqz v0, :cond_b
 
-    iget-object v0, v0, Lcom/airbnb/lottie/c/c/a;->jZ:Lcom/airbnb/lottie/c/c/d;
+    iget-object v0, v0, Lcom/airbnb/lottie/c/c/a;->ka:Lcom/airbnb/lottie/c/c/d;
 
-    iget v0, v0, Lcom/airbnb/lottie/c/c/d;->kw:F
+    iget v0, v0, Lcom/airbnb/lottie/c/c/d;->kx:F
 
-    iget-object v2, p0, Lcom/airbnb/lottie/c/c/a;->kb:Lcom/airbnb/lottie/c/c/a;
+    iget-object v2, p0, Lcom/airbnb/lottie/c/c/a;->kc: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;->ke:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->kf: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;->ke:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->kf: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 019d64d733..642a8f42d7 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 km:[I
+.field static final synthetic kn:[I
 
 
 # direct methods
@@ -30,14 +30,14 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/airbnb/lottie/c/c/b$1;->km:[I
+    sput-object v0, Lcom/airbnb/lottie/c/c/b$1;->kn:[I
 
     const/4 v0, 0x1
 
     :try_start_0
-    sget-object v1, Lcom/airbnb/lottie/c/c/b$1;->km:[I
+    sget-object v1, Lcom/airbnb/lottie/c/c/b$1;->kn:[I
 
-    sget v2, Lcom/airbnb/lottie/c/c/d$b;->kN:I
+    sget v2, Lcom/airbnb/lottie/c/c/d$b;->kO: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;->km:[I
+    sget-object v1, Lcom/airbnb/lottie/c/c/b$1;->kn:[I
 
-    sget v2, Lcom/airbnb/lottie/c/c/d$b;->kO:I
+    sget v2, Lcom/airbnb/lottie/c/c/d$b;->kP: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 90d21e4d92..04dc5b0a24 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 ef:Ljava/util/List;
+.field private final eg:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -14,7 +14,7 @@
     .end annotation
 .end field
 
-.field private kk:Lcom/airbnb/lottie/a/b/a;
+.field private kl: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 kl:Landroid/graphics/RectF;
+.field private final km: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;->ef:Ljava/util/List;
+    iput-object v0, p0, Lcom/airbnb/lottie/c/c/b;->eg: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;->kl:Landroid/graphics/RectF;
+    iput-object v0, p0, Lcom/airbnb/lottie/c/c/b;->km:Landroid/graphics/RectF;
 
-    iget-object p2, p2, Lcom/airbnb/lottie/c/c/d;->kB:Lcom/airbnb/lottie/c/a/b;
+    iget-object p2, p2, Lcom/airbnb/lottie/c/c/d;->kC: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;->kk:Lcom/airbnb/lottie/a/b/a;
+    iput-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;
+    iget-object p2, p0, Lcom/airbnb/lottie/c/c/b;->kl: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;->kk:Lcom/airbnb/lottie/a/b/a;
+    iget-object p2, p0, Lcom/airbnb/lottie/c/c/b;->kl: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;->kk:Lcom/airbnb/lottie/a/b/a;
+    iput-object v0, p0, Lcom/airbnb/lottie/c/c/b;->kl:Lcom/airbnb/lottie/a/b/a;
 
     :goto_0
     new-instance p2, Landroidx/collection/LongSparseArray;
 
-    iget-object v1, p4, Lcom/airbnb/lottie/d;->ef:Ljava/util/List;
+    iget-object v1, p4, Lcom/airbnb/lottie/d;->eg: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;->ki:[I
+    sget-object v6, Lcom/airbnb/lottie/c/c/a$2;->kj:[I
 
-    iget-object v7, v5, Lcom/airbnb/lottie/c/c/d;->kr:Lcom/airbnb/lottie/c/c/d$a;
+    iget-object v7, v5, Lcom/airbnb/lottie/c/c/d;->ks: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;->kr:Lcom/airbnb/lottie/c/c/d$a;
+    iget-object v7, v5, Lcom/airbnb/lottie/c/c/d;->ks: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;->ks:Ljava/lang/String;
+    iget-object v7, v5, Lcom/airbnb/lottie/c/c/d;->kt:Ljava/lang/String;
 
-    iget-object v8, p4, Lcom/airbnb/lottie/d;->dZ:Ljava/util/Map;
+    iget-object v8, p4, Lcom/airbnb/lottie/d;->ea: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;->jZ:Lcom/airbnb/lottie/c/c/d;
+    iget-object v7, v6, Lcom/airbnb/lottie/c/c/a;->ka:Lcom/airbnb/lottie/c/c/d;
 
-    iget-wide v7, v7, Lcom/airbnb/lottie/c/c/d;->kq:J
+    iget-wide v7, v7, Lcom/airbnb/lottie/c/c/d;->kr: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;->ef:Ljava/util/List;
+    iget-object v7, p0, Lcom/airbnb/lottie/c/c/b;->eg: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;->km:[I
+    sget-object v4, Lcom/airbnb/lottie/c/c/b$1;->kn:[I
 
-    iget v5, v5, Lcom/airbnb/lottie/c/c/d;->kD:I
+    iget v5, v5, Lcom/airbnb/lottie/c/c/d;->kE: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;->jZ:Lcom/airbnb/lottie/c/c/d;
+    iget-object p3, p1, Lcom/airbnb/lottie/c/c/a;->ka: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;->ef:Ljava/util/List;
+    iget-object p2, p0, Lcom/airbnb/lottie/c/c/b;->eg: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;->ef:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/b;->eg: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;->jY:Landroid/graphics/Matrix;
+    iget-object v2, p0, Lcom/airbnb/lottie/c/c/b;->jZ: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;->ft:Ljava/lang/Float;
+    sget-object v0, Lcom/airbnb/lottie/j;->fu: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;->kk:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/c/b;->kl: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;->kk:Lcom/airbnb/lottie/a/b/a;
+    iput-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;
+    iget-object p1, p0, Lcom/airbnb/lottie/c/c/b;->kl: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;->kl:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/c/b;->km:Landroid/graphics/RectF;
 
-    iget-object v2, p0, Lcom/airbnb/lottie/c/c/b;->jZ:Lcom/airbnb/lottie/c/c/d;
+    iget-object v2, p0, Lcom/airbnb/lottie/c/c/b;->ka:Lcom/airbnb/lottie/c/c/d;
 
-    iget v2, v2, Lcom/airbnb/lottie/c/c/d;->kx:I
+    iget v2, v2, Lcom/airbnb/lottie/c/c/d;->ky:I
 
     int-to-float v2, v2
 
-    iget-object v3, p0, Lcom/airbnb/lottie/c/c/b;->jZ:Lcom/airbnb/lottie/c/c/d;
+    iget-object v3, p0, Lcom/airbnb/lottie/c/c/b;->ka:Lcom/airbnb/lottie/c/c/d;
 
-    iget v3, v3, Lcom/airbnb/lottie/c/c/d;->ky:I
+    iget v3, v3, Lcom/airbnb/lottie/c/c/d;->kz: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;->kl:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/c/b;->km: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;->ef:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/c/b;->eg: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;->kl:Landroid/graphics/RectF;
+    iget-object v3, p0, Lcom/airbnb/lottie/c/c/b;->km: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;->kl:Landroid/graphics/RectF;
+    iget-object v3, p0, Lcom/airbnb/lottie/c/c/b;->km: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;->ef:Ljava/util/List;
+    iget-object v3, p0, Lcom/airbnb/lottie/c/c/b;->eg: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;->ef:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/c/b;->eg: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;->ef:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/c/b;->eg: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;->kk:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/b;->kl:Lcom/airbnb/lottie/a/b/a;
 
     if-eqz v0, :cond_0
 
-    iget-object p1, p0, Lcom/airbnb/lottie/c/c/b;->dJ:Lcom/airbnb/lottie/f;
+    iget-object p1, p0, Lcom/airbnb/lottie/c/c/b;->dK:Lcom/airbnb/lottie/f;
 
-    iget-object p1, p1, Lcom/airbnb/lottie/f;->dS:Lcom/airbnb/lottie/d;
+    iget-object p1, p1, Lcom/airbnb/lottie/f;->dT: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;->kk:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/b;->kl: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;->jZ:Lcom/airbnb/lottie/c/c/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/b;->ka:Lcom/airbnb/lottie/c/c/d;
 
-    iget v0, v0, Lcom/airbnb/lottie/c/c/d;->kw:F
+    iget v0, v0, Lcom/airbnb/lottie/c/c/d;->kx:F
 
     const/4 v1, 0x0
 
@@ -583,18 +583,18 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/c/b;->jZ:Lcom/airbnb/lottie/c/c/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/b;->ka:Lcom/airbnb/lottie/c/c/d;
 
-    iget v0, v0, Lcom/airbnb/lottie/c/c/d;->kw:F
+    iget v0, v0, Lcom/airbnb/lottie/c/c/d;->kx:F
 
     div-float/2addr p1, v0
 
     :cond_1
-    iget-object v0, p0, Lcom/airbnb/lottie/c/c/b;->jZ:Lcom/airbnb/lottie/c/c/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/b;->ka:Lcom/airbnb/lottie/c/c/d;
 
-    iget v1, v0, Lcom/airbnb/lottie/c/c/d;->eh:F
+    iget v1, v0, Lcom/airbnb/lottie/c/c/d;->ei:F
 
-    iget-object v0, v0, Lcom/airbnb/lottie/c/c/d;->dS:Lcom/airbnb/lottie/d;
+    iget-object v0, v0, Lcom/airbnb/lottie/c/c/d;->dT: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;->ef:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/b;->eg: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;->ef:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/c/b;->eg: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 8046e56ec0..489b703e68 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 fU:Lcom/airbnb/lottie/a/b/a;
+.field private fV:Lcom/airbnb/lottie/a/b/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/airbnb/lottie/a/b/a<",
@@ -15,10 +15,10 @@
     .end annotation
 .end field
 
-.field private final kn:Landroid/graphics/Rect;
-
 .field private final ko:Landroid/graphics/Rect;
 
+.field private final kp: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;->kn:Landroid/graphics/Rect;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/c/c;->ko: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;->ko:Landroid/graphics/Rect;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/c/c;->kp: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;->jZ:Lcom/airbnb/lottie/c/c/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/c;->ka:Lcom/airbnb/lottie/c/c/d;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/c/c/d;->ks:Ljava/lang/String;
+    iget-object v0, v0, Lcom/airbnb/lottie/c/c/d;->kt:Ljava/lang/String;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/c/c/c;->dJ:Lcom/airbnb/lottie/f;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/c/c;->dK: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;->jY:Landroid/graphics/Matrix;
+    iget-object p2, p0, Lcom/airbnb/lottie/c/c/c;->jZ: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;->fu:Landroid/graphics/ColorFilter;
+    sget-object v0, Lcom/airbnb/lottie/j;->fv: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;->fU:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/c/c;->fV: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;->fU:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/c/c;->fV: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;->fU:Lcom/airbnb/lottie/a/b/a;
+    iget-object p3, p0, Lcom/airbnb/lottie/c/c/c;->fV: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;->kn: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
 
@@ -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;->ko:Landroid/graphics/Rect;
+    iget-object p2, p0, Lcom/airbnb/lottie/c/c/c;->kp: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;->kn:Landroid/graphics/Rect;
+    iget-object p2, p0, Lcom/airbnb/lottie/c/c/c;->ko:Landroid/graphics/Rect;
 
-    iget-object p3, p0, Lcom/airbnb/lottie/c/c/c;->ko:Landroid/graphics/Rect;
+    iget-object p3, p0, Lcom/airbnb/lottie/c/c/c;->kp: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 0d2a30ca7d..5aa8d85458 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,8 +23,6 @@
 
 
 # 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;
@@ -37,7 +35,9 @@
 
 .field public static final enum kK:Lcom/airbnb/lottie/c/c/d$a;
 
-.field private static final synthetic kL:[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;
 
 
 # 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;->kE: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;
 
@@ -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;->kF: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;
 
@@ -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;->kG: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;
 
@@ -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;->kH: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;
 
@@ -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;->kI: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;
 
@@ -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;->kJ: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;
 
     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;->kK: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;
 
     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;->kE: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;
 
     aput-object v8, v0, v1
 
-    sget-object v1, Lcom/airbnb/lottie/c/c/d$a;->kF: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, v2
 
-    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;->kH:Lcom/airbnb/lottie/c/c/d$a;
 
     aput-object v1, v0, v3
 
-    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;->kI:Lcom/airbnb/lottie/c/c/d$a;
 
     aput-object v1, v0, v4
 
-    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;->kJ:Lcom/airbnb/lottie/c/c/d$a;
 
     aput-object v1, v0, v5
 
-    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;->kK:Lcom/airbnb/lottie/c/c/d$a;
 
     aput-object v1, v0, v6
 
-    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;->kL:Lcom/airbnb/lottie/c/c/d$a;
 
     aput-object v1, v0, v7
 
-    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;->kM:[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;->kL:[Lcom/airbnb/lottie/c/c/d$a;
+    sget-object v0, Lcom/airbnb/lottie/c/c/d$a;->kM:[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 19d45c57d2..9e931ac58f 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 kM:I = 0x1
+.field public static final kN:I = 0x1
 
-.field public static final kN:I = 0x2
+.field public static final kO:I = 0x2
 
-.field public static final kO:I = 0x3
+.field public static final kP:I = 0x3
 
-.field public static final kP:I = 0x4
+.field public static final kQ:I = 0x4
 
-.field private static final synthetic kQ:[I
+.field private static final synthetic kR:[I
 
 
 # direct methods
@@ -42,31 +42,31 @@
 
     new-array v0, v0, [I
 
-    sget v1, Lcom/airbnb/lottie/c/c/d$b;->kM:I
+    sget v1, Lcom/airbnb/lottie/c/c/d$b;->kN:I
 
     const/4 v2, 0x0
 
     aput v1, v0, v2
 
-    sget v1, Lcom/airbnb/lottie/c/c/d$b;->kN:I
+    sget v1, Lcom/airbnb/lottie/c/c/d$b;->kO:I
 
     const/4 v2, 0x1
 
     aput v1, v0, v2
 
-    sget v1, Lcom/airbnb/lottie/c/c/d$b;->kO:I
+    sget v1, Lcom/airbnb/lottie/c/c/d$b;->kP:I
 
     const/4 v2, 0x2
 
     aput v1, v0, v2
 
-    sget v1, Lcom/airbnb/lottie/c/c/d$b;->kP:I
+    sget v1, Lcom/airbnb/lottie/c/c/d$b;->kQ:I
 
     const/4 v2, 0x3
 
     aput v1, v0, v2
 
-    sput-object v0, Lcom/airbnb/lottie/c/c/d$b;->kQ:[I
+    sput-object v0, Lcom/airbnb/lottie/c/c/d$b;->kR:[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;->kQ:[I
+    sget-object v0, Lcom/airbnb/lottie/c/c/d$b;->kR:[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 8ed63ca7cc..fdd9ba78de 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 dS:Lcom/airbnb/lottie/d;
+.field final dT:Lcom/airbnb/lottie/d;
 
-.field final eh:F
+.field final ei:F
 
-.field final fY:Z
+.field final fZ:Z
 
-.field final gY:Ljava/util/List;
+.field final gZ:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -29,7 +29,7 @@
     .end annotation
 .end field
 
-.field final ia:Ljava/util/List;
+.field final ib:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -39,13 +39,15 @@
     .end annotation
 .end field
 
-.field final jv:Lcom/airbnb/lottie/c/a/l;
+.field final jw:Lcom/airbnb/lottie/c/a/l;
 
-.field final kA:Lcom/airbnb/lottie/c/a/k;
+.field final kA:Lcom/airbnb/lottie/c/a/j;
 
-.field final kB:Lcom/airbnb/lottie/c/a/b;
+.field final kB:Lcom/airbnb/lottie/c/a/k;
 
-.field final kC:Ljava/util/List;
+.field final kC:Lcom/airbnb/lottie/c/a/b;
+
+.field final kD:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -56,29 +58,27 @@
     .end annotation
 .end field
 
-.field final kD:I
+.field final kE:I
 
-.field final kp:Ljava/lang/String;
+.field final kq:Ljava/lang/String;
 
-.field public final kq:J
+.field public final kr:J
 
-.field public final kr:Lcom/airbnb/lottie/c/c/d$a;
+.field public final ks:Lcom/airbnb/lottie/c/c/d$a;
 
-.field final ks:Ljava/lang/String;
-
-.field final kt:I
+.field final kt:Ljava/lang/String;
 
 .field final ku:I
 
 .field final kv:I
 
-.field final kw:F
+.field final kw:I
 
-.field final kx:I
+.field final kx:F
 
 .field final ky:I
 
-.field final kz:Lcom/airbnb/lottie/c/a/j;
+.field final kz:I
 
 .field final parentId:J
 
@@ -120,23 +120,23 @@
 
     move-object v1, p1
 
-    iput-object v1, v0, Lcom/airbnb/lottie/c/c/d;->ia:Ljava/util/List;
+    iput-object v1, v0, Lcom/airbnb/lottie/c/c/d;->ib:Ljava/util/List;
 
     move-object v1, p2
 
-    iput-object v1, v0, Lcom/airbnb/lottie/c/c/d;->dS:Lcom/airbnb/lottie/d;
+    iput-object v1, v0, Lcom/airbnb/lottie/c/c/d;->dT:Lcom/airbnb/lottie/d;
 
     move-object v1, p3
 
-    iput-object v1, v0, Lcom/airbnb/lottie/c/c/d;->kp:Ljava/lang/String;
+    iput-object v1, v0, Lcom/airbnb/lottie/c/c/d;->kq:Ljava/lang/String;
 
     move-wide v1, p4
 
-    iput-wide v1, v0, Lcom/airbnb/lottie/c/c/d;->kq:J
+    iput-wide v1, v0, Lcom/airbnb/lottie/c/c/d;->kr:J
 
     move-object v1, p6
 
-    iput-object v1, v0, Lcom/airbnb/lottie/c/c/d;->kr:Lcom/airbnb/lottie/c/c/d$a;
+    iput-object v1, v0, Lcom/airbnb/lottie/c/c/d;->ks: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;->ks:Ljava/lang/String;
+    iput-object v1, v0, Lcom/airbnb/lottie/c/c/d;->kt:Ljava/lang/String;
 
     move-object v1, p10
 
-    iput-object v1, v0, Lcom/airbnb/lottie/c/c/d;->gY:Ljava/util/List;
+    iput-object v1, v0, Lcom/airbnb/lottie/c/c/d;->gZ:Ljava/util/List;
 
     move-object v1, p11
 
-    iput-object v1, v0, Lcom/airbnb/lottie/c/c/d;->jv:Lcom/airbnb/lottie/c/a/l;
+    iput-object v1, v0, Lcom/airbnb/lottie/c/c/d;->jw:Lcom/airbnb/lottie/c/a/l;
 
     move v1, p12
 
-    iput v1, v0, Lcom/airbnb/lottie/c/c/d;->kt:I
+    iput v1, v0, Lcom/airbnb/lottie/c/c/d;->ku:I
 
     move/from16 v1, p13
 
-    iput v1, v0, Lcom/airbnb/lottie/c/c/d;->ku:I
+    iput v1, v0, Lcom/airbnb/lottie/c/c/d;->kv:I
 
     move/from16 v1, p14
 
-    iput v1, v0, Lcom/airbnb/lottie/c/c/d;->kv:I
+    iput v1, v0, Lcom/airbnb/lottie/c/c/d;->kw:I
 
     move/from16 v1, p15
 
-    iput v1, v0, Lcom/airbnb/lottie/c/c/d;->kw:F
+    iput v1, v0, Lcom/airbnb/lottie/c/c/d;->kx:F
 
     move/from16 v1, p16
 
-    iput v1, v0, Lcom/airbnb/lottie/c/c/d;->eh:F
+    iput v1, v0, Lcom/airbnb/lottie/c/c/d;->ei:F
 
     move/from16 v1, p17
 
-    iput v1, v0, Lcom/airbnb/lottie/c/c/d;->kx:I
+    iput v1, v0, Lcom/airbnb/lottie/c/c/d;->ky:I
 
     move/from16 v1, p18
 
-    iput v1, v0, Lcom/airbnb/lottie/c/c/d;->ky:I
+    iput v1, v0, Lcom/airbnb/lottie/c/c/d;->kz:I
 
     move-object/from16 v1, p19
 
-    iput-object v1, v0, Lcom/airbnb/lottie/c/c/d;->kz:Lcom/airbnb/lottie/c/a/j;
+    iput-object v1, v0, Lcom/airbnb/lottie/c/c/d;->kA:Lcom/airbnb/lottie/c/a/j;
 
     move-object/from16 v1, p20
 
-    iput-object v1, v0, Lcom/airbnb/lottie/c/c/d;->kA:Lcom/airbnb/lottie/c/a/k;
+    iput-object v1, v0, Lcom/airbnb/lottie/c/c/d;->kB:Lcom/airbnb/lottie/c/a/k;
 
     move-object/from16 v1, p21
 
-    iput-object v1, v0, Lcom/airbnb/lottie/c/c/d;->kC:Ljava/util/List;
+    iput-object v1, v0, Lcom/airbnb/lottie/c/c/d;->kD:Ljava/util/List;
 
     move/from16 v1, p22
 
-    iput v1, v0, Lcom/airbnb/lottie/c/c/d;->kD:I
+    iput v1, v0, Lcom/airbnb/lottie/c/c/d;->kE:I
 
     move-object/from16 v1, p23
 
-    iput-object v1, v0, Lcom/airbnb/lottie/c/c/d;->kB:Lcom/airbnb/lottie/c/a/b;
+    iput-object v1, v0, Lcom/airbnb/lottie/c/c/d;->kC:Lcom/airbnb/lottie/c/a/b;
 
     move/from16 v1, p24
 
-    iput-boolean v1, v0, Lcom/airbnb/lottie/c/c/d;->fY:Z
+    iput-boolean v1, v0, Lcom/airbnb/lottie/c/c/d;->fZ: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;->kp:Ljava/lang/String;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/c/d;->kq: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;->dS:Lcom/airbnb/lottie/d;
+    iget-object v2, p0, Lcom/airbnb/lottie/c/c/d;->dT: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;->kp:Ljava/lang/String;
+    iget-object v3, v2, Lcom/airbnb/lottie/c/c/d;->kq: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;->dS:Lcom/airbnb/lottie/d;
+    iget-object v3, p0, Lcom/airbnb/lottie/c/c/d;->dT: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;->kp:Ljava/lang/String;
+    iget-object v3, v2, Lcom/airbnb/lottie/c/c/d;->kq: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;->dS:Lcom/airbnb/lottie/d;
+    iget-object v3, p0, Lcom/airbnb/lottie/c/c/d;->dT: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;->gY:Ljava/util/List;
+    iget-object v2, p0, Lcom/airbnb/lottie/c/c/d;->gZ: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;->gY:Ljava/util/List;
+    iget-object v2, p0, Lcom/airbnb/lottie/c/c/d;->gZ: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;->kt:I
+    iget v2, p0, Lcom/airbnb/lottie/c/c/d;->ku:I
 
     if-eqz v2, :cond_3
 
-    iget v2, p0, Lcom/airbnb/lottie/c/c/d;->ku:I
+    iget v2, p0, Lcom/airbnb/lottie/c/c/d;->kv:I
 
     if-eqz v2, :cond_3
 
@@ -340,7 +340,7 @@
 
     const/4 v4, 0x0
 
-    iget v5, p0, Lcom/airbnb/lottie/c/c/d;->kt:I
+    iget v5, p0, Lcom/airbnb/lottie/c/c/d;->ku: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;->ku:I
+    iget v5, p0, Lcom/airbnb/lottie/c/c/d;->kv: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;->kv:I
+    iget v5, p0, Lcom/airbnb/lottie/c/c/d;->kw: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;->ia:Ljava/util/List;
+    iget-object v2, p0, Lcom/airbnb/lottie/c/c/d;->ib: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;->ia:Ljava/util/List;
+    iget-object v2, p0, Lcom/airbnb/lottie/c/c/d;->ib: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 d6f1048e55..205788cd38 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 gG:Lcom/airbnb/lottie/a/a/d;
+.field private final gH: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;->ia:Ljava/util/List;
+    iget-object p2, p2, Lcom/airbnb/lottie/c/c/d;->ib: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;->gG:Lcom/airbnb/lottie/a/a/d;
+    iput-object p2, 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;
+    iget-object p1, p0, Lcom/airbnb/lottie/c/c/f;->gH: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;->gG:Lcom/airbnb/lottie/a/a/d;
+    iget-object p2, p0, Lcom/airbnb/lottie/c/c/f;->gH:Lcom/airbnb/lottie/a/a/d;
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/c/f;->jY:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/f;->jZ: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;->gG:Lcom/airbnb/lottie/a/a/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/f;->gH: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;->gG:Lcom/airbnb/lottie/a/a/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/f;->gH: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 93efdf78c0..3b7c37c348 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 fU:Lcom/airbnb/lottie/a/b/a;
+.field private fV: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 jZ:Lcom/airbnb/lottie/c/c/d;
+.field private final kS:[F
 
-.field private final kR:[F
+.field private final ka:Lcom/airbnb/lottie/c/c/d;
 
 .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;->kR:[F
+    iput-object p1, p0, Lcom/airbnb/lottie/c/c/g;->kS:[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;->jZ:Lcom/airbnb/lottie/c/c/d;
+    iput-object p2, p0, Lcom/airbnb/lottie/c/c/g;->ka: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;->kv:I
+    iget p2, p2, Lcom/airbnb/lottie/c/c/d;->kw: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;->jZ:Lcom/airbnb/lottie/c/c/d;
+    iget-object p3, p0, Lcom/airbnb/lottie/c/c/g;->ka:Lcom/airbnb/lottie/c/c/d;
 
-    iget p3, p3, Lcom/airbnb/lottie/c/c/d;->kt:I
+    iget p3, p3, Lcom/airbnb/lottie/c/c/d;->ku:I
 
     int-to-float p3, p3
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/c/g;->jZ:Lcom/airbnb/lottie/c/c/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/g;->ka:Lcom/airbnb/lottie/c/c/d;
 
-    iget v0, v0, Lcom/airbnb/lottie/c/c/d;->ku:I
+    iget v0, v0, Lcom/airbnb/lottie/c/c/d;->kv: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;->jY:Landroid/graphics/Matrix;
+    iget-object p2, p0, Lcom/airbnb/lottie/c/c/g;->jZ: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;->fu:Landroid/graphics/ColorFilter;
+    sget-object v0, Lcom/airbnb/lottie/j;->fv: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;->fU:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/c/g;->fV: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;->fU:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/c/g;->fV: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;->jZ:Lcom/airbnb/lottie/c/c/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/g;->ka: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;->kw: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;->gF:Lcom/airbnb/lottie/a/b/o;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/c/g;->gG:Lcom/airbnb/lottie/a/b/o;
 
-    iget-object v1, v1, Lcom/airbnb/lottie/a/b/o;->hr:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, v1, Lcom/airbnb/lottie/a/b/o;->hs: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;->gF:Lcom/airbnb/lottie/a/b/o;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/c/g;->gG:Lcom/airbnb/lottie/a/b/o;
 
-    iget-object v1, v1, Lcom/airbnb/lottie/a/b/o;->hr:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, v1, Lcom/airbnb/lottie/a/b/o;->hs: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;->fU:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/g;->fV: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;->kR:[F
+    iget-object p3, p0, Lcom/airbnb/lottie/c/c/g;->kS:[F
 
     const/4 v0, 0x0
 
@@ -253,9 +253,9 @@
 
     aput v1, p3, v2
 
-    iget-object v3, p0, Lcom/airbnb/lottie/c/c/g;->jZ:Lcom/airbnb/lottie/c/c/d;
+    iget-object v3, p0, Lcom/airbnb/lottie/c/c/g;->ka:Lcom/airbnb/lottie/c/c/d;
 
-    iget v3, v3, Lcom/airbnb/lottie/c/c/d;->kt:I
+    iget v3, v3, Lcom/airbnb/lottie/c/c/d;->ku:I
 
     int-to-float v3, v3
 
@@ -263,15 +263,15 @@
 
     aput v3, p3, v4
 
-    iget-object p3, p0, Lcom/airbnb/lottie/c/c/g;->kR:[F
+    iget-object p3, p0, Lcom/airbnb/lottie/c/c/g;->kS:[F
 
     const/4 v3, 0x3
 
     aput v1, p3, v3
 
-    iget-object v5, p0, Lcom/airbnb/lottie/c/c/g;->jZ:Lcom/airbnb/lottie/c/c/d;
+    iget-object v5, p0, Lcom/airbnb/lottie/c/c/g;->ka:Lcom/airbnb/lottie/c/c/d;
 
-    iget v5, v5, Lcom/airbnb/lottie/c/c/d;->kt:I
+    iget v5, v5, Lcom/airbnb/lottie/c/c/d;->ku:I
 
     int-to-float v5, v5
 
@@ -279,11 +279,11 @@
 
     aput v5, p3, v6
 
-    iget-object p3, p0, Lcom/airbnb/lottie/c/c/g;->kR:[F
+    iget-object p3, p0, Lcom/airbnb/lottie/c/c/g;->kS:[F
 
-    iget-object v5, p0, Lcom/airbnb/lottie/c/c/g;->jZ:Lcom/airbnb/lottie/c/c/d;
+    iget-object v5, p0, Lcom/airbnb/lottie/c/c/g;->ka: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;->kv:I
 
     int-to-float v5, v5
 
@@ -291,15 +291,15 @@
 
     aput v5, p3, v7
 
-    iget-object p3, p0, Lcom/airbnb/lottie/c/c/g;->kR:[F
+    iget-object p3, p0, Lcom/airbnb/lottie/c/c/g;->kS:[F
 
     const/4 v5, 0x6
 
     aput v1, p3, v5
 
-    iget-object v1, p0, Lcom/airbnb/lottie/c/c/g;->jZ:Lcom/airbnb/lottie/c/c/d;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/c/g;->ka:Lcom/airbnb/lottie/c/c/d;
 
-    iget v1, v1, Lcom/airbnb/lottie/c/c/d;->ku:I
+    iget v1, v1, Lcom/airbnb/lottie/c/c/d;->kv:I
 
     int-to-float v1, v1
 
@@ -307,7 +307,7 @@
 
     aput v1, p3, v8
 
-    iget-object p3, p0, Lcom/airbnb/lottie/c/c/g;->kR:[F
+    iget-object p3, p0, Lcom/airbnb/lottie/c/c/g;->kS:[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;->kR:[F
+    iget-object p3, p0, Lcom/airbnb/lottie/c/c/g;->kS:[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;->kR:[F
+    iget-object p3, p0, Lcom/airbnb/lottie/c/c/g;->kS:[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;->kR:[F
+    iget-object p3, p0, Lcom/airbnb/lottie/c/c/g;->kS:[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;->kR:[F
+    iget-object p3, p0, Lcom/airbnb/lottie/c/c/g;->kS:[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;->kR:[F
+    iget-object p3, p0, Lcom/airbnb/lottie/c/c/g;->kS:[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 a28a31eaa8..5c66dbc1ba 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 kZ:Lcom/airbnb/lottie/c/c/h;
+.field final synthetic la: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;->kZ:Lcom/airbnb/lottie/c/c/h;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/c/h$1;->la: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 e65507d43c..8cba16ddbf 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 kZ:Lcom/airbnb/lottie/c/c/h;
+.field final synthetic la: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;->kZ:Lcom/airbnb/lottie/c/c/h;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/c/h$2;->la: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 6c3db96256..91a608e63b 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 la:[I
+.field static final synthetic lb:[I
 
 
 # direct methods
@@ -30,14 +30,14 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/airbnb/lottie/c/c/h$3;->la:[I
+    sput-object v0, Lcom/airbnb/lottie/c/c/h$3;->lb:[I
 
     const/4 v0, 0x1
 
     :try_start_0
-    sget-object v1, Lcom/airbnb/lottie/c/c/h$3;->la:[I
+    sget-object v1, Lcom/airbnb/lottie/c/c/h$3;->lb:[I
 
-    sget v2, Lcom/airbnb/lottie/c/b$a;->hT:I
+    sget v2, Lcom/airbnb/lottie/c/b$a;->hU: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;->la:[I
+    sget-object v1, Lcom/airbnb/lottie/c/c/h$3;->lb:[I
 
-    sget v2, Lcom/airbnb/lottie/c/b$a;->hU:I
+    sget v2, Lcom/airbnb/lottie/c/b$a;->hV: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;->la:[I
+    sget-object v1, Lcom/airbnb/lottie/c/c/h$3;->lb:[I
 
-    sget v2, Lcom/airbnb/lottie/c/b$a;->hV:I
+    sget v2, Lcom/airbnb/lottie/c/b$a;->hW: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 8d808cdc69..d263ed52cd 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 dJ:Lcom/airbnb/lottie/f;
+.field private final dK:Lcom/airbnb/lottie/f;
 
-.field private final dS:Lcom/airbnb/lottie/d;
+.field private final dT:Lcom/airbnb/lottie/d;
 
 .field private final fillPaint:Landroid/graphics/Paint;
 
-.field private gg:Lcom/airbnb/lottie/a/b/a;
+.field private gh: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 kS:Ljava/lang/StringBuilder;
+.field private final kT:Ljava/lang/StringBuilder;
 
-.field private final kT:Ljava/util/Map;
+.field private final kU:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -35,7 +35,7 @@
     .end annotation
 .end field
 
-.field private final kU:Landroidx/collection/LongSparseArray;
+.field private final kV:Landroidx/collection/LongSparseArray;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Landroidx/collection/LongSparseArray<",
@@ -45,25 +45,14 @@
     .end annotation
 .end field
 
-.field private final kV:Lcom/airbnb/lottie/a/b/n;
-
-.field private kW:Lcom/airbnb/lottie/a/b/a;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/airbnb/lottie/a/b/a<",
-            "Ljava/lang/Integer;",
-            "Ljava/lang/Integer;",
-            ">;"
-        }
-    .end annotation
-.end field
+.field private final kW:Lcom/airbnb/lottie/a/b/n;
 
 .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;",
+            "Ljava/lang/Integer;",
+            "Ljava/lang/Integer;",
             ">;"
         }
     .end annotation
@@ -80,6 +69,17 @@
     .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;->kS:Ljava/lang/StringBuilder;
+    iput-object v0, p0, Lcom/airbnb/lottie/c/c/h;->kT:Ljava/lang/StringBuilder;
 
     new-instance v0, Landroid/graphics/RectF;
 
@@ -129,96 +129,73 @@
 
     invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
 
-    iput-object v0, p0, Lcom/airbnb/lottie/c/c/h;->kT:Ljava/util/Map;
+    iput-object v0, p0, Lcom/airbnb/lottie/c/c/h;->kU: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;->kU:Landroidx/collection/LongSparseArray;
+    iput-object v0, p0, Lcom/airbnb/lottie/c/c/h;->kV:Landroidx/collection/LongSparseArray;
 
-    iput-object p1, p0, Lcom/airbnb/lottie/c/c/h;->dJ:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/c/h;->dK:Lcom/airbnb/lottie/f;
 
-    iget-object p1, p2, Lcom/airbnb/lottie/c/c/d;->dS:Lcom/airbnb/lottie/d;
+    iget-object p1, p2, Lcom/airbnb/lottie/c/c/d;->dT:Lcom/airbnb/lottie/d;
 
-    iput-object p1, p0, Lcom/airbnb/lottie/c/c/h;->dS:Lcom/airbnb/lottie/d;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/c/h;->dT:Lcom/airbnb/lottie/d;
 
-    iget-object p1, p2, Lcom/airbnb/lottie/c/c/d;->kz:Lcom/airbnb/lottie/c/a/j;
+    iget-object p1, p2, Lcom/airbnb/lottie/c/c/d;->kA: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;->kV:Lcom/airbnb/lottie/a/b/n;
+    iput-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;
+    iget-object p1, p0, Lcom/airbnb/lottie/c/c/h;->kW: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;->kV:Lcom/airbnb/lottie/a/b/n;
+    iget-object p1, p0, Lcom/airbnb/lottie/c/c/h;->kW: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;->kA:Lcom/airbnb/lottie/c/a/k;
+    iget-object p1, p2, Lcom/airbnb/lottie/c/c/d;->kB:Lcom/airbnb/lottie/c/a/k;
 
     if-eqz p1, :cond_0
 
-    iget-object p2, p1, Lcom/airbnb/lottie/c/a/k;->im:Lcom/airbnb/lottie/c/a/a;
+    iget-object p2, p1, Lcom/airbnb/lottie/c/a/k;->io: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;
+    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;->gg:Lcom/airbnb/lottie/a/b/a;
+    iput-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;->gg:Lcom/airbnb/lottie/a/b/a;
+    iget-object p2, p0, Lcom/airbnb/lottie/c/c/h;->gh: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;
+    iget-object p2, p0, Lcom/airbnb/lottie/c/c/h;->gh: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;
+    iget-object p2, p1, Lcom/airbnb/lottie/c/a/k;->iq: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;
+    iget-object p2, p1, Lcom/airbnb/lottie/c/a/k;->iq: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;->kW: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;->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_1
-    if-eqz p1, :cond_2
-
-    iget-object p2, p1, Lcom/airbnb/lottie/c/a/k;->iq:Lcom/airbnb/lottie/c/a/b;
-
-    if-eqz p2, :cond_2
-
-    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/b;->bi()Lcom/airbnb/lottie/a/b/a;
-
-    move-result-object p2
-
     iput-object p2, p0, Lcom/airbnb/lottie/c/c/h;->kX:Lcom/airbnb/lottie/a/b/a;
 
     iget-object p2, p0, Lcom/airbnb/lottie/c/c/h;->kX:Lcom/airbnb/lottie/a/b/a;
@@ -229,26 +206,49 @@
 
     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
+    :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;
+
     if-eqz p2, :cond_3
 
-    iget-object p1, p1, Lcom/airbnb/lottie/c/a/k;->ir:Lcom/airbnb/lottie/c/a/b;
+    iget-object p1, p1, Lcom/airbnb/lottie/c/a/k;->is: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;->kY:Lcom/airbnb/lottie/a/b/a;
+    iput-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;
+    iget-object p1, p0, Lcom/airbnb/lottie/c/c/h;->kZ: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;->kY:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/c/c/h;->kZ: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;->la:[I
+    sget-object v0, Lcom/airbnb/lottie/c/c/h$3;->lb:[I
 
     const/4 v1, 0x1
 
@@ -385,11 +385,11 @@
 
     move-result v0
 
-    iget-object v1, p0, Lcom/airbnb/lottie/c/c/h;->dJ:Lcom/airbnb/lottie/f;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/c/h;->dK:Lcom/airbnb/lottie/f;
 
-    iget-object v2, p2, Lcom/airbnb/lottie/c/c;->hX:Ljava/lang/String;
+    iget-object v2, p2, Lcom/airbnb/lottie/c/c;->hY:Ljava/lang/String;
 
-    iget-object p2, p2, Lcom/airbnb/lottie/c/c;->hY:Ljava/lang/String;
+    iget-object p2, p2, Lcom/airbnb/lottie/c/c;->hZ: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;->ez:Lcom/airbnb/lottie/b/a;
+    iget-object v3, v1, Lcom/airbnb/lottie/f;->eA: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;->eA:Lcom/airbnb/lottie/a;
+    iget-object v6, v1, Lcom/airbnb/lottie/f;->eB: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;->ez:Lcom/airbnb/lottie/b/a;
+    iput-object v3, v1, Lcom/airbnb/lottie/f;->eA:Lcom/airbnb/lottie/b/a;
 
     :cond_1
-    iget-object v1, v1, Lcom/airbnb/lottie/f;->ez:Lcom/airbnb/lottie/b/a;
+    iget-object v1, v1, Lcom/airbnb/lottie/f;->eA: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;->hy:Lcom/airbnb/lottie/c/i;
+    iget-object v4, v1, Lcom/airbnb/lottie/b/a;->hz: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;->hz:Ljava/util/Map;
+    iget-object v4, v1, Lcom/airbnb/lottie/b/a;->hA:Ljava/util/Map;
 
-    iget-object v5, v1, Lcom/airbnb/lottie/b/a;->hy:Lcom/airbnb/lottie/c/i;
+    iget-object v5, v1, Lcom/airbnb/lottie/b/a;->hz: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;->hA:Ljava/util/Map;
+    iget-object v4, v1, Lcom/airbnb/lottie/b/a;->hB: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;->hD:Ljava/lang/String;
+    iget-object v5, v1, Lcom/airbnb/lottie/b/a;->hE: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;->hB:Landroid/content/res/AssetManager;
+    iget-object v5, v1, Lcom/airbnb/lottie/b/a;->hC: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;->hA:Ljava/util/Map;
+    iget-object v5, v1, Lcom/airbnb/lottie/b/a;->hB: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;->hz:Ljava/util/Map;
+    iget-object p2, v1, Lcom/airbnb/lottie/b/a;->hA:Ljava/util/Map;
 
-    iget-object v1, v1, Lcom/airbnb/lottie/b/a;->hy:Lcom/airbnb/lottie/c/i;
+    iget-object v1, v1, Lcom/airbnb/lottie/b/a;->hz: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;->dJ:Lcom/airbnb/lottie/f;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/c/h;->dK:Lcom/airbnb/lottie/f;
 
-    iget-object v1, v1, Lcom/airbnb/lottie/f;->eB:Lcom/airbnb/lottie/p;
+    iget-object v1, v1, Lcom/airbnb/lottie/f;->eC:Lcom/airbnb/lottie/p;
 
     if-eqz v1, :cond_b
 
-    iget-boolean v2, v1, Lcom/airbnb/lottie/p;->fK:Z
+    iget-boolean v2, v1, Lcom/airbnb/lottie/p;->fL:Z
 
     if-eqz v2, :cond_a
 
-    iget-object v2, v1, Lcom/airbnb/lottie/p;->fJ:Ljava/util/Map;
+    iget-object v2, v1, Lcom/airbnb/lottie/p;->fK: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;->fJ:Ljava/util/Map;
+    iget-object v1, v1, Lcom/airbnb/lottie/p;->fK: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;->fK:Z
+    iget-boolean v2, v1, Lcom/airbnb/lottie/p;->fL:Z
 
     if-eqz v2, :cond_b
 
-    iget-object v1, v1, Lcom/airbnb/lottie/p;->fJ:Ljava/util/Map;
+    iget-object v1, v1, Lcom/airbnb/lottie/p;->fK: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;->hM:D
+    iget-wide v4, p1, Lcom/airbnb/lottie/c/b;->hN: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;->hP:D
+    iget-wide v1, p1, Lcom/airbnb/lottie/c/b;->hQ:D
 
     double-to-float v1, v1
 
@@ -672,7 +672,7 @@
 
     move-result v5
 
-    iget v6, p1, Lcom/airbnb/lottie/c/b;->hN:I
+    iget v6, p1, Lcom/airbnb/lottie/c/b;->hO: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;->kU:Landroidx/collection/LongSparseArray;
+    iget-object v4, p0, Lcom/airbnb/lottie/c/c/h;->kV: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;->kU:Landroidx/collection/LongSparseArray;
+    iget-object v2, p0, Lcom/airbnb/lottie/c/c/h;->kV: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;->kS:Ljava/lang/StringBuilder;
+    iget-object v2, p0, Lcom/airbnb/lottie/c/c/h;->kT: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;->kS:Ljava/lang/StringBuilder;
+    iget-object v8, p0, Lcom/airbnb/lottie/c/c/h;->kT: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;->kS:Ljava/lang/StringBuilder;
+    iget-object v2, p0, Lcom/airbnb/lottie/c/c/h;->kT: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;->kU:Landroidx/collection/LongSparseArray;
+    iget-object v3, p0, Lcom/airbnb/lottie/c/c/h;->kV: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;->hS:Z
+    iget-boolean v3, p2, Lcom/airbnb/lottie/c/b;->hT:Z
 
     if-eqz v3, :cond_5
 
@@ -960,7 +960,7 @@
 
     move-result v2
 
-    iget v3, p2, Lcom/airbnb/lottie/c/b;->hO:I
+    iget v3, p2, Lcom/airbnb/lottie/c/b;->hP: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;->kY:Lcom/airbnb/lottie/a/b/a;
+    iget-object v4, p0, Lcom/airbnb/lottie/c/c/h;->kZ: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;->dS:Lcom/airbnb/lottie/d;
+    iget-object p2, p0, Lcom/airbnb/lottie/c/c/h;->dT:Lcom/airbnb/lottie/d;
 
-    iget-object p2, p2, Lcom/airbnb/lottie/d;->eg:Landroid/graphics/Rect;
+    iget-object p2, p2, Lcom/airbnb/lottie/d;->eh: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;->dS:Lcom/airbnb/lottie/d;
+    iget-object p3, p0, Lcom/airbnb/lottie/c/c/h;->dT:Lcom/airbnb/lottie/d;
 
-    iget-object p3, p3, Lcom/airbnb/lottie/d;->eg:Landroid/graphics/Rect;
+    iget-object p3, p3, Lcom/airbnb/lottie/d;->eh: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;->eT:Ljava/lang/Integer;
+    sget-object v0, Lcom/airbnb/lottie/j;->eU:Ljava/lang/Integer;
 
     if-ne p1, v0, :cond_0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/c/h;->gg:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/h;->gh: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;->eU:Ljava/lang/Integer;
+    sget-object v0, Lcom/airbnb/lottie/j;->eV:Ljava/lang/Integer;
 
     if-ne p1, v0, :cond_1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/c/h;->kW: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_1
 
@@ -1073,11 +1073,11 @@
     return-void
 
     :cond_1
-    sget-object v0, Lcom/airbnb/lottie/j;->fh:Ljava/lang/Float;
+    sget-object v0, Lcom/airbnb/lottie/j;->fi:Ljava/lang/Float;
 
     if-ne p1, v0, :cond_2
 
-    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;->kY: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;->fi:Ljava/lang/Float;
+    sget-object v0, Lcom/airbnb/lottie/j;->fj:Ljava/lang/Float;
 
     if-ne p1, v0, :cond_3
 
-    iget-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;
 
     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;->dJ:Lcom/airbnb/lottie/f;
+    iget-object v3, v0, Lcom/airbnb/lottie/c/c/h;->dK: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;->kV:Lcom/airbnb/lottie/a/b/n;
+    iget-object v3, v0, Lcom/airbnb/lottie/c/c/h;->kW: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;->dS:Lcom/airbnb/lottie/d;
+    iget-object v4, v0, Lcom/airbnb/lottie/c/c/h;->dT:Lcom/airbnb/lottie/d;
 
-    iget-object v4, v4, Lcom/airbnb/lottie/d;->eb:Ljava/util/Map;
+    iget-object v4, v4, Lcom/airbnb/lottie/d;->ec:Ljava/util/Map;
 
-    iget-object v5, v3, Lcom/airbnb/lottie/c/b;->hL:Ljava/lang/String;
+    iget-object v5, v3, Lcom/airbnb/lottie/c/b;->hM: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;->gg:Lcom/airbnb/lottie/a/b/a;
+    iget-object v5, v0, Lcom/airbnb/lottie/c/c/h;->gh: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;->kW: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_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;->gF:Lcom/airbnb/lottie/a/b/o;
+    iget-object v5, v0, Lcom/airbnb/lottie/c/c/h;->gG:Lcom/airbnb/lottie/a/b/o;
 
-    iget-object v5, v5, Lcom/airbnb/lottie/a/b/o;->hr:Lcom/airbnb/lottie/a/b/a;
+    iget-object v5, v5, Lcom/airbnb/lottie/a/b/o;->hs: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;->gF:Lcom/airbnb/lottie/a/b/o;
+    iget-object v5, v0, Lcom/airbnb/lottie/c/c/h;->gG:Lcom/airbnb/lottie/a/b/o;
 
-    iget-object v5, v5, Lcom/airbnb/lottie/a/b/o;->hr:Lcom/airbnb/lottie/a/b/a;
+    iget-object v5, v5, Lcom/airbnb/lottie/a/b/o;->hs: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;->kX:Lcom/airbnb/lottie/a/b/a;
+    iget-object v5, v0, Lcom/airbnb/lottie/c/c/h;->kY: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;->hR:D
+    iget-wide v7, v3, Lcom/airbnb/lottie/c/b;->hS: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;->dJ:Lcom/airbnb/lottie/f;
+    iget-object v5, v0, Lcom/airbnb/lottie/c/c/h;->dK: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;->hM:D
+    iget-wide v5, v3, Lcom/airbnb/lottie/c/b;->hN: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;->hP:D
+    iget-wide v8, v3, Lcom/airbnb/lottie/c/b;->hQ:D
 
     double-to-float v8, v8
 
@@ -1361,19 +1361,19 @@
 
     move-result v10
 
-    iget-object v13, v4, Lcom/airbnb/lottie/c/c;->hX:Ljava/lang/String;
+    iget-object v13, v4, Lcom/airbnb/lottie/c/c;->hY:Ljava/lang/String;
 
     move-object/from16 v16, v7
 
-    iget-object v7, v4, Lcom/airbnb/lottie/c/c;->hY:Ljava/lang/String;
+    iget-object v7, v4, Lcom/airbnb/lottie/c/c;->hZ: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;->dS:Lcom/airbnb/lottie/d;
+    iget-object v10, v0, Lcom/airbnb/lottie/c/c/h;->dT:Lcom/airbnb/lottie/d;
 
-    iget-object v10, v10, Lcom/airbnb/lottie/d;->ed:Landroidx/collection/SparseArrayCompat;
+    iget-object v10, v10, Lcom/airbnb/lottie/d;->ee: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;->ic:D
+    iget-wide v10, v7, Lcom/airbnb/lottie/c/d;->ie: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;->hN:I
+    iget v7, v3, Lcom/airbnb/lottie/c/b;->hO: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;->hX:Ljava/lang/String;
+    iget-object v11, v4, Lcom/airbnb/lottie/c/c;->hY:Ljava/lang/String;
 
-    iget-object v13, v4, Lcom/airbnb/lottie/c/c;->hY:Ljava/lang/String;
+    iget-object v13, v4, Lcom/airbnb/lottie/c/c;->hZ: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;->dS:Lcom/airbnb/lottie/d;
+    iget-object v11, v0, Lcom/airbnb/lottie/c/c/h;->dT:Lcom/airbnb/lottie/d;
 
-    iget-object v11, v11, Lcom/airbnb/lottie/d;->ed:Landroidx/collection/SparseArrayCompat;
+    iget-object v11, v11, Lcom/airbnb/lottie/d;->ee: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;->kT:Ljava/util/Map;
+    iget-object v11, v0, Lcom/airbnb/lottie/c/c/h;->kU: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;->kT:Ljava/util/Map;
+    iget-object v11, v0, Lcom/airbnb/lottie/c/c/h;->kU: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;->ia:Ljava/util/List;
+    iget-object v11, v8, Lcom/airbnb/lottie/c/d;->ib: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;->dJ:Lcom/airbnb/lottie/f;
+    iget-object v12, v0, Lcom/airbnb/lottie/c/c/h;->dK: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;->kT:Ljava/util/Map;
+    iget-object v9, v0, Lcom/airbnb/lottie/c/c/h;->kU: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;->hQ:D
+    iget-wide v13, v3, Lcom/airbnb/lottie/c/b;->hR: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;->hS:Z
+    iget-boolean v12, v3, Lcom/airbnb/lottie/c/b;->hT:Z
 
     if-eqz v12, :cond_a
 
@@ -1689,7 +1689,7 @@
     goto :goto_a
 
     :cond_b
-    iget-wide v8, v8, Lcom/airbnb/lottie/c/d;->ic:D
+    iget-wide v8, v8, Lcom/airbnb/lottie/c/d;->ie:D
 
     double-to-float v8, v8
 
@@ -1703,7 +1703,7 @@
 
     mul-float v8, v8, v6
 
-    iget v9, v3, Lcom/airbnb/lottie/c/b;->hO:I
+    iget v9, v3, Lcom/airbnb/lottie/c/b;->hP: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;->kY:Lcom/airbnb/lottie/a/b/a;
+    iget-object v11, v0, Lcom/airbnb/lottie/c/c/h;->kZ: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 bd13b6bb0b..9d373fe93c 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 hM:D
+.field private final hN:D
 
-.field private final hY:Ljava/lang/String;
+.field private final hZ:Ljava/lang/String;
 
-.field public final ia:Ljava/util/List;
+.field public final ib:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -20,9 +20,9 @@
     .end annotation
 .end field
 
-.field private final ib:C
+.field private final ic:C
 
-.field public final ic:D
+.field public final ie:D
 
 
 # direct methods
@@ -42,15 +42,15 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/airbnb/lottie/c/d;->ia:Ljava/util/List;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/d;->ib:Ljava/util/List;
 
-    iput-char p2, p0, Lcom/airbnb/lottie/c/d;->ib:C
+    iput-char p2, p0, Lcom/airbnb/lottie/c/d;->ic:C
 
-    iput-wide p3, p0, Lcom/airbnb/lottie/c/d;->hM:D
+    iput-wide p3, p0, Lcom/airbnb/lottie/c/d;->hN:D
 
-    iput-wide p5, p0, Lcom/airbnb/lottie/c/d;->ic:D
+    iput-wide p5, p0, Lcom/airbnb/lottie/c/d;->ie:D
 
-    iput-object p7, p0, Lcom/airbnb/lottie/c/d;->hY:Ljava/lang/String;
+    iput-object p7, p0, Lcom/airbnb/lottie/c/d;->hZ: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;->ib:C
+    iget-char v0, p0, Lcom/airbnb/lottie/c/d;->ic:C
 
     iget-object v1, p0, Lcom/airbnb/lottie/c/d;->fontFamily:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/airbnb/lottie/c/d;->hY:Ljava/lang/String;
+    iget-object v2, p0, Lcom/airbnb/lottie/c/d;->hZ: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 e50c25a539..66f62283ce 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 ie:Ljava/util/List;
+.field private final if:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -14,7 +14,7 @@
     .end annotation
 .end field
 
-.field public if:Lcom/airbnb/lottie/c/f;
+.field public ig: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;->ie:Ljava/util/List;
+    iget-object v1, p1, Lcom/airbnb/lottie/c/e;->if:Ljava/util/List;
 
     invoke-direct {v0, v1}, Ljava/util/ArrayList;-><init>(Ljava/util/Collection;)V
 
-    iput-object v0, p0, Lcom/airbnb/lottie/c/e;->ie:Ljava/util/List;
+    iput-object v0, p0, Lcom/airbnb/lottie/c/e;->if:Ljava/util/List;
 
-    iget-object p1, p1, Lcom/airbnb/lottie/c/e;->if:Lcom/airbnb/lottie/c/f;
+    iget-object p1, p1, 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;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/e;->ig: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;->ie:Ljava/util/List;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/e;->if: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;->ie:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/e;->if: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;->if:Lcom/airbnb/lottie/c/f;
+    iput-object p1, v0, Lcom/airbnb/lottie/c/e;->ig: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;->ie:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/e;->if: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;->ie:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/e;->if: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;->ie:Ljava/util/List;
+    iget-object p1, p0, Lcom/airbnb/lottie/c/e;->if: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;->ie:Ljava/util/List;
+    iget-object p1, p0, Lcom/airbnb/lottie/c/e;->if: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;->ie:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/e;->if: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;->ie:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/e;->if: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;->ie:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/e;->if: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;->ie:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/e;->if: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;->ie:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/e;->if: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;->ie:Ljava/util/List;
+    iget-object v3, p0, Lcom/airbnb/lottie/c/e;->if: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;->ie:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/e;->if: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;->ie:Ljava/util/List;
+    iget-object v3, p0, Lcom/airbnb/lottie/c/e;->if: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;->ie:Ljava/util/List;
+    iget-object p1, p0, Lcom/airbnb/lottie/c/e;->if: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;->ie:Ljava/util/List;
+    iget-object p1, p0, Lcom/airbnb/lottie/c/e;->if: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;->ie:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/e;->if: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;->ie:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/e;->if: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;->ie:Ljava/util/List;
+    iget-object p1, p0, Lcom/airbnb/lottie/c/e;->if: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;->ie:Ljava/util/List;
+    iget-object p1, p0, Lcom/airbnb/lottie/c/e;->if: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;->ie:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/e;->if: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;->if:Lcom/airbnb/lottie/c/f;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/e;->ig: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;->ie:Ljava/util/List;
+    iget-object v1, v0, Lcom/airbnb/lottie/c/e;->if: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 15228fb959..cfb3ecdb50 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 ig:Lcom/airbnb/lottie/c/g;
+.field private static final ih:Lcom/airbnb/lottie/c/g;
 
 
 # instance fields
-.field private final ih:Landroidx/collection/LruCache;
+.field private final ii: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;->ig:Lcom/airbnb/lottie/c/g;
+    sput-object v0, Lcom/airbnb/lottie/c/g;->ih: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;->ih:Landroidx/collection/LruCache;
+    iput-object v0, p0, Lcom/airbnb/lottie/c/g;->ii: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;->ig:Lcom/airbnb/lottie/c/g;
+    sget-object v0, Lcom/airbnb/lottie/c/g;->ih: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;->ih:Landroidx/collection/LruCache;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/g;->ii: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;->ih:Landroidx/collection/LruCache;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/g;->ii: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 d86485f6f4..2e0b2c2943 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 ii:Ljava/lang/String; = "\r"
+.field public static ij:Ljava/lang/String; = "\r"
 
 
 # instance fields
-.field public final eh:F
+.field public final ei:F
 
-.field public final ij:F
+.field public final ik: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;->ij:F
+    iput p3, p0, Lcom/airbnb/lottie/c/h;->ik:F
 
-    iput p2, p0, Lcom/airbnb/lottie/c/h;->eh:F
+    iput p2, p0, Lcom/airbnb/lottie/c/h;->ei: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 c1671c214b..efbefc843e 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 dX:Lcom/airbnb/lottie/m;
+.field public final dY:Lcom/airbnb/lottie/m;
 
-.field private final dY:Ljava/util/HashSet;
+.field private final dZ:Ljava/util/HashSet;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/HashSet<",
@@ -16,7 +16,7 @@
     .end annotation
 .end field
 
-.field public dZ:Ljava/util/Map;
+.field public ea:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -28,7 +28,7 @@
     .end annotation
 .end field
 
-.field public ea:Ljava/util/Map;
+.field public eb:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -39,7 +39,7 @@
     .end annotation
 .end field
 
-.field public eb:Ljava/util/Map;
+.field public ec:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -50,7 +50,7 @@
     .end annotation
 .end field
 
-.field public ec:Ljava/util/List;
+.field public ed:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -60,7 +60,7 @@
     .end annotation
 .end field
 
-.field public ed:Landroidx/collection/SparseArrayCompat;
+.field public ee:Landroidx/collection/SparseArrayCompat;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Landroidx/collection/SparseArrayCompat<",
@@ -70,7 +70,7 @@
     .end annotation
 .end field
 
-.field public ee:Landroidx/collection/LongSparseArray;
+.field public ef:Landroidx/collection/LongSparseArray;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Landroidx/collection/LongSparseArray<",
@@ -80,7 +80,7 @@
     .end annotation
 .end field
 
-.field public ef:Ljava/util/List;
+.field public eg:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -90,17 +90,17 @@
     .end annotation
 .end field
 
-.field public eg:Landroid/graphics/Rect;
-
-.field public eh:F
+.field public eh:Landroid/graphics/Rect;
 
 .field public ei:F
 
 .field public ej:F
 
-.field public ek:Z
+.field public ek:F
 
-.field el:I
+.field public el:Z
+
+.field em:I
 
 
 # direct methods
@@ -113,17 +113,17 @@
 
     invoke-direct {v0}, Lcom/airbnb/lottie/m;-><init>()V
 
-    iput-object v0, p0, Lcom/airbnb/lottie/d;->dX:Lcom/airbnb/lottie/m;
+    iput-object v0, p0, Lcom/airbnb/lottie/d;->dY: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;->dY:Ljava/util/HashSet;
+    iput-object v0, p0, Lcom/airbnb/lottie/d;->dZ:Ljava/util/HashSet;
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lcom/airbnb/lottie/d;->el:I
+    iput v0, p0, Lcom/airbnb/lottie/d;->em:I
 
     return-void
 .end method
@@ -137,7 +137,7 @@
 
     move-result v0
 
-    iget v1, p0, Lcom/airbnb/lottie/d;->ej:F
+    iget v1, p0, Lcom/airbnb/lottie/d;->ek:F
 
     div-float/2addr v0, v1
 
@@ -155,9 +155,9 @@
 .method public final aI()F
     .locals 2
 
-    iget v0, p0, Lcom/airbnb/lottie/d;->ei:F
+    iget v0, p0, Lcom/airbnb/lottie/d;->ej:F
 
-    iget v1, p0, Lcom/airbnb/lottie/d;->eh:F
+    iget v1, p0, Lcom/airbnb/lottie/d;->ei: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;->el:I
+    iget v0, p0, Lcom/airbnb/lottie/d;->em:I
 
     add-int/2addr v0, p1
 
-    iput v0, p0, Lcom/airbnb/lottie/d;->el:I
+    iput v0, p0, Lcom/airbnb/lottie/d;->em: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;->ee:Landroidx/collection/LongSparseArray;
+    iget-object v0, p0, Lcom/airbnb/lottie/d;->ef: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;->dY:Ljava/util/HashSet;
+    iget-object v0, p0, Lcom/airbnb/lottie/d;->dZ: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;->dX:Lcom/airbnb/lottie/m;
+    iget-object v0, p0, Lcom/airbnb/lottie/d;->dY: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;->ec:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/d;->ed: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;->ec:Ljava/util/List;
+    iget-object v2, p0, Lcom/airbnb/lottie/d;->ed: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;->ec:Ljava/util/List;
+    iget-object v2, p0, Lcom/airbnb/lottie/d;->ed: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;->ii:Ljava/lang/String;
+    sget-object v5, Lcom/airbnb/lottie/c/h;->ij: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;->ef:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/d;->eg: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 ca37496578..8113c3af4a 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 private static final synthetic ld:[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;
 
 
 # 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;->lb:Lcom/airbnb/lottie/d/a;
+    sput-object v0, Lcom/airbnb/lottie/d/a;->lc: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;->lc:Lcom/airbnb/lottie/d/a;
+    sput-object v0, Lcom/airbnb/lottie/d/a;->ld: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;->lb:Lcom/airbnb/lottie/d/a;
+    sget-object v3, Lcom/airbnb/lottie/d/a;->lc:Lcom/airbnb/lottie/d/a;
 
     aput-object v3, v0, v1
 
-    sget-object v1, Lcom/airbnb/lottie/d/a;->lc:Lcom/airbnb/lottie/d/a;
+    sget-object v1, Lcom/airbnb/lottie/d/a;->ld:Lcom/airbnb/lottie/d/a;
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lcom/airbnb/lottie/d/a;->ld:[Lcom/airbnb/lottie/d/a;
+    sput-object v0, Lcom/airbnb/lottie/d/a;->le:[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;->ld:[Lcom/airbnb/lottie/d/a;
+    sget-object v0, Lcom/airbnb/lottie/d/a;->le:[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 50b04a7aba..20caa2e72d 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 le:Landroid/content/Context;
+.field final lf: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;->le:Landroid/content/Context;
+    iput-object p1, p0, Lcom/airbnb/lottie/d/b;->lf: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;->le:Landroid/content/Context;
+    iget-object v1, p0, Lcom/airbnb/lottie/d/b;->lf: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;->le:Landroid/content/Context;
+    iget-object v3, p0, Lcom/airbnb/lottie/d/b;->lf: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;->lb:Lcom/airbnb/lottie/d/a;
+    sget-object v4, Lcom/airbnb/lottie/d/a;->lc: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;->le:Landroid/content/Context;
+    iget-object v3, p0, Lcom/airbnb/lottie/d/b;->lf: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;->ld: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;->lc:Lcom/airbnb/lottie/d/a;
+    sget-object v0, Lcom/airbnb/lottie/d/a;->ld:Lcom/airbnb/lottie/d/a;
 
     goto :goto_1
 
     :cond_3
-    sget-object v0, Lcom/airbnb/lottie/d/a;->lb:Lcom/airbnb/lottie/d/a;
+    sget-object v0, Lcom/airbnb/lottie/d/a;->lc: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 0501cc863c..65f6f16b11 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 le:Landroid/content/Context;
+.field private final lf:Landroid/content/Context;
 
-.field public final lf:Lcom/airbnb/lottie/d/b;
+.field public final lg: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;->le:Landroid/content/Context;
+    iput-object p1, p0, Lcom/airbnb/lottie/d/c;->lf: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;->le:Landroid/content/Context;
+    iget-object v0, p0, Lcom/airbnb/lottie/d/c;->lf: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;->lf:Lcom/airbnb/lottie/d/b;
+    iput-object p1, p0, Lcom/airbnb/lottie/d/c;->lg: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;->lb: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;->lf:Lcom/airbnb/lottie/d/b;
+    iget-object v2, p0, Lcom/airbnb/lottie/d/c;->lg: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;->lc:Lcom/airbnb/lottie/d/a;
+    sget-object v1, Lcom/airbnb/lottie/d/a;->ld:Lcom/airbnb/lottie/d/a;
 
-    iget-object v2, p0, Lcom/airbnb/lottie/d/c;->lf:Lcom/airbnb/lottie/d/b;
+    iget-object v2, p0, Lcom/airbnb/lottie/d/c;->lg: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;->lf:Lcom/airbnb/lottie/d/b;
+    iget-object v3, p0, Lcom/airbnb/lottie/d/c;->lg: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;->le:Landroid/content/Context;
+    iget-object v3, v3, Lcom/airbnb/lottie/d/b;->lf: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 65917a4ee5..b6d00c20e1 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 en:Ljava/lang/String;
+.field final synthetic eo: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;->en:Ljava/lang/String;
+    iput-object p2, p0, Lcom/airbnb/lottie/e$1;->eo: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;->en:Ljava/lang/String;
+    iget-object v1, p0, Lcom/airbnb/lottie/e$1;->eo: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;->lf:Lcom/airbnb/lottie/d/b;
+    iget-object v0, v2, Lcom/airbnb/lottie/d/c;->lg: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;->lc:Lcom/airbnb/lottie/d/a;
+    sget-object v3, Lcom/airbnb/lottie/d/a;->ld: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 b120229918..111d219ca1 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 eo:Ljava/lang/String;
+.field final synthetic ep:Ljava/lang/String;
 
 
 # direct methods
 .method constructor <init>(Ljava/lang/String;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/airbnb/lottie/e$2;->eo:Ljava/lang/String;
+    iput-object p1, p0, Lcom/airbnb/lottie/e$2;->ep: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;->eo:Ljava/lang/String;
+    iget-object v0, p0, Lcom/airbnb/lottie/e$2;->ep: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;->eo:Ljava/lang/String;
+    iget-object v1, p0, Lcom/airbnb/lottie/e$2;->ep: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;->eo:Ljava/lang/String;
+    iget-object v0, p0, Lcom/airbnb/lottie/e$2;->ep: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 3fbba1b4bf..c87f4ffbf5 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 eo:Ljava/lang/String;
+.field final synthetic ep:Ljava/lang/String;
 
 
 # direct methods
 .method constructor <init>(Ljava/lang/String;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/airbnb/lottie/e$3;->eo:Ljava/lang/String;
+    iput-object p1, p0, Lcom/airbnb/lottie/e$3;->ep: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;->eo:Ljava/lang/String;
+    iget-object v0, p0, Lcom/airbnb/lottie/e$3;->ep: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 7ad0b6a334..759da436d7 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 ep:Ljava/lang/String;
+.field final synthetic eq: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;->ep:Ljava/lang/String;
+    iput-object p2, p0, Lcom/airbnb/lottie/e$4;->eq: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;->ep:Ljava/lang/String;
+    iget-object v1, p0, Lcom/airbnb/lottie/e$4;->eq: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 c92b092089..e9be354b7e 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 eq:I
+.field final synthetic er: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;->eq:I
+    iput p2, p0, Lcom/airbnb/lottie/e$5;->er: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;->eq:I
+    iget v1, p0, Lcom/airbnb/lottie/e$5;->er: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 5d47eaa330..f880fd701d 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 eo:Ljava/lang/String;
+.field final synthetic ep:Ljava/lang/String;
 
-.field final synthetic er:Lcom/airbnb/lottie/e/a/c;
+.field final synthetic es: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;->er:Lcom/airbnb/lottie/e/a/c;
+    iput-object p1, p0, Lcom/airbnb/lottie/e$6;->es:Lcom/airbnb/lottie/e/a/c;
 
-    iput-object p2, p0, Lcom/airbnb/lottie/e$6;->eo:Ljava/lang/String;
+    iput-object p2, p0, Lcom/airbnb/lottie/e$6;->ep: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;->er:Lcom/airbnb/lottie/e/a/c;
+    iget-object v0, p0, Lcom/airbnb/lottie/e$6;->es:Lcom/airbnb/lottie/e/a/c;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/e$6;->eo:Ljava/lang/String;
+    iget-object v1, p0, Lcom/airbnb/lottie/e$6;->ep: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 2f75833508..2565f60e7b 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 es:Lcom/airbnb/lottie/d;
+.field final synthetic et: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;->es:Lcom/airbnb/lottie/d;
+    iput-object p1, p0, Lcom/airbnb/lottie/e$7;->et: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;->es:Lcom/airbnb/lottie/d;
+    iget-object v1, p0, Lcom/airbnb/lottie/e$7;->et: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 78928497b9..b6fb41ee4d 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 em:Ljava/util/Map;
+.field private static final en: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;->em:Ljava/util/Map;
+    sput-object v0, Lcom/airbnb/lottie/e;->en: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;->ea:Ljava/util/Map;
+    iget-object p0, p0, Lcom/airbnb/lottie/d;->eb: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;->eQ:Ljava/lang/String;
+    iget-object v1, v0, Lcom/airbnb/lottie/g;->eR: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;->em:Ljava/util/Map;
+    sget-object v0, Lcom/airbnb/lottie/e;->en: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;->em:Ljava/util/Map;
+    sget-object p1, Lcom/airbnb/lottie/e;->en: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;->em:Ljava/util/Map;
+    sget-object p1, Lcom/airbnb/lottie/e;->en: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;->em:Ljava/util/Map;
+    sget-object v0, Lcom/airbnb/lottie/e;->en:Ljava/util/Map;
 
     return-object v0
 .end method
@@ -660,12 +660,12 @@
 
     move-result-object v0
 
-    iput-object v0, v1, Lcom/airbnb/lottie/g;->eS:Landroid/graphics/Bitmap;
+    iput-object v0, v1, Lcom/airbnb/lottie/g;->eT:Landroid/graphics/Bitmap;
 
     goto :goto_2
 
     :cond_6
-    iget-object p0, v3, Lcom/airbnb/lottie/d;->ea:Ljava/util/Map;
+    iget-object p0, v3, Lcom/airbnb/lottie/d;->eb: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;->eS:Landroid/graphics/Bitmap;
+    iget-object v1, v1, Lcom/airbnb/lottie/g;->eT: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;->eQ:Ljava/lang/String;
+    iget-object v0, v0, Lcom/airbnb/lottie/g;->eR: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 2bd2cc3e70..f31328d690 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 lg:Lcom/airbnb/lottie/e/a/c$a;
+.field private static lh: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;->lg:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/a;->lh: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;->lI:Lcom/airbnb/lottie/e/a/c$b;
+    sget-object v2, Lcom/airbnb/lottie/e/a/c$b;->lJ: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;->lK:Lcom/airbnb/lottie/e/a/c$b;
+    sget-object v2, Lcom/airbnb/lottie/e/a/c$b;->lL: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;->lA:Lcom/airbnb/lottie/e/w;
+    sget-object v3, Lcom/airbnb/lottie/e/w;->lB: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;->lL:Lcom/airbnb/lottie/e/a/c$b;
+    sget-object v6, Lcom/airbnb/lottie/e/a/c$b;->lM:Lcom/airbnb/lottie/e/a/c$b;
 
     if-eq v5, v6, :cond_5
 
-    sget-object v5, Lcom/airbnb/lottie/e/a;->lg:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v5, Lcom/airbnb/lottie/e/a;->lh: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;->lN:Lcom/airbnb/lottie/e/a/c$b;
+    sget-object v6, Lcom/airbnb/lottie/e/a/c$b;->lO: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;->lN:Lcom/airbnb/lottie/e/a/c$b;
+    sget-object v6, Lcom/airbnb/lottie/e/a/c$b;->lO: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 873fea0502..e50377282e 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 lG:[Ljava/lang/String;
+.field final lH:[Ljava/lang/String;
 
-.field final lH:Lokio/k;
+.field final lI: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;->lG:[Ljava/lang/String;
+    iput-object p1, p0, Lcom/airbnb/lottie/e/a/c$a;->lH:[Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/airbnb/lottie/e/a/c$a;->lH:Lokio/k;
+    iput-object p2, p0, Lcom/airbnb/lottie/e/a/c$a;->lI:Lokio/k;
 
     return-void
 .end method
@@ -58,7 +58,7 @@
 
     invoke-virtual {v1}, Lokio/c;->readByte()B
 
-    invoke-virtual {v1}, Lokio/c;->Gs()Lokio/ByteString;
+    invoke-virtual {v1}, Lokio/c;->Gq()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 4ce2ef3c44..2e66f49211 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,8 +23,6 @@
 
 
 # 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;
@@ -43,7 +41,9 @@
 
 .field public static final enum lR:Lcom/airbnb/lottie/e/a/c$b;
 
-.field private static final synthetic lS:[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;
 
 
 # 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;->lI: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;
 
@@ -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;->lJ: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;
 
@@ -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;->lK: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;
 
@@ -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;->lL: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;
 
@@ -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;->lM: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;
 
@@ -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;->lN: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;
 
@@ -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;->lO: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;
 
@@ -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;->lP: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;
 
@@ -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;->lQ: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;
 
     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;->lR: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;
 
     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;->lI: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;
 
     aput-object v11, v0, v1
 
-    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;->lK:Lcom/airbnb/lottie/e/a/c$b;
 
     aput-object v1, v0, v2
 
-    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;->lL:Lcom/airbnb/lottie/e/a/c$b;
 
     aput-object v1, v0, v3
 
-    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;->lM:Lcom/airbnb/lottie/e/a/c$b;
 
     aput-object v1, v0, v4
 
-    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;->lN:Lcom/airbnb/lottie/e/a/c$b;
 
     aput-object v1, v0, v5
 
-    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;->lO:Lcom/airbnb/lottie/e/a/c$b;
 
     aput-object v1, v0, v6
 
-    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;->lP:Lcom/airbnb/lottie/e/a/c$b;
 
     aput-object v1, v0, v7
 
-    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;->lQ:Lcom/airbnb/lottie/e/a/c$b;
 
     aput-object v1, v0, v8
 
-    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;->lR:Lcom/airbnb/lottie/e/a/c$b;
 
     aput-object v1, v0, v9
 
-    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;->lS:Lcom/airbnb/lottie/e/a/c$b;
 
     aput-object v1, v0, v10
 
-    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;->lT:[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;->lS:[Lcom/airbnb/lottie/e/a/c$b;
+    sget-object v0, Lcom/airbnb/lottie/e/a/c$b;->lT:[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 45b5ca6eb6..1d34095e85 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 lE:[I
+.field lF:[I
 
-.field lF:Z
+.field lG:Z
 
 .field lenient:Z
 
@@ -133,7 +133,7 @@
 
     new-array v1, v0, [I
 
-    iput-object v1, p0, Lcom/airbnb/lottie/e/a/c;->lE:[I
+    iput-object v1, p0, Lcom/airbnb/lottie/e/a/c;->lF:[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;->lE:[I
+    iget-object v1, p0, Lcom/airbnb/lottie/e/a/c;->lF:[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;->lE:[I
+    iget-object v1, p0, Lcom/airbnb/lottie/e/a/c;->lF:[I
 
     array-length v2, v1
 
@@ -373,7 +373,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/airbnb/lottie/e/a/c;->lE:[I
+    iput-object v0, p0, Lcom/airbnb/lottie/e/a/c;->lF:[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;->lE:[I
+    iget-object v0, p0, Lcom/airbnb/lottie/e/a/c;->lF:[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 8b2782ccdd..d277a74b4d 100644
--- a/com.discord/smali/com/airbnb/lottie/e/a/e.smali
+++ b/com.discord/smali/com/airbnb/lottie/e/a/e.smali
@@ -4,8 +4,6 @@
 
 
 # static fields
-.field private static final lT:Lokio/ByteString;
-
 .field private static final lU:Lokio/ByteString;
 
 .field private static final lV:Lokio/ByteString;
@@ -14,11 +12,13 @@
 
 .field private static final lX:Lokio/ByteString;
 
+.field private static final lY:Lokio/ByteString;
+
 
 # instance fields
-.field private final lY:Lokio/d;
+.field private final lZ:Lokio/d;
 
-.field private final lZ:Lokio/c;
+.field private final ma:Lokio/c;
 
 .field private peeked:I
 
@@ -39,7 +39,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/e/a/e;->lT:Lokio/ByteString;
+    sput-object v0, Lcom/airbnb/lottie/e/a/e;->lU:Lokio/ByteString;
 
     const-string v0, "\"\\"
 
@@ -47,7 +47,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;->lV: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;->lV:Lokio/ByteString;
+    sput-object v0, Lcom/airbnb/lottie/e/a/e;->lW:Lokio/ByteString;
 
     const-string v0, "\n\r"
 
@@ -63,7 +63,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;->lX:Lokio/ByteString;
 
     const-string v0, "*/"
 
@@ -71,7 +71,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;->lY: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;->lY:Lokio/d;
+    iput-object p1, p0, Lcom/airbnb/lottie/e/a/e;->lZ:Lokio/d;
 
-    invoke-interface {p1}, Lokio/d;->Hg()Lokio/c;
+    invoke-interface {p1}, Lokio/d;->He()Lokio/c;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/airbnb/lottie/e/a/e;->lZ:Lokio/c;
+    iput-object p1, p0, Lcom/airbnb/lottie/e/a/e;->ma: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;->lG:[Ljava/lang/String;
+    iget-object v0, p2, Lcom/airbnb/lottie/e/a/c$a;->lH:[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;->lG:[Ljava/lang/String;
+    iget-object v3, p2, Lcom/airbnb/lottie/e/a/c$a;->lH:[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;->lY:Lokio/d;
+    iget-object v1, p0, Lcom/airbnb/lottie/e/a/e;->lZ: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;->lZ:Lokio/c;
+    iget-object v3, p0, Lcom/airbnb/lottie/e/a/e;->ma: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;->lZ:Lokio/c;
+    iget-object v3, p0, Lcom/airbnb/lottie/e/a/e;->ma: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;->lZ:Lokio/c;
+    iget-object v1, p0, Lcom/airbnb/lottie/e/a/e;->ma: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;->lZ:Lokio/c;
+    iget-object p1, p0, Lcom/airbnb/lottie/e/a/e;->ma: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;->lZ:Lokio/c;
+    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->ma:Lokio/c;
 
     invoke-virtual {v0}, Lokio/c;->readByte()B
 
     return-object p1
 
     :cond_2
-    iget-object p1, p0, Lcom/airbnb/lottie/e/a/e;->lZ:Lokio/c;
+    iget-object p1, p0, Lcom/airbnb/lottie/e/a/e;->ma: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;->lZ:Lokio/c;
+    iget-object p1, p0, Lcom/airbnb/lottie/e/a/e;->ma: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;->lY:Lokio/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->lZ: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;->lZ:Lokio/c;
+    iget-object v2, p0, Lcom/airbnb/lottie/e/a/e;->ma: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;->lZ:Lokio/c;
+    iget-object v2, p0, Lcom/airbnb/lottie/e/a/e;->ma: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;->lZ:Lokio/c;
+    iget-object p1, p0, Lcom/airbnb/lottie/e/a/e;->ma:Lokio/c;
 
     add-long/2addr v0, v4
 
@@ -344,9 +344,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->lY:Lokio/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->lZ:Lokio/d;
 
-    sget-object v1, Lcom/airbnb/lottie/e/a/e;->lX:Lokio/ByteString;
+    sget-object v1, Lcom/airbnb/lottie/e/a/e;->lY: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;->lZ:Lokio/c;
+    iget-object v3, p0, Lcom/airbnb/lottie/e/a/e;->ma:Lokio/c;
 
     if-eqz v2, :cond_1
 
-    sget-object v4, Lcom/airbnb/lottie/e/a/e;->lX:Lokio/ByteString;
+    sget-object v4, Lcom/airbnb/lottie/e/a/e;->lY: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;->lE:[I
+    iget-object v1, v0, Lcom/airbnb/lottie/e/a/e;->lF:[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;->lE:[I
+    iget-object v15, v0, Lcom/airbnb/lottie/e/a/e;->lF:[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;->lZ:Lokio/c;
+    iget-object v15, v0, Lcom/airbnb/lottie/e/a/e;->ma: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;->lE:[I
+    iget-object v15, v0, Lcom/airbnb/lottie/e/a/e;->lF:[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;->lZ:Lokio/c;
+    iget-object v14, v0, Lcom/airbnb/lottie/e/a/e;->ma: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;->lY:Lokio/d;
+    iget-object v6, v0, Lcom/airbnb/lottie/e/a/e;->lZ: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;->lZ:Lokio/c;
+    iget-object v6, v0, Lcom/airbnb/lottie/e/a/e;->ma: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;->lZ:Lokio/c;
+    iget-object v6, v0, Lcom/airbnb/lottie/e/a/e;->ma: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;->lE:[I
+    iget-object v6, v0, Lcom/airbnb/lottie/e/a/e;->lF:[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;->lZ:Lokio/c;
+    iget-object v1, v0, Lcom/airbnb/lottie/e/a/e;->ma: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;->lZ:Lokio/c;
+    iget-object v1, v0, Lcom/airbnb/lottie/e/a/e;->ma: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;->lZ:Lokio/c;
+    iget-object v1, v0, Lcom/airbnb/lottie/e/a/e;->ma: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;->lZ:Lokio/c;
+    iget-object v1, v0, Lcom/airbnb/lottie/e/a/e;->ma: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;->lZ:Lokio/c;
+    iget-object v1, v0, Lcom/airbnb/lottie/e/a/e;->ma: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;->lZ:Lokio/c;
+    iget-object v1, v0, Lcom/airbnb/lottie/e/a/e;->ma: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;->lE:[I
+    iget-object v2, v0, Lcom/airbnb/lottie/e/a/e;->lF:[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;->lZ:Lokio/c;
+    iget-object v5, v0, Lcom/airbnb/lottie/e/a/e;->ma: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;->lZ:Lokio/c;
+    iget-object v1, v0, Lcom/airbnb/lottie/e/a/e;->ma: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;->lZ:Lokio/c;
+    iget-object v1, v0, Lcom/airbnb/lottie/e/a/e;->ma: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;->lZ:Lokio/c;
+    iget-object v1, v0, Lcom/airbnb/lottie/e/a/e;->ma: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;->lY:Lokio/d;
+    iget-object v2, p0, Lcom/airbnb/lottie/e/a/e;->lZ: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;->lZ:Lokio/c;
+    iget-object v2, p0, Lcom/airbnb/lottie/e/a/e;->ma: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;->lZ:Lokio/c;
+    iget-object v2, p0, Lcom/airbnb/lottie/e/a/e;->ma: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;->lY:Lokio/d;
+    iget-object v3, p0, Lcom/airbnb/lottie/e/a/e;->lZ: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;->lZ:Lokio/c;
+    iget-object v3, p0, Lcom/airbnb/lottie/e/a/e;->ma: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;->lZ:Lokio/c;
+    iget-object v1, p0, Lcom/airbnb/lottie/e/a/e;->ma:Lokio/c;
 
     invoke-virtual {v1}, Lokio/c;->readByte()B
 
-    iget-object v1, p0, Lcom/airbnb/lottie/e/a/e;->lZ:Lokio/c;
+    iget-object v1, p0, Lcom/airbnb/lottie/e/a/e;->ma: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;->lZ:Lokio/c;
+    iget-object v1, p0, Lcom/airbnb/lottie/e/a/e;->ma:Lokio/c;
 
     invoke-virtual {v1}, Lokio/c;->readByte()B
 
-    iget-object v1, p0, Lcom/airbnb/lottie/e/a/e;->lZ:Lokio/c;
+    iget-object v1, p0, Lcom/airbnb/lottie/e/a/e;->ma: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;->lY:Lokio/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->lZ:Lokio/d;
 
-    sget-object v1, Lcom/airbnb/lottie/e/a/e;->lV:Lokio/ByteString;
+    sget-object v1, Lcom/airbnb/lottie/e/a/e;->lW: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;->lZ:Lokio/c;
+    iget-object v2, p0, Lcom/airbnb/lottie/e/a/e;->ma: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;->lZ:Lokio/c;
+    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->ma:Lokio/c;
 
-    invoke-virtual {v0}, Lokio/c;->Ho()Ljava/lang/String;
+    invoke-virtual {v0}, Lokio/c;->Hm()Ljava/lang/String;
 
     move-result-object v0
 
@@ -1211,7 +1211,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->lZ:Lokio/c;
+    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->ma: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;->lY:Lokio/d;
+    iget-object v6, p0, Lcom/airbnb/lottie/e/a/e;->lZ: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;->lZ:Lokio/c;
+    iget-object v6, p0, Lcom/airbnb/lottie/e/a/e;->ma: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;->lY:Lokio/d;
+    iget-object v2, p0, Lcom/airbnb/lottie/e/a/e;->lZ: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;->lZ:Lokio/c;
+    iget-object v2, p0, Lcom/airbnb/lottie/e/a/e;->ma: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;->lZ:Lokio/c;
+    iget-object v1, p0, Lcom/airbnb/lottie/e/a/e;->ma: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;->lY:Lokio/d;
+    iget-object v11, v0, Lcom/airbnb/lottie/e/a/e;->lZ: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;->lZ:Lokio/c;
+    iget-object v11, v0, Lcom/airbnb/lottie/e/a/e;->ma: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;->lZ:Lokio/c;
+    iget-object v1, v0, Lcom/airbnb/lottie/e/a/e;->ma:Lokio/c;
 
     int-to-long v2, v5
 
@@ -1712,7 +1712,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->lY:Lokio/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->lZ: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;->lZ:Lokio/c;
+    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->ma: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;->lY:Lokio/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->lZ: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;->lZ:Lokio/c;
+    iget-object v6, p0, Lcom/airbnb/lottie/e/a/e;->ma: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;->lZ:Lokio/c;
+    iget-object v1, p0, Lcom/airbnb/lottie/e/a/e;->ma: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;->lZ:Lokio/c;
+    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->ma: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;->lY:Lokio/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->lZ:Lokio/d;
 
-    sget-object v1, Lcom/airbnb/lottie/e/a/e;->lW:Lokio/ByteString;
+    sget-object v1, Lcom/airbnb/lottie/e/a/e;->lX: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;->lZ:Lokio/c;
+    iget-object v2, p0, Lcom/airbnb/lottie/e/a/e;->ma:Lokio/c;
 
     const-wide/16 v3, -0x1
 
@@ -2028,15 +2028,15 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->lY:Lokio/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->lZ:Lokio/d;
 
-    sget-object v1, Lcom/airbnb/lottie/e/a/e;->lV: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;->lZ:Lokio/c;
+    iget-object v2, p0, Lcom/airbnb/lottie/e/a/e;->ma: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;->lY:Lokio/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->lZ:Lokio/d;
 
-    iget-object v3, p1, Lcom/airbnb/lottie/e/a/c$a;->lH:Lokio/k;
+    iget-object v3, p1, Lcom/airbnb/lottie/e/a/c$a;->lI: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;->lG:[Ljava/lang/String;
+    iget-object p1, p1, Lcom/airbnb/lottie/e/a/c$a;->lH:[Ljava/lang/String;
 
     aget-object p1, p1, v0
 
@@ -2329,52 +2329,52 @@
     throw v0
 
     :pswitch_0
-    sget-object v0, Lcom/airbnb/lottie/e/a/c$b;->lR: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;
 
     return-object v0
 
     :pswitch_1
-    sget-object v0, Lcom/airbnb/lottie/e/a/c$b;->lO:Lcom/airbnb/lottie/e/a/c$b;
-
-    return-object v0
-
-    :pswitch_2
-    sget-object v0, Lcom/airbnb/lottie/e/a/c$b;->lM:Lcom/airbnb/lottie/e/a/c$b;
-
-    return-object v0
-
-    :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_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;
+
+    return-object v0
+
     :pswitch_6
-    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;->lK: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;
+    sget-object v0, Lcom/airbnb/lottie/e/a/c$b;->lJ: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;
+    sget-object v0, Lcom/airbnb/lottie/e/a/c$b;->lM: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;
+    sget-object v0, Lcom/airbnb/lottie/e/a/c$b;->lL:Lcom/airbnb/lottie/e/a/c$b;
 
     return-object v0
 
@@ -2411,7 +2411,7 @@
         }
     .end annotation
 
-    iget-boolean v0, p0, Lcom/airbnb/lottie/e/a/e;->lF:Z
+    iget-boolean v0, p0, Lcom/airbnb/lottie/e/a/e;->lG: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;->lU:Lokio/ByteString;
+    sget-object v0, Lcom/airbnb/lottie/e/a/e;->lV: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;->lT: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
 
@@ -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;->lE:[I
+    iget-object v1, p0, Lcom/airbnb/lottie/e/a/e;->lF:[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;->lZ:Lokio/c;
+    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->ma:Lokio/c;
 
     invoke-virtual {v0}, Lokio/c;->clear()V
 
-    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->lY:Lokio/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->lZ: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;->lZ:Lokio/c;
+    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->ma: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;->lU:Lokio/ByteString;
+    sget-object v0, Lcom/airbnb/lottie/e/a/e;->lV: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;->lT: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;
 
@@ -3214,7 +3214,7 @@
 
     if-ne v0, v1, :cond_3
 
-    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->lZ:Lokio/c;
+    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->ma: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;->lU:Lokio/ByteString;
+    sget-object v0, Lcom/airbnb/lottie/e/a/e;->lV: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;->lT: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;
 
@@ -3448,7 +3448,7 @@
 
     if-ne v0, v1, :cond_2
 
-    sget-object v0, Lcom/airbnb/lottie/e/a/e;->lU:Lokio/ByteString;
+    sget-object v0, Lcom/airbnb/lottie/e/a/e;->lV: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;->lT: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;
 
@@ -3557,7 +3557,7 @@
 
     if-ne v0, v1, :cond_2
 
-    sget-object v0, Lcom/airbnb/lottie/e/a/e;->lU:Lokio/ByteString;
+    sget-object v0, Lcom/airbnb/lottie/e/a/e;->lV: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;->lT: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;
 
@@ -3609,7 +3609,7 @@
 
     if-ne v0, v1, :cond_6
 
-    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->lZ:Lokio/c;
+    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->ma: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;->lF:Z
+    iget-boolean v0, p0, Lcom/airbnb/lottie/e/a/e;->lG: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;->lZ:Lokio/c;
+    iget-object v2, p0, Lcom/airbnb/lottie/e/a/e;->ma: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;->lT: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
 
@@ -3908,7 +3908,7 @@
 
     :cond_e
     :goto_2
-    sget-object v2, Lcom/airbnb/lottie/e/a/e;->lU:Lokio/ByteString;
+    sget-object v2, Lcom/airbnb/lottie/e/a/e;->lV: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;->lY:Lokio/d;
+    iget-object v1, p0, Lcom/airbnb/lottie/e/a/e;->lZ: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 2f856edbef..61f2671529 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 lg:Lcom/airbnb/lottie/e/a/c$a;
+.field private static lh: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;->lg:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/aa;->lh: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;->lg:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v1, Lcom/airbnb/lottie/e/aa;->lh: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 c25b5784ed..eaab29ea4c 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 lC:Lcom/airbnb/lottie/e/ab;
+.field public static final lD: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;->lC:Lcom/airbnb/lottie/e/ab;
+    sput-object v0, Lcom/airbnb/lottie/e/ab;->lD: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;->lI: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;
 
     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 15f359b78e..8c63d470ec 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 lD:Lcom/airbnb/lottie/e/ac;
+.field public static final lE:Lcom/airbnb/lottie/e/ac;
 
-.field private static final lg:Lcom/airbnb/lottie/e/a/c$a;
+.field private static final lh: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;->lD:Lcom/airbnb/lottie/e/ac;
+    sput-object v0, Lcom/airbnb/lottie/e/ac;->lE: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;->lg:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/ac;->lh: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;->lI: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;
 
     if-ne v0, v1, :cond_0
 
@@ -120,7 +120,7 @@
 
     if-eqz v5, :cond_5
 
-    sget-object v5, Lcom/airbnb/lottie/e/ac;->lg:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v5, Lcom/airbnb/lottie/e/ac;->lh: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;->lJ:Lcom/airbnb/lottie/e/a/c$b;
+    sget-object v5, Lcom/airbnb/lottie/e/a/c$b;->lK: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 c1038a91f5..de28f26580 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 lg:Lcom/airbnb/lottie/e/a/c$a;
+.field private static final lh: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;->lg:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/ad;->lh: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;->lg:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v2, Lcom/airbnb/lottie/e/ad;->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
 
diff --git a/com.discord/smali/com/airbnb/lottie/e/ae.smali b/com.discord/smali/com/airbnb/lottie/e/ae.smali
index 38e955d64f..de21e8946b 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 lg:Lcom/airbnb/lottie/e/a/c$a;
+.field private static lh: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;->lg:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/ae;->lh: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;->lg:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v3, Lcom/airbnb/lottie/e/ae;->lh: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 0ed9e3e56c..94bdbe3465 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 lg:Lcom/airbnb/lottie/e/a/c$a;
+.field static lh: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;->lg:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/af;->lh: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;->lg:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v4, Lcom/airbnb/lottie/e/af;->lh: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 b97b71ccd0..a52014ad46 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 lg:Lcom/airbnb/lottie/e/a/c$a;
+.field private static lh: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
@@ -75,7 +75,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/e/ag;->lg:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/ag;->lh: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;->lq:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/ag;->lr: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;->lg:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v14, Lcom/airbnb/lottie/e/ag;->lh: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;->lq:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v2, Lcom/airbnb/lottie/e/ag;->lr: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;->ek:Z
+    iput-boolean v14, v1, Lcom/airbnb/lottie/d;->el: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 0d307d5730..bd239e1532 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 lg:Lcom/airbnb/lottie/e/a/c$a;
+.field private static lh: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;->lg:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/ah;->lh: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;->lg:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v0, Lcom/airbnb/lottie/e/ah;->lh: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 f0d12d9d09..e0419dd4aa 100644
--- a/com.discord/smali/com/airbnb/lottie/e/b.smali
+++ b/com.discord/smali/com/airbnb/lottie/e/b.smali
@@ -4,10 +4,10 @@
 
 
 # static fields
-.field private static lh:Lcom/airbnb/lottie/e/a/c$a;
-
 .field private static li:Lcom/airbnb/lottie/e/a/c$a;
 
+.field private static lj:Lcom/airbnb/lottie/e/a/c$a;
+
 
 # direct methods
 .method static constructor <clinit>()V
@@ -27,7 +27,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/airbnb/lottie/e/b;->lh:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v1, Lcom/airbnb/lottie/e/b;->li: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;->li:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/b;->lj: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;->lh:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v2, Lcom/airbnb/lottie/e/b;->li: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;->li:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v5, Lcom/airbnb/lottie/e/b;->lj: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 95b5bad0f2..846cea1f3f 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 lg: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 lk: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;->lg:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/c;->lh: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;->lj:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/c;->lk: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;->lK:Lcom/airbnb/lottie/e/a/c$b;
+    sget-object v2, Lcom/airbnb/lottie/e/a/c$b;->lL: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;->lg:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v2, Lcom/airbnb/lottie/e/c;->lh: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;->ei:F
+    iget v1, v8, Lcom/airbnb/lottie/d;->ej: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;->mr:Ljava/lang/Object;
+    iget-object v1, v1, Lcom/airbnb/lottie/g/a;->ms:Ljava/lang/Object;
 
     if-nez v1, :cond_3
 
@@ -306,7 +306,7 @@
 
     const/4 v6, 0x0
 
-    iget v1, v8, Lcom/airbnb/lottie/d;->ei:F
+    iget v1, v8, Lcom/airbnb/lottie/d;->ej: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;->lC:Lcom/airbnb/lottie/e/ab;
+    sget-object v2, Lcom/airbnb/lottie/e/ab;->lD: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;->lj:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v2, Lcom/airbnb/lottie/e/c;->lk: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;->mr:Ljava/lang/Object;
+    iget-object v0, v0, Lcom/airbnb/lottie/g/a;->ms: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;->mr:Ljava/lang/Object;
+    iget-object v0, v0, Lcom/airbnb/lottie/g/a;->ms: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;->mr:Ljava/lang/Object;
+    iget-object v0, v0, Lcom/airbnb/lottie/g/a;->ms: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;->mr:Ljava/lang/Object;
+    iget-object v0, v0, Lcom/airbnb/lottie/g/a;->ms: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;->mr:Ljava/lang/Object;
+    iget-object v0, v0, Lcom/airbnb/lottie/g/a;->ms: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;->mr:Ljava/lang/Object;
+    iget-object v0, v0, Lcom/airbnb/lottie/g/a;->ms: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 3ed5e111cb..9b52bba0ef 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;->lm:Lcom/airbnb/lottie/e/i;
+    sget-object v1, Lcom/airbnb/lottie/e/i;->ln: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;->lr:Lcom/airbnb/lottie/e/o;
+    sget-object v1, Lcom/airbnb/lottie/e/o;->ls: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;->lB:Lcom/airbnb/lottie/e/x;
+    sget-object v2, Lcom/airbnb/lottie/e/x;->lC: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;->lD:Lcom/airbnb/lottie/e/ac;
+    sget-object v2, Lcom/airbnb/lottie/e/ac;->lE: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;->lk:Lcom/airbnb/lottie/e/f;
+    sget-object v1, Lcom/airbnb/lottie/e/f;->ll: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 81cf7ce91a..d303c37375 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 lg:Lcom/airbnb/lottie/e/a/c$a;
+.field private static lh: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;->lg:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/e;->lh: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;->lg:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object p2, Lcom/airbnb/lottie/e/e;->lh: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 93538e1e38..cab6ba13eb 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 lk:Lcom/airbnb/lottie/e/f;
+.field public static final ll: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;->lk:Lcom/airbnb/lottie/e/f;
+    sput-object v0, Lcom/airbnb/lottie/e/f;->ll: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;->lI:Lcom/airbnb/lottie/e/a/c$b;
+    sget-object v0, Lcom/airbnb/lottie/e/a/c$b;->lJ: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 2421795706..ec4cc75217 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 lg:Lcom/airbnb/lottie/e/a/c$a;
+.field private static lh: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;->lg:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/g;->lh: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;->lg:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v2, Lcom/airbnb/lottie/e/g;->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
 
diff --git a/com.discord/smali/com/airbnb/lottie/e/h.smali b/com.discord/smali/com/airbnb/lottie/e/h.smali
index c3c3334369..d5df1c20cc 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 lg:Lcom/airbnb/lottie/e/a/c$a;
+.field private static final lh:Lcom/airbnb/lottie/e/a/c$a;
 
-.field public static final ll:Lcom/airbnb/lottie/e/h;
+.field public static final lm: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;->ll:Lcom/airbnb/lottie/e/h;
+    sput-object v0, Lcom/airbnb/lottie/e/h;->lm: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;->lg:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/h;->lh: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;->hV:I
+    sget v0, Lcom/airbnb/lottie/c/b$a;->hW: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;->lg:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v0, Lcom/airbnb/lottie/e/h;->lh: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;->hV:I
+    sget v3, Lcom/airbnb/lottie/c/b$a;->hW:I
 
     sub-int/2addr v3, v1
 
@@ -262,7 +262,7 @@
 
     :cond_1
     :goto_1
-    sget v11, Lcom/airbnb/lottie/c/b$a;->hV:I
+    sget v11, Lcom/airbnb/lottie/c/b$a;->hW: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 23226a0a04..d78b7b59bd 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 lm:Lcom/airbnb/lottie/e/i;
+.field public static final ln: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;->lm:Lcom/airbnb/lottie/e/i;
+    sput-object v0, Lcom/airbnb/lottie/e/i;->ln: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 f61dc06c6f..47cc622cdd 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 lg:Lcom/airbnb/lottie/e/a/c$a;
+.field private static final lh:Lcom/airbnb/lottie/e/a/c$a;
 
-.field private static final ln:Lcom/airbnb/lottie/e/a/c$a;
+.field private static final lo: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;->lg:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/j;->lh: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;->ln:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/j;->lo: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;->lg:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v0, Lcom/airbnb/lottie/e/j;->lh: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;->ln:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v0, Lcom/airbnb/lottie/e/j;->lo: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 d5055fdf17..31c9fae057 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 lg:Lcom/airbnb/lottie/e/a/c$a;
+.field private static final lh: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;->lg:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/k;->lh: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;->lg:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v4, Lcom/airbnb/lottie/e/k;->lh: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 d0de173102..953ba41b9b 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 lo:I
+.field private lp:I
 
 
 # direct methods
@@ -27,7 +27,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput p1, p0, Lcom/airbnb/lottie/e/l;->lo:I
+    iput p1, p0, Lcom/airbnb/lottie/e/l;->lp:I
 
     return-void
 .end method
@@ -50,7 +50,7 @@
 
     move-object/from16 v2, p2
 
-    iget v3, v1, Lcom/airbnb/lottie/e/l;->lo:I
+    iget v3, v1, Lcom/airbnb/lottie/e/l;->lp: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;->iF:[I
+    iget-object v2, v0, Lcom/airbnb/lottie/c/b/c;->iG:[I
 
     array-length v2, v2
 
     if-ge v7, v2, :cond_5
 
-    iget-object v2, v0, Lcom/airbnb/lottie/c/b/c;->iF:[I
+    iget-object v2, v0, Lcom/airbnb/lottie/c/b/c;->iG:[I
 
     aget v2, v2, v7
 
-    iget-object v3, v0, Lcom/airbnb/lottie/c/b/c;->iE:[F
+    iget-object v3, v0, Lcom/airbnb/lottie/c/b/c;->iF:[F
 
     aget v3, v3, v7
 
@@ -214,7 +214,7 @@
 
     move-result v2
 
-    iget-object v3, v0, Lcom/airbnb/lottie/c/b/c;->iF:[I
+    iget-object v3, v0, Lcom/airbnb/lottie/c/b/c;->iG:[I
 
     aput v2, v3, v7
 
@@ -244,7 +244,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/airbnb/lottie/e/a/c$b;->lI: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;
 
     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;->lo:I
+    iget p1, p0, Lcom/airbnb/lottie/e/l;->lp:I
 
     const/4 v0, -0x1
 
@@ -304,10 +304,10 @@
 
     div-int/lit8 p1, p1, 0x4
 
-    iput p1, p0, Lcom/airbnb/lottie/e/l;->lo:I
+    iput p1, p0, Lcom/airbnb/lottie/e/l;->lp:I
 
     :cond_4
-    iget p1, p0, Lcom/airbnb/lottie/e/l;->lo:I
+    iget p1, p0, Lcom/airbnb/lottie/e/l;->lp:I
 
     new-array v0, p1, [F
 
@@ -318,7 +318,7 @@
     const/4 v4, 0x0
 
     :goto_2
-    iget v5, p0, Lcom/airbnb/lottie/e/l;->lo:I
+    iget v5, p0, Lcom/airbnb/lottie/e/l;->lp: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 7c68d52f42..4242cbed9f 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 lg:Lcom/airbnb/lottie/e/a/c$a;
+.field private static final lh: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;
 
 
 # direct methods
@@ -69,7 +69,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/e/m;->lg:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/m;->lh: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;->lp:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/m;->lq: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;->lg:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v0, Lcom/airbnb/lottie/e/m;->lh: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;->iT:I
+    sget v0, Lcom/airbnb/lottie/c/b/f;->iU:I
 
     goto :goto_2
 
     :cond_1
-    sget v0, Lcom/airbnb/lottie/c/b/f;->iU:I
+    sget v0, Lcom/airbnb/lottie/c/b/f;->iV:I
 
     :goto_2
     move v5, v0
@@ -221,7 +221,7 @@
 
     if-eqz v2, :cond_4
 
-    sget-object v2, Lcom/airbnb/lottie/e/m;->lp:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v2, Lcom/airbnb/lottie/e/m;->lq: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 355c79d326..1f0f5130f6 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 lg:Lcom/airbnb/lottie/e/a/c$a;
-
-.field private static final lp:Lcom/airbnb/lottie/e/a/c$a;
+.field private static lh: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;->lg:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/n;->lh: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;->lp:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/n;->lq: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;->lq:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/n;->lr: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;->lg:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v3, Lcom/airbnb/lottie/e/n;->lh: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;->lq:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v2, Lcom/airbnb/lottie/e/n;->lr: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;->ek:Z
+    iput-boolean v2, v1, Lcom/airbnb/lottie/d;->el:Z
 
     move-object/from16 v3, v18
 
@@ -428,12 +428,12 @@
 
     if-ne v3, v2, :cond_8
 
-    sget v2, Lcom/airbnb/lottie/c/b/f;->iT:I
+    sget v2, Lcom/airbnb/lottie/c/b/f;->iU:I
 
     goto :goto_7
 
     :cond_8
-    sget v2, Lcom/airbnb/lottie/c/b/f;->iU:I
+    sget v2, Lcom/airbnb/lottie/c/b/f;->iV:I
 
     :goto_7
     move v5, v2
@@ -459,7 +459,7 @@
 
     if-eqz v3, :cond_b
 
-    sget-object v3, Lcom/airbnb/lottie/e/n;->lp:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v3, Lcom/airbnb/lottie/e/n;->lq: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 a35007ce0d..20fec43e6a 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 lr:Lcom/airbnb/lottie/e/o;
+.field public static final ls: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;->lr:Lcom/airbnb/lottie/e/o;
+    sput-object v0, Lcom/airbnb/lottie/e/o;->ls: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 4d885b3458..95dca0c46e 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 lt:[I
+.field static final synthetic lu:[I
 
 
 # direct methods
@@ -30,12 +30,12 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/airbnb/lottie/e/p$1;->lt:[I
+    sput-object v0, Lcom/airbnb/lottie/e/p$1;->lu:[I
 
     :try_start_0
-    sget-object v0, Lcom/airbnb/lottie/e/p$1;->lt:[I
+    sget-object v0, Lcom/airbnb/lottie/e/p$1;->lu:[I
 
-    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;->lP: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;->lt:[I
+    sget-object v0, Lcom/airbnb/lottie/e/p$1;->lu:[I
 
-    sget-object v1, Lcom/airbnb/lottie/e/a/c$b;->lI: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;
 
     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;->lt:[I
+    sget-object v0, Lcom/airbnb/lottie/e/p$1;->lu:[I
 
-    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;->lL: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 d3e5f2fb82..7b76ce691a 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 ls:Lcom/airbnb/lottie/e/a/c$a;
+.field private static final lt: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;->ls:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/p;->lt: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;->lI:Lcom/airbnb/lottie/e/a/c$b;
+    sget-object v2, Lcom/airbnb/lottie/e/a/c$b;->lJ: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;->lt:[I
+    sget-object v1, Lcom/airbnb/lottie/e/p$1;->lu:[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;->lt:[I
+    sget-object v0, Lcom/airbnb/lottie/e/p$1;->lu:[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;->lJ:Lcom/airbnb/lottie/e/a/c$b;
+    sget-object v3, Lcom/airbnb/lottie/e/a/c$b;->lK: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;->ls:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v2, Lcom/airbnb/lottie/e/p;->lt: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 835a9d0500..9dbc7d3a0e 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 lg:Lcom/airbnb/lottie/e/a/c$a;
+.field static lh:Lcom/airbnb/lottie/e/a/c$a;
 
-.field private static lu:Landroidx/collection/SparseArrayCompat;
+.field private static lv: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;->lg:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/q;->lh: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;->lg:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v10, Lcom/airbnb/lottie/e/q;->lh: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;->mC:Landroid/graphics/PointF;
+    iput-object v14, v0, Lcom/airbnb/lottie/g/a;->mD:Landroid/graphics/PointF;
 
-    iput-object v15, v0, Lcom/airbnb/lottie/g/a;->mD:Landroid/graphics/PointF;
+    iput-object v15, v0, Lcom/airbnb/lottie/g/a;->mE:Landroid/graphics/PointF;
 
     return-object v0
 
@@ -460,7 +460,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/airbnb/lottie/e/q;->lu:Landroidx/collection/SparseArrayCompat;
+    sget-object v1, Lcom/airbnb/lottie/e/q;->lv: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;->lu:Landroidx/collection/SparseArrayCompat;
+    sget-object v1, Lcom/airbnb/lottie/e/q;->lv: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;->lu:Landroidx/collection/SparseArrayCompat;
+    sput-object v1, Lcom/airbnb/lottie/e/q;->lv:Landroidx/collection/SparseArrayCompat;
 
     :cond_0
-    sget-object v1, Lcom/airbnb/lottie/e/q;->lu:Landroidx/collection/SparseArrayCompat;
+    sget-object v1, Lcom/airbnb/lottie/e/q;->lv: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 972fa3b219..6372686a48 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 lg:Lcom/airbnb/lottie/e/a/c$a;
+.field static lh: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;->lg:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/r;->lh: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;->lN: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_0
 
@@ -82,7 +82,7 @@
 
     if-eqz v1, :cond_5
 
-    sget-object v1, Lcom/airbnb/lottie/e/r;->lg:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v1, Lcom/airbnb/lottie/e/r;->lh: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;->lI:Lcom/airbnb/lottie/e/a/c$b;
+    sget-object v2, Lcom/airbnb/lottie/e/a/c$b;->lJ: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;->lO:Lcom/airbnb/lottie/e/a/c$b;
+    sget-object v2, Lcom/airbnb/lottie/e/a/c$b;->lP: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;->eh:F
+    iget v4, v3, Lcom/airbnb/lottie/g/a;->ei: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;->mu:Ljava/lang/Float;
+    iput-object v4, v2, Lcom/airbnb/lottie/g/a;->mv:Ljava/lang/Float;
 
-    iget-object v4, v2, Lcom/airbnb/lottie/g/a;->ms:Ljava/lang/Object;
+    iget-object v4, v2, Lcom/airbnb/lottie/g/a;->mt:Ljava/lang/Object;
 
     if-nez v4, :cond_0
 
-    iget-object v4, v3, Lcom/airbnb/lottie/g/a;->mr:Ljava/lang/Object;
+    iget-object v4, v3, Lcom/airbnb/lottie/g/a;->ms:Ljava/lang/Object;
 
     if-eqz v4, :cond_0
 
-    iget-object v3, v3, Lcom/airbnb/lottie/g/a;->mr:Ljava/lang/Object;
+    iget-object v3, v3, Lcom/airbnb/lottie/g/a;->ms:Ljava/lang/Object;
 
-    iput-object v3, v2, Lcom/airbnb/lottie/g/a;->ms:Ljava/lang/Object;
+    iput-object v3, v2, Lcom/airbnb/lottie/g/a;->mt: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;->mr:Ljava/lang/Object;
+    iget-object v1, v0, Lcom/airbnb/lottie/g/a;->ms:Ljava/lang/Object;
 
     if-eqz v1, :cond_2
 
-    iget-object v1, v0, Lcom/airbnb/lottie/g/a;->ms:Ljava/lang/Object;
+    iget-object v1, v0, Lcom/airbnb/lottie/g/a;->mt: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 abe1d6f3a3..e2814249a6 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 lg:Lcom/airbnb/lottie/e/a/c$a;
-
-.field private static final lv:Lcom/airbnb/lottie/e/a/c$a;
+.field private static final lh: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;->lg:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/s;->lh: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;->lv:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/s;->lw: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;->lw:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/s;->lx: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;->eg:Landroid/graphics/Rect;
+    iget-object v3, v0, Lcom/airbnb/lottie/d;->eh: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;->kE:Lcom/airbnb/lottie/c/c/d$a;
+    sget-object v6, Lcom/airbnb/lottie/c/c/d$a;->kF: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;->kM:I
+    sget v22, Lcom/airbnb/lottie/c/c/d$b;->kN:I
 
     const-string v3, "__container"
 
@@ -278,7 +278,7 @@
 
     move-object/from16 v7, p1
 
-    sget v1, Lcom/airbnb/lottie/c/c/d$b;->kM:I
+    sget v1, Lcom/airbnb/lottie/c/c/d$b;->kN:I
 
     new-instance v10, Ljava/util/ArrayList;
 
@@ -361,7 +361,7 @@
 
     if-eqz v5, :cond_c
 
-    sget-object v5, Lcom/airbnb/lottie/e/s;->lg:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v5, Lcom/airbnb/lottie/e/s;->lh: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;->lw:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v6, Lcom/airbnb/lottie/e/s;->lx: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;->lv:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v5, Lcom/airbnb/lottie/e/s;->lw: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;->ll:Lcom/airbnb/lottie/e/h;
+    sget-object v3, Lcom/airbnb/lottie/e/h;->lm: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;->kK:Lcom/airbnb/lottie/c/c/d$a;
+    sget-object v5, Lcom/airbnb/lottie/c/c/d$a;->kL: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;->kK:Lcom/airbnb/lottie/c/c/d$a;
+    sget-object v16, Lcom/airbnb/lottie/c/c/d$a;->kL: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;->ei:F
+    iget v0, v7, Lcom/airbnb/lottie/d;->ej: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 054649d819..05b2e9636b 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 lg:Lcom/airbnb/lottie/e/a/c$a;
+.field private static final lA:Lcom/airbnb/lottie/e/a/c$a;
 
-.field static lx:Lcom/airbnb/lottie/e/a/c$a;
+.field private static final lh:Lcom/airbnb/lottie/e/a/c$a;
 
-.field private static final ly:Lcom/airbnb/lottie/e/a/c$a;
+.field static 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;->lg:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/t;->lh: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;->lx: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, v4, [Ljava/lang/String;
 
@@ -129,7 +129,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;->lz: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;->lz:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/t;->lA: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;->kr:Lcom/airbnb/lottie/c/c/d$a;
+    iget-object v2, v1, Lcom/airbnb/lottie/c/c/d;->ks: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;
+    sget-object v3, Lcom/airbnb/lottie/c/c/d$a;->kH: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;->kq:J
+    iget-wide v2, v1, Lcom/airbnb/lottie/c/c/d;->kr: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;->lx:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v2, Lcom/airbnb/lottie/e/t;->ly: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;->kq:J
+    iget-wide v3, v2, Lcom/airbnb/lottie/c/c/d;->kr: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;->lz:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v3, Lcom/airbnb/lottie/e/t;->lA: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;->ly:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v0, Lcom/airbnb/lottie/e/t;->lz: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;->lg:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v11, Lcom/airbnb/lottie/e/t;->lh: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;->eg:Landroid/graphics/Rect;
+    iput-object v7, v9, Lcom/airbnb/lottie/d;->eh:Landroid/graphics/Rect;
 
-    iput v13, v9, Lcom/airbnb/lottie/d;->eh:F
+    iput v13, v9, Lcom/airbnb/lottie/d;->ei:F
 
-    iput v14, v9, Lcom/airbnb/lottie/d;->ei:F
+    iput v14, v9, Lcom/airbnb/lottie/d;->ej:F
 
-    iput v15, v9, Lcom/airbnb/lottie/d;->ej:F
+    iput v15, v9, Lcom/airbnb/lottie/d;->ek:F
 
-    iput-object v3, v9, Lcom/airbnb/lottie/d;->ef:Ljava/util/List;
+    iput-object v3, v9, Lcom/airbnb/lottie/d;->eg:Ljava/util/List;
 
-    iput-object v2, v9, Lcom/airbnb/lottie/d;->ee:Landroidx/collection/LongSparseArray;
+    iput-object v2, v9, Lcom/airbnb/lottie/d;->ef:Landroidx/collection/LongSparseArray;
 
-    iput-object v4, v9, Lcom/airbnb/lottie/d;->dZ:Ljava/util/Map;
+    iput-object v4, v9, Lcom/airbnb/lottie/d;->ea:Ljava/util/Map;
 
-    iput-object v5, v9, Lcom/airbnb/lottie/d;->ea:Ljava/util/Map;
+    iput-object v5, v9, Lcom/airbnb/lottie/d;->eb:Ljava/util/Map;
 
-    iput-object v8, v9, Lcom/airbnb/lottie/d;->ed:Landroidx/collection/SparseArrayCompat;
+    iput-object v8, v9, Lcom/airbnb/lottie/d;->ee:Landroidx/collection/SparseArrayCompat;
 
-    iput-object v0, v9, Lcom/airbnb/lottie/d;->eb:Ljava/util/Map;
+    iput-object v0, v9, Lcom/airbnb/lottie/d;->ec:Ljava/util/Map;
 
     move-object/from16 v0, v18
 
-    iput-object v0, v9, Lcom/airbnb/lottie/d;->ec:Ljava/util/List;
+    iput-object v0, v9, Lcom/airbnb/lottie/d;->ed: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 670722c95e..e66e0d834d 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;->iZ:I
+    sget v0, Lcom/airbnb/lottie/c/b/g$a;->ja:I
 
     goto/16 :goto_0
 
@@ -252,17 +252,17 @@
 
     invoke-virtual {p1, v0}, Lcom/airbnb/lottie/d;->s(Ljava/lang/String;)V
 
-    sget v0, Lcom/airbnb/lottie/c/b/g$a;->jb:I
+    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;->ja:I
+    sget v0, Lcom/airbnb/lottie/c/b/g$a;->jb:I
 
     goto/16 :goto_0
 
     :cond_f
-    sget v0, Lcom/airbnb/lottie/c/b/g$a;->iZ:I
+    sget v0, Lcom/airbnb/lottie/c/b/g$a;->ja:I
 
     goto/16 :goto_0
 
diff --git a/com.discord/smali/com/airbnb/lottie/e/v.smali b/com.discord/smali/com/airbnb/lottie/e/v.smali
index 6e1397b306..f65eac0e62 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 lg:Lcom/airbnb/lottie/e/a/c$a;
+.field private static final lh: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;->lg:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/v;->lh: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;->lg:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v3, Lcom/airbnb/lottie/e/v;->lh: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 8997d513ac..f3d42e2e0b 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 lA:Lcom/airbnb/lottie/e/w;
+.field public static final lB: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;->lA:Lcom/airbnb/lottie/e/w;
+    sput-object v0, Lcom/airbnb/lottie/e/w;->lB: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 10bc561091..a5b26b2774 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 lB:Lcom/airbnb/lottie/e/x;
+.field public static final lC: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;->lB:Lcom/airbnb/lottie/e/x;
+    sput-object v0, Lcom/airbnb/lottie/e/x;->lC: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;->lI: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;
 
     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;->lK: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;
 
     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;->lO: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;
 
     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 4bc9a4ef15..b9239c9188 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 lg:Lcom/airbnb/lottie/e/a/c$a;
+.field private static final lh: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;->lg:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/y;->lh: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;->lg:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v1, Lcom/airbnb/lottie/e/y;->lh: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 7dfe8feed9..9bdcaf18d0 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 lg:Lcom/airbnb/lottie/e/a/c$a;
+.field private static lh: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;->lg:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/z;->lh: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;->lg:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v0, Lcom/airbnb/lottie/e/z;->lh: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 569b195d57..eb66b69b60 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 eF:Lcom/airbnb/lottie/f;
+.field final synthetic eG: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;->eF:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/f$1;->eG: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;->eF:Lcom/airbnb/lottie/f;
+    iget-object p1, p0, Lcom/airbnb/lottie/f$1;->eG: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;->eF:Lcom/airbnb/lottie/f;
+    iget-object p1, p0, Lcom/airbnb/lottie/f$1;->eG: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;->eF:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/f$1;->eG: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 c8163470e9..a48a85aa52 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 eF:Lcom/airbnb/lottie/f;
+.field final synthetic eG:Lcom/airbnb/lottie/f;
 
-.field final synthetic eO: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$10;->eF:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/f$10;->eG:Lcom/airbnb/lottie/f;
 
-    iput p2, p0, Lcom/airbnb/lottie/f$10;->eO:F
+    iput p2, p0, Lcom/airbnb/lottie/f$10;->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$10;->eF:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/f$10;->eG:Lcom/airbnb/lottie/f;
 
-    iget v1, p0, Lcom/airbnb/lottie/f$10;->eO:F
+    iget v1, p0, Lcom/airbnb/lottie/f$10;->eP: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 7b36ce83d0..c303baa47e 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 eF:Lcom/airbnb/lottie/f;
+.field final synthetic eG:Lcom/airbnb/lottie/f;
 
-.field final synthetic eI: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$11;->eF:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/f$11;->eG:Lcom/airbnb/lottie/f;
 
-    iput p2, p0, Lcom/airbnb/lottie/f$11;->eI:I
+    iput p2, p0, Lcom/airbnb/lottie/f$11;->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$11;->eF:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/f$11;->eG:Lcom/airbnb/lottie/f;
 
-    iget v1, p0, Lcom/airbnb/lottie/f$11;->eI:I
+    iget v1, p0, Lcom/airbnb/lottie/f$11;->eJ: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 12256c0c74..8268ce8a8b 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 eF:Lcom/airbnb/lottie/f;
+.field final synthetic eG:Lcom/airbnb/lottie/f;
 
-.field final synthetic eP:F
+.field final synthetic eQ:F
 
 
 # direct methods
 .method constructor <init>(Lcom/airbnb/lottie/f;F)V
     .locals 0
 
-    iput-object p1, p0, Lcom/airbnb/lottie/f$12;->eF:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/f$12;->eG:Lcom/airbnb/lottie/f;
 
-    iput p2, p0, Lcom/airbnb/lottie/f$12;->eP:F
+    iput p2, p0, Lcom/airbnb/lottie/f$12;->eQ: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;->eF:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/f$12;->eG:Lcom/airbnb/lottie/f;
 
-    iget v1, p0, Lcom/airbnb/lottie/f$12;->eP:F
+    iget v1, p0, Lcom/airbnb/lottie/f$12;->eQ: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 d2890de547..a62402949b 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 eF:Lcom/airbnb/lottie/f;
+.field final synthetic eG:Lcom/airbnb/lottie/f;
 
-.field final synthetic eG:Ljava/lang/String;
+.field final synthetic eH: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;->eF:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/f$13;->eG:Lcom/airbnb/lottie/f;
 
-    iput-object p2, p0, Lcom/airbnb/lottie/f$13;->eG:Ljava/lang/String;
+    iput-object p2, p0, Lcom/airbnb/lottie/f$13;->eH: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;->eF:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/f$13;->eG:Lcom/airbnb/lottie/f;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/f$13;->eG:Ljava/lang/String;
+    iget-object v1, p0, Lcom/airbnb/lottie/f$13;->eH: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 906c5521c7..a8c41a96e5 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 eF:Lcom/airbnb/lottie/f;
+.field final synthetic eG:Lcom/airbnb/lottie/f;
 
-.field final synthetic eG:Ljava/lang/String;
+.field final synthetic eH: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;->eF:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/f$14;->eG:Lcom/airbnb/lottie/f;
 
-    iput-object p2, p0, Lcom/airbnb/lottie/f$14;->eG:Ljava/lang/String;
+    iput-object p2, p0, Lcom/airbnb/lottie/f$14;->eH: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;->eF:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/f$14;->eG:Lcom/airbnb/lottie/f;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/f$14;->eG:Ljava/lang/String;
+    iget-object v1, p0, Lcom/airbnb/lottie/f$14;->eH: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 250f466901..8912311ddc 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 eF:Lcom/airbnb/lottie/f;
+.field final synthetic eG:Lcom/airbnb/lottie/f;
 
-.field final synthetic eG:Ljava/lang/String;
+.field final synthetic eH: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;->eF:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/f$2;->eG:Lcom/airbnb/lottie/f;
 
-    iput-object p2, p0, Lcom/airbnb/lottie/f$2;->eG:Ljava/lang/String;
+    iput-object p2, p0, Lcom/airbnb/lottie/f$2;->eH: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;->eF:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/f$2;->eG:Lcom/airbnb/lottie/f;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/f$2;->eG:Ljava/lang/String;
+    iget-object v1, p0, Lcom/airbnb/lottie/f$2;->eH: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 c25e22605f..75baa3b69a 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 eF:Lcom/airbnb/lottie/f;
-
-.field final synthetic eH:I
+.field final synthetic eG:Lcom/airbnb/lottie/f;
 
 .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;->eF:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/f$3;->eG:Lcom/airbnb/lottie/f;
 
-    iput p2, p0, Lcom/airbnb/lottie/f$3;->eH:I
+    iput p2, p0, Lcom/airbnb/lottie/f$3;->eI:I
 
-    iput p3, p0, Lcom/airbnb/lottie/f$3;->eI:I
+    iput p3, p0, Lcom/airbnb/lottie/f$3;->eJ: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;->eF:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/f$3;->eG:Lcom/airbnb/lottie/f;
 
-    iget v1, p0, Lcom/airbnb/lottie/f$3;->eH:I
+    iget v1, p0, Lcom/airbnb/lottie/f$3;->eI:I
 
-    iget v2, p0, Lcom/airbnb/lottie/f$3;->eI:I
+    iget v2, p0, Lcom/airbnb/lottie/f$3;->eJ: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 b9173f025a..301e2339fb 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 eF:Lcom/airbnb/lottie/f;
+.field final synthetic eG:Lcom/airbnb/lottie/f;
 
-.field final synthetic eJ:I
+.field final synthetic eK:I
 
 
 # direct methods
 .method constructor <init>(Lcom/airbnb/lottie/f;I)V
     .locals 0
 
-    iput-object p1, p0, Lcom/airbnb/lottie/f$4;->eF:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/f$4;->eG:Lcom/airbnb/lottie/f;
 
-    iput p2, p0, Lcom/airbnb/lottie/f$4;->eJ:I
+    iput p2, p0, Lcom/airbnb/lottie/f$4;->eK: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;->eF:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/f$4;->eG:Lcom/airbnb/lottie/f;
 
-    iget v1, p0, Lcom/airbnb/lottie/f$4;->eJ:I
+    iget v1, p0, Lcom/airbnb/lottie/f$4;->eK: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 fd0149e36e..03cc651ad7 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 eF:Lcom/airbnb/lottie/f;
+.field final synthetic eG:Lcom/airbnb/lottie/f;
 
-.field final synthetic eK:F
+.field final synthetic eL:F
 
 
 # direct methods
 .method constructor <init>(Lcom/airbnb/lottie/f;F)V
     .locals 0
 
-    iput-object p1, p0, Lcom/airbnb/lottie/f$5;->eF:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/f$5;->eG:Lcom/airbnb/lottie/f;
 
-    iput p2, p0, Lcom/airbnb/lottie/f$5;->eK:F
+    iput p2, p0, Lcom/airbnb/lottie/f$5;->eL: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;->eF:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/f$5;->eG:Lcom/airbnb/lottie/f;
 
-    iget v1, p0, Lcom/airbnb/lottie/f$5;->eK:F
+    iget v1, p0, Lcom/airbnb/lottie/f$5;->eL: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 23f0f8fe4c..310fb78161 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 eF:Lcom/airbnb/lottie/f;
+.field final synthetic eG:Lcom/airbnb/lottie/f;
 
-.field final synthetic eL:Lcom/airbnb/lottie/c/e;
+.field final synthetic eM:Lcom/airbnb/lottie/c/e;
 
-.field final synthetic eM:Ljava/lang/Object;
+.field final synthetic eN:Ljava/lang/Object;
 
-.field final synthetic eN:Lcom/airbnb/lottie/g/c;
+.field final synthetic eO: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;->eF:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/f$6;->eG:Lcom/airbnb/lottie/f;
 
-    iput-object p2, p0, Lcom/airbnb/lottie/f$6;->eL:Lcom/airbnb/lottie/c/e;
+    iput-object p2, p0, Lcom/airbnb/lottie/f$6;->eM:Lcom/airbnb/lottie/c/e;
 
-    iput-object p3, p0, Lcom/airbnb/lottie/f$6;->eM:Ljava/lang/Object;
+    iput-object p3, p0, Lcom/airbnb/lottie/f$6;->eN:Ljava/lang/Object;
 
-    iput-object p4, p0, Lcom/airbnb/lottie/f$6;->eN:Lcom/airbnb/lottie/g/c;
+    iput-object p4, p0, Lcom/airbnb/lottie/f$6;->eO: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;->eF:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/f$6;->eG:Lcom/airbnb/lottie/f;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/f$6;->eL:Lcom/airbnb/lottie/c/e;
+    iget-object v1, p0, Lcom/airbnb/lottie/f$6;->eM:Lcom/airbnb/lottie/c/e;
 
-    iget-object v2, p0, Lcom/airbnb/lottie/f$6;->eM:Ljava/lang/Object;
+    iget-object v2, p0, Lcom/airbnb/lottie/f$6;->eN:Ljava/lang/Object;
 
-    iget-object v3, p0, Lcom/airbnb/lottie/f$6;->eN:Lcom/airbnb/lottie/g/c;
+    iget-object v3, p0, Lcom/airbnb/lottie/f$6;->eO: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 f09a87c173..e18ea55b49 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 eF:Lcom/airbnb/lottie/f;
+.field final synthetic eG: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;->eF:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/f$7;->eG: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;->eF:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/f$7;->eG: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 fb0911b6de..c5650b380b 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 eF:Lcom/airbnb/lottie/f;
+.field final synthetic eG: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;->eF:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/f$8;->eG: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;->eF:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/f$8;->eG: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 14c510d898..0ed31d9d55 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 eF:Lcom/airbnb/lottie/f;
+.field final synthetic eG:Lcom/airbnb/lottie/f;
 
-.field final synthetic eH: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$9;->eF:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/f$9;->eG:Lcom/airbnb/lottie/f;
 
-    iput p2, p0, Lcom/airbnb/lottie/f$9;->eH:I
+    iput p2, p0, Lcom/airbnb/lottie/f$9;->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$9;->eF:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/f$9;->eG:Lcom/airbnb/lottie/f;
 
-    iget v1, p0, Lcom/airbnb/lottie/f$9;->eH:I
+    iget v1, p0, Lcom/airbnb/lottie/f$9;->eI: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 55d7ef5734..992da171b9 100644
--- a/com.discord/smali/com/airbnb/lottie/f.smali
+++ b/com.discord/smali/com/airbnb/lottie/f.smali
@@ -22,25 +22,27 @@
 # instance fields
 .field private alpha:I
 
-.field public dS:Lcom/airbnb/lottie/d;
+.field public dT:Lcom/airbnb/lottie/d;
 
-.field dW:Ljava/lang/String;
+.field dX:Ljava/lang/String;
 
-.field public eA:Lcom/airbnb/lottie/a;
+.field public eA:Lcom/airbnb/lottie/b/a;
 
-.field public eB:Lcom/airbnb/lottie/p;
+.field public eB:Lcom/airbnb/lottie/a;
 
-.field public eC:Z
+.field public eC:Lcom/airbnb/lottie/p;
 
-.field private eD:Lcom/airbnb/lottie/c/c/b;
+.field public eD:Z
 
-.field eE:Z
+.field private eE:Lcom/airbnb/lottie/c/c/b;
 
-.field final et:Lcom/airbnb/lottie/f/e;
+.field eF:Z
 
-.field private eu:Z
+.field final eu:Lcom/airbnb/lottie/f/e;
 
-.field private final ev:Ljava/util/Set;
+.field private ev:Z
+
+.field private final ew:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -50,7 +52,7 @@
     .end annotation
 .end field
 
-.field final ew:Ljava/util/ArrayList;
+.field final ex:Ljava/util/ArrayList;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/ArrayList<",
@@ -60,11 +62,9 @@
     .end annotation
 .end field
 
-.field ex:Lcom/airbnb/lottie/b/b;
+.field ey:Lcom/airbnb/lottie/b/b;
 
-.field ey:Lcom/airbnb/lottie/b;
-
-.field public ez:Lcom/airbnb/lottie/b/a;
+.field ez:Lcom/airbnb/lottie/b;
 
 .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;->et:Lcom/airbnb/lottie/f/e;
+    iput-object v0, p0, Lcom/airbnb/lottie/f;->eu: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;->eu:Z
+    iput-boolean v0, p0, Lcom/airbnb/lottie/f;->ev:Z
 
     new-instance v0, Ljava/util/HashSet;
 
     invoke-direct {v0}, Ljava/util/HashSet;-><init>()V
 
-    iput-object v0, p0, Lcom/airbnb/lottie/f;->ev:Ljava/util/Set;
+    iput-object v0, p0, Lcom/airbnb/lottie/f;->ew: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;->ew:Ljava/util/ArrayList;
+    iput-object v0, p0, Lcom/airbnb/lottie/f;->ex: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;->et:Lcom/airbnb/lottie/f/e;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->eu: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;->eD:Lcom/airbnb/lottie/c/c/b;
+    iget-object p0, p0, Lcom/airbnb/lottie/f;->eE: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;->eD:Lcom/airbnb/lottie/c/c/b;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->eE: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;->eD:Lcom/airbnb/lottie/c/c/b;
+    iget-object v1, p0, Lcom/airbnb/lottie/f;->eE: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;->dS:Lcom/airbnb/lottie/d;
+    iget-object v1, p0, Lcom/airbnb/lottie/f;->dT: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;->dS:Lcom/airbnb/lottie/d;
+    iget-object v2, p0, Lcom/airbnb/lottie/f;->dT:Lcom/airbnb/lottie/d;
 
-    iget-object v2, v2, Lcom/airbnb/lottie/d;->ef:Ljava/util/List;
+    iget-object v2, v2, Lcom/airbnb/lottie/d;->eg:Ljava/util/List;
 
-    iget-object v3, p0, Lcom/airbnb/lottie/f;->dS:Lcom/airbnb/lottie/d;
+    iget-object v3, p0, Lcom/airbnb/lottie/f;->dT: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;->eD:Lcom/airbnb/lottie/c/c/b;
+    iput-object v0, p0, Lcom/airbnb/lottie/f;->eE: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;->dS:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->dT: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;->eg:Landroid/graphics/Rect;
+    iget-object v0, v0, Lcom/airbnb/lottie/d;->eh: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;->dS:Lcom/airbnb/lottie/d;
+    iget-object v2, p0, Lcom/airbnb/lottie/f;->dT:Lcom/airbnb/lottie/d;
 
-    iget-object v2, v2, Lcom/airbnb/lottie/d;->eg:Landroid/graphics/Rect;
+    iget-object v2, v2, Lcom/airbnb/lottie/d;->eh: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;->et:Lcom/airbnb/lottie/f/e;
+    iget-object p0, p0, Lcom/airbnb/lottie/f;->eu: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;->dS:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->dT:Lcom/airbnb/lottie/d;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->ew:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->ex: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;->et:Lcom/airbnb/lottie/f/e;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->eu:Lcom/airbnb/lottie/f/e;
 
     int-to-float p1, p1
 
@@ -325,11 +325,11 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->eD:Lcom/airbnb/lottie/c/c/b;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->eE:Lcom/airbnb/lottie/c/c/b;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->ew:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->ex: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;->if:Lcom/airbnb/lottie/c/f;
+    iget-object v0, p1, Lcom/airbnb/lottie/c/e;->ig: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;->if:Lcom/airbnb/lottie/c/f;
+    iget-object p1, p1, Lcom/airbnb/lottie/c/e;->ig: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;->if:Lcom/airbnb/lottie/c/f;
+    iget-object v3, v3, Lcom/airbnb/lottie/c/e;->ig: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;->ft:Ljava/lang/Float;
+    sget-object p1, Lcom/airbnb/lottie/j;->fu:Ljava/lang/Float;
 
     if-ne p2, p1, :cond_4
 
-    iget-object p1, p0, Lcom/airbnb/lottie/f;->et:Lcom/airbnb/lottie/f/e;
+    iget-object p1, p0, Lcom/airbnb/lottie/f;->eu: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;->dS:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->dT: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;->dS:Lcom/airbnb/lottie/d;
+    iput-object p1, p0, Lcom/airbnb/lottie/f;->dT:Lcom/airbnb/lottie/d;
 
     invoke-direct {p0}, Lcom/airbnb/lottie/f;->aK()V
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->et:Lcom/airbnb/lottie/f/e;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->eu:Lcom/airbnb/lottie/f/e;
 
-    iget-object v2, v0, Lcom/airbnb/lottie/f/e;->dS:Lcom/airbnb/lottie/d;
+    iget-object v2, v0, Lcom/airbnb/lottie/f/e;->dT: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;->dS:Lcom/airbnb/lottie/d;
+    iput-object p1, v0, Lcom/airbnb/lottie/f/e;->dT:Lcom/airbnb/lottie/d;
 
     if-eqz v1, :cond_2
 
-    iget v1, v0, Lcom/airbnb/lottie/f/e;->mj:F
+    iget v1, v0, Lcom/airbnb/lottie/f/e;->mk:F
 
-    iget v2, p1, Lcom/airbnb/lottie/d;->eh:F
+    iget v2, p1, Lcom/airbnb/lottie/d;->ei: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;->mk:F
+    iget v2, v0, Lcom/airbnb/lottie/f/e;->ml:F
 
-    iget v4, p1, Lcom/airbnb/lottie/d;->ei:F
+    iget v4, p1, Lcom/airbnb/lottie/d;->ej: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;->eh:F
+    iget v1, p1, Lcom/airbnb/lottie/d;->ei:F
 
     float-to-int v1, v1
 
     int-to-float v1, v1
 
-    iget v2, p1, Lcom/airbnb/lottie/d;->ei:F
+    iget v2, p1, Lcom/airbnb/lottie/d;->ej: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;->mi:F
+    iget v1, v0, Lcom/airbnb/lottie/f/e;->mj:F
 
     const/4 v2, 0x0
 
-    iput v2, v0, Lcom/airbnb/lottie/f/e;->mi:F
+    iput v2, v0, Lcom/airbnb/lottie/f/e;->mj: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;->et:Lcom/airbnb/lottie/f/e;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->eu: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;->ew:Ljava/util/ArrayList;
+    iget-object v1, p0, Lcom/airbnb/lottie/f;->ex: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;->ew:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->ex:Ljava/util/ArrayList;
 
     invoke-virtual {v0}, Ljava/util/ArrayList;->clear()V
 
-    iget-boolean v0, p0, Lcom/airbnb/lottie/f;->eE:Z
+    iget-boolean v0, p0, Lcom/airbnb/lottie/f;->eF: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;->eD:Lcom/airbnb/lottie/c/c/b;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->eE:Lcom/airbnb/lottie/c/c/b;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->ew:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->ex: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;->eu:Z
+    iget-boolean v0, p0, Lcom/airbnb/lottie/f;->ev:Z
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->et:Lcom/airbnb/lottie/f/e;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->eu: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;->et:Lcom/airbnb/lottie/f/e;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->eu: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;->eu:Z
+    iget-boolean v0, p0, Lcom/airbnb/lottie/f;->ev:Z
 
     if-nez v0, :cond_4
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->et:Lcom/airbnb/lottie/f/e;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->eu:Lcom/airbnb/lottie/f/e;
 
-    iget v0, v0, Lcom/airbnb/lottie/f/e;->mf:F
+    iget v0, v0, Lcom/airbnb/lottie/f/e;->mg:F
 
     const/4 v1, 0x0
 
@@ -609,7 +609,7 @@
 
     if-gez v0, :cond_3
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->et:Lcom/airbnb/lottie/f/e;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->eu: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;->et:Lcom/airbnb/lottie/f/e;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->eu: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;->ew:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->ex:Ljava/util/ArrayList;
 
     invoke-virtual {v0}, Ljava/util/ArrayList;->clear()V
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->et:Lcom/airbnb/lottie/f/e;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->eu: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;->et:Lcom/airbnb/lottie/f/e;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->eu: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;->et:Lcom/airbnb/lottie/f/e;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->eu: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;->dS:Lcom/airbnb/lottie/d;
+    iput-object v0, p0, Lcom/airbnb/lottie/f;->dT:Lcom/airbnb/lottie/d;
 
-    iput-object v0, p0, Lcom/airbnb/lottie/f;->eD:Lcom/airbnb/lottie/c/c/b;
+    iput-object v0, p0, Lcom/airbnb/lottie/f;->eE:Lcom/airbnb/lottie/c/c/b;
 
-    iput-object v0, p0, Lcom/airbnb/lottie/f;->ex:Lcom/airbnb/lottie/b/b;
+    iput-object v0, p0, Lcom/airbnb/lottie/f;->ey:Lcom/airbnb/lottie/b/b;
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->et:Lcom/airbnb/lottie/f/e;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->eu: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;->eD:Lcom/airbnb/lottie/c/c/b;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->eE:Lcom/airbnb/lottie/c/c/b;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->ew:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->ex: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;->et:Lcom/airbnb/lottie/f/e;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->eu: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;->eB:Lcom/airbnb/lottie/p;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->eC:Lcom/airbnb/lottie/p;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->dS:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->dT:Lcom/airbnb/lottie/d;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/d;->ed:Landroidx/collection/SparseArrayCompat;
+    iget-object v0, v0, Lcom/airbnb/lottie/d;->ee: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;->eu:Z
+    iput-boolean p1, p0, Lcom/airbnb/lottie/f;->ev: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;->eD:Lcom/airbnb/lottie/c/c/b;
+    iget-object v1, p0, Lcom/airbnb/lottie/f;->eE: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;->dS:Lcom/airbnb/lottie/d;
+    iget-object v3, p0, Lcom/airbnb/lottie/f;->dT:Lcom/airbnb/lottie/d;
 
-    iget-object v3, v3, Lcom/airbnb/lottie/d;->eg:Landroid/graphics/Rect;
+    iget-object v3, v3, Lcom/airbnb/lottie/d;->eh: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;->dS:Lcom/airbnb/lottie/d;
+    iget-object v4, p0, Lcom/airbnb/lottie/f;->dT:Lcom/airbnb/lottie/d;
 
-    iget-object v4, v4, Lcom/airbnb/lottie/d;->eg:Landroid/graphics/Rect;
+    iget-object v4, v4, Lcom/airbnb/lottie/d;->eh: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;->dS:Lcom/airbnb/lottie/d;
+    iget-object v3, p0, Lcom/airbnb/lottie/f;->dT:Lcom/airbnb/lottie/d;
 
-    iget-object v3, v3, Lcom/airbnb/lottie/d;->eg:Landroid/graphics/Rect;
+    iget-object v3, v3, Lcom/airbnb/lottie/d;->eh: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;->dS:Lcom/airbnb/lottie/d;
+    iget-object v6, p0, Lcom/airbnb/lottie/f;->dT:Lcom/airbnb/lottie/d;
 
-    iget-object v6, v6, Lcom/airbnb/lottie/d;->eg:Landroid/graphics/Rect;
+    iget-object v6, v6, Lcom/airbnb/lottie/d;->eh: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;->eD:Lcom/airbnb/lottie/c/c/b;
+    iget-object v1, p0, Lcom/airbnb/lottie/f;->eE: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;->eC:Z
+    iget-boolean v0, p0, Lcom/airbnb/lottie/f;->eD:Z
 
     if-ne v0, p1, :cond_0
 
@@ -926,9 +926,9 @@
     return-void
 
     :cond_1
-    iput-boolean p1, p0, Lcom/airbnb/lottie/f;->eC:Z
+    iput-boolean p1, p0, Lcom/airbnb/lottie/f;->eD:Z
 
-    iget-object p1, p0, Lcom/airbnb/lottie/f;->dS:Lcom/airbnb/lottie/d;
+    iget-object p1, p0, Lcom/airbnb/lottie/f;->dT: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;->dS:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->dT: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;->eg:Landroid/graphics/Rect;
+    iget-object v0, v0, Lcom/airbnb/lottie/d;->eh: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;->dS:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->dT: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;->eg:Landroid/graphics/Rect;
+    iget-object v0, v0, Lcom/airbnb/lottie/d;->eh: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;->et:Lcom/airbnb/lottie/f/e;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->eu: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;->dS:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->dT:Lcom/airbnb/lottie/d;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->ew:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->ex: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;->et:Lcom/airbnb/lottie/f/e;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->eu: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;->dS:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->dT:Lcom/airbnb/lottie/d;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->ew:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->ex: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;->et:Lcom/airbnb/lottie/f/e;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->eu: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;->dS:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->dT:Lcom/airbnb/lottie/d;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->ew:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->ex: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;->eh:F
+    iget p1, v0, Lcom/airbnb/lottie/c/h;->ei:F
 
-    iget v0, v0, Lcom/airbnb/lottie/c/h;->ij:F
+    iget v0, v0, Lcom/airbnb/lottie/c/h;->ik: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;->dS:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->dT:Lcom/airbnb/lottie/d;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->ew:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->ex: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;->eh:F
+    iget v0, v0, Lcom/airbnb/lottie/d;->ei:F
 
-    iget-object v1, p0, Lcom/airbnb/lottie/f;->dS:Lcom/airbnb/lottie/d;
+    iget-object v1, p0, Lcom/airbnb/lottie/f;->dT:Lcom/airbnb/lottie/d;
 
-    iget v1, v1, Lcom/airbnb/lottie/d;->ei:F
+    iget v1, v1, Lcom/airbnb/lottie/d;->ej: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;->dS:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->dT:Lcom/airbnb/lottie/d;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->ew:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->ex: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;->eh:F
+    iget p1, v0, Lcom/airbnb/lottie/c/h;->ei:F
 
     float-to-int p1, p1
 
-    iget v0, v0, Lcom/airbnb/lottie/c/h;->ij:F
+    iget v0, v0, Lcom/airbnb/lottie/c/h;->ik: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;->dS:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->dT:Lcom/airbnb/lottie/d;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->ew:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->ex: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;->et:Lcom/airbnb/lottie/f/e;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->eu: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;->dS:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->dT:Lcom/airbnb/lottie/d;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->ew:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->ex: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;->eh:F
+    iget p1, v0, Lcom/airbnb/lottie/c/h;->ei: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;->dS:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->dT:Lcom/airbnb/lottie/d;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->ew:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->ex: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;->eh:F
+    iget v0, v0, Lcom/airbnb/lottie/d;->ei:F
 
-    iget-object v1, p0, Lcom/airbnb/lottie/f;->dS:Lcom/airbnb/lottie/d;
+    iget-object v1, p0, Lcom/airbnb/lottie/f;->dT:Lcom/airbnb/lottie/d;
 
-    iget v1, v1, Lcom/airbnb/lottie/d;->ei:F
+    iget v1, v1, Lcom/airbnb/lottie/d;->ej: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;->dS:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->dT:Lcom/airbnb/lottie/d;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->ew:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->ex: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;->eh:F
+    iget v0, v0, Lcom/airbnb/lottie/d;->ei:F
 
-    iget-object v1, p0, Lcom/airbnb/lottie/f;->dS:Lcom/airbnb/lottie/d;
+    iget-object v1, p0, Lcom/airbnb/lottie/f;->dT:Lcom/airbnb/lottie/d;
 
-    iget v1, v1, Lcom/airbnb/lottie/d;->ei:F
+    iget v1, v1, Lcom/airbnb/lottie/d;->ej: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;->et:Lcom/airbnb/lottie/f/e;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->eu: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;->ew:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->ex:Ljava/util/ArrayList;
 
     invoke-virtual {v0}, Ljava/util/ArrayList;->clear()V
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->et:Lcom/airbnb/lottie/f/e;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->eu: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;->ex:Lcom/airbnb/lottie/b/b;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->ey: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;->ex:Lcom/airbnb/lottie/b/b;
+    iput-object v1, p0, Lcom/airbnb/lottie/f;->ey:Lcom/airbnb/lottie/b/b;
 
     :cond_5
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->ex:Lcom/airbnb/lottie/b/b;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->ey: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;->dW:Ljava/lang/String;
+    iget-object v3, p0, Lcom/airbnb/lottie/f;->dX:Ljava/lang/String;
 
-    iget-object v4, p0, Lcom/airbnb/lottie/f;->ey:Lcom/airbnb/lottie/b;
+    iget-object v4, p0, Lcom/airbnb/lottie/f;->ez:Lcom/airbnb/lottie/b;
 
-    iget-object v5, p0, Lcom/airbnb/lottie/f;->dS:Lcom/airbnb/lottie/d;
+    iget-object v5, p0, Lcom/airbnb/lottie/f;->dT:Lcom/airbnb/lottie/d;
 
-    iget-object v5, v5, Lcom/airbnb/lottie/d;->ea:Ljava/util/Map;
+    iget-object v5, v5, Lcom/airbnb/lottie/d;->eb: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;->ex:Lcom/airbnb/lottie/b/b;
+    iput-object v0, p0, Lcom/airbnb/lottie/f;->ey:Lcom/airbnb/lottie/b/b;
 
     :cond_6
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->ex:Lcom/airbnb/lottie/b/b;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->ey: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 789a8949cf..8f04ff0b6f 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 ma:Ljava/util/Set;
+.field private final mb:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -14,7 +14,7 @@
     .end annotation
 .end field
 
-.field private final mb:Ljava/util/Set;
+.field private final mc: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;->ma:Ljava/util/Set;
+    iput-object v0, p0, Lcom/airbnb/lottie/f/a;->mb: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;->mb:Ljava/util/Set;
+    iput-object v0, p0, Lcom/airbnb/lottie/f/a;->mc: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;->mb:Ljava/util/Set;
+    iget-object v0, p0, Lcom/airbnb/lottie/f/a;->mc: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;->ma: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
 
@@ -71,7 +71,7 @@
 .method final bB()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;->mc: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;->mb:Ljava/util/Set;
+    iget-object v0, p0, Lcom/airbnb/lottie/f/a;->mc: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;->ma: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;
 
@@ -173,7 +173,7 @@
 .method final h(Z)V
     .locals 4
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f/a;->mb:Ljava/util/Set;
+    iget-object v0, p0, Lcom/airbnb/lottie/f/a;->mc: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;->mb:Ljava/util/Set;
+    iget-object v0, p0, Lcom/airbnb/lottie/f/a;->mc: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;->mb:Ljava/util/Set;
+    iget-object v0, p0, Lcom/airbnb/lottie/f/a;->mc: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;->ma:Ljava/util/Set;
+    iget-object v0, p0, Lcom/airbnb/lottie/f/a;->mb: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;->mb:Ljava/util/Set;
+    iget-object v0, p0, Lcom/airbnb/lottie/f/a;->mc: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;->ma: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
 
diff --git a/com.discord/smali/com/airbnb/lottie/f/c.smali b/com.discord/smali/com/airbnb/lottie/f/c.smali
index 259358a14b..6328fb4725 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 mc:Ljava/util/Set;
+.field private static final md: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;->mc:Ljava/util/Set;
+    sput-object v0, Lcom/airbnb/lottie/f/c;->md: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;->mc:Ljava/util/Set;
+    sget-object v0, Lcom/airbnb/lottie/f/c;->md: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;->mc:Ljava/util/Set;
+    sget-object p2, Lcom/airbnb/lottie/f/c;->md: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 8add665f55..ee1056a361 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 md:Lcom/airbnb/lottie/i;
+.field private static mf: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;->md:Lcom/airbnb/lottie/i;
+    sput-object v0, Lcom/airbnb/lottie/f/d;->mf: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;->md:Lcom/airbnb/lottie/i;
+    sget-object v0, Lcom/airbnb/lottie/f/d;->mf: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;->md:Lcom/airbnb/lottie/i;
+    sget-object v0, Lcom/airbnb/lottie/f/d;->mf: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;->md:Lcom/airbnb/lottie/i;
+    sget-object v0, Lcom/airbnb/lottie/f/d;->mf: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 17c9c6e12a..6207cb7deb 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 dS:Lcom/airbnb/lottie/d;
+.field public dT:Lcom/airbnb/lottie/d;
 
-.field public mf:F
+.field public mg:F
 
-.field private mg:Z
+.field private mh:Z
 
-.field private mh:J
-
-.field public mi:F
+.field private mi:J
 
 .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;->mf:F
+    iput v0, p0, Lcom/airbnb/lottie/f/e;->mg:F
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/airbnb/lottie/f/e;->mg:Z
+    iput-boolean v0, p0, Lcom/airbnb/lottie/f/e;->mh:Z
 
     const-wide/16 v1, 0x0
 
-    iput-wide v1, p0, Lcom/airbnb/lottie/f/e;->mh:J
+    iput-wide v1, p0, Lcom/airbnb/lottie/f/e;->mi:J
 
     const/4 v1, 0x0
 
-    iput v1, p0, Lcom/airbnb/lottie/f/e;->mi:F
+    iput v1, p0, Lcom/airbnb/lottie/f/e;->mj:F
 
     iput v0, p0, Lcom/airbnb/lottie/f/e;->repeatCount:I
 
     const/high16 v1, -0x31000000
 
-    iput v1, p0, Lcom/airbnb/lottie/f/e;->mj:F
+    iput v1, p0, Lcom/airbnb/lottie/f/e;->mk:F
 
     const/high16 v1, 0x4f000000
 
-    iput v1, p0, Lcom/airbnb/lottie/f/e;->mk:F
+    iput v1, p0, Lcom/airbnb/lottie/f/e;->ml: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;->mf:F
+    iget v0, p0, Lcom/airbnb/lottie/f/e;->mg:F
 
     neg-float v0, v0
 
-    iput v0, p0, Lcom/airbnb/lottie/f/e;->mf:F
+    iput v0, p0, Lcom/airbnb/lottie/f/e;->mg:F
 
     return-void
 .end method
@@ -107,7 +107,7 @@
 
     if-gtz v0, :cond_2
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f/e;->dS:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/f/e;->dT: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;->eh:F
+    iget v0, v0, Lcom/airbnb/lottie/d;->ei:F
 
     :goto_0
-    iget-object v1, p0, Lcom/airbnb/lottie/f/e;->dS:Lcom/airbnb/lottie/d;
+    iget-object v1, p0, Lcom/airbnb/lottie/f/e;->dT: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;->ei:F
+    iget v1, v1, Lcom/airbnb/lottie/d;->ej: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;->mj:F
+    iput v2, p0, Lcom/airbnb/lottie/f/e;->mk: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;->mk:F
+    iput v0, p0, Lcom/airbnb/lottie/f/e;->ml:F
 
-    iget v0, p0, Lcom/airbnb/lottie/f/e;->mi:F
+    iget v0, p0, Lcom/airbnb/lottie/f/e;->mj: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;->mh:J
+    iput-wide v0, p0, Lcom/airbnb/lottie/f/e;->mi:J
 
     const/4 v0, 0x0
 
@@ -252,15 +252,15 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/airbnb/lottie/f/e;->dS:Lcom/airbnb/lottie/d;
+    iput-object v0, p0, Lcom/airbnb/lottie/f/e;->dT:Lcom/airbnb/lottie/d;
 
     const/high16 v0, -0x31000000
 
-    iput v0, p0, Lcom/airbnb/lottie/f/e;->mj:F
+    iput v0, p0, Lcom/airbnb/lottie/f/e;->mk:F
 
     const/high16 v0, 0x4f000000
 
-    iput v0, p0, Lcom/airbnb/lottie/f/e;->mk:F
+    iput v0, p0, Lcom/airbnb/lottie/f/e;->ml:F
 
     return-void
 .end method
@@ -276,7 +276,7 @@
 
     const-wide/16 v0, 0x0
 
-    iput-wide v0, p0, Lcom/airbnb/lottie/f/e;->mh:J
+    iput-wide v0, p0, Lcom/airbnb/lottie/f/e;->mi: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;->mi:F
+    iget v0, p0, Lcom/airbnb/lottie/f/e;->mj: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;->mi:F
+    iput v0, p0, Lcom/airbnb/lottie/f/e;->mj:F
 
     return-void
 
@@ -309,7 +309,7 @@
 
     if-nez v0, :cond_1
 
-    iget v0, p0, Lcom/airbnb/lottie/f/e;->mi:F
+    iget v0, p0, Lcom/airbnb/lottie/f/e;->mj: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;->mi:F
+    iput v0, p0, Lcom/airbnb/lottie/f/e;->mj: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;->dS:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/f/e;->dT: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;->mi:F
-
-    iget v0, v0, Lcom/airbnb/lottie/d;->eh:F
-
-    sub-float/2addr v1, v0
-
-    iget-object v0, p0, Lcom/airbnb/lottie/f/e;->dS:Lcom/airbnb/lottie/d;
+    iget v1, p0, Lcom/airbnb/lottie/f/e;->mj:F
 
     iget v0, v0, Lcom/airbnb/lottie/d;->ei:F
 
-    iget-object v2, p0, Lcom/airbnb/lottie/f/e;->dS:Lcom/airbnb/lottie/d;
+    sub-float/2addr v1, v0
 
-    iget v2, v2, Lcom/airbnb/lottie/d;->eh:F
+    iget-object v0, p0, Lcom/airbnb/lottie/f/e;->dT:Lcom/airbnb/lottie/d;
+
+    iget v0, v0, Lcom/airbnb/lottie/d;->ej:F
+
+    iget-object v2, p0, Lcom/airbnb/lottie/f/e;->dT:Lcom/airbnb/lottie/d;
+
+    iget v2, v2, Lcom/airbnb/lottie/d;->ei:F
 
     sub-float/2addr v0, v2
 
@@ -365,7 +365,7 @@
 .method public bG()Z
     .locals 2
 
-    iget v0, p0, Lcom/airbnb/lottie/f/e;->mf:F
+    iget v0, p0, Lcom/airbnb/lottie/f/e;->mg: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;->dS:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/f/e;->dT: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;->mh:J
+    iget-wide v0, p0, Lcom/airbnb/lottie/f/e;->mi: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;->dS:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/f/e;->dT: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;->ej:F
+    iget v0, v0, Lcom/airbnb/lottie/d;->ek:F
 
     div-float/2addr v1, v0
 
-    iget v0, p0, Lcom/airbnb/lottie/f/e;->mf:F
+    iget v0, p0, Lcom/airbnb/lottie/f/e;->mg: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;->mi:F
+    iget v0, p0, Lcom/airbnb/lottie/f/e;->mj: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;->mi:F
+    iput v0, p0, Lcom/airbnb/lottie/f/e;->mj:F
 
-    iget v0, p0, Lcom/airbnb/lottie/f/e;->mi:F
+    iget v0, p0, Lcom/airbnb/lottie/f/e;->mj: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;->mi:F
+    iget v2, p0, Lcom/airbnb/lottie/f/e;->mj: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;->mi:F
+    iput v2, p0, Lcom/airbnb/lottie/f/e;->mj:F
 
-    iput-wide p1, p0, Lcom/airbnb/lottie/f/e;->mh:J
+    iput-wide p1, p0, Lcom/airbnb/lottie/f/e;->mi: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;->mf:F
+    iget p1, p0, Lcom/airbnb/lottie/f/e;->mg:F
 
     const/4 p2, 0x0
 
@@ -548,7 +548,7 @@
     move-result p1
 
     :goto_2
-    iput p1, p0, Lcom/airbnb/lottie/f/e;->mi:F
+    iput p1, p0, Lcom/airbnb/lottie/f/e;->mj: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;->mg:Z
+    iget-boolean v0, p0, Lcom/airbnb/lottie/f/e;->mh:Z
 
     xor-int/2addr v0, v1
 
-    iput-boolean v0, p0, Lcom/airbnb/lottie/f/e;->mg:Z
+    iput-boolean v0, p0, Lcom/airbnb/lottie/f/e;->mh: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;->mi:F
+    iput v0, p0, Lcom/airbnb/lottie/f/e;->mj:F
 
     :goto_4
-    iput-wide p1, p0, Lcom/airbnb/lottie/f/e;->mh:J
+    iput-wide p1, p0, Lcom/airbnb/lottie/f/e;->mi:J
 
     :cond_8
     :goto_5
-    iget-object p1, p0, Lcom/airbnb/lottie/f/e;->dS:Lcom/airbnb/lottie/d;
+    iget-object p1, p0, Lcom/airbnb/lottie/f/e;->dT:Lcom/airbnb/lottie/d;
 
     if-eqz p1, :cond_a
 
-    iget p1, p0, Lcom/airbnb/lottie/f/e;->mi:F
+    iget p1, p0, Lcom/airbnb/lottie/f/e;->mj:F
 
-    iget p2, p0, Lcom/airbnb/lottie/f/e;->mj:F
+    iget p2, p0, Lcom/airbnb/lottie/f/e;->mk:F
 
     cmpg-float p2, p1, p2
 
     if-ltz p2, :cond_9
 
-    iget p2, p0, Lcom/airbnb/lottie/f/e;->mk:F
+    iget p2, p0, Lcom/airbnb/lottie/f/e;->ml:F
 
     cmpl-float p1, p1, p2
 
@@ -640,7 +640,7 @@
 
     const/4 v0, 0x0
 
-    iget v3, p0, Lcom/airbnb/lottie/f/e;->mj:F
+    iget v3, p0, Lcom/airbnb/lottie/f/e;->mk: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;->mk:F
+    iget v0, p0, Lcom/airbnb/lottie/f/e;->ml: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;->mi:F
+    iget v0, p0, Lcom/airbnb/lottie/f/e;->mj: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;->mj:F
+    iget v0, p0, Lcom/airbnb/lottie/f/e;->mk: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;->dS:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/f/e;->dT:Lcom/airbnb/lottie/d;
 
     if-nez v0, :cond_0
 
@@ -711,7 +711,7 @@
 
     move-result v0
 
-    iget v1, p0, Lcom/airbnb/lottie/f/e;->mi:F
+    iget v1, p0, Lcom/airbnb/lottie/f/e;->mj:F
 
     sub-float/2addr v0, v1
 
@@ -731,7 +731,7 @@
     return v0
 
     :cond_1
-    iget v0, p0, Lcom/airbnb/lottie/f/e;->mi:F
+    iget v0, p0, Lcom/airbnb/lottie/f/e;->mj: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;->dS:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/f/e;->dT:Lcom/airbnb/lottie/d;
 
     if-nez v0, :cond_0
 
@@ -788,7 +788,7 @@
 .method public final getMaxFrame()F
     .locals 3
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f/e;->dS:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/f/e;->dT:Lcom/airbnb/lottie/d;
 
     if-nez v0, :cond_0
 
@@ -797,7 +797,7 @@
     return v0
 
     :cond_0
-    iget v1, p0, Lcom/airbnb/lottie/f/e;->mk:F
+    iget v1, p0, Lcom/airbnb/lottie/f/e;->ml:F
 
     const/high16 v2, 0x4f000000
 
@@ -805,7 +805,7 @@
 
     if-nez v2, :cond_1
 
-    iget v0, v0, Lcom/airbnb/lottie/d;->ei:F
+    iget v0, v0, Lcom/airbnb/lottie/d;->ej:F
 
     return v0
 
@@ -816,7 +816,7 @@
 .method public final getMinFrame()F
     .locals 3
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f/e;->dS:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/f/e;->dT:Lcom/airbnb/lottie/d;
 
     if-nez v0, :cond_0
 
@@ -825,7 +825,7 @@
     return v0
 
     :cond_0
-    iget v1, p0, Lcom/airbnb/lottie/f/e;->mj:F
+    iget v1, p0, Lcom/airbnb/lottie/f/e;->mk:F
 
     const/high16 v2, -0x31000000
 
@@ -833,7 +833,7 @@
 
     if-nez v2, :cond_1
 
-    iget v0, v0, Lcom/airbnb/lottie/d;->eh:F
+    iget v0, v0, Lcom/airbnb/lottie/d;->ei:F
 
     return v0
 
@@ -871,7 +871,7 @@
 .method public final setFrame(I)V
     .locals 2
 
-    iget v0, p0, Lcom/airbnb/lottie/f/e;->mi:F
+    iget v0, p0, Lcom/airbnb/lottie/f/e;->mj:F
 
     int-to-float p1, p1
 
@@ -894,11 +894,11 @@
 
     move-result p1
 
-    iput p1, p0, Lcom/airbnb/lottie/f/e;->mi:F
+    iput p1, p0, Lcom/airbnb/lottie/f/e;->mj:F
 
     const-wide/16 v0, 0x0
 
-    iput-wide v0, p0, Lcom/airbnb/lottie/f/e;->mh:J
+    iput-wide v0, p0, Lcom/airbnb/lottie/f/e;->mi: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;->mk:F
+    iget v0, p0, Lcom/airbnb/lottie/f/e;->ml: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;->mg:Z
+    iget-boolean p1, p0, Lcom/airbnb/lottie/f/e;->mh:Z
 
     if-eqz p1, :cond_0
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lcom/airbnb/lottie/f/e;->mg:Z
+    iput-boolean p1, p0, Lcom/airbnb/lottie/f/e;->mh: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 64c1ee28e4..0d204327f5 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 ml:F
+.field public mm:F
 
-.field public mm:I
+.field public mn: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 030d02326a..9e262516b0 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 mn:Landroid/graphics/PointF;
+.field private static mo: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;->mn:Landroid/graphics/PointF;
+    sput-object v0, Lcom/airbnb/lottie/f/g;->mo: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;->jx:Landroid/graphics/PointF;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/b/l;->jy: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;->mn:Landroid/graphics/PointF;
+    sget-object v1, Lcom/airbnb/lottie/f/g;->mo: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;->jw:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/b/l;->jx: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;->jw:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/b/l;->jx: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;->hI:Landroid/graphics/PointF;
+    iget-object v2, v1, Lcom/airbnb/lottie/c/a;->hJ:Landroid/graphics/PointF;
 
-    iget-object v3, v1, Lcom/airbnb/lottie/c/a;->hJ:Landroid/graphics/PointF;
+    iget-object v3, v1, Lcom/airbnb/lottie/c/a;->hK:Landroid/graphics/PointF;
 
-    iget-object v1, v1, Lcom/airbnb/lottie/c/a;->hK:Landroid/graphics/PointF;
+    iget-object v1, v1, Lcom/airbnb/lottie/c/a;->hL:Landroid/graphics/PointF;
 
-    sget-object v4, Lcom/airbnb/lottie/f/g;->mn:Landroid/graphics/PointF;
+    sget-object v4, Lcom/airbnb/lottie/f/g;->mo: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;->mn:Landroid/graphics/PointF;
+    sget-object v2, Lcom/airbnb/lottie/f/g;->mo: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 3287e14ae0..cb7b133cc7 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 hd:Landroid/graphics/PathMeasure;
+.field private static final he:Landroid/graphics/PathMeasure;
 
-.field private static final hg:Landroid/graphics/Path;
+.field private static final hh:Landroid/graphics/Path;
 
-.field private static final kR:[F
+.field private static final kS:[F
 
-.field private static final mo:Landroid/graphics/Path;
+.field private static final mp:Landroid/graphics/Path;
 
-.field private static final mp:F
+.field private static final mq:F
 
-.field private static mq:F
+.field private static mr:F
 
 
 # direct methods
@@ -25,25 +25,25 @@
 
     invoke-direct {v0}, Landroid/graphics/PathMeasure;-><init>()V
 
-    sput-object v0, Lcom/airbnb/lottie/f/h;->hd:Landroid/graphics/PathMeasure;
+    sput-object v0, Lcom/airbnb/lottie/f/h;->he: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;->hg:Landroid/graphics/Path;
+    sput-object v0, Lcom/airbnb/lottie/f/h;->hh: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;->mo:Landroid/graphics/Path;
+    sput-object v0, Lcom/airbnb/lottie/f/h;->mp:Landroid/graphics/Path;
 
     const/4 v0, 0x4
 
     new-array v0, v0, [F
 
-    sput-object v0, Lcom/airbnb/lottie/f/h;->kR:[F
+    sput-object v0, Lcom/airbnb/lottie/f/h;->kS:[F
 
     const-wide/high16 v0, 0x4000000000000000L    # 2.0
 
@@ -53,11 +53,11 @@
 
     double-to-float v0, v0
 
-    sput v0, Lcom/airbnb/lottie/f/h;->mp:F
+    sput v0, Lcom/airbnb/lottie/f/h;->mq:F
 
     const/high16 v0, -0x40800000    # -1.0f
 
-    sput v0, Lcom/airbnb/lottie/f/h;->mq:F
+    sput v0, Lcom/airbnb/lottie/f/h;->mr: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;->kR:[F
+    sget-object v0, Lcom/airbnb/lottie/f/h;->kS:[F
 
     const/4 v1, 0x0
 
@@ -77,7 +77,7 @@
 
     aput v1, v0, v3
 
-    sget v1, Lcom/airbnb/lottie/f/h;->mp:F
+    sget v1, Lcom/airbnb/lottie/f/h;->mq: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;->kR:[F
+    sget-object p0, Lcom/airbnb/lottie/f/h;->kS:[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;->hd:Landroid/graphics/PathMeasure;
+    sget-object v1, Lcom/airbnb/lottie/f/h;->he: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;->hd:Landroid/graphics/PathMeasure;
+    sget-object v1, Lcom/airbnb/lottie/f/h;->he: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;->hg:Landroid/graphics/Path;
+    sget-object p2, Lcom/airbnb/lottie/f/h;->hh:Landroid/graphics/Path;
 
     invoke-virtual {p2}, Landroid/graphics/Path;->reset()V
 
-    sget-object p2, Lcom/airbnb/lottie/f/h;->hd:Landroid/graphics/PathMeasure;
+    sget-object p2, Lcom/airbnb/lottie/f/h;->he:Landroid/graphics/PathMeasure;
 
-    sget-object p3, Lcom/airbnb/lottie/f/h;->hg:Landroid/graphics/Path;
+    sget-object p3, Lcom/airbnb/lottie/f/h;->hh:Landroid/graphics/Path;
 
     const/4 v4, 0x1
 
@@ -451,21 +451,21 @@
 
     if-lez p2, :cond_7
 
-    sget-object p2, Lcom/airbnb/lottie/f/h;->mo:Landroid/graphics/Path;
+    sget-object p2, Lcom/airbnb/lottie/f/h;->mp:Landroid/graphics/Path;
 
     invoke-virtual {p2}, Landroid/graphics/Path;->reset()V
 
-    sget-object p2, Lcom/airbnb/lottie/f/h;->hd:Landroid/graphics/PathMeasure;
+    sget-object p2, Lcom/airbnb/lottie/f/h;->he:Landroid/graphics/PathMeasure;
 
     rem-float/2addr p1, v1
 
-    sget-object p3, Lcom/airbnb/lottie/f/h;->mo:Landroid/graphics/Path;
+    sget-object p3, Lcom/airbnb/lottie/f/h;->mp: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;->hg:Landroid/graphics/Path;
+    sget-object p1, Lcom/airbnb/lottie/f/h;->hh:Landroid/graphics/Path;
 
-    sget-object p2, Lcom/airbnb/lottie/f/h;->mo:Landroid/graphics/Path;
+    sget-object p2, Lcom/airbnb/lottie/f/h;->mp: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;->mo:Landroid/graphics/Path;
+    sget-object p1, Lcom/airbnb/lottie/f/h;->mp:Landroid/graphics/Path;
 
     invoke-virtual {p1}, Landroid/graphics/Path;->reset()V
 
-    sget-object p1, Lcom/airbnb/lottie/f/h;->hd:Landroid/graphics/PathMeasure;
+    sget-object p1, Lcom/airbnb/lottie/f/h;->he:Landroid/graphics/PathMeasure;
 
     add-float/2addr v2, v1
 
-    sget-object p2, Lcom/airbnb/lottie/f/h;->mo:Landroid/graphics/Path;
+    sget-object p2, Lcom/airbnb/lottie/f/h;->mp: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;->hg:Landroid/graphics/Path;
+    sget-object p1, Lcom/airbnb/lottie/f/h;->hh:Landroid/graphics/Path;
 
-    sget-object p2, Lcom/airbnb/lottie/f/h;->mo:Landroid/graphics/Path;
+    sget-object p2, Lcom/airbnb/lottie/f/h;->mp: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;->hg:Landroid/graphics/Path;
+    sget-object p1, Lcom/airbnb/lottie/f/h;->hh: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;->fY:Z
+    iget-boolean v0, p1, Lcom/airbnb/lottie/a/a/s;->fZ:Z
 
     if-eqz v0, :cond_0
 
     goto :goto_0
 
     :cond_0
-    iget-object v0, p1, Lcom/airbnb/lottie/a/a/s;->gJ:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p1, Lcom/airbnb/lottie/a/a/s;->gK: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;->gK:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, p1, Lcom/airbnb/lottie/a/a/s;->gL: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;->gL:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p1, Lcom/airbnb/lottie/a/a/s;->gM: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;->kR:[F
+    sget-object v0, Lcom/airbnb/lottie/f/h;->kS:[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;->kR:[F
+    sget-object p0, Lcom/airbnb/lottie/f/h;->kS:[F
 
     aget v0, p0, v2
 
@@ -661,7 +661,7 @@
 .method public static bH()F
     .locals 2
 
-    sget v0, Lcom/airbnb/lottie/f/h;->mq:F
+    sget v0, Lcom/airbnb/lottie/f/h;->mr: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;->mq:F
+    sput v0, Lcom/airbnb/lottie/f/h;->mr:F
 
     :cond_0
-    sget v0, Lcom/airbnb/lottie/f/h;->mq:F
+    sget v0, Lcom/airbnb/lottie/f/h;->mr: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 569f5d194a..dc5a875adc 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 eQ:Ljava/lang/String;
+.field public final eR:Ljava/lang/String;
 
-.field private final eR:Ljava/lang/String;
+.field private final eS:Ljava/lang/String;
 
-.field public eS:Landroid/graphics/Bitmap;
+.field public eT: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;->eQ:Ljava/lang/String;
+    iput-object p4, p0, Lcom/airbnb/lottie/g;->eR:Ljava/lang/String;
 
-    iput-object p5, p0, Lcom/airbnb/lottie/g;->eR:Ljava/lang/String;
+    iput-object p5, p0, Lcom/airbnb/lottie/g;->eS: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 4be6fd6987..4a934d4847 100644
--- a/com.discord/smali/com/airbnb/lottie/g/a.smali
+++ b/com.discord/smali/com/airbnb/lottie/g/a.smali
@@ -15,17 +15,19 @@
 
 
 # instance fields
-.field private final dS:Lcom/airbnb/lottie/d;
+.field private final dT:Lcom/airbnb/lottie/d;
 
-.field public final eh:F
+.field public final ei:F
 
 .field private mB:F
 
-.field public mC:Landroid/graphics/PointF;
+.field private mC:F
 
 .field public mD:Landroid/graphics/PointF;
 
-.field public final mr:Ljava/lang/Object;
+.field public mE:Landroid/graphics/PointF;
+
+.field public final ms:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TT;"
@@ -33,7 +35,7 @@
     .end annotation
 .end field
 
-.field public ms:Ljava/lang/Object;
+.field public mt:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TT;"
@@ -41,19 +43,17 @@
     .end annotation
 .end field
 
-.field public final mt:Landroid/view/animation/Interpolator;
+.field public final mu:Landroid/view/animation/Interpolator;
 
-.field public mu:Ljava/lang/Float;
-
-.field public mv:F
+.field public mv:Ljava/lang/Float;
 
 .field public mw:F
 
-.field public mx:I
+.field public mx:F
 
 .field public my:I
 
-.field private mz:F
+.field public mz:I
 
 
 # direct methods
@@ -75,39 +75,39 @@
 
     const v0, -0x358c9d09
 
-    iput v0, p0, Lcom/airbnb/lottie/g/a;->mv:F
-
     iput v0, p0, Lcom/airbnb/lottie/g/a;->mw:F
 
+    iput v0, p0, Lcom/airbnb/lottie/g/a;->mx:F
+
     const v0, 0x2ec8fb09
 
-    iput v0, p0, Lcom/airbnb/lottie/g/a;->mx:I
-
     iput v0, p0, Lcom/airbnb/lottie/g/a;->my:I
 
+    iput v0, p0, Lcom/airbnb/lottie/g/a;->mz:I
+
     const/4 v0, 0x1
 
-    iput v0, p0, Lcom/airbnb/lottie/g/a;->mz:F
-
     iput v0, p0, Lcom/airbnb/lottie/g/a;->mB:F
 
+    iput v0, p0, Lcom/airbnb/lottie/g/a;->mC: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 p1, p0, Lcom/airbnb/lottie/g/a;->dS:Lcom/airbnb/lottie/d;
+    iput-object v0, p0, Lcom/airbnb/lottie/g/a;->mE:Landroid/graphics/PointF;
 
-    iput-object p2, p0, Lcom/airbnb/lottie/g/a;->mr:Ljava/lang/Object;
+    iput-object p1, p0, Lcom/airbnb/lottie/g/a;->dT:Lcom/airbnb/lottie/d;
 
-    iput-object p3, p0, Lcom/airbnb/lottie/g/a;->ms:Ljava/lang/Object;
+    iput-object p2, p0, Lcom/airbnb/lottie/g/a;->ms:Ljava/lang/Object;
 
-    iput-object p4, p0, Lcom/airbnb/lottie/g/a;->mt:Landroid/view/animation/Interpolator;
+    iput-object p3, p0, Lcom/airbnb/lottie/g/a;->mt:Ljava/lang/Object;
 
-    iput p5, p0, Lcom/airbnb/lottie/g/a;->eh:F
+    iput-object p4, p0, Lcom/airbnb/lottie/g/a;->mu:Landroid/view/animation/Interpolator;
 
-    iput-object p6, p0, Lcom/airbnb/lottie/g/a;->mu:Ljava/lang/Float;
+    iput p5, p0, Lcom/airbnb/lottie/g/a;->ei:F
+
+    iput-object p6, p0, Lcom/airbnb/lottie/g/a;->mv:Ljava/lang/Float;
 
     return-void
 .end method
@@ -124,37 +124,37 @@
 
     const v0, -0x358c9d09
 
-    iput v0, p0, Lcom/airbnb/lottie/g/a;->mv:F
-
     iput v0, p0, Lcom/airbnb/lottie/g/a;->mw:F
 
+    iput v0, p0, Lcom/airbnb/lottie/g/a;->mx:F
+
     const v0, 0x2ec8fb09
 
-    iput v0, p0, Lcom/airbnb/lottie/g/a;->mx:I
-
     iput v0, p0, Lcom/airbnb/lottie/g/a;->my:I
 
+    iput v0, p0, Lcom/airbnb/lottie/g/a;->mz:I
+
     const/4 v0, 0x1
 
-    iput v0, p0, Lcom/airbnb/lottie/g/a;->mz:F
-
     iput v0, p0, Lcom/airbnb/lottie/g/a;->mB:F
 
+    iput v0, p0, Lcom/airbnb/lottie/g/a;->mC: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;->dS:Lcom/airbnb/lottie/d;
+    iput-object v1, p0, Lcom/airbnb/lottie/g/a;->mE:Landroid/graphics/PointF;
 
-    iput-object p1, p0, Lcom/airbnb/lottie/g/a;->mr:Ljava/lang/Object;
+    iput-object v1, p0, Lcom/airbnb/lottie/g/a;->dT:Lcom/airbnb/lottie/d;
 
     iput-object p1, p0, Lcom/airbnb/lottie/g/a;->ms:Ljava/lang/Object;
 
-    iput-object v1, p0, Lcom/airbnb/lottie/g/a;->mt:Landroid/view/animation/Interpolator;
+    iput-object p1, p0, Lcom/airbnb/lottie/g/a;->mt:Ljava/lang/Object;
 
-    iput v0, p0, Lcom/airbnb/lottie/g/a;->eh:F
+    iput-object v1, p0, Lcom/airbnb/lottie/g/a;->mu:Landroid/view/animation/Interpolator;
+
+    iput v0, p0, Lcom/airbnb/lottie/g/a;->ei:F
 
     const p1, 0x7f7fffff    # Float.MAX_VALUE
 
@@ -162,7 +162,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/airbnb/lottie/g/a;->mu:Ljava/lang/Float;
+    iput-object p1, p0, Lcom/airbnb/lottie/g/a;->mv: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;->dS:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/g/a;->dT: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;->mz:F
+    iget v1, p0, Lcom/airbnb/lottie/g/a;->mB:F
 
     const/4 v2, 0x1
 
@@ -189,13 +189,13 @@
 
     if-nez v1, :cond_1
 
-    iget v1, p0, Lcom/airbnb/lottie/g/a;->eh:F
+    iget v1, p0, Lcom/airbnb/lottie/g/a;->ei:F
 
-    iget v0, v0, Lcom/airbnb/lottie/d;->eh:F
+    iget v0, v0, Lcom/airbnb/lottie/d;->ei:F
 
     sub-float/2addr v1, v0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/g/a;->dS:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/g/a;->dT: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;->mz:F
+    iput v1, p0, Lcom/airbnb/lottie/g/a;->mB:F
 
     :cond_1
-    iget v0, p0, Lcom/airbnb/lottie/g/a;->mz:F
+    iget v0, p0, Lcom/airbnb/lottie/g/a;->mB: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;->dS:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/g/a;->dT: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;->mB:F
+    iget v0, p0, Lcom/airbnb/lottie/g/a;->mC:F
 
     const/4 v2, 0x1
 
@@ -231,11 +231,11 @@
 
     if-nez v0, :cond_2
 
-    iget-object v0, p0, Lcom/airbnb/lottie/g/a;->mu:Ljava/lang/Float;
+    iget-object v0, p0, Lcom/airbnb/lottie/g/a;->mv:Ljava/lang/Float;
 
     if-nez v0, :cond_1
 
-    iput v1, p0, Lcom/airbnb/lottie/g/a;->mB:F
+    iput v1, p0, Lcom/airbnb/lottie/g/a;->mC:F
 
     goto :goto_0
 
@@ -244,17 +244,17 @@
 
     move-result v0
 
-    iget-object v1, p0, Lcom/airbnb/lottie/g/a;->mu:Ljava/lang/Float;
+    iget-object v1, p0, Lcom/airbnb/lottie/g/a;->mv:Ljava/lang/Float;
 
     invoke-virtual {v1}, Ljava/lang/Float;->floatValue()F
 
     move-result v1
 
-    iget v2, p0, Lcom/airbnb/lottie/g/a;->eh:F
+    iget v2, p0, Lcom/airbnb/lottie/g/a;->ei:F
 
     sub-float/2addr v1, v2
 
-    iget-object v2, p0, Lcom/airbnb/lottie/g/a;->dS:Lcom/airbnb/lottie/d;
+    iget-object v2, p0, Lcom/airbnb/lottie/g/a;->dT: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;->mB:F
+    iput v0, p0, Lcom/airbnb/lottie/g/a;->mC:F
 
     :cond_2
     :goto_0
-    iget v0, p0, Lcom/airbnb/lottie/g/a;->mB:F
+    iget v0, p0, Lcom/airbnb/lottie/g/a;->mC: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;->mt:Landroid/view/animation/Interpolator;
+    iget-object v0, p0, Lcom/airbnb/lottie/g/a;->mu: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;->mr: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;
 
@@ -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;->ms:Ljava/lang/Object;
+    iget-object v1, p0, Lcom/airbnb/lottie/g/a;->mt: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;->eh:F
+    iget v1, p0, Lcom/airbnb/lottie/g/a;->ei: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;->mu:Ljava/lang/Float;
+    iget-object v1, p0, Lcom/airbnb/lottie/g/a;->mv: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;->mt:Landroid/view/animation/Interpolator;
+    iget-object v1, p0, Lcom/airbnb/lottie/g/a;->mu: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 85ce0a7a1e..409f098713 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 mE:F
+.field ej:F
 
 .field mF:F
 
 .field mG:F
 
-.field mr:Ljava/lang/Object;
+.field mH:F
+
+.field ms:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TT;"
@@ -33,7 +33,7 @@
     .end annotation
 .end field
 
-.field ms:Ljava/lang/Object;
+.field mt: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 55a5674a36..aa376a8365 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 hw:Lcom/airbnb/lottie/g/b;
+.field private final hx: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 mH:Lcom/airbnb/lottie/a/b/a;
+.field public mI: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;->hw:Lcom/airbnb/lottie/g/b;
+    iput-object v0, p0, Lcom/airbnb/lottie/g/c;->hx: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;->hw:Lcom/airbnb/lottie/g/b;
+    iput-object v0, p0, Lcom/airbnb/lottie/g/c;->hx:Lcom/airbnb/lottie/g/b;
 
     const/4 v0, 0x0
 
@@ -96,21 +96,21 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/airbnb/lottie/g/c;->hw:Lcom/airbnb/lottie/g/b;
+    iget-object v0, p0, Lcom/airbnb/lottie/g/c;->hx:Lcom/airbnb/lottie/g/b;
 
-    iput p1, v0, Lcom/airbnb/lottie/g/b;->eh:F
+    iput p1, v0, Lcom/airbnb/lottie/g/b;->ei:F
 
-    iput p2, v0, Lcom/airbnb/lottie/g/b;->ei:F
+    iput p2, v0, Lcom/airbnb/lottie/g/b;->ej:F
 
-    iput-object p3, v0, Lcom/airbnb/lottie/g/b;->mr:Ljava/lang/Object;
+    iput-object p3, v0, Lcom/airbnb/lottie/g/b;->ms:Ljava/lang/Object;
 
-    iput-object p4, v0, Lcom/airbnb/lottie/g/b;->ms:Ljava/lang/Object;
+    iput-object p4, v0, Lcom/airbnb/lottie/g/b;->mt:Ljava/lang/Object;
 
-    iput p5, v0, Lcom/airbnb/lottie/g/b;->mE:F
+    iput p5, v0, Lcom/airbnb/lottie/g/b;->mF:F
 
-    iput p6, v0, Lcom/airbnb/lottie/g/b;->mF:F
+    iput p6, v0, Lcom/airbnb/lottie/g/b;->mG:F
 
-    iput p7, v0, Lcom/airbnb/lottie/g/b;->mG:F
+    iput p7, v0, Lcom/airbnb/lottie/g/b;->mH: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 5fe9d269f4..61ec0935ce 100644
--- a/com.discord/smali/com/airbnb/lottie/j.smali
+++ b/com.discord/smali/com/airbnb/lottie/j.smali
@@ -4,15 +4,13 @@
 
 
 # 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:Landroid/graphics/PointF;
+.field public static final eX:Ljava/lang/Integer;
 
 .field public static final eY:Landroid/graphics/PointF;
 
@@ -20,13 +18,13 @@
 
 .field public static final fa:Landroid/graphics/PointF;
 
-.field public static final fb:Ljava/lang/Float;
+.field public static final fb:Landroid/graphics/PointF;
 
-.field public static final fc:Landroid/graphics/PointF;
+.field public static final fc:Ljava/lang/Float;
 
-.field public static final fd:Lcom/airbnb/lottie/g/d;
+.field public static final fd:Landroid/graphics/PointF;
 
-.field public static final fe:Ljava/lang/Float;
+.field public static final fe:Lcom/airbnb/lottie/g/d;
 
 .field public static final ff:Ljava/lang/Float;
 
@@ -58,9 +56,11 @@
 
 .field public static final ft:Ljava/lang/Float;
 
-.field public static final fu:Landroid/graphics/ColorFilter;
+.field public static final fu:Ljava/lang/Float;
 
-.field public static final fv:[Ljava/lang/Integer;
+.field public static final fv:Landroid/graphics/ColorFilter;
+
+.field public static final fw:[Ljava/lang/Integer;
 
 
 # direct methods
@@ -73,7 +73,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/j;->eT:Ljava/lang/Integer;
+    sput-object v0, Lcom/airbnb/lottie/j;->eU:Ljava/lang/Integer;
 
     const/4 v0, 0x2
 
@@ -81,7 +81,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/j;->eU:Ljava/lang/Integer;
+    sput-object v0, Lcom/airbnb/lottie/j;->eV:Ljava/lang/Integer;
 
     const/4 v0, 0x3
 
@@ -89,7 +89,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/j;->eV:Ljava/lang/Integer;
+    sput-object v0, Lcom/airbnb/lottie/j;->eW:Ljava/lang/Integer;
 
     const/4 v0, 0x4
 
@@ -97,13 +97,7 @@
 
     move-result-object v0
 
-    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;
+    sput-object v0, Lcom/airbnb/lottie/j;->eX:Ljava/lang/Integer;
 
     new-instance v0, Landroid/graphics/PointF;
 
@@ -123,25 +117,31 @@
 
     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;->fb:Ljava/lang/Float;
+    sput-object v0, Lcom/airbnb/lottie/j;->fc:Ljava/lang/Float;
 
     new-instance v1, Landroid/graphics/PointF;
 
     invoke-direct {v1}, Landroid/graphics/PointF;-><init>()V
 
-    sput-object v1, Lcom/airbnb/lottie/j;->fc:Landroid/graphics/PointF;
+    sput-object v1, Lcom/airbnb/lottie/j;->fd: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;->fd:Lcom/airbnb/lottie/g/d;
+    sput-object v1, Lcom/airbnb/lottie/j;->fe: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;->fe:Ljava/lang/Float;
-
-    sput-object v0, Lcom/airbnb/lottie/j;->ff:Ljava/lang/Float;
+    sput-object v1, 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;->fh:Ljava/lang/Float;
+    sput-object v0, Lcom/airbnb/lottie/j;->fi:Ljava/lang/Float;
 
     const/high16 v0, 0x40400000    # 3.0f
 
@@ -169,7 +169,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/j;->fi:Ljava/lang/Float;
+    sput-object v0, Lcom/airbnb/lottie/j;->fj:Ljava/lang/Float;
 
     const/high16 v0, 0x40800000    # 4.0f
 
@@ -177,7 +177,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/j;->fj:Ljava/lang/Float;
+    sput-object v0, Lcom/airbnb/lottie/j;->fk:Ljava/lang/Float;
 
     const/high16 v0, 0x40a00000    # 5.0f
 
@@ -185,7 +185,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/j;->fk:Ljava/lang/Float;
+    sput-object v0, Lcom/airbnb/lottie/j;->fl:Ljava/lang/Float;
 
     const/high16 v0, 0x40c00000    # 6.0f
 
@@ -193,7 +193,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/j;->fl:Ljava/lang/Float;
+    sput-object v0, Lcom/airbnb/lottie/j;->fm:Ljava/lang/Float;
 
     const/high16 v0, 0x40e00000    # 7.0f
 
@@ -201,7 +201,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/j;->fm:Ljava/lang/Float;
+    sput-object v0, Lcom/airbnb/lottie/j;->fn:Ljava/lang/Float;
 
     const/high16 v0, 0x41000000    # 8.0f
 
@@ -209,7 +209,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/j;->fn:Ljava/lang/Float;
+    sput-object v0, Lcom/airbnb/lottie/j;->fo:Ljava/lang/Float;
 
     const/high16 v0, 0x41100000    # 9.0f
 
@@ -217,7 +217,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/j;->fo:Ljava/lang/Float;
+    sput-object v0, Lcom/airbnb/lottie/j;->fp:Ljava/lang/Float;
 
     const/high16 v0, 0x41200000    # 10.0f
 
@@ -225,7 +225,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/j;->fp:Ljava/lang/Float;
+    sput-object v0, Lcom/airbnb/lottie/j;->fq:Ljava/lang/Float;
 
     const/high16 v0, 0x41300000    # 11.0f
 
@@ -233,7 +233,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/j;->fq:Ljava/lang/Float;
+    sput-object v0, Lcom/airbnb/lottie/j;->fr:Ljava/lang/Float;
 
     const/high16 v0, 0x41400000    # 12.0f
 
@@ -241,29 +241,29 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/j;->fr:Ljava/lang/Float;
-
     sput-object v0, Lcom/airbnb/lottie/j;->fs:Ljava/lang/Float;
 
+    sput-object v0, Lcom/airbnb/lottie/j;->ft:Ljava/lang/Float;
+
     const/high16 v0, 0x41500000    # 13.0f
 
     invoke-static {v0}, Ljava/lang/Float;->valueOf(F)Ljava/lang/Float;
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/j;->ft:Ljava/lang/Float;
+    sput-object v0, Lcom/airbnb/lottie/j;->fu:Ljava/lang/Float;
 
     new-instance v0, Landroid/graphics/ColorFilter;
 
     invoke-direct {v0}, Landroid/graphics/ColorFilter;-><init>()V
 
-    sput-object v0, Lcom/airbnb/lottie/j;->fu:Landroid/graphics/ColorFilter;
+    sput-object v0, Lcom/airbnb/lottie/j;->fv:Landroid/graphics/ColorFilter;
 
     const/4 v0, 0x0
 
     new-array v0, v0, [Ljava/lang/Integer;
 
-    sput-object v0, Lcom/airbnb/lottie/j;->fv:[Ljava/lang/Integer;
+    sput-object v0, Lcom/airbnb/lottie/j;->fw:[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 d76819bd88..b8b1efb36c 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 fA:Lcom/airbnb/lottie/l;
+.field final synthetic fB: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;->fA:Lcom/airbnb/lottie/l;
+    iput-object p1, p0, Lcom/airbnb/lottie/l$1;->fB: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;->fA:Lcom/airbnb/lottie/l;
+    iget-object v0, p0, Lcom/airbnb/lottie/l$1;->fB: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;->fA:Lcom/airbnb/lottie/l;
+    iget-object v0, p0, Lcom/airbnb/lottie/l$1;->fB: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;->fA:Lcom/airbnb/lottie/l;
+    iget-object v1, p0, Lcom/airbnb/lottie/l$1;->fB: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;->fA:Lcom/airbnb/lottie/l;
+    iget-object v1, p0, Lcom/airbnb/lottie/l$1;->fB: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 e870db735d..4cea929f3b 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 fA:Lcom/airbnb/lottie/l;
+.field final synthetic fB:Lcom/airbnb/lottie/l;
 
 
 # direct methods
@@ -38,7 +38,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/airbnb/lottie/l$a;->fA:Lcom/airbnb/lottie/l;
+    iput-object p1, p0, Lcom/airbnb/lottie/l$a;->fB: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;->fA:Lcom/airbnb/lottie/l;
+    iget-object v0, p0, Lcom/airbnb/lottie/l$a;->fB: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;->fA:Lcom/airbnb/lottie/l;
+    iget-object v1, p0, Lcom/airbnb/lottie/l$a;->fB: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 ea3f9f03ac..e3c64b650f 100644
--- a/com.discord/smali/com/airbnb/lottie/l.smali
+++ b/com.discord/smali/com/airbnb/lottie/l.smali
@@ -21,16 +21,15 @@
 
 
 # static fields
-.field public static fw:Ljava/util/concurrent/Executor;
+.field public static fx:Ljava/util/concurrent/Executor;
 
 
 # instance fields
-.field private final fx:Ljava/util/Set;
+.field private volatile fA:Lcom/airbnb/lottie/k;
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "Ljava/util/Set<",
-            "Lcom/airbnb/lottie/h<",
-            "TT;>;>;"
+            "Lcom/airbnb/lottie/k<",
+            "TT;>;"
         }
     .end annotation
 .end field
@@ -40,17 +39,18 @@
         value = {
             "Ljava/util/Set<",
             "Lcom/airbnb/lottie/h<",
-            "Ljava/lang/Throwable;",
-            ">;>;"
+            "TT;>;>;"
         }
     .end annotation
 .end field
 
-.field private volatile fz:Lcom/airbnb/lottie/k;
+.field private final fz:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "Lcom/airbnb/lottie/k<",
-            "TT;>;"
+            "Ljava/util/Set<",
+            "Lcom/airbnb/lottie/h<",
+            "Ljava/lang/Throwable;",
+            ">;>;"
         }
     .end annotation
 .end field
@@ -66,7 +66,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/l;->fw:Ljava/util/concurrent/Executor;
+    sput-object v0, Lcom/airbnb/lottie/l;->fx: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;->fx:Ljava/util/Set;
+    iput-object p2, p0, Lcom/airbnb/lottie/l;->fy: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;->fy:Ljava/util/Set;
+    iput-object p2, p0, Lcom/airbnb/lottie/l;->fz: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;->fz:Lcom/airbnb/lottie/k;
+    iput-object p2, p0, Lcom/airbnb/lottie/l;->fA:Lcom/airbnb/lottie/k;
 
-    sget-object p2, Lcom/airbnb/lottie/l;->fw:Ljava/util/concurrent/Executor;
+    sget-object p2, Lcom/airbnb/lottie/l;->fx: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;->fz:Lcom/airbnb/lottie/k;
+    iget-object p0, p0, Lcom/airbnb/lottie/l;->fA: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;->fz:Lcom/airbnb/lottie/k;
+    iget-object v0, p0, Lcom/airbnb/lottie/l;->fA:Lcom/airbnb/lottie/k;
 
     if-nez v0, :cond_0
 
-    iput-object p1, p0, Lcom/airbnb/lottie/l;->fz:Lcom/airbnb/lottie/k;
+    iput-object p1, p0, Lcom/airbnb/lottie/l;->fA: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;->fy:Ljava/util/Set;
+    iget-object v1, p0, Lcom/airbnb/lottie/l;->fz: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;->fx: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
 
@@ -342,24 +342,24 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/airbnb/lottie/l;->fz:Lcom/airbnb/lottie/k;
+    iget-object v0, p0, Lcom/airbnb/lottie/l;->fA:Lcom/airbnb/lottie/k;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/l;->fz:Lcom/airbnb/lottie/k;
+    iget-object v0, p0, Lcom/airbnb/lottie/l;->fA: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;->fz:Lcom/airbnb/lottie/k;
+    iget-object v0, p0, Lcom/airbnb/lottie/l;->fA: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;->fx: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
@@ -392,7 +392,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/airbnb/lottie/l;->fx: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
@@ -426,24 +426,24 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/airbnb/lottie/l;->fz:Lcom/airbnb/lottie/k;
+    iget-object v0, p0, Lcom/airbnb/lottie/l;->fA:Lcom/airbnb/lottie/k;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/l;->fz:Lcom/airbnb/lottie/k;
+    iget-object v0, p0, Lcom/airbnb/lottie/l;->fA: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;->fz:Lcom/airbnb/lottie/k;
+    iget-object v0, p0, Lcom/airbnb/lottie/l;->fA: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;->fy:Ljava/util/Set;
+    iget-object v0, p0, Lcom/airbnb/lottie/l;->fz: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;->fy:Ljava/util/Set;
+    iget-object v0, p0, Lcom/airbnb/lottie/l;->fz: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 81b7523cbf..2f40510816 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 fE:Lcom/airbnb/lottie/m;
+.field final synthetic fF: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;->fE:Lcom/airbnb/lottie/m;
+    iput-object p1, p0, Lcom/airbnb/lottie/m$1;->fF: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 fb96389bf1..2b3be5be63 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 fB:Ljava/util/Set;
+.field private final fC:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -16,7 +16,7 @@
     .end annotation
 .end field
 
-.field private final fC:Ljava/util/Map;
+.field private final fD:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -27,7 +27,7 @@
     .end annotation
 .end field
 
-.field private final fD:Ljava/util/Comparator;
+.field private final fE: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;->fB:Ljava/util/Set;
+    iput-object v0, p0, Lcom/airbnb/lottie/m;->fC: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;->fC:Ljava/util/Map;
+    iput-object v0, p0, Lcom/airbnb/lottie/m;->fD: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;->fD:Ljava/util/Comparator;
+    iput-object v0, p0, Lcom/airbnb/lottie/m;->fE:Ljava/util/Comparator;
 
     return-void
 .end method
@@ -83,7 +83,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/airbnb/lottie/m;->fC:Ljava/util/Map;
+    iget-object v0, p0, Lcom/airbnb/lottie/m;->fD: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;->fC:Ljava/util/Map;
+    iget-object v1, p0, Lcom/airbnb/lottie/m;->fD: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;->ml:F
+    iget v1, v0, Lcom/airbnb/lottie/f/f;->mm:F
 
     add-float/2addr v1, p2
 
-    iput v1, v0, Lcom/airbnb/lottie/f/f;->ml:F
+    iput v1, v0, Lcom/airbnb/lottie/f/f;->mm:F
 
-    iget p2, v0, Lcom/airbnb/lottie/f/f;->mm:I
+    iget p2, v0, Lcom/airbnb/lottie/f/f;->mn:I
 
     add-int/lit8 p2, p2, 0x1
 
-    iput p2, v0, Lcom/airbnb/lottie/f/f;->mm:I
+    iput p2, v0, Lcom/airbnb/lottie/f/f;->mn:I
 
-    iget p2, v0, Lcom/airbnb/lottie/f/f;->mm:I
+    iget p2, v0, Lcom/airbnb/lottie/f/f;->mn:I
 
     const v1, 0x7fffffff
 
     if-ne p2, v1, :cond_2
 
-    iget p2, v0, Lcom/airbnb/lottie/f/f;->ml:F
+    iget p2, v0, Lcom/airbnb/lottie/f/f;->mm:F
 
     const/high16 v1, 0x40000000    # 2.0f
 
     div-float/2addr p2, v1
 
-    iput p2, v0, Lcom/airbnb/lottie/f/f;->ml:F
+    iput p2, v0, Lcom/airbnb/lottie/f/f;->mm:F
 
-    iget p2, v0, Lcom/airbnb/lottie/f/f;->mm:I
+    iget p2, v0, Lcom/airbnb/lottie/f/f;->mn:I
 
     div-int/lit8 p2, p2, 0x2
 
-    iput p2, v0, Lcom/airbnb/lottie/f/f;->mm:I
+    iput p2, v0, Lcom/airbnb/lottie/f/f;->mn:I
 
     :cond_2
     const-string p2, "__container"
@@ -143,7 +143,7 @@
 
     if-eqz p1, :cond_3
 
-    iget-object p1, p0, Lcom/airbnb/lottie/m;->fB:Ljava/util/Set;
+    iget-object p1, p0, Lcom/airbnb/lottie/m;->fC: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 703bd1abe9..29dfe41c25 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 private static final synthetic fI:[Lcom/airbnb/lottie/n;
+.field public static final enum fI:Lcom/airbnb/lottie/n;
+
+.field private static final synthetic fJ:[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;->fF:Lcom/airbnb/lottie/n;
+    sput-object v0, Lcom/airbnb/lottie/n;->fG: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;->fG:Lcom/airbnb/lottie/n;
+    sput-object v0, Lcom/airbnb/lottie/n;->fH: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;->fH:Lcom/airbnb/lottie/n;
+    sput-object v0, Lcom/airbnb/lottie/n;->fI:Lcom/airbnb/lottie/n;
 
     const/4 v0, 0x3
 
     new-array v0, v0, [Lcom/airbnb/lottie/n;
 
-    sget-object v4, Lcom/airbnb/lottie/n;->fF:Lcom/airbnb/lottie/n;
+    sget-object v4, Lcom/airbnb/lottie/n;->fG:Lcom/airbnb/lottie/n;
 
     aput-object v4, v0, v1
 
-    sget-object v1, Lcom/airbnb/lottie/n;->fG:Lcom/airbnb/lottie/n;
+    sget-object v1, Lcom/airbnb/lottie/n;->fH:Lcom/airbnb/lottie/n;
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/airbnb/lottie/n;->fH:Lcom/airbnb/lottie/n;
+    sget-object v1, Lcom/airbnb/lottie/n;->fI:Lcom/airbnb/lottie/n;
 
     aput-object v1, v0, v3
 
-    sput-object v0, Lcom/airbnb/lottie/n;->fI:[Lcom/airbnb/lottie/n;
+    sput-object v0, Lcom/airbnb/lottie/n;->fJ:[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;->fI:[Lcom/airbnb/lottie/n;
+    sget-object v0, Lcom/airbnb/lottie/n;->fJ:[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 fe6506f745..657d860891 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 fJ:Ljava/util/Map;
+.field public final fK:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -15,4 +15,4 @@
     .end annotation
 .end field
 
-.field public fK:Z
+.field public fL:Z
diff --git a/com.discord/smali/com/angarron/colorpicker/R$a.smali b/com.discord/smali/com/angarron/colorpicker/R$a.smali
index 954b91d5ca..a59fe8ad67 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 = 0x7f0a00ca
+.field public static final beginning:I = 0x7f0a00c9
 
 .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 = 0x7f0a0235
+.field public static final contentPanel:I = 0x7f0a0234
 
-.field public static final custom:I = 0x7f0a0252
+.field public static final custom:I = 0x7f0a0251
 
-.field public static final customPanel:I = 0x7f0a0253
+.field public static final customPanel:I = 0x7f0a0252
 
-.field public static final decor_content_parent:I = 0x7f0a0257
+.field public static final decor_content_parent:I = 0x7f0a0256
 
-.field public static final default_activity_button:I = 0x7f0a0258
+.field public static final default_activity_button:I = 0x7f0a0257
 
-.field public static final disableHome:I = 0x7f0a027c
+.field public static final disableHome:I = 0x7f0a027b
 
-.field public static final edit_query:I = 0x7f0a02ae
+.field public static final edit_query:I = 0x7f0a02ad
 
-.field public static final end:I = 0x7f0a02c9
+.field public static final end:I = 0x7f0a02c8
 
-.field public static final expand_activities_button:I = 0x7f0a02ce
+.field public static final expand_activities_button:I = 0x7f0a02cd
 
-.field public static final expanded_menu:I = 0x7f0a02cf
+.field public static final expanded_menu:I = 0x7f0a02ce
 
-.field public static final home:I = 0x7f0a0394
+.field public static final home:I = 0x7f0a038f
 
-.field public static final homeAsUp:I = 0x7f0a0395
+.field public static final homeAsUp:I = 0x7f0a0390
 
-.field public static final icon:I = 0x7f0a0396
+.field public static final icon:I = 0x7f0a0391
 
-.field public static final ifRoom:I = 0x7f0a0399
+.field public static final ifRoom:I = 0x7f0a0394
 
-.field public static final image:I = 0x7f0a039a
+.field public static final image:I = 0x7f0a0395
 
-.field public static final info:I = 0x7f0a03ac
+.field public static final info:I = 0x7f0a03a7
 
-.field public static final line1:I = 0x7f0a041d
+.field public static final line1:I = 0x7f0a0418
 
-.field public static final line3:I = 0x7f0a041e
+.field public static final line3:I = 0x7f0a0419
 
-.field public static final listMode:I = 0x7f0a0420
+.field public static final listMode:I = 0x7f0a041b
 
-.field public static final list_item:I = 0x7f0a0421
+.field public static final list_item:I = 0x7f0a041c
 
-.field public static final middle:I = 0x7f0a0489
+.field public static final middle:I = 0x7f0a047c
 
-.field public static final multiply:I = 0x7f0a048d
+.field public static final multiply:I = 0x7f0a0480
 
-.field public static final never:I = 0x7f0a049a
+.field public static final never:I = 0x7f0a048d
 
-.field public static final none:I = 0x7f0a04a2
+.field public static final none:I = 0x7f0a0495
 
-.field public static final normal:I = 0x7f0a04a3
+.field public static final normal:I = 0x7f0a0496
 
-.field public static final parentPanel:I = 0x7f0a04e2
+.field public static final parentPanel:I = 0x7f0a04d5
 
-.field public static final progress_circular:I = 0x7f0a055c
+.field public static final progress_circular:I = 0x7f0a054d
 
-.field public static final progress_horizontal:I = 0x7f0a055e
+.field public static final progress_horizontal:I = 0x7f0a054f
 
-.field public static final radio:I = 0x7f0a0569
+.field public static final radio:I = 0x7f0a055a
 
-.field public static final screen:I = 0x7f0a05bc
+.field public static final screen:I = 0x7f0a05a3
 
-.field public static final scrollIndicatorDown:I = 0x7f0a05be
+.field public static final scrollIndicatorDown:I = 0x7f0a05a5
 
-.field public static final scrollIndicatorUp:I = 0x7f0a05bf
+.field public static final scrollIndicatorUp:I = 0x7f0a05a6
 
-.field public static final scrollView:I = 0x7f0a05c0
+.field public static final scrollView:I = 0x7f0a05a7
 
-.field public static final search_badge:I = 0x7f0a05c4
+.field public static final search_badge:I = 0x7f0a05ab
 
-.field public static final search_bar:I = 0x7f0a05c5
+.field public static final search_bar:I = 0x7f0a05ac
 
-.field public static final search_button:I = 0x7f0a05c6
+.field public static final search_button:I = 0x7f0a05ad
 
-.field public static final search_close_btn:I = 0x7f0a05c8
+.field public static final search_close_btn:I = 0x7f0a05af
 
-.field public static final search_edit_frame:I = 0x7f0a05c9
+.field public static final search_edit_frame:I = 0x7f0a05b0
 
-.field public static final search_go_btn:I = 0x7f0a05cc
+.field public static final search_go_btn:I = 0x7f0a05b3
 
-.field public static final search_mag_icon:I = 0x7f0a05ce
+.field public static final search_mag_icon:I = 0x7f0a05b5
 
-.field public static final search_plate:I = 0x7f0a05cf
+.field public static final search_plate:I = 0x7f0a05b6
 
-.field public static final search_src_text:I = 0x7f0a05d2
+.field public static final search_src_text:I = 0x7f0a05b9
 
-.field public static final search_voice_btn:I = 0x7f0a05de
+.field public static final search_voice_btn:I = 0x7f0a05c5
 
-.field public static final select_dialog_listview:I = 0x7f0a05df
+.field public static final select_dialog_listview:I = 0x7f0a05c6
 
-.field public static final selected_checkmark:I = 0x7f0a05e1
+.field public static final selected_checkmark:I = 0x7f0a05c8
 
-.field public static final shortcut:I = 0x7f0a0719
+.field public static final shortcut:I = 0x7f0a0700
 
-.field public static final showCustom:I = 0x7f0a071a
+.field public static final showCustom:I = 0x7f0a0701
 
-.field public static final showHome:I = 0x7f0a071b
+.field public static final showHome:I = 0x7f0a0702
 
-.field public static final showTitle:I = 0x7f0a071c
+.field public static final showTitle:I = 0x7f0a0703
 
-.field public static final spacer:I = 0x7f0a0725
+.field public static final spacer:I = 0x7f0a070c
 
-.field public static final split_action_bar:I = 0x7f0a072c
+.field public static final split_action_bar:I = 0x7f0a070d
 
-.field public static final src_atop:I = 0x7f0a072f
+.field public static final src_atop:I = 0x7f0a0710
 
-.field public static final src_in:I = 0x7f0a0730
+.field public static final src_in:I = 0x7f0a0711
 
-.field public static final src_over:I = 0x7f0a0731
+.field public static final src_over:I = 0x7f0a0712
 
-.field public static final submenuarrow:I = 0x7f0a0755
+.field public static final submenuarrow:I = 0x7f0a072d
 
-.field public static final submit_area:I = 0x7f0a0756
+.field public static final submit_area:I = 0x7f0a072e
 
-.field public static final tabMode:I = 0x7f0a0761
+.field public static final tabMode:I = 0x7f0a0739
 
-.field public static final text:I = 0x7f0a076f
+.field public static final text:I = 0x7f0a0747
 
-.field public static final text2:I = 0x7f0a0770
+.field public static final text2:I = 0x7f0a0748
 
-.field public static final textSpacerNoButtons:I = 0x7f0a0771
+.field public static final textSpacerNoButtons:I = 0x7f0a0749
 
-.field public static final time:I = 0x7f0a077d
+.field public static final time:I = 0x7f0a0755
 
-.field public static final title:I = 0x7f0a077e
+.field public static final title:I = 0x7f0a0756
 
-.field public static final title_template:I = 0x7f0a0780
+.field public static final title_template:I = 0x7f0a0758
 
-.field public static final top:I = 0x7f0a0785
+.field public static final top:I = 0x7f0a075d
 
-.field public static final topPanel:I = 0x7f0a0786
+.field public static final topPanel:I = 0x7f0a075e
 
-.field public static final up:I = 0x7f0a079c
+.field public static final up:I = 0x7f0a0774
 
-.field public static final useLogo:I = 0x7f0a07a5
+.field public static final useLogo:I = 0x7f0a077d
 
-.field public static final withText:I = 0x7f0a087f
+.field public static final withText:I = 0x7f0a0844
 
-.field public static final wrap_content:I = 0x7f0a0881
+.field public static final wrap_content:I = 0x7f0a0846
 
 
 # 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 f24e0dc0d8..d5d0e079f7 100644
--- a/com.discord/smali/com/angarron/colorpicker/R$b.smali
+++ b/com.discord/smali/com/angarron/colorpicker/R$b.smali
@@ -79,7 +79,7 @@
 
 .field public static final select_dialog_singlechoice_material:I = 0x7f0d005a
 
-.field public static final support_simple_spinner_dropdown_item:I = 0x7f0d0062
+.field public static final support_simple_spinner_dropdown_item:I = 0x7f0d0061
 
 
 # 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 156bbc9f4f..d78e6cc61f 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 mL:Lcom/angarron/colorpicker/a;
+.field final synthetic mM: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;->mL:Lcom/angarron/colorpicker/a;
+    iput-object p1, p0, Lcom/angarron/colorpicker/a$1;->mM: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;->mL:Lcom/angarron/colorpicker/a;
+    iget-object p1, p0, Lcom/angarron/colorpicker/a$1;->mM: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;->mL:Lcom/angarron/colorpicker/a;
+    iget-object v0, p0, Lcom/angarron/colorpicker/a$1;->mM: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;->mL:Lcom/angarron/colorpicker/a;
+    iget-object p1, p0, Lcom/angarron/colorpicker/a$1;->mM: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 a3d33fa3da..46232c784e 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 mL:Lcom/angarron/colorpicker/a;
+.field final synthetic mM: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;->mL:Lcom/angarron/colorpicker/a;
+    iput-object p1, p0, Lcom/angarron/colorpicker/a$2;->mM: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;->mL:Lcom/angarron/colorpicker/a;
+    iget-object p1, p0, Lcom/angarron/colorpicker/a$2;->mM: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;->mL:Lcom/angarron/colorpicker/a;
+    iget-object v0, p0, Lcom/angarron/colorpicker/a$2;->mM: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;->mL:Lcom/angarron/colorpicker/a;
+    iget-object p1, p0, Lcom/angarron/colorpicker/a$2;->mM: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 ce6db00bf5..89d84b49ca 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:I
+.field private mJ:Landroid/widget/ImageView;
 
-.field private mK:Lcom/angarron/colorpicker/a$a;
+.field private mK:I
+
+.field private mL:Lcom/angarron/colorpicker/a$a;
 
 
 # direct methods
@@ -34,7 +34,7 @@
 
     const/4 p1, 0x0
 
-    iput p1, p0, Lcom/angarron/colorpicker/a;->mJ:I
+    iput p1, p0, Lcom/angarron/colorpicker/a;->mK: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;->mI:Landroid/widget/ImageView;
+    iput-object p1, p0, Lcom/angarron/colorpicker/a;->mJ:Landroid/widget/ImageView;
 
-    iget-object p1, p0, Lcom/angarron/colorpicker/a;->mI:Landroid/widget/ImageView;
+    iget-object p1, p0, Lcom/angarron/colorpicker/a;->mJ: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;->mI:Landroid/widget/ImageView;
+    iget-object p0, p0, Lcom/angarron/colorpicker/a;->mJ: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;->mJ:I
+    iget v1, p0, Lcom/angarron/colorpicker/a;->mK: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;->mI:Landroid/widget/ImageView;
+    iget-object v0, p0, Lcom/angarron/colorpicker/a;->mJ:Landroid/widget/ImageView;
 
     invoke-virtual {v0, p1}, Landroid/widget/ImageView;->setAlpha(F)V
 
-    iget-object v0, p0, Lcom/angarron/colorpicker/a;->mI:Landroid/widget/ImageView;
+    iget-object v0, p0, Lcom/angarron/colorpicker/a;->mJ:Landroid/widget/ImageView;
 
     invoke-virtual {v0, p1}, Landroid/widget/ImageView;->setScaleX(F)V
 
-    iget-object v0, p0, Lcom/angarron/colorpicker/a;->mI:Landroid/widget/ImageView;
+    iget-object v0, p0, Lcom/angarron/colorpicker/a;->mJ: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;->mK:Lcom/angarron/colorpicker/a$a;
+    iget-object p1, p0, Lcom/angarron/colorpicker/a;->mL: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;->mI:Landroid/widget/ImageView;
+    iget-object v0, p0, Lcom/angarron/colorpicker/a;->mJ:Landroid/widget/ImageView;
 
     invoke-virtual {v0, p1}, Landroid/widget/ImageView;->setVisibility(I)V
 
-    iget-object p1, p0, Lcom/angarron/colorpicker/a;->mI:Landroid/widget/ImageView;
+    iget-object p1, p0, Lcom/angarron/colorpicker/a;->mJ: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;->mI:Landroid/widget/ImageView;
+    iget-object v0, p0, Lcom/angarron/colorpicker/a;->mJ: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;->mI:Landroid/widget/ImageView;
+    iget-object p1, p0, Lcom/angarron/colorpicker/a;->mJ: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;->mI:Landroid/widget/ImageView;
+    iget-object v0, p0, Lcom/angarron/colorpicker/a;->mJ: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;->mK:Lcom/angarron/colorpicker/a$a;
+    iput-object p1, p0, Lcom/angarron/colorpicker/a;->mL: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;->mJ:I
+    iput p1, p0, Lcom/angarron/colorpicker/a;->mK: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 4ca0c4364e..4afe5a350e 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 mP:[I
+.field public mQ:[I
 
-.field public mQ:I
+.field public mR:I
 
-.field public mS:F
+.field public mT:F
 
 
 # direct methods
@@ -36,11 +36,11 @@
 
     move-result v0
 
-    iput v0, p0, Lcom/angarron/colorpicker/b$a;->mS:F
+    iput v0, p0, Lcom/angarron/colorpicker/b$a;->mT:F
 
     const/4 v0, -0x2
 
-    iput v0, p0, Lcom/angarron/colorpicker/b$a;->mQ:I
+    iput v0, p0, Lcom/angarron/colorpicker/b$a;->mR: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;->mP:[I
+    iput-object p1, p0, Lcom/angarron/colorpicker/b$a;->mQ:[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 03b5f303d8..b564a4144c 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 mM:F = 30.0f
+.field private static mN:F = 30.0f
 
-.field private static mN:[I
+.field private static mO:[I
 
 
 # instance fields
@@ -25,13 +25,13 @@
 
 .field public listener:Lcom/angarron/colorpicker/OnColorSelectedListener;
 
-.field public final mO:F
+.field public final mP:F
 
-.field private final mP:[I
+.field private final mQ:[I
 
-.field private mQ:I
+.field private mR:I
 
-.field private mR:Lcom/angarron/colorpicker/a;
+.field private mS:Lcom/angarron/colorpicker/a;
 
 
 # direct methods
@@ -44,7 +44,7 @@
 
     fill-array-data v0, :array_0
 
-    sput-object v0, Lcom/angarron/colorpicker/b;->mN:[I
+    sput-object v0, Lcom/angarron/colorpicker/b;->mO:[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;->mP:[I
+    iput-object p2, p0, Lcom/angarron/colorpicker/b;->mQ:[I
 
-    iput p3, p0, Lcom/angarron/colorpicker/b;->mQ:I
+    iput p3, p0, Lcom/angarron/colorpicker/b;->mR:I
 
-    iput p4, p0, Lcom/angarron/colorpicker/b;->mO:F
+    iput p4, p0, Lcom/angarron/colorpicker/b;->mP:F
 
     return-void
 .end method
@@ -122,7 +122,7 @@
 .method static synthetic bM()F
     .locals 1
 
-    sget v0, Lcom/angarron/colorpicker/b;->mM:F
+    sget v0, Lcom/angarron/colorpicker/b;->mN:F
 
     return v0
 .end method
@@ -130,7 +130,7 @@
 .method static synthetic bN()[I
     .locals 1
 
-    sget-object v0, Lcom/angarron/colorpicker/b;->mN:[I
+    sget-object v0, Lcom/angarron/colorpicker/b;->mO:[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;->mR:Lcom/angarron/colorpicker/a;
+    iget-object v0, p0, Lcom/angarron/colorpicker/b;->mS: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;->mR:Lcom/angarron/colorpicker/a;
+    iput-object p1, p0, Lcom/angarron/colorpicker/b;->mS:Lcom/angarron/colorpicker/a;
 
     invoke-virtual {p1}, Lcom/angarron/colorpicker/a;->getColor()I
 
     move-result p1
 
-    iput p1, p0, Lcom/angarron/colorpicker/b;->mQ:I
+    iput p1, p0, Lcom/angarron/colorpicker/b;->mR: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;->mQ:I
+    iget v0, p0, Lcom/angarron/colorpicker/b;->mR: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;->mP:[I
+    iget-object v0, p0, Lcom/angarron/colorpicker/b;->mQ:[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;->mP:[I
+    iget-object v0, p0, Lcom/angarron/colorpicker/b;->mQ:[I
 
     aget p1, v0, p1
 
@@ -230,11 +230,11 @@
 
     if-nez p2, :cond_2
 
-    iget-object p2, p0, Lcom/angarron/colorpicker/b;->mP:[I
+    iget-object p2, p0, Lcom/angarron/colorpicker/b;->mQ:[I
 
     aget p2, p2, p1
 
-    iget p3, p0, Lcom/angarron/colorpicker/b;->mQ:I
+    iget p3, p0, Lcom/angarron/colorpicker/b;->mR: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;->mP:[I
+    iget-object v1, p0, Lcom/angarron/colorpicker/b;->mQ:[I
 
     aget p1, v1, p1
 
@@ -258,10 +258,10 @@
 
     if-eqz p2, :cond_1
 
-    iput-object p3, p0, Lcom/angarron/colorpicker/b;->mR:Lcom/angarron/colorpicker/a;
+    iput-object p3, p0, Lcom/angarron/colorpicker/b;->mS:Lcom/angarron/colorpicker/a;
 
     :cond_1
-    iget p1, p0, Lcom/angarron/colorpicker/b;->mO:F
+    iget p1, p0, Lcom/angarron/colorpicker/b;->mP: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 bc90676587..1c81d4f565 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 np:Lcom/camerakit/CameraKitView$1;
+.field final synthetic nq: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;->np:Lcom/camerakit/CameraKitView$1;
+    iput-object p1, p0, Lcom/camerakit/CameraKitView$1$1;->nq: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;->np:Lcom/camerakit/CameraKitView$1;
+    iget-object v0, p0, Lcom/camerakit/CameraKitView$1$1;->nq:Lcom/camerakit/CameraKitView$1;
 
-    iget-object v0, v0, Lcom/camerakit/CameraKitView$1;->no:Lcom/camerakit/CameraKitView;
+    iget-object v0, v0, Lcom/camerakit/CameraKitView$1;->np: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 ef28093109..566dd9d472 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 np:Lcom/camerakit/CameraKitView$1;
+.field final synthetic nq: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;->np:Lcom/camerakit/CameraKitView$1;
+    iput-object p1, p0, Lcom/camerakit/CameraKitView$1$2;->nq: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;->np:Lcom/camerakit/CameraKitView$1;
+    iget-object v0, p0, Lcom/camerakit/CameraKitView$1$2;->nq:Lcom/camerakit/CameraKitView$1;
 
-    iget-object v0, v0, Lcom/camerakit/CameraKitView$1;->no:Lcom/camerakit/CameraKitView;
+    iget-object v0, v0, Lcom/camerakit/CameraKitView$1;->np: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 fb7f6271c9..685b3bdc1f 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 np:Lcom/camerakit/CameraKitView$1;
+.field final synthetic nq: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;->np:Lcom/camerakit/CameraKitView$1;
+    iput-object p1, p0, Lcom/camerakit/CameraKitView$1$3;->nq: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;->np:Lcom/camerakit/CameraKitView$1;
+    iget-object v0, p0, Lcom/camerakit/CameraKitView$1$3;->nq:Lcom/camerakit/CameraKitView$1;
 
-    iget-object v0, v0, Lcom/camerakit/CameraKitView$1;->no:Lcom/camerakit/CameraKitView;
+    iget-object v0, v0, Lcom/camerakit/CameraKitView$1;->np: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 1c8d40ae18..1285e90b04 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 np:Lcom/camerakit/CameraKitView$1;
+.field final synthetic nq: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;->np:Lcom/camerakit/CameraKitView$1;
+    iput-object p1, p0, Lcom/camerakit/CameraKitView$1$4;->nq: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;->np:Lcom/camerakit/CameraKitView$1;
+    iget-object v0, p0, Lcom/camerakit/CameraKitView$1$4;->nq:Lcom/camerakit/CameraKitView$1;
 
-    iget-object v0, v0, Lcom/camerakit/CameraKitView$1;->no:Lcom/camerakit/CameraKitView;
+    iget-object v0, v0, Lcom/camerakit/CameraKitView$1;->np: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 7b60ae44b4..0c111f7363 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 no:Lcom/camerakit/CameraKitView;
+.field final synthetic np:Lcom/camerakit/CameraKitView;
 
 
 # direct methods
 .method constructor <init>(Lcom/camerakit/CameraKitView;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/camerakit/CameraKitView$1;->no:Lcom/camerakit/CameraKitView;
+    iput-object p1, p0, Lcom/camerakit/CameraKitView$1;->np: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;->no:Lcom/camerakit/CameraKitView;
+    iget-object v0, p0, Lcom/camerakit/CameraKitView$1;->np: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;->no:Lcom/camerakit/CameraKitView;
+    iget-object v0, p0, Lcom/camerakit/CameraKitView$1;->np: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;->no:Lcom/camerakit/CameraKitView;
+    iget-object v0, p0, Lcom/camerakit/CameraKitView$1;->np: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;->no:Lcom/camerakit/CameraKitView;
+    iget-object v0, p0, Lcom/camerakit/CameraKitView$1;->np: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;->no:Lcom/camerakit/CameraKitView;
+    iget-object v0, p0, Lcom/camerakit/CameraKitView$1;->np: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;->no:Lcom/camerakit/CameraKitView;
+    iget-object v0, p0, Lcom/camerakit/CameraKitView$1;->np: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;->no:Lcom/camerakit/CameraKitView;
+    iget-object v0, p0, Lcom/camerakit/CameraKitView$1;->np: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;->no:Lcom/camerakit/CameraKitView;
+    iget-object v0, p0, Lcom/camerakit/CameraKitView$1;->np: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 b94345606f..d6540282f5 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 nr:[B
+.field final synthetic nt:[B
 
-.field final synthetic nt:Lcom/camerakit/CameraKitView$2;
+.field final synthetic nu: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;->nt:Lcom/camerakit/CameraKitView$2;
+    iput-object p1, p0, Lcom/camerakit/CameraKitView$2$1;->nu:Lcom/camerakit/CameraKitView$2;
 
-    iput-object p2, p0, Lcom/camerakit/CameraKitView$2$1;->nr:[B
+    iput-object p2, p0, Lcom/camerakit/CameraKitView$2$1;->nt:[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;->nt:Lcom/camerakit/CameraKitView$2;
+    iget-object v0, p0, Lcom/camerakit/CameraKitView$2$1;->nu:Lcom/camerakit/CameraKitView$2;
 
-    iget-object v0, v0, Lcom/camerakit/CameraKitView$2;->nq:Lcom/camerakit/CameraKitView$e;
+    iget-object v0, v0, Lcom/camerakit/CameraKitView$2;->nr:Lcom/camerakit/CameraKitView$e;
 
-    iget-object v1, p0, Lcom/camerakit/CameraKitView$2$1;->nt:Lcom/camerakit/CameraKitView$2;
+    iget-object v1, p0, Lcom/camerakit/CameraKitView$2$1;->nu:Lcom/camerakit/CameraKitView$2;
 
-    iget-object v1, v1, Lcom/camerakit/CameraKitView$2;->no:Lcom/camerakit/CameraKitView;
+    iget-object v1, v1, Lcom/camerakit/CameraKitView$2;->np:Lcom/camerakit/CameraKitView;
 
-    iget-object v2, p0, Lcom/camerakit/CameraKitView$2$1;->nr:[B
+    iget-object v2, p0, Lcom/camerakit/CameraKitView$2$1;->nt:[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 c7fe58d6ee..f7788791ab 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 no:Lcom/camerakit/CameraKitView;
+.field final synthetic np:Lcom/camerakit/CameraKitView;
 
-.field final synthetic nq:Lcom/camerakit/CameraKitView$e;
+.field final synthetic nr: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;->no:Lcom/camerakit/CameraKitView;
+    iput-object p1, p0, Lcom/camerakit/CameraKitView$2;->np:Lcom/camerakit/CameraKitView;
 
-    iput-object p2, p0, Lcom/camerakit/CameraKitView$2;->nq:Lcom/camerakit/CameraKitView$e;
+    iput-object p2, p0, Lcom/camerakit/CameraKitView$2;->nr: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;->no:Lcom/camerakit/CameraKitView;
+    iget-object v0, p0, Lcom/camerakit/CameraKitView$2;->np: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 71fb465800..47f8494e0a 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 nu:[I
+.field static final synthetic nv:[I
 
 
 # direct methods
@@ -30,12 +30,12 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/camerakit/CameraKitView$3;->nu:[I
+    sput-object v0, Lcom/camerakit/CameraKitView$3;->nv:[I
 
     :try_start_0
-    sget-object v0, Lcom/camerakit/CameraKitView$3;->nu:[I
+    sget-object v0, Lcom/camerakit/CameraKitView$3;->nv:[I
 
-    sget-object v1, Lcom/camerakit/a$c;->oa:Lcom/camerakit/a$c;
+    sget-object v1, Lcom/camerakit/a$c;->ob: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;->nu:[I
+    sget-object v0, Lcom/camerakit/CameraKitView$3;->nv:[I
 
-    sget-object v1, Lcom/camerakit/a$c;->nY: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
 
@@ -65,9 +65,9 @@
 
     :catch_1
     :try_start_2
-    sget-object v0, Lcom/camerakit/CameraKitView$3;->nu:[I
+    sget-object v0, Lcom/camerakit/CameraKitView$3;->nv:[I
 
-    sget-object v1, Lcom/camerakit/a$c;->nZ: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
 
diff --git a/com.discord/smali/com/camerakit/CameraKitView.smali b/com.discord/smali/com/camerakit/CameraKitView.smali
index 0589f2081e..7f481295d3 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 nl:Lcom/camerakit/b/a;
+.field private static nm:Lcom/camerakit/b/a;
 
-.field private static nm:Lcom/camerakit/b/b;
+.field private static nn:Lcom/camerakit/b/b;
 
 
 # instance fields
-.field private mT:Z
+.field private mU:Z
 
-.field private mU:F
-
-.field private mV:I
+.field private mV:F
 
 .field private mW:I
 
 .field private mZ:I
 
-.field private na:F
+.field private na:I
 
-.field private nb:I
+.field private nb:F
 
 .field private nc:I
 
 .field private nd:I
 
-.field private ne:F
+.field private ne:I
 
-.field private nf:I
+.field private nf:F
 
-.field private ng:Lcom/camerakit/CameraKitView$d;
+.field private ng:I
 
-.field private nh:Lcom/camerakit/CameraKitView$b;
+.field private nh:Lcom/camerakit/CameraKitView$d;
 
-.field private ni:Lcom/camerakit/CameraKitView$g;
+.field private ni:Lcom/camerakit/CameraKitView$b;
 
-.field private nj:Lcom/camerakit/CameraKitView$ErrorListener;
+.field private nj:Lcom/camerakit/CameraKitView$g;
 
-.field private nk:Lcom/camerakit/CameraKitView$f;
+.field private nk:Lcom/camerakit/CameraKitView$ErrorListener;
 
-.field private nn:Lcom/camerakit/a;
+.field private nl:Lcom/camerakit/CameraKitView$f;
+
+.field private no: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;->nh:Lcom/camerakit/CameraKitView$b;
+    iget-object p0, p0, Lcom/camerakit/CameraKitView;->ni:Lcom/camerakit/CameraKitView$b;
 
     return-object p0
 .end method
@@ -118,7 +118,7 @@
 
     move-result p2
 
-    iput-boolean p2, p0, Lcom/camerakit/CameraKitView;->mT:Z
+    iput-boolean p2, p0, Lcom/camerakit/CameraKitView;->mU:Z
 
     sget p2, Lcom/camerakit/R$a;->CameraKitView_camera_aspectRatio:I
 
@@ -128,7 +128,7 @@
 
     move-result p2
 
-    iput p2, p0, Lcom/camerakit/CameraKitView;->mU:F
+    iput p2, p0, Lcom/camerakit/CameraKitView;->mV:F
 
     sget p2, Lcom/camerakit/R$a;->CameraKitView_camera_facing:I
 
@@ -136,17 +136,17 @@
 
     move-result p2
 
-    iput p2, p0, Lcom/camerakit/CameraKitView;->mV:I
+    iput p2, p0, Lcom/camerakit/CameraKitView;->mW:I
 
-    sget-object p2, Lcom/camerakit/CameraKitView;->nl:Lcom/camerakit/b/a;
+    sget-object p2, Lcom/camerakit/CameraKitView;->nm:Lcom/camerakit/b/a;
 
-    sget-object v1, Lcom/camerakit/b/a;->pc:Lcom/camerakit/b/a;
+    sget-object v1, Lcom/camerakit/b/a;->pd:Lcom/camerakit/b/a;
 
     const/4 v2, 0x1
 
     if-ne p2, v1, :cond_0
 
-    iput v2, p0, Lcom/camerakit/CameraKitView;->mV:I
+    iput v2, p0, Lcom/camerakit/CameraKitView;->mW: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;->mW:I
+    iput p2, p0, Lcom/camerakit/CameraKitView;->mZ:I
 
-    sget-object p2, Lcom/camerakit/CameraKitView;->nm:Lcom/camerakit/b/b;
+    sget-object p2, Lcom/camerakit/CameraKitView;->nn:Lcom/camerakit/b/b;
 
-    sget-object v0, Lcom/camerakit/b/b;->pf:Lcom/camerakit/b/b;
+    sget-object v0, Lcom/camerakit/b/b;->pg:Lcom/camerakit/b/b;
 
     if-ne p2, v0, :cond_1
 
-    iput v2, p0, Lcom/camerakit/CameraKitView;->mW:I
+    iput v2, p0, Lcom/camerakit/CameraKitView;->mZ: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;->mZ:I
+    iput p2, p0, Lcom/camerakit/CameraKitView;->na:I
 
     sget p2, Lcom/camerakit/R$a;->CameraKitView_camera_zoomFactor:I
 
@@ -182,7 +182,7 @@
 
     move-result p2
 
-    iput p2, p0, Lcom/camerakit/CameraKitView;->na:F
+    iput p2, p0, Lcom/camerakit/CameraKitView;->nb:F
 
     sget p2, Lcom/camerakit/R$a;->CameraKitView_camera_permissions:I
 
@@ -190,7 +190,7 @@
 
     move-result p2
 
-    iput p2, p0, Lcom/camerakit/CameraKitView;->nd:I
+    iput p2, p0, Lcom/camerakit/CameraKitView;->ne:I
 
     sget p2, Lcom/camerakit/R$a;->CameraKitView_camera_imageMegaPixels:I
 
@@ -200,7 +200,7 @@
 
     move-result p2
 
-    iput p2, p0, Lcom/camerakit/CameraKitView;->ne:F
+    iput p2, p0, Lcom/camerakit/CameraKitView;->nf:F
 
     sget p2, Lcom/camerakit/R$a;->CameraKitView_camera_imageJpegQuality:I
 
@@ -210,7 +210,7 @@
 
     move-result p2
 
-    iput p2, p0, Lcom/camerakit/CameraKitView;->nf:I
+    iput p2, p0, Lcom/camerakit/CameraKitView;->ng: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;->nn:Lcom/camerakit/a;
+    iput-object p1, p0, Lcom/camerakit/CameraKitView;->no:Lcom/camerakit/a;
 
-    iget-object p1, p0, Lcom/camerakit/CameraKitView;->nn:Lcom/camerakit/a;
+    iget-object p1, p0, Lcom/camerakit/CameraKitView;->no:Lcom/camerakit/a;
 
     invoke-virtual {p0, p1}, Lcom/camerakit/CameraKitView;->addView(Landroid/view/View;)V
 
-    iget-object p1, p0, Lcom/camerakit/CameraKitView;->nn:Lcom/camerakit/a;
+    iget-object p1, p0, Lcom/camerakit/CameraKitView;->no: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;->ni:Lcom/camerakit/CameraKitView$g;
+    iget-object p0, p0, Lcom/camerakit/CameraKitView;->nj:Lcom/camerakit/CameraKitView$g;
 
     return-object p0
 .end method
@@ -271,7 +271,7 @@
     return-object v0
 
     :cond_0
-    iget v1, p0, Lcom/camerakit/CameraKitView;->nd:I
+    iget v1, p0, Lcom/camerakit/CameraKitView;->ne: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;->nd:I
+    iget v1, p0, Lcom/camerakit/CameraKitView;->ne: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;->nd:I
+    iget v1, p0, Lcom/camerakit/CameraKitView;->ne: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;->nd:I
+    iget v1, p0, Lcom/camerakit/CameraKitView;->ne: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;->nn:Lcom/camerakit/a;
+    iget-object v0, p0, Lcom/camerakit/CameraKitView;->no: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;->bkx:Lkotlinx/coroutines/bb;
+    sget-object p1, Lkotlinx/coroutines/bb;->bks:Lkotlinx/coroutines/bb;
 
     check-cast p1, Lkotlinx/coroutines/CoroutineScope;
 
-    iget-object v2, v0, Lcom/camerakit/a;->nK:Lkotlinx/coroutines/ab;
+    iget-object v2, v0, Lcom/camerakit/a;->nL: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;->mT:Z
+    iget-boolean v0, p0, Lcom/camerakit/CameraKitView;->mU:Z
 
     return v0
 .end method
@@ -409,7 +409,7 @@
 .method public getAspectRatio()F
     .locals 1
 
-    iget v0, p0, Lcom/camerakit/CameraKitView;->mU:F
+    iget v0, p0, Lcom/camerakit/CameraKitView;->mV: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;->nh:Lcom/camerakit/CameraKitView$b;
+    iget-object v0, p0, Lcom/camerakit/CameraKitView;->ni: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;->nj:Lcom/camerakit/CameraKitView$ErrorListener;
+    iget-object v0, p0, Lcom/camerakit/CameraKitView;->nk: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;->mV:I
+    iget v0, p0, Lcom/camerakit/CameraKitView;->mW:I
 
     return v0
 .end method
@@ -441,7 +441,7 @@
 .method public getFlash()I
     .locals 1
 
-    iget v0, p0, Lcom/camerakit/CameraKitView;->mW:I
+    iget v0, p0, Lcom/camerakit/CameraKitView;->mZ:I
 
     return v0
 .end method
@@ -449,7 +449,7 @@
 .method public getFocus()I
     .locals 1
 
-    iget v0, p0, Lcom/camerakit/CameraKitView;->mZ:I
+    iget v0, p0, Lcom/camerakit/CameraKitView;->na: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;->ng:Lcom/camerakit/CameraKitView$d;
+    iget-object v0, p0, Lcom/camerakit/CameraKitView;->nh: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;->ne:F
+    iget v0, p0, Lcom/camerakit/CameraKitView;->nf:F
 
     return v0
 .end method
@@ -473,7 +473,7 @@
 .method public getPermissions()I
     .locals 1
 
-    iget v0, p0, Lcom/camerakit/CameraKitView;->nd:I
+    iget v0, p0, Lcom/camerakit/CameraKitView;->ne: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;->nn:Lcom/camerakit/a;
+    iget-object v0, p0, Lcom/camerakit/CameraKitView;->no: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;->nn:Lcom/camerakit/a;
+    iget-object v0, p0, Lcom/camerakit/CameraKitView;->no: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;->nc:I
+    iget v0, p0, Lcom/camerakit/CameraKitView;->nd: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;->ni:Lcom/camerakit/CameraKitView$g;
+    iget-object v0, p0, Lcom/camerakit/CameraKitView;->nj: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;->nn:Lcom/camerakit/a;
+    iget-object v0, p0, Lcom/camerakit/CameraKitView;->no: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;->nn:Lcom/camerakit/a;
+    iget-object v0, p0, Lcom/camerakit/CameraKitView;->no: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;->nb:I
+    iget v0, p0, Lcom/camerakit/CameraKitView;->nc:I
 
     return v0
 .end method
@@ -563,7 +563,7 @@
 .method public getZoomFactor()F
     .locals 1
 
-    iget v0, p0, Lcom/camerakit/CameraKitView;->na:F
+    iget v0, p0, Lcom/camerakit/CameraKitView;->nb:F
 
     return v0
 .end method
@@ -571,7 +571,7 @@
 .method protected onMeasure(II)V
     .locals 5
 
-    iget-boolean v0, p0, Lcom/camerakit/CameraKitView;->mT:Z
+    iget-boolean v0, p0, Lcom/camerakit/CameraKitView;->mU:Z
 
     if-eqz v0, :cond_5
 
@@ -614,7 +614,7 @@
 
     move-result v0
 
-    iget v1, p0, Lcom/camerakit/CameraKitView;->mU:F
+    iget v1, p0, Lcom/camerakit/CameraKitView;->mV:F
 
     cmpl-float v2, v1, v3
 
@@ -633,7 +633,7 @@
     goto :goto_1
 
     :cond_2
-    iget-object v1, p0, Lcom/camerakit/CameraKitView;->nn:Lcom/camerakit/a;
+    iget-object v1, p0, Lcom/camerakit/CameraKitView;->no:Lcom/camerakit/a;
 
     if-eqz v1, :cond_5
 
@@ -647,7 +647,7 @@
 
     if-lez v1, :cond_5
 
-    iget-object p1, p0, Lcom/camerakit/CameraKitView;->nn:Lcom/camerakit/a;
+    iget-object p1, p0, Lcom/camerakit/CameraKitView;->no: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;->mU:F
+    iget v1, p0, Lcom/camerakit/CameraKitView;->mV:F
 
     cmpl-float v2, v1, v3
 
@@ -703,7 +703,7 @@
     goto :goto_1
 
     :cond_4
-    iget-object v1, p0, Lcom/camerakit/CameraKitView;->nn:Lcom/camerakit/a;
+    iget-object v1, p0, Lcom/camerakit/CameraKitView;->no:Lcom/camerakit/a;
 
     if-eqz v1, :cond_5
 
@@ -717,7 +717,7 @@
 
     if-lez v1, :cond_5
 
-    iget-object p2, p0, Lcom/camerakit/CameraKitView;->nn:Lcom/camerakit/a;
+    iget-object p2, p0, Lcom/camerakit/CameraKitView;->no: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;->nn:Lcom/camerakit/a;
+    iget-object v0, p0, Lcom/camerakit/CameraKitView;->no:Lcom/camerakit/a;
 
-    sget-object v1, Lkotlinx/coroutines/bb;->bkx:Lkotlinx/coroutines/bb;
+    sget-object v1, Lkotlinx/coroutines/bb;->bks:Lkotlinx/coroutines/bb;
 
     check-cast v1, Lkotlinx/coroutines/CoroutineScope;
 
-    iget-object v2, v0, Lcom/camerakit/a;->nK:Lkotlinx/coroutines/ab;
+    iget-object v2, v0, Lcom/camerakit/a;->nL:Lkotlinx/coroutines/ab;
 
     check-cast v2, Lkotlin/coroutines/CoroutineContext;
 
@@ -799,7 +799,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/camerakit/CameraKitView;->nn:Lcom/camerakit/a;
+    iget-object v0, p0, Lcom/camerakit/CameraKitView;->no: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;->mW:I
+    iget v0, p0, Lcom/camerakit/CameraKitView;->mZ:I
 
     invoke-virtual {p0, v0}, Lcom/camerakit/CameraKitView;->setFlash(I)V
 
-    iget v0, p0, Lcom/camerakit/CameraKitView;->ne:F
+    iget v0, p0, Lcom/camerakit/CameraKitView;->nf: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;->pb:Lcom/camerakit/b/a;
+    sget-object v0, Lcom/camerakit/b/a;->pc:Lcom/camerakit/b/a;
 
     goto :goto_2
 
     :cond_8
-    sget-object v0, Lcom/camerakit/b/a;->pc:Lcom/camerakit/b/a;
+    sget-object v0, Lcom/camerakit/b/a;->pd:Lcom/camerakit/b/a;
 
     :goto_2
-    sput-object v0, Lcom/camerakit/CameraKitView;->nl:Lcom/camerakit/b/a;
+    sput-object v0, Lcom/camerakit/CameraKitView;->nm:Lcom/camerakit/b/a;
 
-    iget-object v0, p0, Lcom/camerakit/CameraKitView;->nn:Lcom/camerakit/a;
+    iget-object v0, p0, Lcom/camerakit/CameraKitView;->no:Lcom/camerakit/a;
 
-    sget-object v1, Lcom/camerakit/CameraKitView;->nl:Lcom/camerakit/b/a;
+    sget-object v1, Lcom/camerakit/CameraKitView;->nm: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;->bkx:Lkotlinx/coroutines/bb;
+    sget-object v2, Lkotlinx/coroutines/bb;->bks:Lkotlinx/coroutines/bb;
 
     check-cast v2, Lkotlinx/coroutines/CoroutineScope;
 
-    iget-object v4, v0, Lcom/camerakit/a;->nK:Lkotlinx/coroutines/ab;
+    iget-object v4, v0, Lcom/camerakit/a;->nL:Lkotlinx/coroutines/ab;
 
     check-cast v4, Lkotlin/coroutines/CoroutineContext;
 
@@ -1002,13 +1002,13 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/camerakit/CameraKitView;->nn:Lcom/camerakit/a;
+    iget-object v0, p0, Lcom/camerakit/CameraKitView;->no:Lcom/camerakit/a;
 
-    sget-object v1, Lkotlinx/coroutines/bb;->bkx:Lkotlinx/coroutines/bb;
+    sget-object v1, Lkotlinx/coroutines/bb;->bks:Lkotlinx/coroutines/bb;
 
     check-cast v1, Lkotlinx/coroutines/CoroutineScope;
 
-    iget-object v2, v0, Lcom/camerakit/a;->nK:Lkotlinx/coroutines/ab;
+    iget-object v2, v0, Lcom/camerakit/a;->nL: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;->mT:Z
+    iput-boolean p1, p0, Lcom/camerakit/CameraKitView;->mU:Z
 
     return-void
 .end method
@@ -1038,7 +1038,7 @@
 .method public setAspectRatio(F)V
     .locals 0
 
-    iput p1, p0, Lcom/camerakit/CameraKitView;->mU:F
+    iput p1, p0, Lcom/camerakit/CameraKitView;->mV: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;->nh:Lcom/camerakit/CameraKitView$b;
+    iput-object p1, p0, Lcom/camerakit/CameraKitView;->ni: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;->nj:Lcom/camerakit/CameraKitView$ErrorListener;
+    iput-object p1, p0, Lcom/camerakit/CameraKitView;->nk: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;->mV:I
+    iput p1, p0, Lcom/camerakit/CameraKitView;->mW:I
 
-    sget-object p1, Lcom/camerakit/CameraKitView$3;->nu:[I
+    sget-object p1, Lcom/camerakit/CameraKitView$3;->nv:[I
 
-    iget-object v0, p0, Lcom/camerakit/CameraKitView;->nn:Lcom/camerakit/a;
+    iget-object v0, p0, Lcom/camerakit/CameraKitView;->no: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;->mW:I
+    iput p1, p0, Lcom/camerakit/CameraKitView;->mZ:I
 
     if-eqz p1, :cond_3
 
@@ -1151,23 +1151,23 @@
     throw p1
 
     :cond_2
-    sget-object p1, Lcom/camerakit/b/b;->pf:Lcom/camerakit/b/b;
+    sget-object p1, Lcom/camerakit/b/b;->pg:Lcom/camerakit/b/b;
 
-    sput-object p1, Lcom/camerakit/CameraKitView;->nm:Lcom/camerakit/b/b;
+    sput-object p1, Lcom/camerakit/CameraKitView;->nn:Lcom/camerakit/b/b;
 
     goto :goto_0
 
     :cond_3
-    sget-object p1, Lcom/camerakit/b/b;->pe:Lcom/camerakit/b/b;
+    sget-object p1, Lcom/camerakit/b/b;->pf:Lcom/camerakit/b/b;
 
-    sput-object p1, Lcom/camerakit/CameraKitView;->nm:Lcom/camerakit/b/b;
+    sput-object p1, Lcom/camerakit/CameraKitView;->nn: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;->nn:Lcom/camerakit/a;
+    iget-object p1, p0, Lcom/camerakit/CameraKitView;->no:Lcom/camerakit/a;
 
-    sget-object v0, Lcom/camerakit/CameraKitView;->nm:Lcom/camerakit/b/b;
+    sget-object v0, Lcom/camerakit/CameraKitView;->nn: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;->mZ:I
+    iput p1, p0, Lcom/camerakit/CameraKitView;->na: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;->ng:Lcom/camerakit/CameraKitView$d;
+    iput-object p1, p0, Lcom/camerakit/CameraKitView;->nh: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;->ne:F
+    iput p1, p0, Lcom/camerakit/CameraKitView;->nf:F
 
-    iget-object p1, p0, Lcom/camerakit/CameraKitView;->nn:Lcom/camerakit/a;
+    iget-object p1, p0, Lcom/camerakit/CameraKitView;->no:Lcom/camerakit/a;
 
-    iget v0, p0, Lcom/camerakit/CameraKitView;->ne:F
+    iget v0, p0, Lcom/camerakit/CameraKitView;->nf: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;->nd:I
+    iput p1, p0, Lcom/camerakit/CameraKitView;->ne: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;->nk:Lcom/camerakit/CameraKitView$f;
+    iput-object p1, p0, Lcom/camerakit/CameraKitView;->nl: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;->nc:I
+    iput p1, p0, Lcom/camerakit/CameraKitView;->nd: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;->ni:Lcom/camerakit/CameraKitView$g;
+    iput-object p1, p0, Lcom/camerakit/CameraKitView;->nj: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;->nb:I
+    iput p1, p0, Lcom/camerakit/CameraKitView;->nc:I
 
     return-void
 .end method
@@ -1266,7 +1266,7 @@
 .method public setZoomFactor(F)V
     .locals 0
 
-    iput p1, p0, Lcom/camerakit/CameraKitView;->na:F
+    iput p1, p0, Lcom/camerakit/CameraKitView;->nb: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 691c04c2a3..c6a6edccdf 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;->od:Lcom/camerakit/a$f;
+    sget-object v0, Lcom/camerakit/a$f;->oe: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;->nZ:Lcom/camerakit/a$c;
+    sget-object v0, Lcom/camerakit/a$c;->oa: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 28778d0d18..60cade1176 100644
--- a/com.discord/smali/com/camerakit/a$a.smali
+++ b/com.discord/smali/com/camerakit/a$a.smali
@@ -23,8 +23,6 @@
 
 
 # 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;
@@ -39,7 +37,9 @@
 
 .field public static final enum nW:Lcom/camerakit/a$a;
 
-.field private static final synthetic nX:[Lcom/camerakit/a$a;
+.field public static final enum nX:Lcom/camerakit/a$a;
+
+.field private static final synthetic nY:[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;->nP:Lcom/camerakit/a$a;
+    sput-object v1, Lcom/camerakit/a$a;->nQ: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;->nQ:Lcom/camerakit/a$a;
+    sput-object v1, Lcom/camerakit/a$a;->nR: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;->nR:Lcom/camerakit/a$a;
+    sput-object v1, Lcom/camerakit/a$a;->nS: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;->nS:Lcom/camerakit/a$a;
+    sput-object v1, Lcom/camerakit/a$a;->nT: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;->nT:Lcom/camerakit/a$a;
+    sput-object v1, Lcom/camerakit/a$a;->nU: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;->nU:Lcom/camerakit/a$a;
+    sput-object v1, Lcom/camerakit/a$a;->nV: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;->nV:Lcom/camerakit/a$a;
+    sput-object v1, Lcom/camerakit/a$a;->nW: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;->nW:Lcom/camerakit/a$a;
+    sput-object v1, Lcom/camerakit/a$a;->nX:Lcom/camerakit/a$a;
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lcom/camerakit/a$a;->nX:[Lcom/camerakit/a$a;
+    sput-object v0, Lcom/camerakit/a$a;->nY:[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;->nX:[Lcom/camerakit/a$a;
+    sget-object v0, Lcom/camerakit/a$a;->nY:[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 82a59660c9..c50f16ee54 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 private static final synthetic oc:[Lcom/camerakit/a$c;
+.field public static final enum oc:Lcom/camerakit/a$c;
+
+.field private static final synthetic od:[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;->nY:Lcom/camerakit/a$c;
+    sput-object v1, Lcom/camerakit/a$c;->nZ: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;->nZ:Lcom/camerakit/a$c;
+    sput-object v1, Lcom/camerakit/a$c;->oa: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;->oa:Lcom/camerakit/a$c;
+    sput-object v1, Lcom/camerakit/a$c;->ob: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;->ob:Lcom/camerakit/a$c;
+    sput-object v1, Lcom/camerakit/a$c;->oc:Lcom/camerakit/a$c;
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lcom/camerakit/a$c;->oc:[Lcom/camerakit/a$c;
+    sput-object v0, Lcom/camerakit/a$c;->od:[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;->oc:[Lcom/camerakit/a$c;
+    sget-object v0, Lcom/camerakit/a$c;->od:[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 320e21490d..75e0a37bd8 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 private static final synthetic of:[Lcom/camerakit/a$f;
+.field public static final enum of:Lcom/camerakit/a$f;
+
+.field private static final synthetic og:[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;->od:Lcom/camerakit/a$f;
+    sput-object v1, Lcom/camerakit/a$f;->oe: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;->oe:Lcom/camerakit/a$f;
+    sput-object v1, Lcom/camerakit/a$f;->of:Lcom/camerakit/a$f;
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lcom/camerakit/a$f;->of:[Lcom/camerakit/a$f;
+    sput-object v0, Lcom/camerakit/a$f;->og:[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;->of:[Lcom/camerakit/a$f;
+    sget-object v0, Lcom/camerakit/a$f;->og:[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 af3363a20a..164964073b 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 og:Lcom/camerakit/a$g$1$1;
+.field final synthetic oh:Lcom/camerakit/a$g$1$1;
 
-.field final synthetic oh:[B
+.field final synthetic oi:[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;->og:Lcom/camerakit/a$g$1$1;
+    iput-object p1, p0, Lcom/camerakit/a$g$1$1$1;->oh:Lcom/camerakit/a$g$1$1;
 
-    iput-object p2, p0, Lcom/camerakit/a$g$1$1$1;->oh:[B
+    iput-object p2, p0, Lcom/camerakit/a$g$1$1$1;->oi:[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;->oh:[B
+    iget-object v1, p0, Lcom/camerakit/a$g$1$1$1;->oi:[B
 
     invoke-direct {v0, v1}, Lcom/jpegkit/Jpeg;-><init>([B)V
 
-    iget-object v1, p0, Lcom/camerakit/a$g$1$1$1;->og:Lcom/camerakit/a$g$1$1;
+    iget-object v1, p0, Lcom/camerakit/a$g$1$1$1;->oh: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;->AW()[B
+    invoke-virtual {v0}, Lcom/jpegkit/Jpeg;->AU()[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;->og:Lcom/camerakit/a$g$1$1;
+    iget-object v0, p0, Lcom/camerakit/a$g$1$1$1;->oh: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 1e7693f8ed..7bb37423a2 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 d367f131e4..ae6b19b70e 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;->bgy:Lkotlin/Unit;
+    sget-object p2, Lkotlin/Unit;->bgt: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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 315596b553..194f6f6cdb 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;->bgy:Lkotlin/Unit;
+    sget-object p2, Lkotlin/Unit;->bgt: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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 c26304665a..c5df994da8 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;->bgy:Lkotlin/Unit;
+    sget-object p2, Lkotlin/Unit;->bgt: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;->oa: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;->nT:Lcom/camerakit/a$a;
+    sget-object v3, Lcom/camerakit/a$a;->nU: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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
-    sget-object v3, Lkotlin/m;->bgv:Lkotlin/m$a;
+    sget-object v3, Lkotlin/m;->bgq: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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 5dfaebec7f..ce6eea42c4 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;->bgy:Lkotlin/Unit;
+    sget-object p2, Lkotlin/Unit;->bgt: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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 943dda32ad..406dbfa6b4 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;->bgy:Lkotlin/Unit;
+    sget-object p2, Lkotlin/Unit;->bgt: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;->nZ:Lcom/camerakit/a$c;
+    sget-object v3, Lcom/camerakit/a$c;->oa: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;->nH:Lcom/camerakit/preview/CameraSurfaceTexture;
+    iget-object v6, v1, Lcom/camerakit/a;->nI:Lcom/camerakit/preview/CameraSurfaceTexture;
 
-    iget-object v7, v1, Lcom/camerakit/a;->nI:Lcom/camerakit/a/c;
+    iget-object v7, v1, Lcom/camerakit/a;->nJ:Lcom/camerakit/a/c;
 
     if-eqz v6, :cond_12
 
     if-eqz v7, :cond_12
 
-    sget-object v5, Lcom/camerakit/a$a;->nR:Lcom/camerakit/a$a;
+    sget-object v5, Lcom/camerakit/a$a;->nS: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;->oU:[F
+    iget-object v8, v6, Lcom/camerakit/preview/CameraSurfaceTexture;->oV:[F
 
     invoke-static {v8, v9}, Landroid/opengl/Matrix;->setIdentityM([FI)V
 
-    iget-object v10, v6, Lcom/camerakit/preview/CameraSurfaceTexture;->oU:[F
+    iget-object v10, v6, Lcom/camerakit/preview/CameraSurfaceTexture;->oV:[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;->pj:[Lcom/camerakit/b/c;
+    iget-object v10, v5, Lcom/camerakit/c/a;->pk:[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;->pj:[Lcom/camerakit/b/c;
+    iget-object v10, v5, Lcom/camerakit/c/a;->pk:[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;->pj:[Lcom/camerakit/b/c;
+    iget-object v5, v5, Lcom/camerakit/c/a;->pk:[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;->oS:Lcom/camerakit/b/c;
+    iput-object v4, v6, Lcom/camerakit/preview/CameraSurfaceTexture;->oT:Lcom/camerakit/b/c;
 
     const/4 v4, 0x1
 
-    iput-boolean v4, v6, Lcom/camerakit/preview/CameraSurfaceTexture;->oT:Z
+    iput-boolean v4, v6, Lcom/camerakit/preview/CameraSurfaceTexture;->oU: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;->pj:[Lcom/camerakit/b/c;
+    iget-object v7, v4, Lcom/camerakit/c/a;->pk:[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;->pj:[Lcom/camerakit/b/c;
+    iget-object v7, v4, Lcom/camerakit/c/a;->pk:[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;->pj:[Lcom/camerakit/b/c;
+    iget-object v4, v4, Lcom/camerakit/c/a;->pk:[Lcom/camerakit/b/c;
 
     array-length v8, v4
 
@@ -697,7 +697,7 @@
 
     check-cast v4, Ljava/lang/Throwable;
 
-    sget-object v6, Lkotlin/m;->bgv:Lkotlin/m$a;
+    sget-object v6, Lkotlin/m;->bgq: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;->bgy:Lkotlin/Unit;
+    sget-object v1, Lkotlin/Unit;->bgt: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 c57f654563..f63ede82f6 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;->bgy:Lkotlin/Unit;
+    sget-object p2, Lkotlin/Unit;->bgt: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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 a385a1df70..c0a7fb9b7b 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;->bgy:Lkotlin/Unit;
+    sget-object p2, Lkotlin/Unit;->bgt: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;->nY:Lcom/camerakit/a$c;
+    sget-object v1, Lcom/camerakit/a$c;->nZ: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;->nL:Lkotlin/coroutines/Continuation;
+    iput-object v2, p1, Lcom/camerakit/a;->nM:Lkotlin/coroutines/Continuation;
 
-    sget-object v2, Lcom/camerakit/a$a;->nP:Lcom/camerakit/a$a;
+    sget-object v2, Lcom/camerakit/a$a;->nQ: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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 6013977865..31ef833d2b 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;->bgy:Lkotlin/Unit;
+    sget-object p2, Lkotlin/Unit;->bgt: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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 71622d33b8..2341e14965 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;->bgy:Lkotlin/Unit;
+    sget-object p2, Lkotlin/Unit;->bgt: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;->ob:Lcom/camerakit/a$c;
+    sget-object v1, Lcom/camerakit/a$c;->oc: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;->nV:Lcom/camerakit/a$a;
+    sget-object v3, Lcom/camerakit/a$a;->nW: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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
-    sget-object v3, Lkotlin/m;->bgv:Lkotlin/m$a;
+    sget-object v3, Lkotlin/m;->bgq: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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 6a1658e8a8..7c9da85459 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;->bgy:Lkotlin/Unit;
+    sget-object p2, Lkotlin/Unit;->bgt: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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object p1
 
diff --git a/com.discord/smali/com/camerakit/a.smali b/com.discord/smali/com/camerakit/a.smali
index da03308a38..d4ba039005 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 nO:Lcom/camerakit/a$b;
+.field public static final nP:Lcom/camerakit/a$b;
 
 
 # instance fields
@@ -28,25 +28,27 @@
 
 .field private nB:I
 
-.field private nC:Lcom/camerakit/b/c;
+.field private nC:I
 
 .field private nD:Lcom/camerakit/b/c;
 
 .field private nE:Lcom/camerakit/b/c;
 
-.field private nF:Lcom/camerakit/b/b;
+.field private nF:Lcom/camerakit/b/c;
 
-.field private nG:F
+.field private nG:Lcom/camerakit/b/b;
 
-.field nH:Lcom/camerakit/preview/CameraSurfaceTexture;
+.field private nH:F
 
-.field nI:Lcom/camerakit/a/c;
+.field nI:Lcom/camerakit/preview/CameraSurfaceTexture;
 
-.field private final nJ:Lcom/camerakit/preview/CameraSurfaceView;
+.field nJ:Lcom/camerakit/a/c;
 
-.field final nK:Lkotlinx/coroutines/ab;
+.field private final nK:Lcom/camerakit/preview/CameraSurfaceView;
 
-.field nL:Lkotlin/coroutines/Continuation;
+.field final nL:Lkotlinx/coroutines/ab;
+
+.field nM:Lkotlin/coroutines/Continuation;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/coroutines/Continuation<",
@@ -57,7 +59,7 @@
     .end annotation
 .end field
 
-.field private nM:Lkotlin/coroutines/Continuation;
+.field private nN:Lkotlin/coroutines/Continuation;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/coroutines/Continuation<",
@@ -68,19 +70,17 @@
     .end annotation
 .end field
 
-.field private final nN:Lcom/camerakit/a/b;
+.field private final nO:Lcom/camerakit/a/b;
 
-.field private nl:Lcom/camerakit/b/a;
+.field private nm:Lcom/camerakit/b/a;
 
-.field private nv:Lcom/camerakit/a$c;
+.field private nw:Lcom/camerakit/a$c;
 
-.field private nw:Lcom/camerakit/a$f;
+.field private nx:Lcom/camerakit/a$f;
 
-.field private nx:Lcom/camerakit/a$a;
+.field private ny:Lcom/camerakit/a$a;
 
-.field private ny:Lcom/camerakit/a$d;
-
-.field private nz:I
+.field private nz:Lcom/camerakit/a$d;
 
 
 # direct methods
@@ -93,7 +93,7 @@
 
     invoke-direct {v0, v1}, Lcom/camerakit/a$b;-><init>(B)V
 
-    sput-object v0, Lcom/camerakit/a;->nO:Lcom/camerakit/a$b;
+    sput-object v0, Lcom/camerakit/a;->nP: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;->ob:Lcom/camerakit/a$c;
+    sget-object p1, Lcom/camerakit/a$c;->oc:Lcom/camerakit/a$c;
 
-    iput-object p1, p0, Lcom/camerakit/a;->nv:Lcom/camerakit/a$c;
+    iput-object p1, p0, Lcom/camerakit/a;->nw:Lcom/camerakit/a$c;
 
-    sget-object p1, Lcom/camerakit/a$f;->oe:Lcom/camerakit/a$f;
+    sget-object p1, Lcom/camerakit/a$f;->of:Lcom/camerakit/a$f;
 
-    iput-object p1, p0, Lcom/camerakit/a;->nw:Lcom/camerakit/a$f;
+    iput-object p1, p0, Lcom/camerakit/a;->nx:Lcom/camerakit/a$f;
 
-    sget-object p1, Lcom/camerakit/a$a;->nW:Lcom/camerakit/a$a;
+    sget-object p1, Lcom/camerakit/a$a;->nX:Lcom/camerakit/a$a;
 
-    iput-object p1, p0, Lcom/camerakit/a;->nx:Lcom/camerakit/a$a;
+    iput-object p1, p0, Lcom/camerakit/a;->ny:Lcom/camerakit/a$a;
 
     new-instance p1, Lcom/camerakit/b/c;
 
@@ -125,12 +125,6 @@
 
     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;
@@ -139,17 +133,23 @@
 
     iput-object p1, p0, Lcom/camerakit/a;->nE:Lcom/camerakit/b/c;
 
-    sget-object p1, Lcom/camerakit/b/b;->pe:Lcom/camerakit/b/b;
+    new-instance p1, Lcom/camerakit/b/c;
 
-    iput-object p1, p0, Lcom/camerakit/a;->nF: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;
 
     const/high16 p1, 0x40000000    # 2.0f
 
-    iput p1, p0, Lcom/camerakit/a;->nG:F
+    iput p1, p0, Lcom/camerakit/a;->nH:F
 
-    sget-object p1, Lcom/camerakit/b/a;->pb:Lcom/camerakit/b/a;
+    sget-object p1, Lcom/camerakit/b/a;->pc:Lcom/camerakit/b/a;
 
-    iput-object p1, p0, Lcom/camerakit/a;->nl:Lcom/camerakit/b/a;
+    iput-object p1, p0, Lcom/camerakit/a;->nm: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;->nJ:Lcom/camerakit/preview/CameraSurfaceView;
+    iput-object p1, p0, Lcom/camerakit/a;->nK: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;->nK:Lkotlinx/coroutines/ab;
+    iput-object p1, p0, Lcom/camerakit/a;->nL: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;->nN:Lcom/camerakit/a/b;
+    iput-object p1, p0, Lcom/camerakit/a;->nO: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;->nz:I
+    iput p1, p0, Lcom/camerakit/a;->nA:I
 
-    iget-object p1, p0, Lcom/camerakit/a;->nJ:Lcom/camerakit/preview/CameraSurfaceView;
+    iget-object p1, p0, Lcom/camerakit/a;->nK: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;->nJ:Lcom/camerakit/preview/CameraSurfaceView;
+    iget-object p1, p0, Lcom/camerakit/a;->nK: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;->nl:Lcom/camerakit/b/a;
+    iget-object p0, p0, Lcom/camerakit/a;->nm: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;->nl:Lcom/camerakit/b/a;
+    iput-object p1, p0, Lcom/camerakit/a;->nm: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;->nH:Lcom/camerakit/preview/CameraSurfaceTexture;
+    iput-object p1, p0, Lcom/camerakit/a;->nI: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;->nM:Lkotlin/coroutines/Continuation;
+    iput-object p1, p0, Lcom/camerakit/a;->nN: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;->nN:Lcom/camerakit/a/b;
+    iget-object p0, p0, Lcom/camerakit/a;->nO: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;->nQ:Lcom/camerakit/a$a;
+    sget-object v0, Lcom/camerakit/a$a;->nR:Lcom/camerakit/a$a;
 
     invoke-virtual {p0, v0}, Lcom/camerakit/a;->setCameraState(Lcom/camerakit/a$a;)V
 
-    iput-object p1, p0, Lcom/camerakit/a;->nI:Lcom/camerakit/a/c;
+    iput-object p1, p0, Lcom/camerakit/a;->nJ:Lcom/camerakit/a/c;
 
-    iget-object p1, p0, Lcom/camerakit/a;->nL:Lkotlin/coroutines/Continuation;
+    iget-object p1, p0, Lcom/camerakit/a;->nM:Lkotlin/coroutines/Continuation;
 
     if-eqz p1, :cond_0
 
-    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
-    sget-object v1, Lkotlin/m;->bgv:Lkotlin/m$a;
+    sget-object v1, Lkotlin/m;->bgq: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;->nL:Lkotlin/coroutines/Continuation;
+    iput-object p1, p0, Lcom/camerakit/a;->nM: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;->nS:Lcom/camerakit/a$a;
+    sget-object v0, Lcom/camerakit/a$a;->nT:Lcom/camerakit/a$a;
 
     invoke-virtual {p0, v0}, Lcom/camerakit/a;->setCameraState(Lcom/camerakit/a$a;)V
 
-    iget-object v0, p0, Lcom/camerakit/a;->nM:Lkotlin/coroutines/Continuation;
+    iget-object v0, p0, Lcom/camerakit/a;->nN:Lkotlin/coroutines/Continuation;
 
     if-eqz v0, :cond_0
 
-    sget-object v1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
+    sget-object v1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
-    sget-object v2, Lkotlin/m;->bgv:Lkotlin/m$a;
+    sget-object v2, Lkotlin/m;->bgq: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;->nM:Lkotlin/coroutines/Continuation;
+    iput-object v0, p0, Lcom/camerakit/a;->nN: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;->nU:Lcom/camerakit/a$a;
+    sget-object v0, Lcom/camerakit/a$a;->nV: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;->bkx:Lkotlinx/coroutines/bb;
+    sget-object v0, Lkotlinx/coroutines/bb;->bks:Lkotlinx/coroutines/bb;
 
     check-cast v0, Lkotlinx/coroutines/CoroutineScope;
 
-    iget-object v1, p0, Lcom/camerakit/a;->nK:Lkotlinx/coroutines/ab;
+    iget-object v1, p0, Lcom/camerakit/a;->nL: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;->nx:Lcom/camerakit/a$a;
+    iget-object v0, p0, Lcom/camerakit/a;->ny: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;->nB:I
+    iget v0, p0, Lcom/camerakit/a;->nC:I
 
     return v0
 .end method
@@ -453,7 +453,7 @@
 .method public final getDisplayOrientation()I
     .locals 1
 
-    iget v0, p0, Lcom/camerakit/a;->nz:I
+    iget v0, p0, Lcom/camerakit/a;->nA: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;->nF:Lcom/camerakit/b/b;
+    iget-object v0, p0, Lcom/camerakit/a;->nG: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;->nG:F
+    iget v0, p0, Lcom/camerakit/a;->nH: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;->nv:Lcom/camerakit/a$c;
+    iget-object v0, p0, Lcom/camerakit/a;->nw: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;->ny:Lcom/camerakit/a$d;
+    iget-object v0, p0, Lcom/camerakit/a;->nz: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;->nE:Lcom/camerakit/b/c;
+    iget-object v0, p0, Lcom/camerakit/a;->nF: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;->nA:I
+    iget v0, p0, Lcom/camerakit/a;->nB: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;->nC:Lcom/camerakit/b/c;
+    iget-object v0, p0, Lcom/camerakit/a;->nD: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;->nH:Lcom/camerakit/preview/CameraSurfaceTexture;
+    iget-object v0, p0, Lcom/camerakit/a;->nI:Lcom/camerakit/preview/CameraSurfaceTexture;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, v0, Lcom/camerakit/preview/CameraSurfaceTexture;->oS:Lcom/camerakit/b/c;
+    iget-object v0, v0, Lcom/camerakit/preview/CameraSurfaceTexture;->oT:Lcom/camerakit/b/c;
 
     if-nez v0, :cond_1
 
     :cond_0
-    iget-object v0, p0, Lcom/camerakit/a;->nD:Lcom/camerakit/b/c;
+    iget-object v0, p0, Lcom/camerakit/a;->nE: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;->nw:Lcom/camerakit/a$f;
+    iget-object v0, p0, Lcom/camerakit/a;->nx: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;->nW:Lcom/camerakit/a$a;
+    sget-object v0, Lcom/camerakit/a$a;->nX: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;->nx:Lcom/camerakit/a$a;
+    iput-object p1, p0, Lcom/camerakit/a;->ny: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;->ny:Lcom/camerakit/a$d;
+    iget-object p1, p0, Lcom/camerakit/a;->nz:Lcom/camerakit/a$d;
 
     if-eqz p1, :cond_1
 
@@ -597,7 +597,7 @@
     return-void
 
     :cond_2
-    iget-object p1, p0, Lcom/camerakit/a;->ny:Lcom/camerakit/a$d;
+    iget-object p1, p0, Lcom/camerakit/a;->nz:Lcom/camerakit/a$d;
 
     if-eqz p1, :cond_3
 
@@ -607,7 +607,7 @@
     return-void
 
     :cond_4
-    iget-object p1, p0, Lcom/camerakit/a;->ny:Lcom/camerakit/a$d;
+    iget-object p1, p0, Lcom/camerakit/a;->nz:Lcom/camerakit/a$d;
 
     if-eqz p1, :cond_5
 
@@ -617,7 +617,7 @@
     return-void
 
     :cond_6
-    iget-object p1, p0, Lcom/camerakit/a;->ny:Lcom/camerakit/a$d;
+    iget-object p1, p0, Lcom/camerakit/a;->nz: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;->nB:I
+    iput p1, p0, Lcom/camerakit/a;->nC:I
 
     return-void
 .end method
@@ -638,7 +638,7 @@
 .method public final setDisplayOrientation(I)V
     .locals 0
 
-    iput p1, p0, Lcom/camerakit/a;->nz:I
+    iput p1, p0, Lcom/camerakit/a;->nA: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;->nF:Lcom/camerakit/b/b;
+    iput-object p1, p0, Lcom/camerakit/a;->nG: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;->nG:F
+    iput p1, p0, Lcom/camerakit/a;->nH: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;->nv:Lcom/camerakit/a$c;
+    iput-object p1, p0, Lcom/camerakit/a;->nw: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;->ny:Lcom/camerakit/a$d;
+    iput-object p1, p0, Lcom/camerakit/a;->nz: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;->nE:Lcom/camerakit/b/c;
+    iput-object p1, p0, Lcom/camerakit/a;->nF: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;->nA:I
+    iput p1, p0, Lcom/camerakit/a;->nB: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;->nC:Lcom/camerakit/b/c;
+    iput-object p1, p0, Lcom/camerakit/a;->nD: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;->nD:Lcom/camerakit/b/c;
+    iput-object p1, p0, Lcom/camerakit/a;->nE: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;->nw:Lcom/camerakit/a$f;
+    iput-object p1, p0, Lcom/camerakit/a;->nx: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 44ccf8c89f..09124c7465 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/b;
+.field private final oA:[Lcom/camerakit/b/c;
 
-.field private final ow:Lcom/camerakit/b/a;
+.field private final oB:[Lcom/camerakit/b/b;
 
-.field private final ox:I
+.field private final ox:Lcom/camerakit/b/a;
 
-.field private final oy:[Lcom/camerakit/b/c;
+.field private final oy:I
 
 .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;->ow:Lcom/camerakit/b/a;
+    iput-object p3, p0, Lcom/camerakit/a/a/a$a;->ox:Lcom/camerakit/b/a;
 
     iget p1, p1, Landroid/hardware/Camera$CameraInfo;->orientation:I
 
-    iput p1, p0, Lcom/camerakit/a/a/a$a;->ox:I
+    iput p1, p0, Lcom/camerakit/a/a/a$a;->oy: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;->oy:[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;->b(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;->oA:[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;->oA:[Lcom/camerakit/b/b;
+    iput-object p1, p0, Lcom/camerakit/a/a/a$a;->oB:[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;->ox:I
+    iget v0, p0, Lcom/camerakit/a/a/a$a;->oy: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;->oy:[Lcom/camerakit/b/c;
+    iget-object v0, p0, Lcom/camerakit/a/a/a$a;->oz:[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;->oz:[Lcom/camerakit/b/c;
+    iget-object v0, p0, Lcom/camerakit/a/a/a$a;->oA:[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 38d8d7f5f6..a62bd3332f 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 oB:Lkotlin/jvm/functions/Function1;
+.field final synthetic oC:Lkotlin/jvm/functions/Function1;
 
-.field final synthetic oC:Landroid/hardware/Camera;
+.field final synthetic oD: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;->oB:Lkotlin/jvm/functions/Function1;
+    iput-object p1, p0, Lcom/camerakit/a/a/a$b;->oC:Lkotlin/jvm/functions/Function1;
 
-    iput-object p2, p0, Lcom/camerakit/a/a/a$b;->oC:Landroid/hardware/Camera;
+    iput-object p2, p0, Lcom/camerakit/a/a/a$b;->oD: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;->oB:Lkotlin/jvm/functions/Function1;
+    iget-object p2, p0, Lcom/camerakit/a/a/a$b;->oC: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;->oC:Landroid/hardware/Camera;
+    iget-object p1, p0, Lcom/camerakit/a/a/a$b;->oD: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 389d6aafa6..83d21a68ef 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 oD:Lcom/camerakit/a/a/a;
+.field final synthetic oE: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;->oD:Lcom/camerakit/a/a/a;
+    iput-object p1, p0, Lcom/camerakit/a/a/a$c;->oE: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;->oD:Lcom/camerakit/a/a/a;
+    iget-object p1, p0, Lcom/camerakit/a/a/a$c;->oE: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 fdccee9f8b..286b8d000f 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 ot:Lcom/camerakit/a/e;
+.field private final ou:Lcom/camerakit/a/e;
 
-.field private ou:Lcom/camerakit/a/c;
+.field private ov:Lcom/camerakit/a/c;
 
-.field private final synthetic ov:Lcom/camerakit/a/d;
+.field private final synthetic ow: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;->ov:Lcom/camerakit/a/d;
+    iput-object p1, p0, Lcom/camerakit/a/a/a;->ow:Lcom/camerakit/a/d;
 
-    sget-object p1, Lcom/camerakit/a/e;->oo:Lcom/camerakit/a/e$a;
+    sget-object p1, Lcom/camerakit/a/e;->oq: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;->ot:Lcom/camerakit/a/e;
+    iput-object p1, p0, Lcom/camerakit/a/a/a;->ou: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;->ov:Lcom/camerakit/a/d;
+    iget-object v0, p0, Lcom/camerakit/a/a/a;->ow: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;->ou:Lcom/camerakit/a/c;
+    iput-object v4, p0, Lcom/camerakit/a/a/a;->ov: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;->ov:Lcom/camerakit/a/d;
+    iget-object v0, p0, Lcom/camerakit/a/a/a;->ow: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;->ov:Lcom/camerakit/a/d;
+    iget-object v0, p0, Lcom/camerakit/a/a/a;->ow: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;->ot:Lcom/camerakit/a/e;
+    iget-object v0, p0, Lcom/camerakit/a/a/a;->ou: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;->ov:Lcom/camerakit/a/d;
+    iget-object v0, p0, Lcom/camerakit/a/a/a;->ow: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;->ou:Lcom/camerakit/a/c;
+    iput-object v0, p0, Lcom/camerakit/a/a/a;->ov: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 c97a4e2cd2..ca49566d9c 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;->ph:Lcom/camerakit/b/b;
+    sget-object v2, Lcom/camerakit/b/b;->pi:Lcom/camerakit/b/b;
 
     goto :goto_5
 
@@ -401,7 +401,7 @@
 
     if-eqz v2, :cond_e
 
-    sget-object v2, Lcom/camerakit/b/b;->pg:Lcom/camerakit/b/b;
+    sget-object v2, Lcom/camerakit/b/b;->ph:Lcom/camerakit/b/b;
 
     goto :goto_5
 
@@ -412,7 +412,7 @@
 
     if-eqz v2, :cond_e
 
-    sget-object v2, Lcom/camerakit/b/b;->pe:Lcom/camerakit/b/b;
+    sget-object v2, Lcom/camerakit/b/b;->pf:Lcom/camerakit/b/b;
 
     goto :goto_5
 
@@ -423,13 +423,13 @@
 
     if-eqz v2, :cond_e
 
-    sget-object v2, Lcom/camerakit/b/b;->pf:Lcom/camerakit/b/b;
+    sget-object v2, Lcom/camerakit/b/b;->pg:Lcom/camerakit/b/b;
 
     goto :goto_5
 
     :cond_e
     :goto_4
-    sget-object v2, Lcom/camerakit/b/b;->pe:Lcom/camerakit/b/b;
+    sget-object v2, Lcom/camerakit/b/b;->pf: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 a7e1455d3f..926938f2c7 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;->pb: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
 
@@ -34,7 +34,7 @@
 
     sget-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;->pd: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;->pe: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
 
@@ -64,7 +64,7 @@
 
     sget-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;->pg: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;->pg: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
 
@@ -86,7 +86,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;->pi: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 6e97133de8..ff04be925c 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/b;
+.field private final oA:[Lcom/camerakit/b/c;
 
-.field private final ow:Lcom/camerakit/b/a;
+.field private final oB:[Lcom/camerakit/b/b;
 
-.field private final ox:I
+.field private final ox:Lcom/camerakit/b/a;
 
-.field private final oy:[Lcom/camerakit/b/c;
+.field private final oy:I
 
 .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;->ow:Lcom/camerakit/b/a;
+    iput-object p2, p0, Lcom/camerakit/a/b/a$a;->ox: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;->ox:I
+    iput v0, p0, Lcom/camerakit/a/b/a$a;->oy: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;->oy:[Lcom/camerakit/b/c;
+    iput-object v0, p0, Lcom/camerakit/a/b/a$a;->oz:[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;->oz:[Lcom/camerakit/b/c;
+    iput-object v0, p0, Lcom/camerakit/a/b/a$a;->oA:[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;->pe:Lcom/camerakit/b/b;
+    sget-object p2, Lcom/camerakit/b/b;->pf:Lcom/camerakit/b/b;
 
     aput-object p2, p1, v1
 
     const/4 p2, 0x1
 
-    sget-object v0, Lcom/camerakit/b/b;->pf:Lcom/camerakit/b/b;
+    sget-object v0, Lcom/camerakit/b/b;->pg:Lcom/camerakit/b/b;
 
     aput-object v0, p1, p2
 
     const/4 p2, 0x2
 
-    sget-object v0, Lcom/camerakit/b/b;->pg:Lcom/camerakit/b/b;
+    sget-object v0, Lcom/camerakit/b/b;->ph:Lcom/camerakit/b/b;
 
     aput-object v0, p1, p2
 
     const/4 p2, 0x3
 
-    sget-object v0, Lcom/camerakit/b/b;->ph:Lcom/camerakit/b/b;
+    sget-object v0, Lcom/camerakit/b/b;->pi: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;->oA:[Lcom/camerakit/b/b;
+    iput-object p1, p0, Lcom/camerakit/a/b/a$a;->oB:[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;->ox:I
+    iget v0, p0, Lcom/camerakit/a/b/a$a;->oy: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;->oy:[Lcom/camerakit/b/c;
+    iget-object v0, p0, Lcom/camerakit/a/b/a$a;->oz:[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;->oz:[Lcom/camerakit/b/c;
+    iget-object v0, p0, Lcom/camerakit/a/b/a$a;->oA:[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 125bd0a0f4..d470894feb 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 oO:Lcom/camerakit/a/b/a$d;
+.field final synthetic oP: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;->oO:Lcom/camerakit/a/b/a$d;
+    iput-object p1, p0, Lcom/camerakit/a/b/a$d$1;->oP: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;->oO:Lcom/camerakit/a/b/a$d;
+    iget-object p1, p0, Lcom/camerakit/a/b/a$d$1;->oP: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 7746c0eddf..bed9b40519 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 oM:Landroid/hardware/camera2/CameraCaptureSession;
+.field final synthetic oN:Landroid/hardware/camera2/CameraCaptureSession;
 
-.field final synthetic oN:Landroid/hardware/camera2/CaptureRequest$Builder;
+.field final synthetic oO: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;->oM:Landroid/hardware/camera2/CameraCaptureSession;
+    iput-object p2, p0, Lcom/camerakit/a/b/a$d;->oN:Landroid/hardware/camera2/CameraCaptureSession;
 
-    iput-object p3, p0, Lcom/camerakit/a/b/a$d;->oN:Landroid/hardware/camera2/CaptureRequest$Builder;
+    iput-object p3, p0, Lcom/camerakit/a/b/a$d;->oO: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;->oM:Landroid/hardware/camera2/CameraCaptureSession;
+    iget-object v0, p0, Lcom/camerakit/a/b/a$d;->oN:Landroid/hardware/camera2/CameraCaptureSession;
 
-    iget-object v1, p0, Lcom/camerakit/a/b/a$d;->oN:Landroid/hardware/camera2/CaptureRequest$Builder;
+    iget-object v1, p0, Lcom/camerakit/a/b/a$d;->oO: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;->ot:Lcom/camerakit/a/e;
+    iget-object v3, v3, Lcom/camerakit/a/b/a;->ou: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 a89c335215..8b3b9b2547 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 oP:Lcom/camerakit/a/b/a$e;
+.field final synthetic oQ: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;->oP:Lcom/camerakit/a/b/a$e;
+    iput-object p1, p0, Lcom/camerakit/a/b/a$e$1;->oQ: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;->oP:Lcom/camerakit/a/b/a$e;
+    iget-object p1, p0, Lcom/camerakit/a/b/a$e$1;->oQ: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;->oP:Lcom/camerakit/a/b/a$e;
+    iget-object p1, p0, Lcom/camerakit/a/b/a$e$1;->oQ: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;->oP:Lcom/camerakit/a/b/a$e;
+    iget-object p1, p0, Lcom/camerakit/a/b/a$e$1;->oQ: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;->oP:Lcom/camerakit/a/b/a$e;
+    iget-object p1, p0, Lcom/camerakit/a/b/a$e$1;->oQ: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;->oP:Lcom/camerakit/a/b/a$e;
+    iget-object p1, p0, Lcom/camerakit/a/b/a$e$1;->oQ: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;->oP:Lcom/camerakit/a/b/a$e;
+    iget-object v1, p0, Lcom/camerakit/a/b/a$e$1;->oQ: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;->oP:Lcom/camerakit/a/b/a$e;
+    iget-object v2, p0, Lcom/camerakit/a/b/a$e$1;->oQ: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;->oP:Lcom/camerakit/a/b/a$e;
+    iget-object v1, p0, Lcom/camerakit/a/b/a$e$1;->oQ: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;->oP:Lcom/camerakit/a/b/a$e;
+    iget-object p1, p0, Lcom/camerakit/a/b/a$e$1;->oQ: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;->oP:Lcom/camerakit/a/b/a$e;
+    iget-object p1, p0, Lcom/camerakit/a/b/a$e$1;->oQ: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 a84e52e6bd..6015a1844e 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;->ot:Lcom/camerakit/a/e;
+    iget-object v3, v3, Lcom/camerakit/a/b/a;->ou: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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 1b18b406b0..a77582f217 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;->ot:Lcom/camerakit/a/e;
+    iget-object v3, v3, Lcom/camerakit/a/b/a;->ou: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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 c075b6a195..d1f3511ccf 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 oL:Lcom/camerakit/a/b/a$b;
+.field public static final oM:Lcom/camerakit/a/b/a$b;
 
 
 # instance fields
@@ -27,15 +27,15 @@
 
 .field private captureSession:Landroid/hardware/camera2/CameraCaptureSession;
 
-.field private nF:Lcom/camerakit/b/b;
+.field private nG:Lcom/camerakit/b/b;
 
-.field private nl:Lcom/camerakit/b/a;
+.field private nm:Lcom/camerakit/b/a;
 
-.field private oE:Landroid/hardware/camera2/CaptureRequest$Builder;
+.field private oF:Landroid/hardware/camera2/CaptureRequest$Builder;
 
-.field private oF:Landroid/media/ImageReader;
+.field private oG:Landroid/media/ImageReader;
 
-.field private oG:Lkotlin/jvm/functions/Function1;
+.field private oH:Lkotlin/jvm/functions/Function1;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/jvm/functions/Function1<",
@@ -46,19 +46,19 @@
     .end annotation
 .end field
 
-.field private oH:Z
-
-.field private oI:I
+.field private oI:Z
 
 .field private oJ:I
 
-.field private final oK:Lcom/camerakit/a/b/a$c;
+.field private oK:I
 
-.field final ot:Lcom/camerakit/a/e;
+.field private final oL:Lcom/camerakit/a/b/a$c;
 
-.field private ou:Lcom/camerakit/a/c;
+.field final ou:Lcom/camerakit/a/e;
 
-.field private final synthetic ov:Lcom/camerakit/a/d;
+.field private ov:Lcom/camerakit/a/c;
+
+.field private final synthetic ow: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;->oL:Lcom/camerakit/a/b/a$b;
+    sput-object v0, Lcom/camerakit/a/b/a;->oM: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;->ov:Lcom/camerakit/a/d;
+    iput-object p1, p0, Lcom/camerakit/a/b/a;->ow:Lcom/camerakit/a/d;
 
-    sget-object p1, Lcom/camerakit/a/e;->oo:Lcom/camerakit/a/e$a;
+    sget-object p1, Lcom/camerakit/a/e;->oq: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;->ot:Lcom/camerakit/a/e;
+    iput-object p1, p0, Lcom/camerakit/a/b/a;->ou: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;->pe:Lcom/camerakit/b/b;
+    sget-object p1, Lcom/camerakit/b/b;->pf:Lcom/camerakit/b/b;
 
-    iput-object p1, p0, Lcom/camerakit/a/b/a;->nF:Lcom/camerakit/b/b;
+    iput-object p1, p0, Lcom/camerakit/a/b/a;->nG:Lcom/camerakit/b/b;
 
-    sget-object p1, Lcom/camerakit/b/a;->pb:Lcom/camerakit/b/a;
+    sget-object p1, Lcom/camerakit/b/a;->pc:Lcom/camerakit/b/a;
 
-    iput-object p1, p0, Lcom/camerakit/a/b/a;->nl:Lcom/camerakit/b/a;
+    iput-object p1, p0, Lcom/camerakit/a/b/a;->nm: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;->oK:Lcom/camerakit/a/b/a$c;
+    iput-object p1, p0, Lcom/camerakit/a/b/a;->oL: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;->oJ:I
+    iput p1, p0, Lcom/camerakit/a/b/a;->oK: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;->oE:Landroid/hardware/camera2/CaptureRequest$Builder;
+    iput-object p1, p0, Lcom/camerakit/a/b/a;->oF: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;->ou:Lcom/camerakit/a/c;
+    iput-object p1, p0, Lcom/camerakit/a/b/a;->ov: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;->oK:Lcom/camerakit/a/b/a$c;
+    iget-object p0, p0, Lcom/camerakit/a/b/a;->oL: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;->oI:I
+    iput p1, p0, Lcom/camerakit/a/b/a;->oJ: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;->oE:Landroid/hardware/camera2/CaptureRequest$Builder;
+    iget-object v0, p0, Lcom/camerakit/a/b/a;->oF: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;->oK:Lcom/camerakit/a/b/a$c;
+    iget-object v3, p0, Lcom/camerakit/a/b/a;->oL:Lcom/camerakit/a/b/a$c;
 
     check-cast v3, Landroid/hardware/camera2/CameraCaptureSession$CaptureCallback;
 
-    iget-object v4, p0, Lcom/camerakit/a/b/a;->ot:Lcom/camerakit/a/e;
+    iget-object v4, p0, Lcom/camerakit/a/b/a;->ou: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;->oJ:I
+    iput v2, p0, Lcom/camerakit/a/b/a;->oK: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;->oK:Lcom/camerakit/a/b/a$c;
+    iget-object v2, p0, Lcom/camerakit/a/b/a;->oL:Lcom/camerakit/a/b/a$c;
 
     check-cast v2, Landroid/hardware/camera2/CameraCaptureSession$CaptureCallback;
 
-    iget-object p0, p0, Lcom/camerakit/a/b/a;->ot:Lcom/camerakit/a/e;
+    iget-object p0, p0, Lcom/camerakit/a/b/a;->ou: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;->oF:Landroid/media/ImageReader;
+    iget-object v2, p0, Lcom/camerakit/a/b/a;->oG: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;->nF:Lcom/camerakit/b/b;
+    iget-object v3, p0, Lcom/camerakit/a/b/a;->nG: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;->nF:Lcom/camerakit/b/b;
+    iget-object v2, p0, Lcom/camerakit/a/b/a;->nG: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;->ot:Lcom/camerakit/a/e;
+    iget-object v4, p0, Lcom/camerakit/a/b/a;->ou: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;->oJ:I
+    iget p0, p0, Lcom/camerakit/a/b/a;->oK: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;->oF:Landroid/media/ImageReader;
+    iget-object p0, p0, Lcom/camerakit/a/b/a;->oG: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;->oG:Lkotlin/jvm/functions/Function1;
+    iget-object p0, p0, Lcom/camerakit/a/b/a;->oH: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;->oG:Lkotlin/jvm/functions/Function1;
+    iput-object v0, p0, Lcom/camerakit/a/b/a;->oH: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;->oE:Landroid/hardware/camera2/CaptureRequest$Builder;
+    iget-object v0, p0, Lcom/camerakit/a/b/a;->oF: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;->oJ:I
+    iput v2, p0, Lcom/camerakit/a/b/a;->oK: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;->oK:Lcom/camerakit/a/b/a$c;
+    iget-object v5, p0, Lcom/camerakit/a/b/a;->oL:Lcom/camerakit/a/b/a$c;
 
     check-cast v5, Landroid/hardware/camera2/CameraCaptureSession$CaptureCallback;
 
-    iget-object v6, p0, Lcom/camerakit/a/b/a;->ot:Lcom/camerakit/a/e;
+    iget-object v6, p0, Lcom/camerakit/a/b/a;->ou: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;->nF:Lcom/camerakit/b/b;
+    iget-object v5, p0, Lcom/camerakit/a/b/a;->nG: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;->oK:Lcom/camerakit/a/b/a$c;
+    iget-object v2, p0, Lcom/camerakit/a/b/a;->oL:Lcom/camerakit/a/b/a$c;
 
     check-cast v2, Landroid/hardware/camera2/CameraCaptureSession$CaptureCallback;
 
-    iget-object p0, p0, Lcom/camerakit/a/b/a;->ot:Lcom/camerakit/a/e;
+    iget-object p0, p0, Lcom/camerakit/a/b/a;->ou: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;->oI:I
+    iget p0, p0, Lcom/camerakit/a/b/a;->oJ: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;->oH:Z
+    iget-boolean p0, p0, Lcom/camerakit/a/b/a;->oI:Z
 
     return p0
 .end method
@@ -522,7 +522,7 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/camerakit/a/b/a;->oH:Z
+    iput-boolean v0, p0, Lcom/camerakit/a/b/a;->oI: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;->oF:Landroid/media/ImageReader;
+    iget-object v1, p0, Lcom/camerakit/a/b/a;->oG: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;->ot:Lcom/camerakit/a/e;
+    iget-object p1, p0, Lcom/camerakit/a/b/a;->ou: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;->ov:Lcom/camerakit/a/d;
+    iget-object v0, p0, Lcom/camerakit/a/b/a;->ow: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;->nl:Lcom/camerakit/b/a;
+    iput-object p1, p0, Lcom/camerakit/a/b/a;->nm: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;->ot:Lcom/camerakit/a/e;
+    iget-object v2, p0, Lcom/camerakit/a/b/a;->ou: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;->oG:Lkotlin/jvm/functions/Function1;
+    iput-object p1, p0, Lcom/camerakit/a/b/a;->oH:Lkotlin/jvm/functions/Function1;
 
-    iget-object p1, p0, Lcom/camerakit/a/b/a;->nl:Lcom/camerakit/b/a;
+    iget-object p1, p0, Lcom/camerakit/a/b/a;->nm:Lcom/camerakit/b/a;
 
-    sget-object v0, Lcom/camerakit/b/a;->pb:Lcom/camerakit/b/a;
+    sget-object v0, Lcom/camerakit/b/a;->pc:Lcom/camerakit/b/a;
 
     if-ne p1, v0, :cond_1
 
-    iget-object p1, p0, Lcom/camerakit/a/b/a;->oE:Landroid/hardware/camera2/CaptureRequest$Builder;
+    iget-object p1, p0, Lcom/camerakit/a/b/a;->oF: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;->oJ:I
+    iput v2, p0, Lcom/camerakit/a/b/a;->oK:I
 
     const/4 v1, 0x0
 
-    iput v1, p0, Lcom/camerakit/a/b/a;->oI:I
+    iput v1, p0, Lcom/camerakit/a/b/a;->oJ: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;->oK:Lcom/camerakit/a/b/a$c;
+    iget-object v2, p0, Lcom/camerakit/a/b/a;->oL:Lcom/camerakit/a/b/a$c;
 
     check-cast v2, Landroid/hardware/camera2/CameraCaptureSession$CaptureCallback;
 
-    iget-object v3, p0, Lcom/camerakit/a/b/a;->ot:Lcom/camerakit/a/e;
+    iget-object v3, p0, Lcom/camerakit/a/b/a;->ou: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;->ov:Lcom/camerakit/a/d;
+    iget-object v0, p0, Lcom/camerakit/a/b/a;->ow: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;->ov:Lcom/camerakit/a/d;
+    iget-object v0, p0, Lcom/camerakit/a/b/a;->ow: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;->oH:Z
+    iput-boolean v0, p0, Lcom/camerakit/a/b/a;->oI: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;->ot:Lcom/camerakit/a/e;
+    iget-object v0, p0, Lcom/camerakit/a/b/a;->ou: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;->ov:Lcom/camerakit/a/d;
+    iget-object v0, p0, Lcom/camerakit/a/b/a;->ow: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;->ou:Lcom/camerakit/a/c;
+    iput-object v0, p0, Lcom/camerakit/a/b/a;->ov:Lcom/camerakit/a/c;
 
-    iget-object v1, p0, Lcom/camerakit/a/b/a;->oF:Landroid/media/ImageReader;
+    iget-object v1, p0, Lcom/camerakit/a/b/a;->oG: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;->oF:Landroid/media/ImageReader;
+    iput-object v0, p0, Lcom/camerakit/a/b/a;->oG:Landroid/media/ImageReader;
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/camerakit/a/b/a;->oH:Z
+    iput-boolean v0, p0, Lcom/camerakit/a/b/a;->oI: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;->nF:Lcom/camerakit/b/b;
+    iput-object p1, p0, Lcom/camerakit/a/b/a;->nG: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;->oF:Landroid/media/ImageReader;
+    iput-object p1, p0, Lcom/camerakit/a/b/a;->oG: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 4be97de390..863c0fa4ee 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 oB:Lkotlin/jvm/functions/Function1;
+.field final synthetic oC: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;->oB:Lkotlin/jvm/functions/Function1;
+    iput-object p1, p0, Lcom/camerakit/a/b/a/b$a;->oC: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;->oB:Lkotlin/jvm/functions/Function1;
+    iget-object v0, p0, Lcom/camerakit/a/b/a/b$a;->oC: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;->oB:Lkotlin/jvm/functions/Function1;
+    iget-object p1, p0, Lcom/camerakit/a/b/a/b$a;->oC: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;->oB:Lkotlin/jvm/functions/Function1;
+    iget-object v0, p0, Lcom/camerakit/a/b/a/b$a;->oC: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 bdb59bf2ac..2bd9207faf 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 oQ:Landroid/hardware/camera2/CameraManager;
+.field final synthetic oR:Landroid/hardware/camera2/CameraManager;
 
-.field final synthetic oR:Ljava/lang/String;
+.field final synthetic oS: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;->oQ:Landroid/hardware/camera2/CameraManager;
+    iput-object p1, p0, Lcom/camerakit/a/b/a/c$a;->oR:Landroid/hardware/camera2/CameraManager;
 
-    iput-object p2, p0, Lcom/camerakit/a/b/a/c$a;->oR:Ljava/lang/String;
+    iput-object p2, p0, Lcom/camerakit/a/b/a/c$a;->oS: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;->oR:Ljava/lang/String;
+    iget-object v0, p0, Lcom/camerakit/a/b/a/c$a;->oS: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;->oQ:Landroid/hardware/camera2/CameraManager;
+    iget-object p1, p0, Lcom/camerakit/a/b/a/c$a;->oR: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;->oR:Ljava/lang/String;
+    iget-object v0, p0, Lcom/camerakit/a/b/a/c$a;->oS: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 f9fcb96f8f..0ddcac9b37 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;->pb: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
 
@@ -32,7 +32,7 @@
 
     sget-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;->pd: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 de61195196..647d040647 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;->pf: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
 
@@ -44,7 +44,7 @@
 
     sput-object v0, Lcom/camerakit/a/b/b;->$EnumSwitchMapping$1:[I
 
-    sget-object v1, Lcom/camerakit/b/b;->pf: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
 
@@ -62,7 +62,7 @@
 
     sput-object v0, Lcom/camerakit/a/b/b;->$EnumSwitchMapping$2:[I
 
-    sget-object v1, Lcom/camerakit/b/b;->pf: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
 
diff --git a/com.discord/smali/com/camerakit/a/e$1.smali b/com.discord/smali/com/camerakit/a/e$1.smali
index 8ad2883b1f..9f4e52925c 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 oq:Lcom/camerakit/a/e$1;
+.field public static final or: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;->oq:Lcom/camerakit/a/e$1;
+    sput-object v0, Lcom/camerakit/a/e$1;->or: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 8d95923c68..15bb5b41fc 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 oo:Lcom/camerakit/a/e$a;
+.field public static final oq: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;->oo:Lcom/camerakit/a/e$a;
+    sput-object v0, Lcom/camerakit/a/e;->oq: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;->oq:Lcom/camerakit/a/e$1;
+    sget-object v0, Lcom/camerakit/a/e$1;->or: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 ee89e5a5b8..788917f651 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 or:Lcom/camerakit/a/b;
+.field private final ot: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;->or:Lcom/camerakit/a/b;
+    iput-object p1, p0, Lcom/camerakit/a/f;->ot: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;->or:Lcom/camerakit/a/b;
+    iget-object v0, p0, Lcom/camerakit/a/f;->ot: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;->or:Lcom/camerakit/a/b;
+    iget-object v0, p0, Lcom/camerakit/a/f;->ot: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;->or:Lcom/camerakit/a/b;
+    iget-object v0, p0, Lcom/camerakit/a/f;->ot: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;->or:Lcom/camerakit/a/b;
+    iget-object v0, p0, Lcom/camerakit/a/f;->ot: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;->or:Lcom/camerakit/a/b;
+    iget-object v0, p0, Lcom/camerakit/a/f;->ot: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;->or:Lcom/camerakit/a/b;
+    iget-object v0, p0, Lcom/camerakit/a/f;->ot: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;->or:Lcom/camerakit/a/b;
+    iget-object v0, p0, Lcom/camerakit/a/f;->ot: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;->or:Lcom/camerakit/a/b;
+    iget-object v0, p0, Lcom/camerakit/a/f;->ot: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;->or:Lcom/camerakit/a/b;
+    iget-object v0, p0, Lcom/camerakit/a/f;->ot: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;->or:Lcom/camerakit/a/b;
+    iget-object v0, p0, Lcom/camerakit/a/f;->ot: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;->or:Lcom/camerakit/a/b;
+    iget-object v0, p0, Lcom/camerakit/a/f;->ot: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;->or:Lcom/camerakit/a/b;
+    iget-object v0, p0, Lcom/camerakit/a/f;->ot: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;->or:Lcom/camerakit/a/b;
+    iget-object v0, p0, Lcom/camerakit/a/f;->ot: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;->or:Lcom/camerakit/a/b;
+    iget-object v0, p0, Lcom/camerakit/a/f;->ot: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 4ba8654585..9eafa74c51 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;->nQ:Lcom/camerakit/a$a;
+    sget-object v1, Lcom/camerakit/a$a;->nR: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;->nS:Lcom/camerakit/a$a;
+    sget-object v1, Lcom/camerakit/a$a;->nT: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;->nU: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
 
@@ -60,7 +60,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;->nW: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;->pb: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
 
@@ -90,7 +90,7 @@
 
     sget-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;->pd: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;->pb: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
 
@@ -118,7 +118,7 @@
 
     sget-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;->pd: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 e1d67aea8b..a06c0268ec 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 private static final synthetic pd:[Lcom/camerakit/b/a;
+.field public static final enum pd:Lcom/camerakit/b/a;
+
+.field private static final synthetic pe:[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;->pb:Lcom/camerakit/b/a;
+    sput-object v1, Lcom/camerakit/b/a;->pc: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;->pc:Lcom/camerakit/b/a;
+    sput-object v1, Lcom/camerakit/b/a;->pd:Lcom/camerakit/b/a;
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lcom/camerakit/b/a;->pd:[Lcom/camerakit/b/a;
+    sput-object v0, Lcom/camerakit/b/a;->pe:[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;->pd:[Lcom/camerakit/b/a;
+    sget-object v0, Lcom/camerakit/b/a;->pe:[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 c9a7285070..3885f5ce1c 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 private static final synthetic pi:[Lcom/camerakit/b/b;
+.field public static final enum pi:Lcom/camerakit/b/b;
+
+.field private static final synthetic pj:[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;->pe:Lcom/camerakit/b/b;
+    sput-object v1, Lcom/camerakit/b/b;->pf: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;->pf:Lcom/camerakit/b/b;
+    sput-object v1, Lcom/camerakit/b/b;->pg: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;->pg:Lcom/camerakit/b/b;
+    sput-object v1, Lcom/camerakit/b/b;->ph: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;->ph:Lcom/camerakit/b/b;
+    sput-object v1, Lcom/camerakit/b/b;->pi:Lcom/camerakit/b/b;
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lcom/camerakit/b/b;->pi:[Lcom/camerakit/b/b;
+    sput-object v0, Lcom/camerakit/b/b;->pj:[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;->pi:[Lcom/camerakit/b/b;
+    sget-object v0, Lcom/camerakit/b/b;->pj:[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 3588a48efe..dd49caa986 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 om:Lcom/camerakit/c;
+.field final synthetic oo:Lcom/camerakit/c;
 
 
 # direct methods
 .method constructor <init>(Lcom/camerakit/c;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/camerakit/c$1;->om:Lcom/camerakit/c;
+    iput-object p1, p0, Lcom/camerakit/c$1;->oo: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;->om:Lcom/camerakit/c;
+    iget-object v0, p0, Lcom/camerakit/c$1;->oo: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;->om:Lcom/camerakit/c;
+    iget-object v0, p0, Lcom/camerakit/c$1;->oo: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;->om:Lcom/camerakit/c;
+    iget-object v0, p0, Lcom/camerakit/c$1;->oo: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;->om:Lcom/camerakit/c;
+    iget-object p1, p0, Lcom/camerakit/c$1;->oo: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;->om:Lcom/camerakit/c;
+    iget-object v0, p0, Lcom/camerakit/c$1;->oo: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;->om:Lcom/camerakit/c;
+    iget-object v0, p0, Lcom/camerakit/c$1;->oo: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 22b01741f8..c249adedab 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 om:Lcom/camerakit/c;
+.field final synthetic oo:Lcom/camerakit/c;
 
 
 # direct methods
 .method constructor <init>(Lcom/camerakit/c;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/camerakit/c$2;->om:Lcom/camerakit/c;
+    iput-object p1, p0, Lcom/camerakit/c$2;->oo: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 3f013b6083..43329753f0 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 oi:Landroid/view/ScaleGestureDetector;
+.field private oj:Landroid/view/ScaleGestureDetector;
 
-.field private oj:Landroid/view/GestureDetector;
+.field private ok:Landroid/view/GestureDetector;
 
-.field private ok:Landroid/view/GestureDetector$SimpleOnGestureListener;
+.field private ol:Landroid/view/GestureDetector$SimpleOnGestureListener;
 
-.field private ol:Landroid/view/ScaleGestureDetector$OnScaleGestureListener;
+.field private om: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;->ok:Landroid/view/GestureDetector$SimpleOnGestureListener;
+    iput-object p1, p0, Lcom/camerakit/c;->ol: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;->ol:Landroid/view/ScaleGestureDetector$OnScaleGestureListener;
+    iput-object p1, p0, Lcom/camerakit/c;->om: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;->ok:Landroid/view/GestureDetector$SimpleOnGestureListener;
+    iput-object p1, p0, Lcom/camerakit/c;->ol: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;->ol:Landroid/view/ScaleGestureDetector$OnScaleGestureListener;
+    iput-object p1, p0, Lcom/camerakit/c;->om: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;->ok:Landroid/view/GestureDetector$SimpleOnGestureListener;
+    iput-object p1, p0, Lcom/camerakit/c;->ol: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;->ol:Landroid/view/ScaleGestureDetector$OnScaleGestureListener;
+    iput-object p1, p0, Lcom/camerakit/c;->om: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;->ol:Landroid/view/ScaleGestureDetector$OnScaleGestureListener;
+    iget-object v2, p0, Lcom/camerakit/c;->om: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;->oi:Landroid/view/ScaleGestureDetector;
+    iput-object v0, p0, Lcom/camerakit/c;->oj:Landroid/view/ScaleGestureDetector;
 
     new-instance v0, Landroid/view/GestureDetector;
 
@@ -101,11 +101,11 @@
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/camerakit/c;->ok:Landroid/view/GestureDetector$SimpleOnGestureListener;
+    iget-object v2, p0, Lcom/camerakit/c;->ol: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;->oj:Landroid/view/GestureDetector;
+    iput-object v0, p0, Lcom/camerakit/c;->ok: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;->oj:Landroid/view/GestureDetector;
+    iget-object v0, p0, Lcom/camerakit/c;->ok:Landroid/view/GestureDetector;
 
     invoke-virtual {v0, p1}, Landroid/view/GestureDetector;->onTouchEvent(Landroid/view/MotionEvent;)Z
 
-    iget-object v0, p0, Lcom/camerakit/c;->oi:Landroid/view/ScaleGestureDetector;
+    iget-object v0, p0, Lcom/camerakit/c;->oj: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 304a012905..6515484d45 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 pj:[Lcom/camerakit/b/c;
+.field public final pk:[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;->pj:[Lcom/camerakit/b/c;
+    iput-object p1, p0, Lcom/camerakit/c/a;->pk:[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 3d696a3d5b..b8d39b6f5c 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 oW:Lcom/camerakit/preview/CameraSurfaceTexture$a;
+.field public static final oX:Lcom/camerakit/preview/CameraSurfaceTexture$a;
 
 
 # instance fields
 .field private nativeHandle:J
 
-.field public oS:Lcom/camerakit/b/c;
+.field public oT:Lcom/camerakit/b/c;
 
-.field public oT:Z
+.field public oU:Z
 
-.field public final oU:[F
+.field public final oV:[F
 
-.field final oV:I
+.field final oW: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;->oW:Lcom/camerakit/preview/CameraSurfaceTexture$a;
+    sput-object v0, Lcom/camerakit/preview/CameraSurfaceTexture;->oX: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;->oV:I
+    iput p2, p0, Lcom/camerakit/preview/CameraSurfaceTexture;->oW: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;->oS:Lcom/camerakit/b/c;
+    iput-object p2, p0, Lcom/camerakit/preview/CameraSurfaceTexture;->oT: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;->oU:[F
+    iput-object p2, p0, Lcom/camerakit/preview/CameraSurfaceTexture;->oV:[F
 
-    iget p2, p0, Lcom/camerakit/preview/CameraSurfaceTexture;->oV:I
+    iget p2, p0, Lcom/camerakit/preview/CameraSurfaceTexture;->oW:I
 
     invoke-direct {p0, p1, p2}, Lcom/camerakit/preview/CameraSurfaceTexture;->nativeInit(II)V
 
-    iget-object p1, p0, Lcom/camerakit/preview/CameraSurfaceTexture;->oU:[F
+    iget-object p1, p0, Lcom/camerakit/preview/CameraSurfaceTexture;->oV:[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;->oT:Z
+    iget-boolean v0, p0, Lcom/camerakit/preview/CameraSurfaceTexture;->oU:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/camerakit/preview/CameraSurfaceTexture;->oS:Lcom/camerakit/b/c;
+    iget-object v0, p0, Lcom/camerakit/preview/CameraSurfaceTexture;->oT:Lcom/camerakit/b/c;
 
     iget v0, v0, Lcom/camerakit/b/c;->width:I
 
-    iget-object v1, p0, Lcom/camerakit/preview/CameraSurfaceTexture;->oS:Lcom/camerakit/b/c;
+    iget-object v1, p0, Lcom/camerakit/preview/CameraSurfaceTexture;->oT: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;->oT:Z
+    iput-boolean v0, p0, Lcom/camerakit/preview/CameraSurfaceTexture;->oU: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;->oU:[F
+    iget-object v1, p0, Lcom/camerakit/preview/CameraSurfaceTexture;->oV:[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 4b2c90a1a2..4e77e957d8 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 pa:Lcom/camerakit/preview/CameraSurfaceView$b;
+.field final synthetic pb: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;->pa:Lcom/camerakit/preview/CameraSurfaceView$b;
+    iput-object p1, p0, Lcom/camerakit/preview/CameraSurfaceView$b$a;->pb: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;->pa:Lcom/camerakit/preview/CameraSurfaceView$b;
+    iget-object p1, p0, Lcom/camerakit/preview/CameraSurfaceView$b$a;->pb: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 c139c98ff7..2f45968963 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 0d2ea3def9..635802d8ef 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 oZ:Lcom/camerakit/preview/CameraSurfaceView$a;
+.field public static final pa:Lcom/camerakit/preview/CameraSurfaceView$a;
 
 
 # instance fields
 .field private nativeHandle:J
 
-.field private oX:Lcom/camerakit/preview/a;
+.field private oY:Lcom/camerakit/preview/a;
 
-.field private oY:Lcom/camerakit/preview/CameraSurfaceTexture;
+.field private oZ: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;->oZ:Lcom/camerakit/preview/CameraSurfaceView$a;
+    sput-object v0, Lcom/camerakit/preview/CameraSurfaceView;->pa: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;->oY:Lcom/camerakit/preview/CameraSurfaceTexture;
+    iput-object p1, p0, Lcom/camerakit/preview/CameraSurfaceView;->oZ: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;->oX:Lcom/camerakit/preview/a;
+    iget-object v0, p0, Lcom/camerakit/preview/CameraSurfaceView;->oY: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;->oY:Lcom/camerakit/preview/CameraSurfaceTexture;
+    iget-object p1, p0, Lcom/camerakit/preview/CameraSurfaceView;->oZ: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;->oV:I
+    iget v0, p1, Lcom/camerakit/preview/CameraSurfaceTexture;->oW:I
 
-    iget-object v1, p1, Lcom/camerakit/preview/CameraSurfaceTexture;->oS:Lcom/camerakit/b/c;
+    iget-object v1, p1, Lcom/camerakit/preview/CameraSurfaceTexture;->oT:Lcom/camerakit/b/c;
 
     iget v1, v1, Lcom/camerakit/b/c;->width:I
 
-    iget-object p1, p1, Lcom/camerakit/preview/CameraSurfaceTexture;->oS:Lcom/camerakit/b/c;
+    iget-object p1, p1, Lcom/camerakit/preview/CameraSurfaceTexture;->oT: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;->oX:Lcom/camerakit/preview/a;
+    iput-object p1, p0, Lcom/camerakit/preview/CameraSurfaceView;->oY: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 b25f2443e8..84bd6e5ac7 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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -259,7 +259,7 @@
     return v3
 
     :cond_3
-    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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 ee0cfe8302..818a81ddc5 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 pk:Lcom/crashlytics/android/answers/Answers;
+.field public final pl:Lcom/crashlytics/android/answers/Answers;
 
-.field public final pl:Lcom/crashlytics/android/beta/a;
+.field public final pm:Lcom/crashlytics/android/beta/a;
 
-.field public final pm:Lcom/crashlytics/android/core/l;
+.field public final pn:Lcom/crashlytics/android/core/l;
 
-.field public final pn:Ljava/util/Collection;
+.field public final po: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;->pk:Lcom/crashlytics/android/answers/Answers;
+    iput-object p1, p0, Lcom/crashlytics/android/a;->pl:Lcom/crashlytics/android/answers/Answers;
 
-    iput-object p2, p0, Lcom/crashlytics/android/a;->pl:Lcom/crashlytics/android/beta/a;
+    iput-object p2, p0, Lcom/crashlytics/android/a;->pm:Lcom/crashlytics/android/beta/a;
 
-    iput-object p3, p0, Lcom/crashlytics/android/a;->pm:Lcom/crashlytics/android/core/l;
+    iput-object p3, p0, Lcom/crashlytics/android/a;->pn: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;->pn:Ljava/util/Collection;
+    iput-object p1, p0, Lcom/crashlytics/android/a;->po:Ljava/util/Collection;
 
     return-void
 .end method
@@ -106,95 +106,9 @@
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/crashlytics/android/a;->pm:Lcom/crashlytics/android/core/l;
+    iget-object v0, v0, Lcom/crashlytics/android/a;->pn:Lcom/crashlytics/android/core/l;
 
-    iget-boolean v1, v0, Lcom/crashlytics/android/core/l;->sU:Z
-
-    if-nez v1, :cond_0
-
-    const-string v1, "prior to setting user data."
-
-    invoke-static {v1}, Lcom/crashlytics/android/core/l;->N(Ljava/lang/String;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_0
-
-    invoke-static {p0}, Lcom/crashlytics/android/core/l;->O(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object p0
-
-    iput-object p0, v0, Lcom/crashlytics/android/core/l;->sR:Ljava/lang/String;
-
-    iget-object p0, v0, Lcom/crashlytics/android/core/l;->sQ:Lcom/crashlytics/android/core/k;
-
-    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;->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
-
-    :cond_0
-    return-void
-.end method
-
-.method public static D(Ljava/lang/String;)V
-    .locals 3
-
-    invoke-static {}, Lcom/crashlytics/android/a;->checkInitialized()V
-
-    invoke-static {}, Lcom/crashlytics/android/a;->ce()Lcom/crashlytics/android/a;
-
-    move-result-object v0
-
-    iget-object v0, v0, Lcom/crashlytics/android/a;->pm:Lcom/crashlytics/android/core/l;
-
-    iget-boolean v1, v0, Lcom/crashlytics/android/core/l;->sU:Z
-
-    if-nez v1, :cond_0
-
-    const-string v1, "prior to setting user data."
-
-    invoke-static {v1}, Lcom/crashlytics/android/core/l;->N(Ljava/lang/String;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_0
-
-    invoke-static {p0}, Lcom/crashlytics/android/core/l;->O(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object p0
-
-    iput-object p0, v0, Lcom/crashlytics/android/core/l;->userName:Ljava/lang/String;
-
-    iget-object p0, v0, Lcom/crashlytics/android/core/l;->sQ:Lcom/crashlytics/android/core/k;
-
-    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;->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
-
-    :cond_0
-    return-void
-.end method
-
-.method public static E(Ljava/lang/String;)V
-    .locals 3
-
-    invoke-static {}, Lcom/crashlytics/android/a;->checkInitialized()V
-
-    invoke-static {}, Lcom/crashlytics/android/a;->ce()Lcom/crashlytics/android/a;
-
-    move-result-object v0
-
-    iget-object v0, v0, Lcom/crashlytics/android/a;->pm:Lcom/crashlytics/android/core/l;
-
-    iget-boolean v1, v0, Lcom/crashlytics/android/core/l;->sU:Z
+    iget-boolean v1, v0, Lcom/crashlytics/android/core/l;->sV:Z
 
     if-nez v1, :cond_0
 
@@ -212,13 +126,99 @@
 
     iput-object p0, v0, Lcom/crashlytics/android/core/l;->sS:Ljava/lang/String;
 
-    iget-object p0, v0, Lcom/crashlytics/android/core/l;->sQ:Lcom/crashlytics/android/core/k;
+    iget-object p0, v0, Lcom/crashlytics/android/core/l;->sR:Lcom/crashlytics/android/core/k;
 
-    iget-object v1, v0, Lcom/crashlytics/android/core/l;->sR:Ljava/lang/String;
+    iget-object v1, v0, Lcom/crashlytics/android/core/l;->sS: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;->sS:Ljava/lang/String;
+    iget-object v0, v0, Lcom/crashlytics/android/core/l;->sT: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
+
+    :cond_0
+    return-void
+.end method
+
+.method public static D(Ljava/lang/String;)V
+    .locals 3
+
+    invoke-static {}, Lcom/crashlytics/android/a;->checkInitialized()V
+
+    invoke-static {}, Lcom/crashlytics/android/a;->ce()Lcom/crashlytics/android/a;
+
+    move-result-object v0
+
+    iget-object v0, v0, Lcom/crashlytics/android/a;->pn:Lcom/crashlytics/android/core/l;
+
+    iget-boolean v1, v0, Lcom/crashlytics/android/core/l;->sV:Z
+
+    if-nez v1, :cond_0
+
+    const-string v1, "prior to setting user data."
+
+    invoke-static {v1}, Lcom/crashlytics/android/core/l;->N(Ljava/lang/String;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_0
+
+    invoke-static {p0}, Lcom/crashlytics/android/core/l;->O(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p0
+
+    iput-object p0, v0, Lcom/crashlytics/android/core/l;->userName:Ljava/lang/String;
+
+    iget-object p0, v0, Lcom/crashlytics/android/core/l;->sR:Lcom/crashlytics/android/core/k;
+
+    iget-object v1, v0, Lcom/crashlytics/android/core/l;->sS: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;
+
+    invoke-virtual {p0, v1, v2, v0}, Lcom/crashlytics/android/core/k;->a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+
+    :cond_0
+    return-void
+.end method
+
+.method public static E(Ljava/lang/String;)V
+    .locals 3
+
+    invoke-static {}, Lcom/crashlytics/android/a;->checkInitialized()V
+
+    invoke-static {}, Lcom/crashlytics/android/a;->ce()Lcom/crashlytics/android/a;
+
+    move-result-object v0
+
+    iget-object v0, v0, Lcom/crashlytics/android/a;->pn:Lcom/crashlytics/android/core/l;
+
+    iget-boolean v1, v0, Lcom/crashlytics/android/core/l;->sV:Z
+
+    if-nez v1, :cond_0
+
+    const-string v1, "prior to setting user data."
+
+    invoke-static {v1}, Lcom/crashlytics/android/core/l;->N(Ljava/lang/String;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_0
+
+    invoke-static {p0}, Lcom/crashlytics/android/core/l;->O(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p0
+
+    iput-object p0, v0, Lcom/crashlytics/android/core/l;->sT:Ljava/lang/String;
+
+    iget-object p0, v0, Lcom/crashlytics/android/core/l;->sR:Lcom/crashlytics/android/core/k;
+
+    iget-object v1, v0, Lcom/crashlytics/android/core/l;->sS: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;
 
     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;->pm:Lcom/crashlytics/android/core/l;
+    iget-object v0, v0, Lcom/crashlytics/android/a;->pn:Lcom/crashlytics/android/core/l;
 
-    iget-boolean v1, v0, Lcom/crashlytics/android/core/l;->sU:Z
+    iget-boolean v1, v0, Lcom/crashlytics/android/core/l;->sV:Z
 
     if-nez v1, :cond_1
 
@@ -251,7 +251,7 @@
 
     if-nez p0, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->sQ:Lcom/crashlytics/android/core/k;
+    iget-object v0, v0, Lcom/crashlytics/android/core/l;->sR: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;->rK:Lcom/crashlytics/android/core/j;
+    iget-object v3, v0, Lcom/crashlytics/android/core/k;->rL: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;->pm:Lcom/crashlytics/android/core/l;
+    iget-object v0, v0, Lcom/crashlytics/android/a;->pn:Lcom/crashlytics/android/core/l;
 
-    iget-boolean v1, v0, Lcom/crashlytics/android/core/l;->sU:Z
+    iget-boolean v1, v0, Lcom/crashlytics/android/core/l;->sV:Z
 
     if-nez v1, :cond_2
 
@@ -350,7 +350,7 @@
 
     move-result-object p0
 
-    iget-object v1, v0, Lcom/crashlytics/android/core/l;->sM:Ljava/util/concurrent/ConcurrentHashMap;
+    iget-object v1, v0, Lcom/crashlytics/android/core/l;->sN: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;->sM:Ljava/util/concurrent/ConcurrentHashMap;
+    iget-object v1, v0, Lcom/crashlytics/android/core/l;->sN: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->sM:Ljava/util/concurrent/ConcurrentHashMap;
+    iget-object v1, v0, Lcom/crashlytics/android/core/l;->sN: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;->sQ:Lcom/crashlytics/android/core/k;
+    iget-object p0, v0, Lcom/crashlytics/android/core/l;->sR:Lcom/crashlytics/android/core/k;
 
-    iget-object p1, v0, Lcom/crashlytics/android/core/l;->sM:Ljava/util/concurrent/ConcurrentHashMap;
+    iget-object p1, v0, Lcom/crashlytics/android/core/l;->sN:Ljava/util/concurrent/ConcurrentHashMap;
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/k;->rK:Lcom/crashlytics/android/core/j;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k;->rL: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;->pm:Lcom/crashlytics/android/core/l;
+    iget-object v0, v0, Lcom/crashlytics/android/a;->pn:Lcom/crashlytics/android/core/l;
 
     const-string v1, "CrashlyticsCore"
 
@@ -453,7 +453,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/crashlytics/android/a;->pn:Ljava/util/Collection;
+    iget-object v0, p0, Lcom/crashlytics/android/a;->po: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 a4e8f155da..faa5bb724f 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 pp:Z
+.field public pq:Z
 
-.field public pq:Lcom/crashlytics/android/answers/ac;
+.field public pr:Lcom/crashlytics/android/answers/ac;
 
 
 # direct methods
@@ -27,7 +27,7 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/crashlytics/android/answers/Answers;->pp:Z
+    iput-boolean v0, p0, Lcom/crashlytics/android/answers/Answers;->pq: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->Ca()Z
+    invoke-virtual {v1}, Lio/fabric/sdk/android/a/b/l;->BY()Z
 
     move-result v1
 
     if-nez v1, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->pq:Lcom/crashlytics/android/answers/ac;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/Answers;->pr: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;->CX()Lio/fabric/sdk/android/a/g/q;
+    invoke-static {}, Lio/fabric/sdk/android/a/g/q$a;->CV()Lio/fabric/sdk/android/a/g/q;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lio/fabric/sdk/android/a/g/q;->CU()Lio/fabric/sdk/android/a/g/t;
+    invoke-virtual {v1}, Lio/fabric/sdk/android/a/g/q;->CS()Lio/fabric/sdk/android/a/g/t;
 
     move-result-object v1
 
     if-nez v1, :cond_1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->bgb:Lio/fabric/sdk/android/a/g/m;
+    iget-object v2, v1, Lio/fabric/sdk/android/a/g/t;->bfW:Lio/fabric/sdk/android/a/g/m;
 
-    iget-boolean v2, v2, Lio/fabric/sdk/android/a/g/m;->bfC:Z
+    iget-boolean v2, v2, Lio/fabric/sdk/android/a/g/m;->bfx:Z
 
     if-eqz v2, :cond_2
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->pq:Lcom/crashlytics/android/answers/ac;
+    iget-object v2, p0, Lcom/crashlytics/android/answers/Answers;->pr:Lcom/crashlytics/android/answers/ac;
 
-    iget-object v1, v1, Lio/fabric/sdk/android/a/g/t;->qu:Lio/fabric/sdk/android/a/g/b;
+    iget-object v1, v1, Lio/fabric/sdk/android/a/g/t;->qv: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;->pK:Lcom/crashlytics/android/answers/k;
+    iget-object v4, v2, Lcom/crashlytics/android/answers/ac;->pL:Lcom/crashlytics/android/answers/k;
 
-    iget-boolean v5, v1, Lio/fabric/sdk/android/a/g/b;->pR:Z
+    iget-boolean v5, v1, Lio/fabric/sdk/android/a/g/b;->pS:Z
 
-    iput-boolean v5, v4, Lcom/crashlytics/android/answers/k;->pR:Z
+    iput-boolean v5, v4, Lcom/crashlytics/android/answers/k;->pS:Z
 
-    iget-object v2, v2, Lcom/crashlytics/android/answers/ac;->qx:Lcom/crashlytics/android/answers/e;
+    iget-object v2, v2, Lcom/crashlytics/android/answers/ac;->qy: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->pq:Lcom/crashlytics/android/answers/ac;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/Answers;->pr: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->pp:Z
+    iget-boolean v0, p0, Lcom/crashlytics/android/answers/Answers;->pq:Z
 
     if-eqz v0, :cond_0
 
@@ -233,11 +233,11 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/crashlytics/android/answers/Answers;->pq:Lcom/crashlytics/android/answers/ac;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/Answers;->pr:Lcom/crashlytics/android/answers/ac;
 
     if-eqz v0, :cond_1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->qx:Lcom/crashlytics/android/answers/e;
+    iget-object v0, v0, Lcom/crashlytics/android/answers/ac;->qy:Lcom/crashlytics/android/answers/e;
 
     new-instance v1, Lcom/crashlytics/android/answers/ae$a;
 
-    sget-object v2, Lcom/crashlytics/android/answers/ae$b;->qO: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
 
-    iget-object v2, p1, Lcom/crashlytics/android/answers/l;->pV:Ljava/lang/String;
+    iget-object v2, p1, Lcom/crashlytics/android/answers/l;->pW:Ljava/lang/String;
 
-    iput-object v2, v1, Lcom/crashlytics/android/answers/ae$a;->qD:Ljava/lang/String;
+    iput-object v2, v1, Lcom/crashlytics/android/answers/ae$a;->qE:Ljava/lang/String;
 
-    iget-object p1, p1, Lcom/crashlytics/android/answers/c;->pt:Lcom/crashlytics/android/answers/b;
+    iget-object p1, p1, Lcom/crashlytics/android/answers/c;->pu:Lcom/crashlytics/android/answers/b;
 
-    iget-object p1, p1, Lcom/crashlytics/android/answers/b;->ps:Ljava/util/Map;
+    iget-object p1, p1, Lcom/crashlytics/android/answers/b;->pt:Ljava/util/Map;
 
-    iput-object p1, v1, Lcom/crashlytics/android/answers/ae$a;->qE:Ljava/util/Map;
+    iput-object p1, v1, Lcom/crashlytics/android/answers/ae$a;->qF: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;->ra:Lio/fabric/sdk/android/a/b/s;
+    iget-object v1, v9, Lio/fabric/sdk/android/i;->rb: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->pq:Lcom/crashlytics/android/answers/ac;
+    iput-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 v1, v9, Lcom/crashlytics/android/answers/Answers;->pr:Lcom/crashlytics/android/answers/ac;
 
-    iget-object v2, v1, Lcom/crashlytics/android/answers/ac;->qx:Lcom/crashlytics/android/answers/e;
+    iget-object v2, v1, Lcom/crashlytics/android/answers/ac;->qy: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;->qy:Lio/fabric/sdk/android/a;
+    iget-object v2, v1, Lcom/crashlytics/android/answers/ac;->qz:Lio/fabric/sdk/android/a;
 
     new-instance v3, Lcom/crashlytics/android/answers/g;
 
-    iget-object v4, v1, Lcom/crashlytics/android/answers/ac;->pK:Lcom/crashlytics/android/answers/k;
+    iget-object v4, v1, Lcom/crashlytics/android/answers/ac;->pL: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;->pK:Lcom/crashlytics/android/answers/k;
+    iget-object v2, v1, Lcom/crashlytics/android/answers/ac;->pL: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;->qz:Lcom/crashlytics/android/answers/h;
+    iget-object v2, v1, Lcom/crashlytics/android/answers/ac;->qA:Lcom/crashlytics/android/answers/h;
 
-    iget-object v2, v2, Lcom/crashlytics/android/answers/h;->pL:Lio/fabric/sdk/android/a/f/c;
+    iget-object v2, v2, Lcom/crashlytics/android/answers/h;->pM:Lio/fabric/sdk/android/a/f/c;
 
-    invoke-interface {v2}, Lio/fabric/sdk/android/a/f/c;->CP()Landroid/content/SharedPreferences;
+    invoke-interface {v2}, Lio/fabric/sdk/android/a/f/c;->CN()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;->qw:J
+    iget-wide v4, v1, Lcom/crashlytics/android/answers/ac;->qx:J
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->qx:Lcom/crashlytics/android/answers/e;
+    iget-object v2, v1, Lcom/crashlytics/android/answers/ac;->qy:Lcom/crashlytics/android/answers/e;
 
     new-instance v6, Lcom/crashlytics/android/answers/ae$a;
 
-    sget-object v7, Lcom/crashlytics/android/answers/ae$b;->qN:Lcom/crashlytics/android/answers/ae$b;
+    sget-object v7, Lcom/crashlytics/android/answers/ae$b;->qO: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;->qC:Ljava/util/Map;
+    iput-object v4, v6, Lcom/crashlytics/android/answers/ae$a;->qD: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;->qz:Lcom/crashlytics/android/answers/h;
+    iget-object v1, v1, Lcom/crashlytics/android/answers/ac;->qA:Lcom/crashlytics/android/answers/h;
 
-    iget-object v2, v1, Lcom/crashlytics/android/answers/h;->pL:Lio/fabric/sdk/android/a/f/c;
+    iget-object v2, 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;
+    iget-object v1, v1, Lcom/crashlytics/android/answers/h;->pM:Lio/fabric/sdk/android/a/f/c;
 
-    invoke-interface {v1}, Lio/fabric/sdk/android/a/f/c;->CQ()Landroid/content/SharedPreferences$Editor;
+    invoke-interface {v1}, Lio/fabric/sdk/android/a/f/c;->CO()Landroid/content/SharedPreferences$Editor;
 
     move-result-object v1
 
@@ -574,7 +574,7 @@
 
     move-result v0
 
-    iput-boolean v0, v9, Lcom/crashlytics/android/answers/Answers;->pp:Z
+    iput-boolean v0, v9, Lcom/crashlytics/android/answers/Answers;->pq: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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 f912db49bf..9942acfd6c 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 po:Ljava/math/BigDecimal;
+.field static final pp:Ljava/math/BigDecimal;
 
 
 # direct methods
@@ -27,7 +27,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/crashlytics/android/answers/a;->po:Ljava/math/BigDecimal;
+    sput-object v0, Lcom/crashlytics/android/answers/a;->pp: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 1017756550..a9c629cede 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 qu:Lio/fabric/sdk/android/a/g/b;
+.field qv: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;->beb:Lio/fabric/sdk/android/a/b/k;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/aa;->bdW:Lio/fabric/sdk/android/a/b/k;
 
-    invoke-interface {v0}, Lio/fabric/sdk/android/a/b/k;->BZ()J
+    invoke-interface {v0}, Lio/fabric/sdk/android/a/b/k;->BX()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;->qu:Lio/fabric/sdk/android/a/g/b;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/aa;->qv: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;->bfa:I
+    iget v0, v0, Lio/fabric/sdk/android/a/g/b;->beV: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;->qu:Lio/fabric/sdk/android/a/g/b;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/aa;->qv: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;->beY:I
+    iget v0, v0, Lio/fabric/sdk/android/a/g/b;->beT: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 6cf5bb5d22..b3cbc0aa8b 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 qv:Ljava/lang/String;
+.field private final qw: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;->beq:I
+    sget v5, Lio/fabric/sdk/android/a/e/c;->bel: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;->qv:Ljava/lang/String;
+    iput-object p5, p0, Lcom/crashlytics/android/answers/ab;->qw:Ljava/lang/String;
 
     return-void
 .end method
@@ -46,7 +46,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/crashlytics/android/answers/ab;->BQ()Lio/fabric/sdk/android/a/e/d;
+    invoke-virtual {p0}, Lcom/crashlytics/android/answers/ab;->BO()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;->px:Lio/fabric/sdk/android/i;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/ab;->py: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;->qv:Ljava/lang/String;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/ab;->qw: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->CG()I
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/e/d;->CE()I
 
     move-result p1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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 a80c4cd49e..a90349b1a6 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 pK:Lcom/crashlytics/android/answers/k;
+.field final pL:Lcom/crashlytics/android/answers/k;
 
-.field final qw:J
+.field final qA:Lcom/crashlytics/android/answers/h;
 
-.field public final qx:Lcom/crashlytics/android/answers/e;
+.field final qx:J
 
-.field final qy:Lio/fabric/sdk/android/a;
+.field public final qy:Lcom/crashlytics/android/answers/e;
 
-.field final qz:Lcom/crashlytics/android/answers/h;
+.field final qz:Lio/fabric/sdk/android/a;
 
 
 # direct methods
@@ -24,15 +24,15 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/crashlytics/android/answers/ac;->qx:Lcom/crashlytics/android/answers/e;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/ac;->qy:Lcom/crashlytics/android/answers/e;
 
-    iput-object p2, p0, Lcom/crashlytics/android/answers/ac;->qy:Lio/fabric/sdk/android/a;
+    iput-object p2, p0, Lcom/crashlytics/android/answers/ac;->qz:Lio/fabric/sdk/android/a;
 
-    iput-object p3, p0, Lcom/crashlytics/android/answers/ac;->pK:Lcom/crashlytics/android/answers/k;
+    iput-object p3, p0, Lcom/crashlytics/android/answers/ac;->pL:Lcom/crashlytics/android/answers/k;
 
-    iput-object p4, p0, Lcom/crashlytics/android/answers/ac;->qz:Lcom/crashlytics/android/answers/h;
+    iput-object p4, p0, Lcom/crashlytics/android/answers/ac;->qA:Lcom/crashlytics/android/answers/h;
 
-    iput-wide p5, p0, Lcom/crashlytics/android/answers/ac;->qw:J
+    iput-wide p5, p0, Lcom/crashlytics/android/answers/ac;->qx: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->qx:Lcom/crashlytics/android/answers/e;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/ac;->qy: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->qx:Lcom/crashlytics/android/answers/e;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/ac;->qy: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;->qQ: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;->qF:Ljava/lang/String;
+    iput-object v2, v1, Lcom/crashlytics/android/answers/ae$a;->qG:Ljava/lang/String;
 
-    iget-object v2, p1, Lcom/crashlytics/android/answers/w;->qm:Lcom/crashlytics/android/answers/b;
+    iget-object v2, p1, Lcom/crashlytics/android/answers/w;->qn:Lcom/crashlytics/android/answers/b;
 
-    iget-object v2, v2, Lcom/crashlytics/android/answers/b;->ps:Ljava/util/Map;
+    iget-object v2, v2, Lcom/crashlytics/android/answers/b;->pt:Ljava/util/Map;
 
-    iput-object v2, v1, Lcom/crashlytics/android/answers/ae$a;->qG:Ljava/util/Map;
+    iput-object v2, v1, Lcom/crashlytics/android/answers/ae$a;->qH:Ljava/util/Map;
 
-    iget-object p1, p1, Lcom/crashlytics/android/answers/c;->pt:Lcom/crashlytics/android/answers/b;
+    iget-object p1, p1, Lcom/crashlytics/android/answers/c;->pu:Lcom/crashlytics/android/answers/b;
 
-    iget-object p1, p1, Lcom/crashlytics/android/answers/b;->ps:Ljava/util/Map;
+    iget-object p1, p1, Lcom/crashlytics/android/answers/b;->pt:Ljava/util/Map;
 
-    iput-object p1, v1, Lcom/crashlytics/android/answers/ae$a;->qE:Ljava/util/Map;
+    iput-object p1, v1, Lcom/crashlytics/android/answers/ae$a;->qF: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->qx:Lcom/crashlytics/android/answers/e;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/ac;->qy: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;->qy:Lio/fabric/sdk/android/a;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/ac;->qz:Lio/fabric/sdk/android/a;
 
-    invoke-virtual {v0}, Lio/fabric/sdk/android/a;->BD()V
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a;->BB()V
 
-    iget-object v0, p0, Lcom/crashlytics/android/answers/ac;->qx:Lcom/crashlytics/android/answers/e;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/ac;->qy: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 65e451e424..94d84480e5 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 qB:Lcom/crashlytics/android/answers/ae$b;
+.field final qC:Lcom/crashlytics/android/answers/ae$b;
 
-.field public qC:Ljava/util/Map;
+.field public qD:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -28,9 +28,9 @@
     .end annotation
 .end field
 
-.field qD:Ljava/lang/String;
+.field qE:Ljava/lang/String;
 
-.field public qE:Ljava/util/Map;
+.field public qF:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -41,9 +41,9 @@
     .end annotation
 .end field
 
-.field qF:Ljava/lang/String;
+.field qG:Ljava/lang/String;
 
-.field qG:Ljava/util/Map;
+.field qH: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;->qB:Lcom/crashlytics/android/answers/ae$b;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/ae$a;->qC: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;->qC:Ljava/util/Map;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/ae$a;->qD:Ljava/util/Map;
 
-    iput-object p1, p0, Lcom/crashlytics/android/answers/ae$a;->qD:Ljava/lang/String;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/ae$a;->qE:Ljava/lang/String;
 
-    iput-object p1, p0, Lcom/crashlytics/android/answers/ae$a;->qE:Ljava/util/Map;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/ae$a;->qF:Ljava/util/Map;
 
-    iput-object p1, p0, Lcom/crashlytics/android/answers/ae$a;->qF:Ljava/lang/String;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/ae$a;->qG:Ljava/lang/String;
 
-    iput-object p1, p0, Lcom/crashlytics/android/answers/ae$a;->qG:Ljava/util/Map;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/ae$a;->qH: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 9a23174a16..6d58323228 100644
--- a/com.discord/smali/com/crashlytics/android/answers/ae$b.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/ae$b.smali
@@ -23,8 +23,6 @@
 
 
 # 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;
@@ -39,7 +37,9 @@
 
 .field public static final enum qP:Lcom/crashlytics/android/answers/ae$b;
 
-.field private static final synthetic qQ:[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;
 
 
 # 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;->qI: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;
 
@@ -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;->qJ: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;
 
@@ -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;->qK: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;
 
@@ -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;->qL: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;
 
@@ -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;->qM: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;
 
@@ -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;->qN: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;
 
@@ -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;->qO:Lcom/crashlytics/android/answers/ae$b;
+    sput-object v0, Lcom/crashlytics/android/answers/ae$b;->qP: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;->qP:Lcom/crashlytics/android/answers/ae$b;
+    sput-object v0, Lcom/crashlytics/android/answers/ae$b;->qQ: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;->qI:Lcom/crashlytics/android/answers/ae$b;
+    sget-object v9, Lcom/crashlytics/android/answers/ae$b;->qJ:Lcom/crashlytics/android/answers/ae$b;
 
     aput-object v9, v0, v1
 
-    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;->qK:Lcom/crashlytics/android/answers/ae$b;
 
     aput-object v1, v0, v2
 
-    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;->qL:Lcom/crashlytics/android/answers/ae$b;
 
     aput-object v1, v0, v3
 
-    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;->qM:Lcom/crashlytics/android/answers/ae$b;
 
     aput-object v1, v0, v4
 
-    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;->qN:Lcom/crashlytics/android/answers/ae$b;
 
     aput-object v1, v0, v5
 
-    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;->qO:Lcom/crashlytics/android/answers/ae$b;
 
     aput-object v1, v0, v6
 
-    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;->qP:Lcom/crashlytics/android/answers/ae$b;
 
     aput-object v1, v0, v7
 
-    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;->qQ:Lcom/crashlytics/android/answers/ae$b;
 
     aput-object v1, v0, v8
 
-    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;->qR:[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;->qQ:[Lcom/crashlytics/android/answers/ae$b;
+    sget-object v0, Lcom/crashlytics/android/answers/ae$b;->qR:[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 5b1d480ff0..a426ac769c 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 qA:Lcom/crashlytics/android/answers/af;
+.field public final qB:Lcom/crashlytics/android/answers/af;
 
-.field public final qB:Lcom/crashlytics/android/answers/ae$b;
+.field public final qC:Lcom/crashlytics/android/answers/ae$b;
 
-.field public final qC:Ljava/util/Map;
+.field public final qD:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -28,9 +28,9 @@
     .end annotation
 .end field
 
-.field public final qD:Ljava/lang/String;
+.field public final qE:Ljava/lang/String;
 
-.field public final qE:Ljava/util/Map;
+.field public final qF:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -41,9 +41,9 @@
     .end annotation
 .end field
 
-.field public final qF:Ljava/lang/String;
+.field public final qG:Ljava/lang/String;
 
-.field public final qG:Ljava/util/Map;
+.field public final qH:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -54,7 +54,7 @@
     .end annotation
 .end field
 
-.field private qH:Ljava/lang/String;
+.field private qI: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;->qA:Lcom/crashlytics/android/answers/af;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/ae;->qB: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;->qB:Lcom/crashlytics/android/answers/ae$b;
+    iput-object p4, p0, Lcom/crashlytics/android/answers/ae;->qC:Lcom/crashlytics/android/answers/ae$b;
 
-    iput-object p5, p0, Lcom/crashlytics/android/answers/ae;->qC:Ljava/util/Map;
+    iput-object p5, p0, Lcom/crashlytics/android/answers/ae;->qD:Ljava/util/Map;
 
-    iput-object p6, p0, Lcom/crashlytics/android/answers/ae;->qD:Ljava/lang/String;
+    iput-object p6, p0, Lcom/crashlytics/android/answers/ae;->qE:Ljava/lang/String;
 
-    iput-object p7, p0, Lcom/crashlytics/android/answers/ae;->qE:Ljava/util/Map;
+    iput-object p7, p0, Lcom/crashlytics/android/answers/ae;->qF:Ljava/util/Map;
 
-    iput-object p8, p0, Lcom/crashlytics/android/answers/ae;->qF:Ljava/lang/String;
+    iput-object p8, p0, Lcom/crashlytics/android/answers/ae;->qG:Ljava/lang/String;
 
-    iput-object p9, p0, Lcom/crashlytics/android/answers/ae;->qG:Ljava/util/Map;
+    iput-object p9, p0, Lcom/crashlytics/android/answers/ae;->qH: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;->qC:Ljava/util/Map;
+    iput-object p1, v0, Lcom/crashlytics/android/answers/ae$a;->qD: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;->qH:Ljava/lang/String;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/ae;->qI: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;->qB:Lcom/crashlytics/android/answers/ae$b;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/ae;->qC: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;->qC:Ljava/util/Map;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/ae;->qD: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;->qD:Ljava/lang/String;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/ae;->qE: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;->qE:Ljava/util/Map;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/ae;->qF: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;->qF:Ljava/lang/String;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/ae;->qG: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;->qG:Ljava/util/Map;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/ae;->qH: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;->qA:Lcom/crashlytics/android/answers/af;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/ae;->qB: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;->qH:Ljava/lang/String;
+    iput-object v0, p0, Lcom/crashlytics/android/answers/ae;->qI:Ljava/lang/String;
 
     :cond_0
-    iget-object v0, p0, Lcom/crashlytics/android/answers/ae;->qH:Ljava/lang/String;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/ae;->qI: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 12893516bd..1873ec2740 100644
--- a/com.discord/smali/com/crashlytics/android/answers/af.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/af.smali
@@ -4,19 +4,17 @@
 
 
 # instance fields
-.field public final cp:Ljava/lang/String;
+.field public final cq:Ljava/lang/String;
 
-.field private qH:Ljava/lang/String;
-
-.field public final qR:Ljava/lang/String;
+.field private qI:Ljava/lang/String;
 
 .field public final qS:Ljava/lang/String;
 
 .field public final qT:Ljava/lang/String;
 
-.field public final qU:Ljava/lang/Boolean;
+.field public final qU:Ljava/lang/String;
 
-.field public final qV:Ljava/lang/String;
+.field public final qV:Ljava/lang/Boolean;
 
 .field public final qW:Ljava/lang/String;
 
@@ -26,6 +24,8 @@
 
 .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;->qR:Ljava/lang/String;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/af;->qS:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/crashlytics/android/answers/af;->qS:Ljava/lang/String;
+    iput-object p2, p0, Lcom/crashlytics/android/answers/af;->qT:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/crashlytics/android/answers/af;->qT:Ljava/lang/String;
+    iput-object p3, p0, Lcom/crashlytics/android/answers/af;->qU:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/crashlytics/android/answers/af;->qU:Ljava/lang/Boolean;
+    iput-object p4, p0, Lcom/crashlytics/android/answers/af;->qV:Ljava/lang/Boolean;
 
-    iput-object p5, p0, Lcom/crashlytics/android/answers/af;->qV:Ljava/lang/String;
+    iput-object p5, p0, Lcom/crashlytics/android/answers/af;->qW:Ljava/lang/String;
 
-    iput-object p6, p0, Lcom/crashlytics/android/answers/af;->qW:Ljava/lang/String;
+    iput-object p6, p0, Lcom/crashlytics/android/answers/af;->qX:Ljava/lang/String;
 
-    iput-object p7, p0, Lcom/crashlytics/android/answers/af;->cp:Ljava/lang/String;
+    iput-object p7, p0, Lcom/crashlytics/android/answers/af;->cq:Ljava/lang/String;
 
-    iput-object p8, p0, Lcom/crashlytics/android/answers/af;->qX:Ljava/lang/String;
+    iput-object p8, p0, Lcom/crashlytics/android/answers/af;->qY:Ljava/lang/String;
 
-    iput-object p9, p0, Lcom/crashlytics/android/answers/af;->qY:Ljava/lang/String;
+    iput-object p9, p0, Lcom/crashlytics/android/answers/af;->qZ:Ljava/lang/String;
 
-    iput-object p10, p0, Lcom/crashlytics/android/answers/af;->qZ:Ljava/lang/String;
+    iput-object p10, p0, Lcom/crashlytics/android/answers/af;->ra: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;->qH:Ljava/lang/String;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/af;->qI: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;->qR: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;
 
@@ -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;->qS: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;
 
@@ -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;->qT:Ljava/lang/String;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/af;->qU: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;->qU:Ljava/lang/Boolean;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/af;->qV: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;->qV: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;
 
@@ -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;->qW: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;
 
@@ -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;->cp:Ljava/lang/String;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/af;->cq: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;->qX: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;
 
@@ -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;->qY: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;
 
@@ -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;->qZ:Ljava/lang/String;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/af;->ra: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;->qH:Ljava/lang/String;
+    iput-object v0, p0, Lcom/crashlytics/android/answers/af;->qI:Ljava/lang/String;
 
     :cond_0
-    iget-object v0, p0, Lcom/crashlytics/android/answers/af;->qH:Ljava/lang/String;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/af;->qI: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 97704c66cc..1a8d476267 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;->qA:Lcom/crashlytics/android/answers/af;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/ae;->qB:Lcom/crashlytics/android/answers/af;
 
     const-string v2, "appBundleId"
 
-    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;->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"
+    const-string v2, "executionId"
 
     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, "installationId"
+
+    iget-object v3, v1, Lcom/crashlytics/android/answers/af;->qU: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;->qU:Ljava/lang/Boolean;
+    iget-object v3, v1, Lcom/crashlytics/android/answers/af;->qV: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;->qV: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, "buildId"
 
-    iget-object v3, v1, Lcom/crashlytics/android/answers/af;->qW: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, "osVersion"
 
-    iget-object v3, v1, Lcom/crashlytics/android/answers/af;->cp:Ljava/lang/String;
+    iget-object v3, v1, Lcom/crashlytics/android/answers/af;->cq: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;->qX: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, "appVersionCode"
 
-    iget-object v3, v1, Lcom/crashlytics/android/answers/af;->qY:Ljava/lang/String;
+    iget-object v3, v1, Lcom/crashlytics/android/answers/af;->qZ: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;->qZ:Ljava/lang/String;
+    iget-object v1, v1, Lcom/crashlytics/android/answers/af;->ra: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;->qB:Lcom/crashlytics/android/answers/ae$b;
+    iget-object v2, p0, Lcom/crashlytics/android/answers/ae;->qC: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;->qC:Ljava/util/Map;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/ae;->qD: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;->qC:Ljava/util/Map;
+    iget-object v3, p0, Lcom/crashlytics/android/answers/ae;->qD: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;->qD:Ljava/lang/String;
+    iget-object v2, p0, Lcom/crashlytics/android/answers/ae;->qE: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;->qE:Ljava/util/Map;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/ae;->qF: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;->qE:Ljava/util/Map;
+    iget-object v3, p0, Lcom/crashlytics/android/answers/ae;->qF: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;->qF:Ljava/lang/String;
+    iget-object v2, p0, Lcom/crashlytics/android/answers/ae;->qG: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;->qG:Ljava/util/Map;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/ae;->qH: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;->qG:Ljava/util/Map;
+    iget-object p0, p0, Lcom/crashlytics/android/answers/ae;->qH: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 810409e72c..cb626554d2 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 ra:Lio/fabric/sdk/android/a/b/s;
-
-.field final rb:Ljava/lang/String;
+.field final rb:Lio/fabric/sdk/android/a/b/s;
 
 .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;->ra:Lio/fabric/sdk/android/a/b/s;
+    iput-object p2, p0, Lcom/crashlytics/android/answers/ah;->rb:Lio/fabric/sdk/android/a/b/s;
 
-    iput-object p3, p0, Lcom/crashlytics/android/answers/ah;->rb:Ljava/lang/String;
+    iput-object p3, p0, Lcom/crashlytics/android/answers/ah;->rc:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/crashlytics/android/answers/ah;->rc:Ljava/lang/String;
+    iput-object p4, p0, Lcom/crashlytics/android/answers/ah;->rd: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 05d7d9ae0e..a0ab72954a 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 pr:Lcom/crashlytics/android/answers/d;
+.field final ps:Lcom/crashlytics/android/answers/d;
 
-.field final ps:Ljava/util/Map;
+.field final pt: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;->ps:Ljava/util/Map;
+    iput-object v0, p0, Lcom/crashlytics/android/answers/b;->pt:Ljava/util/Map;
 
-    iput-object p1, p0, Lcom/crashlytics/android/answers/b;->pr:Lcom/crashlytics/android/answers/d;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/b;->ps: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;->pr:Lcom/crashlytics/android/answers/d;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/b;->ps:Lcom/crashlytics/android/answers/d;
 
-    iget-object v1, p0, Lcom/crashlytics/android/answers/b;->ps:Ljava/util/Map;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/b;->pt: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;->ps:Ljava/util/Map;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/b;->pt: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;->pr:Lcom/crashlytics/android/answers/d;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/b;->ps: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;->pr:Lcom/crashlytics/android/answers/d;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/b;->ps: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;->pr:Lcom/crashlytics/android/answers/d;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/b;->ps: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;->pr:Lcom/crashlytics/android/answers/d;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/b;->ps: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;->ps:Ljava/util/Map;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/b;->pt: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 60aa69f031..6f6034d42f 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 pr:Lcom/crashlytics/android/answers/d;
+.field final ps:Lcom/crashlytics/android/answers/d;
 
-.field final pt:Lcom/crashlytics/android/answers/b;
+.field final pu: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;->BF()Z
+    invoke-static {}, Lio/fabric/sdk/android/c;->BD()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;->pr:Lcom/crashlytics/android/answers/d;
+    iput-object v0, p0, Lcom/crashlytics/android/answers/c;->ps:Lcom/crashlytics/android/answers/d;
 
     new-instance v0, Lcom/crashlytics/android/answers/b;
 
-    iget-object v1, p0, Lcom/crashlytics/android/answers/c;->pr:Lcom/crashlytics/android/answers/d;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/c;->ps: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;->pt:Lcom/crashlytics/android/answers/b;
+    iput-object v0, p0, Lcom/crashlytics/android/answers/c;->pu:Lcom/crashlytics/android/answers/b;
 
     return-void
 .end method
@@ -60,9 +60,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/crashlytics/android/answers/c;->pt:Lcom/crashlytics/android/answers/b;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/c;->pu:Lcom/crashlytics/android/answers/b;
 
-    iget-object v1, v0, Lcom/crashlytics/android/answers/b;->pr:Lcom/crashlytics/android/answers/d;
+    iget-object v1, v0, Lcom/crashlytics/android/answers/b;->ps: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;->pr:Lcom/crashlytics/android/answers/d;
+    iget-object v1, v0, Lcom/crashlytics/android/answers/b;->ps: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;->pr:Lcom/crashlytics/android/answers/d;
+    iget-object v1, v0, Lcom/crashlytics/android/answers/b;->ps: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;->pt:Lcom/crashlytics/android/answers/b;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/c;->pu: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 919d42daae..7f43a593bc 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 pw:Z
+.field final pw:I
+
+.field px:Z
 
 
 # direct methods
@@ -19,13 +19,13 @@
 
     const/16 v0, 0x14
 
-    iput v0, p0, Lcom/crashlytics/android/answers/d;->pu:I
+    iput v0, p0, Lcom/crashlytics/android/answers/d;->pv:I
 
     const/16 v0, 0x64
 
-    iput v0, p0, Lcom/crashlytics/android/answers/d;->pv:I
+    iput v0, p0, Lcom/crashlytics/android/answers/d;->pw:I
 
-    iput-boolean p1, p0, Lcom/crashlytics/android/answers/d;->pw:Z
+    iput-boolean p1, p0, Lcom/crashlytics/android/answers/d;->px: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;->pw:Z
+    iget-boolean v0, p0, Lcom/crashlytics/android/answers/d;->px:Z
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -62,7 +62,7 @@
 
     move-result v0
 
-    iget v1, p0, Lcom/crashlytics/android/answers/d;->pv:I
+    iget v1, p0, Lcom/crashlytics/android/answers/d;->pw: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;->pv:I
+    iget v2, p0, Lcom/crashlytics/android/answers/d;->pw: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;->pv:I
+    iget v0, p0, Lcom/crashlytics/android/answers/d;->pw: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;->pu:I
+    iget v1, p0, Lcom/crashlytics/android/answers/d;->pv:I
 
     const/4 v2, 0x0
 
@@ -175,7 +175,7 @@
 
     new-array v0, p2, [Ljava/lang/Object;
 
-    iget v1, p0, Lcom/crashlytics/android/answers/d;->pu:I
+    iget v1, p0, Lcom/crashlytics/android/answers/d;->pv: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 a0a564c0e9..0923afe255 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 pE:Lio/fabric/sdk/android/a/g/b;
+.field final synthetic pF:Lio/fabric/sdk/android/a/g/b;
 
-.field final synthetic pF:Ljava/lang/String;
+.field final synthetic pG:Ljava/lang/String;
 
-.field final synthetic pG:Lcom/crashlytics/android/answers/e;
+.field final synthetic pH: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;->pG:Lcom/crashlytics/android/answers/e;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/e$1;->pH:Lcom/crashlytics/android/answers/e;
 
-    iput-object p2, p0, Lcom/crashlytics/android/answers/e$1;->pE:Lio/fabric/sdk/android/a/g/b;
+    iput-object p2, p0, Lcom/crashlytics/android/answers/e$1;->pF:Lio/fabric/sdk/android/a/g/b;
 
-    iput-object p3, p0, Lcom/crashlytics/android/answers/e$1;->pF:Ljava/lang/String;
+    iput-object p3, p0, Lcom/crashlytics/android/answers/e$1;->pG: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;->pG:Lcom/crashlytics/android/answers/e;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/e$1;->pH:Lcom/crashlytics/android/answers/e;
 
-    iget-object v0, v0, Lcom/crashlytics/android/answers/e;->pD:Lcom/crashlytics/android/answers/ad;
+    iget-object v0, v0, Lcom/crashlytics/android/answers/e;->pE:Lcom/crashlytics/android/answers/ad;
 
-    iget-object v1, p0, Lcom/crashlytics/android/answers/e$1;->pE:Lio/fabric/sdk/android/a/g/b;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/e$1;->pF:Lio/fabric/sdk/android/a/g/b;
 
-    iget-object v2, p0, Lcom/crashlytics/android/answers/e$1;->pF:Ljava/lang/String;
+    iget-object v2, p0, Lcom/crashlytics/android/answers/e$1;->pG: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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 cb7932dc31..e086c23261 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 pG:Lcom/crashlytics/android/answers/e;
+.field final synthetic pH: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;->pG:Lcom/crashlytics/android/answers/e;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/e$2;->pH: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;->pG:Lcom/crashlytics/android/answers/e;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/e$2;->pH:Lcom/crashlytics/android/answers/e;
 
-    iget-object v0, v0, Lcom/crashlytics/android/answers/e;->pD:Lcom/crashlytics/android/answers/ad;
+    iget-object v0, v0, Lcom/crashlytics/android/answers/e;->pE:Lcom/crashlytics/android/answers/ad;
 
-    iget-object v1, p0, Lcom/crashlytics/android/answers/e$2;->pG:Lcom/crashlytics/android/answers/e;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/e$2;->pH: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;->pD:Lcom/crashlytics/android/answers/ad;
+    iput-object v2, v1, Lcom/crashlytics/android/answers/e;->pE: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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 c18886dc25..c1bdfe80c1 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 pG:Lcom/crashlytics/android/answers/e;
+.field final synthetic pH: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;->pG:Lcom/crashlytics/android/answers/e;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/e$3;->pH: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;->pG:Lcom/crashlytics/android/answers/e;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/e$3;->pH:Lcom/crashlytics/android/answers/e;
 
-    iget-object v0, v0, Lcom/crashlytics/android/answers/e;->pD:Lcom/crashlytics/android/answers/ad;
+    iget-object v0, v0, Lcom/crashlytics/android/answers/e;->pE: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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 23a1370611..e03d6f0aea 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 pG:Lcom/crashlytics/android/answers/e;
+.field final synthetic pH: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;->pG:Lcom/crashlytics/android/answers/e;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/e$4;->pH: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;->pG:Lcom/crashlytics/android/answers/e;
+    iget-object v0, v1, Lcom/crashlytics/android/answers/e$4;->pH:Lcom/crashlytics/android/answers/e;
 
-    iget-object v0, v0, Lcom/crashlytics/android/answers/e;->pz:Lcom/crashlytics/android/answers/ah;
+    iget-object v0, v0, Lcom/crashlytics/android/answers/e;->pA:Lcom/crashlytics/android/answers/ah;
 
-    iget-object v2, v0, Lcom/crashlytics/android/answers/ah;->ra:Lio/fabric/sdk/android/a/b/s;
+    iget-object v2, v0, Lcom/crashlytics/android/answers/ah;->rb: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;->ra:Lio/fabric/sdk/android/a/b/s;
+    iget-object v3, v0, Lcom/crashlytics/android/answers/ah;->rb:Lio/fabric/sdk/android/a/b/s;
 
-    iget-object v5, v3, Lio/fabric/sdk/android/a/b/s;->bbv:Ljava/lang/String;
+    iget-object v5, v3, Lio/fabric/sdk/android/a/b/s;->bbr:Ljava/lang/String;
 
-    iget-object v3, v0, Lcom/crashlytics/android/answers/ah;->ra:Lio/fabric/sdk/android/a/b/s;
+    iget-object v3, v0, Lcom/crashlytics/android/answers/ah;->rb:Lio/fabric/sdk/android/a/b/s;
 
-    invoke-virtual {v3}, Lio/fabric/sdk/android/a/b/s;->Cb()Ljava/lang/String;
+    invoke-virtual {v3}, Lio/fabric/sdk/android/a/b/s;->BZ()Ljava/lang/String;
 
     move-result-object v7
 
-    iget-object v3, v0, Lcom/crashlytics/android/answers/ah;->ra:Lio/fabric/sdk/android/a/b/s;
+    iget-object v3, v0, Lcom/crashlytics/android/answers/ah;->rb:Lio/fabric/sdk/android/a/b/s;
 
-    iget-boolean v4, v3, Lio/fabric/sdk/android/a/b/s;->bcK:Z
+    iget-boolean v4, v3, Lio/fabric/sdk/android/a/b/s;->bcG:Z
 
     if-eqz v4, :cond_0
 
-    iget-object v4, v3, Lio/fabric/sdk/android/a/b/s;->le:Landroid/content/Context;
+    iget-object v4, v3, Lio/fabric/sdk/android/a/b/s;->lf: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;->BU()Lio/fabric/sdk/android/a/b/b;
+    invoke-virtual {v3}, Lio/fabric/sdk/android/a/b/s;->BS()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;->bbP:Z
+    iget-boolean v3, v3, Lio/fabric/sdk/android/a/b/b;->bbL: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;->bcS:Lio/fabric/sdk/android/a/b/s$a;
+    sget-object v3, Lio/fabric/sdk/android/a/b/s$a;->bcO: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;->Cc()Ljava/lang/String;
+    invoke-static {}, Lio/fabric/sdk/android/a/b/s;->Ca()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;->rb:Ljava/lang/String;
+    iget-object v13, v0, Lcom/crashlytics/android/answers/ah;->rc:Ljava/lang/String;
 
-    iget-object v14, v0, Lcom/crashlytics/android/answers/ah;->rc:Ljava/lang/String;
+    iget-object v14, v0, Lcom/crashlytics/android/answers/ah;->rd: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;->pG:Lcom/crashlytics/android/answers/e;
+    iget-object v0, v1, Lcom/crashlytics/android/answers/e$4;->pH:Lcom/crashlytics/android/answers/e;
 
-    iget-object v0, v0, Lcom/crashlytics/android/answers/e;->py:Lcom/crashlytics/android/answers/f;
+    iget-object v0, v0, Lcom/crashlytics/android/answers/e;->pz: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;->pJ:Lio/fabric/sdk/android/a/f/a;
+    iget-object v4, v0, Lcom/crashlytics/android/answers/f;->pK: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;->pG:Lcom/crashlytics/android/answers/e;
+    iget-object v0, v1, Lcom/crashlytics/android/answers/e$4;->pH: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;->pG:Lcom/crashlytics/android/answers/e;
+    iget-object v0, v1, Lcom/crashlytics/android/answers/e$4;->pH:Lcom/crashlytics/android/answers/e;
 
     new-instance v2, Lcom/crashlytics/android/answers/n;
 
-    iget-object v3, v1, Lcom/crashlytics/android/answers/e$4;->pG:Lcom/crashlytics/android/answers/e;
+    iget-object v3, v1, Lcom/crashlytics/android/answers/e$4;->pH:Lcom/crashlytics/android/answers/e;
 
-    iget-object v14, v3, Lcom/crashlytics/android/answers/e;->px:Lio/fabric/sdk/android/i;
+    iget-object v14, v3, Lcom/crashlytics/android/answers/e;->py:Lio/fabric/sdk/android/i;
 
-    iget-object v3, v1, Lcom/crashlytics/android/answers/e$4;->pG:Lcom/crashlytics/android/answers/e;
+    iget-object v3, v1, Lcom/crashlytics/android/answers/e$4;->pH: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;->pG:Lcom/crashlytics/android/answers/e;
+    iget-object v3, v1, Lcom/crashlytics/android/answers/e$4;->pH:Lcom/crashlytics/android/answers/e;
 
-    iget-object v3, v3, Lcom/crashlytics/android/answers/e;->pC:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object v3, v3, Lcom/crashlytics/android/answers/e;->pD:Ljava/util/concurrent/ScheduledExecutorService;
 
-    iget-object v5, v1, Lcom/crashlytics/android/answers/e$4;->pG:Lcom/crashlytics/android/answers/e;
+    iget-object v5, v1, Lcom/crashlytics/android/answers/e$4;->pH:Lcom/crashlytics/android/answers/e;
 
-    iget-object v5, v5, Lcom/crashlytics/android/answers/e;->pA:Lio/fabric/sdk/android/a/e/e;
+    iget-object v5, v5, Lcom/crashlytics/android/answers/e;->pB:Lio/fabric/sdk/android/a/e/e;
 
-    iget-object v6, v1, Lcom/crashlytics/android/answers/e$4;->pG:Lcom/crashlytics/android/answers/e;
+    iget-object v6, v1, Lcom/crashlytics/android/answers/e$4;->pH:Lcom/crashlytics/android/answers/e;
 
-    iget-object v6, v6, Lcom/crashlytics/android/answers/e;->pB:Lcom/crashlytics/android/answers/q;
+    iget-object v6, v6, Lcom/crashlytics/android/answers/e;->pC: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;->pD:Lcom/crashlytics/android/answers/ad;
+    iput-object v2, v0, Lcom/crashlytics/android/answers/e;->pE:Lcom/crashlytics/android/answers/ad;
 
     return-void
 
@@ -269,7 +269,7 @@
     :catch_0
     move-exception v0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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 e50609bf51..940089f58a 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 pG:Lcom/crashlytics/android/answers/e;
+.field final synthetic pH: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;->pG:Lcom/crashlytics/android/answers/e;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/e$5;->pH: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;->pG:Lcom/crashlytics/android/answers/e;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/e$5;->pH:Lcom/crashlytics/android/answers/e;
 
-    iget-object v0, v0, Lcom/crashlytics/android/answers/e;->pD:Lcom/crashlytics/android/answers/ad;
+    iget-object v0, v0, Lcom/crashlytics/android/answers/e;->pE: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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 ef49173417..32f0ea5fc7 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 pG:Lcom/crashlytics/android/answers/e;
+.field final synthetic pH:Lcom/crashlytics/android/answers/e;
 
-.field final synthetic pH:Lcom/crashlytics/android/answers/ae$a;
+.field final synthetic pI:Lcom/crashlytics/android/answers/ae$a;
 
-.field final synthetic pI:Z
+.field final synthetic pJ: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;->pG:Lcom/crashlytics/android/answers/e;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/e$6;->pH:Lcom/crashlytics/android/answers/e;
 
-    iput-object p2, p0, Lcom/crashlytics/android/answers/e$6;->pH:Lcom/crashlytics/android/answers/ae$a;
+    iput-object p2, p0, Lcom/crashlytics/android/answers/e$6;->pI:Lcom/crashlytics/android/answers/ae$a;
 
-    iput-boolean p3, p0, Lcom/crashlytics/android/answers/e$6;->pI:Z
+    iput-boolean p3, p0, Lcom/crashlytics/android/answers/e$6;->pJ: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;->pG:Lcom/crashlytics/android/answers/e;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/e$6;->pH:Lcom/crashlytics/android/answers/e;
 
-    iget-object v0, v0, Lcom/crashlytics/android/answers/e;->pD:Lcom/crashlytics/android/answers/ad;
+    iget-object v0, v0, Lcom/crashlytics/android/answers/e;->pE:Lcom/crashlytics/android/answers/ad;
 
-    iget-object v1, p0, Lcom/crashlytics/android/answers/e$6;->pH:Lcom/crashlytics/android/answers/ae$a;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/e$6;->pI: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;->pI:Z
+    iget-boolean v0, p0, Lcom/crashlytics/android/answers/e$6;->pJ:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/crashlytics/android/answers/e$6;->pG:Lcom/crashlytics/android/answers/e;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/e$6;->pH:Lcom/crashlytics/android/answers/e;
 
-    iget-object v0, v0, Lcom/crashlytics/android/answers/e;->pD:Lcom/crashlytics/android/answers/ad;
+    iget-object v0, v0, Lcom/crashlytics/android/answers/e;->pE: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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 f680633d3d..96c579fb3a 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:Lio/fabric/sdk/android/a/e/e;
+.field final pA:Lcom/crashlytics/android/answers/ah;
 
-.field final pB:Lcom/crashlytics/android/answers/q;
+.field final pB:Lio/fabric/sdk/android/a/e/e;
 
-.field final pC:Ljava/util/concurrent/ScheduledExecutorService;
+.field final pC:Lcom/crashlytics/android/answers/q;
 
-.field pD:Lcom/crashlytics/android/answers/ad;
+.field final pD:Ljava/util/concurrent/ScheduledExecutorService;
 
-.field final px:Lio/fabric/sdk/android/i;
+.field pE:Lcom/crashlytics/android/answers/ad;
 
-.field final py:Lcom/crashlytics/android/answers/f;
+.field final py:Lio/fabric/sdk/android/i;
 
-.field final pz:Lcom/crashlytics/android/answers/ah;
+.field final pz:Lcom/crashlytics/android/answers/f;
 
 
 # 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;->pD:Lcom/crashlytics/android/answers/ad;
+    iput-object v0, p0, Lcom/crashlytics/android/answers/e;->pE:Lcom/crashlytics/android/answers/ad;
 
-    iput-object p1, p0, Lcom/crashlytics/android/answers/e;->px:Lio/fabric/sdk/android/i;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/e;->py: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;->py:Lcom/crashlytics/android/answers/f;
+    iput-object p3, p0, Lcom/crashlytics/android/answers/e;->pz:Lcom/crashlytics/android/answers/f;
 
-    iput-object p4, p0, Lcom/crashlytics/android/answers/e;->pz:Lcom/crashlytics/android/answers/ah;
+    iput-object p4, p0, Lcom/crashlytics/android/answers/e;->pA:Lcom/crashlytics/android/answers/ah;
 
-    iput-object p5, p0, Lcom/crashlytics/android/answers/e;->pA:Lio/fabric/sdk/android/a/e/e;
+    iput-object p5, p0, Lcom/crashlytics/android/answers/e;->pB:Lio/fabric/sdk/android/a/e/e;
 
-    iput-object p6, p0, Lcom/crashlytics/android/answers/e;->pC:Ljava/util/concurrent/ScheduledExecutorService;
+    iput-object p6, p0, Lcom/crashlytics/android/answers/e;->pD:Ljava/util/concurrent/ScheduledExecutorService;
 
-    iput-object p7, p0, Lcom/crashlytics/android/answers/e;->pB:Lcom/crashlytics/android/answers/q;
+    iput-object p7, p0, Lcom/crashlytics/android/answers/e;->pC: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;->pC:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/e;->pD: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->pC:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/e;->pD: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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 a78416ffc5..029cad645a 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 pJ:Lio/fabric/sdk/android/a/f/a;
+.field final pK: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;->pJ:Lio/fabric/sdk/android/a/f/a;
+    iput-object p2, p0, Lcom/crashlytics/android/answers/f;->pK: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 e43be0c51f..39ed2e8510 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 pK:Lcom/crashlytics/android/answers/k;
+.field private final pL:Lcom/crashlytics/android/answers/k;
 
-.field private final pq:Lcom/crashlytics/android/answers/ac;
+.field private final pr: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;->pq:Lcom/crashlytics/android/answers/ac;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/g;->pr:Lcom/crashlytics/android/answers/ac;
 
-    iput-object p2, p0, Lcom/crashlytics/android/answers/g;->pK:Lcom/crashlytics/android/answers/k;
+    iput-object p2, p0, Lcom/crashlytics/android/answers/g;->pL: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;->pq:Lcom/crashlytics/android/answers/ac;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/g;->pr: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;->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
 
-    iget-object p1, p0, Lcom/crashlytics/android/answers/g;->pK:Lcom/crashlytics/android/answers/k;
+    iget-object p1, p0, Lcom/crashlytics/android/answers/g;->pL:Lcom/crashlytics/android/answers/k;
 
-    iget-boolean v0, p1, Lcom/crashlytics/android/answers/k;->pR:Z
+    iget-boolean v0, p1, Lcom/crashlytics/android/answers/k;->pS:Z
 
     if-eqz v0, :cond_0
 
-    iget-boolean v0, p1, Lcom/crashlytics/android/answers/k;->pT:Z
+    iget-boolean v0, p1, Lcom/crashlytics/android/answers/k;->pU:Z
 
     if-nez v0, :cond_0
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p1, Lcom/crashlytics/android/answers/k;->pT:Z
+    iput-boolean v0, p1, Lcom/crashlytics/android/answers/k;->pU:Z
 
     :try_start_0
-    iget-object v0, p1, Lcom/crashlytics/android/answers/k;->pS:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p1, Lcom/crashlytics/android/answers/k;->pT:Ljava/util/concurrent/atomic/AtomicReference;
 
     const/4 v1, 0x0
 
-    iget-object v2, p1, Lcom/crashlytics/android/answers/k;->pQ:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object v2, p1, Lcom/crashlytics/android/answers/k;->pR: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->pq:Lcom/crashlytics/android/answers/ac;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/g;->pr: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;->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;->pK:Lcom/crashlytics/android/answers/k;
+    iget-object p1, p0, Lcom/crashlytics/android/answers/g;->pL:Lcom/crashlytics/android/answers/k;
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p1, Lcom/crashlytics/android/answers/k;->pT:Z
+    iput-boolean v0, p1, Lcom/crashlytics/android/answers/k;->pU:Z
 
-    iget-object p1, p1, Lcom/crashlytics/android/answers/k;->pS:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object p1, p1, Lcom/crashlytics/android/answers/k;->pT: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;->pq:Lcom/crashlytics/android/answers/ac;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/g;->pr:Lcom/crashlytics/android/answers/ac;
 
-    sget-object v1, Lcom/crashlytics/android/answers/ae$b;->qI:Lcom/crashlytics/android/answers/ae$b;
+    sget-object v1, Lcom/crashlytics/android/answers/ae$b;->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
 
@@ -143,9 +143,9 @@
 .method public final onActivityStopped(Landroid/app/Activity;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/crashlytics/android/answers/g;->pq:Lcom/crashlytics/android/answers/ac;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/g;->pr: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;->qM: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 9eb35b2e05..54817cd1fd 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 pL:Lio/fabric/sdk/android/a/f/c;
+.field final pM: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;->pL:Lio/fabric/sdk/android/a/f/c;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/h;->pM: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 5fc3508d2d..7761d80de8 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 pM:Lcom/crashlytics/android/answers/ab;
+.field private final pN:Lcom/crashlytics/android/answers/ab;
 
-.field private final pN:Lcom/crashlytics/android/answers/y;
+.field private final pO: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;->pM:Lcom/crashlytics/android/answers/ab;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/i;->pN:Lcom/crashlytics/android/answers/ab;
 
-    iput-object p2, p0, Lcom/crashlytics/android/answers/i;->pN:Lcom/crashlytics/android/answers/y;
+    iput-object p2, p0, Lcom/crashlytics/android/answers/i;->pO: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;->pN:Lcom/crashlytics/android/answers/y;
+    iget-object v2, p0, Lcom/crashlytics/android/answers/i;->pO:Lcom/crashlytics/android/answers/y;
 
-    iget-object v3, v2, Lcom/crashlytics/android/answers/y;->qr:Lio/fabric/sdk/android/a/c/a/e;
+    iget-object v3, v2, Lcom/crashlytics/android/answers/y;->qs:Lio/fabric/sdk/android/a/c/a/e;
 
-    iget-object v4, v3, Lio/fabric/sdk/android/a/c/a/e;->qn:Lio/fabric/sdk/android/a/c/a/a;
+    iget-object v4, v3, Lio/fabric/sdk/android/a/c/a/e;->qo: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;->qq:J
+    iget-wide v5, v2, Lcom/crashlytics/android/answers/y;->qr: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;->pM:Lcom/crashlytics/android/answers/ab;
+    iget-object v3, p0, Lcom/crashlytics/android/answers/i;->pN: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;->pN:Lcom/crashlytics/android/answers/y;
+    iget-object p1, p0, Lcom/crashlytics/android/answers/i;->pO:Lcom/crashlytics/android/answers/y;
 
     const-wide/16 v0, 0x0
 
-    iput-wide v0, p1, Lcom/crashlytics/android/answers/y;->qq:J
+    iput-wide v0, p1, Lcom/crashlytics/android/answers/y;->qr:J
 
-    iget-object v0, p1, Lcom/crashlytics/android/answers/y;->qr:Lio/fabric/sdk/android/a/c/a/e;
+    iget-object v0, p1, Lcom/crashlytics/android/answers/y;->qs: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;->qn:Lio/fabric/sdk/android/a/c/a/a;
+    iget-object v3, v0, Lio/fabric/sdk/android/a/c/a/e;->qo:Lio/fabric/sdk/android/a/c/a/a;
 
-    iget-object v0, v0, Lio/fabric/sdk/android/a/c/a/e;->bdZ:Lio/fabric/sdk/android/a/c/a/d;
+    iget-object v0, v0, Lio/fabric/sdk/android/a/c/a/e;->bdU: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;->qr:Lio/fabric/sdk/android/a/c/a/e;
+    iput-object v1, p1, Lcom/crashlytics/android/answers/y;->qs:Lio/fabric/sdk/android/a/c/a/e;
 
     return v2
 
     :cond_1
-    iget-object p1, p0, Lcom/crashlytics/android/answers/i;->pN:Lcom/crashlytics/android/answers/y;
+    iget-object p1, p0, Lcom/crashlytics/android/answers/i;->pO:Lcom/crashlytics/android/answers/y;
 
-    iput-wide v0, p1, Lcom/crashlytics/android/answers/y;->qq:J
+    iput-wide v0, p1, Lcom/crashlytics/android/answers/y;->qr:J
 
-    iget-object v0, p1, Lcom/crashlytics/android/answers/y;->qr:Lio/fabric/sdk/android/a/c/a/e;
+    iget-object v0, p1, Lcom/crashlytics/android/answers/y;->qs: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;->qn:Lio/fabric/sdk/android/a/c/a/a;
+    iget-object v2, v0, Lio/fabric/sdk/android/a/c/a/e;->qo:Lio/fabric/sdk/android/a/c/a/a;
 
-    iget-object v0, v0, Lio/fabric/sdk/android/a/c/a/e;->bdZ:Lio/fabric/sdk/android/a/c/a/d;
+    iget-object v0, v0, Lio/fabric/sdk/android/a/c/a/e;->bdU: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;->qr:Lio/fabric/sdk/android/a/c/a/e;
+    iput-object v1, p1, Lcom/crashlytics/android/answers/y;->qs: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 ca05489e79..d7ba7db99a 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 pO:Ljava/lang/reflect/Method;
+.field private final pP:Ljava/lang/reflect/Method;
 
-.field private final pP:Ljava/lang/Object;
+.field private final pQ: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;->pP:Ljava/lang/Object;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/j;->pQ:Ljava/lang/Object;
 
-    iput-object p2, p0, Lcom/crashlytics/android/answers/j;->pO:Ljava/lang/reflect/Method;
+    iput-object p2, p0, Lcom/crashlytics/android/answers/j;->pP: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;->pO:Ljava/lang/reflect/Method;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/j;->pP:Ljava/lang/reflect/Method;
 
-    iget-object v1, p0, Lcom/crashlytics/android/answers/j;->pP:Ljava/lang/Object;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/j;->pQ: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 775967508a..70f0d6f9fd 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 pU:Lcom/crashlytics/android/answers/k;
+.field final synthetic pV: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;->pU:Lcom/crashlytics/android/answers/k;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/k$1;->pV: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;->pU:Lcom/crashlytics/android/answers/k;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/k$1;->pV:Lcom/crashlytics/android/answers/k;
 
-    iget-object v0, v0, Lcom/crashlytics/android/answers/k;->pS:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, v0, Lcom/crashlytics/android/answers/k;->pT: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;->pU:Lcom/crashlytics/android/answers/k;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/k$1;->pV: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 849eb27740..ca9df9c14b 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 pQ:Ljava/util/concurrent/ScheduledExecutorService;
+.field final pR:Ljava/util/concurrent/ScheduledExecutorService;
 
-.field volatile pR:Z
+.field volatile pS:Z
 
-.field final pS:Ljava/util/concurrent/atomic/AtomicReference;
+.field final pT: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 pT:Z
+.field pU:Z
 
 
 # direct methods
@@ -53,17 +53,17 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/crashlytics/android/answers/k;->pR:Z
+    iput-boolean v0, p0, Lcom/crashlytics/android/answers/k;->pS: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;->pS:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object v1, p0, Lcom/crashlytics/android/answers/k;->pT:Ljava/util/concurrent/atomic/AtomicReference;
 
-    iput-boolean v0, p0, Lcom/crashlytics/android/answers/k;->pT:Z
+    iput-boolean v0, p0, Lcom/crashlytics/android/answers/k;->pU:Z
 
-    iput-object p1, p0, Lcom/crashlytics/android/answers/k;->pQ:Ljava/util/concurrent/ScheduledExecutorService;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/k;->pR: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 3da3752713..3321ed494d 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 pV:Ljava/lang/String;
+.field final pW: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;->pr:Lcom/crashlytics/android/answers/d;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/l;->ps: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;->pV:Ljava/lang/String;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/l;->pW: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;->pV:Ljava/lang/String;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/l;->pW: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;->pt:Lcom/crashlytics/android/answers/b;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/l;->pu: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 2467afd1c1..aaf1c2a15d 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 pB:Lcom/crashlytics/android/answers/q;
+.field private final pC:Lcom/crashlytics/android/answers/q;
 
-.field private final pQ:Ljava/util/concurrent/ScheduledExecutorService;
+.field private final pR:Ljava/util/concurrent/ScheduledExecutorService;
 
-.field private final pW:Lio/fabric/sdk/android/a/e/e;
+.field private final pX:Lio/fabric/sdk/android/a/e/e;
 
-.field private final pX:Lcom/crashlytics/android/answers/aa;
+.field private final pY:Lcom/crashlytics/android/answers/aa;
 
-.field private final pY:Ljava/util/concurrent/atomic/AtomicReference;
+.field private final pZ: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 final pZ:Lcom/crashlytics/android/answers/af;
+.field private final py:Lio/fabric/sdk/android/i;
 
-.field private final px:Lio/fabric/sdk/android/i;
+.field final qa:Lcom/crashlytics/android/answers/af;
 
-.field qa:Lio/fabric/sdk/android/a/d/f;
+.field qb:Lio/fabric/sdk/android/a/d/f;
 
-.field qb:Lio/fabric/sdk/android/a/b/g;
+.field qc:Lio/fabric/sdk/android/a/b/g;
 
-.field qc:Lcom/crashlytics/android/answers/o;
-
-.field qd:Z
+.field qd:Lcom/crashlytics/android/answers/o;
 
 .field qe:Z
 
-.field volatile qf:I
+.field qf:Z
 
-.field qg:Z
+.field volatile qg:I
 
 .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;->pY:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object v0, p0, Lcom/crashlytics/android/answers/n;->pZ: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;->qb:Lio/fabric/sdk/android/a/b/g;
+    iput-object v0, p0, Lcom/crashlytics/android/answers/n;->qc: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;->qc:Lcom/crashlytics/android/answers/o;
+    iput-object v0, p0, Lcom/crashlytics/android/answers/n;->qd:Lcom/crashlytics/android/answers/o;
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/crashlytics/android/answers/n;->qd:Z
-
     iput-boolean v0, p0, Lcom/crashlytics/android/answers/n;->qe:Z
 
+    iput-boolean v0, p0, Lcom/crashlytics/android/answers/n;->qf:Z
+
     const/4 v0, -0x1
 
-    iput v0, p0, Lcom/crashlytics/android/answers/n;->qf:I
+    iput v0, p0, Lcom/crashlytics/android/answers/n;->qg: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-object p1, p0, Lcom/crashlytics/android/answers/n;->px:Lio/fabric/sdk/android/i;
+    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 p2, p0, Lcom/crashlytics/android/answers/n;->context:Landroid/content/Context;
 
-    iput-object p3, p0, Lcom/crashlytics/android/answers/n;->pQ:Ljava/util/concurrent/ScheduledExecutorService;
+    iput-object p3, p0, Lcom/crashlytics/android/answers/n;->pR:Ljava/util/concurrent/ScheduledExecutorService;
 
-    iput-object p4, p0, Lcom/crashlytics/android/answers/n;->pX:Lcom/crashlytics/android/answers/aa;
+    iput-object p4, p0, Lcom/crashlytics/android/answers/n;->pY:Lcom/crashlytics/android/answers/aa;
 
-    iput-object p5, p0, Lcom/crashlytics/android/answers/n;->pW:Lio/fabric/sdk/android/a/e/e;
+    iput-object p5, p0, Lcom/crashlytics/android/answers/n;->pX:Lio/fabric/sdk/android/a/e/e;
 
-    iput-object p6, p0, Lcom/crashlytics/android/answers/n;->pZ:Lcom/crashlytics/android/answers/af;
+    iput-object p6, p0, Lcom/crashlytics/android/answers/n;->qa:Lcom/crashlytics/android/answers/af;
 
-    iput-object p7, p0, Lcom/crashlytics/android/answers/n;->pB:Lcom/crashlytics/android/answers/q;
+    iput-object p7, p0, Lcom/crashlytics/android/answers/n;->pC: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;->pY:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/n;->pZ: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;->pY:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/n;->pZ:Ljava/util/concurrent/atomic/AtomicReference;
 
-    iget-object v1, p0, Lcom/crashlytics/android/answers/n;->pQ:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/n;->pR: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;->pZ:Lcom/crashlytics/android/answers/af;
+    iget-object v3, v1, Lcom/crashlytics/android/answers/n;->qa: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;->qB:Lcom/crashlytics/android/answers/ae$b;
+    iget-object v6, v0, Lcom/crashlytics/android/answers/ae$a;->qC:Lcom/crashlytics/android/answers/ae$b;
 
-    iget-object v7, v0, Lcom/crashlytics/android/answers/ae$a;->qC:Ljava/util/Map;
+    iget-object v7, v0, Lcom/crashlytics/android/answers/ae$a;->qD:Ljava/util/Map;
 
-    iget-object v8, v0, Lcom/crashlytics/android/answers/ae$a;->qD:Ljava/lang/String;
+    iget-object v8, v0, Lcom/crashlytics/android/answers/ae$a;->qE:Ljava/lang/String;
 
-    iget-object v9, v0, Lcom/crashlytics/android/answers/ae$a;->qE:Ljava/util/Map;
+    iget-object v9, v0, Lcom/crashlytics/android/answers/ae$a;->qF:Ljava/util/Map;
 
-    iget-object v10, v0, Lcom/crashlytics/android/answers/ae$a;->qF:Ljava/lang/String;
+    iget-object v10, v0, Lcom/crashlytics/android/answers/ae$a;->qG:Ljava/lang/String;
 
-    iget-object v11, v0, Lcom/crashlytics/android/answers/ae$a;->qG:Ljava/util/Map;
+    iget-object v11, v0, Lcom/crashlytics/android/answers/ae$a;->qH: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;->qd:Z
+    iget-boolean v0, v1, Lcom/crashlytics/android/answers/n;->qe:Z
 
     const-string v2, "Answers"
 
     if-nez v0, :cond_0
 
-    sget-object v0, Lcom/crashlytics/android/answers/ae$b;->qO: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;->qB:Lcom/crashlytics/android/answers/ae$b;
+    iget-object v3, v13, Lcom/crashlytics/android/answers/ae;->qC: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->qe:Z
+    iget-boolean v0, v1, Lcom/crashlytics/android/answers/n;->qf:Z
 
     if-nez v0, :cond_1
 
-    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;->qQ:Lcom/crashlytics/android/answers/ae$b;
 
-    iget-object v3, v13, Lcom/crashlytics/android/answers/ae;->qB:Lcom/crashlytics/android/answers/ae$b;
+    iget-object v3, v13, Lcom/crashlytics/android/answers/ae;->qC: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->qc:Lcom/crashlytics/android/answers/o;
+    iget-object v0, v1, Lcom/crashlytics/android/answers/n;->qd: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->pX:Lcom/crashlytics/android/answers/aa;
+    iget-object v0, v1, Lcom/crashlytics/android/answers/n;->pY: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->qf:I
+    iget v0, v1, Lcom/crashlytics/android/answers/n;->qg:I
 
     const/4 v3, -0x1
 
@@ -357,20 +357,20 @@
     :goto_1
     if-eqz v0, :cond_4
 
-    iget v0, v1, Lcom/crashlytics/android/answers/n;->qf:I
+    iget v0, v1, Lcom/crashlytics/android/answers/n;->qg:I
 
     int-to-long v6, v0
 
-    iget v0, v1, Lcom/crashlytics/android/answers/n;->qf:I
+    iget v0, v1, Lcom/crashlytics/android/answers/n;->qg: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;->qO: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;->qB:Lcom/crashlytics/android/answers/ae$b;
+    iget-object v6, v13, Lcom/crashlytics/android/answers/ae;->qC: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;->qP:Lcom/crashlytics/android/answers/ae$b;
+    sget-object v0, Lcom/crashlytics/android/answers/ae$b;->qQ:Lcom/crashlytics/android/answers/ae$b;
 
-    iget-object v6, v13, Lcom/crashlytics/android/answers/ae;->qB:Lcom/crashlytics/android/answers/ae$b;
+    iget-object v6, v13, Lcom/crashlytics/android/answers/ae;->qC: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;->qF:Ljava/lang/String;
+    iget-object v6, v13, Lcom/crashlytics/android/answers/ae;->qG:Ljava/lang/String;
 
     const-string v7, "purchase"
 
@@ -408,7 +408,7 @@
 
     move-result v6
 
-    iget-boolean v8, v1, Lcom/crashlytics/android/answers/n;->qg:Z
+    iget-boolean v8, v1, Lcom/crashlytics/android/answers/n;->qh: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;->qh:Z
+    iget-boolean v0, v1, Lcom/crashlytics/android/answers/n;->qi:Z
 
     if-nez v0, :cond_8
 
@@ -427,9 +427,9 @@
 
     :cond_8
     :try_start_1
-    iget-object v0, v1, Lcom/crashlytics/android/answers/n;->pB:Lcom/crashlytics/android/answers/q;
+    iget-object v0, v1, Lcom/crashlytics/android/answers/n;->pC:Lcom/crashlytics/android/answers/q;
 
-    iget-object v6, v0, Lcom/crashlytics/android/answers/q;->qj:Lcom/crashlytics/android/answers/p;
+    iget-object v6, v0, Lcom/crashlytics/android/answers/q;->qk: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;->qj:Lcom/crashlytics/android/answers/p;
+    iput-object v6, v0, Lcom/crashlytics/android/answers/q;->qk:Lcom/crashlytics/android/answers/p;
 
     :cond_9
-    iget-object v0, v0, Lcom/crashlytics/android/answers/q;->qj:Lcom/crashlytics/android/answers/p;
+    iget-object v0, v0, Lcom/crashlytics/android/answers/q;->qk:Lcom/crashlytics/android/answers/p;
 
     if-nez v0, :cond_a
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->qO:Lcom/crashlytics/android/answers/ae$b;
+    sget-object v6, Lcom/crashlytics/android/answers/ae$b;->qP:Lcom/crashlytics/android/answers/ae$b;
 
-    iget-object v8, v13, Lcom/crashlytics/android/answers/ae;->qB:Lcom/crashlytics/android/answers/ae$b;
+    iget-object v8, v13, Lcom/crashlytics/android/answers/ae;->qC: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;->qD:Ljava/lang/String;
+    iget-object v6, v13, Lcom/crashlytics/android/answers/ae;->qE: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;->qP:Lcom/crashlytics/android/answers/ae$b;
+    sget-object v8, Lcom/crashlytics/android/answers/ae$b;->qQ:Lcom/crashlytics/android/answers/ae$b;
 
-    iget-object v9, v13, Lcom/crashlytics/android/answers/ae;->qB:Lcom/crashlytics/android/answers/ae$b;
+    iget-object v9, v13, Lcom/crashlytics/android/answers/ae;->qC: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;->qF:Ljava/lang/String;
+    iget-object v8, v13, Lcom/crashlytics/android/answers/ae;->qG: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;->qF:Ljava/lang/String;
+    iget-object v3, v13, Lcom/crashlytics/android/answers/ae;->qG: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;->qG:Ljava/util/Map;
+    iget-object v3, v13, Lcom/crashlytics/android/answers/ae;->qH: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;->qG:Ljava/util/Map;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->qH: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;->qG:Ljava/util/Map;
+    iget-object v3, v13, Lcom/crashlytics/android/answers/ae;->qH:Ljava/util/Map;
 
     const-string v4, "itemType"
 
@@ -592,7 +592,7 @@
 
     const-string v0, "value"
 
-    iget-object v3, v13, Lcom/crashlytics/android/answers/ae;->qG:Ljava/util/Map;
+    iget-object v3, v13, Lcom/crashlytics/android/answers/ae;->qH: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;->qG:Ljava/util/Map;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->qH: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;->qF:Ljava/lang/String;
+    iget-object v3, v13, Lcom/crashlytics/android/answers/ae;->qG: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;->qG:Ljava/util/Map;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->qH: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;->qG:Ljava/util/Map;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->qH: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;->qG:Ljava/util/Map;
+    iget-object v3, v13, Lcom/crashlytics/android/answers/ae;->qH:Ljava/util/Map;
 
     const-string v4, "itemType"
 
@@ -671,7 +671,7 @@
 
     const-string v0, "price"
 
-    iget-object v3, v13, Lcom/crashlytics/android/answers/ae;->qG:Ljava/util/Map;
+    iget-object v3, v13, Lcom/crashlytics/android/answers/ae;->qH:Ljava/util/Map;
 
     const-string v4, "itemPrice"
 
@@ -687,7 +687,7 @@
 
     const-string v0, "value"
 
-    iget-object v3, v13, Lcom/crashlytics/android/answers/ae;->qG:Ljava/util/Map;
+    iget-object v3, v13, Lcom/crashlytics/android/answers/ae;->qH: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;->qG:Ljava/util/Map;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->qH: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;->qF:Ljava/lang/String;
+    iget-object v3, v13, Lcom/crashlytics/android/answers/ae;->qG: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;->qG:Ljava/util/Map;
+    iget-object v3, v13, Lcom/crashlytics/android/answers/ae;->qH:Ljava/util/Map;
 
     const-string v4, "itemCount"
 
@@ -756,7 +756,7 @@
 
     const-string v0, "value"
 
-    iget-object v3, v13, Lcom/crashlytics/android/answers/ae;->qG:Ljava/util/Map;
+    iget-object v3, v13, Lcom/crashlytics/android/answers/ae;->qH: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;->qG:Ljava/util/Map;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->qH: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;->qF:Ljava/lang/String;
+    iget-object v1, v13, Lcom/crashlytics/android/answers/ae;->qG: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;->qG:Ljava/util/Map;
+    iget-object v1, v13, Lcom/crashlytics/android/answers/ae;->qH: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;->qG:Ljava/util/Map;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->qH: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;->qG:Ljava/util/Map;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->qH: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;->qF:Ljava/lang/String;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->qG: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;->qG:Ljava/util/Map;
+    iget-object v1, v13, Lcom/crashlytics/android/answers/ae;->qH: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;->qF:Ljava/lang/String;
+    iget-object v1, v13, Lcom/crashlytics/android/answers/ae;->qG: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;->qG:Ljava/util/Map;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->qH: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;->qG:Ljava/util/Map;
+    iget-object v1, v13, Lcom/crashlytics/android/answers/ae;->qH: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;->qG:Ljava/util/Map;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->qH: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;->qG:Ljava/util/Map;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->qH: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;->qF:Ljava/lang/String;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->qG: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;->qG:Ljava/util/Map;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->qH: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;->qG:Ljava/util/Map;
+    iget-object v1, v13, Lcom/crashlytics/android/answers/ae;->qH: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;->qG:Ljava/util/Map;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->qH: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;->qG:Ljava/util/Map;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->qH: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;->qF:Ljava/lang/String;
+    iget-object v3, v13, Lcom/crashlytics/android/answers/ae;->qG: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;->qG:Ljava/util/Map;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->qH: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;->qF:Ljava/lang/String;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->qG: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;->qG:Ljava/util/Map;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->qH: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;->qF:Ljava/lang/String;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->qG: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;->qG:Ljava/util/Map;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->qH: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;->qF:Ljava/lang/String;
+    iget-object v1, v13, Lcom/crashlytics/android/answers/ae;->qG: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;->qG:Ljava/util/Map;
+    iget-object v1, v13, Lcom/crashlytics/android/answers/ae;->qH: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;->qF:Ljava/lang/String;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->qG: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;->qG:Ljava/util/Map;
+    iget-object v1, v13, Lcom/crashlytics/android/answers/ae;->qH: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;->qG:Ljava/util/Map;
+    iget-object v1, v13, Lcom/crashlytics/android/answers/ae;->qH: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;->qG:Ljava/util/Map;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->qH: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;->qE:Ljava/util/Map;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->qF: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;->qE:Ljava/util/Map;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->qF:Ljava/util/Map;
 
     if-eqz v0, :cond_1b
 
-    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->qE:Ljava/util/Map;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->qF: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;->qG:Ljava/util/Map;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->qH: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;->qF:Ljava/lang/String;
+    iget-object v1, v13, Lcom/crashlytics/android/answers/ae;->qG: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;->qD:Ljava/lang/String;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->qE: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->pV:Ljava/lang/String;
+    iget-object v0, v3, Lcom/crashlytics/android/answers/s;->pW:Ljava/lang/String;
 
-    iget-object v1, v3, Lcom/crashlytics/android/answers/s;->qk:Landroid/os/Bundle;
+    iget-object v1, v3, Lcom/crashlytics/android/answers/s;->ql: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;->qF:Ljava/lang/String;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->qG: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;->qk:Landroid/os/Bundle;
+    iget-object v1, v3, Lcom/crashlytics/android/answers/s;->ql: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->px:Lio/fabric/sdk/android/i;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/n;->py:Lio/fabric/sdk/android/i;
 
-    iget-object v3, p1, Lio/fabric/sdk/android/a/g/b;->beW:Ljava/lang/String;
+    iget-object v3, p1, Lio/fabric/sdk/android/a/g/b;->beR:Ljava/lang/String;
 
-    iget-object v4, p0, Lcom/crashlytics/android/answers/n;->pW:Lio/fabric/sdk/android/a/e/e;
+    iget-object v4, p0, Lcom/crashlytics/android/answers/n;->pX:Lio/fabric/sdk/android/a/e/e;
 
-    iget-object v0, p0, Lcom/crashlytics/android/answers/n;->qb:Lio/fabric/sdk/android/a/b/g;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/n;->qc: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;->qa:Lio/fabric/sdk/android/a/d/f;
+    iput-object v0, p0, Lcom/crashlytics/android/answers/n;->qb:Lio/fabric/sdk/android/a/d/f;
 
-    iget-object p2, p0, Lcom/crashlytics/android/answers/n;->pX:Lcom/crashlytics/android/answers/aa;
+    iget-object p2, p0, Lcom/crashlytics/android/answers/n;->pY:Lcom/crashlytics/android/answers/aa;
 
-    iput-object p1, p2, Lcom/crashlytics/android/answers/aa;->qu:Lio/fabric/sdk/android/a/g/b;
+    iput-object p1, p2, Lcom/crashlytics/android/answers/aa;->qv:Lio/fabric/sdk/android/a/g/b;
 
-    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
+    iget-boolean p2, p1, Lio/fabric/sdk/android/a/g/b;->beW:Z
 
     iput-boolean p2, p0, Lcom/crashlytics/android/answers/n;->qh:Z
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
+    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;->BC()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;->qg:Z
+    iget-boolean v1, p0, Lcom/crashlytics/android/answers/n;->qh: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->qh:Z
+    iget-boolean v4, p0, Lcom/crashlytics/android/answers/n;->qi: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;->bfc:Z
+    iget-boolean p2, p1, Lio/fabric/sdk/android/a/g/b;->beX:Z
 
-    iput-boolean p2, p0, Lcom/crashlytics/android/answers/n;->qd:Z
+    iput-boolean p2, p0, Lcom/crashlytics/android/answers/n;->qe:Z
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->qd:Z
+    iget-boolean v4, p0, Lcom/crashlytics/android/answers/n;->qe: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;->bfd:Z
+    iget-boolean p2, p1, Lio/fabric/sdk/android/a/g/b;->beY:Z
 
-    iput-boolean p2, p0, Lcom/crashlytics/android/answers/n;->qe:Z
+    iput-boolean p2, p0, Lcom/crashlytics/android/answers/n;->qf:Z
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->qe:Z
+    iget-boolean v4, p0, Lcom/crashlytics/android/answers/n;->qf: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;->qs:I
+    iget p2, p1, Lio/fabric/sdk/android/a/g/b;->qt:I
 
     const/4 v0, 0x1
 
     if-le p2, v0, :cond_4
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->qs:I
+    iget v0, p1, Lio/fabric/sdk/android/a/g/b;->qt:I
 
     invoke-direct {p2, v0}, Lcom/crashlytics/android/answers/z;-><init>(I)V
 
-    iput-object p2, p0, Lcom/crashlytics/android/answers/n;->qc:Lcom/crashlytics/android/answers/o;
+    iput-object p2, p0, Lcom/crashlytics/android/answers/n;->qd:Lcom/crashlytics/android/answers/o;
 
     :cond_4
-    iget p1, p1, Lio/fabric/sdk/android/a/g/b;->beX:I
+    iget p1, p1, Lio/fabric/sdk/android/a/g/b;->beS:I
 
-    iput p1, p0, Lcom/crashlytics/android/answers/n;->qf:I
+    iput p1, p0, Lcom/crashlytics/android/answers/n;->qg:I
 
     const-wide/16 p1, 0x0
 
-    iget v0, p0, Lcom/crashlytics/android/answers/n;->qf:I
+    iget v0, p0, Lcom/crashlytics/android/answers/n;->qg: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;->qa:Lio/fabric/sdk/android/a/d/f;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/n;->qb: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;->pX:Lcom/crashlytics/android/answers/aa;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/n;->pY:Lcom/crashlytics/android/answers/aa;
 
-    invoke-virtual {v0}, Lcom/crashlytics/android/answers/aa;->Cs()Ljava/util/List;
+    invoke-virtual {v0}, Lcom/crashlytics/android/answers/aa;->Cq()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;->qa:Lio/fabric/sdk/android/a/d/f;
+    iget-object v3, p0, Lcom/crashlytics/android/answers/n;->qb: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;->pX:Lcom/crashlytics/android/answers/aa;
+    iget-object v4, p0, Lcom/crashlytics/android/answers/n;->pY: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;->pX:Lcom/crashlytics/android/answers/aa;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/n;->pY:Lcom/crashlytics/android/answers/aa;
 
-    invoke-virtual {v0}, Lcom/crashlytics/android/answers/aa;->Cs()Ljava/util/List;
+    invoke-virtual {v0}, Lcom/crashlytics/android/answers/aa;->Cq()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;->pX:Lcom/crashlytics/android/answers/aa;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/n;->pY:Lcom/crashlytics/android/answers/aa;
 
-    invoke-virtual {v0}, Lcom/crashlytics/android/answers/aa;->Cu()V
+    invoke-virtual {v0}, Lcom/crashlytics/android/answers/aa;->Cs()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;->pX:Lcom/crashlytics/android/answers/aa;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/n;->pY:Lcom/crashlytics/android/answers/aa;
 
-    invoke-virtual {v0}, Lcom/crashlytics/android/answers/aa;->Ct()V
+    invoke-virtual {v0}, Lcom/crashlytics/android/answers/aa;->Cr()V
 
     return-void
 .end method
@@ -2000,7 +2000,7 @@
     .locals 2
 
     :try_start_0
-    iget-object v0, p0, Lcom/crashlytics/android/answers/n;->pX:Lcom/crashlytics/android/answers/aa;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/n;->pY: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;->pY:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/n;->pZ: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;->pY:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/n;->pZ: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;->pY:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/n;->pZ: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 4399144d06..f2ee178fe8 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 qi:Lcom/crashlytics/android/answers/t;
+.field final qj:Lcom/crashlytics/android/answers/t;
 
-.field qj:Lcom/crashlytics/android/answers/p;
+.field qk: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;->qi:Lcom/crashlytics/android/answers/t;
+    iput-object p2, p0, Lcom/crashlytics/android/answers/q;->qj: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 e103ff5f7d..cb8786d53c 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 pV:Ljava/lang/String;
+.field final pW:Ljava/lang/String;
 
-.field final qk:Landroid/os/Bundle;
+.field final ql: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;->pV:Ljava/lang/String;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/s;->pW:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/crashlytics/android/answers/s;->qk:Landroid/os/Bundle;
+    iput-object p2, p0, Lcom/crashlytics/android/answers/s;->ql: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 44fea7ab56..984769bd3d 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 ql:Ljava/util/Set;
+.field private static final qm: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;->ql:Ljava/util/Set;
+    sput-object v0, Lcom/crashlytics/android/answers/t;->qm:Ljava/util/Set;
 
     return-void
 .end method
@@ -214,7 +214,7 @@
     goto :goto_0
 
     :cond_0
-    sget-object v0, Lcom/crashlytics/android/answers/t;->ql:Ljava/util/Set;
+    sget-object v0, Lcom/crashlytics/android/answers/t;->qm: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;->po:Ljava/math/BigDecimal;
+    sget-object p0, Lcom/crashlytics/android/answers/a;->pp: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 21689520ae..018fca24d3 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 qm:Lcom/crashlytics/android/answers/b;
+.field public final qn: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;->pr:Lcom/crashlytics/android/answers/d;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/w;->ps: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;->qm:Lcom/crashlytics/android/answers/b;
+    iput-object v0, p0, Lcom/crashlytics/android/answers/w;->qn: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;->qm:Lcom/crashlytics/android/answers/b;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/w;->qn: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;->pt:Lcom/crashlytics/android/answers/b;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/w;->pu: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 912fdbebb3..23020b760e 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 qn:Lio/fabric/sdk/android/a/c/a/a;
+.field final qo:Lio/fabric/sdk/android/a/c/a/a;
 
-.field final qo:D
+.field final qq: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;->qn:Lio/fabric/sdk/android/a/c/a/a;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/x;->qo:Lio/fabric/sdk/android/a/c/a/a;
 
     const-wide p1, 0x3fb999999999999aL    # 0.1
 
-    iput-wide p1, p0, Lcom/crashlytics/android/answers/x;->qo:D
+    iput-wide p1, p0, Lcom/crashlytics/android/answers/x;->qq: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;->qo:D
+    iget-wide v0, p0, Lcom/crashlytics/android/answers/x;->qq: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;->qn:Lio/fabric/sdk/android/a/c/a/a;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/x;->qo: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 0909b1cc11..7f0dd23930 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 qq:J
+.field qr:J
 
-.field qr:Lio/fabric/sdk/android/a/c/a/e;
+.field qs: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;->qr:Lio/fabric/sdk/android/a/c/a/e;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/y;->qs: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 daa1dd8a55..ee62545500 100644
--- a/com.discord/smali/com/crashlytics/android/answers/z$1.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/z$1.smali
@@ -28,10 +28,6 @@
 
     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
@@ -44,5 +40,9 @@
 
     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 fd52fe357a..ff1e494d4e 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 qt:Ljava/util/Set;
+.field static final qu:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -19,7 +19,7 @@
 
 
 # instance fields
-.field final qs:I
+.field final qt: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;->qt:Ljava/util/Set;
+    sput-object v0, Lcom/crashlytics/android/answers/z;->qu: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;->qs:I
+    iput p1, p0, Lcom/crashlytics/android/answers/z;->qt: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;->qt:Ljava/util/Set;
+    sget-object v0, Lcom/crashlytics/android/answers/z;->qu:Ljava/util/Set;
 
-    iget-object v1, p1, Lcom/crashlytics/android/answers/ae;->qB:Lcom/crashlytics/android/answers/ae$b;
+    iget-object v1, p1, Lcom/crashlytics/android/answers/ae;->qC: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;->qA:Lcom/crashlytics/android/answers/af;
+    iget-object v0, p1, Lcom/crashlytics/android/answers/ae;->qB:Lcom/crashlytics/android/answers/af;
 
-    iget-object v0, v0, Lcom/crashlytics/android/answers/af;->qV:Ljava/lang/String;
+    iget-object v0, v0, Lcom/crashlytics/android/answers/af;->qW: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;->qA:Lcom/crashlytics/android/answers/af;
+    iget-object p1, p1, Lcom/crashlytics/android/answers/ae;->qB:Lcom/crashlytics/android/answers/af;
 
-    iget-object p1, p1, Lcom/crashlytics/android/answers/af;->qT:Ljava/lang/String;
+    iget-object p1, p1, Lcom/crashlytics/android/answers/af;->qU:Ljava/lang/String;
 
     invoke-virtual {p1}, Ljava/lang/String;->hashCode()I
 
     move-result p1
 
-    iget v3, p0, Lcom/crashlytics/android/answers/z;->qs:I
+    iget v3, p0, Lcom/crashlytics/android/answers/z;->qt: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 6c3fd6344e..35899618f6 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;->bcp:Z
+    iget-boolean p1, p1, Lio/fabric/sdk/android/a/b/l;->bcl: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 2fa505a9eb..f3703b9fbc 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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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 cfedf219fa..9993ec7fce 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 qW:Ljava/lang/String;
+.field public final qX:Ljava/lang/String;
 
-.field public final qv:Ljava/lang/String;
-
-.field public final rb:Ljava/lang/String;
+.field public final qw: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;->qv:Ljava/lang/String;
+    iput-object p1, p0, Lcom/crashlytics/android/core/a;->qw:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/a;->qW:Ljava/lang/String;
+    iput-object p2, p0, Lcom/crashlytics/android/core/a;->qX:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/crashlytics/android/core/a;->rd:Ljava/lang/String;
+    iput-object p3, p0, Lcom/crashlytics/android/core/a;->re: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;->rb:Ljava/lang/String;
+    iput-object p5, p0, Lcom/crashlytics/android/core/a;->rc:Ljava/lang/String;
 
-    iput-object p6, p0, Lcom/crashlytics/android/core/a;->rc:Ljava/lang/String;
+    iput-object p6, p0, Lcom/crashlytics/android/core/a;->rd: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 f6e2561a56..5a2bc6e099 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 tq:[Ljava/io/File;
+.field private final tr:[Ljava/io/File;
 
-.field private final tr:Ljava/util/Map;
+.field private final ts:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -20,7 +20,7 @@
     .end annotation
 .end field
 
-.field private final ts:Ljava/lang/String;
+.field private final tt: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;->tq:[Ljava/io/File;
+    iput-object p2, p0, Lcom/crashlytics/android/core/ab;->tr:[Ljava/io/File;
 
     new-instance p2, Ljava/util/HashMap;
 
-    sget-object v0, Lcom/crashlytics/android/core/ar;->tT:Ljava/util/Map;
+    sget-object v0, Lcom/crashlytics/android/core/ar;->tU:Ljava/util/Map;
 
     invoke-direct {p2, v0}, Ljava/util/HashMap;-><init>(Ljava/util/Map;)V
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/ab;->tr:Ljava/util/Map;
+    iput-object p2, p0, Lcom/crashlytics/android/core/ab;->ts:Ljava/util/Map;
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/ab;->ts:Ljava/lang/String;
+    iput-object p1, p0, Lcom/crashlytics/android/core/ab;->tt: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;->tq:[Ljava/io/File;
+    iget-object v0, p0, Lcom/crashlytics/android/core/ab;->tr:[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;->tq:[Ljava/io/File;
+    iget-object v0, p0, Lcom/crashlytics/android/core/ab;->tr:[Ljava/io/File;
 
     return-object v0
 .end method
@@ -78,7 +78,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/ab;->tr:Ljava/util/Map;
+    iget-object v0, p0, Lcom/crashlytics/android/core/ab;->ts: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;->tQ:I
+    sget v0, Lcom/crashlytics/android/core/aq$a;->tR: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;->tq:[Ljava/io/File;
+    iget-object v0, p0, Lcom/crashlytics/android/core/ab;->tr:[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;->ts:Ljava/lang/String;
+    iget-object v0, p0, Lcom/crashlytics/android/core/ab;->tt: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;->tq:[Ljava/io/File;
+    iget-object v0, p0, Lcom/crashlytics/android/core/ab;->tr:[Ljava/io/File;
 
     array-length v1, v0
 
@@ -133,7 +133,7 @@
 
     aget-object v3, v0, v2
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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 424a19d434..0dbf0d5faf 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 tt:Lcom/crashlytics/android/core/ac$b;
+.field private static final tu:Lcom/crashlytics/android/core/ac$b;
 
 
 # instance fields
 .field private final context:Landroid/content/Context;
 
-.field private final tu:Lcom/crashlytics/android/core/ac$a;
+.field private final tv:Lcom/crashlytics/android/core/ac$a;
 
-.field tv:Lcom/crashlytics/android/core/aa;
+.field tw: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;->tt:Lcom/crashlytics/android/core/ac$b;
+    sput-object v0, Lcom/crashlytics/android/core/ac;->tu: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;->tu:Lcom/crashlytics/android/core/ac$a;
+    iput-object p2, p0, Lcom/crashlytics/android/core/ac;->tv:Lcom/crashlytics/android/core/ac$a;
 
-    sget-object p1, Lcom/crashlytics/android/core/ac;->tt:Lcom/crashlytics/android/core/ac$b;
+    sget-object p1, Lcom/crashlytics/android/core/ac;->tu:Lcom/crashlytics/android/core/ac$b;
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/ac;->tv:Lcom/crashlytics/android/core/aa;
+    iput-object p1, p0, Lcom/crashlytics/android/core/ac;->tw: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;->tu:Lcom/crashlytics/android/core/ac$a;
+    iget-object v1, p0, Lcom/crashlytics/android/core/ac;->tv: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;->tv:Lcom/crashlytics/android/core/aa;
+    iput-object v0, p0, Lcom/crashlytics/android/core/ac;->tw: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;->tv:Lcom/crashlytics/android/core/aa;
+    iget-object v0, p0, Lcom/crashlytics/android/core/ac;->tw:Lcom/crashlytics/android/core/aa;
 
     invoke-interface {v0}, Lcom/crashlytics/android/core/aa;->dd()V
 
-    sget-object v0, Lcom/crashlytics/android/core/ac;->tt:Lcom/crashlytics/android/core/ac$b;
+    sget-object v0, Lcom/crashlytics/android/core/ac;->tu:Lcom/crashlytics/android/core/ac$b;
 
-    iput-object v0, p0, Lcom/crashlytics/android/core/ac;->tv:Lcom/crashlytics/android/core/aa;
+    iput-object v0, p0, Lcom/crashlytics/android/core/ac;->tw: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()Lio/fabric/sdk/android/l;
 
     move-result-object p1
 
@@ -176,7 +176,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/ac;->tu:Lcom/crashlytics/android/core/ac$a;
+    iget-object v0, p0, Lcom/crashlytics/android/core/ac;->tv: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;->tv:Lcom/crashlytics/android/core/aa;
+    iget-object v0, p0, Lcom/crashlytics/android/core/ac;->tw: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 006e24217d..eb21e69110 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 ty:Lcom/crashlytics/android/core/az;
+.field final synthetic tz:Lcom/crashlytics/android/core/az;
 
 
 # direct methods
@@ -27,11 +27,11 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/ae$1;->ty:Lcom/crashlytics/android/core/az;
+    iput-object p1, p0, Lcom/crashlytics/android/core/ae$1;->tz:Lcom/crashlytics/android/core/az;
 
     invoke-direct {p0}, Lorg/json/JSONObject;-><init>()V
 
-    iget-object p1, p0, Lcom/crashlytics/android/core/ae$1;->ty:Lcom/crashlytics/android/core/az;
+    iget-object p1, p0, Lcom/crashlytics/android/core/ae$1;->tz: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;->ty:Lcom/crashlytics/android/core/az;
+    iget-object p1, p0, Lcom/crashlytics/android/core/ae$1;->tz: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;->ty:Lcom/crashlytics/android/core/az;
+    iget-object p1, p0, Lcom/crashlytics/android/core/ae$1;->tz: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 af344c164f..93c8612098 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 tw:Ljava/nio/charset/Charset;
+.field static final tx:Ljava/nio/charset/Charset;
 
 
 # instance fields
-.field private final tx:Ljava/io/File;
+.field private final ty:Ljava/io/File;
 
 
 # direct methods
@@ -21,7 +21,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/crashlytics/android/core/ae;->tw:Ljava/nio/charset/Charset;
+    sput-object v0, Lcom/crashlytics/android/core/ae;->tx: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;->tx:Ljava/io/File;
+    iput-object p1, p0, Lcom/crashlytics/android/core/ae;->ty:Ljava/io/File;
 
     return-void
 .end method
@@ -123,7 +123,7 @@
 
     if-nez v1, :cond_0
 
-    sget-object p1, Lcom/crashlytics/android/core/az;->ui:Lcom/crashlytics/android/core/az;
+    sget-object p1, Lcom/crashlytics/android/core/az;->uj:Lcom/crashlytics/android/core/az;
 
     return-object p1
 
@@ -200,7 +200,7 @@
 
     :goto_0
     :try_start_2
-    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->ui:Lcom/crashlytics/android/core/az;
+    sget-object p1, Lcom/crashlytics/android/core/az;->uj: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;->tx:Ljava/io/File;
+    iget-object v1, p0, Lcom/crashlytics/android/core/ae;->ty: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;->tx:Ljava/io/File;
+    iget-object v1, p0, Lcom/crashlytics/android/core/ae;->ty: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 b4789b0774..2d1352cc7f 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:[Lcom/crashlytics/android/core/aw;
+.field private final tA:I
 
-.field private final tB:Lcom/crashlytics/android/core/ag;
+.field private final tB:[Lcom/crashlytics/android/core/aw;
 
-.field private final tz:I
+.field private final tC:Lcom/crashlytics/android/core/ag;
 
 
 # direct methods
@@ -22,15 +22,15 @@
 
     const/16 v0, 0x400
 
-    iput v0, p0, Lcom/crashlytics/android/core/af;->tz:I
+    iput v0, p0, Lcom/crashlytics/android/core/af;->tA:I
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/af;->tA:[Lcom/crashlytics/android/core/aw;
+    iput-object p1, p0, Lcom/crashlytics/android/core/af;->tB:[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;->tB:Lcom/crashlytics/android/core/ag;
+    iput-object p1, p0, Lcom/crashlytics/android/core/af;->tC: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;->tz:I
+    iget v1, p0, Lcom/crashlytics/android/core/af;->tA:I
 
     if-gt v0, v1, :cond_0
 
     return-object p1
 
     :cond_0
-    iget-object v0, p0, Lcom/crashlytics/android/core/af;->tA:[Lcom/crashlytics/android/core/aw;
+    iget-object v0, p0, Lcom/crashlytics/android/core/af;->tB:[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;->tz:I
+    iget v6, p0, Lcom/crashlytics/android/core/af;->tA: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;->tz:I
+    iget v0, p0, Lcom/crashlytics/android/core/af;->tA:I
 
     if-le p1, v0, :cond_2
 
-    iget-object p1, p0, Lcom/crashlytics/android/core/af;->tB:Lcom/crashlytics/android/core/ag;
+    iget-object p1, p0, Lcom/crashlytics/android/core/af;->tC: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 83f3e0dccb..66511d99a8 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 tC:I
+.field private final tD:I
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     const/16 p1, 0x400
 
-    iput p1, p0, Lcom/crashlytics/android/core/ag;->tC:I
+    iput p1, p0, Lcom/crashlytics/android/core/ag;->tD:I
 
     return-void
 .end method
@@ -30,7 +30,7 @@
 
     array-length v0, p1
 
-    iget v1, p0, Lcom/crashlytics/android/core/ag;->tC:I
+    iget v1, p0, Lcom/crashlytics/android/core/ag;->tD: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 479ca42c6a..fd8b202338 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;->beq:I
+    sget v5, Lio/fabric/sdk/android/a/e/c;->bel: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;->BQ()Lio/fabric/sdk/android/a/e/d;
+    invoke-virtual {p0}, Lcom/crashlytics/android/core/ah;->BO()Lio/fabric/sdk/android/a/e/d;
 
     move-result-object v0
 
-    iget-object v1, p1, Lcom/crashlytics/android/core/u;->qv:Ljava/lang/String;
+    iget-object v1, p1, Lcom/crashlytics/android/core/u;->qw: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;->px:Lio/fabric/sdk/android/i;
+    iget-object v3, p0, Lcom/crashlytics/android/core/ah;->py: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;->px:Lio/fabric/sdk/android/i;
+    iget-object v3, p0, Lcom/crashlytics/android/core/ah;->py: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;->sJ:Lcom/crashlytics/android/core/aq;
+    iget-object p1, p1, Lcom/crashlytics/android/core/u;->sK: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->CG()I
+    invoke-virtual {p1}, Lio/fabric/sdk/android/a/e/d;->CE()I
 
     move-result p1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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 4753053410..b8d8c87101 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 tD:Ljava/io/File;
+.field private final tE: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;->tD:Ljava/io/File;
+    iput-object p1, p0, Lcom/crashlytics/android/core/aj;->tE: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;->tD:Ljava/io/File;
+    iget-object v0, p0, Lcom/crashlytics/android/core/aj;->tE: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;->tR:I
+    sget v0, Lcom/crashlytics/android/core/aq$a;->tS: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;->tD:Ljava/io/File;
+    iget-object v0, p0, Lcom/crashlytics/android/core/aj;->tE: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;->tD:Ljava/io/File;
+    iget-object v0, p0, Lcom/crashlytics/android/core/aj;->tE: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->tD:Ljava/io/File;
+    iget-object v2, p0, Lcom/crashlytics/android/core/aj;->tE: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;->tD:Ljava/io/File;
+    iget-object v0, p0, Lcom/crashlytics/android/core/aj;->tE: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 5f9fd8f10a..3a10d7f19d 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 tE:Lio/fabric/sdk/android/a/f/c;
+.field final tF:Lio/fabric/sdk/android/a/f/c;
 
-.field final tF:Lcom/crashlytics/android/core/l;
+.field final tG: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;->tE:Lio/fabric/sdk/android/a/f/c;
+    iput-object p1, p0, Lcom/crashlytics/android/core/al;->tF:Lio/fabric/sdk/android/a/f/c;
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/al;->tF:Lcom/crashlytics/android/core/l;
+    iput-object p2, p0, Lcom/crashlytics/android/core/al;->tG: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 c350414774..b4ae73902b 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 tG:J
+.field public final tH:J
 
-.field public final tH:Ljava/lang/String;
+.field public final tI: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;->tG:J
+    iput-wide p1, p0, Lcom/crashlytics/android/core/am;->tH:J
 
     iput-wide p3, p0, Lcom/crashlytics/android/core/am;->size:J
 
-    iput-object p5, p0, Lcom/crashlytics/android/core/am;->tH:Ljava/lang/String;
+    iput-object p5, p0, Lcom/crashlytics/android/core/am;->tI: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 f8eed8c127..0003cdc80e 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 tI:Ljava/util/regex/Pattern;
+.field private static final tJ:Ljava/util/regex/Pattern;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/crashlytics/android/core/an;->tI:Ljava/util/regex/Pattern;
+    sput-object v0, Lcom/crashlytics/android/core/an;->tJ: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;->tI:Ljava/util/regex/Pattern;
+    sget-object v0, Lcom/crashlytics/android/core/an;->tJ: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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 32392e0fd3..e1554ac8a4 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 tM:[B
+.field final synthetic tN:[B
 
-.field final synthetic tN:[I
+.field final synthetic tO:[I
 
-.field final synthetic tO:Lcom/crashlytics/android/core/ao;
+.field final synthetic tP: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;->tO:Lcom/crashlytics/android/core/ao;
+    iput-object p1, p0, Lcom/crashlytics/android/core/ao$1;->tP:Lcom/crashlytics/android/core/ao;
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/ao$1;->tM:[B
+    iput-object p2, p0, Lcom/crashlytics/android/core/ao$1;->tN:[B
 
-    iput-object p3, p0, Lcom/crashlytics/android/core/ao$1;->tN:[I
+    iput-object p3, p0, Lcom/crashlytics/android/core/ao$1;->tO:[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;->tM:[B
+    iget-object v0, p0, Lcom/crashlytics/android/core/ao$1;->tN:[B
 
-    iget-object v1, p0, Lcom/crashlytics/android/core/ao$1;->tN:[I
+    iget-object v1, p0, Lcom/crashlytics/android/core/ao$1;->tO:[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;->tN:[I
+    iget-object v0, p0, Lcom/crashlytics/android/core/ao$1;->tO:[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 38d70ddc70..9dd500fa1e 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 rf:[B
+.field public final rg:[B
 
-.field final synthetic tO:Lcom/crashlytics/android/core/ao;
+.field final synthetic tP: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;->tO:Lcom/crashlytics/android/core/ao;
+    iput-object p1, p0, Lcom/crashlytics/android/core/ao$a;->tP:Lcom/crashlytics/android/core/ao;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/ao$a;->rf:[B
+    iput-object p2, p0, Lcom/crashlytics/android/core/ao$a;->rg:[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 161da5afb0..af1c116507 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 tJ:Ljava/io/File;
+.field private final tK:Ljava/io/File;
 
-.field private final tK:I
+.field private final tL:I
 
-.field private tL:Lio/fabric/sdk/android/a/b/u;
+.field private tM: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;->tJ:Ljava/io/File;
+    iput-object p1, p0, Lcom/crashlytics/android/core/ao;->tK:Ljava/io/File;
 
     const/high16 p1, 0x10000
 
-    iput p1, p0, Lcom/crashlytics/android/core/ao;->tK:I
+    iput p1, p0, Lcom/crashlytics/android/core/ao;->tL: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;->tJ:Ljava/io/File;
+    iget-object v0, p0, Lcom/crashlytics/android/core/ao;->tK: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;->tL:Lio/fabric/sdk/android/a/b/u;
+    iget-object v0, p0, Lcom/crashlytics/android/core/ao;->tM: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;->Ce()I
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/u;->Cc()I
 
     move-result v0
 
     new-array v0, v0, [B
 
     :try_start_0
-    iget-object v3, p0, Lcom/crashlytics/android/core/ao;->tL:Lio/fabric/sdk/android/a/b/u;
+    iget-object v3, p0, Lcom/crashlytics/android/core/ao;->tM: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->tL:Lio/fabric/sdk/android/a/b/u;
+    iget-object v0, p0, Lcom/crashlytics/android/core/ao;->tM: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;->tJ:Ljava/io/File;
+    iget-object v1, p0, Lcom/crashlytics/android/core/ao;->tK: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;->tL:Lio/fabric/sdk/android/a/b/u;
+    iput-object v0, p0, Lcom/crashlytics/android/core/ao;->tM: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->tJ:Ljava/io/File;
+    iget-object v3, p0, Lcom/crashlytics/android/core/ao;->tK: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;->tL:Lio/fabric/sdk/android/a/b/u;
+    iget-object v1, p0, Lcom/crashlytics/android/core/ao;->tM: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;->tK:I
+    iget v1, p0, Lcom/crashlytics/android/core/ao;->tL:I
 
     div-int/lit8 v1, v1, 0x4
 
@@ -255,14 +255,14 @@
 
     move-result-object p1
 
-    iget-object p2, p0, Lcom/crashlytics/android/core/ao;->tL:Lio/fabric/sdk/android/a/b/u;
+    iget-object p2, p0, Lcom/crashlytics/android/core/ao;->tM: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;->tL:Lio/fabric/sdk/android/a/b/u;
+    iget-object p1, p0, Lcom/crashlytics/android/core/ao;->tM: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;->tL:Lio/fabric/sdk/android/a/b/u;
+    iget-object p1, p0, Lcom/crashlytics/android/core/ao;->tM:Lio/fabric/sdk/android/a/b/u;
 
-    invoke-virtual {p1}, Lio/fabric/sdk/android/a/b/u;->Ce()I
+    invoke-virtual {p1}, Lio/fabric/sdk/android/a/b/u;->Cc()I
 
     move-result p1
 
-    iget p2, p0, Lcom/crashlytics/android/core/ao;->tK:I
+    iget p2, p0, Lcom/crashlytics/android/core/ao;->tL:I
 
     if-le p1, p2, :cond_2
 
-    iget-object p1, p0, Lcom/crashlytics/android/core/ao;->tL:Lio/fabric/sdk/android/a/b/u;
+    iget-object p1, p0, Lcom/crashlytics/android/core/ao;->tM: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->rf:[B
+    iget-object v1, v0, Lcom/crashlytics/android/core/ao$a;->rg:[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;->rf:[B
+    iget-object v0, v0, Lcom/crashlytics/android/core/ao$a;->rg:[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;->tL:Lio/fabric/sdk/android/a/b/u;
+    iget-object v0, p0, Lcom/crashlytics/android/core/ao;->tM: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;->tL:Lio/fabric/sdk/android/a/b/u;
+    iput-object v0, p0, Lcom/crashlytics/android/core/ao;->tM: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;->tJ:Ljava/io/File;
+    iget-object v0, p0, Lcom/crashlytics/android/core/ao;->tK: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 2a02275ed9..02ce3c6847 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 tP:I
+.field private final tQ:I
 
 
 # direct methods
@@ -26,7 +26,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput p1, p0, Lcom/crashlytics/android/core/ap;->tP:I
+    iput p1, p0, Lcom/crashlytics/android/core/ap;->tQ: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;->tP:I
+    iget v0, p0, Lcom/crashlytics/android/core/ap;->tQ: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 06a7a38b4b..8cf5657897 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 tQ:I = 0x1
+.field public static final tR:I = 0x1
 
-.field public static final tR:I = 0x2
+.field public static final tS:I = 0x2
 
-.field private static final synthetic tS:[I
+.field private static final synthetic tT:[I
 
 
 # direct methods
@@ -38,19 +38,19 @@
 
     new-array v0, v0, [I
 
-    sget v1, Lcom/crashlytics/android/core/aq$a;->tQ:I
+    sget v1, Lcom/crashlytics/android/core/aq$a;->tR:I
 
     const/4 v2, 0x0
 
     aput v1, v0, v2
 
-    sget v1, Lcom/crashlytics/android/core/aq$a;->tR:I
+    sget v1, Lcom/crashlytics/android/core/aq$a;->tS:I
 
     const/4 v2, 0x1
 
     aput v1, v0, v2
 
-    sput-object v0, Lcom/crashlytics/android/core/aq$a;->tS:[I
+    sput-object v0, Lcom/crashlytics/android/core/aq$a;->tT:[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;->tS:[I
+    sget-object v0, Lcom/crashlytics/android/core/aq$a;->tT:[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 445aca0366..6fc8d5062b 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 sT:F
+.field private final sU:F
 
-.field private final tY:Lcom/crashlytics/android/core/ar$d;
+.field private final tZ:Lcom/crashlytics/android/core/ar$d;
 
-.field final synthetic tZ:Lcom/crashlytics/android/core/ar;
+.field final synthetic ua: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;->tZ:Lcom/crashlytics/android/core/ar;
+    iput-object p1, p0, Lcom/crashlytics/android/core/ar$e;->ua: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;->sT:F
+    iput p2, p0, Lcom/crashlytics/android/core/ar$e;->sU:F
 
-    iput-object p3, p0, Lcom/crashlytics/android/core/ar$e;->tY:Lcom/crashlytics/android/core/ar$d;
+    iput-object p3, p0, Lcom/crashlytics/android/core/ar$e;->tZ: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->sT:F
+    iget v3, p0, Lcom/crashlytics/android/core/ar$e;->sU: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;->sT:F
+    iget v1, p0, Lcom/crashlytics/android/core/ar$e;->sU: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;->sT:F
+    iget v1, p0, Lcom/crashlytics/android/core/ar$e;->sU: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;->tZ:Lcom/crashlytics/android/core/ar;
+    iget-object v1, p0, Lcom/crashlytics/android/core/ar$e;->ua: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;->tZ:Lcom/crashlytics/android/core/ar;
+    iget-object v2, p0, Lcom/crashlytics/android/core/ar$e;->ua: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;->tY:Lcom/crashlytics/android/core/ar$d;
+    iget-object v2, p0, Lcom/crashlytics/android/core/ar$e;->tZ: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->tZ:Lcom/crashlytics/android/core/ar;
+    iget-object v3, p0, Lcom/crashlytics/android/core/ar$e;->ua: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->tZ:Lcom/crashlytics/android/core/ar;
+    iget-object v4, p0, Lcom/crashlytics/android/core/ar$e;->ua: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;->tZ:Lcom/crashlytics/android/core/ar;
+    iget-object v1, p0, Lcom/crashlytics/android/core/ar$e;->ua: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->tZ:Lcom/crashlytics/android/core/ar;
+    iget-object v0, p0, Lcom/crashlytics/android/core/ar$e;->ua: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 6e87c2f369..d010b498d2 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 tT:Ljava/util/Map;
+.field static final tU:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -27,21 +27,21 @@
     .end annotation
 .end field
 
-.field private static final tU:[S
+.field private static final tV:[S
 
 
 # instance fields
-.field private final qv:Ljava/lang/String;
+.field private final qw:Ljava/lang/String;
 
-.field private final rP:Lcom/crashlytics/android/core/ar$c;
+.field private final rQ:Lcom/crashlytics/android/core/ar$c;
 
-.field private final rQ:Lcom/crashlytics/android/core/ar$b;
+.field private final rR:Lcom/crashlytics/android/core/ar$b;
 
-.field private final tV:Ljava/lang/Object;
+.field private final tW:Ljava/lang/Object;
 
-.field private final tW:Lcom/crashlytics/android/core/v;
+.field private final tX:Lcom/crashlytics/android/core/v;
 
-.field private tX:Ljava/lang/Thread;
+.field private tY:Ljava/lang/Thread;
 
 
 # direct methods
@@ -56,7 +56,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/crashlytics/android/core/ar;->tT:Ljava/util/Map;
+    sput-object v0, Lcom/crashlytics/android/core/ar;->tU: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;->tU:[S
+    sput-object v0, Lcom/crashlytics/android/core/ar;->tV:[S
 
     return-void
 
@@ -90,17 +90,17 @@
 
     invoke-direct {v0}, Ljava/lang/Object;-><init>()V
 
-    iput-object v0, p0, Lcom/crashlytics/android/core/ar;->tV:Ljava/lang/Object;
+    iput-object v0, p0, Lcom/crashlytics/android/core/ar;->tW:Ljava/lang/Object;
 
     if-eqz p2, :cond_0
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/ar;->tW:Lcom/crashlytics/android/core/v;
+    iput-object p2, p0, Lcom/crashlytics/android/core/ar;->tX:Lcom/crashlytics/android/core/v;
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/ar;->qv:Ljava/lang/String;
+    iput-object p1, p0, Lcom/crashlytics/android/core/ar;->qw:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/crashlytics/android/core/ar;->rP:Lcom/crashlytics/android/core/ar$c;
+    iput-object p3, p0, Lcom/crashlytics/android/core/ar;->rQ:Lcom/crashlytics/android/core/ar$c;
 
-    iput-object p4, p0, Lcom/crashlytics/android/core/ar;->rQ:Lcom/crashlytics/android/core/ar$b;
+    iput-object p4, p0, Lcom/crashlytics/android/core/ar;->rR: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;->tX:Ljava/lang/Thread;
+    iput-object v0, p0, Lcom/crashlytics/android/core/ar;->tY: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;->rQ:Lcom/crashlytics/android/core/ar$b;
+    iget-object p0, p0, Lcom/crashlytics/android/core/ar;->rR: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;->tU:[S
+    sget-object v0, Lcom/crashlytics/android/core/ar;->tV:[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;->tX:Ljava/lang/Thread;
+    iget-object v0, p0, Lcom/crashlytics/android/core/ar;->tY:Ljava/lang/Thread;
 
     if-eqz v0, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->tX:Ljava/lang/Thread;
+    iput-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;
+    iget-object p1, p0, Lcom/crashlytics/android/core/ar;->tY: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;->tV:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/crashlytics/android/core/ar;->tW: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;->qv:Ljava/lang/String;
+    iget-object v3, p0, Lcom/crashlytics/android/core/ar;->qw: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;->tW:Lcom/crashlytics/android/core/v;
+    iget-object v3, p0, Lcom/crashlytics/android/core/ar;->tX: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()Lio/fabric/sdk/android/l;
 
     move-result-object v3
 
@@ -323,7 +323,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->tV:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/crashlytics/android/core/ar;->tW:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/crashlytics/android/core/ar;->rP:Lcom/crashlytics/android/core/ar$c;
+    iget-object v1, p0, Lcom/crashlytics/android/core/ar;->rQ: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;->rP:Lcom/crashlytics/android/core/ar$c;
+    iget-object v2, p0, Lcom/crashlytics/android/core/ar;->rQ: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;->rP:Lcom/crashlytics/android/core/ar$c;
+    iget-object v3, p0, Lcom/crashlytics/android/core/ar;->rQ: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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 5d2be64764..1f0edf1c1b 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 rT:Ljava/lang/String;
+.field private rU:Ljava/lang/String;
 
-.field private final ua:Lcom/crashlytics/android/core/ay;
+.field private final ub:Lcom/crashlytics/android/core/ay;
 
-.field private ub:Z
+.field private uc:Z
 
 
 # direct methods
@@ -24,11 +24,11 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/crashlytics/android/core/as;->ub:Z
+    iput-boolean v0, p0, Lcom/crashlytics/android/core/as;->uc:Z
 
     iput-object p1, p0, Lcom/crashlytics/android/core/as;->context:Landroid/content/Context;
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/as;->ua:Lcom/crashlytics/android/core/ay;
+    iput-object p2, p0, Lcom/crashlytics/android/core/as;->ub: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;->ub:Z
+    iget-boolean v0, p0, Lcom/crashlytics/android/core/as;->uc:Z
 
     if-nez v0, :cond_0
 
@@ -48,21 +48,21 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/crashlytics/android/core/as;->rT:Ljava/lang/String;
+    iput-object v0, p0, Lcom/crashlytics/android/core/as;->rU:Ljava/lang/String;
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/crashlytics/android/core/as;->ub:Z
+    iput-boolean v0, p0, Lcom/crashlytics/android/core/as;->uc:Z
 
     :cond_0
-    iget-object v0, p0, Lcom/crashlytics/android/core/as;->rT:Ljava/lang/String;
+    iget-object v0, p0, Lcom/crashlytics/android/core/as;->rU:Ljava/lang/String;
 
     if-eqz v0, :cond_1
 
     return-object v0
 
     :cond_1
-    iget-object v0, p0, Lcom/crashlytics/android/core/as;->ua:Lcom/crashlytics/android/core/ay;
+    iget-object v0, p0, Lcom/crashlytics/android/core/as;->ub: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 38fba148b8..1b5b8e38fe 100644
--- a/com.discord/smali/com/crashlytics/android/core/at.smali
+++ b/com.discord/smali/com/crashlytics/android/core/at.smali
@@ -4,10 +4,10 @@
 
 
 # static fields
-.field private static final uc:Lcom/crashlytics/android/core/d;
-
 .field private static final ud:Lcom/crashlytics/android/core/d;
 
+.field private static final ue:Lcom/crashlytics/android/core/d;
+
 
 # direct methods
 .method static constructor <clinit>()V
@@ -19,7 +19,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/crashlytics/android/core/at;->uc:Lcom/crashlytics/android/core/d;
+    sput-object v0, Lcom/crashlytics/android/core/at;->ud: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;->ud:Lcom/crashlytics/android/core/d;
+    sput-object v0, Lcom/crashlytics/android/core/at;->ue: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;->uf:Ljava/lang/String;
+    iget-object v3, p0, Lcom/crashlytics/android/core/ax;->ug: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;->ug:[Ljava/lang/StackTraceElement;
+    iget-object v3, p0, Lcom/crashlytics/android/core/ax;->uh:[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;->uh:Lcom/crashlytics/android/core/ax;
+    iget-object p0, p0, Lcom/crashlytics/android/core/ax;->ui: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;->uh:Lcom/crashlytics/android/core/ax;
+    iget-object p0, p0, Lcom/crashlytics/android/core/ax;->ui: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;->tv:Lcom/crashlytics/android/core/aa;
+    iget-object v4, v3, Lcom/crashlytics/android/core/ac;->tw: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->uc:Lcom/crashlytics/android/core/d;
+    sget-object v2, Lcom/crashlytics/android/core/at;->ud: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;->uc:Lcom/crashlytics/android/core/d;
+    sget-object v2, Lcom/crashlytics/android/core/at;->ud: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;->uf:Ljava/lang/String;
+    iget-object v0, p1, Lcom/crashlytics/android/core/ax;->ug: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;->ug:[Ljava/lang/StackTraceElement;
+    iget-object v0, p1, Lcom/crashlytics/android/core/ax;->uh:[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;->uh:Lcom/crashlytics/android/core/ax;
+    iget-object p1, p1, Lcom/crashlytics/android/core/ax;->ui: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;->uh:Lcom/crashlytics/android/core/ax;
+    iget-object p1, p1, Lcom/crashlytics/android/core/ax;->ui: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;->ud:Lcom/crashlytics/android/core/d;
+    sget-object v12, Lcom/crashlytics/android/core/at;->ue: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;->ud:Lcom/crashlytics/android/core/d;
+    sget-object v2, Lcom/crashlytics/android/core/at;->ue: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;->uc:Lcom/crashlytics/android/core/d;
+    sget-object v0, Lcom/crashlytics/android/core/at;->ud: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;->uc:Lcom/crashlytics/android/core/d;
+    sget-object v1, Lcom/crashlytics/android/core/at;->ud: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 46200f50b8..c11a9ab3cf 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 tq:[Ljava/io/File;
+.field private final tr:[Ljava/io/File;
 
-.field private final tr:Ljava/util/Map;
+.field private final ts:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -20,7 +20,7 @@
     .end annotation
 .end field
 
-.field private final ue:Ljava/io/File;
+.field private final uf: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;->ue:Ljava/io/File;
+    iput-object p1, p0, Lcom/crashlytics/android/core/au;->uf: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;->tq:[Ljava/io/File;
+    iput-object v0, p0, Lcom/crashlytics/android/core/au;->tr:[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;->tr:Ljava/util/Map;
+    iput-object p1, p0, Lcom/crashlytics/android/core/au;->ts:Ljava/util/Map;
 
-    iget-object p1, p0, Lcom/crashlytics/android/core/au;->ue:Ljava/io/File;
+    iget-object p1, p0, Lcom/crashlytics/android/core/au;->uf: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;->tr:Ljava/util/Map;
+    iget-object p1, p0, Lcom/crashlytics/android/core/au;->ts:Ljava/util/Map;
 
-    sget-object p2, Lcom/crashlytics/android/core/ar;->tT:Ljava/util/Map;
+    sget-object p2, Lcom/crashlytics/android/core/ar;->tU: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;->ue:Ljava/io/File;
+    iget-object v0, p0, Lcom/crashlytics/android/core/au;->uf: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;->tq:[Ljava/io/File;
+    iget-object v0, p0, Lcom/crashlytics/android/core/au;->tr:[Ljava/io/File;
 
     return-object v0
 .end method
@@ -121,7 +121,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/au;->tr:Ljava/util/Map;
+    iget-object v0, p0, Lcom/crashlytics/android/core/au;->ts: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;->tQ:I
+    sget v0, Lcom/crashlytics/android/core/aq$a;->tR: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;->ue:Ljava/io/File;
+    iget-object v0, p0, Lcom/crashlytics/android/core/au;->uf: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;->ue:Ljava/io/File;
+    iget-object v0, p0, Lcom/crashlytics/android/core/au;->uf: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->ue:Ljava/io/File;
+    iget-object v2, p0, Lcom/crashlytics/android/core/au;->uf: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;->ue:Ljava/io/File;
+    iget-object v0, p0, Lcom/crashlytics/android/core/au;->uf: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 497b4a1aa4..3b566632d9 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 uf:Ljava/lang/String;
+.field public final ug:Ljava/lang/String;
 
-.field public final ug:[Ljava/lang/StackTraceElement;
+.field public final uh:[Ljava/lang/StackTraceElement;
 
-.field public final uh:Lcom/crashlytics/android/core/ax;
+.field public final ui:Lcom/crashlytics/android/core/ax;
 
 
 # direct methods
@@ -23,7 +23,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/crashlytics/android/core/ax;->uf:Ljava/lang/String;
+    iput-object v0, p0, Lcom/crashlytics/android/core/ax;->ug: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;->ug:[Ljava/lang/StackTraceElement;
+    iput-object v0, p0, Lcom/crashlytics/android/core/ax;->uh:[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;->uh:Lcom/crashlytics/android/core/ax;
+    iput-object v0, p0, Lcom/crashlytics/android/core/ax;->ui: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 40477985a3..575f8b4b56 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 ui:Lcom/crashlytics/android/core/az;
+.field public static final uj: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;->ui:Lcom/crashlytics/android/core/az;
+    sput-object v0, Lcom/crashlytics/android/core/az;->uj: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 7ef1a9efaa..4c28d5c2ad 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 uj:Ljava/io/FilenameFilter;
+.field private static final uk: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;->uj:Ljava/io/FilenameFilter;
+    sput-object v0, Lcom/crashlytics/android/core/ba;->uk:Ljava/io/FilenameFilter;
 
     return-void
 .end method
@@ -33,7 +33,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/crashlytics/android/core/ba;->uj:Ljava/io/FilenameFilter;
+    sget-object v0, Lcom/crashlytics/android/core/ba;->uk: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 7aed8c59a4..83ce34a9bc 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 uk:I = 0xb
+.field static final ul:I = 0xb
 
-.field static final ul:I = 0xc
+.field static final um:I = 0xc
 
-.field static final um:I = 0x10
+.field static final un:I = 0x10
 
-.field static final un:I = 0x1a
+.field static final uo: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 6b0c56bdc1..b298c14cc2 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 re:Lcom/crashlytics/android/core/c$a;
+.field private final rf: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;->re:Lcom/crashlytics/android/core/c$a;
+    iput-object p2, p0, Lcom/crashlytics/android/core/c;->rf: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;->tH:Ljava/lang/String;
+    iget-object v2, p1, Lcom/crashlytics/android/core/am;->tI: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;->re:Lcom/crashlytics/android/core/c$a;
+    iget-object v2, p0, Lcom/crashlytics/android/core/c;->rf: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;->tG:J
+    iget-wide v5, p1, Lcom/crashlytics/android/core/am;->tH: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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 71a18ccc57..bf32b2658e 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 rg:Lcom/crashlytics/android/core/d;
+.field public static final rh:Lcom/crashlytics/android/core/d;
 
 
 # instance fields
-.field final rf:[B
+.field final rg:[B
 
-.field private volatile rh:I
+.field private volatile ri: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;->rg:Lcom/crashlytics/android/core/d;
+    sput-object v0, Lcom/crashlytics/android/core/d;->rh: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;->rh:I
+    iput v0, p0, Lcom/crashlytics/android/core/d;->ri:I
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/d;->rf:[B
+    iput-object p1, p0, Lcom/crashlytics/android/core/d;->rg:[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;->rf:[B
+    iget-object v0, p0, Lcom/crashlytics/android/core/d;->rg:[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;->rf:[B
+    iget-object v1, p0, Lcom/crashlytics/android/core/d;->rg:[B
 
     array-length v3, v1
 
-    iget-object p1, p1, Lcom/crashlytics/android/core/d;->rf:[B
+    iget-object p1, p1, Lcom/crashlytics/android/core/d;->rg:[B
 
     array-length v4, p1
 
@@ -161,11 +161,11 @@
 .method public final hashCode()I
     .locals 5
 
-    iget v0, p0, Lcom/crashlytics/android/core/d;->rh:I
+    iget v0, p0, Lcom/crashlytics/android/core/d;->ri:I
 
     if-nez v0, :cond_2
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/d;->rf:[B
+    iget-object v0, p0, Lcom/crashlytics/android/core/d;->rg:[B
 
     array-length v1, v0
 
@@ -197,7 +197,7 @@
     move v0, v3
 
     :goto_1
-    iput v0, p0, Lcom/crashlytics/android/core/d;->rh:I
+    iput v0, p0, Lcom/crashlytics/android/core/d;->ri: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 ec2d7330d4..f364ef65dd 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 ri:Ljava/util/concurrent/atomic/AtomicLong;
+.field private static final rj:Ljava/util/concurrent/atomic/AtomicLong;
 
-.field private static rj:Ljava/lang/String;
+.field private static rk: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;->ri:Ljava/util/concurrent/atomic/AtomicLong;
+    sput-object v0, Lcom/crashlytics/android/core/e;->rj: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;->ri:Ljava/util/concurrent/atomic/AtomicLong;
+    sget-object v1, Lcom/crashlytics/android/core/e;->rj: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;->Cb()Ljava/lang/String;
+    invoke-virtual {p1}, Lio/fabric/sdk/android/a/b/s;->BZ()Ljava/lang/String;
 
     move-result-object p1
 
@@ -215,7 +215,7 @@
 
     move-result-object p1
 
-    sput-object p1, Lcom/crashlytics/android/core/e;->rj:Ljava/lang/String;
+    sput-object p1, Lcom/crashlytics/android/core/e;->rk: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;->rj:Ljava/lang/String;
+    sget-object v0, Lcom/crashlytics/android/core/e;->rk: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 337b12d548..39a7e1ef02 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 rn:Ljava/io/FilenameFilter;
+.field public static final ro:Ljava/io/FilenameFilter;
 
 
 # instance fields
-.field private final rk:Ljava/lang/String;
-
-.field private rl:Ljava/io/File;
+.field private final rl:Ljava/lang/String;
 
 .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;->rn:Ljava/io/FilenameFilter;
+    sput-object v0, Lcom/crashlytics/android/core/f;->ro:Ljava/io/FilenameFilter;
 
     return-void
 .end method
@@ -78,7 +78,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/f;->rk:Ljava/lang/String;
+    iput-object p1, p0, Lcom/crashlytics/android/core/f;->rl: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;->rk:Ljava/lang/String;
+    iget-object v0, p0, Lcom/crashlytics/android/core/f;->rl: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;->rl:Ljava/io/File;
+    iput-object p1, p0, Lcom/crashlytics/android/core/f;->rm: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;->rk:Ljava/lang/String;
+    iget-object v2, p0, Lcom/crashlytics/android/core/f;->rl: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;->rl:Ljava/io/File;
+    iget-object v1, p0, Lcom/crashlytics/android/core/f;->rm: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;->rl:Ljava/io/File;
+    iput-object v1, p0, Lcom/crashlytics/android/core/f;->rm:Ljava/io/File;
 
-    iput-object v0, p0, Lcom/crashlytics/android/core/f;->rm:Ljava/io/File;
+    iput-object v0, p0, Lcom/crashlytics/android/core/f;->rn: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;->rl:Ljava/io/File;
+    iget-object v2, p0, Lcom/crashlytics/android/core/f;->rm: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;->rl:Ljava/io/File;
+    iget-object v4, p0, Lcom/crashlytics/android/core/f;->rm: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 60abe8738c..76c1d992c7 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 ro:Ljava/io/OutputStream;
+.field final rp: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;->ro:Ljava/io/OutputStream;
+    iput-object p1, p0, Lcom/crashlytics/android/core/g;->rp: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;->rf:[B
+    iget-object v0, p1, Lcom/crashlytics/android/core/d;->rg:[B
 
     array-length v0, v0
 
@@ -208,7 +208,7 @@
 
     move-result v0
 
-    iget-object p1, p1, Lcom/crashlytics/android/core/d;->rf:[B
+    iget-object p1, p1, Lcom/crashlytics/android/core/d;->rg:[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;->rf:[B
+    iget-object p1, p2, Lcom/crashlytics/android/core/d;->rg:[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;->rf:[B
+    iget-object p1, p2, Lcom/crashlytics/android/core/d;->rg:[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;->rf:[B
+    iget-object p2, p2, Lcom/crashlytics/android/core/d;->rg:[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;->ro:Ljava/io/OutputStream;
+    iget-object p2, p0, Lcom/crashlytics/android/core/g;->rp: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;->ro:Ljava/io/OutputStream;
+    iget-object v0, p0, Lcom/crashlytics/android/core/g;->rp:Ljava/io/OutputStream;
 
     if-eqz v0, :cond_0
 
@@ -741,7 +741,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/g;->ro:Ljava/io/OutputStream;
+    iget-object v0, p0, Lcom/crashlytics/android/core/g;->rp: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 99405167d2..5c499103b4 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 rr:[I
+.field static final synthetic rs:[I
 
 
 # direct methods
@@ -30,14 +30,14 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/crashlytics/android/core/h$1;->rr:[I
+    sput-object v0, Lcom/crashlytics/android/core/h$1;->rs:[I
 
     const/4 v0, 0x1
 
     :try_start_0
-    sget-object v1, Lcom/crashlytics/android/core/h$1;->rr:[I
+    sget-object v1, Lcom/crashlytics/android/core/h$1;->rs:[I
 
-    sget v2, Lcom/crashlytics/android/core/aq$a;->tQ:I
+    sget v2, Lcom/crashlytics/android/core/aq$a;->tR:I
 
     sub-int/2addr v2, v0
 
@@ -47,9 +47,9 @@
 
     :catch_0
     :try_start_1
-    sget-object v1, Lcom/crashlytics/android/core/h$1;->rr:[I
+    sget-object v1, Lcom/crashlytics/android/core/h$1;->rs:[I
 
-    sget v2, Lcom/crashlytics/android/core/aq$a;->tR:I
+    sget v2, Lcom/crashlytics/android/core/aq$a;->tS: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 c46b7e6ed2..a1e554c1cd 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 rp:Lcom/crashlytics/android/core/x;
+.field private final rq:Lcom/crashlytics/android/core/x;
 
-.field private final rq:Lcom/crashlytics/android/core/ah;
+.field private final rr: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;->rp:Lcom/crashlytics/android/core/x;
+    iput-object p1, p0, Lcom/crashlytics/android/core/h;->rq:Lcom/crashlytics/android/core/x;
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/h;->rq:Lcom/crashlytics/android/core/ah;
+    iput-object p2, p0, Lcom/crashlytics/android/core/h;->rr: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;->rr:[I
+    sget-object v0, Lcom/crashlytics/android/core/h$1;->rs:[I
 
-    iget-object v1, p1, Lcom/crashlytics/android/core/u;->sJ:Lcom/crashlytics/android/core/aq;
+    iget-object v1, p1, Lcom/crashlytics/android/core/u;->sK: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;->rq:Lcom/crashlytics/android/core/ah;
+    iget-object v0, p0, Lcom/crashlytics/android/core/h;->rr: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;->rp:Lcom/crashlytics/android/core/x;
+    iget-object v0, p0, Lcom/crashlytics/android/core/h;->rq: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 1f72113382..64a84af8e7 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 ru:Lcom/crashlytics/android/core/i$b;
+.field final synthetic rv: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;->ru:Lcom/crashlytics/android/core/i$b;
+    iput-object p1, p0, Lcom/crashlytics/android/core/i$1;->rv: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;->ru:Lcom/crashlytics/android/core/i$b;
+    iget-object p2, p0, Lcom/crashlytics/android/core/i$1;->rv: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 4c1c5387ab..a26ac1442f 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 ru:Lcom/crashlytics/android/core/i$b;
+.field final synthetic rv: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;->ru:Lcom/crashlytics/android/core/i$b;
+    iput-object p1, p0, Lcom/crashlytics/android/core/i$2;->rv: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;->ru:Lcom/crashlytics/android/core/i$b;
+    iget-object p2, p0, Lcom/crashlytics/android/core/i$2;->rv: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 5d236eb28c..fd5b669b3f 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 ru:Lcom/crashlytics/android/core/i$b;
+.field final synthetic rv:Lcom/crashlytics/android/core/i$b;
 
-.field final synthetic rv:Lcom/crashlytics/android/core/i$a;
+.field final synthetic rw: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;->rv:Lcom/crashlytics/android/core/i$a;
+    iput-object p1, p0, Lcom/crashlytics/android/core/i$3;->rw:Lcom/crashlytics/android/core/i$a;
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/i$3;->ru:Lcom/crashlytics/android/core/i$b;
+    iput-object p2, p0, Lcom/crashlytics/android/core/i$3;->rv: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;->rv:Lcom/crashlytics/android/core/i$a;
+    iget-object p2, p0, Lcom/crashlytics/android/core/i$3;->rw: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;->ru:Lcom/crashlytics/android/core/i$b;
+    iget-object p2, p0, Lcom/crashlytics/android/core/i$3;->rv: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 2d603d73f3..88b469c51e 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 rw:Z
+.field rx:Z
 
-.field final rx:Ljava/util/concurrent/CountDownLatch;
+.field final ry:Ljava/util/concurrent/CountDownLatch;
 
 
 # direct methods
@@ -28,7 +28,7 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/crashlytics/android/core/i$b;->rw:Z
+    iput-boolean v0, p0, Lcom/crashlytics/android/core/i$b;->rx: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;->rx:Ljava/util/concurrent/CountDownLatch;
+    iput-object v0, p0, Lcom/crashlytics/android/core/i$b;->ry: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;->rw:Z
+    iput-boolean p1, p0, Lcom/crashlytics/android/core/i$b;->rx:Z
 
-    iget-object p1, p0, Lcom/crashlytics/android/core/i$b;->rx:Ljava/util/concurrent/CountDownLatch;
+    iget-object p1, p0, Lcom/crashlytics/android/core/i$b;->ry: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 05dd677dfa..d9d9ab904f 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 rs:Lcom/crashlytics/android/core/i$b;
+.field final rt:Lcom/crashlytics/android/core/i$b;
 
-.field final rt:Landroid/app/AlertDialog$Builder;
+.field final ru: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;->rs:Lcom/crashlytics/android/core/i$b;
+    iput-object p2, p0, Lcom/crashlytics/android/core/i;->rt:Lcom/crashlytics/android/core/i$b;
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/i;->rt:Landroid/app/AlertDialog$Builder;
+    iput-object p1, p0, Lcom/crashlytics/android/core/i;->ru: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 08cc48f00a..b69807d3e0 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 ry:Ljava/lang/Runnable;
+.field final synthetic rA:Lcom/crashlytics/android/core/j;
 
-.field final synthetic rz:Lcom/crashlytics/android/core/j;
+.field final synthetic rz:Ljava/lang/Runnable;
 
 
 # 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;->rz:Lcom/crashlytics/android/core/j;
+    iput-object p1, p0, Lcom/crashlytics/android/core/j$1;->rA:Lcom/crashlytics/android/core/j;
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/j$1;->ry:Ljava/lang/Runnable;
+    iput-object p2, p0, Lcom/crashlytics/android/core/j$1;->rz: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;->ry:Ljava/lang/Runnable;
+    iget-object v0, p0, Lcom/crashlytics/android/core/j$1;->rz: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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 c6fa7b0ed1..eab228b838 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 rz:Lcom/crashlytics/android/core/j;
+.field final synthetic rA: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;->rz:Lcom/crashlytics/android/core/j;
+    iput-object p1, p0, Lcom/crashlytics/android/core/j$2;->rA: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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 1ff41e388e..383d105bf6 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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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 de53e7c8f3..df43e5bc24 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;->sg:Ljava/lang/String;
+    iget-object p1, p1, Lcom/crashlytics/android/core/k$10;->sh: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;->sh:Ljava/lang/String;
+    iget-object p1, p1, Lcom/crashlytics/android/core/k$10;->si: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;->si:J
+    iget-wide v0, p1, Lcom/crashlytics/android/core/k$10;->sj: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 0469b42d4a..1ee39fd80e 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 sa:Lcom/crashlytics/android/core/k;
-
-.field final synthetic sg:Ljava/lang/String;
+.field final synthetic sc:Lcom/crashlytics/android/core/k;
 
 .field final synthetic sh:Ljava/lang/String;
 
-.field final synthetic si:J
+.field final synthetic si:Ljava/lang/String;
+
+.field final synthetic sj: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;->sa:Lcom/crashlytics/android/core/k;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k$10;->sc:Lcom/crashlytics/android/core/k;
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/k$10;->sg:Ljava/lang/String;
+    iput-object p2, p0, Lcom/crashlytics/android/core/k$10;->sh:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/crashlytics/android/core/k$10;->sh:Ljava/lang/String;
+    iput-object p3, p0, Lcom/crashlytics/android/core/k$10;->si:Ljava/lang/String;
 
-    iput-wide p4, p0, Lcom/crashlytics/android/core/k$10;->si:J
+    iput-wide p4, p0, Lcom/crashlytics/android/core/k$10;->sj: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 f79f110388..5a864bce99 100644
--- a/com.discord/smali/com/crashlytics/android/core/k$11.smali
+++ b/com.discord/smali/com/crashlytics/android/core/k$11.smali
@@ -18,9 +18,7 @@
 
 
 # instance fields
-.field final synthetic sa:Lcom/crashlytics/android/core/k;
-
-.field final synthetic sj:Ljava/lang/String;
+.field final synthetic sc:Lcom/crashlytics/android/core/k;
 
 .field final synthetic sk:Ljava/lang/String;
 
@@ -28,24 +26,26 @@
 
 .field final synthetic sm:Ljava/lang/String;
 
-.field final synthetic sn:I
+.field final synthetic sn:Ljava/lang/String;
+
+.field final synthetic so: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;->sa:Lcom/crashlytics/android/core/k;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k$11;->sc:Lcom/crashlytics/android/core/k;
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/k$11;->sj:Ljava/lang/String;
+    iput-object p2, p0, Lcom/crashlytics/android/core/k$11;->sk:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/crashlytics/android/core/k$11;->sk:Ljava/lang/String;
+    iput-object p3, p0, Lcom/crashlytics/android/core/k$11;->sl:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/crashlytics/android/core/k$11;->sl:Ljava/lang/String;
+    iput-object p4, p0, Lcom/crashlytics/android/core/k$11;->sm:Ljava/lang/String;
 
-    iput-object p5, p0, Lcom/crashlytics/android/core/k$11;->sm:Ljava/lang/String;
+    iput-object p5, p0, Lcom/crashlytics/android/core/k$11;->sn:Ljava/lang/String;
 
-    iput p6, p0, Lcom/crashlytics/android/core/k$11;->sn:I
+    iput p6, p0, Lcom/crashlytics/android/core/k$11;->so: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;->sj:Ljava/lang/String;
+    iget-object v1, p0, Lcom/crashlytics/android/core/k$11;->sk:Ljava/lang/String;
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/k$11;->sa:Lcom/crashlytics/android/core/k;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k$11;->sc: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;->qv:Ljava/lang/String;
+    iget-object v2, v0, Lcom/crashlytics/android/core/a;->qw:Ljava/lang/String;
 
-    iget-object v3, p0, Lcom/crashlytics/android/core/k$11;->sk:Ljava/lang/String;
+    iget-object v3, p0, Lcom/crashlytics/android/core/k$11;->sl:Ljava/lang/String;
 
-    iget-object v4, p0, Lcom/crashlytics/android/core/k$11;->sl:Ljava/lang/String;
+    iget-object v4, p0, Lcom/crashlytics/android/core/k$11;->sm:Ljava/lang/String;
 
-    iget-object v5, p0, Lcom/crashlytics/android/core/k$11;->sm:Ljava/lang/String;
+    iget-object v5, p0, Lcom/crashlytics/android/core/k$11;->sn:Ljava/lang/String;
 
-    iget v6, p0, Lcom/crashlytics/android/core/k$11;->sn:I
+    iget v6, p0, Lcom/crashlytics/android/core/k$11;->so:I
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/k$11;->sa:Lcom/crashlytics/android/core/k;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k$11;->sc: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 2f7a65386e..2589e2af3f 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;->sj:Ljava/lang/String;
+    iget-object p1, p1, Lcom/crashlytics/android/core/k$13;->sk: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;->sa:Lcom/crashlytics/android/core/k;
+    iget-object p1, p1, Lcom/crashlytics/android/core/k$13;->sc: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;->qv:Ljava/lang/String;
+    iget-object p1, p1, Lcom/crashlytics/android/core/a;->qw: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;->sk:Ljava/lang/String;
+    iget-object p1, p1, Lcom/crashlytics/android/core/k$13;->sl: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;->sl:Ljava/lang/String;
+    iget-object p1, p1, Lcom/crashlytics/android/core/k$13;->sm: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;->sm:Ljava/lang/String;
+    iget-object p1, p1, Lcom/crashlytics/android/core/k$13;->sn: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;->sn:I
+    iget p1, p1, Lcom/crashlytics/android/core/k$13;->so: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;->sa:Lcom/crashlytics/android/core/k;
+    iget-object p1, p1, Lcom/crashlytics/android/core/k$13;->sc: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;->sa:Lcom/crashlytics/android/core/k;
+    iget-object p1, p1, Lcom/crashlytics/android/core/k$13;->sc: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 785acddeea..3c75f4c2ed 100644
--- a/com.discord/smali/com/crashlytics/android/core/k$13.smali
+++ b/com.discord/smali/com/crashlytics/android/core/k$13.smali
@@ -18,9 +18,7 @@
 
 
 # instance fields
-.field final synthetic sa:Lcom/crashlytics/android/core/k;
-
-.field final synthetic sj:Ljava/lang/String;
+.field final synthetic sc:Lcom/crashlytics/android/core/k;
 
 .field final synthetic sk:Ljava/lang/String;
 
@@ -28,24 +26,26 @@
 
 .field final synthetic sm:Ljava/lang/String;
 
-.field final synthetic sn:I
+.field final synthetic sn:Ljava/lang/String;
+
+.field final synthetic so: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;->sa:Lcom/crashlytics/android/core/k;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k$13;->sc:Lcom/crashlytics/android/core/k;
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/k$13;->sj:Ljava/lang/String;
+    iput-object p2, p0, Lcom/crashlytics/android/core/k$13;->sk:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/crashlytics/android/core/k$13;->sk:Ljava/lang/String;
+    iput-object p3, p0, Lcom/crashlytics/android/core/k$13;->sl:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/crashlytics/android/core/k$13;->sl:Ljava/lang/String;
+    iput-object p4, p0, Lcom/crashlytics/android/core/k$13;->sm:Ljava/lang/String;
 
-    iput-object p5, p0, Lcom/crashlytics/android/core/k$13;->sm:Ljava/lang/String;
+    iput-object p5, p0, Lcom/crashlytics/android/core/k$13;->sn:Ljava/lang/String;
 
-    iput p6, p0, Lcom/crashlytics/android/core/k$13;->sn:I
+    iput p6, p0, Lcom/crashlytics/android/core/k$13;->so: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 8bd86bc402..af0551d4c3 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 sa:Lcom/crashlytics/android/core/k;
+.field final synthetic sc:Lcom/crashlytics/android/core/k;
 
-.field final synthetic so:Z
+.field final synthetic sp: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;->sa:Lcom/crashlytics/android/core/k;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k$14;->sc:Lcom/crashlytics/android/core/k;
 
-    iput-boolean p2, p0, Lcom/crashlytics/android/core/k$14;->so:Z
+    iput-boolean p2, p0, Lcom/crashlytics/android/core/k$14;->sp: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;->so:Z
+    iget-boolean v2, p0, Lcom/crashlytics/android/core/k$14;->sp: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 f32b3a28c5..0f7de2fff9 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;->so:Z
+    iget-boolean p1, p1, Lcom/crashlytics/android/core/k$15;->sp: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 b7a1686b1f..a1752408bc 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 sa:Lcom/crashlytics/android/core/k;
+.field final synthetic sc:Lcom/crashlytics/android/core/k;
 
-.field final synthetic so:Z
+.field final synthetic sp: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;->sa:Lcom/crashlytics/android/core/k;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k$15;->sc:Lcom/crashlytics/android/core/k;
 
-    iput-boolean p2, p0, Lcom/crashlytics/android/core/k$15;->so:Z
+    iput-boolean p2, p0, Lcom/crashlytics/android/core/k$15;->sp: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 bcdf98ca8f..fc7d6efacc 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 sa:Lcom/crashlytics/android/core/k;
-
-.field final synthetic sp:I
+.field final synthetic sc:Lcom/crashlytics/android/core/k;
 
 .field final synthetic sq:I
 
-.field final synthetic sr:J
+.field final synthetic sr:I
 
 .field final synthetic ss:J
 
-.field final synthetic st:Z
+.field final synthetic st:J
 
-.field final synthetic su:Ljava/util/Map;
+.field final synthetic su:Z
 
-.field final synthetic sv:I
+.field final synthetic sv:Ljava/util/Map;
+
+.field final synthetic sw: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;->sa:Lcom/crashlytics/android/core/k;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k$16;->sc:Lcom/crashlytics/android/core/k;
 
-    iput p2, p0, Lcom/crashlytics/android/core/k$16;->sp:I
+    iput p2, p0, Lcom/crashlytics/android/core/k$16;->sq:I
 
-    iput p3, p0, Lcom/crashlytics/android/core/k$16;->sq:I
+    iput p3, p0, Lcom/crashlytics/android/core/k$16;->sr:I
 
-    iput-wide p4, p0, Lcom/crashlytics/android/core/k$16;->sr:J
+    iput-wide p4, p0, Lcom/crashlytics/android/core/k$16;->ss:J
 
-    iput-wide p6, p0, Lcom/crashlytics/android/core/k$16;->ss:J
+    iput-wide p6, p0, Lcom/crashlytics/android/core/k$16;->st:J
 
-    iput-boolean p8, p0, Lcom/crashlytics/android/core/k$16;->st:Z
+    iput-boolean p8, p0, Lcom/crashlytics/android/core/k$16;->su:Z
 
-    iput-object p9, p0, Lcom/crashlytics/android/core/k$16;->su:Ljava/util/Map;
+    iput-object p9, p0, Lcom/crashlytics/android/core/k$16;->sv:Ljava/util/Map;
 
-    iput p10, p0, Lcom/crashlytics/android/core/k$16;->sv:I
+    iput p10, p0, Lcom/crashlytics/android/core/k$16;->sw:I
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -70,21 +70,21 @@
         }
     .end annotation
 
-    iget v1, p0, Lcom/crashlytics/android/core/k$16;->sp:I
+    iget v1, p0, Lcom/crashlytics/android/core/k$16;->sq:I
 
     sget-object v2, Landroid/os/Build;->MODEL:Ljava/lang/String;
 
-    iget v3, p0, Lcom/crashlytics/android/core/k$16;->sq:I
+    iget v3, p0, Lcom/crashlytics/android/core/k$16;->sr:I
 
-    iget-wide v4, p0, Lcom/crashlytics/android/core/k$16;->sr:J
+    iget-wide v4, p0, Lcom/crashlytics/android/core/k$16;->ss:J
 
-    iget-wide v6, p0, Lcom/crashlytics/android/core/k$16;->ss:J
+    iget-wide v6, p0, Lcom/crashlytics/android/core/k$16;->st:J
 
-    iget-boolean v8, p0, Lcom/crashlytics/android/core/k$16;->st:Z
+    iget-boolean v8, p0, Lcom/crashlytics/android/core/k$16;->su:Z
 
-    iget-object v9, p0, Lcom/crashlytics/android/core/k$16;->su:Ljava/util/Map;
+    iget-object v9, p0, Lcom/crashlytics/android/core/k$16;->sv:Ljava/util/Map;
 
-    iget v10, p0, Lcom/crashlytics/android/core/k$16;->sv:I
+    iget v10, p0, Lcom/crashlytics/android/core/k$16;->sw: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 8deb9077bb..dcd424a16f 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;->sp:I
+    iget p1, p1, Lcom/crashlytics/android/core/k$17;->sq: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;->sq:I
+    iget p1, p1, Lcom/crashlytics/android/core/k$17;->sr: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;->sr: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;
 
@@ -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;->ss:J
+    iget-wide v0, p1, Lcom/crashlytics/android/core/k$17;->st: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;->st:Z
+    iget-boolean p1, p1, Lcom/crashlytics/android/core/k$17;->su: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;->su:Ljava/util/Map;
+    iget-object p1, p1, Lcom/crashlytics/android/core/k$17;->sv: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;->sv:I
+    iget p1, p1, Lcom/crashlytics/android/core/k$17;->sw: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 593383b0f0..ca7d069754 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 sa:Lcom/crashlytics/android/core/k;
-
-.field final synthetic sp:I
+.field final synthetic sc:Lcom/crashlytics/android/core/k;
 
 .field final synthetic sq:I
 
-.field final synthetic sr:J
+.field final synthetic sr:I
 
 .field final synthetic ss:J
 
-.field final synthetic st:Z
+.field final synthetic st:J
 
-.field final synthetic su:Ljava/util/Map;
+.field final synthetic su:Z
 
-.field final synthetic sv:I
+.field final synthetic sv:Ljava/util/Map;
+
+.field final synthetic sw: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;->sa:Lcom/crashlytics/android/core/k;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k$17;->sc:Lcom/crashlytics/android/core/k;
 
-    iput p2, p0, Lcom/crashlytics/android/core/k$17;->sp:I
+    iput p2, p0, Lcom/crashlytics/android/core/k$17;->sq:I
 
-    iput p3, p0, Lcom/crashlytics/android/core/k$17;->sq:I
+    iput p3, p0, Lcom/crashlytics/android/core/k$17;->sr:I
 
-    iput-wide p4, p0, Lcom/crashlytics/android/core/k$17;->sr:J
+    iput-wide p4, p0, Lcom/crashlytics/android/core/k$17;->ss:J
 
-    iput-wide p6, p0, Lcom/crashlytics/android/core/k$17;->ss:J
+    iput-wide p6, p0, Lcom/crashlytics/android/core/k$17;->st:J
 
-    iput-boolean p8, p0, Lcom/crashlytics/android/core/k$17;->st:Z
+    iput-boolean p8, p0, Lcom/crashlytics/android/core/k$17;->su:Z
 
-    iput-object p9, p0, Lcom/crashlytics/android/core/k$17;->su:Ljava/util/Map;
+    iput-object p9, p0, Lcom/crashlytics/android/core/k$17;->sv:Ljava/util/Map;
 
-    iput p10, p0, Lcom/crashlytics/android/core/k$17;->sv:I
+    iput p10, p0, Lcom/crashlytics/android/core/k$17;->sw: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 d0e7e7745f..ec078f03b5 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 sa:Lcom/crashlytics/android/core/k;
+.field final synthetic sc:Lcom/crashlytics/android/core/k;
 
-.field final synthetic sw:Lcom/crashlytics/android/core/az;
+.field final synthetic sx: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;->sa:Lcom/crashlytics/android/core/k;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k$18;->sc:Lcom/crashlytics/android/core/k;
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/k$18;->sw:Lcom/crashlytics/android/core/az;
+    iput-object p2, p0, Lcom/crashlytics/android/core/k$18;->sx: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;->sw:Lcom/crashlytics/android/core/az;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k$18;->sx: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;->sw:Lcom/crashlytics/android/core/az;
+    iget-object v1, p0, Lcom/crashlytics/android/core/k$18;->sx: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;->sw:Lcom/crashlytics/android/core/az;
+    iget-object v2, p0, Lcom/crashlytics/android/core/k$18;->sx: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 a75f2dcf81..7fa3298a80 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:Lcom/crashlytics/android/core/k;
+.field final synthetic sa:Ljava/lang/String;
+
+.field final synthetic sc: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;->sa:Lcom/crashlytics/android/core/k;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k$2;->sc:Lcom/crashlytics/android/core/k;
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/k$2;->rX:Ljava/lang/String;
+    iput-object p2, p0, Lcom/crashlytics/android/core/k$2;->rY:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/crashlytics/android/core/k$2;->rY:Ljava/lang/String;
+    iput-object p3, p0, Lcom/crashlytics/android/core/k$2;->rZ:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/crashlytics/android/core/k$2;->rZ:Ljava/lang/String;
+    iput-object p4, p0, Lcom/crashlytics/android/core/k$2;->sa: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;->sa:Lcom/crashlytics/android/core/k;
+    iget-object v1, p0, Lcom/crashlytics/android/core/k$2;->sc: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;->sa:Lcom/crashlytics/android/core/k;
+    iget-object v3, p0, Lcom/crashlytics/android/core/k$2;->sc: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;->rX:Ljava/lang/String;
+    iget-object v4, p0, Lcom/crashlytics/android/core/k$2;->rY:Ljava/lang/String;
 
-    iget-object v5, p0, Lcom/crashlytics/android/core/k$2;->rY:Ljava/lang/String;
+    iget-object v5, p0, Lcom/crashlytics/android/core/k$2;->rZ:Ljava/lang/String;
 
-    iget-object v6, p0, Lcom/crashlytics/android/core/k$2;->rZ:Ljava/lang/String;
+    iget-object v6, p0, Lcom/crashlytics/android/core/k$2;->sa: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;->tw:Ljava/nio/charset/Charset;
+    sget-object v1, Lcom/crashlytics/android/core/ae;->tx: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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 4553c7c151..3da0449c24 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 sa:Lcom/crashlytics/android/core/k;
+.field final synthetic sc: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;->sa:Lcom/crashlytics/android/core/k;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k$22;->sc: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;->sa:Lcom/crashlytics/android/core/k;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k$22;->sc: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 96b0ec4a5f..7cb98c03b1 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:Z
+.field final synthetic sA:Lcom/crashlytics/android/core/t$b;
 
-.field final synthetic sa:Lcom/crashlytics/android/core/k;
+.field final synthetic sB:Z
 
-.field final synthetic sx:Ljava/util/Date;
+.field final synthetic sc:Lcom/crashlytics/android/core/k;
 
-.field final synthetic sy:Ljava/lang/Throwable;
+.field final synthetic sy:Ljava/util/Date;
 
-.field final synthetic sz:Lcom/crashlytics/android/core/t$b;
+.field final synthetic sz:Ljava/lang/Throwable;
 
 .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;->sa:Lcom/crashlytics/android/core/k;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k$23;->sc:Lcom/crashlytics/android/core/k;
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/k$23;->sx:Ljava/util/Date;
+    iput-object p2, p0, Lcom/crashlytics/android/core/k$23;->sy: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;->sy:Ljava/lang/Throwable;
+    iput-object p4, p0, Lcom/crashlytics/android/core/k$23;->sz:Ljava/lang/Throwable;
 
-    iput-object p5, p0, Lcom/crashlytics/android/core/k$23;->sz:Lcom/crashlytics/android/core/t$b;
+    iput-object p5, p0, Lcom/crashlytics/android/core/k$23;->sA:Lcom/crashlytics/android/core/t$b;
 
-    iput-boolean p6, p0, Lcom/crashlytics/android/core/k$23;->sA:Z
+    iput-boolean p6, p0, Lcom/crashlytics/android/core/k$23;->sB: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;->sa:Lcom/crashlytics/android/core/k;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k$23;->sc: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;->sO:Lcom/crashlytics/android/core/m;
+    iget-object v0, v0, Lcom/crashlytics/android/core/l;->sP: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;->sa:Lcom/crashlytics/android/core/k;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k$23;->sc:Lcom/crashlytics/android/core/k;
 
-    iget-object v1, p0, Lcom/crashlytics/android/core/k$23;->sx:Ljava/util/Date;
+    iget-object v1, p0, Lcom/crashlytics/android/core/k$23;->sy: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;->sy:Ljava/lang/Throwable;
+    iget-object v3, p0, Lcom/crashlytics/android/core/k$23;->sz: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;->sz:Lcom/crashlytics/android/core/t$b;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k$23;->sA: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;->bga:Lio/fabric/sdk/android/a/g/p;
+    iget-object v2, v0, Lio/fabric/sdk/android/a/g/t;->bfV:Lio/fabric/sdk/android/a/g/p;
 
-    iget-object v3, v0, Lio/fabric/sdk/android/a/g/t;->bgb:Lio/fabric/sdk/android/a/g/m;
+    iget-object v3, v0, Lio/fabric/sdk/android/a/g/t;->bfW: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;->bfD:Z
+    iget-boolean v3, v3, Lio/fabric/sdk/android/a/g/m;->bfy: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;->sA:Z
+    iget-boolean v3, p0, Lcom/crashlytics/android/core/k$23;->sB:Z
 
     if-eqz v3, :cond_4
 
     :cond_3
-    iget-object v3, p0, Lcom/crashlytics/android/core/k$23;->sa:Lcom/crashlytics/android/core/k;
+    iget-object v3, p0, Lcom/crashlytics/android/core/k$23;->sc:Lcom/crashlytics/android/core/k;
 
-    iget-object v6, p0, Lcom/crashlytics/android/core/k$23;->sx:Ljava/util/Date;
+    iget-object v6, p0, Lcom/crashlytics/android/core/k$23;->sy: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;->sa:Lcom/crashlytics/android/core/k;
+    iget-object v3, p0, Lcom/crashlytics/android/core/k$23;->sc: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;->sa:Lcom/crashlytics/android/core/k;
+    iget-object v3, p0, Lcom/crashlytics/android/core/k$23;->sc: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;->sa:Lcom/crashlytics/android/core/k;
+    iget-object v3, p0, Lcom/crashlytics/android/core/k$23;->sc:Lcom/crashlytics/android/core/k;
 
-    iget v2, v2, Lio/fabric/sdk/android/a/g/p;->bfQ:I
+    iget v2, v2, Lio/fabric/sdk/android/a/g/p;->bfL: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;->rE:Ljava/util/Comparator;
+    sget-object v7, Lcom/crashlytics/android/core/k;->rF: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;->rE:Ljava/util/Comparator;
+    sget-object v7, Lcom/crashlytics/android/core/k;->rF: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;->rB:Ljava/io/FilenameFilter;
+    sget-object v6, Lcom/crashlytics/android/core/k;->rC:Ljava/io/FilenameFilter;
 
-    sget-object v7, Lcom/crashlytics/android/core/k;->rE:Ljava/util/Comparator;
+    sget-object v7, Lcom/crashlytics/android/core/k;->rF: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;->sa:Lcom/crashlytics/android/core/k;
+    iget-object v2, p0, Lcom/crashlytics/android/core/k$23;->sc: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;->Ca()Z
+    invoke-virtual {v2}, Lio/fabric/sdk/android/a/b/l;->BY()Z
 
     move-result v2
 
     if-eqz v2, :cond_6
 
-    iget-object v2, p0, Lcom/crashlytics/android/core/k$23;->sa:Lcom/crashlytics/android/core/k;
+    iget-object v2, p0, Lcom/crashlytics/android/core/k$23;->sc: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;->sa:Lcom/crashlytics/android/core/k;
+    iget-object v2, p0, Lcom/crashlytics/android/core/k$23;->sc: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 e87a10b992..21d41285bf 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 sB:J
+.field final synthetic sC:J
 
-.field final synthetic sC:Ljava/lang/String;
+.field final synthetic sD:Ljava/lang/String;
 
-.field final synthetic sa:Lcom/crashlytics/android/core/k;
+.field final synthetic sc: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;->sa:Lcom/crashlytics/android/core/k;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k$24;->sc:Lcom/crashlytics/android/core/k;
 
-    iput-wide p2, p0, Lcom/crashlytics/android/core/k$24;->sB:J
+    iput-wide p2, p0, Lcom/crashlytics/android/core/k$24;->sC:J
 
-    iput-object p4, p0, Lcom/crashlytics/android/core/k$24;->sC:Ljava/lang/String;
+    iput-object p4, p0, Lcom/crashlytics/android/core/k$24;->sD: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;->sa:Lcom/crashlytics/android/core/k;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k$24;->sc: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;->sa:Lcom/crashlytics/android/core/k;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k$24;->sc: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;->sB:J
+    iget-wide v1, p0, Lcom/crashlytics/android/core/k$24;->sC:J
 
-    iget-object v3, p0, Lcom/crashlytics/android/core/k$24;->sC:Ljava/lang/String;
+    iget-object v3, p0, Lcom/crashlytics/android/core/k$24;->sD:Ljava/lang/String;
 
-    iget-object v0, v0, Lcom/crashlytics/android/core/ac;->tv:Lcom/crashlytics/android/core/aa;
+    iget-object v0, v0, Lcom/crashlytics/android/core/ac;->tw: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 c5c896aaf8..d362244c00 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 sD:Ljava/util/Date;
+.field final synthetic sE:Ljava/util/Date;
 
-.field final synthetic sa:Lcom/crashlytics/android/core/k;
+.field final synthetic sc:Lcom/crashlytics/android/core/k;
 
-.field final synthetic sy:Ljava/lang/Throwable;
+.field final synthetic sz: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;->sa:Lcom/crashlytics/android/core/k;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k$25;->sc:Lcom/crashlytics/android/core/k;
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/k$25;->sD:Ljava/util/Date;
+    iput-object p2, p0, Lcom/crashlytics/android/core/k$25;->sE: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;->sy:Ljava/lang/Throwable;
+    iput-object p4, p0, Lcom/crashlytics/android/core/k$25;->sz: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;->sa:Lcom/crashlytics/android/core/k;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k$25;->sc: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;->sa:Lcom/crashlytics/android/core/k;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k$25;->sc:Lcom/crashlytics/android/core/k;
 
-    iget-object v1, p0, Lcom/crashlytics/android/core/k$25;->sD:Ljava/util/Date;
+    iget-object v1, p0, Lcom/crashlytics/android/core/k$25;->sE: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;->sy:Ljava/lang/Throwable;
+    iget-object v3, p0, Lcom/crashlytics/android/core/k$25;->sz: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 4f38b97222..a40bed4187 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 sa:Lcom/crashlytics/android/core/k;
+.field final synthetic sc:Lcom/crashlytics/android/core/k;
 
-.field final synthetic sc:Ljava/util/Map;
+.field final synthetic sd: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;->sa:Lcom/crashlytics/android/core/k;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k$3;->sc:Lcom/crashlytics/android/core/k;
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/k$3;->sc:Ljava/util/Map;
+    iput-object p2, p0, Lcom/crashlytics/android/core/k$3;->sd: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;->sa:Lcom/crashlytics/android/core/k;
+    iget-object v1, p0, Lcom/crashlytics/android/core/k$3;->sc: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;->sa:Lcom/crashlytics/android/core/k;
+    iget-object v3, p0, Lcom/crashlytics/android/core/k$3;->sc: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;->sc:Ljava/util/Map;
+    iget-object v3, p0, Lcom/crashlytics/android/core/k$3;->sd: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;->tw:Ljava/nio/charset/Charset;
+    sget-object v1, Lcom/crashlytics/android/core/ae;->tx: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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 f1e892154f..e1093f0d03 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 sa:Lcom/crashlytics/android/core/k;
+.field final synthetic sc: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;->sa:Lcom/crashlytics/android/core/k;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k$4;->sc: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;->sa:Lcom/crashlytics/android/core/k;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k$4;->sc: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 0ef726b89c..73a564ab12 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 sa:Lcom/crashlytics/android/core/k;
+.field final synthetic sc:Lcom/crashlytics/android/core/k;
 
-.field final synthetic sd:Lio/fabric/sdk/android/a/g/p;
+.field final synthetic se: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;->sa:Lcom/crashlytics/android/core/k;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k$5;->sc:Lcom/crashlytics/android/core/k;
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/k$5;->sd:Lio/fabric/sdk/android/a/g/p;
+    iput-object p2, p0, Lcom/crashlytics/android/core/k$5;->se: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;->sa:Lcom/crashlytics/android/core/k;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k$5;->sc: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->sa:Lcom/crashlytics/android/core/k;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k$5;->sc:Lcom/crashlytics/android/core/k;
 
-    iget-object v2, p0, Lcom/crashlytics/android/core/k$5;->sd:Lio/fabric/sdk/android/a/g/p;
+    iget-object v2, p0, Lcom/crashlytics/android/core/k$5;->se: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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 b233545700..e1f0879469 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 sa:Lcom/crashlytics/android/core/k;
+.field final synthetic sc: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;->sa:Lcom/crashlytics/android/core/k;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k$6;->sc: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;->sa:Lcom/crashlytics/android/core/k;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k$6;->sc: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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 2995fc2228..38622f3a65 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 sa:Lcom/crashlytics/android/core/k;
+.field final synthetic sc:Lcom/crashlytics/android/core/k;
 
-.field final synthetic se:Ljava/util/Set;
+.field final synthetic sf: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;->sa:Lcom/crashlytics/android/core/k;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k$7;->sc:Lcom/crashlytics/android/core/k;
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/k$7;->se:Ljava/util/Set;
+    iput-object p2, p0, Lcom/crashlytics/android/core/k$7;->sf: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;->se:Ljava/util/Set;
+    iget-object p1, p0, Lcom/crashlytics/android/core/k$7;->sf: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 f9b32c14f8..d66ee13b23 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 sa:Lcom/crashlytics/android/core/k;
+.field final synthetic sc:Lcom/crashlytics/android/core/k;
 
-.field final synthetic sf:Lcom/crashlytics/android/core/p;
+.field final synthetic sg: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;->sa:Lcom/crashlytics/android/core/k;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k$8;->sc:Lcom/crashlytics/android/core/k;
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/k$8;->sf:Lcom/crashlytics/android/core/p;
+    iput-object p2, p0, Lcom/crashlytics/android/core/k$8;->sg: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;->sf:Lcom/crashlytics/android/core/p;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k$8;->sg:Lcom/crashlytics/android/core/p;
 
-    iget-object v0, v0, Lcom/crashlytics/android/core/p;->sZ:Ljava/util/TreeSet;
+    iget-object v0, v0, Lcom/crashlytics/android/core/p;->ta:Ljava/util/TreeSet;
 
-    iget-object v1, p0, Lcom/crashlytics/android/core/k$8;->sa:Lcom/crashlytics/android/core/k;
+    iget-object v1, p0, Lcom/crashlytics/android/core/k$8;->sc: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;->sa:Lcom/crashlytics/android/core/k;
+    iget-object v3, p0, Lcom/crashlytics/android/core/k$8;->sc: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;->sa:Lcom/crashlytics/android/core/k;
+    iget-object v1, p0, Lcom/crashlytics/android/core/k$8;->sc: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 dd3c517bf1..b304965904 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 sa:Lcom/crashlytics/android/core/k;
-
-.field final synthetic sg:Ljava/lang/String;
+.field final synthetic sc:Lcom/crashlytics/android/core/k;
 
 .field final synthetic sh:Ljava/lang/String;
 
-.field final synthetic si:J
+.field final synthetic si:Ljava/lang/String;
+
+.field final synthetic sj: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;->sa:Lcom/crashlytics/android/core/k;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k$9;->sc:Lcom/crashlytics/android/core/k;
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/k$9;->sg:Ljava/lang/String;
+    iput-object p2, p0, Lcom/crashlytics/android/core/k$9;->sh:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/crashlytics/android/core/k$9;->sh:Ljava/lang/String;
+    iput-object p3, p0, Lcom/crashlytics/android/core/k$9;->si:Ljava/lang/String;
 
-    iput-wide p4, p0, Lcom/crashlytics/android/core/k$9;->si:J
+    iput-wide p4, p0, Lcom/crashlytics/android/core/k$9;->sj: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;->sg:Ljava/lang/String;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k$9;->sh:Ljava/lang/String;
 
-    iget-object v1, p0, Lcom/crashlytics/android/core/k$9;->sh:Ljava/lang/String;
+    iget-object v1, p0, Lcom/crashlytics/android/core/k$9;->si:Ljava/lang/String;
 
-    iget-wide v2, p0, Lcom/crashlytics/android/core/k$9;->si:J
+    iget-wide v2, p0, Lcom/crashlytics/android/core/k$9;->sj: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 bfffebefa7..7b9b51b1ed 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;->rB:Ljava/io/FilenameFilter;
+    sget-object v0, Lcom/crashlytics/android/core/k;->rC: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 78e9926ab4..595d47b1ef 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;->CX()Lio/fabric/sdk/android/a/g/q;
+    invoke-static {}, Lio/fabric/sdk/android/a/g/q$a;->CV()Lio/fabric/sdk/android/a/g/q;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lio/fabric/sdk/android/a/g/q;->CU()Lio/fabric/sdk/android/a/g/t;
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/g/q;->CS()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 d45f00fc83..fa47080965 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 sE:Ljava/lang/String;
+.field private final sF: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;->sE:Ljava/lang/String;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k$d;->sF: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;->sE:Ljava/lang/String;
+    iget-object p1, p0, Lcom/crashlytics/android/core/k$d;->sF: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 bcbedf3b4b..cf499f3b8c 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;->rn:Ljava/io/FilenameFilter;
+    sget-object v0, Lcom/crashlytics/android/core/f;->ro: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 6c3defcf7f..d33826031b 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 sF:Lio/fabric/sdk/android/a/f/a;
+.field private final sG: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;->sF:Lio/fabric/sdk/android/a/f/a;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k$g;->sG: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;->sF:Lio/fabric/sdk/android/a/f/a;
+    iget-object v1, p0, Lcom/crashlytics/android/core/k$g;->sG: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 832b50c18a..88d47d12f9 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 sH:Lcom/crashlytics/android/core/k$h;
+.field final synthetic sI: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;->sH:Lcom/crashlytics/android/core/k$h;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k$h$1;->sI: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;->sH:Lcom/crashlytics/android/core/k$h;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k$h$1;->sI:Lcom/crashlytics/android/core/k$h;
 
-    iget-object v0, v0, Lcom/crashlytics/android/core/k$h;->rL:Lcom/crashlytics/android/core/al;
+    iget-object v0, v0, Lcom/crashlytics/android/core/k$h;->rM:Lcom/crashlytics/android/core/al;
 
-    iget-object v1, v0, Lcom/crashlytics/android/core/al;->tE:Lio/fabric/sdk/android/a/f/c;
+    iget-object v1, 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;
+    iget-object v0, v0, Lcom/crashlytics/android/core/al;->tF:Lio/fabric/sdk/android/a/f/c;
 
-    invoke-interface {v0}, Lio/fabric/sdk/android/a/f/c;->CQ()Landroid/content/SharedPreferences$Editor;
+    invoke-interface {v0}, Lio/fabric/sdk/android/a/f/c;->CO()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 b3fb9670d5..53687e065f 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 sH:Lcom/crashlytics/android/core/k$h;
+.field final synthetic sI:Lcom/crashlytics/android/core/k$h;
 
-.field final synthetic sI:Lcom/crashlytics/android/core/i;
+.field final synthetic sJ: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;->sH:Lcom/crashlytics/android/core/k$h;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k$h$2;->sI:Lcom/crashlytics/android/core/k$h;
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/k$h$2;->sI:Lcom/crashlytics/android/core/i;
+    iput-object p2, p0, Lcom/crashlytics/android/core/k$h$2;->sJ: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;->sI:Lcom/crashlytics/android/core/i;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k$h$2;->sJ:Lcom/crashlytics/android/core/i;
 
-    iget-object v0, v0, Lcom/crashlytics/android/core/i;->rt:Landroid/app/AlertDialog$Builder;
+    iget-object v0, v0, Lcom/crashlytics/android/core/i;->ru: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 1e97c891ed..9b3de77678 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 px:Lio/fabric/sdk/android/i;
+.field private final py:Lio/fabric/sdk/android/i;
 
-.field final rL:Lcom/crashlytics/android/core/al;
+.field final rM:Lcom/crashlytics/android/core/al;
 
-.field private final sG:Lio/fabric/sdk/android/a/g/o;
+.field private final sH: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;->px:Lio/fabric/sdk/android/i;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k$h;->py:Lio/fabric/sdk/android/i;
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/k$h;->rL:Lcom/crashlytics/android/core/al;
+    iput-object p2, p0, Lcom/crashlytics/android/core/k$h;->rM:Lcom/crashlytics/android/core/al;
 
-    iput-object p3, p0, Lcom/crashlytics/android/core/k$h;->sG:Lio/fabric/sdk/android/a/g/o;
+    iput-object p3, p0, Lcom/crashlytics/android/core/k$h;->sH: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;->px:Lio/fabric/sdk/android/i;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k$h;->py:Lio/fabric/sdk/android/i;
 
-    iget-object v0, v0, Lio/fabric/sdk/android/i;->bbA:Lio/fabric/sdk/android/c;
+    iget-object v0, v0, Lio/fabric/sdk/android/i;->bbw:Lio/fabric/sdk/android/c;
 
-    iget-object v1, v0, Lio/fabric/sdk/android/c;->bbl:Ljava/lang/ref/WeakReference;
+    iget-object v1, v0, Lio/fabric/sdk/android/c;->bbh:Ljava/lang/ref/WeakReference;
 
     if-eqz v1, :cond_0
 
-    iget-object v0, v0, Lio/fabric/sdk/android/c;->bbl:Ljava/lang/ref/WeakReference;
+    iget-object v0, v0, Lio/fabric/sdk/android/c;->bbh: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;->sG:Lio/fabric/sdk/android/a/g/o;
+    iget-object v2, p0, Lcom/crashlytics/android/core/k$h;->sH: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;->sG:Lio/fabric/sdk/android/a/g/o;
+    iget-object v7, v5, Lcom/crashlytics/android/core/z;->sH: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;->sG:Lio/fabric/sdk/android/a/g/o;
+    iget-object v9, v5, Lcom/crashlytics/android/core/z;->sH: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;->sG:Lio/fabric/sdk/android/a/g/o;
+    iget-object v7, v5, Lcom/crashlytics/android/core/z;->sH:Lio/fabric/sdk/android/a/g/o;
 
-    iget-object v7, v7, Lio/fabric/sdk/android/a/g/o;->bfF:Ljava/lang/String;
+    iget-object v7, v7, Lio/fabric/sdk/android/a/g/o;->bfA: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;->bfG:Z
+    iget-boolean v4, v2, Lio/fabric/sdk/android/a/g/o;->bfB: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;->sG:Lio/fabric/sdk/android/a/g/o;
+    iget-object v7, v5, Lcom/crashlytics/android/core/z;->sH:Lio/fabric/sdk/android/a/g/o;
 
-    iget-object v7, v7, Lio/fabric/sdk/android/a/g/o;->bfH:Ljava/lang/String;
+    iget-object v7, v7, Lio/fabric/sdk/android/a/g/o;->bfC: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;->bfI:Z
+    iget-boolean v2, v2, Lio/fabric/sdk/android/a/g/o;->bfD: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;->sG:Lio/fabric/sdk/android/a/g/o;
+    iget-object v1, v5, Lcom/crashlytics/android/core/z;->sH:Lio/fabric/sdk/android/a/g/o;
 
-    iget-object v1, v1, Lio/fabric/sdk/android/a/g/o;->bfJ:Ljava/lang/String;
+    iget-object v1, v1, Lio/fabric/sdk/android/a/g/o;->bfE: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->rs:Lcom/crashlytics/android/core/i$b;
+    iget-object v0, v1, Lcom/crashlytics/android/core/i;->rt:Lcom/crashlytics/android/core/i$b;
 
     :try_start_0
-    iget-object v0, v0, Lcom/crashlytics/android/core/i$b;->rx:Ljava/util/concurrent/CountDownLatch;
+    iget-object v0, v0, Lcom/crashlytics/android/core/i$b;->ry: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;->rs:Lcom/crashlytics/android/core/i$b;
+    iget-object v0, v1, Lcom/crashlytics/android/core/i;->rt:Lcom/crashlytics/android/core/i$b;
 
-    iget-boolean v0, v0, Lcom/crashlytics/android/core/i$b;->rw:Z
+    iget-boolean v0, v0, Lcom/crashlytics/android/core/i$b;->rx: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 858a7436b3..f084e3fd56 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 sa:Lcom/crashlytics/android/core/k;
+.field final synthetic sc: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;->sa:Lcom/crashlytics/android/core/k;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k$i;->sc: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;->sa:Lcom/crashlytics/android/core/k;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k$i;->sc: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;->sa:Lcom/crashlytics/android/core/k;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k$i;->sc: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;->sa:Lcom/crashlytics/android/core/k;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k$i;->sc:Lcom/crashlytics/android/core/k;
 
-    sget-object v1, Lcom/crashlytics/android/core/k;->rC:Ljava/io/FileFilter;
+    sget-object v1, Lcom/crashlytics/android/core/k;->rD: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 eeed2207f5..0146426aa4 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 sa:Lcom/crashlytics/android/core/k;
+.field final synthetic sc: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;->sa:Lcom/crashlytics/android/core/k;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k$j;->sc: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;->sa:Lcom/crashlytics/android/core/k;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k$j;->sc: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 a7a78fcefe..260e0694cf 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 sJ:Lcom/crashlytics/android/core/aq;
+.field private final sK:Lcom/crashlytics/android/core/aq;
 
-.field private final sK:Lcom/crashlytics/android/core/ar;
+.field private final sL: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;->sJ:Lcom/crashlytics/android/core/aq;
+    iput-object p2, p0, Lcom/crashlytics/android/core/k$k;->sK:Lcom/crashlytics/android/core/aq;
 
-    iput-object p3, p0, Lcom/crashlytics/android/core/k$k;->sK:Lcom/crashlytics/android/core/ar;
+    iput-object p3, p0, Lcom/crashlytics/android/core/k$k;->sL:Lcom/crashlytics/android/core/ar;
 
     return-void
 .end method
@@ -56,7 +56,7 @@
     return-void
 
     :cond_0
-    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->sK:Lcom/crashlytics/android/core/ar;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k$k;->sL:Lcom/crashlytics/android/core/ar;
 
-    iget-object v1, p0, Lcom/crashlytics/android/core/k$k;->sJ:Lcom/crashlytics/android/core/aq;
+    iget-object v1, p0, Lcom/crashlytics/android/core/k$k;->sK: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 6667228360..775064df43 100644
--- a/com.discord/smali/com/crashlytics/android/core/k.smali
+++ b/com.discord/smali/com/crashlytics/android/core/k.smali
@@ -23,21 +23,11 @@
 
 
 # static fields
-.field static final rA:Ljava/io/FilenameFilter;
-
 .field static final rB:Ljava/io/FilenameFilter;
 
-.field static final rC:Ljava/io/FileFilter;
+.field static final rC:Ljava/io/FilenameFilter;
 
-.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 rD:Ljava/io/FileFilter;
 
 .field static final rE:Ljava/util/Comparator;
     .annotation system Ldalvik/annotation/Signature;
@@ -49,9 +39,19 @@
     .end annotation
 .end field
 
-.field private static final rF:Ljava/util/regex/Pattern;
+.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 rG:Ljava/util/Map;
+.field private static final rG:Ljava/util/regex/Pattern;
+
+.field private static final rH:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -62,45 +62,45 @@
     .end annotation
 .end field
 
-.field private static final rH:[Ljava/lang/String;
+.field private static final rI:[Ljava/lang/String;
 
 
 # instance fields
-.field private final pJ:Lio/fabric/sdk/android/a/f/a;
+.field private final pK:Lio/fabric/sdk/android/a/f/a;
 
-.field private final pW:Lio/fabric/sdk/android/a/e/e;
+.field private final pX:Lio/fabric/sdk/android/a/e/e;
 
-.field private final rI:Ljava/util/concurrent/atomic/AtomicInteger;
+.field private final rJ:Ljava/util/concurrent/atomic/AtomicInteger;
 
-.field final rJ:Lcom/crashlytics/android/core/l;
+.field final rK:Lcom/crashlytics/android/core/l;
 
-.field public final rK:Lcom/crashlytics/android/core/j;
+.field public final rL:Lcom/crashlytics/android/core/j;
 
-.field final rL:Lcom/crashlytics/android/core/al;
+.field final rM:Lcom/crashlytics/android/core/al;
 
-.field final rM:Lcom/crashlytics/android/core/a;
+.field final rN:Lcom/crashlytics/android/core/a;
 
-.field private final rN:Lcom/crashlytics/android/core/k$g;
+.field private final rO:Lcom/crashlytics/android/core/k$g;
 
-.field private final rO:Lcom/crashlytics/android/core/ac;
+.field private final rP:Lcom/crashlytics/android/core/ac;
 
-.field final rP:Lcom/crashlytics/android/core/ar$c;
+.field final rQ:Lcom/crashlytics/android/core/ar$c;
 
-.field final rQ:Lcom/crashlytics/android/core/ar$b;
+.field final rR:Lcom/crashlytics/android/core/ar$b;
 
-.field final rR:Lcom/crashlytics/android/core/y;
+.field final rS:Lcom/crashlytics/android/core/y;
 
-.field private final rS:Lcom/crashlytics/android/core/aw;
+.field private final rT:Lcom/crashlytics/android/core/aw;
 
-.field private final rT:Ljava/lang/String;
+.field private final rU:Ljava/lang/String;
 
-.field final rU:Lcom/crashlytics/android/core/b;
+.field final rV:Lcom/crashlytics/android/core/b;
 
-.field private final rV:Lcom/crashlytics/android/answers/p;
+.field private final rW:Lcom/crashlytics/android/answers/p;
 
-.field rW:Lcom/crashlytics/android/core/t;
+.field rX:Lcom/crashlytics/android/core/t;
 
-.field private final ra:Lio/fabric/sdk/android/a/b/s;
+.field private final rb: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;->rA:Ljava/io/FilenameFilter;
+    sput-object v0, Lcom/crashlytics/android/core/k;->rB: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;->rB:Ljava/io/FilenameFilter;
+    sput-object v0, Lcom/crashlytics/android/core/k;->rC: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;->rC:Ljava/io/FileFilter;
+    sput-object v0, Lcom/crashlytics/android/core/k;->rD: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;->rD:Ljava/util/Comparator;
+    sput-object v0, Lcom/crashlytics/android/core/k;->rE: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;->rE:Ljava/util/Comparator;
+    sput-object v0, Lcom/crashlytics/android/core/k;->rF: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;->rF:Ljava/util/regex/Pattern;
+    sput-object v0, Lcom/crashlytics/android/core/k;->rG: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;->rG:Ljava/util/Map;
+    sput-object v0, Lcom/crashlytics/android/core/k;->rH:Ljava/util/Map;
 
     const/4 v0, 0x4
 
@@ -185,7 +185,7 @@
 
     aput-object v2, v0, v1
 
-    sput-object v0, Lcom/crashlytics/android/core/k;->rH:[Ljava/lang/String;
+    sput-object v0, Lcom/crashlytics/android/core/k;->rI:[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;->rI:Ljava/util/concurrent/atomic/AtomicInteger;
+    iput-object v0, p0, Lcom/crashlytics/android/core/k;->rJ:Ljava/util/concurrent/atomic/AtomicInteger;
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/k;->rJ:Lcom/crashlytics/android/core/l;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k;->rK:Lcom/crashlytics/android/core/l;
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/k;->rK:Lcom/crashlytics/android/core/j;
+    iput-object p2, p0, Lcom/crashlytics/android/core/k;->rL:Lcom/crashlytics/android/core/j;
 
-    iput-object p3, p0, Lcom/crashlytics/android/core/k;->pW:Lio/fabric/sdk/android/a/e/e;
+    iput-object p3, p0, Lcom/crashlytics/android/core/k;->pX:Lio/fabric/sdk/android/a/e/e;
 
-    iput-object p4, p0, Lcom/crashlytics/android/core/k;->ra:Lio/fabric/sdk/android/a/b/s;
+    iput-object p4, p0, Lcom/crashlytics/android/core/k;->rb:Lio/fabric/sdk/android/a/b/s;
 
-    iput-object p5, p0, Lcom/crashlytics/android/core/k;->rL:Lcom/crashlytics/android/core/al;
+    iput-object p5, p0, Lcom/crashlytics/android/core/k;->rM:Lcom/crashlytics/android/core/al;
 
-    iput-object p6, p0, Lcom/crashlytics/android/core/k;->pJ:Lio/fabric/sdk/android/a/f/a;
+    iput-object p6, p0, Lcom/crashlytics/android/core/k;->pK:Lio/fabric/sdk/android/a/f/a;
 
-    iput-object p7, p0, Lcom/crashlytics/android/core/k;->rM:Lcom/crashlytics/android/core/a;
+    iput-object p7, p0, Lcom/crashlytics/android/core/k;->rN: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;->rT:Ljava/lang/String;
+    iput-object p2, p0, Lcom/crashlytics/android/core/k;->rU:Ljava/lang/String;
 
-    iput-object p9, p0, Lcom/crashlytics/android/core/k;->rU:Lcom/crashlytics/android/core/b;
+    iput-object p9, p0, Lcom/crashlytics/android/core/k;->rV:Lcom/crashlytics/android/core/b;
 
-    iput-object p10, p0, Lcom/crashlytics/android/core/k;->rV:Lcom/crashlytics/android/answers/p;
+    iput-object p10, p0, Lcom/crashlytics/android/core/k;->rW: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;->rN:Lcom/crashlytics/android/core/k$g;
+    iput-object p2, p0, Lcom/crashlytics/android/core/k;->rO:Lcom/crashlytics/android/core/k$g;
 
     new-instance p2, Lcom/crashlytics/android/core/ac;
 
-    iget-object p3, p0, Lcom/crashlytics/android/core/k;->rN:Lcom/crashlytics/android/core/k$g;
+    iget-object p3, p0, Lcom/crashlytics/android/core/k;->rO: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;->rO:Lcom/crashlytics/android/core/ac;
+    iput-object p2, p0, Lcom/crashlytics/android/core/k;->rP: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;->rP:Lcom/crashlytics/android/core/ar$c;
+    iput-object p2, p0, Lcom/crashlytics/android/core/k;->rQ: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;->rQ:Lcom/crashlytics/android/core/ar$b;
+    iput-object p2, p0, Lcom/crashlytics/android/core/k;->rR: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;->rR:Lcom/crashlytics/android/core/y;
+    iput-object p2, p0, Lcom/crashlytics/android/core/k;->rS: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;->rS:Lcom/crashlytics/android/core/aw;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k;->rT: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;->rJ:Lcom/crashlytics/android/core/l;
+    iget-object p0, p0, Lcom/crashlytics/android/core/k;->rK: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()Lio/fabric/sdk/android/l;
 
     move-result-object p0
 
@@ -442,7 +442,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/crashlytics/android/core/k;->rH:[Ljava/lang/String;
+    sget-object v0, Lcom/crashlytics/android/core/k;->rI:[Ljava/lang/String;
 
     array-length v1, v0
 
@@ -487,7 +487,7 @@
 
     if-nez v6, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->rS:Lcom/crashlytics/android/core/aw;
+    iget-object v1, v0, Lcom/crashlytics/android/core/k;->rT: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;->rJ:Lcom/crashlytics/android/core/l;
+    iget-object v1, v0, Lcom/crashlytics/android/core/k;->rK: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;->rR:Lcom/crashlytics/android/core/y;
+    iget-object v4, v0, Lcom/crashlytics/android/core/k;->rS:Lcom/crashlytics/android/core/y;
 
-    iget-boolean v4, v4, Lcom/crashlytics/android/core/y;->to:Z
+    iget-boolean v4, v4, Lcom/crashlytics/android/core/y;->tp: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;->BX()J
+    invoke-static {}, Lio/fabric/sdk/android/a/b/i;->BV()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;->ug:[Ljava/lang/StackTraceElement;
+    iget-object v7, v5, Lcom/crashlytics/android/core/ax;->uh:[Ljava/lang/StackTraceElement;
 
-    iget-object v4, v0, Lcom/crashlytics/android/core/k;->rM:Lcom/crashlytics/android/core/a;
+    iget-object v4, v0, Lcom/crashlytics/android/core/k;->rN:Lcom/crashlytics/android/core/a;
 
-    iget-object v15, v4, Lcom/crashlytics/android/core/a;->qW:Ljava/lang/String;
+    iget-object v15, v4, Lcom/crashlytics/android/core/a;->qX:Ljava/lang/String;
 
-    iget-object v4, v0, Lcom/crashlytics/android/core/k;->ra:Lio/fabric/sdk/android/a/b/s;
+    iget-object v4, v0, Lcom/crashlytics/android/core/k;->rb:Lio/fabric/sdk/android/a/b/s;
 
-    iget-object v14, v4, Lio/fabric/sdk/android/a/b/s;->bbv:Ljava/lang/String;
+    iget-object v14, v4, Lio/fabric/sdk/android/a/b/s;->bbr: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;->rS:Lcom/crashlytics/android/core/aw;
+    iget-object v6, v0, Lcom/crashlytics/android/core/k;->rT: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;->rJ:Lcom/crashlytics/android/core/l;
+    iget-object v1, v0, Lcom/crashlytics/android/core/k;->rK:Lcom/crashlytics/android/core/l;
 
-    iget-object v1, v1, Lcom/crashlytics/android/core/l;->sM:Ljava/util/concurrent/ConcurrentHashMap;
+    iget-object v1, v1, Lcom/crashlytics/android/core/l;->sN: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;->rO:Lcom/crashlytics/android/core/ac;
+    iget-object v11, v0, Lcom/crashlytics/android/core/k;->rP: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;->bbY:Ljava/util/Comparator;
+    sget-object v1, Lio/fabric/sdk/android/a/b/i;->bbU: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->rV:Lcom/crashlytics/android/answers/p;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k;->rW:Lcom/crashlytics/android/answers/p;
 
     if-eqz v0, :cond_1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->rV:Lcom/crashlytics/android/answers/p;
+    iget-object p0, p0, Lcom/crashlytics/android/core/k;->rW:Lcom/crashlytics/android/answers/p;
 
     const-string p1, "clx"
 
@@ -922,7 +922,7 @@
     return-void
 
     :cond_1
-    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->rJ:Lcom/crashlytics/android/core/l;
+    iget-object v8, p0, Lcom/crashlytics/android/core/k;->rK: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;->rN:Lcom/crashlytics/android/core/k$g;
+    iget-object v9, p0, Lcom/crashlytics/android/core/k;->rO: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;->tv:Lcom/crashlytics/android/core/aa;
+    iget-object v8, v7, Lcom/crashlytics/android/core/ac;->tw: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;->pJ:Lio/fabric/sdk/android/a/f/a;
+    iget-object p0, p0, Lcom/crashlytics/android/core/k;->pK: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()Lio/fabric/sdk/android/l;
 
     move-result-object p0
 
@@ -1239,7 +1239,7 @@
 
     :cond_7
     :goto_3
-    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()Lio/fabric/sdk/android/l;
 
     move-result-object v6
 
@@ -1512,7 +1512,7 @@
 
     move-result-object v8
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->ro:Ljava/io/OutputStream;
+    iget-object p1, p1, Lcom/crashlytics/android/core/g;->rp: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()Lio/fabric/sdk/android/l;
 
     move-result-object v3
 
@@ -2060,7 +2060,7 @@
 
     move-result-object v6
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->rF:Ljava/util/regex/Pattern;
+    sget-object v4, Lcom/crashlytics/android/core/k;->rG: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->ra:Lio/fabric/sdk/android/a/b/s;
+    iget-object v2, v11, Lcom/crashlytics/android/core/k;->rb: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->ra:Lio/fabric/sdk/android/a/b/s;
+    iget-object v0, v11, Lcom/crashlytics/android/core/k;->rb:Lio/fabric/sdk/android/a/b/s;
 
-    iget-object v7, v0, Lio/fabric/sdk/android/a/b/s;->bbv:Ljava/lang/String;
+    iget-object v7, v0, Lio/fabric/sdk/android/a/b/s;->bbr:Ljava/lang/String;
 
-    iget-object v0, v11, Lcom/crashlytics/android/core/k;->rM:Lcom/crashlytics/android/core/a;
+    iget-object v0, v11, Lcom/crashlytics/android/core/k;->rN:Lcom/crashlytics/android/core/a;
 
-    iget-object v8, v0, Lcom/crashlytics/android/core/a;->rb:Ljava/lang/String;
+    iget-object v8, v0, Lcom/crashlytics/android/core/a;->rc:Ljava/lang/String;
 
-    iget-object v0, v11, Lcom/crashlytics/android/core/k;->rM:Lcom/crashlytics/android/core/a;
+    iget-object v0, v11, Lcom/crashlytics/android/core/k;->rN:Lcom/crashlytics/android/core/a;
 
-    iget-object v9, v0, Lcom/crashlytics/android/core/a;->rc:Ljava/lang/String;
+    iget-object v9, v0, Lcom/crashlytics/android/core/a;->rd:Ljava/lang/String;
 
-    iget-object v0, v11, Lcom/crashlytics/android/core/k;->ra:Lio/fabric/sdk/android/a/b/s;
+    iget-object v0, v11, Lcom/crashlytics/android/core/k;->rb:Lio/fabric/sdk/android/a/b/s;
 
-    invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/s;->Cb()Ljava/lang/String;
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/s;->BZ()Ljava/lang/String;
 
     move-result-object v10
 
-    iget-object v0, v11, Lcom/crashlytics/android/core/k;->rM:Lcom/crashlytics/android/core/a;
+    iget-object v0, v11, Lcom/crashlytics/android/core/k;->rN:Lcom/crashlytics/android/core/a;
 
-    iget-object v0, v0, Lcom/crashlytics/android/core/a;->rd:Ljava/lang/String;
+    iget-object v0, v0, Lcom/crashlytics/android/core/a;->re: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;->rJ:Lcom/crashlytics/android/core/l;
+    iget-object v0, v11, Lcom/crashlytics/android/core/k;->rK: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;->rJ:Lcom/crashlytics/android/core/l;
+    iget-object v0, v11, Lcom/crashlytics/android/core/k;->rK: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;->BW()I
+    invoke-static {}, Lio/fabric/sdk/android/a/b/i;->BU()I
 
     move-result v13
 
@@ -2694,7 +2694,7 @@
 
     move-result v14
 
-    invoke-static {}, Lio/fabric/sdk/android/a/b/i;->BX()J
+    invoke-static {}, Lio/fabric/sdk/android/a/b/i;->BV()J
 
     move-result-wide v15
 
@@ -2716,7 +2716,7 @@
 
     move-result v19
 
-    iget-object v1, v11, Lcom/crashlytics/android/core/k;->ra:Lio/fabric/sdk/android/a/b/s;
+    iget-object v1, v11, Lcom/crashlytics/android/core/k;->rb: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;->rO:Lcom/crashlytics/android/core/ac;
+    iget-object v0, v11, Lcom/crashlytics/android/core/k;->rP: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->rJ:Lcom/crashlytics/android/core/l;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k;->rK: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;->bfZ:Lio/fabric/sdk/android/a/g/e;
+    iget-object v1, p1, Lio/fabric/sdk/android/a/g/t;->bfU:Lio/fabric/sdk/android/a/g/e;
 
-    iget-object v1, v1, Lio/fabric/sdk/android/a/g/e;->bfn:Ljava/lang/String;
+    iget-object v1, v1, Lio/fabric/sdk/android/a/g/e;->bfi:Ljava/lang/String;
 
-    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/t;->bfU:Lio/fabric/sdk/android/a/g/e;
 
-    iget-object p1, p1, Lio/fabric/sdk/android/a/g/e;->bfo:Ljava/lang/String;
+    iget-object p1, p1, Lio/fabric/sdk/android/a/g/e;->bfj: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;->rM:Lcom/crashlytics/android/core/a;
+    iget-object v2, p0, Lcom/crashlytics/android/core/k;->rN:Lcom/crashlytics/android/core/a;
 
-    iget-object v2, v2, Lcom/crashlytics/android/core/a;->qv:Ljava/lang/String;
+    iget-object v2, v2, Lcom/crashlytics/android/core/a;->qw:Ljava/lang/String;
 
-    iget-object v3, p0, Lcom/crashlytics/android/core/k;->rP:Lcom/crashlytics/android/core/ar$c;
+    iget-object v3, p0, Lcom/crashlytics/android/core/k;->rQ:Lcom/crashlytics/android/core/ar$c;
 
-    iget-object v4, p0, Lcom/crashlytics/android/core/k;->rQ:Lcom/crashlytics/android/core/ar$b;
+    iget-object v4, p0, Lcom/crashlytics/android/core/k;->rR: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;->rG:Ljava/util/Map;
+    sget-object v6, Lcom/crashlytics/android/core/k;->rH: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;->rK:Lcom/crashlytics/android/core/j;
+    iget-object v4, p0, Lcom/crashlytics/android/core/k;->rL: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->rI:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v0, v8, Lcom/crashlytics/android/core/k;->rJ: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()Lio/fabric/sdk/android/l;
 
     move-result-object v2
 
@@ -3082,7 +3082,7 @@
 
     move-object v1, v0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->rO:Lcom/crashlytics/android/core/ac;
+    iget-object p0, p0, Lcom/crashlytics/android/core/k;->rP: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;->rA:Ljava/io/FilenameFilter;
+    sget-object v0, Lcom/crashlytics/android/core/k;->rB: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;->rD:Ljava/util/Comparator;
+    sget-object v1, Lcom/crashlytics/android/core/k;->rE: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;->rF:Ljava/util/regex/Pattern;
+    sget-object v0, Lcom/crashlytics/android/core/k;->rG: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;->rE:Ljava/util/Comparator;
+    sget-object p1, Lcom/crashlytics/android/core/k;->rF: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;->rM:Lcom/crashlytics/android/core/a;
+    iget-object p0, p0, Lcom/crashlytics/android/core/k;->rN: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;->rT:Ljava/lang/String;
+    iget-object p0, p0, Lcom/crashlytics/android/core/k;->rU:Ljava/lang/String;
 
     return-object p0
 .end method
@@ -3362,7 +3362,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->pq:Lcom/crashlytics/android/answers/ac;
+    iget-object p0, v0, Lcom/crashlytics/android/answers/Answers;->pr:Lcom/crashlytics/android/answers/ac;
 
     if-eqz p0, :cond_2
 
-    iget-object p0, v0, Lcom/crashlytics/android/answers/Answers;->pq:Lcom/crashlytics/android/answers/ac;
+    iget-object p0, v0, Lcom/crashlytics/android/answers/Answers;->pr: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;->bcl:Ljava/lang/String;
+    iget-object v0, v1, Lio/fabric/sdk/android/a/b/j;->bch: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->qx:Lcom/crashlytics/android/answers/e;
+    iget-object p0, p0, Lcom/crashlytics/android/answers/ac;->qy: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;->qM:Lcom/crashlytics/android/answers/ae$b;
+    sget-object v2, Lcom/crashlytics/android/answers/ae$b;->qN: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;->qC:Ljava/util/Map;
+    iput-object p1, v1, Lcom/crashlytics/android/answers/ae$a;->qD: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;->qE:Ljava/util/Map;
+    iput-object p1, v1, Lcom/crashlytics/android/answers/ae$a;->qF: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;->rK:Lcom/crashlytics/android/core/j;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k;->rL: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->rR:Lcom/crashlytics/android/core/y;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k;->rS:Lcom/crashlytics/android/core/y;
 
-    iget-object v1, v0, Lcom/crashlytics/android/core/y;->tl:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v1, v0, Lcom/crashlytics/android/core/y;->tm: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;->tn:Landroid/content/BroadcastReceiver;
+    iget-object v2, v0, Lcom/crashlytics/android/core/y;->to: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;->tm:Landroid/content/BroadcastReceiver;
+    iget-object v0, v0, Lcom/crashlytics/android/core/y;->tn: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;->rK:Lcom/crashlytics/android/core/j;
+    iget-object v7, p0, Lcom/crashlytics/android/core/k;->rL: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;->rO:Lcom/crashlytics/android/core/ac;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k;->rP: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->rJ:Lcom/crashlytics/android/core/l;
+    iget-object v4, p0, Lcom/crashlytics/android/core/k;->rK:Lcom/crashlytics/android/core/l;
 
-    iget-object v5, v4, Lio/fabric/sdk/android/i;->ra:Lio/fabric/sdk/android/a/b/s;
+    iget-object v5, v4, Lio/fabric/sdk/android/i;->rb:Lio/fabric/sdk/android/a/b/s;
 
-    iget-boolean v5, v5, Lio/fabric/sdk/android/a/b/s;->bcL:Z
+    iget-boolean v5, v5, Lio/fabric/sdk/android/a/b/s;->bcH:Z
 
     const/4 v6, 0x0
 
     if-eqz v5, :cond_2
 
-    iget-object v4, v4, Lcom/crashlytics/android/core/l;->sR:Ljava/lang/String;
+    iget-object v4, v4, Lcom/crashlytics/android/core/l;->sS: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;->rJ:Lcom/crashlytics/android/core/l;
+    iget-object v5, p0, Lcom/crashlytics/android/core/k;->rK:Lcom/crashlytics/android/core/l;
 
-    iget-object v7, v5, Lio/fabric/sdk/android/i;->ra:Lio/fabric/sdk/android/a/b/s;
+    iget-object v7, v5, Lio/fabric/sdk/android/i;->rb:Lio/fabric/sdk/android/a/b/s;
 
-    iget-boolean v7, v7, Lio/fabric/sdk/android/a/b/s;->bcL:Z
+    iget-boolean v7, v7, Lio/fabric/sdk/android/a/b/s;->bcH: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;->rJ:Lcom/crashlytics/android/core/l;
+    iget-object v7, p0, Lcom/crashlytics/android/core/k;->rK:Lcom/crashlytics/android/core/l;
 
-    iget-object v8, v7, Lio/fabric/sdk/android/i;->ra:Lio/fabric/sdk/android/a/b/s;
+    iget-object v8, v7, Lio/fabric/sdk/android/i;->rb:Lio/fabric/sdk/android/a/b/s;
 
-    iget-boolean v8, v8, Lio/fabric/sdk/android/a/b/s;->bcL:Z
+    iget-boolean v8, v8, Lio/fabric/sdk/android/a/b/s;->bcH:Z
 
     if-eqz v8, :cond_4
 
-    iget-object v6, v7, Lcom/crashlytics/android/core/l;->sS:Ljava/lang/String;
+    iget-object v6, v7, Lcom/crashlytics/android/core/l;->sT: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->bfM:I
+    iget p1, p1, Lio/fabric/sdk/android/a/g/p;->bfH: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;->rK:Lcom/crashlytics/android/core/j;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k;->rL: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;->bgb:Lio/fabric/sdk/android/a/g/m;
+    iget-object p1, p1, Lio/fabric/sdk/android/a/g/t;->bfW:Lio/fabric/sdk/android/a/g/m;
 
-    iget-boolean p1, p1, Lio/fabric/sdk/android/a/g/m;->bfz:Z
+    iget-boolean p1, p1, Lio/fabric/sdk/android/a/g/m;->bfu:Z
 
     if-eqz p1, :cond_4
 
-    iget-object p1, p0, Lcom/crashlytics/android/core/k;->rL:Lcom/crashlytics/android/core/al;
+    iget-object p1, p0, Lcom/crashlytics/android/core/k;->rM:Lcom/crashlytics/android/core/al;
 
-    iget-object v1, p1, Lcom/crashlytics/android/core/al;->tE:Lio/fabric/sdk/android/a/f/c;
+    iget-object v1, p1, Lcom/crashlytics/android/core/al;->tF:Lio/fabric/sdk/android/a/f/c;
 
-    invoke-interface {v1}, Lio/fabric/sdk/android/a/f/c;->CP()Landroid/content/SharedPreferences;
+    invoke-interface {v1}, Lio/fabric/sdk/android/a/f/c;->CN()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;->tF:Lcom/crashlytics/android/core/l;
+    iget-object v5, p1, Lcom/crashlytics/android/core/al;->tG: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;->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;
 
-    invoke-interface {v5}, Lio/fabric/sdk/android/a/f/c;->CP()Landroid/content/SharedPreferences;
+    invoke-interface {v5}, Lio/fabric/sdk/android/a/f/c;->CN()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;->CP()Landroid/content/SharedPreferences;
+    invoke-interface {v1}, Lio/fabric/sdk/android/a/f/c;->CN()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;->CP()Landroid/content/SharedPreferences;
+    invoke-interface {v1}, Lio/fabric/sdk/android/a/f/c;->CN()Landroid/content/SharedPreferences;
 
     move-result-object v1
 
@@ -3850,11 +3850,11 @@
 
     move-result v1
 
-    iget-object v5, 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 v6, 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;
 
-    invoke-interface {v6}, Lio/fabric/sdk/android/a/f/c;->CQ()Landroid/content/SharedPreferences$Editor;
+    invoke-interface {v6}, Lio/fabric/sdk/android/a/f/c;->CO()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;->tE:Lio/fabric/sdk/android/a/f/c;
+    iget-object v1, 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 v5, p1, Lcom/crashlytics/android/core/al;->tF:Lio/fabric/sdk/android/a/f/c;
 
-    invoke-interface {v5}, Lio/fabric/sdk/android/a/f/c;->CQ()Landroid/content/SharedPreferences$Editor;
+    invoke-interface {v5}, Lio/fabric/sdk/android/a/f/c;->CO()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;->tE:Lio/fabric/sdk/android/a/f/c;
+    iget-object p1, p1, Lcom/crashlytics/android/core/al;->tF:Lio/fabric/sdk/android/a/f/c;
 
-    invoke-interface {p1}, Lio/fabric/sdk/android/a/f/c;->CP()Landroid/content/SharedPreferences;
+    invoke-interface {p1}, Lio/fabric/sdk/android/a/f/c;->CN()Landroid/content/SharedPreferences;
 
     move-result-object p1
 
@@ -3923,7 +3923,7 @@
 
     move-result-object v1
 
-    sget-object v2, Lcom/crashlytics/android/core/k;->rB:Ljava/io/FilenameFilter;
+    sget-object v2, Lcom/crashlytics/android/core/k;->rC: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;->rB:Ljava/io/FilenameFilter;
+    sget-object v2, Lcom/crashlytics/android/core/k;->rC: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;->rB:Ljava/io/FilenameFilter;
+    sget-object v2, Lcom/crashlytics/android/core/k;->rC: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;->rW:Lcom/crashlytics/android/core/t;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k;->rX:Lcom/crashlytics/android/core/t;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, v0, Lcom/crashlytics/android/core/t;->te:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v0, v0, Lcom/crashlytics/android/core/t;->tf: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;->pJ:Lio/fabric/sdk/android/a/f/a;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k;->pK: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;->rJ:Lcom/crashlytics/android/core/l;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k;->rK: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;->rJ:Lcom/crashlytics/android/core/l;
+    iget-object v2, p0, Lcom/crashlytics/android/core/k;->rK:Lcom/crashlytics/android/core/l;
 
-    iget-object v3, p0, Lcom/crashlytics/android/core/k;->pW:Lio/fabric/sdk/android/a/e/e;
+    iget-object v3, p0, Lcom/crashlytics/android/core/k;->pX: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;->rJ:Lcom/crashlytics/android/core/l;
+    iget-object v2, p0, Lcom/crashlytics/android/core/k;->rK:Lcom/crashlytics/android/core/l;
 
-    iget-object v3, p0, Lcom/crashlytics/android/core/k;->pW:Lio/fabric/sdk/android/a/e/e;
+    iget-object v3, p0, Lcom/crashlytics/android/core/k;->pX: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 76a45967c0..4fe0dec9d1 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 sX:Lcom/crashlytics/android/core/l;
+.field final synthetic sY: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;->sX:Lcom/crashlytics/android/core/l;
+    iput-object p1, p0, Lcom/crashlytics/android/core/l$1;->sY: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;->bdM:I
+    sget v0, Lio/fabric/sdk/android/a/c/e;->bdH:I
 
     return v0
 .end method
@@ -55,7 +55,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/l$1;->sX:Lcom/crashlytics/android/core/l;
+    iget-object v0, p0, Lcom/crashlytics/android/core/l$1;->sY: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 3bfcbacf11..bd3375a9b4 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 sX:Lcom/crashlytics/android/core/l;
+.field final synthetic sY: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;->sX:Lcom/crashlytics/android/core/l;
+    iput-object p1, p0, Lcom/crashlytics/android/core/l$2;->sY: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;->sX:Lcom/crashlytics/android/core/l;
+    iget-object v0, p0, Lcom/crashlytics/android/core/l$2;->sY: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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 b44c3c238b..097d11c78a 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 sX:Lcom/crashlytics/android/core/l;
+.field final synthetic sY: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;->sX:Lcom/crashlytics/android/core/l;
+    iput-object p1, p0, Lcom/crashlytics/android/core/l$3;->sY: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;->sX:Lcom/crashlytics/android/core/l;
+    iget-object v1, p0, Lcom/crashlytics/android/core/l$3;->sY: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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 34ca4ed6d0..25d2e37192 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 sO:Lcom/crashlytics/android/core/m;
+.field private final sP: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;->sO:Lcom/crashlytics/android/core/m;
+    iput-object p1, p0, Lcom/crashlytics/android/core/l$a;->sP: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;->sO:Lcom/crashlytics/android/core/m;
+    iget-object v0, p0, Lcom/crashlytics/android/core/l$a;->sP: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->sO:Lcom/crashlytics/android/core/m;
+    iget-object v0, p0, Lcom/crashlytics/android/core/l$a;->sP: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 70e766f34a..d5acb6d9f0 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 pW:Lio/fabric/sdk/android/a/e/e;
+.field private pX:Lio/fabric/sdk/android/a/e/e;
 
-.field private rK:Lcom/crashlytics/android/core/j;
+.field private rL:Lcom/crashlytics/android/core/j;
 
-.field private final sL:J
+.field private final sM:J
 
-.field public final sM:Ljava/util/concurrent/ConcurrentHashMap;
+.field public final sN:Ljava/util/concurrent/ConcurrentHashMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/ConcurrentHashMap<",
@@ -44,25 +44,25 @@
     .end annotation
 .end field
 
-.field private sN:Lcom/crashlytics/android/core/m;
+.field private sO:Lcom/crashlytics/android/core/m;
 
-.field sO:Lcom/crashlytics/android/core/m;
+.field sP:Lcom/crashlytics/android/core/m;
 
-.field private sP:Lcom/crashlytics/android/core/o;
+.field private sQ:Lcom/crashlytics/android/core/o;
 
-.field public sQ:Lcom/crashlytics/android/core/k;
-
-.field public sR:Ljava/lang/String;
+.field public sR:Lcom/crashlytics/android/core/k;
 
 .field public sS:Ljava/lang/String;
 
-.field private sT:F
+.field public sT:Ljava/lang/String;
 
-.field public sU:Z
+.field private sU:F
 
-.field private final sV:Lcom/crashlytics/android/core/ak;
+.field public sV:Z
 
-.field public sW:Lcom/crashlytics/android/core/q;
+.field private final sW:Lcom/crashlytics/android/core/ak;
+
+.field public sX: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;->sR: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;->sT: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;->sT:F
+    iput p2, p0, Lcom/crashlytics/android/core/l;->sU: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;->sP:Lcom/crashlytics/android/core/o;
+    iput-object p2, p0, Lcom/crashlytics/android/core/l;->sQ:Lcom/crashlytics/android/core/o;
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/l;->sV:Lcom/crashlytics/android/core/ak;
+    iput-object p1, p0, Lcom/crashlytics/android/core/l;->sW:Lcom/crashlytics/android/core/ak;
 
-    iput-boolean p3, p0, Lcom/crashlytics/android/core/l;->sU:Z
+    iput-boolean p3, p0, Lcom/crashlytics/android/core/l;->sV: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;->rK:Lcom/crashlytics/android/core/j;
+    iput-object p1, p0, Lcom/crashlytics/android/core/l;->rL: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;->sM:Ljava/util/concurrent/ConcurrentHashMap;
+    iput-object p1, p0, Lcom/crashlytics/android/core/l;->sN:Ljava/util/concurrent/ConcurrentHashMap;
 
     invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
 
     move-result-wide p1
 
-    iput-wide p1, p0, Lcom/crashlytics/android/core/l;->sL:J
+    iput-wide p1, p0, Lcom/crashlytics/android/core/l;->sM:J
 
     return-void
 .end method
@@ -167,7 +167,7 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, v0, Lcom/crashlytics/android/core/l;->sQ:Lcom/crashlytics/android/core/k;
+    iget-object v0, v0, Lcom/crashlytics/android/core/l;->sR: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->sN:Lcom/crashlytics/android/core/m;
+    iget-object p0, p0, Lcom/crashlytics/android/core/l;->sO: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;->bbB:Lio/fabric/sdk/android/h;
+    iget-object v1, p0, Lio/fabric/sdk/android/i;->bbx:Lio/fabric/sdk/android/h;
 
-    invoke-virtual {v1}, Lio/fabric/sdk/android/h;->Ck()Ljava/util/Collection;
+    invoke-virtual {v1}, Lio/fabric/sdk/android/h;->Ci()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;->bbA:Lio/fabric/sdk/android/c;
+    iget-object v1, p0, Lio/fabric/sdk/android/i;->bbw: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->rK:Lcom/crashlytics/android/core/j;
+    iget-object v0, p0, Lcom/crashlytics/android/core/l;->rL: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;->Ca()Z
+    invoke-virtual {v1}, Lio/fabric/sdk/android/a/b/l;->BY()Z
 
     move-result v1
 
@@ -429,7 +429,7 @@
 
     if-nez v1, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->sU:Z
+    iput-boolean v13, v12, Lcom/crashlytics/android/core/l;->sV:Z
 
     :cond_0
-    iget-boolean v1, v12, Lcom/crashlytics/android/core/l;->sU:Z
+    iget-boolean v1, v12, Lcom/crashlytics/android/core/l;->sV:Z
 
     const/4 v15, 0x0
 
@@ -476,7 +476,7 @@
 
     if-nez v1, :cond_3
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->sO:Lcom/crashlytics/android/core/m;
+    iput-object v1, v12, Lcom/crashlytics/android/core/l;->sP: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;->sN:Lcom/crashlytics/android/core/m;
+    iput-object v1, v12, Lcom/crashlytics/android/core/l;->sO: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;->sV:Lcom/crashlytics/android/core/ak;
+    iget-object v1, v12, Lcom/crashlytics/android/core/l;->sW: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;->sV:Lcom/crashlytics/android/core/ak;
+    iget-object v2, v12, Lcom/crashlytics/android/core/l;->sW: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->pW:Lio/fabric/sdk/android/a/e/e;
+    iput-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;
+    iget-object v2, v12, Lcom/crashlytics/android/core/l;->pX: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;->ra:Lio/fabric/sdk/android/a/b/s;
+    iget-object v1, v12, Lio/fabric/sdk/android/i;->rb: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;->Cd()Ljava/lang/String;
+    invoke-virtual {v1}, Lio/fabric/sdk/android/a/b/s;->Cb()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;->rK:Lcom/crashlytics/android/core/j;
+    iget-object v3, v12, Lcom/crashlytics/android/core/l;->rL:Lcom/crashlytics/android/core/j;
 
-    iget-object v4, v12, Lcom/crashlytics/android/core/l;->pW:Lio/fabric/sdk/android/a/e/e;
+    iget-object v4, v12, Lcom/crashlytics/android/core/l;->pX: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;->sQ:Lcom/crashlytics/android/core/k;
+    iput-object v13, v12, Lcom/crashlytics/android/core/l;->sR:Lcom/crashlytics/android/core/k;
 
-    iget-object v1, v12, Lcom/crashlytics/android/core/l;->sN:Lcom/crashlytics/android/core/m;
+    iget-object v1, v12, Lcom/crashlytics/android/core/l;->sO: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;->rK:Lcom/crashlytics/android/core/j;
+    iget-object v2, v12, Lcom/crashlytics/android/core/l;->rL:Lcom/crashlytics/android/core/j;
 
     new-instance v3, Lcom/crashlytics/android/core/l$a;
 
-    iget-object v4, v12, Lcom/crashlytics/android/core/l;->sO:Lcom/crashlytics/android/core/m;
+    iget-object v4, v12, Lcom/crashlytics/android/core/l;->sP: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;->sQ:Lcom/crashlytics/android/core/k;
+    iget-object v3, v12, Lcom/crashlytics/android/core/l;->sR: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;->rK:Lcom/crashlytics/android/core/j;
+    iget-object v5, v3, Lcom/crashlytics/android/core/k;->rL: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;->rW:Lcom/crashlytics/android/core/t;
+    iput-object v6, 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;
+    iget-object v2, v3, Lcom/crashlytics/android/core/k;->rX: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -838,7 +838,7 @@
     return v15
 
     :cond_7
-    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->sQ:Lcom/crashlytics/android/core/k;
+    iput-object v1, v12, Lcom/crashlytics/android/core/l;->sR:Lcom/crashlytics/android/core/k;
 
     return v15
 
@@ -888,7 +888,7 @@
 
     const-string v0, "CrashlyticsCore"
 
-    iget-object v1, p0, Lcom/crashlytics/android/core/l;->rK:Lcom/crashlytics/android/core/j;
+    iget-object v1, p0, Lcom/crashlytics/android/core/l;->rL: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;->sQ:Lcom/crashlytics/android/core/k;
+    iget-object v1, p0, Lcom/crashlytics/android/core/l;->sR:Lcom/crashlytics/android/core/k;
 
-    iget-object v2, v1, Lcom/crashlytics/android/core/k;->rK:Lcom/crashlytics/android/core/j;
+    iget-object v2, v1, Lcom/crashlytics/android/core/k;->rL: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;->sQ:Lcom/crashlytics/android/core/k;
+    iget-object v2, p0, Lcom/crashlytics/android/core/l;->sR:Lcom/crashlytics/android/core/k;
 
-    iget-object v2, v2, Lcom/crashlytics/android/core/k;->rR:Lcom/crashlytics/android/core/y;
+    iget-object v2, v2, Lcom/crashlytics/android/core/k;->rS:Lcom/crashlytics/android/core/y;
 
-    iget-object v3, v2, Lcom/crashlytics/android/core/y;->tl:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v3, v2, Lcom/crashlytics/android/core/y;->tm: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;->ti:Landroid/content/IntentFilter;
+    sget-object v5, Lcom/crashlytics/android/core/y;->tj: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;->to:Z
+    iput-boolean v3, v2, Lcom/crashlytics/android/core/y;->tp:Z
 
     iget-object v3, v2, Lcom/crashlytics/android/core/y;->context:Landroid/content/Context;
 
-    iget-object v5, v2, Lcom/crashlytics/android/core/y;->tn:Landroid/content/BroadcastReceiver;
+    iget-object v5, v2, Lcom/crashlytics/android/core/y;->to:Landroid/content/BroadcastReceiver;
 
-    sget-object v6, Lcom/crashlytics/android/core/y;->tj:Landroid/content/IntentFilter;
+    sget-object v6, Lcom/crashlytics/android/core/y;->tk: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;->tm:Landroid/content/BroadcastReceiver;
+    iget-object v2, v2, Lcom/crashlytics/android/core/y;->tn:Landroid/content/BroadcastReceiver;
 
-    sget-object v5, Lcom/crashlytics/android/core/y;->tk:Landroid/content/IntentFilter;
+    sget-object v5, Lcom/crashlytics/android/core/y;->tl: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;->CX()Lio/fabric/sdk/android/a/g/q;
+    invoke-static {}, Lio/fabric/sdk/android/a/g/q$a;->CV()Lio/fabric/sdk/android/a/g/q;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lio/fabric/sdk/android/a/g/q;->CU()Lio/fabric/sdk/android/a/g/t;
+    invoke-virtual {v2}, Lio/fabric/sdk/android/a/g/q;->CS()Lio/fabric/sdk/android/a/g/t;
 
     move-result-object v2
 
     if-nez v2, :cond_4
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->sQ:Lcom/crashlytics/android/core/k;
+    iget-object v3, p0, Lcom/crashlytics/android/core/l;->sR:Lcom/crashlytics/android/core/k;
 
-    iget-object v5, v2, Lio/fabric/sdk/android/a/g/t;->bgb:Lio/fabric/sdk/android/a/g/m;
+    iget-object v5, v2, Lio/fabric/sdk/android/a/g/t;->bfW:Lio/fabric/sdk/android/a/g/m;
 
-    iget-boolean v5, v5, Lio/fabric/sdk/android/a/g/m;->bfD:Z
+    iget-boolean v5, v5, Lio/fabric/sdk/android/a/g/m;->bfy:Z
 
     if-eqz v5, :cond_5
 
-    iget-object v3, v3, Lcom/crashlytics/android/core/k;->rU:Lcom/crashlytics/android/core/b;
+    iget-object v3, v3, Lcom/crashlytics/android/core/k;->rV: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->bgb:Lio/fabric/sdk/android/a/g/m;
+    iget-object v3, v2, Lio/fabric/sdk/android/a/g/t;->bfW:Lio/fabric/sdk/android/a/g/m;
 
-    iget-boolean v3, v3, Lio/fabric/sdk/android/a/g/m;->bfB:Z
+    iget-boolean v3, v3, Lio/fabric/sdk/android/a/g/m;->bfw:Z
 
     if-nez v3, :cond_6
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->Ca()Z
+    invoke-virtual {v3}, Lio/fabric/sdk/android/a/b/l;->BY()Z
 
     move-result v3
 
     if-nez v3, :cond_7
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->sW:Lcom/crashlytics/android/core/q;
+    iget-object v3, p0, Lcom/crashlytics/android/core/l;->sX:Lcom/crashlytics/android/core/q;
 
     if-eqz v3, :cond_8
 
-    iget-object v3, p0, Lcom/crashlytics/android/core/l;->sW:Lcom/crashlytics/android/core/q;
+    iget-object v3, p0, Lcom/crashlytics/android/core/l;->sX: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;->sQ:Lcom/crashlytics/android/core/k;
+    iget-object v5, p0, Lcom/crashlytics/android/core/l;->sR:Lcom/crashlytics/android/core/k;
 
     if-nez v3, :cond_9
 
     goto :goto_3
 
     :cond_9
-    iget-object v4, v5, Lcom/crashlytics/android/core/k;->rK:Lcom/crashlytics/android/core/j;
+    iget-object v4, v5, Lcom/crashlytics/android/core/k;->rL: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->sQ:Lcom/crashlytics/android/core/k;
+    iget-object v3, p0, Lcom/crashlytics/android/core/l;->sR:Lcom/crashlytics/android/core/k;
 
-    iget-object v4, v2, Lio/fabric/sdk/android/a/g/t;->bga:Lio/fabric/sdk/android/a/g/p;
+    iget-object v4, v2, Lio/fabric/sdk/android/a/g/t;->bfV:Lio/fabric/sdk/android/a/g/p;
 
-    iget-object v5, v3, Lcom/crashlytics/android/core/k;->rK:Lcom/crashlytics/android/core/j;
+    iget-object v5, v3, Lcom/crashlytics/android/core/k;->rL: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->sQ:Lcom/crashlytics/android/core/k;
+    iget-object v3, p0, Lcom/crashlytics/android/core/l;->sR:Lcom/crashlytics/android/core/k;
 
-    iget v4, p0, Lcom/crashlytics/android/core/l;->sT:F
+    iget v4, p0, Lcom/crashlytics/android/core/l;->sU:F
 
     if-nez v2, :cond_c
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->bfZ:Lio/fabric/sdk/android/a/g/e;
+    iget-object v5, v2, Lio/fabric/sdk/android/a/g/t;->bfU:Lio/fabric/sdk/android/a/g/e;
 
-    iget-object v5, v5, Lio/fabric/sdk/android/a/g/e;->bfn:Ljava/lang/String;
+    iget-object v5, v5, Lio/fabric/sdk/android/a/g/e;->bfi:Ljava/lang/String;
 
-    iget-object v6, v2, Lio/fabric/sdk/android/a/g/t;->bfZ:Lio/fabric/sdk/android/a/g/e;
+    iget-object v6, v2, Lio/fabric/sdk/android/a/g/t;->bfU:Lio/fabric/sdk/android/a/g/e;
 
-    iget-object v6, v6, Lio/fabric/sdk/android/a/g/e;->bfo:Ljava/lang/String;
+    iget-object v6, v6, Lio/fabric/sdk/android/a/g/e;->bfj: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;->rJ:Lcom/crashlytics/android/core/l;
+    iget-object v7, v3, Lcom/crashlytics/android/core/k;->rK:Lcom/crashlytics/android/core/l;
 
-    iget-object v8, v3, Lcom/crashlytics/android/core/k;->rL:Lcom/crashlytics/android/core/al;
+    iget-object v8, v3, Lcom/crashlytics/android/core/k;->rM:Lcom/crashlytics/android/core/al;
 
-    iget-object v2, v2, Lio/fabric/sdk/android/a/g/t;->sG:Lio/fabric/sdk/android/a/g/o;
+    iget-object v2, v2, Lio/fabric/sdk/android/a/g/t;->sH: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;->rM:Lcom/crashlytics/android/core/a;
+    iget-object v7, v3, Lcom/crashlytics/android/core/k;->rN:Lcom/crashlytics/android/core/a;
 
-    iget-object v7, v7, Lcom/crashlytics/android/core/a;->qv:Ljava/lang/String;
+    iget-object v7, v7, Lcom/crashlytics/android/core/a;->qw:Ljava/lang/String;
 
-    iget-object v8, v3, Lcom/crashlytics/android/core/k;->rP:Lcom/crashlytics/android/core/ar$c;
+    iget-object v8, v3, Lcom/crashlytics/android/core/k;->rQ:Lcom/crashlytics/android/core/ar$c;
 
-    iget-object v3, v3, Lcom/crashlytics/android/core/k;->rQ:Lcom/crashlytics/android/core/ar$b;
+    iget-object v3, v3, Lcom/crashlytics/android/core/k;->rR: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->sU:Z
+    iget-boolean v0, p0, Lcom/crashlytics/android/core/l;->sV:Z
 
     if-eqz v0, :cond_0
 
@@ -1340,11 +1340,11 @@
 
     move-result-wide v0
 
-    iget-wide v2, p0, Lcom/crashlytics/android/core/l;->sL:J
+    iget-wide v2, p0, Lcom/crashlytics/android/core/l;->sM:J
 
     sub-long/2addr v0, v2
 
-    iget-object v2, p0, Lcom/crashlytics/android/core/l;->sQ:Lcom/crashlytics/android/core/k;
+    iget-object v2, p0, Lcom/crashlytics/android/core/l;->sR: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 ee38017e07..92964bfdb5 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 pJ:Lio/fabric/sdk/android/a/f/a;
+.field private final pK:Lio/fabric/sdk/android/a/f/a;
 
-.field private final sY:Ljava/lang/String;
+.field private final sZ: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;->sY:Ljava/lang/String;
+    iput-object p1, p0, Lcom/crashlytics/android/core/m;->sZ:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/m;->pJ:Lio/fabric/sdk/android/a/f/a;
+    iput-object p2, p0, Lcom/crashlytics/android/core/m;->pK: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->sY:Ljava/lang/String;
+    iget-object v3, p0, Lcom/crashlytics/android/core/m;->sZ: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;->pJ:Lio/fabric/sdk/android/a/f/a;
+    iget-object v1, p0, Lcom/crashlytics/android/core/m;->pK: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;->sY:Ljava/lang/String;
+    iget-object v2, p0, Lcom/crashlytics/android/core/m;->sZ: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 aa42c052ad..9b29483187 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 sZ:Ljava/util/TreeSet;
+.field public final ta: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;->sZ:Ljava/util/TreeSet;
+    iput-object p1, p0, Lcom/crashlytics/android/core/p;->ta: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 3e602a52e9..ad5ab56d9c 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 sV:Lcom/crashlytics/android/core/ak;
+.field private final sW: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;->sV:Lcom/crashlytics/android/core/ak;
+    iput-object p1, p0, Lcom/crashlytics/android/core/s;->sW: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;->sV:Lcom/crashlytics/android/core/ak;
+    iget-object v0, p0, Lcom/crashlytics/android/core/s;->sW: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;->sV:Lcom/crashlytics/android/core/ak;
+    iget-object v0, p0, Lcom/crashlytics/android/core/s;->sW: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;->sV:Lcom/crashlytics/android/core/ak;
+    iget-object v0, p0, Lcom/crashlytics/android/core/s;->sW: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 961648e360..470819269b 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 ta:Lcom/crashlytics/android/core/t$a;
+.field private final tb:Lcom/crashlytics/android/core/t$a;
 
-.field private final tb:Lcom/crashlytics/android/core/t$b;
+.field private final tc:Lcom/crashlytics/android/core/t$b;
 
-.field private final tc:Z
+.field private final td:Z
 
-.field private final td:Ljava/lang/Thread$UncaughtExceptionHandler;
+.field private final te:Ljava/lang/Thread$UncaughtExceptionHandler;
 
-.field final te:Ljava/util/concurrent/atomic/AtomicBoolean;
+.field final tf: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;->ta:Lcom/crashlytics/android/core/t$a;
+    iput-object p1, p0, Lcom/crashlytics/android/core/t;->tb:Lcom/crashlytics/android/core/t$a;
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/t;->tb:Lcom/crashlytics/android/core/t$b;
+    iput-object p2, p0, Lcom/crashlytics/android/core/t;->tc:Lcom/crashlytics/android/core/t$b;
 
-    iput-boolean p3, p0, Lcom/crashlytics/android/core/t;->tc:Z
+    iput-boolean p3, p0, Lcom/crashlytics/android/core/t;->td:Z
 
-    iput-object p4, p0, Lcom/crashlytics/android/core/t;->td:Ljava/lang/Thread$UncaughtExceptionHandler;
+    iput-object p4, p0, Lcom/crashlytics/android/core/t;->te: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;->te:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iput-object p1, p0, Lcom/crashlytics/android/core/t;->tf: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;->te:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v2, p0, Lcom/crashlytics/android/core/t;->tf: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;->ta:Lcom/crashlytics/android/core/t$a;
+    iget-object v3, p0, Lcom/crashlytics/android/core/t;->tb:Lcom/crashlytics/android/core/t$a;
 
-    iget-object v4, p0, Lcom/crashlytics/android/core/t;->tb:Lcom/crashlytics/android/core/t$b;
+    iget-object v4, p0, Lcom/crashlytics/android/core/t;->tc:Lcom/crashlytics/android/core/t$b;
 
-    iget-boolean v5, p0, Lcom/crashlytics/android/core/t;->tc:Z
+    iget-boolean v5, p0, Lcom/crashlytics/android/core/t;->td: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->td:Ljava/lang/Thread$UncaughtExceptionHandler;
+    iget-object v0, p0, Lcom/crashlytics/android/core/t;->te: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;->te:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object p1, p0, Lcom/crashlytics/android/core/t;->tf: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->td:Ljava/lang/Thread$UncaughtExceptionHandler;
+    iget-object v0, p0, Lcom/crashlytics/android/core/t;->te: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;->te:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object p1, p0, Lcom/crashlytics/android/core/t;->tf: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 72d45854bf..45d9937c6e 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 qv:Ljava/lang/String;
+.field public final qw:Ljava/lang/String;
 
-.field public final sJ:Lcom/crashlytics/android/core/aq;
+.field public final sK: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;->qv:Ljava/lang/String;
+    iput-object p1, p0, Lcom/crashlytics/android/core/u;->qw:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/u;->sJ:Lcom/crashlytics/android/core/aq;
+    iput-object p2, p0, Lcom/crashlytics/android/core/u;->sK: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 cffd41a2aa..c2425ca183 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 th:Lcom/crashlytics/android/core/w;
+.field final synthetic ti: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;->th:Lcom/crashlytics/android/core/w;
+    iput-object p1, p0, Lcom/crashlytics/android/core/w$1;->ti: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;->th:Lcom/crashlytics/android/core/w;
+    iget-object p1, p0, Lcom/crashlytics/android/core/w$1;->ti: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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 03b29f9494..0e7f1cac45 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 tf:Ljava/util/List;
+.field private static final tg:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -19,9 +19,9 @@
 
 
 # instance fields
-.field private final rJ:Lcom/crashlytics/android/core/l;
+.field private final rK:Lcom/crashlytics/android/core/l;
 
-.field private tg:Ljava/lang/Object;
+.field private th:Ljava/lang/Object;
 
 
 # direct methods
@@ -64,7 +64,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/crashlytics/android/core/w;->tf:Ljava/util/List;
+    sput-object v0, Lcom/crashlytics/android/core/w;->tg: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;->rJ:Lcom/crashlytics/android/core/l;
+    iput-object p1, p0, Lcom/crashlytics/android/core/w;->rK: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;->rJ:Lcom/crashlytics/android/core/l;
+    iget-object v0, p0, Lcom/crashlytics/android/core/w;->rK: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;->rJ:Lcom/crashlytics/android/core/l;
+    iget-object p0, p0, Lcom/crashlytics/android/core/w;->rK: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->tf:Ljava/util/List;
+    sget-object v1, Lcom/crashlytics/android/core/w;->tg: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;->tf:Ljava/util/List;
+    sget-object v0, Lcom/crashlytics/android/core/w;->tg: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;->rJ:Lcom/crashlytics/android/core/l;
+    iget-object v2, p0, Lcom/crashlytics/android/core/w;->rK: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;->tg:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/crashlytics/android/core/w;->th:Ljava/lang/Object;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/w;->rJ:Lcom/crashlytics/android/core/l;
+    iget-object v0, p0, Lcom/crashlytics/android/core/w;->rK: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;->tg:Ljava/lang/Object;
+    iput-object p1, p0, Lcom/crashlytics/android/core/w;->th:Ljava/lang/Object;
 
     :cond_0
-    iget-object p1, p0, Lcom/crashlytics/android/core/w;->tg:Ljava/lang/Object;
+    iget-object p1, p0, Lcom/crashlytics/android/core/w;->th: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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 0efb46266c..d2b247b9f7 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;->beq:I
+    sget v5, Lio/fabric/sdk/android/a/e/c;->bel: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;->BQ()Lio/fabric/sdk/android/a/e/d;
+    invoke-virtual {p0}, Lcom/crashlytics/android/core/x;->BO()Lio/fabric/sdk/android/a/e/d;
 
     move-result-object v0
 
-    iget-object v1, p1, Lcom/crashlytics/android/core/u;->qv:Ljava/lang/String;
+    iget-object v1, p1, Lcom/crashlytics/android/core/u;->qw: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;->px:Lio/fabric/sdk/android/i;
+    iget-object v1, p0, Lcom/crashlytics/android/core/x;->py: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;->sJ:Lcom/crashlytics/android/core/aq;
+    iget-object v1, p1, Lcom/crashlytics/android/core/u;->sK: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;->sJ:Lcom/crashlytics/android/core/aq;
+    iget-object p1, p1, Lcom/crashlytics/android/core/u;->sK: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()Lio/fabric/sdk/android/l;
 
     move-result-object v11
 
@@ -262,7 +262,7 @@
 
     :cond_2
     :goto_2
-    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->CG()I
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/e/d;->CE()I
 
     move-result p1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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 63ba781d6e..a7c7b4d225 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 tp:Lcom/crashlytics/android/core/y;
+.field final synthetic tq: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;->tp:Lcom/crashlytics/android/core/y;
+    iput-object p1, p0, Lcom/crashlytics/android/core/y$1;->tq: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;->tp:Lcom/crashlytics/android/core/y;
+    iget-object p1, p0, Lcom/crashlytics/android/core/y$1;->tq: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 b84d238922..f53b375f71 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 tp:Lcom/crashlytics/android/core/y;
+.field final synthetic tq: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;->tp:Lcom/crashlytics/android/core/y;
+    iput-object p1, p0, Lcom/crashlytics/android/core/y$2;->tq: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;->tp:Lcom/crashlytics/android/core/y;
+    iget-object p1, p0, Lcom/crashlytics/android/core/y$2;->tq: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 8ab760b555..7f3313ad3b 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 tl:Ljava/util/concurrent/atomic/AtomicBoolean;
-
-.field final tm:Landroid/content/BroadcastReceiver;
+.field final tm:Ljava/util/concurrent/atomic/AtomicBoolean;
 
 .field final tn:Landroid/content/BroadcastReceiver;
 
-.field to:Z
+.field final to:Landroid/content/BroadcastReceiver;
+
+.field tp: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;->ti:Landroid/content/IntentFilter;
+    sput-object v0, Lcom/crashlytics/android/core/y;->tj: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;->tj:Landroid/content/IntentFilter;
+    sput-object v0, Lcom/crashlytics/android/core/y;->tk: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;->tk:Landroid/content/IntentFilter;
+    sput-object v0, Lcom/crashlytics/android/core/y;->tl: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;->tn:Landroid/content/BroadcastReceiver;
+    iput-object p1, p0, Lcom/crashlytics/android/core/y;->to: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;->tm:Landroid/content/BroadcastReceiver;
+    iput-object p1, p0, Lcom/crashlytics/android/core/y;->tn: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;->tl:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iput-object p1, p0, Lcom/crashlytics/android/core/y;->tm: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;->to:Z
+    iput-boolean p1, p0, Lcom/crashlytics/android/core/y;->tp: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 78d620b51c..7eb41e00ec 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 sG:Lio/fabric/sdk/android/a/g/o;
+.field final sH: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;->sG:Lio/fabric/sdk/android/a/g/o;
+    iput-object p2, p0, Lcom/crashlytics/android/core/z;->sH: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 818b39f7ad..4098481a69 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 uo:Lcom/crashlytics/android/ndk/d;
+.field private final uq:Lcom/crashlytics/android/ndk/d;
 
-.field private final uq:Lcom/crashlytics/android/ndk/b;
+.field private final ur: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;->uo:Lcom/crashlytics/android/ndk/d;
+    iput-object p2, p0, Lcom/crashlytics/android/ndk/a;->uq:Lcom/crashlytics/android/ndk/d;
 
-    iput-object p3, p0, Lcom/crashlytics/android/ndk/a;->uq:Lcom/crashlytics/android/ndk/b;
+    iput-object p3, p0, Lcom/crashlytics/android/ndk/a;->ur: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;->uq:Lcom/crashlytics/android/ndk/b;
+    iget-object v0, p0, Lcom/crashlytics/android/ndk/a;->ur: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;->uo:Lcom/crashlytics/android/ndk/d;
+    iget-object v2, p0, Lcom/crashlytics/android/ndk/a;->uq: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()Lio/fabric/sdk/android/l;
 
     move-result-object v2
 
@@ -93,7 +93,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/crashlytics/android/ndk/a;->uq:Lcom/crashlytics/android/ndk/b;
+    iget-object v0, p0, Lcom/crashlytics/android/ndk/a;->ur: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 a05025ee38..5d194a969e 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 ur:Lcom/crashlytics/android/ndk/f;
+.field private us:Lcom/crashlytics/android/ndk/f;
 
-.field private us:Lcom/crashlytics/android/core/p;
+.field private ut: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;->ur:Lcom/crashlytics/android/ndk/f;
+    iget-object v0, p0, Lcom/crashlytics/android/ndk/c;->us: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;->us:Lcom/crashlytics/android/core/p;
+    iput-object v0, p0, Lcom/crashlytics/android/ndk/c;->ut: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->us:Lcom/crashlytics/android/core/p;
+    iget-object v0, p0, Lcom/crashlytics/android/ndk/c;->ut: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;->ur:Lcom/crashlytics/android/ndk/f;
+    iput-object v1, p0, Lcom/crashlytics/android/ndk/c;->us: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;->sW:Lcom/crashlytics/android/core/q;
+    iput-object p0, v0, Lcom/crashlytics/android/core/l;->sX:Lcom/crashlytics/android/core/q;
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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 70b999277d..1486a0f48b 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 ut:Ljava/io/FileFilter;
+.field private static final uu:Ljava/io/FileFilter;
 
 
 # instance fields
-.field private final pJ:Lio/fabric/sdk/android/a/f/a;
+.field private final pK: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;->ut:Ljava/io/FileFilter;
+    sput-object v0, Lcom/crashlytics/android/ndk/e;->uu: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;->pJ:Lio/fabric/sdk/android/a/f/a;
+    iput-object p1, p0, Lcom/crashlytics/android/ndk/e;->pK: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;->pJ:Lio/fabric/sdk/android/a/f/a;
+    iget-object v1, p0, Lcom/crashlytics/android/ndk/e;->pK: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;->ut:Ljava/io/FileFilter;
+    sget-object v1, Lcom/crashlytics/android/ndk/e;->uu: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 19ebd2f24b..7797aaaa38 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/974"
+.field public static final USER_AGENT:Ljava/lang/String; = "Discord-Android/975"
 
-.field public static final VERSION_CODE:I = 0x3ce
+.field public static final VERSION_CODE:I = 0x3cf
 
-.field public static final VERSION_NAME:Ljava/lang/String; = "9.7.4"
+.field public static final VERSION_NAME:Ljava/lang/String; = "9.7.5"
 
 
 # direct methods
diff --git a/com.discord/smali/com/discord/R$a.smali b/com.discord/smali/com/discord/R$a.smali
index c8efbadbdb..3225508735 100644
--- a/com.discord/smali/com/discord/R$a.smali
+++ b/com.discord/smali/com/discord/R$a.smali
@@ -1457,13 +1457,11 @@
 
 .field public static final LoadingButton:[I
 
-.field public static final LoadingButton_lb_disabled_alpha:I = 0x0
+.field public static final LoadingButton_lb_progress_color:I = 0x0
 
-.field public static final LoadingButton_lb_progress_color:I = 0x1
+.field public static final LoadingButton_lb_text:I = 0x1
 
-.field public static final LoadingButton_lb_text:I = 0x2
-
-.field public static final LoadingButton_lb_text_color:I = 0x3
+.field public static final LoadingButton_lb_text_color:I = 0x2
 
 .field public static final LoadingImageView:[I
 
@@ -2744,7 +2742,7 @@
 
     sput-object v5, Lcom/discord/R$a;->ListPopupWindow:[I
 
-    new-array v5, v6, [I
+    new-array v5, v10, [I
 
     fill-array-data v5, :array_34
 
@@ -2784,7 +2782,7 @@
 
     new-array v5, v1, [I
 
-    const v6, 0x7f04027d
+    const v6, 0x7f04027c
 
     aput v6, v5, v3
 
@@ -2832,7 +2830,7 @@
 
     new-array v5, v1, [I
 
-    const v6, 0x7f040315
+    const v6, 0x7f040314
 
     aput v6, v5, v3
 
@@ -3072,15 +3070,15 @@
         0x7f0401d6
         0x7f0401f9
         0x7f040203
-        0x7f040267
-        0x7f040283
-        0x7f04029b
+        0x7f040266
+        0x7f040282
+        0x7f04029a
+        0x7f0402c8
         0x7f0402c9
-        0x7f0402ca
-        0x7f040323
-        0x7f040326
-        0x7f0403bf
-        0x7f0403c9
+        0x7f040322
+        0x7f040325
+        0x7f0403be
+        0x7f0403c8
     .end array-data
 
     :array_1
@@ -3089,8 +3087,8 @@
         0x7f04004c
         0x7f0400b3
         0x7f04015c
-        0x7f040326
-        0x7f0403c9
+        0x7f040325
+        0x7f0403c8
     .end array-data
 
     :array_2
@@ -3104,11 +3102,11 @@
         0x10100f2
         0x7f040079
         0x7f04007a
+        0x7f04025d
         0x7f04025e
-        0x7f04025f
-        0x7f040280
+        0x7f04027f
+        0x7f040307
         0x7f040308
-        0x7f040309
     .end array-data
 
     :array_4
@@ -3142,15 +3140,15 @@
         0x1010540
         0x7f04011a
         0x7f040121
-        0x7f040259
+        0x7f040258
     .end array-data
 
     :array_8
     .array-data 4
+        0x7f040315
         0x7f040316
         0x7f040317
         0x7f040318
-        0x7f040319
     .end array-data
 
     :array_9
@@ -3162,17 +3160,17 @@
     :array_a
     .array-data 4
         0x1010119
-        0x7f040313
+        0x7f040312
+        0x7f0403bc
         0x7f0403bd
-        0x7f0403be
     .end array-data
 
     :array_b
     .array-data 4
         0x1010142
+        0x7f0403b9
         0x7f0403ba
         0x7f0403bb
-        0x7f0403bc
     .end array-data
 
     :array_c
@@ -3197,8 +3195,8 @@
         0x7f040138
         0x7f040145
         0x7f04020c
-        0x7f04025a
-        0x7f040349
+        0x7f040259
+        0x7f040348
     .end array-data
 
     :array_e
@@ -3274,41 +3272,41 @@
         0x7f040119
         0x7f040168
         0x7f0401e1
+        0x7f04025b
         0x7f04025c
-        0x7f04025d
+        0x7f04025f
         0x7f040260
         0x7f040261
         0x7f040262
         0x7f040263
         0x7f040264
         0x7f040265
-        0x7f040266
+        0x7f04028f
         0x7f040290
         0x7f040291
-        0x7f040292
-        0x7f04029a
-        0x7f04029c
-        0x7f0402cf
+        0x7f040299
+        0x7f04029b
+        0x7f0402ce
+        0x7f0402d1
         0x7f0402d2
         0x7f0402d3
-        0x7f0402d4
-        0x7f0402fb
+        0x7f0402fa
+        0x7f0402fc
         0x7f0402fd
         0x7f0402fe
-        0x7f0402ff
+        0x7f04030f
         0x7f040310
-        0x7f040311
-        0x7f04032a
+        0x7f040329
+        0x7f040353
         0x7f040354
         0x7f040355
         0x7f040356
-        0x7f040357
+        0x7f040358
         0x7f040359
         0x7f04035a
         0x7f04035b
-        0x7f04035c
+        0x7f04035e
         0x7f04035f
-        0x7f040360
         0x7f0403cb
         0x7f0403cc
         0x7f0403cd
@@ -3355,7 +3353,7 @@
         0x7f040207
         0x7f040208
         0x7f04020b
-        0x7f04027f
+        0x7f04027e
     .end array-data
 
     :array_12
@@ -3369,8 +3367,8 @@
     :array_13
     .array-data 4
         0x7f040072
-        0x7f040348
-        0x7f040364
+        0x7f040347
+        0x7f040363
     .end array-data
 
     :array_14
@@ -3461,10 +3459,10 @@
         0x7f040160
         0x7f0401d7
         0x7f0401db
-        0x7f0402d8
-        0x7f040306
-        0x7f040361
-        0x7f040363
+        0x7f0402d7
+        0x7f040305
+        0x7f040360
+        0x7f040362
     .end array-data
 
     :array_19
@@ -3473,8 +3471,8 @@
         0x7f0400a3
         0x7f0400a4
         0x7f0400a5
+        0x7f040309
         0x7f04030a
-        0x7f04030b
     .end array-data
 
     :array_1a
@@ -3514,11 +3512,11 @@
         0x7f040126
         0x7f040127
         0x7f040128
-        0x7f0402f6
-        0x7f0402f8
-        0x7f04031b
+        0x7f0402f5
+        0x7f0402f7
+        0x7f04031a
+        0x7f0403be
         0x7f0403bf
-        0x7f0403c0
         0x7f0403ca
     .end array-data
 
@@ -3699,7 +3697,7 @@
     :array_22
     .array-data 4
         0x7f04020a
-        0x7f04031a
+        0x7f040319
     .end array-data
 
     :array_23
@@ -3727,15 +3725,15 @@
         0x7f0400b8
         0x7f040112
         0x7f040150
-        0x7f04030f
-        0x7f0403b6
+        0x7f04030e
+        0x7f0403b5
     .end array-data
 
     :array_26
     .array-data 4
         0x7f040163
         0x7f040165
-        0x7f0402a0
+        0x7f04029f
     .end array-data
 
     :array_27
@@ -3748,9 +3746,9 @@
         0x7f04013b
         0x7f040142
         0x7f040209
+        0x7f040301
         0x7f040302
         0x7f040303
-        0x7f040304
     .end array-data
 
     :array_28
@@ -3777,10 +3775,10 @@
         0x7f04012e
         0x7f040160
         0x7f04016a
-        0x7f04027c
-        0x7f04029f
-        0x7f0402d8
-        0x7f040306
+        0x7f04027b
+        0x7f04029e
+        0x7f0402d7
+        0x7f040305
         0x7f0403e7
     .end array-data
 
@@ -3789,7 +3787,7 @@
         0x7f040139
         0x7f04013a
         0x7f040204
-        0x7f04025b
+        0x7f04025a
     .end array-data
 
     :array_2b
@@ -3830,15 +3828,16 @@
         0x7f04012f
         0x7f040130
         0x7f040131
-        0x7f040289
+        0x7f040288
+        0x7f040297
         0x7f040298
-        0x7f040299
-        0x7f04029e
+        0x7f04029d
+        0x7f0402c5
         0x7f0402c6
         0x7f0402c7
-        0x7f0402c8
+        0x7f0402d4
         0x7f0402d5
-        0x7f0402d6
+        0x7f0402d8
         0x7f0402d9
         0x7f0402da
         0x7f0402db
@@ -3852,7 +3851,6 @@
         0x7f0402e3
         0x7f0402e4
         0x7f0402e5
-        0x7f0402e6
         0x7f0403ed
     .end array-data
 
@@ -3887,8 +3885,8 @@
         0x1010128
         0x7f04010b
         0x7f040110
-        0x7f04027e
-        0x7f040305
+        0x7f04027d
+        0x7f040304
     .end array-data
 
     :array_32
@@ -3910,7 +3908,6 @@
         0x7f040255
         0x7f040256
         0x7f040257
-        0x7f040258
     .end array-data
 
     :array_35
@@ -3922,6 +3919,7 @@
 
     :array_36
     .array-data 4
+        0x7f040268
         0x7f040269
         0x7f04026a
         0x7f04026b
@@ -3935,7 +3933,6 @@
         0x7f040273
         0x7f040274
         0x7f040275
-        0x7f040276
     .end array-data
 
     :array_37
@@ -3953,15 +3950,15 @@
         0x7f0401da
         0x7f0401dc
         0x7f0401dd
-        0x7f0402d8
+        0x7f0402d7
+        0x7f04031e
         0x7f04031f
-        0x7f040320
     .end array-data
 
     :array_38
     .array-data 4
+        0x7f04031e
         0x7f04031f
-        0x7f040320
     .end array-data
 
     :array_39
@@ -3978,12 +3975,13 @@
         0x7f0400c7
         0x7f040119
         0x7f040143
+        0x7f040277
         0x7f040278
-        0x7f040279
-        0x7f040284
-        0x7f0402f7
-        0x7f04030c
-        0x7f040342
+        0x7f040283
+        0x7f0402f6
+        0x7f04030b
+        0x7f040341
+        0x7f040349
         0x7f04034a
         0x7f04034b
         0x7f04034c
@@ -3993,11 +3991,10 @@
         0x7f040350
         0x7f040351
         0x7f040352
-        0x7f040353
-        0x7f040358
+        0x7f040357
+        0x7f04035c
         0x7f04035d
-        0x7f04035e
-        0x7f040362
+        0x7f040361
     .end array-data
 
     :array_3a
@@ -4032,8 +4029,8 @@
         0x7f0400ce
         0x7f0401dc
         0x7f0401dd
-        0x7f040287
-        0x7f040301
+        0x7f040286
+        0x7f040300
         0x7f0403cf
     .end array-data
 
@@ -4046,8 +4043,8 @@
         0x101012f
         0x1010130
         0x1010131
-        0x7f04029d
-        0x7f040321
+        0x7f04029c
+        0x7f040320
     .end array-data
 
     :array_3d
@@ -4063,20 +4060,20 @@
         0x7f040202
         0x7f040205
         0x7f040208
-        0x7f04027f
+        0x7f04027e
     .end array-data
 
     :array_3e
     .array-data 4
         0x1010176
         0x10102c9
-        0x7f040288
+        0x7f040287
     .end array-data
 
     :array_3f
     .array-data 4
-        0x7f04028c
-        0x7f04028f
+        0x7f04028b
+        0x7f04028e
     .end array-data
 
     :array_40
@@ -4089,9 +4086,9 @@
         0x7f040135
         0x7f040136
         0x7f04020e
-        0x7f0402d7
-        0x7f04030e
-        0x7f040314
+        0x7f0402d6
+        0x7f04030d
+        0x7f040313
     .end array-data
 
     :array_41
@@ -4106,12 +4103,12 @@
         0x7f040155
         0x7f0401de
         0x7f04020d
+        0x7f0402cc
         0x7f0402cd
-        0x7f0402ce
+        0x7f0402f8
         0x7f0402f9
-        0x7f0402fa
-        0x7f040322
-        0x7f040327
+        0x7f040321
+        0x7f040326
         0x7f0403ef
     .end array-data
 
@@ -4119,7 +4116,7 @@
     .array-data 4
         0x7f04007b
         0x7f0400c6
-        0x7f0402f5
+        0x7f0402f4
     .end array-data
 
     :array_43
@@ -4131,15 +4128,16 @@
         0x7f04012f
         0x7f040130
         0x7f040131
-        0x7f040289
+        0x7f040288
+        0x7f040297
         0x7f040298
-        0x7f040299
-        0x7f04029e
+        0x7f04029d
+        0x7f0402c5
         0x7f0402c6
         0x7f0402c7
-        0x7f0402c8
+        0x7f0402d4
         0x7f0402d5
-        0x7f0402d6
+        0x7f0402d8
         0x7f0402d9
         0x7f0402da
         0x7f0402db
@@ -4153,21 +4151,20 @@
         0x7f0402e3
         0x7f0402e4
         0x7f0402e5
-        0x7f0402e6
         0x7f0403ed
     .end array-data
 
     :array_44
     .array-data 4
+        0x7f04030b
         0x7f04030c
-        0x7f04030d
     .end array-data
 
     :array_45
     .array-data 4
         0x101011f
         0x7f04011a
-        0x7f04027a
+        0x7f040279
     .end array-data
 
     :array_46
@@ -4176,7 +4173,7 @@
         0x1010176
         0x101017b
         0x1010262
-        0x7f04029b
+        0x7f04029a
     .end array-data
 
     :array_47
@@ -4191,6 +4188,7 @@
 
     :array_48
     .array-data 4
+        0x7f0402e6
         0x7f0402e7
         0x7f0402e8
         0x7f0402e9
@@ -4204,7 +4202,6 @@
         0x7f0402f1
         0x7f0402f2
         0x7f0402f3
-        0x7f0402f4
     .end array-data
 
     :array_49
@@ -4212,14 +4209,14 @@
         0x1010124
         0x1010125
         0x1010142
-        0x7f040307
-        0x7f040312
+        0x7f040306
+        0x7f040311
+        0x7f040327
         0x7f040328
-        0x7f040329
-        0x7f04032b
+        0x7f04032a
+        0x7f0403b6
         0x7f0403b7
         0x7f0403b8
-        0x7f0403b9
         0x7f0403d0
         0x7f0403d1
         0x7f0403d2
@@ -4234,6 +4231,7 @@
 
     :array_4b
     .array-data 4
+        0x7f04032b
         0x7f04032c
         0x7f04032d
         0x7f04032e
@@ -4255,16 +4253,15 @@
         0x7f04033e
         0x7f04033f
         0x7f040340
-        0x7f040341
+        0x7f040342
         0x7f040343
         0x7f040344
-        0x7f040345
     .end array-data
 
     :array_4c
     .array-data 4
         0x101014f
-        0x7f040346
+        0x7f040345
     .end array-data
 
     :array_4d
@@ -4281,7 +4278,7 @@
         0x1010164
         0x10103ac
         0x7f040145
-        0x7f040349
+        0x7f040348
     .end array-data
 
     :array_4e
@@ -4309,11 +4306,11 @@
         0x7f040164
         0x7f040166
         0x7f040167
+        0x7f040292
         0x7f040293
         0x7f040294
         0x7f040295
         0x7f040296
-        0x7f040297
     .end array-data
 
     :array_4f
@@ -4336,16 +4333,17 @@
         0x7f0400d2
         0x7f0400d3
         0x7f0400d4
+        0x7f040266
         0x7f040267
-        0x7f040268
-        0x7f04027b
+        0x7f04027a
+        0x7f040280
         0x7f040281
-        0x7f040282
-        0x7f04029b
+        0x7f04029a
+        0x7f040322
         0x7f040323
         0x7f040324
-        0x7f040325
-        0x7f0403bf
+        0x7f0403be
+        0x7f0403c0
         0x7f0403c1
         0x7f0403c2
         0x7f0403c3
@@ -4353,7 +4351,6 @@
         0x7f0403c5
         0x7f0403c6
         0x7f0403c7
-        0x7f0403c8
     .end array-data
 
     :array_51
@@ -4366,9 +4363,9 @@
     .array-data 4
         0x1010000
         0x10100da
+        0x7f04028c
         0x7f04028d
-        0x7f04028e
-        0x7f040365
+        0x7f040364
     .end array-data
 
     :array_53
diff --git a/com.discord/smali/com/discord/app/App$b.smali b/com.discord/smali/com/discord/app/App$b.smali
index a98d7fc8cb..c10e123a3c 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 ux:Lcom/discord/app/App$b;
+.field public static final uy: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;->ux:Lcom/discord/app/App$b;
+    sput-object v0, Lcom/discord/app/App$b;->uy: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;->vm:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vn: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 9328753017..a618e94800 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 ed8a4dbe6d..542fd41a13 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 uy:Lcom/discord/app/App$d;
+.field public static final uz: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;->uy:Lcom/discord/app/App$d;
+    sput-object v0, Lcom/discord/app/App$d;->uz: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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 5b803ebf63..859d6d66f0 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 uv:Z
+.field private static final uw:Z
 
-.field public static final uw:Lcom/discord/app/App$a;
+.field public static final ux:Lcom/discord/app/App$a;
 
 
 # instance fields
-.field private final uu:Z
+.field private final uv: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;->uw:Lcom/discord/app/App$a;
+    sput-object v0, Lcom/discord/app/App;->ux:Lcom/discord/app/App$a;
 
     const-string v0, "productionDiscordExternal"
 
@@ -49,7 +49,7 @@
 
     move-result v0
 
-    sput-boolean v0, Lcom/discord/app/App;->uv:Z
+    sput-boolean v0, Lcom/discord/app/App;->uw: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;->uv:Z
+    sget-boolean v0, Lcom/discord/app/App;->uw: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;->uu:Z
+    iget-boolean p1, p0, Lcom/discord/app/App;->uv: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;->uu:Z
+    iget-boolean v2, p0, Lcom/discord/app/App;->uv: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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v3
 
@@ -142,7 +142,7 @@
 
     move-result-object v1
 
-    sget-object v3, Lcom/discord/app/App$b;->ux:Lcom/discord/app/App$b;
+    sget-object v3, Lcom/discord/app/App$b;->uy: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;->vm:Lcom/discord/app/AppLog;
+    sget-object v2, Lcom/discord/app/AppLog;->vn: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;->vm:Lcom/discord/app/AppLog;
+    sget-object v2, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
 
     check-cast v2, Lcom/discord/utilities/logging/Logger;
 
-    sget-object v3, Lcom/discord/app/App$d;->uy:Lcom/discord/app/App$d;
+    sget-object v3, Lcom/discord/app/App$d;->uz:Lcom/discord/app/App$d;
 
     check-cast v3, Lkotlin/jvm/functions/Function2;
 
diff --git a/com.discord/smali/com/discord/app/AppActivity$AppAction.smali b/com.discord/smali/com/discord/app/AppActivity$AppAction.smali
index ff80b80bbc..ff06b22b74 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 uD:Lkotlin/Lazy;
+.field private final uE:Lkotlin/Lazy;
 
 
 # direct methods
@@ -74,7 +74,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/app/AppActivity$AppAction;->uD:Lkotlin/Lazy;
+    iput-object v0, p0, Lcom/discord/app/AppActivity$AppAction;->uE:Lkotlin/Lazy;
 
     return-void
 .end method
@@ -93,7 +93,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/discord/app/AppActivity$AppAction;->uD:Lkotlin/Lazy;
+    iget-object v0, p0, Lcom/discord/app/AppActivity$AppAction;->uE: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 c51d46c1a1..9d472efbae 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 uM:Lcom/discord/app/AppActivity$b$a$a;
+.field public static final uN: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;->uM:Lcom/discord/app/AppActivity$b$a$a;
+    sput-object v0, Lcom/discord/app/AppActivity$b$a$a;->uN: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 adeb5c0b59..27aef85c37 100644
--- a/com.discord/smali/com/discord/app/AppActivity$b.smali
+++ b/com.discord/smali/com/discord/app/AppActivity$b.smali
@@ -21,16 +21,16 @@
 
 
 # static fields
-.field public static final uL:Lcom/discord/app/AppActivity$b$a;
+.field public static final uM:Lcom/discord/app/AppActivity$b$a;
 
 
 # instance fields
 .field final fontScale:I
 
-.field final uJ:Ljava/lang/String;
-
 .field final uK:Ljava/lang/String;
 
+.field final uL:Ljava/lang/String;
+
 
 # direct methods
 .method static constructor <clinit>()V
@@ -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;->uL:Lcom/discord/app/AppActivity$b$a;
+    sput-object v0, Lcom/discord/app/AppActivity$b;->uM: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;->uJ:Ljava/lang/String;
+    iput-object p1, p0, Lcom/discord/app/AppActivity$b;->uK:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/discord/app/AppActivity$b;->uK:Ljava/lang/String;
+    iput-object p2, p0, Lcom/discord/app/AppActivity$b;->uL: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;->uJ: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;->uJ: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
 
@@ -96,9 +96,9 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/discord/app/AppActivity$b;->uK:Ljava/lang/String;
+    iget-object v1, p0, Lcom/discord/app/AppActivity$b;->uL: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;->uL: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;->uJ:Ljava/lang/String;
+    iget-object v0, p0, Lcom/discord/app/AppActivity$b;->uK: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;->uK:Ljava/lang/String;
+    iget-object v2, p0, Lcom/discord/app/AppActivity$b;->uL: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;->uJ: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;
 
@@ -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;->uK:Ljava/lang/String;
+    iget-object v1, p0, Lcom/discord/app/AppActivity$b;->uL: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 3d5159090d..45bc18ca22 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 fa3dcb70f2..9ffa7a9aba 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object v0
 .end method
@@ -108,7 +108,7 @@
 
     check-cast v0, Landroid/app/Activity;
 
-    const v1, 0x7f060137
+    const v1, 0x7f060136
 
     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 e7dea5086e..ee0ef520f7 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object v0
 .end method
@@ -78,7 +78,7 @@
 
     move-result-object v0
 
-    iput-object v0, v1, Lcom/discord/app/j;->wt:Lcom/discord/app/j$a;
+    iput-object v0, v1, Lcom/discord/app/j;->wv: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;->vA:Lcom/discord/app/f;
+    sget-object v0, Lcom/discord/app/f;->vB: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 d6b5e0e596..aa9153570a 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 4cc869c32b..9a3ff90fde 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 cf92eec2c6..355503cde4 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 a1471802bb..e08e936c95 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 uN:Landroidx/appcompat/widget/Toolbar;
+.field final synthetic uO:Landroidx/appcompat/widget/Toolbar;
 
-.field final synthetic uO:I
+.field final synthetic uP:I
 
-.field final synthetic uP:Lrx/functions/Action2;
+.field final synthetic uQ:Lrx/functions/Action2;
 
-.field final synthetic uQ:Lrx/functions/Action1;
+.field final synthetic uR: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;->uN:Landroidx/appcompat/widget/Toolbar;
+    iput-object p1, p0, Lcom/discord/app/AppActivity$j;->uO:Landroidx/appcompat/widget/Toolbar;
 
-    iput p2, p0, Lcom/discord/app/AppActivity$j;->uO:I
+    iput p2, p0, Lcom/discord/app/AppActivity$j;->uP:I
 
-    iput-object p3, p0, Lcom/discord/app/AppActivity$j;->uP:Lrx/functions/Action2;
+    iput-object p3, p0, Lcom/discord/app/AppActivity$j;->uQ:Lrx/functions/Action2;
 
-    iput-object p4, p0, Lcom/discord/app/AppActivity$j;->uQ:Lrx/functions/Action1;
+    iput-object p4, p0, Lcom/discord/app/AppActivity$j;->uR: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;->uP:Lrx/functions/Action2;
+    iget-object v0, p0, Lcom/discord/app/AppActivity$j;->uQ:Lrx/functions/Action2;
 
     if-eqz v0, :cond_0
 
-    iget-object v1, p0, Lcom/discord/app/AppActivity$j;->uN:Landroidx/appcompat/widget/Toolbar;
+    iget-object v1, p0, Lcom/discord/app/AppActivity$j;->uO: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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 31ed672e29..bd2dfc86c1 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 uR:Lcom/discord/app/AppActivity$m;
+.field public static final uS: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;->uR:Lcom/discord/app/AppActivity$m;
+    sput-object v0, Lcom/discord/app/AppActivity$m;->uS: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 4a434e4967..fbf593dc3c 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 uF:Z
+.field private static uG:Z
 
-.field private static final uG:Landroid/content/Intent;
+.field private static final uH:Landroid/content/Intent;
 
-.field private static uH:Z
+.field private static uI:Z
 
-.field public static final uI:Lcom/discord/app/AppActivity$a;
+.field public static final uJ:Lcom/discord/app/AppActivity$a;
 
 
 # instance fields
@@ -43,17 +43,7 @@
 
 .field public toolbar:Landroidx/appcompat/widget/Toolbar;
 
-.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;
+.field final uA:Ljava/util/LinkedHashMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/LinkedHashMap<",
@@ -66,6 +56,16 @@
     .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;->uI:Lcom/discord/app/AppActivity$a;
+    sput-object v0, Lcom/discord/app/AppActivity;->uJ: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;->uG:Landroid/content/Intent;
+    sput-object v0, Lcom/discord/app/AppActivity;->uH:Landroid/content/Intent;
 
-    sput-boolean v2, Lcom/discord/app/AppActivity;->uH:Z
+    sput-boolean v2, Lcom/discord/app/AppActivity;->uI: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;->uz:Ljava/util/LinkedHashMap;
+    iput-object v0, p0, Lcom/discord/app/AppActivity;->uA:Ljava/util/LinkedHashMap;
 
     const/4 v0, -0x1
 
-    iput v0, p0, Lcom/discord/app/AppActivity;->uA:I
+    iput v0, p0, Lcom/discord/app/AppActivity;->uB:I
 
     const-string v0, ""
 
-    iput-object v0, p0, Lcom/discord/app/AppActivity;->uB:Ljava/lang/String;
+    iput-object v0, p0, Lcom/discord/app/AppActivity;->uC:Ljava/lang/String;
 
-    invoke-static {}, Lrx/subjects/PublishSubject;->KA()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->Ky()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;->bgt:Lkotlin/j;
+    sget-object v0, Lkotlin/j;->bgo:Lkotlin/j;
 
-    sget-object v1, Lcom/discord/app/AppActivity$m;->uR:Lcom/discord/app/AppActivity$m;
+    sget-object v1, Lcom/discord/app/AppActivity$m;->uS: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;->uC:Lkotlin/Lazy;
+    iput-object v0, p0, Lcom/discord/app/AppActivity;->uD: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;->uD:Lkotlin/Lazy;
+    iput-object v0, p0, Lcom/discord/app/AppActivity;->uE:Lkotlin/Lazy;
 
-    sget-object v0, Lcom/discord/app/AppActivity;->uG:Landroid/content/Intent;
+    sget-object v0, Lcom/discord/app/AppActivity;->uH:Landroid/content/Intent;
 
-    iput-object v0, p0, Lcom/discord/app/AppActivity;->uE:Landroid/content/Intent;
+    iput-object v0, p0, Lcom/discord/app/AppActivity;->uF:Landroid/content/Intent;
 
     return-void
 .end method
@@ -225,7 +225,7 @@
 
     move-result p1
 
-    sput-boolean p1, Lcom/discord/app/AppActivity;->uF:Z
+    sput-boolean p1, Lcom/discord/app/AppActivity;->uG: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;->uA:I
+    iput p1, p0, Lcom/discord/app/AppActivity;->uB: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;->vA:Lcom/discord/app/f;
+    sget-object v0, Lcom/discord/app/f;->vB: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;->uK:Ljava/lang/String;
+    iget-object v0, p1, Lcom/discord/app/AppActivity$b;->uL: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;->uK:Ljava/lang/String;
+    iget-object p1, p1, Lcom/discord/app/AppActivity$b;->uL: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;->uJ:Ljava/lang/String;
+    iget-object v0, p1, Lcom/discord/app/AppActivity$b;->uK:Ljava/lang/String;
 
-    sget-object v2, Lcom/discord/app/f;->vA:Lcom/discord/app/f;
+    sget-object v2, Lcom/discord/app/f;->vB: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, 0x7f04039e
+    const v4, 0x7f04039d
 
     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;->uA:I
+    iget v4, p0, Lcom/discord/app/AppActivity;->uB:I
 
     if-ne v4, v0, :cond_3
 
     :cond_2
     if-eq p1, v2, :cond_4
 
-    iget p0, p0, Lcom/discord/app/AppActivity;->uA:I
+    iget p0, p0, Lcom/discord/app/AppActivity;->uB:I
 
     if-eq p0, p1, :cond_4
 
@@ -585,7 +585,7 @@
     goto :goto_1
 
     :cond_2
-    sget-object p1, Lcom/discord/app/f;->vA:Lcom/discord/app/f;
+    sget-object p1, Lcom/discord/app/f;->vB: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;->wC:Lcom/discord/app/j$c;
+    sget-object p0, Lcom/discord/app/j$c;->wE:Lcom/discord/app/j$c;
 
     goto :goto_1
 
@@ -731,7 +731,7 @@
 
     const/4 v0, 0x0
 
-    sput-boolean v0, Lcom/discord/app/AppActivity;->uH:Z
+    sput-boolean v0, Lcom/discord/app/AppActivity;->uI: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;->uF:Z
+    sget-boolean v0, Lcom/discord/app/AppActivity;->uG: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;->uH:Z
+    sget-boolean v0, Lcom/discord/app/AppActivity;->uI: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;->uC:Lkotlin/Lazy;
+    iget-object v0, p0, Lcom/discord/app/AppActivity;->uD: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;->wA:Lcom/discord/app/j$c;
+    sget-object v0, Lcom/discord/app/j$c;->wC:Lcom/discord/app/j$c;
 
     check-cast v0, Ljava/io/Serializable;
 
@@ -926,7 +926,7 @@
 
     move-result v1
 
-    iput v1, p0, Lcom/discord/app/AppActivity;->uA:I
+    iput v1, p0, Lcom/discord/app/AppActivity;->uB:I
 
     sget v1, Landroid/os/Build$VERSION;->SDK_INT:I
 
@@ -1056,9 +1056,9 @@
 .method public final getMostRecentIntent()Landroid/content/Intent;
     .locals 2
 
-    iget-object v0, p0, Lcom/discord/app/AppActivity;->uE:Landroid/content/Intent;
+    iget-object v0, p0, Lcom/discord/app/AppActivity;->uF:Landroid/content/Intent;
 
-    sget-object v1, Lcom/discord/app/AppActivity;->uG:Landroid/content/Intent;
+    sget-object v1, Lcom/discord/app/AppActivity;->uH:Landroid/content/Intent;
 
     if-ne v0, v1, :cond_0
 
@@ -1070,7 +1070,7 @@
 
     new-instance v0, Landroid/content/Intent;
 
-    sget-object v1, Lcom/discord/app/AppActivity;->uG:Landroid/content/Intent;
+    sget-object v1, Lcom/discord/app/AppActivity;->uH:Landroid/content/Intent;
 
     invoke-direct {v0, v1}, Landroid/content/Intent;-><init>(Landroid/content/Intent;)V
 
@@ -1107,7 +1107,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/discord/app/AppActivity;->uD:Lkotlin/Lazy;
+    iget-object v0, p0, Lcom/discord/app/AppActivity;->uE:Lkotlin/Lazy;
 
     invoke-interface {v0}, Lkotlin/Lazy;->getValue()Ljava/lang/Object;
 
@@ -1254,7 +1254,7 @@
 .method public onDestroy()V
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/app/AppActivity;->uz:Ljava/util/LinkedHashMap;
+    iget-object v0, p0, Lcom/discord/app/AppActivity;->uA:Ljava/util/LinkedHashMap;
 
     invoke-virtual {v0}, Ljava/util/LinkedHashMap;->clear()V
 
@@ -1270,10 +1270,10 @@
 
     if-nez p1, :cond_0
 
-    sget-object p1, Lcom/discord/app/AppActivity;->uG:Landroid/content/Intent;
+    sget-object p1, Lcom/discord/app/AppActivity;->uH:Landroid/content/Intent;
 
     :cond_0
-    iput-object p1, p0, Lcom/discord/app/AppActivity;->uE:Landroid/content/Intent;
+    iput-object p1, p0, Lcom/discord/app/AppActivity;->uF:Landroid/content/Intent;
 
     invoke-virtual {p0}, Lcom/discord/app/AppActivity;->getMostRecentIntent()Landroid/content/Intent;
 
@@ -1285,7 +1285,7 @@
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/discord/app/AppActivity;->uz:Ljava/util/LinkedHashMap;
+    iget-object v0, p0, Lcom/discord/app/AppActivity;->uA:Ljava/util/LinkedHashMap;
 
     check-cast v0, Ljava/util/Map;
 
@@ -1345,7 +1345,7 @@
 
     invoke-super {p0}, Lcom/discord/app/c;->onResume()V
 
-    sget-object v0, Lcom/discord/app/f;->vA:Lcom/discord/app/f;
+    sget-object v0, Lcom/discord/app/f;->vB:Lcom/discord/app/f;
 
     invoke-static {p0}, Lcom/discord/app/f;->c(Lcom/discord/app/AppActivity;)Z
 
@@ -1364,7 +1364,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/discord/app/AppActivity;->uB:Ljava/lang/String;
+    iget-object v1, p0, Lcom/discord/app/AppActivity;->uC:Ljava/lang/String;
 
     invoke-static {v0, v1}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -1376,7 +1376,7 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/discord/app/AppActivity;->uB:Ljava/lang/String;
+    iget-object v0, p0, Lcom/discord/app/AppActivity;->uC:Ljava/lang/String;
 
     const-string v2, ""
 
@@ -1405,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;->uB:Ljava/lang/String;
+    iput-object v0, p0, Lcom/discord/app/AppActivity;->uC:Ljava/lang/String;
 
-    sget-object v0, Lcom/discord/app/AppActivity$b;->uL:Lcom/discord/app/AppActivity$b$a;
+    sget-object v0, Lcom/discord/app/AppActivity$b;->uM:Lcom/discord/app/AppActivity$b$a;
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -1439,7 +1439,7 @@
 
     move-result-object v2
 
-    sget-object v3, Lcom/discord/app/AppActivity$b$a$a;->uM:Lcom/discord/app/AppActivity$b$a$a;
+    sget-object v3, Lcom/discord/app/AppActivity$b$a$a;->uN:Lcom/discord/app/AppActivity$b$a$a;
 
     check-cast v3, Lkotlin/jvm/functions/Function3;
 
@@ -1514,7 +1514,7 @@
 
     invoke-virtual {v0, p1}, Lcom/discord/views/ToolbarTitleLayout;->setSubtitle(Ljava/lang/CharSequence;)V
 
-    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object p1
 
@@ -1535,7 +1535,7 @@
 
     invoke-virtual {v0, p1}, Lcom/discord/views/ToolbarTitleLayout;->setTitle(Ljava/lang/CharSequence;)V
 
-    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 5368e4d9bd..8bb0ee011a 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 uS:Landroid/view/View;
+.field final synthetic uT:Landroid/view/View;
 
-.field final synthetic uT:Lkotlin/jvm/functions/Function1;
+.field final synthetic uU: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;->uS:Landroid/view/View;
+    iput-object p2, p0, Lcom/discord/app/AppBottomSheet$d;->uT:Landroid/view/View;
 
-    iput-object p3, p0, Lcom/discord/app/AppBottomSheet$d;->uT:Lkotlin/jvm/functions/Function1;
+    iput-object p3, p0, Lcom/discord/app/AppBottomSheet$d;->uU: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;->uT:Lkotlin/jvm/functions/Function1;
+    iget-object p1, p0, Lcom/discord/app/AppBottomSheet$d;->uU:Lkotlin/jvm/functions/Function1;
 
-    iget-object v0, p0, Lcom/discord/app/AppBottomSheet$d;->uS:Landroid/view/View;
+    iget-object v0, p0, Lcom/discord/app/AppBottomSheet$d;->uT: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 c5b573901c..9f8980a8a2 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;->KA()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->Ky()Lrx/subjects/PublishSubject;
 
     move-result-object v0
 
@@ -117,6 +117,20 @@
     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;
@@ -303,20 +317,6 @@
     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-virtual {p0}, Lcom/discord/app/AppBottomSheet;->getAppPermissions()Lcom/discord/app/AppPermissions;
+    invoke-direct {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-virtual {p0}, Lcom/discord/app/AppBottomSheet;->getAppPermissions()Lcom/discord/app/AppPermissions;
+    invoke-direct {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-virtual {p0}, Lcom/discord/app/AppBottomSheet;->getAppPermissions()Lcom/discord/app/AppPermissions;
+    invoke-direct {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-virtual {p0}, Lcom/discord/app/AppBottomSheet;->getAppPermissions()Lcom/discord/app/AppPermissions;
+    invoke-direct {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-virtual {p0}, Lcom/discord/app/AppBottomSheet;->getAppPermissions()Lcom/discord/app/AppPermissions;
+    invoke-direct {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 80926c2b6e..ef94410d09 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 uS:Landroid/view/View;
+.field final synthetic uT:Landroid/view/View;
 
-.field final synthetic uT:Lkotlin/jvm/functions/Function1;
+.field final synthetic uU:Lkotlin/jvm/functions/Function1;
 
-.field final synthetic uU:Lcom/discord/app/AppDialog;
+.field final synthetic uV: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;->uU:Lcom/discord/app/AppDialog;
+    iput-object p1, p0, Lcom/discord/app/AppDialog$a;->uV:Lcom/discord/app/AppDialog;
 
-    iput-object p2, p0, Lcom/discord/app/AppDialog$a;->uS:Landroid/view/View;
+    iput-object p2, p0, Lcom/discord/app/AppDialog$a;->uT:Landroid/view/View;
 
-    iput-object p3, p0, Lcom/discord/app/AppDialog$a;->uT:Lkotlin/jvm/functions/Function1;
+    iput-object p3, p0, Lcom/discord/app/AppDialog$a;->uU: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;->uT:Lkotlin/jvm/functions/Function1;
+    iget-object p1, p0, Lcom/discord/app/AppDialog$a;->uU:Lkotlin/jvm/functions/Function1;
 
-    iget-object v0, p0, Lcom/discord/app/AppDialog$a;->uS:Landroid/view/View;
+    iget-object v0, p0, Lcom/discord/app/AppDialog$a;->uT: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;->uU:Lcom/discord/app/AppDialog;
+    iget-object p1, p0, Lcom/discord/app/AppDialog$a;->uV: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 961fb978e0..7ca0d7453d 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;->KA()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->Ky()Lrx/subjects/PublishSubject;
 
     move-result-object v0
 
@@ -399,7 +399,7 @@
     return-void
 
     :cond_0
-    sget-object p2, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
+    sget-object p2, Lcom/discord/app/AppLog;->vn: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 368382a6d1..04036bfaca 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 uV:Z
+.field private uW: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;->uV:Z
+    iget-boolean v0, p0, Lcom/discord/app/AppEditText;->uW: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;->uV:Z
+    iput-boolean p1, p0, Lcom/discord/app/AppEditText;->uW: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 35fb5870e7..b1cd4803f2 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, 0x7f12054f
+    const v3, 0x7f12052a
 
     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 836dec9fe0..a2f872ffb4 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, 0x7f1212e8
+    const p1, 0x7f12125b
 
     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 5e2734d318..4c464f5899 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;->KA()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->Ky()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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object p1
 
@@ -174,6 +174,20 @@
     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
 
@@ -375,20 +389,6 @@
     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;->Bl()Ljava/io/File;
+    invoke-interface {v0}, Lcom/lytefast/flexinput/managers/FileManager;->Bj()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;->uW:Ljava/util/TreeMap;
+    iget-object v0, v0, Lcom/discord/app/c;->uX: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;->bnb:Lkotterknife/a;
+    sget-object v0, Lkotterknife/a;->bmW: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;->uz:Ljava/util/LinkedHashMap;
+    iget-object v0, v0, Lcom/discord/app/AppActivity;->uA: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-virtual {p0}, Lcom/discord/app/AppFragment;->getAppPermissions()Lcom/discord/app/AppPermissions;
+    invoke-direct {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-virtual {p0}, Lcom/discord/app/AppFragment;->getAppPermissions()Lcom/discord/app/AppPermissions;
+    invoke-direct {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-virtual {p0}, Lcom/discord/app/AppFragment;->getAppPermissions()Lcom/discord/app/AppPermissions;
+    invoke-direct {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-virtual {p0}, Lcom/discord/app/AppFragment;->getAppPermissions()Lcom/discord/app/AppPermissions;
+    invoke-direct {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-virtual {p0}, Lcom/discord/app/AppFragment;->getAppPermissions()Lcom/discord/app/AppPermissions;
+    invoke-direct {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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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;->uW:Ljava/util/TreeMap;
+    iget-object v2, v0, Lcom/discord/app/c;->uX: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;->uW:Ljava/util/TreeMap;
+    iget-object p1, v0, Lcom/discord/app/c;->uX: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;->uz:Ljava/util/LinkedHashMap;
+    iget-object v0, v1, Lcom/discord/app/AppActivity;->uA: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 c806213ac1..b1646a84aa 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 sL:J
-
-.field private final vn:Lkotlin/Lazy;
+.field private final sM:J
 
 .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;->sL:J
+    iput-wide v0, p0, Lcom/discord/app/AppLog$Elapsed;->sM: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;->vn:Lkotlin/Lazy;
+    iput-object v0, p0, Lcom/discord/app/AppLog$Elapsed;->vo: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;->vo:Lkotlin/Lazy;
+    iput-object v0, p0, Lcom/discord/app/AppLog$Elapsed;->vp: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;->sL:J
+    iget-wide v0, p0, Lcom/discord/app/AppLog$Elapsed;->sM: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;->vn:Lkotlin/Lazy;
+    iget-object v0, p0, Lcom/discord/app/AppLog$Elapsed;->vo: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;->vo:Lkotlin/Lazy;
+    iget-object v0, p0, Lcom/discord/app/AppLog$Elapsed;->vp: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 39dd799dc8..25c18af7e0 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;->vm:Lcom/discord/app/AppLog;
+    sget-object v2, Lcom/discord/app/AppLog;->vn: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;->vm:Lcom/discord/app/AppLog;
+    sget-object p1, Lcom/discord/app/AppLog;->vn: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;->vm:Lcom/discord/app/AppLog;
+    sget-object p1, Lcom/discord/app/AppLog;->vn: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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 53d099840e..eaee84d625 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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;->vm:Lcom/discord/app/AppLog;
+    sget-object v1, Lcom/discord/app/AppLog;->vn: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 5b77ec89e0..37eec2b067 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 273cb40cb4..d2e6320e3f 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 5eb68f184e..912c9e4ba6 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 vk:Landroid/content/SharedPreferences;
+.field private static vl:Landroid/content/SharedPreferences;
 
-.field private static final vl:Lrx/subjects/SerializedSubject;
+.field private static final vm:Lrx/subjects/SerializedSubject;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/subjects/SerializedSubject<",
@@ -26,7 +26,7 @@
     .end annotation
 .end field
 
-.field public static final vm:Lcom/discord/app/AppLog;
+.field public static final vn: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;->vm:Lcom/discord/app/AppLog;
+    sput-object v0, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
 
     new-instance v0, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/a;->KB()Lrx/subjects/a;
+    invoke-static {}, Lrx/subjects/a;->Kz()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;->vl:Lrx/subjects/SerializedSubject;
+    sput-object v0, Lcom/discord/app/AppLog;->vm: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;->vk:Landroid/content/SharedPreferences;
+    sget-object v0, Lcom/discord/app/AppLog;->vl:Landroid/content/SharedPreferences;
 
     if-eqz v0, :cond_0
 
@@ -169,7 +169,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/discord/app/AppLog;->vl:Lrx/subjects/SerializedSubject;
+    sget-object v0, Lcom/discord/app/AppLog;->vm:Lrx/subjects/SerializedSubject;
 
     new-instance v1, Lcom/discord/app/AppLog$LoggedItem;
 
@@ -429,7 +429,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/discord/app/AppLog;->vl:Lrx/subjects/SerializedSubject;
+    sget-object v0, Lcom/discord/app/AppLog;->vm:Lrx/subjects/SerializedSubject;
 
     check-cast v0, Lrx/Observable;
 
@@ -437,7 +437,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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;->vm:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
 
     const/4 v1, 0x0
 
@@ -481,7 +481,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/discord/app/AppLog;->vk:Landroid/content/SharedPreferences;
+    sput-object v0, Lcom/discord/app/AppLog;->vl: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;->vm:Lcom/discord/app/AppLog;
+    sget-object v2, Lcom/discord/app/AppLog;->vn: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 558b42c61c..a1ef11dc7d 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 081d328c7f..f6149b7f88 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 92ae26cdd8..57b68dba9f 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 vq:Ljava/util/HashMap;
+.field private static final vr: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 vr:I = 0xd2
+.field private static final vs:I = 0xd2
 
 # The value of this static final field might be set in the static constructor
-.field private static final vs:I = 0xd3
+.field private static final vt:I = 0xd3
 
 # The value of this static final field might be set in the static constructor
-.field private static final vt:I = 0xde
+.field private static final vu:I = 0xde
 
 # The value of this static final field might be set in the static constructor
-.field private static final vu:I = 0xd5
+.field private static final vv:I = 0xd5
 
-.field public static final vv:Lcom/discord/app/AppPermissions$a;
+.field public static final vw: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 vp:Ljava/util/HashMap;
+.field private final vq: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;->vv:Lcom/discord/app/AppPermissions$a;
+    sput-object v0, Lcom/discord/app/AppPermissions;->vw: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;->vq:Ljava/util/HashMap;
+    sput-object v0, Lcom/discord/app/AppPermissions;->vr:Ljava/util/HashMap;
 
     const/16 v0, 0xd2
 
-    sput v0, Lcom/discord/app/AppPermissions;->vr:I
+    sput v0, Lcom/discord/app/AppPermissions;->vs:I
 
     const/16 v0, 0xd3
 
-    sput v0, Lcom/discord/app/AppPermissions;->vs:I
+    sput v0, Lcom/discord/app/AppPermissions;->vt:I
 
     const/16 v0, 0xde
 
-    sput v0, Lcom/discord/app/AppPermissions;->vt:I
+    sput v0, Lcom/discord/app/AppPermissions;->vu:I
 
     const/16 v0, 0xd5
 
-    sput v0, Lcom/discord/app/AppPermissions;->vu:I
+    sput v0, Lcom/discord/app/AppPermissions;->vv:I
 
-    sget-object v0, Lcom/discord/app/AppPermissions;->vq:Ljava/util/HashMap;
+    sget-object v0, Lcom/discord/app/AppPermissions;->vr:Ljava/util/HashMap;
 
     check-cast v0, Ljava/util/Map;
 
-    sget v2, Lcom/discord/app/AppPermissions;->vs:I
+    sget v2, Lcom/discord/app/AppPermissions;->vt: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;->vq:Ljava/util/HashMap;
+    sget-object v0, Lcom/discord/app/AppPermissions;->vr:Ljava/util/HashMap;
 
     check-cast v0, Ljava/util/Map;
 
-    sget v2, Lcom/discord/app/AppPermissions;->vr:I
+    sget v2, Lcom/discord/app/AppPermissions;->vs: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;->vq:Ljava/util/HashMap;
+    sget-object v0, Lcom/discord/app/AppPermissions;->vr:Ljava/util/HashMap;
 
     check-cast v0, Ljava/util/Map;
 
-    sget v2, Lcom/discord/app/AppPermissions;->vt:I
+    sget v2, Lcom/discord/app/AppPermissions;->vu: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;->vq:Ljava/util/HashMap;
+    sget-object v0, Lcom/discord/app/AppPermissions;->vr:Ljava/util/HashMap;
 
     check-cast v0, Ljava/util/Map;
 
-    sget v2, Lcom/discord/app/AppPermissions;->vu:I
+    sget v2, Lcom/discord/app/AppPermissions;->vv: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;->vp:Ljava/util/HashMap;
+    iput-object p1, p0, Lcom/discord/app/AppPermissions;->vq: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;->vq:Ljava/util/HashMap;
+    sget-object p2, Lcom/discord/app/AppPermissions;->vr: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;->vp:Ljava/util/HashMap;
+    iget-object v1, p0, Lcom/discord/app/AppPermissions;->vq: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;->vp:Ljava/util/HashMap;
+    iget-object v1, p0, Lcom/discord/app/AppPermissions;->vq: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;->vs:I
+    sget v2, Lcom/discord/app/AppPermissions;->vt:I
 
     if-ne p1, v2, :cond_0
 
-    const p1, 0x7f120dce
+    const p1, 0x7f120d94
 
     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;->vt:I
+    sget v2, Lcom/discord/app/AppPermissions;->vu:I
 
     if-ne p1, v2, :cond_1
 
-    const p1, 0x7f120dcc
+    const p1, 0x7f120d92
 
     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;->vu:I
+    sget v2, Lcom/discord/app/AppPermissions;->vv:I
 
     if-ne p1, v2, :cond_2
 
-    const p1, 0x7f120dcd
+    const p1, 0x7f120d93
 
     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;->vt:I
+    sget v0, Lcom/discord/app/AppPermissions;->vu: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;->vu:I
+    sget v0, Lcom/discord/app/AppPermissions;->vv: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;->vs:I
+    sget v0, Lcom/discord/app/AppPermissions;->vt: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;->vr:I
+    sget v0, Lcom/discord/app/AppPermissions;->vs: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 d9f45fd46f..01ffcb9b2a 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 vE:Lcom/discord/app/AppScrollingViewBehavior;
+.field final synthetic vF:Lcom/discord/app/AppScrollingViewBehavior;
 
-.field final synthetic vF:Landroid/view/View;
+.field final synthetic vG: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;->vE:Lcom/discord/app/AppScrollingViewBehavior;
+    iput-object p1, p0, Lcom/discord/app/AppScrollingViewBehavior$a;->vF:Lcom/discord/app/AppScrollingViewBehavior;
 
-    iput-object p2, p0, Lcom/discord/app/AppScrollingViewBehavior$a;->vF:Landroid/view/View;
+    iput-object p2, p0, Lcom/discord/app/AppScrollingViewBehavior$a;->vG: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;->vE:Lcom/discord/app/AppScrollingViewBehavior;
+    iget-object v0, p0, Lcom/discord/app/AppScrollingViewBehavior$a;->vF:Lcom/discord/app/AppScrollingViewBehavior;
 
-    iget-object v1, p0, Lcom/discord/app/AppScrollingViewBehavior$a;->vF:Landroid/view/View;
+    iget-object v1, p0, Lcom/discord/app/AppScrollingViewBehavior$a;->vG: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 fd353b082a..15f5ac4d2b 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 vC:F
+.field private final vD:F
 
-.field private vD:Z
+.field private vE:Z
 
 
 # direct methods
@@ -35,7 +35,7 @@
 
     move-result p1
 
-    iput p1, p0, Lcom/discord/app/AppScrollingViewBehavior;->vC:F
+    iput p1, p0, Lcom/discord/app/AppScrollingViewBehavior;->vD:F
 
     return-void
 .end method
@@ -45,7 +45,7 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/discord/app/AppScrollingViewBehavior;->vD:Z
+    iput-boolean v0, p0, Lcom/discord/app/AppScrollingViewBehavior;->vE: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;->vD:Z
+    iput-boolean p1, p0, Lcom/discord/app/AppScrollingViewBehavior;->vE:Z
 
     return-void
 .end method
@@ -150,7 +150,7 @@
 
     div-float/2addr p1, v0
 
-    iget v0, p0, Lcom/discord/app/AppScrollingViewBehavior;->vC:F
+    iget v0, p0, Lcom/discord/app/AppScrollingViewBehavior;->vD: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 cfac2ac33e..3f10c8ce24 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:Ljava/lang/String;
+.field private vM:I
+
+.field private vN:Ljava/lang/String;
 
 
 # direct methods
@@ -63,7 +63,7 @@
 
     const/4 v0, -0x1
 
-    iput v0, p0, Lcom/discord/app/AppTextView;->vL:I
+    iput v0, p0, Lcom/discord/app/AppTextView;->vM:I
 
     if-eqz p2, :cond_1
 
@@ -79,7 +79,7 @@
 
     move-result-object p2
 
-    iput-object p2, p0, Lcom/discord/app/AppTextView;->vM:Ljava/lang/String;
+    iput-object p2, p0, Lcom/discord/app/AppTextView;->vN:Ljava/lang/String;
 
     const/4 p2, 0x3
 
@@ -87,7 +87,7 @@
 
     move-result p2
 
-    iput p2, p0, Lcom/discord/app/AppTextView;->vL:I
+    iput p2, p0, Lcom/discord/app/AppTextView;->vM:I
 
     const/4 p2, 0x2
 
@@ -95,7 +95,7 @@
 
     move-result p2
 
-    iput p2, p0, Lcom/discord/app/AppTextView;->vK:I
+    iput p2, p0, Lcom/discord/app/AppTextView;->vL: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;->vK:I
+    iget p1, p0, Lcom/discord/app/AppTextView;->vL:I
 
     if-lez p1, :cond_0
 
-    iget p1, p0, Lcom/discord/app/AppTextView;->vL:I
+    iget p1, p0, Lcom/discord/app/AppTextView;->vM:I
 
     if-lez p1, :cond_0
 
@@ -123,7 +123,7 @@
 
     move-result-object v1
 
-    iget v3, p0, Lcom/discord/app/AppTextView;->vK:I
+    iget v3, p0, Lcom/discord/app/AppTextView;->vL: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;->bhO:Lkotlin/jvm/internal/ab;
+    sget-object p2, Lkotlin/jvm/internal/ab;->bhJ: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;->vM:Ljava/lang/String;
+    iget-object p1, p0, Lcom/discord/app/AppTextView;->vN: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;->vM:Ljava/lang/String;
+    iget-object v0, p0, Lcom/discord/app/AppTextView;->vN: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;->vM:Ljava/lang/String;
+    iput-object p1, p0, Lcom/discord/app/AppTextView;->vN: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;->bhO:Lkotlin/jvm/internal/ab;
+    sget-object v0, Lkotlin/jvm/internal/ab;->bhJ:Lkotlin/jvm/internal/ab;
 
-    iget-object v0, p0, Lcom/discord/app/AppTextView;->vM:Ljava/lang/String;
+    iget-object v0, p0, Lcom/discord/app/AppTextView;->vN: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 8d5423512c..82deac3a70 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;->vm:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vn: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 f2cf410fcb..c688710ccc 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 wK:Lcom/discord/app/DiscordConnectService$b;
+.field public static final wM: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;->wK:Lcom/discord/app/DiscordConnectService$b;
+    sput-object v0, Lcom/discord/app/DiscordConnectService$b;->wM: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 ed17f495c2..3c4d5ad655 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 wM:Lcom/discord/app/DiscordConnectService$c$1;
+.field public static final wO: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;->wM:Lcom/discord/app/DiscordConnectService$c$1;
+    sput-object v0, Lcom/discord/app/DiscordConnectService$c$1;->wO: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 c2b01ab694..8ff6747a71 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 wL:Lcom/discord/app/DiscordConnectService$c;
+.field public static final wN: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;->wL:Lcom/discord/app/DiscordConnectService$c;
+    sput-object v0, Lcom/discord/app/DiscordConnectService$c;->wN: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;->wM:Lcom/discord/app/DiscordConnectService$c$1;
+    sget-object v0, Lcom/discord/app/DiscordConnectService$c$1;->wO: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 a5c563a720..26ed52aa3d 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 wN:Lcom/discord/app/DiscordConnectService$d;
+.field public static final wP: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;->wN:Lcom/discord/app/DiscordConnectService$d;
+    sput-object v0, Lcom/discord/app/DiscordConnectService$d;->wP: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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 26457deca4..82bae8cbdc 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;->wJ:Lcom/discord/app/DiscordConnectService$a;
+    sget-object v0, Lcom/discord/app/DiscordConnectService;->wL: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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 3e3d8d3aa9..9b9cbf4886 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;->wJ:Lcom/discord/app/DiscordConnectService$a;
+    sget-object v0, Lcom/discord/app/DiscordConnectService;->wL: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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 119a5cee7f..8b7bb36211 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 wI:Z
+.field private static final wK:Z
 
-.field public static final wJ:Lcom/discord/app/DiscordConnectService$a;
+.field public static final wL: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;->wJ:Lcom/discord/app/DiscordConnectService$a;
+    sput-object v0, Lcom/discord/app/DiscordConnectService;->wL:Lcom/discord/app/DiscordConnectService$a;
 
-    sget-object v0, Lcom/discord/samsung/a;->Bc:Lcom/discord/samsung/a;
+    sget-object v0, Lcom/discord/samsung/a;->Bf:Lcom/discord/samsung/a;
 
-    invoke-static {}, Lcom/discord/samsung/a;->eK()Z
+    invoke-static {}, Lcom/discord/samsung/a;->eJ()Z
 
     move-result v0
 
-    sput-boolean v0, Lcom/discord/app/DiscordConnectService;->wI:Z
+    sput-boolean v0, Lcom/discord/app/DiscordConnectService;->wK:Z
 
     return-void
 .end method
@@ -89,7 +89,7 @@
 
     invoke-super {p0}, Landroid/app/Service;->onCreate()V
 
-    sget-boolean v0, Lcom/discord/app/DiscordConnectService;->wI:Z
+    sget-boolean v0, Lcom/discord/app/DiscordConnectService;->wK: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;->vI:Lcom/discord/app/g;
+    sget-object v0, Lcom/discord/app/g;->vJ: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, 0x7f08031a
+    const v2, 0x7f08030e
 
     invoke-virtual {v0, v2}, Landroidx/core/app/NotificationCompat$Builder;->setSmallIcon(I)Landroidx/core/app/NotificationCompat$Builder;
 
     move-result-object v0
 
-    const v2, 0x7f06002d
+    const v2, 0x7f06002c
 
     invoke-static {v1, v2}, Landroidx/core/content/ContextCompat;->getColor(Landroid/content/Context;I)I
 
@@ -169,7 +169,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f120465
+    const v1, 0x7f120440
 
     invoke-virtual {p0, v1}, Lcom/discord/app/DiscordConnectService;->getString(I)Ljava/lang/String;
 
@@ -181,7 +181,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f12046c
+    const v1, 0x7f120447
 
     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;->vI:Lcom/discord/app/g;
+    sget-object v0, Lcom/discord/app/g;->vJ: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;->wI:Z
+    sget-boolean v4, Lcom/discord/app/DiscordConnectService;->wK:Z
 
     if-eqz v4, :cond_b
 
@@ -329,7 +329,7 @@
 
     check-cast v2, Landroid/content/Context;
 
-    const v3, 0x7f120d3d
+    const v3, 0x7f120d06
 
     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;->xd:Lcom/discord/app/a/a;
+    sget-object v4, Lcom/discord/app/a/a;->xf: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;->wK:Lcom/discord/app/DiscordConnectService$b;
+    sget-object v3, Lcom/discord/app/DiscordConnectService$b;->wM: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;->wL:Lcom/discord/app/DiscordConnectService$c;
+    sget-object v3, Lcom/discord/app/DiscordConnectService$c;->wN: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;->bgy:Lkotlin/Unit;
+    sget-object v2, Lkotlin/Unit;->bgt: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;->wN:Lcom/discord/app/DiscordConnectService$d;
+    sget-object v2, Lcom/discord/app/DiscordConnectService$d;->wP: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 2e242b8235..f46beb7596 100644
--- a/com.discord/smali/com/discord/app/a/a.smali
+++ b/com.discord/smali/com/discord/app/a/a.smali
@@ -10,23 +10,19 @@
 
 .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:Lkotlin/text/Regex;
+.field private static final wR:Ljava/lang/String;
 
-.field private static final wS:Lkotlin/text/Regex;
+.field private static final wS:Ljava/lang/String;
 
-.field public static final wT:Lkotlin/text/Regex;
+.field private static final wT:Lkotlin/text/Regex;
 
-.field public static final wU:Lkotlin/text/Regex;
+.field private static final wU:Lkotlin/text/Regex;
 
-.field private static final wV:Lkotlin/text/Regex;
+.field public static final wV:Lkotlin/text/Regex;
 
-.field private static final wW:Lkotlin/text/Regex;
+.field public static final wW:Lkotlin/text/Regex;
 
 .field private static final wX:Lkotlin/text/Regex;
 
@@ -40,7 +36,11 @@
 
 .field private static final xc:Lkotlin/text/Regex;
 
-.field public static final xd:Lcom/discord/app/a/a;
+.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;
 
 
 # direct methods
@@ -51,7 +51,7 @@
 
     invoke-direct {v0}, Lcom/discord/app/a/a;-><init>()V
 
-    sput-object v0, Lcom/discord/app/a/a;->xd:Lcom/discord/app/a/a;
+    sput-object v0, Lcom/discord/app/a/a;->xf: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;->wO:Ljava/lang/String;
+    sput-object v0, Lcom/discord/app/a/a;->wQ: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;->wP:Ljava/lang/String;
+    sput-object v0, Lcom/discord/app/a/a;->wR: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;->wQ:Ljava/lang/String;
+    sput-object v0, Lcom/discord/app/a/a;->wS:Ljava/lang/String;
 
-    sget-object v0, Lkotlin/text/k;->bjh:Lkotlin/text/k;
+    sget-object v0, Lkotlin/text/k;->bjc: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;->wR:Lkotlin/text/Regex;
+    sput-object v1, Lcom/discord/app/a/a;->wT:Lkotlin/text/Regex;
 
-    sget-object v0, Lkotlin/text/k;->bjh:Lkotlin/text/k;
+    sget-object v0, Lkotlin/text/k;->bjc: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;->wS:Lkotlin/text/Regex;
+    sput-object v1, Lcom/discord/app/a/a;->wU: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;->wO: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;
 
@@ -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;->wQ:Ljava/lang/String;
+    sget-object v1, Lcom/discord/app/a/a;->wS: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;->wQ:Ljava/lang/String;
+    sget-object v1, Lcom/discord/app/a/a;->wS: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;->bjh:Lkotlin/text/k;
+    sget-object v2, Lkotlin/text/k;->bjc: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;->wT:Lkotlin/text/Regex;
+    sput-object v3, Lcom/discord/app/a/a;->wV: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;->wO:Ljava/lang/String;
+    sget-object v2, Lcom/discord/app/a/a;->wQ: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;->wP:Ljava/lang/String;
+    sget-object v2, Lcom/discord/app/a/a;->wR: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;->bjh:Lkotlin/text/k;
+    sget-object v1, Lkotlin/text/k;->bjc: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;->wU:Lkotlin/text/Regex;
+    sput-object v2, Lcom/discord/app/a/a;->wW:Lkotlin/text/Regex;
 
-    sget-object v0, Lkotlin/text/k;->bjh:Lkotlin/text/k;
+    sget-object v0, Lkotlin/text/k;->bjc: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;->wV:Lkotlin/text/Regex;
+    sput-object v1, Lcom/discord/app/a/a;->wX:Lkotlin/text/Regex;
 
-    sget-object v0, Lkotlin/text/k;->bjh:Lkotlin/text/k;
+    sget-object v0, Lkotlin/text/k;->bjc: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;->wW:Lkotlin/text/Regex;
+    sput-object v1, Lcom/discord/app/a/a;->wY:Lkotlin/text/Regex;
 
-    sget-object v0, Lkotlin/text/k;->bjh:Lkotlin/text/k;
+    sget-object v0, Lkotlin/text/k;->bjc: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;->wX:Lkotlin/text/Regex;
+    sput-object v1, Lcom/discord/app/a/a;->wZ:Lkotlin/text/Regex;
 
-    sget-object v0, Lkotlin/text/k;->bjh:Lkotlin/text/k;
+    sget-object v0, Lkotlin/text/k;->bjc: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;->wY:Lkotlin/text/Regex;
+    sput-object v1, Lcom/discord/app/a/a;->xa:Lkotlin/text/Regex;
 
-    sget-object v0, Lkotlin/text/k;->bjh:Lkotlin/text/k;
+    sget-object v0, Lkotlin/text/k;->bjc: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;->wZ:Lkotlin/text/Regex;
+    sput-object v1, Lcom/discord/app/a/a;->xb: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;->wO: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;
 
@@ -281,15 +281,15 @@
 
     move-result-object v0
 
-    sget-object v1, Lkotlin/text/k;->bjh:Lkotlin/text/k;
+    sget-object v1, Lkotlin/text/k;->bjc: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;->xa:Lkotlin/text/Regex;
+    sput-object v2, Lcom/discord/app/a/a;->xc:Lkotlin/text/Regex;
 
-    sget-object v0, Lkotlin/text/k;->bjh:Lkotlin/text/k;
+    sget-object v0, Lkotlin/text/k;->bjc: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;->xb:Lkotlin/text/Regex;
+    sput-object v1, Lcom/discord/app/a/a;->xd:Lkotlin/text/Regex;
 
-    sget-object v0, Lkotlin/text/k;->bjh:Lkotlin/text/k;
+    sget-object v0, Lkotlin/text/k;->bjc: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;->xc:Lkotlin/text/Regex;
+    sput-object v1, Lcom/discord/app/a/a;->xe: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;->wS:Lkotlin/text/Regex;
+    sget-object v0, Lcom/discord/app/a/a;->wU: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;->xa:Lkotlin/text/Regex;
+    sget-object v0, Lcom/discord/app/a/a;->xc: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;->wR:Lkotlin/text/Regex;
+    sget-object v0, Lcom/discord/app/a/a;->wT: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;->wS:Lkotlin/text/Regex;
+    sget-object v0, Lcom/discord/app/a/a;->wU: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;->wV:Lkotlin/text/Regex;
+    sget-object v0, Lcom/discord/app/a/a;->wX: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;->wW:Lkotlin/text/Regex;
+    sget-object v0, Lcom/discord/app/a/a;->wY: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;->wX:Lkotlin/text/Regex;
+    sget-object v0, Lcom/discord/app/a/a;->wZ: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;->wY:Lkotlin/text/Regex;
+    sget-object v0, Lcom/discord/app/a/a;->xa: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;->wZ:Lkotlin/text/Regex;
+    sget-object v0, Lcom/discord/app/a/a;->xb: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;->xb:Lkotlin/text/Regex;
+    sget-object v0, Lcom/discord/app/a/a;->xd: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;->xc:Lkotlin/text/Regex;
+    sget-object v0, Lcom/discord/app/a/a;->xe: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 ea313fc961..568cf2806a 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 uX:Lcom/discord/app/c$a;
+.field public static final uY:Lcom/discord/app/c$a;
 
 
 # instance fields
-.field final uW:Ljava/util/TreeMap;
+.field final uX: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;->uX:Lcom/discord/app/c$a;
+    sput-object v0, Lcom/discord/app/c;->uY: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;->uW:Ljava/util/TreeMap;
+    iput-object v0, p0, Lcom/discord/app/c;->uX: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;->uW:Ljava/util/TreeMap;
+    iget-object v0, p0, Lcom/discord/app/c;->uX: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 66c8cb9034..765800dee1 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 uY:Ljava/lang/String; = "https://status.discordapp.com/"
+.field public static final uZ: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 uZ:Ljava/lang/String; = "https://support.discordapp.com"
+.field public static final va: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 va:Ljava/lang/String; = "https://support-dev.discordapp.com"
+.field public static final vb: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 vb:Ljava/lang/String; = "https://discordapp.com/acknowledgements"
+.field public static final vc: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 vc:J = 0xd1679fcL
+.field public static final vd:J = 0xd1679fcL
 
 # The value of this static final field might be set in the static constructor
-.field public static final vd:J = 0x53d1ea1c57L
+.field public static final ve:J = 0x53d1ea1c57L
 
 # The value of this static final field might be set in the static constructor
-.field public static final ve:J = 0x53d1e9852cL
+.field public static final vf:J = 0x53d1e9852cL
 
 # The value of this static final field might be set in the static constructor
-.field public static final vf:J = 0x53d1eac657L
+.field public static final vg:J = 0x53d1eac657L
 
 # The value of this static final field might be set in the static constructor
-.field public static final vg:J = 0x53d28f5538L
+.field public static final vh:J = 0x53d28f5538L
 
 # The value of this static final field might be set in the static constructor
-.field public static final vh:J = 0x53d3623db8L
+.field public static final vi:J = 0x53d3623db8L
 
 # The value of this static final field might be set in the static constructor
-.field public static final vi:J = 0x53d357e4d0L
+.field public static final vj:J = 0x53d357e4d0L
 
-.field public static final vj:Lcom/discord/app/e;
+.field public static final vk: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;->vj:Lcom/discord/app/e;
+    sput-object v0, Lcom/discord/app/e;->vk:Lcom/discord/app/e;
 
     const-string v0, "https://status.discordapp.com/"
 
-    sput-object v0, Lcom/discord/app/e;->uY:Ljava/lang/String;
+    sput-object v0, Lcom/discord/app/e;->uZ:Ljava/lang/String;
 
     const-string v0, "https://support.discordapp.com"
 
-    sput-object v0, Lcom/discord/app/e;->uZ:Ljava/lang/String;
+    sput-object v0, Lcom/discord/app/e;->va:Ljava/lang/String;
 
     const-string v0, "https://support-dev.discordapp.com"
 
-    sput-object v0, Lcom/discord/app/e;->va:Ljava/lang/String;
+    sput-object v0, Lcom/discord/app/e;->vb:Ljava/lang/String;
 
     const-string v0, "https://discordapp.com/acknowledgements"
 
-    sput-object v0, Lcom/discord/app/e;->vb:Ljava/lang/String;
+    sput-object v0, Lcom/discord/app/e;->vc:Ljava/lang/String;
 
     const-wide/32 v0, 0xd1679fc
 
-    sput-wide v0, Lcom/discord/app/e;->vc:J
+    sput-wide v0, Lcom/discord/app/e;->vd:J
 
     const-wide v0, 0x53d1ea1c57L
 
-    sput-wide v0, Lcom/discord/app/e;->vd:J
+    sput-wide v0, Lcom/discord/app/e;->ve:J
 
     const-wide v0, 0x53d1e9852cL
 
-    sput-wide v0, Lcom/discord/app/e;->ve:J
+    sput-wide v0, Lcom/discord/app/e;->vf:J
 
     const-wide v0, 0x53d1eac657L
 
-    sput-wide v0, Lcom/discord/app/e;->vf:J
+    sput-wide v0, Lcom/discord/app/e;->vg:J
 
     const-wide v0, 0x53d28f5538L
 
-    sput-wide v0, Lcom/discord/app/e;->vg:J
+    sput-wide v0, Lcom/discord/app/e;->vh:J
 
     const-wide v0, 0x53d3623db8L
 
-    sput-wide v0, Lcom/discord/app/e;->vh:J
+    sput-wide v0, Lcom/discord/app/e;->vi:J
 
     const-wide v0, 0x53d357e4d0L
 
-    sput-wide v0, Lcom/discord/app/e;->vi:J
+    sput-wide v0, Lcom/discord/app/e;->vj:J
 
     return-void
 .end method
@@ -112,7 +112,7 @@
 
     invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
 
-    sget-object v1, Lcom/discord/app/e;->uZ:Ljava/lang/String;
+    sget-object v1, Lcom/discord/app/e;->va: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;->uZ:Ljava/lang/String;
+    sget-object v1, Lcom/discord/app/e;->va: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 c947abd553..89e7e621ab 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 vB:Lcom/discord/app/AppActivity;
+.field final synthetic vC: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;->vB:Lcom/discord/app/AppActivity;
+    iput-object p1, p0, Lcom/discord/app/f$a;->vC: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;->vB:Lcom/discord/app/AppActivity;
+    iget-object v0, p0, Lcom/discord/app/f$a;->vC: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 bf727e8898..ccc871c30a 100644
--- a/com.discord/smali/com/discord/app/f.smali
+++ b/com.discord/smali/com/discord/app/f.smali
@@ -4,9 +4,7 @@
 
 
 # static fields
-.field public static final vA:Lcom/discord/app/f;
-
-.field private static final vw:Ljava/util/List;
+.field private static final vA:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -18,6 +16,8 @@
     .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/widgets/user/account/WidgetUserAccountVerifyBase;",
+            "Lcom/discord/app/AppFragment;",
             ">;>;"
         }
     .end annotation
@@ -48,7 +48,7 @@
             "Ljava/util/List<",
             "Lkotlin/reflect/b<",
             "+",
-            "Lcom/discord/app/AppFragment;",
+            "Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase;",
             ">;>;"
         }
     .end annotation
@@ -63,7 +63,7 @@
 
     invoke-direct {v0}, Lcom/discord/app/f;-><init>()V
 
-    sput-object v0, Lcom/discord/app/f;->vA:Lcom/discord/app/f;
+    sput-object v0, Lcom/discord/app/f;->vB:Lcom/discord/app/f;
 
     const/4 v0, 0x6
 
@@ -133,7 +133,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/discord/app/f;->vw:Ljava/util/List;
+    sput-object v1, Lcom/discord/app/f;->vx:Ljava/util/List;
 
     const/16 v1, 0x21
 
@@ -459,7 +459,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/discord/app/f;->vx:Ljava/util/List;
+    sput-object v1, Lcom/discord/app/f;->vy: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;->vy:Ljava/util/List;
+    sput-object v0, Lcom/discord/app/f;->vz: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;->vz:Ljava/util/List;
+    sput-object v0, Lcom/discord/app/f;->vA:Ljava/util/List;
 
     return-void
 .end method
@@ -878,7 +878,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/discord/app/f;->vw:Ljava/util/List;
+    sget-object v0, Lcom/discord/app/f;->vx:Ljava/util/List;
 
     return-object v0
 .end method
@@ -896,7 +896,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/discord/app/f;->vx:Ljava/util/List;
+    sget-object v0, Lcom/discord/app/f;->vy:Ljava/util/List;
 
     return-object v0
 .end method
@@ -914,7 +914,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/discord/app/f;->vy:Ljava/util/List;
+    sget-object v0, Lcom/discord/app/f;->vz:Ljava/util/List;
 
     return-object v0
 .end method
@@ -932,7 +932,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/discord/app/f;->vz:Ljava/util/List;
+    sget-object v0, Lcom/discord/app/f;->vA: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 862f2604ba..9e88c0878c 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 vJ:Lcom/discord/app/g$a;
+.field public static final vK: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;->vJ:Lcom/discord/app/g$a;
+    sput-object v0, Lcom/discord/app/g$a;->vK: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 ce801dea63..367261f685 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 vG:Ljava/util/ArrayList;
+.field private static final vH:Ljava/util/ArrayList;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/ArrayList<",
@@ -14,7 +14,7 @@
     .end annotation
 .end field
 
-.field private static final vH:Lrx/subjects/BehaviorSubject;
+.field private static final vI:Lrx/subjects/BehaviorSubject;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/subjects/BehaviorSubject<",
@@ -24,7 +24,7 @@
     .end annotation
 .end field
 
-.field public static final vI:Lcom/discord/app/g;
+.field public static final vJ: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;->vI:Lcom/discord/app/g;
+    sput-object v0, Lcom/discord/app/g;->vJ: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;->vG:Ljava/util/ArrayList;
+    sput-object v0, Lcom/discord/app/g;->vH:Ljava/util/ArrayList;
 
     const/4 v0, 0x0
 
@@ -55,7 +55,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/discord/app/g;->vH:Lrx/subjects/BehaviorSubject;
+    sput-object v0, Lcom/discord/app/g;->vI:Lrx/subjects/BehaviorSubject;
 
     return-void
 .end method
@@ -79,9 +79,9 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/discord/app/g;->vH:Lrx/subjects/BehaviorSubject;
+    sget-object v0, Lcom/discord/app/g;->vI:Lrx/subjects/BehaviorSubject;
 
-    sget-object v1, Lcom/discord/app/g$a;->vJ:Lcom/discord/app/g$a;
+    sget-object v1, Lcom/discord/app/g$a;->vK: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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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;->vG:Ljava/util/ArrayList;
+    sget-object v0, Lcom/discord/app/g;->vH: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;->vm:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vn: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;->vH:Lrx/subjects/BehaviorSubject;
+    sget-object p1, Lcom/discord/app/g;->vI:Lrx/subjects/BehaviorSubject;
 
-    sget-object v0, Lcom/discord/app/g;->vG:Ljava/util/ArrayList;
+    sget-object v0, Lcom/discord/app/g;->vH: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;->vG:Ljava/util/ArrayList;
+    sget-object v0, Lcom/discord/app/g;->vH: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;->vm:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vn: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;->vH:Lrx/subjects/BehaviorSubject;
+    sget-object p1, Lcom/discord/app/g;->vI:Lrx/subjects/BehaviorSubject;
 
-    sget-object v0, Lcom/discord/app/g;->vG:Ljava/util/ArrayList;
+    sget-object v0, Lcom/discord/app/g;->vH: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 b38788d196..6b7251b4f8 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 vN:Lcom/discord/app/h;
+.field public static final vO: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;->vN:Lcom/discord/app/h;
+    sput-object v0, Lcom/discord/app/h;->vO: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, 0x7f120480
+    const v0, 0x7f12045b
 
     invoke-static {p0, p1, v0}, Lcom/discord/app/h;->b(Landroid/content/Context;Ljava/lang/CharSequence;I)V
 
@@ -260,13 +260,3 @@
 
     return-void
 .end method
-
-.method public static final d(Landroid/content/Context;Ljava/lang/CharSequence;)V
-    .locals 1
-
-    const v0, 0x7f120480
-
-    invoke-static {p0, p1, v0}, Lcom/discord/app/h;->b(Landroid/content/Context;Ljava/lang/CharSequence;I)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/app/i$a.smali b/com.discord/smali/com/discord/app/i$a.smali
index 91ed3cdfaa..91b3dc1d95 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 vP:Lcom/discord/app/i$a;
+.field public static final vQ: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;->vP:Lcom/discord/app/i$a;
+    sput-object v0, Lcom/discord/app/i$a;->vQ: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 bfcf5122c2..85165735f9 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 vQ:Lcom/discord/app/i$b;
+.field public static final vR: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;->vQ:Lcom/discord/app/i$b;
+    sput-object v0, Lcom/discord/app/i$b;->vR:Lcom/discord/app/i$b;
 
     return-void
 .end method
@@ -70,7 +70,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 388214d317..9b6b2ac861 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 vR:Lcom/discord/app/i$c;
+.field public static final vS: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;->vR:Lcom/discord/app/i$c;
+    sput-object v0, Lcom/discord/app/i$c;->vS: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 5a6fe75e70..14e3762c43 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 vS:Lcom/discord/app/i$d;
+.field public static final vT: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;->vS:Lcom/discord/app/i$d;
+    sput-object v0, Lcom/discord/app/i$d;->vT: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 53d4e7c32e..65586c7101 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 vW:Ljava/util/Map;
+.field final synthetic vX: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;->vW:Ljava/util/Map;
+    iput-object p1, p0, Lcom/discord/app/i$e$1$1;->vX: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;->vW:Ljava/util/Map;
+    iget-object v0, p0, Lcom/discord/app/i$e$1$1;->vX: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 1f63c94b5c..312bdbd4b8 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 vX:Lcom/discord/app/i$e$1$2;
+.field public static final vY: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;->vX:Lcom/discord/app/i$e$1$2;
+    sput-object v0, Lcom/discord/app/i$e$1$2;->vY: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 36ad8a261e..dd0c9b0e4c 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 vW:Ljava/util/Map;
+.field final synthetic vX:Ljava/util/Map;
 
-.field final synthetic vY:Lcom/discord/app/i$e$1;
+.field final synthetic vZ: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;->vY:Lcom/discord/app/i$e$1;
+    iput-object p1, p0, Lcom/discord/app/i$e$1$3;->vZ:Lcom/discord/app/i$e$1;
 
-    iput-object p2, p0, Lcom/discord/app/i$e$1$3;->vW:Ljava/util/Map;
+    iput-object p2, p0, Lcom/discord/app/i$e$1$3;->vX: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;->vY:Lcom/discord/app/i$e$1;
+    iget-object v0, p0, Lcom/discord/app/i$e$1$3;->vZ:Lcom/discord/app/i$e$1;
 
-    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$1;->vW:Lcom/discord/app/i$e;
 
-    iget-object v0, v0, Lcom/discord/app/i$e;->vU:Lkotlin/jvm/functions/Function1;
+    iget-object v0, v0, Lcom/discord/app/i$e;->vV:Lkotlin/jvm/functions/Function1;
 
-    iget-object v1, p0, Lcom/discord/app/i$e$1$3;->vW:Ljava/util/Map;
+    iget-object v1, p0, Lcom/discord/app/i$e$1$3;->vX: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 a04ca42a30..e0db9a2cc0 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 vV:Lcom/discord/app/i$e;
+.field final synthetic vW: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;->vV:Lcom/discord/app/i$e;
+    iput-object p1, p0, Lcom/discord/app/i$e$1;->vW: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;->vV:Lcom/discord/app/i$e;
+    iget-object v0, p0, Lcom/discord/app/i$e$1;->vW:Lcom/discord/app/i$e;
 
-    iget-object v0, v0, Lcom/discord/app/i$e;->vT:Ljava/util/Collection;
+    iget-object v0, v0, Lcom/discord/app/i$e;->vU: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;->vX:Lcom/discord/app/i$e$1$2;
+    sget-object v1, Lcom/discord/app/i$e$1$2;->vY: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 ba5f2c5a05..51c4ccab3a 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 vT:Ljava/util/Collection;
+.field final synthetic vU:Ljava/util/Collection;
 
-.field final synthetic vU:Lkotlin/jvm/functions/Function1;
+.field final synthetic vV: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;->vT:Ljava/util/Collection;
+    iput-object p1, p0, Lcom/discord/app/i$e;->vU:Ljava/util/Collection;
 
-    iput-object p2, p0, Lcom/discord/app/i$e;->vU:Lkotlin/jvm/functions/Function1;
+    iput-object p2, p0, Lcom/discord/app/i$e;->vV: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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 c3b73fd937..e03bd02bf4 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 wc:Lcom/discord/app/i$f;
+.field final synthetic wd: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;->wc:Lcom/discord/app/i$f;
+    iput-object p1, p0, Lcom/discord/app/i$f$1;->wd: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;->wc:Lcom/discord/app/i$f;
+    iget-object v0, p0, Lcom/discord/app/i$f$1;->wd:Lcom/discord/app/i$f;
 
-    iget-object v0, v0, Lcom/discord/app/i$f;->vZ:Lkotlin/jvm/functions/Function1;
+    iget-object v0, v0, Lcom/discord/app/i$f;->wa: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;->wc:Lcom/discord/app/i$f;
+    iget-object p1, p0, Lcom/discord/app/i$f$1;->wd:Lcom/discord/app/i$f;
 
-    iget-object p1, p1, Lcom/discord/app/i$f;->wa:Ljava/lang/Object;
+    iget-object p1, p1, Lcom/discord/app/i$f;->wb: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;->wc:Lcom/discord/app/i$f;
+    iget-object v0, p0, Lcom/discord/app/i$f$1;->wd: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;->wc:Lcom/discord/app/i$f;
+    iget-object v2, p0, Lcom/discord/app/i$f$1;->wd:Lcom/discord/app/i$f;
 
-    iget-object v2, v2, Lcom/discord/app/i$f;->wb:Ljava/util/concurrent/TimeUnit;
+    iget-object v2, v2, Lcom/discord/app/i$f;->wc: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 e9ec68b94d..20c9deea34 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 vZ:Lkotlin/jvm/functions/Function1;
+.field final synthetic wa:Lkotlin/jvm/functions/Function1;
 
-.field final synthetic wa:Ljava/lang/Object;
+.field final synthetic wb:Ljava/lang/Object;
 
-.field final synthetic wb:Ljava/util/concurrent/TimeUnit;
+.field final synthetic wc: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;->vZ:Lkotlin/jvm/functions/Function1;
+    iput-object p1, p0, Lcom/discord/app/i$f;->wa:Lkotlin/jvm/functions/Function1;
 
-    iput-object p2, p0, Lcom/discord/app/i$f;->wa:Ljava/lang/Object;
+    iput-object p2, p0, Lcom/discord/app/i$f;->wb:Ljava/lang/Object;
 
     iput-wide p3, p0, Lcom/discord/app/i$f;->$timeout:J
 
-    iput-object p5, p0, Lcom/discord/app/i$f;->wb:Ljava/util/concurrent/TimeUnit;
+    iput-object p5, p0, Lcom/discord/app/i$f;->wc: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 76fcce1bc7..09b5854a34 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 wd:Z
+.field final synthetic we:Z
 
 
 # direct methods
 .method constructor <init>(Z)V
     .locals 0
 
-    iput-boolean p1, p0, Lcom/discord/app/i$g;->wd:Z
+    iput-boolean p1, p0, Lcom/discord/app/i$g;->we: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;->wd:Z
+    iget-boolean v0, p0, Lcom/discord/app/i$g;->we: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 3cf4f78533..51ff722905 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 9b40c33737..ec4f4d846c 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 353fed5da4..3a3f3f3d2f 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 wh:Lcom/discord/app/i$j$1;
+.field public static final wj: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;->wh:Lcom/discord/app/i$j$1;
+    sput-object v0, Lcom/discord/app/i$j$1;->wj: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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 a1a0dbcf01..46d938e902 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 we:Ljava/lang/Class;
+.field final synthetic wf:Ljava/lang/Class;
 
-.field final synthetic wf:Lkotlin/jvm/functions/Function1;
+.field final synthetic wg:Lkotlin/jvm/functions/Function1;
 
-.field final synthetic wg:Lrx/functions/Action1;
+.field final synthetic wh:Lrx/functions/Action1;
+
+.field final synthetic wi:Lkotlin/jvm/functions/Function0;
 
 
 # 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;->we:Ljava/lang/Class;
+    iput-object p2, p0, Lcom/discord/app/i$j;->wf:Ljava/lang/Class;
 
-    iput-object p3, p0, Lcom/discord/app/i$j;->wf:Lkotlin/jvm/functions/Function1;
+    iput-object p3, p0, Lcom/discord/app/i$j;->wg: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;->wg:Lrx/functions/Action1;
+    iput-object p5, p0, Lcom/discord/app/i$j;->wh:Lrx/functions/Action1;
 
-    iput-object p6, p0, Lcom/discord/app/i$j;->$onCompleted:Lkotlin/jvm/functions/Function0;
+    iput-object p6, p0, Lcom/discord/app/i$j;->wi: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;->we:Ljava/lang/Class;
+    iget-object p1, p0, Lcom/discord/app/i$j;->wf: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;->wf:Lkotlin/jvm/functions/Function1;
+    iget-object v3, p0, Lcom/discord/app/i$j;->wg: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;->wg:Lrx/functions/Action1;
+    iget-object p1, p0, Lcom/discord/app/i$j;->wh:Lrx/functions/Action1;
 
     const/4 v7, 0x0
 
     if-eqz p1, :cond_0
 
-    sget-object v5, Lcom/discord/app/i;->vO:Lcom/discord/app/i;
+    sget-object v5, Lcom/discord/app/i;->vP: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;->$onCompleted:Lkotlin/jvm/functions/Function0;
+    iget-object p1, p0, Lcom/discord/app/i$j;->wi:Lkotlin/jvm/functions/Function0;
 
     if-nez p1, :cond_1
 
-    sget-object p1, Lcom/discord/app/i$j$1;->wh:Lcom/discord/app/i$j$1;
+    sget-object p1, Lcom/discord/app/i$j$1;->wj: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 3a6f5c3586..d1e36cbca4 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 wi:Lcom/discord/app/i$k$1;
+.field public static final wk: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;->wi:Lcom/discord/app/i$k$1;
+    sput-object v0, Lcom/discord/app/i$k$1;->wk: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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 912d70d528..064f905f81 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 wf:Lkotlin/jvm/functions/Function1;
+.field final synthetic wg:Lkotlin/jvm/functions/Function1;
+
+.field final synthetic wi:Lkotlin/jvm/functions/Function0;
 
 
 # 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;->wf:Lkotlin/jvm/functions/Function1;
+    iput-object p3, p0, Lcom/discord/app/i$k;->wg: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;->$onCompleted:Lkotlin/jvm/functions/Function0;
+    iput-object p6, p0, Lcom/discord/app/i$k;->wi: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;->wf:Lkotlin/jvm/functions/Function1;
+    iget-object v3, p0, Lcom/discord/app/i$k;->wg: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;->$onCompleted:Lkotlin/jvm/functions/Function0;
+    iget-object p1, p0, Lcom/discord/app/i$k;->wi:Lkotlin/jvm/functions/Function0;
 
     if-nez p1, :cond_0
 
-    sget-object p1, Lcom/discord/app/i$k$1;->wi:Lcom/discord/app/i$k$1;
+    sget-object p1, Lcom/discord/app/i$k$1;->wk: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 56dc6e110c..b198402b28 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 wj:Lcom/discord/app/i$l;
+.field public static final wl: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;->wj:Lcom/discord/app/i$l;
+    sput-object v0, Lcom/discord/app/i$l;->wl: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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 b289bfc09e..235447822d 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 wk:Lcom/discord/app/i$m;
+.field public static final wm: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;->wk:Lcom/discord/app/i$m;
+    sput-object v0, Lcom/discord/app/i$m;->wm: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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 80888cbb43..385fcc7e9e 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 62fac82bb6..fdb5edd847 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 ed10692c68..f39aff9a89 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 0eed74abc3..40d0928037 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 wo:Lcom/discord/app/i$q;
+.field final synthetic wq: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;->wo:Lcom/discord/app/i$q;
+    iput-object p1, p0, Lcom/discord/app/i$q$1;->wq: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;->wo:Lcom/discord/app/i$q;
+    iget-object v0, p0, Lcom/discord/app/i$q$1;->wq:Lcom/discord/app/i$q;
 
-    iget-object v0, v0, Lcom/discord/app/i$q;->wl: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;
 
@@ -68,9 +68,9 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/app/i$q$1;->wo:Lcom/discord/app/i$q;
+    iget-object v0, p0, Lcom/discord/app/i$q$1;->wq:Lcom/discord/app/i$q;
 
-    iget-object v0, v0, Lcom/discord/app/i$q;->wm:Lkotlin/jvm/functions/Function1;
+    iget-object v0, v0, Lcom/discord/app/i$q;->wo: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;->wo:Lcom/discord/app/i$q;
+    iget-object v0, p0, Lcom/discord/app/i$q$1;->wq: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;->wp: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 a50fcb8075..71901ee177 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;->wl:Lkotlin/jvm/functions/Function1;
+    iput-object p1, p0, Lcom/discord/app/i$q;->wn:Lkotlin/jvm/functions/Function1;
 
-    iput-object p2, p0, Lcom/discord/app/i$q;->wm:Lkotlin/jvm/functions/Function1;
+    iput-object p2, p0, Lcom/discord/app/i$q;->wo:Lkotlin/jvm/functions/Function1;
 
-    iput-object p3, p0, Lcom/discord/app/i$q;->wn:Lkotlin/jvm/functions/Function1;
+    iput-object p3, p0, Lcom/discord/app/i$q;->wp: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 cd6d02f333..e12884dfd9 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 wp:Lcom/discord/app/i$r;
+.field public static final wr: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;->wp:Lcom/discord/app/i$r;
+    sput-object v0, Lcom/discord/app/i$r;->wr: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 fe72dc315b..a474b6eac6 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 wq:J
+.field final synthetic ws:J
 
 
 # direct methods
@@ -40,7 +40,7 @@
 
     const-wide/16 p1, 0x1388
 
-    iput-wide p1, p0, Lcom/discord/app/i$u;->wq:J
+    iput-wide p1, p0, Lcom/discord/app/i$u;->ws: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;->wq:J
+    iget-wide v1, p0, Lcom/discord/app/i$u;->ws: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 028695069a..715eb75d23 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 wr:Lcom/discord/app/i$v;
+.field public static final wt: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;->wr:Lcom/discord/app/i$v;
+    sput-object v0, Lcom/discord/app/i$v;->wt:Lcom/discord/app/i$v;
 
     return-void
 .end method
@@ -62,7 +62,7 @@
 
     check-cast p1, Lrx/Observable;
 
-    invoke-static {}, Lrx/android/b/a;->Jc()Lrx/Scheduler;
+    invoke-static {}, Lrx/android/b/a;->Ja()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 bb63e42871..38c56d6d16 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;->ws:Lcom/discord/utilities/dimmer/DimmerView;
+    iget-object v0, v0, Lcom/discord/app/i$x;->wu: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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 001f3b295d..68afcc8e0b 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 ws:Lcom/discord/utilities/dimmer/DimmerView;
+.field final synthetic wu: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;->ws:Lcom/discord/utilities/dimmer/DimmerView;
+    iput-object p1, p0, Lcom/discord/app/i$x;->wu: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 3ba7cd6497..e31c491fa9 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 275fa80b53..6b962d79d7 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 vO:Lcom/discord/app/i;
+.field public static final vP: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;->vO:Lcom/discord/app/i;
+    sput-object v0, Lcom/discord/app/i;->vP: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;->wp:Lcom/discord/app/i$r;
+    sget-object v0, Lcom/discord/app/i$r;->wr: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;->vR:Lcom/discord/app/i$c;
+    sget-object v0, Lcom/discord/app/i$c;->vS: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;->vS:Lcom/discord/app/i$d;
+    sget-object p0, Lcom/discord/app/i$d;->vT: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;->vO:Lcom/discord/app/i;
+    sget-object v0, Lcom/discord/app/i;->vP: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;->vO:Lcom/discord/app/i;
+    sget-object v0, Lcom/discord/app/i;->vP: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;->wj:Lcom/discord/app/i$l;
+    sget-object v0, Lcom/discord/app/i$l;->wl:Lcom/discord/app/i$l;
 
     move-object v1, v0
 
@@ -1069,7 +1069,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/discord/app/i$v;->wr:Lcom/discord/app/i$v;
+    sget-object v0, Lcom/discord/app/i$v;->wt: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;->vP:Lcom/discord/app/i$a;
+    sget-object v0, Lcom/discord/app/i$a;->vQ: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;->vQ:Lcom/discord/app/i$b;
+    sget-object v0, Lcom/discord/app/i$b;->vR: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;->wk:Lcom/discord/app/i$m;
+    sget-object v0, Lcom/discord/app/i$m;->wm: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 55438bb83e..0500a5e3bc 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 ww:I
+.field final wA:I
 
-.field final wx:I
+.field final wB: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;->ww:I
+    iput p1, p0, Lcom/discord/app/j$a;->wy:I
 
-    iput p2, p0, Lcom/discord/app/j$a;->wx:I
+    iput p2, p0, Lcom/discord/app/j$a;->wz:I
 
-    iput p3, p0, Lcom/discord/app/j$a;->wy:I
+    iput p3, p0, Lcom/discord/app/j$a;->wA:I
 
-    iput p4, p0, Lcom/discord/app/j$a;->wz:I
+    iput p4, p0, Lcom/discord/app/j$a;->wB: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 0135c64475..5b5f189883 100644
--- a/com.discord/smali/com/discord/app/j$c.smali
+++ b/com.discord/smali/com/discord/app/j$c.smali
@@ -23,10 +23,6 @@
 
 
 # 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;
@@ -37,7 +33,11 @@
 
 .field public static final enum wG:Lcom/discord/app/j$c;
 
-.field private static final synthetic wH:[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;
 
 
 # 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;->wA:Lcom/discord/app/j$c;
+    sput-object v1, Lcom/discord/app/j$c;->wC: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;->wB:Lcom/discord/app/j$c;
+    sput-object v1, Lcom/discord/app/j$c;->wD: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;->wC:Lcom/discord/app/j$c;
+    sput-object v1, Lcom/discord/app/j$c;->wE: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;->wD:Lcom/discord/app/j$c;
+    sput-object v1, Lcom/discord/app/j$c;->wF: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;->wE:Lcom/discord/app/j$c;
+    sput-object v1, Lcom/discord/app/j$c;->wG: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;->wF:Lcom/discord/app/j$c;
+    sput-object v1, Lcom/discord/app/j$c;->wH: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;->wG:Lcom/discord/app/j$c;
+    sput-object v1, Lcom/discord/app/j$c;->wI:Lcom/discord/app/j$c;
 
     aput-object v1, v0, v3
 
-    sput-object v0, Lcom/discord/app/j$c;->wH:[Lcom/discord/app/j$c;
+    sput-object v0, Lcom/discord/app/j$c;->wJ:[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;->wH:[Lcom/discord/app/j$c;
+    sget-object v0, Lcom/discord/app/j$c;->wJ:[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 0fadd95546..0fc86ea16b 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 wu:Z
+.field private static ww:Z
 
-.field public static final wv:Lcom/discord/app/j$b;
+.field public static final wx:Lcom/discord/app/j$b;
 
 
 # instance fields
-.field wt:Lcom/discord/app/j$a;
+.field wv: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;->wv:Lcom/discord/app/j$b;
+    sput-object v0, Lcom/discord/app/j;->wx: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;->wE:Lcom/discord/app/j$c;
+    sget-object v0, Lcom/discord/app/j$c;->wG: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;->wt:Lcom/discord/app/j$a;
+    iput-object v0, p0, Lcom/discord/app/j;->wv: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;->wt:Lcom/discord/app/j$a;
+    iget-object p1, p0, Lcom/discord/app/j;->wv:Lcom/discord/app/j$a;
 
     if-eqz p1, :cond_5
 
     if-eqz p2, :cond_3
 
-    iget v0, p1, Lcom/discord/app/j$a;->ww:I
+    iget v0, p1, Lcom/discord/app/j$a;->wy:I
 
     goto :goto_0
 
     :cond_3
-    iget v0, p1, Lcom/discord/app/j$a;->wy:I
+    iget v0, p1, Lcom/discord/app/j$a;->wA:I
 
     :goto_0
     if-eqz p2, :cond_4
 
-    iget p1, p1, Lcom/discord/app/j$a;->wx:I
+    iget p1, p1, Lcom/discord/app/j$a;->wz:I
 
     goto :goto_1
 
     :cond_4
-    iget p1, p1, Lcom/discord/app/j$a;->wz:I
+    iget p1, p1, Lcom/discord/app/j$a;->wB: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;->wu:Z
+    sput-boolean v0, Lcom/discord/app/j;->ww:Z
 
     return-void
 .end method
@@ -117,7 +117,7 @@
 
     const/4 v0, 0x1
 
-    sput-boolean v0, Lcom/discord/app/j;->wu:Z
+    sput-boolean v0, Lcom/discord/app/j;->ww: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;->wu:Z
+    sget-boolean v0, Lcom/discord/app/j;->ww: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;->wu:Z
+    sget-boolean v0, Lcom/discord/app/j;->ww:Z
 
     const/4 v1, 0x1
 
@@ -149,7 +149,7 @@
 
     const/4 v0, 0x0
 
-    sput-boolean v0, Lcom/discord/app/j;->wu:Z
+    sput-boolean v0, Lcom/discord/app/j;->ww: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 495722acdb..595d4a7a79 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;->KA()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->Ky()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 4e7a29243f..8389c7b33c 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 xp: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;
+.field public static final enum xs:Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
+
+.field public static final enum xt:Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
+
+.field private static final synthetic xu:[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;->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
 
@@ -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;->xq:Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
+    sput-object v1, Lcom/discord/dialogs/ImageUploadDialog$PreviewType;->xs: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;->xr:Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
+    sput-object v1, Lcom/discord/dialogs/ImageUploadDialog$PreviewType;->xt:Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lcom/discord/dialogs/ImageUploadDialog$PreviewType;->xs:[Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
+    sput-object v0, Lcom/discord/dialogs/ImageUploadDialog$PreviewType;->xu:[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;->xs:[Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
+    sget-object v0, Lcom/discord/dialogs/ImageUploadDialog$PreviewType;->xu:[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 51abba269e..9219d0da90 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 xt:Lcom/discord/dialogs/ImageUploadDialog;
+.field final synthetic xv: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;->xt:Lcom/discord/dialogs/ImageUploadDialog;
+    iput-object p1, p0, Lcom/discord/dialogs/ImageUploadDialog$b;->xv: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;->xt:Lcom/discord/dialogs/ImageUploadDialog;
+    iget-object p1, p0, Lcom/discord/dialogs/ImageUploadDialog$b;->xv: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;->xt:Lcom/discord/dialogs/ImageUploadDialog;
+    iget-object v0, p0, Lcom/discord/dialogs/ImageUploadDialog$b;->xv: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;->xt:Lcom/discord/dialogs/ImageUploadDialog;
+    iget-object v2, p0, Lcom/discord/dialogs/ImageUploadDialog$b;->xv:Lcom/discord/dialogs/ImageUploadDialog;
 
-    iget-object v2, v2, Lcom/discord/dialogs/ImageUploadDialog;->xm:Lrx/functions/Action1;
+    iget-object v2, v2, Lcom/discord/dialogs/ImageUploadDialog;->xo: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;->xt:Lcom/discord/dialogs/ImageUploadDialog;
+    iget-object p1, p0, Lcom/discord/dialogs/ImageUploadDialog$b;->xv: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 ff60cbebfb..0e7346a8da 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 xt:Lcom/discord/dialogs/ImageUploadDialog;
+.field final synthetic xv: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;->xt:Lcom/discord/dialogs/ImageUploadDialog;
+    iput-object p1, p0, Lcom/discord/dialogs/ImageUploadDialog$c;->xv: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;->xt:Lcom/discord/dialogs/ImageUploadDialog;
+    iget-object p1, p0, Lcom/discord/dialogs/ImageUploadDialog$c;->xv: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;->xt:Lcom/discord/dialogs/ImageUploadDialog;
+    iget-object v0, p0, Lcom/discord/dialogs/ImageUploadDialog$c;->xv:Lcom/discord/dialogs/ImageUploadDialog;
 
-    iget-object v0, v0, Lcom/discord/dialogs/ImageUploadDialog;->xl:Lcom/miguelgaeta/media_picker/MediaPicker$Provider;
+    iget-object v0, v0, Lcom/discord/dialogs/ImageUploadDialog;->xn: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;->xt:Lcom/discord/dialogs/ImageUploadDialog;
+    iget-object v1, p0, Lcom/discord/dialogs/ImageUploadDialog$c;->xv: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;->xt:Lcom/discord/dialogs/ImageUploadDialog;
+    iget-object p1, p0, Lcom/discord/dialogs/ImageUploadDialog$c;->xv: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 419c3fe215..d26b9a8052 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 xt:Lcom/discord/dialogs/ImageUploadDialog;
+.field final synthetic xv: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;->xt:Lcom/discord/dialogs/ImageUploadDialog;
+    iput-object p1, p0, Lcom/discord/dialogs/ImageUploadDialog$d;->xv: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;->xt:Lcom/discord/dialogs/ImageUploadDialog;
+    iget-object p1, p0, Lcom/discord/dialogs/ImageUploadDialog$d;->xv: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 b167ba45fb..4dc291aacf 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 xo:Lcom/discord/dialogs/ImageUploadDialog$a;
+.field public static final xq:Lcom/discord/dialogs/ImageUploadDialog$a;
 
 
 # instance fields
@@ -27,13 +27,13 @@
 
 .field public uri:Landroid/net/Uri;
 
-.field private final xj:Lkotlin/properties/ReadOnlyProperty;
+.field private final xl:Lkotlin/properties/ReadOnlyProperty;
 
-.field private final xk:Lkotlin/properties/ReadOnlyProperty;
+.field private final xm:Lkotlin/properties/ReadOnlyProperty;
 
-.field public xl:Lcom/miguelgaeta/media_picker/MediaPicker$Provider;
+.field public xn:Lcom/miguelgaeta/media_picker/MediaPicker$Provider;
 
-.field public xm:Lrx/functions/Action1;
+.field public xo:Lrx/functions/Action1;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/Action1<",
@@ -43,7 +43,7 @@
     .end annotation
 .end field
 
-.field public xn:Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
+.field public xp: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;->xo:Lcom/discord/dialogs/ImageUploadDialog$a;
+    sput-object v0, Lcom/discord/dialogs/ImageUploadDialog;->xq:Lcom/discord/dialogs/ImageUploadDialog$a;
 
     return-void
 .end method
@@ -160,23 +160,23 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppDialog;-><init>()V
 
-    const v0, 0x7f0a04ac
+    const v0, 0x7f0a049f
 
     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;->xj:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/dialogs/ImageUploadDialog;->xl:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a04a7
+    const v0, 0x7f0a049a
 
     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;->xk:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/dialogs/ImageUploadDialog;->xm:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a04a6
+    const v0, 0x7f0a0499
 
     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, 0x7f0a04aa
+    const v0, 0x7f0a049d
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -198,7 +198,7 @@
 .method private final ee()Landroid/view/View;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/dialogs/ImageUploadDialog;->xk:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/dialogs/ImageUploadDialog;->xm:Lkotlin/properties/ReadOnlyProperty;
 
     sget-object v1, Lcom/discord/dialogs/ImageUploadDialog;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -273,7 +273,7 @@
 
     invoke-virtual {p0, v0}, Lcom/discord/dialogs/ImageUploadDialog;->setRetainInstance(Z)V
 
-    iget-object v1, p0, Lcom/discord/dialogs/ImageUploadDialog;->xn:Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
+    iget-object v1, p0, Lcom/discord/dialogs/ImageUploadDialog;->xp: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;->xj:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v4, p0, Lcom/discord/dialogs/ImageUploadDialog;->xl:Lkotlin/properties/ReadOnlyProperty;
 
     sget-object v5, Lcom/discord/dialogs/ImageUploadDialog;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -410,7 +410,7 @@
 
     int-to-float v2, v8
 
-    const v3, 0x7f0402b4
+    const v3, 0x7f0402b3
 
     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$b.smali b/com.discord/smali/com/discord/dialogs/a$b.smali
index 312f089498..a6c1fa1e01 100644
--- a/com.discord/smali/com/discord/dialogs/a$b.smali
+++ b/com.discord/smali/com/discord/dialogs/a$b.smali
@@ -20,14 +20,14 @@
 # instance fields
 .field final synthetic $profileUrl:Ljava/lang/String;
 
-.field final synthetic xh:Lcom/discord/dialogs/a;
+.field final synthetic xj:Lcom/discord/dialogs/a;
 
 
 # direct methods
 .method constructor <init>(Lcom/discord/dialogs/a;Ljava/lang/String;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/dialogs/a$b;->xh:Lcom/discord/dialogs/a;
+    iput-object p1, p0, Lcom/discord/dialogs/a$b;->xj:Lcom/discord/dialogs/a;
 
     iput-object p2, p0, Lcom/discord/dialogs/a$b;->$profileUrl:Ljava/lang/String;
 
@@ -41,7 +41,7 @@
 .method public final onClick(Landroid/view/View;)V
     .locals 3
 
-    iget-object p1, p0, Lcom/discord/dialogs/a$b;->xh:Lcom/discord/dialogs/a;
+    iget-object p1, p0, Lcom/discord/dialogs/a$b;->xj:Lcom/discord/dialogs/a;
 
     invoke-virtual {p1}, Lcom/discord/dialogs/a;->requireContext()Landroid/content/Context;
 
@@ -59,7 +59,7 @@
 
     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;
+    iget-object p1, p0, Lcom/discord/dialogs/a$b;->xj:Lcom/discord/dialogs/a;
 
     invoke-virtual {p1}, Lcom/discord/dialogs/a;->dismiss()V
 
diff --git a/com.discord/smali/com/discord/dialogs/a$c.smali b/com.discord/smali/com/discord/dialogs/a$c.smali
index 09d38c6750..e013c58dfa 100644
--- a/com.discord/smali/com/discord/dialogs/a$c.smali
+++ b/com.discord/smali/com/discord/dialogs/a$c.smali
@@ -20,14 +20,14 @@
 # instance fields
 .field final synthetic $username:Ljava/lang/String;
 
-.field final synthetic xh:Lcom/discord/dialogs/a;
+.field final synthetic xj:Lcom/discord/dialogs/a;
 
 
 # direct methods
 .method constructor <init>(Lcom/discord/dialogs/a;Ljava/lang/String;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/dialogs/a$c;->xh:Lcom/discord/dialogs/a;
+    iput-object p1, p0, Lcom/discord/dialogs/a$c;->xj:Lcom/discord/dialogs/a;
 
     iput-object p2, p0, Lcom/discord/dialogs/a$c;->$username:Ljava/lang/String;
 
@@ -41,7 +41,7 @@
 .method public final onClick(Landroid/view/View;)V
     .locals 2
 
-    iget-object p1, p0, Lcom/discord/dialogs/a$c;->xh:Lcom/discord/dialogs/a;
+    iget-object p1, p0, Lcom/discord/dialogs/a$c;->xj:Lcom/discord/dialogs/a;
 
     invoke-virtual {p1}, Lcom/discord/dialogs/a;->requireContext()Landroid/content/Context;
 
@@ -59,11 +59,11 @@
 
     check-cast v0, Ljava/lang/CharSequence;
 
-    const v1, 0x7f120480
+    const v1, 0x7f12045b
 
     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;
+    iget-object p1, p0, Lcom/discord/dialogs/a$c;->xj:Lcom/discord/dialogs/a;
 
     invoke-virtual {p1}, Lcom/discord/dialogs/a;->dismiss()V
 
diff --git a/com.discord/smali/com/discord/dialogs/a.smali b/com.discord/smali/com/discord/dialogs/a.smali
index 8e2e7c42eb..61cc5981ad 100644
--- a/com.discord/smali/com/discord/dialogs/a.smali
+++ b/com.discord/smali/com/discord/dialogs/a.smali
@@ -14,15 +14,15 @@
 # static fields
 .field static final synthetic $$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-.field public static final xg:Lcom/discord/dialogs/a$a;
+.field public static final xi: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 xg:Lkotlin/properties/ReadOnlyProperty;
 
-.field private final xf:Lkotlin/properties/ReadOnlyProperty;
+.field private final xh:Lkotlin/properties/ReadOnlyProperty;
 
 
 # direct methods
@@ -107,7 +107,7 @@
 
     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;
+    sput-object v0, Lcom/discord/dialogs/a;->xi:Lcom/discord/dialogs/a$a;
 
     return-void
 .end method
@@ -131,7 +131,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/dialogs/a;->xe:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/dialogs/a;->xg:Lkotlin/properties/ReadOnlyProperty;
 
     const v0, 0x7f0a0222
 
@@ -139,7 +139,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/dialogs/a;->xf:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/dialogs/a;->xh:Lkotlin/properties/ReadOnlyProperty;
 
     return-void
 .end method
@@ -147,7 +147,7 @@
 .method private final ed()Landroid/widget/TextView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/dialogs/a;->xe:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/dialogs/a;->xg:Lkotlin/properties/ReadOnlyProperty;
 
     sget-object v1, Lcom/discord/dialogs/a;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -318,7 +318,7 @@
 
     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;
+    iget-object p1, p0, Lcom/discord/dialogs/a;->xh:Lkotlin/properties/ReadOnlyProperty;
 
     sget-object v1, Lcom/discord/dialogs/a;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
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 8d2e9e4cc2..ce7a19bd10 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 xP:Lcom/discord/dialogs/a/a;
+.field final synthetic xR: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;->xP:Lcom/discord/dialogs/a/a;
+    iput-object p1, p0, Lcom/discord/dialogs/a/a$b;->xR: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;->xP:Lcom/discord/dialogs/a/a;
+    iget-object p1, p0, Lcom/discord/dialogs/a/a$b;->xR: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 4f18212d2b..65a0b2b840 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 xP:Lcom/discord/dialogs/a/a;
+.field final synthetic xR: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;->xP:Lcom/discord/dialogs/a/a;
+    iput-object p1, p0, Lcom/discord/dialogs/a/a$c;->xR: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;->xP:Lcom/discord/dialogs/a/a;
+    iget-object p1, p0, Lcom/discord/dialogs/a/a$c;->xR: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, 0x7f12133a
+    const v0, 0x7f1212ad
 
     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 75e2ff9ec8..b65cb10dd0 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 xP:Lcom/discord/dialogs/a/a;
+.field final synthetic xR: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;->xP:Lcom/discord/dialogs/a/a;
+    iput-object p1, p0, Lcom/discord/dialogs/a/a$d;->xR: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;->xP:Lcom/discord/dialogs/a/a;
+    iget-object p1, p0, Lcom/discord/dialogs/a/a$d;->xR: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, 0x7f1206ce
+    const v0, 0x7f1206a9
 
     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 657bf140ea..e3dabe33d3 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 194ed245e7..cca26f4158 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 13227b950a..785e855954 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 xO:Lcom/discord/dialogs/a/a$a;
+.field public static final xQ:Lcom/discord/dialogs/a/a$a;
 
 
 # instance fields
@@ -24,13 +24,13 @@
 
 .field private final userName$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-.field private final xK:Lkotlin/properties/ReadOnlyProperty;
-
-.field private final xL:Lkotlin/properties/ReadOnlyProperty;
-
 .field private final xM:Lkotlin/properties/ReadOnlyProperty;
 
-.field private xN:Lcom/discord/dialogs/a/b;
+.field private final xN:Lkotlin/properties/ReadOnlyProperty;
+
+.field private final xO:Lkotlin/properties/ReadOnlyProperty;
+
+.field private xP: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;->xO:Lcom/discord/dialogs/a/a$a;
+    sput-object v0, Lcom/discord/dialogs/a/a;->xQ: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, 0x7f0a07a6
+    const v0, 0x7f0a077e
 
     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, 0x7f0a07aa
+    const v0, 0x7f0a0782
 
     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, 0x7f0a07a7
-
-    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;->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
+    const v0, 0x7f0a077f
 
     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;->xM:Lkotlin/properties/ReadOnlyProperty;
 
+    const v0, 0x7f0a0781
+
+    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;->xN:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a0780
+
+    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;->xO: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;->xN:Lcom/discord/dialogs/a/b;
+    iget-object p0, p0, Lcom/discord/dialogs/a/a;->xP: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;->xR:I
+    iget p1, p1, Lcom/discord/dialogs/a/b$a$b;->xT: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;->xQ:I
+    iget p1, p1, Lcom/discord/dialogs/a/b$a$a;->xS: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, 0x7f0402a2
+    const v6, 0x7f0402a1
 
     const v7, 0x7f090003
 
     const v8, 0x7f0b0012
 
-    const v9, 0x7f0402ab
+    const v9, 0x7f0402aa
 
     const v10, 0x7f090002
 
@@ -364,7 +364,7 @@
 
     check-cast v0, Landroid/view/View;
 
-    iget-boolean v1, p1, Lcom/discord/dialogs/a/b$d;->xW:Z
+    iget-boolean v1, p1, Lcom/discord/dialogs/a/b$d;->xY:Z
 
     const/4 v3, 0x0
 
@@ -378,7 +378,7 @@
 
     check-cast v0, Landroid/view/View;
 
-    iget-boolean v1, p1, Lcom/discord/dialogs/a/b$d;->xX:Z
+    iget-boolean v1, p1, Lcom/discord/dialogs/a/b$d;->xZ:Z
 
     invoke-static {v0, v1, v2, v4, v3}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
 
@@ -388,7 +388,7 @@
 
     check-cast p0, Landroid/view/View;
 
-    iget-boolean p1, p1, Lcom/discord/dialogs/a/b$d;->xY:Z
+    iget-boolean p1, p1, Lcom/discord/dialogs/a/b$d;->ya:Z
 
     invoke-static {p0, p1, v2, v4, v3}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
 
@@ -398,7 +398,7 @@
 .method private final em()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;
 
@@ -418,7 +418,7 @@
 .method private final en()Landroid/widget/TextView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/dialogs/a/a;->xL:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/dialogs/a/a;->xN:Lkotlin/properties/ReadOnlyProperty;
 
     sget-object v1, Lcom/discord/dialogs/a/a;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -438,7 +438,7 @@
 .method private final eo()Landroid/widget/TextView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/dialogs/a/a;->xM:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/dialogs/a/a;->xO: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, 0x7f0d006b
+    const v0, 0x7f0d006a
 
     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;->xN:Lcom/discord/dialogs/a/b;
+    iput-object p1, p0, Lcom/discord/dialogs/a/a;->xP:Lcom/discord/dialogs/a/b;
 
     return-void
 .end method
@@ -576,7 +576,7 @@
 
     invoke-super {p0}, Lcom/discord/app/AppDialog;->onViewBoundOrOnResume()V
 
-    iget-object v0, p0, Lcom/discord/dialogs/a/a;->xN:Lcom/discord/dialogs/a/b;
+    iget-object v0, p0, Lcom/discord/dialogs/a/a;->xP: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;->xN:Lcom/discord/dialogs/a/b;
+    iget-object v0, p0, Lcom/discord/dialogs/a/a;->xP: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 b25ce0a986..31376b205a 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 8111ba6864..7486d5953d 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 xQ:I
+.field final xS:I
 
 
 # direct methods
@@ -26,9 +26,9 @@
 
     invoke-direct {p0, v0}, Lcom/discord/dialogs/a/b$a;-><init>(B)V
 
-    const v0, 0x7f120504
+    const v0, 0x7f1204df
 
-    iput v0, p0, Lcom/discord/dialogs/a/b$a$a;->xQ:I
+    iput v0, p0, Lcom/discord/dialogs/a/b$a$a;->xS: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;->xQ:I
+    iget v1, p0, Lcom/discord/dialogs/a/b$a$a;->xS:I
 
-    iget p1, p1, Lcom/discord/dialogs/a/b$a$a;->xQ:I
+    iget p1, p1, Lcom/discord/dialogs/a/b$a$a;->xS: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;->xQ:I
+    iget v0, p0, Lcom/discord/dialogs/a/b$a$a;->xS: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;->xQ:I
+    iget v1, p0, Lcom/discord/dialogs/a/b$a$a;->xS: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 b314dd6561..a871e4ef62 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 xR:I
+.field final xT: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;->xR:I
+    iput p1, p0, Lcom/discord/dialogs/a/b$a$b;->xT: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;->xR:I
+    iget v1, p0, Lcom/discord/dialogs/a/b$a$b;->xT:I
 
-    iget p1, p1, Lcom/discord/dialogs/a/b$a$b;->xR:I
+    iget p1, p1, Lcom/discord/dialogs/a/b$a$b;->xT: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;->xR:I
+    iget v0, p0, Lcom/discord/dialogs/a/b$a$b;->xT: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;->xR:I
+    iget v1, p0, Lcom/discord/dialogs/a/b$a$b;->xT: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 ca7b189d82..2664c495e5 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 xT:Lcom/discord/dialogs/a/b$b$a;
+.field final synthetic xV: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;->xT:Lcom/discord/dialogs/a/b$b$a;
+    iput-object p1, p0, Lcom/discord/dialogs/a/b$b$a$a;->xV: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;->xT:Lcom/discord/dialogs/a/b$b$a;
+    iget-object v0, p0, Lcom/discord/dialogs/a/b$b$a$a;->xV:Lcom/discord/dialogs/a/b$b$a;
 
-    iget-object v0, v0, Lcom/discord/dialogs/a/b$b$a;->xS:Lcom/discord/dialogs/a/b$b;
+    iget-object v0, v0, Lcom/discord/dialogs/a/b$b$a;->xU: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 4902bd7c24..32c9457c31 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 xS:Lcom/discord/dialogs/a/b$b;
+.field final synthetic xU: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;->xS:Lcom/discord/dialogs/a/b$b;
+    iput-object p1, p0, Lcom/discord/dialogs/a/b$b$a;->xU: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;->xS:Lcom/discord/dialogs/a/b$b;
+    iget-object v3, p0, Lcom/discord/dialogs/a/b$b$a;->xU: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 0ba1408893..9096f39710 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 xU:Lcom/discord/dialogs/a/b$b$b;
+.field public static final xW: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;->xU:Lcom/discord/dialogs/a/b$b$b;
+    sput-object v0, Lcom/discord/dialogs/a/b$b$b;->xW: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 152749101c..a5b883ed39 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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;->xU:Lcom/discord/dialogs/a/b$b$b;
+    sget-object v5, Lcom/discord/dialogs/a/b$b$b;->xW: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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 92971adbc9..ce09a6c7a3 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 xV:Lcom/discord/models/domain/ModelGuildMember$Computed;
+.field final xX: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;->xV:Lcom/discord/models/domain/ModelGuildMember$Computed;
+    iput-object p3, p0, Lcom/discord/dialogs/a/b$c;->xX: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 548523aded..e442994d49 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 xW:Z
-
-.field final xX:Z
-
 .field final xY:Z
 
+.field final xZ:Z
+
+.field final ya: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;->xW:Z
+    iput-boolean p3, p0, Lcom/discord/dialogs/a/b$d;->xY:Z
 
-    iput-boolean p4, p0, Lcom/discord/dialogs/a/b$d;->xX:Z
+    iput-boolean p4, p0, Lcom/discord/dialogs/a/b$d;->xZ:Z
 
-    iput-boolean p5, p0, Lcom/discord/dialogs/a/b$d;->xY:Z
+    iput-boolean p5, p0, Lcom/discord/dialogs/a/b$d;->ya:Z
 
     return-void
 .end method
@@ -86,9 +86,9 @@
 
     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 v3, p1, Lcom/discord/dialogs/a/b$d;->xW:Z
+    iget-boolean v3, p1, Lcom/discord/dialogs/a/b$d;->xY: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;->xX:Z
+    iget-boolean v1, p0, Lcom/discord/dialogs/a/b$d;->xZ:Z
 
-    iget-boolean v3, p1, Lcom/discord/dialogs/a/b$d;->xX:Z
+    iget-boolean v3, p1, Lcom/discord/dialogs/a/b$d;->xZ: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;->xY:Z
+    iget-boolean v1, p0, Lcom/discord/dialogs/a/b$d;->ya:Z
 
-    iget-boolean p1, p1, Lcom/discord/dialogs/a/b$d;->xY:Z
+    iget-boolean p1, p1, Lcom/discord/dialogs/a/b$d;->ya: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;->xW:Z
+    iget-boolean v1, p0, Lcom/discord/dialogs/a/b$d;->xY: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;->xX:Z
+    iget-boolean v1, p0, Lcom/discord/dialogs/a/b$d;->xZ: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;->xY:Z
+    iget-boolean v1, p0, Lcom/discord/dialogs/a/b$d;->ya: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;->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;
 
@@ -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;->xX:Z
+    iget-boolean v1, p0, Lcom/discord/dialogs/a/b$d;->xZ: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;->xY:Z
+    iget-boolean v1, p0, Lcom/discord/dialogs/a/b$d;->ya: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 2b6a7b7475..10965af258 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, 0x7f121339
+    const v0, 0x7f1212ac
 
     invoke-static {p1, v0}, Lcom/discord/dialogs/a/b;->a(Lcom/discord/dialogs/a/b;I)V
 
-    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 5dc2fee647..2c3007d3fe 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 f5589c8f82..82f33ad051 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 14a08e6119..0d37d29c07 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 458d9e603a..116e7bb472 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;->Kz()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kx()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;->KA()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->Ky()Lrx/subjects/PublishSubject;
 
     move-result-object p1
 
@@ -83,7 +83,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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;->xV:Lcom/discord/models/domain/ModelGuildMember$Computed;
+    iget-object v0, p1, Lcom/discord/dialogs/a/b$c;->xX: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
index 2792581005..fc06c25082 100644
--- a/com.discord/smali/com/discord/dialogs/b$a.smali
+++ b/com.discord/smali/com/discord/dialogs/b$a.smali
@@ -59,7 +59,7 @@
 
     invoke-interface {p1}, Lkotlin/jvm/functions/Function0;->invoke()Ljava/lang/Object;
 
-    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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
index 2e852bd09b..9580a5e582 100644
--- a/com.discord/smali/com/discord/dialogs/b$b.smali
+++ b/com.discord/smali/com/discord/dialogs/b$b.smali
@@ -59,7 +59,7 @@
 
     invoke-interface {p1}, Lkotlin/jvm/functions/Function0;->invoke()Ljava/lang/Object;
 
-    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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
index d25092a614..1ab556c7b6 100644
--- a/com.discord/smali/com/discord/dialogs/b$c.smali
+++ b/com.discord/smali/com/discord/dialogs/b$c.smali
@@ -57,7 +57,7 @@
 
     iget-object p1, p0, Lcom/discord/dialogs/b$c;->$onConfirm:Lkotlin/jvm/functions/Function1;
 
-    const v0, 0x7f1206d5
+    const v0, 0x7f1206b0
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -65,7 +65,7 @@
 
     invoke-interface {p1, v0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
-    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 c569d68699..51ed1e52a1 100644
--- a/com.discord/smali/com/discord/dialogs/b.smali
+++ b/com.discord/smali/com/discord/dialogs/b.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field public static final xi:Lcom/discord/dialogs/b;
+.field public static final xk:Lcom/discord/dialogs/b;
 
 
 # direct methods
@@ -15,7 +15,7 @@
 
     invoke-direct {v0}, Lcom/discord/dialogs/b;-><init>()V
 
-    sput-object v0, Lcom/discord/dialogs/b;->xi:Lcom/discord/dialogs/b;
+    sput-object v0, Lcom/discord/dialogs/b;->xk:Lcom/discord/dialogs/b;
 
     return-void
 .end method
@@ -70,7 +70,7 @@
 
     sget-object v4, Lcom/discord/widgets/notice/WidgetNoticeDialog;->Companion:Lcom/discord/widgets/notice/WidgetNoticeDialog$Companion;
 
-    const v3, 0x7f1209fe
+    const v3, 0x7f1209c8
 
     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, 0x7f121344
+    const v3, 0x7f1212b7
 
     invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -90,13 +90,13 @@
 
     invoke-static {v7, v3}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v3, 0x7f1206d3
+    const v3, 0x7f1206ae
 
     invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
     move-result-object v8
 
-    const v3, 0x7f1206d6
+    const v3, 0x7f1206b1
 
     invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -106,7 +106,7 @@
 
     new-array v0, v0, [Lkotlin/Pair;
 
-    const v3, 0x7f0a04ab
+    const v3, 0x7f0a049e
 
     invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -124,7 +124,7 @@
 
     aput-object v1, v0, v3
 
-    const v1, 0x7f0a04a6
+    const v1, 0x7f0a0499
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -209,7 +209,7 @@
 
     sget-object v2, Lcom/discord/widgets/notice/WidgetNoticeDialog;->Companion:Lcom/discord/widgets/notice/WidgetNoticeDialog$Companion;
 
-    const v5, 0x7f120d28
+    const v5, 0x7f120cf1
 
     invoke-virtual {v0, v5}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -231,7 +231,7 @@
 
     aput-object v3, v6, v7
 
-    const v3, 0x7f120d29
+    const v3, 0x7f120cf2
 
     invoke-virtual {v0, v3, v6}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -241,19 +241,19 @@
 
     invoke-static {v6, v3}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v3, 0x7f120507
+    const v3, 0x7f1204e2
 
     invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
     move-result-object v7
 
-    const v3, 0x7f1203a0
+    const v3, 0x7f12037b
 
     invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
     move-result-object v8
 
-    const v0, 0x7f0a04ab
+    const v0, 0x7f0a049e
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -271,7 +271,7 @@
 
     move-result-object v9
 
-    const v0, 0x7f040286
+    const v0, 0x7f040285
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
diff --git a/com.discord/smali/com/discord/dialogs/c.smali b/com.discord/smali/com/discord/dialogs/c.smali
index 1a1b710810..e21aee71fa 100644
--- a/com.discord/smali/com/discord/dialogs/c.smali
+++ b/com.discord/smali/com/discord/dialogs/c.smali
@@ -20,7 +20,7 @@
 
     sput-object v0, Lcom/discord/dialogs/c;->$EnumSwitchMapping$0:[I
 
-    sget-object v1, Lcom/discord/dialogs/ImageUploadDialog$PreviewType;->xq:Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
+    sget-object v1, Lcom/discord/dialogs/ImageUploadDialog$PreviewType;->xs:Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
 
     invoke-virtual {v1}, Lcom/discord/dialogs/ImageUploadDialog$PreviewType;->ordinal()I
 
@@ -32,7 +32,7 @@
 
     sget-object v0, Lcom/discord/dialogs/c;->$EnumSwitchMapping$0:[I
 
-    sget-object v1, Lcom/discord/dialogs/ImageUploadDialog$PreviewType;->xr:Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
+    sget-object v1, Lcom/discord/dialogs/ImageUploadDialog$PreviewType;->xt:Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
 
     invoke-virtual {v1}, Lcom/discord/dialogs/ImageUploadDialog$PreviewType;->ordinal()I
 
diff --git a/com.discord/smali/com/discord/dialogs/d$b.smali b/com.discord/smali/com/discord/dialogs/d$b.smali
index 690db7f6d2..b70112a687 100644
--- a/com.discord/smali/com/discord/dialogs/d$b.smali
+++ b/com.discord/smali/com/discord/dialogs/d$b.smali
@@ -19,7 +19,7 @@
 
 .field headerText:Ljava/lang/String;
 
-.field final xx:I
+.field final xz:I
 
 
 # direct methods
@@ -36,7 +36,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput p1, p0, Lcom/discord/dialogs/d$b;->xx:I
+    iput p1, p0, Lcom/discord/dialogs/d$b;->xz:I
 
     iput-object p2, p0, Lcom/discord/dialogs/d$b;->headerText:Ljava/lang/String;
 
@@ -62,9 +62,9 @@
 
     check-cast p1, Lcom/discord/dialogs/d$b;
 
-    iget v1, p0, Lcom/discord/dialogs/d$b;->xx:I
+    iget v1, p0, Lcom/discord/dialogs/d$b;->xz:I
 
-    iget v3, p1, Lcom/discord/dialogs/d$b;->xx:I
+    iget v3, p1, Lcom/discord/dialogs/d$b;->xz:I
 
     if-ne v1, v3, :cond_0
 
@@ -111,7 +111,7 @@
 .method public final hashCode()I
     .locals 3
 
-    iget v0, p0, Lcom/discord/dialogs/d$b;->xx:I
+    iget v0, p0, Lcom/discord/dialogs/d$b;->xz: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/dialogs/d$b;->xx:I
+    iget v1, p0, Lcom/discord/dialogs/d$b;->xz:I
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali/com/discord/dialogs/d$c.smali b/com.discord/smali/com/discord/dialogs/d$c.smali
index d0692f8781..33ffb1a011 100644
--- a/com.discord/smali/com/discord/dialogs/d$c.smali
+++ b/com.discord/smali/com/discord/dialogs/d$c.smali
@@ -23,7 +23,7 @@
 # static fields
 .field static final synthetic $$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-.field public static final xy:Lcom/discord/dialogs/d$c$a;
+.field public static final xA:Lcom/discord/dialogs/d$c$a;
 
 
 # instance fields
@@ -116,7 +116,7 @@
 
     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;
+    sput-object v0, Lcom/discord/dialogs/d$c;->xA:Lcom/discord/dialogs/d$c$a;
 
     return-void
 .end method
@@ -126,7 +126,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a0541
+    const v0, 0x7f0a0532
 
     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/dialogs/d$c;->image$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0540
+    const v0, 0x7f0a0531
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -142,7 +142,7 @@
 
     iput-object v0, p0, Lcom/discord/dialogs/d$c;->header$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a053d
+    const v0, 0x7f0a052e
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -158,7 +158,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0160
+    const v0, 0x7f0d015e
 
     return v0
 .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 a0e9395e6e..d2b487f41a 100644
--- a/com.discord/smali/com/discord/dialogs/d$d.smali
+++ b/com.discord/smali/com/discord/dialogs/d$d.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field private final xz:Ljava/util/List;
+.field private final xB:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -49,7 +49,7 @@
 
     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;
+    iput-object p2, p0, Lcom/discord/dialogs/d$d;->xB:Ljava/util/List;
 
     return-void
 .end method
@@ -59,7 +59,7 @@
 .method public final getCount()I
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/dialogs/d$d;->xz:Ljava/util/List;
+    iget-object v0, p0, Lcom/discord/dialogs/d$d;->xB:Ljava/util/List;
 
     check-cast v0, Ljava/util/Collection;
 
@@ -73,7 +73,7 @@
 .method public final synthetic getItem(I)Landroidx/fragment/app/Fragment;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/dialogs/d$d;->xz:Ljava/util/List;
+    iget-object v0, p0, Lcom/discord/dialogs/d$d;->xB:Ljava/util/List;
 
     invoke-interface {v0, p1}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/discord/dialogs/d$e.smali b/com.discord/smali/com/discord/dialogs/d$e.smali
index bf32724b4b..30135c6d33 100644
--- a/com.discord/smali/com/discord/dialogs/d$e.smali
+++ b/com.discord/smali/com/discord/dialogs/d$e.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic xA:Lcom/discord/dialogs/d;
+.field final synthetic xC:Lcom/discord/dialogs/d;
 
 
 # direct methods
 .method constructor <init>(Lcom/discord/dialogs/d;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/dialogs/d$e;->xA:Lcom/discord/dialogs/d;
+    iput-object p1, p0, Lcom/discord/dialogs/d$e;->xC:Lcom/discord/dialogs/d;
 
     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/d$e;->xA:Lcom/discord/dialogs/d;
+    iget-object p1, p0, Lcom/discord/dialogs/d$e;->xC:Lcom/discord/dialogs/d;
 
     invoke-virtual {p1}, Lcom/discord/dialogs/d;->dismiss()V
 
diff --git a/com.discord/smali/com/discord/dialogs/d$f.smali b/com.discord/smali/com/discord/dialogs/d$f.smali
index 72348d4069..51ec24b8ae 100644
--- a/com.discord/smali/com/discord/dialogs/d$f.smali
+++ b/com.discord/smali/com/discord/dialogs/d$f.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic xA:Lcom/discord/dialogs/d;
+.field final synthetic xC:Lcom/discord/dialogs/d;
 
 
 # direct methods
 .method constructor <init>(Lcom/discord/dialogs/d;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/dialogs/d$f;->xA:Lcom/discord/dialogs/d;
+    iput-object p1, p0, Lcom/discord/dialogs/d$f;->xC:Lcom/discord/dialogs/d;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -39,7 +39,7 @@
 
     new-instance v8, Lcom/discord/utilities/analytics/Traits$Location;
 
-    iget-object v0, p0, Lcom/discord/dialogs/d$f;->xA:Lcom/discord/dialogs/d;
+    iget-object v0, p0, Lcom/discord/dialogs/d$f;->xC:Lcom/discord/dialogs/d;
 
     invoke-virtual {v0}, Lcom/discord/dialogs/d;->getArguments()Landroid/os/Bundle;
 
@@ -63,7 +63,7 @@
     move-object v1, v9
 
     :goto_0
-    iget-object v0, p0, Lcom/discord/dialogs/d$f;->xA:Lcom/discord/dialogs/d;
+    iget-object v0, p0, Lcom/discord/dialogs/d$f;->xC:Lcom/discord/dialogs/d;
 
     invoke-virtual {v0}, Lcom/discord/dialogs/d;->getArguments()Landroid/os/Bundle;
 
@@ -85,7 +85,7 @@
     move-object v2, v9
 
     :goto_1
-    iget-object v0, p0, Lcom/discord/dialogs/d$f;->xA:Lcom/discord/dialogs/d;
+    iget-object v0, p0, Lcom/discord/dialogs/d$f;->xC:Lcom/discord/dialogs/d;
 
     invoke-virtual {v0}, Lcom/discord/dialogs/d;->getArguments()Landroid/os/Bundle;
 
@@ -107,7 +107,7 @@
     move-object v3, v9
 
     :goto_2
-    iget-object v0, p0, Lcom/discord/dialogs/d$f;->xA:Lcom/discord/dialogs/d;
+    iget-object v0, p0, Lcom/discord/dialogs/d$f;->xC:Lcom/discord/dialogs/d;
 
     invoke-virtual {v0}, Lcom/discord/dialogs/d;->getArguments()Landroid/os/Bundle;
 
@@ -161,7 +161,7 @@
 
     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/d$f;->xA:Lcom/discord/dialogs/d;
+    iget-object p1, p0, Lcom/discord/dialogs/d$f;->xC:Lcom/discord/dialogs/d;
 
     invoke-virtual {p1}, Lcom/discord/dialogs/d;->dismiss()V
 
diff --git a/com.discord/smali/com/discord/dialogs/d.smali b/com.discord/smali/com/discord/dialogs/d.smali
index 9d588a01b6..8b8bccb1e1 100644
--- a/com.discord/smali/com/discord/dialogs/d.smali
+++ b/com.discord/smali/com/discord/dialogs/d.smali
@@ -17,7 +17,7 @@
 # static fields
 .field static final synthetic $$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-.field public static final xw:Lcom/discord/dialogs/d$a;
+.field public static final xy:Lcom/discord/dialogs/d$a;
 
 
 # instance fields
@@ -27,9 +27,9 @@
 
 .field private final viewPager$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-.field private final xu:Lkotlin/properties/ReadOnlyProperty;
+.field private final xw:Lkotlin/properties/ReadOnlyProperty;
 
-.field private xv:Lcom/discord/dialogs/d$d;
+.field private xx:Lcom/discord/dialogs/d$d;
 
 
 # direct methods
@@ -136,7 +136,7 @@
 
     invoke-direct {v0, v3}, Lcom/discord/dialogs/d$a;-><init>(B)V
 
-    sput-object v0, Lcom/discord/dialogs/d;->xw:Lcom/discord/dialogs/d$a;
+    sput-object v0, Lcom/discord/dialogs/d;->xy:Lcom/discord/dialogs/d$a;
 
     return-void
 .end method
@@ -146,7 +146,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppDialog;-><init>()V
 
-    const v0, 0x7f0a0543
+    const v0, 0x7f0a0534
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -154,15 +154,15 @@
 
     iput-object v0, p0, Lcom/discord/dialogs/d;->viewPager$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a053f
+    const v0, 0x7f0a0530
 
     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;->xu:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/dialogs/d;->xw:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a053e
+    const v0, 0x7f0a052f
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -170,7 +170,7 @@
 
     iput-object v0, p0, Lcom/discord/dialogs/d;->close$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0542
+    const v0, 0x7f0a0533
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -260,7 +260,7 @@
 
     new-instance v1, Lcom/discord/dialogs/d$b;
 
-    const v3, 0x7f120f48
+    const v3, 0x7f120ebe
 
     invoke-virtual {p0, v3}, Lcom/discord/dialogs/d;->getString(I)Ljava/lang/String;
 
@@ -270,7 +270,7 @@
 
     invoke-static {v3, v4}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v4, 0x7f120f47
+    const v4, 0x7f120ebd
 
     invoke-virtual {p0, v4}, Lcom/discord/dialogs/d;->getString(I)Ljava/lang/String;
 
@@ -280,7 +280,7 @@
 
     invoke-static {v4, v5}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v5, 0x7f08045f
+    const v5, 0x7f080450
 
     invoke-direct {v1, v5, v3, v4}, Lcom/discord/dialogs/d$b;-><init>(ILjava/lang/String;Ljava/lang/String;)V
 
@@ -288,7 +288,7 @@
 
     new-instance v1, Lcom/discord/dialogs/d$b;
 
-    const v3, 0x7f120f3f
+    const v3, 0x7f120ebb
 
     invoke-virtual {p0, v3}, Lcom/discord/dialogs/d;->getString(I)Ljava/lang/String;
 
@@ -298,7 +298,7 @@
 
     invoke-static {v3, v4}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v4, 0x7f120f3e
+    const v4, 0x7f120eba
 
     invoke-virtual {p0, v4}, Lcom/discord/dialogs/d;->getString(I)Ljava/lang/String;
 
@@ -308,7 +308,7 @@
 
     invoke-static {v4, v5}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v5, 0x7f080439
+    const v5, 0x7f08042a
 
     invoke-direct {v1, v5, v3, v4}, Lcom/discord/dialogs/d$b;-><init>(ILjava/lang/String;Ljava/lang/String;)V
 
@@ -318,7 +318,7 @@
 
     new-instance v1, Lcom/discord/dialogs/d$b;
 
-    const v4, 0x7f120f39
+    const v4, 0x7f120eb5
 
     invoke-virtual {p0, v4}, Lcom/discord/dialogs/d;->getString(I)Ljava/lang/String;
 
@@ -328,7 +328,7 @@
 
     invoke-static {v4, v5}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v5, 0x7f120f38
+    const v5, 0x7f120eb4
 
     invoke-virtual {p0, v5}, Lcom/discord/dialogs/d;->getString(I)Ljava/lang/String;
 
@@ -338,7 +338,7 @@
 
     invoke-static {v5, v6}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v6, 0x7f080415
+    const v6, 0x7f080406
 
     invoke-direct {v1, v6, v4, v5}, Lcom/discord/dialogs/d$b;-><init>(ILjava/lang/String;Ljava/lang/String;)V
 
@@ -348,7 +348,7 @@
 
     new-instance v1, Lcom/discord/dialogs/d$b;
 
-    const v5, 0x7f120f4d
+    const v5, 0x7f120ec1
 
     invoke-virtual {p0, v5}, Lcom/discord/dialogs/d;->getString(I)Ljava/lang/String;
 
@@ -362,7 +362,7 @@
 
     new-array v7, v6, [Ljava/lang/Object;
 
-    const v8, 0x7f1205e4
+    const v8, 0x7f1205bf
 
     invoke-virtual {p0, v8}, Lcom/discord/dialogs/d;->getString(I)Ljava/lang/String;
 
@@ -370,7 +370,7 @@
 
     aput-object v8, v7, v2
 
-    const v8, 0x7f1205e3
+    const v8, 0x7f1205be
 
     invoke-virtual {p0, v8}, Lcom/discord/dialogs/d;->getString(I)Ljava/lang/String;
 
@@ -378,7 +378,7 @@
 
     aput-object v8, v7, v3
 
-    const v8, 0x7f1205e2
+    const v8, 0x7f1205bd
 
     invoke-virtual {p0, v8}, Lcom/discord/dialogs/d;->getString(I)Ljava/lang/String;
 
@@ -386,7 +386,7 @@
 
     aput-object v8, v7, v4
 
-    const v4, 0x7f120f4c
+    const v4, 0x7f120ec0
 
     invoke-virtual {p0, v4, v7}, Lcom/discord/dialogs/d;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -396,7 +396,7 @@
 
     invoke-static {v4, v7}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v7, 0x7f080460
+    const v7, 0x7f080451
 
     invoke-direct {v1, v7, v5, v4}, Lcom/discord/dialogs/d$b;-><init>(ILjava/lang/String;Ljava/lang/String;)V
 
@@ -404,7 +404,7 @@
 
     new-instance v1, Lcom/discord/dialogs/d$b;
 
-    const v4, 0x7f120f36
+    const v4, 0x7f120eb2
 
     invoke-virtual {p0, v4}, Lcom/discord/dialogs/d;->getString(I)Ljava/lang/String;
 
@@ -414,7 +414,7 @@
 
     invoke-static {v4, v5}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v5, 0x7f120f35
+    const v5, 0x7f120eb1
 
     invoke-virtual {p0, v5}, Lcom/discord/dialogs/d;->getString(I)Ljava/lang/String;
 
@@ -424,7 +424,7 @@
 
     invoke-static {v5, v6}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v6, 0x7f08041e
+    const v6, 0x7f08040f
 
     invoke-direct {v1, v6, v4, v5}, Lcom/discord/dialogs/d$b;-><init>(ILjava/lang/String;Ljava/lang/String;)V
 
@@ -432,7 +432,7 @@
 
     new-instance v0, Lcom/discord/dialogs/d$b;
 
-    const v1, 0x7f120f3c
+    const v1, 0x7f120eb8
 
     invoke-virtual {p0, v1}, Lcom/discord/dialogs/d;->getString(I)Ljava/lang/String;
 
@@ -442,7 +442,7 @@
 
     invoke-static {v1, v4}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v4, 0x7f120f3b
+    const v4, 0x7f120eb7
 
     invoke-virtual {p0, v4}, Lcom/discord/dialogs/d;->getString(I)Ljava/lang/String;
 
@@ -452,7 +452,7 @@
 
     invoke-static {v4, v5}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v5, 0x7f080421
+    const v5, 0x7f080412
 
     invoke-direct {v0, v5, v1, v4}, Lcom/discord/dialogs/d$b;-><init>(ILjava/lang/String;Ljava/lang/String;)V
 
@@ -674,9 +674,9 @@
 
     check-cast v1, Lcom/discord/dialogs/d$b;
 
-    sget-object v2, Lcom/discord/dialogs/d$c;->xy:Lcom/discord/dialogs/d$c$a;
+    sget-object v2, Lcom/discord/dialogs/d$c;->xA:Lcom/discord/dialogs/d$c$a;
 
-    iget v2, v1, Lcom/discord/dialogs/d$b;->xx:I
+    iget v2, v1, Lcom/discord/dialogs/d$b;->xz:I
 
     iget-object v3, v1, Lcom/discord/dialogs/d$b;->headerText:Ljava/lang/String;
 
@@ -727,7 +727,7 @@
 
     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;
+    iput-object p1, p0, Lcom/discord/dialogs/d;->xx:Lcom/discord/dialogs/d$d;
 
     return-void
 .end method
@@ -745,7 +745,7 @@
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/discord/dialogs/d;->xv:Lcom/discord/dialogs/d$d;
+    iget-object v0, p0, Lcom/discord/dialogs/d;->xx:Lcom/discord/dialogs/d$d;
 
     if-nez v0, :cond_0
 
@@ -758,7 +758,7 @@
 
     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;
+    iget-object p1, p0, Lcom/discord/dialogs/d;->xw:Lkotlin/properties/ReadOnlyProperty;
 
     sget-object v0, Lcom/discord/dialogs/d;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
diff --git a/com.discord/smali/com/discord/dialogs/e$a.smali b/com.discord/smali/com/discord/dialogs/e$a.smali
index ed009815a6..0bdc06f35a 100644
--- a/com.discord/smali/com/discord/dialogs/e$a.smali
+++ b/com.discord/smali/com/discord/dialogs/e$a.smali
@@ -83,7 +83,7 @@
 
     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;
+    iput-object p3, v0, Lcom/discord/dialogs/e;->xD:Lkotlin/jvm/functions/Function1;
 
     const-class p1, Lcom/discord/dialogs/e;
 
diff --git a/com.discord/smali/com/discord/dialogs/e$b$a.smali b/com.discord/smali/com/discord/dialogs/e$b$a.smali
index 25d5150750..b28a529ea0 100644
--- a/com.discord/smali/com/discord/dialogs/e$b$a.smali
+++ b/com.discord/smali/com/discord/dialogs/e$b$a.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic xE:Lcom/discord/dialogs/e$b;
+.field final synthetic xG:Lcom/discord/dialogs/e$b;
 
 
 # direct methods
 .method constructor <init>(Lcom/discord/dialogs/e$b;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/dialogs/e$b$a;->xE:Lcom/discord/dialogs/e$b;
+    iput-object p1, p0, Lcom/discord/dialogs/e$b$a;->xG:Lcom/discord/dialogs/e$b;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,15 +37,15 @@
 .method public final onClick(Landroid/view/View;)V
     .locals 1
 
-    iget-object p1, p0, Lcom/discord/dialogs/e$b$a;->xE:Lcom/discord/dialogs/e$b;
+    iget-object p1, p0, Lcom/discord/dialogs/e$b$a;->xG:Lcom/discord/dialogs/e$b;
 
     iget-object p1, p1, Lcom/discord/dialogs/e$b;->this$0:Lcom/discord/dialogs/e;
 
-    iget-object p1, p1, Lcom/discord/dialogs/e;->xB:Lkotlin/jvm/functions/Function1;
+    iget-object p1, p1, Lcom/discord/dialogs/e;->xD:Lkotlin/jvm/functions/Function1;
 
     if-eqz p1, :cond_0
 
-    iget-object v0, p0, Lcom/discord/dialogs/e$b$a;->xE:Lcom/discord/dialogs/e$b;
+    iget-object v0, p0, Lcom/discord/dialogs/e$b$a;->xG:Lcom/discord/dialogs/e$b;
 
     invoke-virtual {v0}, Lcom/discord/dialogs/e$b;->getAdapterPosition()I
 
@@ -58,7 +58,7 @@
     invoke-interface {p1, v0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
     :cond_0
-    iget-object p1, p0, Lcom/discord/dialogs/e$b$a;->xE:Lcom/discord/dialogs/e$b;
+    iget-object p1, p0, Lcom/discord/dialogs/e$b$a;->xG:Lcom/discord/dialogs/e$b;
 
     iget-object p1, p1, Lcom/discord/dialogs/e$b;->this$0:Lcom/discord/dialogs/e;
 
diff --git a/com.discord/smali/com/discord/dialogs/e.smali b/com.discord/smali/com/discord/dialogs/e.smali
index 5854815685..2e56efded8 100644
--- a/com.discord/smali/com/discord/dialogs/e.smali
+++ b/com.discord/smali/com/discord/dialogs/e.smali
@@ -15,7 +15,7 @@
 # static fields
 .field static final synthetic $$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-.field public static final xD:Lcom/discord/dialogs/e$a;
+.field public static final xF:Lcom/discord/dialogs/e$a;
 
 
 # instance fields
@@ -23,7 +23,7 @@
 
 .field private final titleTv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-.field xB:Lkotlin/jvm/functions/Function1;
+.field xD:Lkotlin/jvm/functions/Function1;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/jvm/functions/Function1<",
@@ -35,7 +35,7 @@
     .end annotation
 .end field
 
-.field private final xC:Lkotlin/properties/ReadOnlyProperty;
+.field private final xE:Lkotlin/properties/ReadOnlyProperty;
 
 
 # direct methods
@@ -120,7 +120,7 @@
 
     invoke-direct {v0, v3}, Lcom/discord/dialogs/e$a;-><init>(B)V
 
-    sput-object v0, Lcom/discord/dialogs/e;->xD:Lcom/discord/dialogs/e$a;
+    sput-object v0, Lcom/discord/dialogs/e;->xF:Lcom/discord/dialogs/e$a;
 
     return-void
 .end method
@@ -130,7 +130,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppDialog;-><init>()V
 
-    const v0, 0x7f0a0274
+    const v0, 0x7f0a0273
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -138,15 +138,15 @@
 
     iput-object v0, p0, Lcom/discord/dialogs/e;->titleTv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0273
+    const v0, 0x7f0a0272
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/dialogs/e;->xC:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/dialogs/e;->xE:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a025f
+    const v0, 0x7f0a025e
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -160,7 +160,7 @@
 .method private final eg()Landroidx/recyclerview/widget/RecyclerView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/dialogs/e;->xC:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/dialogs/e;->xE:Lkotlin/properties/ReadOnlyProperty;
 
     sget-object v1, Lcom/discord/dialogs/e;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
diff --git a/com.discord/smali/com/discord/dialogs/f$d.smali b/com.discord/smali/com/discord/dialogs/f$d.smali
index 1aa0d973fb..a2ca84f022 100644
--- a/com.discord/smali/com/discord/dialogs/f$d.smali
+++ b/com.discord/smali/com/discord/dialogs/f$d.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic xI:Lcom/discord/stores/StoreGifting$GiftState$RedeemedFailed;
+.field final synthetic xK: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;
+    iput-object p1, p0, Lcom/discord/dialogs/f$d;->xK:Lcom/discord/stores/StoreGifting$GiftState$RedeemedFailed;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -43,7 +43,7 @@
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/discord/dialogs/f$d;->xI:Lcom/discord/stores/StoreGifting$GiftState$RedeemedFailed;
+    iget-object v0, p0, Lcom/discord/dialogs/f$d;->xK:Lcom/discord/stores/StoreGifting$GiftState$RedeemedFailed;
 
     invoke-virtual {v0}, Lcom/discord/stores/StoreGifting$GiftState$RedeemedFailed;->getGift()Lcom/discord/models/domain/ModelGift;
 
diff --git a/com.discord/smali/com/discord/dialogs/f$h.smali b/com.discord/smali/com/discord/dialogs/f$h.smali
index f60b8cd157..83cb7ffda4 100644
--- a/com.discord/smali/com/discord/dialogs/f$h.smali
+++ b/com.discord/smali/com/discord/dialogs/f$h.smali
@@ -33,7 +33,7 @@
 
 
 # static fields
-.field public static final xJ:Lcom/discord/dialogs/f$h;
+.field public static final xL:Lcom/discord/dialogs/f$h;
 
 
 # direct methods
@@ -44,7 +44,7 @@
 
     invoke-direct {v0}, Lcom/discord/dialogs/f$h;-><init>()V
 
-    sput-object v0, Lcom/discord/dialogs/f$h;->xJ:Lcom/discord/dialogs/f$h;
+    sput-object v0, Lcom/discord/dialogs/f$h;->xL:Lcom/discord/dialogs/f$h;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/dialogs/f$i.smali b/com.discord/smali/com/discord/dialogs/f$i.smali
index 8847d3ba93..87d6ba3d02 100644
--- a/com.discord/smali/com/discord/dialogs/f$i.smali
+++ b/com.discord/smali/com/discord/dialogs/f$i.smali
@@ -59,7 +59,7 @@
 
     invoke-virtual {p1}, Lcom/discord/dialogs/f;->dismiss()V
 
-    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/dialogs/f$j.smali b/com.discord/smali/com/discord/dialogs/f$j.smali
index db9403ded2..1c72917460 100644
--- a/com.discord/smali/com/discord/dialogs/f$j.smali
+++ b/com.discord/smali/com/discord/dialogs/f$j.smali
@@ -207,7 +207,7 @@
     invoke-virtual {p1}, Lcom/discord/dialogs/f;->dismiss()V
 
     :goto_0
-    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 e09f189a72..ec35ef947d 100644
--- a/com.discord/smali/com/discord/dialogs/f.smali
+++ b/com.discord/smali/com/discord/dialogs/f.smali
@@ -14,7 +14,7 @@
 # static fields
 .field static final synthetic $$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-.field public static final xH:Lcom/discord/dialogs/f$a;
+.field public static final xJ:Lcom/discord/dialogs/f$a;
 
 
 # instance fields
@@ -24,9 +24,9 @@
 
 .field private final progress$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-.field private final xF:Lkotlin/properties/ReadOnlyProperty;
+.field private final xH:Lkotlin/properties/ReadOnlyProperty;
 
-.field private final xG:Lkotlin/properties/ReadOnlyProperty;
+.field private final xI:Lkotlin/properties/ReadOnlyProperty;
 
 
 # direct methods
@@ -155,7 +155,7 @@
 
     invoke-direct {v0, v3}, Lcom/discord/dialogs/f$a;-><init>(B)V
 
-    sput-object v0, Lcom/discord/dialogs/f;->xH:Lcom/discord/dialogs/f$a;
+    sput-object v0, Lcom/discord/dialogs/f;->xJ:Lcom/discord/dialogs/f$a;
 
     return-void
 .end method
@@ -187,7 +187,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/dialogs/f;->xF:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/dialogs/f;->xH:Lkotlin/properties/ReadOnlyProperty;
 
     const v0, 0x7f0a0009
 
@@ -195,7 +195,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/dialogs/f;->xG:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/dialogs/f;->xI:Lkotlin/properties/ReadOnlyProperty;
 
     const v0, 0x7f0a000b
 
@@ -217,7 +217,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f1207bc
+    const v0, 0x7f120797
 
     invoke-virtual {p0, v0}, Lcom/discord/dialogs/f;->getString(I)Ljava/lang/String;
 
@@ -231,7 +231,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f1207a0
+    const v0, 0x7f12077b
 
     invoke-virtual {p0, v0}, Lcom/discord/dialogs/f;->getString(I)Ljava/lang/String;
 
@@ -251,7 +251,7 @@
 
     if-eqz v0, :cond_0
 
-    const v1, 0x7f1207b5
+    const v1, 0x7f120790
 
     invoke-virtual {v0, v1}, Landroid/content/Context;->getText(I)Ljava/lang/CharSequence;
 
@@ -293,7 +293,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f1207bc
+    const v1, 0x7f120797
 
     invoke-virtual {p0, v1}, Lcom/discord/dialogs/f;->getString(I)Ljava/lang/String;
 
@@ -307,7 +307,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f1207b1
+    const v1, 0x7f12078c
 
     invoke-virtual {p0, v1}, Lcom/discord/dialogs/f;->getString(I)Ljava/lang/String;
 
@@ -349,7 +349,7 @@
 
     if-eqz v1, :cond_0
 
-    const v2, 0x7f120fd9
+    const v2, 0x7f120f4d
 
     invoke-virtual {v1, v2}, Landroid/content/Context;->getText(I)Ljava/lang/CharSequence;
 
@@ -394,7 +394,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f1207a4
+    const v0, 0x7f12077f
 
     invoke-virtual {p1, v0}, Lcom/discord/app/AppTextView;->setText(I)V
 
@@ -419,7 +419,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f1207a0
+    const v0, 0x7f12077b
 
     invoke-virtual {p1, v0}, Lcom/discord/app/AppTextView;->setText(I)V
 
@@ -444,7 +444,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f1207a1
+    const v0, 0x7f12077c
 
     invoke-virtual {p1, v0}, Lcom/discord/app/AppTextView;->setText(I)V
 
@@ -469,7 +469,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f12079f
+    const v0, 0x7f12077a
 
     invoke-virtual {p1, v0}, Lcom/discord/app/AppTextView;->setText(I)V
 
@@ -485,7 +485,7 @@
 
     if-eqz v0, :cond_a
 
-    const v1, 0x7f1207b5
+    const v1, 0x7f120790
 
     invoke-virtual {v0, v1}, Landroid/content/Context;->getText(I)Ljava/lang/CharSequence;
 
@@ -660,7 +660,7 @@
 
     if-ne v0, v1, :cond_1
 
-    const v0, 0x7f100053
+    const v0, 0x7f100052
 
     goto :goto_0
 
@@ -672,7 +672,7 @@
     throw p1
 
     :cond_2
-    const v0, 0x7f100052
+    const v0, 0x7f100051
 
     :goto_0
     invoke-virtual {p0}, Lcom/discord/dialogs/f;->requireContext()Landroid/content/Context;
@@ -731,7 +731,7 @@
 
     if-ne v3, v1, :cond_3
 
-    const v3, 0x7f1207c0
+    const v3, 0x7f12079b
 
     new-array v1, v1, [Ljava/lang/Object;
 
@@ -763,7 +763,7 @@
     throw p1
 
     :cond_4
-    const v3, 0x7f1207bf
+    const v3, 0x7f12079a
 
     new-array v1, v1, [Ljava/lang/Object;
 
@@ -829,7 +829,7 @@
 
     if-eqz v2, :cond_2
 
-    const v2, 0x7f1207be
+    const v2, 0x7f120799
 
     new-array v5, v3, [Ljava/lang/Object;
 
@@ -842,7 +842,7 @@
     goto :goto_0
 
     :cond_2
-    const v2, 0x7f1207bd
+    const v2, 0x7f120798
 
     invoke-virtual {p0, v2}, Lcom/discord/dialogs/f;->getString(I)Ljava/lang/String;
 
@@ -859,7 +859,7 @@
 
     if-eqz v5, :cond_3
 
-    const p1, 0x7f1207ab
+    const p1, 0x7f120786
 
     new-array v0, v3, [Ljava/lang/Object;
 
@@ -878,7 +878,7 @@
 
     if-eqz p1, :cond_4
 
-    const p1, 0x7f1207ac
+    const p1, 0x7f120787
 
     new-array v0, v3, [Ljava/lang/Object;
 
@@ -891,7 +891,7 @@
     goto :goto_1
 
     :cond_4
-    const p1, 0x7f1207aa
+    const p1, 0x7f120785
 
     new-array v1, v3, [Ljava/lang/Object;
 
@@ -932,7 +932,7 @@
 
     if-eqz v0, :cond_5
 
-    const v1, 0x7f1207b9
+    const v1, 0x7f120794
 
     invoke-virtual {v0, v1}, Landroid/content/Context;->getText(I)Ljava/lang/CharSequence;
 
@@ -970,7 +970,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f1207bc
+    const v0, 0x7f120797
 
     invoke-virtual {p0, v0}, Lcom/discord/dialogs/f;->getString(I)Ljava/lang/String;
 
@@ -984,7 +984,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f12079c
+    const v0, 0x7f120777
 
     invoke-virtual {p0, v0}, Lcom/discord/dialogs/f;->getString(I)Ljava/lang/String;
 
@@ -1006,7 +1006,7 @@
 
     if-eqz v0, :cond_0
 
-    const v1, 0x7f1207b5
+    const v1, 0x7f120790
 
     invoke-virtual {v0, v1}, Landroid/content/Context;->getText(I)Ljava/lang/CharSequence;
 
@@ -1074,7 +1074,7 @@
 
     if-eqz v2, :cond_1
 
-    const v2, 0x7f1207bb
+    const v2, 0x7f120796
 
     new-array v5, v3, [Ljava/lang/Object;
 
@@ -1087,7 +1087,7 @@
     goto :goto_1
 
     :cond_1
-    const v2, 0x7f1207ba
+    const v2, 0x7f120795
 
     invoke-virtual {p0, v2}, Lcom/discord/dialogs/f;->getString(I)Ljava/lang/String;
 
@@ -1104,7 +1104,7 @@
 
     if-eqz v5, :cond_2
 
-    const v5, 0x7f12079e
+    const v5, 0x7f120779
 
     const/4 v6, 0x2
 
@@ -1125,7 +1125,7 @@
     goto :goto_2
 
     :cond_2
-    const v5, 0x7f12079d
+    const v5, 0x7f120778
 
     new-array v3, v3, [Ljava/lang/Object;
 
@@ -1166,7 +1166,7 @@
 
     if-eqz v2, :cond_3
 
-    const v1, 0x7f1207b3
+    const v1, 0x7f12078e
 
     invoke-virtual {v2, v1}, Landroid/content/Context;->getText(I)Ljava/lang/CharSequence;
 
@@ -1241,7 +1241,7 @@
 
     if-eqz v1, :cond_1
 
-    const v1, 0x7f1207bb
+    const v1, 0x7f120796
 
     new-array v4, v3, [Ljava/lang/Object;
 
@@ -1254,7 +1254,7 @@
     goto :goto_1
 
     :cond_1
-    const v1, 0x7f1207ba
+    const v1, 0x7f120795
 
     invoke-virtual {p0, v1}, Lcom/discord/dialogs/f;->getString(I)Ljava/lang/String;
 
@@ -1271,7 +1271,7 @@
 
     if-eqz v4, :cond_2
 
-    const v4, 0x7f12079e
+    const v4, 0x7f120779
 
     const/4 v5, 0x2
 
@@ -1292,7 +1292,7 @@
     goto :goto_2
 
     :cond_2
-    const p1, 0x7f12079d
+    const p1, 0x7f120778
 
     new-array v3, v3, [Ljava/lang/Object;
 
@@ -1369,7 +1369,7 @@
 .method private final ej()Lcom/facebook/drawee/view/SimpleDraweeView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/dialogs/f;->xF:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/dialogs/f;->xH:Lkotlin/properties/ReadOnlyProperty;
 
     sget-object v1, Lcom/discord/dialogs/f;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -1389,7 +1389,7 @@
 .method private final ek()Landroid/widget/Button;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/dialogs/f;->xG:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/dialogs/f;->xI:Lkotlin/properties/ReadOnlyProperty;
 
     sget-object v1, Lcom/discord/dialogs/f;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -1431,7 +1431,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d00bc
+    const v0, 0x7f0d00ba
 
     return v0
 .end method
@@ -1533,7 +1533,7 @@
 
     move-result-object v1
 
-    sget-object v2, Lcom/discord/dialogs/f$h;->xJ:Lcom/discord/dialogs/f$h;
+    sget-object v2, Lcom/discord/dialogs/f$h;->xL:Lcom/discord/dialogs/f$h;
 
     check-cast v2, Lrx/functions/Func2;
 
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 51660c051d..7ff32d0139 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 409a04c736..68b7a94e2c 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 7da9658a53..5bc15a8059 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 1ecbcb0362..2cfd55f310 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 ea33b92878..7ac447982b 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 0f8841689d..c60137024c 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 2327f55eef..207f6d95b4 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 4315faf80d..c34095884b 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 0df9629b39..0145c9b832 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 2326b8cf68..043fd750bb 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 05a5a76445..4b73efe5f7 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 1d2250e992..78467cab75 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 e342571a44..3ebdde9d8e 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 36be03bf2d..319aaa1524 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 27a0fc47a9..a7df67c99c 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 e4915cf3f6..c71de3be44 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 f828dc0686..63e8f381a9 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 3fddad6f7a..dea5bcb155 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 234b376645..a62d4298f9 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 34bfece391..371186bd39 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 4886aae44d..0d037dcab7 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 0613cc9357..48cfcfaa74 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 b8163e173d..2079c9613e 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 178d15f9a3..7e3543bc57 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 7fb9815337..69495f8cc2 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 c7b90e50f7..4e2cbe182e 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 91ba2014aa..cc2e5fa797 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 57f94f40f9..ed532512c6 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 722a0f6c3c..1c4f6175ef 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 2db63171c8..c14a0e300d 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 c653baceb9..09525092e4 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 0ee2f5f260..99d8bf2603 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 dd19b6bb5d..b7b3776aaf 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 92ea8d16e7..68efb22023 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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
deleted file mode 100644
index 2c8bbf9a61..0000000000
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$streamDelete$1.smali
+++ /dev/null
@@ -1,120 +0,0 @@
-.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
deleted file mode 100644
index 67cf52081b..0000000000
--- a/com.discord/smali/com/discord/gateway/GatewaySocket$streamWatch$1.smali
+++ /dev/null
@@ -1,120 +0,0 @@
-.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 a8a32f8779..8a5fdc3090 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 78d15293a3..924476054f 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 9194914577..22fd7e0828 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 = 0x7
+.field private static final GATEWAY_VERSION:I = 0x6
 
 .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;->Az()Lcom/google/gson/Gson;
+    invoke-virtual {v0}, Lcom/google/gson/f;->Ax()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;->Az()Lcom/google/gson/Gson;
+    invoke-virtual {v0}, Lcom/google/gson/f;->Ax()Lcom/google/gson/Gson;
 
     move-result-object v0
 
@@ -405,7 +405,7 @@
 
     move-result-object v1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 7."
+    const-string v3, ", encoding: json, version 6."
 
     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=7&compress=zlib-stream"
+    const-string p1, "/?encoding=json&v=6&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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     invoke-interface {p1, p2, v0}, Lcom/discord/gateway/GatewayEventHandler;->handleDispatch(Ljava/lang/String;Ljava/lang/Object;)V
 
@@ -3302,42 +3302,6 @@
     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 03abc90c9a..691950cd0e 100644
--- a/com.discord/smali/com/discord/gateway/R$attr.smali
+++ b/com.discord/smali/com/discord/gateway/R$attr.smali
@@ -673,415 +673,415 @@
 
 .field public static final layout_wrapBefore:I = 0x7f040254
 
-.field public static final liftOnScroll:I = 0x7f040259
+.field public static final liftOnScroll:I = 0x7f040258
 
-.field public static final lineHeight:I = 0x7f04025a
+.field public static final lineHeight:I = 0x7f040259
 
-.field public static final lineSpacing:I = 0x7f04025b
+.field public static final lineSpacing:I = 0x7f04025a
 
-.field public static final listChoiceBackgroundIndicator:I = 0x7f04025c
+.field public static final listChoiceBackgroundIndicator:I = 0x7f04025b
 
-.field public static final listDividerAlertDialog:I = 0x7f04025d
+.field public static final listDividerAlertDialog:I = 0x7f04025c
 
-.field public static final listItemLayout:I = 0x7f04025e
+.field public static final listItemLayout:I = 0x7f04025d
 
-.field public static final listLayout:I = 0x7f04025f
+.field public static final listLayout:I = 0x7f04025e
 
-.field public static final listMenuViewStyle:I = 0x7f040260
+.field public static final listMenuViewStyle:I = 0x7f04025f
 
-.field public static final listPopupWindowStyle:I = 0x7f040261
+.field public static final listPopupWindowStyle:I = 0x7f040260
 
-.field public static final listPreferredItemHeight:I = 0x7f040262
+.field public static final listPreferredItemHeight:I = 0x7f040261
 
-.field public static final listPreferredItemHeightLarge:I = 0x7f040263
+.field public static final listPreferredItemHeightLarge:I = 0x7f040262
 
-.field public static final listPreferredItemHeightSmall:I = 0x7f040264
+.field public static final listPreferredItemHeightSmall:I = 0x7f040263
 
-.field public static final listPreferredItemPaddingLeft:I = 0x7f040265
+.field public static final listPreferredItemPaddingLeft:I = 0x7f040264
 
-.field public static final listPreferredItemPaddingRight:I = 0x7f040266
+.field public static final listPreferredItemPaddingRight:I = 0x7f040265
 
-.field public static final logo:I = 0x7f040267
+.field public static final logo:I = 0x7f040266
 
-.field public static final logoDescription:I = 0x7f040268
+.field public static final logoDescription:I = 0x7f040267
 
-.field public static final materialButtonStyle:I = 0x7f040278
+.field public static final materialButtonStyle:I = 0x7f040277
 
-.field public static final materialCardViewStyle:I = 0x7f040279
+.field public static final materialCardViewStyle:I = 0x7f040278
 
-.field public static final maxActionInlineWidth:I = 0x7f04027a
+.field public static final maxActionInlineWidth:I = 0x7f040279
 
-.field public static final maxButtonHeight:I = 0x7f04027b
+.field public static final maxButtonHeight:I = 0x7f04027a
 
-.field public static final maxImageSize:I = 0x7f04027c
+.field public static final maxImageSize:I = 0x7f04027b
 
-.field public static final max_height:I = 0x7f04027d
+.field public static final max_height:I = 0x7f04027c
 
-.field public static final measureWithLargestChild:I = 0x7f04027e
+.field public static final measureWithLargestChild:I = 0x7f04027d
 
-.field public static final menu:I = 0x7f04027f
+.field public static final menu:I = 0x7f04027e
 
-.field public static final multiChoiceItemLayout:I = 0x7f040280
+.field public static final multiChoiceItemLayout:I = 0x7f04027f
 
-.field public static final navigationContentDescription:I = 0x7f040281
+.field public static final navigationContentDescription:I = 0x7f040280
 
-.field public static final navigationIcon:I = 0x7f040282
+.field public static final navigationIcon:I = 0x7f040281
 
-.field public static final navigationMode:I = 0x7f040283
+.field public static final navigationMode:I = 0x7f040282
 
-.field public static final navigationViewStyle:I = 0x7f040284
+.field public static final navigationViewStyle:I = 0x7f040283
 
-.field public static final numericModifiers:I = 0x7f040287
+.field public static final numericModifiers:I = 0x7f040286
 
-.field public static final overlapAnchor:I = 0x7f040288
+.field public static final overlapAnchor:I = 0x7f040287
 
-.field public static final overlayImage:I = 0x7f040289
+.field public static final overlayImage:I = 0x7f040288
 
-.field public static final paddingBottomNoButtons:I = 0x7f04028c
+.field public static final paddingBottomNoButtons:I = 0x7f04028b
 
-.field public static final paddingEnd:I = 0x7f04028d
+.field public static final paddingEnd:I = 0x7f04028c
 
-.field public static final paddingStart:I = 0x7f04028e
+.field public static final paddingStart:I = 0x7f04028d
 
-.field public static final paddingTopNoTitle:I = 0x7f04028f
+.field public static final paddingTopNoTitle:I = 0x7f04028e
 
-.field public static final panelBackground:I = 0x7f040290
+.field public static final panelBackground:I = 0x7f04028f
 
-.field public static final panelMenuListTheme:I = 0x7f040291
+.field public static final panelMenuListTheme:I = 0x7f040290
 
-.field public static final panelMenuListWidth:I = 0x7f040292
+.field public static final panelMenuListWidth:I = 0x7f040291
 
-.field public static final passwordToggleContentDescription:I = 0x7f040293
+.field public static final passwordToggleContentDescription:I = 0x7f040292
 
-.field public static final passwordToggleDrawable:I = 0x7f040294
+.field public static final passwordToggleDrawable:I = 0x7f040293
 
-.field public static final passwordToggleEnabled:I = 0x7f040295
+.field public static final passwordToggleEnabled:I = 0x7f040294
 
-.field public static final passwordToggleTint:I = 0x7f040296
+.field public static final passwordToggleTint:I = 0x7f040295
 
-.field public static final passwordToggleTintMode:I = 0x7f040297
+.field public static final passwordToggleTintMode:I = 0x7f040296
 
-.field public static final placeholderImage:I = 0x7f040298
+.field public static final placeholderImage:I = 0x7f040297
 
-.field public static final placeholderImageScaleType:I = 0x7f040299
+.field public static final placeholderImageScaleType:I = 0x7f040298
 
-.field public static final popupMenuStyle:I = 0x7f04029a
+.field public static final popupMenuStyle:I = 0x7f040299
 
-.field public static final popupTheme:I = 0x7f04029b
+.field public static final popupTheme:I = 0x7f04029a
 
-.field public static final popupWindowStyle:I = 0x7f04029c
+.field public static final popupWindowStyle:I = 0x7f04029b
 
-.field public static final preserveIconSpacing:I = 0x7f04029d
+.field public static final preserveIconSpacing:I = 0x7f04029c
 
-.field public static final pressedStateOverlayImage:I = 0x7f04029e
+.field public static final pressedStateOverlayImage:I = 0x7f04029d
 
-.field public static final pressedTranslationZ:I = 0x7f04029f
+.field public static final pressedTranslationZ:I = 0x7f04029e
 
-.field public static final progressBarAutoRotateInterval:I = 0x7f0402c6
+.field public static final progressBarAutoRotateInterval:I = 0x7f0402c5
 
-.field public static final progressBarImage:I = 0x7f0402c7
+.field public static final progressBarImage:I = 0x7f0402c6
 
-.field public static final progressBarImageScaleType:I = 0x7f0402c8
+.field public static final progressBarImageScaleType:I = 0x7f0402c7
 
-.field public static final progressBarPadding:I = 0x7f0402c9
+.field public static final progressBarPadding:I = 0x7f0402c8
 
-.field public static final progressBarStyle:I = 0x7f0402ca
+.field public static final progressBarStyle:I = 0x7f0402c9
 
-.field public static final queryBackground:I = 0x7f0402cd
+.field public static final queryBackground:I = 0x7f0402cc
 
-.field public static final queryHint:I = 0x7f0402ce
+.field public static final queryHint:I = 0x7f0402cd
 
-.field public static final radioButtonStyle:I = 0x7f0402cf
+.field public static final radioButtonStyle:I = 0x7f0402ce
 
-.field public static final ratingBarStyle:I = 0x7f0402d2
+.field public static final ratingBarStyle:I = 0x7f0402d1
 
-.field public static final ratingBarStyleIndicator:I = 0x7f0402d3
+.field public static final ratingBarStyleIndicator:I = 0x7f0402d2
 
-.field public static final ratingBarStyleSmall:I = 0x7f0402d4
+.field public static final ratingBarStyleSmall:I = 0x7f0402d3
 
-.field public static final retryImage:I = 0x7f0402d5
+.field public static final retryImage:I = 0x7f0402d4
 
-.field public static final retryImageScaleType:I = 0x7f0402d6
+.field public static final retryImageScaleType:I = 0x7f0402d5
 
-.field public static final reverseLayout:I = 0x7f0402d7
+.field public static final reverseLayout:I = 0x7f0402d6
 
-.field public static final rippleColor:I = 0x7f0402d8
+.field public static final rippleColor:I = 0x7f0402d7
 
-.field public static final roundAsCircle:I = 0x7f0402d9
+.field public static final roundAsCircle:I = 0x7f0402d8
 
-.field public static final roundBottomEnd:I = 0x7f0402da
+.field public static final roundBottomEnd:I = 0x7f0402d9
 
-.field public static final roundBottomLeft:I = 0x7f0402db
+.field public static final roundBottomLeft:I = 0x7f0402da
 
-.field public static final roundBottomRight:I = 0x7f0402dc
+.field public static final roundBottomRight:I = 0x7f0402db
 
-.field public static final roundBottomStart:I = 0x7f0402dd
+.field public static final roundBottomStart:I = 0x7f0402dc
 
-.field public static final roundTopEnd:I = 0x7f0402de
+.field public static final roundTopEnd:I = 0x7f0402dd
 
-.field public static final roundTopLeft:I = 0x7f0402df
+.field public static final roundTopLeft:I = 0x7f0402de
 
-.field public static final roundTopRight:I = 0x7f0402e0
+.field public static final roundTopRight:I = 0x7f0402df
 
-.field public static final roundTopStart:I = 0x7f0402e1
+.field public static final roundTopStart:I = 0x7f0402e0
 
-.field public static final roundWithOverlayColor:I = 0x7f0402e2
+.field public static final roundWithOverlayColor:I = 0x7f0402e1
 
-.field public static final roundedCornerRadius:I = 0x7f0402e3
+.field public static final roundedCornerRadius:I = 0x7f0402e2
 
-.field public static final roundingBorderColor:I = 0x7f0402e4
+.field public static final roundingBorderColor:I = 0x7f0402e3
 
-.field public static final roundingBorderPadding:I = 0x7f0402e5
+.field public static final roundingBorderPadding:I = 0x7f0402e4
 
-.field public static final roundingBorderWidth:I = 0x7f0402e6
+.field public static final roundingBorderWidth:I = 0x7f0402e5
 
-.field public static final scopeUris:I = 0x7f0402f5
+.field public static final scopeUris:I = 0x7f0402f4
 
-.field public static final scrimAnimationDuration:I = 0x7f0402f6
+.field public static final scrimAnimationDuration:I = 0x7f0402f5
 
-.field public static final scrimBackground:I = 0x7f0402f7
+.field public static final scrimBackground:I = 0x7f0402f6
 
-.field public static final scrimVisibleHeightTrigger:I = 0x7f0402f8
+.field public static final scrimVisibleHeightTrigger:I = 0x7f0402f7
 
-.field public static final searchHintIcon:I = 0x7f0402f9
+.field public static final searchHintIcon:I = 0x7f0402f8
 
-.field public static final searchIcon:I = 0x7f0402fa
+.field public static final searchIcon:I = 0x7f0402f9
 
-.field public static final searchViewStyle:I = 0x7f0402fb
+.field public static final searchViewStyle:I = 0x7f0402fa
 
-.field public static final seekBarStyle:I = 0x7f0402fd
+.field public static final seekBarStyle:I = 0x7f0402fc
 
-.field public static final selectableItemBackground:I = 0x7f0402fe
+.field public static final selectableItemBackground:I = 0x7f0402fd
 
-.field public static final selectableItemBackgroundBorderless:I = 0x7f0402ff
+.field public static final selectableItemBackgroundBorderless:I = 0x7f0402fe
 
-.field public static final showAsAction:I = 0x7f040301
+.field public static final showAsAction:I = 0x7f040300
 
-.field public static final showDivider:I = 0x7f040302
+.field public static final showDivider:I = 0x7f040301
 
-.field public static final showDividerHorizontal:I = 0x7f040303
+.field public static final showDividerHorizontal:I = 0x7f040302
 
-.field public static final showDividerVertical:I = 0x7f040304
+.field public static final showDividerVertical:I = 0x7f040303
 
-.field public static final showDividers:I = 0x7f040305
+.field public static final showDividers:I = 0x7f040304
 
-.field public static final showMotionSpec:I = 0x7f040306
+.field public static final showMotionSpec:I = 0x7f040305
 
-.field public static final showText:I = 0x7f040307
+.field public static final showText:I = 0x7f040306
 
-.field public static final showTitle:I = 0x7f040308
+.field public static final showTitle:I = 0x7f040307
 
-.field public static final singleChoiceItemLayout:I = 0x7f040309
+.field public static final singleChoiceItemLayout:I = 0x7f040308
 
-.field public static final singleLine:I = 0x7f04030a
+.field public static final singleLine:I = 0x7f040309
 
-.field public static final singleSelection:I = 0x7f04030b
+.field public static final singleSelection:I = 0x7f04030a
 
-.field public static final snackbarButtonStyle:I = 0x7f04030c
+.field public static final snackbarButtonStyle:I = 0x7f04030b
 
-.field public static final snackbarStyle:I = 0x7f04030d
+.field public static final snackbarStyle:I = 0x7f04030c
 
-.field public static final spanCount:I = 0x7f04030e
+.field public static final spanCount:I = 0x7f04030d
 
-.field public static final spinBars:I = 0x7f04030f
+.field public static final spinBars:I = 0x7f04030e
 
-.field public static final spinnerDropDownItemStyle:I = 0x7f040310
+.field public static final spinnerDropDownItemStyle:I = 0x7f04030f
 
-.field public static final spinnerStyle:I = 0x7f040311
+.field public static final spinnerStyle:I = 0x7f040310
 
-.field public static final splitTrack:I = 0x7f040312
+.field public static final splitTrack:I = 0x7f040311
 
-.field public static final srcCompat:I = 0x7f040313
+.field public static final srcCompat:I = 0x7f040312
 
-.field public static final stackFromEnd:I = 0x7f040314
+.field public static final stackFromEnd:I = 0x7f040313
 
-.field public static final state_above_anchor:I = 0x7f040315
+.field public static final state_above_anchor:I = 0x7f040314
 
-.field public static final state_collapsed:I = 0x7f040316
+.field public static final state_collapsed:I = 0x7f040315
 
-.field public static final state_collapsible:I = 0x7f040317
+.field public static final state_collapsible:I = 0x7f040316
 
-.field public static final state_liftable:I = 0x7f040318
+.field public static final state_liftable:I = 0x7f040317
 
-.field public static final state_lifted:I = 0x7f040319
+.field public static final state_lifted:I = 0x7f040318
 
-.field public static final statusBarBackground:I = 0x7f04031a
+.field public static final statusBarBackground:I = 0x7f040319
 
-.field public static final statusBarScrim:I = 0x7f04031b
+.field public static final statusBarScrim:I = 0x7f04031a
 
-.field public static final strokeColor:I = 0x7f04031f
+.field public static final strokeColor:I = 0x7f04031e
 
-.field public static final strokeWidth:I = 0x7f040320
+.field public static final strokeWidth:I = 0x7f04031f
 
-.field public static final subMenuArrow:I = 0x7f040321
+.field public static final subMenuArrow:I = 0x7f040320
 
-.field public static final submitBackground:I = 0x7f040322
+.field public static final submitBackground:I = 0x7f040321
 
-.field public static final subtitle:I = 0x7f040323
+.field public static final subtitle:I = 0x7f040322
 
-.field public static final subtitleTextAppearance:I = 0x7f040324
+.field public static final subtitleTextAppearance:I = 0x7f040323
 
-.field public static final subtitleTextColor:I = 0x7f040325
+.field public static final subtitleTextColor:I = 0x7f040324
 
-.field public static final subtitleTextStyle:I = 0x7f040326
+.field public static final subtitleTextStyle:I = 0x7f040325
 
-.field public static final suggestionRowLayout:I = 0x7f040327
+.field public static final suggestionRowLayout:I = 0x7f040326
 
-.field public static final switchMinWidth:I = 0x7f040328
+.field public static final switchMinWidth:I = 0x7f040327
 
-.field public static final switchPadding:I = 0x7f040329
+.field public static final switchPadding:I = 0x7f040328
 
-.field public static final switchStyle:I = 0x7f04032a
+.field public static final switchStyle:I = 0x7f040329
 
-.field public static final switchTextAppearance:I = 0x7f04032b
+.field public static final switchTextAppearance:I = 0x7f04032a
 
-.field public static final tabBackground:I = 0x7f04032c
+.field public static final tabBackground:I = 0x7f04032b
 
-.field public static final tabContentStart:I = 0x7f04032d
+.field public static final tabContentStart:I = 0x7f04032c
 
-.field public static final tabGravity:I = 0x7f04032e
+.field public static final tabGravity:I = 0x7f04032d
 
-.field public static final tabIconTint:I = 0x7f04032f
+.field public static final tabIconTint:I = 0x7f04032e
 
-.field public static final tabIconTintMode:I = 0x7f040330
+.field public static final tabIconTintMode:I = 0x7f04032f
 
-.field public static final tabIndicator:I = 0x7f040331
+.field public static final tabIndicator:I = 0x7f040330
 
-.field public static final tabIndicatorAnimationDuration:I = 0x7f040332
+.field public static final tabIndicatorAnimationDuration:I = 0x7f040331
 
-.field public static final tabIndicatorColor:I = 0x7f040333
+.field public static final tabIndicatorColor:I = 0x7f040332
 
-.field public static final tabIndicatorFullWidth:I = 0x7f040334
+.field public static final tabIndicatorFullWidth:I = 0x7f040333
 
-.field public static final tabIndicatorGravity:I = 0x7f040335
+.field public static final tabIndicatorGravity:I = 0x7f040334
 
-.field public static final tabIndicatorHeight:I = 0x7f040336
+.field public static final tabIndicatorHeight:I = 0x7f040335
 
-.field public static final tabInlineLabel:I = 0x7f040337
+.field public static final tabInlineLabel:I = 0x7f040336
 
-.field public static final tabMaxWidth:I = 0x7f040338
+.field public static final tabMaxWidth:I = 0x7f040337
 
-.field public static final tabMinWidth:I = 0x7f040339
+.field public static final tabMinWidth:I = 0x7f040338
 
-.field public static final tabMode:I = 0x7f04033a
+.field public static final tabMode:I = 0x7f040339
 
-.field public static final tabPadding:I = 0x7f04033b
+.field public static final tabPadding:I = 0x7f04033a
 
-.field public static final tabPaddingBottom:I = 0x7f04033c
+.field public static final tabPaddingBottom:I = 0x7f04033b
 
-.field public static final tabPaddingEnd:I = 0x7f04033d
+.field public static final tabPaddingEnd:I = 0x7f04033c
 
-.field public static final tabPaddingStart:I = 0x7f04033e
+.field public static final tabPaddingStart:I = 0x7f04033d
 
-.field public static final tabPaddingTop:I = 0x7f04033f
+.field public static final tabPaddingTop:I = 0x7f04033e
 
-.field public static final tabRippleColor:I = 0x7f040340
+.field public static final tabRippleColor:I = 0x7f04033f
 
-.field public static final tabSelectedTextColor:I = 0x7f040341
+.field public static final tabSelectedTextColor:I = 0x7f040340
 
-.field public static final tabStyle:I = 0x7f040342
+.field public static final tabStyle:I = 0x7f040341
 
-.field public static final tabTextAppearance:I = 0x7f040343
+.field public static final tabTextAppearance:I = 0x7f040342
 
-.field public static final tabTextColor:I = 0x7f040344
+.field public static final tabTextColor:I = 0x7f040343
 
-.field public static final tabUnboundedRipple:I = 0x7f040345
+.field public static final tabUnboundedRipple:I = 0x7f040344
 
-.field public static final textAllCaps:I = 0x7f040349
+.field public static final textAllCaps:I = 0x7f040348
 
-.field public static final textAppearanceBody1:I = 0x7f04034a
+.field public static final textAppearanceBody1:I = 0x7f040349
 
-.field public static final textAppearanceBody2:I = 0x7f04034b
+.field public static final textAppearanceBody2:I = 0x7f04034a
 
-.field public static final textAppearanceButton:I = 0x7f04034c
+.field public static final textAppearanceButton:I = 0x7f04034b
 
-.field public static final textAppearanceCaption:I = 0x7f04034d
+.field public static final textAppearanceCaption:I = 0x7f04034c
 
-.field public static final textAppearanceHeadline1:I = 0x7f04034e
+.field public static final textAppearanceHeadline1:I = 0x7f04034d
 
-.field public static final textAppearanceHeadline2:I = 0x7f04034f
+.field public static final textAppearanceHeadline2:I = 0x7f04034e
 
-.field public static final textAppearanceHeadline3:I = 0x7f040350
+.field public static final textAppearanceHeadline3:I = 0x7f04034f
 
-.field public static final textAppearanceHeadline4:I = 0x7f040351
+.field public static final textAppearanceHeadline4:I = 0x7f040350
 
-.field public static final textAppearanceHeadline5:I = 0x7f040352
+.field public static final textAppearanceHeadline5:I = 0x7f040351
 
-.field public static final textAppearanceHeadline6:I = 0x7f040353
+.field public static final textAppearanceHeadline6:I = 0x7f040352
 
-.field public static final textAppearanceLargePopupMenu:I = 0x7f040354
+.field public static final textAppearanceLargePopupMenu:I = 0x7f040353
 
-.field public static final textAppearanceListItem:I = 0x7f040355
+.field public static final textAppearanceListItem:I = 0x7f040354
 
-.field public static final textAppearanceListItemSecondary:I = 0x7f040356
+.field public static final textAppearanceListItemSecondary:I = 0x7f040355
 
-.field public static final textAppearanceListItemSmall:I = 0x7f040357
+.field public static final textAppearanceListItemSmall:I = 0x7f040356
 
-.field public static final textAppearanceOverline:I = 0x7f040358
+.field public static final textAppearanceOverline:I = 0x7f040357
 
-.field public static final textAppearancePopupMenuHeader:I = 0x7f040359
+.field public static final textAppearancePopupMenuHeader:I = 0x7f040358
 
-.field public static final textAppearanceSearchResultSubtitle:I = 0x7f04035a
+.field public static final textAppearanceSearchResultSubtitle:I = 0x7f040359
 
-.field public static final textAppearanceSearchResultTitle:I = 0x7f04035b
+.field public static final textAppearanceSearchResultTitle:I = 0x7f04035a
 
-.field public static final textAppearanceSmallPopupMenu:I = 0x7f04035c
+.field public static final textAppearanceSmallPopupMenu:I = 0x7f04035b
 
-.field public static final textAppearanceSubtitle1:I = 0x7f04035d
+.field public static final textAppearanceSubtitle1:I = 0x7f04035c
 
-.field public static final textAppearanceSubtitle2:I = 0x7f04035e
+.field public static final textAppearanceSubtitle2:I = 0x7f04035d
 
-.field public static final textColorAlertDialogListItem:I = 0x7f04035f
+.field public static final textColorAlertDialogListItem:I = 0x7f04035e
 
-.field public static final textColorSearchUrl:I = 0x7f040360
+.field public static final textColorSearchUrl:I = 0x7f04035f
 
-.field public static final textEndPadding:I = 0x7f040361
+.field public static final textEndPadding:I = 0x7f040360
 
-.field public static final textInputStyle:I = 0x7f040362
+.field public static final textInputStyle:I = 0x7f040361
 
-.field public static final textStartPadding:I = 0x7f040363
+.field public static final textStartPadding:I = 0x7f040362
 
-.field public static final theme:I = 0x7f040365
+.field public static final theme:I = 0x7f040364
 
-.field public static final thickness:I = 0x7f0403b6
+.field public static final thickness:I = 0x7f0403b5
 
-.field public static final thumbTextPadding:I = 0x7f0403b7
+.field public static final thumbTextPadding:I = 0x7f0403b6
 
-.field public static final thumbTint:I = 0x7f0403b8
+.field public static final thumbTint:I = 0x7f0403b7
 
-.field public static final thumbTintMode:I = 0x7f0403b9
+.field public static final thumbTintMode:I = 0x7f0403b8
 
-.field public static final tickMark:I = 0x7f0403ba
+.field public static final tickMark:I = 0x7f0403b9
 
-.field public static final tickMarkTint:I = 0x7f0403bb
+.field public static final tickMarkTint:I = 0x7f0403ba
 
-.field public static final tickMarkTintMode:I = 0x7f0403bc
+.field public static final tickMarkTintMode:I = 0x7f0403bb
 
-.field public static final tint:I = 0x7f0403bd
+.field public static final tint:I = 0x7f0403bc
 
-.field public static final tintMode:I = 0x7f0403be
+.field public static final tintMode:I = 0x7f0403bd
 
-.field public static final title:I = 0x7f0403bf
+.field public static final title:I = 0x7f0403be
 
-.field public static final titleEnabled:I = 0x7f0403c0
+.field public static final titleEnabled:I = 0x7f0403bf
 
-.field public static final titleMargin:I = 0x7f0403c1
+.field public static final titleMargin:I = 0x7f0403c0
 
-.field public static final titleMarginBottom:I = 0x7f0403c2
+.field public static final titleMarginBottom:I = 0x7f0403c1
 
-.field public static final titleMarginEnd:I = 0x7f0403c3
+.field public static final titleMarginEnd:I = 0x7f0403c2
 
-.field public static final titleMarginStart:I = 0x7f0403c4
+.field public static final titleMarginStart:I = 0x7f0403c3
 
-.field public static final titleMarginTop:I = 0x7f0403c5
+.field public static final titleMarginTop:I = 0x7f0403c4
 
-.field public static final titleMargins:I = 0x7f0403c6
+.field public static final titleMargins:I = 0x7f0403c5
 
-.field public static final titleTextAppearance:I = 0x7f0403c7
+.field public static final titleTextAppearance:I = 0x7f0403c6
 
-.field public static final titleTextColor:I = 0x7f0403c8
+.field public static final titleTextColor:I = 0x7f0403c7
 
-.field public static final titleTextStyle:I = 0x7f0403c9
+.field public static final titleTextStyle:I = 0x7f0403c8
 
 .field public static final toolbarId:I = 0x7f0403ca
 
diff --git a/com.discord/smali/com/discord/gateway/R$color.smali b/com.discord/smali/com/discord/gateway/R$color.smali
index 16f893d19e..6388565cc2 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 = 0x7f060035
+.field public static final bright_foreground_disabled_material_dark:I = 0x7f060034
 
-.field public static final bright_foreground_disabled_material_light:I = 0x7f060036
+.field public static final bright_foreground_disabled_material_light:I = 0x7f060035
 
-.field public static final bright_foreground_inverse_material_dark:I = 0x7f060037
+.field public static final bright_foreground_inverse_material_dark:I = 0x7f060036
 
-.field public static final bright_foreground_inverse_material_light:I = 0x7f060038
+.field public static final bright_foreground_inverse_material_light:I = 0x7f060037
 
-.field public static final bright_foreground_material_dark:I = 0x7f060039
+.field public static final bright_foreground_material_dark:I = 0x7f060038
 
-.field public static final bright_foreground_material_light:I = 0x7f06003a
+.field public static final bright_foreground_material_light:I = 0x7f060039
 
-.field public static final button_material_dark:I = 0x7f060040
+.field public static final button_material_dark:I = 0x7f06003f
 
-.field public static final button_material_light:I = 0x7f060041
+.field public static final button_material_light:I = 0x7f060040
 
-.field public static final cardview_dark_background:I = 0x7f060042
+.field public static final cardview_dark_background:I = 0x7f060041
 
-.field public static final cardview_light_background:I = 0x7f060043
+.field public static final cardview_light_background:I = 0x7f060042
 
-.field public static final cardview_shadow_end_color:I = 0x7f060044
+.field public static final cardview_shadow_end_color:I = 0x7f060043
 
-.field public static final cardview_shadow_start_color:I = 0x7f060045
+.field public static final cardview_shadow_start_color:I = 0x7f060044
 
-.field public static final common_google_signin_btn_text_dark:I = 0x7f06004f
+.field public static final common_google_signin_btn_text_dark:I = 0x7f06004e
 
-.field public static final common_google_signin_btn_text_dark_default:I = 0x7f060050
+.field public static final common_google_signin_btn_text_dark_default:I = 0x7f06004f
 
-.field public static final common_google_signin_btn_text_dark_disabled:I = 0x7f060051
+.field public static final common_google_signin_btn_text_dark_disabled:I = 0x7f060050
 
-.field public static final common_google_signin_btn_text_dark_focused:I = 0x7f060052
+.field public static final common_google_signin_btn_text_dark_focused:I = 0x7f060051
 
-.field public static final common_google_signin_btn_text_dark_pressed:I = 0x7f060053
+.field public static final common_google_signin_btn_text_dark_pressed:I = 0x7f060052
 
-.field public static final common_google_signin_btn_text_light:I = 0x7f060054
+.field public static final common_google_signin_btn_text_light:I = 0x7f060053
 
-.field public static final common_google_signin_btn_text_light_default:I = 0x7f060055
+.field public static final common_google_signin_btn_text_light_default:I = 0x7f060054
 
-.field public static final common_google_signin_btn_text_light_disabled:I = 0x7f060056
+.field public static final common_google_signin_btn_text_light_disabled:I = 0x7f060055
 
-.field public static final common_google_signin_btn_text_light_focused:I = 0x7f060057
+.field public static final common_google_signin_btn_text_light_focused:I = 0x7f060056
 
-.field public static final common_google_signin_btn_text_light_pressed:I = 0x7f060058
+.field public static final common_google_signin_btn_text_light_pressed:I = 0x7f060057
 
-.field public static final common_google_signin_btn_tint:I = 0x7f060059
+.field public static final common_google_signin_btn_tint:I = 0x7f060058
 
-.field public static final design_bottom_navigation_shadow_color:I = 0x7f06005c
+.field public static final design_bottom_navigation_shadow_color:I = 0x7f06005b
 
-.field public static final design_default_color_primary:I = 0x7f06005d
+.field public static final design_default_color_primary:I = 0x7f06005c
 
-.field public static final design_default_color_primary_dark:I = 0x7f06005e
+.field public static final design_default_color_primary_dark:I = 0x7f06005d
 
-.field public static final design_error:I = 0x7f06005f
+.field public static final design_error:I = 0x7f06005e
 
-.field public static final design_fab_shadow_end_color:I = 0x7f060060
+.field public static final design_fab_shadow_end_color:I = 0x7f06005f
 
-.field public static final design_fab_shadow_mid_color:I = 0x7f060061
+.field public static final design_fab_shadow_mid_color:I = 0x7f060060
 
-.field public static final design_fab_shadow_start_color:I = 0x7f060062
+.field public static final design_fab_shadow_start_color:I = 0x7f060061
 
-.field public static final design_fab_stroke_end_inner_color:I = 0x7f060063
+.field public static final design_fab_stroke_end_inner_color:I = 0x7f060062
 
-.field public static final design_fab_stroke_end_outer_color:I = 0x7f060064
+.field public static final design_fab_stroke_end_outer_color:I = 0x7f060063
 
-.field public static final design_fab_stroke_top_inner_color:I = 0x7f060065
+.field public static final design_fab_stroke_top_inner_color:I = 0x7f060064
 
-.field public static final design_fab_stroke_top_outer_color:I = 0x7f060066
+.field public static final design_fab_stroke_top_outer_color:I = 0x7f060065
 
-.field public static final design_snackbar_background_color:I = 0x7f060067
+.field public static final design_snackbar_background_color:I = 0x7f060066
 
-.field public static final design_tint_password_toggle:I = 0x7f060068
+.field public static final design_tint_password_toggle:I = 0x7f060067
 
-.field public static final dim_foreground_disabled_material_dark:I = 0x7f060069
+.field public static final dim_foreground_disabled_material_dark:I = 0x7f060068
 
-.field public static final dim_foreground_disabled_material_light:I = 0x7f06006a
+.field public static final dim_foreground_disabled_material_light:I = 0x7f060069
 
-.field public static final dim_foreground_material_dark:I = 0x7f06006b
+.field public static final dim_foreground_material_dark:I = 0x7f06006a
 
-.field public static final dim_foreground_material_light:I = 0x7f06006c
+.field public static final dim_foreground_material_light:I = 0x7f06006b
 
-.field public static final error_color_material_dark:I = 0x7f06006d
+.field public static final error_color_material_dark:I = 0x7f06006c
 
-.field public static final error_color_material_light:I = 0x7f06006e
+.field public static final error_color_material_light:I = 0x7f06006d
 
-.field public static final foreground_material_dark:I = 0x7f060073
+.field public static final foreground_material_dark:I = 0x7f060072
 
-.field public static final foreground_material_light:I = 0x7f060074
+.field public static final foreground_material_light:I = 0x7f060073
 
-.field public static final highlighted_text_material_dark:I = 0x7f060083
+.field public static final highlighted_text_material_dark:I = 0x7f060082
 
-.field public static final highlighted_text_material_light:I = 0x7f060084
+.field public static final highlighted_text_material_light:I = 0x7f060083
 
-.field public static final material_blue_grey_800:I = 0x7f060092
+.field public static final material_blue_grey_800:I = 0x7f060091
 
-.field public static final material_blue_grey_900:I = 0x7f060093
+.field public static final material_blue_grey_900:I = 0x7f060092
 
-.field public static final material_blue_grey_950:I = 0x7f060094
+.field public static final material_blue_grey_950:I = 0x7f060093
 
-.field public static final material_deep_teal_200:I = 0x7f060095
+.field public static final material_deep_teal_200:I = 0x7f060094
 
-.field public static final material_deep_teal_500:I = 0x7f060096
+.field public static final material_deep_teal_500:I = 0x7f060095
 
-.field public static final material_grey_100:I = 0x7f060097
+.field public static final material_grey_100:I = 0x7f060096
 
-.field public static final material_grey_300:I = 0x7f060098
+.field public static final material_grey_300:I = 0x7f060097
 
-.field public static final material_grey_50:I = 0x7f060099
+.field public static final material_grey_50:I = 0x7f060098
 
-.field public static final material_grey_600:I = 0x7f06009a
+.field public static final material_grey_600:I = 0x7f060099
 
-.field public static final material_grey_800:I = 0x7f06009b
+.field public static final material_grey_800:I = 0x7f06009a
 
-.field public static final material_grey_850:I = 0x7f06009c
+.field public static final material_grey_850:I = 0x7f06009b
 
-.field public static final material_grey_900:I = 0x7f06009d
+.field public static final material_grey_900:I = 0x7f06009c
 
-.field public static final mtrl_bottom_nav_colored_item_tint:I = 0x7f06009e
+.field public static final mtrl_bottom_nav_colored_item_tint:I = 0x7f06009d
 
-.field public static final mtrl_bottom_nav_item_tint:I = 0x7f06009f
+.field public static final mtrl_bottom_nav_item_tint:I = 0x7f06009e
 
-.field public static final mtrl_btn_bg_color_disabled:I = 0x7f0600a0
+.field public static final mtrl_btn_bg_color_disabled:I = 0x7f06009f
 
-.field public static final mtrl_btn_bg_color_selector:I = 0x7f0600a1
+.field public static final mtrl_btn_bg_color_selector:I = 0x7f0600a0
 
-.field public static final mtrl_btn_ripple_color:I = 0x7f0600a2
+.field public static final mtrl_btn_ripple_color:I = 0x7f0600a1
 
-.field public static final mtrl_btn_stroke_color_selector:I = 0x7f0600a3
+.field public static final mtrl_btn_stroke_color_selector:I = 0x7f0600a2
 
-.field public static final mtrl_btn_text_btn_ripple_color:I = 0x7f0600a4
+.field public static final mtrl_btn_text_btn_ripple_color:I = 0x7f0600a3
 
-.field public static final mtrl_btn_text_color_disabled:I = 0x7f0600a5
+.field public static final mtrl_btn_text_color_disabled:I = 0x7f0600a4
 
-.field public static final mtrl_btn_text_color_selector:I = 0x7f0600a6
+.field public static final mtrl_btn_text_color_selector:I = 0x7f0600a5
 
-.field public static final mtrl_btn_transparent_bg_color:I = 0x7f0600a7
+.field public static final mtrl_btn_transparent_bg_color:I = 0x7f0600a6
 
-.field public static final mtrl_chip_background_color:I = 0x7f0600a8
+.field public static final mtrl_chip_background_color:I = 0x7f0600a7
 
-.field public static final mtrl_chip_close_icon_tint:I = 0x7f0600a9
+.field public static final mtrl_chip_close_icon_tint:I = 0x7f0600a8
 
-.field public static final mtrl_chip_ripple_color:I = 0x7f0600aa
+.field public static final mtrl_chip_ripple_color:I = 0x7f0600a9
 
-.field public static final mtrl_chip_text_color:I = 0x7f0600ab
+.field public static final mtrl_chip_text_color:I = 0x7f0600aa
 
-.field public static final mtrl_fab_ripple_color:I = 0x7f0600ac
+.field public static final mtrl_fab_ripple_color:I = 0x7f0600ab
 
-.field public static final mtrl_scrim_color:I = 0x7f0600ad
+.field public static final mtrl_scrim_color:I = 0x7f0600ac
 
-.field public static final mtrl_tabs_colored_ripple_color:I = 0x7f0600ae
+.field public static final mtrl_tabs_colored_ripple_color:I = 0x7f0600ad
 
-.field public static final mtrl_tabs_icon_color_selector:I = 0x7f0600af
+.field public static final mtrl_tabs_icon_color_selector:I = 0x7f0600ae
 
-.field public static final mtrl_tabs_icon_color_selector_colored:I = 0x7f0600b0
+.field public static final mtrl_tabs_icon_color_selector_colored:I = 0x7f0600af
 
-.field public static final mtrl_tabs_legacy_text_color_selector:I = 0x7f0600b1
+.field public static final mtrl_tabs_legacy_text_color_selector:I = 0x7f0600b0
 
-.field public static final mtrl_tabs_ripple_color:I = 0x7f0600b2
+.field public static final mtrl_tabs_ripple_color:I = 0x7f0600b1
 
-.field public static final mtrl_text_btn_text_color_selector:I = 0x7f0600b3
+.field public static final mtrl_text_btn_text_color_selector:I = 0x7f0600b2
 
-.field public static final mtrl_textinput_default_box_stroke_color:I = 0x7f0600b4
+.field public static final mtrl_textinput_default_box_stroke_color:I = 0x7f0600b3
 
-.field public static final mtrl_textinput_disabled_color:I = 0x7f0600b5
+.field public static final mtrl_textinput_disabled_color:I = 0x7f0600b4
 
-.field public static final mtrl_textinput_filled_box_default_background_color:I = 0x7f0600b6
+.field public static final mtrl_textinput_filled_box_default_background_color:I = 0x7f0600b5
 
-.field public static final mtrl_textinput_hovered_box_stroke_color:I = 0x7f0600b7
+.field public static final mtrl_textinput_hovered_box_stroke_color:I = 0x7f0600b6
 
-.field public static final notification_action_color_filter:I = 0x7f0600b8
+.field public static final notification_action_color_filter:I = 0x7f0600b7
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b9
+.field public static final notification_icon_bg_color:I = 0x7f0600b8
 
-.field public static final primary_dark_material_dark:I = 0x7f0600db
+.field public static final primary_dark_material_dark:I = 0x7f0600da
 
-.field public static final primary_dark_material_light:I = 0x7f0600dc
+.field public static final primary_dark_material_light:I = 0x7f0600db
 
-.field public static final primary_material_dark:I = 0x7f0600ec
+.field public static final primary_material_dark:I = 0x7f0600eb
 
-.field public static final primary_material_light:I = 0x7f0600ed
+.field public static final primary_material_light:I = 0x7f0600ec
 
-.field public static final primary_text_default_material_dark:I = 0x7f0600ee
+.field public static final primary_text_default_material_dark:I = 0x7f0600ed
 
-.field public static final primary_text_default_material_light:I = 0x7f0600ef
+.field public static final primary_text_default_material_light:I = 0x7f0600ee
 
-.field public static final primary_text_disabled_material_dark:I = 0x7f0600f0
+.field public static final primary_text_disabled_material_dark:I = 0x7f0600ef
 
-.field public static final primary_text_disabled_material_light:I = 0x7f0600f1
+.field public static final primary_text_disabled_material_light:I = 0x7f0600f0
 
-.field public static final ripple_material_dark:I = 0x7f0600fa
+.field public static final ripple_material_dark:I = 0x7f0600f9
 
-.field public static final ripple_material_light:I = 0x7f0600fb
+.field public static final ripple_material_light:I = 0x7f0600fa
 
-.field public static final secondary_text_default_material_dark:I = 0x7f0600fc
+.field public static final secondary_text_default_material_dark:I = 0x7f0600fb
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fd
+.field public static final secondary_text_default_material_light:I = 0x7f0600fc
 
-.field public static final secondary_text_disabled_material_dark:I = 0x7f0600fe
+.field public static final secondary_text_disabled_material_dark:I = 0x7f0600fd
 
-.field public static final secondary_text_disabled_material_light:I = 0x7f0600ff
+.field public static final secondary_text_disabled_material_light:I = 0x7f0600fe
 
-.field public static final switch_thumb_disabled_material_dark:I = 0x7f06012e
+.field public static final switch_thumb_disabled_material_dark:I = 0x7f06012d
 
-.field public static final switch_thumb_disabled_material_light:I = 0x7f06012f
+.field public static final switch_thumb_disabled_material_light:I = 0x7f06012e
 
-.field public static final switch_thumb_material_dark:I = 0x7f060130
+.field public static final switch_thumb_material_dark:I = 0x7f06012f
 
-.field public static final switch_thumb_material_light:I = 0x7f060131
+.field public static final switch_thumb_material_light:I = 0x7f060130
 
-.field public static final switch_thumb_normal_material_dark:I = 0x7f060132
+.field public static final switch_thumb_normal_material_dark:I = 0x7f060131
 
-.field public static final switch_thumb_normal_material_light:I = 0x7f060133
+.field public static final switch_thumb_normal_material_light:I = 0x7f060132
 
-.field public static final tooltip_background_dark:I = 0x7f060135
+.field public static final tooltip_background_dark:I = 0x7f060134
 
-.field public static final tooltip_background_light:I = 0x7f060136
+.field public static final tooltip_background_light:I = 0x7f060135
 
 
 # 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 d142898240..a96a101b7d 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 = 0x7f080017
+.field public static final abc_ab_share_pack_mtrl_alpha:I = 0x7f080016
 
-.field public static final abc_action_bar_item_background_material:I = 0x7f080018
+.field public static final abc_action_bar_item_background_material:I = 0x7f080017
 
-.field public static final abc_btn_borderless_material:I = 0x7f080019
+.field public static final abc_btn_borderless_material:I = 0x7f080018
 
-.field public static final abc_btn_check_material:I = 0x7f08001a
+.field public static final abc_btn_check_material:I = 0x7f080019
 
-.field public static final abc_btn_check_to_on_mtrl_000:I = 0x7f08001b
+.field public static final abc_btn_check_to_on_mtrl_000:I = 0x7f08001a
 
-.field public static final abc_btn_check_to_on_mtrl_015:I = 0x7f08001c
+.field public static final abc_btn_check_to_on_mtrl_015:I = 0x7f08001b
 
-.field public static final abc_btn_colored_material:I = 0x7f08001d
+.field public static final abc_btn_colored_material:I = 0x7f08001c
 
-.field public static final abc_btn_default_mtrl_shape:I = 0x7f08001e
+.field public static final abc_btn_default_mtrl_shape:I = 0x7f08001d
 
-.field public static final abc_btn_radio_material:I = 0x7f08001f
+.field public static final abc_btn_radio_material:I = 0x7f08001e
 
-.field public static final abc_btn_radio_to_on_mtrl_000:I = 0x7f080020
+.field public static final abc_btn_radio_to_on_mtrl_000:I = 0x7f08001f
 
-.field public static final abc_btn_radio_to_on_mtrl_015:I = 0x7f080021
+.field public static final abc_btn_radio_to_on_mtrl_015:I = 0x7f080020
 
-.field public static final abc_btn_switch_to_on_mtrl_00001:I = 0x7f080022
+.field public static final abc_btn_switch_to_on_mtrl_00001:I = 0x7f080021
 
-.field public static final abc_btn_switch_to_on_mtrl_00012:I = 0x7f080023
+.field public static final abc_btn_switch_to_on_mtrl_00012:I = 0x7f080022
 
-.field public static final abc_cab_background_internal_bg:I = 0x7f080024
+.field public static final abc_cab_background_internal_bg:I = 0x7f080023
 
-.field public static final abc_cab_background_top_material:I = 0x7f080025
+.field public static final abc_cab_background_top_material:I = 0x7f080024
 
-.field public static final abc_cab_background_top_mtrl_alpha:I = 0x7f080026
+.field public static final abc_cab_background_top_mtrl_alpha:I = 0x7f080025
 
-.field public static final abc_control_background_material:I = 0x7f080027
+.field public static final abc_control_background_material:I = 0x7f080026
 
-.field public static final abc_dialog_material_background:I = 0x7f080028
+.field public static final abc_dialog_material_background:I = 0x7f080027
 
-.field public static final abc_edit_text_material:I = 0x7f080029
+.field public static final abc_edit_text_material:I = 0x7f080028
 
-.field public static final abc_ic_ab_back_material:I = 0x7f08002a
+.field public static final abc_ic_ab_back_material:I = 0x7f080029
 
-.field public static final abc_ic_arrow_drop_right_black_24dp:I = 0x7f08002b
+.field public static final abc_ic_arrow_drop_right_black_24dp:I = 0x7f08002a
 
-.field public static final abc_ic_clear_material:I = 0x7f08002c
+.field public static final abc_ic_clear_material:I = 0x7f08002b
 
-.field public static final abc_ic_commit_search_api_mtrl_alpha:I = 0x7f08002d
+.field public static final abc_ic_commit_search_api_mtrl_alpha:I = 0x7f08002c
 
-.field public static final abc_ic_go_search_api_material:I = 0x7f08002e
+.field public static final abc_ic_go_search_api_material:I = 0x7f08002d
 
-.field public static final abc_ic_menu_copy_mtrl_am_alpha:I = 0x7f08002f
+.field public static final abc_ic_menu_copy_mtrl_am_alpha:I = 0x7f08002e
 
-.field public static final abc_ic_menu_cut_mtrl_alpha:I = 0x7f080030
+.field public static final abc_ic_menu_cut_mtrl_alpha:I = 0x7f08002f
 
-.field public static final abc_ic_menu_overflow_material:I = 0x7f080031
+.field public static final abc_ic_menu_overflow_material:I = 0x7f080030
 
-.field public static final abc_ic_menu_paste_mtrl_am_alpha:I = 0x7f080032
+.field public static final abc_ic_menu_paste_mtrl_am_alpha:I = 0x7f080031
 
-.field public static final abc_ic_menu_selectall_mtrl_alpha:I = 0x7f080033
+.field public static final abc_ic_menu_selectall_mtrl_alpha:I = 0x7f080032
 
-.field public static final abc_ic_menu_share_mtrl_alpha:I = 0x7f080034
+.field public static final abc_ic_menu_share_mtrl_alpha:I = 0x7f080033
 
-.field public static final abc_ic_search_api_material:I = 0x7f080035
+.field public static final abc_ic_search_api_material:I = 0x7f080034
 
-.field public static final abc_ic_star_black_16dp:I = 0x7f080036
+.field public static final abc_ic_star_black_16dp:I = 0x7f080035
 
-.field public static final abc_ic_star_black_36dp:I = 0x7f080037
+.field public static final abc_ic_star_black_36dp:I = 0x7f080036
 
-.field public static final abc_ic_star_black_48dp:I = 0x7f080038
+.field public static final abc_ic_star_black_48dp:I = 0x7f080037
 
-.field public static final abc_ic_star_half_black_16dp:I = 0x7f080039
+.field public static final abc_ic_star_half_black_16dp:I = 0x7f080038
 
-.field public static final abc_ic_star_half_black_36dp:I = 0x7f08003a
+.field public static final abc_ic_star_half_black_36dp:I = 0x7f080039
 
-.field public static final abc_ic_star_half_black_48dp:I = 0x7f08003b
+.field public static final abc_ic_star_half_black_48dp:I = 0x7f08003a
 
-.field public static final abc_ic_voice_search_api_material:I = 0x7f08003c
+.field public static final abc_ic_voice_search_api_material:I = 0x7f08003b
 
-.field public static final abc_item_background_holo_dark:I = 0x7f08003d
+.field public static final abc_item_background_holo_dark:I = 0x7f08003c
 
-.field public static final abc_item_background_holo_light:I = 0x7f08003e
+.field public static final abc_item_background_holo_light:I = 0x7f08003d
 
-.field public static final abc_list_divider_material:I = 0x7f08003f
+.field public static final abc_list_divider_material:I = 0x7f08003e
 
-.field public static final abc_list_divider_mtrl_alpha:I = 0x7f080040
+.field public static final abc_list_divider_mtrl_alpha:I = 0x7f08003f
 
-.field public static final abc_list_focused_holo:I = 0x7f080041
+.field public static final abc_list_focused_holo:I = 0x7f080040
 
-.field public static final abc_list_longpressed_holo:I = 0x7f080042
+.field public static final abc_list_longpressed_holo:I = 0x7f080041
 
-.field public static final abc_list_pressed_holo_dark:I = 0x7f080043
+.field public static final abc_list_pressed_holo_dark:I = 0x7f080042
 
-.field public static final abc_list_pressed_holo_light:I = 0x7f080044
+.field public static final abc_list_pressed_holo_light:I = 0x7f080043
 
-.field public static final abc_list_selector_background_transition_holo_dark:I = 0x7f080045
+.field public static final abc_list_selector_background_transition_holo_dark:I = 0x7f080044
 
-.field public static final abc_list_selector_background_transition_holo_light:I = 0x7f080046
+.field public static final abc_list_selector_background_transition_holo_light:I = 0x7f080045
 
-.field public static final abc_list_selector_disabled_holo_dark:I = 0x7f080047
+.field public static final abc_list_selector_disabled_holo_dark:I = 0x7f080046
 
-.field public static final abc_list_selector_disabled_holo_light:I = 0x7f080048
+.field public static final abc_list_selector_disabled_holo_light:I = 0x7f080047
 
-.field public static final abc_list_selector_holo_dark:I = 0x7f080049
+.field public static final abc_list_selector_holo_dark:I = 0x7f080048
 
-.field public static final abc_list_selector_holo_light:I = 0x7f08004a
+.field public static final abc_list_selector_holo_light:I = 0x7f080049
 
-.field public static final abc_menu_hardkey_panel_mtrl_mult:I = 0x7f08004b
+.field public static final abc_menu_hardkey_panel_mtrl_mult:I = 0x7f08004a
 
-.field public static final abc_popup_background_mtrl_mult:I = 0x7f08004c
+.field public static final abc_popup_background_mtrl_mult:I = 0x7f08004b
 
-.field public static final abc_ratingbar_indicator_material:I = 0x7f08004d
+.field public static final abc_ratingbar_indicator_material:I = 0x7f08004c
 
-.field public static final abc_ratingbar_material:I = 0x7f08004e
+.field public static final abc_ratingbar_material:I = 0x7f08004d
 
-.field public static final abc_ratingbar_small_material:I = 0x7f08004f
+.field public static final abc_ratingbar_small_material:I = 0x7f08004e
 
-.field public static final abc_scrubber_control_off_mtrl_alpha:I = 0x7f080050
+.field public static final abc_scrubber_control_off_mtrl_alpha:I = 0x7f08004f
 
-.field public static final abc_scrubber_control_to_pressed_mtrl_000:I = 0x7f080051
+.field public static final abc_scrubber_control_to_pressed_mtrl_000:I = 0x7f080050
 
-.field public static final abc_scrubber_control_to_pressed_mtrl_005:I = 0x7f080052
+.field public static final abc_scrubber_control_to_pressed_mtrl_005:I = 0x7f080051
 
-.field public static final abc_scrubber_primary_mtrl_alpha:I = 0x7f080053
+.field public static final abc_scrubber_primary_mtrl_alpha:I = 0x7f080052
 
-.field public static final abc_scrubber_track_mtrl_alpha:I = 0x7f080054
+.field public static final abc_scrubber_track_mtrl_alpha:I = 0x7f080053
 
-.field public static final abc_seekbar_thumb_material:I = 0x7f080055
+.field public static final abc_seekbar_thumb_material:I = 0x7f080054
 
-.field public static final abc_seekbar_tick_mark_material:I = 0x7f080056
+.field public static final abc_seekbar_tick_mark_material:I = 0x7f080055
 
-.field public static final abc_seekbar_track_material:I = 0x7f080057
+.field public static final abc_seekbar_track_material:I = 0x7f080056
 
-.field public static final abc_spinner_mtrl_am_alpha:I = 0x7f080058
+.field public static final abc_spinner_mtrl_am_alpha:I = 0x7f080057
 
-.field public static final abc_spinner_textfield_background_material:I = 0x7f080059
+.field public static final abc_spinner_textfield_background_material:I = 0x7f080058
 
-.field public static final abc_switch_thumb_material:I = 0x7f08005a
+.field public static final abc_switch_thumb_material:I = 0x7f080059
 
-.field public static final abc_switch_track_mtrl_alpha:I = 0x7f08005b
+.field public static final abc_switch_track_mtrl_alpha:I = 0x7f08005a
 
-.field public static final abc_tab_indicator_material:I = 0x7f08005c
+.field public static final abc_tab_indicator_material:I = 0x7f08005b
 
-.field public static final abc_tab_indicator_mtrl_alpha:I = 0x7f08005d
+.field public static final abc_tab_indicator_mtrl_alpha:I = 0x7f08005c
 
-.field public static final abc_text_cursor_material:I = 0x7f08005e
+.field public static final abc_text_cursor_material:I = 0x7f08005d
 
-.field public static final abc_text_select_handle_left_mtrl_dark:I = 0x7f08005f
+.field public static final abc_text_select_handle_left_mtrl_dark:I = 0x7f08005e
 
-.field public static final abc_text_select_handle_left_mtrl_light:I = 0x7f080060
+.field public static final abc_text_select_handle_left_mtrl_light:I = 0x7f08005f
 
-.field public static final abc_text_select_handle_middle_mtrl_dark:I = 0x7f080061
+.field public static final abc_text_select_handle_middle_mtrl_dark:I = 0x7f080060
 
-.field public static final abc_text_select_handle_middle_mtrl_light:I = 0x7f080062
+.field public static final abc_text_select_handle_middle_mtrl_light:I = 0x7f080061
 
-.field public static final abc_text_select_handle_right_mtrl_dark:I = 0x7f080063
+.field public static final abc_text_select_handle_right_mtrl_dark:I = 0x7f080062
 
-.field public static final abc_text_select_handle_right_mtrl_light:I = 0x7f080064
+.field public static final abc_text_select_handle_right_mtrl_light:I = 0x7f080063
 
-.field public static final abc_textfield_activated_mtrl_alpha:I = 0x7f080065
+.field public static final abc_textfield_activated_mtrl_alpha:I = 0x7f080064
 
-.field public static final abc_textfield_default_mtrl_alpha:I = 0x7f080066
+.field public static final abc_textfield_default_mtrl_alpha:I = 0x7f080065
 
-.field public static final abc_textfield_search_activated_mtrl_alpha:I = 0x7f080067
+.field public static final abc_textfield_search_activated_mtrl_alpha:I = 0x7f080066
 
-.field public static final abc_textfield_search_default_mtrl_alpha:I = 0x7f080068
+.field public static final abc_textfield_search_default_mtrl_alpha:I = 0x7f080067
 
-.field public static final abc_textfield_search_material:I = 0x7f080069
+.field public static final abc_textfield_search_material:I = 0x7f080068
 
-.field public static final abc_vector_test:I = 0x7f08006a
+.field public static final abc_vector_test:I = 0x7f080069
 
-.field public static final avd_hide_password:I = 0x7f08008a
+.field public static final avd_hide_password:I = 0x7f080089
 
-.field public static final avd_show_password:I = 0x7f08008b
+.field public static final avd_show_password:I = 0x7f08008a
 
-.field public static final common_full_open_on_phone:I = 0x7f0800a2
+.field public static final common_full_open_on_phone:I = 0x7f0800a1
 
-.field public static final common_google_signin_btn_icon_dark:I = 0x7f0800a3
+.field public static final common_google_signin_btn_icon_dark:I = 0x7f0800a2
 
-.field public static final common_google_signin_btn_icon_dark_focused:I = 0x7f0800a4
+.field public static final common_google_signin_btn_icon_dark_focused:I = 0x7f0800a3
 
-.field public static final common_google_signin_btn_icon_dark_normal:I = 0x7f0800a5
+.field public static final common_google_signin_btn_icon_dark_normal:I = 0x7f0800a4
 
-.field public static final common_google_signin_btn_icon_dark_normal_background:I = 0x7f0800a6
+.field public static final common_google_signin_btn_icon_dark_normal_background:I = 0x7f0800a5
 
-.field public static final common_google_signin_btn_icon_disabled:I = 0x7f0800a7
+.field public static final common_google_signin_btn_icon_disabled:I = 0x7f0800a6
 
-.field public static final common_google_signin_btn_icon_light:I = 0x7f0800a8
+.field public static final common_google_signin_btn_icon_light:I = 0x7f0800a7
 
-.field public static final common_google_signin_btn_icon_light_focused:I = 0x7f0800a9
+.field public static final common_google_signin_btn_icon_light_focused:I = 0x7f0800a8
 
-.field public static final common_google_signin_btn_icon_light_normal:I = 0x7f0800aa
+.field public static final common_google_signin_btn_icon_light_normal:I = 0x7f0800a9
 
-.field public static final common_google_signin_btn_icon_light_normal_background:I = 0x7f0800ab
+.field public static final common_google_signin_btn_icon_light_normal_background:I = 0x7f0800aa
 
-.field public static final common_google_signin_btn_text_dark:I = 0x7f0800ac
+.field public static final common_google_signin_btn_text_dark:I = 0x7f0800ab
 
-.field public static final common_google_signin_btn_text_dark_focused:I = 0x7f0800ad
+.field public static final common_google_signin_btn_text_dark_focused:I = 0x7f0800ac
 
-.field public static final common_google_signin_btn_text_dark_normal:I = 0x7f0800ae
+.field public static final common_google_signin_btn_text_dark_normal:I = 0x7f0800ad
 
-.field public static final common_google_signin_btn_text_dark_normal_background:I = 0x7f0800af
+.field public static final common_google_signin_btn_text_dark_normal_background:I = 0x7f0800ae
 
-.field public static final common_google_signin_btn_text_disabled:I = 0x7f0800b0
+.field public static final common_google_signin_btn_text_disabled:I = 0x7f0800af
 
-.field public static final common_google_signin_btn_text_light:I = 0x7f0800b1
+.field public static final common_google_signin_btn_text_light:I = 0x7f0800b0
 
-.field public static final common_google_signin_btn_text_light_focused:I = 0x7f0800b2
+.field public static final common_google_signin_btn_text_light_focused:I = 0x7f0800b1
 
-.field public static final common_google_signin_btn_text_light_normal:I = 0x7f0800b3
+.field public static final common_google_signin_btn_text_light_normal:I = 0x7f0800b2
 
-.field public static final common_google_signin_btn_text_light_normal_background:I = 0x7f0800b4
+.field public static final common_google_signin_btn_text_light_normal_background:I = 0x7f0800b3
 
-.field public static final design_bottom_navigation_item_background:I = 0x7f0800b5
+.field public static final design_bottom_navigation_item_background:I = 0x7f0800b4
 
-.field public static final design_fab_background:I = 0x7f0800b6
+.field public static final design_fab_background:I = 0x7f0800b5
 
-.field public static final design_ic_visibility:I = 0x7f0800b7
+.field public static final design_ic_visibility:I = 0x7f0800b6
 
-.field public static final design_ic_visibility_off:I = 0x7f0800b8
+.field public static final design_ic_visibility_off:I = 0x7f0800b7
 
-.field public static final design_password_eye:I = 0x7f0800b9
+.field public static final design_password_eye:I = 0x7f0800b8
 
-.field public static final design_snackbar_background:I = 0x7f0800ba
+.field public static final design_snackbar_background:I = 0x7f0800b9
 
-.field public static final drawable_chip_background:I = 0x7f080105
+.field public static final drawable_chip_background:I = 0x7f080101
 
-.field public static final drawable_chip_circle:I = 0x7f080106
+.field public static final drawable_chip_circle:I = 0x7f080102
 
-.field public static final drawable_chip_delete:I = 0x7f080107
+.field public static final drawable_chip_delete:I = 0x7f080103
 
-.field public static final googleg_disabled_color_18:I = 0x7f0801bb
+.field public static final googleg_disabled_color_18:I = 0x7f0801b0
 
-.field public static final googleg_standard_color_18:I = 0x7f0801bc
+.field public static final googleg_standard_color_18:I = 0x7f0801b1
 
-.field public static final ic_mtrl_chip_checked_black:I = 0x7f080308
+.field public static final ic_mtrl_chip_checked_black:I = 0x7f0802fc
 
-.field public static final ic_mtrl_chip_checked_circle:I = 0x7f080309
+.field public static final ic_mtrl_chip_checked_circle:I = 0x7f0802fd
 
-.field public static final ic_mtrl_chip_close_circle:I = 0x7f08030a
+.field public static final ic_mtrl_chip_close_circle:I = 0x7f0802fe
 
-.field public static final mtrl_snackbar_background:I = 0x7f08046f
+.field public static final mtrl_snackbar_background:I = 0x7f080460
 
-.field public static final mtrl_tabs_default_indicator:I = 0x7f080470
+.field public static final mtrl_tabs_default_indicator:I = 0x7f080461
 
-.field public static final navigation_empty_icon:I = 0x7f080471
+.field public static final navigation_empty_icon:I = 0x7f080462
 
-.field public static final notification_action_background:I = 0x7f080472
+.field public static final notification_action_background:I = 0x7f080463
 
-.field public static final notification_bg:I = 0x7f080473
+.field public static final notification_bg:I = 0x7f080464
 
-.field public static final notification_bg_low:I = 0x7f080474
+.field public static final notification_bg_low:I = 0x7f080465
 
-.field public static final notification_bg_low_normal:I = 0x7f080475
+.field public static final notification_bg_low_normal:I = 0x7f080466
 
-.field public static final notification_bg_low_pressed:I = 0x7f080476
+.field public static final notification_bg_low_pressed:I = 0x7f080467
 
-.field public static final notification_bg_normal:I = 0x7f080477
+.field public static final notification_bg_normal:I = 0x7f080468
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080478
+.field public static final notification_bg_normal_pressed:I = 0x7f080469
 
-.field public static final notification_icon_background:I = 0x7f080479
+.field public static final notification_icon_background:I = 0x7f08046a
 
-.field public static final notification_template_icon_bg:I = 0x7f08047a
+.field public static final notification_template_icon_bg:I = 0x7f08046b
 
-.field public static final notification_template_icon_low_bg:I = 0x7f08047b
+.field public static final notification_template_icon_low_bg:I = 0x7f08046c
 
-.field public static final notification_tile_bg:I = 0x7f08047c
+.field public static final notification_tile_bg:I = 0x7f08046d
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08047d
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08046e
 
-.field public static final tooltip_frame_dark:I = 0x7f080485
+.field public static final tooltip_frame_dark:I = 0x7f080476
 
-.field public static final tooltip_frame_light:I = 0x7f080486
+.field public static final tooltip_frame_light:I = 0x7f080477
 
 
 # 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 9b3409a879..9460fbfa0b 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 = 0x7f0a0080
+.field public static final async:I = 0x7f0a007f
 
-.field public static final auto:I = 0x7f0a00b9
+.field public static final auto:I = 0x7f0a00b8
 
-.field public static final baseline:I = 0x7f0a00c9
+.field public static final baseline:I = 0x7f0a00c8
 
-.field public static final blocking:I = 0x7f0a00ce
+.field public static final blocking:I = 0x7f0a00cd
 
 .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 = 0x7f0a0233
+.field public static final container:I = 0x7f0a0232
 
-.field public static final content:I = 0x7f0a0234
+.field public static final content:I = 0x7f0a0233
 
-.field public static final contentPanel:I = 0x7f0a0235
+.field public static final contentPanel:I = 0x7f0a0234
 
-.field public static final coordinator:I = 0x7f0a023a
+.field public static final coordinator:I = 0x7f0a0239
 
-.field public static final custom:I = 0x7f0a0252
+.field public static final custom:I = 0x7f0a0251
 
-.field public static final customPanel:I = 0x7f0a0253
+.field public static final customPanel:I = 0x7f0a0252
 
-.field public static final dark:I = 0x7f0a0254
+.field public static final dark:I = 0x7f0a0253
 
-.field public static final decor_content_parent:I = 0x7f0a0257
+.field public static final decor_content_parent:I = 0x7f0a0256
 
-.field public static final default_activity_button:I = 0x7f0a0258
+.field public static final default_activity_button:I = 0x7f0a0257
 
-.field public static final design_bottom_sheet:I = 0x7f0a0259
+.field public static final design_bottom_sheet:I = 0x7f0a0258
 
-.field public static final design_menu_item_action_area:I = 0x7f0a025a
+.field public static final design_menu_item_action_area:I = 0x7f0a0259
 
-.field public static final design_menu_item_action_area_stub:I = 0x7f0a025b
+.field public static final design_menu_item_action_area_stub:I = 0x7f0a025a
 
-.field public static final design_menu_item_text:I = 0x7f0a025c
+.field public static final design_menu_item_text:I = 0x7f0a025b
 
-.field public static final design_navigation_view:I = 0x7f0a025d
+.field public static final design_navigation_view:I = 0x7f0a025c
 
-.field public static final dialog_button:I = 0x7f0a025e
+.field public static final dialog_button:I = 0x7f0a025d
 
-.field public static final edit_query:I = 0x7f0a02ae
+.field public static final edit_query:I = 0x7f0a02ad
 
-.field public static final end:I = 0x7f0a02c9
+.field public static final end:I = 0x7f0a02c8
 
-.field public static final expand_activities_button:I = 0x7f0a02ce
+.field public static final expand_activities_button:I = 0x7f0a02cd
 
-.field public static final expanded_menu:I = 0x7f0a02cf
+.field public static final expanded_menu:I = 0x7f0a02ce
 
-.field public static final fill:I = 0x7f0a02e4
+.field public static final fill:I = 0x7f0a02e3
 
-.field public static final filled:I = 0x7f0a02e7
+.field public static final filled:I = 0x7f0a02e6
 
-.field public static final fitBottomStart:I = 0x7f0a02e8
+.field public static final fitBottomStart:I = 0x7f0a02e7
 
-.field public static final fitCenter:I = 0x7f0a02e9
+.field public static final fitCenter:I = 0x7f0a02e8
 
-.field public static final fitEnd:I = 0x7f0a02ea
+.field public static final fitEnd:I = 0x7f0a02e9
 
-.field public static final fitStart:I = 0x7f0a02eb
+.field public static final fitStart:I = 0x7f0a02ea
 
-.field public static final fitXY:I = 0x7f0a02ec
+.field public static final fitXY:I = 0x7f0a02eb
 
-.field public static final fixed:I = 0x7f0a02ed
+.field public static final fixed:I = 0x7f0a02ec
 
-.field public static final flex_end:I = 0x7f0a02ee
+.field public static final flex_end:I = 0x7f0a02ed
 
-.field public static final flex_start:I = 0x7f0a02ef
+.field public static final flex_start:I = 0x7f0a02ee
 
-.field public static final focusCrop:I = 0x7f0a02f0
+.field public static final focusCrop:I = 0x7f0a02ef
 
-.field public static final forever:I = 0x7f0a02f2
+.field public static final forever:I = 0x7f0a02f1
 
-.field public static final ghost_view:I = 0x7f0a0316
+.field public static final ghost_view:I = 0x7f0a0315
 
-.field public static final group_divider:I = 0x7f0a032d
+.field public static final group_divider:I = 0x7f0a0328
 
-.field public static final home:I = 0x7f0a0394
+.field public static final home:I = 0x7f0a038f
 
-.field public static final icon:I = 0x7f0a0396
+.field public static final icon:I = 0x7f0a0391
 
-.field public static final icon_group:I = 0x7f0a0397
+.field public static final icon_group:I = 0x7f0a0392
 
-.field public static final icon_only:I = 0x7f0a0398
+.field public static final icon_only:I = 0x7f0a0393
 
-.field public static final image:I = 0x7f0a039a
+.field public static final image:I = 0x7f0a0395
 
-.field public static final info:I = 0x7f0a03ac
+.field public static final info:I = 0x7f0a03a7
 
-.field public static final italic:I = 0x7f0a03d9
+.field public static final italic:I = 0x7f0a03d4
 
-.field public static final item_touch_helper_previous_elevation:I = 0x7f0a040d
+.field public static final item_touch_helper_previous_elevation:I = 0x7f0a0408
 
-.field public static final labeled:I = 0x7f0a0414
+.field public static final labeled:I = 0x7f0a040f
 
-.field public static final largeLabel:I = 0x7f0a0415
+.field public static final largeLabel:I = 0x7f0a0410
 
-.field public static final left:I = 0x7f0a041b
+.field public static final left:I = 0x7f0a0416
 
-.field public static final light:I = 0x7f0a041c
+.field public static final light:I = 0x7f0a0417
 
-.field public static final line1:I = 0x7f0a041d
+.field public static final line1:I = 0x7f0a0418
 
-.field public static final line3:I = 0x7f0a041e
+.field public static final line3:I = 0x7f0a0419
 
-.field public static final listMode:I = 0x7f0a0420
+.field public static final listMode:I = 0x7f0a041b
 
-.field public static final list_item:I = 0x7f0a0421
+.field public static final list_item:I = 0x7f0a041c
 
-.field public static final masked:I = 0x7f0a043f
+.field public static final masked:I = 0x7f0a043a
 
-.field public static final message:I = 0x7f0a0485
+.field public static final message:I = 0x7f0a0478
 
-.field public static final mini:I = 0x7f0a048a
+.field public static final mini:I = 0x7f0a047d
 
-.field public static final mtrl_child_content_container:I = 0x7f0a048b
+.field public static final mtrl_child_content_container:I = 0x7f0a047e
 
-.field public static final mtrl_internal_children_alpha_tag:I = 0x7f0a048c
+.field public static final mtrl_internal_children_alpha_tag:I = 0x7f0a047f
 
-.field public static final multiply:I = 0x7f0a048d
+.field public static final multiply:I = 0x7f0a0480
 
-.field public static final navigation_header_container:I = 0x7f0a048f
+.field public static final navigation_header_container:I = 0x7f0a0482
 
-.field public static final none:I = 0x7f0a04a2
+.field public static final none:I = 0x7f0a0495
 
-.field public static final normal:I = 0x7f0a04a3
+.field public static final normal:I = 0x7f0a0496
 
-.field public static final notification_background:I = 0x7f0a04ad
+.field public static final notification_background:I = 0x7f0a04a0
 
-.field public static final notification_main_column:I = 0x7f0a04ae
+.field public static final notification_main_column:I = 0x7f0a04a1
 
-.field public static final notification_main_column_container:I = 0x7f0a04af
+.field public static final notification_main_column_container:I = 0x7f0a04a2
 
-.field public static final nowrap:I = 0x7f0a04b0
+.field public static final nowrap:I = 0x7f0a04a3
 
-.field public static final outline:I = 0x7f0a04d1
+.field public static final outline:I = 0x7f0a04c4
 
-.field public static final parallax:I = 0x7f0a04e0
+.field public static final parallax:I = 0x7f0a04d3
 
-.field public static final parentPanel:I = 0x7f0a04e2
+.field public static final parentPanel:I = 0x7f0a04d5
 
-.field public static final parent_matrix:I = 0x7f0a04e3
+.field public static final parent_matrix:I = 0x7f0a04d6
 
-.field public static final pin:I = 0x7f0a0520
+.field public static final pin:I = 0x7f0a0512
 
-.field public static final progress_circular:I = 0x7f0a055c
+.field public static final progress_circular:I = 0x7f0a054d
 
-.field public static final progress_horizontal:I = 0x7f0a055e
+.field public static final progress_horizontal:I = 0x7f0a054f
 
-.field public static final radio:I = 0x7f0a0569
+.field public static final radio:I = 0x7f0a055a
 
-.field public static final right:I = 0x7f0a058c
+.field public static final right:I = 0x7f0a0573
 
-.field public static final right_icon:I = 0x7f0a058d
+.field public static final right_icon:I = 0x7f0a0574
 
-.field public static final right_side:I = 0x7f0a058e
+.field public static final right_side:I = 0x7f0a0575
 
-.field public static final row:I = 0x7f0a05b6
+.field public static final row:I = 0x7f0a059d
 
-.field public static final row_reverse:I = 0x7f0a05b7
+.field public static final row_reverse:I = 0x7f0a059e
 
-.field public static final save_image_matrix:I = 0x7f0a05b8
+.field public static final save_image_matrix:I = 0x7f0a059f
 
-.field public static final save_non_transition_alpha:I = 0x7f0a05b9
+.field public static final save_non_transition_alpha:I = 0x7f0a05a0
 
-.field public static final save_scale_type:I = 0x7f0a05ba
+.field public static final save_scale_type:I = 0x7f0a05a1
 
-.field public static final screen:I = 0x7f0a05bc
+.field public static final screen:I = 0x7f0a05a3
 
-.field public static final scrollIndicatorDown:I = 0x7f0a05be
+.field public static final scrollIndicatorDown:I = 0x7f0a05a5
 
-.field public static final scrollIndicatorUp:I = 0x7f0a05bf
+.field public static final scrollIndicatorUp:I = 0x7f0a05a6
 
-.field public static final scrollView:I = 0x7f0a05c0
+.field public static final scrollView:I = 0x7f0a05a7
 
-.field public static final scrollable:I = 0x7f0a05c2
+.field public static final scrollable:I = 0x7f0a05a9
 
-.field public static final search_badge:I = 0x7f0a05c4
+.field public static final search_badge:I = 0x7f0a05ab
 
-.field public static final search_bar:I = 0x7f0a05c5
+.field public static final search_bar:I = 0x7f0a05ac
 
-.field public static final search_button:I = 0x7f0a05c6
+.field public static final search_button:I = 0x7f0a05ad
 
-.field public static final search_close_btn:I = 0x7f0a05c8
+.field public static final search_close_btn:I = 0x7f0a05af
 
-.field public static final search_edit_frame:I = 0x7f0a05c9
+.field public static final search_edit_frame:I = 0x7f0a05b0
 
-.field public static final search_go_btn:I = 0x7f0a05cc
+.field public static final search_go_btn:I = 0x7f0a05b3
 
-.field public static final search_mag_icon:I = 0x7f0a05ce
+.field public static final search_mag_icon:I = 0x7f0a05b5
 
-.field public static final search_plate:I = 0x7f0a05cf
+.field public static final search_plate:I = 0x7f0a05b6
 
-.field public static final search_src_text:I = 0x7f0a05d2
+.field public static final search_src_text:I = 0x7f0a05b9
 
-.field public static final search_voice_btn:I = 0x7f0a05de
+.field public static final search_voice_btn:I = 0x7f0a05c5
 
-.field public static final select_dialog_listview:I = 0x7f0a05df
+.field public static final select_dialog_listview:I = 0x7f0a05c6
 
-.field public static final selected:I = 0x7f0a05e0
+.field public static final selected:I = 0x7f0a05c7
 
-.field public static final shortcut:I = 0x7f0a0719
+.field public static final shortcut:I = 0x7f0a0700
 
-.field public static final smallLabel:I = 0x7f0a071d
+.field public static final smallLabel:I = 0x7f0a0704
 
-.field public static final snackbar_action:I = 0x7f0a071e
+.field public static final snackbar_action:I = 0x7f0a0705
 
-.field public static final snackbar_text:I = 0x7f0a071f
+.field public static final snackbar_text:I = 0x7f0a0706
 
-.field public static final space_around:I = 0x7f0a0723
+.field public static final space_around:I = 0x7f0a070a
 
-.field public static final space_between:I = 0x7f0a0724
+.field public static final space_between:I = 0x7f0a070b
 
-.field public static final spacer:I = 0x7f0a0725
+.field public static final spacer:I = 0x7f0a070c
 
-.field public static final split_action_bar:I = 0x7f0a072c
+.field public static final split_action_bar:I = 0x7f0a070d
 
-.field public static final src_atop:I = 0x7f0a072f
+.field public static final src_atop:I = 0x7f0a0710
 
-.field public static final src_in:I = 0x7f0a0730
+.field public static final src_in:I = 0x7f0a0711
 
-.field public static final src_over:I = 0x7f0a0731
+.field public static final src_over:I = 0x7f0a0712
 
-.field public static final standard:I = 0x7f0a0733
+.field public static final standard:I = 0x7f0a0714
 
-.field public static final start:I = 0x7f0a0734
+.field public static final start:I = 0x7f0a0715
 
-.field public static final stretch:I = 0x7f0a0754
+.field public static final stretch:I = 0x7f0a072c
 
-.field public static final submenuarrow:I = 0x7f0a0755
+.field public static final submenuarrow:I = 0x7f0a072d
 
-.field public static final submit_area:I = 0x7f0a0756
+.field public static final submit_area:I = 0x7f0a072e
 
-.field public static final tabMode:I = 0x7f0a0761
+.field public static final tabMode:I = 0x7f0a0739
 
-.field public static final tag_accessibility_actions:I = 0x7f0a0762
+.field public static final tag_accessibility_actions:I = 0x7f0a073a
 
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0763
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a073b
 
-.field public static final tag_accessibility_heading:I = 0x7f0a0764
+.field public static final tag_accessibility_heading:I = 0x7f0a073c
 
-.field public static final tag_accessibility_pane_title:I = 0x7f0a0765
+.field public static final tag_accessibility_pane_title:I = 0x7f0a073d
 
-.field public static final tag_screen_reader_focusable:I = 0x7f0a0766
+.field public static final tag_screen_reader_focusable:I = 0x7f0a073e
 
-.field public static final tag_transition_group:I = 0x7f0a0767
+.field public static final tag_transition_group:I = 0x7f0a073f
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0768
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0740
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0769
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0741
 
-.field public static final text:I = 0x7f0a076f
+.field public static final text:I = 0x7f0a0747
 
-.field public static final text2:I = 0x7f0a0770
+.field public static final text2:I = 0x7f0a0748
 
-.field public static final textSpacerNoButtons:I = 0x7f0a0771
+.field public static final textSpacerNoButtons:I = 0x7f0a0749
 
-.field public static final textSpacerNoTitle:I = 0x7f0a0772
+.field public static final textSpacerNoTitle:I = 0x7f0a074a
 
-.field public static final text_input_password_toggle:I = 0x7f0a0775
+.field public static final text_input_password_toggle:I = 0x7f0a074d
 
-.field public static final textinput_counter:I = 0x7f0a0778
+.field public static final textinput_counter:I = 0x7f0a0750
 
-.field public static final textinput_error:I = 0x7f0a0779
+.field public static final textinput_error:I = 0x7f0a0751
 
-.field public static final textinput_helper_text:I = 0x7f0a077a
+.field public static final textinput_helper_text:I = 0x7f0a0752
 
-.field public static final time:I = 0x7f0a077d
+.field public static final time:I = 0x7f0a0755
 
-.field public static final title:I = 0x7f0a077e
+.field public static final title:I = 0x7f0a0756
 
-.field public static final titleDividerNoCustom:I = 0x7f0a077f
+.field public static final titleDividerNoCustom:I = 0x7f0a0757
 
-.field public static final title_template:I = 0x7f0a0780
+.field public static final title_template:I = 0x7f0a0758
 
-.field public static final top:I = 0x7f0a0785
+.field public static final top:I = 0x7f0a075d
 
-.field public static final topPanel:I = 0x7f0a0786
+.field public static final topPanel:I = 0x7f0a075e
 
-.field public static final touch_outside:I = 0x7f0a0788
+.field public static final touch_outside:I = 0x7f0a0760
 
-.field public static final transition_current_scene:I = 0x7f0a0789
+.field public static final transition_current_scene:I = 0x7f0a0761
 
-.field public static final transition_layout_save:I = 0x7f0a078a
+.field public static final transition_layout_save:I = 0x7f0a0762
 
-.field public static final transition_position:I = 0x7f0a078b
+.field public static final transition_position:I = 0x7f0a0763
 
-.field public static final transition_scene_layoutid_cache:I = 0x7f0a078c
+.field public static final transition_scene_layoutid_cache:I = 0x7f0a0764
 
-.field public static final transition_transform:I = 0x7f0a078d
+.field public static final transition_transform:I = 0x7f0a0765
 
-.field public static final uniform:I = 0x7f0a0799
+.field public static final uniform:I = 0x7f0a0771
 
-.field public static final unlabeled:I = 0x7f0a079a
+.field public static final unlabeled:I = 0x7f0a0772
 
-.field public static final up:I = 0x7f0a079c
+.field public static final up:I = 0x7f0a0774
 
-.field public static final view_offset_helper:I = 0x7f0a082e
+.field public static final view_offset_helper:I = 0x7f0a07f4
 
-.field public static final visible:I = 0x7f0a0831
+.field public static final visible:I = 0x7f0a07f7
 
-.field public static final wide:I = 0x7f0a085e
+.field public static final wide:I = 0x7f0a0823
 
-.field public static final wrap:I = 0x7f0a0880
+.field public static final wrap:I = 0x7f0a0845
 
-.field public static final wrap_content:I = 0x7f0a0881
+.field public static final wrap_content:I = 0x7f0a0846
 
-.field public static final wrap_reverse:I = 0x7f0a0882
+.field public static final wrap_reverse:I = 0x7f0a0847
 
 
 # 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 21e18a2cfb..0f392d9f9f 100644
--- a/com.discord/smali/com/discord/gateway/R$layout.smali
+++ b/com.discord/smali/com/discord/gateway/R$layout.smali
@@ -123,9 +123,9 @@
 
 .field public static final select_dialog_singlechoice_material:I = 0x7f0d005a
 
-.field public static final support_simple_spinner_dropdown_item:I = 0x7f0d0062
+.field public static final support_simple_spinner_dropdown_item:I = 0x7f0d0061
 
-.field public static final view_chip_default:I = 0x7f0d0083
+.field public static final view_chip_default:I = 0x7f0d0082
 
 
 # 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 593d7d4e32..a635dbcb20 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 = 0x7f120365
+.field public static final bottom_sheet_behavior:I = 0x7f120340
 
-.field public static final character_counter_content_description:I = 0x7f1203f0
+.field public static final character_counter_content_description:I = 0x7f1203cb
 
-.field public static final character_counter_pattern:I = 0x7f1203f1
+.field public static final character_counter_pattern:I = 0x7f1203cc
 
-.field public static final common_google_play_services_enable_button:I = 0x7f120430
+.field public static final common_google_play_services_enable_button:I = 0x7f12040b
 
-.field public static final common_google_play_services_enable_text:I = 0x7f120431
+.field public static final common_google_play_services_enable_text:I = 0x7f12040c
 
-.field public static final common_google_play_services_enable_title:I = 0x7f120432
+.field public static final common_google_play_services_enable_title:I = 0x7f12040d
 
-.field public static final common_google_play_services_install_button:I = 0x7f120433
+.field public static final common_google_play_services_install_button:I = 0x7f12040e
 
-.field public static final common_google_play_services_install_text:I = 0x7f120434
+.field public static final common_google_play_services_install_text:I = 0x7f12040f
 
-.field public static final common_google_play_services_install_title:I = 0x7f120435
+.field public static final common_google_play_services_install_title:I = 0x7f120410
 
-.field public static final common_google_play_services_notification_channel_name:I = 0x7f120436
+.field public static final common_google_play_services_notification_channel_name:I = 0x7f120411
 
-.field public static final common_google_play_services_notification_ticker:I = 0x7f120437
+.field public static final common_google_play_services_notification_ticker:I = 0x7f120412
 
-.field public static final common_google_play_services_unknown_issue:I = 0x7f120438
+.field public static final common_google_play_services_unknown_issue:I = 0x7f120413
 
-.field public static final common_google_play_services_unsupported_text:I = 0x7f120439
+.field public static final common_google_play_services_unsupported_text:I = 0x7f120414
 
-.field public static final common_google_play_services_update_button:I = 0x7f12043a
+.field public static final common_google_play_services_update_button:I = 0x7f120415
 
-.field public static final common_google_play_services_update_text:I = 0x7f12043b
+.field public static final common_google_play_services_update_text:I = 0x7f120416
 
-.field public static final common_google_play_services_update_title:I = 0x7f12043c
+.field public static final common_google_play_services_update_title:I = 0x7f120417
 
-.field public static final common_google_play_services_updating_text:I = 0x7f12043d
+.field public static final common_google_play_services_updating_text:I = 0x7f120418
 
-.field public static final common_google_play_services_wear_update_text:I = 0x7f12043e
+.field public static final common_google_play_services_wear_update_text:I = 0x7f120419
 
-.field public static final common_open_on_phone:I = 0x7f12043f
+.field public static final common_open_on_phone:I = 0x7f12041a
 
-.field public static final common_signin_button_text:I = 0x7f120440
+.field public static final common_signin_button_text:I = 0x7f12041b
 
-.field public static final common_signin_button_text_long:I = 0x7f120441
+.field public static final common_signin_button_text_long:I = 0x7f12041c
 
-.field public static final fab_transformation_scrim_behavior:I = 0x7f1205d8
+.field public static final fab_transformation_scrim_behavior:I = 0x7f1205b3
 
-.field public static final fab_transformation_sheet_behavior:I = 0x7f1205d9
+.field public static final fab_transformation_sheet_behavior:I = 0x7f1205b4
 
-.field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f120968
+.field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f120932
 
-.field public static final mtrl_chip_close_icon_content_description:I = 0x7f120c0a
+.field public static final mtrl_chip_close_icon_content_description:I = 0x7f120bd3
 
-.field public static final password_toggle_content_description:I = 0x7f120d77
+.field public static final password_toggle_content_description:I = 0x7f120d3f
 
-.field public static final path_password_eye:I = 0x7f120d7a
+.field public static final path_password_eye:I = 0x7f120d42
 
-.field public static final path_password_eye_mask_strike_through:I = 0x7f120d7b
+.field public static final path_password_eye_mask_strike_through:I = 0x7f120d43
 
-.field public static final path_password_eye_mask_visible:I = 0x7f120d7c
+.field public static final path_password_eye_mask_visible:I = 0x7f120d44
 
-.field public static final path_password_strike_through:I = 0x7f120d7d
+.field public static final path_password_strike_through:I = 0x7f120d45
 
-.field public static final search_menu_title:I = 0x7f121098
+.field public static final search_menu_title:I = 0x7f12100c
 
-.field public static final status_bar_notification_info_overflow:I = 0x7f121165
+.field public static final status_bar_notification_info_overflow:I = 0x7f1210d9
 
 
 # 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 872c26b688..0465f604c1 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, 0x7f04027d
+    const v9, 0x7f04027c
 
     aput v9, v6, v3
 
@@ -2180,7 +2180,7 @@
 
     new-array v5, v1, [I
 
-    const v6, 0x7f040315
+    const v6, 0x7f040314
 
     aput v6, v5, v3
 
@@ -2364,15 +2364,15 @@
         0x7f0401d6
         0x7f0401f9
         0x7f040203
-        0x7f040267
-        0x7f040283
-        0x7f04029b
+        0x7f040266
+        0x7f040282
+        0x7f04029a
+        0x7f0402c8
         0x7f0402c9
-        0x7f0402ca
-        0x7f040323
-        0x7f040326
-        0x7f0403bf
-        0x7f0403c9
+        0x7f040322
+        0x7f040325
+        0x7f0403be
+        0x7f0403c8
     .end array-data
 
     :array_1
@@ -2381,8 +2381,8 @@
         0x7f04004c
         0x7f0400b3
         0x7f04015c
-        0x7f040326
-        0x7f0403c9
+        0x7f040325
+        0x7f0403c8
     .end array-data
 
     :array_2
@@ -2396,11 +2396,11 @@
         0x10100f2
         0x7f040079
         0x7f04007a
+        0x7f04025d
         0x7f04025e
-        0x7f04025f
-        0x7f040280
+        0x7f04027f
+        0x7f040307
         0x7f040308
-        0x7f040309
     .end array-data
 
     :array_4
@@ -2434,15 +2434,15 @@
         0x1010540
         0x7f04011a
         0x7f040121
-        0x7f040259
+        0x7f040258
     .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
-        0x7f040313
+        0x7f040312
+        0x7f0403bc
         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
-        0x7f04025a
-        0x7f040349
+        0x7f040259
+        0x7f040348
     .end array-data
 
     :array_e
@@ -2566,41 +2566,41 @@
         0x7f040119
         0x7f040168
         0x7f0401e1
+        0x7f04025b
         0x7f04025c
-        0x7f04025d
+        0x7f04025f
         0x7f040260
         0x7f040261
         0x7f040262
         0x7f040263
         0x7f040264
         0x7f040265
-        0x7f040266
+        0x7f04028f
         0x7f040290
         0x7f040291
-        0x7f040292
-        0x7f04029a
-        0x7f04029c
-        0x7f0402cf
+        0x7f040299
+        0x7f04029b
+        0x7f0402ce
+        0x7f0402d1
         0x7f0402d2
         0x7f0402d3
-        0x7f0402d4
-        0x7f0402fb
+        0x7f0402fa
+        0x7f0402fc
         0x7f0402fd
         0x7f0402fe
-        0x7f0402ff
+        0x7f04030f
         0x7f040310
-        0x7f040311
-        0x7f04032a
+        0x7f040329
+        0x7f040353
         0x7f040354
         0x7f040355
         0x7f040356
-        0x7f040357
+        0x7f040358
         0x7f040359
         0x7f04035a
         0x7f04035b
-        0x7f04035c
+        0x7f04035e
         0x7f04035f
-        0x7f040360
         0x7f0403cb
         0x7f0403cc
         0x7f0403cd
@@ -2639,7 +2639,7 @@
         0x7f040207
         0x7f040208
         0x7f04020b
-        0x7f04027f
+        0x7f04027e
     .end array-data
 
     :array_11
@@ -2699,10 +2699,10 @@
         0x7f040160
         0x7f0401d7
         0x7f0401db
-        0x7f0402d8
-        0x7f040306
-        0x7f040361
-        0x7f040363
+        0x7f0402d7
+        0x7f040305
+        0x7f040360
+        0x7f040362
     .end array-data
 
     :array_14
@@ -2711,8 +2711,8 @@
         0x7f0400a3
         0x7f0400a4
         0x7f0400a5
+        0x7f040309
         0x7f04030a
-        0x7f04030b
     .end array-data
 
     :array_15
@@ -2752,11 +2752,11 @@
         0x7f040126
         0x7f040127
         0x7f040128
-        0x7f0402f6
-        0x7f0402f8
-        0x7f04031b
+        0x7f0402f5
+        0x7f0402f7
+        0x7f04031a
+        0x7f0403be
         0x7f0403bf
-        0x7f0403c0
         0x7f0403ca
     .end array-data
 
@@ -2783,7 +2783,7 @@
     :array_1a
     .array-data 4
         0x7f04020a
-        0x7f04031a
+        0x7f040319
     .end array-data
 
     :array_1b
@@ -2811,8 +2811,8 @@
         0x7f0400b8
         0x7f040112
         0x7f040150
-        0x7f04030f
-        0x7f0403b6
+        0x7f04030e
+        0x7f0403b5
     .end array-data
 
     :array_1e
@@ -2825,9 +2825,9 @@
         0x7f04013b
         0x7f040142
         0x7f040209
+        0x7f040301
         0x7f040302
         0x7f040303
-        0x7f040304
     .end array-data
 
     :array_1f
@@ -2854,10 +2854,10 @@
         0x7f04012e
         0x7f040160
         0x7f04016a
-        0x7f04027c
-        0x7f04029f
-        0x7f0402d8
-        0x7f040306
+        0x7f04027b
+        0x7f04029e
+        0x7f0402d7
+        0x7f040305
         0x7f0403e7
     .end array-data
 
@@ -2866,7 +2866,7 @@
         0x7f040139
         0x7f04013a
         0x7f040204
-        0x7f04025b
+        0x7f04025a
     .end array-data
 
     :array_22
@@ -2907,15 +2907,16 @@
         0x7f04012f
         0x7f040130
         0x7f040131
-        0x7f040289
+        0x7f040288
+        0x7f040297
         0x7f040298
-        0x7f040299
-        0x7f04029e
+        0x7f04029d
+        0x7f0402c5
         0x7f0402c6
         0x7f0402c7
-        0x7f0402c8
+        0x7f0402d4
         0x7f0402d5
-        0x7f0402d6
+        0x7f0402d8
         0x7f0402d9
         0x7f0402da
         0x7f0402db
@@ -2929,7 +2930,6 @@
         0x7f0402e3
         0x7f0402e4
         0x7f0402e5
-        0x7f0402e6
         0x7f0403ed
     .end array-data
 
@@ -2964,8 +2964,8 @@
         0x1010128
         0x7f04010b
         0x7f040110
-        0x7f04027e
-        0x7f040305
+        0x7f04027d
+        0x7f040304
     .end array-data
 
     :array_29
@@ -3004,15 +3004,15 @@
         0x7f0401da
         0x7f0401dc
         0x7f0401dd
-        0x7f0402d8
+        0x7f0402d7
+        0x7f04031e
         0x7f04031f
-        0x7f040320
     .end array-data
 
     :array_2d
     .array-data 4
+        0x7f04031e
         0x7f04031f
-        0x7f040320
     .end array-data
 
     :array_2e
@@ -3029,12 +3029,13 @@
         0x7f0400c7
         0x7f040119
         0x7f040143
+        0x7f040277
         0x7f040278
-        0x7f040279
-        0x7f040284
-        0x7f0402f7
-        0x7f04030c
-        0x7f040342
+        0x7f040283
+        0x7f0402f6
+        0x7f04030b
+        0x7f040341
+        0x7f040349
         0x7f04034a
         0x7f04034b
         0x7f04034c
@@ -3044,11 +3045,10 @@
         0x7f040350
         0x7f040351
         0x7f040352
-        0x7f040353
-        0x7f040358
+        0x7f040357
+        0x7f04035c
         0x7f04035d
-        0x7f04035e
-        0x7f040362
+        0x7f040361
     .end array-data
 
     :array_2f
@@ -3083,8 +3083,8 @@
         0x7f0400ce
         0x7f0401dc
         0x7f0401dd
-        0x7f040287
-        0x7f040301
+        0x7f040286
+        0x7f040300
         0x7f0403cf
     .end array-data
 
@@ -3097,8 +3097,8 @@
         0x101012f
         0x1010130
         0x1010131
-        0x7f04029d
-        0x7f040321
+        0x7f04029c
+        0x7f040320
     .end array-data
 
     :array_32
@@ -3114,20 +3114,20 @@
         0x7f040202
         0x7f040205
         0x7f040208
-        0x7f04027f
+        0x7f04027e
     .end array-data
 
     :array_33
     .array-data 4
         0x1010176
         0x10102c9
-        0x7f040288
+        0x7f040287
     .end array-data
 
     :array_34
     .array-data 4
-        0x7f04028c
-        0x7f04028f
+        0x7f04028b
+        0x7f04028e
     .end array-data
 
     :array_35
@@ -3140,9 +3140,9 @@
         0x7f040135
         0x7f040136
         0x7f04020e
-        0x7f0402d7
-        0x7f04030e
-        0x7f040314
+        0x7f0402d6
+        0x7f04030d
+        0x7f040313
     .end array-data
 
     :array_36
@@ -3157,12 +3157,12 @@
         0x7f040155
         0x7f0401de
         0x7f04020d
+        0x7f0402cc
         0x7f0402cd
-        0x7f0402ce
+        0x7f0402f8
         0x7f0402f9
-        0x7f0402fa
-        0x7f040322
-        0x7f040327
+        0x7f040321
+        0x7f040326
         0x7f0403ef
     .end array-data
 
@@ -3170,7 +3170,7 @@
     .array-data 4
         0x7f04007b
         0x7f0400c6
-        0x7f0402f5
+        0x7f0402f4
     .end array-data
 
     :array_38
@@ -3182,15 +3182,16 @@
         0x7f04012f
         0x7f040130
         0x7f040131
-        0x7f040289
+        0x7f040288
+        0x7f040297
         0x7f040298
-        0x7f040299
-        0x7f04029e
+        0x7f04029d
+        0x7f0402c5
         0x7f0402c6
         0x7f0402c7
-        0x7f0402c8
+        0x7f0402d4
         0x7f0402d5
-        0x7f0402d6
+        0x7f0402d8
         0x7f0402d9
         0x7f0402da
         0x7f0402db
@@ -3204,21 +3205,20 @@
         0x7f0402e3
         0x7f0402e4
         0x7f0402e5
-        0x7f0402e6
         0x7f0403ed
     .end array-data
 
     :array_39
     .array-data 4
+        0x7f04030b
         0x7f04030c
-        0x7f04030d
     .end array-data
 
     :array_3a
     .array-data 4
         0x101011f
         0x7f04011a
-        0x7f04027a
+        0x7f040279
     .end array-data
 
     :array_3b
@@ -3227,7 +3227,7 @@
         0x1010176
         0x101017b
         0x1010262
-        0x7f04029b
+        0x7f04029a
     .end array-data
 
     :array_3c
@@ -3245,14 +3245,14 @@
         0x1010124
         0x1010125
         0x1010142
-        0x7f040307
-        0x7f040312
+        0x7f040306
+        0x7f040311
+        0x7f040327
         0x7f040328
-        0x7f040329
-        0x7f04032b
+        0x7f04032a
+        0x7f0403b6
         0x7f0403b7
         0x7f0403b8
-        0x7f0403b9
         0x7f0403d0
         0x7f0403d1
         0x7f0403d2
@@ -3267,6 +3267,7 @@
 
     :array_3f
     .array-data 4
+        0x7f04032b
         0x7f04032c
         0x7f04032d
         0x7f04032e
@@ -3288,10 +3289,9 @@
         0x7f04033e
         0x7f04033f
         0x7f040340
-        0x7f040341
+        0x7f040342
         0x7f040343
         0x7f040344
-        0x7f040345
     .end array-data
 
     :array_40
@@ -3308,7 +3308,7 @@
         0x1010164
         0x10103ac
         0x7f040145
-        0x7f040349
+        0x7f040348
     .end array-data
 
     :array_41
@@ -3336,11 +3336,11 @@
         0x7f040164
         0x7f040166
         0x7f040167
+        0x7f040292
         0x7f040293
         0x7f040294
         0x7f040295
         0x7f040296
-        0x7f040297
     .end array-data
 
     :array_42
@@ -3363,16 +3363,17 @@
         0x7f0400d2
         0x7f0400d3
         0x7f0400d4
+        0x7f040266
         0x7f040267
-        0x7f040268
-        0x7f04027b
+        0x7f04027a
+        0x7f040280
         0x7f040281
-        0x7f040282
-        0x7f04029b
+        0x7f04029a
+        0x7f040322
         0x7f040323
         0x7f040324
-        0x7f040325
-        0x7f0403bf
+        0x7f0403be
+        0x7f0403c0
         0x7f0403c1
         0x7f0403c2
         0x7f0403c3
@@ -3380,16 +3381,15 @@
         0x7f0403c5
         0x7f0403c6
         0x7f0403c7
-        0x7f0403c8
     .end array-data
 
     :array_44
     .array-data 4
         0x1010000
         0x10100da
+        0x7f04028c
         0x7f04028d
-        0x7f04028e
-        0x7f040365
+        0x7f040364
     .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 2f8a47ad67..41f92d0386 100644
--- a/com.discord/smali/com/discord/gateway/io/IncomingParser.smali
+++ b/com.discord/smali/com/discord/gateway/io/IncomingParser.smali
@@ -262,25 +262,6 @@
     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
@@ -291,7 +272,7 @@
 
     goto/16 :goto_2
 
-    :sswitch_2
+    :sswitch_1
     const-string v1, "VOICE_SERVER_UPDATE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -314,7 +295,7 @@
 
     return-void
 
-    :sswitch_3
+    :sswitch_2
     const-string v1, "VOICE_STATE_UPDATE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -337,7 +318,7 @@
 
     return-void
 
-    :sswitch_4
+    :sswitch_3
     const-string v1, "PRESENCES_REPLACE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -360,26 +341,7 @@
 
     return-void
 
-    :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
+    :sswitch_4
     const-string v1, "GUILD_BAN_REMOVE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -390,26 +352,7 @@
 
     goto/16 :goto_a
 
-    :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
+    :sswitch_5
     const-string v1, "MESSAGE_UPDATE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -420,7 +363,7 @@
 
     goto/16 :goto_3
 
-    :sswitch_9
+    :sswitch_6
     const-string v1, "GUILD_ROLE_DELETE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -431,7 +374,7 @@
 
     goto :goto_2
 
-    :sswitch_a
+    :sswitch_7
     const-string v1, "USER_CONNECTIONS_UPDATE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -442,7 +385,7 @@
 
     goto/16 :goto_d
 
-    :sswitch_b
+    :sswitch_8
     const-string v1, "GUILD_ROLE_CREATE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -466,7 +409,7 @@
 
     return-void
 
-    :sswitch_c
+    :sswitch_9
     const-string v1, "USER_GUILD_SETTINGS_UPDATE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -489,7 +432,7 @@
 
     return-void
 
-    :sswitch_d
+    :sswitch_a
     const-string v1, "MESSAGE_ACK"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -512,7 +455,7 @@
 
     return-void
 
-    :sswitch_e
+    :sswitch_b
     const-string v1, "GUILD_EMOJIS_UPDATE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -535,7 +478,7 @@
 
     return-void
 
-    :sswitch_f
+    :sswitch_c
     const-string v1, "MESSAGE_REACTION_REMOVE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -546,7 +489,7 @@
 
     goto/16 :goto_c
 
-    :sswitch_10
+    :sswitch_d
     const-string v1, "CHANNEL_RECIPIENT_ADD"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -557,7 +500,7 @@
 
     goto/16 :goto_6
 
-    :sswitch_11
+    :sswitch_e
     const-string v1, "MESSAGE_DELETE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -568,7 +511,7 @@
 
     goto/16 :goto_4
 
-    :sswitch_12
+    :sswitch_f
     const-string v1, "MESSAGE_CREATE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -592,7 +535,7 @@
 
     return-void
 
-    :sswitch_13
+    :sswitch_10
     const-string v1, "USER_UPDATE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -615,7 +558,7 @@
 
     return-void
 
-    :sswitch_14
+    :sswitch_11
     const-string v1, "CALL_UPDATE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -626,7 +569,7 @@
 
     goto/16 :goto_5
 
-    :sswitch_15
+    :sswitch_12
     const-string v1, "GUILD_UPDATE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -637,26 +580,7 @@
 
     goto/16 :goto_8
 
-    :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
+    :sswitch_13
     const-string v1, "READY"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -715,7 +639,7 @@
 
     return-void
 
-    :sswitch_18
+    :sswitch_14
     const-string v1, "GUILD_MEMBER_UPDATE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -726,7 +650,7 @@
 
     goto/16 :goto_9
 
-    :sswitch_19
+    :sswitch_15
     const-string v1, "MESSAGE_DELETE_BULK"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -750,7 +674,7 @@
 
     return-void
 
-    :sswitch_1a
+    :sswitch_16
     const-string v1, "GUILD_MEMBER_REMOVE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -773,7 +697,7 @@
 
     return-void
 
-    :sswitch_1b
+    :sswitch_17
     const-string v1, "CHANNEL_UPDATE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -784,7 +708,7 @@
 
     goto/16 :goto_7
 
-    :sswitch_1c
+    :sswitch_18
     const-string v1, "CHANNEL_UNREAD_UPDATE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -803,7 +727,7 @@
 
     return-void
 
-    :sswitch_1d
+    :sswitch_19
     const-string v1, "CALL_DELETE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -814,7 +738,7 @@
 
     goto :goto_5
 
-    :sswitch_1e
+    :sswitch_1a
     const-string v1, "CALL_CREATE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -838,7 +762,7 @@
 
     return-void
 
-    :sswitch_1f
+    :sswitch_1b
     const-string v1, "GUILD_DELETE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -849,7 +773,7 @@
 
     goto/16 :goto_8
 
-    :sswitch_20
+    :sswitch_1c
     const-string v1, "GUILD_CREATE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -860,7 +784,7 @@
 
     goto/16 :goto_8
 
-    :sswitch_21
+    :sswitch_1d
     const-string v1, "TYPING_START"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -883,7 +807,7 @@
 
     return-void
 
-    :sswitch_22
+    :sswitch_1e
     const-string v1, "CHANNEL_RECIPIENT_REMOVE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -907,7 +831,7 @@
 
     return-void
 
-    :sswitch_23
+    :sswitch_1f
     const-string v1, "CHANNEL_DELETE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -918,7 +842,7 @@
 
     goto :goto_7
 
-    :sswitch_24
+    :sswitch_20
     const-string v1, "CHANNEL_CREATE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -942,7 +866,7 @@
 
     return-void
 
-    :sswitch_25
+    :sswitch_21
     const-string v1, "RELATIONSHIP_REMOVE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -953,7 +877,7 @@
 
     goto/16 :goto_b
 
-    :sswitch_26
+    :sswitch_22
     const-string v1, "USER_SETTINGS_UPDATE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -976,7 +900,7 @@
 
     return-void
 
-    :sswitch_27
+    :sswitch_23
     const-string v1, "GUILD_INTEGRATIONS_UPDATE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -999,7 +923,7 @@
 
     return-void
 
-    :sswitch_28
+    :sswitch_24
     const-string v1, "PRESENCE_UPDATE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1022,7 +946,7 @@
 
     return-void
 
-    :sswitch_29
+    :sswitch_25
     const-string v1, "GUILD_SYNC"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1046,7 +970,7 @@
 
     return-void
 
-    :sswitch_2a
+    :sswitch_26
     const-string v1, "USER_NOTE_UPDATE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1069,7 +993,7 @@
 
     return-void
 
-    :sswitch_2b
+    :sswitch_27
     const-string v1, "GUILD_MEMBER_LIST_UPDATE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1088,7 +1012,7 @@
 
     return-void
 
-    :sswitch_2c
+    :sswitch_28
     const-string v1, "MESSAGE_REACTION_ADD"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1099,7 +1023,7 @@
 
     goto :goto_c
 
-    :sswitch_2d
+    :sswitch_29
     const-string v1, "GUILD_MEMBER_ADD"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1123,7 +1047,7 @@
 
     return-void
 
-    :sswitch_2e
+    :sswitch_2a
     const-string v1, "GUILD_BAN_ADD"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1147,7 +1071,7 @@
 
     return-void
 
-    :sswitch_2f
+    :sswitch_2b
     const-string v1, "RELATIONSHIP_ADD"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1171,7 +1095,7 @@
 
     return-void
 
-    :sswitch_30
+    :sswitch_2c
     const-string v1, "USER_REQUIRED_ACTION_UPDATE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1194,7 +1118,7 @@
 
     return-void
 
-    :sswitch_31
+    :sswitch_2d
     const-string v1, "MESSAGE_REACTION_REMOVE_ALL"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1218,7 +1142,7 @@
 
     return-void
 
-    :sswitch_32
+    :sswitch_2e
     const-string v1, "GUILD_MEMBERS_CHUNK"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1241,7 +1165,7 @@
 
     return-void
 
-    :sswitch_33
+    :sswitch_2f
     const-string v1, "USER_CONNECTIONS_INTEGRATION_JOINING"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1253,13 +1177,13 @@
     :goto_d
     invoke-virtual {p1}, Lcom/discord/models/domain/Model$JsonReader;->skipValue()V
 
-    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     iput-object p1, p0, Lcom/discord/gateway/io/IncomingParser;->data:Ljava/lang/Object;
 
     return-void
 
-    :sswitch_34
+    :sswitch_30
     const-string v1, "SESSIONS_REPLACE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1304,59 +1228,55 @@
 
     :sswitch_data_0
     .sparse-switch
-        -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
+        -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
     .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
deleted file mode 100644
index 20243d0887..0000000000
--- a/com.discord/smali/com/discord/gateway/io/OutgoingPayload$DeleteStream.smali
+++ /dev/null
@@ -1,46 +0,0 @@
-.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
deleted file mode 100644
index 2bb9d75c4c..0000000000
--- a/com.discord/smali/com/discord/gateway/io/OutgoingPayload$WatchStream.smali
+++ /dev/null
@@ -1,46 +0,0 @@
-.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 e843500b06..2170e1d4c7 100644
--- a/com.discord/smali/com/discord/gateway/io/OutgoingPayload.smali
+++ b/com.discord/smali/com/discord/gateway/io/OutgoingPayload.smali
@@ -13,9 +13,7 @@
         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$WatchStream;,
-        Lcom/discord/gateway/io/OutgoingPayload$DeleteStream;
+        Lcom/discord/gateway/io/OutgoingPayload$GuildSubscriptions;
     }
 .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 0a8b257719..ae51d0375c 100644
--- a/com.discord/smali/com/discord/gateway/opcodes/Opcodes.smali
+++ b/com.discord/smali/com/discord/gateway/opcodes/Opcodes.smali
@@ -30,10 +30,6 @@
 
 .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 ab7ee379c8..e9d23c61b4 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;->Kx()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Kv()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 fcd7c2d647..c44daf82d5 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;->aWi:Ljava/lang/Class;
+    iget-object v1, v1, Lcom/google/gson/reflect/TypeToken;->aWe: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 bedd78938f..a3e2fabb5b 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;->aWi:Ljava/lang/Class;
+    iget-object v0, p2, Lcom/google/gson/reflect/TypeToken;->aWe: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 c7c2f66a40..ec083b369d 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;->bhP:Lkotlin/properties/a;
+    sget-object v0, Lkotlin/properties/a;->bhK: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;->bhP:Lkotlin/properties/a;
+    sget-object v0, Lkotlin/properties/a;->bhK: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 ce13c63467..f171d7cbfe 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;->bhP:Lkotlin/properties/a;
+    sget-object v0, Lkotlin/properties/a;->bhK: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 1cebc6d0fc..4c14a20b11 100644
--- a/com.discord/smali/com/discord/models/domain/ModelApplicationStream$Companion.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelApplicationStream$Companion.smali
@@ -33,90 +33,6 @@
 
 
 # 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
 
@@ -128,10 +44,6 @@
 
     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
@@ -144,6 +56,8 @@
 
     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 f516e44744..7fd74fc570 100644
--- a/com.discord/smali/com/discord/models/domain/ModelApplicationStream.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelApplicationStream.smali
@@ -22,8 +22,6 @@
 
 .field private final ownerId:J
 
-.field private final streamType:Ljava/lang/String;
-
 
 # direct methods
 .method static constructor <clinit>()V
@@ -40,72 +38,53 @@
     return-void
 .end method
 
-.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
+.method public constructor <init>(JJJ)V
+    .locals 0
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/discord/models/domain/ModelApplicationStream;->streamType:Ljava/lang/String;
+    iput-wide p1, p0, Lcom/discord/models/domain/ModelApplicationStream;->ownerId:J
 
-    iput-wide p2, p0, Lcom/discord/models/domain/ModelApplicationStream;->ownerId:J
+    iput-wide p3, p0, Lcom/discord/models/domain/ModelApplicationStream;->guildId:J
 
-    iput-wide p4, p0, Lcom/discord/models/domain/ModelApplicationStream;->guildId:J
-
-    iput-wide p6, p0, Lcom/discord/models/domain/ModelApplicationStream;->channelId:J
+    iput-wide p5, p0, Lcom/discord/models/domain/ModelApplicationStream;->channelId:J
 
     return-void
 .end method
 
-.method public static synthetic copy$default(Lcom/discord/models/domain/ModelApplicationStream;Ljava/lang/String;JJJILjava/lang/Object;)Lcom/discord/models/domain/ModelApplicationStream;
-    .locals 4
+.method public static synthetic copy$default(Lcom/discord/models/domain/ModelApplicationStream;JJJILjava/lang/Object;)Lcom/discord/models/domain/ModelApplicationStream;
+    .locals 7
 
-    and-int/lit8 p9, p8, 0x1
+    and-int/lit8 p8, p7, 0x1
 
-    if-eqz p9, :cond_0
+    if-eqz p8, :cond_0
 
-    iget-object p1, p0, Lcom/discord/models/domain/ModelApplicationStream;->streamType:Ljava/lang/String;
+    iget-wide p1, p0, Lcom/discord/models/domain/ModelApplicationStream;->ownerId:J
 
     :cond_0
-    and-int/lit8 p9, p8, 0x2
+    move-wide v1, p1
 
-    if-eqz p9, :cond_1
+    and-int/lit8 p1, p7, 0x2
 
-    iget-wide p2, p0, Lcom/discord/models/domain/ModelApplicationStream;->ownerId:J
+    if-eqz p1, :cond_1
+
+    iget-wide p3, p0, Lcom/discord/models/domain/ModelApplicationStream;->guildId:J
 
     :cond_1
-    move-wide v0, p2
+    move-wide v3, p3
 
-    and-int/lit8 p2, p8, 0x4
+    and-int/lit8 p1, p7, 0x4
 
-    if-eqz p2, :cond_2
+    if-eqz p1, :cond_2
 
-    iget-wide p4, p0, Lcom/discord/models/domain/ModelApplicationStream;->guildId:J
+    iget-wide p5, p0, Lcom/discord/models/domain/ModelApplicationStream;->channelId:J
 
     :cond_2
-    move-wide v2, p4
+    move-wide v5, p5
 
-    and-int/lit8 p2, p8, 0x8
+    move-object v0, p0
 
-    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;
+    invoke-virtual/range {v0 .. v6}, Lcom/discord/models/domain/ModelApplicationStream;->copy(JJJ)Lcom/discord/models/domain/ModelApplicationStream;
 
     move-result-object p0
 
@@ -114,15 +93,7 @@
 
 
 # virtual methods
-.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
+.method public final component1()J
     .locals 2
 
     iget-wide v0, p0, Lcom/discord/models/domain/ModelApplicationStream;->ownerId:J
@@ -130,7 +101,7 @@
     return-wide v0
 .end method
 
-.method public final component3()J
+.method public final component2()J
     .locals 2
 
     iget-wide v0, p0, Lcom/discord/models/domain/ModelApplicationStream;->guildId:J
@@ -138,7 +109,7 @@
     return-wide v0
 .end method
 
-.method public final component4()J
+.method public final component3()J
     .locals 2
 
     iget-wide v0, p0, Lcom/discord/models/domain/ModelApplicationStream;->channelId:J
@@ -146,28 +117,22 @@
     return-wide v0
 .end method
 
-.method public final copy(Ljava/lang/String;JJJ)Lcom/discord/models/domain/ModelApplicationStream;
-    .locals 9
+.method public final copy(JJJ)Lcom/discord/models/domain/ModelApplicationStream;
+    .locals 8
 
-    const-string v0, "streamType"
+    new-instance v7, Lcom/discord/models/domain/ModelApplicationStream;
 
-    move-object v2, p1
+    move-object v0, v7
 
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    move-wide v1, p1
 
-    new-instance v0, Lcom/discord/models/domain/ModelApplicationStream;
+    move-wide v3, p3
 
-    move-object v1, v0
+    move-wide v5, p5
 
-    move-wide v3, p2
+    invoke-direct/range {v0 .. v6}, Lcom/discord/models/domain/ModelApplicationStream;-><init>(JJJ)V
 
-    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
+    return-object v7
 .end method
 
 .method public final equals(Ljava/lang/Object;)Z
@@ -185,16 +150,6 @@
 
     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
@@ -283,70 +238,44 @@
     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 6
+    .locals 7
 
-    iget-object v0, p0, Lcom/discord/models/domain/ModelApplicationStream;->streamType:Ljava/lang/String;
+    iget-wide v0, p0, Lcom/discord/models/domain/ModelApplicationStream;->ownerId:J
 
-    if-eqz v0, :cond_0
+    const/16 v2, 0x20
 
-    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+    ushr-long v3, v0, v2
 
-    move-result v0
+    xor-long/2addr v0, v3
 
-    goto :goto_0
+    long-to-int v1, v0
 
-    :cond_0
-    const/4 v0, 0x0
+    mul-int/lit8 v1, v1, 0x1f
 
-    :goto_0
-    mul-int/lit8 v0, v0, 0x1f
+    iget-wide v3, p0, Lcom/discord/models/domain/ModelApplicationStream;->guildId:J
 
-    iget-wide v1, p0, Lcom/discord/models/domain/ModelApplicationStream;->ownerId:J
+    ushr-long v5, v3, v2
 
-    const/16 v3, 0x20
+    xor-long/2addr v3, v5
 
-    ushr-long v4, v1, v3
+    long-to-int v0, v3
 
-    xor-long/2addr v1, v4
+    add-int/2addr v1, v0
 
-    long-to-int v2, v1
+    mul-int/lit8 v1, v1, 0x1f
 
-    add-int/2addr v0, v2
+    iget-wide v3, p0, Lcom/discord/models/domain/ModelApplicationStream;->channelId:J
 
-    mul-int/lit8 v0, v0, 0x1f
+    ushr-long v5, v3, v2
 
-    iget-wide v1, p0, Lcom/discord/models/domain/ModelApplicationStream;->guildId:J
+    xor-long/2addr v3, v5
 
-    ushr-long v4, v1, v3
+    long-to-int v0, v3
 
-    xor-long/2addr v1, v4
+    add-int/2addr v1, v0
 
-    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
+    return v1
 .end method
 
 .method public final toString()Ljava/lang/String;
@@ -354,18 +283,10 @@
 
     new-instance v0, Ljava/lang/StringBuilder;
 
-    const-string v1, "ModelApplicationStream(streamType="
+    const-string v1, "ModelApplicationStream(ownerId="
 
     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 7fc6e5ce01..49a0f1f27a 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGuild.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGuild.smali
@@ -69,10 +69,6 @@
 
 .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/ModelPremiumGuildSubscriptionCooldown.smali b/com.discord/smali/com/discord/models/domain/ModelPremiumGuildSubscriptionCooldown.smali
new file mode 100644
index 0000000000..b6e71c495f
--- /dev/null
+++ b/com.discord/smali/com/discord/models/domain/ModelPremiumGuildSubscriptionCooldown.smali
@@ -0,0 +1,273 @@
+.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
deleted file mode 100644
index c0691be78a..0000000000
--- a/com.discord/smali/com/discord/models/domain/ModelPremiumGuildSubscriptionSlot.smali
+++ /dev/null
@@ -1,367 +0,0 @@
-.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/ModelSubscription.smali b/com.discord/smali/com/discord/models/domain/ModelSubscription.smali
index d49e003b3b..3a514ca204 100644
--- a/com.discord/smali/com/discord/models/domain/ModelSubscription.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelSubscription.smali
@@ -1147,39 +1147,6 @@
     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 65676fa5f8..ddab9731c1 100644
--- a/com.discord/smali/com/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType.smali
@@ -33,10 +33,6 @@
 
 .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;
@@ -68,7 +64,7 @@
 .method static constructor <clinit>()V
     .locals 18
 
-    const/16 v0, 0xa
+    const/16 v0, 0x8
 
     new-array v0, v0, [Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
@@ -76,21 +72,21 @@
 
     sget-object v5, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;->MONTHLY:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;
 
-    const-string v2, "NONE_MONTH"
+    const-string v2, "PREMIUM_MONTH_LEGACY"
 
     const/4 v3, 0x0
 
-    const/4 v4, 0x0
+    const/16 v4, 0x1f3
 
-    const-string v6, "none_month"
+    const-string v6, "premium_month"
 
-    const-wide v7, 0x8b873825d000000L
+    const-wide v7, 0x719c0a6fe400000L    # 1.85953420074464E-274
 
     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;->NONE_MONTH:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+    sput-object v9, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_MONTH_LEGACY:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
     const/4 v1, 0x0
 
@@ -100,21 +96,21 @@
 
     sget-object v14, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;->YEARLY:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;
 
-    const-string v11, "NONE_YEAR"
+    const-string v11, "PREMIUM_YEAR_LEGACY"
 
     const/4 v12, 0x1
 
-    const/4 v13, 0x0
+    const/16 v13, 0x1387
 
-    const-string v15, "none_year"
+    const-string v15, "premium_year"
 
-    const-wide v16, 0x8b875b5c4c00000L
+    const-wide v16, 0x719c0a80c000000L
 
     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;->NONE_YEAR:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+    sput-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_YEAR_LEGACY:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
     const/4 v2, 0x1
 
@@ -124,57 +120,9 @@
 
     sget-object v7, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;->MONTHLY:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;
 
-    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/4 v5, 0x2
 
     const/16 v6, 0x1f3
 
@@ -188,7 +136,7 @@
 
     sput-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_MONTH_TIER_1:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
-    const/4 v2, 0x4
+    const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
@@ -198,7 +146,7 @@
 
     const-string v4, "PREMIUM_YEAR_TIER_1"
 
-    const/4 v5, 0x5
+    const/4 v5, 0x3
 
     const/16 v6, 0x1387
 
@@ -212,7 +160,7 @@
 
     sput-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_YEAR_TIER_1:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
-    const/4 v2, 0x5
+    const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
@@ -222,7 +170,7 @@
 
     const-string v4, "PREMIUM_MONTH_TIER_2"
 
-    const/4 v5, 0x6
+    const/4 v5, 0x4
 
     const/16 v6, 0x3e7
 
@@ -236,7 +184,7 @@
 
     sput-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_MONTH_TIER_2:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
-    const/4 v2, 0x6
+    const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
@@ -246,7 +194,7 @@
 
     const-string v4, "PREMIUM_YEAR_TIER_2"
 
-    const/4 v5, 0x7
+    const/4 v5, 0x5
 
     const/16 v6, 0x270f
 
@@ -260,7 +208,7 @@
 
     sput-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_YEAR_TIER_2:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
-    const/4 v2, 0x7
+    const/4 v2, 0x5
 
     aput-object v1, v0, v2
 
@@ -270,7 +218,7 @@
 
     const-string v4, "PREMIUM_GUILD_MONTH"
 
-    const/16 v5, 0x8
+    const/4 v5, 0x6
 
     const/16 v6, 0x1f3
 
@@ -284,7 +232,7 @@
 
     sput-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_GUILD_MONTH:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
-    const/16 v2, 0x8
+    const/4 v2, 0x6
 
     aput-object v1, v0, v2
 
@@ -294,7 +242,7 @@
 
     const-string v4, "PREMIUM_GUILD_YEAR"
 
-    const/16 v5, 0x9
+    const/4 v5, 0x7
 
     const/16 v6, 0x1387
 
@@ -306,7 +254,7 @@
 
     sput-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_GUILD_YEAR:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
-    const/16 v2, 0x9
+    const/4 v2, 0x7
 
     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 9f56d76660..518aa67a1d 100644
--- a/com.discord/smali/com/discord/models/domain/ModelUser.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelUser.smali
@@ -255,87 +255,6 @@
     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/ModelVoice$User.smali b/com.discord/smali/com/discord/models/domain/ModelVoice$User.smali
index 1f970b4107..9b48097fc4 100644
--- a/com.discord/smali/com/discord/models/domain/ModelVoice$User.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelVoice$User.smali
@@ -21,12 +21,8 @@
 
 .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;
@@ -35,7 +31,7 @@
 
 
 # direct methods
-.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
+.method public constructor <init>(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelVoice$State;ZZLjava/lang/Integer;ZLjava/lang/String;)V
     .locals 0
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
@@ -54,10 +50,6 @@
 
     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
 
@@ -221,63 +213,25 @@
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelVoice$User;->getNickname()Ljava/lang/String;
 
-    move-result-object v3
+    move-result-object p1
 
     if-nez v1, :cond_c
 
-    if-eqz v3, :cond_d
+    if-eqz p1, :cond_d
 
     goto :goto_3
 
     :cond_c
-    invoke-virtual {v1, v3}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
+    invoke-virtual {v1, p1}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
 
-    move-result v1
+    move-result p1
 
-    if-nez v1, :cond_d
+    if-nez p1, :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
 
@@ -306,14 +260,6 @@
     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
 
@@ -449,15 +395,13 @@
 
     if-eqz v2, :cond_5
 
-    const/16 v2, 0x4f
-
     goto :goto_5
 
     :cond_5
-    const/16 v2, 0x61
+    const/16 v3, 0x61
 
     :goto_5
-    add-int/2addr v0, v2
+    add-int/2addr v0, v3
 
     invoke-virtual {p0}, Lcom/discord/models/domain/ModelVoice$User;->getNickname()Ljava/lang/String;
 
@@ -467,52 +411,16 @@
 
     if-nez v2, :cond_6
 
-    const/16 v2, 0x2b
-
     goto :goto_6
 
     :cond_6
     invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
 
-    move-result v2
+    move-result v1
 
     :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
 
@@ -583,14 +491,6 @@
     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
 
@@ -666,26 +566,6 @@
 
     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
deleted file mode 100644
index 3e068c5f25..0000000000
--- a/com.discord/smali/com/discord/models/domain/StreamCreate$Parser$parse$1$1.smali
+++ /dev/null
@@ -1,77 +0,0 @@
-.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
deleted file mode 100644
index 4c532393fb..0000000000
--- a/com.discord/smali/com/discord/models/domain/StreamCreate$Parser$parse$1.smali
+++ /dev/null
@@ -1,200 +0,0 @@
-.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
deleted file mode 100644
index dd4d29b0c7..0000000000
--- a/com.discord/smali/com/discord/models/domain/StreamCreate$Parser.smali
+++ /dev/null
@@ -1,157 +0,0 @@
-.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
deleted file mode 100644
index 579c4bdf64..0000000000
--- a/com.discord/smali/com/discord/models/domain/StreamCreate.smali
+++ /dev/null
@@ -1,407 +0,0 @@
-.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
deleted file mode 100644
index ca849a350a..0000000000
--- a/com.discord/smali/com/discord/models/domain/StreamDelete$Parser$parse$1.smali
+++ /dev/null
@@ -1,167 +0,0 @@
-.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
deleted file mode 100644
index d5b4f4182a..0000000000
--- a/com.discord/smali/com/discord/models/domain/StreamDelete$Parser.smali
+++ /dev/null
@@ -1,202 +0,0 @@
-.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
deleted file mode 100644
index 44ecde7736..0000000000
--- a/com.discord/smali/com/discord/models/domain/StreamDelete$Reason.smali
+++ /dev/null
@@ -1,137 +0,0 @@
-.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
deleted file mode 100644
index 16a2de747c..0000000000
--- a/com.discord/smali/com/discord/models/domain/StreamDelete.smali
+++ /dev/null
@@ -1,290 +0,0 @@
-.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
deleted file mode 100644
index 445d009565..0000000000
--- a/com.discord/smali/com/discord/models/domain/StreamServerUpdate$Parser$parse$1.smali
+++ /dev/null
@@ -1,167 +0,0 @@
-.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
deleted file mode 100644
index e1b4ab24f3..0000000000
--- a/com.discord/smali/com/discord/models/domain/StreamServerUpdate$Parser.smali
+++ /dev/null
@@ -1,123 +0,0 @@
-.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
deleted file mode 100644
index ec35e29aaa..0000000000
--- a/com.discord/smali/com/discord/models/domain/StreamServerUpdate.smali
+++ /dev/null
@@ -1,282 +0,0 @@
-.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
deleted file mode 100644
index 78e9591ce4..0000000000
--- a/com.discord/smali/com/discord/models/domain/StreamUpdate$Parser$parse$1$1.smali
+++ /dev/null
@@ -1,77 +0,0 @@
-.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
deleted file mode 100644
index 2289a512d4..0000000000
--- a/com.discord/smali/com/discord/models/domain/StreamUpdate$Parser$parse$1.smali
+++ /dev/null
@@ -1,200 +0,0 @@
-.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
deleted file mode 100644
index 68c34898f6..0000000000
--- a/com.discord/smali/com/discord/models/domain/StreamUpdate$Parser.smali
+++ /dev/null
@@ -1,152 +0,0 @@
-.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
deleted file mode 100644
index b0b4308e94..0000000000
--- a/com.discord/smali/com/discord/models/domain/StreamUpdate.smali
+++ /dev/null
@@ -1,399 +0,0 @@
-.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 15b739216c..d608d35a5c 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;->ye:Lcom/discord/overlay/views/a;
+    iget-object v0, v0, Lcom/discord/overlay/OverlayManager;->yg: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;->yM:Landroid/graphics/Rect;
+    iget-object v0, v0, Lcom/discord/overlay/views/a;->yO: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 3f8a8959fb..868c920bd1 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;->yi:Landroid/view/WindowManager;
+    iget-object v0, v0, Lcom/discord/overlay/OverlayManager;->yk: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;->yd:Lkotlin/jvm/functions/Function1;
+    iget-object v0, v0, Lcom/discord/overlay/OverlayManager;->yf: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 78ff3a5f0d..df0eee0478 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;->ye:Lcom/discord/overlay/views/a;
+    iget-object p1, p1, Lcom/discord/overlay/OverlayManager;->yg:Lcom/discord/overlay/views/a;
 
     if-eqz p1, :cond_2
 
-    iget-object p1, p1, Lcom/discord/overlay/views/a;->yK:Landroid/animation/Animator;
+    iget-object p1, p1, Lcom/discord/overlay/views/a;->yM: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;->ye:Lcom/discord/overlay/views/a;
+    iget-object p1, p1, Lcom/discord/overlay/OverlayManager;->yg:Lcom/discord/overlay/views/a;
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p1, Lcom/discord/overlay/views/a;->yL:Landroid/animation/Animator;
+    iget-object p1, p1, Lcom/discord/overlay/views/a;->yN:Landroid/animation/Animator;
 
     invoke-virtual {p1}, Landroid/animation/Animator;->start()V
 
@@ -93,7 +93,7 @@
 
     :cond_2
     :goto_0
-    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 90190b9d5a..9cb9cd4103 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 yn:Lcom/discord/overlay/OverlayManager$d$1;
+.field final synthetic yp:Lcom/discord/overlay/OverlayManager$d$1;
 
-.field final synthetic yo:Landroid/view/View;
+.field final synthetic yq: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;->yn:Lcom/discord/overlay/OverlayManager$d$1;
+    iput-object p1, p0, Lcom/discord/overlay/OverlayManager$d$1$a;->yp:Lcom/discord/overlay/OverlayManager$d$1;
 
-    iput-object p2, p0, Lcom/discord/overlay/OverlayManager$d$1$a;->yo:Landroid/view/View;
+    iput-object p2, p0, Lcom/discord/overlay/OverlayManager$d$1$a;->yq: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;->yo:Landroid/view/View;
+    iget-object p1, p0, Lcom/discord/overlay/OverlayManager$d$1$a;->yq:Landroid/view/View;
 
-    iget-object p2, p0, Lcom/discord/overlay/OverlayManager$d$1$a;->yn:Lcom/discord/overlay/OverlayManager$d$1;
+    iget-object p2, p0, Lcom/discord/overlay/OverlayManager$d$1$a;->yp:Lcom/discord/overlay/OverlayManager$d$1;
 
-    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$1;->yo:Lcom/discord/overlay/OverlayManager$d;
 
-    iget-object p2, p2, Lcom/discord/overlay/OverlayManager$d;->yl:Ljava/lang/Object;
+    iget-object p2, p2, Lcom/discord/overlay/OverlayManager$d;->yn: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;->yn:Lcom/discord/overlay/OverlayManager$d$1;
+    iget-object p2, p0, Lcom/discord/overlay/OverlayManager$d$1$a;->yp:Lcom/discord/overlay/OverlayManager$d$1;
 
-    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$1;->yo:Lcom/discord/overlay/OverlayManager$d;
 
-    iget-object p2, p2, Lcom/discord/overlay/OverlayManager$d;->yk:Lcom/discord/overlay/views/OverlayBubbleWrap;
+    iget-object p2, p2, Lcom/discord/overlay/OverlayManager$d;->ym: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 ca6b33ae99..c3eb471dbc 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 ym:Lcom/discord/overlay/OverlayManager$d;
+.field final synthetic yo:Lcom/discord/overlay/OverlayManager$d;
 
 
 # direct methods
@@ -30,7 +30,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/discord/overlay/OverlayManager$d$1;->ym:Lcom/discord/overlay/OverlayManager$d;
+    iput-object p1, p0, Lcom/discord/overlay/OverlayManager$d$1;->yo: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;->ym:Lcom/discord/overlay/OverlayManager$d;
+    iget-object v0, p0, Lcom/discord/overlay/OverlayManager$d$1;->yo:Lcom/discord/overlay/OverlayManager$d;
 
-    iget-object v0, v0, Lcom/discord/overlay/OverlayManager$d;->yl:Ljava/lang/Object;
+    iget-object v0, v0, Lcom/discord/overlay/OverlayManager$d;->yn: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;->ym:Lcom/discord/overlay/OverlayManager$d;
+    iget-object v0, p0, Lcom/discord/overlay/OverlayManager$d$1;->yo:Lcom/discord/overlay/OverlayManager$d;
 
-    iget-object v0, v0, Lcom/discord/overlay/OverlayManager$d;->yk:Lcom/discord/overlay/views/OverlayBubbleWrap;
+    iget-object v0, v0, Lcom/discord/overlay/OverlayManager$d;->ym: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;->ym:Lcom/discord/overlay/OverlayManager$d;
+    iget-object p1, p0, Lcom/discord/overlay/OverlayManager$d$1;->yo:Lcom/discord/overlay/OverlayManager$d;
 
-    iget-object p1, p1, Lcom/discord/overlay/OverlayManager$d;->yk:Lcom/discord/overlay/views/OverlayBubbleWrap;
+    iget-object p1, p1, Lcom/discord/overlay/OverlayManager$d;->ym: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;->ym:Lcom/discord/overlay/OverlayManager$d;
+    iget-object p1, p0, Lcom/discord/overlay/OverlayManager$d$1;->yo:Lcom/discord/overlay/OverlayManager$d;
 
-    iget-object p1, p1, Lcom/discord/overlay/OverlayManager$d;->yk:Lcom/discord/overlay/views/OverlayBubbleWrap;
+    iget-object p1, p1, Lcom/discord/overlay/OverlayManager$d;->ym: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;->ym:Lcom/discord/overlay/OverlayManager$d;
+    iget-object p1, p0, Lcom/discord/overlay/OverlayManager$d$1;->yo:Lcom/discord/overlay/OverlayManager$d;
 
-    iget-object p1, p1, Lcom/discord/overlay/OverlayManager$d;->yk:Lcom/discord/overlay/views/OverlayBubbleWrap;
+    iget-object p1, p1, Lcom/discord/overlay/OverlayManager$d;->ym: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 3e7fd1ebf0..578f3bbdc6 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 yj:Lkotlin/jvm/functions/Function1;
+.field final synthetic yl:Lkotlin/jvm/functions/Function1;
 
-.field final synthetic yk:Lcom/discord/overlay/views/OverlayBubbleWrap;
+.field final synthetic ym:Lcom/discord/overlay/views/OverlayBubbleWrap;
 
-.field final synthetic yl:Ljava/lang/Object;
+.field final synthetic yn: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;->yj:Lkotlin/jvm/functions/Function1;
+    iput-object p2, p0, Lcom/discord/overlay/OverlayManager$d;->yl:Lkotlin/jvm/functions/Function1;
 
-    iput-object p3, p0, Lcom/discord/overlay/OverlayManager$d;->yk:Lcom/discord/overlay/views/OverlayBubbleWrap;
+    iput-object p3, p0, Lcom/discord/overlay/OverlayManager$d;->ym:Lcom/discord/overlay/views/OverlayBubbleWrap;
 
-    iput-object p4, p0, Lcom/discord/overlay/OverlayManager$d;->yl:Ljava/lang/Object;
+    iput-object p4, p0, Lcom/discord/overlay/OverlayManager$d;->yn: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;->yj:Lkotlin/jvm/functions/Function1;
+    iget-object p1, p0, Lcom/discord/overlay/OverlayManager$d;->yl:Lkotlin/jvm/functions/Function1;
 
-    iget-object v0, p0, Lcom/discord/overlay/OverlayManager$d;->yk:Lcom/discord/overlay/views/OverlayBubbleWrap;
+    iget-object v0, p0, Lcom/discord/overlay/OverlayManager$d;->ym: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;->yk:Lcom/discord/overlay/views/OverlayBubbleWrap;
+    iget-object p1, p0, Lcom/discord/overlay/OverlayManager$d;->ym: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;->yi:Landroid/view/WindowManager;
+    iget-object p1, p1, Lcom/discord/overlay/OverlayManager;->yk:Landroid/view/WindowManager;
 
-    iget-object v0, p0, Lcom/discord/overlay/OverlayManager$d;->yk:Lcom/discord/overlay/views/OverlayBubbleWrap;
+    iget-object v0, p0, Lcom/discord/overlay/OverlayManager$d;->ym: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;->yi:Landroid/view/WindowManager;
+    iget-object p1, p1, Lcom/discord/overlay/OverlayManager;->yk:Landroid/view/WindowManager;
 
-    iget-object v0, p0, Lcom/discord/overlay/OverlayManager$d;->yk:Lcom/discord/overlay/views/OverlayBubbleWrap;
+    iget-object v0, p0, Lcom/discord/overlay/OverlayManager$d;->ym: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 51a3bf97b9..29dba202e5 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 yp:Lcom/discord/overlay/OverlayManager$e;
+.field public static final yr: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;->yp:Lcom/discord/overlay/OverlayManager$e;
+    sput-object v0, Lcom/discord/overlay/OverlayManager$e;->yr: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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 83d68840d6..8c28f70bfe 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 yq:Lcom/discord/overlay/OverlayManager$f;
+.field public static final ys: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;->yq:Lcom/discord/overlay/OverlayManager$f;
+    sput-object v0, Lcom/discord/overlay/OverlayManager$f;->ys: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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 8907038fb8..f18d0eaf77 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 yr:Lcom/discord/overlay/views/OverlayBubbleWrap;
+.field final synthetic yt: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;->yr:Lcom/discord/overlay/views/OverlayBubbleWrap;
+    iput-object p2, p0, Lcom/discord/overlay/OverlayManager$g;->yt:Lcom/discord/overlay/views/OverlayBubbleWrap;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -63,7 +63,7 @@
 
     if-eqz p1, :cond_0
 
-    iget-object v0, p0, Lcom/discord/overlay/OverlayManager$g;->yr:Lcom/discord/overlay/views/OverlayBubbleWrap;
+    iget-object v0, p0, Lcom/discord/overlay/OverlayManager$g;->yt:Lcom/discord/overlay/views/OverlayBubbleWrap;
 
     invoke-virtual {p1, v0}, Lcom/discord/overlay/views/a;->f(Lcom/discord/overlay/views/OverlayBubbleWrap;)V
 
@@ -76,7 +76,7 @@
 
     if-eqz p1, :cond_1
 
-    iget-object v0, p0, Lcom/discord/overlay/OverlayManager$g;->yr:Lcom/discord/overlay/views/OverlayBubbleWrap;
+    iget-object v0, p0, Lcom/discord/overlay/OverlayManager$g;->yt: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 3e0905c06d..aa1c3799fd 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 xZ:Landroid/graphics/Rect;
+.field private final yb:Landroid/graphics/Rect;
 
-.field private final ya:Ljava/util/ArrayList;
+.field private final yc:Ljava/util/ArrayList;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/ArrayList<",
@@ -19,7 +19,7 @@
     .end annotation
 .end field
 
-.field public final yb:Ljava/util/List;
+.field public final yd:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -29,7 +29,7 @@
     .end annotation
 .end field
 
-.field public yc:Lkotlin/jvm/functions/Function1;
+.field public ye:Lkotlin/jvm/functions/Function1;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/jvm/functions/Function1<",
@@ -41,7 +41,7 @@
     .end annotation
 .end field
 
-.field yd:Lkotlin/jvm/functions/Function1;
+.field yf:Lkotlin/jvm/functions/Function1;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/jvm/functions/Function1<",
@@ -53,15 +53,15 @@
     .end annotation
 .end field
 
-.field ye:Lcom/discord/overlay/views/a;
+.field yg:Lcom/discord/overlay/views/a;
 
-.field yf:Lcom/discord/overlay/a;
+.field yh:Lcom/discord/overlay/a;
 
-.field public yg:Landroid/view/View$OnTouchListener;
+.field public yi:Landroid/view/View$OnTouchListener;
 
-.field private yh:Lcom/discord/overlay/views/OverlayBubbleWrap;
+.field private yj:Lcom/discord/overlay/views/OverlayBubbleWrap;
 
-.field final yi:Landroid/view/WindowManager;
+.field final yk: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;->yi:Landroid/view/WindowManager;
+    iput-object p1, p0, Lcom/discord/overlay/OverlayManager;->yk: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;->yi:Landroid/view/WindowManager;
+    iget-object v0, p0, Lcom/discord/overlay/OverlayManager;->yk: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;->xZ:Landroid/graphics/Rect;
+    iput-object p1, p0, Lcom/discord/overlay/OverlayManager;->yb: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;->ya:Ljava/util/ArrayList;
+    iput-object p1, p0, Lcom/discord/overlay/OverlayManager;->yc:Ljava/util/ArrayList;
 
-    iget-object p1, p0, Lcom/discord/overlay/OverlayManager;->ya:Ljava/util/ArrayList;
+    iget-object p1, p0, Lcom/discord/overlay/OverlayManager;->yc:Ljava/util/ArrayList;
 
     check-cast p1, Ljava/util/List;
 
-    iput-object p1, p0, Lcom/discord/overlay/OverlayManager;->yb:Ljava/util/List;
+    iput-object p1, p0, Lcom/discord/overlay/OverlayManager;->yd:Ljava/util/List;
 
-    sget-object p1, Lcom/discord/overlay/OverlayManager$e;->yp:Lcom/discord/overlay/OverlayManager$e;
+    sget-object p1, Lcom/discord/overlay/OverlayManager$e;->yr:Lcom/discord/overlay/OverlayManager$e;
 
     check-cast p1, Lkotlin/jvm/functions/Function1;
 
-    iput-object p1, p0, Lcom/discord/overlay/OverlayManager;->yc:Lkotlin/jvm/functions/Function1;
+    iput-object p1, p0, Lcom/discord/overlay/OverlayManager;->ye:Lkotlin/jvm/functions/Function1;
 
-    sget-object p1, Lcom/discord/overlay/OverlayManager$f;->yq:Lcom/discord/overlay/OverlayManager$f;
+    sget-object p1, Lcom/discord/overlay/OverlayManager$f;->ys:Lcom/discord/overlay/OverlayManager$f;
 
     check-cast p1, Lkotlin/jvm/functions/Function1;
 
-    iput-object p1, p0, Lcom/discord/overlay/OverlayManager;->yd:Lkotlin/jvm/functions/Function1;
+    iput-object p1, p0, Lcom/discord/overlay/OverlayManager;->yf: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;->yg:Landroid/view/View$OnTouchListener;
+    iput-object p1, p0, Lcom/discord/overlay/OverlayManager;->yi: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;->yF:Landroid/graphics/Point;
+    iget-object v0, p1, Lcom/discord/overlay/views/OverlayBubbleWrap;->yH:Landroid/graphics/Point;
 
     if-eqz v0, :cond_0
 
-    iget-object v1, p1, Lcom/discord/overlay/views/OverlayBubbleWrap;->yE:Landroid/graphics/Point;
+    iget-object v1, p1, Lcom/discord/overlay/views/OverlayBubbleWrap;->yG: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;->yE:Landroid/graphics/Point;
+    iget-object v1, p1, Lcom/discord/overlay/views/OverlayBubbleWrap;->yG: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;->yE:Landroid/graphics/Point;
+    iget-object v2, p1, Lcom/discord/overlay/views/OverlayBubbleWrap;->yG: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;->yh:Lcom/discord/overlay/views/OverlayBubbleWrap;
+    iget-object v0, p0, Lcom/discord/overlay/OverlayManager;->yj: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;->yh:Lcom/discord/overlay/views/OverlayBubbleWrap;
+    iput-object p1, p0, Lcom/discord/overlay/OverlayManager;->yj:Lcom/discord/overlay/views/OverlayBubbleWrap;
 
-    iget-object v0, p0, Lcom/discord/overlay/OverlayManager;->ye:Lcom/discord/overlay/views/a;
+    iget-object v0, p0, Lcom/discord/overlay/OverlayManager;->yg: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;->yf:Lcom/discord/overlay/a;
+    iget-object v0, p0, Lcom/discord/overlay/OverlayManager;->yh: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;->ya:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/discord/overlay/OverlayManager;->yc: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;->yi:Landroid/view/WindowManager;
+    iget-object v0, p0, Lcom/discord/overlay/OverlayManager;->yk: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;->yd:Lkotlin/jvm/functions/Function1;
+    iget-object v0, p0, Lcom/discord/overlay/OverlayManager;->yf: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;->yi:Landroid/view/WindowManager;
+    iget-object v0, p0, Lcom/discord/overlay/OverlayManager;->yk: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;->ya:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/discord/overlay/OverlayManager;->yc: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;->yc:Lkotlin/jvm/functions/Function1;
+    iget-object v0, p0, Lcom/discord/overlay/OverlayManager;->ye: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;->yd:Lkotlin/jvm/functions/Function1;
+    iput-object p1, p0, Lcom/discord/overlay/OverlayManager;->yf: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;->ya:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/discord/overlay/OverlayManager;->yc: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;->ye:Lcom/discord/overlay/views/a;
+    iget-object v0, p0, Lcom/discord/overlay/OverlayManager;->yg:Lcom/discord/overlay/views/a;
 
     if-eqz v0, :cond_0
 
-    iget-object v1, p0, Lcom/discord/overlay/OverlayManager;->yi:Landroid/view/WindowManager;
+    iget-object v1, p0, Lcom/discord/overlay/OverlayManager;->yk: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;->ye:Lcom/discord/overlay/views/a;
+    iput-object v0, p0, Lcom/discord/overlay/OverlayManager;->yg: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;->yi:Landroid/view/WindowManager;
+    iget-object v0, p0, Lcom/discord/overlay/OverlayManager;->yk: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;->xZ:Landroid/graphics/Rect;
+    iget-object v1, p0, Lcom/discord/overlay/OverlayManager;->yb: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;->xZ:Landroid/graphics/Rect;
+    iget-object v1, p0, Lcom/discord/overlay/OverlayManager;->yb:Landroid/graphics/Rect;
 
     invoke-virtual {v1}, Landroid/graphics/Rect;->centerX()I
 
@@ -447,7 +447,7 @@
 .method public final ep()Lcom/discord/overlay/views/a;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/overlay/OverlayManager;->ye:Lcom/discord/overlay/views/a;
+    iget-object v0, p0, Lcom/discord/overlay/OverlayManager;->yg:Lcom/discord/overlay/views/a;
 
     return-object v0
 .end method
@@ -455,7 +455,7 @@
 .method public final eq()Lcom/discord/overlay/a;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/overlay/OverlayManager;->yf:Lcom/discord/overlay/a;
+    iget-object v0, p0, Lcom/discord/overlay/OverlayManager;->yh: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 d47b0243e1..f70e33b321 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;->yb:Ljava/util/List;
+    iget-object p1, p1, Lcom/discord/overlay/OverlayManager;->yd: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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 605072c04d..a34824e7ee 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;->ye:Lcom/discord/overlay/views/a;
+    iget-object p1, p1, Lcom/discord/overlay/OverlayManager;->yg: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;->ye:Lcom/discord/overlay/views/a;
+    iput-object p1, v0, Lcom/discord/overlay/OverlayManager;->yg:Lcom/discord/overlay/views/a;
 
-    iget-object v0, v0, Lcom/discord/overlay/OverlayManager;->yi:Landroid/view/WindowManager;
+    iget-object v0, v0, Lcom/discord/overlay/OverlayManager;->yk: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;->yf:Lcom/discord/overlay/a;
+    iput-object v2, v0, Lcom/discord/overlay/OverlayManager;->yh: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 99d7613111..95017a7266 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 = 0x7f080017
+.field public static final abc_ab_share_pack_mtrl_alpha:I = 0x7f080016
 
-.field public static final abc_action_bar_item_background_material:I = 0x7f080018
+.field public static final abc_action_bar_item_background_material:I = 0x7f080017
 
-.field public static final abc_btn_borderless_material:I = 0x7f080019
+.field public static final abc_btn_borderless_material:I = 0x7f080018
 
-.field public static final abc_btn_check_material:I = 0x7f08001a
+.field public static final abc_btn_check_material:I = 0x7f080019
 
-.field public static final abc_btn_check_to_on_mtrl_000:I = 0x7f08001b
+.field public static final abc_btn_check_to_on_mtrl_000:I = 0x7f08001a
 
-.field public static final abc_btn_check_to_on_mtrl_015:I = 0x7f08001c
+.field public static final abc_btn_check_to_on_mtrl_015:I = 0x7f08001b
 
-.field public static final abc_btn_colored_material:I = 0x7f08001d
+.field public static final abc_btn_colored_material:I = 0x7f08001c
 
-.field public static final abc_btn_default_mtrl_shape:I = 0x7f08001e
+.field public static final abc_btn_default_mtrl_shape:I = 0x7f08001d
 
-.field public static final abc_btn_radio_material:I = 0x7f08001f
+.field public static final abc_btn_radio_material:I = 0x7f08001e
 
-.field public static final abc_btn_radio_to_on_mtrl_000:I = 0x7f080020
+.field public static final abc_btn_radio_to_on_mtrl_000:I = 0x7f08001f
 
-.field public static final abc_btn_radio_to_on_mtrl_015:I = 0x7f080021
+.field public static final abc_btn_radio_to_on_mtrl_015:I = 0x7f080020
 
-.field public static final abc_btn_switch_to_on_mtrl_00001:I = 0x7f080022
+.field public static final abc_btn_switch_to_on_mtrl_00001:I = 0x7f080021
 
-.field public static final abc_btn_switch_to_on_mtrl_00012:I = 0x7f080023
+.field public static final abc_btn_switch_to_on_mtrl_00012:I = 0x7f080022
 
-.field public static final abc_cab_background_internal_bg:I = 0x7f080024
+.field public static final abc_cab_background_internal_bg:I = 0x7f080023
 
-.field public static final abc_cab_background_top_material:I = 0x7f080025
+.field public static final abc_cab_background_top_material:I = 0x7f080024
 
-.field public static final abc_cab_background_top_mtrl_alpha:I = 0x7f080026
+.field public static final abc_cab_background_top_mtrl_alpha:I = 0x7f080025
 
-.field public static final abc_control_background_material:I = 0x7f080027
+.field public static final abc_control_background_material:I = 0x7f080026
 
-.field public static final abc_dialog_material_background:I = 0x7f080028
+.field public static final abc_dialog_material_background:I = 0x7f080027
 
-.field public static final abc_edit_text_material:I = 0x7f080029
+.field public static final abc_edit_text_material:I = 0x7f080028
 
-.field public static final abc_ic_ab_back_material:I = 0x7f08002a
+.field public static final abc_ic_ab_back_material:I = 0x7f080029
 
-.field public static final abc_ic_arrow_drop_right_black_24dp:I = 0x7f08002b
+.field public static final abc_ic_arrow_drop_right_black_24dp:I = 0x7f08002a
 
-.field public static final abc_ic_clear_material:I = 0x7f08002c
+.field public static final abc_ic_clear_material:I = 0x7f08002b
 
-.field public static final abc_ic_commit_search_api_mtrl_alpha:I = 0x7f08002d
+.field public static final abc_ic_commit_search_api_mtrl_alpha:I = 0x7f08002c
 
-.field public static final abc_ic_go_search_api_material:I = 0x7f08002e
+.field public static final abc_ic_go_search_api_material:I = 0x7f08002d
 
-.field public static final abc_ic_menu_copy_mtrl_am_alpha:I = 0x7f08002f
+.field public static final abc_ic_menu_copy_mtrl_am_alpha:I = 0x7f08002e
 
-.field public static final abc_ic_menu_cut_mtrl_alpha:I = 0x7f080030
+.field public static final abc_ic_menu_cut_mtrl_alpha:I = 0x7f08002f
 
-.field public static final abc_ic_menu_overflow_material:I = 0x7f080031
+.field public static final abc_ic_menu_overflow_material:I = 0x7f080030
 
-.field public static final abc_ic_menu_paste_mtrl_am_alpha:I = 0x7f080032
+.field public static final abc_ic_menu_paste_mtrl_am_alpha:I = 0x7f080031
 
-.field public static final abc_ic_menu_selectall_mtrl_alpha:I = 0x7f080033
+.field public static final abc_ic_menu_selectall_mtrl_alpha:I = 0x7f080032
 
-.field public static final abc_ic_menu_share_mtrl_alpha:I = 0x7f080034
+.field public static final abc_ic_menu_share_mtrl_alpha:I = 0x7f080033
 
-.field public static final abc_ic_search_api_material:I = 0x7f080035
+.field public static final abc_ic_search_api_material:I = 0x7f080034
 
-.field public static final abc_ic_star_black_16dp:I = 0x7f080036
+.field public static final abc_ic_star_black_16dp:I = 0x7f080035
 
-.field public static final abc_ic_star_black_36dp:I = 0x7f080037
+.field public static final abc_ic_star_black_36dp:I = 0x7f080036
 
-.field public static final abc_ic_star_black_48dp:I = 0x7f080038
+.field public static final abc_ic_star_black_48dp:I = 0x7f080037
 
-.field public static final abc_ic_star_half_black_16dp:I = 0x7f080039
+.field public static final abc_ic_star_half_black_16dp:I = 0x7f080038
 
-.field public static final abc_ic_star_half_black_36dp:I = 0x7f08003a
+.field public static final abc_ic_star_half_black_36dp:I = 0x7f080039
 
-.field public static final abc_ic_star_half_black_48dp:I = 0x7f08003b
+.field public static final abc_ic_star_half_black_48dp:I = 0x7f08003a
 
-.field public static final abc_ic_voice_search_api_material:I = 0x7f08003c
+.field public static final abc_ic_voice_search_api_material:I = 0x7f08003b
 
-.field public static final abc_item_background_holo_dark:I = 0x7f08003d
+.field public static final abc_item_background_holo_dark:I = 0x7f08003c
 
-.field public static final abc_item_background_holo_light:I = 0x7f08003e
+.field public static final abc_item_background_holo_light:I = 0x7f08003d
 
-.field public static final abc_list_divider_material:I = 0x7f08003f
+.field public static final abc_list_divider_material:I = 0x7f08003e
 
-.field public static final abc_list_divider_mtrl_alpha:I = 0x7f080040
+.field public static final abc_list_divider_mtrl_alpha:I = 0x7f08003f
 
-.field public static final abc_list_focused_holo:I = 0x7f080041
+.field public static final abc_list_focused_holo:I = 0x7f080040
 
-.field public static final abc_list_longpressed_holo:I = 0x7f080042
+.field public static final abc_list_longpressed_holo:I = 0x7f080041
 
-.field public static final abc_list_pressed_holo_dark:I = 0x7f080043
+.field public static final abc_list_pressed_holo_dark:I = 0x7f080042
 
-.field public static final abc_list_pressed_holo_light:I = 0x7f080044
+.field public static final abc_list_pressed_holo_light:I = 0x7f080043
 
-.field public static final abc_list_selector_background_transition_holo_dark:I = 0x7f080045
+.field public static final abc_list_selector_background_transition_holo_dark:I = 0x7f080044
 
-.field public static final abc_list_selector_background_transition_holo_light:I = 0x7f080046
+.field public static final abc_list_selector_background_transition_holo_light:I = 0x7f080045
 
-.field public static final abc_list_selector_disabled_holo_dark:I = 0x7f080047
+.field public static final abc_list_selector_disabled_holo_dark:I = 0x7f080046
 
-.field public static final abc_list_selector_disabled_holo_light:I = 0x7f080048
+.field public static final abc_list_selector_disabled_holo_light:I = 0x7f080047
 
-.field public static final abc_list_selector_holo_dark:I = 0x7f080049
+.field public static final abc_list_selector_holo_dark:I = 0x7f080048
 
-.field public static final abc_list_selector_holo_light:I = 0x7f08004a
+.field public static final abc_list_selector_holo_light:I = 0x7f080049
 
-.field public static final abc_menu_hardkey_panel_mtrl_mult:I = 0x7f08004b
+.field public static final abc_menu_hardkey_panel_mtrl_mult:I = 0x7f08004a
 
-.field public static final abc_popup_background_mtrl_mult:I = 0x7f08004c
+.field public static final abc_popup_background_mtrl_mult:I = 0x7f08004b
 
-.field public static final abc_ratingbar_indicator_material:I = 0x7f08004d
+.field public static final abc_ratingbar_indicator_material:I = 0x7f08004c
 
-.field public static final abc_ratingbar_material:I = 0x7f08004e
+.field public static final abc_ratingbar_material:I = 0x7f08004d
 
-.field public static final abc_ratingbar_small_material:I = 0x7f08004f
+.field public static final abc_ratingbar_small_material:I = 0x7f08004e
 
-.field public static final abc_scrubber_control_off_mtrl_alpha:I = 0x7f080050
+.field public static final abc_scrubber_control_off_mtrl_alpha:I = 0x7f08004f
 
-.field public static final abc_scrubber_control_to_pressed_mtrl_000:I = 0x7f080051
+.field public static final abc_scrubber_control_to_pressed_mtrl_000:I = 0x7f080050
 
-.field public static final abc_scrubber_control_to_pressed_mtrl_005:I = 0x7f080052
+.field public static final abc_scrubber_control_to_pressed_mtrl_005:I = 0x7f080051
 
-.field public static final abc_scrubber_primary_mtrl_alpha:I = 0x7f080053
+.field public static final abc_scrubber_primary_mtrl_alpha:I = 0x7f080052
 
-.field public static final abc_scrubber_track_mtrl_alpha:I = 0x7f080054
+.field public static final abc_scrubber_track_mtrl_alpha:I = 0x7f080053
 
-.field public static final abc_seekbar_thumb_material:I = 0x7f080055
+.field public static final abc_seekbar_thumb_material:I = 0x7f080054
 
-.field public static final abc_seekbar_tick_mark_material:I = 0x7f080056
+.field public static final abc_seekbar_tick_mark_material:I = 0x7f080055
 
-.field public static final abc_seekbar_track_material:I = 0x7f080057
+.field public static final abc_seekbar_track_material:I = 0x7f080056
 
-.field public static final abc_spinner_mtrl_am_alpha:I = 0x7f080058
+.field public static final abc_spinner_mtrl_am_alpha:I = 0x7f080057
 
-.field public static final abc_spinner_textfield_background_material:I = 0x7f080059
+.field public static final abc_spinner_textfield_background_material:I = 0x7f080058
 
-.field public static final abc_switch_thumb_material:I = 0x7f08005a
+.field public static final abc_switch_thumb_material:I = 0x7f080059
 
-.field public static final abc_switch_track_mtrl_alpha:I = 0x7f08005b
+.field public static final abc_switch_track_mtrl_alpha:I = 0x7f08005a
 
-.field public static final abc_tab_indicator_material:I = 0x7f08005c
+.field public static final abc_tab_indicator_material:I = 0x7f08005b
 
-.field public static final abc_tab_indicator_mtrl_alpha:I = 0x7f08005d
+.field public static final abc_tab_indicator_mtrl_alpha:I = 0x7f08005c
 
-.field public static final abc_text_cursor_material:I = 0x7f08005e
+.field public static final abc_text_cursor_material:I = 0x7f08005d
 
-.field public static final abc_text_select_handle_left_mtrl_dark:I = 0x7f08005f
+.field public static final abc_text_select_handle_left_mtrl_dark:I = 0x7f08005e
 
-.field public static final abc_text_select_handle_left_mtrl_light:I = 0x7f080060
+.field public static final abc_text_select_handle_left_mtrl_light:I = 0x7f08005f
 
-.field public static final abc_text_select_handle_middle_mtrl_dark:I = 0x7f080061
+.field public static final abc_text_select_handle_middle_mtrl_dark:I = 0x7f080060
 
-.field public static final abc_text_select_handle_middle_mtrl_light:I = 0x7f080062
+.field public static final abc_text_select_handle_middle_mtrl_light:I = 0x7f080061
 
-.field public static final abc_text_select_handle_right_mtrl_dark:I = 0x7f080063
+.field public static final abc_text_select_handle_right_mtrl_dark:I = 0x7f080062
 
-.field public static final abc_text_select_handle_right_mtrl_light:I = 0x7f080064
+.field public static final abc_text_select_handle_right_mtrl_light:I = 0x7f080063
 
-.field public static final abc_textfield_activated_mtrl_alpha:I = 0x7f080065
+.field public static final abc_textfield_activated_mtrl_alpha:I = 0x7f080064
 
-.field public static final abc_textfield_default_mtrl_alpha:I = 0x7f080066
+.field public static final abc_textfield_default_mtrl_alpha:I = 0x7f080065
 
-.field public static final abc_textfield_search_activated_mtrl_alpha:I = 0x7f080067
+.field public static final abc_textfield_search_activated_mtrl_alpha:I = 0x7f080066
 
-.field public static final abc_textfield_search_default_mtrl_alpha:I = 0x7f080068
+.field public static final abc_textfield_search_default_mtrl_alpha:I = 0x7f080067
 
-.field public static final abc_textfield_search_material:I = 0x7f080069
+.field public static final abc_textfield_search_material:I = 0x7f080068
 
-.field public static final abc_vector_test:I = 0x7f08006a
+.field public static final abc_vector_test:I = 0x7f080069
 
-.field public static final bubble_state_selector:I = 0x7f08009a
+.field public static final bubble_state_selector:I = 0x7f080099
 
-.field public static final ic_close_24dp:I = 0x7f080249
+.field public static final ic_close_24dp:I = 0x7f08023d
 
-.field public static final ic_trash_outline:I = 0x7f0803a7
+.field public static final ic_trash_outline:I = 0x7f080399
 
-.field public static final notification_action_background:I = 0x7f080472
+.field public static final notification_action_background:I = 0x7f080463
 
-.field public static final notification_bg:I = 0x7f080473
+.field public static final notification_bg:I = 0x7f080464
 
-.field public static final notification_bg_low:I = 0x7f080474
+.field public static final notification_bg_low:I = 0x7f080465
 
-.field public static final notification_bg_low_normal:I = 0x7f080475
+.field public static final notification_bg_low_normal:I = 0x7f080466
 
-.field public static final notification_bg_low_pressed:I = 0x7f080476
+.field public static final notification_bg_low_pressed:I = 0x7f080467
 
-.field public static final notification_bg_normal:I = 0x7f080477
+.field public static final notification_bg_normal:I = 0x7f080468
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080478
+.field public static final notification_bg_normal_pressed:I = 0x7f080469
 
-.field public static final notification_icon_background:I = 0x7f080479
+.field public static final notification_icon_background:I = 0x7f08046a
 
-.field public static final notification_template_icon_bg:I = 0x7f08047a
+.field public static final notification_template_icon_bg:I = 0x7f08046b
 
-.field public static final notification_template_icon_low_bg:I = 0x7f08047b
+.field public static final notification_template_icon_low_bg:I = 0x7f08046c
 
-.field public static final notification_tile_bg:I = 0x7f08047c
+.field public static final notification_tile_bg:I = 0x7f08046d
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08047d
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08046e
 
-.field public static final tooltip_frame_dark:I = 0x7f080485
+.field public static final tooltip_frame_dark:I = 0x7f080476
 
-.field public static final tooltip_frame_light:I = 0x7f080486
+.field public static final tooltip_frame_light:I = 0x7f080477
 
-.field public static final trash_bg:I = 0x7f080487
+.field public static final trash_bg:I = 0x7f080478
 
 
 # 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 00925a518a..21f1532eec 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 = 0x7f0a0080
+.field public static final async:I = 0x7f0a007f
 
-.field public static final blocking:I = 0x7f0a00ce
+.field public static final blocking:I = 0x7f0a00cd
 
 .field public static final bottom:I = 0x7f0a0105
 
@@ -135,179 +135,179 @@
 
 .field public static final chronometer:I = 0x7f0a0215
 
-.field public static final content:I = 0x7f0a0234
+.field public static final content:I = 0x7f0a0233
 
-.field public static final contentPanel:I = 0x7f0a0235
+.field public static final contentPanel:I = 0x7f0a0234
 
-.field public static final custom:I = 0x7f0a0252
+.field public static final custom:I = 0x7f0a0251
 
-.field public static final customPanel:I = 0x7f0a0253
+.field public static final customPanel:I = 0x7f0a0252
 
-.field public static final decor_content_parent:I = 0x7f0a0257
+.field public static final decor_content_parent:I = 0x7f0a0256
 
-.field public static final default_activity_button:I = 0x7f0a0258
+.field public static final default_activity_button:I = 0x7f0a0257
 
-.field public static final dialog_button:I = 0x7f0a025e
+.field public static final dialog_button:I = 0x7f0a025d
 
-.field public static final edit_query:I = 0x7f0a02ae
+.field public static final edit_query:I = 0x7f0a02ad
 
-.field public static final end:I = 0x7f0a02c9
+.field public static final end:I = 0x7f0a02c8
 
-.field public static final expand_activities_button:I = 0x7f0a02ce
+.field public static final expand_activities_button:I = 0x7f0a02cd
 
-.field public static final expanded_menu:I = 0x7f0a02cf
+.field public static final expanded_menu:I = 0x7f0a02ce
 
-.field public static final forever:I = 0x7f0a02f2
+.field public static final forever:I = 0x7f0a02f1
 
-.field public static final group_divider:I = 0x7f0a032d
+.field public static final group_divider:I = 0x7f0a0328
 
-.field public static final home:I = 0x7f0a0394
+.field public static final home:I = 0x7f0a038f
 
-.field public static final icon:I = 0x7f0a0396
+.field public static final icon:I = 0x7f0a0391
 
-.field public static final icon_group:I = 0x7f0a0397
+.field public static final icon_group:I = 0x7f0a0392
 
-.field public static final image:I = 0x7f0a039a
+.field public static final image:I = 0x7f0a0395
 
-.field public static final info:I = 0x7f0a03ac
+.field public static final info:I = 0x7f0a03a7
 
-.field public static final italic:I = 0x7f0a03d9
+.field public static final italic:I = 0x7f0a03d4
 
-.field public static final left:I = 0x7f0a041b
+.field public static final left:I = 0x7f0a0416
 
-.field public static final line1:I = 0x7f0a041d
+.field public static final line1:I = 0x7f0a0418
 
-.field public static final line3:I = 0x7f0a041e
+.field public static final line3:I = 0x7f0a0419
 
-.field public static final listMode:I = 0x7f0a0420
+.field public static final listMode:I = 0x7f0a041b
 
-.field public static final list_item:I = 0x7f0a0421
+.field public static final list_item:I = 0x7f0a041c
 
-.field public static final message:I = 0x7f0a0485
+.field public static final message:I = 0x7f0a0478
 
-.field public static final multiply:I = 0x7f0a048d
+.field public static final multiply:I = 0x7f0a0480
 
-.field public static final none:I = 0x7f0a04a2
+.field public static final none:I = 0x7f0a0495
 
-.field public static final normal:I = 0x7f0a04a3
+.field public static final normal:I = 0x7f0a0496
 
-.field public static final notification_background:I = 0x7f0a04ad
+.field public static final notification_background:I = 0x7f0a04a0
 
-.field public static final notification_main_column:I = 0x7f0a04ae
+.field public static final notification_main_column:I = 0x7f0a04a1
 
-.field public static final notification_main_column_container:I = 0x7f0a04af
+.field public static final notification_main_column_container:I = 0x7f0a04a2
 
-.field public static final parentPanel:I = 0x7f0a04e2
+.field public static final parentPanel:I = 0x7f0a04d5
 
-.field public static final progress_circular:I = 0x7f0a055c
+.field public static final progress_circular:I = 0x7f0a054d
 
-.field public static final progress_horizontal:I = 0x7f0a055e
+.field public static final progress_horizontal:I = 0x7f0a054f
 
-.field public static final radio:I = 0x7f0a0569
+.field public static final radio:I = 0x7f0a055a
 
-.field public static final right:I = 0x7f0a058c
+.field public static final right:I = 0x7f0a0573
 
-.field public static final right_icon:I = 0x7f0a058d
+.field public static final right_icon:I = 0x7f0a0574
 
-.field public static final right_side:I = 0x7f0a058e
+.field public static final right_side:I = 0x7f0a0575
 
-.field public static final screen:I = 0x7f0a05bc
+.field public static final screen:I = 0x7f0a05a3
 
-.field public static final scrollIndicatorDown:I = 0x7f0a05be
+.field public static final scrollIndicatorDown:I = 0x7f0a05a5
 
-.field public static final scrollIndicatorUp:I = 0x7f0a05bf
+.field public static final scrollIndicatorUp:I = 0x7f0a05a6
 
-.field public static final scrollView:I = 0x7f0a05c0
+.field public static final scrollView:I = 0x7f0a05a7
 
-.field public static final search_badge:I = 0x7f0a05c4
+.field public static final search_badge:I = 0x7f0a05ab
 
-.field public static final search_bar:I = 0x7f0a05c5
+.field public static final search_bar:I = 0x7f0a05ac
 
-.field public static final search_button:I = 0x7f0a05c6
+.field public static final search_button:I = 0x7f0a05ad
 
-.field public static final search_close_btn:I = 0x7f0a05c8
+.field public static final search_close_btn:I = 0x7f0a05af
 
-.field public static final search_edit_frame:I = 0x7f0a05c9
+.field public static final search_edit_frame:I = 0x7f0a05b0
 
-.field public static final search_go_btn:I = 0x7f0a05cc
+.field public static final search_go_btn:I = 0x7f0a05b3
 
-.field public static final search_mag_icon:I = 0x7f0a05ce
+.field public static final search_mag_icon:I = 0x7f0a05b5
 
-.field public static final search_plate:I = 0x7f0a05cf
+.field public static final search_plate:I = 0x7f0a05b6
 
-.field public static final search_src_text:I = 0x7f0a05d2
+.field public static final search_src_text:I = 0x7f0a05b9
 
-.field public static final search_voice_btn:I = 0x7f0a05de
+.field public static final search_voice_btn:I = 0x7f0a05c5
 
-.field public static final select_dialog_listview:I = 0x7f0a05df
+.field public static final select_dialog_listview:I = 0x7f0a05c6
 
-.field public static final shortcut:I = 0x7f0a0719
+.field public static final shortcut:I = 0x7f0a0700
 
-.field public static final spacer:I = 0x7f0a0725
+.field public static final spacer:I = 0x7f0a070c
 
-.field public static final split_action_bar:I = 0x7f0a072c
+.field public static final split_action_bar:I = 0x7f0a070d
 
-.field public static final src_atop:I = 0x7f0a072f
+.field public static final src_atop:I = 0x7f0a0710
 
-.field public static final src_in:I = 0x7f0a0730
+.field public static final src_in:I = 0x7f0a0711
 
-.field public static final src_over:I = 0x7f0a0731
+.field public static final src_over:I = 0x7f0a0712
 
-.field public static final start:I = 0x7f0a0734
+.field public static final start:I = 0x7f0a0715
 
-.field public static final submenuarrow:I = 0x7f0a0755
+.field public static final submenuarrow:I = 0x7f0a072d
 
-.field public static final submit_area:I = 0x7f0a0756
+.field public static final submit_area:I = 0x7f0a072e
 
-.field public static final tabMode:I = 0x7f0a0761
+.field public static final tabMode:I = 0x7f0a0739
 
-.field public static final tag_accessibility_actions:I = 0x7f0a0762
+.field public static final tag_accessibility_actions:I = 0x7f0a073a
 
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0763
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a073b
 
-.field public static final tag_accessibility_heading:I = 0x7f0a0764
+.field public static final tag_accessibility_heading:I = 0x7f0a073c
 
-.field public static final tag_accessibility_pane_title:I = 0x7f0a0765
+.field public static final tag_accessibility_pane_title:I = 0x7f0a073d
 
-.field public static final tag_screen_reader_focusable:I = 0x7f0a0766
+.field public static final tag_screen_reader_focusable:I = 0x7f0a073e
 
-.field public static final tag_transition_group:I = 0x7f0a0767
+.field public static final tag_transition_group:I = 0x7f0a073f
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0768
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0740
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0769
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0741
 
-.field public static final text:I = 0x7f0a076f
+.field public static final text:I = 0x7f0a0747
 
-.field public static final text2:I = 0x7f0a0770
+.field public static final text2:I = 0x7f0a0748
 
-.field public static final textSpacerNoButtons:I = 0x7f0a0771
+.field public static final textSpacerNoButtons:I = 0x7f0a0749
 
-.field public static final textSpacerNoTitle:I = 0x7f0a0772
+.field public static final textSpacerNoTitle:I = 0x7f0a074a
 
-.field public static final time:I = 0x7f0a077d
+.field public static final time:I = 0x7f0a0755
 
-.field public static final title:I = 0x7f0a077e
+.field public static final title:I = 0x7f0a0756
 
-.field public static final titleDividerNoCustom:I = 0x7f0a077f
+.field public static final titleDividerNoCustom:I = 0x7f0a0757
 
-.field public static final title_template:I = 0x7f0a0780
+.field public static final title_template:I = 0x7f0a0758
 
-.field public static final top:I = 0x7f0a0785
+.field public static final top:I = 0x7f0a075d
 
-.field public static final topPanel:I = 0x7f0a0786
+.field public static final topPanel:I = 0x7f0a075e
 
-.field public static final trash_wrap_icon:I = 0x7f0a078e
+.field public static final trash_wrap_icon:I = 0x7f0a0766
 
-.field public static final trash_wrap_target_container:I = 0x7f0a078f
+.field public static final trash_wrap_target_container:I = 0x7f0a0767
 
-.field public static final trash_wrap_target_zone:I = 0x7f0a0790
+.field public static final trash_wrap_target_zone:I = 0x7f0a0768
 
-.field public static final uniform:I = 0x7f0a0799
+.field public static final uniform:I = 0x7f0a0771
 
-.field public static final up:I = 0x7f0a079c
+.field public static final up:I = 0x7f0a0774
 
-.field public static final wrap_content:I = 0x7f0a0881
+.field public static final wrap_content:I = 0x7f0a0846
 
 
 # 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 fb09f3d876..1361e7af5a 100644
--- a/com.discord/smali/com/discord/overlay/R$e.smali
+++ b/com.discord/smali/com/discord/overlay/R$e.smali
@@ -91,9 +91,9 @@
 
 .field public static final select_dialog_singlechoice_material:I = 0x7f0d005a
 
-.field public static final support_simple_spinner_dropdown_item:I = 0x7f0d0062
+.field public static final support_simple_spinner_dropdown_item:I = 0x7f0d0061
 
-.field public static final trash_wrap:I = 0x7f0d0063
+.field public static final trash_wrap:I = 0x7f0d0062
 
 
 # direct methods
diff --git a/com.discord/smali/com/discord/overlay/b.smali b/com.discord/smali/com/discord/overlay/b.smali
index 74602983de..4fb0a72df0 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 ys:Lcom/discord/overlay/b;
+.field public static final yu: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;->ys:Lcom/discord/overlay/b;
+    sput-object v0, Lcom/discord/overlay/b;->yu:Lcom/discord/overlay/b;
 
     return-void
 .end method
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 72a2aa3f39..36d65d07b0 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 yG:Lcom/discord/overlay/views/OverlayBubbleWrap;
+.field final synthetic yI: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;->yG:Lcom/discord/overlay/views/OverlayBubbleWrap;
+    iput-object p3, p0, Lcom/discord/overlay/views/OverlayBubbleWrap$a;->yI: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;->yG:Lcom/discord/overlay/views/OverlayBubbleWrap;
+    iget-object p2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap$a;->yI: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;->yG:Lcom/discord/overlay/views/OverlayBubbleWrap;
+    iget-object p2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap$a;->yI: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;->yG:Lcom/discord/overlay/views/OverlayBubbleWrap;
+    iget-object p2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap$a;->yI: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;->yG:Lcom/discord/overlay/views/OverlayBubbleWrap;
+    iget-object p2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap$a;->yI: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;->yG:Lcom/discord/overlay/views/OverlayBubbleWrap;
+    iget-object p2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap$a;->yI: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 8b489af83d..938247b8e9 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 yG:Lcom/discord/overlay/views/OverlayBubbleWrap;
+.field final synthetic yI: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;->yG:Lcom/discord/overlay/views/OverlayBubbleWrap;
+    iput-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap$b;->yI: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;->yG:Lcom/discord/overlay/views/OverlayBubbleWrap;
+    iget-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap$b;->yI: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 5024673abd..67b285c8b5 100644
--- a/com.discord/smali/com/discord/overlay/views/OverlayBubbleWrap.smali
+++ b/com.discord/smali/com/discord/overlay/views/OverlayBubbleWrap.smali
@@ -8,31 +8,7 @@
 
 
 # instance fields
-.field private yA:I
-
-.field private yB:I
-
-.field private final yC:Landroidx/dynamicanimation/animation/SpringAnimation;
-
-.field private final yD:Landroidx/dynamicanimation/animation/SpringAnimation;
-
-.field public yE:Landroid/graphics/Point;
-
-.field public yF:Landroid/graphics/Point;
-
-.field private final yi:Landroid/view/WindowManager;
-
-.field private yt:Landroid/view/WindowManager$LayoutParams;
-
-.field private final yu:Landroid/graphics/Rect;
-
-.field private final yv:I
-
-.field private final yw:Landroid/graphics/Rect;
-
-.field private final yx:Lkotlin/properties/ReadWriteProperty;
-
-.field private yy:Lkotlin/jvm/functions/Function1;
+.field private yA:Lkotlin/jvm/functions/Function1;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/jvm/functions/Function1<",
@@ -44,7 +20,31 @@
     .end annotation
 .end field
 
-.field private final yz:[I
+.field private final yB:[I
+
+.field private yC:I
+
+.field private yD:I
+
+.field private final yE:Landroidx/dynamicanimation/animation/SpringAnimation;
+
+.field private final yF:Landroidx/dynamicanimation/animation/SpringAnimation;
+
+.field public yG:Landroid/graphics/Point;
+
+.field public yH:Landroid/graphics/Point;
+
+.field private final yk:Landroid/view/WindowManager;
+
+.field private yv:Landroid/view/WindowManager$LayoutParams;
+
+.field private final yw:Landroid/graphics/Rect;
+
+.field private final yx:I
+
+.field private final yy:Landroid/graphics/Rect;
+
+.field private final yz:Lkotlin/properties/ReadWriteProperty;
 
 
 # direct methods
@@ -107,9 +107,9 @@
 
     check-cast p1, Landroid/view/WindowManager;
 
-    iput-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yi:Landroid/view/WindowManager;
+    iput-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yk:Landroid/view/WindowManager;
 
-    sget-object p1, Lcom/discord/overlay/b;->ys:Lcom/discord/overlay/b;
+    sget-object p1, Lcom/discord/overlay/b;->yu:Lcom/discord/overlay/b;
 
     invoke-static {}, Lcom/discord/overlay/b;->er()Landroid/view/WindowManager$LayoutParams;
 
@@ -119,13 +119,13 @@
 
     iput v0, p1, Landroid/view/WindowManager$LayoutParams;->gravity:I
 
-    iput-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yt:Landroid/view/WindowManager$LayoutParams;
+    iput-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yv: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;->yu:Landroid/graphics/Rect;
+    iput-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yw: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;->yv:I
+    iput p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yx: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;->yi:Landroid/view/WindowManager;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yk: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;->yw:Landroid/graphics/Rect;
+    iput-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yy:Landroid/graphics/Rect;
 
-    sget-object p1, Lkotlin/properties/a;->bhP:Lkotlin/properties/a;
+    sget-object p1, Lkotlin/properties/a;->bhK: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;->yx:Lkotlin/properties/ReadWriteProperty;
+    iput-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yz:Lkotlin/properties/ReadWriteProperty;
 
     const/4 p1, 0x2
 
     new-array p1, p1, [I
 
-    iput-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yz:[I
+    iput-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yB:[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;->yC:Landroidx/dynamicanimation/animation/SpringAnimation;
+    iput-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yE: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;->yD:Landroidx/dynamicanimation/animation/SpringAnimation;
+    iput-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yF:Landroidx/dynamicanimation/animation/SpringAnimation;
 
     new-instance p1, Landroid/graphics/Point;
 
-    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yt:Landroid/view/WindowManager$LayoutParams;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yv:Landroid/view/WindowManager$LayoutParams;
 
     iget v0, v0, Landroid/view/WindowManager$LayoutParams;->x:I
 
-    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yt:Landroid/view/WindowManager$LayoutParams;
+    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yv: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;->yE:Landroid/graphics/Point;
+    iput-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yG:Landroid/graphics/Point;
 
     return-void
 
@@ -307,9 +307,9 @@
 
     move-result p1
 
-    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yC:Landroidx/dynamicanimation/animation/SpringAnimation;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yE:Landroidx/dynamicanimation/animation/SpringAnimation;
 
-    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yt:Landroid/view/WindowManager$LayoutParams;
+    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yv: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;->yD:Landroidx/dynamicanimation/animation/SpringAnimation;
+    iget-object p2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yF:Landroidx/dynamicanimation/animation/SpringAnimation;
 
-    iget-object p3, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yt:Landroid/view/WindowManager$LayoutParams;
+    iget-object p3, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yv: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;->yw:Landroid/graphics/Rect;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yy:Landroid/graphics/Rect;
 
     iget v1, p1, Landroid/graphics/Rect;->left:I
 
-    iget-object v2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yu:Landroid/graphics/Rect;
+    iget-object v2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yw: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;->yu:Landroid/graphics/Rect;
+    iget-object v2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yw: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;->yu:Landroid/graphics/Rect;
+    iget-object v2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yw: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;->yu:Landroid/graphics/Rect;
+    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yw:Landroid/graphics/Rect;
 
     iget v1, v1, Landroid/graphics/Rect;->bottom:I
 
@@ -419,7 +419,7 @@
 .method public static synthetic a(Lcom/discord/overlay/views/OverlayBubbleWrap;II)V
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yw:Landroid/graphics/Rect;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yy:Landroid/graphics/Rect;
 
     invoke-direct {p0, p1, p2, v0}, Lcom/discord/overlay/views/OverlayBubbleWrap;->a(IILandroid/graphics/Rect;)V
 
@@ -429,17 +429,17 @@
 .method private final et()V
     .locals 4
 
-    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yz:[I
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yB:[I
 
     invoke-virtual {p0, v0}, Lcom/discord/overlay/views/OverlayBubbleWrap;->getLocationOnScreen([I)V
 
-    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yz:[I
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yB:[I
 
     const/4 v1, 0x0
 
     aget v2, v0, v1
 
-    iget-object v3, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yt:Landroid/view/WindowManager$LayoutParams;
+    iget-object v3, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yv: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;->yz:[I
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yB:[I
 
     const/4 v1, 0x1
 
     aget v2, v0, v1
 
-    iget-object v3, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yt:Landroid/view/WindowManager$LayoutParams;
+    iget-object v3, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yv:Landroid/view/WindowManager$LayoutParams;
 
     iget v3, v3, Landroid/view/WindowManager$LayoutParams;->y:I
 
@@ -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;->ys:Lcom/discord/overlay/b;
+    sget-object v0, Lcom/discord/overlay/b;->yu: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;->yz:[I
+    iget-object v4, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yB:[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;->yi:Landroid/view/WindowManager;
+    iget-object v2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yk: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;->yE:Landroid/graphics/Point;
+    iget-object v2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yG:Landroid/graphics/Point;
 
     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -624,9 +624,9 @@
 
     if-nez v0, :cond_2
 
-    iget v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yA:I
+    iget v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yC:I
 
-    iget-object v3, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yt:Landroid/view/WindowManager$LayoutParams;
+    iget-object v3, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yv: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;->yv:I
+    iget v3, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yx: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;->yE:Landroid/graphics/Point;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yG: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;->yA:I
+    iget v2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yC:I
 
     sub-int/2addr v1, v2
 
     iput v1, v0, Landroid/graphics/Point;->x:I
 
-    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yE:Landroid/graphics/Point;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yG: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;->yB:I
+    iget v2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yD:I
 
     sub-int/2addr v1, v2
 
@@ -696,29 +696,29 @@
 
     if-eqz v1, :cond_5
 
-    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yF:Landroid/graphics/Point;
+    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yH:Landroid/graphics/Point;
 
     if-nez v1, :cond_5
 
-    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yt:Landroid/view/WindowManager$LayoutParams;
+    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yv:Landroid/view/WindowManager$LayoutParams;
 
-    iget-object v2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yE:Landroid/graphics/Point;
+    iget-object v2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yG: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;->yt:Landroid/view/WindowManager$LayoutParams;
+    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yv:Landroid/view/WindowManager$LayoutParams;
 
-    iget-object v2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yE:Landroid/graphics/Point;
+    iget-object v2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yG: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;->yi:Landroid/view/WindowManager;
+    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yk:Landroid/view/WindowManager;
 
-    iget-object v2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yt:Landroid/view/WindowManager$LayoutParams;
+    iget-object v2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yv:Landroid/view/WindowManager$LayoutParams;
 
     check-cast v2, Landroid/view/ViewGroup$LayoutParams;
 
@@ -744,13 +744,13 @@
 
     float-to-int v0, v0
 
-    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yt:Landroid/view/WindowManager$LayoutParams;
+    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yv: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;->yA:I
+    iput v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yC: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;->yt:Landroid/view/WindowManager$LayoutParams;
+    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yv: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;->yB:I
+    iput v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yD:I
 
     :cond_5
     :goto_0
@@ -778,7 +778,7 @@
 .method public es()Z
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yx:Lkotlin/properties/ReadWriteProperty;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yz: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;->yw:Landroid/graphics/Rect;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yy: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;->yt:Landroid/view/WindowManager$LayoutParams;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yv: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;->yt:Landroid/view/WindowManager$LayoutParams;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yv: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;->yu:Landroid/graphics/Rect;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yw: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;->yv:I
+    iget v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yx:I
 
     return v0
 .end method
@@ -871,7 +871,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yy:Lkotlin/jvm/functions/Function1;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yA: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;->yz:[I
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yB:[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;->yC:Landroidx/dynamicanimation/animation/SpringAnimation;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yE: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;->yD:Landroidx/dynamicanimation/animation/SpringAnimation;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yF: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;->yt:Landroid/view/WindowManager$LayoutParams;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yv: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;->yi:Landroid/view/WindowManager;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yk: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;->yt:Landroid/view/WindowManager$LayoutParams;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yv: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;->yt:Landroid/view/WindowManager$LayoutParams;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yv: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;->yF:Landroid/graphics/Point;
+    iget-object v2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yH: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;->yE:Landroid/graphics/Point;
+    iget-object v2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yG: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;->yF:Landroid/graphics/Point;
+    iput-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yH:Landroid/graphics/Point;
 
-    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yC:Landroidx/dynamicanimation/animation/SpringAnimation;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yE:Landroidx/dynamicanimation/animation/SpringAnimation;
 
     invoke-virtual {v0}, Landroidx/dynamicanimation/animation/SpringAnimation;->cancel()V
 
-    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yD:Landroidx/dynamicanimation/animation/SpringAnimation;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yF: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;->yE:Landroid/graphics/Point;
+    iget-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yG:Landroid/graphics/Point;
 
     iget p1, p1, Landroid/graphics/Point;->x:I
 
-    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yE:Landroid/graphics/Point;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yG: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;->yt:Landroid/view/WindowManager$LayoutParams;
+    iget-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yv:Landroid/view/WindowManager$LayoutParams;
 
-    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yE:Landroid/graphics/Point;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yG: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;->yt:Landroid/view/WindowManager$LayoutParams;
+    iget-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yv:Landroid/view/WindowManager$LayoutParams;
 
-    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yE:Landroid/graphics/Point;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yG: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;->yi:Landroid/view/WindowManager;
+    iget-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yk:Landroid/view/WindowManager;
 
     move-object v0, p0
 
     check-cast v0, Landroid/view/View;
 
-    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yt:Landroid/view/WindowManager$LayoutParams;
+    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yv: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;->yi:Landroid/view/WindowManager;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yk: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;->yw:Landroid/graphics/Rect;
+    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yy:Landroid/graphics/Rect;
 
     invoke-virtual {v0, v1}, Landroid/view/Display;->getRectSize(Landroid/graphics/Rect;)V
 
-    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yw:Landroid/graphics/Rect;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yy: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;->yi:Landroid/view/WindowManager;
+    iget-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yk: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;->yw:Landroid/graphics/Rect;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yy:Landroid/graphics/Rect;
 
     invoke-virtual {p1, v0}, Landroid/view/Display;->getRectSize(Landroid/graphics/Rect;)V
 
-    iget-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yw:Landroid/graphics/Rect;
+    iget-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yy: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;->yi:Landroid/view/WindowManager;
+    iget-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yk:Landroid/view/WindowManager;
 
     move-object v0, p0
 
     check-cast v0, Landroid/view/View;
 
-    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yt:Landroid/view/WindowManager$LayoutParams;
+    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yv:Landroid/view/WindowManager$LayoutParams;
 
     check-cast v1, Landroid/view/ViewGroup$LayoutParams;
 
@@ -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;->yE:Landroid/graphics/Point;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yG: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;->yE:Landroid/graphics/Point;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yG: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;->yF:Landroid/graphics/Point;
+    iput-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yH: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;->yE:Landroid/graphics/Point;
+    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yG: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;->yF:Landroid/graphics/Point;
+    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yH: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;->ys:Lcom/discord/overlay/b;
+    sget-object v0, Lcom/discord/overlay/b;->yu:Lcom/discord/overlay/b;
 
-    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yt:Landroid/view/WindowManager$LayoutParams;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yv: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;->yi:Landroid/view/WindowManager;
+    iget-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yk:Landroid/view/WindowManager;
 
     move-object v0, p0
 
     check-cast v0, Landroid/view/View;
 
-    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yt:Landroid/view/WindowManager$LayoutParams;
+    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yv: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;->yx:Lkotlin/properties/ReadWriteProperty;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yz: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;->yy:Lkotlin/jvm/functions/Function1;
+    iput-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yA: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;->yt:Landroid/view/WindowManager$LayoutParams;
+    iput-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yv: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;->yt:Landroid/view/WindowManager$LayoutParams;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yv: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;->yi:Landroid/view/WindowManager;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yk:Landroid/view/WindowManager;
 
-    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yt:Landroid/view/WindowManager$LayoutParams;
+    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yv: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;->yt:Landroid/view/WindowManager$LayoutParams;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yv: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;->yi:Landroid/view/WindowManager;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yk:Landroid/view/WindowManager;
 
-    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yt:Landroid/view/WindowManager$LayoutParams;
+    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yv: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 eee9bb1811..ac5b750f47 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;->ys:Lcom/discord/overlay/b;
+    sget-object v0, Lcom/discord/overlay/b;->yu:Lcom/discord/overlay/b;
 
     const/4 v0, 0x2
 
diff --git a/com.discord/smali/com/discord/overlay/views/a$a.smali b/com.discord/smali/com/discord/overlay/views/a$a.smali
index 1d3abc98df..b3e54ae820 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 yP:Lcom/discord/overlay/views/a;
+.field final synthetic yR: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;->yP:Lcom/discord/overlay/views/a;
+    iput-object p1, p0, Lcom/discord/overlay/views/a$a;->yR: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;->yP:Lcom/discord/overlay/views/a;
+    iget-object p1, p0, Lcom/discord/overlay/views/a$a;->yR: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 5aa1d4db51..dd341b0e8d 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 yP:Lcom/discord/overlay/views/a;
+.field final synthetic yR: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;->yP:Lcom/discord/overlay/views/a;
+    iput-object p1, p0, Lcom/discord/overlay/views/a$b;->yR: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;->yP:Lcom/discord/overlay/views/a;
+    iget-object p1, p0, Lcom/discord/overlay/views/a$b;->yR: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 f2566b3e9b..7d8fbd92f4 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 yH:Landroid/view/View;
+.field private final yJ:Landroid/view/View;
 
-.field private final yI:Landroid/view/View;
+.field private final yK:Landroid/view/View;
 
-.field private final yJ:Landroid/widget/ImageView;
+.field private final yL:Landroid/widget/ImageView;
 
-.field public final yK:Landroid/animation/Animator;
+.field public final yM:Landroid/animation/Animator;
 
-.field public final yL:Landroid/animation/Animator;
+.field public final yN:Landroid/animation/Animator;
 
-.field public final yM:Landroid/graphics/Rect;
+.field public final yO:Landroid/graphics/Rect;
 
-.field private final yN:[I
+.field private final yP:[I
 
-.field private yO:Lcom/discord/overlay/views/OverlayBubbleWrap;
+.field private yQ:Lcom/discord/overlay/views/OverlayBubbleWrap;
 
-.field private yt:Landroid/view/WindowManager$LayoutParams;
+.field private yv:Landroid/view/WindowManager$LayoutParams;
 
 
 # direct methods
@@ -36,7 +36,7 @@
 
     invoke-direct {p0, p1}, Landroid/widget/FrameLayout;-><init>(Landroid/content/Context;)V
 
-    sget-object p1, Lcom/discord/overlay/b;->ys:Lcom/discord/overlay/b;
+    sget-object p1, Lcom/discord/overlay/b;->yu:Lcom/discord/overlay/b;
 
     invoke-static {}, Lcom/discord/overlay/b;->er()Landroid/view/WindowManager$LayoutParams;
 
@@ -50,13 +50,13 @@
 
     iput v0, p1, Landroid/view/WindowManager$LayoutParams;->gravity:I
 
-    sget-object v0, Lcom/discord/overlay/b;->ys:Lcom/discord/overlay/b;
+    sget-object v0, Lcom/discord/overlay/b;->yu: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;->yt:Landroid/view/WindowManager$LayoutParams;
+    iput-object p1, p0, Lcom/discord/overlay/views/a;->yv: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;->yH:Landroid/view/View;
+    iput-object p1, p0, Lcom/discord/overlay/views/a;->yJ: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;->yI:Landroid/view/View;
+    iput-object p1, p0, Lcom/discord/overlay/views/a;->yK: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;->yJ:Landroid/widget/ImageView;
+    iput-object p1, p0, Lcom/discord/overlay/views/a;->yL: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;->yH:Landroid/view/View;
+    iget-object v4, p0, Lcom/discord/overlay/views/a;->yJ: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;->yK:Landroid/animation/Animator;
+    iput-object p1, p0, Lcom/discord/overlay/views/a;->yM: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;->yH:Landroid/view/View;
+    iget-object v3, p0, Lcom/discord/overlay/views/a;->yJ: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;->yL:Landroid/animation/Animator;
+    iput-object p1, p0, Lcom/discord/overlay/views/a;->yN: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;->yM:Landroid/graphics/Rect;
+    iput-object p1, p0, Lcom/discord/overlay/views/a;->yO:Landroid/graphics/Rect;
 
     new-array p1, v0, [I
 
     fill-array-data p1, :array_0
 
-    iput-object p1, p0, Lcom/discord/overlay/views/a;->yN:[I
+    iput-object p1, p0, Lcom/discord/overlay/views/a;->yP:[I
 
     return-void
 
@@ -268,7 +268,7 @@
 
     if-eqz p1, :cond_0
 
-    iget-object v4, p0, Lcom/discord/overlay/views/a;->yI:Landroid/view/View;
+    iget-object v4, p0, Lcom/discord/overlay/views/a;->yK: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;->yI:Landroid/view/View;
+    iget-object v5, p0, Lcom/discord/overlay/views/a;->yK: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;->yI:Landroid/view/View;
+    iget-object v5, p0, Lcom/discord/overlay/views/a;->yK: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;->yI:Landroid/view/View;
+    iget-object v5, p0, Lcom/discord/overlay/views/a;->yK:Landroid/view/View;
 
     invoke-virtual {v5}, Landroid/view/View;->getScaleX()F
 
     move-result v7
 
-    iget-object v5, p0, Lcom/discord/overlay/views/a;->yI:Landroid/view/View;
+    iget-object v5, p0, Lcom/discord/overlay/views/a;->yK:Landroid/view/View;
 
     invoke-virtual {v5}, Landroid/view/View;->getScaleY()F
 
     move-result v9
 
-    iget-object v5, p0, Lcom/discord/overlay/views/a;->yI:Landroid/view/View;
+    iget-object v5, p0, Lcom/discord/overlay/views/a;->yK:Landroid/view/View;
 
     invoke-virtual {v5}, Landroid/view/View;->getPivotX()F
 
     move-result v11
 
-    iget-object v5, p0, Lcom/discord/overlay/views/a;->yI:Landroid/view/View;
+    iget-object v5, p0, Lcom/discord/overlay/views/a;->yK: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;->yI:Landroid/view/View;
+    iget-object v0, p0, Lcom/discord/overlay/views/a;->yK: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;->yI:Landroid/view/View;
+    iget-object v4, p0, Lcom/discord/overlay/views/a;->yK: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;->yI:Landroid/view/View;
+    iget-object v5, p0, Lcom/discord/overlay/views/a;->yK:Landroid/view/View;
 
     invoke-virtual {v5}, Landroid/view/View;->getScaleX()F
 
     move-result v5
 
-    iget-object v6, p0, Lcom/discord/overlay/views/a;->yI:Landroid/view/View;
+    iget-object v6, p0, Lcom/discord/overlay/views/a;->yK: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;->yI:Landroid/view/View;
+    iget-object v0, p0, Lcom/discord/overlay/views/a;->yK: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;->yO:Lcom/discord/overlay/views/OverlayBubbleWrap;
+    iget-object v0, p0, Lcom/discord/overlay/views/a;->yQ: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;->yJ:Landroid/widget/ImageView;
+    iget-object v0, p0, Lcom/discord/overlay/views/a;->yL: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;->yO:Lcom/discord/overlay/views/OverlayBubbleWrap;
+    iget-object v0, p0, Lcom/discord/overlay/views/a;->yQ: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;->yO:Lcom/discord/overlay/views/OverlayBubbleWrap;
+    iput-object p1, p0, Lcom/discord/overlay/views/a;->yQ: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;->yL:Landroid/animation/Animator;
+    iget-object v0, p0, Lcom/discord/overlay/views/a;->yN: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;->yK:Landroid/animation/Animator;
+    iget-object v0, p0, Lcom/discord/overlay/views/a;->yM: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;->yt:Landroid/view/WindowManager$LayoutParams;
+    iget-object v0, p0, Lcom/discord/overlay/views/a;->yv: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;->yH:Landroid/view/View;
+    iget-object p1, p0, Lcom/discord/overlay/views/a;->yJ:Landroid/view/View;
 
-    iget-object p2, p0, Lcom/discord/overlay/views/a;->yN:[I
+    iget-object p2, p0, Lcom/discord/overlay/views/a;->yP:[I
 
     invoke-virtual {p1, p2}, Landroid/view/View;->getLocationOnScreen([I)V
 
-    iget-object p1, p0, Lcom/discord/overlay/views/a;->yN:[I
+    iget-object p1, p0, Lcom/discord/overlay/views/a;->yP:[I
 
     const/4 p2, 0x0
 
@@ -496,9 +496,9 @@
 
     aget p1, p1, p3
 
-    iget-object p3, p0, Lcom/discord/overlay/views/a;->yM:Landroid/graphics/Rect;
+    iget-object p3, p0, Lcom/discord/overlay/views/a;->yO:Landroid/graphics/Rect;
 
-    iget-object p4, p0, Lcom/discord/overlay/views/a;->yH:Landroid/view/View;
+    iget-object p4, p0, Lcom/discord/overlay/views/a;->yJ: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;->yH:Landroid/view/View;
+    iget-object p5, p0, Lcom/discord/overlay/views/a;->yJ: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;->yt:Landroid/view/WindowManager$LayoutParams;
+    iput-object p1, p0, Lcom/discord/overlay/views/a;->yv: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 3d9b8fd31a..a8ce5b1918 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;->Fx()Lokhttp3/w;
+    invoke-interface {p1}, Lokhttp3/Interceptor$Chain;->Fv()Lokhttp3/w;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokhttp3/w;->FK()Ljava/lang/String;
+    invoke-virtual {v0}, Lokhttp3/w;->FI()Ljava/lang/String;
 
     move-result-object v1
 
-    invoke-virtual {v0}, Lokhttp3/w;->FJ()Lokhttp3/s;
+    invoke-virtual {v0}, Lokhttp3/w;->FH()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;->Fx()Lokhttp3/w;
+    invoke-interface {p1}, Lokhttp3/Interceptor$Chain;->Fv()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 29c706481e..093de3566d 100644
--- a/com.discord/smali/com/discord/restapi/R$attr.smali
+++ b/com.discord/smali/com/discord/restapi/R$attr.smali
@@ -673,415 +673,415 @@
 
 .field public static final layout_wrapBefore:I = 0x7f040254
 
-.field public static final liftOnScroll:I = 0x7f040259
+.field public static final liftOnScroll:I = 0x7f040258
 
-.field public static final lineHeight:I = 0x7f04025a
+.field public static final lineHeight:I = 0x7f040259
 
-.field public static final lineSpacing:I = 0x7f04025b
+.field public static final lineSpacing:I = 0x7f04025a
 
-.field public static final listChoiceBackgroundIndicator:I = 0x7f04025c
+.field public static final listChoiceBackgroundIndicator:I = 0x7f04025b
 
-.field public static final listDividerAlertDialog:I = 0x7f04025d
+.field public static final listDividerAlertDialog:I = 0x7f04025c
 
-.field public static final listItemLayout:I = 0x7f04025e
+.field public static final listItemLayout:I = 0x7f04025d
 
-.field public static final listLayout:I = 0x7f04025f
+.field public static final listLayout:I = 0x7f04025e
 
-.field public static final listMenuViewStyle:I = 0x7f040260
+.field public static final listMenuViewStyle:I = 0x7f04025f
 
-.field public static final listPopupWindowStyle:I = 0x7f040261
+.field public static final listPopupWindowStyle:I = 0x7f040260
 
-.field public static final listPreferredItemHeight:I = 0x7f040262
+.field public static final listPreferredItemHeight:I = 0x7f040261
 
-.field public static final listPreferredItemHeightLarge:I = 0x7f040263
+.field public static final listPreferredItemHeightLarge:I = 0x7f040262
 
-.field public static final listPreferredItemHeightSmall:I = 0x7f040264
+.field public static final listPreferredItemHeightSmall:I = 0x7f040263
 
-.field public static final listPreferredItemPaddingLeft:I = 0x7f040265
+.field public static final listPreferredItemPaddingLeft:I = 0x7f040264
 
-.field public static final listPreferredItemPaddingRight:I = 0x7f040266
+.field public static final listPreferredItemPaddingRight:I = 0x7f040265
 
-.field public static final logo:I = 0x7f040267
+.field public static final logo:I = 0x7f040266
 
-.field public static final logoDescription:I = 0x7f040268
+.field public static final logoDescription:I = 0x7f040267
 
-.field public static final materialButtonStyle:I = 0x7f040278
+.field public static final materialButtonStyle:I = 0x7f040277
 
-.field public static final materialCardViewStyle:I = 0x7f040279
+.field public static final materialCardViewStyle:I = 0x7f040278
 
-.field public static final maxActionInlineWidth:I = 0x7f04027a
+.field public static final maxActionInlineWidth:I = 0x7f040279
 
-.field public static final maxButtonHeight:I = 0x7f04027b
+.field public static final maxButtonHeight:I = 0x7f04027a
 
-.field public static final maxImageSize:I = 0x7f04027c
+.field public static final maxImageSize:I = 0x7f04027b
 
-.field public static final max_height:I = 0x7f04027d
+.field public static final max_height:I = 0x7f04027c
 
-.field public static final measureWithLargestChild:I = 0x7f04027e
+.field public static final measureWithLargestChild:I = 0x7f04027d
 
-.field public static final menu:I = 0x7f04027f
+.field public static final menu:I = 0x7f04027e
 
-.field public static final multiChoiceItemLayout:I = 0x7f040280
+.field public static final multiChoiceItemLayout:I = 0x7f04027f
 
-.field public static final navigationContentDescription:I = 0x7f040281
+.field public static final navigationContentDescription:I = 0x7f040280
 
-.field public static final navigationIcon:I = 0x7f040282
+.field public static final navigationIcon:I = 0x7f040281
 
-.field public static final navigationMode:I = 0x7f040283
+.field public static final navigationMode:I = 0x7f040282
 
-.field public static final navigationViewStyle:I = 0x7f040284
+.field public static final navigationViewStyle:I = 0x7f040283
 
-.field public static final numericModifiers:I = 0x7f040287
+.field public static final numericModifiers:I = 0x7f040286
 
-.field public static final overlapAnchor:I = 0x7f040288
+.field public static final overlapAnchor:I = 0x7f040287
 
-.field public static final overlayImage:I = 0x7f040289
+.field public static final overlayImage:I = 0x7f040288
 
-.field public static final paddingBottomNoButtons:I = 0x7f04028c
+.field public static final paddingBottomNoButtons:I = 0x7f04028b
 
-.field public static final paddingEnd:I = 0x7f04028d
+.field public static final paddingEnd:I = 0x7f04028c
 
-.field public static final paddingStart:I = 0x7f04028e
+.field public static final paddingStart:I = 0x7f04028d
 
-.field public static final paddingTopNoTitle:I = 0x7f04028f
+.field public static final paddingTopNoTitle:I = 0x7f04028e
 
-.field public static final panelBackground:I = 0x7f040290
+.field public static final panelBackground:I = 0x7f04028f
 
-.field public static final panelMenuListTheme:I = 0x7f040291
+.field public static final panelMenuListTheme:I = 0x7f040290
 
-.field public static final panelMenuListWidth:I = 0x7f040292
+.field public static final panelMenuListWidth:I = 0x7f040291
 
-.field public static final passwordToggleContentDescription:I = 0x7f040293
+.field public static final passwordToggleContentDescription:I = 0x7f040292
 
-.field public static final passwordToggleDrawable:I = 0x7f040294
+.field public static final passwordToggleDrawable:I = 0x7f040293
 
-.field public static final passwordToggleEnabled:I = 0x7f040295
+.field public static final passwordToggleEnabled:I = 0x7f040294
 
-.field public static final passwordToggleTint:I = 0x7f040296
+.field public static final passwordToggleTint:I = 0x7f040295
 
-.field public static final passwordToggleTintMode:I = 0x7f040297
+.field public static final passwordToggleTintMode:I = 0x7f040296
 
-.field public static final placeholderImage:I = 0x7f040298
+.field public static final placeholderImage:I = 0x7f040297
 
-.field public static final placeholderImageScaleType:I = 0x7f040299
+.field public static final placeholderImageScaleType:I = 0x7f040298
 
-.field public static final popupMenuStyle:I = 0x7f04029a
+.field public static final popupMenuStyle:I = 0x7f040299
 
-.field public static final popupTheme:I = 0x7f04029b
+.field public static final popupTheme:I = 0x7f04029a
 
-.field public static final popupWindowStyle:I = 0x7f04029c
+.field public static final popupWindowStyle:I = 0x7f04029b
 
-.field public static final preserveIconSpacing:I = 0x7f04029d
+.field public static final preserveIconSpacing:I = 0x7f04029c
 
-.field public static final pressedStateOverlayImage:I = 0x7f04029e
+.field public static final pressedStateOverlayImage:I = 0x7f04029d
 
-.field public static final pressedTranslationZ:I = 0x7f04029f
+.field public static final pressedTranslationZ:I = 0x7f04029e
 
-.field public static final progressBarAutoRotateInterval:I = 0x7f0402c6
+.field public static final progressBarAutoRotateInterval:I = 0x7f0402c5
 
-.field public static final progressBarImage:I = 0x7f0402c7
+.field public static final progressBarImage:I = 0x7f0402c6
 
-.field public static final progressBarImageScaleType:I = 0x7f0402c8
+.field public static final progressBarImageScaleType:I = 0x7f0402c7
 
-.field public static final progressBarPadding:I = 0x7f0402c9
+.field public static final progressBarPadding:I = 0x7f0402c8
 
-.field public static final progressBarStyle:I = 0x7f0402ca
+.field public static final progressBarStyle:I = 0x7f0402c9
 
-.field public static final queryBackground:I = 0x7f0402cd
+.field public static final queryBackground:I = 0x7f0402cc
 
-.field public static final queryHint:I = 0x7f0402ce
+.field public static final queryHint:I = 0x7f0402cd
 
-.field public static final radioButtonStyle:I = 0x7f0402cf
+.field public static final radioButtonStyle:I = 0x7f0402ce
 
-.field public static final ratingBarStyle:I = 0x7f0402d2
+.field public static final ratingBarStyle:I = 0x7f0402d1
 
-.field public static final ratingBarStyleIndicator:I = 0x7f0402d3
+.field public static final ratingBarStyleIndicator:I = 0x7f0402d2
 
-.field public static final ratingBarStyleSmall:I = 0x7f0402d4
+.field public static final ratingBarStyleSmall:I = 0x7f0402d3
 
-.field public static final retryImage:I = 0x7f0402d5
+.field public static final retryImage:I = 0x7f0402d4
 
-.field public static final retryImageScaleType:I = 0x7f0402d6
+.field public static final retryImageScaleType:I = 0x7f0402d5
 
-.field public static final reverseLayout:I = 0x7f0402d7
+.field public static final reverseLayout:I = 0x7f0402d6
 
-.field public static final rippleColor:I = 0x7f0402d8
+.field public static final rippleColor:I = 0x7f0402d7
 
-.field public static final roundAsCircle:I = 0x7f0402d9
+.field public static final roundAsCircle:I = 0x7f0402d8
 
-.field public static final roundBottomEnd:I = 0x7f0402da
+.field public static final roundBottomEnd:I = 0x7f0402d9
 
-.field public static final roundBottomLeft:I = 0x7f0402db
+.field public static final roundBottomLeft:I = 0x7f0402da
 
-.field public static final roundBottomRight:I = 0x7f0402dc
+.field public static final roundBottomRight:I = 0x7f0402db
 
-.field public static final roundBottomStart:I = 0x7f0402dd
+.field public static final roundBottomStart:I = 0x7f0402dc
 
-.field public static final roundTopEnd:I = 0x7f0402de
+.field public static final roundTopEnd:I = 0x7f0402dd
 
-.field public static final roundTopLeft:I = 0x7f0402df
+.field public static final roundTopLeft:I = 0x7f0402de
 
-.field public static final roundTopRight:I = 0x7f0402e0
+.field public static final roundTopRight:I = 0x7f0402df
 
-.field public static final roundTopStart:I = 0x7f0402e1
+.field public static final roundTopStart:I = 0x7f0402e0
 
-.field public static final roundWithOverlayColor:I = 0x7f0402e2
+.field public static final roundWithOverlayColor:I = 0x7f0402e1
 
-.field public static final roundedCornerRadius:I = 0x7f0402e3
+.field public static final roundedCornerRadius:I = 0x7f0402e2
 
-.field public static final roundingBorderColor:I = 0x7f0402e4
+.field public static final roundingBorderColor:I = 0x7f0402e3
 
-.field public static final roundingBorderPadding:I = 0x7f0402e5
+.field public static final roundingBorderPadding:I = 0x7f0402e4
 
-.field public static final roundingBorderWidth:I = 0x7f0402e6
+.field public static final roundingBorderWidth:I = 0x7f0402e5
 
-.field public static final scopeUris:I = 0x7f0402f5
+.field public static final scopeUris:I = 0x7f0402f4
 
-.field public static final scrimAnimationDuration:I = 0x7f0402f6
+.field public static final scrimAnimationDuration:I = 0x7f0402f5
 
-.field public static final scrimBackground:I = 0x7f0402f7
+.field public static final scrimBackground:I = 0x7f0402f6
 
-.field public static final scrimVisibleHeightTrigger:I = 0x7f0402f8
+.field public static final scrimVisibleHeightTrigger:I = 0x7f0402f7
 
-.field public static final searchHintIcon:I = 0x7f0402f9
+.field public static final searchHintIcon:I = 0x7f0402f8
 
-.field public static final searchIcon:I = 0x7f0402fa
+.field public static final searchIcon:I = 0x7f0402f9
 
-.field public static final searchViewStyle:I = 0x7f0402fb
+.field public static final searchViewStyle:I = 0x7f0402fa
 
-.field public static final seekBarStyle:I = 0x7f0402fd
+.field public static final seekBarStyle:I = 0x7f0402fc
 
-.field public static final selectableItemBackground:I = 0x7f0402fe
+.field public static final selectableItemBackground:I = 0x7f0402fd
 
-.field public static final selectableItemBackgroundBorderless:I = 0x7f0402ff
+.field public static final selectableItemBackgroundBorderless:I = 0x7f0402fe
 
-.field public static final showAsAction:I = 0x7f040301
+.field public static final showAsAction:I = 0x7f040300
 
-.field public static final showDivider:I = 0x7f040302
+.field public static final showDivider:I = 0x7f040301
 
-.field public static final showDividerHorizontal:I = 0x7f040303
+.field public static final showDividerHorizontal:I = 0x7f040302
 
-.field public static final showDividerVertical:I = 0x7f040304
+.field public static final showDividerVertical:I = 0x7f040303
 
-.field public static final showDividers:I = 0x7f040305
+.field public static final showDividers:I = 0x7f040304
 
-.field public static final showMotionSpec:I = 0x7f040306
+.field public static final showMotionSpec:I = 0x7f040305
 
-.field public static final showText:I = 0x7f040307
+.field public static final showText:I = 0x7f040306
 
-.field public static final showTitle:I = 0x7f040308
+.field public static final showTitle:I = 0x7f040307
 
-.field public static final singleChoiceItemLayout:I = 0x7f040309
+.field public static final singleChoiceItemLayout:I = 0x7f040308
 
-.field public static final singleLine:I = 0x7f04030a
+.field public static final singleLine:I = 0x7f040309
 
-.field public static final singleSelection:I = 0x7f04030b
+.field public static final singleSelection:I = 0x7f04030a
 
-.field public static final snackbarButtonStyle:I = 0x7f04030c
+.field public static final snackbarButtonStyle:I = 0x7f04030b
 
-.field public static final snackbarStyle:I = 0x7f04030d
+.field public static final snackbarStyle:I = 0x7f04030c
 
-.field public static final spanCount:I = 0x7f04030e
+.field public static final spanCount:I = 0x7f04030d
 
-.field public static final spinBars:I = 0x7f04030f
+.field public static final spinBars:I = 0x7f04030e
 
-.field public static final spinnerDropDownItemStyle:I = 0x7f040310
+.field public static final spinnerDropDownItemStyle:I = 0x7f04030f
 
-.field public static final spinnerStyle:I = 0x7f040311
+.field public static final spinnerStyle:I = 0x7f040310
 
-.field public static final splitTrack:I = 0x7f040312
+.field public static final splitTrack:I = 0x7f040311
 
-.field public static final srcCompat:I = 0x7f040313
+.field public static final srcCompat:I = 0x7f040312
 
-.field public static final stackFromEnd:I = 0x7f040314
+.field public static final stackFromEnd:I = 0x7f040313
 
-.field public static final state_above_anchor:I = 0x7f040315
+.field public static final state_above_anchor:I = 0x7f040314
 
-.field public static final state_collapsed:I = 0x7f040316
+.field public static final state_collapsed:I = 0x7f040315
 
-.field public static final state_collapsible:I = 0x7f040317
+.field public static final state_collapsible:I = 0x7f040316
 
-.field public static final state_liftable:I = 0x7f040318
+.field public static final state_liftable:I = 0x7f040317
 
-.field public static final state_lifted:I = 0x7f040319
+.field public static final state_lifted:I = 0x7f040318
 
-.field public static final statusBarBackground:I = 0x7f04031a
+.field public static final statusBarBackground:I = 0x7f040319
 
-.field public static final statusBarScrim:I = 0x7f04031b
+.field public static final statusBarScrim:I = 0x7f04031a
 
-.field public static final strokeColor:I = 0x7f04031f
+.field public static final strokeColor:I = 0x7f04031e
 
-.field public static final strokeWidth:I = 0x7f040320
+.field public static final strokeWidth:I = 0x7f04031f
 
-.field public static final subMenuArrow:I = 0x7f040321
+.field public static final subMenuArrow:I = 0x7f040320
 
-.field public static final submitBackground:I = 0x7f040322
+.field public static final submitBackground:I = 0x7f040321
 
-.field public static final subtitle:I = 0x7f040323
+.field public static final subtitle:I = 0x7f040322
 
-.field public static final subtitleTextAppearance:I = 0x7f040324
+.field public static final subtitleTextAppearance:I = 0x7f040323
 
-.field public static final subtitleTextColor:I = 0x7f040325
+.field public static final subtitleTextColor:I = 0x7f040324
 
-.field public static final subtitleTextStyle:I = 0x7f040326
+.field public static final subtitleTextStyle:I = 0x7f040325
 
-.field public static final suggestionRowLayout:I = 0x7f040327
+.field public static final suggestionRowLayout:I = 0x7f040326
 
-.field public static final switchMinWidth:I = 0x7f040328
+.field public static final switchMinWidth:I = 0x7f040327
 
-.field public static final switchPadding:I = 0x7f040329
+.field public static final switchPadding:I = 0x7f040328
 
-.field public static final switchStyle:I = 0x7f04032a
+.field public static final switchStyle:I = 0x7f040329
 
-.field public static final switchTextAppearance:I = 0x7f04032b
+.field public static final switchTextAppearance:I = 0x7f04032a
 
-.field public static final tabBackground:I = 0x7f04032c
+.field public static final tabBackground:I = 0x7f04032b
 
-.field public static final tabContentStart:I = 0x7f04032d
+.field public static final tabContentStart:I = 0x7f04032c
 
-.field public static final tabGravity:I = 0x7f04032e
+.field public static final tabGravity:I = 0x7f04032d
 
-.field public static final tabIconTint:I = 0x7f04032f
+.field public static final tabIconTint:I = 0x7f04032e
 
-.field public static final tabIconTintMode:I = 0x7f040330
+.field public static final tabIconTintMode:I = 0x7f04032f
 
-.field public static final tabIndicator:I = 0x7f040331
+.field public static final tabIndicator:I = 0x7f040330
 
-.field public static final tabIndicatorAnimationDuration:I = 0x7f040332
+.field public static final tabIndicatorAnimationDuration:I = 0x7f040331
 
-.field public static final tabIndicatorColor:I = 0x7f040333
+.field public static final tabIndicatorColor:I = 0x7f040332
 
-.field public static final tabIndicatorFullWidth:I = 0x7f040334
+.field public static final tabIndicatorFullWidth:I = 0x7f040333
 
-.field public static final tabIndicatorGravity:I = 0x7f040335
+.field public static final tabIndicatorGravity:I = 0x7f040334
 
-.field public static final tabIndicatorHeight:I = 0x7f040336
+.field public static final tabIndicatorHeight:I = 0x7f040335
 
-.field public static final tabInlineLabel:I = 0x7f040337
+.field public static final tabInlineLabel:I = 0x7f040336
 
-.field public static final tabMaxWidth:I = 0x7f040338
+.field public static final tabMaxWidth:I = 0x7f040337
 
-.field public static final tabMinWidth:I = 0x7f040339
+.field public static final tabMinWidth:I = 0x7f040338
 
-.field public static final tabMode:I = 0x7f04033a
+.field public static final tabMode:I = 0x7f040339
 
-.field public static final tabPadding:I = 0x7f04033b
+.field public static final tabPadding:I = 0x7f04033a
 
-.field public static final tabPaddingBottom:I = 0x7f04033c
+.field public static final tabPaddingBottom:I = 0x7f04033b
 
-.field public static final tabPaddingEnd:I = 0x7f04033d
+.field public static final tabPaddingEnd:I = 0x7f04033c
 
-.field public static final tabPaddingStart:I = 0x7f04033e
+.field public static final tabPaddingStart:I = 0x7f04033d
 
-.field public static final tabPaddingTop:I = 0x7f04033f
+.field public static final tabPaddingTop:I = 0x7f04033e
 
-.field public static final tabRippleColor:I = 0x7f040340
+.field public static final tabRippleColor:I = 0x7f04033f
 
-.field public static final tabSelectedTextColor:I = 0x7f040341
+.field public static final tabSelectedTextColor:I = 0x7f040340
 
-.field public static final tabStyle:I = 0x7f040342
+.field public static final tabStyle:I = 0x7f040341
 
-.field public static final tabTextAppearance:I = 0x7f040343
+.field public static final tabTextAppearance:I = 0x7f040342
 
-.field public static final tabTextColor:I = 0x7f040344
+.field public static final tabTextColor:I = 0x7f040343
 
-.field public static final tabUnboundedRipple:I = 0x7f040345
+.field public static final tabUnboundedRipple:I = 0x7f040344
 
-.field public static final textAllCaps:I = 0x7f040349
+.field public static final textAllCaps:I = 0x7f040348
 
-.field public static final textAppearanceBody1:I = 0x7f04034a
+.field public static final textAppearanceBody1:I = 0x7f040349
 
-.field public static final textAppearanceBody2:I = 0x7f04034b
+.field public static final textAppearanceBody2:I = 0x7f04034a
 
-.field public static final textAppearanceButton:I = 0x7f04034c
+.field public static final textAppearanceButton:I = 0x7f04034b
 
-.field public static final textAppearanceCaption:I = 0x7f04034d
+.field public static final textAppearanceCaption:I = 0x7f04034c
 
-.field public static final textAppearanceHeadline1:I = 0x7f04034e
+.field public static final textAppearanceHeadline1:I = 0x7f04034d
 
-.field public static final textAppearanceHeadline2:I = 0x7f04034f
+.field public static final textAppearanceHeadline2:I = 0x7f04034e
 
-.field public static final textAppearanceHeadline3:I = 0x7f040350
+.field public static final textAppearanceHeadline3:I = 0x7f04034f
 
-.field public static final textAppearanceHeadline4:I = 0x7f040351
+.field public static final textAppearanceHeadline4:I = 0x7f040350
 
-.field public static final textAppearanceHeadline5:I = 0x7f040352
+.field public static final textAppearanceHeadline5:I = 0x7f040351
 
-.field public static final textAppearanceHeadline6:I = 0x7f040353
+.field public static final textAppearanceHeadline6:I = 0x7f040352
 
-.field public static final textAppearanceLargePopupMenu:I = 0x7f040354
+.field public static final textAppearanceLargePopupMenu:I = 0x7f040353
 
-.field public static final textAppearanceListItem:I = 0x7f040355
+.field public static final textAppearanceListItem:I = 0x7f040354
 
-.field public static final textAppearanceListItemSecondary:I = 0x7f040356
+.field public static final textAppearanceListItemSecondary:I = 0x7f040355
 
-.field public static final textAppearanceListItemSmall:I = 0x7f040357
+.field public static final textAppearanceListItemSmall:I = 0x7f040356
 
-.field public static final textAppearanceOverline:I = 0x7f040358
+.field public static final textAppearanceOverline:I = 0x7f040357
 
-.field public static final textAppearancePopupMenuHeader:I = 0x7f040359
+.field public static final textAppearancePopupMenuHeader:I = 0x7f040358
 
-.field public static final textAppearanceSearchResultSubtitle:I = 0x7f04035a
+.field public static final textAppearanceSearchResultSubtitle:I = 0x7f040359
 
-.field public static final textAppearanceSearchResultTitle:I = 0x7f04035b
+.field public static final textAppearanceSearchResultTitle:I = 0x7f04035a
 
-.field public static final textAppearanceSmallPopupMenu:I = 0x7f04035c
+.field public static final textAppearanceSmallPopupMenu:I = 0x7f04035b
 
-.field public static final textAppearanceSubtitle1:I = 0x7f04035d
+.field public static final textAppearanceSubtitle1:I = 0x7f04035c
 
-.field public static final textAppearanceSubtitle2:I = 0x7f04035e
+.field public static final textAppearanceSubtitle2:I = 0x7f04035d
 
-.field public static final textColorAlertDialogListItem:I = 0x7f04035f
+.field public static final textColorAlertDialogListItem:I = 0x7f04035e
 
-.field public static final textColorSearchUrl:I = 0x7f040360
+.field public static final textColorSearchUrl:I = 0x7f04035f
 
-.field public static final textEndPadding:I = 0x7f040361
+.field public static final textEndPadding:I = 0x7f040360
 
-.field public static final textInputStyle:I = 0x7f040362
+.field public static final textInputStyle:I = 0x7f040361
 
-.field public static final textStartPadding:I = 0x7f040363
+.field public static final textStartPadding:I = 0x7f040362
 
-.field public static final theme:I = 0x7f040365
+.field public static final theme:I = 0x7f040364
 
-.field public static final thickness:I = 0x7f0403b6
+.field public static final thickness:I = 0x7f0403b5
 
-.field public static final thumbTextPadding:I = 0x7f0403b7
+.field public static final thumbTextPadding:I = 0x7f0403b6
 
-.field public static final thumbTint:I = 0x7f0403b8
+.field public static final thumbTint:I = 0x7f0403b7
 
-.field public static final thumbTintMode:I = 0x7f0403b9
+.field public static final thumbTintMode:I = 0x7f0403b8
 
-.field public static final tickMark:I = 0x7f0403ba
+.field public static final tickMark:I = 0x7f0403b9
 
-.field public static final tickMarkTint:I = 0x7f0403bb
+.field public static final tickMarkTint:I = 0x7f0403ba
 
-.field public static final tickMarkTintMode:I = 0x7f0403bc
+.field public static final tickMarkTintMode:I = 0x7f0403bb
 
-.field public static final tint:I = 0x7f0403bd
+.field public static final tint:I = 0x7f0403bc
 
-.field public static final tintMode:I = 0x7f0403be
+.field public static final tintMode:I = 0x7f0403bd
 
-.field public static final title:I = 0x7f0403bf
+.field public static final title:I = 0x7f0403be
 
-.field public static final titleEnabled:I = 0x7f0403c0
+.field public static final titleEnabled:I = 0x7f0403bf
 
-.field public static final titleMargin:I = 0x7f0403c1
+.field public static final titleMargin:I = 0x7f0403c0
 
-.field public static final titleMarginBottom:I = 0x7f0403c2
+.field public static final titleMarginBottom:I = 0x7f0403c1
 
-.field public static final titleMarginEnd:I = 0x7f0403c3
+.field public static final titleMarginEnd:I = 0x7f0403c2
 
-.field public static final titleMarginStart:I = 0x7f0403c4
+.field public static final titleMarginStart:I = 0x7f0403c3
 
-.field public static final titleMarginTop:I = 0x7f0403c5
+.field public static final titleMarginTop:I = 0x7f0403c4
 
-.field public static final titleMargins:I = 0x7f0403c6
+.field public static final titleMargins:I = 0x7f0403c5
 
-.field public static final titleTextAppearance:I = 0x7f0403c7
+.field public static final titleTextAppearance:I = 0x7f0403c6
 
-.field public static final titleTextColor:I = 0x7f0403c8
+.field public static final titleTextColor:I = 0x7f0403c7
 
-.field public static final titleTextStyle:I = 0x7f0403c9
+.field public static final titleTextStyle:I = 0x7f0403c8
 
 .field public static final toolbarId:I = 0x7f0403ca
 
diff --git a/com.discord/smali/com/discord/restapi/R$color.smali b/com.discord/smali/com/discord/restapi/R$color.smali
index 7b4d63d95d..dd680f0557 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 = 0x7f060035
+.field public static final bright_foreground_disabled_material_dark:I = 0x7f060034
 
-.field public static final bright_foreground_disabled_material_light:I = 0x7f060036
+.field public static final bright_foreground_disabled_material_light:I = 0x7f060035
 
-.field public static final bright_foreground_inverse_material_dark:I = 0x7f060037
+.field public static final bright_foreground_inverse_material_dark:I = 0x7f060036
 
-.field public static final bright_foreground_inverse_material_light:I = 0x7f060038
+.field public static final bright_foreground_inverse_material_light:I = 0x7f060037
 
-.field public static final bright_foreground_material_dark:I = 0x7f060039
+.field public static final bright_foreground_material_dark:I = 0x7f060038
 
-.field public static final bright_foreground_material_light:I = 0x7f06003a
+.field public static final bright_foreground_material_light:I = 0x7f060039
 
-.field public static final button_material_dark:I = 0x7f060040
+.field public static final button_material_dark:I = 0x7f06003f
 
-.field public static final button_material_light:I = 0x7f060041
+.field public static final button_material_light:I = 0x7f060040
 
-.field public static final cardview_dark_background:I = 0x7f060042
+.field public static final cardview_dark_background:I = 0x7f060041
 
-.field public static final cardview_light_background:I = 0x7f060043
+.field public static final cardview_light_background:I = 0x7f060042
 
-.field public static final cardview_shadow_end_color:I = 0x7f060044
+.field public static final cardview_shadow_end_color:I = 0x7f060043
 
-.field public static final cardview_shadow_start_color:I = 0x7f060045
+.field public static final cardview_shadow_start_color:I = 0x7f060044
 
-.field public static final common_google_signin_btn_text_dark:I = 0x7f06004f
+.field public static final common_google_signin_btn_text_dark:I = 0x7f06004e
 
-.field public static final common_google_signin_btn_text_dark_default:I = 0x7f060050
+.field public static final common_google_signin_btn_text_dark_default:I = 0x7f06004f
 
-.field public static final common_google_signin_btn_text_dark_disabled:I = 0x7f060051
+.field public static final common_google_signin_btn_text_dark_disabled:I = 0x7f060050
 
-.field public static final common_google_signin_btn_text_dark_focused:I = 0x7f060052
+.field public static final common_google_signin_btn_text_dark_focused:I = 0x7f060051
 
-.field public static final common_google_signin_btn_text_dark_pressed:I = 0x7f060053
+.field public static final common_google_signin_btn_text_dark_pressed:I = 0x7f060052
 
-.field public static final common_google_signin_btn_text_light:I = 0x7f060054
+.field public static final common_google_signin_btn_text_light:I = 0x7f060053
 
-.field public static final common_google_signin_btn_text_light_default:I = 0x7f060055
+.field public static final common_google_signin_btn_text_light_default:I = 0x7f060054
 
-.field public static final common_google_signin_btn_text_light_disabled:I = 0x7f060056
+.field public static final common_google_signin_btn_text_light_disabled:I = 0x7f060055
 
-.field public static final common_google_signin_btn_text_light_focused:I = 0x7f060057
+.field public static final common_google_signin_btn_text_light_focused:I = 0x7f060056
 
-.field public static final common_google_signin_btn_text_light_pressed:I = 0x7f060058
+.field public static final common_google_signin_btn_text_light_pressed:I = 0x7f060057
 
-.field public static final common_google_signin_btn_tint:I = 0x7f060059
+.field public static final common_google_signin_btn_tint:I = 0x7f060058
 
-.field public static final design_bottom_navigation_shadow_color:I = 0x7f06005c
+.field public static final design_bottom_navigation_shadow_color:I = 0x7f06005b
 
-.field public static final design_default_color_primary:I = 0x7f06005d
+.field public static final design_default_color_primary:I = 0x7f06005c
 
-.field public static final design_default_color_primary_dark:I = 0x7f06005e
+.field public static final design_default_color_primary_dark:I = 0x7f06005d
 
-.field public static final design_error:I = 0x7f06005f
+.field public static final design_error:I = 0x7f06005e
 
-.field public static final design_fab_shadow_end_color:I = 0x7f060060
+.field public static final design_fab_shadow_end_color:I = 0x7f06005f
 
-.field public static final design_fab_shadow_mid_color:I = 0x7f060061
+.field public static final design_fab_shadow_mid_color:I = 0x7f060060
 
-.field public static final design_fab_shadow_start_color:I = 0x7f060062
+.field public static final design_fab_shadow_start_color:I = 0x7f060061
 
-.field public static final design_fab_stroke_end_inner_color:I = 0x7f060063
+.field public static final design_fab_stroke_end_inner_color:I = 0x7f060062
 
-.field public static final design_fab_stroke_end_outer_color:I = 0x7f060064
+.field public static final design_fab_stroke_end_outer_color:I = 0x7f060063
 
-.field public static final design_fab_stroke_top_inner_color:I = 0x7f060065
+.field public static final design_fab_stroke_top_inner_color:I = 0x7f060064
 
-.field public static final design_fab_stroke_top_outer_color:I = 0x7f060066
+.field public static final design_fab_stroke_top_outer_color:I = 0x7f060065
 
-.field public static final design_snackbar_background_color:I = 0x7f060067
+.field public static final design_snackbar_background_color:I = 0x7f060066
 
-.field public static final design_tint_password_toggle:I = 0x7f060068
+.field public static final design_tint_password_toggle:I = 0x7f060067
 
-.field public static final dim_foreground_disabled_material_dark:I = 0x7f060069
+.field public static final dim_foreground_disabled_material_dark:I = 0x7f060068
 
-.field public static final dim_foreground_disabled_material_light:I = 0x7f06006a
+.field public static final dim_foreground_disabled_material_light:I = 0x7f060069
 
-.field public static final dim_foreground_material_dark:I = 0x7f06006b
+.field public static final dim_foreground_material_dark:I = 0x7f06006a
 
-.field public static final dim_foreground_material_light:I = 0x7f06006c
+.field public static final dim_foreground_material_light:I = 0x7f06006b
 
-.field public static final error_color_material_dark:I = 0x7f06006d
+.field public static final error_color_material_dark:I = 0x7f06006c
 
-.field public static final error_color_material_light:I = 0x7f06006e
+.field public static final error_color_material_light:I = 0x7f06006d
 
-.field public static final foreground_material_dark:I = 0x7f060073
+.field public static final foreground_material_dark:I = 0x7f060072
 
-.field public static final foreground_material_light:I = 0x7f060074
+.field public static final foreground_material_light:I = 0x7f060073
 
-.field public static final highlighted_text_material_dark:I = 0x7f060083
+.field public static final highlighted_text_material_dark:I = 0x7f060082
 
-.field public static final highlighted_text_material_light:I = 0x7f060084
+.field public static final highlighted_text_material_light:I = 0x7f060083
 
-.field public static final material_blue_grey_800:I = 0x7f060092
+.field public static final material_blue_grey_800:I = 0x7f060091
 
-.field public static final material_blue_grey_900:I = 0x7f060093
+.field public static final material_blue_grey_900:I = 0x7f060092
 
-.field public static final material_blue_grey_950:I = 0x7f060094
+.field public static final material_blue_grey_950:I = 0x7f060093
 
-.field public static final material_deep_teal_200:I = 0x7f060095
+.field public static final material_deep_teal_200:I = 0x7f060094
 
-.field public static final material_deep_teal_500:I = 0x7f060096
+.field public static final material_deep_teal_500:I = 0x7f060095
 
-.field public static final material_grey_100:I = 0x7f060097
+.field public static final material_grey_100:I = 0x7f060096
 
-.field public static final material_grey_300:I = 0x7f060098
+.field public static final material_grey_300:I = 0x7f060097
 
-.field public static final material_grey_50:I = 0x7f060099
+.field public static final material_grey_50:I = 0x7f060098
 
-.field public static final material_grey_600:I = 0x7f06009a
+.field public static final material_grey_600:I = 0x7f060099
 
-.field public static final material_grey_800:I = 0x7f06009b
+.field public static final material_grey_800:I = 0x7f06009a
 
-.field public static final material_grey_850:I = 0x7f06009c
+.field public static final material_grey_850:I = 0x7f06009b
 
-.field public static final material_grey_900:I = 0x7f06009d
+.field public static final material_grey_900:I = 0x7f06009c
 
-.field public static final mtrl_bottom_nav_colored_item_tint:I = 0x7f06009e
+.field public static final mtrl_bottom_nav_colored_item_tint:I = 0x7f06009d
 
-.field public static final mtrl_bottom_nav_item_tint:I = 0x7f06009f
+.field public static final mtrl_bottom_nav_item_tint:I = 0x7f06009e
 
-.field public static final mtrl_btn_bg_color_disabled:I = 0x7f0600a0
+.field public static final mtrl_btn_bg_color_disabled:I = 0x7f06009f
 
-.field public static final mtrl_btn_bg_color_selector:I = 0x7f0600a1
+.field public static final mtrl_btn_bg_color_selector:I = 0x7f0600a0
 
-.field public static final mtrl_btn_ripple_color:I = 0x7f0600a2
+.field public static final mtrl_btn_ripple_color:I = 0x7f0600a1
 
-.field public static final mtrl_btn_stroke_color_selector:I = 0x7f0600a3
+.field public static final mtrl_btn_stroke_color_selector:I = 0x7f0600a2
 
-.field public static final mtrl_btn_text_btn_ripple_color:I = 0x7f0600a4
+.field public static final mtrl_btn_text_btn_ripple_color:I = 0x7f0600a3
 
-.field public static final mtrl_btn_text_color_disabled:I = 0x7f0600a5
+.field public static final mtrl_btn_text_color_disabled:I = 0x7f0600a4
 
-.field public static final mtrl_btn_text_color_selector:I = 0x7f0600a6
+.field public static final mtrl_btn_text_color_selector:I = 0x7f0600a5
 
-.field public static final mtrl_btn_transparent_bg_color:I = 0x7f0600a7
+.field public static final mtrl_btn_transparent_bg_color:I = 0x7f0600a6
 
-.field public static final mtrl_chip_background_color:I = 0x7f0600a8
+.field public static final mtrl_chip_background_color:I = 0x7f0600a7
 
-.field public static final mtrl_chip_close_icon_tint:I = 0x7f0600a9
+.field public static final mtrl_chip_close_icon_tint:I = 0x7f0600a8
 
-.field public static final mtrl_chip_ripple_color:I = 0x7f0600aa
+.field public static final mtrl_chip_ripple_color:I = 0x7f0600a9
 
-.field public static final mtrl_chip_text_color:I = 0x7f0600ab
+.field public static final mtrl_chip_text_color:I = 0x7f0600aa
 
-.field public static final mtrl_fab_ripple_color:I = 0x7f0600ac
+.field public static final mtrl_fab_ripple_color:I = 0x7f0600ab
 
-.field public static final mtrl_scrim_color:I = 0x7f0600ad
+.field public static final mtrl_scrim_color:I = 0x7f0600ac
 
-.field public static final mtrl_tabs_colored_ripple_color:I = 0x7f0600ae
+.field public static final mtrl_tabs_colored_ripple_color:I = 0x7f0600ad
 
-.field public static final mtrl_tabs_icon_color_selector:I = 0x7f0600af
+.field public static final mtrl_tabs_icon_color_selector:I = 0x7f0600ae
 
-.field public static final mtrl_tabs_icon_color_selector_colored:I = 0x7f0600b0
+.field public static final mtrl_tabs_icon_color_selector_colored:I = 0x7f0600af
 
-.field public static final mtrl_tabs_legacy_text_color_selector:I = 0x7f0600b1
+.field public static final mtrl_tabs_legacy_text_color_selector:I = 0x7f0600b0
 
-.field public static final mtrl_tabs_ripple_color:I = 0x7f0600b2
+.field public static final mtrl_tabs_ripple_color:I = 0x7f0600b1
 
-.field public static final mtrl_text_btn_text_color_selector:I = 0x7f0600b3
+.field public static final mtrl_text_btn_text_color_selector:I = 0x7f0600b2
 
-.field public static final mtrl_textinput_default_box_stroke_color:I = 0x7f0600b4
+.field public static final mtrl_textinput_default_box_stroke_color:I = 0x7f0600b3
 
-.field public static final mtrl_textinput_disabled_color:I = 0x7f0600b5
+.field public static final mtrl_textinput_disabled_color:I = 0x7f0600b4
 
-.field public static final mtrl_textinput_filled_box_default_background_color:I = 0x7f0600b6
+.field public static final mtrl_textinput_filled_box_default_background_color:I = 0x7f0600b5
 
-.field public static final mtrl_textinput_hovered_box_stroke_color:I = 0x7f0600b7
+.field public static final mtrl_textinput_hovered_box_stroke_color:I = 0x7f0600b6
 
-.field public static final notification_action_color_filter:I = 0x7f0600b8
+.field public static final notification_action_color_filter:I = 0x7f0600b7
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b9
+.field public static final notification_icon_bg_color:I = 0x7f0600b8
 
-.field public static final primary_dark_material_dark:I = 0x7f0600db
+.field public static final primary_dark_material_dark:I = 0x7f0600da
 
-.field public static final primary_dark_material_light:I = 0x7f0600dc
+.field public static final primary_dark_material_light:I = 0x7f0600db
 
-.field public static final primary_material_dark:I = 0x7f0600ec
+.field public static final primary_material_dark:I = 0x7f0600eb
 
-.field public static final primary_material_light:I = 0x7f0600ed
+.field public static final primary_material_light:I = 0x7f0600ec
 
-.field public static final primary_text_default_material_dark:I = 0x7f0600ee
+.field public static final primary_text_default_material_dark:I = 0x7f0600ed
 
-.field public static final primary_text_default_material_light:I = 0x7f0600ef
+.field public static final primary_text_default_material_light:I = 0x7f0600ee
 
-.field public static final primary_text_disabled_material_dark:I = 0x7f0600f0
+.field public static final primary_text_disabled_material_dark:I = 0x7f0600ef
 
-.field public static final primary_text_disabled_material_light:I = 0x7f0600f1
+.field public static final primary_text_disabled_material_light:I = 0x7f0600f0
 
-.field public static final ripple_material_dark:I = 0x7f0600fa
+.field public static final ripple_material_dark:I = 0x7f0600f9
 
-.field public static final ripple_material_light:I = 0x7f0600fb
+.field public static final ripple_material_light:I = 0x7f0600fa
 
-.field public static final secondary_text_default_material_dark:I = 0x7f0600fc
+.field public static final secondary_text_default_material_dark:I = 0x7f0600fb
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fd
+.field public static final secondary_text_default_material_light:I = 0x7f0600fc
 
-.field public static final secondary_text_disabled_material_dark:I = 0x7f0600fe
+.field public static final secondary_text_disabled_material_dark:I = 0x7f0600fd
 
-.field public static final secondary_text_disabled_material_light:I = 0x7f0600ff
+.field public static final secondary_text_disabled_material_light:I = 0x7f0600fe
 
-.field public static final switch_thumb_disabled_material_dark:I = 0x7f06012e
+.field public static final switch_thumb_disabled_material_dark:I = 0x7f06012d
 
-.field public static final switch_thumb_disabled_material_light:I = 0x7f06012f
+.field public static final switch_thumb_disabled_material_light:I = 0x7f06012e
 
-.field public static final switch_thumb_material_dark:I = 0x7f060130
+.field public static final switch_thumb_material_dark:I = 0x7f06012f
 
-.field public static final switch_thumb_material_light:I = 0x7f060131
+.field public static final switch_thumb_material_light:I = 0x7f060130
 
-.field public static final switch_thumb_normal_material_dark:I = 0x7f060132
+.field public static final switch_thumb_normal_material_dark:I = 0x7f060131
 
-.field public static final switch_thumb_normal_material_light:I = 0x7f060133
+.field public static final switch_thumb_normal_material_light:I = 0x7f060132
 
-.field public static final tooltip_background_dark:I = 0x7f060135
+.field public static final tooltip_background_dark:I = 0x7f060134
 
-.field public static final tooltip_background_light:I = 0x7f060136
+.field public static final tooltip_background_light:I = 0x7f060135
 
 
 # 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 6d868f1435..9bb5927260 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 = 0x7f080017
+.field public static final abc_ab_share_pack_mtrl_alpha:I = 0x7f080016
 
-.field public static final abc_action_bar_item_background_material:I = 0x7f080018
+.field public static final abc_action_bar_item_background_material:I = 0x7f080017
 
-.field public static final abc_btn_borderless_material:I = 0x7f080019
+.field public static final abc_btn_borderless_material:I = 0x7f080018
 
-.field public static final abc_btn_check_material:I = 0x7f08001a
+.field public static final abc_btn_check_material:I = 0x7f080019
 
-.field public static final abc_btn_check_to_on_mtrl_000:I = 0x7f08001b
+.field public static final abc_btn_check_to_on_mtrl_000:I = 0x7f08001a
 
-.field public static final abc_btn_check_to_on_mtrl_015:I = 0x7f08001c
+.field public static final abc_btn_check_to_on_mtrl_015:I = 0x7f08001b
 
-.field public static final abc_btn_colored_material:I = 0x7f08001d
+.field public static final abc_btn_colored_material:I = 0x7f08001c
 
-.field public static final abc_btn_default_mtrl_shape:I = 0x7f08001e
+.field public static final abc_btn_default_mtrl_shape:I = 0x7f08001d
 
-.field public static final abc_btn_radio_material:I = 0x7f08001f
+.field public static final abc_btn_radio_material:I = 0x7f08001e
 
-.field public static final abc_btn_radio_to_on_mtrl_000:I = 0x7f080020
+.field public static final abc_btn_radio_to_on_mtrl_000:I = 0x7f08001f
 
-.field public static final abc_btn_radio_to_on_mtrl_015:I = 0x7f080021
+.field public static final abc_btn_radio_to_on_mtrl_015:I = 0x7f080020
 
-.field public static final abc_btn_switch_to_on_mtrl_00001:I = 0x7f080022
+.field public static final abc_btn_switch_to_on_mtrl_00001:I = 0x7f080021
 
-.field public static final abc_btn_switch_to_on_mtrl_00012:I = 0x7f080023
+.field public static final abc_btn_switch_to_on_mtrl_00012:I = 0x7f080022
 
-.field public static final abc_cab_background_internal_bg:I = 0x7f080024
+.field public static final abc_cab_background_internal_bg:I = 0x7f080023
 
-.field public static final abc_cab_background_top_material:I = 0x7f080025
+.field public static final abc_cab_background_top_material:I = 0x7f080024
 
-.field public static final abc_cab_background_top_mtrl_alpha:I = 0x7f080026
+.field public static final abc_cab_background_top_mtrl_alpha:I = 0x7f080025
 
-.field public static final abc_control_background_material:I = 0x7f080027
+.field public static final abc_control_background_material:I = 0x7f080026
 
-.field public static final abc_dialog_material_background:I = 0x7f080028
+.field public static final abc_dialog_material_background:I = 0x7f080027
 
-.field public static final abc_edit_text_material:I = 0x7f080029
+.field public static final abc_edit_text_material:I = 0x7f080028
 
-.field public static final abc_ic_ab_back_material:I = 0x7f08002a
+.field public static final abc_ic_ab_back_material:I = 0x7f080029
 
-.field public static final abc_ic_arrow_drop_right_black_24dp:I = 0x7f08002b
+.field public static final abc_ic_arrow_drop_right_black_24dp:I = 0x7f08002a
 
-.field public static final abc_ic_clear_material:I = 0x7f08002c
+.field public static final abc_ic_clear_material:I = 0x7f08002b
 
-.field public static final abc_ic_commit_search_api_mtrl_alpha:I = 0x7f08002d
+.field public static final abc_ic_commit_search_api_mtrl_alpha:I = 0x7f08002c
 
-.field public static final abc_ic_go_search_api_material:I = 0x7f08002e
+.field public static final abc_ic_go_search_api_material:I = 0x7f08002d
 
-.field public static final abc_ic_menu_copy_mtrl_am_alpha:I = 0x7f08002f
+.field public static final abc_ic_menu_copy_mtrl_am_alpha:I = 0x7f08002e
 
-.field public static final abc_ic_menu_cut_mtrl_alpha:I = 0x7f080030
+.field public static final abc_ic_menu_cut_mtrl_alpha:I = 0x7f08002f
 
-.field public static final abc_ic_menu_overflow_material:I = 0x7f080031
+.field public static final abc_ic_menu_overflow_material:I = 0x7f080030
 
-.field public static final abc_ic_menu_paste_mtrl_am_alpha:I = 0x7f080032
+.field public static final abc_ic_menu_paste_mtrl_am_alpha:I = 0x7f080031
 
-.field public static final abc_ic_menu_selectall_mtrl_alpha:I = 0x7f080033
+.field public static final abc_ic_menu_selectall_mtrl_alpha:I = 0x7f080032
 
-.field public static final abc_ic_menu_share_mtrl_alpha:I = 0x7f080034
+.field public static final abc_ic_menu_share_mtrl_alpha:I = 0x7f080033
 
-.field public static final abc_ic_search_api_material:I = 0x7f080035
+.field public static final abc_ic_search_api_material:I = 0x7f080034
 
-.field public static final abc_ic_star_black_16dp:I = 0x7f080036
+.field public static final abc_ic_star_black_16dp:I = 0x7f080035
 
-.field public static final abc_ic_star_black_36dp:I = 0x7f080037
+.field public static final abc_ic_star_black_36dp:I = 0x7f080036
 
-.field public static final abc_ic_star_black_48dp:I = 0x7f080038
+.field public static final abc_ic_star_black_48dp:I = 0x7f080037
 
-.field public static final abc_ic_star_half_black_16dp:I = 0x7f080039
+.field public static final abc_ic_star_half_black_16dp:I = 0x7f080038
 
-.field public static final abc_ic_star_half_black_36dp:I = 0x7f08003a
+.field public static final abc_ic_star_half_black_36dp:I = 0x7f080039
 
-.field public static final abc_ic_star_half_black_48dp:I = 0x7f08003b
+.field public static final abc_ic_star_half_black_48dp:I = 0x7f08003a
 
-.field public static final abc_ic_voice_search_api_material:I = 0x7f08003c
+.field public static final abc_ic_voice_search_api_material:I = 0x7f08003b
 
-.field public static final abc_item_background_holo_dark:I = 0x7f08003d
+.field public static final abc_item_background_holo_dark:I = 0x7f08003c
 
-.field public static final abc_item_background_holo_light:I = 0x7f08003e
+.field public static final abc_item_background_holo_light:I = 0x7f08003d
 
-.field public static final abc_list_divider_material:I = 0x7f08003f
+.field public static final abc_list_divider_material:I = 0x7f08003e
 
-.field public static final abc_list_divider_mtrl_alpha:I = 0x7f080040
+.field public static final abc_list_divider_mtrl_alpha:I = 0x7f08003f
 
-.field public static final abc_list_focused_holo:I = 0x7f080041
+.field public static final abc_list_focused_holo:I = 0x7f080040
 
-.field public static final abc_list_longpressed_holo:I = 0x7f080042
+.field public static final abc_list_longpressed_holo:I = 0x7f080041
 
-.field public static final abc_list_pressed_holo_dark:I = 0x7f080043
+.field public static final abc_list_pressed_holo_dark:I = 0x7f080042
 
-.field public static final abc_list_pressed_holo_light:I = 0x7f080044
+.field public static final abc_list_pressed_holo_light:I = 0x7f080043
 
-.field public static final abc_list_selector_background_transition_holo_dark:I = 0x7f080045
+.field public static final abc_list_selector_background_transition_holo_dark:I = 0x7f080044
 
-.field public static final abc_list_selector_background_transition_holo_light:I = 0x7f080046
+.field public static final abc_list_selector_background_transition_holo_light:I = 0x7f080045
 
-.field public static final abc_list_selector_disabled_holo_dark:I = 0x7f080047
+.field public static final abc_list_selector_disabled_holo_dark:I = 0x7f080046
 
-.field public static final abc_list_selector_disabled_holo_light:I = 0x7f080048
+.field public static final abc_list_selector_disabled_holo_light:I = 0x7f080047
 
-.field public static final abc_list_selector_holo_dark:I = 0x7f080049
+.field public static final abc_list_selector_holo_dark:I = 0x7f080048
 
-.field public static final abc_list_selector_holo_light:I = 0x7f08004a
+.field public static final abc_list_selector_holo_light:I = 0x7f080049
 
-.field public static final abc_menu_hardkey_panel_mtrl_mult:I = 0x7f08004b
+.field public static final abc_menu_hardkey_panel_mtrl_mult:I = 0x7f08004a
 
-.field public static final abc_popup_background_mtrl_mult:I = 0x7f08004c
+.field public static final abc_popup_background_mtrl_mult:I = 0x7f08004b
 
-.field public static final abc_ratingbar_indicator_material:I = 0x7f08004d
+.field public static final abc_ratingbar_indicator_material:I = 0x7f08004c
 
-.field public static final abc_ratingbar_material:I = 0x7f08004e
+.field public static final abc_ratingbar_material:I = 0x7f08004d
 
-.field public static final abc_ratingbar_small_material:I = 0x7f08004f
+.field public static final abc_ratingbar_small_material:I = 0x7f08004e
 
-.field public static final abc_scrubber_control_off_mtrl_alpha:I = 0x7f080050
+.field public static final abc_scrubber_control_off_mtrl_alpha:I = 0x7f08004f
 
-.field public static final abc_scrubber_control_to_pressed_mtrl_000:I = 0x7f080051
+.field public static final abc_scrubber_control_to_pressed_mtrl_000:I = 0x7f080050
 
-.field public static final abc_scrubber_control_to_pressed_mtrl_005:I = 0x7f080052
+.field public static final abc_scrubber_control_to_pressed_mtrl_005:I = 0x7f080051
 
-.field public static final abc_scrubber_primary_mtrl_alpha:I = 0x7f080053
+.field public static final abc_scrubber_primary_mtrl_alpha:I = 0x7f080052
 
-.field public static final abc_scrubber_track_mtrl_alpha:I = 0x7f080054
+.field public static final abc_scrubber_track_mtrl_alpha:I = 0x7f080053
 
-.field public static final abc_seekbar_thumb_material:I = 0x7f080055
+.field public static final abc_seekbar_thumb_material:I = 0x7f080054
 
-.field public static final abc_seekbar_tick_mark_material:I = 0x7f080056
+.field public static final abc_seekbar_tick_mark_material:I = 0x7f080055
 
-.field public static final abc_seekbar_track_material:I = 0x7f080057
+.field public static final abc_seekbar_track_material:I = 0x7f080056
 
-.field public static final abc_spinner_mtrl_am_alpha:I = 0x7f080058
+.field public static final abc_spinner_mtrl_am_alpha:I = 0x7f080057
 
-.field public static final abc_spinner_textfield_background_material:I = 0x7f080059
+.field public static final abc_spinner_textfield_background_material:I = 0x7f080058
 
-.field public static final abc_switch_thumb_material:I = 0x7f08005a
+.field public static final abc_switch_thumb_material:I = 0x7f080059
 
-.field public static final abc_switch_track_mtrl_alpha:I = 0x7f08005b
+.field public static final abc_switch_track_mtrl_alpha:I = 0x7f08005a
 
-.field public static final abc_tab_indicator_material:I = 0x7f08005c
+.field public static final abc_tab_indicator_material:I = 0x7f08005b
 
-.field public static final abc_tab_indicator_mtrl_alpha:I = 0x7f08005d
+.field public static final abc_tab_indicator_mtrl_alpha:I = 0x7f08005c
 
-.field public static final abc_text_cursor_material:I = 0x7f08005e
+.field public static final abc_text_cursor_material:I = 0x7f08005d
 
-.field public static final abc_text_select_handle_left_mtrl_dark:I = 0x7f08005f
+.field public static final abc_text_select_handle_left_mtrl_dark:I = 0x7f08005e
 
-.field public static final abc_text_select_handle_left_mtrl_light:I = 0x7f080060
+.field public static final abc_text_select_handle_left_mtrl_light:I = 0x7f08005f
 
-.field public static final abc_text_select_handle_middle_mtrl_dark:I = 0x7f080061
+.field public static final abc_text_select_handle_middle_mtrl_dark:I = 0x7f080060
 
-.field public static final abc_text_select_handle_middle_mtrl_light:I = 0x7f080062
+.field public static final abc_text_select_handle_middle_mtrl_light:I = 0x7f080061
 
-.field public static final abc_text_select_handle_right_mtrl_dark:I = 0x7f080063
+.field public static final abc_text_select_handle_right_mtrl_dark:I = 0x7f080062
 
-.field public static final abc_text_select_handle_right_mtrl_light:I = 0x7f080064
+.field public static final abc_text_select_handle_right_mtrl_light:I = 0x7f080063
 
-.field public static final abc_textfield_activated_mtrl_alpha:I = 0x7f080065
+.field public static final abc_textfield_activated_mtrl_alpha:I = 0x7f080064
 
-.field public static final abc_textfield_default_mtrl_alpha:I = 0x7f080066
+.field public static final abc_textfield_default_mtrl_alpha:I = 0x7f080065
 
-.field public static final abc_textfield_search_activated_mtrl_alpha:I = 0x7f080067
+.field public static final abc_textfield_search_activated_mtrl_alpha:I = 0x7f080066
 
-.field public static final abc_textfield_search_default_mtrl_alpha:I = 0x7f080068
+.field public static final abc_textfield_search_default_mtrl_alpha:I = 0x7f080067
 
-.field public static final abc_textfield_search_material:I = 0x7f080069
+.field public static final abc_textfield_search_material:I = 0x7f080068
 
-.field public static final abc_vector_test:I = 0x7f08006a
+.field public static final abc_vector_test:I = 0x7f080069
 
-.field public static final avd_hide_password:I = 0x7f08008a
+.field public static final avd_hide_password:I = 0x7f080089
 
-.field public static final avd_show_password:I = 0x7f08008b
+.field public static final avd_show_password:I = 0x7f08008a
 
-.field public static final common_full_open_on_phone:I = 0x7f0800a2
+.field public static final common_full_open_on_phone:I = 0x7f0800a1
 
-.field public static final common_google_signin_btn_icon_dark:I = 0x7f0800a3
+.field public static final common_google_signin_btn_icon_dark:I = 0x7f0800a2
 
-.field public static final common_google_signin_btn_icon_dark_focused:I = 0x7f0800a4
+.field public static final common_google_signin_btn_icon_dark_focused:I = 0x7f0800a3
 
-.field public static final common_google_signin_btn_icon_dark_normal:I = 0x7f0800a5
+.field public static final common_google_signin_btn_icon_dark_normal:I = 0x7f0800a4
 
-.field public static final common_google_signin_btn_icon_dark_normal_background:I = 0x7f0800a6
+.field public static final common_google_signin_btn_icon_dark_normal_background:I = 0x7f0800a5
 
-.field public static final common_google_signin_btn_icon_disabled:I = 0x7f0800a7
+.field public static final common_google_signin_btn_icon_disabled:I = 0x7f0800a6
 
-.field public static final common_google_signin_btn_icon_light:I = 0x7f0800a8
+.field public static final common_google_signin_btn_icon_light:I = 0x7f0800a7
 
-.field public static final common_google_signin_btn_icon_light_focused:I = 0x7f0800a9
+.field public static final common_google_signin_btn_icon_light_focused:I = 0x7f0800a8
 
-.field public static final common_google_signin_btn_icon_light_normal:I = 0x7f0800aa
+.field public static final common_google_signin_btn_icon_light_normal:I = 0x7f0800a9
 
-.field public static final common_google_signin_btn_icon_light_normal_background:I = 0x7f0800ab
+.field public static final common_google_signin_btn_icon_light_normal_background:I = 0x7f0800aa
 
-.field public static final common_google_signin_btn_text_dark:I = 0x7f0800ac
+.field public static final common_google_signin_btn_text_dark:I = 0x7f0800ab
 
-.field public static final common_google_signin_btn_text_dark_focused:I = 0x7f0800ad
+.field public static final common_google_signin_btn_text_dark_focused:I = 0x7f0800ac
 
-.field public static final common_google_signin_btn_text_dark_normal:I = 0x7f0800ae
+.field public static final common_google_signin_btn_text_dark_normal:I = 0x7f0800ad
 
-.field public static final common_google_signin_btn_text_dark_normal_background:I = 0x7f0800af
+.field public static final common_google_signin_btn_text_dark_normal_background:I = 0x7f0800ae
 
-.field public static final common_google_signin_btn_text_disabled:I = 0x7f0800b0
+.field public static final common_google_signin_btn_text_disabled:I = 0x7f0800af
 
-.field public static final common_google_signin_btn_text_light:I = 0x7f0800b1
+.field public static final common_google_signin_btn_text_light:I = 0x7f0800b0
 
-.field public static final common_google_signin_btn_text_light_focused:I = 0x7f0800b2
+.field public static final common_google_signin_btn_text_light_focused:I = 0x7f0800b1
 
-.field public static final common_google_signin_btn_text_light_normal:I = 0x7f0800b3
+.field public static final common_google_signin_btn_text_light_normal:I = 0x7f0800b2
 
-.field public static final common_google_signin_btn_text_light_normal_background:I = 0x7f0800b4
+.field public static final common_google_signin_btn_text_light_normal_background:I = 0x7f0800b3
 
-.field public static final design_bottom_navigation_item_background:I = 0x7f0800b5
+.field public static final design_bottom_navigation_item_background:I = 0x7f0800b4
 
-.field public static final design_fab_background:I = 0x7f0800b6
+.field public static final design_fab_background:I = 0x7f0800b5
 
-.field public static final design_ic_visibility:I = 0x7f0800b7
+.field public static final design_ic_visibility:I = 0x7f0800b6
 
-.field public static final design_ic_visibility_off:I = 0x7f0800b8
+.field public static final design_ic_visibility_off:I = 0x7f0800b7
 
-.field public static final design_password_eye:I = 0x7f0800b9
+.field public static final design_password_eye:I = 0x7f0800b8
 
-.field public static final design_snackbar_background:I = 0x7f0800ba
+.field public static final design_snackbar_background:I = 0x7f0800b9
 
-.field public static final drawable_chip_background:I = 0x7f080105
+.field public static final drawable_chip_background:I = 0x7f080101
 
-.field public static final drawable_chip_circle:I = 0x7f080106
+.field public static final drawable_chip_circle:I = 0x7f080102
 
-.field public static final drawable_chip_delete:I = 0x7f080107
+.field public static final drawable_chip_delete:I = 0x7f080103
 
-.field public static final googleg_disabled_color_18:I = 0x7f0801bb
+.field public static final googleg_disabled_color_18:I = 0x7f0801b0
 
-.field public static final googleg_standard_color_18:I = 0x7f0801bc
+.field public static final googleg_standard_color_18:I = 0x7f0801b1
 
-.field public static final ic_mtrl_chip_checked_black:I = 0x7f080308
+.field public static final ic_mtrl_chip_checked_black:I = 0x7f0802fc
 
-.field public static final ic_mtrl_chip_checked_circle:I = 0x7f080309
+.field public static final ic_mtrl_chip_checked_circle:I = 0x7f0802fd
 
-.field public static final ic_mtrl_chip_close_circle:I = 0x7f08030a
+.field public static final ic_mtrl_chip_close_circle:I = 0x7f0802fe
 
-.field public static final mtrl_snackbar_background:I = 0x7f08046f
+.field public static final mtrl_snackbar_background:I = 0x7f080460
 
-.field public static final mtrl_tabs_default_indicator:I = 0x7f080470
+.field public static final mtrl_tabs_default_indicator:I = 0x7f080461
 
-.field public static final navigation_empty_icon:I = 0x7f080471
+.field public static final navigation_empty_icon:I = 0x7f080462
 
-.field public static final notification_action_background:I = 0x7f080472
+.field public static final notification_action_background:I = 0x7f080463
 
-.field public static final notification_bg:I = 0x7f080473
+.field public static final notification_bg:I = 0x7f080464
 
-.field public static final notification_bg_low:I = 0x7f080474
+.field public static final notification_bg_low:I = 0x7f080465
 
-.field public static final notification_bg_low_normal:I = 0x7f080475
+.field public static final notification_bg_low_normal:I = 0x7f080466
 
-.field public static final notification_bg_low_pressed:I = 0x7f080476
+.field public static final notification_bg_low_pressed:I = 0x7f080467
 
-.field public static final notification_bg_normal:I = 0x7f080477
+.field public static final notification_bg_normal:I = 0x7f080468
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080478
+.field public static final notification_bg_normal_pressed:I = 0x7f080469
 
-.field public static final notification_icon_background:I = 0x7f080479
+.field public static final notification_icon_background:I = 0x7f08046a
 
-.field public static final notification_template_icon_bg:I = 0x7f08047a
+.field public static final notification_template_icon_bg:I = 0x7f08046b
 
-.field public static final notification_template_icon_low_bg:I = 0x7f08047b
+.field public static final notification_template_icon_low_bg:I = 0x7f08046c
 
-.field public static final notification_tile_bg:I = 0x7f08047c
+.field public static final notification_tile_bg:I = 0x7f08046d
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08047d
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08046e
 
-.field public static final tooltip_frame_dark:I = 0x7f080485
+.field public static final tooltip_frame_dark:I = 0x7f080476
 
-.field public static final tooltip_frame_light:I = 0x7f080486
+.field public static final tooltip_frame_light:I = 0x7f080477
 
 
 # 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 ddf2f1dfeb..c5322c3e04 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 = 0x7f0a0080
+.field public static final async:I = 0x7f0a007f
 
-.field public static final auto:I = 0x7f0a00b9
+.field public static final auto:I = 0x7f0a00b8
 
-.field public static final baseline:I = 0x7f0a00c9
+.field public static final baseline:I = 0x7f0a00c8
 
-.field public static final blocking:I = 0x7f0a00ce
+.field public static final blocking:I = 0x7f0a00cd
 
 .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 = 0x7f0a0233
+.field public static final container:I = 0x7f0a0232
 
-.field public static final content:I = 0x7f0a0234
+.field public static final content:I = 0x7f0a0233
 
-.field public static final contentPanel:I = 0x7f0a0235
+.field public static final contentPanel:I = 0x7f0a0234
 
-.field public static final coordinator:I = 0x7f0a023a
+.field public static final coordinator:I = 0x7f0a0239
 
-.field public static final custom:I = 0x7f0a0252
+.field public static final custom:I = 0x7f0a0251
 
-.field public static final customPanel:I = 0x7f0a0253
+.field public static final customPanel:I = 0x7f0a0252
 
-.field public static final dark:I = 0x7f0a0254
+.field public static final dark:I = 0x7f0a0253
 
-.field public static final decor_content_parent:I = 0x7f0a0257
+.field public static final decor_content_parent:I = 0x7f0a0256
 
-.field public static final default_activity_button:I = 0x7f0a0258
+.field public static final default_activity_button:I = 0x7f0a0257
 
-.field public static final design_bottom_sheet:I = 0x7f0a0259
+.field public static final design_bottom_sheet:I = 0x7f0a0258
 
-.field public static final design_menu_item_action_area:I = 0x7f0a025a
+.field public static final design_menu_item_action_area:I = 0x7f0a0259
 
-.field public static final design_menu_item_action_area_stub:I = 0x7f0a025b
+.field public static final design_menu_item_action_area_stub:I = 0x7f0a025a
 
-.field public static final design_menu_item_text:I = 0x7f0a025c
+.field public static final design_menu_item_text:I = 0x7f0a025b
 
-.field public static final design_navigation_view:I = 0x7f0a025d
+.field public static final design_navigation_view:I = 0x7f0a025c
 
-.field public static final dialog_button:I = 0x7f0a025e
+.field public static final dialog_button:I = 0x7f0a025d
 
-.field public static final edit_query:I = 0x7f0a02ae
+.field public static final edit_query:I = 0x7f0a02ad
 
-.field public static final end:I = 0x7f0a02c9
+.field public static final end:I = 0x7f0a02c8
 
-.field public static final expand_activities_button:I = 0x7f0a02ce
+.field public static final expand_activities_button:I = 0x7f0a02cd
 
-.field public static final expanded_menu:I = 0x7f0a02cf
+.field public static final expanded_menu:I = 0x7f0a02ce
 
-.field public static final fill:I = 0x7f0a02e4
+.field public static final fill:I = 0x7f0a02e3
 
-.field public static final filled:I = 0x7f0a02e7
+.field public static final filled:I = 0x7f0a02e6
 
-.field public static final fitBottomStart:I = 0x7f0a02e8
+.field public static final fitBottomStart:I = 0x7f0a02e7
 
-.field public static final fitCenter:I = 0x7f0a02e9
+.field public static final fitCenter:I = 0x7f0a02e8
 
-.field public static final fitEnd:I = 0x7f0a02ea
+.field public static final fitEnd:I = 0x7f0a02e9
 
-.field public static final fitStart:I = 0x7f0a02eb
+.field public static final fitStart:I = 0x7f0a02ea
 
-.field public static final fitXY:I = 0x7f0a02ec
+.field public static final fitXY:I = 0x7f0a02eb
 
-.field public static final fixed:I = 0x7f0a02ed
+.field public static final fixed:I = 0x7f0a02ec
 
-.field public static final flex_end:I = 0x7f0a02ee
+.field public static final flex_end:I = 0x7f0a02ed
 
-.field public static final flex_start:I = 0x7f0a02ef
+.field public static final flex_start:I = 0x7f0a02ee
 
-.field public static final focusCrop:I = 0x7f0a02f0
+.field public static final focusCrop:I = 0x7f0a02ef
 
-.field public static final forever:I = 0x7f0a02f2
+.field public static final forever:I = 0x7f0a02f1
 
-.field public static final ghost_view:I = 0x7f0a0316
+.field public static final ghost_view:I = 0x7f0a0315
 
-.field public static final group_divider:I = 0x7f0a032d
+.field public static final group_divider:I = 0x7f0a0328
 
-.field public static final home:I = 0x7f0a0394
+.field public static final home:I = 0x7f0a038f
 
-.field public static final icon:I = 0x7f0a0396
+.field public static final icon:I = 0x7f0a0391
 
-.field public static final icon_group:I = 0x7f0a0397
+.field public static final icon_group:I = 0x7f0a0392
 
-.field public static final icon_only:I = 0x7f0a0398
+.field public static final icon_only:I = 0x7f0a0393
 
-.field public static final image:I = 0x7f0a039a
+.field public static final image:I = 0x7f0a0395
 
-.field public static final info:I = 0x7f0a03ac
+.field public static final info:I = 0x7f0a03a7
 
-.field public static final italic:I = 0x7f0a03d9
+.field public static final italic:I = 0x7f0a03d4
 
-.field public static final item_touch_helper_previous_elevation:I = 0x7f0a040d
+.field public static final item_touch_helper_previous_elevation:I = 0x7f0a0408
 
-.field public static final labeled:I = 0x7f0a0414
+.field public static final labeled:I = 0x7f0a040f
 
-.field public static final largeLabel:I = 0x7f0a0415
+.field public static final largeLabel:I = 0x7f0a0410
 
-.field public static final left:I = 0x7f0a041b
+.field public static final left:I = 0x7f0a0416
 
-.field public static final light:I = 0x7f0a041c
+.field public static final light:I = 0x7f0a0417
 
-.field public static final line1:I = 0x7f0a041d
+.field public static final line1:I = 0x7f0a0418
 
-.field public static final line3:I = 0x7f0a041e
+.field public static final line3:I = 0x7f0a0419
 
-.field public static final listMode:I = 0x7f0a0420
+.field public static final listMode:I = 0x7f0a041b
 
-.field public static final list_item:I = 0x7f0a0421
+.field public static final list_item:I = 0x7f0a041c
 
-.field public static final masked:I = 0x7f0a043f
+.field public static final masked:I = 0x7f0a043a
 
-.field public static final message:I = 0x7f0a0485
+.field public static final message:I = 0x7f0a0478
 
-.field public static final mini:I = 0x7f0a048a
+.field public static final mini:I = 0x7f0a047d
 
-.field public static final mtrl_child_content_container:I = 0x7f0a048b
+.field public static final mtrl_child_content_container:I = 0x7f0a047e
 
-.field public static final mtrl_internal_children_alpha_tag:I = 0x7f0a048c
+.field public static final mtrl_internal_children_alpha_tag:I = 0x7f0a047f
 
-.field public static final multiply:I = 0x7f0a048d
+.field public static final multiply:I = 0x7f0a0480
 
-.field public static final navigation_header_container:I = 0x7f0a048f
+.field public static final navigation_header_container:I = 0x7f0a0482
 
-.field public static final none:I = 0x7f0a04a2
+.field public static final none:I = 0x7f0a0495
 
-.field public static final normal:I = 0x7f0a04a3
+.field public static final normal:I = 0x7f0a0496
 
-.field public static final notification_background:I = 0x7f0a04ad
+.field public static final notification_background:I = 0x7f0a04a0
 
-.field public static final notification_main_column:I = 0x7f0a04ae
+.field public static final notification_main_column:I = 0x7f0a04a1
 
-.field public static final notification_main_column_container:I = 0x7f0a04af
+.field public static final notification_main_column_container:I = 0x7f0a04a2
 
-.field public static final nowrap:I = 0x7f0a04b0
+.field public static final nowrap:I = 0x7f0a04a3
 
-.field public static final outline:I = 0x7f0a04d1
+.field public static final outline:I = 0x7f0a04c4
 
-.field public static final parallax:I = 0x7f0a04e0
+.field public static final parallax:I = 0x7f0a04d3
 
-.field public static final parentPanel:I = 0x7f0a04e2
+.field public static final parentPanel:I = 0x7f0a04d5
 
-.field public static final parent_matrix:I = 0x7f0a04e3
+.field public static final parent_matrix:I = 0x7f0a04d6
 
-.field public static final pin:I = 0x7f0a0520
+.field public static final pin:I = 0x7f0a0512
 
-.field public static final progress_circular:I = 0x7f0a055c
+.field public static final progress_circular:I = 0x7f0a054d
 
-.field public static final progress_horizontal:I = 0x7f0a055e
+.field public static final progress_horizontal:I = 0x7f0a054f
 
-.field public static final radio:I = 0x7f0a0569
+.field public static final radio:I = 0x7f0a055a
 
-.field public static final right:I = 0x7f0a058c
+.field public static final right:I = 0x7f0a0573
 
-.field public static final right_icon:I = 0x7f0a058d
+.field public static final right_icon:I = 0x7f0a0574
 
-.field public static final right_side:I = 0x7f0a058e
+.field public static final right_side:I = 0x7f0a0575
 
-.field public static final row:I = 0x7f0a05b6
+.field public static final row:I = 0x7f0a059d
 
-.field public static final row_reverse:I = 0x7f0a05b7
+.field public static final row_reverse:I = 0x7f0a059e
 
-.field public static final save_image_matrix:I = 0x7f0a05b8
+.field public static final save_image_matrix:I = 0x7f0a059f
 
-.field public static final save_non_transition_alpha:I = 0x7f0a05b9
+.field public static final save_non_transition_alpha:I = 0x7f0a05a0
 
-.field public static final save_scale_type:I = 0x7f0a05ba
+.field public static final save_scale_type:I = 0x7f0a05a1
 
-.field public static final screen:I = 0x7f0a05bc
+.field public static final screen:I = 0x7f0a05a3
 
-.field public static final scrollIndicatorDown:I = 0x7f0a05be
+.field public static final scrollIndicatorDown:I = 0x7f0a05a5
 
-.field public static final scrollIndicatorUp:I = 0x7f0a05bf
+.field public static final scrollIndicatorUp:I = 0x7f0a05a6
 
-.field public static final scrollView:I = 0x7f0a05c0
+.field public static final scrollView:I = 0x7f0a05a7
 
-.field public static final scrollable:I = 0x7f0a05c2
+.field public static final scrollable:I = 0x7f0a05a9
 
-.field public static final search_badge:I = 0x7f0a05c4
+.field public static final search_badge:I = 0x7f0a05ab
 
-.field public static final search_bar:I = 0x7f0a05c5
+.field public static final search_bar:I = 0x7f0a05ac
 
-.field public static final search_button:I = 0x7f0a05c6
+.field public static final search_button:I = 0x7f0a05ad
 
-.field public static final search_close_btn:I = 0x7f0a05c8
+.field public static final search_close_btn:I = 0x7f0a05af
 
-.field public static final search_edit_frame:I = 0x7f0a05c9
+.field public static final search_edit_frame:I = 0x7f0a05b0
 
-.field public static final search_go_btn:I = 0x7f0a05cc
+.field public static final search_go_btn:I = 0x7f0a05b3
 
-.field public static final search_mag_icon:I = 0x7f0a05ce
+.field public static final search_mag_icon:I = 0x7f0a05b5
 
-.field public static final search_plate:I = 0x7f0a05cf
+.field public static final search_plate:I = 0x7f0a05b6
 
-.field public static final search_src_text:I = 0x7f0a05d2
+.field public static final search_src_text:I = 0x7f0a05b9
 
-.field public static final search_voice_btn:I = 0x7f0a05de
+.field public static final search_voice_btn:I = 0x7f0a05c5
 
-.field public static final select_dialog_listview:I = 0x7f0a05df
+.field public static final select_dialog_listview:I = 0x7f0a05c6
 
-.field public static final selected:I = 0x7f0a05e0
+.field public static final selected:I = 0x7f0a05c7
 
-.field public static final shortcut:I = 0x7f0a0719
+.field public static final shortcut:I = 0x7f0a0700
 
-.field public static final smallLabel:I = 0x7f0a071d
+.field public static final smallLabel:I = 0x7f0a0704
 
-.field public static final snackbar_action:I = 0x7f0a071e
+.field public static final snackbar_action:I = 0x7f0a0705
 
-.field public static final snackbar_text:I = 0x7f0a071f
+.field public static final snackbar_text:I = 0x7f0a0706
 
-.field public static final space_around:I = 0x7f0a0723
+.field public static final space_around:I = 0x7f0a070a
 
-.field public static final space_between:I = 0x7f0a0724
+.field public static final space_between:I = 0x7f0a070b
 
-.field public static final spacer:I = 0x7f0a0725
+.field public static final spacer:I = 0x7f0a070c
 
-.field public static final split_action_bar:I = 0x7f0a072c
+.field public static final split_action_bar:I = 0x7f0a070d
 
-.field public static final src_atop:I = 0x7f0a072f
+.field public static final src_atop:I = 0x7f0a0710
 
-.field public static final src_in:I = 0x7f0a0730
+.field public static final src_in:I = 0x7f0a0711
 
-.field public static final src_over:I = 0x7f0a0731
+.field public static final src_over:I = 0x7f0a0712
 
-.field public static final standard:I = 0x7f0a0733
+.field public static final standard:I = 0x7f0a0714
 
-.field public static final start:I = 0x7f0a0734
+.field public static final start:I = 0x7f0a0715
 
-.field public static final stretch:I = 0x7f0a0754
+.field public static final stretch:I = 0x7f0a072c
 
-.field public static final submenuarrow:I = 0x7f0a0755
+.field public static final submenuarrow:I = 0x7f0a072d
 
-.field public static final submit_area:I = 0x7f0a0756
+.field public static final submit_area:I = 0x7f0a072e
 
-.field public static final tabMode:I = 0x7f0a0761
+.field public static final tabMode:I = 0x7f0a0739
 
-.field public static final tag_accessibility_actions:I = 0x7f0a0762
+.field public static final tag_accessibility_actions:I = 0x7f0a073a
 
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0763
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a073b
 
-.field public static final tag_accessibility_heading:I = 0x7f0a0764
+.field public static final tag_accessibility_heading:I = 0x7f0a073c
 
-.field public static final tag_accessibility_pane_title:I = 0x7f0a0765
+.field public static final tag_accessibility_pane_title:I = 0x7f0a073d
 
-.field public static final tag_screen_reader_focusable:I = 0x7f0a0766
+.field public static final tag_screen_reader_focusable:I = 0x7f0a073e
 
-.field public static final tag_transition_group:I = 0x7f0a0767
+.field public static final tag_transition_group:I = 0x7f0a073f
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0768
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0740
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0769
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0741
 
-.field public static final text:I = 0x7f0a076f
+.field public static final text:I = 0x7f0a0747
 
-.field public static final text2:I = 0x7f0a0770
+.field public static final text2:I = 0x7f0a0748
 
-.field public static final textSpacerNoButtons:I = 0x7f0a0771
+.field public static final textSpacerNoButtons:I = 0x7f0a0749
 
-.field public static final textSpacerNoTitle:I = 0x7f0a0772
+.field public static final textSpacerNoTitle:I = 0x7f0a074a
 
-.field public static final text_input_password_toggle:I = 0x7f0a0775
+.field public static final text_input_password_toggle:I = 0x7f0a074d
 
-.field public static final textinput_counter:I = 0x7f0a0778
+.field public static final textinput_counter:I = 0x7f0a0750
 
-.field public static final textinput_error:I = 0x7f0a0779
+.field public static final textinput_error:I = 0x7f0a0751
 
-.field public static final textinput_helper_text:I = 0x7f0a077a
+.field public static final textinput_helper_text:I = 0x7f0a0752
 
-.field public static final time:I = 0x7f0a077d
+.field public static final time:I = 0x7f0a0755
 
-.field public static final title:I = 0x7f0a077e
+.field public static final title:I = 0x7f0a0756
 
-.field public static final titleDividerNoCustom:I = 0x7f0a077f
+.field public static final titleDividerNoCustom:I = 0x7f0a0757
 
-.field public static final title_template:I = 0x7f0a0780
+.field public static final title_template:I = 0x7f0a0758
 
-.field public static final top:I = 0x7f0a0785
+.field public static final top:I = 0x7f0a075d
 
-.field public static final topPanel:I = 0x7f0a0786
+.field public static final topPanel:I = 0x7f0a075e
 
-.field public static final touch_outside:I = 0x7f0a0788
+.field public static final touch_outside:I = 0x7f0a0760
 
-.field public static final transition_current_scene:I = 0x7f0a0789
+.field public static final transition_current_scene:I = 0x7f0a0761
 
-.field public static final transition_layout_save:I = 0x7f0a078a
+.field public static final transition_layout_save:I = 0x7f0a0762
 
-.field public static final transition_position:I = 0x7f0a078b
+.field public static final transition_position:I = 0x7f0a0763
 
-.field public static final transition_scene_layoutid_cache:I = 0x7f0a078c
+.field public static final transition_scene_layoutid_cache:I = 0x7f0a0764
 
-.field public static final transition_transform:I = 0x7f0a078d
+.field public static final transition_transform:I = 0x7f0a0765
 
-.field public static final uniform:I = 0x7f0a0799
+.field public static final uniform:I = 0x7f0a0771
 
-.field public static final unlabeled:I = 0x7f0a079a
+.field public static final unlabeled:I = 0x7f0a0772
 
-.field public static final up:I = 0x7f0a079c
+.field public static final up:I = 0x7f0a0774
 
-.field public static final view_offset_helper:I = 0x7f0a082e
+.field public static final view_offset_helper:I = 0x7f0a07f4
 
-.field public static final visible:I = 0x7f0a0831
+.field public static final visible:I = 0x7f0a07f7
 
-.field public static final wide:I = 0x7f0a085e
+.field public static final wide:I = 0x7f0a0823
 
-.field public static final wrap:I = 0x7f0a0880
+.field public static final wrap:I = 0x7f0a0845
 
-.field public static final wrap_content:I = 0x7f0a0881
+.field public static final wrap_content:I = 0x7f0a0846
 
-.field public static final wrap_reverse:I = 0x7f0a0882
+.field public static final wrap_reverse:I = 0x7f0a0847
 
 
 # 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 a87f78e376..2a0f448af7 100644
--- a/com.discord/smali/com/discord/restapi/R$layout.smali
+++ b/com.discord/smali/com/discord/restapi/R$layout.smali
@@ -123,9 +123,9 @@
 
 .field public static final select_dialog_singlechoice_material:I = 0x7f0d005a
 
-.field public static final support_simple_spinner_dropdown_item:I = 0x7f0d0062
+.field public static final support_simple_spinner_dropdown_item:I = 0x7f0d0061
 
-.field public static final view_chip_default:I = 0x7f0d0083
+.field public static final view_chip_default:I = 0x7f0d0082
 
 
 # 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 0da64cd581..7da871ad6f 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 = 0x7f120365
+.field public static final bottom_sheet_behavior:I = 0x7f120340
 
-.field public static final character_counter_content_description:I = 0x7f1203f0
+.field public static final character_counter_content_description:I = 0x7f1203cb
 
-.field public static final character_counter_pattern:I = 0x7f1203f1
+.field public static final character_counter_pattern:I = 0x7f1203cc
 
-.field public static final common_google_play_services_enable_button:I = 0x7f120430
+.field public static final common_google_play_services_enable_button:I = 0x7f12040b
 
-.field public static final common_google_play_services_enable_text:I = 0x7f120431
+.field public static final common_google_play_services_enable_text:I = 0x7f12040c
 
-.field public static final common_google_play_services_enable_title:I = 0x7f120432
+.field public static final common_google_play_services_enable_title:I = 0x7f12040d
 
-.field public static final common_google_play_services_install_button:I = 0x7f120433
+.field public static final common_google_play_services_install_button:I = 0x7f12040e
 
-.field public static final common_google_play_services_install_text:I = 0x7f120434
+.field public static final common_google_play_services_install_text:I = 0x7f12040f
 
-.field public static final common_google_play_services_install_title:I = 0x7f120435
+.field public static final common_google_play_services_install_title:I = 0x7f120410
 
-.field public static final common_google_play_services_notification_channel_name:I = 0x7f120436
+.field public static final common_google_play_services_notification_channel_name:I = 0x7f120411
 
-.field public static final common_google_play_services_notification_ticker:I = 0x7f120437
+.field public static final common_google_play_services_notification_ticker:I = 0x7f120412
 
-.field public static final common_google_play_services_unknown_issue:I = 0x7f120438
+.field public static final common_google_play_services_unknown_issue:I = 0x7f120413
 
-.field public static final common_google_play_services_unsupported_text:I = 0x7f120439
+.field public static final common_google_play_services_unsupported_text:I = 0x7f120414
 
-.field public static final common_google_play_services_update_button:I = 0x7f12043a
+.field public static final common_google_play_services_update_button:I = 0x7f120415
 
-.field public static final common_google_play_services_update_text:I = 0x7f12043b
+.field public static final common_google_play_services_update_text:I = 0x7f120416
 
-.field public static final common_google_play_services_update_title:I = 0x7f12043c
+.field public static final common_google_play_services_update_title:I = 0x7f120417
 
-.field public static final common_google_play_services_updating_text:I = 0x7f12043d
+.field public static final common_google_play_services_updating_text:I = 0x7f120418
 
-.field public static final common_google_play_services_wear_update_text:I = 0x7f12043e
+.field public static final common_google_play_services_wear_update_text:I = 0x7f120419
 
-.field public static final common_open_on_phone:I = 0x7f12043f
+.field public static final common_open_on_phone:I = 0x7f12041a
 
-.field public static final common_signin_button_text:I = 0x7f120440
+.field public static final common_signin_button_text:I = 0x7f12041b
 
-.field public static final common_signin_button_text_long:I = 0x7f120441
+.field public static final common_signin_button_text_long:I = 0x7f12041c
 
-.field public static final fab_transformation_scrim_behavior:I = 0x7f1205d8
+.field public static final fab_transformation_scrim_behavior:I = 0x7f1205b3
 
-.field public static final fab_transformation_sheet_behavior:I = 0x7f1205d9
+.field public static final fab_transformation_sheet_behavior:I = 0x7f1205b4
 
-.field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f120968
+.field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f120932
 
-.field public static final mtrl_chip_close_icon_content_description:I = 0x7f120c0a
+.field public static final mtrl_chip_close_icon_content_description:I = 0x7f120bd3
 
-.field public static final password_toggle_content_description:I = 0x7f120d77
+.field public static final password_toggle_content_description:I = 0x7f120d3f
 
-.field public static final path_password_eye:I = 0x7f120d7a
+.field public static final path_password_eye:I = 0x7f120d42
 
-.field public static final path_password_eye_mask_strike_through:I = 0x7f120d7b
+.field public static final path_password_eye_mask_strike_through:I = 0x7f120d43
 
-.field public static final path_password_eye_mask_visible:I = 0x7f120d7c
+.field public static final path_password_eye_mask_visible:I = 0x7f120d44
 
-.field public static final path_password_strike_through:I = 0x7f120d7d
+.field public static final path_password_strike_through:I = 0x7f120d45
 
-.field public static final search_menu_title:I = 0x7f121098
+.field public static final search_menu_title:I = 0x7f12100c
 
-.field public static final status_bar_notification_info_overflow:I = 0x7f121165
+.field public static final status_bar_notification_info_overflow:I = 0x7f1210d9
 
 
 # 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 8dd4c43197..5abd07bd9a 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, 0x7f04027d
+    const v9, 0x7f04027c
 
     aput v9, v6, v3
 
@@ -2180,7 +2180,7 @@
 
     new-array v5, v1, [I
 
-    const v6, 0x7f040315
+    const v6, 0x7f040314
 
     aput v6, v5, v3
 
@@ -2364,15 +2364,15 @@
         0x7f0401d6
         0x7f0401f9
         0x7f040203
-        0x7f040267
-        0x7f040283
-        0x7f04029b
+        0x7f040266
+        0x7f040282
+        0x7f04029a
+        0x7f0402c8
         0x7f0402c9
-        0x7f0402ca
-        0x7f040323
-        0x7f040326
-        0x7f0403bf
-        0x7f0403c9
+        0x7f040322
+        0x7f040325
+        0x7f0403be
+        0x7f0403c8
     .end array-data
 
     :array_1
@@ -2381,8 +2381,8 @@
         0x7f04004c
         0x7f0400b3
         0x7f04015c
-        0x7f040326
-        0x7f0403c9
+        0x7f040325
+        0x7f0403c8
     .end array-data
 
     :array_2
@@ -2396,11 +2396,11 @@
         0x10100f2
         0x7f040079
         0x7f04007a
+        0x7f04025d
         0x7f04025e
-        0x7f04025f
-        0x7f040280
+        0x7f04027f
+        0x7f040307
         0x7f040308
-        0x7f040309
     .end array-data
 
     :array_4
@@ -2434,15 +2434,15 @@
         0x1010540
         0x7f04011a
         0x7f040121
-        0x7f040259
+        0x7f040258
     .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
-        0x7f040313
+        0x7f040312
+        0x7f0403bc
         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
-        0x7f04025a
-        0x7f040349
+        0x7f040259
+        0x7f040348
     .end array-data
 
     :array_e
@@ -2566,41 +2566,41 @@
         0x7f040119
         0x7f040168
         0x7f0401e1
+        0x7f04025b
         0x7f04025c
-        0x7f04025d
+        0x7f04025f
         0x7f040260
         0x7f040261
         0x7f040262
         0x7f040263
         0x7f040264
         0x7f040265
-        0x7f040266
+        0x7f04028f
         0x7f040290
         0x7f040291
-        0x7f040292
-        0x7f04029a
-        0x7f04029c
-        0x7f0402cf
+        0x7f040299
+        0x7f04029b
+        0x7f0402ce
+        0x7f0402d1
         0x7f0402d2
         0x7f0402d3
-        0x7f0402d4
-        0x7f0402fb
+        0x7f0402fa
+        0x7f0402fc
         0x7f0402fd
         0x7f0402fe
-        0x7f0402ff
+        0x7f04030f
         0x7f040310
-        0x7f040311
-        0x7f04032a
+        0x7f040329
+        0x7f040353
         0x7f040354
         0x7f040355
         0x7f040356
-        0x7f040357
+        0x7f040358
         0x7f040359
         0x7f04035a
         0x7f04035b
-        0x7f04035c
+        0x7f04035e
         0x7f04035f
-        0x7f040360
         0x7f0403cb
         0x7f0403cc
         0x7f0403cd
@@ -2639,7 +2639,7 @@
         0x7f040207
         0x7f040208
         0x7f04020b
-        0x7f04027f
+        0x7f04027e
     .end array-data
 
     :array_11
@@ -2699,10 +2699,10 @@
         0x7f040160
         0x7f0401d7
         0x7f0401db
-        0x7f0402d8
-        0x7f040306
-        0x7f040361
-        0x7f040363
+        0x7f0402d7
+        0x7f040305
+        0x7f040360
+        0x7f040362
     .end array-data
 
     :array_14
@@ -2711,8 +2711,8 @@
         0x7f0400a3
         0x7f0400a4
         0x7f0400a5
+        0x7f040309
         0x7f04030a
-        0x7f04030b
     .end array-data
 
     :array_15
@@ -2752,11 +2752,11 @@
         0x7f040126
         0x7f040127
         0x7f040128
-        0x7f0402f6
-        0x7f0402f8
-        0x7f04031b
+        0x7f0402f5
+        0x7f0402f7
+        0x7f04031a
+        0x7f0403be
         0x7f0403bf
-        0x7f0403c0
         0x7f0403ca
     .end array-data
 
@@ -2783,7 +2783,7 @@
     :array_1a
     .array-data 4
         0x7f04020a
-        0x7f04031a
+        0x7f040319
     .end array-data
 
     :array_1b
@@ -2811,8 +2811,8 @@
         0x7f0400b8
         0x7f040112
         0x7f040150
-        0x7f04030f
-        0x7f0403b6
+        0x7f04030e
+        0x7f0403b5
     .end array-data
 
     :array_1e
@@ -2825,9 +2825,9 @@
         0x7f04013b
         0x7f040142
         0x7f040209
+        0x7f040301
         0x7f040302
         0x7f040303
-        0x7f040304
     .end array-data
 
     :array_1f
@@ -2854,10 +2854,10 @@
         0x7f04012e
         0x7f040160
         0x7f04016a
-        0x7f04027c
-        0x7f04029f
-        0x7f0402d8
-        0x7f040306
+        0x7f04027b
+        0x7f04029e
+        0x7f0402d7
+        0x7f040305
         0x7f0403e7
     .end array-data
 
@@ -2866,7 +2866,7 @@
         0x7f040139
         0x7f04013a
         0x7f040204
-        0x7f04025b
+        0x7f04025a
     .end array-data
 
     :array_22
@@ -2907,15 +2907,16 @@
         0x7f04012f
         0x7f040130
         0x7f040131
-        0x7f040289
+        0x7f040288
+        0x7f040297
         0x7f040298
-        0x7f040299
-        0x7f04029e
+        0x7f04029d
+        0x7f0402c5
         0x7f0402c6
         0x7f0402c7
-        0x7f0402c8
+        0x7f0402d4
         0x7f0402d5
-        0x7f0402d6
+        0x7f0402d8
         0x7f0402d9
         0x7f0402da
         0x7f0402db
@@ -2929,7 +2930,6 @@
         0x7f0402e3
         0x7f0402e4
         0x7f0402e5
-        0x7f0402e6
         0x7f0403ed
     .end array-data
 
@@ -2964,8 +2964,8 @@
         0x1010128
         0x7f04010b
         0x7f040110
-        0x7f04027e
-        0x7f040305
+        0x7f04027d
+        0x7f040304
     .end array-data
 
     :array_29
@@ -3004,15 +3004,15 @@
         0x7f0401da
         0x7f0401dc
         0x7f0401dd
-        0x7f0402d8
+        0x7f0402d7
+        0x7f04031e
         0x7f04031f
-        0x7f040320
     .end array-data
 
     :array_2d
     .array-data 4
+        0x7f04031e
         0x7f04031f
-        0x7f040320
     .end array-data
 
     :array_2e
@@ -3029,12 +3029,13 @@
         0x7f0400c7
         0x7f040119
         0x7f040143
+        0x7f040277
         0x7f040278
-        0x7f040279
-        0x7f040284
-        0x7f0402f7
-        0x7f04030c
-        0x7f040342
+        0x7f040283
+        0x7f0402f6
+        0x7f04030b
+        0x7f040341
+        0x7f040349
         0x7f04034a
         0x7f04034b
         0x7f04034c
@@ -3044,11 +3045,10 @@
         0x7f040350
         0x7f040351
         0x7f040352
-        0x7f040353
-        0x7f040358
+        0x7f040357
+        0x7f04035c
         0x7f04035d
-        0x7f04035e
-        0x7f040362
+        0x7f040361
     .end array-data
 
     :array_2f
@@ -3083,8 +3083,8 @@
         0x7f0400ce
         0x7f0401dc
         0x7f0401dd
-        0x7f040287
-        0x7f040301
+        0x7f040286
+        0x7f040300
         0x7f0403cf
     .end array-data
 
@@ -3097,8 +3097,8 @@
         0x101012f
         0x1010130
         0x1010131
-        0x7f04029d
-        0x7f040321
+        0x7f04029c
+        0x7f040320
     .end array-data
 
     :array_32
@@ -3114,20 +3114,20 @@
         0x7f040202
         0x7f040205
         0x7f040208
-        0x7f04027f
+        0x7f04027e
     .end array-data
 
     :array_33
     .array-data 4
         0x1010176
         0x10102c9
-        0x7f040288
+        0x7f040287
     .end array-data
 
     :array_34
     .array-data 4
-        0x7f04028c
-        0x7f04028f
+        0x7f04028b
+        0x7f04028e
     .end array-data
 
     :array_35
@@ -3140,9 +3140,9 @@
         0x7f040135
         0x7f040136
         0x7f04020e
-        0x7f0402d7
-        0x7f04030e
-        0x7f040314
+        0x7f0402d6
+        0x7f04030d
+        0x7f040313
     .end array-data
 
     :array_36
@@ -3157,12 +3157,12 @@
         0x7f040155
         0x7f0401de
         0x7f04020d
+        0x7f0402cc
         0x7f0402cd
-        0x7f0402ce
+        0x7f0402f8
         0x7f0402f9
-        0x7f0402fa
-        0x7f040322
-        0x7f040327
+        0x7f040321
+        0x7f040326
         0x7f0403ef
     .end array-data
 
@@ -3170,7 +3170,7 @@
     .array-data 4
         0x7f04007b
         0x7f0400c6
-        0x7f0402f5
+        0x7f0402f4
     .end array-data
 
     :array_38
@@ -3182,15 +3182,16 @@
         0x7f04012f
         0x7f040130
         0x7f040131
-        0x7f040289
+        0x7f040288
+        0x7f040297
         0x7f040298
-        0x7f040299
-        0x7f04029e
+        0x7f04029d
+        0x7f0402c5
         0x7f0402c6
         0x7f0402c7
-        0x7f0402c8
+        0x7f0402d4
         0x7f0402d5
-        0x7f0402d6
+        0x7f0402d8
         0x7f0402d9
         0x7f0402da
         0x7f0402db
@@ -3204,21 +3205,20 @@
         0x7f0402e3
         0x7f0402e4
         0x7f0402e5
-        0x7f0402e6
         0x7f0403ed
     .end array-data
 
     :array_39
     .array-data 4
+        0x7f04030b
         0x7f04030c
-        0x7f04030d
     .end array-data
 
     :array_3a
     .array-data 4
         0x101011f
         0x7f04011a
-        0x7f04027a
+        0x7f040279
     .end array-data
 
     :array_3b
@@ -3227,7 +3227,7 @@
         0x1010176
         0x101017b
         0x1010262
-        0x7f04029b
+        0x7f04029a
     .end array-data
 
     :array_3c
@@ -3245,14 +3245,14 @@
         0x1010124
         0x1010125
         0x1010142
-        0x7f040307
-        0x7f040312
+        0x7f040306
+        0x7f040311
+        0x7f040327
         0x7f040328
-        0x7f040329
-        0x7f04032b
+        0x7f04032a
+        0x7f0403b6
         0x7f0403b7
         0x7f0403b8
-        0x7f0403b9
         0x7f0403d0
         0x7f0403d1
         0x7f0403d2
@@ -3267,6 +3267,7 @@
 
     :array_3f
     .array-data 4
+        0x7f04032b
         0x7f04032c
         0x7f04032d
         0x7f04032e
@@ -3288,10 +3289,9 @@
         0x7f04033e
         0x7f04033f
         0x7f040340
-        0x7f040341
+        0x7f040342
         0x7f040343
         0x7f040344
-        0x7f040345
     .end array-data
 
     :array_40
@@ -3308,7 +3308,7 @@
         0x1010164
         0x10103ac
         0x7f040145
-        0x7f040349
+        0x7f040348
     .end array-data
 
     :array_41
@@ -3336,11 +3336,11 @@
         0x7f040164
         0x7f040166
         0x7f040167
+        0x7f040292
         0x7f040293
         0x7f040294
         0x7f040295
         0x7f040296
-        0x7f040297
     .end array-data
 
     :array_42
@@ -3363,16 +3363,17 @@
         0x7f0400d2
         0x7f0400d3
         0x7f0400d4
+        0x7f040266
         0x7f040267
-        0x7f040268
-        0x7f04027b
+        0x7f04027a
+        0x7f040280
         0x7f040281
-        0x7f040282
-        0x7f04029b
+        0x7f04029a
+        0x7f040322
         0x7f040323
         0x7f040324
-        0x7f040325
-        0x7f0403bf
+        0x7f0403be
+        0x7f0403c0
         0x7f0403c1
         0x7f0403c2
         0x7f0403c3
@@ -3380,16 +3381,15 @@
         0x7f0403c5
         0x7f0403c6
         0x7f0403c7
-        0x7f0403c8
     .end array-data
 
     :array_44
     .array-data 4
         0x1010000
         0x10100da
+        0x7f04028c
         0x7f04028d
-        0x7f04028e
-        0x7f040365
+        0x7f040364
     .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 a2e0903f86..e6f3bdd8ed 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;->Fx()Lokhttp3/w;
+    invoke-interface {p1}, Lokhttp3/Interceptor$Chain;->Fv()Lokhttp3/w;
 
     move-result-object v4
 
-    invoke-virtual {v4}, Lokhttp3/w;->FL()Lokhttp3/w$a;
+    invoke-virtual {v4}, Lokhttp3/w;->FJ()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;->FN()Lokhttp3/w;
+    invoke-virtual {v3}, Lokhttp3/w$a;->FL()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 40528cf5e6..b686fee766 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 c802c069a1..b34431cb7b 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;->aSS:Lcom/google/gson/d;
+    sget-object v1, Lcom/google/gson/d;->aSO:Lcom/google/gson/d;
 
-    iput-object v1, v0, Lcom/google/gson/f;->aTj:Lcom/google/gson/e;
+    iput-object v1, v0, Lcom/google/gson/f;->aTf: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;->aSY:Ljava/util/List;
+    iget-object v2, v0, Lcom/google/gson/f;->aSU: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;->aSY:Ljava/util/List;
+    iget-object v4, v0, Lcom/google/gson/f;->aSU: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;->Az()Lcom/google/gson/Gson;
+    invoke-virtual {v0}, Lcom/google/gson/f;->Ax()Lcom/google/gson/Gson;
 
     move-result-object p4
 
@@ -276,7 +276,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lb/a/a/i;->IF()Lb/a/a/i;
+    invoke-static {}, Lb/a/a/i;->ID()Lb/a/a/i;
 
     move-result-object p5
 
@@ -286,7 +286,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lb/b/b/c;->IG()Lb/b/b/c;
+    invoke-static {}, Lb/b/b/c;->IE()Lb/b/b/c;
 
     move-result-object p5
 
@@ -310,7 +310,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lb/n$a;->IC()Lb/n;
+    invoke-virtual {p1}, Lb/n$a;->IA()Lb/n;
 
     move-result-object p1
 
@@ -432,7 +432,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lokhttp3/t$a;->FD()Lokhttp3/t;
+    invoke-virtual {p1}, Lokhttp3/t$a;->FB()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 ebbabe4b02..0e438b9ddc 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;
-            IH = true
+            IF = true
             value = "reaction"
         .end annotation
     .end param
@@ -1789,7 +1789,7 @@
     .end param
     .param p5    # Ljava/lang/String;
         .annotation runtime Lb/c/s;
-            IH = true
+            IF = true
             value = "emoji"
         .end annotation
     .end param
@@ -1902,22 +1902,6 @@
     .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"
@@ -1934,6 +1918,37 @@
     .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;
@@ -2521,7 +2536,7 @@
     .end param
     .param p5    # Ljava/lang/String;
         .annotation runtime Lb/c/s;
-            IH = true
+            IF = true
             value = "reaction"
         .end annotation
     .end param
@@ -2586,7 +2601,7 @@
     .end param
     .param p5    # Ljava/lang/String;
         .annotation runtime Lb/c/s;
-            IH = true
+            IF = true
             value = "reaction"
         .end annotation
     .end param
@@ -3173,25 +3188,19 @@
     .end annotation
 .end method
 
-.method public abstract subscribeToGuild(JLcom/discord/restapi/RestAPIParams$PremiumGuildSubscribe;)Lrx/Observable;
+.method public abstract subscribeToGuild(J)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",
-            "Lcom/discord/restapi/RestAPIParams$PremiumGuildSubscribe;",
-            ")",
+            "(J)",
             "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
deleted file mode 100644
index d2e57a946a..0000000000
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$PremiumGuildSubscribe.smali
+++ /dev/null
@@ -1,40 +0,0 @@
-.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.smali b/com.discord/smali/com/discord/restapi/RestAPIParams.smali
index 9b8cd5057f..71c31481b9 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams.smali
@@ -54,8 +54,7 @@
         Lcom/discord/restapi/RestAPIParams$DisableAccount;,
         Lcom/discord/restapi/RestAPIParams$ActivateMfaSMS;,
         Lcom/discord/restapi/RestAPIParams$OAuth2Authorize;,
-        Lcom/discord/restapi/RestAPIParams$GenerateGiftCode;,
-        Lcom/discord/restapi/RestAPIParams$PremiumGuildSubscribe;
+        Lcom/discord/restapi/RestAPIParams$GenerateGiftCode;
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/restapi/SpotifyTokenInterceptor.smali b/com.discord/smali/com/discord/restapi/SpotifyTokenInterceptor.smali
index 5bff155b93..abd1480a22 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;->Fx()Lokhttp3/w;
+    invoke-interface {p1}, Lokhttp3/Interceptor$Chain;->Fv()Lokhttp3/w;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokhttp3/w;->FL()Lokhttp3/w$a;
+    invoke-virtual {v0}, Lokhttp3/w;->FJ()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;->FN()Lokhttp3/w;
+    invoke-virtual {v0}, Lokhttp3/w$a;->FL()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 3bd2350640..1b443f2189 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 75303c713f..be7f1066ed 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -160,7 +160,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ak;->Jz()Lrx/internal/a/ak;
+    invoke-static {}, Lrx/internal/a/ak;->Jx()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 e06f900cf9..6a3a5c3b49 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;->CG()I
+    invoke-virtual {v0}, Lb/h;->CE()I
 
     move-result v2
 
-    invoke-virtual {v0}, Lb/h;->It()Lb/m;
+    invoke-virtual {v0}, Lb/h;->Ir()Lb/m;
 
     move-result-object v0
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v0}, Lb/m;->IB()Lokhttp3/Response;
+    invoke-virtual {v0}, Lb/m;->Iz()Lokhttp3/Response;
 
     move-result-object v0
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v0}, Lokhttp3/Response;->Fx()Lokhttp3/w;
+    invoke-virtual {v0}, Lokhttp3/Response;->Fv()Lokhttp3/w;
 
     move-result-object v0
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v0}, Lokhttp3/w;->FK()Ljava/lang/String;
+    invoke-virtual {v0}, Lokhttp3/w;->FI()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 fe62a7bfa2..bdfba1cc54 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 f775a3e8ea..5e6bd8334f 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;Ljava/lang/String;JLcom/discord/rtcconnection/mediaengine/MediaEngine;ZLcom/discord/utilities/logging/Logger;Lcom/discord/utilities/networking/NetworkMonitor;)V
+    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
 .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 2c92be24e4..0c1ca9631c 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 zg:Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;
-
 .field public static final enum zh:Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;
 
 .field public static final enum zi:Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;
 
-.field private static final synthetic zj:[Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;
+.field public static final enum zj:Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;
+
+.field private static final synthetic zk:[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;->zg:Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;
+    sput-object v1, Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;->zh: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;->zh:Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;
+    sput-object v1, Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;->zi: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;->zi:Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;
+    sput-object v1, Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;->zj:Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;->zj:[Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;
+    sput-object v0, Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;->zk:[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;->zj:[Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;
+    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;->zk:[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 c5a6324257..9d360f1af0 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 zk:Lcom/discord/rtcconnection/RtcConnection$Quality;
-
 .field public static final enum zl:Lcom/discord/rtcconnection/RtcConnection$Quality;
 
 .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 enum zo:Lcom/discord/rtcconnection/RtcConnection$Quality;
 
-.field public static final zp:Lcom/discord/rtcconnection/RtcConnection$Quality$a;
+.field private static final synthetic zp:[Lcom/discord/rtcconnection/RtcConnection$Quality;
+
+.field public static final zq: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;->zk:Lcom/discord/rtcconnection/RtcConnection$Quality;
+    sput-object v1, Lcom/discord/rtcconnection/RtcConnection$Quality;->zl: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;->zl:Lcom/discord/rtcconnection/RtcConnection$Quality;
+    sput-object v1, Lcom/discord/rtcconnection/RtcConnection$Quality;->zm: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;->zm:Lcom/discord/rtcconnection/RtcConnection$Quality;
+    sput-object v1, Lcom/discord/rtcconnection/RtcConnection$Quality;->zn: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;->zn:Lcom/discord/rtcconnection/RtcConnection$Quality;
+    sput-object v1, Lcom/discord/rtcconnection/RtcConnection$Quality;->zo:Lcom/discord/rtcconnection/RtcConnection$Quality;
 
     aput-object v1, v0, v3
 
-    sput-object v0, Lcom/discord/rtcconnection/RtcConnection$Quality;->zo:[Lcom/discord/rtcconnection/RtcConnection$Quality;
+    sput-object v0, Lcom/discord/rtcconnection/RtcConnection$Quality;->zp:[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;->zp:Lcom/discord/rtcconnection/RtcConnection$Quality$a;
+    sput-object v0, Lcom/discord/rtcconnection/RtcConnection$Quality;->zq: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;->zo:[Lcom/discord/rtcconnection/RtcConnection$Quality;
+    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$Quality;->zp:[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 ad6394c0c1..8219b5ab1f 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 zq:Lcom/discord/rtcconnection/RtcConnection$State$a;
+.field public static final zr: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;->zq:Lcom/discord/rtcconnection/RtcConnection$State$a;
+    sput-object v0, Lcom/discord/rtcconnection/RtcConnection$State$a;->zr: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 94121b91dd..a014ee939b 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 zr:Lcom/discord/rtcconnection/RtcConnection$State$b;
+.field public static final zs: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;->zr:Lcom/discord/rtcconnection/RtcConnection$State$b;
+    sput-object v0, Lcom/discord/rtcconnection/RtcConnection$State$b;->zs: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 4fa08cb701..411e55e3e9 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 zs:Lcom/discord/rtcconnection/RtcConnection$State$c;
+.field public static final zt: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;->zs:Lcom/discord/rtcconnection/RtcConnection$State$c;
+    sput-object v0, Lcom/discord/rtcconnection/RtcConnection$State$c;->zt: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 371f352057..896d76f58b 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 zt:Z
+.field public final zu: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;->zt:Z
+    iput-boolean p1, p0, Lcom/discord/rtcconnection/RtcConnection$State$d;->zu: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;->zt:Z
+    iget-boolean v1, p0, Lcom/discord/rtcconnection/RtcConnection$State$d;->zu:Z
 
-    iget-boolean p1, p1, Lcom/discord/rtcconnection/RtcConnection$State$d;->zt:Z
+    iget-boolean p1, p1, Lcom/discord/rtcconnection/RtcConnection$State$d;->zu: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;->zt:Z
+    iget-boolean v0, p0, Lcom/discord/rtcconnection/RtcConnection$State$d;->zu: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;->zt:Z
+    iget-boolean v1, p0, Lcom/discord/rtcconnection/RtcConnection$State$d;->zu: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 5db161f973..14bab993c9 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 zu:Lcom/discord/rtcconnection/RtcConnection$State$e;
+.field public static final zv: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;->zu:Lcom/discord/rtcconnection/RtcConnection$State$e;
+    sput-object v0, Lcom/discord/rtcconnection/RtcConnection$State$e;->zv: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 3f8db8d432..e678e8557b 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 zv:Lcom/discord/rtcconnection/RtcConnection$State$f;
+.field public static final zw: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;->zv:Lcom/discord/rtcconnection/RtcConnection$State$f;
+    sput-object v0, Lcom/discord/rtcconnection/RtcConnection$State$f;->zw: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 1c139b8a55..45290b5dc5 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 zw:Lcom/discord/rtcconnection/RtcConnection$State$g;
+.field public static final zx: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;->zw:Lcom/discord/rtcconnection/RtcConnection$State$g;
+    sput-object v0, Lcom/discord/rtcconnection/RtcConnection$State$g;->zx: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 d3c4c5cd2a..ab27a497c7 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 zx:Lcom/discord/rtcconnection/RtcConnection$State$h;
+.field public static final zy: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;->zx:Lcom/discord/rtcconnection/RtcConnection$State$h;
+    sput-object v0, Lcom/discord/rtcconnection/RtcConnection$State$h;->zy: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 1ba8ae1012..532d5444d3 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 a569f18d77..e499b8497e 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 final Lcom/discord/rtcconnection/RtcConnection$d;
+.class public final Lcom/discord/rtcconnection/RtcConnection$d;
 .super Lkotlin/jvm/internal/m;
 .source "RtcConnection.kt"
 
@@ -7,12 +7,12 @@
 
 
 # annotations
-.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;
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/rtcconnection/RtcConnection;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
+    accessFlags = 0x19
     name = null
 .end annotation
 
@@ -37,7 +37,7 @@
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/rtcconnection/RtcConnection;Ljavax/net/ssl/SSLSocketFactory;Ljava/lang/String;Ljava/lang/String;)V
+.method public 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;->AS:Lcom/discord/rtcconnection/socket/a$d;
+    sget-object v5, Lcom/discord/rtcconnection/socket/a$d;->AV: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;->AJ:Z
+    iput-boolean v4, v3, Lcom/discord/rtcconnection/socket/a;->AM: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;->zr:Lcom/discord/rtcconnection/RtcConnection$State$b;
+    sget-object v2, Lcom/discord/rtcconnection/RtcConnection$State$b;->zs: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;->eC()Ljava/util/concurrent/ExecutorService;
+    invoke-interface {v3}, Lcom/discord/rtcconnection/mediaengine/MediaEngine;->eB()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;->eE()Z
+    invoke-virtual {v2}, Lcom/discord/rtcconnection/socket/a;->eD()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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 533b6651cd..7aeaa4487b 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 final Lcom/discord/rtcconnection/RtcConnection$e;
+.class public final Lcom/discord/rtcconnection/RtcConnection$e;
 .super Lkotlin/jvm/internal/m;
 .source "RtcConnection.kt"
 
@@ -7,12 +7,12 @@
 
 
 # annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/rtcconnection/RtcConnection;->eu()Ljava/util/concurrent/Future;
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/rtcconnection/RtcConnection;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
+    accessFlags = 0x19
     name = null
 .end annotation
 
@@ -31,7 +31,7 @@
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/rtcconnection/RtcConnection;)V
+.method public 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 cf81dede65..7690358c12 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 zy:Lcom/discord/rtcconnection/RtcConnection$f;
+.field public static final zz: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;->zy:Lcom/discord/rtcconnection/RtcConnection$f;
+    sput-object v0, Lcom/discord/rtcconnection/RtcConnection$f;->zz: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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 7ec2cf3921..69107a8f59 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;Ljava/lang/String;JLcom/discord/rtcconnection/mediaengine/MediaEngine;ZLcom/discord/utilities/logging/Logger;Lcom/discord/utilities/networking/NetworkMonitor;)V
+    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
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -39,12 +39,11 @@
 
 
 # virtual methods
-.method public final onConnected(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;Ljava/util/List;)V
+.method public final onConnected(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;",
@@ -52,67 +51,51 @@
         }
     .end annotation
 
-    const-string v0, "connection"
+    const-string v0, "transportInfo"
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string p1, "transportInfo"
+    const-string v0, "supportedVideoCodecs"
 
-    invoke-static {p2, p1}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string p1, "supportedVideoCodecs"
+    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection$g;->this$0:Lcom/discord/rtcconnection/RtcConnection;
 
-    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
+    invoke-static {v0, p1, p2}, 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;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;)V
+.method public final onConnectionStateChange(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;)V
     .locals 1
 
-    const-string v0, "connection"
+    const-string v0, "connectionState"
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string p1, "connectionState"
+    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection$g;->this$0:Lcom/discord/rtcconnection/RtcConnection;
 
-    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
+    invoke-static {v0, p1}, Lcom/discord/rtcconnection/RtcConnection;->a(Lcom/discord/rtcconnection/RtcConnection;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;)V
 
     return-void
 .end method
 
-.method public final onDestroy(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;)V
-    .locals 1
-
-    const-string v0, "connection"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+.method public final onDestroy()V
+    .locals 0
 
     return-void
 .end method
 
-.method public final onError(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException;)V
+.method public final onError(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException;)V
     .locals 1
 
-    const-string v0, "connection"
+    const-string v0, "exception"
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string p1, "exception"
+    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection$g;->this$0:Lcom/discord/rtcconnection/RtcConnection;
 
-    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
+    invoke-static {v0, p1}, 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 fd1b6ea287..57adff95ca 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 a70bbc9ba9..19fe4c0ca8 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 9a99d27e29..2cf403e935 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 9c6e6cc10f..15d430930f 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 876f3ca6f3..45c6e127d6 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 fa73d3c9d6..a113096319 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 7a021ab5b7..9534482383 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;Ljava/lang/String;JLcom/discord/rtcconnection/mediaengine/MediaEngine;ZLcom/discord/utilities/logging/Logger;Lcom/discord/utilities/networking/NetworkMonitor;)V
+    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
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -114,7 +114,7 @@
     return-void
 .end method
 
-.method public final ey()V
+.method public final ex()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 ez()V
+.method public final ey()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 2470c9f618..1b0d1fab16 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 ze:I
+.field private static zf:I
 
-.field public static final zf:Lcom/discord/rtcconnection/RtcConnection$a;
+.field public static final zg:Lcom/discord/rtcconnection/RtcConnection$a;
 
 
 # instance fields
@@ -32,7 +32,7 @@
 
 .field public final id:Ljava/lang/String;
 
-.field private final listeners:Ljava/util/List;
+.field public final listeners:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -46,25 +46,23 @@
 
 .field private final mediaEngine:Lcom/discord/rtcconnection/mediaengine/MediaEngine;
 
-.field public mediaSessionId:Ljava/lang/String;
-
-.field private final rtcServerId:Ljava/lang/String;
+.field private mediaSessionId:Ljava/lang/String;
 
 .field public sessionId:Ljava/lang/String;
 
 .field private final userId:J
 
-.field private final yQ:Ljava/lang/String;
+.field private final yS:Ljava/lang/String;
 
-.field private final yR:Lcom/discord/rtcconnection/d;
+.field private final yT:Lcom/discord/rtcconnection/d;
 
-.field private final yS:Lcom/discord/utilities/networking/Backoff;
+.field private final yU:Lcom/discord/utilities/networking/Backoff;
 
-.field private yT:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;
+.field private yV:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;
 
-.field private yU:Z
+.field private yW:Z
 
-.field private yV:Ljava/util/LinkedList;
+.field private yX:Ljava/util/LinkedList;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/LinkedList<",
@@ -74,21 +72,19 @@
     .end annotation
 .end field
 
-.field private yW:Lcom/discord/rtcconnection/socket/a;
+.field private yY:Lcom/discord/rtcconnection/socket/a;
 
-.field public yX:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
+.field private yZ:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
 
-.field private yY:Ljava/lang/Integer;
+.field private za:Ljava/lang/Integer;
 
-.field private yZ:I
+.field private zb:I
 
-.field private za:Ljava/lang/Long;
+.field private zc:Ljava/lang/Long;
 
-.field private final zb:Lcom/discord/rtcconnection/RtcConnection$n;
+.field private final zd:Lcom/discord/rtcconnection/RtcConnection$n;
 
-.field private final zc:Lcom/discord/rtcconnection/RtcConnection$g;
-
-.field private final zd:Z
+.field private final ze:Lcom/discord/rtcconnection/RtcConnection$g;
 
 
 # direct methods
@@ -101,71 +97,59 @@
 
     invoke-direct {v0, v1}, Lcom/discord/rtcconnection/RtcConnection$a;-><init>(B)V
 
-    sput-object v0, Lcom/discord/rtcconnection/RtcConnection;->zf:Lcom/discord/rtcconnection/RtcConnection$a;
+    sput-object v0, Lcom/discord/rtcconnection/RtcConnection;->zg:Lcom/discord/rtcconnection/RtcConnection$a;
 
     return-void
 .end method
 
-.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
+.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
 
-    move-object v0, p0
+    move-object/from16 v0, p0
 
     move-object/from16 v1, p4
 
-    move-object/from16 v2, p5
+    move-object/from16 v2, p7
 
     move-object/from16 v3, p8
 
-    move-object/from16 v4, p10
+    const-string v4, "sessionId"
 
-    const-string v5, "sessionId"
+    invoke-static {v1, v4}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v1, v5}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    const-string v4, "mediaEngine"
 
-    const-string v5, "rtcServerId"
+    invoke-static {v2, v4}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v2, v5}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    const-string v4, "logger"
 
-    const-string v5, "mediaEngine"
+    invoke-static {v3, v4}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v3, v5}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    const-string v4, "networkMonitor"
 
-    const-string v5, "logger"
+    move-object/from16 v5, p9
 
-    invoke-static {v4, v5}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, v4}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v5, "networkMonitor"
+    invoke-direct/range {p0 .. p0}, Ljava/lang/Object;-><init>()V
 
-    move-object/from16 v6, p11
+    move-object/from16 v4, p1
 
-    invoke-static {v6, v5}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    iput-object v4, v0, Lcom/discord/rtcconnection/RtcConnection;->guildId:Ljava/lang/Long;
 
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+    move-wide/from16 v6, p2
 
-    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-wide v6, v0, Lcom/discord/rtcconnection/RtcConnection;->channelId:J
 
     iput-object v1, v0, Lcom/discord/rtcconnection/RtcConnection;->sessionId:Ljava/lang/String;
 
-    iput-object v2, v0, Lcom/discord/rtcconnection/RtcConnection;->rtcServerId:Ljava/lang/String;
+    move-wide/from16 v6, p5
 
-    move-wide/from16 v1, p6
+    iput-wide v6, v0, Lcom/discord/rtcconnection/RtcConnection;->userId:J
 
-    iput-wide v1, v0, Lcom/discord/rtcconnection/RtcConnection;->userId:J
+    iput-object v2, v0, Lcom/discord/rtcconnection/RtcConnection;->mediaEngine:Lcom/discord/rtcconnection/mediaengine/MediaEngine;
 
-    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;
+    iput-object v3, v0, Lcom/discord/rtcconnection/RtcConnection;->logger:Lcom/discord/utilities/logging/Logger;
 
     invoke-static {}, Ljava/util/UUID;->randomUUID()Ljava/util/UUID;
 
@@ -197,11 +181,11 @@
 
     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
-    sget v2, Lcom/discord/rtcconnection/RtcConnection;->ze:I
+    sget v2, Lcom/discord/rtcconnection/RtcConnection;->zf:I
 
     add-int/lit8 v2, v2, 0x1
 
-    sput v2, Lcom/discord/rtcconnection/RtcConnection;->ze:I
+    sput v2, Lcom/discord/rtcconnection/RtcConnection;->zf:I
 
     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
@@ -209,7 +193,7 @@
 
     move-result-object v1
 
-    iput-object v1, v0, Lcom/discord/rtcconnection/RtcConnection;->yQ:Ljava/lang/String;
+    iput-object v1, v0, Lcom/discord/rtcconnection/RtcConnection;->yS:Ljava/lang/String;
 
     new-instance v1, Ljava/util/ArrayList;
 
@@ -225,43 +209,29 @@
 
     invoke-direct {v1, v2}, Lcom/discord/rtcconnection/d;-><init>(Lcom/discord/utilities/logging/Logger;)V
 
-    iput-object v1, v0, Lcom/discord/rtcconnection/RtcConnection;->yR:Lcom/discord/rtcconnection/d;
+    iput-object v1, v0, Lcom/discord/rtcconnection/RtcConnection;->yT:Lcom/discord/rtcconnection/d;
 
     new-instance v1, Lcom/discord/utilities/networking/Backoff;
 
-    const-wide/16 v2, 0x3e8
+    const-wide/16 v7, 0x3e8
 
-    const-wide/16 v4, 0x2710
-
-    const/4 v7, 0x0
-
-    const/4 v8, 0x0
-
-    const/4 v9, 0x0
-
-    const/16 v10, 0x1c
+    const-wide/16 v9, 0x2710
 
     const/4 v11, 0x0
 
-    move-object p1, v1
+    const/4 v12, 0x0
 
-    move-wide p2, v2
+    const/4 v13, 0x0
 
-    move-wide/from16 p4, v4
+    const/16 v14, 0x1c
 
-    move/from16 p6, v7
+    const/4 v15, 0x0
 
-    move/from16 p7, v8
+    move-object v6, v1
 
-    move-object/from16 p8, v9
+    invoke-direct/range {v6 .. v15}, Lcom/discord/utilities/networking/Backoff;-><init>(JJIZLcom/discord/utilities/networking/Backoff$Scheduler;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    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;
+    iput-object v1, v0, Lcom/discord/rtcconnection/RtcConnection;->yU:Lcom/discord/utilities/networking/Backoff;
 
     new-instance v1, Lcom/discord/rtcconnection/RtcConnection$State$d;
 
@@ -277,7 +247,7 @@
 
     invoke-direct {v1}, Ljava/util/LinkedList;-><init>()V
 
-    iput-object v1, v0, Lcom/discord/rtcconnection/RtcConnection;->yV:Ljava/util/LinkedList;
+    iput-object v1, v0, Lcom/discord/rtcconnection/RtcConnection;->yX:Ljava/util/LinkedList;
 
     iget-object v1, v0, Lcom/discord/rtcconnection/RtcConnection;->logger:Lcom/discord/utilities/logging/Logger;
 
@@ -303,39 +273,39 @@
 
     move-result-object v2
 
-    iget-object v3, v0, Lcom/discord/rtcconnection/RtcConnection;->yQ:Ljava/lang/String;
+    iget-object v3, v0, Lcom/discord/rtcconnection/RtcConnection;->yS:Ljava/lang/String;
 
     const/4 v4, 0x0
 
-    const/4 v5, 0x4
+    const/4 v6, 0x4
 
     const/4 v7, 0x0
 
-    move-object p1, v1
+    move-object/from16 p1, v1
 
-    move-object p2, v2
+    move-object/from16 p2, v2
 
-    move-object p3, v3
+    move-object/from16 p3, v3
 
     move-object/from16 p4, v4
 
-    move/from16 p5, v5
+    move/from16 p5, v6
 
     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 {p11 .. p11}, Lcom/discord/utilities/networking/NetworkMonitor;->getIsConnected()Lrx/Observable;
+    invoke-virtual/range {p9 .. p9}, Lcom/discord/utilities/networking/NetworkMonitor;->getIsConnected()Lrx/Observable;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lrx/Observable;->IU()Lrx/Observable;
+    invoke-virtual {v1}, Lrx/Observable;->IS()Lrx/Observable;
 
     move-result-object v1
 
     new-instance v2, Lcom/discord/rtcconnection/RtcConnection$1;
 
-    invoke-direct {v2, p0}, Lcom/discord/rtcconnection/RtcConnection$1;-><init>(Lcom/discord/rtcconnection/RtcConnection;)V
+    invoke-direct {v2, v0}, Lcom/discord/rtcconnection/RtcConnection$1;-><init>(Lcom/discord/rtcconnection/RtcConnection;)V
 
     check-cast v2, Lrx/functions/Action1;
 
@@ -343,15 +313,15 @@
 
     new-instance v1, Lcom/discord/rtcconnection/RtcConnection$n;
 
-    invoke-direct {v1, p0}, Lcom/discord/rtcconnection/RtcConnection$n;-><init>(Lcom/discord/rtcconnection/RtcConnection;)V
+    invoke-direct {v1, v0}, Lcom/discord/rtcconnection/RtcConnection$n;-><init>(Lcom/discord/rtcconnection/RtcConnection;)V
 
-    iput-object v1, v0, Lcom/discord/rtcconnection/RtcConnection;->zb:Lcom/discord/rtcconnection/RtcConnection$n;
+    iput-object v1, v0, Lcom/discord/rtcconnection/RtcConnection;->zd:Lcom/discord/rtcconnection/RtcConnection$n;
 
     new-instance v1, Lcom/discord/rtcconnection/RtcConnection$g;
 
-    invoke-direct {v1, p0}, Lcom/discord/rtcconnection/RtcConnection$g;-><init>(Lcom/discord/rtcconnection/RtcConnection;)V
+    invoke-direct {v1, v0}, Lcom/discord/rtcconnection/RtcConnection$g;-><init>(Lcom/discord/rtcconnection/RtcConnection;)V
 
-    iput-object v1, v0, Lcom/discord/rtcconnection/RtcConnection;->zc:Lcom/discord/rtcconnection/RtcConnection$g;
+    iput-object v1, v0, Lcom/discord/rtcconnection/RtcConnection;->ze:Lcom/discord/rtcconnection/RtcConnection$g;
 
     return-void
 .end method
@@ -359,7 +329,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;->yS:Lcom/discord/utilities/networking/Backoff;
+    iget-object p0, p0, Lcom/discord/rtcconnection/RtcConnection;->yU:Lcom/discord/utilities/networking/Backoff;
 
     return-object p0
 .end method
@@ -367,50 +337,13 @@
 .method public static final synthetic a(Lcom/discord/rtcconnection/RtcConnection;Lkotlin/jvm/functions/Function0;)Ljava/util/concurrent/Future;
     .locals 0
 
-    invoke-direct {p0, p1}, Lcom/discord/rtcconnection/RtcConnection;->a(Lkotlin/jvm/functions/Function0;)Ljava/util/concurrent/Future;
+    invoke-virtual {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;
@@ -439,7 +372,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;->yY:Ljava/lang/Integer;
+    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->za:Ljava/lang/Integer;
 
     if-eqz v0, :cond_1
 
@@ -497,7 +430,7 @@
 .end method
 
 .method public static final synthetic a(Lcom/discord/rtcconnection/RtcConnection;IILjava/lang/String;)V
-    .locals 7
+    .locals 6
 
     iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->logger:Lcom/discord/utilities/logging/Logger;
 
@@ -511,7 +444,7 @@
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/discord/rtcconnection/RtcConnection;->yQ:Ljava/lang/String;
+    iget-object v2, p0, Lcom/discord/rtcconnection/RtcConnection;->yS:Ljava/lang/String;
 
     const/4 v3, 0x0
 
@@ -521,37 +454,33 @@
 
     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;->zw:Lcom/discord/rtcconnection/RtcConnection$State$g;
+    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$g;->zx: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 v1, p0, Lcom/discord/rtcconnection/RtcConnection;->mediaEngine:Lcom/discord/rtcconnection/mediaengine/MediaEngine;
+    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->mediaEngine:Lcom/discord/rtcconnection/mediaengine/MediaEngine;
 
-    iget-wide v2, p0, Lcom/discord/rtcconnection/RtcConnection;->userId:J
+    iget-wide v1, p0, Lcom/discord/rtcconnection/RtcConnection;->userId:J
 
-    new-instance v4, Lcom/discord/rtcconnection/mediaengine/MediaEngine$a;
+    new-instance v3, Lcom/discord/rtcconnection/mediaengine/MediaEngine$a;
 
-    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
+    invoke-direct {v3, p2, p3, p1}, Lcom/discord/rtcconnection/mediaengine/MediaEngine$a;-><init>(ILjava/lang/String;I)V
 
     new-instance p1, Lcom/discord/rtcconnection/RtcConnection$k;
 
     invoke-direct {p1, p0}, Lcom/discord/rtcconnection/RtcConnection$k;-><init>(Lcom/discord/rtcconnection/RtcConnection;)V
 
-    move-object v6, p1
+    check-cast p1, Lkotlin/jvm/functions/Function1;
 
-    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;
+    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;
 
     move-result-object p1
 
     if-eqz p1, :cond_1
 
-    iget-object p2, p0, Lcom/discord/rtcconnection/RtcConnection;->yR:Lcom/discord/rtcconnection/d;
+    iget-object p2, p0, Lcom/discord/rtcconnection/RtcConnection;->yT:Lcom/discord/rtcconnection/d;
 
     const-string p3, "connection"
 
@@ -559,7 +488,7 @@
 
     const/4 p3, 0x0
 
-    iput-object p3, p2, Lcom/discord/rtcconnection/d;->zz:Lco/discord/media_engine/Stats;
+    iput-object p3, p2, Lcom/discord/rtcconnection/d;->zA:Lco/discord/media_engine/Stats;
 
     iget-object p3, p2, Lcom/discord/rtcconnection/d;->subscription:Lrx/Subscription;
 
@@ -571,10 +500,10 @@
 
     if-nez p3, :cond_0
 
-    invoke-virtual {p2}, Lcom/discord/rtcconnection/d;->eA()Lkotlin/Unit;
+    invoke-virtual {p2}, Lcom/discord/rtcconnection/d;->ez()Lkotlin/Unit;
 
     :cond_0
-    iget-wide v0, p2, Lcom/discord/rtcconnection/d;->zA:J
+    iget-wide v0, p2, Lcom/discord/rtcconnection/d;->zB:J
 
     sget-object p3, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
 
@@ -600,13 +529,13 @@
 
     iput-object p3, p2, Lcom/discord/rtcconnection/d;->subscription:Lrx/Subscription;
 
-    iget-object p2, p0, Lcom/discord/rtcconnection/RtcConnection;->zc:Lcom/discord/rtcconnection/RtcConnection$g;
+    iget-object p2, p0, Lcom/discord/rtcconnection/RtcConnection;->ze: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;->yX:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
+    iput-object p1, p0, Lcom/discord/rtcconnection/RtcConnection;->yZ:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
 
     :cond_1
     return-void
@@ -615,7 +544,7 @@
 .method public static final synthetic a(Lcom/discord/rtcconnection/RtcConnection;J)V
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->yV:Ljava/util/LinkedList;
+    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->yX:Ljava/util/LinkedList;
 
     invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -623,7 +552,7 @@
 
     invoke-virtual {v0, v1}, Ljava/util/LinkedList;->add(Ljava/lang/Object;)Z
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->yV:Ljava/util/LinkedList;
+    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->yX:Ljava/util/LinkedList;
 
     invoke-virtual {v0}, Ljava/util/LinkedList;->size()I
 
@@ -633,7 +562,7 @@
 
     if-le v0, v1, :cond_0
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->yV:Ljava/util/LinkedList;
+    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->yX:Ljava/util/LinkedList;
 
     invoke-virtual {v0}, Ljava/util/LinkedList;->removeFirst()Ljava/lang/Object;
 
@@ -644,14 +573,14 @@
 
     if-lez v2, :cond_1
 
-    iget v0, p0, Lcom/discord/rtcconnection/RtcConnection;->yZ:I
+    iget v0, p0, Lcom/discord/rtcconnection/RtcConnection;->zb:I
 
     add-int/lit8 v0, v0, 0x1
 
-    iput v0, p0, Lcom/discord/rtcconnection/RtcConnection;->yZ:I
+    iput v0, p0, Lcom/discord/rtcconnection/RtcConnection;->zb:I
 
     :cond_1
-    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$Quality;->zp:Lcom/discord/rtcconnection/RtcConnection$Quality$a;
+    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$Quality;->zq:Lcom/discord/rtcconnection/RtcConnection$Quality$a;
 
     long-to-double p1, p1
 
@@ -661,7 +590,7 @@
 
     if-eqz v0, :cond_2
 
-    sget-object p1, Lcom/discord/rtcconnection/RtcConnection$Quality;->zk:Lcom/discord/rtcconnection/RtcConnection$Quality;
+    sget-object p1, Lcom/discord/rtcconnection/RtcConnection$Quality;->zl:Lcom/discord/rtcconnection/RtcConnection$Quality;
 
     goto :goto_0
 
@@ -672,7 +601,7 @@
 
     if-gez v2, :cond_3
 
-    sget-object p1, Lcom/discord/rtcconnection/RtcConnection$Quality;->zn:Lcom/discord/rtcconnection/RtcConnection$Quality;
+    sget-object p1, Lcom/discord/rtcconnection/RtcConnection$Quality;->zo:Lcom/discord/rtcconnection/RtcConnection$Quality;
 
     goto :goto_0
 
@@ -683,12 +612,12 @@
 
     if-gez v2, :cond_4
 
-    sget-object p1, Lcom/discord/rtcconnection/RtcConnection$Quality;->zm:Lcom/discord/rtcconnection/RtcConnection$Quality;
+    sget-object p1, Lcom/discord/rtcconnection/RtcConnection$Quality;->zn:Lcom/discord/rtcconnection/RtcConnection$Quality;
 
     goto :goto_0
 
     :cond_4
-    sget-object p1, Lcom/discord/rtcconnection/RtcConnection$Quality;->zl:Lcom/discord/rtcconnection/RtcConnection$Quality;
+    sget-object p1, Lcom/discord/rtcconnection/RtcConnection$Quality;->zm:Lcom/discord/rtcconnection/RtcConnection$Quality;
 
     :goto_0
     new-instance p2, Lcom/discord/rtcconnection/RtcConnection$l;
@@ -711,7 +640,7 @@
 
     if-eqz v2, :cond_0
 
-    iget-object p0, p0, Lcom/discord/rtcconnection/RtcConnection;->yX:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
+    iget-object p0, p0, Lcom/discord/rtcconnection/RtcConnection;->yZ:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
 
     if-eqz p0, :cond_0
 
@@ -732,7 +661,7 @@
 
     if-eqz v2, :cond_0
 
-    iget-object p0, p0, Lcom/discord/rtcconnection/RtcConnection;->yX:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
+    iget-object p0, p0, Lcom/discord/rtcconnection/RtcConnection;->yZ:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
 
     if-eqz p0, :cond_0
 
@@ -755,7 +684,7 @@
 
     if-nez v2, :cond_0
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->yW:Lcom/discord/rtcconnection/socket/a;
+    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->yY:Lcom/discord/rtcconnection/socket/a;
 
     if-eqz v0, :cond_0
 
@@ -763,7 +692,7 @@
 
     new-instance v9, Lcom/discord/rtcconnection/socket/io/Payloads$Speaking;
 
-    invoke-static {p4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {p4}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
     move-result-object v4
 
@@ -783,33 +712,11 @@
 
     move v3, p3
 
-    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-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-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
@@ -834,7 +741,7 @@
 
     if-nez v5, :cond_0
 
-    iget-object v3, v0, Lcom/discord/rtcconnection/RtcConnection;->yW:Lcom/discord/rtcconnection/socket/a;
+    iget-object v3, v0, Lcom/discord/rtcconnection/RtcConnection;->yY:Lcom/discord/rtcconnection/socket/a;
 
     if-eqz v3, :cond_0
 
@@ -899,7 +806,7 @@
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/discord/rtcconnection/RtcConnection;->yQ:Ljava/lang/String;
+    iget-object v3, p0, Lcom/discord/rtcconnection/RtcConnection;->yS:Ljava/lang/String;
 
     const/4 v4, 0x0
 
@@ -933,7 +840,7 @@
 
     if-ne p1, v2, :cond_0
 
-    sget-object p1, Lcom/discord/rtcconnection/RtcConnection$State$e;->zu:Lcom/discord/rtcconnection/RtcConnection$State$e;
+    sget-object p1, Lcom/discord/rtcconnection/RtcConnection$State$e;->zv:Lcom/discord/rtcconnection/RtcConnection$State$e;
 
     check-cast p1, Lcom/discord/rtcconnection/RtcConnection$State;
 
@@ -947,47 +854,47 @@
     throw p0
 
     :cond_1
-    sget-object p1, Lcom/discord/rtcconnection/RtcConnection$State$f;->zv:Lcom/discord/rtcconnection/RtcConnection$State$f;
+    sget-object p1, Lcom/discord/rtcconnection/RtcConnection$State$f;->zw: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;->zw:Lcom/discord/rtcconnection/RtcConnection$State$g;
+    sget-object p1, Lcom/discord/rtcconnection/RtcConnection$State$g;->zx: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;->zx:Lcom/discord/rtcconnection/RtcConnection$State$h;
+    sget-object p1, Lcom/discord/rtcconnection/RtcConnection$State$h;->zy: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;->zw:Lcom/discord/rtcconnection/RtcConnection$State$g;
+    sget-object p1, Lcom/discord/rtcconnection/RtcConnection$State$g;->zx: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;->zx:Lcom/discord/rtcconnection/RtcConnection$State$h;
+    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$h;->zy:Lcom/discord/rtcconnection/RtcConnection$State$h;
 
     if-ne p1, v0, :cond_4
 
-    invoke-direct {p0}, Lcom/discord/rtcconnection/RtcConnection;->ew()V
+    invoke-direct {p0}, Lcom/discord/rtcconnection/RtcConnection;->ev()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;->zv:Lcom/discord/rtcconnection/RtcConnection$State$f;
+    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$f;->zw:Lcom/discord/rtcconnection/RtcConnection$State$f;
 
     if-ne p1, v0, :cond_5
 
-    sget-object p1, Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;->zg:Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;
+    sget-object p1, Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;->zh:Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;
 
     new-array v0, v1, [Lkotlin/Pair;
 
@@ -1017,7 +924,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/rtcconnection/RtcConnection;->za:Ljava/lang/Long;
+    iput-object p1, p0, Lcom/discord/rtcconnection/RtcConnection;->zc:Ljava/lang/Long;
 
     :cond_5
     return-void
@@ -1100,7 +1007,7 @@
 
     move-result-object v13
 
-    iget-object v14, v0, Lcom/discord/rtcconnection/RtcConnection;->yQ:Ljava/lang/String;
+    iget-object v14, v0, Lcom/discord/rtcconnection/RtcConnection;->yS:Ljava/lang/String;
 
     const/4 v15, 0x0
 
@@ -1115,7 +1022,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;->yQ:Ljava/lang/String;
+    iget-object v5, v0, Lcom/discord/rtcconnection/RtcConnection;->yS:Ljava/lang/String;
 
     move-object v7, v1
 
@@ -1129,7 +1036,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;->zh:Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;
+    sget-object v1, Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;->zi:Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;
 
     new-array v2, v11, [Lkotlin/Pair;
 
@@ -1164,13 +1071,13 @@
 
     move-object/from16 v2, p2
 
-    iget-object v3, v0, Lcom/discord/rtcconnection/RtcConnection;->yS:Lcom/discord/utilities/networking/Backoff;
+    iget-object v3, v0, Lcom/discord/rtcconnection/RtcConnection;->yU:Lcom/discord/utilities/networking/Backoff;
 
     invoke-virtual {v3}, Lcom/discord/utilities/networking/Backoff;->succeed()V
 
-    iput-object v1, v0, Lcom/discord/rtcconnection/RtcConnection;->yT:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;
+    iput-object v1, v0, Lcom/discord/rtcconnection/RtcConnection;->yV:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;
 
-    iget-object v3, v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;->Ac:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;
+    iget-object v3, v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;->Ae:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;
 
     sget-object v4, Lcom/discord/rtcconnection/b;->$EnumSwitchMapping$0:[I
 
@@ -1186,7 +1093,7 @@
 
     iget-object v5, v0, Lcom/discord/rtcconnection/RtcConnection;->logger:Lcom/discord/utilities/logging/Logger;
 
-    iget-object v6, v0, Lcom/discord/rtcconnection/RtcConnection;->yQ:Ljava/lang/String;
+    iget-object v6, v0, Lcom/discord/rtcconnection/RtcConnection;->yS:Ljava/lang/String;
 
     new-instance v2, Ljava/lang/StringBuilder;
 
@@ -1194,7 +1101,7 @@
 
     invoke-direct {v2, v3}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;->Ac:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;
+    iget-object v1, v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;->Ae:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;
 
     invoke-virtual {v2, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -1219,7 +1126,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;->yQ:Ljava/lang/String;
+    iget-object v14, v0, Lcom/discord/rtcconnection/RtcConnection;->yS:Ljava/lang/String;
 
     const/4 v15, 0x0
 
@@ -1231,7 +1138,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;->yW:Lcom/discord/rtcconnection/socket/a;
+    iget-object v0, v0, Lcom/discord/rtcconnection/RtcConnection;->yY:Lcom/discord/rtcconnection/socket/a;
 
     if-eqz v0, :cond_2
 
@@ -1267,7 +1174,7 @@
 
     check-cast v1, Ljava/lang/Iterable;
 
-    sget-object v2, Lcom/discord/rtcconnection/socket/a;->AK:Lcom/discord/rtcconnection/socket/a$a;
+    sget-object v2, Lcom/discord/rtcconnection/socket/a;->AN:Lcom/discord/rtcconnection/socket/a$a;
 
     new-instance v2, Ljava/util/ArrayList;
 
@@ -1334,7 +1241,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;->yW:Lcom/discord/rtcconnection/socket/a;
+    iput-object p1, p0, Lcom/discord/rtcconnection/RtcConnection;->yY:Lcom/discord/rtcconnection/socket/a;
 
     return-void
 .end method
@@ -1342,7 +1249,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;->yY:Ljava/lang/Integer;
+    iput-object p1, p0, Lcom/discord/rtcconnection/RtcConnection;->za:Ljava/lang/Integer;
 
     return-void
 .end method
@@ -1358,7 +1265,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;->yX:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
+    iget-object p0, p0, Lcom/discord/rtcconnection/RtcConnection;->yZ:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
 
     if-eqz p0, :cond_0
 
@@ -1371,7 +1278,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;->yX:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
+    iget-object p0, p0, Lcom/discord/rtcconnection/RtcConnection;->yZ:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
 
     if-eqz p0, :cond_0
 
@@ -1424,7 +1331,7 @@
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/discord/rtcconnection/RtcConnection;->yQ:Ljava/lang/String;
+    iget-object v2, p0, Lcom/discord/rtcconnection/RtcConnection;->yS:Ljava/lang/String;
 
     const/4 v3, 0x0
 
@@ -1434,18 +1341,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;->yX:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
+    iget-object p1, p0, Lcom/discord/rtcconnection/RtcConnection;->yZ: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;->yX:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
+    iget-object p1, p0, Lcom/discord/rtcconnection/RtcConnection;->yZ:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
 
     if-eqz p1, :cond_1
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->zc:Lcom/discord/rtcconnection/RtcConnection$g;
+    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->ze:Lcom/discord/rtcconnection/RtcConnection$g;
 
     check-cast v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$b;
 
@@ -1458,12 +1365,12 @@
 
     if-nez p1, :cond_2
 
-    invoke-direct {p0}, Lcom/discord/rtcconnection/RtcConnection;->ex()V
+    invoke-direct {p0}, Lcom/discord/rtcconnection/RtcConnection;->ew()V
 
     :cond_2
     const/4 p1, 0x0
 
-    iput p1, p0, Lcom/discord/rtcconnection/RtcConnection;->yZ:I
+    iput p1, p0, Lcom/discord/rtcconnection/RtcConnection;->zb:I
 
     const-wide/16 v0, 0x0
 
@@ -1471,7 +1378,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->za:Ljava/lang/Long;
+    iput-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->zc:Ljava/lang/Long;
 
     if-nez p2, :cond_3
 
@@ -1500,7 +1407,7 @@
 
     if-eqz p1, :cond_5
 
-    iget-object p1, p0, Lcom/discord/rtcconnection/RtcConnection;->yS:Lcom/discord/utilities/networking/Backoff;
+    iget-object p1, p0, Lcom/discord/rtcconnection/RtcConnection;->yU:Lcom/discord/utilities/networking/Backoff;
 
     new-instance v0, Lcom/discord/rtcconnection/RtcConnection$j;
 
@@ -1514,7 +1421,7 @@
 
     iget-object v2, p0, Lcom/discord/rtcconnection/RtcConnection;->logger:Lcom/discord/utilities/logging/Logger;
 
-    iget-object v3, p0, Lcom/discord/rtcconnection/RtcConnection;->yQ:Ljava/lang/String;
+    iget-object v3, p0, Lcom/discord/rtcconnection/RtcConnection;->yS:Ljava/lang/String;
 
     new-instance p0, Ljava/lang/StringBuilder;
 
@@ -1563,7 +1470,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;->yW:Lcom/discord/rtcconnection/socket/a;
+    iget-object p0, p0, Lcom/discord/rtcconnection/RtcConnection;->yY:Lcom/discord/rtcconnection/socket/a;
 
     return-object p0
 .end method
@@ -1579,7 +1486,7 @@
 .method public static final synthetic b(Lcom/discord/rtcconnection/RtcConnection;Z)V
     .locals 3
 
-    iget-object p0, p0, Lcom/discord/rtcconnection/RtcConnection;->yW:Lcom/discord/rtcconnection/socket/a;
+    iget-object p0, p0, Lcom/discord/rtcconnection/RtcConnection;->yY:Lcom/discord/rtcconnection/socket/a;
 
     if-eqz p0, :cond_1
 
@@ -1667,19 +1574,19 @@
 .method public static final synthetic e(Lcom/discord/rtcconnection/RtcConnection;)Ljava/lang/String;
     .locals 0
 
-    iget-object p0, p0, Lcom/discord/rtcconnection/RtcConnection;->yQ:Ljava/lang/String;
+    iget-object p0, p0, Lcom/discord/rtcconnection/RtcConnection;->yS:Ljava/lang/String;
 
     return-object p0
 .end method
 
-.method private final ev()V
+.method private final eu()V
     .locals 2
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->yS:Lcom/discord/utilities/networking/Backoff;
+    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->yU:Lcom/discord/utilities/networking/Backoff;
 
     invoke-virtual {v0}, Lcom/discord/utilities/networking/Backoff;->cancel()V
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->yW:Lcom/discord/rtcconnection/socket/a;
+    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->yY:Lcom/discord/rtcconnection/socket/a;
 
     if-eqz v0, :cond_0
 
@@ -1690,7 +1597,7 @@
     :cond_0
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->yW:Lcom/discord/rtcconnection/socket/a;
+    iput-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->yY:Lcom/discord/rtcconnection/socket/a;
 
     iget-object v1, p0, Lcom/discord/rtcconnection/RtcConnection;->connectionState:Lcom/discord/rtcconnection/RtcConnection$State;
 
@@ -1698,17 +1605,17 @@
 
     if-nez v1, :cond_1
 
-    invoke-direct {p0}, Lcom/discord/rtcconnection/RtcConnection;->ex()V
+    invoke-direct {p0}, Lcom/discord/rtcconnection/RtcConnection;->ew()V
 
     :cond_1
-    iget-object v1, p0, Lcom/discord/rtcconnection/RtcConnection;->yX:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
+    iget-object v1, p0, Lcom/discord/rtcconnection/RtcConnection;->yZ: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;->yX:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
+    iput-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->yZ:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
 
     new-instance v0, Lcom/discord/rtcconnection/RtcConnection$State$d;
 
@@ -1726,17 +1633,17 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/discord/rtcconnection/RtcConnection;->yU:Z
+    iput-boolean v0, p0, Lcom/discord/rtcconnection/RtcConnection;->yW:Z
 
     return-void
 .end method
 
-.method private final ew()V
+.method private final ev()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;->yQ:Ljava/lang/String;
+    iget-object v2, p0, Lcom/discord/rtcconnection/RtcConnection;->yS:Ljava/lang/String;
 
     const-string v1, "reconnect"
 
@@ -1748,19 +1655,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;->yW:Lcom/discord/rtcconnection/socket/a;
+    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->yY: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;->eE()Z
+    invoke-virtual {v0}, Lcom/discord/rtcconnection/socket/a;->eD()Z
 
     :cond_0
     return-void
 .end method
 
-.method private final ex()V
+.method private final ew()V
     .locals 6
 
     const/4 v0, 0x2
@@ -1779,7 +1686,7 @@
 
     aput-object v1, v0, v2
 
-    iget v1, p0, Lcom/discord/rtcconnection/RtcConnection;->yZ:I
+    iget v1, p0, Lcom/discord/rtcconnection/RtcConnection;->zb:I
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -1799,7 +1706,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/discord/rtcconnection/RtcConnection;->yV:Ljava/util/LinkedList;
+    iget-object v1, p0, Lcom/discord/rtcconnection/RtcConnection;->yX:Ljava/util/LinkedList;
 
     check-cast v1, Ljava/lang/Iterable;
 
@@ -1835,9 +1742,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;->yR:Lcom/discord/rtcconnection/d;
+    iget-object v1, p0, Lcom/discord/rtcconnection/RtcConnection;->yT:Lcom/discord/rtcconnection/d;
 
-    iget-object v1, v1, Lcom/discord/rtcconnection/d;->zz:Lco/discord/media_engine/Stats;
+    iget-object v1, v1, Lcom/discord/rtcconnection/d;->zA:Lco/discord/media_engine/Stats;
 
     if-eqz v1, :cond_4
 
@@ -1933,7 +1840,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;->za:Ljava/lang/Long;
+    iget-object v1, p0, Lcom/discord/rtcconnection/RtcConnection;->zc:Ljava/lang/Long;
 
     if-eqz v1, :cond_5
 
@@ -1958,13 +1865,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;->zi:Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;
+    sget-object v1, Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;->zj: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;->yR:Lcom/discord/rtcconnection/d;
+    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->yT:Lcom/discord/rtcconnection/d;
 
-    invoke-virtual {v0}, Lcom/discord/rtcconnection/d;->eA()Lkotlin/Unit;
+    invoke-virtual {v0}, Lcom/discord/rtcconnection/d;->ez()Lkotlin/Unit;
 
     return-void
 .end method
@@ -1972,7 +1879,7 @@
 .method public static final synthetic f(Lcom/discord/rtcconnection/RtcConnection;)Z
     .locals 0
 
-    iget-boolean p0, p0, Lcom/discord/rtcconnection/RtcConnection;->yU:Z
+    iget-boolean p0, p0, Lcom/discord/rtcconnection/RtcConnection;->yW:Z
 
     return p0
 .end method
@@ -1988,7 +1895,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;->zb:Lcom/discord/rtcconnection/RtcConnection$n;
+    iget-object p0, p0, Lcom/discord/rtcconnection/RtcConnection;->zd:Lcom/discord/rtcconnection/RtcConnection$n;
 
     return-object p0
 .end method
@@ -1996,7 +1903,7 @@
 .method public static final synthetic i(Lcom/discord/rtcconnection/RtcConnection;)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/discord/rtcconnection/RtcConnection;->ev()V
+    invoke-direct {p0}, Lcom/discord/rtcconnection/RtcConnection;->eu()V
 
     return-void
 .end method
@@ -2004,7 +1911,7 @@
 .method public static final synthetic j(Lcom/discord/rtcconnection/RtcConnection;)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/discord/rtcconnection/RtcConnection;->ew()V
+    invoke-direct {p0}, Lcom/discord/rtcconnection/RtcConnection;->ev()V
 
     return-void
 .end method
@@ -2012,7 +1919,7 @@
 .method public static final synthetic k(Lcom/discord/rtcconnection/RtcConnection;)V
     .locals 7
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->yS:Lcom/discord/utilities/networking/Backoff;
+    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->yU:Lcom/discord/utilities/networking/Backoff;
 
     invoke-virtual {v0}, Lcom/discord/utilities/networking/Backoff;->cancel()V
 
@@ -2024,7 +1931,7 @@
 
     invoke-direct {v0, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v2, p0, Lcom/discord/rtcconnection/RtcConnection;->yW:Lcom/discord/rtcconnection/socket/a;
+    iget-object v2, p0, Lcom/discord/rtcconnection/RtcConnection;->yY:Lcom/discord/rtcconnection/socket/a;
 
     if-eqz v2, :cond_0
 
@@ -2042,7 +1949,7 @@
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/discord/rtcconnection/RtcConnection;->yQ:Ljava/lang/String;
+    iget-object v3, p0, Lcom/discord/rtcconnection/RtcConnection;->yS:Ljava/lang/String;
 
     const/4 v4, 0x0
 
@@ -2052,7 +1959,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;->zs:Lcom/discord/rtcconnection/RtcConnection$State$c;
+    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$c;->zt:Lcom/discord/rtcconnection/RtcConnection$State$c;
 
     check-cast v0, Lcom/discord/rtcconnection/RtcConnection$State;
 
@@ -2062,15 +1969,15 @@
 .end method
 
 .method public static final synthetic l(Lcom/discord/rtcconnection/RtcConnection;)V
-    .locals 12
+    .locals 14
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->yS:Lcom/discord/utilities/networking/Backoff;
+    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->yU: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;->yQ:Ljava/lang/String;
+    iget-object v3, p0, Lcom/discord/rtcconnection/RtcConnection;->yS:Ljava/lang/String;
 
     const-string v2, "Connected to RTC server."
 
@@ -2082,70 +1989,86 @@
 
     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;->yW:Lcom/discord/rtcconnection/socket/a;
+    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->yY:Lcom/discord/rtcconnection/socket/a;
 
-    if-eqz v0, :cond_1
+    if-eqz v0, :cond_2
 
-    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
+    iget-object v1, p0, Lcom/discord/rtcconnection/RtcConnection;->guildId:Ljava/lang/Long;
 
     if-eqz v1, :cond_0
 
-    iget-object v6, v0, Lcom/discord/rtcconnection/socket/a;->logger:Lcom/discord/utilities/logging/Logger;
+    invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
 
-    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
+    move-result-wide v1
 
     goto :goto_0
 
     :cond_0
-    iput-object v2, v0, Lcom/discord/rtcconnection/socket/a;->serverId:Ljava/lang/String;
+    iget-wide v1, p0, Lcom/discord/rtcconnection/RtcConnection;->channelId:J
 
-    iput-object v5, v0, Lcom/discord/rtcconnection/socket/a;->sessionId:Ljava/lang/String;
+    :goto_0
+    invoke-static {v1, v2}, Ljava/lang/String;->valueOf(J)Ljava/lang/String;
 
-    sget v1, Lcom/discord/rtcconnection/socket/a$b;->AN:I
+    move-result-object v4
 
-    iput v1, v0, Lcom/discord/rtcconnection/socket/a;->AB:I
+    iget-wide v5, p0, Lcom/discord/rtcconnection/RtcConnection;->userId:J
 
-    const/4 v8, 0x0
+    iget-object v7, p0, Lcom/discord/rtcconnection/RtcConnection;->sessionId:Ljava/lang/String;
 
-    new-instance v9, Lcom/discord/rtcconnection/socket/io/Payloads$Identify;
+    const-string v1, "serverId"
 
-    iget-object v6, v0, Lcom/discord/rtcconnection/socket/a;->token:Ljava/lang/String;
+    invoke-static {v4, v1}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/4 v7, 0x1
+    const-string v1, "sessionId"
 
-    move-object v1, v9
+    invoke-static {v7, v1}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct/range {v1 .. v7}, Lcom/discord/rtcconnection/socket/io/Payloads$Identify;-><init>(Ljava/lang/String;JLjava/lang/String;Ljava/lang/String;Z)V
+    iget-boolean v1, v0, Lcom/discord/rtcconnection/socket/a;->AM:Z
 
-    invoke-virtual {v0, v8, v9}, Lcom/discord/rtcconnection/socket/a;->a(ILjava/lang/Object;)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;->yS: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
 
     :cond_1
-    :goto_0
-    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$a;->zq:Lcom/discord/rtcconnection/RtcConnection$State$a;
+    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;->AQ:I
+
+    iput v1, v0, Lcom/discord/rtcconnection/socket/a;->AF: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;->zr:Lcom/discord/rtcconnection/RtcConnection$State$a;
 
     check-cast v0, Lcom/discord/rtcconnection/RtcConnection$State;
 
@@ -2157,11 +2080,11 @@
 .method private final o(Z)V
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->yR:Lcom/discord/rtcconnection/d;
+    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->yT:Lcom/discord/rtcconnection/d;
 
-    invoke-virtual {v0}, Lcom/discord/rtcconnection/d;->eA()Lkotlin/Unit;
+    invoke-virtual {v0}, Lcom/discord/rtcconnection/d;->ez()Lkotlin/Unit;
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->yX:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
+    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->yZ:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
 
     if-eqz v0, :cond_0
 
@@ -2170,9 +2093,9 @@
     :cond_0
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->yX:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
+    iput-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->yZ:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->yS:Lcom/discord/utilities/networking/Backoff;
+    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->yU:Lcom/discord/utilities/networking/Backoff;
 
     invoke-virtual {v0}, Lcom/discord/utilities/networking/Backoff;->cancel()V
 
@@ -2186,88 +2109,57 @@
 
     if-eqz p1, :cond_1
 
-    invoke-direct {p0}, Lcom/discord/rtcconnection/RtcConnection;->ew()V
+    invoke-direct {p0}, Lcom/discord/rtcconnection/RtcConnection;->ev()V
 
     return-void
 
     :cond_1
-    sget-object p1, Lcom/discord/rtcconnection/RtcConnection$f;->zy:Lcom/discord/rtcconnection/RtcConnection$f;
+    sget-object p1, Lcom/discord/rtcconnection/RtcConnection$f;->zz: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;->ev()V
+    invoke-direct {p0}, Lcom/discord/rtcconnection/RtcConnection;->eu()V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final a(Ljava/lang/String;Ljava/lang/String;Ljavax/net/ssl/SSLSocketFactory;)Ljava/util/concurrent/Future;
-    .locals 1
+.method public final a(Lkotlin/jvm/functions/Function0;)Ljava/util/concurrent/Future;
+    .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
-            "Ljava/lang/String;",
-            "Ljava/lang/String;",
-            "Ljavax/net/ssl/SSLSocketFactory;",
-            ")",
+            "Lkotlin/jvm/functions/Function0<",
+            "Lkotlin/Unit;",
+            ">;)",
             "Ljava/util/concurrent/Future<",
             "*>;"
         }
     .end annotation
 
-    const-string v0, "endpoint"
+    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->mediaEngine:Lcom/discord/rtcconnection/mediaengine/MediaEngine;
 
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-interface {v0}, Lcom/discord/rtcconnection/mediaengine/MediaEngine;->eB()Ljava/util/concurrent/ExecutorService;
 
-    new-instance v0, Lcom/discord/rtcconnection/RtcConnection$d;
+    move-result-object v0
 
-    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
+    if-eqz p1, :cond_0
 
-    check-cast v0, Lkotlin/jvm/functions/Function0;
+    new-instance v1, Lcom/discord/rtcconnection/c;
 
-    invoke-direct {p0, v0}, Lcom/discord/rtcconnection/RtcConnection;->a(Lkotlin/jvm/functions/Function0;)Ljava/util/concurrent/Future;
+    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 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 11447b1314..b52cb959bc 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;->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
 
@@ -32,7 +32,7 @@
 
     sget-object v0, Lcom/discord/rtcconnection/a;->$EnumSwitchMapping$0:[I
 
-    sget-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->zO:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
+    sget-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->zQ: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;->zN:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
+    sget-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->zP: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 bd40707873..77db6d29b5 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;->Ad:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;
+    sget-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;->Af: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;->zH: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;->zI: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;->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
@@ -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;->zL: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;->zM: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 e630ada206..1fbfd51e5b 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 0ba38b5274..2e50de0130 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 $connection:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
+.field final synthetic zC:Lcom/discord/rtcconnection/d;
 
-.field final synthetic zB:Lcom/discord/rtcconnection/d;
+.field final synthetic zD:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
 
 
 # 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;->zB:Lcom/discord/rtcconnection/d;
+    iput-object p1, p0, Lcom/discord/rtcconnection/d$a;->zC:Lcom/discord/rtcconnection/d;
 
-    iput-object p2, p0, Lcom/discord/rtcconnection/d$a;->$connection:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
+    iput-object p2, p0, Lcom/discord/rtcconnection/d$a;->zD: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;->$connection:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
+    iget-object p1, p0, Lcom/discord/rtcconnection/d$a;->zD:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
 
     new-instance v0, Lcom/discord/rtcconnection/d$a$1;
 
-    iget-object v1, p0, Lcom/discord/rtcconnection/d$a;->zB:Lcom/discord/rtcconnection/d;
+    iget-object v1, p0, Lcom/discord/rtcconnection/d$a;->zC: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 e204c7f28d..9140ae7a23 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 zB:Lcom/discord/rtcconnection/d;
+.field final synthetic zC: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;->zB:Lcom/discord/rtcconnection/d;
+    iput-object p1, p0, Lcom/discord/rtcconnection/d$b;->zC: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;->zB:Lcom/discord/rtcconnection/d;
+    iget-object p1, p0, Lcom/discord/rtcconnection/d$b;->zC: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 3488c45c10..ac06092e2a 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 final zA:J
+.field zA:Lco/discord/media_engine/Stats;
 
-.field zz:Lco/discord/media_engine/Stats;
+.field final zB:J
 
 
 # direct methods
@@ -25,7 +25,7 @@
 
     const-wide/16 v0, 0x7530
 
-    iput-wide v0, p0, Lcom/discord/rtcconnection/d;->zA:J
+    iput-wide v0, p0, Lcom/discord/rtcconnection/d;->zB: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;->zz:Lco/discord/media_engine/Stats;
+    iput-object p1, p0, Lcom/discord/rtcconnection/d;->zA:Lco/discord/media_engine/Stats;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final eA()Lkotlin/Unit;
+.method public final ez()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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 5d5758ac69..664201cb38 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 zC:F
+.field public final zE:F
 
 
 # direct methods
@@ -26,7 +26,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput p1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus;->zC:F
+    iput p1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus;->zE: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;->zC:F
+    iget v1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus;->zE:F
 
-    iget v3, p1, Lcom/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus;->zC:F
+    iget v3, p1, Lcom/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus;->zE: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;->zC:F
+    iget v0, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus;->zE: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;->zC:F
+    iget v1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus;->zE: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 45cadb05e9..56a2c2a6f4 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 zD: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;
+.field public static final enum zG:Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
+
+.field public static final enum zH:Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
+
+.field private static final synthetic zI:[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;->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
 
@@ -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;->zE:Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
+    sput-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;->zG: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;->zF:Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
+    sput-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;->zH:Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;->zG:[Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
+    sput-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;->zI:[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;->zG:[Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
+    sget-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;->zI:[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 2d51ad99b6..1664c15387 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngine.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngine.smali
@@ -16,12 +16,11 @@
 
 
 # virtual methods
-.method public abstract a(JLcom/discord/rtcconnection/mediaengine/MediaEngine$a;ZLkotlin/jvm/functions/Function1;)Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
+.method public abstract a(JLcom/discord/rtcconnection/mediaengine/MediaEngine$a;Lkotlin/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;",
@@ -61,10 +60,10 @@
     .end annotation
 .end method
 
-.method public abstract eB()Lcom/hammerandchisel/libdiscord/Discord;
+.method public abstract eA()Lcom/hammerandchisel/libdiscord/Discord;
 .end method
 
-.method public abstract eC()Ljava/util/concurrent/ExecutorService;
+.method public abstract eB()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 cdcb5ee1f3..49c6636bed 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 zH:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
-
-.field public static final enum zI: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;
+.field public static final enum zL:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
+
+.field public static final enum zM:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
+
+.field private static final synthetic zN:[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;->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
 
@@ -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;->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
 
@@ -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;->zJ:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
+    sput-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;->zL: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;->zK:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
+    sput-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;->zM:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;->zL:[Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
+    sput-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;->zN:[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;->zL:[Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
+    sget-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;->zN:[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 5fe36ac76d..7219489420 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 zM:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
-
-.field public static final enum zN:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
-
 .field public static final enum zO:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
 
 .field public static final enum zP:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
@@ -41,9 +37,13 @@
 
 .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 enum zS:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
 
-.field public static final zT:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a$a;
+.field public static final enum zT:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
+
+.field private static final synthetic zU:[Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
+
+.field public static final zV: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;->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, 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;->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
 
@@ -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;->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
 
@@ -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;->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
 
@@ -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;->zQ:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
+    sput-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->zS: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;->zR:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
+    sput-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->zT:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
 
     aput-object v1, v0, v3
 
-    sput-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->zS:[Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
+    sput-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->zU:[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;->zT:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a$a;
+    sput-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->zV: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;->zS:[Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
+    sget-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->zU:[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 018e95657d..8d4776a07d 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;->zT:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a$a;
+    sget-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->zV: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;->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
 
@@ -83,7 +83,7 @@
     :goto_1
     if-eqz v2, :cond_3
 
-    sget-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->zN:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
+    sget-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->zP: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;->zO:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
+    sget-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->zQ:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
 
     goto :goto_2
 
     :cond_5
-    sget-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->zR:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
+    sget-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->zT: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 cc6e80055d..bbe3dee502 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 zU:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
+.field public static final enum zW:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
 
-.field public static final enum zV:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
+.field public static final enum zX:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
 
-.field private static final synthetic zW:[Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
+.field private static final synthetic zY:[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;->zU:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
+    sput-object v2, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;->zW: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;->zV:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
+    sput-object v2, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;->zX:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
 
     aput-object v2, v1, v4
 
-    sput-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;->zW:[Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
+    sput-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;->zY:[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;->zW:[Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
+    sget-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;->zY:[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 79ac8cd007..4256dccc53 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 Ad:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;
+.field public static final enum Af:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;
 
-.field public static final enum Ae:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;
+.field public static final enum Ag:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;
 
-.field private static final synthetic Af:[Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;
+.field private static final synthetic Ah:[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;->Ad:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;
+    sput-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;->Af: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;->Ae:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;
+    sput-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;->Ag:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;->Af:[Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;
+    sput-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;->Ah:[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;->Af:[Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;
+    sget-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;->Ah:[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 f6057b4708..073e585464 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 Ac:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;
+.field public final Ae: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;->Ac:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;
+    iput-object p3, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;->Ae: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;->Ac:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;
+    iget-object v1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;->Ae: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;
+    iget-object p1, p1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;->Ae: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;->Ac:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;
+    iget-object v2, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;->Ae: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;->Ac:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;
+    iget-object v1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;->Ae: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 0e8b90c9ac..eed8bb7add 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 Aa:Z
+.field public final Aa:I
 
 .field public final Ab:I
 
-.field public final zX:I
+.field public final Ac:Z
 
-.field public final zY:I
+.field public final Ad: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;->zX:I
+    iput p1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->zZ:I
 
-    iput p2, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->zY:I
+    iput p2, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->Aa:I
 
-    iput p3, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->zZ:I
+    iput p3, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->Ab:I
 
-    iput-boolean p4, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->Aa:Z
+    iput-boolean p4, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->Ac:Z
 
-    iput p5, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->Ab:I
+    iput p5, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->Ad: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;->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_0
 
@@ -98,9 +98,9 @@
     :goto_0
     if-eqz v1, :cond_5
 
-    iget v1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->zY:I
+    iget v1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->Aa:I
 
-    iget v3, p1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->zY:I
+    iget v3, p1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->Aa: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;->zZ:I
+    iget v1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->Ab:I
 
-    iget v3, p1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->zZ:I
+    iget v3, p1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->Ab: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;->Aa:Z
+    iget-boolean v1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->Ac:Z
 
-    iget-boolean v3, p1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->Aa:Z
+    iget-boolean v3, p1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->Ac: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;->Ab:I
+    iget v1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->Ad:I
 
-    iget p1, p1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->Ab:I
+    iget p1, p1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->Ad: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;->zX:I
+    iget v0, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->zZ:I
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget v1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->zY:I
+    iget v1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->Aa:I
 
     add-int/2addr v0, v1
 
     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
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-boolean v1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->Aa:Z
+    iget-boolean v1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->Ac: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;->Ab:I
+    iget v1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->Ad: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;->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;
 
@@ -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;->zY:I
+    iget v1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->Aa: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;->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;
 
@@ -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;->Aa:Z
+    iget-boolean v1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->Ac: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;->Ab:I
+    iget v1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->Ad: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 03402b0db3..c791e870e6 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngineConnection$b.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngineConnection$b.smali
@@ -15,11 +15,10 @@
 
 
 # virtual methods
-.method public abstract onConnected(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;Ljava/util/List;)V
+.method public abstract onConnected(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;",
@@ -28,13 +27,13 @@
     .end annotation
 .end method
 
-.method public abstract onConnectionStateChange(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;)V
+.method public abstract onConnectionStateChange(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;)V
 .end method
 
-.method public abstract onDestroy(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;)V
+.method public abstract onDestroy()V
 .end method
 
-.method public abstract onError(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException;)V
+.method public abstract onError(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 e8ab03b22e..f71af1506f 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,16 +30,12 @@
 # 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/a/a;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;)V
+.method constructor <init>(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;)V
     .locals 0
 
-    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;
+    iput-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/a$b;->$value:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
 
     const/4 p1, 0x1
 
@@ -51,7 +47,7 @@
 
 # virtual methods
 .method public final synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 2
+    .locals 1
 
     check-cast p1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$b;
 
@@ -59,15 +55,11 @@
 
     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;->this$0:Lcom/discord/rtcconnection/mediaengine/a/a;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a$b;->$value:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
 
-    check-cast v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
+    invoke-interface {p1, v0}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$b;->onConnectionStateChange(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;)V
 
-    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;
+    sget-object p1, Lkotlin/Unit;->bgt: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 72600dc46e..d36e329eda 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 5a1e336050..5317c76232 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 26ec028487..5edd440cb2 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,33 +40,7 @@
 
 # virtual methods
 .method public final onUserSpeakingStatusChanged(JZZ)V
-    .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
+    .locals 1
 
     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 91b2ad0e95..a6fb935cc4 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 b7befb4d2d..2199e03c31 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,19 +27,29 @@
 .end annotation
 
 
-# instance fields
-.field final synthetic this$0:Lcom/discord/rtcconnection/mediaengine/a/a;
+# static fields
+.field public static final Aq:Lcom/discord/rtcconnection/mediaengine/a/a$g;
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/rtcconnection/mediaengine/a/a;)V
-    .locals 0
+.method static constructor <clinit>()V
+    .locals 1
 
-    iput-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/a$g;->this$0:Lcom/discord/rtcconnection/mediaengine/a/a;
+    new-instance v0, Lcom/discord/rtcconnection/mediaengine/a/a$g;
 
-    const/4 p1, 0x1
+    invoke-direct {v0}, Lcom/discord/rtcconnection/mediaengine/a/a$g;-><init>()V
 
-    invoke-direct {p0, p1}, Lkotlin/jvm/internal/m;-><init>(I)V
+    sput-object v0, Lcom/discord/rtcconnection/mediaengine/a/a$g;->Aq: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
 
     return-void
 .end method
@@ -47,7 +57,7 @@
 
 # virtual methods
 .method public final synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 2
+    .locals 1
 
     check-cast p1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$b;
 
@@ -55,21 +65,13 @@
 
     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$g;->this$0:Lcom/discord/rtcconnection/mediaengine/a/a;
+    sget-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;->zJ:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
 
-    check-cast v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
+    invoke-interface {p1, v0}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$b;->onConnectionStateChange(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;)V
 
-    sget-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;->zH:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
+    invoke-interface {p1}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$b;->onDestroy()V
 
-    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;
+    sget-object p1, Lkotlin/Unit;->bgt: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 4ced63672a..c7b781b13d 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 Ao:Lkotlin/jvm/functions/Function1;
+.field final synthetic Ar: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;->Ao:Lkotlin/jvm/functions/Function1;
+    iput-object p2, p0, Lcom/discord/rtcconnection/mediaengine/a/a$h;->Ar: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;->Ao:Lkotlin/jvm/functions/Function1;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a$h;->Ar: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 11c4f8619d..3087e7a37f 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 3
+    .locals 2
 
     check-cast p1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$b;
 
@@ -59,23 +59,19 @@
 
     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;->this$0:Lcom/discord/rtcconnection/mediaengine/a/a;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a$i;->$transportInfo:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;
 
-    move-object v1, v0
+    iget-object v1, p0, Lcom/discord/rtcconnection/mediaengine/a/a$i;->this$0:Lcom/discord/rtcconnection/mediaengine/a/a;
 
-    check-cast v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
+    invoke-static {v1}, Lcom/discord/rtcconnection/mediaengine/a/a;->c(Lcom/discord/rtcconnection/mediaengine/a/a;)Ljava/util/ArrayList;
 
-    iget-object v2, p0, Lcom/discord/rtcconnection/mediaengine/a/a$i;->$transportInfo:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;
+    move-result-object v1
 
-    invoke-static {v0}, Lcom/discord/rtcconnection/mediaengine/a/a;->c(Lcom/discord/rtcconnection/mediaengine/a/a;)Ljava/util/ArrayList;
+    check-cast v1, Ljava/util/List;
 
-    move-result-object v0
+    invoke-interface {p1, v0, v1}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$b;->onConnected(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;Ljava/util/List;)V
 
-    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;
+    sget-object p1, Lkotlin/Unit;->bgt: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 93a9fc8a33..5e65b4f15f 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,19 +27,29 @@
 .end annotation
 
 
-# instance fields
-.field final synthetic this$0:Lcom/discord/rtcconnection/mediaengine/a/a;
+# static fields
+.field public static final As:Lcom/discord/rtcconnection/mediaengine/a/a$j;
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/rtcconnection/mediaengine/a/a;)V
-    .locals 0
+.method static constructor <clinit>()V
+    .locals 1
 
-    iput-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/a$j;->this$0:Lcom/discord/rtcconnection/mediaengine/a/a;
+    new-instance v0, Lcom/discord/rtcconnection/mediaengine/a/a$j;
 
-    const/4 p1, 0x1
+    invoke-direct {v0}, Lcom/discord/rtcconnection/mediaengine/a/a$j;-><init>()V
 
-    invoke-direct {p0, p1}, Lkotlin/jvm/internal/m;-><init>(I)V
+    sput-object v0, Lcom/discord/rtcconnection/mediaengine/a/a$j;->As: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
 
     return-void
 .end method
@@ -47,7 +57,7 @@
 
 # virtual methods
 .method public final synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 4
+    .locals 3
 
     check-cast p1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$b;
 
@@ -55,21 +65,17 @@
 
     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$j;->this$0:Lcom/discord/rtcconnection/mediaengine/a/a;
+    new-instance v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException;
 
-    check-cast v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
+    sget-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->zR:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
 
-    new-instance v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException;
+    const-string v2, "No connection info"
 
-    sget-object v2, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->zP:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
+    invoke-direct {v0, v2, v1}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException;-><init>(Ljava/lang/String;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;)V
 
-    const-string v3, "No connection info"
+    invoke-interface {p1, v0}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$b;->onError(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException;)V
 
-    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;
+    sget-object p1, Lkotlin/Unit;->bgt: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 2c1b725079..6c530cca7f 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,16 +30,12 @@
 # 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>(Lcom/discord/rtcconnection/mediaengine/a/a;Ljava/lang/String;)V
+.method constructor <init>(Ljava/lang/String;)V
     .locals 0
 
-    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;
+    iput-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/a$k;->$errorMessage:Ljava/lang/String;
 
     const/4 p1, 0x1
 
@@ -51,7 +47,7 @@
 
 # virtual methods
 .method public final synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 3
+    .locals 2
 
     check-cast p1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$b;
 
@@ -59,19 +55,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$k;->this$0:Lcom/discord/rtcconnection/mediaengine/a/a;
+    new-instance v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException;
 
-    check-cast v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
+    iget-object v1, p0, Lcom/discord/rtcconnection/mediaengine/a/a$k;->$errorMessage:Ljava/lang/String;
 
-    new-instance v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException;
+    invoke-direct {v0, v1}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException;-><init>(Ljava/lang/String;)V
 
-    iget-object v2, p0, Lcom/discord/rtcconnection/mediaengine/a/a$k;->$errorMessage:Ljava/lang/String;
+    invoke-interface {p1, v0}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$b;->onError(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException;)V
 
-    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;
+    sget-object p1, Lkotlin/Unit;->bgt: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 b91c303632..94488a1aea 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 fb660c2990..3824904b4d 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 aa881f7322..f3115d649c 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,16 +30,12 @@
 # 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>(Lcom/discord/rtcconnection/mediaengine/a/a;Ljava/lang/String;)V
+.method constructor <init>(Ljava/lang/String;)V
     .locals 0
 
-    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;
+    iput-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/a$n;->$audioCodec:Ljava/lang/String;
 
     const/4 p1, 0x1
 
@@ -51,7 +47,7 @@
 
 # virtual methods
 .method public final synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 4
+    .locals 3
 
     check-cast p1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$b;
 
@@ -59,37 +55,33 @@
 
     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$n;->this$0:Lcom/discord/rtcconnection/mediaengine/a/a;
+    new-instance v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException;
 
-    check-cast v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
+    new-instance v1, Ljava/lang/StringBuilder;
 
-    new-instance v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException;
+    const-string v2, "Missing audio codec: "
 
-    new-instance v2, Ljava/lang/StringBuilder;
+    invoke-direct {v1, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    const-string v3, "Missing audio codec: "
+    iget-object v2, p0, Lcom/discord/rtcconnection/mediaengine/a/a$n;->$audioCodec:Ljava/lang/String;
 
-    invoke-direct {v2, v3}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v3, p0, Lcom/discord/rtcconnection/mediaengine/a/a$n;->$audioCodec:Ljava/lang/String;
+    const/16 v2, 0x2e
 
-    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
-    const/16 v3, 0x2e
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
-    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+    move-result-object v1
 
-    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+    sget-object v2, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->zS:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
 
-    move-result-object v2
+    invoke-direct {v0, v1, v2}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException;-><init>(Ljava/lang/String;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;)V
 
-    sget-object v3, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->zQ: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
 
-    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;
+    sget-object p1, Lkotlin/Unit;->bgt: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 51a3ebf19a..b3a88a7597 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,16 +30,12 @@
 # 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>(Lcom/discord/rtcconnection/mediaengine/a/a;Ljava/lang/String;)V
+.method constructor <init>(Ljava/lang/String;)V
     .locals 0
 
-    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;
+    iput-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/a$o;->$videoCodec:Ljava/lang/String;
 
     const/4 p1, 0x1
 
@@ -51,7 +47,7 @@
 
 # virtual methods
 .method public final synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 4
+    .locals 3
 
     check-cast p1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$b;
 
@@ -59,37 +55,33 @@
 
     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$o;->this$0:Lcom/discord/rtcconnection/mediaengine/a/a;
+    new-instance v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException;
 
-    check-cast v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
+    new-instance v1, Ljava/lang/StringBuilder;
 
-    new-instance v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException;
+    const-string v2, "Missing video codec: "
 
-    new-instance v2, Ljava/lang/StringBuilder;
+    invoke-direct {v1, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    const-string v3, "Missing video codec: "
+    iget-object v2, p0, Lcom/discord/rtcconnection/mediaengine/a/a$o;->$videoCodec:Ljava/lang/String;
 
-    invoke-direct {v2, v3}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v3, p0, Lcom/discord/rtcconnection/mediaengine/a/a$o;->$videoCodec:Ljava/lang/String;
+    const/16 v2, 0x2e
 
-    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
-    const/16 v3, 0x2e
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
-    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+    move-result-object v1
 
-    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+    sget-object v2, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->zS:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
 
-    move-result-object v2
+    invoke-direct {v0, v1, v2}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException;-><init>(Ljava/lang/String;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;)V
 
-    sget-object v3, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->zQ: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
 
-    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;
+    sget-object p1, Lkotlin/Unit;->bgt: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 1412ca9db2..d3b34ad396 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,16 +30,12 @@
 # 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>(Lcom/discord/rtcconnection/mediaengine/a/a;Ljava/lang/String;)V
+.method constructor <init>(Ljava/lang/String;)V
     .locals 0
 
-    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;
+    iput-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/a$p;->$videoCodec:Ljava/lang/String;
 
     const/4 p1, 0x1
 
@@ -51,7 +47,7 @@
 
 # virtual methods
 .method public final synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 4
+    .locals 3
 
     check-cast p1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$b;
 
@@ -59,37 +55,33 @@
 
     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$p;->this$0:Lcom/discord/rtcconnection/mediaengine/a/a;
+    new-instance v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException;
 
-    check-cast v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
+    new-instance v1, Ljava/lang/StringBuilder;
 
-    new-instance v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException;
+    const-string v2, "Video codec "
 
-    new-instance v2, Ljava/lang/StringBuilder;
+    invoke-direct {v1, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    const-string v3, "Video codec "
+    iget-object v2, p0, Lcom/discord/rtcconnection/mediaengine/a/a$p;->$videoCodec:Ljava/lang/String;
 
-    invoke-direct {v2, v3}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v3, p0, Lcom/discord/rtcconnection/mediaengine/a/a$p;->$videoCodec:Ljava/lang/String;
+    const-string v2, " rtxPayloadType was null."
 
-    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    const-string v3, " rtxPayloadType was null."
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
-    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    move-result-object v1
 
-    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+    sget-object v2, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->zS:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
 
-    move-result-object v2
+    invoke-direct {v0, v1, v2}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException;-><init>(Ljava/lang/String;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;)V
 
-    sget-object v3, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->zQ: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
 
-    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;
+    sget-object p1, Lkotlin/Unit;->bgt: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 963de23a6f..f6252aec6a 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 An:Lcom/discord/rtcconnection/mediaengine/a/a$a;
+.field public static final Ap:Lcom/discord/rtcconnection/mediaengine/a/a$a;
 
 .field private static final TAG:Ljava/lang/String;
 
 
 # instance fields
-.field private Ah:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
+.field private Aj:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
 
-.field private final Ai:Ljava/util/HashMap;
+.field private final Ak:Ljava/util/HashMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/HashMap<",
@@ -34,7 +34,7 @@
     .end annotation
 .end field
 
-.field private final Aj:Ljava/util/HashMap;
+.field private final Al:Ljava/util/HashMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/HashMap<",
@@ -45,7 +45,7 @@
     .end annotation
 .end field
 
-.field private final Ak:Ljava/util/ArrayList;
+.field private final Am:Ljava/util/ArrayList;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/ArrayList<",
@@ -55,9 +55,9 @@
     .end annotation
 .end field
 
-.field private final Al:Lco/discord/media_engine/Connection;
+.field private final An:Lco/discord/media_engine/Connection;
 
-.field private final Am:Lcom/hammerandchisel/libdiscord/Discord;
+.field private final Ao: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;->An:Lcom/discord/rtcconnection/mediaengine/a/a$a;
+    sput-object v0, Lcom/discord/rtcconnection/mediaengine/a/a;->Ap: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;ZJLcom/discord/rtcconnection/mediaengine/MediaEngine$a;Ljava/util/List;)V
-    .locals 14
+.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
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
             "Ljava/util/concurrent/ExecutorService;",
             "Lcom/discord/utilities/logging/Logger;",
             "Lcom/hammerandchisel/libdiscord/Discord;",
-            "ZJ",
+            "J",
             "Lcom/discord/rtcconnection/mediaengine/MediaEngine$a;",
             "Ljava/util/List<",
             "+",
@@ -118,157 +118,137 @@
         }
     .end annotation
 
-    move-object v0, p0
+    const-string v0, "executorService"
 
-    move-object v1, p1
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-object/from16 v2, p2
+    const-string v0, "logger"
 
-    move-object/from16 v3, p3
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-object/from16 v4, p7
+    const-string v0, "voiceEngineLegacy"
 
-    move-object/from16 v5, p8
+    invoke-static {p3, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v6, "executorService"
+    const-string v0, "connectionOptions"
 
-    invoke-static {p1, v6}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p6, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v6, "logger"
+    const-string v0, "listeners"
 
-    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-static {p7, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object v1, v0, Lcom/discord/rtcconnection/mediaengine/a/a;->executorService:Ljava/util/concurrent/ExecutorService;
+    iput-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->executorService:Ljava/util/concurrent/ExecutorService;
 
-    iput-object v2, v0, Lcom/discord/rtcconnection/mediaengine/a/a;->logger:Lcom/discord/utilities/logging/Logger;
+    iput-object p2, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->logger:Lcom/discord/utilities/logging/Logger;
 
-    iput-object v3, v0, Lcom/discord/rtcconnection/mediaengine/a/a;->Am:Lcom/hammerandchisel/libdiscord/Discord;
+    iput-object p3, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Ao:Lcom/hammerandchisel/libdiscord/Discord;
 
-    sget-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;->zI:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
+    sget-object p1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;->zK:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
 
-    iput-object v1, v0, Lcom/discord/rtcconnection/mediaengine/a/a;->Ah:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
+    iput-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Aj:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
 
-    const/4 v1, 0x1
+    const/4 p1, 0x1
 
-    new-array v1, v1, [Lkotlin/Pair;
+    new-array p1, p1, [Lkotlin/Pair;
 
-    invoke-static/range {p5 .. p6}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    invoke-static {p4, p5}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v2
+    move-result-object p2
 
-    iget v3, v4, Lcom/discord/rtcconnection/mediaengine/MediaEngine$a;->ssrc:I
+    iget p3, p6, Lcom/discord/rtcconnection/mediaengine/MediaEngine$a;->ssrc:I
 
-    invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {p3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    move-result-object v3
+    move-result-object p3
 
-    invoke-static {v2, v3}, Lkotlin/q;->to(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
+    invoke-static {p2, p3}, Lkotlin/q;->to(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
 
-    move-result-object v2
+    move-result-object p2
 
-    const/4 v3, 0x0
+    const/4 p3, 0x0
 
-    aput-object v2, v1, v3
+    aput-object p2, p1, p3
 
-    invoke-static {v1}, Lkotlin/a/ad;->hashMapOf([Lkotlin/Pair;)Ljava/util/HashMap;
+    invoke-static {p1}, Lkotlin/a/ad;->hashMapOf([Lkotlin/Pair;)Ljava/util/HashMap;
 
-    move-result-object v1
+    move-result-object p1
 
-    iput-object v1, v0, Lcom/discord/rtcconnection/mediaengine/a/a;->Ai:Ljava/util/HashMap;
+    iput-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Ak:Ljava/util/HashMap;
 
-    new-instance v1, Ljava/util/HashMap;
+    new-instance p1, Ljava/util/HashMap;
 
-    invoke-direct {v1}, Ljava/util/HashMap;-><init>()V
+    invoke-direct {p1}, Ljava/util/HashMap;-><init>()V
 
-    iput-object v1, v0, Lcom/discord/rtcconnection/mediaengine/a/a;->Aj:Ljava/util/HashMap;
+    iput-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Al:Ljava/util/HashMap;
 
-    new-instance v1, Ljava/util/ArrayList;
+    new-instance p1, Ljava/util/ArrayList;
 
-    invoke-direct {v1}, Ljava/util/ArrayList;-><init>()V
+    invoke-direct {p1}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v1, v0, Lcom/discord/rtcconnection/mediaengine/a/a;->Ak:Ljava/util/ArrayList;
+    iput-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Am:Ljava/util/ArrayList;
 
-    iget-object v6, v0, Lcom/discord/rtcconnection/mediaengine/a/a;->Am:Lcom/hammerandchisel/libdiscord/Discord;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Ao:Lcom/hammerandchisel/libdiscord/Discord;
 
-    iget v7, v4, Lcom/discord/rtcconnection/mediaengine/MediaEngine$a;->ssrc:I
+    iget v1, p6, Lcom/discord/rtcconnection/mediaengine/MediaEngine$a;->ssrc:I
 
-    iget-object v10, v4, Lcom/discord/rtcconnection/mediaengine/MediaEngine$a;->ip:Ljava/lang/String;
+    iget-object v4, p6, Lcom/discord/rtcconnection/mediaengine/MediaEngine$a;->ip:Ljava/lang/String;
 
-    iget v11, v4, Lcom/discord/rtcconnection/mediaengine/MediaEngine$a;->port:I
+    iget v5, p6, Lcom/discord/rtcconnection/mediaengine/MediaEngine$a;->port:I
 
-    new-instance v1, Lcom/discord/rtcconnection/mediaengine/a/a$e;
+    new-instance p1, Lcom/discord/rtcconnection/mediaengine/a/a$e;
 
-    invoke-direct {v1, p0}, Lcom/discord/rtcconnection/mediaengine/a/a$e;-><init>(Lcom/discord/rtcconnection/mediaengine/a/a;)V
+    invoke-direct {p1, p0}, Lcom/discord/rtcconnection/mediaengine/a/a$e;-><init>(Lcom/discord/rtcconnection/mediaengine/a/a;)V
 
-    move-object v13, v1
+    move-object v7, p1
 
-    check-cast v13, Lcom/hammerandchisel/libdiscord/Discord$ConnectToServerCallback;
+    check-cast v7, Lcom/hammerandchisel/libdiscord/Discord$ConnectToServerCallback;
 
-    move-wide/from16 v8, p5
+    const/4 v6, 0x0
 
-    move/from16 v12, p4
+    move-wide v2, p4
 
-    invoke-virtual/range {v6 .. v13}, Lcom/hammerandchisel/libdiscord/Discord;->connectToServer(IJLjava/lang/String;IZLcom/hammerandchisel/libdiscord/Discord$ConnectToServerCallback;)Lco/discord/media_engine/Connection;
+    invoke-virtual/range {v0 .. v7}, Lcom/hammerandchisel/libdiscord/Discord;->connectToServer(IJLjava/lang/String;IZLcom/hammerandchisel/libdiscord/Discord$ConnectToServerCallback;)Lco/discord/media_engine/Connection;
 
-    move-result-object v1
+    move-result-object p1
 
-    new-instance v2, Lcom/discord/rtcconnection/mediaengine/a/a$c;
+    new-instance p2, Lcom/discord/rtcconnection/mediaengine/a/a$c;
 
-    invoke-direct {v2, p0}, Lcom/discord/rtcconnection/mediaengine/a/a$c;-><init>(Lcom/discord/rtcconnection/mediaengine/a/a;)V
+    invoke-direct {p2, p0}, Lcom/discord/rtcconnection/mediaengine/a/a$c;-><init>(Lcom/discord/rtcconnection/mediaengine/a/a;)V
 
-    check-cast v2, Lco/discord/media_engine/Connection$OnVideoCallback;
+    check-cast p2, Lco/discord/media_engine/Connection$OnVideoCallback;
 
-    invoke-virtual {v1, v2}, Lco/discord/media_engine/Connection;->setOnVideoCallback(Lco/discord/media_engine/Connection$OnVideoCallback;)V
+    invoke-virtual {p1, p2}, Lco/discord/media_engine/Connection;->setOnVideoCallback(Lco/discord/media_engine/Connection$OnVideoCallback;)V
 
-    new-instance v2, Lcom/discord/rtcconnection/mediaengine/a/a$d;
+    new-instance p2, Lcom/discord/rtcconnection/mediaengine/a/a$d;
 
-    invoke-direct {v2, p0}, Lcom/discord/rtcconnection/mediaengine/a/a$d;-><init>(Lcom/discord/rtcconnection/mediaengine/a/a;)V
+    invoke-direct {p2, p0}, Lcom/discord/rtcconnection/mediaengine/a/a$d;-><init>(Lcom/discord/rtcconnection/mediaengine/a/a;)V
 
-    check-cast v2, Lco/discord/media_engine/Connection$UserSpeakingStatusChangedCallback;
+    check-cast p2, Lco/discord/media_engine/Connection$UserSpeakingStatusChangedCallback;
 
-    invoke-virtual {v1, v2}, Lco/discord/media_engine/Connection;->setUserSpeakingStatusChangedCallback(Lco/discord/media_engine/Connection$UserSpeakingStatusChangedCallback;)V
+    invoke-virtual {p1, p2}, Lco/discord/media_engine/Connection;->setUserSpeakingStatusChangedCallback(Lco/discord/media_engine/Connection$UserSpeakingStatusChangedCallback;)V
 
-    const-string v2, "findme"
+    const-string p2, "connection"
 
-    const-string v3, "added speaking listener"
+    invoke-static {p1, p2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v2, v3}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
+    iput-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->An:Lco/discord/media_engine/Connection;
 
-    const-string v2, "connection"
+    new-instance p1, Ljava/util/ArrayList;
 
-    invoke-static {v1, v2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    check-cast p7, Ljava/util/Collection;
 
-    iput-object v1, v0, Lcom/discord/rtcconnection/mediaengine/a/a;->Al:Lco/discord/media_engine/Connection;
+    invoke-direct {p1, p7}, Ljava/util/ArrayList;-><init>(Ljava/util/Collection;)V
 
-    new-instance v1, Ljava/util/ArrayList;
+    check-cast p1, Ljava/util/List;
 
-    move-object v2, v5
+    iput-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->listeners:Ljava/util/List;
 
-    check-cast v2, Ljava/util/Collection;
+    sget-object p1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;->zK:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
 
-    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
+    invoke-direct {p0, p1}, Lcom/discord/rtcconnection/mediaengine/a/a;->a(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;)V
 
     return-void
 .end method
@@ -302,11 +282,11 @@
 .method private final a(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;)V
     .locals 1
 
-    iput-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Ah:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
+    iput-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Aj:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
 
     new-instance v0, Lcom/discord/rtcconnection/mediaengine/a/a$b;
 
-    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
+    invoke-direct {v0, p1}, Lcom/discord/rtcconnection/mediaengine/a/a$b;-><init>(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;)V
 
     check-cast v0, Lkotlin/jvm/functions/Function1;
 
@@ -318,7 +298,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;->Aj:Ljava/util/HashMap;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Al:Ljava/util/HashMap;
 
     check-cast v0, Ljava/util/Map;
 
@@ -354,9 +334,9 @@
 .end method
 
 .method public static final synthetic a(Lcom/discord/rtcconnection/mediaengine/a/a;JZ)V
-    .locals 3
+    .locals 2
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Ai:Ljava/util/HashMap;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Ak:Ljava/util/HashMap;
 
     invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -385,28 +365,6 @@
 
     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
@@ -503,7 +461,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;->zJ:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
+    sget-object p1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;->zL:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
 
     invoke-direct {p0, p1}, Lcom/discord/rtcconnection/mediaengine/a/a;->a(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;)V
 
@@ -523,7 +481,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;->Am:Lcom/hammerandchisel/libdiscord/Discord;
+    iget-object p2, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Ao:Lcom/hammerandchisel/libdiscord/Discord;
 
     invoke-virtual {p2}, Lcom/hammerandchisel/libdiscord/Discord;->getSupportedVideoCodecs()[Ljava/lang/String;
 
@@ -541,15 +499,15 @@
 
     move-result-object p2
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Ak:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Am:Ljava/util/ArrayList;
 
     invoke-virtual {v0}, Ljava/util/ArrayList;->clear()V
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Ak:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Am: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;->Ak:Ljava/util/ArrayList;
+    iget-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Am:Ljava/util/ArrayList;
 
     check-cast p2, Ljava/util/Collection;
 
@@ -577,9 +535,7 @@
     :cond_3
     if-nez p1, :cond_4
 
-    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
+    sget-object p1, Lcom/discord/rtcconnection/mediaengine/a/a$j;->As:Lcom/discord/rtcconnection/mediaengine/a/a$j;
 
     check-cast p1, Lkotlin/jvm/functions/Function1;
 
@@ -590,7 +546,7 @@
     :cond_4
     new-instance p1, Lcom/discord/rtcconnection/mediaengine/a/a$k;
 
-    invoke-direct {p1, p0, p2}, Lcom/discord/rtcconnection/mediaengine/a/a$k;-><init>(Lcom/discord/rtcconnection/mediaengine/a/a;Ljava/lang/String;)V
+    invoke-direct {p1, p2}, Lcom/discord/rtcconnection/mediaengine/a/a$k;-><init>(Ljava/lang/String;)V
 
     check-cast p1, Lkotlin/jvm/functions/Function1;
 
@@ -610,7 +566,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;->Ai:Ljava/util/HashMap;
+    iget-object p0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Ak:Ljava/util/HashMap;
 
     return-object p0
 .end method
@@ -618,7 +574,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;->Ak:Ljava/util/ArrayList;
+    iget-object p0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Am:Ljava/util/ArrayList;
 
     return-object p0
 .end method
@@ -876,7 +832,7 @@
 .method public final a(JI)V
     .locals 2
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Al:Lco/discord/media_engine/Connection;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->An:Lco/discord/media_engine/Connection;
 
     int-to-float p3, p3
 
@@ -894,7 +850,7 @@
 
     if-nez p4, :cond_0
 
-    iget-object p4, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Aj:Ljava/util/HashMap;
+    iget-object p4, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Al:Ljava/util/HashMap;
 
     invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -921,7 +877,7 @@
     const/4 p4, 0x0
 
     :goto_0
-    iget-object v1, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Ai:Ljava/util/HashMap;
+    iget-object v1, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Ak:Ljava/util/HashMap;
 
     invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -955,7 +911,7 @@
     const/4 v1, 0x0
 
     :goto_2
-    iget-object v3, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Aj:Ljava/util/HashMap;
+    iget-object v3, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Al:Ljava/util/HashMap;
 
     invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -987,7 +943,7 @@
     if-eqz v0, :cond_7
 
     :cond_6
-    iget-object v1, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Al:Lco/discord/media_engine/Connection;
+    iget-object v1, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->An:Lco/discord/media_engine/Connection;
 
     invoke-static {p4}, Lcom/discord/rtcconnection/mediaengine/a/a;->w(I)I
 
@@ -1006,7 +962,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;->Ai:Ljava/util/HashMap;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Ak:Ljava/util/HashMap;
 
     check-cast v0, Ljava/util/Map;
 
@@ -1020,7 +976,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;->Aj:Ljava/util/HashMap;
+    iget-object p3, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Al:Ljava/util/HashMap;
 
     check-cast p3, Ljava/util/Map;
 
@@ -1040,7 +996,7 @@
 .method public final a(JZ)V
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Al:Lco/discord/media_engine/Connection;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->An:Lco/discord/media_engine/Connection;
 
     invoke-virtual {v0, p1, p2, p3}, Lco/discord/media_engine/Connection;->muteUser(JZ)V
 
@@ -1058,23 +1014,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;->Al:Lco/discord/media_engine/Connection;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->An:Lco/discord/media_engine/Connection;
 
-    iget v1, p2, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->zY:I
+    iget v1, p2, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->Aa:I
 
     invoke-virtual {v0, v1}, Lco/discord/media_engine/Connection;->setVADLeadingFramesToBuffer(I)V
 
-    iget v1, p2, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->zZ:I
+    iget v1, p2, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->Ab:I
 
     invoke-virtual {v0, v1}, Lco/discord/media_engine/Connection;->setVADTrailingFramesToSend(I)V
 
-    iget v1, p2, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->zX:I
+    iget v1, p2, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->zZ: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;->Aa:Z
+    iget-boolean p2, p2, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->Ac:Z
 
     if-eqz p2, :cond_0
 
@@ -1100,7 +1056,7 @@
 
     invoke-virtual {v0, p2}, Lco/discord/media_engine/Connection;->setExpectedPacketLossRate(F)V
 
-    iget-object p2, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Am:Lcom/hammerandchisel/libdiscord/Discord;
+    iget-object p2, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Ao:Lcom/hammerandchisel/libdiscord/Discord;
 
     invoke-virtual {p2, p1}, Lcom/hammerandchisel/libdiscord/Discord;->enableBuiltInAEC(Z)V
 
@@ -1108,7 +1064,7 @@
 .end method
 
 .method public final a(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$b;)V
-    .locals 2
+    .locals 1
 
     const-string v0, "listener"
 
@@ -1118,13 +1074,9 @@
 
     invoke-interface {v0, p1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    move-object v0, p0
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Aj:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
 
-    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
+    invoke-interface {p1, v0}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$b;->onConnectionStateChange(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;)V
 
     return-void
 .end method
@@ -1144,7 +1096,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;->Al:Lco/discord/media_engine/Connection;
+    iget-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->An:Lco/discord/media_engine/Connection;
 
     invoke-virtual {p1, v0}, Lco/discord/media_engine/Connection;->setEncryptionSettings(Lco/discord/media_engine/EncryptionSettings;)V
 
@@ -1182,13 +1134,11 @@
 
     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;->Al:Lco/discord/media_engine/Connection;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->An:Lco/discord/media_engine/Connection;
 
     invoke-virtual {v0}, Lco/discord/media_engine/Connection;->dispose()V
 
-    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
+    sget-object v0, Lcom/discord/rtcconnection/mediaengine/a/a$g;->Aq:Lcom/discord/rtcconnection/mediaengine/a/a$g;
 
     check-cast v0, Lkotlin/jvm/functions/Function1;
 
@@ -1214,7 +1164,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;->Al:Lco/discord/media_engine/Connection;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->An:Lco/discord/media_engine/Connection;
 
     new-instance v1, Lcom/discord/rtcconnection/mediaengine/a/a$h;
 
@@ -1230,7 +1180,7 @@
 .method public final p(Z)V
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Al:Lco/discord/media_engine/Connection;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->An:Lco/discord/media_engine/Connection;
 
     invoke-virtual {v0, p1}, Lco/discord/media_engine/Connection;->muteLocalUser(Z)V
 
@@ -1248,7 +1198,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;->Ak:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Am:Ljava/util/ArrayList;
 
     check-cast v0, Ljava/lang/Iterable;
 
@@ -1291,7 +1241,7 @@
 
     check-cast v8, Lcom/discord/rtcconnection/mediaengine/a;
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Ak:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Am:Ljava/util/ArrayList;
 
     check-cast v0, Ljava/lang/Iterable;
 
@@ -1336,7 +1286,7 @@
 
     new-instance v0, Lcom/discord/rtcconnection/mediaengine/a/a$n;
 
-    invoke-direct {v0, p0, p1}, Lcom/discord/rtcconnection/mediaengine/a/a$n;-><init>(Lcom/discord/rtcconnection/mediaengine/a/a;Ljava/lang/String;)V
+    invoke-direct {v0, p1}, Lcom/discord/rtcconnection/mediaengine/a/a$n;-><init>(Ljava/lang/String;)V
 
     check-cast v0, Lkotlin/jvm/functions/Function1;
 
@@ -1349,7 +1299,7 @@
 
     new-instance v0, Lcom/discord/rtcconnection/mediaengine/a/a$o;
 
-    invoke-direct {v0, p0, p2}, Lcom/discord/rtcconnection/mediaengine/a/a$o;-><init>(Lcom/discord/rtcconnection/mediaengine/a/a;Ljava/lang/String;)V
+    invoke-direct {v0, p2}, Lcom/discord/rtcconnection/mediaengine/a/a$o;-><init>(Ljava/lang/String;)V
 
     check-cast v0, Lkotlin/jvm/functions/Function1;
 
@@ -1364,7 +1314,7 @@
 
     new-instance v0, Lcom/discord/rtcconnection/mediaengine/a/a$p;
 
-    invoke-direct {v0, p0, p2}, Lcom/discord/rtcconnection/mediaengine/a/a$p;-><init>(Lcom/discord/rtcconnection/mediaengine/a/a;Ljava/lang/String;)V
+    invoke-direct {v0, p2}, Lcom/discord/rtcconnection/mediaengine/a/a$p;-><init>(Ljava/lang/String;)V
 
     check-cast v0, Lkotlin/jvm/functions/Function1;
 
@@ -1477,7 +1427,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;->Al:Lco/discord/media_engine/Connection;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->An:Lco/discord/media_engine/Connection;
 
     new-array v5, v3, [Lco/discord/media_engine/AudioDecoder;
 
@@ -1495,7 +1445,7 @@
 .method public final setPttActive(Z)V
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Al:Lco/discord/media_engine/Connection;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->An:Lco/discord/media_engine/Connection;
 
     invoke-virtual {v0, p1}, Lco/discord/media_engine/Connection;->setPTTActive(Z)V
 
@@ -1505,7 +1455,7 @@
 .method public final setSelfDeafen(Z)V
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Al:Lco/discord/media_engine/Connection;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->An:Lco/discord/media_engine/Connection;
 
     invoke-virtual {v0, p1}, Lco/discord/media_engine/Connection;->deafenLocalUser(Z)V
 
@@ -1515,7 +1465,7 @@
 .method public final setVideoBroadcast(Z)V
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Al:Lco/discord/media_engine/Connection;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->An: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 fd13ee9f27..b88d9bfb5e 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(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;)V
+    value = Lcom/discord/rtcconnection/mediaengine/a/c$b;->onDestroy()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -27,19 +27,15 @@
 
 
 # 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;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;)V
+.method constructor <init>(Lcom/discord/rtcconnection/mediaengine/a/c$b;)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
@@ -50,17 +46,15 @@
 
 # virtual methods
 .method public final synthetic invoke()Ljava/lang/Object;
-    .locals 2
+    .locals 1
 
     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;
+    iget-object v0, v0, Lcom/discord/rtcconnection/mediaengine/a/c$b;->Ax:Lcom/discord/rtcconnection/mediaengine/a/c;
 
-    iget-object v1, p0, Lcom/discord/rtcconnection/mediaengine/a/c$b$1;->$connection:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
+    invoke-static {v0}, Lcom/discord/rtcconnection/mediaengine/a/c;->a(Lcom/discord/rtcconnection/mediaengine/a/c;)V
 
-    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;
+    sget-object v0, Lkotlin/Unit;->bgt: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 62e2263d69..1e3522d5ab 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;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;)V
+    value = Lcom/discord/rtcconnection/mediaengine/a/c$b;->onConnectionStateChange(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -27,19 +27,15 @@
 
 
 # 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;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;)V
+.method constructor <init>(Lcom/discord/rtcconnection/mediaengine/a/c$b;)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
@@ -50,17 +46,15 @@
 
 # virtual methods
 .method public final synthetic invoke()Ljava/lang/Object;
-    .locals 2
+    .locals 1
 
     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;
+    iget-object v0, v0, Lcom/discord/rtcconnection/mediaengine/a/c$b;->Ax:Lcom/discord/rtcconnection/mediaengine/a/c;
 
-    iget-object v1, p0, Lcom/discord/rtcconnection/mediaengine/a/c$b$2;->$connection:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
+    invoke-static {v0}, Lcom/discord/rtcconnection/mediaengine/a/c;->a(Lcom/discord/rtcconnection/mediaengine/a/c;)V
 
-    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;
+    sget-object v0, Lkotlin/Unit;->bgt: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 44fd19b7ae..46505307ef 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;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException;)V
+    value = Lcom/discord/rtcconnection/mediaengine/a/c$b;->onError(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -27,19 +27,15 @@
 
 
 # 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;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;)V
+.method constructor <init>(Lcom/discord/rtcconnection/mediaengine/a/c$b;)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
@@ -50,17 +46,15 @@
 
 # virtual methods
 .method public final synthetic invoke()Ljava/lang/Object;
-    .locals 2
+    .locals 1
 
     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;
+    iget-object v0, v0, Lcom/discord/rtcconnection/mediaengine/a/c$b;->Ax:Lcom/discord/rtcconnection/mediaengine/a/c;
 
-    iget-object v1, p0, Lcom/discord/rtcconnection/mediaengine/a/c$b$3;->$connection:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
+    invoke-static {v0}, Lcom/discord/rtcconnection/mediaengine/a/c;->a(Lcom/discord/rtcconnection/mediaengine/a/c;)V
 
-    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;
+    sget-object v0, Lkotlin/Unit;->bgt: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 4c8002a4ee..204af5c48f 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;ZLkotlin/jvm/functions/Function1;)Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
+    value = Lcom/discord/rtcconnection/mediaengine/a/c;->a(JLcom/discord/rtcconnection/mediaengine/MediaEngine$a;Lkotlin/jvm/functions/Function1;)Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -20,24 +20,20 @@
 # instance fields
 .field final synthetic $userId$inlined:J
 
-.field final synthetic At:Lcom/discord/rtcconnection/mediaengine/a/c;
+.field final synthetic Ax:Lcom/discord/rtcconnection/mediaengine/a/c;
 
-.field final synthetic Au:Lcom/discord/rtcconnection/mediaengine/MediaEngine$a;
-
-.field final synthetic Av:Z
+.field final synthetic Ay:Lcom/discord/rtcconnection/mediaengine/MediaEngine$a;
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/rtcconnection/mediaengine/a/c;Lcom/discord/rtcconnection/mediaengine/MediaEngine$a;ZJ)V
+.method constructor <init>(Lcom/discord/rtcconnection/mediaengine/a/c;Lcom/discord/rtcconnection/mediaengine/MediaEngine$a;J)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/c$b;->At:Lcom/discord/rtcconnection/mediaengine/a/c;
+    iput-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/c$b;->Ax: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-object p2, p0, Lcom/discord/rtcconnection/mediaengine/a/c$b;->Ay:Lcom/discord/rtcconnection/mediaengine/MediaEngine$a;
 
-    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
+    iput-wide p3, p0, Lcom/discord/rtcconnection/mediaengine/a/c$b;->$userId$inlined:J
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -46,12 +42,11 @@
 
 
 # virtual methods
-.method public final onConnected(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;Ljava/util/List;)V
+.method public final onConnected(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;",
@@ -59,62 +54,50 @@
         }
     .end annotation
 
-    const-string v0, "connection"
+    const-string v0, "transportInfo"
 
     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
+    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;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;)V
+.method public final onConnectionStateChange(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 v0, "connectionState"
 
-    invoke-static {p2, v0}, 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
 
-    sget-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;->zH:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
+    sget-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;->zJ:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
 
-    if-ne p2, v0, :cond_0
+    if-ne p1, v0, :cond_0
 
-    iget-object p2, p0, Lcom/discord/rtcconnection/mediaengine/a/c$b;->At:Lcom/discord/rtcconnection/mediaengine/a/c;
+    iget-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/c$b;->Ax:Lcom/discord/rtcconnection/mediaengine/a/c;
 
     new-instance v0, Lcom/discord/rtcconnection/mediaengine/a/c$b$2;
 
-    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
+    invoke-direct {v0, p0}, Lcom/discord/rtcconnection/mediaengine/a/c$b$2;-><init>(Lcom/discord/rtcconnection/mediaengine/a/c$b;)V
 
     check-cast v0, Lkotlin/jvm/functions/Function0;
 
-    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;
+    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;
 
     :cond_0
     return-void
 .end method
 
-.method public final onDestroy(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;)V
+.method public final onDestroy()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;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c$b;->Ax:Lcom/discord/rtcconnection/mediaengine/a/c;
 
     new-instance v1, Lcom/discord/rtcconnection/mediaengine/a/c$b$1;
 
-    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
+    invoke-direct {v1, p0}, Lcom/discord/rtcconnection/mediaengine/a/c$b$1;-><init>(Lcom/discord/rtcconnection/mediaengine/a/c$b;)V
 
     check-cast v1, Lkotlin/jvm/functions/Function0;
 
@@ -123,26 +106,22 @@
     return-void
 .end method
 
-.method public final onError(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException;)V
+.method public final onError(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 v0, "exception"
 
-    invoke-static {p2, v0}, 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
 
-    iget-object p2, p0, Lcom/discord/rtcconnection/mediaengine/a/c$b;->At:Lcom/discord/rtcconnection/mediaengine/a/c;
+    iget-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/c$b;->Ax:Lcom/discord/rtcconnection/mediaengine/a/c;
 
     new-instance v0, Lcom/discord/rtcconnection/mediaengine/a/c$b$3;
 
-    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
+    invoke-direct {v0, p0}, Lcom/discord/rtcconnection/mediaengine/a/c$b$3;-><init>(Lcom/discord/rtcconnection/mediaengine/a/c$b;)V
 
     check-cast v0, Lkotlin/jvm/functions/Function0;
 
-    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;
+    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;
 
     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 5e7318a48d..bf8d311b26 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;ZLkotlin/jvm/functions/Function1;)Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
+    value = Lcom/discord/rtcconnection/mediaengine/a/c;->a(JLcom/discord/rtcconnection/mediaengine/MediaEngine$a;Lkotlin/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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 b21a4fb797..0b61d56bcf 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 Aw:Lkotlin/jvm/functions/Function1;
+.field final synthetic Az: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;->Aw:Lkotlin/jvm/functions/Function1;
+    iput-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/c$d;->Az: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;->Aw:Lkotlin/jvm/functions/Function1;
+    iget-object p2, p0, Lcom/discord/rtcconnection/mediaengine/a/c$d;->Az: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 48f7b9b2fb..65f77526f4 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;->eD()V
+    value = Lcom/discord/rtcconnection/mediaengine/a/c;->eC()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic At:Lcom/discord/rtcconnection/mediaengine/a/c;
+.field final synthetic Ax:Lcom/discord/rtcconnection/mediaengine/a/c;
 
 
 # direct methods
 .method constructor <init>(Lcom/discord/rtcconnection/mediaengine/a/c;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/c$e;->At:Lcom/discord/rtcconnection/mediaengine/a/c;
+    iput-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/c$e;->Ax:Lcom/discord/rtcconnection/mediaengine/a/c;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,9 +37,9 @@
 .method public final e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
     .locals 8
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c$e;->At:Lcom/discord/rtcconnection/mediaengine/a/c;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c$e;->Ax:Lcom/discord/rtcconnection/mediaengine/a/c;
 
-    invoke-static {v0}, Lcom/discord/rtcconnection/mediaengine/a/c;->a(Lcom/discord/rtcconnection/mediaengine/a/c;)Lcom/discord/utilities/logging/Logger;
+    invoke-static {v0}, Lcom/discord/rtcconnection/mediaengine/a/c;->b(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 4e55d82496..6188e70b40 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;->eD()V
+    value = Lcom/discord/rtcconnection/mediaengine/a/c;->eC()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -28,7 +28,7 @@
 
 
 # static fields
-.field public static final Ax:Lcom/discord/rtcconnection/mediaengine/a/c$f;
+.field public static final AA: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;->Ax:Lcom/discord/rtcconnection/mediaengine/a/c$f;
+    sput-object v0, Lcom/discord/rtcconnection/mediaengine/a/c$f;->AA: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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 98191b042c..7cd45f1a20 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/a/c.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/a/c.smali
@@ -15,25 +15,15 @@
 
 
 # static fields
-.field public static final As:Lcom/discord/rtcconnection/mediaengine/a/c$a;
+.field public static final Aw:Lcom/discord/rtcconnection/mediaengine/a/c$a;
 
 .field private static final TAG:Ljava/lang/String;
 
 
 # instance fields
-.field private Am:Lcom/hammerandchisel/libdiscord/Discord;
+.field private Ao: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;
+.field private final At:Ljava/util/ArrayList;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/ArrayList<",
@@ -43,7 +33,9 @@
     .end annotation
 .end field
 
-.field private final Ar:Ljava/util/concurrent/ExecutorService;
+.field private Au:Lcom/discord/rtcconnection/mediaengine/a/a;
+
+.field private final Av:Ljava/util/concurrent/ExecutorService;
 
 .field private final context:Landroid/content/Context;
 
@@ -62,7 +54,7 @@
 
     invoke-direct {v0, v1}, Lcom/discord/rtcconnection/mediaengine/a/c$a;-><init>(B)V
 
-    sput-object v0, Lcom/discord/rtcconnection/mediaengine/a/c;->As:Lcom/discord/rtcconnection/mediaengine/a/c$a;
+    sput-object v0, Lcom/discord/rtcconnection/mediaengine/a/c;->Aw:Lcom/discord/rtcconnection/mediaengine/a/c$a;
 
     const-class v0, Lcom/discord/rtcconnection/mediaengine/a/c;
 
@@ -102,7 +94,7 @@
 
     iput-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->context:Landroid/content/Context;
 
-    iput-object p2, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->Ar:Ljava/util/concurrent/ExecutorService;
+    iput-object p2, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->Av:Ljava/util/concurrent/ExecutorService;
 
     iput-object p3, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->openSLESConfig:Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
 
@@ -112,29 +104,15 @@
 
     invoke-direct {p1}, Ljava/util/ArrayList;-><init>()V
 
-    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;
+    iput-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->At:Ljava/util/ArrayList;
 
     return-void
 .end method
 
-.method public static final synthetic a(Lcom/discord/rtcconnection/mediaengine/a/c;)Lcom/discord/utilities/logging/Logger;
-    .locals 0
-
-    iget-object p0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->logger:Lcom/discord/utilities/logging/Logger;
-
-    return-object p0
-.end method
-
 .method public static final synthetic a(Lcom/discord/rtcconnection/mediaengine/a/c;Lkotlin/jvm/functions/Function0;)Ljava/util/concurrent/Future;
     .locals 1
 
-    iget-object p0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->Ar:Ljava/util/concurrent/ExecutorService;
+    iget-object p0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->Av:Ljava/util/concurrent/ExecutorService;
 
     new-instance v0, Lcom/discord/rtcconnection/mediaengine/a/f;
 
@@ -149,29 +127,35 @@
     return-object p0
 .end method
 
-.method public static final synthetic a(Lcom/discord/rtcconnection/mediaengine/a/c;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;)V
+.method public static final synthetic a(Lcom/discord/rtcconnection/mediaengine/a/c;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->Am:Lcom/hammerandchisel/libdiscord/Discord;
-
-    if-eqz v0, :cond_0
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->Ao:Lcom/hammerandchisel/libdiscord/Discord;
 
     const/4 v1, 0x0
 
+    if-eqz v0, :cond_0
+
     invoke-virtual {v0, v1}, Lcom/hammerandchisel/libdiscord/Discord;->setLocalVoiceLevelChangedCallback(Lcom/hammerandchisel/libdiscord/Discord$LocalVoiceLevelChangedCallback;)V
 
     :cond_0
-    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
+    iput-object v1, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->Au:Lcom/discord/rtcconnection/mediaengine/a/a;
 
     return-void
 .end method
 
-.method private final eD()V
+.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 eC()V
     .locals 8
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->Am:Lcom/hammerandchisel/libdiscord/Discord;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->Ao:Lcom/hammerandchisel/libdiscord/Discord;
 
     if-eqz v0, :cond_0
 
@@ -250,7 +234,7 @@
 
     invoke-direct {v0, v1}, Lcom/hammerandchisel/libdiscord/Discord;-><init>(Landroid/content/Context;)V
 
-    iput-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->Am:Lcom/hammerandchisel/libdiscord/Discord;
+    iput-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->Ao: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
@@ -324,11 +308,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;->Am:Lcom/hammerandchisel/libdiscord/Discord;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->Ao:Lcom/hammerandchisel/libdiscord/Discord;
 
     if-eqz v0, :cond_3
 
-    sget-object v0, Lcom/discord/rtcconnection/mediaengine/a/c$f;->Ax:Lcom/discord/rtcconnection/mediaengine/a/c$f;
+    sget-object v0, Lcom/discord/rtcconnection/mediaengine/a/c$f;->AA:Lcom/discord/rtcconnection/mediaengine/a/c$f;
 
     check-cast v0, Lkotlin/jvm/functions/Function1;
 
@@ -351,7 +335,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->Aq:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->At:Ljava/util/ArrayList;
 
     check-cast v0, Ljava/lang/Iterable;
 
@@ -408,13 +392,12 @@
 
 
 # virtual methods
-.method public final a(JLcom/discord/rtcconnection/mediaengine/MediaEngine$a;ZLkotlin/jvm/functions/Function1;)Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
-    .locals 16
+.method public final a(JLcom/discord/rtcconnection/mediaengine/MediaEngine$a;Lkotlin/jvm/functions/Function1;)Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
+    .locals 11
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(J",
             "Lcom/discord/rtcconnection/mediaengine/MediaEngine$a;",
-            "Z",
             "Lkotlin/jvm/functions/Function1<",
             "-",
             "Ljava/lang/Exception;",
@@ -424,92 +407,74 @@
         }
     .end annotation
 
-    move-object/from16 v6, p0
+    const-string v0, "options"
 
-    move-object/from16 v0, p5
+    invoke-static {p3, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v1, "options"
+    const-string v0, "onFailure"
 
-    move-object/from16 v14, p3
+    invoke-static {p4, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v14, v1}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-direct {p0}, Lcom/discord/rtcconnection/mediaengine/a/c;->eC()V
 
-    const-string v1, "onFailure"
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->Ao:Lcom/hammerandchisel/libdiscord/Discord;
 
-    invoke-static {v0, v1}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    if-nez v0, :cond_0
 
-    invoke-direct/range {p0 .. p0}, Lcom/discord/rtcconnection/mediaengine/a/c;->eD()V
+    new-instance v0, Lcom/discord/rtcconnection/mediaengine/MediaEngine$c;
 
-    iget-object v1, v6, Lcom/discord/rtcconnection/mediaengine/a/c;->Am:Lcom/hammerandchisel/libdiscord/Discord;
+    invoke-direct {v0}, Lcom/discord/rtcconnection/mediaengine/MediaEngine$c;-><init>()V
 
-    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;
+    invoke-interface {p4, v0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
     :cond_0
-    iget-object v10, v6, Lcom/discord/rtcconnection/mediaengine/a/c;->Am:Lcom/hammerandchisel/libdiscord/Discord;
+    iget-object v4, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->Ao:Lcom/hammerandchisel/libdiscord/Discord;
 
-    if-eqz v10, :cond_1
+    if-eqz v4, :cond_1
 
-    iget-object v0, v6, Lcom/discord/rtcconnection/mediaengine/a/c;->logger:Lcom/discord/utilities/logging/Logger;
+    iget-object v5, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->logger:Lcom/discord/utilities/logging/Logger;
 
-    sget-object v1, Lcom/discord/rtcconnection/mediaengine/a/c;->TAG:Ljava/lang/String;
+    sget-object v6, Lcom/discord/rtcconnection/mediaengine/a/c;->TAG:Ljava/lang/String;
 
-    invoke-static/range {p3 .. p3}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
+    invoke-static {p3}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
-    move-result-object v2
+    move-result-object p4
 
-    const-string v3, "Connecting with options: "
+    const-string v0, "Connecting with options: "
 
-    invoke-virtual {v3, v2}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v0, p4}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
 
-    move-result-object v2
+    move-result-object v7
 
-    const/4 v3, 0x0
+    const/4 v8, 0x0
 
-    const/4 v4, 0x4
+    const/4 v9, 0x4
 
-    const/4 v5, 0x0
+    const/4 v10, 0x0
 
-    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
+    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
 
-    new-instance v7, Lcom/discord/rtcconnection/mediaengine/a/c$b;
+    new-instance p4, Lcom/discord/rtcconnection/mediaengine/a/c$b;
 
-    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
+    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
 
     new-instance v0, Lcom/discord/rtcconnection/mediaengine/a/a;
 
-    iget-object v8, v6, Lcom/discord/rtcconnection/mediaengine/a/c;->Ar:Ljava/util/concurrent/ExecutorService;
+    iget-object v2, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->Av:Ljava/util/concurrent/ExecutorService;
 
-    iget-object v9, v6, Lcom/discord/rtcconnection/mediaengine/a/c;->logger:Lcom/discord/utilities/logging/Logger;
+    iget-object v3, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->logger:Lcom/discord/utilities/logging/Logger;
 
-    invoke-static {v7}, Lkotlin/a/m;->listOf(Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {p4}, Lkotlin/a/m;->listOf(Ljava/lang/Object;)Ljava/util/List;
 
-    move-result-object v15
+    move-result-object v8
 
-    move-object v7, v0
+    move-object v1, v0
 
-    move/from16 v11, p4
+    move-wide v5, p1
 
-    move-wide/from16 v12, p1
+    move-object v7, p3
 
-    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
+    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
 
     goto :goto_0
 
@@ -517,24 +482,26 @@
     const/4 v0, 0x0
 
     :goto_0
-    if-eqz v0, :cond_2
+    iput-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->Au:Lcom/discord/rtcconnection/mediaengine/a/a;
 
-    iget-object v1, v6, Lcom/discord/rtcconnection/mediaengine/a/c;->Ap:Ljava/util/ArrayList;
+    iget-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->Au:Lcom/discord/rtcconnection/mediaengine/a/a;
 
-    invoke-virtual {v1, v0}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+    if-eqz p1, :cond_2
 
-    new-instance v1, Lcom/discord/rtcconnection/mediaengine/a/c$c;
+    new-instance p2, Lcom/discord/rtcconnection/mediaengine/a/c$c;
 
-    invoke-direct {v1, v0}, Lcom/discord/rtcconnection/mediaengine/a/c$c;-><init>(Lcom/discord/rtcconnection/mediaengine/a/a;)V
+    invoke-direct {p2, p1}, Lcom/discord/rtcconnection/mediaengine/a/c$c;-><init>(Lcom/discord/rtcconnection/mediaengine/a/a;)V
 
-    check-cast v1, Lkotlin/jvm/functions/Function1;
+    check-cast p2, Lkotlin/jvm/functions/Function1;
 
-    invoke-direct {v6, v1}, Lcom/discord/rtcconnection/mediaengine/a/c;->g(Lkotlin/jvm/functions/Function1;)V
+    invoke-direct {p0, p2}, Lcom/discord/rtcconnection/mediaengine/a/c;->g(Lkotlin/jvm/functions/Function1;)V
 
     :cond_2
-    check-cast v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
+    iget-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->Au:Lcom/discord/rtcconnection/mediaengine/a/a;
 
-    return-object v0
+    check-cast p1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
+
+    return-object p1
 .end method
 
 .method public final a(Lcom/discord/rtcconnection/mediaengine/MediaEngine$b;)V
@@ -544,7 +511,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;->Aq:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->At:Ljava/util/ArrayList;
 
     invoke-virtual {v0, p1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
@@ -568,9 +535,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;->eD()V
+    invoke-direct {p0}, Lcom/discord/rtcconnection/mediaengine/a/c;->eC()V
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->Am:Lcom/hammerandchisel/libdiscord/Discord;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->Ao:Lcom/hammerandchisel/libdiscord/Discord;
 
     if-eqz v0, :cond_0
 
@@ -601,9 +568,9 @@
 
     if-eqz p1, :cond_1
 
-    invoke-direct {p0}, Lcom/discord/rtcconnection/mediaengine/a/c;->eD()V
+    invoke-direct {p0}, Lcom/discord/rtcconnection/mediaengine/a/c;->eC()V
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->Am:Lcom/hammerandchisel/libdiscord/Discord;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->Ao:Lcom/hammerandchisel/libdiscord/Discord;
 
     if-eqz v0, :cond_0
 
@@ -619,7 +586,7 @@
     return-void
 
     :cond_1
-    iget-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->Am:Lcom/hammerandchisel/libdiscord/Discord;
+    iget-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->Ao:Lcom/hammerandchisel/libdiscord/Discord;
 
     if-eqz p1, :cond_2
 
@@ -631,36 +598,56 @@
     return-void
 .end method
 
-.method public final eB()Lcom/hammerandchisel/libdiscord/Discord;
+.method public final eA()Lcom/hammerandchisel/libdiscord/Discord;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->Am:Lcom/hammerandchisel/libdiscord/Discord;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->Ao:Lcom/hammerandchisel/libdiscord/Discord;
 
     return-object v0
 .end method
 
-.method public final eC()Ljava/util/concurrent/ExecutorService;
+.method public final eB()Ljava/util/concurrent/ExecutorService;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->Ar:Ljava/util/concurrent/ExecutorService;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->Av:Ljava/util/concurrent/ExecutorService;
 
     return-object v0
 .end method
 
-.method public final bridge synthetic getConnections()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;->Ap:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->Au:Lcom/discord/rtcconnection/mediaengine/a/a;
 
-    check-cast v0, Ljava/util/List;
+    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;->Am:Lcom/hammerandchisel/libdiscord/Discord;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->Ao:Lcom/hammerandchisel/libdiscord/Discord;
 
     if-eqz v0, :cond_0
 
@@ -673,7 +660,7 @@
 .method public final setEchoCancellation(Z)V
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->Am:Lcom/hammerandchisel/libdiscord/Discord;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->Ao:Lcom/hammerandchisel/libdiscord/Discord;
 
     if-eqz v0, :cond_0
 
@@ -686,7 +673,7 @@
 .method public final setNoiseSuppression(Z)V
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->Am:Lcom/hammerandchisel/libdiscord/Discord;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->Ao:Lcom/hammerandchisel/libdiscord/Discord;
 
     if-eqz v0, :cond_0
 
@@ -699,7 +686,7 @@
 .method public final setOutputVolume(I)V
     .locals 2
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->Am:Lcom/hammerandchisel/libdiscord/Discord;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->Ao:Lcom/hammerandchisel/libdiscord/Discord;
 
     if-eqz v0, :cond_0
 
@@ -718,7 +705,7 @@
 .method public final v(I)V
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->Am:Lcom/hammerandchisel/libdiscord/Discord;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->Ao: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 ee7b5529b2..48320b7370 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;->zE:Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
+    sget-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;->zG: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;->zF:Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
+    sget-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;->zH: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;->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/rtcconnection/mediaengine/b.smali b/com.discord/smali/com/discord/rtcconnection/mediaengine/b.smali
index f0f138ac0f..b5e10f9158 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 Ag:Lcom/discord/rtcconnection/mediaengine/b;
+.field public static final Ai: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;->Ag:Lcom/discord/rtcconnection/mediaengine/b;
+    sput-object v0, Lcom/discord/rtcconnection/mediaengine/b;->Ai: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 fc37b41713..3d49d5844f 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/a$b.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/a$b.smali
@@ -23,19 +23,19 @@
 
 
 # static fields
-.field public static final AL:I
-
-.field public static final AM:I
-
-.field public static final AN:I
-
 .field public static final AO:I
 
 .field public static final AP:I
 
 .field public static final AQ:I
 
-.field private static final synthetic AR:[I
+.field public static final AR:I
+
+.field public static final AS:I
+
+.field public static final AT:I
+
+.field private static final synthetic AU:[I
 
 
 # direct methods
@@ -50,27 +50,27 @@
 
     const/4 v2, 0x1
 
-    sput v2, Lcom/discord/rtcconnection/socket/a$b;->AL:I
+    sput v2, Lcom/discord/rtcconnection/socket/a$b;->AO:I
 
     const/4 v2, 0x2
 
-    sput v2, Lcom/discord/rtcconnection/socket/a$b;->AM:I
+    sput v2, Lcom/discord/rtcconnection/socket/a$b;->AP:I
 
     const/4 v2, 0x3
 
-    sput v2, Lcom/discord/rtcconnection/socket/a$b;->AN:I
+    sput v2, Lcom/discord/rtcconnection/socket/a$b;->AQ:I
 
     const/4 v2, 0x4
 
-    sput v2, Lcom/discord/rtcconnection/socket/a$b;->AO:I
+    sput v2, Lcom/discord/rtcconnection/socket/a$b;->AR:I
 
     const/4 v2, 0x5
 
-    sput v2, Lcom/discord/rtcconnection/socket/a$b;->AP:I
+    sput v2, Lcom/discord/rtcconnection/socket/a$b;->AS:I
 
-    sput v0, Lcom/discord/rtcconnection/socket/a$b;->AQ:I
+    sput v0, Lcom/discord/rtcconnection/socket/a$b;->AT:I
 
-    sput-object v1, Lcom/discord/rtcconnection/socket/a$b;->AR:[I
+    sput-object v1, Lcom/discord/rtcconnection/socket/a$b;->AU:[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 ca41d888a9..2e6e668160 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 ey()V
+.method public abstract ex()V
 .end method
 
-.method public abstract ez()V
+.method public abstract ey()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 0cc81047e4..2b15cb156a 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 AS:Lcom/discord/rtcconnection/socket/a$d;
+.field public static final AV: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;->AS:Lcom/discord/rtcconnection/socket/a$d;
+    sput-object v0, Lcom/discord/rtcconnection/socket/a$d;->AV: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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 cb6db3b2cb..0d5fc2801d 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 AT:Lcom/discord/rtcconnection/socket/a$e;
+.field public static final AW: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;->AT:Lcom/discord/rtcconnection/socket/a$e;
+    sput-object v0, Lcom/discord/rtcconnection/socket/a$e;->AW: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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 bc895f1861..bfe54a33b3 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 AU:Lcom/discord/rtcconnection/socket/a$f;
+.field public static final AX: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;->AU:Lcom/discord/rtcconnection/socket/a$f;
+    sput-object v0, Lcom/discord/rtcconnection/socket/a$f;->AX: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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 3b55a5737c..2c40710be0 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;->eF()V
+    value = Lcom/discord/rtcconnection/socket/a;->eE()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -28,7 +28,7 @@
 
 
 # static fields
-.field public static final AV:Lcom/discord/rtcconnection/socket/a$g;
+.field public static final AY: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;->AV:Lcom/discord/rtcconnection/socket/a$g;
+    sput-object v0, Lcom/discord/rtcconnection/socket/a$g;->AY: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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 bcbf0ca62c..088df4bd51 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 ef393b5a11..7bb7f07d04 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;->eF()V
+    value = Lcom/discord/rtcconnection/socket/a;->eE()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 e0127e9b6b..851bf9a1c0 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;->eF()V
+    value = Lcom/discord/rtcconnection/socket/a;->eE()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -28,7 +28,7 @@
 
 
 # static fields
-.field public static final AW:Lcom/discord/rtcconnection/socket/a$i;
+.field public static final AZ: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;->AW:Lcom/discord/rtcconnection/socket/a$i;
+    sput-object v0, Lcom/discord/rtcconnection/socket/a$i;->AZ: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;->ey()V
+    invoke-interface {p1}, Lcom/discord/rtcconnection/socket/a$c;->ex()V
 
-    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 279e4ac85b..4c6eee8b74 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 106c594125..65ad9bb359 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;->eJ()Ljava/util/TimerTask;
+    value = Lcom/discord/rtcconnection/socket/a;->eI()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 ec581cac4b..05030c363f 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 226a36ed8f..578dfa2210 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 889e11b64a..13f8958c9d 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 f02f9b03ae..820e79ec78 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 AX:Lcom/discord/rtcconnection/socket/a$n;
+.field public static final Ba: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;->AX:Lcom/discord/rtcconnection/socket/a$n;
+    sput-object v0, Lcom/discord/rtcconnection/socket/a$n;->Ba: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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 c590a65a31..78acfb4903 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 8d066ce399..d1b0c4a289 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 2fe0d59e32..bbf9b45eca 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 33c818527c..65a64e449b 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 c0eefb2884..7f6077de46 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/a$s.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/a$s.smali
@@ -28,19 +28,15 @@
 
 
 # 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;Z)V
+.method constructor <init>(Lcom/discord/rtcconnection/socket/io/Payloads$Speaking;)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
@@ -75,11 +71,19 @@
 
     move-result v2
 
-    iget-boolean v3, p0, Lcom/discord/rtcconnection/socket/a$s;->$isSpeaking:Z
+    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
 
     invoke-interface {p1, v0, v1, v2, v3}, Lcom/discord/rtcconnection/socket/a$c;->onSpeaking(JIZ)V
 
-    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 fa5e957b76..ab2e8938cf 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 e76a884c2d..5a4fc2953c 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 2f48cf898c..720dddd993 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 AY:Lcom/discord/rtcconnection/socket/a$v$1;
+.field public static final Bb: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;->AY:Lcom/discord/rtcconnection/socket/a$v$1;
+    sput-object v0, Lcom/discord/rtcconnection/socket/a$v$1;->Bb: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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 c176e56b8a..a7ef101e04 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;->AY:Lcom/discord/rtcconnection/socket/a$v$1;
+    sget-object v1, Lcom/discord/rtcconnection/socket/a$v$1;->Bb: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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 c2add0413a..e3f7765bce 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 $message:Lcom/discord/rtcconnection/socket/io/Payloads$Incoming;
+.field final synthetic $text:Ljava/lang/String;
 
 .field final synthetic $webSocket:Lokhttp3/WebSocket;
 
@@ -35,14 +35,14 @@
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/rtcconnection/socket/a;Lokhttp3/WebSocket;Lcom/discord/rtcconnection/socket/io/Payloads$Incoming;)V
+.method constructor <init>(Lcom/discord/rtcconnection/socket/a;Lokhttp3/WebSocket;Ljava/lang/String;)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;->$message:Lcom/discord/rtcconnection/socket/io/Payloads$Incoming;
+    iput-object p3, p0, Lcom/discord/rtcconnection/socket/a$w;->$text:Ljava/lang/String;
 
     const/4 p1, 0x0
 
@@ -54,7 +54,7 @@
 
 # virtual methods
 .method public final synthetic invoke()Ljava/lang/Object;
-    .locals 7
+    .locals 8
 
     iget-object v0, p0, Lcom/discord/rtcconnection/socket/a$w;->$webSocket:Lokhttp3/WebSocket;
 
@@ -72,143 +72,151 @@
 
     if-nez v0, :cond_9
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/socket/a$w;->$message:Lcom/discord/rtcconnection/socket/io/Payloads$Incoming;
+    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
 
     invoke-virtual {v0}, Lcom/discord/rtcconnection/socket/io/Payloads$Incoming;->getOpcode()I
 
     move-result v0
 
-    const/4 v1, 0x2
+    invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
-    if-eq v0, v1, :cond_8
+    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
-    const/4 v1, 0x3
+    move-result-object v4
 
-    if-eq v0, v1, :cond_7
+    const/4 v5, 0x0
 
-    const/4 v1, 0x4
+    const/4 v6, 0x4
 
-    if-eq v0, v1, :cond_6
+    const/4 v7, 0x0
 
-    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
+    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
 
     goto/16 :goto_0
 
     :cond_0
-    iget-object v0, p0, Lcom/discord/rtcconnection/socket/a$w;->this$0:Lcom/discord/rtcconnection/socket/a;
+    iget-object v1, 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 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;
+    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;
+
+    move-result-object v0
+
     const-class v3, Lcom/discord/rtcconnection/socket/io/Payloads$SessionUpdate;
 
-    invoke-virtual {v1, v2, v3}, Lcom/google/gson/Gson;->a(Lcom/google/gson/JsonElement;Ljava/lang/Class;)Ljava/lang/Object;
+    invoke-virtual {v2, v0, v3}, Lcom/google/gson/Gson;->a(Lcom/google/gson/JsonElement;Ljava/lang/Class;)Ljava/lang/Object;
 
-    move-result-object v1
+    move-result-object v0
 
     const-string v2, "Gson.fromJson(message.da\u2026essionUpdate::class.java)"
 
-    invoke-static {v1, v2}, 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
 
-    check-cast v1, Lcom/discord/rtcconnection/socket/io/Payloads$SessionUpdate;
+    check-cast v0, Lcom/discord/rtcconnection/socket/io/Payloads$SessionUpdate;
 
-    invoke-static {v0, v1}, Lcom/discord/rtcconnection/socket/a;->a(Lcom/discord/rtcconnection/socket/a;Lcom/discord/rtcconnection/socket/io/Payloads$SessionUpdate;)V
+    invoke-static {v1, v0}, 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 v0, p0, Lcom/discord/rtcconnection/socket/a$w;->this$0:Lcom/discord/rtcconnection/socket/a;
+    iget-object v1, 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 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;
+    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;
+
+    move-result-object v0
+
     const-class v3, Lcom/discord/rtcconnection/socket/io/Payloads$Video;
 
-    invoke-virtual {v1, v2, v3}, Lcom/google/gson/Gson;->a(Lcom/google/gson/JsonElement;Ljava/lang/Class;)Ljava/lang/Object;
+    invoke-virtual {v2, v0, v3}, Lcom/google/gson/Gson;->a(Lcom/google/gson/JsonElement;Ljava/lang/Class;)Ljava/lang/Object;
 
-    move-result-object v1
+    move-result-object v0
 
     const-string v2, "Gson.fromJson(message.da\u2026yloads.Video::class.java)"
 
-    invoke-static {v1, v2}, 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
 
-    check-cast v1, Lcom/discord/rtcconnection/socket/io/Payloads$Video;
+    check-cast v0, Lcom/discord/rtcconnection/socket/io/Payloads$Video;
 
-    invoke-static {v0, v1}, Lcom/discord/rtcconnection/socket/a;->a(Lcom/discord/rtcconnection/socket/a;Lcom/discord/rtcconnection/socket/io/Payloads$Video;)V
+    invoke-static {v1, v0}, Lcom/discord/rtcconnection/socket/a;->a(Lcom/discord/rtcconnection/socket/a;Lcom/discord/rtcconnection/socket/io/Payloads$Video;)V
 
     goto/16 :goto_0
 
@@ -220,138 +228,114 @@
     goto/16 :goto_0
 
     :cond_3
-    iget-object v0, p0, Lcom/discord/rtcconnection/socket/a$w;->this$0:Lcom/discord/rtcconnection/socket/a;
+    iget-object v1, 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 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;
+    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;
+
+    move-result-object v0
+
     const-class v3, Lcom/discord/rtcconnection/socket/io/Payloads$Hello;
 
-    invoke-virtual {v1, v2, v3}, Lcom/google/gson/Gson;->a(Lcom/google/gson/JsonElement;Ljava/lang/Class;)Ljava/lang/Object;
+    invoke-virtual {v2, v0, v3}, Lcom/google/gson/Gson;->a(Lcom/google/gson/JsonElement;Ljava/lang/Class;)Ljava/lang/Object;
 
-    move-result-object v1
+    move-result-object v0
 
     const-string v2, "Gson.fromJson(message.da\u2026yloads.Hello::class.java)"
 
-    invoke-static {v1, v2}, 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
 
-    check-cast v1, Lcom/discord/rtcconnection/socket/io/Payloads$Hello;
+    check-cast v0, Lcom/discord/rtcconnection/socket/io/Payloads$Hello;
 
-    invoke-static {v0, v1}, Lcom/discord/rtcconnection/socket/a;->a(Lcom/discord/rtcconnection/socket/a;Lcom/discord/rtcconnection/socket/io/Payloads$Hello;)V
+    invoke-static {v1, v0}, 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 v0, p0, Lcom/discord/rtcconnection/socket/a$w;->this$0:Lcom/discord/rtcconnection/socket/a;
+    iget-object v1, 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 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;
+    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;
+
+    move-result-object v0
+
     sget-object v3, Ljava/lang/Long;->TYPE:Ljava/lang/Class;
 
-    invoke-virtual {v1, v2, v3}, Lcom/google/gson/Gson;->a(Lcom/google/gson/JsonElement;Ljava/lang/Class;)Ljava/lang/Object;
+    invoke-virtual {v2, v0, v3}, Lcom/google/gson/Gson;->a(Lcom/google/gson/JsonElement;Ljava/lang/Class;)Ljava/lang/Object;
 
-    move-result-object v1
+    move-result-object v0
 
     const-string v2, "Gson.fromJson(message.data, Long::class.java)"
 
-    invoke-static {v1, v2}, 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
 
-    check-cast v1, Ljava/lang/Number;
+    check-cast v0, Ljava/lang/Number;
 
-    invoke-virtual {v1}, Ljava/lang/Number;->longValue()J
+    invoke-virtual {v0}, Ljava/lang/Number;->longValue()J
 
-    move-result-wide v1
+    move-result-wide v2
 
-    invoke-static {v0, v1, v2}, Lcom/discord/rtcconnection/socket/a;->a(Lcom/discord/rtcconnection/socket/a;J)V
+    invoke-static {v1, v2, v3}, Lcom/discord/rtcconnection/socket/a;->a(Lcom/discord/rtcconnection/socket/a;J)V
 
     goto :goto_0
 
     :cond_5
-    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;->$message:Lcom/discord/rtcconnection/socket/io/Payloads$Incoming;
-
-    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
-
-    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 {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;
+
+    move-result-object v0
+
+    const-class v3, Lcom/discord/rtcconnection/socket/io/Payloads$Speaking;
+
+    invoke-virtual {v2, v0, v3}, 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 {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 v0, p0, Lcom/discord/rtcconnection/socket/a$w;->this$0:Lcom/discord/rtcconnection/socket/a;
+    iget-object v1, 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 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;
+    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;
+
+    move-result-object v0
+
     const-class v3, Lcom/discord/rtcconnection/socket/io/Payloads$Description;
 
-    invoke-virtual {v1, v2, v3}, Lcom/google/gson/Gson;->a(Lcom/google/gson/JsonElement;Ljava/lang/Class;)Ljava/lang/Object;
+    invoke-virtual {v2, v0, v3}, Lcom/google/gson/Gson;->a(Lcom/google/gson/JsonElement;Ljava/lang/Class;)Ljava/lang/Object;
 
-    move-result-object v1
+    move-result-object v0
 
     const-string v2, "Gson.fromJson(message.da\u2026.Description::class.java)"
 
-    invoke-static {v1, v2}, 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
 
-    check-cast v1, Lcom/discord/rtcconnection/socket/io/Payloads$Description;
+    check-cast v0, Lcom/discord/rtcconnection/socket/io/Payloads$Description;
 
-    invoke-static {v0, v1}, Lcom/discord/rtcconnection/socket/a;->a(Lcom/discord/rtcconnection/socket/a;Lcom/discord/rtcconnection/socket/io/Payloads$Description;)V
+    invoke-static {v1, v0}, Lcom/discord/rtcconnection/socket/a;->a(Lcom/discord/rtcconnection/socket/a;Lcom/discord/rtcconnection/socket/io/Payloads$Description;)V
 
     goto :goto_0
 
@@ -363,35 +347,33 @@
     goto :goto_0
 
     :cond_8
-    iget-object v0, p0, Lcom/discord/rtcconnection/socket/a$w;->this$0:Lcom/discord/rtcconnection/socket/a;
+    iget-object v1, 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 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;
+    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;
+
+    move-result-object v0
+
     const-class v3, Lcom/discord/rtcconnection/socket/io/Payloads$Ready;
 
-    invoke-virtual {v1, v2, v3}, Lcom/google/gson/Gson;->a(Lcom/google/gson/JsonElement;Ljava/lang/Class;)Ljava/lang/Object;
+    invoke-virtual {v2, v0, v3}, Lcom/google/gson/Gson;->a(Lcom/google/gson/JsonElement;Ljava/lang/Class;)Ljava/lang/Object;
 
-    move-result-object v1
+    move-result-object v0
 
     const-string v2, "Gson.fromJson(message.da\u2026yloads.Ready::class.java)"
 
-    invoke-static {v1, v2}, 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
 
-    check-cast v1, Lcom/discord/rtcconnection/socket/io/Payloads$Ready;
+    check-cast v0, Lcom/discord/rtcconnection/socket/io/Payloads$Ready;
 
-    invoke-static {v0, v1}, Lcom/discord/rtcconnection/socket/a;->a(Lcom/discord/rtcconnection/socket/a;Lcom/discord/rtcconnection/socket/io/Payloads$Ready;)V
+    invoke-static {v1, v0}, 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 cc13f88b00..4ade6ee957 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 AZ:Lcom/discord/rtcconnection/socket/a$x$1;
+.field public static final Bc: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;->AZ:Lcom/discord/rtcconnection/socket/a$x$1;
+    sput-object v0, Lcom/discord/rtcconnection/socket/a$x$1;->Bc: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;->ez()V
+    invoke-interface {p1}, Lcom/discord/rtcconnection/socket/a$c;->ey()V
 
-    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 c43d880b47..f889135c09 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 b305cb20a0..9a8e78d3ea 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;->AM:I
+    sget v1, Lcom/discord/rtcconnection/socket/a$b;->AP: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;->AZ:Lcom/discord/rtcconnection/socket/a$x$1;
+    sget-object v1, Lcom/discord/rtcconnection/socket/a$x$1;->Bc: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;->AQ:I
+    sget v1, Lcom/discord/rtcconnection/socket/a$b;->AT: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;->AP:I
+    sget v1, Lcom/discord/rtcconnection/socket/a$b;->AS: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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 c2e09a5749..d0e97ab3ba 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 Ba:Lcom/discord/rtcconnection/socket/a$y;
+.field public static final Bd: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;->Ba:Lcom/discord/rtcconnection/socket/a$y;
+    sput-object v0, Lcom/discord/rtcconnection/socket/a$y;->Bd: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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 b29bcf6e01..446d9e2a57 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 Bb:Lcom/discord/rtcconnection/socket/a$z;
+.field public static final Be: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;->Bb:Lcom/discord/rtcconnection/socket/a$z;
+    sput-object v0, Lcom/discord/rtcconnection/socket/a$z;->Be: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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 8063807c4b..8b6da738f0 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 AK:Lcom/discord/rtcconnection/socket/a$a;
+.field public static final AN:Lcom/discord/rtcconnection/socket/a$a;
 
-.field private static ze:I
+.field private static zf:I
 
 
 # instance fields
-.field private AA:Z
+.field private final AB:Lcom/google/gson/Gson;
 
-.field public AB:I
+.field private AC:Lokhttp3/WebSocket;
 
-.field private AC:Ljava/lang/Long;
+.field private AD:Z
 
-.field private AD:Ljava/lang/Long;
-
-.field private AF:Ljava/util/TimerTask;
+.field public AF:I
 
 .field private AG:Ljava/lang/Long;
 
-.field private AH:Ljava/util/TimerTask;
+.field private AH:Ljava/lang/Long;
 
-.field public AJ:Z
+.field private AJ:Ljava/util/TimerTask;
 
-.field private final Ar:Ljava/util/concurrent/ExecutorService;
+.field private AK:Ljava/lang/Long;
 
-.field private final Ay:Lcom/google/gson/Gson;
+.field private AL:Ljava/util/TimerTask;
 
-.field private Az:Lokhttp3/WebSocket;
+.field public AM:Z
+
+.field private final Av:Ljava/util/concurrent/ExecutorService;
 
 .field private final backoff:Lcom/discord/utilities/networking/Backoff;
 
@@ -70,7 +70,7 @@
 
 .field public final token:Ljava/lang/String;
 
-.field public final yQ:Ljava/lang/String;
+.field public final yS: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;->AK:Lcom/discord/rtcconnection/socket/a$a;
+    sput-object v0, Lcom/discord/rtcconnection/socket/a;->AN:Lcom/discord/rtcconnection/socket/a$a;
 
     return-void
 .end method
@@ -117,7 +117,7 @@
 
     iput-object p4, p0, Lcom/discord/rtcconnection/socket/a;->logger:Lcom/discord/utilities/logging/Logger;
 
-    iput-object p5, p0, Lcom/discord/rtcconnection/socket/a;->Ar:Ljava/util/concurrent/ExecutorService;
+    iput-object p5, p0, Lcom/discord/rtcconnection/socket/a;->Av:Ljava/util/concurrent/ExecutorService;
 
     new-instance p1, Ljava/lang/StringBuilder;
 
@@ -135,11 +135,11 @@
 
     invoke-virtual {p1, p2}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
-    sget p2, Lcom/discord/rtcconnection/socket/a;->ze:I
+    sget p2, Lcom/discord/rtcconnection/socket/a;->zf:I
 
     add-int/lit8 p2, p2, 0x1
 
-    sput p2, Lcom/discord/rtcconnection/socket/a;->ze:I
+    sput p2, Lcom/discord/rtcconnection/socket/a;->zf: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;->yQ:Ljava/lang/String;
+    iput-object p1, p0, Lcom/discord/rtcconnection/socket/a;->yS: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;->Az()Lcom/google/gson/Gson;
+    invoke-virtual {p1}, Lcom/google/gson/f;->Ax()Lcom/google/gson/Gson;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/rtcconnection/socket/a;->Ay:Lcom/google/gson/Gson;
+    iput-object p1, p0, Lcom/discord/rtcconnection/socket/a;->AB: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;->AL:I
+    sget p1, Lcom/discord/rtcconnection/socket/a$b;->AO:I
 
-    iput p1, p0, Lcom/discord/rtcconnection/socket/a;->AB:I
+    iput p1, p0, Lcom/discord/rtcconnection/socket/a;->AF:I
 
-    invoke-direct {p0}, Lcom/discord/rtcconnection/socket/a;->eJ()Ljava/util/TimerTask;
+    invoke-direct {p0}, Lcom/discord/rtcconnection/socket/a;->eI()Ljava/util/TimerTask;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/rtcconnection/socket/a;->AF:Ljava/util/TimerTask;
+    iput-object p1, p0, Lcom/discord/rtcconnection/socket/a;->AJ:Ljava/util/TimerTask;
 
     new-instance p1, Ljava/util/ArrayList;
 
@@ -231,7 +231,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/socket/a;->Ar:Ljava/util/concurrent/ExecutorService;
+    iget-object v0, p0, Lcom/discord/rtcconnection/socket/a;->Av:Ljava/util/concurrent/ExecutorService;
 
     if-eqz p1, :cond_0
 
@@ -264,7 +264,7 @@
 .method public static final synthetic a(Lcom/discord/rtcconnection/socket/a;I)V
     .locals 0
 
-    iput p1, p0, Lcom/discord/rtcconnection/socket/a;->AB:I
+    iput p1, p0, Lcom/discord/rtcconnection/socket/a;->AF: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;->AJ:Z
+    iget-boolean v0, p0, Lcom/discord/rtcconnection/socket/a;->AM: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;->yQ:Ljava/lang/String;
+    iget-object v2, p0, Lcom/discord/rtcconnection/socket/a;->yS: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;->yQ:Ljava/lang/String;
+    iget-object v3, p0, Lcom/discord/rtcconnection/socket/a;->yS: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;->AG:Ljava/lang/Long;
+    iput-object v0, p0, Lcom/discord/rtcconnection/socket/a;->AK:Ljava/lang/Long;
 
     const/4 v0, 0x1
 
@@ -361,7 +361,7 @@
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lcom/discord/rtcconnection/socket/a;->AA:Z
+    iput-boolean p1, p0, Lcom/discord/rtcconnection/socket/a;->AD: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;->AJ:Z
+    iget-boolean v0, p0, Lcom/discord/rtcconnection/socket/a;->AM: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;->yQ:Ljava/lang/String;
+    iget-object v2, p0, Lcom/discord/rtcconnection/socket/a;->yS:Ljava/lang/String;
 
     const/4 v4, 0x0
 
@@ -390,7 +390,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/discord/rtcconnection/socket/a;->AH:Ljava/util/TimerTask;
+    iget-object v0, p0, Lcom/discord/rtcconnection/socket/a;->AL: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;->yQ:Ljava/lang/String;
+    iget-object v2, p0, Lcom/discord/rtcconnection/socket/a;->yS: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/high16 v2, 0x3ff0000000000000L    # 1.0
+    const-wide v2, 0x3fb999999999999aL    # 0.1
 
     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;->AD:Ljava/lang/Long;
+    iput-object p1, p0, Lcom/discord/rtcconnection/socket/a;->AH:Ljava/lang/Long;
 
-    iget-object p1, p0, Lcom/discord/rtcconnection/socket/a;->AF:Ljava/util/TimerTask;
+    iget-object p1, p0, Lcom/discord/rtcconnection/socket/a;->AJ: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;->eH()V
+    invoke-direct {p0}, Lcom/discord/rtcconnection/socket/a;->eG()V
 
     return-void
 .end method
@@ -463,7 +463,7 @@
 
     move-result-wide v0
 
-    iget-object v2, p0, Lcom/discord/rtcconnection/socket/a;->AC:Ljava/lang/Long;
+    iget-object v2, p0, Lcom/discord/rtcconnection/socket/a;->AG: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;->yQ:Ljava/lang/String;
+    iget-object v3, p0, Lcom/discord/rtcconnection/socket/a;->yS:Ljava/lang/String;
 
     new-instance v4, Ljava/lang/StringBuilder;
 
@@ -533,53 +533,29 @@
 .end method
 
 .method public static final synthetic a(Lcom/discord/rtcconnection/socket/a;Lcom/discord/rtcconnection/socket/io/Payloads$Speaking;)V
-    .locals 2
+    .locals 1
 
     invoke-virtual {p1}, Lcom/discord/rtcconnection/socket/io/Payloads$Speaking;->getUserId()Ljava/lang/Long;
 
     move-result-object v0
 
-    if-eqz v0, :cond_2
+    if-eqz v0, :cond_0
 
-    invoke-virtual {p1}, Lcom/discord/rtcconnection/socket/io/Payloads$Speaking;->getSpeaking()Ljava/lang/Integer;
+    invoke-virtual {p1}, Lcom/discord/rtcconnection/socket/io/Payloads$Speaking;->getSpeaking()Ljava/lang/Boolean;
 
     move-result-object v0
 
-    if-eqz v0, :cond_2
+    if-eqz v0, :cond_0
 
-    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, v1}, Lcom/discord/rtcconnection/socket/a$s;-><init>(Lcom/discord/rtcconnection/socket/io/Payloads$Speaking;Z)V
+    invoke-direct {v0, p1}, Lcom/discord/rtcconnection/socket/a$s;-><init>(Lcom/discord/rtcconnection/socket/io/Payloads$Speaking;)V
 
     check-cast v0, Lkotlin/jvm/functions/Function1;
 
     invoke-direct {p0, v0}, Lcom/discord/rtcconnection/socket/a;->c(Lkotlin/jvm/functions/Function1;)V
 
-    :cond_2
+    :cond_0
     return-void
 .end method
 
@@ -607,9 +583,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;->AL:I
+    sget v0, Lcom/discord/rtcconnection/socket/a$b;->AO:I
 
-    iput v0, p0, Lcom/discord/rtcconnection/socket/a;->AB:I
+    iput v0, p0, Lcom/discord/rtcconnection/socket/a;->AF:I
 
     const/4 v0, 0x1
 
@@ -682,7 +658,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;->yQ:Ljava/lang/String;
+    iget-object v3, p0, Lcom/discord/rtcconnection/socket/a;->yS:Ljava/lang/String;
 
     const/4 v5, 0x0
 
@@ -749,7 +725,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;->yQ:Ljava/lang/String;
+    iget-object v3, p0, Lcom/discord/rtcconnection/socket/a;->yS:Ljava/lang/String;
 
     new-instance p0, Ljava/lang/StringBuilder;
 
@@ -825,13 +801,13 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/socket/a;->Az:Lokhttp3/WebSocket;
+    iget-object v0, p0, Lcom/discord/rtcconnection/socket/a;->AC: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;->yQ:Ljava/lang/String;
+    iget-object v2, p0, Lcom/discord/rtcconnection/socket/a;->yS:Ljava/lang/String;
 
     invoke-static {p1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
@@ -874,7 +850,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;->Az:Lokhttp3/WebSocket;
+    iget-object p0, p0, Lcom/discord/rtcconnection/socket/a;->AC:Lokhttp3/WebSocket;
 
     return-object p0
 .end method
@@ -884,13 +860,13 @@
 
     move-object v0, p0
 
-    iget-boolean v1, v0, Lcom/discord/rtcconnection/socket/a;->AJ:Z
+    iget-boolean v1, v0, Lcom/discord/rtcconnection/socket/a;->AM: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;->yQ:Ljava/lang/String;
+    iget-object v3, v0, Lcom/discord/rtcconnection/socket/a;->yS:Ljava/lang/String;
 
     const/4 v5, 0x0
 
@@ -907,7 +883,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;->yQ:Ljava/lang/String;
+    iget-object v9, v0, Lcom/discord/rtcconnection/socket/a;->yS:Ljava/lang/String;
 
     new-instance v1, Ljava/lang/StringBuilder;
 
@@ -947,17 +923,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;->Ba:Lcom/discord/rtcconnection/socket/a$y;
+    sget-object v1, Lcom/discord/rtcconnection/socket/a$y;->Bd: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;->AQ:I
+    sget v1, Lcom/discord/rtcconnection/socket/a$b;->AT:I
 
-    iput v1, v0, Lcom/discord/rtcconnection/socket/a;->AB:I
+    iput v1, v0, Lcom/discord/rtcconnection/socket/a;->AF:I
 
-    invoke-direct {p0}, Lcom/discord/rtcconnection/socket/a;->eF()V
+    invoke-direct {p0}, Lcom/discord/rtcconnection/socket/a;->eE()V
 
     return-void
 .end method
@@ -965,7 +941,7 @@
 .method public static final synthetic c(Lcom/discord/rtcconnection/socket/a;)I
     .locals 0
 
-    iget p0, p0, Lcom/discord/rtcconnection/socket/a;->AB:I
+    iget p0, p0, Lcom/discord/rtcconnection/socket/a;->AF:I
 
     return p0
 .end method
@@ -1023,13 +999,13 @@
 
     move-object/from16 v3, p3
 
-    iget-boolean v4, v0, Lcom/discord/rtcconnection/socket/a;->AJ:Z
+    iget-boolean v4, v0, Lcom/discord/rtcconnection/socket/a;->AM: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;->yQ:Ljava/lang/String;
+    iget-object v6, v0, Lcom/discord/rtcconnection/socket/a;->yS:Ljava/lang/String;
 
     const/4 v8, 0x0
 
@@ -1046,7 +1022,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;->yQ:Ljava/lang/String;
+    iget-object v12, v0, Lcom/discord/rtcconnection/socket/a;->yS:Ljava/lang/String;
 
     new-instance v4, Ljava/lang/StringBuilder;
 
@@ -1086,7 +1062,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;->eG()V
+    invoke-direct/range {p0 .. p0}, Lcom/discord/rtcconnection/socket/a;->eF()V
 
     new-instance v4, Lcom/discord/rtcconnection/socket/a$k;
 
@@ -1100,7 +1076,7 @@
 .end method
 
 .method public static final synthetic d(Lcom/discord/rtcconnection/socket/a;)V
-    .locals 12
+    .locals 10
 
     iget-object v0, p0, Lcom/discord/rtcconnection/socket/a;->sessionId:Ljava/lang/String;
 
@@ -1108,89 +1084,74 @@
 
     iget-object v2, p0, Lcom/discord/rtcconnection/socket/a;->token:Ljava/lang/String;
 
-    iget-object v3, p0, Lcom/discord/rtcconnection/socket/a;->AG:Ljava/lang/Long;
+    iget-object v3, p0, Lcom/discord/rtcconnection/socket/a;->AK:Ljava/lang/Long;
 
-    const/4 v4, 0x0
+    if-eqz v0, :cond_1
 
-    if-eqz v3, :cond_1
+    if-eqz v1, :cond_1
+
+    iget-boolean v4, p0, Lcom/discord/rtcconnection/socket/a;->AD:Z
+
+    if-eqz v4, :cond_1
+
+    if-eqz v3, :cond_0
 
     invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
 
-    move-result-wide v5
+    move-result-wide v4
 
     invoke-virtual {v3}, Ljava/lang/Long;->longValue()J
 
-    move-result-wide v7
+    move-result-wide v6
 
-    sub-long/2addr v5, v7
+    sub-long/2addr v4, v6
 
-    const-wide/32 v7, 0xea60
+    const-wide/32 v6, 0xea60
 
-    cmp-long v3, v5, v7
+    cmp-long v3, v4, v6
 
-    if-gtz v3, :cond_0
-
-    goto :goto_0
+    if-gtz v3, :cond_1
 
     :cond_0
-    const/4 v3, 0x0
+    iget-object v4, p0, Lcom/discord/rtcconnection/socket/a;->logger:Lcom/discord/utilities/logging/Logger;
 
-    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;
+    iget-object v5, p0, Lcom/discord/rtcconnection/socket/a;->yS:Ljava/lang/String;
 
     new-instance v3, Ljava/lang/StringBuilder;
 
-    const-string v4, "[RESUME] resuming session. serverId="
+    const-string v6, "[RESUME] resuming session. serverId="
 
-    invoke-direct {v3, v4}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+    invoke-direct {v3, v6}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
     invoke-virtual {v3, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    const-string v4, " sessionId="
+    const-string v6, " sessionId="
 
-    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-virtual {v3, v6}, 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 v8
+    move-result-object v6
+
+    const/4 v7, 0x0
+
+    const/4 v8, 0x4
 
     const/4 v9, 0x0
 
-    const/4 v10, 0x4
+    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 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;
+    sget-object v3, Lcom/discord/rtcconnection/socket/a$z;->Be: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;->AO:I
+    sget v3, Lcom/discord/rtcconnection/socket/a$b;->AR:I
 
-    iput v3, p0, Lcom/discord/rtcconnection/socket/a;->AB:I
+    iput v3, p0, Lcom/discord/rtcconnection/socket/a;->AF:I
 
     const/4 v3, 0x7
 
@@ -1202,26 +1163,8 @@
 
     return-void
 
-    :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
+    :cond_1
+    const/4 v0, 0x0
 
     const/16 v1, 0x12c1
 
@@ -1229,7 +1172,9 @@
 
     move-result-object v1
 
-    invoke-direct {p0, v4, v1, v0}, Lcom/discord/rtcconnection/socket/a;->c(ZLjava/lang/Integer;Ljava/lang/String;)V
+    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
 
     return-void
 .end method
@@ -1237,21 +1182,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;->AC:Ljava/lang/Long;
+    iget-object p0, p0, Lcom/discord/rtcconnection/socket/a;->AG:Ljava/lang/Long;
 
     return-object p0
 .end method
 
-.method private final eF()V
+.method private final eE()V
     .locals 13
 
-    iget-boolean v0, p0, Lcom/discord/rtcconnection/socket/a;->AJ:Z
+    iget-boolean v0, p0, Lcom/discord/rtcconnection/socket/a;->AM: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;->yQ:Ljava/lang/String;
+    iget-object v2, p0, Lcom/discord/rtcconnection/socket/a;->yS:Ljava/lang/String;
 
     const/4 v4, 0x0
 
@@ -1268,7 +1213,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;->yQ:Ljava/lang/String;
+    iget-object v8, p0, Lcom/discord/rtcconnection/socket/a;->yS:Ljava/lang/String;
 
     new-instance v0, Ljava/lang/StringBuilder;
 
@@ -1292,13 +1237,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;->Az:Lokhttp3/WebSocket;
+    iget-object v0, p0, Lcom/discord/rtcconnection/socket/a;->AC: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;->yQ:Ljava/lang/String;
+    iget-object v2, p0, Lcom/discord/rtcconnection/socket/a;->yS:Ljava/lang/String;
 
     const/4 v4, 0x0
 
@@ -1312,7 +1257,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;->AV:Lcom/discord/rtcconnection/socket/a$g;
+    sget-object v0, Lcom/discord/rtcconnection/socket/a$g;->AY:Lcom/discord/rtcconnection/socket/a$g;
 
     check-cast v0, Lkotlin/jvm/functions/Function1;
 
@@ -1329,9 +1274,9 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/rtcconnection/socket/a;->AC:Ljava/lang/Long;
+    iput-object v0, p0, Lcom/discord/rtcconnection/socket/a;->AG:Ljava/lang/Long;
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/socket/a;->AH:Ljava/util/TimerTask;
+    iget-object v0, p0, Lcom/discord/rtcconnection/socket/a;->AL:Ljava/util/TimerTask;
 
     if-eqz v0, :cond_2
 
@@ -1344,11 +1289,11 @@
 
     check-cast v0, Ljava/util/TimerTask;
 
-    iput-object v0, p0, Lcom/discord/rtcconnection/socket/a;->AH:Ljava/util/TimerTask;
+    iput-object v0, p0, Lcom/discord/rtcconnection/socket/a;->AL: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;->AH:Ljava/util/TimerTask;
+    iget-object v1, p0, Lcom/discord/rtcconnection/socket/a;->AL:Ljava/util/TimerTask;
 
     const-wide/16 v2, 0x4e20
 
@@ -1381,7 +1326,7 @@
 
     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    const-string v2, "?v=4"
+    const-string v2, "?v=3"
 
     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -1391,7 +1336,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;->yQ:Ljava/lang/String;
+    iget-object v3, p0, Lcom/discord/rtcconnection/socket/a;->yS:Ljava/lang/String;
 
     invoke-static {v1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
@@ -1411,7 +1356,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;->FD()Lokhttp3/t;
+    invoke-virtual {v0}, Lokhttp3/t$a;->FB()Lokhttp3/t;
 
     move-result-object v0
 
@@ -1423,7 +1368,7 @@
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lokhttp3/w$a;->FN()Lokhttp3/w;
+    invoke-virtual {v1}, Lokhttp3/w$a;->FL()Lokhttp3/w;
 
     move-result-object v1
 
@@ -1435,9 +1380,9 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/rtcconnection/socket/a;->Az:Lokhttp3/WebSocket;
+    iput-object v0, p0, Lcom/discord/rtcconnection/socket/a;->AC:Lokhttp3/WebSocket;
 
-    sget-object v0, Lcom/discord/rtcconnection/socket/a$i;->AW:Lcom/discord/rtcconnection/socket/a$i;
+    sget-object v0, Lcom/discord/rtcconnection/socket/a$i;->AZ:Lcom/discord/rtcconnection/socket/a$i;
 
     check-cast v0, Lkotlin/jvm/functions/Function1;
 
@@ -1446,7 +1391,7 @@
     return-void
 .end method
 
-.method private final eG()V
+.method private final eF()V
     .locals 1
 
     const/4 v0, 0x0
@@ -1457,25 +1402,25 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/discord/rtcconnection/socket/a;->AA:Z
+    iput-boolean v0, p0, Lcom/discord/rtcconnection/socket/a;->AD:Z
 
-    sget v0, Lcom/discord/rtcconnection/socket/a$b;->AL:I
+    sget v0, Lcom/discord/rtcconnection/socket/a$b;->AO:I
 
-    iput v0, p0, Lcom/discord/rtcconnection/socket/a;->AB:I
+    iput v0, p0, Lcom/discord/rtcconnection/socket/a;->AF:I
 
     return-void
 .end method
 
-.method private final eH()V
-    .locals 10
+.method private final eG()V
+    .locals 9
 
-    iget-boolean v0, p0, Lcom/discord/rtcconnection/socket/a;->AJ:Z
+    iget-boolean v0, p0, Lcom/discord/rtcconnection/socket/a;->AM: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;->yQ:Ljava/lang/String;
+    iget-object v2, p0, Lcom/discord/rtcconnection/socket/a;->yS:Ljava/lang/String;
 
     const/4 v4, 0x0
 
@@ -1490,92 +1435,39 @@
     return-void
 
     :cond_0
-    iget-boolean v0, p0, Lcom/discord/rtcconnection/socket/a;->heartbeatAck:Z
+    iget-boolean v1, p0, Lcom/discord/rtcconnection/socket/a;->heartbeatAck:Z
 
-    const/4 v1, 0x0
+    const/4 v2, 0x0
 
-    if-eqz v0, :cond_2
+    if-eqz v1, :cond_1
 
-    iget-object v2, p0, Lcom/discord/rtcconnection/socket/a;->logger:Lcom/discord/utilities/logging/Logger;
+    iput-boolean v2, p0, Lcom/discord/rtcconnection/socket/a;->heartbeatAck:Z
 
-    iget-object v3, p0, Lcom/discord/rtcconnection/socket/a;->yQ:Ljava/lang/String;
+    invoke-direct {p0}, Lcom/discord/rtcconnection/socket/a;->eH()V
 
-    const/4 v5, 0x0
-
-    const/4 v6, 0x4
-
-    const/4 v7, 0x0
-
-    const-string v4, "had heartbeatAck, sending heartbeat"
-
-    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
-
-    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
+    goto :goto_0
 
     :cond_1
-    return-void
+    if-eqz v0, :cond_2
+
+    iget-object v3, p0, Lcom/discord/rtcconnection/socket/a;->logger:Lcom/discord/utilities/logging/Logger;
+
+    iget-object v4, p0, Lcom/discord/rtcconnection/socket/a;->yS:Ljava/lang/String;
+
+    const/4 v6, 0x0
+
+    const/4 v7, 0x4
+
+    const/4 v8, 0x0
+
+    const-string v5, "handleHeartbeatTimeout called on canceled instance of RtcControlSocket"
+
+    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
+
+    goto :goto_0
 
     :cond_2
-    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;
+    sget-object v0, Lcom/discord/rtcconnection/socket/a$n;->Ba:Lcom/discord/rtcconnection/socket/a$n;
 
     check-cast v0, Lkotlin/jvm/functions/Function1;
 
@@ -1583,35 +1475,35 @@
 
     iget-object v0, p0, Lcom/discord/rtcconnection/socket/a;->backoff:Lcom/discord/utilities/networking/Backoff;
 
-    new-instance v2, Lcom/discord/rtcconnection/socket/a$o;
+    new-instance v1, Lcom/discord/rtcconnection/socket/a$o;
 
-    invoke-direct {v2, p0}, Lcom/discord/rtcconnection/socket/a$o;-><init>(Lcom/discord/rtcconnection/socket/a;)V
+    invoke-direct {v1, p0}, Lcom/discord/rtcconnection/socket/a$o;-><init>(Lcom/discord/rtcconnection/socket/a;)V
 
-    check-cast v2, Lkotlin/jvm/functions/Function0;
+    check-cast v1, Lkotlin/jvm/functions/Function0;
 
-    invoke-virtual {v0, v2}, Lcom/discord/utilities/networking/Backoff;->fail(Lkotlin/jvm/functions/Function0;)J
+    invoke-virtual {v0, v1}, Lcom/discord/utilities/networking/Backoff;->fail(Lkotlin/jvm/functions/Function0;)J
 
-    move-result-wide v2
+    move-result-wide v0
 
-    const/4 v0, 0x1
+    const/4 v3, 0x1
 
-    new-array v4, v0, [Ljava/lang/Object;
+    new-array v4, v3, [Ljava/lang/Object;
 
-    long-to-double v2, v2
+    long-to-double v0, v0
 
     const-wide v5, 0x408f400000000000L    # 1000.0
 
-    invoke-static {v2, v3}, Ljava/lang/Double;->isNaN(D)Z
+    invoke-static {v0, v1}, Ljava/lang/Double;->isNaN(D)Z
 
-    div-double/2addr v2, v5
+    div-double/2addr v0, v5
 
-    invoke-static {v2, v3}, Ljava/lang/Double;->valueOf(D)Ljava/lang/Double;
+    invoke-static {v0, v1}, Ljava/lang/Double;->valueOf(D)Ljava/lang/Double;
 
-    move-result-object v2
+    move-result-object v0
 
-    aput-object v2, v4, v1
+    aput-object v0, v4, v2
 
-    invoke-static {v4, v0}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
+    invoke-static {v4, v3}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
 
     move-result-object v0
 
@@ -1627,7 +1519,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;->yQ:Ljava/lang/String;
+    iget-object v3, p0, Lcom/discord/rtcconnection/socket/a;->yS:Ljava/lang/String;
 
     new-instance v1, Ljava/lang/StringBuilder;
 
@@ -1653,10 +1545,34 @@
 
     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;->AH: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;->eI()Ljava/util/TimerTask;
+
+    move-result-object v2
+
+    iput-object v2, p0, Lcom/discord/rtcconnection/socket/a;->AJ: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;->AJ: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 eI()V
+.method private final eH()V
     .locals 2
 
     invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
@@ -1674,7 +1590,7 @@
     return-void
 .end method
 
-.method private final eJ()Ljava/util/TimerTask;
+.method private final eI()Ljava/util/TimerTask;
     .locals 1
 
     new-instance v0, Lcom/discord/rtcconnection/socket/a$j;
@@ -1697,7 +1613,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;->yQ:Ljava/lang/String;
+    iget-object p0, p0, Lcom/discord/rtcconnection/socket/a;->yS:Ljava/lang/String;
 
     return-object p0
 .end method
@@ -1705,7 +1621,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;->Ay:Lcom/google/gson/Gson;
+    iget-object p0, p0, Lcom/discord/rtcconnection/socket/a;->AB:Lcom/google/gson/Gson;
 
     return-object p0
 .end method
@@ -1713,7 +1629,7 @@
 .method public static final synthetic i(Lcom/discord/rtcconnection/socket/a;)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/discord/rtcconnection/socket/a;->eI()V
+    invoke-direct {p0}, Lcom/discord/rtcconnection/socket/a;->eH()V
 
     return-void
 .end method
@@ -1731,7 +1647,7 @@
 .method public static final synthetic k(Lcom/discord/rtcconnection/socket/a;)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/discord/rtcconnection/socket/a;->eH()V
+    invoke-direct {p0}, Lcom/discord/rtcconnection/socket/a;->eG()V
 
     return-void
 .end method
@@ -1747,7 +1663,7 @@
 
     move-object/from16 v2, p2
 
-    iget-object v3, v0, Lcom/discord/rtcconnection/socket/a;->Az:Lokhttp3/WebSocket;
+    iget-object v3, v0, Lcom/discord/rtcconnection/socket/a;->AC:Lokhttp3/WebSocket;
 
     if-nez v3, :cond_0
 
@@ -1755,7 +1671,7 @@
 
     :cond_0
     :try_start_0
-    iget-object v4, v0, Lcom/discord/rtcconnection/socket/a;->Ay:Lcom/google/gson/Gson;
+    iget-object v4, v0, Lcom/discord/rtcconnection/socket/a;->AB:Lcom/google/gson/Gson;
 
     new-instance v5, Lcom/discord/rtcconnection/socket/io/Payloads$Outgoing;
 
@@ -1767,7 +1683,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;->yQ:Ljava/lang/String;
+    iget-object v6, v0, Lcom/discord/rtcconnection/socket/a;->yS:Ljava/lang/String;
 
     const-string v7, "sending: "
 
@@ -1796,7 +1712,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;->yQ:Ljava/lang/String;
+    iget-object v12, v0, Lcom/discord/rtcconnection/socket/a;->yS:Ljava/lang/String;
 
     new-instance v3, Ljava/lang/StringBuilder;
 
@@ -1834,13 +1750,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;->AJ:Z
+    iget-boolean v0, p0, Lcom/discord/rtcconnection/socket/a;->AM: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;->yQ:Ljava/lang/String;
+    iget-object v2, p0, Lcom/discord/rtcconnection/socket/a;->yS:Ljava/lang/String;
 
     const/4 v4, 0x0
 
@@ -1855,13 +1771,13 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/discord/rtcconnection/socket/a;->Az:Lokhttp3/WebSocket;
+    iget-object v0, p0, Lcom/discord/rtcconnection/socket/a;->AC: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;->yQ:Ljava/lang/String;
+    iget-object v2, p0, Lcom/discord/rtcconnection/socket/a;->yS:Ljava/lang/String;
 
     invoke-static {p3}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
@@ -1881,19 +1797,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;->AF:Ljava/util/TimerTask;
+    iget-object p3, p0, Lcom/discord/rtcconnection/socket/a;->AJ:Ljava/util/TimerTask;
 
     invoke-virtual {p3}, Ljava/util/TimerTask;->cancel()Z
 
-    invoke-direct {p0}, Lcom/discord/rtcconnection/socket/a;->eJ()Ljava/util/TimerTask;
+    invoke-direct {p0}, Lcom/discord/rtcconnection/socket/a;->eI()Ljava/util/TimerTask;
 
     move-result-object p3
 
-    iput-object p3, p0, Lcom/discord/rtcconnection/socket/a;->AF:Ljava/util/TimerTask;
+    iput-object p3, p0, Lcom/discord/rtcconnection/socket/a;->AJ: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;->AF:Ljava/util/TimerTask;
+    iget-object p4, p0, Lcom/discord/rtcconnection/socket/a;->AJ:Ljava/util/TimerTask;
 
     invoke-virtual {p3, p4, p1, p2}, Ljava/util/Timer;->schedule(Ljava/util/TimerTask;J)V
 
@@ -1911,7 +1827,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;->yQ:Ljava/lang/String;
+    iget-object v1, p0, Lcom/discord/rtcconnection/socket/a;->yS:Ljava/lang/String;
 
     invoke-static {p3}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
@@ -1937,13 +1853,13 @@
 .method public final close()V
     .locals 13
 
-    iget-boolean v0, p0, Lcom/discord/rtcconnection/socket/a;->AJ:Z
+    iget-boolean v0, p0, Lcom/discord/rtcconnection/socket/a;->AM: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;->yQ:Ljava/lang/String;
+    iget-object v2, p0, Lcom/discord/rtcconnection/socket/a;->yS:Ljava/lang/String;
 
     const/4 v4, 0x0
 
@@ -1960,7 +1876,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;->yQ:Ljava/lang/String;
+    iget-object v8, p0, Lcom/discord/rtcconnection/socket/a;->yS:Ljava/lang/String;
 
     const/4 v10, 0x0
 
@@ -1972,15 +1888,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;->AT:Lcom/discord/rtcconnection/socket/a$e;
+    sget-object v0, Lcom/discord/rtcconnection/socket/a$e;->AW: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;->eG()V
+    invoke-direct {p0}, Lcom/discord/rtcconnection/socket/a;->eF()V
 
-    sget-object v0, Lcom/discord/rtcconnection/socket/a$f;->AU:Lcom/discord/rtcconnection/socket/a$f;
+    sget-object v0, Lcom/discord/rtcconnection/socket/a$f;->AX:Lcom/discord/rtcconnection/socket/a$f;
 
     check-cast v0, Lkotlin/jvm/functions/Function1;
 
@@ -1989,10 +1905,10 @@
     return-void
 .end method
 
-.method public final eE()Z
+.method public final eD()Z
     .locals 9
 
-    iget-boolean v0, p0, Lcom/discord/rtcconnection/socket/a;->AJ:Z
+    iget-boolean v0, p0, Lcom/discord/rtcconnection/socket/a;->AM:Z
 
     const/4 v1, 0x0
 
@@ -2000,7 +1916,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;->yQ:Ljava/lang/String;
+    iget-object v3, p0, Lcom/discord/rtcconnection/socket/a;->yS:Ljava/lang/String;
 
     const/4 v5, 0x0
 
@@ -2015,15 +1931,15 @@
     return v1
 
     :cond_0
-    iget v0, p0, Lcom/discord/rtcconnection/socket/a;->AB:I
+    iget v0, p0, Lcom/discord/rtcconnection/socket/a;->AF:I
 
-    sget v2, Lcom/discord/rtcconnection/socket/a$b;->AL:I
+    sget v2, Lcom/discord/rtcconnection/socket/a$b;->AO: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;->yQ:Ljava/lang/String;
+    iget-object v4, p0, Lcom/discord/rtcconnection/socket/a;->yS:Ljava/lang/String;
 
     const/4 v6, 0x0
 
@@ -2038,11 +1954,11 @@
     return v1
 
     :cond_1
-    sget v0, Lcom/discord/rtcconnection/socket/a$b;->AM:I
+    sget v0, Lcom/discord/rtcconnection/socket/a$b;->AP:I
 
-    iput v0, p0, Lcom/discord/rtcconnection/socket/a;->AB:I
+    iput v0, p0, Lcom/discord/rtcconnection/socket/a;->AF:I
 
-    invoke-direct {p0}, Lcom/discord/rtcconnection/socket/a;->eF()V
+    invoke-direct {p0}, Lcom/discord/rtcconnection/socket/a;->eE()V
 
     const/4 v0, 0x1
 
@@ -2062,13 +1978,13 @@
         }
     .end annotation
 
-    iget-boolean v0, p0, Lcom/discord/rtcconnection/socket/a;->AJ:Z
+    iget-boolean v0, p0, Lcom/discord/rtcconnection/socket/a;->AM: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;->yQ:Ljava/lang/String;
+    iget-object v2, p0, Lcom/discord/rtcconnection/socket/a;->yS:Ljava/lang/String;
 
     const/4 v4, 0x0
 
@@ -2087,18 +2003,18 @@
 
     invoke-virtual {v0}, Lcom/discord/utilities/networking/Backoff;->cancel()V
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/socket/a;->AF:Ljava/util/TimerTask;
+    iget-object v0, p0, Lcom/discord/rtcconnection/socket/a;->AJ:Ljava/util/TimerTask;
 
     invoke-virtual {v0}, Ljava/util/TimerTask;->cancel()Z
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/socket/a;->AH:Ljava/util/TimerTask;
+    iget-object v0, p0, Lcom/discord/rtcconnection/socket/a;->AL: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;->Az:Lokhttp3/WebSocket;
+    iget-object v0, p0, Lcom/discord/rtcconnection/socket/a;->AC:Lokhttp3/WebSocket;
 
     if-eqz v0, :cond_2
 
@@ -2109,7 +2025,7 @@
     :cond_2
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/discord/rtcconnection/socket/a;->Az:Lokhttp3/WebSocket;
+    iput-object p1, p0, Lcom/discord/rtcconnection/socket/a;->AC:Lokhttp3/WebSocket;
 
     return-void
 .end method
@@ -2163,7 +2079,7 @@
 .end method
 
 .method public final onMessage(Lokhttp3/WebSocket;Ljava/lang/String;)V
-    .locals 2
+    .locals 1
 
     const-string v0, "webSocket"
 
@@ -2173,25 +2089,15 @@
 
     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 p2, Lcom/discord/rtcconnection/socket/a$w;
+    new-instance v0, Lcom/discord/rtcconnection/socket/a$w;
 
-    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
+    invoke-direct {v0, p0, p1, p2}, Lcom/discord/rtcconnection/socket/a$w;-><init>(Lcom/discord/rtcconnection/socket/a;Lokhttp3/WebSocket;Ljava/lang/String;)V
 
-    check-cast p2, Lkotlin/jvm/functions/Function0;
+    check-cast v0, Lkotlin/jvm/functions/Function0;
 
-    invoke-direct {p0, p2}, Lcom/discord/rtcconnection/socket/a;->a(Lkotlin/jvm/functions/Function0;)Ljava/util/concurrent/Future;
+    invoke-direct {p0, v0}, 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 6eaa02fcd4..be88a5ae44 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/Integer;
+.field private final speaking:Ljava/lang/Boolean;
 
 .field private final ssrc:I
 
@@ -29,14 +29,14 @@
 
 
 # direct methods
-.method public constructor <init>(ILjava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Long;)V
+.method public constructor <init>(ILjava/lang/Boolean;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/Integer;
+    iput-object p2, p0, Lcom/discord/rtcconnection/socket/io/Payloads$Speaking;->speaking:Ljava/lang/Boolean;
 
     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/Integer;Ljava/lang/Integer;Ljava/lang/Long;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+.method public synthetic constructor <init>(ILjava/lang/Boolean;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/Integer;Ljava/lang/Integer;Ljava/lang/Long;)V
+    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
 
     return-void
 .end method
 
-.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;
+.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;
     .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/Integer;
+    iget-object p2, p0, Lcom/discord/rtcconnection/socket/io/Payloads$Speaking;->speaking:Ljava/lang/Boolean;
 
     :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/Integer;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/Boolean;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/Integer;
+.method public final component2()Ljava/lang/Boolean;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/socket/io/Payloads$Speaking;->speaking:Ljava/lang/Integer;
+    iget-object v0, p0, Lcom/discord/rtcconnection/socket/io/Payloads$Speaking;->speaking:Ljava/lang/Boolean;
 
     return-object v0
 .end method
@@ -148,12 +148,12 @@
     return-object v0
 .end method
 
-.method public final copy(ILjava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Long;)Lcom/discord/rtcconnection/socket/io/Payloads$Speaking;
+.method public final copy(ILjava/lang/Boolean;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/Integer;Ljava/lang/Integer;Ljava/lang/Long;)V
+    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
 
     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/Integer;
+    iget-object v1, p0, 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;
+    iget-object v3, p1, Lcom/discord/rtcconnection/socket/io/Payloads$Speaking;->speaking:Ljava/lang/Boolean;
 
     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/Integer;
+.method public final getSpeaking()Ljava/lang/Boolean;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/socket/io/Payloads$Speaking;->speaking:Ljava/lang/Integer;
+    iget-object v0, p0, Lcom/discord/rtcconnection/socket/io/Payloads$Speaking;->speaking:Ljava/lang/Boolean;
 
     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/Integer;
+    iget-object v1, p0, Lcom/discord/rtcconnection/socket/io/Payloads$Speaking;->speaking:Ljava/lang/Boolean;
 
     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/Integer;
+    iget-object v1, p0, Lcom/discord/rtcconnection/socket/io/Payloads$Speaking;->speaking:Ljava/lang/Boolean;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali/com/discord/samsung/SamsungConnectActivity$b.smali b/com.discord/smali/com/discord/samsung/SamsungConnectActivity$b.smali
index 6e92668266..d836924a6d 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 Bh:Lcom/discord/samsung/SamsungConnectActivity;
+.field final synthetic Bk:Lcom/discord/samsung/SamsungConnectActivity;
 
 
 # direct methods
@@ -27,7 +27,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/discord/samsung/SamsungConnectActivity$b;->Bh:Lcom/discord/samsung/SamsungConnectActivity;
+    iput-object p1, p0, Lcom/discord/samsung/SamsungConnectActivity$b;->Bk: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;->vm:Lcom/discord/app/AppLog;
+    sget-object v2, Lcom/discord/app/AppLog;->vn: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;->Bh:Lcom/discord/samsung/SamsungConnectActivity;
+    iget-object p1, p0, Lcom/discord/samsung/SamsungConnectActivity$b;->Bk: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 947e9edbaa..2837e7e8fd 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 Bh:Lcom/discord/samsung/SamsungConnectActivity;
+.field final synthetic Bk:Lcom/discord/samsung/SamsungConnectActivity;
 
 
 # direct methods
@@ -30,7 +30,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/discord/samsung/SamsungConnectActivity$c;->Bh:Lcom/discord/samsung/SamsungConnectActivity;
+    iput-object p1, p0, Lcom/discord/samsung/SamsungConnectActivity$c;->Bk: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;->Bh:Lcom/discord/samsung/SamsungConnectActivity;
+    iget-object p1, p0, Lcom/discord/samsung/SamsungConnectActivity$c;->Bk: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;->Bh:Lcom/discord/samsung/SamsungConnectActivity;
+    iget-object v3, p0, Lcom/discord/samsung/SamsungConnectActivity$c;->Bk: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;->Bh:Lcom/discord/samsung/SamsungConnectActivity;
+    iget-object p1, p0, Lcom/discord/samsung/SamsungConnectActivity$c;->Bk: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;->vm:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vn: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;->Bh:Lcom/discord/samsung/SamsungConnectActivity;
+    iget-object p1, p0, Lcom/discord/samsung/SamsungConnectActivity$c;->Bk: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;->Bh:Lcom/discord/samsung/SamsungConnectActivity;
+    iget-object p1, p0, Lcom/discord/samsung/SamsungConnectActivity$c;->Bk: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;->Bh:Lcom/discord/samsung/SamsungConnectActivity;
+    iget-object p1, p0, Lcom/discord/samsung/SamsungConnectActivity$c;->Bk: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 3d6913eafb..5c6ad0cdc4 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 Bg:Lcom/discord/samsung/SamsungConnectActivity$a;
+.field public static final Bj:Lcom/discord/samsung/SamsungConnectActivity$a;
 
 
 # instance fields
-.field private Be:Lcom/a/a/a/a;
+.field private Bh:Lcom/a/a/a/a;
 
-.field private final Bf:Lcom/discord/samsung/SamsungConnectActivity$c;
+.field private final Bi: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;->Bg:Lcom/discord/samsung/SamsungConnectActivity$a;
+    sput-object v0, Lcom/discord/samsung/SamsungConnectActivity;->Bj: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;->Bf:Lcom/discord/samsung/SamsungConnectActivity$c;
+    iput-object v0, p0, Lcom/discord/samsung/SamsungConnectActivity;->Bi: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;->Be:Lcom/a/a/a/a;
+    iget-object p0, p0, Lcom/discord/samsung/SamsungConnectActivity;->Bh: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;->Be:Lcom/a/a/a/a;
+    iput-object p1, p0, Lcom/discord/samsung/SamsungConnectActivity;->Bh: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;->vm:Lcom/discord/app/AppLog;
+    sget-object v1, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
 
     const/4 v3, 0x0
 
@@ -254,7 +254,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/discord/samsung/SamsungConnectActivity;->Bf:Lcom/discord/samsung/SamsungConnectActivity$c;
+    iget-object v0, p0, Lcom/discord/samsung/SamsungConnectActivity;->Bi: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;->vm:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vn: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;->Bf:Lcom/discord/samsung/SamsungConnectActivity$c;
+    iget-object v0, p0, Lcom/discord/samsung/SamsungConnectActivity;->Bi: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 ed7ea2eaa1..0c942cedba 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;->bgy:Lkotlin/Unit;
+    sget-object p2, Lkotlin/Unit;->bgt: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;->FN()Lokhttp3/w;
+    invoke-virtual {p1}, Lokhttp3/w$a;->FL()Lokhttp3/w;
 
     move-result-object p1
 
@@ -159,11 +159,11 @@
 
     move-result-object p1
 
-    invoke-interface {p1}, Lokhttp3/e;->Fd()Lokhttp3/Response;
+    invoke-interface {p1}, Lokhttp3/e;->Fb()Lokhttp3/Response;
 
     move-result-object p1
 
-    sget-object v0, Lcom/discord/samsung/a;->Bc:Lcom/discord/samsung/a;
+    sget-object v0, Lcom/discord/samsung/a;->Bf: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 47c8f5bb42..9281686b77 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;->eL()Lrx/Observable;
+    value = Lcom/discord/samsung/a;->eK()Lrx/Observable;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -31,7 +31,7 @@
 
 
 # static fields
-.field public static final Bd:Lcom/discord/samsung/a$c;
+.field public static final Bg: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;->Bd:Lcom/discord/samsung/a$c;
+    sput-object v0, Lcom/discord/samsung/a$c;->Bg: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;->Bc:Lcom/discord/samsung/a;
+    sget-object p1, Lcom/discord/samsung/a;->Bf:Lcom/discord/samsung/a;
 
-    invoke-static {}, Lcom/discord/samsung/a;->eK()Z
+    invoke-static {}, Lcom/discord/samsung/a;->eJ()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 09e7428940..1c282ef310 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;->bgy:Lkotlin/Unit;
+    sget-object p2, Lkotlin/Unit;->bgt: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;->FN()Lokhttp3/w;
+    invoke-virtual {p1}, Lokhttp3/w$a;->FL()Lokhttp3/w;
 
     move-result-object p1
 
@@ -323,11 +323,11 @@
 
     move-result-object p1
 
-    invoke-interface {p1}, Lokhttp3/e;->Fd()Lokhttp3/Response;
+    invoke-interface {p1}, Lokhttp3/e;->Fb()Lokhttp3/Response;
 
     move-result-object p1
 
-    sget-object v0, Lcom/discord/samsung/a;->Bc:Lcom/discord/samsung/a;
+    sget-object v0, Lcom/discord/samsung/a;->Bf: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 2efe87b8cd..d5d1604efc 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 Bc:Lcom/discord/samsung/a;
+.field public static final Bf: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;->Bc:Lcom/discord/samsung/a;
+    sput-object v0, Lcom/discord/samsung/a;->Bf:Lcom/discord/samsung/a;
 
     return-void
 .end method
@@ -91,7 +91,7 @@
     :goto_1
     if-nez v4, :cond_4
 
-    invoke-virtual {p0}, Lokhttp3/Response;->zg()Z
+    invoke-virtual {p0}, Lokhttp3/Response;->ze()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;->vm:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vn: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;->DH()Lkotlinx/coroutines/ab;
+    invoke-static {}, Lkotlinx/coroutines/as;->DF()Lkotlinx/coroutines/ab;
 
     move-result-object v0
 
@@ -239,7 +239,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lkotlinx/coroutines/as;->DH()Lkotlinx/coroutines/ab;
+    invoke-static {}, Lkotlinx/coroutines/as;->DF()Lkotlinx/coroutines/ab;
 
     move-result-object v0
 
@@ -335,7 +335,7 @@
     return-object v2
 .end method
 
-.method public static eK()Z
+.method public static eJ()Z
     .locals 3
 
     sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
@@ -364,7 +364,7 @@
     return v0
 .end method
 
-.method public static eL()Lrx/Observable;
+.method public static eK()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;->Bd:Lcom/discord/samsung/a$c;
+    sget-object v1, Lcom/discord/samsung/a$c;->Bg:Lcom/discord/samsung/a$c;
 
     check-cast v1, Lrx/functions/b;
 
@@ -406,7 +406,7 @@
     return-object v0
 .end method
 
-.method public static eM()Landroid/content/Intent;
+.method public static eL()Landroid/content/Intent;
     .locals 3
 
     new-instance v0, Landroid/content/Intent;
@@ -430,7 +430,7 @@
     return-object v0
 .end method
 
-.method public static eN()Landroid/content/Intent;
+.method public static eM()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 36ad842191..79803585e0 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;->Bx:Lcom/discord/simpleast/core/a/a;
+    sget-object v1, Lcom/discord/simpleast/core/a/a;->BA:Lcom/discord/simpleast/core/a/a;
 
-    invoke-virtual {v1}, Lcom/discord/simpleast/core/a/a;->eR()Lcom/discord/simpleast/core/parser/Rule;
+    invoke-virtual {v1}, Lcom/discord/simpleast/core/a/a;->eQ()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;->BI:Lcom/discord/simpleast/a/a;
+    sget-object v0, Lcom/discord/simpleast/a/a;->BL:Lcom/discord/simpleast/a/a;
 
-    invoke-static {}, Lcom/discord/simpleast/a/a;->eX()Ljava/util/regex/Pattern;
+    invoke-static {}, Lcom/discord/simpleast/a/a;->eW()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;->Bp:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Bs: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 ed65c3161d..5ae769147a 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;->BI:Lcom/discord/simpleast/a/a;
+    sget-object p1, Lcom/discord/simpleast/a/a;->BL:Lcom/discord/simpleast/a/a;
 
-    invoke-static {}, Lcom/discord/simpleast/a/a;->eW()Ljava/util/regex/Pattern;
+    invoke-static {}, Lcom/discord/simpleast/a/a;->eV()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;->Bp:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Bs: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 930fa28556..9f6b50b7ec 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;->BI:Lcom/discord/simpleast/a/a;
+    sget-object v0, Lcom/discord/simpleast/a/a;->BL:Lcom/discord/simpleast/a/a;
 
-    invoke-static {}, Lcom/discord/simpleast/a/a;->eV()Ljava/util/regex/Pattern;
+    invoke-static {}, Lcom/discord/simpleast/a/a;->eU()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;->Bp:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Bs: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 537497aef4..0e57d8da04 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 BE:Ljava/util/regex/Pattern;
-
-.field private static final BF:Ljava/util/regex/Pattern;
-
-.field private static final BG:Ljava/util/regex/Pattern;
-
 .field private static final BH:Ljava/util/regex/Pattern;
 
-.field public static final BI:Lcom/discord/simpleast/a/a;
+.field private static final BI:Ljava/util/regex/Pattern;
+
+.field private static final BJ:Ljava/util/regex/Pattern;
+
+.field private static final BK:Ljava/util/regex/Pattern;
+
+.field public static final BL: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;->BI:Lcom/discord/simpleast/a/a;
+    sput-object v0, Lcom/discord/simpleast/a/a;->BL: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;->BE:Ljava/util/regex/Pattern;
+    sput-object v1, Lcom/discord/simpleast/a/a;->BH: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;->BF:Ljava/util/regex/Pattern;
+    sput-object v1, Lcom/discord/simpleast/a/a;->BI: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;->BG:Ljava/util/regex/Pattern;
+    sput-object v0, Lcom/discord/simpleast/a/a;->BJ: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;->BH:Ljava/util/regex/Pattern;
+    sput-object v0, Lcom/discord/simpleast/a/a;->BK:Ljava/util/regex/Pattern;
 
     return-void
 .end method
@@ -92,10 +92,18 @@
     return-void
 .end method
 
+.method public static eT()Ljava/util/regex/Pattern;
+    .locals 1
+
+    sget-object v0, Lcom/discord/simpleast/a/a;->BH:Ljava/util/regex/Pattern;
+
+    return-object v0
+.end method
+
 .method public static eU()Ljava/util/regex/Pattern;
     .locals 1
 
-    sget-object v0, Lcom/discord/simpleast/a/a;->BE:Ljava/util/regex/Pattern;
+    sget-object v0, Lcom/discord/simpleast/a/a;->BI:Ljava/util/regex/Pattern;
 
     return-object v0
 .end method
@@ -103,7 +111,7 @@
 .method public static eV()Ljava/util/regex/Pattern;
     .locals 1
 
-    sget-object v0, Lcom/discord/simpleast/a/a;->BF:Ljava/util/regex/Pattern;
+    sget-object v0, Lcom/discord/simpleast/a/a;->BJ:Ljava/util/regex/Pattern;
 
     return-object v0
 .end method
@@ -111,15 +119,7 @@
 .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;
+    sget-object v0, Lcom/discord/simpleast/a/a;->BK: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 13246a0d89..00c35e80fb 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;->eQ()Lcom/discord/simpleast/core/parser/Rule;
+    value = Lcom/discord/simpleast/core/a/a;->eP()Lcom/discord/simpleast/core/parser/Rule;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -29,7 +29,7 @@
 
 
 # static fields
-.field public static final By:Lcom/discord/simpleast/core/a/a$a;
+.field public static final BB: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;->By:Lcom/discord/simpleast/core/a/a$a;
+    sput-object v0, Lcom/discord/simpleast/core/a/a$a;->BB: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 f87edb46e3..5d320cc0ff 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;->eS()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 Bz:Lcom/discord/simpleast/core/a/a;
+.field final synthetic BC: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;->Bz:Lcom/discord/simpleast/core/a/a;
+    iput-object p1, p0, Lcom/discord/simpleast/core/a/a$b;->BC: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;->Bp:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Bs: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 5092a00310..e63cdc67ae 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 Bz:Lcom/discord/simpleast/core/a/a;
+.field final synthetic BC: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;->Bz:Lcom/discord/simpleast/core/a/a;
+    iput-object p1, p0, Lcom/discord/simpleast/core/a/a$c;->BC: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;->Bp:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object v1, Lcom/discord/simpleast/core/parser/ParseSpec;->Bs: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 1bd86cfe06..a62ac87a42 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 Bz:Lcom/discord/simpleast/core/a/a;
+.field final synthetic BC: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;->Bz:Lcom/discord/simpleast/core/a/a;
+    iput-object p1, p0, Lcom/discord/simpleast/core/a/a$d;->BC: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;->Bp:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Bs: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 1fd9a6a84e..ea3375057f 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 BA:Lkotlin/jvm/functions/Function0;
+.field final synthetic BD: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;->BA:Lkotlin/jvm/functions/Function0;
+    iput-object p1, p0, Lcom/discord/simpleast/core/a/a$e;->BD: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;->BA:Lkotlin/jvm/functions/Function0;
+    iget-object v0, p0, Lcom/discord/simpleast/core/a/a$e;->BD: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;->Bp:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object v0, Lcom/discord/simpleast/core/parser/ParseSpec;->Bs: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 39d0b3eb0f..3280ff2583 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 BB:Lcom/discord/simpleast/core/a/a$f;
+.field public static final BE: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;->BB:Lcom/discord/simpleast/core/a/a$f;
+    sput-object v0, Lcom/discord/simpleast/core/a/a$f;->BE: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 219e372c21..396987bd71 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;->eR()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;
@@ -24,7 +24,7 @@
 
 
 # instance fields
-.field final synthetic Bz:Lcom/discord/simpleast/core/a/a;
+.field final synthetic BC: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;->Bz:Lcom/discord/simpleast/core/a/a;
+    iput-object p1, p0, Lcom/discord/simpleast/core/a/a$g;->BC: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;->Bp:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object p1, Lcom/discord/simpleast/core/parser/ParseSpec;->Bs: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 1bf7618fb5..ff612eb953 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 BC:Lcom/discord/simpleast/core/a/a$h;
+.field public static final BF: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;->BC:Lcom/discord/simpleast/core/a/a$h;
+    sput-object v0, Lcom/discord/simpleast/core/a/a$h;->BF: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 97ae26460b..79893641bc 100644
--- a/com.discord/smali/com/discord/simpleast/core/a/a.smali
+++ b/com.discord/smali/com/discord/simpleast/core/a/a.smali
@@ -4,11 +4,7 @@
 
 
 # static fields
-.field private static final Bq:Ljava/util/regex/Pattern;
-
-.field private static final Br:Ljava/util/regex/Pattern;
-
-.field private static final Bs:Ljava/util/regex/Pattern;
+.field public static final BA:Lcom/discord/simpleast/core/a/a;
 
 .field private static final Bt:Ljava/util/regex/Pattern;
 
@@ -18,7 +14,11 @@
 
 .field private static final Bw:Ljava/util/regex/Pattern;
 
-.field public static final Bx:Lcom/discord/simpleast/core/a/a;
+.field private static final Bx:Ljava/util/regex/Pattern;
+
+.field private static final By:Ljava/util/regex/Pattern;
+
+.field private static final Bz:Ljava/util/regex/Pattern;
 
 
 # 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;->Bx:Lcom/discord/simpleast/core/a/a;
+    sput-object v0, Lcom/discord/simpleast/core/a/a;->BA: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;->Bq:Ljava/util/regex/Pattern;
+    sput-object v0, Lcom/discord/simpleast/core/a/a;->Bt: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;->Br:Ljava/util/regex/Pattern;
+    sput-object v0, Lcom/discord/simpleast/core/a/a;->Bu: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;->Bs:Ljava/util/regex/Pattern;
+    sput-object v0, Lcom/discord/simpleast/core/a/a;->Bv: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;->Bt:Ljava/util/regex/Pattern;
+    sput-object v0, Lcom/discord/simpleast/core/a/a;->Bw: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;->Bu:Ljava/util/regex/Pattern;
+    sput-object v0, Lcom/discord/simpleast/core/a/a;->Bx: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;->Bv:Ljava/util/regex/Pattern;
+    sput-object v0, Lcom/discord/simpleast/core/a/a;->By: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;->Bw:Ljava/util/regex/Pattern;
+    sput-object v0, Lcom/discord/simpleast/core/a/a;->Bz:Ljava/util/regex/Pattern;
 
     return-void
 .end method
@@ -138,23 +138,23 @@
     return-object v0
 .end method
 
+.method public static eN()Ljava/util/regex/Pattern;
+    .locals 1
+
+    sget-object v0, Lcom/discord/simpleast/core/a/a;->Bt:Ljava/util/regex/Pattern;
+
+    return-object v0
+.end method
+
 .method public static eO()Ljava/util/regex/Pattern;
     .locals 1
 
-    sget-object v0, Lcom/discord/simpleast/core/a/a;->Bq:Ljava/util/regex/Pattern;
+    sget-object v0, Lcom/discord/simpleast/core/a/a;->Bx:Ljava/util/regex/Pattern;
 
     return-object v0
 .end method
 
-.method public static eP()Ljava/util/regex/Pattern;
-    .locals 1
-
-    sget-object v0, Lcom/discord/simpleast/core/a/a;->Bu:Ljava/util/regex/Pattern;
-
-    return-object v0
-.end method
-
-.method public static eQ()Lcom/discord/simpleast/core/parser/Rule;
+.method public static eP()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;->Bq:Ljava/util/regex/Pattern;
+    sget-object v0, Lcom/discord/simpleast/core/a/a;->Bt: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;->By:Lcom/discord/simpleast/core/a/a$a;
+    sget-object v1, Lcom/discord/simpleast/core/a/a$a;->BB: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 eT()Ljava/util/List;
+.method public static synthetic eS()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;->Bx:Lcom/discord/simpleast/core/a/a;
+    sget-object v1, Lcom/discord/simpleast/core/a/a;->BA:Lcom/discord/simpleast/core/a/a;
 
-    invoke-virtual {v1}, Lcom/discord/simpleast/core/a/a;->eS()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
 
     invoke-virtual {v0, v1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
-    sget-object v1, Lcom/discord/simpleast/core/a/a;->Bx:Lcom/discord/simpleast/core/a/a;
+    sget-object v1, Lcom/discord/simpleast/core/a/a;->BA: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;->Bt:Ljava/util/regex/Pattern;
+    sget-object v3, Lcom/discord/simpleast/core/a/a;->Bw: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;->eQ()Lcom/discord/simpleast/core/parser/Rule;
+    invoke-static {}, Lcom/discord/simpleast/core/a/a;->eP()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;->Br:Ljava/util/regex/Pattern;
+    sget-object v1, Lcom/discord/simpleast/core/a/a;->Bu: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;->BC:Lcom/discord/simpleast/core/a/a$h;
+    sget-object v2, Lcom/discord/simpleast/core/a/a$h;->BF: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;->Bx:Lcom/discord/simpleast/core/a/a;
+    sget-object v1, Lcom/discord/simpleast/core/a/a;->BA: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;->Bw:Ljava/util/regex/Pattern;
+    sget-object v3, Lcom/discord/simpleast/core/a/a;->Bz: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;->Bs:Ljava/util/regex/Pattern;
+    sget-object v1, Lcom/discord/simpleast/core/a/a;->Bv: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;->BB:Lcom/discord/simpleast/core/a/a$f;
+    sget-object v2, Lcom/discord/simpleast/core/a/a$f;->BE: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;->Bx:Lcom/discord/simpleast/core/a/a;
+    sget-object p0, Lcom/discord/simpleast/core/a/a;->BA:Lcom/discord/simpleast/core/a/a;
 
-    invoke-virtual {p0}, Lcom/discord/simpleast/core/a/a;->eR()Lcom/discord/simpleast/core/parser/Rule;
+    invoke-virtual {p0}, Lcom/discord/simpleast/core/a/a;->eQ()Lcom/discord/simpleast/core/parser/Rule;
 
     move-result-object p0
 
@@ -316,7 +316,7 @@
 
 
 # virtual methods
-.method public final eR()Lcom/discord/simpleast/core/parser/Rule;
+.method public final eQ()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;->Bu:Ljava/util/regex/Pattern;
+    sget-object v1, Lcom/discord/simpleast/core/a/a;->Bx:Ljava/util/regex/Pattern;
 
     const-string v2, "PATTERN_TEXT"
 
@@ -347,7 +347,7 @@
     return-object v0
 .end method
 
-.method public final eS()Lcom/discord/simpleast/core/parser/Rule;
+.method public final eR()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;->Bv:Ljava/util/regex/Pattern;
+    sget-object v1, Lcom/discord/simpleast/core/a/a;->By: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 5362a438b9..511cb7410c 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 BD:Lcom/discord/simpleast/core/a/b;
+.field public static final BG: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;->BD:Lcom/discord/simpleast/core/a/b;
+    sput-object v0, Lcom/discord/simpleast/core/a/b;->BG: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;->eT()Ljava/util/List;
+    invoke-static {}, Lcom/discord/simpleast/core/a/a;->eS()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 b9d4f416f5..601580b321 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 Bk:Lcom/discord/simpleast/core/node/StyleNode$b;
+.field public static final Bn: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;->Bk:Lcom/discord/simpleast/core/node/StyleNode$b;
+    sput-object v0, Lcom/discord/simpleast/core/node/StyleNode$b;->Bn: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 d4f80f9356..3fdd603323 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 Bj:Lcom/discord/simpleast/core/node/StyleNode$a;
+.field public static final Bm:Lcom/discord/simpleast/core/node/StyleNode$a;
 
 
 # instance fields
-.field private final Bi:Ljava/util/List;
+.field private final Bl: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;->Bj:Lcom/discord/simpleast/core/node/StyleNode$a;
+    sput-object v0, Lcom/discord/simpleast/core/node/StyleNode;->Bm: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;->Bi:Ljava/util/List;
+    iput-object p1, p0, Lcom/discord/simpleast/core/node/StyleNode;->Bl: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;->Bi:Ljava/util/List;
+    iget-object p2, p0, Lcom/discord/simpleast/core/node/StyleNode;->Bl: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;->Bk:Lcom/discord/simpleast/core/node/StyleNode$b;
+    sget-object v1, Lcom/discord/simpleast/core/node/StyleNode$b;->Bn: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 27812bb950..fd48b99ce8 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 Bp:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+.field public static final Bs:Lcom/discord/simpleast/core/parser/ParseSpec$a;
 
 
 # instance fields
-.field public final Bl:Lcom/discord/simpleast/core/node/Node;
+.field public final Bo:Lcom/discord/simpleast/core/node/Node;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TT;"
@@ -37,9 +37,9 @@
     .end annotation
 .end field
 
-.field final Bm:Z
+.field final Bp:Z
 
-.field final Bn:Ljava/lang/Object;
+.field final Bq:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TS;"
@@ -47,7 +47,7 @@
     .end annotation
 .end field
 
-.field Bo:I
+.field Br: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;->Bp:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sput-object v0, Lcom/discord/simpleast/core/parser/ParseSpec;->Bs: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;->Bl:Lcom/discord/simpleast/core/node/Node;
+    iput-object p1, p0, Lcom/discord/simpleast/core/parser/ParseSpec;->Bo:Lcom/discord/simpleast/core/node/Node;
 
-    iput-object p2, p0, Lcom/discord/simpleast/core/parser/ParseSpec;->Bn:Ljava/lang/Object;
+    iput-object p2, p0, Lcom/discord/simpleast/core/parser/ParseSpec;->Bq:Ljava/lang/Object;
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lcom/discord/simpleast/core/parser/ParseSpec;->Bm:Z
+    iput-boolean p1, p0, Lcom/discord/simpleast/core/parser/ParseSpec;->Bp: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;->Bl:Lcom/discord/simpleast/core/node/Node;
+    iput-object p1, p0, Lcom/discord/simpleast/core/parser/ParseSpec;->Bo:Lcom/discord/simpleast/core/node/Node;
 
-    iput-object p2, p0, Lcom/discord/simpleast/core/parser/ParseSpec;->Bn:Ljava/lang/Object;
+    iput-object p2, p0, Lcom/discord/simpleast/core/parser/ParseSpec;->Bq:Ljava/lang/Object;
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lcom/discord/simpleast/core/parser/ParseSpec;->Bm:Z
+    iput-boolean p1, p0, Lcom/discord/simpleast/core/parser/ParseSpec;->Bp:Z
 
     iput p3, p0, Lcom/discord/simpleast/core/parser/ParseSpec;->startIndex:I
 
-    iput p4, p0, Lcom/discord/simpleast/core/parser/ParseSpec;->Bo:I
+    iput p4, p0, Lcom/discord/simpleast/core/parser/ParseSpec;->Br: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 cf7060b7f2..c8cc26926d 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;->Bo:I
+    iget v6, p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Br: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;->Bo:I
+    iget v6, p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Br: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;->Bn:Ljava/lang/Object;
+    iget-object v9, p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Bq: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;->Bn:Ljava/lang/Object;
+    iget-object v5, p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Bq: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;->Bl:Lcom/discord/simpleast/core/node/Node;
+    iget-object v7, p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Bo:Lcom/discord/simpleast/core/node/Node;
 
-    iget-object v8, v5, Lcom/discord/simpleast/core/parser/ParseSpec;->Bl:Lcom/discord/simpleast/core/node/Node;
+    iget-object v8, v5, Lcom/discord/simpleast/core/parser/ParseSpec;->Bo: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;->Bo:I
+    iget v8, p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Br:I
 
     if-eq v3, v8, :cond_5
 
-    sget-object v8, Lcom/discord/simpleast/core/parser/ParseSpec;->Bp:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object v8, Lcom/discord/simpleast/core/parser/ParseSpec;->Bs:Lcom/discord/simpleast/core/parser/ParseSpec$a;
 
-    iget-object v8, p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Bn:Ljava/lang/Object;
+    iget-object v8, p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Bq:Ljava/lang/Object;
 
-    iget p2, p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Bo:I
+    iget p2, p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Br: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;->Bm:Z
+    iget-boolean p2, v5, Lcom/discord/simpleast/core/parser/ParseSpec;->Bp: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;->Bo:I
+    iget p2, v5, Lcom/discord/simpleast/core/parser/ParseSpec;->Br:I
 
     add-int/2addr p2, v6
 
-    iput p2, v5, Lcom/discord/simpleast/core/parser/ParseSpec;->Bo:I
+    iput p2, v5, Lcom/discord/simpleast/core/parser/ParseSpec;->Br: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 e1465797b7..8682d850b0 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 ec923b09a5..a492f6d060 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 ec98f821f7..2ba2b945cb 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 abb48706b1..09c070efff 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 1407bccbf4..9822422c11 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 270a7e196b..de915c36a4 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 3493449fa4..3146e6e67a 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 c130f98850..a914a5b9b2 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 2094c7a240..21a8da67e3 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 6c4ef531b2..e4e0ed24aa 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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
deleted file mode 100644
index dd7987ffd5..0000000000
--- a/com.discord/smali/com/discord/stores/StoreAnalytics$reportStreamProblem$1.smali
+++ /dev/null
@@ -1,119 +0,0 @@
-.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 7c872b3af1..dd00f9281d 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 834fdca8dc..4b3e806ae3 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;->KA()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->Ky()Lrx/subjects/PublishSubject;
 
     move-result-object p1
 
@@ -1356,11 +1356,11 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->IV()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->IT()Lrx/Observable;
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/aq;->JG()Lrx/internal/a/aq;
+    invoke-static {}, Lrx/internal/a/aq;->JE()Lrx/internal/a/aq;
 
     move-result-object v0
 
@@ -1479,26 +1479,6 @@
     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 0560de7416..5aee71e149 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 82b2831aa3..ed0767a2bf 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;->KA()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->Ky()Lrx/subjects/PublishSubject;
 
     move-result-object p1
 
@@ -198,7 +198,7 @@
 
     move-object v2, p1
 
-    sget-object v0, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vn: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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 dee57ae02d..6f60a9acbb 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 23ad5f93e8..a521d2e159 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 1d443c3be3..1771702860 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 06e60fed1a..c3a981e455 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 97c6ad5c5b..82ff2f1ec6 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 527ee5939e..e86d76a7d2 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 87c27905e5..a0f0a31905 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 3f4d6e592a..7d1c80c58d 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 861ebaee5e..f8f3536de0 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 a67a3c6b05..041f1ea7bf 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 6154816de8..acb900775b 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 b7291a685a..bdd625d37c 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 2cc026c230..f724783933 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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
deleted file mode 100644
index 736c468955..0000000000
--- a/com.discord/smali/com/discord/stores/StoreApplicationStreaming$Actions$stopWatchingStream$1.smali
+++ /dev/null
@@ -1,72 +0,0 @@
-.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
deleted file mode 100644
index 0ca960a322..0000000000
--- a/com.discord/smali/com/discord/stores/StoreApplicationStreaming$Actions$targetStream$1.smali
+++ /dev/null
@@ -1,72 +0,0 @@
-.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
deleted file mode 100644
index 6eb097a58c..0000000000
--- a/com.discord/smali/com/discord/stores/StoreApplicationStreaming$Actions.smali
+++ /dev/null
@@ -1,164 +0,0 @@
-.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
deleted file mode 100644
index 4d506a9868..0000000000
--- a/com.discord/smali/com/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State.smali
+++ /dev/null
@@ -1,179 +0,0 @@
-.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
deleted file mode 100644
index 0fc31ce0a3..0000000000
--- a/com.discord/smali/com/discord/stores/StoreApplicationStreaming$ActiveApplicationStream.smali
+++ /dev/null
@@ -1,236 +0,0 @@
-.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
deleted file mode 100644
index 0ddc3981c2..0000000000
--- a/com.discord/smali/com/discord/stores/StoreApplicationStreaming$RtcStream.smali
+++ /dev/null
@@ -1,202 +0,0 @@
-.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
deleted file mode 100644
index 37a1874f48..0000000000
--- a/com.discord/smali/com/discord/stores/StoreApplicationStreaming$State.smali
+++ /dev/null
@@ -1,378 +0,0 @@
-.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$getStreamsForGuild$1$2.smali b/com.discord/smali/com/discord/stores/StoreApplicationStreaming$getForGuild$1$1.smali
similarity index 85%
rename from com.discord/smali/com/discord/stores/StoreApplicationStreaming$getStreamsForGuild$1$2.smali
rename to com.discord/smali/com/discord/stores/StoreApplicationStreaming$getForGuild$1$1.smali
index acbe5a7a4e..2d4c0eac95 100644
--- a/com.discord/smali/com/discord/stores/StoreApplicationStreaming$getStreamsForGuild$1$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreApplicationStreaming$getForGuild$1$1.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/stores/StoreApplicationStreaming$getStreamsForGuild$1$2;
+.class final Lcom/discord/stores/StoreApplicationStreaming$getForGuild$1$1;
 .super Ljava/lang/Object;
 .source "StoreApplicationStreaming.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/stores/StoreApplicationStreaming$getStreamsForGuild$1;->call(Ljava/lang/Boolean;)Lrx/Observable;
+    value = Lcom/discord/stores/StoreApplicationStreaming$getForGuild$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$getStreamsForGuild$1;
+.field final synthetic this$0:Lcom/discord/stores/StoreApplicationStreaming$getForGuild$1;
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/stores/StoreApplicationStreaming$getStreamsForGuild$1;)V
+.method constructor <init>(Lcom/discord/stores/StoreApplicationStreaming$getForGuild$1;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/stores/StoreApplicationStreaming$getStreamsForGuild$1$2;->this$0:Lcom/discord/stores/StoreApplicationStreaming$getStreamsForGuild$1;
+    iput-object p1, p0, Lcom/discord/stores/StoreApplicationStreaming$getForGuild$1$1;->this$0:Lcom/discord/stores/StoreApplicationStreaming$getForGuild$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$getStreamsForGuild$1$2;->call(Ljava/util/Map;)Ljava/util/Map;
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreApplicationStreaming$getForGuild$1$1;->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$getStreamsForGuild$1$2;->this$0:Lcom/discord/stores/StoreApplicationStreaming$getStreamsForGuild$1;
+    iget-object v4, p0, Lcom/discord/stores/StoreApplicationStreaming$getForGuild$1$1;->this$0:Lcom/discord/stores/StoreApplicationStreaming$getForGuild$1;
 
-    iget-wide v4, v4, Lcom/discord/stores/StoreApplicationStreaming$getStreamsForGuild$1;->$guildId:J
+    iget-wide v4, v4, Lcom/discord/stores/StoreApplicationStreaming$getForGuild$1;->$guildId:J
 
     cmp-long v6, v2, v4
 
diff --git a/com.discord/smali/com/discord/stores/StoreApplicationStreaming$getStreamsForGuild$1.smali b/com.discord/smali/com/discord/stores/StoreApplicationStreaming$getForGuild$1.smali
similarity index 72%
rename from com.discord/smali/com/discord/stores/StoreApplicationStreaming$getStreamsForGuild$1.smali
rename to com.discord/smali/com/discord/stores/StoreApplicationStreaming$getForGuild$1.smali
index 7faeb05db7..eee60368fd 100644
--- a/com.discord/smali/com/discord/stores/StoreApplicationStreaming$getStreamsForGuild$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreApplicationStreaming$getForGuild$1.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/stores/StoreApplicationStreaming$getStreamsForGuild$1;
+.class final Lcom/discord/stores/StoreApplicationStreaming$getForGuild$1;
 .super Ljava/lang/Object;
 .source "StoreApplicationStreaming.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/stores/StoreApplicationStreaming;->getStreamsForGuild(J)Lrx/Observable;
+    value = Lcom/discord/stores/StoreApplicationStreaming;->getForGuild(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$getStreamsForGuild$1;->this$0:Lcom/discord/stores/StoreApplicationStreaming;
+    iput-object p1, p0, Lcom/discord/stores/StoreApplicationStreaming$getForGuild$1;->this$0:Lcom/discord/stores/StoreApplicationStreaming;
 
-    iput-wide p2, p0, Lcom/discord/stores/StoreApplicationStreaming$getStreamsForGuild$1;->$guildId:J
+    iput-wide p2, p0, Lcom/discord/stores/StoreApplicationStreaming$getForGuild$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$getStreamsForGuild$1;->call(Ljava/lang/Boolean;)Lrx/Observable;
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreApplicationStreaming$getForGuild$1;->call(Ljava/lang/Boolean;)Lrx/Observable;
 
     move-result-object p1
 
@@ -90,13 +90,15 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/discord/stores/StoreApplicationStreaming$getStreamsForGuild$1;->this$0:Lcom/discord/stores/StoreApplicationStreaming;
+    iget-object p1, p0, Lcom/discord/stores/StoreApplicationStreaming$getForGuild$1;->this$0:Lcom/discord/stores/StoreApplicationStreaming;
 
-    invoke-static {p1}, Lcom/discord/stores/StoreApplicationStreaming;->access$getStateSubject$p(Lcom/discord/stores/StoreApplicationStreaming;)Lrx/subjects/BehaviorSubject;
+    invoke-static {p1}, Lcom/discord/stores/StoreApplicationStreaming;->access$getStreamsPublisher$p(Lcom/discord/stores/StoreApplicationStreaming;)Lrx/subjects/BehaviorSubject;
 
     move-result-object p1
 
-    sget-object v0, Lcom/discord/stores/StoreApplicationStreaming$getStreamsForGuild$1$1;->INSTANCE:Lcom/discord/stores/StoreApplicationStreaming$getStreamsForGuild$1$1;
+    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
 
     check-cast v0, Lrx/functions/b;
 
@@ -104,17 +106,7 @@
 
     move-result-object p1
 
-    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;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/stores/StoreApplicationStreaming$getStreamsForUser$1$2.smali b/com.discord/smali/com/discord/stores/StoreApplicationStreaming$getForUser$1$1.smali
similarity index 76%
rename from com.discord/smali/com/discord/stores/StoreApplicationStreaming$getStreamsForUser$1$2.smali
rename to com.discord/smali/com/discord/stores/StoreApplicationStreaming$getForUser$1$1.smali
index 0cf0083aec..1668277307 100644
--- a/com.discord/smali/com/discord/stores/StoreApplicationStreaming$getStreamsForUser$1$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreApplicationStreaming$getForUser$1$1.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/stores/StoreApplicationStreaming$getStreamsForUser$1$2;
+.class final Lcom/discord/stores/StoreApplicationStreaming$getForUser$1$1;
 .super Ljava/lang/Object;
 .source "StoreApplicationStreaming.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/stores/StoreApplicationStreaming$getStreamsForUser$1;->call(Ljava/lang/Boolean;)Lrx/Observable;
+    value = Lcom/discord/stores/StoreApplicationStreaming$getForUser$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$getStreamsForUser$1;
+.field final synthetic this$0:Lcom/discord/stores/StoreApplicationStreaming$getForUser$1;
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/stores/StoreApplicationStreaming$getStreamsForUser$1;)V
+.method constructor <init>(Lcom/discord/stores/StoreApplicationStreaming$getForUser$1;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/stores/StoreApplicationStreaming$getStreamsForUser$1$2;->this$0:Lcom/discord/stores/StoreApplicationStreaming$getStreamsForUser$1;
+    iput-object p1, p0, Lcom/discord/stores/StoreApplicationStreaming$getForUser$1$1;->this$0:Lcom/discord/stores/StoreApplicationStreaming$getForUser$1;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -60,9 +60,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/discord/stores/StoreApplicationStreaming$getStreamsForUser$1$2;->this$0:Lcom/discord/stores/StoreApplicationStreaming$getStreamsForUser$1;
+    iget-object v0, p0, Lcom/discord/stores/StoreApplicationStreaming$getForUser$1$1;->this$0:Lcom/discord/stores/StoreApplicationStreaming$getForUser$1;
 
-    iget-wide v0, v0, Lcom/discord/stores/StoreApplicationStreaming$getStreamsForUser$1;->$userId:J
+    iget-wide v0, v0, Lcom/discord/stores/StoreApplicationStreaming$getForUser$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$getStreamsForUser$1$2;->call(Ljava/util/Map;)Lcom/discord/models/domain/ModelApplicationStream;
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreApplicationStreaming$getForUser$1$1;->call(Ljava/util/Map;)Lcom/discord/models/domain/ModelApplicationStream;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreApplicationStreaming$getStreamsForUser$1.smali b/com.discord/smali/com/discord/stores/StoreApplicationStreaming$getForUser$1.smali
similarity index 72%
rename from com.discord/smali/com/discord/stores/StoreApplicationStreaming$getStreamsForUser$1.smali
rename to com.discord/smali/com/discord/stores/StoreApplicationStreaming$getForUser$1.smali
index 42f156cb30..9b30805c1c 100644
--- a/com.discord/smali/com/discord/stores/StoreApplicationStreaming$getStreamsForUser$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreApplicationStreaming$getForUser$1.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/stores/StoreApplicationStreaming$getStreamsForUser$1;
+.class final Lcom/discord/stores/StoreApplicationStreaming$getForUser$1;
 .super Ljava/lang/Object;
 .source "StoreApplicationStreaming.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/stores/StoreApplicationStreaming;->getStreamsForUser(J)Lrx/Observable;
+    value = Lcom/discord/stores/StoreApplicationStreaming;->getForUser(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$getStreamsForUser$1;->this$0:Lcom/discord/stores/StoreApplicationStreaming;
+    iput-object p1, p0, Lcom/discord/stores/StoreApplicationStreaming$getForUser$1;->this$0:Lcom/discord/stores/StoreApplicationStreaming;
 
-    iput-wide p2, p0, Lcom/discord/stores/StoreApplicationStreaming$getStreamsForUser$1;->$userId:J
+    iput-wide p2, p0, Lcom/discord/stores/StoreApplicationStreaming$getForUser$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$getStreamsForUser$1;->call(Ljava/lang/Boolean;)Lrx/Observable;
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreApplicationStreaming$getForUser$1;->call(Ljava/lang/Boolean;)Lrx/Observable;
 
     move-result-object p1
 
@@ -89,13 +89,15 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/discord/stores/StoreApplicationStreaming$getStreamsForUser$1;->this$0:Lcom/discord/stores/StoreApplicationStreaming;
+    iget-object p1, p0, Lcom/discord/stores/StoreApplicationStreaming$getForUser$1;->this$0:Lcom/discord/stores/StoreApplicationStreaming;
 
-    invoke-static {p1}, Lcom/discord/stores/StoreApplicationStreaming;->access$getStateSubject$p(Lcom/discord/stores/StoreApplicationStreaming;)Lrx/subjects/BehaviorSubject;
+    invoke-static {p1}, Lcom/discord/stores/StoreApplicationStreaming;->access$getStreamsPublisher$p(Lcom/discord/stores/StoreApplicationStreaming;)Lrx/subjects/BehaviorSubject;
 
     move-result-object p1
 
-    sget-object v0, Lcom/discord/stores/StoreApplicationStreaming$getStreamsForUser$1$1;->INSTANCE:Lcom/discord/stores/StoreApplicationStreaming$getStreamsForUser$1$1;
+    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
 
     check-cast v0, Lrx/functions/b;
 
@@ -103,17 +105,7 @@
 
     move-result-object p1
 
-    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;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/stores/StoreApplicationStreaming$getStreams$1.smali b/com.discord/smali/com/discord/stores/StoreApplicationStreaming$getStreams$1.smali
deleted file mode 100644
index 0fd5c3a6b8..0000000000
--- a/com.discord/smali/com/discord/stores/StoreApplicationStreaming$getStreams$1.smali
+++ /dev/null
@@ -1,91 +0,0 @@
-.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
deleted file mode 100644
index cd9fd4556f..0000000000
--- a/com.discord/smali/com/discord/stores/StoreApplicationStreaming$getStreamsForGuild$1$1.smali
+++ /dev/null
@@ -1,91 +0,0 @@
-.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$getStreamsForUser$1$1.smali b/com.discord/smali/com/discord/stores/StoreApplicationStreaming$getStreamsForUser$1$1.smali
deleted file mode 100644
index 5fb2828145..0000000000
--- a/com.discord/smali/com/discord/stores/StoreApplicationStreaming$getStreamsForUser$1$1.smali
+++ /dev/null
@@ -1,91 +0,0 @@
-.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$getActiveStream$1.smali b/com.discord/smali/com/discord/stores/StoreApplicationStreaming$isInSpectatorExperimentObservable$1.smali
similarity index 52%
rename from com.discord/smali/com/discord/stores/StoreApplicationStreaming$getActiveStream$1.smali
rename to com.discord/smali/com/discord/stores/StoreApplicationStreaming$isInSpectatorExperimentObservable$1.smali
index 1c199629f8..8f9ea4e364 100644
--- a/com.discord/smali/com/discord/stores/StoreApplicationStreaming$getActiveStream$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreApplicationStreaming$isInSpectatorExperimentObservable$1.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/stores/StoreApplicationStreaming$getActiveStream$1;
+.class final Lcom/discord/stores/StoreApplicationStreaming$isInSpectatorExperimentObservable$1;
 .super Ljava/lang/Object;
 .source "StoreApplicationStreaming.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/stores/StoreApplicationStreaming;->getActiveStream()Lrx/Observable;
+    value = Lcom/discord/stores/StoreApplicationStreaming;->isInSpectatorExperimentObservable()Lrx/Observable;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -31,18 +31,18 @@
 
 
 # static fields
-.field public static final INSTANCE:Lcom/discord/stores/StoreApplicationStreaming$getActiveStream$1;
+.field public static final INSTANCE:Lcom/discord/stores/StoreApplicationStreaming$isInSpectatorExperimentObservable$1;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    new-instance v0, Lcom/discord/stores/StoreApplicationStreaming$getActiveStream$1;
+    new-instance v0, Lcom/discord/stores/StoreApplicationStreaming$isInSpectatorExperimentObservable$1;
 
-    invoke-direct {v0}, Lcom/discord/stores/StoreApplicationStreaming$getActiveStream$1;-><init>()V
+    invoke-direct {v0}, Lcom/discord/stores/StoreApplicationStreaming$isInSpectatorExperimentObservable$1;-><init>()V
 
-    sput-object v0, Lcom/discord/stores/StoreApplicationStreaming$getActiveStream$1;->INSTANCE:Lcom/discord/stores/StoreApplicationStreaming$getActiveStream$1;
+    sput-object v0, Lcom/discord/stores/StoreApplicationStreaming$isInSpectatorExperimentObservable$1;->INSTANCE:Lcom/discord/stores/StoreApplicationStreaming$isInSpectatorExperimentObservable$1;
 
     return-void
 .end method
@@ -57,24 +57,32 @@
 
 
 # virtual methods
-.method public final call(Lcom/discord/stores/StoreApplicationStreaming$State;)Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+.method public final synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
-    invoke-virtual {p1}, Lcom/discord/stores/StoreApplicationStreaming$State;->getActiveApplicationStream()Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+    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;
 
     move-result-object p1
 
     return-object p1
 .end method
 
-.method public final bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
+.method public final call(Lcom/discord/models/domain/ModelUser;)Z
+    .locals 1
 
-    check-cast p1, Lcom/discord/stores/StoreApplicationStreaming$State;
+    const-string v0, "me"
 
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StoreApplicationStreaming$getActiveStream$1;->call(Lcom/discord/stores/StoreApplicationStreaming$State;)Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-result-object p1
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->isStaff()Z
 
-    return-object p1
+    move-result p1
+
+    return p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreApplicationStreaming.smali b/com.discord/smali/com/discord/stores/StoreApplicationStreaming.smali
index bdae8507c0..3f13601b73 100644
--- a/com.discord/smali/com/discord/stores/StoreApplicationStreaming.smali
+++ b/com.discord/smali/com/discord/stores/StoreApplicationStreaming.smali
@@ -6,45 +6,9 @@
 .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 = {
@@ -56,37 +20,33 @@
     .end annotation
 .end field
 
-.field private targetStream:Lcom/discord/models/domain/ModelApplicationStream;
+.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 final userStore:Lcom/discord/stores/StoreUser;
 
-.field private final voiceChannelSelectedStore:Lcom/discord/stores/StoreVoiceChannelSelected;
-
 
 # direct methods
-.method public constructor <init>(Lcom/discord/stores/StoreUser;Lcom/discord/stores/StoreVoiceChannelSelected;Lcom/discord/stores/StoreStream;)V
+.method public constructor <init>(Lcom/discord/stores/StoreUser;)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
@@ -97,126 +57,27 @@
 
     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
 
-    iput-object p1, p0, Lcom/discord/stores/StoreApplicationStreaming;->stateSubject:Lrx/subjects/BehaviorSubject;
+    const-string v0, "BehaviorSubject.create(HashMap())"
 
-    sget-object p1, Lcom/discord/stores/StoreApplicationStreaming$Actions;->INSTANCE:Lcom/discord/stores/StoreApplicationStreaming$Actions;
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    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
+    iput-object p1, p0, Lcom/discord/stores/StoreApplicationStreaming;->streamsPublisher:Lrx/subjects/BehaviorSubject;
 
     return-void
 .end method
 
-.method public static final synthetic access$getStateSubject$p(Lcom/discord/stores/StoreApplicationStreaming;)Lrx/subjects/BehaviorSubject;
+.method public static final synthetic access$getStreamsPublisher$p(Lcom/discord/stores/StoreApplicationStreaming;)Lrx/subjects/BehaviorSubject;
     .locals 0
 
-    iget-object p0, p0, Lcom/discord/stores/StoreApplicationStreaming;->stateSubject:Lrx/subjects/BehaviorSubject;
+    iget-object p0, p0, Lcom/discord/stores/StoreApplicationStreaming;->streamsPublisher: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
 
@@ -234,110 +95,10 @@
     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 getActiveApplicationStream$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+.method public final get()Lrx/Observable;
     .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 = {
             "()",
@@ -349,24 +110,14 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/discord/stores/StoreApplicationStreaming;->stateSubject:Lrx/subjects/BehaviorSubject;
+    iget-object v0, p0, Lcom/discord/stores/StoreApplicationStreaming;->streamsPublisher:Lrx/subjects/BehaviorSubject;
 
-    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
+    check-cast v0, Lrx/Observable;
 
     return-object v0
 .end method
 
-.method public final getStreamsForGuild(J)Lrx/Observable;
+.method public final getForGuild(J)Lrx/Observable;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -379,13 +130,13 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/discord/stores/StoreApplicationStreaming;->isInSpectatorExperimentObservable()Lrx/Observable;
+    invoke-virtual {p0}, Lcom/discord/stores/StoreApplicationStreaming;->isInSpectatorExperimentObservable()Lrx/Observable;
 
     move-result-object v0
 
-    new-instance v1, Lcom/discord/stores/StoreApplicationStreaming$getStreamsForGuild$1;
+    new-instance v1, Lcom/discord/stores/StoreApplicationStreaming$getForGuild$1;
 
-    invoke-direct {v1, p0, p1, p2}, Lcom/discord/stores/StoreApplicationStreaming$getStreamsForGuild$1;-><init>(Lcom/discord/stores/StoreApplicationStreaming;J)V
+    invoke-direct {v1, p0, p1, p2}, Lcom/discord/stores/StoreApplicationStreaming$getForGuild$1;-><init>(Lcom/discord/stores/StoreApplicationStreaming;J)V
 
     check-cast v1, Lrx/functions/b;
 
@@ -400,7 +151,7 @@
     return-object p1
 .end method
 
-.method public final getStreamsForUser(J)Lrx/Observable;
+.method public final getForUser(J)Lrx/Observable;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -411,13 +162,13 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/discord/stores/StoreApplicationStreaming;->isInSpectatorExperimentObservable()Lrx/Observable;
+    invoke-virtual {p0}, Lcom/discord/stores/StoreApplicationStreaming;->isInSpectatorExperimentObservable()Lrx/Observable;
 
     move-result-object v0
 
-    new-instance v1, Lcom/discord/stores/StoreApplicationStreaming$getStreamsForUser$1;
+    new-instance v1, Lcom/discord/stores/StoreApplicationStreaming$getForUser$1;
 
-    invoke-direct {v1, p0, p1, p2}, Lcom/discord/stores/StoreApplicationStreaming$getStreamsForUser$1;-><init>(Lcom/discord/stores/StoreApplicationStreaming;J)V
+    invoke-direct {v1, p0, p1, p2}, Lcom/discord/stores/StoreApplicationStreaming$getForUser$1;-><init>(Lcom/discord/stores/StoreApplicationStreaming;J)V
 
     check-cast v1, Lrx/functions/b;
 
@@ -521,350 +272,6 @@
     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;
@@ -886,57 +293,53 @@
 .end method
 
 .method public final handleVoiceStateUpdate(Lcom/discord/models/domain/ModelVoice$State;J)V
-    .locals 18
+    .locals 11
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
-    move-object/from16 v0, p0
+    const-string v0, "voiceState"
 
-    const-string v1, "voiceState"
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-object/from16 v2, p1
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelVoice$State;->getChannelId()Ljava/lang/Long;
 
-    invoke-static {v2, v1}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    move-result-object v0
 
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelVoice$State;->getChannelId()Ljava/lang/Long;
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelVoice$State;->getUserId()J
 
-    move-result-object v1
+    move-result-wide v2
 
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelVoice$State;->getUserId()J
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelVoice$State;->isSelfStream()Z
 
-    move-result-wide v11
-
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelVoice$State;->isSelfStream()Z
-
-    move-result v3
+    move-result p1
 
     const-wide/16 v4, 0x0
 
-    const/4 v6, 0x0
+    const/4 v1, 0x0
 
-    const/4 v13, 0x1
+    const/4 v8, 0x1
 
-    cmp-long v7, p2, v4
+    cmp-long v6, p2, v4
 
-    if-eqz v7, :cond_0
+    if-eqz v6, :cond_0
 
-    const/4 v7, 0x1
+    const/4 v6, 0x1
 
     goto :goto_0
 
     :cond_0
-    const/4 v7, 0x0
+    const/4 v6, 0x0
 
     :goto_0
-    if-eqz v1, :cond_1
+    if-eqz v0, :cond_1
 
-    invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
+    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
-    move-result-wide v8
+    move-result-wide v9
 
-    cmp-long v10, v8, v4
+    cmp-long v7, v9, v4
 
-    if-eqz v10, :cond_1
+    if-eqz v7, :cond_1
 
     const/4 v4, 0x1
 
@@ -946,166 +349,144 @@
     const/4 v4, 0x0
 
     :goto_1
-    if-eqz v3, :cond_3
+    if-eqz p1, :cond_2
 
-    if-eqz v7, :cond_3
+    if-eqz v6, :cond_2
 
-    if-eqz v4, :cond_3
+    if-eqz v4, :cond_2
 
-    iget-object v3, v0, Lcom/discord/stores/StoreApplicationStreaming;->streamsByUser:Ljava/util/HashMap;
+    iget-object p1, p0, Lcom/discord/stores/StoreApplicationStreaming;->streamsByUser:Ljava/util/HashMap;
 
-    move-object v14, v3
+    check-cast p1, Ljava/util/Map;
 
-    check-cast v14, Ljava/util/Map;
+    invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    invoke-static {v11, v12}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    move-result-object v9
 
-    move-result-object v15
+    new-instance v10, Lcom/discord/models/domain/ModelApplicationStream;
 
-    new-instance v9, Lcom/discord/models/domain/ModelApplicationStream;
+    const-string v1, "channelId"
 
-    const-string v3, "channelId"
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v1, v3}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
-    invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
+    move-result-wide v6
 
-    move-result-wide v16
+    move-object v1, v10
 
-    const-string v4, "guild"
+    move-wide v4, p2
 
-    move-object v3, v9
+    invoke-direct/range {v1 .. v7}, Lcom/discord/models/domain/ModelApplicationStream;-><init>(JJJ)V
 
-    move-wide v5, v11
+    invoke-interface {p1, v9, v10}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    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;
+    goto :goto_3
 
     :cond_2
-    :goto_2
-    const/4 v6, 0x1
+    iget-object p1, p0, Lcom/discord/stores/StoreApplicationStreaming;->streamsByUser:Ljava/util/HashMap;
 
-    goto :goto_4
+    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
 
     :cond_3
-    iget-object v1, v0, Lcom/discord/stores/StoreApplicationStreaming;->streamsByUser:Ljava/util/HashMap;
+    const/4 p1, 0x0
 
-    invoke-static {v11, v12}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    :goto_2
+    iget-boolean p2, p0, Lcom/discord/stores/StoreApplicationStreaming;->isDirty:Z
 
-    move-result-object v3
+    if-nez p2, :cond_5
 
-    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
+    if-eqz p1, :cond_4
 
     goto :goto_3
 
     :cond_4
-    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
+    const/4 v8, 0x0
 
     :cond_5
-    :goto_4
-    iput-boolean v6, v0, Lcom/discord/stores/StoreApplicationStreaming;->isDirty:Z
+    :goto_3
+    iput-boolean v8, p0, 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-direct {p0}, Lcom/discord/stores/StoreApplicationStreaming;->isInSpectatorExperiment()Z
+    invoke-virtual {p0}, Lcom/discord/stores/StoreApplicationStreaming;->isInSpectatorExperiment()Z
 
     move-result v0
 
@@ -1136,7 +517,7 @@
 .end method
 
 .method public final onDispatchEnded()V
-    .locals 5
+    .locals 3
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
@@ -1147,33 +528,15 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/discord/stores/StoreApplicationStreaming;->stateSubject:Lrx/subjects/BehaviorSubject;
+    iget-object v0, p0, Lcom/discord/stores/StoreApplicationStreaming;->streamsPublisher:Lrx/subjects/BehaviorSubject;
 
-    new-instance v1, Lcom/discord/stores/StoreApplicationStreaming$State;
+    new-instance v1, 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
+    iget-object v2, p0, Lcom/discord/stores/StoreApplicationStreaming;->streamsByUser:Ljava/util/HashMap;
 
     check-cast v2, Ljava/util/Map;
 
-    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-direct {v1, v2}, Ljava/util/HashMap;-><init>(Ljava/util/Map;)V
 
     invoke-virtual {v0, v1}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
 
@@ -1183,11 +546,3 @@
 
     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
deleted file mode 100644
index 119cf3b7fd..0000000000
--- a/com.discord/smali/com/discord/stores/StoreApplicationStreamingKt.smali
+++ /dev/null
@@ -1,7 +0,0 @@
-.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$Companion.smali b/com.discord/smali/com/discord/stores/StoreAudioManager$MediaEngineAudioManager$Companion.smali
new file mode 100644
index 0000000000..b8698fbfc5
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/StoreAudioManager$MediaEngineAudioManager$Companion.smali
@@ -0,0 +1,137 @@
+.class public final Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Companion;
+.super Ljava/lang/Object;
+.source "StoreAudioManager.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;
+.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/stores/StoreAudioManager$MediaEngineAudioManager$Companion;-><init>()V
+
+    return-void
+.end method
+
+.method public static final synthetic access$extractSettings(Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Companion;Landroid/media/AudioManager;)Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$AudioManagerSettings;
+    .locals 0
+
+    invoke-direct {p0, p1}, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Companion;->extractSettings(Landroid/media/AudioManager;)Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$AudioManagerSettings;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+.method public static final synthetic access$useSettings(Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Companion;Landroid/media/AudioManager;Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$AudioManagerSettings;)V
+    .locals 0
+
+    invoke-direct {p0, p1, p2}, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Companion;->useSettings(Landroid/media/AudioManager;Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$AudioManagerSettings;)V
+
+    return-void
+.end method
+
+.method private final extractSettings(Landroid/media/AudioManager;)Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$AudioManagerSettings;
+    .locals 3
+
+    new-instance v0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$AudioManagerSettings;
+
+    invoke-virtual {p1}, Landroid/media/AudioManager;->isSpeakerphoneOn()Z
+
+    move-result v1
+
+    invoke-virtual {p1}, Landroid/media/AudioManager;->getMode()I
+
+    move-result v2
+
+    invoke-virtual {p1}, Landroid/media/AudioManager;->isBluetoothScoOn()Z
+
+    move-result p1
+
+    invoke-direct {v0, v1, v2, p1}, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$AudioManagerSettings;-><init>(ZIZ)V
+
+    return-object v0
+.end method
+
+.method private final trySetMode(Landroid/media/AudioManager;I)V
+    .locals 0
+
+    :try_start_0
+    invoke-virtual {p1, p2}, Landroid/media/AudioManager;->setMode(I)V
+    :try_end_0
+    .catch Ljava/lang/SecurityException; {:try_start_0 .. :try_end_0} :catch_0
+
+    :catch_0
+    return-void
+.end method
+
+.method private final useSettings(Landroid/media/AudioManager;Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$AudioManagerSettings;)V
+    .locals 1
+
+    invoke-virtual {p2}, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$AudioManagerSettings;->getSettingBluetoothScoOn()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {p1}, Landroid/media/AudioManager;->isBluetoothScoOn()Z
+
+    move-result v0
+
+    if-nez v0, :cond_1
+
+    invoke-virtual {p1}, Landroid/media/AudioManager;->startBluetoothSco()V
+
+    goto :goto_0
+
+    :cond_0
+    invoke-virtual {p1}, Landroid/media/AudioManager;->isBluetoothScoOn()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_1
+
+    invoke-virtual {p1}, Landroid/media/AudioManager;->stopBluetoothSco()V
+
+    :cond_1
+    :goto_0
+    invoke-virtual {p2}, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$AudioManagerSettings;->getSettingSpeakerPhoneOn()Z
+
+    move-result v0
+
+    invoke-virtual {p1, v0}, Landroid/media/AudioManager;->setSpeakerphoneOn(Z)V
+
+    move-object v0, p0
+
+    check-cast v0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Companion;
+
+    invoke-virtual {p2}, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$AudioManagerSettings;->getSettingMode()I
+
+    move-result p2
+
+    invoke-direct {v0, p1, p2}, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Companion;->trySetMode(Landroid/media/AudioManager;I)V
+
+    const/4 p2, 0x1
+
+    invoke-virtual {p1, p2}, Landroid/media/AudioManager;->setBluetoothScoOn(Z)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration.smali b/com.discord/smali/com/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration.smali
index dfe3a94835..e19fe4b5a3 100644
--- a/com.discord/smali/com/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration.smali
+++ b/com.discord/smali/com/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration.smali
@@ -23,103 +23,68 @@
 
 .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/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/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, "streamConnectionState"
+    const-string v0, "outputMode"
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    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-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/StoreAudioManager$MediaEngineAudioManager$Configuration;->connectionState:Lcom/discord/rtcconnection/RtcConnection$State;
 
-    iput-object p2, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->streamConnectionState:Lcom/discord/rtcconnection/RtcConnection$State;
+    iput-object p2, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->outputMode:Lcom/discord/models/domain/ModelVoice$OutputMode;
 
-    iput-object p3, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->outputMode:Lcom/discord/models/domain/ModelVoice$OutputMode;
+    iput-object p3, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->audioOutputState:Lcom/discord/utilities/media/AudioOutputState;
 
-    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
+    iput p4, 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/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
+.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
 
-    and-int/lit8 p7, p6, 0x1
+    and-int/lit8 p6, p5, 0x1
 
-    if-eqz p7, :cond_0
+    if-eqz p6, :cond_0
 
     iget-object p1, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->connectionState:Lcom/discord/rtcconnection/RtcConnection$State;
 
     :cond_0
-    and-int/lit8 p7, p6, 0x2
+    and-int/lit8 p6, p5, 0x2
 
-    if-eqz p7, :cond_1
+    if-eqz p6, :cond_1
 
-    iget-object p2, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->streamConnectionState:Lcom/discord/rtcconnection/RtcConnection$State;
+    iget-object p2, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->outputMode:Lcom/discord/models/domain/ModelVoice$OutputMode;
 
     :cond_1
-    move-object p7, p2
+    and-int/lit8 p6, p5, 0x4
 
-    and-int/lit8 p2, p6, 0x4
+    if-eqz p6, :cond_2
 
-    if-eqz p2, :cond_2
-
-    iget-object p3, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->outputMode:Lcom/discord/models/domain/ModelVoice$OutputMode;
+    iget-object p3, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->audioOutputState:Lcom/discord/utilities/media/AudioOutputState;
 
     :cond_2
-    move-object v0, p3
+    and-int/lit8 p5, p5, 0x8
 
-    and-int/lit8 p2, p6, 0x8
+    if-eqz p5, :cond_3
 
-    if-eqz p2, :cond_3
-
-    iget-object p4, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->audioOutputState:Lcom/discord/utilities/media/AudioOutputState;
+    iget p4, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->audioMode:I
 
     :cond_3
-    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;
+    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-result-object p0
 
@@ -136,15 +101,7 @@
     return-object v0
 .end method
 
-.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;
+.method public final component2()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;
@@ -152,7 +109,7 @@
     return-object v0
 .end method
 
-.method public final component4()Lcom/discord/utilities/media/AudioOutputState;
+.method public final component3()Lcom/discord/utilities/media/AudioOutputState;
     .locals 1
 
     iget-object v0, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->audioOutputState:Lcom/discord/utilities/media/AudioOutputState;
@@ -160,7 +117,7 @@
     return-object v0
 .end method
 
-.method public final component5()I
+.method public final component4()I
     .locals 1
 
     iget v0, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->audioMode:I
@@ -168,40 +125,24 @@
     return v0
 .end method
 
-.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
+.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
 
     const-string v0, "connectionState"
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v0, "streamConnectionState"
+    const-string v0, "outputMode"
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v0, "outputMode"
+    const-string v0, "audioOutputState"
 
     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;
 
-    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
+    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
 
     return-object v0
 .end method
@@ -231,16 +172,6 @@
 
     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;
@@ -319,14 +250,6 @@
     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
 
@@ -348,7 +271,7 @@
     :goto_0
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v2, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->streamConnectionState:Lcom/discord/rtcconnection/RtcConnection$State;
+    iget-object v2, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->outputMode:Lcom/discord/models/domain/ModelVoice$OutputMode;
 
     if-eqz v2, :cond_1
 
@@ -366,33 +289,15 @@
 
     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;->audioOutputState:Lcom/discord/utilities/media/AudioOutputState;
 
     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/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
+    :cond_2
     add-int/2addr v0, v1
 
     mul-int/lit8 v0, v0, 0x1f
@@ -421,14 +326,6 @@
 
     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 c7ccfeceba..91cdb66097 100644
--- a/com.discord/smali/com/discord/stores/StoreAudioManager$MediaEngineAudioManager.smali
+++ b/com.discord/smali/com/discord/stores/StoreAudioManager$MediaEngineAudioManager.smali
@@ -16,11 +16,16 @@
 .annotation system Ldalvik/annotation/MemberClasses;
     value = {
         Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;,
-        Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$AudioManagerSettings;
+        Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$AudioManagerSettings;,
+        Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Companion;
     }
 .end annotation
 
 
+# static fields
+.field public static final Companion:Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Companion;
+
+
 # instance fields
 .field private final audioManager:Landroid/media/AudioManager;
 
@@ -28,6 +33,20 @@
 
 
 # direct methods
+.method static constructor <clinit>()V
+    .locals 2
+
+    new-instance v0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Companion;
+
+    const/4 v1, 0x0
+
+    invoke-direct {v0, v1}, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    sput-object v0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;->Companion:Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Companion;
+
+    return-void
+.end method
+
 .method public constructor <init>(Landroid/content/Context;)V
     .locals 1
 
@@ -57,111 +76,10 @@
     return-void
 .end method
 
-.method private final extractSettings(Landroid/media/AudioManager;)Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$AudioManagerSettings;
-    .locals 3
-
-    new-instance v0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$AudioManagerSettings;
-
-    invoke-virtual {p1}, Landroid/media/AudioManager;->isSpeakerphoneOn()Z
-
-    move-result v1
-
-    invoke-virtual {p1}, Landroid/media/AudioManager;->getMode()I
-
-    move-result v2
-
-    invoke-virtual {p1}, Landroid/media/AudioManager;->isBluetoothScoOn()Z
-
-    move-result p1
-
-    invoke-direct {v0, v1, v2, p1}, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$AudioManagerSettings;-><init>(ZIZ)V
-
-    return-object v0
-.end method
-
-.method private final trySetMode(Landroid/media/AudioManager;I)V
-    .locals 0
-
-    :try_start_0
-    invoke-virtual {p1, p2}, Landroid/media/AudioManager;->setMode(I)V
-    :try_end_0
-    .catch Ljava/lang/SecurityException; {:try_start_0 .. :try_end_0} :catch_0
-
-    :catch_0
-    return-void
-.end method
-
-.method private final useSettings(Landroid/media/AudioManager;Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$AudioManagerSettings;)V
-    .locals 1
-
-    invoke-virtual {p2}, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$AudioManagerSettings;->getSettingBluetoothScoOn()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    invoke-virtual {p1}, Landroid/media/AudioManager;->isBluetoothScoOn()Z
-
-    move-result v0
-
-    if-nez v0, :cond_1
-
-    invoke-virtual {p1}, Landroid/media/AudioManager;->startBluetoothSco()V
-
-    goto :goto_0
-
-    :cond_0
-    invoke-virtual {p1}, Landroid/media/AudioManager;->isBluetoothScoOn()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_1
-
-    invoke-virtual {p1}, Landroid/media/AudioManager;->stopBluetoothSco()V
-
-    :cond_1
-    :goto_0
-    invoke-virtual {p2}, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$AudioManagerSettings;->getSettingSpeakerPhoneOn()Z
-
-    move-result v0
-
-    invoke-virtual {p1, v0}, Landroid/media/AudioManager;->setSpeakerphoneOn(Z)V
-
-    invoke-virtual {p2}, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$AudioManagerSettings;->getSettingMode()I
-
-    move-result v0
-
-    invoke-direct {p0, p1, v0}, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;->trySetMode(Landroid/media/AudioManager;I)V
-
-    invoke-virtual {p2}, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$AudioManagerSettings;->getSettingBluetoothScoOn()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_2
-
-    invoke-virtual {p2}, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$AudioManagerSettings;->getSettingSpeakerPhoneOn()Z
-
-    move-result p2
-
-    if-nez p2, :cond_2
-
-    const/4 p2, 0x1
-
-    goto :goto_1
-
-    :cond_2
-    const/4 p2, 0x0
-
-    :goto_1
-    invoke-virtual {p1, p2}, Landroid/media/AudioManager;->setBluetoothScoOn(Z)V
-
-    return-void
-.end method
-
 
 # virtual methods
 .method public final configure(Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;)V
-    .locals 7
+    .locals 6
 
     const-string v0, "configuration"
 
@@ -178,29 +96,27 @@
 
     move-result-object v0
 
-    invoke-virtual {p1}, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->component2()Lcom/discord/rtcconnection/RtcConnection$State;
+    invoke-virtual {p1}, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->component2()Lcom/discord/models/domain/ModelVoice$OutputMode;
 
     move-result-object v1
 
-    invoke-virtual {p1}, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->component3()Lcom/discord/models/domain/ModelVoice$OutputMode;
+    invoke-virtual {p1}, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->component3()Lcom/discord/utilities/media/AudioOutputState;
 
     move-result-object v2
 
-    invoke-virtual {p1}, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->component4()Lcom/discord/utilities/media/AudioOutputState;
+    sget-object v3, Lcom/discord/rtcconnection/RtcConnection$State$f;->zw:Lcom/discord/rtcconnection/RtcConnection$State$f;
 
-    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
+    if-ne v0, v3, :cond_5
 
     iget-object v0, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;->initialAudioManagerSettings:Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$AudioManagerSettings;
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;->audioManager:Landroid/media/AudioManager;
+    sget-object v0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;->Companion:Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Companion;
 
-    invoke-direct {p0, v0}, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;->extractSettings(Landroid/media/AudioManager;)Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$AudioManagerSettings;
+    iget-object v3, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;->audioManager:Landroid/media/AudioManager;
+
+    invoke-static {v0, v3}, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Companion;->access$extractSettings(Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Companion;Landroid/media/AudioManager;)Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$AudioManagerSettings;
 
     move-result-object v0
 
@@ -209,103 +125,83 @@
 
     sget-object v0, Lcom/discord/models/domain/ModelVoice$OutputMode;->SPEAKER:Lcom/discord/models/domain/ModelVoice$OutputMode;
 
+    const/4 v3, 0x1
+
     const/4 v4, 0x0
 
-    const/4 v5, 0x1
+    if-ne v1, v0, :cond_2
 
-    if-eq v2, v0, :cond_3
-
-    instance-of v0, v1, Lcom/discord/rtcconnection/RtcConnection$State$f;
-
-    if-eqz v0, :cond_2
+    const/4 v0, 0x1
 
     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
-
-    iget-object v1, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;->audioManager:Landroid/media/AudioManager;
-
     invoke-virtual {p1}, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->getAudioMode()I
 
     move-result p1
 
-    const/4 v2, 0x2
+    const/4 v1, 0x2
 
-    const/4 v6, 0x3
+    const/4 v5, 0x3
 
-    if-eq p1, v2, :cond_4
+    if-eq p1, v1, :cond_3
+
+    goto :goto_1
+
+    :cond_3
+    const/4 v5, 0x2
+
+    :goto_1
+    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
 
     goto :goto_2
 
     :cond_4
-    const/4 v6, 0x2
+    const/4 v3, 0x0
 
     :goto_2
-    invoke-virtual {v1, v6}, Landroid/media/AudioManager;->setMode(I)V
+    sget-object p1, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;->Companion:Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Companion;
 
-    if-nez v0, :cond_5
+    iget-object v1, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;->audioManager:Landroid/media/AudioManager;
 
-    invoke-virtual {v3}, Lcom/discord/utilities/media/AudioOutputState;->isBluetoothHeadsetDisconnected()Z
+    new-instance v2, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$AudioManagerSettings;
 
-    move-result p1
+    invoke-direct {v2, v0, v5, v3}, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$AudioManagerSettings;-><init>(ZIZ)V
 
-    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;
-
-    invoke-virtual {p1}, Landroid/media/AudioManager;->isBluetoothScoOn()Z
-
-    move-result p1
-
-    if-nez p1, :cond_8
-
-    iget-object p1, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;->audioManager:Landroid/media/AudioManager;
-
-    invoke-virtual {p1, v5}, Landroid/media/AudioManager;->setBluetoothScoOn(Z)V
-
-    iget-object p1, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;->audioManager:Landroid/media/AudioManager;
-
-    invoke-virtual {p1}, Landroid/media/AudioManager;->startBluetoothSco()V
+    invoke-static {p1, v1, v2}, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Companion;->access$useSettings(Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Companion;Landroid/media/AudioManager;Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$AudioManagerSettings;)V
 
     return-void
 
-    :cond_6
+    :cond_5
     iget-object p1, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;->initialAudioManagerSettings:Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$AudioManagerSettings;
 
-    if-eqz p1, :cond_7
+    if-eqz p1, :cond_6
 
-    iget-object v0, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;->audioManager:Landroid/media/AudioManager;
+    sget-object v0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;->Companion:Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Companion;
 
-    invoke-direct {p0, v0, p1}, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;->useSettings(Landroid/media/AudioManager;Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$AudioManagerSettings;)V
+    iget-object v1, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;->audioManager:Landroid/media/AudioManager;
 
-    :cond_7
+    invoke-static {v0, v1, p1}, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Companion;->access$useSettings(Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Companion;Landroid/media/AudioManager;Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$AudioManagerSettings;)V
+
+    :cond_6
     const/4 p1, 0x0
 
     iput-object p1, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;->initialAudioManagerSettings:Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$AudioManagerSettings;
 
-    :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 7667231b2e..8f614be2a4 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/Function5;
+.implements Lkotlin/jvm/functions/Function4;
 
 
 # annotations
@@ -19,8 +19,7 @@
 .annotation system Ldalvik/annotation/Signature;
     value = {
         "Lkotlin/jvm/internal/j;",
-        "Lkotlin/jvm/functions/Function5<",
-        "Lcom/discord/rtcconnection/RtcConnection$State;",
+        "Lkotlin/jvm/functions/Function4<",
         "Lcom/discord/rtcconnection/RtcConnection$State;",
         "Lcom/discord/models/domain/ModelVoice$OutputMode;",
         "Lcom/discord/utilities/media/AudioOutputState;",
@@ -51,7 +50,7 @@
 .method constructor <init>()V
     .locals 1
 
-    const/4 v0, 0x5
+    const/4 v0, 0x4
 
     invoke-direct {p0, v0}, Lkotlin/jvm/internal/j;-><init>(I)V
 
@@ -83,13 +82,13 @@
 .method public final getSignature()Ljava/lang/String;
     .locals 1
 
-    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"
+    const-string v0, "<init>(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/rtcconnection/RtcConnection$State;Lcom/discord/models/domain/ModelVoice$OutputMode;Lcom/discord/utilities/media/AudioOutputState;I)Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;
-    .locals 7
+.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
 
     const-string v0, "p1"
 
@@ -103,57 +102,29 @@
 
     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;
 
-    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
+    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
 
     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;)Ljava/lang/Object;
-    .locals 6
+.method public final synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
 
-    move-object v1, p1
+    check-cast p1, Lcom/discord/rtcconnection/RtcConnection$State;
 
-    check-cast v1, Lcom/discord/rtcconnection/RtcConnection$State;
+    check-cast p2, Lcom/discord/models/domain/ModelVoice$OutputMode;
 
-    move-object v2, p2
+    check-cast p3, Lcom/discord/utilities/media/AudioOutputState;
 
-    check-cast v2, Lcom/discord/rtcconnection/RtcConnection$State;
+    check-cast p4, Ljava/lang/Number;
 
-    move-object v3, p3
+    invoke-virtual {p4}, Ljava/lang/Number;->intValue()I
 
-    check-cast v3, Lcom/discord/models/domain/ModelVoice$OutputMode;
+    move-result p4
 
-    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;
+    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-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 fe16faec28..16ce601552 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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
new file mode 100644
index 0000000000..79b8f403b2
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/StoreAudioManager$sam$rx_functions_Func4$0.smali
@@ -0,0 +1,36 @@
+.class final Lcom/discord/stores/StoreAudioManager$sam$rx_functions_Func4$0;
+.super Ljava/lang/Object;
+.source "StoreAudioManager.kt"
+
+# interfaces
+.implements Lrx/functions/Func4;
+
+
+# instance fields
+.field private final synthetic function:Lkotlin/jvm/functions/Function4;
+
+
+# direct methods
+.method constructor <init>(Lkotlin/jvm/functions/Function4;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lcom/discord/stores/StoreAudioManager$sam$rx_functions_Func4$0;->function:Lkotlin/jvm/functions/Function4;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final synthetic call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/stores/StoreAudioManager$sam$rx_functions_Func4$0;->function:Lkotlin/jvm/functions/Function4;
+
+    invoke-interface {v0, p1, p2, p3, p4}, Lkotlin/jvm/functions/Function4;->invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/stores/StoreAudioManager$sam$rx_functions_Func5$0.smali b/com.discord/smali/com/discord/stores/StoreAudioManager$sam$rx_functions_Func5$0.smali
deleted file mode 100644
index 824ec6f22a..0000000000
--- a/com.discord/smali/com/discord/stores/StoreAudioManager$sam$rx_functions_Func5$0.smali
+++ /dev/null
@@ -1,46 +0,0 @@
-.class final Lcom/discord/stores/StoreAudioManager$sam$rx_functions_Func5$0;
-.super Ljava/lang/Object;
-.source "StoreAudioManager.kt"
-
-# interfaces
-.implements Lrx/functions/Func5;
-
-
-# instance fields
-.field private final synthetic function:Lkotlin/jvm/functions/Function5;
-
-
-# direct methods
-.method constructor <init>(Lkotlin/jvm/functions/Function5;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lcom/discord/stores/StoreAudioManager$sam$rx_functions_Func5$0;->function:Lkotlin/jvm/functions/Function5;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final synthetic call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 6
-
-    iget-object v0, p0, Lcom/discord/stores/StoreAudioManager$sam$rx_functions_Func5$0;->function:Lkotlin/jvm/functions/Function5;
-
-    move-object v1, p1
-
-    move-object v2, p2
-
-    move-object v3, p3
-
-    move-object v4, p4
-
-    move-object v5, p5
-
-    invoke-interface/range {v0 .. v5}, Lkotlin/jvm/functions/Function5;->invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    return-object p1
-.end method
diff --git a/com.discord/smali/com/discord/stores/StoreAudioManager.smali b/com.discord/smali/com/discord/stores/StoreAudioManager.smali
index b622576e50..09970a5eef 100644
--- a/com.discord/smali/com/discord/stores/StoreAudioManager.smali
+++ b/com.discord/smali/com/discord/stores/StoreAudioManager.smali
@@ -16,11 +16,9 @@
 
 .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;Lcom/discord/stores/StoreStreamRtcConnection;)V
+.method public constructor <init>(Lcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreRtcConnection;)V
     .locals 1
 
     const-string v0, "mediaSettings"
@@ -31,18 +29,12 @@
 
     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
 
@@ -65,50 +57,42 @@
 
     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 p1, p0, Lcom/discord/stores/StoreAudioManager;->streamRtcConnectionStore:Lcom/discord/stores/StoreStreamRtcConnection;
+    iget-object v2, p0, Lcom/discord/stores/StoreAudioManager;->mediaSettings:Lcom/discord/stores/StoreMediaSettings;
 
-    invoke-virtual {p1}, Lcom/discord/stores/StoreStreamRtcConnection;->getRtcConnectionState()Lrx/Observable;
+    invoke-virtual {v2}, Lcom/discord/stores/StoreMediaSettings;->getAudioOutputState()Lrx/Observable;
 
     move-result-object v2
 
-    iget-object p1, p0, Lcom/discord/stores/StoreAudioManager;->mediaSettings:Lcom/discord/stores/StoreMediaSettings;
+    iget-object v3, p0, Lcom/discord/stores/StoreAudioManager;->mediaSettings:Lcom/discord/stores/StoreMediaSettings;
 
-    invoke-virtual {p1}, Lcom/discord/stores/StoreMediaSettings;->getOutputMode()Lrx/Observable;
+    invoke-virtual {v3}, Lcom/discord/stores/StoreMediaSettings;->getAudioMode()Lrx/Observable;
 
     move-result-object v3
 
-    iget-object p1, p0, Lcom/discord/stores/StoreAudioManager;->mediaSettings:Lcom/discord/stores/StoreMediaSettings;
+    sget-object v4, Lcom/discord/stores/StoreAudioManager$init$1;->INSTANCE:Lcom/discord/stores/StoreAudioManager$init$1;
 
-    invoke-virtual {p1}, Lcom/discord/stores/StoreMediaSettings;->getAudioOutputState()Lrx/Observable;
+    check-cast v4, Lkotlin/jvm/functions/Function4;
 
-    move-result-object v4
+    if-eqz v4, :cond_0
 
-    iget-object p1, p0, Lcom/discord/stores/StoreAudioManager;->mediaSettings:Lcom/discord/stores/StoreMediaSettings;
+    new-instance v5, Lcom/discord/stores/StoreAudioManager$sam$rx_functions_Func4$0;
 
-    invoke-virtual {p1}, Lcom/discord/stores/StoreMediaSettings;->getAudioMode()Lrx/Observable;
+    invoke-direct {v5, v4}, Lcom/discord/stores/StoreAudioManager$sam$rx_functions_Func4$0;-><init>(Lkotlin/jvm/functions/Function4;)V
 
-    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
+    move-object v4, v5
 
     :cond_0
-    move-object v6, p1
+    check-cast v4, Lrx/functions/Func4;
 
-    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;
+    invoke-static {p1, v1, v2, v3, v4}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func4;)Lrx/Observable;
 
     move-result-object p1
 
@@ -120,7 +104,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 ebc5c02928..faf264bd19 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 82e2741142..74cdaf68f4 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 371be44bd9..e48b0019f6 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 51c38c1e43..c0d8298e03 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 ba466f1ad0..962529c32f 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 f1ba7530c6..81b84b37e8 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 bef1d0ca15..89b2195bf7 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 8bb6792596..7bc5ce9b7f 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 322dcf7dee..03362097d8 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 351a425de3..86fd11f02d 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;->Kz()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kx()Lrx/subjects/BehaviorSubject;
 
     move-result-object p1
 
@@ -1340,7 +1340,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 f66725cf99..40fdc02c58 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 2aa3b958d1..3a5827f0f3 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 151fcee92c..e383a656e2 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 5533e00e46..78f961eab1 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 7b310c2a2c..698b397549 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 e1592ae83f..3b8a549b77 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 c7b44f8753..8fbacc746f 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 8d0a3ad8b2..78168b02f9 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;->KA()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->Ky()Lrx/subjects/PublishSubject;
 
     move-result-object v0
 
@@ -93,7 +93,7 @@
 
     new-instance v0, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kx()Lrx/subjects/BehaviorSubject;
 
     move-result-object v1
 
@@ -105,7 +105,7 @@
 
     new-instance v0, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kx()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;->IV()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/subjects/SerializedSubject;->IT()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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 a78e0bedcc..a494c3cfb5 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 30fe44e4ff..5429661f41 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 bd6387eeb5..eef7d93ad1 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 750f8f7ba7..31c07fe65c 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 b397ee5e2d..abe1c92b68 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 d212b4a8bf..ed468df6c7 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 e11055573d..d707de9b59 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 c379087edc..e7937efb65 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 3af76cf211..7da4541f8c 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 b0e09a3153..b7ea8457e1 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 76a20857de..d7c7c96689 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 d70e1169ef..22be6af281 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;->Kz()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kx()Lrx/subjects/BehaviorSubject;
 
     move-result-object v0
 
@@ -424,7 +424,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->IV()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->IT()Lrx/Observable;
 
     move-result-object v1
 
@@ -492,7 +492,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 0741cb549e..eab779453b 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 cdea5b21a6..bd0be6984a 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 daded7fa58..046cfdaf0f 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 1e8f63a837..9f8250fb70 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, 0x7f1203c5
+    const v4, 0x7f1203a0
 
     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, 0x7f1203c6
+    const p2, 0x7f1203a1
 
     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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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, 0x7f1203c6
+    const v0, 0x7f1203a1
 
     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 34f4438f24..876f0a3b1b 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object p2
 
@@ -360,7 +360,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 bdebaed626..d3f86576cd 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 7d81917113..63029e53c5 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;->vm:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vn: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 90b2e58756..1a6ffcd360 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 73a1c3bb55..ac59705953 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, 0x7f12116b
+    const v0, 0x7f1210df
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -120,7 +120,7 @@
     goto :goto_0
 
     :cond_2
-    const v0, 0x7f12116c
+    const v0, 0x7f1210e0
 
     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 40dac7e5ff..a0dcd90c50 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;->KA()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->Ky()Lrx/subjects/PublishSubject;
 
     move-result-object p1
 
@@ -163,7 +163,7 @@
 
     move-result-object p1
 
-    sget-object p2, Lcom/discord/app/i;->vO:Lcom/discord/app/i;
+    sget-object p2, Lcom/discord/app/i;->vP: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;->vm:Lcom/discord/app/AppLog;
+    sget-object v5, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
 
     new-instance v0, Ljava/lang/StringBuilder;
 
@@ -1195,7 +1195,7 @@
 
     move-result-object p3
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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;->bgy:Lkotlin/Unit;
+    sget-object v1, Lkotlin/Unit;->bgt: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 35f58580cb..7161bb3f4a 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;->bKX:Lrx/internal/a/ba;
+    sget-object v0, Lrx/internal/a/ba$a;->bKS: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 0711590de5..5494e7d9c9 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;->bKX:Lrx/internal/a/ba;
+    sget-object v1, Lrx/internal/a/ba$a;->bKS: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 9e25a992e0..7d46e3cd78 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 7d24cb072b..b7e8dfb97a 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -79,12 +79,12 @@
 
     if-eqz p1, :cond_0
 
-    const p1, 0x7f1203b1
+    const p1, 0x7f12038c
 
     goto :goto_0
 
     :cond_0
-    const p1, 0x7f1203d6
+    const p1, 0x7f1203b1
 
     :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 fc546fec67..859e9802de 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;->IV()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->IT()Lrx/Observable;
 
     move-result-object v0
 
@@ -750,7 +750,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object p2
 
@@ -958,7 +958,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object p2
 
@@ -995,7 +995,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -1031,7 +1031,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -1136,7 +1136,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 70c9b72168..0ba25bd5ef 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 76f004536f..5ac969c234 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 10d6a61f99..8f1035d1a9 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 179f473d65..93523066e3 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 276448738c..c59696253e 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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, "/2131231400"
+    const-string v1, "/2131231388"
 
     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 0141b7df49..8e461db2a2 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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;->vm:Lcom/discord/app/AppLog;
+    sget-object v12, Lcom/discord/app/AppLog;->vn: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 53d3bc0168..cdcf9d3103 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 18ab2fc953..51d4bf8a1a 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 c562ed792f..04d0b22616 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 c3a89089a5..d8014fa243 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 0e7611686c..f5c91265ab 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 4b2c807e29..88d1632535 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;->Kz()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kx()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;->bhP:Lkotlin/properties/a;
+    sget-object p1, Lkotlin/properties/a;->bhK: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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 47c2cf8af7..706797b411 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 420409ae93..375223c550 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;->Kz()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kx()Lrx/subjects/BehaviorSubject;
 
     move-result-object v1
 
@@ -234,7 +234,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -313,7 +313,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 28d3236b50..db0ef578d3 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 b2f21b2b55..84d273b2ad 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 a077ab705d..619c2fb12d 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, 0x3ce
+    const/16 v0, 0x3cf
 
     iput v0, p0, Lcom/discord/stores/StoreClientVersion;->clientVersion:I
 
@@ -149,7 +149,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 2440019c09..826d55b571 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 61b6e5014b..59cf458f5c 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;->aRc:Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;
+    iget-object v1, p1, Lcom/google/firebase/dynamiclinks/PendingDynamicLinkData;->aQY:Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;
 
     if-eqz v1, :cond_0
 
-    iget-object p1, p1, Lcom/google/firebase/dynamiclinks/PendingDynamicLinkData;->aRc:Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;
+    iget-object p1, p1, Lcom/google/firebase/dynamiclinks/PendingDynamicLinkData;->aQY:Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;
 
-    iget-object p1, p1, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->aEv:Ljava/lang/String;
+    iget-object p1, p1, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->aEr: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 d5c2a2fb8b..e0904509ea 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;->Ab()Lcom/google/firebase/dynamiclinks/a;
+    invoke-static {}, Lcom/google/firebase/dynamiclinks/a;->zZ()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 83a3d873bb..f841da4428 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 b48b38ce95..9bec210981 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;->xd:Lcom/discord/app/a/a;
+    sget-object v0, Lcom/discord/app/a/a;->xf: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;->xd:Lcom/discord/app/a/a;
+    sget-object v0, Lcom/discord/app/a/a;->xf: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 621e0173d1..97a9a3de6c 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 f9e43c3301..34ee6e5bee 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;->bGh:Lrx/Emitter$a;
+    sget-object p1, Lrx/Emitter$a;->bGc: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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 97f687fbd2..9ceedfee9b 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 7288536d7f..13a6e95a74 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 6fcbec1db3..e0d27fbc90 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 9e92bed00d..92c9c31224 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 471cbc5b8a..80128e06f0 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 3c4e1991b9..ae76215e75 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 335b046767..776d837526 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 98cf17a68b..ae7ef8f1fd 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 831bb3740a..bafa3e45e7 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 a747ebd9b6..293f18d5f6 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 644357751d..75462e793f 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 df47c41d41..ee221ddbc9 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 0d253f0d5d..fafca17763 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 de12a48887..e8bea5819e 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 be22413e48..7a8373b893 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 b21b5f15af..f37323a647 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 71738a67a6..f2f6a6be1b 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 c51b0838bf..eadc2ac025 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 4a0f03cf9c..ea5780a3e8 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 51e71b4c38..1b30653402 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 8588d34611..faf107b25a 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 2d6598b351..2873d66d1c 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 f55569e370..7e8a24c5a2 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 4c265a1730..daa9dd79b5 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 3df796bc40..e8c1651140 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object p2
 
@@ -896,7 +896,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 036f985fbc..8918fc85fd 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 71fa53574b..399f31bedc 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;->vI:Lcom/discord/app/g;
+    sget-object v2, Lcom/discord/app/g;->vJ: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/StoreGatewayConnectionKt$sam$rx_functions_Func4$0;
+    new-instance v4, Lcom/discord/stores/StoreGatewayConnection$sam$rx_functions_Func4$0;
 
-    invoke-direct {v4, v3}, Lcom/discord/stores/StoreGatewayConnectionKt$sam$rx_functions_Func4$0;-><init>(Lkotlin/jvm/functions/Function4;)V
+    invoke-direct {v4, v3}, Lcom/discord/stores/StoreGatewayConnection$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 f945852703..4d25e5c715 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 b74340355d..40318c9d9a 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 9b9294c008..440d38c185 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 678a09a3c6..be05d2e392 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGatewayConnectionKt$sam$rx_functions_Func4$0.smali b/com.discord/smali/com/discord/stores/StoreGatewayConnection$sam$rx_functions_Func4$0.smali
similarity index 79%
rename from com.discord/smali/com/discord/stores/StoreGatewayConnectionKt$sam$rx_functions_Func4$0.smali
rename to com.discord/smali/com/discord/stores/StoreGatewayConnection$sam$rx_functions_Func4$0.smali
index 61eca8bc11..e17f0d265c 100644
--- a/com.discord/smali/com/discord/stores/StoreGatewayConnectionKt$sam$rx_functions_Func4$0.smali
+++ b/com.discord/smali/com/discord/stores/StoreGatewayConnection$sam$rx_functions_Func4$0.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/stores/StoreGatewayConnectionKt$sam$rx_functions_Func4$0;
+.class final Lcom/discord/stores/StoreGatewayConnection$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/StoreGatewayConnectionKt$sam$rx_functions_Func4$0;->function:Lkotlin/jvm/functions/Function4;
+    iput-object p1, p0, Lcom/discord/stores/StoreGatewayConnection$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/StoreGatewayConnectionKt$sam$rx_functions_Func4$0;->function:Lkotlin/jvm/functions/Function4;
+    iget-object v0, p0, Lcom/discord/stores/StoreGatewayConnection$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/StoreGatewayConnection$streamDelete$1.smali b/com.discord/smali/com/discord/stores/StoreGatewayConnection$streamDelete$1.smali
deleted file mode 100644
index dd205c7c5e..0000000000
--- a/com.discord/smali/com/discord/stores/StoreGatewayConnection$streamDelete$1.smali
+++ /dev/null
@@ -1,73 +0,0 @@
-.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
deleted file mode 100644
index 6ec40023ce..0000000000
--- a/com.discord/smali/com/discord/stores/StoreGatewayConnection$streamWatch$1.smali
+++ /dev/null
@@ -1,73 +0,0 @@
-.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 134eee02f1..4a6b15b989 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 6906aa7506..d51e550ebe 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 b8398d1d1e..5e189e0340 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 bd41cd7582..58b8550be8 100644
--- a/com.discord/smali/com/discord/stores/StoreGatewayConnection.smali
+++ b/com.discord/smali/com/discord/stores/StoreGatewayConnection.smali
@@ -403,50 +403,6 @@
 
 .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 = {
@@ -629,7 +585,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kx()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -641,7 +597,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kx()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -653,7 +609,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kx()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -665,7 +621,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kx()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -677,7 +633,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kx()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -689,7 +645,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kx()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -701,7 +657,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kx()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -713,7 +669,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/PublishSubject;->KA()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->Ky()Lrx/subjects/PublishSubject;
 
     move-result-object p2
 
@@ -725,7 +681,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/PublishSubject;->KA()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->Ky()Lrx/subjects/PublishSubject;
 
     move-result-object p2
 
@@ -737,7 +693,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kx()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -749,7 +705,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kx()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -761,7 +717,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kx()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -773,7 +729,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kx()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -785,7 +741,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kx()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -797,7 +753,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kx()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -809,7 +765,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kx()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -821,7 +777,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kx()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -833,7 +789,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/PublishSubject;->KA()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->Ky()Lrx/subjects/PublishSubject;
 
     move-result-object p2
 
@@ -845,7 +801,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kx()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -857,7 +813,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kx()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -869,7 +825,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kx()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -881,7 +837,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kx()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -893,7 +849,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kx()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -905,7 +861,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kx()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -917,7 +873,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kx()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -929,7 +885,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kx()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -941,7 +897,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kx()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -953,7 +909,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kx()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -965,7 +921,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kx()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -977,7 +933,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kx()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -989,7 +945,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kx()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -1001,7 +957,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kx()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -1013,7 +969,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kx()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -1025,7 +981,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kx()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -1037,7 +993,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kx()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -1049,7 +1005,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kx()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -1061,7 +1017,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kx()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -1073,7 +1029,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kx()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -1085,7 +1041,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kx()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -1097,7 +1053,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kx()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -1109,7 +1065,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kx()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -1121,7 +1077,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kx()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -1133,7 +1089,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kx()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -1143,54 +1099,6 @@
 
     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
 
@@ -1272,7 +1180,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/discord/app/App;->uw:Lcom/discord/app/App$a;
+    sget-object v1, Lcom/discord/app/App;->ux:Lcom/discord/app/App$a;
 
     invoke-static {}, Lcom/discord/app/App;->dx()Z
 
@@ -1294,7 +1202,7 @@
     move-object v12, v1
 
     :goto_0
-    sget-object v1, Lcom/discord/app/App;->uw:Lcom/discord/app/App$a;
+    sget-object v1, Lcom/discord/app/App;->ux:Lcom/discord/app/App$a;
 
     invoke-static {}, Lcom/discord/app/App;->dx()Z
 
@@ -1331,7 +1239,7 @@
 
     iget-object v7, p0, Lcom/discord/stores/StoreGatewayConnection;->scheduler:Lrx/Scheduler;
 
-    sget-object v2, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
+    sget-object v2, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
 
     move-object v8, v2
 
@@ -1762,7 +1670,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreGatewayConnection;->connected:Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -1790,7 +1698,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreGatewayConnection;->connectionReady:Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -2236,74 +2144,6 @@
     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;
@@ -2557,21 +2397,6 @@
     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
@@ -2580,9 +2405,9 @@
 
     if-eqz p1, :cond_1
 
-    goto/16 :goto_0
+    goto :goto_0
 
-    :sswitch_2
+    :sswitch_1
     const-string v0, "VOICE_SERVER_UPDATE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2597,7 +2422,7 @@
 
     return-void
 
-    :sswitch_3
+    :sswitch_2
     const-string v0, "VOICE_STATE_UPDATE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2612,7 +2437,7 @@
 
     return-void
 
-    :sswitch_4
+    :sswitch_3
     const-string v0, "PRESENCES_REPLACE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2627,22 +2452,7 @@
 
     return-void
 
-    :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
+    :sswitch_4
     const-string v0, "GUILD_BAN_REMOVE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2657,22 +2467,7 @@
 
     return-void
 
-    :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
+    :sswitch_5
     const-string v0, "MESSAGE_UPDATE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2687,7 +2482,7 @@
 
     return-void
 
-    :sswitch_9
+    :sswitch_6
     const-string v0, "GUILD_ROLE_DELETE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2702,7 +2497,7 @@
 
     return-void
 
-    :sswitch_a
+    :sswitch_7
     const-string p2, "USER_CONNECTIONS_UPDATE"
 
     invoke-virtual {p1, p2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2713,13 +2508,13 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->userConnectionUpdate:Lrx/subjects/SerializedSubject;
 
-    sget-object p2, Lkotlin/Unit;->bgy:Lkotlin/Unit;
+    sget-object p2, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     invoke-virtual {p1, p2}, Lrx/subjects/SerializedSubject;->onNext(Ljava/lang/Object;)V
 
     return-void
 
-    :sswitch_b
+    :sswitch_8
     const-string v0, "GUILD_ROLE_CREATE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2735,7 +2530,7 @@
 
     return-void
 
-    :sswitch_c
+    :sswitch_9
     const-string v0, "USER_GUILD_SETTINGS_UPDATE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2750,7 +2545,7 @@
 
     return-void
 
-    :sswitch_d
+    :sswitch_a
     const-string v0, "MESSAGE_ACK"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2765,7 +2560,7 @@
 
     return-void
 
-    :sswitch_e
+    :sswitch_b
     const-string v0, "GUILD_EMOJIS_UPDATE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2780,7 +2575,7 @@
 
     return-void
 
-    :sswitch_f
+    :sswitch_c
     const-string v0, "MESSAGE_REACTION_REMOVE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2795,7 +2590,7 @@
 
     return-void
 
-    :sswitch_10
+    :sswitch_d
     const-string v0, "CHANNEL_RECIPIENT_ADD"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2810,7 +2605,7 @@
 
     return-void
 
-    :sswitch_11
+    :sswitch_e
     const-string v0, "MESSAGE_DELETE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2821,7 +2616,7 @@
 
     goto :goto_1
 
-    :sswitch_12
+    :sswitch_f
     const-string v0, "MESSAGE_CREATE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2836,7 +2631,7 @@
 
     return-void
 
-    :sswitch_13
+    :sswitch_10
     const-string v0, "USER_UPDATE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2851,7 +2646,7 @@
 
     return-void
 
-    :sswitch_14
+    :sswitch_11
     const-string v0, "CALL_UPDATE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2860,9 +2655,9 @@
 
     if-eqz p1, :cond_1
 
-    goto/16 :goto_2
+    goto :goto_2
 
-    :sswitch_15
+    :sswitch_12
     const-string v0, "GUILD_UPDATE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2873,22 +2668,7 @@
 
     goto/16 :goto_3
 
-    :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
+    :sswitch_13
     const-string v0, "READY"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2903,7 +2683,7 @@
 
     return-void
 
-    :sswitch_18
+    :sswitch_14
     const-string v0, "GUILD_MEMBER_UPDATE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2914,7 +2694,7 @@
 
     goto/16 :goto_5
 
-    :sswitch_19
+    :sswitch_15
     const-string v0, "MESSAGE_DELETE_BULK"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2930,7 +2710,7 @@
 
     return-void
 
-    :sswitch_1a
+    :sswitch_16
     const-string v0, "GUILD_MEMBER_REMOVE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2945,7 +2725,7 @@
 
     return-void
 
-    :sswitch_1b
+    :sswitch_17
     const-string v0, "CHANNEL_UPDATE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2956,7 +2736,7 @@
 
     goto/16 :goto_4
 
-    :sswitch_1c
+    :sswitch_18
     const-string v0, "CHANNEL_UNREAD_UPDATE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2971,7 +2751,7 @@
 
     return-void
 
-    :sswitch_1d
+    :sswitch_19
     const-string v0, "CALL_DELETE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2986,7 +2766,7 @@
 
     return-void
 
-    :sswitch_1e
+    :sswitch_1a
     const-string v0, "CALL_CREATE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -3002,7 +2782,7 @@
 
     return-void
 
-    :sswitch_1f
+    :sswitch_1b
     const-string v0, "GUILD_DELETE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -3017,7 +2797,7 @@
 
     return-void
 
-    :sswitch_20
+    :sswitch_1c
     const-string v0, "GUILD_CREATE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -3033,7 +2813,7 @@
 
     return-void
 
-    :sswitch_21
+    :sswitch_1d
     const-string v0, "USER_PAYMENT_SOURCES_UPDATE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -3048,7 +2828,7 @@
 
     return-void
 
-    :sswitch_22
+    :sswitch_1e
     const-string v0, "TYPING_START"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -3063,7 +2843,7 @@
 
     return-void
 
-    :sswitch_23
+    :sswitch_1f
     const-string v0, "CHANNEL_RECIPIENT_REMOVE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -3078,7 +2858,7 @@
 
     return-void
 
-    :sswitch_24
+    :sswitch_20
     const-string v0, "CHANNEL_DELETE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -3093,7 +2873,7 @@
 
     return-void
 
-    :sswitch_25
+    :sswitch_21
     const-string v0, "CHANNEL_CREATE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -3109,7 +2889,7 @@
 
     return-void
 
-    :sswitch_26
+    :sswitch_22
     const-string v0, "RELATIONSHIP_REMOVE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -3124,7 +2904,7 @@
 
     return-void
 
-    :sswitch_27
+    :sswitch_23
     const-string v0, "USER_SETTINGS_UPDATE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -3139,7 +2919,7 @@
 
     return-void
 
-    :sswitch_28
+    :sswitch_24
     const-string v0, "GUILD_INTEGRATIONS_UPDATE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -3154,7 +2934,7 @@
 
     return-void
 
-    :sswitch_29
+    :sswitch_25
     const-string v0, "PRESENCE_UPDATE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -3169,7 +2949,7 @@
 
     return-void
 
-    :sswitch_2a
+    :sswitch_26
     const-string v0, "USER_NOTE_UPDATE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -3184,7 +2964,7 @@
 
     return-void
 
-    :sswitch_2b
+    :sswitch_27
     const-string v0, "USER_SUBSCRIPTIONS_UPDATE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -3197,9 +2977,9 @@
 
     invoke-virtual {p1, p2}, Lrx/subjects/SerializedSubject;->onNext(Ljava/lang/Object;)V
 
-    return-void
+    goto/16 :goto_6
 
-    :sswitch_2c
+    :sswitch_28
     const-string v0, "GUILD_MEMBER_LIST_UPDATE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -3214,7 +2994,7 @@
 
     return-void
 
-    :sswitch_2d
+    :sswitch_29
     const-string v0, "MESSAGE_REACTION_ADD"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -3229,7 +3009,7 @@
 
     return-void
 
-    :sswitch_2e
+    :sswitch_2a
     const-string v0, "GUILD_MEMBER_ADD"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -3245,7 +3025,7 @@
 
     return-void
 
-    :sswitch_2f
+    :sswitch_2b
     const-string v0, "GUILD_BAN_ADD"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -3260,7 +3040,7 @@
 
     return-void
 
-    :sswitch_30
+    :sswitch_2c
     const-string v0, "RELATIONSHIP_ADD"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -3275,7 +3055,7 @@
 
     return-void
 
-    :sswitch_31
+    :sswitch_2d
     const-string v0, "USER_REQUIRED_ACTION_UPDATE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -3290,7 +3070,7 @@
 
     return-void
 
-    :sswitch_32
+    :sswitch_2e
     const-string v0, "MESSAGE_REACTION_REMOVE_ALL"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -3305,7 +3085,7 @@
 
     return-void
 
-    :sswitch_33
+    :sswitch_2f
     const-string v0, "GUILD_MEMBERS_CHUNK"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -3320,7 +3100,7 @@
 
     return-void
 
-    :sswitch_34
+    :sswitch_30
     const-string v0, "SESSIONS_REPLACE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -3341,59 +3121,55 @@
 
     :sswitch_data_0
     .sparse-switch
-        -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
+        -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
     .end sparse-switch
 .end method
 
@@ -3430,7 +3206,7 @@
 
     check-cast p1, Lcom/discord/rtcconnection/RtcConnection$State$d;
 
-    iget-boolean p1, p1, Lcom/discord/rtcconnection/RtcConnection$State$d;->zt:Z
+    iget-boolean p1, p1, Lcom/discord/rtcconnection/RtcConnection$State$d;->zu:Z
 
     if-eqz p1, :cond_0
 
@@ -3745,42 +3521,6 @@
     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/StoreGatewayConnectionKt.smali b/com.discord/smali/com/discord/stores/StoreGatewayConnectionKt.smali
deleted file mode 100644
index f5f0d9f12e..0000000000
--- a/com.discord/smali/com/discord/stores/StoreGatewayConnectionKt.smali
+++ /dev/null
@@ -1,7 +0,0 @@
-.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 512ffc8fc3..be89f872d9 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 acfde70db7..1dd655c1f1 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 e4a76a0180..8ac1ffa8ca 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 5112fdbfc9..1f38919929 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 304eb4b9b0..1553832716 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object v0
 .end method
@@ -96,7 +96,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/d/a;->Kx()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Kv()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 76dcd0849f..038e2031de 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 97f8a78a6f..64682b139f 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 1886e2d108..4c1388ca74 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 f48b06beb8..88278997a8 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 eeb97219e1..7fcad723db 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 bbb5ec50f1..c19d57fdbc 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object v0
 .end method
@@ -84,7 +84,7 @@
 
     if-eq v0, v1, :cond_0
 
-    sget-object v2, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
+    sget-object v2, Lcom/discord/app/AppLog;->vn: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 2a721b52e9..2b8f8444f9 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 8062e803d0..dd4b74ee0a 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 89f471ac48..07999dd82f 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 3bdce7afbc..69a0424d29 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 7faee9467a..289d88b969 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object v0
 .end method
@@ -84,7 +84,7 @@
 
     if-eq v0, v1, :cond_0
 
-    sget-object v2, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
+    sget-object v2, Lcom/discord/app/AppLog;->vn: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 86666a9acc..57286cbad7 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 9cdd1f3a6f..18a82ba1cf 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 ffa051a9e5..6131a3603f 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 980b5184bf..e83c176410 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 176b449a1a..84a178b3e4 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 b7c73e2a97..9831b77484 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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;->vm:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vn: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 fc22655d27..a006f9cb9c 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 239cc378fe..81482ada07 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 25f9cd7078..4f4b61b8c5 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 63c9f7b19e..e32a262719 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 7a8589f2ca..fc63ab5cb1 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 d3e32857df..c1e0a0b6a6 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 f295874b0c..c62a7641b2 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 3515c010fa..9e89397a37 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 ca0a226d65..19565c0eac 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 5c25ef0d94..e7ae6ac173 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 b95c8784c6..00a686ca70 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;->vO:Lcom/discord/app/i;
+    sget-object v1, Lcom/discord/app/i;->vP: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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object p2
 
@@ -363,7 +363,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object p2
 
@@ -420,7 +420,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/discord/app/i;->vO:Lcom/discord/app/i;
+    sget-object v1, Lcom/discord/app/i;->vP: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 638157bbb0..77c55ad564 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 d8d5d0858a..f9507b735e 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 987dd1c39d..2348ce300d 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 7fa2952b80..17e64960eb 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;->Kz()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kx()Lrx/subjects/BehaviorSubject;
 
     move-result-object p1
 
@@ -149,7 +149,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v0
 
@@ -181,7 +181,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v0
 
@@ -270,7 +270,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 d039501abd..910e767dcc 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 92049cdf69..c0c0213eaa 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 b5e732beb4..e633e521d2 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 41ed3861eb..c4cc379b02 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 6874725214..21f06b573c 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 8f78b5ef34..157e581cd0 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;->IX()Lrx/Observable;
+    invoke-virtual {p0}, Lrx/Observable;->IV()Lrx/Observable;
 
     move-result-object p0
 
-    invoke-static {}, Lrx/internal/a/ba;->JI()Lrx/internal/a/ba;
+    invoke-static {}, Lrx/internal/a/ba;->JG()Lrx/internal/a/ba;
 
     move-result-object v0
 
@@ -1685,7 +1685,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object p2
 
@@ -1749,7 +1749,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object p2
 
@@ -1874,7 +1874,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object p2
 
@@ -1973,7 +1973,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object p2
 
@@ -2037,7 +2037,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object p2
 
@@ -2094,7 +2094,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 787c67ed8d..3945f3243b 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 3d160c25c5..77e52c614d 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 db8a74e7ab..b74f34fc18 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 a2e0a51212..289df1606b 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 cdd6feb6c5..863aa4a8ba 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 6b9184a0d5..4414f77d06 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 55e4958c3a..e8ca3547af 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 d33e76e4f5..e59fbc08cc 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 218aedef3c..2052b0782b 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;->Kz()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kx()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;->Kz()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kx()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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object p2
 
@@ -469,7 +469,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 3c6ef0f02f..2df11f4705 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;->IS()Lrx/Observable;
+    invoke-static {}, Lrx/Observable;->IQ()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 f212e840a9..7dcade8f36 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 a74c06b2a7..8aab9034b6 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;->IV()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->IT()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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -429,7 +429,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 3e3dabf9f4..b432dfe3e9 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 c0c532e976..3706dd9729 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 b8d4e5025b..db9bbbfcb5 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 d98cdf4b1f..592e095be5 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 02d235bfca..5c60587b53 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 6e113876a6..c158132ad1 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 01ef5453b1..19e076882b 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 f03d16d9ff..9a1d971865 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 acf018a785..de720076dc 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 a36ed368aa..6bca9418f8 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;->vm:Lcom/discord/app/AppLog;
+    sget-object v4, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
 
     new-instance v6, Ljava/lang/StringBuilder;
 
@@ -776,7 +776,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object p2
 
@@ -883,7 +883,7 @@
 
     :cond_1
     :goto_0
-    sget-object v0, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vn: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 ebe44816b6..e46c4fd5f0 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 95c0b51b46..96e450e6ae 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 051ade006c..386b793d28 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;->zY:I
+    iget v6, v2, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->Aa:I
 
-    iget v7, v2, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->zZ:I
+    iget v7, v2, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->Ab:I
 
-    iget v9, v2, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->Ab:I
+    iget v9, v2, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->Ad: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 171c6d105b..45d5693606 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 36f6fb0bb9..4a85b94131 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 e4f9e0c7e8..3f1b39c21f 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(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;)V
+    value = Lcom/discord/stores/StoreMediaEngine$handleNewConnection$1;->onDestroy()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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 40db9a1d49..1df667f8bd 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaEngine$handleNewConnection$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaEngine$handleNewConnection$1.smali
@@ -45,12 +45,11 @@
 
 
 # virtual methods
-.method public final onConnected(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;Ljava/util/List;)V
+.method public final onConnected(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;",
@@ -58,70 +57,54 @@
         }
     .end annotation
 
-    const-string v0, "connection"
+    const-string v0, "transportInfo"
 
     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 onDestroy(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;)V
+.method public final onConnectionStateChange(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;)V
     .locals 1
 
-    const-string v0, "connection"
+    const-string v0, "connectionState"
 
     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 onError(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException;)V
+.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
     .locals 1
 
-    const-string v0, "connection"
+    const-string v0, "exception"
 
     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 e10ee78acb..71468b041a 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 35f6cd546d..322c731598 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 afa326ef57..d236e9d51f 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 6862bcd11b..11aeb5fecc 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 9e670413be..b1243039d7 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 325a1eb379..1372bc0f85 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 10205d2e25..7d78881ba8 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;->vm:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vn: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 78ec651fbe..0caf541188 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 a46bd42bd4..ddb124dfed 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;->vm:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vn: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 46eeea0ea5..a7992ff3c5 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 0219b5fcef..92c358ad4c 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;->vm:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vn: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 12d61a6b37..9d99a987a4 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;->zF:Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
+    sget-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;->zH: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;->Kz()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kx()Lrx/subjects/BehaviorSubject;
 
     move-result-object v0
 
@@ -269,7 +269,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v0
 
@@ -321,7 +321,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/b/b;->Kf()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/b/b;->Kd()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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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;->eB()Lcom/hammerandchisel/libdiscord/Discord;
+    invoke-interface {v0}, Lcom/discord/rtcconnection/mediaengine/MediaEngine;->eA()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;->Ag:Lcom/discord/rtcconnection/mediaengine/b;
+    sget-object v1, Lcom/discord/rtcconnection/mediaengine/b;->Ai: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;->vm:Lcom/discord/app/AppLog;
+    sget-object v2, Lcom/discord/app/AppLog;->vn: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 747d0d5980..42c51ee553 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, 0x7f12046f
+    const p1, 0x7f12044a
 
     goto :goto_0
 
     :cond_0
-    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$b;->zr:Lcom/discord/rtcconnection/RtcConnection$State$b;
+    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$b;->zs: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, 0x7f12046c
+    const p1, 0x7f120447
 
     goto :goto_0
 
     :cond_1
-    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$a;->zq:Lcom/discord/rtcconnection/RtcConnection$State$a;
+    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$a;->zr: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, 0x7f12046b
+    const p1, 0x7f120446
 
     goto :goto_0
 
     :cond_2
-    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$c;->zs:Lcom/discord/rtcconnection/RtcConnection$State$c;
+    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$c;->zt: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, 0x7f12046e
+    const p1, 0x7f120449
 
     goto :goto_0
 
     :cond_3
-    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$h;->zx:Lcom/discord/rtcconnection/RtcConnection$State$h;
+    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$h;->zy: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, 0x7f120473
+    const p1, 0x7f12044e
 
     goto :goto_0
 
     :cond_4
-    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$g;->zw:Lcom/discord/rtcconnection/RtcConnection$State$g;
+    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$g;->zx: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, 0x7f120472
+    const p1, 0x7f12044d
 
     goto :goto_0
 
     :cond_5
-    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$f;->zv:Lcom/discord/rtcconnection/RtcConnection$State$f;
+    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$f;->zw: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, 0x7f12046d
+    const p1, 0x7f120448
 
     goto :goto_0
 
     :cond_6
-    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$e;->zu:Lcom/discord/rtcconnection/RtcConnection$State$e;
+    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$e;->zv: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, 0x7f120471
+    const p1, 0x7f12044c
 
     :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 28c220a770..0dfacd0b5a 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, 0x7f1213b1
+    const v0, 0x7f121325
 
     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 fad914b3e2..b7d896d53a 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -116,7 +116,7 @@
 
     move-result-object p1
 
-    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$f;->zv:Lcom/discord/rtcconnection/RtcConnection$State$f;
+    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$f;->zw: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 651ed844cd..0f6aa298af 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;->zx:Lcom/discord/rtcconnection/RtcConnection$State$h;
+    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$h;->zy: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 1211ffa58b..fe8bf87508 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object p2
 
@@ -108,7 +108,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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;->vO:Lcom/discord/app/i;
+    sget-object v2, Lcom/discord/app/i;->vP: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 0f123d292f..43f8ecca60 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 5f5d80cbc5..3c56ff1996 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 02e8d0e05c..92d7c91675 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;->zU:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
+    sget-object v10, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;->zW: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;->vm:Lcom/discord/app/AppLog;
+    sget-object v1, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
 
     const/4 v3, 0x0
 
@@ -495,7 +495,7 @@
 
     if-nez v0, :cond_1
 
-    sget-object v1, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
+    sget-object v1, Lcom/discord/app/AppLog;->vn: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;->zU:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
+    sget-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;->zW: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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -805,7 +805,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -849,7 +849,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -893,7 +893,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -927,7 +927,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -971,7 +971,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -1015,7 +1015,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -1059,7 +1059,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -1103,7 +1103,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -1147,7 +1147,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -1201,7 +1201,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object p2
 
@@ -1247,7 +1247,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object p2
 
@@ -1283,7 +1283,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -1319,7 +1319,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -1353,7 +1353,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -1474,7 +1474,7 @@
 
     move-result-object v0
 
-    sget-object v2, Lcom/discord/app/i;->vO:Lcom/discord/app/i;
+    sget-object v2, Lcom/discord/app/i;->vP: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;->vO:Lcom/discord/app/i;
+    sget-object v0, Lcom/discord/app/i;->vP: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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -1641,7 +1641,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 c3b3ec293e..e5bf1e252b 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 4cdae357d0..d06e8e37c8 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 21950900d1..74f2506e00 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 f37b10a382..1d31e6b60e 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 28f156cf2c..4c85b483b0 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 ca19dc5d97..c3292b3557 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 737f2b51ee..adc058c44f 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 ff916668aa..4f1439b254 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 a1a5b1f563..1812587e5a 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object p2
 
@@ -931,7 +931,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 23bf3cd9ff..cae604d25c 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 b47045b37c..969903d445 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 17aca8bdd1..afe29bad19 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 f917935a47..cc297c581a 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 780131530e..8da4ee3a21 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 568a97fe16..f535a30158 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 b488fe8c2e..9002be543a 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 24a1d0e0d9..b47760805d 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 e045271eea..891c1c08be 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 93211a76dc..d33cba1a5b 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 a9f5a3b86a..ba3e0198dd 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 f88a101fa6..7f29819e74 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 47d8e2b8b6..4103c1e5a6 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 3b549784e0..3b15ba313e 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 c8464cea3b..c0dea3bc43 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;->vm:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
 
     const-string v1, "ValidationError"
 
@@ -598,7 +598,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object p2
 
@@ -887,7 +887,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object p2
 
@@ -1116,7 +1116,7 @@
 
     check-cast v0, Lrx/functions/Action1;
 
-    sget-object v1, Lrx/Emitter$a;->bGg:Lrx/Emitter$a;
+    sget-object v1, Lrx/Emitter$a;->bGb: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 6f78e46006..a85a133272 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;->Kz()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kx()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 95e0a7f783..4133061d92 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 6fdba6329a..6f8529125a 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 5f0cef089c..fb0afb413e 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 1136ccc788..fe7cd6e345 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 bf7bd636b0..8471202757 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 848b8002d1..2659673264 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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;->vm:Lcom/discord/app/AppLog;
+    sget-object p1, Lcom/discord/app/AppLog;->vn: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 2a22bb25a0..3212cc7b46 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 f24d455a7c..93fe779eb8 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 09a2349282..9fdb5fc8c2 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 58bdd4e826..3ca710651f 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 7d72424aa1..856ae2bf64 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 c18816e0ce..e0884ca6fc 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -251,7 +251,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/discord/app/i;->vO:Lcom/discord/app/i;
+    sget-object v1, Lcom/discord/app/i;->vP: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 b62afa4c77..a520555f22 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 b413ebc82a..5fa137c17e 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;->Kz()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kx()Lrx/subjects/BehaviorSubject;
 
     move-result-object v0
 
@@ -1695,7 +1695,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object p2
 
@@ -2162,7 +2162,7 @@
 
     move-result-object p3
 
-    invoke-virtual {p3}, Lrx/Observable;->IV()Lrx/Observable;
+    invoke-virtual {p3}, Lrx/Observable;->IT()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 e3a4306961..e1f5a82031 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 e231a484fe..2fdfce7459 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 cc171fdf0d..b3510c10e7 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;->vA:Lcom/discord/app/f;
+    sget-object v0, Lcom/discord/app/f;->vB: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 e2872179b4..f5e3943559 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;->vm:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vn: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 d9de853267..db5ea800fe 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 0af8e7079c..098108c7e3 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;->vA:Lcom/discord/app/f;
+    sget-object v0, Lcom/discord/app/f;->vB: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 0e2fd838ad..24e46cf9ab 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 6731312e38..a55d47df0e 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, 0x7f120466
+    const v0, 0x7f120441
 
     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 921073b0e5..9587fb2d9e 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, 0x7f12116e
+    const v2, 0x7f1210e2
 
     invoke-virtual {p1, v2}, Landroid/app/Activity;->getString(I)Ljava/lang/String;
 
@@ -81,7 +81,7 @@
 
     aput-object v2, v0, v3
 
-    const v2, 0x7f121267
+    const v2, 0x7f1211da
 
     invoke-virtual {p1, v2}, Landroid/app/Activity;->getString(I)Ljava/lang/String;
 
@@ -91,7 +91,7 @@
 
     aput-object v2, v0, v3
 
-    const v2, 0x7f12046a
+    const v2, 0x7f120445
 
     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 211c7ef1d8..3f61647f58 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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;->uY: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/stores/StoreNavigation$init$2.smali b/com.discord/smali/com/discord/stores/StoreNavigation$init$2.smali
index 8b1117b4de..28484c2bd2 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;->IS()Lrx/Observable;
+    invoke-static {}, Lrx/Observable;->IQ()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 1eac62c589..2ed9e44af2 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 c486d2e4f6..5f109cc095 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v0
 
@@ -183,7 +183,7 @@
 
     const-string v1, "CONNECTION_ISSUES"
 
-    const v4, 0x7f0803ab
+    const v4, 0x7f08039d
 
     const/16 v5, 0x1e
 
@@ -232,7 +232,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -266,7 +266,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -300,7 +300,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -374,7 +374,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 5c0e181b31..4faa2c57a3 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 82a75f1e99..93e1f61c4a 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;->vm:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vn: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 5b9f3fbed4..781e060d7c 100644
--- a/com.discord/smali/com/discord/stores/StoreNotices.smali
+++ b/com.discord/smali/com/discord/stores/StoreNotices.smali
@@ -80,10 +80,10 @@
 
 .field private pollRateMs:J
 
-.field private final processTrigger:Lrx/subjects/PublishSubject;
+.field private final processTrigger:Lrx/subjects/BehaviorSubject;
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "Lrx/subjects/PublishSubject<",
+            "Lrx/subjects/BehaviorSubject<",
             "Lkotlin/Unit;",
             ">;"
         }
@@ -211,15 +211,15 @@
 
     iput-object p1, p0, Lcom/discord/stores/StoreNotices;->lastShownTimes:Ljava/util/HashMap;
 
-    invoke-static {}, Lrx/subjects/PublishSubject;->KA()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kx()Lrx/subjects/BehaviorSubject;
 
     move-result-object p1
 
-    const-string v0, "PublishSubject.create()"
+    const-string v0, "BehaviorSubject.create()"
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object p1, p0, Lcom/discord/stores/StoreNotices;->processTrigger:Lrx/subjects/PublishSubject;
+    iput-object p1, p0, Lcom/discord/stores/StoreNotices;->processTrigger:Lrx/subjects/BehaviorSubject;
 
     const/4 p1, 0x0
 
@@ -395,7 +395,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreNotices;->noticePublisher:Lrx/subjects/BehaviorSubject;
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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;->vm:Lcom/discord/app/AppLog;
+    sget-object p1, Lcom/discord/app/AppLog;->vn: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;->vm:Lcom/discord/app/AppLog;
+    sget-object p1, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
 
     new-instance v2, Ljava/lang/StringBuilder;
 
@@ -465,7 +465,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
 
-    iget-object p1, p0, Lcom/discord/stores/StoreNotices;->processTrigger:Lrx/subjects/PublishSubject;
+    iget-object p1, p0, Lcom/discord/stores/StoreNotices;->processTrigger:Lrx/subjects/BehaviorSubject;
 
     new-instance v0, Lcom/discord/stores/StoreNotices$init$1;
 
@@ -473,7 +473,7 @@
 
     check-cast v0, Lrx/functions/b;
 
-    invoke-virtual {p1, v0}, Lrx/subjects/PublishSubject;->g(Lrx/functions/b;)Lrx/Observable;
+    invoke-virtual {p1, v0}, Lrx/subjects/BehaviorSubject;->g(Lrx/functions/b;)Lrx/Observable;
 
     move-result-object p1
 
@@ -489,7 +489,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationBuffered(Lrx/Observable;)Lrx/Observable;
+    invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
     move-result-object p1
 
@@ -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;->vm:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
 
     new-instance v1, Ljava/lang/StringBuilder;
 
@@ -825,11 +825,11 @@
     invoke-virtual {p1, v2}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
 
     :cond_9
-    iget-object p1, p0, Lcom/discord/stores/StoreNotices;->processTrigger:Lrx/subjects/PublishSubject;
+    iget-object p1, p0, Lcom/discord/stores/StoreNotices;->processTrigger:Lrx/subjects/BehaviorSubject;
 
-    sget-object p2, Lkotlin/Unit;->bgy:Lkotlin/Unit;
+    sget-object p2, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
-    invoke-virtual {p1, p2}, Lrx/subjects/PublishSubject;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {p1, p2}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -967,7 +967,7 @@
 
     invoke-static {v0}, Lcom/discord/app/AppLog;->i(Ljava/lang/String;)V
 
-    sget-object v0, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
 
     new-instance v1, Ljava/lang/StringBuilder;
 
@@ -1002,11 +1002,11 @@
     invoke-direct {p0, v0, v1}, Lcom/discord/stores/StoreNotices;->setPollRateMs(J)V
 
     :cond_3
-    iget-object p1, p0, Lcom/discord/stores/StoreNotices;->processTrigger:Lrx/subjects/PublishSubject;
+    iget-object p1, p0, Lcom/discord/stores/StoreNotices;->processTrigger:Lrx/subjects/BehaviorSubject;
 
-    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
-    invoke-virtual {p1, v0}, Lrx/subjects/PublishSubject;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {p1, v0}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
diff --git a/com.discord/smali/com/discord/stores/StoreNotifications$configureNotificationClient$1.smali b/com.discord/smali/com/discord/stores/StoreNotifications$configureNotificationClient$1.smali
index aed9172563..e350173f01 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 95b9180492..60c28dd34f 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 0325edf211..875942408d 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 587524edef..3708aa4408 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 7951e50ca0..d67477a7ee 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -213,7 +213,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -479,7 +479,7 @@
 
     move-result-object v0
 
-    sget-object v2, Lcom/discord/app/i;->vO:Lcom/discord/app/i;
+    sget-object v2, Lcom/discord/app/i;->vP:Lcom/discord/app/i;
 
     new-instance v3, Lcom/discord/stores/StoreNotifications$tryTokenPersist$1;
 
diff --git a/com.discord/smali/com/discord/stores/StoreNux$updateNux$1.smali b/com.discord/smali/com/discord/stores/StoreNux$updateNux$1.smali
index be06bd04fa..c8e03c3831 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 dc5e575ab1..71bb0320c9 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 83c12c33c0..999b7f30ba 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 bc7144925c..75f14e6381 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 f40851b251..ccc398a182 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 d39bde34a2..a635a4e654 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 a61919aea7..9a5824aaf2 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object p2
 
@@ -649,7 +649,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object p2
 
@@ -723,7 +723,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object p2
 
@@ -761,7 +761,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 0007f5856d..1c285e6c1d 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object p2
 
@@ -499,7 +499,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object p2
 
diff --git a/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$3$1.smali b/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$Actions$appendNewPremiumGuildSubscription$1.smali
similarity index 66%
rename from com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$3$1.smali
rename to com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$Actions$appendNewPremiumGuildSubscription$1.smali
index c73990dd13..afdd4a5b2c 100644
--- a/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$3$1.smali
+++ b/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$Actions$appendNewPremiumGuildSubscription$1.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$3$1;
+.class final Lcom/discord/stores/StorePremiumGuildSubscription$Actions$appendNewPremiumGuildSubscription$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$3;->invoke(Ljava/util/List;)V
+    value = Lcom/discord/stores/StorePremiumGuildSubscription$Actions;->appendNewPremiumGuildSubscription(Lcom/discord/models/domain/ModelPremiumGuildSubscription;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -27,14 +27,14 @@
 
 
 # instance fields
-.field final synthetic $subscriptionsSlots:Ljava/util/List;
+.field final synthetic $premiumGuildSubscription:Lcom/discord/models/domain/ModelPremiumGuildSubscription;
 
 
 # direct methods
-.method constructor <init>(Ljava/util/List;)V
+.method constructor <init>(Lcom/discord/models/domain/ModelPremiumGuildSubscription;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$3$1;->$subscriptionsSlots:Ljava/util/List;
+    iput-object p1, p0, Lcom/discord/stores/StorePremiumGuildSubscription$Actions$appendNewPremiumGuildSubscription$1;->$premiumGuildSubscription:Lcom/discord/models/domain/ModelPremiumGuildSubscription;
 
     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$fetchUserGuildPremiumState$3$1;->invoke()V
+    invoke-virtual {p0}, Lcom/discord/stores/StorePremiumGuildSubscription$Actions$appendNewPremiumGuildSubscription$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object v0
 .end method
@@ -64,9 +64,9 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$3$1;->$subscriptionsSlots:Ljava/util/List;
+    iget-object v1, p0, Lcom/discord/stores/StorePremiumGuildSubscription$Actions$appendNewPremiumGuildSubscription$1;->$premiumGuildSubscription:Lcom/discord/models/domain/ModelPremiumGuildSubscription;
 
-    invoke-virtual {v0, v1}, Lcom/discord/stores/StorePremiumGuildSubscription;->handleFetchStateSuccess(Ljava/util/List;)V
+    invoke-virtual {v0, v1}, Lcom/discord/stores/StorePremiumGuildSubscription;->handleNewPremiumGuildSubscription(Lcom/discord/models/domain/ModelPremiumGuildSubscription;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$1.smali b/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$1.smali
index c9ac9cdbc7..ebc2a77f9f 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 06f3d15ba2..f2e1b97da0 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 Lkotlin/jvm/internal/m;
+.super Ljava/lang/Object;
 .source "StorePremiumGuildSubscription.kt"
 
 # interfaces
-.implements Lkotlin/jvm/functions/Function1;
+.implements Lrx/functions/b;
 
 
 # annotations
@@ -18,10 +18,15 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lkotlin/jvm/internal/m;",
-        "Lkotlin/jvm/functions/Function1<",
-        "Lcom/discord/utilities/error/Error;",
-        "Lkotlin/Unit;",
+        "<T:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/functions/b<",
+        "Ljava/lang/Throwable;",
+        "Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;",
         ">;"
     }
 .end annotation
@@ -45,47 +50,62 @@
 .end method
 
 .method constructor <init>()V
-    .locals 1
+    .locals 0
 
-    const/4 v0, 0x1
-
-    invoke-direct {p0, v0}, Lkotlin/jvm/internal/m;-><init>(I)V
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
+.method public final call(Ljava/lang/Throwable;)Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;
+    .locals 5
 
-    check-cast p1, Lcom/discord/utilities/error/Error;
+    invoke-virtual {p1}, Ljava/lang/Throwable;->getMessage()Ljava/lang/String;
 
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$2;->invoke(Lcom/discord/utilities/error/Error;)V
+    move-result-object v0
 
-    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
+    if-eqz v0, :cond_0
 
-    return-object p1
-.end method
+    check-cast v0, Ljava/lang/CharSequence;
 
-.method public final invoke(Lcom/discord/utilities/error/Error;)V
-    .locals 1
+    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;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object p1, Lcom/discord/stores/StorePremiumGuildSubscription$Actions;->INSTANCE:Lcom/discord/stores/StorePremiumGuildSubscription$Actions;
+    throw p1
+.end method
 
-    invoke-static {p1}, Lcom/discord/stores/StorePremiumGuildSubscription$Actions;->access$getStream$p(Lcom/discord/stores/StorePremiumGuildSubscription$Actions;)Lcom/discord/stores/StoreStream;
+.method public final bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Ljava/lang/Throwable;
+
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$2;->call(Ljava/lang/Throwable;)Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;
 
     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
+    return-object p1
 .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 47c630f9ee..124a47164b 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 Lkotlin/jvm/internal/m;
+.super Ljava/lang/Object;
 .source "StorePremiumGuildSubscription.kt"
 
 # interfaces
-.implements Lkotlin/jvm/functions/Function1;
+.implements Lrx/functions/Func2;
 
 
 # annotations
@@ -18,14 +18,16 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lkotlin/jvm/internal/m;",
-        "Lkotlin/jvm/functions/Function1<",
-        "Ljava/util/List<",
-        "+",
-        "Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;",
-        ">;",
-        "Lkotlin/Unit;",
-        ">;"
+        "<T1:",
+        "Ljava/lang/Object;",
+        "T2:",
+        "Ljava/lang/Object;",
+        "R:",
+        "Ljava/lang/Object;",
+        ">",
+        "Ljava/lang/Object;",
+        "Lrx/functions/Func2<",
+        "TT1;TT2;TR;>;"
     }
 .end annotation
 
@@ -48,57 +50,51 @@
 .end method
 
 .method constructor <init>()V
-    .locals 1
+    .locals 0
 
-    const/4 v0, 0x1
-
-    invoke-direct {p0, v0}, Lkotlin/jvm/internal/m;-><init>(I)V
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+.method public final bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
     check-cast p1, Ljava/util/List;
 
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$3;->invoke(Ljava/util/List;)V
+    check-cast p2, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;
 
-    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
+    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
 
     return-object p1
 .end method
 
-.method public final invoke(Ljava/util/List;)V
-    .locals 2
+.method public final call(Ljava/util/List;Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;)Lkotlin/Pair;
+    .locals 0
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
             "Ljava/util/List<",
-            "Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;",
-            ">;)V"
+            "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;",
+            ">;"
         }
     .end annotation
 
-    const-string v0, "subscriptionsSlots"
+    invoke-static {p1, p2}, Lkotlin/q;->to(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
 
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    move-result-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
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$2$1.smali b/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$4$1.smali
similarity index 81%
rename from com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$2$1.smali
rename to com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$4$1.smali
index 93dcbb92d9..e11e7f594d 100644
--- a/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$2$1.smali
+++ b/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$4$1.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$2$1;
+.class final Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$4$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$2;->invoke(Lcom/discord/utilities/error/Error;)V
+    value = Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$4;->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$2$1;
+.field public static final INSTANCE:Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$4$1;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    new-instance v0, Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$2$1;
+    new-instance v0, Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$4$1;
 
-    invoke-direct {v0}, Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$2$1;-><init>()V
+    invoke-direct {v0}, Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$4$1;-><init>()V
 
-    sput-object v0, Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$2$1;->INSTANCE:Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$2$1;
+    sput-object v0, Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$4$1;->INSTANCE:Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$4$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$2$1;->invoke()V
+    invoke-virtual {p0}, Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$4$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$4.smali b/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$4.smali
new file mode 100644
index 0000000000..200be9db9b
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$4.smali
@@ -0,0 +1,91 @@
+.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;->bgt: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
new file mode 100644
index 0000000000..108f4d28fc
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$5$1.smali
@@ -0,0 +1,82 @@
+.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;->bgt: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
new file mode 100644
index 0000000000..c0e1b24a0b
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$5.smali
@@ -0,0 +1,120 @@
+.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;->bgt: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
new file mode 100644
index 0000000000..7a0085f9fc
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$Actions$removeNewPremiumGuildSubscription$1.smali
@@ -0,0 +1,72 @@
+.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;->bgt: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 c629d8070e..fa02ec6642 100644
--- a/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$Actions.smali
+++ b/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$Actions.smali
@@ -91,8 +91,35 @@
 
 
 # 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 13
+    .locals 12
 
     sget-object v0, Lcom/discord/stores/StorePremiumGuildSubscription$Actions;->stream:Lcom/discord/stores/StoreStream;
 
@@ -115,7 +142,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/discord/utilities/rest/RestAPI;->getSubscriptionSlots()Lrx/Observable;
+    invoke-virtual {v0}, Lcom/discord/utilities/rest/RestAPI;->getUserPremiumGuildSubscriptions()Lrx/Observable;
 
     move-result-object v0
 
@@ -125,35 +152,69 @@
 
     const/4 v3, 0x0
 
-    invoke-static {v0, v1, v2, v3}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
+    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;
 
     move-result-object v4
 
-    const-class v5, Lcom/discord/stores/StorePremiumGuildSubscription;
+    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/4 v6, 0x0
 
-    const/4 v7, 0x0
+    sget-object v0, Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$4;->INSTANCE:Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$4;
 
-    sget-object v0, Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$2;->INSTANCE:Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$2;
+    move-object v7, v0
 
-    move-object v8, v0
+    check-cast v7, Lkotlin/jvm/functions/Function1;
 
-    check-cast v8, Lkotlin/jvm/functions/Function1;
+    const/4 v8, 0x0
 
-    const/4 v9, 0x0
+    sget-object v0, Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$5;->INSTANCE:Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$5;
 
-    sget-object v0, Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$3;->INSTANCE:Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$3;
+    move-object v9, v0
 
-    move-object v10, v0
+    check-cast v9, Lkotlin/jvm/functions/Function1;
 
-    check-cast v10, Lkotlin/jvm/functions/Function1;
+    const/16 v10, 0x16
 
-    const/16 v11, 0x16
+    const/4 v11, 0x0
 
-    const/4 v12, 0x0
-
-    invoke-static/range {v4 .. v12}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
+    invoke-static/range {v3 .. v11}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
 .end method
@@ -175,3 +236,26 @@
 
     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 c055d297a7..808d72a2ae 100644
--- a/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$State$Loaded.smali
+++ b/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$State$Loaded.smali
@@ -15,11 +15,13 @@
 
 
 # instance fields
-.field private final premiumGuildSubscriptionSlots:Ljava/util/List;
+.field private final cooldown:Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;
+
+.field private final premiumGuildSubscriptions:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
-            "Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;",
+            "Lcom/discord/models/domain/ModelPremiumGuildSubscription;",
             ">;"
         }
     .end annotation
@@ -27,18 +29,20 @@
 
 
 # direct methods
-.method public constructor <init>(Ljava/util/List;)V
+.method public constructor <init>(Ljava/util/List;Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;)V
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
             "Ljava/util/List<",
-            "Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;",
-            ">;)V"
+            "Lcom/discord/models/domain/ModelPremiumGuildSubscription;",
+            ">;",
+            "Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;",
+            ")V"
         }
     .end annotation
 
-    const-string v0, "premiumGuildSubscriptionSlots"
+    const-string v0, "premiumGuildSubscriptions"
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -46,22 +50,31 @@
 
     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;->premiumGuildSubscriptionSlots:Ljava/util/List;
+    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;
 
     return-void
 .end method
 
-.method public static synthetic copy$default(Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;Ljava/util/List;ILjava/lang/Object;)Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;
+.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;
     .locals 0
 
-    and-int/lit8 p2, p2, 0x1
+    and-int/lit8 p4, p3, 0x1
 
-    if-eqz p2, :cond_0
+    if-eqz p4, :cond_0
 
-    iget-object p1, p0, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;->premiumGuildSubscriptionSlots:Ljava/util/List;
+    iget-object p1, p0, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;->premiumGuildSubscriptions:Ljava/util/List;
 
     :cond_0
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;->copy(Ljava/util/List;)Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;
+    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;
 
     move-result-object p0
 
@@ -76,41 +89,51 @@
         value = {
             "()",
             "Ljava/util/List<",
-            "Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;",
+            "Lcom/discord/models/domain/ModelPremiumGuildSubscription;",
             ">;"
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;->premiumGuildSubscriptionSlots:Ljava/util/List;
+    iget-object v0, p0, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;->premiumGuildSubscriptions:Ljava/util/List;
 
     return-object v0
 .end method
 
-.method public final copy(Ljava/util/List;)Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;
+.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;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
             "Ljava/util/List<",
-            "Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;",
-            ">;)",
+            "Lcom/discord/models/domain/ModelPremiumGuildSubscription;",
+            ">;",
+            "Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;",
+            ")",
             "Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;"
         }
     .end annotation
 
-    const-string v0, "premiumGuildSubscriptionSlots"
+    const-string v0, "premiumGuildSubscriptions"
 
     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}, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;-><init>(Ljava/util/List;)V
+    invoke-direct {v0, p1, p2}, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;-><init>(Ljava/util/List;Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;)V
 
     return-object v0
 .end method
 
 .method public final equals(Ljava/lang/Object;)Z
-    .locals 1
+    .locals 2
 
     if-eq p0, p1, :cond_1
 
@@ -120,9 +143,19 @@
 
     check-cast p1, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;
 
-    iget-object v0, p0, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;->premiumGuildSubscriptionSlots:Ljava/util/List;
+    iget-object v0, p0, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;->premiumGuildSubscriptions:Ljava/util/List;
 
-    iget-object p1, p1, 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;
 
     invoke-static {v0, p1}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -144,26 +177,36 @@
     return p1
 .end method
 
-.method public final getPremiumGuildSubscriptionSlots()Ljava/util/List;
+.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;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
             "Ljava/util/List<",
-            "Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;",
+            "Lcom/discord/models/domain/ModelPremiumGuildSubscription;",
             ">;"
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;->premiumGuildSubscriptionSlots:Ljava/util/List;
+    iget-object v0, p0, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;->premiumGuildSubscriptions:Ljava/util/List;
 
     return-object v0
 .end method
 
 .method public final hashCode()I
-    .locals 1
+    .locals 3
 
-    iget-object v0, p0, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;->premiumGuildSubscriptionSlots:Ljava/util/List;
+    iget-object v0, p0, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;->premiumGuildSubscriptions:Ljava/util/List;
+
+    const/4 v1, 0x0
 
     if-eqz v0, :cond_0
 
@@ -171,11 +214,25 @@
 
     move-result v0
 
-    return v0
+    goto :goto_0
 
     :cond_0
     const/4 v0, 0x0
 
+    :goto_0
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v2, p0, Lcom/discord/stores/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
 
@@ -184,11 +241,19 @@
 
     new-instance v0, Ljava/lang/StringBuilder;
 
-    const-string v1, "Loaded(premiumGuildSubscriptionSlots="
+    const-string v1, "Loaded(premiumGuildSubscriptions="
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;->premiumGuildSubscriptionSlots:Ljava/util/List;
+    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;
 
     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 b7bde957cb..fa7ae51ab9 100644
--- a/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$getPremiumGuildSubscriptionsState$1.smali
+++ b/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$getPremiumGuildSubscriptionsState$1.smali
@@ -48,106 +48,118 @@
 
 # virtual methods
 .method public final call(Lcom/discord/stores/StorePremiumGuildSubscription$State;)Lcom/discord/stores/StorePremiumGuildSubscription$State;
-    .locals 4
+    .locals 8
 
     instance-of v0, p1, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;
 
-    if-eqz v0, :cond_4
+    if-eqz v0, :cond_5
 
     iget-object v0, p0, Lcom/discord/stores/StorePremiumGuildSubscription$getPremiumGuildSubscriptionsState$1;->$guildId:Ljava/lang/Long;
 
     if-nez v0, :cond_0
 
-    check-cast p1, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;
+    move-object v0, p1
 
-    invoke-virtual {p1}, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;->getPremiumGuildSubscriptionSlots()Ljava/util/List;
+    check-cast v0, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;
 
-    move-result-object p1
+    invoke-virtual {v0}, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;->getPremiumGuildSubscriptions()Ljava/util/List;
 
-    goto :goto_2
+    move-result-object v0
+
+    goto :goto_3
 
     :cond_0
-    check-cast p1, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;
+    move-object v0, p1
 
-    invoke-virtual {p1}, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;->getPremiumGuildSubscriptionSlots()Ljava/util/List;
+    check-cast v0, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;
 
-    move-result-object p1
+    invoke-virtual {v0}, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;->getPremiumGuildSubscriptions()Ljava/util/List;
 
-    check-cast p1, Ljava/lang/Iterable;
+    move-result-object v0
 
-    new-instance v0, Ljava/util/ArrayList;
+    check-cast v0, Ljava/lang/Iterable;
 
-    invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
+    new-instance v1, Ljava/util/ArrayList;
 
-    check-cast v0, Ljava/util/Collection;
+    invoke-direct {v1}, Ljava/util/ArrayList;-><init>()V
 
-    invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+    check-cast v1, Ljava/util/Collection;
 
-    move-result-object p1
+    invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object v0
 
     :cond_1
     :goto_0
-    invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v1
+    move-result v2
 
-    if-eqz v1, :cond_3
+    if-eqz v2, :cond_4
 
-    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;
+    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
     move-result-object v2
 
-    if-eqz v2, :cond_2
+    move-object v3, v2
 
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelPremiumGuildSubscription;->getGuildId()J
+    check-cast v3, Lcom/discord/models/domain/ModelPremiumGuildSubscription;
 
-    move-result-wide v2
+    invoke-virtual {v3}, Lcom/discord/models/domain/ModelPremiumGuildSubscription;->getGuildId()J
 
-    invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    move-result-wide v3
 
-    move-result-object v2
+    iget-object v5, p0, Lcom/discord/stores/StorePremiumGuildSubscription$getPremiumGuildSubscriptionsState$1;->$guildId:Ljava/lang/Long;
+
+    if-nez v5, :cond_2
 
     goto :goto_1
 
     :cond_2
-    const/4 v2, 0x0
+    invoke-virtual {v5}, Ljava/lang/Long;->longValue()J
 
+    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
-    iget-object v3, p0, Lcom/discord/stores/StorePremiumGuildSubscription$getPremiumGuildSubscriptionsState$1;->$guildId:Ljava/lang/Long;
+    const/4 v3, 0x0
 
-    invoke-static {v2, v3}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    :goto_2
+    if-eqz v3, :cond_1
 
-    move-result v2
-
-    if-eqz v2, :cond_1
-
-    invoke-interface {v0, v1}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+    invoke-interface {v1, v2}, 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 10ce6aa56c..ef215a4501 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;)V
+.method public final handleFetchStateSuccess(Ljava/util/List;Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;)V
     .locals 1
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
@@ -154,18 +154,20 @@
         value = {
             "(",
             "Ljava/util/List<",
-            "Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;",
-            ">;)V"
+            "Lcom/discord/models/domain/ModelPremiumGuildSubscription;",
+            ">;",
+            "Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;",
+            ")V"
         }
     .end annotation
 
-    const-string v0, "premiumGuildSubscriptionSlots"
+    const-string v0, "premiumGuildSubscriptions"
 
     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}, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;-><init>(Ljava/util/List;)V
+    invoke-direct {v0, p1, p2}, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;-><init>(Ljava/util/List;Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;)V
 
     check-cast v0, Lcom/discord/stores/StorePremiumGuildSubscription$State;
 
@@ -196,6 +198,141 @@
     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 7131b1872f..c30a3215d4 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;->IV()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->IT()Lrx/Observable;
 
     move-result-object v0
 
@@ -608,7 +608,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->IV()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->IT()Lrx/Observable;
 
     move-result-object v0
 
@@ -624,7 +624,7 @@
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lrx/Observable;->IV()Lrx/Observable;
+    invoke-virtual {v1}, Lrx/Observable;->IT()Lrx/Observable;
 
     move-result-object v1
 
@@ -801,7 +801,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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;->Je()Lrx/functions/a$b;
+    invoke-static {}, Lrx/functions/a;->Jc()Lrx/functions/a$b;
 
     move-result-object v1
 
-    invoke-static {}, Lrx/functions/a;->Je()Lrx/functions/a$b;
+    invoke-static {}, Lrx/functions/a;->Jc()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 92cc7bd367..090515e76c 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 3b2b97fc99..3fb7005b9d 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 05ffc36db5..5845c3bb4f 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;->zg: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
 
@@ -32,7 +32,7 @@
 
     sget-object v0, Lcom/discord/stores/StoreRtcConnection$WhenMappings;->$EnumSwitchMapping$0:[I
 
-    sget-object v1, Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;->zh: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
 
@@ -44,7 +44,7 @@
 
     sget-object v0, Lcom/discord/stores/StoreRtcConnection$WhenMappings;->$EnumSwitchMapping$0:[I
 
-    sget-object v1, Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;->zi:Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;
+    sget-object v1, Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;->zj: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 d91bdaf8fc..201ea4becc 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 dda74d150e..7ced58cc40 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 e285e4dfda..b3ac88d9ff 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 7006bed8f5..29dabc6ecf 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 4f0fa77d44..489b06ceb8 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 d21c7189f0..fa5dac30cf 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 2ee9419890..d4907ebffe 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 01e4d9a774..37446ebd74 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;->KA()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->Ky()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;->zk:Lcom/discord/rtcconnection/RtcConnection$Quality;
+    sget-object p1, Lcom/discord/rtcconnection/RtcConnection$Quality;->zl: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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v0
 
@@ -187,7 +187,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v0
 
@@ -213,7 +213,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v0
 
@@ -331,7 +331,7 @@
     return-void
 
     :cond_3
-    sget-object v2, Lcom/discord/app/App;->uw:Lcom/discord/app/App$a;
+    sget-object v2, Lcom/discord/app/App;->ux:Lcom/discord/app/App$a;
 
     invoke-static {}, Lcom/discord/app/App;->dx()Z
 
@@ -363,7 +363,17 @@
 
     move-result-object v1
 
-    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;
+    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;
 
     :cond_5
     :goto_1
@@ -371,7 +381,7 @@
 .end method
 
 .method private final createRtcConnection()V
-    .locals 14
+    .locals 12
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
@@ -471,15 +481,15 @@
 
     invoke-virtual {v4}, Lcom/discord/stores/StoreMediaEngine;->getMediaEngine()Lcom/discord/rtcconnection/mediaengine/MediaEngine;
 
-    move-result-object v10
+    move-result-object v9
 
-    if-eqz v0, :cond_a
+    if-eqz v0, :cond_9
 
-    if-eqz v6, :cond_a
+    if-eqz v6, :cond_9
 
     if-nez v2, :cond_4
 
-    goto :goto_6
+    goto :goto_5
 
     :cond_4
     iget-object v4, p0, Lcom/discord/stores/StoreRtcConnection;->rtcConnection:Lcom/discord/rtcconnection/RtcConnection;
@@ -526,68 +536,54 @@
 
     move-result-wide v4
 
-    if-eqz v3, :cond_8
-
-    invoke-virtual {v3}, Ljava/lang/Long;->longValue()J
-
-    move-result-wide v7
-
-    goto :goto_5
-
-    :cond_8
-    invoke-virtual {v2}, Ljava/lang/Long;->longValue()J
-
-    move-result-wide v7
-
-    :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
+    move-result-wide v7
 
-    const/4 v11, 0x0
+    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 v10, v0
 
-    move-object v12, v0
+    check-cast v10, Lcom/discord/utilities/logging/Logger;
 
-    check-cast v12, Lcom/discord/utilities/logging/Logger;
-
-    new-instance v13, Lcom/discord/utilities/networking/NetworkMonitor;
+    new-instance v11, Lcom/discord/utilities/networking/NetworkMonitor;
 
     iget-object v0, p0, Lcom/discord/stores/StoreRtcConnection;->context:Landroid/content/Context;
 
-    if-nez v0, :cond_9
+    if-nez v0, :cond_8
 
     const-string v2, "context"
 
     invoke-static {v2}, Lkotlin/jvm/internal/l;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    :cond_9
-    invoke-direct {v13, v0}, Lcom/discord/utilities/networking/NetworkMonitor;-><init>(Landroid/content/Context;)V
+    :cond_8
+    invoke-direct {v11, v0}, Lcom/discord/utilities/networking/NetworkMonitor;-><init>(Landroid/content/Context;)V
 
     move-object v2, v1
 
-    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
+    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
 
     move-object v0, p0
 
     check-cast v0, Lcom/discord/rtcconnection/RtcConnection$b;
 
-    invoke-virtual {v1, v0}, Lcom/discord/rtcconnection/RtcConnection;->a(Lcom/discord/rtcconnection/RtcConnection$b;)V
+    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
 
     iput-object v1, p0, Lcom/discord/stores/StoreRtcConnection;->rtcConnection:Lcom/discord/rtcconnection/RtcConnection;
 
-    :cond_a
-    :goto_6
+    :cond_9
+    :goto_5
     return-void
 .end method
 
 .method private final destroyRtcConnection()V
-    .locals 1
+    .locals 2
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
@@ -603,7 +599,13 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v0}, Lcom/discord/rtcconnection/RtcConnection;->eu()Ljava/util/concurrent/Future;
+    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;
 
     :cond_0
     const/4 v0, 0x0
@@ -956,7 +958,7 @@
 .method private final recordBreadcrumb(Ljava/lang/String;)V
     .locals 6
 
-    sget-object v0, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
 
     invoke-static {p1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
@@ -1375,7 +1377,7 @@
 
     move-result-object p1
 
-    sget-object v0, Lcom/discord/app/i;->vO:Lcom/discord/app/i;
+    sget-object v0, Lcom/discord/app/i;->vP:Lcom/discord/app/i;
 
     new-instance v0, Lcom/discord/stores/StoreRtcConnection$init$1;
 
@@ -1413,7 +1415,7 @@
 
     move-result-object p1
 
-    sget-object v0, Lcom/discord/app/i;->vO:Lcom/discord/app/i;
+    sget-object v0, Lcom/discord/app/i;->vP:Lcom/discord/app/i;
 
     new-instance v0, Lcom/discord/stores/StoreRtcConnection$init$2;
 
@@ -1451,7 +1453,7 @@
 
     move-result-object p1
 
-    sget-object v0, Lcom/discord/app/i;->vO:Lcom/discord/app/i;
+    sget-object v0, Lcom/discord/app/i;->vP:Lcom/discord/app/i;
 
     new-instance v0, Lcom/discord/stores/StoreRtcConnection$init$4;
 
@@ -1569,29 +1571,7 @@
 .end method
 
 .method public final onSpeaking(JZ)V
-    .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
+    .locals 1
 
     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 9d09225967..dd3f25b23a 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 0e3855befc..f0aea01e4b 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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;->bgy:Lkotlin/Unit;
+    sget-object v1, Lkotlin/Unit;->bgt: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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 9031d15d92..a16398ad1b 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 55904524ce..81fcb4da32 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 8a97eca276..ffa38f146b 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;->Kz()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kx()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -496,7 +496,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 ccaf035506..b7b16d9acc 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 554df19ddc..7b2bc2a687 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 7a312aa9b6..c6aa61a06d 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 7deb945ad8..97e1e87e72 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 6c184bfc9f..5e63d18cf5 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 00de1bc499..49ac91e238 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 3858ca36f2..99f8bd1261 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;->Kz()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kx()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;->KA()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->Ky()Lrx/subjects/PublishSubject;
 
     move-result-object v0
 
@@ -180,7 +180,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/d/a;->Kw()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Ku()Lrx/Scheduler;
 
     move-result-object v1
 
@@ -188,7 +188,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/discord/app/i;->vO:Lcom/discord/app/i;
+    sget-object v1, Lcom/discord/app/i;->vP: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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -470,7 +470,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/d/a;->Kw()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Ku()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 d4b843ca12..a6520fa842 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 28cb6076e8..78284b2686 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 b235ed3698..056de6300f 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 d0cef76946..891fd4d4cb 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 ce2238cb62..61667d8689 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -773,7 +773,7 @@
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lrx/Observable;->IV()Lrx/Observable;
+    invoke-virtual {v1}, Lrx/Observable;->IT()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 c8bd2ef6c4..91b664d38f 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -239,7 +239,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/b/b;->Kf()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/b/b;->Kd()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 008845d928..f71f34573e 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 133b3319d6..27398edeff 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 412f27587b..0e69ca7ff8 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object v0
 .end method
@@ -143,7 +143,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
+    sget-object v1, Lkotlin/Unit;->bgt: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 d61c1f5e68..b8b7521236 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 ff97241dc1..4edab21f6f 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 5da615595e..dde926619d 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 7b722ac2d7..212f731411 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;->Kz()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kx()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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 013509fc29..95f963a19b 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$Companion.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$Companion.smali
@@ -1083,20 +1083,6 @@
     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 e350791a60..7d3bead9d9 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 7f8064f39e..3e89def5df 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 4d1f3283dd..bb0c684794 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 0bd3512402..d2e530a3b5 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 2708ec7ea1..b39d5847a0 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 9bd289765c..851843fcd9 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 aee3d01fe1..47e69a00c8 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 e877bf97f8..a7ade39093 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 9e22657f4d..e6417aaf35 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 54dc6b71da..c0d9e13946 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 b49dd50df9..af91380429 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 387b85bbe9..903b6cc426 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 6a2ff07970..26befd053f 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object v0
 .end method
@@ -508,18 +508,6 @@
 
     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 6495b98a2b..aea7096849 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 06616a6d4f..6dff6efccc 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 ee20b3a368..62423408db 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 2d26b69630..aee28d5b55 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 ba5f9c55bd..d7c31ccde5 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 8b30ce09dd..bbebdd5b7f 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 e57d5ec340..1640c4ced5 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 c213653786..8859196aee 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 ead9552930..b1f4e8f985 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 8bb2a693d5..7f7a6b2348 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 d69fa7d79b..ea1bcf91b4 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 46ba2223ae..8091f7b955 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 36fd74f399..9e29b23aa1 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 5053371af3..4df6c6d1fe 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 1ea35e7dc3..d412d2b423 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 e0c412e103..b963ea3451 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 2ef006c4bc..41c57f2f30 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 b389d12258..ba48da51f5 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 29560f689a..3554843de9 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 c3600545fe..da46af5193 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 b5c66f2689..a24f610d41 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 880855f6c3..e994c49326 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 e65660f7d3..9c074afb41 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 b7ba57b037..970aed8023 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 c4d97a8fe9..7ac79d4f8a 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 1c694d7ea9..87de47ddb7 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 1e17106032..d2b442b879 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 1894e9c9ce..172f683fd2 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 e2ab6374c0..66eeec3456 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 b9cdc651c5..daab51c517 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 1d6470f2b5..af9fdd2bb3 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 08ec918aa7..85d93af5c3 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 4817cde848..9b053f85a3 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 8aea69d322..0abf021c6e 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 1518a6a098..5ce4a8e786 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 42e4e9a64a..db5b92515b 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 be627ea4ef..1cf8e709b3 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 7d94d9833a..c62a3a751a 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 fc8522c0fa..aa2199296d 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 28d625fd8a..396e7139d4 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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
deleted file mode 100644
index b882741dbd..0000000000
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$45.smali
+++ /dev/null
@@ -1,97 +0,0 @@
-.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
deleted file mode 100644
index cebe8236be..0000000000
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$46.smali
+++ /dev/null
@@ -1,97 +0,0 @@
-.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
deleted file mode 100644
index 7b45206f51..0000000000
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$47.smali
+++ /dev/null
@@ -1,97 +0,0 @@
-.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
deleted file mode 100644
index 46a07cad7f..0000000000
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$48.smali
+++ /dev/null
@@ -1,97 +0,0 @@
-.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 3ce34dc6ed..0f9b0f7e1b 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 763d8e1fbd..8a83f3476a 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 e493a55941..1d684edf95 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 ab00e2af35..22c3236a88 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 1629a6285e..ad967c5168 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 7f86e26ab0..2938149bd3 100644
--- a/com.discord/smali/com/discord/stores/StoreStream.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream.smali
@@ -188,8 +188,6 @@
 
 .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;
@@ -643,6 +641,16 @@
 
     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;
@@ -811,30 +819,10 @@
 
     iget-object v1, p0, Lcom/discord/stores/StoreStream;->users:Lcom/discord/stores/StoreUser;
 
-    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
+    invoke-direct {v0, v1}, Lcom/discord/stores/StoreApplicationStreaming;-><init>(Lcom/discord/stores/StoreUser;)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
@@ -1292,38 +1280,6 @@
     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
 
@@ -1447,7 +1403,7 @@
         }
     .end annotation
 
-    const/16 v0, 0x24
+    const/16 v0, 0x23
 
     new-array v0, v0, [Lcom/discord/stores/DispatchHandler;
 
@@ -1731,14 +1687,6 @@
 
     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
@@ -1780,7 +1728,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lrx/internal/a/aj;->Jx()Lrx/internal/a/aj;
+    invoke-static {}, Lrx/internal/a/aj;->Jv()Lrx/internal/a/aj;
 
     move-result-object v0
 
@@ -1877,7 +1825,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lrx/internal/a/aj;->Jx()Lrx/internal/a/aj;
+    invoke-static {}, Lrx/internal/a/aj;->Jv()Lrx/internal/a/aj;
 
     move-result-object v0
 
@@ -2822,18 +2770,6 @@
     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
 
@@ -3283,10 +3219,6 @@
 
     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 "
@@ -4573,104 +4505,6 @@
     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;
@@ -4790,10 +4624,6 @@
 
     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
@@ -5214,7 +5044,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -5724,9 +5554,9 @@
 
     check-cast v1, Lkotlin/jvm/functions/Function1;
 
-    const-string v3, "streamSessionsReplace"
+    const-string v2, "streamSessionsReplace"
 
-    invoke-direct {p0, v0, v3, v1}, Lcom/discord/stores/StoreStream;->dispatchSubscribe(Lrx/Observable;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
+    invoke-direct {p0, v0, v2, v1}, Lcom/discord/stores/StoreStream;->dispatchSubscribe(Lrx/Observable;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreStream;->gatewaySocket:Lcom/discord/stores/StoreGatewayConnection;
 
@@ -5742,9 +5572,9 @@
 
     check-cast v1, Lkotlin/jvm/functions/Function1;
 
-    const-string v3, "streamUserPaymentSourcesUpdate"
+    const-string v2, "streamUserPaymentSourcesUpdate"
 
-    invoke-direct {p0, v0, v3, v1}, Lcom/discord/stores/StoreStream;->dispatchSubscribe(Lrx/Observable;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
+    invoke-direct {p0, v0, v2, v1}, Lcom/discord/stores/StoreStream;->dispatchSubscribe(Lrx/Observable;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
 
     iget-object v0, p0, Lcom/discord/stores/StoreStream;->gatewaySocket:Lcom/discord/stores/StoreGatewayConnection;
 
@@ -5760,79 +5590,7 @@
 
     check-cast v1, Lkotlin/jvm/functions/Function1;
 
-    const-string v3, "streamUserSubscriptionsUpdate"
-
-    invoke-direct {p0, v0, v3, v1}, Lcom/discord/stores/StoreStream;->dispatchSubscribe(Lrx/Observable;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
-
-    iget-object v0, p0, Lcom/discord/stores/StoreStream;->gatewaySocket:Lcom/discord/stores/StoreGatewayConnection;
-
-    invoke-virtual {v0}, Lcom/discord/stores/StoreGatewayConnection;->getStreamCreate()Lrx/subjects/SerializedSubject;
-
-    move-result-object v0
-
-    check-cast v0, Lrx/Observable;
-
-    new-instance v1, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$45;
-
-    invoke-direct {v1, v2}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$45;-><init>(Lcom/discord/stores/StoreStream;)V
-
-    check-cast v1, Lkotlin/jvm/functions/Function1;
-
-    const-string v3, "streamStreamCreate"
-
-    invoke-direct {p0, v0, v3, v1}, Lcom/discord/stores/StoreStream;->dispatchSubscribe(Lrx/Observable;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
-
-    iget-object v0, p0, Lcom/discord/stores/StoreStream;->gatewaySocket:Lcom/discord/stores/StoreGatewayConnection;
-
-    invoke-virtual {v0}, Lcom/discord/stores/StoreGatewayConnection;->getStreamUpdate()Lrx/subjects/SerializedSubject;
-
-    move-result-object v0
-
-    check-cast v0, Lrx/Observable;
-
-    new-instance v1, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$46;
-
-    invoke-direct {v1, v2}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$46;-><init>(Lcom/discord/stores/StoreStream;)V
-
-    check-cast v1, Lkotlin/jvm/functions/Function1;
-
-    const-string v3, "streamStreamUpdate"
-
-    invoke-direct {p0, v0, v3, v1}, Lcom/discord/stores/StoreStream;->dispatchSubscribe(Lrx/Observable;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
-
-    iget-object v0, p0, Lcom/discord/stores/StoreStream;->gatewaySocket:Lcom/discord/stores/StoreGatewayConnection;
-
-    invoke-virtual {v0}, Lcom/discord/stores/StoreGatewayConnection;->getStreamDelete()Lrx/subjects/SerializedSubject;
-
-    move-result-object v0
-
-    check-cast v0, Lrx/Observable;
-
-    new-instance v1, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$47;
-
-    invoke-direct {v1, v2}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$47;-><init>(Lcom/discord/stores/StoreStream;)V
-
-    check-cast v1, Lkotlin/jvm/functions/Function1;
-
-    const-string v3, "streamStreamDelete"
-
-    invoke-direct {p0, v0, v3, v1}, Lcom/discord/stores/StoreStream;->dispatchSubscribe(Lrx/Observable;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
-
-    iget-object v0, p0, Lcom/discord/stores/StoreStream;->gatewaySocket:Lcom/discord/stores/StoreGatewayConnection;
-
-    invoke-virtual {v0}, Lcom/discord/stores/StoreGatewayConnection;->getStreamServerUpdate()Lrx/subjects/SerializedSubject;
-
-    move-result-object v0
-
-    check-cast v0, Lrx/Observable;
-
-    new-instance v1, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$48;
-
-    invoke-direct {v1, v2}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$48;-><init>(Lcom/discord/stores/StoreStream;)V
-
-    check-cast v1, Lkotlin/jvm/functions/Function1;
-
-    const-string v2, "streamStreamServerUpdate"
+    const-string v2, "streamUserSubscriptionsUpdate"
 
     invoke-direct {p0, v0, v2, v1}, Lcom/discord/stores/StoreStream;->dispatchSubscribe(Lrx/Observable;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
 
@@ -6585,14 +6343,6 @@
     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
 
@@ -6829,7 +6579,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreStream;->scheduler:Lrx/Scheduler;
 
-    invoke-virtual {v0}, Lrx/Scheduler;->IY()Lrx/Scheduler$Worker;
+    invoke-virtual {v0}, Lrx/Scheduler;->IW()Lrx/Scheduler$Worker;
 
     move-result-object v0
 
@@ -6843,39 +6593,3 @@
 
     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
deleted file mode 100644
index 90a5cf5fe1..0000000000
--- a/com.discord/smali/com/discord/stores/StoreStreamRtcConnection$Actions$videoUpdate$1.smali
+++ /dev/null
@@ -1,78 +0,0 @@
-.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
deleted file mode 100644
index 033c6fede8..0000000000
--- a/com.discord/smali/com/discord/stores/StoreStreamRtcConnection$Actions.smali
+++ /dev/null
@@ -1,102 +0,0 @@
-.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/stores/StoreStreamRtcConnection$Companion.smali b/com.discord/smali/com/discord/stores/StoreStreamRtcConnection$Companion.smali
deleted file mode 100644
index 3302123d9d..0000000000
--- a/com.discord/smali/com/discord/stores/StoreStreamRtcConnection$Companion.smali
+++ /dev/null
@@ -1,32 +0,0 @@
-.class public final Lcom/discord/stores/StoreStreamRtcConnection$Companion;
-.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 = "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/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
deleted file mode 100644
index a194fe4158..0000000000
--- a/com.discord/smali/com/discord/stores/StoreStreamRtcConnection.smali
+++ /dev/null
@@ -1,683 +0,0 @@
-.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 b78a4a8e02..3de1455794 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 ebd96d247f..d992221905 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 866d095c93..946b5c6efc 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 cbb6d7634f..5b6e291d74 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 ea1fa167b5..b04821d583 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 c6423f9be4..cecd6bec2e 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 8e96cdbb5c..7843c2c805 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 2d405ce8af..6822a7a20e 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 a5515b1364..0802b5efeb 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 d5e20a5bc0..7a9a4ba6aa 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 b112b94350..4ae34c4159 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 2c6bd1a11c..a503e1c6b0 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 04aa44574a..d6bc2c9b7c 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;->Kz()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kx()Lrx/subjects/BehaviorSubject;
 
     move-result-object v0
 
@@ -502,7 +502,7 @@
 
     move-result-object p1
 
-    sget-object p2, Lcom/discord/app/i;->vO:Lcom/discord/app/i;
+    sget-object p2, Lcom/discord/app/i;->vP: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 e2c01b774d..f9b11f751d 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;->JI()Lrx/internal/a/ba;
+    invoke-static {}, Lrx/internal/a/ba;->JG()Lrx/internal/a/ba;
 
     move-result-object v0
 
@@ -413,7 +413,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object p2
 
@@ -449,7 +449,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object p2
 
@@ -482,7 +482,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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, 0x7f1203e3
+    const v6, 0x7f1203be
 
     move-object v1, p0
 
@@ -641,16 +641,16 @@
 
     if-eqz p2, :cond_0
 
-    const p2, 0x7f1203e3
+    const p2, 0x7f1203be
 
-    const v6, 0x7f1203e3
+    const v6, 0x7f1203be
 
     goto :goto_0
 
     :cond_0
-    const p2, 0x7f1203b4
+    const p2, 0x7f12038f
 
-    const v6, 0x7f1203b4
+    const v6, 0x7f12038f
 
     :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, 0x7f1203e3
+    const v6, 0x7f1203be
 
     move-object v1, p0
 
@@ -715,7 +715,7 @@
 
     invoke-direct {v4, p3}, Lcom/discord/restapi/RestAPIParams$UserGuildSettings;-><init>(I)V
 
-    const v5, 0x7f1210dc
+    const v5, 0x7f121050
 
     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, 0x7f1210dc
+    const v5, 0x7f121050
 
     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 2b78fbb0b8..24d5461041 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 e62e29a20c..49b4459db6 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object p2
 
@@ -861,7 +861,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v0
 
@@ -895,7 +895,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 3db2f16ebe..ad93ad9308 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object p2
 
@@ -301,7 +301,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 d198c7d98d..cc7e342548 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 b10aa801b5..caf7e831d1 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 9c9113deff..c29df536c1 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v0
 
@@ -212,7 +212,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v0
 
@@ -250,7 +250,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -537,7 +537,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/discord/app/i;->vO:Lcom/discord/app/i;
+    sget-object v1, Lcom/discord/app/i;->vP: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 5e03952a41..75e451d908 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 99dc5a8823..08bcb86308 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;->Kz()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kx()Lrx/subjects/BehaviorSubject;
 
     move-result-object v1
 
@@ -132,7 +132,7 @@
 
     new-instance v0, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kx()Lrx/subjects/BehaviorSubject;
 
     move-result-object v1
 
@@ -142,7 +142,7 @@
 
     new-instance v0, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kx()Lrx/subjects/BehaviorSubject;
 
     move-result-object v1
 
@@ -210,7 +210,7 @@
 
     new-instance v0, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kx()Lrx/subjects/BehaviorSubject;
 
     move-result-object v1
 
@@ -220,7 +220,7 @@
 
     new-instance v0, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kx()Lrx/subjects/BehaviorSubject;
 
     move-result-object v1
 
@@ -651,7 +651,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -1116,7 +1116,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -1385,7 +1385,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f12122e
+    const v1, 0x7f1211a1
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -1540,7 +1540,7 @@
 
     move-result-object p2
 
-    const v0, 0x7f120b2c
+    const v0, 0x7f120af6
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -1868,7 +1868,7 @@
 
     move-result-object p2
 
-    const v0, 0x7f12122e
+    const v0, 0x7f1211a1
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -1899,7 +1899,7 @@
 
     move-result-object p2
 
-    const v0, 0x7f12122d
+    const v0, 0x7f1211a0
 
     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 418452c0e6..791b65f717 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 38407f4855..af741fd8db 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 d46519c124..4b6b5bb0e4 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 f87e875fc5..c24874c92c 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 366f216518..75a13f9f66 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 f2ba760293..a5c0adc6da 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 da96a95a34..e824402430 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 5cff3b4756..49b14f1dc4 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 fef8e580b3..cfc92f3a74 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 dc0e123138..bce5d5aab0 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 05c73ee617..c24818c1dc 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 d1750115fd..0770d42a60 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v0
 
@@ -126,7 +126,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v0
 
@@ -428,7 +428,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -459,14 +459,6 @@
     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;
@@ -888,11 +880,3 @@
 
     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 9dfe7eb0b5..e2c70cf8bc 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 Lcom/discord/stores/StoreVoiceParticipants$get$1$2;
-.super Ljava/lang/Object;
+.class final synthetic Lcom/discord/stores/StoreVoiceParticipants$get$1$2;
+.super Lkotlin/jvm/internal/j;
 .source "StoreVoiceParticipants.kt"
 
 # interfaces
-.implements Lrx/functions/Func8;
+.implements Lkotlin/jvm/functions/Function7;
 
 
 # annotations
@@ -12,60 +12,93 @@
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
+    accessFlags = 0x1018
     name = null
 .end annotation
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "<T1:",
-        "Ljava/lang/Object;",
-        "T2:",
-        "Ljava/lang/Object;",
-        "T3:",
-        "Ljava/lang/Object;",
-        "T4:",
-        "Ljava/lang/Object;",
-        "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;>;"
+        "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;",
+        ">;>;"
     }
 .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$get$1;Ljava/lang/Long;)V
-    .locals 0
+.method constructor <init>(Lcom/discord/stores/StoreVoiceParticipants;)V
+    .locals 1
 
-    iput-object p1, p0, Lcom/discord/stores/StoreVoiceParticipants$get$1$2;->this$0:Lcom/discord/stores/StoreVoiceParticipants$get$1;
+    const/4 v0, 0x7
 
-    iput-object p2, p0, Lcom/discord/stores/StoreVoiceParticipants$get$1$2;->$guildId:Ljava/lang/Long;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+    invoke-direct {p0, v0, p1}, Lkotlin/jvm/internal/j;-><init>(ILjava/lang/Object;)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+.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;
     .locals 0
 
     check-cast p1, Lcom/discord/models/domain/ModelUser;
@@ -76,23 +109,21 @@
 
     check-cast p4, Ljava/util/Set;
 
-    check-cast p5, Ljava/util/List;
+    check-cast p5, Ljava/util/Collection;
 
     check-cast p6, Ljava/util/Map;
 
     check-cast p7, 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;
+    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;
 
     move-result-object p1
 
     return-object p1
 .end method
 
-.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
+.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
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -109,7 +140,7 @@
             "Ljava/util/Set<",
             "Ljava/lang/Long;",
             ">;",
-            "Ljava/util/List<",
+            "Ljava/util/Collection<",
             "Ljava/lang/Long;",
             ">;",
             "Ljava/util/Map<",
@@ -118,10 +149,9 @@
             ">;",
             "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;",
@@ -129,77 +159,55 @@
         }
     .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
 
-    move-object/from16 v1, p5
+    iget-object v1, v0, Lcom/discord/stores/StoreVoiceParticipants$get$1$2;->receiver:Ljava/lang/Object;
 
-    const-string v2, "isRinging"
+    check-cast v1, Lcom/discord/stores/StoreVoiceParticipants;
 
-    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;
+    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;
 
     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 6612f463ba..7186bc40f5 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 11
+    .locals 10
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -235,47 +235,41 @@
 
     invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
-    move-result-wide v8
+    move-result-wide v0
 
-    invoke-virtual {p1, v8, v9}, Lcom/discord/stores/StoreGuilds;->getComputed(J)Lrx/Observable;
+    invoke-virtual {p1, v0, v1}, Lcom/discord/stores/StoreGuilds;->getComputed(J)Lrx/Observable;
 
     move-result-object p1
 
-    const-string v1, "stream\n                 \u2026    .getComputed(guildId)"
+    const-string v0, "stream\n                 \u2026    .getComputed(guildId)"
 
-    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-wide/16 v8, 0x1
+    const-wide/16 v0, 0x1
 
-    sget-object v1, Ljava/util/concurrent/TimeUnit;->SECONDS:Ljava/util/concurrent/TimeUnit;
+    sget-object v8, Ljava/util/concurrent/TimeUnit;->SECONDS:Ljava/util/concurrent/TimeUnit;
 
-    invoke-static {p1, v8, v9, v1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->leadingEdgeThrottle(Lrx/Observable;JLjava/util/concurrent/TimeUnit;)Lrx/Observable;
+    invoke-static {p1, v0, v1, v8}, 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;
 
-    invoke-direct {p1, p0, v0}, Lcom/discord/stores/StoreVoiceParticipants$get$1$2;-><init>(Lcom/discord/stores/StoreVoiceParticipants$get$1;Ljava/lang/Long;)V
+    iget-object v0, p0, Lcom/discord/stores/StoreVoiceParticipants$get$1;->this$0:Lcom/discord/stores/StoreVoiceParticipants;
 
-    move-object v10, p1
+    invoke-direct {p1, v0}, Lcom/discord/stores/StoreVoiceParticipants$get$1$2;-><init>(Lcom/discord/stores/StoreVoiceParticipants;)V
 
-    check-cast v10, Lrx/functions/Func8;
+    check-cast p1, Lkotlin/jvm/functions/Function7;
 
-    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;
+    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;
 
     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 8ac6a6a311..7857624a4e 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreVoiceParticipants$sam$rx_functions_Func7$0.smali b/com.discord/smali/com/discord/stores/StoreVoiceParticipants$sam$rx_functions_Func7$0.smali
new file mode 100644
index 0000000000..62de350811
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/StoreVoiceParticipants$sam$rx_functions_Func7$0.smali
@@ -0,0 +1,50 @@
+.class final Lcom/discord/stores/StoreVoiceParticipants$sam$rx_functions_Func7$0;
+.super Ljava/lang/Object;
+.source "StoreVoiceParticipants.kt"
+
+# interfaces
+.implements Lrx/functions/Func7;
+
+
+# instance fields
+.field private final synthetic function:Lkotlin/jvm/functions/Function7;
+
+
+# direct methods
+.method constructor <init>(Lkotlin/jvm/functions/Function7;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lcom/discord/stores/StoreVoiceParticipants$sam$rx_functions_Func7$0;->function:Lkotlin/jvm/functions/Function7;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final synthetic call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 8
+
+    iget-object v0, p0, Lcom/discord/stores/StoreVoiceParticipants$sam$rx_functions_Func7$0;->function:Lkotlin/jvm/functions/Function7;
+
+    move-object v1, p1
+
+    move-object v2, p2
+
+    move-object v3, p3
+
+    move-object v4, p4
+
+    move-object v5, p5
+
+    move-object v6, p6
+
+    move-object v7, p7
+
+    invoke-interface/range {v0 .. v7}, Lkotlin/jvm/functions/Function7;->invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/stores/StoreVoiceParticipants.smali b/com.discord/smali/com/discord/stores/StoreVoiceParticipants.smali
index 887c2085eb..5b3f8bdcb7 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;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;
+.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;
     .locals 0
 
-    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;
+    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;
 
     move-result-object p0
 
@@ -64,11 +64,11 @@
     return-object p0
 .end method
 
-.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
+.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
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "(J",
+            "(",
             "Lcom/discord/models/domain/ModelUser;",
             "Ljava/util/Collection<",
             "+",
@@ -93,9 +93,7 @@
             "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;",
@@ -103,514 +101,282 @@
         }
     .end annotation
 
-    move-object/from16 v0, p5
+    move-object/from16 v0, p3
 
-    move-object/from16 v1, p6
+    move-object/from16 v1, p4
 
-    move-object/from16 v2, p7
+    move-object/from16 v2, p5
 
-    move-object/from16 v3, p8
+    move-object/from16 v3, p6
 
-    move-object/from16 v4, p9
+    move-object/from16 v4, p7
 
-    invoke-virtual/range {p10 .. p10}, Lcom/discord/stores/StoreApplicationStreaming$State;->getStreamsByUser()Ljava/util/Map;
+    const/4 v5, 0x1
 
-    move-result-object v5
+    new-array v5, v5, [Lkotlin/Pair;
 
-    new-instance v6, Ljava/util/LinkedHashMap;
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelUser;->getId()J
 
-    invoke-direct {v6}, Ljava/util/LinkedHashMap;-><init>()V
+    move-result-wide v6
 
-    check-cast v6, Ljava/util/Map;
+    invoke-static {v6, v7}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    invoke-interface {v5}, Ljava/util/Map;->entrySet()Ljava/util/Set;
+    move-result-object v6
 
-    move-result-object v5
+    new-instance v15, Lcom/discord/models/domain/ModelVoice$User;
 
-    invoke-interface {v5}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelUser;->getId()J
 
-    move-result-object v5
+    move-result-wide v7
 
-    :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;
+    invoke-static {v7, v8}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object v7
 
-    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;
+    invoke-interface {v0, v7}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v7
 
-    invoke-interface {v6, v8, v7}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    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
 
     goto :goto_0
 
-    :cond_2
-    new-array v5, v9, [Lkotlin/Pair;
+    :cond_0
+    move-object/from16 v14, v16
 
-    invoke-virtual/range {p3 .. p3}, Lcom/discord/models/domain/ModelUser;->getId()J
+    :goto_0
+    const/4 v13, 0x1
 
-    move-result-wide v10
+    move-object v7, v15
 
-    invoke-static {v10, v11}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    move-object/from16 v8, p1
 
-    move-result-object v7
+    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
 
-    invoke-virtual/range {p3 .. p3}, Lcom/discord/models/domain/ModelUser;->getId()J
+    invoke-static {v6, v15}, Lkotlin/q;->to(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
 
-    move-result-wide v10
+    move-result-object v6
 
-    invoke-static {v10, v11}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    const/4 v7, 0x0
 
-    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
+    aput-object v6, v5, v7
 
     invoke-static {v5}, Lkotlin/a/ad;->mutableMapOf([Lkotlin/Pair;)Ljava/util/Map;
 
     move-result-object v5
 
-    move-object/from16 v7, p4
+    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;
 
     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_6
+    :goto_3
     invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v1
 
-    if-eqz v1, :cond_c
+    if-eqz v1, :cond_3
 
     invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
@@ -636,9 +402,9 @@
 
     invoke-interface {v5, v2, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    goto :goto_6
+    goto :goto_3
 
-    :cond_c
+    :cond_3
     return-object v5
 .end method
 
@@ -776,7 +542,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object p2
 
@@ -814,7 +580,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 508eea74db..0b6bb824b2 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;->Kz()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kx()Lrx/subjects/BehaviorSubject;
 
     move-result-object v1
 
@@ -209,7 +209,7 @@
     return-object p0
 
     :cond_0
-    invoke-static {}, Lrx/Observable;->IT()Lrx/Observable;
+    invoke-static {}, Lrx/Observable;->IR()Lrx/Observable;
 
     move-result-object p0
 
@@ -296,7 +296,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 3255716934..0bf1111c98 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object p2
 
@@ -420,7 +420,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 8e3fe3c9e2..d050ebb37e 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;->tw:Ljava/nio/charset/Charset;
+    sget-object p3, Lkotlin/text/d;->tx: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 2da6104d2f..99965a2928 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;->bhP:Lkotlin/properties/a;
+    sget-object v1, Lkotlin/properties/a;->bhK: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/974"
+    const-string v2, "Discord-Android/975"
 
     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, 0x3ce
+    const/16 v1, 0x3cf
 
     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.4"
+    const-string v2, "9.7.5"
 
     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
deleted file mode 100644
index 88f3e250f5..0000000000
--- a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$WhenMappings.smali
+++ /dev/null
@@ -1,94 +0,0 @@
-.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 d7f05f4b4c..43a7291ab7 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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
deleted file mode 100644
index d132bfbb71..0000000000
--- a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$getAppSnapshot$1.smali
+++ /dev/null
@@ -1,598 +0,0 @@
-.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 a8f9922d45..54a39c1555 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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
deleted file mode 100644
index 6c1dfb29b8..0000000000
--- a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$trackFor$1.smali
+++ /dev/null
@@ -1,100 +0,0 @@
-.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
deleted file mode 100644
index d7dfa55c23..0000000000
--- a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$trackFor$2.smali
+++ /dev/null
@@ -1,107 +0,0 @@
-.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
deleted file mode 100644
index 499d182504..0000000000
--- a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$trackFor$3.smali
+++ /dev/null
@@ -1,89 +0,0 @@
-.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 d4b2301ca8..0a13fc22a0 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 77eb4d0e65..2e5e351c68 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 34c0f7140d..74c4290502 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 5cc03ff72d..b5513f013d 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 ee5bdcf82b..0b734bfa38 100644
--- a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker.smali
@@ -94,16 +94,6 @@
     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
 
@@ -218,7 +208,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->IV()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->IT()Lrx/Observable;
 
     move-result-object v0
 
@@ -264,7 +254,7 @@
 
     move-result-object p0
 
-    sget-object p1, Lcom/discord/app/i;->vO:Lcom/discord/app/i;
+    sget-object p1, Lcom/discord/app/i;->vP:Lcom/discord/app/i;
 
     sget-object p1, Lcom/discord/utilities/analytics/AnalyticsTracker$addAttachment$2;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker$addAttachment$2;
 
@@ -959,180 +949,6 @@
     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
 
@@ -2011,7 +1827,7 @@
 
     invoke-direct {v1}, Lcom/crashlytics/android/answers/ai;-><init>()V
 
-    iget-object v2, v1, Lcom/crashlytics/android/answers/ai;->qm:Lcom/crashlytics/android/answers/b;
+    iget-object v2, v1, Lcom/crashlytics/android/answers/ai;->qn:Lcom/crashlytics/android/answers/b;
 
     const-string v3, "invite"
 
@@ -2023,7 +1839,7 @@
 
     move-result-object v2
 
-    iget-object v3, v1, Lcom/crashlytics/android/answers/ai;->qm:Lcom/crashlytics/android/answers/b;
+    iget-object v3, v1, Lcom/crashlytics/android/answers/ai;->qn:Lcom/crashlytics/android/answers/b;
 
     const-string v4, "contentId"
 
@@ -2058,7 +1874,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;->pp:Z
+    iget-boolean p0, v0, Lcom/crashlytics/android/answers/Answers;->pq:Z
 
     if-eqz p0, :cond_5
 
@@ -2069,11 +1885,11 @@
     return-void
 
     :cond_5
-    iget-object p0, v0, Lcom/crashlytics/android/answers/Answers;->pq:Lcom/crashlytics/android/answers/ac;
+    iget-object p0, v0, Lcom/crashlytics/android/answers/Answers;->pr:Lcom/crashlytics/android/answers/ac;
 
     if-eqz p0, :cond_6
 
-    iget-object p0, v0, Lcom/crashlytics/android/answers/Answers;->pq:Lcom/crashlytics/android/answers/ac;
+    iget-object p0, v0, Lcom/crashlytics/android/answers/Answers;->pr:Lcom/crashlytics/android/answers/ac;
 
     invoke-virtual {p0, v1}, Lcom/crashlytics/android/answers/ac;->a(Lcom/crashlytics/android/answers/w;)V
 
@@ -2632,112 +2448,6 @@
     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;
@@ -2811,7 +2521,7 @@
 
     move-result-object p1
 
-    sget-object p2, Lcom/discord/app/i;->vO:Lcom/discord/app/i;
+    sget-object p2, Lcom/discord/app/i;->vP:Lcom/discord/app/i;
 
     sget-object p2, Lcom/discord/utilities/analytics/AnalyticsTracker;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker;
 
@@ -4165,7 +3875,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/discord/app/i;->vO:Lcom/discord/app/i;
+    sget-object v1, Lcom/discord/app/i;->vP:Lcom/discord/app/i;
 
     new-instance v1, Lcom/discord/utilities/analytics/AnalyticsTracker$inviteSuggestionOpened$2;
 
@@ -4285,7 +3995,7 @@
 
     invoke-direct {v1}, Lcom/crashlytics/android/answers/v;-><init>()V
 
-    iget-object v2, v1, Lcom/crashlytics/android/answers/v;->qm:Lcom/crashlytics/android/answers/b;
+    iget-object v2, v1, Lcom/crashlytics/android/answers/v;->qn:Lcom/crashlytics/android/answers/b;
 
     const-string v3, "email"
 
@@ -4293,7 +4003,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;->qm:Lcom/crashlytics/android/answers/b;
+    iget-object v2, v1, Lcom/crashlytics/android/answers/v;->qn:Lcom/crashlytics/android/answers/b;
 
     invoke-static {p1}, Ljava/lang/Boolean;->toString(Z)Ljava/lang/String;
 
@@ -4314,7 +4024,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;->pp:Z
+    iget-boolean p1, v0, Lcom/crashlytics/android/answers/Answers;->pq:Z
 
     if-eqz p1, :cond_2
 
@@ -4325,11 +4035,11 @@
     return-void
 
     :cond_2
-    iget-object p1, v0, Lcom/crashlytics/android/answers/Answers;->pq:Lcom/crashlytics/android/answers/ac;
+    iget-object p1, v0, Lcom/crashlytics/android/answers/Answers;->pr:Lcom/crashlytics/android/answers/ac;
 
     if-eqz p1, :cond_3
 
-    iget-object p1, v0, Lcom/crashlytics/android/answers/Answers;->pq:Lcom/crashlytics/android/answers/ac;
+    iget-object p1, v0, Lcom/crashlytics/android/answers/Answers;->pr:Lcom/crashlytics/android/answers/ac;
 
     invoke-virtual {p1, v1}, Lcom/crashlytics/android/answers/ac;->a(Lcom/crashlytics/android/answers/w;)V
 
@@ -5181,7 +4891,7 @@
     return-void
 
     :cond_d
-    sget-object v0, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
 
     new-instance p1, Ljava/lang/StringBuilder;
 
@@ -5268,7 +4978,7 @@
 
     invoke-direct {v1}, Lcom/crashlytics/android/answers/aj;-><init>()V
 
-    iget-object v2, v1, Lcom/crashlytics/android/answers/aj;->qm:Lcom/crashlytics/android/answers/b;
+    iget-object v2, v1, Lcom/crashlytics/android/answers/aj;->qn:Lcom/crashlytics/android/answers/b;
 
     const-string v3, "email"
 
@@ -5276,7 +4986,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;->qm:Lcom/crashlytics/android/answers/b;
+    iget-object v2, v1, Lcom/crashlytics/android/answers/aj;->qn:Lcom/crashlytics/android/answers/b;
 
     invoke-static {p1}, Ljava/lang/Boolean;->toString(Z)Ljava/lang/String;
 
@@ -5286,7 +4996,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;->pp:Z
+    iget-boolean p1, v0, Lcom/crashlytics/android/answers/Answers;->pq:Z
 
     if-eqz p1, :cond_1
 
@@ -5297,11 +5007,11 @@
     return-void
 
     :cond_1
-    iget-object p1, v0, Lcom/crashlytics/android/answers/Answers;->pq:Lcom/crashlytics/android/answers/ac;
+    iget-object p1, v0, Lcom/crashlytics/android/answers/Answers;->pr:Lcom/crashlytics/android/answers/ac;
 
     if-eqz p1, :cond_2
 
-    iget-object p1, v0, Lcom/crashlytics/android/answers/Answers;->pq:Lcom/crashlytics/android/answers/ac;
+    iget-object p1, v0, Lcom/crashlytics/android/answers/Answers;->pr:Lcom/crashlytics/android/answers/ac;
 
     invoke-virtual {p1, v1}, Lcom/crashlytics/android/answers/ac;->a(Lcom/crashlytics/android/answers/w;)V
 
@@ -5309,141 +5019,6 @@
     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$Companion.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticsUtils$Tracker$Companion.smali
index 7b99ecd178..e65a6c0860 100644
--- a/com.discord/smali/com/discord/utilities/analytics/AnalyticsUtils$Tracker$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticsUtils$Tracker$Companion.smali
@@ -38,9 +38,9 @@
 
     new-instance v0, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;
 
-    new-instance v1, Lcom/discord/utilities/analytics/SystemClock;
+    new-instance v1, Lcom/discord/utilities/clocks/SystemClock;
 
-    invoke-direct {v1}, Lcom/discord/utilities/analytics/SystemClock;-><init>()V
+    invoke-direct {v1}, Lcom/discord/utilities/clocks/SystemClock;-><init>()V
 
     check-cast v1, Lcom/discord/utilities/clocks/Clock;
 
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 891ab6831f..cba07dd3f4 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;->vm:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vn: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;->axe:Z
+    iget-boolean v0, p2, Lcom/google/firebase/analytics/FirebaseAnalytics;->axa:Z
 
     if-eqz v0, :cond_0
 
-    iget-object p2, p2, Lcom/google/firebase/analytics/FirebaseAnalytics;->aQi:Lcom/google/android/gms/internal/measurement/me;
+    iget-object p2, p2, Lcom/google/firebase/analytics/FirebaseAnalytics;->aQe: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;->aBK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p2, Lcom/google/firebase/analytics/FirebaseAnalytics;->aBG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->ya()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;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vq()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 132c2ee314..1448b05c65 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 fcec4a4dcc..7240cea33f 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;->Ho()Ljava/lang/String;
+    invoke-virtual {v3}, Lokio/c;->Hm()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 05b3863ed9..d866dab933 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;->bhO:Lkotlin/jvm/internal/ab;
+    sget-object v8, Lkotlin/jvm/internal/ab;->bhJ:Lkotlin/jvm/internal/ab;
 
     const-string v8, "#%06X"
 
@@ -832,7 +832,7 @@
 
     move-result-object v6
 
-    const v7, 0x7f100064
+    const v7, 0x7f100063
 
     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, 0x7f100067
+    const v7, 0x7f100066
 
     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;->vm:Lcom/discord/app/AppLog;
+    sget-object v2, Lcom/discord/app/AppLog;->vn: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;->vm:Lcom/discord/app/AppLog;
+    sget-object v5, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
 
     new-instance v0, Ljava/lang/StringBuilder;
 
@@ -1334,9 +1334,9 @@
 
     if-eqz v0, :cond_4
 
-    const v0, 0x7f120888
+    const v0, 0x7f120863
 
-    const v1, 0x7f120887
+    const v1, 0x7f120862
 
     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, 0x7f120886
+    const v0, 0x7f120861
 
-    const v1, 0x7f120885
+    const v1, 0x7f120860
 
     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, 0x7f12088b
+    const v0, 0x7f120866
 
-    const v1, 0x7f12088a
+    const v1, 0x7f120865
 
     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, 0x7f120884
+    const p1, 0x7f12085f
 
     return p1
 
@@ -1418,7 +1418,7 @@
 
     if-nez p1, :cond_1
 
-    const p1, 0x7f12087d
+    const p1, 0x7f120858
 
     return p1
 
@@ -1427,7 +1427,7 @@
 
     if-ne p1, v0, :cond_2
 
-    const p1, 0x7f12087e
+    const p1, 0x7f120859
 
     return p1
 
@@ -1456,9 +1456,9 @@
 
     if-eqz v0, :cond_4
 
-    const v0, 0x7f12087c
+    const v0, 0x7f120857
 
-    const v1, 0x7f12087b
+    const v1, 0x7f120856
 
     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, 0x7f120883
+    const p1, 0x7f12085e
 
     return p1
 
@@ -1488,9 +1488,9 @@
 
     if-eqz v0, :cond_4
 
-    const v0, 0x7f120878
+    const v0, 0x7f120853
 
-    const v1, 0x7f120877
+    const v1, 0x7f120852
 
     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, 0x7f120890
+    const p1, 0x7f12086b
 
     return p1
 
@@ -1568,9 +1568,9 @@
 
     if-eqz v0, :cond_3
 
-    const v0, 0x7f120894
+    const v0, 0x7f12086f
 
-    const v1, 0x7f120893
+    const v1, 0x7f12086e
 
     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, 0x7f120890
+    const p1, 0x7f12086b
 
     return p1
 
@@ -1613,7 +1613,7 @@
 
     const/16 v0, 0xe10
 
-    const v3, 0x7f100026
+    const v3, 0x7f100025
 
     if-eq p1, v0, :cond_3
 
@@ -1638,7 +1638,7 @@
 
     move-result-object p1
 
-    const p2, 0x7f100025
+    const p2, 0x7f100024
 
     new-array v0, v2, [Ljava/lang/Object;
 
@@ -1720,7 +1720,7 @@
 
     move-result-object p1
 
-    const p2, 0x7f100028
+    const p2, 0x7f100027
 
     new-array v0, v2, [Ljava/lang/Object;
 
@@ -1739,7 +1739,7 @@
     goto :goto_0
 
     :cond_5
-    const p1, 0x7f120c71
+    const p1, 0x7f120c3a
 
     invoke-virtual {p2, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -1804,14 +1804,14 @@
 
     if-ne p1, v5, :cond_1
 
-    const p1, 0x7f1208b6
+    const p1, 0x7f120891
 
     return p1
 
     :cond_1
     if-nez p1, :cond_2
 
-    const p1, 0x7f1208b5
+    const p1, 0x7f120890
 
     return p1
 
@@ -1840,7 +1840,7 @@
 
     if-eqz p1, :cond_14
 
-    const p1, 0x7f1208a5
+    const p1, 0x7f120880
 
     return p1
 
@@ -1853,9 +1853,9 @@
 
     if-eqz v0, :cond_14
 
-    const v0, 0x7f1208b4
+    const v0, 0x7f12088f
 
-    const v1, 0x7f1208b3
+    const v1, 0x7f12088e
 
     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, 0x7f1208ad
+    const v0, 0x7f120888
 
-    const v1, 0x7f1208ac
+    const v1, 0x7f120887
 
     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, 0x7f12089b
+    const p1, 0x7f120876
 
     return p1
 
     :cond_5
-    const p1, 0x7f12089a
+    const p1, 0x7f120875
 
     return p1
 
@@ -1958,12 +1958,12 @@
     return v1
 
     :cond_7
-    const p1, 0x7f1208a3
+    const p1, 0x7f12087e
 
     return p1
 
     :cond_8
-    const p1, 0x7f1208a2
+    const p1, 0x7f12087d
 
     return p1
 
@@ -1983,7 +1983,7 @@
 
     if-eqz p1, :cond_14
 
-    const p1, 0x7f1208a8
+    const p1, 0x7f120883
 
     return p1
 
@@ -1996,7 +1996,7 @@
 
     if-eqz p1, :cond_14
 
-    const p1, 0x7f1208a4
+    const p1, 0x7f12087f
 
     return p1
 
@@ -2009,7 +2009,7 @@
 
     if-eqz p1, :cond_14
 
-    const p1, 0x7f120898
+    const p1, 0x7f120873
 
     return p1
 
@@ -2053,27 +2053,27 @@
     return v1
 
     :cond_a
-    const p1, 0x7f1208b2
+    const p1, 0x7f12088d
 
     return p1
 
     :cond_b
-    const p1, 0x7f1208ae
+    const p1, 0x7f120889
 
     return p1
 
     :cond_c
-    const p1, 0x7f1208b0
+    const p1, 0x7f12088b
 
     return p1
 
     :cond_d
-    const p1, 0x7f1208af
+    const p1, 0x7f12088a
 
     return p1
 
     :cond_e
-    const p1, 0x7f1208b1
+    const p1, 0x7f12088c
 
     return p1
 
@@ -2093,7 +2093,7 @@
 
     if-eqz p1, :cond_14
 
-    const p1, 0x7f1208a7
+    const p1, 0x7f120882
 
     return p1
 
@@ -2106,7 +2106,7 @@
 
     if-eqz p1, :cond_14
 
-    const p1, 0x7f120890
+    const p1, 0x7f12086b
 
     return p1
 
@@ -2119,9 +2119,9 @@
 
     if-eqz v0, :cond_14
 
-    const v0, 0x7f1208aa
+    const v0, 0x7f120885
 
-    const v1, 0x7f1208a9
+    const v1, 0x7f120884
 
     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, 0x7f1208a1
+    const p1, 0x7f12087c
 
     return p1
 
@@ -2151,9 +2151,9 @@
 
     if-eqz v0, :cond_14
 
-    const v0, 0x7f120897
+    const v0, 0x7f120872
 
-    const v1, 0x7f120896
+    const v1, 0x7f120871
 
     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, 0x7f12089e
+    const p1, 0x7f120879
 
     return p1
 
     :cond_11
-    const p1, 0x7f1208a0
+    const p1, 0x7f12087b
 
     return p1
 
     :cond_12
-    const p1, 0x7f12089f
+    const p1, 0x7f12087a
 
     return p1
 
@@ -2223,7 +2223,7 @@
 
     if-eqz p1, :cond_14
 
-    const p1, 0x7f120899
+    const p1, 0x7f120874
 
     return p1
 
@@ -2302,14 +2302,14 @@
 
     if-ne p1, v0, :cond_1
 
-    const p1, 0x7f1208c0
+    const p1, 0x7f12089b
 
     return p1
 
     :cond_1
     if-nez p1, :cond_2
 
-    const p1, 0x7f1208bf
+    const p1, 0x7f12089a
 
     return p1
 
@@ -2354,12 +2354,12 @@
 
     if-eqz p1, :cond_4
 
-    const p1, 0x7f1208bb
+    const p1, 0x7f120896
 
     return p1
 
     :cond_4
-    const p1, 0x7f1208bc
+    const p1, 0x7f120897
 
     return p1
 
@@ -2395,12 +2395,12 @@
 
     if-eqz p1, :cond_6
 
-    const p1, 0x7f1208bd
+    const p1, 0x7f120898
 
     return p1
 
     :cond_6
-    const p1, 0x7f1208be
+    const p1, 0x7f120899
 
     return p1
 
@@ -2420,7 +2420,7 @@
 
     if-eqz p1, :cond_8
 
-    const p1, 0x7f1208b8
+    const p1, 0x7f120893
 
     return p1
 
@@ -2433,7 +2433,7 @@
 
     if-eqz p1, :cond_8
 
-    const p1, 0x7f120890
+    const p1, 0x7f12086b
 
     return p1
 
@@ -2446,7 +2446,7 @@
 
     if-eqz p1, :cond_8
 
-    const p1, 0x7f1208b7
+    const p1, 0x7f120892
 
     return p1
 
@@ -2776,7 +2776,7 @@
 
     if-eqz p2, :cond_9
 
-    const p2, 0x7f120884
+    const p2, 0x7f12085f
 
     new-array p3, v4, [Ljava/lang/Object;
 
@@ -2784,7 +2784,7 @@
 
     move-result-object p4
 
-    const v3, 0x7f100063
+    const v3, 0x7f100062
 
     invoke-interface {v0}, Ljava/util/Collection;->size()I
 
@@ -2827,7 +2827,7 @@
 
     if-eqz p2, :cond_9
 
-    const p2, 0x7f120883
+    const p2, 0x7f12085e
 
     new-array p3, v4, [Ljava/lang/Object;
 
@@ -2835,7 +2835,7 @@
 
     move-result-object p4
 
-    const v3, 0x7f100062
+    const v3, 0x7f100061
 
     invoke-interface {v0}, Ljava/util/Collection;->size()I
 
@@ -2975,7 +2975,7 @@
 
     move-result-object p1
 
-    const p2, 0x7f100069
+    const p2, 0x7f100068
 
     invoke-interface {v0}, Ljava/util/Collection;->size()I
 
@@ -3014,7 +3014,7 @@
 
     move-result-object p1
 
-    const p2, 0x7f100063
+    const p2, 0x7f100062
 
     invoke-interface {v0}, Ljava/util/Collection;->size()I
 
@@ -3053,7 +3053,7 @@
 
     move-result-object p1
 
-    const p2, 0x7f100062
+    const p2, 0x7f100061
 
     invoke-interface {v0}, Ljava/util/Collection;->size()I
 
@@ -3092,7 +3092,7 @@
 
     move-result-object p1
 
-    const p2, 0x7f100068
+    const p2, 0x7f100067
 
     invoke-interface {v0}, Ljava/util/Collection;->size()I
 
@@ -3189,14 +3189,14 @@
 
     if-ne p1, v3, :cond_1
 
-    const p1, 0x7f1208da
+    const p1, 0x7f1208b5
 
     return p1
 
     :cond_1
     if-nez p1, :cond_2
 
-    const p1, 0x7f1208d9
+    const p1, 0x7f1208b4
 
     return p1
 
@@ -3241,12 +3241,12 @@
 
     if-nez p1, :cond_4
 
-    const p1, 0x7f1208d6
+    const p1, 0x7f1208b1
 
     return p1
 
     :cond_4
-    const p1, 0x7f1208d4
+    const p1, 0x7f1208af
 
     return p1
 
@@ -3268,7 +3268,7 @@
 
     if-eqz p1, :cond_9
 
-    const p1, 0x7f1208e0
+    const p1, 0x7f1208bb
 
     return p1
 
@@ -3295,14 +3295,14 @@
 
     if-ne p1, v3, :cond_6
 
-    const p1, 0x7f1208dc
+    const p1, 0x7f1208b7
 
     return p1
 
     :cond_6
     if-nez p1, :cond_7
 
-    const p1, 0x7f1208db
+    const p1, 0x7f1208b6
 
     return p1
 
@@ -3329,9 +3329,9 @@
 
     if-eqz v0, :cond_9
 
-    const v0, 0x7f1208de
+    const v0, 0x7f1208b9
 
-    const v1, 0x7f1208dd
+    const v1, 0x7f1208b8
 
     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, 0x7f1208df
+    const p1, 0x7f1208ba
 
     return p1
 
@@ -3361,7 +3361,7 @@
 
     if-eqz p1, :cond_9
 
-    const p1, 0x7f120890
+    const p1, 0x7f12086b
 
     return p1
 
@@ -3403,72 +3403,72 @@
     return p1
 
     :sswitch_0
-    const p1, 0x7f120ba1
+    const p1, 0x7f120b6b
 
     return p1
 
     :sswitch_1
-    const p1, 0x7f120bb1
+    const p1, 0x7f120b7b
 
     return p1
 
     :sswitch_2
-    const p1, 0x7f120bab
+    const p1, 0x7f120b75
 
     return p1
 
     :sswitch_3
-    const p1, 0x7f120ba7
+    const p1, 0x7f120b71
 
     return p1
 
     :sswitch_4
-    const p1, 0x7f1203ca
+    const p1, 0x7f1203a5
 
     return p1
 
     :sswitch_5
-    const p1, 0x7f1212f7
+    const p1, 0x7f12126a
 
     return p1
 
     :sswitch_6
-    const p1, 0x7f120c06
-
-    return p1
-
-    :sswitch_7
-    const p1, 0x7f1204fd
-
-    return p1
-
-    :sswitch_8
-    const p1, 0x7f120c12
-
-    return p1
-
-    :sswitch_9
-    const p1, 0x7f121143
-
-    return p1
-
-    :sswitch_a
-    const p1, 0x7f12044d
-
-    return p1
-
-    :sswitch_b
-    const p1, 0x7f1212f4
-
-    return p1
-
-    :sswitch_c
     const p1, 0x7f120bcf
 
     return p1
 
+    :sswitch_7
+    const p1, 0x7f1204d8
+
+    return p1
+
+    :sswitch_8
+    const p1, 0x7f120bdb
+
+    return p1
+
+    :sswitch_9
+    const p1, 0x7f1210b7
+
+    return p1
+
+    :sswitch_a
+    const p1, 0x7f120428
+
+    return p1
+
+    :sswitch_b
+    const p1, 0x7f121267
+
+    return p1
+
+    :sswitch_c
+    const p1, 0x7f120b99
+
+    return p1
+
     :sswitch_d
-    const p1, 0x7f120f9a
+    const p1, 0x7f120f0e
 
     return p1
 
@@ -3478,42 +3478,42 @@
     return p1
 
     :sswitch_f
-    const p1, 0x7f12059c
+    const p1, 0x7f120577
 
     return p1
 
     :sswitch_10
-    const p1, 0x7f120ba4
+    const p1, 0x7f120b6e
 
     return p1
 
     :sswitch_11
-    const p1, 0x7f1210c3
+    const p1, 0x7f121037
 
     return p1
 
     :sswitch_12
-    const p1, 0x7f1210c1
+    const p1, 0x7f121035
 
     return p1
 
     :sswitch_13
-    const p1, 0x7f120f9b
+    const p1, 0x7f120f0f
 
     return p1
 
     :sswitch_14
-    const p1, 0x7f121178
+    const p1, 0x7f1210ee
 
     return p1
 
     :sswitch_15
-    const p1, 0x7f120f52
+    const p1, 0x7f120ec6
 
     return p1
 
     :sswitch_16
-    const p1, 0x7f1213ec
+    const p1, 0x7f121360
 
     return p1
 
@@ -3523,7 +3523,7 @@
     return p1
 
     :sswitch_18
-    const p1, 0x7f120bad
+    const p1, 0x7f120b77
 
     return p1
 
@@ -3536,12 +3536,12 @@
 
     if-ne p1, p2, :cond_0
 
-    const p1, 0x7f120b9d
+    const p1, 0x7f120b67
 
     return p1
 
     :cond_0
-    const p1, 0x7f120b9f
+    const p1, 0x7f120b69
 
     return p1
 
@@ -3551,17 +3551,17 @@
     return p1
 
     :sswitch_1b
-    const p1, 0x7f1202a2
+    const p1, 0x7f1202a0
 
     return p1
 
     :cond_1
-    const p1, 0x7f120b21
+    const p1, 0x7f120aeb
 
     return p1
 
     :cond_2
-    const p1, 0x7f12049d
+    const p1, 0x7f120478
 
     return p1
 
@@ -3633,7 +3633,7 @@
     if-eq p2, v0, :cond_1
 
     :goto_0
-    const p2, 0x7f0600c3
+    const p2, 0x7f0600c2
 
     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, 0x7f06011b
+    const p2, 0x7f06011a
 
     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, 0x7f060126
+    const p2, 0x7f060125
 
     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, 0x7f060105
+    const p2, 0x7f060104
 
     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, 0x7f1208d1
+    const p1, 0x7f1208ac
 
     return p1
 
@@ -3715,19 +3715,19 @@
 
     if-eqz v0, :cond_7
 
-    const v0, 0x7f1208ca
+    const v0, 0x7f1208a5
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v3
 
-    const v0, 0x7f1208cb
+    const v0, 0x7f1208a6
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v4
 
-    const v0, 0x7f1208cc
+    const v0, 0x7f1208a7
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -3772,14 +3772,14 @@
 
     if-ne p1, v3, :cond_1
 
-    const p1, 0x7f1208c9
+    const p1, 0x7f1208a4
 
     return p1
 
     :cond_1
     if-nez p1, :cond_2
 
-    const p1, 0x7f1208c8
+    const p1, 0x7f1208a3
 
     return p1
 
@@ -3820,14 +3820,14 @@
 
     if-ne p1, v3, :cond_4
 
-    const p1, 0x7f1208c6
+    const p1, 0x7f1208a1
 
     return p1
 
     :cond_4
     if-nez p1, :cond_5
 
-    const p1, 0x7f1208c5
+    const p1, 0x7f1208a0
 
     return p1
 
@@ -3854,7 +3854,7 @@
 
     if-eqz p1, :cond_7
 
-    const p1, 0x7f1208d0
+    const p1, 0x7f1208ab
 
     return p1
 
@@ -3867,7 +3867,7 @@
 
     if-eqz p1, :cond_7
 
-    const p1, 0x7f120890
+    const p1, 0x7f12086b
 
     return p1
 
@@ -3880,7 +3880,7 @@
 
     if-eqz p1, :cond_7
 
-    const p1, 0x7f1208ce
+    const p1, 0x7f1208a9
 
     return p1
 
@@ -3931,7 +3931,7 @@
 
     if-eqz p1, :cond_1
 
-    const p1, 0x7f1208e3
+    const p1, 0x7f1208be
 
     return p1
 
@@ -3944,9 +3944,9 @@
 
     if-eqz v0, :cond_1
 
-    const v0, 0x7f1208e9
+    const v0, 0x7f1208c4
 
-    const v1, 0x7f1208e8
+    const v1, 0x7f1208c3
 
     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, 0x7f120890
+    const p1, 0x7f12086b
 
     return p1
 
@@ -3976,9 +3976,9 @@
 
     if-eqz v0, :cond_1
 
-    const v0, 0x7f1208e5
+    const v0, 0x7f1208c0
 
-    const v1, 0x7f1208e4
+    const v1, 0x7f1208bf
 
     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;->bhO:Lkotlin/jvm/internal/ab;
+    sget-object v0, Lkotlin/jvm/internal/ab;->bhJ: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;->vm:Lcom/discord/app/AppLog;
+    sget-object v1, Lcom/discord/app/AppLog;->vn: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 bb417335a6..bf09046f32 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, 0x7f120892
+    const p1, 0x7f12086d
 
     return p1
 
     :pswitch_1
-    const p1, 0x7f120895
+    const p1, 0x7f120870
 
     return p1
 
     :pswitch_2
-    const p1, 0x7f120891
+    const p1, 0x7f12086c
 
     return p1
 
     :pswitch_3
-    const p1, 0x7f1208e7
+    const p1, 0x7f1208c2
 
     return p1
 
     :pswitch_4
-    const p1, 0x7f1208ea
+    const p1, 0x7f1208c5
 
     return p1
 
     :pswitch_5
-    const p1, 0x7f1208e6
-
-    return p1
-
-    :pswitch_6
-    const p1, 0x7f1208ba
-
-    return p1
-
-    :pswitch_7
     const p1, 0x7f1208c1
 
     return p1
 
+    :pswitch_6
+    const p1, 0x7f120895
+
+    return p1
+
+    :pswitch_7
+    const p1, 0x7f12089c
+
+    return p1
+
     :pswitch_8
-    const p1, 0x7f1208b9
+    const p1, 0x7f120894
 
     return p1
 
     :pswitch_9
-    const p1, 0x7f1208d8
+    const p1, 0x7f1208b3
 
     return p1
 
     :pswitch_a
-    const p1, 0x7f1208e1
+    const p1, 0x7f1208bc
 
     return p1
 
     :pswitch_b
-    const p1, 0x7f1208d7
+    const p1, 0x7f1208b2
 
     return p1
 
     :pswitch_c
-    const p1, 0x7f1208cf
+    const p1, 0x7f1208aa
 
     return p1
 
     :pswitch_d
-    const p1, 0x7f1208d2
+    const p1, 0x7f1208ad
 
     return p1
 
     :pswitch_e
-    const p1, 0x7f1208c4
+    const p1, 0x7f12089f
 
     return p1
 
     :pswitch_f
-    const p1, 0x7f1208c3
+    const p1, 0x7f12089e
 
     return p1
 
     :pswitch_10
-    const p1, 0x7f1208cd
+    const p1, 0x7f1208a8
 
     return p1
 
     :pswitch_11
-    const p1, 0x7f1208c7
+    const p1, 0x7f1208a2
 
     return p1
 
     :pswitch_12
-    const p1, 0x7f120880
+    const p1, 0x7f12085b
 
     return p1
 
     :pswitch_13
-    const p1, 0x7f120881
+    const p1, 0x7f12085c
 
     return p1
 
     :pswitch_14
-    const p1, 0x7f12087f
+    const p1, 0x7f12085a
 
     return p1
 
     :pswitch_15
-    const p1, 0x7f12087a
+    const p1, 0x7f120855
 
     return p1
 
     :pswitch_16
-    const p1, 0x7f12088e
+    const p1, 0x7f120869
 
     return p1
 
@@ -292,17 +292,17 @@
 
     if-eq p1, v0, :cond_3
 
-    const p1, 0x7f120889
+    const p1, 0x7f120864
 
     return p1
 
     :cond_3
-    const p1, 0x7f120879
+    const p1, 0x7f120854
 
     return p1
 
     :cond_4
-    const p1, 0x7f12088f
+    const p1, 0x7f12086a
 
     return p1
 
@@ -322,12 +322,12 @@
     return p1
 
     :cond_7
-    const p1, 0x7f1208d3
+    const p1, 0x7f1208ae
 
     return p1
 
     :cond_8
-    const p1, 0x7f1208ab
+    const p1, 0x7f120886
 
     return p1
 
@@ -946,7 +946,7 @@
 
     if-gez v5, :cond_0
 
-    const v0, 0x7f1208e2
+    const v0, 0x7f1208bd
 
     const/4 v1, 0x2
 
@@ -1038,137 +1038,137 @@
     return p1
 
     :pswitch_0
-    const p1, 0x7f120864
+    const p1, 0x7f12083f
 
     return p1
 
     :pswitch_1
-    const p1, 0x7f120865
+    const p1, 0x7f120840
 
     return p1
 
     :pswitch_2
-    const p1, 0x7f120863
+    const p1, 0x7f12083e
 
     return p1
 
     :pswitch_3
-    const p1, 0x7f120875
+    const p1, 0x7f120850
 
     return p1
 
     :pswitch_4
-    const p1, 0x7f120876
+    const p1, 0x7f120851
 
     return p1
 
     :pswitch_5
-    const p1, 0x7f120874
+    const p1, 0x7f12084f
 
     return p1
 
     :pswitch_6
-    const p1, 0x7f120868
+    const p1, 0x7f120843
 
     return p1
 
     :pswitch_7
-    const p1, 0x7f120869
+    const p1, 0x7f120844
 
     return p1
 
     :pswitch_8
-    const p1, 0x7f120867
+    const p1, 0x7f120842
 
     return p1
 
     :pswitch_9
-    const p1, 0x7f120872
+    const p1, 0x7f12084d
 
     return p1
 
     :pswitch_a
-    const p1, 0x7f120873
+    const p1, 0x7f12084e
 
     return p1
 
     :pswitch_b
-    const p1, 0x7f120871
+    const p1, 0x7f12084c
 
     return p1
 
     :pswitch_c
-    const p1, 0x7f12086e
+    const p1, 0x7f120849
 
     return p1
 
     :pswitch_d
-    const p1, 0x7f12086f
+    const p1, 0x7f12084a
 
     return p1
 
     :pswitch_e
-    const p1, 0x7f12086b
+    const p1, 0x7f120846
 
     return p1
 
     :pswitch_f
-    const p1, 0x7f12086a
+    const p1, 0x7f120845
 
     return p1
 
     :pswitch_10
-    const p1, 0x7f12086d
+    const p1, 0x7f120848
 
     return p1
 
     :pswitch_11
-    const p1, 0x7f12086c
+    const p1, 0x7f120847
 
     return p1
 
     :pswitch_12
-    const p1, 0x7f120860
+    const p1, 0x7f12083b
 
     return p1
 
     :pswitch_13
-    const p1, 0x7f120861
+    const p1, 0x7f12083c
 
     return p1
 
     :pswitch_14
-    const p1, 0x7f12085f
+    const p1, 0x7f12083a
 
     return p1
 
     :pswitch_15
-    const p1, 0x7f12085e
+    const p1, 0x7f120839
 
     return p1
 
     :pswitch_16
-    const p1, 0x7f120862
+    const p1, 0x7f12083d
 
     return p1
 
     :pswitch_17
-    const p1, 0x7f12085d
+    const p1, 0x7f120838
 
     return p1
 
     :cond_0
-    const p1, 0x7f120870
+    const p1, 0x7f12084b
 
     return p1
 
     :cond_1
-    const p1, 0x7f120866
+    const p1, 0x7f120841
 
     return p1
 
     :cond_2
-    const p1, 0x7f1208f6
+    const p1, 0x7f1208d1
 
     return p1
 
@@ -1261,17 +1261,17 @@
     return p1
 
     :cond_1
-    const p1, 0x7f0801f1
+    const p1, 0x7f0801e6
 
     return p1
 
     :cond_2
-    const p1, 0x7f0801f2
+    const p1, 0x7f0801e7
 
     return p1
 
     :cond_3
-    const p1, 0x7f0801f0
+    const p1, 0x7f0801e5
 
     return p1
 .end method
@@ -1496,7 +1496,7 @@
 
     move-result-object p2
 
-    const v5, 0x7f10006a
+    const v5, 0x7f100069
 
     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, 0x7f100066
+    const v0, 0x7f100065
 
     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 53156b302f..847dacfc27 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;->vm:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vn: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 def7ddb532..00c127f49a 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;->vm:Lcom/discord/app/AppLog;
+    sget-object v1, Lcom/discord/app/AppLog;->vn: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;->bzI:I
+    iget v1, v4, Lorg/apache/commons/a/a/b$a;->bzD: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;->bzI:I
+    iget v6, v4, Lorg/apache/commons/a/a/b$a;->bzD: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;->bzI:I
+    iget v6, v4, Lorg/apache/commons/a/a/b$a;->bzD: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;->bzI:I
+    iget v5, v4, Lorg/apache/commons/a/a/b$a;->bzD:I
 
     add-int/2addr v5, v1
 
-    iput v5, v4, Lorg/apache/commons/a/a/b$a;->bzI:I
+    iput v5, v4, Lorg/apache/commons/a/a/b$a;->bzD:I
 
-    iget v1, v4, Lorg/apache/commons/a/a/b$a;->bzI:I
+    iget v1, v4, Lorg/apache/commons/a/a/b$a;->bzD: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;->tw:Ljava/nio/charset/Charset;
+    sget-object v1, Lorg/apache/commons/a/a;->tx: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 fd462daea8..e091d7b706 100644
--- a/com.discord/smali/com/discord/utilities/billing/PremiumUtilsKt.smali
+++ b/com.discord/smali/com/discord/utilities/billing/PremiumUtilsKt.smali
@@ -4,52 +4,12 @@
 
 
 # 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 = {
@@ -65,7 +25,7 @@
 
 # direct methods
 .method static constructor <clinit>()V
-    .locals 6
+    .locals 9
 
     invoke-static {}, Ljava/util/Calendar;->getInstance()Ljava/util/Calendar;
 
@@ -115,79 +75,35 @@
 
     sput-object v0, Lcom/discord/utilities/billing/PremiumUtilsKt;->GRANDFATHERED_YEARLY_END_DATE:Ljava/util/Date;
 
-    const/4 v0, 0x2
+    const/4 v0, 0x7
 
-    new-array v3, v0, [Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+    new-array v0, v0, [Lkotlin/Pair;
 
-    sget-object v4, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->NONE_MONTH:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+    const/4 v3, 0x4
 
-    aput-object v4, v3, v2
+    new-array v4, v3, [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 v5, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_MONTH_TIER_1:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
-    aput-object v4, v3, v1
+    aput-object v5, v4, v2
 
-    invoke-static {v3}, Lkotlin/a/ak;->setOf([Ljava/lang/Object;)Ljava/util/Set;
+    sget-object v5, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_YEAR_TIER_1:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
-    move-result-object v3
+    aput-object v5, v4, v1
 
-    sput-object v3, Lcom/discord/utilities/billing/PremiumUtilsKt;->NONE_PLANS:Ljava/util/Set;
+    sget-object v5, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_MONTH_TIER_2:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
-    new-array v3, v0, [Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+    const/4 v6, 0x2
 
-    sget-object v4, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_MONTH_TIER_1:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+    aput-object v5, v4, v6
 
-    aput-object v4, v3, v2
+    sget-object v5, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_YEAR_TIER_2:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
-    sget-object v4, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_YEAR_TIER_1:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+    const/4 v7, 0x3
 
-    aput-object v4, v3, v1
+    aput-object v5, v4, v7
 
-    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;
+    invoke-static {v4}, Lkotlin/a/ak;->setOf([Ljava/lang/Object;)Ljava/util/Set;
 
     move-result-object v4
 
@@ -197,151 +113,119 @@
 
     move-result-object v4
 
-    aput-object v4, v3, v2
+    aput-object v4, v0, v2
 
-    sget-object v2, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->NONE_MONTH:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+    sget-object v4, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_MONTH_LEGACY:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
-    sget-object v4, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->NONE_YEAR:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+    new-array v5, v7, [Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
-    invoke-static {v4}, Lkotlin/a/ak;->setOf(Ljava/lang/Object;)Ljava/util/Set;
+    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;
 
     move-result-object v4
 
-    sget-object v5, Lcom/discord/utilities/billing/PremiumUtilsKt;->ALL_PAID_PLANS:Ljava/util/Set;
+    aput-object v4, v0, v1
 
-    check-cast v5, Ljava/lang/Iterable;
+    sget-object v4, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_YEAR_LEGACY:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
-    invoke-static {v4, v5}, Lkotlin/a/ak;->plus(Ljava/util/Set;Ljava/lang/Iterable;)Ljava/util/Set;
+    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;
 
     move-result-object v4
 
-    invoke-static {v2, v4}, Lkotlin/q;->to(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
+    aput-object v4, v0, v6
+
+    sget-object v4, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_MONTH_TIER_1:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+
+    new-array v5, v7, [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 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;
+
+    move-result-object v1
+
+    invoke-static {v4, v1}, Lkotlin/q;->to(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
+
+    move-result-object v1
+
+    aput-object v1, v0, v7
+
+    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
 
-    aput-object v2, v3, v1
-
-    sget-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->NONE_YEAR:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
-
-    sget-object v2, Lcom/discord/utilities/billing/PremiumUtilsKt;->ALL_PAID_PLANS:Ljava/util/Set;
-
     invoke-static {v1, v2}, Lkotlin/q;->to(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
 
     move-result-object v1
 
-    aput-object v1, v3, v0
+    aput-object v1, v0, v3
 
-    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_MONTH_TIER_2: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 {v1}, Lkotlin/a/ak;->setOf(Ljava/lang/Object;)Ljava/util/Set;
+    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;
 
     move-result-object v1
 
-    sget-object v2, Lcom/discord/utilities/billing/PremiumUtilsKt;->TIER_2_PLANS:Ljava/util/Set;
+    const/4 v2, 0x5
 
-    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, 0x3
-
-    aput-object v0, v3, v1
-
-    sget-object v0, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_YEAR_LEGACY:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+    aput-object v1, v0, v2
 
     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, 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 v2
+
+    invoke-static {v1, v2}, Lkotlin/q;->to(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
+
     move-result-object v1
 
-    invoke-static {v0, v1}, Lkotlin/q;->to(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
+    const/4 v2, 0x6
 
-    move-result-object v0
+    aput-object v1, v0, v2
 
-    const/16 v1, 0x8
-
-    aput-object v0, v3, v1
-
-    invoke-static {v3}, Lkotlin/a/ad;->mapOf([Lkotlin/Pair;)Ljava/util/Map;
+    invoke-static {v0}, Lkotlin/a/ad;->mapOf([Lkotlin/Pair;)Ljava/util/Map;
 
     move-result-object v0
 
@@ -423,14 +307,14 @@
 
     if-eqz v0, :cond_0
 
-    const p0, 0x7f080254
+    const p0, 0x7f080248
 
     return p0
 
     :cond_0
     instance-of v0, p0, Lcom/discord/models/domain/ModelPaymentSource$ModelPaymentSourceCard;
 
-    const v1, 0x7f080252
+    const v1, 0x7f080246
 
     if-eqz v0, :cond_3
 
@@ -478,7 +362,7 @@
 
     if-eqz p0, :cond_1
 
-    const p0, 0x7f080251
+    const p0, 0x7f080245
 
     return p0
 
@@ -502,7 +386,7 @@
 
     if-eqz p0, :cond_1
 
-    const p0, 0x7f080255
+    const p0, 0x7f080249
 
     return p0
 
@@ -516,7 +400,7 @@
     if-eqz p0, :cond_1
 
     :goto_0
-    const p0, 0x7f080250
+    const p0, 0x7f080244
 
     return p0
 
@@ -530,7 +414,7 @@
     if-eqz p0, :cond_1
 
     :goto_1
-    const p0, 0x7f080253
+    const p0, 0x7f080247
 
     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 4176eb8fd9..01a74818e4 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, 0x7f1203a9
+    const v1, 0x7f120384
 
     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 bf4a81e1aa..04846fe6fe 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;->uU()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/safetynet/SafetyNetApi$RecaptchaTokenResponse;->uS()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 5d30a1bf01..46d5c76620 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, 0x7f1203a8
+    const v1, 0x7f120383
 
     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 5a0511646b..165bbd5fea 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 83de5c005c..cb18124a93 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 c1a0ab3179..8467b7db60 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 bd5e5c41b5..1419f200f1 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 9a280991ca..3c615c8c9f 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;->lS()Lcom/google/android/gms/common/GoogleApiAvailability;
+    invoke-static {}, Lcom/google/android/gms/common/GoogleApiAvailability;->lQ()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 af960d51fb..966d8d6c33 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;->ahv:Lcom/google/android/gms/tasks/h;
+    iget-object p1, p2, Lcom/google/android/gms/common/api/internal/ad;->ahr:Lcom/google/android/gms/tasks/h;
 
-    iget-object p1, p1, Lcom/google/android/gms/tasks/h;->aLU:Lcom/google/android/gms/tasks/ac;
+    iget-object p1, p1, Lcom/google/android/gms/tasks/h;->aLQ: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, 0x7f1203aa
+    const p2, 0x7f120385
 
     const-string p3, "unsupported_device"
 
@@ -200,9 +200,9 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/google/android/gms/safetynet/a;->aLk:Lcom/google/android/gms/safetynet/SafetyNetApi;
+    sget-object v0, Lcom/google/android/gms/safetynet/a;->aLg:Lcom/google/android/gms/safetynet/SafetyNetApi;
 
-    iget-object p1, p1, Lcom/google/android/gms/common/api/h;->afw:Lcom/google/android/gms/common/api/i;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/h;->afs: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, 0x7f1203ad
+    const v2, 0x7f120388
 
     invoke-virtual {v1, v2}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setTitle(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
     move-result-object v1
 
-    const v2, 0x7f1203ae
+    const v2, 0x7f120389
 
     invoke-virtual {v1, v2}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setMessage(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
     move-result-object v1
 
-    const v2, 0x7f1203ac
+    const v2, 0x7f120387
 
     new-instance v3, Lcom/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1;
 
@@ -308,7 +308,7 @@
 
     move-result-object p1
 
-    const p2, 0x7f1203a0
+    const p2, 0x7f12037b
 
     const/4 v1, 0x2
 
@@ -362,7 +362,7 @@
 
     check-cast v0, Lrx/functions/Action1;
 
-    sget-object p1, Lrx/Emitter$a;->bGh:Lrx/Emitter$a;
+    sget-object p1, Lrx/Emitter$a;->bGc: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 76bbd03f19..403844b1bb 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, 0x7f120816
+    const p2, 0x7f1207f1
 
     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, 0x7f120a41
+    const p2, 0x7f120a0b
 
     invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -352,7 +352,7 @@
 
     if-eqz v0, :cond_6
 
-    const p2, 0x7f120537
+    const p2, 0x7f120512
 
     invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -376,7 +376,7 @@
 
     if-eqz v0, :cond_8
 
-    const p2, 0x7f120a40
+    const p2, 0x7f120a0a
 
     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 474b84be1b..2b759f2f2e 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object p2
 
diff --git a/com.discord/smali/com/discord/utilities/analytics/SystemClock.smali b/com.discord/smali/com/discord/utilities/clocks/SystemClock.smali
similarity index 87%
rename from com.discord/smali/com/discord/utilities/analytics/SystemClock.smali
rename to com.discord/smali/com/discord/utilities/clocks/SystemClock.smali
index 8dabb2c402..5b632c50de 100644
--- a/com.discord/smali/com/discord/utilities/analytics/SystemClock.smali
+++ b/com.discord/smali/com/discord/utilities/clocks/SystemClock.smali
@@ -1,4 +1,4 @@
-.class public final Lcom/discord/utilities/analytics/SystemClock;
+.class public final Lcom/discord/utilities/clocks/SystemClock;
 .super Ljava/lang/Object;
 .source "SystemClock.kt"
 
diff --git a/com.discord/smali/com/discord/utilities/collections/ShallowPartitionCollection.smali b/com.discord/smali/com/discord/utilities/collections/ShallowPartitionCollection.smali
index 9a6071c7ab..b52f46f89d 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 aa8f55119a..a48f9156c3 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, 0x7f080290
+    const p1, 0x7f080284
 
     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 b02e1864de..42fe5a7eb4 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, 0x7f080293
-
-    return v0
-
-    :pswitch_1
-    const v0, 0x7f08028f
-
-    return v0
-
-    :pswitch_2
-    const v0, 0x7f080288
-
-    return v0
-
-    :pswitch_3
     const v0, 0x7f080287
 
     return v0
 
-    :pswitch_4
-    const v0, 0x7f080286
-
-    return v0
-
-    :pswitch_5
-    const v0, 0x7f080285
-
-    return v0
-
-    :pswitch_6
-    const v0, 0x7f08028e
-
-    return v0
-
-    :pswitch_7
-    const v0, 0x7f080284
-
-    return v0
-
-    :pswitch_8
+    :pswitch_1
     const v0, 0x7f080283
 
     return v0
 
+    :pswitch_2
+    const v0, 0x7f08027c
+
+    return v0
+
+    :pswitch_3
+    const v0, 0x7f08027b
+
+    return v0
+
+    :pswitch_4
+    const v0, 0x7f08027a
+
+    return v0
+
+    :pswitch_5
+    const v0, 0x7f080279
+
+    return v0
+
+    :pswitch_6
+    const v0, 0x7f080282
+
+    return v0
+
+    :pswitch_7
+    const v0, 0x7f080278
+
+    return v0
+
+    :pswitch_8
+    const v0, 0x7f080277
+
+    return v0
+
     :pswitch_9
-    const v0, 0x7f080292
+    const v0, 0x7f080286
 
     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 6210171035..dd3070e06e 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;->bER:Lokhttp3/Response;
+    iget-object v4, v0, Lb/m;->bEM:Lokhttp3/Response;
 
-    iget-object v4, v4, Lokhttp3/Response;->brH:Lokhttp3/Headers;
+    iget-object v4, v4, Lokhttp3/Response;->brC:Lokhttp3/Headers;
 
-    iget-object v5, v0, Lb/m;->bET:Lokhttp3/x;
+    iget-object v5, v0, Lb/m;->bEO:Lokhttp3/x;
 
     if-eqz v5, :cond_2
 
@@ -162,11 +162,11 @@
     :goto_0
     if-eqz v6, :cond_1
 
-    iget-object v1, v6, Lokhttp3/MediaType;->brs:Ljava/lang/String;
+    iget-object v1, v6, Lokhttp3/MediaType;->brn:Ljava/lang/String;
 
     :cond_1
     :try_start_0
-    invoke-virtual {v5}, Lokhttp3/x;->FR()Ljava/lang/String;
+    invoke-virtual {v5}, Lokhttp3/x;->FP()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;->bER:Lokhttp3/Response;
+    iget-object v0, v0, Lb/m;->bEM: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;->bsA:Lokhttp3/w;
+    iget-object v0, p0, Lokhttp3/Response;->bsv:Lokhttp3/w;
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lokhttp3/Response;->bsA:Lokhttp3/w;
+    iget-object v0, p0, Lokhttp3/Response;->bsv:Lokhttp3/w;
 
-    iget-object v0, v0, Lokhttp3/w;->bnk:Lokhttp3/s;
+    iget-object v0, v0, Lokhttp3/w;->bnf:Lokhttp3/s;
 
     if-nez v0, :cond_0
 
     goto :goto_0
 
     :cond_0
-    iget-object p0, p0, Lokhttp3/Response;->bsA:Lokhttp3/w;
+    iget-object p0, p0, Lokhttp3/Response;->bsv:Lokhttp3/w;
 
-    iget-object p0, p0, Lokhttp3/w;->bnk:Lokhttp3/s;
+    iget-object p0, p0, Lokhttp3/w;->bnf: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, 0x7f120c21
+    const v0, 0x7f120bea
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -654,7 +654,7 @@
     return-object p1
 
     :pswitch_1
-    const v0, 0x7f120a39
+    const v0, 0x7f120a03
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -667,7 +667,7 @@
     return-object p1
 
     :pswitch_2
-    const v0, 0x7f120c20
+    const v0, 0x7f120be9
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -680,7 +680,7 @@
     return-object p1
 
     :pswitch_3
-    const v0, 0x7f120c1d
+    const v0, 0x7f120be6
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -693,7 +693,7 @@
     return-object p1
 
     :pswitch_4
-    const v0, 0x7f121232
+    const v0, 0x7f1211a5
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -706,7 +706,7 @@
     return-object p1
 
     :pswitch_5
-    const v0, 0x7f120c1f
+    const v0, 0x7f120be8
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -719,7 +719,7 @@
     return-object p1
 
     :pswitch_6
-    const v0, 0x7f120c1b
+    const v0, 0x7f120be4
 
     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, 0x7f120c18
+    const v1, 0x7f120be1
 
     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, 0x7f120c1c
+    const v1, 0x7f120be5
 
     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, 0x7f120f8d
+    const v0, 0x7f120f01
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -775,7 +775,7 @@
     return-object p1
 
     :pswitch_a
-    const v0, 0x7f120c1a
+    const v0, 0x7f120be3
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -788,7 +788,7 @@
     return-object p1
 
     :pswitch_b
-    const v0, 0x7f120c19
+    const v0, 0x7f120be2
 
     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, 0x7f120c1e
+    const v1, 0x7f120be7
 
     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 61a6a84567..ede9bbe82d 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;->FP:Lcom/discord/workers/MessageAckWorker$a;
+    sget-object p1, Lcom/discord/workers/MessageAckWorker;->FL: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;->FQ:Lcom/discord/workers/MessageSendWorker$a;
+    sget-object p1, Lcom/discord/workers/MessageSendWorker;->FM:Lcom/discord/workers/MessageSendWorker$a;
 
     const-string p1, "message"
 
@@ -569,7 +569,7 @@
 
     :cond_6
     :goto_2
-    sget-object p1, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
+    sget-object p1, Lcom/discord/app/AppLog;->vn: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 806be8103c..4babd5fafd 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;->aBP:Ljava/util/Map;
+    iget-object v0, p1, Lcom/google/firebase/messaging/RemoteMessage;->aBL:Ljava/util/Map;
 
     if-nez v0, :cond_2
 
-    iget-object v0, p1, Lcom/google/firebase/messaging/RemoteMessage;->aCr:Landroid/os/Bundle;
+    iget-object v0, p1, Lcom/google/firebase/messaging/RemoteMessage;->aCn: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;->aBP:Ljava/util/Map;
+    iput-object v1, p1, Lcom/google/firebase/messaging/RemoteMessage;->aBL:Ljava/util/Map;
 
     :cond_2
-    iget-object p1, p1, Lcom/google/firebase/messaging/RemoteMessage;->aBP:Ljava/util/Map;
+    iget-object p1, p1, Lcom/google/firebase/messaging/RemoteMessage;->aBL:Ljava/util/Map;
 
     const-string v0, "remoteMessage.data"
 
@@ -196,7 +196,7 @@
 
     if-nez v1, :cond_4
 
-    sget-object v2, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
+    sget-object v2, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
 
     const/4 v4, 0x0
 
@@ -284,7 +284,7 @@
 
     if-eqz v1, :cond_9
 
-    sget-object v2, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
+    sget-object v2, Lcom/discord/app/AppLog;->vn: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 05aa7d9d6d..7a7779631c 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;->vm:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vn: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 b4e05e50ed..912f1fceb7 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;->vm:Lcom/discord/app/AppLog;
+    sget-object v1, Lcom/discord/app/AppLog;->vn: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 e49451cd21..a086fc0af1 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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;->vm:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vn: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 130a202e8f..21f91057ba 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;->Ae()Lcom/google/firebase/iid/FirebaseInstanceId;
+    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->Ac()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;->aRp:Lcom/google/firebase/FirebaseApp;
+    iget-object v0, p1, Lcom/google/firebase/iid/FirebaseInstanceId;->aRl: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;->vm:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vn: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;->vm:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vn: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 6088123124..8b5ef6ebc2 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, 0x7f120d30
+    const v0, 0x7f120cf9
 
     new-array v1, v6, [Ljava/lang/Object;
 
@@ -1269,7 +1269,7 @@
     return-object v1
 
     :cond_2
-    const v0, 0x7f120cb3
+    const v0, 0x7f120c7c
 
     new-array v1, v4, [Ljava/lang/Object;
 
@@ -1290,7 +1290,7 @@
     return-object p1
 
     :cond_3
-    const v0, 0x7f120cb1
+    const v0, 0x7f120c7a
 
     new-array v1, v4, [Ljava/lang/Object;
 
@@ -1342,7 +1342,7 @@
 
     if-ne v0, v4, :cond_6
 
-    const v0, 0x7f120cb9
+    const v0, 0x7f120c82
 
     new-array v1, v4, [Ljava/lang/Object;
 
@@ -1365,7 +1365,7 @@
     :cond_6
     if-ne v0, v6, :cond_7
 
-    const v0, 0x7f120cb7
+    const v0, 0x7f120c80
 
     new-array v1, v4, [Ljava/lang/Object;
 
@@ -1412,7 +1412,7 @@
 
     if-nez v0, :cond_9
 
-    const v0, 0x7f120caf
+    const v0, 0x7f120c78
 
     new-array v1, v4, [Ljava/lang/Object;
 
@@ -1442,7 +1442,7 @@
 
     if-eqz v0, :cond_c
 
-    const v0, 0x7f120749
+    const v0, 0x7f120724
 
     new-array v1, v6, [Ljava/lang/Object;
 
@@ -1476,7 +1476,7 @@
     goto :goto_0
 
     :cond_a
-    const v0, 0x7f120cbb
+    const v0, 0x7f120c84
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -1485,7 +1485,7 @@
     goto :goto_0
 
     :cond_b
-    const v0, 0x7f120cad
+    const v0, 0x7f120c76
 
     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, 0x7f1210bf
+    const v0, 0x7f121033
 
     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, 0x7f080374
+    const v3, 0x7f080368
 
-    const v4, 0x7f120cbc
+    const v4, 0x7f120c85
 
     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, 0x7f08023a
+    const v2, 0x7f08022f
 
-    const v3, 0x7f120bb4
+    const v3, 0x7f120b7e
 
     invoke-virtual {p1, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -2601,7 +2601,7 @@
     goto :goto_0
 
     :cond_0
-    const v2, 0x7f12054f
+    const v2, 0x7f12052a
 
     invoke-virtual {v1, v2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -2788,7 +2788,7 @@
 
     if-eqz v0, :cond_3
 
-    const v0, 0x7f08031b
+    const v0, 0x7f08030f
 
     return v0
 
@@ -2801,7 +2801,7 @@
 
     if-eqz v0, :cond_3
 
-    const v0, 0x7f08031d
+    const v0, 0x7f080311
 
     return v0
 
@@ -2814,13 +2814,13 @@
 
     if-eqz v0, :cond_3
 
-    const v0, 0x7f08031c
+    const v0, 0x7f080310
 
     return v0
 
     :cond_3
     :goto_0
-    const v0, 0x7f08031a
+    const v0, 0x7f08030e
 
     return v0
 .end method
@@ -2864,7 +2864,7 @@
     goto :goto_0
 
     :cond_0
-    const v0, 0x7f1209fa
+    const v0, 0x7f1209c4
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -2982,7 +2982,7 @@
 
     if-nez v0, :cond_4
 
-    const v0, 0x7f120cc1
+    const v0, 0x7f120c8a
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -3002,7 +3002,7 @@
 
     if-eqz v0, :cond_5
 
-    const v0, 0x7f12074a
+    const v0, 0x7f120725
 
     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 00118fdf22..63ff3a2690 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 c8325e51ff..889c41e497 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -87,7 +87,7 @@
     :catch_0
     move-exception p1
 
-    sget-object v0, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vn: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 528a287ed3..09471d813a 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 5c0e2c8a46..9bbc3709ad 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 af1b377689..2dd1691d90 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 6ee7ce7d57..1420358b72 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, 0x7f06002d
+    const v2, 0x7f06002c
 
     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, 0x7f0600f6
+    const p3, 0x7f0600f5
 
     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;->vm:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
 
     move-object v2, p2
 
@@ -432,7 +432,7 @@
 
     invoke-direct {v0}, Landroidx/core/app/Person$Builder;-><init>()V
 
-    const v1, 0x7f120bc3
+    const v1, 0x7f120b8d
 
     invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -823,12 +823,12 @@
 
     if-eqz p5, :cond_0
 
-    const p5, 0x7f120cbe
+    const p5, 0x7f120c87
 
     goto :goto_0
 
     :cond_0
-    const p5, 0x7f120cbd
+    const p5, 0x7f120c86
 
     :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, 0x7f08031d
+    const v3, 0x7f080311
 
     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, 0x7f12038e
+    const v1, 0x7f120369
 
     invoke-virtual {p1, v1}, Landroid/app/Application;->getString(I)Ljava/lang/String;
 
@@ -963,7 +963,7 @@
 
     new-instance v2, Landroid/app/NotificationChannel;
 
-    const v4, 0x7f1213f5
+    const v4, 0x7f121369
 
     invoke-virtual {p1, v4}, Landroid/app/Application;->getString(I)Ljava/lang/String;
 
@@ -979,7 +979,7 @@
 
     new-instance v4, Landroid/app/NotificationChannel;
 
-    const v6, 0x7f120be8
+    const v6, 0x7f120bb2
 
     invoke-virtual {p1, v6}, Landroid/app/Application;->getString(I)Ljava/lang/String;
 
@@ -995,7 +995,7 @@
 
     new-instance v6, Landroid/app/NotificationChannel;
 
-    const v8, 0x7f120538
+    const v8, 0x7f120513
 
     invoke-virtual {p1, v8}, Landroid/app/Application;->getString(I)Ljava/lang/String;
 
@@ -1009,7 +1009,7 @@
 
     new-instance v8, Landroid/app/NotificationChannel;
 
-    const v9, 0x7f1206df
+    const v9, 0x7f1206ba
 
     invoke-virtual {p1, v9}, Landroid/app/Application;->getString(I)Ljava/lang/String;
 
@@ -1023,7 +1023,7 @@
 
     new-instance v9, Landroid/app/NotificationChannel;
 
-    const v10, 0x7f120726
+    const v10, 0x7f120701
 
     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, 0x7f0600f6
+    const v7, 0x7f0600f5
 
     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 27f98a19db..b8146e8450 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;->vm:Lcom/discord/app/AppLog;
+    sget-object p1, Lcom/discord/app/AppLog;->vn: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;->vm:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vn: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 cf127f116c..0dd14b3d5e 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, 0x7f06002d
+    const v3, 0x7f06002c
 
     invoke-static {p1, v3}, Landroidx/core/content/ContextCompat;->getColor(Landroid/content/Context;I)I
 
@@ -106,13 +106,13 @@
 
     move-result-object v2
 
-    const v3, 0x7f08031a
+    const v3, 0x7f08030e
 
     invoke-virtual {v2, v3}, Landroidx/core/app/NotificationCompat$Builder;->setSmallIcon(I)Landroidx/core/app/NotificationCompat$Builder;
 
     move-result-object v2
 
-    const v3, 0x7f12054f
+    const v3, 0x7f12052a
 
     invoke-virtual {p1, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -126,7 +126,7 @@
 
     if-nez p2, :cond_0
 
-    const p2, 0x7f120726
+    const p2, 0x7f120701
 
     invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -135,7 +135,7 @@
     goto :goto_0
 
     :cond_0
-    const v3, 0x7f120721
+    const v3, 0x7f1206fc
 
     const/4 v4, 0x1
 
@@ -239,7 +239,7 @@
 
     :catch_0
     :try_start_2
-    sget-object p1, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
+    sget-object p1, Lcom/discord/app/AppLog;->vn: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 bfa4390209..ef9f3b4402 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 c5770c9f9f..f5336773c7 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 0326ea2417..8f4c553a6e 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;->vm:Lcom/discord/app/AppLog;
+    sget-object p1, Lcom/discord/app/AppLog;->vn: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 a83a55167f..0a52895b6d 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 c628786ee7..e8df5a4d74 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 481a9e5a26..a0308f6f43 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 1def6c98d8..db4c46f052 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;->vI:Lcom/discord/app/g;
+    sget-object v0, Lcom/discord/app/g;->vJ: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;->vO:Lcom/discord/app/i;
+    sget-object v1, Lcom/discord/app/i;->vP: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;->vO:Lcom/discord/app/i;
+    sget-object v1, Lcom/discord/app/i;->vP: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;->vI:Lcom/discord/app/g;
+    sget-object v0, Lcom/discord/app/g;->vJ: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 34c880aa74..165f46cb10 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, 0x7f100026
+    const p1, 0x7f100025
 
     new-array p2, v2, [Ljava/lang/Object;
 
@@ -96,7 +96,7 @@
 
     move-result p1
 
-    const p2, 0x7f100028
+    const p2, 0x7f100027
 
     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 317363a9ae..91cc4f78cd 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, 0x7f0600c3
+    const p2, 0x7f0600c2
 
     :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 65c2903440..cdd74064fe 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, 0x7f0803ed
+    const p1, 0x7f0803de
 
     return p1
 
@@ -2723,7 +2723,7 @@
 
     if-eqz p1, :cond_1
 
-    const p1, 0x7f0803fa
+    const p1, 0x7f0803eb
 
     return p1
 
@@ -2736,7 +2736,7 @@
 
     if-eqz p1, :cond_1
 
-    const p1, 0x7f0803fd
+    const p1, 0x7f0803ee
 
     return p1
 
@@ -2771,7 +2771,7 @@
 
     if-eqz p1, :cond_1
 
-    const p1, 0x7f0803f6
+    const p1, 0x7f0803e7
 
     return p1
 
@@ -2784,7 +2784,7 @@
 
     if-eqz p1, :cond_1
 
-    const p1, 0x7f0803e9
+    const p1, 0x7f0803da
 
     return p1
 
@@ -2797,7 +2797,7 @@
 
     if-eqz p1, :cond_1
 
-    const p1, 0x7f080402
+    const p1, 0x7f0803f3
 
     return p1
 
@@ -2810,7 +2810,7 @@
 
     if-eqz p1, :cond_1
 
-    const p1, 0x7f0803f5
+    const p1, 0x7f0803e6
 
     return p1
 
@@ -2823,7 +2823,7 @@
 
     if-eqz p1, :cond_1
 
-    const p1, 0x7f080400
+    const p1, 0x7f0803f1
 
     return p1
 
@@ -2858,7 +2858,7 @@
 
     if-eqz p1, :cond_1
 
-    const p1, 0x7f080403
+    const p1, 0x7f0803f4
 
     return p1
 
@@ -2872,7 +2872,7 @@
     if-eqz p1, :cond_1
 
     :goto_0
-    const p1, 0x7f0803f0
+    const p1, 0x7f0803e1
 
     return p1
 
@@ -2886,13 +2886,13 @@
     if-eqz p1, :cond_1
 
     :goto_1
-    const p1, 0x7f0803f2
+    const p1, 0x7f0803e3
 
     return p1
 
     :cond_1
     :goto_2
-    const p1, 0x7f080408
+    const p1, 0x7f0803f9
 
     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 e325859d04..2b309e53d0 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, 0x7f1212a4
+    const v1, 0x7f121217
 
     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 9773d23ed9..3fe295d59d 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;->Pj:Lcom/facebook/drawee/view/b;
+    iget-object v1, v0, Lcom/facebook/drawee/view/DraweeView;->Pf:Lcom/facebook/drawee/view/b;
 
-    iget-object v1, v1, Lcom/facebook/drawee/view/b;->Pw:Lcom/facebook/drawee/d/b;
+    iget-object v1, v1, Lcom/facebook/drawee/view/b;->Ps: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;->hP()Lcom/facebook/drawee/generic/GenericDraweeHierarchy;
+    invoke-virtual {v1}, Lcom/facebook/drawee/generic/a;->hN()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;->aaq:Lcom/facebook/imagepipeline/request/b$b;
+    sget-object v1, Lcom/facebook/imagepipeline/request/b$b;->aam:Lcom/facebook/imagepipeline/request/b$b;
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->XR:Lcom/facebook/imagepipeline/request/b$b;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->XN: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;->aao:Lcom/facebook/imagepipeline/request/b$a;
+    sget-object p0, Lcom/facebook/imagepipeline/request/b$a;->aak:Lcom/facebook/imagepipeline/request/b$a;
 
     goto :goto_1
 
     :cond_1
     :goto_0
-    sget-object p0, Lcom/facebook/imagepipeline/request/b$a;->aan:Lcom/facebook/imagepipeline/request/b$a;
+    sget-object p0, Lcom/facebook/imagepipeline/request/b$a;->aaj:Lcom/facebook/imagepipeline/request/b$a;
 
     :goto_1
-    iput-object p0, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aae:Lcom/facebook/imagepipeline/request/b$a;
+    iput-object p0, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aaa: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;->St:Lcom/facebook/imagepipeline/a/e;
+    iput-object p0, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Sp: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;->xo:Lcom/discord/dialogs/ImageUploadDialog$a;
+    sget-object v5, Lcom/discord/dialogs/ImageUploadDialog;->xq: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;->xl:Lcom/miguelgaeta/media_picker/MediaPicker$Provider;
+    iput-object p3, v0, Lcom/discord/dialogs/ImageUploadDialog;->xn: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;->xm:Lrx/functions/Action1;
+    iput-object p4, v0, Lcom/discord/dialogs/ImageUploadDialog;->xo:Lrx/functions/Action1;
 
-    iput-object p5, v0, Lcom/discord/dialogs/ImageUploadDialog;->xn:Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
+    iput-object p5, v0, Lcom/discord/dialogs/ImageUploadDialog;->xp: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, 0x7f06002d
+    const v0, 0x7f06002c
 
     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;->aYg:Landroid/os/Bundle;
+    iget-object v2, v6, Lcom/yalantis/ucrop/a$a;->aYc: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, 0x7f060031
+    const v1, 0x7f060030
 
     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;->aYg:Landroid/os/Bundle;
+    iget-object v2, v6, Lcom/yalantis/ucrop/a$a;->aYc: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, 0x7f06014a
+    const v1, 0x7f060149
 
     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;->aYg:Landroid/os/Bundle;
+    iget-object v2, v6, Lcom/yalantis/ucrop/a$a;->aYc: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;->aYg:Landroid/os/Bundle;
+    iget-object v1, v6, Lcom/yalantis/ucrop/a$a;->aYc:Landroid/os/Bundle;
 
     const-string v2, "com.yalantis.ucrop.UcropColorWidgetActive"
 
@@ -392,7 +392,7 @@
 
     const/4 v1, 0x1
 
-    const v2, 0x7f120298
+    const v2, 0x7f120296
 
     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;->bgy:Lkotlin/Unit;
+    sget-object p2, Lkotlin/Unit;->bgt: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;->OW:Z
+    iput-boolean v0, p1, Lcom/facebook/drawee/generic/d;->OS:Z
 
-    sget-object p2, Lcom/facebook/drawee/generic/d$a;->OY:Lcom/facebook/drawee/generic/d$a;
+    sget-object p2, Lcom/facebook/drawee/generic/d$a;->OU:Lcom/facebook/drawee/generic/d$a;
 
-    iput-object p2, p1, Lcom/facebook/drawee/generic/d;->OV:Lcom/facebook/drawee/generic/d$a;
+    iput-object p2, p1, Lcom/facebook/drawee/generic/d;->OR: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;->NG:Z
+    iput-boolean v0, p1, Lcom/facebook/drawee/generic/d;->NC: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;->kH()Lcom/facebook/imagepipeline/request/b;
+    invoke-virtual {v4}, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->kF()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;->gQ()Lcom/facebook/drawee/backends/pipeline/e;
+    invoke-static {}, Lcom/facebook/drawee/backends/pipeline/c;->gO()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;->Mk:Lcom/facebook/drawee/d/a;
+    iput-object p3, p2, Lcom/facebook/drawee/controller/a;->Mg:Lcom/facebook/drawee/d/a;
 
     check-cast p2, Lcom/facebook/drawee/backends/pipeline/e;
 
-    iput-boolean v1, p2, Lcom/facebook/drawee/controller/a;->Mj:Z
+    iput-boolean v1, p2, Lcom/facebook/drawee/controller/a;->Mf: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;->Mh:[Ljava/lang/Object;
+    iput-object p1, p2, Lcom/facebook/drawee/controller/a;->Md:[Ljava/lang/Object;
 
-    iput-boolean v1, p2, Lcom/facebook/drawee/controller/a;->Mi:Z
+    iput-boolean v1, p2, Lcom/facebook/drawee/controller/a;->Me: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;->hr()Lcom/facebook/drawee/controller/AbstractDraweeController;
+    invoke-virtual {p2}, Lcom/facebook/drawee/backends/pipeline/e;->hp()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 10c27abe29..8846c6a375 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;->gR()Lcom/facebook/imagepipeline/b/h;
+    invoke-static {}, Lcom/facebook/drawee/backends/pipeline/c;->gP()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;->Zz:Lcom/facebook/imagepipeline/request/c;
+    iput-object p4, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Zv:Lcom/facebook/imagepipeline/request/c;
 
     :cond_0
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->kH()Lcom/facebook/imagepipeline/request/b;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->kF()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object p1
 
-    sget-object p2, Lcom/facebook/imagepipeline/request/b$b;->aaq:Lcom/facebook/imagepipeline/request/b$b;
+    sget-object p2, Lcom/facebook/imagepipeline/request/b$b;->aam: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;->jm()Landroid/graphics/Bitmap;
+    invoke-virtual {p4}, Lcom/facebook/imagepipeline/g/b;->jk()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;->bgy:Lkotlin/Unit;
+    sget-object p4, Lkotlin/Unit;->bgt: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;->gG()Z
+    invoke-interface {p1}, Lcom/facebook/c/c;->gE()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;->gG()Z
+    invoke-interface {p1}, Lcom/facebook/c/c;->gE()Z
 
     return-void
 
     :catchall_3
     move-exception p2
 
-    invoke-interface {p1}, Lcom/facebook/c/c;->gG()Z
+    invoke-interface {p1}, Lcom/facebook/c/c;->gE()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 d86a71e9f0..a518272262 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;->Tg:I
+    iget v2, v0, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->Tc:I
 
-    iget v3, v0, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->Th:I
+    iget v3, v0, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->Td:I
 
-    iget v4, v0, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->Ti:I
+    iget v4, v0, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->Te:I
 
-    iget v5, v0, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->Tj:I
+    iget v5, v0, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->Tf:I
 
-    iget v0, v0, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->Tg:I
+    iget v0, v0, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->Tc: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 4794411469..02a1120f80 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;->GZ:Lcom/facebook/common/d/l;
+    iput-object p1, v0, Lcom/facebook/cache/disk/DiskCacheConfig$a;->GV:Lcom/facebook/common/d/l;
 
-    iput-object p2, v0, Lcom/facebook/cache/disk/DiskCacheConfig$a;->GY:Ljava/lang/String;
+    iput-object p2, v0, Lcom/facebook/cache/disk/DiskCacheConfig$a;->GU:Ljava/lang/String;
 
     const-wide/32 p1, 0x2800000
 
-    iput-wide p1, v0, Lcom/facebook/cache/disk/DiskCacheConfig$a;->Hh:J
+    iput-wide p1, v0, Lcom/facebook/cache/disk/DiskCacheConfig$a;->Hd:J
 
-    invoke-virtual {v0}, Lcom/facebook/cache/disk/DiskCacheConfig$a;->fU()Lcom/facebook/cache/disk/DiskCacheConfig;
+    invoke-virtual {v0}, Lcom/facebook/cache/disk/DiskCacheConfig$a;->fS()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;->Uq:Z
+    iput-boolean v1, v0, Lcom/facebook/imagepipeline/b/i$a;->Um: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;->Uw:Lcom/facebook/cache/disk/DiskCacheConfig;
+    iput-object v2, v0, Lcom/facebook/imagepipeline/b/i$a;->Us: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;->UE:Lcom/facebook/cache/disk/DiskCacheConfig;
+    iput-object v2, v0, Lcom/facebook/imagepipeline/b/i$a;->UA: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;->Uo:Lcom/facebook/common/d/l;
+    iput-object v2, v0, Lcom/facebook/imagepipeline/b/i$a;->Uk:Lcom/facebook/common/d/l;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/b/i$a;->UN:Lcom/facebook/imagepipeline/b/j$a;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/b/i$a;->UJ:Lcom/facebook/imagepipeline/b/j$a;
 
-    iput-boolean v1, v0, Lcom/facebook/imagepipeline/b/j$a;->QA:Z
+    iput-boolean v1, v0, Lcom/facebook/imagepipeline/b/j$a;->Qw:Z
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/b/j$a;->Ve:Lcom/facebook/imagepipeline/b/i$a;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/b/j$a;->Va:Lcom/facebook/imagepipeline/b/i$a;
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/b/i$a;->iL()Lcom/facebook/imagepipeline/b/i;
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/b/i$a;->iJ()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;->gR()Lcom/facebook/imagepipeline/b/h;
+    invoke-static {}, Lcom/facebook/drawee/backends/pipeline/c;->gP()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;->Ud:Lcom/facebook/imagepipeline/cache/o;
+    iget-object v1, p1, Lcom/facebook/imagepipeline/b/h;->TZ: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;->Ue:Lcom/facebook/imagepipeline/cache/o;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/b/h;->Ua: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 c0a84bb80e..f1f1ebce7b 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 8cb39e2682..78c69f8f94 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 54e1ab140d..e5a2f650bb 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 fa4ec9e2e5..7fd0ca0f89 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;->bgy:Lkotlin/Unit;
+    sget-object v1, Lkotlin/Unit;->bgt: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 eb1e6c3fd3..e497e0e296 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;->xd:Lcom/discord/app/a/a;
+    sget-object v0, Lcom/discord/app/a/a;->xf: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 e0c9a5737b..45653722f0 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 4da0c4ba30..445910d062 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 3b746a5cf6..3b8c2b54b1 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;->xd:Lcom/discord/app/a/a;
+    sget-object v1, Lcom/discord/app/a/a;->xf: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;->xd:Lcom/discord/app/a/a;
+    sget-object v1, Lcom/discord/app/a/a;->xf: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;->xd:Lcom/discord/app/a/a;
+    sget-object v1, Lcom/discord/app/a/a;->xf: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;->xd:Lcom/discord/app/a/a;
+    sget-object v1, Lcom/discord/app/a/a;->xf: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;->xd:Lcom/discord/app/a/a;
+    sget-object v1, Lcom/discord/app/a/a;->xf: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;->xd:Lcom/discord/app/a/a;
+    sget-object v1, Lcom/discord/app/a/a;->xf: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;->xd:Lcom/discord/app/a/a;
+    sget-object v1, Lcom/discord/app/a/a;->xf: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;->xd:Lcom/discord/app/a/a;
+    sget-object v1, Lcom/discord/app/a/a;->xf: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;->xd:Lcom/discord/app/a/a;
+    sget-object v0, Lcom/discord/app/a/a;->xf: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;->bjh:Lkotlin/text/k;
+    sget-object v0, Lkotlin/text/k;->bjc: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;->xd:Lcom/discord/app/a/a;
+    sget-object v0, Lcom/discord/app/a/a;->xf: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, 0x7f121116
+    const p2, 0x7f12108a
 
     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;->vm:Lcom/discord/app/AppLog;
+    sget-object p3, Lcom/discord/app/AppLog;->vn: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 f1c803f6d1..e39d26c63c 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 09bdab258a..910ef36cdf 100644
--- a/com.discord/smali/com/discord/utilities/intent/RouteHandlers.smali
+++ b/com.discord/smali/com/discord/utilities/intent/RouteHandlers.smali
@@ -127,7 +127,7 @@
 
     if-ne p3, v0, :cond_4
 
-    sget-object p3, Lcom/discord/dialogs/f;->xH:Lcom/discord/dialogs/f$a;
+    sget-object p3, Lcom/discord/dialogs/f;->xJ:Lcom/discord/dialogs/f$a;
 
     const-wide/16 v0, 0x0
 
@@ -509,7 +509,7 @@
 .end method
 
 .method public final selectProfile(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;
-    .locals 6
+    .locals 8
 
     const-string v0, "uri"
 
@@ -533,6 +533,12 @@
 
     check-cast p1, Ljava/lang/String;
 
+    if-eqz p1, :cond_0
+
+    invoke-static {p1}, Lkotlin/text/l;->toLongOrNull(Ljava/lang/String;)Ljava/lang/Long;
+
+    move-result-object p1
+
     goto :goto_0
 
     :cond_0
@@ -541,33 +547,30 @@
     :goto_0
     if-eqz p1, :cond_1
 
-    invoke-static {p1}, Ljava/lang/Long;->parseLong(Ljava/lang/String;)J
+    sget-object p2, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->Companion:Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;
 
-    move-result-wide p1
+    invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
 
-    goto :goto_1
+    move-result-wide v0
+
+    invoke-virtual {p2, v0, v1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;->enqueueNotice(J)V
 
     :cond_1
-    const-wide/16 p1, 0x0
-
-    :goto_1
-    invoke-static {p3, p1, p2}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->launch(Landroid/content/Context;J)V
-
     new-instance p1, Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;
 
-    const/4 v2, 0x0
-
-    const/4 v3, 0x0
-
-    const/4 v4, 0x6
+    const/4 v4, 0x0
 
     const/4 v5, 0x0
 
-    const-string v1, "profile"
+    const/4 v6, 0x6
 
-    move-object v0, p1
+    const/4 v7, 0x0
 
-    invoke-direct/range {v0 .. v5}, Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;-><init>(Ljava/lang/String;Ljava/lang/Long;Ljava/lang/Long;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    const-string v3, "profile"
+
+    move-object v2, p1
+
+    invoke-direct/range {v2 .. v7}, Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;-><init>(Ljava/lang/String;Ljava/lang/Long;Ljava/lang/Long;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/io/NetworkUtils$downloadFile$1.smali b/com.discord/smali/com/discord/utilities/io/NetworkUtils$downloadFile$1.smali
index 06c88e2469..64cd2414c6 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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;->bgy:Lkotlin/Unit;
+    sget-object v1, Lkotlin/Unit;->bgt: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 5eb8b10e12..32dd7a106f 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;->Az()Lcom/google/gson/Gson;
+    invoke-virtual {v0}, Lcom/google/gson/f;->Ax()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 2e8b8b311b..b84f082315 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 da47935fdc..82f184de50 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;->Jc()Lrx/Scheduler;
+    invoke-static {}, Lrx/android/b/a;->Ja()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 914456e690..07fcf1a9d7 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 e55b984fa1..ce3b693f92 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;->Kw()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Ku()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 b07cab2aa7..1b9a3bec9b 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 d842990478..a3ba7a7968 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 fa42b1a95b..ad05c16ea9 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 c5d6066cbd..e5ad0f7ea6 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 2e45b1e5d8..0942f9f4e2 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 3e224a9cb4..83bc21ead6 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 4b876375a0..1a19227717 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 520b0d3b98..a78ca30719 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 bc84c2cd79..92734fd622 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 b36ea9945e..a08ab85afb 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 ebc65a4cdc..c347b227e9 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 aa0031cbae..729a94c7e6 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 d387533a93..4229af4c11 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 402a7416b3..cadb1f51cb 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 d6b4dd2dad..7bf72f60bb 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;->IV()Lrx/Observable;
+    invoke-virtual {v2}, Lrx/Observable;->IT()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 8977a0a3c1..8cd067d3dd 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 b480c46b70..fdc8afd56f 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;->vm:Lcom/discord/app/AppLog;
+    sget-object v4, Lcom/discord/app/AppLog;->vn: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 84a12881c5..841aeea13d 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;->vm:Lcom/discord/app/AppLog;
+    sget-object v1, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
 
     const-string v2, "Unable to configure recycler."
 
@@ -292,7 +292,7 @@
 
     move-result-object v1
 
-    invoke-static {}, Lrx/d/a;->Kw()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Ku()Lrx/Scheduler;
 
     move-result-object v2
 
@@ -306,7 +306,7 @@
 
     move-result-object v1
 
-    invoke-static {}, Lrx/android/b/a;->Jc()Lrx/Scheduler;
+    invoke-static {}, Lrx/android/b/a;->Ja()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 c482cd44b6..21b2c2f9dd 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 c9fae42f0f..c11a1f4553 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -187,7 +187,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->IV()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->IT()Lrx/Observable;
 
     move-result-object v0
 
@@ -207,7 +207,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 831c64b5b5..ef57630a01 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -132,7 +132,7 @@
     return-void
 
     :cond_2
-    sget-object v2, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
+    sget-object v2, Lcom/discord/app/AppLog;->vn: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 5e80daf5d4..079627c652 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 17d67f41e2..bddb18d892 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 0623fe8118..8af3d44dfe 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, 0x7f12054d
+    const v1, 0x7f120528
 
     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, 0x7f12054c
+    const v0, 0x7f120527
 
     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, 0x7f0a04ab
+    const v0, 0x7f0a049e
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -185,7 +185,7 @@
 
     move-result-object v7
 
-    const p2, 0x7f12054a
+    const p2, 0x7f120525
 
     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, 0x7f120f90
+    const v0, 0x7f120f04
 
     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, 0x7f120f8f
+    const v0, 0x7f120f03
 
     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, 0x7f0d009e
+    const v0, 0x7f0d009c
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -266,7 +266,7 @@
 
     aput-object v4, v0, v3
 
-    const v3, 0x7f0a04ab
+    const v3, 0x7f0a049e
 
     invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -286,13 +286,13 @@
 
     move-result-object v5
 
-    const v0, 0x7f120d13
+    const v0, 0x7f120cdc
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
     move-result-object v3
 
-    const v0, 0x7f120c70
+    const v0, 0x7f120c39
 
     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 fe9c3c72a9..d608468324 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 b1abc9cd6e..ab8aa80787 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 cc0b9a9311..1d5d476919 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 763d74a284..f2a8c4afcf 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 5d206b6c7b..80956f7971 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;->vO:Lcom/discord/app/i;
+    sget-object v2, Lcom/discord/app/i;->vP: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;->vO:Lcom/discord/app/i;
+    sget-object p2, Lcom/discord/app/i;->vP: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 6762f3d97d..9d1f7a0d1b 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 8682ded726..ac35ce3914 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;->Kz()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kx()Lrx/subjects/BehaviorSubject;
 
     move-result-object v1
 
@@ -110,7 +110,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/discord/app/i;->vO:Lcom/discord/app/i;
+    sget-object v1, Lcom/discord/app/i;->vP: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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 6706e6e132..b99036f258 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 8f9248adfd..ae831738cc 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;->Kz()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kx()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 0497927036..30a3bdb937 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;->bgy:Lkotlin/Unit;
+    sget-object v1, Lkotlin/Unit;->bgt: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 35bc6b5519..885ece172a 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 62fb4ffa63..aab78b0f2d 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;->IU()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->IS()Lrx/Observable;
 
     move-result-object v0
 
-    sget-object v1, Lcom/discord/app/g;->vI:Lcom/discord/app/g;
+    sget-object v1, Lcom/discord/app/g;->vJ: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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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;->vm:Lcom/discord/app/AppLog;
+    sget-object v1, Lcom/discord/app/AppLog;->vn: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 922e7ad599..e93f6a3001 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, 0x7f060158
+    const v5, 0x7f060157
 
-    const v6, 0x7f0801d3
+    const v6, 0x7f0801c8
 
-    const v7, 0x7f0803e5
+    const v7, 0x7f0803d6
 
     const/4 v8, 0x0
 
@@ -129,9 +129,9 @@
 
     const v18, 0x7f060020
 
-    const v19, 0x7f0801c2
+    const v19, 0x7f0801b7
 
-    const v20, 0x7f080210
+    const v20, 0x7f080205
 
     const/16 v21, 0x0
 
@@ -161,11 +161,11 @@
 
     const-string v6, "Facebook"
 
-    const v7, 0x7f06006f
+    const v7, 0x7f06006e
 
-    const v8, 0x7f0801c7
+    const v8, 0x7f0801bc
 
-    const v9, 0x7f080281
+    const v9, 0x7f080275
 
     const/4 v11, 0x0
 
@@ -193,11 +193,11 @@
 
     const-string v6, "Google"
 
-    const v7, 0x7f060075
+    const v7, 0x7f060074
 
-    const v8, 0x7f0801c8
+    const v8, 0x7f0801bd
 
-    const v9, 0x7f0802a4
+    const v9, 0x7f080298
 
     const/4 v10, 0x0
 
@@ -223,11 +223,11 @@
 
     const-string v6, "League of Legends"
 
-    const v7, 0x7f060088
+    const v7, 0x7f060087
 
-    const v8, 0x7f0801c9
+    const v8, 0x7f0801be
 
-    const v9, 0x7f0802ec
+    const v9, 0x7f0802e0
 
     move-object v3, v1
 
@@ -249,7 +249,7 @@
 
     const/4 v7, 0x0
 
-    const v8, 0x7f0801cb
+    const v8, 0x7f0801c0
 
     const/4 v9, 0x0
 
@@ -273,7 +273,7 @@
 
     const-string v6, "Patreon"
 
-    const v8, 0x7f0801cc
+    const v8, 0x7f0801c1
 
     move-object v3, v1
 
@@ -293,11 +293,11 @@
 
     const-string v6, "Reddit"
 
-    const v7, 0x7f0600f9
+    const v7, 0x7f0600f8
 
-    const v8, 0x7f0801cd
+    const v8, 0x7f0801c2
 
-    const v9, 0x7f080362
+    const v9, 0x7f080356
 
     const/4 v12, 0x1
 
@@ -351,11 +351,11 @@
 
     const-string v6, "Skype"
 
-    const v7, 0x7f060100
+    const v7, 0x7f0600ff
 
-    const v8, 0x7f0801ce
+    const v8, 0x7f0801c3
 
-    const v9, 0x7f08037f
+    const v9, 0x7f080373
 
     const/4 v10, 0x1
 
@@ -381,11 +381,11 @@
 
     const-string v6, "Spotify"
 
-    const v7, 0x7f060101
+    const v7, 0x7f060100
 
-    const v8, 0x7f0801cf
+    const v8, 0x7f0801c4
 
-    const v9, 0x7f080386
+    const v9, 0x7f08037a
 
     const/4 v10, 0x0
 
@@ -413,11 +413,11 @@
 
     const-string v6, "Steam"
 
-    const v7, 0x7f06012d
+    const v7, 0x7f06012c
 
-    const v8, 0x7f0801d0
+    const v8, 0x7f0801c5
 
-    const v9, 0x7f08038e
+    const v9, 0x7f080381
 
     const/4 v11, 0x0
 
@@ -441,11 +441,11 @@
 
     const-string v6, "Twitch"
 
-    const v7, 0x7f060138
+    const v7, 0x7f060137
 
-    const v8, 0x7f0801d1
+    const v8, 0x7f0801c6
 
-    const v9, 0x7f0803a8
+    const v9, 0x7f08039a
 
     move-object v3, v1
 
@@ -465,11 +465,11 @@
 
     const-string v6, "Twitter"
 
-    const v7, 0x7f060139
+    const v7, 0x7f060138
 
-    const v8, 0x7f0801d2
+    const v8, 0x7f0801c7
 
-    const v9, 0x7f0803aa
+    const v9, 0x7f08039c
 
     move-object v3, v1
 
@@ -491,7 +491,7 @@
 
     const/4 v7, 0x0
 
-    const v8, 0x7f0801d4
+    const v8, 0x7f0801c9
 
     const/4 v9, 0x0
 
@@ -517,11 +517,11 @@
 
     const-string v6, "Youtube"
 
-    const v7, 0x7f060159
+    const v7, 0x7f060158
 
-    const v8, 0x7f0801d5
+    const v8, 0x7f0801ca
 
-    const v9, 0x7f0803e6
+    const v9, 0x7f0803d7
 
     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 dcfc8b4e0b..04716b171e 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(IZ)I
+.method private final getCurrentTierSubs(I)I
     .locals 2
 
     const/4 v0, 0x1
 
     const/4 v1, 0x2
 
-    if-eq p1, v0, :cond_4
+    if-eq p1, v0, :cond_2
 
-    if-eq p1, v1, :cond_2
+    if-eq p1, v1, :cond_1
 
     const/4 v0, 0x3
 
@@ -48,47 +48,33 @@
     return p1
 
     :cond_0
-    if-eqz p2, :cond_1
-
-    const/16 p1, 0x1e
-
-    return p1
-
-    :cond_1
     const/16 p1, 0x14
 
     return p1
 
-    :cond_2
-    if-eqz p2, :cond_3
-
-    const/16 p1, 0xf
-
-    return p1
-
-    :cond_3
+    :cond_1
     const/16 p1, 0xa
 
     return p1
 
-    :cond_4
+    :cond_2
     return v1
 .end method
 
-.method private final getNextTierSubs(IZ)I
-    .locals 1
+.method private final getNextTierSubs(I)I
+    .locals 2
 
     const/4 v0, 0x1
 
-    if-eq p1, v0, :cond_3
+    if-eq p1, v0, :cond_2
 
     const/4 v0, 0x2
 
     if-eq p1, v0, :cond_1
 
-    const/4 p2, 0x3
+    const/4 v1, 0x3
 
-    if-eq p1, p2, :cond_0
+    if-eq p1, v1, :cond_0
 
     return v0
 
@@ -98,25 +84,11 @@
     return p1
 
     :cond_1
-    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
+    :cond_2
     const/16 p1, 0xa
 
     return p1
@@ -124,7 +96,7 @@
 
 
 # virtual methods
-.method public final calculatePercentToNextTier(IIZ)I
+.method public final calculatePercentToNextTier(II)I
     .locals 1
 
     const/4 v0, 0x3
@@ -136,11 +108,11 @@
     return p1
 
     :cond_0
-    invoke-direct {p0, p1, p3}, Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils;->getNextTierSubs(IZ)I
+    invoke-direct {p0, p1}, Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils;->getNextTierSubs(I)I
 
     move-result v0
 
-    invoke-direct {p0, p1, p3}, Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils;->getCurrentTierSubs(IZ)I
+    invoke-direct {p0, p1}, Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils;->getCurrentTierSubs(I)I
 
     move-result p1
 
@@ -163,8 +135,170 @@
     return p1
 .end method
 
-.method public final calculateTotalProgress(IIZ)I
-    .locals 1
+.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
 
     const/4 v0, 0x3
 
@@ -175,31 +309,31 @@
     return p1
 
     :cond_0
-    invoke-direct {p0, p1, p3}, Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils;->getNextTierSubs(IZ)I
+    invoke-direct {p0, p1}, Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils;->getNextTierSubs(I)I
 
     move-result v0
 
-    invoke-direct {p0, p1, p3}, Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils;->getCurrentTierSubs(IZ)I
+    invoke-direct {p0, p1}, Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils;->getCurrentTierSubs(I)I
 
-    move-result p3
+    move-result v1
 
-    sub-int/2addr p2, p3
+    sub-int/2addr p2, v1
 
     int-to-float p2, p2
 
-    sub-int/2addr v0, p3
+    sub-int/2addr v0, v1
 
-    int-to-float p3, v0
+    int-to-float v0, v0
 
-    div-float/2addr p2, p3
+    div-float/2addr p2, v0
 
     int-to-float p1, p1
 
-    const p3, 0x42053333    # 33.3f
+    const v0, 0x42053333    # 33.3f
 
-    mul-float p1, p1, p3
+    mul-float p1, p1, v0
 
-    mul-float p2, p2, p3
+    mul-float p2, p2, v0
 
     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 d7b8880ecc..5d3d61cec7 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 063e50953c..93bc45dca0 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 1bb97e37f5..326886faf6 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, 0x7f08012c
+    const p1, 0x7f080128
 
     return p1
 
     :cond_3
-    const p1, 0x7f08012d
+    const p1, 0x7f080129
 
     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 c69438502e..661fdb3aa9 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, 0x7f121314
+    const v0, 0x7f121287
 
     new-array v2, v2, [Ljava/lang/Object;
 
@@ -79,7 +79,7 @@
     goto :goto_2
 
     :cond_1
-    const v0, 0x7f12130f
+    const v0, 0x7f121282
 
     new-array v2, v2, [Ljava/lang/Object;
 
@@ -96,7 +96,7 @@
     goto :goto_2
 
     :cond_2
-    const v0, 0x7f121310
+    const v0, 0x7f121283
 
     new-array v2, v2, [Ljava/lang/Object;
 
@@ -143,7 +143,7 @@
     :goto_0
     if-eqz p1, :cond_6
 
-    const v0, 0x7f121312
+    const v0, 0x7f121285
 
     new-array v2, v2, [Ljava/lang/Object;
 
@@ -164,7 +164,7 @@
 
     :cond_6
     :goto_1
-    const p1, 0x7f121311
+    const p1, 0x7f121284
 
     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;->bhO:Lkotlin/jvm/internal/ab;
+    sget-object v0, Lkotlin/jvm/internal/ab;->bhJ:Lkotlin/jvm/internal/ab;
 
     const/4 v0, 0x1
 
@@ -264,7 +264,7 @@
     return-object p1
 
     :cond_0
-    const p2, 0x7f121411
+    const p2, 0x7f121385
 
     invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -273,7 +273,7 @@
     return-object p1
 
     :cond_1
-    const p2, 0x7f120b81
+    const p2, 0x7f120b4b
 
     invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -282,7 +282,7 @@
     return-object p1
 
     :cond_2
-    const p2, 0x7f1211b1
+    const p2, 0x7f121127
 
     invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -291,7 +291,7 @@
     return-object p1
 
     :cond_3
-    const p2, 0x7f120df7
+    const p2, 0x7f120dbd
 
     invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -311,7 +311,7 @@
 
     if-eqz p2, :cond_0
 
-    const v0, 0x7f1211b1
+    const v0, 0x7f121127
 
     const/4 v1, 0x1
 
@@ -336,7 +336,7 @@
     if-nez p2, :cond_1
 
     :cond_0
-    const p2, 0x7f1211b2
+    const p2, 0x7f121128
 
     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, 0x7f08038c
+    const p1, 0x7f080380
 
     return p1
 
@@ -421,7 +421,7 @@
 
     if-ne p1, v1, :cond_4
 
-    const p1, 0x7f08038b
+    const p1, 0x7f08037f
 
     return p1
 
@@ -440,7 +440,7 @@
 
     if-ne p1, v1, :cond_6
 
-    const p1, 0x7f080389
+    const p1, 0x7f08037d
 
     return p1
 
@@ -459,7 +459,7 @@
 
     if-ne p1, v1, :cond_8
 
-    const p1, 0x7f080388
+    const p1, 0x7f08037c
 
     return p1
 
@@ -473,7 +473,7 @@
     invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
 
     :goto_4
-    const p1, 0x7f08038a
+    const p1, 0x7f08037e
 
     return p1
 .end method
@@ -510,7 +510,7 @@
 
     if-ne v0, v1, :cond_2
 
-    const p1, 0x7f12116c
+    const p1, 0x7f1210e0
 
     return p1
 
@@ -529,7 +529,7 @@
 
     if-ne v0, v1, :cond_4
 
-    const p1, 0x7f121168
+    const p1, 0x7f1210dc
 
     return p1
 
@@ -548,13 +548,13 @@
 
     if-ne p1, v0, :cond_6
 
-    const p1, 0x7f121166
+    const p1, 0x7f1210da
 
     return p1
 
     :cond_6
     :goto_3
-    const p1, 0x7f12116b
+    const p1, 0x7f1210df
 
     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 0c8ade6efb..6c71af2990 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;->Jc()Lrx/Scheduler;
+    invoke-static {}, Lrx/android/b/a;->Ja()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 6ba82515c6..3545536dbb 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;->vm:Lcom/discord/app/AppLog;
+    sget-object v1, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
 
     invoke-static {p1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/utilities/rest/AttachmentRequestBody.smali b/com.discord/smali/com/discord/utilities/rest/AttachmentRequestBody.smali
index d91cc76fc5..a8163afe9f 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;->vm:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vn: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 38f9b266e2..ef40a5def6 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/974"
+    const-string v0, "Discord-Android/975"
 
     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 055eb3ed89..fa15689eec 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;->Fx()Lokhttp3/w;
+    invoke-interface {p1}, Lokhttp3/Interceptor$Chain;->Fv()Lokhttp3/w;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokhttp3/w;->FL()Lokhttp3/w$a;
+    invoke-virtual {v0}, Lokhttp3/w;->FJ()Lokhttp3/w$a;
 
     move-result-object v0
 
@@ -67,7 +67,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokhttp3/w$a;->FN()Lokhttp3/w;
+    invoke-virtual {v0}, Lokhttp3/w$a;->FL()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 e8361cd2b2..477ffab3bc 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;->vm:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vn: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 8bd6a138b1..95727755ef 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;->byw:I
+    sget v1, Lokhttp3/a/a$a;->byr:I
 
     if-eqz v1, :cond_0
 
-    iput v1, v0, Lokhttp3/a/a;->byu:I
+    iput v1, v0, Lokhttp3/a/a;->byp: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;->vm:Lcom/discord/app/AppLog;
+    sget-object v3, Lcom/discord/app/AppLog;->vn: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 0a74c09ba9..f84ea3c336 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;->aTu:Lcom/google/gson/internal/LinkedTreeMap;
+    iget-object p1, p1, Lcom/google/gson/JsonObject;->aTq: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;->AF()I
+    invoke-virtual {p1}, Lcom/google/gson/JsonElement;->AD()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 661fd03efc..556d573542 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;->vm:Lcom/discord/app/AppLog;
+    sget-object v4, Lcom/discord/app/AppLog;->vn: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;->tw:Ljava/nio/charset/Charset;
+    sget-object v0, Lkotlin/text/d;->tx: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;
-            IH = true
+            IF = true
             value = "reaction"
         .end annotation
     .end param
@@ -3577,7 +3577,7 @@
     .end param
     .param p5    # Ljava/lang/String;
         .annotation runtime Lb/c/s;
-            IH = true
+            IF = true
             value = "emoji"
         .end annotation
     .end param
@@ -3754,31 +3754,6 @@
     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;
@@ -3804,6 +3779,55 @@
     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
@@ -4846,7 +4870,7 @@
     .end param
     .param p5    # Ljava/lang/String;
         .annotation runtime Lb/c/s;
-            IH = true
+            IF = true
             value = "reaction"
         .end annotation
     .end param
@@ -4995,7 +5019,7 @@
     .end param
     .param p5    # Ljava/lang/String;
         .annotation runtime Lb/c/s;
-            IH = true
+            IF = true
             value = "reaction"
         .end annotation
     .end param
@@ -6111,39 +6135,29 @@
     return-object p1
 .end method
 
-.method public final subscribeToGuild(JLcom/discord/restapi/RestAPIParams$PremiumGuildSubscribe;)Lrx/Observable;
+.method public final subscribeToGuild(J)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",
-            "Lcom/discord/restapi/RestAPIParams$PremiumGuildSubscribe;",
-            ")",
+            "(J)",
             "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, p3}, Lcom/discord/restapi/RestAPIInterface;->subscribeToGuild(JLcom/discord/restapi/RestAPIParams$PremiumGuildSubscribe;)Lrx/Observable;
+    invoke-interface {v0, p1, p2}, Lcom/discord/restapi/RestAPIInterface;->subscribeToGuild(J)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 bde9800be6..92a2a73d46 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, 0x7f12035b
+    const v2, 0x7f120336
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -58,7 +58,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f120357
+    const v3, 0x7f120332
 
     invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -78,7 +78,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f120356
+    const v3, 0x7f120331
 
     invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -98,7 +98,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f120358
+    const v3, 0x7f120333
 
     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 da6f5ab5a9..dfc411d336 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;->bGh:Lrx/Emitter$a;
+    sget-object p1, Lrx/Emitter$a;->bGc: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, 0x7f1205e3
+    const p2, 0x7f1205be
 
     goto :goto_0
 
     :cond_1
-    const p2, 0x7f1205e2
+    const p2, 0x7f1205bd
 
     goto :goto_0
 
     :cond_2
-    const p2, 0x7f1205e4
+    const p2, 0x7f1205bf
 
     :goto_0
-    const v0, 0x7f0d00f2
+    const v0, 0x7f0d00f0
 
     const/4 v2, 0x0
 
@@ -391,7 +391,7 @@
 
     if-eqz p1, :cond_3
 
-    const p2, 0x7f060137
+    const p2, 0x7f060136
 
     invoke-virtual {p1, p2}, Landroid/view/Window;->setBackgroundDrawableResource(I)V
 
@@ -648,7 +648,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ba;->JI()Lrx/internal/a/ba;
+    invoke-static {}, Lrx/internal/a/ba;->JG()Lrx/internal/a/ba;
 
     move-result-object p3
 
@@ -759,7 +759,7 @@
     goto :goto_0
 
     :cond_1
-    const p3, 0x7f120c18
+    const p3, 0x7f120be1
 
     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/d;->xw:Lcom/discord/dialogs/d$a;
+    sget-object p3, Lcom/discord/dialogs/d;->xy:Lcom/discord/dialogs/d$a;
 
     const/4 v1, 0x3
 
-    const p3, 0x7f120f4b
+    const p3, 0x7f120ebf
 
     invoke-virtual {p1, p3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/utilities/rest/SendUtilsKt.smali b/com.discord/smali/com/discord/utilities/rest/SendUtilsKt.smali
index 766008372a..524efd0939 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;->vm:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vn: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 985adc3277..0e2e9f513e 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;->Kw()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Ku()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;->IY()Lrx/Scheduler$Worker;
+    invoke-virtual {v0}, Lrx/Scheduler;->IW()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 7d2aa43534..eaa9c24673 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 cdc4ff4a07..c85ce4bb50 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$takeUntilComponentFinished$$inlined$let$lambda$1.smali b/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$ui$$inlined$let$lambda$1.smali
similarity index 75%
rename from com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$takeUntilComponentFinished$$inlined$let$lambda$1.smali
rename to com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$ui$$inlined$let$lambda$1.smali
index e384eef4f7..0cf11dc1c7 100644
--- a/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$takeUntilComponentFinished$$inlined$let$lambda$1.smali
+++ b/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$ui$$inlined$let$lambda$1.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/utilities/rx/ObservableExtensionsKt$takeUntilComponentFinished$$inlined$let$lambda$1;
+.class final Lcom/discord/utilities/rx/ObservableExtensionsKt$ui$$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;->takeUntilComponentFinished(Lrx/Observable;Lcom/discord/app/AppComponent;)Lrx/Observable;
+    value = Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;)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$takeUntilComponentFinished$$inlined$let$lambda$1;->$appComponent$inlined:Lcom/discord/app/AppComponent;
+    iput-object p1, p0, Lcom/discord/utilities/rx/ObservableExtensionsKt$ui$$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$takeUntilComponentFinished$$inlined$let$lambda$1;->call(Ljava/lang/Object;)Z
+    invoke-virtual {p0, p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt$ui$$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$takeUntilComponentFinished$$inlined$let$lambda$1;->$appComponent$inlined:Lcom/discord/app/AppComponent;
+    iget-object p1, p0, Lcom/discord/utilities/rx/ObservableExtensionsKt$ui$$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$takeUntilComponentFinished$$inlined$let$lambda$1;->$appComponent$inlined:Lcom/discord/app/AppComponent;
+    iget-object p1, p0, Lcom/discord/utilities/rx/ObservableExtensionsKt$ui$$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$takeUntilComponentFinished$$inlined$let$lambda$1;->$appComponent$inlined:Lcom/discord/app/AppComponent;
+    iget-object p1, p0, Lcom/discord/utilities/rx/ObservableExtensionsKt$ui$$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$1.smali b/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$ui$2.smali
similarity index 90%
rename from com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$ui$1.smali
rename to com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$ui$2.smali
index de53308442..07df7aca5e 100644
--- a/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$ui$1.smali
+++ b/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt$ui$2.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/utilities/rx/ObservableExtensionsKt$ui$1;
+.class final Lcom/discord/utilities/rx/ObservableExtensionsKt$ui$2;
 .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$1;->$adapter:Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;
+    iput-object p1, p0, Lcom/discord/utilities/rx/ObservableExtensionsKt$ui$2;->$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$1;->$adapter:Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;
+    iget-object v0, p0, Lcom/discord/utilities/rx/ObservableExtensionsKt$ui$2;->$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 16f83e1c97..4e88a8a3a8 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;->Jx()Lrx/internal/a/aj;
+    invoke-static {}, Lrx/internal/a/aj;->Jv()Lrx/internal/a/aj;
 
     move-result-object v0
 
@@ -328,7 +328,7 @@
 
     move-result-object p0
 
-    invoke-static {}, Lrx/d/a;->Kw()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Ku()Lrx/Scheduler;
 
     move-result-object v0
 
@@ -336,7 +336,7 @@
 
     move-result-object p0
 
-    invoke-static {}, Lrx/d/a;->Kw()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Ku()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;->Jz()Lrx/internal/a/ak;
+    invoke-static {}, Lrx/internal/a/ak;->Jx()Lrx/internal/a/ak;
 
     move-result-object v0
 
@@ -377,7 +377,7 @@
 
     move-result-object p0
 
-    invoke-static {}, Lrx/d/a;->Kw()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Ku()Lrx/Scheduler;
 
     move-result-object v0
 
@@ -385,7 +385,7 @@
 
     move-result-object p0
 
-    invoke-static {}, Lrx/d/a;->Kw()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Ku()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;->Kx()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Kv()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;->IV()Lrx/Observable;
+    invoke-virtual {p0}, Lrx/Observable;->IT()Lrx/Observable;
 
     move-result-object p0
 
@@ -681,68 +681,6 @@
     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;
@@ -761,7 +699,7 @@
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {}, Lrx/android/b/a;->Jc()Lrx/Scheduler;
+    invoke-static {}, Lrx/android/b/a;->Ja()Lrx/Scheduler;
 
     move-result-object v0
 
@@ -801,7 +739,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {}, Lrx/android/b/a;->Jc()Lrx/Scheduler;
+    invoke-static {}, Lrx/android/b/a;->Ja()Lrx/Scheduler;
 
     move-result-object v0
 
@@ -809,17 +747,34 @@
 
     move-result-object p0
 
-    const-string v0, "observeOn(AndroidSchedulers.mainThread())"
+    invoke-interface {p1}, Lcom/discord/app/AppComponent;->getPaused()Lrx/subjects/Subject;
 
-    invoke-static {p0, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    move-result-object v0
 
-    invoke-static {p0, p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->takeUntilComponentFinished(Lrx/Observable;Lcom/discord/app/AppComponent;)Lrx/Observable;
+    check-cast v0, Lrx/Observable;
+
+    invoke-virtual {p0, v0}, Lrx/Observable;->c(Lrx/Observable;)Lrx/Observable;
 
     move-result-object p0
 
-    new-instance p1, Lcom/discord/utilities/rx/ObservableExtensionsKt$ui$1;
+    instance-of v0, p1, Landroidx/fragment/app/Fragment;
 
-    invoke-direct {p1, p2}, Lcom/discord/utilities/rx/ObservableExtensionsKt$ui$1;-><init>(Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;)V
+    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
 
     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 0353559ce8..886ad3b86a 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;->Kw()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Ku()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 e06e22afa9..6ea5688098 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 cea77dd7a0..228ea6c767 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 edb0b9bf0c..31b336ff7e 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;->Jc()Lrx/Scheduler;
+    invoke-static {}, Lrx/android/b/a;->Ja()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 38237ad0d1..ddbc6d1e98 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;->Kw()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Ku()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 15bda1a5ac..ea0e2a8c05 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;->IY()Lrx/Scheduler$Worker;
+    invoke-virtual {v0}, Lrx/Scheduler;->IW()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 988fb65fb0..5a4591ac71 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 872d6265d5..63a3e7badd 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 57e3570aa1..fd411f3dc6 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;->IV()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->IT()Lrx/Observable;
 
     move-result-object v0
 
@@ -417,7 +417,7 @@
 
     move-result-object p1
 
-    sget-object v0, Lcom/discord/app/i;->vO:Lcom/discord/app/i;
+    sget-object v0, Lcom/discord/app/i;->vP: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;->IV()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->IT()Lrx/Observable;
 
     move-result-object v0
 
@@ -529,7 +529,7 @@
 
     move-result-object p1
 
-    sget-object p2, Lcom/discord/app/i;->vO:Lcom/discord/app/i;
+    sget-object p2, Lcom/discord/app/i;->vP: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 2bf3ec54a3..60fb8ee4cb 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;->bhO:Lkotlin/jvm/internal/ab;
+    sget-object v1, Lkotlin/jvm/internal/ab;->bhJ: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 72aeb3ab17..f7c49fb8eb 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, 0x7f12107e
+    const v0, 0x7f120ff2
 
     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, 0x7f121080
+    const v0, 0x7f120ff4
 
     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, 0x7f121082    # 1.94153E38f
+    const v0, 0x7f120ff6
 
     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, 0x7f12107f    # 1.9415294E38f
+    const v0, 0x7f120ff3
 
     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, 0x7f12106a
+    const v0, 0x7f120fde
 
     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, 0x7f121068
+    const v0, 0x7f120fdc
 
     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, 0x7f121067
+    const v0, 0x7f120fdb
 
     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, 0x7f12106c
+    const v0, 0x7f120fe0
 
     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, 0x7f121069
+    const v0, 0x7f120fdd
 
     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, 0x7f12106b
+    const v0, 0x7f120fdf
 
     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 7ddf545a96..4992f45521 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 59a8de1399..af9018bb7c 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;->KA()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->Ky()Lrx/subjects/PublishSubject;
 
     move-result-object v2
 
@@ -1157,7 +1157,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 5970050728..44f0101d28 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 1de01710d0..1e6c5236dd 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 33fcb8c4f7..851b3a2e01 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 b6934baa95..7468e1a72a 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 330aa0f9ed..9f9135c670 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 e8e5317ce0..ac1a08affb 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;->Kz()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kx()Lrx/subjects/BehaviorSubject;
 
     move-result-object v0
 
@@ -297,7 +297,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/discord/app/i;->vO:Lcom/discord/app/i;
+    sget-object v1, Lcom/discord/app/i;->vP: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 66cd9105a3..cc69c2ae03 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, 0x7f0d0084
+    const v1, 0x7f0d0083
 
     const/4 v2, 0x0
 
@@ -158,7 +158,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f0a082b
+    const v2, 0x7f0a07f1
 
     invoke-virtual {v0, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -166,7 +166,7 @@
 
     check-cast v2, Landroid/widget/TextView;
 
-    const v3, 0x7f0a082c
+    const v3, 0x7f0a07f2
 
     invoke-virtual {v0, v3}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -174,7 +174,7 @@
 
     check-cast v3, Landroid/widget/TextView;
 
-    const v4, 0x7f0a0829
+    const v4, 0x7f0a07ef
 
     invoke-virtual {v0, v4}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -182,7 +182,7 @@
 
     check-cast v4, Landroid/widget/TextView;
 
-    const v5, 0x7f0a082a
+    const v5, 0x7f0a07f0
 
     invoke-virtual {v0, v5}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -190,11 +190,11 @@
 
     check-cast v0, Landroid/widget/TextView;
 
-    const v5, 0x7f120548
+    const v5, 0x7f120523
 
     invoke-virtual {v2, v5}, Landroid/widget/TextView;->setText(I)V
 
-    const v2, 0x7f120549
+    const v2, 0x7f120524
 
     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, 0x7f120d13
+    const v2, 0x7f120cdc
 
     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 acc664984c..dfeff53c4e 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 ef85822297..b8f475bf5e 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 a09f4b988f..8a2a333886 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 697d3d15be..bd73c9cfeb 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/Func3;
+.implements Lrx/functions/Func2;
 
 
 # annotations
@@ -22,14 +22,12 @@
         "Ljava/lang/Object;",
         "T2:",
         "Ljava/lang/Object;",
-        "T3:",
-        "Ljava/lang/Object;",
         "R:",
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lrx/functions/Func3<",
-        "TT1;TT2;TT3;TR;>;"
+        "Lrx/functions/Func2<",
+        "TT1;TT2;TR;>;"
     }
 .end annotation
 
@@ -51,7 +49,7 @@
 
 
 # virtual methods
-.method public final call(Lcom/discord/models/domain/ModelGuild;Lcom/discord/stores/StoreApplicationStreamPreviews$StreamPreview;Ljava/lang/Integer;)Lcom/discord/utilities/streams/StreamContext;
+.method public final call(Lcom/discord/models/domain/ModelGuild;Lcom/discord/stores/StoreApplicationStreamPreviews$StreamPreview;)Lcom/discord/utilities/streams/StreamContext;
     .locals 2
 
     if-nez p1, :cond_0
@@ -61,31 +59,23 @@
     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, p3}, Lcom/discord/utilities/streams/StreamContext;-><init>(Lcom/discord/models/domain/ModelApplicationStream;Lcom/discord/models/domain/ModelGuild;Lcom/discord/stores/StoreApplicationStreamPreviews$StreamPreview;Z)V
+    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
 
     return-object v0
 .end method
 
-.method public final bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+.method public final bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
     check-cast p1, Lcom/discord/models/domain/ModelGuild;
 
     check-cast p2, Lcom/discord/stores/StoreApplicationStreamPreviews$StreamPreview;
 
-    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;
+    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;
 
     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 339c94b20d..4232d8e723 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 5
+    .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -108,27 +108,13 @@
 
     move-result-object v1
 
-    sget-object v2, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+    new-instance v2, Lcom/discord/utilities/streams/StreamContext$Companion$get$1$1;
 
-    invoke-virtual {v2}, Lcom/discord/stores/StoreStream$Companion;->getPermissions()Lcom/discord/stores/StorePermissions;
+    invoke-direct {v2, p1}, Lcom/discord/utilities/streams/StreamContext$Companion$get$1$1;-><init>(Lcom/discord/models/domain/ModelApplicationStream;)V
 
-    move-result-object v2
+    check-cast v2, Lrx/functions/Func2;
 
-    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;
+    invoke-static {v0, v1, v2}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/functions/Func2;)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 2351bf7994..9a322423e3 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;->getStreamsForUser(J)Lrx/Observable;
+    invoke-virtual {p4, p1, p2}, Lcom/discord/stores/StoreApplicationStreaming;->getForUser(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 72ac6d4aa6..265d0b70df 100644
--- a/com.discord/smali/com/discord/utilities/streams/StreamContext.smali
+++ b/com.discord/smali/com/discord/utilities/streams/StreamContext.smali
@@ -16,8 +16,6 @@
 
 
 # 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;
@@ -40,7 +38,7 @@
     return-void
 .end method
 
-.method public constructor <init>(Lcom/discord/models/domain/ModelApplicationStream;Lcom/discord/models/domain/ModelGuild;Lcom/discord/stores/StoreApplicationStreamPreviews$StreamPreview;Z)V
+.method public constructor <init>(Lcom/discord/models/domain/ModelApplicationStream;Lcom/discord/models/domain/ModelGuild;Lcom/discord/stores/StoreApplicationStreamPreviews$StreamPreview;)V
     .locals 1
 
     const-string v0, "stream"
@@ -59,43 +57,34 @@
 
     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;ZILjava/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;ILjava/lang/Object;)Lcom/discord/utilities/streams/StreamContext;
     .locals 0
 
-    and-int/lit8 p6, p5, 0x1
+    and-int/lit8 p5, p4, 0x1
 
-    if-eqz p6, :cond_0
+    if-eqz p5, :cond_0
 
     iget-object p1, p0, Lcom/discord/utilities/streams/StreamContext;->stream:Lcom/discord/models/domain/ModelApplicationStream;
 
     :cond_0
-    and-int/lit8 p6, p5, 0x2
+    and-int/lit8 p5, p4, 0x2
 
-    if-eqz p6, :cond_1
+    if-eqz p5, :cond_1
 
     iget-object p2, p0, Lcom/discord/utilities/streams/StreamContext;->guild:Lcom/discord/models/domain/ModelGuild;
 
     :cond_1
-    and-int/lit8 p6, p5, 0x4
+    and-int/lit8 p4, p4, 0x4
 
-    if-eqz p6, :cond_2
+    if-eqz p4, :cond_2
 
     iget-object p3, p0, Lcom/discord/utilities/streams/StreamContext;->preview:Lcom/discord/stores/StoreApplicationStreamPreviews$StreamPreview;
 
     :cond_2
-    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;
+    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;
 
     move-result-object p0
 
@@ -128,15 +117,7 @@
     return-object v0
 .end method
 
-.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;
+.method public final copy(Lcom/discord/models/domain/ModelApplicationStream;Lcom/discord/models/domain/ModelGuild;Lcom/discord/stores/StoreApplicationStreamPreviews$StreamPreview;)Lcom/discord/utilities/streams/StreamContext;
     .locals 1
 
     const-string v0, "stream"
@@ -149,88 +130,64 @@
 
     new-instance v0, Lcom/discord/utilities/streams/StreamContext;
 
-    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
+    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
 
     return-object v0
 .end method
 
 .method public final equals(Ljava/lang/Object;)Z
-    .locals 4
+    .locals 2
 
-    const/4 v0, 0x1
+    if-eq p0, p1, :cond_1
 
-    if-eq p0, p1, :cond_2
+    instance-of v0, p1, Lcom/discord/utilities/streams/StreamContext;
 
-    instance-of v1, p1, Lcom/discord/utilities/streams/StreamContext;
-
-    const/4 v2, 0x0
-
-    if-eqz v1, :cond_1
+    if-eqz v0, :cond_0
 
     check-cast p1, Lcom/discord/utilities/streams/StreamContext;
 
-    iget-object v1, p0, Lcom/discord/utilities/streams/StreamContext;->stream:Lcom/discord/models/domain/ModelApplicationStream;
+    iget-object v0, p0, 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;
+    iget-object v1, p1, Lcom/discord/utilities/streams/StreamContext;->stream:Lcom/discord/models/domain/ModelApplicationStream;
 
-    invoke-static {v1, v3}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
-    move-result v1
+    move-result v0
 
-    if-eqz v1, :cond_1
+    if-eqz v0, :cond_0
 
-    iget-object v1, p0, Lcom/discord/utilities/streams/StreamContext;->guild:Lcom/discord/models/domain/ModelGuild;
+    iget-object v0, p0, 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;
+    iget-object v1, p1, Lcom/discord/utilities/streams/StreamContext;->guild:Lcom/discord/models/domain/ModelGuild;
 
-    invoke-static {v1, v3}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
-    move-result v1
+    move-result v0
 
-    if-eqz v1, :cond_1
+    if-eqz v0, :cond_0
 
-    iget-object v1, p0, Lcom/discord/utilities/streams/StreamContext;->preview:Lcom/discord/stores/StoreApplicationStreamPreviews$StreamPreview;
+    iget-object v0, p0, 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;
+    iget-object p1, p1, Lcom/discord/utilities/streams/StreamContext;->preview:Lcom/discord/stores/StoreApplicationStreamPreviews$StreamPreview;
 
-    invoke-static {v1, v3}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
-    move-result v1
+    move-result p1
 
-    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
+    if-eqz p1, :cond_0
 
     goto :goto_0
 
     :cond_0
     const/4 p1, 0x0
 
-    :goto_0
-    if-eqz p1, :cond_1
-
-    goto :goto_1
+    return p1
 
     :cond_1
-    return v2
+    :goto_0
+    const/4 p1, 0x1
 
-    :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
+    return p1
 .end method
 
 .method public final getGuild()Lcom/discord/models/domain/ModelGuild;
@@ -307,17 +264,6 @@
     :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
 
@@ -350,14 +296,6 @@
 
     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/surveys/SurveyUtils$getSurveyToShow$2$1.smali b/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$getSurveyToShow$2$1.smali
index 14bc885023..2ed3aa1764 100644
--- a/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$getSurveyToShow$2$1.smali
+++ b/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$getSurveyToShow$2$1.smali
@@ -74,13 +74,15 @@
         }
     .end annotation
 
-    if-eqz p1, :cond_0
+    instance-of v0, p1, Lcom/discord/utilities/surveys/SurveyUtils$Survey$None;
+
+    if-nez v0, :cond_0
 
     invoke-static {p1}, Lrx/Observable;->bq(Ljava/lang/Object;)Lrx/Observable;
 
     move-result-object p1
 
-    if-nez p1, :cond_1
+    return-object p1
 
     :cond_0
     sget-object p1, Lcom/discord/utilities/surveys/SurveyUtils;->INSTANCE:Lcom/discord/utilities/surveys/SurveyUtils;
@@ -95,6 +97,5 @@
 
     move-result-object p1
 
-    :cond_1
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/MessageRenderContext$1.smali b/com.discord/smali/com/discord/utilities/textprocessing/MessageRenderContext$1.smali
index 27459016c0..62a68647d8 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 d1cd604c0f..923de4a838 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 7ce070201b..45ada3745e 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, 0x7f06008d
+    const v2, 0x7f06008c
 
-    const v8, 0x7f06008d
+    const v8, 0x7f06008c
 
     goto :goto_3
 
@@ -803,7 +803,7 @@
 
     if-eqz v2, :cond_6
 
-    const v2, 0x7f04037f
+    const v2, 0x7f04037e
 
     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, 0x7f040380
+    const v2, 0x7f04037f
 
     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 c10bc49413..cf669dc90c 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;->Bp:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Bs: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 6234d24c6e..507234ffc7 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;->Bp:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Bs: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 5743c6ec56..9b6b856132 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;->Bp:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Bs: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 5cdb081057..b595ecd1e8 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;->Bp:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Bs: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 b6018a719d..fc992bad40 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;->Bx:Lcom/discord/simpleast/core/a/a;
+    sget-object p2, Lcom/discord/simpleast/core/a/a;->BA:Lcom/discord/simpleast/core/a/a;
 
-    invoke-virtual {p2}, Lcom/discord/simpleast/core/a/a;->eR()Lcom/discord/simpleast/core/parser/Rule;
+    invoke-virtual {p2}, Lcom/discord/simpleast/core/a/a;->eQ()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 d6fdd195c6..01bf7e9815 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
-        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
+        0x7f121152
+        0x7f121153
+        0x7f121154
+        0x7f121155
+        0x7f121156
+        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
     .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 194ce0dfae..69b18f749a 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 09017b03c5..09a2879414 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 ffb874ada9..88980bfaa1 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, 0x7f06008d
+    const p1, 0x7f06008c
 
     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 5a4668285c..74b33d5cc8 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 38adedcb8b..941e561c88 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 c43439825d..11803efaf7 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 a508e9d4a5..66e72f7510 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 5adbccd5c0..177248c241 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, 0x7f06008d
+    const p1, 0x7f06008c
 
     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 a42d4643a4..63e7cf91df 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/Parsers.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/Parsers.smali
@@ -334,27 +334,7 @@
 
     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;->Bx:Lcom/discord/simpleast/core/a/a;
-
-    invoke-virtual {v2}, Lcom/discord/simpleast/core/a/a;->eS()Lcom/discord/simpleast/core/parser/Rule;
-
-    move-result-object v2
-
-    invoke-virtual {v0, v2}, Lcom/discord/simpleast/core/parser/Parser;->addRule(Lcom/discord/simpleast/core/parser/Rule;)Lcom/discord/simpleast/core/parser/Parser;
-
-    move-result-object v0
-
-    sget-object v2, Lcom/discord/simpleast/core/a/a;->Bx:Lcom/discord/simpleast/core/a/a;
-
-    invoke-static {}, Lcom/discord/simpleast/core/a/a;->eQ()Lcom/discord/simpleast/core/parser/Rule;
-
-    move-result-object v2
-
-    invoke-virtual {v0, v2}, Lcom/discord/simpleast/core/parser/Parser;->addRule(Lcom/discord/simpleast/core/parser/Rule;)Lcom/discord/simpleast/core/parser/Parser;
-
-    move-result-object v0
-
-    sget-object v2, Lcom/discord/simpleast/core/a/a;->Bx:Lcom/discord/simpleast/core/a/a;
+    sget-object v2, Lcom/discord/simpleast/core/a/a;->BA:Lcom/discord/simpleast/core/a/a;
 
     invoke-virtual {v2}, Lcom/discord/simpleast/core/a/a;->eR()Lcom/discord/simpleast/core/parser/Rule;
 
@@ -362,6 +342,26 @@
 
     invoke-virtual {v0, v2}, Lcom/discord/simpleast/core/parser/Parser;->addRule(Lcom/discord/simpleast/core/parser/Rule;)Lcom/discord/simpleast/core/parser/Parser;
 
+    move-result-object v0
+
+    sget-object v2, Lcom/discord/simpleast/core/a/a;->BA:Lcom/discord/simpleast/core/a/a;
+
+    invoke-static {}, Lcom/discord/simpleast/core/a/a;->eP()Lcom/discord/simpleast/core/parser/Rule;
+
+    move-result-object v2
+
+    invoke-virtual {v0, v2}, Lcom/discord/simpleast/core/parser/Parser;->addRule(Lcom/discord/simpleast/core/parser/Rule;)Lcom/discord/simpleast/core/parser/Parser;
+
+    move-result-object v0
+
+    sget-object v2, Lcom/discord/simpleast/core/a/a;->BA:Lcom/discord/simpleast/core/a/a;
+
+    invoke-virtual {v2}, Lcom/discord/simpleast/core/a/a;->eQ()Lcom/discord/simpleast/core/parser/Rule;
+
+    move-result-object v2
+
+    invoke-virtual {v0, v2}, Lcom/discord/simpleast/core/parser/Parser;->addRule(Lcom/discord/simpleast/core/parser/Rule;)Lcom/discord/simpleast/core/parser/Parser;
+
     move-result-object v3
 
     const/4 v5, 0x0
@@ -440,9 +440,9 @@
 
     move-result-object v0
 
-    sget-object v2, Lcom/discord/simpleast/core/a/a;->Bx:Lcom/discord/simpleast/core/a/a;
+    sget-object v2, Lcom/discord/simpleast/core/a/a;->BA:Lcom/discord/simpleast/core/a/a;
 
-    invoke-static {}, Lcom/discord/simpleast/core/a/a;->eQ()Lcom/discord/simpleast/core/parser/Rule;
+    invoke-static {}, Lcom/discord/simpleast/core/a/a;->eP()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;->Bx:Lcom/discord/simpleast/core/a/a;
+    sget-object v2, Lcom/discord/simpleast/core/a/a;->BA:Lcom/discord/simpleast/core/a/a;
 
-    invoke-virtual {v2}, Lcom/discord/simpleast/core/a/a;->eR()Lcom/discord/simpleast/core/parser/Rule;
+    invoke-virtual {v2}, Lcom/discord/simpleast/core/a/a;->eQ()Lcom/discord/simpleast/core/parser/Rule;
 
     move-result-object v2
 
@@ -460,7 +460,7 @@
 
     move-result-object v3
 
-    sget-object v5, Lkotlin/Unit;->bgy:Lkotlin/Unit;
+    sget-object v5, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     const/4 v6, 0x0
 
@@ -650,7 +650,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lcom/discord/simpleast/core/a/a;->eT()Ljava/util/List;
+    invoke-static {}, Lcom/discord/simpleast/core/a/a;->eS()Ljava/util/List;
 
     move-result-object v1
 
@@ -660,7 +660,7 @@
 
     move-result-object v2
 
-    sget-object v4, Lkotlin/Unit;->bgy:Lkotlin/Unit;
+    sget-object v4, Lkotlin/Unit;->bgt: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;->eT()Ljava/util/List;
+    invoke-static {}, Lcom/discord/simpleast/core/a/a;->eS()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 cc6fdef985..def9d5ac31 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;->Bl:Lcom/discord/simpleast/core/node/Node;
+    iget-object p2, p1, Lcom/discord/simpleast/core/parser/ParseSpec;->Bo: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;->Bp:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Bs: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 a0c500e310..629670137c 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;->BI:Lcom/discord/simpleast/a/a;
+    sget-object v0, Lcom/discord/simpleast/a/a;->BL:Lcom/discord/simpleast/a/a;
 
-    invoke-static {}, Lcom/discord/simpleast/a/a;->eU()Ljava/util/regex/Pattern;
+    invoke-static {}, Lcom/discord/simpleast/a/a;->eT()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;->Bp:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object v0, Lcom/discord/simpleast/core/parser/ParseSpec;->Bs: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 9eaf5cbab9..e6beab81aa 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;->Bp:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object p3, Lcom/discord/simpleast/core/parser/ParseSpec;->Bs: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 a0a0e06d6f..eb800439f7 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;->Bp:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object v0, Lcom/discord/simpleast/core/parser/ParseSpec;->Bs: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 89c233847c..d89971315d 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;->Bp:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object v0, Lcom/discord/simpleast/core/parser/ParseSpec;->Bs: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 06dc98b993..d5cf721276 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;->Bp:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Bs: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 ac2e9f85fb..cc3051a7b2 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;->Bp:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Bs: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 62352284dd..8a04fda5c2 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;->Bp:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Bs: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 1898eb550e..3c5260c8f6 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;->Bp:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object v0, Lcom/discord/simpleast/core/parser/ParseSpec;->Bs: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 2b1b531228..26af727e1d 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;->Bp:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object p1, Lcom/discord/simpleast/core/parser/ParseSpec;->Bs: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;->Bp:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Bs: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 47d19ad8e0..2d56e7af28 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;->Bp:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Bs: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 7892d16eca..de9d8aa0ca 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;->Bp:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object v0, Lcom/discord/simpleast/core/parser/ParseSpec;->Bs: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 0a6a0b74c6..4d11145e58 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;->Bp:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object p1, Lcom/discord/simpleast/core/parser/ParseSpec;->Bs: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 70fc9982e5..f960091137 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;->Bp:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Bs: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 a7ebf2aaf9..b0672220b3 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;->Bx:Lcom/discord/simpleast/core/a/a;
+    sget-object p2, Lcom/discord/simpleast/core/a/a;->BA:Lcom/discord/simpleast/core/a/a;
 
-    invoke-virtual {p2}, Lcom/discord/simpleast/core/a/a;->eR()Lcom/discord/simpleast/core/parser/Rule;
+    invoke-virtual {p2}, Lcom/discord/simpleast/core/a/a;->eQ()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;->Bp:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Bs: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 d041a8f3da..40c81a9963 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;->Bp:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Bs: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 31bd0b5227..f3445efed4 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;->Bp:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object p1, Lcom/discord/simpleast/core/parser/ParseSpec;->Bs: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;->Bp:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Bs: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 8e99c4e751..2bc48f817e 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;->Bp:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Bs: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 1c7c550a6f..3abbab2aae 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;->Bp:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Bs: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 a88fd16242..2f9bbb30db 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;->Bp:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object v0, Lcom/discord/simpleast/core/parser/ParseSpec;->Bs: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;->Bp:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Bs: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 e691e16535..8f9746f555 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;->Bx:Lcom/discord/simpleast/core/a/a;
+    sget-object v0, Lcom/discord/simpleast/core/a/a;->BA:Lcom/discord/simpleast/core/a/a;
 
-    invoke-static {}, Lcom/discord/simpleast/core/a/a;->eO()Ljava/util/regex/Pattern;
+    invoke-static {}, Lcom/discord/simpleast/core/a/a;->eN()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;->Bx:Lcom/discord/simpleast/core/a/a;
+    sget-object v1, Lcom/discord/simpleast/core/a/a;->BA:Lcom/discord/simpleast/core/a/a;
 
-    invoke-static {}, Lcom/discord/simpleast/core/a/a;->eP()Ljava/util/regex/Pattern;
+    invoke-static {}, Lcom/discord/simpleast/core/a/a;->eO()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 508d972fa0..c1f68e22ed 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, 0x7f06002d
+    const v3, 0x7f06002c
 
     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 ea7223dcbf..810781eee0 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, 0x7f040367
+    const v4, 0x7f040366
 
     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 e9c272ddf0..44c3054171 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 248a068a50..71f8b36d05 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, 0x7f0600f2
+    const v3, 0x7f0600f1
 
     if-eqz p2, :cond_1
 
@@ -189,7 +189,7 @@
     :goto_1
     new-instance v3, Landroid/text/style/BackgroundColorSpan;
 
-    const v4, 0x7f0600f3
+    const v4, 0x7f0600f2
 
     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 0ceb034816..4fc625d155 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, 0x7f06004a
+    const v7, 0x7f060049
 
     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, 0x7f04036a
+    const v8, 0x7f040369
 
     const/16 v9, 0xa
 
@@ -306,7 +306,7 @@
     goto :goto_2
 
     :cond_5
-    const v2, 0x7f04037f
+    const v2, 0x7f04037e
 
     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, 0x7f04036b
+    const v2, 0x7f04036a
 
     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 bc5af8ef45..b9025ac7f1 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;->kH()Lcom/facebook/imagepipeline/request/b;
+    invoke-virtual {v2}, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->kF()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v2
 
-    invoke-static {}, Lcom/facebook/drawee/backends/pipeline/c;->gQ()Lcom/facebook/drawee/backends/pipeline/e;
+    invoke-static {}, Lcom/facebook/drawee/backends/pipeline/c;->gO()Lcom/facebook/drawee/backends/pipeline/e;
 
     move-result-object v3
 
-    iput-object v2, v3, Lcom/facebook/drawee/controller/a;->Mf:Ljava/lang/Object;
+    iput-object v2, v3, Lcom/facebook/drawee/controller/a;->Mb: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;->Mj:Z
+    iput-boolean v2, v3, Lcom/facebook/drawee/controller/a;->Mf:Z
 
     check-cast v3, Lcom/facebook/drawee/backends/pipeline/e;
 
-    invoke-virtual {v3}, Lcom/facebook/drawee/backends/pipeline/e;->hr()Lcom/facebook/drawee/controller/AbstractDraweeController;
+    invoke-virtual {v3}, Lcom/facebook/drawee/backends/pipeline/e;->hp()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;->OF:Landroid/graphics/drawable/Drawable;
+    iput-object v4, v3, Lcom/facebook/drawee/generic/a;->OB:Landroid/graphics/drawable/Drawable;
 
-    sget-object v4, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Oo:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sget-object v4, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Ok: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, 0x7f04037f
+    const p2, 0x7f04037e
 
     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;->hP()Lcom/facebook/drawee/generic/GenericDraweeHierarchy;
+    invoke-virtual {v3}, Lcom/facebook/drawee/generic/a;->hN()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;->Pl:Lcom/facebook/drawee/span/DraweeSpanStringBuilder$a;
+    iget-object v3, p2, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->Ph: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;->Px:Lcom/facebook/drawee/d/a;
+    iget-object v0, v0, Lcom/facebook/drawee/view/b;->Pt: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;->Pk:Ljava/util/Set;
+    iget-object v0, p2, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->Pg: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 66f5775abc..610e105c1f 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, 0x7f0600f2
+    const v4, 0x7f0600f1
 
     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, 0x7f0600f3
+    const v1, 0x7f0600f2
 
     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 f40f285f9e..b4dcd85adb 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 88d6fd238d..def44acb1f 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, 0x7f060137
+    const v4, 0x7f060136
 
     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 0c15e42d62..4feeb6a6a0 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 567873d067..bcf491e766 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 5cded1da21..2636c372c0 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 dcd280c114..ac4baa8ff0 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, 0x7f0600f3
+    const v6, 0x7f0600f2
 
     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, 0x7f0600f2
+    const v4, 0x7f0600f1
 
     if-eqz v5, :cond_4
 
@@ -354,7 +354,7 @@
 
     move-result-object v2
 
-    const v4, 0x7f0600f3
+    const v4, 0x7f0600f2
 
     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, 0x7f0600f2
+    const v3, 0x7f0600f1
 
     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 5b00fcccc8..907df92282 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 367ecd70cf..18fcfbb762 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 f715b8e3a1..34a81fa108 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;->vm:Lcom/discord/app/AppLog;
+    sget-object v2, Lcom/discord/app/AppLog;->vn: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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     goto :goto_0
 
     :cond_1
     invoke-virtual {p1, v0}, Landroid/content/Context;->startActivity(Landroid/content/Intent;)V
 
-    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     :cond_2
     :goto_0
@@ -739,7 +739,7 @@
 
     invoke-direct {v0}, Landroidx/browser/customtabs/CustomTabsIntent$Builder;-><init>()V
 
-    const v1, 0x7f06004b
+    const v1, 0x7f06004a
 
     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;->wv:Lcom/discord/app/j$b;
+    sget-object p2, Lcom/discord/app/j;->wx:Lcom/discord/app/j$b;
 
     invoke-static {}, Lcom/discord/app/j;->dR()V
 
@@ -866,7 +866,7 @@
 
     move-result-object p1
 
-    const v1, 0x7f0a0797
+    const v1, 0x7f0a076f
 
     invoke-virtual {v0, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -874,7 +874,7 @@
 
     check-cast v1, Landroid/widget/TextView;
 
-    const v2, 0x7f0a0798
+    const v2, 0x7f0a0770
 
     invoke-virtual {v0, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1103,7 +1103,7 @@
 
     :cond_7
     :goto_2
-    const p2, 0x7f1212b0
+    const p2, 0x7f121223
 
     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 4db6e3a97a..65ed889dbd 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;->Je()Lrx/functions/a$b;
+    invoke-static {}, Lrx/functions/a;->Jc()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 c61e450407..398c3fecbf 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;->aaq:Lcom/facebook/imagepipeline/request/b$b;
+    sget-object v1, Lcom/facebook/imagepipeline/request/b$b;->aam:Lcom/facebook/imagepipeline/request/b$b;
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->XR:Lcom/facebook/imagepipeline/request/b$b;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->XN: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;->aan:Lcom/facebook/imagepipeline/request/b$a;
+    sget-object p0, Lcom/facebook/imagepipeline/request/b$a;->aaj:Lcom/facebook/imagepipeline/request/b$a;
 
     goto :goto_1
 
     :cond_1
-    sget-object p0, Lcom/facebook/imagepipeline/request/b$a;->aao:Lcom/facebook/imagepipeline/request/b$a;
+    sget-object p0, Lcom/facebook/imagepipeline/request/b$a;->aak:Lcom/facebook/imagepipeline/request/b$a;
 
     :goto_1
-    iput-object p0, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aae:Lcom/facebook/imagepipeline/request/b$a;
+    iput-object p0, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aaa: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;->St:Lcom/facebook/imagepipeline/a/e;
+    iput-object p0, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Sp: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;->gQ()Lcom/facebook/drawee/backends/pipeline/e;
+    invoke-static {}, Lcom/facebook/drawee/backends/pipeline/c;->gO()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;->Mk:Lcom/facebook/drawee/d/a;
+    iput-object v2, v1, Lcom/facebook/drawee/controller/a;->Mg: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;->Mj:Z
+    iput-boolean v1, v0, Lcom/facebook/drawee/controller/a;->Mf: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;->kH()Lcom/facebook/imagepipeline/request/b;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->kF()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object p1
 
-    iput-object p1, v0, Lcom/facebook/drawee/controller/a;->Mf:Ljava/lang/Object;
+    iput-object p1, v0, Lcom/facebook/drawee/controller/a;->Mb:Ljava/lang/Object;
 
     check-cast v0, Lcom/facebook/drawee/backends/pipeline/e;
 
-    invoke-virtual {v0}, Lcom/facebook/drawee/backends/pipeline/e;->hr()Lcom/facebook/drawee/controller/AbstractDraweeController;
+    invoke-virtual {v0}, Lcom/facebook/drawee/backends/pipeline/e;->hp()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 5c005d1608..5401318615 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 3376c208b2..cb9f515b79 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 a0a1ed97d5..fff6ba0f23 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 c12438410f..d5fc03831d 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;->bhO:Lkotlin/jvm/internal/ab;
+    sget-object p2, Lkotlin/jvm/internal/ab;->bhJ: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 7fc19d42d7..f5b407951c 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 de90a444fd..7c69f8529f 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 e257605c27..db9fab2557 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 dc83890172..971fcbdac0 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 aa099f5032..6531bd0af3 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;->bgy:Lkotlin/Unit;
+    sget-object p2, Lkotlin/Unit;->bgt: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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 d1fd3363fc..0715f0d07c 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;->bgy:Lkotlin/Unit;
+    sget-object p2, Lkotlin/Unit;->bgt: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;->bgy:Lkotlin/Unit;
+    sget-object v1, Lkotlin/Unit;->bgt: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;->bha:Lkotlin/coroutines/c$b;
+    sget-object v8, Lkotlin/coroutines/c;->bgV: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;->DD()Lkotlinx/coroutines/an;
+    invoke-static {}, Lkotlinx/coroutines/al;->DB()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;->Dd()Lkotlin/coroutines/CoroutineContext;
+    invoke-interface {p1}, Lkotlinx/coroutines/CoroutineScope;->Db()Lkotlin/coroutines/CoroutineContext;
 
     move-result-object v0
 
-    sget-object v1, Lkotlinx/coroutines/Job;->bkC:Lkotlinx/coroutines/Job$b;
+    sget-object v1, Lkotlinx/coroutines/Job;->bkx: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;->DG()Lkotlinx/coroutines/bq;
+    invoke-static {}, Lkotlinx/coroutines/as;->DE()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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 8412fe03d8..96b3082d87 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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;->bkx:Lkotlinx/coroutines/bb;
+    sget-object p1, Lkotlinx/coroutines/bb;->bks:Lkotlinx/coroutines/bb;
 
     check-cast p1, Lkotlinx/coroutines/CoroutineScope;
 
-    invoke-static {}, Lkotlinx/coroutines/as;->DF()Lkotlinx/coroutines/ab;
+    invoke-static {}, Lkotlinx/coroutines/as;->DD()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 4be113a2f4..55155498bb 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 931bc6b079..189cf15631 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 d2947eb731..cfeab6b440 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     :cond_1
     return-void
@@ -251,7 +251,7 @@
     if-nez p1, :cond_1
 
     :cond_0
-    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     :cond_1
     return-void
@@ -289,7 +289,7 @@
     if-nez p1, :cond_1
 
     :cond_0
-    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 8f92c8761f..07f85cb714 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, 0x7f0a02d9
+    const v0, 0x7f0a02d8
 
     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 32b017045e..6ccbfc2e9c 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, 0x7f0a02d8
+    const v1, 0x7f0a02d7
 
     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 22ea933e28..0a4a658178 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;->zt:Z
+    iget-boolean p1, p1, Lcom/discord/rtcconnection/RtcConnection$State$d;->zu: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 04b30192a3..b78f461bc6 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 032fff3396..9813af4854 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, 0x7f120d3a
+    const v0, 0x7f120d03
 
     const/4 v1, 0x1
 
@@ -249,7 +249,7 @@
     :catchall_0
     move-exception p1
 
-    sget-object v0, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vn: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 467575bbb1..82eda900ec 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 e027c10ec2..2d87663cf6 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, 0x7f0a04d7
+    const v1, 0x7f0a04ca
 
     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 446bbd9c57..8abff0c9ca 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 aaf875aae1..62806ecac6 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 48a3ca173d..ca8cf83a3c 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -108,7 +108,7 @@
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/discord/overlay/OverlayManager;->yb:Ljava/util/List;
+    iget-object p1, p1, Lcom/discord/overlay/OverlayManager;->yd: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 b1fd466875..97292fd033 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;->yg:Landroid/view/View$OnTouchListener;
+    iget-object v2, v0, Lcom/discord/overlay/OverlayManager;->yi: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, 0x7f08031a
+    const v4, 0x7f08030e
 
     invoke-virtual {v2, v4}, Landroidx/core/app/NotificationCompat$Builder;->setSmallIcon(I)Landroidx/core/app/NotificationCompat$Builder;
 
     move-result-object v2
 
-    const v4, 0x7f060106
+    const v4, 0x7f060105
 
     invoke-static {p1, v4}, Landroidx/core/content/ContextCompat;->getColor(Landroid/content/Context;I)I
 
@@ -323,7 +323,7 @@
 
     move-result-object p1
 
-    const v2, 0x7f120d2a
+    const v2, 0x7f120cf3
 
     invoke-virtual {p0, v2}, Lcom/discord/utilities/voice/DiscordOverlayService;->getString(I)Ljava/lang/String;
 
@@ -335,7 +335,7 @@
 
     move-result-object p1
 
-    const v2, 0x7f120d3b
+    const v2, 0x7f120d04
 
     invoke-virtual {p0, v2}, Lcom/discord/utilities/voice/DiscordOverlayService;->getString(I)Ljava/lang/String;
 
@@ -351,7 +351,7 @@
 
     move-result-object p1
 
-    const v2, 0x7f120409
+    const v2, 0x7f1203e4
 
     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, 0x7f08024a
+    const v3, 0x7f08023e
 
     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, 0x7f1210ea
+    const v0, 0x7f12105e
 
     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, 0x7f080378
+    const v2, 0x7f08036c
 
     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;->yb:Ljava/util/List;
+    iget-object p1, p1, Lcom/discord/overlay/OverlayManager;->yd: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;->yb:Ljava/util/List;
+    iget-object p1, p1, Lcom/discord/overlay/OverlayManager;->yd: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;->yc:Lkotlin/jvm/functions/Function1;
+    iput-object v1, v0, Lcom/discord/overlay/OverlayManager;->ye: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;->vm:Lcom/discord/app/AppLog;
+    sget-object v4, Lcom/discord/app/AppLog;->vn: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 37a3dd4527..933aca0c48 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, 0x7f08031a
+    const v2, 0x7f08030e
 
     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, 0x7f080219
+    const v9, 0x7f08020e
 
     invoke-virtual {p1}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
 
     move-result-object v10
 
-    const v11, 0x7f12054a
+    const v11, 0x7f120525
 
     invoke-virtual {v10, v11}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
@@ -318,12 +318,12 @@
 
     if-eqz v3, :cond_0
 
-    const v8, 0x7f080302
+    const v8, 0x7f0802f6
 
     goto :goto_0
 
     :cond_0
-    const v8, 0x7f080301
+    const v8, 0x7f0802f5
 
     :goto_0
     if-eqz v3, :cond_1
@@ -332,7 +332,7 @@
 
     move-result-object v3
 
-    const v9, 0x7f1212b7
+    const v9, 0x7f12122a
 
     invoke-virtual {v3, v9}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
@@ -345,7 +345,7 @@
 
     move-result-object v3
 
-    const v9, 0x7f120c0b
+    const v9, 0x7f120bd4
 
     invoke-virtual {v3, v9}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
@@ -362,12 +362,12 @@
 
     if-eqz p0, :cond_2
 
-    const v4, 0x7f0802c3
+    const v4, 0x7f0802b7
 
     goto :goto_2
 
     :cond_2
-    const v4, 0x7f0802c2
+    const v4, 0x7f0802b6
 
     :goto_2
     if-eqz p0, :cond_3
@@ -376,7 +376,7 @@
 
     move-result-object p0
 
-    const v6, 0x7f1212ae
+    const v6, 0x7f121221
 
     invoke-virtual {p0, v6}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
@@ -389,7 +389,7 @@
 
     move-result-object p0
 
-    const v6, 0x7f1204fc
+    const v6, 0x7f1204d7
 
     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 e690325ff8..b85e081a49 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;->vI:Lcom/discord/app/g;
+    sget-object v0, Lcom/discord/app/g;->vJ: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;->vI:Lcom/discord/app/g;
+    sget-object v0, Lcom/discord/app/g;->vJ: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 f9cb11e3ec..d4b13da2ce 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;->zl: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
 
@@ -34,7 +34,7 @@
 
     sget-object v0, Lcom/discord/utilities/voice/VoiceViewUtils$WhenMappings;->$EnumSwitchMapping$0:[I
 
-    sget-object v1, Lcom/discord/rtcconnection/RtcConnection$Quality;->zm: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
 
@@ -46,7 +46,7 @@
 
     sget-object v0, Lcom/discord/utilities/voice/VoiceViewUtils$WhenMappings;->$EnumSwitchMapping$0:[I
 
-    sget-object v1, Lcom/discord/rtcconnection/RtcConnection$Quality;->zn:Lcom/discord/rtcconnection/RtcConnection$Quality;
+    sget-object v1, Lcom/discord/rtcconnection/RtcConnection$Quality;->zo: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;->zk: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
 
@@ -78,7 +78,7 @@
 
     sput-object v0, Lcom/discord/utilities/voice/VoiceViewUtils$WhenMappings;->$EnumSwitchMapping$1:[I
 
-    sget-object v1, Lcom/discord/rtcconnection/RtcConnection$Quality;->zl: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
 
@@ -88,7 +88,7 @@
 
     sget-object v0, Lcom/discord/utilities/voice/VoiceViewUtils$WhenMappings;->$EnumSwitchMapping$1:[I
 
-    sget-object v1, Lcom/discord/rtcconnection/RtcConnection$Quality;->zm: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
 
@@ -98,7 +98,7 @@
 
     sget-object v0, Lcom/discord/utilities/voice/VoiceViewUtils$WhenMappings;->$EnumSwitchMapping$1:[I
 
-    sget-object v1, Lcom/discord/rtcconnection/RtcConnection$Quality;->zn:Lcom/discord/rtcconnection/RtcConnection$Quality;
+    sget-object v1, Lcom/discord/rtcconnection/RtcConnection$Quality;->zo: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;->zk: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
 
diff --git a/com.discord/smali/com/discord/utilities/voice/VoiceViewUtils.smali b/com.discord/smali/com/discord/utilities/voice/VoiceViewUtils.smali
index 3d4a8ff6fd..57aec9379c 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;->zv:Lcom/discord/rtcconnection/RtcConnection$State$f;
+    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$f;->zw: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, 0x7f06011c
+    const v1, 0x7f06011b
 
-    const v2, 0x7f060127
+    const v2, 0x7f060126
 
     if-eqz v0, :cond_4
 
-    const p1, 0x7f060106
+    const p1, 0x7f060105
 
     if-nez p2, :cond_0
 
@@ -109,7 +109,7 @@
     return p1
 
     :cond_4
-    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$b;->zr:Lcom/discord/rtcconnection/RtcConnection$State$b;
+    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$b;->zs: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;->zs:Lcom/discord/rtcconnection/RtcConnection$State$c;
+    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$c;->zt: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;->zq:Lcom/discord/rtcconnection/RtcConnection$State$a;
+    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$a;->zr: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;->zw:Lcom/discord/rtcconnection/RtcConnection$State$g;
+    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$g;->zx: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;->zu:Lcom/discord/rtcconnection/RtcConnection$State$e;
+    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$e;->zv: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, 0x7f0402a2
+    const v0, 0x7f0402a1
 
     if-nez p2, :cond_8
 
-    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$h;->zx:Lcom/discord/rtcconnection/RtcConnection$State$h;
+    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$h;->zy: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, 0x7f0803d8
+    const v0, 0x7f0803ca
 
     if-nez p1, :cond_0
 
@@ -238,17 +238,17 @@
     return v0
 
     :cond_2
-    const p1, 0x7f0803d7
+    const p1, 0x7f0803c9
 
     return p1
 
     :cond_3
-    const p1, 0x7f0803d5
+    const p1, 0x7f0803c7
 
     return p1
 
     :cond_4
-    const p1, 0x7f0803d6
+    const p1, 0x7f0803c8
 
     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;->zs:Lcom/discord/rtcconnection/RtcConnection$State$c;
+    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$c;->zt: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, 0x7f12046e
+    const p1, 0x7f120449
 
     return p1
 
     :cond_0
-    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$e;->zu:Lcom/discord/rtcconnection/RtcConnection$State$e;
+    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$e;->zv: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, 0x7f120471
+    const p1, 0x7f12044c
 
     return p1
 
     :cond_1
-    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$b;->zr:Lcom/discord/rtcconnection/RtcConnection$State$b;
+    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$b;->zs: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, 0x7f12046c
+    const p1, 0x7f120447
 
     return p1
 
     :cond_2
-    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$a;->zq:Lcom/discord/rtcconnection/RtcConnection$State$a;
+    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$a;->zr: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, 0x7f12046b
+    const p1, 0x7f120446
 
     return p1
 
     :cond_3
-    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$g;->zw:Lcom/discord/rtcconnection/RtcConnection$State$g;
+    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$g;->zx: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, 0x7f120472
+    const p1, 0x7f12044d
 
     return p1
 
     :cond_4
-    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$f;->zv:Lcom/discord/rtcconnection/RtcConnection$State$f;
+    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$f;->zw: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, 0x7f120476
+    const p1, 0x7f120451
 
     return p1
 
     :cond_5
     instance-of v0, p1, Lcom/discord/rtcconnection/RtcConnection$State$d;
 
-    const v1, 0x7f12046f
+    const v1, 0x7f12044a
 
     if-nez v0, :cond_6
 
-    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$h;->zx:Lcom/discord/rtcconnection/RtcConnection$State$h;
+    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$h;->zy: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 da36ebdeb1..e37d535326 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 3fb0907fce..877565379f 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 1ab9587d1e..aea3a49fa2 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 eaf3289283..a6e2cc57e7 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 f8360a344e..4928e343e8 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 4e39729fdd..e17d6af59f 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 1dfa94915f..076251a7a8 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 0083af2d08..ed6a09ea3e 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 816654e4d7..875b9e865c 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 85d16c9930..113fa01f43 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 e1dcd0b3c2..1ffa308b8a 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 fc4f615673..7a8dc6ff93 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 c8c0b2b1c2..cb8bac4d38 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;->KA()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->Ky()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;->Jx()Lrx/internal/a/aj;
+    invoke-static {}, Lrx/internal/a/aj;->Jv()Lrx/internal/a/aj;
 
     move-result-object p3
 
@@ -198,7 +198,7 @@
 
     if-nez p1, :cond_0
 
-    invoke-static {}, Lrx/d/a;->Kv()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Kt()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;->FD()Lokhttp3/t;
+    invoke-virtual {v0}, Lokhttp3/t$a;->FB()Lokhttp3/t;
 
     move-result-object p2
 
@@ -308,7 +308,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lokhttp3/w$a;->FN()Lokhttp3/w;
+    invoke-virtual {p1}, Lokhttp3/w$a;->FL()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 e3f6304c8e..c974a29d5f 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 192a3b06a6..b2ef3ad163 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 = 0x7f080017
+.field public static final abc_ab_share_pack_mtrl_alpha:I = 0x7f080016
 
-.field public static final abc_action_bar_item_background_material:I = 0x7f080018
+.field public static final abc_action_bar_item_background_material:I = 0x7f080017
 
-.field public static final abc_btn_borderless_material:I = 0x7f080019
+.field public static final abc_btn_borderless_material:I = 0x7f080018
 
-.field public static final abc_btn_check_material:I = 0x7f08001a
+.field public static final abc_btn_check_material:I = 0x7f080019
 
-.field public static final abc_btn_check_to_on_mtrl_000:I = 0x7f08001b
+.field public static final abc_btn_check_to_on_mtrl_000:I = 0x7f08001a
 
-.field public static final abc_btn_check_to_on_mtrl_015:I = 0x7f08001c
+.field public static final abc_btn_check_to_on_mtrl_015:I = 0x7f08001b
 
-.field public static final abc_btn_colored_material:I = 0x7f08001d
+.field public static final abc_btn_colored_material:I = 0x7f08001c
 
-.field public static final abc_btn_default_mtrl_shape:I = 0x7f08001e
+.field public static final abc_btn_default_mtrl_shape:I = 0x7f08001d
 
-.field public static final abc_btn_radio_material:I = 0x7f08001f
+.field public static final abc_btn_radio_material:I = 0x7f08001e
 
-.field public static final abc_btn_radio_to_on_mtrl_000:I = 0x7f080020
+.field public static final abc_btn_radio_to_on_mtrl_000:I = 0x7f08001f
 
-.field public static final abc_btn_radio_to_on_mtrl_015:I = 0x7f080021
+.field public static final abc_btn_radio_to_on_mtrl_015:I = 0x7f080020
 
-.field public static final abc_btn_switch_to_on_mtrl_00001:I = 0x7f080022
+.field public static final abc_btn_switch_to_on_mtrl_00001:I = 0x7f080021
 
-.field public static final abc_btn_switch_to_on_mtrl_00012:I = 0x7f080023
+.field public static final abc_btn_switch_to_on_mtrl_00012:I = 0x7f080022
 
-.field public static final abc_cab_background_internal_bg:I = 0x7f080024
+.field public static final abc_cab_background_internal_bg:I = 0x7f080023
 
-.field public static final abc_cab_background_top_material:I = 0x7f080025
+.field public static final abc_cab_background_top_material:I = 0x7f080024
 
-.field public static final abc_cab_background_top_mtrl_alpha:I = 0x7f080026
+.field public static final abc_cab_background_top_mtrl_alpha:I = 0x7f080025
 
-.field public static final abc_control_background_material:I = 0x7f080027
+.field public static final abc_control_background_material:I = 0x7f080026
 
-.field public static final abc_dialog_material_background:I = 0x7f080028
+.field public static final abc_dialog_material_background:I = 0x7f080027
 
-.field public static final abc_edit_text_material:I = 0x7f080029
+.field public static final abc_edit_text_material:I = 0x7f080028
 
-.field public static final abc_ic_ab_back_material:I = 0x7f08002a
+.field public static final abc_ic_ab_back_material:I = 0x7f080029
 
-.field public static final abc_ic_arrow_drop_right_black_24dp:I = 0x7f08002b
+.field public static final abc_ic_arrow_drop_right_black_24dp:I = 0x7f08002a
 
-.field public static final abc_ic_clear_material:I = 0x7f08002c
+.field public static final abc_ic_clear_material:I = 0x7f08002b
 
-.field public static final abc_ic_commit_search_api_mtrl_alpha:I = 0x7f08002d
+.field public static final abc_ic_commit_search_api_mtrl_alpha:I = 0x7f08002c
 
-.field public static final abc_ic_go_search_api_material:I = 0x7f08002e
+.field public static final abc_ic_go_search_api_material:I = 0x7f08002d
 
-.field public static final abc_ic_menu_copy_mtrl_am_alpha:I = 0x7f08002f
+.field public static final abc_ic_menu_copy_mtrl_am_alpha:I = 0x7f08002e
 
-.field public static final abc_ic_menu_cut_mtrl_alpha:I = 0x7f080030
+.field public static final abc_ic_menu_cut_mtrl_alpha:I = 0x7f08002f
 
-.field public static final abc_ic_menu_overflow_material:I = 0x7f080031
+.field public static final abc_ic_menu_overflow_material:I = 0x7f080030
 
-.field public static final abc_ic_menu_paste_mtrl_am_alpha:I = 0x7f080032
+.field public static final abc_ic_menu_paste_mtrl_am_alpha:I = 0x7f080031
 
-.field public static final abc_ic_menu_selectall_mtrl_alpha:I = 0x7f080033
+.field public static final abc_ic_menu_selectall_mtrl_alpha:I = 0x7f080032
 
-.field public static final abc_ic_menu_share_mtrl_alpha:I = 0x7f080034
+.field public static final abc_ic_menu_share_mtrl_alpha:I = 0x7f080033
 
-.field public static final abc_ic_search_api_material:I = 0x7f080035
+.field public static final abc_ic_search_api_material:I = 0x7f080034
 
-.field public static final abc_ic_star_black_16dp:I = 0x7f080036
+.field public static final abc_ic_star_black_16dp:I = 0x7f080035
 
-.field public static final abc_ic_star_black_36dp:I = 0x7f080037
+.field public static final abc_ic_star_black_36dp:I = 0x7f080036
 
-.field public static final abc_ic_star_black_48dp:I = 0x7f080038
+.field public static final abc_ic_star_black_48dp:I = 0x7f080037
 
-.field public static final abc_ic_star_half_black_16dp:I = 0x7f080039
+.field public static final abc_ic_star_half_black_16dp:I = 0x7f080038
 
-.field public static final abc_ic_star_half_black_36dp:I = 0x7f08003a
+.field public static final abc_ic_star_half_black_36dp:I = 0x7f080039
 
-.field public static final abc_ic_star_half_black_48dp:I = 0x7f08003b
+.field public static final abc_ic_star_half_black_48dp:I = 0x7f08003a
 
-.field public static final abc_ic_voice_search_api_material:I = 0x7f08003c
+.field public static final abc_ic_voice_search_api_material:I = 0x7f08003b
 
-.field public static final abc_item_background_holo_dark:I = 0x7f08003d
+.field public static final abc_item_background_holo_dark:I = 0x7f08003c
 
-.field public static final abc_item_background_holo_light:I = 0x7f08003e
+.field public static final abc_item_background_holo_light:I = 0x7f08003d
 
-.field public static final abc_list_divider_material:I = 0x7f08003f
+.field public static final abc_list_divider_material:I = 0x7f08003e
 
-.field public static final abc_list_divider_mtrl_alpha:I = 0x7f080040
+.field public static final abc_list_divider_mtrl_alpha:I = 0x7f08003f
 
-.field public static final abc_list_focused_holo:I = 0x7f080041
+.field public static final abc_list_focused_holo:I = 0x7f080040
 
-.field public static final abc_list_longpressed_holo:I = 0x7f080042
+.field public static final abc_list_longpressed_holo:I = 0x7f080041
 
-.field public static final abc_list_pressed_holo_dark:I = 0x7f080043
+.field public static final abc_list_pressed_holo_dark:I = 0x7f080042
 
-.field public static final abc_list_pressed_holo_light:I = 0x7f080044
+.field public static final abc_list_pressed_holo_light:I = 0x7f080043
 
-.field public static final abc_list_selector_background_transition_holo_dark:I = 0x7f080045
+.field public static final abc_list_selector_background_transition_holo_dark:I = 0x7f080044
 
-.field public static final abc_list_selector_background_transition_holo_light:I = 0x7f080046
+.field public static final abc_list_selector_background_transition_holo_light:I = 0x7f080045
 
-.field public static final abc_list_selector_disabled_holo_dark:I = 0x7f080047
+.field public static final abc_list_selector_disabled_holo_dark:I = 0x7f080046
 
-.field public static final abc_list_selector_disabled_holo_light:I = 0x7f080048
+.field public static final abc_list_selector_disabled_holo_light:I = 0x7f080047
 
-.field public static final abc_list_selector_holo_dark:I = 0x7f080049
+.field public static final abc_list_selector_holo_dark:I = 0x7f080048
 
-.field public static final abc_list_selector_holo_light:I = 0x7f08004a
+.field public static final abc_list_selector_holo_light:I = 0x7f080049
 
-.field public static final abc_menu_hardkey_panel_mtrl_mult:I = 0x7f08004b
+.field public static final abc_menu_hardkey_panel_mtrl_mult:I = 0x7f08004a
 
-.field public static final abc_popup_background_mtrl_mult:I = 0x7f08004c
+.field public static final abc_popup_background_mtrl_mult:I = 0x7f08004b
 
-.field public static final abc_ratingbar_indicator_material:I = 0x7f08004d
+.field public static final abc_ratingbar_indicator_material:I = 0x7f08004c
 
-.field public static final abc_ratingbar_material:I = 0x7f08004e
+.field public static final abc_ratingbar_material:I = 0x7f08004d
 
-.field public static final abc_ratingbar_small_material:I = 0x7f08004f
+.field public static final abc_ratingbar_small_material:I = 0x7f08004e
 
-.field public static final abc_scrubber_control_off_mtrl_alpha:I = 0x7f080050
+.field public static final abc_scrubber_control_off_mtrl_alpha:I = 0x7f08004f
 
-.field public static final abc_scrubber_control_to_pressed_mtrl_000:I = 0x7f080051
+.field public static final abc_scrubber_control_to_pressed_mtrl_000:I = 0x7f080050
 
-.field public static final abc_scrubber_control_to_pressed_mtrl_005:I = 0x7f080052
+.field public static final abc_scrubber_control_to_pressed_mtrl_005:I = 0x7f080051
 
-.field public static final abc_scrubber_primary_mtrl_alpha:I = 0x7f080053
+.field public static final abc_scrubber_primary_mtrl_alpha:I = 0x7f080052
 
-.field public static final abc_scrubber_track_mtrl_alpha:I = 0x7f080054
+.field public static final abc_scrubber_track_mtrl_alpha:I = 0x7f080053
 
-.field public static final abc_seekbar_thumb_material:I = 0x7f080055
+.field public static final abc_seekbar_thumb_material:I = 0x7f080054
 
-.field public static final abc_seekbar_tick_mark_material:I = 0x7f080056
+.field public static final abc_seekbar_tick_mark_material:I = 0x7f080055
 
-.field public static final abc_seekbar_track_material:I = 0x7f080057
+.field public static final abc_seekbar_track_material:I = 0x7f080056
 
-.field public static final abc_spinner_mtrl_am_alpha:I = 0x7f080058
+.field public static final abc_spinner_mtrl_am_alpha:I = 0x7f080057
 
-.field public static final abc_spinner_textfield_background_material:I = 0x7f080059
+.field public static final abc_spinner_textfield_background_material:I = 0x7f080058
 
-.field public static final abc_switch_thumb_material:I = 0x7f08005a
+.field public static final abc_switch_thumb_material:I = 0x7f080059
 
-.field public static final abc_switch_track_mtrl_alpha:I = 0x7f08005b
+.field public static final abc_switch_track_mtrl_alpha:I = 0x7f08005a
 
-.field public static final abc_tab_indicator_material:I = 0x7f08005c
+.field public static final abc_tab_indicator_material:I = 0x7f08005b
 
-.field public static final abc_tab_indicator_mtrl_alpha:I = 0x7f08005d
+.field public static final abc_tab_indicator_mtrl_alpha:I = 0x7f08005c
 
-.field public static final abc_text_cursor_material:I = 0x7f08005e
+.field public static final abc_text_cursor_material:I = 0x7f08005d
 
-.field public static final abc_text_select_handle_left_mtrl_dark:I = 0x7f08005f
+.field public static final abc_text_select_handle_left_mtrl_dark:I = 0x7f08005e
 
-.field public static final abc_text_select_handle_left_mtrl_light:I = 0x7f080060
+.field public static final abc_text_select_handle_left_mtrl_light:I = 0x7f08005f
 
-.field public static final abc_text_select_handle_middle_mtrl_dark:I = 0x7f080061
+.field public static final abc_text_select_handle_middle_mtrl_dark:I = 0x7f080060
 
-.field public static final abc_text_select_handle_middle_mtrl_light:I = 0x7f080062
+.field public static final abc_text_select_handle_middle_mtrl_light:I = 0x7f080061
 
-.field public static final abc_text_select_handle_right_mtrl_dark:I = 0x7f080063
+.field public static final abc_text_select_handle_right_mtrl_dark:I = 0x7f080062
 
-.field public static final abc_text_select_handle_right_mtrl_light:I = 0x7f080064
+.field public static final abc_text_select_handle_right_mtrl_light:I = 0x7f080063
 
-.field public static final abc_textfield_activated_mtrl_alpha:I = 0x7f080065
+.field public static final abc_textfield_activated_mtrl_alpha:I = 0x7f080064
 
-.field public static final abc_textfield_default_mtrl_alpha:I = 0x7f080066
+.field public static final abc_textfield_default_mtrl_alpha:I = 0x7f080065
 
-.field public static final abc_textfield_search_activated_mtrl_alpha:I = 0x7f080067
+.field public static final abc_textfield_search_activated_mtrl_alpha:I = 0x7f080066
 
-.field public static final abc_textfield_search_default_mtrl_alpha:I = 0x7f080068
+.field public static final abc_textfield_search_default_mtrl_alpha:I = 0x7f080067
 
-.field public static final abc_textfield_search_material:I = 0x7f080069
+.field public static final abc_textfield_search_material:I = 0x7f080068
 
-.field public static final abc_vector_test:I = 0x7f08006a
+.field public static final abc_vector_test:I = 0x7f080069
 
-.field public static final avd_hide_password:I = 0x7f08008a
+.field public static final avd_hide_password:I = 0x7f080089
 
-.field public static final avd_show_password:I = 0x7f08008b
+.field public static final avd_show_password:I = 0x7f08008a
 
-.field public static final common_full_open_on_phone:I = 0x7f0800a2
+.field public static final common_full_open_on_phone:I = 0x7f0800a1
 
-.field public static final common_google_signin_btn_icon_dark:I = 0x7f0800a3
+.field public static final common_google_signin_btn_icon_dark:I = 0x7f0800a2
 
-.field public static final common_google_signin_btn_icon_dark_focused:I = 0x7f0800a4
+.field public static final common_google_signin_btn_icon_dark_focused:I = 0x7f0800a3
 
-.field public static final common_google_signin_btn_icon_dark_normal:I = 0x7f0800a5
+.field public static final common_google_signin_btn_icon_dark_normal:I = 0x7f0800a4
 
-.field public static final common_google_signin_btn_icon_dark_normal_background:I = 0x7f0800a6
+.field public static final common_google_signin_btn_icon_dark_normal_background:I = 0x7f0800a5
 
-.field public static final common_google_signin_btn_icon_disabled:I = 0x7f0800a7
+.field public static final common_google_signin_btn_icon_disabled:I = 0x7f0800a6
 
-.field public static final common_google_signin_btn_icon_light:I = 0x7f0800a8
+.field public static final common_google_signin_btn_icon_light:I = 0x7f0800a7
 
-.field public static final common_google_signin_btn_icon_light_focused:I = 0x7f0800a9
+.field public static final common_google_signin_btn_icon_light_focused:I = 0x7f0800a8
 
-.field public static final common_google_signin_btn_icon_light_normal:I = 0x7f0800aa
+.field public static final common_google_signin_btn_icon_light_normal:I = 0x7f0800a9
 
-.field public static final common_google_signin_btn_icon_light_normal_background:I = 0x7f0800ab
+.field public static final common_google_signin_btn_icon_light_normal_background:I = 0x7f0800aa
 
-.field public static final common_google_signin_btn_text_dark:I = 0x7f0800ac
+.field public static final common_google_signin_btn_text_dark:I = 0x7f0800ab
 
-.field public static final common_google_signin_btn_text_dark_focused:I = 0x7f0800ad
+.field public static final common_google_signin_btn_text_dark_focused:I = 0x7f0800ac
 
-.field public static final common_google_signin_btn_text_dark_normal:I = 0x7f0800ae
+.field public static final common_google_signin_btn_text_dark_normal:I = 0x7f0800ad
 
-.field public static final common_google_signin_btn_text_dark_normal_background:I = 0x7f0800af
+.field public static final common_google_signin_btn_text_dark_normal_background:I = 0x7f0800ae
 
-.field public static final common_google_signin_btn_text_disabled:I = 0x7f0800b0
+.field public static final common_google_signin_btn_text_disabled:I = 0x7f0800af
 
-.field public static final common_google_signin_btn_text_light:I = 0x7f0800b1
+.field public static final common_google_signin_btn_text_light:I = 0x7f0800b0
 
-.field public static final common_google_signin_btn_text_light_focused:I = 0x7f0800b2
+.field public static final common_google_signin_btn_text_light_focused:I = 0x7f0800b1
 
-.field public static final common_google_signin_btn_text_light_normal:I = 0x7f0800b3
+.field public static final common_google_signin_btn_text_light_normal:I = 0x7f0800b2
 
-.field public static final common_google_signin_btn_text_light_normal_background:I = 0x7f0800b4
+.field public static final common_google_signin_btn_text_light_normal_background:I = 0x7f0800b3
 
-.field public static final design_bottom_navigation_item_background:I = 0x7f0800b5
+.field public static final design_bottom_navigation_item_background:I = 0x7f0800b4
 
-.field public static final design_fab_background:I = 0x7f0800b6
+.field public static final design_fab_background:I = 0x7f0800b5
 
-.field public static final design_ic_visibility:I = 0x7f0800b7
+.field public static final design_ic_visibility:I = 0x7f0800b6
 
-.field public static final design_ic_visibility_off:I = 0x7f0800b8
+.field public static final design_ic_visibility_off:I = 0x7f0800b7
 
-.field public static final design_password_eye:I = 0x7f0800b9
+.field public static final design_password_eye:I = 0x7f0800b8
 
-.field public static final design_snackbar_background:I = 0x7f0800ba
+.field public static final design_snackbar_background:I = 0x7f0800b9
 
-.field public static final drawable_chip_background:I = 0x7f080105
+.field public static final drawable_chip_background:I = 0x7f080101
 
-.field public static final drawable_chip_circle:I = 0x7f080106
+.field public static final drawable_chip_circle:I = 0x7f080102
 
-.field public static final drawable_chip_delete:I = 0x7f080107
+.field public static final drawable_chip_delete:I = 0x7f080103
 
-.field public static final googleg_disabled_color_18:I = 0x7f0801bb
+.field public static final googleg_disabled_color_18:I = 0x7f0801b0
 
-.field public static final googleg_standard_color_18:I = 0x7f0801bc
+.field public static final googleg_standard_color_18:I = 0x7f0801b1
 
-.field public static final ic_mtrl_chip_checked_black:I = 0x7f080308
+.field public static final ic_mtrl_chip_checked_black:I = 0x7f0802fc
 
-.field public static final ic_mtrl_chip_checked_circle:I = 0x7f080309
+.field public static final ic_mtrl_chip_checked_circle:I = 0x7f0802fd
 
-.field public static final ic_mtrl_chip_close_circle:I = 0x7f08030a
+.field public static final ic_mtrl_chip_close_circle:I = 0x7f0802fe
 
-.field public static final mtrl_snackbar_background:I = 0x7f08046f
+.field public static final mtrl_snackbar_background:I = 0x7f080460
 
-.field public static final mtrl_tabs_default_indicator:I = 0x7f080470
+.field public static final mtrl_tabs_default_indicator:I = 0x7f080461
 
-.field public static final navigation_empty_icon:I = 0x7f080471
+.field public static final navigation_empty_icon:I = 0x7f080462
 
-.field public static final notification_action_background:I = 0x7f080472
+.field public static final notification_action_background:I = 0x7f080463
 
-.field public static final notification_bg:I = 0x7f080473
+.field public static final notification_bg:I = 0x7f080464
 
-.field public static final notification_bg_low:I = 0x7f080474
+.field public static final notification_bg_low:I = 0x7f080465
 
-.field public static final notification_bg_low_normal:I = 0x7f080475
+.field public static final notification_bg_low_normal:I = 0x7f080466
 
-.field public static final notification_bg_low_pressed:I = 0x7f080476
+.field public static final notification_bg_low_pressed:I = 0x7f080467
 
-.field public static final notification_bg_normal:I = 0x7f080477
+.field public static final notification_bg_normal:I = 0x7f080468
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080478
+.field public static final notification_bg_normal_pressed:I = 0x7f080469
 
-.field public static final notification_icon_background:I = 0x7f080479
+.field public static final notification_icon_background:I = 0x7f08046a
 
-.field public static final notification_template_icon_bg:I = 0x7f08047a
+.field public static final notification_template_icon_bg:I = 0x7f08046b
 
-.field public static final notification_template_icon_low_bg:I = 0x7f08047b
+.field public static final notification_template_icon_low_bg:I = 0x7f08046c
 
-.field public static final notification_tile_bg:I = 0x7f08047c
+.field public static final notification_tile_bg:I = 0x7f08046d
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08047d
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08046e
 
-.field public static final tooltip_frame_dark:I = 0x7f080485
+.field public static final tooltip_frame_dark:I = 0x7f080476
 
-.field public static final tooltip_frame_light:I = 0x7f080486
+.field public static final tooltip_frame_light:I = 0x7f080477
 
 
 # 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 aefaaf0973..85dad554b5 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 = 0x7f0a0080
+.field public static final async:I = 0x7f0a007f
 
-.field public static final auto:I = 0x7f0a00b9
+.field public static final auto:I = 0x7f0a00b8
 
-.field public static final baseline:I = 0x7f0a00c9
+.field public static final baseline:I = 0x7f0a00c8
 
-.field public static final blocking:I = 0x7f0a00ce
+.field public static final blocking:I = 0x7f0a00cd
 
 .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 = 0x7f0a0233
+.field public static final container:I = 0x7f0a0232
 
-.field public static final content:I = 0x7f0a0234
+.field public static final content:I = 0x7f0a0233
 
-.field public static final contentPanel:I = 0x7f0a0235
+.field public static final contentPanel:I = 0x7f0a0234
 
-.field public static final coordinator:I = 0x7f0a023a
+.field public static final coordinator:I = 0x7f0a0239
 
-.field public static final custom:I = 0x7f0a0252
+.field public static final custom:I = 0x7f0a0251
 
-.field public static final customPanel:I = 0x7f0a0253
+.field public static final customPanel:I = 0x7f0a0252
 
-.field public static final dark:I = 0x7f0a0254
+.field public static final dark:I = 0x7f0a0253
 
-.field public static final decor_content_parent:I = 0x7f0a0257
+.field public static final decor_content_parent:I = 0x7f0a0256
 
-.field public static final default_activity_button:I = 0x7f0a0258
+.field public static final default_activity_button:I = 0x7f0a0257
 
-.field public static final design_bottom_sheet:I = 0x7f0a0259
+.field public static final design_bottom_sheet:I = 0x7f0a0258
 
-.field public static final design_menu_item_action_area:I = 0x7f0a025a
+.field public static final design_menu_item_action_area:I = 0x7f0a0259
 
-.field public static final design_menu_item_action_area_stub:I = 0x7f0a025b
+.field public static final design_menu_item_action_area_stub:I = 0x7f0a025a
 
-.field public static final design_menu_item_text:I = 0x7f0a025c
+.field public static final design_menu_item_text:I = 0x7f0a025b
 
-.field public static final design_navigation_view:I = 0x7f0a025d
+.field public static final design_navigation_view:I = 0x7f0a025c
 
-.field public static final dialog_button:I = 0x7f0a025e
+.field public static final dialog_button:I = 0x7f0a025d
 
-.field public static final edit_query:I = 0x7f0a02ae
+.field public static final edit_query:I = 0x7f0a02ad
 
-.field public static final end:I = 0x7f0a02c9
+.field public static final end:I = 0x7f0a02c8
 
-.field public static final expand_activities_button:I = 0x7f0a02ce
+.field public static final expand_activities_button:I = 0x7f0a02cd
 
-.field public static final expanded_menu:I = 0x7f0a02cf
+.field public static final expanded_menu:I = 0x7f0a02ce
 
-.field public static final fill:I = 0x7f0a02e4
+.field public static final fill:I = 0x7f0a02e3
 
-.field public static final filled:I = 0x7f0a02e7
+.field public static final filled:I = 0x7f0a02e6
 
-.field public static final fitBottomStart:I = 0x7f0a02e8
+.field public static final fitBottomStart:I = 0x7f0a02e7
 
-.field public static final fitCenter:I = 0x7f0a02e9
+.field public static final fitCenter:I = 0x7f0a02e8
 
-.field public static final fitEnd:I = 0x7f0a02ea
+.field public static final fitEnd:I = 0x7f0a02e9
 
-.field public static final fitStart:I = 0x7f0a02eb
+.field public static final fitStart:I = 0x7f0a02ea
 
-.field public static final fitXY:I = 0x7f0a02ec
+.field public static final fitXY:I = 0x7f0a02eb
 
-.field public static final fixed:I = 0x7f0a02ed
+.field public static final fixed:I = 0x7f0a02ec
 
-.field public static final flex_end:I = 0x7f0a02ee
+.field public static final flex_end:I = 0x7f0a02ed
 
-.field public static final flex_start:I = 0x7f0a02ef
+.field public static final flex_start:I = 0x7f0a02ee
 
-.field public static final focusCrop:I = 0x7f0a02f0
+.field public static final focusCrop:I = 0x7f0a02ef
 
-.field public static final forever:I = 0x7f0a02f2
+.field public static final forever:I = 0x7f0a02f1
 
-.field public static final ghost_view:I = 0x7f0a0316
+.field public static final ghost_view:I = 0x7f0a0315
 
-.field public static final group_divider:I = 0x7f0a032d
+.field public static final group_divider:I = 0x7f0a0328
 
-.field public static final home:I = 0x7f0a0394
+.field public static final home:I = 0x7f0a038f
 
-.field public static final icon:I = 0x7f0a0396
+.field public static final icon:I = 0x7f0a0391
 
-.field public static final icon_group:I = 0x7f0a0397
+.field public static final icon_group:I = 0x7f0a0392
 
-.field public static final icon_only:I = 0x7f0a0398
+.field public static final icon_only:I = 0x7f0a0393
 
-.field public static final image:I = 0x7f0a039a
+.field public static final image:I = 0x7f0a0395
 
-.field public static final info:I = 0x7f0a03ac
+.field public static final info:I = 0x7f0a03a7
 
-.field public static final italic:I = 0x7f0a03d9
+.field public static final italic:I = 0x7f0a03d4
 
-.field public static final item_touch_helper_previous_elevation:I = 0x7f0a040d
+.field public static final item_touch_helper_previous_elevation:I = 0x7f0a0408
 
-.field public static final labeled:I = 0x7f0a0414
+.field public static final labeled:I = 0x7f0a040f
 
-.field public static final largeLabel:I = 0x7f0a0415
+.field public static final largeLabel:I = 0x7f0a0410
 
-.field public static final left:I = 0x7f0a041b
+.field public static final left:I = 0x7f0a0416
 
-.field public static final light:I = 0x7f0a041c
+.field public static final light:I = 0x7f0a0417
 
-.field public static final line1:I = 0x7f0a041d
+.field public static final line1:I = 0x7f0a0418
 
-.field public static final line3:I = 0x7f0a041e
+.field public static final line3:I = 0x7f0a0419
 
-.field public static final listMode:I = 0x7f0a0420
+.field public static final listMode:I = 0x7f0a041b
 
-.field public static final list_item:I = 0x7f0a0421
+.field public static final list_item:I = 0x7f0a041c
 
-.field public static final masked:I = 0x7f0a043f
+.field public static final masked:I = 0x7f0a043a
 
-.field public static final message:I = 0x7f0a0485
+.field public static final message:I = 0x7f0a0478
 
-.field public static final mini:I = 0x7f0a048a
+.field public static final mini:I = 0x7f0a047d
 
-.field public static final mtrl_child_content_container:I = 0x7f0a048b
+.field public static final mtrl_child_content_container:I = 0x7f0a047e
 
-.field public static final mtrl_internal_children_alpha_tag:I = 0x7f0a048c
+.field public static final mtrl_internal_children_alpha_tag:I = 0x7f0a047f
 
-.field public static final multiply:I = 0x7f0a048d
+.field public static final multiply:I = 0x7f0a0480
 
-.field public static final navigation_header_container:I = 0x7f0a048f
+.field public static final navigation_header_container:I = 0x7f0a0482
 
-.field public static final none:I = 0x7f0a04a2
+.field public static final none:I = 0x7f0a0495
 
-.field public static final normal:I = 0x7f0a04a3
+.field public static final normal:I = 0x7f0a0496
 
-.field public static final notification_background:I = 0x7f0a04ad
+.field public static final notification_background:I = 0x7f0a04a0
 
-.field public static final notification_main_column:I = 0x7f0a04ae
+.field public static final notification_main_column:I = 0x7f0a04a1
 
-.field public static final notification_main_column_container:I = 0x7f0a04af
+.field public static final notification_main_column_container:I = 0x7f0a04a2
 
-.field public static final nowrap:I = 0x7f0a04b0
+.field public static final nowrap:I = 0x7f0a04a3
 
-.field public static final outline:I = 0x7f0a04d1
+.field public static final outline:I = 0x7f0a04c4
 
-.field public static final parallax:I = 0x7f0a04e0
+.field public static final parallax:I = 0x7f0a04d3
 
-.field public static final parentPanel:I = 0x7f0a04e2
+.field public static final parentPanel:I = 0x7f0a04d5
 
-.field public static final parent_matrix:I = 0x7f0a04e3
+.field public static final parent_matrix:I = 0x7f0a04d6
 
-.field public static final pin:I = 0x7f0a0520
+.field public static final pin:I = 0x7f0a0512
 
-.field public static final progress_circular:I = 0x7f0a055c
+.field public static final progress_circular:I = 0x7f0a054d
 
-.field public static final progress_horizontal:I = 0x7f0a055e
+.field public static final progress_horizontal:I = 0x7f0a054f
 
-.field public static final radio:I = 0x7f0a0569
+.field public static final radio:I = 0x7f0a055a
 
-.field public static final right:I = 0x7f0a058c
+.field public static final right:I = 0x7f0a0573
 
-.field public static final right_icon:I = 0x7f0a058d
+.field public static final right_icon:I = 0x7f0a0574
 
-.field public static final right_side:I = 0x7f0a058e
+.field public static final right_side:I = 0x7f0a0575
 
-.field public static final row:I = 0x7f0a05b6
+.field public static final row:I = 0x7f0a059d
 
-.field public static final row_reverse:I = 0x7f0a05b7
+.field public static final row_reverse:I = 0x7f0a059e
 
-.field public static final save_image_matrix:I = 0x7f0a05b8
+.field public static final save_image_matrix:I = 0x7f0a059f
 
-.field public static final save_non_transition_alpha:I = 0x7f0a05b9
+.field public static final save_non_transition_alpha:I = 0x7f0a05a0
 
-.field public static final save_scale_type:I = 0x7f0a05ba
+.field public static final save_scale_type:I = 0x7f0a05a1
 
-.field public static final screen:I = 0x7f0a05bc
+.field public static final screen:I = 0x7f0a05a3
 
-.field public static final scrollIndicatorDown:I = 0x7f0a05be
+.field public static final scrollIndicatorDown:I = 0x7f0a05a5
 
-.field public static final scrollIndicatorUp:I = 0x7f0a05bf
+.field public static final scrollIndicatorUp:I = 0x7f0a05a6
 
-.field public static final scrollView:I = 0x7f0a05c0
+.field public static final scrollView:I = 0x7f0a05a7
 
-.field public static final scrollable:I = 0x7f0a05c2
+.field public static final scrollable:I = 0x7f0a05a9
 
-.field public static final search_badge:I = 0x7f0a05c4
+.field public static final search_badge:I = 0x7f0a05ab
 
-.field public static final search_bar:I = 0x7f0a05c5
+.field public static final search_bar:I = 0x7f0a05ac
 
-.field public static final search_button:I = 0x7f0a05c6
+.field public static final search_button:I = 0x7f0a05ad
 
-.field public static final search_close_btn:I = 0x7f0a05c8
+.field public static final search_close_btn:I = 0x7f0a05af
 
-.field public static final search_edit_frame:I = 0x7f0a05c9
+.field public static final search_edit_frame:I = 0x7f0a05b0
 
-.field public static final search_go_btn:I = 0x7f0a05cc
+.field public static final search_go_btn:I = 0x7f0a05b3
 
-.field public static final search_mag_icon:I = 0x7f0a05ce
+.field public static final search_mag_icon:I = 0x7f0a05b5
 
-.field public static final search_plate:I = 0x7f0a05cf
+.field public static final search_plate:I = 0x7f0a05b6
 
-.field public static final search_src_text:I = 0x7f0a05d2
+.field public static final search_src_text:I = 0x7f0a05b9
 
-.field public static final search_voice_btn:I = 0x7f0a05de
+.field public static final search_voice_btn:I = 0x7f0a05c5
 
-.field public static final select_dialog_listview:I = 0x7f0a05df
+.field public static final select_dialog_listview:I = 0x7f0a05c6
 
-.field public static final selected:I = 0x7f0a05e0
+.field public static final selected:I = 0x7f0a05c7
 
-.field public static final shortcut:I = 0x7f0a0719
+.field public static final shortcut:I = 0x7f0a0700
 
-.field public static final smallLabel:I = 0x7f0a071d
+.field public static final smallLabel:I = 0x7f0a0704
 
-.field public static final snackbar_action:I = 0x7f0a071e
+.field public static final snackbar_action:I = 0x7f0a0705
 
-.field public static final snackbar_text:I = 0x7f0a071f
+.field public static final snackbar_text:I = 0x7f0a0706
 
-.field public static final space_around:I = 0x7f0a0723
+.field public static final space_around:I = 0x7f0a070a
 
-.field public static final space_between:I = 0x7f0a0724
+.field public static final space_between:I = 0x7f0a070b
 
-.field public static final spacer:I = 0x7f0a0725
+.field public static final spacer:I = 0x7f0a070c
 
-.field public static final split_action_bar:I = 0x7f0a072c
+.field public static final split_action_bar:I = 0x7f0a070d
 
-.field public static final src_atop:I = 0x7f0a072f
+.field public static final src_atop:I = 0x7f0a0710
 
-.field public static final src_in:I = 0x7f0a0730
+.field public static final src_in:I = 0x7f0a0711
 
-.field public static final src_over:I = 0x7f0a0731
+.field public static final src_over:I = 0x7f0a0712
 
-.field public static final standard:I = 0x7f0a0733
+.field public static final standard:I = 0x7f0a0714
 
-.field public static final start:I = 0x7f0a0734
+.field public static final start:I = 0x7f0a0715
 
-.field public static final stretch:I = 0x7f0a0754
+.field public static final stretch:I = 0x7f0a072c
 
-.field public static final submenuarrow:I = 0x7f0a0755
+.field public static final submenuarrow:I = 0x7f0a072d
 
-.field public static final submit_area:I = 0x7f0a0756
+.field public static final submit_area:I = 0x7f0a072e
 
-.field public static final tabMode:I = 0x7f0a0761
+.field public static final tabMode:I = 0x7f0a0739
 
-.field public static final tag_accessibility_actions:I = 0x7f0a0762
+.field public static final tag_accessibility_actions:I = 0x7f0a073a
 
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0763
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a073b
 
-.field public static final tag_accessibility_heading:I = 0x7f0a0764
+.field public static final tag_accessibility_heading:I = 0x7f0a073c
 
-.field public static final tag_accessibility_pane_title:I = 0x7f0a0765
+.field public static final tag_accessibility_pane_title:I = 0x7f0a073d
 
-.field public static final tag_screen_reader_focusable:I = 0x7f0a0766
+.field public static final tag_screen_reader_focusable:I = 0x7f0a073e
 
-.field public static final tag_transition_group:I = 0x7f0a0767
+.field public static final tag_transition_group:I = 0x7f0a073f
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0768
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0740
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0769
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0741
 
-.field public static final text:I = 0x7f0a076f
+.field public static final text:I = 0x7f0a0747
 
-.field public static final text2:I = 0x7f0a0770
+.field public static final text2:I = 0x7f0a0748
 
-.field public static final textSpacerNoButtons:I = 0x7f0a0771
+.field public static final textSpacerNoButtons:I = 0x7f0a0749
 
-.field public static final textSpacerNoTitle:I = 0x7f0a0772
+.field public static final textSpacerNoTitle:I = 0x7f0a074a
 
-.field public static final text_input_password_toggle:I = 0x7f0a0775
+.field public static final text_input_password_toggle:I = 0x7f0a074d
 
-.field public static final textinput_counter:I = 0x7f0a0778
+.field public static final textinput_counter:I = 0x7f0a0750
 
-.field public static final textinput_error:I = 0x7f0a0779
+.field public static final textinput_error:I = 0x7f0a0751
 
-.field public static final textinput_helper_text:I = 0x7f0a077a
+.field public static final textinput_helper_text:I = 0x7f0a0752
 
-.field public static final time:I = 0x7f0a077d
+.field public static final time:I = 0x7f0a0755
 
-.field public static final title:I = 0x7f0a077e
+.field public static final title:I = 0x7f0a0756
 
-.field public static final titleDividerNoCustom:I = 0x7f0a077f
+.field public static final titleDividerNoCustom:I = 0x7f0a0757
 
-.field public static final title_template:I = 0x7f0a0780
+.field public static final title_template:I = 0x7f0a0758
 
-.field public static final top:I = 0x7f0a0785
+.field public static final top:I = 0x7f0a075d
 
-.field public static final topPanel:I = 0x7f0a0786
+.field public static final topPanel:I = 0x7f0a075e
 
-.field public static final touch_outside:I = 0x7f0a0788
+.field public static final touch_outside:I = 0x7f0a0760
 
-.field public static final transition_current_scene:I = 0x7f0a0789
+.field public static final transition_current_scene:I = 0x7f0a0761
 
-.field public static final transition_layout_save:I = 0x7f0a078a
+.field public static final transition_layout_save:I = 0x7f0a0762
 
-.field public static final transition_position:I = 0x7f0a078b
+.field public static final transition_position:I = 0x7f0a0763
 
-.field public static final transition_scene_layoutid_cache:I = 0x7f0a078c
+.field public static final transition_scene_layoutid_cache:I = 0x7f0a0764
 
-.field public static final transition_transform:I = 0x7f0a078d
+.field public static final transition_transform:I = 0x7f0a0765
 
-.field public static final uniform:I = 0x7f0a0799
+.field public static final uniform:I = 0x7f0a0771
 
-.field public static final unlabeled:I = 0x7f0a079a
+.field public static final unlabeled:I = 0x7f0a0772
 
-.field public static final up:I = 0x7f0a079c
+.field public static final up:I = 0x7f0a0774
 
-.field public static final view_offset_helper:I = 0x7f0a082e
+.field public static final view_offset_helper:I = 0x7f0a07f4
 
-.field public static final visible:I = 0x7f0a0831
+.field public static final visible:I = 0x7f0a07f7
 
-.field public static final wide:I = 0x7f0a085e
+.field public static final wide:I = 0x7f0a0823
 
-.field public static final wrap:I = 0x7f0a0880
+.field public static final wrap:I = 0x7f0a0845
 
-.field public static final wrap_content:I = 0x7f0a0881
+.field public static final wrap_content:I = 0x7f0a0846
 
-.field public static final wrap_reverse:I = 0x7f0a0882
+.field public static final wrap_reverse:I = 0x7f0a0847
 
 
 # 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 ce9228f113..17345b6312 100644
--- a/com.discord/smali/com/discord/utils/R$e.smali
+++ b/com.discord/smali/com/discord/utils/R$e.smali
@@ -123,9 +123,9 @@
 
 .field public static final select_dialog_singlechoice_material:I = 0x7f0d005a
 
-.field public static final support_simple_spinner_dropdown_item:I = 0x7f0d0062
+.field public static final support_simple_spinner_dropdown_item:I = 0x7f0d0061
 
-.field public static final view_chip_default:I = 0x7f0d0083
+.field public static final view_chip_default:I = 0x7f0d0082
 
 
 # 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 c917731117..987a590ab3 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, 0x7f04027d
+    const v9, 0x7f04027c
 
     aput v9, v6, v3
 
@@ -2180,7 +2180,7 @@
 
     new-array v5, v1, [I
 
-    const v6, 0x7f040315
+    const v6, 0x7f040314
 
     aput v6, v5, v3
 
@@ -2364,15 +2364,15 @@
         0x7f0401d6
         0x7f0401f9
         0x7f040203
-        0x7f040267
-        0x7f040283
-        0x7f04029b
+        0x7f040266
+        0x7f040282
+        0x7f04029a
+        0x7f0402c8
         0x7f0402c9
-        0x7f0402ca
-        0x7f040323
-        0x7f040326
-        0x7f0403bf
-        0x7f0403c9
+        0x7f040322
+        0x7f040325
+        0x7f0403be
+        0x7f0403c8
     .end array-data
 
     :array_1
@@ -2381,8 +2381,8 @@
         0x7f04004c
         0x7f0400b3
         0x7f04015c
-        0x7f040326
-        0x7f0403c9
+        0x7f040325
+        0x7f0403c8
     .end array-data
 
     :array_2
@@ -2396,11 +2396,11 @@
         0x10100f2
         0x7f040079
         0x7f04007a
+        0x7f04025d
         0x7f04025e
-        0x7f04025f
-        0x7f040280
+        0x7f04027f
+        0x7f040307
         0x7f040308
-        0x7f040309
     .end array-data
 
     :array_4
@@ -2434,15 +2434,15 @@
         0x1010540
         0x7f04011a
         0x7f040121
-        0x7f040259
+        0x7f040258
     .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
-        0x7f040313
+        0x7f040312
+        0x7f0403bc
         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
-        0x7f04025a
-        0x7f040349
+        0x7f040259
+        0x7f040348
     .end array-data
 
     :array_e
@@ -2566,41 +2566,41 @@
         0x7f040119
         0x7f040168
         0x7f0401e1
+        0x7f04025b
         0x7f04025c
-        0x7f04025d
+        0x7f04025f
         0x7f040260
         0x7f040261
         0x7f040262
         0x7f040263
         0x7f040264
         0x7f040265
-        0x7f040266
+        0x7f04028f
         0x7f040290
         0x7f040291
-        0x7f040292
-        0x7f04029a
-        0x7f04029c
-        0x7f0402cf
+        0x7f040299
+        0x7f04029b
+        0x7f0402ce
+        0x7f0402d1
         0x7f0402d2
         0x7f0402d3
-        0x7f0402d4
-        0x7f0402fb
+        0x7f0402fa
+        0x7f0402fc
         0x7f0402fd
         0x7f0402fe
-        0x7f0402ff
+        0x7f04030f
         0x7f040310
-        0x7f040311
-        0x7f04032a
+        0x7f040329
+        0x7f040353
         0x7f040354
         0x7f040355
         0x7f040356
-        0x7f040357
+        0x7f040358
         0x7f040359
         0x7f04035a
         0x7f04035b
-        0x7f04035c
+        0x7f04035e
         0x7f04035f
-        0x7f040360
         0x7f0403cb
         0x7f0403cc
         0x7f0403cd
@@ -2639,7 +2639,7 @@
         0x7f040207
         0x7f040208
         0x7f04020b
-        0x7f04027f
+        0x7f04027e
     .end array-data
 
     :array_11
@@ -2699,10 +2699,10 @@
         0x7f040160
         0x7f0401d7
         0x7f0401db
-        0x7f0402d8
-        0x7f040306
-        0x7f040361
-        0x7f040363
+        0x7f0402d7
+        0x7f040305
+        0x7f040360
+        0x7f040362
     .end array-data
 
     :array_14
@@ -2711,8 +2711,8 @@
         0x7f0400a3
         0x7f0400a4
         0x7f0400a5
+        0x7f040309
         0x7f04030a
-        0x7f04030b
     .end array-data
 
     :array_15
@@ -2752,11 +2752,11 @@
         0x7f040126
         0x7f040127
         0x7f040128
-        0x7f0402f6
-        0x7f0402f8
-        0x7f04031b
+        0x7f0402f5
+        0x7f0402f7
+        0x7f04031a
+        0x7f0403be
         0x7f0403bf
-        0x7f0403c0
         0x7f0403ca
     .end array-data
 
@@ -2783,7 +2783,7 @@
     :array_1a
     .array-data 4
         0x7f04020a
-        0x7f04031a
+        0x7f040319
     .end array-data
 
     :array_1b
@@ -2811,8 +2811,8 @@
         0x7f0400b8
         0x7f040112
         0x7f040150
-        0x7f04030f
-        0x7f0403b6
+        0x7f04030e
+        0x7f0403b5
     .end array-data
 
     :array_1e
@@ -2825,9 +2825,9 @@
         0x7f04013b
         0x7f040142
         0x7f040209
+        0x7f040301
         0x7f040302
         0x7f040303
-        0x7f040304
     .end array-data
 
     :array_1f
@@ -2854,10 +2854,10 @@
         0x7f04012e
         0x7f040160
         0x7f04016a
-        0x7f04027c
-        0x7f04029f
-        0x7f0402d8
-        0x7f040306
+        0x7f04027b
+        0x7f04029e
+        0x7f0402d7
+        0x7f040305
         0x7f0403e7
     .end array-data
 
@@ -2866,7 +2866,7 @@
         0x7f040139
         0x7f04013a
         0x7f040204
-        0x7f04025b
+        0x7f04025a
     .end array-data
 
     :array_22
@@ -2907,15 +2907,16 @@
         0x7f04012f
         0x7f040130
         0x7f040131
-        0x7f040289
+        0x7f040288
+        0x7f040297
         0x7f040298
-        0x7f040299
-        0x7f04029e
+        0x7f04029d
+        0x7f0402c5
         0x7f0402c6
         0x7f0402c7
-        0x7f0402c8
+        0x7f0402d4
         0x7f0402d5
-        0x7f0402d6
+        0x7f0402d8
         0x7f0402d9
         0x7f0402da
         0x7f0402db
@@ -2929,7 +2930,6 @@
         0x7f0402e3
         0x7f0402e4
         0x7f0402e5
-        0x7f0402e6
         0x7f0403ed
     .end array-data
 
@@ -2964,8 +2964,8 @@
         0x1010128
         0x7f04010b
         0x7f040110
-        0x7f04027e
-        0x7f040305
+        0x7f04027d
+        0x7f040304
     .end array-data
 
     :array_29
@@ -3004,15 +3004,15 @@
         0x7f0401da
         0x7f0401dc
         0x7f0401dd
-        0x7f0402d8
+        0x7f0402d7
+        0x7f04031e
         0x7f04031f
-        0x7f040320
     .end array-data
 
     :array_2d
     .array-data 4
+        0x7f04031e
         0x7f04031f
-        0x7f040320
     .end array-data
 
     :array_2e
@@ -3029,12 +3029,13 @@
         0x7f0400c7
         0x7f040119
         0x7f040143
+        0x7f040277
         0x7f040278
-        0x7f040279
-        0x7f040284
-        0x7f0402f7
-        0x7f04030c
-        0x7f040342
+        0x7f040283
+        0x7f0402f6
+        0x7f04030b
+        0x7f040341
+        0x7f040349
         0x7f04034a
         0x7f04034b
         0x7f04034c
@@ -3044,11 +3045,10 @@
         0x7f040350
         0x7f040351
         0x7f040352
-        0x7f040353
-        0x7f040358
+        0x7f040357
+        0x7f04035c
         0x7f04035d
-        0x7f04035e
-        0x7f040362
+        0x7f040361
     .end array-data
 
     :array_2f
@@ -3083,8 +3083,8 @@
         0x7f0400ce
         0x7f0401dc
         0x7f0401dd
-        0x7f040287
-        0x7f040301
+        0x7f040286
+        0x7f040300
         0x7f0403cf
     .end array-data
 
@@ -3097,8 +3097,8 @@
         0x101012f
         0x1010130
         0x1010131
-        0x7f04029d
-        0x7f040321
+        0x7f04029c
+        0x7f040320
     .end array-data
 
     :array_32
@@ -3114,20 +3114,20 @@
         0x7f040202
         0x7f040205
         0x7f040208
-        0x7f04027f
+        0x7f04027e
     .end array-data
 
     :array_33
     .array-data 4
         0x1010176
         0x10102c9
-        0x7f040288
+        0x7f040287
     .end array-data
 
     :array_34
     .array-data 4
-        0x7f04028c
-        0x7f04028f
+        0x7f04028b
+        0x7f04028e
     .end array-data
 
     :array_35
@@ -3140,9 +3140,9 @@
         0x7f040135
         0x7f040136
         0x7f04020e
-        0x7f0402d7
-        0x7f04030e
-        0x7f040314
+        0x7f0402d6
+        0x7f04030d
+        0x7f040313
     .end array-data
 
     :array_36
@@ -3157,12 +3157,12 @@
         0x7f040155
         0x7f0401de
         0x7f04020d
+        0x7f0402cc
         0x7f0402cd
-        0x7f0402ce
+        0x7f0402f8
         0x7f0402f9
-        0x7f0402fa
-        0x7f040322
-        0x7f040327
+        0x7f040321
+        0x7f040326
         0x7f0403ef
     .end array-data
 
@@ -3170,7 +3170,7 @@
     .array-data 4
         0x7f04007b
         0x7f0400c6
-        0x7f0402f5
+        0x7f0402f4
     .end array-data
 
     :array_38
@@ -3182,15 +3182,16 @@
         0x7f04012f
         0x7f040130
         0x7f040131
-        0x7f040289
+        0x7f040288
+        0x7f040297
         0x7f040298
-        0x7f040299
-        0x7f04029e
+        0x7f04029d
+        0x7f0402c5
         0x7f0402c6
         0x7f0402c7
-        0x7f0402c8
+        0x7f0402d4
         0x7f0402d5
-        0x7f0402d6
+        0x7f0402d8
         0x7f0402d9
         0x7f0402da
         0x7f0402db
@@ -3204,21 +3205,20 @@
         0x7f0402e3
         0x7f0402e4
         0x7f0402e5
-        0x7f0402e6
         0x7f0403ed
     .end array-data
 
     :array_39
     .array-data 4
+        0x7f04030b
         0x7f04030c
-        0x7f04030d
     .end array-data
 
     :array_3a
     .array-data 4
         0x101011f
         0x7f04011a
-        0x7f04027a
+        0x7f040279
     .end array-data
 
     :array_3b
@@ -3227,7 +3227,7 @@
         0x1010176
         0x101017b
         0x1010262
-        0x7f04029b
+        0x7f04029a
     .end array-data
 
     :array_3c
@@ -3245,14 +3245,14 @@
         0x1010124
         0x1010125
         0x1010142
-        0x7f040307
-        0x7f040312
+        0x7f040306
+        0x7f040311
+        0x7f040327
         0x7f040328
-        0x7f040329
-        0x7f04032b
+        0x7f04032a
+        0x7f0403b6
         0x7f0403b7
         0x7f0403b8
-        0x7f0403b9
         0x7f0403d0
         0x7f0403d1
         0x7f0403d2
@@ -3267,6 +3267,7 @@
 
     :array_3f
     .array-data 4
+        0x7f04032b
         0x7f04032c
         0x7f04032d
         0x7f04032e
@@ -3288,10 +3289,9 @@
         0x7f04033e
         0x7f04033f
         0x7f040340
-        0x7f040341
+        0x7f040342
         0x7f040343
         0x7f040344
-        0x7f040345
     .end array-data
 
     :array_40
@@ -3308,7 +3308,7 @@
         0x1010164
         0x10103ac
         0x7f040145
-        0x7f040349
+        0x7f040348
     .end array-data
 
     :array_41
@@ -3336,11 +3336,11 @@
         0x7f040164
         0x7f040166
         0x7f040167
+        0x7f040292
         0x7f040293
         0x7f040294
         0x7f040295
         0x7f040296
-        0x7f040297
     .end array-data
 
     :array_42
@@ -3363,16 +3363,17 @@
         0x7f0400d2
         0x7f0400d3
         0x7f0400d4
+        0x7f040266
         0x7f040267
-        0x7f040268
-        0x7f04027b
+        0x7f04027a
+        0x7f040280
         0x7f040281
-        0x7f040282
-        0x7f04029b
+        0x7f04029a
+        0x7f040322
         0x7f040323
         0x7f040324
-        0x7f040325
-        0x7f0403bf
+        0x7f0403be
+        0x7f0403c0
         0x7f0403c1
         0x7f0403c2
         0x7f0403c3
@@ -3380,16 +3381,15 @@
         0x7f0403c5
         0x7f0403c6
         0x7f0403c7
-        0x7f0403c8
     .end array-data
 
     :array_44
     .array-data 4
         0x1010000
         0x10100da
+        0x7f04028c
         0x7f04028d
-        0x7f04028e
-        0x7f040365
+        0x7f040364
     .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 8e06598a85..37603064c6 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 BU:Lcom/discord/views/ActiveSubscriptionView$DropdownItem$a;
+.field public static final BX: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;->BU:Lcom/discord/views/ActiveSubscriptionView$DropdownItem$a;
+    sput-object v0, Lcom/discord/views/ActiveSubscriptionView$DropdownItem$a;->BX: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 99aef8c46d..4117175ac8 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 BV:Lcom/discord/views/ActiveSubscriptionView$DropdownItem$b;
+.field public static final BY: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;->BV:Lcom/discord/views/ActiveSubscriptionView$DropdownItem$b;
+    sput-object v0, Lcom/discord/views/ActiveSubscriptionView$DropdownItem$b;->BY: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 7d75091b7e..97f7ce2885 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 BW:Lcom/discord/views/ActiveSubscriptionView$HeaderImage;
+.field public static final enum BZ:Lcom/discord/views/ActiveSubscriptionView$HeaderImage;
 
-.field public static final enum BX:Lcom/discord/views/ActiveSubscriptionView$HeaderImage;
+.field public static final enum Ca:Lcom/discord/views/ActiveSubscriptionView$HeaderImage;
 
-.field public static final enum BY:Lcom/discord/views/ActiveSubscriptionView$HeaderImage;
+.field public static final enum Cb:Lcom/discord/views/ActiveSubscriptionView$HeaderImage;
 
-.field private static final synthetic BZ:[Lcom/discord/views/ActiveSubscriptionView$HeaderImage;
+.field private static final synthetic Cc:[Lcom/discord/views/ActiveSubscriptionView$HeaderImage;
 
 
 # instance fields
@@ -52,13 +52,13 @@
 
     const-string v3, "MECH_WUMPUS"
 
-    const v4, 0x7f08046b
+    const v4, 0x7f08045c
 
     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;->BW:Lcom/discord/views/ActiveSubscriptionView$HeaderImage;
+    sput-object v1, Lcom/discord/views/ActiveSubscriptionView$HeaderImage;->BZ:Lcom/discord/views/ActiveSubscriptionView$HeaderImage;
 
     aput-object v1, v0, v2
 
@@ -68,11 +68,11 @@
 
     const-string v3, "WHEEL_WUMPUS"
 
-    const v4, 0x7f08046c
+    const v4, 0x7f08045d
 
     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;->Ca:Lcom/discord/views/ActiveSubscriptionView$HeaderImage;
 
     aput-object v1, v0, v2
 
@@ -82,15 +82,15 @@
 
     const-string v3, "BROKEN_WHEEL"
 
-    const v4, 0x7f080449
+    const v4, 0x7f08043a
 
     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;->BY:Lcom/discord/views/ActiveSubscriptionView$HeaderImage;
+    sput-object v1, Lcom/discord/views/ActiveSubscriptionView$HeaderImage;->Cb:Lcom/discord/views/ActiveSubscriptionView$HeaderImage;
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lcom/discord/views/ActiveSubscriptionView$HeaderImage;->BZ:[Lcom/discord/views/ActiveSubscriptionView$HeaderImage;
+    sput-object v0, Lcom/discord/views/ActiveSubscriptionView$HeaderImage;->Cc:[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;->BZ:[Lcom/discord/views/ActiveSubscriptionView$HeaderImage;
+    sget-object v0, Lcom/discord/views/ActiveSubscriptionView$HeaderImage;->Cc:[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 d65adb239f..7dec7db78a 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 Ca:Ljava/util/HashSet;
+.field private final Cd:Ljava/util/HashSet;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/HashSet<",
@@ -73,11 +73,109 @@
 
     invoke-direct {p1}, Ljava/util/HashSet;-><init>()V
 
-    iput-object p1, p0, Lcom/discord/views/ActiveSubscriptionView$a;->Ca:Ljava/util/HashSet;
+    iput-object p1, p0, Lcom/discord/views/ActiveSubscriptionView$a;->Cd: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;->BX: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;->BY: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
 
@@ -119,7 +217,7 @@
 
     iget-object v1, p0, Lcom/discord/views/ActiveSubscriptionView$a;->context:Landroid/content/Context;
 
-    const v2, 0x7f120d9b
+    const v2, 0x7f120d62
 
     const/4 v3, 0x1
 
@@ -205,104 +303,6 @@
     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;->getItemView(ILandroid/view/View;)Landroid/view/View;
+    invoke-direct {p0, p1, p2}, Lcom/discord/views/ActiveSubscriptionView$a;->a(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;->getItemView(ILandroid/view/View;)Landroid/view/View;
+    invoke-direct {p0, p1, p2}, Lcom/discord/views/ActiveSubscriptionView$a;->a(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;->Ca:Ljava/util/HashSet;
+    iget-object v0, p0, Lcom/discord/views/ActiveSubscriptionView$a;->Cd: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;->Ca:Ljava/util/HashSet;
+    iget-object v0, p0, Lcom/discord/views/ActiveSubscriptionView$a;->Cd: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 b747328c94..e94dbed76b 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 Cb:Lkotlin/jvm/functions/Function0;
+.field final synthetic Ce: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;->Cb:Lkotlin/jvm/functions/Function0;
+    iput-object p1, p0, Lcom/discord/views/ActiveSubscriptionView$b;->Ce: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;->Cb:Lkotlin/jvm/functions/Function0;
+    iget-object p1, p0, Lcom/discord/views/ActiveSubscriptionView$b;->Ce: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 e29462fe30..66385e9a2d 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 Cc:Lkotlin/jvm/functions/Function0;
+.field final synthetic Cf: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;->Cc:Lkotlin/jvm/functions/Function0;
+    iput-object p1, p0, Lcom/discord/views/ActiveSubscriptionView$c;->Cf: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;->Cc:Lkotlin/jvm/functions/Function0;
+    iget-object p1, p0, Lcom/discord/views/ActiveSubscriptionView$c;->Cf: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 70bf92739f..cd375e54db 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 Cd:Ljava/util/List;
+.field final synthetic Cg:Ljava/util/List;
 
-.field final synthetic Ce:Lkotlin/jvm/functions/Function1;
+.field final synthetic Ch: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;->Cd:Ljava/util/List;
+    iput-object p1, p0, Lcom/discord/views/ActiveSubscriptionView$d;->Cg:Ljava/util/List;
 
-    iput-object p2, p0, Lcom/discord/views/ActiveSubscriptionView$d;->Ce:Lkotlin/jvm/functions/Function1;
+    iput-object p2, p0, Lcom/discord/views/ActiveSubscriptionView$d;->Ch: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;->Cd:Ljava/util/List;
+    iget-object p1, p0, Lcom/discord/views/ActiveSubscriptionView$d;->Cg: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;->Ce:Lkotlin/jvm/functions/Function1;
+    iget-object p2, p0, Lcom/discord/views/ActiveSubscriptionView$d;->Ch: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 2f9a3a40f4..eccecab690 100644
--- a/com.discord/smali/com/discord/views/ActiveSubscriptionView.smali
+++ b/com.discord/smali/com/discord/views/ActiveSubscriptionView.smali
@@ -14,27 +14,27 @@
 
 
 # instance fields
-.field private final BJ:Landroid/widget/TextView;
+.field private final BM:Landroid/widget/TextView;
 
-.field private final BK:Landroid/widget/Spinner;
+.field private final BN:Landroid/widget/Spinner;
 
-.field private final BL:Landroid/widget/ImageView;
+.field private final BO:Landroid/widget/ImageView;
 
-.field private final BM:Landroid/widget/ImageView;
+.field private final BP:Landroid/widget/ImageView;
 
-.field private final BN:Landroid/widget/ImageView;
+.field private final BQ:Landroid/widget/ImageView;
 
-.field private final BO:Landroid/widget/TextView;
+.field private final BR:Landroid/widget/TextView;
 
-.field private final BP:Landroid/widget/Button;
+.field private final BS:Landroid/widget/Button;
 
-.field private final BQ:Landroid/widget/ProgressBar;
+.field private final BT:Landroid/widget/ProgressBar;
 
-.field private final BR:Landroid/widget/Button;
+.field private final BU:Landroid/widget/Button;
 
-.field private final BS:Landroid/widget/TextView;
+.field private final BV:Landroid/widget/TextView;
 
-.field private final BT:Landroid/widget/TextView;
+.field private final BW:Landroid/widget/TextView;
 
 .field private final headerTv:Landroid/widget/TextView;
 
@@ -93,7 +93,7 @@
 
     check-cast p2, Landroid/view/ViewGroup;
 
-    const p3, 0x7f0d0072
+    const p3, 0x7f0d0071
 
     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;->BJ:Landroid/widget/TextView;
+    iput-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->BM:Landroid/widget/TextView;
 
     const p1, 0x7f0a004c
 
@@ -123,7 +123,7 @@
 
     check-cast p1, Landroid/widget/Spinner;
 
-    iput-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->BK:Landroid/widget/Spinner;
+    iput-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->BN:Landroid/widget/Spinner;
 
     const p1, 0x7f0a0049
 
@@ -151,7 +151,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;->BO:Landroid/widget/ImageView;
 
     const p1, 0x7f0a0047
 
@@ -165,7 +165,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;->BP:Landroid/widget/ImageView;
 
     const p1, 0x7f0a0048
 
@@ -179,7 +179,7 @@
 
     check-cast p1, Landroid/widget/ImageView;
 
-    iput-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->BN:Landroid/widget/ImageView;
+    iput-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->BQ:Landroid/widget/ImageView;
 
     const p1, 0x7f0a0043
 
@@ -193,7 +193,7 @@
 
     check-cast p1, Landroid/widget/TextView;
 
-    iput-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->BO:Landroid/widget/TextView;
+    iput-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->BR:Landroid/widget/TextView;
 
     const p1, 0x7f0a004e
 
@@ -207,7 +207,7 @@
 
     check-cast p1, Landroid/widget/Button;
 
-    iput-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->BP:Landroid/widget/Button;
+    iput-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->BS:Landroid/widget/Button;
 
     const p1, 0x7f0a004b
 
@@ -221,7 +221,7 @@
 
     check-cast p1, Landroid/widget/ProgressBar;
 
-    iput-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->BQ:Landroid/widget/ProgressBar;
+    iput-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->BT:Landroid/widget/ProgressBar;
 
     const p1, 0x7f0a004f
 
@@ -235,7 +235,7 @@
 
     check-cast p1, Landroid/widget/Button;
 
-    iput-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->BR:Landroid/widget/Button;
+    iput-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->BU:Landroid/widget/Button;
 
     const p1, 0x7f0a0045
 
@@ -249,7 +249,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;->BV:Landroid/widget/TextView;
 
     const p1, 0x7f0a0044
 
@@ -263,7 +263,7 @@
 
     check-cast p1, Landroid/widget/TextView;
 
-    iput-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->BT:Landroid/widget/TextView;
+    iput-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->BW: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;->BL:Landroid/widget/ImageView;
+    iget-object v0, p0, Lcom/discord/views/ActiveSubscriptionView;->BO:Landroid/widget/ImageView;
 
     invoke-virtual {v0, p1}, Landroid/widget/ImageView;->setImageResource(I)V
 
-    iget-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->BM:Landroid/widget/ImageView;
+    iget-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->BP: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;->BM:Landroid/widget/ImageView;
+    iget-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->BP: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;->BN:Landroid/widget/ImageView;
+    iget-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->BQ: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;->BS:Landroid/widget/TextView;
+    iget-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->BV: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;->BT:Landroid/widget/TextView;
+    iget-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->BW: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;->BT:Landroid/widget/TextView;
+    iget-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->BW: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;->BO:Landroid/widget/TextView;
+    iget-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->BR: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;->BP:Landroid/widget/Button;
+    iget-object p5, p0, Lcom/discord/views/ActiveSubscriptionView;->BS:Landroid/widget/Button;
 
     invoke-virtual {p5, p7}, Landroid/widget/Button;->setText(Ljava/lang/CharSequence;)V
 
-    iget-object p5, p0, Lcom/discord/views/ActiveSubscriptionView;->BP:Landroid/widget/Button;
+    iget-object p5, p0, Lcom/discord/views/ActiveSubscriptionView;->BS: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;->BP:Landroid/widget/Button;
+    iget-object p5, p0, Lcom/discord/views/ActiveSubscriptionView;->BS:Landroid/widget/Button;
 
     invoke-virtual {p5, p1}, Landroid/widget/Button;->setVisibility(I)V
 
     :goto_0
-    iget-object p5, p0, Lcom/discord/views/ActiveSubscriptionView;->BP:Landroid/widget/Button;
+    iget-object p5, p0, Lcom/discord/views/ActiveSubscriptionView;->BS: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;->BP:Landroid/widget/Button;
+    iget-object p5, p0, Lcom/discord/views/ActiveSubscriptionView;->BS: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;->BQ:Landroid/widget/ProgressBar;
+    iget-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->BT: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;->BR:Landroid/widget/Button;
+    iget-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->BU: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;->BR:Landroid/widget/Button;
+    iget-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->BU: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;->BK:Landroid/widget/Spinner;
+    iget-object p5, p0, Lcom/discord/views/ActiveSubscriptionView;->BN:Landroid/widget/Spinner;
 
     invoke-virtual {p5, p2}, Landroid/widget/Spinner;->setOnItemSelectedListener(Landroid/widget/AdapterView$OnItemSelectedListener;)V
 
-    iget-object p2, p0, Lcom/discord/views/ActiveSubscriptionView;->BK:Landroid/widget/Spinner;
+    iget-object p2, p0, Lcom/discord/views/ActiveSubscriptionView;->BN: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;->BK:Landroid/widget/Spinner;
+    iget-object p2, p0, Lcom/discord/views/ActiveSubscriptionView;->BN: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;->BK:Landroid/widget/Spinner;
+    iget-object p2, p0, Lcom/discord/views/ActiveSubscriptionView;->BN:Landroid/widget/Spinner;
 
     invoke-virtual {p2, p4}, Landroid/widget/Spinner;->setVisibility(I)V
 
-    iget-object p2, p0, Lcom/discord/views/ActiveSubscriptionView;->BJ:Landroid/widget/TextView;
+    iget-object p2, p0, Lcom/discord/views/ActiveSubscriptionView;->BM:Landroid/widget/TextView;
 
     invoke-virtual {p2, p4}, Landroid/widget/TextView;->setVisibility(I)V
 
-    iget-object p0, p0, Lcom/discord/views/ActiveSubscriptionView;->BK:Landroid/widget/Spinner;
+    iget-object p0, p0, Lcom/discord/views/ActiveSubscriptionView;->BN: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;->BK:Landroid/widget/Spinner;
+    iget-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->BN: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;->BJ:Landroid/widget/TextView;
+    iget-object p0, p0, Lcom/discord/views/ActiveSubscriptionView;->BM: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 921d6ad9d5..882c2346ee 100644
--- a/com.discord/smali/com/discord/views/ApplicationNewsView$a$a.smali
+++ b/com.discord/smali/com/discord/views/ApplicationNewsView$a$a.smali
@@ -15,9 +15,9 @@
 
 
 # instance fields
-.field final Cn:I
+.field final Cq:I
 
-.field final Co:I
+.field final Cr: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;->Cn:I
+    iput p2, p0, Lcom/discord/views/ApplicationNewsView$a$a;->Cq:I
 
-    iput p3, p0, Lcom/discord/views/ApplicationNewsView$a$a;->Co:I
+    iput p3, p0, Lcom/discord/views/ApplicationNewsView$a$a;->Cr: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 39ab61713e..a042c9da43 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 Cp:Lcom/discord/views/ApplicationNewsView$a$b;
+.field public static final Cs: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;->Cp:Lcom/discord/views/ApplicationNewsView$a$b;
+    sput-object v0, Lcom/discord/views/ApplicationNewsView$a$b;->Cs: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 956cfe9e6b..de7d92c544 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 Cq:Lkotlin/jvm/functions/Function0;
+.field final synthetic Ct: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;->Cq:Lkotlin/jvm/functions/Function0;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView$b;->Ct: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;->Cq:Lkotlin/jvm/functions/Function0;
+    iget-object p1, p0, Lcom/discord/views/ApplicationNewsView$b;->Ct: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 320489ea84..0be2537e47 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 BS:Landroid/widget/TextView;
+.field public final BV:Landroid/widget/TextView;
 
-.field public final Cf:Landroid/view/ViewGroup;
+.field public final Ci:Landroid/view/ViewGroup;
 
-.field private final Cg:Landroid/widget/FrameLayout;
+.field private final Cj:Landroid/widget/FrameLayout;
 
-.field public final Ch:Lcom/facebook/drawee/view/SimpleDraweeView;
+.field public final Ck:Lcom/facebook/drawee/view/SimpleDraweeView;
 
-.field private final Ci:Lcom/facebook/drawee/view/SimpleDraweeView;
+.field private final Cl:Lcom/facebook/drawee/view/SimpleDraweeView;
 
-.field public final Cj:Landroid/widget/TextView;
+.field public final Cm:Landroid/widget/TextView;
 
-.field public final Ck:Landroid/widget/ImageView;
+.field public final Cn:Landroid/widget/ImageView;
 
-.field public final Cl:Landroid/view/ViewGroup;
+.field public final Co:Landroid/view/ViewGroup;
 
-.field private final Cm:Landroid/widget/Button;
+.field private final Cp:Landroid/widget/Button;
 
 .field public final titleTv:Landroid/widget/TextView;
 
@@ -51,7 +51,7 @@
 
     check-cast v0, Landroid/view/ViewGroup;
 
-    const v1, 0x7f0d0074
+    const v1, 0x7f0d0073
 
     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;->Ck:Landroid/widget/ImageView;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Cn:Landroid/widget/ImageView;
 
     const p1, 0x7f0a0077
 
@@ -81,7 +81,7 @@
 
     check-cast p1, Landroid/view/ViewGroup;
 
-    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Cl:Landroid/view/ViewGroup;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Co:Landroid/view/ViewGroup;
 
     const p1, 0x7f0a0075
 
@@ -95,7 +95,7 @@
 
     check-cast p1, Landroid/view/ViewGroup;
 
-    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Cf:Landroid/view/ViewGroup;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Ci:Landroid/view/ViewGroup;
 
     const p1, 0x7f0a007a
 
@@ -109,7 +109,7 @@
 
     check-cast p1, Landroid/widget/FrameLayout;
 
-    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Cg:Landroid/widget/FrameLayout;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Cj: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;->Ch:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Ck: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;->Ci:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Cl: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;->BS:Landroid/widget/TextView;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->BV:Landroid/widget/TextView;
 
     const p1, 0x7f0a007e
 
@@ -179,7 +179,7 @@
 
     check-cast p1, Landroid/widget/TextView;
 
-    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Cj:Landroid/widget/TextView;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Cm:Landroid/widget/TextView;
 
     const p1, 0x7f0a0078
 
@@ -193,7 +193,7 @@
 
     check-cast p1, Landroid/widget/Button;
 
-    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Cm:Landroid/widget/Button;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Cp:Landroid/widget/Button;
 
     return-void
 .end method
@@ -215,7 +215,7 @@
 
     check-cast p2, Landroid/view/ViewGroup;
 
-    const v0, 0x7f0d0074
+    const v0, 0x7f0d0073
 
     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;->Ck:Landroid/widget/ImageView;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Cn:Landroid/widget/ImageView;
 
     const p1, 0x7f0a0077
 
@@ -245,7 +245,7 @@
 
     check-cast p1, Landroid/view/ViewGroup;
 
-    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Cl:Landroid/view/ViewGroup;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Co:Landroid/view/ViewGroup;
 
     const p1, 0x7f0a0075
 
@@ -259,7 +259,7 @@
 
     check-cast p1, Landroid/view/ViewGroup;
 
-    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Cf:Landroid/view/ViewGroup;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Ci:Landroid/view/ViewGroup;
 
     const p1, 0x7f0a007a
 
@@ -273,7 +273,7 @@
 
     check-cast p1, Landroid/widget/FrameLayout;
 
-    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Cg:Landroid/widget/FrameLayout;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Cj: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;->Ch:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Ck: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;->Ci:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Cl: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;->BS:Landroid/widget/TextView;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->BV:Landroid/widget/TextView;
 
     const p1, 0x7f0a007e
 
@@ -343,7 +343,7 @@
 
     check-cast p1, Landroid/widget/TextView;
 
-    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Cj:Landroid/widget/TextView;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Cm:Landroid/widget/TextView;
 
     const p1, 0x7f0a0078
 
@@ -357,7 +357,7 @@
 
     check-cast p1, Landroid/widget/Button;
 
-    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Cm:Landroid/widget/Button;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Cp:Landroid/widget/Button;
 
     return-void
 .end method
@@ -379,7 +379,7 @@
 
     check-cast p2, Landroid/view/ViewGroup;
 
-    const p3, 0x7f0d0074
+    const p3, 0x7f0d0073
 
     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;->Ck:Landroid/widget/ImageView;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Cn:Landroid/widget/ImageView;
 
     const p1, 0x7f0a0077
 
@@ -409,7 +409,7 @@
 
     check-cast p1, Landroid/view/ViewGroup;
 
-    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Cl:Landroid/view/ViewGroup;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Co:Landroid/view/ViewGroup;
 
     const p1, 0x7f0a0075
 
@@ -423,7 +423,7 @@
 
     check-cast p1, Landroid/view/ViewGroup;
 
-    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Cf:Landroid/view/ViewGroup;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Ci:Landroid/view/ViewGroup;
 
     const p1, 0x7f0a007a
 
@@ -437,7 +437,7 @@
 
     check-cast p1, Landroid/widget/FrameLayout;
 
-    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Cg:Landroid/widget/FrameLayout;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Cj: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;->Ch:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Ck: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;->Ci:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Cl: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;->BS:Landroid/widget/TextView;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->BV:Landroid/widget/TextView;
 
     const p1, 0x7f0a007e
 
@@ -507,7 +507,7 @@
 
     check-cast p1, Landroid/widget/TextView;
 
-    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Cj:Landroid/widget/TextView;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Cm:Landroid/widget/TextView;
 
     const p1, 0x7f0a0078
 
@@ -521,7 +521,7 @@
 
     check-cast p1, Landroid/widget/Button;
 
-    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Cm:Landroid/widget/Button;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Cp:Landroid/widget/Button;
 
     return-void
 .end method
@@ -572,7 +572,7 @@
 
     div-float/2addr p1, p2
 
-    iget-object p2, p0, Lcom/discord/views/ApplicationNewsView;->Cg:Landroid/widget/FrameLayout;
+    iget-object p2, p0, Lcom/discord/views/ApplicationNewsView;->Cj: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;->Cg:Landroid/widget/FrameLayout;
+    iget-object v0, p0, Lcom/discord/views/ApplicationNewsView;->Cj: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;->Cg:Landroid/widget/FrameLayout;
+    iget-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Cj: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;->Ci:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Cl: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;->Ci:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object v0, p0, Lcom/discord/views/ApplicationNewsView;->Cl: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;->Ci:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object v0, p0, Lcom/discord/views/ApplicationNewsView;->Cl: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;->Cn:I
+    iget v0, p1, Lcom/discord/views/ApplicationNewsView$a$a;->Cq:I
 
-    iget p1, p1, Lcom/discord/views/ApplicationNewsView$a$a;->Co:I
+    iget p1, p1, Lcom/discord/views/ApplicationNewsView$a$a;->Cr: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;->Cf:Landroid/view/ViewGroup;
+    iget-object v0, p0, Lcom/discord/views/ApplicationNewsView;->Ci: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;->Ck:Landroid/widget/ImageView;
+    iget-object v0, p0, Lcom/discord/views/ApplicationNewsView;->Cn:Landroid/widget/ImageView;
 
     invoke-virtual {v0, v1}, Landroid/widget/ImageView;->setVisibility(I)V
 
-    iget-object v0, p0, Lcom/discord/views/ApplicationNewsView;->Cl:Landroid/view/ViewGroup;
+    iget-object v0, p0, Lcom/discord/views/ApplicationNewsView;->Co: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;->Cm:Landroid/widget/Button;
+    iget-object v0, p0, Lcom/discord/views/ApplicationNewsView;->Cp: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;->Ch:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Ck: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;->Ch:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Ck: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;->Cp:Lcom/discord/views/ApplicationNewsView$a$b;
+    sget-object p1, Lcom/discord/views/ApplicationNewsView$a$b;->Cs: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 6e1c87a9c6..cfd821186c 100644
--- a/com.discord/smali/com/discord/views/BoxedButton.smali
+++ b/com.discord/smali/com/discord/views/BoxedButton.smali
@@ -8,9 +8,9 @@
 
 
 # instance fields
-.field private final Cr:Lkotlin/properties/ReadOnlyProperty;
+.field private final Cu:Lkotlin/properties/ReadOnlyProperty;
 
-.field private final Cs:Lkotlin/properties/ReadOnlyProperty;
+.field private final Cv:Lkotlin/properties/ReadOnlyProperty;
 
 
 # direct methods
@@ -87,7 +87,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;->Cu:Lkotlin/properties/ReadOnlyProperty;
 
     const p1, 0x7f0a010d
 
@@ -95,7 +95,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/views/BoxedButton;->Cs:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/views/BoxedButton;->Cv:Lkotlin/properties/ReadOnlyProperty;
 
     return-void
 .end method
@@ -115,7 +115,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;->Cu:Lkotlin/properties/ReadOnlyProperty;
 
     const p1, 0x7f0a010d
 
@@ -123,7 +123,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/views/BoxedButton;->Cs:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/views/BoxedButton;->Cv: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;->Cr:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/views/BoxedButton;->Cu:Lkotlin/properties/ReadOnlyProperty;
 
     const p1, 0x7f0a010d
 
@@ -153,7 +153,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/views/BoxedButton;->Cs:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/views/BoxedButton;->Cv: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, 0x7f0d0079
+    const v2, 0x7f0d0078
 
     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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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;->Cs:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/views/BoxedButton;->Cv: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;->Cr:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/views/BoxedButton;->Cu: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 7b2fd63eb3..63eb9c29d9 100644
--- a/com.discord/smali/com/discord/views/ChatActionItem.smali
+++ b/com.discord/smali/com/discord/views/ChatActionItem.smali
@@ -4,11 +4,11 @@
 
 
 # instance fields
-.field private Ct:Landroid/widget/ImageView;
+.field private Cw:Landroid/widget/ImageView;
 
-.field private Cu:Lcom/discord/app/AppTextView;
+.field private Cx:Lcom/discord/app/AppTextView;
 
-.field private Cv:Lcom/discord/app/AppTextView;
+.field private Cy:Lcom/discord/app/AppTextView;
 
 
 # direct methods
@@ -92,7 +92,7 @@
 
     check-cast v1, Landroid/view/ViewGroup;
 
-    const v2, 0x7f0d007d
+    const v2, 0x7f0d007c
 
     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;->Cu:Lcom/discord/app/AppTextView;
+    iput-object v0, p0, Lcom/discord/views/ChatActionItem;->Cx: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;->Cv:Lcom/discord/app/AppTextView;
+    iput-object v0, p0, Lcom/discord/views/ChatActionItem;->Cy: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;->Ct:Landroid/widget/ImageView;
+    iput-object v0, p0, Lcom/discord/views/ChatActionItem;->Cw: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;->Cu:Lcom/discord/app/AppTextView;
+    iget-object v0, p0, Lcom/discord/views/ChatActionItem;->Cx: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;->Cv:Lcom/discord/app/AppTextView;
+    iget-object v0, p0, Lcom/discord/views/ChatActionItem;->Cy:Lcom/discord/app/AppTextView;
 
     if-nez v0, :cond_1
 
@@ -190,13 +190,13 @@
 
     const/4 v0, 0x1
 
-    const v1, 0x7f080112
+    const v1, 0x7f08010e
 
     invoke-virtual {p1, v0, v1}, Landroid/content/res/TypedArray;->getResourceId(II)I
 
     move-result v0
 
-    iget-object v1, p0, Lcom/discord/views/ChatActionItem;->Ct:Landroid/widget/ImageView;
+    iget-object v1, p0, Lcom/discord/views/ChatActionItem;->Cw:Landroid/widget/ImageView;
 
     const-string v3, "image"
 
@@ -223,7 +223,7 @@
 
     if-eqz v0, :cond_4
 
-    iget-object v1, p0, Lcom/discord/views/ChatActionItem;->Ct:Landroid/widget/ImageView;
+    iget-object v1, p0, Lcom/discord/views/ChatActionItem;->Cw: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 b639ea131d..8b1330cfa5 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 Cw:[I
+.field private final Cz:[I
 
 .field private checked:Z
 
@@ -32,7 +32,7 @@
 
     aput v2, v0, v1
 
-    iput-object v0, p0, Lcom/discord/views/CheckableImageView;->Cw:[I
+    iput-object v0, p0, Lcom/discord/views/CheckableImageView;->Cz:[I
 
     if-eqz p2, :cond_0
 
@@ -99,7 +99,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/views/CheckableImageView;->Cw:[I
+    iget-object v0, p0, Lcom/discord/views/CheckableImageView;->Cz:[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 55460aa0f2..d7b8a73c7e 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 CC:I
+.field public static final CF:I
 
-.field public static final CD:I
+.field public static final CG:I
 
-.field public static final CE:I
+.field public static final CH:I
 
-.field private static final synthetic CF:[I
+.field private static final synthetic CI:[I
 
-.field private static final CG:[I
+.field private static final CJ:[I
 
-.field public static final CH:Lcom/discord/views/CheckedSetting$b$a;
+.field public static final CK:Lcom/discord/views/CheckedSetting$b$a;
 
 
 # direct methods
@@ -54,15 +54,15 @@
 
     const/4 v2, 0x1
 
-    sput v2, Lcom/discord/views/CheckedSetting$b;->CC:I
+    sput v2, Lcom/discord/views/CheckedSetting$b;->CF:I
 
     const/4 v2, 0x2
 
-    sput v2, Lcom/discord/views/CheckedSetting$b;->CD:I
+    sput v2, Lcom/discord/views/CheckedSetting$b;->CG:I
 
-    sput v0, Lcom/discord/views/CheckedSetting$b;->CE:I
+    sput v0, Lcom/discord/views/CheckedSetting$b;->CH:I
 
-    sput-object v1, Lcom/discord/views/CheckedSetting$b;->CF:[I
+    sput-object v1, Lcom/discord/views/CheckedSetting$b;->CI:[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;->CH:Lcom/discord/views/CheckedSetting$b$a;
+    sput-object v0, Lcom/discord/views/CheckedSetting$b;->CK:Lcom/discord/views/CheckedSetting$b$a;
 
-    invoke-static {}, Lcom/discord/views/CheckedSetting$b;->eZ()[I
+    invoke-static {}, Lcom/discord/views/CheckedSetting$b;->eY()[I
 
     move-result-object v0
 
-    sput-object v0, Lcom/discord/views/CheckedSetting$b;->CG:[I
+    sput-object v0, Lcom/discord/views/CheckedSetting$b;->CJ:[I
 
     return-void
 
@@ -90,18 +90,18 @@
     .end array-data
 .end method
 
-.method public static final synthetic eY()[I
+.method public static final synthetic eX()[I
     .locals 1
 
-    sget-object v0, Lcom/discord/views/CheckedSetting$b;->CG:[I
+    sget-object v0, Lcom/discord/views/CheckedSetting$b;->CJ:[I
 
     return-object v0
 .end method
 
-.method public static eZ()[I
+.method public static eY()[I
     .locals 1
 
-    sget-object v0, Lcom/discord/views/CheckedSetting$b;->CF:[I
+    sget-object v0, Lcom/discord/views/CheckedSetting$b;->CI:[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 d42cf1e55a..1df93f2178 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 CI:Lcom/discord/views/CheckedSetting;
+.field final synthetic CL:Lcom/discord/views/CheckedSetting;
 
-.field final synthetic CJ:Ljava/lang/String;
+.field final synthetic CM: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;->CI:Lcom/discord/views/CheckedSetting;
+    iput-object p1, p0, Lcom/discord/views/CheckedSetting$c;->CL:Lcom/discord/views/CheckedSetting;
 
-    iput-object p2, p0, Lcom/discord/views/CheckedSetting$c;->CJ:Ljava/lang/String;
+    iput-object p2, p0, Lcom/discord/views/CheckedSetting$c;->CM: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;->CJ:Ljava/lang/String;
+    iget-object p1, p0, Lcom/discord/views/CheckedSetting$c;->CM:Ljava/lang/String;
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/discord/views/CheckedSetting$c;->CI:Lcom/discord/views/CheckedSetting;
+    iget-object p1, p0, Lcom/discord/views/CheckedSetting$c;->CL: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;->CJ:Ljava/lang/String;
+    iget-object v0, p0, Lcom/discord/views/CheckedSetting$c;->CM: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 4d9cf12d7e..1976a29638 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 CI:Lcom/discord/views/CheckedSetting;
+.field final synthetic CL: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;->CI:Lcom/discord/views/CheckedSetting;
+    iput-object p1, p0, Lcom/discord/views/CheckedSetting$d;->CL: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;->CI:Lcom/discord/views/CheckedSetting;
+    iget-object p1, p0, Lcom/discord/views/CheckedSetting$d;->CL: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 13f7a0ac8b..34ae49b6c7 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 CI:Lcom/discord/views/CheckedSetting;
+.field final synthetic CL: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;->CI:Lcom/discord/views/CheckedSetting;
+    iput-object p1, p0, Lcom/discord/views/CheckedSetting$e;->CL: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;->CI:Lcom/discord/views/CheckedSetting;
+    iget-object p1, p0, Lcom/discord/views/CheckedSetting$e;->CL: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;->CI:Lcom/discord/views/CheckedSetting;
+    iget-object v0, p0, Lcom/discord/views/CheckedSetting$e;->CL: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 1336007404..2e707b20f7 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 CK:Lrx/functions/Action1;
+.field final synthetic CN:Lrx/functions/Action1;
 
 
 # direct methods
 .method constructor <init>(Lrx/functions/Action1;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/views/CheckedSetting$f;->CK:Lrx/functions/Action1;
+    iput-object p1, p0, Lcom/discord/views/CheckedSetting$f;->CN: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;->CK:Lrx/functions/Action1;
+    iget-object p1, p0, Lcom/discord/views/CheckedSetting$f;->CN: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 dd13698ac8..4bb161baf1 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 CL:Lrx/functions/Action0;
+.field final synthetic CO:Lrx/functions/Action0;
 
 
 # direct methods
 .method constructor <init>(Lrx/functions/Action0;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/views/CheckedSetting$g;->CL:Lrx/functions/Action0;
+    iput-object p1, p0, Lcom/discord/views/CheckedSetting$g;->CO: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;->CL:Lrx/functions/Action0;
+    iget-object p1, p0, Lcom/discord/views/CheckedSetting$g;->CO: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 ab3a3ecc8a..f78ca9d4eb 100644
--- a/com.discord/smali/com/discord/views/CheckedSetting.smali
+++ b/com.discord/smali/com/discord/views/CheckedSetting.smali
@@ -16,16 +16,14 @@
 
 
 # static fields
-.field public static final CB:Lcom/discord/views/CheckedSetting$a;
+.field public static final CE:Lcom/discord/views/CheckedSetting$a;
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
 
 # instance fields
-.field private CA:Landroid/widget/TextView;
-
-.field private Cx:Lrx/functions/Action1;
+.field private CA:Lrx/functions/Action1;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/Action1<",
@@ -35,9 +33,11 @@
     .end annotation
 .end field
 
-.field private Cy:Landroid/widget/CompoundButton;
+.field private CB:Landroid/widget/CompoundButton;
 
-.field private Cz:Landroid/widget/TextView;
+.field private CC:Landroid/widget/TextView;
+
+.field private CD:Landroid/widget/TextView;
 
 .field private container:Landroid/view/View;
 
@@ -52,7 +52,7 @@
 
     invoke-direct {v0, v1}, Lcom/discord/views/CheckedSetting$a;-><init>(B)V
 
-    sput-object v0, Lcom/discord/views/CheckedSetting;->CB:Lcom/discord/views/CheckedSetting$a;
+    sput-object v0, Lcom/discord/views/CheckedSetting;->CE: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;->CC:I
+    sget p1, Lcom/discord/views/CheckedSetting$b;->CF: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;->CC:I
+    sget p3, Lcom/discord/views/CheckedSetting$b;->CF:I
 
     const/4 v1, 0x1
 
@@ -140,9 +140,9 @@
 
     move-result p2
 
-    sget-object p3, Lcom/discord/views/CheckedSetting$b;->CH:Lcom/discord/views/CheckedSetting$b$a;
+    sget-object p3, Lcom/discord/views/CheckedSetting$b;->CK:Lcom/discord/views/CheckedSetting$b$a;
 
-    invoke-static {}, Lcom/discord/views/CheckedSetting$b;->eY()[I
+    invoke-static {}, Lcom/discord/views/CheckedSetting$b;->eX()[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;->Cz:Landroid/widget/TextView;
+    iget-object v4, p0, Lcom/discord/views/CheckedSetting;->CC: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;->Cz:Landroid/widget/TextView;
+    iget-object v4, p0, Lcom/discord/views/CheckedSetting;->CC: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;->Cz:Landroid/widget/TextView;
+    iget-object p2, p0, Lcom/discord/views/CheckedSetting;->CC: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;->Cz:Landroid/widget/TextView;
+    iget-object p2, p0, Lcom/discord/views/CheckedSetting;->CC: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;->Cz:Landroid/widget/TextView;
+    iget-object p2, p0, Lcom/discord/views/CheckedSetting;->CC: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;->Cz:Landroid/widget/TextView;
+    iget-object v4, p0, Lcom/discord/views/CheckedSetting;->CC: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;->CA:Landroid/widget/TextView;
+    iget-object p2, p0, Lcom/discord/views/CheckedSetting;->CD: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;->CA:Landroid/widget/TextView;
+    iget-object v1, p0, Lcom/discord/views/CheckedSetting;->CD: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;->CA:Landroid/widget/TextView;
+    iget-object p2, p0, Lcom/discord/views/CheckedSetting;->CD: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;->CA:Landroid/widget/TextView;
+    iget-object p3, p0, Lcom/discord/views/CheckedSetting;->CD: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;->CA:Landroid/widget/TextView;
+    iget-object p3, p0, Lcom/discord/views/CheckedSetting;->CD:Landroid/widget/TextView;
 
     if-nez p3, :cond_12
 
@@ -404,7 +404,7 @@
     goto :goto_2
 
     :cond_14
-    const p2, 0x7f0800dc
+    const p2, 0x7f0800db
 
     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;->Cy:Landroid/widget/CompoundButton;
+    iget-object p0, p0, Lcom/discord/views/CheckedSetting;->CB:Landroid/widget/CompoundButton;
 
     if-nez p0, :cond_0
 
@@ -520,7 +520,7 @@
 
     if-ne v0, v1, :cond_0
 
-    const v0, 0x7f0d00a9
+    const v0, 0x7f0d00a7
 
     goto :goto_0
 
@@ -532,12 +532,12 @@
     throw p1
 
     :cond_1
-    const v0, 0x7f0d00a8
+    const v0, 0x7f0d00a6
 
     goto :goto_0
 
     :cond_2
-    const v0, 0x7f0d00a7
+    const v0, 0x7f0d00a5
 
     :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, 0x7f0a066e
+    const v0, 0x7f0a0655
 
     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;->Cz:Landroid/widget/TextView;
+    iput-object v0, p0, Lcom/discord/views/CheckedSetting;->CC:Landroid/widget/TextView;
 
-    const v0, 0x7f0a066f
+    const v0, 0x7f0a0656
 
     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;->CA:Landroid/widget/TextView;
+    iput-object v0, p0, Lcom/discord/views/CheckedSetting;->CD:Landroid/widget/TextView;
 
-    const v0, 0x7f0a066b
+    const v0, 0x7f0a0652
 
     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;->Cy:Landroid/widget/CompoundButton;
+    iput-object v0, p0, Lcom/discord/views/CheckedSetting;->CB:Landroid/widget/CompoundButton;
 
-    const v0, 0x7f0a066c
+    const v0, 0x7f0a0653
 
     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;->CD:I
+    sget v0, Lcom/discord/views/CheckedSetting$b;->CG: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;->CA:Landroid/widget/TextView;
+    iget-object v0, p0, Lcom/discord/views/CheckedSetting;->CD:Landroid/widget/TextView;
 
     const-string v1, "subLabel"
 
@@ -689,7 +689,7 @@
 
     if-eqz p2, :cond_2
 
-    iget-object p1, p0, Lcom/discord/views/CheckedSetting;->CA:Landroid/widget/TextView;
+    iget-object p1, p0, Lcom/discord/views/CheckedSetting;->CD: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;->Cy:Landroid/widget/CompoundButton;
+    iget-object p2, p0, Lcom/discord/views/CheckedSetting;->CB: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;->Cy:Landroid/widget/CompoundButton;
+    iget-object p2, p0, Lcom/discord/views/CheckedSetting;->CB: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;->Cx:Lrx/functions/Action1;
+    iget-object p1, p0, Lcom/discord/views/CheckedSetting;->CA: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;->Cy:Landroid/widget/CompoundButton;
+    iget-object p2, p0, Lcom/discord/views/CheckedSetting;->CB: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;->Cy:Landroid/widget/CompoundButton;
+    iget-object v0, p0, Lcom/discord/views/CheckedSetting;->CB: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;->Cy:Landroid/widget/CompoundButton;
+    iget-object v0, p0, Lcom/discord/views/CheckedSetting;->CB: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;->Cy:Landroid/widget/CompoundButton;
+    iget-object v0, p0, Lcom/discord/views/CheckedSetting;->CB:Landroid/widget/CompoundButton;
 
     if-nez v0, :cond_0
 
@@ -961,9 +961,9 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/discord/views/CheckedSetting;->Cx:Lrx/functions/Action1;
+    iput-object p1, p0, Lcom/discord/views/CheckedSetting;->CA:Lrx/functions/Action1;
 
-    iget-object v0, p0, Lcom/discord/views/CheckedSetting;->Cy:Landroid/widget/CompoundButton;
+    iget-object v0, p0, Lcom/discord/views/CheckedSetting;->CB: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;->CA:Landroid/widget/TextView;
+    iget-object v0, p0, Lcom/discord/views/CheckedSetting;->CD: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;->CA:Landroid/widget/TextView;
+    iget-object v0, p0, Lcom/discord/views/CheckedSetting;->CD: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;->Cz:Landroid/widget/TextView;
+    iget-object v0, p0, Lcom/discord/views/CheckedSetting;->CC: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;->Cz:Landroid/widget/TextView;
+    iget-object v0, p0, Lcom/discord/views/CheckedSetting;->CC: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;->Cy:Landroid/widget/CompoundButton;
+    iget-object v0, p0, Lcom/discord/views/CheckedSetting;->CB: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 d12b99c473..dcfa0ebf33 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 CP:Lcom/discord/views/CustomAppBarLayout$a;
+.field public static final CS: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;->CP:Lcom/discord/views/CustomAppBarLayout$a;
+    sput-object v0, Lcom/discord/views/CustomAppBarLayout$a;->CS: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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 c9155a25b9..97aa0384d2 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 CQ:Lcom/discord/views/CustomAppBarLayout;
+.field final synthetic CT: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;->CQ:Lcom/discord/views/CustomAppBarLayout;
+    iput-object p1, p0, Lcom/discord/views/CustomAppBarLayout$b;->CT: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;->CQ:Lcom/discord/views/CustomAppBarLayout;
+    iget-object p2, p0, Lcom/discord/views/CustomAppBarLayout$b;->CT: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;->CQ:Lcom/discord/views/CustomAppBarLayout;
+    iget-object p2, p0, Lcom/discord/views/CustomAppBarLayout$b;->CT: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;->CQ:Lcom/discord/views/CustomAppBarLayout;
+    iget-object p2, p0, Lcom/discord/views/CustomAppBarLayout$b;->CT: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 e0f4e1fcd3..7faf9ec3f8 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 CM:F
+.field private CP:F
 
-.field private final CN:Lcom/google/android/material/appbar/AppBarLayout$OnOffsetChangedListener;
+.field private final CQ:Lcom/google/android/material/appbar/AppBarLayout$OnOffsetChangedListener;
 
-.field private CO:Lkotlin/jvm/functions/Function1;
+.field private CR: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;->CN:Lcom/google/android/material/appbar/AppBarLayout$OnOffsetChangedListener;
+    iput-object p1, p0, Lcom/discord/views/CustomAppBarLayout;->CQ:Lcom/google/android/material/appbar/AppBarLayout$OnOffsetChangedListener;
 
-    sget-object p1, Lcom/discord/views/CustomAppBarLayout$a;->CP:Lcom/discord/views/CustomAppBarLayout$a;
+    sget-object p1, Lcom/discord/views/CustomAppBarLayout$a;->CS:Lcom/discord/views/CustomAppBarLayout$a;
 
     check-cast p1, Lkotlin/jvm/functions/Function1;
 
-    iput-object p1, p0, Lcom/discord/views/CustomAppBarLayout;->CO:Lkotlin/jvm/functions/Function1;
+    iput-object p1, p0, Lcom/discord/views/CustomAppBarLayout;->CR: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;->CM:F
+    iget p0, p0, Lcom/discord/views/CustomAppBarLayout;->CP: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;->CM:F
+    iput p1, p0, Lcom/discord/views/CustomAppBarLayout;->CP: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;->CO:Lkotlin/jvm/functions/Function1;
+    iget-object p0, p0, Lcom/discord/views/CustomAppBarLayout;->CR: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;->CM:F
+    iget v0, p0, Lcom/discord/views/CustomAppBarLayout;->CP: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;->CN:Lcom/google/android/material/appbar/AppBarLayout$OnOffsetChangedListener;
+    iget-object v0, p0, Lcom/discord/views/CustomAppBarLayout;->CQ: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;->CN:Lcom/google/android/material/appbar/AppBarLayout$OnOffsetChangedListener;
+    iget-object v0, p0, Lcom/discord/views/CustomAppBarLayout;->CQ: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;->CO:Lkotlin/jvm/functions/Function1;
+    iput-object p1, p0, Lcom/discord/views/CustomAppBarLayout;->CR: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 e0327c4b0d..942b81b02b 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;->CT:Lcom/discord/views/DigitVerificationView$a;
+    sget-object v0, Lcom/discord/views/DigitVerificationView;->CW: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 d0d4fcdcd3..9b37c093b0 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 CU:Lkotlin/jvm/functions/Function0;
+.field private final CX:Lkotlin/jvm/functions/Function0;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/jvm/functions/Function0<",
@@ -28,9 +28,9 @@
     .end annotation
 .end field
 
-.field private final CV:Landroid/widget/EditText;
+.field private final CY:Landroid/widget/EditText;
 
-.field private final CW:Landroid/widget/EditText;
+.field private final CZ:Landroid/widget/EditText;
 
 
 # direct methods
@@ -54,11 +54,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/discord/views/DigitVerificationView$b;->CU:Lkotlin/jvm/functions/Function0;
+    iput-object p1, p0, Lcom/discord/views/DigitVerificationView$b;->CX:Lkotlin/jvm/functions/Function0;
 
-    iput-object p2, p0, Lcom/discord/views/DigitVerificationView$b;->CV:Landroid/widget/EditText;
+    iput-object p2, p0, Lcom/discord/views/DigitVerificationView$b;->CY:Landroid/widget/EditText;
 
-    iput-object p3, p0, Lcom/discord/views/DigitVerificationView$b;->CW:Landroid/widget/EditText;
+    iput-object p3, p0, Lcom/discord/views/DigitVerificationView$b;->CZ: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;->CV:Landroid/widget/EditText;
+    iget-object p1, p0, Lcom/discord/views/DigitVerificationView$b;->CY:Landroid/widget/EditText;
 
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lcom/discord/views/DigitVerificationView$b;->CW:Landroid/widget/EditText;
+    iget-object p1, p0, Lcom/discord/views/DigitVerificationView$b;->CZ:Landroid/widget/EditText;
 
     :goto_0
-    sget-object p2, Lcom/discord/views/DigitVerificationView;->CT:Lcom/discord/views/DigitVerificationView$a;
+    sget-object p2, Lcom/discord/views/DigitVerificationView;->CW:Lcom/discord/views/DigitVerificationView$a;
 
-    iget-object p2, p0, Lcom/discord/views/DigitVerificationView$b;->CU:Lkotlin/jvm/functions/Function0;
+    iget-object p2, p0, Lcom/discord/views/DigitVerificationView$b;->CX: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 0c2106be04..a704e5193c 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 CS:Ljava/util/List;
+.field private final CV:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -25,7 +25,7 @@
     .end annotation
 .end field
 
-.field private final CU:Lkotlin/jvm/functions/Function0;
+.field private final CX: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;->CU:Lkotlin/jvm/functions/Function0;
+    iput-object p1, p0, Lcom/discord/views/DigitVerificationView$c;->CX:Lkotlin/jvm/functions/Function0;
 
-    iput-object p2, p0, Lcom/discord/views/DigitVerificationView$c;->CS:Ljava/util/List;
+    iput-object p2, p0, Lcom/discord/views/DigitVerificationView$c;->CV: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;->CS:Ljava/util/List;
+    iget-object v0, p0, Lcom/discord/views/DigitVerificationView$c;->CV: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;->CS:Ljava/util/List;
+    iget-object v1, p0, Lcom/discord/views/DigitVerificationView$c;->CV: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;->CT:Lcom/discord/views/DigitVerificationView$a;
+    sget-object v1, Lcom/discord/views/DigitVerificationView;->CW: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;->CT:Lcom/discord/views/DigitVerificationView$a;
+    sget-object p1, Lcom/discord/views/DigitVerificationView;->CW: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;->CT:Lcom/discord/views/DigitVerificationView$a;
+    sget-object p1, Lcom/discord/views/DigitVerificationView;->CW:Lcom/discord/views/DigitVerificationView$a;
 
-    iget-object p1, p0, Lcom/discord/views/DigitVerificationView$c;->CU:Lkotlin/jvm/functions/Function0;
+    iget-object p1, p0, Lcom/discord/views/DigitVerificationView$c;->CX: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 6494a77701..94cd255f1e 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;->fa()Landroid/view/ViewGroup;
+    value = Lcom/discord/views/DigitVerificationView;->eZ()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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 baee56fddf..bfba1d2213 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 CX:Landroid/widget/EditText;
+.field final synthetic Da:Landroid/widget/EditText;
 
 
 # direct methods
 .method constructor <init>(Landroid/widget/EditText;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/views/DigitVerificationView$f;->CX:Landroid/widget/EditText;
+    iput-object p1, p0, Lcom/discord/views/DigitVerificationView$f;->Da: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;->CX:Landroid/widget/EditText;
+    iget-object v0, p0, Lcom/discord/views/DigitVerificationView$f;->Da: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 2b78fa405a..b783e39b1f 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 CY:Lcom/discord/views/DigitVerificationView$g;
+.field public static final Db: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;->CY:Lcom/discord/views/DigitVerificationView$g;
+    sput-object v0, Lcom/discord/views/DigitVerificationView$g;->Db: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 fcef7f66b9..6bbd311d90 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 CT:Lcom/discord/views/DigitVerificationView$a;
+.field public static final CW:Lcom/discord/views/DigitVerificationView$a;
 
 
 # instance fields
-.field private CR:Lcom/discord/views/DigitVerificationView$d;
+.field private CU:Lcom/discord/views/DigitVerificationView$d;
 
-.field public CS:Ljava/util/List;
+.field public CV: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;->CT:Lcom/discord/views/DigitVerificationView$a;
+    sput-object v0, Lcom/discord/views/DigitVerificationView;->CW: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;->CS:Ljava/util/List;
+    iget-object p0, p0, Lcom/discord/views/DigitVerificationView;->CV: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;->CS:Ljava/util/List;
+    iget-object v0, p0, Lcom/discord/views/DigitVerificationView;->CV:Ljava/util/List;
 
     if-nez v0, :cond_0
 
@@ -180,7 +180,7 @@
 
     const/4 v7, 0x0
 
-    sget-object v0, Lcom/discord/views/DigitVerificationView$g;->CY:Lcom/discord/views/DigitVerificationView$g;
+    sget-object v0, Lcom/discord/views/DigitVerificationView$g;->Db: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;->CS:Ljava/util/List;
+    iget-object v0, p0, Lcom/discord/views/DigitVerificationView;->CV:Ljava/util/List;
 
     const-string v1, "digits"
 
@@ -237,7 +237,7 @@
     goto :goto_0
 
     :cond_1
-    iget-object v0, p0, Lcom/discord/views/DigitVerificationView;->CS:Ljava/util/List;
+    iget-object v0, p0, Lcom/discord/views/DigitVerificationView;->CV:Ljava/util/List;
 
     if-nez v0, :cond_2
 
@@ -255,7 +255,7 @@
     return-void
 .end method
 
-.method public final fa()Landroid/view/ViewGroup;
+.method public final eZ()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, 0x7f0d0085
+    const v3, 0x7f0d0084
 
     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, 0x7f0a0823
+    const v4, 0x7f0a07e9
 
     invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -288,7 +288,7 @@
 
     aput-object v4, v3, v5
 
-    const v4, 0x7f0a0824
+    const v4, 0x7f0a07ea
 
     invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -296,7 +296,7 @@
 
     aput-object v4, v3, v2
 
-    const v4, 0x7f0a0825
+    const v4, 0x7f0a07eb
 
     invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -306,7 +306,7 @@
 
     aput-object v4, v3, v6
 
-    const v4, 0x7f0a0826
+    const v4, 0x7f0a07ec
 
     invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -316,7 +316,7 @@
 
     aput-object v4, v3, v6
 
-    const v4, 0x7f0a0827
+    const v4, 0x7f0a07ed
 
     invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -326,7 +326,7 @@
 
     aput-object v4, v3, v6
 
-    const v4, 0x7f0a0828
+    const v4, 0x7f0a07ee
 
     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;->CS:Ljava/util/List;
+    iput-object v4, p0, Lcom/discord/views/DigitVerificationView;->CV: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;->CS:Ljava/util/List;
+    iget-object v3, p0, Lcom/discord/views/DigitVerificationView;->CV: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;->CS:Ljava/util/List;
+    iget-object v10, p0, Lcom/discord/views/DigitVerificationView;->CV: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;->CS:Ljava/util/List;
+    iget-object v10, p0, Lcom/discord/views/DigitVerificationView;->CV: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;->CS:Ljava/util/List;
+    iget-object v11, p0, Lcom/discord/views/DigitVerificationView;->CV: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;->CS:Ljava/util/List;
+    iget-object v0, p0, Lcom/discord/views/DigitVerificationView;->CV: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;->CR:Lcom/discord/views/DigitVerificationView$d;
+    iget-object v0, p0, Lcom/discord/views/DigitVerificationView;->CU: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;->CS:Ljava/util/List;
+    iget-object v0, p0, Lcom/discord/views/DigitVerificationView;->CV: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;->CR:Lcom/discord/views/DigitVerificationView$d;
+    iput-object p1, p0, Lcom/discord/views/DigitVerificationView;->CU:Lcom/discord/views/DigitVerificationView$d;
 
     return-void
 .end method
@@ -617,7 +617,7 @@
 
     move-result v0
 
-    iget-object v1, p0, Lcom/discord/views/DigitVerificationView;->CS:Ljava/util/List;
+    iget-object v1, p0, Lcom/discord/views/DigitVerificationView;->CV: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;->CS:Ljava/util/List;
+    iget-object v3, p0, Lcom/discord/views/DigitVerificationView;->CV: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;->CS:Ljava/util/List;
+    iget-object v0, p0, Lcom/discord/views/DigitVerificationView;->CV:Ljava/util/List;
 
     if-nez v0, :cond_3
 
@@ -682,7 +682,7 @@
 
     move-result p1
 
-    iget-object v1, p0, Lcom/discord/views/DigitVerificationView;->CS:Ljava/util/List;
+    iget-object v1, p0, Lcom/discord/views/DigitVerificationView;->CV: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 b5bcb65e78..ab44a53cd5 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 CZ:I
+.field public Dc: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, 0x7f0a0381
+    const p3, 0x7f0a037c
 
     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, 0x7f0a0380
+    const p3, 0x7f0a037b
 
     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;->CZ:I
+    iput p3, p0, Lcom/discord/views/GuildView;->Dc:I
 
     move-object v0, p0
 
     check-cast v0, Landroid/view/ViewGroup;
 
-    const v1, 0x7f0d008e
+    const v1, 0x7f0d008c
 
     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;->CZ:I
+    iput p2, p0, Lcom/discord/views/GuildView;->Dc: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 6c04da86b7..8fa8075f53 100644
--- a/com.discord/smali/com/discord/views/LoadingButton.smali
+++ b/com.discord/smali/com/discord/views/LoadingButton.smali
@@ -8,9 +8,7 @@
 
 
 # instance fields
-.field private final Cr:Lkotlin/properties/ReadOnlyProperty;
-
-.field private Da:F
+.field private final Cu:Lkotlin/properties/ReadOnlyProperty;
 
 .field private final progress$delegate:Lkotlin/properties/ReadOnlyProperty;
 
@@ -123,15 +121,15 @@
 
     invoke-direct {p0, p1, p2, p3}, Landroidx/constraintlayout/widget/ConstraintLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 
-    const p3, 0x7f0a0423
+    const p3, 0x7f0a041e
 
     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;->Cr:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p3, p0, Lcom/discord/views/LoadingButton;->Cu:Lkotlin/properties/ReadOnlyProperty;
 
-    const p3, 0x7f0a0422
+    const p3, 0x7f0a041d
 
     invoke-static {p0, p3}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -139,15 +137,11 @@
 
     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, 0x7f0d0094
+    const v0, 0x7f0d0092
 
     invoke-static {p1, v0, p3}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
@@ -167,16 +161,14 @@
 
     move-result-object p1
 
-    const/4 p2, 0x2
-
     :try_start_0
-    invoke-virtual {p1, p2}, Landroid/content/res/TypedArray;->getString(I)Ljava/lang/String;
+    invoke-virtual {p1, p3}, 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, 0x3
+    const/4 p2, 0x2
 
     invoke-virtual {p1, p2}, Landroid/content/res/TypedArray;->getColorStateList(I)Landroid/content/res/ColorStateList;
 
@@ -186,34 +178,24 @@
 
     invoke-direct {p0}, Lcom/discord/views/LoadingButton;->getTextView()Landroid/widget/TextView;
 
-    move-result-object v0
+    move-result-object p3
 
-    invoke-virtual {v0, p2}, Landroid/widget/TextView;->setTextColor(Landroid/content/res/ColorStateList;)V
+    invoke-virtual {p3, p2}, Landroid/widget/TextView;->setTextColor(Landroid/content/res/ColorStateList;)V
 
     :cond_0
     const p2, 0x7fffffff
 
-    invoke-virtual {p1, p3, p2}, Landroid/content/res/TypedArray;->getColor(II)I
+    invoke-virtual {p1, v1, 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
@@ -251,28 +233,6 @@
     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
 
@@ -296,7 +256,7 @@
 .method private final getTextView()Landroid/widget/TextView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/views/LoadingButton;->Cr:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/views/LoadingButton;->Cu:Lkotlin/properties/ReadOnlyProperty;
 
     sget-object v1, Lcom/discord/views/LoadingButton;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -377,8 +337,6 @@
 
     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 e155183b80..e380f93c9c 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 DE:I
+.field final DG: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;->DE:I
+    iput p1, p0, Lcom/discord/views/OverlayMenuView$a;->DG: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;->DE:I
+    iget v1, p0, Lcom/discord/views/OverlayMenuView$a;->DG:I
 
-    iget v3, p1, Lcom/discord/views/OverlayMenuView$a;->DE:I
+    iget v3, p1, Lcom/discord/views/OverlayMenuView$a;->DG: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;->DE:I
+    iget v0, p0, Lcom/discord/views/OverlayMenuView$a;->DG: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;->DE:I
+    iget v1, p0, Lcom/discord/views/OverlayMenuView$a;->DG: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 8e4e28516d..fc956d0797 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 DF:Lcom/discord/views/OverlayMenuView$b$1;
+.field public static final DH: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;->DF:Lcom/discord/views/OverlayMenuView$b$1;
+    sput-object v0, Lcom/discord/views/OverlayMenuView$b$1;->DH: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 8c04557d65..6f2882ef53 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 DG:Lcom/discord/views/OverlayMenuView$b$2;
+.field public static final DI: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;->DG:Lcom/discord/views/OverlayMenuView$b$2;
+    sput-object v0, Lcom/discord/views/OverlayMenuView$b$2;->DI: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 72f1352c5e..8b34f718b9 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, 0x7f120a18
+    const v0, 0x7f1209e2
 
     invoke-static {p1, v0}, Lcom/discord/app/h;->c(Landroid/content/Context;I)V
 
-    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 0a783db458..5525a1b6d1 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, 0x7f120a8a
+    const v1, 0x7f120a54
 
     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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 c2a36dcdde..56a6393e7e 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;->DF:Lcom/discord/views/OverlayMenuView$b$1;
+    sget-object v0, Lcom/discord/views/OverlayMenuView$b$1;->DH: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;->DG:Lcom/discord/views/OverlayMenuView$b$2;
+    sget-object v0, Lcom/discord/views/OverlayMenuView$b$2;->DI: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 d89bb49eeb..49bd461661 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 DH:Lcom/discord/views/OverlayMenuView$e;
+.field public static final DJ: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;->DH:Lcom/discord/views/OverlayMenuView$e;
+    sput-object v0, Lcom/discord/views/OverlayMenuView$e;->DJ: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 a586f6bcd7..02f50aef3b 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 DI:Lcom/discord/views/OverlayMenuView$f;
+.field public static final DK: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;->DI:Lcom/discord/views/OverlayMenuView$f;
+    sput-object v0, Lcom/discord/views/OverlayMenuView$f;->DK: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 08fffc4dcf..002a1af11d 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 6126f92473..8dd0832c5d 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 DJ:Lcom/discord/views/OverlayMenuView$h;
+.field public static final DL: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;->DJ:Lcom/discord/views/OverlayMenuView$h;
+    sput-object v0, Lcom/discord/views/OverlayMenuView$h;->DL: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 43cb4d3ba0..3d1ab01c70 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;->DE:I
+    iget v1, p1, Lcom/discord/views/OverlayMenuView$a;->DG:I
 
     goto :goto_0
 
     :cond_0
-    const v1, 0x7f0803d8
+    const v1, 0x7f0803ca
 
     :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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 a7eb27c720..92192e8dbb 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 DK:Lcom/discord/views/OverlayMenuView$j;
+.field public static final DN: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;->DK:Lcom/discord/views/OverlayMenuView$j;
+    sput-object v0, Lcom/discord/views/OverlayMenuView$j;->DN: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 8b82cc44b6..87d3827cb7 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 DL:Lcom/discord/views/OverlayMenuView$k;
+.field public static final DO: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;->DL:Lcom/discord/views/OverlayMenuView$k;
+    sput-object v0, Lcom/discord/views/OverlayMenuView$k;->DO: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 6545e289ad..ac644b6528 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 DN:Lcom/discord/views/OverlayMenuView$m;
+.field public static final DQ: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;->DN:Lcom/discord/views/OverlayMenuView$m;
+    sput-object v0, Lcom/discord/views/OverlayMenuView$m;->DQ: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 f8890d0e49..9acea60173 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 2f9695909b..71b7ff0ec0 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 DO:Lcom/discord/views/OverlayMenuView$o;
+.field public static final DR: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;->DO:Lcom/discord/views/OverlayMenuView$o;
+    sput-object v0, Lcom/discord/views/OverlayMenuView$o;->DR: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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 faa3017dde..a6d14169cf 100644
--- a/com.discord/smali/com/discord/views/OverlayMenuView.smali
+++ b/com.discord/smali/com/discord/views/OverlayMenuView.smali
@@ -25,7 +25,11 @@
 
 .field private final DC:Lkotlin/properties/ReadOnlyProperty;
 
-.field private DD:Lkotlin/jvm/functions/Function0;
+.field private final DD:Lkotlin/properties/ReadOnlyProperty;
+
+.field private final DE:Lkotlin/properties/ReadOnlyProperty;
+
+.field private DF:Lkotlin/jvm/functions/Function0;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/jvm/functions/Function0<",
@@ -35,10 +39,6 @@
     .end annotation
 .end field
 
-.field private final Du:Lkotlin/properties/ReadOnlyProperty;
-
-.field private final Dv:Lkotlin/properties/ReadOnlyProperty;
-
 .field private final Dw:Lkotlin/properties/ReadOnlyProperty;
 
 .field private final Dx:Lkotlin/properties/ReadOnlyProperty;
@@ -289,11 +289,11 @@
 
     check-cast v0, Landroid/view/ViewGroup;
 
-    const v1, 0x7f0d0098
+    const v1, 0x7f0d0096
 
     invoke-static {p1, v1, v0}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
-    invoke-static {}, Lrx/subjects/PublishSubject;->KA()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->Ky()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, 0x7f0a04db
-
-    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;->Du:Lkotlin/properties/ReadOnlyProperty;
-
-    const p1, 0x7f0a04d4
-
-    invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Dv:Lkotlin/properties/ReadOnlyProperty;
-
-    const p1, 0x7f0a04d3
+    const p1, 0x7f0a04ce
 
     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;->Dw:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a04d6
+    const p1, 0x7f0a04c7
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -337,7 +321,7 @@
 
     iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Dx:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a04dd
+    const p1, 0x7f0a04c6
 
     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;->Dy:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a04dc
+    const p1, 0x7f0a04c9
 
     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;->Dz:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0732
+    const p1, 0x7f0a04d0
 
     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;->DA:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a048e
+    const p1, 0x7f0a04cf
 
     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;->DB:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0285
+    const p1, 0x7f0a0713
 
     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;->DC:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object p1, Lcom/discord/views/OverlayMenuView$o;->DO:Lcom/discord/views/OverlayMenuView$o;
+    const p1, 0x7f0a0481
+
+    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;->DD:Lkotlin/properties/ReadOnlyProperty;
+
+    const p1, 0x7f0a0284
+
+    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;->DE:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object p1, Lcom/discord/views/OverlayMenuView$o;->DR:Lcom/discord/views/OverlayMenuView$o;
 
     check-cast p1, Lkotlin/jvm/functions/Function0;
 
-    iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->DD:Lkotlin/jvm/functions/Function0;
+    iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->DF:Lkotlin/jvm/functions/Function0;
 
     return-void
 .end method
@@ -403,11 +403,11 @@
 
     check-cast p2, Landroid/view/ViewGroup;
 
-    const v0, 0x7f0d0098
+    const v0, 0x7f0d0096
 
     invoke-static {p1, v0, p2}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
-    invoke-static {}, Lrx/subjects/PublishSubject;->KA()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->Ky()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, 0x7f0a04db
-
-    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;->Du:Lkotlin/properties/ReadOnlyProperty;
-
-    const p1, 0x7f0a04d4
-
-    invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Dv:Lkotlin/properties/ReadOnlyProperty;
-
-    const p1, 0x7f0a04d3
+    const p1, 0x7f0a04ce
 
     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;->Dw:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a04d6
+    const p1, 0x7f0a04c7
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -451,7 +435,7 @@
 
     iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Dx:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a04dd
+    const p1, 0x7f0a04c6
 
     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;->Dy:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a04dc
+    const p1, 0x7f0a04c9
 
     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;->Dz:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0732
+    const p1, 0x7f0a04d0
 
     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;->DA:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a048e
+    const p1, 0x7f0a04cf
 
     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;->DB:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0285
+    const p1, 0x7f0a0713
 
     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;->DC:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object p1, Lcom/discord/views/OverlayMenuView$o;->DO:Lcom/discord/views/OverlayMenuView$o;
+    const p1, 0x7f0a0481
+
+    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;->DD:Lkotlin/properties/ReadOnlyProperty;
+
+    const p1, 0x7f0a0284
+
+    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;->DE:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object p1, Lcom/discord/views/OverlayMenuView$o;->DR:Lcom/discord/views/OverlayMenuView$o;
 
     check-cast p1, Lkotlin/jvm/functions/Function0;
 
-    iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->DD:Lkotlin/jvm/functions/Function0;
+    iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->DF:Lkotlin/jvm/functions/Function0;
 
     return-void
 .end method
@@ -517,11 +517,11 @@
 
     check-cast p2, Landroid/view/ViewGroup;
 
-    const p3, 0x7f0d0098
+    const p3, 0x7f0d0096
 
     invoke-static {p1, p3, p2}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
-    invoke-static {}, Lrx/subjects/PublishSubject;->KA()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->Ky()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, 0x7f0a04db
-
-    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;->Du:Lkotlin/properties/ReadOnlyProperty;
-
-    const p1, 0x7f0a04d4
-
-    invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Dv:Lkotlin/properties/ReadOnlyProperty;
-
-    const p1, 0x7f0a04d3
+    const p1, 0x7f0a04ce
 
     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;->Dw:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a04d6
+    const p1, 0x7f0a04c7
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -565,7 +549,7 @@
 
     iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Dx:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a04dd
+    const p1, 0x7f0a04c6
 
     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;->Dy:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a04dc
+    const p1, 0x7f0a04c9
 
     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;->Dz:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0732
+    const p1, 0x7f0a04d0
 
     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;->DA:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a048e
+    const p1, 0x7f0a04cf
 
     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;->DB:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0285
+    const p1, 0x7f0a0713
 
     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;->DC:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object p1, Lcom/discord/views/OverlayMenuView$o;->DO:Lcom/discord/views/OverlayMenuView$o;
+    const p1, 0x7f0a0481
+
+    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;->DD:Lkotlin/properties/ReadOnlyProperty;
+
+    const p1, 0x7f0a0284
+
+    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;->DE:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object p1, Lcom/discord/views/OverlayMenuView$o;->DR:Lcom/discord/views/OverlayMenuView$o;
 
     check-cast p1, Lkotlin/jvm/functions/Function0;
 
-    iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->DD:Lkotlin/jvm/functions/Function0;
+    iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->DF: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;->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;
 
@@ -697,7 +697,7 @@
 .method private final getDisconnectBtn()Landroid/widget/ImageView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/views/OverlayMenuView;->DC:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/views/OverlayMenuView;->DE: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;->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;
 
@@ -737,7 +737,7 @@
 .method private final getInviteLinkBtn()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;
 
@@ -757,7 +757,7 @@
 .method private final getMuteToggle()Landroid/widget/ImageView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/views/OverlayMenuView;->DB:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/views/OverlayMenuView;->DD: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;->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;
 
@@ -797,7 +797,7 @@
 .method private final getOpenAppBtn()Landroid/view/View;
     .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;
 
@@ -817,7 +817,7 @@
 .method private final getSrcToggle()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;
 
@@ -837,7 +837,7 @@
 .method private final getSwitchChannelBtn()Landroid/view/View;
     .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;
 
@@ -867,7 +867,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/discord/views/OverlayMenuView;->DD:Lkotlin/jvm/functions/Function0;
+    iget-object v0, p0, Lcom/discord/views/OverlayMenuView;->DF: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;->DJ:Lcom/discord/views/OverlayMenuView$h;
+    sget-object v4, Lcom/discord/views/OverlayMenuView$h;->DL: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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v4
 
@@ -980,7 +980,7 @@
 
     move-result-object v0
 
-    sget-object v5, Lcom/discord/views/OverlayMenuView$j;->DK:Lcom/discord/views/OverlayMenuView$j;
+    sget-object v5, Lcom/discord/views/OverlayMenuView$j;->DN: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;->DL:Lcom/discord/views/OverlayMenuView$k;
+    sget-object v5, Lcom/discord/views/OverlayMenuView$k;->DO: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;->DN:Lcom/discord/views/OverlayMenuView$m;
+    sget-object v6, Lcom/discord/views/OverlayMenuView$m;->DQ: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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v5
 
@@ -1119,7 +1119,7 @@
 
     move-result-object v0
 
-    sget-object v4, Lcom/discord/views/OverlayMenuView$e;->DH:Lcom/discord/views/OverlayMenuView$e;
+    sget-object v4, Lcom/discord/views/OverlayMenuView$e;->DJ: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;->DI:Lcom/discord/views/OverlayMenuView$f;
+    sget-object v4, Lcom/discord/views/OverlayMenuView$f;->DK: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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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;->DD:Lkotlin/jvm/functions/Function0;
+    iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->DF: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 0fe21602ca..8fa01977ab 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 DX:Ljava/util/List;
+.field private DZ: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;->DX:Ljava/util/List;
+    iput-object v0, p0, Lcom/discord/views/RadioManager;->DZ:Ljava/util/List;
 
     const/4 v0, 0x0
 
@@ -82,7 +82,7 @@
 
     :cond_1
     :goto_1
-    iget-object v4, p0, Lcom/discord/views/RadioManager;->DX:Ljava/util/List;
+    iget-object v4, p0, Lcom/discord/views/RadioManager;->DZ: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;->DX:Ljava/util/List;
+    iget-object v2, p0, Lcom/discord/views/RadioManager;->DZ: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;->DX:Ljava/util/List;
+    iget-object v2, p0, Lcom/discord/views/RadioManager;->DZ: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 fh()I
+.method public final ff()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;->DX:Ljava/util/List;
+    iget-object v2, p0, Lcom/discord/views/RadioManager;->DZ: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;->DX:Ljava/util/List;
+    iget-object v2, p0, Lcom/discord/views/RadioManager;->DZ: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 fi()Landroid/widget/Checkable;
+.method public final fg()Landroid/widget/Checkable;
     .locals 2
 
-    iget-object v0, p0, Lcom/discord/views/RadioManager;->DX:Ljava/util/List;
+    iget-object v0, p0, Lcom/discord/views/RadioManager;->DZ:Ljava/util/List;
 
-    invoke-virtual {p0}, Lcom/discord/views/RadioManager;->fh()I
+    invoke-virtual {p0}, Lcom/discord/views/RadioManager;->ff()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 31a8e86e78..e793931391 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 Eh:Lcom/discord/views/ServerFolderView;
+.field final synthetic Ej:Lcom/discord/views/ServerFolderView;
 
 
 # direct methods
@@ -30,7 +30,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/discord/views/ServerFolderView$a;->Eh:Lcom/discord/views/ServerFolderView;
+    iput-object p1, p0, Lcom/discord/views/ServerFolderView$a;->Ej: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;->Eh:Lcom/discord/views/ServerFolderView;
+    iget-object p1, p0, Lcom/discord/views/ServerFolderView$a;->Ej: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 300f55cbdf..784e58c531 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 Ed:Lkotlin/properties/ReadOnlyProperty;
-
-.field private final Ee:Lkotlin/properties/ReadOnlyProperty;
-
 .field private final Ef:Lkotlin/properties/ReadOnlyProperty;
 
-.field private Eg:Landroid/view/animation/Animation;
+.field private final Eg:Lkotlin/properties/ReadOnlyProperty;
+
+.field private final Eh:Lkotlin/properties/ReadOnlyProperty;
+
+.field private Ei: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, 0x7f0a02f1
+    const p2, 0x7f0a02f0
 
     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;->Ed:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p2, p0, Lcom/discord/views/ServerFolderView;->Ef:Lkotlin/properties/ReadOnlyProperty;
 
-    const p2, 0x7f0a0382
+    const p2, 0x7f0a037d
 
     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;->Ee:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p2, p0, Lcom/discord/views/ServerFolderView;->Eg: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;->bnc:Lkotterknife/b$d;
+    sget-object p3, Lkotterknife/b$d;->bmX: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;->Ef:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p2, p0, Lcom/discord/views/ServerFolderView;->Eh:Lkotlin/properties/ReadOnlyProperty;
 
     move-object p2, p0
 
     check-cast p2, Landroid/view/ViewGroup;
 
-    const p3, 0x7f0d00a0
+    const p3, 0x7f0d009e
 
     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
-        0x7f0a037c
-        0x7f0a037d
-        0x7f0a037e
-        0x7f0a037f
+        0x7f0a0377
+        0x7f0a0378
+        0x7f0a0379
+        0x7f0a037a
     .end array-data
 .end method
 
@@ -243,9 +243,9 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/discord/views/ServerFolderView;->Eg:Landroid/view/animation/Animation;
+    iput-object v0, p0, Lcom/discord/views/ServerFolderView;->Ei:Landroid/view/animation/Animation;
 
-    invoke-virtual {p0}, Lcom/discord/views/ServerFolderView;->fj()V
+    invoke-virtual {p0}, Lcom/discord/views/ServerFolderView;->fh()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;->Ee:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/views/ServerFolderView;->Eg: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;->Eg:Landroid/view/animation/Animation;
+    iput-object p1, p0, Lcom/discord/views/ServerFolderView;->Ei: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 fj()V
+.method public final fh()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;->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;
 
@@ -388,7 +388,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/discord/views/ServerFolderView;->Ef:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/views/ServerFolderView;->Eh: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 af8658e899..e26b0ca5cc 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 Es:Lcom/discord/views/TernaryCheckBox;
+.field final synthetic Eu: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;->Es:Lcom/discord/views/TernaryCheckBox;
+    iput-object p1, p0, Lcom/discord/views/TernaryCheckBox$c;->Eu: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;->Es:Lcom/discord/views/TernaryCheckBox;
+    iget-object p1, p0, Lcom/discord/views/TernaryCheckBox$c;->Eu:Lcom/discord/views/TernaryCheckBox;
 
-    invoke-static {}, Lcom/discord/views/TernaryCheckBox;->fn()Lcom/discord/views/TernaryCheckBox$a;
+    invoke-static {}, Lcom/discord/views/TernaryCheckBox;->fl()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 a459b27b66..db167be11b 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 Es:Lcom/discord/views/TernaryCheckBox;
+.field final synthetic Eu: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;->Es:Lcom/discord/views/TernaryCheckBox;
+    iput-object p1, p0, Lcom/discord/views/TernaryCheckBox$d;->Eu: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;->Es:Lcom/discord/views/TernaryCheckBox;
+    iget-object p1, p0, Lcom/discord/views/TernaryCheckBox$d;->Eu:Lcom/discord/views/TernaryCheckBox;
 
-    invoke-static {}, Lcom/discord/views/TernaryCheckBox;->fn()Lcom/discord/views/TernaryCheckBox$a;
+    invoke-static {}, Lcom/discord/views/TernaryCheckBox;->fl()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 83a7036578..d4c8574122 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 Es:Lcom/discord/views/TernaryCheckBox;
+.field final synthetic Eu: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;->Es:Lcom/discord/views/TernaryCheckBox;
+    iput-object p1, p0, Lcom/discord/views/TernaryCheckBox$e;->Eu: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;->Es:Lcom/discord/views/TernaryCheckBox;
+    iget-object p1, p0, Lcom/discord/views/TernaryCheckBox$e;->Eu:Lcom/discord/views/TernaryCheckBox;
 
-    invoke-static {}, Lcom/discord/views/TernaryCheckBox;->fn()Lcom/discord/views/TernaryCheckBox$a;
+    invoke-static {}, Lcom/discord/views/TernaryCheckBox;->fl()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 f7d2613a1d..4a6f014695 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 Es:Lcom/discord/views/TernaryCheckBox;
+.field final synthetic Eu:Lcom/discord/views/TernaryCheckBox;
 
-.field final synthetic Et:Ljava/lang/String;
+.field final synthetic Ev: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;->Es:Lcom/discord/views/TernaryCheckBox;
+    iput-object p1, p0, Lcom/discord/views/TernaryCheckBox$f;->Eu:Lcom/discord/views/TernaryCheckBox;
 
-    iput-object p2, p0, Lcom/discord/views/TernaryCheckBox$f;->Et:Ljava/lang/String;
+    iput-object p2, p0, Lcom/discord/views/TernaryCheckBox$f;->Ev: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;->Es:Lcom/discord/views/TernaryCheckBox;
+    iget-object p1, p0, Lcom/discord/views/TernaryCheckBox$f;->Eu: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;->Et:Ljava/lang/String;
+    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox$f;->Ev: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 843ed45db2..c8e79ada24 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 Es:Lcom/discord/views/TernaryCheckBox;
+.field final synthetic Eu:Lcom/discord/views/TernaryCheckBox;
 
-.field final synthetic Et:Ljava/lang/String;
+.field final synthetic Ev: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;->Es:Lcom/discord/views/TernaryCheckBox;
+    iput-object p1, p0, Lcom/discord/views/TernaryCheckBox$g;->Eu:Lcom/discord/views/TernaryCheckBox;
 
-    iput-object p2, p0, Lcom/discord/views/TernaryCheckBox$g;->Et:Ljava/lang/String;
+    iput-object p2, p0, Lcom/discord/views/TernaryCheckBox$g;->Ev: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;->Es:Lcom/discord/views/TernaryCheckBox;
+    iget-object p1, p0, Lcom/discord/views/TernaryCheckBox$g;->Eu: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;->Et:Ljava/lang/String;
+    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox$g;->Ev: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 be24926af8..8c3ddb4563 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 Er:Lcom/discord/views/TernaryCheckBox$a;
+.field public static final Et:Lcom/discord/views/TernaryCheckBox$a;
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
 
 # instance fields
-.field private Cz:Landroid/widget/TextView;
-
-.field private Ei:Lcom/discord/views/CheckableImageView;
-
-.field private Ej:Lcom/discord/views/CheckableImageView;
+.field private CC:Landroid/widget/TextView;
 
 .field private Ek:Lcom/discord/views/CheckableImageView;
 
-.field private El:Landroid/view/View;
+.field private El:Lcom/discord/views/CheckableImageView;
 
-.field private Em:Landroid/view/View;
+.field private Em:Lcom/discord/views/CheckableImageView;
 
-.field private En:Ljava/lang/String;
+.field private En:Landroid/view/View;
 
-.field private Eo:Ljava/lang/String;
+.field private Eo:Landroid/view/View;
 
-.field private Ep:Lcom/discord/views/TernaryCheckBox$b;
+.field private Ep:Ljava/lang/String;
 
-.field public Eq:I
+.field private Eq:Ljava/lang/String;
+
+.field private Er:Lcom/discord/views/TernaryCheckBox$b;
+
+.field public Es: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;->Er:Lcom/discord/views/TernaryCheckBox$a;
+    sput-object v0, Lcom/discord/views/TernaryCheckBox;->Et:Lcom/discord/views/TernaryCheckBox$a;
 
     return-void
 .end method
@@ -69,7 +69,7 @@
 
     const/4 v0, -0x1
 
-    iput v0, p0, Lcom/discord/views/TernaryCheckBox;->Eq:I
+    iput v0, p0, Lcom/discord/views/TernaryCheckBox;->Es:I
 
     const/4 v0, 0x0
 
@@ -89,7 +89,7 @@
 
     const/4 v0, -0x1
 
-    iput v0, p0, Lcom/discord/views/TernaryCheckBox;->Eq:I
+    iput v0, p0, Lcom/discord/views/TernaryCheckBox;->Es: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;->Eq:I
+    iput p3, p0, Lcom/discord/views/TernaryCheckBox;->Es: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;->En:Ljava/lang/String;
+    iput-object v1, p0, Lcom/discord/views/TernaryCheckBox;->Ep:Ljava/lang/String;
 
     const/4 v1, 0x1
 
@@ -152,7 +152,7 @@
 
     move-result-object v1
 
-    iput-object v1, p0, Lcom/discord/views/TernaryCheckBox;->Eo:Ljava/lang/String;
+    iput-object v1, p0, Lcom/discord/views/TernaryCheckBox;->Eq: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, 0x7f0d00b0
+    const p2, 0x7f0d00ae
 
     move-object v1, p0
 
@@ -179,7 +179,7 @@
 
     move-result-object p1
 
-    const p2, 0x7f0a066e
+    const p2, 0x7f0a0655
 
     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;->Cz:Landroid/widget/TextView;
+    iput-object p2, p0, Lcom/discord/views/TernaryCheckBox;->CC:Landroid/widget/TextView;
 
-    iget-object p2, p0, Lcom/discord/views/TernaryCheckBox;->Cz:Landroid/widget/TextView;
+    iget-object p2, p0, Lcom/discord/views/TernaryCheckBox;->CC: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;->En:Ljava/lang/String;
+    iget-object v2, p0, Lcom/discord/views/TernaryCheckBox;->Ep: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;->Cz:Landroid/widget/TextView;
+    iget-object p2, p0, Lcom/discord/views/TernaryCheckBox;->CC: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;->En:Ljava/lang/String;
+    iget-object v1, p0, Lcom/discord/views/TernaryCheckBox;->Ep:Ljava/lang/String;
 
     check-cast v1, Ljava/lang/CharSequence;
 
     invoke-virtual {p2, v1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    const p2, 0x7f0a066f
+    const p2, 0x7f0a0656
 
     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;->Eo:Ljava/lang/String;
+    iget-object v2, p0, Lcom/discord/views/TernaryCheckBox;->Eq: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;->Eo:Ljava/lang/String;
+    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox;->Eq:Ljava/lang/String;
 
     check-cast v0, Ljava/lang/CharSequence;
 
     invoke-virtual {p2, v0}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    const p2, 0x7f0a066d
+    const p2, 0x7f0a0654
 
     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;->El:Landroid/view/View;
+    iput-object p2, p0, Lcom/discord/views/TernaryCheckBox;->En:Landroid/view/View;
 
-    const p2, 0x7f0a04cf
+    const p2, 0x7f0a04c2
 
     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;->Em:Landroid/view/View;
+    iput-object p2, p0, Lcom/discord/views/TernaryCheckBox;->Eo:Landroid/view/View;
 
-    const p2, 0x7f0a076d
+    const p2, 0x7f0a0745
 
     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;->Ei:Lcom/discord/views/CheckableImageView;
+    iput-object p2, p0, Lcom/discord/views/TernaryCheckBox;->Ek:Lcom/discord/views/CheckableImageView;
 
-    const p2, 0x7f0a076c
+    const p2, 0x7f0a0744
 
     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;->Ej:Lcom/discord/views/CheckableImageView;
+    iput-object p2, p0, Lcom/discord/views/TernaryCheckBox;->El:Lcom/discord/views/CheckableImageView;
 
-    const p2, 0x7f0a076b
+    const p2, 0x7f0a0743
 
     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;->Ek:Lcom/discord/views/CheckableImageView;
+    iput-object p1, p0, Lcom/discord/views/TernaryCheckBox;->Em:Lcom/discord/views/CheckableImageView;
 
-    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_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;->Ej:Lcom/discord/views/CheckableImageView;
+    iget-object p1, p0, Lcom/discord/views/TernaryCheckBox;->El: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;->Ek:Lcom/discord/views/CheckableImageView;
+    iget-object p1, p0, Lcom/discord/views/TernaryCheckBox;->Em:Lcom/discord/views/CheckableImageView;
 
     if-nez p1, :cond_9
 
@@ -399,10 +399,10 @@
     return-void
 .end method
 
-.method public static final synthetic fn()Lcom/discord/views/TernaryCheckBox$a;
+.method public static final synthetic fl()Lcom/discord/views/TernaryCheckBox$a;
     .locals 1
 
-    sget-object v0, Lcom/discord/views/TernaryCheckBox;->Er:Lcom/discord/views/TernaryCheckBox$a;
+    sget-object v0, Lcom/discord/views/TernaryCheckBox;->Et: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;->Ej:Lcom/discord/views/CheckableImageView;
+    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox;->El: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;->Em:Landroid/view/View;
+    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox;->Eo: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;->El:Landroid/view/View;
+    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox;->En: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;->El:Landroid/view/View;
+    iget-object p1, p0, Lcom/discord/views/TernaryCheckBox;->En: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;->Ej:Lcom/discord/views/CheckableImageView;
+    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox;->El: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;->El:Landroid/view/View;
+    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox;->En: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;->Em:Landroid/view/View;
+    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox;->Eo: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;->Em:Landroid/view/View;
+    iget-object p1, p0, Lcom/discord/views/TernaryCheckBox;->Eo:Landroid/view/View;
 
     if-nez p1, :cond_3
 
@@ -527,10 +527,10 @@
 
 
 # virtual methods
-.method public final fk()Z
+.method public final fi()Z
     .locals 2
 
-    iget v0, p0, Lcom/discord/views/TernaryCheckBox;->Eq:I
+    iget v0, p0, Lcom/discord/views/TernaryCheckBox;->Es:I
 
     const/4 v1, 0x1
 
@@ -544,10 +544,10 @@
     return v0
 .end method
 
-.method public final fl()Z
+.method public final fj()Z
     .locals 2
 
-    iget v0, p0, Lcom/discord/views/TernaryCheckBox;->Eq:I
+    iget v0, p0, Lcom/discord/views/TernaryCheckBox;->Es:I
 
     const/4 v1, -0x1
 
@@ -563,10 +563,10 @@
     return v0
 .end method
 
-.method public final fm()V
+.method public final fk()V
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox;->Ej:Lcom/discord/views/CheckableImageView;
+    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox;->El: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;->Em:Landroid/view/View;
+    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox;->Eo: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;->El:Landroid/view/View;
+    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox;->En: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;->Ep:Lcom/discord/views/TernaryCheckBox$b;
+    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox;->Er: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;->Eq:I
+    iget v0, p0, Lcom/discord/views/TernaryCheckBox;->Es: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;->Ep:Lcom/discord/views/TernaryCheckBox$b;
+    iput-object p1, p0, Lcom/discord/views/TernaryCheckBox;->Er: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;->Eq:I
+    iput p1, p0, Lcom/discord/views/TernaryCheckBox;->Es:I
 
-    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_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;->Ej:Lcom/discord/views/CheckableImageView;
+    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox;->El: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;->Ek:Lcom/discord/views/CheckableImageView;
+    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox;->Em: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;->Ep:Lcom/discord/views/TernaryCheckBox$b;
+    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox;->Er: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 e190abdaa4..2490bfea1a 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 Eu:Lkotlin/properties/ReadOnlyProperty;
+.field private final Ew:Lkotlin/properties/ReadOnlyProperty;
 
-.field private final Ev:Lkotlin/properties/ReadOnlyProperty;
+.field private final Ex: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, 0x7f0a0783
+    const p1, 0x7f0a075b
 
     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, 0x7f0a0784
+    const p1, 0x7f0a075c
 
     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;->Eu:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/views/ToolbarTitleLayout;->Ew:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0782
+    const p1, 0x7f0a075a
 
     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;->Ev:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/views/ToolbarTitleLayout;->Ex: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;->Eu:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/views/ToolbarTitleLayout;->Ew:Lkotlin/properties/ReadOnlyProperty;
 
     sget-object v1, Lcom/discord/views/ToolbarTitleLayout;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -174,7 +174,7 @@
 
 
 # virtual methods
-.method public final fa()Landroid/view/ViewGroup;
+.method public final eZ()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, 0x7f0d00b1
+    const v2, 0x7f0d00af
 
     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;->Ev:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/views/ToolbarTitleLayout;->Ex: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 f6eddcfca9..55752506f0 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 Ez:Lcom/discord/views/UploadProgressView$a;
+.field public static final EB:Lcom/discord/views/UploadProgressView$a;
 
 
 # instance fields
-.field private final Ew:Landroid/widget/TextView;
+.field private final EA:Landroid/graphics/drawable/Drawable;
 
-.field private final Ex:Landroid/graphics/drawable/Drawable;
+.field private final Ey:Landroid/widget/TextView;
 
-.field private final Ey:Landroid/graphics/drawable/Drawable;
+.field private final Ez: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;->Ez:Lcom/discord/views/UploadProgressView$a;
+    sput-object v0, Lcom/discord/views/UploadProgressView;->EB:Lcom/discord/views/UploadProgressView$a;
 
     return-void
 .end method
@@ -57,11 +57,11 @@
 
     check-cast v0, Landroid/view/ViewGroup;
 
-    const v1, 0x7f0d00b2
+    const v1, 0x7f0d00b0
 
     invoke-static {p1, v1, v0}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
-    const p1, 0x7f0a0560
+    const p1, 0x7f0a0551
 
     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;->Ew:Landroid/widget/TextView;
+    iput-object p1, p0, Lcom/discord/views/UploadProgressView;->Ey:Landroid/widget/TextView;
 
-    const p1, 0x7f0a055f
+    const p1, 0x7f0a0550
 
     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, 0x7f0a0559
+    const p1, 0x7f0a054a
 
     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, 0x7f0a055d
+    const p1, 0x7f0a054e
 
     invoke-virtual {p0, p1}, Lcom/discord/views/UploadProgressView;->findViewById(I)Landroid/view/View;
 
@@ -121,7 +121,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f0402cb
+    const v0, 0x7f0402ca
 
     const/4 v1, 0x0
 
@@ -137,19 +137,19 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/views/UploadProgressView;->Ey:Landroid/graphics/drawable/Drawable;
+    iput-object p1, p0, Lcom/discord/views/UploadProgressView;->EA:Landroid/graphics/drawable/Drawable;
 
     invoke-virtual {p0}, Lcom/discord/views/UploadProgressView;->getContext()Landroid/content/Context;
 
     move-result-object p1
 
-    const v0, 0x7f080147
+    const v0, 0x7f080143
 
     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;->Ex:Landroid/graphics/drawable/Drawable;
+    iput-object p1, p0, Lcom/discord/views/UploadProgressView;->Ez:Landroid/graphics/drawable/Drawable;
 
     return-void
 .end method
@@ -167,11 +167,11 @@
 
     check-cast p2, Landroid/view/ViewGroup;
 
-    const v0, 0x7f0d00b2
+    const v0, 0x7f0d00b0
 
     invoke-static {p1, v0, p2}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
-    const p1, 0x7f0a0560
+    const p1, 0x7f0a0551
 
     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;->Ew:Landroid/widget/TextView;
+    iput-object p1, p0, Lcom/discord/views/UploadProgressView;->Ey:Landroid/widget/TextView;
 
-    const p1, 0x7f0a055f
+    const p1, 0x7f0a0550
 
     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, 0x7f0a0559
+    const p1, 0x7f0a054a
 
     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, 0x7f0a055d
+    const p1, 0x7f0a054e
 
     invoke-virtual {p0, p1}, Lcom/discord/views/UploadProgressView;->findViewById(I)Landroid/view/View;
 
@@ -231,7 +231,7 @@
 
     move-result-object p1
 
-    const p2, 0x7f0402cb
+    const p2, 0x7f0402ca
 
     const/4 v0, 0x0
 
@@ -247,19 +247,19 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/views/UploadProgressView;->Ey:Landroid/graphics/drawable/Drawable;
+    iput-object p1, p0, Lcom/discord/views/UploadProgressView;->EA:Landroid/graphics/drawable/Drawable;
 
     invoke-virtual {p0}, Lcom/discord/views/UploadProgressView;->getContext()Landroid/content/Context;
 
     move-result-object p1
 
-    const p2, 0x7f080147
+    const p2, 0x7f080143
 
     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;->Ex:Landroid/graphics/drawable/Drawable;
+    iput-object p1, p0, Lcom/discord/views/UploadProgressView;->Ez:Landroid/graphics/drawable/Drawable;
 
     return-void
 .end method
@@ -281,11 +281,11 @@
 
     check-cast p2, Landroid/view/ViewGroup;
 
-    const p3, 0x7f0d00b2
+    const p3, 0x7f0d00b0
 
     invoke-static {p1, p3, p2}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
-    const p1, 0x7f0a0560
+    const p1, 0x7f0a0551
 
     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;->Ew:Landroid/widget/TextView;
+    iput-object p1, p0, Lcom/discord/views/UploadProgressView;->Ey:Landroid/widget/TextView;
 
-    const p1, 0x7f0a055f
+    const p1, 0x7f0a0550
 
     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, 0x7f0a0559
+    const p1, 0x7f0a054a
 
     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, 0x7f0a055d
+    const p1, 0x7f0a054e
 
     invoke-virtual {p0, p1}, Lcom/discord/views/UploadProgressView;->findViewById(I)Landroid/view/View;
 
@@ -345,7 +345,7 @@
 
     move-result-object p1
 
-    const p2, 0x7f0402cb
+    const p2, 0x7f0402ca
 
     const/4 p3, 0x0
 
@@ -361,19 +361,19 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/views/UploadProgressView;->Ey:Landroid/graphics/drawable/Drawable;
+    iput-object p1, p0, Lcom/discord/views/UploadProgressView;->EA:Landroid/graphics/drawable/Drawable;
 
     invoke-virtual {p0}, Lcom/discord/views/UploadProgressView;->getContext()Landroid/content/Context;
 
     move-result-object p1
 
-    const p2, 0x7f080147
+    const p2, 0x7f080143
 
     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;->Ex:Landroid/graphics/drawable/Drawable;
+    iput-object p1, p0, Lcom/discord/views/UploadProgressView;->Ez: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;->Ew:Landroid/widget/TextView;
+    iget-object v0, p0, Lcom/discord/views/UploadProgressView;->Ey: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;->Ex:Landroid/graphics/drawable/Drawable;
+    iget-object p2, p0, Lcom/discord/views/UploadProgressView;->Ez:Landroid/graphics/drawable/Drawable;
 
     goto :goto_2
 
     :cond_2
-    iget-object p2, p0, Lcom/discord/views/UploadProgressView;->Ey:Landroid/graphics/drawable/Drawable;
+    iget-object p2, p0, Lcom/discord/views/UploadProgressView;->EA: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 e134786dd4..f7e80e13b9 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/widget/TextView;
+.field public final EC:Landroid/widget/TextView;
 
-.field public final EB:Landroid/widget/ImageView;
+.field public final ED:Landroid/widget/ImageView;
 
-.field public final EC:Landroid/view/View;
+.field public final EE:Landroid/view/View;
 
 .field public final userAvatar:Landroid/widget/ImageView;
 
@@ -77,13 +77,13 @@
 
     check-cast p3, Landroid/view/ViewGroup;
 
-    const v0, 0x7f0d00b4
+    const v0, 0x7f0d00b2
 
     invoke-virtual {p1, v0, p3, p2}, Landroid/view/LayoutInflater;->inflate(ILandroid/view/ViewGroup;Z)Landroid/view/View;
 
     move-result-object p1
 
-    const p2, 0x7f0a07b9
+    const p2, 0x7f0a078c
 
     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, 0x7f0a07ba
+    const p2, 0x7f0a078d
 
     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, 0x7f0a07bb
+    const p2, 0x7f0a078e
 
     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;->EA:Landroid/widget/TextView;
+    iput-object p2, p0, Lcom/discord/views/UserListItemView;->EC:Landroid/widget/TextView;
 
-    const p2, 0x7f0a07bd
+    const p2, 0x7f0a0790
 
     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;->EC:Landroid/view/View;
+    iput-object p2, p0, Lcom/discord/views/UserListItemView;->EE:Landroid/view/View;
 
-    const p2, 0x7f0a07bc
+    const p2, 0x7f0a078f
 
     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;->EB:Landroid/widget/ImageView;
+    iput-object p1, p0, Lcom/discord/views/UserListItemView;->ED: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 3d7ebcb421..a274b8523c 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 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 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;
+.field public static final enum EL:Lcom/discord/views/VoiceUserView$a;
+
+.field public static final enum EM:Lcom/discord/views/VoiceUserView$a;
+
+.field private static final synthetic EN:[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;->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
 
@@ -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;->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
 
@@ -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;->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
 
@@ -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;->EJ:Lcom/discord/views/VoiceUserView$a;
+    sput-object v1, Lcom/discord/views/VoiceUserView$a;->EL: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;->EK:Lcom/discord/views/VoiceUserView$a;
+    sput-object v1, Lcom/discord/views/VoiceUserView$a;->EM:Lcom/discord/views/VoiceUserView$a;
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lcom/discord/views/VoiceUserView$a;->EL:[Lcom/discord/views/VoiceUserView$a;
+    sput-object v0, Lcom/discord/views/VoiceUserView$a;->EN:[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;->EL:[Lcom/discord/views/VoiceUserView$a;
+    sget-object v0, Lcom/discord/views/VoiceUserView$a;->EN:[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 6ccb901973..4832b27906 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;->EJ:Lcom/discord/views/VoiceUserView$a;
+    sget-object v1, Lcom/discord/views/VoiceUserView$a;->EL: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 71cf8bfeaa..872315863a 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 2b84c2a8e2..ab54414722 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 ED:Lcom/discord/views/VoiceUserView$a;
+.field private EF:Lcom/discord/views/VoiceUserView$a;
 
-.field private final EE:Lcom/discord/utilities/anim/RingAnimator;
+.field private final EG:Lcom/discord/utilities/anim/RingAnimator;
 
-.field private EF:Lcom/discord/models/domain/ModelVoice$User;
+.field private EH: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, 0x7f0a0853
+    const p3, 0x7f0a0819
 
     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, 0x7f0a085a
+    const p3, 0x7f0a081f
 
     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;->EE:Lcom/discord/utilities/anim/RingAnimator;
+    iput-object p3, p0, Lcom/discord/views/VoiceUserView;->EG:Lcom/discord/utilities/anim/RingAnimator;
 
     move-object p3, p0
 
     check-cast p3, Landroid/view/ViewGroup;
 
-    const v0, 0x7f0d00b7
+    const v0, 0x7f0d00b5
 
     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;->ED:Lcom/discord/views/VoiceUserView$a;
+    iget-object p0, p0, Lcom/discord/views/VoiceUserView;->EF: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;->EH:Lcom/discord/views/VoiceUserView$a;
+    sget-object p1, Lcom/discord/views/VoiceUserView$a;->EJ: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;->EJ:Lcom/discord/views/VoiceUserView$a;
+    sget-object p1, Lcom/discord/views/VoiceUserView$a;->EL: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;->EK:Lcom/discord/views/VoiceUserView$a;
+    sget-object p1, Lcom/discord/views/VoiceUserView$a;->EM: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;->EI:Lcom/discord/views/VoiceUserView$a;
+    sget-object p1, Lcom/discord/views/VoiceUserView$a;->EK:Lcom/discord/views/VoiceUserView$a;
 
     goto :goto_1
 
     :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_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;->ED:Lcom/discord/views/VoiceUserView$a;
+    iget-object v0, p0, Lcom/discord/views/VoiceUserView;->EF:Lcom/discord/views/VoiceUserView$a;
 
     if-ne p1, v0, :cond_0
 
     return-void
 
     :cond_0
-    iput-object p1, p0, Lcom/discord/views/VoiceUserView;->ED:Lcom/discord/views/VoiceUserView$a;
+    iput-object p1, p0, Lcom/discord/views/VoiceUserView;->EF: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, 0x7f080196
+    const v0, 0x7f08018b
 
     goto :goto_0
 
     :cond_2
-    const v0, 0x7f080197
+    const v0, 0x7f08018c
 
     :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;->EE:Lcom/discord/utilities/anim/RingAnimator;
+    iget-object p1, p0, Lcom/discord/views/VoiceUserView;->EG: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;->EF:Lcom/discord/models/domain/ModelVoice$User;
+    iget-object v0, p0, Lcom/discord/views/VoiceUserView;->EH: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;->EF:Lcom/discord/models/domain/ModelVoice$User;
+    iput-object p1, p0, Lcom/discord/views/VoiceUserView;->EH: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 850e5b7a7a..7e044721bb 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;->eZ()[I
+    invoke-static {}, Lcom/discord/views/CheckedSetting$b;->eY()[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;->CC:I
+    sget v1, Lcom/discord/views/CheckedSetting$b;->CF: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;->CD:I
+    sget v1, Lcom/discord/views/CheckedSetting$b;->CG: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;->CE:I
+    sget v1, Lcom/discord/views/CheckedSetting$b;->CH: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 7b7488e0ce..b6b243d303 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 Dd:Lcom/discord/views/b$a;
+.field final synthetic Df: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;->Dd:Lcom/discord/views/b$a;
+    iput-object p1, p0, Lcom/discord/views/b$a$1;->Df: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;->Dd:Lcom/discord/views/b$a;
+    iget-object v0, p0, Lcom/discord/views/b$a$1;->Df: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 6af8d63ce9..157bd841a2 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 Dd:Lcom/discord/views/b$a;
+.field final synthetic Df: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;->Dd:Lcom/discord/views/b$a;
+    iput-object p1, p0, Lcom/discord/views/b$a$2;->Df: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;->Dd:Lcom/discord/views/b$a;
+    iget-object v0, p0, Lcom/discord/views/b$a$2;->Df: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 8230f30d0c..6c74197c83 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 Dd:Lcom/discord/views/b$a;
+.field final synthetic Df: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;->Dd:Lcom/discord/views/b$a;
+    iput-object p1, p0, Lcom/discord/views/b$a$3;->Df: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;->Dd:Lcom/discord/views/b$a;
+    iget-object v0, p0, Lcom/discord/views/b$a$3;->Df: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 e39e9b06c9..be4f17a201 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 Dd:Lcom/discord/views/b$a;
+.field final synthetic Df: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;->Dd:Lcom/discord/views/b$a;
+    iput-object p1, p0, Lcom/discord/views/b$a$4;->Df: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;->Dd:Lcom/discord/views/b$a;
+    iget-object v0, p0, Lcom/discord/views/b$a$4;->Df: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 1b2625af5f..6ea437071f 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 Dd:Lcom/discord/views/b$a;
+.field final synthetic Df: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;->Dd:Lcom/discord/views/b$a;
+    iput-object p1, p0, Lcom/discord/views/b$a$5;->Df: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;->Dd:Lcom/discord/views/b$a;
+    iget-object v0, p0, Lcom/discord/views/b$a$5;->Df: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 d40ac92819..ce445405bb 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 Dc:Lcom/discord/views/b;
+.field private final De: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;->Dc:Lcom/discord/views/b;
+    iput-object p1, p0, Lcom/discord/views/b$a;->De:Lcom/discord/views/b;
 
-    iget-object p1, p0, Lcom/discord/views/b$a;->Dc:Lcom/discord/views/b;
+    iget-object p1, p0, Lcom/discord/views/b$a;->De: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;->Dc:Lcom/discord/views/b;
+    iput-object p1, p0, Lcom/discord/views/b$a;->De:Lcom/discord/views/b;
 
-    iget-object p1, p0, Lcom/discord/views/b$a;->Dc:Lcom/discord/views/b;
+    iget-object p1, p0, Lcom/discord/views/b$a;->De: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;->Dc:Lcom/discord/views/b;
+    iput-object p1, p0, Lcom/discord/views/b$a;->De:Lcom/discord/views/b;
 
-    iget-object p1, p0, Lcom/discord/views/b$a;->Dc:Lcom/discord/views/b;
+    iget-object p1, p0, Lcom/discord/views/b$a;->De: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;->Dc:Lcom/discord/views/b;
+    iget-object v0, p0, Lcom/discord/views/b$a;->De: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;->Db:Landroid/view/ViewGroup;
+    iget-object v0, v0, Lcom/discord/views/b;->Dd: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;->Dc:Lcom/discord/views/b;
+    iget-object v0, p0, Lcom/discord/views/b$a;->De: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;->Db:Landroid/view/ViewGroup;
+    iget-object v0, v0, Lcom/discord/views/b;->Dd: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;->Dc:Lcom/discord/views/b;
+    iget-object v0, p0, Lcom/discord/views/b$a;->De: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;->Db:Landroid/view/ViewGroup;
+    iget-object v0, v0, Lcom/discord/views/b;->Dd: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;->Dc:Lcom/discord/views/b;
+    iget-object v0, p0, Lcom/discord/views/b$a;->De: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;->Db:Landroid/view/ViewGroup;
+    iget-object v0, v0, Lcom/discord/views/b;->Dd: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;->Dc:Lcom/discord/views/b;
+    iget-object v0, p0, Lcom/discord/views/b$a;->De: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;->Db:Landroid/view/ViewGroup;
+    iget-object v0, v0, Lcom/discord/views/b;->Dd: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 df5fffe23a..a2f8248e56 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 fa()Landroid/view/ViewGroup;
+.method public abstract eZ()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 79d4fb52f8..f897d2a682 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 Db:Landroid/view/ViewGroup;
+.field Dd: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;->fa()Landroid/view/ViewGroup;
+    invoke-interface {p1}, Lcom/discord/views/b$b;->eZ()Landroid/view/ViewGroup;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/views/b;->Db:Landroid/view/ViewGroup;
+    iput-object p1, p0, Lcom/discord/views/b;->Dd: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 ad34f5fab1..cd46f23cf8 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 Df:Landroid/widget/TextView;
+.field private final Dh:Landroid/widget/TextView;
 
 
 # direct methods
@@ -38,7 +38,7 @@
 
     check-cast p1, Landroid/widget/TextView;
 
-    iput-object p1, p0, Lcom/discord/views/c$a;->Df:Landroid/widget/TextView;
+    iput-object p1, p0, Lcom/discord/views/c$a;->Dh: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;->De:Lcom/discord/views/c;
+    sget-object v0, Lcom/discord/views/c;->Dg:Lcom/discord/views/c;
 
-    iget-object v0, p0, Lcom/discord/views/c$a;->Df:Landroid/widget/TextView;
+    iget-object v0, p0, Lcom/discord/views/c$a;->Dh: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 57ac0f64bc..eb5376f22b 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;->fc()Lcom/discord/utilities/views/SimpleRecyclerAdapter;
+    value = Lcom/discord/views/c;->fa()Lcom/discord/utilities/views/SimpleRecyclerAdapter;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -29,7 +29,7 @@
 
 
 # static fields
-.field public static final Dg:Lcom/discord/views/c$b;
+.field public static final Di: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;->Dg:Lcom/discord/views/c$b;
+    sput-object v0, Lcom/discord/views/c$b;->Di:Lcom/discord/views/c$b;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/views/c$c.smali b/com.discord/smali/com/discord/views/c$c.smali
index 19e6103dc3..62db1094e9 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 Dh:Lcom/discord/views/c$c;
+.field public static final Dj: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;->Dh:Lcom/discord/views/c$c;
+    sput-object v0, Lcom/discord/views/c$c;->Dj: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 57c40365eb..06cf107c1d 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 Di:Lcom/discord/views/c$d;
+.field public static final Dk: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;->Di:Lcom/discord/views/c$d;
+    sput-object v0, Lcom/discord/views/c$d;->Dk: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 1faaa1e5ad..a962c83fcf 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 De:Lcom/discord/views/c;
+.field public static final Dg: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;->De:Lcom/discord/views/c;
+    sput-object v0, Lcom/discord/views/c;->Dg:Lcom/discord/views/c;
 
     return-void
 .end method
@@ -72,7 +72,7 @@
 
     if-eqz p0, :cond_4
 
-    const p0, 0x7f121024
+    const p0, 0x7f120f98
 
     invoke-virtual {p1, p0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -89,7 +89,7 @@
 
     if-eqz p0, :cond_4
 
-    const p0, 0x7f121026
+    const p0, 0x7f120f9a
 
     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;->Dh:Lcom/discord/views/c$c;
+    sget-object p0, Lcom/discord/views/c$c;->Dj:Lcom/discord/views/c$c;
 
     move-object v8, p0
 
@@ -163,7 +163,7 @@
     if-nez v2, :cond_4
 
     :cond_1
-    const p0, 0x7f121033
+    const p0, 0x7f120fa7
 
     invoke-virtual {p1, p0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -180,7 +180,7 @@
 
     if-eqz p0, :cond_4
 
-    const p0, 0x7f121044
+    const p0, 0x7f120fb8
 
     invoke-virtual {p1, p0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -197,7 +197,7 @@
 
     if-eqz p0, :cond_4
 
-    const p0, 0x7f12102a
+    const p0, 0x7f120f9e
 
     invoke-virtual {p1, p0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -214,7 +214,7 @@
 
     if-eqz p0, :cond_4
 
-    const p0, 0x7f121037
+    const p0, 0x7f120fab
 
     invoke-virtual {p1, p0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -250,7 +250,7 @@
 
     if-eqz p0, :cond_4
 
-    const p0, 0x7f121045
+    const p0, 0x7f120fb9
 
     invoke-virtual {p1, p0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -267,7 +267,7 @@
 
     if-eqz p0, :cond_4
 
-    const p0, 0x7f12102c
+    const p0, 0x7f120fa0
 
     invoke-virtual {p1, p0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -303,7 +303,7 @@
 
     if-eqz p0, :cond_4
 
-    const p0, 0x7f121020
+    const p0, 0x7f120f94
 
     invoke-virtual {p1, p0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -320,7 +320,7 @@
 
     if-eqz p0, :cond_4
 
-    const p0, 0x7f12103f
+    const p0, 0x7f120fb3
 
     invoke-virtual {p1, p0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -337,7 +337,7 @@
 
     if-eqz p0, :cond_4
 
-    const p0, 0x7f121047
+    const p0, 0x7f120fbb
 
     invoke-virtual {p1, p0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -354,7 +354,7 @@
 
     if-eqz p0, :cond_4
 
-    const p0, 0x7f121028
+    const p0, 0x7f120f9c
 
     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;->Di:Lcom/discord/views/c$d;
+    sget-object p0, Lcom/discord/views/c$d;->Dk:Lcom/discord/views/c$d;
 
     move-object v8, p0
 
@@ -428,7 +428,7 @@
     if-nez v2, :cond_4
 
     :cond_3
-    const p0, 0x7f121039
+    const p0, 0x7f120fad
 
     invoke-virtual {p1, p0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -445,7 +445,7 @@
 
     if-eqz p0, :cond_4
 
-    const p0, 0x7f12103b
+    const p0, 0x7f120faf
 
     invoke-virtual {p1, p0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -462,7 +462,7 @@
 
     if-eqz p0, :cond_4
 
-    const p0, 0x7f121022
+    const p0, 0x7f120f96
 
     invoke-virtual {p1, p0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -479,7 +479,7 @@
 
     if-eqz p0, :cond_4
 
-    const p0, 0x7f121041
+    const p0, 0x7f120fb5
 
     invoke-virtual {p1, p0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -542,7 +542,7 @@
 
     if-eqz v0, :cond_0
 
-    const v0, 0x7f121023
+    const v0, 0x7f120f97
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -559,7 +559,7 @@
 
     if-eqz v0, :cond_0
 
-    const v0, 0x7f121025
+    const v0, 0x7f120f99
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -576,7 +576,7 @@
 
     if-eqz v0, :cond_0
 
-    const v0, 0x7f121032
+    const v0, 0x7f120fa6
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -593,7 +593,7 @@
 
     if-eqz v0, :cond_0
 
-    const v0, 0x7f121043
+    const v0, 0x7f120fb7
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -610,7 +610,7 @@
 
     if-eqz v0, :cond_0
 
-    const v0, 0x7f121029
+    const v0, 0x7f120f9d
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -627,7 +627,7 @@
 
     if-eqz v0, :cond_0
 
-    const v0, 0x7f121036
+    const v0, 0x7f120faa
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -644,7 +644,7 @@
 
     if-eqz v0, :cond_0
 
-    const v0, 0x7f121034
+    const v0, 0x7f120fa8
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -661,7 +661,7 @@
 
     if-eqz v0, :cond_0
 
-    const v0, 0x7f121042
+    const v0, 0x7f120fb6
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -678,7 +678,7 @@
 
     if-eqz v0, :cond_0
 
-    const v0, 0x7f12102b
+    const v0, 0x7f120f9f
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -695,7 +695,7 @@
 
     if-eqz v0, :cond_0
 
-    const v0, 0x7f12103d
+    const v0, 0x7f120fb1
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -712,7 +712,7 @@
 
     if-eqz v0, :cond_0
 
-    const v0, 0x7f12101f
+    const v0, 0x7f120f93
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -729,7 +729,7 @@
 
     if-eqz v0, :cond_0
 
-    const v0, 0x7f12103e
+    const v0, 0x7f120fb2
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -746,7 +746,7 @@
 
     if-eqz v0, :cond_0
 
-    const v0, 0x7f121046
+    const v0, 0x7f120fba
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -763,7 +763,7 @@
 
     if-eqz v0, :cond_0
 
-    const v0, 0x7f121027
+    const v0, 0x7f120f9b
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -780,7 +780,7 @@
 
     if-eqz v0, :cond_0
 
-    const v0, 0x7f121038    # 1.941515E38f
+    const v0, 0x7f120fac
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -797,7 +797,7 @@
 
     if-eqz v0, :cond_0
 
-    const v0, 0x7f12103a
+    const v0, 0x7f120fae
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -814,7 +814,7 @@
 
     if-eqz v0, :cond_0
 
-    const v0, 0x7f121021
+    const v0, 0x7f120f95
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -831,7 +831,7 @@
 
     if-eqz v0, :cond_0
 
-    const v0, 0x7f121040
+    const v0, 0x7f120fb4
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -886,7 +886,7 @@
     .end sparse-switch
 .end method
 
-.method public static fc()Lcom/discord/utilities/views/SimpleRecyclerAdapter;
+.method public static fa()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;->Dg:Lcom/discord/views/c$b;
+    sget-object v1, Lcom/discord/views/c$b;->Di: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 ea640a1bb5..1060cb45fa 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 Dk:Lcom/discord/views/e;
+.field final synthetic Dm: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;->Dk:Lcom/discord/views/e;
+    iput-object p1, p0, Lcom/discord/views/e$1;->Dm: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;->Dk:Lcom/discord/views/e;
+    iget-object p1, p0, Lcom/discord/views/e$1;->Dm:Lcom/discord/views/e;
 
-    invoke-virtual {p1}, Lcom/discord/views/e;->fd()V
+    invoke-virtual {p1}, Lcom/discord/views/e;->fb()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 e24776f0f1..b7782755b7 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;->fd()V
+    value = Lcom/discord/views/e;->fb()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic Dk:Lcom/discord/views/e;
+.field final synthetic Dm: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;->Dk:Lcom/discord/views/e;
+    iput-object p1, p0, Lcom/discord/views/e$a;->Dm: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;->Dk:Lcom/discord/views/e;
+    iget-object p1, p0, Lcom/discord/views/e$a;->Dm: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;->Dk:Lcom/discord/views/e;
+    iget-object v0, p0, Lcom/discord/views/e$a;->Dm: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 7d1893f19c..f390bedf19 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;->fd()V
+    value = Lcom/discord/views/e;->fb()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic Dl:Landroid/animation/Animator;
+.field final synthetic Dn:Landroid/animation/Animator;
 
 
 # direct methods
 .method constructor <init>(Landroid/animation/Animator;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/views/e$b;->Dl:Landroid/animation/Animator;
+    iput-object p1, p0, Lcom/discord/views/e$b;->Dn: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;->Dl:Landroid/animation/Animator;
+    iget-object p1, p0, Lcom/discord/views/e$b;->Dn: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 006d5a6e88..b81c47237b 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 Dm:Lcom/discord/views/e$c;
+.field public static final Do: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;->Dm:Lcom/discord/views/e$c;
+    sput-object v0, Lcom/discord/views/e$c;->Do: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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 39299d619b..e970f5ade8 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 Dj:Lkotlin/jvm/functions/Function1;
+.field private Dl: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;->KA()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->Ky()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;->Dm:Lcom/discord/views/e$c;
+    sget-object p1, Lcom/discord/views/e$c;->Do:Lcom/discord/views/e$c;
 
     check-cast p1, Lkotlin/jvm/functions/Function1;
 
-    iput-object p1, p0, Lcom/discord/views/e;->Dj:Lkotlin/jvm/functions/Function1;
+    iput-object p1, p0, Lcom/discord/views/e;->Dl:Lkotlin/jvm/functions/Function1;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final fd()V
+.method public final fb()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;->Dj:Lkotlin/jvm/functions/Function1;
+    iget-object v0, p0, Lcom/discord/views/e;->Dl: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;->Dj:Lkotlin/jvm/functions/Function1;
+    iget-object v0, p0, Lcom/discord/views/e;->Dl: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;->Dj:Lkotlin/jvm/functions/Function1;
+    iput-object p1, p0, Lcom/discord/views/e;->Dl: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 e7e610b366..5db6373ab9 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;->fd()V
+    invoke-virtual {v0}, Lcom/discord/views/f;->fb()V
 
-    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 3277dff7b1..3d78b3d6ab 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 Dq:Lcom/discord/views/f$b;
+.field public static final Ds: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;->Dq:Lcom/discord/views/f$b;
+    sput-object v0, Lcom/discord/views/f$b;->Ds:Lcom/discord/views/f$b;
 
     return-void
 .end method
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 1f7afb296d..de65a54fee 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 Ds:Lcom/discord/views/f$c$1;
+.field public static final Du: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;->Ds:Lcom/discord/views/f$c$1;
+    sput-object v0, Lcom/discord/views/f$c$1;->Du: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 66f0512669..83028d9f41 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 Dr:Lcom/discord/views/f$c;
+.field public static final Dt: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;->Dr:Lcom/discord/views/f$c;
+    sput-object v0, Lcom/discord/views/f$c;->Dt: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;->Ds:Lcom/discord/views/f$c$1;
+    sget-object v0, Lcom/discord/views/f$c$1;->Du: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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 a5b910d307..ec0d4aeee7 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 Dt:Lcom/discord/views/f$d;
+.field public static final Dv: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;->Dt:Lcom/discord/views/f$d;
+    sput-object v0, Lcom/discord/views/f$d;->Dv: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 f8d8c6acf4..a300221fad 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 f87f3cd4b9..eb56c23d21 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 Dn:Lkotlin/properties/ReadOnlyProperty;
-
-.field private final Do:Lkotlin/properties/ReadOnlyProperty;
-
 .field private final Dp:Lkotlin/properties/ReadOnlyProperty;
 
+.field private final Dq:Lkotlin/properties/ReadOnlyProperty;
+
+.field private final Dr:Lkotlin/properties/ReadOnlyProperty;
+
 .field private final adapter:Lcom/discord/utilities/views/SimpleRecyclerAdapter;
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -167,31 +167,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/views/f;->setClipChildren(Z)V
 
-    const p1, 0x7f0a04da
-
-    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;->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
+    const p1, 0x7f0a04cd
 
     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;->Dp:Lkotlin/properties/ReadOnlyProperty;
 
+    const p1, 0x7f0a04c8
+
+    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, 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;->Dq:Lkotlin/properties/ReadOnlyProperty;
+
+    const p1, 0x7f0a04cc
+
+    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;->Dr:Lkotlin/properties/ReadOnlyProperty;
+
     new-instance p1, Lcom/discord/utilities/views/SimpleRecyclerAdapter;
 
-    sget-object v0, Lcom/discord/views/f$b;->Dq:Lcom/discord/views/f$b;
+    sget-object v0, Lcom/discord/views/f$b;->Ds: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;->Dp:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/views/f;->Dr: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;->Do:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/views/f;->Dq: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;->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;
 
@@ -531,7 +531,7 @@
 
     move-result-object v0
 
-    sget-object v2, Lcom/discord/views/f$c;->Dr:Lcom/discord/views/f$c;
+    sget-object v2, Lcom/discord/views/f$c;->Dt: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;->Dt:Lcom/discord/views/f$d;
+    sget-object v2, Lcom/discord/views/f$d;->Dv: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 f2701c9af5..fc4d811ea8 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 DT:Lcom/discord/views/g$b$1;
+.field public static final DV: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;->DT:Lcom/discord/views/g$b$1;
+    sput-object v0, Lcom/discord/views/g$b$1;->DV: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 728f9f4063..cc484b478b 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 DS:Lcom/discord/views/g$b;
+.field public static final DU: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;->DS:Lcom/discord/views/g$b;
+    sput-object v0, Lcom/discord/views/g$b;->DU: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;->DT:Lcom/discord/views/g$b$1;
+    sget-object v0, Lcom/discord/views/g$b$1;->DV: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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 4274676713..9f604f81ba 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 52ae660ade..a47d183229 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 DR:Lcom/discord/views/g$a;
+.field public static final DT:Lcom/discord/views/g$a;
 
 
 # instance fields
-.field private final DQ:Lkotlin/properties/ReadOnlyProperty;
+.field private final DS: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;->DR:Lcom/discord/views/g$a;
+    sput-object v0, Lcom/discord/views/g;->DT:Lcom/discord/views/g$a;
 
     return-void
 .end method
@@ -99,7 +99,7 @@
 
     invoke-static {p1, v1, v0}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
-    invoke-static {}, Lrx/subjects/PublishSubject;->KA()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->Ky()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, 0x7f0a04d2
+    const p1, 0x7f0a04c5
 
     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;->DQ:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/views/g;->DS:Lkotlin/properties/ReadOnlyProperty;
 
     return-void
 .end method
@@ -127,7 +127,7 @@
 
     if-nez p1, :cond_0
 
-    invoke-direct {p0}, Lcom/discord/views/g;->fe()V
+    invoke-direct {p0}, Lcom/discord/views/g;->fc()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;->ff()V
+    invoke-direct {p0}, Lcom/discord/views/g;->fd()V
 
     return-void
 .end method
 
-.method private final fe()V
+.method private final fc()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 ff()V
+.method private final fd()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;->ff()V
+    invoke-direct {p0}, Lcom/discord/views/g;->fd()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;->DQ:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/views/g;->DS: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;->fe()V
+    invoke-direct {p0}, Lcom/discord/views/g;->fc()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;->DS:Lcom/discord/views/g$b;
+    sget-object v1, Lcom/discord/views/g$b;->DU: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 88af542118..d3407f90ff 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;->wJ:Lcom/discord/app/DiscordConnectService$a;
+    sget-object p2, Lcom/discord/app/DiscordConnectService;->wL: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;->fd()V
+    invoke-virtual {p1}, Lcom/discord/views/h;->fb()V
 
     :cond_1
-    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 c7cf5802dd..8292dac995 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;->fg()V
+    value = Lcom/discord/views/h;->fe()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;->fd()V
+    invoke-virtual {p1}, Lcom/discord/views/h;->fb()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 69c548f2b8..460ef50021 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;->fg()V
+    value = Lcom/discord/views/h;->fe()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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 7cdc1728d5..c4a126f65f 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;->fg()V
+    value = Lcom/discord/views/h;->fe()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -31,7 +31,7 @@
 
 
 # static fields
-.field public static final DW:Lcom/discord/views/h$e;
+.field public static final DY: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;->DW:Lcom/discord/views/h$e;
+    sput-object v0, Lcom/discord/views/h$e;->DY: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 83b9f76c64..e49ac41bc7 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;->fg()V
+    value = Lcom/discord/views/h;->fe()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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 5bbc39f5ea..3a896507e8 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 DU:Lkotlin/properties/ReadOnlyProperty;
+.field private final DW:Lkotlin/properties/ReadOnlyProperty;
 
-.field private final DV:Lkotlin/properties/ReadOnlyProperty;
+.field private final DX:Lkotlin/properties/ReadOnlyProperty;
 
 .field private final closeBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
 
@@ -180,15 +180,15 @@
 
     iput-object p1, p0, Lcom/discord/views/h;->closeBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a05cd
+    const p1, 0x7f0a05b4
 
     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;->DU:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/views/h;->DW:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a02bd
+    const p1, 0x7f0a02bc
 
     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, 0x7f0a057b
+    const p1, 0x7f0a0562
 
     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;->DV:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/views/h;->DX:Lkotlin/properties/ReadOnlyProperty;
 
     new-instance p1, Lcom/discord/widgets/user/search/WidgetGlobalSearchAdapter;
 
@@ -388,7 +388,7 @@
     return-object p0
 .end method
 
-.method private final fg()V
+.method private final fe()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;->DW:Lcom/discord/views/h$e;
+    sget-object v2, Lcom/discord/views/h$e;->DY: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;->DU:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/views/h;->DW: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;->DV:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/views/h;->DX:Lkotlin/properties/ReadOnlyProperty;
 
     sget-object v1, Lcom/discord/views/h;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -613,7 +613,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f0a0260
+    const v1, 0x7f0a025f
 
     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;->fg()V
+    invoke-direct {p0}, Lcom/discord/views/h;->fe()V
 
     invoke-virtual {p0}, Lcom/discord/views/h;->getContext()Landroid/content/Context;
 
@@ -645,7 +645,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f0a0260
+    const v1, 0x7f0a025f
 
     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;->bnb:Lkotterknife/a;
+    sget-object p1, Lkotterknife/a;->bmW:Lkotterknife/a;
 
     invoke-static {p0}, Lkotterknife/a;->bi(Ljava/lang/Object;)V
 
@@ -689,7 +689,7 @@
 
     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;->fg()V
+    invoke-direct {p0}, Lcom/discord/views/h;->fe()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 746d42eff5..da9ec2cbc2 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 DY:Landroid/widget/TextSwitcher;
+.field public Ea:Landroid/widget/TextSwitcher;
 
-.field private DZ:Landroid/widget/TextView;
+.field private Eb:Landroid/widget/TextView;
 
-.field private Ea:Landroid/widget/TextView;
+.field private Ec:Landroid/widget/TextView;
 
-.field public Eb:I
+.field public Ed:I
 
-.field public Ec:Ljava/lang/Long;
+.field public Ee:Ljava/lang/Long;
 
 .field public emojiTextView:Lcom/discord/utilities/view/text/SimpleDraweeSpanTextView;
 
@@ -35,7 +35,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f0a056d
+    const v0, 0x7f0a055e
 
     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, 0x7f0a056c
+    const v0, 0x7f0a055d
 
     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;->DY:Landroid/widget/TextSwitcher;
+    iput-object v0, p0, Lcom/discord/views/i;->Ea:Landroid/widget/TextSwitcher;
 
-    const v0, 0x7f0a056a
+    const v0, 0x7f0a055b
 
     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;->DZ:Landroid/widget/TextView;
+    iput-object v0, p0, Lcom/discord/views/i;->Eb:Landroid/widget/TextView;
 
-    const v0, 0x7f0a056b
+    const v0, 0x7f0a055c
 
     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;->Ea:Landroid/widget/TextView;
+    iput-object p1, p0, Lcom/discord/views/i;->Ec: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;->DZ:Landroid/widget/TextView;
+    iget-object v0, p0, Lcom/discord/views/i;->Eb:Landroid/widget/TextView;
 
     invoke-virtual {v0, p1}, Landroid/widget/TextView;->setActivated(Z)V
 
-    iget-object v0, p0, Lcom/discord/views/i;->Ea:Landroid/widget/TextView;
+    iget-object v0, p0, Lcom/discord/views/i;->Ec: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 6eb20e27ac..a270ddd6b2 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;->EH:Lcom/discord/views/VoiceUserView$a;
+    sget-object v1, Lcom/discord/views/VoiceUserView$a;->EJ: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;->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
 
@@ -54,7 +54,7 @@
 
     sput-object v0, Lcom/discord/views/j;->$EnumSwitchMapping$1:[I
 
-    sget-object v1, Lcom/discord/views/VoiceUserView$a;->EK:Lcom/discord/views/VoiceUserView$a;
+    sget-object v1, Lcom/discord/views/VoiceUserView$a;->EM: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 cc800e9fee..447573033a 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 Fa:Ljava/lang/Class;
+.field final Fd:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -26,13 +26,13 @@
     .end annotation
 .end field
 
-.field private final Fb:I
+.field private final Fe:I
 
-.field private final Fc:I
+.field private final Ff:I
 
-.field private final Fd:I
+.field private final Fg:I
 
-.field private final Fe:Lkotlin/jvm/functions/Function1;
+.field private final Fh: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 Ff:Lkotlin/jvm/functions/Function1;
+.field private final Fi: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 Fg:Z
+.field private final Fj:Z
 
-.field private final Fh:Z
+.field private final Fk: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;->Fa:Ljava/lang/Class;
+    iput-object v11, v10, Lcom/discord/views/steps/StepsView$b$a;->Fd:Ljava/lang/Class;
 
     move v0, p2
 
-    iput v0, v10, Lcom/discord/views/steps/StepsView$b$a;->Fb:I
+    iput v0, v10, Lcom/discord/views/steps/StepsView$b$a;->Fe:I
 
     move v0, p3
 
-    iput v0, v10, Lcom/discord/views/steps/StepsView$b$a;->Fc:I
+    iput v0, v10, Lcom/discord/views/steps/StepsView$b$a;->Ff:I
 
     move/from16 v0, p4
 
-    iput v0, v10, Lcom/discord/views/steps/StepsView$b$a;->Fd:I
+    iput v0, v10, Lcom/discord/views/steps/StepsView$b$a;->Fg:I
 
     const/4 v0, 0x0
 
-    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;->Fh: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;->Ff:Lkotlin/jvm/functions/Function1;
+    iput-object v0, v10, Lcom/discord/views/steps/StepsView$b$a;->Fi:Lkotlin/jvm/functions/Function1;
 
     move/from16 v0, p8
 
-    iput-boolean v0, v10, Lcom/discord/views/steps/StepsView$b$a;->Fg:Z
+    iput-boolean v0, v10, Lcom/discord/views/steps/StepsView$b$a;->Fj:Z
 
     move/from16 v0, p9
 
-    iput-boolean v0, v10, Lcom/discord/views/steps/StepsView$b$a;->Fh:Z
+    iput-boolean v0, v10, Lcom/discord/views/steps/StepsView$b$a;->Fk:Z
 
     return-void
 .end method
@@ -170,9 +170,9 @@
 
     if-eqz v1, :cond_0
 
-    const v1, 0x7f120c3c
+    const v1, 0x7f120c05
 
-    const v4, 0x7f120c3c
+    const v4, 0x7f120c05
 
     goto :goto_0
 
@@ -184,9 +184,9 @@
 
     if-eqz v1, :cond_1
 
-    const v1, 0x7f12029b
+    const v1, 0x7f120299
 
-    const v5, 0x7f12029b
+    const v5, 0x7f120299
 
     goto :goto_1
 
@@ -198,9 +198,9 @@
 
     if-eqz v1, :cond_2
 
-    const v1, 0x7f12056c
+    const v1, 0x7f120547
 
-    const v6, 0x7f12056c
+    const v6, 0x7f120547
 
     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;->Fa:Ljava/lang/Class;
+    iget-object v1, p0, Lcom/discord/views/steps/StepsView$b$a;->Fd:Ljava/lang/Class;
 
-    iget-object v3, p1, Lcom/discord/views/steps/StepsView$b$a;->Fa:Ljava/lang/Class;
+    iget-object v3, p1, Lcom/discord/views/steps/StepsView$b$a;->Fd: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;->Fb:I
+    iget v1, p0, Lcom/discord/views/steps/StepsView$b$a;->Fe:I
 
-    iget v3, p1, Lcom/discord/views/steps/StepsView$b$a;->Fb:I
+    iget v3, p1, Lcom/discord/views/steps/StepsView$b$a;->Fe: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;->Fc:I
+    iget v1, p0, Lcom/discord/views/steps/StepsView$b$a;->Ff:I
 
-    iget v3, p1, Lcom/discord/views/steps/StepsView$b$a;->Fc:I
+    iget v3, p1, Lcom/discord/views/steps/StepsView$b$a;->Ff: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;->Fd:I
+    iget v1, p0, Lcom/discord/views/steps/StepsView$b$a;->Fg:I
 
-    iget v3, p1, Lcom/discord/views/steps/StepsView$b$a;->Fd:I
+    iget v3, p1, Lcom/discord/views/steps/StepsView$b$a;->Fg: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;->Fe:Lkotlin/jvm/functions/Function1;
+    iget-object v1, p0, Lcom/discord/views/steps/StepsView$b$a;->Fh:Lkotlin/jvm/functions/Function1;
 
-    iget-object v3, p1, Lcom/discord/views/steps/StepsView$b$a;->Fe:Lkotlin/jvm/functions/Function1;
+    iget-object v3, p1, Lcom/discord/views/steps/StepsView$b$a;->Fh: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;->Ff:Lkotlin/jvm/functions/Function1;
+    iget-object v1, p0, Lcom/discord/views/steps/StepsView$b$a;->Fi:Lkotlin/jvm/functions/Function1;
 
-    iget-object v3, p1, Lcom/discord/views/steps/StepsView$b$a;->Ff:Lkotlin/jvm/functions/Function1;
+    iget-object v3, p1, Lcom/discord/views/steps/StepsView$b$a;->Fi: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;->Fg:Z
+    iget-boolean v1, p0, Lcom/discord/views/steps/StepsView$b$a;->Fj:Z
 
-    iget-boolean v3, p1, Lcom/discord/views/steps/StepsView$b$a;->Fg:Z
+    iget-boolean v3, p1, Lcom/discord/views/steps/StepsView$b$a;->Fj: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;->Fh:Z
+    iget-boolean v1, p0, Lcom/discord/views/steps/StepsView$b$a;->Fk:Z
 
-    iget-boolean p1, p1, Lcom/discord/views/steps/StepsView$b$a;->Fh:Z
+    iget-boolean p1, p1, Lcom/discord/views/steps/StepsView$b$a;->Fk: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;->Fa:Ljava/lang/Class;
+    iget-object v0, p0, Lcom/discord/views/steps/StepsView$b$a;->Fd:Ljava/lang/Class;
 
     const/4 v1, 0x0
 
@@ -417,7 +417,7 @@
     :goto_0
     mul-int/lit8 v0, v0, 0x1f
 
-    iget v2, p0, Lcom/discord/views/steps/StepsView$b$a;->Fb:I
+    iget v2, p0, Lcom/discord/views/steps/StepsView$b$a;->Fe:I
 
     invoke-static {v2}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
 
@@ -427,7 +427,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget v2, p0, Lcom/discord/views/steps/StepsView$b$a;->Fc:I
+    iget v2, p0, Lcom/discord/views/steps/StepsView$b$a;->Ff:I
 
     invoke-static {v2}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
 
@@ -437,7 +437,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget v2, p0, Lcom/discord/views/steps/StepsView$b$a;->Fd:I
+    iget v2, p0, Lcom/discord/views/steps/StepsView$b$a;->Fg:I
 
     invoke-static {v2}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
 
@@ -447,7 +447,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v2, p0, Lcom/discord/views/steps/StepsView$b$a;->Fe:Lkotlin/jvm/functions/Function1;
+    iget-object v2, p0, Lcom/discord/views/steps/StepsView$b$a;->Fh: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;->Ff:Lkotlin/jvm/functions/Function1;
+    iget-object v2, p0, Lcom/discord/views/steps/StepsView$b$a;->Fi: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;->Fg:Z
+    iget-boolean v1, p0, Lcom/discord/views/steps/StepsView$b$a;->Fj: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;->Fh:Z
+    iget-boolean v1, p0, Lcom/discord/views/steps/StepsView$b$a;->Fk: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;->Fa:Ljava/lang/Class;
+    iget-object v1, p0, Lcom/discord/views/steps/StepsView$b$a;->Fd: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;->Fb:I
+    iget v1, p0, Lcom/discord/views/steps/StepsView$b$a;->Fe: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;->Fc:I
+    iget v1, p0, Lcom/discord/views/steps/StepsView$b$a;->Ff: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;->Fd:I
+    iget v1, p0, Lcom/discord/views/steps/StepsView$b$a;->Fg: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;->Fe:Lkotlin/jvm/functions/Function1;
+    iget-object v1, p0, Lcom/discord/views/steps/StepsView$b$a;->Fh: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;->Ff:Lkotlin/jvm/functions/Function1;
+    iget-object v1, p0, Lcom/discord/views/steps/StepsView$b$a;->Fi: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;->Fg:Z
+    iget-boolean v1, p0, Lcom/discord/views/steps/StepsView$b$a;->Fj: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;->Fh:Z
+    iget-boolean v1, p0, Lcom/discord/views/steps/StepsView$b$a;->Fk: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 2979390168..406a7938f7 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 Fb:I
+.field private final Fe:I
 
-.field private final Fc:I
+.field private final Ff:I
 
-.field private final Fd:I
+.field private final Fg:I
 
-.field private final Fe:Lkotlin/jvm/functions/Function1;
+.field private final Fh: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 Ff:Lkotlin/jvm/functions/Function1;
+.field private final Fi: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 Fg:Z
+.field private final Fj:Z
 
-.field private final Fh:Z
+.field private final Fk:Z
 
-.field final Fi:I
+.field final Fl: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;->Fi:I
+    iget v1, p0, Lcom/discord/views/steps/StepsView$b$b;->Fl:I
 
-    iget v3, p1, Lcom/discord/views/steps/StepsView$b$b;->Fi:I
+    iget v3, p1, Lcom/discord/views/steps/StepsView$b$b;->Fl: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;->Fb:I
+    iget v1, p0, Lcom/discord/views/steps/StepsView$b$b;->Fe:I
 
-    iget v3, p1, Lcom/discord/views/steps/StepsView$b$b;->Fb:I
+    iget v3, p1, Lcom/discord/views/steps/StepsView$b$b;->Fe: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;->Fc:I
+    iget v1, p0, Lcom/discord/views/steps/StepsView$b$b;->Ff:I
 
-    iget v3, p1, Lcom/discord/views/steps/StepsView$b$b;->Fc:I
+    iget v3, p1, Lcom/discord/views/steps/StepsView$b$b;->Ff: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;->Fd:I
+    iget v1, p0, Lcom/discord/views/steps/StepsView$b$b;->Fg:I
 
-    iget v3, p1, Lcom/discord/views/steps/StepsView$b$b;->Fd:I
+    iget v3, p1, Lcom/discord/views/steps/StepsView$b$b;->Fg: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;->Fe:Lkotlin/jvm/functions/Function1;
+    iget-object v1, p0, Lcom/discord/views/steps/StepsView$b$b;->Fh:Lkotlin/jvm/functions/Function1;
 
-    iget-object v3, p1, Lcom/discord/views/steps/StepsView$b$b;->Fe:Lkotlin/jvm/functions/Function1;
+    iget-object v3, p1, Lcom/discord/views/steps/StepsView$b$b;->Fh: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;->Ff:Lkotlin/jvm/functions/Function1;
+    iget-object v1, p0, Lcom/discord/views/steps/StepsView$b$b;->Fi:Lkotlin/jvm/functions/Function1;
 
-    iget-object v3, p1, Lcom/discord/views/steps/StepsView$b$b;->Ff:Lkotlin/jvm/functions/Function1;
+    iget-object v3, p1, Lcom/discord/views/steps/StepsView$b$b;->Fi: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;->Fg:Z
+    iget-boolean v1, p0, Lcom/discord/views/steps/StepsView$b$b;->Fj:Z
 
-    iget-boolean v3, p1, Lcom/discord/views/steps/StepsView$b$b;->Fg:Z
+    iget-boolean v3, p1, Lcom/discord/views/steps/StepsView$b$b;->Fj: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;->Fh:Z
+    iget-boolean v1, p0, Lcom/discord/views/steps/StepsView$b$b;->Fk:Z
 
-    iget-boolean p1, p1, Lcom/discord/views/steps/StepsView$b$b;->Fh:Z
+    iget-boolean p1, p1, Lcom/discord/views/steps/StepsView$b$b;->Fk: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;->Fi:I
+    iget v0, p0, Lcom/discord/views/steps/StepsView$b$b;->Fl:I
 
     invoke-static {v0}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
 
@@ -224,7 +224,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget v1, p0, Lcom/discord/views/steps/StepsView$b$b;->Fb:I
+    iget v1, p0, Lcom/discord/views/steps/StepsView$b$b;->Fe:I
 
     invoke-static {v1}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
 
@@ -234,7 +234,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget v1, p0, Lcom/discord/views/steps/StepsView$b$b;->Fc:I
+    iget v1, p0, Lcom/discord/views/steps/StepsView$b$b;->Ff:I
 
     invoke-static {v1}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
 
@@ -244,7 +244,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget v1, p0, Lcom/discord/views/steps/StepsView$b$b;->Fd:I
+    iget v1, p0, Lcom/discord/views/steps/StepsView$b$b;->Fg:I
 
     invoke-static {v1}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
 
@@ -254,7 +254,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lcom/discord/views/steps/StepsView$b$b;->Fe:Lkotlin/jvm/functions/Function1;
+    iget-object v1, p0, Lcom/discord/views/steps/StepsView$b$b;->Fh: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;->Ff:Lkotlin/jvm/functions/Function1;
+    iget-object v1, p0, Lcom/discord/views/steps/StepsView$b$b;->Fi: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;->Fg:Z
+    iget-boolean v1, p0, Lcom/discord/views/steps/StepsView$b$b;->Fj: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;->Fh:Z
+    iget-boolean v1, p0, Lcom/discord/views/steps/StepsView$b$b;->Fk: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;->Fi:I
+    iget v1, p0, Lcom/discord/views/steps/StepsView$b$b;->Fl: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;->Fb:I
+    iget v1, p0, Lcom/discord/views/steps/StepsView$b$b;->Fe: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;->Fc:I
+    iget v1, p0, Lcom/discord/views/steps/StepsView$b$b;->Ff: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;->Fd:I
+    iget v1, p0, Lcom/discord/views/steps/StepsView$b$b;->Fg: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;->Fe:Lkotlin/jvm/functions/Function1;
+    iget-object v1, p0, Lcom/discord/views/steps/StepsView$b$b;->Fh: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;->Ff:Lkotlin/jvm/functions/Function1;
+    iget-object v1, p0, Lcom/discord/views/steps/StepsView$b$b;->Fi: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;->Fg:Z
+    iget-boolean v1, p0, Lcom/discord/views/steps/StepsView$b$b;->Fj: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;->Fh:Z
+    iget-boolean v1, p0, Lcom/discord/views/steps/StepsView$b$b;->Fk: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 63d9d2f7e9..95e1263d71 100644
--- a/com.discord/smali/com/discord/views/steps/StepsView$b.smali
+++ b/com.discord/smali/com/discord/views/steps/StepsView$b.smali
@@ -22,13 +22,13 @@
 
 
 # instance fields
-.field final ES:I
+.field final EV:I
 
-.field final ET:I
+.field final EW:I
 
-.field final EU:I
+.field final EX:I
 
-.field final EV:Lkotlin/jvm/functions/Function1;
+.field final EY:Lkotlin/jvm/functions/Function1;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/jvm/functions/Function1<",
@@ -39,7 +39,7 @@
     .end annotation
 .end field
 
-.field final EW:Lkotlin/jvm/functions/Function1;
+.field final EZ:Lkotlin/jvm/functions/Function1;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/jvm/functions/Function1<",
@@ -50,7 +50,7 @@
     .end annotation
 .end field
 
-.field final EX:Lkotlin/jvm/functions/Function1;
+.field final Fa:Lkotlin/jvm/functions/Function1;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/jvm/functions/Function1<",
@@ -61,9 +61,9 @@
     .end annotation
 .end field
 
-.field final EY:Z
+.field final Fb:Z
 
-.field final EZ:Z
+.field final Fc:Z
 
 
 # direct methods
@@ -92,21 +92,21 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput p1, p0, Lcom/discord/views/steps/StepsView$b;->ES:I
+    iput p1, p0, Lcom/discord/views/steps/StepsView$b;->EV:I
 
-    iput p2, p0, Lcom/discord/views/steps/StepsView$b;->ET:I
+    iput p2, p0, Lcom/discord/views/steps/StepsView$b;->EW:I
 
-    iput p3, p0, Lcom/discord/views/steps/StepsView$b;->EU:I
+    iput p3, p0, Lcom/discord/views/steps/StepsView$b;->EX:I
 
-    iput-object p4, p0, Lcom/discord/views/steps/StepsView$b;->EV:Lkotlin/jvm/functions/Function1;
+    iput-object p4, p0, Lcom/discord/views/steps/StepsView$b;->EY:Lkotlin/jvm/functions/Function1;
 
-    iput-object p5, p0, Lcom/discord/views/steps/StepsView$b;->EW:Lkotlin/jvm/functions/Function1;
+    iput-object p5, p0, Lcom/discord/views/steps/StepsView$b;->EZ:Lkotlin/jvm/functions/Function1;
 
-    iput-object p6, p0, Lcom/discord/views/steps/StepsView$b;->EX:Lkotlin/jvm/functions/Function1;
+    iput-object p6, p0, Lcom/discord/views/steps/StepsView$b;->Fa:Lkotlin/jvm/functions/Function1;
 
-    iput-boolean p7, p0, Lcom/discord/views/steps/StepsView$b;->EY:Z
+    iput-boolean p7, p0, Lcom/discord/views/steps/StepsView$b;->Fb:Z
 
-    iput-boolean p8, p0, Lcom/discord/views/steps/StepsView$b;->EZ:Z
+    iput-boolean p8, p0, Lcom/discord/views/steps/StepsView$b;->Fc: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 710d5e646b..b649a256cd 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 Fi:I
+.field private Fl:I
 
 
 # direct methods
@@ -26,7 +26,7 @@
 
     const/4 v0, -0x1
 
-    iput v0, p0, Lcom/discord/views/steps/StepsView$c;->Fi:I
+    iput v0, p0, Lcom/discord/views/steps/StepsView$c;->Fl: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;->Fi:I
+    iget v0, p0, Lcom/discord/views/steps/StepsView$c;->Fl:I
 
     return v0
 .end method
@@ -64,7 +64,7 @@
     const/4 p1, -0x1
 
     :goto_0
-    iput p1, p0, Lcom/discord/views/steps/StepsView$c;->Fi:I
+    iput p1, p0, Lcom/discord/views/steps/StepsView$c;->Fl: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 3e2bd2c600..0757933ee7 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 Fj:Ljava/util/List;
+.field public Fm: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;->Fj:Ljava/util/List;
+    iget-object v0, p0, Lcom/discord/views/steps/StepsView$d;->Fm: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;->Fj:Ljava/util/List;
+    iget-object v0, p0, Lcom/discord/views/steps/StepsView$d;->Fm: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;->Fa:Ljava/lang/Class;
+    iget-object p1, p1, Lcom/discord/views/steps/StepsView$b$a;->Fd: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;->Fi:I
+    iget p1, p1, Lcom/discord/views/steps/StepsView$b$b;->Fl: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 4037d3404e..813e996afd 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 Fk:Lcom/discord/views/steps/StepsView;
+.field final synthetic Fn:Lcom/discord/views/steps/StepsView;
 
-.field final synthetic Fl:Lkotlin/jvm/functions/Function0;
+.field final synthetic Fo:Lkotlin/jvm/functions/Function0;
 
 
 # direct methods
@@ -34,9 +34,9 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/discord/views/steps/StepsView$e;->Fk:Lcom/discord/views/steps/StepsView;
+    iput-object p1, p0, Lcom/discord/views/steps/StepsView$e;->Fn:Lcom/discord/views/steps/StepsView;
 
-    iput-object p2, p0, Lcom/discord/views/steps/StepsView$e;->Fl:Lkotlin/jvm/functions/Function0;
+    iput-object p2, p0, Lcom/discord/views/steps/StepsView$e;->Fo: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;->Fk:Lcom/discord/views/steps/StepsView;
+    iget-object v0, p0, Lcom/discord/views/steps/StepsView$e;->Fn:Lcom/discord/views/steps/StepsView;
 
-    iget-object v1, p0, Lcom/discord/views/steps/StepsView$e;->Fl:Lkotlin/jvm/functions/Function0;
+    iget-object v1, p0, Lcom/discord/views/steps/StepsView$e;->Fo: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 393603894a..8a27ab0937 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 Fl:Lkotlin/jvm/functions/Function0;
+.field final synthetic Fo: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;->Fl:Lkotlin/jvm/functions/Function0;
+    iput-object p1, p0, Lcom/discord/views/steps/StepsView$f;->Fo: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;->Fl:Lkotlin/jvm/functions/Function0;
+    iget-object p1, p0, Lcom/discord/views/steps/StepsView$f;->Fo: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 6c2ecbc875..c35c067b37 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 Fk:Lcom/discord/views/steps/StepsView;
+.field final synthetic Fn:Lcom/discord/views/steps/StepsView;
 
-.field final synthetic Fm:Ljava/util/List;
+.field final synthetic Fp: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;->Fk:Lcom/discord/views/steps/StepsView;
+    iput-object p1, p0, Lcom/discord/views/steps/StepsView$g;->Fn:Lcom/discord/views/steps/StepsView;
 
-    iput-object p2, p0, Lcom/discord/views/steps/StepsView$g;->Fm:Ljava/util/List;
+    iput-object p2, p0, Lcom/discord/views/steps/StepsView$g;->Fp: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;->Fm:Ljava/util/List;
+    iget-object v0, p0, Lcom/discord/views/steps/StepsView$g;->Fp: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;->EV:Lkotlin/jvm/functions/Function1;
+    iget-object v0, v0, Lcom/discord/views/steps/StepsView$b;->EY: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;->Fk:Lcom/discord/views/steps/StepsView;
+    iget-object p1, p0, Lcom/discord/views/steps/StepsView$g;->Fn: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;->Fk:Lcom/discord/views/steps/StepsView;
+    iget-object v0, p0, Lcom/discord/views/steps/StepsView$g;->Fn: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;->Fk:Lcom/discord/views/steps/StepsView;
+    iget-object p1, p0, Lcom/discord/views/steps/StepsView$g;->Fn: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;->Fk:Lcom/discord/views/steps/StepsView;
+    iget-object v0, p0, Lcom/discord/views/steps/StepsView$g;->Fn: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 f31e92bea1..3758d0113c 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 Fk:Lcom/discord/views/steps/StepsView;
+.field final synthetic Fn:Lcom/discord/views/steps/StepsView;
 
-.field final synthetic Fl:Lkotlin/jvm/functions/Function0;
+.field final synthetic Fo:Lkotlin/jvm/functions/Function0;
 
-.field final synthetic Fm:Ljava/util/List;
+.field final synthetic Fp: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;->Fk:Lcom/discord/views/steps/StepsView;
+    iput-object p1, p0, Lcom/discord/views/steps/StepsView$h;->Fn:Lcom/discord/views/steps/StepsView;
 
-    iput-object p2, p0, Lcom/discord/views/steps/StepsView$h;->Fm:Ljava/util/List;
+    iput-object p2, p0, Lcom/discord/views/steps/StepsView$h;->Fp:Ljava/util/List;
 
     iput p3, p0, Lcom/discord/views/steps/StepsView$h;->$position:I
 
-    iput-object p4, p0, Lcom/discord/views/steps/StepsView$h;->Fl:Lkotlin/jvm/functions/Function0;
+    iput-object p4, p0, Lcom/discord/views/steps/StepsView$h;->Fo: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;->Fm:Ljava/util/List;
+    iget-object v0, p0, Lcom/discord/views/steps/StepsView$h;->Fp: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;->EW:Lkotlin/jvm/functions/Function1;
+    iget-object v0, v0, Lcom/discord/views/steps/StepsView$b;->EZ: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;->Fk:Lcom/discord/views/steps/StepsView;
+    iget-object p1, p0, Lcom/discord/views/steps/StepsView$h;->Fn: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;->Fl:Lkotlin/jvm/functions/Function0;
+    iget-object p1, p0, Lcom/discord/views/steps/StepsView$h;->Fo: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;->Fk:Lcom/discord/views/steps/StepsView;
+    iget-object p1, p0, Lcom/discord/views/steps/StepsView$h;->Fn: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;->Fk:Lcom/discord/views/steps/StepsView;
+    iget-object v0, p0, Lcom/discord/views/steps/StepsView$h;->Fn: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 992629463f..d4d36fe6cb 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 Fl:Lkotlin/jvm/functions/Function0;
+.field final synthetic Fo:Lkotlin/jvm/functions/Function0;
 
-.field final synthetic Fm:Ljava/util/List;
+.field final synthetic Fp: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;->Fm:Ljava/util/List;
+    iput-object p1, p0, Lcom/discord/views/steps/StepsView$i;->Fp:Ljava/util/List;
 
     iput p2, p0, Lcom/discord/views/steps/StepsView$i;->$position:I
 
-    iput-object p3, p0, Lcom/discord/views/steps/StepsView$i;->Fl:Lkotlin/jvm/functions/Function0;
+    iput-object p3, p0, Lcom/discord/views/steps/StepsView$i;->Fo: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;->Fm:Ljava/util/List;
+    iget-object v0, p0, Lcom/discord/views/steps/StepsView$i;->Fp: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;->EX:Lkotlin/jvm/functions/Function1;
+    iget-object v0, v0, Lcom/discord/views/steps/StepsView$b;->Fa: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;->Fl:Lkotlin/jvm/functions/Function0;
+    iget-object p1, p0, Lcom/discord/views/steps/StepsView$i;->Fo: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 3e04d5a34d..2c3456a23a 100644
--- a/com.discord/smali/com/discord/views/steps/StepsView.smali
+++ b/com.discord/smali/com/discord/views/steps/StepsView.smali
@@ -15,22 +15,22 @@
 
 
 # static fields
-.field public static final ER:Lcom/discord/views/steps/StepsView$a;
+.field public static final EU:Lcom/discord/views/steps/StepsView$a;
 
 
 # instance fields
-.field private EM:Landroid/widget/Button;
+.field private EO:Landroid/widget/Button;
 
-.field private EN:Landroid/widget/Button;
+.field private EP:Landroid/widget/Button;
 
-.field private EO:Landroid/widget/TextView;
+.field private ER:Landroid/widget/TextView;
 
-.field public EP:Lcom/discord/views/steps/StepsView$d;
+.field public ES:Lcom/discord/utilities/simple_pager/SimplePager;
+
+.field public ET:Lcom/discord/views/steps/StepsView$d;
 
 .field private close:Landroid/view/View;
 
-.field public viewPager:Lcom/discord/utilities/simple_pager/SimplePager;
-
 
 # direct methods
 .method static constructor <clinit>()V
@@ -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;->ER:Lcom/discord/views/steps/StepsView$a;
+    sput-object v0, Lcom/discord/views/steps/StepsView;->EU:Lcom/discord/views/steps/StepsView$a;
 
     return-void
 .end method
@@ -96,7 +96,7 @@
 
     check-cast p1, Landroid/view/LayoutInflater;
 
-    const p2, 0x7f0d00af
+    const p2, 0x7f0d00ad
 
     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, 0x7f0a0744
+    const p1, 0x7f0a0725
 
     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;->EM:Landroid/widget/Button;
+    iput-object p1, p0, Lcom/discord/views/steps/StepsView;->EO:Landroid/widget/Button;
 
-    const p1, 0x7f0a0743
+    const p1, 0x7f0a0724
 
     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, 0x7f0a0745
+    const p1, 0x7f0a0726
 
     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;->EN:Landroid/widget/Button;
+    iput-object p1, p0, Lcom/discord/views/steps/StepsView;->EP:Landroid/widget/Button;
 
-    const p1, 0x7f0a0742
+    const p1, 0x7f0a0723
 
     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;->EO:Landroid/widget/TextView;
+    iput-object p1, p0, Lcom/discord/views/steps/StepsView;->ER:Landroid/widget/TextView;
 
-    const p1, 0x7f0a0746
+    const p1, 0x7f0a0727
 
     invoke-virtual {p0, p1}, Lcom/discord/views/steps/StepsView;->findViewById(I)Landroid/view/View;
 
@@ -172,7 +172,7 @@
 
     check-cast p1, Lcom/discord/utilities/simple_pager/SimplePager;
 
-    iput-object p1, p0, Lcom/discord/views/steps/StepsView;->viewPager:Lcom/discord/utilities/simple_pager/SimplePager;
+    iput-object p1, p0, Lcom/discord/views/steps/StepsView;->ES:Lcom/discord/utilities/simple_pager/SimplePager;
 
     return-void
 
@@ -226,7 +226,7 @@
 .method public static final synthetic a(Lcom/discord/views/steps/StepsView;)Lcom/discord/utilities/simple_pager/SimplePager;
     .locals 0
 
-    iget-object p0, p0, Lcom/discord/views/steps/StepsView;->viewPager:Lcom/discord/utilities/simple_pager/SimplePager;
+    iget-object p0, p0, Lcom/discord/views/steps/StepsView;->ES:Lcom/discord/utilities/simple_pager/SimplePager;
 
     return-object p0
 .end method
@@ -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;->EP:Lcom/discord/views/steps/StepsView$d;
+    iget-object p0, p0, Lcom/discord/views/steps/StepsView;->ET:Lcom/discord/views/steps/StepsView$d;
 
     return-object p0
 .end method
@@ -270,18 +270,18 @@
 
     invoke-virtual {v0, v1}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    iget-object v0, p0, Lcom/discord/views/steps/StepsView;->EP:Lcom/discord/views/steps/StepsView$d;
+    iget-object v0, p0, Lcom/discord/views/steps/StepsView;->ET:Lcom/discord/views/steps/StepsView$d;
 
     if-eqz v0, :cond_3
 
-    iget-object v0, v0, Lcom/discord/views/steps/StepsView$d;->Fj:Ljava/util/List;
+    iget-object v0, v0, Lcom/discord/views/steps/StepsView$d;->Fm:Ljava/util/List;
 
     if-nez v0, :cond_0
 
     goto/16 :goto_2
 
     :cond_0
-    iget-object v1, p0, Lcom/discord/views/steps/StepsView;->viewPager:Lcom/discord/utilities/simple_pager/SimplePager;
+    iget-object v1, p0, Lcom/discord/views/steps/StepsView;->ES:Lcom/discord/utilities/simple_pager/SimplePager;
 
     invoke-interface {v0, p1}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -289,11 +289,11 @@
 
     check-cast v2, Lcom/discord/views/steps/StepsView$b;
 
-    iget-boolean v2, v2, Lcom/discord/views/steps/StepsView$b;->EZ:Z
+    iget-boolean v2, v2, Lcom/discord/views/steps/StepsView$b;->Fc:Z
 
     invoke-virtual {v1, v2}, Lcom/discord/utilities/simple_pager/SimplePager;->setScrollingEnabled(Z)V
 
-    iget-object v1, p0, Lcom/discord/views/steps/StepsView;->EN:Landroid/widget/Button;
+    iget-object v1, p0, Lcom/discord/views/steps/StepsView;->EP:Landroid/widget/Button;
 
     invoke-virtual {p0}, Lcom/discord/views/steps/StepsView;->getContext()Landroid/content/Context;
 
@@ -305,7 +305,7 @@
 
     check-cast v3, Lcom/discord/views/steps/StepsView$b;
 
-    iget v3, v3, Lcom/discord/views/steps/StepsView$b;->ES:I
+    iget v3, v3, Lcom/discord/views/steps/StepsView$b;->EV:I
 
     invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -315,7 +315,7 @@
 
     invoke-virtual {v1, v2}, Landroid/widget/Button;->setText(Ljava/lang/CharSequence;)V
 
-    iget-object v1, p0, Lcom/discord/views/steps/StepsView;->EO:Landroid/widget/TextView;
+    iget-object v1, p0, Lcom/discord/views/steps/StepsView;->ER:Landroid/widget/TextView;
 
     invoke-virtual {p0}, Lcom/discord/views/steps/StepsView;->getContext()Landroid/content/Context;
 
@@ -327,7 +327,7 @@
 
     check-cast v3, Lcom/discord/views/steps/StepsView$b;
 
-    iget v3, v3, Lcom/discord/views/steps/StepsView$b;->ET:I
+    iget v3, v3, Lcom/discord/views/steps/StepsView$b;->EW:I
 
     invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -337,7 +337,7 @@
 
     invoke-virtual {v1, v2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    iget-object v1, p0, Lcom/discord/views/steps/StepsView;->EM:Landroid/widget/Button;
+    iget-object v1, p0, Lcom/discord/views/steps/StepsView;->EO:Landroid/widget/Button;
 
     invoke-virtual {p0}, Lcom/discord/views/steps/StepsView;->getContext()Landroid/content/Context;
 
@@ -349,7 +349,7 @@
 
     check-cast v3, Lcom/discord/views/steps/StepsView$b;
 
-    iget v3, v3, Lcom/discord/views/steps/StepsView$b;->EU:I
+    iget v3, v3, Lcom/discord/views/steps/StepsView$b;->EX:I
 
     invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -359,7 +359,7 @@
 
     invoke-virtual {v1, v2}, Landroid/widget/Button;->setText(Ljava/lang/CharSequence;)V
 
-    iget-object v1, p0, Lcom/discord/views/steps/StepsView;->EN:Landroid/widget/Button;
+    iget-object v1, p0, Lcom/discord/views/steps/StepsView;->EP: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;->EO:Landroid/widget/TextView;
+    iget-object v1, p0, Lcom/discord/views/steps/StepsView;->ER: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;->EM:Landroid/widget/Button;
+    iget-object v1, p0, Lcom/discord/views/steps/StepsView;->EO: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;->EP:Lcom/discord/views/steps/StepsView$d;
+    iget-object p2, p0, Lcom/discord/views/steps/StepsView;->ET: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;->EN:Landroid/widget/Button;
+    iget-object v3, p0, Lcom/discord/views/steps/StepsView;->EP: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;->EY:Z
+    iget-boolean p1, p1, Lcom/discord/views/steps/StepsView$b;->Fb: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;->EO:Landroid/widget/TextView;
+    iget-object v1, p0, Lcom/discord/views/steps/StepsView;->ER: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;->EM:Landroid/widget/Button;
+    iget-object v1, p0, Lcom/discord/views/steps/StepsView;->EO:Landroid/widget/Button;
 
     check-cast v1, Landroid/view/View;
 
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
deleted file mode 100644
index 420517ca0b..0000000000
--- a/com.discord/smali/com/discord/views/video/AppVideoStreamRenderer$a$2.smali
+++ /dev/null
@@ -1,88 +0,0 @@
-.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/AppVideoStreamRenderer$a.smali b/com.discord/smali/com/discord/views/video/AppVideoStreamRenderer$a.smali
deleted file mode 100644
index 17c71c5105..0000000000
--- a/com.discord/smali/com/discord/views/video/AppVideoStreamRenderer$a.smali
+++ /dev/null
@@ -1,233 +0,0 @@
-.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
deleted file mode 100644
index 9116ef5dcd..0000000000
--- a/com.discord/smali/com/discord/views/video/AppVideoStreamRenderer.smali
+++ /dev/null
@@ -1,468 +0,0 @@
-.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
deleted file mode 100644
index 191824c949..0000000000
--- a/com.discord/smali/com/discord/views/video/ApplicationStreamView$1.smali
+++ /dev/null
@@ -1,117 +0,0 @@
-.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
deleted file mode 100644
index 9a72d7ce41..0000000000
--- a/com.discord/smali/com/discord/views/video/ApplicationStreamView$a$a.smali
+++ /dev/null
@@ -1,112 +0,0 @@
-.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
deleted file mode 100644
index 21a931264d..0000000000
--- a/com.discord/smali/com/discord/views/video/ApplicationStreamView$a$b.smali
+++ /dev/null
@@ -1,42 +0,0 @@
-.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
deleted file mode 100644
index 721f8a1ac3..0000000000
--- a/com.discord/smali/com/discord/views/video/ApplicationStreamView$a$c.smali
+++ /dev/null
@@ -1,42 +0,0 @@
-.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
deleted file mode 100644
index 4922ca5d4e..0000000000
--- a/com.discord/smali/com/discord/views/video/ApplicationStreamView$a.smali
+++ /dev/null
@@ -1,40 +0,0 @@
-.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
deleted file mode 100644
index 08419b03bb..0000000000
--- a/com.discord/smali/com/discord/views/video/ApplicationStreamView.smali
+++ /dev/null
@@ -1,567 +0,0 @@
-.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
deleted file mode 100644
index c0cf91fdf9..0000000000
--- a/com.discord/smali/com/discord/views/video/VideoCallParticipantView$1.smali
+++ /dev/null
@@ -1,89 +0,0 @@
-.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 b90e9fa9fa..55e9382efd 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 FM:Lcom/discord/models/domain/ModelVoice$User;
+.field final FE:Lcom/discord/models/domain/ModelVoice$User;
 
-.field final FO:Z
+.field final FG:Lorg/webrtc/RendererCommon$ScalingType;
 
-.field final Fs:Lorg/webrtc/RendererCommon$ScalingType;
+.field final FJ:Z
 
 .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;->FM:Lcom/discord/models/domain/ModelVoice$User;
+    iput-object p1, p0, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->FE:Lcom/discord/models/domain/ModelVoice$User;
 
-    iput-boolean p2, p0, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->FO:Z
+    iput-boolean p2, p0, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->FJ:Z
 
-    iput-object p3, p0, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->Fs:Lorg/webrtc/RendererCommon$ScalingType;
+    iput-object p3, p0, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->FG: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;->FM:Lcom/discord/models/domain/ModelVoice$User;
+    iget-object p1, p0, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->FE: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;->FM:Lcom/discord/models/domain/ModelVoice$User;
+    iget-object v1, p0, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->FE:Lcom/discord/models/domain/ModelVoice$User;
 
-    iget-object v3, p1, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->FM:Lcom/discord/models/domain/ModelVoice$User;
+    iget-object v3, p1, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->FE: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;->FO:Z
+    iget-boolean v1, p0, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->FJ:Z
 
-    iget-boolean v3, p1, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->FO:Z
+    iget-boolean v3, p1, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->FJ: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;->Fs:Lorg/webrtc/RendererCommon$ScalingType;
+    iget-object v1, p0, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->FG:Lorg/webrtc/RendererCommon$ScalingType;
 
-    iget-object v3, p1, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->Fs:Lorg/webrtc/RendererCommon$ScalingType;
+    iget-object v3, p1, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->FG: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;->FM:Lcom/discord/models/domain/ModelVoice$User;
+    iget-object v0, p0, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->FE: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;->FO:Z
+    iget-boolean v2, p0, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->FJ: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;->Fs:Lorg/webrtc/RendererCommon$ScalingType;
+    iget-object v2, p0, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->FG: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;->FM:Lcom/discord/models/domain/ModelVoice$User;
+    iget-object v1, p0, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->FE: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;->FO:Z
+    iget-boolean v1, p0, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->FJ: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;->Fs:Lorg/webrtc/RendererCommon$ScalingType;
+    iget-object v1, p0, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->FG: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 1bb577a7aa..fcad778457 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;->bgq:Ljava/util/List;
+    iget-object v0, v0, Ljp/wasabeef/fresco/a/c$a;->bgl: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;->Zz:Lcom/facebook/imagepipeline/request/c;
+    iput-object v1, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Zv:Lcom/facebook/imagepipeline/request/c;
 
-    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/views/video/AppVideoStreamRenderer$a$1.smali b/com.discord/smali/com/discord/views/video/VideoCallParticipantView$b$1.smali
similarity index 57%
rename from com.discord/smali/com/discord/views/video/AppVideoStreamRenderer$a$1.smali
rename to com.discord/smali/com/discord/views/video/VideoCallParticipantView$b$1.smali
index 52ec2dfd0c..5dbee82d49 100644
--- a/com.discord/smali/com/discord/views/video/AppVideoStreamRenderer$a$1.smali
+++ b/com.discord/smali/com/discord/views/video/VideoCallParticipantView$b$1.smali
@@ -1,6 +1,6 @@
-.class final Lcom/discord/views/video/AppVideoStreamRenderer$a$1;
+.class final Lcom/discord/views/video/VideoCallParticipantView$b$1;
 .super Ljava/lang/Object;
-.source "AppVideoStreamRenderer.kt"
+.source "VideoCallParticipantView.kt"
 
 # interfaces
 .implements Lrx/functions/b;
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/views/video/AppVideoStreamRenderer$a;->invoke(I)V
+    value = Lcom/discord/views/video/VideoCallParticipantView$b;->a(ILco/discord/media_engine/VideoStreamRenderer;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -33,14 +33,14 @@
 
 
 # instance fields
-.field final synthetic Fu:Lcom/discord/views/video/b;
+.field final synthetic FK:Lcom/discord/views/video/a;
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/views/video/b;)V
+.method constructor <init>(Lcom/discord/views/video/a;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/views/video/AppVideoStreamRenderer$a$1;->Fu:Lcom/discord/views/video/b;
+    iput-object p1, p0, Lcom/discord/views/video/VideoCallParticipantView$b$1;->FK:Lcom/discord/views/video/a;
 
     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/AppVideoStreamRenderer$a$1;->Fu:Lcom/discord/views/video/b;
+    iget-object p1, p0, Lcom/discord/views/video/VideoCallParticipantView$b$1;->FK:Lcom/discord/views/video/a;
 
-    invoke-static {p1}, Lcom/discord/views/video/b;->a(Lcom/discord/views/video/b;)Lrx/Observable;
+    invoke-static {p1}, Lcom/discord/views/video/a;->a(Lcom/discord/views/video/a;)Lrx/Observable;
 
     move-result-object p1
 
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
new file mode 100644
index 0000000000..56568d5ef5
--- /dev/null
+++ b/com.discord/smali/com/discord/views/video/VideoCallParticipantView$b$2.smali
@@ -0,0 +1,75 @@
+.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;->bgt:Lkotlin/Unit;
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/views/video/AppVideoStreamRenderer$a$3.smali b/com.discord/smali/com/discord/views/video/VideoCallParticipantView$b$3.smali
similarity index 50%
rename from com.discord/smali/com/discord/views/video/AppVideoStreamRenderer$a$3.smali
rename to com.discord/smali/com/discord/views/video/VideoCallParticipantView$b$3.smali
index d074534226..011fda919b 100644
--- a/com.discord/smali/com/discord/views/video/AppVideoStreamRenderer$a$3.smali
+++ b/com.discord/smali/com/discord/views/video/VideoCallParticipantView$b$3.smali
@@ -1,6 +1,6 @@
-.class final Lcom/discord/views/video/AppVideoStreamRenderer$a$3;
+.class final Lcom/discord/views/video/VideoCallParticipantView$b$3;
 .super Lkotlin/jvm/internal/m;
-.source "AppVideoStreamRenderer.kt"
+.source "VideoCallParticipantView.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/views/video/AppVideoStreamRenderer$a;->invoke(I)V
+    value = Lcom/discord/views/video/VideoCallParticipantView$b;->a(ILco/discord/media_engine/VideoStreamRenderer;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -28,14 +28,14 @@
 
 
 # instance fields
-.field final synthetic this$0:Lcom/discord/views/video/AppVideoStreamRenderer$a;
+.field final synthetic this$0:Lcom/discord/views/video/VideoCallParticipantView$b;
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/views/video/AppVideoStreamRenderer$a;)V
+.method constructor <init>(Lcom/discord/views/video/VideoCallParticipantView$b;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/views/video/AppVideoStreamRenderer$a$3;->this$0:Lcom/discord/views/video/AppVideoStreamRenderer$a;
+    iput-object p1, p0, Lcom/discord/views/video/VideoCallParticipantView$b$3;->this$0:Lcom/discord/views/video/VideoCallParticipantView$b;
 
     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/AppVideoStreamRenderer$a$3;->this$0:Lcom/discord/views/video/AppVideoStreamRenderer$a;
+    iget-object v0, p0, Lcom/discord/views/video/VideoCallParticipantView$b$3;->this$0:Lcom/discord/views/video/VideoCallParticipantView$b;
 
-    iget-object v0, v0, Lcom/discord/views/video/AppVideoStreamRenderer$a;->this$0:Lcom/discord/views/video/AppVideoStreamRenderer;
+    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/AppVideoStreamRenderer;->a(Lcom/discord/views/video/AppVideoStreamRenderer;Lrx/Subscription;)V
+    invoke-static {v0, p1}, Lcom/discord/views/video/VideoCallParticipantView;->a(Lcom/discord/views/video/VideoCallParticipantView;Lrx/Subscription;)V
 
-    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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
new file mode 100644
index 0000000000..da2aadc447
--- /dev/null
+++ b/com.discord/smali/com/discord/views/video/VideoCallParticipantView$b.smali
@@ -0,0 +1,175 @@
+.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;->bgt: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 8d81871afd..14da214d90 100644
--- a/com.discord/smali/com/discord/views/video/VideoCallParticipantView.smali
+++ b/com.discord/smali/com/discord/views/video/VideoCallParticipantView.smali
@@ -19,28 +19,52 @@
 
 
 # instance fields
-.field private final FF:Lkotlin/properties/ReadOnlyProperty;
+.field private final FA:Lrx/subjects/BehaviorSubject;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/subjects/BehaviorSubject<",
+            "Lkotlin/Unit;",
+            ">;"
+        }
+    .end annotation
+.end field
 
-.field private final FG:Lkotlin/properties/ReadOnlyProperty;
+.field private FB:Lrx/Subscription;
 
-.field private final FH:Lkotlin/properties/ReadOnlyProperty;
+.field private final FC:Z
 
-.field private final FI:Lkotlin/properties/ReadOnlyProperty;
+.field private final FD:Z
 
-.field private final FJ:Lkotlin/properties/ReadOnlyProperty;
+.field private FE:Lcom/discord/models/domain/ModelVoice$User;
 
-.field private final FK:I
+.field private FF:Lco/discord/media_engine/VideoStreamRenderer;
 
-.field private final FL:I
+.field private FG:Lorg/webrtc/RendererCommon$ScalingType;
 
-.field private FM:Lcom/discord/models/domain/ModelVoice$User;
+.field private FH:Z
 
-.field private FN:Ljava/lang/String;
+.field private FI:Ljava/lang/String;
 
-.field private final Fo:Z
+.field private final Fs:Lkotlin/properties/ReadOnlyProperty;
+
+.field private final Ft:Lkotlin/properties/ReadOnlyProperty;
+
+.field private final Fu:Lkotlin/properties/ReadOnlyProperty;
+
+.field private final Fv:Lkotlin/properties/ReadOnlyProperty;
+
+.field private final Fw:Lkotlin/properties/ReadOnlyProperty;
 
 .field private final Fx:Lkotlin/properties/ReadOnlyProperty;
 
+.field private final Fy:I
+
+.field private final Fz:I
+
+.field private scalingTypeMismatchOrientation:Lorg/webrtc/RendererCommon$ScalingType;
+
+.field private streamId:Ljava/lang/Integer;
+
 
 # direct methods
 .method static constructor <clinit>()V
@@ -58,6 +82,28 @@
 
     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;"
@@ -70,7 +116,7 @@
 
     check-cast v2, Lkotlin/reflect/KProperty;
 
-    const/4 v3, 0x0
+    const/4 v3, 0x1
 
     aput-object v2, v1, v3
 
@@ -92,7 +138,7 @@
 
     check-cast v2, Lkotlin/reflect/KProperty;
 
-    const/4 v3, 0x1
+    const/4 v3, 0x2
 
     aput-object v2, v1, v3
 
@@ -114,7 +160,7 @@
 
     check-cast v2, Lkotlin/reflect/KProperty;
 
-    const/4 v3, 0x2
+    const/4 v3, 0x3
 
     aput-object v2, v1, v3
 
@@ -136,28 +182,6 @@
 
     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
@@ -168,9 +192,9 @@
 
     move-result-object v0
 
-    const-string v3, "videoStreamRenderer"
+    const-string v3, "letterbox"
 
-    const-string v4, "getVideoStreamRenderer()Lcom/discord/views/video/AppVideoStreamRenderer;"
+    const-string v4, "getLetterbox()Landroid/view/View;"
 
     invoke-direct {v2, v0, v3, v4}, Lkotlin/jvm/internal/x;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
 
@@ -238,31 +262,47 @@
 
     invoke-direct {p0, p1, p2, p3}, Landroid/widget/RelativeLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 
-    const p3, 0x7f0a04ea
+    const p3, 0x7f0a04d9
 
     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;->FF:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p3, p0, Lcom/discord/views/video/VideoCallParticipantView;->Fs:Lkotlin/properties/ReadOnlyProperty;
 
-    const p3, 0x7f0a04e4
+    const p3, 0x7f0a04dc
 
     invoke-static {p0, p3}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object p3
 
-    iput-object p3, p0, Lcom/discord/views/video/VideoCallParticipantView;->FG:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p3, p0, Lcom/discord/views/video/VideoCallParticipantView;->Ft:Lkotlin/properties/ReadOnlyProperty;
 
-    const p3, 0x7f0a04e9
+    const p3, 0x7f0a04d7
 
     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;->FH:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p3, p0, Lcom/discord/views/video/VideoCallParticipantView;->Fu:Lkotlin/properties/ReadOnlyProperty;
 
-    const p3, 0x7f0a04e7
+    const p3, 0x7f0a04db
+
+    invoke-static {p0, p3}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p3
+
+    iput-object p3, p0, Lcom/discord/views/video/VideoCallParticipantView;->Fv:Lkotlin/properties/ReadOnlyProperty;
+
+    const p3, 0x7f0a04da
+
+    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;->Fw:Lkotlin/properties/ReadOnlyProperty;
+
+    const p3, 0x7f0a04d8
 
     invoke-static {p0, p3}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -270,22 +310,6 @@
 
     iput-object p3, p0, Lcom/discord/views/video/VideoCallParticipantView;->Fx:Lkotlin/properties/ReadOnlyProperty;
 
-    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;->FI:Lkotlin/properties/ReadOnlyProperty;
-
-    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;->FJ:Lkotlin/properties/ReadOnlyProperty;
-
     invoke-virtual {p0}, Lcom/discord/views/video/VideoCallParticipantView;->getResources()Landroid/content/res/Resources;
 
     move-result-object p3
@@ -296,7 +320,7 @@
 
     move-result p3
 
-    iput p3, p0, Lcom/discord/views/video/VideoCallParticipantView;->FK:I
+    iput p3, p0, Lcom/discord/views/video/VideoCallParticipantView;->Fy:I
 
     invoke-virtual {p0}, Lcom/discord/views/video/VideoCallParticipantView;->getResources()Landroid/content/res/Resources;
 
@@ -308,13 +332,29 @@
 
     move-result p3
 
-    iput p3, p0, Lcom/discord/views/video/VideoCallParticipantView;->FL:I
+    iput p3, p0, Lcom/discord/views/video/VideoCallParticipantView;->Fz:I
+
+    sget-object p3, Lkotlin/Unit;->bgt: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;->FA: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;->FG: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;
 
     move-object p3, p0
 
     check-cast p3, Landroid/view/ViewGroup;
 
-    const v0, 0x7f0d00b6
+    const v0, 0x7f0d00b4
 
     invoke-static {p1, v0, p3}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
@@ -332,53 +372,24 @@
 
     move-result p2
 
-    const/4 v0, 0x1
+    iput-boolean p2, p0, Lcom/discord/views/video/VideoCallParticipantView;->FC:Z
 
-    invoke-virtual {p1, v0, p3}, Landroid/content/res/TypedArray;->getBoolean(IZ)Z
+    const/4 p2, 0x1
 
-    move-result p3
+    invoke-virtual {p1, p2, p3}, Landroid/content/res/TypedArray;->getBoolean(IZ)Z
 
-    iput-boolean p3, p0, Lcom/discord/views/video/VideoCallParticipantView;->Fo:Z
+    move-result p2
+
+    iput-boolean p2, p0, Lcom/discord/views/video/VideoCallParticipantView;->FD:Z
 
     invoke-virtual {p1}, Landroid/content/res/TypedArray;->recycle()V
 
-    goto :goto_0
+    return-void
 
     :cond_0
-    iput-boolean p3, p0, Lcom/discord/views/video/VideoCallParticipantView;->Fo:Z
+    iput-boolean p3, p0, Lcom/discord/views/video/VideoCallParticipantView;->FC: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
+    iput-boolean p3, p0, Lcom/discord/views/video/VideoCallParticipantView;->FD:Z
 
     return-void
 .end method
@@ -405,44 +416,37 @@
     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;->FB:Lrx/Subscription;
+
+    return-object p0
+.end method
+
 .method public static final synthetic a(Lcom/discord/views/video/VideoCallParticipantView;Landroid/graphics/Point;)V
     .locals 4
 
-    invoke-direct {p0}, Lcom/discord/views/video/VideoCallParticipantView;->getVideoStreamRenderer()Lcom/discord/views/video/AppVideoStreamRenderer;
+    if-nez p1, :cond_0
 
-    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
+    return-void
 
+    :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_0
+    if-le v0, p1, :cond_1
 
     const/4 p1, 0x1
 
     goto :goto_0
 
-    :cond_0
+    :cond_1
     const/4 p1, 0x0
 
     :goto_0
@@ -454,135 +458,211 @@
 
     move-result v3
 
-    if-le v0, v3, :cond_1
+    if-le v0, v3, :cond_2
 
     const/4 v0, 0x1
 
     goto :goto_1
 
-    :cond_1
+    :cond_2
     const/4 v0, 0x0
 
     :goto_1
-    if-eq p1, v0, :cond_2
+    if-eq p1, v0, :cond_3
 
     const/4 v1, 0x1
 
-    :cond_2
-    iget-boolean p1, p0, Lcom/discord/views/video/VideoCallParticipantView;->Fo:Z
+    :cond_3
+    iget-boolean p1, p0, Lcom/discord/views/video/VideoCallParticipantView;->FD:Z
 
-    if-eqz p1, :cond_3
+    if-eqz p1, :cond_4
 
-    if-eqz v1, :cond_3
-
-    invoke-virtual {p0}, Lcom/discord/views/video/VideoCallParticipantView;->getHeight()I
-
-    move-result p1
+    if-eqz v1, :cond_4
 
     invoke-virtual {p0}, Lcom/discord/views/video/VideoCallParticipantView;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
 
-    move-result-object v0
+    move-result-object p1
+
+    invoke-virtual {p0}, Lcom/discord/views/video/VideoCallParticipantView;->getHeight()I
+
+    move-result v0
 
     invoke-virtual {p0}, Lcom/discord/views/video/VideoCallParticipantView;->getWidth()I
 
     move-result v1
 
-    iput v1, v0, Landroid/view/ViewGroup$LayoutParams;->height:I
+    iput v1, p1, Landroid/view/ViewGroup$LayoutParams;->height:I
 
-    invoke-virtual {p0}, Lcom/discord/views/video/VideoCallParticipantView;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
+    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;->FF: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;->FG: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;->FB: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;->FA: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;
 
     move-result-object p0
 
-    iput p1, p0, Landroid/view/ViewGroup$LayoutParams;->width:I
+    return-object p0
+.end method
 
-    :cond_3
+.method private final fm()V
+    .locals 7
+
+    iget-object v6, p0, Lcom/discord/views/video/VideoCallParticipantView;->FF:Lco/discord/media_engine/VideoStreamRenderer;
+
+    if-eqz v6, :cond_1
+
+    iget-object v0, p0, Lcom/discord/views/video/VideoCallParticipantView;->FB: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;->FF: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
     return-void
 .end method
 
 .method private final getBackgroundAvatar()Landroid/widget/ImageView;
     .locals 3
 
-    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, 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/ImageView;
-
-    return-object v0
-.end method
-
-.method private final getLetterbox()Landroid/view/View;
-    .locals 3
-
-    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;
-
-    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 getLoadingIndicator()Landroid/view/View;
-    .locals 3
-
-    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;
-
-    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 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;
+    iget-object v0, p0, Lcom/discord/views/video/VideoCallParticipantView;->Fu:Lkotlin/properties/ReadOnlyProperty;
 
     sget-object v1, Lcom/discord/views/video/VideoCallParticipantView;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -599,10 +679,10 @@
     return-object v0
 .end method
 
-.method private final getVoiceUserView()Lcom/discord/views/VoiceUserView;
+.method private final getContentContainer()Landroid/view/ViewGroup;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/views/video/VideoCallParticipantView;->FF:Lkotlin/properties/ReadOnlyProperty;
+    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;
 
@@ -614,6 +694,86 @@
 
     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;->Fx: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;->Fw:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/views/video/VideoCallParticipantView;->$$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 getVoiceStatusIndicator()Landroid/widget/ImageView;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/views/video/VideoCallParticipantView;->Fv:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/views/video/VideoCallParticipantView;->$$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 getVoiceUserView()Lcom/discord/views/VoiceUserView;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/views/video/VideoCallParticipantView;->Ft:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/views/video/VideoCallParticipantView;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+    const/4 v2, 0x1
+
+    aget-object v1, v1, v2
+
+    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
+
+    move-result-object v0
+
     check-cast v0, Lcom/discord/views/VoiceUserView;
 
     return-object v0
@@ -624,7 +784,7 @@
 .method public final getDataId()Ljava/lang/String;
     .locals 2
 
-    iget-object v0, p0, Lcom/discord/views/video/VideoCallParticipantView;->FM:Lcom/discord/models/domain/ModelVoice$User;
+    iget-object v0, p0, Lcom/discord/views/video/VideoCallParticipantView;->FE:Lcom/discord/models/domain/ModelVoice$User;
 
     if-eqz v0, :cond_0
 
@@ -653,7 +813,7 @@
 .method public final getParticipant()Lcom/discord/models/domain/ModelVoice$User;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/views/video/VideoCallParticipantView;->FM:Lcom/discord/models/domain/ModelVoice$User;
+    iget-object v0, p0, Lcom/discord/views/video/VideoCallParticipantView;->FE:Lcom/discord/models/domain/ModelVoice$User;
 
     return-object v0
 .end method
@@ -672,6 +832,20 @@
     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;->fm()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
 
@@ -689,11 +863,11 @@
 
     move-result p1
 
-    iget p2, p0, Lcom/discord/views/video/VideoCallParticipantView;->FL:I
+    iget p2, p0, Lcom/discord/views/video/VideoCallParticipantView;->Fz:I
 
     sub-int/2addr p1, p2
 
-    iget p2, p0, Lcom/discord/views/video/VideoCallParticipantView;->FK:I
+    iget p2, p0, Lcom/discord/views/video/VideoCallParticipantView;->Fy:I
 
     invoke-static {p1, p2}, Ljava/lang/Math;->min(II)I
 
@@ -716,323 +890,404 @@
     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;->FA:Lrx/subjects/BehaviorSubject;
+
+    sget-object p2, Lkotlin/Unit;->bgt: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 13
+    .locals 12
 
-    iget-object v0, p0, Lcom/discord/views/video/VideoCallParticipantView;->FM:Lcom/discord/models/domain/ModelVoice$User;
-
-    const/4 v1, 0x0
+    const/4 v0, 0x0
 
     if-eqz p1, :cond_0
 
-    iget-object v2, p1, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->FM:Lcom/discord/models/domain/ModelVoice$User;
+    iget-object v1, p1, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->FE:Lcom/discord/models/domain/ModelVoice$User;
 
     goto :goto_0
 
     :cond_0
-    move-object v2, v1
+    move-object v1, v0
 
     :goto_0
-    iput-object v2, p0, Lcom/discord/views/video/VideoCallParticipantView;->FM:Lcom/discord/models/domain/ModelVoice$User;
+    iput-object v1, p0, Lcom/discord/views/video/VideoCallParticipantView;->FE:Lcom/discord/models/domain/ModelVoice$User;
 
-    iget-object v2, p0, Lcom/discord/views/video/VideoCallParticipantView;->FM:Lcom/discord/models/domain/ModelVoice$User;
+    const/4 v1, 0x0
 
-    if-eqz v2, :cond_1
+    if-eqz p1, :cond_1
 
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelVoice$User;->getStreamId()Ljava/lang/Integer;
-
-    move-result-object v2
+    iget-boolean v2, p1, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->FJ:Z
 
     goto :goto_1
 
     :cond_1
-    move-object v2, v1
+    const/4 v2, 0x0
 
     :goto_1
-    if-eqz v0, :cond_2
+    iput-boolean v2, p0, Lcom/discord/views/video/VideoCallParticipantView;->FH:Z
 
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelVoice$User;->getStreamId()Ljava/lang/Integer;
+    iget-object v2, p0, Lcom/discord/views/video/VideoCallParticipantView;->FG:Lorg/webrtc/RendererCommon$ScalingType;
 
-    move-result-object v0
+    iget-object v3, p0, Lcom/discord/views/video/VideoCallParticipantView;->scalingTypeMismatchOrientation:Lorg/webrtc/RendererCommon$ScalingType;
 
-    goto :goto_2
+    if-eqz p1, :cond_2
+
+    iget-object v4, p1, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->FG:Lorg/webrtc/RendererCommon$ScalingType;
+
+    if-nez v4, :cond_3
 
     :cond_2
-    move-object v0, v1
-
-    :goto_2
-    invoke-static {v2, v0}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    const/4 v2, 0x1
-
-    xor-int/2addr v0, v2
-
-    const/4 v3, 0x0
-
-    if-eqz v0, :cond_5
-
-    iget-object v0, p0, Lcom/discord/views/video/VideoCallParticipantView;->FM:Lcom/discord/models/domain/ModelVoice$User;
-
-    if-eqz v0, :cond_3
-
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelVoice$User;->getStreamId()Ljava/lang/Integer;
-
-    move-result-object v0
-
-    goto :goto_3
+    sget-object v4, Lorg/webrtc/RendererCommon$ScalingType;->SCALE_ASPECT_BALANCED:Lorg/webrtc/RendererCommon$ScalingType;
 
     :cond_3
-    move-object v0, v1
+    iput-object v4, p0, Lcom/discord/views/video/VideoCallParticipantView;->FG:Lorg/webrtc/RendererCommon$ScalingType;
 
-    :goto_3
-    const/16 v4, 0x8
+    if-eqz p1, :cond_4
 
-    if-eqz v0, :cond_4
+    iget-object p1, p1, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->scalingTypeMismatchOrientation:Lorg/webrtc/RendererCommon$ScalingType;
 
-    invoke-direct {p0}, Lcom/discord/views/video/VideoCallParticipantView;->getVideoStreamRenderer()Lcom/discord/views/video/AppVideoStreamRenderer;
-
-    move-result-object v0
-
-    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 v0
-
-    invoke-virtual {v0, v3}, Landroid/view/View;->setVisibility(I)V
-
-    invoke-direct {p0}, Lcom/discord/views/video/VideoCallParticipantView;->getLoadingIndicator()Landroid/view/View;
-
-    move-result-object v0
-
-    invoke-virtual {v0, v3}, Landroid/view/View;->setVisibility(I)V
-
-    goto :goto_4
+    if-nez p1, :cond_5
 
     :cond_4
-    invoke-direct {p0}, Lcom/discord/views/video/VideoCallParticipantView;->getVideoStreamRenderer()Lcom/discord/views/video/AppVideoStreamRenderer;
-
-    move-result-object v0
-
-    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 v0
-
-    invoke-virtual {v0, v4}, Landroid/view/View;->setVisibility(I)V
-
-    invoke-direct {p0}, Lcom/discord/views/video/VideoCallParticipantView;->getLoadingIndicator()Landroid/view/View;
-
-    move-result-object v0
-
-    invoke-virtual {v0, v4}, Landroid/view/View;->setVisibility(I)V
+    sget-object p1, Lorg/webrtc/RendererCommon$ScalingType;->SCALE_ASPECT_BALANCED:Lorg/webrtc/RendererCommon$ScalingType;
 
     :cond_5
-    :goto_4
-    iget-object v0, p0, Lcom/discord/views/video/VideoCallParticipantView;->FM:Lcom/discord/models/domain/ModelVoice$User;
+    iput-object p1, p0, Lcom/discord/views/video/VideoCallParticipantView;->scalingTypeMismatchOrientation:Lorg/webrtc/RendererCommon$ScalingType;
 
-    if-eqz v0, :cond_6
+    iget-object p1, p0, Lcom/discord/views/video/VideoCallParticipantView;->FG: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;->FF: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;->FE: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 v4
+    move-result-object v2
 
-    invoke-static {v4, v0}, Lcom/discord/views/VoiceUserView;->a(Lcom/discord/views/VoiceUserView;Lcom/discord/models/domain/ModelVoice$User;)V
+    invoke-static {v2, p1}, Lcom/discord/views/VoiceUserView;->a(Lcom/discord/views/VoiceUserView;Lcom/discord/models/domain/ModelVoice$User;)V
 
-    :cond_6
-    iget-object v0, p0, Lcom/discord/views/video/VideoCallParticipantView;->FM:Lcom/discord/models/domain/ModelVoice$User;
+    :cond_8
+    iget-object p1, p0, Lcom/discord/views/video/VideoCallParticipantView;->FE:Lcom/discord/models/domain/ModelVoice$User;
 
-    if-eqz v0, :cond_7
+    if-eqz p1, :cond_9
 
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelVoice$User;->getUser()Lcom/discord/models/domain/ModelUser;
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelVoice$User;->getUser()Lcom/discord/models/domain/ModelUser;
 
-    move-result-object v0
+    move-result-object p1
 
-    goto :goto_5
+    goto :goto_2
 
-    :cond_7
-    move-object v0, v1
+    :cond_9
+    move-object p1, v0
 
-    :goto_5
-    const/4 v4, 0x2
+    :goto_2
+    const/4 v2, 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;
+    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 v0
+    move-result-object p1
 
-    iget-object v5, p0, Lcom/discord/views/video/VideoCallParticipantView;->FN:Ljava/lang/String;
+    iget-object v3, p0, Lcom/discord/views/video/VideoCallParticipantView;->FI:Ljava/lang/String;
 
-    invoke-static {v0, v5}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {p1, v3}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
-    move-result v5
+    move-result v3
 
-    xor-int/2addr v5, v2
+    const/4 v4, 0x1
 
-    if-eqz v5, :cond_9
+    xor-int/2addr v3, v4
 
-    iput-object v0, p0, Lcom/discord/views/video/VideoCallParticipantView;->FN:Ljava/lang/String;
+    if-eqz v3, :cond_b
+
+    iput-object p1, p0, Lcom/discord/views/video/VideoCallParticipantView;->FI:Ljava/lang/String;
 
     invoke-direct {p0}, Lcom/discord/views/video/VideoCallParticipantView;->getBackgroundAvatar()Landroid/widget/ImageView;
 
-    move-result-object v6
+    move-result-object v5
 
-    iget-object v0, p0, Lcom/discord/views/video/VideoCallParticipantView;->FM:Lcom/discord/models/domain/ModelVoice$User;
+    iget-object p1, p0, Lcom/discord/views/video/VideoCallParticipantView;->FE:Lcom/discord/models/domain/ModelVoice$User;
 
-    if-eqz v0, :cond_8
+    if-eqz p1, :cond_a
 
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelVoice$User;->getUser()Lcom/discord/models/domain/ModelUser;
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelVoice$User;->getUser()Lcom/discord/models/domain/ModelUser;
 
-    move-result-object v0
+    move-result-object p1
 
-    move-object v7, v0
+    move-object v6, p1
 
-    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
+    goto :goto_3
 
     :cond_a
-    const/4 v0, 0x0
+    move-object v6, v0
 
-    :goto_7
-    iget-object v5, p0, Lcom/discord/views/video/VideoCallParticipantView;->FM:Lcom/discord/models/domain/ModelVoice$User;
+    :goto_3
+    const/4 v7, 0x0
 
-    if-eqz v5, :cond_b
+    new-instance p1, Lcom/discord/views/video/VideoCallParticipantView$a;
 
-    invoke-virtual {v5}, Lcom/discord/models/domain/ModelVoice$User;->getVoiceState()Lcom/discord/models/domain/ModelVoice$State;
+    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;->FE: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;->FE: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
 
-    if-eqz v5, :cond_b
+    move-object v6, v5
 
-    invoke-virtual {v5}, Lcom/discord/models/domain/ModelVoice$State;->isSelfDeaf()Z
+    check-cast v6, Landroid/view/View;
 
-    move-result v5
+    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_b
-    const/4 v5, 0x0
+    :cond_10
+    if-eqz p1, :cond_11
+
+    const p1, 0x7f0802f2
+
+    goto :goto_8
+
+    :cond_11
+    const/4 p1, 0x0
 
     :goto_8
-    invoke-direct {p0}, Lcom/discord/views/video/VideoCallParticipantView;->getVoiceStatusIndicator()Landroid/widget/ImageView;
+    invoke-virtual {v5, p1}, Landroid/widget/ImageView;->setImageResource(I)V
 
-    move-result-object v6
+    new-instance p1, Lcom/discord/views/video/VideoCallParticipantView$b;
 
-    move-object v7, v6
+    invoke-direct {p1, p0}, Lcom/discord/views/video/VideoCallParticipantView$b;-><init>(Lcom/discord/views/video/VideoCallParticipantView;)V
 
-    check-cast v7, Landroid/view/View;
+    iget-object v2, p0, Lcom/discord/views/video/VideoCallParticipantView;->FE:Lcom/discord/models/domain/ModelVoice$User;
 
-    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
+    if-eqz v2, :cond_12
 
     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;
+    goto :goto_9
 
     :cond_12
-    if-eqz p1, :cond_13
+    move-object v2, v0
 
-    iget-boolean v3, p1, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->FO:Z
+    :goto_9
+    if-eqz v2, :cond_18
+
+    iget-object v0, p0, Lcom/discord/views/video/VideoCallParticipantView;->FF:Lco/discord/media_engine/VideoStreamRenderer;
+
+    if-nez v0, :cond_13
+
+    new-instance v0, Lco/discord/media_engine/VideoStreamRenderer;
+
+    invoke-virtual {p0}, Lcom/discord/views/video/VideoCallParticipantView;->getContext()Landroid/content/Context;
+
+    move-result-object v3
+
+    const-string v5, "context"
+
+    invoke-static {v3, v5}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {v0, v3}, Lco/discord/media_engine/VideoStreamRenderer;-><init>(Landroid/content/Context;)V
+
+    iput-object v0, p0, Lcom/discord/views/video/VideoCallParticipantView;->FF:Lco/discord/media_engine/VideoStreamRenderer;
+
+    const/4 v0, 0x1
+
+    goto :goto_a
 
     :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
+    const/4 v0, 0x0
+
+    :goto_a
+    iget-object v3, p0, Lcom/discord/views/video/VideoCallParticipantView;->streamId:Ljava/lang/Integer;
+
+    invoke-static {v2, v3}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v3
+
+    xor-int/2addr v3, v4
+
+    if-eqz v3, :cond_15
+
+    invoke-direct {p0}, Lcom/discord/views/video/VideoCallParticipantView;->getLoadingIndicator()Landroid/view/View;
+
+    move-result-object v3
+
+    invoke-virtual {v3, v1}, Landroid/view/View;->setVisibility(I)V
+
+    iget-object v3, p0, Lcom/discord/views/video/VideoCallParticipantView;->FF: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;->FF:Lco/discord/media_engine/VideoStreamRenderer;
+
+    check-cast v0, Landroid/view/View;
+
+    invoke-virtual {p1, v0}, Landroid/view/ViewGroup;->addView(Landroid/view/View;)V
+
+    invoke-direct {p0}, Lcom/discord/views/video/VideoCallParticipantView;->getLetterbox()Landroid/view/View;
+
+    move-result-object p1
+
+    invoke-virtual {p1, v1}, Landroid/view/View;->setVisibility(I)V
+
+    iget-object p1, p0, Lcom/discord/views/video/VideoCallParticipantView;->FF:Lco/discord/media_engine/VideoStreamRenderer;
+
+    if-eqz p1, :cond_16
+
+    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_16
+    iget-object p1, p0, Lcom/discord/views/video/VideoCallParticipantView;->FF:Lco/discord/media_engine/VideoStreamRenderer;
+
+    if-eqz p1, :cond_17
+
+    iget-object v0, p0, Lcom/discord/views/video/VideoCallParticipantView;->FG:Lorg/webrtc/RendererCommon$ScalingType;
+
+    iget-object v1, p0, Lcom/discord/views/video/VideoCallParticipantView;->scalingTypeMismatchOrientation:Lorg/webrtc/RendererCommon$ScalingType;
+
+    invoke-virtual {p1, v0, v1}, Lco/discord/media_engine/VideoStreamRenderer;->setScalingType(Lorg/webrtc/RendererCommon$ScalingType;Lorg/webrtc/RendererCommon$ScalingType;)V
+
+    iget-boolean v0, p0, Lcom/discord/views/video/VideoCallParticipantView;->FH:Z
+
+    invoke-virtual {p1, v0}, Lco/discord/media_engine/VideoStreamRenderer;->setMirror(Z)V
+
+    iget-boolean v0, p0, Lcom/discord/views/video/VideoCallParticipantView;->FC:Z
+
+    invoke-virtual {p1, v0}, Lco/discord/media_engine/VideoStreamRenderer;->setZOrderMediaOverlay(Z)V
+
+    :cond_17
+    return-void
+
+    :cond_18
+    invoke-direct {p0}, Lcom/discord/views/video/VideoCallParticipantView;->fm()V
+
+    iput-object v0, p0, Lcom/discord/views/video/VideoCallParticipantView;->streamId:Ljava/lang/Integer;
 
     return-void
 .end method
@@ -1040,7 +1295,7 @@
 .method public final setParticipant(Lcom/discord/models/domain/ModelVoice$User;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/views/video/VideoCallParticipantView;->FM:Lcom/discord/models/domain/ModelVoice$User;
+    iput-object p1, p0, Lcom/discord/views/video/VideoCallParticipantView;->FE:Lcom/discord/models/domain/ModelVoice$User;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/views/video/b$a.smali b/com.discord/smali/com/discord/views/video/a$a.smali
similarity index 74%
rename from com.discord/smali/com/discord/views/video/b$a.smali
rename to com.discord/smali/com/discord/views/video/a$a.smali
index fbcc39b793..8ae13d2bbf 100644
--- a/com.discord/smali/com/discord/views/video/b$a.smali
+++ b/com.discord/smali/com/discord/views/video/a$a.smali
@@ -1,11 +1,11 @@
-.class final Lcom/discord/views/video/b$a;
+.class final Lcom/discord/views/video/a$a;
 .super Ljava/lang/Object;
 .source "RxRendererEvents.kt"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/views/video/b;
+    value = Lcom/discord/views/video/a;
 .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/b$a;->width:I
+    iput p1, p0, Lcom/discord/views/video/a$a;->width:I
 
-    iput p2, p0, Lcom/discord/views/video/b$a;->height:I
+    iput p2, p0, Lcom/discord/views/video/a$a;->height:I
 
-    iput p3, p0, Lcom/discord/views/video/b$a;->rotation:I
+    iput p3, p0, Lcom/discord/views/video/a$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/b$a;
+    instance-of v1, p1, Lcom/discord/views/video/a$a;
 
     const/4 v2, 0x0
 
     if-eqz v1, :cond_3
 
-    check-cast p1, Lcom/discord/views/video/b$a;
+    check-cast p1, Lcom/discord/views/video/a$a;
 
-    iget v1, p0, Lcom/discord/views/video/b$a;->width:I
+    iget v1, p0, Lcom/discord/views/video/a$a;->width:I
 
-    iget v3, p1, Lcom/discord/views/video/b$a;->width:I
+    iget v3, p1, Lcom/discord/views/video/a$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/b$a;->height:I
+    iget v1, p0, Lcom/discord/views/video/a$a;->height:I
 
-    iget v3, p1, Lcom/discord/views/video/b$a;->height:I
+    iget v3, p1, Lcom/discord/views/video/a$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/b$a;->rotation:I
+    iget v1, p0, Lcom/discord/views/video/a$a;->rotation:I
 
-    iget p1, p1, Lcom/discord/views/video/b$a;->rotation:I
+    iget p1, p1, Lcom/discord/views/video/a$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/b$a;->width:I
+    iget v0, p0, Lcom/discord/views/video/a$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/b$a;->height:I
+    iget v1, p0, Lcom/discord/views/video/a$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/b$a;->rotation:I
+    iget v1, p0, Lcom/discord/views/video/a$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/b$a;->width:I
+    iget v1, p0, Lcom/discord/views/video/a$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/b$a;->height:I
+    iget v1, p0, Lcom/discord/views/video/a$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/b$a;->rotation:I
+    iget v1, p0, Lcom/discord/views/video/a$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/b$b.smali b/com.discord/smali/com/discord/views/video/a$b.smali
similarity index 67%
rename from com.discord/smali/com/discord/views/video/b$b.smali
rename to com.discord/smali/com/discord/views/video/a$b.smali
index a97c2c1418..df2135a87e 100644
--- a/com.discord/smali/com/discord/views/video/b$b.smali
+++ b/com.discord/smali/com/discord/views/video/a$b.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/views/video/b$b;
+.class final Lcom/discord/views/video/a$b;
 .super Ljava/lang/Object;
 .source "RxRendererEvents.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/views/video/b;
+    value = Lcom/discord/views/video/a;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -31,18 +31,18 @@
 
 
 # static fields
-.field public static final FE:Lcom/discord/views/video/b$b;
+.field public static final Fr:Lcom/discord/views/video/a$b;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    new-instance v0, Lcom/discord/views/video/b$b;
+    new-instance v0, Lcom/discord/views/video/a$b;
 
-    invoke-direct {v0}, Lcom/discord/views/video/b$b;-><init>()V
+    invoke-direct {v0}, Lcom/discord/views/video/a$b;-><init>()V
 
-    sput-object v0, Lcom/discord/views/video/b$b;->FE:Lcom/discord/views/video/b$b;
+    sput-object v0, Lcom/discord/views/video/a$b;->Fr:Lcom/discord/views/video/a$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/b$a;
+    check-cast p1, Lcom/discord/views/video/a$a;
 
     if-eqz p1, :cond_1
 
-    iget v0, p1, Lcom/discord/views/video/b$a;->rotation:I
+    iget v0, p1, Lcom/discord/views/video/a$a;->rotation:I
 
     const/16 v1, -0xb4
 
@@ -78,9 +78,9 @@
 
     new-instance v0, Landroid/graphics/Point;
 
-    iget v1, p1, Lcom/discord/views/video/b$a;->height:I
+    iget v1, p1, Lcom/discord/views/video/a$a;->height:I
 
-    iget p1, p1, Lcom/discord/views/video/b$a;->width:I
+    iget p1, p1, Lcom/discord/views/video/a$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/b$a;->width:I
+    iget v1, p1, Lcom/discord/views/video/a$a;->width:I
 
-    iget p1, p1, Lcom/discord/views/video/b$a;->height:I
+    iget p1, p1, Lcom/discord/views/video/a$a;->height:I
 
     invoke-direct {v0, v1, p1}, Landroid/graphics/Point;-><init>(II)V
 
diff --git a/com.discord/smali/com/discord/views/video/a.smali b/com.discord/smali/com/discord/views/video/a.smali
index fdc3158f97..a28f22fa20 100644
--- a/com.discord/smali/com/discord/views/video/a.smali
+++ b/com.discord/smali/com/discord/views/video/a.smali
@@ -1,7 +1,108 @@
 .class public final Lcom/discord/views/video/a;
 .super Ljava/lang/Object;
-.source "AppVideoStreamRenderer.kt"
+.source "RxRendererEvents.kt"
+
+# interfaces
+.implements Lorg/webrtc/RendererCommon$RendererEvents;
 
 
-# static fields
-.field static Fv:I
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lcom/discord/views/video/a$a;
+    }
+.end annotation
+
+
+# instance fields
+.field private final Fq: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;->Kx()Lrx/subjects/BehaviorSubject;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/views/video/a;->Fq: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;->Fq: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;->Fr: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;->Jx()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;->Jm()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;->Fq: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
diff --git a/com.discord/smali/com/discord/views/video/b.smali b/com.discord/smali/com/discord/views/video/b.smali
index 1dc6238e0b..38b82d98f0 100644
--- a/com.discord/smali/com/discord/views/video/b.smali
+++ b/com.discord/smali/com/discord/views/video/b.smali
@@ -1,126 +1,34 @@
-.class public final Lcom/discord/views/video/b;
+.class public final synthetic Lcom/discord/views/video/b;
 .super Ljava/lang/Object;
-.source "RxRendererEvents.kt"
-
-# interfaces
-.implements Lorg/webrtc/RendererCommon$RendererEvents;
 
 
-# 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
+# static fields
+.field public static final synthetic $EnumSwitchMapping$0:[I
 
 
 # direct methods
-.method public constructor <init>()V
-    .locals 1
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
-
-    move-result-object v0
-
-    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;
+.method static synthetic constructor <clinit>()V
     .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;
+    invoke-static {}, Lorg/webrtc/RendererCommon$ScalingType;->values()[Lorg/webrtc/RendererCommon$ScalingType;
 
     move-result-object v0
 
-    invoke-virtual {p0, v0}, Lrx/Observable;->a(Lrx/Observable$b;)Lrx/Observable;
+    array-length v0, v0
 
-    move-result-object p0
+    new-array v0, v0, [I
 
-    const-string v0, "frameResolutionSubject\n \u2026  .onBackpressureLatest()"
+    sput-object v0, Lcom/discord/views/video/b;->$EnumSwitchMapping$0:[I
 
-    invoke-static {p0, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    sget-object v1, Lorg/webrtc/RendererCommon$ScalingType;->SCALE_ASPECT_FIT:Lorg/webrtc/RendererCommon$ScalingType;
 
-    return-object p0
-.end method
+    invoke-virtual {v1}, Lorg/webrtc/RendererCommon$ScalingType;->ordinal()I
 
+    move-result v1
 
-# 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
+    const/4 v2, 0x1
+
+    aput v2, v0, v1
 
     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 7993bc3012..40811148c0 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 3a51b20934..01997eb0d7 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;->vO:Lcom/discord/app/i;
+    sget-object v0, Lcom/discord/app/i;->vP: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 5c69a91254..979841eb5c 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 f19d85f88d..892773d15d 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, 0x7f0a0099
+    const v0, 0x7f0a0098
 
     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, 0x7f0a0098
+    const v0, 0x7f0a0097
 
     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, 0x7f0d00bf
+    const v0, 0x7f0d00bd
 
     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 db15d3a2e6..c47530c180 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 c2b66a1a6a..5f173bbdf2 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, 0x7f0a009d
+    const v0, 0x7f0a009c
 
     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, 0x7f0a009b
+    const v0, 0x7f0a009a
 
     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, 0x7f0a009c
+    const v0, 0x7f0a009b
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -510,7 +510,7 @@
 
     move-result v5
 
-    const v7, 0x7f120288
+    const v7, 0x7f120286
 
     if-eqz v5, :cond_6
 
@@ -586,7 +586,7 @@
 
     :cond_5
     :goto_3
-    const p1, 0x7f120a31
+    const p1, 0x7f1209fb
 
     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, 0x7f120a2f
+    const p1, 0x7f1209f9
 
     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, 0x7f0d00c1
+    const v0, 0x7f0d00bf
 
     return v0
 .end method
@@ -684,7 +684,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 64a4d85810..19aa0158cc 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, 0x7f0a00a0
+    const v0, 0x7f0a009f
 
     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, 0x7f0a00a1
+    const v0, 0x7f0a00a0
 
     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;->Bc:Lcom/discord/samsung/a;
+    sget-object v0, Lcom/discord/samsung/a;->Bf:Lcom/discord/samsung/a;
 
-    invoke-static {}, Lcom/discord/samsung/a;->eK()Z
+    invoke-static {}, Lcom/discord/samsung/a;->eJ()Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    const v0, 0x7f0d00c3
+    const v0, 0x7f0d00c1
 
     return v0
 
     :cond_0
-    const v0, 0x7f0d00c2
+    const v0, 0x7f0d00c0
 
     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;->Bc:Lcom/discord/samsung/a;
+    sget-object p1, Lcom/discord/samsung/a;->Bf:Lcom/discord/samsung/a;
 
-    invoke-static {}, Lcom/discord/samsung/a;->eK()Z
+    invoke-static {}, Lcom/discord/samsung/a;->eJ()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 35d1a82a79..5a65361567 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 b4c257a68f..a559106517 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 390e602842..36779057cf 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 cdbd86dd61..b89fb7bfd7 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 4304537e7d..f67fe43d38 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 6f000d297e..69ad6b4213 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 c031c004e5..92f5ce4446 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 2892b050d5..194be17dd6 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 9bc2238a54..4ba3ed693e 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -97,7 +97,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f120d74
+    const v0, 0x7f120d3c
 
     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 1d81b2debd..091b5b8086 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, 0x7f120d71
+    const v0, 0x7f120d39
 
     invoke-virtual {p1, v0}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setTitle(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
     move-result-object p1
 
-    const v0, 0x7f120d72
+    const v0, 0x7f120d3a
 
     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, 0x7f120d73
+    const v1, 0x7f120d3b
 
     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, 0x7f1203a0
+    const v1, 0x7f12037b
 
     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 5792857458..4b3b95704f 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, 0x7f120599
+    const v6, 0x7f120574
 
     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, 0x7f120598
+    const v7, 0x7f120573
 
     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, 0x7f120d76
+    const v8, 0x7f120d3e
 
     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 8ae38a3d12..231380fde5 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, 0x7f0a00a3
+    const v0, 0x7f0a00a2
 
     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, 0x7f0a00a4
+    const v0, 0x7f0a00a3
 
     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, 0x7f0a00a6
+    const v0, 0x7f0a00a5
 
     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, 0x7f0a00a8
+    const v0, 0x7f0a00a7
 
     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, 0x7f0a00a5
+    const v0, 0x7f0a00a4
 
     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, 0x7f0a00a2
+    const v0, 0x7f0a00a1
 
     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, 0x7f0a027a
+    const v0, 0x7f0a0279
 
     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, 0x7f0a00a7
+    const v0, 0x7f0a00a6
 
     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, 0x7f120599
+    const v1, 0x7f120574
 
     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, 0x7f12059a
+    const p1, 0x7f120575
 
     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, 0x7f0d00c4
+    const v0, 0x7f0d00c2
 
     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 7c16e25c33..1b27dee9e1 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 0c7f4e8612..0f68eabdc9 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 0x7f0a044b
+    .packed-switch 0x7f0a0446
         :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 3584e9a12f..0ae97f4bca 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, 0x7f0a00a9
+    const v0, 0x7f0a00a8
 
     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, 0x7f0a027a
+    const v0, 0x7f0a0279
 
     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, 0x7f12126e
+    const p2, 0x7f1211e1
 
     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, 0x7f121297
+    const v0, 0x7f12120a
 
     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;->vO:Lcom/discord/app/i;
+    sget-object v0, Lcom/discord/app/i;->vP: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, 0x7f0d00c6
+    const v1, 0x7f0d00c4
 
     const/4 v2, 0x0
 
@@ -353,7 +353,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f0a0861
+    const v2, 0x7f0a0826
 
     invoke-virtual {v1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -361,13 +361,13 @@
 
     check-cast v2, Landroid/widget/EditText;
 
-    const v3, 0x7f0a0862
+    const v3, 0x7f0a0827
 
     invoke-virtual {v1, v3}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
     move-result-object v3
 
-    const v4, 0x7f0a0860
+    const v4, 0x7f0a0825
 
     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, 0x7f0d00c7
+    const v1, 0x7f0d00c5
 
     const/4 v2, 0x0
 
@@ -428,7 +428,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f0a0864
+    const v2, 0x7f0a0829
 
     invoke-virtual {v1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -438,7 +438,7 @@
 
     check-cast v6, Landroid/widget/TextView;
 
-    const v2, 0x7f0a0863
+    const v2, 0x7f0a0828
 
     invoke-virtual {v1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -456,7 +456,7 @@
 
     move-result-object v8
 
-    const v1, 0x7f121278
+    const v1, 0x7f1211eb
 
     const/4 v2, 0x2
 
@@ -518,7 +518,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d00c5
+    const v0, 0x7f0d00c3
 
     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 7245e2ddaf..6b1eb0366c 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 1fefc84bfd..d6328e93df 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 4826c52d61..b336adb240 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 6e33297329..e5abc48a94 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 fbe2395626..cf4a8d9c03 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 006ea2b030..0537e8a5ae 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 93265d6c12..db00f93571 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, 0x7f12121e
+    const v0, 0x7f121191
 
     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 078a1e54bb..37dd49d34b 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, 0x7f1213ae
+    const v7, 0x7f121322
 
     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, 0x7f120599
+    const v9, 0x7f120574
 
     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, 0x7f120598
+    const v9, 0x7f120573
 
     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, 0x7f120d76
+    const v9, 0x7f120d3e
 
     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, 0x7f120d70
+    const v8, 0x7f120d38
 
     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 de3b674842..cbe62ac2b4 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, 0x7f0a00b1
+    const v0, 0x7f0a00b0
 
     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, 0x7f0a00b2
+    const v0, 0x7f0a00b1
 
     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, 0x7f0a00ad
+    const v0, 0x7f0a00ac
 
     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, 0x7f0a00ae
+    const v0, 0x7f0a00ad
 
     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, 0x7f0a00af
+    const v0, 0x7f0a00ae
 
     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, 0x7f0a00b0
+    const v0, 0x7f0a00af
 
     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, 0x7f0a00ac
+    const v0, 0x7f0a00ab
 
     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, 0x7f0a00ab
+    const v0, 0x7f0a00aa
 
     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, 0x7f0a027a
+    const v0, 0x7f0a0279
 
     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, 0x7f0a00aa
+    const v0, 0x7f0a00a9
 
     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, 0x7f0a00b3
+    const v0, 0x7f0a00b2
 
     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, 0x7f12121b
+    const v1, 0x7f12118e
 
     invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -710,7 +710,7 @@
 
     aput-object v1, v0, v2
 
-    const v1, 0x7f120f57
+    const v1, 0x7f120ecb
 
     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, 0x7f0d00c8
+    const v0, 0x7f0d00c6
 
     return v0
 .end method
@@ -1312,12 +1312,12 @@
 
     if-eqz v3, :cond_1
 
-    const v3, 0x7f12121d
+    const v3, 0x7f121190
 
     goto :goto_1
 
     :cond_1
-    const v3, 0x7f12121c
+    const v3, 0x7f12118f
 
     :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 79b81a2728..f848654f7b 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, 0x7f0a00b6
+    const v0, 0x7f0a00b5
 
     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, 0x7f0a00b5
+    const v0, 0x7f0a00b4
 
     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, 0x7f0a00b7
+    const v0, 0x7f0a00b6
 
     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, 0x7f0a00b4
+    const v0, 0x7f0a00b3
 
     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, 0x7f0d00c9
+    const v0, 0x7f0d00c7
 
     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 c819dd11d2..662fd5c78c 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;->Bc:Lcom/discord/samsung/a;
+    sget-object v1, Lcom/discord/samsung/a;->Bf:Lcom/discord/samsung/a;
 
     const-string v1, "clientId"
 
@@ -156,7 +156,7 @@
 
     if-eqz p2, :cond_2
 
-    invoke-static {}, Lcom/discord/samsung/a;->eK()Z
+    invoke-static {}, Lcom/discord/samsung/a;->eJ()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 c5bc731b40..ff8c52600b 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, 0x7f0a04cd
+    const p1, 0x7f0a04c0
 
     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, 0x7f0a04cb
+    const p1, 0x7f0a04be
 
     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;->De:Lcom/discord/views/c;
+    sget-object v0, Lcom/discord/views/c;->Dg: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$authorizeApplication$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$authorizeApplication$1.smali
index 3925b5a142..0323e764c8 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 c4306e4ceb..37b366a009 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -73,7 +73,7 @@
 
     move-result-object p1
 
-    sget-object v0, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vn: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 c3177bf1ab..14eeb4b0f9 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 7603da04e2..c858c86dc3 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 45ea4b66cf..9dc8081504 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 0c27c733a9..80519bc9a6 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, 0x7f120d0e
+    const v3, 0x7f120cd7
 
     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 0e565c9401..f37c6756f5 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, 0x7f0a04bd
+    const v0, 0x7f0a04b0
 
     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, 0x7f0a04be
+    const v0, 0x7f0a04b1
 
     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, 0x7f0a04c6
+    const v0, 0x7f0a04b9
 
     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, 0x7f0a04c8
+    const v0, 0x7f0a04bb
 
     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, 0x7f0a04c7
+    const v0, 0x7f0a04ba
 
     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, 0x7f0a04c2
+    const v0, 0x7f0a04b5
 
     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, 0x7f0a04c9
+    const v0, 0x7f0a04bc
 
     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, 0x7f0a04c3
+    const v0, 0x7f0a04b6
 
     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, 0x7f0a04c0
+    const v0, 0x7f0a04b3
 
     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, 0x7f0a04c5
+    const v0, 0x7f0a04b8
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -492,9 +492,9 @@
 
     :array_0
     .array-data 4
-        0x7f0a04c1
-        0x7f0a04c4
-        0x7f0a04ca
+        0x7f0a04b4
+        0x7f0a04b7
+        0x7f0a04bd
     .end array-data
 .end method
 
@@ -684,19 +684,19 @@
 
     if-eqz p1, :cond_2
 
-    const p1, 0x7f120d09
+    const p1, 0x7f120cd2
 
     goto :goto_2
 
     :cond_2
     if-eqz p1, :cond_3
 
-    const p1, 0x7f120d0a
+    const p1, 0x7f120cd3
 
     goto :goto_2
 
     :cond_3
-    const p1, 0x7f120d11
+    const p1, 0x7f120cda
 
     :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, 0x7f06014a
+    const v4, 0x7f060149
 
     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, 0x7f120d0b
+    const v5, 0x7f120cd4
 
     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;->De:Lcom/discord/views/c;
+    sget-object v3, Lcom/discord/views/c;->Dg: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, 0x7f0d015d
+    const v0, 0x7f0d015b
 
     return v0
 .end method
@@ -1551,7 +1551,7 @@
     :catch_0
     move-exception p1
 
-    const v2, 0x7f120d0f
+    const v2, 0x7f120cd8
 
     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;->vm:Lcom/discord/app/AppLog;
+    sget-object v3, Lcom/discord/app/AppLog;->vn: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 15aa69d618..f80330da00 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 be271bf164..54b85d95b7 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 b8c6eb16c2..41b9ab8b90 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;->vm:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
 
     new-instance v0, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion$logI$1;
 
-    sget-object v1, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
+    sget-object v1, Lcom/discord/app/AppLog;->vn: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;->vm:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
 
     new-instance v0, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion$logW$1;
 
-    sget-object v1, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
+    sget-object v1, Lcom/discord/app/AppLog;->vn: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 26837dd939..b66bf02172 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 42c47fedd6..de16e881be 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;->bgy:Lkotlin/Unit;
+    sget-object p2, Lkotlin/Unit;->bgt: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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 af9fa89d89..7843d268d1 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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;->bkx:Lkotlinx/coroutines/bb;
+    sget-object v0, Lkotlinx/coroutines/bb;->bks:Lkotlinx/coroutines/bb;
 
     check-cast v0, Lkotlinx/coroutines/CoroutineScope;
 
-    invoke-static {}, Lkotlinx/coroutines/as;->DH()Lkotlinx/coroutines/ab;
+    invoke-static {}, Lkotlinx/coroutines/as;->DF()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 28b5b07c68..1e5ea4018d 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 48dd21503c..6adbed00a8 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;->bgy:Lkotlin/Unit;
+    sget-object p2, Lkotlin/Unit;->bgt: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, 0x7f120290
+    const v0, 0x7f12028e
 
     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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 e37748fb46..d02eaa978e 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 4dadc77df6..9a956c848a 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 9d5f9c3535..dae508f2c9 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, 0x7f0a04c2
+    const v0, 0x7f0a04b5
 
     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;->Bc:Lcom/discord/samsung/a;
+    sget-object v0, Lcom/discord/samsung/a;->Bf:Lcom/discord/samsung/a;
 
-    invoke-static {}, Lcom/discord/samsung/a;->eM()Landroid/content/Intent;
+    invoke-static {}, Lcom/discord/samsung/a;->eL()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;->Bc:Lcom/discord/samsung/a;
+    sget-object v0, Lcom/discord/samsung/a;->Bf: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, 0x7f0d015d
+    const v0, 0x7f0d015b
 
     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;->Bg:Lcom/discord/samsung/SamsungConnectActivity$a;
+    sget-object p1, Lcom/discord/samsung/SamsungConnectActivity;->Bj: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;->Bg:Lcom/discord/samsung/SamsungConnectActivity$a;
+    sget-object p1, Lcom/discord/samsung/SamsungConnectActivity;->Bj:Lcom/discord/samsung/SamsungConnectActivity$a;
 
     move-object p1, p0
 
@@ -646,7 +646,7 @@
 
     check-cast p1, Landroidx/fragment/app/Fragment;
 
-    const p2, 0x7f1205db
+    const p2, 0x7f1205b6
 
     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;->brT:Z
+    iput-boolean v2, p3, Lokhttp3/t$a;->brO:Z
 
-    invoke-virtual {p3}, Lokhttp3/t$a;->FD()Lokhttp3/t;
+    invoke-virtual {p3}, Lokhttp3/t$a;->FB()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;->Bc:Lcom/discord/samsung/a;
+    sget-object v2, Lcom/discord/samsung/a;->Bf: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;->Bc:Lcom/discord/samsung/a;
+    sget-object v8, Lcom/discord/samsung/a;->Bf: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;->DG()Lkotlinx/coroutines/bq;
+    invoke-static {}, Lkotlinx/coroutines/as;->DE()Lkotlinx/coroutines/bq;
 
     move-result-object v5
 
@@ -1000,7 +1000,7 @@
 
     :cond_8
     :goto_3
-    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 f09e1eaa38..6621a30f3c 100644
--- a/com.discord/smali/com/discord/widgets/channels/SimpleMembersAdapter$MemberAdapterItem.smali
+++ b/com.discord/smali/com/discord/widgets/channels/SimpleMembersAdapter$MemberAdapterItem.smali
@@ -49,7 +49,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/channels/SimpleMembersAdapter$MemberAdapterItem;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a0445
+    const v0, 0x7f0a0440
 
     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, 0x7f0a0442
+    const v0, 0x7f0a043d
 
     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 fe8021fb67..1ee317810e 100644
--- a/com.discord/smali/com/discord/widgets/channels/SimpleRolesAdapter$RoleAdapterItem.smali
+++ b/com.discord/smali/com/discord/widgets/channels/SimpleRolesAdapter$RoleAdapterItem.smali
@@ -47,7 +47,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/channels/SimpleRolesAdapter$RoleAdapterItem;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a0655
+    const v0, 0x7f0a063c
 
     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 b5c125a1a8..70bc044fa8 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
-        0x7f0a06cd
+        0x7f0a06b4
     .end array-data
 .end method
 
@@ -209,7 +209,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f1203e2
+    const v2, 0x7f1203bd
 
     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, 0x7f120b3b
+    const p1, 0x7f120b05
 
     const/4 v2, 0x1
 
@@ -344,7 +344,7 @@
 
     move-result-object p1
 
-    const v1, 0x7f120b38
+    const v1, 0x7f120b02
 
     new-array v2, v2, [Ljava/lang/Object;
 
@@ -358,13 +358,13 @@
 
     move-result-object p1
 
-    const p3, 0x7f040286
+    const p3, 0x7f040285
 
     invoke-virtual {p1, p3}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setDialogAttrTheme(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
     move-result-object p1
 
-    const p3, 0x7f120b37
+    const p3, 0x7f120b01
 
     new-instance v1, Lcom/discord/widgets/channels/-$$Lambda$WidgetChannelGroupDMSettings$c8xwH3a5VMhyc7oYmYZ83i0PPRA;
 
@@ -374,7 +374,7 @@
 
     move-result-object p1
 
-    const p2, 0x7f1203a0
+    const p2, 0x7f12037b
 
     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, 0x7f12101e
+    const v0, 0x7f120f92
 
     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;->bgy:Lkotlin/Unit;
+    sget-object p0, Lkotlin/Unit;->bgt: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;->bgy:Lkotlin/Unit;
+    sget-object p0, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object p0
 .end method
@@ -531,7 +531,7 @@
 .method public getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d00cd
+    const v0, 0x7f0d00cb
 
     return v0
 .end method
@@ -577,7 +577,7 @@
 
     move-result p3
 
-    const v0, 0x7f0a0469
+    const v0, 0x7f0a0464
 
     if-eq p3, v0, :cond_0
 
@@ -709,9 +709,9 @@
 .method public synthetic lambda$null$7$WidgetChannelGroupDMSettings()V
     .locals 2
 
-    const v0, 0x7f1203fd
+    const v0, 0x7f1203d8
 
-    const v1, 0x7f1212a4
+    const v1, 0x7f121217
 
     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;->xr:Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
+    sget-object v5, Lcom/discord/dialogs/ImageUploadDialog$PreviewType;->xt: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, 0x7f0a032e
+    const v1, 0x7f0a0329
 
     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, 0x7f0a048e
+    const v1, 0x7f0a0481
 
     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, 0x7f0a06ce
+    const v1, 0x7f0a06b5
 
     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, 0x7f0a06cf
+    const v1, 0x7f0a06b6
 
     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, 0x7f0a06cd
+    const v1, 0x7f0a06b4
 
     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 c7a6c6f022..d3e9b145b3 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 f3e2a7e905..aa389ffb0e 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 51abfd7b7d..aa71527d2f 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 54476d5800..78673f887c 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, 0x7f120c0d
+    const v1, 0x7f120bd6
 
     const/4 v3, 0x1
 
@@ -421,7 +421,7 @@
     goto :goto_0
 
     :cond_0
-    const v1, 0x7f120c0c
+    const v1, 0x7f120bd5
 
     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, 0x7f0d00d2
+    const v0, 0x7f0d00d0
 
     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, 0x7f120cbf
+    const v1, 0x7f120c88
 
     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 bceaee170a..b1134eae56 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, 0x7f0d00d7
+    const v0, 0x7f0d00d5
 
     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 5c4f9e1b67..a5fa9243c3 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, 0x7f120c76
+    const p6, 0x7f120c3f
 
-    const v6, 0x7f120c76
+    const v6, 0x7f120c3f
 
     goto :goto_1
 
@@ -168,9 +168,9 @@
 
     if-eqz p5, :cond_1
 
-    const p6, 0x7f120c76
+    const p6, 0x7f120c3f
 
-    const v6, 0x7f120c76
+    const v6, 0x7f120c3f
 
     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 48ba05efea..a6ead7aad2 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 b5c417410a..84bfcd5b9e 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 134927de4c..b6c1fe5c23 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, 0x7f0d00d6
+    const v0, 0x7f0d00d4
 
     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 fbbcf491df..de1be3754f 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object p1
 
@@ -781,7 +781,7 @@
     return-void
 
     :cond_0
-    iget v0, p1, Lcom/discord/views/TernaryCheckBox;->Eq:I
+    iget v0, p1, Lcom/discord/views/TernaryCheckBox;->Es:I
 
     if-nez v0, :cond_1
 
@@ -793,7 +793,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    const v1, 0x7f1203a3
+    const v1, 0x7f12037e
 
     if-eqz v0, :cond_4
 
@@ -811,7 +811,7 @@
 
     if-eqz p2, :cond_2
 
-    invoke-virtual {p1}, Lcom/discord/views/TernaryCheckBox;->fm()V
+    invoke-virtual {p1}, Lcom/discord/views/TernaryCheckBox;->fk()V
 
     return-void
 
@@ -821,25 +821,25 @@
     return-void
 
     :cond_3
-    const p2, 0x7f1203a1
+    const p2, 0x7f12037c
 
     invoke-virtual {p1, p2}, Lcom/discord/views/TernaryCheckBox;->setOffDisabled(I)V
 
     return-void
 
     :cond_4
-    invoke-virtual {p1}, Lcom/discord/views/TernaryCheckBox;->fl()Z
+    invoke-virtual {p1}, Lcom/discord/views/TernaryCheckBox;->fj()Z
 
     move-result v0
 
     if-eqz v0, :cond_5
 
-    invoke-virtual {p1}, Lcom/discord/views/TernaryCheckBox;->fm()V
+    invoke-virtual {p1}, Lcom/discord/views/TernaryCheckBox;->fk()V
 
     return-void
 
     :cond_5
-    invoke-virtual {p1}, Lcom/discord/views/TernaryCheckBox;->fk()Z
+    invoke-virtual {p1}, Lcom/discord/views/TernaryCheckBox;->fi()Z
 
     move-result v0
 
@@ -873,7 +873,7 @@
 
     if-eqz p2, :cond_8
 
-    invoke-virtual {p1}, Lcom/discord/views/TernaryCheckBox;->fm()V
+    invoke-virtual {p1}, Lcom/discord/views/TernaryCheckBox;->fk()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 155e156cc8..0ed812f5f2 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;->fk()Z
+    invoke-virtual {p1}, Lcom/discord/views/TernaryCheckBox;->fi()Z
 
     move-result p2
 
-    const v0, 0x7f1203a2
+    const v0, 0x7f12037d
 
     if-eqz p2, :cond_0
 
@@ -395,12 +395,12 @@
 
     if-eqz p2, :cond_2
 
-    invoke-virtual {p1}, Lcom/discord/views/TernaryCheckBox;->fm()V
+    invoke-virtual {p1}, Lcom/discord/views/TernaryCheckBox;->fk()V
 
     return-void
 
     :cond_2
-    const p2, 0x7f1203a1
+    const p2, 0x7f12037c
 
     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 fd9e51cc6d..e0ca883300 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, 0x7f1203b3
+    const v0, 0x7f12038e
 
     goto :goto_0
 
     :cond_0
-    const v0, 0x7f1203e2
+    const v0, 0x7f1203bd
 
     :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;->fk()Z
+    invoke-virtual {v3}, Lcom/discord/views/TernaryCheckBox;->fi()Z
 
     move-result v4
 
@@ -646,7 +646,7 @@
     goto :goto_0
 
     :cond_1
-    invoke-virtual {v3}, Lcom/discord/views/TernaryCheckBox;->fl()Z
+    invoke-virtual {v3}, Lcom/discord/views/TernaryCheckBox;->fj()Z
 
     move-result v4
 
@@ -836,7 +836,7 @@
 .method public getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d00d9
+    const v0, 0x7f0d00d7
 
     return v0
 .end method
@@ -848,7 +848,7 @@
 
     move-result p4
 
-    const p5, 0x7f0a0461
+    const p5, 0x7f0a045c
 
     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 66b35f618b..1cbc3d1d28 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object p1
 
@@ -574,7 +574,7 @@
 
     move-result-object p0
 
-    invoke-static {}, Lrx/internal/a/ba;->JI()Lrx/internal/a/ba;
+    invoke-static {}, Lrx/internal/a/ba;->JG()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 e4b33b15fb..e0b627d3cc 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, 0x7f0d00da
+    const v0, 0x7f0d00d8
 
     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 a417180c37..7c7606bbdb 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;->JI()Lrx/internal/a/ba;
+    invoke-static {}, Lrx/internal/a/ba;->JG()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 51e48796a0..913d5b89ad 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, 0x7f0d00db
+    const v0, 0x7f0d00d9
 
     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 c6c38a0ce5..23f5762f8a 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;->JI()Lrx/internal/a/ba;
+    invoke-static {}, Lrx/internal/a/ba;->JG()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 77e8786274..99d1cb87b0 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, 0x7f1203b3
+    const v0, 0x7f12038e
 
     goto :goto_0
 
     :cond_0
-    const v0, 0x7f1203e2
+    const v0, 0x7f1203bd
 
     :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, 0x7f0d00dc
+    const v0, 0x7f0d00da
 
     return v0
 .end method
@@ -352,7 +352,7 @@
     return-void
 
     :cond_0
-    const p1, 0x7f120d60
+    const p1, 0x7f120d29
 
     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, 0x7f0a0868
+    const v0, 0x7f0a082d
 
     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, 0x7f0a0867
+    const v0, 0x7f0a082c
 
     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 ebd5f499b4..999b1865c1 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 b902173acd..133d19c536 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 6e7c126c9a..bd5f84dae3 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, 0x7f1203ea
+    const p3, 0x7f1203c5
 
     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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 9edec07157..311b0e3fa0 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 8ac01417e1..b59e8b4b1a 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, 0x7f0d00dd
+    const v0, 0x7f0d00db
 
     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 bafa22b697..089616b9ad 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, 0x7f0d0081
+    const v0, 0x7f0d0080
 
     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, 0x7f0a058f
+    const v0, 0x7f0a0576
 
     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 23b89233c8..3ba6531c24 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, 0x7f120499
+    const v0, 0x7f120474
 
     goto :goto_0
 
     :cond_1
-    const v0, 0x7f12049a
+    const v0, 0x7f120475
 
     :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, 0x7f0d0118
+    const v0, 0x7f0d0116
 
     return v0
 .end method
@@ -485,7 +485,7 @@
 
     move-result p1
 
-    const p2, 0x7f0a047a
+    const p2, 0x7f0a0475
 
     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, 0x7f0a023b
+    const v0, 0x7f0a023a
 
     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, 0x7f0a023c
+    const v0, 0x7f0a023b
 
     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, 0x7f0a0241
+    const v0, 0x7f0a0240
 
     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, 0x7f0a0244
+    const v0, 0x7f0a0243
 
     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, 0x7f0a0247
+    const v0, 0x7f0a0246
 
     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, 0x7f0a023f
+    const v0, 0x7f0a023e
 
     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, 0x7f0a0240
+    const v0, 0x7f0a023f
 
     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, 0x7f0a023e
+    const v0, 0x7f0a023d
 
     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, 0x7f0a0243
+    const v0, 0x7f0a0242
 
     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, 0x7f0a0246
+    const v0, 0x7f0a0245
 
     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, 0x7f0a023d
+    const v0, 0x7f0a023c
 
     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, 0x7f0a0242
+    const v0, 0x7f0a0241
 
     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, 0x7f0a0245
+    const v0, 0x7f0a0244
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -939,12 +939,12 @@
 
     if-ne v1, v2, :cond_4
 
-    const v1, 0x7f120f59
+    const v1, 0x7f120ecd
 
     goto :goto_1
 
     :cond_4
-    const v1, 0x7f120f5b
+    const v1, 0x7f120ecf
 
     :goto_1
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
@@ -955,12 +955,12 @@
 
     if-ne v1, v2, :cond_5
 
-    const v1, 0x7f120f5a
+    const v1, 0x7f120ece
 
     goto :goto_2
 
     :cond_5
-    const v1, 0x7f120f5c
+    const v1, 0x7f120ed0
 
     :goto_2
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
@@ -971,12 +971,12 @@
 
     if-ne v1, v2, :cond_6
 
-    const v1, 0x7f120642
+    const v1, 0x7f12061d
 
     goto :goto_3
 
     :cond_6
-    const v1, 0x7f120645
+    const v1, 0x7f120620
 
     :goto_3
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
@@ -987,12 +987,12 @@
 
     if-ne v1, v2, :cond_7
 
-    const v1, 0x7f1203b2
+    const v1, 0x7f12038d
 
     goto :goto_4
 
     :cond_7
-    const v1, 0x7f120643
+    const v1, 0x7f12061e
 
     :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 6e59856315..74e8a4ff51 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;->getStreams()Lrx/Observable;
+    invoke-virtual {v2}, Lcom/discord/stores/StoreApplicationStreaming;->get()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 7771e80abc..c9aada9127 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;->bKX:Lrx/internal/a/ba;
+    sget-object v0, Lrx/internal/a/ba$a;->bKS: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 0de8f2d243..fbaaa0ccfb 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;->JI()Lrx/internal/a/ba;
+    invoke-static {}, Lrx/internal/a/ba;->JG()Lrx/internal/a/ba;
 
     move-result-object v0
 
@@ -305,7 +305,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 7a94e982ad..f838d1069b 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, 0x7f12081d
+    const p2, 0x7f1207f8
 
     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 b6f89a0ad2..aafa0e5004 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 4dbc12a237..45f99aefd0 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 6142f73245..be75c127f0 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, 0x7f12081d
+    const v0, 0x7f1207f8
 
     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 4cb7358b5c..28cd5b93fc 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 a7d833fc0a..ffa1ece895 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, 0x7f0a0331
+    const v0, 0x7f0a032c
 
     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, 0x7f0a0334
+    const v0, 0x7f0a032f
 
     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, 0x7f0a0332
+    const v0, 0x7f0a032d
 
     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, 0x7f0a032f
+    const v0, 0x7f0a032a
 
     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, 0x7f0a0330
+    const v0, 0x7f0a032b
 
     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, 0x7f120816
+    const p1, 0x7f1207f1
 
     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, 0x7f120829
+    const v2, 0x7f120804
 
     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, 0x7f12081c
+    const p1, 0x7f1207f7
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/WidgetGroupInviteFriends;->getString(I)Ljava/lang/String;
 
@@ -891,7 +891,7 @@
 
     move-result-object v1
 
-    const v4, 0x7f10005f
+    const v4, 0x7f10005e
 
     new-array v0, v0, [Ljava/lang/Object;
 
@@ -915,7 +915,7 @@
     :cond_1
     if-nez v2, :cond_2
 
-    const p1, 0x7f120828
+    const p1, 0x7f120803
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/WidgetGroupInviteFriends;->getString(I)Ljava/lang/String;
 
@@ -934,7 +934,7 @@
 
     move-result-object v1
 
-    const v4, 0x7f100060
+    const v4, 0x7f10005f
 
     new-array v0, v0, [Ljava/lang/Object;
 
@@ -1033,7 +1033,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0129
+    const v0, 0x7f0d0127
 
     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 ee6f51e8ae..c40c21de02 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, 0x7f0a0311
+    const p2, 0x7f0a0310
 
     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, 0x7f0a0312
+    const p2, 0x7f0a0311
 
     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, 0x7f0a0303
+    const p2, 0x7f0a0302
 
     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, 0x7f0a02fa
+    const p2, 0x7f0a02f9
 
     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, 0x7f0a02f3
+    const p2, 0x7f0a02f2
 
     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, 0x7f0a07f2
+    const p2, 0x7f0a07bb
 
     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 9f5aaac5c9..7f2f609876 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, 0x7f0d012a
+    const p2, 0x7f0d0128
 
     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 a28fc610f7..0a65bac126 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 082a5105bb..7bc6671343 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 0x7f0a044f
+    .packed-switch 0x7f0a044a
         :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 fdaa904e5d..15dbe98ac1 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, 0x7f0a044f
+    const v0, 0x7f0a044a
 
     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 e1a23a9e6c..73706e3749 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, 0x7f120deb
+    const v0, 0x7f120db1
 
     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 1f8381daba..cf0d07c959 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 e3222fbd98..e9e99ff126 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -77,12 +77,12 @@
 
     if-eqz p1, :cond_0
 
-    const p1, 0x7f1203b4
+    const p1, 0x7f12038f
 
     goto :goto_0
 
     :cond_0
-    const p1, 0x7f1203e3
+    const p1, 0x7f1203be
 
     :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 0f0715a398..12b812a19f 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, 0x7f1203e2
+    const v0, 0x7f1203bd
 
     goto :goto_0
 
     :cond_2
-    const v0, 0x7f1203b3
+    const v0, 0x7f12038e
 
     :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, 0x7f0e0019
+    const v0, 0x7f0e0018
 
     goto :goto_1
 
@@ -923,18 +923,18 @@
 
     move-result v3
 
-    const v4, 0x7f120643
+    const v4, 0x7f12061e
 
-    const v5, 0x7f1203b2
+    const v5, 0x7f12038d
 
     if-eqz v3, :cond_4
 
-    const v3, 0x7f120643
+    const v3, 0x7f12061e
 
     goto :goto_2
 
     :cond_4
-    const v3, 0x7f1203b2
+    const v3, 0x7f12038d
 
     :goto_2
     invoke-virtual {v0, v3}, Landroid/widget/TextView;->setText(I)V
@@ -986,7 +986,7 @@
     goto :goto_3
 
     :cond_5
-    const v4, 0x7f1203b2
+    const v4, 0x7f12038d
 
     :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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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, 0x7f0d00d8
+    const v1, 0x7f0d00d6
 
     const/4 v2, 0x0
 
@@ -1452,12 +1452,12 @@
 
     if-eqz v5, :cond_0
 
-    const v5, 0x7f120510
+    const v5, 0x7f1204eb
 
     goto :goto_0
 
     :cond_0
-    const v5, 0x7f12050f
+    const v5, 0x7f1204ea
 
     :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, 0x7f120511
+    const v0, 0x7f1204ec
 
     const/4 v2, 0x1
 
@@ -1892,7 +1892,7 @@
 
     move-result-object v1
 
-    sget-object v2, Lcom/discord/app/i;->vO:Lcom/discord/app/i;
+    sget-object v2, Lcom/discord/app/i;->vP: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, 0x7f1206af
+    const v0, 0x7f12068a
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/channels/WidgetTextChannelSettings;->getString(I)Ljava/lang/String;
 
@@ -2012,7 +2012,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f10002b
+    const v2, 0x7f10002a
 
     new-array v0, v0, [Ljava/lang/Object;
 
@@ -2035,7 +2035,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f100028
+    const v3, 0x7f100027
 
     div-int/2addr p1, v1
 
@@ -2051,7 +2051,7 @@
 
     move-result-object v1
 
-    const v3, 0x7f100026
+    const v3, 0x7f100025
 
     div-int/2addr p1, v2
 
@@ -2067,7 +2067,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d01c6
+    const v0, 0x7f0d01be
 
     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 e472b7eb5f..a84cf9a1c0 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, 0x7f120538
+    const v2, 0x7f120513
 
     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 c6579b2a75..c7dfdcc611 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 19bab76713..b66569f1de 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -889,7 +889,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/discord/stores/StoreApplicationStreaming;->getStreams()Lrx/Observable;
+    invoke-virtual {v0}, Lcom/discord/stores/StoreApplicationStreaming;->get()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 ca1caf5ed8..c46f2cf93c 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;->getStreamsForGuild(J)Lrx/Observable;
+    invoke-virtual {v0, p1, p2}, Lcom/discord/stores/StoreApplicationStreaming;->getForGuild(J)Lrx/Observable;
 
     move-result-object v1
 
@@ -315,7 +315,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 ebb775f3fa..a221ede8f0 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 b29a2abb60..0dbbf25e7f 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, 0x7f120c28
+    const v0, 0x7f120bf1
 
-    const v6, 0x7f120c28
+    const v6, 0x7f120bf1
 
     goto :goto_1
 
@@ -290,9 +290,9 @@
 
     if-eqz v0, :cond_2
 
-    const v0, 0x7f120c34
+    const v0, 0x7f120bfd
 
-    const v7, 0x7f120c34
+    const v7, 0x7f120bfd
 
     goto :goto_2
 
@@ -370,12 +370,12 @@
 
     if-eqz p1, :cond_0
 
-    const p1, 0x7f0800f1
+    const p1, 0x7f0800f0
 
     return p1
 
     :cond_0
-    const p1, 0x7f0800f9
+    const p1, 0x7f0800f5
 
     return p1
 .end method
@@ -710,16 +710,16 @@
 
     if-eqz p3, :cond_0
 
-    const p1, 0x7f0801e9
+    const p1, 0x7f0801de
 
-    const v3, 0x7f0801e9
+    const v3, 0x7f0801de
 
     goto :goto_0
 
     :cond_0
-    const p1, 0x7f0801e7
+    const p1, 0x7f0801dc
 
-    const v3, 0x7f0801e7
+    const v3, 0x7f0801dc
 
     :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 e857b22b94..613aba438d 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 031a7f2ecd..770dd934bb 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 60be35011a..dc4a006b05 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 ab2a95f408..b7380f84b1 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 b4156bdb55..0df0f1b2ec 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 1ccd61d166..d5fdd4ebd0 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -95,7 +95,7 @@
 
     check-cast p1, Ljava/lang/CharSequence;
 
-    const v1, 0x7f120a8a
+    const v1, 0x7f120a54
 
     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 8f4eeb9516..87ccd88b89 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -87,7 +87,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/discord/app/i;->vO:Lcom/discord/app/i;
+    sget-object v1, Lcom/discord/app/i;->vP: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 31c31fc265..834e0e8e58 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,13 +56,13 @@
 
     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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object p1
 .end method
 
 .method public final invoke(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelChannel;)V
-    .locals 9
+    .locals 8
 
     const-string v0, "user"
 
@@ -82,19 +82,23 @@
 
     move-result-wide v4
 
+    invoke-static {v4, v5}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v4
+
     iget-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList$onViewBound$6;->this$0:Lcom/discord/widgets/channels/list/WidgetChannelsList;
 
     invoke-virtual {p1}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->requireFragmentManager()Landroidx/fragment/app/FragmentManager;
 
-    move-result-object v6
+    move-result-object v5
 
     const-string p1, "requireFragmentManager()"
 
-    invoke-static {v6, p1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, p1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p2}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
 
-    move-result-object v7
+    move-result-object v6
 
     invoke-virtual {p2}, Lcom/discord/models/domain/ModelChannel;->isVoiceChannel()Z
 
@@ -102,9 +106,9 @@
 
     invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
-    move-result-object v8
+    move-result-object v7
 
-    invoke-virtual/range {v1 .. v8}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;->show(JJLandroidx/fragment/app/FragmentManager;Ljava/lang/Long;Ljava/lang/Boolean;)V
+    invoke-virtual/range {v1 .. v7}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;->show(JLjava/lang/Long;Landroidx/fragment/app/FragmentManager;Ljava/lang/Long;Ljava/lang/Boolean;)V
 
     return-void
 .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 c1e9c57c0a..246da94438 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 557c1bbf50..2577dd609e 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, 0x7f0803c9
+    const p1, 0x7f0803bb
 
-    const v1, 0x7f0803c9
+    const v1, 0x7f0803bb
 
     goto/16 :goto_0
 
     :cond_0
-    const p1, 0x7f0803ca
+    const p1, 0x7f0803bc
 
-    const v1, 0x7f0803ca
+    const v1, 0x7f0803bc
 
     goto/16 :goto_0
 
@@ -438,16 +438,16 @@
 
     if-eqz p1, :cond_2
 
-    const p1, 0x7f08032f
+    const p1, 0x7f080323
 
-    const v1, 0x7f08032f
+    const v1, 0x7f080323
 
     goto/16 :goto_0
 
     :cond_2
-    const p1, 0x7f080330
+    const p1, 0x7f080324
 
-    const v1, 0x7f080330
+    const v1, 0x7f080324
 
     goto/16 :goto_0
 
@@ -489,16 +489,16 @@
 
     if-eqz p1, :cond_5
 
-    const p1, 0x7f0802b3
+    const p1, 0x7f0802a7
 
-    const v1, 0x7f0802b3
+    const v1, 0x7f0802a7
 
     goto :goto_0
 
     :cond_5
-    const p1, 0x7f0802b4
+    const p1, 0x7f0802a8
 
-    const v1, 0x7f0802b4
+    const v1, 0x7f0802a8
 
     goto :goto_0
 
@@ -521,16 +521,16 @@
 
     if-eqz p1, :cond_7
 
-    const p1, 0x7f0802aa
+    const p1, 0x7f08029e
 
-    const v1, 0x7f0802aa
+    const v1, 0x7f08029e
 
     goto :goto_0
 
     :cond_7
-    const p1, 0x7f0802ab
+    const p1, 0x7f08029f
 
-    const v1, 0x7f0802ab
+    const v1, 0x7f08029f
 
     goto :goto_0
 
@@ -553,16 +553,16 @@
 
     if-eqz p1, :cond_9
 
-    const p1, 0x7f0802ac
+    const p1, 0x7f0802a0
 
-    const v1, 0x7f0802ac
+    const v1, 0x7f0802a0
 
     goto :goto_0
 
     :cond_9
-    const p1, 0x7f0802ad
+    const p1, 0x7f0802a1
 
-    const v1, 0x7f0802ad
+    const v1, 0x7f0802a1
 
     goto :goto_0
 
@@ -585,16 +585,16 @@
 
     if-eqz p1, :cond_b
 
-    const p1, 0x7f0802ae
+    const p1, 0x7f0802a2
 
-    const v1, 0x7f0802ae
+    const v1, 0x7f0802a2
 
     goto :goto_0
 
     :cond_b
-    const p1, 0x7f0802af
+    const p1, 0x7f0802a3
 
-    const v1, 0x7f0802af
+    const v1, 0x7f0802a3
 
     goto :goto_0
 
@@ -610,7 +610,7 @@
 
     const/4 v2, 0x0
 
-    const v3, 0x7f08040e
+    const v3, 0x7f0803ff
 
     const/4 v4, 0x0
 
@@ -1022,7 +1022,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d00de
+    const v0, 0x7f0d00dc
 
     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 9578799411..087e58d5b2 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, 0x7f080139
+    const p2, 0x7f080135
 
     goto :goto_1
 
     :cond_1
-    const p2, 0x7f080137
+    const p2, 0x7f080133
 
     :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 d32d00aa02..aa9c3d0371 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, 0x7f080240
+    const p1, 0x7f080234
 
     return p1
 
@@ -141,7 +141,7 @@
 
     if-nez v0, :cond_1
 
-    const p1, 0x7f08023c
+    const p1, 0x7f080231
 
     return p1
 
@@ -158,7 +158,7 @@
 
     if-eqz v0, :cond_2
 
-    const p1, 0x7f080241
+    const p1, 0x7f080235
 
     return p1
 
@@ -175,7 +175,7 @@
 
     if-nez p1, :cond_3
 
-    const p1, 0x7f08023d
+    const p1, 0x7f080232
 
     return p1
 
@@ -194,12 +194,12 @@
 
     if-eqz p1, :cond_0
 
-    const p1, 0x7f0600cb
+    const p1, 0x7f0600ca
 
     return p1
 
     :cond_0
-    const p1, 0x7f0600c6
+    const p1, 0x7f0600c5
 
     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 91a872c9f7..37e7ecd0bc 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, 0x7f080137
+    const v1, 0x7f080133
 
     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 697c8557b2..c32f6ce8c5 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, 0x7f120bca
+    const v0, 0x7f120b94
 
     invoke-virtual {p2, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -414,12 +414,12 @@
 
     if-eqz p1, :cond_0
 
-    const p1, 0x7f080176
+    const p1, 0x7f08016b
 
     goto :goto_0
 
     :cond_0
-    const p1, 0x7f08017b
+    const p1, 0x7f080170
 
     :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 49db8ddb88..a10f3e9303 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, 0x7f08022b
+    const p1, 0x7f080220
 
     return p1
 
@@ -199,7 +199,7 @@
 
     if-eqz v0, :cond_1
 
-    const p1, 0x7f080229
+    const p1, 0x7f08021e
 
     return p1
 
@@ -210,12 +210,12 @@
 
     if-eqz p1, :cond_2
 
-    const p1, 0x7f08022a
+    const p1, 0x7f08021f
 
     return p1
 
     :cond_2
-    const p1, 0x7f080225
+    const p1, 0x7f08021a
 
     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, 0x7f0600bb
+    const v0, 0x7f0600ba
 
     if-eqz p2, :cond_0
 
@@ -316,7 +316,7 @@
 
     if-eqz p2, :cond_1
 
-    const p1, 0x7f0600cb
+    const p1, 0x7f0600ca
 
     return p1
 
@@ -330,7 +330,7 @@
     return v0
 
     :cond_2
-    const p1, 0x7f0600c6
+    const p1, 0x7f0600c5
 
     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 0c0709f01a..92fa400961 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, 0x7f0803d4
+    const p2, 0x7f0803c6
 
     goto :goto_0
 
     :cond_0
     if-nez v1, :cond_1
 
-    const p2, 0x7f080223
+    const p2, 0x7f080218
 
     goto :goto_0
 
     :cond_1
     if-eqz v3, :cond_2
 
-    const p2, 0x7f080230
+    const p2, 0x7f080225
 
     goto :goto_0
 
     :cond_2
-    const p2, 0x7f08022d
+    const p2, 0x7f080222
 
     :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 47f88b77d6..40b6520428 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, 0x7f120d24
+    const v0, 0x7f120ced
 
     if-eq p1, v0, :cond_2
 
-    const p2, 0x7f121224
+    const p2, 0x7f121197
 
     const/4 v0, 0x0
 
     if-eq p1, p2, :cond_1
 
-    const p2, 0x7f1213fe
+    const p2, 0x7f121372
 
     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 5a500de11e..9e8ace7e27 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, 0x7f121285
+    const v0, 0x7f1211f8
 
     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;->vj:Lcom/discord/app/e;
+    sget-object p1, Lcom/discord/app/e;->vk:Lcom/discord/app/e;
 
-    sget-wide p1, Lcom/discord/app/e;->vc:J
+    sget-wide p1, Lcom/discord/app/e;->vd: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 bd20435a86..492b12d3d5 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 1859873308..5259d531ee 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 8623d54091..220e6caf73 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 fe7a2296c4..a335803ed0 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 b3083c4e8e..aef5beea10 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 751893d919..4cd5d9279a 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 d22dc35d8d..9a4d43251c 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, 0x7f0d00e7
+    const p2, 0x7f0d00e5
 
     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, 0x7f0d00e1
+    const p2, 0x7f0d00df
 
     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, 0x7f0d00e8
+    const p2, 0x7f0d00e6
 
     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, 0x7f0d00e6
+    const p2, 0x7f0d00e4
 
     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, 0x7f0d00e5
+    const p2, 0x7f0d00e3
 
     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, 0x7f0d00e3
+    const p2, 0x7f0d00e1
 
     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, 0x7f0d00ea
+    const p2, 0x7f0d00e8
 
     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, 0x7f0d00e4
+    const p2, 0x7f0d00e2
 
     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, 0x7f0d00e2
+    const p2, 0x7f0d00e0
 
     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 ee36078439..e6f255544f 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 70fc0162f4..f7d1ba8b3f 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, 0x7f1212b7
+    const v0, 0x7f12122a
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -340,7 +340,7 @@
     return-object p1
 
     :cond_0
-    const v0, 0x7f120c0d
+    const v0, 0x7f120bd6
 
     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 41cb1f5704..acc6fb5789 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 bce9cbaf3f..012ed3b784 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
@@ -28,22 +28,18 @@
 
 
 # instance fields
-.field final synthetic $this_apply:Landroid/view/View;
-
 .field final synthetic $this_configureUI$inlined:Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model;
 
 .field final synthetic this$0:Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions;
 
 
 # direct methods
-.method constructor <init>(Landroid/view/View;Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions;Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model;)V
+.method constructor <init>(Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions;Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$1;->$this_apply:Landroid/view/View;
+    iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$1;->this$0:Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions;
 
-    iput-object p2, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$1;->this$0:Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions;
-
-    iput-object p3, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$1;->$this_configureUI$inlined:Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model;
+    iput-object p2, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$1;->$this_configureUI$inlined:Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model;
 
     const/4 p1, 0x1
 
@@ -61,43 +57,59 @@
 
     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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object p1
 .end method
 
 .method public final invoke(Landroid/view/View;)V
-    .locals 2
+    .locals 10
 
     const-string v0, "it"
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$1;->$this_apply:Landroid/view/View;
+    sget-object v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->Companion:Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;
 
-    invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
+    iget-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$1;->$this_configureUI$inlined:Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model;
+
+    invoke-virtual {p1}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model;->getChannel()Lcom/discord/models/domain/ModelChannel;
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$1;->$this_configureUI$inlined:Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model;
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getDMRecipient()Lcom/discord/models/domain/ModelUser;
 
-    invoke-virtual {v0}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model;->getChannel()Lcom/discord/models/domain/ModelChannel;
+    move-result-object p1
 
-    move-result-object v0
+    const-string v0, "channel.dmRecipient"
 
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelChannel;->getDMRecipient()Lcom/discord/models/domain/ModelUser;
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-result-object v0
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getId()J
 
-    const-string v1, "channel.dmRecipient"
+    move-result-wide v2
 
-    invoke-static {v0, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    iget-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$1;->this$0:Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions;
 
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->getId()J
+    invoke-virtual {p1}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions;->requireFragmentManager()Landroidx/fragment/app/FragmentManager;
 
-    move-result-wide v0
+    move-result-object v5
 
-    invoke-static {p1, v0, v1}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->launch(Landroid/content/Context;J)V
+    const-string p1, "requireFragmentManager()"
+
+    invoke-static {v5, p1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v4, 0x0
+
+    const/4 v6, 0x0
+
+    const/4 v7, 0x0
+
+    const/16 v8, 0x1a
+
+    const/4 v9, 0x0
+
+    invoke-static/range {v1 .. v9}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;->show$default(Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;JLjava/lang/Long;Landroidx/fragment/app/FragmentManager;Ljava/lang/Long;Ljava/lang/Boolean;ILjava/lang/Object;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$2.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$2.smali
index d4fff26887..0d35c9c695 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 b2d6d2fb5d..9cb8468aad 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 6d387556f4..06e2f8122a 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 336bf7e09c..a4f7a6d852 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 f72b18bede..12b4f7e935 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 7c788ab6e6..a869c4d4fc 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions.smali
@@ -485,7 +485,7 @@
 
     new-instance v1, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$1;
 
-    invoke-direct {v1, v0, p0, p1}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$1;-><init>(Landroid/view/View;Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions;Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model;)V
+    invoke-direct {v1, p0, p1}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$1;-><init>(Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions;Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model;)V
 
     check-cast v1, Lkotlin/jvm/functions/Function1;
 
@@ -898,7 +898,7 @@
 
     if-eqz p2, :cond_0
 
-    const p1, 0x7f120587
+    const p1, 0x7f120562
 
     goto :goto_0
 
@@ -911,7 +911,7 @@
 
     if-nez p2, :cond_1
 
-    const p1, 0x7f1203e2
+    const p1, 0x7f1203bd
 
     goto :goto_0
 
@@ -922,12 +922,12 @@
 
     if-eqz p1, :cond_2
 
-    const p1, 0x7f120586
+    const p1, 0x7f120561
 
     goto :goto_0
 
     :cond_2
-    const p1, 0x7f120fff
+    const p1, 0x7f120f73
 
     :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, 0x7f0d00e9
+    const v0, 0x7f0d00e7
 
     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 df1a58dac9..c88a25a3f3 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 af9ffccd8f..94b9e2f3f7 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 695bd31152..f28c3a8787 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 5faeef2535..b2a9088cc2 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 b09ef30a8d..8faf6218d9 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 bc0e50b7b5..1666af4525 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 b77b1c0c63..1921016853 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 b87718b4db..445089d160 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, 0x7f0a0837
+    const v0, 0x7f0a07fd
 
     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, 0x7f0a0833
+    const v0, 0x7f0a07f9
 
     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, 0x7f0a0835
+    const v0, 0x7f0a07fb
 
     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, 0x7f0a0838
+    const v0, 0x7f0a07fe
 
     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, 0x7f0a0839
+    const v0, 0x7f0a07ff
 
     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, 0x7f0a0836
+    const v0, 0x7f0a07fc
 
     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, 0x7f0a083a
+    const v0, 0x7f0a0800
 
     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, 0x7f0a083b
+    const v0, 0x7f0a0801
 
     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, 0x7f0a0834
+    const v0, 0x7f0a07fa
 
     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;->bhO:Lkotlin/jvm/internal/ab;
+    sget-object v2, Lkotlin/jvm/internal/ab;->bhJ:Lkotlin/jvm/internal/ab;
 
     new-array v2, v6, [Ljava/lang/Object;
 
@@ -1040,7 +1040,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d01e0
+    const v0, 0x7f0d01d5
 
     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 9990e9aca5..6e7697bcbc 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, 0x7f0a0871
+    const p1, 0x7f0a0836
 
     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, 0x7f0a0870
+    const p1, 0x7f0a0835
 
     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, 0x7f080129
+    const p2, 0x7f080125
 
     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 ca67ef3796..a8d6a42d6f 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, 0x7f0d0116
+    const p2, 0x7f0d0114
 
     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 d0c8011cd3..c53c62cf94 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;->IV()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->IT()Lrx/Observable;
 
     move-result-object v0
 
@@ -409,7 +409,7 @@
 
     move-result-object p2
 
-    invoke-static {}, Lrx/internal/a/ba;->JI()Lrx/internal/a/ba;
+    invoke-static {}, Lrx/internal/a/ba;->JG()Lrx/internal/a/ba;
 
     move-result-object v0
 
@@ -435,7 +435,7 @@
 
     invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
 
-    const v1, 0x7f120bca
+    const v1, 0x7f120b94
 
     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;->getStreams()Lrx/Observable;
+    invoke-virtual {v2}, Lcom/discord/stores/StoreApplicationStreaming;->get()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 ccd60f8103..665464361a 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;->KA()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->Ky()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;->bgy:Lkotlin/Unit;
+    sget-object p2, Lkotlin/Unit;->bgt: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 db362191db..e29886b44f 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -77,9 +77,13 @@
 
     invoke-virtual {v0}, Ljava/lang/Number;->longValue()J
 
-    move-result-wide v4
+    move-result-wide v0
 
-    sget-object v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->Companion:Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;
+    sget-object v2, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->Companion:Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;
+
+    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v5
 
     iget-object v0, p0, Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersList$configureUI$1;->this$0:Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersList;
 
@@ -103,9 +107,9 @@
 
     const/4 v10, 0x0
 
-    move-wide v2, p1
+    move-wide v3, p1
 
-    invoke-static/range {v1 .. v10}, 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
+    invoke-static/range {v2 .. v10}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;->show$default(Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;JLjava/lang/Long;Landroidx/fragment/app/FragmentManager;Ljava/lang/Long;Ljava/lang/Boolean;ILjava/lang/Object;)V
 
     :cond_0
     return-void
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 dc2d2b98d1..bfe7b4e97a 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 5602699dd8..86dae7ea8d 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 e87a84060a..717cdcb72f 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;->Kw()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Ku()Lrx/Scheduler;
 
     move-result-object v1
 
@@ -356,7 +356,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ak;->Jz()Lrx/internal/a/ak;
+    invoke-static {}, Lrx/internal/a/ak;->Jx()Lrx/internal/a/ak;
 
     move-result-object v1
 
@@ -482,7 +482,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d00ce
+    const v0, 0x7f0d00cc
 
     return v0
 .end method
@@ -633,7 +633,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/d/a;->Kw()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Ku()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 519f84c70d..dddd949e72 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;->vm:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vn: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 f9f684bfa5..6671a0b202 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 1cfc81cb6f..afd5fae24c 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;->KA()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->Ky()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;->Jz()Lrx/internal/a/ak;
+    invoke-static {}, Lrx/internal/a/ak;->Jx()Lrx/internal/a/ak;
 
     move-result-object v2
 
@@ -117,11 +117,11 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->IU()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->IS()Lrx/Observable;
 
     move-result-object v0
 
-    invoke-static {}, Lrx/d/a;->Kw()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Ku()Lrx/Scheduler;
 
     move-result-object v1
 
@@ -129,7 +129,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/android/b/a;->Jc()Lrx/Scheduler;
+    invoke-static {}, Lrx/android/b/a;->Ja()Lrx/Scheduler;
 
     move-result-object v1
 
@@ -267,7 +267,7 @@
 
     :catch_0
     :try_start_2
-    sget-object v2, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
+    sget-object v2, Lcom/discord/app/AppLog;->vn: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, 0x7f0d00cf
+    const p1, 0x7f0d00cd
 
     return p1
 .end method
@@ -411,7 +411,7 @@
 
     check-cast v1, Landroid/view/ViewGroup;
 
-    const v2, 0x7f0d00cf
+    const v2, 0x7f0d00cd
 
     const/4 v3, 0x0
 
@@ -564,7 +564,7 @@
 
     new-instance p1, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderLoading;
 
-    const p2, 0x7f0d00d0
+    const p2, 0x7f0d00ce
 
     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, 0x7f0d00d1
+    const p2, 0x7f0d00cf
 
     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, 0x7f0d00cf
+    const p2, 0x7f0d00cd
 
     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 5f7a683454..d60332e041 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, 0x7f0a0822
+    const v0, 0x7f0a07e8
 
     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 5d57bd2692..778a91741b 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, 0x7f120ecb
+    const v2, 0x7f120e57
 
     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 61559e8c99..778ed1b6ef 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, 0x7f0402a1
+    const v4, 0x7f0402a0
 
     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 56f5ce4678..4b495a4181 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, 0x7f1206a2
+    const v2, 0x7f12067d
 
     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 9864843d50..b43abe2a26 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, 0x7f0a0278
+    const v0, 0x7f0a0277
 
     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, 0x7f0a0275
+    const v0, 0x7f0a0274
 
     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, 0x7f0a0276
+    const v0, 0x7f0a0275
 
     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, 0x7f0a0277
+    const v0, 0x7f0a0276
 
     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, 0x7f0d01c9
+    const v0, 0x7f0d01c1
 
     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 f9a8061df8..26130e001f 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 2d63557530..0bbfc640ac 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -70,7 +70,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 3ef9d6583d..1af7a1aced 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 f1807405be..ef1898a0be 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, 0x7f0d00ec
+    const v0, 0x7f0d00ea
 
     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 bb12a4f533..94aeb57e16 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, 0x7f0d00ee
+    const v3, 0x7f0d00ec
 
     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 9afb16131a..b57103370e 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 a3d8fda897..5d3f39c48d 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, 0x7f120b97
+    const v1, 0x7f120b61
 
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
 
@@ -389,7 +389,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f120b96
+    const v1, 0x7f120b60
 
     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, 0x7f0d00ed
+    const v0, 0x7f0d00eb
 
     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 90c98c2a62..43afd26177 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, 0x7f0d00f1
+    const v1, 0x7f0d00ef
 
     const/4 v2, 0x1
 
@@ -54,7 +54,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f0a051d
+    const v0, 0x7f0a050f
 
     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, 0x7f121211
+    const v2, 0x7f121184
 
     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 13bfde797d..49f8fad285 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, 0x7f0d00f1
+    const v1, 0x7f0d00ef
 
     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 88d5fc94a4..2c6ff72524 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, 0x7f0d00f1
+    const v1, 0x7f0d00ef
 
     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 156c2420e1..28016ac416 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, 0x7f0a051d
+    const v0, 0x7f0a050f
 
     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, 0x7f121212
+    const v1, 0x7f121185
 
     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 a73e5d43a2..25922e739d 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 aeea3b5907..f61fc7c54a 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;->AX()Lcom/lytefast/flexinput/utils/SelectionAggregator;
+    invoke-virtual {v1}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->AV()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;->vm:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vn: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;->aXX:Lcom/lytefast/flexinput/utils/SelectionCoordinator$ItemSelectionListener;
+    iget-object v0, p1, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->aXT: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 97968a481f..18a2573e27 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, 0x7f120272
+    const v2, 0x7f120270
 
     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, 0x7f0802d2
+    const v6, 0x7f0802c6
 
-    const v7, 0x7f120275
+    const v7, 0x7f120273
 
     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, 0x7f080282
+    const v6, 0x7f080276
 
-    const v7, 0x7f120273
+    const v7, 0x7f120271
 
     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, 0x7f0801d7
+    const v8, 0x7f0801cc
 
-    const v9, 0x7f120270
+    const v9, 0x7f12026e
 
     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;->aXr:Landroid/widget/LinearLayout;
+    iget-object v5, v1, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXn: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;->aXz:Lcom/lytefast/flexinput/managers/a;
+    iput-object v4, v1, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXv: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, 0x7f0a02b5
+    const v4, 0x7f0a02b4
 
     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;->aXv:Landroidx/appcompat/widget/AppCompatImageButton;
+    iget-object v1, v1, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXr: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;->Bi()Z
+    invoke-virtual {v0}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Bg()Z
 
     move-result v0
 
@@ -466,7 +466,7 @@
     const/4 v1, 0x0
 
     :goto_0
-    iget-object v2, v0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXr:Landroid/widget/LinearLayout;
+    iget-object v2, v0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXn: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;->aXr:Landroid/widget/LinearLayout;
+    iget-object v2, v0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXn: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;->aXu:Landroidx/appcompat/widget/AppCompatEditText;
+    iget-object p1, v0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXq: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;->aXA:Lcom/lytefast/flexinput/InputListener;
+    iput-object p1, v0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXw: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 2524153a4c..2f54bc921d 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, 0x7f060111
+    const v3, 0x7f060110
 
     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 3e529504c8..d872e9177c 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, 0x7f0d00f0
+    const p2, 0x7f0d00ee
 
     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 3f9276b8e2..1a2aae5144 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object p1
 
@@ -891,7 +891,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ba;->JI()Lrx/internal/a/ba;
+    invoke-static {}, Lrx/internal/a/ba;->JG()Lrx/internal/a/ba;
 
     move-result-object v1
 
@@ -907,7 +907,7 @@
 
     move-result-object p0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v0
 
@@ -954,7 +954,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v2
 
@@ -1054,7 +1054,7 @@
 
     move-result-object p0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 a65cb8892d..e026798e81 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 f0ae52d07b..d6f232b7ee 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;->bGh:Lrx/Emitter$a;
+    sget-object p1, Lrx/Emitter$a;->bGc: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;->Kw()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Ku()Lrx/Scheduler;
 
     move-result-object v0
 
@@ -937,7 +937,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/android/b/a;->Jc()Lrx/Scheduler;
+    invoke-static {}, Lrx/android/b/a;->Ja()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 0f01ecd66b..a666707d9d 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, 0x7f12056b
+    const p1, 0x7f120546
 
     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, 0x7f120c6d
+    const p1, 0x7f120c36
 
     invoke-virtual {p0, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -135,7 +135,7 @@
 
     move-result-object p1
 
-    const p2, 0x7f121227
+    const p2, 0x7f12119a
 
     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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object p1
 
@@ -379,7 +379,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -399,7 +399,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -837,7 +837,7 @@
     return-object p1
 
     :cond_0
-    const v0, 0x7f1213dd
+    const v0, 0x7f121351
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -846,7 +846,7 @@
     return-object p1
 
     :cond_1
-    const v0, 0x7f1213d3
+    const v0, 0x7f121347
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -883,7 +883,7 @@
     return-object p1
 
     :cond_0
-    const v0, 0x7f12095a
+    const v0, 0x7f120924
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -892,7 +892,7 @@
     return-object p1
 
     :cond_1
-    const v0, 0x7f120958
+    const v0, 0x7f120922
 
     new-array v1, v1, [Ljava/lang/Object;
 
@@ -907,7 +907,7 @@
     return-object p1
 
     :cond_2
-    const v0, 0x7f120957
+    const v0, 0x7f120921
 
     new-array v1, v1, [Ljava/lang/Object;
 
@@ -922,7 +922,7 @@
     return-object p1
 
     :cond_3
-    const v0, 0x7f120959
+    const v0, 0x7f120923
 
     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 2afd3ececc..8e88d65b19 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object v0
 .end method
@@ -110,7 +110,7 @@
 
     if-eqz v1, :cond_1
 
-    sget-object v3, Lkotlin/jvm/internal/h;->bhJ:Lkotlin/jvm/internal/h;
+    sget-object v3, Lkotlin/jvm/internal/h;->bhE: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 8ba1e1c173..1b357fa42f 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 b5252b348b..4348d9130a 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 c4bbf44c81..8ca23a6187 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, 0x7f1203e9
+    const p2, 0x7f1203c4
 
     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, 0x7f120591
+    const p2, 0x7f12056c
 
     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, 0x7f120c6d
+    const p2, 0x7f120c36
 
     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 4a4707d816..105c7fb251 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiAdapter$EmojiViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiAdapter$EmojiViewHolder.smali
@@ -37,7 +37,7 @@
 
     iget-object v0, p0, Lcom/discord/widgets/chat/input/emoji/WidgetChatInputEmojiAdapter$EmojiViewHolder;->itemView:Landroid/view/View;
 
-    const v1, 0x7f0a02b6
+    const v1, 0x7f0a02b5
 
     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 b69e8405d7..df3b84e4f2 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, 0x7f121170
+    const p1, 0x7f1210e4
 
     return p1
 
     :pswitch_0
-    const p1, 0x7f1205a5
+    const p1, 0x7f120580
 
     return p1
 
     :pswitch_1
-    const p1, 0x7f12059f
+    const p1, 0x7f12057a
 
     return p1
 
     :pswitch_2
-    const p1, 0x7f1205a0
+    const p1, 0x7f12057b
 
     return p1
 
     :pswitch_3
-    const p1, 0x7f1205a6
+    const p1, 0x7f120581
 
     return p1
 
     :pswitch_4
-    const p1, 0x7f1205a3
+    const p1, 0x7f12057e
 
     return p1
 
     :pswitch_5
-    const p1, 0x7f1205a7
+    const p1, 0x7f120582
 
     return p1
 
     :pswitch_6
-    const p1, 0x7f12059e
+    const p1, 0x7f120579
 
     return p1
 
     :pswitch_7
-    const p1, 0x7f1205a1
+    const p1, 0x7f12057c
 
     return p1
 
     :pswitch_8
-    const p1, 0x7f1205a2
+    const p1, 0x7f12057d
 
     return p1
 
     :pswitch_9
-    const p1, 0x7f1205a4
+    const p1, 0x7f12057f
 
     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 fcc046f9ad..ca4eb48c8c 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiAdapter$HeaderViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiAdapter$HeaderViewHolder.smali
@@ -37,7 +37,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/chat/input/emoji/WidgetChatInputEmojiAdapter$HeaderViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a0393
+    const v0, 0x7f0a038e
 
     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 4860d538a3..991f83d2c8 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;->bGj:Lrx/Emitter$a;
+    sget-object v1, Lrx/Emitter$a;->bGe: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 b71cc9c654..ea6896282a 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, 0x7f040385
-
-    return p0
-
-    :pswitch_0
-    const p0, 0x7f04038b
-
-    return p0
-
-    :pswitch_1
-    const p0, 0x7f040386
-
-    return p0
-
-    :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
+    :pswitch_0
+    const p0, 0x7f04038a
 
     return p0
 
-    :pswitch_7
+    :pswitch_1
+    const p0, 0x7f040385
+
+    return p0
+
+    :pswitch_2
+    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
+    const p0, 0x7f040386
+
+    return p0
+
+    :pswitch_7
+    const p0, 0x7f040387
+
+    return p0
+
     :pswitch_8
-    const p0, 0x7f04038a
+    const p0, 0x7f040389
 
     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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -822,7 +822,7 @@
 .method public getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d00ef
+    const v0, 0x7f0d00ed
 
     return v0
 .end method
@@ -1037,12 +1037,12 @@
     :cond_1
     if-eqz v1, :cond_2
 
-    const v0, 0x7f120f37
+    const v0, 0x7f120eb3
 
     goto :goto_0
 
     :cond_2
-    const v0, 0x7f120f3d
+    const v0, 0x7f120eb9
 
     :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, 0x7f120f38
+    const v1, 0x7f120eb4
 
     goto :goto_1
 
     :cond_3
-    const v1, 0x7f120f3e
+    const v1, 0x7f120eba
 
     :goto_1
     invoke-virtual {p0, v1}, Lcom/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker;->getString(I)Ljava/lang/String;
@@ -1080,7 +1080,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f1205a8
+    const v0, 0x7f120583
 
     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, 0x7f0a02bb
+    const v0, 0x7f0a02ba
 
     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, 0x7f0a02ba
+    const v0, 0x7f0a02b9
 
     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, 0x7f0a02b8
+    const v0, 0x7f0a02b7
 
     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, 0x7f0a02bc
+    const v0, 0x7f0a02bb
 
     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, 0x7f0a05cd
+    const v0, 0x7f0a05b4
 
     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, 0x7f0a05c3
+    const v0, 0x7f0a05aa
 
     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, 0x7f0a05c7
+    const v0, 0x7f0a05ae
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion.smali b/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion.smali
index 396ea10e37..850ebdce0b 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion.smali
@@ -560,7 +560,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object p2
 
@@ -774,7 +774,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object p2
 
@@ -790,7 +790,7 @@
 
     :cond_4
     :goto_2
-    sget-object p1, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
+    sget-object p1, Lcom/discord/app/AppLog;->vn: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/chat/list/ViewEmbedGameInvite$configureUI$2.smali b/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite$configureUI$2.smali
index 567a47f8ca..aefa35521d 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite$configureUI$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite$configureUI$2.smali
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$configureUI$2;->invoke(Lcom/facebook/imagepipeline/request/ImageRequestBuilder;)V
 
-    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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;->Zz:Lcom/facebook/imagepipeline/request/c;
+    iput-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Zv:Lcom/facebook/imagepipeline/request/c;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite.smali b/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite.smali
index 7b7bf03ff2..54d8815f85 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite.smali
@@ -90,11 +90,11 @@
 
     check-cast v0, Landroid/view/ViewGroup;
 
-    const v1, 0x7f0d007e
+    const v1, 0x7f0d007d
 
     invoke-static {p1, v1, v0}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
-    const p1, 0x7f0a03e0
+    const p1, 0x7f0a03db
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->findViewById(I)Landroid/view/View;
 
@@ -108,7 +108,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->headerText:Landroid/widget/TextView;
 
-    const p1, 0x7f0a03e2
+    const p1, 0x7f0a03dd
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->findViewById(I)Landroid/view/View;
 
@@ -122,7 +122,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->statusText:Landroid/widget/TextView;
 
-    const p1, 0x7f0a03de
+    const p1, 0x7f0a03d9
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->findViewById(I)Landroid/view/View;
 
@@ -136,7 +136,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->applicationNameText:Landroid/widget/TextView;
 
-    const p1, 0x7f0a03df
+    const p1, 0x7f0a03da
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->findViewById(I)Landroid/view/View;
 
@@ -150,7 +150,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->coverImage:Lcom/facebook/drawee/view/SimpleDraweeView;
 
-    const p1, 0x7f0a03e1
+    const p1, 0x7f0a03dc
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->findViewById(I)Landroid/view/View;
 
@@ -164,7 +164,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->recyclerView:Landroidx/recyclerview/widget/RecyclerView;
 
-    const p1, 0x7f0a03dd
+    const p1, 0x7f0a03d8
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->findViewById(I)Landroid/view/View;
 
@@ -216,11 +216,11 @@
 
     check-cast p2, Landroid/view/ViewGroup;
 
-    const v0, 0x7f0d007e
+    const v0, 0x7f0d007d
 
     invoke-static {p1, v0, p2}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
-    const p1, 0x7f0a03e0
+    const p1, 0x7f0a03db
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->findViewById(I)Landroid/view/View;
 
@@ -234,7 +234,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->headerText:Landroid/widget/TextView;
 
-    const p1, 0x7f0a03e2
+    const p1, 0x7f0a03dd
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->findViewById(I)Landroid/view/View;
 
@@ -248,7 +248,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->statusText:Landroid/widget/TextView;
 
-    const p1, 0x7f0a03de
+    const p1, 0x7f0a03d9
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->findViewById(I)Landroid/view/View;
 
@@ -262,7 +262,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->applicationNameText:Landroid/widget/TextView;
 
-    const p1, 0x7f0a03df
+    const p1, 0x7f0a03da
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->findViewById(I)Landroid/view/View;
 
@@ -276,7 +276,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->coverImage:Lcom/facebook/drawee/view/SimpleDraweeView;
 
-    const p1, 0x7f0a03e1
+    const p1, 0x7f0a03dc
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->findViewById(I)Landroid/view/View;
 
@@ -290,7 +290,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->recyclerView:Landroidx/recyclerview/widget/RecyclerView;
 
-    const p1, 0x7f0a03dd
+    const p1, 0x7f0a03d8
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->findViewById(I)Landroid/view/View;
 
@@ -342,11 +342,11 @@
 
     check-cast p2, Landroid/view/ViewGroup;
 
-    const p3, 0x7f0d007e
+    const p3, 0x7f0d007d
 
     invoke-static {p1, p3, p2}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
-    const p1, 0x7f0a03e0
+    const p1, 0x7f0a03db
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->findViewById(I)Landroid/view/View;
 
@@ -360,7 +360,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->headerText:Landroid/widget/TextView;
 
-    const p1, 0x7f0a03e2
+    const p1, 0x7f0a03dd
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->findViewById(I)Landroid/view/View;
 
@@ -374,7 +374,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->statusText:Landroid/widget/TextView;
 
-    const p1, 0x7f0a03de
+    const p1, 0x7f0a03d9
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->findViewById(I)Landroid/view/View;
 
@@ -388,7 +388,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->applicationNameText:Landroid/widget/TextView;
 
-    const p1, 0x7f0a03df
+    const p1, 0x7f0a03da
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->findViewById(I)Landroid/view/View;
 
@@ -402,7 +402,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->coverImage:Lcom/facebook/drawee/view/SimpleDraweeView;
 
-    const p1, 0x7f0a03e1
+    const p1, 0x7f0a03dc
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->findViewById(I)Landroid/view/View;
 
@@ -416,7 +416,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->recyclerView:Landroidx/recyclerview/widget/RecyclerView;
 
-    const p1, 0x7f0a03dd
+    const p1, 0x7f0a03d8
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->findViewById(I)Landroid/view/View;
 
@@ -478,12 +478,12 @@
 
     if-eq v2, v3, :cond_0
 
-    const v2, 0x7f120a68
+    const v2, 0x7f120a32
 
     goto :goto_0
 
     :cond_0
-    const v2, 0x7f120a6a
+    const v2, 0x7f120a34
 
     :goto_0
     invoke-virtual {v1, v2}, Landroid/widget/TextView;->setText(I)V
@@ -547,7 +547,7 @@
 
     if-eqz v1, :cond_4
 
-    const v4, 0x7f120a63
+    const v4, 0x7f120a2d
 
     goto :goto_3
 
@@ -562,14 +562,14 @@
 
     if-ne v6, v3, :cond_5
 
-    const v4, 0x7f120a74
+    const v4, 0x7f120a3e
 
     goto :goto_3
 
     :cond_5
     if-eqz v4, :cond_6
 
-    const v4, 0x7f120a61
+    const v4, 0x7f120a2b
 
     goto :goto_3
 
@@ -580,12 +580,12 @@
 
     if-eqz v4, :cond_7
 
-    const v4, 0x7f120a66
+    const v4, 0x7f120a30
 
     goto :goto_3
 
     :cond_7
-    const v4, 0x7f120a6c
+    const v4, 0x7f120a36
 
     :goto_3
     invoke-virtual {v5, v4}, Landroid/widget/TextView;->setText(I)V
@@ -898,7 +898,7 @@
 
     iget-object p2, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->actionBtn:Lcom/google/android/material/button/MaterialButton;
 
-    const p3, 0x7f120ac6
+    const p3, 0x7f120a90
 
     invoke-virtual {p2, p3}, Lcom/google/android/material/button/MaterialButton;->setText(I)V
 
@@ -941,7 +941,7 @@
 
     iget-object p2, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->actionBtn:Lcom/google/android/material/button/MaterialButton;
 
-    const v0, 0x7f1212fc
+    const v0, 0x7f12126f    # 1.94163E38f
 
     invoke-virtual {p2, v0}, Lcom/google/android/material/button/MaterialButton;->setText(I)V
 
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 6c0ee0c26f..2008bed959 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, 0x7f120575
+    const v0, 0x7f120550
 
     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;->bgy:Lkotlin/Unit;
+    sget-object p0, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object p0
 .end method
@@ -98,7 +98,7 @@
 
     check-cast p0, Landroid/content/Context;
 
-    const v0, 0x7f120574
+    const v0, 0x7f12054f
 
     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;->bgy:Lkotlin/Unit;
+    sget-object p0, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object p0
 .end method
@@ -204,7 +204,7 @@
     :catch_0
     move-exception p1
 
-    sget-object p2, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
+    sget-object p2, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
 
     const-string v0, "SDK action unhandled."
 
@@ -240,7 +240,7 @@
 .end method
 
 .method public onMessageAuthorLongClicked(Lcom/discord/models/domain/ModelMessage;Ljava/lang/Long;)V
-    .locals 7
+    .locals 4
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessage;->isWebhook()Z
 
@@ -254,7 +254,7 @@
 
     move-result-object p1
 
-    const p2, 0x7f121342
+    const p2, 0x7f1212b5
 
     const/4 v0, 0x0
 
@@ -269,21 +269,23 @@
 
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->getId()J
 
-    move-result-wide v1
+    move-result-wide v0
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessage;->getChannelId()J
 
-    move-result-wide v3
+    move-result-wide v2
 
-    iget-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatList$1;->this$0:Lcom/discord/widgets/chat/list/WidgetChatList;
+    invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    invoke-virtual {p1}, Lcom/discord/widgets/chat/list/WidgetChatList;->getChildFragmentManager()Landroidx/fragment/app/FragmentManager;
+    move-result-object p1
 
-    move-result-object v5
+    iget-object v2, p0, Lcom/discord/widgets/chat/list/WidgetChatList$1;->this$0:Lcom/discord/widgets/chat/list/WidgetChatList;
 
-    move-object v6, p2
+    invoke-virtual {v2}, Lcom/discord/widgets/chat/list/WidgetChatList;->getChildFragmentManager()Landroidx/fragment/app/FragmentManager;
 
-    invoke-static/range {v1 .. v6}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->show(JJLandroidx/fragment/app/FragmentManager;Ljava/lang/Long;)V
+    move-result-object v2
+
+    invoke-static {v0, v1, p1, v2, p2}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->show(JLjava/lang/Long;Landroidx/fragment/app/FragmentManager;Ljava/lang/Long;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatList$UserReactionHandler.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatList$UserReactionHandler.smali
index 9e6f2f6443..ba25810026 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;->KA()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->Ky()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;->Kw()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Ku()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 422deaf968..34a7db60d0 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, 0x7f0d00f4
+    const v0, 0x7f0d00f2
 
     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 3a790fc570..61c0da9b2e 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, 0x7f0800c9
+    const v0, 0x7f0800c8
 
     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 0a5decc7e8..1b31c25fd8 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 4c2837c3ac..18ae65ee7f 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, 0x7f0d00fd
+    const p2, 0x7f0d00fb
 
     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, 0x7f0d010e
+    const p2, 0x7f0d010c
 
     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, 0x7f0d00f9
+    const p2, 0x7f0d00f7
 
     move-object v0, p0
 
@@ -508,7 +508,7 @@
     :pswitch_e
     new-instance p1, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
 
-    const p2, 0x7f0d010a
+    const p2, 0x7f0d0108
 
     move-object v0, p0
 
@@ -521,7 +521,7 @@
     :pswitch_f
     new-instance p1, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
 
-    const p2, 0x7f0d0109
+    const p2, 0x7f0d0107
 
     move-object v0, p0
 
@@ -534,7 +534,7 @@
     :pswitch_10
     new-instance p1, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
 
-    const p2, 0x7f0d010b
+    const p2, 0x7f0d0109
 
     move-object v0, p0
 
@@ -583,7 +583,7 @@
     :pswitch_15
     new-instance p1, Lcom/discord/widgets/chat/list/WidgetChatListItem;
 
-    const p2, 0x7f0d010c
+    const p2, 0x7f0d010a
 
     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, 0x7f0d0103
+    const p2, 0x7f0d0101
 
     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, 0x7f0d0106
+    const p2, 0x7f0d0104
 
     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, 0x7f0d010f
+    const p2, 0x7f0d010d
 
     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 48e3c52c42..e478592cce 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 b8d7ec63cd..b29bca106c 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 0361fa9afc..b897de6de6 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 74a49e732d..5058a29931 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, 0x7f0d00f6
+    const v0, 0x7f0d00f4
 
     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;->Cp:Lcom/discord/views/ApplicationNewsView$a$b;
+    sget-object v7, Lcom/discord/views/ApplicationNewsView$a$b;->Cs: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;->Cf:Landroid/view/ViewGroup;
+    iget-object v9, v2, Lcom/discord/views/ApplicationNewsView;->Ci:Landroid/view/ViewGroup;
 
     invoke-virtual {v9, v5}, Landroid/view/ViewGroup;->setVisibility(I)V
 
-    iget-object v9, v2, Lcom/discord/views/ApplicationNewsView;->Ck:Landroid/widget/ImageView;
+    iget-object v9, v2, Lcom/discord/views/ApplicationNewsView;->Cn:Landroid/widget/ImageView;
 
     invoke-virtual {v9, v6}, Landroid/widget/ImageView;->setVisibility(I)V
 
-    iget-object v9, v2, Lcom/discord/views/ApplicationNewsView;->Cl:Landroid/view/ViewGroup;
+    iget-object v9, v2, Lcom/discord/views/ApplicationNewsView;->Co: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;->BS:Landroid/widget/TextView;
+    iget-object v6, v2, Lcom/discord/views/ApplicationNewsView;->BV: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;->Ch:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object v6, v2, Lcom/discord/views/ApplicationNewsView;->Ck: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;->Ch:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object v6, v2, Lcom/discord/views/ApplicationNewsView;->Ck: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;->Cj:Landroid/widget/TextView;
+    iget-object v4, v2, Lcom/discord/views/ApplicationNewsView;->Cm: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;->Cf:Landroid/view/ViewGroup;
+    iget-object v1, v2, Lcom/discord/views/ApplicationNewsView;->Ci:Landroid/view/ViewGroup;
 
     invoke-virtual {v1, v6}, Landroid/view/ViewGroup;->setVisibility(I)V
 
-    iget-object v1, v2, Lcom/discord/views/ApplicationNewsView;->Ck:Landroid/widget/ImageView;
+    iget-object v1, v2, Lcom/discord/views/ApplicationNewsView;->Cn:Landroid/widget/ImageView;
 
     invoke-virtual {v1, v5}, Landroid/widget/ImageView;->setVisibility(I)V
 
-    iget-object v1, v2, Lcom/discord/views/ApplicationNewsView;->Cl:Landroid/view/ViewGroup;
+    iget-object v1, v2, Lcom/discord/views/ApplicationNewsView;->Co:Landroid/view/ViewGroup;
 
     invoke-virtual {v1, v6}, Landroid/view/ViewGroup;->setVisibility(I)V
 
-    iget-object v1, v2, Lcom/discord/views/ApplicationNewsView;->Ch:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object v1, v2, Lcom/discord/views/ApplicationNewsView;->Ck: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;->Ch:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object v1, v2, Lcom/discord/views/ApplicationNewsView;->Ck: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;->Cp:Lcom/discord/views/ApplicationNewsView$a$b;
+    sget-object v1, Lcom/discord/views/ApplicationNewsView$a$b;->Cs: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 ac850db3aa..1caa761ebd 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 e45cfe8cf4..6f050c3c86 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 bbc156d220..fa551c6ed0 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 34a86a1591..e4adbcf4a5 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, 0x7f0d00f7
+    const v0, 0x7f0d00f5
 
     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 672eb95d23..4f96541ea6 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, 0x7f0d00f8
+    const v0, 0x7f0d00f6
 
     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, 0x7f100019
+    const v0, 0x7f100018
 
     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, 0x7f120352
+    const p2, 0x7f12032d
 
     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 9c517f29e0..95bc46ad18 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, 0x7f08021a
+    const v2, 0x7f08020f
 
     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, 0x7f08021c
+    const v2, 0x7f080211
 
     invoke-virtual {v1, v2}, Landroid/widget/ImageView;->setImageResource(I)V
 
@@ -256,7 +256,7 @@
 
     move-result-object v0
 
-    const v3, 0x7f1211d9
+    const v3, 0x7f12114c
 
     new-array v2, v2, [Ljava/lang/Object;
 
@@ -277,7 +277,7 @@
 
     move-result-object v0
 
-    const v3, 0x7f1211d8
+    const v3, 0x7f12114b
 
     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 b095479196..dee7a2b7fc 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 33b7d7038a..e0c568d020 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;->IT()Lrx/Observable;
+    invoke-static {}, Lrx/Observable;->IR()Lrx/Observable;
 
     move-result-object p1
 
@@ -634,7 +634,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 9c704e5213..ec2904a150 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 d65c3a112e..75c5bbf671 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 48ace9fc7a..c1f213a318 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 3169afae69..ec27eee138 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 6fa7e493b2..ab84cd9f54 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 21886ff296..1d1ce60f04 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 1568c5d956..dfc68ad577 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 d889952cc3..6399c45513 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 e0e78e96c5..9f7adaa486 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, 0x7f0d00fa
+    const v0, 0x7f0d00f8
 
     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, 0x7f0a02b3
+    const p1, 0x7f0a02b2
 
     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, 0x7f04036d
+    const v1, 0x7f04036c
 
     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, 0x7f0d00fb
+    const v5, 0x7f0d00f9
 
     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, 0x7f06008d
+    const v4, 0x7f06008c
 
     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, 0x7f0402a2
+    const v4, 0x7f0402a1
 
     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;->vm:Lcom/discord/app/AppLog;
+    sget-object v2, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
 
     move-object v4, p1
 
@@ -2819,7 +2819,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->IV()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->IT()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 42bc82b8fc..f83c72824e 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, 0x7f0d00fc
+    const v0, 0x7f0d00fa
 
     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$onConfigure$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigure$1.smali
index 7fb70b699e..9d229d3c12 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
@@ -60,7 +60,7 @@
 
     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;
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigure$2.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigure$2.smali
index c6a4ba5b99..9ec7cb477b 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigure$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigure$2.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigure$2;->invoke(Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;)V
 
-    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigure$3.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigure$3.smali
index 15c292a792..b4c95c878a 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigure$3.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigure$3.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigure$3;->invoke(Lrx/Subscription;)V
 
-    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite.smali
index dbdea64fea..51280b2ead 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite.smali
@@ -17,7 +17,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f0d00fe
+    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/WidgetChatListAdapterItemGift$configureResolvedUI$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift$configureResolvedUI$1.smali
index e15d21a00d..6d50bfb37f 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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;->Zz:Lcom/facebook/imagepipeline/request/c;
+    iput-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Zv: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 d63605c341..9eb9d74825 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/f;->xH:Lcom/discord/dialogs/f$a;
+    sget-object p1, Lcom/discord/dialogs/f;->xJ: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;
 
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 1cbdf3eaea..732e86c4d4 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 a608e3391b..97074c80e2 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 88944e9bf8..6dad1fe838 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 aa881bfbf3..4a4e698321 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, 0x7f0d00ff
+    const v0, 0x7f0d00fd
 
     invoke-direct {p0, v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListItem;-><init>(ILcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
 
-    const p1, 0x7f0a03e7
+    const p1, 0x7f0a03e2
 
     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, 0x7f0a03eb
+    const p1, 0x7f0a03e6
 
     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, 0x7f0a03e8
+    const p1, 0x7f0a03e3
 
     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, 0x7f0a03e9
+    const p1, 0x7f0a03e4
 
     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, 0x7f0a03e6
+    const p1, 0x7f0a03e1
 
     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, 0x7f0a03ec
+    const p1, 0x7f0a03e7
 
     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, 0x7f0a03e3
+    const p1, 0x7f0a03de
 
     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, 0x7f0a03ed
+    const p1, 0x7f0a03e8
 
     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, 0x7f0a03e4
+    const p1, 0x7f0a03df
 
     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, 0x7f0a03ea
+    const p1, 0x7f0a03e5
 
     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, 0x7f1207e4
+    const p1, 0x7f1207bf
 
     invoke-virtual {v0, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -601,7 +601,7 @@
     goto :goto_2
 
     :cond_2
-    const p1, 0x7f1207e3
+    const p1, 0x7f1207be
 
     invoke-virtual {v0, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -616,7 +616,7 @@
 
     move-result-object p1
 
-    const v2, 0x7f1207e0
+    const v2, 0x7f1207bb
 
     invoke-virtual {p1, v2}, Landroid/widget/TextView;->setText(I)V
 
@@ -624,7 +624,7 @@
 
     move-result-object p1
 
-    const v2, 0x7f06011c
+    const v2, 0x7f06011b
 
     invoke-static {v0, v2}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
 
@@ -646,7 +646,7 @@
 
     const p1, 0x7f0401f2
 
-    const v2, 0x7f08045b
+    const v2, 0x7f08044c
 
     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, 0x7f1207e5
+    const v2, 0x7f1207c0
 
     invoke-virtual {v1, v2}, Lcom/discord/app/AppTextView;->setText(I)V
 
@@ -730,7 +730,7 @@
 
     move-result-object v1
 
-    const v3, 0x7f0402a2
+    const v3, 0x7f0402a1
 
     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, 0x7f080116
+    const v1, 0x7f080112
 
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setBackgroundResource(I)V
 
@@ -1056,7 +1056,7 @@
 
     const v3, 0x7f040154
 
-    const v12, 0x7f08044c
+    const v12, 0x7f08043d
 
     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, 0x7f1207e8
+    const v4, 0x7f1207c3
 
     invoke-virtual {v2, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -1140,7 +1140,7 @@
     goto :goto_7
 
     :cond_8
-    const v4, 0x7f1207e7
+    const v4, 0x7f1207c2
 
     invoke-virtual {v2, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -1189,7 +1189,7 @@
 
     move-result-object v3
 
-    const v4, 0x7f0402a2
+    const v4, 0x7f0402a1
 
     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, 0x7f1207db
+    const v4, 0x7f1207b6
 
     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, 0x7f120792
+    const v3, 0x7f12076d
 
     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, 0x7f1207c3
+    const v3, 0x7f12079e
 
     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, 0x7f1207a0
+    const v3, 0x7f12077b
 
     invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -1491,7 +1491,7 @@
 
     if-eqz v3, :cond_12
 
-    const v3, 0x7f120791
+    const v3, 0x7f12076c
 
     const/4 v4, 0x1
 
@@ -1550,7 +1550,7 @@
     :cond_12
     if-eqz v8, :cond_13
 
-    const v3, 0x7f120790
+    const v3, 0x7f12076b
 
     invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -1620,7 +1620,7 @@
 
     if-eqz v9, :cond_16
 
-    const v4, 0x7f1207d6
+    const v4, 0x7f1207b1
 
     goto :goto_e
 
@@ -1631,7 +1631,7 @@
 
     if-eqz v4, :cond_17
 
-    const v4, 0x7f1207d8
+    const v4, 0x7f1207b3
 
     goto :goto_e
 
@@ -1644,12 +1644,12 @@
 
     if-eqz v4, :cond_18
 
-    const v4, 0x7f1207d9
+    const v4, 0x7f1207b4
 
     goto :goto_e
 
     :cond_18
-    const v4, 0x7f1207d7
+    const v4, 0x7f1207b2
 
     :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 f91bf4b1fc..2564f914bd 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, 0x7f0d0100
+    const v0, 0x7f0d00fe
 
     invoke-direct {p0, v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListItem;-><init>(ILcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
 
-    const p1, 0x7f0a03ef
+    const p1, 0x7f0a03ea
 
     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, 0x7f0a03f0
+    const p1, 0x7f0a03eb
 
     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, 0x7f0a085d
+    const p1, 0x7f0a0822
 
     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, 0x7f0a085c
+    const p1, 0x7f0a0821
 
     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, 0x7f121431
+    const v6, 0x7f1213a5
 
     new-array v7, v4, [Ljava/lang/Object;
 
@@ -327,7 +327,7 @@
 
     check-cast v3, Landroid/view/View;
 
-    const v6, 0x7f121436
+    const v6, 0x7f1213aa
 
     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 6462c1d32d..799829df9e 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 f1813389ff..4c153c14c7 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 0a886bde91..5f8c64d992 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;->vO:Lcom/discord/app/i;
+    sget-object v0, Lcom/discord/app/i;->vP: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 b8c2cb8eaf..8e7cf48dd3 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 39842db30d..64e1b45e46 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 9a893b4211..690a7426fe 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 c4bff042bd..4bad03d5f8 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite.smali
@@ -356,11 +356,11 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f0d0101
+    const v0, 0x7f0d00ff
 
     invoke-direct {p0, v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListItem;-><init>(ILcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
 
-    const p1, 0x7f0a03f5
+    const p1, 0x7f0a03f0
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -368,7 +368,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;->headerText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a03fd
+    const p1, 0x7f0a03f8
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -376,7 +376,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;->nameText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a03f6
+    const p1, 0x7f0a03f1
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -384,7 +384,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;->image$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a03f7
+    const p1, 0x7f0a03f2
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -392,7 +392,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;->imageText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a03ff
+    const p1, 0x7f0a03fa
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -400,7 +400,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;->onlineMemberText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0401
+    const p1, 0x7f0a03fc
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -408,7 +408,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;->totalMemberText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a03f8
+    const p1, 0x7f0a03f3
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -416,7 +416,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;->joinButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a03f9
+    const p1, 0x7f0a03f4
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -424,7 +424,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;->joinedButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a03fc
+    const p1, 0x7f0a03f7
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -432,7 +432,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;->mentionButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a03fa
+    const p1, 0x7f0a03f5
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -440,7 +440,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;->loadingButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a03fb
+    const p1, 0x7f0a03f6
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -448,7 +448,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;->memberContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a03fe
+    const p1, 0x7f0a03f9
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -456,7 +456,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;->onlineDot$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0400
+    const p1, 0x7f0a03fb
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -593,7 +593,7 @@
 
     if-eqz v2, :cond_2
 
-    const v4, 0x7f120a5a
+    const v4, 0x7f120a24
 
     invoke-virtual {v0, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -604,7 +604,7 @@
     goto :goto_2
 
     :cond_2
-    const v4, 0x7f120a55
+    const v4, 0x7f120a1f
 
     invoke-virtual {v0, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -619,7 +619,7 @@
 
     move-result-object v3
 
-    const v4, 0x7f120a49
+    const v4, 0x7f120a13
 
     invoke-virtual {v3, v4}, Landroid/widget/TextView;->setText(I)V
 
@@ -627,7 +627,7 @@
 
     move-result-object v3
 
-    const v4, 0x7f06011c
+    const v4, 0x7f06011b
 
     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, 0x7f080467
+    const v5, 0x7f080458
 
     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, 0x7f120a12
+    const v3, 0x7f1209dc
 
     const/4 v6, 0x1
 
@@ -714,7 +714,7 @@
     :goto_4
     if-nez v3, :cond_6
 
-    const v3, 0x7f120a11
+    const v3, 0x7f1209db
 
     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, 0x7f120a4a
+    const v3, 0x7f120a14
 
     invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -775,7 +775,7 @@
 
     if-eqz v2, :cond_8
 
-    const v3, 0x7f12049d
+    const v3, 0x7f120478
 
     invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -786,7 +786,7 @@
     goto :goto_6
 
     :cond_8
-    const v3, 0x7f120bce
+    const v3, 0x7f120b98
 
     invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -853,7 +853,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f120a2c
+    const v2, 0x7f1209f6
 
     invoke-virtual {v1, v2}, Lcom/discord/app/AppTextView;->setText(I)V
 
@@ -869,7 +869,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f0402a2
+    const v2, 0x7f0402a1
 
     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, 0x7f080116
+    const v1, 0x7f080112
 
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setBackgroundResource(I)V
 
@@ -1061,7 +1061,7 @@
 
     if-eqz v2, :cond_4
 
-    const v2, 0x7f120a59
+    const v2, 0x7f120a23
 
     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, 0x7f120a58
+    const v2, 0x7f120a22
 
     invoke-virtual {v7, v2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -1085,7 +1085,7 @@
 
     if-nez v2, :cond_6
 
-    const v2, 0x7f120a54
+    const v2, 0x7f120a1e
 
     invoke-virtual {v7, v2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -1102,7 +1102,7 @@
 
     if-eqz v2, :cond_8
 
-    const v2, 0x7f120a30
+    const v2, 0x7f1209fa
 
     new-array v3, v8, [Ljava/lang/Object;
 
@@ -1131,7 +1131,7 @@
     goto :goto_5
 
     :cond_8
-    const v2, 0x7f120a53
+    const v2, 0x7f120a1d
 
     invoke-virtual {v7, v2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -1193,7 +1193,7 @@
 
     move-result-object v2
 
-    const v11, 0x7f0402a2
+    const v11, 0x7f0402a1
 
     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, 0x7f120a1e
+    const v12, 0x7f1209e8
 
     new-array v13, v8, [Ljava/lang/Object;
 
@@ -1438,7 +1438,7 @@
 
     move-result-object v3
 
-    const v12, 0x7f100073
+    const v12, 0x7f100071
 
     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 e40a83f913..51f2b1e9cc 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 20c726abe7..641c255d4b 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 7e039c46d7..d7b999a0ef 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 943195b569..ae045de8c4 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, 0x7f0d0102
+    const v0, 0x7f0d0100
 
     invoke-direct {p0, v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListItem;-><init>(ILcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
 
-    const p1, 0x7f0a0405
+    const p1, 0x7f0a0400
 
     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, 0x7f0a0409
+    const p1, 0x7f0a0404
 
     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, 0x7f0a0403
+    const p1, 0x7f0a03fe
 
     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, 0x7f0a0402
+    const p1, 0x7f0a03fd
 
     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, 0x7f0a0408
+    const p1, 0x7f0a0403
 
     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, 0x7f0a0407
+    const p1, 0x7f0a0402
 
     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, 0x7f0a0404
+    const p1, 0x7f0a03ff
 
     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, 0x7f120a69
+    const v5, 0x7f120a33
 
     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, 0x7f12131e
+    const v7, 0x7f121291
 
     new-array v3, v3, [Ljava/lang/Object;
 
@@ -706,7 +706,7 @@
     return-object v0
 
     :cond_0
-    const p2, 0x7f12064f
+    const p2, 0x7f12062a
 
     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 ca35b1f7a9..e19e1ee355 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, 0x7f0d0104
+    const v0, 0x7f0d0102
 
     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, 0x7f0a077c
+    const v0, 0x7f0a0754
 
     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 c70db8854b..4358b328a6 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, 0x7f04037c
+    const v1, 0x7f04037b
 
     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;->bgy:Lkotlin/Unit;
+    sget-object p0, Lkotlin/Unit;->bgt: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;->bgy:Lkotlin/Unit;
+    sget-object p0, Lkotlin/Unit;->bgt: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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -697,7 +697,7 @@
 
     move-result-object v3
 
-    const v6, 0x7f121142
+    const v6, 0x7f1210b6
 
     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, 0x7f040383
+    const v4, 0x7f040382
 
     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, 0x7f06008d
+    const v16, 0x7f06008c
 
     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, 0x7f04037f
+    const v2, 0x7f04037e
 
     invoke-static {v15, v2}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
 
     move-result v18
 
-    const v2, 0x7f040380
+    const v2, 0x7f04037f
 
     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, 0x7f04037b
+    const v2, 0x7f04037a
 
     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 f64885d821..c4c9735101 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, 0x7f0d0105
+    const v0, 0x7f0d0103
 
     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 489e5e03a5..146c5d2f3a 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, 0x7f0d0110
+    const v0, 0x7f0d010e
 
     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, 0x7f06011c
+    const v1, 0x7f06011b
 
     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, 0x7f120c2a
+    const v1, 0x7f120bf3
 
     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 3f13e93bdf..5d2b167490 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, 0x7f0d0107
+    const v0, 0x7f0d0105
 
     invoke-direct {p0, v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListItem;-><init>(ILcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
 
@@ -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;->Ec:Ljava/lang/Long;
+    iget-object v6, v5, Lcom/discord/views/i;->Ee:Ljava/lang/Long;
 
     const/4 v7, 0x1
 
     if-eqz v6, :cond_4
 
-    iget-object v6, v5, Lcom/discord/views/i;->Ec:Ljava/lang/Long;
+    iget-object v6, v5, Lcom/discord/views/i;->Ee: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;->Eb:I
+    iget v9, v5, Lcom/discord/views/i;->Ed:I
 
     if-eq v8, v9, :cond_7
 
     if-eqz v6, :cond_5
 
-    iget-object v6, v5, Lcom/discord/views/i;->DY:Landroid/widget/TextSwitcher;
+    iget-object v6, v5, Lcom/discord/views/i;->Ea: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;->DY:Landroid/widget/TextSwitcher;
+    iget-object v6, v5, Lcom/discord/views/i;->Ea:Landroid/widget/TextSwitcher;
 
     invoke-virtual {v6}, Landroid/widget/TextSwitcher;->getContext()Landroid/content/Context;
 
     move-result-object v6
 
-    iget v9, v5, Lcom/discord/views/i;->Eb:I
+    iget v9, v5, Lcom/discord/views/i;->Ed:I
 
     if-le v8, v9, :cond_6
 
-    iget-object v9, v5, Lcom/discord/views/i;->DY:Landroid/widget/TextSwitcher;
+    iget-object v9, v5, Lcom/discord/views/i;->Ea: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;->DY:Landroid/widget/TextSwitcher;
+    iget-object v9, v5, Lcom/discord/views/i;->Ea:Landroid/widget/TextSwitcher;
 
     const v10, 0x7f01002c
 
@@ -249,20 +249,20 @@
     goto :goto_5
 
     :cond_6
-    iget-object v9, v5, Lcom/discord/views/i;->DY:Landroid/widget/TextSwitcher;
+    iget-object v9, v5, Lcom/discord/views/i;->Ea: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;->DY:Landroid/widget/TextSwitcher;
+    iget-object v9, v5, Lcom/discord/views/i;->Ea: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;->DY:Landroid/widget/TextSwitcher;
+    iget-object v6, v5, Lcom/discord/views/i;->Ea: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;->Eb:I
+    iput v8, v5, Lcom/discord/views/i;->Ed: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;->Ec:Ljava/lang/Long;
+    iput-object v4, v5, Lcom/discord/views/i;->Ee: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 99a025b1c8..f90e1c0acc 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, 0x7f0d0108
+    const v0, 0x7f0d0106
 
     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, 0x7f0a057a
+    const v0, 0x7f0a0561
 
     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 edbecd5e3b..c86fcf5ded 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, 0x7f0d010d
+    const v0, 0x7f0d010b
 
     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, 0x7f1202b0
+    const p1, 0x7f1202ae
 
     return p1
 
     :cond_0
-    const p1, 0x7f1202b1
+    const p1, 0x7f1202af
 
     return p1
 
     :cond_1
-    const p1, 0x7f1202b5
+    const p1, 0x7f1202b3
 
     return p1
 
     :cond_2
-    const p1, 0x7f1202b4
+    const p1, 0x7f1202b2
 
     return p1
 .end method
@@ -195,7 +195,7 @@
 
     move-result-object p1
 
-    const v3, 0x7f1212b9
+    const v3, 0x7f12122c
 
     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 99d75e5971..d21108fbc0 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, 0x7f121207
+    const v2, 0x7f12117a
 
     const/4 v3, 0x2
 
@@ -109,7 +109,7 @@
     goto/16 :goto_1
 
     :pswitch_1
-    const v0, 0x7f1211da
+    const v0, 0x7f12114d
 
     new-array v1, v3, [Ljava/lang/Object;
 
@@ -142,7 +142,7 @@
 
     aput-object v1, v0, v4
 
-    const v1, 0x7f120ed3
+    const v1, 0x7f120e5a
 
     invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -167,7 +167,7 @@
 
     aput-object v1, v0, v4
 
-    const v1, 0x7f120ed2
+    const v1, 0x7f120e59
 
     invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -192,7 +192,7 @@
 
     aput-object v1, v0, v4
 
-    const v1, 0x7f120ed1
+    const v1, 0x7f120e58
 
     invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -207,7 +207,7 @@
     goto/16 :goto_1
 
     :pswitch_5
-    const v0, 0x7f121206
+    const v0, 0x7f121179
 
     new-array v1, v4, [Ljava/lang/Object;
 
@@ -247,7 +247,7 @@
     goto/16 :goto_1
 
     :pswitch_7
-    const v0, 0x7f12120a
+    const v0, 0x7f12117d
 
     new-array v1, v4, [Ljava/lang/Object;
 
@@ -262,7 +262,7 @@
     goto/16 :goto_1
 
     :pswitch_8
-    const v0, 0x7f1211dc
+    const v0, 0x7f12114f
 
     new-array v1, v4, [Ljava/lang/Object;
 
@@ -277,7 +277,7 @@
     goto :goto_1
 
     :pswitch_9
-    const v0, 0x7f1211dd
+    const v0, 0x7f121150
 
     new-array v1, v3, [Ljava/lang/Object;
 
@@ -329,7 +329,7 @@
 
     if-nez v0, :cond_1
 
-    const v0, 0x7f12120f
+    const v0, 0x7f121182
 
     new-array v1, v4, [Ljava/lang/Object;
 
@@ -345,7 +345,7 @@
 
     :cond_1
     :goto_0
-    const v0, 0x7f12120e
+    const v0, 0x7f121181
 
     new-array v1, v3, [Ljava/lang/Object;
 
@@ -364,7 +364,7 @@
     goto :goto_1
 
     :pswitch_b
-    const v0, 0x7f12120d
+    const v0, 0x7f121180
 
     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 5bc7f14a9b..f58d7f85f9 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, 0x7f0d010e
+    const v0, 0x7f0d010c
 
     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, 0x7f0802a7
+    const v0, 0x7f08029b
 
-    const v1, 0x7f0802a8
+    const v1, 0x7f08029c
 
-    const v2, 0x7f0803c0
+    const v2, 0x7f0803b2
 
     packed-switch p1, :pswitch_data_0
 
@@ -194,7 +194,7 @@
     return v1
 
     :pswitch_4
-    const p1, 0x7f080224
+    const p1, 0x7f080219
 
     return p1
 
@@ -202,7 +202,7 @@
     return v0
 
     :pswitch_6
-    const p1, 0x7f0802a9
+    const p1, 0x7f08029d
 
     return p1
 
@@ -465,7 +465,7 @@
 
     move-result-object p2
 
-    const v1, 0x7f04037c
+    const v1, 0x7f04037b
 
     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;->Bx:Lcom/discord/simpleast/core/a/a;
+    sget-object v2, Lcom/discord/simpleast/core/a/a;->BA:Lcom/discord/simpleast/core/a/a;
 
-    invoke-static {}, Lcom/discord/simpleast/core/a/a;->eO()Ljava/util/regex/Pattern;
+    invoke-static {}, Lcom/discord/simpleast/core/a/a;->eN()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;->Bx:Lcom/discord/simpleast/core/a/a;
+    sget-object v1, Lcom/discord/simpleast/core/a/a;->BA:Lcom/discord/simpleast/core/a/a;
 
-    invoke-virtual {v1}, Lcom/discord/simpleast/core/a/a;->eR()Lcom/discord/simpleast/core/parser/Rule;
+    invoke-virtual {v1}, Lcom/discord/simpleast/core/a/a;->eQ()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 01a63253ee..50b12fc2c7 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, 0x7f0d0110
+    const v0, 0x7f0d010e
 
     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, 0x7f04036c
+    const v1, 0x7f04036b
 
     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 99e34e7e46..00349fc95e 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object p3
 
@@ -365,7 +365,7 @@
     return p1
 
     :cond_0
-    sget-object v0, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
 
     new-instance p1, Ljava/lang/Exception;
 
@@ -462,7 +462,7 @@
 
     move-result-object p2
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 6168699f44..632153636e 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 53fa2e34ea..6bd8557d65 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 a5ae1d7f81..b0d81ed788 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 a822050f4a..c23ee39141 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, 0x7f0d0111
+    const v0, 0x7f0d010f
 
     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, 0x7f0a07a2
+    const v0, 0x7f0a077a
 
     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, 0x7f0a07a3
+    const v0, 0x7f0a077b
 
     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, 0x7f0a07a4
+    const v0, 0x7f0a077c
 
     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, 0x7f0a055b
+    const v0, 0x7f0a054c
 
     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, 0x7f0a055a
+    const v0, 0x7f0a054b
 
     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;->bhO:Lkotlin/jvm/internal/ab;
+    sget-object v4, Lkotlin/jvm/internal/ab;->bhJ:Lkotlin/jvm/internal/ab;
 
     const/4 v4, 0x2
 
@@ -613,7 +613,7 @@
 
     check-cast p2, Landroid/view/View;
 
-    const v0, 0x7f1212ea
+    const v0, 0x7f12125d
 
     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, 0x7f1000bd
+    const v8, 0x7f1000b2
 
     const/4 v9, -0x1
 
@@ -885,7 +885,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ak;->Jz()Lrx/internal/a/ak;
+    invoke-static {}, Lrx/internal/a/ak;->Jx()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 5251b2a34f..065efaa629 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, 0x7f040368
+    const p2, 0x7f040367
 
     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 b7688364fc..de48401089 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 26a2ee0d45..865e8af4d7 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -71,12 +71,12 @@
 
     if-eqz p1, :cond_0
 
-    const p1, 0x7f120be5
+    const p1, 0x7f120baf
 
     goto :goto_0
 
     :cond_0
-    const p1, 0x7f120bdc
+    const p1, 0x7f120ba6
 
     :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 2bc337d883..3f60bbe82b 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 81e5c85832..dde2c6ccfe 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, 0x7f120513
+    const v3, 0x7f1204ee
 
     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, 0x7f120514
+    const v3, 0x7f1204ef
 
     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, 0x7f120507
+    const v3, 0x7f1204e2
 
     invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
     move-result-object v8
 
-    const v3, 0x7f1203a0
+    const v3, 0x7f12037b
 
     invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
     move-result-object v9
 
-    const v0, 0x7f0a04ab
+    const v0, 0x7f0a049e
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -120,7 +120,7 @@
 
     move-result-object v10
 
-    const v0, 0x7f040286
+    const v0, 0x7f040285
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -198,12 +198,12 @@
 
     if-eqz v2, :cond_0
 
-    const v0, 0x7f1212c1
+    const v0, 0x7f121234
 
     goto :goto_0
 
     :cond_0
-    const v0, 0x7f120de2
+    const v0, 0x7f120da8
 
     :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, 0x7f1212bd
+    const v0, 0x7f121230
 
     goto :goto_1
 
     :cond_1
-    const v0, 0x7f120de0
+    const v0, 0x7f120da6
 
     :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, 0x7f1212ba
+    const v0, 0x7f12122d
 
     goto :goto_2
 
     :cond_2
-    const v0, 0x7f120ddc
+    const v0, 0x7f120da2
 
     :goto_2
     invoke-virtual {v4, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
     move-result-object v10
 
-    const v0, 0x7f1203a0
+    const v0, 0x7f12037b
 
     invoke-virtual {v4, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
     move-result-object v11
 
-    const v0, 0x7f0a04ab
+    const v0, 0x7f0a049e
 
     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 8d6cd71a25..988b1fb268 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, 0x7f0a02b7
+    const p1, 0x7f0a02b6
 
     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 4b6dafb9d2..8946eb7b53 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 e50cb618fd..70494957ef 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 1cd5cf152e..b13ab3408a 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, 0x7f0d007f
+    const v0, 0x7f0d007e
 
     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 1d90e19224..25d65381f4 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$11.smali b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$11.smali
index 8ff2273fa4..2977c83ff2 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$11.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$11.smali
@@ -20,12 +20,16 @@
 # instance fields
 .field final synthetic $data:Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;
 
+.field final synthetic this$0:Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;
+
 
 # direct methods
-.method constructor <init>(Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;)V
+.method constructor <init>(Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$11;->$data:Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$11;->this$0:Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;
+
+    iput-object p2, p0, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$11;->$data:Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -35,35 +39,49 @@
 
 # virtual methods
 .method public final onClick(Landroid/view/View;)V
-    .locals 2
+    .locals 9
 
-    const-string v0, "v"
+    sget-object v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->Companion:Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;
 
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    iget-object p1, p0, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$11;->$data:Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;
 
-    invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
+    invoke-virtual {p1}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;->getMessage()Lcom/discord/models/domain/ModelMessage;
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$11;->$data:Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessage;->getAuthor()Lcom/discord/models/domain/ModelUser;
 
-    invoke-virtual {v0}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;->getMessage()Lcom/discord/models/domain/ModelMessage;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelMessage;->getAuthor()Lcom/discord/models/domain/ModelUser;
-
-    move-result-object v0
+    move-result-object p1
 
     const-string v1, "data.message.author"
 
-    invoke-static {v0, v1}, 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
 
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->getId()J
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getId()J
 
-    move-result-wide v0
+    move-result-wide v1
 
-    invoke-static {p1, v0, v1}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->launch(Landroid/content/Context;J)V
+    iget-object p1, p0, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$11;->this$0:Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;
+
+    invoke-virtual {p1}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;->requireFragmentManager()Landroidx/fragment/app/FragmentManager;
+
+    move-result-object v4
+
+    const-string p1, "requireFragmentManager()"
+
+    invoke-static {v4, p1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v3, 0x0
+
+    const/4 v5, 0x0
+
+    const/4 v6, 0x0
+
+    const/16 v7, 0x1a
+
+    const/4 v8, 0x0
+
+    invoke-static/range {v0 .. v8}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;->show$default(Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;JLjava/lang/Long;Landroidx/fragment/app/FragmentManager;Ljava/lang/Long;Ljava/lang/Boolean;ILjava/lang/Object;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$12.smali b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$12.smali
index 196148317b..45b3ebbd00 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$12.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$12.smali
@@ -20,12 +20,16 @@
 # instance fields
 .field final synthetic $data:Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;
 
+.field final synthetic this$0:Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;
+
 
 # direct methods
-.method constructor <init>(Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;)V
+.method constructor <init>(Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$12;->$data:Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$12;->this$0:Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;
+
+    iput-object p2, p0, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$12;->$data:Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -35,35 +39,49 @@
 
 # virtual methods
 .method public final onClick(Landroid/view/View;)V
-    .locals 2
+    .locals 9
 
-    const-string v0, "v"
+    sget-object v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->Companion:Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;
 
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    iget-object p1, p0, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$12;->$data:Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;
 
-    invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
+    invoke-virtual {p1}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;->getMessage()Lcom/discord/models/domain/ModelMessage;
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$12;->$data:Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessage;->getAuthor()Lcom/discord/models/domain/ModelUser;
 
-    invoke-virtual {v0}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;->getMessage()Lcom/discord/models/domain/ModelMessage;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelMessage;->getAuthor()Lcom/discord/models/domain/ModelUser;
-
-    move-result-object v0
+    move-result-object p1
 
     const-string v1, "data.message.author"
 
-    invoke-static {v0, v1}, 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
 
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->getId()J
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getId()J
 
-    move-result-wide v0
+    move-result-wide v1
 
-    invoke-static {p1, v0, v1}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->launch(Landroid/content/Context;J)V
+    iget-object p1, p0, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$12;->this$0:Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;
+
+    invoke-virtual {p1}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;->requireFragmentManager()Landroidx/fragment/app/FragmentManager;
+
+    move-result-object v4
+
+    const-string p1, "requireFragmentManager()"
+
+    invoke-static {v4, p1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v3, 0x0
+
+    const/4 v5, 0x0
+
+    const/4 v6, 0x0
+
+    const/16 v7, 0x1a
+
+    const/4 v8, 0x0
+
+    invoke-static/range {v0 .. v8}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;->show$default(Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;JLjava/lang/Long;Landroidx/fragment/app/FragmentManager;Ljava/lang/Long;Ljava/lang/Boolean;ILjava/lang/Object;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$8.smali b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$8.smali
index 89f5d19e5c..aa2e179582 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, 0x7f12111b
+    const v2, 0x7f12108f
 
     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 50e998dcd7..234eb140a4 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 25f06c3f40..5171aa7564 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 293da75395..47f8da496f 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 60f40d9c7a..06a18ef9d6 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 0afc8cc68c..6aba0f8610 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 fa8e3d00eb..de644bb798 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 089b5cf5f2..4f9d3e2f97 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, 0x7f0a0262
+    const v0, 0x7f0a0261
 
     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, 0x7f0a0263
+    const v0, 0x7f0a0262
 
     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, 0x7f0a0269
+    const v0, 0x7f0a0268
 
     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, 0x7f0a026c
+    const v0, 0x7f0a026b
 
     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, 0x7f0a0268
+    const v0, 0x7f0a0267
 
     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, 0x7f0a026d
+    const v0, 0x7f0a026c
 
     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, 0x7f0a0265
+    const v0, 0x7f0a0264
 
     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, 0x7f0a0266
+    const v0, 0x7f0a0265
 
     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, 0x7f0a026e
+    const v0, 0x7f0a026d
 
     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, 0x7f0a0267
+    const v0, 0x7f0a0266
 
     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, 0x7f0a026a
+    const v0, 0x7f0a0269
 
     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, 0x7f0a0270
+    const v0, 0x7f0a026f
 
     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, 0x7f0a026f
+    const v0, 0x7f0a026e
 
     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, 0x7f0a0264
+    const v0, 0x7f0a0263
 
     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, 0x7f0a026b
+    const v0, 0x7f0a026a
 
     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, 0x7f0a0261
+    const v0, 0x7f0a0260
 
     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, 0x7f1212ba
+    const v1, 0x7f12122d
 
     goto :goto_4
 
     :cond_6
-    const v1, 0x7f120ddc
+    const v1, 0x7f120da2
 
     :goto_4
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
@@ -1215,7 +1215,7 @@
 
     new-instance v1, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$11;
 
-    invoke-direct {v1, p1}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$11;-><init>(Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;)V
+    invoke-direct {v1, p0, p1}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$11;-><init>(Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;)V
 
     check-cast v1, Landroid/view/View$OnClickListener;
 
@@ -1227,7 +1227,7 @@
 
     new-instance v1, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$12;
 
-    invoke-direct {v1, p1}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$12;-><init>(Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;)V
+    invoke-direct {v1, p0, p1}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$12;-><init>(Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;)V
 
     check-cast v1, Landroid/view/View$OnClickListener;
 
@@ -1315,7 +1315,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/discord/app/i;->vO:Lcom/discord/app/i;
+    sget-object v1, Lcom/discord/app/i;->vP: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, 0x7f120fb6
+    const v3, 0x7f120f2a
 
     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, 0x7f120fb5
+    const v4, 0x7f120f29
 
     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, 0x7f121447
+    const v5, 0x7f1213ba
 
     invoke-virtual {v0, v5}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;->getString(I)Ljava/lang/String;
 
     move-result-object v5
 
-    const v6, 0x7f120c6f
+    const v6, 0x7f120c38
 
     invoke-virtual {v0, v6}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;->getString(I)Ljava/lang/String;
 
     move-result-object v6
 
-    const v7, 0x7f0a04ab
+    const v7, 0x7f0a049e
 
     invoke-static {v7}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -1837,7 +1837,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d00f5
+    const v0, 0x7f0d00f3
 
     return v0
 .end method
@@ -1911,7 +1911,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 a6fd1fd38f..47a3cb6025 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;->vm:Lcom/discord/app/AppLog;
+    sget-object p0, Lcom/discord/app/AppLog;->vn: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;->wU:Lkotlin/text/Regex;
+    sget-object v2, Lcom/discord/app/a/a;->wW: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;->wT:Lkotlin/text/Regex;
+    sget-object v2, Lcom/discord/app/a/a;->wV: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 eb74144793..93f08eb1a3 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v4
 
@@ -547,7 +547,7 @@
 
     move-result-object p0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 81634c5fe1..03dcc794f0 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v4
 
@@ -192,7 +192,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 291c34e97c..010b51a17d 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, 0x7f0d0150
+    const v0, 0x7f0d014e
 
     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, 0x7f0a0436
+    const v0, 0x7f0a0431
 
     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, 0x7f0a0435
+    const v0, 0x7f0a0430
 
     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, 0x7f0a0437
+    const v0, 0x7f0a0432
 
     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 2b4c49a439..d2809a9e52 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 dd846bf17c..400225a336 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 2c2c36fe34..b8d647b758 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, 0x7f0d0151
+    const v0, 0x7f0d014f
 
     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, 0x7f0a0439
+    const v0, 0x7f0a0434
 
     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 647247f255..aaaa716db8 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, 0x7f0d0152
+    const v0, 0x7f0d0150
 
     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 e3ee20b50b..080867231b 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, 0x7f0d0153
+    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$ReactionUserViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a043d
+    const v0, 0x7f0a0438
 
     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, 0x7f0a043c
+    const v0, 0x7f0a0437
 
     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, 0x7f0a043b
+    const v0, 0x7f0a0436
 
     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 8fa857b494..abf4285dbb 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 33f06e8e2a..f45aaa1e5f 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 8ede781b0a..2e336a7453 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, 0x7f0a0438
+    const v0, 0x7f0a0433
 
     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, 0x7f0a043e
+    const v0, 0x7f0a0439
 
     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, 0x7f0d014f
+    const v0, 0x7f0d014d
 
     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, 0x7f120f98
+    const p1, 0x7f120f0c
 
     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 ef184451dd..df89181784 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, 0x7f120c67
+    const v1, 0x7f120c30
 
     goto :goto_1
 
     :cond_3
-    const v1, 0x7f120c66
+    const v1, 0x7f120c2f
 
     :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 dd62f6536c..d280852e00 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, 0x7f0d00d3
+    const v0, 0x7f0d00d1
 
     return v0
 .end method
@@ -176,7 +176,7 @@
 
     invoke-virtual {p0}, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages;->setActionBarDisplayHomeAsUpEnabled()Landroidx/appcompat/widget/Toolbar;
 
-    const p1, 0x7f120de6
+    const p1, 0x7f120dac
 
     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 2d4d4584ec..2608dd88c9 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v0
 
@@ -171,7 +171,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 9a58d50355..5b89150297 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 3d31456789..970c5e4f0f 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, 0x7f1203e9
+    const p1, 0x7f1203c4
 
     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, 0x7f121115
+    const p2, 0x7f121089
 
     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;->bhO:Lkotlin/jvm/internal/ab;
+    sget-object v0, Lkotlin/jvm/internal/ab;->bhJ:Lkotlin/jvm/internal/ab;
 
-    const v0, 0x7f121231
+    const v0, 0x7f1211a4
 
     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;->bhO:Lkotlin/jvm/internal/ab;
+    sget-object v0, Lkotlin/jvm/internal/ab;->bhJ:Lkotlin/jvm/internal/ab;
 
-    const v0, 0x7f12129b
+    const v0, 0x7f12120e
 
     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;->bhO:Lkotlin/jvm/internal/ab;
+    sget-object v0, Lkotlin/jvm/internal/ab;->bhJ:Lkotlin/jvm/internal/ab;
 
-    const v0, 0x7f120d14
+    const v0, 0x7f120cdd
 
     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, 0x7f0d0113
+    const v0, 0x7f0d0111
 
     return v0
 .end method
@@ -652,7 +652,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 437fa52418..620c4f7ce6 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, 0x7f0d0115
+    const v0, 0x7f0d0113
 
     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 0ca79017d6..5211950509 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, 0x7f0a0255
+    const p1, 0x7f0a0254
 
     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, 0x7f0402a2
+    const p2, 0x7f0402a1
 
     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, 0x7f06011c
+    const p2, 0x7f06011b
 
     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, 0x7f060127
+    const p2, 0x7f060126
 
     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, 0x7f060106
+    const p2, 0x7f060105
 
     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, 0x7f0402a8
+    const p2, 0x7f0402a7
 
     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 e476002d8d..ff05103f38 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, 0x7f0d011a
+    const p2, 0x7f0d0118
 
     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 d8dd5d84a7..468f1716fa 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 0x7f0a045f
+    .packed-switch 0x7f0a045a
         :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 44dafb647b..aa240e443a 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, 0x7f0a045f
+    const v0, 0x7f0a045a
 
     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 f446826dc9..163887a051 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 1e34d5ec0b..a21254b115 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, 0x7f0a0256
+    const v0, 0x7f0a0255
 
     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, 0x7f0d0119
+    const v0, 0x7f0d0117
 
     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, 0x7f120501
+    const p1, 0x7f1204dc
 
     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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 a86e66e705..1bca93af13 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;->vm:Lcom/discord/app/AppLog;
+    sget-object v1, Lcom/discord/app/AppLog;->vn: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 d617249998..d2d5cd978b 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, 0x7f0a02e0
+    const v0, 0x7f0a02df
 
     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, 0x7f0a02df
+    const v0, 0x7f0a02de
 
     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, 0x7f0a02e1
+    const v0, 0x7f0a02e0
 
     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, 0x7f0a02db
+    const v0, 0x7f0a02da
 
     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, 0x7f0a02de
+    const v0, 0x7f0a02dd
 
     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, 0x7f0a02dd
+    const v0, 0x7f0a02dc
 
     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, 0x7f0d011f
+    const v0, 0x7f0d011d
 
     return v0
 .end method
@@ -409,7 +409,7 @@
 
     aput-object v3, v1, v2
 
-    const v3, 0x7f120495
+    const v3, 0x7f120470
 
     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, 0x7f121170
+    const v5, 0x7f1210e4
 
     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, 0x7f120494
+    const v5, 0x7f12046f
 
     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, 0x7f120496
+    const v3, 0x7f120471
 
     new-array v5, v0, [Ljava/lang/Object;
 
@@ -498,11 +498,11 @@
 
     move-result-object p1
 
-    const v1, 0x7f12048e
+    const v1, 0x7f120469
 
     new-array v3, v0, [Ljava/lang/Object;
 
-    const-string v4, "9.7.4"
+    const-string v4, "9.7.5"
 
     aput-object v4, v3, v2
 
@@ -518,7 +518,7 @@
 
     move-result-object p1
 
-    const v1, 0x7f120492
+    const v1, 0x7f12046d
 
     new-array v3, v0, [Ljava/lang/Object;
 
@@ -542,7 +542,7 @@
 
     move-result-object p1
 
-    const v1, 0x7f120491
+    const v1, 0x7f12046c
 
     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 1f1d919382..8d91b4589b 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;->aJu:[B
+    iget-object p1, p1, Lcom/google/android/gms/nearby/messages/Message;->aJq:[B
 
     const-string v0, "message.content"
 
@@ -270,7 +270,7 @@
 
     new-instance v0, Ljava/lang/String;
 
-    sget-object v1, Lkotlin/text/d;->tw:Ljava/nio/charset/Charset;
+    sget-object v1, Lkotlin/text/d;->tx: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;->aJM:Lcom/google/android/gms/nearby/messages/c;
+    iput-object v1, v0, Lcom/google/android/gms/nearby/messages/PublishOptions$a;->aJI:Lcom/google/android/gms/nearby/messages/c;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/nearby/messages/PublishOptions$a;->za()Lcom/google/android/gms/nearby/messages/PublishOptions;
+    invoke-virtual {v0}, Lcom/google/android/gms/nearby/messages/PublishOptions$a;->yY()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;->tw:Ljava/nio/charset/Charset;
+    sget-object p2, Lkotlin/text/d;->tx: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;->aJO:Lcom/google/android/gms/nearby/messages/Strategy;
+    sget-object v1, Lcom/google/android/gms/nearby/messages/Strategy;->aJK: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;
+    iput-object v1, v0, Lcom/google/android/gms/nearby/messages/SubscribeOptions$a;->aJH:Lcom/google/android/gms/nearby/messages/Strategy;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/nearby/messages/SubscribeOptions$a;->zc()Lcom/google/android/gms/nearby/messages/SubscribeOptions;
+    invoke-virtual {v0}, Lcom/google/android/gms/nearby/messages/SubscribeOptions$a;->za()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 f1a0112d3c..252f0a8398 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -128,7 +128,7 @@
     return-void
 
     :catch_0
-    sget-object v2, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
+    sget-object v2, Lcom/discord/app/AppLog;->vn: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 d13ddc11fa..0bab67cab5 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, 0x7f0a02f8
+    const v0, 0x7f0a02f7
 
     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, 0x7f0a02f9
+    const v0, 0x7f0a02f8
 
     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, 0x7f0a02f7
+    const v0, 0x7f0a02f6
 
     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, 0x7f0d0120
+    const v0, 0x7f0d011e
 
     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, 0x7f1206f6
+    const v1, 0x7f1206d1
 
     invoke-virtual {p0, v1}, Lcom/discord/widgets/friends/WidgetFriendsAdd;->setActionBarTitle(I)Lkotlin/Unit;
 
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddUserAdapter$UserViewHolder$onConfigure$3.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddUserAdapter$UserViewHolder$onConfigure$3.smali
index 68012bca36..936d7a7a14 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddUserAdapter$UserViewHolder$onConfigure$3.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddUserAdapter$UserViewHolder$onConfigure$3.smali
@@ -47,13 +47,17 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/discord/widgets/friends/WidgetFriendsAddUserAdapter;->getContext()Landroid/content/Context;
+    invoke-static {p1}, Lcom/discord/widgets/friends/WidgetFriendsAddUserAdapter;->access$getOnItemClick$p(Lcom/discord/widgets/friends/WidgetFriendsAddUserAdapter;)Lkotlin/jvm/functions/Function1;
 
     move-result-object p1
 
     iget-wide v0, p0, Lcom/discord/widgets/friends/WidgetFriendsAddUserAdapter$UserViewHolder$onConfigure$3;->$userId:J
 
-    invoke-static {p1, v0, v1}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->launch(Landroid/content/Context;J)V
+    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v0
+
+    invoke-interface {p1, v0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddUserAdapter$UserViewHolder.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddUserAdapter$UserViewHolder.smali
index 67898a0b74..1b1c7a4357 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, 0x7f0d00bd
+    const v0, 0x7f0d00bb
 
     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, 0x7f120a84
+    const p2, 0x7f120a4e
 
     invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -484,7 +484,7 @@
 
     move-result-object p1
 
-    const p2, 0x7f120bc3
+    const p2, 0x7f120b8d
 
     invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderView$onAvatarClick$1.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddUserAdapter$onItemClick$1.smali
similarity index 55%
rename from com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderView$onAvatarClick$1.smali
rename to com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddUserAdapter$onItemClick$1.smali
index 273073207f..f3cfc7c111 100644
--- a/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderView$onAvatarClick$1.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddUserAdapter$onItemClick$1.smali
@@ -1,6 +1,6 @@
-.class final Lcom/discord/widgets/user/profile/UserProfileHeaderView$onAvatarClick$1;
+.class final Lcom/discord/widgets/friends/WidgetFriendsAddUserAdapter$onItemClick$1;
 .super Lkotlin/jvm/internal/m;
-.source "UserProfileHeaderView.kt"
+.source "WidgetFriendsAddUserAdapter.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/user/profile/UserProfileHeaderView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
+    value = Lcom/discord/widgets/friends/WidgetFriendsAddUserAdapter;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -28,18 +28,18 @@
 
 
 # static fields
-.field public static final INSTANCE:Lcom/discord/widgets/user/profile/UserProfileHeaderView$onAvatarClick$1;
+.field public static final INSTANCE:Lcom/discord/widgets/friends/WidgetFriendsAddUserAdapter$onItemClick$1;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    new-instance v0, Lcom/discord/widgets/user/profile/UserProfileHeaderView$onAvatarClick$1;
+    new-instance v0, Lcom/discord/widgets/friends/WidgetFriendsAddUserAdapter$onItemClick$1;
 
-    invoke-direct {v0}, Lcom/discord/widgets/user/profile/UserProfileHeaderView$onAvatarClick$1;-><init>()V
+    invoke-direct {v0}, Lcom/discord/widgets/friends/WidgetFriendsAddUserAdapter$onItemClick$1;-><init>()V
 
-    sput-object v0, Lcom/discord/widgets/user/profile/UserProfileHeaderView$onAvatarClick$1;->INSTANCE:Lcom/discord/widgets/user/profile/UserProfileHeaderView$onAvatarClick$1;
+    sput-object v0, Lcom/discord/widgets/friends/WidgetFriendsAddUserAdapter$onItemClick$1;->INSTANCE:Lcom/discord/widgets/friends/WidgetFriendsAddUserAdapter$onItemClick$1;
 
     return-void
 .end method
@@ -65,9 +65,9 @@
 
     move-result-wide v0
 
-    invoke-virtual {p0, v0, v1}, Lcom/discord/widgets/user/profile/UserProfileHeaderView$onAvatarClick$1;->invoke(J)V
+    invoke-virtual {p0, v0, v1}, Lcom/discord/widgets/friends/WidgetFriendsAddUserAdapter$onItemClick$1;->invoke(J)V
 
-    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddUserAdapter.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddUserAdapter.smali
index a97c2e6e3a..2f96787b38 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddUserAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddUserAdapter.smali
@@ -52,6 +52,18 @@
 
 .field private meUserId:Ljava/lang/Long;
 
+.field private onItemClick:Lkotlin/jvm/functions/Function1;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lkotlin/jvm/functions/Function1<",
+            "-",
+            "Ljava/lang/Long;",
+            "Lkotlin/Unit;",
+            ">;"
+        }
+    .end annotation
+.end field
+
 .field private final outgoingRequestUserIds:Ljava/util/HashSet;
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -113,6 +125,12 @@
 
     iput-object p1, p0, Lcom/discord/widgets/friends/WidgetFriendsAddUserAdapter;->incomingRequestUserIds:Ljava/util/HashSet;
 
+    sget-object p1, Lcom/discord/widgets/friends/WidgetFriendsAddUserAdapter$onItemClick$1;->INSTANCE:Lcom/discord/widgets/friends/WidgetFriendsAddUserAdapter$onItemClick$1;
+
+    check-cast p1, Lkotlin/jvm/functions/Function1;
+
+    iput-object p1, p0, Lcom/discord/widgets/friends/WidgetFriendsAddUserAdapter;->onItemClick:Lkotlin/jvm/functions/Function1;
+
     return-void
 .end method
 
@@ -132,6 +150,14 @@
     return-object p0
 .end method
 
+.method public static final synthetic access$getOnItemClick$p(Lcom/discord/widgets/friends/WidgetFriendsAddUserAdapter;)Lkotlin/jvm/functions/Function1;
+    .locals 0
+
+    iget-object p0, p0, Lcom/discord/widgets/friends/WidgetFriendsAddUserAdapter;->onItemClick:Lkotlin/jvm/functions/Function1;
+
+    return-object p0
+.end method
+
 .method public static final synthetic access$getOutgoingRequestUserIds$p(Lcom/discord/widgets/friends/WidgetFriendsAddUserAdapter;)Ljava/util/HashSet;
     .locals 0
 
@@ -156,6 +182,14 @@
     return-void
 .end method
 
+.method public static final synthetic access$setOnItemClick$p(Lcom/discord/widgets/friends/WidgetFriendsAddUserAdapter;Lkotlin/jvm/functions/Function1;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/friends/WidgetFriendsAddUserAdapter;->onItemClick:Lkotlin/jvm/functions/Function1;
+
+    return-void
+.end method
+
 .method public static final synthetic access$setSendHandler$p(Lcom/discord/widgets/friends/WidgetFriendsAddUserAdapter;Lkotlin/jvm/functions/Function2;)V
     .locals 0
 
@@ -286,6 +320,28 @@
     return-void
 .end method
 
+.method public final setOnItemClick(Lkotlin/jvm/functions/Function1;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lkotlin/jvm/functions/Function1<",
+            "-",
+            "Ljava/lang/Long;",
+            "Lkotlin/Unit;",
+            ">;)V"
+        }
+    .end annotation
+
+    const-string v0, "onItemClick"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iput-object p1, p0, Lcom/discord/widgets/friends/WidgetFriendsAddUserAdapter;->onItemClick:Lkotlin/jvm/functions/Function1;
+
+    return-void
+.end method
+
 .method public final setSendHandler(Lkotlin/jvm/functions/Function2;)V
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
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 a8c227b466..c94c1ec5d3 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 3ba55041f7..ac93d3154f 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 9b144883ef..0265786912 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -96,7 +96,7 @@
 
     move-result-object p2
 
-    sget-object v0, Lcom/discord/app/i;->vO:Lcom/discord/app/i;
+    sget-object v0, Lcom/discord/app/i;->vP: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 51f34e8a26..785118f672 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 654107f128..e63e2ce472 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -89,7 +89,7 @@
 
     move-result-object p1
 
-    sget-object p2, Lcom/discord/app/i;->vO:Lcom/discord/app/i;
+    sget-object p2, Lcom/discord/app/i;->vP: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$4.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$4.smali
index f7fe8d496f..0fb7ccdc4c 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$4.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$4.smali
@@ -1,9 +1,9 @@
 .class final Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$4;
-.super Ljava/lang/Object;
+.super Lkotlin/jvm/internal/m;
 .source "WidgetFriendsFindNearby.kt"
 
 # interfaces
-.implements Landroid/view/View$OnClickListener;
+.implements Lkotlin/jvm/functions/Function1;
 
 
 # annotations
@@ -16,6 +16,16 @@
     name = null
 .end annotation
 
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/m;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Ljava/lang/Long;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
 
 # instance fields
 .field final synthetic this$0:Lcom/discord/widgets/friends/WidgetFriendsFindNearby;
@@ -27,61 +37,59 @@
 
     iput-object p1, p0, Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$4;->this$0:Lcom/discord/widgets/friends/WidgetFriendsFindNearby;
 
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+    const/4 p1, 0x1
+
+    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
-
-    sget-object p1, Lcom/discord/widgets/friends/WidgetFriendsFindNearby;->Companion:Lcom/discord/widgets/friends/WidgetFriendsFindNearby$Companion;
-
-    const/4 v0, 0x1
-
-    invoke-static {p1, v0}, Lcom/discord/widgets/friends/WidgetFriendsFindNearby$Companion;->access$setAutoEnableNearby(Lcom/discord/widgets/friends/WidgetFriendsFindNearby$Companion;Z)V
-
-    iget-object p1, p0, Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$4;->this$0:Lcom/discord/widgets/friends/WidgetFriendsFindNearby;
-
-    invoke-static {p1}, Lcom/discord/widgets/friends/WidgetFriendsFindNearby;->access$getMeUserId$p(Lcom/discord/widgets/friends/WidgetFriendsFindNearby;)Ljava/lang/Long;
-
-    move-result-object p1
-
-    if-eqz p1, :cond_1
+.method public final synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 2
 
     check-cast p1, Ljava/lang/Number;
 
     invoke-virtual {p1}, Ljava/lang/Number;->longValue()J
 
-    iget-object p1, p0, Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$4;->this$0:Lcom/discord/widgets/friends/WidgetFriendsFindNearby;
+    move-result-wide v0
 
-    invoke-static {p1}, Lcom/discord/widgets/friends/WidgetFriendsFindNearby;->access$getNearbyManager$p(Lcom/discord/widgets/friends/WidgetFriendsFindNearby;)Lcom/discord/widgets/friends/NearbyManager;
+    invoke-virtual {p0, v0, v1}, Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$4;->invoke(J)V
 
-    move-result-object p1
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
-    iget-object v0, p0, Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$4;->this$0:Lcom/discord/widgets/friends/WidgetFriendsFindNearby;
+    return-object p1
+.end method
 
-    invoke-virtual {v0}, Lcom/discord/widgets/friends/WidgetFriendsFindNearby;->getActivity()Landroidx/fragment/app/FragmentActivity;
+.method public final invoke(J)V
+    .locals 9
 
-    move-result-object v0
+    sget-object v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->Companion:Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;
 
-    if-eqz v0, :cond_0
+    iget-object v1, p0, Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$4;->this$0:Lcom/discord/widgets/friends/WidgetFriendsFindNearby;
 
-    invoke-virtual {p1, v0}, Lcom/discord/widgets/friends/NearbyManager;->buildClientAndPublish(Landroidx/fragment/app/FragmentActivity;)V
+    invoke-virtual {v1}, Lcom/discord/widgets/friends/WidgetFriendsFindNearby;->requireFragmentManager()Landroidx/fragment/app/FragmentManager;
 
-    return-void
+    move-result-object v4
 
-    :cond_0
-    new-instance p1, Lkotlin/r;
+    const-string v1, "requireFragmentManager()"
 
-    const-string v0, "null cannot be cast to non-null type androidx.fragment.app.FragmentActivity"
+    invoke-static {v4, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {p1, v0}, Lkotlin/r;-><init>(Ljava/lang/String;)V
+    const/4 v3, 0x0
 
-    throw p1
+    const/4 v5, 0x0
+
+    const/4 v6, 0x0
+
+    const/16 v7, 0x1a
+
+    const/4 v8, 0x0
+
+    move-wide v1, p1
+
+    invoke-static/range {v0 .. v8}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;->show$default(Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;JLjava/lang/Long;Landroidx/fragment/app/FragmentManager;Ljava/lang/Long;Ljava/lang/Boolean;ILjava/lang/Object;)V
 
-    :cond_1
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$5.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$5.smali
index ec07391fef..c9fc0a85ad 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$5.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$5.smali
@@ -39,17 +39,21 @@
 
     sget-object p1, Lcom/discord/widgets/friends/WidgetFriendsFindNearby;->Companion:Lcom/discord/widgets/friends/WidgetFriendsFindNearby$Companion;
 
-    const/4 v0, 0x0
+    const/4 v0, 0x1
 
     invoke-static {p1, v0}, Lcom/discord/widgets/friends/WidgetFriendsFindNearby$Companion;->access$setAutoEnableNearby(Lcom/discord/widgets/friends/WidgetFriendsFindNearby$Companion;Z)V
 
     iget-object p1, p0, Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$5;->this$0:Lcom/discord/widgets/friends/WidgetFriendsFindNearby;
 
-    invoke-static {p1}, Lcom/discord/widgets/friends/WidgetFriendsFindNearby;->access$getSearchingLottie$p(Lcom/discord/widgets/friends/WidgetFriendsFindNearby;)Lcom/airbnb/lottie/LottieAnimationView;
+    invoke-static {p1}, Lcom/discord/widgets/friends/WidgetFriendsFindNearby;->access$getMeUserId$p(Lcom/discord/widgets/friends/WidgetFriendsFindNearby;)Ljava/lang/Long;
 
     move-result-object p1
 
-    invoke-virtual {p1, v0}, Lcom/airbnb/lottie/LottieAnimationView;->setFrame(I)V
+    if-eqz p1, :cond_1
+
+    check-cast p1, Ljava/lang/Number;
+
+    invoke-virtual {p1}, Ljava/lang/Number;->longValue()J
 
     iget-object p1, p0, Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$5;->this$0:Lcom/discord/widgets/friends/WidgetFriendsFindNearby;
 
@@ -57,7 +61,27 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/discord/widgets/friends/NearbyManager;->disableNearby()V
+    iget-object v0, p0, Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$5;->this$0:Lcom/discord/widgets/friends/WidgetFriendsFindNearby;
+
+    invoke-virtual {v0}, Lcom/discord/widgets/friends/WidgetFriendsFindNearby;->getActivity()Landroidx/fragment/app/FragmentActivity;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {p1, v0}, Lcom/discord/widgets/friends/NearbyManager;->buildClientAndPublish(Landroidx/fragment/app/FragmentActivity;)V
 
     return-void
+
+    :cond_0
+    new-instance p1, Lkotlin/r;
+
+    const-string v0, "null cannot be cast to non-null type androidx.fragment.app.FragmentActivity"
+
+    invoke-direct {p1, v0}, Lkotlin/r;-><init>(Ljava/lang/String;)V
+
+    throw p1
+
+    :cond_1
+    return-void
 .end method
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 3cf89111bb..b99018b193 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
@@ -17,26 +17,16 @@
 .end annotation
 
 
-# static fields
-.field public static final INSTANCE:Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$6;
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/friends/WidgetFriendsFindNearby;
 
 
 # direct methods
-.method static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$6;
-
-    invoke-direct {v0}, Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$6;-><init>()V
-
-    sput-object v0, Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$6;->INSTANCE:Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$6;
-
-    return-void
-.end method
-
-.method constructor <init>()V
+.method constructor <init>(Lcom/discord/widgets/friends/WidgetFriendsFindNearby;)V
     .locals 0
 
+    iput-object p1, p0, Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$6;->this$0:Lcom/discord/widgets/friends/WidgetFriendsFindNearby;
+
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     return-void
@@ -45,33 +35,29 @@
 
 # virtual methods
 .method public final onClick(Landroid/view/View;)V
-    .locals 3
+    .locals 1
 
-    const-string v0, "it"
+    sget-object p1, Lcom/discord/widgets/friends/WidgetFriendsFindNearby;->Companion:Lcom/discord/widgets/friends/WidgetFriendsFindNearby$Companion;
 
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    const/4 v0, 0x0
 
-    invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
+    invoke-static {p1, v0}, Lcom/discord/widgets/friends/WidgetFriendsFindNearby$Companion;->access$setAutoEnableNearby(Lcom/discord/widgets/friends/WidgetFriendsFindNearby$Companion;Z)V
+
+    iget-object p1, p0, Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$6;->this$0:Lcom/discord/widgets/friends/WidgetFriendsFindNearby;
+
+    invoke-static {p1}, Lcom/discord/widgets/friends/WidgetFriendsFindNearby;->access$getSearchingLottie$p(Lcom/discord/widgets/friends/WidgetFriendsFindNearby;)Lcom/airbnb/lottie/LottieAnimationView;
 
     move-result-object p1
 
-    const-string v0, "it.context"
+    invoke-virtual {p1, v0}, Lcom/airbnb/lottie/LottieAnimationView;->setFrame(I)V
 
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    iget-object p1, p0, Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$6;->this$0:Lcom/discord/widgets/friends/WidgetFriendsFindNearby;
 
-    sget-object v0, Lcom/discord/app/e;->vj:Lcom/discord/app/e;
+    invoke-static {p1}, Lcom/discord/widgets/friends/WidgetFriendsFindNearby;->access$getNearbyManager$p(Lcom/discord/widgets/friends/WidgetFriendsFindNearby;)Lcom/discord/widgets/friends/NearbyManager;
 
-    sget-wide v0, Lcom/discord/app/e;->vg:J
+    move-result-object p1
 
-    invoke-static {v0, v1}, Lcom/discord/app/e;->j(J)Ljava/lang/String;
-
-    move-result-object v0
-
-    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
+    invoke-virtual {p1}, Lcom/discord/widgets/friends/NearbyManager;->disableNearby()V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$7.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$7.smali
new file mode 100644
index 0000000000..8b7f61ff3b
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$7.smali
@@ -0,0 +1,77 @@
+.class final Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$7;
+.super Ljava/lang/Object;
+.source "WidgetFriendsFindNearby.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/friends/WidgetFriendsFindNearby;->onViewBound(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/friends/WidgetFriendsFindNearby$onViewBound$7;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$7;
+
+    invoke-direct {v0}, Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$7;-><init>()V
+
+    sput-object v0, Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$7;->INSTANCE:Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$7;
+
+    return-void
+.end method
+
+.method constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final onClick(Landroid/view/View;)V
+    .locals 3
+
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
+
+    move-result-object p1
+
+    const-string v0, "it.context"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v0, Lcom/discord/app/e;->vk:Lcom/discord/app/e;
+
+    sget-wide v0, Lcom/discord/app/e;->vh:J
+
+    invoke-static {v0, v1}, Lcom/discord/app/e;->j(J)Ljava/lang/String;
+
+    move-result-object v0
+
+    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
+
+    return-void
+.end method
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 91d929a7d5..e669b01dad 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 f2b57da1f2..c799a7b54f 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 ebf0422479..3dd1632170 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, 0x7f0a0497
+    const v0, 0x7f0a048a
 
     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, 0x7f0a0495
+    const v0, 0x7f0a0488
 
     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, 0x7f0a0491
+    const v0, 0x7f0a0484
 
     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, 0x7f0a0494
+    const v0, 0x7f0a0487
 
     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, 0x7f0a0493
+    const v0, 0x7f0a0486
 
     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, 0x7f0a0492
+    const v0, 0x7f0a0485
 
     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, 0x7f0a0498
+    const v0, 0x7f0a048b
 
     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, 0x7f0a0499
+    const v0, 0x7f0a048c
 
     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, 0x7f0a0496
+    const v0, 0x7f0a0489
 
     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, 0x7f0d0124
+    const v0, 0x7f0d0122
 
     return v0
 .end method
@@ -955,7 +955,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->IV()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->IT()Lrx/Observable;
 
     move-result-object p1
 
@@ -975,7 +975,7 @@
 
     move-result-object p1
 
-    sget-object v0, Lcom/discord/app/i;->vO:Lcom/discord/app/i;
+    sget-object v0, Lcom/discord/app/i;->vP:Lcom/discord/app/i;
 
     new-instance v0, Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$1;
 
@@ -1045,27 +1045,30 @@
     invoke-static {v0}, Lkotlin/jvm/internal/l;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     :cond_1
-    new-instance v0, Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$3;
+    new-instance v1, Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$3;
 
-    invoke-direct {v0, p0}, Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$3;-><init>(Lcom/discord/widgets/friends/WidgetFriendsFindNearby;)V
+    invoke-direct {v1, p0}, Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$3;-><init>(Lcom/discord/widgets/friends/WidgetFriendsFindNearby;)V
 
-    check-cast v0, Lkotlin/jvm/functions/Function1;
+    check-cast v1, Lkotlin/jvm/functions/Function1;
 
-    invoke-virtual {p1, v0}, Lcom/discord/widgets/friends/WidgetFriendsAddUserAdapter;->setAcceptHandler(Lkotlin/jvm/functions/Function1;)V
+    invoke-virtual {p1, v1}, Lcom/discord/widgets/friends/WidgetFriendsAddUserAdapter;->setAcceptHandler(Lkotlin/jvm/functions/Function1;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/friends/WidgetFriendsFindNearby;->getEnableButton()Landroid/widget/Button;
+    iget-object p1, p0, Lcom/discord/widgets/friends/WidgetFriendsFindNearby;->resultsAdapter:Lcom/discord/widgets/friends/WidgetFriendsAddUserAdapter;
 
-    move-result-object p1
+    if-nez p1, :cond_2
 
+    invoke-static {v0}, Lkotlin/jvm/internal/l;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+
+    :cond_2
     new-instance v0, Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$4;
 
     invoke-direct {v0, p0}, Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$4;-><init>(Lcom/discord/widgets/friends/WidgetFriendsFindNearby;)V
 
-    check-cast v0, Landroid/view/View$OnClickListener;
+    check-cast v0, Lkotlin/jvm/functions/Function1;
 
-    invoke-virtual {p1, v0}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {p1, v0}, Lcom/discord/widgets/friends/WidgetFriendsAddUserAdapter;->setOnItemClick(Lkotlin/jvm/functions/Function1;)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/friends/WidgetFriendsFindNearby;->getDisableButton()Landroid/widget/Button;
+    invoke-direct {p0}, Lcom/discord/widgets/friends/WidgetFriendsFindNearby;->getEnableButton()Landroid/widget/Button;
 
     move-result-object p1
 
@@ -1077,11 +1080,23 @@
 
     invoke-virtual {p1, v0}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
+    invoke-direct {p0}, Lcom/discord/widgets/friends/WidgetFriendsFindNearby;->getDisableButton()Landroid/widget/Button;
+
+    move-result-object p1
+
+    new-instance v0, Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$6;
+
+    invoke-direct {v0, p0}, Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$6;-><init>(Lcom/discord/widgets/friends/WidgetFriendsFindNearby;)V
+
+    check-cast v0, Landroid/view/View$OnClickListener;
+
+    invoke-virtual {p1, v0}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+
     invoke-direct {p0}, Lcom/discord/widgets/friends/WidgetFriendsFindNearby;->getLearnMore()Landroid/widget/TextView;
 
     move-result-object p1
 
-    sget-object v0, Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$6;->INSTANCE:Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$6;
+    sget-object v0, Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$7;->INSTANCE:Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$7;
 
     check-cast v0, Landroid/view/View$OnClickListener;
 
@@ -1164,7 +1179,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -1188,7 +1203,7 @@
 
     move-result-object v0
 
-    sget-object v2, Lcom/discord/app/i;->vO:Lcom/discord/app/i;
+    sget-object v2, Lcom/discord/app/i;->vP: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 df274ef45f..efdec31fc2 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/b;
+.implements Lrx/functions/Func6;
 
 
 # annotations
@@ -18,38 +18,38 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "<T:",
+        "<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/b<",
-        "TT;TR;>;"
+        "Lrx/functions/Func6<",
+        "TT1;TT2;TT3;TT4;TT5;TT6;TR;>;"
     }
 .end annotation
 
 
-# static fields
-.field public static final INSTANCE:Lcom/discord/widgets/friends/WidgetFriendsList$Model$Companion$get$1$1;
+# instance fields
+.field final synthetic $index:Ljava/lang/Integer;
 
 
 # direct methods
-.method static constructor <clinit>()V
-    .locals 1
-
-    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
+.method constructor <init>(Ljava/lang/Integer;)V
     .locals 0
 
+    iput-object p1, p0, Lcom/discord/widgets/friends/WidgetFriendsList$Model$Companion$get$1$1;->$index:Ljava/lang/Integer;
+
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     return-void
@@ -57,33 +57,209 @@
 
 
 # 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/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
+.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 = {
             "(",
-            "Lcom/discord/stores/StoreApplicationStreaming$State;",
-            ")",
+            "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
 
-    invoke-virtual {p1}, Lcom/discord/stores/StoreApplicationStreaming$State;->getStreamsByUser()Ljava/util/Map;
+    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;
+    .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$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;
 
     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
deleted file mode 100644
index d178943d8b..0000000000
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model$Companion$get$1$2.smali
+++ /dev/null
@@ -1,267 +0,0 @@
-.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 b8bfe94d4e..b91369a400 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,21 +140,13 @@
 
     move-result-object v0
 
-    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;
+    invoke-virtual {v0}, Lcom/discord/stores/StoreApplicationStreaming;->get()Lrx/Observable;
 
     move-result-object v6
 
-    new-instance v0, Lcom/discord/widgets/friends/WidgetFriendsList$Model$Companion$get$1$2;
+    new-instance v0, Lcom/discord/widgets/friends/WidgetFriendsList$Model$Companion$get$1$1;
 
-    invoke-direct {v0, p1}, Lcom/discord/widgets/friends/WidgetFriendsList$Model$Companion$get$1$2;-><init>(Ljava/lang/Integer;)V
+    invoke-direct {v0, p1}, Lcom/discord/widgets/friends/WidgetFriendsList$Model$Companion$get$1$1;-><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 c8cc4e937c..76ac245381 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 bcdd5bb81a..5b211df541 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, 0x7f0d0112
+    const v2, 0x7f0d0110
 
     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 d057fb5c97..8c253f7442 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 190ded02cc..ee5d024e7b 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
@@ -28,29 +28,19 @@
 .end annotation
 
 
-# static fields
-.field public static final INSTANCE:Lcom/discord/widgets/friends/WidgetFriendsList$configure$4;
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/friends/WidgetFriendsList;
 
 
 # direct methods
-.method static constructor <clinit>()V
-    .locals 1
+.method constructor <init>(Lcom/discord/widgets/friends/WidgetFriendsList;)V
+    .locals 0
 
-    new-instance v0, Lcom/discord/widgets/friends/WidgetFriendsList$configure$4;
+    iput-object p1, p0, Lcom/discord/widgets/friends/WidgetFriendsList$configure$4;->this$0:Lcom/discord/widgets/friends/WidgetFriendsList;
 
-    invoke-direct {v0}, Lcom/discord/widgets/friends/WidgetFriendsList$configure$4;-><init>()V
+    const/4 p1, 0x2
 
-    sput-object v0, Lcom/discord/widgets/friends/WidgetFriendsList$configure$4;->INSTANCE:Lcom/discord/widgets/friends/WidgetFriendsList$configure$4;
-
-    return-void
-.end method
-
-.method constructor <init>()V
-    .locals 1
-
-    const/4 v0, 0x2
-
-    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
@@ -66,31 +56,49 @@
 
     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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object p1
 .end method
 
 .method public final invoke(Landroid/view/View;Lcom/discord/models/domain/ModelUser;)V
-    .locals 2
+    .locals 9
 
     const-string v0, "view"
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v0, "user"
+    const-string p1, "user"
 
-    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
 
-    invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
-
-    move-result-object p1
+    sget-object v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->Companion:Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;
 
     invoke-virtual {p2}, Lcom/discord/models/domain/ModelUser;->getId()J
 
-    move-result-wide v0
+    move-result-wide v1
 
-    invoke-static {p1, v0, v1}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->launch(Landroid/content/Context;J)V
+    iget-object p1, p0, Lcom/discord/widgets/friends/WidgetFriendsList$configure$4;->this$0:Lcom/discord/widgets/friends/WidgetFriendsList;
+
+    invoke-virtual {p1}, Lcom/discord/widgets/friends/WidgetFriendsList;->requireFragmentManager()Landroidx/fragment/app/FragmentManager;
+
+    move-result-object v4
+
+    const-string p1, "requireFragmentManager()"
+
+    invoke-static {v4, p1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v3, 0x0
+
+    const/4 v5, 0x0
+
+    const/4 v6, 0x0
+
+    const/16 v7, 0x1a
+
+    const/4 v8, 0x0
+
+    invoke-static/range {v0 .. v8}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;->show$default(Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;JLjava/lang/Long;Landroidx/fragment/app/FragmentManager;Ljava/lang/Long;Ljava/lang/Boolean;ILjava/lang/Object;)V
 
     return-void
 .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 9b00886b39..6cb6beb55e 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 9468f48192..17adb41a2b 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 6399781c1c..2c72461629 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 dc8013beb8..1f51b436db 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;->Kz()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kx()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, 0x7f1206f9
+    const v2, 0x7f1206d4
 
     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, 0x7f1206f7
+    const v0, 0x7f1206d2
 
     invoke-direct {p0, p1, v0}, Lcom/discord/widgets/friends/WidgetFriendsList;->addTab(Lcom/google/android/material/tabs/TabLayout;I)V
 
-    const v0, 0x7f1206f8
+    const v0, 0x7f1206d3
 
     invoke-direct {p0, p1, v0}, Lcom/discord/widgets/friends/WidgetFriendsList;->addTab(Lcom/google/android/material/tabs/TabLayout;I)V
 
-    const v0, 0x7f1206f9
+    const v0, 0x7f1206d4
 
     invoke-direct {p0, p1, v0}, Lcom/discord/widgets/friends/WidgetFriendsList;->addTab(Lcom/google/android/material/tabs/TabLayout;I)V
 
-    const v0, 0x7f120351
+    const v0, 0x7f12032c
 
     invoke-direct {p0, p1, v0}, Lcom/discord/widgets/friends/WidgetFriendsList;->addTab(Lcom/google/android/material/tabs/TabLayout;I)V
 
@@ -218,7 +218,9 @@
 
     if-eqz p1, :cond_5
 
-    sget-object v0, Lcom/discord/widgets/friends/WidgetFriendsList$configure$4;->INSTANCE:Lcom/discord/widgets/friends/WidgetFriendsList$configure$4;
+    new-instance v0, Lcom/discord/widgets/friends/WidgetFriendsList$configure$4;
+
+    invoke-direct {v0, p0}, Lcom/discord/widgets/friends/WidgetFriendsList$configure$4;-><init>(Lcom/discord/widgets/friends/WidgetFriendsList;)V
 
     check-cast v0, Lkotlin/jvm/functions/Function2;
 
@@ -354,7 +356,7 @@
 .method public getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0121
+    const v0, 0x7f0d011f
 
     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 40cb4e129c..8bef3a7b49 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, 0x7f0d0123
+    const v0, 0x7f0d0121
 
     invoke-direct {p0, v0, p1}, Lcom/discord/widgets/friends/WidgetFriendsListAdapter$Item;-><init>(ILcom/discord/widgets/friends/WidgetFriendsListAdapter;)V
 
-    const v0, 0x7f0a02fc
+    const v0, 0x7f0a02fb
 
     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 fdd70b50a9..6bb22ed354 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, 0x7f0d0122
+    const v0, 0x7f0d0120
 
     invoke-direct {p0, v0, p1}, Lcom/discord/widgets/friends/WidgetFriendsListAdapter$Item;-><init>(ILcom/discord/widgets/friends/WidgetFriendsListAdapter;)V
 
-    const v0, 0x7f0a02fa
+    const v0, 0x7f0a02f9
 
     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, 0x7f0a0311
+    const v0, 0x7f0a0310
 
     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, 0x7f0a0303
+    const v0, 0x7f0a0302
 
     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, 0x7f0a0312
+    const v0, 0x7f0a0311
 
     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, 0x7f0a030d
+    const v0, 0x7f0a030c
 
     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, 0x7f0a030f
+    const v0, 0x7f0a030e
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -359,25 +359,25 @@
     nop
 
     :array_0
+    .array-data 4
+        0x7f0a0303
+        0x7f0a0306
+        0x7f0a0309
+    .end array-data
+
+    :array_1
     .array-data 4
         0x7f0a0304
         0x7f0a0307
         0x7f0a030a
     .end array-data
 
-    :array_1
+    :array_2
     .array-data 4
         0x7f0a0305
         0x7f0a0308
         0x7f0a030b
     .end array-data
-
-    :array_2
-    .array-data 4
-        0x7f0a0306
-        0x7f0a0309
-        0x7f0a030c
-    .end array-data
 .end method
 
 .method private final getItemAvatar()Landroid/widget/ImageView;
@@ -736,7 +736,7 @@
 
     move-result-object v1
 
-    const v4, 0x7f120d28
+    const v4, 0x7f120cf1
 
     invoke-virtual {v1, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -763,7 +763,7 @@
 
     move-result-object v1
 
-    const v4, 0x7f1209fe
+    const v4, 0x7f1209c8
 
     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 e75ce8c4a5..a94f7bade6 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 4d2d6848b7..bf58b824da 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 d0665fb803..8089ce59c4 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 5774f7e288..ccc333b2a7 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, 0x7f0a0339
+    const v0, 0x7f0a0334
 
     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, 0x7f0a0337
+    const v0, 0x7f0a0332
 
     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, 0x7f0d012b
+    const v0, 0x7f0d0129
 
     return v0
 .end method
@@ -210,7 +210,7 @@
 
     check-cast v0, Landroidx/fragment/app/Fragment;
 
-    const v1, 0x7f060137
+    const v1, 0x7f060136
 
     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 7172cb4fed..c8068b64a3 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 852f446172..7bf15a25ca 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 5f69e0b084..3269b9c488 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 0ef980e50c..a1257a8699 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 41e86ad2e6..b2e0b9a7e3 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 988ca3c84d..242f63784a 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 d3f2ecf5fd..8dd9e1953d 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 1869dc268e..90166ceba3 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 42573af3aa..00f168228a 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 cbd5e73642..a8fccec98a 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 25c11166ba..6d28271387 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 0f5e6698a0..f7f61d0a02 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 eaa8207f77..d48bf9a772 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, 0x7f0a0343
+    const v0, 0x7f0a033e
 
     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, 0x7f0a0341
+    const v0, 0x7f0a033c
 
     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, 0x7f0a0342
+    const v0, 0x7f0a033d
 
     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, 0x7f0a033f
+    const v0, 0x7f0a033a
 
     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, 0x7f0a0340
+    const v0, 0x7f0a033b
 
     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, 0x7f0a033b
+    const v0, 0x7f0a0336
 
     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, 0x7f0a033e
+    const v0, 0x7f0a0339
 
     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, 0x7f0a0344
+    const v0, 0x7f0a033f
 
     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, 0x7f0a0346
+    const v0, 0x7f0a0341
 
     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, 0x7f0a0348
+    const v0, 0x7f0a0343
 
     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, 0x7f0a033d
+    const v0, 0x7f0a0338
 
     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, 0x7f0a0347
+    const v0, 0x7f0a0342
 
     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, 0x7f0a0349
+    const v0, 0x7f0a0344
 
     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, 0x7f0a0345
+    const v0, 0x7f0a0340
 
     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, 0x7f0a033c
+    const v0, 0x7f0a0337
 
     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, 0x7f121124
+    const v1, 0x7f121098
 
     goto :goto_2
 
     :cond_2
-    const v1, 0x7f12096c
+    const v1, 0x7f120936
 
     :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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     goto :goto_0
 
@@ -1354,7 +1354,7 @@
 
     const/4 v1, 0x0
 
-    const v2, 0x7f0d00df
+    const v2, 0x7f0d00dd
 
     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, 0x7f0d00e0
+    const v1, 0x7f0d00de
 
     const/4 v2, 0x0
 
@@ -1666,7 +1666,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/discord/app/i;->vO:Lcom/discord/app/i;
+    sget-object v1, Lcom/discord/app/i;->vP: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, 0x7f0d012c
+    const v0, 0x7f0d012a
 
     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 79309e5314..9eac17a3ba 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, 0x7f0d012f
+    const v3, 0x7f0d012d
 
     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;->fi()Landroid/widget/Checkable;
+    invoke-virtual {v0}, Lcom/discord/views/RadioManager;->fg()Landroid/widget/Checkable;
 
     move-result-object v0
 
@@ -279,7 +279,7 @@
 .method private getCommunityGuidelines()Ljava/lang/CharSequence;
     .locals 4
 
-    const v0, 0x7f1204a9
+    const v0, 0x7f120484
 
     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, 0x7f0a0467
+    const v0, 0x7f0a0462
 
     invoke-interface {p1, v0}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
 
@@ -399,7 +399,7 @@
 .method public getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d012e
+    const v0, 0x7f0d012c
 
     return v0
 .end method
@@ -461,7 +461,7 @@
 
     if-eqz v1, :cond_0
 
-    const p1, 0x7f1210d5
+    const p1, 0x7f121049
 
     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, 0x7f1212b4
+    const p1, 0x7f121227
 
     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, 0x7f1203fd
+    const v0, 0x7f1203d8
 
-    const v1, 0x7f1212a4
+    const v1, 0x7f121217
 
     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, 0x7f1204a4
+    const p1, 0x7f12047f
 
     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;->xr:Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
+    sget-object v5, Lcom/discord/dialogs/ImageUploadDialog$PreviewType;->xt: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, 0x7f0a027a
+    const v0, 0x7f0a0279
 
     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, 0x7f0a0351
+    const v0, 0x7f0a034c
 
     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, 0x7f0a0352
+    const v0, 0x7f0a034d
 
     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, 0x7f0a0350
+    const v0, 0x7f0a034b
 
     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, 0x7f0a034e
+    const v0, 0x7f0a0349
 
     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, 0x7f0a034f
+    const v0, 0x7f0a034a
 
     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, 0x7f0a034d
+    const v0, 0x7f0a0348
 
     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 1623494e5a..3089a4a175 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, 0x7f120a8a
+    const p2, 0x7f120a54
 
     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, 0x7f120a25
+    const v1, 0x7f1209ef
 
     invoke-virtual {v0, v1}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
@@ -130,7 +130,7 @@
 
     move-result-object p2
 
-    const v0, 0x7f12123c
+    const v0, 0x7f1211af
 
     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 d81c4a4c21..93781c3882 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 8e751b1d6b..42e5a3ed19 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 5837ef23b0..9dba23f375 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -214,7 +214,7 @@
 
     move-result-object p2
 
-    sget-object p3, Lcom/discord/app/i;->vO:Lcom/discord/app/i;
+    sget-object p3, Lcom/discord/app/i;->vP: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 d01be42f02..3bbfa20655 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;->IV()Lrx/Observable;
+    invoke-virtual {v1}, Lrx/Observable;->IT()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 4a9046b7d1..970f9f31ff 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;->bhO:Lkotlin/jvm/internal/ab;
+    sget-object p3, Lkotlin/jvm/internal/ab;->bhJ: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, 0x7f0d0093
+    const p3, 0x7f0d0091
 
     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, 0x7f0d0092
+    const p3, 0x7f0d0090
 
     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 f94c2e7706..9cbcab067d 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 0d8f262ea1..6c5bf04223 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 2d41794105..3458308089 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, 0x7f0a0356
+    const p1, 0x7f0a0351
 
     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, 0x7f0a035d
+    const p1, 0x7f0a0358
 
     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, 0x7f0a0363
+    const p1, 0x7f0a035e
 
     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, 0x7f0a036a
+    const p1, 0x7f0a0365
 
     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, 0x7f0a0360
+    const p1, 0x7f0a035b
 
     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, 0x7f0d0092
+    const v2, 0x7f0d0090
 
     const/4 v3, 0x0
 
@@ -273,7 +273,7 @@
 
     check-cast v0, Landroid/view/ViewGroup;
 
-    const v1, 0x7f0d008f
+    const v1, 0x7f0d008d
 
     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, 0x7f0a0356
+    const p1, 0x7f0a0351
 
     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, 0x7f0a035d
+    const p1, 0x7f0a0358
 
     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, 0x7f0a0363
+    const p1, 0x7f0a035e
 
     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, 0x7f0a036a
+    const p1, 0x7f0a0365
 
     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, 0x7f0a0360
+    const p1, 0x7f0a035b
 
     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, 0x7f0d0092
+    const v2, 0x7f0d0090
 
     const/4 v3, 0x0
 
@@ -429,7 +429,7 @@
 
     check-cast p2, Landroid/view/ViewGroup;
 
-    const v0, 0x7f0d008f
+    const v0, 0x7f0d008d
 
     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, 0x7f0a0356
+    const p1, 0x7f0a0351
 
     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, 0x7f0a035d
+    const p1, 0x7f0a0358
 
     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, 0x7f0a0363
+    const p1, 0x7f0a035e
 
     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, 0x7f0a036a
+    const p1, 0x7f0a0365
 
     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, 0x7f0a0360
+    const p1, 0x7f0a035b
 
     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, 0x7f0d0092
+    const v2, 0x7f0d0090
 
     const/4 v3, 0x0
 
@@ -585,7 +585,7 @@
 
     check-cast p2, Landroid/view/ViewGroup;
 
-    const p3, 0x7f0d008f
+    const p3, 0x7f0d008d
 
     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, 0x7f0d009d
+    const v6, 0x7f0d009b
 
     move-object v7, p1
 
@@ -864,7 +864,7 @@
 
     const/16 v0, 0xe10
 
-    const v3, 0x7f100026
+    const v3, 0x7f100025
 
     if-eq p1, v0, :cond_3
 
@@ -889,7 +889,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f100025
+    const v0, 0x7f100024
 
     new-array v3, v2, [Ljava/lang/Object;
 
@@ -987,7 +987,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f100028
+    const v0, 0x7f100027
 
     new-array v2, v2, [Ljava/lang/Object;
 
@@ -1010,7 +1010,7 @@
     return-object p1
 
     :cond_5
-    const p1, 0x7f120c71
+    const p1, 0x7f120c3a
 
     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 c4ab8c85d6..9d4953aab2 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 a9a3c544f0..c7d5cb95af 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;->vO:Lcom/discord/app/i;
+    sget-object v0, Lcom/discord/app/i;->vP: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 3e2e8ee850..79e18b5cc5 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -74,7 +74,7 @@
     return-void
 
     :cond_0
-    sget-object p1, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
+    sget-object p1, Lcom/discord/app/AppLog;->vn: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 aa427d64ef..e91c990490 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, 0x7f0a0361
+    const v0, 0x7f0a035c
 
     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, 0x7f0a0353
+    const v0, 0x7f0a034e
 
     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, 0x7f0a0355
+    const v0, 0x7f0a0350
 
     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, 0x7f0a0367
+    const v0, 0x7f0a0362
 
     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, 0x7f0d0130
+    const v0, 0x7f0d012e
 
     return v0
 .end method
@@ -759,7 +759,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/discord/app/i;->vO:Lcom/discord/app/i;
+    sget-object v1, Lcom/discord/app/i;->vP: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 1ea570cc1c..ffa589dd0b 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 5ad70645bb..ce214c4420 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 3814b6dc79..03555a0d78 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, 0x7f0d0134
+    const v0, 0x7f0d0132
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
-    const p1, 0x7f0a03f3
+    const p1, 0x7f0a03ee
 
     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, 0x7f0a040b
+    const p1, 0x7f0a0406
 
     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, 0x7f0a03f4
+    const p1, 0x7f0a03ef
 
     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, 0x7f0a040c
+    const p1, 0x7f0a0407
 
     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 2332825447..1ac9ba082d 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 8468def75c..0c49868a6e 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 d5f781df21..c4475328bd 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 262923766e..243f17c6d9 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 fb4cb5c755..9dda7ae906 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 b1c0d49f71..a8f0e7da2a 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 065e6486de..a24828bcc2 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, 0x7f0a05c3
+    const v0, 0x7f0a05aa
 
     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, 0x7f0a05cd
+    const v0, 0x7f0a05b4
 
     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, 0x7f0a05c7
+    const v0, 0x7f0a05ae
 
     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, 0x7f0a0369
+    const v0, 0x7f0a0364
 
     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, 0x7f0a0368
+    const v0, 0x7f0a0363
 
     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, 0x7f0a0357
+    const v0, 0x7f0a0352
 
     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, 0x7f0a0366
+    const v0, 0x7f0a0361
 
     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, 0x7f0a0364
+    const v0, 0x7f0a035f
 
     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, 0x7f0a0362
+    const v0, 0x7f0a035d
 
     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, 0x7f0a0365
+    const v0, 0x7f0a0360
 
     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, 0x7f0a03d3
+    const v0, 0x7f0a03ce
 
     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;->vO:Lcom/discord/app/i;
+    sget-object v3, Lcom/discord/app/i;->vP: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, 0x7f0d0132
+    const v0, 0x7f0d0130
 
     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, 0x7f120a9a
+    const v4, 0x7f120a64
 
     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, 0x7f0403a6
+    const v1, 0x7f0403a5
 
     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 98421c742f..80bc7e60d2 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 281f83bb54..c5180e650c 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 562c4a052b..82b20c5de0 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, 0x7f0a035a
+    const v0, 0x7f0a0355
 
     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, 0x7f0a035b
+    const v0, 0x7f0a0356
 
     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, 0x7f0a0359
+    const v0, 0x7f0a0354
 
     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, 0x7f0a035c
+    const v0, 0x7f0a0357
 
     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, 0x7f0a03d3
+    const v0, 0x7f0a03ce
 
     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, 0x7f100026
+    const v3, 0x7f100025
 
     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, 0x7f120a9e
+    const p1, 0x7f120a68
 
     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, 0x7f120bc2
+    const v1, 0x7f120b8c
 
     invoke-virtual {p1, v1}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
@@ -654,7 +654,7 @@
 
     move-result-object v1
 
-    const v4, 0x7f100082
+    const v4, 0x7f100080
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelInvite$Settings;->getMaxUses()I
 
@@ -695,7 +695,7 @@
 
     const/4 v4, 0x2
 
-    const v5, 0x7f120a9e
+    const v5, 0x7f120a68
 
     if-eq v0, v1, :cond_5
 
@@ -722,7 +722,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f100025
+    const v1, 0x7f100024
 
     invoke-virtual {v0, v1, v3}, Landroid/content/res/Resources;->getQuantityString(II)Ljava/lang/String;
 
@@ -810,7 +810,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f100029
+    const v1, 0x7f100028
 
     new-array v6, v3, [Ljava/lang/Object;
 
@@ -863,7 +863,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f120bbe
+    const v2, 0x7f120b88
 
     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, 0x7f0d0133
+    const v0, 0x7f0d0131
 
     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, 0x7f120a9a
+    const v3, 0x7f120a64
 
     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 b925fad2ba..0dc6e0f37d 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 b32e0ee98d..92c3f3c0e2 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;->Kz()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kx()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;->bgy:Lkotlin/Unit;
+    sget-object v2, Lkotlin/Unit;->bgt: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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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;->bgy:Lkotlin/Unit;
+    sget-object v1, Lkotlin/Unit;->bgt: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 4e61dcbac3..90cb43f976 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, 0x7f0a03d1
+    const p1, 0x7f0a03cc
 
     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, 0x7f0a03d5
+    const p1, 0x7f0a03d0
 
     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, 0x7f0a03d0
+    const p1, 0x7f0a03cb
 
     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, 0x7f0a03cd
+    const p1, 0x7f0a03c8
 
     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, 0x7f0a03cc
+    const p1, 0x7f0a03c7
 
     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, 0x7f0a03ce
+    const p1, 0x7f0a03c9
 
     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, 0x7f0a03cf
+    const p1, 0x7f0a03ca
 
     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, 0x7f0a03bf
+    const p1, 0x7f0a03ba
 
     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, 0x7f0a03c2
+    const p1, 0x7f0a03bd
 
     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, 0x7f0a03c0
+    const p1, 0x7f0a03bb
 
     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, 0x7f0a03c1
+    const p1, 0x7f0a03bc
 
     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, 0x7f0a03c9
+    const p1, 0x7f0a03c4
 
     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, 0x7f0d0131
+    const v1, 0x7f0d012f
 
     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, 0x7f0803c9
+    const v10, 0x7f0803bb
 
     const/4 v11, 0x0
 
@@ -931,7 +931,7 @@
 
     move-result-object v9
 
-    const v10, 0x7f08032f
+    const v10, 0x7f080323
 
     const/4 v11, 0x0
 
@@ -1100,7 +1100,7 @@
 
     if-nez p1, :cond_0
 
-    const p1, 0x7f120a2f
+    const p1, 0x7f1209f9
 
     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, 0x7f120288
+    const v0, 0x7f120286
 
     const/4 v1, 0x1
 
@@ -1147,7 +1147,7 @@
 
     if-eqz p2, :cond_0
 
-    const p2, 0x7f120288
+    const p2, 0x7f120286
 
     const/4 v0, 0x1
 
@@ -1172,7 +1172,7 @@
     return-object p1
 
     :cond_0
-    const p1, 0x7f120a31
+    const p1, 0x7f1209fb
 
     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, 0x7f100073
+    const v3, 0x7f100071
 
     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, 0x7f120a1f
+    const p1, 0x7f1209e9
 
     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, 0x7f120a1e
+    const p1, 0x7f1209e8
 
     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, 0x7f120a16
+    const v1, 0x7f1209e0
 
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
 
@@ -1547,7 +1547,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f120a47
+    const v1, 0x7f120a11
 
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
 
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 0e78a91693..37bd2affde 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
@@ -33,6 +33,8 @@
 
 
 # instance fields
+.field final synthetic $channelObservable$inlined:Lrx/Observable;
+
 .field final synthetic $me$inlined:Lcom/discord/models/domain/ModelUser;
 
 .field final synthetic $user$inlined:Lcom/discord/models/domain/ModelUser;
@@ -41,14 +43,16 @@
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory$observeStoreState$2;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelUser;)V
+.method constructor <init>(Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory$observeStoreState$2;Lrx/Observable;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelUser;)V
     .locals 0
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory$observeStoreState$2$$special$$inlined$let$lambda$1;->this$0:Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory$observeStoreState$2;
 
-    iput-object p2, p0, Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory$observeStoreState$2$$special$$inlined$let$lambda$1;->$user$inlined:Lcom/discord/models/domain/ModelUser;
+    iput-object p2, p0, Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory$observeStoreState$2$$special$$inlined$let$lambda$1;->$channelObservable$inlined:Lrx/Observable;
 
-    iput-object p3, p0, Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory$observeStoreState$2$$special$$inlined$let$lambda$1;->$me$inlined:Lcom/discord/models/domain/ModelUser;
+    iput-object p3, p0, Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory$observeStoreState$2$$special$$inlined$let$lambda$1;->$user$inlined:Lcom/discord/models/domain/ModelUser;
+
+    iput-object p4, p0, Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory$observeStoreState$2$$special$$inlined$let$lambda$1;->$me$inlined:Lcom/discord/models/domain/ModelUser;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -104,8 +108,6 @@
 
     check-cast v6, Lcom/discord/models/domain/ModelChannel;
 
-    if-eqz v5, :cond_0
-
     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 v2, v1, Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory$observeStoreState$2;->this$0:Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory;
@@ -164,17 +166,5 @@
 
     move-result-object v1
 
-    if-nez v1, :cond_1
-
-    :cond_0
-    invoke-static {}, Lrx/Observable;->IS()Lrx/Observable;
-
-    move-result-object v1
-
-    const-string v2, "Observable.empty()"
-
-    invoke-static {v1, v2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    :cond_1
     return-object v1
 .end method
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 d53f6a56ba..f08cc2b953 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
@@ -138,13 +138,23 @@
 
     check-cast p1, Lcom/discord/models/domain/ModelUser;
 
-    if-eqz v0, :cond_0
+    iget-object v1, p0, Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory$observeStoreState$2;->this$0:Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory;
+
+    invoke-virtual {v1}, Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory;->getChannelId()Ljava/lang/Long;
+
+    move-result-object v1
+
+    if-eqz v1, :cond_0
 
     iget-object v1, p0, Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory$observeStoreState$2;->$storeChannels:Lcom/discord/stores/StoreChannels;
 
     iget-object v2, p0, Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory$observeStoreState$2;->this$0:Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory;
 
-    invoke-virtual {v2}, Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory;->getChannelId()J
+    invoke-virtual {v2}, Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory;->getChannelId()Ljava/lang/Long;
+
+    move-result-object v2
+
+    invoke-virtual {v2}, Ljava/lang/Long;->longValue()J
 
     move-result-wide v2
 
@@ -152,6 +162,18 @@
 
     move-result-object v1
 
+    goto :goto_0
+
+    :cond_0
+    const/4 v1, 0x0
+
+    invoke-static {v1}, Lrx/Observable;->bq(Ljava/lang/Object;)Lrx/Observable;
+
+    move-result-object v1
+
+    :goto_0
+    if-eqz v0, :cond_1
+
     iget-object v2, p0, Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory$observeStoreState$2;->$storeVoiceChannelSelected:Lcom/discord/stores/StoreVoiceChannelSelected;
 
     invoke-virtual {v2}, Lcom/discord/stores/StoreVoiceChannelSelected;->get()Lrx/Observable;
@@ -164,22 +186,22 @@
 
     invoke-static {v1, v2, v3}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/functions/Func2;)Lrx/Observable;
 
-    move-result-object v1
+    move-result-object v2
 
-    new-instance v2, Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory$observeStoreState$2$$special$$inlined$let$lambda$1;
+    new-instance v3, Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory$observeStoreState$2$$special$$inlined$let$lambda$1;
 
-    invoke-direct {v2, p0, v0, p1}, Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory$observeStoreState$2$$special$$inlined$let$lambda$1;-><init>(Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory$observeStoreState$2;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelUser;)V
+    invoke-direct {v3, p0, v1, v0, p1}, Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory$observeStoreState$2$$special$$inlined$let$lambda$1;-><init>(Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory$observeStoreState$2;Lrx/Observable;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelUser;)V
 
-    check-cast v2, Lrx/functions/b;
+    check-cast v3, Lrx/functions/b;
 
-    invoke-virtual {v1, v2}, Lrx/Observable;->g(Lrx/functions/b;)Lrx/Observable;
+    invoke-virtual {v2, v3}, Lrx/Observable;->g(Lrx/functions/b;)Lrx/Observable;
 
     move-result-object p1
 
-    if-nez p1, :cond_1
+    if-nez p1, :cond_2
 
-    :cond_0
-    invoke-static {}, Lrx/Observable;->IS()Lrx/Observable;
+    :cond_1
+    invoke-static {}, Lrx/Observable;->IQ()Lrx/Observable;
 
     move-result-object p1
 
@@ -187,6 +209,6 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    :cond_1
+    :cond_2
     return-object p1
 .end method
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 830f40f7fd..5c60171d56 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field private final channelId:J
+.field private final channelId:Ljava/lang/Long;
 
 .field private final isVoiceContext:Z
 
@@ -23,16 +23,16 @@
 
 
 # direct methods
-.method public constructor <init>(JJZ)V
+.method public constructor <init>(JLjava/lang/Long;Z)V
     .locals 0
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-wide p1, p0, Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory;->userId:J
 
-    iput-wide p3, p0, Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory;->channelId:J
+    iput-object p3, p0, Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory;->channelId:Ljava/lang/Long;
 
-    iput-boolean p5, p0, Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory;->isVoiceContext:Z
+    iput-boolean p4, p0, Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory;->isVoiceContext:Z
 
     return-void
 .end method
@@ -74,61 +74,25 @@
 
     move-object/from16 v1, p7
 
-    if-eqz p4, :cond_0
+    const/4 v2, 0x1
 
-    invoke-virtual/range {p4 .. p4}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
+    const-string v3, "channel.guildId"
 
-    move-result-object v2
+    if-eqz p3, :cond_0
 
-    const-string v3, "mySelectedVoiceChannel.guildId"
+    invoke-virtual/range {p3 .. p3}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
 
-    invoke-static {v2, v3}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    move-result-object v4
 
-    invoke-virtual {v2}, Ljava/lang/Long;->longValue()J
+    invoke-static {v4, v3}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-result-wide v2
-
-    invoke-virtual/range {p4 .. p4}, Lcom/discord/models/domain/ModelChannel;->getId()J
+    invoke-virtual {v4}, Ljava/lang/Long;->longValue()J
 
     move-result-wide v4
 
-    move-object/from16 v6, p5
+    const/4 v6, 0x2
 
-    invoke-virtual {v6, v2, v3, v4, v5}, Lcom/discord/stores/StoreVoiceStates;->get(JJ)Lrx/Observable;
-
-    move-result-object v2
-
-    goto :goto_0
-
-    :cond_0
-    invoke-static {}, Lkotlin/a/ad;->emptyMap()Ljava/util/Map;
-
-    move-result-object v2
-
-    invoke-static {v2}, Lrx/Observable;->bq(Ljava/lang/Object;)Lrx/Observable;
-
-    move-result-object v2
-
-    const-string v3, "Observable.just(emptyMap())"
-
-    invoke-static {v2, v3}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    :goto_0
-    invoke-virtual/range {p3 .. p3}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
-
-    move-result-object v3
-
-    const-string v4, "channel.guildId"
-
-    invoke-static {v3, v4}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v3}, Ljava/lang/Long;->longValue()J
-
-    move-result-wide v5
-
-    const/4 v3, 0x2
-
-    new-array v3, v3, [Ljava/lang/Long;
+    new-array v6, v6, [Ljava/lang/Long;
 
     const/4 v7, 0x0
 
@@ -140,7 +104,7 @@
 
     move-result-object v8
 
-    aput-object v8, v3, v7
+    aput-object v8, v6, v7
 
     invoke-virtual {p2}, Lcom/discord/models/domain/ModelUser;->getId()J
 
@@ -150,51 +114,173 @@
 
     move-result-object v7
 
-    const/4 v8, 0x1
+    aput-object v7, v6, v2
 
-    aput-object v7, v3, v8
-
-    invoke-static {v3}, Lkotlin/a/m;->listOf([Ljava/lang/Object;)Ljava/util/List;
-
-    move-result-object v3
-
-    check-cast v3, Ljava/util/Collection;
-
-    invoke-virtual {v0, v5, v6, v3}, Lcom/discord/stores/StoreGuilds;->getComputed(JLjava/util/Collection;)Lrx/Observable;
-
-    move-result-object v3
-
-    invoke-virtual/range {p3 .. p3}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
-
-    move-result-object v5
-
-    invoke-static {v5, v4}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v5}, Ljava/lang/Long;->longValue()J
-
-    move-result-wide v5
-
-    invoke-virtual {v0, v5, v6}, Lcom/discord/stores/StoreGuilds;->getRoles(J)Lrx/Observable;
-
-    move-result-object v5
-
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getId()J
-
-    move-result-wide v6
-
-    invoke-virtual {v1, v6, v7}, Lcom/discord/stores/StoreMediaSettings;->getUserMuted(J)Lrx/Observable;
+    invoke-static {v6}, Lkotlin/a/m;->listOf([Ljava/lang/Object;)Ljava/util/List;
 
     move-result-object v6
 
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getId()J
+    check-cast v6, Ljava/util/Collection;
+
+    invoke-virtual {v0, v4, v5, v6}, Lcom/discord/stores/StoreGuilds;->getComputed(JLjava/util/Collection;)Lrx/Observable;
+
+    move-result-object v4
+
+    goto :goto_0
+
+    :cond_0
+    invoke-static {}, Lkotlin/a/ad;->emptyMap()Ljava/util/Map;
+
+    move-result-object v4
+
+    invoke-static {v4}, Lrx/Observable;->bq(Ljava/lang/Object;)Lrx/Observable;
+
+    move-result-object v4
+
+    :goto_0
+    const-string v5, "when {\n      (channel !=\u2026le.just(emptyMap())\n    }"
+
+    invoke-static {v4, v5}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    if-eqz p3, :cond_1
+
+    invoke-virtual/range {p3 .. p3}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
+
+    move-result-object v6
+
+    invoke-static {v6, v3}, 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;->getRoles(J)Lrx/Observable;
+
+    move-result-object v6
+
+    goto :goto_1
+
+    :cond_1
+    invoke-static {}, Lkotlin/a/ad;->emptyMap()Ljava/util/Map;
+
+    move-result-object v6
+
+    invoke-static {v6}, Lrx/Observable;->bq(Ljava/lang/Object;)Lrx/Observable;
+
+    move-result-object v6
+
+    :goto_1
+    invoke-static {v6, v5}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    if-eqz p4, :cond_2
+
+    invoke-virtual/range {p4 .. p4}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
+
+    move-result-object v5
+
+    const-string v7, "mySelectedVoiceChannel.guildId"
+
+    invoke-static {v5, v7}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v5}, Ljava/lang/Long;->longValue()J
+
+    move-result-wide v7
+
+    invoke-virtual/range {p4 .. p4}, Lcom/discord/models/domain/ModelChannel;->getId()J
 
     move-result-wide v9
 
-    invoke-virtual {v1, v9, v10}, Lcom/discord/stores/StoreMediaSettings;->getUserOutputVolume(J)Lrx/Observable;
+    move-object/from16 v5, p5
+
+    invoke-virtual {v5, v7, v8, v9, v10}, Lcom/discord/stores/StoreVoiceStates;->get(JJ)Lrx/Observable;
+
+    move-result-object v5
+
+    goto :goto_2
+
+    :cond_2
+    invoke-static {}, Lkotlin/a/ad;->emptyMap()Ljava/util/Map;
+
+    move-result-object v5
+
+    invoke-static {v5}, Lrx/Observable;->bq(Ljava/lang/Object;)Lrx/Observable;
+
+    move-result-object v5
+
+    const-string v7, "Observable.just(emptyMap())"
+
+    invoke-static {v5, v7}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    :goto_2
+    const/4 v7, 0x0
+
+    if-eqz p3, :cond_3
+
+    invoke-virtual/range {p3 .. p3}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
+
+    move-result-object v8
+
+    invoke-static {v8, v3}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v8}, Ljava/lang/Long;->longValue()J
+
+    move-result-wide v8
+
+    invoke-virtual {v0, v8, v9}, Lcom/discord/stores/StoreGuilds;->get(J)Lrx/Observable;
+
+    move-result-object v0
+
+    goto :goto_3
+
+    :cond_3
+    invoke-static {v7}, Lrx/Observable;->bq(Ljava/lang/Object;)Lrx/Observable;
+
+    move-result-object v0
+
+    :goto_3
+    if-eqz p3, :cond_4
+
+    invoke-virtual/range {p3 .. p3}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
+
+    move-result-object v7
+
+    invoke-static {v7, v3}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v7}, Ljava/lang/Long;->longValue()J
+
+    move-result-wide v7
+
+    move-object/from16 v3, p9
+
+    invoke-virtual {v3, v7, v8}, Lcom/discord/stores/StorePermissions;->getForGuild(J)Lrx/Observable;
+
+    move-result-object v3
+
+    goto :goto_4
+
+    :cond_4
+    invoke-static {v7}, Lrx/Observable;->bq(Ljava/lang/Object;)Lrx/Observable;
+
+    move-result-object v3
+
+    :goto_4
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getId()J
+
+    move-result-wide v7
+
+    invoke-virtual {v1, v7, v8}, Lcom/discord/stores/StoreMediaSettings;->getUserMuted(J)Lrx/Observable;
+
+    move-result-object v7
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getId()J
+
+    move-result-wide v8
+
+    invoke-virtual {v1, v8, v9}, Lcom/discord/stores/StoreMediaSettings;->getUserOutputVolume(J)Lrx/Observable;
 
     move-result-object v1
 
-    sget-object v7, Lcom/discord/widgets/user/presence/ModelRichPresence;->Companion:Lcom/discord/widgets/user/presence/ModelRichPresence$Companion;
+    sget-object v8, Lcom/discord/widgets/user/presence/ModelRichPresence;->Companion:Lcom/discord/widgets/user/presence/ModelRichPresence$Companion;
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getId()J
 
@@ -202,39 +288,9 @@
 
     move-object/from16 v11, p8
 
-    invoke-virtual {v7, v9, v10, v11}, Lcom/discord/widgets/user/presence/ModelRichPresence$Companion;->get(JLcom/discord/stores/StoreUserPresence;)Lrx/Observable;
+    invoke-virtual {v8, v9, v10, v11}, Lcom/discord/widgets/user/presence/ModelRichPresence$Companion;->get(JLcom/discord/stores/StoreUserPresence;)Lrx/Observable;
 
-    move-result-object v7
-
-    invoke-virtual/range {p3 .. p3}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
-
-    move-result-object v9
-
-    invoke-static {v9, v4}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v9}, Ljava/lang/Long;->longValue()J
-
-    move-result-wide v9
-
-    invoke-virtual {v0, v9, v10}, Lcom/discord/stores/StoreGuilds;->get(J)Lrx/Observable;
-
-    move-result-object v0
-
-    invoke-virtual/range {p3 .. p3}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
-
-    move-result-object v9
-
-    invoke-static {v9, v4}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v9}, Ljava/lang/Long;->longValue()J
-
-    move-result-wide v9
-
-    move-object/from16 v4, p9
-
-    invoke-virtual {v4, v9, v10}, Lcom/discord/stores/StorePermissions;->getForGuild(J)Lrx/Observable;
-
-    move-result-object v4
+    move-result-object v8
 
     sget-object v9, Lcom/discord/utilities/streams/StreamContext;->Companion:Lcom/discord/utilities/streams/StreamContext$Companion;
 
@@ -244,31 +300,31 @@
 
     move-object/from16 v12, p10
 
-    invoke-virtual {v9, v10, v11, v8, v12}, Lcom/discord/utilities/streams/StreamContext$Companion;->get(JZLcom/discord/stores/StoreApplicationStreaming;)Lrx/Observable;
+    invoke-virtual {v9, v10, v11, v2, v12}, Lcom/discord/utilities/streams/StreamContext$Companion;->get(JZLcom/discord/stores/StoreApplicationStreaming;)Lrx/Observable;
 
-    move-result-object v8
+    move-result-object v2
 
     sget-object v9, Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory$observeStoreChunk$1;->INSTANCE:Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory$observeStoreChunk$1;
 
     check-cast v9, Lrx/functions/Func9;
 
-    move-object p1, v3
+    move-object p1, v4
 
-    move-object p2, v5
+    move-object p2, v6
 
-    move-object/from16 p3, v2
+    move-object/from16 p3, v5
 
-    move-object/from16 p4, v6
+    move-object/from16 p4, v7
 
     move-object/from16 p5, v1
 
-    move-object/from16 p6, v7
+    move-object/from16 p6, v8
 
     move-object/from16 p7, v0
 
-    move-object/from16 p8, v4
+    move-object/from16 p8, v3
 
-    move-object/from16 p9, v8
+    move-object/from16 p9, v2
 
     move-object/from16 p10, v9
 
@@ -394,7 +450,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -410,7 +466,7 @@
 .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;Lcom/discord/stores/StoreUserNotes;Lrx/Scheduler;)Lrx/Observable;
-    .locals 12
+    .locals 14
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -435,13 +491,59 @@
         }
     .end annotation
 
+    move-object/from16 v12, p3
+
+    if-eqz v12, :cond_0
+
+    invoke-virtual/range {p3 .. p3}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
+
+    move-result-object v0
+
+    const-string v1, "channel.guildId"
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
+
+    move-result-wide v0
+
+    invoke-virtual/range {p3 .. p3}, Lcom/discord/models/domain/ModelChannel;->getId()J
+
+    move-result-wide v2
+
+    move-object/from16 v5, p7
+
+    invoke-virtual {v5, v0, v1, v2, v3}, Lcom/discord/stores/StoreVoiceStates;->get(JJ)Lrx/Observable;
+
+    move-result-object v0
+
+    goto :goto_0
+
+    :cond_0
+    move-object/from16 v5, p7
+
+    invoke-static {}, Lkotlin/a/ad;->emptyMap()Ljava/util/Map;
+
+    move-result-object v0
+
+    invoke-static {v0}, Lrx/Observable;->bq(Ljava/lang/Object;)Lrx/Observable;
+
+    move-result-object v0
+
+    const-string v1, "Observable.just(emptyMap())"
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    :goto_0
+    move-object v13, v0
+
     move-object v0, p0
 
     move-object v1, p1
 
-    move-object v2, p2
+    move-object/from16 v2, p2
 
-    move-object v3, p3
+    move-object/from16 v3, p3
 
     move-object/from16 v4, p4
 
@@ -483,61 +585,37 @@
 
     move-result-object v2
 
-    invoke-virtual {p3}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
-
-    move-result-object v3
-
-    const-string v4, "channel.guildId"
-
-    invoke-static {v3, v4}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v3}, Ljava/lang/Long;->longValue()J
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getId()J
 
     move-result-wide v3
 
-    invoke-virtual {p3}, Lcom/discord/models/domain/ModelChannel;->getId()J
+    move-object/from16 v5, p13
 
-    move-result-wide v5
-
-    move-object/from16 v7, p7
-
-    invoke-virtual {v7, v3, v4, v5, v6}, Lcom/discord/stores/StoreVoiceStates;->get(JJ)Lrx/Observable;
+    invoke-virtual {v5, v3, v4}, Lcom/discord/stores/StoreUserNotes;->getForUserId(J)Lrx/Observable;
 
     move-result-object v3
 
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getId()J
+    new-instance v4, Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory$observeStoreStateFromUsersAndChannels$1;
 
-    move-result-wide v4
+    move-object v5, p1
 
-    move-object/from16 v6, p13
+    move-object/from16 v6, p2
 
-    invoke-virtual {v6, v4, v5}, Lcom/discord/stores/StoreUserNotes;->getForUserId(J)Lrx/Observable;
+    invoke-direct {v4, p1, v6, v12}, 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
-
-    new-instance v5, Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory$observeStoreStateFromUsersAndChannels$1;
-
-    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;
+    check-cast v4, Lrx/functions/Func5;
 
     move-object p1, v0
 
-    move-object p2, v1
+    move-object/from16 p2, v1
 
-    move-object p3, v2
+    move-object/from16 p3, v2
 
-    move-object/from16 p4, v3
+    move-object/from16 p4, v13
 
-    move-object/from16 p5, v4
+    move-object/from16 p5, v3
 
-    move-object/from16 p6, v5
+    move-object/from16 p6, v4
 
     invoke-static/range {p1 .. p6}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func5;)Lrx/Observable;
 
@@ -553,7 +631,7 @@
 
 # virtual methods
 .method public final create(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
-    .locals 27
+    .locals 26
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "<T:",
@@ -576,9 +654,9 @@
 
     iget-wide v12, v14, Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory;->userId:J
 
-    iget-wide v10, v14, Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory;->channelId:J
+    iget-object v11, v14, Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory;->channelId:Ljava/lang/Long;
 
-    iget-boolean v9, v14, Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory;->isVoiceContext:Z
+    iget-boolean v10, v14, Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory;->isVoiceContext:Z
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -650,87 +728,85 @@
 
     invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getPresences()Lcom/discord/stores/StoreUserPresence;
 
-    move-result-object v19
+    move-result-object v9
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
     invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getPermissions()Lcom/discord/stores/StorePermissions;
 
-    move-result-object v20
+    move-result-object v19
 
     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 v21
+    move-result-object v20
 
     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
+    move-result-object v21
 
-    invoke-static {}, Lrx/d/a;->Kw()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Ku()Lrx/Scheduler;
 
     move-result-object v0
 
-    move/from16 p1, v9
+    move/from16 p1, v10
 
-    const-string v9, "Schedulers.computation()"
+    const-string v10, "Schedulers.computation()"
 
-    invoke-static {v0, v9}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v10}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-object/from16 v23, v0
+    move-object/from16 v22, v0
 
     move-object/from16 v0, p0
 
-    move/from16 v24, p1
+    move/from16 v23, p1
 
-    move-object/from16 v9, v19
+    move-object/from16 v10, v19
 
-    move-wide/from16 v25, v10
+    move-object/from16 v19, v11
 
-    move-object/from16 v10, v20
+    move-object/from16 v11, v20
 
-    move-object/from16 v11, v21
+    move-wide/from16 v24, v12
 
-    move-wide/from16 v19, v12
+    move-object/from16 v12, v21
 
-    move-object/from16 v12, v22
-
-    move-object/from16 v13, v23
+    move-object/from16 v13, v22
 
     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-result-object v9
 
     move-object v1, v15
 
-    move-wide/from16 v2, v19
+    move-wide/from16 v2, v24
 
-    move-wide/from16 v4, v25
+    move-object/from16 v4, v19
 
-    move/from16 v6, v24
+    move/from16 v5, v23
 
-    move-object/from16 v7, v16
+    move-object/from16 v6, v16
 
-    move-object/from16 v8, v17
+    move-object/from16 v7, v17
 
-    move-object/from16 v9, v18
+    move-object/from16 v8, v18
 
-    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
+    invoke-direct/range {v1 .. v9}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;-><init>(JLjava/lang/Long;ZLcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreChannels;Lcom/discord/utilities/rest/RestAPI;Lrx/Observable;)V
 
     check-cast v15, Landroidx/lifecycle/ViewModel;
 
     return-object v15
 .end method
 
-.method public final getChannelId()J
-    .locals 2
+.method public final getChannelId()Ljava/lang/Long;
+    .locals 1
 
-    iget-wide v0, p0, Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory;->channelId:J
+    iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory;->channelId:Ljava/lang/Long;
 
-    return-wide v0
+    return-object v0
 .end method
 
 .method public final getUserId()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 4d07d124c4..b5133da77c 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, 0x7f120acb
+    const v0, 0x7f120a95
 
     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 c5781cd57b..edf4c69cee 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 8ab2ae4dac..a56e251a4f 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, 0x7f0a036d
+    const v0, 0x7f0a0368
 
     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, 0x7f0d0135
+    const v0, 0x7f0d0133
 
     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, 0x7f0a0468
+    const v0, 0x7f0a0463
 
     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 654bb9f739..73603479b5 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, 0x7f0a0389
+    const p2, 0x7f0a0384
 
     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, 0x7f0a0388
+    const p2, 0x7f0a0383
 
     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, 0x7f0a038f
+    const p2, 0x7f0a038a
 
     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, 0x7f0a0390
+    const p2, 0x7f0a038b
 
     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, 0x7f0a038c
+    const p2, 0x7f0a0387
 
     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, 0x7f0a0391
+    const p2, 0x7f0a038c
 
     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, 0x7f0a038b
+    const p2, 0x7f0a0386
 
     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;->fj()V
+    invoke-virtual {v2}, Lcom/discord/views/ServerFolderView;->fh()V
 
     :goto_4
     if-eqz v11, :cond_5
@@ -386,7 +386,7 @@
 
     move-result-object v7
 
-    const v8, 0x7f06002d
+    const v8, 0x7f06002c
 
     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;->fj()V
+    invoke-virtual {v2}, Lcom/discord/views/ServerFolderView;->fh()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;->CZ:I
+    iget v12, v4, Lcom/discord/views/GuildView;->Dc:I
 
     const/4 v14, -0x1
 
     if-eq v12, v14, :cond_c
 
-    iget v12, v4, Lcom/discord/views/GuildView;->CZ:I
+    iget v12, v4, Lcom/discord/views/GuildView;->Dc:I
 
     goto :goto_b
 
@@ -803,7 +803,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f080159
+    const v2, 0x7f080155
 
     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 7c2d86788d..f6faab85bd 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, 0x7f0a038d
+    const p2, 0x7f0a0388
 
     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, 0x7f0a038e
+    const p2, 0x7f0a0389
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -136,12 +136,12 @@
 
     if-eqz p1, :cond_0
 
-    const p1, 0x7f080158
+    const p1, 0x7f080154
 
     goto :goto_0
 
     :cond_0
-    const p1, 0x7f08010a
+    const p1, 0x7f080106
 
     :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 5362e42a92..40db371d32 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, 0x7f0a0385
+    const p2, 0x7f0a0380
 
     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, 0x7f0a0383
+    const p2, 0x7f0a037e
 
     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, 0x7f0a0384
+    const p2, 0x7f0a037f
 
     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, 0x7f0a038c
+    const p2, 0x7f0a0387
 
     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, 0x7f0a0391
+    const p2, 0x7f0a038c
 
     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, 0x7f0a0390
+    const p2, 0x7f0a038b
 
     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, 0x7f0a038f
+    const p2, 0x7f0a038a
 
     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, 0x7f080071
+    const v3, 0x7f080070
 
     invoke-virtual {v1, v3}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->R(I)V
 
@@ -658,12 +658,12 @@
 
     if-eqz p1, :cond_1
 
-    const p1, 0x7f08015a
+    const p1, 0x7f080156
 
     goto :goto_1
 
     :cond_1
-    const p1, 0x7f080111
+    const p1, 0x7f08010d
 
     :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 235defccb5..94cd2da20c 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, 0x7f0a0386
+    const p2, 0x7f0a0381
 
     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, 0x7f0a0387
+    const p2, 0x7f0a0382
 
     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 60fbd09d03..0e9ce4dc7e 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, 0x7f120bd8
+    const v2, 0x7f120ba2
 
     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 f47f93b572..f17fc03fb5 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 69f187d5c0..6e2335bb75 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 ada534edfc..5290198c42 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 cd6d7932b0..7c5204c280 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 c3cb933906..e791b669af 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 f1eb9d5ea0..2b6c912d0a 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 adbf0fafd0..0abf939f6b 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, 0x7f0d013e
+    const p1, 0x7f0d013c
 
     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, 0x7f0d0140
+    const p1, 0x7f0d013e
 
     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, 0x7f0d0141
+    const p1, 0x7f0d013f
 
     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, 0x7f0d0142
+    const p2, 0x7f0d0140
 
     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, 0x7f060081
+    const v0, 0x7f060080
 
     invoke-static {p2, v0}, Landroidx/core/content/ContextCompat;->getColor(Landroid/content/Context;I)I
 
@@ -581,7 +581,7 @@
 
     move-result-object p1
 
-    const p2, 0x7f0600cd
+    const p2, 0x7f0600cc
 
     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, 0x7f0d013d
+    const p1, 0x7f0d013b
 
     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, 0x7f0d013b
+    const p1, 0x7f0d0139
 
     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, 0x7f0d0143
+    const p1, 0x7f0d0141
 
     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 25be4d7262..6b3d836c8d 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 685cfd9f78..4055a664f9 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 000d0b105b..54e07a0525 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 0442850526..eb49c9be9a 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, 0x7f0a05cd
+    const v0, 0x7f0a05b4
 
     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, 0x7f0a05c7
+    const v0, 0x7f0a05ae
 
     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, 0x7f0a05c3
+    const v0, 0x7f0a05aa
 
     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, 0x7f0a0376
+    const v0, 0x7f0a0371
 
     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, 0x7f0d0137
+    const v0, 0x7f0d0135
 
     return v0
 .end method
@@ -408,7 +408,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -482,7 +482,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f120e87
+    const v0, 0x7f120e42
 
     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 f39aa28a3e..85b03beb11 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, 0x7f0d0138
+    const v0, 0x7f0d0136
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
-    const p1, 0x7f0a0374
+    const p1, 0x7f0a036f
 
     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, 0x7f0a0375
+    const p1, 0x7f0a0370
 
     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 078548762d..3645189dba 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 32abaf5dc5..bc76c16878 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 e788344b92..ae42995e98 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 286b0ed4e2..5e458582a2 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 7b0840c134..98dc70fb1f 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 2d54721e82..dbd15b5974 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 b427dfbe62..478ac53631 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, 0x7f0a036e
+    const v0, 0x7f0a0369
 
     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, 0x7f0a0370
+    const v0, 0x7f0a036b
 
     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, 0x7f080159
+    const v3, 0x7f080155
 
     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, 0x7f08015b
+    const v4, 0x7f080157
 
     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, 0x7f080133
+    const v5, 0x7f08012f
 
     invoke-static {v4, v5}, Landroidx/core/content/ContextCompat;->getDrawable(Landroid/content/Context;I)Landroid/graphics/drawable/Drawable;
 
@@ -702,7 +702,7 @@
 
     aput-object v2, v1, v3
 
-    const v2, 0x7f100090
+    const v2, 0x7f10008e
 
     invoke-virtual {v0, v2, p1, v1}, Landroid/content/res/Resources;->getQuantityString(II[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -732,7 +732,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d013a
+    const v0, 0x7f0d0138
 
     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 d565913d53..9be750c8f5 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 92a1fcbb94..e37e2ec29e 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 46f01e3483..db3462d484 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;->Kz()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kx()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;->KA()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->Ky()Lrx/subjects/PublishSubject;
 
     move-result-object v0
 
@@ -91,7 +91,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -99,7 +99,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/android/b/a;->Jc()Lrx/Scheduler;
+    invoke-static {}, Lrx/android/b/a;->Ja()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;->bhT:Lkotlin/f/c$b;
+    sget-object v7, Lkotlin/f/c;->bhO: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 750b34d596..c0562e3ef9 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 ff131338af..83b9a7ce62 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 1d169fea7b..db3ba16392 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 99075eab82..12e57acacc 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 c10fda165c..0a955ac36e 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -116,7 +116,7 @@
     return-void
 
     :cond_1
-    sget-object v1, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
+    sget-object v1, Lcom/discord/app/AppLog;->vn: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 39f8c1c803..2dd29d1f99 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 ee72eb2791..fd03baccb7 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 cfe702b0e9..951dc354e0 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 0c254c51c2..92dc6b3a98 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 157517b035..cf8dc99b27 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 e8619fce14..369d9ab536 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, 0x7f120ca6
+    const v4, 0x7f120c6f
 
     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 8207ef2067..f28e9e83b7 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, 0x7f0a036f
+    const v0, 0x7f0a036a
 
     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, 0x7f0a0426
+    const v0, 0x7f0a0421
 
     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, 0x7f0a0433
+    const v0, 0x7f0a042e
 
     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;->KA()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->Ky()Lrx/subjects/PublishSubject;
 
     move-result-object v0
 
@@ -678,7 +678,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0146
+    const v0, 0x7f0d0144
 
     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;->Bc:Lcom/discord/samsung/a;
+    sget-object p1, Lcom/discord/samsung/a;->Bf:Lcom/discord/samsung/a;
 
-    invoke-static {}, Lcom/discord/samsung/a;->eK()Z
+    invoke-static {}, Lcom/discord/samsung/a;->eJ()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 d97d248e18..d4963eb83f 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, 0x7f0a0430
+    const v0, 0x7f0a042b
 
     const/4 v2, 0x0
 
     if-eq p1, v0, :cond_2
 
-    const v0, 0x7f0a0432
+    const v0, 0x7f0a042d
 
     if-eq p1, v0, :cond_1
 
diff --git a/com.discord/smali/com/discord/widgets/main/WidgetMainHeaderManager$configure$$inlined$apply$lambda$1.smali b/com.discord/smali/com/discord/widgets/main/WidgetMainHeaderManager$configure$$inlined$apply$lambda$1.smali
index 7c14200fde..9b454aaa9b 100644
--- a/com.discord/smali/com/discord/widgets/main/WidgetMainHeaderManager$configure$$inlined$apply$lambda$1.smali
+++ b/com.discord/smali/com/discord/widgets/main/WidgetMainHeaderManager$configure$$inlined$apply$lambda$1.smali
@@ -43,7 +43,7 @@
 
 # virtual methods
 .method public final onClick(Landroid/view/View;)V
-    .locals 4
+    .locals 10
 
     iget-object v0, p0, Lcom/discord/widgets/main/WidgetMainHeaderManager$configure$$inlined$apply$lambda$1;->$this_apply:Lcom/discord/widgets/main/WidgetMainModel;
 
@@ -57,40 +57,55 @@
 
     if-eq v0, p1, :cond_0
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lcom/discord/widgets/main/WidgetMainHeaderManager$configure$$inlined$apply$lambda$1;->$main$inlined:Lcom/discord/widgets/main/WidgetMain;
+    sget-object v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->Companion:Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;
 
-    invoke-virtual {p1}, Lcom/discord/widgets/main/WidgetMain;->getContext()Landroid/content/Context;
+    iget-object p1, p0, Lcom/discord/widgets/main/WidgetMainHeaderManager$configure$$inlined$apply$lambda$1;->$this_apply:Lcom/discord/widgets/main/WidgetMainModel;
+
+    invoke-virtual {p1}, Lcom/discord/widgets/main/WidgetMainModel;->getChannel()Lcom/discord/models/domain/ModelChannel;
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/discord/widgets/main/WidgetMainHeaderManager$configure$$inlined$apply$lambda$1;->$this_apply:Lcom/discord/widgets/main/WidgetMainModel;
+    if-nez p1, :cond_1
 
-    invoke-virtual {v0}, Lcom/discord/widgets/main/WidgetMainModel;->getChannel()Lcom/discord/models/domain/ModelChannel;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_1
-
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelChannel;->getDMRecipient()Lcom/discord/models/domain/ModelUser;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_1
-
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->getId()J
-
-    move-result-wide v0
-
-    goto :goto_0
+    invoke-static {}, Lkotlin/jvm/internal/l;->throwNpe()V
 
     :cond_1
-    const-wide/16 v0, 0x0
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getDMRecipient()Lcom/discord/models/domain/ModelUser;
 
-    :goto_0
-    invoke-static {p1, v0, v1}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->launch(Landroid/content/Context;J)V
+    move-result-object p1
+
+    const-string v0, "channel!!.dmRecipient"
+
+    invoke-static {p1, v0}, 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 v2
+
+    const/4 v4, 0x0
+
+    iget-object p1, p0, Lcom/discord/widgets/main/WidgetMainHeaderManager$configure$$inlined$apply$lambda$1;->$main$inlined:Lcom/discord/widgets/main/WidgetMain;
+
+    invoke-virtual {p1}, Lcom/discord/widgets/main/WidgetMain;->requireFragmentManager()Landroidx/fragment/app/FragmentManager;
+
+    move-result-object v5
+
+    const-string p1, "main.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, 0x1a
+
+    const/4 v9, 0x0
+
+    invoke-static/range {v1 .. v9}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;->show$default(Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;JLjava/lang/Long;Landroidx/fragment/app/FragmentManager;Ljava/lang/Long;Ljava/lang/Boolean;ILjava/lang/Object;)V
 
     return-void
 
@@ -124,6 +139,6 @@
     invoke-virtual {v2, v0, v1, p1}, Lcom/discord/widgets/channels/WidgetTextChannelSettings$Companion;->launch(JLandroid/content/Context;)V
 
     :cond_3
-    :goto_1
+    :goto_0
     return-void
 .end method
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 411550a36a..fc804a3339 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, 0x7f0a045a
+    const v2, 0x7f0a0455
 
     const/4 v3, 0x1
 
@@ -65,7 +65,7 @@
 
     if-ne v0, v4, :cond_0
 
-    const v0, 0x7f0a0451
+    const v0, 0x7f0a044c
 
     invoke-interface {p1, v0}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
 
@@ -108,7 +108,7 @@
 
     if-nez v0, :cond_1
 
-    const v0, 0x7f0a0456
+    const v0, 0x7f0a0451
 
     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, 0x7f0a0457
+    const v5, 0x7f0a0452
 
     const/16 v6, 0x8
 
@@ -147,7 +147,7 @@
     goto :goto_1
 
     :cond_2
-    const v0, 0x7f0a0454
+    const v0, 0x7f0a044f
 
     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, 0x7f0a0455
+    const v0, 0x7f0a0450
 
     invoke-interface {p1, v0}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
 
@@ -174,7 +174,7 @@
     goto :goto_1
 
     :cond_3
-    const v0, 0x7f0a0453
+    const v0, 0x7f0a044e
 
     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, 0x7f0a0452
+    const v0, 0x7f0a044d
 
     invoke-interface {p1, v0}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
 
@@ -209,7 +209,7 @@
     goto :goto_1
 
     :cond_4
-    const v0, 0x7f0a044e
+    const v0, 0x7f0a0449
 
     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, 0x7f0a044d
+    const v0, 0x7f0a0448
 
     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, 0x7f0a0458
+    const v0, 0x7f0a0453
 
     invoke-interface {p1, v0}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
 
@@ -331,7 +331,7 @@
     const/4 v0, 0x0
 
     :goto_2
-    const v2, 0x7f0a0459
+    const v2, 0x7f0a0454
 
     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, 0x7f0a045b
+    const v2, 0x7f0a0456
 
     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, 0x7f0a045c
+    const v0, 0x7f0a0457
 
     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 e73c1432f8..2168a57fb0 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
@@ -163,7 +163,7 @@
 
 # virtual methods
 .method public final call(Landroid/view/MenuItem;Landroid/content/Context;)V
-    .locals 11
+    .locals 13
 
     const-string v0, "menuItem"
 
@@ -204,7 +204,7 @@
     packed-switch p1, :pswitch_data_0
 
     :pswitch_0
-    goto/16 :goto_1
+    goto/16 :goto_0
 
     :pswitch_1
     sget-object p1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
@@ -215,7 +215,7 @@
 
     invoke-virtual {p1}, Lcom/discord/stores/StoreVoiceChannelSelected;->clear()V
 
-    goto/16 :goto_1
+    goto/16 :goto_0
 
     :pswitch_2
     iget-object p1, p0, Lcom/discord/widgets/main/WidgetMainHeaderManager$getOnSelectedAction$1;->$this_getOnSelectedAction:Lcom/discord/widgets/main/WidgetMainModel;
@@ -226,12 +226,12 @@
 
     invoke-virtual {v0, p1, p2}, Lcom/discord/widgets/user/calls/PrivateCallLauncher;->launchVideoCall(J)V
 
-    goto/16 :goto_1
+    goto/16 :goto_0
 
     :pswitch_3
     invoke-direct {p0, p2}, Lcom/discord/widgets/main/WidgetMainHeaderManager$getOnSelectedAction$1;->launchForStartGround(Landroid/content/Context;)V
 
-    goto/16 :goto_1
+    goto/16 :goto_0
 
     :pswitch_4
     iget-object p1, p0, Lcom/discord/widgets/main/WidgetMainHeaderManager$getOnSelectedAction$1;->$this_getOnSelectedAction:Lcom/discord/widgets/main/WidgetMainModel;
@@ -242,7 +242,7 @@
 
     invoke-virtual {v0, p1, p2}, Lcom/discord/widgets/user/calls/PrivateCallLauncher;->launchVoiceCall(J)V
 
-    goto/16 :goto_1
+    goto/16 :goto_0
 
     :pswitch_5
     iget-object p1, p0, Lcom/discord/widgets/main/WidgetMainHeaderManager$getOnSelectedAction$1;->$drawerLayout:Lcom/discord/widgets/main/WidgetMainDrawerLayout;
@@ -251,12 +251,12 @@
 
     invoke-virtual {p1, p2}, Lcom/discord/widgets/main/WidgetMainDrawerLayout;->openDrawer(I)V
 
-    goto/16 :goto_1
+    goto/16 :goto_0
 
     :pswitch_6
     invoke-direct {p0, p2}, Lcom/discord/widgets/main/WidgetMainHeaderManager$getOnSelectedAction$1;->launchForSearch(Landroid/content/Context;)V
 
-    goto/16 :goto_1
+    goto/16 :goto_0
 
     :pswitch_7
     iget-object p1, p0, Lcom/discord/widgets/main/WidgetMainHeaderManager$getOnSelectedAction$1;->$this_getOnSelectedAction:Lcom/discord/widgets/main/WidgetMainModel;
@@ -267,7 +267,7 @@
 
     invoke-static {p2, v2, v3}, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages;->show(Landroid/content/Context;J)V
 
-    goto :goto_1
+    goto/16 :goto_0
 
     :pswitch_8
     iget-object p1, p0, Lcom/discord/widgets/main/WidgetMainHeaderManager$getOnSelectedAction$1;->$this_getOnSelectedAction:Lcom/discord/widgets/main/WidgetMainModel;
@@ -278,7 +278,7 @@
 
     invoke-static {v2, v3, p2}, Lcom/discord/widgets/channels/WidgetChannelGroupDMSettings;->create(JLandroid/content/Context;)V
 
-    goto :goto_1
+    goto :goto_0
 
     :pswitch_9
     sget-object p1, Lcom/discord/widgets/channels/WidgetGroupInviteFriends;->Companion:Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Companion;
@@ -291,36 +291,57 @@
 
     invoke-virtual {p1, p2, v2, v3}, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$Companion;->launch(Landroid/content/Context;J)V
 
-    goto :goto_1
-
-    :pswitch_a
-    iget-object p1, p0, Lcom/discord/widgets/main/WidgetMainHeaderManager$getOnSelectedAction$1;->$this_getOnSelectedAction:Lcom/discord/widgets/main/WidgetMainModel;
-
-    invoke-virtual {p1}, Lcom/discord/widgets/main/WidgetMainModel;->getChannel()Lcom/discord/models/domain/ModelChannel;
-
-    move-result-object p1
-
-    if-eqz p1, :cond_0
-
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getDMRecipient()Lcom/discord/models/domain/ModelUser;
-
-    move-result-object p1
-
-    if-eqz p1, :cond_0
-
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getId()J
-
-    move-result-wide v2
-
     goto :goto_0
 
+    :pswitch_a
+    sget-object p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->Companion:Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;
+
+    iget-object p2, p0, Lcom/discord/widgets/main/WidgetMainHeaderManager$getOnSelectedAction$1;->$this_getOnSelectedAction:Lcom/discord/widgets/main/WidgetMainModel;
+
+    invoke-virtual {p2}, Lcom/discord/widgets/main/WidgetMainModel;->getChannel()Lcom/discord/models/domain/ModelChannel;
+
+    move-result-object p2
+
+    if-nez p2, :cond_0
+
+    invoke-static {}, Lkotlin/jvm/internal/l;->throwNpe()V
+
     :cond_0
-    const-wide/16 v2, 0x0
+    invoke-virtual {p2}, Lcom/discord/models/domain/ModelChannel;->getDMRecipient()Lcom/discord/models/domain/ModelUser;
 
-    :goto_0
-    invoke-static {p2, v2, v3}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->launch(Landroid/content/Context;J)V
+    move-result-object p2
 
-    goto :goto_1
+    const-string v0, "channel!!.dmRecipient"
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p2}, Lcom/discord/models/domain/ModelUser;->getId()J
+
+    move-result-wide v5
+
+    const/4 v7, 0x0
+
+    iget-object p2, p0, Lcom/discord/widgets/main/WidgetMainHeaderManager$getOnSelectedAction$1;->$appFragment:Lcom/discord/app/AppFragment;
+
+    invoke-virtual {p2}, Lcom/discord/app/AppFragment;->requireFragmentManager()Landroidx/fragment/app/FragmentManager;
+
+    move-result-object v8
+
+    invoke-static {v8, v4}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v9, 0x0
+
+    const/4 v10, 0x0
+
+    const/16 v11, 0x1a
+
+    const/4 v12, 0x0
+
+    move-object v4, p1
+
+    invoke-static/range {v4 .. v12}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;->show$default(Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;JLjava/lang/Long;Landroidx/fragment/app/FragmentManager;Ljava/lang/Long;Ljava/lang/Boolean;ILjava/lang/Object;)V
+
+    goto :goto_0
 
     :pswitch_b
     sget-object p1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
@@ -337,7 +358,7 @@
 
     invoke-virtual {p1, p2, v2, v3}, Lcom/discord/stores/StoreChannels;->delete(Landroid/content/Context;J)V
 
-    goto :goto_1
+    goto :goto_0
 
     :pswitch_c
     sget-object p1, Lcom/discord/widgets/friends/WidgetFriendsAdd;->Companion:Lcom/discord/widgets/friends/WidgetFriendsAdd$Companion;
@@ -346,7 +367,7 @@
 
     invoke-static {p1, p2, v1, v0, v1}, Lcom/discord/widgets/friends/WidgetFriendsAdd$Companion;->show$default(Lcom/discord/widgets/friends/WidgetFriendsAdd$Companion;Landroid/content/Context;Ljava/lang/String;ILjava/lang/Object;)V
 
-    goto :goto_1
+    goto :goto_0
 
     :pswitch_d
     sget-object p1, Lcom/discord/widgets/channels/WidgetTextChannelSettings;->Companion:Lcom/discord/widgets/channels/WidgetTextChannelSettings$Companion;
@@ -359,7 +380,7 @@
 
     invoke-virtual {p1, v2, v3, p2}, Lcom/discord/widgets/channels/WidgetTextChannelSettings$Companion;->launch(JLandroid/content/Context;)V
 
-    goto :goto_1
+    goto :goto_0
 
     :pswitch_e
     sget-object v4, Lcom/discord/widgets/channels/WidgetChannelNotificationSettings;->Companion:Lcom/discord/widgets/channels/WidgetChannelNotificationSettings$Companion;
@@ -380,7 +401,7 @@
 
     invoke-static/range {v4 .. v10}, Lcom/discord/widgets/channels/WidgetChannelNotificationSettings$Companion;->launch$default(Lcom/discord/widgets/channels/WidgetChannelNotificationSettings$Companion;Landroid/content/Context;JZILjava/lang/Object;)V
 
-    :goto_1
+    :goto_0
     iget-object p1, p0, Lcom/discord/widgets/main/WidgetMainHeaderManager$getOnSelectedAction$1;->$appFragment:Lcom/discord/app/AppFragment;
 
     invoke-virtual {p1}, Lcom/discord/app/AppFragment;->getActivity()Landroidx/fragment/app/FragmentActivity;
@@ -398,7 +419,7 @@
     return-void
 
     :pswitch_data_0
-    .packed-switch 0x7f0a044d
+    .packed-switch 0x7f0a0448
         :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 cd29640d36..547cf5455c 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, 0x7f0402ab
+    const v1, 0x7f0402aa
 
     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, 0x7f1203ef
+    const p1, 0x7f1203ca
 
     invoke-virtual {p2, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -197,7 +197,7 @@
     goto :goto_0
 
     :cond_5
-    const p1, 0x7f1206df
+    const p1, 0x7f1206ba
 
     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 4f0d241241..22496d957a 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 f31d88569b..0a2d81ca75 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 db7c017e6f..44ced36ef3 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, 0x7f0a0431
+    const v0, 0x7f0a042c
 
     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, 0x7f0a0428
+    const v0, 0x7f0a0423
 
     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 374e38cd3d..8e92ec1027 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, 0x7f0a0429
+    const v0, 0x7f0a0424
 
     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, 0x7f0a042b
+    const v0, 0x7f0a0426
 
     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, 0x7f0a042a
+    const v0, 0x7f0a0425
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -108,7 +108,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f1203ef
+    const v1, 0x7f1203ca
 
     invoke-virtual {v0, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -127,7 +127,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f1203ee
+    const v1, 0x7f1203c9
 
     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 c0e73fa336..ace998b0d3 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, 0x7f0a042c
+    const p2, 0x7f0a0427
 
     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, 0x7f0a086d
+    const v1, 0x7f0a0832
 
     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, 0x7f0a042e
+    const v0, 0x7f0a0429
 
     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, 0x7f0a042f
+    const v0, 0x7f0a042a
 
     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 37157b1c36..2c01562c36 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, 0x7f120ca8
+    const p2, 0x7f120c71
 
     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 fba81d02a1..77a3befda7 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, 0x7f0a082b
+    const v0, 0x7f0a07f1
 
     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, 0x7f0a082c
+    const v0, 0x7f0a07f2
 
     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, 0x7f0a082a
+    const v0, 0x7f0a07f0
 
     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, 0x7f0a0829
+    const v0, 0x7f0a07ef
 
     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, 0x7f0d0084
+    const v0, 0x7f0d0083
 
     return v0
 .end method
@@ -389,7 +389,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f120ca7
+    const v3, 0x7f120c70
 
     invoke-virtual {p0, v3}, Lcom/discord/widgets/main/WidgetMainSurveyDialog;->getString(I)Ljava/lang/String;
 
@@ -411,7 +411,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f120c70
+    const v2, 0x7f120c39
 
     invoke-virtual {p0, v2}, Lcom/discord/widgets/main/WidgetMainSurveyDialog;->getString(I)Ljava/lang/String;
 
@@ -437,7 +437,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f120d13
+    const v2, 0x7f120cdc
 
     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 59617a1c86..949af46705 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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, 0x7f120575
+    const v2, 0x7f120550
 
     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 99ed63c92c..da8bc66504 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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, 0x7f120574
+    const v1, 0x7f12054f
 
     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 362e683f52..330eb15b23 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 0x7f0a046b
+    .packed-switch 0x7f0a0466
         :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 de41b41592..7a882c78f5 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 ebf0d7c3a8..fc625683c1 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, 0x7f0a0440
+    const v0, 0x7f0a043b
 
     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, 0x7f0a0441
+    const v0, 0x7f0a043c
 
     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, 0x7f0d0154
+    const v0, 0x7f0d0152
 
     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, 0x7f1213ef
+    const v4, 0x7f121363
 
     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;->Oo:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sget-object v1, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Ok: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 87d59f2bf9..75b6750019 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 7a3f9b9757..6d689b7c66 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 bc8a800a09..a465cd139e 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 264b9caed9..e30c508c5a 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 210d39ccf6..816f5ccecf 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 bc8654c398..6950d78400 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 9c656a631d..d1a5da9931 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, 0x7f0a04ab
+    const v8, 0x7f0a049e
 
     invoke-static {v8}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -442,7 +442,7 @@
 
     aput-object v8, v1, v9
 
-    const v8, 0x7f0a04a6
+    const v8, 0x7f0a0499
 
     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 24cc2ec668..a38a5ebfab 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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, 0x7f0a082d
+    const v2, 0x7f0a07f3
 
     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 e563d16aec..e3c139d74c 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 c97a332a67..8a60fec665 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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, 0x7f0a082d
+    const v0, 0x7f0a07f3
 
     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 793078a0bc..3a24725bad 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, 0x7f0a04ab
+    const v4, 0x7f0a049e
 
     invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -424,7 +424,7 @@
 
     if-eqz v3, :cond_0
 
-    const v2, 0x7f0a04a6
+    const v2, 0x7f0a0499
 
     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, 0x7f0d0091
+    const v1, 0x7f0d008f
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v14
 
-    const v1, 0x7f120446
+    const v1, 0x7f120421
 
     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 992d041812..2b30d7e261 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 0b54920838..a781ad3955 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 = 0x7f0a04a6
+.field public static final CANCEL_BUTTON:I = 0x7f0a0499
 
 .field public static final Companion:Lcom/discord/widgets/notice/WidgetNoticeDialog$Companion;
 
-.field public static final OK_BUTTON:I = 0x7f0a04ab
+.field public static final OK_BUTTON:I = 0x7f0a049e
 
 .field public static final ON_SHOW:I
 
@@ -232,7 +232,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppDialog;-><init>()V
 
-    const v0, 0x7f0a04a9
+    const v0, 0x7f0a049c
 
     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, 0x7f0a04a8
+    const v0, 0x7f0a049b
 
     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, 0x7f0a04a5
+    const v0, 0x7f0a0498
 
     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, 0x7f0a04ab
+    const v0, 0x7f0a049e
 
     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, 0x7f0a04a6
+    const v0, 0x7f0a0499
 
     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, 0x7f0a04a4
+    const v0, 0x7f0a0497
 
     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, 0x7f0d0156
+    const v0, 0x7f0d0154
 
     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 174517e8a6..a6cc42ce0d 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, 0x7f0a070e
+    const v1, 0x7f0a06f5
 
     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 eb0d84a280..a475faf302 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, 0x7f0a02be
+    const v0, 0x7f0a02bd
 
     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, 0x7f0d0157
+    const v0, 0x7f0d0155
 
     return v0
 .end method
@@ -183,7 +183,7 @@
 
     if-eqz v0, :cond_0
 
-    const v1, 0x7f060137
+    const v1, 0x7f060136
 
     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 428c6b8ecb..bbadeefd92 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 0d53695a31..8939a42ca1 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;->Bc:Lcom/discord/samsung/a;
+    sget-object v0, Lcom/discord/samsung/a;->Bf:Lcom/discord/samsung/a;
 
-    invoke-static {}, Lcom/discord/samsung/a;->eN()Landroid/content/Intent;
+    invoke-static {}, Lcom/discord/samsung/a;->eM()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 e113fef09d..4942c28097 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, 0x7f0a02be
+    const v0, 0x7f0a02bd
 
     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, 0x7f0d0158
+    const v0, 0x7f0d0156
 
     return v0
 .end method
@@ -183,7 +183,7 @@
 
     if-eqz v0, :cond_0
 
-    const v1, 0x7f060137
+    const v1, 0x7f060136
 
     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 86f8dc1d31..9dbda6a3f4 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 55e20987dd..8b57cb1dd4 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 850e0badd0..a33f779ae9 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, 0x7f0a0528
+    const v0, 0x7f0a0519
 
     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, 0x7f0a0523
+    const v0, 0x7f0a0514
 
     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, 0x7f0a0526
+    const v0, 0x7f0a0517
 
     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, 0x7f0a0525
+    const v0, 0x7f0a0516
 
     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, 0x7f0a0524
+    const v0, 0x7f0a0515
 
     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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object v0
 
@@ -499,7 +499,7 @@
 .method public getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0159
+    const v0, 0x7f0d0157
 
     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 41c1e58cda..97a3309447 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 a49e47dbab..697d5925c9 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 87d929bdeb..9b7914d9a9 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, 0x7f040381
+    const v5, 0x7f040380
 
     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 a128e2c4ec..e31f5c8b7b 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 95cd5753d5..99e4d66194 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, 0x7f0a0527
+    const v0, 0x7f0a0518
 
     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, 0x7f0a0522
+    const v0, 0x7f0a0513
 
     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, 0x7f040381
+    const v5, 0x7f040380
 
     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, 0x7f0403b2
+    const v5, 0x7f0403b1
 
     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;->Or:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sget-object v5, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->On: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, 0x7f0402a1
+    const v1, 0x7f0402a0
 
     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, 0x7f0d015a
+    const v0, 0x7f0d0158
 
     return v0
 .end method
@@ -973,7 +973,7 @@
 
     if-nez v0, :cond_0
 
-    sget-object v0, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
 
     new-instance v3, Ljava/lang/StringBuilder;
 
@@ -1032,7 +1032,7 @@
 
     move-result-object v3
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v4
 
@@ -1116,7 +1116,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->IV()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->IT()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 cea9ee04d7..81500cec46 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, 0x7f0a04b6
+    const v0, 0x7f0a04a9
 
     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, 0x7f0a04b2
+    const v0, 0x7f0a04a5
 
     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, 0x7f0a04b3
+    const v0, 0x7f0a04a6
 
     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, 0x7f0a04b4
+    const v0, 0x7f0a04a7
 
     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, 0x7f0a04b5
+    const v0, 0x7f0a04a8
 
     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, 0x7f0a04b1
+    const v0, 0x7f0a04a4
 
     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, 0x7f0d015b
+    const v0, 0x7f0d0159
 
     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 ea22f77414..afef79f648 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -81,12 +81,12 @@
 
     if-eqz p1, :cond_0
 
-    const p1, 0x7f120d02
+    const p1, 0x7f120ccb
 
     goto :goto_0
 
     :cond_0
-    const p1, 0x7f120ac6
+    const p1, 0x7f120a90
 
     :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 4418238eb0..98a592d6c8 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, 0x7f0a036b
+    const v0, 0x7f0a0366
 
     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, 0x7f0d015c
+    const v0, 0x7f0d015a
 
     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 eb7a237dc0..87c85cdde1 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, 0x7f0d009f
+    const v0, 0x7f0d009d
 
     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 81ad16dd2c..587b9bc597 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, 0x7f121095
+    const p1, 0x7f121009
 
     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, 0x7f121095
+    const p1, 0x7f121009
 
     new-array v2, v2, [Ljava/lang/Object;
 
@@ -290,7 +290,7 @@
     return-object p0
 
     :cond_1
-    const p1, 0x7f121077
+    const p1, 0x7f120feb
 
     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 3200f14fd7..176956fcf0 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, 0x7f0d0164
+    const v0, 0x7f0d0162
 
     return v0
 .end method
@@ -519,7 +519,7 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const v0, 0x7f0a05cd
+    const v0, 0x7f0a05b4
 
     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, 0x7f0a05d1
+    const v0, 0x7f0a05b8
 
     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, 0x7f0a05c3
+    const v0, 0x7f0a05aa
 
     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, 0x7f0a05c7
+    const v0, 0x7f0a05ae
 
     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, 0x7f0a0877
+    const v0, 0x7f0a083c
 
     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, 0x7f0a0876
+    const v0, 0x7f0a083b
 
     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 40299d617b..ccebbb250d 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, 0x7f1000bc
+    const v12, 0x7f1000b1
 
     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 e050c84984..6eba7ce95c 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, 0x7f0d0165
+    const v0, 0x7f0d0163
 
     return v0
 .end method
@@ -98,7 +98,7 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const v0, 0x7f0a05d0
+    const v0, 0x7f0a05b7
 
     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 f4fa7e7cad..7c4f4e6ccf 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, 0x7f0d0168
+    const v0, 0x7f0d0166
 
     return v0
 .end method
@@ -84,7 +84,7 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const v0, 0x7f0a05dd
+    const v0, 0x7f0a05c4
 
     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 e77a77fe04..126ad16eae 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, 0x7f0d016c
+    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$FilterViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a0758
+    const v0, 0x7f0a0730
 
     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, 0x7f0a075a
+    const v0, 0x7f0a0732
 
     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, 0x7f0a0759
+    const v0, 0x7f0a0731
 
     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, 0x7f0a0757
+    const v0, 0x7f0a072f
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -117,27 +117,27 @@
 
     if-eq p1, v0, :cond_0
 
-    const p1, 0x7f120fff
+    const p1, 0x7f120f73
 
     return p1
 
     :cond_0
-    const p1, 0x7f12106d
+    const p1, 0x7f120fe1
 
     return p1
 
     :cond_1
-    const p1, 0x7f121066
+    const p1, 0x7f120fda
 
     return p1
 
     :cond_2
-    const p1, 0x7f12106f
+    const p1, 0x7f120fe3
 
     return p1
 
     :cond_3
-    const p1, 0x7f121065
+    const p1, 0x7f120fd9
 
     return p1
 .end method
@@ -169,27 +169,27 @@
 
     if-eq p1, v0, :cond_0
 
-    const p1, 0x7f120fff
+    const p1, 0x7f120f73
 
     return p1
 
     :cond_0
-    const p1, 0x7f121080
+    const p1, 0x7f120ff4
 
     return p1
 
     :cond_1
-    const p1, 0x7f12107f    # 1.9415294E38f
+    const p1, 0x7f120ff3
 
     return p1
 
     :cond_2
-    const p1, 0x7f121082    # 1.94153E38f
+    const p1, 0x7f120ff6
 
     return p1
 
     :cond_3
-    const p1, 0x7f12107e
+    const p1, 0x7f120ff2
 
     return p1
 .end method
@@ -226,22 +226,22 @@
     return p1
 
     :cond_0
-    const p1, 0x7f0403a9
-
-    return p1
-
-    :cond_1
     const p1, 0x7f0403a8
 
     return p1
 
+    :cond_1
+    const p1, 0x7f0403a7
+
+    return p1
+
     :cond_2
-    const p1, 0x7f0403af
+    const p1, 0x7f0403ae
 
     return p1
 
     :cond_3
-    const p1, 0x7f0403b0
+    const p1, 0x7f0403af
 
     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 4368df7ea1..4f3608d7a3 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, 0x7f0d016a
+    const v0, 0x7f0d0168
 
     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, 0x7f0a05d4
+    const v0, 0x7f0a05bb
 
     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, 0x7f0a05d9
+    const v0, 0x7f0a05c0
 
     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, 0x7f0a05da
+    const v0, 0x7f0a05c1
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -121,32 +121,32 @@
 
     if-eq p0, v0, :cond_0
 
-    const p0, 0x7f0403ae
-
-    return p0
-
-    :cond_0
-    const p0, 0x7f0403ab
-
-    return p0
-
-    :cond_1
-    const p0, 0x7f0403b1
-
-    return p0
-
-    :cond_2
     const p0, 0x7f0403ad
 
     return p0
 
+    :cond_0
+    const p0, 0x7f0403aa
+
+    return p0
+
+    :cond_1
+    const p0, 0x7f0403b0
+
+    return p0
+
+    :cond_2
+    const p0, 0x7f0403ac
+
+    return p0
+
     :cond_3
-    const p0, 0x7f0403b2
+    const p0, 0x7f0403b1
 
     return p0
 
     :cond_4
-    const p0, 0x7f0403a8
+    const p0, 0x7f0403a7
 
     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 14e57ad956..7e8395a766 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, 0x7f0d0166
+    const v0, 0x7f0d0164
 
     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, 0x7f0a075b
+    const v0, 0x7f0a0733
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -80,32 +80,32 @@
     throw v0
 
     :pswitch_0
-    const p1, 0x7f121089
+    const p1, 0x7f120ffd
 
     return p1
 
     :pswitch_1
-    const p1, 0x7f12108a
+    const p1, 0x7f120ffe
 
     return p1
 
     :pswitch_2
-    const p1, 0x7f12108e
+    const p1, 0x7f121002
 
     return p1
 
     :pswitch_3
-    const p1, 0x7f12108d
+    const p1, 0x7f121001
 
     return p1
 
     :pswitch_4
-    const p1, 0x7f121091
+    const p1, 0x7f121005
 
     return p1
 
     :pswitch_5
-    const p1, 0x7f121092
+    const p1, 0x7f121006
 
     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 32aa0fd3e5..e6c3962a90 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, 0x7f0d0167
+    const v0, 0x7f0d0165
 
     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, 0x7f0a075c
+    const v0, 0x7f0a0734
 
     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 dc9213859c..af1d6d7bb3 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, 0x7f0d0169
+    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$InChannelViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a05d3
+    const v0, 0x7f0a05ba
 
     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, 0x7f0a05d8
+    const v0, 0x7f0a05bf
 
     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 f227d76690..0ad4a4387f 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, 0x7f0d016b
+    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$RecentQueryViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a05d5
+    const v0, 0x7f0a05bc
 
     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, 0x7f0a05dc
+    const v0, 0x7f0a05c3
 
     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 0e199bedab..6e10305b0a 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, 0x7f0d016d
+    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$UserViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a05d6
+    const v0, 0x7f0a05bd
 
     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;->EA:Landroid/widget/TextView;
+    iget-object v0, p2, Lcom/discord/views/UserListItemView;->EC: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;->EA:Landroid/widget/TextView;
+    iget-object v1, p2, Lcom/discord/views/UserListItemView;->EC: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;->EC:Landroid/view/View;
+    iget-object p2, p2, Lcom/discord/views/UserListItemView;->EE: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 948398800b..5332b6ba03 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, 0x7f120682
+    const p1, 0x7f12065d
 
     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 47b5d93e3f..e943f4d2e1 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, 0x7f120682
+    const p1, 0x7f12065d
 
     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 76f85946d8..aa0190347d 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, 0x7f120631
+    const p1, 0x7f12060c
 
     return p1
 
@@ -103,7 +103,7 @@
 
     if-ne p1, v0, :cond_1
 
-    const p1, 0x7f12068c
+    const p1, 0x7f120667
 
     return p1
 
@@ -112,7 +112,7 @@
 
     if-ne p1, v0, :cond_2
 
-    const p1, 0x7f120686
+    const p1, 0x7f120661
 
     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 a639a590d0..34de6025ef 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, 0x7f0d007b
+    const v3, 0x7f0d007a
 
     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, 0x7f0d007c
+    const v3, 0x7f0d007b
 
     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 d1ad4a9ed2..53237443db 100644
--- a/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$CategoryListItem.smali
+++ b/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$CategoryListItem.smali
@@ -51,7 +51,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/servers/SettingsChannelListAdapter$CategoryListItem;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a06b0
+    const v0, 0x7f0a0697
 
     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, 0x7f0a06af
+    const v0, 0x7f0a0696
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -172,7 +172,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f1212ab
+    const v0, 0x7f12121e
 
     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 80c06110a4..4762b80cd2 100644
--- a/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$ChannelListItem.smali
+++ b/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$ChannelListItem.smali
@@ -55,7 +55,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/servers/SettingsChannelListAdapter$ChannelListItem;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a06b2
+    const v0, 0x7f0a0699
 
     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, 0x7f0a06b3
+    const v0, 0x7f0a069a
 
     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, 0x7f0a06b4
+    const v0, 0x7f0a069b
 
     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, 0x7f0a06b1
+    const v0, 0x7f0a0698
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -205,12 +205,12 @@
 
     if-eqz v1, :cond_1
 
-    const v1, 0x7f080225
+    const v1, 0x7f08021a
 
     goto :goto_0
 
     :cond_1
-    const v1, 0x7f08022d
+    const v1, 0x7f080222
 
     :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 37eccbcc1f..9c40fb1e21 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;->vm:Lcom/discord/app/AppLog;
+    sget-object v2, Lcom/discord/app/AppLog;->vn: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 ecc02e6ace..d9cd235dea 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 f85cfba53e..d55dba507e 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 53b032e72d..5d7707f1f2 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 ed5f3588c5..273e3782cd 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, 0x7f0a0602
+    const v0, 0x7f0a05e9
 
     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, 0x7f0a0605
+    const v0, 0x7f0a05ec
 
     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, 0x7f0a0600
+    const v0, 0x7f0a05e7
 
     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, 0x7f0a0601
+    const v0, 0x7f0a05e8
 
     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, 0x7f0a0604
+    const v0, 0x7f0a05eb
 
     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, 0x7f0a0603
+    const v0, 0x7f0a05ea
 
     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, 0x7f0d0170
+    const v0, 0x7f0d016e
 
     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 40d80b4165..1018393f1d 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 4cc415ee56..e6c1f98901 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 68c9b92bb5..9274c93ba0 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 312ee1533b..626e0bbb7d 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 62f4200e65..48b66e08d3 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, 0x7f0a05ea
+    const v0, 0x7f0a05d1
 
     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, 0x7f0a05e9
+    const v0, 0x7f0a05d0
 
     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, 0x7f0a05e6
+    const v0, 0x7f0a05cd
 
     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, 0x7f0a05e7
+    const v0, 0x7f0a05ce
 
     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, 0x7f0a05e8
+    const v0, 0x7f0a05cf
 
     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, 0x7f0a05e5
+    const v0, 0x7f0a05cc
 
     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, 0x7f0a05eb
+    const v0, 0x7f0a05d2
 
     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, 0x7f0a0371
+    const v0, 0x7f0a036c
 
     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, 0x7f0a0373
+    const v0, 0x7f0a036e
 
     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, 0x7f120cbf
+    const v0, 0x7f120c88
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/WidgetServerNotifications;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -522,7 +522,7 @@
 
     move-result-object v0
 
-    const v3, 0x7f120680
+    const v3, 0x7f12065b
 
     new-array v6, v4, [Ljava/lang/Object;
 
@@ -596,7 +596,7 @@
 
     move-result-object v0
 
-    const v3, 0x7f1206b3
+    const v3, 0x7f12068e
 
     invoke-virtual {p0, v3}, Lcom/discord/widgets/servers/WidgetServerNotifications;->getString(I)Ljava/lang/String;
 
@@ -664,7 +664,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f12068c
+    const v1, 0x7f120667
 
     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, 0x7f06011c
+    const v2, 0x7f06011b
 
     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, 0x7f08025a
+    const v3, 0x7f08024e
 
     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, 0x7f0d0172
+    const v0, 0x7f0d0170
 
     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 4d4fa2d301..825cdd4345 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 c7b947b3da..d38a9677ad 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 1b6615d526..8cfb7f90ac 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 31766d9b00..9f07c0f3b9 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 2c9cc81e2a..ca84da13ae 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, 0x7f0a05cd
+    const v0, 0x7f0a05b4
 
     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, 0x7f0a0372
+    const v0, 0x7f0a036d
 
     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, 0x7f0d0171
+    const v0, 0x7f0d016f
 
     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, 0x7f120cba
+    const p1, 0x7f120c83
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/WidgetServerNotificationsOverrideSelector;->setActionBarTitle(I)Lkotlin/Unit;
 
-    const p1, 0x7f1210ac
+    const p1, 0x7f121020
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/WidgetServerNotificationsOverrideSelector;->setActionBarSubtitle(I)Lkotlin/Unit;
 
@@ -244,7 +244,7 @@
 
     move-result-object p1
 
-    const v1, 0x7f121060
+    const v1, 0x7f120fd4
 
     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 828695baec..94b6a3df3f 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 8bbbf133c8..fc4d04821d 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, 0x7f0a063a
+    const p1, 0x7f0a0621
 
     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, 0x7f08023a
+    const p1, 0x7f08022f
 
-    const v3, 0x7f08023a
+    const v3, 0x7f08022f
 
     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 9fe1ae1861..a178be26c4 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, 0x7f0d0194
+    const p2, 0x7f0d0192
 
     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 1f7a546d4e..450b3f50ed 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 7348455886..d1605ffc04 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 69b424f78e..5513faebee 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, 0x7f0a063b
+    const v0, 0x7f0a0622
 
     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, 0x7f0d0193
+    const v0, 0x7f0d0191
 
     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 545d6389d4..e0c60fa0d1 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 1756d79ae4..6a4fa50832 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, 0x7f0a0475
+    const p2, 0x7f0a0470
 
     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 6fc21f459b..8bb177d9c2 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 8b2dc63e56..ca3dc27140 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, 0x7f0a0660
+    const v0, 0x7f0a0647
 
     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, 0x7f0a0661
+    const v0, 0x7f0a0648
 
     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, 0x7f0a0662
+    const v0, 0x7f0a0649
 
     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, 0x7f0a0658
+    const v0, 0x7f0a063f
 
     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, 0x7f0a0624
+    const v0, 0x7f0a060b
 
     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, 0x7f0a0623
+    const v0, 0x7f0a060a
 
     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, 0x7f0a0620
+    const v0, 0x7f0a0607
 
     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, 0x7f0a0621
+    const v0, 0x7f0a0608
 
     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, 0x7f0a0622
+    const v0, 0x7f0a0609
 
     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, 0x7f0a0625
+    const v0, 0x7f0a060c
 
     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, 0x7f0a0626
+    const v0, 0x7f0a060d
 
     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, 0x7f0a0659
+    const v0, 0x7f0a0640
 
     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, 0x7f0a065a
+    const v0, 0x7f0a0641
 
     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, 0x7f0a0614
+    const v0, 0x7f0a05fb
 
     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, 0x7f0a0656
+    const v0, 0x7f0a063d
 
     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, 0x7f0a060f
+    const v0, 0x7f0a05f6
 
     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, 0x7f0a05f3
+    const v0, 0x7f0a05da
 
     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, 0x7f0a060b
+    const v0, 0x7f0a05f2
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1171,7 +1171,7 @@
 
     move-result-object v1
 
-    invoke-virtual {v0}, Lcom/discord/utilities/permissions/ManageGuildContext;->getCanManageServer()Z
+    invoke-virtual {v0}, Lcom/discord/utilities/permissions/ManageGuildContext;->isOwnerWithRequiredMFALevel()Z
 
     move-result v2
 
@@ -1736,7 +1736,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0174
+    const v0, 0x7f0d0172
 
     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, 0x7f1210db
+    const p1, 0x7f12104f
 
     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 d57cbe5ee2..c047d60dd6 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, 0x7f0d017a
+    const p1, 0x7f0d0178
 
     invoke-direct {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
-    const p1, 0x7f0a00bc
+    const p1, 0x7f0a00bb
 
     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, 0x7f0a00be
+    const p1, 0x7f0a00bd
 
     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, 0x7f0a00bd
+    const p1, 0x7f0a00bc
 
     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 2a9c3c4baf..5aa25445d4 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object p2
 
@@ -204,7 +204,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 844214c15c..718a88fe90 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 d61b58a0eb..ba91f5c1f6 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 1036f1c20d..bd5a93905b 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 846fb4f988..ae2a512e8c 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 68890dbb93..53f5bc41ce 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 6d88e8b771..94ea6b643f 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, 0x7f0a05f5
+    const v0, 0x7f0a05dc
 
     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, 0x7f0a05f6
+    const v0, 0x7f0a05dd
 
     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, 0x7f0a05f4
+    const v0, 0x7f0a05db
 
     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, 0x7f1202a9
+    const v0, 0x7f1202a7
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsBans;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -447,7 +447,7 @@
 
     aput-object v4, v3, v5
 
-    const v4, 0x7f1212a7
+    const v4, 0x7f12121a
 
     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, 0x7f1212a6
+    const v3, 0x7f121219
 
     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, 0x7f1203a0
+    const v2, 0x7f12037b
 
     const/4 v3, 0x2
 
@@ -503,7 +503,7 @@
 
     check-cast v1, Lkotlin/jvm/functions/Function1;
 
-    const p1, 0x7f1212a5
+    const p1, 0x7f121218
 
     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, 0x7f0d017b
+    const v0, 0x7f0d0179
 
     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 5010b695f6..a4a61e4546 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;->JI()Lrx/internal/a/ba;
+    invoke-static {}, Lrx/internal/a/ba;->JG()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 6e780dae2c..73ed4d8bf4 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, 0x7f1203ed
+    const v0, 0x7f1203c8
 
     goto :goto_0
 
     :cond_0
-    const v0, 0x7f12112e
+    const v0, 0x7f1210a2
 
     :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, 0x7f0a047a
+    const v0, 0x7f0a0475
 
     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, 0x7f0a047b
+    const v0, 0x7f0a0476
 
     invoke-interface {p1, v0}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
 
@@ -422,7 +422,7 @@
 .method public getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d017c
+    const v0, 0x7f0d017a
 
     return v0
 .end method
@@ -472,7 +472,7 @@
     nop
 
     :pswitch_data_0
-    .packed-switch 0x7f0a047a
+    .packed-switch 0x7f0a0475
         :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, 0x7f1203df
+    const p1, 0x7f1203ba
 
     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, 0x7f0a05fb
+    const v0, 0x7f0a05e2
 
     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, 0x7f0a05f7
+    const v0, 0x7f0a05de
 
     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, 0x7f0a027a
+    const v0, 0x7f0a0279
 
     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 6e0ba9b323..073fc77437 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, 0x7f0a0878
+    const p2, 0x7f0a083d
 
     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, 0x7f0a02d5
+    const v1, 0x7f0a02d4
 
     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, 0x7f0a02d7
+    const v1, 0x7f0a02d6
 
     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, 0x7f0a02d6
+    const v1, 0x7f0a02d5
 
     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, 0x7f0a02d8
+    const v1, 0x7f0a02d7
 
     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, 0x7f0d017e
+    const p3, 0x7f0d017c
 
     const/4 v0, 0x0
 
@@ -332,7 +332,7 @@
 
     invoke-virtual {p1, p2}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    const p3, 0x7f0a02da
+    const p3, 0x7f0a02d9
 
     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 030c7396c1..b4d0aaf97e 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 8f8645edb1..2d67729601 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, 0x7f0a05f8
+    const v0, 0x7f0a05df
 
     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, 0x7f0a05fa
+    const v0, 0x7f0a05e1
 
     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, 0x7f0a05f9
+    const v0, 0x7f0a05e0
 
     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, 0x7f0d017d
+    const v0, 0x7f0d017b
 
     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 0c09cf93fe..a4836a0062 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 = 0x7f0a0290
+.field private static final STATE_KEY_ENABLE_TWITCH_EMOTES:I = 0x7f0a028f
 
-.field private static final STATE_KEY_EXPIRE_BEHAVIOR:I = 0x7f0a0293
+.field private static final STATE_KEY_EXPIRE_BEHAVIOR:I = 0x7f0a0292
 
-.field private static final STATE_KEY_GRACE_PERIOD:I = 0x7f0a0294
+.field private static final STATE_KEY_GRACE_PERIOD:I = 0x7f0a0293
 
 .field private static final gracePeriodDays:[I
 
@@ -126,9 +126,9 @@
 
     :array_0
     .array-data 4
-        0x7f0a0290
+        0x7f0a028f
+        0x7f0a0292
         0x7f0a0293
-        0x7f0a0294
     .end array-data
 .end method
 
@@ -144,7 +144,7 @@
     goto/16 :goto_4
 
     :cond_0
-    const v0, 0x7f120a33
+    const v0, 0x7f1209fd
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -204,12 +204,12 @@
 
     if-eqz v0, :cond_3
 
-    const v2, 0x7f08006c
+    const v2, 0x7f08006b
 
     goto :goto_0
 
     :cond_3
-    const v2, 0x7f08006d
+    const v2, 0x7f08006c
 
     :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, 0x7f0600c3
+    const v3, 0x7f0600c2
 
     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, 0x7f0a0293
+    const v2, 0x7f0a0292
 
     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, 0x7f0a0294
+    const v3, 0x7f0a0293
 
     invoke-direct {p0, v1}, Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration;->getGracePeriodPosition(I)I
 
@@ -567,12 +567,12 @@
 
     if-eqz p1, :cond_0
 
-    const p1, 0x7f10008c
+    const p1, 0x7f10008a
 
     goto :goto_0
 
     :cond_0
-    const p1, 0x7f10008b
+    const p1, 0x7f100089
 
     :goto_0
     iget-object p2, p2, Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration$Model;->integration:Lcom/discord/models/domain/ModelGuildIntegration;
@@ -668,7 +668,7 @@
 
     move-result-object v3
 
-    const v4, 0x7f100086
+    const v4, 0x7f100084
 
     const/4 v5, 0x1
 
@@ -768,7 +768,7 @@
 .method public getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0180
+    const v0, 0x7f0d017e
 
     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;->fh()I
+    invoke-virtual {p2}, Lcom/discord/views/RadioManager;->ff()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;->fh()I
+    invoke-virtual {v1}, Lcom/discord/views/RadioManager;->ff()I
 
     move-result v1
 
@@ -956,7 +956,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f0a0290
+    const v1, 0x7f0a028f
 
     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, 0x7f0a029c
+    const v0, 0x7f0a029b
 
     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, 0x7f0a029e
+    const v0, 0x7f0a029d
 
     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, 0x7f0a029a
+    const v0, 0x7f0a0299
 
     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, 0x7f0a02a2
+    const v0, 0x7f0a02a1
 
     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, 0x7f0a02a1
+    const v0, 0x7f0a02a0
 
     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, 0x7f0a02a4
+    const v0, 0x7f0a02a3
 
     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, 0x7f0a02a3
+    const v0, 0x7f0a02a2
 
     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, 0x7f0a029b
+    const v0, 0x7f0a029a
 
     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, 0x7f0a027a
+    const v0, 0x7f0a0279
 
     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, 0x7f0a029f
+    const v0, 0x7f0a029e
 
     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, 0x7f0a0292
+    const v2, 0x7f0a0291
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1184,7 +1184,7 @@
 
     aput-object v2, v1, v3
 
-    const v2, 0x7f0a0291
+    const v2, 0x7f0a0290
 
     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, 0x7f0a0296
+    const v2, 0x7f0a0295
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1216,7 +1216,7 @@
 
     aput-object v2, v1, v3
 
-    const v2, 0x7f0a0298
+    const v2, 0x7f0a0297
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1226,7 +1226,7 @@
 
     aput-object v2, v1, v4
 
-    const v2, 0x7f0a0299
+    const v2, 0x7f0a0298
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1236,7 +1236,7 @@
 
     aput-object v2, v1, v0
 
-    const v0, 0x7f0a0295
+    const v0, 0x7f0a0294
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1248,7 +1248,7 @@
 
     aput-object v0, v1, v2
 
-    const v0, 0x7f0a0297
+    const v0, 0x7f0a0296
 
     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, 0x7f0a028f
+    const v0, 0x7f0a028e
 
     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, 0x7f0a0290
+    const v0, 0x7f0a028f
 
     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, 0x7f0a0293
+    const v0, 0x7f0a0292
 
     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, 0x7f0a0294
+    const v0, 0x7f0a0293
 
     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 101f2335e5..c8af93f8b9 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 7bde0c5a0c..2bc9bf6b40 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, 0x7f0a02a8
+    const v3, 0x7f0a02a7
 
     aput v3, v1, v2
 
@@ -242,7 +242,7 @@
 
     iget-object v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditMember;->kickButton:Landroid/widget/TextView;
 
-    const v6, 0x7f120b26
+    const v6, 0x7f120af0
 
     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, 0x7f1202a8
+    const v6, 0x7f1202a6
 
     new-array v2, v2, [Ljava/lang/Object;
 
@@ -449,7 +449,7 @@
 
     if-nez v0, :cond_0
 
-    const v0, 0x7f120c3e
+    const v0, 0x7f120c07
 
     const/4 v1, 0x1
 
@@ -466,7 +466,7 @@
     goto :goto_0
 
     :cond_0
-    const p1, 0x7f120c3f
+    const p1, 0x7f120c08
 
     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, 0x7f12084b
+    const p1, 0x7f120826
 
     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, 0x7f0d0181
+    const v0, 0x7f0d017f
 
     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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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, 0x7f0a02a8
+    const v1, 0x7f0a02a7
 
     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, 0x7f0a02a9
+    const v1, 0x7f0a02a8
 
     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, 0x7f0a02ac
+    const v1, 0x7f0a02ab
 
     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, 0x7f0a02ab
+    const v1, 0x7f0a02aa
 
     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, 0x7f0a02aa
+    const v1, 0x7f0a02a9
 
     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, 0x7f0a02a5
+    const v1, 0x7f0a02a4
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -978,16 +978,6 @@
 
     iput-object v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditMember;->administrativeContainer:Landroid/view/View;
 
-    const v1, 0x7f0a02a7
-
-    invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
-
-    move-result-object v1
-
-    check-cast v1, Landroid/widget/TextView;
-
-    iput-object v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditMember;->kickButton:Landroid/widget/TextView;
-
     const v1, 0x7f0a02a6
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -996,9 +986,19 @@
 
     check-cast v1, Landroid/widget/TextView;
 
+    iput-object v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditMember;->kickButton:Landroid/widget/TextView;
+
+    const v1, 0x7f0a02a5
+
+    invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
+
+    move-result-object v1
+
+    check-cast v1, Landroid/widget/TextView;
+
     iput-object v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditMember;->banButton:Landroid/widget/TextView;
 
-    const v1, 0x7f0a02ad
+    const v1, 0x7f0a02ac
 
     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 b211d8f6ff..e0d13be2ad 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, 0x7f0d0080
+    const v0, 0x7f0d007f
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
-    const p1, 0x7f0a058f
+    const p1, 0x7f0a0576
 
     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, 0x7f120bb3
+    const p2, 0x7f120b7d
 
     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 624aa3465a..b490dca9d4 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 80490be837..b44446bedf 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, 0x7f0a02af
+    const v3, 0x7f0a02ae
 
     aput v3, v1, v2
 
@@ -291,7 +291,7 @@
 
     if-eqz p2, :cond_0
 
-    const p1, 0x7f120650
+    const p1, 0x7f12062b
 
     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, 0x7f121286
+    const p1, 0x7f1211f9
 
     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, 0x7f120966
+    const p1, 0x7f120930
 
     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, 0x7f120965
+    const p1, 0x7f12092f
 
     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, 0x7f120963
+    const p1, 0x7f12092d
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/WidgetServerSettingsEditRole;->getString(I)Ljava/lang/String;
 
@@ -522,7 +522,7 @@
     nop
 
     :pswitch_data_0
-    .packed-switch 0x7f0a0590
+    .packed-switch 0x7f0a0577
         :pswitch_1c
         :pswitch_1b
         :pswitch_1a
@@ -706,7 +706,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f0600f2
+    const v2, 0x7f0600f1
 
     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, 0x7f0600f4
+    const v1, 0x7f0600f3
 
     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, 0x7f0600bb
+    const v0, 0x7f0600ba
 
     goto :goto_1
 
     :cond_1
-    const v0, 0x7f0600c9
+    const v0, 0x7f0600c8
 
     :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, 0x7f12069e
+    const v2, 0x7f120679
 
     invoke-virtual {p0, v2}, Lcom/discord/widgets/servers/WidgetServerSettingsEditRole;->getString(I)Ljava/lang/String;
 
@@ -870,7 +870,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f080112
+    const v1, 0x7f08010e
 
     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, 0x7f120967
+    const v7, 0x7f120931
 
     if-eq v5, v6, :cond_2
 
@@ -1208,7 +1208,7 @@
     :cond_4
     if-nez v4, :cond_5
 
-    const v2, 0x7f120964
+    const v2, 0x7f12092e
 
     invoke-virtual {v1, v2}, Lcom/discord/views/CheckedSetting;->y(I)V
 
@@ -1299,7 +1299,7 @@
 .method public getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d011c
+    const v0, 0x7f0d011a
 
     return v0
 .end method
@@ -1346,7 +1346,7 @@
     return-void
 
     :cond_0
-    const p1, 0x7f12069c
+    const p1, 0x7f120677
 
     invoke-static {p0, p1}, Lcom/discord/app/h;->b(Landroidx/fragment/app/Fragment;I)V
 
@@ -1561,7 +1561,7 @@
 
     move-result p2
 
-    const p3, 0x7f0a0462
+    const p3, 0x7f0a045d
 
     if-eq p2, p3, :cond_0
 
@@ -1645,7 +1645,7 @@
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsEditRole;->setRetainInstance(Z)V
 
-    const v1, 0x7f0a0599
+    const v1, 0x7f0a0580
 
     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, 0x7f0a0595
+    const v1, 0x7f0a057c
 
     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, 0x7f0a02af
+    const v1, 0x7f0a02ae
 
     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, 0x7f0a0596
+    const v1, 0x7f0a057d
 
     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, 0x7f0a0598
+    const v1, 0x7f0a057f
 
     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, 0x7f0a02b0
+    const v1, 0x7f0a02af
 
     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, 0x7f0a059b
+    const v1, 0x7f0a0582
 
     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, 0x7f0a05a5
+    const v1, 0x7f0a058c
 
     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, 0x7f0a0591
+    const v2, 0x7f0a0578
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1731,7 +1731,7 @@
 
     aput-object v2, v1, v3
 
-    const v2, 0x7f0a0592
+    const v2, 0x7f0a0579
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1741,7 +1741,7 @@
 
     aput-object v2, v1, v0
 
-    const v2, 0x7f0a0593
+    const v2, 0x7f0a057a
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1753,7 +1753,7 @@
 
     aput-object v2, v1, v4
 
-    const v2, 0x7f0a0594
+    const v2, 0x7f0a057b
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1765,7 +1765,7 @@
 
     aput-object v2, v1, v4
 
-    const v2, 0x7f0a0597
+    const v2, 0x7f0a057e
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1777,7 +1777,7 @@
 
     aput-object v2, v1, v4
 
-    const v2, 0x7f0a059a
+    const v2, 0x7f0a0581
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1789,7 +1789,7 @@
 
     aput-object v2, v1, v4
 
-    const v2, 0x7f0a059c
+    const v2, 0x7f0a0583
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1801,7 +1801,7 @@
 
     aput-object v2, v1, v4
 
-    const v2, 0x7f0a059d
+    const v2, 0x7f0a0584
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1813,7 +1813,7 @@
 
     aput-object v2, v1, v4
 
-    const v2, 0x7f0a059f
+    const v2, 0x7f0a0586
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1825,7 +1825,7 @@
 
     aput-object v2, v1, v4
 
-    const v2, 0x7f0a05a0
+    const v2, 0x7f0a0587
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1837,7 +1837,7 @@
 
     aput-object v2, v1, v5
 
-    const v2, 0x7f0a059e
+    const v2, 0x7f0a0585
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1849,7 +1849,7 @@
 
     aput-object v2, v1, v5
 
-    const v2, 0x7f0a05a1
+    const v2, 0x7f0a0588
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1861,7 +1861,7 @@
 
     aput-object v2, v1, v5
 
-    const v2, 0x7f0a05a2
+    const v2, 0x7f0a0589
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1873,7 +1873,7 @@
 
     aput-object v2, v1, v5
 
-    const v2, 0x7f0a05a3
+    const v2, 0x7f0a058a
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1885,7 +1885,7 @@
 
     aput-object v2, v1, v5
 
-    const v2, 0x7f0a05a4
+    const v2, 0x7f0a058b
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1897,7 +1897,7 @@
 
     aput-object v2, v1, v5
 
-    const v2, 0x7f0a05a7
+    const v2, 0x7f0a058e
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1909,7 +1909,7 @@
 
     aput-object v2, v1, v5
 
-    const v2, 0x7f0a05a8
+    const v2, 0x7f0a058f
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1921,7 +1921,7 @@
 
     aput-object v2, v1, v5
 
-    const v2, 0x7f0a05a9
+    const v2, 0x7f0a0590
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1933,7 +1933,7 @@
 
     aput-object v2, v1, v5
 
-    const v2, 0x7f0a05aa
+    const v2, 0x7f0a0591
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1945,7 +1945,7 @@
 
     aput-object v2, v1, v5
 
-    const v2, 0x7f0a05ab
+    const v2, 0x7f0a0592
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1957,7 +1957,7 @@
 
     aput-object v2, v1, v5
 
-    const v2, 0x7f0a0590
+    const v2, 0x7f0a0577
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1969,7 +1969,7 @@
 
     aput-object v2, v1, v5
 
-    const v2, 0x7f0a05ac
+    const v2, 0x7f0a0593
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1981,7 +1981,7 @@
 
     aput-object v2, v1, v5
 
-    const v2, 0x7f0a05ad
+    const v2, 0x7f0a0594
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1993,7 +1993,7 @@
 
     aput-object v2, v1, v5
 
-    const v2, 0x7f0a05b1
+    const v2, 0x7f0a0598
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -2005,7 +2005,7 @@
 
     aput-object v2, v1, v5
 
-    const v2, 0x7f0a05b0
+    const v2, 0x7f0a0597
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -2017,7 +2017,7 @@
 
     aput-object v2, v1, v5
 
-    const v2, 0x7f0a05ae
+    const v2, 0x7f0a0595
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -2029,7 +2029,7 @@
 
     aput-object v2, v1, v5
 
-    const v2, 0x7f0a05af
+    const v2, 0x7f0a0596
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -2041,7 +2041,7 @@
 
     aput-object v2, v1, v5
 
-    const v2, 0x7f0a05b2
+    const v2, 0x7f0a0599
 
     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 8f158dea1a..26055060e7 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, 0x7f0d0182
+    const v0, 0x7f0d0180
 
     return v0
 .end method
@@ -177,21 +177,21 @@
 
     const/high16 v3, 0x42340000    # 45.0f
 
-    iput v3, v2, Lcom/angarron/colorpicker/b$a;->mS:F
+    iput v3, v2, Lcom/angarron/colorpicker/b$a;->mT:F
 
-    iput v1, v2, Lcom/angarron/colorpicker/b$a;->mQ:I
+    iput v1, v2, Lcom/angarron/colorpicker/b$a;->mR:I
 
-    iput-object v0, v2, Lcom/angarron/colorpicker/b$a;->mP:[I
+    iput-object v0, v2, Lcom/angarron/colorpicker/b$a;->mQ:[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;->mP:[I
+    iget-object v6, v2, Lcom/angarron/colorpicker/b$a;->mQ:[I
 
-    iget v7, v2, Lcom/angarron/colorpicker/b$a;->mQ:I
+    iget v7, v2, Lcom/angarron/colorpicker/b$a;->mR:I
 
-    iget v8, v2, Lcom/angarron/colorpicker/b$a;->mS:F
+    iget v8, v2, Lcom/angarron/colorpicker/b$a;->mT: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;->mO:F
+    iget v2, v0, Lcom/angarron/colorpicker/b;->mP: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 fd19842e62..4ca3bcb4ab 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, 0x7f0d0185
+    const v0, 0x7f0d0183
 
     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 98d94a65bd..231dab68e7 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, 0x7f0d0186
+    const v0, 0x7f0d0184
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
-    const p1, 0x7f0a087c
+    const p1, 0x7f0a0841
 
     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, 0x7f0a087b
+    const p1, 0x7f0a0840
 
     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, 0x7f1208f0
+    const p2, 0x7f1208cb
 
     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 3638157b93..08c243b668 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, 0x7f0d0187
+    const v0, 0x7f0d0185
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
-    const p1, 0x7f0a0607
+    const p1, 0x7f0a05ee
 
     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, 0x7f0a060d
+    const p1, 0x7f0a05f4
 
     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, 0x7f0a060a
+    const p1, 0x7f0a05f1
 
     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, 0x7f0a0606
+    const p1, 0x7f0a05ed
 
     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, 0x7f0a060e
+    const p1, 0x7f0a05f5
 
     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 2131e17682..911e915b72 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, 0x7f0d0188
+    const v0, 0x7f0d0186
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
-    const p1, 0x7f0a087a
+    const p1, 0x7f0a083f
 
     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, 0x7f10002d
+    const v4, 0x7f10002c
 
     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, 0x7f1205ad
+    const v0, 0x7f120588
 
     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, 0x7f1205ac
+    const p2, 0x7f120587
 
     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 b9c72f7aa3..51063de0f8 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 68fdf4a643..f0cf95e376 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 b14cc59d78..7f487f6508 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, 0x7f12059d
+    const v6, 0x7f120578
 
     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 d26315d4b0..a94749d5fe 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 ee158ad9b7..a499215d61 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 f077b97f88..eb1381c2c0 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 ab4e8b9625..7f6b879667 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, 0x7f1203fd
+    const v1, 0x7f1203d8
 
-    const v2, 0x7f1212a4
+    const v2, 0x7f121217
 
     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 01408c822a..2ca9b39ef4 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, 0x7f0a087d
+    const v0, 0x7f0a0842
 
     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, 0x7f0a0879
+    const v0, 0x7f0a083e
 
     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, 0x7f12059d
+    const v0, 0x7f120578
 
     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, 0x7f0d0183
+    const v0, 0x7f0d0181
 
     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;->xp:Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
+    sget-object v6, Lcom/discord/dialogs/ImageUploadDialog$PreviewType;->xr: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 2f04a3ef6e..05e88e9fc6 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, 0x7f0a0476
+    const p2, 0x7f0a0471
 
     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 e6e061a4aa..4f9dd0682b 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, 0x7f0a0608
+    const v0, 0x7f0a05ef
 
     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, 0x7f0a0609
+    const v1, 0x7f0a05f0
 
     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, 0x7f12059d
+    const v0, 0x7f120578
 
     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, 0x7f12101c
+    const v0, 0x7f120f90
 
     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, 0x7f0d0184
+    const v0, 0x7f0d0182
 
     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 29ae8cf6c9..840d974912 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object p1
 
@@ -197,11 +197,11 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lrx/Observable;->IX()Lrx/Observable;
+    invoke-virtual {p0}, Lrx/Observable;->IV()Lrx/Observable;
 
     move-result-object p0
 
-    invoke-static {}, Lrx/internal/a/ba;->JI()Lrx/internal/a/ba;
+    invoke-static {}, Lrx/internal/a/ba;->JG()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 0efee52194..4bffc2f68e 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, 0x7f120a32
+    const v0, 0x7f1209fc
 
     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, 0x7f0d018b
+    const v0, 0x7f0d0189
 
     return v0
 .end method
@@ -254,7 +254,7 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const v0, 0x7f0a0611
+    const v0, 0x7f0a05f8
 
     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, 0x7f0a0610
+    const v0, 0x7f0a05f7
 
     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 2b34b3b586..ee934d3919 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 389d7b0e94..cfa5e4a410 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, 0x7f121119
+    const v3, 0x7f12108d
 
     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 abb0c2ff21..a745c6b0b9 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, 0x7f0a03be
+    const v0, 0x7f0a03b9
 
     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, 0x7f0a03bc
+    const v0, 0x7f0a03b7
 
     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, 0x7f0a03bb
+    const v0, 0x7f0a03b6
 
     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, 0x7f0a03bd
+    const v0, 0x7f0a03b8
 
     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, 0x7f0d0189
+    const v0, 0x7f0d0187
 
     return v0
 .end method
@@ -362,7 +362,7 @@
     return-void
 
     :cond_2
-    sget-object v4, Lkotlin/jvm/internal/ab;->bhO:Lkotlin/jvm/internal/ab;
+    sget-object v4, Lkotlin/jvm/internal/ab;->bhJ: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 a85900876e..68e86aa404 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, 0x7f0d018a
+    const v0, 0x7f0d0188
 
     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, 0x7f0a03c5
+    const v0, 0x7f0a03c0
 
     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, 0x7f0a03c4
+    const v0, 0x7f0a03bf
 
     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, 0x7f0a03c3
+    const v0, 0x7f0a03be
 
     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, 0x7f0a03d6
+    const v0, 0x7f0a03d1
 
     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, 0x7f0a03cb
+    const v0, 0x7f0a03c6
 
     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, 0x7f0a03d7
+    const v0, 0x7f0a03d2
 
     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, 0x7f0a03c8
+    const v0, 0x7f0a03c3
 
     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, 0x7f060108
+    const p2, 0x7f060107
 
     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, 0x7f120bbd
+    const v0, 0x7f120b87
 
     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, 0x7f060076
+    const v0, 0x7f060075
 
     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, 0x7f120a1c
+    const v1, 0x7f1209e6
 
     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 36951c1f2d..21c8b20e08 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object p2
 
@@ -361,7 +361,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 ec46265821..dea8504961 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 b96ce15f99..e2cda5d7e5 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 58030b8009..4cab53b20e 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, 0x7f0a03b9
+    const v0, 0x7f0a03b4
 
     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, 0x7f0a03b8
+    const v0, 0x7f0a03b3
 
     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, 0x7f120a34
+    const v0, 0x7f1209fe
 
     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, 0x7f0d018d
+    const v0, 0x7f0d018b
 
     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 a6fd879dc6..e5f6cbec60 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, 0x7f0d018c
+    const v0, 0x7f0d018a
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
-    const p1, 0x7f0a03ae
+    const p1, 0x7f0a03a9
 
     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, 0x7f0a03ad
+    const p1, 0x7f0a03a8
 
     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, 0x7f0a03b2
+    const p1, 0x7f0a03ad
 
     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, 0x7f0a03b0
+    const p1, 0x7f0a03ab
 
     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, 0x7f0a03af
+    const p1, 0x7f0a03aa
 
     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, 0x7f0a03b3
+    const p1, 0x7f0a03ae
 
     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, 0x7f0a03b5
+    const p1, 0x7f0a03b0
 
     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, 0x7f0a03b4
+    const p1, 0x7f0a03af
 
     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, 0x7f0d017f
+    const v0, 0x7f0d017d
 
     const/4 v1, 0x0
 
@@ -516,19 +516,19 @@
 
     move-result-object v0
 
-    const v1, 0x7f0a05fe
+    const v1, 0x7f0a05e5
 
     invoke-virtual {v0, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
     move-result-object v7
 
-    const v1, 0x7f0a05fd
+    const v1, 0x7f0a05e4
 
     invoke-virtual {v0, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
     move-result-object v1
 
-    const v2, 0x7f0a05fc
+    const v2, 0x7f0a05e3
 
     invoke-virtual {v0, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -586,12 +586,12 @@
 
     if-eqz p5, :cond_2
 
-    const v0, 0x7f120541
+    const v0, 0x7f12051c
 
     goto :goto_0
 
     :cond_2
-    const v0, 0x7f120542
+    const v0, 0x7f12051d
 
     :goto_0
     invoke-virtual {v8, v0}, Landroid/widget/TextView;->setText(I)V
@@ -818,12 +818,12 @@
 
     if-eqz v7, :cond_7
 
-    const v4, 0x7f08006c
+    const v4, 0x7f08006b
 
     goto :goto_7
 
     :cond_7
-    const v4, 0x7f08006d
+    const v4, 0x7f08006c
 
     :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 c988fe29c6..439657319e 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, 0x7f0a05b3
+    const p2, 0x7f0a059a
 
     invoke-virtual {p3, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembers.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembers.smali
index e5cb3e2136..237e62f073 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, 0x7f120bc7
+    const v0, 0x7f120b91
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsMembers;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -439,7 +439,7 @@
 .method public getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d018f
+    const v0, 0x7f0d018d
 
     return v0
 .end method
@@ -451,7 +451,7 @@
 
     move-result p2
 
-    const p3, 0x7f0a0477
+    const p3, 0x7f0a0472
 
     if-eq p2, p3, :cond_0
 
@@ -515,7 +515,7 @@
 
     if-nez v0, :cond_1
 
-    const p1, 0x7f1203a5
+    const p1, 0x7f120380
 
     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, 0x7f1203a6
+    const p1, 0x7f120381
 
     invoke-static {p0, p1}, Lcom/discord/app/h;->b(Landroidx/fragment/app/Fragment;I)V
 
     return-void
 
     :cond_3
-    const p1, 0x7f1203a4
+    const p1, 0x7f12037f
 
     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, 0x7f0a0613
+    const v0, 0x7f0a05fa
 
     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, 0x7f0a0615
+    const v0, 0x7f0a05fc
 
     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, 0x7f0a0616
+    const v0, 0x7f0a05fd
 
     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, 0x7f0a0617
+    const v0, 0x7f0a05fe
 
     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 0333910c0d..6c6359cf54 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, 0x7f0d018e
+    const v0, 0x7f0d018c
 
     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, 0x7f0a0443
+    const v0, 0x7f0a043e
 
     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, 0x7f0a0445
+    const v0, 0x7f0a0440
 
     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, 0x7f0a0442
+    const v0, 0x7f0a043d
 
     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, 0x7f0a0447
+    const v0, 0x7f0a0442
 
     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, 0x7f0a0444
+    const v0, 0x7f0a043f
 
     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, 0x7f0a0446
+    const v0, 0x7f0a0441
 
     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, 0x7f060111
+    const v0, 0x7f060110
 
     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 d713c9a986..f021403c83 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, 0x7f0d0190
+    const v0, 0x7f0d018e
 
     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, 0x7f1210dc
+    const p1, 0x7f121050
 
     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, 0x7f120c01
+    const v0, 0x7f120bcb
 
     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, 0x7f0a061b
+    const v1, 0x7f0a0602
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -401,7 +401,7 @@
 
     aput-object v1, v0, v2
 
-    const v1, 0x7f0a061c
+    const v1, 0x7f0a0603
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -413,7 +413,7 @@
 
     aput-object v1, v0, v3
 
-    const v1, 0x7f0a061d
+    const v1, 0x7f0a0604
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -425,7 +425,7 @@
 
     aput-object v1, v0, v4
 
-    const v1, 0x7f0a061e
+    const v1, 0x7f0a0605
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -437,7 +437,7 @@
 
     aput-object v1, v0, v5
 
-    const v1, 0x7f0a061f
+    const v1, 0x7f0a0606
 
     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, 0x7f0a0618
+    const v1, 0x7f0a05ff
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -467,7 +467,7 @@
 
     aput-object v1, v0, v2
 
-    const v1, 0x7f0a0619
+    const v1, 0x7f0a0600
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -477,7 +477,7 @@
 
     aput-object v1, v0, v3
 
-    const v1, 0x7f0a061a
+    const v1, 0x7f0a0601
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -523,7 +523,7 @@
 
     aput-object v1, v0, v2
 
-    const v1, 0x7f1213c8    # 1.9417E38f
+    const v1, 0x7f12133c
 
     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, 0x7f1213c4
+    const v1, 0x7f121338
 
     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 494cf97661..89ee68f643 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
-        0x7f0a062a
-        0x7f0a062b
-        0x7f0a062c
-        0x7f0a062d
-        0x7f0a062e
+        0x7f0a0611
+        0x7f0a0612
+        0x7f0a0613
+        0x7f0a0614
+        0x7f0a0615
     .end array-data
 .end method
 
@@ -121,7 +121,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0192
+    const v0, 0x7f0d0190
 
     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 413b9d4780..6396fa4413 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object p2
 
@@ -96,7 +96,7 @@
 
     const/16 v0, 0x3c
 
-    const v1, 0x7f100029
+    const v1, 0x7f100028
 
     const/4 v2, 0x0
 
@@ -129,7 +129,7 @@
 
     move-result-object p1
 
-    const p2, 0x7f100026
+    const p2, 0x7f100025
 
     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 91eb9e7991..bcbadfa2d5 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;->bhO:Lkotlin/jvm/internal/ab;
+    sget-object p2, Lkotlin/jvm/internal/ab;->bhJ: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 173972f496..0f27e50a1c 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, 0x7f1203fd
+    const v1, 0x7f1203d8
 
-    const v2, 0x7f1212a4
+    const v2, 0x7f121217
 
     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 ea38f4e17f..7f2fee6529 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 f19e7226e1..c5721ff911 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, 0x7f1203fd
+    const v1, 0x7f1203d8
 
-    const v2, 0x7f1212a4
+    const v2, 0x7f121217
 
     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 f1d9ffd42f..90f61c8fe5 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, 0x7f1203fd
+    const v1, 0x7f1203d8
 
-    const v2, 0x7f1212a4
+    const v2, 0x7f121217
 
     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 d078222d94..734b58373a 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 fc84302bc5..0a34564e68 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, 0x7f120c42
+    const v6, 0x7f120c0b
 
     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 f14d697750..90a12846e2 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, 0x7f120c6e
+    const v6, 0x7f120c37
 
     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 e47560e2a4..f45f496499 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 bdd00362f4..1d18e16378 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 9c4f13edf5..8011d66eee 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 44d50561ad..a4aa661239 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -86,7 +86,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f0a063f
+    const v1, 0x7f0a0626
 
     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, 0x7f0a0627
+    const v1, 0x7f0a060e
 
     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 8de23a9f30..3b7b24d369 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -105,7 +105,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 a6dea9f9f9..0d3b938f9f 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 030212a6b8..69c31532d4 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -85,7 +85,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f0a0638
+    const v3, 0x7f0a061f
 
     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, 0x7f0a0639
+    const v3, 0x7f0a0620
 
     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, 0x7f0a063c
+    const v3, 0x7f0a0623
 
     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 130dde887c..89528041ee 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, 0x7f0a063e
+    const v0, 0x7f0a0625
 
     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, 0x7f0a0632
+    const v0, 0x7f0a0619
 
     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, 0x7f0a0633
+    const v0, 0x7f0a061a
 
     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, 0x7f0a0631
+    const v0, 0x7f0a0618
 
     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, 0x7f0a0634
+    const v0, 0x7f0a061b
 
     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, 0x7f0a0630
+    const v0, 0x7f0a0617
 
     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, 0x7f0a0635
+    const v0, 0x7f0a061c
 
     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, 0x7f0a0638
+    const v0, 0x7f0a061f
 
     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, 0x7f0a0639
+    const v0, 0x7f0a0620
 
     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, 0x7f0a063c
+    const v0, 0x7f0a0623
 
     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, 0x7f0a0628
+    const v0, 0x7f0a060f
 
     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, 0x7f0a0627
+    const v0, 0x7f0a060e
 
     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, 0x7f0a062f
+    const v0, 0x7f0a0616
 
     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, 0x7f0a0629
+    const v0, 0x7f0a0610
 
     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, 0x7f0a0642
+    const v0, 0x7f0a0629
 
     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, 0x7f0a063f
+    const v0, 0x7f0a0626
 
     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, 0x7f0a0641
+    const v0, 0x7f0a0628
 
     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, 0x7f0a0640
+    const v0, 0x7f0a0627
 
     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, 0x7f0a064b
+    const v0, 0x7f0a0632
 
     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, 0x7f0a064a
+    const v0, 0x7f0a0631
 
     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, 0x7f0a064f
+    const v0, 0x7f0a0636
 
     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, 0x7f0a064d
+    const v0, 0x7f0a0634
 
     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, 0x7f0a064e
+    const v0, 0x7f0a0635
 
     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, 0x7f0a064c
+    const v0, 0x7f0a0633
 
     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, 0x7f0a0650
+    const v0, 0x7f0a0637
 
     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, 0x7f0a0644
+    const v0, 0x7f0a062b
 
     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, 0x7f0a0643
+    const v0, 0x7f0a062a
 
     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, 0x7f0a0648
+    const v0, 0x7f0a062f
 
     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, 0x7f0a0646
+    const v0, 0x7f0a062d
 
     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, 0x7f0a0647
+    const v0, 0x7f0a062e
 
     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, 0x7f0a0645
+    const v0, 0x7f0a062c
 
     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, 0x7f0a0649
+    const v0, 0x7f0a0630
 
     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, 0x7f0a063d
+    const v0, 0x7f0a0624
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1203,25 +1203,25 @@
 
     :array_0
     .array-data 4
-        0x7f0a0636
-        0x7f0a0637
+        0x7f0a061d
+        0x7f0a061e
     .end array-data
 
     :array_1
     .array-data 4
-        0x7f0a0630
-        0x7f0a0635
-        0x7f0a0638
-        0x7f0a0639
-        0x7f0a063c
+        0x7f0a0617
+        0x7f0a061c
+        0x7f0a061f
+        0x7f0a0620
+        0x7f0a0623
+        0x7f0a060e
+        0x7f0a0610
+        0x7f0a0616
+        0x7f0a0626
+        0x7f0a0631
+        0x7f0a062a
+        0x7f0a0628
         0x7f0a0627
-        0x7f0a0629
-        0x7f0a062f
-        0x7f0a063f
-        0x7f0a064a
-        0x7f0a0643
-        0x7f0a0641
-        0x7f0a0640
         0x15f91
     .end array-data
 .end method
@@ -1479,9 +1479,9 @@
 
     move-result-object v0
 
-    const v1, 0x7f120c42
+    const v1, 0x7f120c0b
 
-    const v2, 0x7f08022e
+    const v2, 0x7f080223
 
     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, 0x7f0800c0
+    const v6, 0x7f0800bf
 
     invoke-virtual {v0, v6}, Lcom/facebook/drawee/view/SimpleDraweeView;->setBackgroundResource(I)V
 
@@ -1671,7 +1671,7 @@
 
     move-result-object v0
 
-    const v6, 0x7f120931
+    const v6, 0x7f12090c
 
     new-array v7, v4, [Ljava/lang/Object;
 
@@ -1691,7 +1691,7 @@
 
     const/4 v7, 0x0
 
-    const v8, 0x7f080334
+    const v8, 0x7f080328
 
     const/4 v9, 0x0
 
@@ -1711,7 +1711,7 @@
 
     move-result-object v1
 
-    const v6, 0x7f06014a
+    const v6, 0x7f060149
 
     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, 0x7f120933
+    const v0, 0x7f12090e
 
     new-array v6, v2, [Ljava/lang/Object;
 
@@ -1875,7 +1875,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f10006d
+    const v2, 0x7f10006c
 
     new-array v3, v4, [Ljava/lang/Object;
 
@@ -1897,7 +1897,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f120930
+    const v2, 0x7f12090b
 
     new-array v3, v4, [Ljava/lang/Object;
 
@@ -1917,7 +1917,7 @@
 
     const/4 v3, 0x0
 
-    const v4, 0x7f080333
+    const v4, 0x7f080327
 
     const/4 v5, 0x0
 
@@ -1937,7 +1937,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f0402a8
+    const v2, 0x7f0402a7
 
     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, 0x7f0402b6
+    const v2, 0x7f0402b5
 
     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, 0x7f0800c0
+    const v6, 0x7f0800bf
 
     invoke-virtual {v0, v6}, Lcom/facebook/drawee/view/SimpleDraweeView;->setBackgroundResource(I)V
 
@@ -2495,7 +2495,7 @@
 
     move-result-object v0
 
-    const v6, 0x7f120931
+    const v6, 0x7f12090c
 
     new-array v7, v4, [Ljava/lang/Object;
 
@@ -2515,7 +2515,7 @@
 
     const/4 v7, 0x0
 
-    const v8, 0x7f080334
+    const v8, 0x7f080328
 
     const/4 v9, 0x0
 
@@ -2535,7 +2535,7 @@
 
     move-result-object v1
 
-    const v6, 0x7f06014a
+    const v6, 0x7f060149
 
     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, 0x7f120933
+    const v0, 0x7f12090e
 
     new-array v6, v3, [Ljava/lang/Object;
 
@@ -2699,7 +2699,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f10006d
+    const v1, 0x7f10006c
 
     new-array v2, v4, [Ljava/lang/Object;
 
@@ -2721,7 +2721,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f120930
+    const v2, 0x7f12090b
 
     new-array v3, v4, [Ljava/lang/Object;
 
@@ -2741,7 +2741,7 @@
 
     const/4 v3, 0x0
 
-    const v4, 0x7f080333
+    const v4, 0x7f080327
 
     const/4 v5, 0x0
 
@@ -2761,7 +2761,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f0402a8
+    const v2, 0x7f0402a7
 
     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, 0x7f0402b6
+    const v2, 0x7f0402b5
 
     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, 0x7f120c6e
+    const v1, 0x7f120c37
 
-    const v2, 0x7f080226
+    const v2, 0x7f08021b
 
     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, 0x7f1210da
+    const v2, 0x7f12104e
 
     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, 0x7f1210dc
+    const v0, 0x7f121050
 
     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, 0x7f0d0191
+    const v0, 0x7f0d018f
 
     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;->xr:Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
+    sget-object v6, Lcom/discord/dialogs/ImageUploadDialog$PreviewType;->xt: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;->vj:Lcom/discord/app/e;
+    sget-object v2, Lcom/discord/app/e;->vk:Lcom/discord/app/e;
 
-    sget-wide v2, Lcom/discord/app/e;->vh:J
+    sget-wide v2, Lcom/discord/app/e;->vi: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, 0x7f120940
+    const v2, 0x7f120918
 
     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;->vj:Lcom/discord/app/e;
+    sget-object v1, Lcom/discord/app/e;->vk:Lcom/discord/app/e;
 
-    sget-wide v7, Lcom/discord/app/e;->vh:J
+    sget-wide v7, Lcom/discord/app/e;->vi: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, 0x7f1208eb
+    const v1, 0x7f1208c6
 
     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, 0x7f120d5d
+    const v0, 0x7f120d26
 
     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 0ee1770873..d6f8bab6ba 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 3e92a42cf9..d5a0b3524e 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, 0x7f120fe1
+    const v0, 0x7f120f55
 
     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, 0x7f0d0197
+    const v0, 0x7f0d0195
 
     return v0
 .end method
@@ -549,7 +549,7 @@
 .method public synthetic lambda$processRoleDrop$3$WidgetServerSettingsRolesList(Ljava/lang/Void;)V
     .locals 0
 
-    const p1, 0x7f120fe0
+    const p1, 0x7f120f54
 
     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, 0x7f0a05b4
+    const v0, 0x7f0a059b
 
     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, 0x7f0a0657
+    const v0, 0x7f0a063e
 
     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, 0x7f0a027a
+    const v0, 0x7f0a0279
 
     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 62a0fb02f5..43fb1da2ce 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, 0x7f0d0196
+    const v0, 0x7f0d0194
 
     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, 0x7f0a0655
+    const v0, 0x7f0a063c
 
     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, 0x7f0a0653
+    const v0, 0x7f0a063a
 
     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, 0x7f0a0654
+    const v0, 0x7f0a063b
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -87,7 +87,7 @@
 
     move-result-object p0
 
-    const v0, 0x7f120650
+    const v0, 0x7f12062b
 
     invoke-static {p0, v0}, Lcom/discord/app/h;->d(Landroid/content/Context;I)V
 
@@ -103,7 +103,7 @@
 
     move-result-object p0
 
-    const v0, 0x7f120963
+    const v0, 0x7f12092d
 
     invoke-static {p0, v0}, Lcom/discord/app/h;->d(Landroid/content/Context;I)V
 
@@ -119,7 +119,7 @@
 
     move-result-object p0
 
-    const v0, 0x7f121286
+    const v0, 0x7f1211f9
 
     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 ad70a8ab73..580127c9c6 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, 0x7f120539
+    const v1, 0x7f120514
 
     goto :goto_0
 
     :cond_1
-    const v1, 0x7f1205b1
+    const v1, 0x7f12058c
 
     :goto_0
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
@@ -75,12 +75,12 @@
 
     if-eqz p3, :cond_2
 
-    const v1, 0x7f0800f9
+    const v1, 0x7f0800f5
 
     goto :goto_1
 
     :cond_2
-    const v1, 0x7f0800ed
+    const v1, 0x7f0800ec
 
     :goto_1
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setBackgroundResource(I)V
@@ -135,7 +135,7 @@
 .method public getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0199
+    const v0, 0x7f0d0197
 
     return v0
 .end method
@@ -227,7 +227,7 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppDialog;->onViewBound(Landroid/view/View;)V
 
-    const v0, 0x7f0a065e
+    const v0, 0x7f0a0645
 
     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, 0x7f0a065b
+    const v0, 0x7f0a0642
 
     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, 0x7f0a065c
+    const v0, 0x7f0a0643
 
     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 6646c76939..0b8b7a4ec3 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, 0x7f1210aa
+    const v0, 0x7f12101e
 
     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, 0x7f12085b
+    const v1, 0x7f120836
 
     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, 0x7f0800f9
+    const v1, 0x7f0800f5
 
     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, 0x7f12085c
+    const v1, 0x7f120837
 
     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, 0x7f0800ed
+    const v1, 0x7f0800ec
 
     invoke-virtual {v0, v1}, Landroid/widget/Button;->setBackgroundResource(I)V
 
@@ -185,7 +185,7 @@
 .method public getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0198
+    const v0, 0x7f0d0196
 
     return v0
 .end method
@@ -286,7 +286,7 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const v0, 0x7f0a065f
+    const v0, 0x7f0a0646
 
     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, 0x7f0a0486
+    const v0, 0x7f0a0479
 
     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 db25bbb8ef..ed74f6ea85 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, 0x7f12125c
+    const v2, 0x7f1211cf
 
     const/4 v3, 0x1
 
@@ -257,7 +257,7 @@
 .method public getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0139
+    const v0, 0x7f0d0137
 
     return v0
 .end method
@@ -359,7 +359,7 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppDialog;->onViewBound(Landroid/view/View;)V
 
-    const v0, 0x7f0a0379
+    const v0, 0x7f0a0374
 
     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, 0x7f0a0378
+    const v0, 0x7f0a0373
 
     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, 0x7f0a037b
+    const v0, 0x7f0a0376
 
     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, 0x7f0a037a
+    const v0, 0x7f0a0375
 
     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, 0x7f0a0377
+    const v0, 0x7f0a0372
 
     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 67b7b79bca..bff172675a 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, 0x7f0a0663
+    const v3, 0x7f0a064a
 
     aput v3, v1, v2
 
@@ -114,7 +114,7 @@
 
     iget-object v3, p0, Lcom/discord/widgets/servers/WidgetServerSettingsVanityUrl;->currentUrl:Lcom/discord/app/AppTextView;
 
-    const v4, 0x7f1213b6
+    const v4, 0x7f12132a
 
     const/4 v5, 0x1
 
@@ -162,7 +162,7 @@
 .method private configureToolbar(Ljava/lang/String;)V
     .locals 1
 
-    const v0, 0x7f121114
+    const v0, 0x7f121088
 
     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, 0x7f0d019a
+    const v0, 0x7f0d0198
 
     return v0
 .end method
@@ -632,7 +632,7 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const v0, 0x7f0a0663
+    const v0, 0x7f0a064a
 
     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, 0x7f0a0666
+    const v0, 0x7f0a064d
 
     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, 0x7f0a0667
+    const v0, 0x7f0a064e
 
     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, 0x7f0a0668
+    const v0, 0x7f0a064f
 
     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, 0x7f0a0665
+    const v0, 0x7f0a064c
 
     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, 0x7f0a0664
+    const v0, 0x7f0a064b
 
     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, 0x7f0a0669
+    const v0, 0x7f0a0650
 
     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, 0x7f0a066a
+    const v0, 0x7f0a0651
 
     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 54f711cf49..6abe77d22d 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, 0x7f1208f7
+    const v2, 0x7f1208d2
 
     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 37fa1e4fea..39d1152c08 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 9b4be36dc9..c56cbd7458 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 0x7f0a0449
+    .packed-switch 0x7f0a0444
         :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 5fe0f02524..b60de71294 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, 0x7f0a0463
+    const v0, 0x7f0a045e
 
     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 7210d5ca5e..7b288e6ea8 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 b4e66a64b5..674146cfd9 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, 0x7f0a05f1
+    const v0, 0x7f0a05d8
 
     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, 0x7f0a05f2
+    const v0, 0x7f0a05d9
 
     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, 0x7f0a05ee
+    const v0, 0x7f0a05d5
 
     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, 0x7f0a05ef
+    const v0, 0x7f0a05d6
 
     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, 0x7f0a05ec
+    const v0, 0x7f0a05d3
 
     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, 0x7f0d0175
+    const v0, 0x7f0d0173
 
     return v0
 .end method
@@ -562,7 +562,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f120497
+    const v1, 0x7f120472
 
     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, 0x7f120928
+    const v0, 0x7f120903
 
     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 1961cd8fcc..18a241f3fb 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,11 +245,11 @@
 
     check-cast p1, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
 
-    const v0, 0x7f0d0178
+    const v0, 0x7f0d0176
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
-    const p1, 0x7f0a008f
+    const p1, 0x7f0a008e
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -257,7 +257,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$AuditLogEntryViewHolder;->actionTypeImage$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0095
+    const p1, 0x7f0a0094
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -265,7 +265,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$AuditLogEntryViewHolder;->targetTypeImage$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0091
+    const p1, 0x7f0a0090
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -273,7 +273,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$AuditLogEntryViewHolder;->avatar$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0094
+    const p1, 0x7f0a0093
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -281,7 +281,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$AuditLogEntryViewHolder;->headerText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0093
+    const p1, 0x7f0a0092
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -289,7 +289,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$AuditLogEntryViewHolder;->dateText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0090
+    const p1, 0x7f0a008f
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -297,7 +297,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$AuditLogEntryViewHolder;->arrow$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0096
+    const p1, 0x7f0a0095
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -305,7 +305,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter$AuditLogEntryViewHolder;->topContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0092
+    const p1, 0x7f0a0091
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -663,7 +663,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f08023d
+    const v0, 0x7f080232
 
     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, 0x7f0402bd
+    const v1, 0x7f0402bc
 
     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, 0x7f080241
+    const v0, 0x7f080235
 
     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, 0x7f0402b6
+    const v1, 0x7f0402b5
 
     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 16ef65e6fb..bd53507eb3 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, 0x7f0d0179
+    const v0, 0x7f0d0177
 
     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 74cd98392f..bfefa84f03 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, 0x7f0d0176
+    const v0, 0x7f0d0174
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
-    const p1, 0x7f0a008a
+    const p1, 0x7f0a0089
 
     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, 0x7f0a0088
+    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$AuditLogFilterActionViewHolder;->actionImage$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0086
+    const p1, 0x7f0a0085
 
     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 02be2b219a..510f64d210 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, 0x7f0d0177
+    const v0, 0x7f0d0175
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
-    const p1, 0x7f0a0085
+    const p1, 0x7f0a0084
 
     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, 0x7f0a0087
+    const p1, 0x7f0a0086
 
     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, 0x7f0a0086
+    const p1, 0x7f0a0085
 
     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 2846572c9f..36b7b79132 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, 0x7f1208f7
+    const v1, 0x7f1208d2
 
     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 5c95b37452..12be3e044b 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -129,7 +129,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 542b48d4a4..b748dd92ab 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 f39f6f498d..b5c090f25b 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 d2cb4136f3..2c733a02fc 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 28c72254e7..5d4415f72e 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 9bbaede857..7d63b4818e 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, 0x7f0a008b
+    const v0, 0x7f0a008a
 
     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, 0x7f0a008c
+    const v0, 0x7f0a008b
 
     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, 0x7f0d00be
+    const v0, 0x7f0d00bc
 
     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, 0x7f120928
+    const p1, 0x7f120903
 
     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, 0x7f1208f8
+    const p1, 0x7f1208d3
 
     goto :goto_1
 
     :cond_1
     :goto_0
-    const p1, 0x7f1208f4
+    const p1, 0x7f1208cf
 
     :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, 0x7f121096
+    const p2, 0x7f12100a
 
     goto :goto_3
 
     :cond_3
     :goto_2
-    const p2, 0x7f121061
+    const p2, 0x7f120fd5
 
     :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 306333c6ec..2875089e1a 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 c8e318c618..e80e53b27a 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 be84ba122b..a3704e4269 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,15 +28,19 @@
 
 
 # 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;)V
+.method constructor <init>(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;J)V
     .locals 0
 
     iput-object p1, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$removePremiumGuildSubscription$3;->this$0:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;
 
+    iput-wide p2, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$removePremiumGuildSubscription$3;->$subscriptionId:J
+
     const/4 p1, 0x1
 
     invoke-direct {p0, p1}, Lkotlin/jvm/internal/m;-><init>(I)V
@@ -53,13 +57,19 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$removePremiumGuildSubscription$3;->invoke(Ljava/lang/Void;)V
 
-    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object p1
 .end method
 
 .method public final invoke(Ljava/lang/Void;)V
-    .locals 0
+    .locals 2
+
+    sget-object p1, Lcom/discord/stores/StorePremiumGuildSubscription$Actions;->INSTANCE:Lcom/discord/stores/StorePremiumGuildSubscription$Actions;
+
+    iget-wide v0, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$removePremiumGuildSubscription$3;->$subscriptionId:J
+
+    invoke-virtual {p1, v0, v1}, Lcom/discord/stores/StorePremiumGuildSubscription$Actions;->removeNewPremiumGuildSubscription(J)V
 
     iget-object p1, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$removePremiumGuildSubscription$3;->this$0:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;
 
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 a796502c3b..f8ea4a32e8 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 c703d0c85f..c2cb325e54 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 1a73f2a931..f8974f3921 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(JJ)V
+    value = Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;->subscribeToPremiumGuild(J)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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 8f8d890167..44957bb6eb 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(JJ)V
+    value = Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;->subscribeToPremiumGuild(J)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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 2f41acc51c..f2953e9c5f 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(JJ)V
+    value = Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;->subscribeToPremiumGuild(J)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -53,13 +53,21 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$subscribeToPremiumGuild$3;->invoke(Lcom/discord/models/domain/ModelPremiumGuildSubscription;)V
 
-    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object p1
 .end method
 
 .method public final invoke(Lcom/discord/models/domain/ModelPremiumGuildSubscription;)V
-    .locals 0
+    .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
 
     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 8954c2818a..686cfd1269 100644
--- a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel.smali
@@ -142,10 +142,6 @@
 .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;
@@ -379,15 +375,15 @@
 
     const/4 p2, 0x0
 
-    const/4 p3, 0x1
+    const/4 v0, 0x1
 
-    const/4 p4, 0x0
+    const/4 v1, 0x0
 
-    invoke-static {p1, p2, p3, p4}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
+    invoke-static {p1, p2, v0, v1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
 
     move-result-object p1
 
-    invoke-static {}, Lrx/android/b/a;->Jc()Lrx/Scheduler;
+    invoke-static {}, Lrx/android/b/a;->Ja()Lrx/Scheduler;
 
     move-result-object p2
 
@@ -419,7 +415,7 @@
 
     new-instance p1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$removePremiumGuildSubscription$3;
 
-    invoke-direct {p1, p0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$removePremiumGuildSubscription$3;-><init>(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;)V
+    invoke-direct {p1, p0, p3, p4}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$removePremiumGuildSubscription$3;-><init>(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;J)V
 
     move-object v6, p1
 
@@ -458,7 +454,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object p2
 
@@ -466,7 +462,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/android/b/a;->Jc()Lrx/Scheduler;
+    invoke-static {}, Lrx/android/b/a;->Ja()Lrx/Scheduler;
 
     move-result-object p2
 
@@ -515,7 +511,7 @@
     return-void
 .end method
 
-.method public final subscribeToPremiumGuild(JJ)V
+.method public final subscribeToPremiumGuild(J)V
     .locals 9
 
     invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;->handlePremiumGuildSubscriptionStarted()V
@@ -526,25 +522,21 @@
 
     move-result-object v0
 
-    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;
+    invoke-virtual {v0, p1, p2}, Lcom/discord/utilities/rest/RestAPI;->subscribeToGuild(J)Lrx/Observable;
 
     move-result-object p1
 
     const/4 p2, 0x0
 
-    const/4 p3, 0x1
+    const/4 v0, 0x1
 
-    const/4 p4, 0x0
+    const/4 v1, 0x0
 
-    invoke-static {p1, p2, p3, p4}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
+    invoke-static {p1, p2, v0, v1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
 
     move-result-object p1
 
-    invoke-static {}, Lrx/android/b/a;->Jc()Lrx/Scheduler;
+    invoke-static {}, Lrx/android/b/a;->Ja()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 c3d8f8e25c..dc15f5acd7 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(IIZ)V
+    value = Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;->configure(II)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -62,7 +62,7 @@
 
     if-eqz p2, :cond_0
 
-    const p1, 0x7f080239
+    const p1, 0x7f08022e
 
     :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 7a72584152..c2ef1dae03 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, 0x7f0d0095
+    const v2, 0x7f0d0093
 
     invoke-static {v0, v2, v1}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
-    const v0, 0x7f0a0519
+    const v0, 0x7f0a050b
 
     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, 0x7f0a051b
+    const v0, 0x7f0a050d
 
     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, 0x7f0a051a
+    const v0, 0x7f0a050c
 
     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, 0x7f0a051c
+    const v0, 0x7f0a050e
 
     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, 0x7f0a0517
+    const v0, 0x7f0a0509
 
     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, 0x7f0a0518
+    const v0, 0x7f0a050a
 
     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, 0x7f0a0233
+    const v0, 0x7f0a0232
 
     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(IIZ)V
+.method public final configure(II)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, 0x7f0800c0
+    const v6, 0x7f0800bf
 
     invoke-virtual {v7, v6}, Landroid/view/View;->setBackgroundResource(I)V
 
@@ -299,7 +299,7 @@
 
     check-cast v6, Landroid/view/View;
 
-    const v8, 0x7f0402bc
+    const v8, 0x7f0402bb
 
     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_8
+    if-eq v1, v3, :cond_6
 
-    if-eq v1, v7, :cond_6
+    if-eq v1, v7, :cond_5
 
     if-eq v1, v6, :cond_4
 
@@ -323,30 +323,16 @@
     goto :goto_2
 
     :cond_4
-    if-eqz p3, :cond_5
-
-    const/16 v8, 0x1e
-
-    goto :goto_2
-
-    :cond_5
     const/16 v8, 0x14
 
     goto :goto_2
 
-    :cond_6
-    if-eqz p3, :cond_7
-
-    const/16 v8, 0xf
-
-    goto :goto_2
-
-    :cond_7
+    :cond_5
     const/16 v8, 0xa
 
     goto :goto_2
 
-    :cond_8
+    :cond_6
     const/4 v8, 0x2
 
     :goto_2
@@ -354,33 +340,33 @@
 
     const-string v10, "headerText"
 
-    if-nez v9, :cond_9
+    if-nez v9, :cond_7
 
     invoke-static {v10}, Lkotlin/jvm/internal/l;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    :cond_9
-    if-eq v1, v3, :cond_c
+    :cond_7
+    if-eq v1, v3, :cond_a
 
-    if-eq v1, v7, :cond_b
+    if-eq v1, v7, :cond_9
 
-    if-eq v1, v6, :cond_a
+    if-eq v1, v6, :cond_8
 
     const/4 v11, 0x0
 
     goto :goto_3
 
+    :cond_8
+    const v11, 0x7f120901
+
+    goto :goto_3
+
+    :cond_9
+    const v11, 0x7f120900
+
+    goto :goto_3
+
     :cond_a
-    const v11, 0x7f120926
-
-    goto :goto_3
-
-    :cond_b
-    const v11, 0x7f120925
-
-    goto :goto_3
-
-    :cond_c
-    const v11, 0x7f120924
+    const v11, 0x7f1208ff
 
     :goto_3
     invoke-static {v0, v11}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
@@ -391,70 +377,70 @@
 
     invoke-virtual {v9, v11}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    if-eq v1, v3, :cond_11
+    if-eq v1, v3, :cond_f
 
-    if-eq v1, v7, :cond_f
+    if-eq v1, v7, :cond_d
 
-    if-eq v1, v6, :cond_d
+    if-eq v1, v6, :cond_b
 
     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, 0x7f080338
+    const v9, 0x7f08032a
 
-    const v12, 0x7f080338
+    const v12, 0x7f08032a
 
     goto :goto_4
 
     :cond_e
-    const v9, 0x7f080339
+    const v9, 0x7f08032b
 
-    const v12, 0x7f080339
+    const v12, 0x7f08032b
 
     goto :goto_4
 
     :cond_f
     if-eqz v5, :cond_10
 
-    const v9, 0x7f080336
+    const v9, 0x7f080328
 
-    const v12, 0x7f080336
+    const v12, 0x7f080328
 
     goto :goto_4
 
     :cond_10
-    const v9, 0x7f080337
+    const v9, 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
+    const v12, 0x7f080329
 
     :goto_4
     iget-object v11, v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;->headerText:Landroid/widget/TextView;
 
-    if-nez v11, :cond_13
+    if-nez v11, :cond_11
 
     invoke-static {v10}, Lkotlin/jvm/internal/l;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    :cond_13
+    :cond_11
     const/4 v13, 0x0
 
     const/4 v14, 0x0
@@ -469,18 +455,18 @@
 
     iget-object v9, v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;->headerText:Landroid/widget/TextView;
 
-    if-nez v9, :cond_14
+    if-nez v9, :cond_12
 
     invoke-static {v10}, Lkotlin/jvm/internal/l;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    :cond_14
+    :cond_12
     invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;->getContext()Landroid/content/Context;
 
     move-result-object v10
 
-    if-eqz v5, :cond_15
+    if-eqz v5, :cond_13
 
-    const v11, 0x7f06014a
+    const v11, 0x7f060149
 
     invoke-static {v10, v11}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
 
@@ -488,8 +474,8 @@
 
     goto :goto_5
 
-    :cond_15
-    const v11, 0x7f0402a8
+    :cond_13
+    const v11, 0x7f0402a7
 
     invoke-static {v10, v11}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
 
@@ -502,16 +488,16 @@
 
     const-string v10, "headerBoostText"
 
-    if-nez v9, :cond_16
+    if-nez v9, :cond_14
 
     invoke-static {v10}, Lkotlin/jvm/internal/l;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    :cond_16
+    :cond_14
     invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;->getResources()Landroid/content/res/Resources;
 
     move-result-object v11
 
-    const v12, 0x7f100070
+    const v12, 0x7f10006f
 
     new-array v13, v3, [Ljava/lang/Object;
 
@@ -531,11 +517,11 @@
 
     iget-object v8, v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;->headerBoostText:Landroid/widget/TextView;
 
-    if-nez v8, :cond_17
+    if-nez v8, :cond_15
 
     invoke-static {v10}, Lkotlin/jvm/internal/l;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    :cond_17
+    :cond_15
     check-cast v8, Landroid/view/View;
 
     xor-int/lit8 v9, v5, 0x1
@@ -546,27 +532,27 @@
 
     iget-object v8, v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;->headerUnlocked:Landroid/view/View;
 
-    if-nez v8, :cond_18
+    if-nez v8, :cond_16
 
     const-string v9, "headerUnlocked"
 
     invoke-static {v9}, Lkotlin/jvm/internal/l;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    :cond_18
+    :cond_16
     invoke-static {v8, v5, v4, v7, v10}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
 
     iget-object v8, v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;->contentText:Landroid/widget/TextView;
 
-    if-nez v8, :cond_19
+    if-nez v8, :cond_17
 
     const-string v9, "contentText"
 
     invoke-static {v9}, Lkotlin/jvm/internal/l;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    :cond_19
-    if-eq v1, v3, :cond_1a
+    :cond_17
+    if-eq v1, v3, :cond_18
 
-    const v9, 0x7f120922
+    const v9, 0x7f1208fd
 
     invoke-static {v0, v9}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
 
@@ -576,8 +562,8 @@
 
     goto :goto_6
 
-    :cond_1a
-    const v9, 0x7f120920
+    :cond_18
+    const v9, 0x7f1208fb
 
     invoke-static {v0, v9}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
 
@@ -594,19 +580,19 @@
 
     const/4 v10, 0x4
 
-    const v11, 0x7f12091d
+    const v11, 0x7f1208f8
 
-    const v12, 0x7f0802b7
+    const v12, 0x7f0802ab
 
-    const v13, 0x7f12091e
+    const v13, 0x7f1208f9
 
-    const v14, 0x7f080381
+    const v14, 0x7f080375
 
-    if-eq v1, v3, :cond_1d
+    if-eq v1, v3, :cond_1b
 
-    if-eq v1, v7, :cond_1c
+    if-eq v1, v7, :cond_1a
 
-    if-eq v1, v6, :cond_1b
+    if-eq v1, v6, :cond_19
 
     invoke-static {}, Lkotlin/a/m;->emptyList()Ljava/util/List;
 
@@ -614,7 +600,7 @@
 
     goto/16 :goto_7
 
-    :cond_1b
+    :cond_19
     new-array v1, v10, [Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;
 
     new-instance v8, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;
@@ -685,17 +671,17 @@
 
     new-instance v8, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;
 
-    const v9, 0x7f0803af
+    const v9, 0x7f0803a1
 
     invoke-virtual {v2, v9, v5}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$configure$1;->invoke(IZ)I
 
     move-result v9
 
-    const v10, 0x7f12091f
+    const v10, 0x7f1208fa
 
     new-array v11, v3, [Ljava/lang/Object;
 
-    const v12, 0x7f1205e1
+    const v12, 0x7f1205bc
 
     new-array v3, v3, [Ljava/lang/Object;
 
@@ -729,13 +715,13 @@
 
     new-instance v3, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;
 
-    const v4, 0x7f080387
+    const v4, 0x7f08037b
 
     invoke-virtual {v2, v4, v5}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$configure$1;->invoke(IZ)I
 
     move-result v2
 
-    const v4, 0x7f12091c
+    const v4, 0x7f1208f7
 
     invoke-static {v0, v4}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
 
@@ -751,7 +737,7 @@
 
     goto/16 :goto_7
 
-    :cond_1c
+    :cond_1a
     new-array v1, v9, [Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;
 
     new-instance v9, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;
@@ -820,17 +806,17 @@
 
     new-instance v8, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;
 
-    const v9, 0x7f0803af
+    const v9, 0x7f0803a1
 
     invoke-virtual {v2, v9, v5}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$configure$1;->invoke(IZ)I
 
     move-result v9
 
-    const v11, 0x7f12091f
+    const v11, 0x7f1208fa
 
     new-array v12, v3, [Ljava/lang/Object;
 
-    const v13, 0x7f1205e1
+    const v13, 0x7f1205bc
 
     new-array v3, v3, [Ljava/lang/Object;
 
@@ -864,13 +850,13 @@
 
     new-instance v3, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;
 
-    const v4, 0x7f0802d3
+    const v4, 0x7f0802c7
 
     invoke-virtual {v2, v4, v5}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$configure$1;->invoke(IZ)I
 
     move-result v4
 
-    const v7, 0x7f12091a
+    const v7, 0x7f1208f5
 
     invoke-static {v0, v7}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
 
@@ -882,13 +868,13 @@
 
     new-instance v3, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;
 
-    const v4, 0x7f0802b2
+    const v4, 0x7f0802a6
 
     invoke-virtual {v2, v4, v5}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$configure$1;->invoke(IZ)I
 
     move-result v2
 
-    const v4, 0x7f12091b
+    const v4, 0x7f1208f6
 
     invoke-static {v0, v4}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
 
@@ -904,7 +890,7 @@
 
     goto/16 :goto_7
 
-    :cond_1d
+    :cond_1b
     new-array v1, v9, [Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;
 
     new-instance v9, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;
@@ -973,13 +959,13 @@
 
     new-instance v3, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;
 
-    const v4, 0x7f080313
+    const v4, 0x7f080307
 
     invoke-virtual {v2, v4, v5}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$configure$1;->invoke(IZ)I
 
     move-result v4
 
-    const v8, 0x7f120917
+    const v8, 0x7f1208f2
 
     invoke-static {v0, v8}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
 
@@ -991,13 +977,13 @@
 
     new-instance v3, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;
 
-    const v4, 0x7f0802d3
+    const v4, 0x7f0802c7
 
     invoke-virtual {v2, v4, v5}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$configure$1;->invoke(IZ)I
 
     move-result v4
 
-    const v7, 0x7f120918
+    const v7, 0x7f1208f3
 
     invoke-static {v0, v7}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
 
@@ -1009,13 +995,13 @@
 
     new-instance v3, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;
 
-    const v4, 0x7f0802b2
+    const v4, 0x7f0802a6
 
     invoke-virtual {v2, v4, v5}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$configure$1;->invoke(IZ)I
 
     move-result v2
 
-    const v4, 0x7f120919
+    const v4, 0x7f1208f4
 
     invoke-static {v0, v4}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
 
@@ -1032,13 +1018,13 @@
     :goto_7
     iget-object v2, v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;->adapter:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter;
 
-    if-nez v2, :cond_1e
+    if-nez v2, :cond_1c
 
     const-string v3, "adapter"
 
     invoke-static {v3}, Lkotlin/jvm/internal/l;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    :cond_1e
+    :cond_1c
     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 41c0c26751..22804b0626 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, 0x7f0d0096
+    const v0, 0x7f0d0094
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
-    const p1, 0x7f0a0516
+    const p1, 0x7f0a0508
 
     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 222fea84ba..b3adc57bb2 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/Func5;
+.implements Lrx/functions/Func4;
 
 
 # annotations
@@ -26,14 +26,12 @@
         "Ljava/lang/Object;",
         "T4:",
         "Ljava/lang/Object;",
-        "T5:",
-        "Ljava/lang/Object;",
         "R:",
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lrx/functions/Func5<",
-        "TT1;TT2;TT3;TT4;TT5;TR;>;"
+        "Lrx/functions/Func4<",
+        "TT1;TT2;TT3;TT4;TR;>;"
     }
 .end annotation
 
@@ -65,59 +63,29 @@
 
 
 # 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/models/domain/ModelExperiment;)Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;
-    .locals 7
+.method public final call(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;Lcom/discord/stores/StorePremiumGuildSubscription$State;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;)Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;
+    .locals 2
 
-    new-instance v6, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;
+    new-instance v0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;
 
-    const-string v0, "me"
+    const-string v1, "me"
 
-    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-string v0, "premiumGuildSubscriptionsState"
+    const-string v1, "premiumGuildSubscriptionsState"
 
-    invoke-static {p3, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p3, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v0, "premiumSubscriptionState"
+    const-string v1, "premiumSubscriptionState"
 
-    invoke-static {p4, v0}, 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
 
-    const/4 v0, 0x1
+    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
 
-    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
+    return-object v0
 .end method
 
-.method public final bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+.method public final bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
     check-cast p1, Lcom/discord/models/domain/ModelUser;
@@ -128,9 +96,7 @@
 
     check-cast p4, Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;
 
-    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;
+    invoke-virtual {p0, p1, p2, p3, p4}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model$Companion$get$1;->call(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;Lcom/discord/stores/StorePremiumGuildSubscription$State;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;)Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model$Companion.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model$Companion.smali
index 396e0878f6..8884cc22b0 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 7
+    .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(J)",
@@ -52,71 +52,55 @@
 
     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
 
-    invoke-virtual {v0, p1, p2}, Lcom/discord/stores/StoreGuilds;->get(J)Lrx/Observable;
+    sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
-    move-result-object v2
+    invoke-virtual {v1}, Lcom/discord/stores/StoreStream$Companion;->getGuilds()Lcom/discord/stores/StoreGuilds;
 
-    sget-object p1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+    move-result-object v1
 
-    invoke-virtual {p1}, Lcom/discord/stores/StoreStream$Companion;->getPremiumGuildSubscriptions()Lcom/discord/stores/StorePremiumGuildSubscription;
+    invoke-virtual {v1, p1, p2}, Lcom/discord/stores/StoreGuilds;->get(J)Lrx/Observable;
 
     move-result-object p1
 
-    const/4 p2, 0x0
+    sget-object p2, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
-    const/4 v0, 0x1
+    invoke-virtual {p2}, Lcom/discord/stores/StoreStream$Companion;->getPremiumGuildSubscriptions()Lcom/discord/stores/StorePremiumGuildSubscription;
 
-    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 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;
 
     move-result-object p1
 
-    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              }"
+    const-string p2, "Observable\n             \u2026ionState)\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 0302acef37..7e38e6172a 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,8 +33,6 @@
 
 .field private final premiumSubscriptionState:Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;
 
-.field private final useNewPremiumTierValues:Z
-
 
 # direct methods
 .method static constructor <clinit>()V
@@ -51,7 +49,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;Z)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;)V
     .locals 1
 
     const-string v0, "meUser"
@@ -76,70 +74,41 @@
 
     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;ZILjava/lang/Object;)Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;
-    .locals 3
+.method public static synthetic copy$default(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;Lcom/discord/stores/StorePremiumGuildSubscription$State;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;ILjava/lang/Object;)Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;
+    .locals 0
 
-    and-int/lit8 p7, p6, 0x1
+    and-int/lit8 p6, p5, 0x1
 
-    if-eqz p7, :cond_0
+    if-eqz p6, :cond_0
 
     iget-object p1, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;->meUser:Lcom/discord/models/domain/ModelUser;
 
     :cond_0
-    and-int/lit8 p7, p6, 0x2
+    and-int/lit8 p6, p5, 0x2
 
-    if-eqz p7, :cond_1
+    if-eqz p6, :cond_1
 
     iget-object p2, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;->guild:Lcom/discord/models/domain/ModelGuild;
 
     :cond_1
-    move-object p7, p2
+    and-int/lit8 p6, p5, 0x4
 
-    and-int/lit8 p2, p6, 0x4
-
-    if-eqz p2, :cond_2
+    if-eqz p6, :cond_2
 
     iget-object p3, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;->premiumGuildSubscriptionState:Lcom/discord/stores/StorePremiumGuildSubscription$State;
 
     :cond_2
-    move-object v0, p3
+    and-int/lit8 p5, p5, 0x8
 
-    and-int/lit8 p2, p6, 0x8
-
-    if-eqz p2, :cond_3
+    if-eqz p5, :cond_3
 
     iget-object p4, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;->premiumSubscriptionState:Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;
 
     :cond_3
-    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;
+    invoke-virtual {p0, p1, p2, p3, p4}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;->copy(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;Lcom/discord/stores/StorePremiumGuildSubscription$State;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;)Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;
 
     move-result-object p0
 
@@ -180,17 +149,9 @@
     return-object v0
 .end method
 
-.method public final component5()Z
+.method public final copy(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;Lcom/discord/stores/StorePremiumGuildSubscription$State;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;)Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;
     .locals 1
 
-    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
@@ -205,102 +166,74 @@
 
     new-instance v0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$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/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
+    invoke-direct {v0, p1, p2, p3, p4}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;-><init>(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;Lcom/discord/stores/StorePremiumGuildSubscription$State;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;)V
 
     return-object v0
 .end method
 
 .method public final equals(Ljava/lang/Object;)Z
-    .locals 4
+    .locals 2
 
-    const/4 v0, 0x1
+    if-eq p0, p1, :cond_1
 
-    if-eq p0, p1, :cond_2
+    instance-of v0, p1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;
 
-    instance-of v1, p1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;
-
-    const/4 v2, 0x0
-
-    if-eqz v1, :cond_1
+    if-eqz v0, :cond_0
 
     check-cast p1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;
 
-    iget-object v1, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;->meUser:Lcom/discord/models/domain/ModelUser;
+    iget-object v0, p0, 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;
+    iget-object v1, p1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;->meUser:Lcom/discord/models/domain/ModelUser;
 
-    invoke-static {v1, v3}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
-    move-result v1
+    move-result v0
 
-    if-eqz v1, :cond_1
+    if-eqz v0, :cond_0
 
-    iget-object v1, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;->guild:Lcom/discord/models/domain/ModelGuild;
+    iget-object v0, p0, 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;
+    iget-object v1, p1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;->guild:Lcom/discord/models/domain/ModelGuild;
 
-    invoke-static {v1, v3}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
-    move-result v1
+    move-result v0
 
-    if-eqz v1, :cond_1
+    if-eqz v0, :cond_0
 
-    iget-object v1, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;->premiumGuildSubscriptionState:Lcom/discord/stores/StorePremiumGuildSubscription$State;
+    iget-object v0, p0, 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;
+    iget-object v1, p1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;->premiumGuildSubscriptionState:Lcom/discord/stores/StorePremiumGuildSubscription$State;
 
-    invoke-static {v1, v3}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
-    move-result v1
+    move-result v0
 
-    if-eqz v1, :cond_1
+    if-eqz v0, :cond_0
 
-    iget-object v1, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;->premiumSubscriptionState:Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;
+    iget-object v0, p0, 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;
+    iget-object p1, p1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;->premiumSubscriptionState:Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;
 
-    invoke-static {v1, v3}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
-    move-result v1
+    move-result p1
 
-    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
+    if-eqz p1, :cond_0
 
     goto :goto_0
 
     :cond_0
     const/4 p1, 0x0
 
-    :goto_0
-    if-eqz p1, :cond_1
-
-    goto :goto_1
+    return p1
 
     :cond_1
-    return v2
+    :goto_0
+    const/4 p1, 0x1
 
-    :cond_2
-    :goto_1
-    return v0
+    return p1
 .end method
 
 .method public final getGuild()Lcom/discord/models/domain/ModelGuild;
@@ -335,14 +268,6 @@
     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
 
@@ -411,17 +336,6 @@
     :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
 
@@ -462,14 +376,6 @@
 
     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 ffa91e8d49..b465396235 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,8 +31,6 @@
 
 .field private subscriptionCount:I
 
-.field private final useNewPremiumTierValues:Z
-
 .field private final views:Ljava/util/HashMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -60,18 +58,16 @@
     return-void
 .end method
 
-.method public constructor <init>(Z)V
-    .locals 0
+.method public constructor <init>()V
+    .locals 1
 
     invoke-direct {p0}, Landroidx/viewpager/widget/PagerAdapter;-><init>()V
 
-    iput-boolean p1, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$PerksPagerAdapter;->useNewPremiumTierValues:Z
+    new-instance v0, Ljava/util/HashMap;
 
-    new-instance p1, Ljava/util/HashMap;
+    invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
 
-    invoke-direct {p1}, Ljava/util/HashMap;-><init>()V
-
-    iput-object p1, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$PerksPagerAdapter;->views:Ljava/util/HashMap;
+    iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$PerksPagerAdapter;->views:Ljava/util/HashMap;
 
     return-void
 .end method
@@ -104,7 +100,7 @@
 
     if-eqz v1, :cond_3
 
-    const v2, 0x7f0a05e4
+    const v2, 0x7f0a05cb
 
     invoke-virtual {v1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -124,12 +120,12 @@
 
     if-nez v3, :cond_0
 
-    const v3, 0x7f120e70
+    const v3, 0x7f120e33
 
     goto :goto_1
 
     :cond_0
-    const v3, 0x7f120e74
+    const v3, 0x7f120e35
 
     :goto_1
     invoke-virtual {v1, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -157,9 +153,7 @@
 
     iget v2, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$PerksPagerAdapter;->premiumTier:I
 
-    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
+    invoke-virtual {v1, v0, v2}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;->configure(II)V
 
     :cond_3
     :goto_3
@@ -213,14 +207,6 @@
     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
 
@@ -254,9 +240,7 @@
 
     iget v1, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$PerksPagerAdapter;->premiumTier:I
 
-    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
+    invoke-virtual {v0, p2, v1}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;->configure(II)V
 
     check-cast v0, Landroid/view/View;
 
@@ -271,7 +255,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f0d0077
+    const v1, 0x7f0d0076
 
     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 265e779347..730f4684b9 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,20 +17,26 @@
 .end annotation
 
 
-# instance fields
-.field final synthetic $availableBoosts:Ljava/util/List;
-
-.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$2;
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;Ljava/util/List;)V
+.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
     .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
@@ -39,9 +45,9 @@
 
 # virtual methods
 .method public final onClick(Landroid/view/View;)V
-    .locals 5
+    .locals 2
 
-    sget-object v0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->Companion:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$Companion;
+    sget-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->Companion:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$Companion;
 
     const-string v1, "it"
 
@@ -55,29 +61,13 @@
 
     invoke-static {p1, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$2;->this$0:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
+    const/4 v1, 0x1
 
-    invoke-static {v1}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->access$getGuildId$p(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;)J
+    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    move-result-wide v1
+    move-result-object v1
 
-    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
+    invoke-virtual {v0, p1, v1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$Companion;->launch(Landroid/content/Context;Ljava/lang/Integer;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$3.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$3.smali
index 81998ca5a0..ca35599b9b 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,26 +17,20 @@
 .end annotation
 
 
-# static fields
-.field public static final INSTANCE:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$3;
+# instance fields
+.field final synthetic $hasAppleSubscription:Z
+
+.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$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
+.method constructor <init>(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;Z)V
     .locals 0
 
+    iput-object p1, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$3;->this$0:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
+
+    iput-boolean p2, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$3;->$hasAppleSubscription:Z
+
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     return-void
@@ -45,29 +39,36 @@
 
 # virtual methods
 .method public final onClick(Landroid/view/View;)V
-    .locals 2
+    .locals 3
 
-    sget-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->Companion:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$Companion;
+    iget-boolean p1, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$3;->$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$3;->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
 
-    const/4 v1, 0x1
+    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$3;->this$0:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
 
-    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    const v1, 0x7f1200ef
 
-    move-result-object v1
+    invoke-virtual {v0, v1}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getString(I)Ljava/lang/String;
 
-    invoke-virtual {v0, p1, v1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$Companion;->launch(Landroid/content/Context;Ljava/lang/Integer;)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$configureUI$4.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$4.smali
index 26f47c0361..3dffa577b0 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,19 +18,15 @@
 
 
 # instance fields
-.field final synthetic $hasAppleSubscription:Z
-
 .field final synthetic this$0:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;Z)V
+.method constructor <init>(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;)V
     .locals 0
 
     iput-object p1, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$4;->this$0:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
 
-    iput-boolean p2, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$4;->$hasAppleSubscription:Z
-
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     return-void
@@ -41,34 +37,27 @@
 .method public final onClick(Landroid/view/View;)V
     .locals 3
 
-    iget-boolean p1, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$4;->$hasAppleSubscription:Z
+    sget-object v0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->Companion:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$Companion;
 
-    if-eqz p1, :cond_0
+    const-string v1, "it"
 
-    iget-object p1, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$4;->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$4;->this$0:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
+    iget-object v1, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$4;->this$0:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
 
-    const v1, 0x7f1200ef
+    invoke-static {v1}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->access$getGuildId$p(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;)J
 
-    invoke-virtual {v0, v1}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getString(I)Ljava/lang/String;
+    move-result-wide v1
 
-    move-result-object v0
+    invoke-virtual {v0, p1, v1, v2}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$Companion;->create(Landroid/content/Context;J)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$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$onViewBoundOrOnResume$1.smali
index 18b30a07b3..ee43a3311b 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 4abda25800..458cee969b 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, 0x7f0a00d2
+    const v0, 0x7f0a00d1
 
     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, 0x7f0a00d4
+    const v0, 0x7f0a00d3
 
     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, 0x7f0a00d6
+    const v0, 0x7f0a00d5
 
     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, 0x7f0a00d7
+    const v0, 0x7f0a00d6
 
     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, 0x7f0a00d9
+    const v0, 0x7f0a00d8
 
     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, 0x7f0a00da
+    const v0, 0x7f0a00d9
 
     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, 0x7f0a00dc
+    const v0, 0x7f0a00db
 
     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, 0x7f0a00dd
+    const v0, 0x7f0a00dc
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -689,6 +689,12 @@
 
     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
@@ -836,7 +842,7 @@
 
     check-cast v2, Landroid/view/View;
 
-    const v3, 0x7f0402a1
+    const v3, 0x7f0402a0
 
     invoke-static {v2, v3}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/view/View;I)I
 
@@ -849,7 +855,7 @@
 
     check-cast v2, Landroid/view/View;
 
-    const v3, 0x7f0402ab
+    const v3, 0x7f0402aa
 
     invoke-static {v2, v3}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/view/View;I)I
 
@@ -867,8 +873,8 @@
     return-void
 .end method
 
-.method private final configureProgressBar(IIZ)V
-    .locals 5
+.method private final configureProgressBar(II)V
+    .locals 6
 
     invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getBoostProgressBar()Landroid/widget/ProgressBar;
 
@@ -876,66 +882,66 @@
 
     sget-object v1, Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils;->INSTANCE:Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils;
 
-    invoke-virtual {v1, p1, p2, p3}, Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils;->calculateTotalProgress(IIZ)I
+    invoke-virtual {v1, p1, p2}, Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils;->calculateTotalProgress(II)I
 
-    move-result p3
+    move-result v1
 
-    invoke-virtual {v0, p3}, Landroid/widget/ProgressBar;->setProgress(I)V
+    invoke-virtual {v0, v1}, Landroid/widget/ProgressBar;->setProgress(I)V
 
     invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getBoostProgressBar()Landroid/widget/ProgressBar;
 
-    move-result-object p3
+    move-result-object v0
 
-    const/4 v0, 0x3
+    const/4 v1, 0x3
 
-    const/4 v1, 0x2
+    const/4 v2, 0x2
 
-    const/4 v2, 0x0
+    const/4 v3, 0x0
 
-    const/4 v3, 0x1
+    const/4 v4, 0x1
 
     if-eqz p1, :cond_3
 
-    if-eq p1, v3, :cond_2
+    if-eq p1, v4, :cond_2
 
-    if-eq p1, v1, :cond_1
+    if-eq p1, v2, :cond_1
 
-    if-eq p1, v0, :cond_0
+    if-eq p1, v1, :cond_0
 
-    const/4 v4, 0x0
+    const/4 v5, 0x0
 
     goto :goto_0
 
     :cond_0
-    const v4, 0x7f120ed3
+    const v5, 0x7f120e5a
 
     goto :goto_0
 
     :cond_1
-    const v4, 0x7f120ed2
+    const v5, 0x7f120e59
 
     goto :goto_0
 
     :cond_2
-    const v4, 0x7f120ed1
+    const v5, 0x7f120e58
 
     goto :goto_0
 
     :cond_3
-    const v4, 0x7f120e5c
+    const v5, 0x7f120e24
 
     :goto_0
-    invoke-virtual {p0, v4}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getString(I)Ljava/lang/String;
+    invoke-virtual {p0, v5}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getString(I)Ljava/lang/String;
 
-    move-result-object v4
+    move-result-object v5
 
-    check-cast v4, Ljava/lang/CharSequence;
+    check-cast v5, Ljava/lang/CharSequence;
 
-    invoke-virtual {p3, v4}, Landroid/widget/ProgressBar;->setContentDescription(Ljava/lang/CharSequence;)V
+    invoke-virtual {v0, v5}, Landroid/widget/ProgressBar;->setContentDescription(Ljava/lang/CharSequence;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getBoostTier0Iv()Landroid/widget/ImageView;
 
-    move-result-object p3
+    move-result-object v0
 
     if-lez p2, :cond_4
 
@@ -947,7 +953,7 @@
     const/4 p2, 0x0
 
     :goto_1
-    invoke-virtual {p3, p2}, Landroid/widget/ImageView;->setEnabled(Z)V
+    invoke-virtual {v0, p2}, Landroid/widget/ImageView;->setEnabled(Z)V
 
     invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getBoostTier1Iv()Landroid/widget/ImageView;
 
@@ -955,42 +961,42 @@
 
     if-lez p1, :cond_5
 
-    const/4 p3, 0x1
+    const/4 v0, 0x1
 
     goto :goto_2
 
     :cond_5
-    const/4 p3, 0x0
+    const/4 v0, 0x0
 
     :goto_2
-    invoke-virtual {p2, p3}, Landroid/widget/ImageView;->setEnabled(Z)V
+    invoke-virtual {p2, v0}, 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, v1, :cond_6
+    if-lt p1, v2, :cond_6
 
-    const/4 p3, 0x1
+    const/4 v0, 0x1
 
     goto :goto_3
 
     :cond_6
-    const/4 p3, 0x0
+    const/4 v0, 0x0
 
     :goto_3
-    invoke-virtual {p2, p3}, Landroid/widget/ImageView;->setEnabled(Z)V
+    invoke-virtual {p2, v0}, 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, v0, :cond_7
+    if-lt p1, v1, :cond_7
 
-    const/4 v2, 0x1
+    const/4 v3, 0x1
 
     :cond_7
-    invoke-virtual {p2, v2}, Landroid/widget/ImageView;->setEnabled(Z)V
+    invoke-virtual {p2, v3}, Landroid/widget/ImageView;->setEnabled(Z)V
 
     return-void
 .end method
@@ -998,7 +1004,7 @@
 .method private final configureToolbar(Ljava/lang/String;)V
     .locals 1
 
-    const v0, 0x7f120e69
+    const v0, 0x7f120e2f
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -1010,7 +1016,7 @@
 .end method
 
 .method private final configureUI(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;)V
-    .locals 21
+    .locals 26
 
     move-object/from16 v0, p0
 
@@ -1052,7 +1058,7 @@
 
     const/4 v6, 0x0
 
-    if-nez v5, :cond_16
+    if-nez v5, :cond_1c
 
     sget-object v5, Lcom/discord/stores/StoreSubscriptions$SubscriptionsState$Loading;->INSTANCE:Lcom/discord/stores/StoreSubscriptions$SubscriptionsState$Loading;
 
@@ -1062,7 +1068,7 @@
 
     if-eqz v5, :cond_2
 
-    goto/16 :goto_9
+    goto/16 :goto_d
 
     :cond_2
     sget-object v5, Lcom/discord/stores/StorePremiumGuildSubscription$State$Failure;->INSTANCE:Lcom/discord/stores/StorePremiumGuildSubscription$State$Failure;
@@ -1073,7 +1079,7 @@
 
     const/4 v7, 0x1
 
-    if-nez v5, :cond_15
+    if-nez v5, :cond_1b
 
     sget-object v5, Lcom/discord/stores/StoreSubscriptions$SubscriptionsState$Failure;->INSTANCE:Lcom/discord/stores/StoreSubscriptions$SubscriptionsState$Failure;
 
@@ -1083,7 +1089,7 @@
 
     if-eqz v5, :cond_3
 
-    goto/16 :goto_8
+    goto/16 :goto_c
 
     :cond_3
     instance-of v5, v3, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;
@@ -1103,15 +1109,19 @@
     invoke-virtual {v5, v8}, Lcom/discord/app/AppViewFlipper;->setDisplayedChild(I)V
 
     :cond_4
-    if-eqz v3, :cond_14
+    if-eqz v3, :cond_1a
 
     check-cast v3, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;
 
-    invoke-virtual {v3}, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;->getPremiumGuildSubscriptionSlots()Ljava/util/List;
+    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;
 
     move-result-object v3
 
-    if-eqz v4, :cond_13
+    if-eqz v4, :cond_19
 
     check-cast v4, Lcom/discord/stores/StoreSubscriptions$SubscriptionsState$Loaded;
 
@@ -1121,35 +1131,33 @@
 
     invoke-virtual {v2}, Lcom/discord/models/domain/ModelGuild;->getPremiumTier()I
 
-    move-result v5
+    move-result v9
 
     invoke-virtual {v2}, Lcom/discord/models/domain/ModelGuild;->getPremiumSubscriptionCount()Ljava/lang/Integer;
 
-    move-result-object v9
+    move-result-object v10
 
-    if-eqz v9, :cond_5
+    if-eqz v10, :cond_5
 
-    invoke-virtual {v9}, Ljava/lang/Integer;->intValue()I
+    invoke-virtual {v10}, Ljava/lang/Integer;->intValue()I
 
-    move-result v9
+    move-result v10
 
     goto :goto_0
 
     :cond_5
-    const/4 v9, 0x0
+    const/4 v10, 0x0
 
     :goto_0
-    invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
+    move-object v11, v5
 
-    move-result-wide v10
+    check-cast v11, Ljava/lang/Iterable;
 
-    check-cast v4, Ljava/lang/Iterable;
-
-    instance-of v12, v4, Ljava/util/Collection;
+    instance-of v12, v11, Ljava/util/Collection;
 
     if-eqz v12, :cond_6
 
-    move-object v12, v4
+    move-object v12, v11
 
     check-cast v12, Ljava/util/Collection;
 
@@ -1157,122 +1165,167 @@
 
     move-result v12
 
-    if-nez v12, :cond_8
+    if-nez v12, :cond_9
 
     :cond_6
-    invoke-interface {v4}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+    invoke-interface {v11}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
-    move-result-object v4
+    move-result-object v11
 
     :cond_7
-    invoke-interface {v4}, Ljava/util/Iterator;->hasNext()Z
+    invoke-interface {v11}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v12
 
-    if-eqz v12, :cond_8
+    if-eqz v12, :cond_9
 
-    invoke-interface {v4}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+    invoke-interface {v11}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
     move-result-object v12
 
-    check-cast v12, Lcom/discord/models/domain/ModelSubscription;
+    check-cast v12, Lcom/discord/models/domain/ModelPremiumGuildSubscription;
 
-    invoke-virtual {v12}, Lcom/discord/models/domain/ModelSubscription;->isAppleSubscription()Z
+    invoke-virtual {v12}, Lcom/discord/models/domain/ModelPremiumGuildSubscription;->getGuildId()J
 
-    move-result v12
+    move-result-wide v12
 
-    if-eqz v12, :cond_7
+    invoke-virtual {v2}, Lcom/discord/models/domain/ModelGuild;->getId()J
 
-    const/4 v4, 0x1
+    move-result-wide v14
+
+    cmp-long v16, v12, v14
+
+    if-nez v16, :cond_8
+
+    const/4 v12, 0x1
 
     goto :goto_1
 
     :cond_8
-    const/4 v4, 0x0
+    const/4 v12, 0x0
 
     :goto_1
-    check-cast v3, Ljava/lang/Iterable;
+    if-eqz v12, :cond_7
 
-    new-instance v12, Ljava/util/ArrayList;
+    const/4 v11, 0x1
 
-    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
+    goto :goto_2
 
     :cond_9
+    const/4 v11, 0x0
+
     :goto_2
-    invoke-interface {v3}, Ljava/util/Iterator;->hasNext()Z
+    if-eqz v3, :cond_a
 
-    move-result v13
+    invoke-virtual {v3}, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;->getExpiresAtTimestamp()J
 
-    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
+    move-result-wide v12
 
     goto :goto_3
 
     :cond_a
-    const/4 v14, 0x0
+    const-wide/16 v12, 0x0
 
     :goto_3
-    if-eqz v14, :cond_9
+    invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
 
-    invoke-interface {v12, v13}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+    move-result-wide v14
 
-    goto :goto_2
+    cmp-long v3, v12, v14
+
+    if-lez v3, :cond_b
+
+    const/4 v3, 0x1
+
+    goto :goto_4
 
     :cond_b
-    check-cast v12, Ljava/util/List;
+    const/4 v3, 0x0
 
-    move-object v3, v12
+    :goto_4
+    move-object v12, v4
 
-    check-cast v3, Ljava/util/Collection;
+    check-cast v12, Ljava/lang/Iterable;
 
-    invoke-interface {v3}, Ljava/util/Collection;->isEmpty()Z
+    instance-of v13, v12, Ljava/util/Collection;
 
-    move-result v3
+    if-eqz v13, :cond_c
 
-    xor-int/2addr v3, v7
+    move-object v13, v12
 
+    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-virtual/range {p1 .. p1}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;->getUseNewPremiumTierValues()Z
+    invoke-direct {v0, v9, v10}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->configureProgressBar(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 {v0, v9, v10}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->configureViewpager(II)V
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getBoostNumber()Landroid/widget/TextView;
 
@@ -1282,17 +1335,17 @@
 
     move-result-object v5
 
-    const v10, 0x7f100095
+    const v9, 0x7f100090
 
-    new-array v11, v7, [Ljava/lang/Object;
+    new-array v13, v7, [Ljava/lang/Object;
 
-    invoke-static {v9}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {v10}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    move-result-object v13
+    move-result-object v14
 
-    aput-object v13, v11, v6
+    aput-object v14, v13, v6
 
-    invoke-virtual {v5, v10, v9, v11}, Landroid/content/res/Resources;->getQuantityString(II[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {v5, v9, v10, v13}, Landroid/content/res/Resources;->getQuantityString(II[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v5
 
@@ -1300,9 +1353,24 @@
 
     invoke-virtual {v2, v5}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    const/16 v2, 0x8
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser;->getPremiumType()I
 
-    if-eqz v3, :cond_c
+    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
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getButtonFlipper()Lcom/discord/app/AppViewFlipper;
 
@@ -1314,48 +1382,31 @@
 
     move-result-object v1
 
-    new-instance v3, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$2;
+    new-instance v2, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$4;
 
-    invoke-direct {v3, v0, v12}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$2;-><init>(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;Ljava/util/List;)V
+    invoke-direct {v2, v0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$4;-><init>(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;)V
 
-    check-cast v3, Landroid/view/View$OnClickListener;
+    check-cast v2, Landroid/view/View$OnClickListener;
 
-    invoke-virtual {v1, v3}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    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
 
+    const/16 v2, 0x8
+
     invoke-virtual {v1, v2}, Landroid/widget/TextView;->setVisibility(I)V
 
     return-void
 
-    :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
+    :cond_11
     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
@@ -1366,60 +1417,6 @@
 
     invoke-virtual {v1, v2}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    :goto_4
-    return-void
-
-    :cond_e
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getButtonFlipper()Lcom/discord/app/AppViewFlipper;
-
-    move-result-object v2
-
-    invoke-virtual {v2, v7}, Lcom/discord/app/AppViewFlipper;->setDisplayedChild(I)V
-
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getUpgradeButton()Landroid/widget/Button;
-
-    move-result-object v2
-
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser;->getPremiumType()I
-
-    move-result v1
-
-    if-nez v1, :cond_f
-
-    const v1, 0x7f120e62
-
-    goto :goto_5
-
-    :cond_f
-    const v1, 0x7f120e66
-
-    :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;
-
-    move-result-object v1
-
-    check-cast v1, Landroid/view/View;
-
-    xor-int/lit8 v2, v4, 0x1
-
-    const/4 v3, 0x0
-
-    const/4 v5, 0x0
-
-    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$3;->INSTANCE:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$3;
-
-    check-cast v2, Landroid/view/View$OnClickListener;
-
-    invoke-virtual {v1, v2}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
-
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getButtonInfo()Landroid/widget/TextView;
 
     move-result-object v1
@@ -1430,17 +1427,7 @@
 
     check-cast v2, Landroid/view/View;
 
-    if-eqz v4, :cond_10
-
-    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
+    invoke-static {v2, v5}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/view/View;I)I
 
     move-result v2
 
@@ -1448,88 +1435,219 @@
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getButtonInfo()Landroid/widget/TextView;
 
-    move-result-object v8
+    move-result-object v4
 
-    if-eqz v4, :cond_11
+    const v5, 0x7f0801d6
 
-    const v1, 0x7f0801e2
+    const/4 v6, 0x0
 
-    const v9, 0x7f0801e2
+    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, 0x7f120e38
 
     goto :goto_7
 
-    :cond_11
-    const/4 v9, 0x0
+    :cond_12
+    if-eqz v11, :cond_13
+
+    const v2, 0x7f120e36
+
+    goto :goto_7
+
+    :cond_13
+    const v2, 0x7f120e37
 
     :goto_7
-    const/4 v10, 0x0
+    invoke-virtual {v0, v2}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getString(I)Ljava/lang/String;
 
-    const/4 v11, 0x0
+    move-result-object v2
 
-    const/4 v12, 0x0
+    check-cast v2, Ljava/lang/CharSequence;
 
-    const/16 v13, 0xe
+    invoke-static {v1, v2}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy(Landroid/widget/TextView;Ljava/lang/CharSequence;)V
 
-    const/4 v14, 0x0
+    :goto_8
+    return-void
 
-    invoke-static/range {v8 .. v14}, Lcom/discord/utilities/drawable/DrawableCompat;->setCompoundDrawablesCompat$default(Landroid/widget/TextView;IIIIILjava/lang/Object;)V
+    :cond_14
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getButtonFlipper()Lcom/discord/app/AppViewFlipper;
 
-    if-eqz v4, :cond_12
+    move-result-object v2
 
-    invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->requireContext()Landroid/content/Context;
+    invoke-virtual {v2, v7}, Lcom/discord/app/AppViewFlipper;->setDisplayedChild(I)V
 
-    move-result-object v15
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getUpgradeButton()Landroid/widget/Button;
 
-    const-string v1, "requireContext()"
+    move-result-object v2
 
-    invoke-static {v15, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser;->getPremiumType()I
 
-    const v1, 0x7f120e67
+    move-result v1
 
-    new-array v2, v7, [Ljava/lang/Object;
+    if-nez v1, :cond_15
 
-    const-string v3, "https://support.apple.com/en-us/HT202039"
+    const v1, 0x7f120e2a
 
-    aput-object v3, v2, v6
+    goto :goto_9
 
-    invoke-virtual {v0, v1, v2}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    :cond_15
+    const v1, 0x7f120e2c
+
+    :goto_9
+    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;
 
     move-result-object v1
 
-    const-string v2, "getString(R.string.premi\u2026pple.com/en-us/HT202039\")"
+    check-cast v1, Landroid/view/View;
 
-    invoke-static {v1, v2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    xor-int/lit8 v2, v12, 0x1
 
-    move-object/from16 v16, v1
+    const/4 v3, 0x0
 
-    check-cast v16, Ljava/lang/CharSequence;
+    const/4 v4, 0x0
+
+    invoke-static {v1, v2, v3, v8, v4}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setEnabledAlpha$default(Landroid/view/View;ZFILjava/lang/Object;)V
+
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/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;
+
+    check-cast v2, Landroid/view/View$OnClickListener;
+
+    invoke-virtual {v1, v2}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/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;
+
+    if-eqz v12, :cond_16
+
+    const v3, 0x7f060126
+
+    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
+
+    if-eqz v12, :cond_17
+
+    const v1, 0x7f0801d7
+
+    const v14, 0x7f0801d7
+
+    goto :goto_b
+
+    :cond_17
+    const/4 v14, 0x0
+
+    :goto_b
+    const/4 v15, 0x0
+
+    const/16 v16, 0x0
 
     const/16 v17, 0x0
 
-    const/16 v18, 0x0
+    const/16 v18, 0xe
 
-    const/16 v19, 0xc
+    const/16 v19, 0x0
 
-    const/16 v20, 0x0
+    invoke-static/range {v13 .. v19}, Lcom/discord/utilities/drawable/DrawableCompat;->setCompoundDrawablesCompat$default(Landroid/widget/TextView;IIIIILjava/lang/Object;)V
 
-    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;
+    if-eqz v12, :cond_18
 
-    move-result-object v5
+    invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->requireContext()Landroid/content/Context;
 
-    :cond_12
+    move-result-object v1
+
+    const-string v2, "requireContext()"
+
+    invoke-static {v1, v2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const v2, 0x7f120e2d
+
+    new-array v3, v7, [Ljava/lang/Object;
+
+    const-string v4, "https://support.apple.com/en-us/HT202039"
+
+    aput-object v4, v3, v6
+
+    invoke-virtual {v0, v2, v3}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v2
+
+    const-string v3, "getString(R.string.premi\u2026pple.com/en-us/HT202039\")"
+
+    invoke-static {v2, v3}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    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
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getButtonInfo()Landroid/widget/TextView;
 
     move-result-object v1
 
-    invoke-static {v1, v5}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy(Landroid/widget/TextView;Ljava/lang/CharSequence;)V
+    invoke-static {v1, v4}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy(Landroid/widget/TextView;Ljava/lang/CharSequence;)V
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getButtonInfo()Landroid/widget/TextView;
 
     move-result-object v1
 
-    new-instance v2, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$4;
+    new-instance v2, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$3;
 
-    invoke-direct {v2, v0, v4}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$4;-><init>(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;Z)V
+    invoke-direct {v2, v0, v12}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$3;-><init>(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;Z)V
 
     check-cast v2, Landroid/view/View$OnClickListener;
 
@@ -1537,7 +1655,7 @@
 
     return-void
 
-    :cond_13
+    :cond_19
     new-instance v1, Lkotlin/r;
 
     const-string v2, "null cannot be cast to non-null type com.discord.stores.StoreSubscriptions.SubscriptionsState.Loaded"
@@ -1546,7 +1664,7 @@
 
     throw v1
 
-    :cond_14
+    :cond_1a
     new-instance v1, Lkotlin/r;
 
     const-string v2, "null cannot be cast to non-null type com.discord.stores.StorePremiumGuildSubscription.State.Loaded"
@@ -1555,8 +1673,8 @@
 
     throw v1
 
-    :cond_15
-    :goto_8
+    :cond_1b
+    :goto_c
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getFlipper()Lcom/discord/app/AppViewFlipper;
 
     move-result-object v1
@@ -1577,8 +1695,8 @@
 
     return-void
 
-    :cond_16
-    :goto_9
+    :cond_1c
+    :goto_d
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getFlipper()Lcom/discord/app/AppViewFlipper;
 
     move-result-object v1
@@ -1589,40 +1707,23 @@
 .end method
 
 .method private final configureViewpager(II)V
-    .locals 2
+    .locals 1
 
     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_3
+    if-nez p2, :cond_0
 
     invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getViewPager()Lcom/discord/utilities/simple_pager/SimplePager;
 
@@ -1638,7 +1739,7 @@
 
     iput-boolean p1, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->wasPagerPageSet:Z
 
-    :cond_3
+    :cond_0
     return-void
 .end method
 
@@ -2047,13 +2148,13 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d016f
+    const v0, 0x7f0d016d
 
     return v0
 .end method
 
 .method public final onActivityCreated(Landroid/os/Bundle;)V
-    .locals 5
+    .locals 2
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onActivityCreated(Landroid/os/Bundle;)V
 
@@ -2063,46 +2164,15 @@
 
     const/4 v1, 0x3
 
-    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-static {p0, v0, p1, v1, p1}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
 
     invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getViewPager()Lcom/discord/utilities/simple_pager/SimplePager;
 
     move-result-object p1
 
-    invoke-virtual {p1, v2}, Lcom/discord/utilities/simple_pager/SimplePager;->setWrapHeight(Z)V
+    const/4 v0, 0x1
+
+    invoke-virtual {p1, v0}, 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;
 
@@ -2110,13 +2180,6 @@
 
     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
@@ -2149,9 +2212,9 @@
 
     new-array v1, v0, [Ljava/lang/Object;
 
-    sget-object v2, Lcom/discord/app/e;->vj:Lcom/discord/app/e;
+    sget-object v2, Lcom/discord/app/e;->vk:Lcom/discord/app/e;
 
-    sget-wide v2, Lcom/discord/app/e;->vi:J
+    sget-wide v2, Lcom/discord/app/e;->vj:J
 
     invoke-static {v2, v3}, Lcom/discord/app/e;->j(J)Ljava/lang/String;
 
@@ -2161,7 +2224,7 @@
 
     aput-object v2, v1, v3
 
-    const v2, 0x7f120e60
+    const v2, 0x7f120e27
 
     invoke-virtual {p0, v2, v1}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -2319,7 +2382,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 a803270b19..9b2d4a831a 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,24 +31,9 @@
     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;JLjava/lang/Long;)V
+.method public final create(Landroid/content/Context;J)V
     .locals 2
 
     const-string v0, "context"
@@ -65,15 +50,7 @@
 
     move-result-object p2
 
-    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)"
+    const-string p3, "Intent().putExtra(INTENT_EXTRA_GUILD_ID, guildId)"
 
     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 aeb01ee985..3c28eb4536 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 37ae950f47..8a114024cd 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 4
+    .locals 2
 
     iget-object p1, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$onViewBound$1;->this$0:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;
 
@@ -49,13 +49,7 @@
 
     move-result-wide v0
 
-    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
+    invoke-virtual {p1, v0, v1}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;->subscribeToPremiumGuild(J)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation.smali
index 83d3f267da..3386186212 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,10 +46,10 @@
 
 .field private final select$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-.field private slotId:J
-
 .field private viewModel:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;
 
+.field private final warning$delegate:Lkotlin/properties/ReadOnlyProperty;
+
 
 # direct methods
 .method static constructor <clinit>()V
@@ -57,7 +57,7 @@
 
     const-class v0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;
 
-    const/16 v1, 0x9
+    const/16 v1, 0xa
 
     new-array v1, v1, [Lkotlin/reflect/KProperty;
 
@@ -89,6 +89,28 @@
 
     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;"
@@ -101,7 +123,7 @@
 
     check-cast v2, Lkotlin/reflect/KProperty;
 
-    const/4 v3, 0x1
+    const/4 v3, 0x2
 
     aput-object v2, v1, v3
 
@@ -123,7 +145,7 @@
 
     check-cast v2, Lkotlin/reflect/KProperty;
 
-    const/4 v3, 0x2
+    const/4 v3, 0x3
 
     aput-object v2, v1, v3
 
@@ -145,7 +167,7 @@
 
     check-cast v2, Lkotlin/reflect/KProperty;
 
-    const/4 v3, 0x3
+    const/4 v3, 0x4
 
     aput-object v2, v1, v3
 
@@ -167,7 +189,7 @@
 
     check-cast v2, Lkotlin/reflect/KProperty;
 
-    const/4 v3, 0x4
+    const/4 v3, 0x5
 
     aput-object v2, v1, v3
 
@@ -189,7 +211,7 @@
 
     check-cast v2, Lkotlin/reflect/KProperty;
 
-    const/4 v3, 0x5
+    const/4 v3, 0x6
 
     aput-object v2, v1, v3
 
@@ -211,7 +233,7 @@
 
     check-cast v2, Lkotlin/reflect/KProperty;
 
-    const/4 v3, 0x6
+    const/4 v3, 0x7
 
     aput-object v2, v1, v3
 
@@ -233,7 +255,7 @@
 
     check-cast v2, Lkotlin/reflect/KProperty;
 
-    const/4 v3, 0x7
+    const/16 v3, 0x8
 
     aput-object v2, v1, v3
 
@@ -255,7 +277,7 @@
 
     check-cast v0, Lkotlin/reflect/KProperty;
 
-    const/16 v2, 0x8
+    const/16 v2, 0x9
 
     aput-object v0, v1, v2
 
@@ -277,7 +299,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a00e3
+    const v0, 0x7f0a00e2
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -285,7 +307,15 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->flipper$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a00de
+    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
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -293,7 +323,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->avatar$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a00e4
+    const v0, 0x7f0a00e3
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -301,7 +331,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->name$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a00e5
+    const v0, 0x7f0a00e4
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -309,7 +339,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->level$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a00e7
+    const v0, 0x7f0a00e6
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -317,7 +347,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->select$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a00e0
+    const v0, 0x7f0a00df
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -325,7 +355,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->cancel$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a00e1
+    const v0, 0x7f0a00e0
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -333,7 +363,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->close$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a00e2
+    const v0, 0x7f0a00e1
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -341,7 +371,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->error$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a027a
+    const v0, 0x7f0a0279
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -353,8 +383,6 @@
 
     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
 
@@ -374,14 +402,6 @@
     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
 
@@ -405,14 +425,6 @@
     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
 
@@ -497,7 +509,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f120ed3
+    const v3, 0x7f120e5a
 
     invoke-virtual {v0, v3}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->getString(I)Ljava/lang/String;
 
@@ -543,7 +555,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f120ed2
+    const v3, 0x7f120e59
 
     invoke-virtual {v0, v3}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->getString(I)Ljava/lang/String;
 
@@ -588,7 +600,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f120ed1
+    const v3, 0x7f120e58
 
     invoke-virtual {v0, v3}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->getString(I)Ljava/lang/String;
 
@@ -633,7 +645,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f120e5c
+    const v2, 0x7f120e24
 
     invoke-virtual {v0, v2}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->getString(I)Ljava/lang/String;
 
@@ -647,7 +659,7 @@
 
     move-result-object v3
 
-    const v4, 0x7f0802b4
+    const v4, 0x7f0802a8
 
     const/4 v5, 0x0
 
@@ -667,7 +679,7 @@
 .method private final configureToolbar(Ljava/lang/String;)V
     .locals 1
 
-    const v0, 0x7f120e69
+    const v0, 0x7f120e2f
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -679,7 +691,7 @@
 .end method
 
 .method private final configureUI(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State;)V
-    .locals 6
+    .locals 13
 
     instance-of v0, p1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Uninitialized;
 
@@ -727,6 +739,78 @@
 
     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, 0x7f100094
+
+    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, 0x7f120e40
+
+    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
@@ -739,25 +823,21 @@
 
     aget p1, v0, p1
 
-    const/4 v0, 0x1
+    const/4 v0, 0x0
 
-    const/4 v1, 0x0
-
-    const/4 v2, 0x4
+    const/4 v1, 0x4
 
     const/4 v3, 0x2
 
-    const/4 v4, 0x0
-
-    if-eq p1, v0, :cond_5
+    if-eq p1, v2, :cond_5
 
     if-eq p1, v3, :cond_4
 
-    const/4 v5, 0x3
+    const/4 v4, 0x3
 
-    if-eq p1, v5, :cond_3
+    if-eq p1, v4, :cond_3
 
-    if-eq p1, v2, :cond_2
+    if-eq p1, v1, :cond_2
 
     goto :goto_0
 
@@ -766,19 +846,19 @@
 
     move-result-object p1
 
-    invoke-virtual {p1, v0}, Lcom/discord/app/AppViewFlipper;->setDisplayedChild(I)V
+    invoke-virtual {p1, v2}, 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, v4, v4, v3, v1}, Lcom/discord/utilities/dimmer/DimmerView;->setDimmed$default(Lcom/discord/utilities/dimmer/DimmerView;ZZILjava/lang/Object;)V
+    invoke-static {p1, v6, v6, v3, v0}, Lcom/discord/utilities/dimmer/DimmerView;->setDimmed$default(Lcom/discord/utilities/dimmer/DimmerView;ZZILjava/lang/Object;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->getError()Landroid/view/View;
 
     move-result-object p1
 
-    invoke-virtual {p1, v2}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {p1, v1}, Landroid/view/View;->setVisibility(I)V
 
     :goto_0
     return-void
@@ -788,19 +868,19 @@
 
     move-result-object p1
 
-    invoke-virtual {p1, v4}, Lcom/discord/app/AppViewFlipper;->setDisplayedChild(I)V
+    invoke-virtual {p1, v6}, 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, v4, v4, v3, v1}, Lcom/discord/utilities/dimmer/DimmerView;->setDimmed$default(Lcom/discord/utilities/dimmer/DimmerView;ZZILjava/lang/Object;)V
+    invoke-static {p1, v6, v6, v3, v0}, Lcom/discord/utilities/dimmer/DimmerView;->setDimmed$default(Lcom/discord/utilities/dimmer/DimmerView;ZZILjava/lang/Object;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->getError()Landroid/view/View;
 
     move-result-object p1
 
-    invoke-virtual {p1, v4}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {p1, v6}, Landroid/view/View;->setVisibility(I)V
 
     return-void
 
@@ -809,19 +889,19 @@
 
     move-result-object p1
 
-    invoke-virtual {p1, v4}, Lcom/discord/app/AppViewFlipper;->setDisplayedChild(I)V
+    invoke-virtual {p1, v6}, 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, v0, v4, v3, v1}, Lcom/discord/utilities/dimmer/DimmerView;->setDimmed$default(Lcom/discord/utilities/dimmer/DimmerView;ZZILjava/lang/Object;)V
+    invoke-static {p1, v2, v6, v3, v0}, Lcom/discord/utilities/dimmer/DimmerView;->setDimmed$default(Lcom/discord/utilities/dimmer/DimmerView;ZZILjava/lang/Object;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->getError()Landroid/view/View;
 
     move-result-object p1
 
-    invoke-virtual {p1, v2}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {p1, v1}, Landroid/view/View;->setVisibility(I)V
 
     return-void
 
@@ -830,19 +910,19 @@
 
     move-result-object p1
 
-    invoke-virtual {p1, v4}, Lcom/discord/app/AppViewFlipper;->setDisplayedChild(I)V
+    invoke-virtual {p1, v6}, 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, v4, v4, v3, v1}, Lcom/discord/utilities/dimmer/DimmerView;->setDimmed$default(Lcom/discord/utilities/dimmer/DimmerView;ZZILjava/lang/Object;)V
+    invoke-static {p1, v6, v6, v3, v0}, Lcom/discord/utilities/dimmer/DimmerView;->setDimmed$default(Lcom/discord/utilities/dimmer/DimmerView;ZZILjava/lang/Object;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->getError()Landroid/view/View;
 
     move-result-object p1
 
-    invoke-virtual {p1, v2}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {p1, v1}, Landroid/view/View;->setVisibility(I)V
 
     return-void
 
@@ -856,12 +936,12 @@
     throw p1
 .end method
 
-.method public static final create(Landroid/content/Context;JLjava/lang/Long;)V
+.method public static final create(Landroid/content/Context;J)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, p3}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$Companion;->create(Landroid/content/Context;JLjava/lang/Long;)V
+    invoke-virtual {v0, p0, p1, p2}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$Companion;->create(Landroid/content/Context;J)V
 
     return-void
 .end method
@@ -873,7 +953,7 @@
 
     sget-object v1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/4 v2, 0x1
+    const/4 v2, 0x2
 
     aget-object v1, v1, v2
 
@@ -893,7 +973,7 @@
 
     sget-object v1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/4 v2, 0x5
+    const/4 v2, 0x6
 
     aget-object v1, v1, v2
 
@@ -913,7 +993,7 @@
 
     sget-object v1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/4 v2, 0x6
+    const/4 v2, 0x7
 
     aget-object v1, v1, v2
 
@@ -933,7 +1013,7 @@
 
     sget-object v1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/16 v2, 0x8
+    const/16 v2, 0x9
 
     aget-object v1, v1, v2
 
@@ -953,7 +1033,7 @@
 
     sget-object v1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/4 v2, 0x7
+    const/16 v2, 0x8
 
     aget-object v1, v1, v2
 
@@ -993,7 +1073,7 @@
 
     sget-object v1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/4 v2, 0x3
+    const/4 v2, 0x4
 
     aget-object v1, v1, v2
 
@@ -1013,7 +1093,7 @@
 
     sget-object v1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/4 v2, 0x2
+    const/4 v2, 0x3
 
     aget-object v1, v1, v2
 
@@ -1033,7 +1113,7 @@
 
     sget-object v1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/4 v2, 0x4
+    const/4 v2, 0x5
 
     aget-object v1, v1, v2
 
@@ -1046,12 +1126,32 @@
     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, 0x7f0d016e
+    const v0, 0x7f0d016c
 
     return v0
 .end method
@@ -1073,7 +1173,7 @@
 .end method
 
 .method public final onCreate(Landroid/os/Bundle;)V
-    .locals 4
+    .locals 3
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onCreate(Landroid/os/Bundle;)V
 
@@ -1081,27 +1181,15 @@
 
     move-result-object p1
 
-    const-wide/16 v0, -0x1
+    const-string v0, "GUILD_ID"
 
-    const-string v2, "GUILD_ID"
+    const-wide/16 v1, -0x1
 
-    invoke-virtual {p1, v2, v0, v1}, Landroid/content/Intent;->getLongExtra(Ljava/lang/String;J)J
-
-    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
+    invoke-virtual {p1, v0, v1, v2}, Landroid/content/Intent;->getLongExtra(Ljava/lang/String;J)J
 
     move-result-wide v0
 
-    iput-wide v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->slotId:J
+    iput-wide v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->guildId:J
 
     return-void
 .end method
@@ -1193,7 +1281,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 b8f2af3a1b..44bd2e2559 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 0b537c6b3f..ba6222de03 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, 0x7f0a027a
+    const v0, 0x7f0a0279
 
     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, 0x7f120ed3
+    const v3, 0x7f120e5a
 
     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, 0x7f120ed2
+    const v3, 0x7f120e59
 
     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, 0x7f120ed1
+    const v3, 0x7f120e58
 
     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, 0x7f120e5c
+    const v2, 0x7f120e24
 
     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, 0x7f0802b4
+    const v4, 0x7f0802a8
 
     const/4 v5, 0x0
 
@@ -599,7 +599,7 @@
 .method private final configureToolbar(Ljava/lang/String;)V
     .locals 1
 
-    const v0, 0x7f120e69
+    const v0, 0x7f120e2f
 
     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, 0x7f0d0173
+    const v0, 0x7f0d0171
 
     return v0
 .end method
@@ -1061,7 +1061,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 5e83b9685d..2c4702eb0d 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 8366ec2d29..e1c71bd729 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 307b437b9d..ecde1fa482 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 1702e5f7e6..02f30eb58f 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;->hm()Landroid/graphics/drawable/Animatable;
+    invoke-interface {p1}, Lcom/facebook/drawee/d/a;->hk()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 708bfbd297..8322aea7f8 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;->vm:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vn: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 86be71e368..3d405f9bd7 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;->gQ()Lcom/facebook/drawee/backends/pipeline/e;
+    invoke-static {}, Lcom/facebook/drawee/backends/pipeline/c;->gO()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;->Mk:Lcom/facebook/drawee/d/a;
+    iput-object v1, v0, Lcom/facebook/drawee/controller/a;->Mg: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;->Mj:Z
+    iput-boolean v2, p1, Lcom/facebook/drawee/controller/a;->Mf: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;->LP:Lcom/facebook/drawee/controller/ControllerListener;
+    iput-object v0, p1, Lcom/facebook/drawee/controller/a;->LL:Lcom/facebook/drawee/controller/ControllerListener;
 
     check-cast p1, Lcom/facebook/drawee/backends/pipeline/e;
 
-    invoke-virtual {p1}, Lcom/facebook/drawee/backends/pipeline/e;->hr()Lcom/facebook/drawee/controller/AbstractDraweeController;
+    invoke-virtual {p1}, Lcom/facebook/drawee/backends/pipeline/e;->hp()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, 0x7f1203c6
+    const v0, 0x7f1203a1
 
     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, 0x7f0d00cc
+    const v0, 0x7f0d00ca
 
     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, 0x7f121438
+    const p1, 0x7f1213ac
 
     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, 0x7f1203c5
+    const v0, 0x7f1203a0
 
     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, 0x7f1203c9
+    const p1, 0x7f1203a4
 
     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 bcf8be7f2c..0c9628f7a4 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 0x7f0a0478
+    .packed-switch 0x7f0a0473
         :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 04b0668a4f..930a455cd7 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;->uZ:Ljava/lang/String;
+    sget-object v0, Lcom/discord/app/e;->va: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 73ff3e43ee..211e4a3e8b 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;->vb:Ljava/lang/String;
+    sget-object v0, Lcom/discord/app/e;->vc: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 49825bb41f..880d7eb485 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 de40dcd008..2856b9e4b5 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 9d383f9c4b..cab38f1784 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, 0x7f0a068e
+    const v0, 0x7f0a0675
 
     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, 0x7f0a07f4
+    const v0, 0x7f0a07bd
 
     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, 0x7f0a06d9
+    const v0, 0x7f0a06c0
 
     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, 0x7f0a06da
+    const v0, 0x7f0a06c1
 
     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, 0x7f0a06db
+    const v0, 0x7f0a06c2
 
     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, 0x7f0a06a3
+    const v0, 0x7f0a068a
 
     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, 0x7f0a0670
+    const v0, 0x7f0a0657
 
     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, 0x7f0a06e7
+    const v0, 0x7f0a06ce
 
     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, 0x7f0a069a
+    const v0, 0x7f0a0681
 
     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, 0x7f0a06b5
+    const v0, 0x7f0a069c
 
     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, 0x7f0a068f
+    const v0, 0x7f0a0676
 
     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, 0x7f0a069e
+    const v0, 0x7f0a0685
 
     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, 0x7f0a06d1
+    const v0, 0x7f0a06b8
 
     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, 0x7f0a06e0
+    const v0, 0x7f0a06c7
 
     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, 0x7f0a06b9
+    const v0, 0x7f0a06a0
 
     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, 0x7f0a06f8
+    const v0, 0x7f0a06df
 
     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, 0x7f0a06ff
+    const v0, 0x7f0a06e6
 
     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, 0x7f0a06b7
+    const v0, 0x7f0a069e
 
     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, 0x7f0a06b8
+    const v0, 0x7f0a069f
 
     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, 0x7f0a06b6
+    const v0, 0x7f0a069d
 
     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, 0x7f0a06f7
+    const v0, 0x7f0a06de
 
     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, 0x7f0a068d
+    const v0, 0x7f0a0674
 
     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, 0x7f0a06ae
+    const v0, 0x7f0a0695
 
     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, 0x7f0a06dc
+    const v0, 0x7f0a06c3
 
     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, 0x7f120f0d
+    const p1, 0x7f120e8a
 
     goto :goto_3
 
     :cond_3
-    const p1, 0x7f120f0c
+    const p1, 0x7f120e89
 
     :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, 0x7f120b93
+    const p1, 0x7f120b5d
 
     invoke-virtual {v1, p1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setTitle(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
     move-result-object v1
 
-    const v2, 0x7f12136d
+    const v2, 0x7f1212e1
 
     invoke-virtual {v1, v2}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setMessage(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
     move-result-object v1
 
-    const v2, 0x7f040286
+    const v2, 0x7f040285
 
     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, 0x7f1203a0
+    const v1, 0x7f12037b
 
     const/4 v2, 0x2
 
@@ -1513,7 +1513,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d019b
+    const v0, 0x7f0d0199
 
     return v0
 .end method
@@ -1527,7 +1527,7 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const p1, 0x7f12134d
+    const p1, 0x7f1212c1
 
     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.4 (974)"
+    const-string v0, " - 9.7.5 (975)"
 
     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 2cdc8b9120..46e703cf5c 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 925a85ab27..7c68307e7a 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 8a2558a27f..475796a4cb 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, 0x7f0a0698
+    const v0, 0x7f0a067f
 
     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, 0x7f0a0697
+    const v0, 0x7f0a067e
 
     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, 0x7f0a0699
+    const v0, 0x7f0a0680
 
     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, 0x7f0a0696
+    const v0, 0x7f0a067d
 
     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, 0x7f0a0693
+    const v0, 0x7f0a067a
 
     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, 0x7f0a0692
+    const v0, 0x7f0a0679
 
     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, 0x7f0a0690
+    const v0, 0x7f0a0677
 
     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;->Kz()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kx()Lrx/subjects/BehaviorSubject;
 
     move-result-object v0
 
@@ -1068,7 +1068,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f12135e
+    const v0, 0x7f1212d2
 
     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, 0x7f0d01a0
+    const v0, 0x7f0d019e
 
     return v0
 .end method
@@ -1100,7 +1100,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsAppearance;->setActionBarTitle(I)Lkotlin/Unit;
 
-    const p1, 0x7f12134d
+    const p1, 0x7f1212c1
 
     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 6f6a5924b9..1e7a4e8714 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, 0x7f0a04bb
+    const p1, 0x7f0a04ae
 
     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, 0x7f0a04ba
+    const p1, 0x7f0a04ad
 
     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, 0x7f0a04b8
+    const p1, 0x7f0a04ab
 
     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, 0x7f0a04b9
+    const p1, 0x7f0a04ac
 
     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, 0x7f0a04bc
+    const p1, 0x7f0a04af
 
     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, 0x7f0a04b7
+    const p1, 0x7f0a04aa
 
     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;->De:Lcom/discord/views/c;
+    sget-object p1, Lcom/discord/views/c;->Dg:Lcom/discord/views/c;
 
-    invoke-static {}, Lcom/discord/views/c;->fc()Lcom/discord/utilities/views/SimpleRecyclerAdapter;
+    invoke-static {}, Lcom/discord/views/c;->fa()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 202607f1dd..477f7f37b9 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 63563f14ed..f03a646ae2 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, 0x7f0d01a2
+    const v0, 0x7f0d01a0
 
     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 ca7effe359..1be6bfb748 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 8f07649527..3807942ee5 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 e42fc4ccbe..6bf9e4beca 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 916810fe4c..0b57c6f7b5 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, 0x7f0a00b8
+    const v0, 0x7f0a00b7
 
     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, 0x7f1204ff
+    const v1, 0x7f1204da
 
     invoke-virtual {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setTitle(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
     move-result-object v0
 
-    const v1, 0x7f12050e
+    const v1, 0x7f1204e9
 
     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, 0x7f1203a0
+    const v2, 0x7f12037b
 
     const/4 v3, 0x2
 
@@ -253,7 +253,7 @@
 
     check-cast v1, Lkotlin/jvm/functions/Function1;
 
-    const p1, 0x7f1204fe
+    const p1, 0x7f1204d9
 
     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, 0x7f0d01a1
+    const v0, 0x7f0d019f
 
     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 cb724c6e36..546834436e 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, 0x7f0a069f
+    const v0, 0x7f0a0686
 
     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, 0x7f0a06a2
+    const v0, 0x7f0a0689
 
     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, 0x7f0a06a1
+    const v0, 0x7f0a0688
 
     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, 0x7f0a06a0
+    const v0, 0x7f0a0687
 
     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, 0x7f0d01a3
+    const v0, 0x7f0d01a1
 
     return v0
 .end method
@@ -285,11 +285,11 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onActivityCreated(Landroid/os/Bundle;)V
 
-    const p1, 0x7f12134d
+    const p1, 0x7f1212c1
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsBehavior;->setActionBarSubtitle(I)Lkotlin/Unit;
 
-    const p1, 0x7f12066c
+    const p1, 0x7f120647
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsBehavior;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -383,7 +383,7 @@
 
     aput-object v4, v1, v3
 
-    const v3, 0x7f120532
+    const v3, 0x7f12050d
 
     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 e1424fe637..60043dc4b5 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, 0x7f0d01a8
+    const v0, 0x7f0d01a6
 
     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, 0x7f120533
+    const p1, 0x7f12050e
 
     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 6f6f6d64fd..575aded032 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 82addd5056..dcf65c4187 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 00519b6161..be33286c16 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, 0x7f1212ef
+    const v5, 0x7f121262
 
     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, 0x7f120724
+    const v6, 0x7f1206ff
 
     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, 0x7f120725
+    const v7, 0x7f120700
 
     invoke-virtual {v1, v7}, Lcom/discord/widgets/settings/WidgetSettingsGameActivity;->getString(I)Ljava/lang/String;
 
@@ -113,7 +113,7 @@
 
     const/4 v8, 0x0
 
-    const v1, 0x7f0a04ab
+    const v1, 0x7f0a049e
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -135,7 +135,7 @@
 
     const/4 v11, 0x0
 
-    const v1, 0x7f0d01ca
+    const v1, 0x7f0d01c2
 
     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 5d391061cb..c36e7a1bc2 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 18a25b8f06..825c165977 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, 0x7f0a06bf
+    const v0, 0x7f0a06a6
 
     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, 0x7f0a06c0
+    const v0, 0x7f0a06a7
 
     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, 0x7f0a06be
+    const v0, 0x7f0a06a5
 
     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, 0x7f0a06bd
+    const v0, 0x7f0a06a4
 
     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, 0x7f0a06bb
+    const v0, 0x7f0a06a2
 
     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, 0x7f0a06bc
+    const v0, 0x7f0a06a3
 
     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, 0x7f0a06ba
+    const v0, 0x7f0a06a1
 
     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, 0x7f0800ed
+    const v1, 0x7f0800ec
 
     invoke-virtual {v0, v1}, Landroid/view/View;->setBackgroundResource(I)V
 
@@ -337,7 +337,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f1210fc
+    const v1, 0x7f121070
 
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
 
@@ -362,7 +362,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f0800f1
+    const v1, 0x7f0800f0
 
     invoke-virtual {v0, v1}, Landroid/view/View;->setBackgroundResource(I)V
 
@@ -370,7 +370,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f1210f7
+    const v1, 0x7f12106b
 
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
 
@@ -378,7 +378,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f1210f9
+    const v1, 0x7f12106d
 
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
 
@@ -663,7 +663,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f120dd5
+    const v1, 0x7f120d9b
 
     const/4 v2, 0x1
 
@@ -678,7 +678,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d01ad
+    const v0, 0x7f0d01ab
 
     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 6b482667f7..bc9ba6c4ae 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, 0x7f0803f0
+    const v0, 0x7f0803e1
 
     packed-switch p0, :pswitch_data_0
 
     return v0
 
     :pswitch_0
-    const p0, 0x7f0803f7
+    const p0, 0x7f0803e8
 
     return p0
 
     :pswitch_1
-    const p0, 0x7f080405
+    const p0, 0x7f0803f6
 
     return p0
 
     :pswitch_2
-    const p0, 0x7f080409
-
-    return p0
-
-    :pswitch_3
-    const p0, 0x7f08040a
-
-    return p0
-
-    :pswitch_4
-    const p0, 0x7f080401
-
-    return p0
-
-    :pswitch_5
-    const p0, 0x7f0803f8
-
-    return p0
-
-    :pswitch_6
-    const p0, 0x7f0803fc
-
-    return p0
-
-    :pswitch_7
-    const p0, 0x7f0803ee
-
-    return p0
-
-    :pswitch_8
-    const p0, 0x7f0803fe
-
-    return p0
-
-    :pswitch_9
-    const p0, 0x7f0803f3
-
-    return p0
-
-    :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
+    :pswitch_3
+    const p0, 0x7f0803fb
 
     return p0
 
-    :pswitch_e
-    const p0, 0x7f080402
+    :pswitch_4
+    const p0, 0x7f0803f2
 
     return p0
 
-    :pswitch_f
-    const p0, 0x7f0803ea
+    :pswitch_5
+    const p0, 0x7f0803e9
 
     return p0
 
-    :pswitch_10
+    :pswitch_6
+    const p0, 0x7f0803ed
+
+    return p0
+
+    :pswitch_7
+    const p0, 0x7f0803df
+
+    return p0
+
+    :pswitch_8
+    const p0, 0x7f0803ef
+
+    return p0
+
+    :pswitch_9
+    const p0, 0x7f0803e4
+
+    return p0
+
+    :pswitch_a
+    const p0, 0x7f0803ec
+
+    return p0
+
+    :pswitch_b
+    const p0, 0x7f0803fc
+
+    return p0
+
+    :pswitch_c
     const p0, 0x7f0803eb
 
     return p0
 
+    :pswitch_d
+    const p0, 0x7f0803f8
+
+    return p0
+
+    :pswitch_e
+    const p0, 0x7f0803f3
+
+    return p0
+
+    :pswitch_f
+    const p0, 0x7f0803db
+
+    return p0
+
+    :pswitch_10
+    const p0, 0x7f0803dc
+
+    return p0
+
     :pswitch_11
-    const p0, 0x7f080406
+    const p0, 0x7f0803f7
 
     return p0
 
     :pswitch_12
-    const p0, 0x7f080404
+    const p0, 0x7f0803f5
 
     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, 0x7f0803f4
-
-    return p0
-
-    :pswitch_18
     const p0, 0x7f0803f1
 
     return p0
 
+    :pswitch_14
+    const p0, 0x7f0803f0
+
+    return p0
+
+    :pswitch_15
+    const p0, 0x7f0803ee
+
+    return p0
+
+    :pswitch_16
+    const p0, 0x7f0803ea
+
+    return p0
+
+    :pswitch_17
+    const p0, 0x7f0803e5
+
+    return p0
+
+    :pswitch_18
+    const p0, 0x7f0803e2
+
+    return p0
+
     :pswitch_19
-    const p0, 0x7f0803ef
+    const p0, 0x7f0803e0
 
     return p0
 
@@ -1198,12 +1198,12 @@
     return v0
 
     :pswitch_1b
-    const p0, 0x7f0803ed
+    const p0, 0x7f0803de
 
     return p0
 
     :pswitch_1c
-    const p0, 0x7f0803ec
+    const p0, 0x7f0803dd
 
     return p0
 
@@ -1667,139 +1667,139 @@
     const/4 p0, -0x1
 
     :goto_1
-    const v0, 0x7f1205b0
+    const v0, 0x7f12058b
 
     packed-switch p0, :pswitch_data_0
 
     return v0
 
     :pswitch_0
-    const p0, 0x7f121228
+    const p0, 0x7f12119b
 
     return p0
 
     :pswitch_1
-    const p0, 0x7f1213e0
+    const p0, 0x7f121354
 
     return p0
 
     :pswitch_2
-    const p0, 0x7f12144c
+    const p0, 0x7f1213bf
 
     return p0
 
     :pswitch_3
-    const p0, 0x7f120fdf
+    const p0, 0x7f120f53
 
     return p0
 
     :pswitch_4
-    const p0, 0x7f120973
+    const p0, 0x7f12093d
 
     return p0
 
     :pswitch_5
-    const p0, 0x7f120b94
+    const p0, 0x7f120b5e
 
     return p0
 
     :pswitch_6
-    const p0, 0x7f120592
+    const p0, 0x7f12056d
 
     return p0
 
     :pswitch_7
-    const p0, 0x7f120c41
+    const p0, 0x7f120c0a
 
     return p0
 
     :pswitch_8
-    const p0, 0x7f1205dd
+    const p0, 0x7f1205b8
 
     return p0
 
     :pswitch_9
-    const p0, 0x7f120972
+    const p0, 0x7f12093c
 
     return p0
 
     :pswitch_a
-    const p0, 0x7f120b27
+    const p0, 0x7f120af1
 
     return p0
 
     :pswitch_b
-    const p0, 0x7f12144d
+    const p0, 0x7f1213c0
 
     return p0
 
     :pswitch_c
-    const p0, 0x7f120ac5
+    const p0, 0x7f120a8f
 
     return p0
 
     :pswitch_d
-    const p0, 0x7f1212a1
+    const p0, 0x7f121214
 
     return p0
 
     :pswitch_e
-    const p0, 0x7f120ff5
+    const p0, 0x7f120f69
 
     return p0
 
     :pswitch_f
-    const p0, 0x7f1202b8
+    const p0, 0x7f1202b6
 
     return p0
 
     :pswitch_10
-    const p0, 0x7f1204c6
+    const p0, 0x7f1204a1
 
     return p0
 
     :pswitch_11
-    const p0, 0x7f121259
+    const p0, 0x7f1211cc
 
     return p0
 
     :pswitch_12
-    const p0, 0x7f1211c0
+    const p0, 0x7f121133
 
     return p0
 
     :pswitch_13
-    const p0, 0x7f120f61
+    const p0, 0x7f120ed5
 
     return p0
 
     :pswitch_14
-    const p0, 0x7f120dec
+    const p0, 0x7f120db2
 
     return p0
 
     :pswitch_15
-    const p0, 0x7f120c40
+    const p0, 0x7f120c09
 
     return p0
 
     :pswitch_16
-    const p0, 0x7f120ac4
+    const p0, 0x7f120a8e
 
     return p0
 
     :pswitch_17
-    const p0, 0x7f1206cd
+    const p0, 0x7f1206a8
 
     return p0
 
     :pswitch_18
-    const p0, 0x7f1205c2
+    const p0, 0x7f12059d
 
     return p0
 
     :pswitch_19
-    const p0, 0x7f1205af
+    const p0, 0x7f12058a
 
     return p0
 
@@ -1807,12 +1807,12 @@
     return v0
 
     :pswitch_1b
-    const p0, 0x7f1204fb
+    const p0, 0x7f1204d6
 
     return p0
 
     :pswitch_1c
-    const p0, 0x7f1204dd
+    const p0, 0x7f1204b8
 
     return p0
 
@@ -1906,7 +1906,7 @@
 .method public getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d01b3
+    const v0, 0x7f0d01b1
 
     return v0
 .end method
@@ -1928,17 +1928,17 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const v0, 0x7f12134d
+    const v0, 0x7f1212c1
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/settings/WidgetSettingsLanguage;->setActionBarSubtitle(I)Lkotlin/Unit;
 
-    const v0, 0x7f120b29
+    const v0, 0x7f120af3
 
     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, 0x7f0a06d2
+    const v0, 0x7f0a06b9
 
     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, 0x7f0a06d4
+    const v0, 0x7f0a06bb
 
     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, 0x7f0a06d3
+    const v0, 0x7f0a06ba
 
     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, 0x7f0a06d8
+    const v0, 0x7f0a06bf
 
     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 804f790d86..4caeebe5bc 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, 0x7f0a06d5
+    const p1, 0x7f0a06bc
 
     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, 0x7f0a06d6
+    const p1, 0x7f0a06bd
 
     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 61cd3e18c3..0d81cd80aa 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, 0x7f0d01b5
+    const p2, 0x7f0d01b3
 
     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 c27590fac5..e7e6286ff8 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, 0x7f0a06d7
+    const v0, 0x7f0a06be
 
     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, 0x7f0d01b4
+    const v0, 0x7f0d01b2
 
     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 5b77ee242b..daa2bdf7a8 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 138aedb5c6..c32b37629c 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, 0x7f0a06fa
+    const v0, 0x7f0a06e1
 
     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, 0x7f0a06fb
+    const v0, 0x7f0a06e2
 
     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, 0x7f0a06fc
+    const v0, 0x7f0a06e3
 
     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, 0x7f0a06fd
+    const v0, 0x7f0a06e4
 
     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, 0x7f0a06f9
+    const v0, 0x7f0a06e0
 
     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, 0x7f0d01b6
+    const v0, 0x7f0d01b4
 
     return v0
 .end method
@@ -370,11 +370,11 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onActivityCreated(Landroid/os/Bundle;)V
 
-    const p1, 0x7f12134d
+    const p1, 0x7f1212c1
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsMedia;->setActionBarSubtitle(I)Lkotlin/Unit;
 
-    const p1, 0x7f121222
+    const p1, 0x7f121195
 
     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;->bhO:Lkotlin/jvm/internal/ab;
+    sget-object v0, Lkotlin/jvm/internal/ab;->bhJ:Lkotlin/jvm/internal/ab;
 
-    const v0, 0x7f120a04
+    const v0, 0x7f1209ce
 
     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 9d2a3fe9bf..a95cf9b1b4 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 0d00a1223a..4522e99ba7 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, 0x7f0a06e2
+    const v0, 0x7f0a06c9
 
     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, 0x7f0a06d0
+    const v0, 0x7f0a06b7
 
     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, 0x7f0a06e5
+    const v0, 0x7f0a06cc
 
     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, 0x7f0a06e1
+    const v0, 0x7f0a06c8
 
     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, 0x7f0a06e4
+    const v0, 0x7f0a06cb
 
     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, 0x7f0a06e3
+    const v0, 0x7f0a06ca
 
     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, 0x7f0a06e6
+    const v0, 0x7f0a06cd
 
     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, 0x7f0d01b8
+    const v0, 0x7f0d01b6
 
     return v0
 .end method
@@ -523,11 +523,11 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const p1, 0x7f12134d
+    const p1, 0x7f1212c1
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsNotifications;->setActionBarSubtitle(I)Lkotlin/Unit;
 
-    const p1, 0x7f120cc5
+    const p1, 0x7f120c8e
 
     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;->vO:Lcom/discord/app/i;
+    sget-object v1, Lcom/discord/app/i;->vP: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 205f3be6d9..79984a8ccf 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 49ac32055e..2e451a663e 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, 0x7f0a06df
+    const v0, 0x7f0a06c6
 
     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, 0x7f0a06d0
+    const v0, 0x7f0a06b7
 
     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, 0x7f0a06dd
+    const v0, 0x7f0a06c4
 
     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, 0x7f0d01b7
+    const v0, 0x7f0d01b5
 
     return v0
 .end method
@@ -273,7 +273,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/discord/app/i;->vO:Lcom/discord/app/i;
+    sget-object v1, Lcom/discord/app/i;->vP: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 41edd0882d..8be56614b1 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;->Kx()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Kv()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 c78f8ac6d7..518f479a1a 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 114482a3a8..7ff810c568 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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, 0x7f1212f3
+    const v0, 0x7f121266
 
     invoke-virtual {p2, v0}, Landroid/widget/TextView;->setText(I)V
 
-    const p2, 0x7f1212f0
+    const p2, 0x7f121263
 
     invoke-virtual {p3, p2}, Landroid/widget/TextView;->setText(I)V
 
-    const p2, 0x7f1212f1
+    const p2, 0x7f121264
 
     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, 0x7f1212f2
+    const p2, 0x7f121265
 
     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 ab73fd0667..7a21d89fa9 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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, 0x7f120dd9
+    const v0, 0x7f120d9f
 
     invoke-virtual {p2, v0}, Landroid/widget/TextView;->setText(I)V
 
-    const p2, 0x7f120dd6
+    const p2, 0x7f120d9c
 
     invoke-virtual {p3, p2}, Landroid/widget/TextView;->setText(I)V
 
-    const p2, 0x7f120dd7
+    const p2, 0x7f120d9d
 
     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, 0x7f120dd8
+    const p2, 0x7f120d9e
 
     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 d13767def9..e4b1e2f517 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, 0x7f1204f5
+    const v0, 0x7f1204d0
 
     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 486831fc54..ff73be1b23 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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, 0x7f1204f4
+    const v1, 0x7f1204cf
 
     invoke-virtual {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setTitle(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
     move-result-object v0
 
-    const v1, 0x7f1204f3
+    const v1, 0x7f1204ce
 
     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, 0x7f120d13
+    const v2, 0x7f120cdc
 
     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 e9aae7947a..e1e5fa52e8 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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, 0x7f1204eb
+    const v1, 0x7f1204c6
 
     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, 0x7f1204ea
+    const v1, 0x7f1204c5
 
     invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -111,7 +111,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f120d13
+    const v0, 0x7f120cdc
 
     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 190c4a2585..ae1261a411 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 d062357798..3f534e585a 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 e562ca74d6..eca9e1451c 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 3119b33466..e064408cfa 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 6c30a0775a..d4097437de 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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, 0x7f1204e9
+    const v1, 0x7f1204c4
 
     invoke-virtual {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setTitle(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
     move-result-object v0
 
-    const v1, 0x7f1204ee
+    const v1, 0x7f1204c9
 
     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, 0x7f120d13
+    const v2, 0x7f120cdc
 
     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, 0x7f1203a0
+    const v2, 0x7f12037b
 
     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 dab7a2471c..21826e05b9 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 26f9818dec..9205ec7c5c 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 77eaf52761..9224ca44d6 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 eb602fd3ae..cf29cf697d 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, 0x7f0a06ed
+    const v0, 0x7f0a06d4
 
     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, 0x7f0a06ee
+    const v0, 0x7f0a06d5
 
     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, 0x7f0a06ef
+    const v0, 0x7f0a06d6
 
     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, 0x7f0a06f0
+    const v0, 0x7f0a06d7
 
     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, 0x7f0a06f1
+    const v0, 0x7f0a06d8
 
     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, 0x7f0a06f2
+    const v0, 0x7f0a06d9
 
     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, 0x7f0a06ea
+    const v0, 0x7f0a06d1
 
     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, 0x7f0a06e9
+    const v0, 0x7f0a06d0
 
     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, 0x7f0a06f6
+    const v0, 0x7f0a06dd
 
     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, 0x7f0a06f3
+    const v0, 0x7f0a06da
 
     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, 0x7f0a06e8
+    const v0, 0x7f0a06cf
 
     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, 0x7f0a06f4
+    const v0, 0x7f0a06db
 
     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, 0x7f0a06f5
+    const v0, 0x7f0a06dc
 
     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, 0x7f0a027a
+    const v0, 0x7f0a0279
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1168,7 +1168,7 @@
         }
     .end annotation
 
-    const v0, 0x7f0d0084
+    const v0, 0x7f0d0083
 
     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, 0x7f0a082b
+    const v1, 0x7f0a07f1
 
     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, 0x7f0a082c
+    const v1, 0x7f0a07f2
 
     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, 0x7f0a0829
+    const v1, 0x7f0a07ef
 
     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, 0x7f0a082a
+    const v1, 0x7f0a07f0
 
     invoke-virtual {v0, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1655,7 +1655,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f0d01bc
+    const v1, 0x7f0d01ba
 
     const/4 v2, 0x0
 
@@ -1663,7 +1663,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f0a06eb
+    const v1, 0x7f0a06d2
 
     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, 0x7f0a06ec
+    const v1, 0x7f0a06d3
 
     invoke-virtual {v0, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1762,7 +1762,7 @@
 
     move-result-object p1
 
-    const p2, 0x7f1204e2
+    const p2, 0x7f1204bd
 
     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, 0x7f1204f8
+    const v0, 0x7f1204d3
 
     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, 0x7f120d13
+    const p2, 0x7f120cdc
 
     const/4 v0, 0x2
 
@@ -1857,7 +1857,7 @@
 
     move-result-object p2
 
-    sget-object v0, Lcom/discord/app/i;->vO:Lcom/discord/app/i;
+    sget-object v0, Lcom/discord/app/i;->vP: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;->IV()Lrx/Observable;
+    invoke-virtual {p2}, Lrx/Observable;->IT()Lrx/Observable;
 
     move-result-object p2
 
@@ -1948,7 +1948,7 @@
 
     move-result-object p2
 
-    sget-object v0, Lcom/discord/app/i;->vO:Lcom/discord/app/i;
+    sget-object v0, Lcom/discord/app/i;->vP: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, 0x7f0d01bb
+    const v0, 0x7f0d01b9
 
     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, 0x7f12134d
+    const v1, 0x7f1212c1
 
     invoke-virtual {v0, v1}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->setActionBarSubtitle(I)Lkotlin/Unit;
 
-    const v1, 0x7f120f55
+    const v1, 0x7f120ec9
 
     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;->vj:Lcom/discord/app/e;
+    sget-object v1, Lcom/discord/app/e;->vk:Lcom/discord/app/e;
 
-    sget-wide v4, Lcom/discord/app/e;->vf:J
+    sget-wide v4, Lcom/discord/app/e;->vg: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, 0x7f1204e7
+    const v1, 0x7f1204c2
 
     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;->vj:Lcom/discord/app/e;
+    sget-object v1, Lcom/discord/app/e;->vk:Lcom/discord/app/e;
 
-    sget-wide v5, Lcom/discord/app/e;->vd:J
+    sget-wide v5, Lcom/discord/app/e;->ve:J
 
     invoke-static {v5, v6}, Lcom/discord/app/e;->j(J)Ljava/lang/String;
 
     move-result-object v1
 
-    const v5, 0x7f1204e4
+    const v5, 0x7f1204bf
 
     invoke-virtual {v0, v5}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->getString(I)Ljava/lang/String;
 
@@ -2245,7 +2245,7 @@
 
     move-result-object v6
 
-    const v7, 0x7f0a066b
+    const v7, 0x7f0a0652
 
     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;->vj:Lcom/discord/app/e;
+    sget-object v5, Lcom/discord/app/e;->vk:Lcom/discord/app/e;
 
-    sget-wide v5, Lcom/discord/app/e;->ve:J
+    sget-wide v5, Lcom/discord/app/e;->vf: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, 0x7f120cac
+    const v8, 0x7f120c75
 
     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, 0x7f1204f6
+    const v1, 0x7f1204d1
 
     new-array v5, v4, [Ljava/lang/Object;
 
-    sget-object v6, Lcom/discord/app/e;->vj:Lcom/discord/app/e;
+    sget-object v6, Lcom/discord/app/e;->vk:Lcom/discord/app/e;
 
-    sget-wide v6, Lcom/discord/app/e;->vf:J
+    sget-wide v6, Lcom/discord/app/e;->vg: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 9ad66c0864..4a8ab05731 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
@@ -242,7 +242,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder;->platformImage$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a022c
+    const p1, 0x7f0a022b
 
     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, 0x7f0a022d
+    const p1, 0x7f0a022c
 
     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, 0x7f120561
+    const v5, 0x7f12053c
 
     new-array v3, v3, [Ljava/lang/Object;
 
@@ -841,7 +841,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f12114e
+    const v1, 0x7f1210c2
 
     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 ad9b5331cd..9138070f3f 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, 0x7f0d01b2
+    const p2, 0x7f0d01b0
 
     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 d170ef5aed..585c5fbc57 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, 0x7f0a0448
+    const p2, 0x7f0a0443
 
     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 2f88d58963..e682a92aaf 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 399feec99a..f87292bd31 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, 0x7f0a022f
+    const v0, 0x7f0a022e
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -113,7 +113,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsUserConnections;->emptyView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0230
+    const v0, 0x7f0a022f
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -317,7 +317,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d01a6
+    const v0, 0x7f0d01a4
 
     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, 0x7f12134d
+    const p1, 0x7f1212c1
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsUserConnections;->setActionBarSubtitle(I)Lkotlin/Unit;
 
-    const p1, 0x7f120478
+    const p1, 0x7f120453
 
     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 bd9ba51519..9086e94383 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, 0x7f0d01af
+    const v0, 0x7f0d01ad
 
     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 939e477e13..ee8053f310 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 389b44d50b..03a63236dd 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, 0x7f0a0230
+    const v0, 0x7f0a022f
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -121,7 +121,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d01a7
+    const v0, 0x7f0d01a5
 
     return v0
 .end method
@@ -139,7 +139,7 @@
 
     invoke-virtual {v0}, Landroid/app/Dialog;->dismiss()V
 
-    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 891c307b33..60a2413505 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, 0x7f0a0231
+    const v0, 0x7f0a0230
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -127,7 +127,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox;->digits$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0232
+    const v0, 0x7f0a0231
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -135,7 +135,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox;->login$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a027a
+    const v0, 0x7f0a0279
 
     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, 0x7f120468
+    const v1, 0x7f120443
 
     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, 0x7f0d0117
+    const v0, 0x7f0d0115
 
     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, 0x7f12134d
+    const p1, 0x7f1212c1
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox;->setActionBarSubtitle(I)Lkotlin/Unit;
 
-    const p1, 0x7f120478
+    const p1, 0x7f120453
 
     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 6ab8fd669f..4006867947 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 39bd924d12..0525a07f76 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;->zV:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
+    sget-object p2, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;->zX: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;->zU:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
+    sget-object p2, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;->zW: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 581f524243..b244e8abc4 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;->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
 
@@ -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;->zE:Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
+    sget-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;->zG: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;->zF:Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
+    sget-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;->zH: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 c11bbb4439..7bfe66231e 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;->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 {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 e796f2b7e5..bb757089e2 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;->zV:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
+    sget-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;->zX: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 85a4048614..3f7526894f 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;->zv:Lcom/discord/rtcconnection/RtcConnection$State$f;
+    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$f;->zw: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 e6cb72d0ff..8494f19899 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 26a8065952..f4722badee 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 7cd5aa8dd7..36202c3c52 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 df98bb7af8..55576867c3 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, 0x7f0a070f
+    const v0, 0x7f0a06f6
 
     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, 0x7f0a070e
+    const v0, 0x7f0a06f5
 
     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, 0x7f0a0706
+    const v0, 0x7f0a06ed
 
     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, 0x7f0a0707
+    const v0, 0x7f0a06ee
 
     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, 0x7f0a0701
+    const v0, 0x7f0a06e8
 
     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, 0x7f0a0700
+    const v0, 0x7f0a06e7
 
     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, 0x7f0a0709
+    const v0, 0x7f0a06f0
 
     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, 0x7f0a070b
+    const v0, 0x7f0a06f2
 
     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, 0x7f0a070a
+    const v0, 0x7f0a06f1
 
     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, 0x7f0a0702
+    const v0, 0x7f0a06e9
 
     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, 0x7f0a0703
+    const v0, 0x7f0a06ea
 
     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, 0x7f0a0708
+    const v0, 0x7f0a06ef
 
     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, 0x7f0a0705
+    const v0, 0x7f0a06ec
 
     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, 0x7f0a070c
+    const v0, 0x7f0a06f3
 
     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, 0x7f0a0717
+    const v0, 0x7f0a06fe
 
     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, 0x7f0a0713
+    const v0, 0x7f0a06fa
 
     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, 0x7f0a0710
+    const v0, 0x7f0a06f7
 
     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, 0x7f0a0716
+    const v0, 0x7f0a06fd
 
     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, 0x7f0a0712
+    const v0, 0x7f0a06f9
 
     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, 0x7f0a0715
+    const v0, 0x7f0a06fc
 
     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, 0x7f0a0714
+    const v0, 0x7f0a06fb
 
     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, 0x7f0a0718
+    const v0, 0x7f0a06ff
 
     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, 0x7f0a0704
+    const v0, 0x7f0a06eb
 
     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, 0x7f080195
+    const p1, 0x7f08018a
 
     goto :goto_0
 
     :cond_0
-    const p1, 0x7f080194
+    const p1, 0x7f080189
 
     :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;->zC:F
+    iget v1, v1, Lcom/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus;->zE: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;->fi()Landroid/widget/Checkable;
+    invoke-virtual {v0}, Lcom/discord/views/RadioManager;->fg()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;->fi()Landroid/widget/Checkable;
+    invoke-virtual {v0}, Lcom/discord/views/RadioManager;->fg()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;->zE:Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
+    sget-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;->zG: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;->zF:Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
+    sget-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;->zH:Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
 
     goto :goto_0
 
@@ -2178,7 +2178,7 @@
 
     check-cast v0, Landroidx/fragment/app/Fragment;
 
-    const v1, 0x7f121393
+    const v1, 0x7f121307
 
     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, 0x7f0d01bd
+    const v0, 0x7f0d01bb
 
     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;->Bc:Lcom/discord/samsung/a;
+    sget-object v3, Lcom/discord/samsung/a;->Bf:Lcom/discord/samsung/a;
 
-    invoke-static {}, Lcom/discord/samsung/a;->eL()Lrx/Observable;
+    invoke-static {}, Lcom/discord/samsung/a;->eK()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 8363b12a6a..e2e5bfc895 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, 0x7f12053a
+    const v4, 0x7f120515
 
-    const v5, 0x7f12053b
+    const v5, 0x7f120516
 
-    const v6, 0x7f120539
+    const v6, 0x7f120514
 
     move-object v1, v7
 
@@ -74,11 +74,11 @@
 
     const/4 v10, 0x1
 
-    const v11, 0x7f120508
+    const v11, 0x7f1204e3
 
-    const v12, 0x7f120509
+    const v12, 0x7f1204e4
 
-    const v13, 0x7f120507
+    const v13, 0x7f1204e2
 
     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 d959d342ad..65e2b1a992 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 9ed2f2ef31..c416b156d7 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 55577522bb..d25ab35e5f 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 2c2cc48440..8d43ecadd4 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 8408332955..191e13c30c 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 2cfc9fa0be..0aa9ff90cf 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, 0x7f0a0282
+    const v0, 0x7f0a0281
 
     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, 0x7f0a027d
+    const v0, 0x7f0a027c
 
     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, 0x7f0a027e
+    const v0, 0x7f0a027d
 
     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, 0x7f0a0281
+    const v0, 0x7f0a0280
 
     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, 0x7f0a0283
+    const v0, 0x7f0a0282
 
     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, 0x7f0a0284
+    const v0, 0x7f0a0283
 
     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, 0x7f0a027f
+    const v0, 0x7f0a027e
 
     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, 0x7f0a0280
+    const v0, 0x7f0a027f
 
     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, 0x7f0d011b
+    const v0, 0x7f0d0119
 
     return v0
 .end method
@@ -801,7 +801,7 @@
     :goto_0
     if-nez v0, :cond_1
 
-    sget-object v1, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
+    sget-object v1, Lcom/discord/app/AppLog;->vn: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 ae5731f558..2984ef2df2 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 c01e9b7cfe..73f61015a9 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 395cec3bb8..b21b55f060 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, 0x7f0a02c6
+    const v0, 0x7f0a02c5
 
     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, 0x7f0a02c3
+    const v0, 0x7f0a02c2
 
     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, 0x7f0a02c8
+    const v0, 0x7f0a02c7
 
     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, 0x7f0a02c7
+    const v0, 0x7f0a02c6
 
     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, 0x7f0a02c4
+    const v0, 0x7f0a02c3
 
     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, 0x7f0a02c5
+    const v0, 0x7f0a02c4
 
     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, 0x7f0d011e
+    const v0, 0x7f0d011c
 
     return v0
 .end method
@@ -582,7 +582,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f120bf1
+    const v3, 0x7f120bbb
 
     invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -600,7 +600,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f120bed
+    const v3, 0x7f120bb7
 
     invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -618,7 +618,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f1205b1
+    const v3, 0x7f12058c
 
     invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -637,7 +637,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f120bf6
+    const v3, 0x7f120bc0
 
     invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -655,7 +655,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f120bef
+    const v3, 0x7f120bb9
 
     invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -673,7 +673,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f120539
+    const v3, 0x7f120514
 
     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 91798ad301..bf88728c19 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/d;->xw:Lcom/discord/dialogs/d$a;
+    sget-object p1, Lcom/discord/dialogs/d;->xy: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, 0x7f120f34
+    const v2, 0x7f120eb0
 
     invoke-virtual {p1, v2}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getString(I)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$5$1.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$5$1.smali
index 64bf63db04..56397e9616 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, 0x7f1203fd
+    const v1, 0x7f1203d8
 
-    const v2, 0x7f1212a4
+    const v2, 0x7f121217
 
     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 d647a4a32d..8558121c03 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 4f22726103..5653093c9b 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -77,7 +77,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f121388
+    const v2, 0x7f1212fc
 
     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 b7227a4b18..aa0647104e 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 a6dfc9d1fb..c5dc366c93 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, 0x7f0a0686
+    const v0, 0x7f0a066d
 
     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, 0x7f0a0685
+    const v0, 0x7f0a066c
 
     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, 0x7f0a0675
+    const v0, 0x7f0a065c
 
     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, 0x7f0a0689
+    const v0, 0x7f0a0670
 
     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, 0x7f0a0677
+    const v0, 0x7f0a065e
 
     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, 0x7f0a0676
+    const v0, 0x7f0a065d
 
     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, 0x7f0a0671
+    const v0, 0x7f0a0658
 
     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, 0x7f0a068a
+    const v1, 0x7f0a0671
 
     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, 0x7f0a068b
+    const v1, 0x7f0a0672
 
     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, 0x7f0a0672
+    const v1, 0x7f0a0659
 
     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, 0x7f0a0683
+    const v1, 0x7f0a066a
 
     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, 0x7f0a067c
+    const v1, 0x7f0a0663
 
     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, 0x7f0a068c
+    const v1, 0x7f0a0673
 
     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, 0x7f0a0684
+    const v1, 0x7f0a066b
 
     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, 0x7f0a0687
+    const v1, 0x7f0a066e
 
     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, 0x7f0a0688
+    const v1, 0x7f0a066f
 
     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, 0x7f0a067d
+    const v1, 0x7f0a0664
 
     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, 0x7f0a067e
+    const v1, 0x7f0a0665
 
     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, 0x7f0a067f
+    const v1, 0x7f0a0666
 
     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, 0x7f0a067a
+    const v1, 0x7f0a0661
 
     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, 0x7f0a067b
+    const v1, 0x7f0a0662
 
     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, 0x7f0a0679
+    const v1, 0x7f0a0660
 
     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, 0x7f0a0682
+    const v1, 0x7f0a0669
 
     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, 0x7f0a0681
+    const v1, 0x7f0a0668
 
     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, 0x7f0a0680
+    const v1, 0x7f0a0667
 
     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, 0x7f0a027a
+    const v1, 0x7f0a0279
 
     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, 0x7f0402ab
+    const v8, 0x7f0402aa
 
     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, 0x7f120bec
+    const v2, 0x7f120bb6
 
     new-array v3, v4, [Ljava/lang/Object;
 
@@ -1631,7 +1631,7 @@
 
     if-eqz p1, :cond_c
 
-    const p1, 0x7f120bf0
+    const p1, 0x7f120bba
 
     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, 0x7f120bed
+    const p1, 0x7f120bb7
 
     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, 0x7f12101e
+    const v1, 0x7f120f92
 
     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, 0x7f12050b
+    const v1, 0x7f1204e6
 
     invoke-virtual {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setTitle(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
     move-result-object v0
 
-    const v1, 0x7f12050c
+    const v1, 0x7f1204e7
 
     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, 0x7f120d13
+    const v2, 0x7f120cdc
 
     const/4 v3, 0x2
 
@@ -2470,7 +2470,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f121292
+    const v3, 0x7f121205
 
     invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -2484,7 +2484,7 @@
 
     move-result-object v3
 
-    const v4, 0x7f121385
+    const v4, 0x7f1212f9
 
     invoke-virtual {v3, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -2498,7 +2498,7 @@
 
     move-result-object v4
 
-    const v5, 0x7f12126c
+    const v5, 0x7f1211df
 
     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, 0x7f0d019c
+    const v0, 0x7f0d019a
 
     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;->xq:Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
+    sget-object v6, Lcom/discord/dialogs/ImageUploadDialog$PreviewType;->xs: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, 0x7f12134d
+    const p1, 0x7f1212c1
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->setActionBarSubtitle(I)Lkotlin/Unit;
 
-    const p1, 0x7f12138b
+    const p1, 0x7f1212ff
 
     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 de624a91e5..fbffedae08 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, 0x7f0a03f1
+    const p1, 0x7f0a03ec
 
     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 bfe1513772..4ed18759b5 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, 0x7f120480
+    const v0, 0x7f12045b
 
     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 fc9b0578ca..89ba5e9a3b 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, 0x7f0a03da
+    const p1, 0x7f0a03d5
 
     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, 0x7f12029f
+    const v4, 0x7f12029d
 
     const/4 v5, 0x1
 
@@ -213,7 +213,7 @@
 
     move-result-object p1
 
-    const p2, 0x7f080236
+    const p2, 0x7f08022b
 
     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 a6b1a10301..69ffa2c29d 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, 0x7f0d01b0
+    const p2, 0x7f0d01ae
 
     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, 0x7f0d01b1
+    const p2, 0x7f0d01af
 
     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 fda4c7c701..8eb6dad25a 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -179,7 +179,7 @@
 
     move-result-object v4
 
-    const v5, 0x7f121367
+    const v5, 0x7f1212db
 
     invoke-virtual {v4, v5}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -258,7 +258,7 @@
 
     move-result-object v2
 
-    const v4, 0x7f12139b
+    const v4, 0x7f12130f
 
     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 423b69973a..1a6c1b89c3 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 3161bfa625..d58739425b 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 8ef0ed310a..af89577ed1 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, 0x7f0a069c
+    const v0, 0x7f0a0683
 
     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, 0x7f0a069d
+    const v0, 0x7f0a0684
 
     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, 0x7f0a069b
+    const v0, 0x7f0a0682
 
     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, 0x7f0a027a
+    const v0, 0x7f0a0279
 
     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;->vO:Lcom/discord/app/i;
+    sget-object v0, Lcom/discord/app/i;->vP: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, 0x7f121371
+    const v3, 0x7f1212e5
 
     invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -456,7 +456,7 @@
 
     move-result-object v2
 
-    const v4, 0x7f121272
+    const v4, 0x7f1211e5
 
     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, 0x7f0d019d
+    const v0, 0x7f0d019b
 
     return v0
 .end method
@@ -511,11 +511,11 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onActivityCreated(Landroid/os/Bundle;)V
 
-    const p1, 0x7f12134d
+    const p1, 0x7f1212c1
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes;->setActionBarSubtitle(I)Lkotlin/Unit;
 
-    const p1, 0x7f121272
+    const p1, 0x7f1211e5
 
     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, 0x7f121271
+    const v0, 0x7f1211e4
 
     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 20ec33aad7..396bf27825 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 d888952c40..6a2254008a 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 fc7c1e77df..a71985e0fa 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 0c47ba241e..65bc5a7060 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 da9251549f..09cb3e84a1 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, 0x7f12101e
+    const v1, 0x7f120f92
 
     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 86d5cfb588..b7ec0bd39f 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, 0x7f0a027a
+    const v1, 0x7f0a0279
 
     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, 0x7f120d76
+    const v3, 0x7f120d3e
 
     invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -546,7 +546,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f120d70
+    const v3, 0x7f120d38
 
     invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -609,7 +609,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f121297
+    const v3, 0x7f12120a
 
     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, 0x7f0d019e
+    const v0, 0x7f0d019c
 
     return v0
 .end method
@@ -734,11 +734,11 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const p1, 0x7f12134d
+    const p1, 0x7f1212c1
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountChangePassword;->setActionBarSubtitle(I)Lkotlin/Unit;
 
-    const p1, 0x7f1203cd
+    const p1, 0x7f1203a8
 
     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 0888998051..abbf25087c 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/d;->xw:Lcom/discord/dialogs/d$a;
+    sget-object p1, Lcom/discord/dialogs/d;->xy: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, 0x7f120f46
+    const p2, 0x7f120ebc
 
     invoke-virtual {p1, p2}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit;->getString(I)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$onViewBound$1$1.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$onViewBound$1$1.smali
index 1c696504cb..3d1db73e77 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 0ced962293..b54d798f5a 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 2dcbfaef40..d963637a3d 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 550d765cc7..c44ea970bc 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 67dc1e0e53..e229cc053b 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, 0x7f12101e
+    const v1, 0x7f120f92
 
     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 a0eddfc9c7..7b43ff6f18 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, 0x7f1213ae
+    const v7, 0x7f121322
 
     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, 0x7f120e10
+    const v8, 0x7f120dd6
 
-    const v9, 0x7f120e15
+    const v9, 0x7f120ddb
 
     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, 0x7f120599
+    const v9, 0x7f120574
 
     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, 0x7f120598
+    const v9, 0x7f120573
 
     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, 0x7f120d76
+    const v8, 0x7f120d3e
 
     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, 0x7f120d70
+    const v7, 0x7f120d38
 
     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 534b3adc41..91184e9528 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, 0x7f0a028e
+    const v0, 0x7f0a028d
 
     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, 0x7f0a028d
+    const v0, 0x7f0a028c
 
     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, 0x7f0a0286
+    const v0, 0x7f0a0285
 
     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, 0x7f0a0288
+    const v0, 0x7f0a0287
 
     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, 0x7f0a0289
+    const v0, 0x7f0a0288
 
     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, 0x7f0a028b
+    const v0, 0x7f0a028a
 
     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, 0x7f0a028a
+    const v0, 0x7f0a0289
 
     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, 0x7f0a0685
+    const v0, 0x7f0a066c
 
     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, 0x7f0a027a
+    const v0, 0x7f0a0279
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -391,9 +391,9 @@
 
     :array_0
     .array-data 4
-        0x7f0a028d
-        0x7f0a0286
-        0x7f0a0288
+        0x7f0a028c
+        0x7f0a0285
+        0x7f0a0287
     .end array-data
 .end method
 
@@ -524,7 +524,7 @@
 
     move-result v4
 
-    sget-object v5, Lkotlin/jvm/internal/ab;->bhO:Lkotlin/jvm/internal/ab;
+    sget-object v5, Lkotlin/jvm/internal/ab;->bhJ:Lkotlin/jvm/internal/ab;
 
     new-array v5, v1, [Ljava/lang/Object;
 
@@ -1058,7 +1058,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d019f
+    const v0, 0x7f0d019d
 
     return v0
 .end method
@@ -1072,11 +1072,11 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const p1, 0x7f12134d
+    const p1, 0x7f1212c1
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit;->setActionBarSubtitle(I)Lkotlin/Unit;
 
-    const p1, 0x7f12136e
+    const p1, 0x7f1212e2
 
     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 1a6b9127a6..4c4547ec02 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, 0x7f0a0487
+    const v0, 0x7f0a047a
 
     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, 0x7f0d01a9
+    const v0, 0x7f0d01a7
 
     return v0
 .end method
@@ -119,7 +119,7 @@
 
     aput-object v2, v0, v1
 
-    const v1, 0x7f121278
+    const v1, 0x7f1211eb
 
     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 4a632b92a2..1a2406b941 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, 0x7f0a07f3
+    const v0, 0x7f0a07bc
 
     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, 0x7f0d01aa
+    const v0, 0x7f0d01a8
 
     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 6ff8625b8a..26197f87b1 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, 0x7f0a02bf
+    const v0, 0x7f0a02be
 
     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, 0x7f0a02c0
+    const v0, 0x7f0a02bf
 
     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, 0x7f0a02c1
+    const v0, 0x7f0a02c0
 
     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, 0x7f120480
+    const v0, 0x7f12045b
 
     invoke-static {p1, v0}, Lcom/discord/app/h;->c(Landroid/content/Context;I)V
 
@@ -293,7 +293,7 @@
 
     const/4 v2, 0x1
 
-    const v3, 0x7f120b34
+    const v3, 0x7f120afe
 
     const/4 v4, 0x0
 
@@ -305,7 +305,7 @@
 
     new-array v5, v2, [Ljava/lang/Object;
 
-    const v6, 0x7f12126a
+    const v6, 0x7f1211dd
 
     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, 0x7f12126b
+    const v5, 0x7f1211de
 
     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, 0x7f0d01ab
+    const v0, 0x7f0d01a9
 
     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 b6e2250535..c115e04bb7 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 bbdf7223d1..7febeeabcd 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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;->EP:Lcom/discord/views/steps/StepsView$d;
+    iget-object v1, v0, Lcom/discord/views/steps/StepsView;->ET:Lcom/discord/views/steps/StepsView$d;
 
     if-eqz v1, :cond_0
 
@@ -110,7 +110,7 @@
     :cond_0
     if-ge p1, v2, :cond_1
 
-    iget-object v0, v0, Lcom/discord/views/steps/StepsView;->viewPager:Lcom/discord/utilities/simple_pager/SimplePager;
+    iget-object v0, v0, Lcom/discord/views/steps/StepsView;->ES:Lcom/discord/utilities/simple_pager/SimplePager;
 
     invoke-virtual {v0, p1}, Lcom/discord/utilities/simple_pager/SimplePager;->setCurrentItem(I)V
 
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 6164d79e71..5a8e8faf9f 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, 0x7f0a02c2
+    const v0, 0x7f0a02c1
 
     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, 0x7f0a027a
+    const v0, 0x7f0a0279
 
     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, 0x7f0d011d
+    const v0, 0x7f0d011b
 
     return v0
 .end method
@@ -251,7 +251,7 @@
 
     const/4 v3, 0x0
 
-    const v4, 0x7f1203a0
+    const v4, 0x7f12037b
 
     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;->Fj:Ljava/util/List;
+    iput-object v0, v2, Lcom/discord/views/steps/StepsView$d;->Fm:Ljava/util/List;
 
     invoke-virtual {v2}, Lcom/discord/views/steps/StepsView$d;->notifyDataSetChanged()V
 
@@ -367,21 +367,21 @@
 
     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;->EP:Lcom/discord/views/steps/StepsView$d;
+    iput-object v2, v0, Lcom/discord/views/steps/StepsView;->ET:Lcom/discord/views/steps/StepsView$d;
 
-    iget-object v2, v0, Lcom/discord/views/steps/StepsView;->viewPager:Lcom/discord/utilities/simple_pager/SimplePager;
+    iget-object v2, v0, Lcom/discord/views/steps/StepsView;->ES:Lcom/discord/utilities/simple_pager/SimplePager;
 
-    iget-object v5, v0, Lcom/discord/views/steps/StepsView;->EP:Lcom/discord/views/steps/StepsView$d;
+    iget-object v5, v0, Lcom/discord/views/steps/StepsView;->ET:Lcom/discord/views/steps/StepsView$d;
 
     check-cast v5, Landroidx/viewpager/widget/PagerAdapter;
 
     invoke-virtual {v2, v5}, Lcom/discord/utilities/simple_pager/SimplePager;->setAdapter(Landroidx/viewpager/widget/PagerAdapter;)V
 
-    iget-object v2, v0, Lcom/discord/views/steps/StepsView;->viewPager:Lcom/discord/utilities/simple_pager/SimplePager;
+    iget-object v2, v0, Lcom/discord/views/steps/StepsView;->ES:Lcom/discord/utilities/simple_pager/SimplePager;
 
     invoke-virtual {v2}, Lcom/discord/utilities/simple_pager/SimplePager;->clearOnPageChangeListeners()V
 
-    iget-object v2, v0, Lcom/discord/views/steps/StepsView;->viewPager:Lcom/discord/utilities/simple_pager/SimplePager;
+    iget-object v2, v0, Lcom/discord/views/steps/StepsView;->ES:Lcom/discord/utilities/simple_pager/SimplePager;
 
     new-instance v5, Lcom/discord/views/steps/StepsView$e;
 
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 07104ddd9d..e9f1b5c514 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, 0x7f0a0488
+    const v0, 0x7f0a047b
 
     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, 0x7f0d01ac
+    const v0, 0x7f0d01aa
 
     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 909f0d3120..04c460aaa9 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 c18e4565cc..bdeb4d30ba 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 a5b6f9b8d2..f98c9391d2 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 8d0e6007cd..99b156df78 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;->Kz()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kx()Lrx/subjects/BehaviorSubject;
 
     move-result-object v0
 
@@ -238,7 +238,7 @@
 
     move-result-object p2
 
-    invoke-static {}, Lrx/android/b/a;->Jc()Lrx/Scheduler;
+    invoke-static {}, Lrx/android/b/a;->Ja()Lrx/Scheduler;
 
     move-result-object v0
 
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 730337a3f9..9d44a0d6a7 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
@@ -77,7 +77,7 @@
 
     if-ne p2, v0, :cond_0
 
-    const p2, 0x7f120d22
+    const p2, 0x7f120ceb
 
     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 ab2fa62d57..9719f7d616 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
@@ -45,7 +45,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/settings/billing/PaymentSourceAdapter$PaymentSourceItemViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a04fb
+    const v0, 0x7f0a04ed
 
     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, 0x7f0a04f9
+    const v0, 0x7f0a04eb
 
     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 dc5a0526d6..031d28c8c9 100644
--- a/com.discord/smali/com/discord/widgets/settings/billing/PaymentSourceView.smali
+++ b/com.discord/smali/com/discord/widgets/settings/billing/PaymentSourceView.smali
@@ -73,7 +73,7 @@
 
     invoke-static {p1, p3, p2}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
-    const p1, 0x7f0a050f
+    const p1, 0x7f0a0501
 
     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, 0x7f0a0514
+    const p1, 0x7f0a0506
 
     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, 0x7f0a0513
+    const p1, 0x7f0a0505
 
     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, 0x7f0a0512
+    const p1, 0x7f0a0504
 
     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, 0x7f0a0511
+    const p1, 0x7f0a0503
 
     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, 0x7f120d9a
+    const v2, 0x7f120d61
 
     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, 0x7f120d9c
+    const p1, 0x7f120d63
 
     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, 0x7f120db8
+    const v1, 0x7f120d7f
 
     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 d13a1a3402..9a18f97d6c 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 c30f111480..faa5e40a93 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 2a337b9aaa..d27fe790ae 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;->Kz()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kx()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 de54587143..9aef4fcb39 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -65,7 +65,7 @@
 
     check-cast p1, Landroidx/fragment/app/Fragment;
 
-    const v0, 0x7f120da2
+    const v0, 0x7f120d69
 
     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 c1de741204..0c53f2eaf8 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 3e7baf2446..d15acf0b72 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 d910b49c2b..2edc7a33da 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, 0x7f120da0
+    const v4, 0x7f120d67
 
     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, 0x7f120da1
+    const v5, 0x7f120d68
 
     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, 0x7f120d13
+    const v6, 0x7f120cdc
 
     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 40e165def8..0db8717828 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 20c37a71c7..48e9f1ef0c 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -65,7 +65,7 @@
 
     check-cast p1, Landroidx/fragment/app/Fragment;
 
-    const v0, 0x7f120da5
+    const v0, 0x7f120d6c
 
     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 3c2c64ccad..11673ff54e 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 4e3f4bf672..86cd4ac6a4 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 813161c1de..d7d9267f0b 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, 0x7f0a050e
+    const v0, 0x7f0a0500
 
     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, 0x7f0a050a
+    const v0, 0x7f0a04fc
 
     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, 0x7f0a0509
+    const v0, 0x7f0a04fb
 
     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, 0x7f0a050b
+    const v0, 0x7f0a04fd
 
     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, 0x7f0a0504
+    const v0, 0x7f0a04f6
 
     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, 0x7f0a0505
+    const v0, 0x7f0a04f7
 
     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, 0x7f0a0506
+    const v0, 0x7f0a04f8
 
     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, 0x7f0a050d
+    const v0, 0x7f0a04ff
 
     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, 0x7f0a050c
+    const v0, 0x7f0a04fe
 
     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, 0x7f0a0507
+    const v0, 0x7f0a04f9
 
     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, 0x7f0a0508
+    const v0, 0x7f0a04fa
 
     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, 0x7f0a0272
+    const v0, 0x7f0a0271
 
     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, 0x7f0a0271
+    const v0, 0x7f0a0270
 
     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, 0x7f120da4
+    const v3, 0x7f120d6b
 
     new-array v4, v9, [Ljava/lang/Object;
 
@@ -1201,7 +1201,7 @@
     goto :goto_0
 
     :cond_0
-    const v3, 0x7f120da3
+    const v3, 0x7f120d6a
 
     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, 0x7f1202cd
+    const v0, 0x7f1202cc
 
     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, 0x7f1202ca
+    const v0, 0x7f1202c9
 
     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, 0x7f1202c9
+    const v7, 0x7f1202c8
 
     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, 0x7f1202c1
+    const v8, 0x7f1202c0
 
     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, 0x7f1202c4
+    const v8, 0x7f1202c3
 
     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, 0x7f1202ce
+    const p1, 0x7f1202cd
 
     goto :goto_0
 
     :cond_0
-    const p1, 0x7f1202d1
+    const p1, 0x7f1202d0
 
     :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, 0x7f1202cc
+    const v6, 0x7f1202cb
 
     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/e;->xD:Lcom/discord/dialogs/e$a;
+    sget-object v0, Lcom/discord/dialogs/e;->xF: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, 0x7f120da6
+    const v1, 0x7f120d6d
 
     invoke-virtual {p0, v1}, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;->getString(I)Ljava/lang/String;
 
@@ -2166,7 +2166,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d015e
+    const v0, 0x7f0d015c
 
     return v0
 .end method
@@ -2404,7 +2404,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->IV()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->IT()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 34709ee5dc..79823abd6e 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, 0x7f0a06a4
+    const v0, 0x7f0a068b
 
     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, 0x7f0d01a4
+    const v0, 0x7f0d01a2
 
     return v0
 .end method
@@ -117,11 +117,11 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onActivityCreated(Landroid/os/Bundle;)V
 
-    const p1, 0x7f1202b9
+    const p1, 0x7f1202b7
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/billing/WidgetSettingsBilling;->setActionBarTitle(I)Lkotlin/Unit;
 
-    const p1, 0x7f12134d
+    const p1, 0x7f1212c1
 
     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, 0x7f1202ff
+    const v4, 0x7f1202fa
 
     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, 0x7f1202fa
+    const v4, 0x7f1202f5
 
     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 c38c950305..757c1c869a 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 9b63b8c4c1..cf75a49fd1 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, 0x7f0a085b
+    const v0, 0x7f0a0820
 
     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, 0x7f0d01e4
+    const v0, 0x7f0d01d9
 
     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 8517b3a4f6..e751af38ee 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 99c745962c..f3d05e075e 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 f32804f75a..01d60f0d59 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, 0x7f0a0503
+    const v0, 0x7f0a04f5
 
     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, 0x7f0a0501
+    const v0, 0x7f0a04f3
 
     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, 0x7f0a0502
+    const v0, 0x7f0a04f4
 
     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, 0x7f0a04fc
+    const v0, 0x7f0a04ee
 
     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, 0x7f0d01b9
+    const v0, 0x7f0d01b7
 
     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 c3b808ce12..1f7320566f 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, 0x7f0d0071
+    const p3, 0x7f0d0070
 
     invoke-static {p1, p3, p2}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
-    const p1, 0x7f0a0249
+    const p1, 0x7f0a0248
 
     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, 0x7f0a0248
+    const p1, 0x7f0a0247
 
     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, 0x7f0a024a
+    const p1, 0x7f0a0249
 
     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, 0x7f0a024f
+    const p1, 0x7f0a024e
 
     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, 0x7f120f10
+    const v2, 0x7f120e8b
 
     const-string v7, "header"
 
@@ -192,7 +192,7 @@
 
     move-result-object v5
 
-    const v6, 0x7f120f1c
+    const v6, 0x7f120e93
 
     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, 0x7f08012d
+    const v8, 0x7f080129
 
     invoke-virtual {v6, v8}, Landroid/widget/ImageView;->setImageResource(I)V
 
@@ -245,7 +245,7 @@
 
     move-result-object v5
 
-    const v6, 0x7f120f1d
+    const v6, 0x7f120e94
 
     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, 0x7f08012c
+    const v8, 0x7f080128
 
     invoke-virtual {v6, v8}, Landroid/widget/ImageView;->setImageResource(I)V
 
@@ -335,7 +335,7 @@
 
     move-result-object v2
 
-    const v7, 0x7f120f12
+    const v7, 0x7f120e8d
 
     new-array v8, v3, [Ljava/lang/Object;
 
@@ -360,7 +360,7 @@
 
     move-result-object v2
 
-    const v7, 0x7f120f11
+    const v7, 0x7f120e8c
 
     new-array v8, v3, [Ljava/lang/Object;
 
@@ -385,7 +385,7 @@
 
     move-result-object v5
 
-    const v6, 0x7f1000af
+    const v6, 0x7f1000a4
 
     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 8299c785b0..f6ff0f5479 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 8d0926c16f..f75f375cbc 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 9bad527877..6c802435be 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;->KA()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->Ky()Lrx/subjects/PublishSubject;
 
     move-result-object v0
 
@@ -837,7 +837,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/android/b/a;->Jc()Lrx/Scheduler;
+    invoke-static {}, Lrx/android/b/a;->Ja()Lrx/Scheduler;
 
     move-result-object v1
 
@@ -938,7 +938,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/android/b/a;->Jc()Lrx/Scheduler;
+    invoke-static {}, Lrx/android/b/a;->Ja()Lrx/Scheduler;
 
     move-result-object v0
 
@@ -1317,7 +1317,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/android/b/a;->Jc()Lrx/Scheduler;
+    invoke-static {}, Lrx/android/b/a;->Ja()Lrx/Scheduler;
 
     move-result-object v1
 
@@ -1434,7 +1434,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/android/b/a;->Jc()Lrx/Scheduler;
+    invoke-static {}, Lrx/android/b/a;->Ja()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 bec4dc1d61..9b8cef3e03 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 19ea92f6f8..c324bcc72d 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, 0x7f0a02cc
+    const v0, 0x7f0a02cb
 
     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, 0x7f120f1c
+    const v2, 0x7f120e93
 
     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, 0x7f120e05
+    const v4, 0x7f120dcb
 
-    const v5, 0x7f120e06
+    const v5, 0x7f120dcc
 
     goto :goto_1
 
     :pswitch_1
-    const v2, 0x7f120f1d
+    const v2, 0x7f120e94
 
     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, 0x7f120e08
+    const v4, 0x7f120dce
 
-    const v5, 0x7f120e09
+    const v5, 0x7f120dcf
 
     :goto_1
     invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;->getHeaderTv()Landroid/widget/TextView;
 
     move-result-object v6
 
-    const v7, 0x7f120e0c
+    const v7, 0x7f120dd2
 
     const/4 v8, 0x1
 
@@ -810,7 +810,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d00cb
+    const v0, 0x7f0d00c9
 
     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 b0967784ca..a3c9f49d1c 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 71668a4a4f..698184eeb0 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 665b4c939a..e6283e82d0 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 5d0008e0d8..c6b58b0005 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 6731c837e9..77f4b680cc 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 737741c53b..9e779a69c1 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 2e2668634c..df98dbf1ae 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 3513fc8582..d24d5fc1de 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 2f4106cbd3..fbfb29ed8a 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 v0, Lcom/discord/dialogs/f;->xH:Lcom/discord/dialogs/f$a;
+    sget-object v0, Lcom/discord/dialogs/f;->xJ:Lcom/discord/dialogs/f$a;
 
     const-string v0, "Settings - Gifting"
 
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 c1106397a9..2abf721919 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, 0x7f0a06cb
+    const v0, 0x7f0a06b2
 
     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, 0x7f0a06c1
+    const v0, 0x7f0a06a8
 
     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, 0x7f0a06cc
+    const v0, 0x7f0a06b3
 
     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, 0x7f0a06c2
+    const v0, 0x7f0a06a9
 
     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, 0x7f0a06c4
+    const v0, 0x7f0a06ab
 
     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, 0x7f0a06c3
+    const v0, 0x7f0a06aa
 
     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, 0x7f0a06ca
+    const v0, 0x7f0a06b1
 
     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, 0x7f0a06c9
+    const v0, 0x7f0a06b0
 
     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, 0x7f0a06c8
+    const v0, 0x7f0a06af
 
     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, 0x7f0a06c7
+    const v0, 0x7f0a06ae
 
     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, 0x7f0a06c6
+    const v0, 0x7f0a06ad
 
     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, 0x7f0a06c5
+    const v0, 0x7f0a06ac
 
     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, 0x7f0d01ae
+    const v0, 0x7f0d01ac
 
     return v0
 .end method
@@ -1464,7 +1464,7 @@
 
     move-result-object v2
 
-    const v4, 0x7f06011c
+    const v4, 0x7f06011b
 
     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, 0x7f120307
+    const v4, 0x7f120302
 
     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, 0x7f120305
+    const v5, 0x7f120300
 
     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, 0x7f120eed
+    const v3, 0x7f120e70
 
     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, 0x7f120e2e
+    const v4, 0x7f120df2
 
     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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 c74020b9e8..2053ae3878 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 bee16ee0ff..0b1b6496a1 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, 0x7f0d0089
+    const v0, 0x7f0d0088
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
-    const p1, 0x7f0a031c
+    const p1, 0x7f0a031b
 
     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, 0x7f0a0319
+    const p1, 0x7f0a0318
 
     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, 0x7f0a0317
+    const p1, 0x7f0a0316
 
     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, 0x7f0a0318
+    const p1, 0x7f0a0317
 
     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, 0x7f0a031a
+    const p1, 0x7f0a0319
 
     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, 0x7f0a031e
+    const p1, 0x7f0a031d
 
     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, 0x7f0a031d
+    const p1, 0x7f0a031c
 
     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, 0x7f0a031b
+    const p1, 0x7f0a031a
 
     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, 0x7f08009c
+    const v7, 0x7f08009b
 
     goto :goto_0
 
     :cond_2
-    const v7, 0x7f08009b
+    const v7, 0x7f08009a
 
     :goto_0
     invoke-virtual {v6, v7}, Landroid/widget/TextView;->setBackgroundResource(I)V
@@ -655,12 +655,12 @@
 
     if-eqz v2, :cond_3
 
-    const v8, 0x7f12047f
+    const v8, 0x7f12045a
 
     goto :goto_1
 
     :cond_3
-    const v8, 0x7f120481
+    const v8, 0x7f12045c
 
     :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, 0x7f0402bb
+    const v2, 0x7f0402ba
 
     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, 0x7f1207ef
+    const v7, 0x7f1207ca
 
     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, 0x7f0402b8
+    const v4, 0x7f0402b7
 
     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, 0x7f0402b6
+    const v3, 0x7f0402b5
 
     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 eb9a1abc28..27c68ab5c7 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, 0x7f0d0097
+    const v0, 0x7f0d0095
 
     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 7af610031e..a0ff9c24ff 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,33 +149,25 @@
 
     check-cast p1, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
 
-    const v0, 0x7f0d008a
+    const v0, 0x7f0d0089
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
-    const p1, 0x7f0a0321
-
-    invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$SkuListItem;->icon$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const p1, 0x7f0a0322
-
-    invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$SkuListItem;->name$delegate:Lkotlin/properties/ReadOnlyProperty;
-
     const p1, 0x7f0a0320
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$SkuListItem;->copies$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$SkuListItem;->icon$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const p1, 0x7f0a0321
+
+    invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$SkuListItem;->name$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     const p1, 0x7f0a031f
 
@@ -183,6 +175,14 @@
 
     move-result-object p1
 
+    iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$SkuListItem;->copies$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const p1, 0x7f0a031e
+
+    invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p1
+
     iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$SkuListItem;->arrow$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     return-void
@@ -348,7 +348,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f100059
+    const v1, 0x7f100058
 
     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, 0x7f08023e
+    const v0, 0x7f080233
 
     goto :goto_0
 
     :cond_1
-    const v0, 0x7f080242
+    const v0, 0x7f080236
 
     :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 ba4ced7406..8ead2375f6 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 9f19a0e885..51f8288178 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 7d7d11547e..fa998c541b 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 b17b06bbc5..4a6d120a94 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 3eb47684fe..0e7cbef495 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 a41c837bda..472d93be39 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 4b09e86aeb..32fe4cd5e3 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 c5b9a39d08..4ca7f65669 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 47dacac4f5..2cbf51674f 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 9ca6bd6c19..6e9fa5de90 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;->Jc()Lrx/Scheduler;
+    invoke-static {}, Lrx/android/b/a;->Ja()Lrx/Scheduler;
 
     move-result-object v1
 
@@ -89,7 +89,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -1016,7 +1016,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/android/b/a;->Jc()Lrx/Scheduler;
+    invoke-static {}, Lrx/android/b/a;->Ja()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 a41df7f565..668af2c335 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;->vm:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vn: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 22620aba00..84818cb936 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 207e7b370a..7769637fbe 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 690d31f490..997a3ada5d 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 cddddf0786..b4cb978a36 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 f42e6257b4..15d3c54323 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 7a8d1bb60f..fda0e30259 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, 0x7f120ee1
+    const v0, 0x7f120e64
 
     return v0
 
@@ -78,7 +78,7 @@
     throw v0
 
     :cond_1
-    const v0, 0x7f120ee0
+    const v0, 0x7f120e63
 
     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 ce8a087f7d..6a80a00910 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 493b778e9a..8227d14edf 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 3adda8f3bc..c7d4ed8cfa 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 ff5e25066e..08ebee4f0b 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, 0x7f0a0529
+    const v0, 0x7f0a051a
 
     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, 0x7f0a0537
+    const v0, 0x7f0a0528
 
     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, 0x7f0a0536
+    const v0, 0x7f0a0527
 
     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, 0x7f0a0535
+    const v0, 0x7f0a0526
 
     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, 0x7f0a0534
+    const v0, 0x7f0a0525
 
     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, 0x7f0a0533
+    const v0, 0x7f0a0524
 
     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, 0x7f0a0532
+    const v0, 0x7f0a0523
 
     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, 0x7f0a053a
+    const v0, 0x7f0a052b
 
     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, 0x7f0a053b
+    const v0, 0x7f0a052c
 
     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, 0x7f0a053c
+    const v0, 0x7f0a052d
 
     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, 0x7f0a052a
+    const v0, 0x7f0a051b
 
     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, 0x7f0a0538
+    const v0, 0x7f0a0529
 
     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, 0x7f0a052d
+    const v0, 0x7f0a051e
 
     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, 0x7f0a052c
+    const v0, 0x7f0a051d
 
     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, 0x7f0a0539
+    const v0, 0x7f0a052a
 
     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, 0x7f0a052b
+    const v0, 0x7f0a051c
 
     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, 0x7f0a024c
+    const v0, 0x7f0a024b
 
     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, 0x7f0a024d
+    const v0, 0x7f0a024c
 
     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, 0x7f0a024e
+    const v0, 0x7f0a024d
 
     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 18
+    .locals 17
 
     move-object/from16 v0, p0
 
@@ -975,24 +975,22 @@
 
     move-result-object v2
 
-    if-eqz v1, :cond_9
+    if-nez v1, :cond_0
 
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelSubscription;->getPlanType()Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getActiveSubscriptionView()Lcom/discord/views/ActiveSubscriptionView;
 
-    move-result-object v3
+    move-result-object v1
 
-    invoke-virtual {v3}, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->isNitroSubscription()Z
+    const/16 v2, 0x8
 
-    move-result v3
+    invoke-virtual {v1, v2}, Lcom/discord/views/ActiveSubscriptionView;->setVisibility(I)V
 
-    if-nez v3, :cond_0
-
-    goto/16 :goto_3
+    return-void
 
     :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 v16
+    move-result-object v15
 
     invoke-virtual {v1}, Lcom/discord/models/domain/ModelSubscription;->isAppleSubscription()Z
 
@@ -1012,7 +1010,7 @@
 
     new-instance v2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig;
 
-    const v3, 0x7f1203a0
+    const v3, 0x7f12037b
 
     invoke-virtual {v0, v3}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getString(I)Ljava/lang/String;
 
@@ -1099,7 +1097,7 @@
 
     new-instance v2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig;
 
-    const v3, 0x7f120fd8
+    const v3, 0x7f120f4c
 
     invoke-virtual {v0, v3}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getString(I)Ljava/lang/String;
 
@@ -1142,7 +1140,7 @@
 
     new-instance v3, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig;
 
-    const v5, 0x7f1202f1
+    const v5, 0x7f1202ec
 
     invoke-virtual {v0, v5}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getString(I)Ljava/lang/String;
 
@@ -1161,7 +1159,7 @@
     goto :goto_2
 
     :cond_7
-    invoke-interface/range {v16 .. v16}, Ljava/util/List;->isEmpty()Z
+    invoke-interface {v15}, Ljava/util/List;->isEmpty()Z
 
     move-result v3
 
@@ -1169,7 +1167,7 @@
 
     new-instance v3, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig;
 
-    const v5, 0x7f1202bc
+    const v5, 0x7f1202bb
 
     invoke-virtual {v0, v5}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getString(I)Ljava/lang/String;
 
@@ -1223,61 +1221,61 @@
 
     invoke-virtual {v1}, Lcom/discord/models/domain/ModelSubscription;->isAppleSubscription()Z
 
-    move-result v9
+    move-result v1
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->getSubscriptionError()Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$SubscriptionError;
 
-    move-result-object v1
+    move-result-object v9
 
-    invoke-direct {v0, v1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getSubscriptionErrorText(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$SubscriptionError;)Ljava/lang/CharSequence;
+    invoke-direct {v0, v9}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getSubscriptionErrorText(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$SubscriptionError;)Ljava/lang/CharSequence;
 
-    move-result-object v10
+    move-result-object v9
 
     invoke-virtual {v2}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig;->getText()Ljava/lang/CharSequence;
 
-    move-result-object v11
+    move-result-object v10
 
     invoke-virtual {v2}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig;->getOnClick()Lkotlin/jvm/functions/Function0;
 
-    move-result-object v12
+    move-result-object v11
 
     invoke-virtual {v3}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig;->getText()Ljava/lang/CharSequence;
 
-    move-result-object v14
+    move-result-object v13
 
     invoke-virtual {v3}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig;->getOnClick()Lkotlin/jvm/functions/Function0;
 
-    move-result-object v15
+    move-result-object v14
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->isBusy()Z
 
-    move-result v13
+    move-result v12
 
-    new-instance v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configureActiveSubscriptionView$1;
+    new-instance v2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configureActiveSubscriptionView$1;
 
-    move-object v2, v0
+    move-object v3, v0
 
-    check-cast v2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+    check-cast v3, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
 
-    invoke-direct {v1, v2}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configureActiveSubscriptionView$1;-><init>(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;)V
+    invoke-direct {v2, v3}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configureActiveSubscriptionView$1;-><init>(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;)V
 
-    move-object/from16 v17, v1
+    move-object/from16 v16, v2
 
-    check-cast v17, Lkotlin/jvm/functions/Function1;
+    check-cast v16, Lkotlin/jvm/functions/Function1;
 
-    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-object v3, v4
 
-    return-void
+    move v4, v5
 
-    :cond_9
-    :goto_3
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getActiveSubscriptionView()Lcom/discord/views/ActiveSubscriptionView;
+    move-object v5, v6
 
-    move-result-object v1
+    move v6, v7
 
-    const/16 v2, 0x8
+    move-object v7, v8
 
-    invoke-virtual {v1, v2}, Lcom/discord/views/ActiveSubscriptionView;->setVisibility(I)V
+    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
 
     return-void
 .end method
@@ -1813,7 +1811,7 @@
     goto :goto_2
 
     :cond_2
-    const p1, 0x7f120e4a
+    const p1, 0x7f120e0e
 
     new-array v4, v3, [Ljava/lang/Object;
 
@@ -1842,7 +1840,7 @@
     goto :goto_2
 
     :cond_3
-    const p1, 0x7f120e45
+    const p1, 0x7f120e09
 
     new-array v4, v3, [Ljava/lang/Object;
 
@@ -1910,19 +1908,17 @@
 .method private final configureLegalese(Lcom/discord/models/domain/ModelSubscription;)V
     .locals 13
 
-    if-eqz p1, :cond_3
+    if-nez p1, :cond_0
 
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelSubscription;->getPlanType()Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getLegalese()Landroid/widget/TextView;
 
-    move-result-object v0
+    move-result-object p1
 
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->isNitroSubscription()Z
+    const/16 v0, 0x8
 
-    move-result v0
+    invoke-virtual {p1, v0}, Landroid/widget/TextView;->setVisibility(I)V
 
-    if-nez v0, :cond_0
-
-    goto/16 :goto_2
+    return-void
 
     :cond_0
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelSubscription;->getPlanType()Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
@@ -1949,7 +1945,7 @@
 
     if-ne v0, v1, :cond_1
 
-    const v0, 0x7f1202fc
+    const v0, 0x7f1202f7
 
     goto :goto_0
 
@@ -1961,7 +1957,7 @@
     throw p1
 
     :cond_2
-    const v0, 0x7f1202fd
+    const v0, 0x7f1202f8
 
     :goto_0
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelSubscription;->getPlanType()Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
@@ -1983,7 +1979,7 @@
     goto :goto_1
 
     :pswitch_0
-    const v3, 0x7f120f1d
+    const v3, 0x7f120e94
 
     invoke-virtual {p0, v3}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getString(I)Ljava/lang/String;
 
@@ -1992,7 +1988,7 @@
     goto :goto_1
 
     :pswitch_1
-    const v3, 0x7f120f1c
+    const v3, 0x7f120e93
 
     invoke-virtual {p0, v3}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getString(I)Ljava/lang/String;
 
@@ -2047,7 +2043,7 @@
 
     aput-object v3, v5, v6
 
-    const v3, 0x7f12121b
+    const v3, 0x7f12118e
 
     invoke-virtual {p0, v3}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getString(I)Ljava/lang/String;
 
@@ -2095,18 +2091,6 @@
 
     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
@@ -2574,7 +2558,7 @@
 
     if-nez v1, :cond_2
 
-    sget-object v1, Lcom/discord/views/ActiveSubscriptionView$DropdownItem$b;->BV:Lcom/discord/views/ActiveSubscriptionView$DropdownItem$b;
+    sget-object v1, Lcom/discord/views/ActiveSubscriptionView$DropdownItem$b;->BY:Lcom/discord/views/ActiveSubscriptionView$DropdownItem$b;
 
     invoke-virtual {v2, v1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
@@ -2663,7 +2647,7 @@
     :cond_4
     if-eqz v0, :cond_5
 
-    sget-object p1, Lcom/discord/views/ActiveSubscriptionView$DropdownItem$a;->BU:Lcom/discord/views/ActiveSubscriptionView$DropdownItem$a;
+    sget-object p1, Lcom/discord/views/ActiveSubscriptionView$DropdownItem$a;->BX:Lcom/discord/views/ActiveSubscriptionView$DropdownItem$a;
 
     invoke-virtual {v2, p1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
@@ -2704,7 +2688,7 @@
 
     if-ne v0, v1, :cond_0
 
-    const p1, 0x7f080090
+    const p1, 0x7f08008f
 
     return p1
 
@@ -2713,7 +2697,7 @@
 
     if-ne v0, v1, :cond_1
 
-    const p1, 0x7f080092
+    const p1, 0x7f080091
 
     return p1
 
@@ -2757,12 +2741,12 @@
     throw v0
 
     :pswitch_0
-    const p1, 0x7f08008f
+    const p1, 0x7f08008e
 
     return p1
 
     :pswitch_1
-    const p1, 0x7f080091
+    const p1, 0x7f080090
 
     return p1
 
@@ -2836,18 +2820,18 @@
     throw v0
 
     :pswitch_0
-    sget-object p1, Lcom/discord/views/ActiveSubscriptionView$HeaderImage;->BW:Lcom/discord/views/ActiveSubscriptionView$HeaderImage;
+    sget-object p1, Lcom/discord/views/ActiveSubscriptionView$HeaderImage;->BZ:Lcom/discord/views/ActiveSubscriptionView$HeaderImage;
 
     return-object p1
 
     :pswitch_1
-    sget-object p1, Lcom/discord/views/ActiveSubscriptionView$HeaderImage;->BX:Lcom/discord/views/ActiveSubscriptionView$HeaderImage;
+    sget-object p1, Lcom/discord/views/ActiveSubscriptionView$HeaderImage;->Ca:Lcom/discord/views/ActiveSubscriptionView$HeaderImage;
 
     return-object p1
 
     :cond_1
     :goto_0
-    sget-object p1, Lcom/discord/views/ActiveSubscriptionView$HeaderImage;->BY:Lcom/discord/views/ActiveSubscriptionView$HeaderImage;
+    sget-object p1, Lcom/discord/views/ActiveSubscriptionView$HeaderImage;->Cb:Lcom/discord/views/ActiveSubscriptionView$HeaderImage;
 
     return-object p1
 
@@ -2895,12 +2879,12 @@
 
     if-eq p1, v0, :cond_0
 
-    const p1, 0x7f080443
+    const p1, 0x7f080434
 
     return p1
 
     :cond_0
-    const p1, 0x7f080440
+    const p1, 0x7f080431
 
     return p1
 .end method
@@ -2958,7 +2942,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f120ee7
+    const v2, 0x7f120e6a
 
     new-array v3, v6, [Ljava/lang/Object;
 
@@ -3072,7 +3056,7 @@
 
     :cond_2
     :goto_0
-    const v1, 0x7f120e0e
+    const v1, 0x7f120dd4
 
     new-array v2, v6, [Ljava/lang/Object;
 
@@ -3126,7 +3110,7 @@
 
     if-ne v1, v2, :cond_0
 
-    const p3, 0x7f12030d
+    const p3, 0x7f120307
 
     goto :goto_0
 
@@ -3141,7 +3125,7 @@
 
     if-ne p3, v1, :cond_1
 
-    const p3, 0x7f120313
+    const p3, 0x7f12030c
 
     goto :goto_0
 
@@ -3154,7 +3138,7 @@
 
     if-ne p3, v1, :cond_2
 
-    const p3, 0x7f12030b
+    const p3, 0x7f120306
 
     goto :goto_0
 
@@ -3167,7 +3151,7 @@
 
     if-ne p3, v1, :cond_3
 
-    const p3, 0x7f120311
+    const p3, 0x7f12030b
 
     goto :goto_0
 
@@ -3279,13 +3263,13 @@
 
     if-ne p1, v0, :cond_1
 
-    const p1, 0x7f12060e
+    const p1, 0x7f1205e9
 
     new-array v0, v0, [Ljava/lang/Object;
 
     const/4 v1, 0x0
 
-    sget-object v2, Lcom/discord/app/e;->uY:Ljava/lang/String;
+    sget-object v2, Lcom/discord/app/e;->uZ:Ljava/lang/String;
 
     aput-object v2, v0, v1
 
@@ -3416,7 +3400,7 @@
     return-void
 
     :cond_1
-    sget-object v0, Lcom/discord/views/ActiveSubscriptionView$DropdownItem$a;->BU:Lcom/discord/views/ActiveSubscriptionView$DropdownItem$a;
+    sget-object v0, Lcom/discord/views/ActiveSubscriptionView$DropdownItem$a;->BX:Lcom/discord/views/ActiveSubscriptionView$DropdownItem$a;
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -3429,7 +3413,7 @@
     return-void
 
     :cond_2
-    sget-object v0, Lcom/discord/views/ActiveSubscriptionView$DropdownItem$b;->BV:Lcom/discord/views/ActiveSubscriptionView$DropdownItem$b;
+    sget-object v0, Lcom/discord/views/ActiveSubscriptionView$DropdownItem$b;->BY:Lcom/discord/views/ActiveSubscriptionView$DropdownItem$b;
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -3551,73 +3535,27 @@
 
     move-result-object v0
 
-    const/4 v1, 0x0
-
-    if-eqz v0, :cond_0
+    if-eqz v0, :cond_1
 
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelSubscription;->getPlanType()Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
     move-result-object v0
 
-    if-eqz v0, :cond_0
+    if-eqz v0, :cond_1
 
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->isNitroSubscription()Z
 
     move-result v0
 
-    invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+    if-nez v0, :cond_1
 
-    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;
+    sget-object v1, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
 
     new-instance v0, Ljava/lang/StringBuilder;
 
-    const-string v1, "Attempting to open WidgetSettingsPremium with non-Premium and non-PremiumGuild subscription: "
+    const-string v2, "Attempting to open WidgetSettingsPremium with non-Nitro subscription: "
 
-    invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+    invoke-direct {v0, v2}, 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;
 
@@ -3631,30 +3569,30 @@
 
     invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
-    move-result-object v3
+    move-result-object v2
+
+    const/4 v3, 0x0
 
     const/4 v4, 0x0
 
-    const/4 v5, 0x0
+    const/4 v5, 0x6
 
-    const/4 v6, 0x6
+    const/4 v6, 0x0
 
-    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-static/range {v1 .. v6}, Lcom/discord/utilities/logging/Logger;->e$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/Throwable;Ljava/util/Map;ILjava/lang/Object;)V
 
     invoke-virtual {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getActivity()Landroidx/fragment/app/FragmentActivity;
 
     move-result-object p1
 
-    if-eqz p1, :cond_2
+    if-eqz p1, :cond_0
 
     invoke-virtual {p1}, Landroidx/fragment/app/FragmentActivity;->finish()V
 
-    :cond_2
+    :cond_0
     return-void
 
-    :cond_3
+    :cond_1
     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;
@@ -3681,9 +3619,9 @@
 
     invoke-virtual {p1}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->getPremiumSubscription()Lcom/discord/models/domain/ModelSubscription;
 
-    move-result-object v2
+    move-result-object v1
 
-    invoke-direct {p0, v0, v2}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->configureAccountCredit(Ljava/util/List;Lcom/discord/models/domain/ModelSubscription;)V
+    invoke-direct {p0, v0, v1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->configureAccountCredit(Ljava/util/List;Lcom/discord/models/domain/ModelSubscription;)V
 
     invoke-virtual {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getMostRecentIntent()Landroid/content/Intent;
 
@@ -3693,13 +3631,15 @@
 
     move-result-object v0
 
-    const/4 v2, -0x1
+    const/4 v1, -0x1
 
-    const-string v3, "intent_section"
+    const-string v2, "intent_section"
 
-    if-eqz v0, :cond_4
+    const/4 v3, 0x0
 
-    invoke-virtual {v0, v3, v2}, Landroid/os/Bundle;->getInt(Ljava/lang/String;I)I
+    if-eqz v0, :cond_2
+
+    invoke-virtual {v0, v2, v1}, Landroid/os/Bundle;->getInt(Ljava/lang/String;I)I
 
     move-result v0
 
@@ -3707,36 +3647,36 @@
 
     move-result-object v0
 
-    goto :goto_2
+    goto :goto_0
 
-    :cond_4
-    move-object v0, v1
+    :cond_2
+    move-object v0, v3
 
-    :goto_2
-    if-nez v0, :cond_5
+    :goto_0
+    if-nez v0, :cond_3
 
-    goto :goto_3
+    goto :goto_1
 
-    :cond_5
+    :cond_3
     invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
 
     move-result v4
 
-    if-eq v4, v2, :cond_6
+    if-eq v4, v1, :cond_4
 
-    :goto_3
+    :goto_1
     const-wide/16 v4, 0x12c
 
     :try_start_0
-    sget-object v2, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
+    sget-object v1, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
 
-    invoke-static {v4, v5, v2}, Lrx/Observable;->g(JLjava/util/concurrent/TimeUnit;)Lrx/Observable;
+    invoke-static {v4, v5, v1}, Lrx/Observable;->g(JLjava/util/concurrent/TimeUnit;)Lrx/Observable;
 
-    move-result-object v2
+    move-result-object v1
 
     const-string v4, "Observable\n            .\u20260, TimeUnit.MILLISECONDS)"
 
-    invoke-static {v2, v4}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v4}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     move-object v4, p0
 
@@ -3744,9 +3684,9 @@
 
     const/4 v5, 0x2
 
-    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;
+    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;
 
-    move-result-object v2
+    move-result-object v1
 
     new-instance v4, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$showContent$1;
 
@@ -3754,16 +3694,16 @@
 
     check-cast v4, Lrx/functions/Action1;
 
-    invoke-virtual {v2, v4}, Lrx/Observable;->b(Lrx/functions/Action1;)Lrx/Subscription;
+    invoke-virtual {v1, 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_4
+    goto :goto_2
 
     :catch_0
     move-exception v0
 
-    sget-object v4, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
+    sget-object v4, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
 
     move-object v6, v0
 
@@ -3779,19 +3719,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_4
+    :goto_2
     invoke-virtual {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getMostRecentIntent()Landroid/content/Intent;
 
     move-result-object v0
 
-    invoke-virtual {v0, v3}, Landroid/content/Intent;->removeExtra(Ljava/lang/String;)V
+    invoke-virtual {v0, v2}, Landroid/content/Intent;->removeExtra(Ljava/lang/String;)V
 
-    :cond_6
+    :cond_4
     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_7
+    if-eqz v0, :cond_5
 
     invoke-virtual {p1}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->getDialog()Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog;
 
@@ -3801,10 +3741,10 @@
 
     return-void
 
-    :cond_7
+    :cond_5
     const/4 p1, 0x1
 
-    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
+    invoke-static {p0, v3, p1, v3}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->dismissAllDialogs$default(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog;ILjava/lang/Object;)V
 
     return-void
 .end method
@@ -3894,7 +3834,7 @@
 
     invoke-direct {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;-><init>(Landroid/content/Context;)V
 
-    const v1, 0x7f120f2d
+    const v1, 0x7f120ea9
 
     invoke-virtual {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setTitle(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
@@ -3906,7 +3846,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f120f2c
+    const v1, 0x7f120ea8
 
     invoke-virtual {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setMessage(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
@@ -3918,7 +3858,7 @@
 
     check-cast v1, Lkotlin/jvm/functions/Function1;
 
-    const v2, 0x7f120d13
+    const v2, 0x7f120cdc
 
     invoke-virtual {v0, v2, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setPositiveButton(ILkotlin/jvm/functions/Function1;)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
@@ -4000,7 +3940,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d01ba
+    const v0, 0x7f0d01b8
 
     return v0
 .end method
@@ -4136,7 +4076,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v2
 
@@ -4255,11 +4195,11 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const p1, 0x7f12134d
+    const p1, 0x7f1212c1
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->setActionBarSubtitle(I)Lkotlin/Unit;
 
-    const p1, 0x7f120f20
+    const p1, 0x7f120e97
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -4277,7 +4217,7 @@
 
     new-array p1, p1, [Ljava/lang/Object;
 
-    const v3, 0x7f1205e4
+    const v3, 0x7f1205bf
 
     invoke-virtual {p0, v3}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getString(I)Ljava/lang/String;
 
@@ -4285,7 +4225,7 @@
 
     aput-object v3, p1, v0
 
-    const v0, 0x7f1205e3
+    const v0, 0x7f1205be
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getString(I)Ljava/lang/String;
 
@@ -4295,7 +4235,7 @@
 
     aput-object v0, p1, v3
 
-    const v0, 0x7f1205e2
+    const v0, 0x7f1205bd
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getString(I)Ljava/lang/String;
 
@@ -4305,7 +4245,7 @@
 
     aput-object v0, p1, v4
 
-    const v0, 0x7f120e1f
+    const v0, 0x7f120de4
 
     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 9d8c08c909..f6bdf98a0b 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_3
+    if-eqz v0, :cond_1
 
     move-object v0, p1
 
     check-cast v0, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;
 
-    invoke-virtual {v0}, 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 v0
 
@@ -105,7 +105,13 @@
 
     new-instance v1, Ljava/util/ArrayList;
 
-    invoke-direct {v1}, Ljava/util/ArrayList;-><init>()V
+    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;
 
@@ -113,25 +119,18 @@
 
     move-result-object v0
 
-    :cond_0
     :goto_0
     invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v2
 
-    if-eqz v2, :cond_2
+    if-eqz v2, :cond_0
 
     invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
     move-result-object v2
 
-    check-cast v2, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;
-
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;->getPremiumGuildSubscription()Lcom/discord/models/domain/ModelPremiumGuildSubscription;
-
-    move-result-object v2
-
-    if-eqz v2, :cond_1
+    check-cast v2, Lcom/discord/models/domain/ModelPremiumGuildSubscription;
 
     invoke-virtual {v2}, Lcom/discord/models/domain/ModelPremiumGuildSubscription;->getGuildId()J
 
@@ -141,19 +140,11 @@
 
     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_2
+    :cond_0
     check-cast v1, Ljava/util/List;
 
     check-cast v1, Ljava/lang/Iterable;
@@ -184,7 +175,7 @@
 
     return-object p1
 
-    :cond_3
+    :cond_1
     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 5d12bba9fe..8b46a6c349 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/Func3;
+.implements Lrx/functions/Func2;
 
 
 # annotations
@@ -22,14 +22,12 @@
         "Ljava/lang/Object;",
         "T2:",
         "Ljava/lang/Object;",
-        "T3:",
-        "Ljava/lang/Object;",
         "R:",
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lrx/functions/Func3<",
-        "TT1;TT2;TT3;TR;>;"
+        "Lrx/functions/Func2<",
+        "TT1;TT2;TR;>;"
     }
 .end annotation
 
@@ -61,7 +59,7 @@
 
 
 # virtual methods
-.method public final call(Lkotlin/Pair;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;Lcom/discord/models/domain/ModelExperiment;)Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model;
+.method public final call(Lkotlin/Pair;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;)Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model;
     .locals 4
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -76,7 +74,6 @@
             "Lcom/discord/models/domain/ModelGuild;",
             ">;>;",
             "Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;",
-            "Lcom/discord/models/domain/ModelExperiment;",
             ")",
             "Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model;"
         }
@@ -96,85 +93,65 @@
 
     instance-of v1, v0, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loading;
 
-    if-nez v1, :cond_b
+    if-nez v1, :cond_a
 
     instance-of v1, p2, Lcom/discord/stores/StoreSubscriptions$SubscriptionsState$Loading;
 
     if-eqz v1, :cond_0
 
-    goto/16 :goto_5
+    goto/16 :goto_4
 
     :cond_0
     instance-of v1, v0, Lcom/discord/stores/StorePremiumGuildSubscription$State$Failure;
 
-    if-nez v1, :cond_a
+    if-nez v1, :cond_9
 
     instance-of v1, p2, Lcom/discord/stores/StoreSubscriptions$SubscriptionsState$Failure;
 
     if-eqz v1, :cond_1
 
-    goto/16 :goto_4
+    goto/16 :goto_3
 
     :cond_1
     instance-of v1, v0, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;
 
-    if-eqz v1, :cond_9
+    if-eqz v1, :cond_8
 
     instance-of v1, p2, Lcom/discord/stores/StoreSubscriptions$SubscriptionsState$Loaded;
 
-    if-eqz v1, :cond_9
+    if-eqz v1, :cond_8
 
-    check-cast v0, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;
+    sget-object v1, Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils;->INSTANCE:Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils;
 
-    invoke-virtual {v0}, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;->getPremiumGuildSubscriptionSlots()Ljava/util/List;
+    check-cast p2, Lcom/discord/stores/StoreSubscriptions$SubscriptionsState$Loaded;
 
-    move-result-object v1
+    invoke-virtual {p2}, Lcom/discord/stores/StoreSubscriptions$SubscriptionsState$Loaded;->getSubscriptions()Ljava/util/List;
 
-    check-cast v1, Ljava/util/Collection;
+    move-result-object v2
 
-    invoke-interface {v1}, Ljava/util/Collection;->isEmpty()Z
+    invoke-virtual {v1, v2}, Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils;->calculateTotalBoostCount(Ljava/util/List;)I
 
     move-result v1
 
-    const/4 v2, 0x1
+    if-lez v1, :cond_2
 
-    xor-int/2addr v1, v2
+    new-instance v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Loaded;
 
-    const/4 v3, 0x0
+    sget-object v2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model;->Companion:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion;
 
-    if-eqz v1, :cond_3
+    check-cast v0, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;
 
-    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;
+    invoke-static {v2, v0, p2, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion;->access$createBoostItems(Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion;Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState$Loaded;Ljava/util/Map;)Ljava/util/List;
 
     move-result-object p1
 
-    invoke-direct {p2, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Loaded;-><init>(Ljava/util/List;)V
+    invoke-direct {v1, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Loaded;-><init>(Ljava/util/List;)V
 
-    check-cast p2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model;
+    check-cast v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model;
 
-    return-object p2
-
-    :cond_3
-    check-cast p2, Lcom/discord/stores/StoreSubscriptions$SubscriptionsState$Loaded;
+    return-object v1
 
+    :cond_2
     invoke-virtual {p2}, Lcom/discord/stores/StoreSubscriptions$SubscriptionsState$Loaded;->getSubscriptions()Ljava/util/List;
 
     move-result-object p1
@@ -183,7 +160,11 @@
 
     instance-of p2, p1, Ljava/util/Collection;
 
-    if-eqz p2, :cond_4
+    const/4 v0, 0x1
+
+    const/4 v1, 0x0
+
+    if-eqz p2, :cond_3
 
     move-object p2, p1
 
@@ -193,19 +174,19 @@
 
     move-result p2
 
-    if-nez p2, :cond_8
+    if-nez p2, :cond_7
 
-    :cond_4
+    :cond_3
     invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
     move-result-object p1
 
-    :cond_5
+    :cond_4
     invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
 
     move-result p2
 
-    if-eqz p2, :cond_8
+    if-eqz p2, :cond_7
 
     invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
@@ -215,49 +196,57 @@
 
     invoke-virtual {p2}, Lcom/discord/models/domain/ModelSubscription;->getPlanType()Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
-    move-result-object p3
+    move-result-object v2
 
-    sget-object v0, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_MONTH_TIER_1:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+    sget-object v3, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_MONTH_TIER_1:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
-    if-eq p3, v0, :cond_7
+    if-eq v2, v3, :cond_6
 
     invoke-virtual {p2}, Lcom/discord/models/domain/ModelSubscription;->getPlanType()Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
     move-result-object p2
 
-    sget-object p3, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_YEAR_TIER_1:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+    sget-object v2, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_YEAR_TIER_1:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
-    if-ne p2, p3, :cond_6
+    if-ne p2, v2, :cond_5
+
+    goto :goto_0
+
+    :cond_5
+    const/4 p2, 0x0
 
     goto :goto_1
 
     :cond_6
-    const/4 p2, 0x0
+    :goto_0
+    const/4 p2, 0x1
+
+    :goto_1
+    if-eqz p2, :cond_4
 
     goto :goto_2
 
     :cond_7
-    :goto_1
-    const/4 p2, 0x1
+    const/4 v0, 0x0
 
     :goto_2
-    if-eqz p2, :cond_5
+    new-instance p1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$LoadedNotPremiumTier2;
 
-    goto :goto_3
+    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
 
     :cond_8
-    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
+    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_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;
@@ -266,14 +255,6 @@
 
     :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;
@@ -281,16 +262,14 @@
     return-object p1
 .end method
 
-.method public final bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+.method public final bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
     check-cast p1, Lkotlin/Pair;
 
     check-cast p2, Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;
 
-    check-cast p3, Lcom/discord/models/domain/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;
+    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion$get$2;->call(Lkotlin/Pair;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;)Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion.smali
index 8cbff4d730..e56b155d4d 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,380 +31,183 @@
     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;Ljava/util/Map;Z)Ljava/util/List;
+.method public static final synthetic access$createBoostItems(Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion;Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState$Loaded;Ljava/util/Map;)Ljava/util/List;
     .locals 0
 
-    invoke-direct {p0, p1, p2, p3}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion;->createBoostItems(Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;Ljava/util/Map;Z)Ljava/util/List;
+    invoke-direct {p0, p1, p2, p3}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion;->createBoostItems(Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState$Loaded;Ljava/util/Map;)Ljava/util/List;
 
     move-result-object p0
 
     return-object p0
 .end method
 
-.method private final createBoostItems(Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;Ljava/util/Map;Z)Ljava/util/List;
-    .locals 14
+.method private final createBoostItems(Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState$Loaded;Ljava/util/Map;)Ljava/util/List;
+    .locals 5
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
             "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;->getPremiumGuildSubscriptionSlots()Ljava/util/List;
+    invoke-virtual {p1}, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;->getCooldown()Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;
 
     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
 
-    check-cast v0, Ljava/lang/Iterable;
+    sget-object v2, Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils;->INSTANCE:Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils;
 
-    new-instance v2, Ljava/util/ArrayList;
+    invoke-virtual {v2, p2}, Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils;->calculateTotalBoostCount(Ljava/util/List;)I
 
-    invoke-direct {v2}, Ljava/util/ArrayList;-><init>()V
+    move-result p2
 
-    check-cast v2, Ljava/util/Collection;
+    if-eqz v0, :cond_0
 
-    invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;->getRemaining()I
 
-    move-result-object v3
-
-    :cond_0
-    :goto_0
-    invoke-interface {v3}, Ljava/util/Iterator;->hasNext()Z
-
-    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
-    if-eqz v5, :cond_0
-
-    invoke-interface {v2, v4}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+    move-result p2
 
     goto :goto_0
 
-    :cond_2
-    check-cast v2, Ljava/util/List;
+    :cond_0
+    move-object v2, p1
 
-    invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
+    check-cast v2, Ljava/util/Collection;
+
+    invoke-interface {v2}, Ljava/util/Collection;->size()I
+
+    move-result v2
+
+    sub-int/2addr p2, v2
+
+    :goto_0
+    if-nez v0, :cond_1
+
+    if-lez p2, :cond_3
+
+    :cond_1
+    sget-object v2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->Companion:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem$Companion;
+
+    if-eqz v0, :cond_2
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;->getExpiresAtTimestamp()J
 
     move-result-wide v3
 
-    move-object v7, v2
+    invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    check-cast v7, Ljava/lang/Iterable;
+    move-result-object v0
 
-    new-instance v8, Ljava/util/ArrayList;
+    goto :goto_1
 
-    invoke-direct {v8}, Ljava/util/ArrayList;-><init>()V
+    :cond_2
+    const/4 v0, 0x0
 
-    check-cast v8, Ljava/util/Collection;
+    :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;
 
-    invoke-interface {v7}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+    move-result-object v0
 
-    move-result-object v9
+    invoke-virtual {v1, v0}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
     :cond_3
-    :goto_1
-    invoke-interface {v9}, Ljava/util/Iterator;->hasNext()Z
+    if-lez p2, :cond_4
 
-    move-result v10
+    sget-object p2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->Companion:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem$Companion;
 
-    if-eqz v10, :cond_5
+    const/4 v0, 0x1
 
-    invoke-interface {v9}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+    invoke-virtual {p2, v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem$Companion;->createAvailableBoostItem(Z)Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;
 
-    move-result-object v10
+    move-result-object p2
 
-    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
+    invoke-virtual {v1, p2}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
     goto :goto_2
 
     :cond_4
-    const/4 v11, 0x0
+    invoke-interface {p1}, Ljava/util/List;->isEmpty()Z
 
-    :goto_2
-    if-eqz v11, :cond_3
+    move-result p2
 
-    invoke-interface {v8, v10}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+    if-eqz p2, :cond_5
 
-    goto :goto_1
+    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
 
     :cond_5
-    check-cast v8, Ljava/util/List;
+    :goto_2
+    check-cast p1, Ljava/lang/Iterable;
 
-    check-cast v2, Ljava/util/Collection;
+    invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
-    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
+    move-result-object p1
 
     :goto_3
-    invoke-interface {v7}, Ljava/util/Iterator;->hasNext()Z
+    invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v9
+    move-result p2
 
-    if-eqz v9, :cond_6
+    if-eqz p2, :cond_6
 
-    invoke-interface {v7}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+    invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object v9
+    move-result-object p2
 
-    check-cast v9, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;
+    check-cast p2, Lcom/discord/models/domain/ModelPremiumGuildSubscription;
 
-    invoke-virtual {v9}, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;->getCooldownExpiresAtTimestamp()J
+    sget-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->Companion:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem$Companion;
 
-    move-result-wide v9
+    invoke-virtual {p2}, Lcom/discord/models/domain/ModelPremiumGuildSubscription;->getGuildId()J
 
-    invoke-static {v9, v10}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    move-result-wide v2
 
-    move-result-object v9
+    invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    invoke-interface {v3, v9}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+    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
 
     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
@@ -413,7 +216,7 @@
 
 # virtual methods
 .method public final get()Lrx/Observable;
-    .locals 6
+    .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
@@ -437,59 +240,45 @@
 
     move-result-object v0
 
-    sget-object v2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion$get$1;->INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion$get$1;
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion$get$1;->INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion$get$1;
 
-    check-cast v2, Lrx/functions/b;
+    check-cast v1, Lrx/functions/b;
 
-    invoke-virtual {v0, v2}, Lrx/Observable;->g(Lrx/functions/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->g(Lrx/functions/b;)Lrx/Observable;
 
     move-result-object v0
 
-    const-string v2, "StoreStream\n            \u2026      }\n                }"
+    const-string v1, "StoreStream\n            \u2026      }\n                }"
 
-    invoke-static {v0, v2}, 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-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
-
-    move-result-object v2
-
-    invoke-virtual {v0, v2}, Lrx/Observable;->a(Lrx/Observable$b;)Lrx/Observable;
-
-    move-result-object v0
-
-    sget-object v2, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
-
-    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;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v1
 
-    sget-object v3, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion$get$2;->INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion$get$2;
+    invoke-virtual {v0, v1}, Lrx/Observable;->a(Lrx/Observable$b;)Lrx/Observable;
 
-    check-cast v3, Lrx/functions/Func3;
+    move-result-object v0
 
-    invoke-static {v0, v2, v1, v3}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func3;)Lrx/Observable;
+    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/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;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$LoadedNoPremiumGuildSubscriptions.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$LoadedNotPremiumTier2.smali
similarity index 77%
rename from com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$LoadedNoPremiumGuildSubscriptions.smali
rename to com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$LoadedNotPremiumTier2.smali
index e0351b4a95..a2e8a7c923 100644
--- a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$LoadedNoPremiumGuildSubscriptions.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$LoadedNotPremiumTier2.smali
@@ -1,4 +1,4 @@
-.class public final Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$LoadedNoPremiumGuildSubscriptions;
+.class public final Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$LoadedNotPremiumTier2;
 .super Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model;
 .source "WidgetSettingsPremiumGuildSubscription.kt"
 
@@ -10,7 +10,7 @@
 
 .annotation system Ldalvik/annotation/InnerClass;
     accessFlags = 0x19
-    name = "LoadedNoPremiumGuildSubscriptions"
+    name = "LoadedNotPremiumTier2"
 .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$LoadedNoPremiumGuildSubscriptions;->isNitroClassic:Z
+    iput-boolean p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$LoadedNotPremiumTier2;->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$LoadedNoPremiumGuildSubscriptions;->isNitroClassic:Z
+    iget-boolean v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$LoadedNotPremiumTier2;->isNitroClassic:Z
 
     return v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model.smali
index 381537a06b..7810ddb8e3 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$LoadedNoPremiumGuildSubscriptions;,
+        Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$LoadedNotPremiumTier2;,
         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 8ef80a046f..d3d61078dc 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 54e69379ab..0a353147b4 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 c07c418fa9..f2723bf5b7 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;->vj:Lcom/discord/app/e;
+    sget-object v0, Lcom/discord/app/e;->vk:Lcom/discord/app/e;
 
-    sget-wide v0, Lcom/discord/app/e;->vi:J
+    sget-wide v0, Lcom/discord/app/e;->vj: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 2d20c95d5b..4ea9c4cb1e 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 a60c4e35c8..1ceda16bb3 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, 0x7f0a06ad
+    const v0, 0x7f0a0694
 
     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, 0x7f0a06ac
+    const v0, 0x7f0a0693
 
     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, 0x7f0a06ab
+    const v0, 0x7f0a0692
 
     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, 0x7f0a06a6
+    const v0, 0x7f0a068d
 
     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, 0x7f0a06a7
+    const v0, 0x7f0a068e
 
     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, 0x7f0a06a8
+    const v0, 0x7f0a068f
 
     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$LoadedNoPremiumGuildSubscriptions;
+    instance-of v0, p1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$LoadedNotPremiumTier2;
 
     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$LoadedNoPremiumGuildSubscriptions;
+    check-cast p1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$LoadedNotPremiumTier2;
 
-    invoke-virtual {p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$LoadedNoPremiumGuildSubscriptions;->isNitroClassic()Z
+    invoke-virtual {p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$LoadedNotPremiumTier2;->isNitroClassic()Z
 
     move-result p1
 
     if-eqz p1, :cond_4
 
-    const p1, 0x7f120e56
+    const p1, 0x7f120e22
 
     goto :goto_0
 
     :cond_4
-    const p1, 0x7f120e55
+    const p1, 0x7f120e21
 
     :goto_0
     new-array v0, v2, [Ljava/lang/Object;
 
-    sget-object v2, Lcom/discord/app/e;->vj:Lcom/discord/app/e;
+    sget-object v2, Lcom/discord/app/e;->vk:Lcom/discord/app/e;
 
-    sget-wide v2, Lcom/discord/app/e;->vi:J
+    sget-wide v2, Lcom/discord/app/e;->vj: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, 0x7f0d01a5
+    const v0, 0x7f0d01a3
 
     return v0
 .end method
 
 .method public final onActivityResult(IILandroid/content/Intent;)V
-    .locals 7
+    .locals 2
 
     invoke-super {p0, p1, p2, p3}, Lcom/discord/app/AppFragment;->onActivityResult(IILandroid/content/Intent;)V
 
@@ -617,25 +617,19 @@
 
     invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
 
-    move-result-wide v2
+    move-result-wide p1
 
-    sget-object v0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->Companion:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$Companion;
+    sget-object p3, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->Companion:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$Companion;
 
     invoke-virtual {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;->requireContext()Landroid/content/Context;
 
-    move-result-object v1
+    move-result-object v0
 
-    const-string p1, "requireContext()"
+    const-string v1, "requireContext()"
 
-    invoke-static {v1, p1}, 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
 
-    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
+    invoke-virtual {p3, v0, p1, p2}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$Companion;->create(Landroid/content/Context;J)V
 
     goto :goto_1
 
@@ -670,11 +664,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, 0x7f12134d
+    const v0, 0x7f1212c1
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;->setActionBarSubtitle(I)Lkotlin/Unit;
 
-    const v0, 0x7f120eca
+    const v0, 0x7f120e56
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -714,9 +708,9 @@
 
     new-array p1, p1, [Ljava/lang/Object;
 
-    sget-object v3, Lcom/discord/app/e;->vj:Lcom/discord/app/e;
+    sget-object v3, Lcom/discord/app/e;->vk:Lcom/discord/app/e;
 
-    sget-wide v3, Lcom/discord/app/e;->vi:J
+    sget-wide v3, Lcom/discord/app/e;->vj:J
 
     invoke-static {v3, v4}, Lcom/discord/app/e;->j(J)Ljava/lang/String;
 
@@ -724,7 +718,7 @@
 
     aput-object v3, p1, v1
 
-    const v1, 0x7f120ec7
+    const v1, 0x7f120e53
 
     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 2dd8dd8ce3..5c9fa2bc5c 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, 0x7f0d00aa
+    const v0, 0x7f0d00a8
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
-    const p1, 0x7f0a00d1
+    const p1, 0x7f0a00d0
 
     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 63b8ab28e9..91227f5c33 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, 0x7f0d00ac
+    const v0, 0x7f0d00aa
 
     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, 0x7f10009f
+    const v6, 0x7f100096
 
     const/4 v7, 0x1
 
@@ -771,17 +771,17 @@
     goto :goto_1
 
     :cond_2
-    const v1, 0x7f080215
+    const v1, 0x7f08020a
 
     goto :goto_1
 
     :cond_3
-    const v1, 0x7f080214
+    const v1, 0x7f080209
 
     goto :goto_1
 
     :cond_4
-    const v1, 0x7f080213
+    const v1, 0x7f080208
 
     goto :goto_1
 
@@ -820,22 +820,22 @@
     goto :goto_2
 
     :cond_6
-    const v1, 0x7f120ed3
+    const v1, 0x7f120e5a
 
     goto :goto_2
 
     :cond_7
-    const v1, 0x7f120ed2
+    const v1, 0x7f120e59
 
     goto :goto_2
 
     :cond_8
-    const v1, 0x7f120ed1
+    const v1, 0x7f120e58
 
     goto :goto_2
 
     :cond_9
-    const v1, 0x7f120e5c
+    const v1, 0x7f120e24
 
     :goto_2
     invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -875,11 +875,7 @@
     move-result v4
 
     :cond_a
-    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
+    invoke-virtual {v0, v1, v4}, Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils;->calculatePercentToNextTier(II)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 afe69499fd..5bb3505bbf 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, 0x7f0d00ab
+    const v0, 0x7f0d00a9
 
     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, 0x7f0800c1
+    const v4, 0x7f0800c0
 
     invoke-virtual {p1, v4}, Landroid/view/View;->setBackgroundResource(I)V
 
@@ -221,7 +221,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f10009a
+    const v0, 0x7f100095
 
     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, 0x7f120e92
+    const v4, 0x7f120e45
 
     new-array v1, v1, [Ljava/lang/Object;
 
@@ -296,7 +296,7 @@
 
     move-result-object v4
 
-    const v5, 0x7f0402c0
+    const v5, 0x7f0402bf
 
     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, 0x7f120e4b
+    const v0, 0x7f120e0f
 
     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 248f321876..46d85e6432 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 11
+    .locals 10
 
-    new-instance v10, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;
+    new-instance v9, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;
 
     const/4 v1, 0x0
 
@@ -46,27 +46,25 @@
 
     const/4 v4, 0x0
 
-    const/4 v6, 0x0
+    const/4 v6, 0x1
 
-    const/4 v7, 0x1
+    const/16 v7, 0xf
 
-    const/16 v8, 0xf
+    const/4 v8, 0x0
 
-    const/4 v9, 0x0
-
-    move-object v0, v10
+    move-object v0, v9
 
     move v5, p1
 
-    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
+    invoke-direct/range {v0 .. v8}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;-><init>(Ljava/lang/Long;Ljava/lang/Integer;Lcom/discord/models/domain/ModelPremiumGuildSubscription;Lcom/discord/models/domain/ModelGuild;ZIILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    return-object v10
+    return-object v9
 .end method
 
 .method public final createBoostInfoItem(Ljava/lang/Long;I)Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;
-    .locals 11
+    .locals 10
 
-    new-instance v10, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;
+    new-instance v9, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;
 
     invoke-static {p2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -80,23 +78,21 @@
 
     const/4 v6, 0x0
 
-    const/4 v7, 0x0
+    const/16 v7, 0x1c
 
-    const/16 v8, 0x1c
+    const/4 v8, 0x0
 
-    const/4 v9, 0x0
-
-    move-object v0, v10
+    move-object v0, v9
 
     move-object v1, p1
 
-    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
+    invoke-direct/range {v0 .. v8}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;-><init>(Ljava/lang/Long;Ljava/lang/Integer;Lcom/discord/models/domain/ModelPremiumGuildSubscription;Lcom/discord/models/domain/ModelGuild;ZIILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    return-object v10
+    return-object v9
 .end method
 
-.method public final createBoostedGuildItem(Lcom/discord/models/domain/ModelPremiumGuildSubscription;Lcom/discord/models/domain/ModelGuild;Z)Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;
-    .locals 11
+.method public final createBoostedGuildItem(Lcom/discord/models/domain/ModelPremiumGuildSubscription;Lcom/discord/models/domain/ModelGuild;)Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;
+    .locals 10
 
     const-string v0, "premiumGuildSubscription"
 
@@ -110,11 +106,11 @@
 
     const/4 v6, 0x0
 
-    const/4 v8, 0x2
+    const/4 v7, 0x2
 
-    const/16 v9, 0x13
+    const/16 v8, 0x13
 
-    const/4 v10, 0x0
+    const/4 v9, 0x0
 
     move-object v1, v0
 
@@ -122,9 +118,7 @@
 
     move-object v5, p2
 
-    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
+    invoke-direct/range {v1 .. v9}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;-><init>(Ljava/lang/Long;Ljava/lang/Integer;Lcom/discord/models/domain/ModelPremiumGuildSubscription;Lcom/discord/models/domain/ModelGuild;ZIILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem.smali
index dfaeb971b9..57c1bfb11f 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,8 +46,6 @@
 
 .field private final typeInt:I
 
-.field private final useNewPremiumTierValues:Z
-
 
 # direct methods
 .method static constructor <clinit>()V
@@ -64,7 +62,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;ZZI)V
+.method public constructor <init>(Ljava/lang/Long;Ljava/lang/Integer;Lcom/discord/models/domain/ModelPremiumGuildSubscription;Lcom/discord/models/domain/ModelGuild;ZI)V
     .locals 0
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
@@ -79,17 +77,15 @@
 
     iput-boolean p5, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->enabled:Z
 
-    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
+    iput p6, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->typeInt:I
 
     return-void
 .end method
 
-.method public synthetic constructor <init>(Ljava/lang/Long;Ljava/lang/Integer;Lcom/discord/models/domain/ModelPremiumGuildSubscription;Lcom/discord/models/domain/ModelGuild;ZZIILkotlin/jvm/internal/DefaultConstructorMarker;)V
-    .locals 10
+.method public synthetic constructor <init>(Ljava/lang/Long;Ljava/lang/Integer;Lcom/discord/models/domain/ModelPremiumGuildSubscription;Lcom/discord/models/domain/ModelGuild;ZIILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    .locals 9
 
-    and-int/lit8 v0, p8, 0x1
+    and-int/lit8 v0, p7, 0x1
 
     const/4 v1, 0x0
 
@@ -103,7 +99,7 @@
     move-object v3, p1
 
     :goto_0
-    and-int/lit8 v0, p8, 0x2
+    and-int/lit8 v0, p7, 0x2
 
     if-eqz v0, :cond_1
 
@@ -115,7 +111,7 @@
     move-object v4, p2
 
     :goto_1
-    and-int/lit8 v0, p8, 0x4
+    and-int/lit8 v0, p7, 0x4
 
     if-eqz v0, :cond_2
 
@@ -127,7 +123,7 @@
     move-object v5, p3
 
     :goto_2
-    and-int/lit8 v0, p8, 0x8
+    and-int/lit8 v0, p7, 0x8
 
     if-eqz v0, :cond_3
 
@@ -139,7 +135,7 @@
     move-object v6, p4
 
     :goto_3
-    and-int/lit8 v0, p8, 0x10
+    and-int/lit8 v0, p7, 0x10
 
     if-eqz v0, :cond_4
 
@@ -155,35 +151,33 @@
     :goto_4
     move-object v2, p0
 
-    move/from16 v8, p6
+    move v8, p6
 
-    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
+    invoke-direct/range {v2 .. v8}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;-><init>(Ljava/lang/Long;Ljava/lang/Integer;Lcom/discord/models/domain/ModelPremiumGuildSubscription;Lcom/discord/models/domain/ModelGuild;ZI)V
 
     return-void
 .end method
 
-.method public static synthetic copy$default(Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;Ljava/lang/Long;Ljava/lang/Integer;Lcom/discord/models/domain/ModelPremiumGuildSubscription;Lcom/discord/models/domain/ModelGuild;ZZIILjava/lang/Object;)Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;
-    .locals 5
+.method public static synthetic copy$default(Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;Ljava/lang/Long;Ljava/lang/Integer;Lcom/discord/models/domain/ModelPremiumGuildSubscription;Lcom/discord/models/domain/ModelGuild;ZIILjava/lang/Object;)Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;
+    .locals 4
 
-    and-int/lit8 p9, p8, 0x1
+    and-int/lit8 p8, p7, 0x1
 
-    if-eqz p9, :cond_0
+    if-eqz p8, :cond_0
 
     iget-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->cooldownEndsAt:Ljava/lang/Long;
 
     :cond_0
-    and-int/lit8 p9, p8, 0x2
+    and-int/lit8 p8, p7, 0x2
 
-    if-eqz p9, :cond_1
+    if-eqz p8, :cond_1
 
     iget-object p2, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->boostsRemaining:Ljava/lang/Integer;
 
     :cond_1
-    move-object p9, p2
+    move-object p8, p2
 
-    and-int/lit8 p2, p8, 0x4
+    and-int/lit8 p2, p7, 0x4
 
     if-eqz p2, :cond_2
 
@@ -192,7 +186,7 @@
     :cond_2
     move-object v0, p3
 
-    and-int/lit8 p2, p8, 0x8
+    and-int/lit8 p2, p7, 0x8
 
     if-eqz p2, :cond_3
 
@@ -201,7 +195,7 @@
     :cond_3
     move-object v1, p4
 
-    and-int/lit8 p2, p8, 0x10
+    and-int/lit8 p2, p7, 0x10
 
     if-eqz p2, :cond_4
 
@@ -210,29 +204,20 @@
     :cond_4
     move v2, p5
 
-    and-int/lit8 p2, p8, 0x20
+    and-int/lit8 p2, p7, 0x20
 
     if-eqz p2, :cond_5
 
-    iget-boolean p6, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->useNewPremiumTierValues:Z
+    iget p6, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->typeInt:I
 
     :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, p9
+    move-object p4, p8
 
     move-object p5, v0
 
@@ -242,9 +227,7 @@
 
     move p8, v3
 
-    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;
+    invoke-virtual/range {p2 .. p8}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->copy(Ljava/lang/Long;Ljava/lang/Integer;Lcom/discord/models/domain/ModelPremiumGuildSubscription;Lcom/discord/models/domain/ModelGuild;ZI)Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;
 
     move-result-object p0
 
@@ -293,15 +276,7 @@
     return v0
 .end method
 
-.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
+.method public final component6()I
     .locals 1
 
     iget v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->typeInt:I
@@ -309,12 +284,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;ZZI)Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;
-    .locals 9
+.method public final copy(Ljava/lang/Long;Ljava/lang/Integer;Lcom/discord/models/domain/ModelPremiumGuildSubscription;Lcom/discord/models/domain/ModelGuild;ZI)Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;
+    .locals 8
 
-    new-instance v8, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;
+    new-instance v7, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;
 
-    move-object v0, v8
+    move-object v0, v7
 
     move-object v1, p1
 
@@ -328,11 +303,9 @@
 
     move v6, p6
 
-    move/from16 v7, p7
+    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
 
-    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
+    return-object v7
 .end method
 
 .method public final equals(Ljava/lang/Object;)Z
@@ -340,13 +313,13 @@
 
     const/4 v0, 0x1
 
-    if-eq p0, p1, :cond_4
+    if-eq p0, p1, :cond_3
 
     instance-of v1, p1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;
 
     const/4 v2, 0x0
 
-    if-eqz v1, :cond_3
+    if-eqz v1, :cond_2
 
     check-cast p1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;
 
@@ -358,7 +331,7 @@
 
     move-result v1
 
-    if-eqz v1, :cond_3
+    if-eqz v1, :cond_2
 
     iget-object v1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->boostsRemaining:Ljava/lang/Integer;
 
@@ -368,7 +341,7 @@
 
     move-result v1
 
-    if-eqz v1, :cond_3
+    if-eqz v1, :cond_2
 
     iget-object v1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->premiumGuildSubscription:Lcom/discord/models/domain/ModelPremiumGuildSubscription;
 
@@ -378,7 +351,7 @@
 
     move-result v1
 
-    if-eqz v1, :cond_3
+    if-eqz v1, :cond_2
 
     iget-object v1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->guild:Lcom/discord/models/domain/ModelGuild;
 
@@ -388,7 +361,7 @@
 
     move-result v1
 
-    if-eqz v1, :cond_3
+    if-eqz v1, :cond_2
 
     iget-boolean v1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->enabled:Z
 
@@ -404,47 +377,31 @@
     const/4 v1, 0x0
 
     :goto_0
-    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
+    if-eqz v1, :cond_2
 
     iget v1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->typeInt:I
 
     iget p1, p1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->typeInt:I
 
-    if-ne v1, p1, :cond_2
+    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
-    const/4 p1, 0x0
-
-    :goto_2
-    if-eqz p1, :cond_3
-
-    goto :goto_3
-
-    :cond_3
     return v2
 
-    :cond_4
-    :goto_3
+    :cond_3
+    :goto_2
     return v0
 .end method
 
@@ -545,14 +502,6 @@
     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
 
@@ -625,8 +574,6 @@
 
     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
@@ -636,17 +583,6 @@
 
     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
@@ -703,14 +639,6 @@
 
     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 2fcc8a72b6..be8a85e3ff 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 c24c6c8453..1c9c1f901c 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 0964398dd9..dbda9b5eed 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 2686191fca..d641b14678 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, 0x7f0a07a1
+    const v0, 0x7f0a0779
 
     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, 0x7f0a079d
+    const v0, 0x7f0a0775
 
     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, 0x7f0a079e
+    const v0, 0x7f0a0776
 
     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, 0x7f0a079f
+    const v0, 0x7f0a0777
 
     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, 0x7f0a02cc
+    const v0, 0x7f0a02cb
 
     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, 0x7f0a07a0
+    const v0, 0x7f0a0778
 
     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;->vm:Lcom/discord/app/AppLog;
+    sget-object v5, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
 
     new-instance p1, Ljava/lang/StringBuilder;
 
@@ -385,7 +385,7 @@
 
     move-result-object v4
 
-    const v5, 0x7f120f28
+    const v5, 0x7f120ea4
 
     const/4 v6, 0x1
 
@@ -423,7 +423,7 @@
 
     if-ne v4, v8, :cond_8
 
-    const v4, 0x7f120f25
+    const v4, 0x7f120e9e
 
     new-array v8, v7, [Ljava/lang/Object;
 
@@ -472,7 +472,7 @@
 
     if-ne v4, v8, :cond_9
 
-    const v4, 0x7f120f26
+    const v4, 0x7f120ea0
 
     new-array v8, v7, [Ljava/lang/Object;
 
@@ -521,7 +521,7 @@
 
     if-ne v4, v8, :cond_a
 
-    const v4, 0x7f120f24
+    const v4, 0x7f120e9c
 
     new-array v8, v7, [Ljava/lang/Object;
 
@@ -558,7 +558,7 @@
     goto :goto_3
 
     :cond_a
-    const v2, 0x7f120f23
+    const v2, 0x7f120e9a
 
     new-array v4, v6, [Ljava/lang/Object;
 
@@ -828,7 +828,7 @@
     goto :goto_0
 
     :pswitch_0
-    const p1, 0x7f120f1c
+    const p1, 0x7f120e93
 
     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, 0x7f120f1d
+    const p1, 0x7f120e94
 
     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, 0x7f0d01c8
+    const v0, 0x7f0d01c0
 
     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 eb3057a4af..e859f98601 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 eaf27190a3..5f58d4d5a1 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, 0x7f0d0090
+    const v0, 0x7f0d008e
 
     const/4 v1, 0x0
 
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 5d755e7649..e699dd5890 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,45 +74,63 @@
 
     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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object p1
 .end method
 
 .method public final invoke(Landroid/view/View;ILcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;Z)V
-    .locals 2
+    .locals 9
 
     const-string p2, "view"
 
     invoke-static {p1, p2}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string p2, "data"
+    const-string p1, "data"
 
-    invoke-static {p3, p2}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p3, p1}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    instance-of p2, p3, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemUser;
+    instance-of p1, p3, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemUser;
 
-    if-eqz p2, :cond_0
+    if-eqz p1, :cond_0
 
     if-eqz p4, :cond_0
 
-    invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
+    sget-object v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->Companion:Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;
+
+    move-object p1, p3
+
+    check-cast p1, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemUser;
+
+    invoke-virtual {p1}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemUser;->getUser()Lcom/discord/models/domain/ModelUser;
 
     move-result-object p1
 
-    move-object p2, p3
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getId()J
 
-    check-cast p2, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemUser;
+    move-result-wide v1
 
-    invoke-virtual {p2}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemUser;->getUser()Lcom/discord/models/domain/ModelUser;
+    const/4 v3, 0x0
 
-    move-result-object p2
+    iget-object p1, p0, Lcom/discord/widgets/share/WidgetIncomingShare$configureUi$$inlined$apply$lambda$2;->this$0:Lcom/discord/widgets/share/WidgetIncomingShare;
 
-    invoke-virtual {p2}, Lcom/discord/models/domain/ModelUser;->getId()J
+    invoke-virtual {p1}, Lcom/discord/widgets/share/WidgetIncomingShare;->requireFragmentManager()Landroidx/fragment/app/FragmentManager;
 
-    move-result-wide v0
+    move-result-object v4
 
-    invoke-static {p1, v0, v1}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->launch(Landroid/content/Context;J)V
+    const-string p1, "requireFragmentManager()"
+
+    invoke-static {v4, p1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v5, 0x0
+
+    const/4 v6, 0x0
+
+    const/16 v7, 0x1a
+
+    const/4 v8, 0x0
+
+    invoke-static/range {v0 .. v8}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;->show$default(Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;JLjava/lang/Long;Landroidx/fragment/app/FragmentManager;Ljava/lang/Long;Ljava/lang/Boolean;ILjava/lang/Object;)V
 
     :cond_0
     instance-of p1, p3, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemHeader;
diff --git a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$configureUi$2.smali b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$configureUi$2.smali
index 6122fc86c4..f11b7d2434 100644
--- a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$configureUi$2.smali
+++ b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$configureUi$2.smali
@@ -64,7 +64,7 @@
 
     move-result p1
 
-    const v0, 0x7f0a0474
+    const v0, 0x7f0a046f
 
     if-eq p1, v0, :cond_0
 
diff --git a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$configureUi$5.smali b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$configureUi$5.smali
index 43cf9a5011..340263da62 100644
--- a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$configureUi$5.smali
+++ b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$configureUi$5.smali
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/share/WidgetIncomingShare$configureUi$5;->invoke(Landroid/net/Uri;)V
 
-    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$2.smali b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$2.smali
index 30c2bd8480..f9ecf88887 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
@@ -275,7 +275,7 @@
     if-nez p1, :cond_6
 
     :cond_5
-    invoke-static {}, Lrx/Observable;->IS()Lrx/Observable;
+    invoke-static {}, Lrx/Observable;->IQ()Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$3$2.smali b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$3$2.smali
index 15ec7fa7e0..8a4e5977fb 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object v0
 .end method
@@ -153,7 +153,7 @@
 
     move-result v8
 
-    sget-object v0, Lkotlin/jvm/internal/h;->bhJ:Lkotlin/jvm/internal/h;
+    sget-object v0, Lkotlin/jvm/internal/h;->bhE: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 67e941be26..a9fe10b846 100644
--- a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$3.smali
+++ b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$3.smali
@@ -70,7 +70,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/share/WidgetIncomingShare$onSendClicked$3;->invoke(Lkotlin/Pair;)V
 
-    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -157,7 +157,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f10001a
+    const v2, 0x7f100019
 
     new-array v0, v0, [Ljava/lang/Object;
 
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 ee3302dcf3..e89f856cab 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 9252ac5904..5d1b8369a4 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 6c32e218bf..c1ab602280 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     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 4a6b283bb4..d77650a4cc 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
@@ -177,7 +177,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v5
 
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 21fbe99f73..cd3c1abf1a 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 d828318256..69534ba683 100644
--- a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare.smali
+++ b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare.smali
@@ -340,7 +340,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a027a
+    const v0, 0x7f0a0279
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -348,7 +348,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/share/WidgetIncomingShare;->dimmer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a02d1
+    const v0, 0x7f0a02d0
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -356,7 +356,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/share/WidgetIncomingShare;->commentTv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a02d2
+    const v0, 0x7f0a02d1
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -364,7 +364,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/share/WidgetIncomingShare;->previewList$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a02d0
+    const v0, 0x7f0a02cf
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -372,7 +372,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/share/WidgetIncomingShare;->activityActionPreview$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a05c1
+    const v0, 0x7f0a05a8
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -380,7 +380,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/share/WidgetIncomingShare;->scrollView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a05cb
+    const v0, 0x7f0a05b2
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -388,7 +388,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/share/WidgetIncomingShare;->searchFlipper$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a02d3
+    const v0, 0x7f0a02d2
 
     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/share/WidgetIncomingShare;->searchEt$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a02d4
+    const v0, 0x7f0a02d3
 
     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/share/WidgetIncomingShare;->searchResultsRv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0865
+    const v0, 0x7f0a082a
 
     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/share/WidgetIncomingShare;->selectedReceiver$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0866
+    const v0, 0x7f0a082b
 
     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/share/WidgetIncomingShare;->selectedReceiverRemoveIv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kx()Lrx/subjects/BehaviorSubject;
 
     move-result-object v0
 
@@ -440,7 +440,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/share/WidgetIncomingShare;->searchQueryPublisher:Lrx/subjects/BehaviorSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kx()Lrx/subjects/BehaviorSubject;
 
     move-result-object v0
 
@@ -701,7 +701,7 @@
     goto :goto_1
 
     :cond_3
-    const p1, 0x7f1212d5
+    const p1, 0x7f121248
 
     :goto_1
     invoke-virtual {v0, p1}, Landroid/widget/TextView;->setHint(I)V
@@ -1393,7 +1393,7 @@
 
     if-eqz p5, :cond_0
 
-    const v1, 0x7f1203e9
+    const v1, 0x7f1203c4
 
     invoke-static {v7, v1}, Lcom/discord/app/h;->c(Landroid/content/Context;I)V
 
@@ -1679,7 +1679,7 @@
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lrx/Observable;->IV()Lrx/Observable;
+    invoke-virtual {v1}, Lrx/Observable;->IT()Lrx/Observable;
 
     move-result-object v1
 
@@ -1839,7 +1839,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0144
+    const v0, 0x7f0d0142
 
     return v0
 .end method
@@ -1864,7 +1864,7 @@
     return-void
 
     :cond_0
-    const v0, 0x7f121116
+    const v0, 0x7f12108a
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/share/WidgetIncomingShare;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -2085,7 +2085,7 @@
 
     iget-object v1, p0, Lcom/discord/widgets/share/WidgetIncomingShare;->selectedReceiverPublisher:Lrx/subjects/BehaviorSubject;
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v2
 
diff --git a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectate$Companion.smali b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectate$Companion.smali
deleted file mode 100644
index 72a5effa4f..0000000000
--- a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectate$Companion.smali
+++ /dev/null
@@ -1,115 +0,0 @@
-.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
deleted file mode 100644
index b5653d1952..0000000000
--- a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectate$WhenMappings.smali
+++ /dev/null
@@ -1,106 +0,0 @@
-.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
deleted file mode 100644
index 6b6f583186..0000000000
--- a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectate$configureActionBar$1.smali
+++ /dev/null
@@ -1,125 +0,0 @@
-.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
deleted file mode 100644
index c06a38a696..0000000000
--- a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectate$configureUI$1.smali
+++ /dev/null
@@ -1,49 +0,0 @@
-.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
deleted file mode 100644
index f8431c1c34..0000000000
--- a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectate$configureUI$2.smali
+++ /dev/null
@@ -1,49 +0,0 @@
-.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
deleted file mode 100644
index 034a523bae..0000000000
--- a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectate$configureUI$3.smali
+++ /dev/null
@@ -1,49 +0,0 @@
-.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
deleted file mode 100644
index 8869e96bca..0000000000
--- a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectate$configureUI$4.smali
+++ /dev/null
@@ -1,49 +0,0 @@
-.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
deleted file mode 100644
index c87569532a..0000000000
--- a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectate$configureUI$5.smali
+++ /dev/null
@@ -1,97 +0,0 @@
-.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
deleted file mode 100644
index 1b424a6691..0000000000
--- a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectate$initializeSystemUiListeners$1.smali
+++ /dev/null
@@ -1,221 +0,0 @@
-.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
deleted file mode 100644
index 4d0f8f2528..0000000000
--- a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectate$initializeSystemUiListeners$2$1.smali
+++ /dev/null
@@ -1,73 +0,0 @@
-.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
deleted file mode 100644
index a00ab7833e..0000000000
--- a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectate$initializeSystemUiListeners$2.smali
+++ /dev/null
@@ -1,85 +0,0 @@
-.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
deleted file mode 100644
index 02d56a0730..0000000000
--- a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectate$initializeSystemUiListeners$3$1.smali
+++ /dev/null
@@ -1,77 +0,0 @@
-.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
deleted file mode 100644
index cdc8a85cdd..0000000000
--- a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectate$initializeSystemUiListeners$3.smali
+++ /dev/null
@@ -1,51 +0,0 @@
-.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
deleted file mode 100644
index c4cfdd72da..0000000000
--- a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectate$onViewBoundOrOnResume$1.smali
+++ /dev/null
@@ -1,87 +0,0 @@
-.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
deleted file mode 100644
index 9f32e78825..0000000000
--- a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectate$onViewBoundOrOnResume$2.smali
+++ /dev/null
@@ -1,97 +0,0 @@
-.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
deleted file mode 100644
index e0cc11629c..0000000000
--- a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectate$onViewBoundOrOnResume$3.smali
+++ /dev/null
@@ -1,97 +0,0 @@
-.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
deleted file mode 100644
index 04b9fa21d6..0000000000
--- a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectate.smali
+++ /dev/null
@@ -1,1441 +0,0 @@
-.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
deleted file mode 100644
index 294b8685c0..0000000000
--- a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateKt.smali
+++ /dev/null
@@ -1,7 +0,0 @@
-.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
deleted file mode 100644
index e60894d581..0000000000
--- a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateReportProblemDialog$Companion.smali
+++ /dev/null
@@ -1,54 +0,0 @@
-.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
deleted file mode 100644
index 13c8d17f8e..0000000000
--- a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateReportProblemDialog$onResume$$inlined$filterIs$1.smali
+++ /dev/null
@@ -1,82 +0,0 @@
-.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
deleted file mode 100644
index 2c4b504c52..0000000000
--- a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateReportProblemDialog$onResume$$inlined$filterIs$2.smali
+++ /dev/null
@@ -1,84 +0,0 @@
-.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
deleted file mode 100644
index 7f40bf2bde..0000000000
--- a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateReportProblemDialog$onResume$1.smali
+++ /dev/null
@@ -1,93 +0,0 @@
-.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
deleted file mode 100644
index ed331a01fd..0000000000
--- a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateReportProblemDialog$onResume$2.smali
+++ /dev/null
@@ -1,49 +0,0 @@
-.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
deleted file mode 100644
index f8a76d0d0a..0000000000
--- a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateReportProblemDialog$onResume$3.smali
+++ /dev/null
@@ -1,141 +0,0 @@
-.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
deleted file mode 100644
index 07efe2b63f..0000000000
--- a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateReportProblemDialog.smali
+++ /dev/null
@@ -1,801 +0,0 @@
-.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
deleted file mode 100644
index 580065a3a9..0000000000
--- a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateStreamFullDialog$onResume$1.smali
+++ /dev/null
@@ -1,49 +0,0 @@
-.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
deleted file mode 100644
index a4d7afdcd0..0000000000
--- a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateStreamFullDialog.smali
+++ /dev/null
@@ -1,166 +0,0 @@
-.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
deleted file mode 100644
index 198d9157ec..0000000000
--- a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel$Dialog$ReportProblem.smali
+++ /dev/null
@@ -1,42 +0,0 @@
-.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
deleted file mode 100644
index 8c13e07c29..0000000000
--- a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel$Dialog$StreamFeedback.smali
+++ /dev/null
@@ -1,42 +0,0 @@
-.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
deleted file mode 100644
index c6778938cc..0000000000
--- a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel$Dialog$StreamFull.smali
+++ /dev/null
@@ -1,42 +0,0 @@
-.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
deleted file mode 100644
index b4d9e129d7..0000000000
--- a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel$Dialog.smali
+++ /dev/null
@@ -1,40 +0,0 @@
-.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
deleted file mode 100644
index 41649011dd..0000000000
--- a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel$Event$ShowToast.smali
+++ /dev/null
@@ -1,154 +0,0 @@
-.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
deleted file mode 100644
index 152ac2cd2f..0000000000
--- a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel$Event.smali
+++ /dev/null
@@ -1,38 +0,0 @@
-.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
deleted file mode 100644
index dfb577dc6e..0000000000
--- a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel$Problem.smali
+++ /dev/null
@@ -1,179 +0,0 @@
-.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
deleted file mode 100644
index 8ed1b8de55..0000000000
--- a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel$RawData.smali
+++ /dev/null
@@ -1,580 +0,0 @@
-.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
deleted file mode 100644
index 0dff322629..0000000000
--- a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel$State$Finish.smali
+++ /dev/null
@@ -1,42 +0,0 @@
-.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
deleted file mode 100644
index dbe0606a93..0000000000
--- a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel$State$SpectatingActive.smali
+++ /dev/null
@@ -1,766 +0,0 @@
-.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
deleted file mode 100644
index 26e02e682f..0000000000
--- a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel$State$Uninitialized.smali
+++ /dev/null
@@ -1,42 +0,0 @@
-.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
deleted file mode 100644
index 7a15e44cec..0000000000
--- a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel$State.smali
+++ /dev/null
@@ -1,40 +0,0 @@
-.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
deleted file mode 100644
index f123f457e2..0000000000
--- a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel$beginHideChromeTimeout$1.smali
+++ /dev/null
@@ -1,67 +0,0 @@
-.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
deleted file mode 100644
index 98ecedf77e..0000000000
--- a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$1$1.smali
+++ /dev/null
@@ -1,90 +0,0 @@
-.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
deleted file mode 100644
index 132e1a2841..0000000000
--- a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$1$2.smali
+++ /dev/null
@@ -1,90 +0,0 @@
-.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
deleted file mode 100644
index 2f04e711c2..0000000000
--- a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$1$3.smali
+++ /dev/null
@@ -1,94 +0,0 @@
-.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
deleted file mode 100644
index 758622e18c..0000000000
--- a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$1$4.smali
+++ /dev/null
@@ -1,116 +0,0 @@
-.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
deleted file mode 100644
index 6c06236636..0000000000
--- a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$1.smali
+++ /dev/null
@@ -1,241 +0,0 @@
-.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
deleted file mode 100644
index 264b9fa87a..0000000000
--- a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$2.smali
+++ /dev/null
@@ -1,97 +0,0 @@
-.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
deleted file mode 100644
index e256ba37b8..0000000000
--- a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$3.smali
+++ /dev/null
@@ -1,73 +0,0 @@
-.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
deleted file mode 100644
index a0ebe702c4..0000000000
--- a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel.smali
+++ /dev/null
@@ -1,1147 +0,0 @@
-.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
deleted file mode 100644
index b58530ded9..0000000000
--- a/com.discord/smali/com/discord/widgets/spectate/WidgetStreamFeedbackDialog$Face.smali
+++ /dev/null
@@ -1,137 +0,0 @@
-.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
deleted file mode 100644
index c7bf9a1a25..0000000000
--- a/com.discord/smali/com/discord/widgets/spectate/WidgetStreamFeedbackDialog$SpinnerAdapter$WhenMappings.smali
+++ /dev/null
@@ -1,106 +0,0 @@
-.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
deleted file mode 100644
index 739d363e26..0000000000
--- a/com.discord/smali/com/discord/widgets/spectate/WidgetStreamFeedbackDialog$SpinnerAdapter.smali
+++ /dev/null
@@ -1,293 +0,0 @@
-.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
deleted file mode 100644
index 8ebed95f23..0000000000
--- a/com.discord/smali/com/discord/widgets/spectate/WidgetStreamFeedbackDialog$onResume$1.smali
+++ /dev/null
@@ -1,88 +0,0 @@
-.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
deleted file mode 100644
index 7f58ab3bbb..0000000000
--- a/com.discord/smali/com/discord/widgets/spectate/WidgetStreamFeedbackDialog$onResume$2.smali
+++ /dev/null
@@ -1,49 +0,0 @@
-.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
deleted file mode 100644
index eaf308a791..0000000000
--- a/com.discord/smali/com/discord/widgets/spectate/WidgetStreamFeedbackDialog$onResume$3.smali
+++ /dev/null
@@ -1,47 +0,0 @@
-.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
deleted file mode 100644
index f699e8d09f..0000000000
--- a/com.discord/smali/com/discord/widgets/spectate/WidgetStreamFeedbackDialog$onResume$4.smali
+++ /dev/null
@@ -1,47 +0,0 @@
-.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
deleted file mode 100644
index 58d2cb8ae3..0000000000
--- a/com.discord/smali/com/discord/widgets/spectate/WidgetStreamFeedbackDialog$onResume$5.smali
+++ /dev/null
@@ -1,47 +0,0 @@
-.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
deleted file mode 100644
index 8c7608c0ed..0000000000
--- a/com.discord/smali/com/discord/widgets/spectate/WidgetStreamFeedbackDialog.smali
+++ /dev/null
@@ -1,867 +0,0 @@
-.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 54a164d517..1a160f8195 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;->IV()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->IT()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 f4fcba5b43..0243e81fc2 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -235,7 +235,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -307,7 +307,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 d83ea4aca6..344c8ae793 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 7a7fd7a9b5..53e63aca31 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, 0x7f0a0738
+    const v0, 0x7f0a0719
 
     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, 0x7f0a073c
+    const v0, 0x7f0a071d
 
     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, 0x7f0a073b
+    const v0, 0x7f0a071c
 
     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, 0x7f0a073a
+    const v0, 0x7f0a071b
 
     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, 0x7f0a073d
+    const v0, 0x7f0a071e
 
     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, 0x7f0a073f
+    const v0, 0x7f0a0720
 
     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, 0x7f0a073e
+    const v0, 0x7f0a071f
 
     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, 0x7f120465
+    const v0, 0x7f120440
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -505,7 +505,7 @@
 
     if-eqz p2, :cond_1
 
-    const p2, 0x7f120c23
+    const p2, 0x7f120bec
 
     invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -698,7 +698,7 @@
 
     move-result-object p1
 
-    const v2, 0x7f120c2b
+    const v2, 0x7f120bf4
 
     new-array p4, p4, [Ljava/lang/Object;
 
@@ -725,7 +725,7 @@
 
     move-result-object p1
 
-    const v2, 0x7f100087
+    const v2, 0x7f100085
 
     new-array v3, v1, [Ljava/lang/Object;
 
@@ -747,7 +747,7 @@
 
     move-result-object p2
 
-    const v2, 0x7f120c29
+    const v2, 0x7f120bf2
 
     new-array p4, p4, [Ljava/lang/Object;
 
@@ -771,7 +771,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d01c3
+    const v0, 0x7f0d01bc
 
     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 88cc4684d8..4ae875382b 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 423cb42552..688b35f798 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;->vO:Lcom/discord/app/i;
+    sget-object v0, Lcom/discord/app/i;->vP: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 4267b4ee66..f5283425a8 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, 0x7f0a0479
+    const p2, 0x7f0a0474
 
     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 72893a5446..eb802905e8 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 d526644c4f..52932578be 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, 0x7f12121b
+    const v2, 0x7f12118e
 
     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, 0x7f120f57
+    const v1, 0x7f120ecb
 
     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, 0x7f0d01c7
+    const v0, 0x7f0d01bf
 
     return v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/user/-$$Lambda$WidgetUserMutualFriends$Model$3upmMSc6W0SjsUzwaia_3qi_-yw.smali b/com.discord/smali/com/discord/widgets/user/-$$Lambda$WidgetUserMutualFriends$Model$3upmMSc6W0SjsUzwaia_3qi_-yw.smali
new file mode 100644
index 0000000000..bfb724d3d9
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/-$$Lambda$WidgetUserMutualFriends$Model$3upmMSc6W0SjsUzwaia_3qi_-yw.smali
@@ -0,0 +1,38 @@
+.class public final synthetic Lcom/discord/widgets/user/-$$Lambda$WidgetUserMutualFriends$Model$3upmMSc6W0SjsUzwaia_3qi_-yw;
+.super Ljava/lang/Object;
+.source "lambda"
+
+# interfaces
+.implements Lrx/functions/b;
+
+
+# instance fields
+.field private final synthetic f$0:J
+
+
+# direct methods
+.method public synthetic constructor <init>(J)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-wide p1, p0, Lcom/discord/widgets/user/-$$Lambda$WidgetUserMutualFriends$Model$3upmMSc6W0SjsUzwaia_3qi_-yw;->f$0:J
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final call(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 2
+
+    iget-wide v0, p0, Lcom/discord/widgets/user/-$$Lambda$WidgetUserMutualFriends$Model$3upmMSc6W0SjsUzwaia_3qi_-yw;->f$0:J
+
+    check-cast p1, Ljava/util/List;
+
+    invoke-static {v0, v1, p1}, Lcom/discord/widgets/user/WidgetUserMutualFriends$Model;->lambda$get$1(JLjava/util/List;)Lrx/Observable;
+
+    move-result-object p1
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/-$$Lambda$WidgetUserMutualFriends$Model$ND-ROW9qDeFibPdK4tfF506nI1o.smali b/com.discord/smali/com/discord/widgets/user/-$$Lambda$WidgetUserMutualFriends$Model$ND-ROW9qDeFibPdK4tfF506nI1o.smali
deleted file mode 100644
index 31dcad8064..0000000000
--- a/com.discord/smali/com/discord/widgets/user/-$$Lambda$WidgetUserMutualFriends$Model$ND-ROW9qDeFibPdK4tfF506nI1o.smali
+++ /dev/null
@@ -1,46 +0,0 @@
-.class public final synthetic Lcom/discord/widgets/user/-$$Lambda$WidgetUserMutualFriends$Model$ND-ROW9qDeFibPdK4tfF506nI1o;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Lrx/functions/b;
-
-
-# static fields
-.field public static final synthetic INSTANCE:Lcom/discord/widgets/user/-$$Lambda$WidgetUserMutualFriends$Model$ND-ROW9qDeFibPdK4tfF506nI1o;
-
-
-# direct methods
-.method static synthetic constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lcom/discord/widgets/user/-$$Lambda$WidgetUserMutualFriends$Model$ND-ROW9qDeFibPdK4tfF506nI1o;
-
-    invoke-direct {v0}, Lcom/discord/widgets/user/-$$Lambda$WidgetUserMutualFriends$Model$ND-ROW9qDeFibPdK4tfF506nI1o;-><init>()V
-
-    sput-object v0, Lcom/discord/widgets/user/-$$Lambda$WidgetUserMutualFriends$Model$ND-ROW9qDeFibPdK4tfF506nI1o;->INSTANCE:Lcom/discord/widgets/user/-$$Lambda$WidgetUserMutualFriends$Model$ND-ROW9qDeFibPdK4tfF506nI1o;
-
-    return-void
-.end method
-
-.method private synthetic constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Ljava/util/List;
-
-    invoke-static {p1}, Lcom/discord/widgets/user/WidgetUserMutualFriends$Model;->lambda$get$1(Ljava/util/List;)Lrx/Observable;
-
-    move-result-object p1
-
-    return-object p1
-.end method
diff --git a/com.discord/smali/com/discord/widgets/user/-$$Lambda$WidgetUserMutualFriends$Model$inFrWcCqjHGm73egDeeCOVBpDYo.smali b/com.discord/smali/com/discord/widgets/user/-$$Lambda$WidgetUserMutualFriends$Model$U6gIfcsL44GQ-3vvEL_EUnPjMYU.smali
similarity index 52%
rename from com.discord/smali/com/discord/widgets/user/-$$Lambda$WidgetUserMutualFriends$Model$inFrWcCqjHGm73egDeeCOVBpDYo.smali
rename to com.discord/smali/com/discord/widgets/user/-$$Lambda$WidgetUserMutualFriends$Model$U6gIfcsL44GQ-3vvEL_EUnPjMYU.smali
index bc54475bad..3a31a09429 100644
--- a/com.discord/smali/com/discord/widgets/user/-$$Lambda$WidgetUserMutualFriends$Model$inFrWcCqjHGm73egDeeCOVBpDYo.smali
+++ b/com.discord/smali/com/discord/widgets/user/-$$Lambda$WidgetUserMutualFriends$Model$U6gIfcsL44GQ-3vvEL_EUnPjMYU.smali
@@ -1,24 +1,24 @@
-.class public final synthetic Lcom/discord/widgets/user/-$$Lambda$WidgetUserMutualFriends$Model$inFrWcCqjHGm73egDeeCOVBpDYo;
+.class public final synthetic Lcom/discord/widgets/user/-$$Lambda$WidgetUserMutualFriends$Model$U6gIfcsL44GQ-3vvEL_EUnPjMYU;
 .super Ljava/lang/Object;
 .source "lambda"
 
 # interfaces
-.implements Lrx/functions/Func5;
+.implements Lrx/functions/Func6;
 
 
 # static fields
-.field public static final synthetic INSTANCE:Lcom/discord/widgets/user/-$$Lambda$WidgetUserMutualFriends$Model$inFrWcCqjHGm73egDeeCOVBpDYo;
+.field public static final synthetic INSTANCE:Lcom/discord/widgets/user/-$$Lambda$WidgetUserMutualFriends$Model$U6gIfcsL44GQ-3vvEL_EUnPjMYU;
 
 
 # direct methods
 .method static synthetic constructor <clinit>()V
     .locals 1
 
-    new-instance v0, Lcom/discord/widgets/user/-$$Lambda$WidgetUserMutualFriends$Model$inFrWcCqjHGm73egDeeCOVBpDYo;
+    new-instance v0, Lcom/discord/widgets/user/-$$Lambda$WidgetUserMutualFriends$Model$U6gIfcsL44GQ-3vvEL_EUnPjMYU;
 
-    invoke-direct {v0}, Lcom/discord/widgets/user/-$$Lambda$WidgetUserMutualFriends$Model$inFrWcCqjHGm73egDeeCOVBpDYo;-><init>()V
+    invoke-direct {v0}, Lcom/discord/widgets/user/-$$Lambda$WidgetUserMutualFriends$Model$U6gIfcsL44GQ-3vvEL_EUnPjMYU;-><init>()V
 
-    sput-object v0, Lcom/discord/widgets/user/-$$Lambda$WidgetUserMutualFriends$Model$inFrWcCqjHGm73egDeeCOVBpDYo;->INSTANCE:Lcom/discord/widgets/user/-$$Lambda$WidgetUserMutualFriends$Model$inFrWcCqjHGm73egDeeCOVBpDYo;
+    sput-object v0, Lcom/discord/widgets/user/-$$Lambda$WidgetUserMutualFriends$Model$U6gIfcsL44GQ-3vvEL_EUnPjMYU;->INSTANCE:Lcom/discord/widgets/user/-$$Lambda$WidgetUserMutualFriends$Model$U6gIfcsL44GQ-3vvEL_EUnPjMYU;
 
     return-void
 .end method
@@ -33,7 +33,7 @@
 
 
 # virtual methods
-.method public final call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+.method public final call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
     check-cast p1, Ljava/util/Map;
@@ -46,7 +46,9 @@
 
     check-cast p5, Ljava/util/Map;
 
-    invoke-static {p1, p2, p3, p4, p5}, Lcom/discord/widgets/user/WidgetUserMutualFriends$Model;->lambda$inFrWcCqjHGm73egDeeCOVBpDYo(Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;)Lcom/discord/widgets/user/WidgetUserMutualFriends$Model;
+    check-cast p6, Lcom/discord/models/domain/ModelUser;
+
+    invoke-static/range {p1 .. p6}, Lcom/discord/widgets/user/WidgetUserMutualFriends$Model;->lambda$U6gIfcsL44GQ-3vvEL_EUnPjMYU(Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Lcom/discord/models/domain/ModelUser;)Lcom/discord/widgets/user/WidgetUserMutualFriends$Model;
 
     move-result-object p1
 
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$_77tpjGQf94zYIVClZjxvYlAWS8.smali
similarity index 51%
rename from com.discord/smali/com/discord/widgets/user/-$$Lambda$WidgetUserMutualFriends$MutualFriendsAdapter$ViewHolder$KotLNlPcAVBbHHO7-m9mz_CwblE.smali
rename to com.discord/smali/com/discord/widgets/user/-$$Lambda$WidgetUserMutualFriends$MutualFriendsAdapter$ViewHolder$_77tpjGQf94zYIVClZjxvYlAWS8.smali
index 4e30aa13ca..8f53d4731a 100644
--- 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$_77tpjGQf94zYIVClZjxvYlAWS8.smali
@@ -1,4 +1,4 @@
-.class public final synthetic Lcom/discord/widgets/user/-$$Lambda$WidgetUserMutualFriends$MutualFriendsAdapter$ViewHolder$KotLNlPcAVBbHHO7-m9mz_CwblE;
+.class public final synthetic Lcom/discord/widgets/user/-$$Lambda$WidgetUserMutualFriends$MutualFriendsAdapter$ViewHolder$_77tpjGQf94zYIVClZjxvYlAWS8;
 .super Ljava/lang/Object;
 .source "lambda"
 
@@ -7,16 +7,16 @@
 
 
 # instance fields
-.field private final synthetic f$0:Landroid/app/Activity;
+.field private final synthetic f$0:Lcom/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter;
 
 
 # direct methods
-.method public synthetic constructor <init>(Landroid/app/Activity;)V
+.method public synthetic constructor <init>(Lcom/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter;)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;
+    iput-object p1, p0, Lcom/discord/widgets/user/-$$Lambda$WidgetUserMutualFriends$MutualFriendsAdapter$ViewHolder$_77tpjGQf94zYIVClZjxvYlAWS8;->f$0:Lcom/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter;
 
     return-void
 .end method
@@ -26,7 +26,7 @@
 .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;
+    iget-object v0, p0, Lcom/discord/widgets/user/-$$Lambda$WidgetUserMutualFriends$MutualFriendsAdapter$ViewHolder$_77tpjGQf94zYIVClZjxvYlAWS8;->f$0:Lcom/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter;
 
     check-cast p1, Landroid/view/View;
 
@@ -34,7 +34,7 @@
 
     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
+    invoke-static {v0, p1, p2, p3}, Lcom/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter$ViewHolder;->lambda$new$0(Lcom/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter;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 baa6bd5413..64718db796 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -75,7 +75,7 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lcom/discord/dialogs/d;->xw:Lcom/discord/dialogs/d$a;
+    sget-object v0, Lcom/discord/dialogs/d;->xy: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, 0x7f120f3a
+    const v3, 0x7f120eb6
 
     invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
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 e75493be64..b02cca0271 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, 0x7f08035f
+    const v7, 0x7f080353
 
-    const v6, 0x7f06002d
+    const v6, 0x7f06002c
 
     invoke-static {v2, v6}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
 
     move-result v8
 
-    const v6, 0x7f12115d
+    const v6, 0x7f1210d1
 
     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, 0x7f080354
+    const v7, 0x7f080348
 
-    const v6, 0x7f06008d
+    const v6, 0x7f06008c
 
     invoke-static {v2, v6}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
 
     move-result v8
 
-    const v6, 0x7f120d6b
+    const v6, 0x7f120d33
 
     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, 0x7f080352
+    const v7, 0x7f080346
 
-    const v6, 0x7f060127
+    const v6, 0x7f060126
 
     invoke-static {v2, v6}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
 
     move-result v8
 
-    const v6, 0x7f120975
+    const v6, 0x7f12093f
 
     invoke-virtual {v2, v6}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -215,7 +215,7 @@
 
     move-result v4
 
-    const v6, 0x7f120986
+    const v6, 0x7f120950
 
     const/4 v7, 0x0
 
@@ -237,25 +237,25 @@
 
     if-eqz v4, :cond_4
 
-    const v4, 0x7f0802cd
+    const v4, 0x7f0802c1
 
-    const v10, 0x7f0802cd
+    const v10, 0x7f0802c1
 
     goto :goto_1
 
     :cond_4
-    const v4, 0x7f0802cc
+    const v4, 0x7f0802c0
 
-    const v10, 0x7f0802cc
+    const v10, 0x7f0802c0
 
     :goto_1
-    const v4, 0x7f060085
+    const v4, 0x7f060084
 
     invoke-static {v2, v4}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
 
     move-result v11
 
-    const v4, 0x7f12097d
+    const v4, 0x7f120947
 
     invoke-virtual {v2, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -320,25 +320,25 @@
 
     if-eqz v4, :cond_7
 
-    const v4, 0x7f0802cf
+    const v4, 0x7f0802c3
 
-    const v10, 0x7f0802cf
+    const v10, 0x7f0802c3
 
     goto :goto_3
 
     :cond_7
-    const v4, 0x7f0802ce
+    const v4, 0x7f0802c2
 
-    const v10, 0x7f0802ce
+    const v10, 0x7f0802c2
 
     :goto_3
-    const v4, 0x7f060086
+    const v4, 0x7f060085
 
     invoke-static {v2, v4}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
 
     move-result v11
 
-    const v4, 0x7f12097e
+    const v4, 0x7f120948
 
     invoke-virtual {v2, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -352,7 +352,7 @@
 
     aput-object v4, v9, v7
 
-    const v4, 0x7f120986
+    const v4, 0x7f120950
 
     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, 0x7f0802d1
+    const v1, 0x7f0802c5
 
-    const v10, 0x7f0802d1
+    const v10, 0x7f0802c5
 
     goto :goto_5
 
     :cond_a
-    const v1, 0x7f0802d0
+    const v1, 0x7f0802c4
 
-    const v10, 0x7f0802d0
+    const v10, 0x7f0802c4
 
     :goto_5
-    const v1, 0x7f060087
+    const v1, 0x7f060086
 
     invoke-static {v2, v1}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
 
     move-result v11
 
-    const v1, 0x7f12097f
+    const v1, 0x7f120949
 
     invoke-virtual {v2, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -437,7 +437,7 @@
 
     aput-object v1, v9, v7
 
-    const v1, 0x7f120986
+    const v1, 0x7f120950
 
     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, 0x7f080351
+    const v10, 0x7f080345
 
-    const v4, 0x7f060106
+    const v4, 0x7f060105
 
     invoke-static {v2, v4}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
 
     move-result v11
 
-    const v4, 0x7f12037b
+    const v4, 0x7f120356
 
     invoke-virtual {v2, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -513,19 +513,19 @@
 
     move-result v1
 
-    const v4, 0x7f0402ab
+    const v4, 0x7f0402aa
 
     if-eqz v1, :cond_d
 
     new-instance v1, Lcom/discord/widgets/user/Badge;
 
-    const v10, 0x7f080355
+    const v10, 0x7f080349
 
     invoke-static {v2, v4}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
 
     move-result v11
 
-    const v5, 0x7f120583
+    const v5, 0x7f12055e
 
     invoke-virtual {v2, v5}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -552,13 +552,13 @@
 
     move-result v1
 
-    const v5, 0x7f120f20
+    const v5, 0x7f120e97
 
     if-eqz v1, :cond_e
 
     new-instance v1, Lcom/discord/widgets/user/Badge;
 
-    const v10, 0x7f080353
+    const v10, 0x7f080347
 
     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, 0x7f120e01
+    const v9, 0x7f120dc7
 
     new-array v13, v8, [Ljava/lang/Object;
 
@@ -615,9 +615,9 @@
 
     if-ltz v9, :cond_f
 
-    const v1, 0x7f08035e
+    const v1, 0x7f080352
 
-    const v10, 0x7f08035e
+    const v10, 0x7f080352
 
     goto/16 :goto_6
 
@@ -634,9 +634,9 @@
 
     if-ltz v9, :cond_10
 
-    const v1, 0x7f08035d
+    const v1, 0x7f080351
 
-    const v10, 0x7f08035d
+    const v10, 0x7f080351
 
     goto/16 :goto_6
 
@@ -653,9 +653,9 @@
 
     if-ltz v9, :cond_11
 
-    const v1, 0x7f08035c
+    const v1, 0x7f080350
 
-    const v10, 0x7f08035c
+    const v10, 0x7f080350
 
     goto :goto_6
 
@@ -672,9 +672,9 @@
 
     if-ltz v9, :cond_12
 
-    const v1, 0x7f08035b
+    const v1, 0x7f08034f
 
-    const v10, 0x7f08035b
+    const v10, 0x7f08034f
 
     goto :goto_6
 
@@ -691,9 +691,9 @@
 
     if-ltz v9, :cond_13
 
-    const v1, 0x7f08035a
+    const v1, 0x7f08034e
 
-    const v10, 0x7f08035a
+    const v10, 0x7f08034e
 
     goto :goto_6
 
@@ -710,9 +710,9 @@
 
     if-ltz v9, :cond_14
 
-    const v1, 0x7f080359
+    const v1, 0x7f08034d
 
-    const v10, 0x7f080359
+    const v10, 0x7f08034d
 
     goto :goto_6
 
@@ -727,9 +727,9 @@
 
     if-ltz v6, :cond_15
 
-    const v1, 0x7f080358
+    const v1, 0x7f08034c
 
-    const v10, 0x7f080358
+    const v10, 0x7f08034c
 
     goto :goto_6
 
@@ -746,9 +746,9 @@
 
     if-ltz v6, :cond_16
 
-    const v1, 0x7f080357
+    const v1, 0x7f08034b
 
-    const v10, 0x7f080357
+    const v10, 0x7f08034b
 
     goto :goto_6
 
@@ -759,9 +759,9 @@
 
     invoke-static {v1, v8}, Lkotlin/jvm/internal/l;->compare(II)I
 
-    const v1, 0x7f080356
+    const v1, 0x7f08034a
 
-    const v10, 0x7f080356
+    const v10, 0x7f08034a
 
     :goto_6
     new-instance v1, Lcom/discord/widgets/user/Badge;
@@ -774,7 +774,7 @@
 
     move-result-object v12
 
-    const v4, 0x7f120ecb
+    const v4, 0x7f120e57
 
     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 1d3783c0fc..b26c9d8d5f 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, 0x7f1202a6
+    const v2, 0x7f1202a4
 
     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 2f015f7eb9..57caaf84a9 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;->fh()I
+    invoke-virtual {v0}, Lcom/discord/views/RadioManager;->ff()I
 
     move-result v0
 
@@ -190,7 +190,7 @@
     nop
 
     :pswitch_data_0
-    .packed-switch 0x7f0a00c3
+    .packed-switch 0x7f0a00c2
         :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 d275cc36be..d204e4dc04 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, 0x7f0a00c7
+    const v0, 0x7f0a00c6
 
     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, 0x7f0a00bf
+    const v0, 0x7f0a00be
 
     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, 0x7f0a00c2
+    const v0, 0x7f0a00c1
 
     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, 0x7f0a00c1
+    const v0, 0x7f0a00c0
 
     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, 0x7f0a00c6
+    const v0, 0x7f0a00c5
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -251,9 +251,9 @@
 
     :array_0
     .array-data 4
-        0x7f0a00c5
-        0x7f0a00c3
         0x7f0a00c4
+        0x7f0a00c2
+        0x7f0a00c3
     .end array-data
 .end method
 
@@ -444,7 +444,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d00ca
+    const v0, 0x7f0d00c8
 
     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 751dc05c68..0f79aebe50 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, 0x7f120b24
+    const v2, 0x7f120aee
 
     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 5ebebaa73d..6b34488586 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, 0x7f0a0413
+    const v0, 0x7f0a040e
 
     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, 0x7f0a040f
+    const v0, 0x7f0a040a
 
     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, 0x7f0a0411
+    const v0, 0x7f0a040c
 
     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, 0x7f0a0410
+    const v0, 0x7f0a040b
 
     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, 0x7f0a0412
+    const v0, 0x7f0a040d
 
     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, 0x7f0d0145
+    const v0, 0x7f0d0143
 
     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 7f881bd7b1..861369e315 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, 0x7f120f60
+    const v1, 0x7f120ed4
 
     invoke-virtual {p0, v1}, Lcom/discord/widgets/user/WidgetPruneUsers;->getString(I)Ljava/lang/String;
 
@@ -237,7 +237,7 @@
 
     move-result-object v3
 
-    const v5, 0x7f10002f
+    const v5, 0x7f10002e
 
     iget v6, p1, Lcom/discord/widgets/user/WidgetPruneUsers$Model;->pruneCount:I
 
@@ -259,7 +259,7 @@
 
     move-result-object v3
 
-    const v5, 0x7f10002e
+    const v5, 0x7f10002d
 
     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, 0x7f12061d
+    const v5, 0x7f1205f8
 
     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;->fh()I
+    invoke-virtual {v0}, Lcom/discord/views/RadioManager;->ff()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;->Je()Lrx/functions/a$b;
+    invoke-static {}, Lrx/functions/a;->Jc()Lrx/functions/a$b;
 
     move-result-object v0
 
-    invoke-static {}, Lrx/functions/a;->Je()Lrx/functions/a$b;
+    invoke-static {}, Lrx/functions/a;->Jc()Lrx/functions/a$b;
 
     move-result-object v1
 
@@ -461,7 +461,7 @@
 .method public getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0163
+    const v0, 0x7f0d0161
 
     return v0
 .end method
@@ -555,7 +555,7 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppDialog;->onViewBound(Landroid/view/View;)V
 
-    const v0, 0x7f0a0562
+    const v0, 0x7f0a0553
 
     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, 0x7f0a0564
+    const v0, 0x7f0a0555
 
     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, 0x7f0a0568
+    const v0, 0x7f0a0559
 
     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, 0x7f0a0563
+    const v0, 0x7f0a0554
 
     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, 0x7f0a0561
+    const v0, 0x7f0a0552
 
     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, 0x7f0a0565
+    const v1, 0x7f0a0556
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -617,7 +617,7 @@
 
     aput-object v1, v0, v2
 
-    const v1, 0x7f0a0566
+    const v1, 0x7f0a0557
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -629,7 +629,7 @@
 
     aput-object v1, v0, v2
 
-    const v1, 0x7f0a0567
+    const v1, 0x7f0a0558
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -699,7 +699,7 @@
 
     aput-object v7, v6, v3
 
-    const v7, 0x7f10007c
+    const v7, 0x7f10007a
 
     invoke-virtual {v4, v7, v5, v6}, Landroid/content/res/Resources;->getQuantityString(II[Ljava/lang/Object;)Ljava/lang/String;
 
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 45b14227ed..00e7efee23 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 5b9281adc8..20c5b418d8 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 1beb195ebb..700437a92a 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, 0x7f0a07c0
+    const v0, 0x7f0a0793
 
     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, 0x7f0a07be
+    const v0, 0x7f0a0791
 
     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, 0x7f0a07bf
+    const v0, 0x7f0a0792
 
     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, 0x7f0d01d2
+    const v0, 0x7f0d01c8
 
     return v0
 .end method
@@ -474,7 +474,7 @@
 
     move-result-object v0
 
-    const v4, 0x7f121230
+    const v4, 0x7f1211a3
 
     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 a4ecb40f7f..14b91d8bd7 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 f74d6e6aef..b149120882 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, 0x7f0a047e
+    const p2, 0x7f0a0477
 
     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 a72c37aa31..fabd259e37 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 d6db4385a9..63021a7c6f 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 867eda7be7..58cb24e93d 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, 0x7f0a07c1
+    const v0, 0x7f0a0794
 
     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, 0x7f0e001a
+    const v2, 0x7f0e0019
 
     new-instance v0, Lcom/discord/widgets/user/WidgetUserMentions$configureUI$1;
 
@@ -280,7 +280,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d01d1
+    const v0, 0x7f0d01c7
 
     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, 0x7f120f9f
+    const p1, 0x7f120f13
 
     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 dfae5ae19c..bdd457b741 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserMutualFriends$Model.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMutualFriends$Model.smali
@@ -31,13 +31,16 @@
     .end annotation
 .end field
 
+.field private final user:Lcom/discord/models/domain/ModelUser;
+
 
 # direct methods
-.method public constructor <init>(Ljava/util/List;)V
+.method public constructor <init>(Lcom/discord/models/domain/ModelUser;Ljava/util/List;)V
     .locals 0
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
+            "Lcom/discord/models/domain/ModelUser;",
             "Ljava/util/List<",
             "Lcom/discord/widgets/user/WidgetUserMutualFriends$Model$Item;",
             ">;)V"
@@ -46,13 +49,15 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/discord/widgets/user/WidgetUserMutualFriends$Model;->mutualFriends:Ljava/util/List;
+    iput-object p1, p0, Lcom/discord/widgets/user/WidgetUserMutualFriends$Model;->user:Lcom/discord/models/domain/ModelUser;
+
+    iput-object p2, p0, Lcom/discord/widgets/user/WidgetUserMutualFriends$Model;->mutualFriends:Ljava/util/List;
 
     return-void
 .end method
 
-.method private constructor <init>(Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;)V
-    .locals 9
+.method private constructor <init>(Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Lcom/discord/models/domain/ModelUser;)V
+    .locals 8
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -76,21 +81,25 @@
             "Ljava/util/Map<",
             "Ljava/lang/Long;",
             "Lcom/discord/models/domain/ModelApplicationStream;",
-            ">;)V"
+            ">;",
+            "Lcom/discord/models/domain/ModelUser;",
+            ")V"
         }
     .end annotation
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    new-instance v0, Ljava/util/ArrayList;
+    iput-object p6, p0, Lcom/discord/widgets/user/WidgetUserMutualFriends$Model;->user:Lcom/discord/models/domain/ModelUser;
+
+    new-instance p6, Ljava/util/ArrayList;
 
     invoke-interface {p2}, Ljava/util/Map;->size()I
 
-    move-result v1
+    move-result v0
 
-    invoke-direct {v0, v1}, Ljava/util/ArrayList;-><init>(I)V
+    invoke-direct {p6, v0}, Ljava/util/ArrayList;-><init>(I)V
 
-    iput-object v0, p0, Lcom/discord/widgets/user/WidgetUserMutualFriends$Model;->mutualFriends:Ljava/util/List;
+    iput-object p6, p0, Lcom/discord/widgets/user/WidgetUserMutualFriends$Model;->mutualFriends:Ljava/util/List;
 
     invoke-interface {p2}, Ljava/util/Map;->values()Ljava/util/Collection;
 
@@ -104,37 +113,37 @@
     :goto_0
     invoke-interface {p2}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v0
+    move-result p6
 
-    if-eqz v0, :cond_1
+    if-eqz p6, :cond_1
 
     invoke-interface {p2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object v0
+    move-result-object p6
 
-    move-object v3, v0
+    move-object v2, p6
 
-    check-cast v3, Lcom/discord/models/domain/ModelUser;
+    check-cast v2, Lcom/discord/models/domain/ModelUser;
 
-    invoke-virtual {v3}, Lcom/discord/models/domain/ModelUser;->getId()J
+    invoke-virtual {v2}, Lcom/discord/models/domain/ModelUser;->getId()J
 
     move-result-wide v0
 
     invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v2
+    move-result-object p6
 
-    invoke-interface {p4, v2}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z
+    invoke-interface {p4, p6}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z
 
-    move-result v2
+    move-result p6
 
-    if-eqz v2, :cond_0
+    if-eqz p6, :cond_0
 
-    iget-object v7, p0, Lcom/discord/widgets/user/WidgetUserMutualFriends$Model;->mutualFriends:Ljava/util/List;
+    iget-object p6, p0, Lcom/discord/widgets/user/WidgetUserMutualFriends$Model;->mutualFriends:Ljava/util/List;
 
-    new-instance v8, Lcom/discord/widgets/user/WidgetUserMutualFriends$Model$Item;
+    new-instance v6, Lcom/discord/widgets/user/WidgetUserMutualFriends$Model$Item;
 
-    const/4 v2, 0x1
+    const/4 v3, 0x1
 
     invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -166,13 +175,21 @@
 
     invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
-    move-result-object v6
+    move-result-object v7
 
-    move-object v1, v8
+    move-object v0, v6
 
-    invoke-direct/range {v1 .. v6}, Lcom/discord/widgets/user/WidgetUserMutualFriends$Model$Item;-><init>(ILcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelPresence;Ljava/util/List;Ljava/lang/Boolean;)V
+    move v1, v3
 
-    invoke-interface {v7, v8}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+    move-object v3, v4
+
+    move-object v4, v5
+
+    move-object v5, v7
+
+    invoke-direct/range {v0 .. v5}, Lcom/discord/widgets/user/WidgetUserMutualFriends$Model$Item;-><init>(ILcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelPresence;Ljava/util/List;Ljava/lang/Boolean;)V
+
+    invoke-interface {p6, v6}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
     goto :goto_0
 
@@ -217,8 +234,16 @@
     return-object p0
 .end method
 
+.method static synthetic access$100(Lcom/discord/widgets/user/WidgetUserMutualFriends$Model;)Lcom/discord/models/domain/ModelUser;
+    .locals 0
+
+    iget-object p0, p0, Lcom/discord/widgets/user/WidgetUserMutualFriends$Model;->user:Lcom/discord/models/domain/ModelUser;
+
+    return-object p0
+.end method
+
 .method public static get(J)Lrx/Observable;
-    .locals 1
+    .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(J)",
@@ -234,25 +259,27 @@
 
     invoke-virtual {v0, p0, p1}, Lcom/discord/utilities/rest/RestAPI;->getRelationships(J)Lrx/Observable;
 
-    move-result-object p0
+    move-result-object v0
 
     invoke-static {}, Lcom/discord/app/i;->dN()Lrx/Observable$c;
 
-    move-result-object p1
+    move-result-object v1
 
-    invoke-virtual {p0, p1}, Lrx/Observable;->a(Lrx/Observable$c;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->a(Lrx/Observable$c;)Lrx/Observable;
 
-    move-result-object p0
+    move-result-object v0
 
-    sget-object p1, Lcom/discord/widgets/user/-$$Lambda$WidgetUserMutualFriends$Model$fsXz76pDmPgq-OhmCyucDddrzLo;->INSTANCE:Lcom/discord/widgets/user/-$$Lambda$WidgetUserMutualFriends$Model$fsXz76pDmPgq-OhmCyucDddrzLo;
+    sget-object v1, Lcom/discord/widgets/user/-$$Lambda$WidgetUserMutualFriends$Model$fsXz76pDmPgq-OhmCyucDddrzLo;->INSTANCE:Lcom/discord/widgets/user/-$$Lambda$WidgetUserMutualFriends$Model$fsXz76pDmPgq-OhmCyucDddrzLo;
 
-    invoke-virtual {p0, p1}, Lrx/Observable;->g(Lrx/functions/b;)Lrx/Observable;
+    invoke-virtual {v0, v1}, Lrx/Observable;->g(Lrx/functions/b;)Lrx/Observable;
 
-    move-result-object p0
+    move-result-object v0
 
-    sget-object p1, Lcom/discord/widgets/user/-$$Lambda$WidgetUserMutualFriends$Model$ND-ROW9qDeFibPdK4tfF506nI1o;->INSTANCE:Lcom/discord/widgets/user/-$$Lambda$WidgetUserMutualFriends$Model$ND-ROW9qDeFibPdK4tfF506nI1o;
+    new-instance v1, Lcom/discord/widgets/user/-$$Lambda$WidgetUserMutualFriends$Model$3upmMSc6W0SjsUzwaia_3qi_-yw;
 
-    invoke-virtual {p0, p1}, Lrx/Observable;->g(Lrx/functions/b;)Lrx/Observable;
+    invoke-direct {v1, p0, p1}, Lcom/discord/widgets/user/-$$Lambda$WidgetUserMutualFriends$Model$3upmMSc6W0SjsUzwaia_3qi_-yw;-><init>(J)V
+
+    invoke-virtual {v0, v1}, Lrx/Observable;->g(Lrx/functions/b;)Lrx/Observable;
 
     move-result-object p0
 
@@ -267,6 +294,30 @@
     return-object p0
 .end method
 
+.method public static synthetic lambda$U6gIfcsL44GQ-3vvEL_EUnPjMYU(Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Lcom/discord/models/domain/ModelUser;)Lcom/discord/widgets/user/WidgetUserMutualFriends$Model;
+    .locals 8
+
+    new-instance v7, Lcom/discord/widgets/user/WidgetUserMutualFriends$Model;
+
+    move-object v0, v7
+
+    move-object v1, p0
+
+    move-object v2, p1
+
+    move-object v3, p2
+
+    move-object v4, p3
+
+    move-object v5, p4
+
+    move-object v6, p5
+
+    invoke-direct/range {v0 .. v6}, Lcom/discord/widgets/user/WidgetUserMutualFriends$Model;-><init>(Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Lcom/discord/models/domain/ModelUser;)V
+
+    return-object v7
+.end method
+
 .method static synthetic lambda$get$0(Ljava/util/List;)Lrx/Observable;
     .locals 1
 
@@ -280,7 +331,7 @@
 
     move-result-object p0
 
-    invoke-static {}, Lrx/internal/a/ba;->JI()Lrx/internal/a/ba;
+    invoke-static {}, Lrx/internal/a/ba;->JG()Lrx/internal/a/ba;
 
     move-result-object v0
 
@@ -291,14 +342,14 @@
     return-object p0
 .end method
 
-.method static synthetic lambda$get$1(Ljava/util/List;)Lrx/Observable;
-    .locals 10
+.method static synthetic lambda$get$1(JLjava/util/List;)Lrx/Observable;
+    .locals 11
 
     invoke-static {}, Lcom/discord/stores/StoreStream;->getUsersMutualGuilds()Lcom/discord/stores/StoreUsersMutualGuilds;
 
     move-result-object v0
 
-    invoke-virtual {v0, p0}, Lcom/discord/stores/StoreUsersMutualGuilds;->get(Ljava/util/Collection;)Lrx/Observable;
+    invoke-virtual {v0, p2}, Lcom/discord/stores/StoreUsersMutualGuilds;->get(Ljava/util/Collection;)Lrx/Observable;
 
     move-result-object v1
 
@@ -306,7 +357,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0, p0}, Lcom/discord/stores/StoreUser;->get(Ljava/util/Collection;)Lrx/Observable;
+    invoke-virtual {v0, p2}, Lcom/discord/stores/StoreUser;->get(Ljava/util/Collection;)Lrx/Observable;
 
     move-result-object v2
 
@@ -314,65 +365,51 @@
 
     move-result-object v0
 
-    invoke-virtual {v0, p0}, Lcom/discord/stores/StoreUserPresence;->getForUserIds(Ljava/util/Collection;)Lrx/Observable;
+    invoke-virtual {v0, p2}, Lcom/discord/stores/StoreUserPresence;->getForUserIds(Ljava/util/Collection;)Lrx/Observable;
 
     move-result-object v3
 
     invoke-static {}, Lcom/discord/stores/StoreStream;->getUserRelationships()Lcom/discord/stores/StoreUserRelationships;
 
-    move-result-object p0
+    move-result-object p2
 
-    invoke-virtual {p0}, Lcom/discord/stores/StoreUserRelationships;->get()Lrx/Observable;
+    invoke-virtual {p2}, Lcom/discord/stores/StoreUserRelationships;->get()Lrx/Observable;
 
     move-result-object v4
 
     invoke-static {}, Lcom/discord/stores/StoreStream;->getApplicationStreaming()Lcom/discord/stores/StoreApplicationStreaming;
 
-    move-result-object p0
+    move-result-object p2
 
-    invoke-virtual {p0}, Lcom/discord/stores/StoreApplicationStreaming;->getStreams()Lrx/Observable;
+    invoke-virtual {p2}, Lcom/discord/stores/StoreApplicationStreaming;->get()Lrx/Observable;
 
     move-result-object v5
 
-    sget-object v6, Lcom/discord/widgets/user/-$$Lambda$WidgetUserMutualFriends$Model$inFrWcCqjHGm73egDeeCOVBpDYo;->INSTANCE:Lcom/discord/widgets/user/-$$Lambda$WidgetUserMutualFriends$Model$inFrWcCqjHGm73egDeeCOVBpDYo;
+    invoke-static {}, Lcom/discord/stores/StoreStream;->getUsers()Lcom/discord/stores/StoreUser;
 
-    sget-object v9, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
+    move-result-object p2
 
-    const-wide/16 v7, 0x3e8
+    invoke-virtual {p2, p0, p1}, Lcom/discord/stores/StoreUser;->getUser(J)Lrx/Observable;
 
-    invoke-static/range {v1 .. v9}, Lcom/discord/utilities/rx/ObservableWithLeadingEdgeThrottle;->combineLatest(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func5;JLjava/util/concurrent/TimeUnit;)Lrx/Observable;
+    move-result-object v6
+
+    sget-object v7, Lcom/discord/widgets/user/-$$Lambda$WidgetUserMutualFriends$Model$U6gIfcsL44GQ-3vvEL_EUnPjMYU;->INSTANCE:Lcom/discord/widgets/user/-$$Lambda$WidgetUserMutualFriends$Model$U6gIfcsL44GQ-3vvEL_EUnPjMYU;
+
+    sget-object v10, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
+
+    const-wide/16 v8, 0x3e8
+
+    invoke-static/range {v1 .. v10}, Lcom/discord/utilities/rx/ObservableWithLeadingEdgeThrottle;->combineLatest(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func6;JLjava/util/concurrent/TimeUnit;)Lrx/Observable;
 
     move-result-object p0
 
     return-object p0
 .end method
 
-.method public static synthetic lambda$inFrWcCqjHGm73egDeeCOVBpDYo(Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;)Lcom/discord/widgets/user/WidgetUserMutualFriends$Model;
-    .locals 7
-
-    new-instance v6, Lcom/discord/widgets/user/WidgetUserMutualFriends$Model;
-
-    move-object v0, v6
-
-    move-object v1, p0
-
-    move-object v2, p1
-
-    move-object v3, p2
-
-    move-object v4, p3
-
-    move-object v5, p4
-
-    invoke-direct/range {v0 .. v5}, Lcom/discord/widgets/user/WidgetUserMutualFriends$Model;-><init>(Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;)V
-
-    return-object v6
-.end method
-
 
 # virtual methods
 .method public final equals(Ljava/lang/Object;)Z
-    .locals 3
+    .locals 4
 
     const/4 v0, 0x1
 
@@ -392,34 +429,57 @@
     :cond_1
     check-cast p1, Lcom/discord/widgets/user/WidgetUserMutualFriends$Model;
 
-    iget-object v1, p0, Lcom/discord/widgets/user/WidgetUserMutualFriends$Model;->mutualFriends:Ljava/util/List;
+    iget-object v1, p0, Lcom/discord/widgets/user/WidgetUserMutualFriends$Model;->user:Lcom/discord/models/domain/ModelUser;
 
-    iget-object p1, p1, Lcom/discord/widgets/user/WidgetUserMutualFriends$Model;->mutualFriends:Ljava/util/List;
+    iget-object v3, p1, Lcom/discord/widgets/user/WidgetUserMutualFriends$Model;->user:Lcom/discord/models/domain/ModelUser;
 
     if-nez v1, :cond_2
 
-    if-eqz p1, :cond_3
+    if-eqz v3, :cond_3
 
     goto :goto_0
 
     :cond_2
-    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_3
+    if-nez v1, :cond_3
 
     :goto_0
     return v2
 
     :cond_3
+    iget-object v1, p0, Lcom/discord/widgets/user/WidgetUserMutualFriends$Model;->mutualFriends:Ljava/util/List;
+
+    iget-object p1, p1, Lcom/discord/widgets/user/WidgetUserMutualFriends$Model;->mutualFriends:Ljava/util/List;
+
+    if-nez v1, :cond_4
+
+    if-eqz p1, :cond_5
+
+    goto :goto_1
+
+    :cond_4
+    invoke-virtual {v1, p1}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-nez p1, :cond_5
+
+    :goto_1
+    return v2
+
+    :cond_5
     return v0
 .end method
 
 .method public final hashCode()I
-    .locals 1
+    .locals 3
 
-    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserMutualFriends$Model;->mutualFriends:Ljava/util/List;
+    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserMutualFriends$Model;->user:Lcom/discord/models/domain/ModelUser;
+
+    const/16 v1, 0x2b
 
     if-nez v0, :cond_0
 
@@ -435,6 +495,22 @@
     :goto_0
     add-int/lit8 v0, v0, 0x3b
 
+    iget-object v2, p0, Lcom/discord/widgets/user/WidgetUserMutualFriends$Model;->mutualFriends:Ljava/util/List;
+
+    mul-int/lit8 v0, v0, 0x3b
+
+    if-nez v2, :cond_1
+
+    goto :goto_1
+
+    :cond_1
+    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
+
+    move-result v1
+
+    :goto_1
+    add-int/2addr v0, v1
+
     return v0
 .end method
 
@@ -443,10 +519,18 @@
 
     new-instance v0, Ljava/lang/StringBuilder;
 
-    const-string v1, "WidgetUserMutualFriends.Model(mutualFriends="
+    const-string v1, "WidgetUserMutualFriends.Model(user="
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
+    iget-object v1, p0, Lcom/discord/widgets/user/WidgetUserMutualFriends$Model;->user:Lcom/discord/models/domain/ModelUser;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", mutualFriends="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
     iget-object v1, p0, Lcom/discord/widgets/user/WidgetUserMutualFriends$Model;->mutualFriends:Ljava/util/List;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter$ViewHolder.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter$ViewHolder.smali
index 6688f93971..26ceeb5686 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter$ViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter$ViewHolder.smali
@@ -43,7 +43,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a07cf
+    const v0, 0x7f0a07a0
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -55,7 +55,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a07d5
+    const v0, 0x7f0a07a6
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -67,7 +67,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a07d4
+    const v0, 0x7f0a07a5
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -79,7 +79,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a07d3
+    const v0, 0x7f0a07a4
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -91,7 +91,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter$ViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a07d0
+    const v0, 0x7f0a07a1
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -101,50 +101,37 @@
 
     iput-object p1, p0, Lcom/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter$ViewHolder;->itemMutualServers:Landroid/view/ViewGroup;
 
-    invoke-static {p2}, Lcom/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter;->access$100(Lcom/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter;)Lcom/discord/app/AppFragment;
+    new-instance p1, Lcom/discord/widgets/user/-$$Lambda$WidgetUserMutualFriends$MutualFriendsAdapter$ViewHolder$_77tpjGQf94zYIVClZjxvYlAWS8;
 
-    move-result-object p1
+    invoke-direct {p1, p2}, Lcom/discord/widgets/user/-$$Lambda$WidgetUserMutualFriends$MutualFriendsAdapter$ViewHolder$_77tpjGQf94zYIVClZjxvYlAWS8;-><init>(Lcom/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter;)V
 
-    invoke-virtual {p1}, Lcom/discord/app/AppFragment;->getAppActivity()Lcom/discord/app/AppActivity;
+    const/4 p2, 0x0
 
-    move-result-object p1
+    new-array p2, p2, [Landroid/view/View;
 
-    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
+    invoke-virtual {p0, p1, p2}, 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/app/Activity;Landroid/view/View;Ljava/lang/Integer;Lcom/discord/widgets/user/WidgetUserMutualFriends$Model$Item;)V
+.method static synthetic lambda$new$0(Lcom/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter;Landroid/view/View;Ljava/lang/Integer;Lcom/discord/widgets/user/WidgetUserMutualFriends$Model$Item;)V
     .locals 0
 
-    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, p3, Lcom/discord/widgets/user/WidgetUserMutualFriends$Model$Item;->user:Lcom/discord/models/domain/ModelUser;
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getId()J
 
     move-result-wide p1
 
-    invoke-static {p0, p1, p2}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->launch(Landroid/content/Context;J)V
+    invoke-static {p0}, Lcom/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter;->access$200(Lcom/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter;)Lcom/discord/app/AppFragment;
+
+    move-result-object p0
+
+    invoke-virtual {p0}, Lcom/discord/app/AppFragment;->requireFragmentManager()Landroidx/fragment/app/FragmentManager;
+
+    move-result-object p0
+
+    invoke-static {p1, p2, p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->show(JLandroidx/fragment/app/FragmentManager;)V
 
     return-void
 .end method
@@ -205,7 +192,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f0a07d2
+    const v2, 0x7f0a07a3
 
     invoke-virtual {v1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -213,7 +200,7 @@
 
     check-cast v2, Landroid/widget/TextView;
 
-    const v3, 0x7f0a07d1
+    const v3, 0x7f0a07a2
 
     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 e560c23829..c5bcaa1320 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter.smali
@@ -43,7 +43,7 @@
     return-void
 .end method
 
-.method static synthetic access$100(Lcom/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter;)Lcom/discord/app/AppFragment;
+.method static synthetic access$200(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;
@@ -85,7 +85,7 @@
 
     new-instance p1, Lcom/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter$ViewHolder;
 
-    const p2, 0x7f0d01d9
+    const p2, 0x7f0d01ce
 
     invoke-direct {p1, p2, p0}, Lcom/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter$ViewHolder;-><init>(ILcom/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter;)V
 
@@ -101,11 +101,11 @@
     :cond_1
     new-instance p1, Lcom/discord/widgets/user/profile/WidgetUserProfileEmptyListItem;
 
-    const p2, 0x7f0d01d8
+    const p2, 0x7f0d01cd
 
     const v0, 0x7f0401f0
 
-    const v1, 0x7f120c61
+    const v1, 0x7f120c2a
 
     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 61bddedde0..17e0a8e79f 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserMutualFriends.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMutualFriends.smali
@@ -12,10 +12,6 @@
 .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;
 
@@ -23,12 +19,6 @@
 
 
 # direct methods
-.method static constructor <clinit>()V
-    .locals 0
-
-    return-void
-.end method
-
 .method public constructor <init>()V
     .locals 0
 
@@ -55,26 +45,24 @@
     return-wide v0
 .end method
 
-.method public static show(Landroidx/fragment/app/Fragment;JI)V
-    .locals 2
+.method public static show(Landroidx/fragment/app/Fragment;Lcom/discord/models/domain/ModelUser;I)V
+    .locals 3
 
     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 {p1}, Lcom/discord/models/domain/ModelUser;->getId()J
 
-    invoke-virtual {v0, v1, p1, p2}, Landroid/content/Intent;->putExtra(Ljava/lang/String;J)Landroid/content/Intent;
+    move-result-wide v1
 
-    sget-object p1, Lcom/discord/widgets/user/WidgetUserMutualFriends;->EXTRA_SHOW_TOOLBAR:Ljava/lang/String;
+    const-string p1, "com.discord.intent.extra.EXTRA_USER_ID"
 
-    const/4 p2, 0x1
-
-    invoke-virtual {v0, p1, p2}, Landroid/content/Intent;->putExtra(Ljava/lang/String;Z)Landroid/content/Intent;
+    invoke-virtual {v0, p1, v1, v2}, Landroid/content/Intent;->putExtra(Ljava/lang/String;J)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
+    invoke-static {p0, p1, v0, p2}, Lcom/discord/app/f;->a(Landroidx/fragment/app/Fragment;Ljava/lang/Class;Landroid/content/Intent;I)V
 
     return-void
 .end method
@@ -108,9 +96,9 @@
 
     aput-object v3, v2, v4
 
-    const v3, 0x7f1000c7
+    const v3, 0x7f1000bc
 
-    const v4, 0x7f120c13
+    const v4, 0x7f120bdc
 
     invoke-static {v1, v3, v4, v0, v2}, Lcom/discord/utilities/resources/StringResourceUtilsKt;->getQuantityString(Landroid/content/res/Resources;III[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -118,6 +106,16 @@
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/user/WidgetUserMutualFriends;->setActionBarTitle(Ljava/lang/CharSequence;)Lkotlin/Unit;
 
+    invoke-static {p1}, Lcom/discord/widgets/user/WidgetUserMutualFriends$Model;->access$100(Lcom/discord/widgets/user/WidgetUserMutualFriends$Model;)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
+
+    invoke-virtual {p0, v0}, Lcom/discord/widgets/user/WidgetUserMutualFriends;->setActionBarSubtitle(Ljava/lang/CharSequence;)Lkotlin/Unit;
+
     iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserMutualFriends;->adapter:Lcom/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter;
 
     invoke-static {p1}, Lcom/discord/widgets/user/WidgetUserMutualFriends$Model;->access$000(Lcom/discord/widgets/user/WidgetUserMutualFriends$Model;)Ljava/util/List;
@@ -132,56 +130,26 @@
 .method public getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d01d3
+    const v0, 0x7f0d01c9
 
     return v0
 .end method
 
 .method public onViewBound(Landroid/view/View;)V
-    .locals 3
+    .locals 1
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const v0, 0x7f0a07c3
+    const v0, 0x7f0a0795
 
     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;
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 ebc6ccd234..47cef04c66 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, 0x7f0a07d6
+    const v0, 0x7f0a07a7
 
     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, 0x7f0a07d9
+    const v0, 0x7f0a07aa
 
     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, 0x7f0a07d7
+    const v0, 0x7f0a07a8
 
     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, 0x7f0a07d8
+    const v0, 0x7f0a07a9
 
     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 d69feb1b63..66a22f4e19 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, 0x7f0d01db
+    const p2, 0x7f0d01d0
 
     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, 0x7f0d01d8
+    const p2, 0x7f0d01cd
 
     const v0, 0x7f0401f1
 
-    const v1, 0x7f120c62
+    const v1, 0x7f120c2b
 
     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 3440c18efc..dbb43909df 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserMutualGuilds.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMutualGuilds.smali
@@ -12,10 +12,6 @@
 .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;
 
@@ -23,12 +19,6 @@
 
 
 # direct methods
-.method static constructor <clinit>()V
-    .locals 0
-
-    return-void
-.end method
-
 .method public constructor <init>()V
     .locals 0
 
@@ -66,12 +56,6 @@
 
     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
@@ -108,9 +92,9 @@
 
     aput-object v3, v2, v4
 
-    const v3, 0x7f1000c8
+    const v3, 0x7f1000bd
 
-    const v4, 0x7f120c14
+    const v4, 0x7f120bdd
 
     invoke-static {v1, v3, v4, v0, v2}, Lcom/discord/utilities/resources/StringResourceUtilsKt;->getQuantityString(Landroid/content/res/Resources;III[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -132,7 +116,7 @@
 .method public getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d01d4
+    const v0, 0x7f0d01ca
 
     return v0
 .end method
@@ -157,22 +141,14 @@
 .end method
 
 .method public onViewBound(Landroid/view/View;)V
-    .locals 3
+    .locals 2
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const v0, 0x7f0a07c5
+    const v0, 0x7f0a0796
 
     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;
@@ -181,13 +157,13 @@
 
     new-instance p1, Lcom/discord/widgets/user/WidgetUserMutualGuilds$Adapter;
 
-    iget-object v1, p0, Lcom/discord/widgets/user/WidgetUserMutualGuilds;->recycler:Landroidx/recyclerview/widget/RecyclerView;
+    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserMutualGuilds;->recycler:Landroidx/recyclerview/widget/RecyclerView;
 
-    new-instance v2, Lcom/discord/widgets/user/-$$Lambda$WidgetUserMutualGuilds$0gG6wkTTmOf0AO_Epar-aK7PWQQ;
+    new-instance v1, Lcom/discord/widgets/user/-$$Lambda$WidgetUserMutualGuilds$0gG6wkTTmOf0AO_Epar-aK7PWQQ;
 
-    invoke-direct {v2, p0}, Lcom/discord/widgets/user/-$$Lambda$WidgetUserMutualGuilds$0gG6wkTTmOf0AO_Epar-aK7PWQQ;-><init>(Lcom/discord/widgets/user/WidgetUserMutualGuilds;)V
+    invoke-direct {v1, p0}, Lcom/discord/widgets/user/-$$Lambda$WidgetUserMutualGuilds$0gG6wkTTmOf0AO_Epar-aK7PWQQ;-><init>(Lcom/discord/widgets/user/WidgetUserMutualGuilds;)V
 
-    invoke-direct {p1, v1, v2}, Lcom/discord/widgets/user/WidgetUserMutualGuilds$Adapter;-><init>(Landroidx/recyclerview/widget/RecyclerView;Lrx/functions/Action0;)V
+    invoke-direct {p1, v0, v1}, 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;
 
@@ -197,28 +173,6 @@
 
     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 50a0907a7b..c9c2c8f0c7 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 8afd63562b..b8d3efe450 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, 0x7f0a0821
+    const v0, 0x7f0a07e7
 
     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, 0x7f0a081f
+    const v0, 0x7f0a07e5
 
     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, 0x7f0a081e
+    const v0, 0x7f0a07e4
 
     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, 0x7f0a0820
+    const v0, 0x7f0a07e6
 
     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, 0x7f0a081b
+    const v0, 0x7f0a07e1
 
     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, 0x7f0a081d
+    const p2, 0x7f0a07e3
 
     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, 0x7f0a081c
+    const p2, 0x7f0a07e2
 
     if-eqz p4, :cond_0
 
@@ -405,7 +405,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d01df
+    const v0, 0x7f0d01d4
 
     return v0
 .end method
@@ -433,9 +433,9 @@
 
     move-result-object v2
 
-    const v3, 0x7f08038b
+    const v3, 0x7f08037f
 
-    const v4, 0x7f12116c
+    const v4, 0x7f1210e0
 
     const/4 v5, 0x0
 
@@ -463,9 +463,9 @@
 
     move-result-object v1
 
-    const v2, 0x7f080389
+    const v2, 0x7f08037d
 
-    const v3, 0x7f121168
+    const v3, 0x7f1210dc
 
     const/4 v4, 0x0
 
@@ -493,15 +493,15 @@
 
     move-result-object p1
 
-    const p2, 0x7f121167
+    const p2, 0x7f1210db
 
     invoke-static {p2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object p2
 
-    const v0, 0x7f080388
+    const v0, 0x7f08037c
 
-    const v1, 0x7f121166
+    const v1, 0x7f1210da
 
     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, 0x7f12116a
+    const p2, 0x7f1210de
 
     invoke-static {p2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object p2
 
-    const v0, 0x7f08038a
+    const v0, 0x7f08037e
 
-    const v1, 0x7f121169
+    const v1, 0x7f1210dd
 
     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 4c8e15e0aa..78d6ff7fee 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, 0x7f1213bb
+    const v0, 0x7f12132f
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -55,7 +55,7 @@
 
     aput-object v0, v1, v2
 
-    const v0, 0x7f1213c3
+    const v0, 0x7f121337
 
     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, 0x7f0d01cb
+    const v0, 0x7f0d01c3
 
     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 8a49a9e2ab..359910bb9e 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 9008e5be73..30b55c23ff 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, 0x7f0a0479
+    const p2, 0x7f0a0474
 
     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 b76d8b2947..f07c39cd7a 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -472,7 +472,7 @@
 
     :cond_1
     :goto_0
-    sget-object v0, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vn: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 80df29c481..9ad61be68d 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 a11a06e229..6eafa8d1af 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 531ad87879..cab790a4f9 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, 0x7f0a07b0
+    const v0, 0x7f0a0788
 
     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, 0x7f0a07b2
+    const v0, 0x7f0a078a
 
     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, 0x7f0a07af
+    const v0, 0x7f0a0787
 
     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, 0x7f0a027a
+    const v0, 0x7f0a0279
 
     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, 0x7f0d01cc
+    const v0, 0x7f0d01c4
 
     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 ffabf280e4..c8045b61a3 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 58dace4539..cb8af5b409 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 c4f9a46d1d..296230aa40 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, 0x7f0a027a
+    const v0, 0x7f0a0279
 
     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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object v0
 
@@ -398,7 +398,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d01cd
+    const v0, 0x7f0d01c5
 
     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 b2edc88249..9d232771d4 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, 0x7f1213bd
+    const p1, 0x7f121331
 
     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, 0x7f0d01ce
+    const v0, 0x7f0d01c6
 
     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 0b474a80da..465d2aa158 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, 0x7f0d01d5
+    const v0, 0x7f0d01cb
 
     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, 0x7f0a07ca
+    const v0, 0x7f0a079b
 
     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, 0x7f0a07c7
+    const v0, 0x7f0a0798
 
     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, 0x7f0a07c9
+    const v0, 0x7f0a079a
 
     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, 0x7f0a07c8
+    const v0, 0x7f0a0799
 
     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, 0x7f0a027a
+    const v0, 0x7f0a0279
 
     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 68b0d1975d..c737fa2dd3 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, 0x7f0d01d6
+    const v0, 0x7f0d01cc
 
     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, 0x7f0a07cc
+    const v0, 0x7f0a079d
 
     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, 0x7f0a07cb
+    const v0, 0x7f0a079c
 
     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, 0x7f0a027a
+    const v0, 0x7f0a0279
 
     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;->CS:Ljava/util/List;
+    iget-object p1, p1, Lcom/discord/views/DigitVerificationView;->CV: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 94716dd7cb..4ccc64bd64 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, 0x7f121324
+    const v3, 0x7f121297
 
     const/4 v4, 0x2
 
@@ -259,27 +259,10 @@
     throw p1
 .end method
 
-.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
+.method public final configureUi(Lcom/discord/widgets/user/presence/ModelRichPresence;Lcom/discord/utilities/streams/StreamContext;ZLcom/discord/models/domain/ModelUser;)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 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-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
 
     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 b9472ef61e..3fcd484148 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;Lcom/discord/app/AppPermissions;Lkotlin/jvm/functions/Function0;)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;)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 788547494d..5540f88e4e 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;Lcom/discord/app/AppPermissions;Lkotlin/jvm/functions/Function0;)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;)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 79d65187ae..b8fd07b7f3 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;Lcom/discord/app/AppPermissions;Lkotlin/jvm/functions/Function0;)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;)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 c7c109a511..8f9a4c07e3 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;Lcom/discord/app/AppPermissions;Lkotlin/jvm/functions/Function0;)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;)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 96f780441f..744041ef21 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, 0x7f0a0585
+    const v0, 0x7f0a056c
 
     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, 0x7f0a0586
+    const v0, 0x7f0a056d
 
     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, 0x7f0a0588
+    const v0, 0x7f0a056f
 
     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, 0x7f0a0584
+    const v0, 0x7f0a056b
 
     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, 0x7f0a0583
+    const v0, 0x7f0a056a
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -94,35 +94,18 @@
 
 
 # virtual methods
-.method public final configureUi(Lcom/discord/widgets/user/presence/ModelRichPresence;Lcom/discord/utilities/streams/StreamContext;ZLcom/discord/models/domain/ModelUser;Lcom/discord/app/AppPermissions;Lkotlin/jvm/functions/Function0;)V
-    .locals 9
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lcom/discord/widgets/user/presence/ModelRichPresence;",
-            "Lcom/discord/utilities/streams/StreamContext;",
-            "Z",
-            "Lcom/discord/models/domain/ModelUser;",
-            "Lcom/discord/app/AppPermissions;",
-            "Lkotlin/jvm/functions/Function0<",
-            "Lkotlin/Unit;",
-            ">;)V"
-        }
-    .end annotation
-
-    const-string p6, "appPermissions"
-
-    invoke-static {p5, p6}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+.method public final configureUi(Lcom/discord/widgets/user/presence/ModelRichPresence;Lcom/discord/utilities/streams/StreamContext;ZLcom/discord/models/domain/ModelUser;)V
+    .locals 11
 
     invoke-virtual {p0}, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->disposeTimer()V
 
-    iget-object p5, p0, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->containerView:Landroid/view/View;
+    iget-object v0, p0, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->containerView:Landroid/view/View;
 
-    invoke-virtual {p5}, Landroid/view/View;->getContext()Landroid/content/Context;
+    invoke-virtual {v0}, Landroid/view/View;->getContext()Landroid/content/Context;
 
-    move-result-object p5
+    move-result-object v0
 
-    const/4 p6, 0x0
+    const/4 v1, 0x0
 
     if-eqz p1, :cond_0
 
@@ -133,304 +116,304 @@
     goto :goto_0
 
     :cond_0
-    move-object p1, p6
+    move-object p1, v1
 
     :goto_0
     if-eqz p1, :cond_7
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelPresence$Activity;->isRichPresence()Z
 
-    move-result v0
+    move-result v2
 
-    if-nez v0, :cond_1
+    if-nez v2, :cond_1
 
     goto/16 :goto_4
 
     :cond_1
-    iget-object v0, p0, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->containerView:Landroid/view/View;
+    iget-object v2, p0, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->containerView:Landroid/view/View;
 
-    const/4 v1, 0x0
+    const/4 v3, 0x0
 
-    invoke-virtual {v0, v1}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {v2, v3}, Landroid/view/View;->setVisibility(I)V
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelPresence$Activity;->getName()Ljava/lang/String;
 
-    move-result-object v0
+    move-result-object v2
 
-    const/4 v2, 0x1
+    const/4 v4, 0x1
 
-    const-string v3, "spotify"
+    const-string v5, "spotify"
 
-    invoke-static {v0, v3, v2}, Lkotlin/text/l;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+    invoke-static {v2, v5, v4}, Lkotlin/text/l;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
 
-    move-result v0
+    move-result v2
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelPresence$Activity;->getState()Ljava/lang/String;
 
-    move-result-object v3
+    move-result-object v5
 
-    if-eqz v3, :cond_2
+    if-eqz v5, :cond_2
 
-    const/16 v4, 0x3b
+    const/16 v6, 0x3b
 
-    const/16 v5, 0x2c
-
-    const/4 v6, 0x0
-
-    const/4 v7, 0x4
+    const/16 v7, 0x2c
 
     const/4 v8, 0x0
 
-    invoke-static/range {v3 .. v8}, Lkotlin/text/l;->replace$default(Ljava/lang/String;CCZILjava/lang/Object;)Ljava/lang/String;
+    const/4 v9, 0x4
 
-    move-result-object v3
+    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
 
     goto :goto_1
 
     :cond_2
-    move-object v3, p6
+    move-object v5, v1
 
     :goto_1
     invoke-virtual {p0}, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->getHeaderTv()Landroid/widget/TextView;
 
-    move-result-object v4
+    move-result-object v6
 
-    const-string v5, "headerTv"
+    const-string v7, "headerTv"
 
-    invoke-static {v4, 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
 
     invoke-virtual {p0}, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->getHeaderTv()Landroid/widget/TextView;
 
-    move-result-object v6
+    move-result-object v8
 
-    invoke-static {v6, v5}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v8, v7}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v6}, Landroid/widget/TextView;->getContext()Landroid/content/Context;
+    invoke-virtual {v8}, Landroid/widget/TextView;->getContext()Landroid/content/Context;
 
-    move-result-object v5
+    move-result-object v7
 
-    const-string v6, "headerTv.context"
+    const-string v8, "headerTv.context"
 
-    invoke-static {v5, v6}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v7, v8}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v5, p1}, Lcom/discord/utilities/presence/PresenceUtils;->getActivityHeader(Landroid/content/Context;Lcom/discord/models/domain/ModelPresence$Activity;)Ljava/lang/CharSequence;
+    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 v5
+    move-result-object v7
 
-    invoke-virtual {v4, v5}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+    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 v4
+    move-result-object v6
 
-    const-string v5, "smallIv"
+    const-string v7, "smallIv"
 
-    invoke-static {v4, 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 v4, Landroid/view/View;
+    check-cast v6, Landroid/view/View;
 
-    const/4 v5, 0x2
+    const/4 v7, 0x2
 
-    invoke-static {v4, v1, v1, v5, p6}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
+    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 v4
+    move-result-object v6
 
-    const-string v6, "titleTv"
+    const-string v8, "titleTv"
 
-    invoke-static {v4, v6}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    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, 0x7f121291
+
+    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;
+
+    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"
+
+    invoke-static {v5, v6}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const v6, 0x7f121290
+
+    new-array v8, v4, [Ljava/lang/Object;
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelPresence$Activity;->getAssets()Lcom/discord/models/domain/ModelPresence$Assets;
+
+    move-result-object v9
+
+    if-eqz v9, :cond_3
+
+    invoke-virtual {v9}, Lcom/discord/models/domain/ModelPresence$Assets;->getLargeText()Ljava/lang/String;
+
+    move-result-object v9
+
+    goto :goto_2
+
+    :cond_3
+    move-object v9, v1
+
+    :goto_2
+    aput-object v9, v8, v3
+
+    invoke-virtual {v0, v6, v8}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+
     move-result-object v6
 
     check-cast v6, Ljava/lang/CharSequence;
 
-    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-static {v5, v6}, 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 v3
+    move-result-object v5
 
-    const-string v4, "textContainer"
+    const-string v6, "textContainer"
 
-    invoke-static {v3, v4}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v5, v6}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v3, v2}, Landroid/view/View;->setSelected(Z)V
+    invoke-virtual {v5, v4}, 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 v3, "playButton"
+    const-string v5, "playButton"
 
-    invoke-static {p2, v3}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v5}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {p2, v0, v1, v5, p6}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
+    invoke-static {p2, v2, v3, v7, v1}, 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 v4, "musicSuperBar"
+    const-string v6, "musicSuperBar"
 
-    invoke-static {p2, v4}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v6}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p2, Landroid/view/View;
 
-    invoke-static {p2, v0, v1, v5, p6}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
+    invoke-static {p2, v2, v3, v7, v1}, 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 v4, "musicDuration"
+    const-string v6, "musicDuration"
 
-    invoke-static {p2, v4}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v6}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p2, Landroid/view/View;
 
-    invoke-static {p2, v0, v1, v5, p6}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
+    invoke-static {p2, v2, v3, v7, v1}, 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 v4, "musicElapsed"
+    const-string v6, "musicElapsed"
 
-    invoke-static {p2, v4}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v6}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p2, Landroid/view/View;
 
-    invoke-static {p2, v0, v1, v5, p6}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
+    invoke-static {p2, v2, v3, v7, v1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
 
     const-string p2, "playButtonText"
 
     if-eqz p3, :cond_4
 
-    iget-object p6, p0, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->playButtonText:Landroid/widget/TextView;
+    iget-object v1, p0, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->playButtonText:Landroid/widget/TextView;
 
-    invoke-static {p6, p2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, p2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const p2, 0x7f121304
+    const p2, 0x7f121277
 
-    invoke-virtual {p5, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+    invoke-virtual {v0, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
     move-result-object p2
 
     check-cast p2, Ljava/lang/CharSequence;
 
-    invoke-virtual {p6, p2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+    invoke-virtual {v1, 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, v3}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v5}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {p2, v1}, Landroid/view/View;->setEnabled(Z)V
+    invoke-virtual {p2, v3}, Landroid/view/View;->setEnabled(Z)V
 
     goto :goto_3
 
     :cond_4
-    iget-object p6, p0, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->playButtonText:Landroid/widget/TextView;
+    iget-object v1, p0, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->playButtonText:Landroid/widget/TextView;
 
-    invoke-static {p6, p2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, p2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const p2, 0x7f121321
+    const p2, 0x7f121294
 
-    new-array v0, v2, [Ljava/lang/Object;
+    new-array v2, v4, [Ljava/lang/Object;
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelPresence$Activity;->getName()Ljava/lang/String;
 
-    move-result-object v4
+    move-result-object v6
 
-    if-nez v4, :cond_5
+    if-nez v6, :cond_5
 
-    const/16 v4, 0x3f
+    const/16 v6, 0x3f
 
-    invoke-static {v4}, Ljava/lang/Character;->valueOf(C)Ljava/lang/Character;
+    invoke-static {v6}, Ljava/lang/Character;->valueOf(C)Ljava/lang/Character;
 
-    move-result-object v4
+    move-result-object v6
 
     :cond_5
-    aput-object v4, v0, v1
+    aput-object v6, v2, v3
 
-    invoke-virtual {p5, p2, v0}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {v0, p2, v2}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object p2
 
     check-cast p2, Ljava/lang/CharSequence;
 
-    invoke-virtual {p6, p2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+    invoke-virtual {v1, 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, v3}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v5}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {p2, v2}, Landroid/view/View;->setEnabled(Z)V
+    invoke-virtual {p2, v4}, Landroid/view/View;->setEnabled(Z)V
 
     :goto_3
     sget-object p2, Lcom/discord/utilities/integrations/SpotifyHelper;->INSTANCE:Lcom/discord/utilities/integrations/SpotifyHelper;
 
-    const-string p6, "context"
+    const-string v1, "context"
 
-    invoke-static {p5, p6}, 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 {p2, p5}, Lcom/discord/utilities/integrations/SpotifyHelper;->isSpotifyInstalled(Landroid/content/Context;)Z
+    invoke-virtual {p2, v0}, Lcom/discord/utilities/integrations/SpotifyHelper;->isSpotifyInstalled(Landroid/content/Context;)Z
 
     move-result p2
 
@@ -440,35 +423,35 @@
 
     move-result-object p2
 
-    new-instance p5, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$1;
+    new-instance v0, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$1;
 
-    invoke-direct {p5, p1}, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$1;-><init>(Lcom/discord/models/domain/ModelPresence$Activity;)V
+    invoke-direct {v0, p1}, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$1;-><init>(Lcom/discord/models/domain/ModelPresence$Activity;)V
 
-    check-cast p5, Landroid/view/View$OnClickListener;
+    check-cast v0, Landroid/view/View$OnClickListener;
 
-    invoke-virtual {p2, p5}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {p2, v0}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     iget-object p2, p0, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->playButton:Landroid/view/View;
 
-    new-instance p5, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$2;
+    new-instance v0, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$2;
 
-    invoke-direct {p5, p1}, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$2;-><init>(Lcom/discord/models/domain/ModelPresence$Activity;)V
+    invoke-direct {v0, p1}, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$2;-><init>(Lcom/discord/models/domain/ModelPresence$Activity;)V
 
-    check-cast p5, Landroid/view/View$OnClickListener;
+    check-cast v0, Landroid/view/View$OnClickListener;
 
-    invoke-virtual {p2, p5}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {p2, v0}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     invoke-virtual {p0}, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->getLargeIv()Lcom/facebook/drawee/view/SimpleDraweeView;
 
     move-result-object p2
 
-    new-instance p5, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$3;
+    new-instance v0, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$3;
 
-    invoke-direct {p5, p1, p4, p3}, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$3;-><init>(Lcom/discord/models/domain/ModelPresence$Activity;Lcom/discord/models/domain/ModelUser;Z)V
+    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
 
-    check-cast p5, Landroid/view/View$OnClickListener;
+    check-cast v0, Landroid/view/View$OnClickListener;
 
-    invoke-virtual {p2, p5}, Lcom/facebook/drawee/view/SimpleDraweeView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {p2, v0}, 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 3f27166503..d59b5bbe09 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;Lcom/discord/app/AppPermissions;Lkotlin/jvm/functions/Function0;)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;)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 38b744af78..0bbca557e1 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;Lcom/discord/app/AppPermissions;Lkotlin/jvm/functions/Function0;)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;)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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 48c485c29a..e71b1ac3f3 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;Lcom/discord/app/AppPermissions;Lkotlin/jvm/functions/Function0;)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;)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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 4d2459da5c..d45ec25db0 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;Lcom/discord/app/AppPermissions;Lkotlin/jvm/functions/Function0;)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;)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 68ad9776d2..14a17342b3 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, 0x7f0a0585
+    const v0, 0x7f0a056c
 
     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, 0x7f0a0586
+    const v0, 0x7f0a056d
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -237,25 +237,8 @@
 
 
 # virtual methods
-.method public final configureUi(Lcom/discord/widgets/user/presence/ModelRichPresence;Lcom/discord/utilities/streams/StreamContext;ZLcom/discord/models/domain/ModelUser;Lcom/discord/app/AppPermissions;Lkotlin/jvm/functions/Function0;)V
-    .locals 9
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lcom/discord/widgets/user/presence/ModelRichPresence;",
-            "Lcom/discord/utilities/streams/StreamContext;",
-            "Z",
-            "Lcom/discord/models/domain/ModelUser;",
-            "Lcom/discord/app/AppPermissions;",
-            "Lkotlin/jvm/functions/Function0<",
-            "Lkotlin/Unit;",
-            ">;)V"
-        }
-    .end annotation
-
-    const-string p3, "appPermissions"
-
-    invoke-static {p5, p3}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+.method public final configureUi(Lcom/discord/widgets/user/presence/ModelRichPresence;Lcom/discord/utilities/streams/StreamContext;ZLcom/discord/models/domain/ModelUser;)V
+    .locals 10
 
     invoke-virtual {p0}, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence;->disposeSubscriptions()V
 
@@ -277,97 +260,97 @@
 
     invoke-virtual {p4}, Lcom/discord/models/domain/ModelPresence$Activity;->isGamePlatform()Z
 
-    move-result p5
+    move-result v0
 
-    if-nez p5, :cond_1
+    if-nez v0, :cond_1
 
     goto/16 :goto_3
 
     :cond_1
-    iget-object p5, p0, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence;->containerView:Landroid/view/View;
+    iget-object v0, p0, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence;->containerView:Landroid/view/View;
 
-    const/4 p6, 0x0
+    const/4 v1, 0x0
 
-    invoke-virtual {p5, p6}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {v0, v1}, Landroid/view/View;->setVisibility(I)V
 
     invoke-virtual {p4}, Lcom/discord/models/domain/ModelPresence$Activity;->isXboxActivity()Z
 
-    move-result p5
+    move-result v0
 
-    if-eqz p5, :cond_2
+    if-eqz v0, :cond_2
 
-    sget-object p5, Lcom/discord/utilities/platform/Platform;->XBOX:Lcom/discord/utilities/platform/Platform;
+    sget-object v0, Lcom/discord/utilities/platform/Platform;->XBOX:Lcom/discord/utilities/platform/Platform;
 
     goto :goto_1
 
     :cond_2
-    sget-object p5, Lcom/discord/utilities/platform/Platform;->Companion:Lcom/discord/utilities/platform/Platform$Companion;
+    sget-object v0, Lcom/discord/utilities/platform/Platform;->Companion:Lcom/discord/utilities/platform/Platform$Companion;
 
     invoke-virtual {p4}, Lcom/discord/models/domain/ModelPresence$Activity;->getPlatform()Ljava/lang/String;
 
-    move-result-object v0
+    move-result-object v2
 
-    if-nez v0, :cond_3
+    if-nez v2, :cond_3
 
-    const-string v0, ""
+    const-string v2, ""
 
     :cond_3
-    invoke-virtual {p5, v0}, Lcom/discord/utilities/platform/Platform$Companion;->from(Ljava/lang/String;)Lcom/discord/utilities/platform/Platform;
+    invoke-virtual {v0, v2}, Lcom/discord/utilities/platform/Platform$Companion;->from(Ljava/lang/String;)Lcom/discord/utilities/platform/Platform;
 
-    move-result-object p5
+    move-result-object v0
 
     :goto_1
     invoke-virtual {p0}, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence;->getHeaderTv()Landroid/widget/TextView;
 
-    move-result-object v0
+    move-result-object v2
 
-    const-string v1, "headerTv"
+    const-string v3, "headerTv"
 
-    invoke-static {v0, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, 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 v2
+    move-result-object v4
 
-    invoke-static {v2, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v3}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v2}, Landroid/widget/TextView;->getContext()Landroid/content/Context;
+    invoke-virtual {v4}, Landroid/widget/TextView;->getContext()Landroid/content/Context;
 
-    move-result-object v1
+    move-result-object v3
 
-    const-string v2, "headerTv.context"
+    const-string v4, "headerTv.context"
 
-    invoke-static {v1, v2}, 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-static {v1, p4}, Lcom/discord/utilities/presence/PresenceUtils;->getActivityHeader(Landroid/content/Context;Lcom/discord/models/domain/ModelPresence$Activity;)Ljava/lang/CharSequence;
+    invoke-static {v3, p4}, Lcom/discord/utilities/presence/PresenceUtils;->getActivityHeader(Landroid/content/Context;Lcom/discord/models/domain/ModelPresence$Activity;)Ljava/lang/CharSequence;
 
-    move-result-object v1
+    move-result-object v3
 
-    invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+    invoke-virtual {v2, v3}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     invoke-virtual {p0}, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence;->getTitleTv()Landroid/widget/TextView;
 
-    move-result-object v0
+    move-result-object v2
 
-    const-string v1, "titleTv"
+    const-string v3, "titleTv"
 
-    invoke-static {v0, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, 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 v1
+    move-result-object v3
 
-    check-cast v1, Ljava/lang/CharSequence;
+    check-cast v3, Ljava/lang/CharSequence;
 
-    invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+    invoke-virtual {v2, v3}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     invoke-virtual {p0}, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence;->getTimeTv()Landroid/widget/TextView;
 
-    move-result-object v0
+    move-result-object v2
 
-    const-string v1, "timeTv"
+    const-string v3, "timeTv"
 
-    invoke-static {v0, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v3}, 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;
 
@@ -385,33 +368,33 @@
     move-object p4, p3
 
     :goto_2
-    invoke-static {v0, p4}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy(Landroid/widget/TextView;Ljava/lang/CharSequence;)V
+    invoke-static {v2, p4}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy(Landroid/widget/TextView;Ljava/lang/CharSequence;)V
 
     invoke-virtual {p0}, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence;->getTextContainer()Landroid/view/View;
 
     move-result-object p4
 
-    const-string v0, "textContainer"
+    const-string v2, "textContainer"
 
-    invoke-static {p4, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p4, v2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/4 v0, 0x1
+    const/4 v2, 0x1
 
-    invoke-virtual {p4, v0}, Landroid/view/View;->setSelected(Z)V
+    invoke-virtual {p4, v2}, Landroid/view/View;->setSelected(Z)V
 
     iget-object p4, p0, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence;->connectButton:Landroid/view/View;
 
-    const-string v1, "connectButton"
+    const-string v3, "connectButton"
 
-    invoke-static {p4, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p4, v3}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {p5}, Lcom/discord/utilities/platform/Platform;->getEnabled()Z
+    invoke-virtual {v0}, Lcom/discord/utilities/platform/Platform;->getEnabled()Z
 
-    move-result v1
+    move-result v3
 
-    const/4 v2, 0x2
+    const/4 v4, 0x2
 
-    invoke-static {p4, v1, p6, v2, p3}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
+    invoke-static {p4, v3, v1, v4, p3}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
 
     iget-object p3, p0, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence;->connectButtonText:Landroid/widget/TextView;
 
@@ -425,17 +408,17 @@
 
     move-result-object p4
 
-    const v1, 0x7f121308
+    const v3, 0x7f12127b
 
-    new-array v0, v0, [Ljava/lang/Object;
+    new-array v2, v2, [Ljava/lang/Object;
 
-    invoke-virtual {p5}, Lcom/discord/utilities/platform/Platform;->getProperName()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/discord/utilities/platform/Platform;->getProperName()Ljava/lang/String;
 
-    move-result-object v2
+    move-result-object v4
 
-    aput-object v2, v0, p6
+    aput-object v4, v2, v1
 
-    invoke-virtual {p4, v1, v0}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {p4, v3, v2}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object p4
 
@@ -443,7 +426,7 @@
 
     invoke-virtual {p3, p4}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    invoke-virtual {p5}, Lcom/discord/utilities/platform/Platform;->getEnabled()Z
+    invoke-virtual {v0}, Lcom/discord/utilities/platform/Platform;->getEnabled()Z
 
     move-result p3
 
@@ -461,7 +444,7 @@
 
     new-instance p4, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$1;
 
-    invoke-direct {p4, p5}, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$1;-><init>(Lcom/discord/utilities/platform/Platform;)V
+    invoke-direct {p4, v0}, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$1;-><init>(Lcom/discord/utilities/platform/Platform;)V
 
     check-cast p4, Lrx/functions/b;
 
@@ -469,7 +452,7 @@
 
     move-result-object p3
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object p4
 
@@ -483,13 +466,13 @@
 
     invoke-static {p3}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui(Lrx/Observable;)Lrx/Observable;
 
-    move-result-object v0
+    move-result-object v1
 
     invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
-    move-result-object v1
+    move-result-object v2
 
-    const/4 v2, 0x0
+    const/4 v3, 0x0
 
     new-instance p3, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$2;
 
@@ -497,40 +480,40 @@
 
     invoke-direct {p3, p4}, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$2;-><init>(Lrx/subscriptions/CompositeSubscription;)V
 
-    move-object v3, p3
+    move-object v4, p3
 
-    check-cast v3, Lkotlin/jvm/functions/Function1;
-
-    const/4 v4, 0x0
+    check-cast v4, Lkotlin/jvm/functions/Function1;
 
     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 v6, p3
+    move-object v7, p3
 
-    check-cast v6, Lkotlin/jvm/functions/Function1;
+    check-cast v7, Lkotlin/jvm/functions/Function1;
 
-    const/16 v7, 0x1a
+    const/16 v8, 0x1a
 
-    const/4 v8, 0x0
+    const/4 v9, 0x0
 
-    invoke-static/range {v0 .. v8}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
+    invoke-static/range {v1 .. v9}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     iget-object p3, p0, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence;->connectButton:Landroid/view/View;
 
     new-instance p4, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$4;
 
-    invoke-direct {p4, p5}, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$4;-><init>(Lcom/discord/utilities/platform/Platform;)V
+    invoke-direct {p4, v0}, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$4;-><init>(Lcom/discord/utilities/platform/Platform;)V
 
     check-cast p4, Landroid/view/View$OnClickListener;
 
     invoke-virtual {p3, p4}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     :cond_5
-    invoke-direct {p0, p5, p1, p2}, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence;->configureImages(Lcom/discord/utilities/platform/Platform;Lcom/discord/widgets/user/presence/ModelRichPresence;Lcom/discord/utilities/streams/StreamContext;)V
+    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
 
     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
deleted file mode 100644
index 4bbf776d81..0000000000
--- a/com.discord/smali/com/discord/widgets/user/presence/ViewHolderStreamRichPresence$configureWatchButton$1$1.smali
+++ /dev/null
@@ -1,112 +0,0 @@
-.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
deleted file mode 100644
index f2e6ebd1b4..0000000000
--- a/com.discord/smali/com/discord/widgets/user/presence/ViewHolderStreamRichPresence$configureWatchButton$1.smali
+++ /dev/null
@@ -1,74 +0,0 @@
-.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 cf6e07eb20..e8f22d632f 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, 0x7f121189
+    const v0, 0x7f1210ff
 
     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 43df43c8d9..db09ee9724 100644
--- a/com.discord/smali/com/discord/widgets/user/presence/ViewHolderStreamRichPresence.smali
+++ b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderStreamRichPresence.smali
@@ -25,8 +25,6 @@
 
 .field private final streamPreviewPlaceholderTv:Landroid/widget/TextView;
 
-.field private final watchStreamButton:Landroid/view/View;
-
 
 # direct methods
 .method public constructor <init>(Landroid/view/View;)V
@@ -44,7 +42,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;->containerView:Landroid/view/View;
 
-    const v0, 0x7f0a0752
+    const v0, 0x7f0a072a
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -54,7 +52,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;->containerView:Landroid/view/View;
 
-    const v0, 0x7f0a0753
+    const v0, 0x7f0a072b
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -66,7 +64,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;->containerView:Landroid/view/View;
 
-    const v0, 0x7f0a0751
+    const v0, 0x7f0a0729
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -76,20 +74,6 @@
 
     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
@@ -99,14 +83,6 @@
     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
 
@@ -149,7 +125,7 @@
 
     if-eqz v1, :cond_1
 
-    const v0, 0x7f121324
+    const v0, 0x7f121297
 
     const/4 v2, 0x2
 
@@ -259,7 +235,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const p2, 0x7f12118b
+    const p2, 0x7f121101
 
     invoke-virtual {p0, p2}, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;->getString(I)Ljava/lang/String;
 
@@ -269,7 +245,7 @@
 
     invoke-virtual {p1, p2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     goto :goto_0
 
@@ -286,7 +262,7 @@
 
     if-eqz p2, :cond_1
 
-    invoke-static {}, Lcom/facebook/drawee/backends/pipeline/c;->gQ()Lcom/facebook/drawee/backends/pipeline/e;
+    invoke-static {}, Lcom/facebook/drawee/backends/pipeline/c;->gO()Lcom/facebook/drawee/backends/pipeline/e;
 
     move-result-object p2
 
@@ -300,7 +276,7 @@
 
     move-result-object v0
 
-    iput-object v0, p2, Lcom/facebook/drawee/controller/a;->Mk:Lcom/facebook/drawee/d/a;
+    iput-object v0, p2, Lcom/facebook/drawee/controller/a;->Mg:Lcom/facebook/drawee/d/a;
 
     check-cast p2, Lcom/facebook/drawee/backends/pipeline/e;
 
@@ -316,11 +292,11 @@
 
     check-cast p2, Lcom/facebook/drawee/controller/ControllerListener;
 
-    iput-object p2, p1, Lcom/facebook/drawee/controller/a;->LP:Lcom/facebook/drawee/controller/ControllerListener;
+    iput-object p2, p1, Lcom/facebook/drawee/controller/a;->LL:Lcom/facebook/drawee/controller/ControllerListener;
 
     check-cast p1, Lcom/facebook/drawee/backends/pipeline/e;
 
-    invoke-virtual {p1}, Lcom/facebook/drawee/backends/pipeline/e;->hr()Lcom/facebook/drawee/controller/AbstractDraweeController;
+    invoke-virtual {p1}, Lcom/facebook/drawee/backends/pipeline/e;->hp()Lcom/facebook/drawee/controller/AbstractDraweeController;
 
     move-result-object p1
 
@@ -336,7 +312,7 @@
 
     invoke-virtual {p1, p2}, Lcom/facebook/drawee/view/SimpleDraweeView;->setController(Lcom/facebook/drawee/d/a;)V
 
-    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     goto :goto_0
 
@@ -345,7 +321,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const p2, 0x7f121189
+    const p2, 0x7f1210ff
 
     invoke-virtual {p0, p2}, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;->getString(I)Ljava/lang/String;
 
@@ -355,7 +331,7 @@
 
     invoke-virtual {p1, p2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     :goto_0
     invoke-virtual {p1}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
@@ -419,7 +395,7 @@
 
     if-eqz v1, :cond_0
 
-    const v5, 0x7f121313
+    const v5, 0x7f121286
 
     new-array v6, v3, [Ljava/lang/Object;
 
@@ -568,54 +544,3 @@
 
     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 14db6a36bd..f86aa84bbc 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, 0x7f0d01dd
+    const v3, 0x7f0d01d2
 
     if-eq p2, v1, :cond_3
 
@@ -81,7 +81,7 @@
     :cond_0
     new-instance p2, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;
 
-    const v1, 0x7f0d01c5
+    const v1, 0x7f0d01bd
 
     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, 0x7f0d015f
+    const v1, 0x7f0d015d
 
     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, 0x7f0d0155
+    const v1, 0x7f0d0153
 
     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 105b68fe86..c1665db4ab 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 ec3495c70a..dad3eb24fb 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 5f00937773..df39c41d03 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, 0x7f0a0581
+    const p2, 0x7f0a0568
 
     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, 0x7f0a0582
+    const p2, 0x7f0a0569
 
     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, 0x7f0a0580
+    const p2, 0x7f0a0567
 
     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, 0x7f0a058a
+    const p2, 0x7f0a0571
 
     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, 0x7f0a057f
+    const p2, 0x7f0a0566
 
     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, 0x7f0a0589
+    const p2, 0x7f0a0570
 
     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, 0x7f0a0587
+    const p2, 0x7f0a056e
 
     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, 0x7f0a057e
+    const p2, 0x7f0a0565
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -205,46 +205,6 @@
     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
 
@@ -473,7 +433,7 @@
 
     if-eqz v2, :cond_1
 
-    const v3, 0x7f121324
+    const v3, 0x7f121297
 
     const/4 v4, 0x2
 
@@ -662,51 +622,8 @@
     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;)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
+.method public configureUi(Lcom/discord/widgets/user/presence/ModelRichPresence;Lcom/discord/utilities/streams/StreamContext;ZLcom/discord/models/domain/ModelUser;)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
 
@@ -753,8 +670,6 @@
 
     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
@@ -864,26 +779,6 @@
     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
 
@@ -936,7 +831,7 @@
 
     move-result-wide v8
 
-    const p1, 0x7f121326
+    const p1, 0x7f121299
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->getString(I)Ljava/lang/String;
 
@@ -967,7 +862,7 @@
 
     move-result-wide v8
 
-    const p1, 0x7f121328
+    const p1, 0x7f12129b
 
     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/-$$Lambda$CAZX9HinCfGUrxKDysE1a1e8gPI.smali b/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$CAZX9HinCfGUrxKDysE1a1e8gPI.smali
deleted file mode 100644
index f3f0907254..0000000000
--- a/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$CAZX9HinCfGUrxKDysE1a1e8gPI.smali
+++ /dev/null
@@ -1,36 +0,0 @@
-.class public final synthetic Lcom/discord/widgets/user/profile/-$$Lambda$CAZX9HinCfGUrxKDysE1a1e8gPI;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Lrx/functions/Action1;
-
-
-# instance fields
-.field private final synthetic f$0:Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;
-
-
-# direct methods
-.method public synthetic constructor <init>(Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lcom/discord/widgets/user/profile/-$$Lambda$CAZX9HinCfGUrxKDysE1a1e8gPI;->f$0:Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final call(Ljava/lang/Object;)V
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/widgets/user/profile/-$$Lambda$CAZX9HinCfGUrxKDysE1a1e8gPI;->f$0:Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;
-
-    check-cast p1, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;
-
-    invoke-virtual {v0, p1}, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;->configureUI(Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$EALePXrH4Vsc8bQ9cxT3iStUZBY.smali b/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$EALePXrH4Vsc8bQ9cxT3iStUZBY.smali
deleted file mode 100644
index b58e5e9005..0000000000
--- a/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$EALePXrH4Vsc8bQ9cxT3iStUZBY.smali
+++ /dev/null
@@ -1,54 +0,0 @@
-.class public final synthetic Lcom/discord/widgets/user/profile/-$$Lambda$EALePXrH4Vsc8bQ9cxT3iStUZBY;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Lrx/functions/Func3;
-
-
-# static fields
-.field public static final synthetic INSTANCE:Lcom/discord/widgets/user/profile/-$$Lambda$EALePXrH4Vsc8bQ9cxT3iStUZBY;
-
-
-# direct methods
-.method static synthetic constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lcom/discord/widgets/user/profile/-$$Lambda$EALePXrH4Vsc8bQ9cxT3iStUZBY;
-
-    invoke-direct {v0}, Lcom/discord/widgets/user/profile/-$$Lambda$EALePXrH4Vsc8bQ9cxT3iStUZBY;-><init>()V
-
-    sput-object v0, Lcom/discord/widgets/user/profile/-$$Lambda$EALePXrH4Vsc8bQ9cxT3iStUZBY;->INSTANCE:Lcom/discord/widgets/user/profile/-$$Lambda$EALePXrH4Vsc8bQ9cxT3iStUZBY;
-
-    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;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Ljava/lang/Long;
-
-    check-cast p2, Lcom/discord/models/domain/ModelUser;
-
-    check-cast p3, Ljava/lang/Integer;
-
-    invoke-virtual {p3}, Ljava/lang/Integer;->intValue()I
-
-    move-result p3
-
-    invoke-static {p1, p2, p3}, Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;->create(Ljava/lang/Long;Lcom/discord/models/domain/ModelUser;I)Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;
-
-    move-result-object p1
-
-    return-object p1
-.end method
diff --git a/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$EU4h8UETsUFV1Oz2KCLmnQoxeO4.smali b/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$EU4h8UETsUFV1Oz2KCLmnQoxeO4.smali
deleted file mode 100644
index 45c2fd924e..0000000000
--- a/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$EU4h8UETsUFV1Oz2KCLmnQoxeO4.smali
+++ /dev/null
@@ -1,50 +0,0 @@
-.class public final synthetic Lcom/discord/widgets/user/profile/-$$Lambda$EU4h8UETsUFV1Oz2KCLmnQoxeO4;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Lrx/functions/b;
-
-
-# static fields
-.field public static final synthetic INSTANCE:Lcom/discord/widgets/user/profile/-$$Lambda$EU4h8UETsUFV1Oz2KCLmnQoxeO4;
-
-
-# direct methods
-.method static synthetic constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lcom/discord/widgets/user/profile/-$$Lambda$EU4h8UETsUFV1Oz2KCLmnQoxeO4;
-
-    invoke-direct {v0}, Lcom/discord/widgets/user/profile/-$$Lambda$EU4h8UETsUFV1Oz2KCLmnQoxeO4;-><init>()V
-
-    sput-object v0, Lcom/discord/widgets/user/profile/-$$Lambda$EU4h8UETsUFV1Oz2KCLmnQoxeO4;->INSTANCE:Lcom/discord/widgets/user/profile/-$$Lambda$EU4h8UETsUFV1Oz2KCLmnQoxeO4;
-
-    return-void
-.end method
-
-.method private synthetic constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final call(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Ljava/lang/Integer;
-
-    invoke-static {p1}, Lcom/discord/models/domain/ModelUserRelationship;->getType(Ljava/lang/Integer;)I
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object p1
-
-    return-object p1
-.end method
diff --git a/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$G3X6iZzo5xG5qTSUIIkOEt___S4.smali b/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$G3X6iZzo5xG5qTSUIIkOEt___S4.smali
deleted file mode 100644
index 1a301b4162..0000000000
--- a/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$G3X6iZzo5xG5qTSUIIkOEt___S4.smali
+++ /dev/null
@@ -1,46 +0,0 @@
-.class public final synthetic Lcom/discord/widgets/user/profile/-$$Lambda$G3X6iZzo5xG5qTSUIIkOEt___S4;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function0;
-
-
-# static fields
-.field public static final synthetic INSTANCE:Lcom/discord/widgets/user/profile/-$$Lambda$G3X6iZzo5xG5qTSUIIkOEt___S4;
-
-
-# direct methods
-.method static synthetic constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lcom/discord/widgets/user/profile/-$$Lambda$G3X6iZzo5xG5qTSUIIkOEt___S4;
-
-    invoke-direct {v0}, Lcom/discord/widgets/user/profile/-$$Lambda$G3X6iZzo5xG5qTSUIIkOEt___S4;-><init>()V
-
-    sput-object v0, Lcom/discord/widgets/user/profile/-$$Lambda$G3X6iZzo5xG5qTSUIIkOEt___S4;->INSTANCE:Lcom/discord/widgets/user/profile/-$$Lambda$G3X6iZzo5xG5qTSUIIkOEt___S4;
-
-    return-void
-.end method
-
-.method private synthetic constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final invoke()Ljava/lang/Object;
-    .locals 1
-
-    new-instance v0, Lcom/discord/widgets/user/WidgetUserMutualGuilds;
-
-    invoke-direct {v0}, Lcom/discord/widgets/user/WidgetUserMutualGuilds;-><init>()V
-
-    check-cast v0, Landroidx/fragment/app/Fragment;
-
-    return-object v0
-.end method
diff --git a/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$GzAIln3JcMVDfWOQhKd9ANBXlzY.smali b/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$GzAIln3JcMVDfWOQhKd9ANBXlzY.smali
deleted file mode 100644
index 2e1037a0a0..0000000000
--- a/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$GzAIln3JcMVDfWOQhKd9ANBXlzY.smali
+++ /dev/null
@@ -1,66 +0,0 @@
-.class public final synthetic Lcom/discord/widgets/user/profile/-$$Lambda$GzAIln3JcMVDfWOQhKd9ANBXlzY;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Lrx/functions/Func5;
-
-
-# static fields
-.field public static final synthetic INSTANCE:Lcom/discord/widgets/user/profile/-$$Lambda$GzAIln3JcMVDfWOQhKd9ANBXlzY;
-
-
-# direct methods
-.method static synthetic constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lcom/discord/widgets/user/profile/-$$Lambda$GzAIln3JcMVDfWOQhKd9ANBXlzY;
-
-    invoke-direct {v0}, Lcom/discord/widgets/user/profile/-$$Lambda$GzAIln3JcMVDfWOQhKd9ANBXlzY;-><init>()V
-
-    sput-object v0, Lcom/discord/widgets/user/profile/-$$Lambda$GzAIln3JcMVDfWOQhKd9ANBXlzY;->INSTANCE:Lcom/discord/widgets/user/profile/-$$Lambda$GzAIln3JcMVDfWOQhKd9ANBXlzY;
-
-    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;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 6
-
-    move-object v0, p1
-
-    check-cast v0, Lcom/discord/models/domain/ModelUserProfile;
-
-    move-object v1, p2
-
-    check-cast v1, Ljava/lang/String;
-
-    move-object v2, p3
-
-    check-cast v2, Lcom/discord/widgets/user/presence/ModelRichPresence;
-
-    check-cast p4, Ljava/lang/Long;
-
-    invoke-virtual {p4}, Ljava/lang/Long;->longValue()J
-
-    move-result-wide v3
-
-    move-object v5, p5
-
-    check-cast v5, Lcom/discord/utilities/streams/StreamContext;
-
-    invoke-static/range {v0 .. v5}, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->create(Lcom/discord/models/domain/ModelUserProfile;Ljava/lang/String;Lcom/discord/widgets/user/presence/ModelRichPresence;JLcom/discord/utilities/streams/StreamContext;)Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;
-
-    move-result-object p1
-
-    return-object p1
-.end method
diff --git a/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$4bLFCE2gs1cmT5D_n5dCwFN-k2w.smali b/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$4bLFCE2gs1cmT5D_n5dCwFN-k2w.smali
deleted file mode 100644
index d4aca46c75..0000000000
--- a/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$4bLFCE2gs1cmT5D_n5dCwFN-k2w.smali
+++ /dev/null
@@ -1,40 +0,0 @@
-.class public final synthetic Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$4bLFCE2gs1cmT5D_n5dCwFN-k2w;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Landroid/view/View$OnClickListener;
-
-
-# instance fields
-.field private final synthetic f$0:Lcom/discord/widgets/user/profile/WidgetUserProfile;
-
-.field private final synthetic f$1:Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;
-
-
-# direct methods
-.method public synthetic constructor <init>(Lcom/discord/widgets/user/profile/WidgetUserProfile;Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$4bLFCE2gs1cmT5D_n5dCwFN-k2w;->f$0:Lcom/discord/widgets/user/profile/WidgetUserProfile;
-
-    iput-object p2, p0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$4bLFCE2gs1cmT5D_n5dCwFN-k2w;->f$1:Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final onClick(Landroid/view/View;)V
-    .locals 2
-
-    iget-object v0, p0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$4bLFCE2gs1cmT5D_n5dCwFN-k2w;->f$0:Lcom/discord/widgets/user/profile/WidgetUserProfile;
-
-    iget-object v1, p0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$4bLFCE2gs1cmT5D_n5dCwFN-k2w;->f$1:Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;
-
-    invoke-virtual {v0, v1, p1}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->lambda$configureActionButtons$8$WidgetUserProfile(Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;Landroid/view/View;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$4bi2BckCgGWsAR6-gHs_SqmEJx8.smali b/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$4bi2BckCgGWsAR6-gHs_SqmEJx8.smali
deleted file mode 100644
index 427ca9ac38..0000000000
--- a/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$4bi2BckCgGWsAR6-gHs_SqmEJx8.smali
+++ /dev/null
@@ -1,40 +0,0 @@
-.class public final synthetic Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$4bi2BckCgGWsAR6-gHs_SqmEJx8;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Landroid/view/View$OnClickListener;
-
-
-# instance fields
-.field private final synthetic f$0:Lcom/discord/widgets/user/profile/WidgetUserProfile;
-
-.field private final synthetic f$1:Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;
-
-
-# direct methods
-.method public synthetic constructor <init>(Lcom/discord/widgets/user/profile/WidgetUserProfile;Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$4bi2BckCgGWsAR6-gHs_SqmEJx8;->f$0:Lcom/discord/widgets/user/profile/WidgetUserProfile;
-
-    iput-object p2, p0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$4bi2BckCgGWsAR6-gHs_SqmEJx8;->f$1:Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final onClick(Landroid/view/View;)V
-    .locals 2
-
-    iget-object v0, p0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$4bi2BckCgGWsAR6-gHs_SqmEJx8;->f$0:Lcom/discord/widgets/user/profile/WidgetUserProfile;
-
-    iget-object v1, p0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$4bi2BckCgGWsAR6-gHs_SqmEJx8;->f$1:Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;
-
-    invoke-virtual {v0, v1, p1}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->lambda$configureUI$3$WidgetUserProfile(Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;Landroid/view/View;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$GtbM47vb98D8_7kqF7P6FT9Rod0.smali b/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$GtbM47vb98D8_7kqF7P6FT9Rod0.smali
deleted file mode 100644
index 308c7953d4..0000000000
--- a/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$GtbM47vb98D8_7kqF7P6FT9Rod0.smali
+++ /dev/null
@@ -1,34 +0,0 @@
-.class public final synthetic Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$GtbM47vb98D8_7kqF7P6FT9Rod0;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Landroid/view/View$OnClickListener;
-
-
-# instance fields
-.field private final synthetic f$0:Lcom/discord/widgets/user/profile/WidgetUserProfile;
-
-
-# direct methods
-.method public synthetic constructor <init>(Lcom/discord/widgets/user/profile/WidgetUserProfile;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$GtbM47vb98D8_7kqF7P6FT9Rod0;->f$0:Lcom/discord/widgets/user/profile/WidgetUserProfile;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final onClick(Landroid/view/View;)V
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$GtbM47vb98D8_7kqF7P6FT9Rod0;->f$0:Lcom/discord/widgets/user/profile/WidgetUserProfile;
-
-    invoke-virtual {v0, p1}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->lambda$configureActionButtons$6$WidgetUserProfile(Landroid/view/View;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$HAwjp9JHT84pYjyb7ykVT-mTGzI.smali b/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$HAwjp9JHT84pYjyb7ykVT-mTGzI.smali
deleted file mode 100644
index a768d1ce3a..0000000000
--- a/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$HAwjp9JHT84pYjyb7ykVT-mTGzI.smali
+++ /dev/null
@@ -1,46 +0,0 @@
-.class public final synthetic Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$HAwjp9JHT84pYjyb7ykVT-mTGzI;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Lrx/functions/Action2;
-
-
-# static fields
-.field public static final synthetic INSTANCE:Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$HAwjp9JHT84pYjyb7ykVT-mTGzI;
-
-
-# direct methods
-.method static synthetic constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$HAwjp9JHT84pYjyb7ykVT-mTGzI;
-
-    invoke-direct {v0}, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$HAwjp9JHT84pYjyb7ykVT-mTGzI;-><init>()V
-
-    sput-object v0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$HAwjp9JHT84pYjyb7ykVT-mTGzI;->INSTANCE:Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$HAwjp9JHT84pYjyb7ykVT-mTGzI;
-
-    return-void
-.end method
-
-.method private synthetic constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final call(Ljava/lang/Object;Ljava/lang/Object;)V
-    .locals 0
-
-    check-cast p1, Landroid/view/MenuItem;
-
-    check-cast p2, Landroid/content/Context;
-
-    invoke-static {p1, p2}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->lambda$onViewBound$0(Landroid/view/MenuItem;Landroid/content/Context;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$Jcdn3PnYbHJIKOwI6Mt8j4MecI8.smali b/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$Jcdn3PnYbHJIKOwI6Mt8j4MecI8.smali
deleted file mode 100644
index ff4bcb7d0c..0000000000
--- a/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$Jcdn3PnYbHJIKOwI6Mt8j4MecI8.smali
+++ /dev/null
@@ -1,34 +0,0 @@
-.class public final synthetic Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$Jcdn3PnYbHJIKOwI6Mt8j4MecI8;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Landroid/view/View$OnClickListener;
-
-
-# instance fields
-.field private final synthetic f$0:Lcom/discord/widgets/user/profile/WidgetUserProfile;
-
-
-# direct methods
-.method public synthetic constructor <init>(Lcom/discord/widgets/user/profile/WidgetUserProfile;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$Jcdn3PnYbHJIKOwI6Mt8j4MecI8;->f$0:Lcom/discord/widgets/user/profile/WidgetUserProfile;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final onClick(Landroid/view/View;)V
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$Jcdn3PnYbHJIKOwI6Mt8j4MecI8;->f$0:Lcom/discord/widgets/user/profile/WidgetUserProfile;
-
-    invoke-virtual {v0, p1}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->lambda$configureActionButtons$10$WidgetUserProfile(Landroid/view/View;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$Model$PmxSeZU_OF5vtYMpAwo1eBXEaBQ.smali b/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$Model$PmxSeZU_OF5vtYMpAwo1eBXEaBQ.smali
deleted file mode 100644
index 64427a5778..0000000000
--- a/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$Model$PmxSeZU_OF5vtYMpAwo1eBXEaBQ.smali
+++ /dev/null
@@ -1,46 +0,0 @@
-.class public final synthetic Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$Model$PmxSeZU_OF5vtYMpAwo1eBXEaBQ;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function1;
-
-
-# static fields
-.field public static final synthetic INSTANCE:Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$Model$PmxSeZU_OF5vtYMpAwo1eBXEaBQ;
-
-
-# direct methods
-.method static synthetic constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$Model$PmxSeZU_OF5vtYMpAwo1eBXEaBQ;
-
-    invoke-direct {v0}, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$Model$PmxSeZU_OF5vtYMpAwo1eBXEaBQ;-><init>()V
-
-    sput-object v0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$Model$PmxSeZU_OF5vtYMpAwo1eBXEaBQ;->INSTANCE:Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$Model$PmxSeZU_OF5vtYMpAwo1eBXEaBQ;
-
-    return-void
-.end method
-
-.method private synthetic constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 0
-
-    check-cast p1, Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;
-
-    invoke-static {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;->lambda$get$0(Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;)Ljava/lang/Boolean;
-
-    move-result-object p1
-
-    return-object p1
-.end method
diff --git a/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$_uoeQ5BGVjBEDi7OI14CbePnIWI.smali b/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$_uoeQ5BGVjBEDi7OI14CbePnIWI.smali
deleted file mode 100644
index c0880612cd..0000000000
--- a/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$_uoeQ5BGVjBEDi7OI14CbePnIWI.smali
+++ /dev/null
@@ -1,34 +0,0 @@
-.class public final synthetic Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$_uoeQ5BGVjBEDi7OI14CbePnIWI;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Landroid/view/View$OnClickListener;
-
-
-# instance fields
-.field private final synthetic f$0:Lcom/discord/widgets/user/profile/WidgetUserProfile;
-
-
-# direct methods
-.method public synthetic constructor <init>(Lcom/discord/widgets/user/profile/WidgetUserProfile;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$_uoeQ5BGVjBEDi7OI14CbePnIWI;->f$0:Lcom/discord/widgets/user/profile/WidgetUserProfile;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final onClick(Landroid/view/View;)V
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$_uoeQ5BGVjBEDi7OI14CbePnIWI;->f$0:Lcom/discord/widgets/user/profile/WidgetUserProfile;
-
-    invoke-virtual {v0, p1}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->lambda$configureActionButtons$9$WidgetUserProfile(Landroid/view/View;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$_vPT0_FNIPkvGR-sUtQdsuQ4CHQ.smali b/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$_vPT0_FNIPkvGR-sUtQdsuQ4CHQ.smali
deleted file mode 100644
index deddc827c7..0000000000
--- a/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$_vPT0_FNIPkvGR-sUtQdsuQ4CHQ.smali
+++ /dev/null
@@ -1,36 +0,0 @@
-.class public final synthetic Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$_vPT0_FNIPkvGR-sUtQdsuQ4CHQ;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Lrx/functions/Action1;
-
-
-# instance fields
-.field private final synthetic f$0:Lcom/discord/widgets/user/profile/WidgetUserProfile;
-
-
-# direct methods
-.method public synthetic constructor <init>(Lcom/discord/widgets/user/profile/WidgetUserProfile;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$_vPT0_FNIPkvGR-sUtQdsuQ4CHQ;->f$0:Lcom/discord/widgets/user/profile/WidgetUserProfile;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final call(Ljava/lang/Object;)V
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$_vPT0_FNIPkvGR-sUtQdsuQ4CHQ;->f$0:Lcom/discord/widgets/user/profile/WidgetUserProfile;
-
-    check-cast p1, Landroid/view/Menu;
-
-    invoke-virtual {v0, p1}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->lambda$configureUI$2$WidgetUserProfile(Landroid/view/Menu;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$brFGHcmQNy7YYo8339oI7w2xtVU.smali b/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$brFGHcmQNy7YYo8339oI7w2xtVU.smali
deleted file mode 100644
index b707447aa0..0000000000
--- a/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$brFGHcmQNy7YYo8339oI7w2xtVU.smali
+++ /dev/null
@@ -1,42 +0,0 @@
-.class public final synthetic Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$brFGHcmQNy7YYo8339oI7w2xtVU;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Lrx/functions/Action1;
-
-
-# instance fields
-.field private final synthetic f$0:Lcom/discord/widgets/user/profile/WidgetUserProfile;
-
-.field private final synthetic f$1:I
-
-
-# direct methods
-.method public synthetic constructor <init>(Lcom/discord/widgets/user/profile/WidgetUserProfile;I)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$brFGHcmQNy7YYo8339oI7w2xtVU;->f$0:Lcom/discord/widgets/user/profile/WidgetUserProfile;
-
-    iput p2, p0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$brFGHcmQNy7YYo8339oI7w2xtVU;->f$1:I
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final call(Ljava/lang/Object;)V
-    .locals 2
-
-    iget-object v0, p0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$brFGHcmQNy7YYo8339oI7w2xtVU;->f$0:Lcom/discord/widgets/user/profile/WidgetUserProfile;
-
-    iget v1, p0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$brFGHcmQNy7YYo8339oI7w2xtVU;->f$1:I
-
-    check-cast p1, Ljava/lang/Void;
-
-    invoke-virtual {v0, v1, p1}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->lambda$addRelationship$5$WidgetUserProfile(ILjava/lang/Void;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$hHhsPA-4_vC3fndRZ6imlHYxghg.smali b/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$hHhsPA-4_vC3fndRZ6imlHYxghg.smali
deleted file mode 100644
index e2d767f64d..0000000000
--- a/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$hHhsPA-4_vC3fndRZ6imlHYxghg.smali
+++ /dev/null
@@ -1,36 +0,0 @@
-.class public final synthetic Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$hHhsPA-4_vC3fndRZ6imlHYxghg;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Lrx/functions/Action1;
-
-
-# instance fields
-.field private final synthetic f$0:Lcom/discord/widgets/user/profile/WidgetUserProfile;
-
-
-# direct methods
-.method public synthetic constructor <init>(Lcom/discord/widgets/user/profile/WidgetUserProfile;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$hHhsPA-4_vC3fndRZ6imlHYxghg;->f$0:Lcom/discord/widgets/user/profile/WidgetUserProfile;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final call(Ljava/lang/Object;)V
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$hHhsPA-4_vC3fndRZ6imlHYxghg;->f$0:Lcom/discord/widgets/user/profile/WidgetUserProfile;
-
-    check-cast p1, Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;
-
-    invoke-static {v0, p1}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->lambda$hHhsPA-4_vC3fndRZ6imlHYxghg(Lcom/discord/widgets/user/profile/WidgetUserProfile;Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$jdsK9_ibibEFXAkF5xkWCaaguRI.smali b/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$jdsK9_ibibEFXAkF5xkWCaaguRI.smali
deleted file mode 100644
index 5f86d19aee..0000000000
--- a/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$jdsK9_ibibEFXAkF5xkWCaaguRI.smali
+++ /dev/null
@@ -1,42 +0,0 @@
-.class public final synthetic Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$jdsK9_ibibEFXAkF5xkWCaaguRI;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Lrx/functions/Action1;
-
-
-# instance fields
-.field private final synthetic f$0:Lcom/discord/widgets/user/profile/WidgetUserProfile;
-
-.field private final synthetic f$1:I
-
-
-# direct methods
-.method public synthetic constructor <init>(Lcom/discord/widgets/user/profile/WidgetUserProfile;I)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$jdsK9_ibibEFXAkF5xkWCaaguRI;->f$0:Lcom/discord/widgets/user/profile/WidgetUserProfile;
-
-    iput p2, p0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$jdsK9_ibibEFXAkF5xkWCaaguRI;->f$1:I
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final call(Ljava/lang/Object;)V
-    .locals 2
-
-    iget-object v0, p0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$jdsK9_ibibEFXAkF5xkWCaaguRI;->f$0:Lcom/discord/widgets/user/profile/WidgetUserProfile;
-
-    iget v1, p0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$jdsK9_ibibEFXAkF5xkWCaaguRI;->f$1:I
-
-    check-cast p1, Ljava/lang/Void;
-
-    invoke-virtual {v0, v1, p1}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->lambda$removeRelationship$4$WidgetUserProfile(ILjava/lang/Void;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$k2NACIWmwSumvwPo2dWszzRPznc.smali b/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$k2NACIWmwSumvwPo2dWszzRPznc.smali
deleted file mode 100644
index 54bf75cd1a..0000000000
--- a/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$k2NACIWmwSumvwPo2dWszzRPznc.smali
+++ /dev/null
@@ -1,44 +0,0 @@
-.class public final synthetic Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$k2NACIWmwSumvwPo2dWszzRPznc;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Lrx/functions/Action2;
-
-
-# instance fields
-.field private final synthetic f$0:Lcom/discord/widgets/user/profile/WidgetUserProfile;
-
-.field private final synthetic f$1:Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;
-
-
-# direct methods
-.method public synthetic constructor <init>(Lcom/discord/widgets/user/profile/WidgetUserProfile;Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$k2NACIWmwSumvwPo2dWszzRPznc;->f$0:Lcom/discord/widgets/user/profile/WidgetUserProfile;
-
-    iput-object p2, p0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$k2NACIWmwSumvwPo2dWszzRPznc;->f$1:Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final call(Ljava/lang/Object;Ljava/lang/Object;)V
-    .locals 2
-
-    iget-object v0, p0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$k2NACIWmwSumvwPo2dWszzRPznc;->f$0:Lcom/discord/widgets/user/profile/WidgetUserProfile;
-
-    iget-object v1, p0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$k2NACIWmwSumvwPo2dWszzRPznc;->f$1:Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;
-
-    check-cast p1, Landroid/view/MenuItem;
-
-    check-cast p2, Landroid/content/Context;
-
-    invoke-virtual {v0, v1, p1, p2}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->lambda$configureUI$1$WidgetUserProfile(Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;Landroid/view/MenuItem;Landroid/content/Context;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$w99BB3Pu45_EnXg_yDu3vxEqGB8.smali b/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$w99BB3Pu45_EnXg_yDu3vxEqGB8.smali
deleted file mode 100644
index c1e0e022bb..0000000000
--- a/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$w99BB3Pu45_EnXg_yDu3vxEqGB8.smali
+++ /dev/null
@@ -1,38 +0,0 @@
-.class public final synthetic Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$w99BB3Pu45_EnXg_yDu3vxEqGB8;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function1;
-
-
-# instance fields
-.field private final synthetic f$0:Lcom/discord/widgets/user/profile/WidgetUserProfile;
-
-
-# direct methods
-.method public synthetic constructor <init>(Lcom/discord/widgets/user/profile/WidgetUserProfile;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$w99BB3Pu45_EnXg_yDu3vxEqGB8;->f$0:Lcom/discord/widgets/user/profile/WidgetUserProfile;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$w99BB3Pu45_EnXg_yDu3vxEqGB8;->f$0:Lcom/discord/widgets/user/profile/WidgetUserProfile;
-
-    check-cast p1, Ljava/lang/Integer;
-
-    invoke-virtual {v0, p1}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->lambda$null$7$WidgetUserProfile(Ljava/lang/Integer;)Lkotlin/Unit;
-
-    move-result-object p1
-
-    return-object p1
-.end method
diff --git a/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfileInfo$3-bgq3Q5Blc2Cp1QlK2yV6hUyno.smali b/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfileInfo$3-bgq3Q5Blc2Cp1QlK2yV6hUyno.smali
deleted file mode 100644
index 9f83835f6f..0000000000
--- a/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfileInfo$3-bgq3Q5Blc2Cp1QlK2yV6hUyno.smali
+++ /dev/null
@@ -1,40 +0,0 @@
-.class public final synthetic Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfileInfo$3-bgq3Q5Blc2Cp1QlK2yV6hUyno;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Landroid/view/View$OnFocusChangeListener;
-
-
-# instance fields
-.field private final synthetic f$0:Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;
-
-.field private final synthetic f$1:Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;
-
-
-# direct methods
-.method public synthetic constructor <init>(Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfileInfo$3-bgq3Q5Blc2Cp1QlK2yV6hUyno;->f$0:Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;
-
-    iput-object p2, p0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfileInfo$3-bgq3Q5Blc2Cp1QlK2yV6hUyno;->f$1:Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final onFocusChange(Landroid/view/View;Z)V
-    .locals 2
-
-    iget-object v0, p0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfileInfo$3-bgq3Q5Blc2Cp1QlK2yV6hUyno;->f$0:Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;
-
-    iget-object v1, p0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfileInfo$3-bgq3Q5Blc2Cp1QlK2yV6hUyno;->f$1:Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;
-
-    invoke-virtual {v0, v1, p1, p2}, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;->lambda$configureUI$0$WidgetUserProfileInfo(Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;Landroid/view/View;Z)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfileInfo$Adapter$ViewHolder$IAy00oijo6WZvUTumj9BxiKaqMI.smali b/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfileInfo$Adapter$ViewHolder$IAy00oijo6WZvUTumj9BxiKaqMI.smali
deleted file mode 100644
index 728fd8cdbc..0000000000
--- a/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$WidgetUserProfileInfo$Adapter$ViewHolder$IAy00oijo6WZvUTumj9BxiKaqMI.smali
+++ /dev/null
@@ -1,48 +0,0 @@
-.class public final synthetic Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfileInfo$Adapter$ViewHolder$IAy00oijo6WZvUTumj9BxiKaqMI;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Lrx/functions/Action3;
-
-
-# static fields
-.field public static final synthetic INSTANCE:Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfileInfo$Adapter$ViewHolder$IAy00oijo6WZvUTumj9BxiKaqMI;
-
-
-# direct methods
-.method static synthetic constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfileInfo$Adapter$ViewHolder$IAy00oijo6WZvUTumj9BxiKaqMI;
-
-    invoke-direct {v0}, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfileInfo$Adapter$ViewHolder$IAy00oijo6WZvUTumj9BxiKaqMI;-><init>()V
-
-    sput-object v0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfileInfo$Adapter$ViewHolder$IAy00oijo6WZvUTumj9BxiKaqMI;->INSTANCE:Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfileInfo$Adapter$ViewHolder$IAy00oijo6WZvUTumj9BxiKaqMI;
-
-    return-void
-.end method
-
-.method private synthetic constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V
-    .locals 0
-
-    check-cast p1, Landroid/view/View;
-
-    check-cast p2, Ljava/lang/Integer;
-
-    check-cast p3, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model$Item;
-
-    invoke-static {p1, p2, p3}, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter$ViewHolder;->lambda$new$0(Landroid/view/View;Ljava/lang/Integer;Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model$Item;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$q1ld3SATWirrLqu5yxT-BvgGuzI.smali b/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$q1ld3SATWirrLqu5yxT-BvgGuzI.smali
deleted file mode 100644
index 9f61e8724c..0000000000
--- a/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$q1ld3SATWirrLqu5yxT-BvgGuzI.smali
+++ /dev/null
@@ -1,46 +0,0 @@
-.class public final synthetic Lcom/discord/widgets/user/profile/-$$Lambda$q1ld3SATWirrLqu5yxT-BvgGuzI;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function0;
-
-
-# static fields
-.field public static final synthetic INSTANCE:Lcom/discord/widgets/user/profile/-$$Lambda$q1ld3SATWirrLqu5yxT-BvgGuzI;
-
-
-# direct methods
-.method static synthetic constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lcom/discord/widgets/user/profile/-$$Lambda$q1ld3SATWirrLqu5yxT-BvgGuzI;
-
-    invoke-direct {v0}, Lcom/discord/widgets/user/profile/-$$Lambda$q1ld3SATWirrLqu5yxT-BvgGuzI;-><init>()V
-
-    sput-object v0, Lcom/discord/widgets/user/profile/-$$Lambda$q1ld3SATWirrLqu5yxT-BvgGuzI;->INSTANCE:Lcom/discord/widgets/user/profile/-$$Lambda$q1ld3SATWirrLqu5yxT-BvgGuzI;
-
-    return-void
-.end method
-
-.method private synthetic constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final invoke()Ljava/lang/Object;
-    .locals 1
-
-    new-instance v0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;
-
-    invoke-direct {v0}, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;-><init>()V
-
-    check-cast v0, Landroidx/fragment/app/Fragment;
-
-    return-object v0
-.end method
diff --git a/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$zaBZWlDaOm5GfqQPvapRkaebLyg.smali b/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$zaBZWlDaOm5GfqQPvapRkaebLyg.smali
deleted file mode 100644
index 0e67b1cb9f..0000000000
--- a/com.discord/smali/com/discord/widgets/user/profile/-$$Lambda$zaBZWlDaOm5GfqQPvapRkaebLyg.smali
+++ /dev/null
@@ -1,46 +0,0 @@
-.class public final synthetic Lcom/discord/widgets/user/profile/-$$Lambda$zaBZWlDaOm5GfqQPvapRkaebLyg;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function0;
-
-
-# static fields
-.field public static final synthetic INSTANCE:Lcom/discord/widgets/user/profile/-$$Lambda$zaBZWlDaOm5GfqQPvapRkaebLyg;
-
-
-# direct methods
-.method static synthetic constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lcom/discord/widgets/user/profile/-$$Lambda$zaBZWlDaOm5GfqQPvapRkaebLyg;
-
-    invoke-direct {v0}, Lcom/discord/widgets/user/profile/-$$Lambda$zaBZWlDaOm5GfqQPvapRkaebLyg;-><init>()V
-
-    sput-object v0, Lcom/discord/widgets/user/profile/-$$Lambda$zaBZWlDaOm5GfqQPvapRkaebLyg;->INSTANCE:Lcom/discord/widgets/user/profile/-$$Lambda$zaBZWlDaOm5GfqQPvapRkaebLyg;
-
-    return-void
-.end method
-
-.method private synthetic constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final invoke()Ljava/lang/Object;
-    .locals 1
-
-    new-instance v0, Lcom/discord/widgets/user/WidgetUserMutualFriends;
-
-    invoke-direct {v0}, Lcom/discord/widgets/user/WidgetUserMutualFriends;-><init>()V
-
-    check-cast v0, Landroidx/fragment/app/Fragment;
-
-    return-object v0
-.end method
diff --git a/com.discord/smali/com/discord/widgets/user/profile/UserAvatarPresenceView.smali b/com.discord/smali/com/discord/widgets/user/profile/UserAvatarPresenceView.smali
index 9428d23066..e9107212ba 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, 0x7f0a07ab
+    const v0, 0x7f0a0783
 
     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, 0x7f0a07ae
+    const v0, 0x7f0a0786
 
     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, 0x7f0a07ad
+    const v0, 0x7f0a0785
 
     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, 0x7f0d00b3
+    const v1, 0x7f0d00b1
 
     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, 0x7f0402bc
+    const v0, 0x7f0402bb
 
     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 ba8f95a9c5..ca3d22af1b 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, 0x7f0a07dc
+    const p2, 0x7f0a07ad
 
     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, 0x7f0a07dd
+    const p2, 0x7f0a07ae
 
     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, 0x7f0a07db
+    const p2, 0x7f0a07ac
 
     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, 0x7f0a07e0
+    const p2, 0x7f0a07b1
 
     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, 0x7f0a07de
+    const p2, 0x7f0a07af
 
     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, 0x7f0a07df
+    const p2, 0x7f0a07b0
 
     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, 0x7f0d006c
+    const v0, 0x7f0d006b
 
     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, 0x7f120fba
+    const v0, 0x7f120f2e
 
     goto :goto_0
 
     :cond_0
-    const v0, 0x7f120b1f
+    const v0, 0x7f120ae9
 
     :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, 0x7f0802fd
+    const v1, 0x7f0802f1
 
-    const v6, 0x7f0802fd
+    const v6, 0x7f0802f1
 
     goto :goto_1
 
     :cond_1
-    const v1, 0x7f080300
+    const v1, 0x7f0802f4
 
-    const v6, 0x7f080300
+    const v6, 0x7f0802f4
 
     :goto_1
     if-eqz v0, :cond_2
 
-    const v0, 0x7f1210e0
+    const v0, 0x7f121054
 
     goto :goto_2
 
     :cond_2
-    const v0, 0x7f1210d2
+    const v0, 0x7f121046
 
     :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, 0x7f0802ba
+    const v1, 0x7f0802ae
 
-    const v6, 0x7f0802ba
+    const v6, 0x7f0802ae
 
     goto :goto_3
 
     :cond_3
-    const v1, 0x7f0802c0
+    const v1, 0x7f0802b4
 
-    const v6, 0x7f0802c0
+    const v6, 0x7f0802b4
 
     :goto_3
     if-eqz v0, :cond_4
 
-    const v0, 0x7f1210df
+    const v0, 0x7f121053
 
     goto :goto_4
 
     :cond_4
-    const v0, 0x7f1210c7
+    const v0, 0x7f12103b
 
     :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$ConnectedAccountsAdapter$onConnectedAccountClick$1.smali b/com.discord/smali/com/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountsAdapter$onConnectedAccountClick$1.smali
index 4159fd21b8..b97d82cb36 100644
--- 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
@@ -73,7 +73,7 @@
 
     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;
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object p1
 .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
index e6f5c346a0..10661b3f7a 100644
--- a/com.discord/smali/com/discord/widgets/user/profile/UserProfileConnectionsView$ViewState.smali
+++ b/com.discord/smali/com/discord/widgets/user/profile/UserProfileConnectionsView$ViewState.smali
@@ -25,13 +25,17 @@
     .end annotation
 .end field
 
+.field private final showConnectionsSection:Z
+
+.field private final showMutualGuildsAndFriends:Z
+
 
 # direct methods
-.method public constructor <init>(Ljava/util/List;)V
+.method public constructor <init>(ZZLjava/util/List;)V
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "(",
+            "(ZZ",
             "Ljava/util/List<",
             "Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountItem;",
             ">;)V"
@@ -40,26 +44,44 @@
 
     const-string v0, "connectedAccountItems"
 
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    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/widgets/user/profile/UserProfileConnectionsView$ViewState;->connectedAccountItems:Ljava/util/List;
+    iput-boolean p1, p0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;->showConnectionsSection:Z
+
+    iput-boolean p2, p0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;->showMutualGuildsAndFriends:Z
+
+    iput-object p3, 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;
+.method public static synthetic copy$default(Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;ZZLjava/util/List;ILjava/lang/Object;)Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;
     .locals 0
 
-    and-int/lit8 p2, p2, 0x1
+    and-int/lit8 p5, p4, 0x1
 
-    if-eqz p2, :cond_0
+    if-eqz p5, :cond_0
 
-    iget-object p1, p0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;->connectedAccountItems:Ljava/util/List;
+    iget-boolean p1, p0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;->showConnectionsSection:Z
 
     :cond_0
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;->copy(Ljava/util/List;)Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;
+    and-int/lit8 p5, p4, 0x2
+
+    if-eqz p5, :cond_1
+
+    iget-boolean p2, p0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;->showMutualGuildsAndFriends:Z
+
+    :cond_1
+    and-int/lit8 p4, p4, 0x4
+
+    if-eqz p4, :cond_2
+
+    iget-object p3, p0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;->connectedAccountItems:Ljava/util/List;
+
+    :cond_2
+    invoke-virtual {p0, p1, p2, p3}, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;->copy(ZZLjava/util/List;)Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;
 
     move-result-object p0
 
@@ -68,7 +90,23 @@
 
 
 # virtual methods
-.method public final component1()Ljava/util/List;
+.method public final component1()Z
+    .locals 1
+
+    iget-boolean v0, p0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;->showConnectionsSection:Z
+
+    return v0
+.end method
+
+.method public final component2()Z
+    .locals 1
+
+    iget-boolean v0, p0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;->showMutualGuildsAndFriends:Z
+
+    return v0
+.end method
+
+.method public final component3()Ljava/util/List;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -84,11 +122,11 @@
     return-object v0
 .end method
 
-.method public final copy(Ljava/util/List;)Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;
+.method public final copy(ZZLjava/util/List;)Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "(",
+            "(ZZ",
             "Ljava/util/List<",
             "Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountItem;",
             ">;)",
@@ -98,48 +136,80 @@
 
     const-string v0, "connectedAccountItems"
 
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p3, 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
+    invoke-direct {v0, p1, p2, p3}, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;-><init>(ZZLjava/util/List;)V
 
     return-object v0
 .end method
 
 .method public final equals(Ljava/lang/Object;)Z
-    .locals 1
+    .locals 4
 
-    if-eq p0, p1, :cond_1
+    const/4 v0, 0x1
 
-    instance-of v0, p1, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;
+    if-eq p0, p1, :cond_3
 
-    if-eqz v0, :cond_0
+    instance-of v1, p1, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;
+
+    const/4 v2, 0x0
+
+    if-eqz v1, :cond_2
 
     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-boolean v1, p0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;->showConnectionsSection:Z
 
-    iget-object p1, p1, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;->connectedAccountItems:Ljava/util/List;
+    iget-boolean v3, p1, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;->showConnectionsSection:Z
 
-    invoke-static {v0, p1}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    if-ne v1, v3, :cond_0
 
-    move-result p1
-
-    if-eqz p1, :cond_0
+    const/4 v1, 0x1
 
     goto :goto_0
 
     :cond_0
-    const/4 p1, 0x0
+    const/4 v1, 0x0
 
-    return p1
+    :goto_0
+    if-eqz v1, :cond_2
+
+    iget-boolean v1, p0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;->showMutualGuildsAndFriends:Z
+
+    iget-boolean v3, p1, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;->showMutualGuildsAndFriends:Z
+
+    if-ne v1, v3, :cond_1
+
+    const/4 v1, 0x1
+
+    goto :goto_1
 
     :cond_1
-    :goto_0
-    const/4 p1, 0x1
+    const/4 v1, 0x0
 
-    return p1
+    :goto_1
+    if-eqz v1, :cond_2
+
+    iget-object v1, 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 {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 getConnectedAccountItems()Ljava/util/List;
@@ -158,21 +228,65 @@
     return-object v0
 .end method
 
-.method public final hashCode()I
+.method public final getShowConnectionsSection()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;->connectedAccountItems:Ljava/util/List;
+    iget-boolean v0, p0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;->showConnectionsSection:Z
+
+    return v0
+.end method
+
+.method public final getShowMutualGuildsAndFriends()Z
+    .locals 1
+
+    iget-boolean v0, p0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;->showMutualGuildsAndFriends:Z
+
+    return v0
+.end method
+
+.method public final hashCode()I
+    .locals 3
+
+    iget-boolean v0, p0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;->showConnectionsSection:Z
+
+    const/4 v1, 0x1
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
-
-    move-result v0
-
-    return v0
+    const/4 v0, 0x1
 
     :cond_0
-    const/4 v0, 0x0
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-boolean v2, p0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;->showMutualGuildsAndFriends:Z
+
+    if-eqz v2, :cond_1
+
+    goto :goto_0
+
+    :cond_1
+    move v1, v2
+
+    :goto_0
+    add-int/2addr v0, v1
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v1, p0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;->connectedAccountItems:Ljava/util/List;
+
+    if-eqz v1, :cond_2
+
+    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
+
+    move-result v1
+
+    goto :goto_1
+
+    :cond_2
+    const/4 v1, 0x0
+
+    :goto_1
+    add-int/2addr v0, v1
 
     return v0
 .end method
@@ -182,10 +296,26 @@
 
     new-instance v0, Ljava/lang/StringBuilder;
 
-    const-string v1, "ViewState(connectedAccountItems="
+    const-string v1, "ViewState(showConnectionsSection="
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
+    iget-boolean v1, p0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;->showConnectionsSection:Z
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
+
+    const-string v1, ", showMutualGuildsAndFriends="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-boolean v1, p0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;->showMutualGuildsAndFriends:Z
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
+
+    const-string v1, ", connectedAccountItems="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
     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;
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
index c4d0449bbb..826d42949a 100644
--- 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
@@ -63,7 +63,7 @@
 
     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;
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object p1
 .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
index c914cbd33e..058f0cedc0 100644
--- a/com.discord/smali/com/discord/widgets/user/profile/UserProfileConnectionsView.smali
+++ b/com.discord/smali/com/discord/widgets/user/profile/UserProfileConnectionsView.smali
@@ -122,7 +122,7 @@
 
     invoke-direct {p0, p1, p2}, Landroid/widget/LinearLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
-    const p2, 0x7f0a07e4
+    const p2, 0x7f0a07b5
 
     invoke-static {p0, p2}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -130,7 +130,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView;->connectedAccountsRecycler$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p2, 0x7f0a07e3
+    const p2, 0x7f0a07b4
 
     invoke-static {p0, p2}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -138,7 +138,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView;->mutualGuildsItem$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p2, 0x7f0a07e2
+    const p2, 0x7f0a07b3
 
     invoke-static {p0, p2}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -150,7 +150,7 @@
 
     check-cast p2, Landroid/view/ViewGroup;
 
-    const v0, 0x7f0d006d
+    const v0, 0x7f0d006c
 
     invoke-static {p1, v0, p2}, Landroid/widget/LinearLayout;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
@@ -329,33 +329,59 @@
     :cond_1
     invoke-virtual {p1}, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;->getConnectedAccountItems()Ljava/util/List;
 
-    move-result-object p1
+    move-result-object v0
 
-    invoke-virtual {p2, p1}, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountsAdapter;->setData(Ljava/util/List;)V
+    invoke-virtual {p2, v0}, 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
+    move-result-object p2
 
-    new-instance p2, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$updateViewState$2;
+    new-instance v0, 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
+    invoke-direct {v0, p3}, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$updateViewState$2;-><init>(Lkotlin/jvm/functions/Function0;)V
 
-    check-cast p2, Landroid/view/View$OnClickListener;
+    check-cast v0, Landroid/view/View$OnClickListener;
 
-    invoke-virtual {p1, p2}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {p2, v0}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/user/profile/UserProfileConnectionsView;->getMutualGuildsItem()Landroid/view/View;
+
+    move-result-object p2
+
+    invoke-virtual {p1}, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;->getShowMutualGuildsAndFriends()Z
+
+    move-result p3
+
+    const/4 v0, 0x0
+
+    const/4 v1, 0x2
+
+    const/4 v2, 0x0
+
+    invoke-static {p2, p3, v2, v1, v0}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/user/profile/UserProfileConnectionsView;->getMutualFriendsItem()Landroid/view/View;
 
-    move-result-object p1
+    move-result-object p2
 
-    new-instance p2, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$updateViewState$3;
+    new-instance p3, 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
+    invoke-direct {p3, p4}, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$updateViewState$3;-><init>(Lkotlin/jvm/functions/Function0;)V
 
-    check-cast p2, Landroid/view/View$OnClickListener;
+    check-cast p3, Landroid/view/View$OnClickListener;
 
-    invoke-virtual {p1, p2}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {p2, p3}, 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 p2
+
+    invoke-virtual {p1}, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;->getShowMutualGuildsAndFriends()Z
+
+    move-result p1
+
+    invoke-static {p2, p1, v2, v1, v0}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderView$1.smali b/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderView$1.smali
index 446097b026..ba7707f554 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, 0x7f0d006e
+    const v0, 0x7f0d006d
 
     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 b7fbb17aaf..857e42aad4 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, 0x7f0a07fb
+    const p1, 0x7f0a07c2
 
     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 e6ce0a3aa9..39cdb79266 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 22bf7d7a2c..5caca2819f 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderView$updateViewState$1.smali b/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderView$updateViewState$1.smali
deleted file mode 100644
index 56c05f89aa..0000000000
--- a/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderView$updateViewState$1.smali
+++ /dev/null
@@ -1,63 +0,0 @@
-.class final Lcom/discord/widgets/user/profile/UserProfileHeaderView$updateViewState$1;
-.super Ljava/lang/Object;
-.source "UserProfileHeaderView.kt"
-
-# interfaces
-.implements Landroid/view/View$OnClickListener;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/user/profile/UserProfileHeaderView;->updateViewState(Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-
-# instance fields
-.field final synthetic $user:Lcom/discord/models/domain/ModelUser;
-
-.field final synthetic this$0:Lcom/discord/widgets/user/profile/UserProfileHeaderView;
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/widgets/user/profile/UserProfileHeaderView;Lcom/discord/models/domain/ModelUser;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderView$updateViewState$1;->this$0:Lcom/discord/widgets/user/profile/UserProfileHeaderView;
-
-    iput-object p2, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderView$updateViewState$1;->$user:Lcom/discord/models/domain/ModelUser;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final onClick(Landroid/view/View;)V
-    .locals 2
-
-    iget-object p1, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderView$updateViewState$1;->this$0:Lcom/discord/widgets/user/profile/UserProfileHeaderView;
-
-    invoke-virtual {p1}, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->getOnAvatarClick()Lkotlin/jvm/functions/Function1;
-
-    move-result-object p1
-
-    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderView$updateViewState$1;->$user:Lcom/discord/models/domain/ModelUser;
-
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->getId()J
-
-    move-result-wide v0
-
-    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object v0
-
-    invoke-interface {p1, v0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderView.smali b/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderView.smali
index dec656db59..ff31436739 100644
--- a/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderView.smali
+++ b/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderView.smali
@@ -34,18 +34,6 @@
 
 .field private final customStatusTextView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-.field private onAvatarClick:Lkotlin/jvm/functions/Function1;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lkotlin/jvm/functions/Function1<",
-            "-",
-            "Ljava/lang/Long;",
-            "Lkotlin/Unit;",
-            ">;"
-        }
-    .end annotation
-.end field
-
 .field private onBadgeClick:Lkotlin/jvm/functions/Function1;
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -213,7 +201,7 @@
 
     invoke-direct {p0, p1, p2}, Landroidx/constraintlayout/widget/ConstraintLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
-    const v0, 0x7f0a07ed
+    const v0, 0x7f0a07b9
 
     invoke-static {p0, v0}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -221,7 +209,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->primaryName$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07ee
+    const v0, 0x7f0a07ba
 
     invoke-static {p0, v0}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -229,7 +217,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->secondaryName$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07eb
+    const v0, 0x7f0a07b7
 
     invoke-static {p0, v0}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -237,7 +225,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->customStatusTextView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07e1
+    const v0, 0x7f0a07b2
 
     invoke-static {p0, v0}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -245,7 +233,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->userAvatarPresenceView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07ea
+    const v0, 0x7f0a07b6
 
     invoke-static {p0, v0}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -259,17 +247,11 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->onBadgeClick:Lkotlin/jvm/functions/Function1;
 
-    sget-object v0, Lcom/discord/widgets/user/profile/UserProfileHeaderView$onAvatarClick$1;->INSTANCE:Lcom/discord/widgets/user/profile/UserProfileHeaderView$onAvatarClick$1;
-
-    check-cast v0, Lkotlin/jvm/functions/Function1;
-
-    iput-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->onAvatarClick:Lkotlin/jvm/functions/Function1;
-
     move-object v0, p0
 
     check-cast v0, Landroid/view/ViewGroup;
 
-    const v1, 0x7f0d006f
+    const v1, 0x7f0d006e
 
     invoke-static {p1, v1, v0}, Landroidx/constraintlayout/widget/ConstraintLayout;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
@@ -323,7 +305,7 @@
 
     check-cast p2, Landroid/view/View;
 
-    const v0, 0x7f0402bc
+    const v0, 0x7f0402bb
 
     invoke-static {p2, v0}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/view/View;I)I
 
@@ -433,13 +415,13 @@
 
     invoke-static {v2, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v3, 0x7f0402a2
+    const v3, 0x7f0402a1
 
     const v4, 0x7f090001
 
     const v5, 0x7f0b0013
 
-    const v6, 0x7f0402ab
+    const v6, 0x7f0402aa
 
     const v7, 0x7f090002
 
@@ -515,23 +497,6 @@
 
 
 # virtual methods
-.method public final getOnAvatarClick()Lkotlin/jvm/functions/Function1;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Lkotlin/jvm/functions/Function1<",
-            "Ljava/lang/Long;",
-            "Lkotlin/Unit;",
-            ">;"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->onAvatarClick:Lkotlin/jvm/functions/Function1;
-
-    return-object v0
-.end method
-
 .method public final getOnBadgeClick()Lkotlin/jvm/functions/Function1;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
@@ -572,28 +537,6 @@
     return-void
 .end method
 
-.method public final setOnAvatarClick(Lkotlin/jvm/functions/Function1;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lkotlin/jvm/functions/Function1<",
-            "-",
-            "Ljava/lang/Long;",
-            "Lkotlin/Unit;",
-            ">;)V"
-        }
-    .end annotation
-
-    const-string v0, "<set-?>"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    iput-object p1, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->onAvatarClick:Lkotlin/jvm/functions/Function1;
-
-    return-void
-.end method
-
 .method public final setOnBadgeClick(Lkotlin/jvm/functions/Function1;)V
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
@@ -635,18 +578,6 @@
 
     move-result-object v2
 
-    new-instance v3, Lcom/discord/widgets/user/profile/UserProfileHeaderView$updateViewState$1;
-
-    invoke-direct {v3, p0, v0}, Lcom/discord/widgets/user/profile/UserProfileHeaderView$updateViewState$1;-><init>(Lcom/discord/widgets/user/profile/UserProfileHeaderView;Lcom/discord/models/domain/ModelUser;)V
-
-    check-cast v3, Landroid/view/View$OnClickListener;
-
-    invoke-virtual {v2, v3}, Lcom/discord/widgets/user/profile/UserAvatarPresenceView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
-
-    invoke-direct {p0}, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->getUserAvatarPresenceView()Lcom/discord/widgets/user/profile/UserAvatarPresenceView;
-
-    move-result-object v2
-
     new-instance v3, Lcom/discord/widgets/user/profile/UserAvatarPresenceView$ViewState;
 
     invoke-virtual {p1}, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel$ViewState;->getUser()Lcom/discord/models/domain/ModelUser;
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 a6281b3aad..fe9bc2ea45 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 540a84b419..4469e6ad3d 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;->IS()Lrx/Observable;
+    invoke-static {}, Lrx/Observable;->IQ()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 86051e0cbe..5c5b87b2cd 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;->Kz()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kx()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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfile$1.smali b/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfile$1.smali
deleted file mode 100644
index cc71e30d6b..0000000000
--- a/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfile$1.smali
+++ /dev/null
@@ -1,61 +0,0 @@
-.class Lcom/discord/widgets/user/profile/WidgetUserProfile$1;
-.super Ljava/lang/Object;
-.source "WidgetUserProfile.java"
-
-# interfaces
-.implements Landroidx/viewpager/widget/ViewPager$OnPageChangeListener;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/user/profile/WidgetUserProfile;->onViewBound(Landroid/view/View;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x0
-    name = null
-.end annotation
-
-
-# instance fields
-.field final synthetic this$0:Lcom/discord/widgets/user/profile/WidgetUserProfile;
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/widgets/user/profile/WidgetUserProfile;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile$1;->this$0:Lcom/discord/widgets/user/profile/WidgetUserProfile;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public onPageScrollStateChanged(I)V
-    .locals 0
-
-    return-void
-.end method
-
-.method public onPageScrolled(IFI)V
-    .locals 0
-
-    return-void
-.end method
-
-.method public onPageSelected(I)V
-    .locals 1
-
-    iget-object p1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile$1;->this$0:Lcom/discord/widgets/user/profile/WidgetUserProfile;
-
-    invoke-static {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->access$000(Lcom/discord/widgets/user/profile/WidgetUserProfile;)Lcom/discord/utilities/simple_pager/SimplePager;
-
-    move-result-object v0
-
-    invoke-virtual {p1, v0}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->hideKeyboard(Landroid/view/View;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfile$Model.smali b/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfile$Model.smali
deleted file mode 100644
index a8a24c1a01..0000000000
--- a/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfile$Model.smali
+++ /dev/null
@@ -1,397 +0,0 @@
-.class Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;
-.super Ljava/lang/Object;
-.source "WidgetUserProfile.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/widgets/user/profile/WidgetUserProfile;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x8
-    name = "Model"
-.end annotation
-
-
-# instance fields
-.field private final isMe:Z
-
-.field private final relationshipType:I
-
-.field private final user:Lcom/discord/models/domain/ModelUser;
-
-
-# direct methods
-.method public constructor <init>(ZLcom/discord/models/domain/ModelUser;I)V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-boolean p1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;->isMe:Z
-
-    iput-object p2, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;->user:Lcom/discord/models/domain/ModelUser;
-
-    iput p3, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;->relationshipType:I
-
-    return-void
-.end method
-
-.method static synthetic access$100(Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;)I
-    .locals 0
-
-    iget p0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;->relationshipType:I
-
-    return p0
-.end method
-
-.method static synthetic access$200(Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;)Lcom/discord/models/domain/ModelUser;
-    .locals 0
-
-    iget-object p0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;->user:Lcom/discord/models/domain/ModelUser;
-
-    return-object p0
-.end method
-
-.method static synthetic access$300(Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;)Z
-    .locals 0
-
-    iget-boolean p0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;->isMe:Z
-
-    return p0
-.end method
-
-.method public static create(Ljava/lang/Long;Lcom/discord/models/domain/ModelUser;I)Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;
-    .locals 5
-
-    if-nez p1, :cond_0
-
-    const/4 p0, 0x0
-
-    return-object p0
-
-    :cond_0
-    new-instance v0, Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;
-
-    invoke-virtual {p0}, Ljava/lang/Long;->longValue()J
-
-    move-result-wide v1
-
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getId()J
-
-    move-result-wide v3
-
-    cmp-long p0, v1, v3
-
-    if-nez p0, :cond_1
-
-    const/4 p0, 0x1
-
-    goto :goto_0
-
-    :cond_1
-    const/4 p0, 0x0
-
-    :goto_0
-    invoke-direct {v0, p0, p1, p2}, Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;-><init>(ZLcom/discord/models/domain/ModelUser;I)V
-
-    return-object v0
-.end method
-
-.method public static get(J)Lrx/Observable;
-    .locals 4
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(J)",
-            "Lrx/Observable<",
-            "Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;",
-            ">;"
-        }
-    .end annotation
-
-    invoke-static {}, Lcom/discord/stores/StoreStream;->getUsers()Lcom/discord/stores/StoreUser;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lcom/discord/stores/StoreUser;->getMeId()Lrx/Observable;
-
-    move-result-object v0
-
-    invoke-static {}, Lcom/discord/stores/StoreStream;->getUsers()Lcom/discord/stores/StoreUser;
-
-    move-result-object v1
-
-    invoke-virtual {v1, p0, p1}, Lcom/discord/stores/StoreUser;->getUser(J)Lrx/Observable;
-
-    move-result-object v1
-
-    invoke-static {}, Lcom/discord/stores/StoreStream;->getUserRelationships()Lcom/discord/stores/StoreUserRelationships;
-
-    move-result-object v2
-
-    invoke-virtual {v2, p0, p1}, Lcom/discord/stores/StoreUserRelationships;->get(J)Lrx/Observable;
-
-    move-result-object p0
-
-    sget-object p1, Lcom/discord/widgets/user/profile/-$$Lambda$EU4h8UETsUFV1Oz2KCLmnQoxeO4;->INSTANCE:Lcom/discord/widgets/user/profile/-$$Lambda$EU4h8UETsUFV1Oz2KCLmnQoxeO4;
-
-    invoke-virtual {p0, p1}, Lrx/Observable;->e(Lrx/functions/b;)Lrx/Observable;
-
-    move-result-object p0
-
-    sget-object p1, Lcom/discord/widgets/user/profile/-$$Lambda$EALePXrH4Vsc8bQ9cxT3iStUZBY;->INSTANCE:Lcom/discord/widgets/user/profile/-$$Lambda$EALePXrH4Vsc8bQ9cxT3iStUZBY;
-
-    invoke-static {v0, v1, p0, p1}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func3;)Lrx/Observable;
-
-    move-result-object p0
-
-    sget-object p1, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$Model$PmxSeZU_OF5vtYMpAwo1eBXEaBQ;->INSTANCE:Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$Model$PmxSeZU_OF5vtYMpAwo1eBXEaBQ;
-
-    sget-object v0, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
-
-    const/4 v1, 0x0
-
-    const-wide/16 v2, 0x1388
-
-    invoke-static {p1, v1, v2, v3, v0}, Lcom/discord/app/i;->a(Lkotlin/jvm/functions/Function1;Ljava/lang/Object;JLjava/util/concurrent/TimeUnit;)Lrx/Observable$c;
-
-    move-result-object p1
-
-    invoke-virtual {p0, p1}, Lrx/Observable;->a(Lrx/Observable$c;)Lrx/Observable;
-
-    move-result-object p0
-
-    invoke-static {}, Lcom/discord/app/i;->dP()Lrx/Observable$c;
-
-    move-result-object p1
-
-    invoke-virtual {p0, p1}, Lrx/Observable;->a(Lrx/Observable$c;)Lrx/Observable;
-
-    move-result-object p0
-
-    return-object p0
-.end method
-
-.method static synthetic lambda$get$0(Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;)Ljava/lang/Boolean;
-    .locals 0
-
-    if-eqz p0, :cond_0
-
-    const/4 p0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p0, 0x0
-
-    :goto_0
-    invoke-static {p0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object p0
-
-    return-object p0
-.end method
-
-
-# virtual methods
-.method canAccept()Z
-    .locals 2
-
-    iget v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;->relationshipType:I
-
-    const/4 v1, 0x3
-
-    if-ne v0, v1, :cond_0
-
-    const/4 v0, 0x1
-
-    return v0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    return v0
-.end method
-
-.method canCancel()Z
-    .locals 2
-
-    iget v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;->relationshipType:I
-
-    const/4 v1, 0x4
-
-    if-ne v0, v1, :cond_0
-
-    const/4 v0, 0x1
-
-    return v0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    return v0
-.end method
-
-.method protected canEqual(Ljava/lang/Object;)Z
-    .locals 0
-
-    instance-of p1, p1, Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;
-
-    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/widgets/user/profile/WidgetUserProfile$Model;
-
-    const/4 v2, 0x0
-
-    if-nez v1, :cond_1
-
-    return v2
-
-    :cond_1
-    check-cast p1, Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;
-
-    invoke-virtual {p1, p0}, Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;->canEqual(Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-nez v1, :cond_2
-
-    return v2
-
-    :cond_2
-    iget-boolean v1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;->isMe:Z
-
-    iget-boolean v3, p1, Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;->isMe:Z
-
-    if-eq v1, v3, :cond_3
-
-    return v2
-
-    :cond_3
-    iget-object v1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;->user:Lcom/discord/models/domain/ModelUser;
-
-    iget-object v3, p1, Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;->user:Lcom/discord/models/domain/ModelUser;
-
-    if-nez v1, :cond_4
-
-    if-eqz v3, :cond_5
-
-    goto :goto_0
-
-    :cond_4
-    invoke-virtual {v1, v3}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-nez v1, :cond_5
-
-    :goto_0
-    return v2
-
-    :cond_5
-    iget v1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;->relationshipType:I
-
-    iget p1, p1, Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;->relationshipType:I
-
-    if-eq v1, p1, :cond_6
-
-    return v2
-
-    :cond_6
-    return v0
-.end method
-
-.method public hashCode()I
-    .locals 2
-
-    iget-boolean v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;->isMe:Z
-
-    if-eqz v0, :cond_0
-
-    const/16 v0, 0x4f
-
-    goto :goto_0
-
-    :cond_0
-    const/16 v0, 0x61
-
-    :goto_0
-    add-int/lit8 v0, v0, 0x3b
-
-    iget-object v1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;->user:Lcom/discord/models/domain/ModelUser;
-
-    mul-int/lit8 v0, v0, 0x3b
-
-    if-nez v1, :cond_1
-
-    const/16 v1, 0x2b
-
-    goto :goto_1
-
-    :cond_1
-    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
-
-    move-result v1
-
-    :goto_1
-    add-int/2addr v0, v1
-
-    mul-int/lit8 v0, v0, 0x3b
-
-    iget v1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;->relationshipType:I
-
-    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, "WidgetUserProfile.Model(isMe="
-
-    invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
-
-    iget-boolean v1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;->isMe:Z
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
-
-    const-string v1, ", user="
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-object v1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;->user:Lcom/discord/models/domain/ModelUser;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const-string v1, ", relationshipType="
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget v1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;->relationshipType:I
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    const-string v1, ")"
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
diff --git a/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfile.smali b/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfile.smali
deleted file mode 100644
index 8f3b880ee4..0000000000
--- a/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfile.smali
+++ /dev/null
@@ -1,1013 +0,0 @@
-.class public Lcom/discord/widgets/user/profile/WidgetUserProfile;
-.super Lcom/discord/app/AppFragment;
-.source "WidgetUserProfile.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;
-    }
-.end annotation
-
-
-# instance fields
-.field private friendRequestAcceptBtn:Landroid/view/View;
-
-.field private friendRequestBtn:Landroid/view/View;
-
-.field private friendRequestIgnoreBtn:Landroid/view/View;
-
-.field private friendRequestIncomingContainer:Landroid/view/View;
-
-.field private friendRequestSentBtn:Landroid/view/View;
-
-.field private sendMessageFab:Landroid/view/View;
-
-.field private tabs:Lcom/google/android/material/tabs/TabLayout;
-
-.field private userProfileHeaderView:Lcom/discord/widgets/user/profile/UserProfileHeaderView;
-
-.field private viewPager:Lcom/discord/utilities/simple_pager/SimplePager;
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
-
-    return-void
-.end method
-
-.method static synthetic access$000(Lcom/discord/widgets/user/profile/WidgetUserProfile;)Lcom/discord/utilities/simple_pager/SimplePager;
-    .locals 0
-
-    iget-object p0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile;->viewPager:Lcom/discord/utilities/simple_pager/SimplePager;
-
-    return-object p0
-.end method
-
-.method private addRelationship(Ljava/lang/Integer;I)V
-    .locals 4
-
-    invoke-static {}, Lcom/discord/utilities/rest/RestAPI;->getApi()Lcom/discord/utilities/rest/RestAPI;
-
-    move-result-object v0
-
-    invoke-direct {p0}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->getUserId()J
-
-    move-result-wide v1
-
-    const-string v3, "User Profile"
-
-    invoke-virtual {v0, v3, v1, v2, p1}, Lcom/discord/utilities/rest/RestAPI;->addRelationship(Ljava/lang/String;JLjava/lang/Integer;)Lrx/Observable;
-
-    move-result-object p1
-
-    invoke-static {p0}, Lcom/discord/app/i;->b(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
-
-    move-result-object v0
-
-    invoke-virtual {p1, v0}, Lrx/Observable;->a(Lrx/Observable$c;)Lrx/Observable;
-
-    move-result-object p1
-
-    new-instance v0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$brFGHcmQNy7YYo8339oI7w2xtVU;
-
-    invoke-direct {v0, p0, p2}, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$brFGHcmQNy7YYo8339oI7w2xtVU;-><init>(Lcom/discord/widgets/user/profile/WidgetUserProfile;I)V
-
-    invoke-static {v0, p0}, Lcom/discord/app/i;->a(Lrx/functions/Action1;Lcom/discord/app/AppFragment;)Lrx/Observable$c;
-
-    move-result-object p2
-
-    invoke-virtual {p1, p2}, Lrx/Observable;->a(Lrx/Observable$c;)Lrx/Observable;
-
-    return-void
-.end method
-
-.method private configureActionButtons(Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;)V
-    .locals 4
-
-    invoke-static {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;->access$300(Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;)Z
-
-    move-result v0
-
-    const/4 v1, 0x0
-
-    if-nez v0, :cond_0
-
-    invoke-static {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;->access$200(Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;)Lcom/discord/models/domain/ModelUser;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->isBot()Z
-
-    move-result v0
-
-    if-nez v0, :cond_0
-
-    invoke-static {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;->access$100(Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;)I
-
-    move-result v0
-
-    if-nez v0, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    iget-object v2, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile;->friendRequestBtn:Landroid/view/View;
-
-    const/16 v3, 0x8
-
-    if-eqz v0, :cond_1
-
-    const/4 v0, 0x0
-
-    goto :goto_1
-
-    :cond_1
-    const/16 v0, 0x8
-
-    :goto_1
-    invoke-virtual {v2, v0}, Landroid/view/View;->setVisibility(I)V
-
-    iget-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile;->friendRequestBtn:Landroid/view/View;
-
-    new-instance v2, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$GtbM47vb98D8_7kqF7P6FT9Rod0;
-
-    invoke-direct {v2, p0}, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$GtbM47vb98D8_7kqF7P6FT9Rod0;-><init>(Lcom/discord/widgets/user/profile/WidgetUserProfile;)V
-
-    invoke-virtual {v0, v2}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
-
-    iget-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile;->friendRequestSentBtn:Landroid/view/View;
-
-    invoke-virtual {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;->canCancel()Z
-
-    move-result v2
-
-    if-eqz v2, :cond_2
-
-    const/4 v2, 0x0
-
-    goto :goto_2
-
-    :cond_2
-    const/16 v2, 0x8
-
-    :goto_2
-    invoke-virtual {v0, v2}, Landroid/view/View;->setVisibility(I)V
-
-    iget-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile;->friendRequestSentBtn:Landroid/view/View;
-
-    new-instance v2, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$4bLFCE2gs1cmT5D_n5dCwFN-k2w;
-
-    invoke-direct {v2, p0, p1}, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$4bLFCE2gs1cmT5D_n5dCwFN-k2w;-><init>(Lcom/discord/widgets/user/profile/WidgetUserProfile;Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;)V
-
-    invoke-virtual {v0, v2}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
-
-    iget-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile;->friendRequestIncomingContainer:Landroid/view/View;
-
-    invoke-virtual {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;->canAccept()Z
-
-    move-result p1
-
-    if-eqz p1, :cond_3
-
-    goto :goto_3
-
-    :cond_3
-    const/16 v1, 0x8
-
-    :goto_3
-    invoke-virtual {v0, v1}, Landroid/view/View;->setVisibility(I)V
-
-    iget-object p1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile;->friendRequestAcceptBtn:Landroid/view/View;
-
-    new-instance v0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$_uoeQ5BGVjBEDi7OI14CbePnIWI;
-
-    invoke-direct {v0, p0}, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$_uoeQ5BGVjBEDi7OI14CbePnIWI;-><init>(Lcom/discord/widgets/user/profile/WidgetUserProfile;)V
-
-    invoke-virtual {p1, v0}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
-
-    iget-object p1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile;->friendRequestIgnoreBtn:Landroid/view/View;
-
-    new-instance v0, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$Jcdn3PnYbHJIKOwI6Mt8j4MecI8;
-
-    invoke-direct {v0, p0}, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$Jcdn3PnYbHJIKOwI6Mt8j4MecI8;-><init>(Lcom/discord/widgets/user/profile/WidgetUserProfile;)V
-
-    invoke-virtual {p1, v0}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
-
-    return-void
-.end method
-
-.method private configureUI(Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;)V
-    .locals 3
-
-    if-nez p1, :cond_1
-
-    invoke-virtual {p0}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->getAppActivity()Lcom/discord/app/AppActivity;
-
-    move-result-object p1
-
-    if-eqz p1, :cond_0
-
-    invoke-virtual {p0}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->getAppActivity()Lcom/discord/app/AppActivity;
-
-    move-result-object p1
-
-    invoke-virtual {p1}, Lcom/discord/app/AppActivity;->onBackPressed()V
-
-    :cond_0
-    return-void
-
-    :cond_1
-    invoke-static {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;->access$100(Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;)I
-
-    move-result v0
-
-    invoke-direct {p0, v0}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->getMenuResId(I)I
-
-    move-result v0
-
-    new-instance v1, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$k2NACIWmwSumvwPo2dWszzRPznc;
-
-    invoke-direct {v1, p0, p1}, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$k2NACIWmwSumvwPo2dWszzRPznc;-><init>(Lcom/discord/widgets/user/profile/WidgetUserProfile;Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;)V
-
-    new-instance v2, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$_vPT0_FNIPkvGR-sUtQdsuQ4CHQ;
-
-    invoke-direct {v2, p0}, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$_vPT0_FNIPkvGR-sUtQdsuQ4CHQ;-><init>(Lcom/discord/widgets/user/profile/WidgetUserProfile;)V
-
-    invoke-virtual {p0, v0, v1, v2}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->setActionBarOptionsMenu(ILrx/functions/Action2;Lrx/functions/Action1;)Landroidx/appcompat/widget/Toolbar;
-
-    invoke-direct {p0, p1}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->configureActionButtons(Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;)V
-
-    iget-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile;->sendMessageFab:Landroid/view/View;
-
-    new-instance v1, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$4bi2BckCgGWsAR6-gHs_SqmEJx8;
-
-    invoke-direct {v1, p0, p1}, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$4bi2BckCgGWsAR6-gHs_SqmEJx8;-><init>(Lcom/discord/widgets/user/profile/WidgetUserProfile;Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;)V
-
-    invoke-virtual {v0, v1}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
-
-    return-void
-.end method
-
-.method private findAndSetDirectMessage(Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;)V
-    .locals 4
-
-    invoke-virtual {p0}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->getContext()Landroid/content/Context;
-
-    move-result-object v0
-
-    if-nez v0, :cond_0
-
-    return-void
-
-    :cond_0
-    invoke-static {}, Lcom/discord/stores/StoreStream;->getChannelsSelected()Lcom/discord/stores/StoreChannelsSelected;
-
-    move-result-object v0
-
-    invoke-virtual {p0}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->getContext()Landroid/content/Context;
-
-    move-result-object v1
-
-    invoke-static {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;->access$200(Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;)Lcom/discord/models/domain/ModelUser;
-
-    move-result-object p1
-
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getId()J
-
-    move-result-wide v2
-
-    invoke-virtual {v0, v1, v2, v3}, Lcom/discord/stores/StoreChannelsSelected;->findAndSetDirectMessage(Landroid/content/Context;J)V
-
-    return-void
-.end method
-
-.method private getGuildId()J
-    .locals 4
-
-    invoke-virtual {p0}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->getMostRecentIntent()Landroid/content/Intent;
-
-    move-result-object v0
-
-    const-string v1, "com.discord.intent.extra.EXTRA_GUILD_ID"
-
-    const-wide/16 v2, 0x0
-
-    invoke-virtual {v0, v1, v2, v3}, Landroid/content/Intent;->getLongExtra(Ljava/lang/String;J)J
-
-    move-result-wide v0
-
-    return-wide v0
-.end method
-
-.method private getMenuResId(I)I
-    .locals 1
-
-    const/4 v0, 0x1
-
-    if-eq p1, v0, :cond_3
-
-    const/4 v0, 0x2
-
-    if-eq p1, v0, :cond_2
-
-    const/4 v0, 0x3
-
-    if-eq p1, v0, :cond_1
-
-    const/4 v0, 0x4
-
-    if-eq p1, v0, :cond_0
-
-    const p1, 0x7f0e001b
-
-    return p1
-
-    :cond_0
-    const p1, 0x7f0e001f
-
-    return p1
-
-    :cond_1
-    const p1, 0x7f0e001e
-
-    return p1
-
-    :cond_2
-    const p1, 0x7f0e001c
-
-    return p1
-
-    :cond_3
-    const p1, 0x7f0e001d
-
-    return p1
-.end method
-
-.method private getUserId()J
-    .locals 4
-
-    invoke-virtual {p0}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->getMostRecentIntent()Landroid/content/Intent;
-
-    move-result-object v0
-
-    const-string v1, "com.discord.intent.extra.EXTRA_USER_ID"
-
-    const-wide/16 v2, 0x0
-
-    invoke-virtual {v0, v1, v2, v3}, Landroid/content/Intent;->getLongExtra(Ljava/lang/String;J)J
-
-    move-result-wide v0
-
-    return-wide v0
-.end method
-
-.method public static synthetic lambda$hHhsPA-4_vC3fndRZ6imlHYxghg(Lcom/discord/widgets/user/profile/WidgetUserProfile;Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;)V
-    .locals 0
-
-    invoke-direct {p0, p1}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->configureUI(Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;)V
-
-    return-void
-.end method
-
-.method static synthetic lambda$onViewBound$0(Landroid/view/MenuItem;Landroid/content/Context;)V
-    .locals 0
-
-    invoke-interface {p0}, Landroid/view/MenuItem;->getItemId()I
-
-    return-void
-.end method
-
-.method public static launch(Landroid/content/Context;J)V
-    .locals 1
-
-    const/4 v0, 0x0
-
-    invoke-static {p0, p1, p2, v0}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->launch(Landroid/content/Context;JLjava/lang/Long;)V
-
-    return-void
-.end method
-
-.method public static launch(Landroid/content/Context;JLjava/lang/Long;)V
-    .locals 2
-
-    new-instance v0, Landroid/content/Intent;
-
-    invoke-direct {v0}, Landroid/content/Intent;-><init>()V
-
-    const-string v1, "com.discord.intent.extra.EXTRA_USER_ID"
-
-    invoke-virtual {v0, v1, p1, p2}, Landroid/content/Intent;->putExtra(Ljava/lang/String;J)Landroid/content/Intent;
-
-    move-result-object p1
-
-    const-string p2, "com.discord.intent.extra.EXTRA_GUILD_ID"
-
-    invoke-virtual {p1, p2, p3}, Landroid/content/Intent;->putExtra(Ljava/lang/String;Ljava/io/Serializable;)Landroid/content/Intent;
-
-    move-result-object p1
-
-    const-class p2, Lcom/discord/widgets/user/profile/WidgetUserProfile;
-
-    invoke-static {p0, p2, p1}, Lcom/discord/app/f;->a(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
-
-    return-void
-.end method
-
-.method private removeRelationship(I)V
-    .locals 4
-
-    invoke-static {}, Lcom/discord/utilities/rest/RestAPI;->getApi()Lcom/discord/utilities/rest/RestAPI;
-
-    move-result-object v0
-
-    invoke-direct {p0}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->getUserId()J
-
-    move-result-wide v1
-
-    const-string v3, "User Profile"
-
-    invoke-virtual {v0, v3, v1, v2}, Lcom/discord/utilities/rest/RestAPI;->removeRelationship(Ljava/lang/String;J)Lrx/Observable;
-
-    move-result-object v0
-
-    invoke-static {p0}, Lcom/discord/app/i;->b(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Lrx/Observable;->a(Lrx/Observable$c;)Lrx/Observable;
-
-    move-result-object v0
-
-    new-instance v1, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$jdsK9_ibibEFXAkF5xkWCaaguRI;
-
-    invoke-direct {v1, p0, p1}, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$jdsK9_ibibEFXAkF5xkWCaaguRI;-><init>(Lcom/discord/widgets/user/profile/WidgetUserProfile;I)V
-
-    invoke-static {v1, p0}, Lcom/discord/app/i;->a(Lrx/functions/Action1;Lcom/discord/app/AppFragment;)Lrx/Observable$c;
-
-    move-result-object p1
-
-    invoke-virtual {v0, p1}, Lrx/Observable;->a(Lrx/Observable$c;)Lrx/Observable;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public getContentViewResId()I
-    .locals 1
-
-    const v0, 0x7f0d01d7
-
-    return v0
-.end method
-
-.method public synthetic lambda$addRelationship$5$WidgetUserProfile(ILjava/lang/Void;)V
-    .locals 0
-
-    invoke-static {p0, p1}, Lcom/discord/app/h;->b(Landroidx/fragment/app/Fragment;I)V
-
-    return-void
-.end method
-
-.method public synthetic lambda$configureActionButtons$10$WidgetUserProfile(Landroid/view/View;)V
-    .locals 0
-
-    const p1, 0x7f1206d7
-
-    invoke-direct {p0, p1}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->removeRelationship(I)V
-
-    return-void
-.end method
-
-.method public synthetic lambda$configureActionButtons$6$WidgetUserProfile(Landroid/view/View;)V
-    .locals 1
-
-    const/4 p1, 0x0
-
-    const v0, 0x7f1206de
-
-    invoke-direct {p0, p1, v0}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->addRelationship(Ljava/lang/Integer;I)V
-
-    return-void
-.end method
-
-.method public synthetic lambda$configureActionButtons$8$WidgetUserProfile(Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;Landroid/view/View;)V
-    .locals 2
-
-    invoke-static {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;->access$200(Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;)Lcom/discord/models/domain/ModelUser;
-
-    move-result-object p1
-
-    invoke-virtual {p2}, Landroid/view/View;->getContext()Landroid/content/Context;
-
-    move-result-object p2
-
-    invoke-virtual {p0}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->requireFragmentManager()Landroidx/fragment/app/FragmentManager;
-
-    move-result-object v0
-
-    new-instance v1, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$w99BB3Pu45_EnXg_yDu3vxEqGB8;
-
-    invoke-direct {v1, p0}, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$w99BB3Pu45_EnXg_yDu3vxEqGB8;-><init>(Lcom/discord/widgets/user/profile/WidgetUserProfile;)V
-
-    invoke-static {p1, p2, v0, v1}, Lcom/discord/dialogs/b;->a(Lcom/discord/models/domain/ModelUser;Landroid/content/Context;Landroidx/fragment/app/FragmentManager;Lkotlin/jvm/functions/Function1;)V
-
-    return-void
-.end method
-
-.method public synthetic lambda$configureActionButtons$9$WidgetUserProfile(Landroid/view/View;)V
-    .locals 1
-
-    const/4 p1, 0x0
-
-    const v0, 0x7f12002e
-
-    invoke-direct {p0, p1, v0}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->addRelationship(Ljava/lang/Integer;I)V
-
-    return-void
-.end method
-
-.method public synthetic lambda$configureUI$1$WidgetUserProfile(Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;Landroid/view/MenuItem;Landroid/content/Context;)V
-    .locals 0
-
-    invoke-interface {p2}, Landroid/view/MenuItem;->getItemId()I
-
-    move-result p2
-
-    const p3, 0x7f0a045d
-
-    if-eq p2, p3, :cond_0
-
-    packed-switch p2, :pswitch_data_0
-
-    goto :goto_0
-
-    :pswitch_0
-    const p1, 0x7f12133a
-
-    invoke-direct {p0, p1}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->removeRelationship(I)V
-
-    return-void
-
-    :pswitch_1
-    const p1, 0x7f1206ce
-
-    invoke-direct {p0, p1}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->removeRelationship(I)V
-
-    return-void
-
-    :pswitch_2
-    invoke-direct {p0, p1}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->findAndSetDirectMessage(Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;)V
-
-    return-void
-
-    :pswitch_3
-    const p1, 0x7f1206d7
-
-    invoke-direct {p0, p1}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->removeRelationship(I)V
-
-    return-void
-
-    :pswitch_4
-    const p1, 0x7f1206d5
-
-    invoke-direct {p0, p1}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->removeRelationship(I)V
-
-    return-void
-
-    :pswitch_5
-    const/4 p1, 0x2
-
-    invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object p1
-
-    const p2, 0x7f121339
-
-    invoke-direct {p0, p1, p2}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->addRelationship(Ljava/lang/Integer;I)V
-
-    return-void
-
-    :cond_0
-    invoke-virtual {p0}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->getContext()Landroid/content/Context;
-
-    move-result-object p1
-
-    invoke-direct {p0}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->getUserId()J
-
-    move-result-wide p2
-
-    invoke-static {p2, p3}, Ljava/lang/String;->valueOf(J)Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-static {p1, p2}, Lcom/discord/app/h;->d(Landroid/content/Context;Ljava/lang/CharSequence;)V
-
-    :goto_0
-    return-void
-
-    nop
-
-    :pswitch_data_0
-    .packed-switch 0x7f0a047f
-        :pswitch_5
-        :pswitch_4
-        :pswitch_3
-        :pswitch_2
-        :pswitch_1
-        :pswitch_0
-    .end packed-switch
-.end method
-
-.method public synthetic lambda$configureUI$2$WidgetUserProfile(Landroid/view/Menu;)V
-    .locals 4
-
-    invoke-static {}, Lcom/discord/stores/StoreStream;->getUserSettings()Lcom/discord/stores/StoreUserSettings;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lcom/discord/stores/StoreUserSettings;->getDeveloperMode()Z
-
-    move-result v0
-
-    if-nez v0, :cond_0
-
-    return-void
-
-    :cond_0
-    const/4 v0, 0x0
-
-    const v1, 0x7f0a045d
-
-    const v2, 0xffff
-
-    const v3, 0x7f120484
-
-    invoke-interface {p1, v0, v1, v2, v3}, Landroid/view/Menu;->add(IIII)Landroid/view/MenuItem;
-
-    move-result-object p1
-
-    invoke-virtual {p0}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->getContext()Landroid/content/Context;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_1
-
-    invoke-virtual {p0}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->getContext()Landroid/content/Context;
-
-    move-result-object v0
-
-    const v1, 0x7f040188
-
-    invoke-static {v0, v1}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes(Landroid/content/Context;I)I
-
-    move-result v0
-
-    goto :goto_0
-
-    :cond_1
-    const/4 v0, -0x1
-
-    :goto_0
-    invoke-interface {p1, v0}, Landroid/view/MenuItem;->setIcon(I)Landroid/view/MenuItem;
-
-    return-void
-.end method
-
-.method public synthetic lambda$configureUI$3$WidgetUserProfile(Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;Landroid/view/View;)V
-    .locals 0
-
-    invoke-direct {p0, p1}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->findAndSetDirectMessage(Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;)V
-
-    return-void
-.end method
-
-.method public synthetic lambda$null$7$WidgetUserProfile(Ljava/lang/Integer;)Lkotlin/Unit;
-    .locals 0
-
-    invoke-virtual {p1}, Ljava/lang/Integer;->intValue()I
-
-    move-result p1
-
-    invoke-direct {p0, p1}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->removeRelationship(I)V
-
-    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
-
-    return-object p1
-.end method
-
-.method public synthetic lambda$removeRelationship$4$WidgetUserProfile(ILjava/lang/Void;)V
-    .locals 0
-
-    invoke-static {p0, p1}, Lcom/discord/app/h;->b(Landroidx/fragment/app/Fragment;I)V
-
-    return-void
-.end method
-
-.method public onPause()V
-    .locals 7
-
-    invoke-super {p0}, Lcom/discord/app/AppFragment;->onPause()V
-
-    invoke-direct {p0}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->getUserId()J
-
-    move-result-wide v0
-
-    invoke-direct {p0}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->getGuildId()J
-
-    move-result-wide v2
-
-    const-wide/16 v4, 0x0
-
-    cmp-long v6, v0, v4
-
-    if-lez v6, :cond_0
-
-    cmp-long v6, v2, v4
-
-    if-lez v6, :cond_0
-
-    invoke-static {}, Lcom/discord/stores/StoreStream;->getGuildSubscriptions()Lcom/discord/stores/StoreGuildSubscriptions;
-
-    move-result-object v4
-
-    invoke-virtual {v4, v2, v3, v0, v1}, Lcom/discord/stores/StoreGuildSubscriptions;->unsubscribeUser(JJ)V
-
-    :cond_0
-    return-void
-.end method
-
-.method public onViewBound(Landroid/view/View;)V
-    .locals 6
-
-    invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
-
-    const v0, 0x7f0a07f1
-
-    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/discord/utilities/simple_pager/SimplePager;
-
-    iput-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile;->viewPager:Lcom/discord/utilities/simple_pager/SimplePager;
-
-    iget-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile;->viewPager:Lcom/discord/utilities/simple_pager/SimplePager;
-
-    new-instance v1, Lcom/discord/widgets/user/profile/WidgetUserProfile$1;
-
-    invoke-direct {v1, p0}, Lcom/discord/widgets/user/profile/WidgetUserProfile$1;-><init>(Lcom/discord/widgets/user/profile/WidgetUserProfile;)V
-
-    invoke-virtual {v0, v1}, Lcom/discord/utilities/simple_pager/SimplePager;->addOnPageChangeListener(Landroidx/viewpager/widget/ViewPager$OnPageChangeListener;)V
-
-    const v0, 0x7f0a07ef
-
-    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/discord/widgets/user/profile/UserProfileHeaderView;
-
-    iput-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile;->userProfileHeaderView:Lcom/discord/widgets/user/profile/UserProfileHeaderView;
-
-    const v0, 0x7f0a07e8
-
-    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile;->friendRequestIncomingContainer:Landroid/view/View;
-
-    const v0, 0x7f0a07e9
-
-    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile;->friendRequestSentBtn:Landroid/view/View;
-
-    const v0, 0x7f0a07e5
-
-    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile;->friendRequestBtn:Landroid/view/View;
-
-    const v0, 0x7f0a07e6
-
-    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile;->friendRequestAcceptBtn:Landroid/view/View;
-
-    const v0, 0x7f0a07e7
-
-    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile;->friendRequestIgnoreBtn:Landroid/view/View;
-
-    const v0, 0x7f0a07f0
-
-    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile;->sendMessageFab:Landroid/view/View;
-
-    const v0, 0x7f0a0033
-
-    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
-
-    move-result-object p1
-
-    check-cast p1, Lcom/google/android/material/tabs/TabLayout;
-
-    iput-object p1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile;->tabs:Lcom/google/android/material/tabs/TabLayout;
-
-    invoke-virtual {p0}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->setActionBarDisplayHomeAsUpEnabled()Landroidx/appcompat/widget/Toolbar;
-
-    const p1, 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, 0x7f0e001d
-
-    invoke-virtual {p0, v0, p1}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->setActionBarOptionsMenu(ILrx/functions/Action2;)Landroidx/appcompat/widget/Toolbar;
-
-    iget-object p1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile;->userProfileHeaderView:Lcom/discord/widgets/user/profile/UserProfileHeaderView;
-
-    invoke-virtual {p0}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->requireFragmentManager()Landroidx/fragment/app/FragmentManager;
-
-    move-result-object v0
-
-    invoke-virtual {p0}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->requireContext()Landroid/content/Context;
-
-    move-result-object v1
-
-    invoke-static {v0, v1}, Lcom/discord/widgets/user/Badge;->onBadgeClick(Landroidx/fragment/app/FragmentManager;Landroid/content/Context;)Lkotlin/jvm/functions/Function1;
-
-    move-result-object v0
-
-    invoke-virtual {p1, v0}, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->setOnBadgeClick(Lkotlin/jvm/functions/Function1;)V
-
-    iget-object p1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile;->viewPager:Lcom/discord/utilities/simple_pager/SimplePager;
-
-    new-instance v0, Lcom/discord/utilities/simple_pager/SimplePager$Adapter;
-
-    invoke-virtual {p0}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->getChildFragmentManager()Landroidx/fragment/app/FragmentManager;
-
-    move-result-object v1
-
-    const/4 v2, 0x3
-
-    new-array v2, v2, [Lcom/discord/utilities/simple_pager/SimplePager$Adapter$Item;
-
-    new-instance v3, Lcom/discord/utilities/simple_pager/SimplePager$Adapter$Item;
-
-    const v4, 0x7f12133b
-
-    invoke-virtual {p0, v4}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->getString(I)Ljava/lang/String;
-
-    move-result-object v4
-
-    sget-object v5, Lcom/discord/widgets/user/profile/-$$Lambda$q1ld3SATWirrLqu5yxT-BvgGuzI;->INSTANCE:Lcom/discord/widgets/user/profile/-$$Lambda$q1ld3SATWirrLqu5yxT-BvgGuzI;
-
-    invoke-direct {v3, v4, v5}, Lcom/discord/utilities/simple_pager/SimplePager$Adapter$Item;-><init>(Ljava/lang/String;Lkotlin/jvm/functions/Function0;)V
-
-    const/4 v4, 0x0
-
-    aput-object v3, v2, v4
-
-    new-instance v3, Lcom/discord/utilities/simple_pager/SimplePager$Adapter$Item;
-
-    const v4, 0x7f120c14
-
-    invoke-virtual {p0, v4}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->getString(I)Ljava/lang/String;
-
-    move-result-object v4
-
-    sget-object v5, Lcom/discord/widgets/user/profile/-$$Lambda$G3X6iZzo5xG5qTSUIIkOEt___S4;->INSTANCE:Lcom/discord/widgets/user/profile/-$$Lambda$G3X6iZzo5xG5qTSUIIkOEt___S4;
-
-    invoke-direct {v3, v4, v5}, Lcom/discord/utilities/simple_pager/SimplePager$Adapter$Item;-><init>(Ljava/lang/String;Lkotlin/jvm/functions/Function0;)V
-
-    const/4 v4, 0x1
-
-    aput-object v3, v2, v4
-
-    new-instance v3, Lcom/discord/utilities/simple_pager/SimplePager$Adapter$Item;
-
-    const v4, 0x7f120c13
-
-    invoke-virtual {p0, v4}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->getString(I)Ljava/lang/String;
-
-    move-result-object v4
-
-    sget-object v5, Lcom/discord/widgets/user/profile/-$$Lambda$zaBZWlDaOm5GfqQPvapRkaebLyg;->INSTANCE:Lcom/discord/widgets/user/profile/-$$Lambda$zaBZWlDaOm5GfqQPvapRkaebLyg;
-
-    invoke-direct {v3, v4, v5}, Lcom/discord/utilities/simple_pager/SimplePager$Adapter$Item;-><init>(Ljava/lang/String;Lkotlin/jvm/functions/Function0;)V
-
-    const/4 v4, 0x2
-
-    aput-object v3, v2, v4
-
-    invoke-direct {v0, v1, v2}, Lcom/discord/utilities/simple_pager/SimplePager$Adapter;-><init>(Landroidx/fragment/app/FragmentManager;[Lcom/discord/utilities/simple_pager/SimplePager$Adapter$Item;)V
-
-    invoke-virtual {p1, v0}, Lcom/discord/utilities/simple_pager/SimplePager;->setAdapter(Landroidx/viewpager/widget/PagerAdapter;)V
-
-    iget-object p1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile;->viewPager:Lcom/discord/utilities/simple_pager/SimplePager;
-
-    iget-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile;->tabs:Lcom/google/android/material/tabs/TabLayout;
-
-    invoke-virtual {p1, v0}, Lcom/discord/utilities/simple_pager/SimplePager;->setTabLayout(Lcom/google/android/material/tabs/TabLayout;)V
-
-    return-void
-.end method
-
-.method public onViewBoundOrOnResume()V
-    .locals 11
-
-    invoke-super {p0}, Lcom/discord/app/AppFragment;->onViewBoundOrOnResume()V
-
-    invoke-direct {p0}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->getUserId()J
-
-    move-result-wide v0
-
-    invoke-direct {p0}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->getGuildId()J
-
-    move-result-wide v2
-
-    const-wide/16 v4, 0x0
-
-    cmp-long v6, v0, v4
-
-    if-lez v6, :cond_0
-
-    cmp-long v6, v2, v4
-
-    if-lez v6, :cond_0
-
-    invoke-static {}, Lcom/discord/stores/StoreStream;->getGuildSubscriptions()Lcom/discord/stores/StoreGuildSubscriptions;
-
-    move-result-object v4
-
-    invoke-virtual {v4, v2, v3, v0, v1}, Lcom/discord/stores/StoreGuildSubscriptions;->subscribeUser(JJ)V
-
-    :cond_0
-    iget-object v5, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile;->userProfileHeaderView:Lcom/discord/widgets/user/profile/UserProfileHeaderView;
-
-    invoke-direct {p0}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->getUserId()J
-
-    move-result-wide v8
-
-    const/4 v10, 0x0
-
-    move-object v6, p0
-
-    move-object v7, p0
-
-    invoke-static/range {v5 .. v10}, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->bind(Lcom/discord/widgets/user/profile/UserProfileHeaderView;Landroidx/fragment/app/Fragment;Lcom/discord/app/AppComponent;JLjava/lang/Long;)V
-
-    invoke-static {v0, v1}, Lcom/discord/widgets/user/profile/WidgetUserProfile$Model;->get(J)Lrx/Observable;
-
-    move-result-object v0
-
-    invoke-static {p0}, Lcom/discord/app/i;->b(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Lrx/Observable;->a(Lrx/Observable$c;)Lrx/Observable;
-
-    move-result-object v0
-
-    new-instance v1, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$hHhsPA-4_vC3fndRZ6imlHYxghg;
-
-    invoke-direct {v1, p0}, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfile$hHhsPA-4_vC3fndRZ6imlHYxghg;-><init>(Lcom/discord/widgets/user/profile/WidgetUserProfile;)V
-
-    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
-
-    move-result-object v2
-
-    invoke-static {v1, v2}, Lcom/discord/app/i;->a(Lrx/functions/Action1;Ljava/lang/Class;)Lrx/Observable$c;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Lrx/Observable;->a(Lrx/Observable$c;)Lrx/Observable;
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileEmptyListItem.smali b/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileEmptyListItem.smali
index b2cc3ba42c..d356027919 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, 0x7f0a07cd
+    const p2, 0x7f0a079e
 
     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, 0x7f0a07ce
+    const p2, 0x7f0a079f
 
     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
deleted file mode 100644
index 13e17ceeda..0000000000
--- a/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter$ViewHolder.smali
+++ /dev/null
@@ -1,197 +0,0 @@
-.class Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter$ViewHolder;
-.super Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
-.source "WidgetUserProfileInfo.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x0
-    name = "ViewHolder"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder<",
-        "Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter;",
-        "Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model$Item;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field private linkImage:Landroid/widget/ImageView;
-
-.field private platformImage:Landroid/widget/ImageView;
-
-.field private platformUserName:Landroid/widget/TextView;
-
-.field final synthetic this$0:Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter;
-
-
-# direct methods
-.method public constructor <init>(Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter;ILcom/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter$ViewHolder;->this$0:Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter;
-
-    invoke-direct {p0, p2, p3}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
-
-    iget-object p1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter$ViewHolder;->itemView:Landroid/view/View;
-
-    const p2, 0x7f0a022a
-
-    invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
-
-    move-result-object p1
-
-    check-cast p1, Landroid/widget/ImageView;
-
-    iput-object p1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter$ViewHolder;->platformImage:Landroid/widget/ImageView;
-
-    iget-object p1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter$ViewHolder;->itemView:Landroid/view/View;
-
-    const p2, 0x7f0a022c
-
-    invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
-
-    move-result-object p1
-
-    check-cast p1, Landroid/widget/TextView;
-
-    iput-object p1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter$ViewHolder;->platformUserName:Landroid/widget/TextView;
-
-    iget-object p1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter$ViewHolder;->itemView:Landroid/view/View;
-
-    const p2, 0x7f0a022b
-
-    invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
-
-    move-result-object p1
-
-    check-cast p1, Landroid/widget/ImageView;
-
-    iput-object p1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter$ViewHolder;->linkImage:Landroid/widget/ImageView;
-
-    sget-object p1, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfileInfo$Adapter$ViewHolder$IAy00oijo6WZvUTumj9BxiKaqMI;->INSTANCE:Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfileInfo$Adapter$ViewHolder$IAy00oijo6WZvUTumj9BxiKaqMI;
-
-    const/4 p2, 0x0
-
-    new-array p2, p2, [Landroid/view/View;
-
-    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter$ViewHolder;->setOnClickListener(Lrx/functions/Action3;[Landroid/view/View;)V
-
-    return-void
-.end method
-
-.method static synthetic lambda$new$0(Landroid/view/View;Ljava/lang/Integer;Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model$Item;)V
-    .locals 1
-
-    invoke-static {p2}, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model$Item;->access$600(Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model$Item;)Lcom/discord/models/domain/ModelConnectedAccount;
-
-    move-result-object p1
-
-    invoke-static {p1}, Lcom/discord/utilities/platform/Platform;->from(Lcom/discord/models/domain/ModelConnectedAccount;)Lcom/discord/utilities/platform/Platform;
-
-    move-result-object p1
-
-    invoke-virtual {p1}, Lcom/discord/utilities/platform/Platform;->getPlatformId()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-static {v0}, Lcom/discord/utilities/analytics/AnalyticsTracker;->connectedAccountViewed(Ljava/lang/String;)V
-
-    invoke-virtual {p0}, Landroid/view/View;->getContext()Landroid/content/Context;
-
-    move-result-object p0
-
-    invoke-static {p2}, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model$Item;->access$600(Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model$Item;)Lcom/discord/models/domain/ModelConnectedAccount;
-
-    move-result-object p2
-
-    invoke-virtual {p1, p2}, Lcom/discord/utilities/platform/Platform;->getProfileUrl(Lcom/discord/models/domain/ModelConnectedAccount;)Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-static {p0, p1}, Lcom/discord/utilities/uri/UriHandler;->handle(Landroid/content/Context;Ljava/lang/String;)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method protected onConfigure(ILcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model$Item;)V
-    .locals 2
-
-    invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
-
-    invoke-static {p2}, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model$Item;->access$600(Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model$Item;)Lcom/discord/models/domain/ModelConnectedAccount;
-
-    move-result-object p1
-
-    invoke-static {p1}, Lcom/discord/utilities/platform/Platform;->from(Lcom/discord/models/domain/ModelConnectedAccount;)Lcom/discord/utilities/platform/Platform;
-
-    move-result-object p1
-
-    invoke-virtual {p1}, Lcom/discord/utilities/platform/Platform;->getPlatformImage()I
-
-    move-result v0
-
-    iget-object v1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter$ViewHolder;->platformImage:Landroid/widget/ImageView;
-
-    invoke-virtual {v1, v0}, Landroid/widget/ImageView;->setImageResource(I)V
-
-    invoke-static {p2}, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model$Item;->access$600(Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model$Item;)Lcom/discord/models/domain/ModelConnectedAccount;
-
-    move-result-object v0
-
-    invoke-virtual {p1, v0}, Lcom/discord/utilities/platform/Platform;->getProfileUrl(Lcom/discord/models/domain/ModelConnectedAccount;)Ljava/lang/String;
-
-    move-result-object p1
-
-    iget-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter$ViewHolder;->platformUserName:Landroid/widget/TextView;
-
-    invoke-static {p2}, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model$Item;->access$600(Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model$Item;)Lcom/discord/models/domain/ModelConnectedAccount;
-
-    move-result-object p2
-
-    invoke-virtual {p2}, Lcom/discord/models/domain/ModelConnectedAccount;->getUsername()Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-virtual {v0, p2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
-
-    iget-object p2, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter$ViewHolder;->linkImage:Landroid/widget/ImageView;
-
-    invoke-static {p1}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
-
-    move-result p1
-
-    if-eqz p1, :cond_0
-
-    const/16 p1, 0x8
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p1, 0x0
-
-    :goto_0
-    invoke-virtual {p2, p1}, Landroid/widget/ImageView;->setVisibility(I)V
-
-    return-void
-.end method
-
-.method public bridge synthetic onConfigure(ILjava/lang/Object;)V
-    .locals 0
-
-    check-cast p2, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model$Item;
-
-    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter$ViewHolder;->onConfigure(ILcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model$Item;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter.smali b/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter.smali
deleted file mode 100644
index 6a73d0e0e6..0000000000
--- a/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter.smali
+++ /dev/null
@@ -1,73 +0,0 @@
-.class Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter;
-.super Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;
-.source "WidgetUserProfileInfo.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x8
-    name = "Adapter"
-.end annotation
-
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter$ViewHolder;
-    }
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple<",
-        "Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model$Item;",
-        ">;"
-    }
-.end annotation
-
-
-# direct methods
-.method public constructor <init>(Landroidx/recyclerview/widget/RecyclerView;)V
-    .locals 0
-
-    invoke-direct {p0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public bridge synthetic onCreateViewHolder(Landroid/view/ViewGroup;I)Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
-    .locals 0
-
-    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter;->onCreateViewHolder(Landroid/view/ViewGroup;I)Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
-
-    move-result-object p1
-
-    return-object p1
-.end method
-
-.method public 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/WidgetUserProfileInfo$Adapter;",
-            "Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model$Item;",
-            ">;"
-        }
-    .end annotation
-
-    new-instance p1, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter$ViewHolder;
-
-    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
-
-    return-object p1
-.end method
diff --git a/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileInfo$Model$Item.smali b/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileInfo$Model$Item.smali
deleted file mode 100644
index fa30570567..0000000000
--- a/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileInfo$Model$Item.smali
+++ /dev/null
@@ -1,175 +0,0 @@
-.class public Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model$Item;
-.super Ljava/lang/Object;
-.source "WidgetUserProfileInfo.java"
-
-# interfaces
-.implements Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x9
-    name = "Item"
-.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 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model$Item;->connectedAccount:Lcom/discord/models/domain/ModelConnectedAccount;
-
-    return-void
-.end method
-
-.method static synthetic access$600(Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model$Item;)Lcom/discord/models/domain/ModelConnectedAccount;
-    .locals 0
-
-    iget-object p0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model$Item;->connectedAccount:Lcom/discord/models/domain/ModelConnectedAccount;
-
-    return-object p0
-.end method
-
-
-# virtual methods
-.method protected canEqual(Ljava/lang/Object;)Z
-    .locals 0
-
-    instance-of p1, p1, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model$Item;
-
-    return p1
-.end method
-
-.method public equals(Ljava/lang/Object;)Z
-    .locals 3
-
-    const/4 v0, 0x1
-
-    if-ne p1, p0, :cond_0
-
-    return v0
-
-    :cond_0
-    instance-of v1, p1, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model$Item;
-
-    const/4 v2, 0x0
-
-    if-nez v1, :cond_1
-
-    return v2
-
-    :cond_1
-    check-cast p1, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model$Item;
-
-    invoke-virtual {p1, p0}, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model$Item;->canEqual(Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-nez v1, :cond_2
-
-    return v2
-
-    :cond_2
-    iget-object v1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model$Item;->connectedAccount:Lcom/discord/models/domain/ModelConnectedAccount;
-
-    iget-object p1, p1, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model$Item;->connectedAccount:Lcom/discord/models/domain/ModelConnectedAccount;
-
-    if-nez v1, :cond_3
-
-    if-eqz p1, :cond_4
-
-    goto :goto_0
-
-    :cond_3
-    invoke-virtual {v1, p1}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
-
-    move-result p1
-
-    if-nez p1, :cond_4
-
-    :goto_0
-    return v2
-
-    :cond_4
-    return v0
-.end method
-
-.method public getKey()Ljava/lang/String;
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model$Item;->connectedAccount:Lcom/discord/models/domain/ModelConnectedAccount;
-
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelConnectedAccount;->getId()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-static {v0}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public getType()I
-    .locals 1
-
-    const/4 v0, 0x0
-
-    return v0
-.end method
-
-.method public hashCode()I
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model$Item;->connectedAccount:Lcom/discord/models/domain/ModelConnectedAccount;
-
-    if-nez v0, :cond_0
-
-    const/16 v0, 0x2b
-
-    goto :goto_0
-
-    :cond_0
-    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
-
-    move-result v0
-
-    :goto_0
-    add-int/lit8 v0, v0, 0x3b
-
-    return v0
-.end method
-
-.method public toString()Ljava/lang/String;
-    .locals 2
-
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    const-string v1, "WidgetUserProfileInfo.Model.Item(connectedAccount="
-
-    invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
-
-    iget-object v1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model$Item;->connectedAccount:Lcom/discord/models/domain/ModelConnectedAccount;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    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/WidgetUserProfileInfo$Model.smali b/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileInfo$Model.smali
deleted file mode 100644
index b3e6b734b9..0000000000
--- a/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileInfo$Model.smali
+++ /dev/null
@@ -1,609 +0,0 @@
-.class Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;
-.super Ljava/lang/Object;
-.source "WidgetUserProfileInfo.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x8
-    name = "Model"
-.end annotation
-
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model$Item;
-    }
-.end annotation
-
-
-# instance fields
-.field private final connectedAccounts:Ljava/util/List;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/List<",
-            "Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model$Item;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field private final isMe:Z
-
-.field private final notes:Ljava/lang/CharSequence;
-
-.field private final richPresence:Lcom/discord/widgets/user/presence/ModelRichPresence;
-
-.field private final streamContext:Lcom/discord/utilities/streams/StreamContext;
-
-.field private final user:Lcom/discord/models/domain/ModelUser;
-
-
-# direct methods
-.method public constructor <init>(Ljava/util/List;Ljava/lang/CharSequence;Lcom/discord/widgets/user/presence/ModelRichPresence;Lcom/discord/models/domain/ModelUser;ZLcom/discord/utilities/streams/StreamContext;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/util/List<",
-            "Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model$Item;",
-            ">;",
-            "Ljava/lang/CharSequence;",
-            "Lcom/discord/widgets/user/presence/ModelRichPresence;",
-            "Lcom/discord/models/domain/ModelUser;",
-            "Z",
-            "Lcom/discord/utilities/streams/StreamContext;",
-            ")V"
-        }
-    .end annotation
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->connectedAccounts:Ljava/util/List;
-
-    iput-object p2, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->notes:Ljava/lang/CharSequence;
-
-    iput-object p3, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->richPresence:Lcom/discord/widgets/user/presence/ModelRichPresence;
-
-    iput-object p4, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->user:Lcom/discord/models/domain/ModelUser;
-
-    iput-boolean p5, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->isMe:Z
-
-    iput-object p6, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->streamContext:Lcom/discord/utilities/streams/StreamContext;
-
-    return-void
-.end method
-
-.method static synthetic access$000(Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;)Ljava/util/List;
-    .locals 0
-
-    iget-object p0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->connectedAccounts:Ljava/util/List;
-
-    return-object p0
-.end method
-
-.method static synthetic access$100(Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;)Ljava/lang/CharSequence;
-    .locals 0
-
-    iget-object p0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->notes:Ljava/lang/CharSequence;
-
-    return-object p0
-.end method
-
-.method static synthetic access$200(Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;)Lcom/discord/widgets/user/presence/ModelRichPresence;
-    .locals 0
-
-    iget-object p0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->richPresence:Lcom/discord/widgets/user/presence/ModelRichPresence;
-
-    return-object p0
-.end method
-
-.method static synthetic access$300(Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;)Lcom/discord/utilities/streams/StreamContext;
-    .locals 0
-
-    iget-object p0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->streamContext:Lcom/discord/utilities/streams/StreamContext;
-
-    return-object p0
-.end method
-
-.method static synthetic access$400(Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;)Z
-    .locals 0
-
-    iget-boolean p0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->isMe:Z
-
-    return p0
-.end method
-
-.method static synthetic access$500(Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;)Lcom/discord/models/domain/ModelUser;
-    .locals 0
-
-    iget-object p0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->user:Lcom/discord/models/domain/ModelUser;
-
-    return-object p0
-.end method
-
-.method public static create(Lcom/discord/models/domain/ModelUserProfile;Ljava/lang/String;Lcom/discord/widgets/user/presence/ModelRichPresence;JLcom/discord/utilities/streams/StreamContext;)Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;
-    .locals 8
-
-    invoke-virtual {p0}, Lcom/discord/models/domain/ModelUserProfile;->getConnectedAccounts()Ljava/util/List;
-
-    move-result-object v0
-
-    new-instance v2, Ljava/util/ArrayList;
-
-    invoke-interface {v0}, Ljava/util/List;->size()I
-
-    move-result v1
-
-    invoke-direct {v2, v1}, Ljava/util/ArrayList;-><init>(I)V
-
-    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, Lcom/discord/models/domain/ModelConnectedAccount;
-
-    new-instance v3, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model$Item;
-
-    invoke-direct {v3, v1}, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model$Item;-><init>(Lcom/discord/models/domain/ModelConnectedAccount;)V
-
-    invoke-interface {v2, v3}, Ljava/util/List;->add(Ljava/lang/Object;)Z
-
-    goto :goto_0
-
-    :cond_0
-    new-instance v0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;
-
-    invoke-virtual {p0}, Lcom/discord/models/domain/ModelUserProfile;->getUser()Lcom/discord/models/domain/ModelUser;
-
-    move-result-object v5
-
-    invoke-virtual {p0}, Lcom/discord/models/domain/ModelUserProfile;->getUser()Lcom/discord/models/domain/ModelUser;
-
-    move-result-object p0
-
-    invoke-virtual {p0}, Lcom/discord/models/domain/ModelUser;->getId()J
-
-    move-result-wide v3
-
-    cmp-long p0, p3, v3
-
-    if-nez p0, :cond_1
-
-    const/4 p0, 0x1
-
-    const/4 v6, 0x1
-
-    goto :goto_1
-
-    :cond_1
-    const/4 p0, 0x0
-
-    const/4 v6, 0x0
-
-    :goto_1
-    move-object v1, v0
-
-    move-object v3, p1
-
-    move-object v4, p2
-
-    move-object v7, p5
-
-    invoke-direct/range {v1 .. v7}, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;-><init>(Ljava/util/List;Ljava/lang/CharSequence;Lcom/discord/widgets/user/presence/ModelRichPresence;Lcom/discord/models/domain/ModelUser;ZLcom/discord/utilities/streams/StreamContext;)V
-
-    return-object v0
-.end method
-
-.method public static get(J)Lrx/Observable;
-    .locals 7
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(J)",
-            "Lrx/Observable<",
-            "Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;",
-            ">;"
-        }
-    .end annotation
-
-    invoke-static {}, Lcom/discord/stores/StoreStream;->getUserProfile()Lcom/discord/stores/StoreUserProfile;
-
-    move-result-object v0
-
-    invoke-virtual {v0, p0, p1}, Lcom/discord/stores/StoreUserProfile;->get(J)Lrx/Observable;
-
-    move-result-object v1
-
-    invoke-static {}, Lcom/discord/stores/StoreStream;->getUsersNotes()Lcom/discord/stores/StoreUserNotes;
-
-    move-result-object v0
-
-    invoke-virtual {v0, p0, p1}, Lcom/discord/stores/StoreUserNotes;->getForUserId(J)Lrx/Observable;
-
-    move-result-object v2
-
-    invoke-static {}, Lcom/discord/stores/StoreStream;->getPresences()Lcom/discord/stores/StoreUserPresence;
-
-    move-result-object v0
-
-    invoke-static {p0, p1, v0}, Lcom/discord/widgets/user/presence/ModelRichPresence;->get(JLcom/discord/stores/StoreUserPresence;)Lrx/Observable;
-
-    move-result-object v3
-
-    invoke-static {}, Lcom/discord/stores/StoreStream;->getUsers()Lcom/discord/stores/StoreUser;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lcom/discord/stores/StoreUser;->getMeId()Lrx/Observable;
-
-    move-result-object v4
-
-    sget-object v0, Lcom/discord/utilities/streams/StreamContext;->Companion:Lcom/discord/utilities/streams/StreamContext$Companion;
-
-    const/4 v5, 0x1
-
-    invoke-virtual {v0, p0, p1, v5}, Lcom/discord/utilities/streams/StreamContext$Companion;->get(JZ)Lrx/Observable;
-
-    move-result-object v5
-
-    sget-object v6, Lcom/discord/widgets/user/profile/-$$Lambda$GzAIln3JcMVDfWOQhKd9ANBXlzY;->INSTANCE:Lcom/discord/widgets/user/profile/-$$Lambda$GzAIln3JcMVDfWOQhKd9ANBXlzY;
-
-    invoke-static/range {v1 .. v6}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func5;)Lrx/Observable;
-
-    move-result-object p0
-
-    invoke-static {}, Lcom/discord/app/i;->dP()Lrx/Observable$c;
-
-    move-result-object p1
-
-    invoke-virtual {p0, p1}, Lrx/Observable;->a(Lrx/Observable$c;)Lrx/Observable;
-
-    move-result-object p0
-
-    return-object p0
-.end method
-
-
-# virtual methods
-.method protected canEqual(Ljava/lang/Object;)Z
-    .locals 0
-
-    instance-of p1, p1, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;
-
-    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/widgets/user/profile/WidgetUserProfileInfo$Model;
-
-    const/4 v2, 0x0
-
-    if-nez v1, :cond_1
-
-    return v2
-
-    :cond_1
-    check-cast p1, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;
-
-    invoke-virtual {p1, p0}, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->canEqual(Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-nez v1, :cond_2
-
-    return v2
-
-    :cond_2
-    iget-object v1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->connectedAccounts:Ljava/util/List;
-
-    iget-object v3, p1, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->connectedAccounts:Ljava/util/List;
-
-    if-nez v1, :cond_3
-
-    if-eqz v3, :cond_4
-
-    goto :goto_0
-
-    :cond_3
-    invoke-virtual {v1, v3}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-nez v1, :cond_4
-
-    :goto_0
-    return v2
-
-    :cond_4
-    iget-object v1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->notes:Ljava/lang/CharSequence;
-
-    iget-object v3, p1, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->notes:Ljava/lang/CharSequence;
-
-    if-nez v1, :cond_5
-
-    if-eqz v3, :cond_6
-
-    goto :goto_1
-
-    :cond_5
-    invoke-virtual {v1, v3}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-nez v1, :cond_6
-
-    :goto_1
-    return v2
-
-    :cond_6
-    iget-object v1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->richPresence:Lcom/discord/widgets/user/presence/ModelRichPresence;
-
-    iget-object v3, p1, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->richPresence:Lcom/discord/widgets/user/presence/ModelRichPresence;
-
-    if-nez v1, :cond_7
-
-    if-eqz v3, :cond_8
-
-    goto :goto_2
-
-    :cond_7
-    invoke-virtual {v1, v3}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-nez v1, :cond_8
-
-    :goto_2
-    return v2
-
-    :cond_8
-    iget-object v1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->user:Lcom/discord/models/domain/ModelUser;
-
-    iget-object v3, p1, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->user:Lcom/discord/models/domain/ModelUser;
-
-    if-nez v1, :cond_9
-
-    if-eqz v3, :cond_a
-
-    goto :goto_3
-
-    :cond_9
-    invoke-virtual {v1, v3}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-nez v1, :cond_a
-
-    :goto_3
-    return v2
-
-    :cond_a
-    iget-boolean v1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->isMe:Z
-
-    iget-boolean v3, p1, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->isMe:Z
-
-    if-eq v1, v3, :cond_b
-
-    return v2
-
-    :cond_b
-    iget-object v1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->streamContext:Lcom/discord/utilities/streams/StreamContext;
-
-    iget-object p1, p1, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->streamContext:Lcom/discord/utilities/streams/StreamContext;
-
-    if-nez v1, :cond_c
-
-    if-eqz p1, :cond_d
-
-    goto :goto_4
-
-    :cond_c
-    invoke-virtual {v1, p1}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
-
-    move-result p1
-
-    if-nez p1, :cond_d
-
-    :goto_4
-    return v2
-
-    :cond_d
-    return v0
-.end method
-
-.method public hashCode()I
-    .locals 3
-
-    iget-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->connectedAccounts:Ljava/util/List;
-
-    const/16 v1, 0x2b
-
-    if-nez v0, :cond_0
-
-    const/16 v0, 0x2b
-
-    goto :goto_0
-
-    :cond_0
-    invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
-
-    move-result v0
-
-    :goto_0
-    add-int/lit8 v0, v0, 0x3b
-
-    iget-object v2, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->notes:Ljava/lang/CharSequence;
-
-    mul-int/lit8 v0, v0, 0x3b
-
-    if-nez v2, :cond_1
-
-    const/16 v2, 0x2b
-
-    goto :goto_1
-
-    :cond_1
-    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
-
-    move-result v2
-
-    :goto_1
-    add-int/2addr v0, v2
-
-    iget-object v2, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->richPresence:Lcom/discord/widgets/user/presence/ModelRichPresence;
-
-    mul-int/lit8 v0, v0, 0x3b
-
-    if-nez v2, :cond_2
-
-    const/16 v2, 0x2b
-
-    goto :goto_2
-
-    :cond_2
-    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
-
-    move-result v2
-
-    :goto_2
-    add-int/2addr v0, v2
-
-    iget-object v2, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->user:Lcom/discord/models/domain/ModelUser;
-
-    mul-int/lit8 v0, v0, 0x3b
-
-    if-nez v2, :cond_3
-
-    const/16 v2, 0x2b
-
-    goto :goto_3
-
-    :cond_3
-    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
-
-    move-result v2
-
-    :goto_3
-    add-int/2addr v0, v2
-
-    mul-int/lit8 v0, v0, 0x3b
-
-    iget-boolean v2, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->isMe:Z
-
-    if-eqz v2, :cond_4
-
-    const/16 v2, 0x4f
-
-    goto :goto_4
-
-    :cond_4
-    const/16 v2, 0x61
-
-    :goto_4
-    add-int/2addr v0, v2
-
-    iget-object v2, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->streamContext:Lcom/discord/utilities/streams/StreamContext;
-
-    mul-int/lit8 v0, v0, 0x3b
-
-    if-nez v2, :cond_5
-
-    goto :goto_5
-
-    :cond_5
-    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
-
-    move-result v1
-
-    :goto_5
-    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, "WidgetUserProfileInfo.Model(connectedAccounts="
-
-    invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
-
-    iget-object v1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->connectedAccounts:Ljava/util/List;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const-string v1, ", notes="
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-object v1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->notes:Ljava/lang/CharSequence;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const-string v1, ", richPresence="
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-object v1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->richPresence:Lcom/discord/widgets/user/presence/ModelRichPresence;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const-string v1, ", user="
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-object v1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->user:Lcom/discord/models/domain/ModelUser;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const-string v1, ", isMe="
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-boolean v1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->isMe:Z
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
-
-    const-string v1, ", streamContext="
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-object v1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->streamContext:Lcom/discord/utilities/streams/StreamContext;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const-string v1, ")"
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
diff --git a/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileInfo.smali b/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileInfo.smali
deleted file mode 100644
index adba9a4c96..0000000000
--- a/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileInfo.smali
+++ /dev/null
@@ -1,458 +0,0 @@
-.class public Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;
-.super Lcom/discord/app/AppFragment;
-.source "WidgetUserProfileInfo.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter;,
-        Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;
-    }
-.end annotation
-
-
-# instance fields
-.field private activityContainer:Landroid/widget/FrameLayout;
-
-.field private activityDivider:Landroid/view/View;
-
-.field private activityViewHolder:Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;
-
-.field private adapter:Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter;
-
-.field private identitiesDivider:Landroid/view/View;
-
-.field private identitiesHeader:Landroid/view/View;
-
-.field private notes:Landroid/widget/EditText;
-
-.field private recycler:Landroidx/recyclerview/widget/RecyclerView;
-
-
-# direct methods
-.method public constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
-
-    return-void
-.end method
-
-.method private getUserId()J
-    .locals 4
-
-    invoke-virtual {p0}, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;->getMostRecentIntent()Landroid/content/Intent;
-
-    move-result-object v0
-
-    const-string v1, "com.discord.intent.extra.EXTRA_USER_ID"
-
-    const-wide/16 v2, 0x0
-
-    invoke-virtual {v0, v1, v2, v3}, Landroid/content/Intent;->getLongExtra(Ljava/lang/String;J)J
-
-    move-result-wide v0
-
-    return-wide v0
-.end method
-
-.method private static isTextEquivalent(Ljava/lang/CharSequence;Ljava/lang/CharSequence;)Z
-    .locals 1
-
-    invoke-static {p0, p1}, Landroid/text/TextUtils;->equals(Ljava/lang/CharSequence;Ljava/lang/CharSequence;)Z
-
-    move-result v0
-
-    if-nez v0, :cond_1
-
-    invoke-static {p0}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
-
-    move-result p0
-
-    if-eqz p0, :cond_0
-
-    invoke-static {p1}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
-
-    move-result p0
-
-    if-eqz p0, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p0, 0x0
-
-    return p0
-
-    :cond_1
-    :goto_0
-    const/4 p0, 0x1
-
-    return p0
-.end method
-
-
-# virtual methods
-.method public configureUI(Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;)V
-    .locals 8
-
-    iget-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;->adapter:Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter;
-
-    invoke-static {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->access$000(Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;)Ljava/util/List;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter;->setData(Ljava/util/List;)V
-
-    invoke-static {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->access$100(Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;)Ljava/lang/CharSequence;
-
-    move-result-object v0
-
-    invoke-static {v0}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
-
-    move-result v0
-
-    if-nez v0, :cond_0
-
-    iget-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;->notes:Landroid/widget/EditText;
-
-    invoke-static {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->access$100(Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;)Ljava/lang/CharSequence;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Landroid/widget/EditText;->setText(Ljava/lang/CharSequence;)V
-
-    :cond_0
-    iget-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;->notes:Landroid/widget/EditText;
-
-    new-instance v1, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfileInfo$3-bgq3Q5Blc2Cp1QlK2yV6hUyno;
-
-    invoke-direct {v1, p0, p1}, Lcom/discord/widgets/user/profile/-$$Lambda$WidgetUserProfileInfo$3-bgq3Q5Blc2Cp1QlK2yV6hUyno;-><init>(Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;)V
-
-    invoke-virtual {v0, v1}, Landroid/widget/EditText;->setOnFocusChangeListener(Landroid/view/View$OnFocusChangeListener;)V
-
-    invoke-static {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->access$200(Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;)Lcom/discord/widgets/user/presence/ModelRichPresence;
-
-    move-result-object v0
-
-    if-nez v0, :cond_1
-
-    const/4 v0, 0x0
-
-    goto :goto_0
-
-    :cond_1
-    invoke-static {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->access$200(Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;)Lcom/discord/widgets/user/presence/ModelRichPresence;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lcom/discord/widgets/user/presence/ModelRichPresence;->getPrimaryActivity()Lcom/discord/models/domain/ModelPresence$Activity;
-
-    move-result-object v0
-
-    :goto_0
-    iget-object v1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;->activityContainer:Landroid/widget/FrameLayout;
-
-    invoke-static {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->access$300(Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;)Lcom/discord/utilities/streams/StreamContext;
-
-    move-result-object v2
-
-    iget-object v3, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;->activityViewHolder:Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;
-
-    invoke-static {v1, v0, v2, v3}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->setRichPresence(Landroid/view/ViewGroup;Lcom/discord/models/domain/ModelPresence$Activity;Lcom/discord/utilities/streams/StreamContext;Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;)Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;
-
-    move-result-object v1
-
-    iput-object v1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;->activityViewHolder:Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;
-
-    iget-object v2, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;->activityViewHolder:Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;
-
-    invoke-static {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->access$200(Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;)Lcom/discord/widgets/user/presence/ModelRichPresence;
-
-    move-result-object v3
-
-    invoke-static {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->access$300(Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;)Lcom/discord/utilities/streams/StreamContext;
-
-    move-result-object v4
-
-    invoke-static {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->access$400(Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;)Z
-
-    move-result v5
-
-    invoke-static {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->access$500(Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;)Lcom/discord/models/domain/ModelUser;
-
-    move-result-object v6
-
-    invoke-virtual {p0}, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;->getAppPermissions()Lcom/discord/app/AppPermissions;
-
-    move-result-object v7
-
-    invoke-virtual/range {v2 .. v7}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->configureUi(Lcom/discord/widgets/user/presence/ModelRichPresence;Lcom/discord/utilities/streams/StreamContext;ZLcom/discord/models/domain/ModelUser;Lcom/discord/app/AppPermissions;)V
-
-    iget-object v1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;->activityViewHolder:Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;
-
-    invoke-virtual {v1, v0, p0}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->configureUiTimestamp(Lcom/discord/models/domain/ModelPresence$Activity;Lcom/discord/app/AppComponent;)V
-
-    iget-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;->activityDivider:Landroid/view/View;
-
-    iget-object v1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;->activityContainer:Landroid/widget/FrameLayout;
-
-    invoke-virtual {v1}, Landroid/widget/FrameLayout;->getVisibility()I
-
-    move-result v1
-
-    invoke-virtual {v0, v1}, Landroid/view/View;->setVisibility(I)V
-
-    iget-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;->identitiesDivider:Landroid/view/View;
-
-    invoke-static {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->access$000(Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;)Ljava/util/List;
-
-    move-result-object v1
-
-    invoke-interface {v1}, Ljava/util/List;->isEmpty()Z
-
-    move-result v1
-
-    const/16 v2, 0x8
-
-    const/4 v3, 0x0
-
-    if-eqz v1, :cond_2
-
-    const/16 v1, 0x8
-
-    goto :goto_1
-
-    :cond_2
-    const/4 v1, 0x0
-
-    :goto_1
-    invoke-virtual {v0, v1}, Landroid/view/View;->setVisibility(I)V
-
-    iget-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;->identitiesHeader:Landroid/view/View;
-
-    invoke-static {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->access$000(Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;)Ljava/util/List;
-
-    move-result-object p1
-
-    invoke-interface {p1}, Ljava/util/List;->isEmpty()Z
-
-    move-result p1
-
-    if-eqz p1, :cond_3
-
-    goto :goto_2
-
-    :cond_3
-    const/4 v2, 0x0
-
-    :goto_2
-    invoke-virtual {v0, v2}, Landroid/view/View;->setVisibility(I)V
-
-    return-void
-.end method
-
-.method public getContentViewResId()I
-    .locals 1
-
-    const v0, 0x7f0d01cf
-
-    return v0
-.end method
-
-.method public synthetic lambda$configureUI$0$WidgetUserProfileInfo(Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;Landroid/view/View;Z)V
-    .locals 2
-
-    check-cast p2, Landroid/widget/EditText;
-
-    invoke-virtual {p2}, Landroid/widget/EditText;->getText()Landroid/text/Editable;
-
-    move-result-object p2
-
-    if-nez p3, :cond_0
-
-    invoke-static {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->access$100(Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;)Ljava/lang/CharSequence;
-
-    move-result-object p1
-
-    invoke-static {p1, p2}, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;->isTextEquivalent(Ljava/lang/CharSequence;Ljava/lang/CharSequence;)Z
-
-    move-result p1
-
-    if-nez p1, :cond_0
-
-    invoke-static {}, Lcom/discord/utilities/rest/RestAPI;->getApi()Lcom/discord/utilities/rest/RestAPI;
-
-    move-result-object p1
-
-    invoke-direct {p0}, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;->getUserId()J
-
-    move-result-wide v0
-
-    new-instance p3, Lcom/discord/restapi/RestAPIParams$UserNoteUpdate;
-
-    invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-direct {p3, p2}, Lcom/discord/restapi/RestAPIParams$UserNoteUpdate;-><init>(Ljava/lang/String;)V
-
-    invoke-virtual {p1, v0, v1, p3}, Lcom/discord/utilities/rest/RestAPI;->updateUserNotes(JLcom/discord/restapi/RestAPIParams$UserNoteUpdate;)Lrx/Observable;
-
-    move-result-object p1
-
-    invoke-static {}, Lcom/discord/app/i;->dN()Lrx/Observable$c;
-
-    move-result-object p2
-
-    invoke-virtual {p1, p2}, Lrx/Observable;->a(Lrx/Observable$c;)Lrx/Observable;
-
-    move-result-object p1
-
-    const-string p2, "updateNote"
-
-    invoke-static {p2}, Lcom/discord/app/i;->ab(Ljava/lang/String;)Lrx/Observable$c;
-
-    move-result-object p2
-
-    invoke-virtual {p1, p2}, Lrx/Observable;->a(Lrx/Observable$c;)Lrx/Observable;
-
-    :cond_0
-    return-void
-.end method
-
-.method public onPause()V
-    .locals 1
-
-    invoke-super {p0}, Lcom/discord/app/AppFragment;->onPause()V
-
-    iget-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;->activityViewHolder:Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;
-
-    if-eqz v0, :cond_0
-
-    invoke-virtual {v0}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->disposeSubscriptions()V
-
-    :cond_0
-    return-void
-.end method
-
-.method public onViewBound(Landroid/view/View;)V
-    .locals 1
-
-    invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
-
-    const v0, 0x7f0a07b6
-
-    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
-
-    move-result-object v0
-
-    check-cast v0, Landroid/widget/EditText;
-
-    iput-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;->notes:Landroid/widget/EditText;
-
-    const v0, 0x7f0a0521
-
-    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
-
-    move-result-object v0
-
-    check-cast v0, Landroidx/recyclerview/widget/RecyclerView;
-
-    iput-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;->recycler:Landroidx/recyclerview/widget/RecyclerView;
-
-    const v0, 0x7f0a07b7
-
-    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
-
-    move-result-object v0
-
-    check-cast v0, Landroid/widget/FrameLayout;
-
-    iput-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;->activityContainer:Landroid/widget/FrameLayout;
-
-    const v0, 0x7f0a07b3
-
-    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;->activityDivider:Landroid/view/View;
-
-    const v0, 0x7f0a07b4
-
-    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;->identitiesDivider:Landroid/view/View;
-
-    const v0, 0x7f0a07b5
-
-    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;->identitiesHeader:Landroid/view/View;
-
-    new-instance p1, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter;
-
-    iget-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;->recycler:Landroidx/recyclerview/widget/RecyclerView;
-
-    invoke-direct {p1, v0}, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
-
-    invoke-static {p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;->configure(Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
-
-    move-result-object p1
-
-    check-cast p1, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter;
-
-    iput-object p1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;->adapter:Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter;
-
-    iget-object p1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;->recycler:Landroidx/recyclerview/widget/RecyclerView;
-
-    const/4 v0, 0x0
-
-    invoke-virtual {p1, v0}, Landroidx/recyclerview/widget/RecyclerView;->setHasFixedSize(Z)V
-
-    return-void
-.end method
-
-.method public onViewBoundOrOnResume()V
-    .locals 3
-
-    invoke-super {p0}, Lcom/discord/app/AppFragment;->onViewBoundOrOnResume()V
-
-    invoke-direct {p0}, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;->getUserId()J
-
-    move-result-wide v0
-
-    invoke-static {v0, v1}, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;->get(J)Lrx/Observable;
-
-    move-result-object v0
-
-    invoke-static {p0}, Lcom/discord/app/i;->b(Lcom/discord/app/AppComponent;)Lrx/Observable$c;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Lrx/Observable;->a(Lrx/Observable$c;)Lrx/Observable;
-
-    move-result-object v0
-
-    new-instance v1, Lcom/discord/widgets/user/profile/-$$Lambda$CAZX9HinCfGUrxKDysE1a1e8gPI;
-
-    invoke-direct {v1, p0}, Lcom/discord/widgets/user/profile/-$$Lambda$CAZX9HinCfGUrxKDysE1a1e8gPI;-><init>(Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;)V
-
-    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
-
-    move-result-object v2
-
-    invoke-static {v1, v2}, Lcom/discord/app/i;->a(Lrx/functions/Action1;Ljava/lang/Class;)Lrx/Observable$c;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Lrx/Observable;->a(Lrx/Observable$c;)Lrx/Observable;
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileStrip$Model$Companion.smali b/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileStrip$Model$Companion.smali
index 2a69bd68cc..5d22c37e7e 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 ed08860647..7d1d12d4ca 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 b50126ce81..fad07900e3 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, 0x7f0a0551
+    const v0, 0x7f0a0542
 
     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, 0x7f0a0552
+    const v0, 0x7f0a0543
 
     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, 0x7f0a0558
+    const v0, 0x7f0a0549
 
     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, 0x7f0a0555
+    const v0, 0x7f0a0546
 
     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, 0x7f0a0553
+    const v0, 0x7f0a0544
 
     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, 0x7f0a0556
+    const v0, 0x7f0a0547
 
     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, 0x7f0a0557
+    const v0, 0x7f0a0548
 
     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, 0x7f0a0554
+    const v0, 0x7f0a0545
 
     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, 0x7f080379
+    const v2, 0x7f08036d
 
     goto :goto_2
 
     :cond_3
-    const v2, 0x7f0802c8
+    const v2, 0x7f0802bc
 
     :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, 0x7f0d01dc
+    const v0, 0x7f0d01d1
 
     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 0a075d9886..c33ced561a 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, 0x7f0a03f3
+    const p1, 0x7f0a03ee
 
     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, 0x7f0a040b
+    const p1, 0x7f0a0406
 
     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, 0x7f0a03dc
+    const p1, 0x7f0a03d7
 
     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, 0x7f0a03ee
+    const p1, 0x7f0a03e9
 
     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, 0x7f0a040a
+    const p1, 0x7f0a0405
 
     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, 0x7f0a040e
+    const p1, 0x7f0a0409
 
     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, 0x7f0d008b
+    const p3, 0x7f0d008a
 
     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, 0x7f080227
+    const v9, 0x7f08021c
 
     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, 0x7f08022f
+    const v9, 0x7f080224
 
     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, 0x7f060155
+    const v4, 0x7f060154
 
     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, 0x7f1206df
+    const v1, 0x7f1206ba
 
     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 7c88b25217..d4da19bfdb 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, 0x7f1213af
+    const v1, 0x7f121323
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -87,7 +87,7 @@
 
     aput-object v1, v0, v2
 
-    const v1, 0x7f121224
+    const v1, 0x7f121197
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -107,7 +107,7 @@
 
     aput-object v1, v0, v2
 
-    const v1, 0x7f1213fe
+    const v1, 0x7f121372
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -127,7 +127,7 @@
 
     aput-object v1, v0, v2
 
-    const v1, 0x7f1210e3
+    const v1, 0x7f121057
 
     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 e0947faf87..3c48667748 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 4c4329166a..87cf7fe63c 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 ad63a12e74..7b661e9d22 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 e8ba67604f..8ec0b455ab 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 aca4504697..b87b3ba4ed 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 0615b23979..26ac9ebbab 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 988697d59b..cac50d41f5 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 b00f6ef3f0..8daf308934 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, 0x7f0a0326
+    const v0, 0x7f0a0325
 
     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, 0x7f0a0324
+    const v0, 0x7f0a0323
 
     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, 0x7f0a0327
+    const v0, 0x7f0a0326
 
     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, 0x7f0a0323
+    const v0, 0x7f0a0322
 
     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, 0x7f0a0325
+    const v0, 0x7f0a0324
 
     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, 0x7f0a05c3
+    const v0, 0x7f0a05aa
 
     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, 0x7f0a05cd
+    const v0, 0x7f0a05b4
 
     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, 0x7f0a05c7
+    const v0, 0x7f0a05ae
 
     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, 0x7f0a05ca
+    const v0, 0x7f0a05b1
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -806,50 +806,21 @@
 .end method
 
 .method private final handleOnSelected(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel;Landroid/view/View;ILcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;Z)V
-    .locals 6
+    .locals 12
 
-    instance-of v0, p4, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemUser;
+    move-object/from16 v0, p4
 
-    const-string v1, "view.context"
+    instance-of v1, v0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemUser;
 
-    if-eqz v0, :cond_1
+    const-string v2, "view.context"
+
+    if-eqz v1, :cond_1
 
     if-eqz p5, :cond_0
 
-    invoke-virtual {p2}, Landroid/view/View;->getContext()Landroid/content/Context;
+    sget-object v3, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->Companion:Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;
 
-    move-result-object p2
-
-    move-object v0, p4
-
-    check-cast v0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemUser;
-
-    invoke-virtual {v0}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemUser;->getUser()Lcom/discord/models/domain/ModelUser;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->getId()J
-
-    move-result-wide v0
-
-    invoke-static {p2, v0, v1}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->launch(Landroid/content/Context;J)V
-
-    goto :goto_0
-
-    :cond_0
-    sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
-
-    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getChannelsSelected()Lcom/discord/stores/StoreChannelsSelected;
-
-    move-result-object v0
-
-    invoke-virtual {p2}, Landroid/view/View;->getContext()Landroid/content/Context;
-
-    move-result-object p2
-
-    invoke-static {p2, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    move-object v1, p4
+    move-object v1, v0
 
     check-cast v1, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemUser;
 
@@ -859,87 +830,138 @@
 
     invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser;->getId()J
 
-    move-result-wide v1
+    move-result-wide v4
 
-    invoke-virtual {v0, p2, v1, v2}, Lcom/discord/stores/StoreChannelsSelected;->findAndSetDirectMessage(Landroid/content/Context;J)V
+    const/4 v6, 0x0
+
+    invoke-virtual {p0}, Lcom/discord/widgets/user/search/WidgetGlobalSearch;->requireFragmentManager()Landroidx/fragment/app/FragmentManager;
+
+    move-result-object v7
+
+    const-string v1, "requireFragmentManager()"
+
+    invoke-static {v7, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v8, 0x0
+
+    const/4 v9, 0x0
+
+    const/16 v10, 0x1a
+
+    const/4 v11, 0x0
+
+    invoke-static/range {v3 .. v11}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;->show$default(Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;JLjava/lang/Long;Landroidx/fragment/app/FragmentManager;Ljava/lang/Long;Ljava/lang/Boolean;ILjava/lang/Object;)V
+
+    goto :goto_0
+
+    :cond_0
+    sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+
+    invoke-virtual {v1}, Lcom/discord/stores/StoreStream$Companion;->getChannelsSelected()Lcom/discord/stores/StoreChannelsSelected;
+
+    move-result-object v1
+
+    invoke-virtual {p2}, Landroid/view/View;->getContext()Landroid/content/Context;
+
+    move-result-object v3
+
+    invoke-static {v3, v2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    move-object v2, v0
+
+    check-cast v2, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemUser;
+
+    invoke-virtual {v2}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemUser;->getUser()Lcom/discord/models/domain/ModelUser;
+
+    move-result-object v2
+
+    invoke-virtual {v2}, Lcom/discord/models/domain/ModelUser;->getId()J
+
+    move-result-wide v4
+
+    invoke-virtual {v1, v3, v4, v5}, Lcom/discord/stores/StoreChannelsSelected;->findAndSetDirectMessage(Landroid/content/Context;J)V
 
     goto :goto_0
 
     :cond_1
-    instance-of v0, p4, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemChannel;
+    instance-of v1, v0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemChannel;
 
-    if-eqz v0, :cond_2
+    if-eqz v1, :cond_2
 
-    sget-object v0, 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 {v0}, Lcom/discord/stores/StoreStream$Companion;->getChannelsSelected()Lcom/discord/stores/StoreChannelsSelected;
-
-    move-result-object v0
-
-    invoke-virtual {p2}, Landroid/view/View;->getContext()Landroid/content/Context;
-
-    move-result-object p2
-
-    invoke-static {p2, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    move-object v1, p4
-
-    check-cast v1, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemChannel;
-
-    invoke-virtual {v1}, 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 {v1}, Lcom/discord/models/domain/ModelChannel;->getId()J
+    invoke-virtual {p2}, Landroid/view/View;->getContext()Landroid/content/Context;
 
-    move-result-wide v1
+    move-result-object v3
 
-    invoke-virtual {v0, p2, v1, v2}, Lcom/discord/stores/StoreChannelsSelected;->findAndSet(Landroid/content/Context;J)V
+    invoke-static {v3, v2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    move-object v2, v0
+
+    check-cast v2, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemChannel;
+
+    invoke-virtual {v2}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemChannel;->getChannel()Lcom/discord/models/domain/ModelChannel;
+
+    move-result-object v2
+
+    invoke-virtual {v2}, Lcom/discord/models/domain/ModelChannel;->getId()J
+
+    move-result-wide v4
+
+    invoke-virtual {v1, v3, v4, v5}, Lcom/discord/stores/StoreChannelsSelected;->findAndSet(Landroid/content/Context;J)V
 
     goto :goto_0
 
     :cond_2
-    instance-of p2, p4, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemGuild;
+    instance-of v1, v0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemGuild;
 
-    if-eqz p2, :cond_3
+    if-eqz v1, :cond_3
 
-    sget-object p2, 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 {p2}, 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 v2
 
-    move-object p2, p4
+    move-object v1, v0
 
-    check-cast p2, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemGuild;
+    check-cast v1, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemGuild;
 
-    invoke-virtual {p2}, 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 p2
+    move-result-object v1
 
-    invoke-virtual {p2}, Lcom/discord/models/domain/ModelGuild;->getId()J
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelGuild;->getId()J
 
-    move-result-wide v1
-
-    const/4 v3, 0x0
-
-    const/4 v4, 0x2
+    move-result-wide v3
 
     const/4 v5, 0x0
 
-    invoke-static/range {v0 .. v5}, Lcom/discord/stores/StoreGuildSelected;->set$default(Lcom/discord/stores/StoreGuildSelected;JLrx/functions/Action0;ILjava/lang/Object;)V
+    const/4 v6, 0x2
+
+    const/4 v7, 0x0
+
+    invoke-static/range {v2 .. v7}, Lcom/discord/stores/StoreGuildSelected;->set$default(Lcom/discord/stores/StoreGuildSelected;JLrx/functions/Action0;ILjava/lang/Object;)V
 
     :cond_3
     :goto_0
-    instance-of p2, p4, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemHeader;
+    instance-of v1, v0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemHeader;
 
-    if-nez p2, :cond_4
+    if-nez v1, :cond_4
 
     if-nez p5, :cond_4
 
-    sget-object p2, Lcom/discord/utilities/analytics/AnalyticsTracker;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker;
+    sget-object v1, Lcom/discord/utilities/analytics/AnalyticsTracker;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker;
 
-    invoke-virtual {p2, p1, p4, p3}, Lcom/discord/utilities/analytics/AnalyticsTracker;->quickSwitcherSelect(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel;Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;I)V
+    move-object v2, p1
+
+    move v3, p3
+
+    invoke-virtual {v1, p1, v0, p3}, Lcom/discord/utilities/analytics/AnalyticsTracker;->quickSwitcherSelect(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel;Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;I)V
 
     invoke-virtual {p0}, Lcom/discord/widgets/user/search/WidgetGlobalSearch;->dismiss()V
 
@@ -1186,9 +1208,9 @@
 
     check-cast v1, [Ljava/lang/String;
 
-    sget-object v2, Lcom/discord/dialogs/e;->xD:Lcom/discord/dialogs/e$a;
+    sget-object v2, Lcom/discord/dialogs/e;->xF:Lcom/discord/dialogs/e$a;
 
-    const v2, 0x7f1205e8
+    const v2, 0x7f1205c3
 
     invoke-virtual {p0, v2}, Lcom/discord/widgets/user/search/WidgetGlobalSearch;->getString(I)Ljava/lang/String;
 
@@ -1255,7 +1277,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0125
+    const v0, 0x7f0d0123
 
     return v0
 .end method
@@ -1344,7 +1366,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f0402b6
+    const v3, 0x7f0402b5
 
     invoke-static {p1, v3}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/view/View;I)I
 
@@ -1366,7 +1388,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f120f7e
+    const v0, 0x7f120ef2
 
     invoke-virtual {p1, v0}, Landroid/widget/EditText;->setHint(I)V
 
@@ -1582,7 +1604,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v2
 
@@ -1590,7 +1612,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->IU()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->IS()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 65fef49080..613a225865 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, 0x7f0d00d5
+    const v0, 0x7f0d00d3
 
     invoke-direct {p0, v0, p1}, Lcom/discord/widgets/user/search/WidgetGlobalSearchAdapter$Item;-><init>(ILcom/discord/widgets/user/search/WidgetGlobalSearchAdapter;)V
 
-    const p1, 0x7f0a03f2
+    const p1, 0x7f0a03ed
 
     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 db758cfc75..3a80f7dcb6 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, 0x7f0d00d4
+    const v0, 0x7f0d00d2
 
     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 6e7725af9d..fbaffea98c 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 a988a5600d..802f6b7bd9 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, 0x7f120970
+    const p3, 0x7f12093a
 
     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, 0x7f04028b
+    const v3, 0x7f04028a
 
     const/4 v4, 0x2
 
@@ -238,7 +238,7 @@
 
     invoke-virtual {p1, v0}, Landroid/widget/TextView;->setBackgroundResource(I)V
 
-    const v0, 0x7f120bd8
+    const v0, 0x7f120ba2
 
     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 69c95f663d..843f31d872 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, 0x7f0a0386
+    const p1, 0x7f0a0381
 
     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, 0x7f0a0387
+    const p1, 0x7f0a0382
 
     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 45e4df0528..2fbe8b0811 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, 0x7f0a0383
+    const p1, 0x7f0a037e
 
     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, 0x7f0a0384
+    const p1, 0x7f0a037f
 
     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, 0x7f0a038c
+    const p1, 0x7f0a0387
 
     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, 0x7f0a0391
+    const p1, 0x7f0a038c
 
     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, 0x7f0a0390
+    const p1, 0x7f0a038b
 
     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, 0x7f0a038f
+    const p1, 0x7f0a038a
 
     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 06ab3f4562..38168d0aed 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 75472d183d..63d54f313b 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 a33e65e04a..00211aa5fc 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, 0x7f0d0128
+    const p2, 0x7f0d0126
 
     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, 0x7f0d0127
+    const p2, 0x7f0d0125
 
     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, 0x7f0d0126
+    const p2, 0x7f0d0124
 
     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 ffa4adcead..5c7554b471 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -230,7 +230,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -311,7 +311,7 @@
 
     move-result-object v2
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v3
 
@@ -432,7 +432,7 @@
 
     move-result-object v2
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v3
 
@@ -484,7 +484,7 @@
 
     move-result-object v2
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v3
 
@@ -542,7 +542,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v2
 
@@ -1330,7 +1330,7 @@
 
     new-instance v2, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemHeader;
 
-    const v6, 0x7f1211b9
+    const v6, 0x7f12112c
 
     const/4 v7, 0x0
 
@@ -1365,7 +1365,7 @@
 
     new-instance v12, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemHeader;
 
-    const v7, 0x7f120f7b
+    const v7, 0x7f120eef
 
     const/4 v8, 0x0
 
@@ -1393,7 +1393,7 @@
 
     new-instance v11, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemHeader;
 
-    const v6, 0x7f1211b9
+    const v6, 0x7f12112c
 
     const/4 v7, 0x0
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/UserProfileVoiceSettingsView$ViewState.smali b/com.discord/smali/com/discord/widgets/user/usersheet/UserProfileVoiceSettingsView$ViewState.smali
similarity index 100%
rename from com.discord/smali_classes2/com/discord/widgets/user/usersheet/UserProfileVoiceSettingsView$ViewState.smali
rename to com.discord/smali/com/discord/widgets/user/usersheet/UserProfileVoiceSettingsView$ViewState.smali
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/UserProfileVoiceSettingsView$sam$android_widget_CompoundButton_OnCheckedChangeListener$0.smali b/com.discord/smali/com/discord/widgets/user/usersheet/UserProfileVoiceSettingsView$sam$android_widget_CompoundButton_OnCheckedChangeListener$0.smali
similarity index 100%
rename from com.discord/smali_classes2/com/discord/widgets/user/usersheet/UserProfileVoiceSettingsView$sam$android_widget_CompoundButton_OnCheckedChangeListener$0.smali
rename to com.discord/smali/com/discord/widgets/user/usersheet/UserProfileVoiceSettingsView$sam$android_widget_CompoundButton_OnCheckedChangeListener$0.smali
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/UserProfileVoiceSettingsView$setOnVolumeChange$1.smali b/com.discord/smali/com/discord/widgets/user/usersheet/UserProfileVoiceSettingsView$setOnVolumeChange$1.smali
similarity index 100%
rename from com.discord/smali_classes2/com/discord/widgets/user/usersheet/UserProfileVoiceSettingsView$setOnVolumeChange$1.smali
rename to com.discord/smali/com/discord/widgets/user/usersheet/UserProfileVoiceSettingsView$setOnVolumeChange$1.smali
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/UserProfileVoiceSettingsView.smali b/com.discord/smali/com/discord/widgets/user/usersheet/UserProfileVoiceSettingsView.smali
similarity index 99%
rename from com.discord/smali_classes2/com/discord/widgets/user/usersheet/UserProfileVoiceSettingsView.smali
rename to com.discord/smali/com/discord/widgets/user/usersheet/UserProfileVoiceSettingsView.smali
index d73cf66a5c..91c47a7716 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/UserProfileVoiceSettingsView.smali
+++ b/com.discord/smali/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, 0x7f0a080e
+    const p2, 0x7f0a07d5
 
     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, 0x7f0a081a
+    const p2, 0x7f0a07e0
 
     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, 0x7f0d0070
+    const v0, 0x7f0d006f
 
     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$enqueueNotice$showUserSheetNotice$1.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$Companion$enqueueNotice$showUserSheetNotice$1.smali
new file mode 100644
index 0000000000..0e5b13a189
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$Companion$enqueueNotice$showUserSheetNotice$1.smali
@@ -0,0 +1,125 @@
+.class final Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion$enqueueNotice$showUserSheetNotice$1;
+.super Lkotlin/jvm/internal/m;
+.source "WidgetUserSheet.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;->enqueueNotice(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/Function1<",
+        "Landroidx/fragment/app/FragmentActivity;",
+        "Ljava/lang/Boolean;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic $noticeName:Ljava/lang/String;
+
+.field final synthetic $storeNotices:Lcom/discord/stores/StoreNotices;
+
+.field final synthetic $userId:J
+
+
+# direct methods
+.method constructor <init>(JLcom/discord/stores/StoreNotices;Ljava/lang/String;)V
+    .locals 0
+
+    iput-wide p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion$enqueueNotice$showUserSheetNotice$1;->$userId:J
+
+    iput-object p3, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion$enqueueNotice$showUserSheetNotice$1;->$storeNotices:Lcom/discord/stores/StoreNotices;
+
+    iput-object p4, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion$enqueueNotice$showUserSheetNotice$1;->$noticeName: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 synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 0
+
+    check-cast p1, Landroidx/fragment/app/FragmentActivity;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion$enqueueNotice$showUserSheetNotice$1;->invoke(Landroidx/fragment/app/FragmentActivity;)Z
+
+    move-result p1
+
+    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public final invoke(Landroidx/fragment/app/FragmentActivity;)Z
+    .locals 17
+
+    move-object/from16 v0, p0
+
+    const-string v1, "fragmentActivity"
+
+    move-object/from16 v2, p1
+
+    invoke-static {v2, v1}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->Companion:Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;
+
+    iget-wide v3, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion$enqueueNotice$showUserSheetNotice$1;->$userId:J
+
+    invoke-virtual/range {p1 .. p1}, Landroidx/fragment/app/FragmentActivity;->getSupportFragmentManager()Landroidx/fragment/app/FragmentManager;
+
+    move-result-object v6
+
+    const-string v2, "fragmentActivity.supportFragmentManager"
+
+    invoke-static {v6, v2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v5, 0x0
+
+    const/4 v7, 0x0
+
+    const/4 v8, 0x0
+
+    const/16 v9, 0x1a
+
+    const/4 v10, 0x0
+
+    move-object v2, v1
+
+    invoke-static/range {v2 .. v10}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;->show$default(Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;JLjava/lang/Long;Landroidx/fragment/app/FragmentManager;Ljava/lang/Long;Ljava/lang/Boolean;ILjava/lang/Object;)V
+
+    iget-object v11, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion$enqueueNotice$showUserSheetNotice$1;->$storeNotices:Lcom/discord/stores/StoreNotices;
+
+    iget-object v12, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion$enqueueNotice$showUserSheetNotice$1;->$noticeName:Ljava/lang/String;
+
+    const-wide/16 v13, 0x0
+
+    const/4 v15, 0x2
+
+    const/16 v16, 0x0
+
+    invoke-static/range {v11 .. v16}, Lcom/discord/stores/StoreNotices;->markSeen$default(Lcom/discord/stores/StoreNotices;Ljava/lang/String;JILjava/lang/Object;)V
+
+    const/4 v1, 0x1
+
+    return v1
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$Companion.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$Companion.smali
new file mode 100644
index 0000000000..d59b642c90
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$Companion.smali
@@ -0,0 +1,314 @@
+.class public final Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;
+.super Ljava/lang/Object;
+.source "WidgetUserSheet.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "Companion"
+.end annotation
+
+
+# direct methods
+.method private constructor <init>()V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+.method public synthetic constructor <init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+    .locals 0
+
+    invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;-><init>()V
+
+    return-void
+.end method
+
+.method private final getNoticeName(J)Ljava/lang/String;
+    .locals 0
+
+    invoke-static {p1, p2}, Ljava/lang/String;->valueOf(J)Ljava/lang/String;
+
+    move-result-object p1
+
+    const-string p2, "User Sheet Notice for user ID: "
+
+    invoke-virtual {p2, p1}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p1
+
+    const-string p2, "StringBuilder(\"User Shee\u2026)\n            .toString()"
+
+    invoke-static {p1, p2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object p1
+.end method
+
+.method public static synthetic show$default(Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;JLjava/lang/Long;Landroidx/fragment/app/FragmentManager;Ljava/lang/Long;Ljava/lang/Boolean;ILjava/lang/Object;)V
+    .locals 9
+
+    and-int/lit8 v0, p7, 0x2
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_0
+
+    move-object v5, v1
+
+    goto :goto_0
+
+    :cond_0
+    move-object v5, p3
+
+    :goto_0
+    and-int/lit8 v0, p7, 0x8
+
+    if-eqz v0, :cond_1
+
+    move-object v7, v1
+
+    goto :goto_1
+
+    :cond_1
+    move-object v7, p5
+
+    :goto_1
+    and-int/lit8 v0, p7, 0x10
+
+    if-eqz v0, :cond_2
+
+    move-object v8, v1
+
+    goto :goto_2
+
+    :cond_2
+    move-object v8, p6
+
+    :goto_2
+    move-object v2, p0
+
+    move-wide v3, p1
+
+    move-object v6, p4
+
+    invoke-virtual/range {v2 .. v8}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;->show(JLjava/lang/Long;Landroidx/fragment/app/FragmentManager;Ljava/lang/Long;Ljava/lang/Boolean;)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final enqueueNotice(J)V
+    .locals 19
+
+    move-wide/from16 v0, p1
+
+    sget-object v2, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+
+    invoke-virtual {v2}, Lcom/discord/stores/StoreStream$Companion;->getNotices()Lcom/discord/stores/StoreNotices;
+
+    move-result-object v2
+
+    move-object/from16 v3, p0
+
+    check-cast v3, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;
+
+    invoke-direct {v3, v0, v1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;->getNoticeName(J)Ljava/lang/String;
+
+    move-result-object v5
+
+    new-instance v3, Lcom/discord/stores/StoreNotices$Notice;
+
+    new-instance v4, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion$enqueueNotice$showUserSheetNotice$1;
+
+    invoke-direct {v4, v0, v1, v2, v5}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion$enqueueNotice$showUserSheetNotice$1;-><init>(JLcom/discord/stores/StoreNotices;Ljava/lang/String;)V
+
+    move-object/from16 v16, v4
+
+    check-cast v16, Lkotlin/jvm/functions/Function1;
+
+    const-wide/16 v6, 0x0
+
+    const/4 v8, 0x0
+
+    const/4 v9, 0x0
+
+    const/4 v10, 0x0
+
+    const/4 v11, 0x0
+
+    const-wide/16 v12, 0x0
+
+    const-wide/16 v14, 0x0
+
+    const/16 v17, 0x3a
+
+    const/16 v18, 0x0
+
+    move-object v4, v3
+
+    invoke-direct/range {v4 .. v18}, 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, v3}, Lcom/discord/stores/StoreNotices;->requestToShow(Lcom/discord/stores/StoreNotices$Notice;)V
+
+    return-void
+.end method
+
+.method public final show(JLandroidx/fragment/app/FragmentManager;)V
+    .locals 9
+
+    const/4 v3, 0x0
+
+    const/4 v5, 0x0
+
+    const/4 v6, 0x0
+
+    const/16 v7, 0x1a
+
+    const/4 v8, 0x0
+
+    move-object v0, p0
+
+    move-wide v1, p1
+
+    move-object v4, p3
+
+    invoke-static/range {v0 .. v8}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;->show$default(Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;JLjava/lang/Long;Landroidx/fragment/app/FragmentManager;Ljava/lang/Long;Ljava/lang/Boolean;ILjava/lang/Object;)V
+
+    return-void
+.end method
+
+.method public final show(JLjava/lang/Long;Landroidx/fragment/app/FragmentManager;)V
+    .locals 9
+
+    const/4 v5, 0x0
+
+    const/4 v6, 0x0
+
+    const/16 v7, 0x18
+
+    const/4 v8, 0x0
+
+    move-object v0, p0
+
+    move-wide v1, p1
+
+    move-object v3, p3
+
+    move-object v4, p4
+
+    invoke-static/range {v0 .. v8}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;->show$default(Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;JLjava/lang/Long;Landroidx/fragment/app/FragmentManager;Ljava/lang/Long;Ljava/lang/Boolean;ILjava/lang/Object;)V
+
+    return-void
+.end method
+
+.method public final show(JLjava/lang/Long;Landroidx/fragment/app/FragmentManager;Ljava/lang/Long;)V
+    .locals 9
+
+    const/4 v6, 0x0
+
+    const/16 v7, 0x10
+
+    const/4 v8, 0x0
+
+    move-object v0, p0
+
+    move-wide v1, p1
+
+    move-object v3, p3
+
+    move-object v4, p4
+
+    move-object v5, p5
+
+    invoke-static/range {v0 .. v8}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;->show$default(Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;JLjava/lang/Long;Landroidx/fragment/app/FragmentManager;Ljava/lang/Long;Ljava/lang/Boolean;ILjava/lang/Object;)V
+
+    return-void
+.end method
+
+.method public final show(JLjava/lang/Long;Landroidx/fragment/app/FragmentManager;Ljava/lang/Long;Ljava/lang/Boolean;)V
+    .locals 3
+
+    const-string v0, "fragmentManager"
+
+    invoke-static {p4, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+
+    invoke-direct {v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;-><init>()V
+
+    new-instance v1, Landroid/os/Bundle;
+
+    invoke-direct {v1}, Landroid/os/Bundle;-><init>()V
+
+    const-string v2, "ARG_USER_ID"
+
+    invoke-virtual {v1, v2, p1, p2}, Landroid/os/Bundle;->putLong(Ljava/lang/String;J)V
+
+    if-eqz p3, :cond_0
+
+    invoke-virtual {p3}, Ljava/lang/Long;->longValue()J
+
+    move-result-wide p1
+
+    const-string p3, "ARG_CHANNEL_ID"
+
+    invoke-virtual {v1, p3, p1, p2}, Landroid/os/Bundle;->putLong(Ljava/lang/String;J)V
+
+    :cond_0
+    if-eqz p5, :cond_1
+
+    check-cast p5, Ljava/lang/Number;
+
+    invoke-virtual {p5}, Ljava/lang/Number;->longValue()J
+
+    move-result-wide p1
+
+    const-string p3, "ARG_GUILD_ID"
+
+    invoke-virtual {v1, p3, p1, p2}, Landroid/os/Bundle;->putLong(Ljava/lang/String;J)V
+
+    :cond_1
+    if-eqz p6, :cond_2
+
+    invoke-virtual {p6}, Ljava/lang/Boolean;->booleanValue()Z
+
+    move-result p1
+
+    goto :goto_0
+
+    :cond_2
+    const/4 p1, 0x0
+
+    :goto_0
+    const-string p2, "ARG_IS_VOICE_CONTEXT"
+
+    invoke-virtual {v1, p2, p1}, Landroid/os/Bundle;->putBoolean(Ljava/lang/String;Z)V
+
+    invoke-virtual {v0, v1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->setArguments(Landroid/os/Bundle;)V
+
+    invoke-virtual {v0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Ljava/lang/Class;->getName()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-virtual {v0, p4, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->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$bindSubscriptions$1.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$bindSubscriptions$1.smali
similarity index 98%
rename from com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$bindSubscriptions$1.smali
rename to com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$bindSubscriptions$1.smali
index 3597cd20dd..da1484e1a6 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$bindSubscriptions$1.smali
+++ b/com.discord/smali/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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$bindSubscriptions$2.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$bindSubscriptions$2.smali
similarity index 98%
rename from com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$bindSubscriptions$2.smali
rename to com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$bindSubscriptions$2.smali
index 73e4d3c31b..85c3c867d3 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$bindSubscriptions$2.smali
+++ b/com.discord/smali/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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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/com/discord/widgets/user/usersheet/WidgetUserSheet$configureConnectionsSection$onConnectedAccountClick$1.smali
similarity index 97%
rename from com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureConnectionsSection$onConnectedAccountClick$1.smali
rename to com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureConnectionsSection$onConnectedAccountClick$1.smali
index 7f9c90a899..d43a3bda1c 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureConnectionsSection$onConnectedAccountClick$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureConnectionsSection$onConnectedAccountClick$1.smali
@@ -63,7 +63,7 @@
 
     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;
+    sget-object p1, Lkotlin/Unit;->bgt: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 v1, Lcom/discord/dialogs/a;->xg:Lcom/discord/dialogs/a$a;
+    sget-object v1, Lcom/discord/dialogs/a;->xi: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;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureConnectionsSection$onMutualFriendsItemClick$1.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureConnectionsSection$onMutualFriendsItemClick$1.smali
similarity index 72%
rename from com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureConnectionsSection$onMutualFriendsItemClick$1.smali
rename to com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureConnectionsSection$onMutualFriendsItemClick$1.smali
index e492cdeb62..ec515050bd 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureConnectionsSection$onMutualFriendsItemClick$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureConnectionsSection$onMutualFriendsItemClick$1.smali
@@ -27,18 +27,18 @@
 
 
 # instance fields
-.field final synthetic $userId:J
+.field final synthetic $user:Lcom/discord/models/domain/ModelUser;
 
 .field final synthetic this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;J)V
+.method constructor <init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;Lcom/discord/models/domain/ModelUser;)V
     .locals 0
 
     iput-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$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
+    iput-object p2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureConnectionsSection$onMutualFriendsItemClick$1;->$user:Lcom/discord/models/domain/ModelUser;
 
     const/4 p1, 0x0
 
@@ -54,23 +54,23 @@
 
     invoke-virtual {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureConnectionsSection$onMutualFriendsItemClick$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object v0
 .end method
 
 .method public final invoke()V
-    .locals 4
+    .locals 3
 
     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
+    iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureConnectionsSection$onMutualFriendsItemClick$1;->$user:Lcom/discord/models/domain/ModelUser;
 
-    const/16 v3, 0xfa2
+    const/16 v2, 0xfa2
 
-    invoke-static {v0, v1, v2, v3}, Lcom/discord/widgets/user/WidgetUserMutualFriends;->show(Landroidx/fragment/app/Fragment;JI)V
+    invoke-static {v0, v1, v2}, Lcom/discord/widgets/user/WidgetUserMutualFriends;->show(Landroidx/fragment/app/Fragment;Lcom/discord/models/domain/ModelUser;I)V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureConnectionsSection$onMutualGuildsItemClick$1.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureConnectionsSection$onMutualGuildsItemClick$1.smali
similarity index 76%
rename from com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureConnectionsSection$onMutualGuildsItemClick$1.smali
rename to com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureConnectionsSection$onMutualGuildsItemClick$1.smali
index 81ee5c0fad..05f64c81bb 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureConnectionsSection$onMutualGuildsItemClick$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureConnectionsSection$onMutualGuildsItemClick$1.smali
@@ -27,18 +27,18 @@
 
 
 # instance fields
-.field final synthetic $userId:J
+.field final synthetic $user:Lcom/discord/models/domain/ModelUser;
 
 .field final synthetic this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;J)V
+.method constructor <init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;Lcom/discord/models/domain/ModelUser;)V
     .locals 0
 
     iput-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$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
+    iput-object p2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureConnectionsSection$onMutualGuildsItemClick$1;->$user:Lcom/discord/models/domain/ModelUser;
 
     const/4 p1, 0x0
 
@@ -54,7 +54,7 @@
 
     invoke-virtual {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureConnectionsSection$onMutualGuildsItemClick$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object v0
 .end method
@@ -66,7 +66,11 @@
 
     check-cast v0, Landroidx/fragment/app/Fragment;
 
-    iget-wide v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureConnectionsSection$onMutualGuildsItemClick$1;->$userId:J
+    iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureConnectionsSection$onMutualGuildsItemClick$1;->$user:Lcom/discord/models/domain/ModelUser;
+
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser;->getId()J
+
+    move-result-wide v1
 
     const/16 v3, 0xfa1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureDeveloperSection$$inlined$apply$lambda$1.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureDeveloperSection$$inlined$apply$lambda$1.smali
similarity index 100%
rename from com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureDeveloperSection$$inlined$apply$lambda$1.smali
rename to com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureDeveloperSection$$inlined$apply$lambda$1.smali
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureIncomingFriendRequest$1.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureIncomingFriendRequest$1.smali
similarity index 100%
rename from com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureIncomingFriendRequest$1.smali
rename to com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureIncomingFriendRequest$1.smali
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureIncomingFriendRequest$2.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureIncomingFriendRequest$2.smali
similarity index 100%
rename from com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureIncomingFriendRequest$2.smali
rename to com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureIncomingFriendRequest$2.smali
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$1.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$1.smali
similarity index 100%
rename from com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$1.smali
rename to com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$1.smali
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$2.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$2.smali
similarity index 100%
rename from com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$2.smali
rename to com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$2.smali
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$3.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$3.smali
similarity index 100%
rename from com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$3.smali
rename to com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$3.smali
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$4.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$4.smali
similarity index 100%
rename from com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$4.smali
rename to com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$4.smali
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$1.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$1.smali
similarity index 97%
rename from com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$1.smali
rename to com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$1.smali
index 6785e73b3a..228cd372c7 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$1.smali
+++ b/com.discord/smali/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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$2.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$2.smali
similarity index 97%
rename from com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$2.smali
rename to com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$2.smali
index 8708313a55..a9878d70fe 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$2.smali
+++ b/com.discord/smali/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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$3.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$3.smali
similarity index 97%
rename from com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$3.smali
rename to com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$3.smali
index a2f2e5d771..0c0b86d589 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$3.smali
+++ b/com.discord/smali/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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5.smali
similarity index 99%
rename from com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5.smali
rename to com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5.smali
index 91c8a5ab4b..86276c2dba 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5.smali
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5.smali
@@ -101,7 +101,7 @@
     return-void
 
     :cond_1
-    sget-object p1, Lcom/discord/dialogs/b;->xi:Lcom/discord/dialogs/b;
+    sget-object p1, Lcom/discord/dialogs/b;->xk:Lcom/discord/dialogs/b;
 
     iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onActivityResult$1.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$onActivityResult$1.smali
similarity index 98%
rename from com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onActivityResult$1.smali
rename to com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$onActivityResult$1.smali
index ed06ac13bd..1ef8314034 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onActivityResult$1.smali
+++ b/com.discord/smali/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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$1.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$1.smali
similarity index 97%
rename from com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$1.smali
rename to com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$1.smali
index ff5a13fc2a..2356cebdd3 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$1.smali
+++ b/com.discord/smali/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;->xO:Lcom/discord/dialogs/a/a$a;
+    sget-object p1, Lcom/discord/dialogs/a/a;->xQ: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_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$11.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$10.smali
similarity index 90%
rename from com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$11.smali
rename to com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$10.smali
index cedf5a7cc2..1037e2bbbd 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$11.smali
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$10.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$11;
+.class final Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$10;
 .super Ljava/lang/Object;
 .source "WidgetUserSheet.kt"
 
@@ -25,7 +25,7 @@
 .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;
+    iput-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$10;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -39,13 +39,13 @@
 
     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;
+    iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$10;->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;
+    iget-object p2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$10;->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;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$3.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$2.smali
similarity index 89%
rename from com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$3.smali
rename to com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$2.smali
index 399c55c78c..f20f8c74cf 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$3.smali
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$2.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$3;
+.class final Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$2;
 .super Lkotlin/jvm/internal/m;
 .source "WidgetUserSheet.kt"
 
@@ -36,7 +36,7 @@
 .method constructor <init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$3;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+    iput-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$2;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
 
     const/4 p1, 0x2
 
@@ -58,9 +58,9 @@
 
     move-result p2
 
-    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$3;->invoke(Landroid/widget/CompoundButton;Z)V
+    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$2;->invoke(Landroid/widget/CompoundButton;Z)V
 
-    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -72,7 +72,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$3;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+    iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$2;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
 
     invoke-static {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->access$getViewModel$p(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;)Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$4.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$3.smali
similarity index 89%
rename from com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$4.smali
rename to com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$3.smali
index 1ba07ecd35..49d83cc997 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$4.smali
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$3.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$4;
+.class final Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$3;
 .super Lkotlin/jvm/internal/m;
 .source "WidgetUserSheet.kt"
 
@@ -36,7 +36,7 @@
 .method constructor <init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$4;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+    iput-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$3;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
 
     const/4 p1, 0x2
 
@@ -62,9 +62,9 @@
 
     move-result p2
 
-    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$4;->invoke(IZ)V
+    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$3;->invoke(IZ)V
 
-    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -74,7 +74,7 @@
 
     if-eqz p2, :cond_0
 
-    iget-object p2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$4;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+    iget-object p2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$3;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
 
     invoke-static {p2}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->access$getViewModel$p(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;)Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$10.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$4.smali
similarity index 83%
rename from com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$10.smali
rename to com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$4.smali
index 1b1cc926a3..2ed98d7568 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$10.smali
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$4.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$10;
+.class final Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$4;
 .super Lkotlin/jvm/internal/m;
 .source "WidgetUserSheet.kt"
 
@@ -34,7 +34,7 @@
 .method constructor <init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$10;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+    iput-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$4;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
 
     const/4 p1, 0x0
 
@@ -48,9 +48,9 @@
 .method public final bridge synthetic invoke()Ljava/lang/Object;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$10;->invoke()V
+    invoke-virtual {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$4;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object v0
 .end method
@@ -58,13 +58,13 @@
 .method public final invoke()V
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$10;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$4;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
 
     invoke-static {v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->access$getViewModel$p(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;)Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->guildMoveForUser()V
+    invoke-virtual {v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->editMember()V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$5.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$5.smali
similarity index 95%
rename from com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$5.smali
rename to com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$5.smali
index e685280c45..6e9c59e00f 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$5.smali
+++ b/com.discord/smali/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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object v0
 .end method
@@ -64,7 +64,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->editMember()V
+    invoke-virtual {v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->kickUser()V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$6.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$6.smali
similarity index 95%
rename from com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$6.smali
rename to com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$6.smali
index 778ad79b97..c78b2ff763 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$6.smali
+++ b/com.discord/smali/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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object v0
 .end method
@@ -64,7 +64,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->kickUser()V
+    invoke-virtual {v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->banUser()V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$7.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$7.smali
similarity index 95%
rename from com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$7.smali
rename to com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$7.smali
index ad38eaa5df..0689b6e93d 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$7.smali
+++ b/com.discord/smali/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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object v0
 .end method
@@ -64,7 +64,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->banUser()V
+    invoke-virtual {v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->guildMuteUser()V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$8.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$8.smali
similarity index 95%
rename from com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$8.smali
rename to com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$8.smali
index 809f9bc40e..1c0cbe4f5f 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$8.smali
+++ b/com.discord/smali/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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object v0
 .end method
@@ -64,7 +64,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->guildMuteUser()V
+    invoke-virtual {v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->guildDeafenUser()V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$9.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$9.smali
similarity index 95%
rename from com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$9.smali
rename to com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$9.smali
index 9d8466b5d5..4e212285c1 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$9.smali
+++ b/com.discord/smali/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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object v0
 .end method
@@ -64,7 +64,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->guildDeafenUser()V
+    invoke-virtual {v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->guildMoveForUser()V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet.smali
similarity index 88%
rename from com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet.smali
rename to com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet.smali
index 7425610772..482675f389 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet.smali
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet.smali
@@ -32,8 +32,6 @@
 
 
 # instance fields
-.field private final actionsDivider$delegate:Lkotlin/properties/ReadOnlyProperty;
-
 .field private final activityDivider$delegate:Lkotlin/properties/ReadOnlyProperty;
 
 .field private activityViewHolder:Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;
@@ -44,6 +42,10 @@
 
 .field private final callActionButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
+.field private final connectionsDivider$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field private final connectionsHeader$delegate:Lkotlin/properties/ReadOnlyProperty;
+
 .field private final copyIdButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
 .field private final developerDivider$delegate:Lkotlin/properties/ReadOnlyProperty;
@@ -96,8 +98,6 @@
 
 .field private viewModel:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
 
-.field private final viewProfileButton$delegate:Lkotlin/properties/ReadOnlyProperty;
-
 
 # direct methods
 .method static constructor <clinit>()V
@@ -577,9 +577,9 @@
 
     move-result-object v3
 
-    const-string v4, "userProfileConnectionsView"
+    const-string v4, "connectionsDivider"
 
-    const-string v5, "getUserProfileConnectionsView()Lcom/discord/widgets/user/profile/UserProfileConnectionsView;"
+    const-string v5, "getConnectionsDivider()Landroid/view/View;"
 
     invoke-direct {v2, v3, v4, v5}, Lkotlin/jvm/internal/x;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
 
@@ -599,9 +599,9 @@
 
     move-result-object v3
 
-    const-string v4, "noteTextField"
+    const-string v4, "connectionsHeader"
 
-    const-string v5, "getNoteTextField()Lcom/discord/app/AppEditText;"
+    const-string v5, "getConnectionsHeader()Landroid/view/View;"
 
     invoke-direct {v2, v3, v4, v5}, Lkotlin/jvm/internal/x;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
 
@@ -621,9 +621,9 @@
 
     move-result-object v3
 
-    const-string v4, "actionsDivider"
+    const-string v4, "userProfileConnectionsView"
 
-    const-string v5, "getActionsDivider()Landroid/view/View;"
+    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
 
@@ -643,9 +643,9 @@
 
     move-result-object v3
 
-    const-string v4, "viewProfileButton"
+    const-string v4, "noteTextField"
 
-    const-string v5, "getViewProfileButton()Landroid/widget/TextView;"
+    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
 
@@ -765,7 +765,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppBottomSheet;-><init>()V
 
-    const v0, 0x7f0a080d
+    const v0, 0x7f0a07d4
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -773,7 +773,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->moreButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0816
+    const v0, 0x7f0a07dc
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -781,7 +781,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->userProfileHeaderView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0815
+    const v0, 0x7f0a07db
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -789,7 +789,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->profileActionsDivider$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0814
+    const v0, 0x7f0a07da
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -797,7 +797,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->profileActionsContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a080c
+    const v0, 0x7f0a07d3
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -805,7 +805,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->messageActionButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07fc
+    const v0, 0x7f0a07c3
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -813,7 +813,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->callActionButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0819
+    const v0, 0x7f0a07df
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -821,7 +821,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->videoActionButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07f8
+    const v0, 0x7f0a07bf
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -829,7 +829,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->addFriendActionButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0812
+    const v0, 0x7f0a07d9
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -837,7 +837,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->pendingFriendRequestActionButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a080a
+    const v0, 0x7f0a07d1
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -845,7 +845,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->incomingFriendRequestDivider$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a080b
+    const v0, 0x7f0a07d2
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -853,7 +853,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->incomingFriendRequestHeader$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0805
+    const v0, 0x7f0a07cc
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -861,7 +861,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->incomingFriendRequestContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0804
+    const v0, 0x7f0a07cb
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -869,7 +869,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->friendRequestIgnoreButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0803
+    const v0, 0x7f0a07ca
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -877,7 +877,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->friendRequestAcceptButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a057d
+    const v0, 0x7f0a0564
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -885,7 +885,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->richPresenceContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07f7
+    const v0, 0x7f0a07be
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -893,7 +893,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->activityDivider$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0818
+    const v0, 0x7f0a07de
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -901,7 +901,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->rolesRecycler$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0806
+    const v0, 0x7f0a07cd
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -909,7 +909,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->guildContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0808
+    const v0, 0x7f0a07cf
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -917,7 +917,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->guildHeader$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07fa
+    const v0, 0x7f0a07c1
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -925,7 +925,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->audioSettingsDivider$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0817
+    const v0, 0x7f0a07dd
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -933,7 +933,23 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->userProfileVoiceSettingsView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07ff
+    const v0, 0x7f0a07c4
+
+    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;->connectionsDivider$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a07c5
+
+    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;->connectionsHeader$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a07c6
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -941,7 +957,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->userProfileConnectionsView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0811
+    const v0, 0x7f0a07d8
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -949,23 +965,7 @@
 
     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;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->actionsDivider$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const v0, 0x7f0a0813
-
-    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;->viewProfileButton$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const v0, 0x7f0a07f9
+    const v0, 0x7f0a07c0
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -973,7 +973,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->userProfileAdminView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0802
+    const v0, 0x7f0a07c9
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -981,7 +981,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->developerHeader$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0801
+    const v0, 0x7f0a07c8
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -989,7 +989,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->developerDivider$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0800
+    const v0, 0x7f0a07c7
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1108,7 +1108,7 @@
     :cond_0
     const/4 v1, 0x0
 
-    const v2, 0x7f1206de
+    const v2, 0x7f1206b9
 
     invoke-virtual {v0, v1, v2}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->addRelationship(Ljava/lang/Integer;I)V
 
@@ -1116,12 +1116,50 @@
 .end method
 
 .method private final configureConnectionsSection(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;)V
-    .locals 5
+    .locals 6
 
     invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->getConnectionsViewState()Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;
 
     move-result-object v0
 
+    invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getConnectionsDivider()Landroid/view/View;
+
+    move-result-object v1
+
+    invoke-virtual {v0}, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;->getShowConnectionsSection()Z
+
+    move-result v2
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x2
+
+    const/4 v5, 0x0
+
+    invoke-static {v1, v2, v5, v4, v3}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getConnectionsHeader()Landroid/view/View;
+
+    move-result-object v1
+
+    invoke-virtual {v0}, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;->getShowConnectionsSection()Z
+
+    move-result v2
+
+    invoke-static {v1, v2, v5, v4, v3}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getUserProfileConnectionsView()Lcom/discord/widgets/user/profile/UserProfileConnectionsView;
+
+    move-result-object v1
+
+    check-cast v1, Landroid/view/View;
+
+    invoke-virtual {v0}, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;->getShowConnectionsSection()Z
+
+    move-result v2
+
+    invoke-static {v1, v2, v5, v4, v3}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
+
     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
@@ -1132,27 +1170,23 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getId()J
+    new-instance v2, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureConnectionsSection$onMutualGuildsItemClick$1;
 
-    move-result-wide v2
+    invoke-direct {v2, p0, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureConnectionsSection$onMutualGuildsItemClick$1;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;Lcom/discord/models/domain/ModelUser;)V
 
-    new-instance p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureConnectionsSection$onMutualGuildsItemClick$1;
+    check-cast v2, Lkotlin/jvm/functions/Function0;
 
-    invoke-direct {p1, p0, v2, v3}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureConnectionsSection$onMutualGuildsItemClick$1;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;J)V
+    new-instance v3, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureConnectionsSection$onMutualFriendsItemClick$1;
 
-    check-cast p1, Lkotlin/jvm/functions/Function0;
+    invoke-direct {v3, p0, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureConnectionsSection$onMutualFriendsItemClick$1;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;Lcom/discord/models/domain/ModelUser;)V
 
-    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;
+    check-cast v3, Lkotlin/jvm/functions/Function0;
 
     invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getUserProfileConnectionsView()Lcom/discord/widgets/user/profile/UserProfileConnectionsView;
 
-    move-result-object v2
+    move-result-object p1
 
-    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
+    invoke-virtual {p1, v0, v1, v2, v3}, 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
@@ -1224,7 +1258,7 @@
 .end method
 
 .method private final configureGuildSection(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;)V
-    .locals 8
+    .locals 9
 
     invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->getRoleItems()Ljava/util/List;
 
@@ -1246,55 +1280,67 @@
 
     xor-int/2addr v2, v3
 
-    invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getGuildContainer()Landroid/view/ViewGroup;
+    const/4 v4, 0x0
 
-    move-result-object v4
-
-    check-cast v4, Landroid/view/View;
-
-    const/4 v5, 0x0
-
-    if-nez v2, :cond_1
+    if-eqz v1, :cond_0
 
     invoke-virtual {v1}, Lcom/discord/widgets/user/profile/UserProfileAdminView$ViewState;->isAdminSectionEnabled()Z
 
-    move-result v6
+    move-result v5
 
-    if-eqz v6, :cond_0
+    if-ne v5, v3, :cond_0
+
+    const/4 v5, 0x1
 
     goto :goto_0
 
     :cond_0
-    const/4 v3, 0x0
+    const/4 v5, 0x0
+
+    :goto_0
+    invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getGuildContainer()Landroid/view/ViewGroup;
+
+    move-result-object v6
+
+    check-cast v6, Landroid/view/View;
+
+    if-nez v2, :cond_2
+
+    if-eqz v5, :cond_1
+
+    goto :goto_1
 
     :cond_1
-    :goto_0
-    const/4 v6, 0x0
+    const/4 v3, 0x0
 
-    const/4 v7, 0x2
+    :cond_2
+    :goto_1
+    const/4 v7, 0x0
 
-    invoke-static {v4, v3, v5, v7, v6}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
+    const/4 v8, 0x2
+
+    invoke-static {v6, v3, v4, v8, v7}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
 
     iget-object v3, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->rolesAdapter:Lcom/discord/widgets/roles/RolesAdapter;
 
-    if-eqz v3, :cond_2
+    if-eqz v3, :cond_3
 
     invoke-virtual {v3, v0}, Lcom/discord/widgets/roles/RolesAdapter;->setData(Ljava/util/List;)V
 
-    :cond_2
+    :cond_3
     invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getRolesRecycler()Landroidx/recyclerview/widget/RecyclerView;
 
     move-result-object v0
 
     check-cast v0, Landroid/view/View;
 
-    invoke-static {v0, v2, v5, v7, v6}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
+    invoke-static {v0, v2, v4, v8, v7}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
 
     invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->getGuildSectionHeaderText()Ljava/lang/String;
 
     move-result-object p1
 
-    if-eqz p1, :cond_3
+    if-eqz p1, :cond_4
 
     invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getGuildHeader()Landroid/widget/TextView;
 
@@ -1304,18 +1350,16 @@
 
     invoke-virtual {v0, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    :cond_3
+    :cond_4
     invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getUserProfileAdminView()Lcom/discord/widgets/user/profile/UserProfileAdminView;
 
     move-result-object p1
 
     check-cast p1, Landroid/view/View;
 
-    invoke-virtual {v1}, Lcom/discord/widgets/user/profile/UserProfileAdminView$ViewState;->isAdminSectionEnabled()Z
+    invoke-static {p1, v5, v4, v8, v7}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
 
-    move-result v0
-
-    invoke-static {p1, v0, v5, v7, v6}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
+    if-eqz v1, :cond_5
 
     invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getUserProfileAdminView()Lcom/discord/widgets/user/profile/UserProfileAdminView;
 
@@ -1323,6 +1367,7 @@
 
     invoke-virtual {p1, v1}, Lcom/discord/widgets/user/profile/UserProfileAdminView;->updateView(Lcom/discord/widgets/user/profile/UserProfileAdminView$ViewState;)V
 
+    :cond_5
     return-void
 .end method
 
@@ -1486,20 +1531,26 @@
 
     move-result-object v5
 
+    if-eqz v5, :cond_2
+
     invoke-virtual {v5}, Lcom/discord/models/domain/ModelChannel;->getType()I
 
     move-result v5
 
     if-eq v5, v4, :cond_1
 
-    const/4 v5, 0x1
-
     goto :goto_0
 
     :cond_1
     const/4 v5, 0x0
 
+    goto :goto_1
+
+    :cond_2
     :goto_0
+    const/4 v5, 0x1
+
+    :goto_1
     invoke-static {v3, v5, v8, v7, v6}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getMessageActionButton()Landroid/widget/Button;
@@ -1540,15 +1591,15 @@
 
     const/16 v3, 0x8
 
-    if-eqz v2, :cond_3
+    if-eqz v2, :cond_4
 
     const/4 v5, 0x3
 
-    if-eq v2, v5, :cond_2
+    if-eq v2, v5, :cond_3
 
     const/4 v5, 0x4
 
-    if-eq v2, v5, :cond_2
+    if-eq v2, v5, :cond_3
 
     invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getAddFriendActionButton()Landroid/widget/Button;
 
@@ -1562,9 +1613,9 @@
 
     invoke-virtual {v5, v3}, Landroid/widget/Button;->setVisibility(I)V
 
-    goto :goto_1
+    goto :goto_2
 
-    :cond_2
+    :cond_3
     invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getAddFriendActionButton()Landroid/widget/Button;
 
     move-result-object v5
@@ -1577,9 +1628,9 @@
 
     invoke-virtual {v3, v8}, Landroid/widget/Button;->setVisibility(I)V
 
-    goto :goto_1
+    goto :goto_2
 
-    :cond_3
+    :cond_4
     invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getAddFriendActionButton()Landroid/widget/Button;
 
     move-result-object v5
@@ -1592,19 +1643,19 @@
 
     invoke-virtual {v5, v3}, Landroid/widget/Button;->setVisibility(I)V
 
-    :goto_1
-    if-nez v0, :cond_4
+    :goto_2
+    if-nez v0, :cond_5
 
-    if-nez v1, :cond_4
+    if-nez v1, :cond_5
 
-    if-nez v2, :cond_4
+    if-nez v2, :cond_5
 
-    goto :goto_2
+    goto :goto_3
 
-    :cond_4
+    :cond_5
     const/4 v4, 0x0
 
-    :goto_2
+    :goto_3
     invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getAddFriendActionButton()Landroid/widget/Button;
 
     move-result-object v0
@@ -1641,32 +1692,26 @@
 .end method
 
 .method private final configureUI(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;)V
-    .locals 18
+    .locals 7
 
-    move-object/from16 v6, p0
-
-    move-object/from16 v5, p1
-
-    instance-of v0, v5, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Uninitialized;
+    instance-of v0, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Uninitialized;
 
     if-eqz v0, :cond_0
 
     return-void
 
     :cond_0
-    instance-of v0, v5, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;
+    instance-of v0, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;
 
-    if-eqz v0, :cond_7
+    if-eqz v0, :cond_6
 
-    move-object v7, v5
+    check-cast p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;
 
-    check-cast v7, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;
-
-    invoke-virtual {v7}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->getPresence()Lcom/discord/models/domain/ModelPresence;
+    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->getPresence()Lcom/discord/models/domain/ModelPresence;
 
     move-result-object v0
 
-    const/4 v8, 0x0
+    const/4 v1, 0x0
 
     if-eqz v0, :cond_1
 
@@ -1674,249 +1719,135 @@
 
     move-result-object v0
 
-    move-object v9, v0
-
     goto :goto_0
 
     :cond_1
-    move-object v9, v8
+    move-object v0, v1
 
     :goto_0
-    invoke-virtual {v7}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->getUser()Lcom/discord/models/domain/ModelUser;
+    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->isMe()Z
 
-    move-result-object v4
+    move-result v2
 
-    invoke-virtual {v7}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->isMe()Z
+    invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getMoreButton()Landroid/view/View;
 
-    move-result v3
+    move-result-object v3
 
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getMoreButton()Landroid/view/View;
+    xor-int/lit8 v4, v2, 0x1
 
-    move-result-object v0
+    const/4 v5, 0x2
 
-    xor-int/lit8 v1, v3, 0x1
+    const/4 v6, 0x0
 
-    const/4 v2, 0x2
+    invoke-static {v3, v4, v6, v5, v1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
 
-    const/4 v10, 0x0
+    invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getActivityDivider()Landroid/view/View;
 
-    invoke-static {v0, v1, v10, v2, v8}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
+    move-result-object v3
 
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getActivityDivider()Landroid/view/View;
+    if-eqz v0, :cond_2
 
-    move-result-object v0
-
-    if-eqz v9, :cond_2
-
-    const/4 v1, 0x1
+    const/4 v4, 0x1
 
     goto :goto_1
 
     :cond_2
-    const/4 v1, 0x0
+    const/4 v4, 0x0
 
     :goto_1
-    invoke-static {v0, v1, v10, v2, v8}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
+    invoke-static {v3, v4, v6, v5, v1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
 
-    if-nez v3, :cond_3
+    if-nez v2, :cond_3
 
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getActionsDivider()Landroid/view/View;
-
-    move-result-object v0
-
-    invoke-virtual {v6, v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->setPeekHeightBottomView(Landroid/view/View;)V
-
-    :cond_3
-    sget-object v0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->Companion:Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence$Companion;
-
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getRichPresenceContainer()Landroid/widget/FrameLayout;
-
-    move-result-object v1
-
-    check-cast v1, Landroid/view/ViewGroup;
-
-    invoke-virtual {v7}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->getStreamContext()Lcom/discord/utilities/streams/StreamContext;
+    invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getConnectionsHeader()Landroid/view/View;
 
     move-result-object v2
 
-    iget-object v10, v6, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->activityViewHolder:Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;
+    invoke-virtual {p0, v2}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->setPeekHeightBottomView(Landroid/view/View;)V
 
-    invoke-virtual {v0, v1, v9, v2, v10}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence$Companion;->setRichPresence(Landroid/view/ViewGroup;Lcom/discord/models/domain/ModelPresence$Activity;Lcom/discord/utilities/streams/StreamContext;Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;)Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;
+    :cond_3
+    sget-object v2, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->Companion:Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence$Companion;
 
-    move-result-object v0
+    invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getRichPresenceContainer()Landroid/widget/FrameLayout;
 
-    invoke-virtual {v7}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->getRichPresence()Lcom/discord/widgets/user/presence/ModelRichPresence;
+    move-result-object v3
 
-    move-result-object v12
+    check-cast v3, Landroid/view/ViewGroup;
 
-    invoke-virtual {v7}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->getStreamContext()Lcom/discord/utilities/streams/StreamContext;
+    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->getStreamContext()Lcom/discord/utilities/streams/StreamContext;
 
-    move-result-object v13
+    move-result-object v4
 
-    invoke-virtual {v7}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->isMe()Z
+    iget-object v5, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->activityViewHolder:Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;
 
-    move-result v14
+    invoke-virtual {v2, v3, v0, v4, v5}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence$Companion;->setRichPresence(Landroid/view/ViewGroup;Lcom/discord/models/domain/ModelPresence$Activity;Lcom/discord/utilities/streams/StreamContext;Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;)Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;
 
-    invoke-virtual {v7}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->getUser()Lcom/discord/models/domain/ModelUser;
+    move-result-object v2
 
-    move-result-object v15
+    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->getRichPresence()Lcom/discord/widgets/user/presence/ModelRichPresence;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getAppPermissions()Lcom/discord/app/AppPermissions;
+    move-result-object v3
 
-    move-result-object v16
+    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->getStreamContext()Lcom/discord/utilities/streams/StreamContext;
 
-    new-instance v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$1;
+    move-result-object v4
 
-    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
+    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->isMe()Z
 
-    move-object/from16 v17, v1
+    move-result v5
 
-    check-cast v17, Lkotlin/jvm/functions/Function0;
+    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->getUser()Lcom/discord/models/domain/ModelUser;
 
-    move-object v11, v0
+    move-result-object v6
 
-    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
+    invoke-virtual {v2, v3, v4, v5, v6}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->configureUi(Lcom/discord/widgets/user/presence/ModelRichPresence;Lcom/discord/utilities/streams/StreamContext;ZLcom/discord/models/domain/ModelUser;)V
 
-    move-object v1, v6
+    move-object v3, p0
 
-    check-cast v1, Lcom/discord/app/AppComponent;
+    check-cast v3, Lcom/discord/app/AppComponent;
 
-    invoke-virtual {v0, v9, v1}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->configureUiTimestamp(Lcom/discord/models/domain/ModelPresence$Activity;Lcom/discord/app/AppComponent;)V
+    invoke-virtual {v2, v0, v3}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->configureUiTimestamp(Lcom/discord/models/domain/ModelPresence$Activity;Lcom/discord/app/AppComponent;)V
 
-    iput-object v0, v6, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->activityViewHolder:Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;
+    iput-object v2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->activityViewHolder:Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;
 
-    invoke-direct {v6, v7}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->configureProfileActionButtons(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;)V
+    invoke-direct {p0, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->configureProfileActionButtons(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;)V
 
-    invoke-direct {v6, v7}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->configureIncomingFriendRequest(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;)V
+    invoke-direct {p0, p1}, 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 {p0, p1}, 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 {p0, p1}, 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 {p0, p1}, 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 {p0, p1}, 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;
+    invoke-direct {p0, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->configureDeveloperSection(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;)V
 
-    move-result-object v10
+    sget-object p1, Lcom/discord/utilities/analytics/AnalyticsTracker;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker;
 
-    const v11, 0x7f0401ba
+    if-eqz v0, :cond_4
 
-    const v12, 0x7f04016b
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelPresence$Activity;->getName()Ljava/lang/String;
 
-    if-eqz v3, :cond_4
-
-    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$2;
-
-    move-object v0, v13
-
-    move-object v1, v10
-
-    move-object/from16 v2, p0
-
-    move-object/from16 v5, p1
-
-    invoke-direct/range {v0 .. v5}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$2;-><init>(Landroid/widget/TextView;Lcom/discord/widgets/user/usersheet/WidgetUserSheet;ZLcom/discord/models/domain/ModelUser;Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;)V
-
-    check-cast v13, Landroid/view/View$OnClickListener;
-
-    invoke-virtual {v10, v13}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
-
-    move-object v0, v10
-
-    check-cast v0, Landroid/view/View;
-
-    invoke-static {v0, v11, v12}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes(Landroid/view/View;II)I
-
-    move-result v11
-
-    const/4 v12, 0x0
-
-    const/4 v13, 0x0
-
-    const/4 v14, 0x0
-
-    const/16 v15, 0xe
-
-    const/16 v16, 0x0
-
-    invoke-static/range {v10 .. v16}, Lcom/discord/utilities/drawable/DrawableCompat;->setCompoundDrawablesCompat$default(Landroid/widget/TextView;IIIIILjava/lang/Object;)V
+    move-result-object v2
 
     goto :goto_2
 
     :cond_4
-    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$3;
-
-    move-object v0, v13
-
-    move-object v1, v10
-
-    move-object/from16 v2, p0
-
-    move-object/from16 v5, p1
-
-    invoke-direct/range {v0 .. v5}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$3;-><init>(Landroid/widget/TextView;Lcom/discord/widgets/user/usersheet/WidgetUserSheet;ZLcom/discord/models/domain/ModelUser;Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;)V
-
-    check-cast v13, Landroid/view/View$OnClickListener;
-
-    invoke-virtual {v10, v13}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
-
-    move-object v0, v10
-
-    check-cast v0, Landroid/view/View;
-
-    invoke-static {v0, v12, v11}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes(Landroid/view/View;II)I
-
-    move-result v11
-
-    const/4 v12, 0x0
-
-    const/4 v13, 0x0
-
-    const/4 v14, 0x0
-
-    const/16 v15, 0xe
-
-    const/16 v16, 0x0
-
-    invoke-static/range {v10 .. v16}, Lcom/discord/utilities/drawable/DrawableCompat;->setCompoundDrawablesCompat$default(Landroid/widget/TextView;IIIIILjava/lang/Object;)V
+    move-object v2, v1
 
     :goto_2
-    invoke-direct {v6, v7}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->configureDeveloperSection(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;)V
+    if-eqz v0, :cond_5
 
-    sget-object v0, Lcom/discord/utilities/analytics/AnalyticsTracker;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker;
-
-    if-eqz v9, :cond_5
-
-    invoke-virtual {v9}, Lcom/discord/models/domain/ModelPresence$Activity;->getName()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelPresence$Activity;->getGamePlatform()Ljava/lang/String;
 
     move-result-object v1
 
-    goto :goto_3
-
     :cond_5
-    move-object v1, v8
-
-    :goto_3
-    if-eqz v9, :cond_6
-
-    invoke-virtual {v9}, Lcom/discord/models/domain/ModelPresence$Activity;->getGamePlatform()Ljava/lang/String;
-
-    move-result-object v8
+    invoke-virtual {p1, v2, v1}, Lcom/discord/utilities/analytics/AnalyticsTracker;->openUserSheet(Ljava/lang/String;Ljava/lang/String;)V
 
     :cond_6
-    invoke-virtual {v0, v1, v8}, Lcom/discord/utilities/analytics/AnalyticsTracker;->openUserSheet(Ljava/lang/String;Ljava/lang/String;)V
-
-    :cond_7
     return-void
 .end method
 
@@ -1964,26 +1895,6 @@
     return-void
 .end method
 
-.method private final getActionsDivider()Landroid/view/View;
-    .locals 3
-
-    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->actionsDivider$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    sget-object v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
-
-    const/16 v2, 0x17
-
-    aget-object v1, v1, v2
-
-    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Landroid/view/View;
-
-    return-object v0
-.end method
-
 .method private final getActivityDivider()Landroid/view/View;
     .locals 3
 
@@ -2064,6 +1975,46 @@
     return-object v0
 .end method
 
+.method private final getConnectionsDivider()Landroid/view/View;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->connectionsDivider$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, Landroid/view/View;
+
+    return-object v0
+.end method
+
+.method private final getConnectionsHeader()Landroid/view/View;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->connectionsHeader$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, Landroid/view/View;
+
+    return-object v0
+.end method
+
 .method private final getCopyIdButton()Landroid/view/View;
     .locals 3
 
@@ -2311,7 +2262,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
 
@@ -2451,7 +2402,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
 
@@ -2524,26 +2475,6 @@
     return-object v0
 .end method
 
-.method private final getViewProfileButton()Landroid/widget/TextView;
-    .locals 3
-
-    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->viewProfileButton$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    sget-object v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
-
-    const/16 v2, 0x18
-
-    aget-object v1, v1, v2
-
-    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Landroid/widget/TextView;
-
-    return-object v0
-.end method
-
 .method private final handleBanUser(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchBanUser;)V
     .locals 7
 
@@ -2818,77 +2749,101 @@
     invoke-static {v1}, Lkotlin/jvm/internal/l;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     :cond_0
-    const v1, 0x7f1206d7
+    const v1, 0x7f1206b2
 
     invoke-virtual {v0, v1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->removeRelationship(I)V
 
     return-void
 .end method
 
-.method public static final show(JJLandroidx/fragment/app/FragmentManager;)V
-    .locals 10
+.method public static final show(JLandroidx/fragment/app/FragmentManager;)V
+    .locals 9
+
+    sget-object v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->Companion:Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;
+
+    const/4 v3, 0x0
+
+    const/4 v5, 0x0
+
+    const/4 v6, 0x0
+
+    const/16 v7, 0x1a
+
+    const/4 v8, 0x0
+
+    move-wide v1, p0
+
+    move-object v4, p2
+
+    invoke-static/range {v0 .. v8}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;->show$default(Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;JLjava/lang/Long;Landroidx/fragment/app/FragmentManager;Ljava/lang/Long;Ljava/lang/Boolean;ILjava/lang/Object;)V
+
+    return-void
+.end method
+
+.method public static final show(JLjava/lang/Long;Landroidx/fragment/app/FragmentManager;)V
+    .locals 9
+
+    sget-object v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->Companion:Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;
+
+    const/4 v5, 0x0
+
+    const/4 v6, 0x0
+
+    const/16 v7, 0x18
+
+    const/4 v8, 0x0
+
+    move-wide v1, p0
+
+    move-object v3, p2
+
+    move-object v4, p3
+
+    invoke-static/range {v0 .. v8}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;->show$default(Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;JLjava/lang/Long;Landroidx/fragment/app/FragmentManager;Ljava/lang/Long;Ljava/lang/Boolean;ILjava/lang/Object;)V
+
+    return-void
+.end method
+
+.method public static final show(JLjava/lang/Long;Landroidx/fragment/app/FragmentManager;Ljava/lang/Long;)V
+    .locals 9
 
     sget-object v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->Companion:Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;
 
     const/4 v6, 0x0
 
-    const/4 v7, 0x0
+    const/16 v7, 0x10
 
-    const/16 v8, 0x18
-
-    const/4 v9, 0x0
+    const/4 v8, 0x0
 
     move-wide v1, p0
 
-    move-wide v3, p2
+    move-object v3, p2
+
+    move-object v4, p3
 
     move-object v5, p4
 
-    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
+    invoke-static/range {v0 .. v8}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;->show$default(Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;JLjava/lang/Long;Landroidx/fragment/app/FragmentManager;Ljava/lang/Long;Ljava/lang/Boolean;ILjava/lang/Object;)V
 
     return-void
 .end method
 
-.method public static final show(JJLandroidx/fragment/app/FragmentManager;Ljava/lang/Long;)V
-    .locals 10
-
-    sget-object v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->Companion:Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;
-
-    const/4 v7, 0x0
-
-    const/16 v8, 0x10
-
-    const/4 v9, 0x0
-
-    move-wide v1, p0
-
-    move-wide v3, p2
-
-    move-object v5, p4
-
-    move-object v6, p5
-
-    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 static final show(JJLandroidx/fragment/app/FragmentManager;Ljava/lang/Long;Ljava/lang/Boolean;)V
-    .locals 8
+.method public static final show(JLjava/lang/Long;Landroidx/fragment/app/FragmentManager;Ljava/lang/Long;Ljava/lang/Boolean;)V
+    .locals 7
 
     sget-object v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->Companion:Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;
 
     move-wide v1, p0
 
-    move-wide v3, p2
+    move-object v3, p2
+
+    move-object v4, p3
 
     move-object v5, p4
 
     move-object v6, p5
 
-    move-object v7, p6
-
-    invoke-virtual/range {v0 .. v7}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;->show(JJLandroidx/fragment/app/FragmentManager;Ljava/lang/Long;Ljava/lang/Boolean;)V
+    invoke-virtual/range {v0 .. v6}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;->show(JLjava/lang/Long;Landroidx/fragment/app/FragmentManager;Ljava/lang/Long;Ljava/lang/Boolean;)V
 
     return-void
 .end method
@@ -3046,34 +3001,30 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d01de
+    const v0, 0x7f0d01d3
 
     return v0
 .end method
 
 .method public final onActivityResult(IILandroid/content/Intent;)V
-    .locals 8
+    .locals 7
 
     invoke-super {p0, p1, p2, p3}, Lcom/discord/app/AppBottomSheet;->onActivityResult(IILandroid/content/Intent;)V
 
-    const/4 v0, -0x1
+    const/16 v0, 0xfa0
 
-    packed-switch p1, :pswitch_data_0
+    if-eq p1, v0, :cond_2
 
-    goto :goto_1
+    const/16 p3, 0xfa1
 
-    :pswitch_0
-    if-eq p2, v0, :cond_0
+    if-eq p1, p3, :cond_0
 
-    goto :goto_1
+    goto :goto_0
 
     :cond_0
-    invoke-virtual {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->dismiss()V
+    const/4 p1, -0x1
 
-    goto :goto_1
-
-    :pswitch_1
-    if-eq p2, v0, :cond_1
+    if-eq p2, p1, :cond_1
 
     goto :goto_0
 
@@ -3083,42 +3034,34 @@
     :goto_0
     return-void
 
-    :pswitch_2
-    sget-object v1, Lcom/discord/widgets/channels/WidgetChannelSelector;->Companion:Lcom/discord/widgets/channels/WidgetChannelSelector$Companion;
+    :cond_2
+    sget-object v0, 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 v4, p2
+    move-object v3, p2
 
-    check-cast v4, Lkotlin/jvm/functions/Function3;
+    check-cast v3, Lkotlin/jvm/functions/Function3;
 
-    const/4 v5, 0x0
+    const/4 v4, 0x0
 
-    const/16 v6, 0x8
+    const/16 v5, 0x8
 
-    const/4 v7, 0x0
+    const/4 v6, 0x0
 
-    move v2, p1
+    move v1, p1
 
-    move-object v3, p3
+    move-object v2, p3
 
-    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
+    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
 
-    :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;
-    .locals 9
+    .locals 8
 
     const-string v0, "inflater"
 
@@ -3132,47 +3075,49 @@
 
     invoke-virtual {v0, v1}, Landroid/os/Bundle;->getLong(Ljava/lang/String;)J
 
-    move-result-wide v3
+    move-result-wide v0
 
     invoke-virtual {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getArgumentsOrDefault()Landroid/os/Bundle;
 
-    move-result-object v0
+    move-result-object v2
 
-    const-string v1, "ARG_CHANNEL_ID"
+    const-string v3, "ARG_CHANNEL_ID"
 
-    invoke-virtual {v0, v1}, Landroid/os/Bundle;->getLong(Ljava/lang/String;)J
+    invoke-virtual {v2, v3}, Landroid/os/Bundle;->getLong(Ljava/lang/String;)J
 
-    move-result-wide v5
+    move-result-wide v2
 
     invoke-virtual {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getArgumentsOrDefault()Landroid/os/Bundle;
 
-    move-result-object v0
+    move-result-object v4
 
-    const-string v1, "ARG_IS_VOICE_CONTEXT"
+    const-string v5, "ARG_IS_VOICE_CONTEXT"
 
-    invoke-virtual {v0, v1}, Landroid/os/Bundle;->getBoolean(Ljava/lang/String;)Z
+    invoke-virtual {v4, v5}, Landroid/os/Bundle;->getBoolean(Ljava/lang/String;)Z
 
-    move-result v7
+    move-result v4
 
-    new-instance v0, Landroidx/lifecycle/ViewModelProvider;
+    new-instance v5, Landroidx/lifecycle/ViewModelProvider;
 
-    move-object v1, p0
+    move-object v6, p0
 
-    check-cast v1, Landroidx/lifecycle/ViewModelStoreOwner;
+    check-cast v6, Landroidx/lifecycle/ViewModelStoreOwner;
 
-    new-instance v8, Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory;
+    new-instance v7, Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory;
 
-    move-object v2, v8
+    invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    invoke-direct/range {v2 .. v7}, Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory;-><init>(JJZ)V
+    move-result-object v2
 
-    check-cast v8, Landroidx/lifecycle/ViewModelProvider$Factory;
+    invoke-direct {v7, v0, v1, v2, v4}, Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory;-><init>(JLjava/lang/Long;Z)V
 
-    invoke-direct {v0, v1, v8}, Landroidx/lifecycle/ViewModelProvider;-><init>(Landroidx/lifecycle/ViewModelStoreOwner;Landroidx/lifecycle/ViewModelProvider$Factory;)V
+    check-cast v7, Landroidx/lifecycle/ViewModelProvider$Factory;
 
-    const-class v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
+    invoke-direct {v5, v6, v7}, Landroidx/lifecycle/ViewModelProvider;-><init>(Landroidx/lifecycle/ViewModelStoreOwner;Landroidx/lifecycle/ViewModelProvider$Factory;)V
 
-    invoke-virtual {v0, v1}, Landroidx/lifecycle/ViewModelProvider;->get(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
+    const-class v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
+
+    invoke-virtual {v5, v0}, Landroidx/lifecycle/ViewModelProvider;->get(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
 
     move-result-object v0
 
@@ -3371,18 +3316,6 @@
 
     move-result-object p1
 
-    new-instance p2, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$2;
-
-    invoke-direct {p2, p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$2;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;)V
-
-    check-cast p2, Lkotlin/jvm/functions/Function1;
-
-    invoke-virtual {p1, p2}, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->setOnAvatarClick(Lkotlin/jvm/functions/Function1;)V
-
-    invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getUserProfileHeaderView()Lcom/discord/widgets/user/profile/UserProfileHeaderView;
-
-    move-result-object p1
-
     sget-object p2, Lcom/discord/widgets/user/Badge;->Companion:Lcom/discord/widgets/user/Badge$Companion;
 
     invoke-virtual {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->requireFragmentManager()Landroidx/fragment/app/FragmentManager;
@@ -3421,7 +3354,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f0402a8
+    const v1, 0x7f0402a7
 
     invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
 
@@ -3437,9 +3370,9 @@
 
     move-result-object p1
 
-    new-instance p2, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$3;
+    new-instance p2, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$2;
 
-    invoke-direct {p2, p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$3;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;)V
+    invoke-direct {p2, p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$2;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;)V
 
     check-cast p2, Lkotlin/jvm/functions/Function2;
 
@@ -3449,9 +3382,9 @@
 
     move-result-object p1
 
-    new-instance p2, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$4;
+    new-instance p2, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$3;
 
-    invoke-direct {p2, p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$4;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;)V
+    invoke-direct {p2, p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$3;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;)V
 
     check-cast p2, Lkotlin/jvm/functions/Function2;
 
@@ -3461,13 +3394,25 @@
 
     move-result-object p1
 
+    new-instance p2, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$4;
+
+    invoke-direct {p2, p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$4;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;)V
+
+    check-cast p2, Lkotlin/jvm/functions/Function0;
+
+    invoke-virtual {p1, p2}, Lcom/discord/widgets/user/profile/UserProfileAdminView;->setOnEditMember(Lkotlin/jvm/functions/Function0;)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getUserProfileAdminView()Lcom/discord/widgets/user/profile/UserProfileAdminView;
+
+    move-result-object p1
+
     new-instance p2, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$5;
 
     invoke-direct {p2, p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$5;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;)V
 
     check-cast p2, Lkotlin/jvm/functions/Function0;
 
-    invoke-virtual {p1, p2}, Lcom/discord/widgets/user/profile/UserProfileAdminView;->setOnEditMember(Lkotlin/jvm/functions/Function0;)V
+    invoke-virtual {p1, p2}, Lcom/discord/widgets/user/profile/UserProfileAdminView;->setOnKick(Lkotlin/jvm/functions/Function0;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getUserProfileAdminView()Lcom/discord/widgets/user/profile/UserProfileAdminView;
 
@@ -3479,7 +3424,7 @@
 
     check-cast p2, Lkotlin/jvm/functions/Function0;
 
-    invoke-virtual {p1, p2}, Lcom/discord/widgets/user/profile/UserProfileAdminView;->setOnKick(Lkotlin/jvm/functions/Function0;)V
+    invoke-virtual {p1, p2}, Lcom/discord/widgets/user/profile/UserProfileAdminView;->setOnBan(Lkotlin/jvm/functions/Function0;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getUserProfileAdminView()Lcom/discord/widgets/user/profile/UserProfileAdminView;
 
@@ -3491,7 +3436,7 @@
 
     check-cast p2, Lkotlin/jvm/functions/Function0;
 
-    invoke-virtual {p1, p2}, Lcom/discord/widgets/user/profile/UserProfileAdminView;->setOnBan(Lkotlin/jvm/functions/Function0;)V
+    invoke-virtual {p1, p2}, Lcom/discord/widgets/user/profile/UserProfileAdminView;->setOnServerMute(Lkotlin/jvm/functions/Function0;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getUserProfileAdminView()Lcom/discord/widgets/user/profile/UserProfileAdminView;
 
@@ -3503,7 +3448,7 @@
 
     check-cast p2, Lkotlin/jvm/functions/Function0;
 
-    invoke-virtual {p1, p2}, Lcom/discord/widgets/user/profile/UserProfileAdminView;->setOnServerMute(Lkotlin/jvm/functions/Function0;)V
+    invoke-virtual {p1, p2}, Lcom/discord/widgets/user/profile/UserProfileAdminView;->setOnServerDeafen(Lkotlin/jvm/functions/Function0;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getUserProfileAdminView()Lcom/discord/widgets/user/profile/UserProfileAdminView;
 
@@ -3515,18 +3460,6 @@
 
     check-cast p2, Lkotlin/jvm/functions/Function0;
 
-    invoke-virtual {p1, p2}, Lcom/discord/widgets/user/profile/UserProfileAdminView;->setOnServerDeafen(Lkotlin/jvm/functions/Function0;)V
-
-    invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getUserProfileAdminView()Lcom/discord/widgets/user/profile/UserProfileAdminView;
-
-    move-result-object p1
-
-    new-instance p2, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$10;
-
-    invoke-direct {p2, p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$10;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;)V
-
-    check-cast p2, Lkotlin/jvm/functions/Function0;
-
     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;
@@ -3541,9 +3474,9 @@
 
     move-result-object p1
 
-    new-instance p2, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$11;
+    new-instance p2, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$10;
 
-    invoke-direct {p2, p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$11;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;)V
+    invoke-direct {p2, p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$10;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;)V
 
     check-cast p2, Landroid/view/View$OnFocusChangeListener;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$1.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$1.smali
similarity index 93%
rename from com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$1.smali
rename to com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$1.smali
index 0276197fb9..c04cf8a9a5 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$1.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;-><init>(JJZLcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreChannels;Lcom/discord/utilities/rest/RestAPI;Lrx/Observable;)V
+    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;-><init>(JLjava/lang/Long;ZLcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreChannels;Lcom/discord/utilities/rest/RestAPI;Lrx/Observable;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Companion.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Companion.smali
similarity index 100%
rename from com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Companion.smali
rename to com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Companion.smali
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$DismissSheet.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$DismissSheet.smali
similarity index 100%
rename from com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$DismissSheet.smali
rename to com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$DismissSheet.smali
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchBanUser.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchBanUser.smali
similarity index 100%
rename from com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchBanUser.smali
rename to com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchBanUser.smali
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchEditMember.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchEditMember.smali
similarity index 100%
rename from com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchEditMember.smali
rename to com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchEditMember.smali
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchKickUser.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchKickUser.smali
similarity index 100%
rename from com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchKickUser.smali
rename to com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchKickUser.smali
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchMoveUser.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchMoveUser.smali
similarity index 100%
rename from com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchMoveUser.smali
rename to com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchMoveUser.smali
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchVideoCall.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchVideoCall.smali
similarity index 100%
rename from com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchVideoCall.smali
rename to com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchVideoCall.smali
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchVoiceCall.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchVoiceCall.smali
similarity index 100%
rename from com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchVoiceCall.smali
rename to com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchVoiceCall.smali
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$ShowToast.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$ShowToast.smali
similarity index 100%
rename from com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$ShowToast.smali
rename to com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$ShowToast.smali
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event.smali
similarity index 100%
rename from com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event.smali
rename to com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event.smali
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState.smali
similarity index 97%
rename from com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState.smali
rename to com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState.smali
index f37e3fbf83..57a370160d 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState.smali
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState.smali
@@ -86,7 +86,7 @@
 
 # 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;Ljava/lang/String;)V
-    .locals 10
+    .locals 9
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -130,49 +130,43 @@
 
     move-object v2, p2
 
-    move-object v3, p3
+    move-object v3, p4
 
-    move-object v4, p4
+    move-object v4, p5
 
-    move-object v5, p5
+    move-object v5, p6
 
-    move-object/from16 v6, p6
+    move-object/from16 v6, p7
 
-    move-object/from16 v7, p7
+    move-object/from16 v7, p14
 
-    move-object/from16 v8, p14
+    const-string v8, "user"
 
-    const-string v9, "user"
+    invoke-static {p1, v8}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {p1, v9}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    const-string v8, "me"
 
-    const-string v9, "me"
+    invoke-static {p2, v8}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {p2, v9}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    const-string v8, "computedMembers"
 
-    const-string v9, "channel"
+    invoke-static {p4, v8}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {p3, v9}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    const-string v8, "guildRoles"
 
-    const-string v9, "computedMembers"
+    invoke-static {p5, v8}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {p4, v9}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    const-string v8, "mySelectedVoiceChannelVoiceStates"
 
-    const-string v9, "guildRoles"
+    invoke-static {p6, v8}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {p5, v9}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    const-string v8, "currentChannelVoiceStates"
 
-    const-string v9, "mySelectedVoiceChannelVoiceStates"
+    invoke-static {v6, v8}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v6, v9}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    const-string v8, "userProfile"
 
-    const-string v9, "currentChannelVoiceStates"
-
-    invoke-static {v7, v9}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v9, "userProfile"
-
-    invoke-static {v8, v9}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v7, v8}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -180,15 +174,17 @@
 
     iput-object v2, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->me:Lcom/discord/models/domain/ModelUser;
 
-    iput-object v3, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->channel:Lcom/discord/models/domain/ModelChannel;
+    move-object v1, p3
 
-    iput-object v4, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->computedMembers:Ljava/util/Map;
+    iput-object v1, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->channel:Lcom/discord/models/domain/ModelChannel;
 
-    iput-object v5, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->guildRoles:Ljava/util/Map;
+    iput-object v3, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->computedMembers:Ljava/util/Map;
 
-    iput-object v6, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->mySelectedVoiceChannelVoiceStates:Ljava/util/Map;
+    iput-object v4, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->guildRoles:Ljava/util/Map;
 
-    iput-object v7, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->currentChannelVoiceStates:Ljava/util/Map;
+    iput-object v5, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->mySelectedVoiceChannelVoiceStates:Ljava/util/Map;
+
+    iput-object v6, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->currentChannelVoiceStates:Ljava/util/Map;
 
     move/from16 v1, p8
 
@@ -214,7 +210,7 @@
 
     iput-object v1, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->streamContext:Lcom/discord/utilities/streams/StreamContext;
 
-    iput-object v8, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->userProfile:Lcom/discord/models/domain/ModelUserProfile;
+    iput-object v7, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->userProfile:Lcom/discord/models/domain/ModelUserProfile;
 
     move-object/from16 v1, p15
 
@@ -717,12 +713,6 @@
 
     invoke-static {v1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v0, "channel"
-
-    move-object/from16 v1, p3
-
-    invoke-static {v1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
     const-string v0, "computedMembers"
 
     move-object/from16 v1, p4
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded.smali
similarity index 97%
rename from com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded.smali
rename to com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded.smali
index 23d35868c6..66dc9bbfef 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded.smali
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded.smali
@@ -56,7 +56,7 @@
 
 # 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;ILcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;Ljava/lang/CharSequence;)V
-    .locals 8
+    .locals 6
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -87,41 +87,29 @@
 
     move-object v2, p4
 
-    move-object/from16 v3, p8
+    move-object v3, p8
 
-    move-object/from16 v4, p9
+    move-object/from16 v4, p14
 
-    move-object/from16 v5, p10
+    const-string v5, "user"
 
-    move-object/from16 v6, p14
+    invoke-static {p1, v5}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v7, "user"
+    const-string v5, "voiceSettingsViewState"
 
-    invoke-static {p1, v7}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p4, v5}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v7, "voiceSettingsViewState"
+    const-string v5, "roleItems"
 
-    invoke-static {p4, v7}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p8, v5}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v7, "roleItems"
+    const-string v5, "connectionsViewState"
 
-    invoke-static {v3, v7}, 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
 
-    const-string v7, "adminViewState"
+    const/4 v5, 0x0
 
-    invoke-static {v4, v7}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v7, "channel"
-
-    invoke-static {v5, v7}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v7, "connectionsViewState"
-
-    invoke-static {v6, v7}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const/4 v7, 0x0
-
-    invoke-direct {p0, v7}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+    invoke-direct {p0, v5}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
     iput-object v1, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->user:Lcom/discord/models/domain/ModelUser;
 
@@ -149,9 +137,13 @@
 
     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;
+    move-object v1, p9
 
-    iput-object v5, v0, 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;->adminViewState:Lcom/discord/widgets/user/profile/UserProfileAdminView$ViewState;
+
+    move-object/from16 v1, p10
+
+    iput-object v1, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->channel:Lcom/discord/models/domain/ModelChannel;
 
     move-object/from16 v1, p11
 
@@ -165,7 +157,7 @@
 
     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;
+    iput-object v4, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->connectionsViewState:Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;
 
     move-object/from16 v1, p15
 
@@ -573,18 +565,6 @@
 
     invoke-static {v9, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v0, "adminViewState"
-
-    move-object/from16 v10, p9
-
-    invoke-static {v10, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v0, "channel"
-
-    move-object/from16 v11, p10
-
-    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
@@ -605,6 +585,10 @@
 
     move-object/from16 v8, p7
 
+    move-object/from16 v10, p9
+
+    move-object/from16 v11, p10
+
     move-object/from16 v12, p11
 
     move-object/from16 v13, p12
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Uninitialized.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Uninitialized.smali
similarity index 100%
rename from com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Uninitialized.smali
rename to com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Uninitialized.smali
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState.smali
similarity index 100%
rename from com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState.smali
rename to com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState.smali
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$1.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$1.smali
similarity index 97%
rename from com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$1.smali
rename to com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$1.smali
index ac8c1a15b3..38e5b80f19 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$1.smali
+++ b/com.discord/smali/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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$2.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$2.smali
similarity index 96%
rename from com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$2.smali
rename to com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$2.smali
index 45e0ebce57..6d19cfaaa1 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$2.smali
+++ b/com.discord/smali/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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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, 0x7f120504
+    const v0, 0x7f1204df
 
     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$guildDeafenUser$1.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildDeafenUser$1.smali
similarity index 97%
rename from com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildDeafenUser$1.smali
rename to com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildDeafenUser$1.smali
index 3e5d5874dd..1c62f40392 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildDeafenUser$1.smali
+++ b/com.discord/smali/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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildDeafenUser$2.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildDeafenUser$2.smali
similarity index 96%
rename from com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildDeafenUser$2.smali
rename to com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildDeafenUser$2.smali
index 30581e5eab..e15c9f3e76 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildDeafenUser$2.smali
+++ b/com.discord/smali/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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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, 0x7f120504
+    const v0, 0x7f1204df
 
     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$guildMuteUser$1.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildMuteUser$1.smali
similarity index 97%
rename from com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildMuteUser$1.smali
rename to com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildMuteUser$1.smali
index d7e17b1bae..3fb2f45d3b 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildMuteUser$1.smali
+++ b/com.discord/smali/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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildMuteUser$2.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildMuteUser$2.smali
similarity index 96%
rename from com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildMuteUser$2.smali
rename to com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildMuteUser$2.smali
index 00c9fa07b1..d403b58432 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildMuteUser$2.smali
+++ b/com.discord/smali/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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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, 0x7f120504
+    const v0, 0x7f1204df
 
     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$kickUser$1.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$kickUser$1.smali
similarity index 97%
rename from com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$kickUser$1.smali
rename to com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$kickUser$1.smali
index 5ed47982b6..78701f388d 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$kickUser$1.smali
+++ b/com.discord/smali/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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$1.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$1.smali
similarity index 97%
rename from com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$1.smali
rename to com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$1.smali
index ba674b2bb8..ee477bc588 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$1.smali
+++ b/com.discord/smali/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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$2.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$2.smali
similarity index 96%
rename from com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$2.smali
rename to com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$2.smali
index 5b356e12d1..390a9c8c60 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$2.smali
+++ b/com.discord/smali/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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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, 0x7f120504
+    const v0, 0x7f1204df
 
     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$launchVoiceCall$1.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$1.smali
similarity index 97%
rename from com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$1.smali
rename to com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$1.smali
index 9ee58f8500..1285ced84d 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$1.smali
+++ b/com.discord/smali/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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$2.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$2.smali
similarity index 96%
rename from com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$2.smali
rename to com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$2.smali
index 69b22d924a..e599b8ecb3 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$2.smali
+++ b/com.discord/smali/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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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, 0x7f120504
+    const v0, 0x7f1204df
 
     invoke-static {p1, v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->access$emitShowToastEvent(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;I)V
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$moveUserToChannel$1.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$moveUserToChannel$1.smali
similarity index 96%
rename from com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$moveUserToChannel$1.smali
rename to com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$moveUserToChannel$1.smali
index 3bd9ab7058..3f22e1f85f 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$moveUserToChannel$1.smali
+++ b/com.discord/smali/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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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, 0x7f120c09
+    const v0, 0x7f120bd2
 
     invoke-static {p1, v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->access$emitShowToastEvent(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;I)V
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$moveUserToChannel$2.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$moveUserToChannel$2.smali
similarity index 96%
rename from com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$moveUserToChannel$2.smali
rename to com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$moveUserToChannel$2.smali
index af8f83dfaf..59c80c320e 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$moveUserToChannel$2.smali
+++ b/com.discord/smali/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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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, 0x7f120504
+    const v0, 0x7f1204df
 
     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$removeRelationship$1.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$removeRelationship$1.smali
similarity index 97%
rename from com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$removeRelationship$1.smali
rename to com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$removeRelationship$1.smali
index 4761a71e19..27f546e2d0 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$removeRelationship$1.smali
+++ b/com.discord/smali/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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$removeRelationship$2.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$removeRelationship$2.smali
similarity index 96%
rename from com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$removeRelationship$2.smali
rename to com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$removeRelationship$2.smali
index facf04e186..f1943ae8ea 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$removeRelationship$2.smali
+++ b/com.discord/smali/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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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, 0x7f120504
+    const v0, 0x7f1204df
 
     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/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$updateUserNote$1.smali
similarity index 97%
rename from com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$updateUserNote$1.smali
rename to com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$updateUserNote$1.smali
index c3ad197c50..0daaf5d8b9 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$updateUserNote$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$updateUserNote$1.smali
@@ -63,7 +63,7 @@
 
     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;
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel.smali
similarity index 92%
rename from com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel.smali
rename to com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel.smali
index ffadef029e..5408ea232b 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel.smali
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel.smali
@@ -21,7 +21,7 @@
 
 
 # instance fields
-.field private final channelId:J
+.field private final channelId:Ljava/lang/Long;
 
 .field private final eventSubject:Lrx/subjects/PublishSubject;
     .annotation system Ldalvik/annotation/Signature;
@@ -79,11 +79,13 @@
     return-void
 .end method
 
-.method public constructor <init>(JJZLcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreChannels;Lcom/discord/utilities/rest/RestAPI;Lrx/Observable;)V
-    .locals 10
+.method public constructor <init>(JLjava/lang/Long;ZLcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreChannels;Lcom/discord/utilities/rest/RestAPI;Lrx/Observable;)V
+    .locals 14
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "(JJZ",
+            "(J",
+            "Ljava/lang/Long;",
+            "Z",
             "Lcom/discord/stores/StoreMediaSettings;",
             "Lcom/discord/stores/StoreChannels;",
             "Lcom/discord/utilities/rest/RestAPI;",
@@ -95,13 +97,13 @@
 
     move-object v0, p0
 
-    move-object/from16 v1, p6
+    move-object/from16 v1, p5
 
-    move-object/from16 v2, p7
+    move-object/from16 v2, p6
 
-    move-object/from16 v3, p8
+    move-object/from16 v3, p7
 
-    move-object/from16 v4, p9
+    move-object/from16 v4, p8
 
     const-string v5, "storeMediaSettings"
 
@@ -125,11 +127,11 @@
 
     iput-wide v5, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->userId:J
 
-    move-wide v5, p3
+    move-object/from16 v5, p3
 
-    iput-wide v5, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->channelId:J
+    iput-object v5, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->channelId:Ljava/lang/Long;
 
-    move v5, p5
+    move/from16 v5, p4
 
     iput-boolean v5, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->isVoiceContext:Z
 
@@ -149,7 +151,7 @@
 
     iput-object v1, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->viewStateSubject:Lrx/subjects/BehaviorSubject;
 
-    invoke-static {}, Lrx/subjects/PublishSubject;->KA()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->Ky()Lrx/subjects/PublishSubject;
 
     move-result-object v1
 
@@ -161,7 +163,7 @@
 
     move-result-object v1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v2
 
@@ -183,53 +185,37 @@
 
     invoke-static {v1, v2, v3, v4, v3}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
 
-    move-result-object v1
+    move-result-object v5
 
     invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
-    move-result-object v2
+    move-result-object v6
 
-    new-instance v3, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$1;
+    new-instance v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$1;
 
-    move-object v4, v0
+    move-object v2, v0
 
-    check-cast v4, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
+    check-cast v2, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
 
-    invoke-direct {v3, v4}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$1;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;)V
+    invoke-direct {v1, v2}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$1;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;)V
 
-    check-cast v3, Lkotlin/jvm/functions/Function1;
+    move-object v11, v1
 
-    const/4 v4, 0x0
-
-    const/4 v5, 0x0
-
-    const/4 v6, 0x0
+    check-cast v11, Lkotlin/jvm/functions/Function1;
 
     const/4 v7, 0x0
 
-    const/16 v8, 0x1e
+    const/4 v8, 0x0
 
     const/4 v9, 0x0
 
-    move-object p1, v1
+    const/4 v10, 0x0
 
-    move-object p2, v2
+    const/16 v12, 0x1e
 
-    move-object p3, v4
+    const/4 v13, 0x0
 
-    move-object p4, v5
-
-    move-object p5, v6
-
-    move-object/from16 p6, v7
-
-    move-object/from16 p7, v3
-
-    move/from16 p8, v8
-
-    move-object/from16 p9, v9
-
-    invoke-static/range {p1 .. p9}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
+    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
 
     return-void
 .end method
@@ -277,30 +263,37 @@
 .method private final createAdminViewState(Lcom/discord/models/domain/ModelChannel;ZZLcom/discord/utilities/permissions/ManageUserContext;Lcom/discord/models/domain/ModelVoice$State;)Lcom/discord/widgets/user/profile/UserProfileAdminView$ViewState;
     .locals 15
 
+    if-nez p1, :cond_0
+
+    const/4 v0, 0x0
+
+    return-object v0
+
+    :cond_0
     const/4 v0, 0x0
 
     const/4 v1, 0x1
 
-    if-eqz p4, :cond_1
+    if-eqz p4, :cond_2
 
     invoke-virtual/range {p4 .. p4}, Lcom/discord/utilities/permissions/ManageUserContext;->getCanChangeNickname()Z
 
     move-result v2
 
-    if-nez v2, :cond_0
+    if-nez v2, :cond_1
 
     invoke-virtual/range {p4 .. p4}, Lcom/discord/utilities/permissions/ManageUserContext;->getCanManageRoles()Z
 
     move-result v2
 
-    if-eqz v2, :cond_1
+    if-eqz v2, :cond_2
 
-    :cond_0
+    :cond_1
     const/4 v4, 0x1
 
     goto :goto_0
 
-    :cond_1
+    :cond_2
     const/4 v4, 0x0
 
     :goto_0
@@ -308,33 +301,33 @@
 
     move-result v2
 
-    if-eqz v2, :cond_3
+    if-eqz v2, :cond_4
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelChannel;->isManaged()Z
 
     move-result v2
 
-    if-nez v2, :cond_2
+    if-nez v2, :cond_3
 
-    if-eqz p2, :cond_2
+    if-eqz p2, :cond_3
 
-    if-nez p3, :cond_2
+    if-nez p3, :cond_3
 
     goto :goto_1
 
-    :cond_2
+    :cond_3
     const/4 v5, 0x0
 
     goto :goto_2
 
-    :cond_3
-    if-eqz p4, :cond_2
+    :cond_4
+    if-eqz p4, :cond_3
 
     invoke-virtual/range {p4 .. p4}, Lcom/discord/utilities/permissions/ManageUserContext;->getCanKick()Z
 
     move-result v2
 
-    if-ne v2, v1, :cond_2
+    if-ne v2, v1, :cond_3
 
     :goto_1
     const/4 v5, 0x1
@@ -344,105 +337,105 @@
 
     move-result v6
 
-    if-eqz p4, :cond_4
+    if-eqz p4, :cond_5
 
     invoke-virtual/range {p4 .. p4}, Lcom/discord/utilities/permissions/ManageUserContext;->getCanBan()Z
 
     move-result v2
 
-    if-ne v2, v1, :cond_4
+    if-ne v2, v1, :cond_5
 
     const/4 v7, 0x1
 
     goto :goto_3
 
-    :cond_4
+    :cond_5
     const/4 v7, 0x0
 
     :goto_3
-    if-eqz p5, :cond_5
+    if-eqz p5, :cond_6
 
-    if-eqz p4, :cond_5
+    if-eqz p4, :cond_6
 
     invoke-virtual/range {p4 .. p4}, Lcom/discord/utilities/permissions/ManageUserContext;->getCanMute()Z
 
     move-result v2
 
-    if-ne v2, v1, :cond_5
+    if-ne v2, v1, :cond_6
 
     const/4 v8, 0x1
 
     goto :goto_4
 
-    :cond_5
+    :cond_6
     const/4 v8, 0x0
 
     :goto_4
-    if-eqz p5, :cond_6
+    if-eqz p5, :cond_7
 
     invoke-virtual/range {p5 .. p5}, Lcom/discord/models/domain/ModelVoice$State;->isMute()Z
 
     move-result v2
 
-    if-ne v2, v1, :cond_6
+    if-ne v2, v1, :cond_7
 
     const/4 v9, 0x1
 
     goto :goto_5
 
-    :cond_6
+    :cond_7
     const/4 v9, 0x0
 
     :goto_5
-    if-eqz p5, :cond_7
+    if-eqz p5, :cond_8
 
-    if-eqz p4, :cond_7
+    if-eqz p4, :cond_8
 
     invoke-virtual/range {p4 .. p4}, Lcom/discord/utilities/permissions/ManageUserContext;->getCanDeafen()Z
 
     move-result v2
 
-    if-ne v2, v1, :cond_7
+    if-ne v2, v1, :cond_8
 
     const/4 v10, 0x1
 
     goto :goto_6
 
-    :cond_7
+    :cond_8
     const/4 v10, 0x0
 
     :goto_6
-    if-eqz p5, :cond_8
+    if-eqz p5, :cond_9
 
     invoke-virtual/range {p5 .. p5}, Lcom/discord/models/domain/ModelVoice$State;->isDeaf()Z
 
     move-result v2
 
-    if-ne v2, v1, :cond_8
+    if-ne v2, v1, :cond_9
 
     const/4 v11, 0x1
 
     goto :goto_7
 
-    :cond_8
+    :cond_9
     const/4 v11, 0x0
 
     :goto_7
-    if-eqz p5, :cond_9
+    if-eqz p5, :cond_a
 
-    if-eqz p4, :cond_9
+    if-eqz p4, :cond_a
 
     invoke-virtual/range {p4 .. p4}, Lcom/discord/utilities/permissions/ManageUserContext;->getCanMove()Z
 
     move-result v2
 
-    if-ne v2, v1, :cond_9
+    if-ne v2, v1, :cond_a
 
     const/4 v12, 0x1
 
     goto :goto_8
 
-    :cond_9
+    :cond_a
     const/4 v12, 0x0
 
     :goto_8
@@ -497,7 +490,7 @@
     const/4 v13, 0x0
 
     :goto_9
-    if-ge v13, v2, :cond_b
+    if-ge v13, v2, :cond_c
 
     aget-object v14, v3, v13
 
@@ -505,18 +498,18 @@
 
     move-result v14
 
-    if-eqz v14, :cond_a
+    if-eqz v14, :cond_b
 
     const/4 v13, 0x1
 
     goto :goto_a
 
-    :cond_a
+    :cond_b
     add-int/lit8 v13, v13, 0x1
 
     goto :goto_9
 
-    :cond_b
+    :cond_c
     const/4 v13, 0x0
 
     :goto_a
@@ -529,7 +522,7 @@
     return-object v0
 .end method
 
-.method private final createConnectionsViewState(Lcom/discord/models/domain/ModelUserProfile;)Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;
+.method private final createConnectionsViewState(Lcom/discord/models/domain/ModelUserProfile;Z)Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;
     .locals 4
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUserProfile;->getConnectedAccounts()Ljava/util/List;
@@ -586,11 +579,36 @@
     :cond_0
     check-cast v0, Ljava/util/List;
 
-    new-instance p1, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;
+    const/4 p1, 0x1
 
-    invoke-direct {p1, v0}, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;-><init>(Ljava/util/List;)V
+    xor-int/2addr p2, p1
 
-    return-object p1
+    if-nez p2, :cond_2
+
+    move-object v1, v0
+
+    check-cast v1, Ljava/util/Collection;
+
+    invoke-interface {v1}, Ljava/util/Collection;->isEmpty()Z
+
+    move-result v1
+
+    xor-int/2addr v1, p1
+
+    if-eqz v1, :cond_1
+
+    goto :goto_1
+
+    :cond_1
+    const/4 p1, 0x0
+
+    :cond_2
+    :goto_1
+    new-instance v1, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;
+
+    invoke-direct {v1, p1, p2, v0}, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;-><init>(ZZLjava/util/List;)V
+
+    return-object v1
 .end method
 
 .method private final createPrivateChannelWithUser(J)Lrx/Observable;
@@ -668,7 +686,7 @@
 .end method
 
 .method private final handleStoreState(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;)V
-    .locals 24
+    .locals 23
 
     move-object/from16 v6, p0
 
@@ -712,12 +730,12 @@
 
     if-nez v7, :cond_0
 
-    const/16 v20, 0x1
+    const/4 v5, 0x1
 
     goto :goto_0
 
     :cond_0
-    const/16 v20, 0x0
+    const/4 v5, 0x0
 
     :goto_0
     invoke-virtual {v15}, Lcom/discord/models/domain/ModelUser;->getId()J
@@ -772,25 +790,25 @@
     :goto_1
     invoke-interface {v3}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v5
+    move-result v7
 
-    if-eqz v5, :cond_2
+    if-eqz v7, :cond_2
 
     invoke-interface {v3}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object v5
+    move-result-object v7
 
-    check-cast v5, Ljava/lang/Long;
+    check-cast v7, Ljava/lang/Long;
 
-    invoke-interface {v14, v5}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v14, v7}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
-    move-result-object v5
+    move-result-object v7
 
-    check-cast v5, Lcom/discord/models/domain/ModelGuildRole;
+    check-cast v7, Lcom/discord/models/domain/ModelGuildRole;
 
-    if-eqz v5, :cond_1
+    if-eqz v7, :cond_1
 
-    invoke-interface {v4, v5}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+    invoke-interface {v4, v7}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
 
     goto :goto_1
 
@@ -811,9 +829,9 @@
     move-result-object v3
 
     :cond_4
-    move-object/from16 v21, v3
+    move-object/from16 v20, v3
 
-    const/16 v22, 0x0
+    const/16 v21, 0x0
 
     if-eqz v2, :cond_6
 
@@ -870,9 +888,11 @@
 
     :cond_6
     :goto_2
-    move-object/from16 v4, v22
+    move-object/from16 v4, v21
 
     :goto_3
+    if-eqz v17, :cond_7
+
     invoke-virtual/range {v17 .. v17}, Lcom/discord/models/domain/ModelChannel;->getOwnerId()J
 
     move-result-wide v1
@@ -899,7 +919,7 @@
 
     invoke-static {v1}, Lcom/discord/models/domain/ModelUserRelationship;->getType(Ljava/lang/Integer;)I
 
-    move-result v23
+    move-result v22
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->getMySelectedVoiceChannelVoiceStates()Ljava/util/Map;
 
@@ -937,7 +957,7 @@
 
     check-cast v0, Lcom/discord/models/domain/ModelVoice$State;
 
-    if-nez v20, :cond_9
+    if-nez v5, :cond_9
 
     iget-boolean v3, v6, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->isVoiceContext:Z
 
@@ -990,11 +1010,19 @@
 
     check-cast v12, Lcom/discord/models/domain/ModelVoice$State;
 
+    if-nez v17, :cond_b
+
+    :cond_a
+    move-object/from16 v14, v21
+
+    goto :goto_7
+
+    :cond_b
     invoke-virtual/range {v17 .. v17}, Lcom/discord/models/domain/ModelChannel;->isMultiUserDM()Z
 
     move-result v0
 
-    if-eqz v0, :cond_a
+    if-eqz v0, :cond_c
 
     invoke-virtual/range {v17 .. v17}, Lcom/discord/models/domain/ModelChannel;->getName()Ljava/lang/String;
 
@@ -1005,8 +1033,8 @@
 
     goto :goto_7
 
-    :cond_a
-    if-eqz v16, :cond_b
+    :cond_c
+    if-eqz v16, :cond_a
 
     invoke-virtual/range {v16 .. v16}, Lcom/discord/models/domain/ModelGuild;->getName()Ljava/lang/String;
 
@@ -1014,15 +1042,14 @@
 
     goto :goto_6
 
-    :cond_b
-    move-object/from16 v14, v22
-
     :goto_7
     move-object/from16 v0, p0
 
     move-object/from16 v1, v17
 
-    move/from16 v3, v20
+    move v3, v5
+
+    move v9, v5
 
     move-object v5, v12
 
@@ -1034,7 +1061,7 @@
 
     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;
+    invoke-direct {v6, v1, v9}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->createConnectionsViewState(Lcom/discord/models/domain/ModelUserProfile;Z)Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;
 
     move-result-object v1
 
@@ -1048,7 +1075,7 @@
 
     move-result-object v18
 
-    if-eqz v16, :cond_c
+    if-eqz v16, :cond_d
 
     invoke-virtual/range {v16 .. v16}, Lcom/discord/models/domain/ModelGuild;->getName()Ljava/lang/String;
 
@@ -1058,32 +1085,30 @@
 
     goto :goto_8
 
-    :cond_c
-    move-object/from16 v19, v22
+    :cond_d
+    move-object/from16 v19, v21
 
     :goto_8
     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;
+    check-cast v3, Ljava/lang/CharSequence;
 
     move-object v7, v2
 
     move-object v8, v15
 
-    move/from16 v9, v20
-
-    move-object/from16 v15, v21
+    move-object/from16 v15, v20
 
     move-object/from16 v16, v0
 
-    move/from16 v20, v23
+    move/from16 v20, v22
 
     move-object/from16 v21, v1
 
+    move-object/from16 v22, v3
+
     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;
@@ -1238,6 +1263,11 @@
 
     move-result-object v1
 
+    if-nez v1, :cond_2
+
+    return-void
+
+    :cond_2
     invoke-virtual {v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->getUser()Lcom/discord/models/domain/ModelUser;
 
     move-result-object v0
@@ -1306,19 +1336,24 @@
     return-void
 
     :cond_1
-    iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->eventSubject:Lrx/subjects/PublishSubject;
-
-    new-instance v2, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchEditMember;
-
     invoke-virtual {v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->getChannel()Lcom/discord/models/domain/ModelChannel;
 
     move-result-object v0
 
+    if-nez v0, :cond_2
+
+    return-void
+
+    :cond_2
+    iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->eventSubject:Lrx/subjects/PublishSubject;
+
+    new-instance v2, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchEditMember;
+
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
 
     move-result-object v0
 
-    const-string v3, "viewState.channel.guildId"
+    const-string v3, "channel.guildId"
 
     invoke-static {v0, v3}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -1335,12 +1370,12 @@
     return-void
 .end method
 
-.method public final getChannelId()J
-    .locals 2
+.method public final getChannelId()Ljava/lang/Long;
+    .locals 1
 
-    iget-wide v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->channelId:J
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->channelId:Ljava/lang/Long;
 
-    return-wide v0
+    return-object v0
 .end method
 
 .method public final getRestAPI()Lcom/discord/utilities/rest/RestAPI;
@@ -1432,6 +1467,10 @@
 
     move-result-object v0
 
+    if-eqz v1, :cond_2
+
+    if-eqz v0, :cond_2
+
     invoke-virtual {v0}, Lcom/discord/widgets/user/profile/UserProfileAdminView$ViewState;->isServerDeafened()Z
 
     move-result v0
@@ -1514,6 +1553,7 @@
 
     invoke-static/range {v4 .. v12}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
+    :cond_2
     return-void
 .end method
 
@@ -1548,6 +1588,8 @@
 
     move-result-object v0
 
+    if-eqz v0, :cond_2
+
     iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->eventSubject:Lrx/subjects/PublishSubject;
 
     new-instance v2, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchMoveUser;
@@ -1568,6 +1610,7 @@
 
     invoke-virtual {v1, v2}, Lrx/subjects/PublishSubject;->onNext(Ljava/lang/Object;)V
 
+    :cond_2
     return-void
 .end method
 
@@ -1604,10 +1647,18 @@
 
     move-result-object v1
 
-    invoke-virtual {v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->getUser()Lcom/discord/models/domain/ModelUser;
+    invoke-virtual {v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->getAdminViewState()Lcom/discord/widgets/user/profile/UserProfileAdminView$ViewState;
 
     move-result-object v3
 
+    invoke-virtual {v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->getUser()Lcom/discord/models/domain/ModelUser;
+
+    move-result-object v4
+
+    if-eqz v1, :cond_2
+
+    if-eqz v3, :cond_2
+
     invoke-virtual {v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->getAdminViewState()Lcom/discord/widgets/user/profile/UserProfileAdminView$ViewState;
 
     move-result-object v0
@@ -1616,23 +1667,23 @@
 
     move-result v0
 
-    iget-object v4, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->restAPI:Lcom/discord/utilities/rest/RestAPI;
+    iget-object v5, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->restAPI:Lcom/discord/utilities/rest/RestAPI;
 
     invoke-virtual {v1}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
 
     move-result-object v1
 
-    const-string v5, "channel.guildId"
+    const-string v3, "channel.guildId"
 
-    invoke-static {v1, v5}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v3}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
 
-    move-result-wide v5
+    move-result-wide v6
 
-    invoke-virtual {v3}, Lcom/discord/models/domain/ModelUser;->getId()J
+    invoke-virtual {v4}, Lcom/discord/models/domain/ModelUser;->getId()J
 
-    move-result-wide v7
+    move-result-wide v8
 
     sget-object v1, Lcom/discord/restapi/RestAPIParams$GuildMember;->Companion:Lcom/discord/restapi/RestAPIParams$GuildMember$Companion;
 
@@ -1642,9 +1693,9 @@
 
     invoke-virtual {v1, v0}, Lcom/discord/restapi/RestAPIParams$GuildMember$Companion;->createWithMute(Z)Lcom/discord/restapi/RestAPIParams$GuildMember;
 
-    move-result-object v9
+    move-result-object v10
 
-    invoke-virtual/range {v4 .. v9}, Lcom/discord/utilities/rest/RestAPI;->changeGuildMember(JJLcom/discord/restapi/RestAPIParams$GuildMember;)Lrx/Observable;
+    invoke-virtual/range {v5 .. v10}, Lcom/discord/utilities/rest/RestAPI;->changeGuildMember(JJLcom/discord/restapi/RestAPIParams$GuildMember;)Lrx/Observable;
 
     move-result-object v0
 
@@ -1694,6 +1745,7 @@
 
     invoke-static/range {v4 .. v12}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
+    :cond_2
     return-void
 .end method
 
@@ -1706,7 +1758,7 @@
 .end method
 
 .method public final kickUser()V
-    .locals 14
+    .locals 13
 
     iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->viewStateSubject:Lrx/subjects/BehaviorSubject;
 
@@ -1738,43 +1790,44 @@
 
     move-result-object v1
 
+    if-nez v1, :cond_2
+
+    return-void
+
+    :cond_2
     invoke-virtual {v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->getUser()Lcom/discord/models/domain/ModelUser;
 
-    move-result-object v3
-
-    invoke-virtual {v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->getChannel()Lcom/discord/models/domain/ModelChannel;
-
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelChannel;->isMultiUserDM()Z
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelChannel;->isMultiUserDM()Z
 
-    move-result v0
+    move-result v3
 
-    if-eqz v0, :cond_2
+    if-eqz v3, :cond_3
 
-    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->storeChannels:Lcom/discord/stores/StoreChannels;
+    iget-object v3, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->storeChannels:Lcom/discord/stores/StoreChannels;
 
     invoke-virtual {v1}, Lcom/discord/models/domain/ModelChannel;->getId()J
 
     move-result-wide v4
 
-    invoke-virtual {v3}, Lcom/discord/models/domain/ModelUser;->getId()J
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->getId()J
 
-    move-result-wide v6
+    move-result-wide v0
 
-    invoke-virtual {v0, v4, v5, v6, v7}, Lcom/discord/stores/StoreChannels;->removeGroupRecipient(JJ)Lrx/Observable;
+    invoke-virtual {v3, v4, v5, v0, v1}, Lcom/discord/stores/StoreChannels;->removeGroupRecipient(JJ)Lrx/Observable;
 
-    move-result-object v8
+    move-result-object v6
 
-    const-wide/16 v9, 0x0
+    const-wide/16 v7, 0x0
+
+    const/4 v9, 0x0
+
+    const/4 v10, 0x1
 
     const/4 v11, 0x0
 
-    const/4 v12, 0x1
-
-    const/4 v13, 0x0
-
-    invoke-static/range {v8 .. v13}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->takeSingleUntilTimeout$default(Lrx/Observable;JZILjava/lang/Object;)Lrx/Observable;
+    invoke-static/range {v6 .. v11}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->takeSingleUntilTimeout$default(Lrx/Observable;JZILjava/lang/Object;)Lrx/Observable;
 
     move-result-object v0
 
@@ -1814,40 +1867,40 @@
 
     return-void
 
-    :cond_2
-    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->eventSubject:Lrx/subjects/PublishSubject;
+    :cond_3
+    iget-object v2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->eventSubject:Lrx/subjects/PublishSubject;
 
-    new-instance v2, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchKickUser;
+    new-instance v9, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchKickUser;
 
-    invoke-virtual {v3}, Lcom/discord/models/domain/ModelUser;->getUsername()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->getUsername()Ljava/lang/String;
 
-    move-result-object v5
+    move-result-object v4
 
-    const-string v4, "user.username"
+    const-string v3, "user.username"
 
-    invoke-static {v5, v4}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v3}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
 
     move-result-object v1
 
-    const-string v4, "channel.guildId"
+    const-string v3, "channel.guildId"
 
-    invoke-static {v1, v4}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v3}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
 
-    move-result-wide v6
+    move-result-wide v5
 
-    invoke-virtual {v3}, Lcom/discord/models/domain/ModelUser;->getId()J
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->getId()J
 
-    move-result-wide v8
+    move-result-wide v7
 
-    move-object v4, v2
+    move-object v3, v9
 
-    invoke-direct/range {v4 .. v9}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchKickUser;-><init>(Ljava/lang/String;JJ)V
+    invoke-direct/range {v3 .. v8}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchKickUser;-><init>(Ljava/lang/String;JJ)V
 
-    invoke-virtual {v0, v2}, Lrx/subjects/PublishSubject;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {v2, v9}, Lrx/subjects/PublishSubject;->onNext(Ljava/lang/Object;)V
 
     return-void
 .end method
@@ -2017,6 +2070,8 @@
 
     move-result-object v0
 
+    if-eqz v1, :cond_2
+
     iget-object v3, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->restAPI:Lcom/discord/utilities/rest/RestAPI;
 
     invoke-virtual {v1}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
@@ -2095,6 +2150,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
 
+    :cond_2
     return-void
 .end method
 
@@ -2272,10 +2328,6 @@
 .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"
diff --git a/com.discord/smali/com/esotericsoftware/kryo/Kryo.smali b/com.discord/smali/com/esotericsoftware/kryo/Kryo.smali
index 428c0d442e..ac81d21190 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;->FU:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->FQ: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;->FU:Z
+    sget-boolean p2, Lcom/esotericsoftware/a/a;->FQ: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;->FU:Z
+    sget-boolean v2, Lcom/esotericsoftware/a/a;->FQ: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;->FU:Z
+    sget-boolean p2, Lcom/esotericsoftware/a/a;->FQ:Z
 
     if-nez p2, :cond_7
 
@@ -2221,7 +2221,7 @@
 
     :cond_5
     :goto_0
-    sget-boolean v1, Lcom/esotericsoftware/a/a;->FU:Z
+    sget-boolean v1, Lcom/esotericsoftware/a/a;->FQ:Z
 
     if-nez v1, :cond_6
 
@@ -2384,7 +2384,7 @@
 
     :cond_3
     :goto_0
-    sget-boolean p2, Lcom/esotericsoftware/a/a;->FU:Z
+    sget-boolean p2, Lcom/esotericsoftware/a/a;->FQ:Z
 
     if-nez p2, :cond_4
 
@@ -2544,7 +2544,7 @@
 
     :cond_3
     :goto_0
-    sget-boolean p2, Lcom/esotericsoftware/a/a;->FU:Z
+    sget-boolean p2, Lcom/esotericsoftware/a/a;->FQ:Z
 
     if-nez p2, :cond_4
 
@@ -2734,7 +2734,7 @@
 
     if-nez v3, :cond_6
 
-    sget-boolean p1, Lcom/esotericsoftware/a/a;->FU:Z
+    sget-boolean p1, Lcom/esotericsoftware/a/a;->FQ:Z
 
     const/4 p2, 0x0
 
@@ -2779,7 +2779,7 @@
 
     :cond_7
     :goto_0
-    sget-boolean p2, Lcom/esotericsoftware/a/a;->FU:Z
+    sget-boolean p2, Lcom/esotericsoftware/a/a;->FQ:Z
 
     if-nez p2, :cond_8
 
@@ -2946,7 +2946,7 @@
 
     if-nez v1, :cond_6
 
-    sget-boolean p1, Lcom/esotericsoftware/a/a;->FU:Z
+    sget-boolean p1, Lcom/esotericsoftware/a/a;->FQ:Z
 
     const/4 p2, 0x0
 
@@ -2991,7 +2991,7 @@
 
     :cond_7
     :goto_0
-    sget-boolean p2, Lcom/esotericsoftware/a/a;->FU:Z
+    sget-boolean p2, Lcom/esotericsoftware/a/a;->FQ:Z
 
     if-nez p2, :cond_8
 
@@ -3108,7 +3108,7 @@
 
     if-nez p1, :cond_3
 
-    sget-boolean p1, Lcom/esotericsoftware/a/a;->FU:Z
+    sget-boolean p1, Lcom/esotericsoftware/a/a;->FQ:Z
 
     const/4 p2, 0x0
 
@@ -3176,7 +3176,7 @@
 
     move-result p1
 
-    sget-boolean v1, Lcom/esotericsoftware/a/a;->FU:Z
+    sget-boolean v1, Lcom/esotericsoftware/a/a;->FQ: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;->FU:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->FQ: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;->FU:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->FQ: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;->FU:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->FQ: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;->FU:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->FQ: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;->FU:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->FQ:Z
 
     if-eqz v0, :cond_0
 
@@ -4043,7 +4043,7 @@
 
     :cond_3
     :try_start_2
-    sget-boolean v0, Lcom/esotericsoftware/a/a;->FU:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->FQ:Z
 
     if-nez v0, :cond_4
 
@@ -4177,7 +4177,7 @@
 
     :cond_1
     :try_start_1
-    sget-boolean v1, Lcom/esotericsoftware/a/a;->FU:Z
+    sget-boolean v1, Lcom/esotericsoftware/a/a;->FQ:Z
 
     if-nez v1, :cond_2
 
@@ -4318,7 +4318,7 @@
 
     :cond_1
     :try_start_1
-    sget-boolean v1, Lcom/esotericsoftware/a/a;->FU:Z
+    sget-boolean v1, Lcom/esotericsoftware/a/a;->FQ:Z
 
     if-nez v1, :cond_2
 
@@ -4465,7 +4465,7 @@
 
     if-nez p2, :cond_5
 
-    sget-boolean p2, Lcom/esotericsoftware/a/a;->FU:Z
+    sget-boolean p2, Lcom/esotericsoftware/a/a;->FQ: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;->FU:Z
+    sget-boolean v1, Lcom/esotericsoftware/a/a;->FQ:Z
 
     if-nez v1, :cond_7
 
@@ -4651,7 +4651,7 @@
 
     if-nez p2, :cond_5
 
-    sget-boolean p3, Lcom/esotericsoftware/a/a;->FU:Z
+    sget-boolean p3, Lcom/esotericsoftware/a/a;->FQ: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;->FU:Z
+    sget-boolean v1, Lcom/esotericsoftware/a/a;->FQ:Z
 
     if-nez v1, :cond_7
 
@@ -4771,7 +4771,7 @@
 
     if-nez p2, :cond_2
 
-    sget-boolean p2, Lcom/esotericsoftware/a/a;->FU:Z
+    sget-boolean p2, Lcom/esotericsoftware/a/a;->FQ: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;->FU:Z
+    sget-boolean p1, Lcom/esotericsoftware/a/a;->FQ: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 32df8b9c87..dff7ea064a 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 fJ()Ljava/io/InputStream;
+.method public abstract fH()Ljava/io/InputStream;
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -12,5 +12,5 @@
     .end annotation
 .end method
 
-.method public abstract fK()J
+.method public abstract fI()J
 .end method
diff --git a/com.discord/smali/com/facebook/a/b.smali b/com.discord/smali/com/facebook/a/b.smali
index a2b5a265c1..a230bcb9cf 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 fJ()Ljava/io/InputStream;
+.method public final fH()Ljava/io/InputStream;
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -96,7 +96,7 @@
     return-object v0
 .end method
 
-.method public final fK()J
+.method public final fI()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 f3b8e493ae..92bb7c1592 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 Iz:Z
+.field private Iv:Z
 
-.field private Jt:I
+.field private Jp:I
 
-.field private Ju:Ljava/lang/Object;
+.field private Jq:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TT;"
@@ -41,9 +41,9 @@
     .end annotation
 .end field
 
-.field private Jv:Ljava/lang/Throwable;
+.field private Jr:Ljava/lang/Throwable;
 
-.field private final Jw:Ljava/util/concurrent/ConcurrentLinkedQueue;
+.field private final Js: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;->Ju:Ljava/lang/Object;
+    iput-object v0, p0, Lcom/facebook/c/a;->Jq:Ljava/lang/Object;
 
-    iput-object v0, p0, Lcom/facebook/c/a;->Jv:Ljava/lang/Throwable;
+    iput-object v0, p0, Lcom/facebook/c/a;->Jr:Ljava/lang/Throwable;
 
     const/4 v0, 0x0
 
@@ -77,17 +77,17 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/facebook/c/a;->Iz:Z
+    iput-boolean v0, p0, Lcom/facebook/c/a;->Iv:Z
 
-    sget v0, Lcom/facebook/c/a$a;->JC:I
+    sget v0, Lcom/facebook/c/a$a;->Jy:I
 
-    iput v0, p0, Lcom/facebook/c/a;->Jt:I
+    iput v0, p0, Lcom/facebook/c/a;->Jp: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;->Jw:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iput-object v0, p0, Lcom/facebook/c/a;->Js: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;->Iz:Z
+    iget-boolean v1, p0, Lcom/facebook/c/a;->Iv:Z
 
     if-nez v1, :cond_4
 
-    iget v1, p0, Lcom/facebook/c/a;->Jt:I
+    iget v1, p0, Lcom/facebook/c/a;->Jp:I
 
-    sget v2, Lcom/facebook/c/a$a;->JC:I
+    sget v2, Lcom/facebook/c/a$a;->Jy: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;->JD:I
+    sget p2, Lcom/facebook/c/a$a;->Jz:I
 
-    iput p2, p0, Lcom/facebook/c/a;->Jt:I
+    iput p2, p0, Lcom/facebook/c/a;->Jp: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;->Ju:Ljava/lang/Object;
+    iget-object p2, p0, Lcom/facebook/c/a;->Jq:Ljava/lang/Object;
 
     if-eq p2, p1, :cond_2
 
-    iget-object p2, p0, Lcom/facebook/c/a;->Ju:Ljava/lang/Object;
+    iget-object p2, p0, Lcom/facebook/c/a;->Jq: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;->Ju:Ljava/lang/Object;
+    iput-object p1, p0, Lcom/facebook/c/a;->Jq: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;->Iz:Z
+    iget-boolean v0, p0, Lcom/facebook/c/a;->Iv:Z
 
     if-nez v0, :cond_1
 
-    iget v0, p0, Lcom/facebook/c/a;->Jt:I
+    iget v0, p0, Lcom/facebook/c/a;->Jp:I
 
-    sget v1, Lcom/facebook/c/a$a;->JC:I
+    sget v1, Lcom/facebook/c/a$a;->Jy:I
 
     if-eq v0, v1, :cond_0
 
     goto :goto_0
 
     :cond_0
-    sget v0, Lcom/facebook/c/a$a;->JE:I
+    sget v0, Lcom/facebook/c/a$a;->JA:I
 
-    iput v0, p0, Lcom/facebook/c/a;->Jt:I
+    iput v0, p0, Lcom/facebook/c/a;->Jp:I
 
-    iput-object p1, p0, Lcom/facebook/c/a;->Jv:Ljava/lang/Throwable;
+    iput-object p1, p0, Lcom/facebook/c/a;->Jr: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 gE()Z
+.method private declared-synchronized gC()Z
     .locals 2
 
     monitor-enter p0
 
     :try_start_0
-    iget v0, p0, Lcom/facebook/c/a;->Jt:I
+    iget v0, p0, Lcom/facebook/c/a;->Jp:I
 
-    sget v1, Lcom/facebook/c/a$a;->JE:I
+    sget v1, Lcom/facebook/c/a$a;->JA:I
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -338,18 +338,18 @@
     goto :goto_1
 .end method
 
-.method private gH()V
+.method private gF()V
     .locals 5
 
-    invoke-direct {p0}, Lcom/facebook/c/a;->gE()Z
+    invoke-direct {p0}, Lcom/facebook/c/a;->gC()Z
 
     move-result v0
 
-    invoke-direct {p0}, Lcom/facebook/c/a;->gI()Z
+    invoke-direct {p0}, Lcom/facebook/c/a;->gG()Z
 
     move-result v1
 
-    iget-object v2, p0, Lcom/facebook/c/a;->Jw:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v2, p0, Lcom/facebook/c/a;->Js: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 gI()Z
+.method private declared-synchronized gG()Z
     .locals 1
 
     monitor-enter p0
@@ -436,15 +436,15 @@
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lcom/facebook/c/a;->Iz:Z
+    iget-boolean v0, p0, Lcom/facebook/c/a;->Iv:Z
 
     const/4 v1, 0x0
 
     if-nez v0, :cond_2
 
-    iget v0, p0, Lcom/facebook/c/a;->Jt:I
+    iget v0, p0, Lcom/facebook/c/a;->Jp:I
 
-    sget v2, Lcom/facebook/c/a$a;->JC:I
+    sget v2, Lcom/facebook/c/a$a;->Jy: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;->Iz:Z
+    iget-boolean v0, p0, Lcom/facebook/c/a;->Iv:Z
 
     if-eqz v0, :cond_0
 
@@ -519,13 +519,13 @@
     return-void
 
     :cond_0
-    iget v0, p0, Lcom/facebook/c/a;->Jt:I
+    iget v0, p0, Lcom/facebook/c/a;->Jp:I
 
-    sget v1, Lcom/facebook/c/a$a;->JC:I
+    sget v1, Lcom/facebook/c/a$a;->Jy:I
 
     if-ne v0, v1, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/c/a;->Jw:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v0, p0, Lcom/facebook/c/a;->Js: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;->gD()Z
+    invoke-virtual {p0}, Lcom/facebook/c/a;->gB()Z
 
     move-result v0
 
@@ -546,7 +546,7 @@
 
     if-nez v0, :cond_3
 
-    invoke-direct {p0}, Lcom/facebook/c/a;->gI()Z
+    invoke-direct {p0}, Lcom/facebook/c/a;->gG()Z
 
     move-result v0
 
@@ -570,11 +570,11 @@
 
     if-eqz v0, :cond_4
 
-    invoke-direct {p0}, Lcom/facebook/c/a;->gE()Z
+    invoke-direct {p0}, Lcom/facebook/c/a;->gC()Z
 
     move-result v0
 
-    invoke-direct {p0}, Lcom/facebook/c/a;->gI()Z
+    invoke-direct {p0}, Lcom/facebook/c/a;->gG()Z
 
     move-result v1
 
@@ -612,7 +612,7 @@
 
     if-eqz p1, :cond_0
 
-    invoke-direct {p0}, Lcom/facebook/c/a;->gH()V
+    invoke-direct {p0}, Lcom/facebook/c/a;->gF()V
 
     :cond_0
     return p1
@@ -627,19 +627,19 @@
 
     if-eqz p1, :cond_0
 
-    invoke-direct {p0}, Lcom/facebook/c/a;->gH()V
+    invoke-direct {p0}, Lcom/facebook/c/a;->gF()V
 
     :cond_0
     return p1
 .end method
 
-.method public declared-synchronized gD()Z
+.method public declared-synchronized gB()Z
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/c/a;->Ju:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/facebook/c/a;->Jq: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 gF()Ljava/lang/Throwable;
+.method public final declared-synchronized gD()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;->Jv:Ljava/lang/Throwable;
+    iget-object v0, p0, Lcom/facebook/c/a;->Jr: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 gG()Z
+.method public gE()Z
     .locals 3
 
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lcom/facebook/c/a;->Iz:Z
+    iget-boolean v0, p0, Lcom/facebook/c/a;->Iv:Z
 
     if-eqz v0, :cond_0
 
@@ -714,13 +714,13 @@
     :cond_0
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/facebook/c/a;->Iz:Z
+    iput-boolean v0, p0, Lcom/facebook/c/a;->Iv:Z
 
-    iget-object v1, p0, Lcom/facebook/c/a;->Ju:Ljava/lang/Object;
+    iget-object v1, p0, Lcom/facebook/c/a;->Jq:Ljava/lang/Object;
 
     const/4 v2, 0x0
 
-    iput-object v2, p0, Lcom/facebook/c/a;->Ju:Ljava/lang/Object;
+    iput-object v2, p0, Lcom/facebook/c/a;->Jq: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;->gH()V
+    invoke-direct {p0}, Lcom/facebook/c/a;->gF()V
 
     :cond_2
     monitor-enter p0
 
     :try_start_1
-    iget-object v1, p0, Lcom/facebook/c/a;->Jw:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v1, p0, Lcom/facebook/c/a;->Js: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;->Jw:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v0, p0, Lcom/facebook/c/a;->Js: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;->Iz:Z
+    iget-boolean v0, p0, Lcom/facebook/c/a;->Iv: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;->Jt:I
+    iget v0, p0, Lcom/facebook/c/a;->Jp:I
 
-    sget v1, Lcom/facebook/c/a$a;->JC:I
+    sget v1, Lcom/facebook/c/a$a;->Jy: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;->Ju:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/facebook/c/a;->Jq: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 289db2716f..3f974211d3 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 gD()Z
+.method public abstract gB()Z
 .end method
 
-.method public abstract gF()Ljava/lang/Throwable;
+.method public abstract gD()Ljava/lang/Throwable;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end method
 
-.method public abstract gG()Z
+.method public abstract gE()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 2da543740f..d0fec7aa1b 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 JK:Lcom/facebook/c/c;
+.field JG:Lcom/facebook/c/c;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/c/c<",
@@ -37,7 +37,7 @@
     .end annotation
 .end field
 
-.field JL:Lcom/facebook/c/c;
+.field JH: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 JM:Lcom/facebook/c/f;
+.field final synthetic JI: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;->JM:Lcom/facebook/c/f;
+    iput-object p1, p0, Lcom/facebook/c/f$a;->JI: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;->JK:Lcom/facebook/c/c;
+    iput-object p1, p0, Lcom/facebook/c/f$a;->JG:Lcom/facebook/c/c;
 
-    iput-object p1, p0, Lcom/facebook/c/f$a;->JL:Lcom/facebook/c/c;
+    iput-object p1, p0, Lcom/facebook/c/f$a;->JH:Lcom/facebook/c/c;
 
-    invoke-direct {p0}, Lcom/facebook/c/f$a;->gK()Z
+    invoke-direct {p0}, Lcom/facebook/c/f$a;->gI()Z
 
     move-result p1
 
@@ -96,7 +96,7 @@
 
     if-eqz v0, :cond_1
 
-    invoke-virtual {p0}, Lcom/facebook/c/f$a;->gM()Lcom/facebook/c/c;
+    invoke-virtual {p0}, Lcom/facebook/c/f$a;->gK()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;->gK()Z
+    invoke-direct {p0}, Lcom/facebook/c/f$a;->gI()Z
 
     move-result v0
 
     if-nez v0, :cond_1
 
-    invoke-interface {p1}, Lcom/facebook/c/c;->gF()Ljava/lang/Throwable;
+    invoke-interface {p1}, Lcom/facebook/c/c;->gD()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;->JK:Lcom/facebook/c/c;
+    iput-object p1, p0, Lcom/facebook/c/f$a;->JG: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;->JK:Lcom/facebook/c/c;
+    iget-object v0, p0, Lcom/facebook/c/f$a;->JG: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;->JK:Lcom/facebook/c/c;
+    iput-object p1, p0, Lcom/facebook/c/f$a;->JG: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 gK()Z
+.method private gI()Z
     .locals 3
 
-    invoke-direct {p0}, Lcom/facebook/c/f$a;->gL()Lcom/facebook/common/d/l;
+    invoke-direct {p0}, Lcom/facebook/c/f$a;->gJ()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;->gb()Lcom/facebook/common/b/a;
+    invoke-static {}, Lcom/facebook/common/b/a;->fZ()Lcom/facebook/common/b/a;
 
     move-result-object v2
 
@@ -273,7 +273,7 @@
     return v2
 .end method
 
-.method private declared-synchronized gL()Lcom/facebook/common/d/l;
+.method private declared-synchronized gJ()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;->JM:Lcom/facebook/c/f;
+    iget-object v1, p0, Lcom/facebook/c/f$a;->JI:Lcom/facebook/c/f;
 
-    iget-object v1, v1, Lcom/facebook/c/f;->JJ:Ljava/util/List;
+    iget-object v1, v1, Lcom/facebook/c/f;->JF: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;->JM:Lcom/facebook/c/f;
+    iget-object v0, p0, Lcom/facebook/c/f$a;->JI:Lcom/facebook/c/f;
 
-    iget-object v0, v0, Lcom/facebook/c/f;->JJ:Ljava/util/List;
+    iget-object v0, v0, Lcom/facebook/c/f;->JF: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;->gG()Z
+    invoke-interface {p0}, Lcom/facebook/c/c;->gE()Z
 
     :cond_0
     return-void
@@ -365,19 +365,19 @@
 
 
 # virtual methods
-.method public final declared-synchronized gD()Z
+.method public final declared-synchronized gB()Z
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    invoke-virtual {p0}, Lcom/facebook/c/f$a;->gM()Lcom/facebook/c/c;
+    invoke-virtual {p0}, Lcom/facebook/c/f$a;->gK()Lcom/facebook/c/c;
 
     move-result-object v0
 
     if-eqz v0, :cond_0
 
-    invoke-interface {v0}, Lcom/facebook/c/c;->gD()Z
+    invoke-interface {v0}, Lcom/facebook/c/c;->gB()Z
 
     move-result v0
     :try_end_0
@@ -411,13 +411,13 @@
     goto :goto_1
 .end method
 
-.method public final gG()Z
+.method public final gE()Z
     .locals 3
 
     monitor-enter p0
 
     :try_start_0
-    invoke-super {p0}, Lcom/facebook/c/a;->gG()Z
+    invoke-super {p0}, Lcom/facebook/c/a;->gE()Z
 
     move-result v0
 
@@ -430,15 +430,15 @@
     return v0
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/c/f$a;->JK:Lcom/facebook/c/c;
+    iget-object v0, p0, Lcom/facebook/c/f$a;->JG:Lcom/facebook/c/c;
 
     const/4 v1, 0x0
 
-    iput-object v1, p0, Lcom/facebook/c/f$a;->JK:Lcom/facebook/c/c;
+    iput-object v1, p0, Lcom/facebook/c/f$a;->JG:Lcom/facebook/c/c;
 
-    iget-object v2, p0, Lcom/facebook/c/f$a;->JL:Lcom/facebook/c/c;
+    iget-object v2, p0, Lcom/facebook/c/f$a;->JH:Lcom/facebook/c/c;
 
-    iput-object v1, p0, Lcom/facebook/c/f$a;->JL:Lcom/facebook/c/c;
+    iput-object v1, p0, Lcom/facebook/c/f$a;->JH:Lcom/facebook/c/c;
 
     monitor-exit p0
     :try_end_0
@@ -463,7 +463,7 @@
     throw v0
 .end method
 
-.method declared-synchronized gM()Lcom/facebook/c/c;
+.method declared-synchronized gK()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;->JL:Lcom/facebook/c/c;
+    iget-object v0, p0, Lcom/facebook/c/f$a;->JH: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;->gM()Lcom/facebook/c/c;
+    invoke-virtual {p0}, Lcom/facebook/c/f$a;->gK()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 b1c3d6b0bb..02cad1615f 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 JP:Ljava/util/ArrayList;
+.field private JL:Ljava/util/ArrayList;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/ArrayList<",
@@ -41,33 +41,33 @@
     .end annotation
 .end field
 
-.field JQ:I
+.field JM:I
 
-.field private JR:I
+.field private JN:I
 
-.field private JS:Ljava/util/concurrent/atomic/AtomicInteger;
+.field private JO:Ljava/util/concurrent/atomic/AtomicInteger;
 
-.field private JT:Ljava/lang/Throwable;
+.field private JP:Ljava/lang/Throwable;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field final synthetic JU:Lcom/facebook/c/g;
+.field final synthetic JQ: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;->JU:Lcom/facebook/c/g;
+    iput-object p1, p0, Lcom/facebook/c/g$a;->JQ:Lcom/facebook/c/g;
 
     invoke-direct {p0}, Lcom/facebook/c/a;-><init>()V
 
-    iget-boolean p1, p1, Lcom/facebook/c/g;->JO:Z
+    iget-boolean p1, p1, Lcom/facebook/c/g;->JK:Z
 
     if-nez p1, :cond_0
 
-    invoke-direct {p0}, Lcom/facebook/c/g$a;->gN()V
+    invoke-direct {p0}, Lcom/facebook/c/g$a;->gL()V
 
     :cond_0
     return-void
@@ -91,7 +91,7 @@
     monitor-enter p0
 
     :try_start_0
-    invoke-virtual {p0}, Lcom/facebook/c/g$a;->gM()Lcom/facebook/c/c;
+    invoke-virtual {p0}, Lcom/facebook/c/g$a;->gK()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;->gF()Ljava/lang/Throwable;
+    invoke-interface {p2}, Lcom/facebook/c/c;->gD()Ljava/lang/Throwable;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/facebook/c/g$a;->JT:Ljava/lang/Throwable;
+    iput-object p1, p0, Lcom/facebook/c/g$a;->JP:Ljava/lang/Throwable;
 
     :cond_0
-    invoke-virtual {p0}, Lcom/facebook/c/g$a;->gO()V
+    invoke-virtual {p0}, Lcom/facebook/c/g$a;->gM()V
 
     return-void
 .end method
 
-.method private gN()V
+.method private gL()V
     .locals 5
 
-    iget-object v0, p0, Lcom/facebook/c/g$a;->JS:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v0, p0, Lcom/facebook/c/g$a;->JO: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;->JS:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v0, p0, Lcom/facebook/c/g$a;->JO: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;->JS:Ljava/util/concurrent/atomic/AtomicInteger;
+    iput-object v0, p0, Lcom/facebook/c/g$a;->JO:Ljava/util/concurrent/atomic/AtomicInteger;
 
-    iget-object v0, p0, Lcom/facebook/c/g$a;->JU:Lcom/facebook/c/g;
+    iget-object v0, p0, Lcom/facebook/c/g$a;->JQ:Lcom/facebook/c/g;
 
-    iget-object v0, v0, Lcom/facebook/c/g;->JJ:Ljava/util/List;
+    iget-object v0, v0, Lcom/facebook/c/g;->JF:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
     move-result v0
 
-    iput v0, p0, Lcom/facebook/c/g$a;->JR:I
+    iput v0, p0, Lcom/facebook/c/g$a;->JN:I
 
-    iput v0, p0, Lcom/facebook/c/g$a;->JQ:I
+    iput v0, p0, Lcom/facebook/c/g$a;->JM: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;->JP:Ljava/util/ArrayList;
+    iput-object v2, p0, Lcom/facebook/c/g$a;->JL:Ljava/util/ArrayList;
 
     :goto_0
     if-ge v1, v0, :cond_1
 
-    iget-object v2, p0, Lcom/facebook/c/g$a;->JU:Lcom/facebook/c/g;
+    iget-object v2, p0, Lcom/facebook/c/g$a;->JQ:Lcom/facebook/c/g;
 
-    iget-object v2, v2, Lcom/facebook/c/g;->JJ:Ljava/util/List;
+    iget-object v2, v2, Lcom/facebook/c/g;->JF: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;->JP:Ljava/util/ArrayList;
+    iget-object v3, p0, Lcom/facebook/c/g$a;->JL: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;->gb()Lcom/facebook/common/b/a;
+    invoke-static {}, Lcom/facebook/common/b/a;->fZ()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;->gD()Z
+    invoke-interface {v2}, Lcom/facebook/c/c;->gB()Z
 
     move-result v2
 
@@ -278,7 +278,7 @@
 
     if-eqz p0, :cond_0
 
-    invoke-interface {p0}, Lcom/facebook/c/c;->gG()Z
+    invoke-interface {p0}, Lcom/facebook/c/c;->gE()Z
 
     :cond_0
     return-void
@@ -302,11 +302,11 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/c/g$a;->JP:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/facebook/c/g$a;->JL:Ljava/util/ArrayList;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/c/g$a;->JP:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/facebook/c/g$a;->JL: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;->JP:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/facebook/c/g$a;->JL: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;->JP:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/facebook/c/g$a;->JL:Ljava/util/ArrayList;
 
     const/4 v1, 0x0
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/c/g$a;->JP:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/facebook/c/g$a;->JL: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;->JP:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/facebook/c/g$a;->JL: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 gD()Z
+.method public final declared-synchronized gB()Z
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/c/g$a;->JU:Lcom/facebook/c/g;
+    iget-object v0, p0, Lcom/facebook/c/g$a;->JQ:Lcom/facebook/c/g;
 
-    iget-boolean v0, v0, Lcom/facebook/c/g;->JO:Z
+    iget-boolean v0, v0, Lcom/facebook/c/g;->JK:Z
 
     if-eqz v0, :cond_0
 
-    invoke-direct {p0}, Lcom/facebook/c/g$a;->gN()V
+    invoke-direct {p0}, Lcom/facebook/c/g$a;->gL()V
 
     :cond_0
-    invoke-virtual {p0}, Lcom/facebook/c/g$a;->gM()Lcom/facebook/c/c;
+    invoke-virtual {p0}, Lcom/facebook/c/g$a;->gK()Lcom/facebook/c/c;
 
     move-result-object v0
 
     if-eqz v0, :cond_1
 
-    invoke-interface {v0}, Lcom/facebook/c/c;->gD()Z
+    invoke-interface {v0}, Lcom/facebook/c/c;->gB()Z
 
     move-result v0
     :try_end_0
@@ -455,22 +455,22 @@
     goto :goto_1
 .end method
 
-.method public final gG()Z
+.method public final gE()Z
     .locals 3
 
-    iget-object v0, p0, Lcom/facebook/c/g$a;->JU:Lcom/facebook/c/g;
+    iget-object v0, p0, Lcom/facebook/c/g$a;->JQ:Lcom/facebook/c/g;
 
-    iget-boolean v0, v0, Lcom/facebook/c/g;->JO:Z
+    iget-boolean v0, v0, Lcom/facebook/c/g;->JK:Z
 
     if-eqz v0, :cond_0
 
-    invoke-direct {p0}, Lcom/facebook/c/g$a;->gN()V
+    invoke-direct {p0}, Lcom/facebook/c/g$a;->gL()V
 
     :cond_0
     monitor-enter p0
 
     :try_start_0
-    invoke-super {p0}, Lcom/facebook/c/a;->gG()Z
+    invoke-super {p0}, Lcom/facebook/c/a;->gE()Z
 
     move-result v0
 
@@ -483,11 +483,11 @@
     return v1
 
     :cond_1
-    iget-object v0, p0, Lcom/facebook/c/g$a;->JP:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/facebook/c/g$a;->JL:Ljava/util/ArrayList;
 
     const/4 v2, 0x0
 
-    iput-object v2, p0, Lcom/facebook/c/g$a;->JP:Ljava/util/ArrayList;
+    iput-object v2, p0, Lcom/facebook/c/g$a;->JL:Ljava/util/ArrayList;
 
     monitor-exit p0
     :try_end_0
@@ -536,7 +536,7 @@
     goto :goto_1
 .end method
 
-.method declared-synchronized gM()Lcom/facebook/c/c;
+.method declared-synchronized gK()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;->JQ:I
+    iget v0, p0, Lcom/facebook/c/g$a;->JM: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 gO()V
+.method gM()V
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/c/g$a;->JS:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v0, p0, Lcom/facebook/c/g$a;->JO: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;->JR:I
+    iget v1, p0, Lcom/facebook/c/g$a;->JN:I
 
     if-ne v0, v1, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/c/g$a;->JT:Ljava/lang/Throwable;
+    iget-object v0, p0, Lcom/facebook/c/g$a;->JP: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;->JU:Lcom/facebook/c/g;
+    iget-object v0, p0, Lcom/facebook/c/g$a;->JQ:Lcom/facebook/c/g;
 
-    iget-boolean v0, v0, Lcom/facebook/c/g;->JO:Z
+    iget-boolean v0, v0, Lcom/facebook/c/g;->JK:Z
 
     if-eqz v0, :cond_0
 
-    invoke-direct {p0}, Lcom/facebook/c/g$a;->gN()V
+    invoke-direct {p0}, Lcom/facebook/c/g$a;->gL()V
 
     :cond_0
-    invoke-virtual {p0}, Lcom/facebook/c/g$a;->gM()Lcom/facebook/c/c;
+    invoke-virtual {p0}, Lcom/facebook/c/g$a;->gK()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 a8792823d4..d463d91e7f 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 fL()Ljava/lang/String;
+.method public abstract fJ()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 4a96a4468d..8423ac5fcc 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 GG:Lcom/facebook/cache/common/e;
+.field private static GC: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 fM()Lcom/facebook/cache/common/e;
+.method public static declared-synchronized fK()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;->GG:Lcom/facebook/cache/common/e;
+    sget-object v1, Lcom/facebook/cache/common/e;->GC: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;->GG:Lcom/facebook/cache/common/e;
+    sput-object v1, Lcom/facebook/cache/common/e;->GC:Lcom/facebook/cache/common/e;
 
     :cond_0
-    sget-object v1, Lcom/facebook/cache/common/e;->GG:Lcom/facebook/cache/common/e;
+    sget-object v1, Lcom/facebook/cache/common/e;->GC: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 ff4804b037..33f7361010 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 GH:Lcom/facebook/cache/common/f;
+.field private static GD: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 fN()Lcom/facebook/cache/common/f;
+.method public static declared-synchronized fL()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;->GH:Lcom/facebook/cache/common/f;
+    sget-object v1, Lcom/facebook/cache/common/f;->GD: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;->GH:Lcom/facebook/cache/common/f;
+    sput-object v1, Lcom/facebook/cache/common/f;->GD:Lcom/facebook/cache/common/f;
 
     :cond_0
-    sget-object v1, Lcom/facebook/cache/common/f;->GH:Lcom/facebook/cache/common/f;
+    sget-object v1, Lcom/facebook/cache/common/f;->GD: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 ea817277d8..8cde1938d4 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 GN:Lcom/facebook/cache/common/a;
+.field GJ:Lcom/facebook/cache/common/a;
 
-.field public GY:Ljava/lang/String;
+.field public GU:Ljava/lang/String;
 
-.field public GZ:Lcom/facebook/common/d/l;
+.field public GV: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 Hd:Lcom/facebook/cache/disk/g;
+.field GZ:Lcom/facebook/cache/disk/g;
 
-.field He:Lcom/facebook/cache/common/b;
+.field Ha:Lcom/facebook/cache/common/b;
 
-.field Hf:Lcom/facebook/common/a/a;
+.field Hb:Lcom/facebook/common/a/a;
 
-.field Hg:Z
+.field Hc:Z
 
-.field public Hh:J
+.field public Hd:J
 
-.field Hi:J
+.field He:J
 
-.field Hj:J
+.field Hf: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;->GY:Ljava/lang/String;
+    iput-object v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig$a;->GU:Ljava/lang/String;
 
     const-wide/32 v0, 0x2800000
 
-    iput-wide v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig$a;->Hh:J
+    iput-wide v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig$a;->Hd:J
 
     const-wide/32 v0, 0xa00000
 
-    iput-wide v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig$a;->Hi:J
+    iput-wide v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig$a;->He:J
 
     const-wide/32 v0, 0x200000
 
-    iput-wide v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig$a;->Hj:J
+    iput-wide v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig$a;->Hf: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;->Hd:Lcom/facebook/cache/disk/g;
+    iput-object v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig$a;->GZ: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 fU()Lcom/facebook/cache/disk/DiskCacheConfig;
+.method public final fS()Lcom/facebook/cache/disk/DiskCacheConfig;
     .locals 3
 
-    iget-object v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig$a;->GZ:Lcom/facebook/common/d/l;
+    iget-object v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig$a;->GV: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;->GZ:Lcom/facebook/common/d/l;
+    iget-object v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig$a;->GV: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;->GZ:Lcom/facebook/common/d/l;
+    iput-object v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig$a;->GV: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 e16532a954..52a70e8b12 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 GN:Lcom/facebook/cache/common/a;
+.field public final GJ:Lcom/facebook/cache/common/a;
 
-.field public final GY:Ljava/lang/String;
+.field public final GU:Ljava/lang/String;
 
-.field public final GZ:Lcom/facebook/common/d/l;
+.field public final GV: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 Ha:J
+.field public final GW:J
 
-.field public final Hb:J
+.field public final GX:J
 
-.field public final Hc:J
+.field public final GY:J
 
-.field public final Hd:Lcom/facebook/cache/disk/g;
+.field public final GZ:Lcom/facebook/cache/disk/g;
 
-.field public final He:Lcom/facebook/cache/common/b;
+.field public final Ha:Lcom/facebook/cache/common/b;
 
-.field public final Hf:Lcom/facebook/common/a/a;
+.field public final Hb:Lcom/facebook/common/a/a;
 
-.field public final Hg:Z
+.field public final Hc: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;->GY:Ljava/lang/String;
+    iget-object v0, p1, Lcom/facebook/cache/disk/DiskCacheConfig$a;->GU: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;->GY:Ljava/lang/String;
+    iput-object v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig;->GU:Ljava/lang/String;
 
-    iget-object v0, p1, Lcom/facebook/cache/disk/DiskCacheConfig$a;->GZ:Lcom/facebook/common/d/l;
+    iget-object v0, p1, Lcom/facebook/cache/disk/DiskCacheConfig$a;->GV: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;->GZ:Lcom/facebook/common/d/l;
+    iput-object v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig;->GV:Lcom/facebook/common/d/l;
 
-    iget-wide v0, p1, Lcom/facebook/cache/disk/DiskCacheConfig$a;->Hh:J
+    iget-wide v0, p1, Lcom/facebook/cache/disk/DiskCacheConfig$a;->Hd:J
 
-    iput-wide v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig;->Ha:J
+    iput-wide v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig;->GW:J
 
-    iget-wide v0, p1, Lcom/facebook/cache/disk/DiskCacheConfig$a;->Hi:J
+    iget-wide v0, p1, Lcom/facebook/cache/disk/DiskCacheConfig$a;->He:J
 
-    iput-wide v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig;->Hb:J
+    iput-wide v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig;->GX:J
 
-    iget-wide v0, p1, Lcom/facebook/cache/disk/DiskCacheConfig$a;->Hj:J
+    iget-wide v0, p1, Lcom/facebook/cache/disk/DiskCacheConfig$a;->Hf:J
 
-    iput-wide v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig;->Hc:J
+    iput-wide v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig;->GY:J
 
-    iget-object v0, p1, Lcom/facebook/cache/disk/DiskCacheConfig$a;->Hd:Lcom/facebook/cache/disk/g;
+    iget-object v0, p1, Lcom/facebook/cache/disk/DiskCacheConfig$a;->GZ: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;->Hd:Lcom/facebook/cache/disk/g;
+    iput-object v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig;->GZ:Lcom/facebook/cache/disk/g;
 
-    iget-object v0, p1, Lcom/facebook/cache/disk/DiskCacheConfig$a;->GN:Lcom/facebook/cache/common/a;
+    iget-object v0, p1, Lcom/facebook/cache/disk/DiskCacheConfig$a;->GJ:Lcom/facebook/cache/common/a;
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lcom/facebook/cache/common/e;->fM()Lcom/facebook/cache/common/e;
+    invoke-static {}, Lcom/facebook/cache/common/e;->fK()Lcom/facebook/cache/common/e;
 
     move-result-object v0
 
     goto :goto_0
 
     :cond_0
-    iget-object v0, p1, Lcom/facebook/cache/disk/DiskCacheConfig$a;->GN:Lcom/facebook/cache/common/a;
+    iget-object v0, p1, Lcom/facebook/cache/disk/DiskCacheConfig$a;->GJ:Lcom/facebook/cache/common/a;
 
     :goto_0
-    iput-object v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig;->GN:Lcom/facebook/cache/common/a;
+    iput-object v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig;->GJ:Lcom/facebook/cache/common/a;
 
-    iget-object v0, p1, Lcom/facebook/cache/disk/DiskCacheConfig$a;->He:Lcom/facebook/cache/common/b;
+    iget-object v0, p1, Lcom/facebook/cache/disk/DiskCacheConfig$a;->Ha:Lcom/facebook/cache/common/b;
 
     if-nez v0, :cond_1
 
-    invoke-static {}, Lcom/facebook/cache/common/f;->fN()Lcom/facebook/cache/common/f;
+    invoke-static {}, Lcom/facebook/cache/common/f;->fL()Lcom/facebook/cache/common/f;
 
     move-result-object v0
 
     goto :goto_1
 
     :cond_1
-    iget-object v0, p1, Lcom/facebook/cache/disk/DiskCacheConfig$a;->He:Lcom/facebook/cache/common/b;
+    iget-object v0, p1, Lcom/facebook/cache/disk/DiskCacheConfig$a;->Ha:Lcom/facebook/cache/common/b;
 
     :goto_1
-    iput-object v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig;->He:Lcom/facebook/cache/common/b;
+    iput-object v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig;->Ha:Lcom/facebook/cache/common/b;
 
-    iget-object v0, p1, Lcom/facebook/cache/disk/DiskCacheConfig$a;->Hf:Lcom/facebook/common/a/a;
+    iget-object v0, p1, Lcom/facebook/cache/disk/DiskCacheConfig$a;->Hb:Lcom/facebook/common/a/a;
 
     if-nez v0, :cond_2
 
-    invoke-static {}, Lcom/facebook/common/a/b;->ga()Lcom/facebook/common/a/b;
+    invoke-static {}, Lcom/facebook/common/a/b;->fY()Lcom/facebook/common/a/b;
 
     move-result-object v0
 
     goto :goto_2
 
     :cond_2
-    iget-object v0, p1, Lcom/facebook/cache/disk/DiskCacheConfig$a;->Hf:Lcom/facebook/common/a/a;
+    iget-object v0, p1, Lcom/facebook/cache/disk/DiskCacheConfig$a;->Hb:Lcom/facebook/common/a/a;
 
     :goto_2
-    iput-object v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig;->Hf:Lcom/facebook/common/a/a;
+    iput-object v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig;->Hb: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;->Hg:Z
+    iget-boolean p1, p1, Lcom/facebook/cache/disk/DiskCacheConfig$a;->Hc:Z
 
-    iput-boolean p1, p0, Lcom/facebook/cache/disk/DiskCacheConfig;->Hg:Z
+    iput-boolean p1, p0, Lcom/facebook/cache/disk/DiskCacheConfig;->Hc: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 3b26fd5269..43dfded92f 100644
--- a/com.discord/smali/com/facebook/cache/disk/a.smali
+++ b/com.discord/smali/com/facebook/cache/disk/a.smali
@@ -20,7 +20,7 @@
 
 
 # static fields
-.field private static final GI:Ljava/lang/Class;
+.field private static final GE:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -29,19 +29,19 @@
     .end annotation
 .end field
 
-.field static final GJ:J
+.field static final GF:J
 
 
 # instance fields
-.field private final GK:Ljava/io/File;
+.field private final GG:Ljava/io/File;
 
-.field private final GL:Z
+.field private final GH:Z
 
-.field private final GM:Ljava/io/File;
+.field private final GI:Ljava/io/File;
 
-.field private final GN:Lcom/facebook/cache/common/a;
+.field private final GJ:Lcom/facebook/cache/common/a;
 
-.field private final GO:Lcom/facebook/common/time/a;
+.field private final GK: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;->GI:Ljava/lang/Class;
+    sput-object v0, Lcom/facebook/cache/disk/a;->GE: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;->GJ:J
+    sput-wide v0, Lcom/facebook/cache/disk/a;->GF: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;->GK:Ljava/io/File;
+    iput-object p1, p0, Lcom/facebook/cache/disk/a;->GG: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;->GL:Z
+    iput-boolean p1, p0, Lcom/facebook/cache/disk/a;->GH:Z
 
     new-instance p1, Ljava/io/File;
 
-    iget-object v0, p0, Lcom/facebook/cache/disk/a;->GK:Ljava/io/File;
+    iget-object v0, p0, Lcom/facebook/cache/disk/a;->GG: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;->GM:Ljava/io/File;
+    iput-object p1, p0, Lcom/facebook/cache/disk/a;->GI:Ljava/io/File;
 
-    iput-object p3, p0, Lcom/facebook/cache/disk/a;->GN:Lcom/facebook/cache/common/a;
+    iput-object p3, p0, Lcom/facebook/cache/disk/a;->GJ:Lcom/facebook/cache/common/a;
 
-    iget-object p1, p0, Lcom/facebook/cache/disk/a;->GK:Ljava/io/File;
+    iget-object p1, p0, Lcom/facebook/cache/disk/a;->GG: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;->GM:Ljava/io/File;
+    iget-object p1, p0, Lcom/facebook/cache/disk/a;->GI: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;->GK:Ljava/io/File;
+    iget-object p1, p0, Lcom/facebook/cache/disk/a;->GG: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;->GM:Ljava/io/File;
+    iget-object p1, p0, Lcom/facebook/cache/disk/a;->GI: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;->Gs:I
+    sget p1, Lcom/facebook/cache/common/a$a;->Go: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;->GM:Ljava/io/File;
+    iget-object p2, p0, Lcom/facebook/cache/disk/a;->GI: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;->gB()Lcom/facebook/common/time/c;
+    invoke-static {}, Lcom/facebook/common/time/c;->gz()Lcom/facebook/common/time/c;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/facebook/cache/disk/a;->GO:Lcom/facebook/common/time/a;
+    iput-object p1, p0, Lcom/facebook/cache/disk/a;->GK: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;->GS:Ljava/lang/String;
+    iget-object v0, v1, Lcom/facebook/cache/disk/a$c;->GO: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;->GM:Ljava/io/File;
+    iget-object p0, p0, Lcom/facebook/cache/disk/a;->GI: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;->GM:Ljava/io/File;
+    iget-object v1, p0, Lcom/facebook/cache/disk/a;->GI: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;->GK:Ljava/io/File;
+    iget-object p0, p0, Lcom/facebook/cache/disk/a;->GG: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;->GO:Lcom/facebook/common/time/a;
+    iget-object p0, p0, Lcom/facebook/cache/disk/a;->GK: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;->GN:Lcom/facebook/cache/common/a;
+    iget-object p0, p0, Lcom/facebook/cache/disk/a;->GJ:Lcom/facebook/cache/common/a;
 
     return-object p0
 .end method
 
-.method static synthetic fQ()Ljava/lang/Class;
+.method static synthetic fO()Ljava/lang/Class;
     .locals 1
 
-    sget-object v0, Lcom/facebook/cache/disk/a;->GI:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/cache/disk/a;->GE: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;->Gy:I
+    sget p0, Lcom/facebook/cache/common/a$a;->Gu: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;->Gy:I
+    sget p0, Lcom/facebook/cache/common/a$a;->Gu: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;->GR:Lcom/facebook/a/b;
+    iget-object p1, p1, Lcom/facebook/cache/disk/a$b;->GN: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;->GS:Ljava/lang/String;
+    iget-object p1, v1, Lcom/facebook/cache/disk/a$c;->GO: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;->GS:Ljava/lang/String;
+    iget-object p1, v1, Lcom/facebook/cache/disk/a$c;->GO: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;->GS:Ljava/lang/String;
+    iget-object v1, p2, Lcom/facebook/cache/disk/a$c;->GO: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;->Gs:I
+    sget p2, Lcom/facebook/cache/common/a$a;->Go: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;->GS:Ljava/lang/String;
+    iget-object p2, p2, Lcom/facebook/cache/disk/a$c;->GO: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;->Gn:I
+    sget p2, Lcom/facebook/cache/common/a$a;->Gj:I
 
     throw p1
 .end method
@@ -651,7 +651,7 @@
 
     if-eqz p2, :cond_0
 
-    iget-object p2, p0, Lcom/facebook/cache/disk/a;->GO:Lcom/facebook/common/time/a;
+    iget-object p2, p0, Lcom/facebook/cache/disk/a;->GK: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 fO()V
+.method public final fM()V
     .locals 3
 
-    iget-object v0, p0, Lcom/facebook/cache/disk/a;->GK:Ljava/io/File;
+    iget-object v0, p0, Lcom/facebook/cache/disk/a;->GG:Ljava/io/File;
 
     new-instance v1, Lcom/facebook/cache/disk/a$f;
 
@@ -687,7 +687,7 @@
     return-void
 .end method
 
-.method public final synthetic fP()Ljava/util/Collection;
+.method public final synthetic fN()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;->GM:Ljava/io/File;
+    iget-object v1, p0, Lcom/facebook/cache/disk/a;->GI: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;->GP:Ljava/util/List;
+    iget-object v0, v0, Lcom/facebook/cache/disk/a$a;->GL: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;->GL:Z
+    iget-boolean v0, p0, Lcom/facebook/cache/disk/a;->GH: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 1adf296264..e0d49b16d5 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 fO()V
+.method public abstract fM()V
 .end method
 
-.method public abstract fP()Ljava/util/Collection;
+.method public abstract fN()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 0bd8274e88..7565f75f28 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 GI:Ljava/lang/Class;
+.field private static final GE:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -25,31 +25,31 @@
     .end annotation
 .end field
 
-.field private static final Hl:J
+.field private static final Hh:J
 
-.field private static final Hm:J
+.field private static final Hi:J
 
 
 # instance fields
-.field private final GN:Lcom/facebook/cache/common/a;
+.field private final GJ:Lcom/facebook/cache/common/a;
 
-.field private final GO:Lcom/facebook/common/time/a;
+.field private final GK:Lcom/facebook/common/time/a;
 
-.field private final Hd:Lcom/facebook/cache/disk/g;
+.field private final GZ:Lcom/facebook/cache/disk/g;
 
-.field private final He:Lcom/facebook/cache/common/b;
+.field private final Ha:Lcom/facebook/cache/common/b;
 
-.field private final Hg:Z
+.field private final Hc:Z
 
-.field private final Hn:J
+.field private final Hj:J
 
-.field private final Ho:J
+.field private final Hk:J
 
-.field private final Hp:Ljava/util/concurrent/CountDownLatch;
+.field private final Hl:Ljava/util/concurrent/CountDownLatch;
 
-.field private Hq:J
+.field private Hm:J
 
-.field final Hr:Ljava/util/Set;
+.field final Hn:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -59,17 +59,17 @@
     .end annotation
 .end field
 
-.field private Hs:J
+.field private Ho:J
 
-.field private final Ht:J
+.field private final Hp:J
 
-.field private final Hu:Lcom/facebook/common/h/a;
+.field private final Hq:Lcom/facebook/common/h/a;
 
-.field private final Hv:Lcom/facebook/cache/disk/c;
+.field private final Hr:Lcom/facebook/cache/disk/c;
 
-.field private final Hw:Lcom/facebook/cache/disk/d$a;
+.field private final Hs:Lcom/facebook/cache/disk/d$a;
 
-.field private Hx:Z
+.field private Ht: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;->GI:Ljava/lang/Class;
+    sput-object v0, Lcom/facebook/cache/disk/d;->GE: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;->Hl:J
+    sput-wide v0, Lcom/facebook/cache/disk/d;->Hh: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;->Hm:J
+    sput-wide v0, Lcom/facebook/cache/disk/d;->Hi: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;->Hn:J
+    iget-wide v0, p3, Lcom/facebook/cache/disk/d$b;->Hj:J
 
-    iput-wide v0, p0, Lcom/facebook/cache/disk/d;->Hn:J
+    iput-wide v0, p0, Lcom/facebook/cache/disk/d;->Hj:J
 
-    iget-wide v0, p3, Lcom/facebook/cache/disk/d$b;->Ho:J
+    iget-wide v0, p3, Lcom/facebook/cache/disk/d$b;->Hk:J
 
-    iput-wide v0, p0, Lcom/facebook/cache/disk/d;->Ho:J
+    iput-wide v0, p0, Lcom/facebook/cache/disk/d;->Hk:J
 
-    iget-wide v0, p3, Lcom/facebook/cache/disk/d$b;->Ho:J
+    iget-wide v0, p3, Lcom/facebook/cache/disk/d$b;->Hk:J
 
-    iput-wide v0, p0, Lcom/facebook/cache/disk/d;->Hq:J
+    iput-wide v0, p0, Lcom/facebook/cache/disk/d;->Hm:J
 
-    invoke-static {}, Lcom/facebook/common/h/a;->gx()Lcom/facebook/common/h/a;
+    invoke-static {}, Lcom/facebook/common/h/a;->gv()Lcom/facebook/common/h/a;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/facebook/cache/disk/d;->Hu:Lcom/facebook/common/h/a;
+    iput-object v0, p0, Lcom/facebook/cache/disk/d;->Hq:Lcom/facebook/common/h/a;
 
-    iput-object p1, p0, Lcom/facebook/cache/disk/d;->Hv:Lcom/facebook/cache/disk/c;
+    iput-object p1, p0, Lcom/facebook/cache/disk/d;->Hr:Lcom/facebook/cache/disk/c;
 
-    iput-object p2, p0, Lcom/facebook/cache/disk/d;->Hd:Lcom/facebook/cache/disk/g;
+    iput-object p2, p0, Lcom/facebook/cache/disk/d;->GZ:Lcom/facebook/cache/disk/g;
 
     const-wide/16 p1, -0x1
 
-    iput-wide p1, p0, Lcom/facebook/cache/disk/d;->Hs:J
+    iput-wide p1, p0, Lcom/facebook/cache/disk/d;->Ho:J
 
-    iput-object p4, p0, Lcom/facebook/cache/disk/d;->He:Lcom/facebook/cache/common/b;
+    iput-object p4, p0, Lcom/facebook/cache/disk/d;->Ha:Lcom/facebook/cache/common/b;
 
-    iget-wide p1, p3, Lcom/facebook/cache/disk/d$b;->Ht:J
+    iget-wide p1, p3, Lcom/facebook/cache/disk/d$b;->Hp:J
 
-    iput-wide p1, p0, Lcom/facebook/cache/disk/d;->Ht:J
+    iput-wide p1, p0, Lcom/facebook/cache/disk/d;->Hp:J
 
-    iput-object p5, p0, Lcom/facebook/cache/disk/d;->GN:Lcom/facebook/cache/common/a;
+    iput-object p5, p0, Lcom/facebook/cache/disk/d;->GJ: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;->Hw:Lcom/facebook/cache/disk/d$a;
+    iput-object p1, p0, Lcom/facebook/cache/disk/d;->Hs:Lcom/facebook/cache/disk/d$a;
 
-    invoke-static {}, Lcom/facebook/common/time/c;->gB()Lcom/facebook/common/time/c;
+    invoke-static {}, Lcom/facebook/common/time/c;->gz()Lcom/facebook/common/time/c;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/facebook/cache/disk/d;->GO:Lcom/facebook/common/time/a;
+    iput-object p1, p0, Lcom/facebook/cache/disk/d;->GK:Lcom/facebook/common/time/a;
 
-    iput-boolean p7, p0, Lcom/facebook/cache/disk/d;->Hg:Z
+    iput-boolean p7, p0, Lcom/facebook/cache/disk/d;->Hc:Z
 
     new-instance p1, Ljava/util/HashSet;
 
     invoke-direct {p1}, Ljava/util/HashSet;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/cache/disk/d;->Hr:Ljava/util/Set;
+    iput-object p1, p0, Lcom/facebook/cache/disk/d;->Hn:Ljava/util/Set;
 
-    iget-boolean p1, p0, Lcom/facebook/cache/disk/d;->Hg:Z
+    iget-boolean p1, p0, Lcom/facebook/cache/disk/d;->Hc: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;->Hp:Ljava/util/concurrent/CountDownLatch;
+    iput-object p1, p0, Lcom/facebook/cache/disk/d;->Hl: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;->Hp:Ljava/util/concurrent/CountDownLatch;
+    iput-object p1, p0, Lcom/facebook/cache/disk/d;->Hl: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;->fS()Lcom/facebook/a/a;
+    invoke-interface {p1}, Lcom/facebook/cache/disk/c$b;->fQ()Lcom/facebook/a/a;
 
     move-result-object p1
 
-    iget-object v1, p0, Lcom/facebook/cache/disk/d;->Hr:Ljava/util/Set;
+    iget-object v1, p0, Lcom/facebook/cache/disk/d;->Hn:Ljava/util/Set;
 
     invoke-interface {v1, p2}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
 
-    iget-object p2, p0, Lcom/facebook/cache/disk/d;->Hw:Lcom/facebook/cache/disk/d$a;
+    iget-object p2, p0, Lcom/facebook/cache/disk/d;->Hs:Lcom/facebook/cache/disk/d$a;
 
-    invoke-interface {p1}, Lcom/facebook/a/a;->fK()J
+    invoke-interface {p1}, Lcom/facebook/a/a;->fI()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;->fV()Z
+    invoke-direct/range {p0 .. p0}, Lcom/facebook/cache/disk/d;->fT()Z
 
     move-result v0
 
-    iget-object v3, v1, Lcom/facebook/cache/disk/d;->Hv:Lcom/facebook/cache/disk/c;
+    iget-object v3, v1, Lcom/facebook/cache/disk/d;->Hr: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;->IU:I
+    sget v3, Lcom/facebook/common/h/a$a;->IQ:I
 
     goto :goto_0
 
     :cond_0
-    sget v3, Lcom/facebook/common/h/a$a;->IT:I
+    sget v3, Lcom/facebook/common/h/a$a;->IP:I
 
     :goto_0
-    iget-object v4, v1, Lcom/facebook/cache/disk/d;->Hu:Lcom/facebook/common/h/a;
+    iget-object v4, v1, Lcom/facebook/cache/disk/d;->Hq:Lcom/facebook/common/h/a;
 
-    iget-wide v5, v1, Lcom/facebook/cache/disk/d;->Ho:J
+    iget-wide v5, v1, Lcom/facebook/cache/disk/d;->Hk:J
 
-    iget-object v7, v1, Lcom/facebook/cache/disk/d;->Hw:Lcom/facebook/cache/disk/d$a;
+    iget-object v7, v1, Lcom/facebook/cache/disk/d;->Hs:Lcom/facebook/cache/disk/d$a;
 
-    invoke-virtual {v7}, Lcom/facebook/cache/disk/d$a;->fR()J
+    invoke-virtual {v7}, Lcom/facebook/cache/disk/d$a;->fP()J
 
     move-result-wide v7
 
     sub-long/2addr v5, v7
 
-    invoke-virtual {v4}, Lcom/facebook/common/h/a;->gy()V
+    invoke-virtual {v4}, Lcom/facebook/common/h/a;->gw()V
 
-    invoke-virtual {v4}, Lcom/facebook/common/h/a;->gy()V
+    invoke-virtual {v4}, Lcom/facebook/common/h/a;->gw()V
 
-    iget-object v7, v4, Lcom/facebook/common/h/a;->IS:Ljava/util/concurrent/locks/Lock;
+    iget-object v7, v4, Lcom/facebook/common/h/a;->IO: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;->IR:J
+    iget-wide v9, v4, Lcom/facebook/common/h/a;->IM:J
 
     sub-long/2addr v7, v9
 
-    sget-wide v9, Lcom/facebook/common/h/a;->IL:J
+    sget-wide v9, Lcom/facebook/common/h/a;->IH:J
 
     cmp-long v11, v7, v9
 
     if-lez v11, :cond_1
 
-    invoke-virtual {v4}, Lcom/facebook/common/h/a;->gz()V
+    invoke-virtual {v4}, Lcom/facebook/common/h/a;->gx()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;->IS:Ljava/util/concurrent/locks/Lock;
+    iget-object v7, v4, Lcom/facebook/common/h/a;->IO: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;->IS:Ljava/util/concurrent/locks/Lock;
+    iget-object v3, v4, Lcom/facebook/common/h/a;->IO: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;->IT:I
+    sget v7, Lcom/facebook/common/h/a$a;->IP:I
 
     if-ne v3, v7, :cond_3
 
-    iget-object v3, v4, Lcom/facebook/common/h/a;->IM:Landroid/os/StatFs;
+    iget-object v3, v4, Lcom/facebook/common/h/a;->II:Landroid/os/StatFs;
 
     goto :goto_2
 
     :cond_3
-    iget-object v3, v4, Lcom/facebook/common/h/a;->IP:Landroid/os/StatFs;
+    iget-object v3, v4, Lcom/facebook/common/h/a;->IK: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;->Hn:J
+    iget-wide v3, v1, Lcom/facebook/cache/disk/d;->Hj:J
 
-    iput-wide v3, v1, Lcom/facebook/cache/disk/d;->Hq:J
+    iput-wide v3, v1, Lcom/facebook/cache/disk/d;->Hm:J
 
     goto :goto_6
 
     :cond_7
-    iget-wide v3, v1, Lcom/facebook/cache/disk/d;->Ho:J
+    iget-wide v3, v1, Lcom/facebook/cache/disk/d;->Hk:J
 
-    iput-wide v3, v1, Lcom/facebook/cache/disk/d;->Hq:J
+    iput-wide v3, v1, Lcom/facebook/cache/disk/d;->Hm:J
 
     :goto_6
-    iget-object v3, v1, Lcom/facebook/cache/disk/d;->Hw:Lcom/facebook/cache/disk/d$a;
+    iget-object v3, v1, Lcom/facebook/cache/disk/d;->Hs:Lcom/facebook/cache/disk/d$a;
 
-    invoke-virtual {v3}, Lcom/facebook/cache/disk/d$a;->fR()J
+    invoke-virtual {v3}, Lcom/facebook/cache/disk/d$a;->fP()J
 
     move-result-wide v3
 
-    iget-wide v5, v1, Lcom/facebook/cache/disk/d;->Hq:J
+    iget-wide v5, v1, Lcom/facebook/cache/disk/d;->Hm:J
 
     cmp-long v10, v3, v5
 
@@ -446,20 +446,20 @@
 
     if-nez v0, :cond_8
 
-    iget-object v0, v1, Lcom/facebook/cache/disk/d;->Hw:Lcom/facebook/cache/disk/d$a;
+    iget-object v0, v1, Lcom/facebook/cache/disk/d;->Hs: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;->fV()Z
+    invoke-direct/range {p0 .. p0}, Lcom/facebook/cache/disk/d;->fT()Z
 
     :cond_8
-    iget-wide v5, v1, Lcom/facebook/cache/disk/d;->Hq:J
+    iget-wide v5, v1, Lcom/facebook/cache/disk/d;->Hm:J
 
     cmp-long v0, v3, v5
 
     if-lez v0, :cond_d
 
-    iget-wide v3, v1, Lcom/facebook/cache/disk/d;->Hq:J
+    iget-wide v3, v1, Lcom/facebook/cache/disk/d;->Hm:J
 
     const-wide/16 v5, 0x9
 
@@ -469,24 +469,24 @@
 
     div-long/2addr v3, v5
 
-    sget v0, Lcom/facebook/cache/common/b$a;->GA:I
+    sget v0, Lcom/facebook/cache/common/b$a;->Gw: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;->Hv:Lcom/facebook/cache/disk/c;
+    iget-object v5, v1, Lcom/facebook/cache/disk/d;->Hr:Lcom/facebook/cache/disk/c;
 
-    invoke-interface {v5}, Lcom/facebook/cache/disk/c;->fP()Ljava/util/Collection;
+    invoke-interface {v5}, Lcom/facebook/cache/disk/c;->fN()Ljava/util/Collection;
 
     move-result-object v5
 
-    iget-object v6, v1, Lcom/facebook/cache/disk/d;->GO:Lcom/facebook/common/time/a;
+    iget-object v6, v1, Lcom/facebook/cache/disk/d;->GK: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;->Hl:J
+    sget-wide v12, Lcom/facebook/cache/disk/d;->Hh:J
 
     add-long/2addr v10, v12
 
@@ -541,9 +541,9 @@
     goto :goto_7
 
     :cond_a
-    iget-object v5, v1, Lcom/facebook/cache/disk/d;->Hd:Lcom/facebook/cache/disk/g;
+    iget-object v5, v1, Lcom/facebook/cache/disk/d;->GZ:Lcom/facebook/cache/disk/g;
 
-    invoke-interface {v5}, Lcom/facebook/cache/disk/g;->fT()Lcom/facebook/cache/disk/f;
+    invoke-interface {v5}, Lcom/facebook/cache/disk/g;->fR()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;->Hw:Lcom/facebook/cache/disk/d$a;
+    iget-object v5, v1, Lcom/facebook/cache/disk/d;->Hs:Lcom/facebook/cache/disk/d$a;
 
-    invoke-virtual {v5}, Lcom/facebook/cache/disk/d$a;->fR()J
+    invoke-virtual {v5}, Lcom/facebook/cache/disk/d$a;->fP()J
 
     move-result-wide v10
 
@@ -586,7 +586,7 @@
 
     if-gtz v16, :cond_c
 
-    iget-object v7, v1, Lcom/facebook/cache/disk/d;->Hv:Lcom/facebook/cache/disk/c;
+    iget-object v7, v1, Lcom/facebook/cache/disk/d;->Hr: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;->Hr:Ljava/util/Set;
+    iget-object v5, v1, Lcom/facebook/cache/disk/d;->Hn:Ljava/util/Set;
 
     move-wide/from16 v18, v12
 
@@ -614,7 +614,7 @@
 
     add-long/2addr v14, v7
 
-    invoke-static {}, Lcom/facebook/cache/disk/i;->fZ()Lcom/facebook/cache/disk/i;
+    invoke-static {}, Lcom/facebook/cache/disk/i;->fX()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;->GU:Ljava/lang/String;
+    iput-object v6, v5, Lcom/facebook/cache/disk/i;->GP:Ljava/lang/String;
 
-    iput v0, v5, Lcom/facebook/cache/disk/i;->HM:I
+    iput v0, v5, Lcom/facebook/cache/disk/i;->HI:I
 
-    iput-wide v7, v5, Lcom/facebook/cache/disk/i;->HI:J
+    iput-wide v7, v5, Lcom/facebook/cache/disk/i;->HE:J
 
     sub-long v6, v10, v14
 
-    iput-wide v6, v5, Lcom/facebook/cache/disk/i;->HK:J
+    iput-wide v6, v5, Lcom/facebook/cache/disk/i;->HG:J
 
-    iput-wide v3, v5, Lcom/facebook/cache/disk/i;->HJ:J
+    iput-wide v3, v5, Lcom/facebook/cache/disk/i;->HF: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;->Hw:Lcom/facebook/cache/disk/d$a;
+    iget-object v0, v1, Lcom/facebook/cache/disk/d;->Hs: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;->Hv:Lcom/facebook/cache/disk/c;
+    iget-object v0, v1, Lcom/facebook/cache/disk/d;->Hr:Lcom/facebook/cache/disk/c;
 
-    invoke-interface {v0}, Lcom/facebook/cache/disk/c;->fO()V
+    invoke-interface {v0}, Lcom/facebook/cache/disk/c;->fM()V
 
     goto :goto_9
 
     :catch_0
     move-exception v0
 
-    sget v3, Lcom/facebook/cache/common/a$a;->Gw:I
+    sget v3, Lcom/facebook/cache/common/a$a;->Gs: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;->Hv:Lcom/facebook/cache/disk/c;
+    iget-object v0, v1, Lcom/facebook/cache/disk/d;->Hr: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;->fV()Z
+    invoke-direct {p0}, Lcom/facebook/cache/disk/d;->fT()Z
 
     move-result p0
 
@@ -739,7 +739,7 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/facebook/cache/disk/d;->Hx:Z
+    iput-boolean v0, p0, Lcom/facebook/cache/disk/d;->Ht: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;->Hp:Ljava/util/concurrent/CountDownLatch;
+    iget-object p0, p0, Lcom/facebook/cache/disk/d;->Hl:Ljava/util/concurrent/CountDownLatch;
 
     return-object p0
 .end method
 
-.method private fV()Z
+.method private fT()Z
     .locals 7
 
-    iget-object v0, p0, Lcom/facebook/cache/disk/d;->GO:Lcom/facebook/common/time/a;
+    iget-object v0, p0, Lcom/facebook/cache/disk/d;->GK: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;->Hw:Lcom/facebook/cache/disk/d$a;
+    iget-object v2, p0, Lcom/facebook/cache/disk/d;->Hs: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;->Hs:J
+    iget-wide v2, p0, Lcom/facebook/cache/disk/d;->Ho:J
 
     const-wide/16 v4, -0x1
 
@@ -779,7 +779,7 @@
 
     sub-long/2addr v0, v2
 
-    sget-wide v2, Lcom/facebook/cache/disk/d;->Hm:J
+    sget-wide v2, Lcom/facebook/cache/disk/d;->Hi:J
 
     cmp-long v4, v0, v2
 
@@ -794,33 +794,33 @@
 
     :cond_1
     :goto_0
-    invoke-direct {p0}, Lcom/facebook/cache/disk/d;->fW()Z
+    invoke-direct {p0}, Lcom/facebook/cache/disk/d;->fU()Z
 
     move-result v0
 
     return v0
 .end method
 
-.method private fW()Z
+.method private fU()Z
     .locals 23
 
     move-object/from16 v1, p0
 
-    iget-object v0, v1, Lcom/facebook/cache/disk/d;->GO:Lcom/facebook/common/time/a;
+    iget-object v0, v1, Lcom/facebook/cache/disk/d;->GK: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;->Hl:J
+    sget-wide v4, Lcom/facebook/cache/disk/d;->Hh:J
 
     add-long/2addr v4, v2
 
-    iget-boolean v0, v1, Lcom/facebook/cache/disk/d;->Hg:Z
+    iget-boolean v0, v1, Lcom/facebook/cache/disk/d;->Hc:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, v1, Lcom/facebook/cache/disk/d;->Hr:Ljava/util/Set;
+    iget-object v0, v1, Lcom/facebook/cache/disk/d;->Hn: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;->Hr:Ljava/util/Set;
+    iget-object v0, v1, Lcom/facebook/cache/disk/d;->Hn:Ljava/util/Set;
 
     goto :goto_0
 
     :cond_0
-    iget-boolean v0, v1, Lcom/facebook/cache/disk/d;->Hg:Z
+    iget-boolean v0, v1, Lcom/facebook/cache/disk/d;->Hc:Z
 
     if-eqz v0, :cond_1
 
@@ -848,9 +848,9 @@
 
     :goto_0
     :try_start_0
-    iget-object v7, v1, Lcom/facebook/cache/disk/d;->Hv:Lcom/facebook/cache/disk/c;
+    iget-object v7, v1, Lcom/facebook/cache/disk/d;->Hr:Lcom/facebook/cache/disk/c;
 
-    invoke-interface {v7}, Lcom/facebook/cache/disk/c;->fP()Ljava/util/Collection;
+    invoke-interface {v7}, Lcom/facebook/cache/disk/c;->fN()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;->fR()J
+    invoke-interface/range {v16 .. v16}, Lcom/facebook/cache/disk/c$a;->fP()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;->fR()J
+    invoke-interface/range {v16 .. v16}, Lcom/facebook/cache/disk/c$a;->fP()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;->Hg:Z
+    iget-boolean v6, v1, Lcom/facebook/cache/disk/d;->Hc: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;->Gl:I
+    sget v4, Lcom/facebook/cache/common/a$a;->Gh: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;->Hw:Lcom/facebook/cache/disk/d$a;
+    iget-object v4, v1, Lcom/facebook/cache/disk/d;->Hs:Lcom/facebook/cache/disk/d$a;
 
-    invoke-virtual {v4}, Lcom/facebook/cache/disk/d$a;->fX()J
+    invoke-virtual {v4}, Lcom/facebook/cache/disk/d$a;->fV()J
 
     move-result-wide v4
 
@@ -995,9 +995,9 @@
 
     if-nez v8, :cond_6
 
-    iget-object v4, v1, Lcom/facebook/cache/disk/d;->Hw:Lcom/facebook/cache/disk/d$a;
+    iget-object v4, v1, Lcom/facebook/cache/disk/d;->Hs:Lcom/facebook/cache/disk/d$a;
 
-    invoke-virtual {v4}, Lcom/facebook/cache/disk/d$a;->fR()J
+    invoke-virtual {v4}, Lcom/facebook/cache/disk/d$a;->fP()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;->Hg:Z
+    iget-boolean v4, v1, Lcom/facebook/cache/disk/d;->Hc:Z
 
     if-eqz v4, :cond_7
 
-    iget-object v4, v1, Lcom/facebook/cache/disk/d;->Hr:Ljava/util/Set;
+    iget-object v4, v1, Lcom/facebook/cache/disk/d;->Hn:Ljava/util/Set;
 
     if-eq v4, v0, :cond_7
 
-    iget-object v4, v1, Lcom/facebook/cache/disk/d;->Hr:Ljava/util/Set;
+    iget-object v4, v1, Lcom/facebook/cache/disk/d;->Hn:Ljava/util/Set;
 
     invoke-interface {v4}, Ljava/util/Set;->clear()V
 
-    iget-object v4, v1, Lcom/facebook/cache/disk/d;->Hr:Ljava/util/Set;
+    iget-object v4, v1, Lcom/facebook/cache/disk/d;->Hn: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;->Hw:Lcom/facebook/cache/disk/d$a;
+    iget-object v0, v1, Lcom/facebook/cache/disk/d;->Hs: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;->Hs:J
+    iput-wide v2, v1, Lcom/facebook/cache/disk/d;->Ho:J
 
     const/4 v0, 0x1
 
@@ -1039,7 +1039,7 @@
     :catch_0
     move-exception v0
 
-    sget v2, Lcom/facebook/cache/common/a$a;->Gx:I
+    sget v2, Lcom/facebook/cache/common/a$a;->Gt:I
 
     new-instance v2, Ljava/lang/StringBuilder;
 
@@ -1068,11 +1068,11 @@
         }
     .end annotation
 
-    invoke-static {}, Lcom/facebook/cache/disk/i;->fZ()Lcom/facebook/cache/disk/i;
+    invoke-static {}, Lcom/facebook/cache/disk/i;->fX()Lcom/facebook/cache/disk/i;
 
     move-result-object v0
 
-    iput-object p1, v0, Lcom/facebook/cache/disk/i;->HH:Lcom/facebook/cache/common/CacheKey;
+    iput-object p1, v0, Lcom/facebook/cache/disk/i;->HD: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;->GU:Ljava/lang/String;
+    iput-object v2, v0, Lcom/facebook/cache/disk/i;->GP: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;->fK()J
+    invoke-interface {p2}, Lcom/facebook/a/a;->fI()J
 
     move-result-wide v1
 
-    iput-wide v1, v0, Lcom/facebook/cache/disk/i;->HI:J
+    iput-wide v1, v0, Lcom/facebook/cache/disk/i;->HE:J
 
-    iget-object v1, p0, Lcom/facebook/cache/disk/d;->Hw:Lcom/facebook/cache/disk/d$a;
+    iget-object v1, p0, Lcom/facebook/cache/disk/d;->Hs:Lcom/facebook/cache/disk/d$a;
 
-    invoke-virtual {v1}, Lcom/facebook/cache/disk/d$a;->fR()J
+    invoke-virtual {v1}, Lcom/facebook/cache/disk/d$a;->fP()J
 
     move-result-wide v1
 
-    iput-wide v1, v0, Lcom/facebook/cache/disk/i;->HK:J
+    iput-wide v1, v0, Lcom/facebook/cache/disk/i;->HG: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;->GI:Ljava/lang/Class;
+    sget-object p1, Lcom/facebook/cache/disk/d;->GE: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;->GI:Ljava/lang/Class;
+    sget-object p1, Lcom/facebook/cache/disk/d;->GE: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;->HL:Ljava/io/IOException;
+    iput-object p1, v0, Lcom/facebook/cache/disk/i;->HH:Ljava/io/IOException;
 
-    sget-object p2, Lcom/facebook/cache/disk/d;->GI:Ljava/lang/Class;
+    sget-object p2, Lcom/facebook/cache/disk/d;->GE: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;->fZ()Lcom/facebook/cache/disk/i;
+    invoke-static {}, Lcom/facebook/cache/disk/i;->fX()Lcom/facebook/cache/disk/i;
 
     move-result-object v0
 
-    iput-object p1, v0, Lcom/facebook/cache/disk/i;->HH:Lcom/facebook/cache/common/CacheKey;
+    iput-object p1, v0, Lcom/facebook/cache/disk/i;->HD: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;->GU:Ljava/lang/String;
+    iput-object v5, v0, Lcom/facebook/cache/disk/i;->GP:Ljava/lang/String;
 
-    iget-object v6, p0, Lcom/facebook/cache/disk/d;->Hv:Lcom/facebook/cache/disk/c;
+    iget-object v6, p0, Lcom/facebook/cache/disk/d;->Hr: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;->Hr:Ljava/util/Set;
+    iget-object p1, p0, Lcom/facebook/cache/disk/d;->Hn: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;->Hr:Ljava/util/Set;
+    iget-object p1, p0, Lcom/facebook/cache/disk/d;->Hn: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;->Gx:I
+    sget v2, Lcom/facebook/cache/common/a$a;->Gt:I
 
-    iput-object p1, v0, Lcom/facebook/cache/disk/i;->HL:Ljava/io/IOException;
+    iput-object p1, v0, Lcom/facebook/cache/disk/i;->HH: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;->Hv:Lcom/facebook/cache/disk/c;
+    iget-object v3, p0, Lcom/facebook/cache/disk/d;->Hr: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;->Hr:Ljava/util/Set;
+    iget-object v3, p0, Lcom/facebook/cache/disk/d;->Hn: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;->Gv:I
+    sget v1, Lcom/facebook/cache/common/a$a;->Gr: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 afbe0e5901..9b77921b0f 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 HC:Lcom/facebook/cache/disk/c;
+.field public final Hy:Lcom/facebook/cache/disk/c;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public final HD:Ljava/io/File;
+.field public final Hz: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;->HC:Lcom/facebook/cache/disk/c;
+    iput-object p2, p0, Lcom/facebook/cache/disk/e$a;->Hy:Lcom/facebook/cache/disk/c;
 
-    iput-object p1, p0, Lcom/facebook/cache/disk/e$a;->HD:Ljava/io/File;
+    iput-object p1, p0, Lcom/facebook/cache/disk/e$a;->Hz: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 c12a5ddee3..2e5beed43d 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 HO:Lcom/facebook/common/a/b;
+.field private static HK: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 ga()Lcom/facebook/common/a/b;
+.method public static declared-synchronized fY()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;->HO:Lcom/facebook/common/a/b;
+    sget-object v1, Lcom/facebook/common/a/b;->HK: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;->HO:Lcom/facebook/common/a/b;
+    sput-object v1, Lcom/facebook/common/a/b;->HK:Lcom/facebook/common/a/b;
 
     :cond_0
-    sget-object v1, Lcom/facebook/common/a/b;->HO:Lcom/facebook/common/a/b;
+    sget-object v1, Lcom/facebook/common/a/b;->HK: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 0ebcbb6efc..bd232aa5f1 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 gf()Z
+.method public final gd()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 88940ce51e..521fd27c2f 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 HW:Ljava/util/concurrent/FutureTask;
+.field private final HS: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;->HW:Ljava/util/concurrent/FutureTask;
+    iput-object p1, p0, Lcom/facebook/common/b/f;->HS: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;->HW:Ljava/util/concurrent/FutureTask;
+    iput-object p1, p0, Lcom/facebook/common/b/f;->HS: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;->HW:Ljava/util/concurrent/FutureTask;
+    iget-object v0, p0, Lcom/facebook/common/b/f;->HS: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;->HW:Ljava/util/concurrent/FutureTask;
+    iget-object v0, p0, Lcom/facebook/common/b/f;->HS: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;->HW:Ljava/util/concurrent/FutureTask;
+    iget-object v0, p0, Lcom/facebook/common/b/f;->HS: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;->HW:Ljava/util/concurrent/FutureTask;
+    iget-object v0, p0, Lcom/facebook/common/b/f;->HS: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;->HW:Ljava/util/concurrent/FutureTask;
+    iget-object v0, p0, Lcom/facebook/common/b/f;->HS: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;->HW:Ljava/util/concurrent/FutureTask;
+    iget-object v0, p0, Lcom/facebook/common/b/f;->HS: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 3e384cf330..37fa9d9610 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 HX:Ljava/util/concurrent/atomic/AtomicInteger;
+.field protected final HT: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;->HX:Ljava/util/concurrent/atomic/AtomicInteger;
+    iput-object v0, p0, Lcom/facebook/common/b/h;->HT: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;->HX:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v0, p0, Lcom/facebook/common/b/h;->HT: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;->gg()V
+    invoke-virtual {p0}, Lcom/facebook/common/b/h;->ge()V
 
     :cond_0
     return-void
 .end method
 
-.method protected gg()V
+.method protected ge()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;->HX:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v0, p0, Lcom/facebook/common/b/h;->HT: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;->HX:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v1, p0, Lcom/facebook/common/b/h;->HT: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;->HX:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v1, p0, Lcom/facebook/common/b/h;->HT: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 8910c99f6f..ce7c24a48c 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 HY:Lcom/facebook/common/b/i;
+.field private static HU: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 gh()Lcom/facebook/common/b/i;
+.method public static gf()Lcom/facebook/common/b/i;
     .locals 1
 
-    sget-object v0, Lcom/facebook/common/b/i;->HY:Lcom/facebook/common/b/i;
+    sget-object v0, Lcom/facebook/common/b/i;->HU: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;->HY:Lcom/facebook/common/b/i;
+    sput-object v0, Lcom/facebook/common/b/i;->HU:Lcom/facebook/common/b/i;
 
     :cond_0
-    sget-object v0, Lcom/facebook/common/b/i;->HY:Lcom/facebook/common/b/i;
+    sget-object v0, Lcom/facebook/common/b/i;->HU: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;->gf()Z
+    invoke-virtual {p0}, Lcom/facebook/common/b/i;->gd()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 f273d6bb18..9b180e3af1 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 HZ:Ljava/util/logging/Logger;
+.field static final HV:Ljava/util/logging/Logger;
 
 
 # direct methods
@@ -21,7 +21,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/facebook/common/d/b;->HZ:Ljava/util/logging/Logger;
+    sput-object v0, Lcom/facebook/common/d/b;->HV: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;->HZ:Ljava/util/logging/Logger;
+    sget-object v0, Lcom/facebook/common/d/b;->HV: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 336e47b9ae..e64495d891 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 Id:Lcom/facebook/common/d/h$a$a;
+.field HZ: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 2a11fedc08..b908f2c5bb 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 Ia:Lcom/facebook/common/d/h$a$a;
+.field private HW:Lcom/facebook/common/d/h$a$a;
 
-.field private Ib:Lcom/facebook/common/d/h$a$a;
+.field private HX:Lcom/facebook/common/d/h$a$a;
 
-.field private Ic:Z
+.field private HY: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;->Ia:Lcom/facebook/common/d/h$a$a;
+    iput-object v0, p0, Lcom/facebook/common/d/h$a;->HW: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;
+    iget-object v0, p0, Lcom/facebook/common/d/h$a;->HW: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-object v0, p0, Lcom/facebook/common/d/h$a;->HX:Lcom/facebook/common/d/h$a$a;
 
-    iput-boolean v1, p0, Lcom/facebook/common/d/h$a;->Ic:Z
+    iput-boolean v1, p0, Lcom/facebook/common/d/h$a;->HY: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 gi()Lcom/facebook/common/d/h$a$a;
+.method private gg()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;->Ib:Lcom/facebook/common/d/h$a$a;
+    iget-object v1, p0, Lcom/facebook/common/d/h$a;->HX: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, v1, Lcom/facebook/common/d/h$a$a;->HZ: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-object v0, p0, Lcom/facebook/common/d/h$a;->HX: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;->gi()Lcom/facebook/common/d/h$a$a;
+    invoke-direct {p0}, Lcom/facebook/common/d/h$a;->gg()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;->Ic:Z
+    iget-boolean v0, p0, Lcom/facebook/common/d/h$a;->HY: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;->Ia:Lcom/facebook/common/d/h$a$a;
+    iget-object v2, p0, Lcom/facebook/common/d/h$a;->HW: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;
+    iget-object v2, v2, Lcom/facebook/common/d/h$a$a;->HZ: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;->Id:Lcom/facebook/common/d/h$a$a;
+    iget-object v2, v2, Lcom/facebook/common/d/h$a$a;->HZ: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 8a897a757e..c6b06f08c0 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 Il:Ljava/util/Map;
+.field public static final Ih: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;->Il:Ljava/util/Map;
+    sput-object v0, Lcom/facebook/common/f/a;->Ih:Ljava/util/Map;
 
     return-void
 .end method
@@ -120,7 +120,7 @@
 
     if-nez v0, :cond_3
 
-    sget-object v0, Lcom/facebook/common/f/a;->Il:Ljava/util/Map;
+    sget-object v0, Lcom/facebook/common/f/a;->Ih: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 48b7ce4557..4b5479d586 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 go()J
+.method public abstract gm()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 7ea50007e9..b5cdf71c96 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 IK:Lcom/facebook/common/h/a;
+.field private static IG:Lcom/facebook/common/h/a;
 
-.field public static final IL:J
+.field public static final IH:J
 
 
 # instance fields
-.field public volatile IM:Landroid/os/StatFs;
+.field public volatile II:Landroid/os/StatFs;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private volatile IO:Ljava/io/File;
+.field private volatile IJ:Ljava/io/File;
 
-.field public volatile IP:Landroid/os/StatFs;
+.field public volatile IK:Landroid/os/StatFs;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private volatile IQ:Ljava/io/File;
+.field private volatile IL:Ljava/io/File;
 
-.field public IR:J
+.field public IM:J
 
-.field public final IS:Ljava/util/concurrent/locks/Lock;
+.field public final IO: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;->IL:J
+    sput-wide v0, Lcom/facebook/common/h/a;->IH:J
 
     return-void
 .end method
@@ -63,9 +63,9 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/facebook/common/h/a;->IM:Landroid/os/StatFs;
+    iput-object v0, p0, Lcom/facebook/common/h/a;->II:Landroid/os/StatFs;
 
-    iput-object v0, p0, Lcom/facebook/common/h/a;->IP:Landroid/os/StatFs;
+    iput-object v0, p0, Lcom/facebook/common/h/a;->IK: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;->IS:Ljava/util/concurrent/locks/Lock;
+    iput-object v0, p0, Lcom/facebook/common/h/a;->IO:Ljava/util/concurrent/locks/Lock;
 
     return-void
 .end method
@@ -153,7 +153,7 @@
     return-object v0
 .end method
 
-.method public static declared-synchronized gx()Lcom/facebook/common/h/a;
+.method public static declared-synchronized gv()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;->IK:Lcom/facebook/common/h/a;
+    sget-object v1, Lcom/facebook/common/h/a;->IG: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;->IK:Lcom/facebook/common/h/a;
+    sput-object v1, Lcom/facebook/common/h/a;->IG:Lcom/facebook/common/h/a;
 
     :cond_0
-    sget-object v1, Lcom/facebook/common/h/a;->IK:Lcom/facebook/common/h/a;
+    sget-object v1, Lcom/facebook/common/h/a;->IG: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 gy()V
+.method public final gw()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;->IS:Ljava/util/concurrent/locks/Lock;
+    iget-object v0, p0, Lcom/facebook/common/h/a;->IO: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;->IO:Ljava/io/File;
+    iput-object v0, p0, Lcom/facebook/common/h/a;->IJ: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;->IQ:Ljava/io/File;
+    iput-object v0, p0, Lcom/facebook/common/h/a;->IL:Ljava/io/File;
 
-    invoke-virtual {p0}, Lcom/facebook/common/h/a;->gz()V
+    invoke-virtual {p0}, Lcom/facebook/common/h/a;->gx()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;->IS:Ljava/util/concurrent/locks/Lock;
+    iget-object v0, p0, Lcom/facebook/common/h/a;->IO: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;->IS:Ljava/util/concurrent/locks/Lock;
+    iget-object v1, p0, Lcom/facebook/common/h/a;->IO: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 gz()V
+.method public gx()V
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/common/h/a;->IM:Landroid/os/StatFs;
+    iget-object v0, p0, Lcom/facebook/common/h/a;->II:Landroid/os/StatFs;
 
-    iget-object v1, p0, Lcom/facebook/common/h/a;->IO:Ljava/io/File;
+    iget-object v1, p0, Lcom/facebook/common/h/a;->IJ: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;->IM:Landroid/os/StatFs;
+    iput-object v0, p0, Lcom/facebook/common/h/a;->II:Landroid/os/StatFs;
 
-    iget-object v0, p0, Lcom/facebook/common/h/a;->IP:Landroid/os/StatFs;
+    iget-object v0, p0, Lcom/facebook/common/h/a;->IK:Landroid/os/StatFs;
 
-    iget-object v1, p0, Lcom/facebook/common/h/a;->IQ:Ljava/io/File;
+    iget-object v1, p0, Lcom/facebook/common/h/a;->IL: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;->IP:Landroid/os/StatFs;
+    iput-object v0, p0, Lcom/facebook/common/h/a;->IK:Landroid/os/StatFs;
 
     invoke-static {}, Landroid/os/SystemClock;->uptimeMillis()J
 
     move-result-wide v0
 
-    iput-wide v0, p0, Lcom/facebook/common/h/a;->IR:J
+    iput-wide v0, p0, Lcom/facebook/common/h/a;->IM: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 a96b646f8d..6bb0064531 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 Ji:Landroid/net/Uri;
+.field private static final Je:Landroid/net/Uri;
 
 
 # direct methods
@@ -19,7 +19,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/facebook/common/j/f;->Ji:Landroid/net/Uri;
+    sput-object v0, Lcom/facebook/common/j/f;->Je:Landroid/net/Uri;
 
     return-void
 .end method
@@ -300,7 +300,7 @@
 
     move-result-object p0
 
-    sget-object v0, Lcom/facebook/common/j/f;->Ji:Landroid/net/Uri;
+    sget-object v0, Lcom/facebook/common/j/f;->Je: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 448bc69111..18979cb457 100644
--- a/com.discord/smali/com/facebook/common/k/c.smali
+++ b/com.discord/smali/com/facebook/common/k/c.smali
@@ -4,29 +4,29 @@
 
 
 # static fields
-.field public static final Jj:Z
+.field public static final Jf:Z
 
-.field public static final Jk:Z
+.field public static final Jg:Z
 
-.field public static final Jl:Z
+.field public static final Jh:Z
 
-.field public static Jm:Lcom/facebook/common/k/b;
+.field public static Ji:Lcom/facebook/common/k/b;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private static Jn:Z
+.field private static Jj:Z
+
+.field private static final Jk:[B
+
+.field private static final Jl:[B
+
+.field private static final Jm:[B
+
+.field private static final Jn:[B
 
 .field private static final Jo:[B
 
-.field private static final Jp:[B
-
-.field private static final Jq:[B
-
-.field private static final Jr:[B
-
-.field private static final Js:[B
-
 
 # direct methods
 .method static constructor <clinit>()V
@@ -50,7 +50,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    sput-boolean v0, Lcom/facebook/common/k/c;->Jj:Z
+    sput-boolean v0, Lcom/facebook/common/k/c;->Jf: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;->Jk:Z
+    sput-boolean v0, Lcom/facebook/common/k/c;->Jg: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;->Jl:Z
+    sput-boolean v2, Lcom/facebook/common/k/c;->Jh:Z
 
     const/4 v0, 0x0
 
-    sput-object v0, Lcom/facebook/common/k/c;->Jm:Lcom/facebook/common/k/b;
+    sput-object v0, Lcom/facebook/common/k/c;->Ji:Lcom/facebook/common/k/b;
 
-    sput-boolean v3, Lcom/facebook/common/k/c;->Jn:Z
+    sput-boolean v3, Lcom/facebook/common/k/c;->Jj:Z
 
     const-string v0, "RIFF"
 
@@ -125,7 +125,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/facebook/common/k/c;->Jo:[B
+    sput-object v0, Lcom/facebook/common/k/c;->Jk:[B
 
     const-string v0, "WEBP"
 
@@ -133,7 +133,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/facebook/common/k/c;->Jp:[B
+    sput-object v0, Lcom/facebook/common/k/c;->Jl:[B
 
     const-string v0, "VP8 "
 
@@ -141,7 +141,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/facebook/common/k/c;->Jq:[B
+    sput-object v0, Lcom/facebook/common/k/c;->Jm:[B
 
     const-string v0, "VP8L"
 
@@ -149,7 +149,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/facebook/common/k/c;->Jr:[B
+    sput-object v0, Lcom/facebook/common/k/c;->Jn:[B
 
     const-string v0, "VP8X"
 
@@ -157,7 +157,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/facebook/common/k/c;->Js:[B
+    sput-object v0, Lcom/facebook/common/k/c;->Jo:[B
 
     return-void
 .end method
@@ -169,7 +169,7 @@
 
     if-lt p2, v0, :cond_0
 
-    sget-object p2, Lcom/facebook/common/k/c;->Jo:[B
+    sget-object p2, Lcom/facebook/common/k/c;->Jk:[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;->Jp:[B
+    sget-object p2, Lcom/facebook/common/k/c;->Jl:[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;->Js:[B
+    sget-object v0, Lcom/facebook/common/k/c;->Jo:[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;->Js:[B
+    sget-object v0, Lcom/facebook/common/k/c;->Jo:[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;->Jq:[B
+    sget-object v0, Lcom/facebook/common/k/c;->Jm:[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;->Jr:[B
+    sget-object v0, Lcom/facebook/common/k/c;->Jn:[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;->Js:[B
+    sget-object v0, Lcom/facebook/common/k/c;->Jo:[B
 
     const/16 v1, 0xc
 
@@ -419,16 +419,16 @@
     return v3
 .end method
 
-.method public static gC()Lcom/facebook/common/k/b;
+.method public static gA()Lcom/facebook/common/k/b;
     .locals 2
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    sget-boolean v0, Lcom/facebook/common/k/c;->Jn:Z
+    sget-boolean v0, Lcom/facebook/common/k/c;->Jj:Z
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lcom/facebook/common/k/c;->Jm:Lcom/facebook/common/k/b;
+    sget-object v0, Lcom/facebook/common/k/c;->Ji: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;->Jn:Z
+    sput-boolean v1, Lcom/facebook/common/k/c;->Jj: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 76f2a7a62d..aec4223a84 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;->gt()Ljava/lang/Class;
+    invoke-static {}, Lcom/facebook/common/references/CloseableReference;->gr()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 121b218178..cb7808c20a 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 GI:Ljava/lang/Class;
+.field private static GE:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -37,7 +37,9 @@
     .end annotation
 .end field
 
-.field private static final ID:Lcom/facebook/common/references/b;
+.field private static final IA:Lcom/facebook/common/references/CloseableReference$a;
+
+.field private static final Iz:Lcom/facebook/common/references/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/references/b<",
@@ -47,11 +49,11 @@
     .end annotation
 .end field
 
-.field private static final IE:Lcom/facebook/common/references/CloseableReference$a;
-
 
 # instance fields
-.field public final IA:Lcom/facebook/common/references/c;
+.field private Iv:Z
+
+.field public final Iw:Lcom/facebook/common/references/c;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/references/c<",
@@ -60,15 +62,13 @@
     .end annotation
 .end field
 
-.field private final IB:Lcom/facebook/common/references/CloseableReference$a;
+.field private final Ix:Lcom/facebook/common/references/CloseableReference$a;
 
-.field private final IC:Ljava/lang/Throwable;
+.field private final Iy: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;->GI:Ljava/lang/Class;
+    sput-object v0, Lcom/facebook/common/references/CloseableReference;->GE: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;->ID:Lcom/facebook/common/references/b;
+    sput-object v0, Lcom/facebook/common/references/CloseableReference;->Iz: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;->IE:Lcom/facebook/common/references/CloseableReference$a;
+    sput-object v0, Lcom/facebook/common/references/CloseableReference;->IA: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;->Iz:Z
+    iput-boolean v0, p0, Lcom/facebook/common/references/CloseableReference;->Iv: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;->IA:Lcom/facebook/common/references/c;
+    iput-object v0, p0, Lcom/facebook/common/references/CloseableReference;->Iw:Lcom/facebook/common/references/c;
 
-    invoke-virtual {p1}, Lcom/facebook/common/references/c;->gu()V
+    invoke-virtual {p1}, Lcom/facebook/common/references/c;->gs()V
 
-    iput-object p2, p0, Lcom/facebook/common/references/CloseableReference;->IB:Lcom/facebook/common/references/CloseableReference$a;
+    iput-object p2, p0, Lcom/facebook/common/references/CloseableReference;->Ix:Lcom/facebook/common/references/CloseableReference$a;
 
-    iput-object p3, p0, Lcom/facebook/common/references/CloseableReference;->IC:Ljava/lang/Throwable;
+    iput-object p3, p0, Lcom/facebook/common/references/CloseableReference;->Iy:Ljava/lang/Throwable;
 
     return-void
 .end method
@@ -154,17 +154,17 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/facebook/common/references/CloseableReference;->Iz:Z
+    iput-boolean v0, p0, Lcom/facebook/common/references/CloseableReference;->Iv: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;->IA:Lcom/facebook/common/references/c;
+    iput-object v0, p0, Lcom/facebook/common/references/CloseableReference;->Iw:Lcom/facebook/common/references/c;
 
-    iput-object p3, p0, Lcom/facebook/common/references/CloseableReference;->IB:Lcom/facebook/common/references/CloseableReference$a;
+    iput-object p3, p0, Lcom/facebook/common/references/CloseableReference;->Ix:Lcom/facebook/common/references/CloseableReference$a;
 
-    iput-object p4, p0, Lcom/facebook/common/references/CloseableReference;->IC:Ljava/lang/Throwable;
+    iput-object p4, p0, Lcom/facebook/common/references/CloseableReference;->Iy: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;->ID:Lcom/facebook/common/references/b;
+    sget-object v2, Lcom/facebook/common/references/CloseableReference;->Iz: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;->IE:Lcom/facebook/common/references/CloseableReference$a;
+    sget-object v0, Lcom/facebook/common/references/CloseableReference;->IA: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;->gs()Lcom/facebook/common/references/CloseableReference;
+    invoke-virtual {p0}, Lcom/facebook/common/references/CloseableReference;->gq()Lcom/facebook/common/references/CloseableReference;
 
     move-result-object p0
 
@@ -374,7 +374,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/facebook/common/references/CloseableReference;->ID:Lcom/facebook/common/references/b;
+    sget-object v0, Lcom/facebook/common/references/CloseableReference;->Iz: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 gt()Ljava/lang/Class;
+.method static synthetic gr()Ljava/lang/Class;
     .locals 1
 
-    sget-object v0, Lcom/facebook/common/references/CloseableReference;->GI:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/common/references/CloseableReference;->GE:Ljava/lang/Class;
 
     return-object v0
 .end method
@@ -483,7 +483,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/facebook/common/references/CloseableReference;->gr()Lcom/facebook/common/references/CloseableReference;
+    invoke-virtual {p0}, Lcom/facebook/common/references/CloseableReference;->gp()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;->Iz:Z
+    iget-boolean v0, p0, Lcom/facebook/common/references/CloseableReference;->Iv: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;->Iz:Z
+    iput-boolean v0, p0, Lcom/facebook/common/references/CloseableReference;->Iv: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;->IA:Lcom/facebook/common/references/c;
+    iget-object v0, p0, Lcom/facebook/common/references/CloseableReference;->Iw:Lcom/facebook/common/references/c;
 
-    invoke-virtual {v0}, Lcom/facebook/common/references/c;->gv()I
+    invoke-virtual {v0}, Lcom/facebook/common/references/c;->gt()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;->Is:Lcom/facebook/common/references/b;
+    iget-object v0, v0, Lcom/facebook/common/references/c;->Io: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;->Iz:Z
+    iget-boolean v0, p0, Lcom/facebook/common/references/CloseableReference;->Iv: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;->IB:Lcom/facebook/common/references/CloseableReference$a;
+    iget-object v0, p0, Lcom/facebook/common/references/CloseableReference;->Ix:Lcom/facebook/common/references/CloseableReference$a;
 
-    iget-object v1, p0, Lcom/facebook/common/references/CloseableReference;->IA:Lcom/facebook/common/references/c;
+    iget-object v1, p0, Lcom/facebook/common/references/CloseableReference;->Iw:Lcom/facebook/common/references/c;
 
-    iget-object v2, p0, Lcom/facebook/common/references/CloseableReference;->IC:Ljava/lang/Throwable;
+    iget-object v2, p0, Lcom/facebook/common/references/CloseableReference;->Iy: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;->Iz:Z
+    iget-boolean v0, p0, Lcom/facebook/common/references/CloseableReference;->Iv: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;->IA:Lcom/facebook/common/references/c;
+    iget-object v0, p0, Lcom/facebook/common/references/CloseableReference;->Iw: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 gr()Lcom/facebook/common/references/CloseableReference;
+.method public final declared-synchronized gp()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;->IA:Lcom/facebook/common/references/c;
+    iget-object v1, p0, Lcom/facebook/common/references/CloseableReference;->Iw:Lcom/facebook/common/references/c;
 
-    iget-object v2, p0, Lcom/facebook/common/references/CloseableReference;->IB:Lcom/facebook/common/references/CloseableReference$a;
+    iget-object v2, p0, Lcom/facebook/common/references/CloseableReference;->Ix:Lcom/facebook/common/references/CloseableReference$a;
 
-    iget-object v3, p0, Lcom/facebook/common/references/CloseableReference;->IC:Ljava/lang/Throwable;
+    iget-object v3, p0, Lcom/facebook/common/references/CloseableReference;->Iy: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 gs()Lcom/facebook/common/references/CloseableReference;
+.method public final declared-synchronized gq()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;->gr()Lcom/facebook/common/references/CloseableReference;
+    invoke-virtual {p0}, Lcom/facebook/common/references/CloseableReference;->gp()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;->Iz:Z
+    iget-boolean v0, p0, Lcom/facebook/common/references/CloseableReference;->Iv: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 d2ca82b73d..30e7a24b13 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 gP()V
+.method public abstract gN()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 04c1a4d874..bc898170ec 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 La:Lcom/facebook/drawee/a/a;
+.field private static KW:Lcom/facebook/drawee/a/a;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
 
 # instance fields
-.field public final Lb:Ljava/util/Set;
+.field public final KX:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -29,9 +29,9 @@
     .end annotation
 .end field
 
-.field public final Lc:Landroid/os/Handler;
+.field public final KY:Landroid/os/Handler;
 
-.field public final Ld:Ljava/lang/Runnable;
+.field public final KZ: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;->Ld:Ljava/lang/Runnable;
+    iput-object v0, p0, Lcom/facebook/drawee/a/a;->KZ: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;->Lb:Ljava/util/Set;
+    iput-object v0, p0, Lcom/facebook/drawee/a/a;->KX: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;->Lc:Landroid/os/Handler;
+    iput-object v0, p0, Lcom/facebook/drawee/a/a;->KY: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;->Lb:Ljava/util/Set;
+    iget-object p0, p0, Lcom/facebook/drawee/a/a;->KX:Ljava/util/Set;
 
     return-object p0
 .end method
 
-.method public static declared-synchronized hb()Lcom/facebook/drawee/a/a;
+.method public static declared-synchronized gZ()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;->La:Lcom/facebook/drawee/a/a;
+    sget-object v1, Lcom/facebook/drawee/a/a;->KW: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;->La:Lcom/facebook/drawee/a/a;
+    sput-object v1, Lcom/facebook/drawee/a/a;->KW:Lcom/facebook/drawee/a/a;
 
     :cond_0
-    sget-object v1, Lcom/facebook/drawee/a/a;->La:Lcom/facebook/drawee/a/a;
+    sget-object v1, Lcom/facebook/drawee/a/a;->KW: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 hc()V
+.method public static ha()V
     .locals 2
 
     invoke-static {}, Landroid/os/Looper;->getMainLooper()Landroid/os/Looper;
@@ -144,10 +144,10 @@
     return-void
 .end method
 
-.method static synthetic hd()V
+.method static synthetic hb()V
     .locals 0
 
-    invoke-static {}, Lcom/facebook/drawee/a/a;->hc()V
+    invoke-static {}, Lcom/facebook/drawee/a/a;->ha()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;->hc()V
+    invoke-static {}, Lcom/facebook/drawee/a/a;->ha()V
 
-    iget-object v0, p0, Lcom/facebook/drawee/a/a;->Lb:Ljava/util/Set;
+    iget-object v0, p0, Lcom/facebook/drawee/a/a;->KX: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 55682f3499..6018aabfd8 100644
--- a/com.discord/smali/com/facebook/drawee/b/a.smali
+++ b/com.discord/smali/com/facebook/drawee/b/a.smali
@@ -7,13 +7,39 @@
 
 
 # instance fields
-.field private Kv:Ljava/lang/String;
+.field private Kr:Ljava/lang/String;
 
-.field private MA:Ljava/lang/String;
+.field private MA:I
 
-.field public MB:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+.field private MB:I
 
-.field private MC:Ljava/util/HashMap;
+.field private final MC:Landroid/graphics/RectF;
+
+.field private MD:I
+
+.field private MF:I
+
+.field private MG:I
+
+.field private MH:I
+
+.field private MI:I
+
+.field private MJ:J
+
+.field private Ms:Ljava/lang/String;
+
+.field private Mt:I
+
+.field private Mu:I
+
+.field public Mv:I
+
+.field private Mw:Ljava/lang/String;
+
+.field public Mx:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+
+.field private My:Ljava/util/HashMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/HashMap<",
@@ -24,33 +50,7 @@
     .end annotation
 .end field
 
-.field private MD:I
-
-.field private MF:I
-
-.field private MG:I
-
-.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 public Mz:I
+.field private 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;->MC:Ljava/util/HashMap;
+    iput-object v0, p0, Lcom/facebook/drawee/b/a;->My:Ljava/util/HashMap;
 
     const/16 v0, 0x50
 
-    iput v0, p0, Lcom/facebook/drawee/b/a;->MG:I
+    iput v0, p0, Lcom/facebook/drawee/b/a;->MB: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;->MH:Landroid/graphics/RectF;
+    iput-object v0, p0, Lcom/facebook/drawee/b/a;->MC: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;->ML:I
+    iget p3, p0, Lcom/facebook/drawee/b/a;->MH:I
 
     int-to-float p3, p3
 
-    iget v0, p0, Lcom/facebook/drawee/b/a;->MM:I
+    iget v0, p0, Lcom/facebook/drawee/b/a;->MI: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;->MM:I
+    iget p1, p0, Lcom/facebook/drawee/b/a;->MI:I
 
-    iget p2, p0, Lcom/facebook/drawee/b/a;->MK:I
+    iget p2, p0, Lcom/facebook/drawee/b/a;->MG:I
 
     add-int/2addr p1, p2
 
-    iput p1, p0, Lcom/facebook/drawee/b/a;->MM:I
+    iput p1, p0, Lcom/facebook/drawee/b/a;->MI:I
 
     return-void
 .end method
@@ -159,7 +159,7 @@
     const-string p1, "none"
 
     :goto_0
-    iput-object p1, p0, Lcom/facebook/drawee/b/a;->Kv:Ljava/lang/String;
+    iput-object p1, p0, Lcom/facebook/drawee/b/a;->Kr: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;->Mx:I
+    iget v2, v0, Lcom/facebook/drawee/b/a;->Mt:I
 
-    iget v3, v0, Lcom/facebook/drawee/b/a;->My:I
+    iget v3, v0, Lcom/facebook/drawee/b/a;->Mu:I
 
-    iget-object v9, v0, Lcom/facebook/drawee/b/a;->MB:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    iget-object v9, v0, Lcom/facebook/drawee/b/a;->Mx: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;->MH:Landroid/graphics/RectF;
+    iget-object v9, v0, Lcom/facebook/drawee/b/a;->MC: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;->MH:Landroid/graphics/RectF;
+    iget-object v9, v0, Lcom/facebook/drawee/b/a;->MC: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;->MH:Landroid/graphics/RectF;
+    iget-object v10, v0, Lcom/facebook/drawee/b/a;->MC: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;->MI:I
+    iget v1, v0, Lcom/facebook/drawee/b/a;->MD:I
 
-    iput v1, v0, Lcom/facebook/drawee/b/a;->ML:I
+    iput v1, v0, Lcom/facebook/drawee/b/a;->MH:I
 
-    iget v1, v0, Lcom/facebook/drawee/b/a;->MJ:I
+    iget v1, v0, Lcom/facebook/drawee/b/a;->MF:I
 
-    iput v1, v0, Lcom/facebook/drawee/b/a;->MM:I
+    iput v1, v0, Lcom/facebook/drawee/b/a;->MI:I
 
-    iget-object v1, v0, Lcom/facebook/drawee/b/a;->Mw:Ljava/lang/String;
+    iget-object v1, v0, Lcom/facebook/drawee/b/a;->Ms: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;->Kv:Ljava/lang/String;
+    iget-object v5, v0, Lcom/facebook/drawee/b/a;->Kr: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;->Kv:Ljava/lang/String;
+    iget-object v4, v0, Lcom/facebook/drawee/b/a;->Kr: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;->Mx:I
+    iget v4, v0, Lcom/facebook/drawee/b/a;->Mt: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;->My:I
+    iget v4, v0, Lcom/facebook/drawee/b/a;->Mu: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;->Mz:I
+    iget v4, v0, Lcom/facebook/drawee/b/a;->Mv: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;->MA:Ljava/lang/String;
+    iget-object v1, v0, Lcom/facebook/drawee/b/a;->Mw: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;->MD:I
+    iget v1, v0, Lcom/facebook/drawee/b/a;->Mz:I
 
     if-lez v1, :cond_7
 
@@ -602,7 +602,7 @@
 
     aput-object v1, v4, v18
 
-    iget v1, v0, Lcom/facebook/drawee/b/a;->MF:I
+    iget v1, v0, Lcom/facebook/drawee/b/a;->MA: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;->MB:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    iget-object v1, v0, Lcom/facebook/drawee/b/a;->Mx: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;->MN:J
+    iget-wide v4, v0, Lcom/facebook/drawee/b/a;->MJ: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;->MC:Ljava/util/HashMap;
+    iget-object v1, v0, Lcom/facebook/drawee/b/a;->My: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;->Mx:I
+    iput p1, p0, Lcom/facebook/drawee/b/a;->Mt:I
 
-    iput p2, p0, Lcom/facebook/drawee/b/a;->My:I
+    iput p2, p0, Lcom/facebook/drawee/b/a;->Mu: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;->MN:J
+    iput-wide p1, p0, Lcom/facebook/drawee/b/a;->MJ: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;->MK:I
+    iput v0, p0, Lcom/facebook/drawee/b/a;->MG:I
 
-    iget v0, p0, Lcom/facebook/drawee/b/a;->MG:I
+    iget v0, p0, Lcom/facebook/drawee/b/a;->MB:I
 
     const/16 v2, 0x50
 
     if-ne v0, v2, :cond_0
 
-    iget v0, p0, Lcom/facebook/drawee/b/a;->MK:I
+    iget v0, p0, Lcom/facebook/drawee/b/a;->MG:I
 
     mul-int/lit8 v0, v0, -0x1
 
-    iput v0, p0, Lcom/facebook/drawee/b/a;->MK:I
+    iput v0, p0, Lcom/facebook/drawee/b/a;->MG:I
 
     :cond_0
     iget v0, p1, Landroid/graphics/Rect;->left:I
 
     add-int/2addr v0, v1
 
-    iput v0, p0, Lcom/facebook/drawee/b/a;->MI:I
+    iput v0, p0, Lcom/facebook/drawee/b/a;->MD:I
 
-    iget v0, p0, Lcom/facebook/drawee/b/a;->MG:I
+    iget v0, p0, Lcom/facebook/drawee/b/a;->MB: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;->MJ:I
+    iput p1, p0, Lcom/facebook/drawee/b/a;->MF:I
 
     return-void
 .end method
@@ -829,31 +829,31 @@
 
     const/4 v0, -0x1
 
-    iput v0, p0, Lcom/facebook/drawee/b/a;->Mx:I
+    iput v0, p0, Lcom/facebook/drawee/b/a;->Mt:I
 
-    iput v0, p0, Lcom/facebook/drawee/b/a;->My:I
+    iput v0, p0, Lcom/facebook/drawee/b/a;->Mu:I
 
-    iput v0, p0, Lcom/facebook/drawee/b/a;->Mz:I
+    iput v0, p0, Lcom/facebook/drawee/b/a;->Mv:I
 
     new-instance v1, Ljava/util/HashMap;
 
     invoke-direct {v1}, Ljava/util/HashMap;-><init>()V
 
-    iput-object v1, p0, Lcom/facebook/drawee/b/a;->MC:Ljava/util/HashMap;
+    iput-object v1, p0, Lcom/facebook/drawee/b/a;->My:Ljava/util/HashMap;
 
-    iput v0, p0, Lcom/facebook/drawee/b/a;->MD:I
+    iput v0, p0, Lcom/facebook/drawee/b/a;->Mz:I
 
-    iput v0, p0, Lcom/facebook/drawee/b/a;->MF:I
+    iput v0, p0, Lcom/facebook/drawee/b/a;->MA:I
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/facebook/drawee/b/a;->MA:Ljava/lang/String;
+    iput-object v0, p0, Lcom/facebook/drawee/b/a;->Mw: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;->MN:J
+    iput-wide v1, p0, Lcom/facebook/drawee/b/a;->MJ: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 a0b4930f1e..dc428beeb6 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 MO:J
+.field private MK:J
 
-.field private MP:J
+.field private ML:J
 
-.field private MQ:Lcom/facebook/drawee/b/a/b;
+.field private MM: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;->MO:J
+    iput-wide v0, p0, Lcom/facebook/drawee/b/a/a;->MK:J
 
-    iput-wide v0, p0, Lcom/facebook/drawee/b/a/a;->MP:J
+    iput-wide v0, p0, Lcom/facebook/drawee/b/a/a;->ML:J
 
-    iput-object p1, p0, Lcom/facebook/drawee/b/a/a;->MQ:Lcom/facebook/drawee/b/a/b;
+    iput-object p1, p0, Lcom/facebook/drawee/b/a/a;->MM: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;->MP:J
+    iput-wide p1, p0, Lcom/facebook/drawee/b/a/a;->ML:J
 
-    iget-object p1, p0, Lcom/facebook/drawee/b/a/a;->MQ:Lcom/facebook/drawee/b/a/b;
+    iget-object p1, p0, Lcom/facebook/drawee/b/a/a;->MM:Lcom/facebook/drawee/b/a/b;
 
     if-eqz p1, :cond_0
 
-    iget-wide p2, p0, Lcom/facebook/drawee/b/a/a;->MP:J
+    iget-wide p2, p0, Lcom/facebook/drawee/b/a/a;->ML:J
 
-    iget-wide v0, p0, Lcom/facebook/drawee/b/a/a;->MO:J
+    iget-wide v0, p0, Lcom/facebook/drawee/b/a/a;->MK:J
 
     sub-long/2addr p2, v0
 
@@ -77,7 +77,7 @@
 
     move-result-wide p1
 
-    iput-wide p1, p0, Lcom/facebook/drawee/b/a/a;->MO:J
+    iput-wide p1, p0, Lcom/facebook/drawee/b/a/a;->MK: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 a67c230666..4a32e73825 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 JW:Lcom/facebook/imagepipeline/f/a;
+.field private final JS: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;->JW:Lcom/facebook/imagepipeline/f/a;
+    iput-object p2, p0, Lcom/facebook/drawee/backends/pipeline/a;->JS: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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()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;->Nv:I
+    iget v1, p1, Lcom/facebook/imagepipeline/g/d;->Nr:I
 
     const/4 v2, 0x0
 
@@ -72,7 +72,7 @@
 
     if-eqz v1, :cond_0
 
-    iget v1, p1, Lcom/facebook/imagepipeline/g/d;->Nv:I
+    iget v1, p1, Lcom/facebook/imagepipeline/g/d;->Nr:I
 
     const/4 v4, -0x1
 
@@ -88,11 +88,11 @@
     :goto_0
     if-nez v1, :cond_2
 
-    iget v1, p1, Lcom/facebook/imagepipeline/g/d;->Nw:I
+    iget v1, p1, Lcom/facebook/imagepipeline/g/d;->Ns:I
 
     if-eq v1, v3, :cond_1
 
-    iget v1, p1, Lcom/facebook/imagepipeline/g/d;->Nw:I
+    iget v1, p1, Lcom/facebook/imagepipeline/g/d;->Ns: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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()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;->Nv:I
+    iget v2, p1, Lcom/facebook/imagepipeline/g/d;->Nr:I
 
-    iget p1, p1, Lcom/facebook/imagepipeline/g/d;->Nw:I
+    iget p1, p1, Lcom/facebook/imagepipeline/g/d;->Ns: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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     return-object v1
 
     :cond_3
     :try_start_2
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/a;->JW:Lcom/facebook/imagepipeline/f/a;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/a;->JS:Lcom/facebook/imagepipeline/f/a;
 
     if-eqz v0, :cond_4
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/a;->JW:Lcom/facebook/imagepipeline/f/a;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/a;->JS: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;->JW:Lcom/facebook/imagepipeline/f/a;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/a;->JS: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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     return-object p1
 
     :cond_4
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     const/4 p1, 0x0
 
@@ -159,7 +159,7 @@
     :catchall_0
     move-exception p1
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()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 7a29862750..acfa08355b 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 JX:Lcom/facebook/common/d/e;
+.field final JT: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 JY:Lcom/facebook/drawee/backends/pipeline/g;
+.field final JU:Lcom/facebook/drawee/backends/pipeline/g;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field final JZ:Lcom/facebook/common/d/l;
+.field final JV: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 Ka:Lcom/facebook/drawee/backends/pipeline/b/f;
+.field final JW: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 928147e3ab..440f8039c3 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 KS:Lcom/facebook/drawee/backends/pipeline/b/h;
+.field private final KO:Lcom/facebook/drawee/backends/pipeline/b/h;
 
-.field private final KZ:Lcom/facebook/common/time/b;
+.field private final KV:Lcom/facebook/common/time/b;
 
-.field private final Ki:Lcom/facebook/drawee/backends/pipeline/b/g;
+.field private final Ke: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;->KZ:Lcom/facebook/common/time/b;
+    iput-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->KV:Lcom/facebook/common/time/b;
 
-    iput-object p2, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->KS:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iput-object p2, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->KO:Lcom/facebook/drawee/backends/pipeline/b/h;
 
-    iput-object p3, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->Ki:Lcom/facebook/drawee/backends/pipeline/b/g;
+    iput-object p3, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->Ke: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;->KS:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->KO: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;->KS:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->KO:Lcom/facebook/drawee/backends/pipeline/b/h;
 
-    iput-wide p1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KO:J
+    iput-wide p1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KK:J
 
-    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->Ki:Lcom/facebook/drawee/backends/pipeline/b/g;
+    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->Ke: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;->KZ:Lcom/facebook/common/time/b;
+    iget-object p2, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->KV: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;->KS:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iget-object p2, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->KO:Lcom/facebook/drawee/backends/pipeline/b/h;
 
-    iput-wide v0, p2, Lcom/facebook/drawee/backends/pipeline/b/h;->KE:J
+    iput-wide v0, p2, Lcom/facebook/drawee/backends/pipeline/b/h;->KA:J
 
-    iput-object p1, p2, Lcom/facebook/drawee/backends/pipeline/b/h;->Kv:Ljava/lang/String;
+    iput-object p1, p2, Lcom/facebook/drawee/backends/pipeline/b/h;->Kr:Ljava/lang/String;
 
-    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->Ki:Lcom/facebook/drawee/backends/pipeline/b/g;
+    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->Ke: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;->KZ:Lcom/facebook/common/time/b;
+    iget-object p3, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->KV: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;->KS:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iget-object p3, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->KO:Lcom/facebook/drawee/backends/pipeline/b/h;
+
+    iput-wide v0, p3, Lcom/facebook/drawee/backends/pipeline/b/h;->Kz: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;->KH:J
+    iput-object p1, p3, Lcom/facebook/drawee/backends/pipeline/b/h;->Kr: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;->Kw: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;->Ki:Lcom/facebook/drawee/backends/pipeline/b/g;
+    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->Ke: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;->KZ:Lcom/facebook/common/time/b;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->KV: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;->KS:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iget-object v2, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->KO:Lcom/facebook/drawee/backends/pipeline/b/h;
 
-    iput-wide v0, v2, Lcom/facebook/drawee/backends/pipeline/b/h;->KC:J
+    iput-wide v0, v2, Lcom/facebook/drawee/backends/pipeline/b/h;->Ky:J
 
-    iput-object p1, v2, Lcom/facebook/drawee/backends/pipeline/b/h;->Kv:Ljava/lang/String;
+    iput-object p1, v2, Lcom/facebook/drawee/backends/pipeline/b/h;->Kr:Ljava/lang/String;
 
-    iput-object p2, v2, Lcom/facebook/drawee/backends/pipeline/b/h;->KA:Lcom/facebook/imagepipeline/g/f;
+    iput-object p2, v2, Lcom/facebook/drawee/backends/pipeline/b/h;->Kw:Lcom/facebook/imagepipeline/g/f;
 
-    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->Ki:Lcom/facebook/drawee/backends/pipeline/b/g;
+    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->Ke: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;->KZ:Lcom/facebook/common/time/b;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->KV: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;->KS:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iget-object v2, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->KO:Lcom/facebook/drawee/backends/pipeline/b/h;
 
-    iget v2, v2, Lcom/facebook/drawee/backends/pipeline/b/h;->KY:I
+    iget v2, v2, Lcom/facebook/drawee/backends/pipeline/b/h;->KU: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;->KS:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iget-object v2, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->KO:Lcom/facebook/drawee/backends/pipeline/b/h;
 
-    iput-wide v0, v2, Lcom/facebook/drawee/backends/pipeline/b/h;->KF: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;->Kv:Ljava/lang/String;
+    iput-object p1, v2, Lcom/facebook/drawee/backends/pipeline/b/h;->Kr:Ljava/lang/String;
 
-    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->Ki:Lcom/facebook/drawee/backends/pipeline/b/g;
+    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->Ke: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;->KZ:Lcom/facebook/common/time/b;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->KV: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;->KS:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iget-object v2, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->KO:Lcom/facebook/drawee/backends/pipeline/b/h;
 
-    iput-wide v0, v2, Lcom/facebook/drawee/backends/pipeline/b/h;->KB:J
+    iput-wide v0, v2, Lcom/facebook/drawee/backends/pipeline/b/h;->Kx:J
 
-    iput-object p1, v2, Lcom/facebook/drawee/backends/pipeline/b/h;->Kv:Ljava/lang/String;
+    iput-object p1, v2, Lcom/facebook/drawee/backends/pipeline/b/h;->Kr:Ljava/lang/String;
 
-    iput-object p2, v2, Lcom/facebook/drawee/backends/pipeline/b/h;->Ky:Ljava/lang/Object;
+    iput-object p2, v2, Lcom/facebook/drawee/backends/pipeline/b/h;->Ku:Ljava/lang/Object;
 
-    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->Ki:Lcom/facebook/drawee/backends/pipeline/b/g;
+    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->Ke: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;->KS:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->KO: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;->KS:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->KO:Lcom/facebook/drawee/backends/pipeline/b/h;
 
-    iput-wide v0, p1, Lcom/facebook/drawee/backends/pipeline/b/h;->KN:J
+    iput-wide v0, p1, Lcom/facebook/drawee/backends/pipeline/b/h;->KJ:J
 
-    iget-object p2, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->Ki:Lcom/facebook/drawee/backends/pipeline/b/g;
+    iget-object p2, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->Ke: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 dd67072806..bb6dcf271d 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 Kv:Ljava/lang/String;
+.field Kr:Ljava/lang/String;
 
-.field private final Kw:Lcom/facebook/drawee/backends/pipeline/b/b;
+.field private final Ks: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;->Kw:Lcom/facebook/drawee/backends/pipeline/b/b;
+    iput-object p2, p0, Lcom/facebook/drawee/backends/pipeline/b/c;->Ks:Lcom/facebook/drawee/backends/pipeline/b/b;
 
-    iput-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/c;->Kv:Ljava/lang/String;
+    iput-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/c;->Kr: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;->Kw:Lcom/facebook/drawee/backends/pipeline/b/b;
+    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/c;->Ks:Lcom/facebook/drawee/backends/pipeline/b/b;
 
     if-eqz p1, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/c;->Kv:Ljava/lang/String;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/c;->Kr: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 125e5ae2f9..0bd0be614e 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,10 +4,7 @@
 
 
 # instance fields
-.field private final KA:Lcom/facebook/imagepipeline/g/f;
-    .annotation runtime Ljavax/annotation/Nullable;
-    .end annotation
-.end field
+.field private final KA:J
 
 .field private final KB:J
 
@@ -15,58 +12,61 @@
 
 .field private final KD:J
 
-.field private final KE:J
-
-.field private final KF:J
-
-.field private final KG:J
-
-.field private final KH:J
-
-.field private final KI:Ljava/lang/String;
+.field private final KE:Ljava/lang/String;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private final KJ:Z
+.field private final KF:Z
 
-.field private final KK:I
+.field private final KG:I
 
-.field private final KL:I
+.field private final KH:I
 
-.field private final KM:I
+.field private final KI:I
 
-.field private final KN:J
+.field private final KJ:J
 
-.field private final KO:J
+.field private final KK:J
 
-.field private final KP:Ljava/lang/String;
+.field private final KL:Ljava/lang/String;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private final Kt:I
+.field private final Kp:I
 
-.field private final Kv:Ljava/lang/String;
+.field private final Kr:Ljava/lang/String;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private final Kx:Ljava/lang/String;
+.field private final Kt:Ljava/lang/String;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private final Ky:Ljava/lang/Object;
+.field private final Ku:Ljava/lang/Object;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private final Kz:Lcom/facebook/imagepipeline/request/b;
+.field private final Kv:Lcom/facebook/imagepipeline/request/b;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
+.field private final Kw:Lcom/facebook/imagepipeline/g/f;
+    .annotation runtime Ljavax/annotation/Nullable;
+    .end annotation
+.end field
+
+.field private final Kx:J
+
+.field private final Ky:J
+
+.field private final Kz:J
+
 
 # direct methods
 .method public constructor <init>(Ljava/lang/String;Ljava/lang/String;Lcom/facebook/imagepipeline/request/b;Ljava/lang/Object;Lcom/facebook/imagepipeline/g/f;JJJJJJJILjava/lang/String;ZIIIJJLjava/lang/String;)V
@@ -106,87 +106,87 @@
 
     move-object v1, p1
 
-    iput-object v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->Kv:Ljava/lang/String;
+    iput-object v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->Kr:Ljava/lang/String;
 
     move-object v1, p2
 
-    iput-object v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->Kx:Ljava/lang/String;
+    iput-object v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->Kt:Ljava/lang/String;
 
     move-object v1, p3
 
-    iput-object v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->Kz:Lcom/facebook/imagepipeline/request/b;
+    iput-object v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->Kv:Lcom/facebook/imagepipeline/request/b;
 
     move-object v1, p4
 
-    iput-object v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->Ky:Ljava/lang/Object;
+    iput-object v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->Ku:Ljava/lang/Object;
 
     move-object v1, p5
 
-    iput-object v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->KA:Lcom/facebook/imagepipeline/g/f;
+    iput-object v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->Kw:Lcom/facebook/imagepipeline/g/f;
 
     move-wide v1, p6
 
-    iput-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->KB:J
+    iput-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->Kx:J
 
     move-wide v1, p8
 
-    iput-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->KC:J
+    iput-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->Ky:J
 
     move-wide v1, p10
 
-    iput-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->KD:J
+    iput-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->Kz:J
 
     move-wide v1, p12
 
-    iput-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->KE:J
+    iput-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->KA:J
 
     move-wide/from16 v1, p14
 
-    iput-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->KF:J
+    iput-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->KB:J
 
     move-wide/from16 v1, p16
 
-    iput-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->KG:J
+    iput-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->KC:J
 
     move-wide/from16 v1, p18
 
-    iput-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->KH:J
+    iput-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->KD:J
 
     move/from16 v1, p20
 
-    iput v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->Kt:I
+    iput v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->Kp:I
 
     move-object/from16 v1, p21
 
-    iput-object v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->KI:Ljava/lang/String;
+    iput-object v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->KE:Ljava/lang/String;
 
     move/from16 v1, p22
 
-    iput-boolean v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->KJ:Z
+    iput-boolean v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->KF:Z
 
     move/from16 v1, p23
 
-    iput v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->KK:I
+    iput v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->KG:I
 
     move/from16 v1, p24
 
-    iput v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->KL:I
+    iput v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->KH:I
 
     move/from16 v1, p25
 
-    iput v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->KM:I
+    iput v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->KI:I
 
     move-wide/from16 v1, p26
 
-    iput-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->KN:J
+    iput-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->KJ:J
 
     move-wide/from16 v1, p28
 
-    iput-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->KO:J
+    iput-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->KK:J
 
     move-object/from16 v1, p30
 
-    iput-object v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->KP:Ljava/lang/String;
+    iput-object v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->KL: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 b7de4a6003..ffa2e540f0 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 KQ:Lcom/facebook/drawee/backends/pipeline/d;
+.field private final KM:Lcom/facebook/drawee/backends/pipeline/d;
 
-.field private final KR:Lcom/facebook/common/time/b;
+.field private final KN:Lcom/facebook/common/time/b;
 
-.field public final KS:Lcom/facebook/drawee/backends/pipeline/b/h;
+.field public final KO:Lcom/facebook/drawee/backends/pipeline/b/h;
 
-.field private KT:Lcom/facebook/drawee/backends/pipeline/b/c;
+.field private KP:Lcom/facebook/drawee/backends/pipeline/b/c;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private KU:Lcom/facebook/drawee/backends/pipeline/b/a/c;
+.field private KQ:Lcom/facebook/drawee/backends/pipeline/b/a/c;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private KV:Lcom/facebook/drawee/backends/pipeline/b/a/a;
+.field private KR:Lcom/facebook/drawee/backends/pipeline/b/a/a;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private KW:Lcom/facebook/imagepipeline/h/b;
+.field private KS:Lcom/facebook/imagepipeline/h/b;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public KX:Ljava/util/List;
+.field public KT:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -43,7 +43,7 @@
     .end annotation
 .end field
 
-.field private Kk:Lcom/facebook/drawee/backends/pipeline/b/b;
+.field private Kg: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;->KR:Lcom/facebook/common/time/b;
+    iput-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KN:Lcom/facebook/common/time/b;
 
-    iput-object p2, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KQ:Lcom/facebook/drawee/backends/pipeline/d;
+    iput-object p2, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KM: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;->KS:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iput-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KO:Lcom/facebook/drawee/backends/pipeline/b/h;
 
     return-void
 .end method
 
-.method private gZ()V
+.method private gX()V
     .locals 4
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KV:Lcom/facebook/drawee/backends/pipeline/b/a/a;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KR: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;->KR:Lcom/facebook/common/time/b;
+    iget-object v1, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KN:Lcom/facebook/common/time/b;
 
-    iget-object v2, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KS:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iget-object v2, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KO: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;->KV:Lcom/facebook/drawee/backends/pipeline/b/a/a;
+    iput-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KR:Lcom/facebook/drawee/backends/pipeline/b/a/a;
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KU:Lcom/facebook/drawee/backends/pipeline/b/a/c;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KQ: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;->KR:Lcom/facebook/common/time/b;
+    iget-object v1, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KN:Lcom/facebook/common/time/b;
 
-    iget-object v2, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KS:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iget-object v2, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KO: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;->KU:Lcom/facebook/drawee/backends/pipeline/b/a/c;
+    iput-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KQ:Lcom/facebook/drawee/backends/pipeline/b/a/c;
 
     :cond_1
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->Kk:Lcom/facebook/drawee/backends/pipeline/b/b;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->Kg: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;->KS:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iget-object v1, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KO: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;->Kk:Lcom/facebook/drawee/backends/pipeline/b/b;
+    iput-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->Kg:Lcom/facebook/drawee/backends/pipeline/b/b;
 
     :cond_2
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KT:Lcom/facebook/drawee/backends/pipeline/b/c;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KP: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;->KQ:Lcom/facebook/drawee/backends/pipeline/d;
+    iget-object v1, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KM: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;->Kk:Lcom/facebook/drawee/backends/pipeline/b/b;
+    iget-object v2, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->Kg: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;->KT:Lcom/facebook/drawee/backends/pipeline/b/c;
+    iput-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KP:Lcom/facebook/drawee/backends/pipeline/b/c;
 
     goto :goto_0
 
     :cond_3
-    iget-object v1, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KQ:Lcom/facebook/drawee/backends/pipeline/d;
+    iget-object v1, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KM: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;->Kv:Ljava/lang/String;
+    iput-object v1, v0, Lcom/facebook/drawee/backends/pipeline/b/c;->Kr:Ljava/lang/String;
 
     :goto_0
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KW:Lcom/facebook/imagepipeline/h/b;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KS: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;->KU:Lcom/facebook/drawee/backends/pipeline/b/a/c;
+    iget-object v3, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KQ: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;->KT:Lcom/facebook/drawee/backends/pipeline/b/c;
+    iget-object v3, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KP: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;->KW:Lcom/facebook/imagepipeline/h/b;
+    iput-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KS: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;->KX:Ljava/util/List;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KT: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;->ha()Lcom/facebook/drawee/backends/pipeline/b/e;
+    invoke-virtual {p1}, Lcom/facebook/drawee/backends/pipeline/b/h;->gY()Lcom/facebook/drawee/backends/pipeline/b/e;
 
-    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KX:Ljava/util/List;
+    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KT: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;->KY:I
+    iput p2, p1, Lcom/facebook/drawee/backends/pipeline/b/h;->KU: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;->KX:Ljava/util/List;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KT: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;->KQ:Lcom/facebook/drawee/backends/pipeline/d;
+    iget-object p2, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KM:Lcom/facebook/drawee/backends/pipeline/d;
 
-    iget-object p2, p2, Lcom/facebook/drawee/controller/AbstractDraweeController;->LQ:Lcom/facebook/drawee/d/c;
+    iget-object p2, p2, Lcom/facebook/drawee/controller/AbstractDraweeController;->LM: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;->KS:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KO: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;->KK:I
+    iput v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KG:I
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KS:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KO: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;->KL:I
+    iput p2, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KH:I
 
     :cond_1
-    invoke-virtual {p1}, Lcom/facebook/drawee/backends/pipeline/b/h;->ha()Lcom/facebook/drawee/backends/pipeline/b/e;
+    invoke-virtual {p1}, Lcom/facebook/drawee/backends/pipeline/b/h;->gY()Lcom/facebook/drawee/backends/pipeline/b/e;
 
-    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KX:Ljava/util/List;
+    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KT: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;->gZ()V
+    invoke-direct {p0}, Lcom/facebook/drawee/backends/pipeline/b/g;->gX()V
 
-    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->Kk:Lcom/facebook/drawee/backends/pipeline/b/b;
+    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->Kg:Lcom/facebook/drawee/backends/pipeline/b/b;
 
     if-eqz p1, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KQ:Lcom/facebook/drawee/backends/pipeline/d;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KM: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;->KV:Lcom/facebook/drawee/backends/pipeline/b/a/a;
+    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KR:Lcom/facebook/drawee/backends/pipeline/b/a/a;
 
     if-eqz p1, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KQ:Lcom/facebook/drawee/backends/pipeline/d;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KM: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;->KW:Lcom/facebook/imagepipeline/h/b;
+    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KS:Lcom/facebook/imagepipeline/h/b;
 
     if-eqz p1, :cond_5
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KQ:Lcom/facebook/drawee/backends/pipeline/d;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KM: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;->Kk:Lcom/facebook/drawee/backends/pipeline/b/b;
+    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->Kg:Lcom/facebook/drawee/backends/pipeline/b/b;
 
     if-eqz p1, :cond_3
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KQ:Lcom/facebook/drawee/backends/pipeline/d;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KM: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;->KV:Lcom/facebook/drawee/backends/pipeline/b/a/a;
+    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KR:Lcom/facebook/drawee/backends/pipeline/b/a/a;
 
     if-eqz p1, :cond_4
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KQ:Lcom/facebook/drawee/backends/pipeline/d;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KM: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;->KW:Lcom/facebook/imagepipeline/h/b;
+    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KS:Lcom/facebook/imagepipeline/h/b;
 
     if-eqz p1, :cond_5
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KQ:Lcom/facebook/drawee/backends/pipeline/d;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KM: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 d4109f8fbf..59060827ed 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,10 +4,7 @@
 
 
 # instance fields
-.field public KA:Lcom/facebook/imagepipeline/g/f;
-    .annotation runtime Ljavax/annotation/Nullable;
-    .end annotation
-.end field
+.field public KA:J
 
 .field public KB:J
 
@@ -15,60 +12,63 @@
 
 .field public KD:J
 
-.field public KE:J
-
-.field public KF:J
-
-.field public KG:J
-
-.field public KH:J
-
-.field public KI:Ljava/lang/String;
+.field public KE:Ljava/lang/String;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public KJ:Z
+.field public KF:Z
 
-.field public KK:I
+.field public KG:I
 
-.field public KL:I
+.field public KH:I
 
-.field public KM:I
+.field public KI:I
 
-.field public KN:J
+.field public KJ:J
 
-.field public KO:J
+.field public KK:J
 
-.field public KP:Ljava/lang/String;
+.field public KL:Ljava/lang/String;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public KY:I
+.field public KU:I
 
-.field public Kt:I
+.field public Kp:I
 
-.field public Kv:Ljava/lang/String;
+.field public Kr:Ljava/lang/String;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public Kx:Ljava/lang/String;
+.field public Kt:Ljava/lang/String;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public Ky:Ljava/lang/Object;
+.field public Ku:Ljava/lang/Object;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public Kz:Lcom/facebook/imagepipeline/request/b;
+.field public Kv:Lcom/facebook/imagepipeline/request/b;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
+.field public Kw:Lcom/facebook/imagepipeline/g/f;
+    .annotation runtime Ljavax/annotation/Nullable;
+    .end annotation
+.end field
+
+.field public Kx:J
+
+.field public Ky:J
+
+.field public Kz:J
+
 
 # direct methods
 .method public constructor <init>()V
@@ -78,35 +78,35 @@
 
     const-wide/16 v0, -0x1
 
+    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
+
+    iput-wide v0, p0, Lcom/facebook/drawee/backends/pipeline/b/h;->Kz:J
+
+    iput-wide v0, p0, Lcom/facebook/drawee/backends/pipeline/b/h;->KA: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;->KC:J
 
     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;->Kp:I
 
-    iput v2, p0, Lcom/facebook/drawee/backends/pipeline/b/h;->KK:I
+    iput v2, p0, Lcom/facebook/drawee/backends/pipeline/b/h;->KG:I
 
-    iput v2, p0, Lcom/facebook/drawee/backends/pipeline/b/h;->KL:I
+    iput v2, p0, Lcom/facebook/drawee/backends/pipeline/b/h;->KH:I
 
-    iput v2, p0, Lcom/facebook/drawee/backends/pipeline/b/h;->KY:I
+    iput v2, p0, Lcom/facebook/drawee/backends/pipeline/b/h;->KU:I
 
-    iput v2, p0, Lcom/facebook/drawee/backends/pipeline/b/h;->KM:I
+    iput v2, p0, Lcom/facebook/drawee/backends/pipeline/b/h;->KI: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;->KJ:J
 
-    iput-wide v0, p0, Lcom/facebook/drawee/backends/pipeline/b/h;->KO:J
+    iput-wide v0, p0, Lcom/facebook/drawee/backends/pipeline/b/h;->KK: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;->KM:I
+    iput p1, p0, Lcom/facebook/drawee/backends/pipeline/b/h;->KI:I
 
     return-void
 .end method
 
-.method public final ha()Lcom/facebook/drawee/backends/pipeline/b/e;
+.method public final gY()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;->Kv:Ljava/lang/String;
+    iget-object v2, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Kr:Ljava/lang/String;
 
-    iget-object v3, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Kx:Ljava/lang/String;
+    iget-object v3, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Kt:Ljava/lang/String;
 
-    iget-object v4, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Kz:Lcom/facebook/imagepipeline/request/b;
+    iget-object v4, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Kv:Lcom/facebook/imagepipeline/request/b;
 
-    iget-object v5, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Ky:Ljava/lang/Object;
+    iget-object v5, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Ku:Ljava/lang/Object;
 
-    iget-object v6, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KA:Lcom/facebook/imagepipeline/g/f;
+    iget-object v6, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Kw:Lcom/facebook/imagepipeline/g/f;
 
-    iget-wide v7, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KB:J
+    iget-wide v7, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Kx:J
 
-    iget-wide v9, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KC:J
+    iget-wide v9, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Ky:J
 
-    iget-wide v11, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KD:J
+    iget-wide v11, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Kz:J
 
-    iget-wide v13, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KE:J
+    iget-wide v13, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KA:J
 
     move-object/from16 v33, v1
 
     move-object/from16 v34, v2
 
-    iget-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KF:J
+    iget-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KB:J
 
     move-wide v15, v1
 
-    iget-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KG:J
+    iget-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KC:J
 
     move-wide/from16 v17, v1
 
-    iget-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KH:J
+    iget-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KD:J
 
     move-wide/from16 v19, v1
 
-    iget v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Kt:I
+    iget v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Kp:I
 
     move/from16 v21, v1
 
-    iget-object v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KI:Ljava/lang/String;
+    iget-object v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KE:Ljava/lang/String;
 
     move-object/from16 v22, v1
 
-    iget-boolean v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KJ:Z
+    iget-boolean v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KF:Z
 
     move/from16 v23, v1
 
-    iget v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KK:I
+    iget v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KG:I
 
     move/from16 v24, v1
 
-    iget v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KL:I
+    iget v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KH:I
 
     move/from16 v25, v1
 
-    iget v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KM:I
+    iget v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KI:I
 
     move/from16 v26, v1
 
-    iget-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KN:J
+    iget-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KJ:J
 
     move-wide/from16 v27, v1
 
-    iget-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KO:J
+    iget-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KK:J
 
     move-wide/from16 v29, v1
 
-    iget-object v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KP:Ljava/lang/String;
+    iget-object v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KL: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 ed7abf86a4..8b60216b26 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 GI:Ljava/lang/Class;
+.field private static final GE:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -13,9 +13,9 @@
     .end annotation
 .end field
 
-.field private static Kb:Lcom/facebook/drawee/backends/pipeline/f; = null
+.field private static JX:Lcom/facebook/drawee/backends/pipeline/f; = null
 
-.field private static volatile Kc:Z = false
+.field private static volatile JY: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;->GI:Ljava/lang/Class;
+    sput-object v0, Lcom/facebook/drawee/backends/pipeline/c;->GE:Ljava/lang/Class;
 
     return-void
 .end method
@@ -44,13 +44,13 @@
         .end annotation
     .end param
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
-    sget-boolean v0, Lcom/facebook/drawee/backends/pipeline/c;->Kc:Z
+    sget-boolean v0, Lcom/facebook/drawee/backends/pipeline/c;->JY:Z
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lcom/facebook/drawee/backends/pipeline/c;->GI:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/drawee/backends/pipeline/c;->GE: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;->Kc:Z
+    sput-boolean v0, Lcom/facebook/drawee/backends/pipeline/c;->JY:Z
 
     :goto_0
     :try_start_0
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     invoke-static {p0}, Lcom/facebook/soloader/SoLoader;->A(Landroid/content/Context;)V
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()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;->Kb:Lcom/facebook/drawee/backends/pipeline/f;
+    sput-object p1, Lcom/facebook/drawee/backends/pipeline/c;->JX: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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     return-void
 
     :catch_0
     move-exception p0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     new-instance p1, Ljava/lang/RuntimeException;
 
@@ -119,26 +119,26 @@
     throw p1
 .end method
 
-.method public static gQ()Lcom/facebook/drawee/backends/pipeline/e;
+.method public static gO()Lcom/facebook/drawee/backends/pipeline/e;
     .locals 1
 
-    sget-object v0, Lcom/facebook/drawee/backends/pipeline/c;->Kb:Lcom/facebook/drawee/backends/pipeline/f;
+    sget-object v0, Lcom/facebook/drawee/backends/pipeline/c;->JX:Lcom/facebook/drawee/backends/pipeline/f;
 
-    invoke-virtual {v0}, Lcom/facebook/drawee/backends/pipeline/f;->gY()Lcom/facebook/drawee/backends/pipeline/e;
+    invoke-virtual {v0}, Lcom/facebook/drawee/backends/pipeline/f;->gW()Lcom/facebook/drawee/backends/pipeline/e;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public static gR()Lcom/facebook/imagepipeline/b/h;
+.method public static gP()Lcom/facebook/imagepipeline/b/h;
     .locals 1
 
-    invoke-static {}, Lcom/facebook/imagepipeline/b/k;->iM()Lcom/facebook/imagepipeline/b/k;
+    invoke-static {}, Lcom/facebook/imagepipeline/b/k;->iK()Lcom/facebook/imagepipeline/b/k;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/b/k;->gR()Lcom/facebook/imagepipeline/b/h;
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/b/k;->gP()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 901b463e49..7767dd75e1 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 GI:Ljava/lang/Class;
+.field private static final GE:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -28,9 +28,9 @@
 
 
 # instance fields
-.field private HH:Lcom/facebook/cache/common/CacheKey;
+.field private HD:Lcom/facebook/cache/common/CacheKey;
 
-.field private JX:Lcom/facebook/common/d/e;
+.field private JT: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 Kd:Lcom/facebook/imagepipeline/f/a;
+.field private final JZ:Lcom/facebook/imagepipeline/f/a;
 
-.field private final Ke:Lcom/facebook/common/d/e;
+.field private final Ka: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 Kf:Lcom/facebook/imagepipeline/cache/o;
+.field private final Kb: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 Kg:Lcom/facebook/common/d/l;
+.field private Kc: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 Kh:Z
+.field Kd:Z
 
-.field private Ki:Lcom/facebook/drawee/backends/pipeline/b/g;
+.field private Ke:Lcom/facebook/drawee/backends/pipeline/b/g;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private Kj:Ljava/util/Set;
+.field private Kf:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -104,12 +104,12 @@
     .end annotation
 .end field
 
-.field private Kk:Lcom/facebook/drawee/backends/pipeline/b/b;
+.field private Kg:Lcom/facebook/drawee/backends/pipeline/b/b;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private Kl:Lcom/facebook/drawee/backends/pipeline/a/a;
+.field private Kh: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;->GI:Ljava/lang/Class;
+    sput-object v0, Lcom/facebook/drawee/backends/pipeline/d;->GE: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;->Kd:Lcom/facebook/imagepipeline/f/a;
+    iput-object p2, p0, Lcom/facebook/drawee/backends/pipeline/d;->JZ:Lcom/facebook/imagepipeline/f/a;
 
-    iput-object p6, p0, Lcom/facebook/drawee/backends/pipeline/d;->Ke:Lcom/facebook/common/d/e;
+    iput-object p6, p0, Lcom/facebook/drawee/backends/pipeline/d;->Ka:Lcom/facebook/common/d/e;
 
-    iput-object p5, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kf:Lcom/facebook/imagepipeline/cache/o;
+    iput-object p5, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kb: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;->LQ:Lcom/facebook/drawee/d/c;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LM: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;->MB:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    iget-object v0, v0, Lcom/facebook/drawee/drawable/p;->Mx:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
     move-object v1, v0
 
     :cond_0
-    iput-object v1, p2, Lcom/facebook/drawee/b/a;->MB:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    iput-object v1, p2, Lcom/facebook/drawee/b/a;->Mx:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kl:Lcom/facebook/drawee/backends/pipeline/a/a;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kh:Lcom/facebook/drawee/backends/pipeline/a/a;
 
-    iget v0, v0, Lcom/facebook/drawee/backends/pipeline/a/a;->Kt:I
+    iget v0, v0, Lcom/facebook/drawee/backends/pipeline/a/a;->Kp: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;->fI()I
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/c;->fG()I
 
     move-result p1
 
-    iput p1, p2, Lcom/facebook/drawee/b/a;->Mz:I
+    iput p1, p2, Lcom/facebook/drawee/b/a;->Mv:I
 
     return-void
 
@@ -309,14 +309,14 @@
         .end annotation
     .end param
 
-    iget-boolean v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kh:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kd:Z
 
     if-nez v0, :cond_0
 
     return-void
 
     :cond_0
-    invoke-virtual {p0}, Lcom/facebook/drawee/backends/pipeline/d;->hi()Landroid/graphics/drawable/Drawable;
+    invoke-virtual {p0}, Lcom/facebook/drawee/backends/pipeline/d;->hg()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;->Kl:Lcom/facebook/drawee/backends/pipeline/a/a;
+    iput-object v2, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kh: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;->Kk:Lcom/facebook/drawee/backends/pipeline/b/b;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kg:Lcom/facebook/drawee/backends/pipeline/b/b;
 
     if-nez v0, :cond_2
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kl:Lcom/facebook/drawee/backends/pipeline/a/a;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kh: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;->hi()Landroid/graphics/drawable/Drawable;
+    invoke-virtual {p0}, Lcom/facebook/drawee/backends/pipeline/d;->hg()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;->hi()Landroid/graphics/drawable/Drawable;
+    invoke-virtual {p0}, Lcom/facebook/drawee/backends/pipeline/d;->hg()Landroid/graphics/drawable/Drawable;
 
     move-result-object v0
 
@@ -383,7 +383,7 @@
     .end annotation
 
     :try_start_0
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()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;->JX:Lcom/facebook/common/d/e;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->JT: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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     return-object v0
 
     :cond_0
     :try_start_1
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->Ke:Lcom/facebook/common/d/e;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->Ka: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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     return-object v0
 
     :cond_1
     :try_start_2
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kd:Lcom/facebook/imagepipeline/f/a;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->JZ: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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     return-object v0
 
@@ -468,12 +468,12 @@
     :catchall_0
     move-exception p1
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     throw p1
 .end method
 
-.method private gU()Lcom/facebook/common/references/CloseableReference;
+.method private gS()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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kf:Lcom/facebook/imagepipeline/cache/o;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kb:Lcom/facebook/imagepipeline/cache/o;
 
     const/4 v1, 0x0
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->HH:Lcom/facebook/cache/common/CacheKey;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->HD: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;->Kf:Lcom/facebook/imagepipeline/cache/o;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kb:Lcom/facebook/imagepipeline/cache/o;
 
-    iget-object v2, p0, Lcom/facebook/drawee/backends/pipeline/d;->HH:Lcom/facebook/cache/common/CacheKey;
+    iget-object v2, p0, Lcom/facebook/drawee/backends/pipeline/d;->HD: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;->jn()Lcom/facebook/imagepipeline/g/h;
+    invoke-virtual {v2}, Lcom/facebook/imagepipeline/g/c;->jl()Lcom/facebook/imagepipeline/g/h;
 
     move-result-object v2
 
-    invoke-interface {v2}, Lcom/facebook/imagepipeline/g/h;->jC()Z
+    invoke-interface {v2}, Lcom/facebook/imagepipeline/g/h;->jA()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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     return-object v1
 
     :cond_1
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     return-object v0
 
     :cond_2
     :goto_0
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     return-object v1
 
     :catchall_0
     move-exception v0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()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;->gP()V
+    invoke-interface {p1}, Lcom/facebook/d/a/a;->gN()V
 
     :cond_0
     return-void
@@ -606,24 +606,24 @@
         }
     .end annotation
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()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;->Kg:Lcom/facebook/common/d/l;
+    iput-object p1, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kc: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;->HH:Lcom/facebook/cache/common/CacheKey;
+    iput-object p3, p0, Lcom/facebook/drawee/backends/pipeline/d;->HD:Lcom/facebook/cache/common/CacheKey;
 
-    iput-object p5, p0, Lcom/facebook/drawee/backends/pipeline/d;->JX:Lcom/facebook/common/d/e;
+    iput-object p5, p0, Lcom/facebook/drawee/backends/pipeline/d;->JT:Lcom/facebook/common/d/e;
 
     monitor-enter p0
 
     :try_start_0
-    iput-object p1, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kk:Lcom/facebook/drawee/backends/pipeline/b/b;
+    iput-object p1, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kg: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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     return-void
 
@@ -654,13 +654,13 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kk:Lcom/facebook/drawee/backends/pipeline/b/b;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kg: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;->Kk:Lcom/facebook/drawee/backends/pipeline/b/b;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kg: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;->Kk:Lcom/facebook/drawee/backends/pipeline/b/b;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kg: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;->Kk:Lcom/facebook/drawee/backends/pipeline/b/b;
+    iget-object v3, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kg: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;->Kk:Lcom/facebook/drawee/backends/pipeline/b/b;
+    iput-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kg: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;->Kk:Lcom/facebook/drawee/backends/pipeline/b/b;
+    iput-object p1, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kg: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;->Ki:Lcom/facebook/drawee/backends/pipeline/b/g;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->Ke: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;->Ki:Lcom/facebook/drawee/backends/pipeline/b/g;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->Ke:Lcom/facebook/drawee/backends/pipeline/b/g;
 
-    iget-object v2, v0, Lcom/facebook/drawee/backends/pipeline/b/g;->KX:Ljava/util/List;
+    iget-object v2, v0, Lcom/facebook/drawee/backends/pipeline/b/g;->KT:Ljava/util/List;
 
     if-eqz v2, :cond_0
 
-    iget-object v2, v0, Lcom/facebook/drawee/backends/pipeline/b/g;->KX:Ljava/util/List;
+    iget-object v2, v0, Lcom/facebook/drawee/backends/pipeline/b/g;->KT: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;->KS:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iget-object v0, v0, Lcom/facebook/drawee/backends/pipeline/b/g;->KO:Lcom/facebook/drawee/backends/pipeline/b/h;
 
     const/4 v3, 0x0
 
-    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;->Kt:Ljava/lang/String;
 
-    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;->Kv:Lcom/facebook/imagepipeline/request/b;
 
-    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;->Ku:Ljava/lang/Object;
 
-    iput-object v3, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KA:Lcom/facebook/imagepipeline/g/f;
+    iput-object v3, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Kw:Lcom/facebook/imagepipeline/g/f;
 
     const-wide/16 v4, -0x1
 
+    iput-wide v4, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Kx:J
+
+    iput-wide v4, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Kz:J
+
+    iput-wide v4, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KA: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;->KC:J
+
     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 v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Kp:I
 
-    iput-wide v4, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KF:J
+    iput-object v3, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KE: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
+    iput-boolean v2, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KF: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;->KG:I
 
-    iput v2, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KL:I
+    iput v2, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KH:I
 
-    iput v2, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KY:I
+    iput v2, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KU:I
 
-    iput v2, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KM:I
+    iput v2, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KI: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;->KJ:J
 
-    iput-wide v4, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KO:J
+    iput-wide v4, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KK:J
 
-    iput-object v3, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KP:Ljava/lang/String;
+    iput-object v3, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KL:Ljava/lang/String;
 
     :cond_1
     if-eqz p1, :cond_5
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->Ki:Lcom/facebook/drawee/backends/pipeline/b/g;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->Ke: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;->Ki:Lcom/facebook/drawee/backends/pipeline/b/g;
+    iput-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->Ke:Lcom/facebook/drawee/backends/pipeline/b/g;
 
     :cond_2
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->Ki:Lcom/facebook/drawee/backends/pipeline/b/g;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->Ke:Lcom/facebook/drawee/backends/pipeline/b/g;
 
     if-eqz p1, :cond_4
 
-    iget-object v2, v0, Lcom/facebook/drawee/backends/pipeline/b/g;->KX:Ljava/util/List;
+    iget-object v2, v0, Lcom/facebook/drawee/backends/pipeline/b/g;->KT: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;->KX:Ljava/util/List;
+    iput-object v2, v0, Lcom/facebook/drawee/backends/pipeline/b/g;->KT:Ljava/util/List;
 
     :cond_3
-    iget-object v0, v0, Lcom/facebook/drawee/backends/pipeline/b/g;->KX:Ljava/util/List;
+    iget-object v0, v0, Lcom/facebook/drawee/backends/pipeline/b/g;->KT: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;->Ki:Lcom/facebook/drawee/backends/pipeline/b/g;
+    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/d;->Ke: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;->Kj:Ljava/util/Set;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kf: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;->Kj:Ljava/util/Set;
+    iput-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kf:Ljava/util/Set;
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kj:Ljava/util/Set;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kf: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;->Kk:Lcom/facebook/drawee/backends/pipeline/b/b;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kg: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;->Kk:Lcom/facebook/drawee/backends/pipeline/b/b;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kg: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;->Kk:Lcom/facebook/drawee/backends/pipeline/b/b;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kg: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;->Kk:Lcom/facebook/drawee/backends/pipeline/b/b;
+    iget-object v3, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kg: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;->Kk:Lcom/facebook/drawee/backends/pipeline/b/b;
+    iput-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kg: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;->Kk:Lcom/facebook/drawee/backends/pipeline/b/b;
+    iput-object p1, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kg: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;->Kj:Ljava/util/Set;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kf: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;->Kj:Ljava/util/Set;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kf: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;->Kk:Lcom/facebook/drawee/backends/pipeline/b/b;
+    iget-object p2, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kg:Lcom/facebook/drawee/backends/pipeline/b/b;
 
     if-eqz p2, :cond_0
 
-    iget-object p2, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kk:Lcom/facebook/drawee/backends/pipeline/b/b;
+    iget-object p2, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kg:Lcom/facebook/drawee/backends/pipeline/b/b;
 
     const/4 v0, 0x5
 
@@ -1042,7 +1042,7 @@
     throw p1
 .end method
 
-.method public final declared-synchronized gS()Lcom/facebook/imagepipeline/h/c;
+.method public final declared-synchronized gQ()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;->Kk:Lcom/facebook/drawee/backends/pipeline/b/b;
+    iget-object v1, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kg: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;->Kk:Lcom/facebook/drawee/backends/pipeline/b/b;
+    iget-object v2, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kg: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;->Kj:Ljava/util/Set;
+    iget-object v1, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kf: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;->Kj:Ljava/util/Set;
+    iget-object v2, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kf: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;->Wn:Ljava/util/List;
+    iget-object v2, v1, Lcom/facebook/imagepipeline/h/b;->Wj: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 gT()Lcom/facebook/c/c;
+.method public final gR()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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     const/4 v0, 0x2
 
@@ -1123,7 +1123,7 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lcom/facebook/drawee/backends/pipeline/d;->GI:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/drawee/backends/pipeline/d;->GE: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;->Kg:Lcom/facebook/common/d/l;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kc: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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     return-object v0
 .end method
 
-.method public final synthetic gV()Ljava/lang/Object;
+.method public final synthetic gT()Ljava/lang/Object;
     .locals 1
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    invoke-direct {p0}, Lcom/facebook/drawee/backends/pipeline/d;->gU()Lcom/facebook/common/references/CloseableReference;
+    invoke-direct {p0}, Lcom/facebook/drawee/backends/pipeline/d;->gS()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;->Kg:Lcom/facebook/common/d/l;
+    iget-object v1, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kc: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;->IA:Lcom/facebook/common/references/c;
+    iget-object p1, p1, Lcom/facebook/common/references/CloseableReference;->Iw: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 a518c6faf8..cc5566e48c 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 JX:Lcom/facebook/common/d/e;
+.field private JT: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 JY:Lcom/facebook/drawee/backends/pipeline/g;
+.field private final JU:Lcom/facebook/drawee/backends/pipeline/g;
 
-.field private Ka:Lcom/facebook/drawee/backends/pipeline/b/f;
+.field private JW:Lcom/facebook/drawee/backends/pipeline/b/f;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private Kk:Lcom/facebook/drawee/backends/pipeline/b/b;
+.field private Kg:Lcom/facebook/drawee/backends/pipeline/b/b;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private final Km:Lcom/facebook/imagepipeline/b/h;
+.field private final Ki: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;->Km:Lcom/facebook/imagepipeline/b/h;
+    iput-object p3, p0, Lcom/facebook/drawee/backends/pipeline/e;->Ki:Lcom/facebook/imagepipeline/b/h;
 
-    iput-object p2, p0, Lcom/facebook/drawee/backends/pipeline/e;->JY:Lcom/facebook/drawee/backends/pipeline/g;
+    iput-object p2, p0, Lcom/facebook/drawee/backends/pipeline/e;->JU:Lcom/facebook/drawee/backends/pipeline/g;
 
     return-void
 .end method
 
-.method private gW()Lcom/facebook/drawee/backends/pipeline/d;
+.method private gU()Lcom/facebook/drawee/backends/pipeline/d;
     .locals 11
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     :try_start_0
-    invoke-virtual {p0}, Lcom/facebook/drawee/backends/pipeline/e;->hq()Lcom/facebook/drawee/d/a;
+    invoke-virtual {p0}, Lcom/facebook/drawee/backends/pipeline/e;->ho()Lcom/facebook/drawee/d/a;
 
     move-result-object v0
 
-    invoke-static {}, Lcom/facebook/drawee/backends/pipeline/e;->hs()Ljava/lang/String;
+    invoke-static {}, Lcom/facebook/drawee/backends/pipeline/e;->hq()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;->JY:Lcom/facebook/drawee/backends/pipeline/g;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/e;->JU: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;->Kq:Lcom/facebook/drawee/a/a;
+    iget-object v6, v0, Lcom/facebook/drawee/backends/pipeline/g;->Km:Lcom/facebook/drawee/a/a;
 
-    iget-object v7, v0, Lcom/facebook/drawee/backends/pipeline/g;->JW:Lcom/facebook/imagepipeline/f/a;
+    iget-object v7, v0, Lcom/facebook/drawee/backends/pipeline/g;->JS:Lcom/facebook/imagepipeline/f/a;
 
-    iget-object v8, v0, Lcom/facebook/drawee/backends/pipeline/g;->Kr:Ljava/util/concurrent/Executor;
+    iget-object v8, v0, Lcom/facebook/drawee/backends/pipeline/g;->Kn:Ljava/util/concurrent/Executor;
 
-    iget-object v9, v0, Lcom/facebook/drawee/backends/pipeline/g;->Kf:Lcom/facebook/imagepipeline/cache/o;
+    iget-object v9, v0, Lcom/facebook/drawee/backends/pipeline/g;->Kb:Lcom/facebook/imagepipeline/cache/o;
 
-    iget-object v10, v0, Lcom/facebook/drawee/backends/pipeline/g;->Ks:Lcom/facebook/common/d/e;
+    iget-object v10, v0, Lcom/facebook/drawee/backends/pipeline/g;->Ko: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;->JZ:Lcom/facebook/common/d/l;
+    iget-object v2, v0, Lcom/facebook/drawee/backends/pipeline/g;->JV:Lcom/facebook/common/d/l;
 
     if-eqz v2, :cond_1
 
-    iget-object v0, v0, Lcom/facebook/drawee/backends/pipeline/g;->JZ:Lcom/facebook/common/d/l;
+    iget-object v0, v0, Lcom/facebook/drawee/backends/pipeline/g;->JV: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;->Kh:Z
+    iput-boolean v0, v1, Lcom/facebook/drawee/backends/pipeline/d;->Kd:Z
 
     :cond_1
     move-object v0, v1
@@ -140,15 +140,15 @@
 
     move-result-object v2
 
-    invoke-virtual {p0}, Lcom/facebook/drawee/backends/pipeline/e;->ho()Ljava/lang/Object;
+    invoke-virtual {p0}, Lcom/facebook/drawee/backends/pipeline/e;->hm()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;->Km:Lcom/facebook/imagepipeline/b/h;
+    iget-object v4, p0, Lcom/facebook/drawee/backends/pipeline/e;->Ki:Lcom/facebook/imagepipeline/b/h;
 
-    iget-object v4, v4, Lcom/facebook/imagepipeline/b/h;->Uh:Lcom/facebook/imagepipeline/cache/f;
+    iget-object v4, v4, Lcom/facebook/imagepipeline/b/h;->Ud: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;->Zz:Lcom/facebook/imagepipeline/request/c;
+    iget-object v5, v1, Lcom/facebook/imagepipeline/request/b;->Zv:Lcom/facebook/imagepipeline/request/c;
 
     if-eqz v5, :cond_2
 
-    invoke-virtual {p0}, Lcom/facebook/drawee/backends/pipeline/e;->hn()Ljava/lang/Object;
+    invoke-virtual {p0}, Lcom/facebook/drawee/backends/pipeline/e;->hl()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;->hn()Ljava/lang/Object;
+    invoke-virtual {p0}, Lcom/facebook/drawee/backends/pipeline/e;->hl()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;->hn()Ljava/lang/Object;
+    invoke-virtual {p0}, Lcom/facebook/drawee/backends/pipeline/e;->hl()Ljava/lang/Object;
 
     move-result-object v5
 
-    iget-object v6, p0, Lcom/facebook/drawee/backends/pipeline/e;->JX:Lcom/facebook/common/d/e;
+    iget-object v6, p0, Lcom/facebook/drawee/backends/pipeline/e;->JT:Lcom/facebook/common/d/e;
 
-    iget-object v7, p0, Lcom/facebook/drawee/backends/pipeline/e;->Kk:Lcom/facebook/drawee/backends/pipeline/b/b;
+    iget-object v7, p0, Lcom/facebook/drawee/backends/pipeline/e;->Kg: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;->Ka:Lcom/facebook/drawee/backends/pipeline/b/f;
+    iget-object v1, p0, Lcom/facebook/drawee/backends/pipeline/e;->JW: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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     return-object v0
 
     :catchall_0
     move-exception v0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()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;->Km:Lcom/facebook/imagepipeline/b/h;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/e;->Ki:Lcom/facebook/imagepipeline/b/h;
 
-    sget-object v1, Lcom/facebook/drawee/backends/pipeline/e$1;->Kn:[I
+    sget-object v1, Lcom/facebook/drawee/backends/pipeline/e$1;->Kj:[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;->aat:Lcom/facebook/imagepipeline/request/b$b;
+    sget-object p4, Lcom/facebook/imagepipeline/request/b$b;->aap: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;->aar:Lcom/facebook/imagepipeline/request/b$b;
+    sget-object p4, Lcom/facebook/imagepipeline/request/b$b;->aan:Lcom/facebook/imagepipeline/request/b$b;
 
     goto :goto_0
 
     :cond_2
-    sget-object p4, Lcom/facebook/imagepipeline/request/b$b;->aaq:Lcom/facebook/imagepipeline/request/b$b;
+    sget-object p4, Lcom/facebook/imagepipeline/request/b$b;->aam: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;->gS()Lcom/facebook/imagepipeline/h/c;
+    invoke-virtual {p1}, Lcom/facebook/drawee/backends/pipeline/d;->gQ()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;->kH()Lcom/facebook/imagepipeline/request/b;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->kF()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;->Ka:Lcom/facebook/drawee/backends/pipeline/b/f;
+    iput-object p1, p0, Lcom/facebook/drawee/backends/pipeline/e;->JW:Lcom/facebook/drawee/backends/pipeline/b/f;
 
     move-object p1, p0
 
@@ -393,10 +393,10 @@
     return-object p1
 .end method
 
-.method public final synthetic gX()Lcom/facebook/drawee/controller/AbstractDraweeController;
+.method public final synthetic gV()Lcom/facebook/drawee/controller/AbstractDraweeController;
     .locals 1
 
-    invoke-direct {p0}, Lcom/facebook/drawee/backends/pipeline/e;->gW()Lcom/facebook/drawee/backends/pipeline/d;
+    invoke-direct {p0}, Lcom/facebook/drawee/backends/pipeline/e;->gU()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;->iB()Lcom/facebook/imagepipeline/a/f;
+    invoke-static {}, Lcom/facebook/imagepipeline/a/f;->iz()Lcom/facebook/imagepipeline/a/f;
 
     move-result-object v0
 
-    iput-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Su:Lcom/facebook/imagepipeline/a/f;
+    iput-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Sq:Lcom/facebook/imagepipeline/a/f;
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->kH()Lcom/facebook/imagepipeline/request/b;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->kF()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 9ae4fca1f2..dbb06eafc7 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 JY:Lcom/facebook/drawee/backends/pipeline/g;
+.field private final JU:Lcom/facebook/drawee/backends/pipeline/g;
 
-.field private final Km:Lcom/facebook/imagepipeline/b/h;
+.field private final Ki:Lcom/facebook/imagepipeline/b/h;
 
-.field private final Ko:Ljava/util/Set;
+.field private final Kk:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -32,7 +32,7 @@
     .end annotation
 .end field
 
-.field private final Kp:Lcom/facebook/drawee/backends/pipeline/b/f;
+.field private final Kl: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;->iM()Lcom/facebook/imagepipeline/b/k;
+    invoke-static {}, Lcom/facebook/imagepipeline/b/k;->iK()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;->gR()Lcom/facebook/imagepipeline/b/h;
+    invoke-virtual {p2}, Lcom/facebook/imagepipeline/b/k;->gP()Lcom/facebook/imagepipeline/b/h;
 
     move-result-object p4
 
-    iput-object p4, p0, Lcom/facebook/drawee/backends/pipeline/f;->Km:Lcom/facebook/imagepipeline/b/h;
+    iput-object p4, p0, Lcom/facebook/drawee/backends/pipeline/f;->Ki:Lcom/facebook/imagepipeline/b/h;
 
     if-eqz p3, :cond_0
 
-    iget-object p4, p3, Lcom/facebook/drawee/backends/pipeline/b;->JY:Lcom/facebook/drawee/backends/pipeline/g;
+    iget-object p4, p3, Lcom/facebook/drawee/backends/pipeline/b;->JU:Lcom/facebook/drawee/backends/pipeline/g;
 
     if-eqz p4, :cond_0
 
-    iget-object p4, p3, Lcom/facebook/drawee/backends/pipeline/b;->JY:Lcom/facebook/drawee/backends/pipeline/g;
+    iget-object p4, p3, Lcom/facebook/drawee/backends/pipeline/b;->JU:Lcom/facebook/drawee/backends/pipeline/g;
 
-    iput-object p4, p0, Lcom/facebook/drawee/backends/pipeline/f;->JY:Lcom/facebook/drawee/backends/pipeline/g;
+    iput-object p4, p0, Lcom/facebook/drawee/backends/pipeline/f;->JU: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;->JY:Lcom/facebook/drawee/backends/pipeline/g;
+    iput-object p4, p0, Lcom/facebook/drawee/backends/pipeline/f;->JU:Lcom/facebook/drawee/backends/pipeline/g;
 
     :goto_0
-    iget-object p4, p0, Lcom/facebook/drawee/backends/pipeline/f;->JY:Lcom/facebook/drawee/backends/pipeline/g;
+    iget-object p4, p0, Lcom/facebook/drawee/backends/pipeline/f;->JU: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;->hb()Lcom/facebook/drawee/a/a;
+    invoke-static {}, Lcom/facebook/drawee/a/a;->gZ()Lcom/facebook/drawee/a/a;
 
     move-result-object v0
 
-    invoke-virtual {p2}, Lcom/facebook/imagepipeline/b/k;->iN()Lcom/facebook/imagepipeline/animated/b/a;
+    invoke-virtual {p2}, Lcom/facebook/imagepipeline/b/k;->iL()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;->ib()Lcom/facebook/imagepipeline/f/a;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/animated/b/a;->hZ()Lcom/facebook/imagepipeline/f/a;
 
     move-result-object p2
 
     :goto_1
-    invoke-static {}, Lcom/facebook/common/b/i;->gh()Lcom/facebook/common/b/i;
+    invoke-static {}, Lcom/facebook/common/b/i;->gf()Lcom/facebook/common/b/i;
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/facebook/drawee/backends/pipeline/f;->Km:Lcom/facebook/imagepipeline/b/h;
+    iget-object v3, p0, Lcom/facebook/drawee/backends/pipeline/f;->Ki:Lcom/facebook/imagepipeline/b/h;
 
-    iget-object v3, v3, Lcom/facebook/imagepipeline/b/h;->Ud:Lcom/facebook/imagepipeline/cache/o;
+    iget-object v3, v3, Lcom/facebook/imagepipeline/b/h;->TZ:Lcom/facebook/imagepipeline/cache/o;
 
     if-eqz p3, :cond_2
 
-    iget-object v4, p3, Lcom/facebook/drawee/backends/pipeline/b;->JX:Lcom/facebook/common/d/e;
+    iget-object v4, p3, Lcom/facebook/drawee/backends/pipeline/b;->JT: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;->JZ:Lcom/facebook/common/d/l;
+    iget-object v5, p3, Lcom/facebook/drawee/backends/pipeline/b;->JV: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;->Kq:Lcom/facebook/drawee/a/a;
+    iput-object v0, p4, Lcom/facebook/drawee/backends/pipeline/g;->Km:Lcom/facebook/drawee/a/a;
 
-    iput-object p2, p4, Lcom/facebook/drawee/backends/pipeline/g;->JW:Lcom/facebook/imagepipeline/f/a;
+    iput-object p2, p4, Lcom/facebook/drawee/backends/pipeline/g;->JS:Lcom/facebook/imagepipeline/f/a;
 
-    iput-object v2, p4, Lcom/facebook/drawee/backends/pipeline/g;->Kr:Ljava/util/concurrent/Executor;
+    iput-object v2, p4, Lcom/facebook/drawee/backends/pipeline/g;->Kn:Ljava/util/concurrent/Executor;
 
-    iput-object v3, p4, Lcom/facebook/drawee/backends/pipeline/g;->Kf:Lcom/facebook/imagepipeline/cache/o;
+    iput-object v3, p4, Lcom/facebook/drawee/backends/pipeline/g;->Kb:Lcom/facebook/imagepipeline/cache/o;
 
-    iput-object v4, p4, Lcom/facebook/drawee/backends/pipeline/g;->Ks:Lcom/facebook/common/d/e;
+    iput-object v4, p4, Lcom/facebook/drawee/backends/pipeline/g;->Ko:Lcom/facebook/common/d/e;
 
-    iput-object v5, p4, Lcom/facebook/drawee/backends/pipeline/g;->JZ:Lcom/facebook/common/d/l;
+    iput-object v5, p4, Lcom/facebook/drawee/backends/pipeline/g;->JV:Lcom/facebook/common/d/l;
 
-    iput-object v1, p0, Lcom/facebook/drawee/backends/pipeline/f;->Ko:Ljava/util/Set;
+    iput-object v1, p0, Lcom/facebook/drawee/backends/pipeline/f;->Kk:Ljava/util/Set;
 
     if-eqz p3, :cond_4
 
-    iget-object v1, p3, Lcom/facebook/drawee/backends/pipeline/b;->Ka:Lcom/facebook/drawee/backends/pipeline/b/f;
+    iget-object v1, p3, Lcom/facebook/drawee/backends/pipeline/b;->JW:Lcom/facebook/drawee/backends/pipeline/b/f;
 
     :cond_4
-    iput-object v1, p0, Lcom/facebook/drawee/backends/pipeline/f;->Kp:Lcom/facebook/drawee/backends/pipeline/b/f;
+    iput-object v1, p0, Lcom/facebook/drawee/backends/pipeline/f;->Kl:Lcom/facebook/drawee/backends/pipeline/b/f;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final gY()Lcom/facebook/drawee/backends/pipeline/e;
+.method public final gW()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;->JY:Lcom/facebook/drawee/backends/pipeline/g;
+    iget-object v2, p0, Lcom/facebook/drawee/backends/pipeline/f;->JU:Lcom/facebook/drawee/backends/pipeline/g;
 
-    iget-object v3, p0, Lcom/facebook/drawee/backends/pipeline/f;->Km:Lcom/facebook/imagepipeline/b/h;
+    iget-object v3, p0, Lcom/facebook/drawee/backends/pipeline/f;->Ki:Lcom/facebook/imagepipeline/b/h;
 
-    iget-object v4, p0, Lcom/facebook/drawee/backends/pipeline/f;->Ko:Ljava/util/Set;
+    iget-object v4, p0, Lcom/facebook/drawee/backends/pipeline/f;->Kk: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;->Kp:Lcom/facebook/drawee/backends/pipeline/b/f;
+    iget-object v1, p0, Lcom/facebook/drawee/backends/pipeline/f;->Kl: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;->gY()Lcom/facebook/drawee/backends/pipeline/e;
+    invoke-virtual {p0}, Lcom/facebook/drawee/backends/pipeline/f;->gW()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 86da5b2a80..ee6f6d9ea9 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 JW:Lcom/facebook/imagepipeline/f/a;
+.field JS:Lcom/facebook/imagepipeline/f/a;
 
-.field JZ:Lcom/facebook/common/d/l;
+.field JV: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 Kf:Lcom/facebook/imagepipeline/cache/o;
+.field Kb: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 Kq:Lcom/facebook/drawee/a/a;
+.field Km:Lcom/facebook/drawee/a/a;
 
-.field Kr:Ljava/util/concurrent/Executor;
+.field Kn:Ljava/util/concurrent/Executor;
 
-.field Ks:Lcom/facebook/common/d/e;
+.field Ko: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 5782b4f10a..117e5a7f7a 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 hk()Z
+.method public abstract hi()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 8fbc15115e..f5777bb423 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 Pc:Lcom/facebook/drawee/c/a$a;
+.field public OY:Lcom/facebook/drawee/c/a$a;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public final Pd:F
+.field public final OZ:F
 
-.field public Pe:Z
+.field public Pa:Z
 
-.field public Pf:Z
+.field public Pb:Z
 
-.field public Pg:J
+.field public Pc:J
 
-.field public Ph:F
+.field public Pd:F
 
-.field public Pi:F
+.field public Pe:F
 
 
 # direct methods
@@ -46,7 +46,7 @@
 
     int-to-float p1, p1
 
-    iput p1, p0, Lcom/facebook/drawee/c/a;->Pd:F
+    iput p1, p0, Lcom/facebook/drawee/c/a;->OZ: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;->Pc:Lcom/facebook/drawee/c/a$a;
+    iput-object v0, p0, Lcom/facebook/drawee/c/a;->OY: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;->Pe:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/c/a;->Pa:Z
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/c/a;->Pf:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/c/a;->Pb: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 bf62a141bb..77448db73b 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 GI:Ljava/lang/Class;
+.field private static final GE:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -42,30 +42,30 @@
 
 
 # instance fields
-.field private final Kq:Lcom/facebook/drawee/a/a;
+.field private final Km:Lcom/facebook/drawee/a/a;
 
-.field private Ky:Ljava/lang/Object;
+.field private Ku:Ljava/lang/Object;
 
-.field private final LK:Lcom/facebook/drawee/a/b;
+.field private final LG:Lcom/facebook/drawee/a/b;
 
-.field private final LL:Ljava/util/concurrent/Executor;
+.field private final LH:Ljava/util/concurrent/Executor;
 
-.field LM:Lcom/facebook/drawee/a/c;
+.field LI:Lcom/facebook/drawee/a/c;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field LN:Lcom/facebook/drawee/c/a;
+.field LJ:Lcom/facebook/drawee/c/a;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field LO:Lcom/facebook/drawee/controller/c;
+.field LK:Lcom/facebook/drawee/controller/c;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field protected LP:Lcom/facebook/drawee/controller/ControllerListener;
+.field protected LL: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 LQ:Lcom/facebook/drawee/d/c;
+.field public LM:Lcom/facebook/drawee/d/c;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private LR:Landroid/graphics/drawable/Drawable;
+.field private LN:Landroid/graphics/drawable/Drawable;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private LS:Z
+.field private LO:Z
 
-.field private LU:Z
+.field private LP:Z
 
-.field private LV:Z
+.field private LQ:Z
 
-.field LW:Z
+.field LR:Z
 
-.field LX:Ljava/lang/String;
+.field LS:Ljava/lang/String;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private LY:Lcom/facebook/c/c;
+.field private LU:Lcom/facebook/c/c;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/c/c<",
@@ -112,7 +112,7 @@
     .end annotation
 .end field
 
-.field private LZ:Ljava/lang/Object;
+.field private LV:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TT;"
@@ -123,7 +123,7 @@
     .end annotation
 .end field
 
-.field private Ma:Z
+.field private LW: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;->GI:Ljava/lang/Class;
+    sput-object v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->GE: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;->he()Lcom/facebook/drawee/a/b;
+    invoke-static {}, Lcom/facebook/drawee/a/b;->hc()Lcom/facebook/drawee/a/b;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LK:Lcom/facebook/drawee/a/b;
+    iput-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LG:Lcom/facebook/drawee/a/b;
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Ma:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LW:Z
 
-    iput-object p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kq:Lcom/facebook/drawee/a/a;
+    iput-object p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Km:Lcom/facebook/drawee/a/a;
 
-    iput-object p2, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LL:Ljava/util/concurrent/Executor;
+    iput-object p2, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LH: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;->gG()Z
+    invoke-interface {p2}, Lcom/facebook/c/c;->gE()Z
 
     return-void
 
     :cond_0
     if-nez p4, :cond_1
 
-    iget-object p0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LQ:Lcom/facebook/drawee/d/c;
+    iget-object p0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LM: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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()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;->gG()Z
+    invoke-interface {p2}, Lcom/facebook/c/c;->gE()Z
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_1
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     return-void
 
     :cond_0
     :try_start_1
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LK:Lcom/facebook/drawee/a/b;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LG:Lcom/facebook/drawee/a/b;
 
     if-eqz p5, :cond_1
 
-    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;->Lo:Lcom/facebook/drawee/a/b$a;
 
     goto :goto_0
 
     :cond_1
-    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;->Lp: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;->LZ:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LV: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;->LZ:Ljava/lang/Object;
+    iput-object p3, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LV: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;->LY:Lcom/facebook/c/c;
+    iput-object p4, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LU:Lcom/facebook/c/c;
 
-    iget-object p4, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LQ:Lcom/facebook/drawee/d/c;
+    iget-object p4, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LM: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;->hh()Lcom/facebook/drawee/controller/ControllerListener;
+    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->hf()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;->hm()Landroid/graphics/drawable/Animatable;
+    invoke-virtual {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->hk()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;->LQ:Lcom/facebook/drawee/d/c;
+    iget-object p4, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LM: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;->hh()Lcom/facebook/drawee/controller/ControllerListener;
+    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->hf()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;->hm()Landroid/graphics/drawable/Animatable;
+    invoke-virtual {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->hk()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;->LQ:Lcom/facebook/drawee/d/c;
+    iget-object p5, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LM: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;->hh()Lcom/facebook/drawee/controller/ControllerListener;
+    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->hf()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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     return-void
 
     :catchall_1
     move-exception p1
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     throw p1
 .end method
@@ -483,7 +483,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()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;->gG()Z
+    invoke-interface {p2}, Lcom/facebook/c/c;->gE()Z
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     return-void
 
     :cond_0
-    iget-object p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LK:Lcom/facebook/drawee/a/b;
+    iget-object p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LG:Lcom/facebook/drawee/a/b;
 
     if-eqz p4, :cond_1
 
-    sget-object p2, Lcom/facebook/drawee/a/b$a;->Lu:Lcom/facebook/drawee/a/b$a;
+    sget-object p2, Lcom/facebook/drawee/a/b$a;->Lq:Lcom/facebook/drawee/a/b$a;
 
     goto :goto_0
 
     :cond_1
-    sget-object p2, Lcom/facebook/drawee/a/b$a;->Lv:Lcom/facebook/drawee/a/b$a;
+    sget-object p2, Lcom/facebook/drawee/a/b$a;->Lr: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;->LY:Lcom/facebook/c/c;
+    iput-object p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LU:Lcom/facebook/c/c;
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LV:Z
+    iput-boolean p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LQ:Z
 
-    iget-boolean p2, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LW:Z
+    iget-boolean p2, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LR:Z
 
     if-eqz p2, :cond_2
 
@@ -538,7 +538,7 @@
 
     if-eqz p2, :cond_2
 
-    iget-object p4, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LQ:Lcom/facebook/drawee/d/c;
+    iget-object p4, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LM: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;->hf()Z
+    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->hd()Z
 
     move-result p1
 
     if-eqz p1, :cond_3
 
-    iget-object p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LQ:Lcom/facebook/drawee/d/c;
+    iget-object p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LM:Lcom/facebook/drawee/d/c;
 
-    invoke-interface {p1}, Lcom/facebook/drawee/d/c;->hO()V
+    invoke-interface {p1}, Lcom/facebook/drawee/d/c;->hM()V
 
     goto :goto_1
 
     :cond_3
-    iget-object p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LQ:Lcom/facebook/drawee/d/c;
+    iget-object p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LM:Lcom/facebook/drawee/d/c;
 
-    invoke-interface {p1}, Lcom/facebook/drawee/d/c;->hN()V
+    invoke-interface {p1}, Lcom/facebook/drawee/d/c;->hL()V
 
     :goto_1
-    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->hh()Lcom/facebook/drawee/controller/ControllerListener;
+    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->hf()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;->hh()Lcom/facebook/drawee/controller/ControllerListener;
+    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->hf()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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     return-void
 .end method
@@ -609,7 +609,7 @@
 
     if-nez p2, :cond_0
 
-    iget-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LY:Lcom/facebook/c/c;
+    iget-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LU: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;->LY:Lcom/facebook/c/c;
+    iget-object p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LU:Lcom/facebook/c/c;
 
     if-ne p2, p1, :cond_1
 
-    iget-boolean p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LS:Z
+    iget-boolean p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LO:Z
 
     if-eqz p1, :cond_1
 
@@ -651,7 +651,7 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v1, Lcom/facebook/drawee/controller/AbstractDraweeController;->GI:Ljava/lang/Class;
+    sget-object v1, Lcom/facebook/drawee/controller/AbstractDraweeController;->GE: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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LK:Lcom/facebook/drawee/a/b;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LG: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;->Lj: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;->Ma:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LW:Z
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kq:Lcom/facebook/drawee/a/a;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Km:Lcom/facebook/drawee/a/a;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kq:Lcom/facebook/drawee/a/a;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Km: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;->LU:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LP:Z
 
-    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->hg()V
+    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->he()V
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LW:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LR:Z
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LM:Lcom/facebook/drawee/a/c;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LI:Lcom/facebook/drawee/a/c;
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LM:Lcom/facebook/drawee/a/c;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LI: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;->LN:Lcom/facebook/drawee/c/a;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LJ:Lcom/facebook/drawee/c/a;
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LN:Lcom/facebook/drawee/c/a;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LJ:Lcom/facebook/drawee/c/a;
 
     invoke-virtual {v0}, Lcom/facebook/drawee/c/a;->init()V
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LN:Lcom/facebook/drawee/c/a;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LJ:Lcom/facebook/drawee/c/a;
 
-    iput-object p0, v0, Lcom/facebook/drawee/c/a;->Pc:Lcom/facebook/drawee/c/a$a;
+    iput-object p0, v0, Lcom/facebook/drawee/c/a;->OY:Lcom/facebook/drawee/c/a$a;
 
     :cond_2
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LP:Lcom/facebook/drawee/controller/ControllerListener;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LL: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;->LP:Lcom/facebook/drawee/controller/ControllerListener;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LL:Lcom/facebook/drawee/controller/ControllerListener;
 
     check-cast v0, Lcom/facebook/drawee/controller/AbstractDraweeController$a;
 
-    invoke-virtual {v0}, Lcom/facebook/drawee/controller/AbstractDraweeController$a;->hu()V
+    invoke-virtual {v0}, Lcom/facebook/drawee/controller/AbstractDraweeController$a;->hs()V
 
     goto :goto_0
 
     :cond_3
-    iput-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LP:Lcom/facebook/drawee/controller/ControllerListener;
+    iput-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LL:Lcom/facebook/drawee/controller/ControllerListener;
 
     :goto_0
-    iput-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LO:Lcom/facebook/drawee/controller/c;
+    iput-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LK:Lcom/facebook/drawee/controller/c;
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LQ:Lcom/facebook/drawee/d/c;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LM:Lcom/facebook/drawee/d/c;
 
     if-eqz v0, :cond_4
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LQ:Lcom/facebook/drawee/d/c;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LM:Lcom/facebook/drawee/d/c;
 
     invoke-interface {v0}, Lcom/facebook/drawee/d/c;->reset()V
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LQ:Lcom/facebook/drawee/d/c;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LM: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;->LQ:Lcom/facebook/drawee/d/c;
+    iput-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LM:Lcom/facebook/drawee/d/c;
 
     :cond_4
-    iput-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LR:Landroid/graphics/drawable/Drawable;
+    iput-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LN: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;->GI:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->GE: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;->Ky:Ljava/lang/Object;
+    iput-object p2, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Ku:Ljava/lang/Object;
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()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;->GI:Ljava/lang/Class;
+    sget-object v1, Lcom/facebook/drawee/controller/AbstractDraweeController;->GE:Ljava/lang/Class;
 
     const/4 v2, 0x5
 
@@ -890,18 +890,18 @@
     return-void
 .end method
 
-.method private hf()Z
+.method private hd()Z
     .locals 1
 
-    iget-boolean v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LV:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LQ:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LM:Lcom/facebook/drawee/a/c;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LI:Lcom/facebook/drawee/a/c;
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v0}, Lcom/facebook/drawee/a/c;->hf()Z
+    invoke-virtual {v0}, Lcom/facebook/drawee/a/c;->hd()Z
 
     move-result v0
 
@@ -917,26 +917,26 @@
     return v0
 .end method
 
-.method private hg()V
+.method private he()V
     .locals 4
 
-    iget-boolean v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LS:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LO:Z
 
     const/4 v1, 0x0
 
-    iput-boolean v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LS:Z
+    iput-boolean v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LO:Z
 
-    iput-boolean v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LV:Z
+    iput-boolean v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LQ:Z
 
-    iget-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LY:Lcom/facebook/c/c;
+    iget-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LU:Lcom/facebook/c/c;
 
     const/4 v2, 0x0
 
     if-eqz v1, :cond_0
 
-    invoke-interface {v1}, Lcom/facebook/c/c;->gG()Z
+    invoke-interface {v1}, Lcom/facebook/c/c;->gE()Z
 
-    iput-object v2, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LY:Lcom/facebook/c/c;
+    iput-object v2, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LU: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;->LX:Ljava/lang/String;
+    iget-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LS:Ljava/lang/String;
 
     if-eqz v1, :cond_2
 
-    iput-object v2, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LX:Ljava/lang/String;
+    iput-object v2, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LS: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;->LZ:Ljava/lang/Object;
+    iget-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LV: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;->LZ:Ljava/lang/Object;
+    iget-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LV: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;->LZ:Ljava/lang/Object;
+    iput-object v2, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LV:Ljava/lang/Object;
 
     :cond_3
     if-eqz v0, :cond_4
 
-    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->hh()Lcom/facebook/drawee/controller/ControllerListener;
+    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->hf()Lcom/facebook/drawee/controller/ControllerListener;
 
     move-result-object v0
 
@@ -984,7 +984,7 @@
     return-void
 .end method
 
-.method private hh()Lcom/facebook/drawee/controller/ControllerListener;
+.method private hf()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;->LP:Lcom/facebook/drawee/controller/ControllerListener;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LL:Lcom/facebook/drawee/controller/ControllerListener;
 
     if-nez v0, :cond_0
 
@@ -1006,12 +1006,12 @@
     return-object v0
 .end method
 
-.method private hl()V
+.method private hj()V
     .locals 8
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
-    invoke-virtual {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->gV()Ljava/lang/Object;
+    invoke-virtual {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->gT()Ljava/lang/Object;
 
     move-result-object v3
 
@@ -1021,29 +1021,29 @@
 
     if-eqz v3, :cond_0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     const/4 v2, 0x0
 
-    iput-object v2, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LY:Lcom/facebook/c/c;
+    iput-object v2, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LU:Lcom/facebook/c/c;
 
-    iput-boolean v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LS:Z
+    iput-boolean v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LO:Z
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LV:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LQ:Z
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LK:Lcom/facebook/drawee/a/b;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LG: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;->LB: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;->hh()Lcom/facebook/drawee/controller/ControllerListener;
+    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->hf()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;->Ky:Ljava/lang/Object;
+    iget-object v2, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Ku: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;->LY:Lcom/facebook/c/c;
+    iget-object v2, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LU: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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     return-void
 
     :cond_0
-    iget-object v2, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LK:Lcom/facebook/drawee/a/b;
+    iget-object v2, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LG:Lcom/facebook/drawee/a/b;
 
-    sget-object v3, Lcom/facebook/drawee/a/b$a;->Lr:Lcom/facebook/drawee/a/b$a;
+    sget-object v3, Lcom/facebook/drawee/a/b$a;->Ln: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;->hh()Lcom/facebook/drawee/controller/ControllerListener;
+    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->hf()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;->Ky:Ljava/lang/Object;
+    iget-object v4, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Ku: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;->LQ:Lcom/facebook/drawee/d/c;
+    iget-object v2, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LM: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;->LS:Z
+    iput-boolean v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LO:Z
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LV:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LQ:Z
 
-    invoke-virtual {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->gT()Lcom/facebook/c/c;
+    invoke-virtual {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->gR()Lcom/facebook/c/c;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LY:Lcom/facebook/c/c;
+    iput-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LU: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;->GI:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->GE: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;->LY:Lcom/facebook/c/c;
+    iget-object v3, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LU: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;->LY:Lcom/facebook/c/c;
+    iget-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LU:Lcom/facebook/c/c;
 
-    invoke-interface {v1}, Lcom/facebook/c/c;->gD()Z
+    invoke-interface {v1}, Lcom/facebook/c/c;->gB()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;->LY:Lcom/facebook/c/c;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LU:Lcom/facebook/c/c;
 
-    iget-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LL:Ljava/util/concurrent/Executor;
+    iget-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LH: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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()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;->LP:Lcom/facebook/drawee/controller/ControllerListener;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LL: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;->LP:Lcom/facebook/drawee/controller/ControllerListener;
+    iput-object p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LL:Lcom/facebook/drawee/controller/ControllerListener;
 
     return-void
 
     :cond_1
-    iput-object p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LP:Lcom/facebook/drawee/controller/ControllerListener;
+    iput-object p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LL: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;->LR:Landroid/graphics/drawable/Drawable;
+    iput-object p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LN:Landroid/graphics/drawable/Drawable;
 
-    iget-object p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LQ:Lcom/facebook/drawee/d/c;
+    iget-object p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LM:Lcom/facebook/drawee/d/c;
 
     if-eqz p1, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LR:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LN: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;->LP:Lcom/facebook/drawee/controller/ControllerListener;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LL: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;->LP:Lcom/facebook/drawee/controller/ControllerListener;
+    iput-object p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LL: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;->Ma:Z
+    iput-boolean p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LW:Z
 
     return-void
 .end method
 
-.method protected abstract gT()Lcom/facebook/c/c;
+.method protected abstract gR()Lcom/facebook/c/c;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
@@ -1336,7 +1336,7 @@
     .end annotation
 .end method
 
-.method protected gV()Ljava/lang/Object;
+.method protected gT()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;->LQ:Lcom/facebook/drawee/d/c;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LM:Lcom/facebook/drawee/d/c;
 
     return-object v0
 .end method
 
-.method protected final hi()Landroid/graphics/drawable/Drawable;
+.method protected final hg()Landroid/graphics/drawable/Drawable;
     .locals 1
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LR:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LN:Landroid/graphics/drawable/Drawable;
 
     return-object v0
 .end method
 
-.method public final hj()V
+.method public final hh()V
     .locals 5
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     const/4 v0, 0x2
 
@@ -1385,7 +1385,7 @@
 
     if-eqz v0, :cond_1
 
-    sget-object v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->GI:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->GE: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;->LS:Z
+    iget-boolean v3, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LO: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;->LK:Lcom/facebook/drawee/a/b;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LG: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;->Lk: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;->LQ:Lcom/facebook/drawee/d/c;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LM: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;->Kq:Lcom/facebook/drawee/a/a;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Km: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;->LS:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LO:Z
 
     if-nez v0, :cond_2
 
-    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->hl()V
+    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->hj()V
 
     :cond_2
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     return-void
 .end method
 
-.method public final hk()Z
+.method public final hi()Z
     .locals 4
 
     const/4 v0, 0x2
@@ -1455,7 +1455,7 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->GI:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->GE: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;->hf()Z
+    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->hd()Z
 
     move-result v0
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LM:Lcom/facebook/drawee/a/c;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LI:Lcom/facebook/drawee/a/c;
 
-    iget v1, v0, Lcom/facebook/drawee/a/c;->LJ:I
+    iget v1, v0, Lcom/facebook/drawee/a/c;->LF:I
 
     const/4 v2, 0x1
 
     add-int/2addr v1, v2
 
-    iput v1, v0, Lcom/facebook/drawee/a/c;->LJ:I
+    iput v1, v0, Lcom/facebook/drawee/a/c;->LF:I
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LQ:Lcom/facebook/drawee/d/c;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LM:Lcom/facebook/drawee/d/c;
 
     invoke-interface {v0}, Lcom/facebook/drawee/d/c;->reset()V
 
-    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->hl()V
+    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->hj()V
 
     return v2
 
@@ -1502,7 +1502,7 @@
     return v0
 .end method
 
-.method public final hm()Landroid/graphics/drawable/Animatable;
+.method public final hk()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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     const/4 v0, 0x2
 
@@ -1536,7 +1536,7 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->GI:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->GE: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;->LK:Lcom/facebook/drawee/a/b;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LG:Lcom/facebook/drawee/a/b;
 
-    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;->Ll: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;->Kq:Lcom/facebook/drawee/a/a;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Km:Lcom/facebook/drawee/a/a;
 
-    invoke-static {}, Lcom/facebook/drawee/a/a;->hc()V
+    invoke-static {}, Lcom/facebook/drawee/a/a;->ha()V
 
-    iget-object v1, v0, Lcom/facebook/drawee/a/a;->Lb:Ljava/util/Set;
+    iget-object v1, v0, Lcom/facebook/drawee/a/a;->KX: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;->Lb:Ljava/util/Set;
+    iget-object v1, v0, Lcom/facebook/drawee/a/a;->KX: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;->Lc:Landroid/os/Handler;
+    iget-object v1, v0, Lcom/facebook/drawee/a/a;->KY:Landroid/os/Handler;
 
-    iget-object v0, v0, Lcom/facebook/drawee/a/a;->Ld:Ljava/lang/Runnable;
+    iget-object v0, v0, Lcom/facebook/drawee/a/a;->KZ:Ljava/lang/Runnable;
 
     invoke-virtual {v1, v0}, Landroid/os/Handler;->post(Ljava/lang/Runnable;)Z
 
     :cond_1
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     return-void
 .end method
@@ -1608,7 +1608,7 @@
 
     if-eqz v1, :cond_0
 
-    sget-object v1, Lcom/facebook/drawee/controller/AbstractDraweeController;->GI:Ljava/lang/Class;
+    sget-object v1, Lcom/facebook/drawee/controller/AbstractDraweeController;->GE: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;->LN:Lcom/facebook/drawee/c/a;
+    iget-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LJ: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;->Pe:Z
+    iget-boolean v1, v1, Lcom/facebook/drawee/c/a;->Pa:Z
 
     if-nez v1, :cond_3
 
-    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->hf()Z
+    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->hd()Z
 
     move-result v1
 
@@ -1651,7 +1651,7 @@
 
     :cond_3
     :goto_0
-    iget-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LN:Lcom/facebook/drawee/c/a;
+    iget-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LJ: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;->Pe:Z
+    iput-boolean v2, v1, Lcom/facebook/drawee/c/a;->Pa:Z
 
     goto :goto_1
 
@@ -1681,7 +1681,7 @@
 
     move-result v0
 
-    iget v3, v1, Lcom/facebook/drawee/c/a;->Ph:F
+    iget v3, v1, Lcom/facebook/drawee/c/a;->Pd:F
 
     sub-float/2addr v0, v3
 
@@ -1689,7 +1689,7 @@
 
     move-result v0
 
-    iget v3, v1, Lcom/facebook/drawee/c/a;->Pd:F
+    iget v3, v1, Lcom/facebook/drawee/c/a;->OZ:F
 
     cmpl-float v0, v0, v3
 
@@ -1699,7 +1699,7 @@
 
     move-result p1
 
-    iget v0, v1, Lcom/facebook/drawee/c/a;->Pi:F
+    iget v0, v1, Lcom/facebook/drawee/c/a;->Pe:F
 
     sub-float/2addr p1, v0
 
@@ -1707,25 +1707,25 @@
 
     move-result p1
 
-    iget v0, v1, Lcom/facebook/drawee/c/a;->Pd:F
+    iget v0, v1, Lcom/facebook/drawee/c/a;->OZ:F
 
     cmpl-float p1, p1, v0
 
     if-lez p1, :cond_c
 
     :cond_6
-    iput-boolean v2, v1, Lcom/facebook/drawee/c/a;->Pf:Z
+    iput-boolean v2, v1, Lcom/facebook/drawee/c/a;->Pb:Z
 
     goto :goto_2
 
     :cond_7
-    iput-boolean v2, v1, Lcom/facebook/drawee/c/a;->Pe:Z
+    iput-boolean v2, v1, Lcom/facebook/drawee/c/a;->Pa:Z
 
     invoke-virtual {p1}, Landroid/view/MotionEvent;->getX()F
 
     move-result v0
 
-    iget v3, v1, Lcom/facebook/drawee/c/a;->Ph:F
+    iget v3, v1, Lcom/facebook/drawee/c/a;->Pd:F
 
     sub-float/2addr v0, v3
 
@@ -1733,7 +1733,7 @@
 
     move-result v0
 
-    iget v3, v1, Lcom/facebook/drawee/c/a;->Pd:F
+    iget v3, v1, Lcom/facebook/drawee/c/a;->OZ:F
 
     cmpl-float v0, v0, v3
 
@@ -1743,7 +1743,7 @@
 
     move-result v0
 
-    iget v3, v1, Lcom/facebook/drawee/c/a;->Pi:F
+    iget v3, v1, Lcom/facebook/drawee/c/a;->Pe:F
 
     sub-float/2addr v0, v3
 
@@ -1751,17 +1751,17 @@
 
     move-result v0
 
-    iget v3, v1, Lcom/facebook/drawee/c/a;->Pd:F
+    iget v3, v1, Lcom/facebook/drawee/c/a;->OZ:F
 
     cmpl-float v0, v0, v3
 
     if-lez v0, :cond_9
 
     :cond_8
-    iput-boolean v2, v1, Lcom/facebook/drawee/c/a;->Pf:Z
+    iput-boolean v2, v1, Lcom/facebook/drawee/c/a;->Pb:Z
 
     :cond_9
-    iget-boolean v0, v1, Lcom/facebook/drawee/c/a;->Pf:Z
+    iget-boolean v0, v1, Lcom/facebook/drawee/c/a;->Pb:Z
 
     if-eqz v0, :cond_a
 
@@ -1769,7 +1769,7 @@
 
     move-result-wide v5
 
-    iget-wide v7, v1, Lcom/facebook/drawee/c/a;->Pg:J
+    iget-wide v7, v1, Lcom/facebook/drawee/c/a;->Pc:J
 
     sub-long/2addr v5, v7
 
@@ -1783,42 +1783,42 @@
 
     if-gtz p1, :cond_a
 
-    iget-object p1, v1, Lcom/facebook/drawee/c/a;->Pc:Lcom/facebook/drawee/c/a$a;
+    iget-object p1, v1, Lcom/facebook/drawee/c/a;->OY:Lcom/facebook/drawee/c/a$a;
 
     if-eqz p1, :cond_a
 
-    iget-object p1, v1, Lcom/facebook/drawee/c/a;->Pc:Lcom/facebook/drawee/c/a$a;
+    iget-object p1, v1, Lcom/facebook/drawee/c/a;->OY:Lcom/facebook/drawee/c/a$a;
 
-    invoke-interface {p1}, Lcom/facebook/drawee/c/a$a;->hk()Z
+    invoke-interface {p1}, Lcom/facebook/drawee/c/a$a;->hi()Z
 
     :cond_a
     :goto_1
-    iput-boolean v2, v1, Lcom/facebook/drawee/c/a;->Pf:Z
+    iput-boolean v2, v1, Lcom/facebook/drawee/c/a;->Pb:Z
 
     goto :goto_2
 
     :cond_b
-    iput-boolean v4, v1, Lcom/facebook/drawee/c/a;->Pe:Z
+    iput-boolean v4, v1, Lcom/facebook/drawee/c/a;->Pa:Z
 
-    iput-boolean v4, v1, Lcom/facebook/drawee/c/a;->Pf:Z
+    iput-boolean v4, v1, Lcom/facebook/drawee/c/a;->Pb:Z
 
     invoke-virtual {p1}, Landroid/view/MotionEvent;->getEventTime()J
 
     move-result-wide v2
 
-    iput-wide v2, v1, Lcom/facebook/drawee/c/a;->Pg:J
+    iput-wide v2, v1, Lcom/facebook/drawee/c/a;->Pc:J
 
     invoke-virtual {p1}, Landroid/view/MotionEvent;->getX()F
 
     move-result v0
 
-    iput v0, v1, Lcom/facebook/drawee/c/a;->Ph:F
+    iput v0, v1, Lcom/facebook/drawee/c/a;->Pd:F
 
     invoke-virtual {p1}, Landroid/view/MotionEvent;->getY()F
 
     move-result p1
 
-    iput p1, v1, Lcom/facebook/drawee/c/a;->Pi:F
+    iput p1, v1, Lcom/facebook/drawee/c/a;->Pe: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;->LK:Lcom/facebook/drawee/a/b;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LG:Lcom/facebook/drawee/a/b;
 
-    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;->Lm: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;->LM:Lcom/facebook/drawee/a/c;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LI:Lcom/facebook/drawee/a/c;
 
     if-eqz v0, :cond_0
 
     const/4 v1, 0x0
 
-    iput v1, v0, Lcom/facebook/drawee/a/c;->LJ:I
+    iput v1, v0, Lcom/facebook/drawee/a/c;->LF:I
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LN:Lcom/facebook/drawee/c/a;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LJ: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;->LQ:Lcom/facebook/drawee/d/c;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LM: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;->hg()V
+    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->he()V
 
     return-void
 .end method
@@ -1877,7 +1877,7 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->GI:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->GE: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;->LK:Lcom/facebook/drawee/a/b;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LG:Lcom/facebook/drawee/a/b;
 
     if-eqz p1, :cond_1
 
-    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;->Le:Lcom/facebook/drawee/a/b$a;
 
     goto :goto_0
 
     :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;->Lf: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;->LS:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LO:Z
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kq:Lcom/facebook/drawee/a/a;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Km: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;->LQ:Lcom/facebook/drawee/d/c;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LM: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;->LQ:Lcom/facebook/drawee/d/c;
+    iput-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LM: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;->LQ:Lcom/facebook/drawee/d/c;
+    iput-object p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LM:Lcom/facebook/drawee/d/c;
 
-    iget-object p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LQ:Lcom/facebook/drawee/d/c;
+    iget-object p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LM:Lcom/facebook/drawee/d/c;
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LR:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LN: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;->LS:Z
+    iget-boolean v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LO:Z
 
     const-string v2, "isRequestSubmitted"
 
@@ -1973,7 +1973,7 @@
 
     move-result-object v0
 
-    iget-boolean v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LV:Z
+    iget-boolean v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LQ:Z
 
     const-string v2, "hasFetchFailed"
 
@@ -1981,7 +1981,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LZ:Ljava/lang/Object;
+    iget-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LV: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;->LK:Lcom/facebook/drawee/a/b;
+    iget-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LG: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 04fc200c79..c105eb642f 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 Md:Lcom/facebook/drawee/controller/ControllerListener;
+.field private static final LZ: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 Me:Ljava/lang/NullPointerException;
+.field private static final Ma:Ljava/lang/NullPointerException;
 
-.field private static final Ml:Ljava/util/concurrent/atomic/AtomicLong;
+.field private static final Mh:Ljava/util/concurrent/atomic/AtomicLong;
 
 
 # instance fields
-.field private Kg:Lcom/facebook/common/d/l;
+.field private Kc: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 Ko:Ljava/util/Set;
+.field private final Kk:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -72,19 +72,19 @@
     .end annotation
 .end field
 
-.field public Ky:Ljava/lang/Object;
+.field public Ku:Ljava/lang/Object;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private LH:Z
+.field private LD:Z
 
-.field private LO:Lcom/facebook/drawee/controller/c;
+.field private LK:Lcom/facebook/drawee/controller/c;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public LP:Lcom/facebook/drawee/controller/ControllerListener;
+.field public LL:Lcom/facebook/drawee/controller/ControllerListener;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/drawee/controller/ControllerListener<",
@@ -96,11 +96,11 @@
     .end annotation
 .end field
 
-.field private LW:Z
+.field private LR:Z
 
-.field private LX:Ljava/lang/String;
+.field private LS:Ljava/lang/String;
 
-.field public Mf:Ljava/lang/Object;
+.field public Mb:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TREQUEST;"
@@ -111,7 +111,7 @@
     .end annotation
 .end field
 
-.field private Mg:Ljava/lang/Object;
+.field private Mc:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TREQUEST;"
@@ -122,7 +122,7 @@
     .end annotation
 .end field
 
-.field public Mh:[Ljava/lang/Object;
+.field public Md:[Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "[TREQUEST;"
@@ -133,11 +133,11 @@
     .end annotation
 .end field
 
-.field public Mi:Z
+.field public Me:Z
 
-.field public Mj:Z
+.field public Mf:Z
 
-.field public Mk:Lcom/facebook/drawee/d/a;
+.field public Mg: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;->Md:Lcom/facebook/drawee/controller/ControllerListener;
+    sput-object v0, Lcom/facebook/drawee/controller/a;->LZ: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;->Me:Ljava/lang/NullPointerException;
+    sput-object v0, Lcom/facebook/drawee/controller/a;->Ma: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;->Ml:Ljava/util/concurrent/atomic/AtomicLong;
+    sput-object v0, Lcom/facebook/drawee/controller/a;->Mh: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;->Ko:Ljava/util/Set;
+    iput-object p2, p0, Lcom/facebook/drawee/controller/a;->Kk:Ljava/util/Set;
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/facebook/drawee/controller/a;->Ky:Ljava/lang/Object;
+    iput-object p1, p0, Lcom/facebook/drawee/controller/a;->Ku: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;->Mb: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;->Mc:Ljava/lang/Object;
 
-    iput-object p1, p0, Lcom/facebook/drawee/controller/a;->Mh:[Ljava/lang/Object;
+    iput-object p1, p0, Lcom/facebook/drawee/controller/a;->Md:[Ljava/lang/Object;
 
     const/4 p2, 0x1
 
-    iput-boolean p2, p0, Lcom/facebook/drawee/controller/a;->Mi:Z
+    iput-boolean p2, p0, Lcom/facebook/drawee/controller/a;->Me:Z
 
-    iput-object p1, p0, Lcom/facebook/drawee/controller/a;->LP:Lcom/facebook/drawee/controller/ControllerListener;
+    iput-object p1, p0, Lcom/facebook/drawee/controller/a;->LL:Lcom/facebook/drawee/controller/ControllerListener;
 
-    iput-object p1, p0, Lcom/facebook/drawee/controller/a;->LO:Lcom/facebook/drawee/controller/c;
+    iput-object p1, p0, Lcom/facebook/drawee/controller/a;->LK:Lcom/facebook/drawee/controller/c;
 
     const/4 p2, 0x0
 
-    iput-boolean p2, p0, Lcom/facebook/drawee/controller/a;->LH:Z
+    iput-boolean p2, p0, Lcom/facebook/drawee/controller/a;->LD:Z
 
-    iput-boolean p2, p0, Lcom/facebook/drawee/controller/a;->Mj:Z
+    iput-boolean p2, p0, Lcom/facebook/drawee/controller/a;->Mf:Z
 
-    iput-object p1, p0, Lcom/facebook/drawee/controller/a;->Mk:Lcom/facebook/drawee/d/a;
+    iput-object p1, p0, Lcom/facebook/drawee/controller/a;->Mg:Lcom/facebook/drawee/d/a;
 
-    iput-object p1, p0, Lcom/facebook/drawee/controller/a;->LX:Ljava/lang/String;
+    iput-object p1, p0, Lcom/facebook/drawee/controller/a;->LS:Ljava/lang/String;
 
     return-void
 .end method
@@ -235,7 +235,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/facebook/drawee/controller/a$a;->Ms:Lcom/facebook/drawee/controller/a$a;
+    sget-object v0, Lcom/facebook/drawee/controller/a$a;->Mo: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;->Ky:Ljava/lang/Object;
+    iget-object v5, p0, Lcom/facebook/drawee/controller/a;->Ku:Ljava/lang/Object;
 
     new-instance v7, Lcom/facebook/drawee/controller/a$2;
 
@@ -281,10 +281,10 @@
     return-object v7
 .end method
 
-.method protected static hs()Ljava/lang/String;
+.method protected static hq()Ljava/lang/String;
     .locals 2
 
-    sget-object v0, Lcom/facebook/drawee/controller/a;->Ml:Ljava/util/concurrent/atomic/AtomicLong;
+    sget-object v0, Lcom/facebook/drawee/controller/a;->Mh: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;->Kg:Lcom/facebook/common/d/l;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/a;->Kc: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;->Mf:Ljava/lang/Object;
+    iget-object v1, p0, Lcom/facebook/drawee/controller/a;->Mb: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;->Mh:[Ljava/lang/Object;
+    iget-object v1, p0, Lcom/facebook/drawee/controller/a;->Md:[Ljava/lang/Object;
 
     if-eqz v1, :cond_4
 
-    iget-boolean v0, p0, Lcom/facebook/drawee/controller/a;->Mi:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/controller/a;->Me: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;->Mu:Lcom/facebook/drawee/controller/a$a;
+    sget-object v6, Lcom/facebook/drawee/controller/a$a;->Mq: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;->Mg:Ljava/lang/Object;
+    iget-object v1, p0, Lcom/facebook/drawee/controller/a;->Mc: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;->Mg:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/a;->Mc: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;->Me:Ljava/lang/NullPointerException;
+    sget-object p1, Lcom/facebook/drawee/controller/a;->Ma: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;->Mk:Lcom/facebook/drawee/d/a;
+    iput-object p1, p0, Lcom/facebook/drawee/controller/a;->Mg: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;->Mk:Lcom/facebook/drawee/d/a;
+    iput-object p1, p0, Lcom/facebook/drawee/controller/a;->Mg:Lcom/facebook/drawee/d/a;
 
     return-object p0
 .end method
 
-.method protected abstract gX()Lcom/facebook/drawee/controller/AbstractDraweeController;
+.method protected abstract gV()Lcom/facebook/drawee/controller/AbstractDraweeController;
 .end method
 
-.method public final hn()Ljava/lang/Object;
+.method public final hl()Ljava/lang/Object;
     .locals 1
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/a;->Ky:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/a;->Ku:Ljava/lang/Object;
 
     return-object v0
 .end method
 
-.method public final ho()Ljava/lang/Object;
+.method public final hm()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;->Mf:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/a;->Mb:Ljava/lang/Object;
 
     return-object v0
 .end method
 
-.method public final hp()Lcom/facebook/drawee/controller/a;
+.method public final hn()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;->LH:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/controller/a;->LD:Z
 
     return-object p0
 .end method
 
-.method public final hq()Lcom/facebook/drawee/d/a;
+.method public final ho()Lcom/facebook/drawee/d/a;
     .locals 1
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/a;->Mk:Lcom/facebook/drawee/d/a;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/a;->Mg:Lcom/facebook/drawee/d/a;
 
     return-object v0
 .end method
 
-.method public final hr()Lcom/facebook/drawee/controller/AbstractDraweeController;
+.method public final hp()Lcom/facebook/drawee/controller/AbstractDraweeController;
     .locals 4
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/a;->Mh:[Ljava/lang/Object;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/a;->Md:[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;->Mf:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/a;->Mb: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;->Kg:Lcom/facebook/common/d/l;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/a;->Kc:Lcom/facebook/common/d/l;
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/a;->Mh:[Ljava/lang/Object;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/a;->Md:[Ljava/lang/Object;
 
     if-nez v0, :cond_3
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/a;->Mf:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/a;->Mb:Ljava/lang/Object;
 
     if-nez v0, :cond_3
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/a;->Mg:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/a;->Mc: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;->Mf:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/a;->Mb:Ljava/lang/Object;
 
     if-nez v0, :cond_4
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/a;->Mh:[Ljava/lang/Object;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/a;->Md:[Ljava/lang/Object;
 
     if-nez v0, :cond_4
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/a;->Mg:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/a;->Mc:Ljava/lang/Object;
 
     if-eqz v0, :cond_4
 
-    iput-object v0, p0, Lcom/facebook/drawee/controller/a;->Mf:Ljava/lang/Object;
+    iput-object v0, p0, Lcom/facebook/drawee/controller/a;->Mb:Ljava/lang/Object;
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/facebook/drawee/controller/a;->Mg:Ljava/lang/Object;
+    iput-object v0, p0, Lcom/facebook/drawee/controller/a;->Mc:Ljava/lang/Object;
 
     :cond_4
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
-    invoke-virtual {p0}, Lcom/facebook/drawee/controller/a;->gX()Lcom/facebook/drawee/controller/AbstractDraweeController;
+    invoke-virtual {p0}, Lcom/facebook/drawee/controller/a;->gV()Lcom/facebook/drawee/controller/AbstractDraweeController;
 
     move-result-object v0
 
-    iget-boolean v1, p0, Lcom/facebook/drawee/controller/a;->LW:Z
+    iget-boolean v1, p0, Lcom/facebook/drawee/controller/a;->LR:Z
 
-    iput-boolean v1, v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LW:Z
+    iput-boolean v1, v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LR:Z
 
-    iget-object v1, p0, Lcom/facebook/drawee/controller/a;->LX:Ljava/lang/String;
+    iget-object v1, p0, Lcom/facebook/drawee/controller/a;->LS:Ljava/lang/String;
 
-    iput-object v1, v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LX:Ljava/lang/String;
+    iput-object v1, v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LS:Ljava/lang/String;
 
-    iget-object v1, p0, Lcom/facebook/drawee/controller/a;->LO:Lcom/facebook/drawee/controller/c;
+    iget-object v1, p0, Lcom/facebook/drawee/controller/a;->LK:Lcom/facebook/drawee/controller/c;
 
-    iput-object v1, v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LO:Lcom/facebook/drawee/controller/c;
+    iput-object v1, v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LK:Lcom/facebook/drawee/controller/c;
 
-    iget-boolean v1, p0, Lcom/facebook/drawee/controller/a;->LH:Z
+    iget-boolean v1, p0, Lcom/facebook/drawee/controller/a;->LD:Z
 
     if-eqz v1, :cond_6
 
-    iget-object v1, v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LM:Lcom/facebook/drawee/a/c;
+    iget-object v1, v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LI: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;->LM:Lcom/facebook/drawee/a/c;
+    iput-object v1, v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LI:Lcom/facebook/drawee/a/c;
 
     :cond_5
-    iget-object v1, v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LM:Lcom/facebook/drawee/a/c;
+    iget-object v1, v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LI:Lcom/facebook/drawee/a/c;
 
-    iget-boolean v2, p0, Lcom/facebook/drawee/controller/a;->LH:Z
+    iget-boolean v2, p0, Lcom/facebook/drawee/controller/a;->LD:Z
 
-    iput-boolean v2, v1, Lcom/facebook/drawee/a/c;->LH:Z
+    iput-boolean v2, v1, Lcom/facebook/drawee/a/c;->LD:Z
 
-    iget-object v1, v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LN:Lcom/facebook/drawee/c/a;
+    iget-object v1, v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LJ: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;->LN:Lcom/facebook/drawee/c/a;
+    iput-object v2, v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LJ:Lcom/facebook/drawee/c/a;
 
-    iget-object v1, v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LN:Lcom/facebook/drawee/c/a;
+    iget-object v1, v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LJ:Lcom/facebook/drawee/c/a;
 
     if-eqz v1, :cond_6
 
-    iget-object v1, v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LN:Lcom/facebook/drawee/c/a;
+    iget-object v1, v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LJ:Lcom/facebook/drawee/c/a;
 
-    iput-object v0, v1, Lcom/facebook/drawee/c/a;->Pc:Lcom/facebook/drawee/c/a$a;
+    iput-object v0, v1, Lcom/facebook/drawee/c/a;->OY:Lcom/facebook/drawee/c/a$a;
 
     :cond_6
-    iget-object v1, p0, Lcom/facebook/drawee/controller/a;->Ko:Ljava/util/Set;
+    iget-object v1, p0, Lcom/facebook/drawee/controller/a;->Kk: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;->LP:Lcom/facebook/drawee/controller/ControllerListener;
+    iget-object v1, p0, Lcom/facebook/drawee/controller/a;->LL: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;->Mj:Z
+    iget-boolean v1, p0, Lcom/facebook/drawee/controller/a;->Mf:Z
 
     if-eqz v1, :cond_9
 
-    sget-object v1, Lcom/facebook/drawee/controller/a;->Md:Lcom/facebook/drawee/controller/ControllerListener;
+    sget-object v1, Lcom/facebook/drawee/controller/a;->LZ: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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     return-object v0
 .end method
 
-.method public final synthetic ht()Lcom/facebook/drawee/d/a;
+.method public final synthetic hr()Lcom/facebook/drawee/d/a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/facebook/drawee/controller/a;->hr()Lcom/facebook/drawee/controller/AbstractDraweeController;
+    invoke-virtual {p0}, Lcom/facebook/drawee/controller/a;->hp()Lcom/facebook/drawee/controller/AbstractDraweeController;
 
     move-result-object v0
 
@@ -740,7 +740,7 @@
         }
     .end annotation
 
-    iput-boolean p1, p0, Lcom/facebook/drawee/controller/a;->Mj:Z
+    iput-boolean p1, p0, Lcom/facebook/drawee/controller/a;->Mf:Z
 
     return-object p0
 .end method
@@ -754,7 +754,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/facebook/drawee/controller/a;->Mf:Ljava/lang/Object;
+    iput-object p1, p0, Lcom/facebook/drawee/controller/a;->Mb: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 5bdd5385e8..e08e0070c2 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 hu()V
+.method public final declared-synchronized hs()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 768e64ca14..1b1815a4e1 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 hj()V
+.method public abstract hh()V
 .end method
 
-.method public abstract hm()Landroid/graphics/drawable/Animatable;
+.method public abstract hk()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 740663c3a7..d5b0302183 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 hN()V
+.method public abstract hL()V
 .end method
 
-.method public abstract hO()V
+.method public abstract hM()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 651b703583..e168cc51a0 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 ht()Lcom/facebook/drawee/d/a;
+.method public abstract hr()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 fd6a737e44..0c1d1e0e26 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;->hv()Landroid/graphics/drawable/Drawable;
+    invoke-interface {p0}, Lcom/facebook/drawee/drawable/c;->ht()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;->MT:[Landroid/graphics/drawable/Drawable;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/a;->MP:[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 f17ef2471f..89afd185db 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 MR:Lcom/facebook/drawee/drawable/r;
+.field private MN:Lcom/facebook/drawee/drawable/r;
 
-.field private final MS:Lcom/facebook/drawee/drawable/d;
+.field private final MO:Lcom/facebook/drawee/drawable/d;
 
-.field public final MT:[Landroid/graphics/drawable/Drawable;
+.field public final MP:[Landroid/graphics/drawable/Drawable;
 
-.field public final MU:[Lcom/facebook/drawee/drawable/c;
+.field public final MQ:[Lcom/facebook/drawee/drawable/c;
 
-.field private MV:Z
+.field private MR:Z
 
-.field private MW:Z
+.field private MS:Z
 
-.field private MX:Z
+.field private MT: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;->MS:Lcom/facebook/drawee/drawable/d;
+    iput-object v0, p0, Lcom/facebook/drawee/drawable/a;->MO: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;->MV:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/drawable/a;->MR:Z
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/drawable/a;->MW:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/drawable/a;->MS:Z
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/drawable/a;->MX:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/drawable/a;->MT: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;->MT:[Landroid/graphics/drawable/Drawable;
+    iput-object p1, p0, Lcom/facebook/drawee/drawable/a;->MP:[Landroid/graphics/drawable/Drawable;
 
     :goto_0
-    iget-object p1, p0, Lcom/facebook/drawee/drawable/a;->MT:[Landroid/graphics/drawable/Drawable;
+    iget-object p1, p0, Lcom/facebook/drawee/drawable/a;->MP:[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;->MU:[Lcom/facebook/drawee/drawable/c;
+    iput-object p1, p0, Lcom/facebook/drawee/drawable/a;->MQ:[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;->MT:[Landroid/graphics/drawable/Drawable;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/a;->MP:[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;->MT:[Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/a;->MP:[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;->MX:Z
+    iget-boolean v2, p0, Lcom/facebook/drawee/drawable/a;->MT: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;->MT:[Landroid/graphics/drawable/Drawable;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/a;->MP:[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;->MS:Lcom/facebook/drawee/drawable/d;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/a;->MO: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;->MW:Z
+    iput-boolean v1, p0, Lcom/facebook/drawee/drawable/a;->MS:Z
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/a;->MT:[Landroid/graphics/drawable/Drawable;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/a;->MP:[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;->MR:Lcom/facebook/drawee/drawable/r;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/a;->MN: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;->MR:Lcom/facebook/drawee/drawable/r;
+    iput-object p1, p0, Lcom/facebook/drawee/drawable/a;->MN: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;->MR:Lcom/facebook/drawee/drawable/r;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/a;->MN: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;->MT:[Landroid/graphics/drawable/Drawable;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/a;->MP:[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;->MT:[Landroid/graphics/drawable/Drawable;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/a;->MP:[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;->MT:[Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/a;->MP:[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;->MT:[Landroid/graphics/drawable/Drawable;
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/a;->MP:[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;->MT:[Landroid/graphics/drawable/Drawable;
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/a;->MP:[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;->MT:[Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/a;->MP:[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;->MT:[Landroid/graphics/drawable/Drawable;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/a;->MP:[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;->MT:[Landroid/graphics/drawable/Drawable;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/a;->MP:[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;->MW:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/a;->MS:Z
 
     if-nez v0, :cond_2
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/drawable/a;->MV:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/drawable/a;->MR:Z
 
     const/4 v1, 0x0
 
     :goto_0
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/a;->MT:[Landroid/graphics/drawable/Drawable;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/a;->MP:[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;->MV:Z
+    iget-boolean v3, p0, Lcom/facebook/drawee/drawable/a;->MR: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;->MV:Z
+    iput-boolean v2, p0, Lcom/facebook/drawee/drawable/a;->MR:Z
 
     add-int/lit8 v1, v1, 0x1
 
     goto :goto_0
 
     :cond_1
-    iput-boolean v4, p0, Lcom/facebook/drawee/drawable/a;->MW:Z
+    iput-boolean v4, p0, Lcom/facebook/drawee/drawable/a;->MS:Z
 
     :cond_2
-    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/a;->MV:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/a;->MR:Z
 
     return v0
 .end method
@@ -562,7 +562,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/a;->MT:[Landroid/graphics/drawable/Drawable;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/a;->MP:[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;->MX:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/drawable/a;->MT: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;->MT:[Landroid/graphics/drawable/Drawable;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/a;->MP:[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;->MT:[Landroid/graphics/drawable/Drawable;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/a;->MP:[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;->MT:[Landroid/graphics/drawable/Drawable;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/a;->MP:[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;->MS:Lcom/facebook/drawee/drawable/d;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/a;->MO: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;->MT:[Landroid/graphics/drawable/Drawable;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/a;->MP:[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;->MS:Lcom/facebook/drawee/drawable/d;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/a;->MO: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;->MT:[Landroid/graphics/drawable/Drawable;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/a;->MP:[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;->MS:Lcom/facebook/drawee/drawable/d;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/a;->MO: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;->MT:[Landroid/graphics/drawable/Drawable;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/a;->MP:[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;->MS:Lcom/facebook/drawee/drawable/d;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/a;->MO: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;->MT:[Landroid/graphics/drawable/Drawable;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/a;->MP:[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;->MT:[Landroid/graphics/drawable/Drawable;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/a;->MP:[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;->MT:[Landroid/graphics/drawable/Drawable;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/a;->MP:[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 2870172789..456292820c 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 hv()Landroid/graphics/drawable/Drawable;
+.method public abstract ht()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 40a6ed0b78..4864ce8a76 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 Nq:Landroid/graphics/Matrix;
+.field private static final Nm:Landroid/graphics/Matrix;
 
 
 # instance fields
-.field protected MR:Lcom/facebook/drawee/drawable/r;
+.field protected MN:Lcom/facebook/drawee/drawable/r;
 
-.field private final MS:Lcom/facebook/drawee/drawable/d;
+.field private final MO:Lcom/facebook/drawee/drawable/d;
 
-.field private Np:Landroid/graphics/drawable/Drawable;
+.field private Nl: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;->Nq:Landroid/graphics/Matrix;
+    sput-object v0, Lcom/facebook/drawee/drawable/g;->Nm: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;->MS:Lcom/facebook/drawee/drawable/d;
+    iput-object v0, p0, Lcom/facebook/drawee/drawable/g;->MO:Lcom/facebook/drawee/drawable/d;
 
-    iput-object p1, p0, Lcom/facebook/drawee/drawable/g;->Np:Landroid/graphics/drawable/Drawable;
+    iput-object p1, p0, Lcom/facebook/drawee/drawable/g;->Nl:Landroid/graphics/drawable/Drawable;
 
-    iget-object p1, p0, Lcom/facebook/drawee/drawable/g;->Np:Landroid/graphics/drawable/Drawable;
+    iget-object p1, p0, Lcom/facebook/drawee/drawable/g;->Nl: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;->MR:Lcom/facebook/drawee/drawable/r;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->MN: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;->MR:Lcom/facebook/drawee/drawable/r;
+    iput-object p1, p0, Lcom/facebook/drawee/drawable/g;->MN: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;->Nq:Landroid/graphics/Matrix;
+    sget-object v0, Lcom/facebook/drawee/drawable/g;->Nm: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;->Nq:Landroid/graphics/Matrix;
+    sget-object v0, Lcom/facebook/drawee/drawable/g;->Nm: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;->MR:Lcom/facebook/drawee/drawable/r;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->MN: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;->Np:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->Nl: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;->Np:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->Nl: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;->MS:Lcom/facebook/drawee/drawable/d;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/g;->MO: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;->Np:Landroid/graphics/drawable/Drawable;
+    iput-object p1, p0, Lcom/facebook/drawee/drawable/g;->Nl: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;->Np:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->Nl: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;->Np:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->Nl: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;->Np:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->Nl: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;->Np:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->Nl: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;->Np:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->Nl: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;->Np:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->Nl:Landroid/graphics/drawable/Drawable;
 
     if-nez v0, :cond_0
 
@@ -311,7 +311,7 @@
     return p1
 .end method
 
-.method public final hv()Landroid/graphics/drawable/Drawable;
+.method public final ht()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;->Np:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->Nl: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;->Np:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->Nl: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;->Np:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->Nl: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;->Np:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->Nl: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;->Np:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->Nl: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;->MS:Lcom/facebook/drawee/drawable/d;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->MO:Lcom/facebook/drawee/drawable/d;
 
     iput p1, v0, Lcom/facebook/drawee/drawable/d;->mAlpha:I
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->Np:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->Nl: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;->MS:Lcom/facebook/drawee/drawable/d;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->MO: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;->Np:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->Nl: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;->MS:Lcom/facebook/drawee/drawable/d;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->MO: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;->Np:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->Nl: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;->MS:Lcom/facebook/drawee/drawable/d;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->MO: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;->Np:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->Nl: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;->Np:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->Nl: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;->Np:Landroid/graphics/drawable/Drawable;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/g;->Nl: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 03f325a991..7d323ad374 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 hC()V
+.method public abstract hA()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 975f8f40ef..3c53da9acf 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 Nx:Landroid/graphics/Paint;
+.field private final Nt:Landroid/graphics/Paint;
 
-.field private Ny:Ljava/lang/ref/WeakReference;
+.field private Nu: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;->Nx:Landroid/graphics/Paint;
+    iput-object p1, p0, Lcom/facebook/drawee/drawable/k;->Nt: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;->Nx:Landroid/graphics/Paint;
+    iget-object p1, p0, Lcom/facebook/drawee/drawable/k;->Nt: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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
-    invoke-virtual {p0}, Lcom/facebook/drawee/drawable/k;->hD()Z
+    invoke-virtual {p0}, Lcom/facebook/drawee/drawable/k;->hB()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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     return-void
 
     :cond_0
-    invoke-virtual {p0}, Lcom/facebook/drawee/drawable/k;->hH()V
+    invoke-virtual {p0}, Lcom/facebook/drawee/drawable/k;->hF()V
 
-    invoke-virtual {p0}, Lcom/facebook/drawee/drawable/k;->hE()V
+    invoke-virtual {p0}, Lcom/facebook/drawee/drawable/k;->hC()V
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/k;->Ny:Ljava/lang/ref/WeakReference;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/k;->Nu: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;->Ny:Ljava/lang/ref/WeakReference;
+    iput-object v0, p0, Lcom/facebook/drawee/drawable/k;->Nu: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;->NW:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/drawable/k;->NS:Z
 
     :cond_2
-    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/k;->NW:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/k;->NS:Z
 
     if-eqz v0, :cond_3
 
@@ -150,18 +150,18 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/k;->Oi:Landroid/graphics/Matrix;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/k;->Oe: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;->NW:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/drawable/k;->NS:Z
 
     :cond_3
     iget-object v0, p0, Lcom/facebook/drawee/drawable/k;->mPaint:Landroid/graphics/Paint;
 
-    invoke-virtual {p0}, Lcom/facebook/drawee/drawable/k;->hG()Z
+    invoke-virtual {p0}, Lcom/facebook/drawee/drawable/k;->hE()Z
 
     move-result v1
 
@@ -171,7 +171,7 @@
 
     move-result v0
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/k;->Og:Landroid/graphics/Matrix;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/k;->Oc: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;->ND:F
+    iget v1, p0, Lcom/facebook/drawee/drawable/k;->Nz:F
 
     const/4 v2, 0x0
 
@@ -189,15 +189,15 @@
 
     if-lez v1, :cond_4
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/k;->Nx:Landroid/graphics/Paint;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/k;->Nt:Landroid/graphics/Paint;
 
-    iget v2, p0, Lcom/facebook/drawee/drawable/k;->ND:F
+    iget v2, p0, Lcom/facebook/drawee/drawable/k;->Nz:F
 
     invoke-virtual {v1, v2}, Landroid/graphics/Paint;->setStrokeWidth(F)V
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/k;->Nx:Landroid/graphics/Paint;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/k;->Nt:Landroid/graphics/Paint;
 
-    iget v2, p0, Lcom/facebook/drawee/drawable/k;->NE:I
+    iget v2, p0, Lcom/facebook/drawee/drawable/k;->NA: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;->NH:Landroid/graphics/Path;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/k;->ND:Landroid/graphics/Path;
 
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/k;->Nx:Landroid/graphics/Paint;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/k;->Nt: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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     return-void
 .end method
 
-.method final hD()Z
+.method final hB()Z
     .locals 1
 
-    invoke-super {p0}, Lcom/facebook/drawee/drawable/n;->hD()Z
+    invoke-super {p0}, Lcom/facebook/drawee/drawable/n;->hB()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 401c0dd187..deb7955834 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 final NA:[F
+.field private NA:I
 
-.field NB:[F
+.field private NB:Z
+
+.field private NC:Z
+
+.field final ND:Landroid/graphics/Path;
+
+.field private final NE:Landroid/graphics/RectF;
+
+.field private final Nv:[F
+
+.field final Nw:[F
+
+.field Nx:[F
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private NC:Z
+.field private Ny:Z
 
-.field private ND:F
-
-.field private NE:I
-
-.field private NF:Z
-
-.field private NG:Z
-
-.field final NH:Landroid/graphics/Path;
-
-.field private final NI:Landroid/graphics/RectF;
-
-.field private final Nz:[F
+.field private Nz:F
 
 .field private mAlpha:I
 
@@ -51,11 +51,11 @@
 
     new-array v1, v0, [F
 
-    iput-object v1, p0, Lcom/facebook/drawee/drawable/l;->Nz:[F
+    iput-object v1, p0, Lcom/facebook/drawee/drawable/l;->Nv:[F
 
     new-array v0, v0, [F
 
-    iput-object v0, p0, Lcom/facebook/drawee/drawable/l;->NA:[F
+    iput-object v0, p0, Lcom/facebook/drawee/drawable/l;->Nw:[F
 
     new-instance v0, Landroid/graphics/Paint;
 
@@ -67,19 +67,19 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/drawable/l;->NC:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/drawable/l;->Ny:Z
 
     const/4 v1, 0x0
 
-    iput v1, p0, Lcom/facebook/drawee/drawable/l;->ND:F
+    iput v1, p0, Lcom/facebook/drawee/drawable/l;->Nz:F
 
     iput v1, p0, Lcom/facebook/drawee/drawable/l;->mPadding:F
 
-    iput v0, p0, Lcom/facebook/drawee/drawable/l;->NE:I
+    iput v0, p0, Lcom/facebook/drawee/drawable/l;->NA:I
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/drawable/l;->NF:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/drawable/l;->NB:Z
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/drawable/l;->NG:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/drawable/l;->NC: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;->NH:Landroid/graphics/Path;
+    iput-object v1, p0, Lcom/facebook/drawee/drawable/l;->ND: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;->NI:Landroid/graphics/RectF;
+    iput-object v0, p0, Lcom/facebook/drawee/drawable/l;->NE:Landroid/graphics/RectF;
 
     const/16 v0, 0xff
 
@@ -131,18 +131,18 @@
     return-object v0
 .end method
 
-.method private hE()V
+.method private hC()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;->NH:Landroid/graphics/Path;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/l;->ND:Landroid/graphics/Path;
 
     invoke-virtual {v0}, Landroid/graphics/Path;->reset()V
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/l;->NI:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/l;->NE: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;->NI:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/l;->NE:Landroid/graphics/RectF;
 
-    iget v1, p0, Lcom/facebook/drawee/drawable/l;->ND:F
+    iget v1, p0, Lcom/facebook/drawee/drawable/l;->Nz: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;->NC:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/l;->Ny:Z
 
     const/4 v1, 0x0
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/l;->NI:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/l;->NE:Landroid/graphics/RectF;
 
     invoke-virtual {v0}, Landroid/graphics/RectF;->width()F
 
     move-result v0
 
-    iget-object v3, p0, Lcom/facebook/drawee/drawable/l;->NI:Landroid/graphics/RectF;
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/l;->NE: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;->NH:Landroid/graphics/Path;
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/l;->ND:Landroid/graphics/Path;
 
-    iget-object v4, p0, Lcom/facebook/drawee/drawable/l;->NI:Landroid/graphics/RectF;
+    iget-object v4, p0, Lcom/facebook/drawee/drawable/l;->NE:Landroid/graphics/RectF;
 
     invoke-virtual {v4}, Landroid/graphics/RectF;->centerX()F
 
     move-result v4
 
-    iget-object v5, p0, Lcom/facebook/drawee/drawable/l;->NI:Landroid/graphics/RectF;
+    iget-object v5, p0, Lcom/facebook/drawee/drawable/l;->NE: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;->NA:[F
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/l;->Nw:[F
 
     array-length v4, v3
 
     if-ge v0, v4, :cond_1
 
-    iget-object v4, p0, Lcom/facebook/drawee/drawable/l;->Nz:[F
+    iget-object v4, p0, Lcom/facebook/drawee/drawable/l;->Nv:[F
 
     aget v4, v4, v0
 
@@ -224,7 +224,7 @@
 
     add-float/2addr v4, v5
 
-    iget v5, p0, Lcom/facebook/drawee/drawable/l;->ND:F
+    iget v5, p0, Lcom/facebook/drawee/drawable/l;->Nz:F
 
     div-float/2addr v5, v2
 
@@ -237,18 +237,18 @@
     goto :goto_0
 
     :cond_1
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/l;->NH:Landroid/graphics/Path;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/l;->ND:Landroid/graphics/Path;
 
-    iget-object v4, p0, Lcom/facebook/drawee/drawable/l;->NI:Landroid/graphics/RectF;
+    iget-object v4, p0, Lcom/facebook/drawee/drawable/l;->NE: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;->NI:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/l;->NE:Landroid/graphics/RectF;
 
-    iget v3, p0, Lcom/facebook/drawee/drawable/l;->ND:F
+    iget v3, p0, Lcom/facebook/drawee/drawable/l;->Nz: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;->NF:Z
+    iget-boolean v3, p0, Lcom/facebook/drawee/drawable/l;->NB:Z
 
     if-eqz v3, :cond_2
 
-    iget v3, p0, Lcom/facebook/drawee/drawable/l;->ND:F
+    iget v3, p0, Lcom/facebook/drawee/drawable/l;->Nz:F
 
     goto :goto_2
 
@@ -276,21 +276,21 @@
     :goto_2
     add-float/2addr v0, v3
 
-    iget-object v3, p0, Lcom/facebook/drawee/drawable/l;->NI:Landroid/graphics/RectF;
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/l;->NE:Landroid/graphics/RectF;
 
     invoke-virtual {v3, v0, v0}, Landroid/graphics/RectF;->inset(FF)V
 
-    iget-boolean v3, p0, Lcom/facebook/drawee/drawable/l;->NC:Z
+    iget-boolean v3, p0, Lcom/facebook/drawee/drawable/l;->Ny:Z
 
     if-eqz v3, :cond_3
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/l;->NI:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/l;->NE:Landroid/graphics/RectF;
 
     invoke-virtual {v1}, Landroid/graphics/RectF;->width()F
 
     move-result v1
 
-    iget-object v3, p0, Lcom/facebook/drawee/drawable/l;->NI:Landroid/graphics/RectF;
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/l;->NE: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;->NI:Landroid/graphics/RectF;
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/l;->NE:Landroid/graphics/RectF;
 
     invoke-virtual {v3}, Landroid/graphics/RectF;->centerX()F
 
     move-result v3
 
-    iget-object v4, p0, Lcom/facebook/drawee/drawable/l;->NI:Landroid/graphics/RectF;
+    iget-object v4, p0, Lcom/facebook/drawee/drawable/l;->NE: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;->NF:Z
+    iget-boolean v2, p0, Lcom/facebook/drawee/drawable/l;->NB:Z
 
     if-eqz v2, :cond_6
 
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/l;->NB:[F
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/l;->Nx:[F
 
     if-nez v2, :cond_4
 
@@ -335,21 +335,21 @@
 
     new-array v2, v2, [F
 
-    iput-object v2, p0, Lcom/facebook/drawee/drawable/l;->NB:[F
+    iput-object v2, p0, Lcom/facebook/drawee/drawable/l;->Nx:[F
 
     :cond_4
     :goto_3
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/l;->NB:[F
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/l;->Nx:[F
 
     array-length v3, v2
 
     if-ge v1, v3, :cond_5
 
-    iget-object v3, p0, Lcom/facebook/drawee/drawable/l;->Nz:[F
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/l;->Nv:[F
 
     aget v3, v3, v1
 
-    iget v4, p0, Lcom/facebook/drawee/drawable/l;->ND:F
+    iget v4, p0, Lcom/facebook/drawee/drawable/l;->Nz: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;->NI:Landroid/graphics/RectF;
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/l;->NE: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;->NI:Landroid/graphics/RectF;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/l;->NE:Landroid/graphics/RectF;
 
-    iget-object v3, p0, Lcom/facebook/drawee/drawable/l;->Nz:[F
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/l;->Nv:[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;->NI:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/l;->NE: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;->NE:I
+    iget v0, p0, Lcom/facebook/drawee/drawable/l;->NA:I
 
     if-eq v0, p1, :cond_0
 
-    iput p1, p0, Lcom/facebook/drawee/drawable/l;->NE:I
+    iput p1, p0, Lcom/facebook/drawee/drawable/l;->NA:I
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/l;->invalidateSelf()V
 
     :cond_0
-    iget p1, p0, Lcom/facebook/drawee/drawable/l;->ND:F
+    iget p1, p0, Lcom/facebook/drawee/drawable/l;->Nz:F
 
     cmpl-float p1, p1, p2
 
     if-eqz p1, :cond_1
 
-    iput p2, p0, Lcom/facebook/drawee/drawable/l;->ND:F
+    iput p2, p0, Lcom/facebook/drawee/drawable/l;->Nz:F
 
-    invoke-direct {p0}, Lcom/facebook/drawee/drawable/l;->hE()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/l;->hC()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;->Nz:[F
+    iget-object p1, p0, Lcom/facebook/drawee/drawable/l;->Nv:[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;->Nz:[F
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/l;->Nv:[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;->hE()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/l;->hC()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;->NG:Z
+    iget-boolean v1, p0, Lcom/facebook/drawee/drawable/l;->NC: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;->ND:F
+    iget v0, p0, Lcom/facebook/drawee/drawable/l;->Nz: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;->NE:I
+    iget v1, p0, Lcom/facebook/drawee/drawable/l;->NA: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;->ND:F
+    iget v1, p0, Lcom/facebook/drawee/drawable/l;->Nz:F
 
     invoke-virtual {v0, v1}, Landroid/graphics/Paint;->setStrokeWidth(F)V
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/l;->NH:Landroid/graphics/Path;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/l;->ND: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 hC()V
+.method public final hA()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;->Nz:[F
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/l;->Nv:[F
 
     const/4 v1, 0x0
 
     invoke-static {v0, v1}, Ljava/util/Arrays;->fill([FF)V
 
-    invoke-direct {p0}, Lcom/facebook/drawee/drawable/l;->hE()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/l;->hC()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;->hE()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/l;->hC()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;->hE()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/l;->hC()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;->NC:Z
+    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/l;->Ny:Z
 
-    invoke-direct {p0}, Lcom/facebook/drawee/drawable/l;->hE()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/l;->hC()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;->NF:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/l;->NB:Z
 
     if-eq v0, p1, :cond_0
 
-    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/l;->NF:Z
+    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/l;->NB:Z
 
-    invoke-direct {p0}, Lcom/facebook/drawee/drawable/l;->hE()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/l;->hC()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;->NG:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/l;->NC:Z
 
     if-eq v0, p1, :cond_0
 
-    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/l;->NG:Z
+    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/l;->NC: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 ba362fcc77..9535641967 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 final NA:[F
+.field private NA:I
+
+.field private NB:Z
 
 .field private NC:Z
 
-.field private ND:F
+.field private final ND:Landroid/graphics/Path;
 
-.field private NE:I
+.field NF:I
 
-.field private NF:Z
+.field private final NG:Landroid/graphics/RectF;
 
-.field private NG:Z
+.field private NH:Landroid/graphics/RectF;
+    .annotation runtime Ljavax/annotation/Nullable;
+    .end annotation
+.end field
 
-.field private final NH:Landroid/graphics/Path;
+.field private NI:Landroid/graphics/Matrix;
+    .annotation runtime Ljavax/annotation/Nullable;
+    .end annotation
+.end field
 
-.field NJ:I
+.field private NJ:I
 
 .field private final NK:Landroid/graphics/RectF;
 
-.field private NM:Landroid/graphics/RectF;
-    .annotation runtime Ljavax/annotation/Nullable;
-    .end annotation
-.end field
+.field private final Nv:[F
 
-.field private NN:Landroid/graphics/Matrix;
-    .annotation runtime Ljavax/annotation/Nullable;
-    .end annotation
-.end field
+.field final Nw:[F
 
-.field private NO:I
+.field private Ny:Z
 
-.field private final NP:Landroid/graphics/RectF;
-
-.field private final Nz:[F
+.field private 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;->NR:I
+    sget p1, Lcom/facebook/drawee/drawable/m$a;->NN:I
 
-    iput p1, p0, Lcom/facebook/drawee/drawable/m;->NJ:I
+    iput p1, p0, Lcom/facebook/drawee/drawable/m;->NF:I
 
     new-instance p1, Landroid/graphics/RectF;
 
     invoke-direct {p1}, Landroid/graphics/RectF;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/drawee/drawable/m;->NK:Landroid/graphics/RectF;
+    iput-object p1, p0, Lcom/facebook/drawee/drawable/m;->NG:Landroid/graphics/RectF;
 
     const/16 p1, 0x8
 
     new-array v0, p1, [F
 
-    iput-object v0, p0, Lcom/facebook/drawee/drawable/m;->Nz:[F
+    iput-object v0, p0, Lcom/facebook/drawee/drawable/m;->Nv:[F
 
     new-array p1, p1, [F
 
-    iput-object p1, p0, Lcom/facebook/drawee/drawable/m;->NA:[F
+    iput-object p1, p0, Lcom/facebook/drawee/drawable/m;->Nw:[F
 
     new-instance p1, Landroid/graphics/Paint;
 
@@ -98,21 +98,21 @@
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/m;->NC:Z
+    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/m;->Ny:Z
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lcom/facebook/drawee/drawable/m;->ND:F
+    iput v0, p0, Lcom/facebook/drawee/drawable/m;->Nz:F
 
-    iput p1, p0, Lcom/facebook/drawee/drawable/m;->NE:I
+    iput p1, p0, Lcom/facebook/drawee/drawable/m;->NA:I
 
-    iput p1, p0, Lcom/facebook/drawee/drawable/m;->NO:I
+    iput p1, p0, Lcom/facebook/drawee/drawable/m;->NJ:I
 
     iput v0, p0, Lcom/facebook/drawee/drawable/m;->mPadding:F
 
-    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/m;->NF:Z
+    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/m;->NB:Z
 
-    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/m;->NG:Z
+    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/m;->NC: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;->NH:Landroid/graphics/Path;
+    iput-object p1, p0, Lcom/facebook/drawee/drawable/m;->ND: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;->NP:Landroid/graphics/RectF;
+    iput-object p1, p0, Lcom/facebook/drawee/drawable/m;->NK:Landroid/graphics/RectF;
 
     return-void
 .end method
 
-.method private hE()V
+.method private hC()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;->NH:Landroid/graphics/Path;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->ND:Landroid/graphics/Path;
 
     invoke-virtual {v0}, Landroid/graphics/Path;->reset()V
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->NP: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;
 
@@ -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;->NP:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->NK: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;->NP:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/m;->NK: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;->NC:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/m;->Ny: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;->NP:Landroid/graphics/RectF;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/m;->NK:Landroid/graphics/RectF;
 
     invoke-virtual {v2}, Landroid/graphics/RectF;->centerX()F
 
     move-result v2
 
-    iget-object v3, p0, Lcom/facebook/drawee/drawable/m;->NP:Landroid/graphics/RectF;
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/m;->NK:Landroid/graphics/RectF;
 
     invoke-virtual {v3}, Landroid/graphics/RectF;->centerY()F
 
     move-result v3
 
-    iget-object v4, p0, Lcom/facebook/drawee/drawable/m;->NP:Landroid/graphics/RectF;
+    iget-object v4, p0, Lcom/facebook/drawee/drawable/m;->NK:Landroid/graphics/RectF;
 
     invoke-virtual {v4}, Landroid/graphics/RectF;->width()F
 
     move-result v4
 
-    iget-object v5, p0, Lcom/facebook/drawee/drawable/m;->NP:Landroid/graphics/RectF;
+    iget-object v5, p0, Lcom/facebook/drawee/drawable/m;->NK: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;->NP:Landroid/graphics/RectF;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/m;->NK:Landroid/graphics/RectF;
 
-    iget-object v3, p0, Lcom/facebook/drawee/drawable/m;->Nz:[F
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/m;->Nv:[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;->NP:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->NK: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;->NP:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->NK:Landroid/graphics/RectF;
 
-    iget v2, p0, Lcom/facebook/drawee/drawable/m;->ND:F
+    iget v2, p0, Lcom/facebook/drawee/drawable/m;->Nz: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;->NC:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/m;->Ny:Z
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->NP: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;->NP:Landroid/graphics/RectF;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/m;->NK: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;->NH:Landroid/graphics/Path;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/m;->ND:Landroid/graphics/Path;
 
-    iget-object v3, p0, Lcom/facebook/drawee/drawable/m;->NP:Landroid/graphics/RectF;
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/m;->NK:Landroid/graphics/RectF;
 
     invoke-virtual {v3}, Landroid/graphics/RectF;->centerX()F
 
     move-result v3
 
-    iget-object v4, p0, Lcom/facebook/drawee/drawable/m;->NP:Landroid/graphics/RectF;
+    iget-object v4, p0, Lcom/facebook/drawee/drawable/m;->NK: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;->NA:[F
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/m;->Nw:[F
 
     array-length v3, v2
 
     if-ge v0, v3, :cond_2
 
-    iget-object v3, p0, Lcom/facebook/drawee/drawable/m;->Nz:[F
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/m;->Nv:[F
 
     aget v3, v3, v0
 
@@ -304,7 +304,7 @@
 
     add-float/2addr v3, v4
 
-    iget v4, p0, Lcom/facebook/drawee/drawable/m;->ND:F
+    iget v4, p0, Lcom/facebook/drawee/drawable/m;->Nz:F
 
     div-float/2addr v4, v1
 
@@ -317,18 +317,18 @@
     goto :goto_1
 
     :cond_2
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->NH:Landroid/graphics/Path;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->ND:Landroid/graphics/Path;
 
-    iget-object v3, p0, Lcom/facebook/drawee/drawable/m;->NP:Landroid/graphics/RectF;
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/m;->NK: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;->NP:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->NK:Landroid/graphics/RectF;
 
-    iget v2, p0, Lcom/facebook/drawee/drawable/m;->ND:F
+    iget v2, p0, Lcom/facebook/drawee/drawable/m;->Nz: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;->NO:I
+    iput p1, p0, Lcom/facebook/drawee/drawable/m;->NJ: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;->NE:I
+    iput p1, p0, Lcom/facebook/drawee/drawable/m;->NA:I
 
-    iput p2, p0, Lcom/facebook/drawee/drawable/m;->ND:F
+    iput p2, p0, Lcom/facebook/drawee/drawable/m;->Nz:F
 
-    invoke-direct {p0}, Lcom/facebook/drawee/drawable/m;->hE()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/m;->hC()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;->Nz:[F
+    iget-object p1, p0, Lcom/facebook/drawee/drawable/m;->Nv:[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;->Nz:[F
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->Nv:[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;->hE()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/m;->hC()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;->NK:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->NG: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;->NQ:[I
+    sget-object v0, Lcom/facebook/drawee/drawable/m$1;->NM:[I
 
-    iget v1, p0, Lcom/facebook/drawee/drawable/m;->NJ:I
+    iget v1, p0, Lcom/facebook/drawee/drawable/m;->NF:I
 
     const/4 v2, 0x1
 
@@ -445,47 +445,47 @@
     goto/16 :goto_2
 
     :cond_0
-    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/m;->NF:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/m;->NB:Z
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->NM:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->NH:Landroid/graphics/RectF;
 
     if-nez v0, :cond_1
 
     new-instance v0, Landroid/graphics/RectF;
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/m;->NK:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/m;->NG:Landroid/graphics/RectF;
 
     invoke-direct {v0, v1}, Landroid/graphics/RectF;-><init>(Landroid/graphics/RectF;)V
 
-    iput-object v0, p0, Lcom/facebook/drawee/drawable/m;->NM:Landroid/graphics/RectF;
+    iput-object v0, p0, Lcom/facebook/drawee/drawable/m;->NH: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;->NN:Landroid/graphics/Matrix;
+    iput-object v0, p0, Lcom/facebook/drawee/drawable/m;->NI:Landroid/graphics/Matrix;
 
     goto :goto_0
 
     :cond_1
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/m;->NK:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/m;->NG: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;->NM:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->NH:Landroid/graphics/RectF;
 
-    iget v1, p0, Lcom/facebook/drawee/drawable/m;->ND:F
+    iget v1, p0, Lcom/facebook/drawee/drawable/m;->Nz:F
 
     invoke-virtual {v0, v1, v1}, Landroid/graphics/RectF;->inset(FF)V
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->NN:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->NI:Landroid/graphics/Matrix;
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/m;->NK:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/m;->NG:Landroid/graphics/RectF;
 
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/m;->NM:Landroid/graphics/RectF;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/m;->NH: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;->NK:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/m;->NG:Landroid/graphics/RectF;
 
     invoke-virtual {p1, v1}, Landroid/graphics/Canvas;->clipRect(Landroid/graphics/RectF;)Z
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/m;->NN:Landroid/graphics/Matrix;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/m;->NI: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;->NO:I
+    iget v1, p0, Lcom/facebook/drawee/drawable/m;->NJ: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;->NG:Z
+    iget-boolean v2, p0, Lcom/facebook/drawee/drawable/m;->NC: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;->NC:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/m;->Ny:Z
 
     if-eqz v0, :cond_5
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->NK:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->NG:Landroid/graphics/RectF;
 
     invoke-virtual {v0}, Landroid/graphics/RectF;->width()F
 
     move-result v0
 
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/m;->NK:Landroid/graphics/RectF;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/m;->NG: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;->ND:F
+    iget v2, p0, Lcom/facebook/drawee/drawable/m;->Nz:F
 
     add-float/2addr v0, v2
 
@@ -575,13 +575,13 @@
 
     div-float/2addr v0, v2
 
-    iget-object v3, p0, Lcom/facebook/drawee/drawable/m;->NK:Landroid/graphics/RectF;
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/m;->NG:Landroid/graphics/RectF;
 
     invoke-virtual {v3}, Landroid/graphics/RectF;->height()F
 
     move-result v3
 
-    iget-object v4, p0, Lcom/facebook/drawee/drawable/m;->NK:Landroid/graphics/RectF;
+    iget-object v4, p0, Lcom/facebook/drawee/drawable/m;->NG: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;->ND:F
+    iget v4, p0, Lcom/facebook/drawee/drawable/m;->Nz:F
 
     add-float/2addr v3, v4
 
@@ -599,21 +599,21 @@
 
     if-lez v2, :cond_3
 
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/m;->NK:Landroid/graphics/RectF;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/m;->NG:Landroid/graphics/RectF;
 
     iget v5, v2, Landroid/graphics/RectF;->left:F
 
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/m;->NK:Landroid/graphics/RectF;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/m;->NG:Landroid/graphics/RectF;
 
     iget v6, v2, Landroid/graphics/RectF;->top:F
 
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/m;->NK:Landroid/graphics/RectF;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/m;->NG: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;->NK:Landroid/graphics/RectF;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/m;->NG: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;->NK:Landroid/graphics/RectF;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/m;->NG: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;->NK:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->NG:Landroid/graphics/RectF;
 
     iget v6, v0, Landroid/graphics/RectF;->top:F
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->NK:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->NG:Landroid/graphics/RectF;
 
     iget v7, v0, Landroid/graphics/RectF;->right:F
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->NK:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->NG: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;->NK:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->NG:Landroid/graphics/RectF;
 
     iget v5, v0, Landroid/graphics/RectF;->left:F
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->NK:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->NG:Landroid/graphics/RectF;
 
     iget v6, v0, Landroid/graphics/RectF;->top:F
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->NK:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->NG:Landroid/graphics/RectF;
 
     iget v7, v0, Landroid/graphics/RectF;->right:F
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->NK:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->NG: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;->NK:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->NG:Landroid/graphics/RectF;
 
     iget v5, v0, Landroid/graphics/RectF;->left:F
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->NK:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->NG: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;->NK:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->NG:Landroid/graphics/RectF;
 
     iget v7, v0, Landroid/graphics/RectF;->right:F
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->NK:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->NG: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;->NE:I
+    iget v0, p0, Lcom/facebook/drawee/drawable/m;->NA: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;->NE:I
+    iget v1, p0, Lcom/facebook/drawee/drawable/m;->NA: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;->ND:F
+    iget v1, p0, Lcom/facebook/drawee/drawable/m;->Nz: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;->NH:Landroid/graphics/Path;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->ND: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 hC()V
+.method public final hA()V
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->Nz:[F
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->Nv:[F
 
     const/4 v1, 0x0
 
     invoke-static {v0, v1}, Ljava/util/Arrays;->fill([FF)V
 
-    invoke-direct {p0}, Lcom/facebook/drawee/drawable/m;->hE()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/m;->hC()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;->hE()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/m;->hC()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;->hE()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/m;->hC()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;->NC:Z
+    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/m;->Ny:Z
 
-    invoke-direct {p0}, Lcom/facebook/drawee/drawable/m;->hE()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/m;->hC()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;->NF:Z
+    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/m;->NB:Z
 
-    invoke-direct {p0}, Lcom/facebook/drawee/drawable/m;->hE()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/m;->hC()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;->NG:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/m;->NC:Z
 
     if-eq v0, p1, :cond_0
 
-    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/m;->NG:Z
+    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/m;->NC: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 05cc0639f4..9f4ccc5ddb 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 MR:Lcom/facebook/drawee/drawable/r;
+.field private MN:Lcom/facebook/drawee/drawable/r;
 
-.field final NA:[F
+.field protected NA:I
 
-.field NB:[F
+.field private NB:Z
 
-.field protected NC:Z
+.field private NC:Z
 
-.field protected ND:F
+.field protected final ND:Landroid/graphics/Path;
 
-.field protected NE:I
+.field NH:Landroid/graphics/RectF;
 
-.field private NF:Z
+.field NI:Landroid/graphics/Matrix;
 
-.field private NG:Z
+.field private final NQ:Landroid/graphics/drawable/Drawable;
 
-.field protected final NH:Landroid/graphics/Path;
+.field protected NR:Z
 
-.field NM:Landroid/graphics/RectF;
+.field protected NS:Z
 
-.field NN:Landroid/graphics/Matrix;
+.field private final NT:[F
 
-.field private final NU:Landroid/graphics/drawable/Drawable;
+.field final NU:Landroid/graphics/RectF;
 
-.field protected NV:Z
+.field final NV:Landroid/graphics/RectF;
 
-.field protected NW:Z
+.field final NW:Landroid/graphics/RectF;
 
-.field private final NX:[F
+.field final NX:Landroid/graphics/RectF;
 
-.field final NY:Landroid/graphics/RectF;
+.field final NY:Landroid/graphics/Matrix;
 
-.field final NZ:Landroid/graphics/RectF;
+.field final NZ:Landroid/graphics/Matrix;
 
-.field final Oa:Landroid/graphics/RectF;
+.field final Nw:[F
 
-.field final Ob:Landroid/graphics/RectF;
+.field Nx:[F
+
+.field protected Ny:Z
+
+.field protected Nz:F
+
+.field final Oa:Landroid/graphics/Matrix;
+
+.field final Ob:Landroid/graphics/Matrix;
 
 .field final Oc:Landroid/graphics/Matrix;
 
-.field final Od:Landroid/graphics/Matrix;
+.field Od:Landroid/graphics/Matrix;
 
 .field final Oe:Landroid/graphics/Matrix;
 
-.field final Of:Landroid/graphics/Matrix;
-
-.field final Og:Landroid/graphics/Matrix;
-
-.field Oh:Landroid/graphics/Matrix;
-
-.field final Oi:Landroid/graphics/Matrix;
-
-.field private Oj:Z
+.field private Of:Z
 
 .field private mPadding:F
 
@@ -75,13 +75,13 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/drawable/n;->NC:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/drawable/n;->Ny:Z
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/drawable/n;->NV:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/drawable/n;->NR:Z
 
     const/4 v1, 0x0
 
-    iput v1, p0, Lcom/facebook/drawee/drawable/n;->ND:F
+    iput v1, p0, Lcom/facebook/drawee/drawable/n;->Nz:F
 
     new-instance v2, Landroid/graphics/Path;
 
@@ -91,49 +91,73 @@
 
     const/4 v2, 0x1
 
-    iput-boolean v2, p0, Lcom/facebook/drawee/drawable/n;->NW:Z
+    iput-boolean v2, p0, Lcom/facebook/drawee/drawable/n;->NS:Z
 
-    iput v0, p0, Lcom/facebook/drawee/drawable/n;->NE:I
+    iput v0, p0, Lcom/facebook/drawee/drawable/n;->NA:I
 
     new-instance v3, Landroid/graphics/Path;
 
     invoke-direct {v3}, Landroid/graphics/Path;-><init>()V
 
-    iput-object v3, p0, Lcom/facebook/drawee/drawable/n;->NH:Landroid/graphics/Path;
+    iput-object v3, p0, Lcom/facebook/drawee/drawable/n;->ND:Landroid/graphics/Path;
 
     const/16 v3, 0x8
 
     new-array v4, v3, [F
 
-    iput-object v4, p0, Lcom/facebook/drawee/drawable/n;->NX:[F
+    iput-object v4, p0, Lcom/facebook/drawee/drawable/n;->NT:[F
 
     new-array v3, v3, [F
 
-    iput-object v3, p0, Lcom/facebook/drawee/drawable/n;->NA:[F
+    iput-object v3, p0, Lcom/facebook/drawee/drawable/n;->Nw:[F
 
     new-instance v3, Landroid/graphics/RectF;
 
     invoke-direct {v3}, Landroid/graphics/RectF;-><init>()V
 
-    iput-object v3, p0, Lcom/facebook/drawee/drawable/n;->NY:Landroid/graphics/RectF;
+    iput-object v3, p0, Lcom/facebook/drawee/drawable/n;->NU: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;->NZ:Landroid/graphics/RectF;
+    iput-object v3, p0, Lcom/facebook/drawee/drawable/n;->NV: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;->Oa:Landroid/graphics/RectF;
+    iput-object v3, p0, Lcom/facebook/drawee/drawable/n;->NW: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;->Ob:Landroid/graphics/RectF;
+    iput-object v3, p0, Lcom/facebook/drawee/drawable/n;->NX: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;->NY: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;
+
+    new-instance v3, Landroid/graphics/Matrix;
+
+    invoke-direct {v3}, Landroid/graphics/Matrix;-><init>()V
+
+    iput-object v3, p0, Lcom/facebook/drawee/drawable/n;->Oa: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;->Ob:Landroid/graphics/Matrix;
 
     new-instance v3, Landroid/graphics/Matrix;
 
@@ -145,41 +169,17 @@
 
     invoke-direct {v3}, Landroid/graphics/Matrix;-><init>()V
 
-    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;->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;->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;->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;->Oi:Landroid/graphics/Matrix;
-
     iput v1, p0, Lcom/facebook/drawee/drawable/n;->mPadding:F
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/drawable/n;->NF:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/drawable/n;->NB:Z
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/drawable/n;->NG:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/drawable/n;->NC:Z
 
-    iput-boolean v2, p0, Lcom/facebook/drawee/drawable/n;->Oj:Z
+    iput-boolean v2, p0, Lcom/facebook/drawee/drawable/n;->Of:Z
 
-    iput-object p1, p0, Lcom/facebook/drawee/drawable/n;->NU:Landroid/graphics/drawable/Drawable;
+    iput-object p1, p0, Lcom/facebook/drawee/drawable/n;->NQ: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;->NE:I
+    iget v0, p0, Lcom/facebook/drawee/drawable/n;->NA:I
 
     if-ne v0, p1, :cond_0
 
-    iget v0, p0, Lcom/facebook/drawee/drawable/n;->ND:F
+    iget v0, p0, Lcom/facebook/drawee/drawable/n;->Nz:F
 
     cmpl-float v0, v0, p2
 
     if-eqz v0, :cond_1
 
     :cond_0
-    iput p1, p0, Lcom/facebook/drawee/drawable/n;->NE:I
+    iput p1, p0, Lcom/facebook/drawee/drawable/n;->NA:I
 
-    iput p2, p0, Lcom/facebook/drawee/drawable/n;->ND:F
+    iput p2, p0, Lcom/facebook/drawee/drawable/n;->Nz:F
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/n;->Oj:Z
+    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/n;->Of: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;->MR:Lcom/facebook/drawee/drawable/r;
+    iput-object p1, p0, Lcom/facebook/drawee/drawable/n;->MN: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;->NX:[F
+    iget-object p1, p0, Lcom/facebook/drawee/drawable/n;->NT:[F
 
     invoke-static {p1, v0}, Ljava/util/Arrays;->fill([FF)V
 
-    iput-boolean v2, p0, Lcom/facebook/drawee/drawable/n;->NV:Z
+    iput-boolean v2, p0, Lcom/facebook/drawee/drawable/n;->NR: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;->NX:[F
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/n;->NT:[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;->NV:Z
+    iput-boolean v2, p0, Lcom/facebook/drawee/drawable/n;->NR:Z
 
     const/4 v3, 0x0
 
     :goto_1
     if-ge v3, v4, :cond_3
 
-    iget-boolean v5, p0, Lcom/facebook/drawee/drawable/n;->NV:Z
+    iget-boolean v5, p0, Lcom/facebook/drawee/drawable/n;->NR: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;->NV:Z
+    iput-boolean v5, p0, Lcom/facebook/drawee/drawable/n;->NR:Z
 
     add-int/lit8 v3, v3, 0x1
 
@@ -297,7 +297,7 @@
 
     :cond_3
     :goto_3
-    iput-boolean v1, p0, Lcom/facebook/drawee/drawable/n;->Oj:Z
+    iput-boolean v1, p0, Lcom/facebook/drawee/drawable/n;->Of: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;->NU:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NQ: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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NU:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NQ:Landroid/graphics/drawable/Drawable;
 
     invoke-virtual {v0, p1}, Landroid/graphics/drawable/Drawable;->draw(Landroid/graphics/Canvas;)V
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     return-void
 .end method
@@ -331,7 +331,7 @@
 .method public getAlpha()I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NU:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NQ: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;->NU:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NQ: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;->NU:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NQ: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;->NU:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NQ: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;->NU:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NQ:Landroid/graphics/drawable/Drawable;
 
     invoke-virtual {v0}, Landroid/graphics/drawable/Drawable;->getOpacity()I
 
@@ -388,14 +388,14 @@
     return v0
 .end method
 
-.method public final hC()V
+.method public final hA()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
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/n;->NT:[F
 
     const/4 v2, 0x0
 
@@ -403,27 +403,27 @@
 
     const/4 v1, 0x0
 
-    iput-boolean v1, p0, Lcom/facebook/drawee/drawable/n;->NV:Z
+    iput-boolean v1, p0, Lcom/facebook/drawee/drawable/n;->NR:Z
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/drawable/n;->Oj:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/drawable/n;->Of:Z
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/n;->invalidateSelf()V
 
     return-void
 .end method
 
-.method hD()Z
+.method hB()Z
     .locals 2
 
-    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/n;->NC:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/n;->Ny:Z
 
     if-nez v0, :cond_1
 
-    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/n;->NV:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/n;->NR:Z
 
     if-nez v0, :cond_1
 
-    iget v0, p0, Lcom/facebook/drawee/drawable/n;->ND:F
+    iget v0, p0, Lcom/facebook/drawee/drawable/n;->Nz:F
 
     const/4 v1, 0x0
 
@@ -445,20 +445,20 @@
     return v0
 .end method
 
-.method protected final hE()V
+.method protected final hC()V
     .locals 8
 
-    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/n;->Oj:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/n;->Of:Z
 
     if-eqz v0, :cond_7
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NH:Landroid/graphics/Path;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->ND:Landroid/graphics/Path;
 
     invoke-virtual {v0}, Landroid/graphics/Path;->reset()V
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NY:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NU:Landroid/graphics/RectF;
 
-    iget v1, p0, Lcom/facebook/drawee/drawable/n;->ND:F
+    iget v1, p0, Lcom/facebook/drawee/drawable/n;->Nz:F
 
     const/high16 v2, 0x40000000    # 2.0f
 
@@ -468,19 +468,19 @@
 
     invoke-virtual {v0, v3, v1}, Landroid/graphics/RectF;->inset(FF)V
 
-    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/n;->NC:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/n;->Ny:Z
 
     const/4 v1, 0x0
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NY:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NU:Landroid/graphics/RectF;
 
     invoke-virtual {v0}, Landroid/graphics/RectF;->width()F
 
     move-result v0
 
-    iget-object v3, p0, Lcom/facebook/drawee/drawable/n;->NY:Landroid/graphics/RectF;
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/n;->NU:Landroid/graphics/RectF;
 
     invoke-virtual {v3}, Landroid/graphics/RectF;->height()F
 
@@ -492,15 +492,15 @@
 
     div-float/2addr v0, v2
 
-    iget-object v3, p0, Lcom/facebook/drawee/drawable/n;->NH:Landroid/graphics/Path;
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/n;->ND:Landroid/graphics/Path;
 
-    iget-object v4, p0, Lcom/facebook/drawee/drawable/n;->NY:Landroid/graphics/RectF;
+    iget-object v4, p0, Lcom/facebook/drawee/drawable/n;->NU:Landroid/graphics/RectF;
 
     invoke-virtual {v4}, Landroid/graphics/RectF;->centerX()F
 
     move-result v4
 
-    iget-object v5, p0, Lcom/facebook/drawee/drawable/n;->NY:Landroid/graphics/RectF;
+    iget-object v5, p0, Lcom/facebook/drawee/drawable/n;->NU:Landroid/graphics/RectF;
 
     invoke-virtual {v5}, Landroid/graphics/RectF;->centerY()F
 
@@ -516,13 +516,13 @@
     const/4 v0, 0x0
 
     :goto_0
-    iget-object v3, p0, Lcom/facebook/drawee/drawable/n;->NA:[F
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/n;->Nw:[F
 
     array-length v4, v3
 
     if-ge v0, v4, :cond_1
 
-    iget-object v4, p0, Lcom/facebook/drawee/drawable/n;->NX:[F
+    iget-object v4, p0, Lcom/facebook/drawee/drawable/n;->NT:[F
 
     aget v4, v4, v0
 
@@ -530,7 +530,7 @@
 
     add-float/2addr v4, v5
 
-    iget v5, p0, Lcom/facebook/drawee/drawable/n;->ND:F
+    iget v5, p0, Lcom/facebook/drawee/drawable/n;->Nz:F
 
     div-float/2addr v5, v2
 
@@ -543,18 +543,18 @@
     goto :goto_0
 
     :cond_1
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NH:Landroid/graphics/Path;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->ND:Landroid/graphics/Path;
 
-    iget-object v4, p0, Lcom/facebook/drawee/drawable/n;->NY:Landroid/graphics/RectF;
+    iget-object v4, p0, Lcom/facebook/drawee/drawable/n;->NU: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;->NY:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NU:Landroid/graphics/RectF;
 
-    iget v3, p0, Lcom/facebook/drawee/drawable/n;->ND:F
+    iget v3, p0, Lcom/facebook/drawee/drawable/n;->Nz:F
 
     neg-float v4, v3
 
@@ -572,11 +572,11 @@
 
     iget v0, p0, Lcom/facebook/drawee/drawable/n;->mPadding:F
 
-    iget-boolean v3, p0, Lcom/facebook/drawee/drawable/n;->NF:Z
+    iget-boolean v3, p0, Lcom/facebook/drawee/drawable/n;->NB:Z
 
     if-eqz v3, :cond_2
 
-    iget v3, p0, Lcom/facebook/drawee/drawable/n;->ND:F
+    iget v3, p0, Lcom/facebook/drawee/drawable/n;->Nz:F
 
     goto :goto_2
 
@@ -586,35 +586,35 @@
     :goto_2
     add-float/2addr v0, v3
 
-    iget-object v3, p0, Lcom/facebook/drawee/drawable/n;->NY:Landroid/graphics/RectF;
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/n;->NU:Landroid/graphics/RectF;
 
     invoke-virtual {v3, v0, v0}, Landroid/graphics/RectF;->inset(FF)V
 
-    iget-boolean v3, p0, Lcom/facebook/drawee/drawable/n;->NC:Z
+    iget-boolean v3, p0, Lcom/facebook/drawee/drawable/n;->Ny: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;->NY:Landroid/graphics/RectF;
+    iget-object v4, p0, Lcom/facebook/drawee/drawable/n;->NU:Landroid/graphics/RectF;
 
     invoke-virtual {v4}, Landroid/graphics/RectF;->centerX()F
 
     move-result v4
 
-    iget-object v5, p0, Lcom/facebook/drawee/drawable/n;->NY:Landroid/graphics/RectF;
+    iget-object v5, p0, Lcom/facebook/drawee/drawable/n;->NU:Landroid/graphics/RectF;
 
     invoke-virtual {v5}, Landroid/graphics/RectF;->centerY()F
 
     move-result v5
 
-    iget-object v6, p0, Lcom/facebook/drawee/drawable/n;->NY:Landroid/graphics/RectF;
+    iget-object v6, p0, Lcom/facebook/drawee/drawable/n;->NU:Landroid/graphics/RectF;
 
     invoke-virtual {v6}, Landroid/graphics/RectF;->width()F
 
     move-result v6
 
-    iget-object v7, p0, Lcom/facebook/drawee/drawable/n;->NY:Landroid/graphics/RectF;
+    iget-object v7, p0, Lcom/facebook/drawee/drawable/n;->NU:Landroid/graphics/RectF;
 
     invoke-virtual {v7}, Landroid/graphics/RectF;->height()F
 
@@ -633,11 +633,11 @@
     goto :goto_4
 
     :cond_3
-    iget-boolean v2, p0, Lcom/facebook/drawee/drawable/n;->NF:Z
+    iget-boolean v2, p0, Lcom/facebook/drawee/drawable/n;->NB:Z
 
     if-eqz v2, :cond_6
 
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->NB:[F
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->Nx:[F
 
     if-nez v2, :cond_4
 
@@ -645,25 +645,25 @@
 
     new-array v2, v2, [F
 
-    iput-object v2, p0, Lcom/facebook/drawee/drawable/n;->NB:[F
+    iput-object v2, p0, Lcom/facebook/drawee/drawable/n;->Nx:[F
 
     :cond_4
     const/4 v2, 0x0
 
     :goto_3
-    iget-object v3, p0, Lcom/facebook/drawee/drawable/n;->NA:[F
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/n;->Nw:[F
 
     array-length v3, v3
 
     if-ge v2, v3, :cond_5
 
-    iget-object v3, p0, Lcom/facebook/drawee/drawable/n;->NB:[F
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/n;->Nx:[F
 
-    iget-object v4, p0, Lcom/facebook/drawee/drawable/n;->NX:[F
+    iget-object v4, p0, Lcom/facebook/drawee/drawable/n;->NT:[F
 
     aget v4, v4, v2
 
-    iget v5, p0, Lcom/facebook/drawee/drawable/n;->ND:F
+    iget v5, p0, Lcom/facebook/drawee/drawable/n;->Nz:F
 
     sub-float/2addr v4, v5
 
@@ -676,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;->NY:Landroid/graphics/RectF;
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/n;->NU:Landroid/graphics/RectF;
 
-    iget-object v4, p0, Lcom/facebook/drawee/drawable/n;->NB:[F
+    iget-object v4, p0, Lcom/facebook/drawee/drawable/n;->Nx:[F
 
     sget-object v5, Landroid/graphics/Path$Direction;->CW:Landroid/graphics/Path$Direction;
 
@@ -689,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;->NY:Landroid/graphics/RectF;
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/n;->NU:Landroid/graphics/RectF;
 
-    iget-object v4, p0, Lcom/facebook/drawee/drawable/n;->NX:[F
+    iget-object v4, p0, Lcom/facebook/drawee/drawable/n;->NT:[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;->NY:Landroid/graphics/RectF;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->NU:Landroid/graphics/RectF;
 
     neg-float v0, v0
 
@@ -710,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;->Oj:Z
+    iput-boolean v1, p0, Lcom/facebook/drawee/drawable/n;->Of:Z
 
     :cond_7
     return-void
 .end method
 
-.method public final hG()Z
+.method public final hE()Z
     .locals 1
 
-    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/n;->NG:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/n;->NC:Z
 
     return v0
 .end method
 
-.method protected final hH()V
+.method protected final hF()V
     .locals 4
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->MR:Lcom/facebook/drawee/drawable/r;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->MN:Lcom/facebook/drawee/drawable/r;
 
     if-eqz v0, :cond_0
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/n;->Oe:Landroid/graphics/Matrix;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/n;->Oa: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;->MR:Lcom/facebook/drawee/drawable/r;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->MN:Lcom/facebook/drawee/drawable/r;
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/n;->NY:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/n;->NU: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;->Oe:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->Oa:Landroid/graphics/Matrix;
 
     invoke-virtual {v0}, Landroid/graphics/Matrix;->reset()V
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NY:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NU:Landroid/graphics/RectF;
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/n;->getBounds()Landroid/graphics/Rect;
 
@@ -757,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;->Oa:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NW:Landroid/graphics/RectF;
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/n;->getIntrinsicWidth()I
 
@@ -775,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;->Ob:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NX:Landroid/graphics/RectF;
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/n;->NU:Landroid/graphics/drawable/Drawable;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/n;->NQ:Landroid/graphics/drawable/Drawable;
 
     invoke-virtual {v1}, Landroid/graphics/drawable/Drawable;->getBounds()Landroid/graphics/Rect;
 
@@ -785,47 +785,47 @@
 
     invoke-virtual {v0, v1}, Landroid/graphics/RectF;->set(Landroid/graphics/Rect;)V
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->Oc:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NY:Landroid/graphics/Matrix;
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/n;->Oa:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/n;->NW:Landroid/graphics/RectF;
 
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->Ob:Landroid/graphics/RectF;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->NX: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;->NF:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/n;->NB:Z
 
     if-eqz v0, :cond_3
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NM:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NH:Landroid/graphics/RectF;
 
     if-nez v0, :cond_1
 
     new-instance v0, Landroid/graphics/RectF;
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/n;->NY:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/n;->NU:Landroid/graphics/RectF;
 
     invoke-direct {v0, v1}, Landroid/graphics/RectF;-><init>(Landroid/graphics/RectF;)V
 
-    iput-object v0, p0, Lcom/facebook/drawee/drawable/n;->NM:Landroid/graphics/RectF;
+    iput-object v0, p0, Lcom/facebook/drawee/drawable/n;->NH:Landroid/graphics/RectF;
 
     goto :goto_1
 
     :cond_1
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/n;->NY:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/n;->NU: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;->NM:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NH:Landroid/graphics/RectF;
 
-    iget v1, p0, Lcom/facebook/drawee/drawable/n;->ND:F
+    iget v1, p0, Lcom/facebook/drawee/drawable/n;->Nz:F
 
     invoke-virtual {v0, v1, v1}, Landroid/graphics/RectF;->inset(FF)V
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NN:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NI:Landroid/graphics/Matrix;
 
     if-nez v0, :cond_2
 
@@ -833,14 +833,14 @@
 
     invoke-direct {v0}, Landroid/graphics/Matrix;-><init>()V
 
-    iput-object v0, p0, Lcom/facebook/drawee/drawable/n;->NN:Landroid/graphics/Matrix;
+    iput-object v0, p0, Lcom/facebook/drawee/drawable/n;->NI:Landroid/graphics/Matrix;
 
     :cond_2
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NN:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NI:Landroid/graphics/Matrix;
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/n;->NY:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/n;->NU:Landroid/graphics/RectF;
 
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->NM:Landroid/graphics/RectF;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->NH:Landroid/graphics/RectF;
 
     sget-object v3, Landroid/graphics/Matrix$ScaleToFit;->FILL:Landroid/graphics/Matrix$ScaleToFit;
 
@@ -849,7 +849,7 @@
     goto :goto_2
 
     :cond_3
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NN:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NI:Landroid/graphics/Matrix;
 
     if-eqz v0, :cond_4
 
@@ -857,9 +857,9 @@
 
     :cond_4
     :goto_2
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->Oe:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->Oa:Landroid/graphics/Matrix;
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/n;->Of:Landroid/graphics/Matrix;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/n;->Ob:Landroid/graphics/Matrix;
 
     invoke-virtual {v0, v1}, Landroid/graphics/Matrix;->equals(Ljava/lang/Object;)Z
 
@@ -869,9 +869,9 @@
 
     if-eqz v0, :cond_5
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->Oc:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NY:Landroid/graphics/Matrix;
 
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->Od:Landroid/graphics/Matrix;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->NZ:Landroid/graphics/Matrix;
 
     invoke-virtual {v0, v2}, Landroid/graphics/Matrix;->equals(Ljava/lang/Object;)Z
 
@@ -879,11 +879,11 @@
 
     if-eqz v0, :cond_5
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NN:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NI:Landroid/graphics/Matrix;
 
     if-eqz v0, :cond_9
 
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->Oh: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
 
@@ -892,76 +892,76 @@
     if-nez v0, :cond_9
 
     :cond_5
-    iput-boolean v1, p0, Lcom/facebook/drawee/drawable/n;->NW:Z
+    iput-boolean v1, p0, Lcom/facebook/drawee/drawable/n;->NS:Z
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->Oe:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->Oa:Landroid/graphics/Matrix;
 
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->Og:Landroid/graphics/Matrix;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->Oc:Landroid/graphics/Matrix;
 
     invoke-virtual {v0, v2}, Landroid/graphics/Matrix;->invert(Landroid/graphics/Matrix;)Z
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->Oi: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;->Oe:Landroid/graphics/Matrix;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->Oa:Landroid/graphics/Matrix;
 
     invoke-virtual {v0, v2}, Landroid/graphics/Matrix;->set(Landroid/graphics/Matrix;)V
 
-    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/n;->NF:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/n;->NB:Z
 
     if-eqz v0, :cond_6
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->Oi: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;->NN:Landroid/graphics/Matrix;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->NI: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;->Oi: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;->Oc:Landroid/graphics/Matrix;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->NY:Landroid/graphics/Matrix;
 
     invoke-virtual {v0, v2}, Landroid/graphics/Matrix;->preConcat(Landroid/graphics/Matrix;)Z
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->Of:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->Ob:Landroid/graphics/Matrix;
 
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->Oe:Landroid/graphics/Matrix;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->Oa:Landroid/graphics/Matrix;
 
     invoke-virtual {v0, v2}, Landroid/graphics/Matrix;->set(Landroid/graphics/Matrix;)V
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->Od:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NZ:Landroid/graphics/Matrix;
 
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->Oc:Landroid/graphics/Matrix;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->NY:Landroid/graphics/Matrix;
 
     invoke-virtual {v0, v2}, Landroid/graphics/Matrix;->set(Landroid/graphics/Matrix;)V
 
-    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/n;->NF:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/n;->NB:Z
 
     if-eqz v0, :cond_8
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->Oh:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->Od:Landroid/graphics/Matrix;
 
     if-nez v0, :cond_7
 
     new-instance v0, Landroid/graphics/Matrix;
 
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->NN:Landroid/graphics/Matrix;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->NI:Landroid/graphics/Matrix;
 
     invoke-direct {v0, v2}, Landroid/graphics/Matrix;-><init>(Landroid/graphics/Matrix;)V
 
-    iput-object v0, p0, Lcom/facebook/drawee/drawable/n;->Oh:Landroid/graphics/Matrix;
+    iput-object v0, p0, Lcom/facebook/drawee/drawable/n;->Od:Landroid/graphics/Matrix;
 
     goto :goto_3
 
     :cond_7
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->NN:Landroid/graphics/Matrix;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->NI: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;->Oh:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->Od:Landroid/graphics/Matrix;
 
     if-eqz v0, :cond_9
 
@@ -969,9 +969,9 @@
 
     :cond_9
     :goto_3
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NY:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NU:Landroid/graphics/RectF;
 
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->NZ:Landroid/graphics/RectF;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->NV:Landroid/graphics/RectF;
 
     invoke-virtual {v0, v2}, Landroid/graphics/RectF;->equals(Ljava/lang/Object;)Z
 
@@ -979,11 +979,11 @@
 
     if-nez v0, :cond_a
 
-    iput-boolean v1, p0, Lcom/facebook/drawee/drawable/n;->Oj:Z
+    iput-boolean v1, p0, Lcom/facebook/drawee/drawable/n;->Of:Z
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NZ:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NV:Landroid/graphics/RectF;
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/n;->NY:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/n;->NU:Landroid/graphics/RectF;
 
     invoke-virtual {v0, v1}, Landroid/graphics/RectF;->set(Landroid/graphics/RectF;)V
 
@@ -1004,7 +1004,7 @@
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/n;->Oj:Z
+    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/n;->Of: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;->NU:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NQ: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;->NU:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NQ: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;->NU:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NQ: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;->NU:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NQ: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;->NC:Z
+    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/n;->Ny:Z
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/n;->Oj:Z
+    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/n;->Of: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;->NF:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/n;->NB:Z
 
     if-eq v0, p1, :cond_0
 
-    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/n;->NF:Z
+    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/n;->NB:Z
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/n;->Oj:Z
+    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/n;->Of: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;->NG:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/n;->NC:Z
 
     if-eq v0, p1, :cond_0
 
-    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/n;->NG:Z
+    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/n;->NC: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 f43c5b45a7..f1b7432ae1 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 MB:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+.field public Mx:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-.field Nr:Landroid/graphics/Matrix;
+.field Nn:Landroid/graphics/Matrix;
 
-.field Ns:I
+.field No:I
 
-.field Nt:I
+.field Np:I
 
-.field Ok:Ljava/lang/Object;
+.field Og:Ljava/lang/Object;
 
-.field Ol:Landroid/graphics/PointF;
+.field Oh: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;->Ol:Landroid/graphics/PointF;
+    iput-object p1, p0, Lcom/facebook/drawee/drawable/p;->Oh:Landroid/graphics/PointF;
 
     const/4 p1, 0x0
 
-    iput p1, p0, Lcom/facebook/drawee/drawable/p;->Ns:I
+    iput p1, p0, Lcom/facebook/drawee/drawable/p;->No:I
 
-    iput p1, p0, Lcom/facebook/drawee/drawable/p;->Nt:I
+    iput p1, p0, Lcom/facebook/drawee/drawable/p;->Np:I
 
     new-instance p1, Landroid/graphics/Matrix;
 
@@ -50,134 +50,15 @@
 
     iput-object p1, p0, Lcom/facebook/drawee/drawable/p;->mTempMatrix:Landroid/graphics/Matrix;
 
-    iput-object p2, p0, Lcom/facebook/drawee/drawable/p;->MB:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    iput-object p2, p0, Lcom/facebook/drawee/drawable/p;->Mx:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
     return-void
 .end method
 
-.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
+.method private hG()V
     .locals 5
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/p;->MB:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/p;->Mx:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
     instance-of v1, v0, Lcom/facebook/drawee/drawable/ScalingUtils$k;
 
@@ -189,13 +70,13 @@
 
     check-cast v0, Lcom/facebook/drawee/drawable/ScalingUtils$k;
 
-    invoke-interface {v0}, Lcom/facebook/drawee/drawable/ScalingUtils$k;->hJ()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/facebook/drawee/drawable/ScalingUtils$k;->hH()Ljava/lang/Object;
 
     move-result-object v0
 
     if-eqz v0, :cond_1
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/p;->Ok:Ljava/lang/Object;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/p;->Og:Ljava/lang/Object;
 
     invoke-virtual {v0, v1}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
 
@@ -215,7 +96,7 @@
     const/4 v1, 0x1
 
     :goto_1
-    iput-object v0, p0, Lcom/facebook/drawee/drawable/p;->Ok:Ljava/lang/Object;
+    iput-object v0, p0, Lcom/facebook/drawee/drawable/p;->Og:Ljava/lang/Object;
 
     goto :goto_2
 
@@ -223,7 +104,7 @@
     const/4 v1, 0x0
 
     :goto_2
-    iget v0, p0, Lcom/facebook/drawee/drawable/p;->Ns:I
+    iget v0, p0, Lcom/facebook/drawee/drawable/p;->No:I
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/p;->getCurrent()Landroid/graphics/drawable/Drawable;
 
@@ -235,7 +116,7 @@
 
     if-ne v0, v4, :cond_4
 
-    iget v0, p0, Lcom/facebook/drawee/drawable/p;->Nt:I
+    iget v0, p0, Lcom/facebook/drawee/drawable/p;->Np:I
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/p;->getCurrent()Landroid/graphics/drawable/Drawable;
 
@@ -259,18 +140,137 @@
     if-eqz v1, :cond_6
 
     :cond_5
-    invoke-direct {p0}, Lcom/facebook/drawee/drawable/p;->hB()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/p;->hz()V
 
     :cond_6
     return-void
 .end method
 
+.method private hz()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;->No:I
+
+    invoke-virtual {v0}, Landroid/graphics/drawable/Drawable;->getIntrinsicHeight()I
+
+    move-result v5
+
+    iput v5, p0, Lcom/facebook/drawee/drawable/p;->Np: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;->Nn:Landroid/graphics/Matrix;
+
+    return-void
+
+    :cond_1
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/p;->Mx:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+
+    sget-object v2, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Oi: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;->Nn: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;->Mx: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;->Oh: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;->Oh: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;->Nn: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;->Nn: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;->Ol:Landroid/graphics/PointF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/p;->Oh: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;->Ol:Landroid/graphics/PointF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/p;->Oh: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;->Ol:Landroid/graphics/PointF;
+    iput-object v0, p0, Lcom/facebook/drawee/drawable/p;->Oh:Landroid/graphics/PointF;
 
     :cond_1
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/p;->Ol:Landroid/graphics/PointF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/p;->Oh:Landroid/graphics/PointF;
 
     invoke-virtual {v0, p1}, Landroid/graphics/PointF;->set(Landroid/graphics/PointF;)V
 
-    invoke-direct {p0}, Lcom/facebook/drawee/drawable/p;->hB()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/p;->hz()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;->MB:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/p;->Mx: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;->MB:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    iput-object p1, p0, Lcom/facebook/drawee/drawable/p;->Mx:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/facebook/drawee/drawable/p;->Ok:Ljava/lang/Object;
+    iput-object p1, p0, Lcom/facebook/drawee/drawable/p;->Og:Ljava/lang/Object;
 
-    invoke-direct {p0}, Lcom/facebook/drawee/drawable/p;->hB()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/p;->hz()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;->hI()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/p;->hG()V
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/p;->Nr:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/p;->Nn: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;->hI()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/p;->hG()V
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/p;->Nr:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/p;->Nn: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;->Nr:Landroid/graphics/Matrix;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/p;->Nn: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;->hB()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/p;->hz()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;->hB()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/p;->hz()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 c9279acb82..8a0d20ebbb 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 hK()V
+.method public abstract hI()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 c3d86472e1..09f25c4a79 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 public final OA:Lcom/facebook/drawee/drawable/g;
+.field private final Os:Landroid/graphics/drawable/Drawable;
 
-.field private final Ow:Landroid/graphics/drawable/Drawable;
-
-.field private Ox:Lcom/facebook/drawee/generic/d;
+.field private Ot:Lcom/facebook/drawee/generic/d;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private final Oy:Lcom/facebook/drawee/generic/c;
+.field private final Ou:Lcom/facebook/drawee/generic/c;
 
-.field private final Oz:Lcom/facebook/drawee/drawable/f;
+.field private final Ov:Lcom/facebook/drawee/drawable/f;
+
+.field public final Ow:Lcom/facebook/drawee/drawable/g;
 
 .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;->Ow:Landroid/graphics/drawable/Drawable;
+    iput-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Os:Landroid/graphics/drawable/Drawable;
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()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;->Ox:Lcom/facebook/drawee/generic/d;
+    iget-object v0, p1, Lcom/facebook/drawee/generic/a;->Ot:Lcom/facebook/drawee/generic/d;
 
-    iput-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Ox:Lcom/facebook/drawee/generic/d;
+    iput-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Ot:Lcom/facebook/drawee/generic/d;
 
     new-instance v0, Lcom/facebook/drawee/drawable/g;
 
-    iget-object v2, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Ow:Landroid/graphics/drawable/Drawable;
+    iget-object v2, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Os: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;->OA:Lcom/facebook/drawee/drawable/g;
+    iput-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Ow:Lcom/facebook/drawee/drawable/g;
 
-    iget-object v0, p1, Lcom/facebook/drawee/generic/a;->OS:Ljava/util/List;
+    iget-object v0, p1, Lcom/facebook/drawee/generic/a;->OO:Ljava/util/List;
 
     const/4 v2, 0x1
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p1, Lcom/facebook/drawee/generic/a;->OS:Ljava/util/List;
+    iget-object v0, p1, Lcom/facebook/drawee/generic/a;->OO: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;->OT:Landroid/graphics/drawable/Drawable;
+    iget-object v3, p1, Lcom/facebook/drawee/generic/a;->OP: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;->OF:Landroid/graphics/drawable/Drawable;
+    iget-object v4, p1, Lcom/facebook/drawee/generic/a;->OB:Landroid/graphics/drawable/Drawable;
 
-    iget-object v6, p1, Lcom/facebook/drawee/generic/a;->OG:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    iget-object v6, p1, Lcom/facebook/drawee/generic/a;->OC: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;->OA:Lcom/facebook/drawee/drawable/g;
+    iget-object v6, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Ow:Lcom/facebook/drawee/drawable/g;
 
-    iget-object v7, p1, Lcom/facebook/drawee/generic/a;->OO:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    iget-object v7, p1, Lcom/facebook/drawee/generic/a;->OJ:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-    iget-object v8, p1, Lcom/facebook/drawee/generic/a;->OQ:Landroid/graphics/PointF;
+    iget-object v8, p1, Lcom/facebook/drawee/generic/a;->OM:Landroid/graphics/PointF;
 
-    iget-object v9, p1, Lcom/facebook/drawee/generic/a;->OR:Landroid/graphics/ColorFilter;
+    iget-object v9, p1, Lcom/facebook/drawee/generic/a;->ON:Landroid/graphics/ColorFilter;
 
     invoke-virtual {v6, v9}, Landroid/graphics/drawable/Drawable;->setColorFilter(Landroid/graphics/ColorFilter;)V
 
@@ -131,18 +131,6 @@
 
     const/4 v4, 0x3
 
-    iget-object v6, p1, Lcom/facebook/drawee/generic/a;->OM:Landroid/graphics/drawable/Drawable;
-
-    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;
-
-    move-result-object v6
-
-    aput-object v6, v3, v4
-
-    const/4 v4, 0x4
-
     iget-object v6, p1, Lcom/facebook/drawee/generic/a;->OH:Landroid/graphics/drawable/Drawable;
 
     iget-object v7, p1, Lcom/facebook/drawee/generic/a;->OI:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
@@ -153,11 +141,23 @@
 
     aput-object v6, v3, v4
 
+    const/4 v4, 0x4
+
+    iget-object v6, p1, Lcom/facebook/drawee/generic/a;->OD:Landroid/graphics/drawable/Drawable;
+
+    iget-object v7, p1, Lcom/facebook/drawee/generic/a;->OE: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;
+
+    move-result-object v6
+
+    aput-object v6, v3, v4
+
     const/4 v4, 0x5
 
-    iget-object v6, p1, Lcom/facebook/drawee/generic/a;->OJ:Landroid/graphics/drawable/Drawable;
+    iget-object v6, p1, Lcom/facebook/drawee/generic/a;->OF:Landroid/graphics/drawable/Drawable;
 
-    iget-object v7, p1, Lcom/facebook/drawee/generic/a;->OL:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    iget-object v7, p1, Lcom/facebook/drawee/generic/a;->OG: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;->OS:Ljava/util/List;
+    iget-object v0, p1, Lcom/facebook/drawee/generic/a;->OO:Ljava/util/List;
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p1, Lcom/facebook/drawee/generic/a;->OS:Ljava/util/List;
+    iget-object v0, p1, Lcom/facebook/drawee/generic/a;->OO: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;->OT:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p1, Lcom/facebook/drawee/generic/a;->OP:Landroid/graphics/drawable/Drawable;
 
     if-eqz v0, :cond_3
 
     add-int/lit8 v2, v2, 0x6
 
-    iget-object v0, p1, Lcom/facebook/drawee/generic/a;->OT:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p1, Lcom/facebook/drawee/generic/a;->OP: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;->Oz:Lcom/facebook/drawee/drawable/f;
+    iput-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Ov:Lcom/facebook/drawee/drawable/f;
 
-    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Oz:Lcom/facebook/drawee/drawable/f;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Ov:Lcom/facebook/drawee/drawable/f;
 
-    iget p1, p1, Lcom/facebook/drawee/generic/a;->OD:I
+    iget p1, p1, Lcom/facebook/drawee/generic/a;->Oz:I
 
     invoke-virtual {v0, p1}, Lcom/facebook/drawee/drawable/f;->K(I)V
 
-    iget-object p1, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Oz:Lcom/facebook/drawee/drawable/f;
+    iget-object p1, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Ov:Lcom/facebook/drawee/drawable/f;
 
-    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Ox:Lcom/facebook/drawee/generic/d;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Ot: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;->Oy:Lcom/facebook/drawee/generic/c;
+    iput-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Ou:Lcom/facebook/drawee/generic/c;
 
-    iget-object p1, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Oy:Lcom/facebook/drawee/generic/c;
+    iget-object p1, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Ou: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;->hL()V
+    invoke-direct {p0}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->hJ()V
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     return-void
 .end method
@@ -264,7 +264,7 @@
 
     if-ltz p1, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Oz:Lcom/facebook/drawee/drawable/f;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Ov: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;->Oz:Lcom/facebook/drawee/drawable/f;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Ov: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;->Oz:Lcom/facebook/drawee/drawable/f;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Ov: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;->MU:[Lcom/facebook/drawee/drawable/c;
+    iget-object v3, v0, Lcom/facebook/drawee/drawable/a;->MQ:[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;->MU:[Lcom/facebook/drawee/drawable/c;
+    iget-object v1, v0, Lcom/facebook/drawee/drawable/a;->MQ:[Lcom/facebook/drawee/drawable/c;
 
     aget-object v1, v1, p1
 
     if-nez v1, :cond_2
 
-    iget-object v1, v0, Lcom/facebook/drawee/drawable/a;->MU:[Lcom/facebook/drawee/drawable/c;
+    iget-object v1, v0, Lcom/facebook/drawee/drawable/a;->MQ:[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;->MU:[Lcom/facebook/drawee/drawable/c;
+    iget-object v0, v0, Lcom/facebook/drawee/drawable/a;->MQ:[Lcom/facebook/drawee/drawable/c;
 
     aget-object p1, v0, p1
 
-    invoke-interface {p1}, Lcom/facebook/drawee/drawable/c;->hv()Landroid/graphics/drawable/Drawable;
+    invoke-interface {p1}, Lcom/facebook/drawee/drawable/c;->ht()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;->hv()Landroid/graphics/drawable/Drawable;
+    invoke-interface {p1}, Lcom/facebook/drawee/drawable/c;->ht()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;->hv()Landroid/graphics/drawable/Drawable;
+    invoke-interface {p1}, Lcom/facebook/drawee/drawable/c;->ht()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;->hv()Landroid/graphics/drawable/Drawable;
+    invoke-interface {p1}, Lcom/facebook/drawee/drawable/c;->ht()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;->Ox:Lcom/facebook/drawee/generic/d;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Ot: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 hL()V
+.method private hJ()V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Oz:Lcom/facebook/drawee/drawable/f;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Ov:Lcom/facebook/drawee/drawable/f;
 
     if-eqz v0, :cond_0
 
+    invoke-virtual {v0}, Lcom/facebook/drawee/drawable/f;->hu()V
+
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Ov:Lcom/facebook/drawee/drawable/f;
+
     invoke-virtual {v0}, Lcom/facebook/drawee/drawable/f;->hw()V
 
-    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Oz:Lcom/facebook/drawee/drawable/f;
-
-    invoke-virtual {v0}, Lcom/facebook/drawee/drawable/f;->hy()V
-
-    invoke-direct {p0}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->hM()V
+    invoke-direct {p0}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->hK()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;->Oz:Lcom/facebook/drawee/drawable/f;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Ov:Lcom/facebook/drawee/drawable/f;
 
-    invoke-virtual {v0}, Lcom/facebook/drawee/drawable/f;->hA()V
+    invoke-virtual {v0}, Lcom/facebook/drawee/drawable/f;->hy()V
 
-    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Oz:Lcom/facebook/drawee/drawable/f;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Ov:Lcom/facebook/drawee/drawable/f;
 
-    invoke-virtual {v0}, Lcom/facebook/drawee/drawable/f;->hx()V
+    invoke-virtual {v0}, Lcom/facebook/drawee/drawable/f;->hv()V
 
     :cond_0
     return-void
 .end method
 
-.method private hM()V
+.method private hK()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;->Oz:Lcom/facebook/drawee/drawable/f;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Ov: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;->Om:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sget-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Oi: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;->Oz:Lcom/facebook/drawee/drawable/f;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Ov: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;->Oz:Lcom/facebook/drawee/drawable/f;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Ov: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;->Oz:Lcom/facebook/drawee/drawable/f;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Ov:Lcom/facebook/drawee/drawable/f;
 
-    invoke-virtual {v0}, Lcom/facebook/drawee/drawable/f;->hw()V
+    invoke-virtual {v0}, Lcom/facebook/drawee/drawable/f;->hu()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;->Oz:Lcom/facebook/drawee/drawable/f;
+    iget-object p1, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Ov:Lcom/facebook/drawee/drawable/f;
 
-    invoke-virtual {p1}, Lcom/facebook/drawee/drawable/f;->hA()V
+    invoke-virtual {p1}, Lcom/facebook/drawee/drawable/f;->hy()V
 
     :cond_1
-    iget-object p1, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Oz:Lcom/facebook/drawee/drawable/f;
+    iget-object p1, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Ov:Lcom/facebook/drawee/drawable/f;
 
-    invoke-virtual {p1}, Lcom/facebook/drawee/drawable/f;->hx()V
+    invoke-virtual {p1}, Lcom/facebook/drawee/drawable/f;->hv()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;->Ox:Lcom/facebook/drawee/generic/d;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Ot: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;->OA:Lcom/facebook/drawee/drawable/g;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Ow: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;->Oz:Lcom/facebook/drawee/drawable/f;
+    iget-object p1, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Ov:Lcom/facebook/drawee/drawable/f;
 
-    invoke-virtual {p1}, Lcom/facebook/drawee/drawable/f;->hw()V
+    invoke-virtual {p1}, Lcom/facebook/drawee/drawable/f;->hu()V
 
-    invoke-direct {p0}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->hM()V
+    invoke-direct {p0}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->hK()V
 
     const/4 p1, 0x2
 
@@ -640,14 +640,14 @@
 
     if-eqz p3, :cond_0
 
-    iget-object p1, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Oz:Lcom/facebook/drawee/drawable/f;
+    iget-object p1, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Ov:Lcom/facebook/drawee/drawable/f;
 
-    invoke-virtual {p1}, Lcom/facebook/drawee/drawable/f;->hA()V
+    invoke-virtual {p1}, Lcom/facebook/drawee/drawable/f;->hy()V
 
     :cond_0
-    iget-object p1, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Oz:Lcom/facebook/drawee/drawable/f;
+    iget-object p1, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Ov:Lcom/facebook/drawee/drawable/f;
 
-    invoke-virtual {p1}, Lcom/facebook/drawee/drawable/f;->hx()V
+    invoke-virtual {p1}, Lcom/facebook/drawee/drawable/f;->hv()V
 
     return-void
 .end method
@@ -659,20 +659,20 @@
         .end annotation
     .end param
 
-    iput-object p1, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Ox:Lcom/facebook/drawee/generic/d;
+    iput-object p1, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Ot:Lcom/facebook/drawee/generic/d;
 
-    iget-object p1, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Oy:Lcom/facebook/drawee/generic/c;
+    iget-object p1, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Ou:Lcom/facebook/drawee/generic/c;
 
-    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Ox:Lcom/facebook/drawee/generic/d;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Ot: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;->Oz:Lcom/facebook/drawee/drawable/f;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Ov:Lcom/facebook/drawee/drawable/f;
 
-    iget-object v0, v0, Lcom/facebook/drawee/drawable/a;->MT:[Landroid/graphics/drawable/Drawable;
+    iget-object v0, v0, Lcom/facebook/drawee/drawable/a;->MP:[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;->Ox:Lcom/facebook/drawee/generic/d;
+    iget-object v1, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Ot: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;->Oy:Lcom/facebook/drawee/generic/c;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Ou:Lcom/facebook/drawee/generic/c;
 
-    iput-object p1, v0, Lcom/facebook/drawee/generic/c;->LR:Landroid/graphics/drawable/Drawable;
+    iput-object p1, v0, Lcom/facebook/drawee/generic/c;->LN: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;->Oz:Lcom/facebook/drawee/drawable/f;
+    iget-object p1, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Ov: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;->Ox:Lcom/facebook/drawee/generic/d;
+    iget-object v1, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Ot: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;->Oy:Lcom/facebook/drawee/generic/c;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Ou:Lcom/facebook/drawee/generic/c;
 
     return-object v0
 .end method
@@ -785,16 +785,16 @@
     return-void
 .end method
 
-.method public final hN()V
+.method public final hL()V
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Oz:Lcom/facebook/drawee/drawable/f;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Ov:Lcom/facebook/drawee/drawable/f;
 
-    invoke-virtual {v0}, Lcom/facebook/drawee/drawable/f;->hw()V
+    invoke-virtual {v0}, Lcom/facebook/drawee/drawable/f;->hu()V
 
-    invoke-direct {p0}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->hM()V
+    invoke-direct {p0}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->hK()V
 
-    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Oz:Lcom/facebook/drawee/drawable/f;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Ov: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;->Oz:Lcom/facebook/drawee/drawable/f;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Ov:Lcom/facebook/drawee/drawable/f;
 
-    invoke-virtual {v0}, Lcom/facebook/drawee/drawable/f;->hx()V
+    invoke-virtual {v0}, Lcom/facebook/drawee/drawable/f;->hv()V
 
     return-void
 .end method
 
-.method public final hO()V
+.method public final hM()V
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Oz:Lcom/facebook/drawee/drawable/f;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Ov:Lcom/facebook/drawee/drawable/f;
 
-    invoke-virtual {v0}, Lcom/facebook/drawee/drawable/f;->hw()V
+    invoke-virtual {v0}, Lcom/facebook/drawee/drawable/f;->hu()V
 
-    invoke-direct {p0}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->hM()V
+    invoke-direct {p0}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->hK()V
 
-    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Oz:Lcom/facebook/drawee/drawable/f;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Ov: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;->Oz:Lcom/facebook/drawee/drawable/f;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Ov:Lcom/facebook/drawee/drawable/f;
 
-    invoke-virtual {v0}, Lcom/facebook/drawee/drawable/f;->hx()V
+    invoke-virtual {v0}, Lcom/facebook/drawee/drawable/f;->hv()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;->OA:Lcom/facebook/drawee/drawable/g;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Ow:Lcom/facebook/drawee/drawable/g;
 
-    iget-object v1, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Ow:Landroid/graphics/drawable/Drawable;
+    iget-object v1, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Os: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;->hL()V
+    invoke-direct {p0}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->hJ()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 3fb80abd32..28a3f7617f 100644
--- a/com.discord/smali/com/facebook/drawee/generic/a.smali
+++ b/com.discord/smali/com/facebook/drawee/generic/a.smali
@@ -4,17 +4,35 @@
 
 
 # static fields
-.field public static final OB:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+.field public static final Ox:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-.field public static final OC:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+.field public static final Oy:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
 
 # instance fields
-.field OD:I
+.field public OA:F
 
-.field public OE:F
+.field public OB:Landroid/graphics/drawable/Drawable;
+    .annotation runtime Ljavax/annotation/Nullable;
+    .end annotation
+.end field
 
-.field public OF:Landroid/graphics/drawable/Drawable;
+.field OC:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    .annotation runtime Ljavax/annotation/Nullable;
+    .end annotation
+.end field
+
+.field OD:Landroid/graphics/drawable/Drawable;
+    .annotation runtime Ljavax/annotation/Nullable;
+    .end annotation
+.end field
+
+.field OE:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    .annotation runtime Ljavax/annotation/Nullable;
+    .end annotation
+.end field
+
+.field OF:Landroid/graphics/drawable/Drawable;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
@@ -34,47 +52,27 @@
     .end annotation
 .end field
 
-.field OJ:Landroid/graphics/drawable/Drawable;
+.field OJ:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field OL:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+.field private OL:Landroid/graphics/Matrix;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field OM:Landroid/graphics/drawable/Drawable;
+.field OM:Landroid/graphics/PointF;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field ON:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+.field ON:Landroid/graphics/ColorFilter;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.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;
+.field OO:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -87,16 +85,18 @@
     .end annotation
 .end field
 
-.field OT:Landroid/graphics/drawable/Drawable;
+.field OP:Landroid/graphics/drawable/Drawable;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field Ox:Lcom/facebook/drawee/generic/d;
+.field Ot:Lcom/facebook/drawee/generic/d;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
+.field Oz:I
+
 .field mBackground:Landroid/graphics/drawable/Drawable;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
@@ -109,13 +109,13 @@
 .method static constructor <clinit>()V
     .locals 1
 
-    sget-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Or:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sget-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->On:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-    sput-object v0, Lcom/facebook/drawee/generic/a;->OB:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sput-object v0, Lcom/facebook/drawee/generic/a;->Ox:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-    sget-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Os:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sget-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Oo:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-    sput-object v0, Lcom/facebook/drawee/generic/a;->OC:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sput-object v0, Lcom/facebook/drawee/generic/a;->Oy: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;->OD:I
+    iput p1, p0, Lcom/facebook/drawee/generic/a;->Oz:I
 
     const/4 p1, 0x0
 
-    iput p1, p0, Lcom/facebook/drawee/generic/a;->OE:F
+    iput p1, p0, Lcom/facebook/drawee/generic/a;->OA:F
 
     const/4 p1, 0x0
 
+    iput-object p1, p0, Lcom/facebook/drawee/generic/a;->OB:Landroid/graphics/drawable/Drawable;
+
+    sget-object v0, Lcom/facebook/drawee/generic/a;->Ox:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+
+    iput-object v0, p0, Lcom/facebook/drawee/generic/a;->OC:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+
+    iput-object p1, p0, Lcom/facebook/drawee/generic/a;->OD:Landroid/graphics/drawable/Drawable;
+
+    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/drawable/Drawable;
 
-    sget-object v0, Lcom/facebook/drawee/generic/a;->OB: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;->OH:Landroid/graphics/drawable/Drawable;
 
     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;
+    sget-object v0, Lcom/facebook/drawee/generic/a;->Oy:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-    iput-object v0, p0, Lcom/facebook/drawee/generic/a;->OL:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    iput-object v0, p0, Lcom/facebook/drawee/generic/a;->OJ:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-    iput-object p1, p0, Lcom/facebook/drawee/generic/a;->OM:Landroid/graphics/drawable/Drawable;
+    iput-object p1, p0, Lcom/facebook/drawee/generic/a;->OL:Landroid/graphics/Matrix;
 
-    iput-object v0, p0, Lcom/facebook/drawee/generic/a;->ON:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    iput-object p1, p0, Lcom/facebook/drawee/generic/a;->OM:Landroid/graphics/PointF;
 
-    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;->ON: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;->OO: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;->OP:Landroid/graphics/drawable/Drawable;
 
-    iput-object p1, p0, Lcom/facebook/drawee/generic/a;->Ox:Lcom/facebook/drawee/generic/d;
+    iput-object p1, p0, Lcom/facebook/drawee/generic/a;->Ot: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;->OS:Ljava/util/List;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/a;->OO: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;->OO:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    iput-object p1, p0, Lcom/facebook/drawee/generic/a;->OJ:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/facebook/drawee/generic/a;->OP:Landroid/graphics/Matrix;
+    iput-object p1, p0, Lcom/facebook/drawee/generic/a;->OL:Landroid/graphics/Matrix;
 
     return-object p0
 .end method
 
-.method public final hP()Lcom/facebook/drawee/generic/GenericDraweeHierarchy;
+.method public final hN()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;->OS:Ljava/util/List;
+    iput-object p1, p0, Lcom/facebook/drawee/generic/a;->OO:Ljava/util/List;
 
     goto :goto_0
 
@@ -276,7 +276,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/facebook/drawee/generic/a;->OS:Ljava/util/List;
+    iput-object p1, p0, Lcom/facebook/drawee/generic/a;->OO: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 dda481cd22..7230b787b6 100644
--- a/com.discord/smali/com/facebook/drawee/generic/b.smali
+++ b/com.discord/smali/com/facebook/drawee/generic/b.smali
@@ -26,50 +26,50 @@
     throw p0
 
     :pswitch_0
-    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;->Ot:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
-
-    return-object p0
-
-    :pswitch_2
-    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;->Or:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
-
-    return-object p0
-
-    :pswitch_4
     sget-object p0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Oq:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
     return-object p0
 
-    :pswitch_5
+    :pswitch_1
     sget-object p0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Op:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
     return-object p0
 
-    :pswitch_6
+    :pswitch_2
     sget-object p0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Oo:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
     return-object p0
 
-    :pswitch_7
+    :pswitch_3
     sget-object p0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->On:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
     return-object p0
 
-    :pswitch_8
+    :pswitch_4
     sget-object p0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Om:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
     return-object p0
 
+    :pswitch_5
+    sget-object p0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Ol:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+
+    return-object p0
+
+    :pswitch_6
+    sget-object p0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Ok:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+
+    return-object p0
+
+    :pswitch_7
+    sget-object p0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Oj:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+
+    return-object p0
+
+    :pswitch_8
+    sget-object p0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Oi:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+
+    return-object p0
+
     :pswitch_9
     const/4 p0, 0x0
 
@@ -178,7 +178,7 @@
 
     move-result-object v3
 
-    iput-object v3, v0, Lcom/facebook/drawee/generic/a;->OF:Landroid/graphics/drawable/Drawable;
+    iput-object v3, v0, Lcom/facebook/drawee/generic/a;->OB:Landroid/graphics/drawable/Drawable;
 
     goto :goto_1
 
@@ -195,7 +195,7 @@
 
     const/4 v3, 0x0
 
-    iput-object v3, v0, Lcom/facebook/drawee/generic/a;->OT:Landroid/graphics/drawable/Drawable;
+    iput-object v3, v0, Lcom/facebook/drawee/generic/a;->OP: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;->OT:Landroid/graphics/drawable/Drawable;
+    iput-object v4, v0, Lcom/facebook/drawee/generic/a;->OP:Landroid/graphics/drawable/Drawable;
 
     goto :goto_2
 
@@ -231,7 +231,7 @@
 
     move-result-object v3
 
-    iput-object v3, v0, Lcom/facebook/drawee/generic/a;->OM:Landroid/graphics/drawable/Drawable;
+    iput-object v3, v0, Lcom/facebook/drawee/generic/a;->OH:Landroid/graphics/drawable/Drawable;
 
     goto :goto_2
 
@@ -246,7 +246,7 @@
 
     move-result v3
 
-    iput v3, v0, Lcom/facebook/drawee/generic/a;->OD:I
+    iput v3, v0, Lcom/facebook/drawee/generic/a;->Oz:I
 
     goto :goto_2
 
@@ -261,7 +261,7 @@
 
     move-result v3
 
-    iput v3, v0, Lcom/facebook/drawee/generic/a;->OE:F
+    iput v3, v0, Lcom/facebook/drawee/generic/a;->OA:F
 
     goto :goto_2
 
@@ -274,7 +274,7 @@
 
     move-result-object v3
 
-    iput-object v3, v0, Lcom/facebook/drawee/generic/a;->OG:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    iput-object v3, v0, Lcom/facebook/drawee/generic/a;->OC: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;->OH:Landroid/graphics/drawable/Drawable;
+    iput-object v3, v0, Lcom/facebook/drawee/generic/a;->OD:Landroid/graphics/drawable/Drawable;
 
     goto :goto_2
 
@@ -300,7 +300,7 @@
 
     move-result-object v3
 
-    iput-object v3, v0, Lcom/facebook/drawee/generic/a;->OI:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    iput-object v3, v0, Lcom/facebook/drawee/generic/a;->OE: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;->OJ:Landroid/graphics/drawable/Drawable;
+    iput-object v3, v0, Lcom/facebook/drawee/generic/a;->OF: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;->OL:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    iput-object v3, v0, Lcom/facebook/drawee/generic/a;->OG: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;->ON:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    iput-object v3, v0, Lcom/facebook/drawee/generic/a;->OI: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;->OW:Z
+    iput-boolean v3, v7, Lcom/facebook/drawee/generic/d;->OS: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;->ND:F
+    iput v3, v1, Lcom/facebook/drawee/generic/d;->Nz:F
 
     goto :goto_7
 
@@ -611,7 +611,7 @@
 
     move-result v3
 
-    iput v3, v1, Lcom/facebook/drawee/generic/d;->NE:I
+    iput v3, v1, Lcom/facebook/drawee/generic/d;->NA:I
 
     goto :goto_7
 
@@ -845,7 +845,7 @@
     const/4 v6, 0x1
 
     :goto_12
-    iget-object v7, v0, Lcom/facebook/drawee/generic/a;->OM:Landroid/graphics/drawable/Drawable;
+    iget-object v7, v0, Lcom/facebook/drawee/generic/a;->OH: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;->OM:Landroid/graphics/drawable/Drawable;
+    iget-object v8, v0, Lcom/facebook/drawee/generic/a;->OH: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;->OM:Landroid/graphics/drawable/Drawable;
+    iput-object v7, v0, Lcom/facebook/drawee/generic/a;->OH: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;->hQ()[F
+    invoke-virtual {v1}, Lcom/facebook/drawee/generic/d;->hO()[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;->Ox:Lcom/facebook/drawee/generic/d;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/a;->Ot: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;->Ox:Lcom/facebook/drawee/generic/d;
+    iput-object v0, p0, Lcom/facebook/drawee/generic/a;->Ot:Lcom/facebook/drawee/generic/d;
 
     :cond_0
-    iget-object p0, p0, Lcom/facebook/drawee/generic/a;->Ox:Lcom/facebook/drawee/generic/d;
+    iget-object p0, p0, Lcom/facebook/drawee/generic/a;->Ot: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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()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 f8f853b67a..05d417fed4 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 LR:Landroid/graphics/drawable/Drawable;
+.field LN:Landroid/graphics/drawable/Drawable;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private OU:Lcom/facebook/drawee/drawable/t;
+.field private OQ: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;->LR:Landroid/graphics/drawable/Drawable;
+    iput-object p1, p0, Lcom/facebook/drawee/generic/c;->LN: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;->OU:Lcom/facebook/drawee/drawable/t;
+    iput-object p1, p0, Lcom/facebook/drawee/generic/c;->OQ: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;->OU:Lcom/facebook/drawee/drawable/t;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/c;->OQ:Lcom/facebook/drawee/drawable/t;
 
     if-eqz v0, :cond_1
 
-    invoke-interface {v0}, Lcom/facebook/drawee/drawable/t;->hK()V
+    invoke-interface {v0}, Lcom/facebook/drawee/drawable/t;->hI()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;->LR:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/c;->LN: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;->LR:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/c;->LN: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;->OU:Lcom/facebook/drawee/drawable/t;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/c;->OQ: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 41c654821f..db2244a7a9 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 NA:I
 
-.field NE:I
+.field NB:Z
 
-.field NF:Z
+.field public NC:Z
 
-.field public NG:Z
+.field NJ:I
 
-.field NO:I
+.field Nz:F
 
-.field public OV:Lcom/facebook/drawee/generic/d$a;
+.field public OR:Lcom/facebook/drawee/generic/d$a;
 
-.field public OW:Z
+.field public OS:Z
 
-.field OX:[F
+.field OT:[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;->OZ:Lcom/facebook/drawee/generic/d$a;
+    sget-object v0, Lcom/facebook/drawee/generic/d$a;->OV:Lcom/facebook/drawee/generic/d$a;
 
-    iput-object v0, p0, Lcom/facebook/drawee/generic/d;->OV:Lcom/facebook/drawee/generic/d$a;
+    iput-object v0, p0, Lcom/facebook/drawee/generic/d;->OR:Lcom/facebook/drawee/generic/d$a;
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/generic/d;->OW:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/generic/d;->OS:Z
 
     const/4 v1, 0x0
 
-    iput-object v1, p0, Lcom/facebook/drawee/generic/d;->OX:[F
+    iput-object v1, p0, Lcom/facebook/drawee/generic/d;->OT:[F
 
-    iput v0, p0, Lcom/facebook/drawee/generic/d;->NO:I
+    iput v0, p0, Lcom/facebook/drawee/generic/d;->NJ:I
 
     const/4 v1, 0x0
 
-    iput v1, p0, Lcom/facebook/drawee/generic/d;->ND:F
+    iput v1, p0, Lcom/facebook/drawee/generic/d;->Nz:F
 
-    iput v0, p0, Lcom/facebook/drawee/generic/d;->NE:I
+    iput v0, p0, Lcom/facebook/drawee/generic/d;->NA:I
 
     iput v1, p0, Lcom/facebook/drawee/generic/d;->mPadding:F
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/generic/d;->NF:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/generic/d;->NB:Z
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/generic/d;->NG:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/generic/d;->NC: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;->hQ()[F
+    invoke-virtual {p0}, Lcom/facebook/drawee/generic/d;->hO()[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;->NO:I
+    iput p1, p0, Lcom/facebook/drawee/generic/d;->NJ:I
 
-    sget-object p1, Lcom/facebook/drawee/generic/d$a;->OY:Lcom/facebook/drawee/generic/d$a;
+    sget-object p1, Lcom/facebook/drawee/generic/d$a;->OU:Lcom/facebook/drawee/generic/d$a;
 
-    iput-object p1, p0, Lcom/facebook/drawee/generic/d;->OV:Lcom/facebook/drawee/generic/d$a;
+    iput-object p1, p0, Lcom/facebook/drawee/generic/d;->OR: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;->OW:Z
+    iget-boolean v1, p0, Lcom/facebook/drawee/generic/d;->OS:Z
 
-    iget-boolean v2, p1, Lcom/facebook/drawee/generic/d;->OW:Z
+    iget-boolean v2, p1, Lcom/facebook/drawee/generic/d;->OS:Z
 
     if-eq v1, v2, :cond_2
 
     return v0
 
     :cond_2
-    iget v1, p0, Lcom/facebook/drawee/generic/d;->NO:I
+    iget v1, p0, Lcom/facebook/drawee/generic/d;->NJ:I
 
-    iget v2, p1, Lcom/facebook/drawee/generic/d;->NO:I
+    iget v2, p1, Lcom/facebook/drawee/generic/d;->NJ:I
 
     if-eq v1, v2, :cond_3
 
     return v0
 
     :cond_3
-    iget v1, p1, Lcom/facebook/drawee/generic/d;->ND:F
+    iget v1, p1, Lcom/facebook/drawee/generic/d;->Nz:F
 
-    iget v2, p0, Lcom/facebook/drawee/generic/d;->ND:F
+    iget v2, p0, Lcom/facebook/drawee/generic/d;->Nz: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;->NE:I
+    iget v1, p0, Lcom/facebook/drawee/generic/d;->NA:I
 
-    iget v2, p1, Lcom/facebook/drawee/generic/d;->NE:I
+    iget v2, p1, Lcom/facebook/drawee/generic/d;->NA:I
 
     if-eq v1, v2, :cond_5
 
@@ -195,36 +195,36 @@
     return v0
 
     :cond_6
-    iget-object v1, p0, Lcom/facebook/drawee/generic/d;->OV:Lcom/facebook/drawee/generic/d$a;
+    iget-object v1, p0, Lcom/facebook/drawee/generic/d;->OR:Lcom/facebook/drawee/generic/d$a;
 
-    iget-object v2, p1, Lcom/facebook/drawee/generic/d;->OV:Lcom/facebook/drawee/generic/d$a;
+    iget-object v2, p1, Lcom/facebook/drawee/generic/d;->OR: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;->NF:Z
+    iget-boolean v1, p0, Lcom/facebook/drawee/generic/d;->NB:Z
 
-    iget-boolean v2, p1, Lcom/facebook/drawee/generic/d;->NF:Z
+    iget-boolean v2, p1, Lcom/facebook/drawee/generic/d;->NB:Z
 
     if-eq v1, v2, :cond_8
 
     return v0
 
     :cond_8
-    iget-boolean v1, p0, Lcom/facebook/drawee/generic/d;->NG:Z
+    iget-boolean v1, p0, Lcom/facebook/drawee/generic/d;->NC:Z
 
-    iget-boolean v2, p1, Lcom/facebook/drawee/generic/d;->NG:Z
+    iget-boolean v2, p1, Lcom/facebook/drawee/generic/d;->NC:Z
 
     if-eq v1, v2, :cond_9
 
     return v0
 
     :cond_9
-    iget-object v0, p0, Lcom/facebook/drawee/generic/d;->OX:[F
+    iget-object v0, p0, Lcom/facebook/drawee/generic/d;->OT:[F
 
-    iget-object p1, p1, Lcom/facebook/drawee/generic/d;->OX:[F
+    iget-object p1, p1, Lcom/facebook/drawee/generic/d;->OT:[F
 
     invoke-static {v0, p1}, Ljava/util/Arrays;->equals([F[F)Z
 
@@ -237,10 +237,10 @@
     return v0
 .end method
 
-.method final hQ()[F
+.method final hO()[F
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/drawee/generic/d;->OX:[F
+    iget-object v0, p0, Lcom/facebook/drawee/generic/d;->OT:[F
 
     if-nez v0, :cond_0
 
@@ -248,10 +248,10 @@
 
     new-array v0, v0, [F
 
-    iput-object v0, p0, Lcom/facebook/drawee/generic/d;->OX:[F
+    iput-object v0, p0, Lcom/facebook/drawee/generic/d;->OT:[F
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/drawee/generic/d;->OX:[F
+    iget-object v0, p0, Lcom/facebook/drawee/generic/d;->OT:[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;->OV:Lcom/facebook/drawee/generic/d$a;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/d;->OR: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;->OW:Z
+    iget-boolean v2, p0, Lcom/facebook/drawee/generic/d;->OS:Z
 
     add-int/2addr v0, v2
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v2, p0, Lcom/facebook/drawee/generic/d;->OX:[F
+    iget-object v2, p0, Lcom/facebook/drawee/generic/d;->OT:[F
 
     if-eqz v2, :cond_1
 
@@ -301,13 +301,13 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget v2, p0, Lcom/facebook/drawee/generic/d;->NO:I
+    iget v2, p0, Lcom/facebook/drawee/generic/d;->NJ:I
 
     add-int/2addr v0, v2
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget v2, p0, Lcom/facebook/drawee/generic/d;->ND:F
+    iget v2, p0, Lcom/facebook/drawee/generic/d;->Nz:F
 
     const/4 v3, 0x0
 
@@ -329,7 +329,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget v2, p0, Lcom/facebook/drawee/generic/d;->NE:I
+    iget v2, p0, Lcom/facebook/drawee/generic/d;->NA: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;->NF:Z
+    iget-boolean v1, p0, Lcom/facebook/drawee/generic/d;->NB:Z
 
     add-int/2addr v0, v1
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-boolean v1, p0, Lcom/facebook/drawee/generic/d;->NG:Z
+    iget-boolean v1, p0, Lcom/facebook/drawee/generic/d;->NC: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 bfd27b9648..e01b68bfa2 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 Pb:Landroid/graphics/drawable/Drawable;
+.field private static final OX: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;->Pb:Landroid/graphics/drawable/Drawable;
+    sput-object v0, Lcom/facebook/drawee/generic/e;->OX: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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     return-object v0
 
     :cond_2
     :goto_0
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     return-object p0
 .end method
@@ -80,15 +80,15 @@
     .end param
 
     :try_start_0
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     if-eqz p0, :cond_1
 
     if-eqz p1, :cond_1
 
-    iget-object v0, p1, Lcom/facebook/drawee/generic/d;->OV:Lcom/facebook/drawee/generic/d$a;
+    iget-object v0, p1, Lcom/facebook/drawee/generic/d;->OR:Lcom/facebook/drawee/generic/d$a;
 
-    sget-object v1, Lcom/facebook/drawee/generic/d$a;->OY:Lcom/facebook/drawee/generic/d$a;
+    sget-object v1, Lcom/facebook/drawee/generic/d$a;->OU: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;->NO:I
+    iget p0, p1, Lcom/facebook/drawee/generic/d;->NJ: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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     return-object v0
 
     :cond_1
     :goto_0
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     return-object p0
 
     :catchall_0
     move-exception p0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     throw p0
 .end method
@@ -137,15 +137,15 @@
     .end param
 
     :try_start_0
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     if-eqz p0, :cond_2
 
     if-eqz p1, :cond_2
 
-    iget-object v0, p1, Lcom/facebook/drawee/generic/d;->OV:Lcom/facebook/drawee/generic/d$a;
+    iget-object v0, p1, Lcom/facebook/drawee/generic/d;->OR:Lcom/facebook/drawee/generic/d$a;
 
-    sget-object v1, Lcom/facebook/drawee/generic/d$a;->OZ:Lcom/facebook/drawee/generic/d$a;
+    sget-object v1, Lcom/facebook/drawee/generic/d$a;->OV: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;->Pb:Landroid/graphics/drawable/Drawable;
+    sget-object v1, Lcom/facebook/drawee/generic/e;->OX: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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     return-object p0
 
     :cond_2
     :goto_0
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     return-object p0
 
     :catchall_0
     move-exception p0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     throw p0
 .end method
@@ -212,7 +212,7 @@
     .locals 2
 
     :goto_0
-    invoke-interface {p0}, Lcom/facebook/drawee/drawable/c;->hv()Landroid/graphics/drawable/Drawable;
+    invoke-interface {p0}, Lcom/facebook/drawee/drawable/c;->ht()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;->Pb:Landroid/graphics/drawable/Drawable;
+    sget-object v0, Lcom/facebook/drawee/generic/e;->OX: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;->hv()Landroid/graphics/drawable/Drawable;
+    invoke-interface {p0}, Lcom/facebook/drawee/drawable/c;->ht()Landroid/graphics/drawable/Drawable;
 
     move-result-object v0
 
     if-eqz p1, :cond_1
 
-    iget-object v1, p1, Lcom/facebook/drawee/generic/d;->OV:Lcom/facebook/drawee/generic/d$a;
+    iget-object v1, p1, Lcom/facebook/drawee/generic/d;->OR:Lcom/facebook/drawee/generic/d$a;
 
-    sget-object v2, Lcom/facebook/drawee/generic/d$a;->OY:Lcom/facebook/drawee/generic/d$a;
+    sget-object v2, Lcom/facebook/drawee/generic/d$a;->OU: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;->NO:I
+    iget p0, p1, Lcom/facebook/drawee/generic/d;->NJ: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;->Pb:Landroid/graphics/drawable/Drawable;
+    sget-object v0, Lcom/facebook/drawee/generic/e;->OX: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;->Pb:Landroid/graphics/drawable/Drawable;
+    sget-object p1, Lcom/facebook/drawee/generic/e;->OX: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;->Pb:Landroid/graphics/drawable/Drawable;
+    sget-object p0, Lcom/facebook/drawee/generic/e;->OX:Landroid/graphics/drawable/Drawable;
 
     const/4 p1, 0x0
 
@@ -342,15 +342,15 @@
 
     move-result-object p0
 
-    invoke-interface {p0}, Lcom/facebook/drawee/drawable/c;->hv()Landroid/graphics/drawable/Drawable;
+    invoke-interface {p0}, Lcom/facebook/drawee/drawable/c;->ht()Landroid/graphics/drawable/Drawable;
 
     move-result-object v0
 
     if-eqz p1, :cond_1
 
-    iget-object v1, p1, Lcom/facebook/drawee/generic/d;->OV:Lcom/facebook/drawee/generic/d$a;
+    iget-object v1, p1, Lcom/facebook/drawee/generic/d;->OR:Lcom/facebook/drawee/generic/d$a;
 
-    sget-object v2, Lcom/facebook/drawee/generic/d$a;->OZ:Lcom/facebook/drawee/generic/d$a;
+    sget-object v2, Lcom/facebook/drawee/generic/d$a;->OV: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;->Pb:Landroid/graphics/drawable/Drawable;
+    sget-object v1, Lcom/facebook/drawee/generic/e;->OX: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;->hC()V
+    invoke-interface {v0}, Lcom/facebook/drawee/drawable/j;->hA()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;->OW:Z
+    iget-boolean v0, p1, Lcom/facebook/drawee/generic/d;->OS:Z
 
     invoke-interface {p0, v0}, Lcom/facebook/drawee/drawable/j;->t(Z)V
 
-    iget-object v0, p1, Lcom/facebook/drawee/generic/d;->OX:[F
+    iget-object v0, p1, Lcom/facebook/drawee/generic/d;->OT:[F
 
     invoke-interface {p0, v0}, Lcom/facebook/drawee/drawable/j;->a([F)V
 
-    iget v0, p1, Lcom/facebook/drawee/generic/d;->NE:I
+    iget v0, p1, Lcom/facebook/drawee/generic/d;->NA:I
 
-    iget v1, p1, Lcom/facebook/drawee/generic/d;->ND:F
+    iget v1, p1, Lcom/facebook/drawee/generic/d;->Nz: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;->NF:Z
+    iget-boolean v0, p1, Lcom/facebook/drawee/generic/d;->NB:Z
 
     invoke-interface {p0, v0}, Lcom/facebook/drawee/drawable/j;->u(Z)V
 
-    iget-boolean p1, p1, Lcom/facebook/drawee/generic/d;->NG:Z
+    iget-boolean p1, p1, Lcom/facebook/drawee/generic/d;->NC: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 a92e332194..87d7e7c550 100644
--- a/com.discord/smali/com/facebook/drawee/view/DraweeView.smali
+++ b/com.discord/smali/com/facebook/drawee/view/DraweeView.smali
@@ -15,13 +15,11 @@
 
 
 # static fields
-.field private static PB:Z = false
+.field private static Px:Z = false
 
 
 # instance fields
-.field private PA:Z
-
-.field public Pj:Lcom/facebook/drawee/view/b;
+.field public Pf:Lcom/facebook/drawee/view/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/drawee/view/b<",
@@ -30,11 +28,13 @@
     .end annotation
 .end field
 
-.field private final Py:Lcom/facebook/drawee/view/a$a;
+.field private final Pu:Lcom/facebook/drawee/view/a$a;
 
-.field private Pz:Z
+.field private Pv:Z
 
-.field private mU:F
+.field private Pw:Z
+
+.field private mV: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;->Py:Lcom/facebook/drawee/view/a$a;
+    iput-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->Pu:Lcom/facebook/drawee/view/a$a;
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lcom/facebook/drawee/view/DraweeView;->mU:F
+    iput v0, p0, Lcom/facebook/drawee/view/DraweeView;->mV:F
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/view/DraweeView;->Pz:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/view/DraweeView;->Pv:Z
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/view/DraweeView;->PA:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/view/DraweeView;->Pw: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;->Py:Lcom/facebook/drawee/view/a$a;
+    iput-object p2, p0, Lcom/facebook/drawee/view/DraweeView;->Pu:Lcom/facebook/drawee/view/a$a;
 
     const/4 p2, 0x0
 
-    iput p2, p0, Lcom/facebook/drawee/view/DraweeView;->mU:F
+    iput p2, p0, Lcom/facebook/drawee/view/DraweeView;->mV:F
 
     const/4 p2, 0x0
 
-    iput-boolean p2, p0, Lcom/facebook/drawee/view/DraweeView;->Pz:Z
+    iput-boolean p2, p0, Lcom/facebook/drawee/view/DraweeView;->Pv:Z
 
-    iput-boolean p2, p0, Lcom/facebook/drawee/view/DraweeView;->PA:Z
+    iput-boolean p2, p0, Lcom/facebook/drawee/view/DraweeView;->Pw: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;->Py:Lcom/facebook/drawee/view/a$a;
+    iput-object p2, p0, Lcom/facebook/drawee/view/DraweeView;->Pu:Lcom/facebook/drawee/view/a$a;
 
     const/4 p2, 0x0
 
-    iput p2, p0, Lcom/facebook/drawee/view/DraweeView;->mU:F
+    iput p2, p0, Lcom/facebook/drawee/view/DraweeView;->mV:F
 
     const/4 p2, 0x0
 
-    iput-boolean p2, p0, Lcom/facebook/drawee/view/DraweeView;->Pz:Z
+    iput-boolean p2, p0, Lcom/facebook/drawee/view/DraweeView;->Pv:Z
 
-    iput-boolean p2, p0, Lcom/facebook/drawee/view/DraweeView;->PA:Z
+    iput-boolean p2, p0, Lcom/facebook/drawee/view/DraweeView;->Pw: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;->Py:Lcom/facebook/drawee/view/a$a;
+    iput-object p2, p0, Lcom/facebook/drawee/view/DraweeView;->Pu:Lcom/facebook/drawee/view/a$a;
 
     const/4 p2, 0x0
 
-    iput p2, p0, Lcom/facebook/drawee/view/DraweeView;->mU:F
+    iput p2, p0, Lcom/facebook/drawee/view/DraweeView;->mV:F
 
     const/4 p2, 0x0
 
-    iput-boolean p2, p0, Lcom/facebook/drawee/view/DraweeView;->Pz:Z
+    iput-boolean p2, p0, Lcom/facebook/drawee/view/DraweeView;->Pv:Z
 
-    iput-boolean p2, p0, Lcom/facebook/drawee/view/DraweeView;->PA:Z
+    iput-boolean p2, p0, Lcom/facebook/drawee/view/DraweeView;->Pw:Z
 
     invoke-direct {p0, p1}, Lcom/facebook/drawee/view/DraweeView;->init(Landroid/content/Context;)V
 
     return-void
 .end method
 
-.method private hV()V
+.method private hT()V
     .locals 3
 
-    iget-boolean v0, p0, Lcom/facebook/drawee/view/DraweeView;->PA:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/view/DraweeView;->Pw:Z
 
     if-eqz v0, :cond_1
 
@@ -187,15 +187,15 @@
     .locals 3
 
     :try_start_0
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
-    iget-boolean v0, p0, Lcom/facebook/drawee/view/DraweeView;->Pz:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/view/DraweeView;->Pv: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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     return-void
 
@@ -203,7 +203,7 @@
     const/4 v0, 0x1
 
     :try_start_1
-    iput-boolean v0, p0, Lcom/facebook/drawee/view/DraweeView;->Pz:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/view/DraweeView;->Pv:Z
 
     const/4 v1, 0x0
 
@@ -211,7 +211,7 @@
 
     move-result-object v1
 
-    iput-object v1, p0, Lcom/facebook/drawee/view/DraweeView;->Pj:Lcom/facebook/drawee/view/b;
+    iput-object v1, p0, Lcom/facebook/drawee/view/DraweeView;->Pf: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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()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;->PB:Z
+    sget-boolean v1, Lcom/facebook/drawee/view/DraweeView;->Px: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;->PA:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/view/DraweeView;->Pw:Z
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     return-void
 
     :catchall_0
     move-exception p1
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()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;->PB:Z
+    sput-boolean p0, Lcom/facebook/drawee/view/DraweeView;->Px:Z
 
     return-void
 .end method
@@ -289,7 +289,7 @@
 .method public getAspectRatio()F
     .locals 1
 
-    iget v0, p0, Lcom/facebook/drawee/view/DraweeView;->mU:F
+    iget v0, p0, Lcom/facebook/drawee/view/DraweeView;->mV: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;->Pj:Lcom/facebook/drawee/view/b;
+    iget-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->Pf:Lcom/facebook/drawee/view/b;
 
-    iget-object v0, v0, Lcom/facebook/drawee/view/b;->Px:Lcom/facebook/drawee/d/a;
+    iget-object v0, v0, Lcom/facebook/drawee/view/b;->Pt: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;->Pj:Lcom/facebook/drawee/view/b;
+    iget-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->Pf:Lcom/facebook/drawee/view/b;
 
-    iget-object v0, v0, Lcom/facebook/drawee/view/b;->Pw:Lcom/facebook/drawee/d/b;
+    iget-object v0, v0, Lcom/facebook/drawee/view/b;->Ps: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;->Pj:Lcom/facebook/drawee/view/b;
+    iget-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->Pf: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;->hV()V
+    invoke-direct {p0}, Lcom/facebook/drawee/view/DraweeView;->hT()V
 
-    iget-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->Pj:Lcom/facebook/drawee/view/b;
+    iget-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->Pf:Lcom/facebook/drawee/view/b;
 
-    invoke-virtual {v0}, Lcom/facebook/drawee/view/b;->hj()V
+    invoke-virtual {v0}, Lcom/facebook/drawee/view/b;->hh()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;->hV()V
+    invoke-direct {p0}, Lcom/facebook/drawee/view/DraweeView;->hT()V
 
-    iget-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->Pj:Lcom/facebook/drawee/view/b;
+    iget-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->Pf: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;->hV()V
+    invoke-direct {p0}, Lcom/facebook/drawee/view/DraweeView;->hT()V
 
-    iget-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->Pj:Lcom/facebook/drawee/view/b;
+    iget-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->Pf:Lcom/facebook/drawee/view/b;
 
-    invoke-virtual {v0}, Lcom/facebook/drawee/view/b;->hj()V
+    invoke-virtual {v0}, Lcom/facebook/drawee/view/b;->hh()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;->Py:Lcom/facebook/drawee/view/a$a;
+    iget-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->Pu: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;->mU:F
+    iget p1, p0, Lcom/facebook/drawee/view/DraweeView;->mV: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;->Py:Lcom/facebook/drawee/view/a$a;
+    iget-object p1, p0, Lcom/facebook/drawee/view/DraweeView;->Pu: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;->Py:Lcom/facebook/drawee/view/a$a;
+    iget-object p2, p0, Lcom/facebook/drawee/view/DraweeView;->Pu: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;->hV()V
+    invoke-direct {p0}, Lcom/facebook/drawee/view/DraweeView;->hT()V
 
-    iget-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->Pj:Lcom/facebook/drawee/view/b;
+    iget-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->Pf: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;->Pj:Lcom/facebook/drawee/view/b;
+    iget-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->Pf:Lcom/facebook/drawee/view/b;
 
-    invoke-virtual {v0}, Lcom/facebook/drawee/view/b;->hR()Z
+    invoke-virtual {v0}, Lcom/facebook/drawee/view/b;->hP()Z
 
     move-result v1
 
@@ -555,7 +555,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, v0, Lcom/facebook/drawee/view/b;->Px:Lcom/facebook/drawee/d/a;
+    iget-object v0, v0, Lcom/facebook/drawee/view/b;->Pt: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;->hV()V
+    invoke-direct {p0}, Lcom/facebook/drawee/view/DraweeView;->hT()V
 
     return-void
 .end method
@@ -589,7 +589,7 @@
 .method public setAspectRatio(F)V
     .locals 1
 
-    iget v0, p0, Lcom/facebook/drawee/view/DraweeView;->mU:F
+    iget v0, p0, Lcom/facebook/drawee/view/DraweeView;->mV:F
 
     cmpl-float v0, p1, v0
 
@@ -598,7 +598,7 @@
     return-void
 
     :cond_0
-    iput p1, p0, Lcom/facebook/drawee/view/DraweeView;->mU:F
+    iput p1, p0, Lcom/facebook/drawee/view/DraweeView;->mV: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;->Pj:Lcom/facebook/drawee/view/b;
+    iget-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->Pf: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;->Pj:Lcom/facebook/drawee/view/b;
+    iget-object p1, p0, Lcom/facebook/drawee/view/DraweeView;->Pf: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;->Pj:Lcom/facebook/drawee/view/b;
+    iget-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->Pf: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;->Pj:Lcom/facebook/drawee/view/b;
+    iget-object p1, p0, Lcom/facebook/drawee/view/DraweeView;->Pf: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;->Pj:Lcom/facebook/drawee/view/b;
+    iget-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->Pf: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;->Pj:Lcom/facebook/drawee/view/b;
+    iget-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->Pf: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;->Pj:Lcom/facebook/drawee/view/b;
+    iget-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->Pf: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;->Pj:Lcom/facebook/drawee/view/b;
+    iget-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->Pf: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;->PA:Z
+    iput-boolean p1, p0, Lcom/facebook/drawee/view/DraweeView;->Pw:Z
 
     return-void
 .end method
@@ -753,7 +753,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/facebook/drawee/view/DraweeView;->Pj:Lcom/facebook/drawee/view/b;
+    iget-object v1, p0, Lcom/facebook/drawee/view/DraweeView;->Pf: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 0419b0952d..c704e14878 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 PC:Lcom/facebook/common/d/l;
+.field private static Py:Lcom/facebook/common/d/l;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/d/l<",
@@ -17,7 +17,7 @@
 
 
 # instance fields
-.field private PD:Lcom/facebook/drawee/controller/a;
+.field private Pz:Lcom/facebook/drawee/controller/a;
 
 
 # direct methods
@@ -87,7 +87,7 @@
         }
     .end annotation
 
-    sput-object p0, Lcom/facebook/drawee/view/SimpleDraweeView;->PC:Lcom/facebook/common/d/l;
+    sput-object p0, Lcom/facebook/drawee/view/SimpleDraweeView;->Py: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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()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;->PC:Lcom/facebook/common/d/l;
+    sget-object v0, Lcom/facebook/drawee/view/SimpleDraweeView;->Py: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;->PC:Lcom/facebook/common/d/l;
+    sget-object v0, Lcom/facebook/drawee/view/SimpleDraweeView;->Py: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;->PD:Lcom/facebook/drawee/controller/a;
+    iput-object v0, p0, Lcom/facebook/drawee/view/SimpleDraweeView;->Pz: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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     return-void
 
     :catchall_1
     move-exception p1
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     throw p1
 .end method
@@ -252,9 +252,9 @@
         .end annotation
     .end param
 
-    iget-object v0, p0, Lcom/facebook/drawee/view/SimpleDraweeView;->PD:Lcom/facebook/drawee/controller/a;
+    iget-object v0, p0, Lcom/facebook/drawee/view/SimpleDraweeView;->Pz:Lcom/facebook/drawee/controller/a;
 
-    iput-object p2, v0, Lcom/facebook/drawee/controller/a;->Ky:Ljava/lang/Object;
+    iput-object p2, v0, Lcom/facebook/drawee/controller/a;->Ku: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;->ht()Lcom/facebook/drawee/d/a;
+    invoke-interface {p1}, Lcom/facebook/drawee/d/d;->hr()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;->PD:Lcom/facebook/drawee/controller/a;
+    iget-object v0, p0, Lcom/facebook/drawee/view/SimpleDraweeView;->Pz: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;->PD:Lcom/facebook/drawee/controller/a;
+    iget-object v0, p0, Lcom/facebook/drawee/view/SimpleDraweeView;->Pz:Lcom/facebook/drawee/controller/a;
 
-    iput-object p1, v0, Lcom/facebook/drawee/controller/a;->Mf:Ljava/lang/Object;
+    iput-object p1, v0, Lcom/facebook/drawee/controller/a;->Mb: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;->Mk:Lcom/facebook/drawee/d/a;
+    iput-object p1, v0, Lcom/facebook/drawee/controller/a;->Mg:Lcom/facebook/drawee/d/a;
 
-    invoke-virtual {v0}, Lcom/facebook/drawee/controller/a;->hr()Lcom/facebook/drawee/controller/AbstractDraweeController;
+    invoke-virtual {v0}, Lcom/facebook/drawee/controller/a;->hp()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 713822f9ce..0b534dd6ee 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 LK:Lcom/facebook/drawee/a/b;
+.field private final LG:Lcom/facebook/drawee/a/b;
 
-.field private Pt:Z
+.field private Pp:Z
 
-.field private Pu:Z
+.field private Pq:Z
 
-.field private Pv:Z
+.field private Pr:Z
 
-.field public Pw:Lcom/facebook/drawee/d/b;
+.field public Ps:Lcom/facebook/drawee/d/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TDH;"
@@ -35,7 +35,7 @@
     .end annotation
 .end field
 
-.field public Px:Lcom/facebook/drawee/d/a;
+.field public Pt:Lcom/facebook/drawee/d/a;
 
 
 # direct methods
@@ -55,23 +55,23 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/view/b;->Pt:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/view/b;->Pp:Z
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/view/b;->Pu:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/view/b;->Pq:Z
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/view/b;->Pv:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/view/b;->Pr:Z
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/facebook/drawee/view/b;->Px:Lcom/facebook/drawee/d/a;
+    iput-object v0, p0, Lcom/facebook/drawee/view/b;->Pt:Lcom/facebook/drawee/d/a;
 
-    invoke-static {}, Lcom/facebook/drawee/a/b;->he()Lcom/facebook/drawee/a/b;
+    invoke-static {}, Lcom/facebook/drawee/a/b;->hc()Lcom/facebook/drawee/a/b;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/facebook/drawee/view/b;->LK:Lcom/facebook/drawee/a/b;
+    iput-object v0, p0, Lcom/facebook/drawee/view/b;->LG:Lcom/facebook/drawee/a/b;
 
     if-eqz p1, :cond_0
 
@@ -127,27 +127,27 @@
     return-void
 .end method
 
-.method private hS()V
+.method private hQ()V
     .locals 2
 
-    iget-boolean v0, p0, Lcom/facebook/drawee/view/b;->Pt:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/view/b;->Pp:Z
 
     if-eqz v0, :cond_0
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/drawee/view/b;->LK:Lcom/facebook/drawee/a/b;
+    iget-object v0, p0, Lcom/facebook/drawee/view/b;->LG: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;->Lk: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;->Pt:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/view/b;->Pp:Z
 
-    iget-object v0, p0, Lcom/facebook/drawee/view/b;->Px:Lcom/facebook/drawee/d/a;
+    iget-object v0, p0, Lcom/facebook/drawee/view/b;->Pt: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;->Px:Lcom/facebook/drawee/d/a;
+    iget-object v0, p0, Lcom/facebook/drawee/view/b;->Pt:Lcom/facebook/drawee/d/a;
 
-    invoke-interface {v0}, Lcom/facebook/drawee/d/a;->hj()V
+    invoke-interface {v0}, Lcom/facebook/drawee/d/a;->hh()V
 
     :cond_1
     return-void
 .end method
 
-.method private hT()V
+.method private hR()V
     .locals 2
 
-    iget-boolean v0, p0, Lcom/facebook/drawee/view/b;->Pt:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/view/b;->Pp:Z
 
     if-nez v0, :cond_0
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/drawee/view/b;->LK:Lcom/facebook/drawee/a/b;
+    iget-object v0, p0, Lcom/facebook/drawee/view/b;->LG:Lcom/facebook/drawee/a/b;
 
-    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;->Ll: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;->Pt:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/view/b;->Pp:Z
 
-    invoke-virtual {p0}, Lcom/facebook/drawee/view/b;->hR()Z
+    invoke-virtual {p0}, Lcom/facebook/drawee/view/b;->hP()Z
 
     move-result v0
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/drawee/view/b;->Px:Lcom/facebook/drawee/d/a;
+    iget-object v0, p0, Lcom/facebook/drawee/view/b;->Pt: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 hU()V
+.method private hS()V
     .locals 1
 
-    iget-boolean v0, p0, Lcom/facebook/drawee/view/b;->Pu:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/view/b;->Pq:Z
 
     if-eqz v0, :cond_0
 
-    iget-boolean v0, p0, Lcom/facebook/drawee/view/b;->Pv:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/view/b;->Pr:Z
 
     if-eqz v0, :cond_0
 
-    invoke-direct {p0}, Lcom/facebook/drawee/view/b;->hS()V
+    invoke-direct {p0}, Lcom/facebook/drawee/view/b;->hQ()V
 
     return-void
 
     :cond_0
-    invoke-direct {p0}, Lcom/facebook/drawee/view/b;->hT()V
+    invoke-direct {p0}, Lcom/facebook/drawee/view/b;->hR()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;->Pw:Lcom/facebook/drawee/d/b;
+    iget-object v0, p0, Lcom/facebook/drawee/view/b;->Ps:Lcom/facebook/drawee/d/b;
 
     if-nez v0, :cond_0
 
@@ -243,10 +243,10 @@
     return-object v0
 .end method
 
-.method public final hK()V
+.method public final hI()V
     .locals 5
 
-    iget-boolean v0, p0, Lcom/facebook/drawee/view/b;->Pt:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/view/b;->Pp:Z
 
     if-eqz v0, :cond_0
 
@@ -271,7 +271,7 @@
 
     aput-object v3, v1, v2
 
-    iget-object v2, p0, Lcom/facebook/drawee/view/b;->Px:Lcom/facebook/drawee/d/a;
+    iget-object v2, p0, Lcom/facebook/drawee/view/b;->Pt: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;->Pu:Z
+    iput-boolean v3, p0, Lcom/facebook/drawee/view/b;->Pq:Z
 
-    iput-boolean v3, p0, Lcom/facebook/drawee/view/b;->Pv:Z
+    iput-boolean v3, p0, Lcom/facebook/drawee/view/b;->Pr:Z
 
-    invoke-direct {p0}, Lcom/facebook/drawee/view/b;->hU()V
+    invoke-direct {p0}, Lcom/facebook/drawee/view/b;->hS()V
 
     return-void
 .end method
 
-.method public final hR()Z
+.method public final hP()Z
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/drawee/view/b;->Px:Lcom/facebook/drawee/d/a;
+    iget-object v0, p0, Lcom/facebook/drawee/view/b;->Pt: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;->Pw:Lcom/facebook/drawee/d/b;
+    iget-object v1, p0, Lcom/facebook/drawee/view/b;->Ps:Lcom/facebook/drawee/d/b;
 
     if-ne v0, v1, :cond_0
 
@@ -331,20 +331,20 @@
     return v0
 .end method
 
-.method public final hj()V
+.method public final hh()V
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/drawee/view/b;->LK:Lcom/facebook/drawee/a/b;
+    iget-object v0, p0, Lcom/facebook/drawee/view/b;->LG: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;->Ls: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;->Pu:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/view/b;->Pq:Z
 
-    invoke-direct {p0}, Lcom/facebook/drawee/view/b;->hU()V
+    invoke-direct {p0}, Lcom/facebook/drawee/view/b;->hS()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;->LK:Lcom/facebook/drawee/a/b;
+    iget-object v0, p0, Lcom/facebook/drawee/view/b;->LG:Lcom/facebook/drawee/a/b;
 
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->Lx:Lcom/facebook/drawee/a/b$a;
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->Lt: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;->Pu:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/view/b;->Pq:Z
 
-    invoke-direct {p0}, Lcom/facebook/drawee/view/b;->hU()V
+    invoke-direct {p0}, Lcom/facebook/drawee/view/b;->hS()V
 
     return-void
 .end method
@@ -374,63 +374,63 @@
         .end annotation
     .end param
 
-    iget-boolean v0, p0, Lcom/facebook/drawee/view/b;->Pt:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/view/b;->Pp:Z
 
     if-eqz v0, :cond_0
 
-    invoke-direct {p0}, Lcom/facebook/drawee/view/b;->hT()V
+    invoke-direct {p0}, Lcom/facebook/drawee/view/b;->hR()V
 
     :cond_0
-    invoke-virtual {p0}, Lcom/facebook/drawee/view/b;->hR()Z
+    invoke-virtual {p0}, Lcom/facebook/drawee/view/b;->hP()Z
 
     move-result v1
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/facebook/drawee/view/b;->LK:Lcom/facebook/drawee/a/b;
+    iget-object v1, p0, Lcom/facebook/drawee/view/b;->LG:Lcom/facebook/drawee/a/b;
 
-    sget-object v2, Lcom/facebook/drawee/a/b$a;->Ll:Lcom/facebook/drawee/a/b$a;
+    sget-object v2, Lcom/facebook/drawee/a/b$a;->Lh: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;->Px:Lcom/facebook/drawee/d/a;
+    iget-object v1, p0, Lcom/facebook/drawee/view/b;->Pt: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;->Px:Lcom/facebook/drawee/d/a;
+    iput-object p1, p0, Lcom/facebook/drawee/view/b;->Pt:Lcom/facebook/drawee/d/a;
 
-    iget-object p1, p0, Lcom/facebook/drawee/view/b;->Px:Lcom/facebook/drawee/d/a;
+    iget-object p1, p0, Lcom/facebook/drawee/view/b;->Pt:Lcom/facebook/drawee/d/a;
 
     if-eqz p1, :cond_2
 
-    iget-object p1, p0, Lcom/facebook/drawee/view/b;->LK:Lcom/facebook/drawee/a/b;
+    iget-object p1, p0, Lcom/facebook/drawee/view/b;->LG:Lcom/facebook/drawee/a/b;
 
-    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;->Lg: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;->Px:Lcom/facebook/drawee/d/a;
+    iget-object p1, p0, Lcom/facebook/drawee/view/b;->Pt:Lcom/facebook/drawee/d/a;
 
-    iget-object v1, p0, Lcom/facebook/drawee/view/b;->Pw:Lcom/facebook/drawee/d/b;
+    iget-object v1, p0, Lcom/facebook/drawee/view/b;->Ps: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;->LK:Lcom/facebook/drawee/a/b;
+    iget-object p1, p0, Lcom/facebook/drawee/view/b;->LG:Lcom/facebook/drawee/a/b;
 
-    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;->Li: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;->hS()V
+    invoke-direct {p0}, Lcom/facebook/drawee/view/b;->hQ()V
 
     :cond_3
     return-void
@@ -444,13 +444,13 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/drawee/view/b;->LK:Lcom/facebook/drawee/a/b;
+    iget-object v0, p0, Lcom/facebook/drawee/view/b;->LG:Lcom/facebook/drawee/a/b;
 
-    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;->Le: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;->hR()Z
+    invoke-virtual {p0}, Lcom/facebook/drawee/view/b;->hP()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;->Pw:Lcom/facebook/drawee/d/b;
+    iput-object v1, p0, Lcom/facebook/drawee/view/b;->Ps:Lcom/facebook/drawee/d/b;
 
-    iget-object v1, p0, Lcom/facebook/drawee/view/b;->Pw:Lcom/facebook/drawee/d/b;
+    iget-object v1, p0, Lcom/facebook/drawee/view/b;->Ps: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;->Px:Lcom/facebook/drawee/d/a;
+    iget-object v0, p0, Lcom/facebook/drawee/view/b;->Pt: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;->Pt:Z
+    iget-boolean v1, p0, Lcom/facebook/drawee/view/b;->Pp:Z
 
     const-string v2, "controllerAttached"
 
@@ -521,7 +521,7 @@
 
     move-result-object v0
 
-    iget-boolean v1, p0, Lcom/facebook/drawee/view/b;->Pu:Z
+    iget-boolean v1, p0, Lcom/facebook/drawee/view/b;->Pq:Z
 
     const-string v2, "holderAttached"
 
@@ -529,7 +529,7 @@
 
     move-result-object v0
 
-    iget-boolean v1, p0, Lcom/facebook/drawee/view/b;->Pv:Z
+    iget-boolean v1, p0, Lcom/facebook/drawee/view/b;->Pr:Z
 
     const-string v2, "drawableVisible"
 
@@ -537,7 +537,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/facebook/drawee/view/b;->LK:Lcom/facebook/drawee/a/b;
+    iget-object v1, p0, Lcom/facebook/drawee/view/b;->LG: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;->Pv:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/view/b;->Pr:Z
 
     if-ne v0, p1, :cond_0
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/drawee/view/b;->LK:Lcom/facebook/drawee/a/b;
+    iget-object v0, p0, Lcom/facebook/drawee/view/b;->LG:Lcom/facebook/drawee/a/b;
 
     if-eqz p1, :cond_1
 
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->Ly:Lcom/facebook/drawee/a/b$a;
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->Lu:Lcom/facebook/drawee/a/b$a;
 
     goto :goto_0
 
     :cond_1
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->Lz:Lcom/facebook/drawee/a/b$a;
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->Lv: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;->Pv:Z
+    iput-boolean p1, p0, Lcom/facebook/drawee/view/b;->Pr:Z
 
-    invoke-direct {p0}, Lcom/facebook/drawee/view/b;->hU()V
+    invoke-direct {p0}, Lcom/facebook/drawee/view/b;->hS()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 f595995fe4..513ee1c788 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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()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;->OE:F
+    iget p2, p1, Lcom/facebook/drawee/generic/a;->OA:F
 
     invoke-virtual {p0, p2}, Lcom/facebook/drawee/view/c;->setAspectRatio(F)V
 
-    invoke-virtual {p1}, Lcom/facebook/drawee/generic/a;->hP()Lcom/facebook/drawee/generic/GenericDraweeHierarchy;
+    invoke-virtual {p1}, Lcom/facebook/drawee/generic/a;->hN()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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()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 22dce3ff63..5f7242304f 100644
--- a/com.discord/smali/com/facebook/e/a.smali
+++ b/com.discord/smali/com/facebook/e/a.smali
@@ -7,9 +7,17 @@
 
 
 # static fields
+.field private static final QI:[B
+
+.field private static final QJ:I
+
+.field private static final QK:[B
+
+.field private static final QL:I
+
 .field private static final QM:[B
 
-.field private static final QN:I
+.field private static final QN:[B
 
 .field private static final QO:[B
 
@@ -17,23 +25,15 @@
 
 .field private static final QQ:[B
 
-.field private static final QR:[B
+.field private static final QR:I
 
-.field private static final QS:[B
+.field private static final QS:[Ljava/lang/String;
 
 .field private static final QT:I
 
-.field private static final QU:[B
-
-.field private static final QV:I
-
-.field private static final QW:[Ljava/lang/String;
-
-.field private static final QX:I
-
 
 # instance fields
-.field final QL:I
+.field final QH:I
 
 
 # direct methods
@@ -46,9 +46,9 @@
 
     fill-array-data v1, :array_0
 
-    sput-object v1, Lcom/facebook/e/a;->QM:[B
+    sput-object v1, Lcom/facebook/e/a;->QI:[B
 
-    sput v0, Lcom/facebook/e/a;->QN:I
+    sput v0, Lcom/facebook/e/a;->QJ:I
 
     const/16 v1, 0x8
 
@@ -56,9 +56,9 @@
 
     fill-array-data v2, :array_1
 
-    sput-object v2, Lcom/facebook/e/a;->QO:[B
+    sput-object v2, Lcom/facebook/e/a;->QK:[B
 
-    sput v1, Lcom/facebook/e/a;->QP:I
+    sput v1, Lcom/facebook/e/a;->QL:I
 
     const-string v1, "GIF87a"
 
@@ -66,7 +66,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/facebook/e/a;->QQ:[B
+    sput-object v1, Lcom/facebook/e/a;->QM:[B
 
     const-string v1, "GIF89a"
 
@@ -74,7 +74,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/facebook/e/a;->QR:[B
+    sput-object v1, Lcom/facebook/e/a;->QN:[B
 
     const-string v1, "BM"
 
@@ -82,11 +82,11 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/facebook/e/a;->QS:[B
+    sput-object v1, Lcom/facebook/e/a;->QO:[B
 
     array-length v1, v1
 
-    sput v1, Lcom/facebook/e/a;->QT:I
+    sput v1, Lcom/facebook/e/a;->QP:I
 
     const/4 v1, 0x4
 
@@ -94,9 +94,9 @@
 
     fill-array-data v2, :array_2
 
-    sput-object v2, Lcom/facebook/e/a;->QU:[B
+    sput-object v2, Lcom/facebook/e/a;->QQ:[B
 
-    sput v1, Lcom/facebook/e/a;->QV:I
+    sput v1, Lcom/facebook/e/a;->QR:I
 
     const/4 v2, 0x6
 
@@ -134,7 +134,7 @@
 
     aput-object v1, v2, v0
 
-    sput-object v2, Lcom/facebook/e/a;->QW:[Ljava/lang/String;
+    sput-object v2, Lcom/facebook/e/a;->QS:[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;->QW:[Ljava/lang/String;
+    sget-object v1, Lcom/facebook/e/a;->QS:[Ljava/lang/String;
 
     aget-object v1, v1, v3
 
@@ -158,7 +158,7 @@
 
     array-length v0, v0
 
-    sput v0, Lcom/facebook/e/a;->QX:I
+    sput v0, Lcom/facebook/e/a;->QT:I
 
     return-void
 
@@ -213,13 +213,13 @@
 
     aput v2, v0, v1
 
-    sget v1, Lcom/facebook/e/a;->QN:I
+    sget v1, Lcom/facebook/e/a;->QJ:I
 
     const/4 v2, 0x2
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/e/a;->QP:I
+    sget v1, Lcom/facebook/e/a;->QL:I
 
     const/4 v2, 0x3
 
@@ -231,17 +231,17 @@
 
     aput v1, v0, v2
 
-    sget v2, Lcom/facebook/e/a;->QT:I
+    sget v2, Lcom/facebook/e/a;->QP:I
 
     const/4 v3, 0x5
 
     aput v2, v0, v3
 
-    sget v2, Lcom/facebook/e/a;->QV:I
+    sget v2, Lcom/facebook/e/a;->QR:I
 
     aput v2, v0, v1
 
-    sget v1, Lcom/facebook/e/a;->QX:I
+    sget v1, Lcom/facebook/e/a;->QT:I
 
     const/4 v2, 0x7
 
@@ -251,7 +251,7 @@
 
     move-result v0
 
-    iput v0, p0, Lcom/facebook/e/a;->QL:I
+    iput v0, p0, Lcom/facebook/e/a;->QH:I
 
     return-void
 .end method
@@ -285,7 +285,7 @@
 
     if-eqz v0, :cond_0
 
-    sget-object p1, Lcom/facebook/e/b;->Rd:Lcom/facebook/e/c;
+    sget-object p1, Lcom/facebook/e/b;->QZ:Lcom/facebook/e/c;
 
     return-object p1
 
@@ -296,7 +296,7 @@
 
     if-eqz v0, :cond_1
 
-    sget-object p1, Lcom/facebook/e/b;->Re:Lcom/facebook/e/c;
+    sget-object p1, Lcom/facebook/e/b;->Ra:Lcom/facebook/e/c;
 
     return-object p1
 
@@ -313,7 +313,7 @@
 
     if-eqz p2, :cond_2
 
-    sget-object p1, Lcom/facebook/e/b;->Rh:Lcom/facebook/e/c;
+    sget-object p1, Lcom/facebook/e/b;->Rd:Lcom/facebook/e/c;
 
     return-object p1
 
@@ -324,22 +324,22 @@
 
     if-eqz p1, :cond_3
 
-    sget-object p1, Lcom/facebook/e/b;->Rg:Lcom/facebook/e/c;
+    sget-object p1, Lcom/facebook/e/b;->Rc:Lcom/facebook/e/c;
 
     return-object p1
 
     :cond_3
-    sget-object p1, Lcom/facebook/e/b;->Rf:Lcom/facebook/e/c;
+    sget-object p1, Lcom/facebook/e/b;->Rb:Lcom/facebook/e/c;
 
     return-object p1
 
     :cond_4
-    sget-object p1, Lcom/facebook/e/c;->Rj:Lcom/facebook/e/c;
+    sget-object p1, Lcom/facebook/e/c;->Rf:Lcom/facebook/e/c;
 
     return-object p1
 
     :cond_5
-    sget-object v1, Lcom/facebook/e/a;->QM:[B
+    sget-object v1, Lcom/facebook/e/a;->QI:[B
 
     array-length v2, v1
 
@@ -363,12 +363,12 @@
     :goto_0
     if-eqz v1, :cond_7
 
-    sget-object p1, Lcom/facebook/e/b;->QY:Lcom/facebook/e/c;
+    sget-object p1, Lcom/facebook/e/b;->QU:Lcom/facebook/e/c;
 
     return-object p1
 
     :cond_7
-    sget-object v1, Lcom/facebook/e/a;->QO:[B
+    sget-object v1, Lcom/facebook/e/a;->QK:[B
 
     array-length v2, v1
 
@@ -390,7 +390,7 @@
     :goto_1
     if-eqz v1, :cond_9
 
-    sget-object p1, Lcom/facebook/e/b;->QZ:Lcom/facebook/e/c;
+    sget-object p1, Lcom/facebook/e/b;->QV:Lcom/facebook/e/c;
 
     return-object p1
 
@@ -399,7 +399,7 @@
 
     if-lt p2, v1, :cond_b
 
-    sget-object v1, Lcom/facebook/e/a;->QQ:[B
+    sget-object v1, Lcom/facebook/e/a;->QM:[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;->QR:[B
+    sget-object v1, Lcom/facebook/e/a;->QN:[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;->Ra:Lcom/facebook/e/c;
+    sget-object p1, Lcom/facebook/e/b;->QW:Lcom/facebook/e/c;
 
     return-object p1
 
     :cond_c
-    sget-object v1, Lcom/facebook/e/a;->QS:[B
+    sget-object v1, Lcom/facebook/e/a;->QO:[B
 
     array-length v2, v1
 
@@ -449,12 +449,12 @@
     :goto_3
     if-eqz v1, :cond_e
 
-    sget-object p1, Lcom/facebook/e/b;->Rb:Lcom/facebook/e/c;
+    sget-object p1, Lcom/facebook/e/b;->QX:Lcom/facebook/e/c;
 
     return-object p1
 
     :cond_e
-    sget-object v1, Lcom/facebook/e/a;->QU:[B
+    sget-object v1, Lcom/facebook/e/a;->QQ:[B
 
     array-length v2, v1
 
@@ -472,12 +472,12 @@
     :goto_4
     if-eqz v1, :cond_10
 
-    sget-object p1, Lcom/facebook/e/b;->Rc:Lcom/facebook/e/c;
+    sget-object p1, Lcom/facebook/e/b;->QY:Lcom/facebook/e/c;
 
     return-object p1
 
     :cond_10
-    sget v1, Lcom/facebook/e/a;->QX:I
+    sget v1, Lcom/facebook/e/a;->QT:I
 
     if-lt p2, v1, :cond_12
 
@@ -489,7 +489,7 @@
 
     if-lt p2, v1, :cond_12
 
-    sget-object p2, Lcom/facebook/e/a;->QW:[Ljava/lang/String;
+    sget-object p2, Lcom/facebook/e/a;->QS:[Ljava/lang/String;
 
     array-length v1, p2
 
@@ -516,7 +516,7 @@
 
     move-result-object v4
 
-    sget v6, Lcom/facebook/e/a;->QX:I
+    sget v6, Lcom/facebook/e/a;->QT: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;->Ri:Lcom/facebook/e/c;
+    sget-object p1, Lcom/facebook/e/b;->Re:Lcom/facebook/e/c;
 
     return-object p1
 
     :cond_13
-    sget-object p1, Lcom/facebook/e/c;->Rj:Lcom/facebook/e/c;
+    sget-object p1, Lcom/facebook/e/c;->Rf:Lcom/facebook/e/c;
 
     return-object p1
 .end method
 
-.method public final if()I
+.method public final ic()I
     .locals 1
 
-    iget v0, p0, Lcom/facebook/e/a;->QL:I
+    iget v0, p0, Lcom/facebook/e/a;->QH: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 c91e695f32..1e7021b500 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 if()I
+.method public abstract ic()I
 .end method
diff --git a/com.discord/smali/com/facebook/e/c.smali b/com.discord/smali/com/facebook/e/c.smali
index d11e41bfef..ce0c86e365 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 Rj:Lcom/facebook/e/c;
+.field public static final Rf:Lcom/facebook/e/c;
 
 
 # instance fields
-.field private final Rk:Ljava/lang/String;
+.field private final Rg: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;->Rj:Lcom/facebook/e/c;
+    sput-object v0, Lcom/facebook/e/c;->Rf: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;->Rk:Ljava/lang/String;
+    iput-object p2, p0, Lcom/facebook/e/c;->Rg: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 fb8cf61eb0..81eab07912 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 Rl:Lcom/facebook/e/d;
+.field private static Rh:Lcom/facebook/e/d;
 
 
 # instance fields
-.field private Rm:I
+.field private Ri:I
 
-.field public Rn:Ljava/util/List;
+.field public Rj:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -23,7 +23,7 @@
     .end annotation
 .end field
 
-.field private final Ro:Lcom/facebook/e/c$a;
+.field private final Rk: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;->Ro:Lcom/facebook/e/c$a;
+    iput-object v0, p0, Lcom/facebook/e/d;->Rk:Lcom/facebook/e/c$a;
 
-    invoke-virtual {p0}, Lcom/facebook/e/d;->ig()V
+    invoke-virtual {p0}, Lcom/facebook/e/d;->ie()V
 
     return-void
 .end method
@@ -107,23 +107,23 @@
     .locals 4
 
     :try_start_0
-    invoke-static {}, Lcom/facebook/e/d;->ih()Lcom/facebook/e/d;
+    invoke-static {}, Lcom/facebook/e/d;->if()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;->Rm:I
+    iget v1, v0, Lcom/facebook/e/d;->Ri:I
 
     new-array v1, v1, [B
 
-    iget v2, v0, Lcom/facebook/e/d;->Rm:I
+    iget v2, v0, Lcom/facebook/e/d;->Ri: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;->Ro:Lcom/facebook/e/c$a;
+    iget-object v2, v0, Lcom/facebook/e/d;->Rk: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;->Rj:Lcom/facebook/e/c;
+    sget-object v3, Lcom/facebook/e/c;->Rf:Lcom/facebook/e/c;
 
     if-eq v2, v3, :cond_0
 
     return-object v2
 
     :cond_0
-    iget-object v2, v0, Lcom/facebook/e/d;->Rn:Ljava/util/List;
+    iget-object v2, v0, Lcom/facebook/e/d;->Rj:Ljava/util/List;
 
     if-eqz v2, :cond_2
 
-    iget-object v0, v0, Lcom/facebook/e/d;->Rn:Ljava/util/List;
+    iget-object v0, v0, Lcom/facebook/e/d;->Rj: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;->Rj:Lcom/facebook/e/c;
+    sget-object v3, Lcom/facebook/e/c;->Rf:Lcom/facebook/e/c;
 
     if-eq v2, v3, :cond_1
 
     return-object v2
 
     :cond_2
-    sget-object p0, Lcom/facebook/e/c;->Rj:Lcom/facebook/e/c;
+    sget-object p0, Lcom/facebook/e/c;->Rf: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 ih()Lcom/facebook/e/d;
+.method public static declared-synchronized if()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;->Rl:Lcom/facebook/e/d;
+    sget-object v1, Lcom/facebook/e/d;->Rh: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;->Rl:Lcom/facebook/e/d;
+    sput-object v1, Lcom/facebook/e/d;->Rh:Lcom/facebook/e/d;
 
     :cond_0
-    sget-object v1, Lcom/facebook/e/d;->Rl:Lcom/facebook/e/d;
+    sget-object v1, Lcom/facebook/e/d;->Rh: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 ig()V
+.method public final ie()V
     .locals 3
 
-    iget-object v0, p0, Lcom/facebook/e/d;->Ro:Lcom/facebook/e/c$a;
+    iget-object v0, p0, Lcom/facebook/e/d;->Rk:Lcom/facebook/e/c$a;
 
-    invoke-interface {v0}, Lcom/facebook/e/c$a;->if()I
+    invoke-interface {v0}, Lcom/facebook/e/c$a;->ic()I
 
     move-result v0
 
-    iput v0, p0, Lcom/facebook/e/d;->Rm:I
+    iput v0, p0, Lcom/facebook/e/d;->Ri:I
 
-    iget-object v0, p0, Lcom/facebook/e/d;->Rn:Ljava/util/List;
+    iget-object v0, p0, Lcom/facebook/e/d;->Rj: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;->Rm:I
+    iget v2, p0, Lcom/facebook/e/d;->Ri:I
 
-    invoke-interface {v1}, Lcom/facebook/e/c$a;->if()I
+    invoke-interface {v1}, Lcom/facebook/e/c$a;->ic()I
 
     move-result v1
 
@@ -275,7 +275,7 @@
 
     move-result v1
 
-    iput v1, p0, Lcom/facebook/e/d;->Rm:I
+    iput v1, p0, Lcom/facebook/e/d;->Ri: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 9c2709b4d8..412d588799 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 PE:Lcom/facebook/fresco/animation/a/a;
+.field private PA: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;->PE:Lcom/facebook/fresco/animation/a/a;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/a/b;->PA: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;->PE:Lcom/facebook/fresco/animation/a/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/a/b;->PA: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;->PE:Lcom/facebook/fresco/animation/a/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/a/b;->PA: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;->PE:Lcom/facebook/fresco/animation/a/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/a/b;->PA: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;->PE:Lcom/facebook/fresco/animation/a/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/a/b;->PA:Lcom/facebook/fresco/animation/a/a;
 
     if-eqz v0, :cond_0
 
@@ -143,10 +143,29 @@
     return-void
 .end method
 
+.method public final fC()I
+    .locals 1
+
+    iget-object v0, p0, Lcom/facebook/fresco/animation/a/b;->PA:Lcom/facebook/fresco/animation/a/a;
+
+    if-nez v0, :cond_0
+
+    const/4 v0, 0x0
+
+    return v0
+
+    :cond_0
+    invoke-interface {v0}, Lcom/facebook/fresco/animation/a/a;->fC()I
+
+    move-result v0
+
+    return v0
+.end method
+
 .method public final fE()I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/a/b;->PE:Lcom/facebook/fresco/animation/a/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/a/b;->PA:Lcom/facebook/fresco/animation/a/a;
 
     if-nez v0, :cond_0
 
@@ -162,29 +181,10 @@
     return v0
 .end method
 
-.method public final fG()I
-    .locals 1
-
-    iget-object v0, p0, Lcom/facebook/fresco/animation/a/b;->PE:Lcom/facebook/fresco/animation/a/a;
-
-    if-nez v0, :cond_0
-
-    const/4 v0, 0x0
-
-    return v0
-
-    :cond_0
-    invoke-interface {v0}, Lcom/facebook/fresco/animation/a/a;->fG()I
-
-    move-result v0
-
-    return v0
-.end method
-
 .method public final getIntrinsicHeight()I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/a/b;->PE:Lcom/facebook/fresco/animation/a/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/a/b;->PA: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;->PE:Lcom/facebook/fresco/animation/a/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/a/b;->PA: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;->PE:Lcom/facebook/fresco/animation/a/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/a/b;->PA: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;->PE:Lcom/facebook/fresco/animation/a/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/a/b;->PA: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 e987011ffa..0ba6606e01 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 KR:Lcom/facebook/common/time/b;
+.field final KN:Lcom/facebook/common/time/b;
 
-.field private final PF:Ljava/util/concurrent/ScheduledExecutorService;
+.field private final PB:Ljava/util/concurrent/ScheduledExecutorService;
 
-.field PG:Z
+.field PC:Z
 
-.field PH:J
+.field PD:J
 
-.field PI:J
+.field PE:J
 
-.field private PJ:J
+.field private PF:J
 
-.field PK:Lcom/facebook/fresco/animation/a/c$a;
+.field PG:Lcom/facebook/fresco/animation/a/c$a;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private final PL:Ljava/lang/Runnable;
+.field private final PH:Ljava/lang/Runnable;
 
 
 # direct methods
@@ -67,27 +67,27 @@
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lcom/facebook/fresco/animation/a/c;->PG:Z
+    iput-boolean p1, p0, Lcom/facebook/fresco/animation/a/c;->PC:Z
 
     const-wide/16 v0, 0x7d0
 
-    iput-wide v0, p0, Lcom/facebook/fresco/animation/a/c;->PI:J
+    iput-wide v0, p0, Lcom/facebook/fresco/animation/a/c;->PE:J
 
     const-wide/16 v0, 0x3e8
 
-    iput-wide v0, p0, Lcom/facebook/fresco/animation/a/c;->PJ:J
+    iput-wide v0, p0, Lcom/facebook/fresco/animation/a/c;->PF: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;->PL:Ljava/lang/Runnable;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/a/c;->PH:Ljava/lang/Runnable;
 
-    iput-object p2, p0, Lcom/facebook/fresco/animation/a/c;->PK:Lcom/facebook/fresco/animation/a/c$a;
+    iput-object p2, p0, Lcom/facebook/fresco/animation/a/c;->PG:Lcom/facebook/fresco/animation/a/c$a;
 
-    iput-object p3, p0, Lcom/facebook/fresco/animation/a/c;->KR:Lcom/facebook/common/time/b;
+    iput-object p3, p0, Lcom/facebook/fresco/animation/a/c;->KN:Lcom/facebook/common/time/b;
 
-    iput-object p4, p0, Lcom/facebook/fresco/animation/a/c;->PF:Ljava/util/concurrent/ScheduledExecutorService;
+    iput-object p4, p0, Lcom/facebook/fresco/animation/a/c;->PB: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;->KR:Lcom/facebook/common/time/b;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/a/c;->KN: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;->PH:J
+    iput-wide v0, p0, Lcom/facebook/fresco/animation/a/c;->PD: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;->hW()V
+    invoke-virtual {p0}, Lcom/facebook/fresco/animation/a/c;->hU()V
 
     return p1
 .end method
 
-.method final declared-synchronized hW()V
+.method final declared-synchronized hU()V
     .locals 5
 
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lcom/facebook/fresco/animation/a/c;->PG:Z
+    iget-boolean v0, p0, Lcom/facebook/fresco/animation/a/c;->PC:Z
 
     if-nez v0, :cond_0
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/facebook/fresco/animation/a/c;->PG:Z
+    iput-boolean v0, p0, Lcom/facebook/fresco/animation/a/c;->PC:Z
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/a/c;->PF:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/a/c;->PB:Ljava/util/concurrent/ScheduledExecutorService;
 
-    iget-object v1, p0, Lcom/facebook/fresco/animation/a/c;->PL:Ljava/lang/Runnable;
+    iget-object v1, p0, Lcom/facebook/fresco/animation/a/c;->PH:Ljava/lang/Runnable;
 
-    iget-wide v2, p0, Lcom/facebook/fresco/animation/a/c;->PJ:J
+    iget-wide v2, p0, Lcom/facebook/fresco/animation/a/c;->PF: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 e16e137196..c55456be31 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 fE()I
+.method public abstract fC()I
 .end method
 
-.method public abstract fG()I
+.method public abstract fE()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 f8582fde9f..246f7c2abd 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 GI:Ljava/lang/Class;
+.field private static final GE:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -19,25 +19,25 @@
 
 
 # instance fields
-.field private final PN:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+.field private final PJ:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
 
-.field private final PO:Lcom/facebook/fresco/animation/b/b;
+.field private final PK:Lcom/facebook/fresco/animation/b/b;
 
-.field private final PP:Lcom/facebook/fresco/animation/a/d;
+.field private final PL:Lcom/facebook/fresco/animation/a/d;
 
-.field private final PQ:Lcom/facebook/fresco/animation/b/c;
+.field private final PM:Lcom/facebook/fresco/animation/b/c;
 
-.field private final PR:Lcom/facebook/fresco/animation/b/b/a;
+.field private final PN:Lcom/facebook/fresco/animation/b/b/a;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private final PS:Lcom/facebook/fresco/animation/b/b/b;
+.field private final PO:Lcom/facebook/fresco/animation/b/b/b;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private PT:Landroid/graphics/Bitmap$Config;
+.field private PP: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;->GI:Ljava/lang/Class;
+    sput-object v0, Lcom/facebook/fresco/animation/b/a;->GE: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;->PT:Landroid/graphics/Bitmap$Config;
+    iput-object v0, p0, Lcom/facebook/fresco/animation/b/a;->PP:Landroid/graphics/Bitmap$Config;
 
-    iput-object p1, p0, Lcom/facebook/fresco/animation/b/a;->PN:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/b/a;->PJ:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
 
-    iput-object p2, p0, Lcom/facebook/fresco/animation/b/a;->PO:Lcom/facebook/fresco/animation/b/b;
+    iput-object p2, p0, Lcom/facebook/fresco/animation/b/a;->PK:Lcom/facebook/fresco/animation/b/b;
 
-    iput-object p3, p0, Lcom/facebook/fresco/animation/b/a;->PP:Lcom/facebook/fresco/animation/a/d;
+    iput-object p3, p0, Lcom/facebook/fresco/animation/b/a;->PL:Lcom/facebook/fresco/animation/a/d;
 
-    iput-object p4, p0, Lcom/facebook/fresco/animation/b/a;->PQ:Lcom/facebook/fresco/animation/b/c;
+    iput-object p4, p0, Lcom/facebook/fresco/animation/b/a;->PM:Lcom/facebook/fresco/animation/b/c;
 
-    iput-object p5, p0, Lcom/facebook/fresco/animation/b/a;->PR:Lcom/facebook/fresco/animation/b/b/a;
+    iput-object p5, p0, Lcom/facebook/fresco/animation/b/a;->PN:Lcom/facebook/fresco/animation/b/b/a;
 
-    iput-object p6, p0, Lcom/facebook/fresco/animation/b/a;->PS:Lcom/facebook/fresco/animation/b/b/b;
+    iput-object p6, p0, Lcom/facebook/fresco/animation/b/a;->PO: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;->hX()V
+    invoke-direct {p0}, Lcom/facebook/fresco/animation/b/a;->hV()V
 
     return-void
 .end method
@@ -130,7 +130,7 @@
     return p1
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a;->PQ:Lcom/facebook/fresco/animation/b/c;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a;->PM: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;->PO:Lcom/facebook/fresco/animation/b/b;
+    iget-object p3, p0, Lcom/facebook/fresco/animation/b/a;->PK: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;->PO:Lcom/facebook/fresco/animation/b/b;
+    iget-object p3, p0, Lcom/facebook/fresco/animation/b/a;->PK:Lcom/facebook/fresco/animation/b/b;
 
-    invoke-interface {p3}, Lcom/facebook/fresco/animation/b/b;->hY()Lcom/facebook/common/references/CloseableReference;
+    invoke-interface {p3}, Lcom/facebook/fresco/animation/b/b;->hW()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;->PN:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+    iget-object p3, p0, Lcom/facebook/fresco/animation/b/a;->PJ: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;->PT:Landroid/graphics/Bitmap$Config;
+    iget-object v8, p0, Lcom/facebook/fresco/animation/b/a;->PP: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;->GI:Ljava/lang/Class;
+    sget-object p2, Lcom/facebook/fresco/animation/b/a;->GE: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;->PO:Lcom/facebook/fresco/animation/b/b;
+    iget-object p3, p0, Lcom/facebook/fresco/animation/b/a;->PK:Lcom/facebook/fresco/animation/b/b;
 
-    invoke-interface {p3}, Lcom/facebook/fresco/animation/b/b;->hZ()Lcom/facebook/common/references/CloseableReference;
+    invoke-interface {p3}, Lcom/facebook/fresco/animation/b/b;->hX()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;->PO:Lcom/facebook/fresco/animation/b/b;
+    iget-object p3, p0, Lcom/facebook/fresco/animation/b/a;->PK: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 hX()V
+.method private hV()V
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a;->PQ:Lcom/facebook/fresco/animation/b/c;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a;->PM: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;->PQ:Lcom/facebook/fresco/animation/b/c;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a;->PM: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;->PP:Lcom/facebook/fresco/animation/a/d;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a;->PL: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;->PR:Lcom/facebook/fresco/animation/b/b/a;
+    iget-object p2, p0, Lcom/facebook/fresco/animation/b/a;->PN:Lcom/facebook/fresco/animation/b/b/a;
 
     if-eqz p2, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a;->PS:Lcom/facebook/fresco/animation/b/b/b;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a;->PO:Lcom/facebook/fresco/animation/b/b/b;
 
     if-eqz v0, :cond_0
 
-    iget-object v1, p0, Lcom/facebook/fresco/animation/b/a;->PO:Lcom/facebook/fresco/animation/b/b;
+    iget-object v1, p0, Lcom/facebook/fresco/animation/b/a;->PK: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;->PQ:Lcom/facebook/fresco/animation/b/c;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a;->PM: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;->hX()V
+    invoke-direct {p0}, Lcom/facebook/fresco/animation/b/a;->hV()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;->PO:Lcom/facebook/fresco/animation/b/b;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a;->PK:Lcom/facebook/fresco/animation/b/b;
 
     invoke-interface {v0}, Lcom/facebook/fresco/animation/b/b;->clear()V
 
     return-void
 .end method
 
-.method public final fE()I
+.method public final fC()I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a;->PP:Lcom/facebook/fresco/animation/a/d;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a;->PL:Lcom/facebook/fresco/animation/a/d;
 
-    invoke-interface {v0}, Lcom/facebook/fresco/animation/a/d;->fE()I
+    invoke-interface {v0}, Lcom/facebook/fresco/animation/a/d;->fC()I
 
     move-result v0
 
     return v0
 .end method
 
-.method public final fG()I
+.method public final fE()I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a;->PP:Lcom/facebook/fresco/animation/a/d;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a;->PL:Lcom/facebook/fresco/animation/a/d;
 
-    invoke-interface {v0}, Lcom/facebook/fresco/animation/a/d;->fG()I
+    invoke-interface {v0}, Lcom/facebook/fresco/animation/a/d;->fE()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 0d3214ac7f..1c304de177 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 GI:Ljava/lang/Class;
+.field private static final GE:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -18,11 +18,11 @@
 
 
 # instance fields
-.field private final PU:Lcom/facebook/imagepipeline/animated/c/c;
+.field private final PQ:Lcom/facebook/imagepipeline/animated/c/c;
 
-.field private final PV:Z
+.field private final PR:Z
 
-.field private final PW:Landroid/util/SparseArray;
+.field private final PS:Landroid/util/SparseArray;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Landroid/util/SparseArray<",
@@ -33,7 +33,7 @@
     .end annotation
 .end field
 
-.field private PY:Lcom/facebook/common/references/CloseableReference;
+.field private PT: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;->GI:Ljava/lang/Class;
+    sput-object v0, Lcom/facebook/fresco/animation/b/a/a;->GE: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;->PU:Lcom/facebook/imagepipeline/animated/c/c;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/b/a/a;->PQ:Lcom/facebook/imagepipeline/animated/c/c;
 
-    iput-boolean p2, p0, Lcom/facebook/fresco/animation/b/a/a;->PV:Z
+    iput-boolean p2, p0, Lcom/facebook/fresco/animation/b/a/a;->PR: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;->PW:Landroid/util/SparseArray;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/b/a/a;->PS: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;->PW:Landroid/util/SparseArray;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a/a;->PS: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;->PW:Landroid/util/SparseArray;
+    iget-object v1, p0, Lcom/facebook/fresco/animation/b/a/a;->PS: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;->GI:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/fresco/animation/b/a/a;->GE: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;->PW:Landroid/util/SparseArray;
+    iget-object v2, p0, Lcom/facebook/fresco/animation/b/a/a;->PS: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;->jp()Lcom/facebook/common/references/CloseableReference;
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/g/d;->jn()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;->Wj:Lcom/facebook/imagepipeline/g/h;
+    sget-object v1, Lcom/facebook/imagepipeline/g/g;->Wf: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;->PU:Lcom/facebook/imagepipeline/animated/c/c;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a/a;->PQ:Lcom/facebook/imagepipeline/animated/c/c;
 
-    iget-object v1, v0, Lcom/facebook/imagepipeline/animated/c/c;->Qz:Lcom/facebook/imagepipeline/cache/h;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/animated/c/c;->Qv: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;->PY:Lcom/facebook/common/references/CloseableReference;
+    iget-object p2, p0, Lcom/facebook/fresco/animation/b/a/a;->PT: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;->PU:Lcom/facebook/imagepipeline/animated/c/c;
+    iget-object p2, p0, Lcom/facebook/fresco/animation/b/a/a;->PQ: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;->PY:Lcom/facebook/common/references/CloseableReference;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/b/a/a;->PT: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;->PU:Lcom/facebook/imagepipeline/animated/c/c;
+    iget-object p2, p0, Lcom/facebook/fresco/animation/b/a/a;->PQ: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;->PW:Landroid/util/SparseArray;
+    iget-object v1, p0, Lcom/facebook/fresco/animation/b/a/a;->PS: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;->PW:Landroid/util/SparseArray;
+    iget-object v1, p0, Lcom/facebook/fresco/animation/b/a/a;->PS: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;->GI:Ljava/lang/Class;
+    sget-object p2, Lcom/facebook/fresco/animation/b/a/a;->GE: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;->PW:Landroid/util/SparseArray;
+    iget-object v2, p0, Lcom/facebook/fresco/animation/b/a/a;->PS: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;->PY:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a/a;->PT: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;->PY:Lcom/facebook/common/references/CloseableReference;
+    iput-object v0, p0, Lcom/facebook/fresco/animation/b/a/a;->PT:Lcom/facebook/common/references/CloseableReference;
 
     const/4 v0, 0x0
 
     :goto_0
-    iget-object v1, p0, Lcom/facebook/fresco/animation/b/a/a;->PW:Landroid/util/SparseArray;
+    iget-object v1, p0, Lcom/facebook/fresco/animation/b/a/a;->PS: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;->PW:Landroid/util/SparseArray;
+    iget-object v1, p0, Lcom/facebook/fresco/animation/b/a/a;->PS: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;->PW:Landroid/util/SparseArray;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a/a;->PS: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;->PU:Lcom/facebook/imagepipeline/animated/c/c;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a/a;->PQ:Lcom/facebook/imagepipeline/animated/c/c;
 
-    iget-object v1, v0, Lcom/facebook/imagepipeline/animated/c/c;->Qz:Lcom/facebook/imagepipeline/cache/h;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/animated/c/c;->Qv: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 hY()Lcom/facebook/common/references/CloseableReference;
+.method public final declared-synchronized hW()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;->PY:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a/a;->PT: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 hZ()Lcom/facebook/common/references/CloseableReference;
+.method public final declared-synchronized hX()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;->PV:Z
+    iget-boolean v0, p0, Lcom/facebook/fresco/animation/b/a/a;->PR: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;->PU:Lcom/facebook/imagepipeline/animated/c/c;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a/a;->PQ:Lcom/facebook/imagepipeline/animated/c/c;
 
     :cond_1
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/animated/c/c;->im()Lcom/facebook/cache/common/CacheKey;
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/animated/c/c;->ik()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;->Qz:Lcom/facebook/imagepipeline/cache/h;
+    iget-object v3, v0, Lcom/facebook/imagepipeline/animated/c/c;->Qv: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 4bcb3996bc..6f1f126c68 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 PZ:I
+.field private PU:I
 
-.field private Qa:Lcom/facebook/common/references/CloseableReference;
+.field private PV: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;->PZ:I
+    iput v0, p0, Lcom/facebook/fresco/animation/b/a/b;->PU:I
 
     return-void
 .end method
 
-.method private declared-synchronized ia()V
+.method private declared-synchronized hY()V
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a/b;->Qa:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a/b;->PV: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;->Qa:Lcom/facebook/common/references/CloseableReference;
+    iput-object v0, p0, Lcom/facebook/fresco/animation/b/a/b;->PV:Lcom/facebook/common/references/CloseableReference;
 
     const/4 v0, -0x1
 
-    iput v0, p0, Lcom/facebook/fresco/animation/b/a/b;->PZ:I
+    iput v0, p0, Lcom/facebook/fresco/animation/b/a/b;->PU: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;->PZ:I
+    iget v0, p0, Lcom/facebook/fresco/animation/b/a/b;->PU:I
 
     if-ne v0, p1, :cond_0
 
-    iget-object p1, p0, Lcom/facebook/fresco/animation/b/a/b;->Qa:Lcom/facebook/common/references/CloseableReference;
+    iget-object p1, p0, Lcom/facebook/fresco/animation/b/a/b;->PV: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;->Qa:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a/b;->PV: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;->Qa:Lcom/facebook/common/references/CloseableReference;
+    iget-object v1, p0, Lcom/facebook/fresco/animation/b/a/b;->PV: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;->Qa:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a/b;->PV: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;->Qa:Lcom/facebook/common/references/CloseableReference;
+    iput-object p2, p0, Lcom/facebook/fresco/animation/b/a/b;->PV:Lcom/facebook/common/references/CloseableReference;
 
-    iput p1, p0, Lcom/facebook/fresco/animation/b/a/b;->PZ:I
+    iput p1, p0, Lcom/facebook/fresco/animation/b/a/b;->PU: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;->ia()V
+    invoke-direct {p0}, Lcom/facebook/fresco/animation/b/a/b;->hY()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;->PZ:I
+    iget v0, p0, Lcom/facebook/fresco/animation/b/a/b;->PU:I
 
     if-ne p1, v0, :cond_0
 
-    iget-object p1, p0, Lcom/facebook/fresco/animation/b/a/b;->Qa:Lcom/facebook/common/references/CloseableReference;
+    iget-object p1, p0, Lcom/facebook/fresco/animation/b/a/b;->PV: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 hY()Lcom/facebook/common/references/CloseableReference;
+.method public final declared-synchronized hW()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;->Qa:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a/b;->PV: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 hZ()Lcom/facebook/common/references/CloseableReference;
+.method public final declared-synchronized hX()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;->Qa:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a/b;->PV: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;->ia()V
+    invoke-direct {p0}, Lcom/facebook/fresco/animation/b/a/b;->hY()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;->ia()V
+    invoke-direct {p0}, Lcom/facebook/fresco/animation/b/a/b;->hY()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 8f2c18f5a7..f7dea67060 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 hY()Lcom/facebook/common/references/CloseableReference;
+.method public final hW()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 hZ()Lcom/facebook/common/references/CloseableReference;
+.method public final hX()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 1d8191f665..7d94714745 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 hY()Lcom/facebook/common/references/CloseableReference;
+.method public abstract hW()Lcom/facebook/common/references/CloseableReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
@@ -60,7 +60,7 @@
     .end annotation
 .end method
 
-.method public abstract hZ()Lcom/facebook/common/references/CloseableReference;
+.method public abstract hX()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 4aa0c03fd8..bd04a3ad7d 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 Qk:Lcom/facebook/fresco/animation/b/c/b;
+.field final synthetic Qg: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;->Qk:Lcom/facebook/fresco/animation/b/c/b;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/b/c/b$1;->Qg: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;->Qk:Lcom/facebook/fresco/animation/b/c/b;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/c/b$1;->Qg: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 54097255b0..3e20fa344c 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 GI:Ljava/lang/Class;
+.field private static final GE:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -18,13 +18,13 @@
 
 
 # instance fields
-.field private final PO:Lcom/facebook/fresco/animation/b/b;
+.field private final PK:Lcom/facebook/fresco/animation/b/b;
 
-.field private Qh:Lcom/facebook/imagepipeline/animated/a/a;
+.field private Qd:Lcom/facebook/imagepipeline/animated/a/a;
 
-.field private Qi:Lcom/facebook/imagepipeline/animated/c/d;
+.field private Qe:Lcom/facebook/imagepipeline/animated/c/d;
 
-.field private final Qj:Lcom/facebook/imagepipeline/animated/c/d$a;
+.field private final Qf: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;->GI:Ljava/lang/Class;
+    sput-object v0, Lcom/facebook/fresco/animation/b/c/b;->GE: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;->Qj:Lcom/facebook/imagepipeline/animated/c/d$a;
+    iput-object v0, p0, Lcom/facebook/fresco/animation/b/c/b;->Qf:Lcom/facebook/imagepipeline/animated/c/d$a;
 
-    iput-object p1, p0, Lcom/facebook/fresco/animation/b/c/b;->PO:Lcom/facebook/fresco/animation/b/b;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/b/c/b;->PK:Lcom/facebook/fresco/animation/b/b;
 
-    iput-object p2, p0, Lcom/facebook/fresco/animation/b/c/b;->Qh:Lcom/facebook/imagepipeline/animated/a/a;
+    iput-object p2, p0, Lcom/facebook/fresco/animation/b/c/b;->Qd: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;->Qh:Lcom/facebook/imagepipeline/animated/a/a;
+    iget-object p2, p0, Lcom/facebook/fresco/animation/b/c/b;->Qd:Lcom/facebook/imagepipeline/animated/a/a;
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/b/c/b;->Qj:Lcom/facebook/imagepipeline/animated/c/d$a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/c/b;->Qf: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;->Qi:Lcom/facebook/imagepipeline/animated/c/d;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/b/c/b;->Qe: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;->PO:Lcom/facebook/fresco/animation/b/b;
+    iget-object p0, p0, Lcom/facebook/fresco/animation/b/c/b;->PK: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;->Qi:Lcom/facebook/imagepipeline/animated/c/d;
+    iget-object v1, p0, Lcom/facebook/fresco/animation/b/c/b;->Qe: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;->GI:Ljava/lang/Class;
+    sget-object v1, Lcom/facebook/fresco/animation/b/c/b;->GE: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;->Qh:Lcom/facebook/imagepipeline/animated/a/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/c/b;->Qd: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;->Qh:Lcom/facebook/imagepipeline/animated/a/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/c/b;->Qd:Lcom/facebook/imagepipeline/animated/a/a;
 
     if-eq p1, v0, :cond_0
 
-    iput-object p1, p0, Lcom/facebook/fresco/animation/b/c/b;->Qh:Lcom/facebook/imagepipeline/animated/a/a;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/b/c/b;->Qd: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;->Qh:Lcom/facebook/imagepipeline/animated/a/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/c/b;->Qd:Lcom/facebook/imagepipeline/animated/a/a;
 
-    iget-object v1, p0, Lcom/facebook/fresco/animation/b/c/b;->Qj:Lcom/facebook/imagepipeline/animated/c/d$a;
+    iget-object v1, p0, Lcom/facebook/fresco/animation/b/c/b;->Qf: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;->Qi:Lcom/facebook/imagepipeline/animated/c/d;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/b/c/b;->Qe: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;->Qh:Lcom/facebook/imagepipeline/animated/a/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/c/b;->Qd: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;->Qh:Lcom/facebook/imagepipeline/animated/a/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/c/b;->Qd: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 f7fc1200b0..9f7b72cc46 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 GI:Ljava/lang/Class;
+.field private static final GE:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -25,49 +25,49 @@
     .end annotation
 .end field
 
-.field private static final Ql:Lcom/facebook/fresco/animation/c/b;
+.field private static final Qh:Lcom/facebook/fresco/animation/c/b;
 
 
 # instance fields
-.field private MS:Lcom/facebook/drawee/drawable/d;
+.field private MO:Lcom/facebook/drawee/drawable/d;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private Nk:J
+.field private Ng:J
 
-.field private PE:Lcom/facebook/fresco/animation/a/a;
+.field private PA:Lcom/facebook/fresco/animation/a/a;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private Qm:Lcom/facebook/fresco/animation/d/b;
+.field private Qi:Lcom/facebook/fresco/animation/d/b;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private volatile Qn:Z
+.field private volatile Qj:Z
+
+.field private Qk:J
+
+.field private Ql:J
+
+.field private Qm:I
+
+.field private Qn:J
 
 .field private Qo:J
 
-.field private Qp:J
+.field private Qp:I
 
-.field private Qq:I
+.field private volatile Qq:Lcom/facebook/fresco/animation/c/b;
 
-.field private Qr:J
-
-.field private Qs:J
-
-.field private Qt:I
-
-.field private volatile Qu:Lcom/facebook/fresco/animation/c/b;
-
-.field private volatile Qv:Lcom/facebook/fresco/animation/c/a$a;
+.field private volatile Qr:Lcom/facebook/fresco/animation/c/a$a;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private final Qw:Ljava/lang/Runnable;
+.field private final Qs: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;->GI:Ljava/lang/Class;
+    sput-object v0, Lcom/facebook/fresco/animation/c/a;->GE: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;->Ql:Lcom/facebook/fresco/animation/c/b;
+    sput-object v0, Lcom/facebook/fresco/animation/c/a;->Qh: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;->Qr:J
+    iput-wide v0, p0, Lcom/facebook/fresco/animation/c/a;->Qn:J
 
     const-wide/16 v0, 0x0
 
-    iput-wide v0, p0, Lcom/facebook/fresco/animation/c/a;->Qs:J
+    iput-wide v0, p0, Lcom/facebook/fresco/animation/c/a;->Qo:J
 
-    sget-object v0, Lcom/facebook/fresco/animation/c/a;->Ql:Lcom/facebook/fresco/animation/c/b;
+    sget-object v0, Lcom/facebook/fresco/animation/c/a;->Qh:Lcom/facebook/fresco/animation/c/b;
 
-    iput-object v0, p0, Lcom/facebook/fresco/animation/c/a;->Qu:Lcom/facebook/fresco/animation/c/b;
+    iput-object v0, p0, Lcom/facebook/fresco/animation/c/a;->Qq:Lcom/facebook/fresco/animation/c/b;
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/facebook/fresco/animation/c/a;->Qv:Lcom/facebook/fresco/animation/c/a$a;
+    iput-object v0, p0, Lcom/facebook/fresco/animation/c/a;->Qr: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;->Qw:Ljava/lang/Runnable;
+    iput-object v1, p0, Lcom/facebook/fresco/animation/c/a;->Qs:Ljava/lang/Runnable;
 
-    iput-object p1, p0, Lcom/facebook/fresco/animation/c/a;->PE:Lcom/facebook/fresco/animation/a/a;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/c/a;->PA:Lcom/facebook/fresco/animation/a/a;
 
-    iget-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;->PA: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;->Qm:Lcom/facebook/fresco/animation/d/b;
+    iput-object v0, p0, Lcom/facebook/fresco/animation/c/a;->Qi: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;->Qw:Ljava/lang/Runnable;
+    iget-object p0, p0, Lcom/facebook/fresco/animation/c/a;->Qs: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;->PE:Lcom/facebook/fresco/animation/a/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->PA:Lcom/facebook/fresco/animation/a/a;
 
     if-eqz v0, :cond_8
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->Qm:Lcom/facebook/fresco/animation/d/b;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->Qi: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;->Qn:Z
+    iget-boolean v2, p0, Lcom/facebook/fresco/animation/c/a;->Qj:Z
 
     if-eqz v2, :cond_1
 
-    iget-wide v2, p0, Lcom/facebook/fresco/animation/c/a;->Nk:J
+    iget-wide v2, p0, Lcom/facebook/fresco/animation/c/a;->Ng:J
 
     sub-long v2, v0, v2
 
-    iget-wide v4, p0, Lcom/facebook/fresco/animation/c/a;->Qs:J
+    iget-wide v4, p0, Lcom/facebook/fresco/animation/c/a;->Qo:J
 
     add-long/2addr v2, v4
 
     goto :goto_0
 
     :cond_1
-    iget-wide v2, p0, Lcom/facebook/fresco/animation/c/a;->Qo:J
+    iget-wide v2, p0, Lcom/facebook/fresco/animation/c/a;->Qk: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;->Qm:Lcom/facebook/fresco/animation/d/b;
+    iget-object v4, p0, Lcom/facebook/fresco/animation/c/a;->Qi: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;->PE:Lcom/facebook/fresco/animation/a/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->PA:Lcom/facebook/fresco/animation/a/a;
 
-    invoke-interface {v0}, Lcom/facebook/fresco/animation/a/a;->fE()I
+    invoke-interface {v0}, Lcom/facebook/fresco/animation/a/a;->fC()I
 
     move-result v0
 
     add-int/lit8 v4, v0, -0x1
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->Qu:Lcom/facebook/fresco/animation/c/b;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->Qq:Lcom/facebook/fresco/animation/c/b;
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/facebook/fresco/animation/c/a;->Qn:Z
+    iput-boolean v0, p0, Lcom/facebook/fresco/animation/c/a;->Qj:Z
 
     goto :goto_1
 
     :cond_2
     if-nez v4, :cond_3
 
-    iget v6, p0, Lcom/facebook/fresco/animation/c/a;->Qq:I
+    iget v6, p0, Lcom/facebook/fresco/animation/c/a;->Qm:I
 
     if-eq v6, v5, :cond_3
 
-    iget-wide v5, p0, Lcom/facebook/fresco/animation/c/a;->Qp:J
+    iget-wide v5, p0, Lcom/facebook/fresco/animation/c/a;->Ql:J
 
     cmp-long v7, v0, v5
 
     if-ltz v7, :cond_3
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->Qu:Lcom/facebook/fresco/animation/c/b;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->Qq:Lcom/facebook/fresco/animation/c/b;
 
     :cond_3
     :goto_1
-    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->PE:Lcom/facebook/fresco/animation/a/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->PA: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;->Qu:Lcom/facebook/fresco/animation/c/b;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->Qq:Lcom/facebook/fresco/animation/c/b;
 
-    iput v4, p0, Lcom/facebook/fresco/animation/c/a;->Qq:I
+    iput v4, p0, Lcom/facebook/fresco/animation/c/a;->Qm:I
 
     :cond_4
     if-nez p1, :cond_5
 
-    iget p1, p0, Lcom/facebook/fresco/animation/c/a;->Qt:I
+    iget p1, p0, Lcom/facebook/fresco/animation/c/a;->Qp:I
 
     add-int/lit8 p1, p1, 0x1
 
-    iput p1, p0, Lcom/facebook/fresco/animation/c/a;->Qt:I
+    iput p1, p0, Lcom/facebook/fresco/animation/c/a;->Qp:I
 
     const/4 p1, 0x2
 
@@ -271,9 +271,9 @@
 
     if-eqz p1, :cond_5
 
-    sget-object p1, Lcom/facebook/fresco/animation/c/a;->GI:Ljava/lang/Class;
+    sget-object p1, Lcom/facebook/fresco/animation/c/a;->GE:Ljava/lang/Class;
 
-    iget v0, p0, Lcom/facebook/fresco/animation/c/a;->Qt:I
+    iget v0, p0, Lcom/facebook/fresco/animation/c/a;->Qp: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;->Qn:Z
+    iget-boolean p1, p0, Lcom/facebook/fresco/animation/c/a;->Qj:Z
 
     if-eqz p1, :cond_6
 
-    iget-object p1, p0, Lcom/facebook/fresco/animation/c/a;->Qm:Lcom/facebook/fresco/animation/d/b;
+    iget-object p1, p0, Lcom/facebook/fresco/animation/c/a;->Qi:Lcom/facebook/fresco/animation/d/b;
 
-    iget-wide v4, p0, Lcom/facebook/fresco/animation/c/a;->Nk:J
+    iget-wide v4, p0, Lcom/facebook/fresco/animation/c/a;->Ng: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;->Qr:J
+    iget-wide v4, p0, Lcom/facebook/fresco/animation/c/a;->Qn:J
 
     add-long/2addr v0, v4
 
-    iget-wide v4, p0, Lcom/facebook/fresco/animation/c/a;->Nk:J
+    iget-wide v4, p0, Lcom/facebook/fresco/animation/c/a;->Ng:J
 
     add-long/2addr v4, v0
 
-    iput-wide v4, p0, Lcom/facebook/fresco/animation/c/a;->Qp:J
+    iput-wide v4, p0, Lcom/facebook/fresco/animation/c/a;->Ql:J
 
-    iget-object p1, p0, Lcom/facebook/fresco/animation/c/a;->Qw:Ljava/lang/Runnable;
+    iget-object p1, p0, Lcom/facebook/fresco/animation/c/a;->Qs:Ljava/lang/Runnable;
 
-    iget-wide v0, p0, Lcom/facebook/fresco/animation/c/a;->Qp:J
+    iget-wide v0, p0, Lcom/facebook/fresco/animation/c/a;->Ql: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;->Qv:Lcom/facebook/fresco/animation/c/a$a;
+    iget-object p1, p0, Lcom/facebook/fresco/animation/c/a;->Qr:Lcom/facebook/fresco/animation/c/a$a;
 
     if-eqz p1, :cond_7
 
-    iget-boolean p1, p0, Lcom/facebook/fresco/animation/c/a;->Qn:Z
+    iget-boolean p1, p0, Lcom/facebook/fresco/animation/c/a;->Qj:Z
 
     :cond_7
-    iput-wide v2, p0, Lcom/facebook/fresco/animation/c/a;->Qo:J
+    iput-wide v2, p0, Lcom/facebook/fresco/animation/c/a;->Qk:J
 
     :cond_8
     :goto_2
     return-void
 .end method
 
-.method public final gP()V
+.method public final gN()V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->PE:Lcom/facebook/fresco/animation/a/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->PA: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;->PE:Lcom/facebook/fresco/animation/a/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->PA: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;->PE:Lcom/facebook/fresco/animation/a/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->PA: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;->Qn:Z
+    iget-boolean v0, p0, Lcom/facebook/fresco/animation/c/a;->Qj: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;->PE:Lcom/facebook/fresco/animation/a/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->PA: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;->Qn:Z
+    iget-boolean v0, p0, Lcom/facebook/fresco/animation/c/a;->Qj:Z
 
     const/4 v1, 0x0
 
@@ -437,7 +437,7 @@
     return v1
 
     :cond_0
-    iget-wide v2, p0, Lcom/facebook/fresco/animation/c/a;->Qo:J
+    iget-wide v2, p0, Lcom/facebook/fresco/animation/c/a;->Qk: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;->Qo:J
+    iput-wide v4, p0, Lcom/facebook/fresco/animation/c/a;->Qk: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;->MS:Lcom/facebook/drawee/drawable/d;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->MO: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;->MS:Lcom/facebook/drawee/drawable/d;
+    iput-object v0, p0, Lcom/facebook/fresco/animation/c/a;->MO:Lcom/facebook/drawee/drawable/d;
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->MS:Lcom/facebook/drawee/drawable/d;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->MO: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;->PE:Lcom/facebook/fresco/animation/a/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->PA: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;->MS:Lcom/facebook/drawee/drawable/d;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->MO: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;->MS:Lcom/facebook/drawee/drawable/d;
+    iput-object v0, p0, Lcom/facebook/fresco/animation/c/a;->MO:Lcom/facebook/drawee/drawable/d;
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->MS:Lcom/facebook/drawee/drawable/d;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->MO: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;->PE:Lcom/facebook/fresco/animation/a/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->PA: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;->Qn:Z
+    iget-boolean v0, p0, Lcom/facebook/fresco/animation/c/a;->Qj:Z
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->PE:Lcom/facebook/fresco/animation/a/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->PA:Lcom/facebook/fresco/animation/a/a;
 
     if-eqz v0, :cond_1
 
-    invoke-interface {v0}, Lcom/facebook/fresco/animation/a/a;->fE()I
+    invoke-interface {v0}, Lcom/facebook/fresco/animation/a/a;->fC()I
 
     move-result v0
 
@@ -535,29 +535,29 @@
     goto :goto_0
 
     :cond_0
-    iput-boolean v1, p0, Lcom/facebook/fresco/animation/c/a;->Qn:Z
+    iput-boolean v1, p0, Lcom/facebook/fresco/animation/c/a;->Qj:Z
 
     invoke-static {}, Landroid/os/SystemClock;->uptimeMillis()J
 
     move-result-wide v0
 
-    iput-wide v0, p0, Lcom/facebook/fresco/animation/c/a;->Nk:J
+    iput-wide v0, p0, Lcom/facebook/fresco/animation/c/a;->Ng:J
 
-    iget-wide v0, p0, Lcom/facebook/fresco/animation/c/a;->Nk:J
+    iget-wide v0, p0, Lcom/facebook/fresco/animation/c/a;->Ng:J
 
-    iput-wide v0, p0, Lcom/facebook/fresco/animation/c/a;->Qp:J
+    iput-wide v0, p0, Lcom/facebook/fresco/animation/c/a;->Ql:J
 
     const-wide/16 v0, -0x1
 
-    iput-wide v0, p0, Lcom/facebook/fresco/animation/c/a;->Qo:J
+    iput-wide v0, p0, Lcom/facebook/fresco/animation/c/a;->Qk:J
 
     const/4 v0, -0x1
 
-    iput v0, p0, Lcom/facebook/fresco/animation/c/a;->Qq:I
+    iput v0, p0, Lcom/facebook/fresco/animation/c/a;->Qm:I
 
     invoke-virtual {p0}, Lcom/facebook/fresco/animation/c/a;->invalidateSelf()V
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->Qu:Lcom/facebook/fresco/animation/c/b;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->Qq: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;->Qn:Z
+    iget-boolean v0, p0, Lcom/facebook/fresco/animation/c/a;->Qj: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;->Qn:Z
+    iput-boolean v0, p0, Lcom/facebook/fresco/animation/c/a;->Qj:Z
 
     const-wide/16 v0, 0x0
 
-    iput-wide v0, p0, Lcom/facebook/fresco/animation/c/a;->Nk:J
+    iput-wide v0, p0, Lcom/facebook/fresco/animation/c/a;->Ng:J
 
-    iget-wide v0, p0, Lcom/facebook/fresco/animation/c/a;->Nk:J
+    iget-wide v0, p0, Lcom/facebook/fresco/animation/c/a;->Ng:J
 
-    iput-wide v0, p0, Lcom/facebook/fresco/animation/c/a;->Qp:J
+    iput-wide v0, p0, Lcom/facebook/fresco/animation/c/a;->Ql:J
 
     const-wide/16 v0, -0x1
 
-    iput-wide v0, p0, Lcom/facebook/fresco/animation/c/a;->Qo:J
+    iput-wide v0, p0, Lcom/facebook/fresco/animation/c/a;->Qk:J
 
     const/4 v0, -0x1
 
-    iput v0, p0, Lcom/facebook/fresco/animation/c/a;->Qq:I
+    iput v0, p0, Lcom/facebook/fresco/animation/c/a;->Qm:I
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->Qw:Ljava/lang/Runnable;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->Qs: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;->Qu:Lcom/facebook/fresco/animation/c/b;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->Qq: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 f08e9c4dd5..243fbfa39b 100644
--- a/com.discord/smali/com/facebook/fresco/animation/factory/AnimatedFactoryV2Impl.smali
+++ b/com.discord/smali/com/facebook/fresco/animation/factory/AnimatedFactoryV2Impl.smali
@@ -7,33 +7,16 @@
 
 
 # instance fields
-.field private JW:Lcom/facebook/imagepipeline/f/a;
+.field private JS:Lcom/facebook/imagepipeline/f/a;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private final PN:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+.field private final PJ:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
 
-.field private final QA:Z
+.field private final Qu:Lcom/facebook/imagepipeline/b/f;
 
-.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;
+.field private final Qv:Lcom/facebook/imagepipeline/cache/h;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/cache/h<",
@@ -44,6 +27,23 @@
     .end annotation
 .end field
 
+.field private final Qw:Z
+
+.field private Qx:Lcom/facebook/imagepipeline/animated/b/d;
+    .annotation runtime Ljavax/annotation/Nullable;
+    .end annotation
+.end field
+
+.field private Qy:Lcom/facebook/imagepipeline/animated/c/b;
+    .annotation runtime Ljavax/annotation/Nullable;
+    .end annotation
+.end field
+
+.field private Qz: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;->PN:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->PJ:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
 
-    iput-object p2, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->Qy:Lcom/facebook/imagepipeline/b/f;
+    iput-object p2, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->Qu:Lcom/facebook/imagepipeline/b/f;
 
-    iput-object p3, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->Qz:Lcom/facebook/imagepipeline/cache/h;
+    iput-object p3, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->Qv:Lcom/facebook/imagepipeline/cache/h;
 
-    iput-boolean p4, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->QA:Z
+    iput-boolean p4, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->Qw: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;->QB:Lcom/facebook/imagepipeline/animated/b/d;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->Qx: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;->PN:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+    iget-object v2, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->PJ: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;->QB:Lcom/facebook/imagepipeline/animated/b/d;
+    iput-object v1, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->Qx:Lcom/facebook/imagepipeline/animated/b/d;
 
     :cond_0
-    iget-object p0, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->QB:Lcom/facebook/imagepipeline/animated/b/d;
+    iget-object p0, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->Qx: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;->QD:Lcom/facebook/imagepipeline/animated/d/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->Qz: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;->QD:Lcom/facebook/imagepipeline/animated/d/a;
+    iput-object v0, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->Qz:Lcom/facebook/imagepipeline/animated/d/a;
 
     :cond_0
-    iget-object p0, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->QD:Lcom/facebook/imagepipeline/animated/d/a;
+    iget-object p0, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->Qz: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;->QA:Z
+    iget-boolean p0, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->Qw:Z
 
     return p0
 .end method
@@ -147,12 +147,12 @@
     return-object v0
 .end method
 
-.method public final ib()Lcom/facebook/imagepipeline/f/a;
+.method public final hZ()Lcom/facebook/imagepipeline/f/a;
     .locals 10
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->JW:Lcom/facebook/imagepipeline/f/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->JS: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;->Qy:Lcom/facebook/imagepipeline/b/f;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->Qu:Lcom/facebook/imagepipeline/b/f;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/b/f;->iH()Ljava/util/concurrent/Executor;
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/b/f;->iF()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;->QC:Lcom/facebook/imagepipeline/animated/c/b;
+    iget-object v1, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->Qy: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;->QC:Lcom/facebook/imagepipeline/animated/c/b;
+    iput-object v1, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->Qy:Lcom/facebook/imagepipeline/animated/c/b;
 
     :cond_0
-    iget-object v2, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->QC:Lcom/facebook/imagepipeline/animated/c/b;
+    iget-object v2, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->Qy:Lcom/facebook/imagepipeline/animated/c/b;
 
-    invoke-static {}, Lcom/facebook/common/b/i;->gh()Lcom/facebook/common/b/i;
+    invoke-static {}, Lcom/facebook/common/b/i;->gf()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;->PN:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+    iget-object v6, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->PJ:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
 
-    iget-object v7, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->Qz:Lcom/facebook/imagepipeline/cache/h;
+    iget-object v7, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->Qv: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;->JW:Lcom/facebook/imagepipeline/f/a;
+    iput-object v0, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->JS:Lcom/facebook/imagepipeline/f/a;
 
     :cond_1
-    iget-object v0, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->JW:Lcom/facebook/imagepipeline/f/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->JS: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 3935fe3f4f..9639d67843 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 Tq:Lcom/facebook/imagepipeline/a/b;
+.field private static final Tm:Lcom/facebook/imagepipeline/a/b;
 
 
 # instance fields
-.field public final Tr:I
+.field public final Tn:I
 
-.field public final Ts:Z
+.field public final To:Z
 
-.field public final Tt:Z
+.field public final Tp:Z
 
-.field public final Tu:Z
+.field public final Tq:Z
 
-.field public final Tv:Z
+.field public final Tr:Z
 
-.field public final Tw:Landroid/graphics/Bitmap$Config;
+.field public final Ts:Landroid/graphics/Bitmap$Config;
 
-.field public final Tx:Lcom/facebook/imagepipeline/e/c;
+.field public final Tt:Lcom/facebook/imagepipeline/e/c;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public final Ty:Lcom/facebook/imagepipeline/l/a;
+.field public final Tu:Lcom/facebook/imagepipeline/l/a;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public final Tz:Landroid/graphics/ColorSpace;
+.field public final Tv: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;->Tq:Lcom/facebook/imagepipeline/a/b;
+    sput-object v1, Lcom/facebook/imagepipeline/a/b;->Tm: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;->TA:I
+    iget v0, p1, Lcom/facebook/imagepipeline/a/c;->Tw:I
 
-    iput v0, p0, Lcom/facebook/imagepipeline/a/b;->Tr:I
+    iput v0, p0, Lcom/facebook/imagepipeline/a/b;->Tn:I
 
-    iget-boolean v0, p1, Lcom/facebook/imagepipeline/a/c;->TB:Z
+    iget-boolean v0, p1, Lcom/facebook/imagepipeline/a/c;->Tx:Z
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/a/b;->Ts:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/a/b;->To:Z
 
-    iget-boolean v0, p1, Lcom/facebook/imagepipeline/a/c;->TC:Z
+    iget-boolean v0, p1, Lcom/facebook/imagepipeline/a/c;->Ty:Z
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/a/b;->Tt:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/a/b;->Tp:Z
 
-    iget-boolean v0, p1, Lcom/facebook/imagepipeline/a/c;->TD:Z
+    iget-boolean v0, p1, Lcom/facebook/imagepipeline/a/c;->Tz:Z
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/a/b;->Tu:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/a/b;->Tq:Z
 
-    iget-boolean v0, p1, Lcom/facebook/imagepipeline/a/c;->TE:Z
+    iget-boolean v0, p1, Lcom/facebook/imagepipeline/a/c;->TA:Z
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/a/b;->Tv:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/a/b;->Tr:Z
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/a/c;->PT:Landroid/graphics/Bitmap$Config;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/a/c;->PP:Landroid/graphics/Bitmap$Config;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/a/b;->Tw:Landroid/graphics/Bitmap$Config;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/a/b;->Ts:Landroid/graphics/Bitmap$Config;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/a/c;->TF:Lcom/facebook/imagepipeline/e/c;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/a/c;->TB:Lcom/facebook/imagepipeline/e/c;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/a/b;->Tx:Lcom/facebook/imagepipeline/e/c;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/a/b;->Tt:Lcom/facebook/imagepipeline/e/c;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/a/c;->TG:Lcom/facebook/imagepipeline/l/a;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/a/c;->TC:Lcom/facebook/imagepipeline/l/a;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/a/b;->Ty:Lcom/facebook/imagepipeline/l/a;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/a/b;->Tu:Lcom/facebook/imagepipeline/l/a;
 
-    iget-object p1, p1, Lcom/facebook/imagepipeline/a/c;->TH:Landroid/graphics/ColorSpace;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/a/c;->TD:Landroid/graphics/ColorSpace;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/a/b;->Tz:Landroid/graphics/ColorSpace;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/a/b;->Tv:Landroid/graphics/ColorSpace;
 
     return-void
 .end method
 
-.method public static iz()Lcom/facebook/imagepipeline/a/b;
+.method public static ix()Lcom/facebook/imagepipeline/a/b;
     .locals 1
 
-    sget-object v0, Lcom/facebook/imagepipeline/a/b;->Tq:Lcom/facebook/imagepipeline/a/b;
+    sget-object v0, Lcom/facebook/imagepipeline/a/b;->Tm: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;->Ts:Z
+    iget-boolean v2, p0, Lcom/facebook/imagepipeline/a/b;->To:Z
 
-    iget-boolean v3, p1, Lcom/facebook/imagepipeline/a/b;->Ts:Z
+    iget-boolean v3, p1, Lcom/facebook/imagepipeline/a/b;->To:Z
 
     if-eq v2, v3, :cond_2
 
     return v1
 
     :cond_2
-    iget-boolean v2, p0, Lcom/facebook/imagepipeline/a/b;->Tt:Z
+    iget-boolean v2, p0, Lcom/facebook/imagepipeline/a/b;->Tp:Z
 
-    iget-boolean v3, p1, Lcom/facebook/imagepipeline/a/b;->Tt:Z
+    iget-boolean v3, p1, Lcom/facebook/imagepipeline/a/b;->Tp:Z
 
     if-eq v2, v3, :cond_3
 
     return v1
 
     :cond_3
-    iget-boolean v2, p0, Lcom/facebook/imagepipeline/a/b;->Tu:Z
+    iget-boolean v2, p0, Lcom/facebook/imagepipeline/a/b;->Tq:Z
 
-    iget-boolean v3, p1, Lcom/facebook/imagepipeline/a/b;->Tu:Z
+    iget-boolean v3, p1, Lcom/facebook/imagepipeline/a/b;->Tq:Z
 
     if-eq v2, v3, :cond_4
 
     return v1
 
     :cond_4
-    iget-boolean v2, p0, Lcom/facebook/imagepipeline/a/b;->Tv:Z
+    iget-boolean v2, p0, Lcom/facebook/imagepipeline/a/b;->Tr:Z
 
-    iget-boolean v3, p1, Lcom/facebook/imagepipeline/a/b;->Tv:Z
+    iget-boolean v3, p1, Lcom/facebook/imagepipeline/a/b;->Tr:Z
 
     if-eq v2, v3, :cond_5
 
     return v1
 
     :cond_5
-    iget-object v2, p0, Lcom/facebook/imagepipeline/a/b;->Tw:Landroid/graphics/Bitmap$Config;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/a/b;->Ts:Landroid/graphics/Bitmap$Config;
 
-    iget-object v3, p1, Lcom/facebook/imagepipeline/a/b;->Tw:Landroid/graphics/Bitmap$Config;
+    iget-object v3, p1, Lcom/facebook/imagepipeline/a/b;->Ts:Landroid/graphics/Bitmap$Config;
 
     if-eq v2, v3, :cond_6
 
     return v1
 
     :cond_6
-    iget-object v2, p0, Lcom/facebook/imagepipeline/a/b;->Tx:Lcom/facebook/imagepipeline/e/c;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/a/b;->Tt:Lcom/facebook/imagepipeline/e/c;
 
-    iget-object v3, p1, Lcom/facebook/imagepipeline/a/b;->Tx:Lcom/facebook/imagepipeline/e/c;
+    iget-object v3, p1, Lcom/facebook/imagepipeline/a/b;->Tt:Lcom/facebook/imagepipeline/e/c;
 
     if-eq v2, v3, :cond_7
 
     return v1
 
     :cond_7
-    iget-object v2, p0, Lcom/facebook/imagepipeline/a/b;->Ty:Lcom/facebook/imagepipeline/l/a;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/a/b;->Tu:Lcom/facebook/imagepipeline/l/a;
 
-    iget-object v3, p1, Lcom/facebook/imagepipeline/a/b;->Ty:Lcom/facebook/imagepipeline/l/a;
+    iget-object v3, p1, Lcom/facebook/imagepipeline/a/b;->Tu:Lcom/facebook/imagepipeline/l/a;
 
     if-eq v2, v3, :cond_8
 
     return v1
 
     :cond_8
-    iget-object v2, p0, Lcom/facebook/imagepipeline/a/b;->Tz:Landroid/graphics/ColorSpace;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/a/b;->Tv:Landroid/graphics/ColorSpace;
 
-    iget-object p1, p1, Lcom/facebook/imagepipeline/a/b;->Tz:Landroid/graphics/ColorSpace;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/a/b;->Tv: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;->Tr:I
+    iget v0, p0, Lcom/facebook/imagepipeline/a/b;->Tn:I
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-boolean v1, p0, Lcom/facebook/imagepipeline/a/b;->Ts:Z
+    iget-boolean v1, p0, Lcom/facebook/imagepipeline/a/b;->To:Z
 
     add-int/2addr v0, v1
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-boolean v1, p0, Lcom/facebook/imagepipeline/a/b;->Tt:Z
+    iget-boolean v1, p0, Lcom/facebook/imagepipeline/a/b;->Tp:Z
 
     add-int/2addr v0, v1
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-boolean v1, p0, Lcom/facebook/imagepipeline/a/b;->Tu:Z
+    iget-boolean v1, p0, Lcom/facebook/imagepipeline/a/b;->Tq:Z
 
     add-int/2addr v0, v1
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-boolean v1, p0, Lcom/facebook/imagepipeline/a/b;->Tv:Z
+    iget-boolean v1, p0, Lcom/facebook/imagepipeline/a/b;->Tr:Z
 
     add-int/2addr v0, v1
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/a/b;->Tw:Landroid/graphics/Bitmap$Config;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/a/b;->Ts: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;->Tx:Lcom/facebook/imagepipeline/e/c;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/a/b;->Tt: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;->Ty:Lcom/facebook/imagepipeline/l/a;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/a/b;->Tu: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;->Tz:Landroid/graphics/ColorSpace;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/a/b;->Tv: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;->Tr:I
+    iget v1, p0, Lcom/facebook/imagepipeline/a/b;->Tn: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;->Ts:Z
+    iget-boolean v1, p0, Lcom/facebook/imagepipeline/a/b;->To: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;->Tt:Z
+    iget-boolean v1, p0, Lcom/facebook/imagepipeline/a/b;->Tp: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;->Tu:Z
+    iget-boolean v1, p0, Lcom/facebook/imagepipeline/a/b;->Tq: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;->Tv:Z
+    iget-boolean v1, p0, Lcom/facebook/imagepipeline/a/b;->Tr: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;->Tw:Landroid/graphics/Bitmap$Config;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/a/b;->Ts: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;->Tx:Lcom/facebook/imagepipeline/e/c;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/a/b;->Tt:Lcom/facebook/imagepipeline/e/c;
 
     const/4 v2, 0x6
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/a/b;->Ty:Lcom/facebook/imagepipeline/l/a;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/a/b;->Tu:Lcom/facebook/imagepipeline/l/a;
 
     const/4 v2, 0x7
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/a/b;->Tz:Landroid/graphics/ColorSpace;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/a/b;->Tv: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 b5a07a37cb..d448e81c9b 100644
--- a/com.discord/smali/com/facebook/imagepipeline/a/c.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/a/c.smali
@@ -4,33 +4,33 @@
 
 
 # instance fields
-.field PT:Landroid/graphics/Bitmap$Config;
+.field PP:Landroid/graphics/Bitmap$Config;
 
-.field TA:I
+.field TA:Z
 
-.field TB:Z
-
-.field TC:Z
-
-.field TD:Z
-
-.field TE:Z
-
-.field TF:Lcom/facebook/imagepipeline/e/c;
+.field TB:Lcom/facebook/imagepipeline/e/c;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field TG:Lcom/facebook/imagepipeline/l/a;
+.field TC:Lcom/facebook/imagepipeline/l/a;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field TH:Landroid/graphics/ColorSpace;
+.field TD:Landroid/graphics/ColorSpace;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
+.field Tw:I
+
+.field Tx:Z
+
+.field Ty:Z
+
+.field Tz:Z
+
 
 # direct methods
 .method public constructor <init>()V
@@ -40,11 +40,11 @@
 
     const/16 v0, 0x64
 
-    iput v0, p0, Lcom/facebook/imagepipeline/a/c;->TA:I
+    iput v0, p0, Lcom/facebook/imagepipeline/a/c;->Tw:I
 
     sget-object v0, Landroid/graphics/Bitmap$Config;->ARGB_8888:Landroid/graphics/Bitmap$Config;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/a/c;->PT:Landroid/graphics/Bitmap$Config;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/a/c;->PP: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 8b83774428..889390622f 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 TI:Lcom/facebook/imagepipeline/a/d;
+.field public static final enum TE:Lcom/facebook/imagepipeline/a/d;
 
-.field public static final enum TJ:Lcom/facebook/imagepipeline/a/d;
+.field public static final enum TF:Lcom/facebook/imagepipeline/a/d;
 
-.field public static final enum TK:Lcom/facebook/imagepipeline/a/d;
+.field public static final enum TG:Lcom/facebook/imagepipeline/a/d;
 
-.field private static final synthetic TL:[Lcom/facebook/imagepipeline/a/d;
+.field private static final synthetic TH:[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;->TI:Lcom/facebook/imagepipeline/a/d;
+    sput-object v0, Lcom/facebook/imagepipeline/a/d;->TE: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;->TJ:Lcom/facebook/imagepipeline/a/d;
+    sput-object v0, Lcom/facebook/imagepipeline/a/d;->TF: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;->TK:Lcom/facebook/imagepipeline/a/d;
+    sput-object v0, Lcom/facebook/imagepipeline/a/d;->TG: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;->TI:Lcom/facebook/imagepipeline/a/d;
+    sget-object v4, Lcom/facebook/imagepipeline/a/d;->TE:Lcom/facebook/imagepipeline/a/d;
 
     aput-object v4, v0, v1
 
-    sget-object v1, Lcom/facebook/imagepipeline/a/d;->TJ:Lcom/facebook/imagepipeline/a/d;
+    sget-object v1, Lcom/facebook/imagepipeline/a/d;->TF:Lcom/facebook/imagepipeline/a/d;
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/facebook/imagepipeline/a/d;->TK:Lcom/facebook/imagepipeline/a/d;
+    sget-object v1, Lcom/facebook/imagepipeline/a/d;->TG:Lcom/facebook/imagepipeline/a/d;
 
     aput-object v1, v0, v3
 
-    sput-object v0, Lcom/facebook/imagepipeline/a/d;->TL:[Lcom/facebook/imagepipeline/a/d;
+    sput-object v0, Lcom/facebook/imagepipeline/a/d;->TH:[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;->TL:[Lcom/facebook/imagepipeline/a/d;
+    sget-object v0, Lcom/facebook/imagepipeline/a/d;->TH:[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 39d7889cc8..b7b3cc5ccc 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 fE()I
+.method public abstract fC()I
 .end method
 
-.method public abstract fG()I
+.method public abstract fE()I
 .end method
 
 .method public abstract getHeight()I
@@ -28,8 +28,8 @@
 .method public abstract getWidth()I
 .end method
 
-.method public abstract ii()I
+.method public abstract ig()I
 .end method
 
-.method public abstract ij()I
+.method public abstract ih()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 0d0d6fdf7b..bde8486403 100644
--- a/com.discord/smali/com/facebook/imagepipeline/animated/a/e.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/animated/a/e.smali
@@ -4,16 +4,13 @@
 
 
 # instance fields
-.field public final RB:Lcom/facebook/imagepipeline/animated/a/c;
-
-.field private final RC:I
-
-.field private RD:Lcom/facebook/common/references/CloseableReference;
+.field private RA:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
+            "Ljava/util/List<",
             "Lcom/facebook/common/references/CloseableReference<",
             "Landroid/graphics/Bitmap;",
-            ">;"
+            ">;>;"
         }
     .end annotation
 
@@ -21,13 +18,16 @@
     .end annotation
 .end field
 
-.field private RE:Ljava/util/List;
+.field public final Rx:Lcom/facebook/imagepipeline/animated/a/c;
+
+.field private final Ry:I
+
+.field private Rz:Lcom/facebook/common/references/CloseableReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "Ljava/util/List<",
             "Lcom/facebook/common/references/CloseableReference<",
             "Landroid/graphics/Bitmap;",
-            ">;>;"
+            ">;"
         }
     .end annotation
 
@@ -48,11 +48,11 @@
 
     check-cast p1, Lcom/facebook/imagepipeline/animated/a/c;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/a/e;->RB:Lcom/facebook/imagepipeline/animated/a/c;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/a/e;->Rx:Lcom/facebook/imagepipeline/animated/a/c;
 
     const/4 p1, 0x0
 
-    iput p1, p0, Lcom/facebook/imagepipeline/animated/a/e;->RC:I
+    iput p1, p0, Lcom/facebook/imagepipeline/animated/a/e;->Ry: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;->RB:Lcom/facebook/imagepipeline/animated/a/c;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/animated/a/f;->Rx: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;->RB:Lcom/facebook/imagepipeline/animated/a/c;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/animated/a/e;->Rx:Lcom/facebook/imagepipeline/animated/a/c;
 
-    iget v0, p1, Lcom/facebook/imagepipeline/animated/a/f;->RC:I
+    iget v0, p1, Lcom/facebook/imagepipeline/animated/a/f;->Ry:I
 
-    iput v0, p0, Lcom/facebook/imagepipeline/animated/a/e;->RC:I
+    iput v0, p0, Lcom/facebook/imagepipeline/animated/a/e;->Ry:I
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/animated/a/f;->RD:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/animated/a/f;->Rz: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;->RD:Lcom/facebook/common/references/CloseableReference;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/animated/a/e;->Rz:Lcom/facebook/common/references/CloseableReference;
 
-    iget-object p1, p1, Lcom/facebook/imagepipeline/animated/a/f;->RE:Ljava/util/List;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/animated/a/f;->RA: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;->RE:Ljava/util/List;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/a/e;->RA: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;->RD:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/a/e;->Rz: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;->RD:Lcom/facebook/common/references/CloseableReference;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/animated/a/e;->Rz:Lcom/facebook/common/references/CloseableReference;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/animated/a/e;->RE:Ljava/util/List;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/animated/a/e;->RA: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;->RE:Ljava/util/List;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/animated/a/e;->RA: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 423997bbd4..3ed1365d0c 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 ib()Lcom/facebook/imagepipeline/f/a;
+.method public abstract hZ()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 8af81affb1..45211b2cf0 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 RK:Lcom/facebook/imagepipeline/animated/b/e;
+.field final synthetic RG: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;->RK:Lcom/facebook/imagepipeline/animated/b/e;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/b/e$1;->RG: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 57eeff8639..8a844b2491 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 RI:Lcom/facebook/imagepipeline/animated/b/c;
+.field static RE:Lcom/facebook/imagepipeline/animated/b/c;
 
-.field static RJ:Lcom/facebook/imagepipeline/animated/b/c;
+.field static RF:Lcom/facebook/imagepipeline/animated/b/c;
 
 
 # instance fields
-.field private final QC:Lcom/facebook/imagepipeline/animated/c/b;
+.field private final Qy:Lcom/facebook/imagepipeline/animated/c/b;
 
-.field private final RH:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+.field private final RD:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
 
 
 # direct methods
@@ -28,7 +28,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/facebook/imagepipeline/animated/b/e;->RI:Lcom/facebook/imagepipeline/animated/b/c;
+    sput-object v0, Lcom/facebook/imagepipeline/animated/b/e;->RE: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;->RJ:Lcom/facebook/imagepipeline/animated/b/c;
+    sput-object v0, Lcom/facebook/imagepipeline/animated/b/e;->RF: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;->QC:Lcom/facebook/imagepipeline/animated/c/b;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/b/e;->Qy:Lcom/facebook/imagepipeline/animated/c/b;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/animated/b/e;->RH:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/animated/b/e;->RD: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;->QC:Lcom/facebook/imagepipeline/animated/c/b;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/b/e;->Qy: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;->Tt:Z
+    iget-boolean v1, p1, Lcom/facebook/imagepipeline/a/b;->Tp:Z
 
     const/4 v2, 0x0
 
     if-eqz v1, :cond_0
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/animated/a/c;->fE()I
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/animated/a/c;->fC()I
 
     move-result v1
 
@@ -134,7 +134,7 @@
     const/4 v1, 0x0
 
     :goto_0
-    iget-boolean v3, p1, Lcom/facebook/imagepipeline/a/b;->Tv:Z
+    iget-boolean v3, p1, Lcom/facebook/imagepipeline/a/b;->Tr:Z
 
     if-eqz v3, :cond_1
 
@@ -144,7 +144,7 @@
 
     move-result-object p2
 
-    sget-object p3, Lcom/facebook/imagepipeline/g/g;->Wj:Lcom/facebook/imagepipeline/g/h;
+    sget-object p3, Lcom/facebook/imagepipeline/g/g;->Wf: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;->Tu:Z
+    iget-boolean v3, p1, Lcom/facebook/imagepipeline/a/b;->Tq:Z
 
     if-eqz v3, :cond_3
 
@@ -166,7 +166,7 @@
 
     move-result-object v3
 
-    iget-object v4, p0, Lcom/facebook/imagepipeline/animated/b/e;->QC:Lcom/facebook/imagepipeline/animated/c/b;
+    iget-object v4, p0, Lcom/facebook/imagepipeline/animated/b/e;->Qy: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;->fE()I
+    invoke-interface {v3}, Lcom/facebook/imagepipeline/animated/a/a;->fC()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;->fE()I
+    invoke-interface {v3}, Lcom/facebook/imagepipeline/animated/a/a;->fC()I
 
     move-result v6
 
@@ -241,7 +241,7 @@
     move-object v4, v0
 
     :goto_2
-    iget-boolean p1, p1, Lcom/facebook/imagepipeline/a/b;->Ts:Z
+    iget-boolean p1, p1, Lcom/facebook/imagepipeline/a/b;->To:Z
 
     if-eqz p1, :cond_4
 
@@ -262,17 +262,17 @@
 
     move-result-object p2
 
-    iput-object p2, p1, Lcom/facebook/imagepipeline/animated/a/f;->RD:Lcom/facebook/common/references/CloseableReference;
+    iput-object p2, p1, Lcom/facebook/imagepipeline/animated/a/f;->Rz:Lcom/facebook/common/references/CloseableReference;
 
-    iput v1, p1, Lcom/facebook/imagepipeline/animated/a/f;->RC:I
+    iput v1, p1, Lcom/facebook/imagepipeline/animated/a/f;->Ry: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;->RE:Ljava/util/List;
+    iput-object p2, p1, Lcom/facebook/imagepipeline/animated/a/f;->RA:Ljava/util/List;
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/animated/a/f;->ik()Lcom/facebook/imagepipeline/animated/a/e;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/animated/a/f;->ii()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;->RH:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/b/e;->RD: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;->RI:Lcom/facebook/imagepipeline/animated/b/c;
+    sget-object v0, Lcom/facebook/imagepipeline/animated/b/e;->RE:Lcom/facebook/imagepipeline/animated/b/c;
 
     if-eqz v0, :cond_1
 
-    iget-object p1, p1, Lcom/facebook/imagepipeline/g/e;->Wd:Lcom/facebook/common/references/CloseableReference;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/g/e;->VZ: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;->RI:Lcom/facebook/imagepipeline/animated/b/c;
+    sget-object v1, Lcom/facebook/imagepipeline/animated/b/e;->RE: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;->RI:Lcom/facebook/imagepipeline/animated/b/c;
+    sget-object v1, Lcom/facebook/imagepipeline/animated/b/e;->RE:Lcom/facebook/imagepipeline/animated/b/c;
 
-    invoke-interface {v0}, Lcom/facebook/common/g/f;->go()J
+    invoke-interface {v0}, Lcom/facebook/common/g/f;->gm()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;->RJ:Lcom/facebook/imagepipeline/animated/b/c;
+    sget-object v0, Lcom/facebook/imagepipeline/animated/b/e;->RF:Lcom/facebook/imagepipeline/animated/b/c;
 
     if-eqz v0, :cond_1
 
-    iget-object p1, p1, Lcom/facebook/imagepipeline/g/e;->Wd:Lcom/facebook/common/references/CloseableReference;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/g/e;->VZ: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;->RJ:Lcom/facebook/imagepipeline/animated/b/c;
+    sget-object v1, Lcom/facebook/imagepipeline/animated/b/e;->RF: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;->RJ:Lcom/facebook/imagepipeline/animated/b/c;
+    sget-object v1, Lcom/facebook/imagepipeline/animated/b/e;->RF:Lcom/facebook/imagepipeline/animated/b/c;
 
-    invoke-interface {v0}, Lcom/facebook/common/g/f;->go()J
+    invoke-interface {v0}, Lcom/facebook/common/g/f;->gm()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 ac4d05f112..de0dc408b8 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 Nj:I
+.field private final Nf:I
 
-.field private final QA:Z
+.field private final Qw:Z
 
-.field private final QD:Lcom/facebook/imagepipeline/animated/d/a;
+.field private final Qz:Lcom/facebook/imagepipeline/animated/d/a;
 
-.field private final RM:Lcom/facebook/imagepipeline/animated/a/e;
+.field private final RI:Lcom/facebook/imagepipeline/animated/a/e;
 
-.field private final RN:Lcom/facebook/imagepipeline/animated/a/c;
+.field private final RJ:Lcom/facebook/imagepipeline/animated/a/c;
+
+.field private final RK:Landroid/graphics/Rect;
+
+.field private final RL:[I
+
+.field private final RM:[I
+
+.field private final RN:[Lcom/facebook/imagepipeline/animated/a/b;
 
 .field private final RO:Landroid/graphics/Rect;
 
-.field private final RP:[I
+.field private final RP:Landroid/graphics/Rect;
 
-.field private final RQ:[I
-
-.field private final RR:[Lcom/facebook/imagepipeline/animated/a/b;
-
-.field private final RS:Landroid/graphics/Rect;
-
-.field private final RT:Landroid/graphics/Rect;
-
-.field private RU:Landroid/graphics/Bitmap;
+.field private RQ: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;->RS:Landroid/graphics/Rect;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RO: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;->RT:Landroid/graphics/Rect;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RP:Landroid/graphics/Rect;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/c/a;->QD:Lcom/facebook/imagepipeline/animated/d/a;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/c/a;->Qz:Lcom/facebook/imagepipeline/animated/d/a;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/animated/c/a;->RM:Lcom/facebook/imagepipeline/animated/a/e;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/animated/c/a;->RI:Lcom/facebook/imagepipeline/animated/a/e;
 
-    iget-object p1, p2, Lcom/facebook/imagepipeline/animated/a/e;->RB:Lcom/facebook/imagepipeline/animated/a/c;
+    iget-object p1, p2, Lcom/facebook/imagepipeline/animated/a/e;->Rx:Lcom/facebook/imagepipeline/animated/a/c;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/c/a;->RN:Lcom/facebook/imagepipeline/animated/a/c;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/c/a;->RJ:Lcom/facebook/imagepipeline/animated/a/c;
 
-    iget-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;->RJ:Lcom/facebook/imagepipeline/animated/a/c;
 
-    invoke-interface {p1}, Lcom/facebook/imagepipeline/animated/a/c;->fF()[I
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/animated/a/c;->fD()[I
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/c/a;->RP:[I
+    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/c/a;->RL:[I
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/animated/c/a;->RP:[I
+    iget-object p1, p0, Lcom/facebook/imagepipeline/animated/c/a;->RL:[I
 
     invoke-static {p1}, Lcom/facebook/imagepipeline/animated/d/a;->d([I)V
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/animated/c/a;->RP:[I
+    iget-object p1, p0, Lcom/facebook/imagepipeline/animated/c/a;->RL:[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;->Nj:I
+    iput p1, p0, Lcom/facebook/imagepipeline/animated/c/a;->Nf:I
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/animated/c/a;->RP:[I
+    iget-object p1, p0, Lcom/facebook/imagepipeline/animated/c/a;->RL:[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;->RQ:[I
+    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/c/a;->RM:[I
 
-    iget-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;->RJ: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;->RO:Landroid/graphics/Rect;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/c/a;->RK:Landroid/graphics/Rect;
 
-    iput-boolean p4, p0, Lcom/facebook/imagepipeline/animated/c/a;->QA:Z
+    iput-boolean p4, p0, Lcom/facebook/imagepipeline/animated/c/a;->Qw:Z
 
-    iget-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;->RJ:Lcom/facebook/imagepipeline/animated/a/c;
 
-    invoke-interface {p1}, Lcom/facebook/imagepipeline/animated/a/c;->fE()I
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/animated/a/c;->fC()I
 
     move-result p1
 
     new-array p1, p1, [Lcom/facebook/imagepipeline/animated/a/b;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/c/a;->RR:[Lcom/facebook/imagepipeline/animated/a/b;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/c/a;->RN:[Lcom/facebook/imagepipeline/animated/a/b;
 
     const/4 p1, 0x0
 
     :goto_0
-    iget-object p2, p0, Lcom/facebook/imagepipeline/animated/c/a;->RN:Lcom/facebook/imagepipeline/animated/a/c;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/animated/c/a;->RJ:Lcom/facebook/imagepipeline/animated/a/c;
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/animated/a/c;->fE()I
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/animated/a/c;->fC()I
 
     move-result p2
 
     if-ge p1, p2, :cond_0
 
-    iget-object p2, p0, Lcom/facebook/imagepipeline/animated/c/a;->RR:[Lcom/facebook/imagepipeline/animated/a/b;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/animated/c/a;->RN:[Lcom/facebook/imagepipeline/animated/a/b;
 
-    iget-object p3, p0, Lcom/facebook/imagepipeline/animated/c/a;->RN:Lcom/facebook/imagepipeline/animated/a/c;
+    iget-object p3, p0, Lcom/facebook/imagepipeline/animated/c/a;->RJ: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 il()V
+.method private declared-synchronized ij()V
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RU:Landroid/graphics/Bitmap;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RQ:Landroid/graphics/Bitmap;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RU:Landroid/graphics/Bitmap;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RQ: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;->RU:Landroid/graphics/Bitmap;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RQ: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;->RU:Landroid/graphics/Bitmap;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RQ:Landroid/graphics/Bitmap;
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RU:Landroid/graphics/Bitmap;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RQ: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;->RU:Landroid/graphics/Bitmap;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RQ: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;->il()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/animated/c/a;->ij()V
 
     :cond_1
-    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RU:Landroid/graphics/Bitmap;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RQ: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;->RU:Landroid/graphics/Bitmap;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/c/a;->RQ:Landroid/graphics/Bitmap;
 
     :cond_2
-    iget-object p1, p0, Lcom/facebook/imagepipeline/animated/c/a;->RU:Landroid/graphics/Bitmap;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/animated/c/a;->RQ: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;->RR:[Lcom/facebook/imagepipeline/animated/a/b;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RN:[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;->RP:[I
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RL:[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;->RN:Lcom/facebook/imagepipeline/animated/a/c;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RJ: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;->RN:Lcom/facebook/imagepipeline/animated/a/c;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RJ:Lcom/facebook/imagepipeline/animated/a/c;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/animated/a/c;->fH()Z
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/animated/a/c;->fF()Z
 
     move-result v0
 
@@ -329,7 +329,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RO:Landroid/graphics/Rect;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RK: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;->RN:Lcom/facebook/imagepipeline/animated/a/c;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RJ: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;->RO:Landroid/graphics/Rect;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RK: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;->RN:Lcom/facebook/imagepipeline/animated/a/c;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RJ: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;->fB()I
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/animated/a/d;->fz()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;->fC()I
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/animated/a/d;->fA()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;->RO:Landroid/graphics/Rect;
+    iget-object v4, p0, Lcom/facebook/imagepipeline/animated/c/a;->RK:Landroid/graphics/Rect;
 
     invoke-virtual {v4}, Landroid/graphics/Rect;->width()I
 
     move-result v4
 
-    iget-object v5, p0, Lcom/facebook/imagepipeline/animated/c/a;->RO:Landroid/graphics/Rect;
+    iget-object v5, p0, Lcom/facebook/imagepipeline/animated/c/a;->RK: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;->RU:Landroid/graphics/Bitmap;
+    iget-object v6, p0, Lcom/facebook/imagepipeline/animated/c/a;->RQ: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;->RS:Landroid/graphics/Rect;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RO: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;->RT:Landroid/graphics/Rect;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RP: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;->RU:Landroid/graphics/Bitmap;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RQ:Landroid/graphics/Bitmap;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/animated/c/a;->RS:Landroid/graphics/Rect;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/animated/c/a;->RO:Landroid/graphics/Rect;
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/animated/c/a;->RT:Landroid/graphics/Rect;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/animated/c/a;->RP: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;->QA:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->Qw:Z
 
     if-eqz v0, :cond_1
 
@@ -579,7 +579,7 @@
 
     float-to-int v3, v3
 
-    invoke-interface {p1}, Lcom/facebook/imagepipeline/animated/a/d;->fB()I
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/animated/a/d;->fz()I
 
     move-result v4
 
@@ -589,7 +589,7 @@
 
     float-to-int v4, v4
 
-    invoke-interface {p1}, Lcom/facebook/imagepipeline/animated/a/d;->fC()I
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/animated/a/d;->fA()I
 
     move-result v5
 
@@ -610,11 +610,11 @@
 
     move-result v3
 
-    invoke-interface {p1}, Lcom/facebook/imagepipeline/animated/a/d;->fB()I
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/animated/a/d;->fz()I
 
     move-result v4
 
-    invoke-interface {p1}, Lcom/facebook/imagepipeline/animated/a/d;->fC()I
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/animated/a/d;->fA()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;->RU:Landroid/graphics/Bitmap;
+    iget-object v5, p0, Lcom/facebook/imagepipeline/animated/c/a;->RQ: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;->RU:Landroid/graphics/Bitmap;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RQ: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;->RN:Lcom/facebook/imagepipeline/animated/a/c;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RJ: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;->RO:Landroid/graphics/Rect;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/animated/c/a;->RK: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;->QD:Lcom/facebook/imagepipeline/animated/d/a;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/animated/c/a;->Qz:Lcom/facebook/imagepipeline/animated/d/a;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/animated/c/a;->RM:Lcom/facebook/imagepipeline/animated/a/e;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/animated/c/a;->RI:Lcom/facebook/imagepipeline/animated/a/e;
 
-    iget-boolean v3, p0, Lcom/facebook/imagepipeline/animated/c/a;->QA:Z
+    iget-boolean v3, p0, Lcom/facebook/imagepipeline/animated/c/a;->Qw:Z
 
     invoke-direct {v0, v1, v2, p1, v3}, Lcom/facebook/imagepipeline/animated/c/a;-><init>(Lcom/facebook/imagepipeline/animated/d/a;Lcom/facebook/imagepipeline/animated/a/e;Landroid/graphics/Rect;Z)V
 
     return-object v0
 .end method
 
-.method public final fE()I
+.method public final fC()I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RN:Lcom/facebook/imagepipeline/animated/a/c;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RJ:Lcom/facebook/imagepipeline/animated/a/c;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/animated/a/c;->fE()I
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/animated/a/c;->fC()I
 
     move-result v0
 
     return v0
 .end method
 
-.method public final fG()I
+.method public final fE()I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RN:Lcom/facebook/imagepipeline/animated/a/c;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RJ:Lcom/facebook/imagepipeline/animated/a/c;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/animated/a/c;->fG()I
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/animated/a/c;->fE()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;->RN:Lcom/facebook/imagepipeline/animated/a/c;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RJ: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;->RN:Lcom/facebook/imagepipeline/animated/a/c;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RJ: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 ii()I
+.method public final ig()I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RO:Landroid/graphics/Rect;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RK:Landroid/graphics/Rect;
 
     invoke-virtual {v0}, Landroid/graphics/Rect;->width()I
 
@@ -769,10 +769,10 @@
     return v0
 .end method
 
-.method public final ij()I
+.method public final ih()I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RO:Landroid/graphics/Rect;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RK: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 e65789bac0..0d329d5093 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 RV:Lcom/facebook/cache/common/CacheKey;
+.field private final RR:Lcom/facebook/cache/common/CacheKey;
 
-.field private final RZ:I
+.field private final RV: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;->RV:Lcom/facebook/cache/common/CacheKey;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/c/c$a;->RR:Lcom/facebook/cache/common/CacheKey;
 
-    iput p2, p0, Lcom/facebook/imagepipeline/animated/c/c$a;->RZ:I
+    iput p2, p0, Lcom/facebook/imagepipeline/animated/c/c$a;->RV: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;->RZ:I
+    iget v1, p0, Lcom/facebook/imagepipeline/animated/c/c$a;->RV:I
 
-    iget v3, p1, Lcom/facebook/imagepipeline/animated/c/c$a;->RZ:I
+    iget v3, p1, Lcom/facebook/imagepipeline/animated/c/c$a;->RV:I
 
     if-ne v1, v3, :cond_1
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/animated/c/c$a;->RV:Lcom/facebook/cache/common/CacheKey;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/animated/c/c$a;->RR:Lcom/facebook/cache/common/CacheKey;
 
-    iget-object p1, p1, Lcom/facebook/imagepipeline/animated/c/c$a;->RV:Lcom/facebook/cache/common/CacheKey;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/animated/c/c$a;->RR: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 fL()Ljava/lang/String;
+.method public final fJ()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;->RV:Lcom/facebook/cache/common/CacheKey;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/c$a;->RR: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;->RZ:I
+    iget v1, p0, Lcom/facebook/imagepipeline/animated/c/c$a;->RV: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;->RV:Lcom/facebook/cache/common/CacheKey;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/animated/c/c$a;->RR: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;->RZ:I
+    iget v1, p0, Lcom/facebook/imagepipeline/animated/c/c$a;->RV: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 71649d74f5..6651c7ee3e 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 Qz:Lcom/facebook/imagepipeline/cache/h;
+.field public final Qv: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 RV:Lcom/facebook/cache/common/CacheKey;
+.field private final RR:Lcom/facebook/cache/common/CacheKey;
 
-.field private final RW:Lcom/facebook/imagepipeline/cache/h$c;
+.field private final RS: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 RX:Ljava/util/LinkedHashSet;
+.field private final RT: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;->RV:Lcom/facebook/cache/common/CacheKey;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/c/c;->RR:Lcom/facebook/cache/common/CacheKey;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/animated/c/c;->Qz:Lcom/facebook/imagepipeline/cache/h;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/animated/c/c;->Qv: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;->RX:Ljava/util/LinkedHashSet;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/c/c;->RT: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;->RW:Lcom/facebook/imagepipeline/cache/h$c;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/c/c;->RS: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;->RV:Lcom/facebook/cache/common/CacheKey;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/animated/c/c;->RR: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;->RX:Ljava/util/LinkedHashSet;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/animated/c/c;->RT: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;->RX:Ljava/util/LinkedHashSet;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/animated/c/c;->RT: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;->Qz:Lcom/facebook/imagepipeline/cache/h;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/c;->Qv: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;->RW:Lcom/facebook/imagepipeline/cache/h$c;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/animated/c/c;->RS: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 im()Lcom/facebook/cache/common/CacheKey;
+.method public final declared-synchronized ik()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;->RX:Ljava/util/LinkedHashSet;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/animated/c/c;->RT: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 2d4cfade4c..cd293c1d6b 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 TT:Lcom/facebook/imagepipeline/d/a;
+.field final synthetic TP:Lcom/facebook/imagepipeline/d/a;
 
-.field final synthetic TU:Lcom/facebook/imagepipeline/b/a;
+.field final synthetic TQ: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;->TU:Lcom/facebook/imagepipeline/b/a;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/b/a$1;->TQ:Lcom/facebook/imagepipeline/b/a;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/b/a$1;->TT:Lcom/facebook/imagepipeline/d/a;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/b/a$1;->TP: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 ffa9272dcb..05dfda305f 100644
--- a/com.discord/smali/com/facebook/imagepipeline/b/h.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/b/h.smali
@@ -4,15 +4,15 @@
 
 
 # static fields
-.field private static final TZ:Ljava/util/concurrent/CancellationException;
+.field private static final TV:Ljava/util/concurrent/CancellationException;
 
 
 # instance fields
-.field private final Ua:Lcom/facebook/imagepipeline/b/n;
+.field private final TW:Lcom/facebook/imagepipeline/b/n;
 
-.field private final Ub:Lcom/facebook/imagepipeline/h/c;
+.field private final TX:Lcom/facebook/imagepipeline/h/c;
 
-.field private final Uc:Lcom/facebook/common/d/l;
+.field private final TY:Lcom/facebook/common/d/l;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/d/l<",
@@ -22,7 +22,7 @@
     .end annotation
 .end field
 
-.field public final Ud:Lcom/facebook/imagepipeline/cache/o;
+.field public final TZ:Lcom/facebook/imagepipeline/cache/o;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/cache/o<",
@@ -33,7 +33,7 @@
     .end annotation
 .end field
 
-.field public final Ue:Lcom/facebook/imagepipeline/cache/o;
+.field public final Ua:Lcom/facebook/imagepipeline/cache/o;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/cache/o<",
@@ -44,15 +44,15 @@
     .end annotation
 .end field
 
-.field private final Uf:Lcom/facebook/imagepipeline/cache/e;
+.field private final Ub:Lcom/facebook/imagepipeline/cache/e;
 
-.field private final Ug:Lcom/facebook/imagepipeline/cache/e;
+.field private final Uc:Lcom/facebook/imagepipeline/cache/e;
 
-.field public final Uh:Lcom/facebook/imagepipeline/cache/f;
+.field public final Ud:Lcom/facebook/imagepipeline/cache/f;
 
-.field private final Ui:Lcom/facebook/imagepipeline/i/as;
+.field private final Ue:Lcom/facebook/imagepipeline/i/as;
 
-.field private final Uj:Lcom/facebook/common/d/l;
+.field private final Uf:Lcom/facebook/common/d/l;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/d/l<",
@@ -62,9 +62,9 @@
     .end annotation
 .end field
 
-.field private Uk:Ljava/util/concurrent/atomic/AtomicLong;
+.field private Ug:Ljava/util/concurrent/atomic/AtomicLong;
 
-.field private final Ul:Lcom/facebook/common/d/l;
+.field private final Uh:Lcom/facebook/common/d/l;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/d/l<",
@@ -74,7 +74,7 @@
     .end annotation
 .end field
 
-.field private final Um:Lcom/facebook/b/a;
+.field private final Ui: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;->TZ:Ljava/util/concurrent/CancellationException;
+    sput-object v0, Lcom/facebook/imagepipeline/b/h;->TV: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;->Uk:Ljava/util/concurrent/atomic/AtomicLong;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/h;->Ug:Ljava/util/concurrent/atomic/AtomicLong;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/b/h;->Ua:Lcom/facebook/imagepipeline/b/n;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/b/h;->TW: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;->Ub:Lcom/facebook/imagepipeline/h/c;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/b/h;->TX:Lcom/facebook/imagepipeline/h/c;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/b/h;->Uc:Lcom/facebook/common/d/l;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/b/h;->TY:Lcom/facebook/common/d/l;
 
-    iput-object p4, p0, Lcom/facebook/imagepipeline/b/h;->Ud:Lcom/facebook/imagepipeline/cache/o;
+    iput-object p4, p0, Lcom/facebook/imagepipeline/b/h;->TZ:Lcom/facebook/imagepipeline/cache/o;
 
-    iput-object p5, p0, Lcom/facebook/imagepipeline/b/h;->Ue:Lcom/facebook/imagepipeline/cache/o;
+    iput-object p5, p0, Lcom/facebook/imagepipeline/b/h;->Ua:Lcom/facebook/imagepipeline/cache/o;
 
-    iput-object p6, p0, Lcom/facebook/imagepipeline/b/h;->Uf:Lcom/facebook/imagepipeline/cache/e;
+    iput-object p6, p0, Lcom/facebook/imagepipeline/b/h;->Ub:Lcom/facebook/imagepipeline/cache/e;
 
-    iput-object p7, p0, Lcom/facebook/imagepipeline/b/h;->Ug:Lcom/facebook/imagepipeline/cache/e;
+    iput-object p7, p0, Lcom/facebook/imagepipeline/b/h;->Uc:Lcom/facebook/imagepipeline/cache/e;
 
-    iput-object p8, p0, Lcom/facebook/imagepipeline/b/h;->Uh:Lcom/facebook/imagepipeline/cache/f;
+    iput-object p8, p0, Lcom/facebook/imagepipeline/b/h;->Ud:Lcom/facebook/imagepipeline/cache/f;
 
-    iput-object p9, p0, Lcom/facebook/imagepipeline/b/h;->Ui:Lcom/facebook/imagepipeline/i/as;
+    iput-object p9, p0, Lcom/facebook/imagepipeline/b/h;->Ue:Lcom/facebook/imagepipeline/i/as;
 
-    iput-object p10, p0, Lcom/facebook/imagepipeline/b/h;->Uj:Lcom/facebook/common/d/l;
+    iput-object p10, p0, Lcom/facebook/imagepipeline/b/h;->Uf:Lcom/facebook/common/d/l;
 
-    iput-object p11, p0, Lcom/facebook/imagepipeline/b/h;->Ul:Lcom/facebook/common/d/l;
+    iput-object p11, p0, Lcom/facebook/imagepipeline/b/h;->Uh:Lcom/facebook/common/d/l;
 
-    iput-object p12, p0, Lcom/facebook/imagepipeline/b/h;->Um:Lcom/facebook/b/a;
+    iput-object p12, p0, Lcom/facebook/imagepipeline/b/h;->Ui:Lcom/facebook/b/a;
 
     return-void
 .end method
@@ -202,7 +202,7 @@
 
     move-object v0, p2
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     const/4 v2, 0x2
 
@@ -212,11 +212,11 @@
 
     if-nez p5, :cond_1
 
-    iget-object v5, v0, Lcom/facebook/imagepipeline/request/b;->Ub:Lcom/facebook/imagepipeline/h/c;
+    iget-object v5, v0, Lcom/facebook/imagepipeline/request/b;->TX:Lcom/facebook/imagepipeline/h/c;
 
     if-nez v5, :cond_0
 
-    iget-object v2, v1, Lcom/facebook/imagepipeline/b/h;->Ub:Lcom/facebook/imagepipeline/h/c;
+    iget-object v2, v1, Lcom/facebook/imagepipeline/b/h;->TX: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;->Ub:Lcom/facebook/imagepipeline/h/c;
+    iget-object v6, v1, Lcom/facebook/imagepipeline/b/h;->TX:Lcom/facebook/imagepipeline/h/c;
 
     aput-object v6, v2, v4
 
-    iget-object v6, v0, Lcom/facebook/imagepipeline/request/b;->Ub:Lcom/facebook/imagepipeline/h/c;
+    iget-object v6, v0, Lcom/facebook/imagepipeline/request/b;->TX: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;->Ub:Lcom/facebook/imagepipeline/h/c;
+    iget-object v5, v0, Lcom/facebook/imagepipeline/request/b;->TX: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;->Ub:Lcom/facebook/imagepipeline/h/c;
+    iget-object v6, v1, Lcom/facebook/imagepipeline/b/h;->TX: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;->Ub:Lcom/facebook/imagepipeline/h/c;
+    iget-object v7, v1, Lcom/facebook/imagepipeline/b/h;->TX:Lcom/facebook/imagepipeline/h/c;
 
     aput-object v7, v6, v4
 
     aput-object p5, v6, v3
 
-    iget-object v7, v0, Lcom/facebook/imagepipeline/request/b;->Ub:Lcom/facebook/imagepipeline/h/c;
+    iget-object v7, v0, Lcom/facebook/imagepipeline/request/b;->TX: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;->XR:Lcom/facebook/imagepipeline/request/b$b;
+    iget-object v2, v0, Lcom/facebook/imagepipeline/request/b;->XN: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;->Uk:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v2, v1, Lcom/facebook/imagepipeline/b/h;->Ug: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;->UO:Z
+    iget-boolean v2, v0, Lcom/facebook/imagepipeline/request/b;->UK:Z
 
     if-nez v2, :cond_4
 
-    iget-object v2, v0, Lcom/facebook/imagepipeline/request/b;->aaf:Landroid/net/Uri;
+    iget-object v2, v0, Lcom/facebook/imagepipeline/request/b;->aab: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;->aaj:Lcom/facebook/imagepipeline/a/d;
+    iget-object v10, v0, Lcom/facebook/imagepipeline/request/b;->aaf: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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     return-object v0
 
     :goto_4
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     throw v0
 .end method
@@ -408,15 +408,15 @@
     .end annotation
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/h;->Ua:Lcom/facebook/imagepipeline/b/n;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/h;->TW:Lcom/facebook/imagepipeline/b/n;
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()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;->Zz:Lcom/facebook/imagepipeline/request/c;
+    iget-object v2, p1, Lcom/facebook/imagepipeline/request/b;->Zv: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;->UV:Z
+    iget-boolean v2, v0, Lcom/facebook/imagepipeline/b/n;->UR:Z
 
     if-eqz v2, :cond_1
 
@@ -434,7 +434,7 @@
     move-result-object v1
 
     :cond_1
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()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 75bb40eba8..e4e4944409 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 Kj:Ljava/util/Set;
+.field Kf:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -25,38 +25,15 @@
     .end annotation
 .end field
 
-.field PN:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+.field PJ:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
 
-.field PT:Landroid/graphics/Bitmap$Config;
+.field PP:Landroid/graphics/Bitmap$Config;
 
-.field Qy:Lcom/facebook/imagepipeline/b/f;
+.field Qu:Lcom/facebook/imagepipeline/b/f;
 
-.field SF:Lcom/facebook/imagepipeline/cache/m;
+.field SB:Lcom/facebook/imagepipeline/cache/m;
 
-.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;
+.field TY:Lcom/facebook/common/d/l;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/d/l<",
@@ -66,50 +43,73 @@
     .end annotation
 .end field
 
-.field Uh:Lcom/facebook/imagepipeline/cache/f;
+.field public UA:Lcom/facebook/cache/disk/DiskCacheConfig;
 
-.field Um:Lcom/facebook/b/a;
+.field UB:Lcom/facebook/imagepipeline/e/d;
 
-.field public Uo:Lcom/facebook/common/d/l;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/facebook/common/d/l<",
-            "Lcom/facebook/imagepipeline/cache/MemoryCacheParams;",
-            ">;"
-        }
-    .end annotation
-.end field
+.field UD:Z
 
-.field Up:Lcom/facebook/imagepipeline/cache/h$a;
+.field UE:Lcom/facebook/imagepipeline/d/a;
 
-.field public Uq:Z
-
-.field Ur:Lcom/facebook/imagepipeline/b/g;
-
-.field Us:Lcom/facebook/common/d/l;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/facebook/common/d/l<",
-            "Lcom/facebook/imagepipeline/cache/MemoryCacheParams;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field Ut:Lcom/facebook/imagepipeline/e/c;
-
-.field Uu:Lcom/facebook/imagepipeline/k/d;
-
-.field Uv:Ljava/lang/Integer;
+.field UH:Ljava/lang/Integer;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public Uw:Lcom/facebook/cache/disk/DiskCacheConfig;
+.field UI:I
 
-.field Ux:Lcom/facebook/common/g/b;
+.field public final UJ:Lcom/facebook/imagepipeline/b/j$a;
 
-.field Uz:Lcom/facebook/imagepipeline/i/af;
+.field Ud:Lcom/facebook/imagepipeline/cache/f;
+
+.field Ui:Lcom/facebook/b/a;
+
+.field public Uk:Lcom/facebook/common/d/l;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/facebook/common/d/l<",
+            "Lcom/facebook/imagepipeline/cache/MemoryCacheParams;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field Ul:Lcom/facebook/imagepipeline/cache/h$a;
+
+.field public Um:Z
+
+.field Un:Lcom/facebook/imagepipeline/b/g;
+
+.field Uo:Lcom/facebook/common/d/l;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/facebook/common/d/l<",
+            "Lcom/facebook/imagepipeline/cache/MemoryCacheParams;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field Up:Lcom/facebook/imagepipeline/e/c;
+
+.field Uq:Lcom/facebook/imagepipeline/k/d;
+
+.field Ur:Ljava/lang/Integer;
+    .annotation runtime Ljavax/annotation/Nullable;
+    .end annotation
+.end field
+
+.field public Us:Lcom/facebook/cache/disk/DiskCacheConfig;
+
+.field Ut:Lcom/facebook/common/g/b;
+
+.field Uv:Lcom/facebook/imagepipeline/i/af;
+
+.field Ux:Lcom/facebook/imagepipeline/memory/ad;
+
+.field Uy:Lcom/facebook/imagepipeline/e/e;
+
+.field Uz:Z
 
 .field final mContext:Landroid/content/Context;
 
@@ -122,35 +122,35 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/i$a;->Uq:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/i$a;->Um:Z
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i$a;->Uv:Ljava/lang/Integer;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i$a;->Ur:Ljava/lang/Integer;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i$a;->UL:Ljava/lang/Integer;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i$a;->UH:Ljava/lang/Integer;
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/i$a;->UD:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/i$a;->Uz:Z
 
     const/4 v1, -0x1
 
-    iput v1, p0, Lcom/facebook/imagepipeline/b/i$a;->UM:I
+    iput v1, p0, Lcom/facebook/imagepipeline/b/i$a;->UI: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;->UN:Lcom/facebook/imagepipeline/b/j$a;
+    iput-object v1, p0, Lcom/facebook/imagepipeline/b/i$a;->UJ:Lcom/facebook/imagepipeline/b/j$a;
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/i$a;->UH:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/i$a;->UD: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;->UI:Lcom/facebook/imagepipeline/d/a;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i$a;->UE: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 iL()Lcom/facebook/imagepipeline/b/i;
+.method public final iJ()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 92ba9a93b0..696ef0a058 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 UJ:Lcom/facebook/imagepipeline/b/i$b;
+.field private static UF:Lcom/facebook/imagepipeline/b/i$b;
 
 
 # instance fields
-.field final Kj:Ljava/util/Set;
+.field final Kf:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -27,39 +27,18 @@
     .end annotation
 .end field
 
-.field private final PN:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+.field private final PJ:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field final PT:Landroid/graphics/Bitmap$Config;
+.field final PP:Landroid/graphics/Bitmap$Config;
 
-.field final Qy:Lcom/facebook/imagepipeline/b/f;
+.field final Qu:Lcom/facebook/imagepipeline/b/f;
 
-.field final SF:Lcom/facebook/imagepipeline/cache/m;
+.field final SB:Lcom/facebook/imagepipeline/cache/m;
 
-.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;
+.field final TY:Lcom/facebook/common/d/l;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/d/l<",
@@ -69,13 +48,42 @@
     .end annotation
 .end field
 
-.field final Uh:Lcom/facebook/imagepipeline/cache/f;
+.field final UA:Lcom/facebook/cache/disk/DiskCacheConfig;
 
-.field final Um:Lcom/facebook/b/a;
+.field final UB:Lcom/facebook/imagepipeline/e/d;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
+.field final UC:Lcom/facebook/imagepipeline/b/j;
+
+.field final UD:Z
+
+.field final UE:Lcom/facebook/imagepipeline/d/a;
+
+.field final Ud:Lcom/facebook/imagepipeline/cache/f;
+
+.field final Ui:Lcom/facebook/b/a;
+    .annotation runtime Ljavax/annotation/Nullable;
+    .end annotation
+.end field
+
+.field final Uk:Lcom/facebook/common/d/l;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/facebook/common/d/l<",
+            "Lcom/facebook/imagepipeline/cache/MemoryCacheParams;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field final Ul:Lcom/facebook/imagepipeline/cache/h$a;
+
+.field final Um:Z
+
+.field final Un:Lcom/facebook/imagepipeline/b/g;
+
 .field final Uo:Lcom/facebook/common/d/l;
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -86,44 +94,36 @@
     .end annotation
 .end field
 
-.field final Up:Lcom/facebook/imagepipeline/cache/h$a;
-
-.field final Uq:Z
-
-.field final Ur:Lcom/facebook/imagepipeline/b/g;
-
-.field final Us:Lcom/facebook/common/d/l;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/facebook/common/d/l<",
-            "Lcom/facebook/imagepipeline/cache/MemoryCacheParams;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field final Ut:Lcom/facebook/imagepipeline/e/c;
+.field final Up:Lcom/facebook/imagepipeline/e/c;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field final Uu:Lcom/facebook/imagepipeline/k/d;
+.field final Uq:Lcom/facebook/imagepipeline/k/d;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field final Uv:Ljava/lang/Integer;
+.field final Ur:Ljava/lang/Integer;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field final Uw:Lcom/facebook/cache/disk/DiskCacheConfig;
+.field final Us:Lcom/facebook/cache/disk/DiskCacheConfig;
 
-.field final Ux:Lcom/facebook/common/g/b;
+.field final Ut:Lcom/facebook/common/g/b;
 
-.field final Uy:I
+.field final Uu:I
 
-.field final Uz:Lcom/facebook/imagepipeline/i/af;
+.field final Uv:Lcom/facebook/imagepipeline/i/af;
+
+.field private final Uw:I
+
+.field final Ux:Lcom/facebook/imagepipeline/memory/ad;
+
+.field final Uy:Lcom/facebook/imagepipeline/e/e;
+
+.field final Uz:Z
 
 .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;->UJ:Lcom/facebook/imagepipeline/b/i$b;
+    sput-object v0, Lcom/facebook/imagepipeline/b/i;->UF: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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->UN:Lcom/facebook/imagepipeline/b/j$a;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->UJ: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;->UG:Lcom/facebook/imagepipeline/b/j;
+    iput-object v1, p0, Lcom/facebook/imagepipeline/b/i;->UC:Lcom/facebook/imagepipeline/b/j;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Uo:Lcom/facebook/common/d/l;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Uk: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;->Uo:Lcom/facebook/common/d/l;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Uk:Lcom/facebook/common/d/l;
 
     :goto_0
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->Uo:Lcom/facebook/common/d/l;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->Uk:Lcom/facebook/common/d/l;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Up:Lcom/facebook/imagepipeline/cache/h$a;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Ul: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;->Up:Lcom/facebook/imagepipeline/cache/h$a;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Ul:Lcom/facebook/imagepipeline/cache/h$a;
 
     :goto_1
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->Up:Lcom/facebook/imagepipeline/cache/h$a;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->Ul:Lcom/facebook/imagepipeline/cache/h$a;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->PT:Landroid/graphics/Bitmap$Config;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->PP: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;->PT:Landroid/graphics/Bitmap$Config;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->PP:Landroid/graphics/Bitmap$Config;
 
     :goto_2
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->PT:Landroid/graphics/Bitmap$Config;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->PP:Landroid/graphics/Bitmap$Config;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Uh:Lcom/facebook/imagepipeline/cache/f;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Ud:Lcom/facebook/imagepipeline/cache/f;
 
     if-nez v0, :cond_3
 
-    invoke-static {}, Lcom/facebook/imagepipeline/cache/i;->iv()Lcom/facebook/imagepipeline/cache/i;
+    invoke-static {}, Lcom/facebook/imagepipeline/cache/i;->it()Lcom/facebook/imagepipeline/cache/i;
 
     move-result-object v0
 
     goto :goto_3
 
     :cond_3
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Uh:Lcom/facebook/imagepipeline/cache/f;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Ud:Lcom/facebook/imagepipeline/cache/f;
 
     :goto_3
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->Uh:Lcom/facebook/imagepipeline/cache/f;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->Ud: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;->Ur:Lcom/facebook/imagepipeline/b/g;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Un: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;->Ur:Lcom/facebook/imagepipeline/b/g;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Un:Lcom/facebook/imagepipeline/b/g;
 
     :goto_4
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->Ur:Lcom/facebook/imagepipeline/b/g;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->Un:Lcom/facebook/imagepipeline/b/g;
 
-    iget-boolean v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Uq:Z
+    iget-boolean v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Um:Z
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/i;->Uq:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/i;->Um:Z
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Us: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_5
 
@@ -277,36 +277,36 @@
     goto :goto_5
 
     :cond_5
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Us:Lcom/facebook/common/d/l;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Uo:Lcom/facebook/common/d/l;
 
     :goto_5
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->Us: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;->SF:Lcom/facebook/imagepipeline/cache/m;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->SB:Lcom/facebook/imagepipeline/cache/m;
 
     if-nez v0, :cond_6
 
-    invoke-static {}, Lcom/facebook/imagepipeline/cache/r;->iw()Lcom/facebook/imagepipeline/cache/r;
+    invoke-static {}, Lcom/facebook/imagepipeline/cache/r;->iu()Lcom/facebook/imagepipeline/cache/r;
 
     move-result-object v0
 
     goto :goto_6
 
     :cond_6
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->SF:Lcom/facebook/imagepipeline/cache/m;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->SB:Lcom/facebook/imagepipeline/cache/m;
 
     :goto_6
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->SF:Lcom/facebook/imagepipeline/cache/m;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->SB:Lcom/facebook/imagepipeline/cache/m;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Ut:Lcom/facebook/imagepipeline/e/c;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Up:Lcom/facebook/imagepipeline/e/c;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->Ut:Lcom/facebook/imagepipeline/e/c;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->Up:Lcom/facebook/imagepipeline/e/c;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Uu:Lcom/facebook/imagepipeline/k/d;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Uq:Lcom/facebook/imagepipeline/k/d;
 
     if-eqz v0, :cond_8
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Uv:Ljava/lang/Integer;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Ur: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;->Uu:Lcom/facebook/imagepipeline/k/d;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Uq:Lcom/facebook/imagepipeline/k/d;
 
     if-eqz v0, :cond_9
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Uu:Lcom/facebook/imagepipeline/k/d;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Uq: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;->Uu:Lcom/facebook/imagepipeline/k/d;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->Uq:Lcom/facebook/imagepipeline/k/d;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Uv:Ljava/lang/Integer;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Ur:Ljava/lang/Integer;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->Uv:Ljava/lang/Integer;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->Ur:Ljava/lang/Integer;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Uc:Lcom/facebook/common/d/l;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->TY: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;->Uc:Lcom/facebook/common/d/l;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->TY:Lcom/facebook/common/d/l;
 
     :goto_9
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->Uc:Lcom/facebook/common/d/l;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->TY:Lcom/facebook/common/d/l;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Uw:Lcom/facebook/cache/disk/DiskCacheConfig;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Us: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;->Uw:Lcom/facebook/cache/disk/DiskCacheConfig;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Us:Lcom/facebook/cache/disk/DiskCacheConfig;
 
     :goto_a
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->Uw:Lcom/facebook/cache/disk/DiskCacheConfig;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->Us:Lcom/facebook/cache/disk/DiskCacheConfig;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Ux:Lcom/facebook/common/g/b;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Ut:Lcom/facebook/common/g/b;
 
     if-nez v0, :cond_c
 
-    invoke-static {}, Lcom/facebook/common/g/c;->gl()Lcom/facebook/common/g/c;
+    invoke-static {}, Lcom/facebook/common/g/c;->gj()Lcom/facebook/common/g/c;
 
     move-result-object v0
 
     goto :goto_b
 
     :cond_c
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Ux:Lcom/facebook/common/g/b;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Ut:Lcom/facebook/common/g/b;
 
     :goto_b
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->Ux:Lcom/facebook/common/g/b;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->Ut:Lcom/facebook/common/g/b;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/i;->UG:Lcom/facebook/imagepipeline/b/j;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/i;->UC:Lcom/facebook/imagepipeline/b/j;
 
-    iget-object v1, p1, Lcom/facebook/imagepipeline/b/i$a;->UL:Ljava/lang/Integer;
+    iget-object v1, p1, Lcom/facebook/imagepipeline/b/i$a;->UH:Ljava/lang/Integer;
 
     if-eqz v1, :cond_d
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->UL:Ljava/lang/Integer;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->UH: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;->Va:Z
+    iget-boolean v0, v0, Lcom/facebook/imagepipeline/b/j;->UW:Z
 
     if-eqz v0, :cond_e
 
@@ -418,9 +418,9 @@
     const/4 v0, 0x0
 
     :goto_c
-    iput v0, p0, Lcom/facebook/imagepipeline/b/i;->Uy:I
+    iput v0, p0, Lcom/facebook/imagepipeline/b/i;->Uu:I
 
-    iget v0, p1, Lcom/facebook/imagepipeline/b/i$a;->UM:I
+    iget v0, p1, Lcom/facebook/imagepipeline/b/i$a;->UI:I
 
     if-gez v0, :cond_f
 
@@ -429,38 +429,38 @@
     goto :goto_d
 
     :cond_f
-    iget v0, p1, Lcom/facebook/imagepipeline/b/i$a;->UM:I
+    iget v0, p1, Lcom/facebook/imagepipeline/b/i$a;->UI:I
 
     :goto_d
-    iput v0, p0, Lcom/facebook/imagepipeline/b/i;->UA:I
+    iput v0, p0, Lcom/facebook/imagepipeline/b/i;->Uw:I
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Uz:Lcom/facebook/imagepipeline/i/af;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Uv: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;->UA:I
+    iget v1, p0, Lcom/facebook/imagepipeline/b/i;->Uw: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;->Uz:Lcom/facebook/imagepipeline/i/af;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Uv:Lcom/facebook/imagepipeline/i/af;
 
     :goto_e
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->Uz:Lcom/facebook/imagepipeline/i/af;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->Uv:Lcom/facebook/imagepipeline/i/af;
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->PN:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->PJ:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->PN:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->PJ:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->UB:Lcom/facebook/imagepipeline/memory/ad;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Ux: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;->UB:Lcom/facebook/imagepipeline/memory/ad;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Ux:Lcom/facebook/imagepipeline/memory/ad;
 
     :goto_f
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->UB:Lcom/facebook/imagepipeline/memory/ad;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->Ux:Lcom/facebook/imagepipeline/memory/ad;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->UC:Lcom/facebook/imagepipeline/e/e;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Uy: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;->UC:Lcom/facebook/imagepipeline/e/e;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Uy:Lcom/facebook/imagepipeline/e/e;
 
     :goto_10
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->UC:Lcom/facebook/imagepipeline/e/e;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->Uy:Lcom/facebook/imagepipeline/e/e;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Kj:Ljava/util/Set;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Kf: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;->Kj:Ljava/util/Set;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Kf:Ljava/util/Set;
 
     :goto_11
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->Kj:Ljava/util/Set;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->Kf:Ljava/util/Set;
 
-    iget-boolean v0, p1, Lcom/facebook/imagepipeline/b/i$a;->UD:Z
+    iget-boolean v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Uz:Z
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/i;->UD:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/i;->Uz:Z
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->UE:Lcom/facebook/cache/disk/DiskCacheConfig;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->UA:Lcom/facebook/cache/disk/DiskCacheConfig;
 
     if-nez v0, :cond_14
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/i;->Uw:Lcom/facebook/cache/disk/DiskCacheConfig;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/i;->Us:Lcom/facebook/cache/disk/DiskCacheConfig;
 
     goto :goto_12
 
     :cond_14
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->UE:Lcom/facebook/cache/disk/DiskCacheConfig;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->UA:Lcom/facebook/cache/disk/DiskCacheConfig;
 
     :goto_12
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->UE:Lcom/facebook/cache/disk/DiskCacheConfig;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->UA:Lcom/facebook/cache/disk/DiskCacheConfig;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->UF:Lcom/facebook/imagepipeline/e/d;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->UB:Lcom/facebook/imagepipeline/e/d;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->UF:Lcom/facebook/imagepipeline/e/d;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->UB:Lcom/facebook/imagepipeline/e/d;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/i;->UB:Lcom/facebook/imagepipeline/memory/ad;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/i;->Ux:Lcom/facebook/imagepipeline/memory/ad;
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/memory/ad;->jT()I
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/memory/ad;->jR()I
 
     move-result v0
 
-    iget-object v1, p1, Lcom/facebook/imagepipeline/b/i$a;->Qy:Lcom/facebook/imagepipeline/b/f;
+    iget-object v1, p1, Lcom/facebook/imagepipeline/b/i$a;->Qu: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;->Qy:Lcom/facebook/imagepipeline/b/f;
+    iget-object v1, p1, Lcom/facebook/imagepipeline/b/i$a;->Qu:Lcom/facebook/imagepipeline/b/f;
 
     :goto_13
-    iput-object v1, p0, Lcom/facebook/imagepipeline/b/i;->Qy:Lcom/facebook/imagepipeline/b/f;
+    iput-object v1, p0, Lcom/facebook/imagepipeline/b/i;->Qu:Lcom/facebook/imagepipeline/b/f;
 
-    iget-boolean v0, p1, Lcom/facebook/imagepipeline/b/i$a;->UH:Z
+    iget-boolean v0, p1, Lcom/facebook/imagepipeline/b/i$a;->UD:Z
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/i;->UH:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/i;->UD:Z
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Um:Lcom/facebook/b/a;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Ui:Lcom/facebook/b/a;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->Um:Lcom/facebook/b/a;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->Ui:Lcom/facebook/b/a;
 
-    iget-object p1, p1, Lcom/facebook/imagepipeline/b/i$a;->UI:Lcom/facebook/imagepipeline/d/a;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/b/i$a;->UE:Lcom/facebook/imagepipeline/d/a;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/b/i;->UI:Lcom/facebook/imagepipeline/d/a;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/b/i;->UE:Lcom/facebook/imagepipeline/d/a;
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/b/i;->UG:Lcom/facebook/imagepipeline/b/j;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/b/i;->UC:Lcom/facebook/imagepipeline/b/j;
 
-    iget-object p1, p1, Lcom/facebook/imagepipeline/b/j;->UT:Lcom/facebook/common/k/b;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/b/j;->UO: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;->UB:Lcom/facebook/imagepipeline/memory/ad;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/i;->Ux: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;->UG:Lcom/facebook/imagepipeline/b/j;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/i;->UC: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;->UG:Lcom/facebook/imagepipeline/b/j;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/b/i;->UC:Lcom/facebook/imagepipeline/b/j;
 
-    iget-boolean p1, p1, Lcom/facebook/imagepipeline/b/j;->UQ:Z
+    iget-boolean p1, p1, Lcom/facebook/imagepipeline/b/j;->UL:Z
 
     if-eqz p1, :cond_17
 
-    sget-boolean p1, Lcom/facebook/common/k/c;->Jj:Z
+    sget-boolean p1, Lcom/facebook/common/k/c;->Jf:Z
 
     if-eqz p1, :cond_17
 
-    invoke-static {}, Lcom/facebook/common/k/c;->gC()Lcom/facebook/common/k/b;
+    invoke-static {}, Lcom/facebook/common/k/c;->gA()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;->UB:Lcom/facebook/imagepipeline/memory/ad;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/i;->Ux: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;->UG:Lcom/facebook/imagepipeline/b/j;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/i;->UC: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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()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;->Jm:Lcom/facebook/common/k/b;
+    sput-object p0, Lcom/facebook/common/k/c;->Ji:Lcom/facebook/common/k/b;
 
-    iget-object p1, p1, Lcom/facebook/imagepipeline/b/j;->UR:Lcom/facebook/common/k/b$a;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/b/j;->UM:Lcom/facebook/common/k/b$a;
 
     if-eqz p1, :cond_0
 
@@ -649,10 +649,10 @@
     return-void
 .end method
 
-.method public static iK()Lcom/facebook/imagepipeline/b/i$b;
+.method public static iI()Lcom/facebook/imagepipeline/b/i$b;
     .locals 1
 
-    sget-object v0, Lcom/facebook/imagepipeline/b/i;->UJ:Lcom/facebook/imagepipeline/b/i$b;
+    sget-object v0, Lcom/facebook/imagepipeline/b/i;->UF: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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()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;->fU()Lcom/facebook/cache/disk/DiskCacheConfig;
+    invoke-virtual {p0}, Lcom/facebook/cache/disk/DiskCacheConfig$a;->fS()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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     return-object p0
 
     :catchall_0
     move-exception p0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()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 13bafb9421..13cccaa819 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 GI:Ljava/lang/Class;
+.field private static final GE:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -13,31 +13,31 @@
     .end annotation
 .end field
 
-.field private static Vf:Lcom/facebook/imagepipeline/b/k;
+.field private static Vb:Lcom/facebook/imagepipeline/b/k;
 
 
 # instance fields
-.field private Km:Lcom/facebook/imagepipeline/b/h;
+.field private Ki:Lcom/facebook/imagepipeline/b/h;
 
-.field private PN:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+.field private PJ:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
 
-.field private final Si:Lcom/facebook/imagepipeline/b/a;
+.field private final Se:Lcom/facebook/imagepipeline/b/a;
 
-.field private Ua:Lcom/facebook/imagepipeline/b/n;
+.field private TW:Lcom/facebook/imagepipeline/b/n;
 
-.field private Uf:Lcom/facebook/imagepipeline/cache/e;
+.field private Ub:Lcom/facebook/imagepipeline/cache/e;
 
-.field private Ug:Lcom/facebook/imagepipeline/cache/e;
+.field private Uc:Lcom/facebook/imagepipeline/cache/e;
 
-.field private final Ui:Lcom/facebook/imagepipeline/i/as;
+.field private final Ue:Lcom/facebook/imagepipeline/i/as;
 
-.field private Ut:Lcom/facebook/imagepipeline/e/c;
+.field private Up:Lcom/facebook/imagepipeline/e/c;
 
-.field private Uu:Lcom/facebook/imagepipeline/k/d;
+.field private Uq:Lcom/facebook/imagepipeline/k/d;
 
-.field private final Vg:Lcom/facebook/imagepipeline/b/i;
+.field private final Vc:Lcom/facebook/imagepipeline/b/i;
 
-.field private Vh:Lcom/facebook/imagepipeline/cache/h;
+.field private Vd:Lcom/facebook/imagepipeline/cache/h;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/cache/h<",
@@ -48,7 +48,7 @@
     .end annotation
 .end field
 
-.field private Vi:Lcom/facebook/imagepipeline/cache/n;
+.field private Ve:Lcom/facebook/imagepipeline/cache/n;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/cache/n<",
@@ -59,7 +59,7 @@
     .end annotation
 .end field
 
-.field private Vj:Lcom/facebook/imagepipeline/cache/h;
+.field private Vf: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 Vk:Lcom/facebook/imagepipeline/cache/n;
+.field private Vg: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 Vl:Lcom/facebook/cache/disk/h;
+.field private Vh:Lcom/facebook/cache/disk/h;
 
-.field private Vm:Lcom/facebook/imagepipeline/b/m;
+.field private Vi:Lcom/facebook/imagepipeline/b/m;
 
-.field private Vn:Lcom/facebook/cache/disk/h;
+.field private Vj:Lcom/facebook/cache/disk/h;
 
-.field private Vo:Lcom/facebook/imagepipeline/platform/f;
+.field private Vk:Lcom/facebook/imagepipeline/platform/f;
 
-.field private Vp:Lcom/facebook/imagepipeline/animated/b/a;
+.field private Vl: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;->GI:Ljava/lang/Class;
+    sput-object v0, Lcom/facebook/imagepipeline/b/k;->GE: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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()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;->Vg:Lcom/facebook/imagepipeline/b/i;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Vc:Lcom/facebook/imagepipeline/b/i;
 
     new-instance v0, Lcom/facebook/imagepipeline/i/as;
 
-    iget-object v1, p1, Lcom/facebook/imagepipeline/b/i;->Qy:Lcom/facebook/imagepipeline/b/f;
+    iget-object v1, p1, Lcom/facebook/imagepipeline/b/i;->Qu:Lcom/facebook/imagepipeline/b/f;
 
-    invoke-interface {v1}, Lcom/facebook/imagepipeline/b/f;->iJ()Ljava/util/concurrent/Executor;
+    invoke-interface {v1}, Lcom/facebook/imagepipeline/b/f;->iH()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;->Ui:Lcom/facebook/imagepipeline/i/as;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Ue:Lcom/facebook/imagepipeline/i/as;
 
     new-instance v0, Lcom/facebook/imagepipeline/b/a;
 
-    iget-object p1, p1, Lcom/facebook/imagepipeline/b/i;->UI:Lcom/facebook/imagepipeline/d/a;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/b/i;->UE: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;->Si:Lcom/facebook/imagepipeline/b/a;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Se:Lcom/facebook/imagepipeline/b/a;
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     return-void
 .end method
@@ -151,11 +151,11 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/facebook/imagepipeline/b/k;->Vf:Lcom/facebook/imagepipeline/b/k;
+    sget-object v1, Lcom/facebook/imagepipeline/b/k;->Vb:Lcom/facebook/imagepipeline/b/k;
 
     if-eqz v1, :cond_0
 
-    sget-object v1, Lcom/facebook/imagepipeline/b/k;->GI:Ljava/lang/Class;
+    sget-object v1, Lcom/facebook/imagepipeline/b/k;->GE: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;->Vf:Lcom/facebook/imagepipeline/b/k;
+    sput-object v1, Lcom/facebook/imagepipeline/b/k;->Vb: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 iM()Lcom/facebook/imagepipeline/b/k;
+.method public static iK()Lcom/facebook/imagepipeline/b/k;
     .locals 2
 
-    sget-object v0, Lcom/facebook/imagepipeline/b/k;->Vf:Lcom/facebook/imagepipeline/b/k;
+    sget-object v0, Lcom/facebook/imagepipeline/b/k;->Vb:Lcom/facebook/imagepipeline/b/k;
 
     const-string v1, "ImagePipelineFactory was not initialized!"
 
@@ -198,7 +198,7 @@
     return-object v0
 .end method
 
-.method private iO()Lcom/facebook/imagepipeline/cache/h;
+.method private iM()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;->Vh:Lcom/facebook/imagepipeline/cache/h;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Vd:Lcom/facebook/imagepipeline/cache/h;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Vc:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/b/i;->Uo:Lcom/facebook/common/d/l;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/b/i;->Uk:Lcom/facebook/common/d/l;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vc:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->Up:Lcom/facebook/imagepipeline/cache/h$a;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->Ul: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;->Vh:Lcom/facebook/imagepipeline/cache/h;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Vd:Lcom/facebook/imagepipeline/cache/h;
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Vh:Lcom/facebook/imagepipeline/cache/h;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Vd:Lcom/facebook/imagepipeline/cache/h;
 
     return-object v0
 .end method
 
-.method private iP()Lcom/facebook/imagepipeline/cache/n;
+.method private iN()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;->Vi:Lcom/facebook/imagepipeline/cache/n;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Ve:Lcom/facebook/imagepipeline/cache/n;
 
     if-nez v0, :cond_0
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/k;->iO()Lcom/facebook/imagepipeline/cache/h;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/k;->iM()Lcom/facebook/imagepipeline/cache/h;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vc:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->SF:Lcom/facebook/imagepipeline/cache/m;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->SB: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;->Vi:Lcom/facebook/imagepipeline/cache/n;
+    iput-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Ve:Lcom/facebook/imagepipeline/cache/n;
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Vi:Lcom/facebook/imagepipeline/cache/n;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Ve:Lcom/facebook/imagepipeline/cache/n;
 
     return-object v0
 .end method
 
-.method private iQ()Lcom/facebook/imagepipeline/cache/n;
+.method private iO()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;->Vk:Lcom/facebook/imagepipeline/cache/n;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/cache/n;
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Vj:Lcom/facebook/imagepipeline/cache/h;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Vf:Lcom/facebook/imagepipeline/cache/h;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Vc:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/b/i;->Us:Lcom/facebook/common/d/l;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/b/i;->Uo: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;->Vj:Lcom/facebook/imagepipeline/cache/h;
+    iput-object v3, p0, Lcom/facebook/imagepipeline/b/k;->Vf:Lcom/facebook/imagepipeline/cache/h;
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Vj:Lcom/facebook/imagepipeline/cache/h;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Vf:Lcom/facebook/imagepipeline/cache/h;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vc:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->SF:Lcom/facebook/imagepipeline/cache/m;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->SB: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;->Vk:Lcom/facebook/imagepipeline/cache/n;
+    iput-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/cache/n;
 
     :cond_1
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Vk:Lcom/facebook/imagepipeline/cache/n;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/cache/n;
 
     return-object v0
 .end method
 
-.method private iR()Lcom/facebook/imagepipeline/cache/e;
+.method private iP()Lcom/facebook/imagepipeline/cache/e;
     .locals 8
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Uf:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Ub: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;->Vl:Lcom/facebook/cache/disk/h;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vh:Lcom/facebook/cache/disk/h;
 
     if-nez v1, :cond_0
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vc:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->Uw:Lcom/facebook/cache/disk/DiskCacheConfig;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->Us:Lcom/facebook/cache/disk/DiskCacheConfig;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/b/k;->Vc:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v2, v2, Lcom/facebook/imagepipeline/b/i;->Ur:Lcom/facebook/imagepipeline/b/g;
+    iget-object v2, v2, Lcom/facebook/imagepipeline/b/i;->Un: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;->Vl:Lcom/facebook/cache/disk/h;
+    iput-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vh:Lcom/facebook/cache/disk/h;
 
     :cond_0
-    iget-object v2, p0, Lcom/facebook/imagepipeline/b/k;->Vl:Lcom/facebook/cache/disk/h;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/b/k;->Vh:Lcom/facebook/cache/disk/h;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vc:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->UB:Lcom/facebook/imagepipeline/memory/ad;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->Ux:Lcom/facebook/imagepipeline/memory/ad;
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/b/k;->Vc:Lcom/facebook/imagepipeline/b/i;
 
-    iget v3, v3, Lcom/facebook/imagepipeline/b/i;->Uy:I
+    iget v3, v3, Lcom/facebook/imagepipeline/b/i;->Uu: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;->Vg:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vc:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->UB:Lcom/facebook/imagepipeline/memory/ad;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->Ux:Lcom/facebook/imagepipeline/memory/ad;
 
-    invoke-virtual {v1}, Lcom/facebook/imagepipeline/memory/ad;->jV()Lcom/facebook/common/g/j;
+    invoke-virtual {v1}, Lcom/facebook/imagepipeline/memory/ad;->jT()Lcom/facebook/common/g/j;
 
     move-result-object v4
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vc:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->Qy:Lcom/facebook/imagepipeline/b/f;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->Qu: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;->iD()Ljava/util/concurrent/Executor;
 
     move-result-object v5
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vc:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->Qy:Lcom/facebook/imagepipeline/b/f;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->Qu: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;->iE()Ljava/util/concurrent/Executor;
 
     move-result-object v6
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vc:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v7, v1, Lcom/facebook/imagepipeline/b/i;->SF:Lcom/facebook/imagepipeline/cache/m;
+    iget-object v7, v1, Lcom/facebook/imagepipeline/b/i;->SB: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;->Uf:Lcom/facebook/imagepipeline/cache/e;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Ub:Lcom/facebook/imagepipeline/cache/e;
 
     :cond_1
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Uf:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Ub:Lcom/facebook/imagepipeline/cache/e;
 
     return-object v0
 .end method
 
-.method private iS()Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+.method private iQ()Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
     .locals 3
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->PN:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->PJ:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Vc:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/b/i;->UB:Lcom/facebook/imagepipeline/memory/ad;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/b/i;->Ux:Lcom/facebook/imagepipeline/memory/ad;
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/k;->iT()Lcom/facebook/imagepipeline/platform/f;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/k;->iR()Lcom/facebook/imagepipeline/platform/f;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/b/k;->Si:Lcom/facebook/imagepipeline/b/a;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/b/k;->Se: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;->PN:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/k;->PJ:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->PN:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->PJ:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
 
     return-object v0
 .end method
 
-.method private iT()Lcom/facebook/imagepipeline/platform/f;
+.method private iR()Lcom/facebook/imagepipeline/platform/f;
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Vo:Lcom/facebook/imagepipeline/platform/f;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Vk:Lcom/facebook/imagepipeline/platform/f;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Vc:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/b/i;->UB:Lcom/facebook/imagepipeline/memory/ad;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/b/i;->Ux:Lcom/facebook/imagepipeline/memory/ad;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vc:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->UG:Lcom/facebook/imagepipeline/b/j;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->UC:Lcom/facebook/imagepipeline/b/j;
 
-    iget-boolean v1, v1, Lcom/facebook/imagepipeline/b/j;->Vd:Z
+    iget-boolean v1, v1, Lcom/facebook/imagepipeline/b/j;->UZ: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;->Vo:Lcom/facebook/imagepipeline/platform/f;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Vk:Lcom/facebook/imagepipeline/platform/f;
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Vo:Lcom/facebook/imagepipeline/platform/f;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Vk:Lcom/facebook/imagepipeline/platform/f;
 
     return-object v0
 .end method
 
-.method private iU()Lcom/facebook/imagepipeline/b/m;
+.method private iS()Lcom/facebook/imagepipeline/b/m;
     .locals 23
 
     move-object/from16 v0, p0
 
-    iget-object v1, v0, Lcom/facebook/imagepipeline/b/k;->Vm:Lcom/facebook/imagepipeline/b/m;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/b/k;->Vi:Lcom/facebook/imagepipeline/b/m;
 
     if-nez v1, :cond_4
 
-    iget-object v1, v0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/b/k;->Vc:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->UG:Lcom/facebook/imagepipeline/b/j;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->UC:Lcom/facebook/imagepipeline/b/j;
 
-    iget-object v2, v1, Lcom/facebook/imagepipeline/b/j;->Vc:Lcom/facebook/imagepipeline/b/j$c;
+    iget-object v2, v1, Lcom/facebook/imagepipeline/b/j;->UY:Lcom/facebook/imagepipeline/b/j$c;
 
-    iget-object v1, v0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/b/k;->Vc: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;->Vg:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/b/k;->Vc:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->UB:Lcom/facebook/imagepipeline/memory/ad;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->Ux:Lcom/facebook/imagepipeline/memory/ad;
 
-    invoke-virtual {v1}, Lcom/facebook/imagepipeline/memory/ad;->jW()Lcom/facebook/common/g/a;
+    invoke-virtual {v1}, Lcom/facebook/imagepipeline/memory/ad;->jU()Lcom/facebook/common/g/a;
 
     move-result-object v4
 
-    iget-object v1, v0, Lcom/facebook/imagepipeline/b/k;->Ut:Lcom/facebook/imagepipeline/e/c;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/b/k;->Up:Lcom/facebook/imagepipeline/e/c;
 
     if-nez v1, :cond_3
 
-    iget-object v1, v0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/b/k;->Vc:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->Ut:Lcom/facebook/imagepipeline/e/c;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->Up:Lcom/facebook/imagepipeline/e/c;
 
     if-eqz v1, :cond_0
 
-    iget-object v1, v0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/b/k;->Vc:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->Ut:Lcom/facebook/imagepipeline/e/c;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->Up:Lcom/facebook/imagepipeline/e/c;
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/b/k;->Ut:Lcom/facebook/imagepipeline/e/c;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/b/k;->Up:Lcom/facebook/imagepipeline/e/c;
 
     goto :goto_1
 
     :cond_0
-    invoke-virtual/range {p0 .. p0}, Lcom/facebook/imagepipeline/b/k;->iN()Lcom/facebook/imagepipeline/animated/b/a;
+    invoke-virtual/range {p0 .. p0}, Lcom/facebook/imagepipeline/b/k;->iL()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;->Vg:Lcom/facebook/imagepipeline/b/i;
+    iget-object v5, v0, Lcom/facebook/imagepipeline/b/k;->Vc:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v5, v5, Lcom/facebook/imagepipeline/b/i;->PT:Landroid/graphics/Bitmap$Config;
+    iget-object v5, v5, Lcom/facebook/imagepipeline/b/i;->PP: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;->Vg:Lcom/facebook/imagepipeline/b/i;
+    iget-object v6, v0, Lcom/facebook/imagepipeline/b/k;->Vc:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v6, v6, Lcom/facebook/imagepipeline/b/i;->PT:Landroid/graphics/Bitmap$Config;
+    iget-object v6, v6, Lcom/facebook/imagepipeline/b/i;->PP: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;->Vg:Lcom/facebook/imagepipeline/b/i;
+    iget-object v6, v0, Lcom/facebook/imagepipeline/b/k;->Vc:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v6, v6, Lcom/facebook/imagepipeline/b/i;->UF:Lcom/facebook/imagepipeline/e/d;
+    iget-object v6, v6, Lcom/facebook/imagepipeline/b/i;->UB: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;->iT()Lcom/facebook/imagepipeline/platform/f;
+    invoke-direct/range {p0 .. p0}, Lcom/facebook/imagepipeline/b/k;->iR()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;->Ut:Lcom/facebook/imagepipeline/e/c;
+    iput-object v6, v0, Lcom/facebook/imagepipeline/b/k;->Up: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;->iT()Lcom/facebook/imagepipeline/platform/f;
+    invoke-direct/range {p0 .. p0}, Lcom/facebook/imagepipeline/b/k;->iR()Lcom/facebook/imagepipeline/platform/f;
 
     move-result-object v7
 
-    iget-object v8, v0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
+    iget-object v8, v0, Lcom/facebook/imagepipeline/b/k;->Vc:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v8, v8, Lcom/facebook/imagepipeline/b/i;->UF:Lcom/facebook/imagepipeline/e/d;
+    iget-object v8, v8, Lcom/facebook/imagepipeline/b/i;->UB:Lcom/facebook/imagepipeline/e/d;
 
-    iget-object v8, v8, Lcom/facebook/imagepipeline/e/d;->VQ:Ljava/util/Map;
+    iget-object v8, v8, Lcom/facebook/imagepipeline/e/d;->VM: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;->Ut:Lcom/facebook/imagepipeline/e/c;
+    iput-object v6, v0, Lcom/facebook/imagepipeline/b/k;->Up:Lcom/facebook/imagepipeline/e/c;
 
-    invoke-static {}, Lcom/facebook/e/d;->ih()Lcom/facebook/e/d;
+    invoke-static {}, Lcom/facebook/e/d;->if()Lcom/facebook/e/d;
 
     move-result-object v1
 
-    iget-object v5, v0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
+    iget-object v5, v0, Lcom/facebook/imagepipeline/b/k;->Vc:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v5, v5, Lcom/facebook/imagepipeline/b/i;->UF:Lcom/facebook/imagepipeline/e/d;
+    iget-object v5, v5, Lcom/facebook/imagepipeline/b/i;->UB:Lcom/facebook/imagepipeline/e/d;
 
-    iget-object v5, v5, Lcom/facebook/imagepipeline/e/d;->VR:Ljava/util/List;
+    iget-object v5, v5, Lcom/facebook/imagepipeline/e/d;->VN:Ljava/util/List;
 
-    iput-object v5, v1, Lcom/facebook/e/d;->Rn:Ljava/util/List;
+    iput-object v5, v1, Lcom/facebook/e/d;->Rj:Ljava/util/List;
 
-    invoke-virtual {v1}, Lcom/facebook/e/d;->ig()V
+    invoke-virtual {v1}, Lcom/facebook/e/d;->ie()V
 
     :cond_3
     :goto_1
-    iget-object v5, v0, Lcom/facebook/imagepipeline/b/k;->Ut:Lcom/facebook/imagepipeline/e/c;
+    iget-object v5, v0, Lcom/facebook/imagepipeline/b/k;->Up:Lcom/facebook/imagepipeline/e/c;
 
-    iget-object v1, v0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/b/k;->Vc:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v6, v1, Lcom/facebook/imagepipeline/b/i;->UC:Lcom/facebook/imagepipeline/e/e;
+    iget-object v6, v1, Lcom/facebook/imagepipeline/b/i;->Uy:Lcom/facebook/imagepipeline/e/e;
 
-    iget-object v1, v0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/b/k;->Vc:Lcom/facebook/imagepipeline/b/i;
 
-    iget-boolean v7, v1, Lcom/facebook/imagepipeline/b/i;->Uq:Z
+    iget-boolean v7, v1, Lcom/facebook/imagepipeline/b/i;->Um:Z
 
-    iget-object v1, v0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/b/k;->Vc:Lcom/facebook/imagepipeline/b/i;
 
-    iget-boolean v8, v1, Lcom/facebook/imagepipeline/b/i;->UD:Z
+    iget-boolean v8, v1, Lcom/facebook/imagepipeline/b/i;->Uz:Z
 
-    iget-object v1, v0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/b/k;->Vc:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->UG:Lcom/facebook/imagepipeline/b/j;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->UC:Lcom/facebook/imagepipeline/b/j;
 
-    iget-boolean v9, v1, Lcom/facebook/imagepipeline/b/j;->US:Z
+    iget-boolean v9, v1, Lcom/facebook/imagepipeline/b/j;->UN:Z
 
-    iget-object v1, v0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/b/k;->Vc:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v10, v1, Lcom/facebook/imagepipeline/b/i;->Qy:Lcom/facebook/imagepipeline/b/f;
+    iget-object v10, v1, Lcom/facebook/imagepipeline/b/i;->Qu:Lcom/facebook/imagepipeline/b/f;
 
-    iget-object v1, v0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/b/k;->Vc:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->UB:Lcom/facebook/imagepipeline/memory/ad;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->Ux:Lcom/facebook/imagepipeline/memory/ad;
 
-    iget-object v11, v0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
+    iget-object v11, v0, Lcom/facebook/imagepipeline/b/k;->Vc:Lcom/facebook/imagepipeline/b/i;
 
-    iget v11, v11, Lcom/facebook/imagepipeline/b/i;->Uy:I
+    iget v11, v11, Lcom/facebook/imagepipeline/b/i;->Uu: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;->iP()Lcom/facebook/imagepipeline/cache/n;
+    invoke-direct/range {p0 .. p0}, Lcom/facebook/imagepipeline/b/k;->iN()Lcom/facebook/imagepipeline/cache/n;
 
     move-result-object v12
 
-    invoke-direct/range {p0 .. p0}, Lcom/facebook/imagepipeline/b/k;->iQ()Lcom/facebook/imagepipeline/cache/n;
+    invoke-direct/range {p0 .. p0}, Lcom/facebook/imagepipeline/b/k;->iO()Lcom/facebook/imagepipeline/cache/n;
 
     move-result-object v13
 
-    invoke-direct/range {p0 .. p0}, Lcom/facebook/imagepipeline/b/k;->iR()Lcom/facebook/imagepipeline/cache/e;
+    invoke-direct/range {p0 .. p0}, Lcom/facebook/imagepipeline/b/k;->iP()Lcom/facebook/imagepipeline/cache/e;
 
     move-result-object v14
 
-    invoke-direct/range {p0 .. p0}, Lcom/facebook/imagepipeline/b/k;->iX()Lcom/facebook/imagepipeline/cache/e;
+    invoke-direct/range {p0 .. p0}, Lcom/facebook/imagepipeline/b/k;->iV()Lcom/facebook/imagepipeline/cache/e;
 
     move-result-object v15
 
-    iget-object v1, v0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/b/k;->Vc:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->Uh:Lcom/facebook/imagepipeline/cache/f;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->Ud:Lcom/facebook/imagepipeline/cache/f;
 
     move-object/from16 v16, v1
 
-    invoke-direct/range {p0 .. p0}, Lcom/facebook/imagepipeline/b/k;->iS()Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+    invoke-direct/range {p0 .. p0}, Lcom/facebook/imagepipeline/b/k;->iQ()Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
 
     move-result-object v17
 
-    iget-object v1, v0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/b/k;->Vc:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->UG:Lcom/facebook/imagepipeline/b/j;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->UC:Lcom/facebook/imagepipeline/b/j;
 
-    iget v1, v1, Lcom/facebook/imagepipeline/b/j;->UW:I
+    iget v1, v1, Lcom/facebook/imagepipeline/b/j;->US:I
 
     move/from16 v18, v1
 
-    iget-object v1, v0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/b/k;->Vc:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->UG:Lcom/facebook/imagepipeline/b/j;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->UC:Lcom/facebook/imagepipeline/b/j;
 
-    iget v1, v1, Lcom/facebook/imagepipeline/b/j;->UX:I
+    iget v1, v1, Lcom/facebook/imagepipeline/b/j;->UT:I
 
     move/from16 v19, v1
 
-    iget-object v1, v0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/b/k;->Vc:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->UG:Lcom/facebook/imagepipeline/b/j;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->UC:Lcom/facebook/imagepipeline/b/j;
 
-    iget-boolean v1, v1, Lcom/facebook/imagepipeline/b/j;->UY:Z
+    iget-boolean v1, v1, Lcom/facebook/imagepipeline/b/j;->UU:Z
 
     move/from16 v20, v1
 
-    iget-object v1, v0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/b/k;->Vc:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->UG:Lcom/facebook/imagepipeline/b/j;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->UC:Lcom/facebook/imagepipeline/b/j;
 
-    iget v1, v1, Lcom/facebook/imagepipeline/b/j;->UZ:I
+    iget v1, v1, Lcom/facebook/imagepipeline/b/j;->UV:I
 
     move/from16 v21, v1
 
-    iget-object v1, v0, Lcom/facebook/imagepipeline/b/k;->Si:Lcom/facebook/imagepipeline/b/a;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/b/k;->Se: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;->Vm:Lcom/facebook/imagepipeline/b/m;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/b/k;->Vi:Lcom/facebook/imagepipeline/b/m;
 
     :cond_4
-    iget-object v1, v0, Lcom/facebook/imagepipeline/b/k;->Vm:Lcom/facebook/imagepipeline/b/m;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/b/k;->Vi:Lcom/facebook/imagepipeline/b/m;
 
     return-object v1
 .end method
 
-.method private iV()Lcom/facebook/imagepipeline/b/n;
+.method private iT()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;->Vg:Lcom/facebook/imagepipeline/b/i;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Vc:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/b/i;->UG:Lcom/facebook/imagepipeline/b/j;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/b/i;->UC:Lcom/facebook/imagepipeline/b/j;
 
-    iget-boolean v0, v0, Lcom/facebook/imagepipeline/b/j;->UV:Z
+    iget-boolean v0, v0, Lcom/facebook/imagepipeline/b/j;->UR: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;->Ua:Lcom/facebook/imagepipeline/b/n;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->TW: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;->Vg:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vc: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;->iU()Lcom/facebook/imagepipeline/b/m;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/k;->iS()Lcom/facebook/imagepipeline/b/m;
 
     move-result-object v3
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vc:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v4, v1, Lcom/facebook/imagepipeline/b/i;->Uz:Lcom/facebook/imagepipeline/i/af;
+    iget-object v4, v1, Lcom/facebook/imagepipeline/b/i;->Uv:Lcom/facebook/imagepipeline/i/af;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vc:Lcom/facebook/imagepipeline/b/i;
 
-    iget-boolean v5, v1, Lcom/facebook/imagepipeline/b/i;->UD:Z
+    iget-boolean v5, v1, Lcom/facebook/imagepipeline/b/i;->Uz:Z
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vc:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->UG:Lcom/facebook/imagepipeline/b/j;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->UC:Lcom/facebook/imagepipeline/b/j;
 
-    iget-boolean v6, v1, Lcom/facebook/imagepipeline/b/j;->UQ:Z
+    iget-boolean v6, v1, Lcom/facebook/imagepipeline/b/j;->UL:Z
 
-    iget-object v7, p0, Lcom/facebook/imagepipeline/b/k;->Ui:Lcom/facebook/imagepipeline/i/as;
+    iget-object v7, p0, Lcom/facebook/imagepipeline/b/k;->Ue:Lcom/facebook/imagepipeline/i/as;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vc:Lcom/facebook/imagepipeline/b/i;
 
-    iget-boolean v8, v1, Lcom/facebook/imagepipeline/b/i;->Uq:Z
+    iget-boolean v8, v1, Lcom/facebook/imagepipeline/b/i;->Um:Z
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vc:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->UG:Lcom/facebook/imagepipeline/b/j;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->UC:Lcom/facebook/imagepipeline/b/j;
 
-    iget-boolean v10, v1, Lcom/facebook/imagepipeline/b/j;->Vb:Z
+    iget-boolean v10, v1, Lcom/facebook/imagepipeline/b/j;->UX:Z
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vc:Lcom/facebook/imagepipeline/b/i;
 
-    iget-boolean v11, v1, Lcom/facebook/imagepipeline/b/i;->UH:Z
+    iget-boolean v11, v1, Lcom/facebook/imagepipeline/b/i;->UD:Z
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/k;->iY()Lcom/facebook/imagepipeline/k/d;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/k;->iW()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;->Ua:Lcom/facebook/imagepipeline/b/n;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/k;->TW:Lcom/facebook/imagepipeline/b/n;
 
     :cond_1
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Ua:Lcom/facebook/imagepipeline/b/n;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->TW:Lcom/facebook/imagepipeline/b/n;
 
     return-object v0
 .end method
 
-.method private iW()Lcom/facebook/cache/disk/h;
+.method private iU()Lcom/facebook/cache/disk/h;
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Vn:Lcom/facebook/cache/disk/h;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Vj:Lcom/facebook/cache/disk/h;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Vc:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/b/i;->UE:Lcom/facebook/cache/disk/DiskCacheConfig;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/b/i;->UA:Lcom/facebook/cache/disk/DiskCacheConfig;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vc:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->Ur:Lcom/facebook/imagepipeline/b/g;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->Un: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;->Vn:Lcom/facebook/cache/disk/h;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Vj:Lcom/facebook/cache/disk/h;
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Vn:Lcom/facebook/cache/disk/h;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Vj:Lcom/facebook/cache/disk/h;
 
     return-object v0
 .end method
 
-.method private iX()Lcom/facebook/imagepipeline/cache/e;
+.method private iV()Lcom/facebook/imagepipeline/cache/e;
     .locals 8
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Ug:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Uc: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;->iW()Lcom/facebook/cache/disk/h;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/k;->iU()Lcom/facebook/cache/disk/h;
 
     move-result-object v2
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vc:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->UB:Lcom/facebook/imagepipeline/memory/ad;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->Ux:Lcom/facebook/imagepipeline/memory/ad;
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/b/k;->Vc:Lcom/facebook/imagepipeline/b/i;
 
-    iget v3, v3, Lcom/facebook/imagepipeline/b/i;->Uy:I
+    iget v3, v3, Lcom/facebook/imagepipeline/b/i;->Uu: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;->Vg:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vc:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->UB:Lcom/facebook/imagepipeline/memory/ad;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->Ux:Lcom/facebook/imagepipeline/memory/ad;
 
-    invoke-virtual {v1}, Lcom/facebook/imagepipeline/memory/ad;->jV()Lcom/facebook/common/g/j;
+    invoke-virtual {v1}, Lcom/facebook/imagepipeline/memory/ad;->jT()Lcom/facebook/common/g/j;
 
     move-result-object v4
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vc:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->Qy:Lcom/facebook/imagepipeline/b/f;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->Qu: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;->iD()Ljava/util/concurrent/Executor;
 
     move-result-object v5
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vc:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->Qy:Lcom/facebook/imagepipeline/b/f;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->Qu: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;->iE()Ljava/util/concurrent/Executor;
 
     move-result-object v6
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vc:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v7, v1, Lcom/facebook/imagepipeline/b/i;->SF:Lcom/facebook/imagepipeline/cache/m;
+    iget-object v7, v1, Lcom/facebook/imagepipeline/b/i;->SB: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;->Ug:Lcom/facebook/imagepipeline/cache/e;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Uc:Lcom/facebook/imagepipeline/cache/e;
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Ug:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Uc:Lcom/facebook/imagepipeline/cache/e;
 
     return-object v0
 .end method
 
-.method private iY()Lcom/facebook/imagepipeline/k/d;
+.method private iW()Lcom/facebook/imagepipeline/k/d;
     .locals 5
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Uu:Lcom/facebook/imagepipeline/k/d;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Uq:Lcom/facebook/imagepipeline/k/d;
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Vc:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/b/i;->Uu:Lcom/facebook/imagepipeline/k/d;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/b/i;->Uq:Lcom/facebook/imagepipeline/k/d;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Vc:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/b/i;->Uv:Ljava/lang/Integer;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/b/i;->Ur:Ljava/lang/Integer;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Vc:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/b/i;->UG:Lcom/facebook/imagepipeline/b/j;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/b/i;->UC:Lcom/facebook/imagepipeline/b/j;
 
-    iget-boolean v0, v0, Lcom/facebook/imagepipeline/b/j;->Va:Z
+    iget-boolean v0, v0, Lcom/facebook/imagepipeline/b/j;->UW:Z
 
     if-eqz v0, :cond_0
 
     new-instance v0, Lcom/facebook/imagepipeline/k/h;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vc:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->UG:Lcom/facebook/imagepipeline/b/j;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->UC:Lcom/facebook/imagepipeline/b/j;
 
-    iget v1, v1, Lcom/facebook/imagepipeline/b/j;->UZ:I
+    iget v1, v1, Lcom/facebook/imagepipeline/b/j;->UV:I
 
     invoke-direct {v0, v1}, Lcom/facebook/imagepipeline/k/h;-><init>(I)V
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Uu:Lcom/facebook/imagepipeline/k/d;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Uq: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;->Vg:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vc:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->UG:Lcom/facebook/imagepipeline/b/j;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->UC:Lcom/facebook/imagepipeline/b/j;
 
-    iget v1, v1, Lcom/facebook/imagepipeline/b/j;->UZ:I
+    iget v1, v1, Lcom/facebook/imagepipeline/b/j;->UV:I
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/b/k;->Vc:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v2, v2, Lcom/facebook/imagepipeline/b/i;->UG:Lcom/facebook/imagepipeline/b/j;
+    iget-object v2, v2, Lcom/facebook/imagepipeline/b/i;->UC:Lcom/facebook/imagepipeline/b/j;
 
-    iget-boolean v2, v2, Lcom/facebook/imagepipeline/b/j;->UU:Z
+    iget-boolean v2, v2, Lcom/facebook/imagepipeline/b/j;->UQ:Z
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/b/k;->Vc:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v3, v3, Lcom/facebook/imagepipeline/b/i;->Uu:Lcom/facebook/imagepipeline/k/d;
+    iget-object v3, v3, Lcom/facebook/imagepipeline/b/i;->Uq:Lcom/facebook/imagepipeline/k/d;
 
-    iget-object v4, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
+    iget-object v4, p0, Lcom/facebook/imagepipeline/b/k;->Vc:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v4, v4, Lcom/facebook/imagepipeline/b/i;->Uv:Ljava/lang/Integer;
+    iget-object v4, v4, Lcom/facebook/imagepipeline/b/i;->Ur: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;->Uu:Lcom/facebook/imagepipeline/k/d;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Uq:Lcom/facebook/imagepipeline/k/d;
 
     :cond_1
     :goto_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Uu:Lcom/facebook/imagepipeline/k/d;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Uq: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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()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;->iL()Lcom/facebook/imagepipeline/b/i;
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/b/i$a;->iJ()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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -1014,52 +1014,52 @@
 
 
 # virtual methods
-.method public final gR()Lcom/facebook/imagepipeline/b/h;
+.method public final gP()Lcom/facebook/imagepipeline/b/h;
     .locals 14
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Km:Lcom/facebook/imagepipeline/b/h;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Ki: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;->iV()Lcom/facebook/imagepipeline/b/n;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/k;->iT()Lcom/facebook/imagepipeline/b/n;
 
     move-result-object v2
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vc:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->Kj:Ljava/util/Set;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->Kf: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;->Vg:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vc:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v4, v1, Lcom/facebook/imagepipeline/b/i;->Uc:Lcom/facebook/common/d/l;
+    iget-object v4, v1, Lcom/facebook/imagepipeline/b/i;->TY:Lcom/facebook/common/d/l;
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/k;->iP()Lcom/facebook/imagepipeline/cache/n;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/k;->iN()Lcom/facebook/imagepipeline/cache/n;
 
     move-result-object v5
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/k;->iQ()Lcom/facebook/imagepipeline/cache/n;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/k;->iO()Lcom/facebook/imagepipeline/cache/n;
 
     move-result-object v6
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/k;->iR()Lcom/facebook/imagepipeline/cache/e;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/k;->iP()Lcom/facebook/imagepipeline/cache/e;
 
     move-result-object v7
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/k;->iX()Lcom/facebook/imagepipeline/cache/e;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/k;->iV()Lcom/facebook/imagepipeline/cache/e;
 
     move-result-object v8
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vc:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v9, v1, Lcom/facebook/imagepipeline/b/i;->Uh:Lcom/facebook/imagepipeline/cache/f;
+    iget-object v9, v1, Lcom/facebook/imagepipeline/b/i;->Ud:Lcom/facebook/imagepipeline/cache/f;
 
-    iget-object v10, p0, Lcom/facebook/imagepipeline/b/k;->Ui:Lcom/facebook/imagepipeline/i/as;
+    iget-object v10, p0, Lcom/facebook/imagepipeline/b/k;->Ue: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;->Vg:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vc:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->UG:Lcom/facebook/imagepipeline/b/j;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->UC:Lcom/facebook/imagepipeline/b/j;
 
-    iget-object v12, v1, Lcom/facebook/imagepipeline/b/j;->Ul:Lcom/facebook/common/d/l;
+    iget-object v12, v1, Lcom/facebook/imagepipeline/b/j;->Uh:Lcom/facebook/common/d/l;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vc:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v13, v1, Lcom/facebook/imagepipeline/b/i;->Um:Lcom/facebook/b/a;
+    iget-object v13, v1, Lcom/facebook/imagepipeline/b/i;->Ui: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;->Km:Lcom/facebook/imagepipeline/b/h;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Ki:Lcom/facebook/imagepipeline/b/h;
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Km:Lcom/facebook/imagepipeline/b/h;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Ki:Lcom/facebook/imagepipeline/b/h;
 
     return-object v0
 .end method
 
-.method public final iN()Lcom/facebook/imagepipeline/animated/b/a;
+.method public final iL()Lcom/facebook/imagepipeline/animated/b/a;
     .locals 4
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Vp:Lcom/facebook/imagepipeline/animated/b/a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Vl:Lcom/facebook/imagepipeline/animated/b/a;
 
     if-nez v0, :cond_0
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/k;->iS()Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/k;->iQ()Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vc:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->Qy:Lcom/facebook/imagepipeline/b/f;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->Qu:Lcom/facebook/imagepipeline/b/f;
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/k;->iO()Lcom/facebook/imagepipeline/cache/h;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/k;->iM()Lcom/facebook/imagepipeline/cache/h;
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/b/k;->Vc:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v3, v3, Lcom/facebook/imagepipeline/b/i;->UG:Lcom/facebook/imagepipeline/b/j;
+    iget-object v3, v3, Lcom/facebook/imagepipeline/b/i;->UC:Lcom/facebook/imagepipeline/b/j;
 
-    iget-boolean v3, v3, Lcom/facebook/imagepipeline/b/j;->QA:Z
+    iget-boolean v3, v3, Lcom/facebook/imagepipeline/b/j;->Qw: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;->Vp:Lcom/facebook/imagepipeline/animated/b/a;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Vl:Lcom/facebook/imagepipeline/animated/b/a;
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Vp:Lcom/facebook/imagepipeline/animated/b/a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Vl: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 8a5b2a8906..07b39ae1c3 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 VK:Lcom/facebook/imagepipeline/c/a;
+.field final synthetic VG: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;->VK:Lcom/facebook/imagepipeline/c/a;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/c/a$1;->VG: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;->VK:Lcom/facebook/imagepipeline/c/a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/c/a$1;->VG: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;->VK:Lcom/facebook/imagepipeline/c/a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/c/a$1;->VG: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 jj()V
+.method public final jh()V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/c/a$1;->VK:Lcom/facebook/imagepipeline/c/a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/c/a$1;->VG:Lcom/facebook/imagepipeline/c/a;
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/c/a;->jj()V
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/c/a;->jh()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;->VK:Lcom/facebook/imagepipeline/c/a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/c/a$1;->VG: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 894c30c08c..0e9cd2acbb 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 Ub:Lcom/facebook/imagepipeline/h/c;
+.field private final TX:Lcom/facebook/imagepipeline/h/c;
 
-.field private final VJ:Lcom/facebook/imagepipeline/i/ap;
+.field private final VF: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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/c/a;->VJ:Lcom/facebook/imagepipeline/i/ap;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/c/a;->VF:Lcom/facebook/imagepipeline/i/ap;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/c/a;->Ub:Lcom/facebook/imagepipeline/h/c;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/c/a;->TX:Lcom/facebook/imagepipeline/h/c;
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
-    iget-object p3, p0, Lcom/facebook/imagepipeline/c/a;->Ub:Lcom/facebook/imagepipeline/h/c;
+    iget-object p3, p0, Lcom/facebook/imagepipeline/c/a;->TX:Lcom/facebook/imagepipeline/h/c;
 
-    iget-object v0, p2, Lcom/facebook/imagepipeline/i/d;->Kz:Lcom/facebook/imagepipeline/request/b;
+    iget-object v0, p2, Lcom/facebook/imagepipeline/i/d;->Kv:Lcom/facebook/imagepipeline/request/b;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/c/a;->VJ:Lcom/facebook/imagepipeline/i/ap;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/c/a;->VF:Lcom/facebook/imagepipeline/i/ap;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/i/d;->Ky:Ljava/lang/Object;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/i/d;->Ku:Ljava/lang/Object;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/c/a;->VJ:Lcom/facebook/imagepipeline/i/ap;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/c/a;->VF: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;->VJ:Lcom/facebook/imagepipeline/i/ap;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/c/a;->VF:Lcom/facebook/imagepipeline/i/ap;
 
-    invoke-virtual {v3}, Lcom/facebook/imagepipeline/i/ap;->kd()Z
+    invoke-virtual {v3}, Lcom/facebook/imagepipeline/i/ap;->kb()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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     return-void
 .end method
@@ -91,19 +91,19 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/c/a;->Ub:Lcom/facebook/imagepipeline/h/c;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/c/a;->TX:Lcom/facebook/imagepipeline/h/c;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/c/a;->VJ:Lcom/facebook/imagepipeline/i/ap;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/c/a;->VF:Lcom/facebook/imagepipeline/i/ap;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/i/d;->Kz:Lcom/facebook/imagepipeline/request/b;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/i/d;->Kv:Lcom/facebook/imagepipeline/request/b;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/c/a;->VJ:Lcom/facebook/imagepipeline/i/ap;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/c/a;->VF: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;->VJ:Lcom/facebook/imagepipeline/i/ap;
+    iget-object p0, p0, Lcom/facebook/imagepipeline/c/a;->VF:Lcom/facebook/imagepipeline/i/ap;
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/ap;->kd()Z
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/ap;->kb()Z
 
     move-result p0
 
@@ -139,19 +139,19 @@
 
     if-eqz p2, :cond_0
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/c/a;->Ub:Lcom/facebook/imagepipeline/h/c;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/c/a;->TX:Lcom/facebook/imagepipeline/h/c;
 
-    iget-object p2, p0, Lcom/facebook/imagepipeline/c/a;->VJ:Lcom/facebook/imagepipeline/i/ap;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/c/a;->VF:Lcom/facebook/imagepipeline/i/ap;
 
-    iget-object p2, p2, Lcom/facebook/imagepipeline/i/d;->Kz:Lcom/facebook/imagepipeline/request/b;
+    iget-object p2, p2, Lcom/facebook/imagepipeline/i/d;->Kv:Lcom/facebook/imagepipeline/request/b;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/c/a;->VJ:Lcom/facebook/imagepipeline/i/ap;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/c/a;->VF: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;->VJ:Lcom/facebook/imagepipeline/i/ap;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/c/a;->VF:Lcom/facebook/imagepipeline/i/ap;
 
-    invoke-virtual {v1}, Lcom/facebook/imagepipeline/i/ap;->kd()Z
+    invoke-virtual {v1}, Lcom/facebook/imagepipeline/i/ap;->kb()Z
 
     move-result v1
 
@@ -161,10 +161,10 @@
     return-void
 .end method
 
-.method public final gG()Z
+.method public final gE()Z
     .locals 2
 
-    invoke-super {p0}, Lcom/facebook/c/a;->gG()Z
+    invoke-super {p0}, Lcom/facebook/c/a;->gE()Z
 
     move-result v0
 
@@ -181,17 +181,17 @@
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/c/a;->Ub:Lcom/facebook/imagepipeline/h/c;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/c/a;->TX:Lcom/facebook/imagepipeline/h/c;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/c/a;->VJ:Lcom/facebook/imagepipeline/i/ap;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/c/a;->VF: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;->VJ:Lcom/facebook/imagepipeline/i/ap;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/c/a;->VF:Lcom/facebook/imagepipeline/i/ap;
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/d;->kg()Ljava/util/List;
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/d;->ke()Ljava/util/List;
 
     move-result-object v0
 
@@ -203,7 +203,7 @@
     return v0
 .end method
 
-.method final declared-synchronized jj()V
+.method final declared-synchronized jh()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 bc901e3172..3d7227900c 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 Ky:Ljava/lang/Object;
+.field private final Ku:Ljava/lang/Object;
 
-.field private final Ss:Ljava/lang/String;
+.field private final So:Ljava/lang/String;
 
-.field private final St:Lcom/facebook/imagepipeline/a/e;
+.field private final Sp:Lcom/facebook/imagepipeline/a/e;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private final Su:Lcom/facebook/imagepipeline/a/f;
+.field private final Sq:Lcom/facebook/imagepipeline/a/f;
 
-.field private final Sv:Lcom/facebook/imagepipeline/a/b;
+.field private final Sr:Lcom/facebook/imagepipeline/a/b;
 
-.field private final Sw:Lcom/facebook/cache/common/CacheKey;
+.field private final Ss:Lcom/facebook/cache/common/CacheKey;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private final Sx:Ljava/lang/String;
+.field private final St:Ljava/lang/String;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private final Sy:I
+.field private final Su:I
 
-.field private final Sz:J
+.field private final Sv:J
 
 
 # direct methods
@@ -59,17 +59,17 @@
 
     check-cast v0, Ljava/lang/String;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/cache/c;->Ss:Ljava/lang/String;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/cache/c;->So:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/cache/c;->St:Lcom/facebook/imagepipeline/a/e;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/cache/c;->Sp:Lcom/facebook/imagepipeline/a/e;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/cache/c;->Su:Lcom/facebook/imagepipeline/a/f;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/cache/c;->Sq:Lcom/facebook/imagepipeline/a/f;
 
-    iput-object p4, p0, Lcom/facebook/imagepipeline/cache/c;->Sv:Lcom/facebook/imagepipeline/a/b;
+    iput-object p4, p0, Lcom/facebook/imagepipeline/cache/c;->Sr:Lcom/facebook/imagepipeline/a/b;
 
-    iput-object p5, p0, Lcom/facebook/imagepipeline/cache/c;->Sw:Lcom/facebook/cache/common/CacheKey;
+    iput-object p5, p0, Lcom/facebook/imagepipeline/cache/c;->Ss:Lcom/facebook/cache/common/CacheKey;
 
-    iput-object p6, p0, Lcom/facebook/imagepipeline/cache/c;->Sx:Ljava/lang/String;
+    iput-object p6, p0, Lcom/facebook/imagepipeline/cache/c;->St: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;->Sv:Lcom/facebook/imagepipeline/a/b;
+    iget-object p5, p0, Lcom/facebook/imagepipeline/cache/c;->Sr:Lcom/facebook/imagepipeline/a/b;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/c;->Sw:Lcom/facebook/cache/common/CacheKey;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/c;->Ss: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;->Sy:I
+    iput p1, p0, Lcom/facebook/imagepipeline/cache/c;->Su:I
 
-    iput-object p7, p0, Lcom/facebook/imagepipeline/cache/c;->Ky:Ljava/lang/Object;
+    iput-object p7, p0, Lcom/facebook/imagepipeline/cache/c;->Ku: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;->Sz:J
+    iput-wide p1, p0, Lcom/facebook/imagepipeline/cache/c;->Sv: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;->Sy:I
+    iget v0, p0, Lcom/facebook/imagepipeline/cache/c;->Su:I
 
-    iget v2, p1, Lcom/facebook/imagepipeline/cache/c;->Sy:I
+    iget v2, p1, Lcom/facebook/imagepipeline/cache/c;->Su:I
 
     if-ne v0, v2, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/c;->Ss:Ljava/lang/String;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/c;->So:Ljava/lang/String;
 
-    iget-object v2, p1, Lcom/facebook/imagepipeline/cache/c;->Ss:Ljava/lang/String;
+    iget-object v2, p1, Lcom/facebook/imagepipeline/cache/c;->So: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;->St:Lcom/facebook/imagepipeline/a/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/c;->Sp:Lcom/facebook/imagepipeline/a/e;
 
-    iget-object v2, p1, Lcom/facebook/imagepipeline/cache/c;->St:Lcom/facebook/imagepipeline/a/e;
+    iget-object v2, p1, Lcom/facebook/imagepipeline/cache/c;->Sp: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;->Su:Lcom/facebook/imagepipeline/a/f;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/c;->Sq:Lcom/facebook/imagepipeline/a/f;
 
-    iget-object v2, p1, Lcom/facebook/imagepipeline/cache/c;->Su:Lcom/facebook/imagepipeline/a/f;
+    iget-object v2, p1, Lcom/facebook/imagepipeline/cache/c;->Sq: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;->Sv:Lcom/facebook/imagepipeline/a/b;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/c;->Sr:Lcom/facebook/imagepipeline/a/b;
 
-    iget-object v2, p1, Lcom/facebook/imagepipeline/cache/c;->Sv:Lcom/facebook/imagepipeline/a/b;
+    iget-object v2, p1, Lcom/facebook/imagepipeline/cache/c;->Sr: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;->Sw:Lcom/facebook/cache/common/CacheKey;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/c;->Ss:Lcom/facebook/cache/common/CacheKey;
 
-    iget-object v2, p1, Lcom/facebook/imagepipeline/cache/c;->Sw:Lcom/facebook/cache/common/CacheKey;
+    iget-object v2, p1, Lcom/facebook/imagepipeline/cache/c;->Ss: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;->Sx:Ljava/lang/String;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/c;->St:Ljava/lang/String;
 
-    iget-object p1, p1, Lcom/facebook/imagepipeline/cache/c;->Sx:Ljava/lang/String;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/cache/c;->St: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 fL()Ljava/lang/String;
+.method public final fJ()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/c;->Ss:Ljava/lang/String;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/c;->So: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;->Sy:I
+    iget v0, p0, Lcom/facebook/imagepipeline/cache/c;->Su: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;->Ss:Ljava/lang/String;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/c;->So:Ljava/lang/String;
 
     const/4 v2, 0x0
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/c;->St:Lcom/facebook/imagepipeline/a/e;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/c;->Sp:Lcom/facebook/imagepipeline/a/e;
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/c;->Su:Lcom/facebook/imagepipeline/a/f;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/c;->Sq:Lcom/facebook/imagepipeline/a/f;
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/c;->Sv:Lcom/facebook/imagepipeline/a/b;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/c;->Sr:Lcom/facebook/imagepipeline/a/b;
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/c;->Sw:Lcom/facebook/cache/common/CacheKey;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/c;->Ss:Lcom/facebook/cache/common/CacheKey;
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/c;->Sx:Ljava/lang/String;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/c;->St:Ljava/lang/String;
 
     const/4 v2, 0x5
 
     aput-object v1, v0, v2
 
-    iget v1, p0, Lcom/facebook/imagepipeline/cache/c;->Sy:I
+    iget v1, p0, Lcom/facebook/imagepipeline/cache/c;->Su: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 83d99f8445..34d109e84a 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 SG:Ljava/util/concurrent/atomic/AtomicBoolean;
+.field final synthetic SC:Ljava/util/concurrent/atomic/AtomicBoolean;
 
-.field final synthetic SH:Lcom/facebook/cache/common/CacheKey;
+.field final synthetic SD:Lcom/facebook/cache/common/CacheKey;
 
-.field final synthetic SI:Lcom/facebook/imagepipeline/cache/e;
+.field final synthetic SE: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;->SI:Lcom/facebook/imagepipeline/cache/e;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/cache/e$1;->SE:Lcom/facebook/imagepipeline/cache/e;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/cache/e$1;->SG:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/cache/e$1;->SC:Ljava/util/concurrent/atomic/AtomicBoolean;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/cache/e$1;->SH:Lcom/facebook/cache/common/CacheKey;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/cache/e$1;->SD:Lcom/facebook/cache/common/CacheKey;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     return-void
 .end method
 
-.method private ip()Lcom/facebook/imagepipeline/g/e;
+.method private in()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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/e$1;->SG:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/e$1;->SC: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;->SI:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/e$1;->SE: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;->SH:Lcom/facebook/cache/common/CacheKey;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/e$1;->SD: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;->ge()Ljava/lang/Class;
+    invoke-static {}, Lcom/facebook/imagepipeline/cache/e;->gb()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;->SH:Lcom/facebook/cache/common/CacheKey;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/cache/e$1;->SD:Lcom/facebook/cache/common/CacheKey;
 
-    invoke-interface {v3}, Lcom/facebook/cache/common/CacheKey;->fL()Ljava/lang/String;
+    invoke-interface {v3}, Lcom/facebook/cache/common/CacheKey;->fJ()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;->SI:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/e$1;->SE: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;->ge()Ljava/lang/Class;
+    invoke-static {}, Lcom/facebook/imagepipeline/cache/e;->gb()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;->SH:Lcom/facebook/cache/common/CacheKey;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/cache/e$1;->SD:Lcom/facebook/cache/common/CacheKey;
 
-    invoke-interface {v2}, Lcom/facebook/cache/common/CacheKey;->fL()Ljava/lang/String;
+    invoke-interface {v2}, Lcom/facebook/cache/common/CacheKey;->fJ()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;->SI:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/e$1;->SE: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;->SI:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/e$1;->SE:Lcom/facebook/imagepipeline/cache/e;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/cache/e$1;->SH:Lcom/facebook/cache/common/CacheKey;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/cache/e$1;->SD: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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     return-object v0
 
@@ -178,7 +178,7 @@
 
     if-eqz v1, :cond_3
 
-    invoke-static {}, Lcom/facebook/imagepipeline/cache/e;->ge()Ljava/lang/Class;
+    invoke-static {}, Lcom/facebook/imagepipeline/cache/e;->gb()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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     return-object v0
 
@@ -233,7 +233,7 @@
     :catchall_1
     move-exception v0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()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;->ip()Lcom/facebook/imagepipeline/g/e;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/e$1;->in()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 8474e96d2d..f8f14cee04 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 GI:Ljava/lang/Class;
+.field private static final GE:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -15,19 +15,19 @@
 
 
 # instance fields
-.field private final SA:Lcom/facebook/cache/disk/h;
+.field private final SA:Lcom/facebook/imagepipeline/cache/s;
 
-.field private final SB:Lcom/facebook/common/g/j;
+.field private final SB:Lcom/facebook/imagepipeline/cache/m;
 
-.field private final SC:Ljava/util/concurrent/Executor;
+.field private final Sh:Lcom/facebook/common/g/g;
 
-.field private final SD:Ljava/util/concurrent/Executor;
+.field private final Sw:Lcom/facebook/cache/disk/h;
 
-.field private final SE:Lcom/facebook/imagepipeline/cache/s;
+.field private final Sx:Lcom/facebook/common/g/j;
 
-.field private final SF:Lcom/facebook/imagepipeline/cache/m;
+.field private final Sy:Ljava/util/concurrent/Executor;
 
-.field private final Sl:Lcom/facebook/common/g/g;
+.field private final Sz:Ljava/util/concurrent/Executor;
 
 
 # direct methods
@@ -36,7 +36,7 @@
 
     const-class v0, Lcom/facebook/imagepipeline/cache/e;
 
-    sput-object v0, Lcom/facebook/imagepipeline/cache/e;->GI:Ljava/lang/Class;
+    sput-object v0, Lcom/facebook/imagepipeline/cache/e;->GE: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;->SA:Lcom/facebook/cache/disk/h;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/cache/e;->Sw:Lcom/facebook/cache/disk/h;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/cache/e;->Sl:Lcom/facebook/common/g/g;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/cache/e;->Sh:Lcom/facebook/common/g/g;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/cache/e;->SB:Lcom/facebook/common/g/j;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/cache/e;->Sx:Lcom/facebook/common/g/j;
 
-    iput-object p4, p0, Lcom/facebook/imagepipeline/cache/e;->SC:Ljava/util/concurrent/Executor;
+    iput-object p4, p0, Lcom/facebook/imagepipeline/cache/e;->Sy:Ljava/util/concurrent/Executor;
 
-    iput-object p5, p0, Lcom/facebook/imagepipeline/cache/e;->SD:Ljava/util/concurrent/Executor;
+    iput-object p5, p0, Lcom/facebook/imagepipeline/cache/e;->Sz:Ljava/util/concurrent/Executor;
 
-    iput-object p6, p0, Lcom/facebook/imagepipeline/cache/e;->SF:Lcom/facebook/imagepipeline/cache/m;
+    iput-object p6, p0, Lcom/facebook/imagepipeline/cache/e;->SB:Lcom/facebook/imagepipeline/cache/m;
 
-    invoke-static {}, Lcom/facebook/imagepipeline/cache/s;->ix()Lcom/facebook/imagepipeline/cache/s;
+    invoke-static {}, Lcom/facebook/imagepipeline/cache/s;->iv()Lcom/facebook/imagepipeline/cache/s;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/cache/e;->SE:Lcom/facebook/imagepipeline/cache/s;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/cache/e;->SA: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;->SE:Lcom/facebook/imagepipeline/cache/s;
+    iget-object p0, p0, Lcom/facebook/imagepipeline/cache/e;->SA: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;->GI:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/imagepipeline/cache/e;->GE:Ljava/lang/Class;
 
-    invoke-interface {p1}, Lcom/facebook/cache/common/CacheKey;->fL()Ljava/lang/String;
+    invoke-interface {p1}, Lcom/facebook/cache/common/CacheKey;->fJ()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;->SA:Lcom/facebook/cache/disk/h;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/e;->Sw: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;->GI:Ljava/lang/Class;
+    sget-object p0, Lcom/facebook/imagepipeline/cache/e;->GE:Ljava/lang/Class;
 
     const-string p2, "Successful disk-cache write for key %s"
 
-    invoke-interface {p1}, Lcom/facebook/cache/common/CacheKey;->fL()Ljava/lang/String;
+    invoke-interface {p1}, Lcom/facebook/cache/common/CacheKey;->fJ()Ljava/lang/String;
 
     move-result-object v0
 
@@ -129,7 +129,7 @@
     :catch_0
     move-exception p0
 
-    sget-object p2, Lcom/facebook/imagepipeline/cache/e;->GI:Ljava/lang/Class;
+    sget-object p2, Lcom/facebook/imagepipeline/cache/e;->GE:Ljava/lang/Class;
 
     const/4 v0, 0x1
 
@@ -137,7 +137,7 @@
 
     const/4 v1, 0x0
 
-    invoke-interface {p1}, Lcom/facebook/cache/common/CacheKey;->fL()Ljava/lang/String;
+    invoke-interface {p1}, Lcom/facebook/cache/common/CacheKey;->fJ()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;->SC:Ljava/util/concurrent/Executor;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/cache/e;->Sy: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;->GI:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/imagepipeline/cache/e;->GE:Ljava/lang/Class;
 
     const/4 v1, 0x1
 
@@ -190,7 +190,7 @@
 
     const/4 v2, 0x0
 
-    invoke-interface {p1}, Lcom/facebook/cache/common/CacheKey;->fL()Ljava/lang/String;
+    invoke-interface {p1}, Lcom/facebook/cache/common/CacheKey;->fJ()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;->SF:Lcom/facebook/imagepipeline/cache/m;
+    iget-object p0, p0, Lcom/facebook/imagepipeline/cache/e;->SB: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;->SA:Lcom/facebook/cache/disk/h;
+    iget-object p0, p0, Lcom/facebook/imagepipeline/cache/e;->Sw: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;->SB:Lcom/facebook/common/g/j;
+    iget-object p0, p0, Lcom/facebook/imagepipeline/cache/e;->Sx: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;->GI:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/imagepipeline/cache/e;->GE:Ljava/lang/Class;
 
     const-string v1, "Disk cache read for %s"
 
-    invoke-interface {p1}, Lcom/facebook/cache/common/CacheKey;->fL()Ljava/lang/String;
+    invoke-interface {p1}, Lcom/facebook/cache/common/CacheKey;->fJ()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;->SA:Lcom/facebook/cache/disk/h;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/e;->Sw: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;->GI:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/imagepipeline/cache/e;->GE:Ljava/lang/Class;
 
     const-string v1, "Disk cache miss for %s"
 
-    invoke-interface {p1}, Lcom/facebook/cache/common/CacheKey;->fL()Ljava/lang/String;
+    invoke-interface {p1}, Lcom/facebook/cache/common/CacheKey;->fJ()Ljava/lang/String;
 
     move-result-object v2
 
@@ -276,26 +276,26 @@
     return-object p1
 
     :cond_0
-    sget-object v1, Lcom/facebook/imagepipeline/cache/e;->GI:Ljava/lang/Class;
+    sget-object v1, Lcom/facebook/imagepipeline/cache/e;->GE:Ljava/lang/Class;
 
     const-string v2, "Found entry in disk cache for %s"
 
-    invoke-interface {p1}, Lcom/facebook/cache/common/CacheKey;->fL()Ljava/lang/String;
+    invoke-interface {p1}, Lcom/facebook/cache/common/CacheKey;->fJ()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;->fJ()Ljava/io/InputStream;
+    invoke-interface {v0}, Lcom/facebook/a/a;->fH()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;->Sl:Lcom/facebook/common/g/g;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/cache/e;->Sh:Lcom/facebook/common/g/g;
 
-    invoke-interface {v0}, Lcom/facebook/a/a;->fK()J
+    invoke-interface {v0}, Lcom/facebook/a/a;->fI()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;->GI:Ljava/lang/Class;
+    sget-object v1, Lcom/facebook/imagepipeline/cache/e;->GE:Ljava/lang/Class;
 
     const-string v2, "Successful read from disk cache for %s"
 
-    invoke-interface {p1}, Lcom/facebook/cache/common/CacheKey;->fL()Ljava/lang/String;
+    invoke-interface {p1}, Lcom/facebook/cache/common/CacheKey;->fJ()Ljava/lang/String;
 
     move-result-object v3
 
@@ -334,7 +334,7 @@
     :catch_0
     move-exception v0
 
-    sget-object v1, Lcom/facebook/imagepipeline/cache/e;->GI:Ljava/lang/Class;
+    sget-object v1, Lcom/facebook/imagepipeline/cache/e;->GE:Ljava/lang/Class;
 
     const/4 v2, 0x1
 
@@ -342,7 +342,7 @@
 
     const/4 v3, 0x0
 
-    invoke-interface {p1}, Lcom/facebook/cache/common/CacheKey;->fL()Ljava/lang/String;
+    invoke-interface {p1}, Lcom/facebook/cache/common/CacheKey;->fJ()Ljava/lang/String;
 
     move-result-object p1
 
@@ -355,10 +355,10 @@
     throw v0
 .end method
 
-.method static synthetic ge()Ljava/lang/Class;
+.method static synthetic gb()Ljava/lang/Class;
     .locals 1
 
-    sget-object v0, Lcom/facebook/imagepipeline/cache/e;->GI:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/imagepipeline/cache/e;->GE:Ljava/lang/Class;
 
     return-object v0
 .end method
@@ -380,9 +380,9 @@
     .end annotation
 
     :try_start_0
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/e;->SE:Lcom/facebook/imagepipeline/cache/s;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/e;->SA: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;->GI:Ljava/lang/Class;
+    sget-object p2, Lcom/facebook/imagepipeline/cache/e;->GE:Ljava/lang/Class;
 
     const-string v1, "Found image for %s in staging area"
 
-    invoke-interface {p1}, Lcom/facebook/cache/common/CacheKey;->fL()Ljava/lang/String;
+    invoke-interface {p1}, Lcom/facebook/cache/common/CacheKey;->fJ()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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     return-object p1
 
     :catchall_0
     move-exception p1
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     throw p1
 .end method
@@ -434,7 +434,7 @@
     .locals 7
 
     :try_start_0
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()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;->SE:Lcom/facebook/imagepipeline/cache/s;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/e;->SA: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;->SD:Ljava/util/concurrent/Executor;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/e;->Sz: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;->GI:Ljava/lang/Class;
+    sget-object v2, Lcom/facebook/imagepipeline/cache/e;->GE: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;->fL()Ljava/lang/String;
+    invoke-interface {p1}, Lcom/facebook/cache/common/CacheKey;->fJ()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;->SE:Lcom/facebook/imagepipeline/cache/s;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/e;->SA: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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     return-void
 
     :catchall_0
     move-exception p1
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()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;->SE:Lcom/facebook/imagepipeline/cache/s;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/e;->SA: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;->SD:Ljava/util/concurrent/Executor;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/e;->Sz: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;->GI:Ljava/lang/Class;
+    sget-object v1, Lcom/facebook/imagepipeline/cache/e;->GE:Ljava/lang/Class;
 
     const/4 v2, 0x1
 
@@ -556,7 +556,7 @@
 
     const/4 v3, 0x0
 
-    invoke-interface {p1}, Lcom/facebook/cache/common/CacheKey;->fL()Ljava/lang/String;
+    invoke-interface {p1}, Lcom/facebook/cache/common/CacheKey;->fJ()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 e9ac456f2a..389051e331 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 SL:Lcom/facebook/imagepipeline/cache/t;
+.field private final SH: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 SM:Ljava/util/LinkedHashMap;
+.field private final SI:Ljava/util/LinkedHashMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/LinkedHashMap<",
@@ -35,7 +35,7 @@
     .end annotation
 .end field
 
-.field private SN:I
+.field private SJ:I
 
 
 # direct methods
@@ -55,13 +55,13 @@
 
     invoke-direct {v0}, Ljava/util/LinkedHashMap;-><init>()V
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/cache/g;->SM:Ljava/util/LinkedHashMap;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/cache/g;->SI:Ljava/util/LinkedHashMap;
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lcom/facebook/imagepipeline/cache/g;->SN:I
+    iput v0, p0, Lcom/facebook/imagepipeline/cache/g;->SJ:I
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/cache/g;->SL:Lcom/facebook/imagepipeline/cache/t;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/cache/g;->SH: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;->SL:Lcom/facebook/imagepipeline/cache/t;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/g;->SH: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;->SM:Ljava/util/LinkedHashMap;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/g;->SI: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;->SN:I
+    iget v3, p0, Lcom/facebook/imagepipeline/cache/g;->SJ: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;->SN:I
+    iput v3, p0, Lcom/facebook/imagepipeline/cache/g;->SJ: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;->SM:Ljava/util/LinkedHashMap;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/g;->SI: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 fI()I
+.method public final declared-synchronized fG()I
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    iget v0, p0, Lcom/facebook/imagepipeline/cache/g;->SN:I
+    iget v0, p0, Lcom/facebook/imagepipeline/cache/g;->SJ: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;->SM:Ljava/util/LinkedHashMap;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/g;->SI: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;->SM:Ljava/util/LinkedHashMap;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/g;->SI:Ljava/util/LinkedHashMap;
 
     invoke-virtual {v0}, Ljava/util/LinkedHashMap;->size()I
 
@@ -301,7 +301,7 @@
     throw v0
 .end method
 
-.method public final declared-synchronized iq()Ljava/lang/Object;
+.method public final declared-synchronized io()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;->SM:Ljava/util/LinkedHashMap;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/g;->SI: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;->SM:Ljava/util/LinkedHashMap;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/g;->SI: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;->SM:Ljava/util/LinkedHashMap;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/g;->SI: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;->SN:I
+    iget v1, p0, Lcom/facebook/imagepipeline/cache/g;->SJ: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;->SN:I
+    iput v1, p0, Lcom/facebook/imagepipeline/cache/g;->SJ:I
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/g;->SM:Ljava/util/LinkedHashMap;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/g;->SI: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;->SN:I
+    iget p1, p0, Lcom/facebook/imagepipeline/cache/g;->SJ: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;->SN:I
+    iput p1, p0, Lcom/facebook/imagepipeline/cache/g;->SJ: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;->SM:Ljava/util/LinkedHashMap;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/g;->SI: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;->SN:I
+    iget v0, p0, Lcom/facebook/imagepipeline/cache/g;->SJ: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;->SN:I
+    iput v0, p0, Lcom/facebook/imagepipeline/cache/g;->SJ: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 2ab27bafbd..3f230b9d95 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 SZ:Lcom/facebook/common/references/CloseableReference;
+.field public final SV: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 Ta:I
+.field public SW:I
 
-.field public Tb:Z
+.field public SX:Z
 
-.field public final Tc:Lcom/facebook/imagepipeline/cache/h$c;
+.field public final SY: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;->SZ:Lcom/facebook/common/references/CloseableReference;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/cache/h$b;->SV:Lcom/facebook/common/references/CloseableReference;
 
     const/4 p1, 0x0
 
-    iput p1, p0, Lcom/facebook/imagepipeline/cache/h$b;->Ta:I
+    iput p1, p0, Lcom/facebook/imagepipeline/cache/h$b;->SW:I
 
-    iput-boolean p1, p0, Lcom/facebook/imagepipeline/cache/h$b;->Tb:Z
+    iput-boolean p1, p0, Lcom/facebook/imagepipeline/cache/h$b;->SX:Z
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/cache/h$b;->Tc:Lcom/facebook/imagepipeline/cache/h$c;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/cache/h$b;->SY: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 ce396eaf49..5421bd42c2 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 SL:Lcom/facebook/imagepipeline/cache/t;
+.field private final SH: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 SO:Lcom/facebook/imagepipeline/cache/g;
+.field final SK: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 SQ:Lcom/facebook/imagepipeline/cache/g;
+.field final SL: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 SR:Ljava/util/Map;
+.field final SM:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -72,9 +72,9 @@
     .end annotation
 .end field
 
-.field private final SS:Lcom/facebook/imagepipeline/cache/h$a;
+.field private final SN:Lcom/facebook/imagepipeline/cache/h$a;
 
-.field private final ST:Lcom/facebook/common/d/l;
+.field private final SO: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 SU:Lcom/facebook/imagepipeline/cache/MemoryCacheParams;
+.field protected SQ:Lcom/facebook/imagepipeline/cache/MemoryCacheParams;
 
-.field private SV:J
+.field private SR:J
 
 
 # direct methods
@@ -110,9 +110,9 @@
 
     invoke-direct {v0}, Ljava/util/WeakHashMap;-><init>()V
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->SR:Ljava/util/Map;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->SM:Ljava/util/Map;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/cache/h;->SL:Lcom/facebook/imagepipeline/cache/t;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/cache/h;->SH: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;->SO:Lcom/facebook/imagepipeline/cache/g;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->SK: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;->SQ:Lcom/facebook/imagepipeline/cache/g;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->SL:Lcom/facebook/imagepipeline/cache/g;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/cache/h;->SS:Lcom/facebook/imagepipeline/cache/h$a;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/cache/h;->SN:Lcom/facebook/imagepipeline/cache/h$a;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/cache/h;->ST:Lcom/facebook/common/d/l;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/cache/h;->SO:Lcom/facebook/common/d/l;
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/cache/h;->ST:Lcom/facebook/common/d/l;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/cache/h;->SO: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;->SU:Lcom/facebook/imagepipeline/cache/MemoryCacheParams;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/cache/h;->SQ: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;->SV:J
+    iput-wide p1, p0, Lcom/facebook/imagepipeline/cache/h;->SR:J
 
     return-void
 .end method
@@ -168,25 +168,25 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->SL:Lcom/facebook/imagepipeline/cache/t;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->SH: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;->SU:Lcom/facebook/imagepipeline/cache/MemoryCacheParams;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->SQ:Lcom/facebook/imagepipeline/cache/MemoryCacheParams;
 
-    iget v0, v0, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->Tk:I
+    iget v0, v0, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->Tg:I
 
     if-gt p1, v0, :cond_0
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->it()I
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->ir()I
 
     move-result v0
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/h;->SU:Lcom/facebook/imagepipeline/cache/MemoryCacheParams;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/h;->SQ:Lcom/facebook/imagepipeline/cache/MemoryCacheParams;
 
-    iget v1, v1, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->Th:I
+    iget v1, v1, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->Td:I
 
     const/4 v2, 0x1
 
@@ -194,13 +194,13 @@
 
     if-gt v0, v1, :cond_0
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->iu()I
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->is()I
 
     move-result v0
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/h;->SU:Lcom/facebook/imagepipeline/cache/MemoryCacheParams;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/h;->SQ:Lcom/facebook/imagepipeline/cache/MemoryCacheParams;
 
-    iget v1, v1, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->Tg:I
+    iget v1, v1, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->Tc: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;->SZ:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/cache/h$b;->SV: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;->Tc:Lcom/facebook/imagepipeline/cache/h$c;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/cache/h$b;->SY:Lcom/facebook/imagepipeline/cache/h$c;
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/cache/h$b;->Tc:Lcom/facebook/imagepipeline/cache/h$c;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/cache/h$b;->SY: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;->ir()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->ip()V
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->is()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->iq()V
 
     return-void
 
@@ -457,15 +457,15 @@
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p1, Lcom/facebook/imagepipeline/cache/h$b;->Tb:Z
+    iget-boolean v0, p1, Lcom/facebook/imagepipeline/cache/h$b;->SX:Z
 
     if-nez v0, :cond_0
 
-    iget v0, p1, Lcom/facebook/imagepipeline/cache/h$b;->Ta:I
+    iget v0, p1, Lcom/facebook/imagepipeline/cache/h$b;->SW:I
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->SO:Lcom/facebook/imagepipeline/cache/g;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->SK: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;->Tc:Lcom/facebook/imagepipeline/cache/h$c;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h$b;->SY:Lcom/facebook/imagepipeline/cache/h$c;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h$b;->Tc:Lcom/facebook/imagepipeline/cache/h$c;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h$b;->SY: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;->Tb:Z
+    iget-boolean v0, p1, Lcom/facebook/imagepipeline/cache/h$b;->SX: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;->Tb:Z
+    iput-boolean v1, p1, Lcom/facebook/imagepipeline/cache/h$b;->SX: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;->Tb:Z
+    iget-boolean v0, p1, Lcom/facebook/imagepipeline/cache/h$b;->SX: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;->Ta:I
+    iget v0, p1, Lcom/facebook/imagepipeline/cache/h$b;->SW:I
 
     add-int/2addr v0, v1
 
-    iput v0, p1, Lcom/facebook/imagepipeline/cache/h$b;->Ta:I
+    iput v0, p1, Lcom/facebook/imagepipeline/cache/h$b;->SW: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;->Ta:I
+    iget v0, p1, Lcom/facebook/imagepipeline/cache/h$b;->SW: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;->Ta:I
+    iget v0, p1, Lcom/facebook/imagepipeline/cache/h$b;->SW:I
 
     sub-int/2addr v0, v1
 
-    iput v0, p1, Lcom/facebook/imagepipeline/cache/h$b;->Ta:I
+    iput v0, p1, Lcom/facebook/imagepipeline/cache/h$b;->SW: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;->Tb:Z
+    iget-boolean v0, p1, Lcom/facebook/imagepipeline/cache/h$b;->SX:Z
 
     if-eqz v0, :cond_0
 
-    iget v0, p1, Lcom/facebook/imagepipeline/cache/h$b;->Ta:I
+    iget v0, p1, Lcom/facebook/imagepipeline/cache/h$b;->SW:I
 
     if-nez v0, :cond_0
 
-    iget-object p1, p1, Lcom/facebook/imagepipeline/cache/h$b;->SZ:Lcom/facebook/common/references/CloseableReference;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/cache/h$b;->SV: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 ir()V
+.method private declared-synchronized ip()V
     .locals 5
 
     monitor-enter p0
 
     :try_start_0
-    iget-wide v0, p0, Lcom/facebook/imagepipeline/cache/h;->SV:J
+    iget-wide v0, p0, Lcom/facebook/imagepipeline/cache/h;->SR:J
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/cache/h;->SU:Lcom/facebook/imagepipeline/cache/MemoryCacheParams;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/cache/h;->SQ:Lcom/facebook/imagepipeline/cache/MemoryCacheParams;
 
-    iget-wide v2, v2, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->Tl:J
+    iget-wide v2, v2, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->Th:J
 
     add-long/2addr v0, v2
 
@@ -820,9 +820,9 @@
 
     move-result-wide v0
 
-    iput-wide v0, p0, Lcom/facebook/imagepipeline/cache/h;->SV:J
+    iput-wide v0, p0, Lcom/facebook/imagepipeline/cache/h;->SR:J
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->ST:Lcom/facebook/common/d/l;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->SO: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;->SU:Lcom/facebook/imagepipeline/cache/MemoryCacheParams;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->SQ: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 is()V
+.method private iq()V
     .locals 4
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->SU:Lcom/facebook/imagepipeline/cache/MemoryCacheParams;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->SQ:Lcom/facebook/imagepipeline/cache/MemoryCacheParams;
 
-    iget v0, v0, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->Tj:I
+    iget v0, v0, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->Tf:I
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/h;->SU:Lcom/facebook/imagepipeline/cache/MemoryCacheParams;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/h;->SQ:Lcom/facebook/imagepipeline/cache/MemoryCacheParams;
 
-    iget v1, v1, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->Th:I
+    iget v1, v1, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->Td:I
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->it()I
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->ir()I
 
     move-result v2
 
@@ -870,15 +870,15 @@
 
     move-result v0
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/h;->SU:Lcom/facebook/imagepipeline/cache/MemoryCacheParams;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/h;->SQ:Lcom/facebook/imagepipeline/cache/MemoryCacheParams;
 
-    iget v1, v1, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->Ti:I
+    iget v1, v1, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->Te:I
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/cache/h;->SU:Lcom/facebook/imagepipeline/cache/MemoryCacheParams;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/cache/h;->SQ:Lcom/facebook/imagepipeline/cache/MemoryCacheParams;
 
-    iget v2, v2, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->Tg:I
+    iget v2, v2, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->Tc:I
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->iu()I
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->is()I
 
     move-result v3
 
@@ -915,19 +915,19 @@
     throw v0
 .end method
 
-.method private declared-synchronized it()I
+.method private declared-synchronized ir()I
     .locals 2
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->SQ:Lcom/facebook/imagepipeline/cache/g;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->SL: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;->SO:Lcom/facebook/imagepipeline/cache/g;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/h;->SK: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 iu()I
+.method private declared-synchronized is()I
     .locals 2
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->SQ:Lcom/facebook/imagepipeline/cache/g;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->SL:Lcom/facebook/imagepipeline/cache/g;
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/cache/g;->fI()I
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/cache/g;->fG()I
 
     move-result v0
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/h;->SO:Lcom/facebook/imagepipeline/cache/g;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/h;->SK:Lcom/facebook/imagepipeline/cache/g;
 
-    invoke-virtual {v1}, Lcom/facebook/imagepipeline/cache/g;->fI()I
+    invoke-virtual {v1}, Lcom/facebook/imagepipeline/cache/g;->fG()I
 
     move-result v1
     :try_end_0
@@ -1010,7 +1010,7 @@
 
     move-result p2
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->SO:Lcom/facebook/imagepipeline/cache/g;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->SK: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;->SO:Lcom/facebook/imagepipeline/cache/g;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->SK:Lcom/facebook/imagepipeline/cache/g;
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/cache/g;->fI()I
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/cache/g;->fG()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;->SO:Lcom/facebook/imagepipeline/cache/g;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/h;->SK: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;->SO:Lcom/facebook/imagepipeline/cache/g;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/h;->SK:Lcom/facebook/imagepipeline/cache/g;
 
-    invoke-virtual {v1}, Lcom/facebook/imagepipeline/cache/g;->fI()I
+    invoke-virtual {v1}, Lcom/facebook/imagepipeline/cache/g;->fG()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;->SO:Lcom/facebook/imagepipeline/cache/g;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/h;->SK:Lcom/facebook/imagepipeline/cache/g;
 
-    invoke-virtual {v1}, Lcom/facebook/imagepipeline/cache/g;->iq()Ljava/lang/Object;
+    invoke-virtual {v1}, Lcom/facebook/imagepipeline/cache/g;->io()Ljava/lang/Object;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/cache/h;->SO:Lcom/facebook/imagepipeline/cache/g;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/cache/h;->SK: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;->SQ:Lcom/facebook/imagepipeline/cache/g;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/cache/h;->SL: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;->SO:Lcom/facebook/imagepipeline/cache/g;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->SK: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;->SQ:Lcom/facebook/imagepipeline/cache/g;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/h;->SL: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;->ir()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->ip()V
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->is()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->iq()V
 
     return-object p1
 
@@ -1194,7 +1194,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->SO:Lcom/facebook/imagepipeline/cache/g;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->SK: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;->SQ:Lcom/facebook/imagepipeline/cache/g;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/cache/h;->SL: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;->Ta:I
+    iget v3, p1, Lcom/facebook/imagepipeline/cache/h$b;->SW: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;->SZ:Lcom/facebook/common/references/CloseableReference;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/cache/h$b;->SV: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;->ir()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->ip()V
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->SO:Lcom/facebook/imagepipeline/cache/g;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->SK: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;->SQ:Lcom/facebook/imagepipeline/cache/g;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/h;->SL: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;->SQ:Lcom/facebook/imagepipeline/cache/g;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/cache/h;->SL: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;->is()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->iq()V
 
     return-object v2
 
@@ -1397,13 +1397,13 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->SO:Lcom/facebook/imagepipeline/cache/g;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->SK: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;->SQ:Lcom/facebook/imagepipeline/cache/g;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/h;->SL: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;->ir()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->ip()V
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->is()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->iq()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;->SQ:Lcom/facebook/imagepipeline/cache/g;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->SL: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 b449a4bb8c..1530e070ad 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 GI:Ljava/lang/Class;
+.field private static final GE:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field private Tn:Ljava/util/Map;
+.field private Tj: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;->GI:Ljava/lang/Class;
+    sput-object v0, Lcom/facebook/imagepipeline/cache/s;->GE: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;->Tn:Ljava/util/Map;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/cache/s;->Tj:Ljava/util/Map;
 
     return-void
 .end method
 
-.method public static ix()Lcom/facebook/imagepipeline/cache/s;
+.method public static iv()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 iy()V
+.method private declared-synchronized iw()V
     .locals 3
 
     monitor-enter p0
 
     :try_start_0
-    sget-object v0, Lcom/facebook/imagepipeline/cache/s;->GI:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/imagepipeline/cache/s;->GE:Ljava/lang/Class;
 
     const-string v1, "Count = %d"
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/cache/s;->Tn:Ljava/util/Map;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/cache/s;->Tj: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;->Tn:Ljava/util/Map;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/s;->Tj: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;->iy()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/s;->iw()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;->Tn:Ljava/util/Map;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/s;->Tj: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;->Wd:Lcom/facebook/common/references/CloseableReference;
+    iget-object v2, v0, Lcom/facebook/imagepipeline/g/e;->VZ: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;->Wd:Lcom/facebook/common/references/CloseableReference;
+    iget-object p2, p2, Lcom/facebook/imagepipeline/g/e;->VZ: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;->Tn:Ljava/util/Map;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/s;->Tj: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;->iy()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/s;->iw()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;->Tn:Ljava/util/Map;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/s;->Tj: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;->Tn:Ljava/util/Map;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/s;->Tj: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;->Tn:Ljava/util/Map;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/s;->Tj: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;->GI:Ljava/lang/Class;
+    sget-object v1, Lcom/facebook/imagepipeline/cache/s;->GE: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;->fL()Ljava/lang/String;
+    invoke-interface {p1}, Lcom/facebook/cache/common/CacheKey;->fJ()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 4ab682f3d3..5fa56e48f5 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 VL:Lcom/facebook/imagepipeline/e/c;
+.field final VH:Lcom/facebook/imagepipeline/e/c;
 
-.field final VM:Lcom/facebook/imagepipeline/e/c;
+.field final VI:Lcom/facebook/imagepipeline/e/c;
 
-.field private final VN:Lcom/facebook/imagepipeline/e/c;
+.field private final VJ:Lcom/facebook/imagepipeline/e/c;
 
-.field private final VO:Ljava/util/Map;
+.field private final VK:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -27,7 +27,7 @@
     .end annotation
 .end field
 
-.field private final Vo:Lcom/facebook/imagepipeline/platform/f;
+.field private final Vk: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;->VN:Lcom/facebook/imagepipeline/e/c;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/e/b;->VJ:Lcom/facebook/imagepipeline/e/c;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/e/b;->VL:Lcom/facebook/imagepipeline/e/c;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/e/b;->VH:Lcom/facebook/imagepipeline/e/c;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/e/b;->VM:Lcom/facebook/imagepipeline/e/c;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/e/b;->VI:Lcom/facebook/imagepipeline/e/c;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/e/b;->Vo:Lcom/facebook/imagepipeline/platform/f;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/e/b;->Vk:Lcom/facebook/imagepipeline/platform/f;
 
-    iput-object p4, p0, Lcom/facebook/imagepipeline/e/b;->VO:Ljava/util/Map;
+    iput-object p4, p0, Lcom/facebook/imagepipeline/e/b;->VK: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;->kK()Z
+    invoke-interface {p0}, Lcom/facebook/imagepipeline/l/a;->kI()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;->Tx:Lcom/facebook/imagepipeline/e/c;
+    iget-object v0, p4, Lcom/facebook/imagepipeline/a/b;->Tt:Lcom/facebook/imagepipeline/e/c;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p4, Lcom/facebook/imagepipeline/a/b;->Tx:Lcom/facebook/imagepipeline/e/c;
+    iget-object v0, p4, Lcom/facebook/imagepipeline/a/b;->Tt: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;->jr()Lcom/facebook/e/c;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->jp()Lcom/facebook/e/c;
 
     move-result-object v0
 
     if-eqz v0, :cond_1
 
-    sget-object v1, Lcom/facebook/e/c;->Rj:Lcom/facebook/e/c;
+    sget-object v1, Lcom/facebook/e/c;->Rf: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;->Wf:Lcom/facebook/e/c;
+    iput-object v0, p1, Lcom/facebook/imagepipeline/g/e;->Wb:Lcom/facebook/e/c;
 
     :cond_2
-    iget-object v1, p0, Lcom/facebook/imagepipeline/e/b;->VO:Ljava/util/Map;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/e/b;->VK: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;->VN:Lcom/facebook/imagepipeline/e/c;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/e/b;->VJ: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;->Vo:Lcom/facebook/imagepipeline/platform/f;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/e/b;->Vk:Lcom/facebook/imagepipeline/platform/f;
 
-    iget-object v1, p2, Lcom/facebook/imagepipeline/a/b;->Tw:Landroid/graphics/Bitmap$Config;
+    iget-object v1, p2, Lcom/facebook/imagepipeline/a/b;->Ts:Landroid/graphics/Bitmap$Config;
 
-    iget-object v2, p2, Lcom/facebook/imagepipeline/a/b;->Tz:Landroid/graphics/ColorSpace;
+    iget-object v2, p2, Lcom/facebook/imagepipeline/a/b;->Tv: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;->Ty:Lcom/facebook/imagepipeline/l/a;
+    iget-object p2, p2, Lcom/facebook/imagepipeline/a/b;->Tu: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;->Wj:Lcom/facebook/imagepipeline/g/h;
+    sget-object v1, Lcom/facebook/imagepipeline/g/g;->Wf:Lcom/facebook/imagepipeline/g/h;
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->js()I
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->jq()I
 
     move-result v2
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->jt()I
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->jr()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;->Vo:Lcom/facebook/imagepipeline/platform/f;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/e/b;->Vk:Lcom/facebook/imagepipeline/platform/f;
 
-    iget-object v2, p4, Lcom/facebook/imagepipeline/a/b;->Tw:Landroid/graphics/Bitmap$Config;
+    iget-object v2, p4, Lcom/facebook/imagepipeline/a/b;->Ts:Landroid/graphics/Bitmap$Config;
 
-    iget-object v5, p4, Lcom/facebook/imagepipeline/a/b;->Tz:Landroid/graphics/ColorSpace;
+    iget-object v5, p4, Lcom/facebook/imagepipeline/a/b;->Tv: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;->Ty:Lcom/facebook/imagepipeline/l/a;
+    iget-object p4, p4, Lcom/facebook/imagepipeline/a/b;->Tu: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;->js()I
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->jq()I
 
     move-result v0
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->jt()I
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->jr()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 192a1940e5..548a8e1e33 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 jm()Landroid/graphics/Bitmap;
+.method public abstract jk()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 fb309fb483..748855e707 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 fI()I
+.method public abstract fG()I
 .end method
 
 .method protected finalize()V
@@ -103,10 +103,10 @@
     return v0
 .end method
 
-.method public jn()Lcom/facebook/imagepipeline/g/h;
+.method public jl()Lcom/facebook/imagepipeline/g/h;
     .locals 1
 
-    sget-object v0, Lcom/facebook/imagepipeline/g/g;->Wj:Lcom/facebook/imagepipeline/g/h;
+    sget-object v0, Lcom/facebook/imagepipeline/g/g;->Wf: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 076f244f96..22b0e72a6c 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 Nv:I
+.field public final Nr:I
 
-.field public final Nw:I
+.field public final Ns:I
 
-.field private Wb:Lcom/facebook/common/references/CloseableReference;
+.field private VX: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 Wc:Lcom/facebook/imagepipeline/g/h;
+.field private final VY: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;->Wb:Lcom/facebook/common/references/CloseableReference;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/g/d;->VX:Lcom/facebook/common/references/CloseableReference;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/g/d;->Wc:Lcom/facebook/imagepipeline/g/h;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/g/d;->VY:Lcom/facebook/imagepipeline/g/h;
 
     const/4 p1, 0x0
 
-    iput p1, p0, Lcom/facebook/imagepipeline/g/d;->Nv:I
+    iput p1, p0, Lcom/facebook/imagepipeline/g/d;->Nr:I
 
-    iput p1, p0, Lcom/facebook/imagepipeline/g/d;->Nw:I
+    iput p1, p0, Lcom/facebook/imagepipeline/g/d;->Ns: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;->gs()Lcom/facebook/common/references/CloseableReference;
+    invoke-virtual {p1}, Lcom/facebook/common/references/CloseableReference;->gq()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;->Wb:Lcom/facebook/common/references/CloseableReference;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/g/d;->VX:Lcom/facebook/common/references/CloseableReference;
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/g/d;->Wb:Lcom/facebook/common/references/CloseableReference;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/g/d;->VX: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;->Wc:Lcom/facebook/imagepipeline/g/h;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/g/d;->VY:Lcom/facebook/imagepipeline/g/h;
 
-    iput p3, p0, Lcom/facebook/imagepipeline/g/d;->Nv:I
+    iput p3, p0, Lcom/facebook/imagepipeline/g/d;->Nr:I
 
-    iput p4, p0, Lcom/facebook/imagepipeline/g/d;->Nw:I
+    iput p4, p0, Lcom/facebook/imagepipeline/g/d;->Ns:I
 
     return-void
 .end method
@@ -202,7 +202,7 @@
     return p0
 .end method
 
-.method private declared-synchronized jo()Lcom/facebook/common/references/CloseableReference;
+.method private declared-synchronized jm()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;->Wb:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/g/d;->VX:Lcom/facebook/common/references/CloseableReference;
 
     const/4 v1, 0x0
 
-    iput-object v1, p0, Lcom/facebook/imagepipeline/g/d;->Wb:Lcom/facebook/common/references/CloseableReference;
+    iput-object v1, p0, Lcom/facebook/imagepipeline/g/d;->VX: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;->jo()Lcom/facebook/common/references/CloseableReference;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/g/d;->jm()Lcom/facebook/common/references/CloseableReference;
 
     move-result-object v0
 
@@ -255,7 +255,7 @@
     return-void
 .end method
 
-.method public final fI()I
+.method public final fG()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;->Nv:I
+    iget v0, p0, Lcom/facebook/imagepipeline/g/d;->Nr:I
 
     rem-int/lit16 v0, v0, 0xb4
 
     if-nez v0, :cond_1
 
-    iget v0, p0, Lcom/facebook/imagepipeline/g/d;->Nw:I
+    iget v0, p0, Lcom/facebook/imagepipeline/g/d;->Ns:I
 
     const/4 v1, 0x5
 
@@ -311,13 +311,13 @@
 .method public final getWidth()I
     .locals 2
 
-    iget v0, p0, Lcom/facebook/imagepipeline/g/d;->Nv:I
+    iget v0, p0, Lcom/facebook/imagepipeline/g/d;->Nr:I
 
     rem-int/lit16 v0, v0, 0xb4
 
     if-nez v0, :cond_1
 
-    iget v0, p0, Lcom/facebook/imagepipeline/g/d;->Nw:I
+    iget v0, p0, Lcom/facebook/imagepipeline/g/d;->Ns:I
 
     const/4 v1, 0x5
 
@@ -355,7 +355,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/g/d;->Wb:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/g/d;->VX: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 jm()Landroid/graphics/Bitmap;
+.method public final jk()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 jn()Lcom/facebook/imagepipeline/g/h;
+.method public final jl()Lcom/facebook/imagepipeline/g/h;
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/g/d;->Wc:Lcom/facebook/imagepipeline/g/h;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/g/d;->VY:Lcom/facebook/imagepipeline/g/h;
 
     return-object v0
 .end method
 
-.method public final declared-synchronized jp()Lcom/facebook/common/references/CloseableReference;
+.method public final declared-synchronized jn()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;->Wb:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/g/d;->VX: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 fdedde83fd..e742551f45 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 Nv:I
+.field public Nr:I
 
-.field public Nw:I
+.field public Ns:I
 
-.field private TH:Landroid/graphics/ColorSpace;
+.field private TD:Landroid/graphics/ColorSpace;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public final Wd:Lcom/facebook/common/references/CloseableReference;
+.field public final VZ: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 We:Lcom/facebook/common/d/l;
+.field public final Wa: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 Wf:Lcom/facebook/e/c;
+.field public Wb:Lcom/facebook/e/c;
 
-.field public Wg:I
+.field public Wc:I
 
-.field private Wh:I
+.field private Wd:I
 
-.field public Wi:Lcom/facebook/imagepipeline/a/a;
+.field public We: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;->Rj:Lcom/facebook/e/c;
+    sget-object v0, Lcom/facebook/e/c;->Rf:Lcom/facebook/e/c;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/g/e;->Wf:Lcom/facebook/e/c;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/g/e;->Wb:Lcom/facebook/e/c;
 
     const/4 v0, -0x1
 
-    iput v0, p0, Lcom/facebook/imagepipeline/g/e;->Nv:I
+    iput v0, p0, Lcom/facebook/imagepipeline/g/e;->Nr:I
 
     const/4 v1, 0x0
 
-    iput v1, p0, Lcom/facebook/imagepipeline/g/e;->Nw:I
+    iput v1, p0, Lcom/facebook/imagepipeline/g/e;->Ns: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;->Wg:I
+    iput v1, p0, Lcom/facebook/imagepipeline/g/e;->Wc:I
 
-    iput v0, p0, Lcom/facebook/imagepipeline/g/e;->Wh:I
+    iput v0, p0, Lcom/facebook/imagepipeline/g/e;->Wd: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;->Wd:Lcom/facebook/common/references/CloseableReference;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/g/e;->VZ:Lcom/facebook/common/references/CloseableReference;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/g/e;->We:Lcom/facebook/common/d/l;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/g/e;->Wa: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;->Wh:I
+    iput p2, p0, Lcom/facebook/imagepipeline/g/e;->Wd:I
 
     return-void
 .end method
@@ -136,17 +136,17 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    sget-object v0, Lcom/facebook/e/c;->Rj:Lcom/facebook/e/c;
+    sget-object v0, Lcom/facebook/e/c;->Rf:Lcom/facebook/e/c;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/g/e;->Wf:Lcom/facebook/e/c;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/g/e;->Wb:Lcom/facebook/e/c;
 
     const/4 v0, -0x1
 
-    iput v0, p0, Lcom/facebook/imagepipeline/g/e;->Nv:I
+    iput v0, p0, Lcom/facebook/imagepipeline/g/e;->Nr:I
 
     const/4 v1, 0x0
 
-    iput v1, p0, Lcom/facebook/imagepipeline/g/e;->Nw:I
+    iput v1, p0, Lcom/facebook/imagepipeline/g/e;->Ns: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;->Wg:I
+    iput v1, p0, Lcom/facebook/imagepipeline/g/e;->Wc:I
 
-    iput v0, p0, Lcom/facebook/imagepipeline/g/e;->Wh:I
+    iput v0, p0, Lcom/facebook/imagepipeline/g/e;->Wd: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;->gr()Lcom/facebook/common/references/CloseableReference;
+    invoke-virtual {p1}, Lcom/facebook/common/references/CloseableReference;->gp()Lcom/facebook/common/references/CloseableReference;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/g/e;->Wd:Lcom/facebook/common/references/CloseableReference;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/g/e;->VZ:Lcom/facebook/common/references/CloseableReference;
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/g/e;->We:Lcom/facebook/common/d/l;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/g/e;->Wa: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;->jq()Lcom/facebook/imagepipeline/g/e;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/g/e;->jo()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;->Nv:I
+    iget v0, p0, Lcom/facebook/imagepipeline/g/e;->Nr:I
 
     if-ltz v0, :cond_0
 
@@ -261,25 +261,25 @@
     return p0
 .end method
 
-.method private jq()Lcom/facebook/imagepipeline/g/e;
+.method private jo()Lcom/facebook/imagepipeline/g/e;
     .locals 3
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/g/e;->We:Lcom/facebook/common/d/l;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/g/e;->Wa: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;->Wh:I
+    iget v2, p0, Lcom/facebook/imagepipeline/g/e;->Wd: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;->Wd:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/g/e;->VZ: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 ju()Landroid/graphics/ColorSpace;
+.method private js()Landroid/graphics/ColorSpace;
     .locals 1
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/g/e;->jw()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/g/e;->ju()V
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/g/e;->TH:Landroid/graphics/ColorSpace;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/g/e;->TD:Landroid/graphics/ColorSpace;
 
     return-object v0
 .end method
 
-.method private jw()V
+.method private ju()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;->jx()V
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/g/e;->jv()V
 
     :cond_1
     return-void
 .end method
 
-.method private jy()Landroid/util/Pair;
+.method private jw()Landroid/util/Pair;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -394,7 +394,7 @@
     return-object v0
 .end method
 
-.method private jz()Lcom/facebook/imageutils/b;
+.method private jx()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;->TH:Landroid/graphics/ColorSpace;
+    iget-object v2, v1, Lcom/facebook/imageutils/b;->TD:Landroid/graphics/ColorSpace;
 
-    iput-object v2, p0, Lcom/facebook/imagepipeline/g/e;->TH:Landroid/graphics/ColorSpace;
+    iput-object v2, p0, Lcom/facebook/imagepipeline/g/e;->TD:Landroid/graphics/ColorSpace;
 
-    iget-object v2, v1, Lcom/facebook/imageutils/b;->aaD:Landroid/util/Pair;
+    iget-object v2, v1, Lcom/facebook/imageutils/b;->aaz: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;->jr()Lcom/facebook/e/c;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->jp()Lcom/facebook/e/c;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/g/e;->Wf:Lcom/facebook/e/c;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/g/e;->Wb: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;->js()I
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->jq()I
 
     move-result v0
 
-    iput v0, p0, Lcom/facebook/imagepipeline/g/e;->Nv:I
+    iput v0, p0, Lcom/facebook/imagepipeline/g/e;->Nr:I
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->jt()I
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->jr()I
 
     move-result v0
 
-    iput v0, p0, Lcom/facebook/imagepipeline/g/e;->Nw:I
+    iput v0, p0, Lcom/facebook/imagepipeline/g/e;->Ns:I
 
-    iget v0, p1, Lcom/facebook/imagepipeline/g/e;->Wg:I
+    iget v0, p1, Lcom/facebook/imagepipeline/g/e;->Wc:I
 
-    iput v0, p0, Lcom/facebook/imagepipeline/g/e;->Wg:I
+    iput v0, p0, Lcom/facebook/imagepipeline/g/e;->Wc:I
 
     invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->getSize()I
 
     move-result v0
 
-    iput v0, p0, Lcom/facebook/imagepipeline/g/e;->Wh:I
+    iput v0, p0, Lcom/facebook/imagepipeline/g/e;->Wd:I
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/g/e;->Wi:Lcom/facebook/imagepipeline/a/a;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/g/e;->We:Lcom/facebook/imagepipeline/a/a;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/g/e;->Wi:Lcom/facebook/imagepipeline/a/a;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/g/e;->We:Lcom/facebook/imagepipeline/a/a;
 
-    invoke-direct {p1}, Lcom/facebook/imagepipeline/g/e;->ju()Landroid/graphics/ColorSpace;
+    invoke-direct {p1}, Lcom/facebook/imagepipeline/g/e;->js()Landroid/graphics/ColorSpace;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/g/e;->TH:Landroid/graphics/ColorSpace;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/g/e;->TD: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;->Wd:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/g/e;->VZ: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;->jw()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/g/e;->ju()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;->We:Lcom/facebook/common/d/l;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/g/e;->Wa: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;->Wd:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/g/e;->VZ: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;->Wd:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/g/e;->VZ: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;->Wd:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/g/e;->VZ: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;->Wh:I
+    iget v0, p0, Lcom/facebook/imagepipeline/g/e;->Wd:I
 
     return v0
 .end method
@@ -644,7 +644,7 @@
 .method public final getWidth()I
     .locals 1
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/g/e;->jw()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/g/e;->ju()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;->Wd:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/g/e;->VZ: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;->We:Lcom/facebook/common/d/l;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/g/e;->Wa: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 jr()Lcom/facebook/e/c;
+.method public final jp()Lcom/facebook/e/c;
     .locals 1
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/g/e;->jw()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/g/e;->ju()V
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/g/e;->Wf:Lcom/facebook/e/c;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/g/e;->Wb:Lcom/facebook/e/c;
 
     return-object v0
 .end method
 
-.method public final js()I
+.method public final jq()I
     .locals 1
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/g/e;->jw()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/g/e;->ju()V
 
-    iget v0, p0, Lcom/facebook/imagepipeline/g/e;->Nv:I
+    iget v0, p0, Lcom/facebook/imagepipeline/g/e;->Nr:I
 
     return v0
 .end method
 
-.method public final jt()I
+.method public final jr()I
     .locals 1
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/g/e;->jw()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/g/e;->ju()V
 
-    iget v0, p0, Lcom/facebook/imagepipeline/g/e;->Nw:I
+    iget v0, p0, Lcom/facebook/imagepipeline/g/e;->Ns:I
 
     return v0
 .end method
 
-.method public final jv()Ljava/lang/String;
+.method public final jt()Ljava/lang/String;
     .locals 7
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/g/e;->Wd:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/g/e;->VZ: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 jx()V
+.method public final jv()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;->Wf:Lcom/facebook/e/c;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/g/e;->Wb: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;->jy()Landroid/util/Pair;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/g/e;->jw()Landroid/util/Pair;
 
     move-result-object v1
 
     goto :goto_0
 
     :cond_0
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/g/e;->jz()Lcom/facebook/imageutils/b;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/g/e;->jx()Lcom/facebook/imageutils/b;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/facebook/imageutils/b;->aaD:Landroid/util/Pair;
+    iget-object v1, v1, Lcom/facebook/imageutils/b;->aaz:Landroid/util/Pair;
 
     :goto_0
-    sget-object v2, Lcom/facebook/e/b;->QY:Lcom/facebook/e/c;
+    sget-object v2, Lcom/facebook/e/b;->QU:Lcom/facebook/e/c;
 
     const/4 v3, -0x1
 
     if-ne v0, v2, :cond_1
 
-    iget v2, p0, Lcom/facebook/imagepipeline/g/e;->Nv:I
+    iget v2, p0, Lcom/facebook/imagepipeline/g/e;->Nr:I
 
     if-ne v2, v3, :cond_1
 
@@ -893,24 +893,24 @@
 
     move-result v0
 
-    iput v0, p0, Lcom/facebook/imagepipeline/g/e;->Nw:I
+    iput v0, p0, Lcom/facebook/imagepipeline/g/e;->Ns:I
 
-    iget v0, p0, Lcom/facebook/imagepipeline/g/e;->Nw:I
+    iget v0, p0, Lcom/facebook/imagepipeline/g/e;->Ns:I
 
     invoke-static {v0}, Lcom/facebook/imageutils/e;->aE(I)I
 
     move-result v0
 
-    iput v0, p0, Lcom/facebook/imagepipeline/g/e;->Nv:I
+    iput v0, p0, Lcom/facebook/imagepipeline/g/e;->Nr:I
 
     return-void
 
     :cond_1
-    sget-object v1, Lcom/facebook/e/b;->Ri:Lcom/facebook/e/c;
+    sget-object v1, Lcom/facebook/e/b;->Re:Lcom/facebook/e/c;
 
     if-ne v0, v1, :cond_2
 
-    iget v0, p0, Lcom/facebook/imagepipeline/g/e;->Nv:I
+    iget v0, p0, Lcom/facebook/imagepipeline/g/e;->Nr:I
 
     if-ne v0, v3, :cond_2
 
@@ -922,22 +922,22 @@
 
     move-result v0
 
-    iput v0, p0, Lcom/facebook/imagepipeline/g/e;->Nw:I
+    iput v0, p0, Lcom/facebook/imagepipeline/g/e;->Ns:I
 
-    iget v0, p0, Lcom/facebook/imagepipeline/g/e;->Nw:I
+    iget v0, p0, Lcom/facebook/imagepipeline/g/e;->Ns:I
 
     invoke-static {v0}, Lcom/facebook/imageutils/e;->aE(I)I
 
     move-result v0
 
-    iput v0, p0, Lcom/facebook/imagepipeline/g/e;->Nv:I
+    iput v0, p0, Lcom/facebook/imagepipeline/g/e;->Nr:I
 
     return-void
 
     :cond_2
     const/4 v0, 0x0
 
-    iput v0, p0, Lcom/facebook/imagepipeline/g/e;->Nv:I
+    iput v0, p0, Lcom/facebook/imagepipeline/g/e;->Nr: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 11bdc1b04a..b60fdc4a8e 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 Wn:Ljava/util/List;
+.field public final Wj: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;->Wn:Ljava/util/List;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/h/b;->Wj: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;->Wn:Ljava/util/List;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/h/b;->Wj: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;->Wn:Ljava/util/List;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/h/b;->Wj: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;->Wn:Ljava/util/List;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/h/b;->Wj: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;->Wn:Ljava/util/List;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/b;->Wj: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;->Wn:Ljava/util/List;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/h/b;->Wj: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;->Wn:Ljava/util/List;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/b;->Wj: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;->Wn:Ljava/util/List;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/h/b;->Wj: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;->Wn:Ljava/util/List;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/b;->Wj: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;->Wn:Ljava/util/List;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/h/b;->Wj: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;->Wn:Ljava/util/List;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/b;->Wj: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;->Wn:Ljava/util/List;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/h/b;->Wj: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;->Wn:Ljava/util/List;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/b;->Wj: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;->Wn:Ljava/util/List;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/h/b;->Wj: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;->Wn:Ljava/util/List;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/b;->Wj: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;->Wn:Ljava/util/List;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/h/b;->Wj: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;->Wn:Ljava/util/List;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/b;->Wj: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;->Wn:Ljava/util/List;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/h/b;->Wj: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;->Wn:Ljava/util/List;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/b;->Wj: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;->Wn:Ljava/util/List;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/h/b;->Wj: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;->Wn:Ljava/util/List;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/b;->Wj: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;->Wn:Ljava/util/List;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/h/b;->Wj: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;->Wn:Ljava/util/List;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/b;->Wj: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;->Wn:Ljava/util/List;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/h/b;->Wj: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;->Wn:Ljava/util/List;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/b;->Wj: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;->Wn:Ljava/util/List;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/h/b;->Wj: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 fd84f28002..aeb78a531a 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 Yq:Lcom/facebook/imagepipeline/i/am;
+.field final synthetic YX:Lcom/facebook/imagepipeline/request/b;
 
-.field final synthetic Yr:Ljava/lang/String;
+.field final synthetic Ym:Lcom/facebook/imagepipeline/i/am;
 
-.field final synthetic Zb:Lcom/facebook/imagepipeline/request/b;
+.field final synthetic Yn:Ljava/lang/String;
 
-.field final synthetic Zf:Lcom/facebook/imagepipeline/i/ac;
+.field final synthetic Zb: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;->Zf:Lcom/facebook/imagepipeline/i/ac;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ac$1;->Zb:Lcom/facebook/imagepipeline/i/ac;
 
-    iput-object p6, p0, Lcom/facebook/imagepipeline/i/ac$1;->Yq:Lcom/facebook/imagepipeline/i/am;
+    iput-object p6, p0, Lcom/facebook/imagepipeline/i/ac$1;->Ym:Lcom/facebook/imagepipeline/i/am;
 
-    iput-object p7, p0, Lcom/facebook/imagepipeline/i/ac$1;->Yr:Ljava/lang/String;
+    iput-object p7, p0, Lcom/facebook/imagepipeline/i/ac$1;->Yn:Ljava/lang/String;
 
-    iput-object p8, p0, Lcom/facebook/imagepipeline/i/ac$1;->Zb:Lcom/facebook/imagepipeline/request/b;
+    iput-object p8, p0, Lcom/facebook/imagepipeline/i/ac$1;->YX: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 kt()Lcom/facebook/common/references/CloseableReference;
+.method private kr()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;->Zf:Lcom/facebook/imagepipeline/i/ac;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ac$1;->Zb:Lcom/facebook/imagepipeline/i/ac;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/i/ac$1;->Zb:Lcom/facebook/imagepipeline/request/b;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/i/ac$1;->YX: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;->Zb:Lcom/facebook/imagepipeline/request/b;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/i/ac$1;->YX:Lcom/facebook/imagepipeline/request/b;
 
-    iget-object v3, v2, Lcom/facebook/imagepipeline/request/b;->St:Lcom/facebook/imagepipeline/a/e;
+    iget-object v3, v2, Lcom/facebook/imagepipeline/request/b;->Sp:Lcom/facebook/imagepipeline/a/e;
 
     const/16 v4, 0x800
 
     if-eqz v3, :cond_0
 
-    iget-object v3, v2, Lcom/facebook/imagepipeline/request/b;->St:Lcom/facebook/imagepipeline/a/e;
+    iget-object v3, v2, Lcom/facebook/imagepipeline/request/b;->Sp: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;->St:Lcom/facebook/imagepipeline/a/e;
+    iget-object v3, v2, Lcom/facebook/imagepipeline/request/b;->Sp:Lcom/facebook/imagepipeline/a/e;
 
     if-eqz v3, :cond_1
 
-    iget-object v2, v2, Lcom/facebook/imagepipeline/request/b;->St:Lcom/facebook/imagepipeline/a/e;
+    iget-object v2, v2, Lcom/facebook/imagepipeline/request/b;->Sp: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;->Zf:Lcom/facebook/imagepipeline/i/ac;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ac$1;->Zb:Lcom/facebook/imagepipeline/i/ac;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/i/ac;->Vu:Landroid/content/ContentResolver;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/i/ac;->Vq:Landroid/content/ContentResolver;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/i/ac$1;->Zb:Lcom/facebook/imagepipeline/request/b;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/i/ac$1;->YX:Lcom/facebook/imagepipeline/request/b;
 
-    iget-object v2, v2, Lcom/facebook/imagepipeline/request/b;->aaf:Landroid/net/Uri;
+    iget-object v2, v2, Lcom/facebook/imagepipeline/request/b;->aab: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;->io()Lcom/facebook/imagepipeline/bitmaps/g;
+    invoke-static {}, Lcom/facebook/imagepipeline/bitmaps/g;->im()Lcom/facebook/imagepipeline/bitmaps/g;
 
     move-result-object v2
 
-    sget-object v3, Lcom/facebook/imagepipeline/g/g;->Wj:Lcom/facebook/imagepipeline/g/h;
+    sget-object v3, Lcom/facebook/imagepipeline/g/g;->Wf: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;->kt()Lcom/facebook/common/references/CloseableReference;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/i/ac$1;->kr()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;->Yq:Lcom/facebook/imagepipeline/i/am;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/ac$1;->Ym:Lcom/facebook/imagepipeline/i/am;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ac$1;->Yr:Ljava/lang/String;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ac$1;->Yn: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;->Yq:Lcom/facebook/imagepipeline/i/am;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ac$1;->Ym:Lcom/facebook/imagepipeline/i/am;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ac$1;->Yr:Ljava/lang/String;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ac$1;->Yn: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 2a802fff61..d344f329c9 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 Vu:Landroid/content/ContentResolver;
+.field final Vq: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;->Vu:Landroid/content/ContentResolver;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/ac;->Vq:Landroid/content/ContentResolver;
 
     return-void
 .end method
@@ -98,7 +98,7 @@
         }
     .end annotation
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->kb()Lcom/facebook/imagepipeline/i/am;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->jZ()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;->ka()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->jY()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;->aaf:Landroid/net/Uri;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/request/b;->aab: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;->kG()Ljava/io/File;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/request/b;->kE()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;->Vu:Landroid/content/ContentResolver;
+    iget-object v5, p0, Lcom/facebook/imagepipeline/i/ac;->Vq: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 c94c4a5551..96b5455458 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 Zh:Ljava/util/concurrent/CopyOnWriteArraySet;
+.field final Zd:Ljava/util/concurrent/CopyOnWriteArraySet;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/CopyOnWriteArraySet<",
@@ -34,7 +34,7 @@
     .end annotation
 .end field
 
-.field Zi:Ljava/io/Closeable;
+.field Ze:Ljava/io/Closeable;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TT;"
@@ -45,16 +45,16 @@
     .end annotation
 .end field
 
-.field Zj:F
+.field Zf:F
 
-.field private Zk:I
+.field private Zg:I
 
-.field Zl:Lcom/facebook/imagepipeline/i/d;
+.field Zh:Lcom/facebook/imagepipeline/i/d;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field Zm:Lcom/facebook/imagepipeline/i/ad$a$a;
+.field Zi: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 Zn:Lcom/facebook/imagepipeline/i/ad;
+.field final synthetic Zj: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;->Zn:Lcom/facebook/imagepipeline/i/ad;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zj: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;->Zh:Ljava/util/concurrent/CopyOnWriteArraySet;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zd:Ljava/util/concurrent/CopyOnWriteArraySet;
 
     iput-object p2, p0, Lcom/facebook/imagepipeline/i/ad$a;->mKey:Ljava/lang/Object;
 
@@ -127,75 +127,13 @@
     return-void
 .end method
 
-.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
+.method private declared-synchronized ku()Z
     .locals 2
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zh:Ljava/util/concurrent/CopyOnWriteArraySet;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zd:Ljava/util/concurrent/CopyOnWriteArraySet;
 
     invoke-virtual {v0}, Ljava/util/concurrent/CopyOnWriteArraySet;->iterator()Ljava/util/Iterator;
 
@@ -218,7 +156,7 @@
 
     check-cast v1, Lcom/facebook/imagepipeline/i/ak;
 
-    invoke-interface {v1}, Lcom/facebook/imagepipeline/i/ak;->kd()Z
+    invoke-interface {v1}, Lcom/facebook/imagepipeline/i/ak;->kb()Z
 
     move-result v1
     :try_end_0
@@ -253,13 +191,13 @@
     goto :goto_0
 .end method
 
-.method private declared-synchronized ky()Z
+.method private declared-synchronized kw()Z
     .locals 2
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zh:Ljava/util/concurrent/CopyOnWriteArraySet;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zd:Ljava/util/concurrent/CopyOnWriteArraySet;
 
     invoke-virtual {v0}, Ljava/util/concurrent/CopyOnWriteArraySet;->iterator()Ljava/util/Iterator;
 
@@ -282,7 +220,7 @@
 
     check-cast v1, Lcom/facebook/imagepipeline/i/ak;
 
-    invoke-interface {v1}, Lcom/facebook/imagepipeline/i/ak;->kf()Z
+    invoke-interface {v1}, Lcom/facebook/imagepipeline/i/ak;->kd()Z
 
     move-result v1
     :try_end_0
@@ -317,6 +255,68 @@
     goto :goto_0
 .end method
 
+.method private declared-synchronized ky()Lcom/facebook/imagepipeline/a/d;
+    .locals 3
+
+    monitor-enter p0
+
+    :try_start_0
+    sget-object v0, Lcom/facebook/imagepipeline/a/d;->TE:Lcom/facebook/imagepipeline/a/d;
+
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zd: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;->kc()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;->Zm:Lcom/facebook/imagepipeline/i/ad$a$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zi: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;->Zi:Ljava/io/Closeable;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/ad$a;->Ze: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;->Zi:Ljava/io/Closeable;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ad$a;->Ze:Ljava/io/Closeable;
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zh:Ljava/util/concurrent/CopyOnWriteArraySet;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zd: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;->Zn:Lcom/facebook/imagepipeline/i/ad;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zj: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;->Zi:Ljava/io/Closeable;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a;->Ze:Ljava/io/Closeable;
 
-    iput p3, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zk:I
+    iput p3, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zg:I
 
     goto :goto_0
 
     :cond_1
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zh:Ljava/util/concurrent/CopyOnWriteArraySet;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zd:Ljava/util/concurrent/CopyOnWriteArraySet;
 
     invoke-virtual {v0}, Ljava/util/concurrent/CopyOnWriteArraySet;->clear()V
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zn:Lcom/facebook/imagepipeline/i/ad;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zj: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;->Zn:Lcom/facebook/imagepipeline/i/ad;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zj: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;->Zh:Ljava/util/concurrent/CopyOnWriteArraySet;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zd: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;->kv()Ljava/util/List;
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/ad$a;->kt()Ljava/util/List;
 
     move-result-object v1
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/ad$a;->kz()Ljava/util/List;
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/ad$a;->kx()Ljava/util/List;
 
     move-result-object v2
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/ad$a;->kx()Ljava/util/List;
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/ad$a;->kv()Ljava/util/List;
 
     move-result-object v3
 
-    iget-object v4, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zi:Ljava/io/Closeable;
+    iget-object v4, p0, Lcom/facebook/imagepipeline/i/ad$a;->Ze:Ljava/io/Closeable;
 
-    iget v5, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zj:F
+    iget v5, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zf:F
 
-    iget v6, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zk:I
+    iget v6, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zg: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;->Zi:Ljava/io/Closeable;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ad$a;->Ze: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;->Zn:Lcom/facebook/imagepipeline/i/ad;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zj: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 ku()V
+.method final ks()V
     .locals 12
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zl:Lcom/facebook/imagepipeline/i/d;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zh: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;->Zm:Lcom/facebook/imagepipeline/i/ad$a$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zi: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;->Zh:Ljava/util/concurrent/CopyOnWriteArraySet;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zd: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;->Zn:Lcom/facebook/imagepipeline/i/ad;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zj: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;->Zh:Ljava/util/concurrent/CopyOnWriteArraySet;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zd: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;->ka()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/ak;->jY()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;->kb()Lcom/facebook/imagepipeline/i/am;
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/ak;->jZ()Lcom/facebook/imagepipeline/i/am;
 
     move-result-object v6
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/ak;->hn()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/ak;->hl()Ljava/lang/Object;
 
     move-result-object v7
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/ak;->kc()Lcom/facebook/imagepipeline/request/b$b;
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/ak;->ka()Lcom/facebook/imagepipeline/request/b$b;
 
     move-result-object v8
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/i/ad$a;->kw()Z
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/i/ad$a;->ku()Z
 
     move-result v9
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/i/ad$a;->ky()Z
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/i/ad$a;->kw()Z
 
     move-result v10
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/i/ad$a;->kA()Lcom/facebook/imagepipeline/a/d;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/i/ad$a;->ky()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;->Zl:Lcom/facebook/imagepipeline/i/d;
+    iput-object v1, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zh: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;->Zm:Lcom/facebook/imagepipeline/i/ad$a$a;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zi:Lcom/facebook/imagepipeline/i/ad$a$a;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zl:Lcom/facebook/imagepipeline/i/d;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zh:Lcom/facebook/imagepipeline/i/d;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zm:Lcom/facebook/imagepipeline/i/ad$a$a;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zi: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;->Zn:Lcom/facebook/imagepipeline/i/ad;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zj:Lcom/facebook/imagepipeline/i/ad;
 
-    iget-object v2, v2, Lcom/facebook/imagepipeline/i/ad;->XO:Lcom/facebook/imagepipeline/i/aj;
+    iget-object v2, v2, Lcom/facebook/imagepipeline/i/ad;->XK: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,6 +749,61 @@
     throw v0
 .end method
 
+.method final declared-synchronized kt()Ljava/util/List;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/List<",
+            "Lcom/facebook/imagepipeline/i/al;",
+            ">;"
+        }
+    .end annotation
+
+    .annotation runtime Ljavax/annotation/Nullable;
+    .end annotation
+
+    monitor-enter p0
+
+    :try_start_0
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zh:Lcom/facebook/imagepipeline/i/d;
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    if-nez v0, :cond_0
+
+    const/4 v0, 0x0
+
+    monitor-exit p0
+
+    return-object v0
+
+    :cond_0
+    :try_start_1
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zh:Lcom/facebook/imagepipeline/i/d;
+
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/i/ad$a;->ku()Z
+
+    move-result v1
+
+    invoke-virtual {v0, v1}, Lcom/facebook/imagepipeline/i/d;->x(Z)Ljava/util/List;
+
+    move-result-object v0
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    monitor-exit p0
+
+    return-object v0
+
+    :catchall_0
+    move-exception v0
+
+    monitor-exit p0
+
+    throw v0
+.end method
+
 .method final declared-synchronized kv()Ljava/util/List;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
@@ -766,7 +821,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zl:Lcom/facebook/imagepipeline/i/d;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zh:Lcom/facebook/imagepipeline/i/d;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -780,13 +835,13 @@
 
     :cond_0
     :try_start_1
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zl:Lcom/facebook/imagepipeline/i/d;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zh:Lcom/facebook/imagepipeline/i/d;
 
     invoke-direct {p0}, Lcom/facebook/imagepipeline/i/ad$a;->kw()Z
 
     move-result v1
 
-    invoke-virtual {v0, v1}, Lcom/facebook/imagepipeline/i/d;->x(Z)Ljava/util/List;
+    invoke-virtual {v0, v1}, Lcom/facebook/imagepipeline/i/d;->y(Z)Ljava/util/List;
 
     move-result-object v0
     :try_end_1
@@ -821,7 +876,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zl:Lcom/facebook/imagepipeline/i/d;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zh:Lcom/facebook/imagepipeline/i/d;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -835,64 +890,9 @@
 
     :cond_0
     :try_start_1
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zl:Lcom/facebook/imagepipeline/i/d;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zh:Lcom/facebook/imagepipeline/i/d;
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/i/ad$a;->ky()Z
-
-    move-result v1
-
-    invoke-virtual {v0, v1}, Lcom/facebook/imagepipeline/i/d;->y(Z)Ljava/util/List;
-
-    move-result-object v0
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    monitor-exit p0
-
-    return-object v0
-
-    :catchall_0
-    move-exception v0
-
-    monitor-exit p0
-
-    throw v0
-.end method
-
-.method final declared-synchronized kz()Ljava/util/List;
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Ljava/util/List<",
-            "Lcom/facebook/imagepipeline/i/al;",
-            ">;"
-        }
-    .end annotation
-
-    .annotation runtime Ljavax/annotation/Nullable;
-    .end annotation
-
-    monitor-enter p0
-
-    :try_start_0
-    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
-
-    if-nez v0, :cond_0
-
-    const/4 v0, 0x0
-
-    monitor-exit p0
-
-    return-object v0
-
-    :cond_0
-    :try_start_1
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zl:Lcom/facebook/imagepipeline/i/d;
-
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/i/ad$a;->kA()Lcom/facebook/imagepipeline/a/d;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/i/ad$a;->ky()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 0a728511a7..a03f173d50 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 Iy:Lcom/facebook/common/g/a;
+.field final Iu:Lcom/facebook/common/g/a;
 
-.field final Sl:Lcom/facebook/common/g/g;
+.field final Sh:Lcom/facebook/common/g/g;
 
-.field final Uz:Lcom/facebook/imagepipeline/i/af;
+.field final Uv: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;->Sl:Lcom/facebook/common/g/g;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ae;->Sh:Lcom/facebook/common/g/g;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/i/ae;->Iy:Lcom/facebook/common/g/a;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/ae;->Iu:Lcom/facebook/common/g/a;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/i/ae;->Uz:Lcom/facebook/imagepipeline/i/af;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/i/ae;->Uv:Lcom/facebook/imagepipeline/i/af;
 
     return-void
 .end method
@@ -58,7 +58,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/facebook/common/g/i;->gq()Lcom/facebook/common/g/f;
+    invoke-virtual {p0}, Lcom/facebook/common/g/i;->go()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;->Wi:Lcom/facebook/imagepipeline/a/a;
+    iput-object p2, v1, Lcom/facebook/imagepipeline/g/e;->We:Lcom/facebook/imagepipeline/a/a;
 
-    invoke-virtual {v1}, Lcom/facebook/imagepipeline/g/e;->jx()V
+    invoke-virtual {v1}, Lcom/facebook/imagepipeline/g/e;->jv()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;->kb()Lcom/facebook/imagepipeline/i/am;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->jZ()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;->Uz:Lcom/facebook/imagepipeline/i/af;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ae;->Uv: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;->Uz:Lcom/facebook/imagepipeline/i/af;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/i/ae;->Uv: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 4f6ea41902..8f12f95878 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 Iy:Lcom/facebook/common/g/a;
+.field private final Iu:Lcom/facebook/common/g/a;
 
-.field private final Sl:Lcom/facebook/common/g/g;
+.field private final Sh:Lcom/facebook/common/g/g;
 
-.field private final Vw:Lcom/facebook/imagepipeline/cache/e;
+.field private final Vs:Lcom/facebook/imagepipeline/cache/e;
 
-.field private final Zu:Lcom/facebook/cache/common/CacheKey;
+.field private final Zq:Lcom/facebook/cache/common/CacheKey;
 
-.field private final Zv:Lcom/facebook/imagepipeline/g/e;
+.field private final Zr: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;->Vw:Lcom/facebook/imagepipeline/cache/e;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/ag$a;->Vs:Lcom/facebook/imagepipeline/cache/e;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/i/ag$a;->Zu:Lcom/facebook/cache/common/CacheKey;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/i/ag$a;->Zq:Lcom/facebook/cache/common/CacheKey;
 
-    iput-object p4, p0, Lcom/facebook/imagepipeline/i/ag$a;->Sl:Lcom/facebook/common/g/g;
+    iput-object p4, p0, Lcom/facebook/imagepipeline/i/ag$a;->Sh:Lcom/facebook/common/g/g;
 
-    iput-object p5, p0, Lcom/facebook/imagepipeline/i/ag$a;->Iy:Lcom/facebook/common/g/a;
+    iput-object p5, p0, Lcom/facebook/imagepipeline/i/ag$a;->Iu:Lcom/facebook/common/g/a;
 
-    iput-object p6, p0, Lcom/facebook/imagepipeline/i/ag$a;->Zv:Lcom/facebook/imagepipeline/g/e;
+    iput-object p6, p0, Lcom/facebook/imagepipeline/i/ag$a;->Zr: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;->Iy:Lcom/facebook/common/g/a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ag$a;->Iu: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;->Iy:Lcom/facebook/common/g/a;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/i/ag$a;->Iu: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;->Iy:Lcom/facebook/common/g/a;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/ag$a;->Iu: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;->Zv:Lcom/facebook/imagepipeline/g/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ag$a;->Zr:Lcom/facebook/imagepipeline/g/e;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/g/e;->Wi:Lcom/facebook/imagepipeline/a/a;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/g/e;->We:Lcom/facebook/imagepipeline/a/a;
 
     if-eqz v0, :cond_0
 
     :try_start_0
-    iget-object p2, p0, Lcom/facebook/imagepipeline/i/ag$a;->Zv:Lcom/facebook/imagepipeline/g/e;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/i/ag$a;->Zr: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;->Wi:Lcom/facebook/imagepipeline/a/a;
+    iget-object v1, p1, Lcom/facebook/imagepipeline/g/e;->We:Lcom/facebook/imagepipeline/a/a;
 
-    iget v1, v1, Lcom/facebook/imagepipeline/a/a;->To:I
+    iget v1, v1, Lcom/facebook/imagepipeline/a/a;->Tk:I
 
     add-int/2addr v0, v1
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ag$a;->Sl:Lcom/facebook/common/g/g;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ag$a;->Sh: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;->Wi:Lcom/facebook/imagepipeline/a/a;
+    iget-object v1, p1, Lcom/facebook/imagepipeline/g/e;->We:Lcom/facebook/imagepipeline/a/a;
 
-    iget v1, v1, Lcom/facebook/imagepipeline/a/a;->To:I
+    iget v1, v1, Lcom/facebook/imagepipeline/a/a;->Tk: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;->gq()Lcom/facebook/common/g/f;
+    invoke-virtual {v0}, Lcom/facebook/common/g/i;->go()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;->jx()V
+    invoke-virtual {v1}, Lcom/facebook/imagepipeline/g/e;->jv()V
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yp:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yl: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;->Yp:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yl: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;->Zv:Lcom/facebook/imagepipeline/g/e;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/ag$a;->Zr: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;->Vw:Lcom/facebook/imagepipeline/cache/e;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/ag$a;->Vs:Lcom/facebook/imagepipeline/cache/e;
 
-    iget-object p2, p0, Lcom/facebook/imagepipeline/i/ag$a;->Zu:Lcom/facebook/cache/common/CacheKey;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/i/ag$a;->Zq: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;->Zv:Lcom/facebook/imagepipeline/g/e;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/ag$a;->Zr: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;->jr()Lcom/facebook/e/c;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->jp()Lcom/facebook/e/c;
 
     move-result-object v0
 
-    sget-object v1, Lcom/facebook/e/c;->Rj:Lcom/facebook/e/c;
+    sget-object v1, Lcom/facebook/e/c;->Rf:Lcom/facebook/e/c;
 
     if-eq v0, v1, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ag$a;->Vw:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ag$a;->Vs:Lcom/facebook/imagepipeline/cache/e;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ag$a;->Zu:Lcom/facebook/cache/common/CacheKey;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ag$a;->Zq: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;->Yp:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yl: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 ffa55f542f..1d25a4fc58 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 Iy:Lcom/facebook/common/g/a;
+.field private final Iu:Lcom/facebook/common/g/a;
 
-.field private final Sl:Lcom/facebook/common/g/g;
+.field private final Sh:Lcom/facebook/common/g/g;
 
-.field private final Uh:Lcom/facebook/imagepipeline/cache/f;
+.field private final Ud:Lcom/facebook/imagepipeline/cache/f;
 
-.field private final Vw:Lcom/facebook/imagepipeline/cache/e;
+.field private final Vs:Lcom/facebook/imagepipeline/cache/e;
 
-.field private final XO:Lcom/facebook/imagepipeline/i/aj;
+.field private final XK: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;->Vw:Lcom/facebook/imagepipeline/cache/e;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ag;->Vs:Lcom/facebook/imagepipeline/cache/e;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/i/ag;->Uh:Lcom/facebook/imagepipeline/cache/f;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/ag;->Ud:Lcom/facebook/imagepipeline/cache/f;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/i/ag;->Sl:Lcom/facebook/common/g/g;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/i/ag;->Sh:Lcom/facebook/common/g/g;
 
-    iput-object p4, p0, Lcom/facebook/imagepipeline/i/ag;->Iy:Lcom/facebook/common/g/a;
+    iput-object p4, p0, Lcom/facebook/imagepipeline/i/ag;->Iu:Lcom/facebook/common/g/a;
 
-    iput-object p5, p0, Lcom/facebook/imagepipeline/i/ag;->XO:Lcom/facebook/imagepipeline/i/aj;
+    iput-object p5, p0, Lcom/facebook/imagepipeline/i/ag;->XK: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;->Vw:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/i/ag;->Vs:Lcom/facebook/imagepipeline/cache/e;
 
-    iget-object v4, p0, Lcom/facebook/imagepipeline/i/ag;->Sl:Lcom/facebook/common/g/g;
+    iget-object v4, p0, Lcom/facebook/imagepipeline/i/ag;->Sh:Lcom/facebook/common/g/g;
 
-    iget-object v5, p0, Lcom/facebook/imagepipeline/i/ag;->Iy:Lcom/facebook/common/g/a;
+    iget-object v5, p0, Lcom/facebook/imagepipeline/i/ag;->Iu: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;->XO:Lcom/facebook/imagepipeline/i/aj;
+    iget-object p0, p0, Lcom/facebook/imagepipeline/i/ag;->XK: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;->ka()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->jY()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v0
 
-    iget-boolean v1, v0, Lcom/facebook/imagepipeline/request/b;->aak:Z
+    iget-boolean v1, v0, Lcom/facebook/imagepipeline/request/b;->aag:Z
 
     if-nez v1, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ag;->XO:Lcom/facebook/imagepipeline/i/aj;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ag;->XK: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;->kb()Lcom/facebook/imagepipeline/i/am;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->jZ()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;->aaf:Landroid/net/Uri;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/request/b;->aab: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;->Uh:Lcom/facebook/imagepipeline/cache/f;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ag;->Ud:Lcom/facebook/imagepipeline/cache/f;
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->hn()Ljava/lang/Object;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->hl()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;->Vw:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ag;->Vs: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;->kb()Lcom/facebook/imagepipeline/i/am;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->jZ()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 9902ef1dc8..b49d9f35a9 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/ai$a.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/ai$a.smali
@@ -27,13 +27,17 @@
 
 
 # instance fields
-.field private Iz:Z
+.field private Iv:Z
 
-.field final Kx:Ljava/lang/String;
+.field final Kt:Ljava/lang/String;
 
-.field YL:I
+.field YH:I
 
-.field ZA:Lcom/facebook/common/references/CloseableReference;
+.field final Zu:Lcom/facebook/imagepipeline/i/am;
+
+.field final Zv:Lcom/facebook/imagepipeline/request/c;
+
+.field Zw:Lcom/facebook/common/references/CloseableReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/references/CloseableReference<",
@@ -46,15 +50,11 @@
     .end annotation
 .end field
 
-.field ZB:Z
+.field Zx:Z
 
-.field ZC:Z
+.field Zy:Z
 
-.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;
+.field final synthetic Zz:Lcom/facebook/imagepipeline/i/ai;
 
 
 # direct methods
@@ -75,27 +75,27 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ai$a;->ZD:Lcom/facebook/imagepipeline/i/ai;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ai$a;->Zz: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;->ZA:Lcom/facebook/common/references/CloseableReference;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/ai$a;->Zw:Lcom/facebook/common/references/CloseableReference;
 
     const/4 p2, 0x0
 
-    iput p2, p0, Lcom/facebook/imagepipeline/i/ai$a;->YL:I
+    iput p2, p0, Lcom/facebook/imagepipeline/i/ai$a;->YH:I
 
-    iput-boolean p2, p0, Lcom/facebook/imagepipeline/i/ai$a;->ZB:Z
+    iput-boolean p2, p0, Lcom/facebook/imagepipeline/i/ai$a;->Zx:Z
 
-    iput-boolean p2, p0, Lcom/facebook/imagepipeline/i/ai$a;->ZC:Z
+    iput-boolean p2, p0, Lcom/facebook/imagepipeline/i/ai$a;->Zy:Z
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/i/ai$a;->Zy:Lcom/facebook/imagepipeline/i/am;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/i/ai$a;->Zu:Lcom/facebook/imagepipeline/i/am;
 
-    iput-object p4, p0, Lcom/facebook/imagepipeline/i/ai$a;->Kx:Ljava/lang/String;
+    iput-object p4, p0, Lcom/facebook/imagepipeline/i/ai$a;->Kt:Ljava/lang/String;
 
-    iput-object p5, p0, Lcom/facebook/imagepipeline/i/ai$a;->Zz:Lcom/facebook/imagepipeline/request/c;
+    iput-object p5, p0, Lcom/facebook/imagepipeline/i/ai$a;->Zv: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 gG()Z
+.method private gE()Z
     .locals 2
 
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/i/ai$a;->Iz:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/i/ai$a;->Iv:Z
 
     if-eqz v0, :cond_0
 
@@ -166,15 +166,15 @@
     return v0
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ai$a;->ZA:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ai$a;->Zw:Lcom/facebook/common/references/CloseableReference;
 
     const/4 v1, 0x0
 
-    iput-object v1, p0, Lcom/facebook/imagepipeline/i/ai$a;->ZA:Lcom/facebook/common/references/CloseableReference;
+    iput-object v1, p0, Lcom/facebook/imagepipeline/i/ai$a;->Zw:Lcom/facebook/common/references/CloseableReference;
 
     const/4 v1, 0x1
 
-    iput-boolean v1, p0, Lcom/facebook/imagepipeline/i/ai$a;->Iz:Z
+    iput-boolean v1, p0, Lcom/facebook/imagepipeline/i/ai$a;->Iv: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;->Iz:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/i/ai$a;->Iv: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;->Iz:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/i/ai$a;->Iv:Z
 
     if-eqz v0, :cond_2
 
@@ -256,21 +256,21 @@
     return-void
 
     :cond_2
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ai$a;->ZA:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ai$a;->Zw: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;->ZA:Lcom/facebook/common/references/CloseableReference;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ai$a;->Zw:Lcom/facebook/common/references/CloseableReference;
 
-    iput p2, p0, Lcom/facebook/imagepipeline/i/ai$a;->YL:I
+    iput p2, p0, Lcom/facebook/imagepipeline/i/ai$a;->YH:I
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lcom/facebook/imagepipeline/i/ai$a;->ZB:Z
+    iput-boolean p1, p0, Lcom/facebook/imagepipeline/i/ai$a;->Zx:Z
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/ai$a;->kC()Z
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/ai$a;->kA()Z
 
     move-result p1
 
@@ -282,7 +282,7 @@
 
     if-eqz p1, :cond_3
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/ai$a;->kB()V
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/ai$a;->kz()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;->gG()Z
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/i/ai$a;->gE()Z
 
     move-result v0
 
     if-eqz v0, :cond_2
 
     :cond_1
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yp:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yl: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;->Zz:Lcom/facebook/imagepipeline/request/c;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/i/ai$a;->Zv:Lcom/facebook/imagepipeline/request/c;
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/i/ai$a;->ZD:Lcom/facebook/imagepipeline/i/ai;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/i/ai$a;->Zz:Lcom/facebook/imagepipeline/i/ai;
 
-    iget-object v3, v3, Lcom/facebook/imagepipeline/i/ai;->RH:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+    iget-object v3, v3, Lcom/facebook/imagepipeline/i/ai;->RD: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;->Nv:I
+    iget v2, v0, Lcom/facebook/imagepipeline/g/d;->Nr:I
 
-    iget v0, v0, Lcom/facebook/imagepipeline/g/d;->Nw:I
+    iget v0, v0, Lcom/facebook/imagepipeline/g/d;->Ns:I
 
     :try_start_0
     new-instance v3, Lcom/facebook/imagepipeline/g/d;
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/c;->jn()Lcom/facebook/imagepipeline/g/h;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/c;->jl()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;->gG()Z
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/i/ai$a;->gE()Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yp:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yl:Lcom/facebook/imagepipeline/i/k;
 
     invoke-interface {v0, p1}, Lcom/facebook/imagepipeline/i/k;->i(Ljava/lang/Throwable;)V
 
@@ -424,49 +424,33 @@
     return-void
 .end method
 
-.method protected final jj()V
+.method protected final jh()V
     .locals 0
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/ai$a;->kD()V
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/ai$a;->kB()V
 
     return-void
 .end method
 
-.method final kB()V
-    .locals 2
-
-    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;
-
-    new-instance v1, Lcom/facebook/imagepipeline/i/ai$a$2;
-
-    invoke-direct {v1, p0}, Lcom/facebook/imagepipeline/i/ai$a$2;-><init>(Lcom/facebook/imagepipeline/i/ai$a;)V
-
-    invoke-interface {v0, v1}, Ljava/util/concurrent/Executor;->execute(Ljava/lang/Runnable;)V
-
-    return-void
-.end method
-
-.method final declared-synchronized kC()Z
+.method final declared-synchronized kA()Z
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/i/ai$a;->Iz:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/i/ai$a;->Iv:Z
 
     if-nez v0, :cond_0
 
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/i/ai$a;->ZB:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/i/ai$a;->Zx:Z
 
     if-eqz v0, :cond_0
 
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/i/ai$a;->ZC:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/i/ai$a;->Zy:Z
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ai$a;->ZA:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ai$a;->Zw:Lcom/facebook/common/references/CloseableReference;
 
     invoke-static {v0}, Lcom/facebook/common/references/CloseableReference;->a(Lcom/facebook/common/references/CloseableReference;)Z
 
@@ -476,7 +460,7 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/i/ai$a;->ZC:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/i/ai$a;->Zy:Z
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -499,19 +483,35 @@
     throw v0
 .end method
 
-.method final kD()V
+.method final kB()V
     .locals 1
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/i/ai$a;->gG()Z
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/i/ai$a;->gE()Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yp:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yl:Lcom/facebook/imagepipeline/i/k;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/k;->gg()V
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/k;->ge()V
 
     :cond_0
     return-void
 .end method
+
+.method final kz()V
+    .locals 2
+
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ai$a;->Zz:Lcom/facebook/imagepipeline/i/ai;
+
+    iget-object v0, v0, Lcom/facebook/imagepipeline/i/ai;->mExecutor:Ljava/util/concurrent/Executor;
+
+    new-instance v1, Lcom/facebook/imagepipeline/i/ai$a$2;
+
+    invoke-direct {v1, p0}, Lcom/facebook/imagepipeline/i/ai$a$2;-><init>(Lcom/facebook/imagepipeline/i/ai$a;)V
+
+    invoke-interface {v0, v1}, Ljava/util/concurrent/Executor;->execute(Ljava/lang/Runnable;)V
+
+    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 3b3a06ac5e..5184dfde6f 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 Iz:Z
+.field private Iv:Z
 
-.field private ZA:Lcom/facebook/common/references/CloseableReference;
+.field private Zw: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 ZD:Lcom/facebook/imagepipeline/i/ai;
+.field final synthetic Zz: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;->ZD:Lcom/facebook/imagepipeline/i/ai;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ai$b;->Zz: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;->Iz:Z
+    iput-boolean p2, p0, Lcom/facebook/imagepipeline/i/ai$b;->Iv:Z
 
     const/4 p2, 0x0
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/i/ai$b;->ZA:Lcom/facebook/common/references/CloseableReference;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/ai$b;->Zw: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;->Iz:Z
+    iget-boolean p2, p0, Lcom/facebook/imagepipeline/i/ai$b;->Iv: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;->ZA:Lcom/facebook/common/references/CloseableReference;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/i/ai$b;->Zw: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;->ZA:Lcom/facebook/common/references/CloseableReference;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ai$b;->Zw: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;->Iz:Z
+    iget-boolean p1, p0, Lcom/facebook/imagepipeline/i/ai$b;->Iv:Z
 
     if-eqz p1, :cond_1
 
@@ -130,7 +130,7 @@
     return-void
 
     :cond_1
-    iget-object p1, p0, Lcom/facebook/imagepipeline/i/ai$b;->ZA:Lcom/facebook/common/references/CloseableReference;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/ai$b;->Zw: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;->Yp:Lcom/facebook/imagepipeline/i/k;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/i/n;->Yl:Lcom/facebook/imagepipeline/i/k;
 
     const/4 v0, 0x0
 
@@ -184,13 +184,13 @@
     return-void
 .end method
 
-.method final gG()Z
+.method final gE()Z
     .locals 2
 
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/i/ai$b;->Iz:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/i/ai$b;->Iv:Z
 
     if-eqz v0, :cond_0
 
@@ -201,15 +201,15 @@
     return v0
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ai$b;->ZA:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ai$b;->Zw:Lcom/facebook/common/references/CloseableReference;
 
     const/4 v1, 0x0
 
-    iput-object v1, p0, Lcom/facebook/imagepipeline/i/ai$b;->ZA:Lcom/facebook/common/references/CloseableReference;
+    iput-object v1, p0, Lcom/facebook/imagepipeline/i/ai$b;->Zw:Lcom/facebook/common/references/CloseableReference;
 
     const/4 v1, 0x1
 
-    iput-boolean v1, p0, Lcom/facebook/imagepipeline/i/ai$b;->Iz:Z
+    iput-boolean v1, p0, Lcom/facebook/imagepipeline/i/ai$b;->Iv: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;->gG()Z
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/ai$b;->gE()Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yp:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yl: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 jj()V
+.method protected final jh()V
     .locals 1
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/ai$b;->gG()Z
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/ai$b;->gE()Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yp:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yl:Lcom/facebook/imagepipeline/i/k;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/k;->gg()V
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/k;->ge()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 6360b2d52e..a8152ee960 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 hn()Ljava/lang/Object;
+.method public abstract hl()Ljava/lang/Object;
 .end method
 
-.method public abstract ka()Lcom/facebook/imagepipeline/request/b;
+.method public abstract jY()Lcom/facebook/imagepipeline/request/b;
 .end method
 
-.method public abstract kb()Lcom/facebook/imagepipeline/i/am;
+.method public abstract jZ()Lcom/facebook/imagepipeline/i/am;
 .end method
 
-.method public abstract kc()Lcom/facebook/imagepipeline/request/b$b;
+.method public abstract ka()Lcom/facebook/imagepipeline/request/b$b;
+.end method
+
+.method public abstract kb()Z
+.end method
+
+.method public abstract kc()Lcom/facebook/imagepipeline/a/d;
 .end method
 
 .method public abstract kd()Z
 .end method
-
-.method public abstract ke()Lcom/facebook/imagepipeline/a/d;
-.end method
-
-.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 dbbd87433b..0f3bb0ee0d 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 Uu:Lcom/facebook/imagepipeline/k/d;
+.field final Uq:Lcom/facebook/imagepipeline/k/d;
 
-.field XU:Z
+.field XQ:Z
 
-.field final Yd:Lcom/facebook/imagepipeline/i/ak;
+.field final XZ:Lcom/facebook/imagepipeline/i/ak;
 
-.field final Yj:Lcom/facebook/imagepipeline/i/u;
+.field final Yf:Lcom/facebook/imagepipeline/i/u;
 
-.field final ZH:Z
+.field final ZD:Z
 
-.field final synthetic ZI:Lcom/facebook/imagepipeline/i/ao;
+.field final synthetic ZE:Lcom/facebook/imagepipeline/i/ao;
 
 
 # direct methods
@@ -53,23 +53,23 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ao$a;->ZI:Lcom/facebook/imagepipeline/i/ao;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ao$a;->ZE: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;->XU:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/i/ao$a;->XQ:Z
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/i/ao$a;->Yd:Lcom/facebook/imagepipeline/i/ak;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/i/ao$a;->XZ:Lcom/facebook/imagepipeline/i/ak;
 
-    iget-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;->XZ:Lcom/facebook/imagepipeline/i/ak;
 
-    invoke-interface {p3}, Lcom/facebook/imagepipeline/i/ak;->ka()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p3}, Lcom/facebook/imagepipeline/i/ak;->jY()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object p3
 
-    iget-object p3, p3, Lcom/facebook/imagepipeline/request/b;->aam:Ljava/lang/Boolean;
+    iget-object p3, p3, Lcom/facebook/imagepipeline/request/b;->aai: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;->ZH:Z
+    iput-boolean p4, p0, Lcom/facebook/imagepipeline/i/ao$a;->ZD:Z
 
-    iput-object p5, p0, Lcom/facebook/imagepipeline/i/ao$a;->Uu:Lcom/facebook/imagepipeline/k/d;
+    iput-object p5, p0, Lcom/facebook/imagepipeline/i/ao$a;->Uq: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;->Yj:Lcom/facebook/imagepipeline/i/u;
+    iput-object p4, p0, Lcom/facebook/imagepipeline/i/ao$a;->Yf:Lcom/facebook/imagepipeline/i/u;
 
-    iget-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;->XZ: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;->Nv:I
+    iput p1, v0, Lcom/facebook/imagepipeline/g/e;->Nr: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;->XU:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/i/ao$a;->XQ:Z
 
     if-nez v0, :cond_11
 
@@ -151,7 +151,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/i/n;->Yp:Lcom/facebook/imagepipeline/i/k;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/n;->Yl: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;->jr()Lcom/facebook/e/c;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->jp()Lcom/facebook/e/c;
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/i/ao$a;->Yd:Lcom/facebook/imagepipeline/i/ak;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/i/ao$a;->XZ:Lcom/facebook/imagepipeline/i/ak;
 
-    invoke-interface {v3}, Lcom/facebook/imagepipeline/i/ak;->ka()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {v3}, Lcom/facebook/imagepipeline/i/ak;->jY()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v3
 
-    iget-object v4, p0, Lcom/facebook/imagepipeline/i/ao$a;->Uu:Lcom/facebook/imagepipeline/k/d;
+    iget-object v4, p0, Lcom/facebook/imagepipeline/i/ao$a;->Uq:Lcom/facebook/imagepipeline/k/d;
 
-    iget-boolean v5, p0, Lcom/facebook/imagepipeline/i/ao$a;->ZH:Z
+    iget-boolean v5, p0, Lcom/facebook/imagepipeline/i/ao$a;->ZD: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;->jr()Lcom/facebook/e/c;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->jp()Lcom/facebook/e/c;
 
     move-result-object v6
 
-    sget-object v7, Lcom/facebook/e/c;->Rj:Lcom/facebook/e/c;
+    sget-object v7, Lcom/facebook/e/c;->Rf:Lcom/facebook/e/c;
 
     if-ne v6, v7, :cond_2
 
     goto :goto_4
 
     :cond_2
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->jr()Lcom/facebook/e/c;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->jp()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;->Jf:Lcom/facebook/common/j/e;
+    sget-object v1, Lcom/facebook/common/j/e;->Jb:Lcom/facebook/common/j/e;
 
     goto :goto_5
 
     :cond_3
-    iget-object v6, v3, Lcom/facebook/imagepipeline/request/b;->Su:Lcom/facebook/imagepipeline/a/f;
+    iget-object v6, v3, Lcom/facebook/imagepipeline/request/b;->Sq:Lcom/facebook/imagepipeline/a/f;
 
-    iget-boolean v7, v6, Lcom/facebook/imagepipeline/a/f;->TP:Z
+    iget-boolean v7, v6, Lcom/facebook/imagepipeline/a/f;->TL:Z
 
     if-nez v7, :cond_7
 
@@ -227,22 +227,22 @@
 
     if-nez v7, :cond_6
 
-    invoke-virtual {v6}, Lcom/facebook/imagepipeline/a/f;->iD()Z
+    invoke-virtual {v6}, Lcom/facebook/imagepipeline/a/f;->iB()Z
 
     move-result v7
 
     if-eqz v7, :cond_5
 
-    iget-boolean v6, v6, Lcom/facebook/imagepipeline/a/f;->TP:Z
+    iget-boolean v6, v6, Lcom/facebook/imagepipeline/a/f;->TL:Z
 
     if-eqz v6, :cond_4
 
     goto :goto_0
 
     :cond_4
-    sget-object v6, Lcom/facebook/imagepipeline/k/e;->aaz:Lcom/facebook/common/d/e;
+    sget-object v6, Lcom/facebook/imagepipeline/k/e;->aav:Lcom/facebook/common/d/e;
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->jt()I
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->jr()I
 
     move-result v7
 
@@ -258,7 +258,7 @@
 
     :cond_5
     :goto_0
-    iput v5, p1, Lcom/facebook/imagepipeline/g/e;->Nw:I
+    iput v5, p1, Lcom/facebook/imagepipeline/g/e;->Ns: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;->Su:Lcom/facebook/imagepipeline/a/f;
+    iget-object v6, v3, Lcom/facebook/imagepipeline/request/b;->Sq:Lcom/facebook/imagepipeline/a/f;
 
-    iget-object v3, v3, Lcom/facebook/imagepipeline/request/b;->St:Lcom/facebook/imagepipeline/a/e;
+    iget-object v3, v3, Lcom/facebook/imagepipeline/request/b;->Sp: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;->Jg:Lcom/facebook/common/j/e;
+    sget-object v1, Lcom/facebook/common/j/e;->Jc:Lcom/facebook/common/j/e;
 
     :goto_5
     if-nez v0, :cond_b
 
-    sget-object v3, Lcom/facebook/common/j/e;->Jg:Lcom/facebook/common/j/e;
+    sget-object v3, Lcom/facebook/common/j/e;->Jc:Lcom/facebook/common/j/e;
 
     if-eq v1, v3, :cond_11
 
     :cond_b
-    sget-object v3, Lcom/facebook/common/j/e;->Je:Lcom/facebook/common/j/e;
+    sget-object v3, Lcom/facebook/common/j/e;->Ja:Lcom/facebook/common/j/e;
 
     if-eq v1, v3, :cond_f
 
-    sget-object v0, Lcom/facebook/e/b;->QY:Lcom/facebook/e/c;
+    sget-object v0, Lcom/facebook/e/b;->QU:Lcom/facebook/e/c;
 
     if-eq v2, v0, :cond_d
 
-    sget-object v0, Lcom/facebook/e/b;->Ri:Lcom/facebook/e/c;
+    sget-object v0, Lcom/facebook/e/b;->Re: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;->Yd:Lcom/facebook/imagepipeline/i/ak;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ao$a;->XZ:Lcom/facebook/imagepipeline/i/ak;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/ak;->ka()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/ak;->jY()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/request/b;->Su:Lcom/facebook/imagepipeline/a/f;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/request/b;->Sq:Lcom/facebook/imagepipeline/a/f;
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/a/f;->iC()Z
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/a/f;->iA()Z
 
     move-result v1
 
     if-nez v1, :cond_e
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/a/f;->iD()Z
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/a/f;->iB()Z
 
     move-result v1
 
     if-eqz v1, :cond_e
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/a/f;->iE()I
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/a/f;->iC()I
 
     move-result v0
 
@@ -358,25 +358,25 @@
 
     :cond_d
     :goto_6
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ao$a;->Yd:Lcom/facebook/imagepipeline/i/ak;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ao$a;->XZ:Lcom/facebook/imagepipeline/i/ak;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/ak;->ka()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/ak;->jY()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/request/b;->Su:Lcom/facebook/imagepipeline/a/f;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/request/b;->Sq:Lcom/facebook/imagepipeline/a/f;
 
-    iget-boolean v0, v0, Lcom/facebook/imagepipeline/a/f;->TP:Z
+    iget-boolean v0, v0, Lcom/facebook/imagepipeline/a/f;->TL:Z
 
     if-nez v0, :cond_e
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->js()I
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->jq()I
 
     move-result v0
 
     if-eqz v0, :cond_e
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->js()I
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->jq()I
 
     move-result v0
 
@@ -390,14 +390,14 @@
 
     :cond_e
     :goto_7
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yp:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yl: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;->Yj:Lcom/facebook/imagepipeline/i/u;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ao$a;->Yf: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;->Yd:Lcom/facebook/imagepipeline/i/ak;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/ao$a;->XZ:Lcom/facebook/imagepipeline/i/ak;
 
-    invoke-interface {p1}, Lcom/facebook/imagepipeline/i/ak;->kf()Z
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/i/ak;->kd()Z
 
     move-result p1
 
     if-eqz p1, :cond_11
 
     :cond_10
-    iget-object p1, p0, Lcom/facebook/imagepipeline/i/ao$a;->Yj:Lcom/facebook/imagepipeline/i/u;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/ao$a;->Yf:Lcom/facebook/imagepipeline/i/u;
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/i/u;->ko()Z
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/i/u;->km()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 db33a93840..9b51a1f128 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 Kx:Ljava/lang/String;
+.field private final Kt:Ljava/lang/String;
 
-.field private final XQ:Lcom/facebook/imagepipeline/i/am;
+.field private final XM:Lcom/facebook/imagepipeline/i/am;
 
-.field private final Yp:Lcom/facebook/imagepipeline/i/k;
+.field private final Yl: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 ZL:Ljava/lang/String;
+.field private final ZH: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;->Yp:Lcom/facebook/imagepipeline/i/k;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/aq;->Yl:Lcom/facebook/imagepipeline/i/k;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/i/aq;->XQ:Lcom/facebook/imagepipeline/i/am;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/aq;->XM:Lcom/facebook/imagepipeline/i/am;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/i/aq;->ZL:Ljava/lang/String;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/i/aq;->ZH:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/facebook/imagepipeline/i/aq;->Kx:Ljava/lang/String;
+    iput-object p4, p0, Lcom/facebook/imagepipeline/i/aq;->Kt:Ljava/lang/String;
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/i/aq;->XQ:Lcom/facebook/imagepipeline/i/am;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/aq;->XM:Lcom/facebook/imagepipeline/i/am;
 
-    iget-object p2, p0, Lcom/facebook/imagepipeline/i/aq;->Kx:Ljava/lang/String;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/i/aq;->Kt:Ljava/lang/String;
 
-    iget-object p3, p0, Lcom/facebook/imagepipeline/i/aq;->ZL:Ljava/lang/String;
+    iget-object p3, p0, Lcom/facebook/imagepipeline/i/aq;->ZH: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 gg()V
+.method public ge()V
     .locals 4
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/aq;->XQ:Lcom/facebook/imagepipeline/i/am;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/aq;->XM:Lcom/facebook/imagepipeline/i/am;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/aq;->Kx:Ljava/lang/String;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/aq;->Kt:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/i/aq;->ZL:Ljava/lang/String;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/i/aq;->ZH: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;->Yp:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/aq;->Yl:Lcom/facebook/imagepipeline/i/k;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/k;->gg()V
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/k;->ge()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;->XQ:Lcom/facebook/imagepipeline/i/am;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/aq;->XM:Lcom/facebook/imagepipeline/i/am;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/aq;->Kx:Ljava/lang/String;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/aq;->Kt:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/i/aq;->ZL:Ljava/lang/String;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/i/aq;->ZH: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;->Yp:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/aq;->Yl: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;->XQ:Lcom/facebook/imagepipeline/i/am;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/aq;->XM:Lcom/facebook/imagepipeline/i/am;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/aq;->Kx:Ljava/lang/String;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/aq;->Kt:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/i/aq;->ZL:Ljava/lang/String;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/i/aq;->ZH: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;->Yp:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/aq;->Yl: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 de6fbf086a..7359e517df 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 Yr:Ljava/lang/String;
+.field final synthetic Yn:Ljava/lang/String;
 
-.field final synthetic Ys:Lcom/facebook/imagepipeline/i/k;
+.field final synthetic Yo:Lcom/facebook/imagepipeline/i/k;
 
-.field final synthetic ZM:Lcom/facebook/imagepipeline/i/am;
+.field final synthetic ZI:Lcom/facebook/imagepipeline/i/am;
 
-.field final synthetic ZN:Lcom/facebook/imagepipeline/i/ak;
+.field final synthetic ZJ:Lcom/facebook/imagepipeline/i/ak;
 
-.field final synthetic ZO:Lcom/facebook/imagepipeline/i/ar;
+.field final synthetic ZK: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;->ZO:Lcom/facebook/imagepipeline/i/ar;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ar$1;->ZK:Lcom/facebook/imagepipeline/i/ar;
 
-    iput-object p6, p0, Lcom/facebook/imagepipeline/i/ar$1;->ZM:Lcom/facebook/imagepipeline/i/am;
+    iput-object p6, p0, Lcom/facebook/imagepipeline/i/ar$1;->ZI:Lcom/facebook/imagepipeline/i/am;
 
-    iput-object p7, p0, Lcom/facebook/imagepipeline/i/ar$1;->Yr:Ljava/lang/String;
+    iput-object p7, p0, Lcom/facebook/imagepipeline/i/ar$1;->Yn:Ljava/lang/String;
 
-    iput-object p8, p0, Lcom/facebook/imagepipeline/i/ar$1;->Ys:Lcom/facebook/imagepipeline/i/k;
+    iput-object p8, p0, Lcom/facebook/imagepipeline/i/ar$1;->Yo:Lcom/facebook/imagepipeline/i/k;
 
-    iput-object p9, p0, Lcom/facebook/imagepipeline/i/ar$1;->ZN:Lcom/facebook/imagepipeline/i/ak;
+    iput-object p9, p0, Lcom/facebook/imagepipeline/i/ar$1;->ZJ: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;->ZM:Lcom/facebook/imagepipeline/i/am;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/ar$1;->ZI:Lcom/facebook/imagepipeline/i/am;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ar$1;->Yr:Ljava/lang/String;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ar$1;->Yn: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;->ZO:Lcom/facebook/imagepipeline/i/ar;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/ar$1;->ZK:Lcom/facebook/imagepipeline/i/ar;
 
-    iget-object p1, p1, Lcom/facebook/imagepipeline/i/ar;->XO:Lcom/facebook/imagepipeline/i/aj;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/i/ar;->XK:Lcom/facebook/imagepipeline/i/aj;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ar$1;->Ys:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ar$1;->Yo:Lcom/facebook/imagepipeline/i/k;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ar$1;->ZN:Lcom/facebook/imagepipeline/i/ak;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ar$1;->ZJ: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 67d43c5734..d7de14e5a4 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 Yw:Lcom/facebook/imagepipeline/i/ak;
+.field private final Ys:Lcom/facebook/imagepipeline/i/ak;
 
-.field final synthetic aac:Lcom/facebook/imagepipeline/i/ax;
+.field final synthetic ZY:Lcom/facebook/imagepipeline/i/ax;
 
-.field private aad:Lcom/facebook/common/j/e;
+.field private ZZ:Lcom/facebook/common/j/e;
 
 
 # direct methods
@@ -45,15 +45,15 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ax$a;->aac:Lcom/facebook/imagepipeline/i/ax;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ax$a;->ZY: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;->Yw:Lcom/facebook/imagepipeline/i/ak;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/i/ax$a;->Ys:Lcom/facebook/imagepipeline/i/ak;
 
-    sget-object p1, Lcom/facebook/common/j/e;->Jg:Lcom/facebook/common/j/e;
+    sget-object p1, Lcom/facebook/common/j/e;->Jc:Lcom/facebook/common/j/e;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ax$a;->aad:Lcom/facebook/common/j/e;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ax$a;->ZZ: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;->aad:Lcom/facebook/common/j/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ax$a;->ZZ:Lcom/facebook/common/j/e;
 
-    sget-object v1, Lcom/facebook/common/j/e;->Jg:Lcom/facebook/common/j/e;
+    sget-object v1, Lcom/facebook/common/j/e;->Jc: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;->jY()Lcom/facebook/imagepipeline/nativecode/e;
+    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/f;->jW()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;->Rj:Lcom/facebook/e/c;
+    sget-object v1, Lcom/facebook/e/c;->Rf:Lcom/facebook/e/c;
 
     if-ne v0, v1, :cond_1
 
-    sget-object v0, Lcom/facebook/common/j/e;->Jg:Lcom/facebook/common/j/e;
+    sget-object v0, Lcom/facebook/common/j/e;->Jc:Lcom/facebook/common/j/e;
 
     goto :goto_0
 
     :cond_1
-    sget-object v0, Lcom/facebook/common/j/e;->Jf:Lcom/facebook/common/j/e;
+    sget-object v0, Lcom/facebook/common/j/e;->Jb:Lcom/facebook/common/j/e;
 
     :goto_0
-    iput-object v0, p0, Lcom/facebook/imagepipeline/i/ax$a;->aad:Lcom/facebook/common/j/e;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/i/ax$a;->ZZ:Lcom/facebook/common/j/e;
 
     :cond_2
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ax$a;->aad:Lcom/facebook/common/j/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ax$a;->ZZ:Lcom/facebook/common/j/e;
 
-    sget-object v1, Lcom/facebook/common/j/e;->Jf:Lcom/facebook/common/j/e;
+    sget-object v1, Lcom/facebook/common/j/e;->Jb: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;->aad:Lcom/facebook/common/j/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ax$a;->ZZ:Lcom/facebook/common/j/e;
 
-    sget-object v1, Lcom/facebook/common/j/e;->Je:Lcom/facebook/common/j/e;
+    sget-object v1, Lcom/facebook/common/j/e;->Ja: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;->aac:Lcom/facebook/imagepipeline/i/ax;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/i/ax$a;->ZY:Lcom/facebook/imagepipeline/i/ax;
 
-    iget-object v4, p0, Lcom/facebook/imagepipeline/i/n;->Yp:Lcom/facebook/imagepipeline/i/k;
+    iget-object v4, p0, Lcom/facebook/imagepipeline/i/n;->Yl:Lcom/facebook/imagepipeline/i/k;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ax$a;->Yw:Lcom/facebook/imagepipeline/i/ak;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ax$a;->Ys: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;->kb()Lcom/facebook/imagepipeline/i/am;
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/ak;->jZ()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;->Yp:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yl: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 56188ffb83..b60c6104af 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 XP:Z
+.field private XL:Z
 
 
 # direct methods
@@ -31,7 +31,7 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/i/b;->XP:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/i/b;->XL:Z
 
     return-void
 .end method
@@ -145,7 +145,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/i/b;->XP:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/i/b;->XL: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;->XP:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/i/b;->XL: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 gg()V
+.method public final declared-synchronized ge()V
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/i/b;->XP:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/i/b;->XL: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;->XP:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/i/b;->XL:Z
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     :try_start_2
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/b;->jj()V
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/b;->jh()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;->XP:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/i/b;->XL: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;->XP:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/i/b;->XL:Z
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
@@ -306,7 +306,7 @@
     throw p1
 .end method
 
-.method protected abstract jj()V
+.method protected abstract jh()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;->XP:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/i/b;->XL: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 00f2bbe9cf..43813cf17b 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 KJ:Z
+.field private KF:Z
 
-.field public final Ky:Ljava/lang/Object;
+.field public final Ku:Ljava/lang/Object;
 
-.field public final Kz:Lcom/facebook/imagepipeline/request/b;
+.field public final Kv:Lcom/facebook/imagepipeline/request/b;
 
-.field private final XQ:Lcom/facebook/imagepipeline/i/am;
+.field private final XM:Lcom/facebook/imagepipeline/i/am;
 
-.field private final XR:Lcom/facebook/imagepipeline/request/b$b;
+.field private final XN:Lcom/facebook/imagepipeline/request/b$b;
 
-.field private XS:Lcom/facebook/imagepipeline/a/d;
+.field private XO:Lcom/facebook/imagepipeline/a/d;
 
-.field private XT:Z
+.field private XP:Z
 
-.field private XU:Z
+.field private XQ: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;->Kz:Lcom/facebook/imagepipeline/request/b;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/d;->Kv: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;->XQ:Lcom/facebook/imagepipeline/i/am;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/i/d;->XM:Lcom/facebook/imagepipeline/i/am;
 
-    iput-object p4, p0, Lcom/facebook/imagepipeline/i/d;->Ky:Ljava/lang/Object;
+    iput-object p4, p0, Lcom/facebook/imagepipeline/i/d;->Ku:Ljava/lang/Object;
 
-    iput-object p5, p0, Lcom/facebook/imagepipeline/i/d;->XR:Lcom/facebook/imagepipeline/request/b$b;
+    iput-object p5, p0, Lcom/facebook/imagepipeline/i/d;->XN:Lcom/facebook/imagepipeline/request/b$b;
 
-    iput-boolean p6, p0, Lcom/facebook/imagepipeline/i/d;->KJ:Z
+    iput-boolean p6, p0, Lcom/facebook/imagepipeline/i/d;->KF:Z
 
-    iput-object p8, p0, Lcom/facebook/imagepipeline/i/d;->XS:Lcom/facebook/imagepipeline/a/d;
+    iput-object p8, p0, Lcom/facebook/imagepipeline/i/d;->XO:Lcom/facebook/imagepipeline/a/d;
 
-    iput-boolean p7, p0, Lcom/facebook/imagepipeline/i/d;->XT:Z
+    iput-boolean p7, p0, Lcom/facebook/imagepipeline/i/d;->XP:Z
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lcom/facebook/imagepipeline/i/d;->XU:Z
+    iput-boolean p1, p0, Lcom/facebook/imagepipeline/i/d;->XQ: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;->kh()V
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/al;->kf()V
 
     goto :goto_0
 
@@ -153,7 +153,7 @@
 
     check-cast v0, Lcom/facebook/imagepipeline/i/al;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/al;->ki()V
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/al;->kg()V
 
     goto :goto_0
 
@@ -198,7 +198,7 @@
 
     check-cast v0, Lcom/facebook/imagepipeline/i/al;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/al;->kj()V
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/al;->kh()V
 
     goto :goto_0
 
@@ -243,7 +243,7 @@
 
     check-cast v0, Lcom/facebook/imagepipeline/i/al;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/al;->kk()V
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/al;->ki()V
 
     goto :goto_0
 
@@ -272,7 +272,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/d;->XS:Lcom/facebook/imagepipeline/a/d;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/d;->XO: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;->XS:Lcom/facebook/imagepipeline/a/d;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/d;->XO: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;->XU:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/i/d;->XQ:Z
 
     monitor-exit p0
     :try_end_0
@@ -326,7 +326,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-interface {p1}, Lcom/facebook/imagepipeline/i/al;->kh()V
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/i/al;->kf()V
 
     :cond_0
     return-void
@@ -350,45 +350,89 @@
     return-object v0
 .end method
 
-.method public final hn()Ljava/lang/Object;
+.method public final hl()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/d;->Ky:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/d;->Ku:Ljava/lang/Object;
 
     return-object v0
 .end method
 
-.method public final ka()Lcom/facebook/imagepipeline/request/b;
+.method public final jY()Lcom/facebook/imagepipeline/request/b;
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/d;->Kz:Lcom/facebook/imagepipeline/request/b;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/d;->Kv:Lcom/facebook/imagepipeline/request/b;
 
     return-object v0
 .end method
 
-.method public final kb()Lcom/facebook/imagepipeline/i/am;
+.method public final jZ()Lcom/facebook/imagepipeline/i/am;
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/d;->XQ:Lcom/facebook/imagepipeline/i/am;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/d;->XM:Lcom/facebook/imagepipeline/i/am;
 
     return-object v0
 .end method
 
-.method public final kc()Lcom/facebook/imagepipeline/request/b$b;
+.method public final ka()Lcom/facebook/imagepipeline/request/b$b;
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/d;->XR:Lcom/facebook/imagepipeline/request/b$b;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/d;->XN:Lcom/facebook/imagepipeline/request/b$b;
 
     return-object v0
 .end method
 
+.method public final declared-synchronized kb()Z
+    .locals 1
+
+    monitor-enter p0
+
+    :try_start_0
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/i/d;->KF:Z
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    monitor-exit p0
+
+    return v0
+
+    :catchall_0
+    move-exception v0
+
+    monitor-exit p0
+
+    throw v0
+.end method
+
+.method public final declared-synchronized kc()Lcom/facebook/imagepipeline/a/d;
+    .locals 1
+
+    monitor-enter p0
+
+    :try_start_0
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/d;->XO:Lcom/facebook/imagepipeline/a/d;
+    :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 kd()Z
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/i/d;->KJ:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/i/d;->XP:Z
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -404,51 +448,7 @@
     throw v0
 .end method
 
-.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;->XS:Lcom/facebook/imagepipeline/a/d;
-    :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 kf()Z
-    .locals 1
-
-    monitor-enter p0
-
-    :try_start_0
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/i/d;->XT:Z
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    monitor-exit p0
-
-    return v0
-
-    :catchall_0
-    move-exception v0
-
-    monitor-exit p0
-
-    throw v0
-.end method
-
-.method public final declared-synchronized kg()Ljava/util/List;
+.method public final declared-synchronized ke()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;->XU:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/i/d;->XQ: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;->XU:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/i/d;->XQ: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;->KJ:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/i/d;->KF: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;->KJ:Z
+    iput-boolean p1, p0, Lcom/facebook/imagepipeline/i/d;->KF: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;->XT:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/i/d;->XP: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;->XT:Z
+    iput-boolean p1, p0, Lcom/facebook/imagepipeline/i/d;->XP: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 5f827aefd3..24472290d9 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 gg()V
+.method public abstract ge()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 ba5b27c45a..3288d577a4 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 Sv:Lcom/facebook/imagepipeline/a/b;
+.field private final Sr:Lcom/facebook/imagepipeline/a/b;
 
 .field private final TAG:Ljava/lang/String;
 
-.field private XP:Z
+.field private XL:Z
 
-.field private final XQ:Lcom/facebook/imagepipeline/i/am;
+.field private final XM:Lcom/facebook/imagepipeline/i/am;
 
-.field final Yd:Lcom/facebook/imagepipeline/i/ak;
+.field final XZ:Lcom/facebook/imagepipeline/i/ak;
 
-.field final synthetic Yg:Lcom/facebook/imagepipeline/i/m;
+.field final synthetic Yc:Lcom/facebook/imagepipeline/i/m;
 
-.field final Yj:Lcom/facebook/imagepipeline/i/u;
+.field final Yf:Lcom/facebook/imagepipeline/i/u;
 
 
 # direct methods
@@ -55,7 +55,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/m$c;->Yg:Lcom/facebook/imagepipeline/i/m;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/m$c;->Yc: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;->Yd:Lcom/facebook/imagepipeline/i/ak;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/i/m$c;->XZ:Lcom/facebook/imagepipeline/i/ak;
 
-    invoke-interface {p3}, Lcom/facebook/imagepipeline/i/ak;->kb()Lcom/facebook/imagepipeline/i/am;
+    invoke-interface {p3}, Lcom/facebook/imagepipeline/i/ak;->jZ()Lcom/facebook/imagepipeline/i/am;
 
     move-result-object p2
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/i/m$c;->XQ:Lcom/facebook/imagepipeline/i/am;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/m$c;->XM:Lcom/facebook/imagepipeline/i/am;
 
-    invoke-interface {p3}, Lcom/facebook/imagepipeline/i/ak;->ka()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p3}, Lcom/facebook/imagepipeline/i/ak;->jY()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/facebook/imagepipeline/request/b;->Sv:Lcom/facebook/imagepipeline/a/b;
+    iget-object p2, p2, Lcom/facebook/imagepipeline/request/b;->Sr:Lcom/facebook/imagepipeline/a/b;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/i/m$c;->Sv:Lcom/facebook/imagepipeline/a/b;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/m$c;->Sr:Lcom/facebook/imagepipeline/a/b;
 
     const/4 p2, 0x0
 
-    iput-boolean p2, p0, Lcom/facebook/imagepipeline/i/m$c;->XP:Z
+    iput-boolean p2, p0, Lcom/facebook/imagepipeline/i/m$c;->XL: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;->Sv:Lcom/facebook/imagepipeline/a/b;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/m$c;->Sr:Lcom/facebook/imagepipeline/a/b;
 
-    iget v0, v0, Lcom/facebook/imagepipeline/a/b;->Tr:I
+    iget v0, v0, Lcom/facebook/imagepipeline/a/b;->Tn: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;->Yj:Lcom/facebook/imagepipeline/i/u;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/i/m$c;->Yf:Lcom/facebook/imagepipeline/i/u;
 
-    iget-object p2, p0, Lcom/facebook/imagepipeline/i/m$c;->Yd:Lcom/facebook/imagepipeline/i/ak;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/i/m$c;->XZ: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;->XQ:Lcom/facebook/imagepipeline/i/am;
+    iget-object v6, v0, Lcom/facebook/imagepipeline/i/m$c;->XM:Lcom/facebook/imagepipeline/i/am;
 
-    iget-object v7, v0, Lcom/facebook/imagepipeline/i/m$c;->Yd:Lcom/facebook/imagepipeline/i/ak;
+    iget-object v7, v0, Lcom/facebook/imagepipeline/i/m$c;->XZ: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;->jB()Z
+    invoke-interface/range {p4 .. p4}, Lcom/facebook/imagepipeline/g/h;->jz()Z
 
     move-result v7
 
@@ -304,11 +304,11 @@
 
     const-string v13, "DecodeProducer"
 
-    invoke-virtual/range {p1 .. p1}, Lcom/facebook/imagepipeline/g/e;->jr()Lcom/facebook/e/c;
+    invoke-virtual/range {p1 .. p1}, Lcom/facebook/imagepipeline/g/e;->jp()Lcom/facebook/e/c;
 
     move-result-object v1
 
-    sget-object v2, Lcom/facebook/e/b;->QY:Lcom/facebook/e/c;
+    sget-object v2, Lcom/facebook/e/b;->QU: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;->jr()Lcom/facebook/e/c;
+    invoke-virtual/range {p1 .. p1}, Lcom/facebook/imagepipeline/g/e;->jp()Lcom/facebook/e/c;
 
     move-result-object v1
 
@@ -382,7 +382,7 @@
 
     move-result-object v8
 
-    iget v1, v12, Lcom/facebook/imagepipeline/g/e;->Wg:I
+    iget v1, v12, Lcom/facebook/imagepipeline/g/e;->Wc: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;->Yd:Lcom/facebook/imagepipeline/i/ak;
+    iget-object v15, v11, Lcom/facebook/imagepipeline/i/m$c;->XZ:Lcom/facebook/imagepipeline/i/ak;
 
-    invoke-interface {v15}, Lcom/facebook/imagepipeline/i/ak;->ka()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {v15}, Lcom/facebook/imagepipeline/i/ak;->jY()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v15
 
-    iget-object v15, v15, Lcom/facebook/imagepipeline/request/b;->St:Lcom/facebook/imagepipeline/a/e;
+    iget-object v15, v15, Lcom/facebook/imagepipeline/request/b;->Sp: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;->Yj:Lcom/facebook/imagepipeline/i/u;
+    iget-object v1, v11, Lcom/facebook/imagepipeline/i/m$c;->Yf:Lcom/facebook/imagepipeline/i/u;
 
-    invoke-virtual {v1}, Lcom/facebook/imagepipeline/i/u;->kq()J
+    invoke-virtual {v1}, Lcom/facebook/imagepipeline/i/u;->ko()J
 
     move-result-wide v17
 
-    iget-object v1, v11, Lcom/facebook/imagepipeline/i/m$c;->Yd:Lcom/facebook/imagepipeline/i/ak;
+    iget-object v1, v11, Lcom/facebook/imagepipeline/i/m$c;->XZ:Lcom/facebook/imagepipeline/i/ak;
 
-    invoke-interface {v1}, Lcom/facebook/imagepipeline/i/ak;->ka()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {v1}, Lcom/facebook/imagepipeline/i/ak;->jY()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/request/b;->aaf:Landroid/net/Uri;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/request/b;->aab: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;->jn()Lcom/facebook/imagepipeline/g/h;
+    invoke-virtual/range {p0 .. p0}, Lcom/facebook/imagepipeline/i/m$c;->jl()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;->Wj:Lcom/facebook/imagepipeline/g/h;
+    sget-object v3, Lcom/facebook/imagepipeline/g/g;->Wf:Lcom/facebook/imagepipeline/g/h;
 
     :goto_7
     move-object v5, v3
 
-    iget-object v3, v11, Lcom/facebook/imagepipeline/i/m$c;->XQ:Lcom/facebook/imagepipeline/i/am;
+    iget-object v3, v11, Lcom/facebook/imagepipeline/i/m$c;->XM:Lcom/facebook/imagepipeline/i/am;
 
-    iget-object v14, v11, Lcom/facebook/imagepipeline/i/m$c;->Yd:Lcom/facebook/imagepipeline/i/ak;
+    iget-object v14, v11, Lcom/facebook/imagepipeline/i/m$c;->XZ: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;->Yg:Lcom/facebook/imagepipeline/i/m;
+    iget-object v14, v11, Lcom/facebook/imagepipeline/i/m$c;->Yc:Lcom/facebook/imagepipeline/i/m;
 
-    iget-object v14, v14, Lcom/facebook/imagepipeline/i/m;->Ut:Lcom/facebook/imagepipeline/e/c;
+    iget-object v14, v14, Lcom/facebook/imagepipeline/i/m;->Up:Lcom/facebook/imagepipeline/e/c;
 
-    iget-object v3, v11, Lcom/facebook/imagepipeline/i/m$c;->Sv:Lcom/facebook/imagepipeline/a/b;
+    iget-object v3, v11, Lcom/facebook/imagepipeline/i/m$c;->Sr: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;->Wg:I
+    iget v1, v12, Lcom/facebook/imagepipeline/g/e;->Wc: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;->XQ:Lcom/facebook/imagepipeline/i/am;
+    iget-object v2, v11, Lcom/facebook/imagepipeline/i/m$c;->XM:Lcom/facebook/imagepipeline/i/am;
 
-    iget-object v3, v11, Lcom/facebook/imagepipeline/i/m$c;->Yd:Lcom/facebook/imagepipeline/i/ak;
+    iget-object v3, v11, Lcom/facebook/imagepipeline/i/m$c;->XZ: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;->Yg:Lcom/facebook/imagepipeline/i/m;
+    iget-object v1, v11, Lcom/facebook/imagepipeline/i/m$c;->Yc:Lcom/facebook/imagepipeline/i/m;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/i/m;->Si:Lcom/facebook/imagepipeline/b/a;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/i/m;->Se:Lcom/facebook/imagepipeline/b/a;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/a;->IB:Lcom/facebook/common/references/CloseableReference$a;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/a;->Ix: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;->Yp:Lcom/facebook/imagepipeline/i/k;
+    iget-object v2, v11, Lcom/facebook/imagepipeline/i/n;->Yl: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;->jv()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/facebook/imagepipeline/g/e;->jt()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;->XQ:Lcom/facebook/imagepipeline/i/am;
+    iget-object v2, v11, Lcom/facebook/imagepipeline/i/m$c;->XM:Lcom/facebook/imagepipeline/i/am;
 
-    iget-object v3, v11, Lcom/facebook/imagepipeline/i/m$c;->Yd:Lcom/facebook/imagepipeline/i/ak;
+    iget-object v3, v11, Lcom/facebook/imagepipeline/i/m$c;->XZ: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;->Yp:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yl: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;->XP:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/i/m$c;->XL: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;->XP:Z
+    iget-boolean p1, p0, Lcom/facebook/imagepipeline/i/m$c;->XL:Z
 
     if-eqz p1, :cond_0
 
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lcom/facebook/imagepipeline/i/n;->Yp:Lcom/facebook/imagepipeline/i/k;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/n;->Yl: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;->XP:Z
+    iput-boolean p1, p0, Lcom/facebook/imagepipeline/i/m$c;->XL: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;->Yj:Lcom/facebook/imagepipeline/i/u;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/m$c;->Yf:Lcom/facebook/imagepipeline/i/u;
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/i/u;->kn()V
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/i/u;->kl()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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     return-void
 
@@ -857,7 +857,7 @@
 
     if-nez p1, :cond_1
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     return-void
 
@@ -873,30 +873,30 @@
 
     if-nez p1, :cond_2
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/i/m$c;->Yd:Lcom/facebook/imagepipeline/i/ak;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/m$c;->XZ:Lcom/facebook/imagepipeline/i/ak;
 
-    invoke-interface {p1}, Lcom/facebook/imagepipeline/i/ak;->kf()Z
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/i/ak;->kd()Z
 
     move-result p1
 
     if-eqz p1, :cond_3
 
     :cond_2
-    iget-object p1, p0, Lcom/facebook/imagepipeline/i/m$c;->Yj:Lcom/facebook/imagepipeline/i/u;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/m$c;->Yf:Lcom/facebook/imagepipeline/i/u;
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/i/u;->ko()Z
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/i/u;->km()Z
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
     :cond_3
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     return-void
 
     :catchall_0
     move-exception p1
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()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;->Yj:Lcom/facebook/imagepipeline/i/u;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/m$c;->Yf: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 jj()V
+.method public final jh()V
     .locals 0
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/m$c;->km()V
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/m$c;->kk()V
 
     return-void
 .end method
 
-.method protected abstract jn()Lcom/facebook/imagepipeline/g/h;
+.method protected abstract jl()Lcom/facebook/imagepipeline/g/h;
 .end method
 
-.method final km()V
+.method final kk()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;->Yp:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yl:Lcom/facebook/imagepipeline/i/k;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/k;->gg()V
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/k;->ge()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 2eaaaaa43e..0f5a044d6a 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 Yp:Lcom/facebook/imagepipeline/i/k;
+.field final Yl: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;->Yp:Lcom/facebook/imagepipeline/i/k;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/n;->Yl: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;->Yp:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yl: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 jj()V
+.method protected jh()V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yp:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yl:Lcom/facebook/imagepipeline/i/k;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/k;->gg()V
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/k;->ge()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;->Yp:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yl: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 8a406ac2bc..cf876b155c 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 Ug:Lcom/facebook/imagepipeline/cache/e;
+.field private final Uc:Lcom/facebook/imagepipeline/cache/e;
 
-.field private final Uh:Lcom/facebook/imagepipeline/cache/f;
+.field private final Ud:Lcom/facebook/imagepipeline/cache/f;
 
-.field private final Vw:Lcom/facebook/imagepipeline/cache/e;
+.field private final Vs:Lcom/facebook/imagepipeline/cache/e;
 
-.field final XO:Lcom/facebook/imagepipeline/i/aj;
+.field final XK: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;->Vw:Lcom/facebook/imagepipeline/cache/e;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/o;->Vs:Lcom/facebook/imagepipeline/cache/e;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/i/o;->Ug:Lcom/facebook/imagepipeline/cache/e;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/o;->Uc:Lcom/facebook/imagepipeline/cache/e;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/i/o;->Uh:Lcom/facebook/imagepipeline/cache/f;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/i/o;->Ud:Lcom/facebook/imagepipeline/cache/f;
 
-    iput-object p4, p0, Lcom/facebook/imagepipeline/i/o;->XO:Lcom/facebook/imagepipeline/i/aj;
+    iput-object p4, p0, Lcom/facebook/imagepipeline/i/o;->XK:Lcom/facebook/imagepipeline/i/aj;
 
     return-void
 .end method
@@ -139,23 +139,23 @@
         }
     .end annotation
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->ka()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->jY()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v0
 
-    iget-boolean v1, v0, Lcom/facebook/imagepipeline/request/b;->aak:Z
+    iget-boolean v1, v0, Lcom/facebook/imagepipeline/request/b;->aag:Z
 
     const/4 v2, 0x1
 
     if-nez v1, :cond_1
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->kc()Lcom/facebook/imagepipeline/request/b$b;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->ka()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;->aar:Lcom/facebook/imagepipeline/request/b$b;
+    sget-object v1, Lcom/facebook/imagepipeline/request/b$b;->aan: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;->XO:Lcom/facebook/imagepipeline/i/aj;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/o;->XK: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;->kb()Lcom/facebook/imagepipeline/i/am;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->jZ()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;->Uh:Lcom/facebook/imagepipeline/cache/f;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/o;->Ud:Lcom/facebook/imagepipeline/cache/f;
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->hn()Ljava/lang/Object;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->hl()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;->aae:Lcom/facebook/imagepipeline/request/b$a;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/request/b;->aaa:Lcom/facebook/imagepipeline/request/b$a;
 
-    sget-object v3, Lcom/facebook/imagepipeline/request/b$a;->aan:Lcom/facebook/imagepipeline/request/b$a;
+    sget-object v3, Lcom/facebook/imagepipeline/request/b$a;->aaj: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;->Ug:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/o;->Uc:Lcom/facebook/imagepipeline/cache/e;
 
     goto :goto_1
 
     :cond_3
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/o;->Vw:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/o;->Vs: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;->kb()Lcom/facebook/imagepipeline/i/am;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->jZ()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 2e495e7e31..7f666466a5 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 Yp:Lcom/facebook/imagepipeline/i/k;
+.field final Yl: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 Yw:Lcom/facebook/imagepipeline/i/ak;
+.field final Ys:Lcom/facebook/imagepipeline/i/ak;
 
-.field Yx:J
+.field Yt:J
 
-.field Yy:I
+.field Yu:I
 
-.field Yz:Lcom/facebook/imagepipeline/a/a;
+.field Yv: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;->Yp:Lcom/facebook/imagepipeline/i/k;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/s;->Yl:Lcom/facebook/imagepipeline/i/k;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/i/s;->Yw:Lcom/facebook/imagepipeline/i/ak;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/s;->Ys:Lcom/facebook/imagepipeline/i/ak;
 
     const-wide/16 p1, 0x0
 
-    iput-wide p1, p0, Lcom/facebook/imagepipeline/i/s;->Yx:J
+    iput-wide p1, p0, Lcom/facebook/imagepipeline/i/s;->Yt: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;->Yw:Lcom/facebook/imagepipeline/i/ak;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/s;->Ys: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 kb()Lcom/facebook/imagepipeline/i/am;
+.method public final jZ()Lcom/facebook/imagepipeline/i/am;
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/s;->Yw:Lcom/facebook/imagepipeline/i/ak;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/s;->Ys:Lcom/facebook/imagepipeline/i/ak;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/ak;->kb()Lcom/facebook/imagepipeline/i/am;
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/ak;->jZ()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 0f6907fa1e..e6b0eb083f 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 YX:[Ljava/lang/String;
+.field private static final YT:[Ljava/lang/String;
 
 
 # instance fields
-.field private final Vu:Landroid/content/ContentResolver;
+.field private final Vq:Landroid/content/ContentResolver;
 
 
 # direct methods
@@ -31,7 +31,7 @@
 
     aput-object v2, v0, v1
 
-    sput-object v0, Lcom/facebook/imagepipeline/i/w;->YX:[Ljava/lang/String;
+    sput-object v0, Lcom/facebook/imagepipeline/i/w;->YT:[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;->Vu:Landroid/content/ContentResolver;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/i/w;->Vq: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;->Vu:Landroid/content/ContentResolver;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/w;->Vq:Landroid/content/ContentResolver;
 
-    sget-object v2, Lcom/facebook/imagepipeline/i/w;->YX:[Ljava/lang/String;
+    sget-object v2, Lcom/facebook/imagepipeline/i/w;->YT:[Ljava/lang/String;
 
     const/4 v3, 0x0
 
@@ -164,7 +164,7 @@
         }
     .end annotation
 
-    iget-object p1, p1, Lcom/facebook/imagepipeline/request/b;->aaf:Landroid/net/Uri;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/request/b;->aab: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;->Vu:Landroid/content/ContentResolver;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/w;->Vq: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;->Vu:Landroid/content/ContentResolver;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/w;->Vq:Landroid/content/ContentResolver;
 
     const-string v3, "r"
 
@@ -242,7 +242,7 @@
     throw v0
 
     :cond_1
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/w;->Vu:Landroid/content/ContentResolver;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/w;->Vq: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;->Vu:Landroid/content/ContentResolver;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/w;->Vq: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 kl()Ljava/lang/String;
+.method protected final kj()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 546cfeaa56..8a0f275dd0 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 GI:Ljava/lang/Class;
+.field private static final GE:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -27,17 +27,17 @@
     .end annotation
 .end field
 
-.field private static final YX:[Ljava/lang/String;
+.field private static final YT:[Ljava/lang/String;
 
-.field private static final YY:[Ljava/lang/String;
+.field private static final YU:[Ljava/lang/String;
 
-.field private static final YZ:Landroid/graphics/Rect;
+.field private static final YV:Landroid/graphics/Rect;
 
-.field private static final Za:Landroid/graphics/Rect;
+.field private static final YW:Landroid/graphics/Rect;
 
 
 # instance fields
-.field private final Vu:Landroid/content/ContentResolver;
+.field private final Vq: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;->GI:Ljava/lang/Class;
+    sput-object v0, Lcom/facebook/imagepipeline/i/x;->GE:Ljava/lang/Class;
 
     const/4 v0, 0x2
 
@@ -64,13 +64,13 @@
 
     aput-object v2, v0, v3
 
-    sput-object v0, Lcom/facebook/imagepipeline/i/x;->YX:[Ljava/lang/String;
+    sput-object v0, Lcom/facebook/imagepipeline/i/x;->YT:[Ljava/lang/String;
 
     new-array v0, v3, [Ljava/lang/String;
 
     aput-object v2, v0, v1
 
-    sput-object v0, Lcom/facebook/imagepipeline/i/x;->YY:[Ljava/lang/String;
+    sput-object v0, Lcom/facebook/imagepipeline/i/x;->YU:[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;->YZ:Landroid/graphics/Rect;
+    sput-object v0, Lcom/facebook/imagepipeline/i/x;->YV: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;->Za:Landroid/graphics/Rect;
+    sput-object v0, Lcom/facebook/imagepipeline/i/x;->YW: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;->Vu:Landroid/content/ContentResolver;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/i/x;->Vq: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;->Vu:Landroid/content/ContentResolver;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/x;->Vq:Landroid/content/ContentResolver;
 
-    sget-object v2, Lcom/facebook/imagepipeline/i/x;->YX:[Ljava/lang/String;
+    sget-object v2, Lcom/facebook/imagepipeline/i/x;->YT:[Ljava/lang/String;
 
     const/4 v3, 0x0
 
@@ -186,7 +186,7 @@
 
     move-result v0
 
-    iput v0, p2, Lcom/facebook/imagepipeline/g/e;->Nv:I
+    iput v0, p2, Lcom/facebook/imagepipeline/g/e;->Nr: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;->Za:Landroid/graphics/Rect;
+    sget-object v0, Lcom/facebook/imagepipeline/i/x;->YW:Landroid/graphics/Rect;
 
     invoke-virtual {v0}, Landroid/graphics/Rect;->width()I
 
     move-result v0
 
-    sget-object v1, Lcom/facebook/imagepipeline/i/x;->Za:Landroid/graphics/Rect;
+    sget-object v1, Lcom/facebook/imagepipeline/i/x;->YW: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;->YZ:Landroid/graphics/Rect;
+    sget-object v0, Lcom/facebook/imagepipeline/i/x;->YV:Landroid/graphics/Rect;
 
     invoke-virtual {v0}, Landroid/graphics/Rect;->width()I
 
     move-result v0
 
-    sget-object v1, Lcom/facebook/imagepipeline/i/x;->YZ:Landroid/graphics/Rect;
+    sget-object v1, Lcom/facebook/imagepipeline/i/x;->YV: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;->Vu:Landroid/content/ContentResolver;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/x;->Vq:Landroid/content/ContentResolver;
 
     int-to-long v2, p2
 
-    sget-object p2, Lcom/facebook/imagepipeline/i/x;->YY:[Ljava/lang/String;
+    sget-object p2, Lcom/facebook/imagepipeline/i/x;->YU:[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;->GI:Ljava/lang/Class;
+    sget-object v3, Lcom/facebook/imagepipeline/i/x;->GE: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;->YZ:Landroid/graphics/Rect;
+    sget-object v0, Lcom/facebook/imagepipeline/i/x;->YV:Landroid/graphics/Rect;
 
     invoke-virtual {v0}, Landroid/graphics/Rect;->width()I
 
     move-result v0
 
-    sget-object v1, Lcom/facebook/imagepipeline/i/x;->YZ:Landroid/graphics/Rect;
+    sget-object v1, Lcom/facebook/imagepipeline/i/x;->YV: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;->aaf:Landroid/net/Uri;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/request/b;->aab: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;->St:Lcom/facebook/imagepipeline/a/e;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/request/b;->Sp: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 kl()Ljava/lang/String;
+.method protected final kj()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 7758166503..1567f753d5 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 Zb:Lcom/facebook/imagepipeline/request/b;
+.field final synthetic YX:Lcom/facebook/imagepipeline/request/b;
 
-.field final synthetic Zc:Lcom/facebook/imagepipeline/i/y;
+.field final synthetic YY: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;->Zc:Lcom/facebook/imagepipeline/i/y;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/y$1;->YY:Lcom/facebook/imagepipeline/i/y;
 
-    iput-object p6, p0, Lcom/facebook/imagepipeline/i/y$1;->Zb:Lcom/facebook/imagepipeline/request/b;
+    iput-object p6, p0, Lcom/facebook/imagepipeline/i/y$1;->YX: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;->Zb:Lcom/facebook/imagepipeline/request/b;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/y$1;->YX:Lcom/facebook/imagepipeline/request/b;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/request/b;->aaf:Landroid/net/Uri;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/request/b;->aab:Landroid/net/Uri;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/y$1;->Zc:Lcom/facebook/imagepipeline/i/y;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/y$1;->YY: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;->Zc:Lcom/facebook/imagepipeline/i/y;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/i/y$1;->YY: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;->Zc:Lcom/facebook/imagepipeline/i/y;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/i/y$1;->YY: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 39abe3cd96..42a9f39159 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 Sl:Lcom/facebook/common/g/g;
+.field private final Sh:Lcom/facebook/common/g/g;
 
-.field private final Vu:Landroid/content/ContentResolver;
+.field private final Vq: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;->Sl:Lcom/facebook/common/g/g;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/y;->Sh:Lcom/facebook/common/g/g;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/i/y;->Vu:Landroid/content/ContentResolver;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/i/y;->Vq: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;->Sl:Lcom/facebook/common/g/g;
+    iget-object p0, p0, Lcom/facebook/imagepipeline/i/y;->Sh: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;->QY:Lcom/facebook/e/c;
+    sget-object p0, Lcom/facebook/e/b;->QU:Lcom/facebook/e/c;
 
-    iput-object p0, v0, Lcom/facebook/imagepipeline/g/e;->Wf:Lcom/facebook/e/c;
+    iput-object p0, v0, Lcom/facebook/imagepipeline/g/e;->Wb:Lcom/facebook/e/c;
 
-    iput p1, v0, Lcom/facebook/imagepipeline/g/e;->Nv:I
+    iput p1, v0, Lcom/facebook/imagepipeline/g/e;->Nr: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;->kb()Lcom/facebook/imagepipeline/i/am;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->jZ()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;->ka()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->jY()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;->Vu:Landroid/content/ContentResolver;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/y;->Vq: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 3d7876816f..fdecedb797 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 Yq:Lcom/facebook/imagepipeline/i/am;
+.field final synthetic YX:Lcom/facebook/imagepipeline/request/b;
 
-.field final synthetic Yr:Ljava/lang/String;
+.field final synthetic Ym:Lcom/facebook/imagepipeline/i/am;
 
-.field final synthetic Zb:Lcom/facebook/imagepipeline/request/b;
+.field final synthetic Yn:Ljava/lang/String;
 
-.field final synthetic Ze:Lcom/facebook/imagepipeline/i/z;
+.field final synthetic Za: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;->Ze:Lcom/facebook/imagepipeline/i/z;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/z$1;->Za:Lcom/facebook/imagepipeline/i/z;
 
-    iput-object p6, p0, Lcom/facebook/imagepipeline/i/z$1;->Zb:Lcom/facebook/imagepipeline/request/b;
+    iput-object p6, p0, Lcom/facebook/imagepipeline/i/z$1;->YX:Lcom/facebook/imagepipeline/request/b;
 
-    iput-object p7, p0, Lcom/facebook/imagepipeline/i/z$1;->Yq:Lcom/facebook/imagepipeline/i/am;
+    iput-object p7, p0, Lcom/facebook/imagepipeline/i/z$1;->Ym:Lcom/facebook/imagepipeline/i/am;
 
-    iput-object p8, p0, Lcom/facebook/imagepipeline/i/z$1;->Yr:Ljava/lang/String;
+    iput-object p8, p0, Lcom/facebook/imagepipeline/i/z$1;->Yn: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;->Ze:Lcom/facebook/imagepipeline/i/z;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/z$1;->Za:Lcom/facebook/imagepipeline/i/z;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/z$1;->Zb:Lcom/facebook/imagepipeline/request/b;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/z$1;->YX: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;->Yq:Lcom/facebook/imagepipeline/i/am;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/z$1;->Ym:Lcom/facebook/imagepipeline/i/am;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/z$1;->Yr:Ljava/lang/String;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/z$1;->Yn:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/i/z$1;->Ze:Lcom/facebook/imagepipeline/i/z;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/i/z$1;->Za:Lcom/facebook/imagepipeline/i/z;
 
-    invoke-virtual {v2}, Lcom/facebook/imagepipeline/i/z;->kl()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/facebook/imagepipeline/i/z;->kj()Ljava/lang/String;
 
     move-result-object v2
 
@@ -91,15 +91,15 @@
     return-object v0
 
     :cond_0
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/g/e;->jx()V
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/g/e;->jv()V
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/z$1;->Yq:Lcom/facebook/imagepipeline/i/am;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/z$1;->Ym:Lcom/facebook/imagepipeline/i/am;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/i/z$1;->Yr:Ljava/lang/String;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/i/z$1;->Yn:Ljava/lang/String;
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/i/z$1;->Ze:Lcom/facebook/imagepipeline/i/z;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/i/z$1;->Za:Lcom/facebook/imagepipeline/i/z;
 
-    invoke-virtual {v3}, Lcom/facebook/imagepipeline/i/z;->kl()Ljava/lang/String;
+    invoke-virtual {v3}, Lcom/facebook/imagepipeline/i/z;->kj()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 6f8dc9a2ab..9fb7841591 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 Sl:Lcom/facebook/common/g/g;
+.field private final Sh: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;->Sl:Lcom/facebook/common/g/g;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/z;->Sh:Lcom/facebook/common/g/g;
 
     return-void
 .end method
@@ -51,7 +51,7 @@
         }
     .end annotation
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->kb()Lcom/facebook/imagepipeline/i/am;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->jZ()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;->ka()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->jY()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;->kl()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/z;->kj()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;->Sl:Lcom/facebook/common/g/g;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/i/z;->Sh: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;->Sl:Lcom/facebook/common/g/g;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/z;->Sh: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 kl()Ljava/lang/String;
+.method protected abstract kj()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 8f4849970f..3ddc930ce0 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 aaw:Lcom/facebook/imagepipeline/j/b$a;
+.field public static final aas:Lcom/facebook/imagepipeline/j/b$a;
 
-.field private static volatile aax:Lcom/facebook/imagepipeline/j/b$c;
+.field private static volatile aat: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;->aaw:Lcom/facebook/imagepipeline/j/b$a;
+    sput-object v0, Lcom/facebook/imagepipeline/j/b;->aas:Lcom/facebook/imagepipeline/j/b$a;
 
     const/4 v0, 0x0
 
-    sput-object v0, Lcom/facebook/imagepipeline/j/b;->aax:Lcom/facebook/imagepipeline/j/b$c;
+    sput-object v0, Lcom/facebook/imagepipeline/j/b;->aat:Lcom/facebook/imagepipeline/j/b$c;
 
     return-void
 .end method
@@ -49,20 +49,20 @@
     return-void
 .end method
 
-.method public static kI()Z
+.method public static kG()Z
     .locals 1
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kJ()Lcom/facebook/imagepipeline/j/b$c;
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kH()Lcom/facebook/imagepipeline/j/b$c;
 
     const/4 v0, 0x0
 
     return v0
 .end method
 
-.method private static kJ()Lcom/facebook/imagepipeline/j/b$c;
+.method private static kH()Lcom/facebook/imagepipeline/j/b$c;
     .locals 2
 
-    sget-object v0, Lcom/facebook/imagepipeline/j/b;->aax:Lcom/facebook/imagepipeline/j/b$c;
+    sget-object v0, Lcom/facebook/imagepipeline/j/b;->aat: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;->aax:Lcom/facebook/imagepipeline/j/b$c;
+    sget-object v1, Lcom/facebook/imagepipeline/j/b;->aat: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;->aax:Lcom/facebook/imagepipeline/j/b$c;
+    sput-object v1, Lcom/facebook/imagepipeline/j/b;->aat: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;->aax:Lcom/facebook/imagepipeline/j/b$c;
+    sget-object v0, Lcom/facebook/imagepipeline/j/b;->aat: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 5168dda7b6..e433b53d32 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;->jr()Lcom/facebook/e/c;
+    invoke-virtual {p2}, Lcom/facebook/imagepipeline/g/e;->jp()Lcom/facebook/e/c;
 
     move-result-object v0
 
-    sget-object v1, Lcom/facebook/e/b;->QY:Lcom/facebook/e/c;
+    sget-object v1, Lcom/facebook/e/b;->QU: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;->TM:F
+    iget p1, p1, Lcom/facebook/imagepipeline/a/e;->TI:F
 
     goto :goto_1
 
@@ -265,11 +265,11 @@
 
     if-lez p3, :cond_4
 
-    invoke-virtual {p2}, Lcom/facebook/imagepipeline/g/e;->jr()Lcom/facebook/e/c;
+    invoke-virtual {p2}, Lcom/facebook/imagepipeline/g/e;->jp()Lcom/facebook/e/c;
 
     move-result-object p3
 
-    sget-object v1, Lcom/facebook/e/b;->QY:Lcom/facebook/e/c;
+    sget-object v1, Lcom/facebook/e/b;->QU: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;->iC()Z
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/a/f;->iA()Z
 
     move-result p0
 
@@ -300,7 +300,7 @@
     return v0
 
     :cond_0
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->js()I
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->jq()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 9d64c8e77b..6d33449ed5 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 aaz:Lcom/facebook/common/d/e;
+.field public static final aav: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;->aaz:Lcom/facebook/common/d/e;
+    sput-object v0, Lcom/facebook/imagepipeline/k/e;->aav:Lcom/facebook/common/d/e;
 
     return-void
 .end method
@@ -91,9 +91,9 @@
 
     move-result p3
 
-    sget-object v1, Lcom/facebook/imagepipeline/k/e;->aaz:Lcom/facebook/common/d/e;
+    sget-object v1, Lcom/facebook/imagepipeline/k/e;->aav:Lcom/facebook/common/d/e;
 
-    invoke-virtual {p2}, Lcom/facebook/imagepipeline/g/e;->jt()I
+    invoke-virtual {p2}, Lcom/facebook/imagepipeline/g/e;->jr()I
 
     move-result v2
 
@@ -198,26 +198,26 @@
 
     mul-float v1, p0, p3
 
-    iget v2, p1, Lcom/facebook/imagepipeline/a/e;->TM:F
+    iget v2, p1, Lcom/facebook/imagepipeline/a/e;->TI:F
 
     cmpl-float v1, v1, v2
 
     if-lez v1, :cond_8
 
-    iget p3, p1, Lcom/facebook/imagepipeline/a/e;->TM:F
+    iget p3, p1, Lcom/facebook/imagepipeline/a/e;->TI:F
 
     div-float/2addr p3, p0
 
     :cond_8
     mul-float p0, p2, p3
 
-    iget v1, p1, Lcom/facebook/imagepipeline/a/e;->TM:F
+    iget v1, p1, Lcom/facebook/imagepipeline/a/e;->TI:F
 
     cmpl-float p0, p0, v1
 
     if-lez p0, :cond_9
 
-    iget p0, p1, Lcom/facebook/imagepipeline/a/e;->TM:F
+    iget p0, p1, Lcom/facebook/imagepipeline/a/e;->TI:F
 
     div-float/2addr p0, p2
 
@@ -227,7 +227,7 @@
     move p0, p3
 
     :goto_3
-    iget p1, p1, Lcom/facebook/imagepipeline/a/e;->TN:F
+    iget p1, p1, Lcom/facebook/imagepipeline/a/e;->TJ: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;->iD()Z
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/a/f;->iB()Z
 
     move-result v0
 
@@ -268,7 +268,7 @@
 
     move-result p1
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/a/f;->iC()Z
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/a/f;->iA()Z
 
     move-result v0
 
@@ -277,7 +277,7 @@
     return p1
 
     :cond_1
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/a/f;->iE()I
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/a/f;->iC()I
 
     move-result p0
 
@@ -293,9 +293,9 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    sget-object v0, Lcom/facebook/imagepipeline/k/e;->aaz:Lcom/facebook/common/d/e;
+    sget-object v0, Lcom/facebook/imagepipeline/k/e;->aav:Lcom/facebook/common/d/e;
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/g/e;->jt()I
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/g/e;->jr()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;->jt()I
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->jr()I
 
     move-result p1
 
-    sget-object v0, Lcom/facebook/imagepipeline/k/e;->aaz:Lcom/facebook/common/d/e;
+    sget-object v0, Lcom/facebook/imagepipeline/k/e;->aav: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;->iC()Z
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/a/f;->iA()Z
 
     move-result v1
 
     if-nez v1, :cond_0
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/a/f;->iE()I
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/a/f;->iC()I
 
     move-result v0
 
     :cond_0
     div-int/lit8 v0, v0, 0x5a
 
-    sget-object p0, Lcom/facebook/imagepipeline/k/e;->aaz:Lcom/facebook/common/d/e;
+    sget-object p0, Lcom/facebook/imagepipeline/k/e;->aav: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;->js()I
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/g/e;->jq()I
 
     move-result v0
 
@@ -554,7 +554,7 @@
     return p0
 
     :cond_0
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/g/e;->js()I
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/g/e;->jq()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 58ba6122a1..42e6a6ec9a 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 UZ:I
+.field private final UV:I
 
-.field private final Uv:Ljava/lang/Integer;
+.field private final Ur:Ljava/lang/Integer;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private final XH:Z
+.field private final XD:Z
 
-.field private final aaA:Lcom/facebook/imagepipeline/k/d;
+.field private final aaw: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;->UZ:I
+    iput p1, p0, Lcom/facebook/imagepipeline/k/f;->UV:I
 
-    iput-boolean p2, p0, Lcom/facebook/imagepipeline/k/f;->XH:Z
+    iput-boolean p2, p0, Lcom/facebook/imagepipeline/k/f;->XD:Z
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/k/f;->aaA:Lcom/facebook/imagepipeline/k/d;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/k/f;->aaw:Lcom/facebook/imagepipeline/k/d;
 
-    iput-object p4, p0, Lcom/facebook/imagepipeline/k/f;->Uv:Ljava/lang/Integer;
+    iput-object p4, p0, Lcom/facebook/imagepipeline/k/f;->Ur: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;->UZ:I
+    iget v0, p0, Lcom/facebook/imagepipeline/k/f;->UV:I
 
-    iget-boolean v1, p0, Lcom/facebook/imagepipeline/k/f;->XH:Z
+    iget-boolean v1, p0, Lcom/facebook/imagepipeline/k/f;->XD: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;->UZ:I
+    iget v1, p0, Lcom/facebook/imagepipeline/k/f;->UV: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;->aaA:Lcom/facebook/imagepipeline/k/d;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/k/f;->aaw: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;->Uv:Ljava/lang/Integer;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/k/f;->Ur: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 4abcf428c4..8a427b7405 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 UZ:I
+.field private final UV:I
 
-.field private final XF:Z
+.field private final XB:Z
 
 
 # direct methods
@@ -18,9 +18,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-boolean p1, p0, Lcom/facebook/imagepipeline/k/g;->XF:Z
+    iput-boolean p1, p0, Lcom/facebook/imagepipeline/k/g;->XB:Z
 
-    iput p2, p0, Lcom/facebook/imagepipeline/k/g;->UZ:I
+    iput p2, p0, Lcom/facebook/imagepipeline/k/g;->UV:I
 
     return-void
 .end method
@@ -66,7 +66,7 @@
     :goto_0
     if-nez p3, :cond_1
 
-    invoke-static {}, Lcom/facebook/imagepipeline/a/f;->iA()Lcom/facebook/imagepipeline/a/f;
+    invoke-static {}, Lcom/facebook/imagepipeline/a/f;->iy()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;->XF:Z
+    iget-boolean v6, v1, Lcom/facebook/imagepipeline/k/g;->XB:Z
 
     const/4 v7, 0x1
 
@@ -87,7 +87,7 @@
     goto :goto_2
 
     :cond_2
-    iget v6, v1, Lcom/facebook/imagepipeline/k/g;->UZ:I
+    iget v6, v1, Lcom/facebook/imagepipeline/k/g;->UV:I
 
     move-object/from16 v8, p4
 
@@ -267,16 +267,16 @@
 
     if-nez p2, :cond_0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/a/f;->iA()Lcom/facebook/imagepipeline/a/f;
+    invoke-static {}, Lcom/facebook/imagepipeline/a/f;->iy()Lcom/facebook/imagepipeline/a/f;
 
     move-result-object p2
 
     :cond_0
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/k/g;->XF:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/k/g;->XB:Z
 
     if-eqz v0, :cond_1
 
-    iget v0, p0, Lcom/facebook/imagepipeline/k/g;->UZ:I
+    iget v0, p0, Lcom/facebook/imagepipeline/k/g;->UV: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;->Ri:Lcom/facebook/e/c;
+    sget-object v0, Lcom/facebook/e/b;->Re:Lcom/facebook/e/c;
 
     if-eq p1, v0, :cond_1
 
-    sget-object v0, Lcom/facebook/e/b;->QY:Lcom/facebook/e/c;
+    sget-object v0, Lcom/facebook/e/b;->QU: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 7a1468c0ce..11774c60c2 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 Iz:Z
+.field private Iv:Z
 
-.field private final Xd:J
+.field private final WZ:J
 
 .field private final mSize:I
 
@@ -19,7 +19,7 @@
 .method static constructor <clinit>()V
     .locals 0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/a;->jX()V
+    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/a;->jV()V
 
     return-void
 .end method
@@ -35,11 +35,11 @@
 
     const-wide/16 v0, 0x0
 
-    iput-wide v0, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->Xd:J
+    iput-wide v0, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->WZ:J
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->Iz:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->Iv:Z
 
     return-void
 .end method
@@ -71,9 +71,9 @@
 
     move-result-wide v1
 
-    iput-wide v1, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->Xd:J
+    iput-wide v1, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->WZ:J
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->Iz:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->Iv: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;->go()J
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/memory/s;->gm()J
 
     move-result-wide p1
 
@@ -119,7 +119,7 @@
 
     add-long/2addr p1, v0
 
-    iget-wide v2, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->Xd:J
+    iget-wide v2, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->WZ: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;->Xd:J
+    iget-wide v0, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->WZ: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;->Xd:J
+    iget-wide v0, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->WZ: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;->jM()J
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/memory/s;->jK()J
 
     move-result-wide v0
 
-    iget-wide v2, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->Xd:J
+    iget-wide v2, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->WZ: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;->Xd:J
+    iget-wide v1, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->WZ: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;->jM()J
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/memory/s;->jK()J
 
     move-result-wide v0
 
-    iget-wide v2, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->Xd:J
+    iget-wide v2, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->WZ: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;->Xd:J
+    iget-wide v0, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->WZ: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;->Iz:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->Iv:Z
 
     if-nez v0, :cond_0
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->Iz:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->Iv:Z
 
-    iget-wide v0, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->Xd:J
+    iget-wide v0, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->WZ: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 go()J
+.method public final gm()J
     .locals 2
 
-    iget-wide v0, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->Xd:J
+    iget-wide v0, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->WZ: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;->Iz:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->Iv:Z
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -654,10 +654,10 @@
     throw v0
 .end method
 
-.method public final jM()J
+.method public final jK()J
     .locals 2
 
-    iget-wide v0, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->Xd:J
+    iget-wide v0, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->WZ: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 3f83c00364..90041b74b6 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 GI:Ljava/lang/Class;
+.field private final GE:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -37,11 +37,11 @@
     .end annotation
 .end field
 
-.field final Ux:Lcom/facebook/common/g/b;
+.field final Ut:Lcom/facebook/common/g/b;
 
-.field final Wo:Lcom/facebook/imagepipeline/memory/ae;
+.field final Wk:Lcom/facebook/imagepipeline/memory/ae;
 
-.field final Wp:Landroid/util/SparseArray;
+.field final Wl:Landroid/util/SparseArray;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Landroid/util/SparseArray<",
@@ -51,7 +51,7 @@
     .end annotation
 .end field
 
-.field final Wq:Ljava/util/Set;
+.field final Wm:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -60,13 +60,13 @@
     .end annotation
 .end field
 
-.field private Wr:Z
+.field private Wn:Z
 
-.field final Ws:Lcom/facebook/imagepipeline/memory/a$a;
+.field final Wo:Lcom/facebook/imagepipeline/memory/a$a;
 
-.field final Wt:Lcom/facebook/imagepipeline/memory/a$a;
+.field final Wp:Lcom/facebook/imagepipeline/memory/a$a;
 
-.field private final Wu:Lcom/facebook/imagepipeline/memory/af;
+.field private final Wq:Lcom/facebook/imagepipeline/memory/af;
 
 
 # direct methods
@@ -79,7 +79,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->GI:Ljava/lang/Class;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->GE: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;->Ux:Lcom/facebook/common/g/b;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/a;->Ut: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;->Wo:Lcom/facebook/imagepipeline/memory/ae;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/a;->Wk: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;->Wu:Lcom/facebook/imagepipeline/memory/af;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/a;->Wq: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;->Wp:Landroid/util/SparseArray;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/a;->Wl:Landroid/util/SparseArray;
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/memory/a;->Wo:Lcom/facebook/imagepipeline/memory/ae;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/memory/a;->Wk:Lcom/facebook/imagepipeline/memory/ae;
 
-    iget-boolean p1, p1, Lcom/facebook/imagepipeline/memory/ae;->XA:Z
+    iget-boolean p1, p1, Lcom/facebook/imagepipeline/memory/ae;->Xw:Z
 
     if-eqz p1, :cond_0
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/a;->jE()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/a;->jC()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;->gj()Ljava/util/Set;
+    invoke-static {}, Lcom/facebook/common/d/k;->gh()Ljava/util/Set;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/a;->Wq:Ljava/util/Set;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/a;->Wm: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;->Wt:Lcom/facebook/imagepipeline/memory/a$a;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/a;->Wp: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;->Ws:Lcom/facebook/imagepipeline/memory/a$a;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/a;->Wo: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;->Wp:Landroid/util/SparseArray;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->Wl:Landroid/util/SparseArray;
 
     invoke-virtual {v0}, Landroid/util/SparseArray;->clear()V
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->Wo:Lcom/facebook/imagepipeline/memory/ae;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->Wk:Lcom/facebook/imagepipeline/memory/ae;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/memory/ae;->Xx:Landroid/util/SparseIntArray;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/memory/ae;->Xt:Landroid/util/SparseIntArray;
 
     if-eqz v0, :cond_1
 
@@ -193,7 +193,7 @@
 
     move-result v5
 
-    iget-object v6, p0, Lcom/facebook/imagepipeline/memory/a;->Wp:Landroid/util/SparseArray;
+    iget-object v6, p0, Lcom/facebook/imagepipeline/memory/a;->Wl: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;->Wo:Lcom/facebook/imagepipeline/memory/ae;
+    iget-object v9, p0, Lcom/facebook/imagepipeline/memory/a;->Wk:Lcom/facebook/imagepipeline/memory/ae;
 
-    iget-boolean v9, v9, Lcom/facebook/imagepipeline/memory/ae;->XA:Z
+    iget-boolean v9, v9, Lcom/facebook/imagepipeline/memory/ae;->Xw: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;->Wr:Z
+    iput-boolean v1, p0, Lcom/facebook/imagepipeline/memory/a;->Wn: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;->Wr:Z
+    iput-boolean p1, p0, Lcom/facebook/imagepipeline/memory/a;->Wn: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;->Wp:Landroid/util/SparseArray;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->Wl: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;->Wp:Landroid/util/SparseArray;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->Wl: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;->Wr:Z
+    iget-boolean v1, p0, Lcom/facebook/imagepipeline/memory/a;->Wn:Z
 
     if-nez v1, :cond_0
 
@@ -321,7 +321,7 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->GI:Ljava/lang/Class;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->GE: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;->Wp:Landroid/util/SparseArray;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/a;->Wl: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;->Wo:Lcom/facebook/imagepipeline/memory/ae;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->Wk:Lcom/facebook/imagepipeline/memory/ae;
 
-    iget v0, v0, Lcom/facebook/imagepipeline/memory/ae;->Xv:I
+    iget v0, v0, Lcom/facebook/imagepipeline/memory/ae;->Xr:I
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/a;->Ws:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/a;->Wo:Lcom/facebook/imagepipeline/memory/a$a;
 
-    iget v1, v1, Lcom/facebook/imagepipeline/memory/a$a;->Wv:I
+    iget v1, v1, Lcom/facebook/imagepipeline/memory/a$a;->Wr: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;->Wo:Lcom/facebook/imagepipeline/memory/ae;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/a;->Wk:Lcom/facebook/imagepipeline/memory/ae;
 
-    iget v1, v1, Lcom/facebook/imagepipeline/memory/ae;->Xw:I
+    iget v1, v1, Lcom/facebook/imagepipeline/memory/ae;->Xs:I
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/a;->Ws:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/a;->Wo:Lcom/facebook/imagepipeline/memory/a$a;
 
-    iget v3, v3, Lcom/facebook/imagepipeline/memory/a$a;->Wv:I
+    iget v3, v3, Lcom/facebook/imagepipeline/memory/a$a;->Wr:I
 
-    iget-object v4, p0, Lcom/facebook/imagepipeline/memory/a;->Wt:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v4, p0, Lcom/facebook/imagepipeline/memory/a;->Wp:Lcom/facebook/imagepipeline/memory/a$a;
 
-    iget v4, v4, Lcom/facebook/imagepipeline/memory/a$a;->Wv:I
+    iget v4, v4, Lcom/facebook/imagepipeline/memory/a$a;->Wr: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;->Ws:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/a;->Wo:Lcom/facebook/imagepipeline/memory/a$a;
 
-    iget v1, v1, Lcom/facebook/imagepipeline/memory/a$a;->Wv:I
+    iget v1, v1, Lcom/facebook/imagepipeline/memory/a$a;->Wr:I
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/a;->Wt:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/a;->Wp:Lcom/facebook/imagepipeline/memory/a$a;
 
-    iget v3, v3, Lcom/facebook/imagepipeline/memory/a$a;->Wv:I
+    iget v3, v3, Lcom/facebook/imagepipeline/memory/a$a;->Wr:I
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
@@ -446,7 +446,7 @@
     throw p1
 .end method
 
-.method private iy()V
+.method private iw()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;->GI:Ljava/lang/Class;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/a;->GE:Ljava/lang/Class;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->Ws:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->Wo: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;->Ws:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->Wo:Lcom/facebook/imagepipeline/memory/a$a;
 
-    iget v0, v0, Lcom/facebook/imagepipeline/memory/a$a;->Wv:I
+    iget v0, v0, Lcom/facebook/imagepipeline/memory/a$a;->Wr: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;->Wt:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->Wp: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;->Wt:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->Wp:Lcom/facebook/imagepipeline/memory/a$a;
 
-    iget v0, v0, Lcom/facebook/imagepipeline/memory/a$a;->Wv:I
+    iget v0, v0, Lcom/facebook/imagepipeline/memory/a$a;->Wr:I
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -499,21 +499,21 @@
     return-void
 .end method
 
-.method private declared-synchronized jD()V
+.method private declared-synchronized jB()V
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/a;->jG()Z
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/a;->jE()Z
 
     move-result v0
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->Wt:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->Wp:Lcom/facebook/imagepipeline/memory/a$a;
 
-    iget v0, v0, Lcom/facebook/imagepipeline/memory/a$a;->Wv:I
+    iget v0, v0, Lcom/facebook/imagepipeline/memory/a$a;->Wr:I
 
     if-nez v0, :cond_0
 
@@ -545,19 +545,19 @@
     throw v0
 .end method
 
-.method private declared-synchronized jE()V
+.method private declared-synchronized jC()V
     .locals 9
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->Wo:Lcom/facebook/imagepipeline/memory/ae;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->Wk:Lcom/facebook/imagepipeline/memory/ae;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/memory/ae;->Xx:Landroid/util/SparseIntArray;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/memory/ae;->Xt:Landroid/util/SparseIntArray;
 
     if-eqz v0, :cond_1
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/a;->Wp:Landroid/util/SparseArray;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/a;->Wl: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;->Wp:Landroid/util/SparseArray;
+    iget-object v5, p0, Lcom/facebook/imagepipeline/memory/a;->Wl: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;->Wo:Lcom/facebook/imagepipeline/memory/ae;
+    iget-object v8, p0, Lcom/facebook/imagepipeline/memory/a;->Wk:Lcom/facebook/imagepipeline/memory/ae;
 
-    iget-boolean v8, v8, Lcom/facebook/imagepipeline/memory/ae;->XA:Z
+    iget-boolean v8, v8, Lcom/facebook/imagepipeline/memory/ae;->Xw: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;->Wr:Z
+    iput-boolean v1, p0, Lcom/facebook/imagepipeline/memory/a;->Wn: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;->Wr:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/memory/a;->Wn: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 jF()V
+.method private declared-synchronized jD()V
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/a;->jG()Z
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/a;->jE()Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->Wo:Lcom/facebook/imagepipeline/memory/ae;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->Wk:Lcom/facebook/imagepipeline/memory/ae;
 
-    iget v0, v0, Lcom/facebook/imagepipeline/memory/ae;->Xw:I
+    iget v0, v0, Lcom/facebook/imagepipeline/memory/ae;->Xs: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 jG()Z
+.method private declared-synchronized jE()Z
     .locals 2
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->Ws:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->Wo:Lcom/facebook/imagepipeline/memory/a$a;
 
-    iget v0, v0, Lcom/facebook/imagepipeline/memory/a$a;->Wv:I
+    iget v0, v0, Lcom/facebook/imagepipeline/memory/a$a;->Wr:I
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/a;->Wt:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/a;->Wp:Lcom/facebook/imagepipeline/memory/a$a;
 
-    iget v1, v1, Lcom/facebook/imagepipeline/memory/a$a;->Wv:I
+    iget v1, v1, Lcom/facebook/imagepipeline/memory/a$a;->Wr:I
 
     add-int/2addr v0, v1
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/a;->Wo:Lcom/facebook/imagepipeline/memory/ae;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/a;->Wk:Lcom/facebook/imagepipeline/memory/ae;
 
-    iget v1, v1, Lcom/facebook/imagepipeline/memory/ae;->Xw:I
+    iget v1, v1, Lcom/facebook/imagepipeline/memory/ae;->Xs: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;->Ws:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->Wo:Lcom/facebook/imagepipeline/memory/a$a;
 
-    iget v0, v0, Lcom/facebook/imagepipeline/memory/a$a;->Wv:I
+    iget v0, v0, Lcom/facebook/imagepipeline/memory/a$a;->Wr:I
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/a;->Wt:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/a;->Wp:Lcom/facebook/imagepipeline/memory/a$a;
 
-    iget v1, v1, Lcom/facebook/imagepipeline/memory/a$a;->Wv:I
+    iget v1, v1, Lcom/facebook/imagepipeline/memory/a$a;->Wr:I
 
     add-int/2addr v0, v1
 
     sub-int/2addr v0, p1
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/a;->Wt:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/a;->Wp:Lcom/facebook/imagepipeline/memory/a$a;
 
-    iget v1, v1, Lcom/facebook/imagepipeline/memory/a$a;->Wv:I
+    iget v1, v1, Lcom/facebook/imagepipeline/memory/a$a;->Wr: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;->GI:Ljava/lang/Class;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/memory/a;->GE: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;->Ws:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v5, p0, Lcom/facebook/imagepipeline/memory/a;->Wo:Lcom/facebook/imagepipeline/memory/a$a;
 
-    iget v5, v5, Lcom/facebook/imagepipeline/memory/a$a;->Wv:I
+    iget v5, v5, Lcom/facebook/imagepipeline/memory/a$a;->Wr:I
 
-    iget-object v6, p0, Lcom/facebook/imagepipeline/memory/a;->Wt:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v6, p0, Lcom/facebook/imagepipeline/memory/a;->Wp:Lcom/facebook/imagepipeline/memory/a$a;
 
-    iget v6, v6, Lcom/facebook/imagepipeline/memory/a$a;->Wv:I
+    iget v6, v6, Lcom/facebook/imagepipeline/memory/a$a;->Wr: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;->iy()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/a;->iw()V
 
     const/4 v2, 0x0
 
     :goto_0
-    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/a;->Wp:Landroid/util/SparseArray;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/a;->Wl: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;->Wp:Landroid/util/SparseArray;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/a;->Wl: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;->jJ()Ljava/lang/Object;
+    invoke-virtual {v3}, Lcom/facebook/imagepipeline/memory/f;->jH()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;->WD:I
+    iget v4, v3, Lcom/facebook/imagepipeline/memory/f;->Wz:I
 
     sub-int/2addr v0, v4
 
-    iget-object v4, p0, Lcom/facebook/imagepipeline/memory/a;->Wt:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v4, p0, Lcom/facebook/imagepipeline/memory/a;->Wp:Lcom/facebook/imagepipeline/memory/a$a;
 
-    iget v5, v3, Lcom/facebook/imagepipeline/memory/f;->WD:I
+    iget v5, v3, Lcom/facebook/imagepipeline/memory/f;->Wz: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;->iy()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/a;->iw()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;->GI:Ljava/lang/Class;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->GE: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;->Ws:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/memory/a;->Wo:Lcom/facebook/imagepipeline/memory/a$a;
 
-    iget v2, v2, Lcom/facebook/imagepipeline/memory/a$a;->Wv:I
+    iget v2, v2, Lcom/facebook/imagepipeline/memory/a$a;->Wr:I
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/a;->Wt:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/a;->Wp:Lcom/facebook/imagepipeline/memory/a$a;
 
-    iget v3, v3, Lcom/facebook/imagepipeline/memory/a$a;->Wv:I
+    iget v3, v3, Lcom/facebook/imagepipeline/memory/a$a;->Wr:I
 
     add-int/2addr v2, v3
 
@@ -940,17 +940,17 @@
     monitor-enter p0
 
     :try_start_0
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/memory/f;->jJ()Ljava/lang/Object;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/memory/f;->jH()Ljava/lang/Object;
 
     move-result-object v0
 
     if-eqz v0, :cond_0
 
-    iget v1, p1, Lcom/facebook/imagepipeline/memory/f;->WH:I
+    iget v1, p1, Lcom/facebook/imagepipeline/memory/f;->WD:I
 
     add-int/lit8 v1, v1, 0x1
 
-    iput v1, p1, Lcom/facebook/imagepipeline/memory/f;->WH:I
+    iput v1, p1, Lcom/facebook/imagepipeline/memory/f;->WD: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;->Wo:Lcom/facebook/imagepipeline/memory/ae;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/a;->Wk:Lcom/facebook/imagepipeline/memory/ae;
 
-    iget-boolean v1, v1, Lcom/facebook/imagepipeline/memory/ae;->XA:Z
+    iget-boolean v1, v1, Lcom/facebook/imagepipeline/memory/ae;->Xw:Z
 
     const v2, 0x7fffffff
 
@@ -1018,7 +1018,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/a;->jD()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/a;->jB()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;->Wq:Ljava/util/Set;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/memory/a;->Wm: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;->Ws:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/a;->Wo: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;->Wt:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/a;->Wp: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;->iy()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/a;->iw()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;->GI:Ljava/lang/Class;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->GE: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;->Ws:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/a;->Wo: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;->WH:I
+    iget v3, v0, Lcom/facebook/imagepipeline/memory/f;->WD:I
 
     add-int/lit8 v3, v3, 0x1
 
-    iput v3, v0, Lcom/facebook/imagepipeline/memory/f;->WH:I
+    iput v3, v0, Lcom/facebook/imagepipeline/memory/f;->WD: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;->Ws:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v4, p0, Lcom/facebook/imagepipeline/memory/a;->Wo: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;->jK()V
+    invoke-virtual {v2}, Lcom/facebook/imagepipeline/memory/f;->jI()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;->Wq:Ljava/util/Set;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/memory/a;->Wm: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;->jF()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/a;->jD()V
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/a;->iy()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/a;->iw()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;->GI:Ljava/lang/Class;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/a;->GE: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;->Wo:Lcom/facebook/imagepipeline/memory/ae;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->Wk:Lcom/facebook/imagepipeline/memory/ae;
 
-    iget v0, v0, Lcom/facebook/imagepipeline/memory/ae;->Xv:I
+    iget v0, v0, Lcom/facebook/imagepipeline/memory/ae;->Xr:I
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/a;->Ws:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/a;->Wo:Lcom/facebook/imagepipeline/memory/a$a;
 
-    iget v1, v1, Lcom/facebook/imagepipeline/memory/a$a;->Wv:I
+    iget v1, v1, Lcom/facebook/imagepipeline/memory/a$a;->Wr:I
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/a;->Wt:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/a;->Wp:Lcom/facebook/imagepipeline/memory/a$a;
 
-    iget v3, v3, Lcom/facebook/imagepipeline/memory/a$a;->Wv:I
+    iget v3, v3, Lcom/facebook/imagepipeline/memory/a$a;->Wr: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;->Wq:Ljava/util/Set;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/a;->Wm: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;->GI:Ljava/lang/Class;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/a;->GE: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;->WH:I
+    iget v3, v2, Lcom/facebook/imagepipeline/memory/f;->WD:I
 
-    iget-object v7, v2, Lcom/facebook/imagepipeline/memory/f;->WF:Ljava/util/Queue;
+    iget-object v7, v2, Lcom/facebook/imagepipeline/memory/f;->WB: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;->WE:I
+    iget v7, v2, Lcom/facebook/imagepipeline/memory/f;->WA: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;->jG()Z
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/a;->jE()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;->WG:Z
+    iget-boolean v3, v2, Lcom/facebook/imagepipeline/memory/f;->WC:Z
 
     if-eqz v3, :cond_4
 
-    iget v3, v2, Lcom/facebook/imagepipeline/memory/f;->WH:I
+    iget v3, v2, Lcom/facebook/imagepipeline/memory/f;->WD: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;->WH:I
+    iget v3, v2, Lcom/facebook/imagepipeline/memory/f;->WD:I
 
     sub-int/2addr v3, v6
 
-    iput v3, v2, Lcom/facebook/imagepipeline/memory/f;->WH:I
+    iput v3, v2, Lcom/facebook/imagepipeline/memory/f;->WD: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;->WH:I
+    iget v3, v2, Lcom/facebook/imagepipeline/memory/f;->WD:I
 
     if-lez v3, :cond_5
 
-    iget v3, v2, Lcom/facebook/imagepipeline/memory/f;->WH:I
+    iget v3, v2, Lcom/facebook/imagepipeline/memory/f;->WD:I
 
     sub-int/2addr v3, v6
 
-    iput v3, v2, Lcom/facebook/imagepipeline/memory/f;->WH:I
+    iput v3, v2, Lcom/facebook/imagepipeline/memory/f;->WD: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;->Wt:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/memory/a;->Wp: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;->Ws:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/memory/a;->Wo: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;->GI:Ljava/lang/Class;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/a;->GE: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;->jK()V
+    invoke-virtual {v2}, Lcom/facebook/imagepipeline/memory/f;->jI()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;->GI:Ljava/lang/Class;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/memory/a;->GE: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;->Ws:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/memory/a;->Wo: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;->iy()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/a;->iw()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 dc749dbf8b..34b3fd352d 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 jJ()Ljava/lang/Object;
+.method public abstract jH()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 ecb6481eec..327430c790 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 XA:Z
+.field public final Xr:I
 
-.field public final XB:I
+.field public final Xs:I
+
+.field public final Xt:Landroid/util/SparseIntArray;
+
+.field public final Xu:I
 
 .field public final Xv:I
 
-.field public final Xw:I
+.field public Xw:Z
 
-.field public final Xx:Landroid/util/SparseIntArray;
-
-.field public final Xy:I
-
-.field public final Xz:I
+.field public final Xx: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;->Xw:I
+    iput p1, p0, Lcom/facebook/imagepipeline/memory/ae;->Xs:I
 
-    iput p2, p0, Lcom/facebook/imagepipeline/memory/ae;->Xv:I
+    iput p2, p0, Lcom/facebook/imagepipeline/memory/ae;->Xr:I
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/memory/ae;->Xx:Landroid/util/SparseIntArray;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/memory/ae;->Xt:Landroid/util/SparseIntArray;
 
-    iput p4, p0, Lcom/facebook/imagepipeline/memory/ae;->Xy:I
+    iput p4, p0, Lcom/facebook/imagepipeline/memory/ae;->Xu:I
 
-    iput p5, p0, Lcom/facebook/imagepipeline/memory/ae;->Xz:I
+    iput p5, p0, Lcom/facebook/imagepipeline/memory/ae;->Xv:I
 
-    iput p6, p0, Lcom/facebook/imagepipeline/memory/ae;->XB:I
+    iput p6, p0, Lcom/facebook/imagepipeline/memory/ae;->Xx: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 d036583c5f..82373e954d 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 WD:I
+.field public final WA:I
 
-.field public final WE:I
+.field final WB:Ljava/util/Queue;
 
-.field final WF:Ljava/util/Queue;
+.field final WC:Z
 
-.field final WG:Z
+.field WD:I
 
-.field WH:I
+.field public final Wz: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;->WD:I
+    iput p1, p0, Lcom/facebook/imagepipeline/memory/f;->Wz:I
 
-    iput p2, p0, Lcom/facebook/imagepipeline/memory/f;->WE:I
+    iput p2, p0, Lcom/facebook/imagepipeline/memory/f;->WA:I
 
     new-instance p1, Ljava/util/LinkedList;
 
     invoke-direct {p1}, Ljava/util/LinkedList;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/f;->WF:Ljava/util/Queue;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/f;->WB:Ljava/util/Queue;
 
-    iput p3, p0, Lcom/facebook/imagepipeline/memory/f;->WH:I
+    iput p3, p0, Lcom/facebook/imagepipeline/memory/f;->WD:I
 
-    iput-boolean p4, p0, Lcom/facebook/imagepipeline/memory/f;->WG:Z
+    iput-boolean p4, p0, Lcom/facebook/imagepipeline/memory/f;->WC:Z
 
     return-void
 .end method
@@ -97,14 +97,14 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/f;->WF:Ljava/util/Queue;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/f;->WB:Ljava/util/Queue;
 
     invoke-interface {v0, p1}, Ljava/util/Queue;->add(Ljava/lang/Object;)Z
 
     return-void
 .end method
 
-.method public jJ()Ljava/lang/Object;
+.method public jH()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;->WF:Ljava/util/Queue;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/f;->WB: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 jK()V
+.method public final jI()V
     .locals 2
 
-    iget v0, p0, Lcom/facebook/imagepipeline/memory/f;->WH:I
+    iget v0, p0, Lcom/facebook/imagepipeline/memory/f;->WD: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;->WH:I
+    iget v0, p0, Lcom/facebook/imagepipeline/memory/f;->WD:I
 
     sub-int/2addr v0, v1
 
-    iput v0, p0, Lcom/facebook/imagepipeline/memory/f;->WH:I
+    iput v0, p0, Lcom/facebook/imagepipeline/memory/f;->WD: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 2e2b1c0461..d454285df8 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 WL:Lcom/facebook/imagepipeline/memory/g$a;
+.field WH: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 WM:Ljava/util/LinkedList;
+.field WI:Ljava/util/LinkedList;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/LinkedList<",
@@ -45,7 +45,7 @@
     .end annotation
 .end field
 
-.field WN:Lcom/facebook/imagepipeline/memory/g$a;
+.field WJ: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;->WL:Lcom/facebook/imagepipeline/memory/g$a;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/g$a;->WH: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;->WM:Ljava/util/LinkedList;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/memory/g$a;->WI:Ljava/util/LinkedList;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/g$a;->WN:Lcom/facebook/imagepipeline/memory/g$a;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/g$a;->WJ: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 7fc9e58e52..c31590417a 100644
--- a/com.discord/smali/com/facebook/imagepipeline/memory/g.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/memory/g.smali
@@ -21,7 +21,7 @@
 
 
 # instance fields
-.field protected final WI:Landroid/util/SparseArray;
+.field protected final WE:Landroid/util/SparseArray;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Landroid/util/SparseArray<",
@@ -31,7 +31,7 @@
     .end annotation
 .end field
 
-.field WJ:Lcom/facebook/imagepipeline/memory/g$a;
+.field WF:Lcom/facebook/imagepipeline/memory/g$a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/memory/g$a<",
@@ -43,7 +43,7 @@
     .end annotation
 .end field
 
-.field WK:Lcom/facebook/imagepipeline/memory/g$a;
+.field WG:Lcom/facebook/imagepipeline/memory/g$a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/memory/g$a<",
@@ -66,7 +66,7 @@
 
     invoke-direct {v0}, Landroid/util/SparseArray;-><init>()V
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/g;->WI:Landroid/util/SparseArray;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/g;->WE: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;->WL:Lcom/facebook/imagepipeline/memory/g$a;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/g$a;->WH:Lcom/facebook/imagepipeline/memory/g$a;
 
-    iget-object v1, p1, Lcom/facebook/imagepipeline/memory/g$a;->WN:Lcom/facebook/imagepipeline/memory/g$a;
+    iget-object v1, p1, Lcom/facebook/imagepipeline/memory/g$a;->WJ:Lcom/facebook/imagepipeline/memory/g$a;
 
     if-eqz v0, :cond_0
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/memory/g$a;->WN:Lcom/facebook/imagepipeline/memory/g$a;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/memory/g$a;->WJ:Lcom/facebook/imagepipeline/memory/g$a;
 
     :cond_0
     if-eqz v1, :cond_1
 
-    iput-object v0, v1, Lcom/facebook/imagepipeline/memory/g$a;->WL:Lcom/facebook/imagepipeline/memory/g$a;
+    iput-object v0, v1, Lcom/facebook/imagepipeline/memory/g$a;->WH:Lcom/facebook/imagepipeline/memory/g$a;
 
     :cond_1
     const/4 v2, 0x0
 
-    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;->WH:Lcom/facebook/imagepipeline/memory/g$a;
 
-    iput-object v2, p1, Lcom/facebook/imagepipeline/memory/g$a;->WN:Lcom/facebook/imagepipeline/memory/g$a;
+    iput-object v2, p1, Lcom/facebook/imagepipeline/memory/g$a;->WJ:Lcom/facebook/imagepipeline/memory/g$a;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/memory/g;->WJ:Lcom/facebook/imagepipeline/memory/g$a;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/memory/g;->WF:Lcom/facebook/imagepipeline/memory/g$a;
 
     if-ne p1, v2, :cond_2
 
-    iput-object v1, p0, Lcom/facebook/imagepipeline/memory/g;->WJ:Lcom/facebook/imagepipeline/memory/g$a;
+    iput-object v1, p0, Lcom/facebook/imagepipeline/memory/g;->WF:Lcom/facebook/imagepipeline/memory/g$a;
 
     :cond_2
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/g;->WK:Lcom/facebook/imagepipeline/memory/g$a;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/g;->WG:Lcom/facebook/imagepipeline/memory/g$a;
 
     if-ne p1, v1, :cond_3
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/g;->WK:Lcom/facebook/imagepipeline/memory/g$a;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/g;->WG: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;->WJ:Lcom/facebook/imagepipeline/memory/g$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/g;->WF: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;->WJ:Lcom/facebook/imagepipeline/memory/g$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/g;->WF:Lcom/facebook/imagepipeline/memory/g$a;
 
     if-nez v0, :cond_1
 
-    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;->WF:Lcom/facebook/imagepipeline/memory/g$a;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/g;->WK:Lcom/facebook/imagepipeline/memory/g$a;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/g;->WG:Lcom/facebook/imagepipeline/memory/g$a;
 
     return-void
 
     :cond_1
-    iput-object v0, p1, Lcom/facebook/imagepipeline/memory/g$a;->WN:Lcom/facebook/imagepipeline/memory/g$a;
+    iput-object v0, p1, Lcom/facebook/imagepipeline/memory/g$a;->WJ: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, v0, Lcom/facebook/imagepipeline/memory/g$a;->WH: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;->WF: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;->WI:Landroid/util/SparseArray;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/g;->WE: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;->WM:Ljava/util/LinkedList;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/g$a;->WI: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;->WI:Landroid/util/SparseArray;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/g;->WE: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;->WI:Landroid/util/SparseArray;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/g;->WE: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;->WM:Ljava/util/LinkedList;
+    iget-object p1, v0, Lcom/facebook/imagepipeline/memory/g$a;->WI: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 jL()Ljava/lang/Object;
+.method public final declared-synchronized jJ()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;->WK:Lcom/facebook/imagepipeline/memory/g$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/g;->WG: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;->WM:Ljava/util/LinkedList;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/memory/g$a;->WI: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;->WM:Ljava/util/LinkedList;
+    iget-object v2, v0, Lcom/facebook/imagepipeline/memory/g$a;->WI: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;->WI:Landroid/util/SparseArray;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/memory/g;->WE: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 cc2bf52267..d423775182 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 WO:Ljava/nio/ByteBuffer;
+.field private WK:Ljava/nio/ByteBuffer;
 
-.field private final WP:J
+.field private final WL:J
 
 .field private final mSize:I
 
@@ -25,7 +25,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/i;->WO:Ljava/nio/ByteBuffer;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/i;->WK: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;->WP:J
+    iput-wide v0, p0, Lcom/facebook/imagepipeline/memory/i;->WL: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;->WO:Ljava/nio/ByteBuffer;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/memory/i;->WK: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;->WO:Ljava/nio/ByteBuffer;
+    iget-object p3, p0, Lcom/facebook/imagepipeline/memory/i;->WK: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;->WO:Ljava/nio/ByteBuffer;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/i;->WK: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;->WO:Ljava/nio/ByteBuffer;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/i;->WK:Ljava/nio/ByteBuffer;
 
     invoke-virtual {v0, p1}, Ljava/nio/ByteBuffer;->position(I)Ljava/nio/Buffer;
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/memory/i;->WO:Ljava/nio/ByteBuffer;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/memory/i;->WK: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;->jM()J
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/memory/s;->jK()J
 
     move-result-wide v0
 
-    iget-wide v2, p0, Lcom/facebook/imagepipeline/memory/i;->WP:J
+    iget-wide v2, p0, Lcom/facebook/imagepipeline/memory/i;->WL: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;->WP:J
+    iget-wide v1, p0, Lcom/facebook/imagepipeline/memory/i;->WL: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;->jM()J
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/memory/s;->jK()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;->jM()J
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/memory/s;->jK()J
 
     move-result-wide v0
 
-    iget-wide v2, p0, Lcom/facebook/imagepipeline/memory/i;->WP:J
+    iget-wide v2, p0, Lcom/facebook/imagepipeline/memory/i;->WL: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;->WO:Ljava/nio/ByteBuffer;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/i;->WK:Ljava/nio/ByteBuffer;
 
     invoke-virtual {v0, p1}, Ljava/nio/ByteBuffer;->position(I)Ljava/nio/Buffer;
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/memory/i;->WO:Ljava/nio/ByteBuffer;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/memory/i;->WK: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;->WO:Ljava/nio/ByteBuffer;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/i;->WK: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;->WO:Ljava/nio/ByteBuffer;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/i;->WK: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 go()J
+.method public final gm()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;->WO:Ljava/nio/ByteBuffer;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/i;->WK: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 jM()J
+.method public final jK()J
     .locals 2
 
-    iget-wide v0, p0, Lcom/facebook/imagepipeline/memory/i;->WP:J
+    iget-wide v0, p0, Lcom/facebook/imagepipeline/memory/i;->WL: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 83af9a09fd..4b3daa4553 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 WZ:Ljava/util/Set;
+.field private final WV:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -29,7 +29,7 @@
     .end annotation
 .end field
 
-.field private final Xa:Lcom/facebook/imagepipeline/memory/g;
+.field private final WW: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;->WZ:Ljava/util/Set;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/r;->WV: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;->Xa:Lcom/facebook/imagepipeline/memory/g;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/r;->WW: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;->WZ:Ljava/util/Set;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/r;->WV: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;->WZ:Ljava/util/Set;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/r;->WV: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;->Xa:Lcom/facebook/imagepipeline/memory/g;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/r;->WW: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;->Xa:Lcom/facebook/imagepipeline/memory/g;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/r;->WW: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 jJ()Ljava/lang/Object;
+.method public final jH()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;->Xa:Lcom/facebook/imagepipeline/memory/g;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/r;->WW:Lcom/facebook/imagepipeline/memory/g;
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/memory/g;->jL()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/memory/g;->jJ()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 ff2f9ef249..aaddb271c3 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 go()J
+.method public abstract gm()J
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/lang/UnsupportedOperationException;
@@ -38,5 +38,5 @@
 .method public abstract isClosed()Z
 .end method
 
-.method public abstract jM()J
+.method public abstract jK()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 33b725d9c7..afc8d95f6e 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 Xb:Lcom/facebook/common/references/CloseableReference;
+.field WX: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;->gr()Lcom/facebook/common/references/CloseableReference;
+    invoke-virtual {p1}, Lcom/facebook/common/references/CloseableReference;->gp()Lcom/facebook/common/references/CloseableReference;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/v;->Xb:Lcom/facebook/common/references/CloseableReference;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/v;->WX:Lcom/facebook/common/references/CloseableReference;
 
     iput p2, p0, Lcom/facebook/imagepipeline/memory/v;->mSize:I
 
     return-void
 .end method
 
-.method private declared-synchronized gw()V
+.method private declared-synchronized gu()V
     .locals 1
 
     monitor-enter p0
@@ -115,7 +115,7 @@
     monitor-enter p0
 
     :try_start_0
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/v;->gw()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/v;->gu()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;->Xb:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/v;->WX: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;->gw()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/v;->gu()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;->Xb:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/v;->WX: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;->Xb:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/v;->WX: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;->Xb:Lcom/facebook/common/references/CloseableReference;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/v;->WX: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;->Xb:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/v;->WX: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 go()J
+.method public final declared-synchronized gm()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;->gw()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/v;->gu()V
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/v;->Xb:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/v;->WX: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;->go()J
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/memory/s;->gm()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;->Xb:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/v;->WX: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;->gw()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/v;->gu()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 35b9a31456..ac7216c2b3 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 XC:[B
+.field protected static final Xy:[B
 
 
 # instance fields
-.field private final XD:Lcom/facebook/imagepipeline/memory/b;
+.field private final Xz:Lcom/facebook/imagepipeline/memory/b;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/a;->jX()V
+    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/a;->jV()V
 
     const/4 v0, 0x2
 
@@ -34,7 +34,7 @@
 
     fill-array-data v0, :array_0
 
-    sput-object v0, Lcom/facebook/imagepipeline/nativecode/DalvikPurgeableDecoder;->XC:[B
+    sput-object v0, Lcom/facebook/imagepipeline/nativecode/DalvikPurgeableDecoder;->Xy:[B
 
     return-void
 
@@ -50,11 +50,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    invoke-static {}, Lcom/facebook/imagepipeline/memory/c;->jI()Lcom/facebook/imagepipeline/memory/b;
+    invoke-static {}, Lcom/facebook/imagepipeline/memory/c;->jG()Lcom/facebook/imagepipeline/memory/b;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/nativecode/DalvikPurgeableDecoder;->XD:Lcom/facebook/imagepipeline/memory/b;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/nativecode/DalvikPurgeableDecoder;->Xz: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;->XD:Lcom/facebook/imagepipeline/memory/b;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/nativecode/DalvikPurgeableDecoder;->Xz: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;->XD:Lcom/facebook/imagepipeline/memory/b;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/nativecode/DalvikPurgeableDecoder;->Xz:Lcom/facebook/imagepipeline/memory/b;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/memory/b;->Wy:Lcom/facebook/common/references/b;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/memory/b;->Wu: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;->XD:Lcom/facebook/imagepipeline/memory/b;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/nativecode/DalvikPurgeableDecoder;->Xz: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;->XD:Lcom/facebook/imagepipeline/memory/b;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/nativecode/DalvikPurgeableDecoder;->Xz:Lcom/facebook/imagepipeline/memory/b;
 
-    invoke-virtual {v2}, Lcom/facebook/imagepipeline/memory/b;->fR()J
+    invoke-virtual {v2}, Lcom/facebook/imagepipeline/memory/b;->fP()J
 
     move-result-wide v2
 
@@ -230,9 +230,9 @@
 
     const/4 v0, 0x3
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/nativecode/DalvikPurgeableDecoder;->XD:Lcom/facebook/imagepipeline/memory/b;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/nativecode/DalvikPurgeableDecoder;->Xz:Lcom/facebook/imagepipeline/memory/b;
 
-    invoke-virtual {v2}, Lcom/facebook/imagepipeline/memory/b;->jH()I
+    invoke-virtual {v2}, Lcom/facebook/imagepipeline/memory/b;->jF()I
 
     move-result v2
 
@@ -244,7 +244,7 @@
 
     const/4 v0, 0x4
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/nativecode/DalvikPurgeableDecoder;->XD:Lcom/facebook/imagepipeline/memory/b;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/nativecode/DalvikPurgeableDecoder;->Xz: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;->Wg:I
+    iget p3, p1, Lcom/facebook/imagepipeline/g/e;->Wc: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;->Wd:Lcom/facebook/common/references/CloseableReference;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/g/e;->VZ: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;->Wg:I
+    iget p3, p1, Lcom/facebook/imagepipeline/g/e;->Wc: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;->Wd:Lcom/facebook/common/references/CloseableReference;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/g/e;->VZ: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 7d955f04e8..4590c05655 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 UZ:I
+.field private UV:I
 
-.field private XF:Z
+.field private XB:Z
 
-.field private XG:Z
+.field private XC:Z
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/c;->fD()V
+    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/c;->fB()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;->XF:Z
+    iput-boolean p1, p0, Lcom/facebook/imagepipeline/nativecode/NativeJpegTranscoder;->XB:Z
 
-    iput p2, p0, Lcom/facebook/imagepipeline/nativecode/NativeJpegTranscoder;->UZ:I
+    iput p2, p0, Lcom/facebook/imagepipeline/nativecode/NativeJpegTranscoder;->UV:I
 
-    iput-boolean p3, p0, Lcom/facebook/imagepipeline/nativecode/NativeJpegTranscoder;->XG:Z
+    iput-boolean p3, p0, Lcom/facebook/imagepipeline/nativecode/NativeJpegTranscoder;->XC:Z
 
     return-void
 .end method
@@ -86,12 +86,12 @@
     :cond_0
     if-nez p3, :cond_1
 
-    invoke-static {}, Lcom/facebook/imagepipeline/a/f;->iA()Lcom/facebook/imagepipeline/a/f;
+    invoke-static {}, Lcom/facebook/imagepipeline/a/f;->iy()Lcom/facebook/imagepipeline/a/f;
 
     move-result-object p3
 
     :cond_1
-    iget v0, p0, Lcom/facebook/imagepipeline/nativecode/NativeJpegTranscoder;->UZ:I
+    iget v0, p0, Lcom/facebook/imagepipeline/nativecode/NativeJpegTranscoder;->UV: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;->XF:Z
+    iget-boolean v2, p0, Lcom/facebook/imagepipeline/nativecode/NativeJpegTranscoder;->XB: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;->XG:Z
+    iget-boolean v3, p0, Lcom/facebook/imagepipeline/nativecode/NativeJpegTranscoder;->XC:Z
 
     if-eqz v3, :cond_2
 
@@ -121,9 +121,9 @@
 
     move-result-object v1
 
-    sget-object v2, Lcom/facebook/imagepipeline/k/e;->aaz:Lcom/facebook/common/d/e;
+    sget-object v2, Lcom/facebook/imagepipeline/k/e;->aav:Lcom/facebook/common/d/e;
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->jt()I
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->jr()I
 
     move-result v3
 
@@ -160,7 +160,7 @@
 
     move-result p3
 
-    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/c;->fD()V
+    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/c;->fB()V
 
     if-lez p4, :cond_3
 
@@ -259,7 +259,7 @@
 
     move-result p3
 
-    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/c;->fD()V
+    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/c;->fB()V
 
     if-lez p4, :cond_a
 
@@ -384,12 +384,12 @@
 
     if-nez p2, :cond_0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/a/f;->iA()Lcom/facebook/imagepipeline/a/f;
+    invoke-static {}, Lcom/facebook/imagepipeline/a/f;->iy()Lcom/facebook/imagepipeline/a/f;
 
     move-result-object p2
 
     :cond_0
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/nativecode/NativeJpegTranscoder;->XF:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/nativecode/NativeJpegTranscoder;->XB: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;->QY:Lcom/facebook/e/c;
+    sget-object v0, Lcom/facebook/e/b;->QU: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 56ba9314fc..2bd1d5a178 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 UZ:I
+.field private final UV:I
 
-.field private final XH:Z
+.field private final XD:Z
 
 
 # direct methods
@@ -18,9 +18,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput p1, p0, Lcom/facebook/imagepipeline/nativecode/NativeJpegTranscoderFactory;->UZ:I
+    iput p1, p0, Lcom/facebook/imagepipeline/nativecode/NativeJpegTranscoderFactory;->UV:I
 
-    iput-boolean p2, p0, Lcom/facebook/imagepipeline/nativecode/NativeJpegTranscoderFactory;->XH:Z
+    iput-boolean p2, p0, Lcom/facebook/imagepipeline/nativecode/NativeJpegTranscoderFactory;->XD:Z
 
     return-void
 .end method
@@ -32,7 +32,7 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    sget-object v0, Lcom/facebook/e/b;->QY:Lcom/facebook/e/c;
+    sget-object v0, Lcom/facebook/e/b;->QU: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;->UZ:I
+    iget v0, p0, Lcom/facebook/imagepipeline/nativecode/NativeJpegTranscoderFactory;->UV:I
 
-    iget-boolean v1, p0, Lcom/facebook/imagepipeline/nativecode/NativeJpegTranscoderFactory;->XH:Z
+    iget-boolean v1, p0, Lcom/facebook/imagepipeline/nativecode/NativeJpegTranscoderFactory;->XD: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 39553c0e05..017a668ccc 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 GI:Ljava/lang/Class;
+.field private static final GE:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -16,18 +16,18 @@
     .end annotation
 .end field
 
-.field private static final XM:[B
+.field private static final XI:[B
 
 
 # instance fields
-.field private final Sh:Lcom/facebook/imagepipeline/memory/d;
+.field private final Sd:Lcom/facebook/imagepipeline/memory/d;
 
-.field private final XK:Lcom/facebook/imagepipeline/platform/PreverificationHelper;
+.field private final XG:Lcom/facebook/imagepipeline/platform/PreverificationHelper;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field final XL:Landroidx/core/util/Pools$SynchronizedPool;
+.field final XH: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;->GI:Ljava/lang/Class;
+    sput-object v0, Lcom/facebook/imagepipeline/platform/b;->GE: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;->XM:[B
+    sput-object v0, Lcom/facebook/imagepipeline/platform/b;->XI:[B
 
     return-void
 
@@ -86,18 +86,18 @@
     const/4 v0, 0x0
 
     :goto_0
-    iput-object v0, p0, Lcom/facebook/imagepipeline/platform/b;->XK:Lcom/facebook/imagepipeline/platform/PreverificationHelper;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/platform/b;->XG:Lcom/facebook/imagepipeline/platform/PreverificationHelper;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/platform/b;->Sh:Lcom/facebook/imagepipeline/memory/d;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/platform/b;->Sd:Lcom/facebook/imagepipeline/memory/d;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/platform/b;->XL:Landroidx/core/util/Pools$SynchronizedPool;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/platform/b;->XH: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;->XL:Landroidx/core/util/Pools$SynchronizedPool;
+    iget-object p3, p0, Lcom/facebook/imagepipeline/platform/b;->XH: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;->Wg:I
+    iget v1, p0, Lcom/facebook/imagepipeline/g/e;->Wc: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;->XK:Lcom/facebook/imagepipeline/platform/PreverificationHelper;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/platform/b;->XG: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;->Sh:Lcom/facebook/imagepipeline/memory/d;
+    iget-object v7, p0, Lcom/facebook/imagepipeline/platform/b;->Sd: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;->XL:Landroidx/core/util/Pools$SynchronizedPool;
+    iget-object p4, p0, Lcom/facebook/imagepipeline/platform/b;->XH: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;->GI:Ljava/lang/Class;
+    sget-object v1, Lcom/facebook/imagepipeline/platform/b;->GE: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;->XL:Landroidx/core/util/Pools$SynchronizedPool;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/platform/b;->XH: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;->Sh:Lcom/facebook/imagepipeline/memory/d;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/platform/b;->Sd: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;->Sh:Lcom/facebook/imagepipeline/memory/d;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/platform/b;->Sd: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;->Sh:Lcom/facebook/imagepipeline/memory/d;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/platform/b;->Sd: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;->Sh:Lcom/facebook/imagepipeline/memory/d;
+    iget-object p3, p0, Lcom/facebook/imagepipeline/platform/b;->Sd: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;->io()Lcom/facebook/imagepipeline/bitmaps/g;
+    invoke-static {}, Lcom/facebook/imagepipeline/bitmaps/g;->im()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;->XL:Landroidx/core/util/Pools$SynchronizedPool;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/platform/b;->XH: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;->XL:Landroidx/core/util/Pools$SynchronizedPool;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/platform/b;->XH: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;->Wf:Lcom/facebook/e/c;
+    iget-object p3, p1, Lcom/facebook/imagepipeline/g/e;->Wb:Lcom/facebook/e/c;
 
-    sget-object v0, Lcom/facebook/e/b;->QY:Lcom/facebook/e/c;
+    sget-object v0, Lcom/facebook/e/b;->QU: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;->We:Lcom/facebook/common/d/l;
+    iget-object p3, p1, Lcom/facebook/imagepipeline/g/e;->Wa:Lcom/facebook/common/d/l;
 
     if-eqz p3, :cond_1
 
     goto :goto_1
 
     :cond_1
-    iget-object p3, p1, Lcom/facebook/imagepipeline/g/e;->Wd:Lcom/facebook/common/references/CloseableReference;
+    iget-object p3, p1, Lcom/facebook/imagepipeline/g/e;->VZ: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;->Wd:Lcom/facebook/common/references/CloseableReference;
+    iget-object p3, p1, Lcom/facebook/imagepipeline/g/e;->VZ: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;->XM:[B
+    sget-object v3, Lcom/facebook/imagepipeline/platform/b;->XI:[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 be7a155b3f..fba86bfad7 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 XN:Ljava/lang/reflect/Method;
+.field private static XJ:Ljava/lang/reflect/Method;
 
 
 # instance fields
-.field private final UT:Lcom/facebook/common/k/b;
+.field private final UO: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;->gC()Lcom/facebook/common/k/b;
+    invoke-static {}, Lcom/facebook/common/k/c;->gA()Lcom/facebook/common/k/b;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/platform/c;->UT:Lcom/facebook/common/k/b;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/platform/c;->UO: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;->UT:Lcom/facebook/common/k/b;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/platform/c;->UO:Lcom/facebook/common/k/b;
 
     if-eqz p2, :cond_0
 
-    iget-object p2, p0, Lcom/facebook/imagepipeline/platform/c;->UT:Lcom/facebook/common/k/b;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/platform/c;->UO: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;->jZ()Ljava/lang/reflect/Method;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/platform/c;->jX()Ljava/lang/reflect/Method;
 
     move-result-object v0
 
@@ -275,13 +275,13 @@
     throw p1
 .end method
 
-.method private declared-synchronized jZ()Ljava/lang/reflect/Method;
+.method private declared-synchronized jX()Ljava/lang/reflect/Method;
     .locals 3
 
     monitor-enter p0
 
     :try_start_0
-    sget-object v0, Lcom/facebook/imagepipeline/platform/c;->XN:Ljava/lang/reflect/Method;
+    sget-object v0, Lcom/facebook/imagepipeline/platform/c;->XJ: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;->XN:Ljava/lang/reflect/Method;
+    sput-object v0, Lcom/facebook/imagepipeline/platform/c;->XJ: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;->XN:Ljava/lang/reflect/Method;
+    sget-object v0, Lcom/facebook/imagepipeline/platform/c;->XJ: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;->XC:[B
+    sget-object v0, Lcom/facebook/imagepipeline/platform/c;->Xy:[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 70d7b8e9d9..4ab6375f53 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 St:Lcom/facebook/imagepipeline/a/e;
+.field public Sp:Lcom/facebook/imagepipeline/a/e;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public Su:Lcom/facebook/imagepipeline/a/f;
+.field public Sq:Lcom/facebook/imagepipeline/a/f;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field Sv:Lcom/facebook/imagepipeline/a/b;
+.field Sr:Lcom/facebook/imagepipeline/a/b;
 
-.field UH:Z
-
-.field UO:Z
-
-.field Ub:Lcom/facebook/imagepipeline/h/c;
+.field TX:Lcom/facebook/imagepipeline/h/c;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public Wi:Lcom/facebook/imagepipeline/a/a;
+.field UD:Z
+
+.field UK:Z
+
+.field public We:Lcom/facebook/imagepipeline/a/a;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public XR:Lcom/facebook/imagepipeline/request/b$b;
+.field public XN:Lcom/facebook/imagepipeline/request/b$b;
 
-.field public Zz:Lcom/facebook/imagepipeline/request/c;
+.field public Zv:Lcom/facebook/imagepipeline/request/c;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public aae:Lcom/facebook/imagepipeline/request/b$a;
+.field public aaa:Lcom/facebook/imagepipeline/request/b$a;
 
-.field aaf:Landroid/net/Uri;
+.field aab:Landroid/net/Uri;
 
-.field aai:Z
+.field aae:Z
 
-.field aaj:Lcom/facebook/imagepipeline/a/d;
+.field aaf:Lcom/facebook/imagepipeline/a/d;
 
-.field aal:Ljava/lang/Boolean;
+.field aah:Ljava/lang/Boolean;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field aam:Ljava/lang/Boolean;
+.field aai:Ljava/lang/Boolean;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field aav:Z
+.field aar:Z
 
 
 # direct methods
@@ -74,55 +74,55 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aaf:Landroid/net/Uri;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aab:Landroid/net/Uri;
 
-    sget-object v1, Lcom/facebook/imagepipeline/request/b$b;->aaq:Lcom/facebook/imagepipeline/request/b$b;
+    sget-object v1, Lcom/facebook/imagepipeline/request/b$b;->aam:Lcom/facebook/imagepipeline/request/b$b;
 
-    iput-object v1, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->XR:Lcom/facebook/imagepipeline/request/b$b;
+    iput-object v1, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->XN:Lcom/facebook/imagepipeline/request/b$b;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->St:Lcom/facebook/imagepipeline/a/e;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Sp:Lcom/facebook/imagepipeline/a/e;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Su:Lcom/facebook/imagepipeline/a/f;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Sq:Lcom/facebook/imagepipeline/a/f;
 
-    invoke-static {}, Lcom/facebook/imagepipeline/a/b;->iz()Lcom/facebook/imagepipeline/a/b;
+    invoke-static {}, Lcom/facebook/imagepipeline/a/b;->ix()Lcom/facebook/imagepipeline/a/b;
 
     move-result-object v1
 
-    iput-object v1, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Sv:Lcom/facebook/imagepipeline/a/b;
+    iput-object v1, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Sr:Lcom/facebook/imagepipeline/a/b;
 
-    sget-object v1, Lcom/facebook/imagepipeline/request/b$a;->aao:Lcom/facebook/imagepipeline/request/b$a;
+    sget-object v1, Lcom/facebook/imagepipeline/request/b$a;->aak:Lcom/facebook/imagepipeline/request/b$a;
 
-    iput-object v1, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aae:Lcom/facebook/imagepipeline/request/b$a;
+    iput-object v1, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aaa:Lcom/facebook/imagepipeline/request/b$a;
 
-    invoke-static {}, Lcom/facebook/imagepipeline/b/i;->iK()Lcom/facebook/imagepipeline/b/i$b;
+    invoke-static {}, Lcom/facebook/imagepipeline/b/i;->iI()Lcom/facebook/imagepipeline/b/i$b;
 
     move-result-object v1
 
-    iget-boolean v1, v1, Lcom/facebook/imagepipeline/b/i$b;->UO:Z
+    iget-boolean v1, v1, Lcom/facebook/imagepipeline/b/i$b;->UK:Z
 
-    iput-boolean v1, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->UO:Z
+    iput-boolean v1, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->UK:Z
 
     const/4 v1, 0x0
 
-    iput-boolean v1, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aai:Z
+    iput-boolean v1, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aae:Z
 
-    sget-object v1, Lcom/facebook/imagepipeline/a/d;->TK:Lcom/facebook/imagepipeline/a/d;
+    sget-object v1, Lcom/facebook/imagepipeline/a/d;->TG:Lcom/facebook/imagepipeline/a/d;
 
-    iput-object v1, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aaj:Lcom/facebook/imagepipeline/a/d;
+    iput-object v1, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aaf:Lcom/facebook/imagepipeline/a/d;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Zz:Lcom/facebook/imagepipeline/request/c;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Zv:Lcom/facebook/imagepipeline/request/c;
 
     const/4 v1, 0x1
 
-    iput-boolean v1, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->UH:Z
+    iput-boolean v1, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->UD:Z
 
-    iput-boolean v1, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aav:Z
+    iput-boolean v1, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aar:Z
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aal:Ljava/lang/Boolean;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aah:Ljava/lang/Boolean;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Wi:Lcom/facebook/imagepipeline/a/a;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->We:Lcom/facebook/imagepipeline/a/a;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aam:Ljava/lang/Boolean;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aai: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;->aaf:Landroid/net/Uri;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/request/b;->aab: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;->Sv:Lcom/facebook/imagepipeline/a/b;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->Sr:Lcom/facebook/imagepipeline/a/b;
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Sv:Lcom/facebook/imagepipeline/a/b;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Sr:Lcom/facebook/imagepipeline/a/b;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->Wi:Lcom/facebook/imagepipeline/a/a;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->We:Lcom/facebook/imagepipeline/a/a;
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Wi:Lcom/facebook/imagepipeline/a/a;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->We:Lcom/facebook/imagepipeline/a/a;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->aae:Lcom/facebook/imagepipeline/request/b$a;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->aaa:Lcom/facebook/imagepipeline/request/b$a;
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aae:Lcom/facebook/imagepipeline/request/b$a;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aaa:Lcom/facebook/imagepipeline/request/b$a;
 
-    iget-boolean v1, p0, Lcom/facebook/imagepipeline/request/b;->aai:Z
+    iget-boolean v1, p0, Lcom/facebook/imagepipeline/request/b;->aae:Z
 
-    iput-boolean v1, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aai:Z
+    iput-boolean v1, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aae:Z
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->XR:Lcom/facebook/imagepipeline/request/b$b;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->XN:Lcom/facebook/imagepipeline/request/b$b;
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->XR:Lcom/facebook/imagepipeline/request/b$b;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->XN:Lcom/facebook/imagepipeline/request/b$b;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->Zz:Lcom/facebook/imagepipeline/request/c;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->Zv:Lcom/facebook/imagepipeline/request/c;
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Zz:Lcom/facebook/imagepipeline/request/c;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Zv:Lcom/facebook/imagepipeline/request/c;
 
-    iget-boolean v1, p0, Lcom/facebook/imagepipeline/request/b;->UO:Z
+    iget-boolean v1, p0, Lcom/facebook/imagepipeline/request/b;->UK:Z
 
-    iput-boolean v1, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->UO:Z
+    iput-boolean v1, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->UK:Z
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->aaj:Lcom/facebook/imagepipeline/a/d;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->aaf:Lcom/facebook/imagepipeline/a/d;
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aaj:Lcom/facebook/imagepipeline/a/d;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aaf:Lcom/facebook/imagepipeline/a/d;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->St:Lcom/facebook/imagepipeline/a/e;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->Sp:Lcom/facebook/imagepipeline/a/e;
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->St:Lcom/facebook/imagepipeline/a/e;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Sp:Lcom/facebook/imagepipeline/a/e;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->Ub:Lcom/facebook/imagepipeline/h/c;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->TX:Lcom/facebook/imagepipeline/h/c;
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Ub:Lcom/facebook/imagepipeline/h/c;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->TX:Lcom/facebook/imagepipeline/h/c;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->Su:Lcom/facebook/imagepipeline/a/f;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->Sq:Lcom/facebook/imagepipeline/a/f;
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Su:Lcom/facebook/imagepipeline/a/f;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Sq:Lcom/facebook/imagepipeline/a/f;
 
-    iget-object p0, p0, Lcom/facebook/imagepipeline/request/b;->aal:Ljava/lang/Boolean;
+    iget-object p0, p0, Lcom/facebook/imagepipeline/request/b;->aah:Ljava/lang/Boolean;
 
-    iput-object p0, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aal:Ljava/lang/Boolean;
+    iput-object p0, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aah: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;->aaf:Landroid/net/Uri;
+    iput-object p0, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aab: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;->Su:Lcom/facebook/imagepipeline/a/f;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Sq: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;->St:Lcom/facebook/imagepipeline/a/e;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Sp:Lcom/facebook/imagepipeline/a/e;
 
     return-object p0
 .end method
 
-.method public final kH()Lcom/facebook/imagepipeline/request/b;
+.method public final kF()Lcom/facebook/imagepipeline/request/b;
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aaf:Landroid/net/Uri;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aab: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;->aaf:Landroid/net/Uri;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aab: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;->aaf:Landroid/net/Uri;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aab: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;->aaf:Landroid/net/Uri;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aab: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;->aaf:Landroid/net/Uri;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aab: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;->aaf:Landroid/net/Uri;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aab: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 db8c1198e8..1ae473ed19 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 St:Lcom/facebook/imagepipeline/a/e;
+.field public final Sp:Lcom/facebook/imagepipeline/a/e;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public final Su:Lcom/facebook/imagepipeline/a/f;
+.field public final Sq:Lcom/facebook/imagepipeline/a/f;
 
-.field public final Sv:Lcom/facebook/imagepipeline/a/b;
+.field public final Sr:Lcom/facebook/imagepipeline/a/b;
 
-.field public final UO:Z
-
-.field public final Ub:Lcom/facebook/imagepipeline/h/c;
+.field public final TX:Lcom/facebook/imagepipeline/h/c;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public final Wi:Lcom/facebook/imagepipeline/a/a;
+.field public final UK:Z
+
+.field public final We:Lcom/facebook/imagepipeline/a/a;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public final XR:Lcom/facebook/imagepipeline/request/b$b;
+.field public final XN:Lcom/facebook/imagepipeline/request/b$b;
 
-.field public final Yv:Z
+.field public final Yr:Z
 
-.field public final Zz:Lcom/facebook/imagepipeline/request/c;
+.field public final Zv:Lcom/facebook/imagepipeline/request/c;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public final aae:Lcom/facebook/imagepipeline/request/b$a;
+.field public final aaa:Lcom/facebook/imagepipeline/request/b$a;
 
-.field public final aaf:Landroid/net/Uri;
+.field public final aab:Landroid/net/Uri;
 
-.field public final aag:I
+.field public final aac:I
 
-.field private aah:Ljava/io/File;
+.field private aad:Ljava/io/File;
 
-.field public final aai:Z
+.field public final aae:Z
 
-.field public final aaj:Lcom/facebook/imagepipeline/a/d;
+.field public final aaf:Lcom/facebook/imagepipeline/a/d;
 
-.field public final aak:Z
+.field public final aag:Z
 
-.field final aal:Ljava/lang/Boolean;
+.field final aah:Ljava/lang/Boolean;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public final aam:Ljava/lang/Boolean;
+.field public final aai: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;->aae:Lcom/facebook/imagepipeline/request/b$a;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aaa:Lcom/facebook/imagepipeline/request/b$a;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/request/b;->aae:Lcom/facebook/imagepipeline/request/b$a;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/request/b;->aaa:Lcom/facebook/imagepipeline/request/b$a;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aaf:Landroid/net/Uri;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aab:Landroid/net/Uri;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/request/b;->aaf:Landroid/net/Uri;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/request/b;->aab:Landroid/net/Uri;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/request/b;->aaf:Landroid/net/Uri;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/request/b;->aab: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;->aag:I
+    iput v0, p0, Lcom/facebook/imagepipeline/request/b;->aac:I
 
-    iget-boolean v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->UO:Z
+    iget-boolean v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->UK:Z
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/request/b;->UO:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/request/b;->UK:Z
 
-    iget-boolean v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aai:Z
+    iget-boolean v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aae:Z
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/request/b;->aai:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/request/b;->aae:Z
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Sv:Lcom/facebook/imagepipeline/a/b;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Sr:Lcom/facebook/imagepipeline/a/b;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/request/b;->Sv:Lcom/facebook/imagepipeline/a/b;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/request/b;->Sr:Lcom/facebook/imagepipeline/a/b;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->St:Lcom/facebook/imagepipeline/a/e;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Sp:Lcom/facebook/imagepipeline/a/e;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/request/b;->St:Lcom/facebook/imagepipeline/a/e;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/request/b;->Sp:Lcom/facebook/imagepipeline/a/e;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Su:Lcom/facebook/imagepipeline/a/f;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Sq:Lcom/facebook/imagepipeline/a/f;
 
     if-nez v0, :cond_8
 
-    invoke-static {}, Lcom/facebook/imagepipeline/a/f;->iA()Lcom/facebook/imagepipeline/a/f;
+    invoke-static {}, Lcom/facebook/imagepipeline/a/f;->iy()Lcom/facebook/imagepipeline/a/f;
 
     move-result-object v0
 
     goto :goto_1
 
     :cond_8
-    iget-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Su:Lcom/facebook/imagepipeline/a/f;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Sq:Lcom/facebook/imagepipeline/a/f;
 
     :goto_1
-    iput-object v0, p0, Lcom/facebook/imagepipeline/request/b;->Su:Lcom/facebook/imagepipeline/a/f;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/request/b;->Sq:Lcom/facebook/imagepipeline/a/f;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Wi:Lcom/facebook/imagepipeline/a/a;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->We:Lcom/facebook/imagepipeline/a/a;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/request/b;->Wi:Lcom/facebook/imagepipeline/a/a;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/request/b;->We:Lcom/facebook/imagepipeline/a/a;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aaj:Lcom/facebook/imagepipeline/a/d;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aaf:Lcom/facebook/imagepipeline/a/d;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/request/b;->aaj:Lcom/facebook/imagepipeline/a/d;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/request/b;->aaf:Lcom/facebook/imagepipeline/a/d;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->XR:Lcom/facebook/imagepipeline/request/b$b;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->XN:Lcom/facebook/imagepipeline/request/b$b;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/request/b;->XR:Lcom/facebook/imagepipeline/request/b$b;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/request/b;->XN:Lcom/facebook/imagepipeline/request/b$b;
 
-    iget-boolean v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->UH:Z
+    iget-boolean v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->UD:Z
 
     if-eqz v0, :cond_9
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aaf:Landroid/net/Uri;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aab: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;->aak:Z
+    iput-boolean v1, p0, Lcom/facebook/imagepipeline/request/b;->aag:Z
 
-    iget-boolean v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aav:Z
+    iget-boolean v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aar:Z
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/request/b;->Yv:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/request/b;->Yr:Z
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aal:Ljava/lang/Boolean;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aah:Ljava/lang/Boolean;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/request/b;->aal:Ljava/lang/Boolean;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/request/b;->aah:Ljava/lang/Boolean;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Zz:Lcom/facebook/imagepipeline/request/c;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Zv:Lcom/facebook/imagepipeline/request/c;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/request/b;->Zz:Lcom/facebook/imagepipeline/request/c;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/request/b;->Zv:Lcom/facebook/imagepipeline/request/c;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Ub:Lcom/facebook/imagepipeline/h/c;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->TX:Lcom/facebook/imagepipeline/h/c;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/request/b;->Ub:Lcom/facebook/imagepipeline/h/c;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/request/b;->TX:Lcom/facebook/imagepipeline/h/c;
 
-    iget-object p1, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aam:Ljava/lang/Boolean;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aai:Ljava/lang/Boolean;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/request/b;->aam:Ljava/lang/Boolean;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/request/b;->aai: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;->aaf:Landroid/net/Uri;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/request/b;->aab:Landroid/net/Uri;
 
-    iget-object v2, p1, Lcom/facebook/imagepipeline/request/b;->aaf:Landroid/net/Uri;
+    iget-object v2, p1, Lcom/facebook/imagepipeline/request/b;->aab: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;->aae:Lcom/facebook/imagepipeline/request/b$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/request/b;->aaa:Lcom/facebook/imagepipeline/request/b$a;
 
-    iget-object v2, p1, Lcom/facebook/imagepipeline/request/b;->aae:Lcom/facebook/imagepipeline/request/b$a;
+    iget-object v2, p1, Lcom/facebook/imagepipeline/request/b;->aaa: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;->aah:Ljava/io/File;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/request/b;->aad:Ljava/io/File;
 
-    iget-object v2, p1, Lcom/facebook/imagepipeline/request/b;->aah:Ljava/io/File;
+    iget-object v2, p1, Lcom/facebook/imagepipeline/request/b;->aad: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;->Wi:Lcom/facebook/imagepipeline/a/a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/request/b;->We:Lcom/facebook/imagepipeline/a/a;
 
-    iget-object v2, p1, Lcom/facebook/imagepipeline/request/b;->Wi:Lcom/facebook/imagepipeline/a/a;
+    iget-object v2, p1, Lcom/facebook/imagepipeline/request/b;->We: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;->Sv:Lcom/facebook/imagepipeline/a/b;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/request/b;->Sr:Lcom/facebook/imagepipeline/a/b;
 
-    iget-object v2, p1, Lcom/facebook/imagepipeline/request/b;->Sv:Lcom/facebook/imagepipeline/a/b;
+    iget-object v2, p1, Lcom/facebook/imagepipeline/request/b;->Sr: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;->St:Lcom/facebook/imagepipeline/a/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/request/b;->Sp:Lcom/facebook/imagepipeline/a/e;
 
-    iget-object v2, p1, Lcom/facebook/imagepipeline/request/b;->St:Lcom/facebook/imagepipeline/a/e;
+    iget-object v2, p1, Lcom/facebook/imagepipeline/request/b;->Sp: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;->Su:Lcom/facebook/imagepipeline/a/f;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/request/b;->Sq:Lcom/facebook/imagepipeline/a/f;
 
-    iget-object v2, p1, Lcom/facebook/imagepipeline/request/b;->Su:Lcom/facebook/imagepipeline/a/f;
+    iget-object v2, p1, Lcom/facebook/imagepipeline/request/b;->Sq: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;->Zz:Lcom/facebook/imagepipeline/request/c;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/request/b;->Zv: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;->Zz:Lcom/facebook/imagepipeline/request/c;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/request/b;->Zv: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;->Zz:Lcom/facebook/imagepipeline/request/c;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/request/b;->Zv: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;->aae:Lcom/facebook/imagepipeline/request/b$a;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/request/b;->aaa:Lcom/facebook/imagepipeline/request/b$a;
 
     aput-object v3, v1, v2
 
     const/4 v2, 0x1
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/request/b;->aaf:Landroid/net/Uri;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/request/b;->aab:Landroid/net/Uri;
 
     aput-object v3, v1, v2
 
     const/4 v2, 0x2
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/request/b;->aah:Ljava/io/File;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/request/b;->aad:Ljava/io/File;
 
     aput-object v3, v1, v2
 
     const/4 v2, 0x3
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/request/b;->Wi:Lcom/facebook/imagepipeline/a/a;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/request/b;->We:Lcom/facebook/imagepipeline/a/a;
 
     aput-object v3, v1, v2
 
     const/4 v2, 0x4
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/request/b;->Sv:Lcom/facebook/imagepipeline/a/b;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/request/b;->Sr:Lcom/facebook/imagepipeline/a/b;
 
     aput-object v3, v1, v2
 
     const/4 v2, 0x5
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/request/b;->St:Lcom/facebook/imagepipeline/a/e;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/request/b;->Sp:Lcom/facebook/imagepipeline/a/e;
 
     aput-object v3, v1, v2
 
     const/4 v2, 0x6
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/request/b;->Su:Lcom/facebook/imagepipeline/a/f;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/request/b;->Sq: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;->aam:Ljava/lang/Boolean;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/request/b;->aai:Ljava/lang/Boolean;
 
     aput-object v2, v1, v0
 
@@ -478,19 +478,19 @@
     return v0
 .end method
 
-.method public final declared-synchronized kG()Ljava/io/File;
+.method public final declared-synchronized kE()Ljava/io/File;
     .locals 2
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/request/b;->aah:Ljava/io/File;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/request/b;->aad:Ljava/io/File;
 
     if-nez v0, :cond_0
 
     new-instance v0, Ljava/io/File;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->aaf:Landroid/net/Uri;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->aab: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;->aah:Ljava/io/File;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/request/b;->aad:Ljava/io/File;
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/request/b;->aah:Ljava/io/File;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/request/b;->aad: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;->aaf:Landroid/net/Uri;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->aab:Landroid/net/Uri;
 
     const-string v2, "uri"
 
@@ -532,7 +532,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->aae:Lcom/facebook/imagepipeline/request/b$a;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->aaa: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;->Sv:Lcom/facebook/imagepipeline/a/b;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->Sr: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;->Zz:Lcom/facebook/imagepipeline/request/c;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->Zv: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;->aaj:Lcom/facebook/imagepipeline/a/d;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->aaf: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;->St:Lcom/facebook/imagepipeline/a/e;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->Sp: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;->Su:Lcom/facebook/imagepipeline/a/f;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->Sq: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;->Wi:Lcom/facebook/imagepipeline/a/a;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->We: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;->aam:Ljava/lang/Boolean;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->aai: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 1735c939fa..6a38bee8b0 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 aaB:Landroidx/core/util/Pools$SynchronizedPool;
+.field private static final aax: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;->aaB:Landroidx/core/util/Pools$SynchronizedPool;
+    sput-object v0, Lcom/facebook/imageutils/a;->aax: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;->aaC:[I
+    sget-object v0, Lcom/facebook/imageutils/a$1;->aay:[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;->aaB:Landroidx/core/util/Pools$SynchronizedPool;
+    sget-object v0, Lcom/facebook/imageutils/a;->aax: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;->aaB:Landroidx/core/util/Pools$SynchronizedPool;
+    sget-object p0, Lcom/facebook/imageutils/a;->aax: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;->aaB:Landroidx/core/util/Pools$SynchronizedPool;
+    sget-object v1, Lcom/facebook/imageutils/a;->aax: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;->aaB:Landroidx/core/util/Pools$SynchronizedPool;
+    sget-object v0, Lcom/facebook/imageutils/a;->aax: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;->aaB:Landroidx/core/util/Pools$SynchronizedPool;
+    sget-object v1, Lcom/facebook/imageutils/a;->aax: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;->aaB:Landroidx/core/util/Pools$SynchronizedPool;
+    sget-object v1, Lcom/facebook/imageutils/a;->aax: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 f911027614..57b9c60ae1 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 TH:Landroid/graphics/ColorSpace;
+.field public final TD:Landroid/graphics/ColorSpace;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public final aaD:Landroid/util/Pair;
+.field public final aaz: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;->aaD:Landroid/util/Pair;
+    iput-object v0, p0, Lcom/facebook/imageutils/b;->aaz:Landroid/util/Pair;
 
-    iput-object p3, p0, Lcom/facebook/imageutils/b;->TH:Landroid/graphics/ColorSpace;
+    iput-object p3, p0, Lcom/facebook/imageutils/b;->TD: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 e695ba307b..811f9a804d 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 abU:Z
+.field static final abQ:Z
 
-.field static abV:Lcom/facebook/soloader/h;
+.field static abR:Lcom/facebook/soloader/h;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private static final abW:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+.field private static final abS:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
 
-.field private static abX:[Lcom/facebook/soloader/i;
+.field private static abT:[Lcom/facebook/soloader/i;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private static abY:I
+.field private static abU:I
 
-.field private static abZ:[Lcom/facebook/soloader/k;
+.field private static abV:[Lcom/facebook/soloader/k;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private static aca:Lcom/facebook/soloader/b;
+.field private static abW:Lcom/facebook/soloader/b;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private static final acb:Ljava/util/HashSet;
+.field private static final abX:Ljava/util/HashSet;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/HashSet<",
@@ -49,7 +49,7 @@
     .end annotation
 .end field
 
-.field private static final acc:Ljava/util/Map;
+.field private static final abY:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -60,7 +60,7 @@
     .end annotation
 .end field
 
-.field private static final acd:Ljava/util/Set;
+.field private static final abZ:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -70,12 +70,12 @@
     .end annotation
 .end field
 
-.field private static ace:Lcom/facebook/soloader/j;
+.field private static aca:Lcom/facebook/soloader/j;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private static acf:I
+.field private static acb:I
 
 
 # direct methods
@@ -86,27 +86,27 @@
 
     invoke-direct {v0}, Ljava/util/concurrent/locks/ReentrantReadWriteLock;-><init>()V
 
-    sput-object v0, Lcom/facebook/soloader/SoLoader;->abW:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+    sput-object v0, Lcom/facebook/soloader/SoLoader;->abS:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
 
     const/4 v0, 0x0
 
-    sput-object v0, Lcom/facebook/soloader/SoLoader;->abX:[Lcom/facebook/soloader/i;
+    sput-object v0, Lcom/facebook/soloader/SoLoader;->abT:[Lcom/facebook/soloader/i;
 
     const/4 v1, 0x0
 
-    sput v1, Lcom/facebook/soloader/SoLoader;->abY:I
+    sput v1, Lcom/facebook/soloader/SoLoader;->abU:I
 
     new-instance v2, Ljava/util/HashSet;
 
     invoke-direct {v2}, Ljava/util/HashSet;-><init>()V
 
-    sput-object v2, Lcom/facebook/soloader/SoLoader;->acb:Ljava/util/HashSet;
+    sput-object v2, Lcom/facebook/soloader/SoLoader;->abX:Ljava/util/HashSet;
 
     new-instance v2, Ljava/util/HashMap;
 
     invoke-direct {v2}, Ljava/util/HashMap;-><init>()V
 
-    sput-object v2, Lcom/facebook/soloader/SoLoader;->acc:Ljava/util/Map;
+    sput-object v2, Lcom/facebook/soloader/SoLoader;->abY: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;->acd:Ljava/util/Set;
+    sput-object v2, Lcom/facebook/soloader/SoLoader;->abZ:Ljava/util/Set;
 
-    sput-object v0, Lcom/facebook/soloader/SoLoader;->ace:Lcom/facebook/soloader/j;
+    sput-object v0, Lcom/facebook/soloader/SoLoader;->aca: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;->abU:Z
+    sput-boolean v1, Lcom/facebook/soloader/SoLoader;->abQ: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;->abW:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+    sget-object v5, Lcom/facebook/soloader/SoLoader;->abS: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;->abX:[Lcom/facebook/soloader/i;
+    sget-object v5, Lcom/facebook/soloader/SoLoader;->abT:[Lcom/facebook/soloader/i;
 
     if-nez v5, :cond_9
 
@@ -193,7 +193,7 @@
 
     const/4 v5, 0x0
 
-    sput v5, Lcom/facebook/soloader/SoLoader;->acf:I
+    sput v5, Lcom/facebook/soloader/SoLoader;->acb: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;->aca:Lcom/facebook/soloader/b;
+    sput-object v9, Lcom/facebook/soloader/SoLoader;->abW: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;->aca:Lcom/facebook/soloader/b;
+    sget-object v9, Lcom/facebook/soloader/SoLoader;->abW: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;->aca:Lcom/facebook/soloader/b;
+    sget-object v8, Lcom/facebook/soloader/SoLoader;->abW: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;->acf:I
+    sget v9, Lcom/facebook/soloader/SoLoader;->acb:I
 
     and-int/lit8 v9, v9, 0x8
 
     if-eqz v9, :cond_5
 
-    sput-object v4, Lcom/facebook/soloader/SoLoader;->abZ:[Lcom/facebook/soloader/k;
+    sput-object v4, Lcom/facebook/soloader/SoLoader;->abV:[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;->abZ:[Lcom/facebook/soloader/k;
+    sput-object v0, Lcom/facebook/soloader/SoLoader;->abV:[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;->li()I
+    invoke-static {}, Lcom/facebook/soloader/SoLoader;->lg()I
 
     move-result v4
 
@@ -543,15 +543,15 @@
     goto :goto_6
 
     :cond_8
-    sput-object v0, Lcom/facebook/soloader/SoLoader;->abX:[Lcom/facebook/soloader/i;
+    sput-object v0, Lcom/facebook/soloader/SoLoader;->abT:[Lcom/facebook/soloader/i;
 
-    sget v0, Lcom/facebook/soloader/SoLoader;->abY:I
+    sget v0, Lcom/facebook/soloader/SoLoader;->abU:I
 
     const/4 v4, 0x1
 
     add-int/2addr v0, v4
 
-    sput v0, Lcom/facebook/soloader/SoLoader;->abY:I
+    sput v0, Lcom/facebook/soloader/SoLoader;->abU: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;->abX:[Lcom/facebook/soloader/i;
+    sget-object v4, Lcom/facebook/soloader/SoLoader;->abT:[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;->abW:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+    sget-object v0, Lcom/facebook/soloader/SoLoader;->abS: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;->abW:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+    sget-object v1, Lcom/facebook/soloader/SoLoader;->abS: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;->lj()Ljava/lang/reflect/Method;
+    invoke-static {}, Lcom/facebook/soloader/SoLoader;->lh()Ljava/lang/reflect/Method;
 
     move-result-object v5
 
@@ -663,7 +663,7 @@
 
     if-eqz v1, :cond_1
 
-    invoke-static {}, Lcom/facebook/soloader/SoLoader$Api14Utils;->lk()Ljava/lang/String;
+    invoke-static {}, Lcom/facebook/soloader/SoLoader$Api14Utils;->li()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;->abV:Lcom/facebook/soloader/h;
+    sput-object v7, Lcom/facebook/soloader/SoLoader;->abR: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;->acd:Ljava/util/Set;
+    sget-object v0, Lcom/facebook/soloader/SoLoader;->abZ: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;->acb:Ljava/util/HashSet;
+    sget-object v0, Lcom/facebook/soloader/SoLoader;->abX: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;->acc:Ljava/util/Map;
+    sget-object v0, Lcom/facebook/soloader/SoLoader;->abY: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;->acc:Ljava/util/Map;
+    sget-object v0, Lcom/facebook/soloader/SoLoader;->abY: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;->acc:Ljava/util/Map;
+    sget-object v2, Lcom/facebook/soloader/SoLoader;->abY: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;->acb:Ljava/util/HashSet;
+    sget-object v2, Lcom/facebook/soloader/SoLoader;->abX: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;->acb:Ljava/util/HashSet;
+    sget-object p3, Lcom/facebook/soloader/SoLoader;->abX: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;->acd:Ljava/util/Set;
+    sget-object p0, Lcom/facebook/soloader/SoLoader;->abZ: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;->abW:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+    sget-object v0, Lcom/facebook/soloader/SoLoader;->abS: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;->abX:[Lcom/facebook/soloader/i;
+    sget-object v0, Lcom/facebook/soloader/SoLoader;->abT:[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;->abW:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+    sget-object v0, Lcom/facebook/soloader/SoLoader;->abS: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;->abX:[Lcom/facebook/soloader/i;
+    sget-object v0, Lcom/facebook/soloader/SoLoader;->abT:[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;->abW:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+    sget-object v0, Lcom/facebook/soloader/SoLoader;->abS: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;->abW:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+    sget-object v0, Lcom/facebook/soloader/SoLoader;->abS: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;->acb:Ljava/util/HashSet;
+    sget-object v1, Lcom/facebook/soloader/SoLoader;->abX: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;->ace:Lcom/facebook/soloader/j;
+    sget-object v2, Lcom/facebook/soloader/SoLoader;->aca: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;->abW:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+    sget-object p0, Lcom/facebook/soloader/SoLoader;->abS: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;->abW:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+    sget-object v0, Lcom/facebook/soloader/SoLoader;->abS: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;->abW:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+    sget-object v0, Lcom/facebook/soloader/SoLoader;->abS: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;->abW:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+    sget-object v0, Lcom/facebook/soloader/SoLoader;->abS: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;->abX:[Lcom/facebook/soloader/i;
+    sget-object v0, Lcom/facebook/soloader/SoLoader;->abT:[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;->abW:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+    sget-object v0, Lcom/facebook/soloader/SoLoader;->abS: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;->abU:Z
+    sget-boolean v5, Lcom/facebook/soloader/SoLoader;->abQ:Z
 
     if-eqz v5, :cond_1
 
@@ -1302,7 +1302,7 @@
     const/4 v6, 0x3
 
     :try_start_1
-    sget-object v7, Lcom/facebook/soloader/SoLoader;->abW:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+    sget-object v7, Lcom/facebook/soloader/SoLoader;->abS: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;->abY:I
+    sget v7, Lcom/facebook/soloader/SoLoader;->abU: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;->abX:[Lcom/facebook/soloader/i;
+    sget-object v9, Lcom/facebook/soloader/SoLoader;->abT:[Lcom/facebook/soloader/i;
 
     array-length v9, v9
 
     if-ge v8, v9, :cond_5
 
-    sget-object v9, Lcom/facebook/soloader/SoLoader;->abX:[Lcom/facebook/soloader/i;
+    sget-object v9, Lcom/facebook/soloader/SoLoader;->abT:[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;->abZ:[Lcom/facebook/soloader/k;
+    sget-object v9, Lcom/facebook/soloader/SoLoader;->abV:[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;->abZ:[Lcom/facebook/soloader/k;
+    sget-object v8, Lcom/facebook/soloader/SoLoader;->abV:[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;->abW:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+    sget-object v0, Lcom/facebook/soloader/SoLoader;->abS: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;->abW:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+    sget-object v8, Lcom/facebook/soloader/SoLoader;->abS: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;->abW:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+    sget-object v8, Lcom/facebook/soloader/SoLoader;->abS: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;->aca:Lcom/facebook/soloader/b;
+    sget-object v8, Lcom/facebook/soloader/SoLoader;->abW:Lcom/facebook/soloader/b;
 
     if-eqz v8, :cond_6
 
-    sget-object v8, Lcom/facebook/soloader/SoLoader;->aca:Lcom/facebook/soloader/b;
+    sget-object v8, Lcom/facebook/soloader/SoLoader;->abW:Lcom/facebook/soloader/b;
 
-    invoke-virtual {v8}, Lcom/facebook/soloader/b;->ld()Z
+    invoke-virtual {v8}, Lcom/facebook/soloader/b;->lb()Z
 
     move-result v8
 
     if-eqz v8, :cond_6
 
-    sget v8, Lcom/facebook/soloader/SoLoader;->abY:I
+    sget v8, Lcom/facebook/soloader/SoLoader;->abU:I
 
     add-int/2addr v8, v3
 
-    sput v8, Lcom/facebook/soloader/SoLoader;->abY:I
+    sput v8, Lcom/facebook/soloader/SoLoader;->abU:I
 
     :cond_6
-    sget v8, Lcom/facebook/soloader/SoLoader;->abY:I
+    sget v8, Lcom/facebook/soloader/SoLoader;->abU: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;->abW:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+    sget-object v8, Lcom/facebook/soloader/SoLoader;->abS: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;->abW:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+    sget-object v0, Lcom/facebook/soloader/SoLoader;->abS: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;->abU:Z
+    sget-boolean p1, Lcom/facebook/soloader/SoLoader;->abQ:Z
 
     if-eqz p1, :cond_9
 
@@ -1533,7 +1533,7 @@
     :catchall_2
     move-exception p1
 
-    sget-boolean v0, Lcom/facebook/soloader/SoLoader;->abU:Z
+    sget-boolean v0, Lcom/facebook/soloader/SoLoader;->abQ:Z
 
     if-eqz v0, :cond_c
 
@@ -1639,7 +1639,7 @@
     :catchall_3
     move-exception p0
 
-    sget-object p1, Lcom/facebook/soloader/SoLoader;->abW:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+    sget-object p1, Lcom/facebook/soloader/SoLoader;->abS: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 li()I
+.method private static lg()I
     .locals 2
 
-    sget-object v0, Lcom/facebook/soloader/SoLoader;->abW:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+    sget-object v0, Lcom/facebook/soloader/SoLoader;->abS: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;->acf:I
+    sget v0, Lcom/facebook/soloader/SoLoader;->acb: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;->abW:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+    sget-object v1, Lcom/facebook/soloader/SoLoader;->abS: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;->abW:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+    sget-object v1, Lcom/facebook/soloader/SoLoader;->abS: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 lj()Ljava/lang/reflect/Method;
+.method private static lh()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 7b3a50e3e9..d7c7a72f89 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 abH:Ljava/io/File;
+.field protected final abD: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;->abH:Ljava/io/File;
+    iput-object p1, p0, Lcom/facebook/soloader/c;->abD: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;->abU:Z
+    sget-boolean v0, Lcom/facebook/soloader/SoLoader;->abQ: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;->abU:Z
+    sget-boolean v0, Lcom/facebook/soloader/SoLoader;->abQ:Z
 
     if-eqz v0, :cond_1
 
@@ -138,7 +138,7 @@
     :catchall_0
     move-exception p0
 
-    sget-boolean v0, Lcom/facebook/soloader/SoLoader;->abU:Z
+    sget-boolean v0, Lcom/facebook/soloader/SoLoader;->abQ:Z
 
     if-eqz v0, :cond_2
 
@@ -158,7 +158,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/soloader/c;->abH:Ljava/io/File;
+    iget-object v0, p0, Lcom/facebook/soloader/c;->abD: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;->abV:Lcom/facebook/soloader/h;
+    sget-object p1, Lcom/facebook/soloader/SoLoader;->abR: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;->abH:Ljava/io/File;
+    iget-object v0, p0, Lcom/facebook/soloader/c;->abD: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;->abH:Ljava/io/File;
+    iget-object v0, p0, Lcom/facebook/soloader/c;->abD: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 7fa6cc360f..035b9212d0 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 abM:[Lcom/facebook/soloader/e$a;
+.field abI:[Lcom/facebook/soloader/e$a;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field final abN:Ljava/util/zip/ZipFile;
+.field final abJ:Ljava/util/zip/ZipFile;
 
-.field private final abO:Lcom/facebook/soloader/k;
+.field private final abK:Lcom/facebook/soloader/k;
 
-.field final synthetic abP:Lcom/facebook/soloader/e;
+.field final synthetic abL:Lcom/facebook/soloader/e;
 
 
 # direct methods
@@ -42,19 +42,19 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/facebook/soloader/e$b;->abP:Lcom/facebook/soloader/e;
+    iput-object p1, p0, Lcom/facebook/soloader/e$b;->abL: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;->abI:Ljava/io/File;
+    iget-object p1, p1, Lcom/facebook/soloader/e;->abE: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;->abN:Ljava/util/zip/ZipFile;
+    iput-object v0, p0, Lcom/facebook/soloader/e$b;->abJ:Ljava/util/zip/ZipFile;
 
-    iput-object p2, p0, Lcom/facebook/soloader/e$b;->abO:Lcom/facebook/soloader/k;
+    iput-object p2, p0, Lcom/facebook/soloader/e$b;->abK:Lcom/facebook/soloader/k;
 
     return-void
 .end method
@@ -77,17 +77,17 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/soloader/e$b;->abN:Ljava/util/zip/ZipFile;
+    iget-object v0, p0, Lcom/facebook/soloader/e$b;->abJ:Ljava/util/zip/ZipFile;
 
     invoke-virtual {v0}, Ljava/util/zip/ZipFile;->close()V
 
     return-void
 .end method
 
-.method final le()[Lcom/facebook/soloader/e$a;
+.method final lc()[Lcom/facebook/soloader/e$a;
     .locals 9
 
-    iget-object v0, p0, Lcom/facebook/soloader/e$b;->abM:[Lcom/facebook/soloader/e$a;
+    iget-object v0, p0, Lcom/facebook/soloader/e$b;->abI:[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;->abP:Lcom/facebook/soloader/e;
+    iget-object v2, p0, Lcom/facebook/soloader/e$b;->abL:Lcom/facebook/soloader/e;
 
-    iget-object v2, v2, Lcom/facebook/soloader/e;->abJ:Ljava/lang/String;
+    iget-object v2, v2, Lcom/facebook/soloader/e;->abF: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;->abN:Ljava/util/zip/ZipFile;
+    iget-object v4, p0, Lcom/facebook/soloader/e$b;->abJ: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;->abL:I
+    iget v7, v7, Lcom/facebook/soloader/e$a;->abH: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;->abO:Lcom/facebook/soloader/k;
+    iget-object v2, p0, Lcom/facebook/soloader/e$b;->abK: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;->acn:[Ljava/lang/String;
+    iput-object v0, v2, Lcom/facebook/soloader/k;->aci:[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;->abK:Ljava/util/zip/ZipEntry;
+    iget-object v5, v4, Lcom/facebook/soloader/e$a;->abG: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;->abM:[Lcom/facebook/soloader/e$a;
+    iput-object v2, p0, Lcom/facebook/soloader/e$b;->abI:[Lcom/facebook/soloader/e$a;
 
     :cond_7
-    iget-object v0, p0, Lcom/facebook/soloader/e$b;->abM:[Lcom/facebook/soloader/e$a;
+    iget-object v0, p0, Lcom/facebook/soloader/e$b;->abI:[Lcom/facebook/soloader/e$a;
 
     return-object v0
 .end method
 
-.method protected final lf()Lcom/facebook/soloader/k$b;
+.method protected final ld()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;->le()[Lcom/facebook/soloader/e$a;
+    invoke-virtual {p0}, Lcom/facebook/soloader/e$b;->lc()[Lcom/facebook/soloader/e$a;
 
     move-result-object v1
 
@@ -311,7 +311,7 @@
     return-object v0
 .end method
 
-.method protected final lg()Lcom/facebook/soloader/k$d;
+.method protected final le()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 9a528f41b7..9977e42fb0 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 abS:Ljava/io/FileOutputStream;
+.field private final abO:Ljava/io/FileOutputStream;
 
-.field private final abT:Ljava/nio/channels/FileLock;
+.field private final abP: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;->abS:Ljava/io/FileOutputStream;
+    iput-object v0, p0, Lcom/facebook/soloader/f;->abO:Ljava/io/FileOutputStream;
 
     :try_start_0
-    iget-object p1, p0, Lcom/facebook/soloader/f;->abS:Ljava/io/FileOutputStream;
+    iget-object p1, p0, Lcom/facebook/soloader/f;->abO: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;->abS:Ljava/io/FileOutputStream;
+    iget-object v0, p0, Lcom/facebook/soloader/f;->abO:Ljava/io/FileOutputStream;
 
     invoke-virtual {v0}, Ljava/io/FileOutputStream;->close()V
 
     :cond_0
-    iput-object p1, p0, Lcom/facebook/soloader/f;->abT:Ljava/nio/channels/FileLock;
+    iput-object p1, p0, Lcom/facebook/soloader/f;->abP:Ljava/nio/channels/FileLock;
 
     return-void
 
     :catchall_0
     move-exception p1
 
-    iget-object v0, p0, Lcom/facebook/soloader/f;->abS:Ljava/io/FileOutputStream;
+    iget-object v0, p0, Lcom/facebook/soloader/f;->abO: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;->abT:Ljava/nio/channels/FileLock;
+    iget-object v0, p0, Lcom/facebook/soloader/f;->abP:Ljava/nio/channels/FileLock;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/soloader/f;->abT:Ljava/nio/channels/FileLock;
+    iget-object v0, p0, Lcom/facebook/soloader/f;->abP: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;->abS:Ljava/io/FileOutputStream;
+    iget-object v0, p0, Lcom/facebook/soloader/f;->abO: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;->abS:Ljava/io/FileOutputStream;
+    iget-object v1, p0, Lcom/facebook/soloader/f;->abO: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 aaa3242bb9..197ba79ae4 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 lf()Lcom/facebook/soloader/k$b;
+.method protected abstract ld()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 lg()Lcom/facebook/soloader/k$d;
+.method protected abstract le()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 2e59ccb996..93fb2ddaae 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 acm:Ljava/lang/String;
+.field protected ach:Ljava/lang/String;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field acn:[Ljava/lang/String;
+.field aci:[Ljava/lang/String;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private final aco:Ljava/util/Map;
+.field private final acj: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;->aco:Ljava/util/Map;
+    iput-object p2, p0, Lcom/facebook/soloader/k;->acj: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;->abH:Ljava/io/File;
+    iget-object v3, v1, Lcom/facebook/soloader/k;->abD: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;->acw:[Lcom/facebook/soloader/k$a;
+    iget-object v0, v5, Lcom/facebook/soloader/k$b;->acs:[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;->lh()Lcom/facebook/soloader/k$c;
+    invoke-virtual/range {p3 .. p3}, Lcom/facebook/soloader/k$d;->lf()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;->acw:[Lcom/facebook/soloader/k$a;
+    iget-object v11, v8, Lcom/facebook/soloader/k$b;->acs:[Lcom/facebook/soloader/k$a;
 
     array-length v11, v11
 
     if-ge v10, v11, :cond_3
 
-    iget-object v11, v8, Lcom/facebook/soloader/k$b;->acw:[Lcom/facebook/soloader/k$a;
+    iget-object v11, v8, Lcom/facebook/soloader/k$b;->acs:[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;->acx:Lcom/facebook/soloader/k$a;
+    iget-object v12, v9, Lcom/facebook/soloader/k$c;->act: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;->acw:[Lcom/facebook/soloader/k$a;
+    iget-object v11, v8, Lcom/facebook/soloader/k$b;->acs:[Lcom/facebook/soloader/k$a;
 
     aget-object v11, v11, v10
 
-    iget-object v11, v11, Lcom/facebook/soloader/k$a;->acv:Ljava/lang/String;
+    iget-object v11, v11, Lcom/facebook/soloader/k$a;->acr:Ljava/lang/String;
 
-    iget-object v12, v9, Lcom/facebook/soloader/k$c;->acx:Lcom/facebook/soloader/k$a;
+    iget-object v12, v9, Lcom/facebook/soloader/k$c;->act:Lcom/facebook/soloader/k$a;
 
-    iget-object v12, v12, Lcom/facebook/soloader/k$a;->acv:Ljava/lang/String;
+    iget-object v12, v12, Lcom/facebook/soloader/k$a;->acr: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;->acx:Lcom/facebook/soloader/k$a;
+    iget-object v10, v9, Lcom/facebook/soloader/k$c;->act: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;->abH:Ljava/io/File;
+    iget-object v0, v1, Lcom/facebook/soloader/k;->abD: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;->abH:Ljava/io/File;
+    iget-object v0, v1, Lcom/facebook/soloader/k;->abD:Ljava/io/File;
 
-    iget-object v11, v9, Lcom/facebook/soloader/k$c;->acx:Lcom/facebook/soloader/k$a;
+    iget-object v11, v9, Lcom/facebook/soloader/k$c;->act: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;->acy:Ljava/io/InputStream;
+    iget-object v0, v9, Lcom/facebook/soloader/k$c;->acu: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;->acy:Ljava/io/InputStream;
+    iget-object v0, v9, Lcom/facebook/soloader/k$c;->acu: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;->abH:Ljava/io/File;
+    iget-object v4, v1, Lcom/facebook/soloader/k;->abD: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;->abH:Ljava/io/File;
+    iget-object v0, p0, Lcom/facebook/soloader/k;->abD: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;->abH:Ljava/io/File;
+    iget-object v5, p0, Lcom/facebook/soloader/k;->abD: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;->abH:Ljava/io/File;
+    iget-object v1, p0, Lcom/facebook/soloader/k;->abD: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;->abH:Ljava/io/File;
+    iget-object v1, p0, Lcom/facebook/soloader/k;->abD: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;->abH:Ljava/io/File;
+    iget-object v5, p0, Lcom/facebook/soloader/k;->abD: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;->abH:Ljava/io/File;
+    iget-object v1, p0, Lcom/facebook/soloader/k;->abD: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;->lb()Lcom/facebook/soloader/k$e;
+    invoke-virtual {p0}, Lcom/facebook/soloader/k;->kZ()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;->lf()Lcom/facebook/soloader/k$b;
+    invoke-virtual {v0}, Lcom/facebook/soloader/k$e;->ld()Lcom/facebook/soloader/k$b;
 
     move-result-object v1
 
-    invoke-virtual {v0}, Lcom/facebook/soloader/k$e;->lg()Lcom/facebook/soloader/k$d;
+    invoke-virtual {v0}, Lcom/facebook/soloader/k$e;->le()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;->abH:Ljava/io/File;
+    iget-object p3, p0, Lcom/facebook/soloader/k;->abD: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;->aco:Ljava/util/Map;
+    iget-object v0, p0, Lcom/facebook/soloader/k;->acj:Ljava/util/Map;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/facebook/soloader/k;->aco:Ljava/util/Map;
+    iget-object v1, p0, Lcom/facebook/soloader/k;->acj: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;->aco:Ljava/util/Map;
+    iget-object v2, p0, Lcom/facebook/soloader/k;->acj: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;->abH:Ljava/io/File;
+    iget-object v1, p0, Lcom/facebook/soloader/k;->abD: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;->abH:Ljava/io/File;
+    iget-object v4, p0, Lcom/facebook/soloader/k;->abD: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;->abH:Ljava/io/File;
+    iget-object v5, p0, Lcom/facebook/soloader/k;->abD: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;->abH:Ljava/io/File;
+    iget-object v6, p0, Lcom/facebook/soloader/k;->abD: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;->lc()[B
+    invoke-virtual {p0}, Lcom/facebook/soloader/k;->la()[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;->abH:Ljava/io/File;
+    iget-object v5, p0, Lcom/facebook/soloader/k;->abD: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;->abH:Ljava/io/File;
+    iget-object v0, p0, Lcom/facebook/soloader/k;->abD: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;->abH:Ljava/io/File;
+    iget-object v0, p0, Lcom/facebook/soloader/k;->abD: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;->abH:Ljava/io/File;
+    iget-object v0, p0, Lcom/facebook/soloader/k;->abD: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;->abH:Ljava/io/File;
+    iget-object v2, p0, Lcom/facebook/soloader/k;->abD: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;->acm:Ljava/lang/String;
+    iput-object p1, p0, Lcom/facebook/soloader/k;->ach:Ljava/lang/String;
 
     const/4 p1, 0x2
 
@@ -1403,7 +1403,7 @@
     throw p1
 .end method
 
-.method protected abstract lb()Lcom/facebook/soloader/k$e;
+.method protected abstract kZ()Lcom/facebook/soloader/k$e;
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -1411,7 +1411,7 @@
     .end annotation
 .end method
 
-.method protected lc()[B
+.method protected la()[B
     .locals 5
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -1423,16 +1423,16 @@
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/facebook/soloader/k;->lb()Lcom/facebook/soloader/k$e;
+    invoke-virtual {p0}, Lcom/facebook/soloader/k;->kZ()Lcom/facebook/soloader/k$e;
 
     move-result-object v1
 
     :try_start_0
-    invoke-virtual {v1}, Lcom/facebook/soloader/k$e;->lf()Lcom/facebook/soloader/k$b;
+    invoke-virtual {v1}, Lcom/facebook/soloader/k$e;->ld()Lcom/facebook/soloader/k$b;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/facebook/soloader/k$b;->acw:[Lcom/facebook/soloader/k$a;
+    iget-object v2, v2, Lcom/facebook/soloader/k$b;->acs:[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;->acv:Ljava/lang/String;
+    iget-object v4, v4, Lcom/facebook/soloader/k$a;->acr: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 57635923ae..3e5f14392f 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 UR:Lcom/facebook/common/k/b$a;
+.field private static UM:Lcom/facebook/common/k/b$a;
 
-.field private static acA:Lcom/facebook/common/k/a;
+.field public static final acv:Z
 
-.field public static final acz:Z
+.field private static acw:Lcom/facebook/common/k/a;
 
 
 # direct methods
@@ -32,7 +32,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    sput-boolean v0, Lcom/facebook/webpsupport/WebpBitmapFactoryImpl;->acz:Z
+    sput-boolean v0, Lcom/facebook/webpsupport/WebpBitmapFactoryImpl;->acv:Z
 
     return-void
 .end method
@@ -85,7 +85,7 @@
     return-void
 
     :cond_3
-    sget-boolean v0, Lcom/facebook/webpsupport/WebpBitmapFactoryImpl;->acz:Z
+    sget-boolean v0, Lcom/facebook/webpsupport/WebpBitmapFactoryImpl;->acv: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;->acz:Z
+    sget-boolean v0, Lcom/facebook/webpsupport/WebpBitmapFactoryImpl;->acv:Z
 
     if-eqz v0, :cond_0
 
@@ -189,7 +189,7 @@
     return-object p0
 
     :cond_0
-    sget-object p2, Lcom/facebook/webpsupport/WebpBitmapFactoryImpl;->acA:Lcom/facebook/common/k/a;
+    sget-object p2, Lcom/facebook/webpsupport/WebpBitmapFactoryImpl;->acw: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;->fD()V
+    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/d;->fB()V
 
-    sget-boolean v0, Lcom/facebook/common/k/c;->Jj:Z
+    sget-boolean v0, Lcom/facebook/common/k/c;->Jf: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;->fD()V
+    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/d;->fB()V
 
     const/4 v0, 0x0
 
@@ -440,7 +440,7 @@
 
     move-result-object v4
 
-    sget-boolean v5, Lcom/facebook/common/k/c;->Jj:Z
+    sget-boolean v5, Lcom/facebook/common/k/c;->Jf:Z
 
     if-eqz v5, :cond_0
 
@@ -592,7 +592,7 @@
 
     :cond_1
     :goto_0
-    sget-boolean p0, Lcom/facebook/webpsupport/WebpBitmapFactoryImpl;->acz:Z
+    sget-boolean p0, Lcom/facebook/webpsupport/WebpBitmapFactoryImpl;->acv: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;->fD()V
+    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/d;->fB()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;->Jj:Z
+    sget-boolean v1, Lcom/facebook/common/k/c;->Jf: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;->acA:Lcom/facebook/common/k/a;
+    sput-object p1, Lcom/facebook/webpsupport/WebpBitmapFactoryImpl;->acw: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;->UR:Lcom/facebook/common/k/b$a;
+    sput-object p1, Lcom/facebook/webpsupport/WebpBitmapFactoryImpl;->UM: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 d49941b4db..72fa60f251 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;->lU()Lcom/google/android/gms/common/c;
+    invoke-static {}, Lcom/google/android/gms/common/c;->lS()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;->nk()Lcom/google/android/gms/common/stats/a;
+    invoke-static {}, Lcom/google/android/gms/common/stats/a;->ni()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;->afc:Ljava/util/concurrent/BlockingQueue;
+    iget-object p1, p1, Lcom/google/android/gms/common/a;->aeY: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;->adQ:Ljava/util/concurrent/CountDownLatch;
+    iget-object v1, v1, Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$a;->adM: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;->adR:Z
+    iget-boolean v1, v1, Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$a;->adN: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;->nO()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/a/e;->nM()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;->nk()Lcom/google/android/gms/common/stats/a;
+    invoke-static {}, Lcom/google/android/gms/common/stats/a;->ni()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;->adR:Z
+    iget-boolean v1, v1, Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$a;->adN: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;->nN()Z
+    invoke-interface {v2}, Lcom/google/android/gms/internal/a/e;->nL()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 70c31074b4..8d43e91bf4 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 aeY:Ljava/util/concurrent/locks/Lock;
+.field private static final aeU:Ljava/util/concurrent/locks/Lock;
 
-.field private static aeZ:Lcom/google/android/gms/auth/api/signin/a/a;
+.field private static aeV:Lcom/google/android/gms/auth/api/signin/a/a;
 
 
 # instance fields
-.field private final afa:Ljava/util/concurrent/locks/Lock;
+.field private final aeW:Ljava/util/concurrent/locks/Lock;
 
-.field private final afb:Landroid/content/SharedPreferences;
+.field private final aeX: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;->aeY:Ljava/util/concurrent/locks/Lock;
+    sput-object v0, Lcom/google/android/gms/auth/api/signin/a/a;->aeU: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;->afa:Ljava/util/concurrent/locks/Lock;
+    iput-object v0, p0, Lcom/google/android/gms/auth/api/signin/a/a;->aeW: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;->afb:Landroid/content/SharedPreferences;
+    iput-object p1, p0, Lcom/google/android/gms/auth/api/signin/a/a;->aeX: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;->aeY:Ljava/util/concurrent/locks/Lock;
+    sget-object v0, Lcom/google/android/gms/auth/api/signin/a/a;->aeU: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;->aeZ:Lcom/google/android/gms/auth/api/signin/a/a;
+    sget-object v0, Lcom/google/android/gms/auth/api/signin/a/a;->aeV: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;->aeZ:Lcom/google/android/gms/auth/api/signin/a/a;
+    sput-object v0, Lcom/google/android/gms/auth/api/signin/a/a;->aeV:Lcom/google/android/gms/auth/api/signin/a/a;
 
     :cond_0
-    sget-object p0, Lcom/google/android/gms/auth/api/signin/a/a;->aeZ:Lcom/google/android/gms/auth/api/signin/a/a;
+    sget-object p0, Lcom/google/android/gms/auth/api/signin/a/a;->aeV: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;->aeY:Ljava/util/concurrent/locks/Lock;
+    sget-object v0, Lcom/google/android/gms/auth/api/signin/a/a;->aeU: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;->aeY:Ljava/util/concurrent/locks/Lock;
+    sget-object v0, Lcom/google/android/gms/auth/api/signin/a/a;->aeU: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;->afa:Ljava/util/concurrent/locks/Lock;
+    iget-object v0, p0, Lcom/google/android/gms/auth/api/signin/a/a;->aeW: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;->afb:Landroid/content/SharedPreferences;
+    iget-object v0, p0, Lcom/google/android/gms/auth/api/signin/a/a;->aeX: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;->afa:Ljava/util/concurrent/locks/Lock;
+    iget-object v0, p0, Lcom/google/android/gms/auth/api/signin/a/a;->aeW: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;->afa:Ljava/util/concurrent/locks/Lock;
+    iget-object v0, p0, Lcom/google/android/gms/auth/api/signin/a/a;->aeW: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 03254fa88e..bdebff97bb 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 afn:Lcom/google/android/gms/common/g;
+.field private static afi: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;->afn:Lcom/google/android/gms/common/g;
+    sget-object v1, Lcom/google/android/gms/common/g;->afi: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;->afn:Lcom/google/android/gms/common/g;
+    sput-object v1, Lcom/google/android/gms/common/g;->afi: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;->afn:Lcom/google/android/gms/common/g;
+    sget-object p0, Lcom/google/android/gms/common/g;->afi: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;->amC:[Lcom/google/android/gms/common/n;
+    sget-object p1, Lcom/google/android/gms/common/q;->amy:[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;->amC:[Lcom/google/android/gms/common/n;
+    sget-object v2, Lcom/google/android/gms/common/q;->amy:[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;->amr:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/android/gms/common/c/b;->amn: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;->amr:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/android/gms/common/c/b;->amn: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;->nJ()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/common/v;->nH()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;->nJ()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/common/v;->nH()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 34f162e985..e5e3e22ddb 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 akt:Landroid/content/res/Resources;
+.field private final akp:Landroid/content/res/Resources;
 
-.field private final aku:Ljava/lang/String;
+.field private final akq:Ljava/lang/String;
 
 
 # direct methods
@@ -20,9 +20,9 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/common/internal/t;->akt:Landroid/content/res/Resources;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/t;->akp:Landroid/content/res/Resources;
 
-    iget-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;->akp: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;->aku:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/t;->akq: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;->akt:Landroid/content/res/Resources;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/t;->akp:Landroid/content/res/Resources;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/internal/t;->aku:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/t;->akq: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;->akt:Landroid/content/res/Resources;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/t;->akp: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 b662617973..8b7deebae4 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 amu:Lcom/google/android/gms/common/internal/ao;
+.field private static volatile amq:Lcom/google/android/gms/common/internal/ao;
 
-.field private static final amv:Ljava/lang/Object;
+.field private static final amr:Ljava/lang/Object;
 
-.field private static amw:Landroid/content/Context;
+.field private static ams: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;->amv:Ljava/lang/Object;
+    sput-object v0, Lcom/google/android/gms/common/l;->amr: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;->amw:Landroid/content/Context;
+    sget-object v1, Lcom/google/android/gms/common/l;->ams: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;->amw:Landroid/content/Context;
+    sput-object p0, Lcom/google/android/gms/common/l;->ams: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;->amu:Lcom/google/android/gms/common/internal/ao;
+    sget-object v0, Lcom/google/android/gms/common/l;->amq:Lcom/google/android/gms/common/internal/ao;
 
     if-nez v0, :cond_1
 
-    sget-object v0, Lcom/google/android/gms/common/l;->amw:Landroid/content/Context;
+    sget-object v0, Lcom/google/android/gms/common/l;->ams: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;->amv:Ljava/lang/Object;
+    sget-object v0, Lcom/google/android/gms/common/l;->amr: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;->amu:Lcom/google/android/gms/common/internal/ao;
+    sget-object v1, Lcom/google/android/gms/common/l;->amq:Lcom/google/android/gms/common/internal/ao;
 
     if-nez v1, :cond_0
 
-    sget-object v1, Lcom/google/android/gms/common/l;->amw:Landroid/content/Context;
+    sget-object v1, Lcom/google/android/gms/common/l;->ams:Landroid/content/Context;
 
-    sget-object v2, Lcom/google/android/gms/dynamite/DynamiteModule;->amU:Lcom/google/android/gms/dynamite/DynamiteModule$b;
+    sget-object v2, Lcom/google/android/gms/dynamite/DynamiteModule;->amQ: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;->amu:Lcom/google/android/gms/common/internal/ao;
+    sput-object v1, Lcom/google/android/gms/common/l;->amq: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;->amw:Landroid/content/Context;
+    sget-object v0, Lcom/google/android/gms/common/l;->ams: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;->amu:Lcom/google/android/gms/common/internal/ao;
+    sget-object p3, Lcom/google/android/gms/common/l;->amq:Lcom/google/android/gms/common/internal/ao;
 
-    sget-object v1, Lcom/google/android/gms/common/l;->amw:Landroid/content/Context;
+    sget-object v1, Lcom/google/android/gms/common/l;->ams: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;->nI()Lcom/google/android/gms/common/v;
+    invoke-static {}, Lcom/google/android/gms/common/v;->nG()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 073b5b5fe1..44edcc5326 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 alX:Ljava/lang/String;
+.field private static alT:Ljava/lang/String;
 
-.field private static alY:I
+.field private static alU:I
 
 
 # direct methods
@@ -135,16 +135,16 @@
     return-object v0
 .end method
 
-.method public static nx()Ljava/lang/String;
+.method public static nv()Ljava/lang/String;
     .locals 1
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    sget-object v0, Lcom/google/android/gms/common/util/m;->alX:Ljava/lang/String;
+    sget-object v0, Lcom/google/android/gms/common/util/m;->alT:Ljava/lang/String;
 
     if-nez v0, :cond_1
 
-    sget v0, Lcom/google/android/gms/common/util/m;->alY:I
+    sget v0, Lcom/google/android/gms/common/util/m;->alU:I
 
     if-nez v0, :cond_0
 
@@ -152,19 +152,19 @@
 
     move-result v0
 
-    sput v0, Lcom/google/android/gms/common/util/m;->alY:I
+    sput v0, Lcom/google/android/gms/common/util/m;->alU:I
 
     :cond_0
-    sget v0, Lcom/google/android/gms/common/util/m;->alY:I
+    sget v0, Lcom/google/android/gms/common/util/m;->alU: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;->alX:Ljava/lang/String;
+    sput-object v0, Lcom/google/android/gms/common/util/m;->alT:Ljava/lang/String;
 
     :cond_1
-    sget-object v0, Lcom/google/android/gms/common/util/m;->alX:Ljava/lang/String;
+    sget-object v0, Lcom/google/android/gms/common/util/m;->alT: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 007d292032..aacc9d47c9 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 amG:Lcom/google/android/gms/common/v;
+.field private static final amC:Lcom/google/android/gms/common/v;
 
 
 # instance fields
-.field private final amH:Ljava/lang/String;
+.field private final amD: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;->amG:Lcom/google/android/gms/common/v;
+    sput-object v0, Lcom/google/android/gms/common/v;->amC: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;->amH:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/common/v;->amD: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;->nG()[B
+    invoke-virtual {p1}, Lcom/google/android/gms/common/n;->nE()[B
 
     move-result-object p1
 
@@ -175,22 +175,22 @@
     return-object v0
 .end method
 
-.method static nI()Lcom/google/android/gms/common/v;
+.method static nG()Lcom/google/android/gms/common/v;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/common/v;->amG:Lcom/google/android/gms/common/v;
+    sget-object v0, Lcom/google/android/gms/common/v;->amC:Lcom/google/android/gms/common/v;
 
     return-object v0
 .end method
 
 
 # virtual methods
-.method nJ()Ljava/lang/String;
+.method nH()Ljava/lang/String;
     .locals 1
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/common/v;->amH:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/common/v;->amD: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 d9f8f84fb6..972db84d7c 100644
--- a/com.discord/smali/com/google/android/gms/common/zzk.smali
+++ b/com.discord/smali/com/google/android/gms/common/zzk.smali
@@ -15,15 +15,15 @@
 
 
 # instance fields
-.field private final amD:Lcom/google/android/gms/common/n;
+.field private final amA:Z
+
+.field private final amB:Z
+
+.field private final amz:Lcom/google/android/gms/common/n;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private final amE: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;->amD:Lcom/google/android/gms/common/n;
+    iput-object p1, p0, Lcom/google/android/gms/common/zzk;->amz:Lcom/google/android/gms/common/n;
 
-    iput-boolean p3, p0, Lcom/google/android/gms/common/zzk;->amE:Z
+    iput-boolean p3, p0, Lcom/google/android/gms/common/zzk;->amA:Z
 
-    iput-boolean p4, p0, Lcom/google/android/gms/common/zzk;->amF:Z
+    iput-boolean p4, p0, Lcom/google/android/gms/common/zzk;->amB: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;->amD:Lcom/google/android/gms/common/n;
+    iput-object p2, p0, Lcom/google/android/gms/common/zzk;->amz:Lcom/google/android/gms/common/n;
 
-    iput-boolean p3, p0, Lcom/google/android/gms/common/zzk;->amE:Z
+    iput-boolean p3, p0, Lcom/google/android/gms/common/zzk;->amA:Z
 
-    iput-boolean p4, p0, Lcom/google/android/gms/common/zzk;->amF:Z
+    iput-boolean p4, p0, Lcom/google/android/gms/common/zzk;->amB:Z
 
     return-void
 .end method
@@ -109,7 +109,7 @@
 
     move-result-object p0
 
-    invoke-interface {p0}, Lcom/google/android/gms/common/internal/ak;->ng()Lcom/google/android/gms/a/a;
+    invoke-interface {p0}, Lcom/google/android/gms/common/internal/ak;->ne()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;->amD:Lcom/google/android/gms/common/n;
+    iget-object v0, p0, Lcom/google/android/gms/common/zzk;->amz: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;->amE:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/common/zzk;->amA: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;->amF:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/common/zzk;->amB: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 defe2a3503..87853cf682 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 anx:Ljava/util/logging/Logger;
+.field private static final ant:Ljava/util/logging/Logger;
 
 
 # direct methods
@@ -21,7 +21,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/e/j;->anx:Ljava/util/logging/Logger;
+    sput-object v0, Lcom/google/android/gms/internal/e/j;->ant: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;->anx:Ljava/util/logging/Logger;
+    sget-object v0, Lcom/google/android/gms/internal/e/j;->ant: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 cc3bed5e2d..4812265379 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 atJ:Lcom/google/android/gms/internal/measurement/az;
+.field private static atF:Lcom/google/android/gms/internal/measurement/az;
 
 
 # instance fields
-.field final atK:Landroid/content/Context;
+.field final atG:Landroid/content/Context;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private final atL:Landroid/database/ContentObserver;
+.field private final atH: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;->atK:Landroid/content/Context;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/az;->atG:Landroid/content/Context;
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/az;->atL:Landroid/database/ContentObserver;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/az;->atH: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;->atK:Landroid/content/Context;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/az;->atG: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;->atL:Landroid/database/ContentObserver;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/az;->atH: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;->atl:Landroid/net/Uri;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ap;->ath:Landroid/net/Uri;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/az;->atL:Landroid/database/ContentObserver;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/az;->atH: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;->atJ:Lcom/google/android/gms/internal/measurement/az;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/az;->atF: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;->atJ:Lcom/google/android/gms/internal/measurement/az;
+    sput-object v1, Lcom/google/android/gms/internal/measurement/az;->atF:Lcom/google/android/gms/internal/measurement/az;
 
     :cond_2
-    sget-object p0, Lcom/google/android/gms/internal/measurement/az;->atJ:Lcom/google/android/gms/internal/measurement/az;
+    sget-object p0, Lcom/google/android/gms/internal/measurement/az;->atF: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;->atK:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/az;->atG: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;->atJ:Lcom/google/android/gms/internal/measurement/az;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/az;->atF:Lcom/google/android/gms/internal/measurement/az;
 
     if-eqz v1, :cond_0
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/az;->atJ:Lcom/google/android/gms/internal/measurement/az;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/az;->atF:Lcom/google/android/gms/internal/measurement/az;
 
-    iget-object v1, v1, Lcom/google/android/gms/internal/measurement/az;->atK:Landroid/content/Context;
+    iget-object v1, v1, Lcom/google/android/gms/internal/measurement/az;->atG:Landroid/content/Context;
 
     if-eqz v1, :cond_0
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/az;->atJ:Lcom/google/android/gms/internal/measurement/az;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/az;->atF:Lcom/google/android/gms/internal/measurement/az;
 
-    iget-object v1, v1, Lcom/google/android/gms/internal/measurement/az;->atL:Landroid/database/ContentObserver;
+    iget-object v1, v1, Lcom/google/android/gms/internal/measurement/az;->atH:Landroid/database/ContentObserver;
 
     if-eqz v1, :cond_0
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/az;->atJ:Lcom/google/android/gms/internal/measurement/az;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/az;->atF:Lcom/google/android/gms/internal/measurement/az;
 
-    iget-object v1, v1, Lcom/google/android/gms/internal/measurement/az;->atK:Landroid/content/Context;
+    iget-object v1, v1, Lcom/google/android/gms/internal/measurement/az;->atG: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;->atJ:Lcom/google/android/gms/internal/measurement/az;
+    sget-object v2, Lcom/google/android/gms/internal/measurement/az;->atF:Lcom/google/android/gms/internal/measurement/az;
 
-    iget-object v2, v2, Lcom/google/android/gms/internal/measurement/az;->atL:Landroid/database/ContentObserver;
+    iget-object v2, v2, Lcom/google/android/gms/internal/measurement/az;->atH: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;->atJ:Lcom/google/android/gms/internal/measurement/az;
+    sput-object v1, Lcom/google/android/gms/internal/measurement/az;->atF: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 cd47b80d96..3e261437c0 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 aty:Ljava/util/Map;
+.field final atu: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;->aty:Ljava/util/Map;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ba;->atu: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 c69604aab0..93721bfa51 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 anq:Ljava/lang/String;
+.field final anm:Ljava/lang/String;
 
-.field final atS:Ljava/lang/String;
+.field final atO:Ljava/lang/String;
 
-.field final atT:Landroid/net/Uri;
+.field final atP:Landroid/net/Uri;
 
-.field final atU:Lcom/google/android/gms/internal/measurement/bo;
+.field final atQ: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;->atS:Ljava/lang/String;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/bk;->atO:Ljava/lang/String;
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/bk;->atT:Landroid/net/Uri;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/bk;->atP:Landroid/net/Uri;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/bk;->anq:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/bk;->anm: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;->atU:Lcom/google/android/gms/internal/measurement/bo;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/bk;->atQ: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 f8f432fc86..97ac1baefe 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 aub:Lcom/google/android/gms/internal/measurement/bp;
+.field static final atX: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;->aub:Lcom/google/android/gms/internal/measurement/bp;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/bp;->atX:Lcom/google/android/gms/internal/measurement/bp;
 
     return-void
 .end method
@@ -77,7 +77,7 @@
     return v0
 .end method
 
-.method public final pH()Z
+.method public final pF()Z
     .locals 1
 
     const/4 v0, 0x0
@@ -85,7 +85,7 @@
     return v0
 .end method
 
-.method public final rG()Ljava/lang/Object;
+.method public final rE()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 1cd0fa6aba..db5701acd7 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 rH()Lcom/google/android/gms/internal/measurement/br;
+.method public static rF()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;->aub:Lcom/google/android/gms/internal/measurement/bp;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/bp;->atX:Lcom/google/android/gms/internal/measurement/bp;
 
     return-object v0
 .end method
 
 
 # virtual methods
-.method public abstract pH()Z
+.method public abstract pF()Z
 .end method
 
-.method public abstract rG()Ljava/lang/Object;
+.method public abstract rE()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 30a4126c9f..48c7993e6b 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 rC()Ljava/lang/Object;
+.method public abstract rA()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 0cbf053a3c..0644c83cff 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 pH()Z
+.method public final pF()Z
     .locals 1
 
     const/4 v0, 0x1
@@ -96,7 +96,7 @@
     return v0
 .end method
 
-.method public final rG()Ljava/lang/Object;
+.method public final rE()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 2aafd1d54d..c5c8c67c08 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 atG:Z
+.field private volatile transient atC: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 rC()Ljava/lang/Object;
+.method public final rA()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;->atG:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/bv;->atC:Z
 
     if-nez v0, :cond_1
 
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/bv;->atG:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/bv;->atC: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;->rC()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rA()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;->atG:Z
+    iput-boolean v1, p0, Lcom/google/android/gms/internal/measurement/bv;->atC: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;->atG:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/bv;->atC: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 9f7cde1472..cfd6a8a1ba 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 rC()Ljava/lang/Object;
+.method public final rA()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 b1dbf25619..709411e7cc 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 atG:Z
+.field private volatile atC: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 rC()Ljava/lang/Object;
+.method public final rA()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;->atG:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/by;->atC:Z
 
     if-nez v0, :cond_1
 
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/by;->atG:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/by;->atC: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;->rC()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rA()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;->atG:Z
+    iput-boolean v1, p0, Lcom/google/android/gms/internal/measurement/by;->atC: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 1e02d4539a..201ccd1363 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 aSF:Ljava/lang/String;
+.field private final aSB:Ljava/lang/String;
 
-.field private final aSG:Ljava/lang/String;
+.field private final aSC:Ljava/lang/String;
 
 
 # direct methods
@@ -17,11 +17,11 @@
 
     if-eqz p1, :cond_1
 
-    iput-object p1, p0, Lcom/google/firebase/d/a;->aSF:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/firebase/d/a;->aSB:Ljava/lang/String;
 
     if-eqz p2, :cond_0
 
-    iput-object p2, p0, Lcom/google/firebase/d/a;->aSG:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/firebase/d/a;->aSC:Ljava/lang/String;
 
     return-void
 
@@ -46,12 +46,12 @@
 
 
 # virtual methods
-.method public final As()Ljava/lang/String;
+.method public final Aq()Ljava/lang/String;
     .locals 1
     .annotation runtime Ljavax/annotation/Nonnull;
     .end annotation
 
-    iget-object v0, p0, Lcom/google/firebase/d/a;->aSF:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/firebase/d/a;->aSB: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;->aSG:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/firebase/d/a;->aSC: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;->aSF:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/firebase/d/a;->aSB:Ljava/lang/String;
 
-    invoke-virtual {p1}, Lcom/google/firebase/d/e;->As()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/firebase/d/e;->Aq()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;->aSG:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/firebase/d/a;->aSC: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;->aSF:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/firebase/d/a;->aSB: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;->aSG:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/firebase/d/a;->aSC: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;->aSF:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/firebase/d/a;->aSB: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;->aSG:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/firebase/d/a;->aSC: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 ec35b73c36..c816612a9f 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 As()Ljava/lang/String;
+.method public abstract Aq()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 a642cf8259..233ca03e6c 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 aRS:Lcom/google/firebase/iid/x;
+.field aRO: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;->aRS:Lcom/google/firebase/iid/x;
+    iput-object p1, p0, Lcom/google/firebase/iid/w;->aRO: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;->aRS:Lcom/google/firebase/iid/x;
+    iget-object p1, p0, Lcom/google/firebase/iid/w;->aRO: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;->qg()Z
+    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->qe()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;->aRS:Lcom/google/firebase/iid/x;
+    iget-object p1, p0, Lcom/google/firebase/iid/w;->aRO: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;->aRS:Lcom/google/firebase/iid/x;
+    iget-object p1, p0, Lcom/google/firebase/iid/w;->aRO:Lcom/google/firebase/iid/x;
 
-    invoke-virtual {p1}, Lcom/google/firebase/iid/x;->Ak()Landroid/content/Context;
+    invoke-virtual {p1}, Lcom/google/firebase/iid/x;->Ai()Landroid/content/Context;
 
     move-result-object p1
 
@@ -71,7 +71,7 @@
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/google/firebase/iid/w;->aRS:Lcom/google/firebase/iid/x;
+    iput-object p1, p0, Lcom/google/firebase/iid/w;->aRO: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 7c372211ac..755ea70aa9 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;
-        AJ = true
-        AK = true
+        AH = true
+        AI = true
     .end subannotation
 .end annotation
 
@@ -29,8 +29,8 @@
 
 
 # virtual methods
-.method public abstract AJ()Z
+.method public abstract AH()Z
 .end method
 
-.method public abstract AK()Z
+.method public abstract AI()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 51dacad89f..17a61bedb0 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;
-        AL = true
+        AJ = true
     .end subannotation
 .end annotation
 
@@ -26,7 +26,7 @@
 
 
 # virtual methods
-.method public abstract AL()Z
+.method public abstract AJ()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 450fdca078..7876546dc1 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;
-        AM = {}
+        AK = {}
     .end subannotation
 .end annotation
 
@@ -29,7 +29,7 @@
 
 
 # virtual methods
-.method public abstract AM()[Ljava/lang/String;
+.method public abstract AK()[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 2317d52f1d..48a7bce909 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 AN()D
+.method public abstract AL()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 834d9bb257..e689238c94 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 AN()D
+.method public abstract AL()D
 .end method
diff --git a/com.discord/smali/com/miguelgaeta/backgrounded/Backgrounded.smali b/com.discord/smali/com/miguelgaeta/backgrounded/Backgrounded.smali
index 4fd0658f51..32de173b59 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;->Kz()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kx()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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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;->bNW:Lrx/Observable;
+    iget-object v0, v0, Lrx/b/a;->bNR: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 f444f45963..ed1022d6b7 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 bgy:Lkotlin/Unit;
+.field public static final bgt:Lkotlin/Unit;
 
 
 # direct methods
@@ -15,7 +15,7 @@
 
     invoke-direct {v0}, Lkotlin/Unit;-><init>()V
 
-    sput-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
+    sput-object v0, Lkotlin/Unit;->bgt: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 3c47f00674..b814523a33 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;->bgN:Lkotlin/a/y;
+    sget-object v0, Lkotlin/a/y;->bgI: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 5a9e5e09ef..fc634446f1 100644
--- a/com.discord/smali/kotlin/a/p.smali
+++ b/com.discord/smali/kotlin/a/p.smali
@@ -36,45 +36,6 @@
     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 289cf1fbc8..7aa93eae0c 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;->bhD:Lkotlin/jvm/internal/g;
+    sget-object p0, Lkotlin/jvm/internal/g;->bhy:Lkotlin/jvm/internal/g;
 
     invoke-virtual {p0}, Lkotlin/jvm/internal/g;->getNaN()D
 
@@ -1275,71 +1275,6 @@
     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 d24e322d34..69d099e0c5 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 bhO:Lkotlin/jvm/internal/ab;
+.field public static final bhJ: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;->bhO:Lkotlin/jvm/internal/ab;
+    sput-object v0, Lkotlin/jvm/internal/ab;->bhJ: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 5a0c829640..d167abf1d7 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;->CZ()Lkotlin/jvm/internal/c$a;
+    invoke-static {}, Lkotlin/jvm/internal/c$a;->CX()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 bfdd4d5b1d..dc0db84577 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 bib:Lkotlin/ranges/IntProgression$a;
+.field public static final bhW:Lkotlin/ranges/IntProgression$a;
 
 
 # instance fields
-.field private final bhY:I
+.field private final bhT:I
 
-.field private final bhZ:I
+.field private final bhU:I
 
-.field private final bia:I
+.field private final bhV: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;->bib:Lkotlin/ranges/IntProgression$a;
+    sput-object v0, Lkotlin/ranges/IntProgression;->bhW:Lkotlin/ranges/IntProgression$a;
 
     return-void
 .end method
@@ -63,15 +63,15 @@
 
     if-eq p3, v0, :cond_0
 
-    iput p1, p0, Lkotlin/ranges/IntProgression;->bhY:I
+    iput p1, p0, Lkotlin/ranges/IntProgression;->bhT:I
 
     invoke-static {p1, p2, p3}, Lkotlin/c/c;->getProgressionLastElement(III)I
 
     move-result p1
 
-    iput p1, p0, Lkotlin/ranges/IntProgression;->bhZ:I
+    iput p1, p0, Lkotlin/ranges/IntProgression;->bhU:I
 
-    iput p3, p0, Lkotlin/ranges/IntProgression;->bia:I
+    iput p3, p0, Lkotlin/ranges/IntProgression;->bhV:I
 
     return-void
 
@@ -124,23 +124,23 @@
     if-nez v0, :cond_1
 
     :cond_0
-    iget v0, p0, Lkotlin/ranges/IntProgression;->bhY:I
+    iget v0, p0, Lkotlin/ranges/IntProgression;->bhT:I
 
     check-cast p1, Lkotlin/ranges/IntProgression;
 
-    iget v1, p1, Lkotlin/ranges/IntProgression;->bhY:I
+    iget v1, p1, Lkotlin/ranges/IntProgression;->bhT:I
 
     if-ne v0, v1, :cond_2
 
-    iget v0, p0, Lkotlin/ranges/IntProgression;->bhZ:I
+    iget v0, p0, Lkotlin/ranges/IntProgression;->bhU:I
 
-    iget v1, p1, Lkotlin/ranges/IntProgression;->bhZ:I
+    iget v1, p1, Lkotlin/ranges/IntProgression;->bhU:I
 
     if-ne v0, v1, :cond_2
 
-    iget v0, p0, Lkotlin/ranges/IntProgression;->bia:I
+    iget v0, p0, Lkotlin/ranges/IntProgression;->bhV:I
 
-    iget p1, p1, Lkotlin/ranges/IntProgression;->bia:I
+    iget p1, p1, Lkotlin/ranges/IntProgression;->bhV:I
 
     if-ne v0, p1, :cond_2
 
@@ -158,7 +158,7 @@
 .method public final getFirst()I
     .locals 1
 
-    iget v0, p0, Lkotlin/ranges/IntProgression;->bhY:I
+    iget v0, p0, Lkotlin/ranges/IntProgression;->bhT:I
 
     return v0
 .end method
@@ -166,7 +166,7 @@
 .method public final getLast()I
     .locals 1
 
-    iget v0, p0, Lkotlin/ranges/IntProgression;->bhZ:I
+    iget v0, p0, Lkotlin/ranges/IntProgression;->bhU:I
 
     return v0
 .end method
@@ -174,7 +174,7 @@
 .method public final getStep()I
     .locals 1
 
-    iget v0, p0, Lkotlin/ranges/IntProgression;->bia:I
+    iget v0, p0, Lkotlin/ranges/IntProgression;->bhV:I
 
     return v0
 .end method
@@ -193,17 +193,17 @@
     return v0
 
     :cond_0
-    iget v0, p0, Lkotlin/ranges/IntProgression;->bhY:I
+    iget v0, p0, Lkotlin/ranges/IntProgression;->bhT:I
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget v1, p0, Lkotlin/ranges/IntProgression;->bhZ:I
+    iget v1, p0, Lkotlin/ranges/IntProgression;->bhU:I
 
     add-int/2addr v0, v1
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget v1, p0, Lkotlin/ranges/IntProgression;->bia:I
+    iget v1, p0, Lkotlin/ranges/IntProgression;->bhV:I
 
     add-int/2addr v0, v1
 
@@ -213,7 +213,7 @@
 .method public isEmpty()Z
     .locals 4
 
-    iget v0, p0, Lkotlin/ranges/IntProgression;->bia:I
+    iget v0, p0, Lkotlin/ranges/IntProgression;->bhV:I
 
     const/4 v1, 0x1
 
@@ -221,9 +221,9 @@
 
     if-lez v0, :cond_1
 
-    iget v0, p0, Lkotlin/ranges/IntProgression;->bhY:I
+    iget v0, p0, Lkotlin/ranges/IntProgression;->bhT:I
 
-    iget v3, p0, Lkotlin/ranges/IntProgression;->bhZ:I
+    iget v3, p0, Lkotlin/ranges/IntProgression;->bhU:I
 
     if-le v0, v3, :cond_0
 
@@ -233,9 +233,9 @@
     return v2
 
     :cond_1
-    iget v0, p0, Lkotlin/ranges/IntProgression;->bhY:I
+    iget v0, p0, Lkotlin/ranges/IntProgression;->bhT:I
 
-    iget v3, p0, Lkotlin/ranges/IntProgression;->bhZ:I
+    iget v3, p0, Lkotlin/ranges/IntProgression;->bhU:I
 
     if-ge v0, v3, :cond_2
 
@@ -262,11 +262,11 @@
 
     new-instance v0, Lkotlin/ranges/b;
 
-    iget v1, p0, Lkotlin/ranges/IntProgression;->bhY:I
+    iget v1, p0, Lkotlin/ranges/IntProgression;->bhT:I
 
-    iget v2, p0, Lkotlin/ranges/IntProgression;->bhZ:I
+    iget v2, p0, Lkotlin/ranges/IntProgression;->bhU:I
 
-    iget v3, p0, Lkotlin/ranges/IntProgression;->bia:I
+    iget v3, p0, Lkotlin/ranges/IntProgression;->bhV: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;->bia:I
+    iget v0, p0, Lkotlin/ranges/IntProgression;->bhV:I
 
     const-string v1, " step "
 
@@ -288,7 +288,7 @@
 
     invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
 
-    iget v2, p0, Lkotlin/ranges/IntProgression;->bhY:I
+    iget v2, p0, Lkotlin/ranges/IntProgression;->bhT: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;->bhZ:I
+    iget v2, p0, Lkotlin/ranges/IntProgression;->bhU: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;->bia:I
+    iget v1, p0, Lkotlin/ranges/IntProgression;->bhV: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;->bhY:I
+    iget v2, p0, Lkotlin/ranges/IntProgression;->bhT: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;->bhZ:I
+    iget v2, p0, Lkotlin/ranges/IntProgression;->bhU: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;->bia:I
+    iget v1, p0, Lkotlin/ranges/IntProgression;->bhV:I
 
     neg-int v1, v1
 
diff --git a/com.discord/smali/kotlin/ranges/IntRange.smali b/com.discord/smali/kotlin/ranges/IntRange.smali
index fd04106cb7..e70e1374d1 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 bie:Lkotlin/ranges/IntRange;
+.field private static final bhZ:Lkotlin/ranges/IntRange;
 
-.field public static final bif:Lkotlin/ranges/IntRange$a;
+.field public static final bia: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;->bif:Lkotlin/ranges/IntRange$a;
+    sput-object v0, Lkotlin/ranges/IntRange;->bia: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;->bie:Lkotlin/ranges/IntRange;
+    sput-object v0, Lkotlin/ranges/IntRange;->bhZ: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;->bie:Lkotlin/ranges/IntRange;
+    sget-object v0, Lkotlin/ranges/IntRange;->bhZ: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 cdba71a57e..831ef8e06b 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 bia:I
+.field private final bhV:I
 
-.field private final bic:I
+.field private final bhX:I
 
-.field private bid:I
+.field private bhY:I
 
 .field private hasNext:Z
 
@@ -19,11 +19,11 @@
 
     invoke-direct {p0}, Lkotlin/a/ab;-><init>()V
 
-    iput p3, p0, Lkotlin/ranges/b;->bia:I
+    iput p3, p0, Lkotlin/ranges/b;->bhV:I
 
-    iput p2, p0, Lkotlin/ranges/b;->bic:I
+    iput p2, p0, Lkotlin/ranges/b;->bhX:I
 
-    iget p3, p0, Lkotlin/ranges/b;->bia:I
+    iget p3, p0, Lkotlin/ranges/b;->bhV:I
 
     const/4 v0, 0x1
 
@@ -53,10 +53,10 @@
     goto :goto_1
 
     :cond_2
-    iget p1, p0, Lkotlin/ranges/b;->bic:I
+    iget p1, p0, Lkotlin/ranges/b;->bhX:I
 
     :goto_1
-    iput p1, p0, Lkotlin/ranges/b;->bid:I
+    iput p1, p0, Lkotlin/ranges/b;->bhY:I
 
     return-void
 .end method
@@ -74,9 +74,9 @@
 .method public final nextInt()I
     .locals 2
 
-    iget v0, p0, Lkotlin/ranges/b;->bid:I
+    iget v0, p0, Lkotlin/ranges/b;->bhY:I
 
-    iget v1, p0, Lkotlin/ranges/b;->bic:I
+    iget v1, p0, Lkotlin/ranges/b;->bhX:I
 
     if-ne v0, v1, :cond_1
 
@@ -100,11 +100,11 @@
     throw v0
 
     :cond_1
-    iget v1, p0, Lkotlin/ranges/b;->bia:I
+    iget v1, p0, Lkotlin/ranges/b;->bhV:I
 
     add-int/2addr v1, v0
 
-    iput v1, p0, Lkotlin/ranges/b;->bid:I
+    iput v1, p0, Lkotlin/ranges/b;->bhY:I
 
     :goto_0
     return v0
diff --git a/com.discord/smali/kotlin/ranges/f.smali b/com.discord/smali/kotlin/ranges/f.smali
index d2c0b04319..439908c055 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;->bib:Lkotlin/ranges/IntProgression$a;
+    sget-object v0, Lkotlin/ranges/IntProgression;->bhW: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;->bib:Lkotlin/ranges/IntProgression$a;
+    sget-object v0, Lkotlin/ranges/IntProgression;->bhW: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;->bif:Lkotlin/ranges/IntRange$a;
+    sget-object p0, Lkotlin/ranges/IntRange;->bia: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 f85544edd6..632bdd7fd1 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;->biG:Lkotlin/sequences/l$c;
+    sget-object v1, Lkotlin/sequences/l$c;->biB:Lkotlin/sequences/l$c;
 
     check-cast v1, Lkotlin/jvm/functions/Function1;
 
@@ -62,7 +62,7 @@
         }
     .end annotation
 
-    sget-object v0, Lkotlin/sequences/e;->bir:Lkotlin/sequences/e;
+    sget-object v0, Lkotlin/sequences/e;->bim: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;->biE:Lkotlin/sequences/l$a;
+    sget-object v0, Lkotlin/sequences/l$a;->biz: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;->biF:Lkotlin/sequences/l$b;
+    sget-object v0, Lkotlin/sequences/l$b;->biA: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 6a13238d38..9fd5b2d2d6 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;->biI:Lkotlin/sequences/n$b;
+    sget-object v0, Lkotlin/sequences/n$b;->biD: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;->biJ:Lkotlin/sequences/n$c;
+    sget-object v0, Lkotlin/sequences/n$c;->biE: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 c5570fbba8..38133a2c49 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 biU:Ljava/lang/CharSequence;
+.field private final biP:Ljava/lang/CharSequence;
 
-.field private final biV:Lkotlin/jvm/functions/Function2;
+.field private final biQ: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;->biU:Ljava/lang/CharSequence;
+    iput-object p1, p0, Lkotlin/text/e;->biP: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;->biV:Lkotlin/jvm/functions/Function2;
+    iput-object p4, p0, Lkotlin/text/e;->biQ: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;->biV:Lkotlin/jvm/functions/Function2;
+    iget-object p0, p0, Lkotlin/text/e;->biQ: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;->biU:Ljava/lang/CharSequence;
+    iget-object p0, p0, Lkotlin/text/e;->biP: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 b2dd687f79..1efa6251d0 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 bjp:Lkotlin/text/w$a;
+.field public static final bjk: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;->bjp:Lkotlin/text/w$a;
+    sput-object v0, Lkotlin/text/w$a;->bjk: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 0153c1d1e7..59a49ea9a4 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;->bjp:Lkotlin/text/w$a;
+    sget-object v0, Lkotlin/text/w$a;->bjk: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 fe10d0a2be..16fea458a6 100644
--- a/com.discord/smali/okhttp3/Headers.smali
+++ b/com.discord/smali/okhttp3/Headers.smali
@@ -12,7 +12,7 @@
 
 
 # instance fields
-.field public final brc:[Ljava/lang/String;
+.field public final bqX:[Ljava/lang/String;
 
 
 # direct methods
@@ -21,9 +21,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iget-object v0, p1, Lokhttp3/Headers$a;->brd:Ljava/util/List;
+    iget-object v0, p1, Lokhttp3/Headers$a;->bqY:Ljava/util/List;
 
-    iget-object p1, p1, Lokhttp3/Headers$a;->brd:Ljava/util/List;
+    iget-object p1, p1, Lokhttp3/Headers$a;->bqY: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;->brc:[Ljava/lang/String;
+    iput-object p1, p0, Lokhttp3/Headers;->bqX:[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;->brc:[Ljava/lang/String;
+    iput-object p1, p0, Lokhttp3/Headers;->bqX:[Ljava/lang/String;
 
     return-void
 .end method
@@ -391,16 +391,16 @@
 
 
 # virtual methods
-.method public final Fl()Lokhttp3/Headers$a;
+.method public final Fj()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;->brd:Ljava/util/List;
+    iget-object v1, v0, Lokhttp3/Headers$a;->bqY:Ljava/util/List;
 
-    iget-object v2, p0, Lokhttp3/Headers;->brc:[Ljava/lang/String;
+    iget-object v2, p0, Lokhttp3/Headers;->bqX:[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;->brc:[Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/Headers;->bqX:[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;->brc:[Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/Headers;->bqX:[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;->brc:[Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/Headers;->bqX:[Ljava/lang/String;
 
     mul-int/lit8 p1, p1, 0x2
 
@@ -460,9 +460,9 @@
 
     check-cast p1, Lokhttp3/Headers;
 
-    iget-object p1, p1, Lokhttp3/Headers;->brc:[Ljava/lang/String;
+    iget-object p1, p1, Lokhttp3/Headers;->bqX:[Ljava/lang/String;
 
-    iget-object v0, p0, Lokhttp3/Headers;->brc:[Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/Headers;->bqX:[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;->brc:[Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/Headers;->bqX:[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;->brc:[Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/Headers;->bqX:[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 de08276007..7f33206d57 100644
--- a/com.discord/smali/okhttp3/Interceptor$Chain.smali
+++ b/com.discord/smali/okhttp3/Interceptor$Chain.smali
@@ -15,20 +15,20 @@
 
 
 # virtual methods
-.method public abstract FA()I
+.method public abstract Fv()Lokhttp3/w;
 .end method
 
-.method public abstract FB()I
-.end method
-
-.method public abstract Fx()Lokhttp3/w;
-.end method
-
-.method public abstract Fy()Lokhttp3/i;
+.method public abstract Fw()Lokhttp3/i;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end method
 
+.method public abstract Fx()I
+.end method
+
+.method public abstract Fy()I
+.end method
+
 .method public abstract Fz()I
 .end method
 
diff --git a/com.discord/smali/okhttp3/MediaType.smali b/com.discord/smali/okhttp3/MediaType.smali
index 7e28db5631..b3f00eec6b 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 brp:Ljava/util/regex/Pattern;
+.field private static final brk:Ljava/util/regex/Pattern;
 
-.field private static final brq:Ljava/util/regex/Pattern;
+.field private static final brl:Ljava/util/regex/Pattern;
 
 
 # instance fields
-.field private final brr:Ljava/lang/String;
+.field private final brm:Ljava/lang/String;
 
-.field public final brs:Ljava/lang/String;
+.field public final brn:Ljava/lang/String;
 
-.field private final brt:Ljava/lang/String;
+.field private final bro: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;->brp:Ljava/util/regex/Pattern;
+    sput-object v0, Lokhttp3/MediaType;->brk: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;->brq:Ljava/util/regex/Pattern;
+    sput-object v0, Lokhttp3/MediaType;->brl: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;->brr:Ljava/lang/String;
+    iput-object p1, p0, Lokhttp3/MediaType;->brm:Ljava/lang/String;
 
     iput-object p2, p0, Lokhttp3/MediaType;->type:Ljava/lang/String;
 
-    iput-object p3, p0, Lokhttp3/MediaType;->brs:Ljava/lang/String;
+    iput-object p3, p0, Lokhttp3/MediaType;->brn:Ljava/lang/String;
 
-    iput-object p4, p0, Lokhttp3/MediaType;->brt:Ljava/lang/String;
+    iput-object p4, p0, Lokhttp3/MediaType;->bro: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;->brp:Ljava/util/regex/Pattern;
+    sget-object v0, Lokhttp3/MediaType;->brk: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;->brq:Ljava/util/regex/Pattern;
+    sget-object v7, Lokhttp3/MediaType;->brl: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;->brt:Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/MediaType;->bro:Ljava/lang/String;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/MediaType;->brt:Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/MediaType;->bro: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;->brr:Ljava/lang/String;
+    iget-object p1, p1, Lokhttp3/MediaType;->brm:Ljava/lang/String;
 
-    iget-object v0, p0, Lokhttp3/MediaType;->brr:Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/MediaType;->brm: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;->brr:Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/MediaType;->brm: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;->brr:Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/MediaType;->brm: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 df34c35a83..bc12635ab4 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 brH:Lokhttp3/Headers;
+.field final brC:Lokhttp3/Headers;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field final brI:Lokhttp3/RequestBody;
+.field final brD:Lokhttp3/RequestBody;
 
 
 # direct methods
@@ -33,9 +33,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/MultipartBody$Part;->brH:Lokhttp3/Headers;
+    iput-object p1, p0, Lokhttp3/MultipartBody$Part;->brC:Lokhttp3/Headers;
 
-    iput-object p2, p0, Lokhttp3/MultipartBody$Part;->brI:Lokhttp3/RequestBody;
+    iput-object p2, p0, Lokhttp3/MultipartBody$Part;->brD: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 c11adbc3a3..303b1bc6b0 100644
--- a/com.discord/smali/okhttp3/MultipartBody$a.smali
+++ b/com.discord/smali/okhttp3/MultipartBody$a.smali
@@ -15,9 +15,7 @@
 
 
 # instance fields
-.field public final brC:Lokio/ByteString;
-
-.field public final brF:Ljava/util/List;
+.field public final brA:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -27,7 +25,9 @@
     .end annotation
 .end field
 
-.field public brG:Lokhttp3/MediaType;
+.field public brB:Lokhttp3/MediaType;
+
+.field public final brx:Lokio/ByteString;
 
 
 # direct methods
@@ -52,21 +52,21 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    sget-object v0, Lokhttp3/MultipartBody;->bru:Lokhttp3/MediaType;
+    sget-object v0, Lokhttp3/MultipartBody;->brp:Lokhttp3/MediaType;
 
-    iput-object v0, p0, Lokhttp3/MultipartBody$a;->brG:Lokhttp3/MediaType;
+    iput-object v0, p0, Lokhttp3/MultipartBody$a;->brB:Lokhttp3/MediaType;
 
     new-instance v0, Ljava/util/ArrayList;
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/MultipartBody$a;->brF:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/MultipartBody$a;->brA: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;->brC:Lokio/ByteString;
+    iput-object p1, p0, Lokhttp3/MultipartBody$a;->brx:Lokio/ByteString;
 
     return-void
 .end method
@@ -96,7 +96,7 @@
 
     if-eqz p1, :cond_0
 
-    iget-object v0, p0, Lokhttp3/MultipartBody$a;->brF:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/MultipartBody$a;->brA: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 10d2b358af..3cc3846b1a 100644
--- a/com.discord/smali/okhttp3/MultipartBody.smali
+++ b/com.discord/smali/okhttp3/MultipartBody.smali
@@ -13,31 +13,25 @@
 
 
 # static fields
-.field private static final brA:[B
+.field public static final brp:Lokhttp3/MediaType;
 
-.field private static final brB:[B
+.field public static final brq:Lokhttp3/MediaType;
 
-.field public static final bru:Lokhttp3/MediaType;
+.field public static final brr:Lokhttp3/MediaType;
 
-.field public static final brv:Lokhttp3/MediaType;
+.field public static final brs:Lokhttp3/MediaType;
 
-.field public static final brw:Lokhttp3/MediaType;
+.field public static final brt:Lokhttp3/MediaType;
 
-.field public static final brx:Lokhttp3/MediaType;
+.field private static final bru:[B
 
-.field public static final bry:Lokhttp3/MediaType;
+.field private static final brv:[B
 
-.field private static final brz:[B
+.field private static final brw:[B
 
 
 # instance fields
-.field private final brC:Lokio/ByteString;
-
-.field private final brD:Lokhttp3/MediaType;
-
-.field private final brE:Lokhttp3/MediaType;
-
-.field private final brF:Ljava/util/List;
+.field private final brA:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -47,6 +41,12 @@
     .end annotation
 .end field
 
+.field private final brx:Lokio/ByteString;
+
+.field private final bry:Lokhttp3/MediaType;
+
+.field private final brz:Lokhttp3/MediaType;
+
 .field private contentLength:J
 
 
@@ -60,7 +60,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/MultipartBody;->bru:Lokhttp3/MediaType;
+    sput-object v0, Lokhttp3/MultipartBody;->brp:Lokhttp3/MediaType;
 
     const-string v0, "multipart/alternative"
 
@@ -68,7 +68,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/MultipartBody;->brv:Lokhttp3/MediaType;
+    sput-object v0, Lokhttp3/MultipartBody;->brq:Lokhttp3/MediaType;
 
     const-string v0, "multipart/digest"
 
@@ -76,7 +76,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/MultipartBody;->brw:Lokhttp3/MediaType;
+    sput-object v0, Lokhttp3/MultipartBody;->brr:Lokhttp3/MediaType;
 
     const-string v0, "multipart/parallel"
 
@@ -84,7 +84,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/MultipartBody;->brx:Lokhttp3/MediaType;
+    sput-object v0, Lokhttp3/MultipartBody;->brs:Lokhttp3/MediaType;
 
     const-string v0, "multipart/form-data"
 
@@ -92,7 +92,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/MultipartBody;->bry:Lokhttp3/MediaType;
+    sput-object v0, Lokhttp3/MultipartBody;->brt:Lokhttp3/MediaType;
 
     const/4 v0, 0x2
 
@@ -100,19 +100,19 @@
 
     fill-array-data v1, :array_0
 
-    sput-object v1, Lokhttp3/MultipartBody;->brz:[B
+    sput-object v1, Lokhttp3/MultipartBody;->bru:[B
 
     new-array v1, v0, [B
 
     fill-array-data v1, :array_1
 
-    sput-object v1, Lokhttp3/MultipartBody;->brA:[B
+    sput-object v1, Lokhttp3/MultipartBody;->brv:[B
 
     new-array v0, v0, [B
 
     fill-array-data v0, :array_2
 
-    sput-object v0, Lokhttp3/MultipartBody;->brB:[B
+    sput-object v0, Lokhttp3/MultipartBody;->brw:[B
 
     return-void
 
@@ -160,9 +160,9 @@
 
     iput-wide v0, p0, Lokhttp3/MultipartBody;->contentLength:J
 
-    iput-object p1, p0, Lokhttp3/MultipartBody;->brC:Lokio/ByteString;
+    iput-object p1, p0, Lokhttp3/MultipartBody;->brx:Lokio/ByteString;
 
-    iput-object p2, p0, Lokhttp3/MultipartBody;->brD:Lokhttp3/MediaType;
+    iput-object p2, p0, Lokhttp3/MultipartBody;->bry: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;->Ht()Ljava/lang/String;
+    invoke-virtual {p1}, Lokio/ByteString;->Hr()Ljava/lang/String;
 
     move-result-object p1
 
@@ -188,13 +188,13 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lokhttp3/MultipartBody;->brE:Lokhttp3/MediaType;
+    iput-object p1, p0, Lokhttp3/MultipartBody;->brz: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;->brF:Ljava/util/List;
+    iput-object p1, p0, Lokhttp3/MultipartBody;->brA:Ljava/util/List;
 
     return-void
 .end method
@@ -225,7 +225,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    iget-object v1, p0, Lokhttp3/MultipartBody;->brF:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/MultipartBody;->brA: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;->brF:Ljava/util/List;
+    iget-object v6, p0, Lokhttp3/MultipartBody;->brA: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;->brH:Lokhttp3/Headers;
+    iget-object v7, v6, Lokhttp3/MultipartBody$Part;->brC:Lokhttp3/Headers;
 
-    iget-object v6, v6, Lokhttp3/MultipartBody$Part;->brI:Lokhttp3/RequestBody;
+    iget-object v6, v6, Lokhttp3/MultipartBody$Part;->brD:Lokhttp3/RequestBody;
 
-    sget-object v8, Lokhttp3/MultipartBody;->brB:[B
+    sget-object v8, Lokhttp3/MultipartBody;->brw:[B
 
     invoke-interface {p1, v8}, Lokio/BufferedSink;->E([B)Lokio/BufferedSink;
 
-    iget-object v8, p0, Lokhttp3/MultipartBody;->brC:Lokio/ByteString;
+    iget-object v8, p0, Lokhttp3/MultipartBody;->brx:Lokio/ByteString;
 
     invoke-interface {p1, v8}, Lokio/BufferedSink;->m(Lokio/ByteString;)Lokio/BufferedSink;
 
-    sget-object v8, Lokhttp3/MultipartBody;->brA:[B
+    sget-object v8, Lokhttp3/MultipartBody;->brv:[B
 
     invoke-interface {p1, v8}, Lokio/BufferedSink;->E([B)Lokio/BufferedSink;
 
     if-eqz v7, :cond_1
 
-    iget-object v8, v7, Lokhttp3/Headers;->brc:[Ljava/lang/String;
+    iget-object v8, v7, Lokhttp3/Headers;->bqX:[Ljava/lang/String;
 
     array-length v8, v8
 
@@ -287,7 +287,7 @@
 
     move-result-object v10
 
-    sget-object v11, Lokhttp3/MultipartBody;->brz:[B
+    sget-object v11, Lokhttp3/MultipartBody;->bru:[B
 
     invoke-interface {v10, v11}, Lokio/BufferedSink;->E([B)Lokio/BufferedSink;
 
@@ -301,7 +301,7 @@
 
     move-result-object v10
 
-    sget-object v11, Lokhttp3/MultipartBody;->brA:[B
+    sget-object v11, Lokhttp3/MultipartBody;->brv:[B
 
     invoke-interface {v10, v11}, Lokio/BufferedSink;->E([B)Lokio/BufferedSink;
 
@@ -330,7 +330,7 @@
 
     move-result-object v7
 
-    sget-object v8, Lokhttp3/MultipartBody;->brA:[B
+    sget-object v8, Lokhttp3/MultipartBody;->brv:[B
 
     invoke-interface {v7, v8}, Lokio/BufferedSink;->E([B)Lokio/BufferedSink;
 
@@ -355,7 +355,7 @@
 
     move-result-object v9
 
-    sget-object v10, Lokhttp3/MultipartBody;->brA:[B
+    sget-object v10, Lokhttp3/MultipartBody;->brv:[B
 
     invoke-interface {v9, v10}, Lokio/BufferedSink;->E([B)Lokio/BufferedSink;
 
@@ -370,7 +370,7 @@
 
     :cond_4
     :goto_3
-    sget-object v9, Lokhttp3/MultipartBody;->brA:[B
+    sget-object v9, Lokhttp3/MultipartBody;->brv:[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;->brA:[B
+    sget-object v6, Lokhttp3/MultipartBody;->brv:[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;->brB:[B
+    sget-object v1, Lokhttp3/MultipartBody;->brw:[B
 
     invoke-interface {p1, v1}, Lokio/BufferedSink;->E([B)Lokio/BufferedSink;
 
-    iget-object v1, p0, Lokhttp3/MultipartBody;->brC:Lokio/ByteString;
+    iget-object v1, p0, Lokhttp3/MultipartBody;->brx:Lokio/ByteString;
 
     invoke-interface {p1, v1}, Lokio/BufferedSink;->m(Lokio/ByteString;)Lokio/BufferedSink;
 
-    sget-object v1, Lokhttp3/MultipartBody;->brB:[B
+    sget-object v1, Lokhttp3/MultipartBody;->brw:[B
 
     invoke-interface {p1, v1}, Lokio/BufferedSink;->E([B)Lokio/BufferedSink;
 
-    sget-object v1, Lokhttp3/MultipartBody;->brA:[B
+    sget-object v1, Lokhttp3/MultipartBody;->brv:[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;->brE:Lokhttp3/MediaType;
+    iget-object v0, p0, Lokhttp3/MultipartBody;->brz: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 070f1bc1fc..4eca3c8aa9 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 bsu:Lokhttp3/MediaType;
+.field final synthetic bsp:Lokhttp3/MediaType;
 
-.field final synthetic bsv:Lokio/ByteString;
+.field final synthetic bsq:Lokio/ByteString;
 
 
 # direct methods
 .method constructor <init>(Lokhttp3/MediaType;Lokio/ByteString;)V
     .locals 0
 
-    iput-object p1, p0, Lokhttp3/RequestBody$1;->bsu:Lokhttp3/MediaType;
+    iput-object p1, p0, Lokhttp3/RequestBody$1;->bsp:Lokhttp3/MediaType;
 
-    iput-object p2, p0, Lokhttp3/RequestBody$1;->bsv:Lokio/ByteString;
+    iput-object p2, p0, Lokhttp3/RequestBody$1;->bsq:Lokio/ByteString;
 
     invoke-direct {p0}, Lokhttp3/RequestBody;-><init>()V
 
@@ -43,7 +43,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/RequestBody$1;->bsv:Lokio/ByteString;
+    iget-object v0, p0, Lokhttp3/RequestBody$1;->bsq: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;->bsu:Lokhttp3/MediaType;
+    iget-object v0, p0, Lokhttp3/RequestBody$1;->bsp:Lokhttp3/MediaType;
 
     return-object v0
 .end method
@@ -72,7 +72,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/RequestBody$1;->bsv:Lokio/ByteString;
+    iget-object v0, p0, Lokhttp3/RequestBody$1;->bsq: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 574095e410..324c0973fa 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 bsu:Lokhttp3/MediaType;
+.field final synthetic bsp:Lokhttp3/MediaType;
 
-.field final synthetic bsw:I
+.field final synthetic bsr:I
 
-.field final synthetic bsx:[B
+.field final synthetic bss:[B
 
-.field final synthetic bsy:I
+.field final synthetic bst:I
 
 
 # direct methods
 .method constructor <init>(Lokhttp3/MediaType;I[BI)V
     .locals 0
 
-    iput-object p1, p0, Lokhttp3/RequestBody$2;->bsu:Lokhttp3/MediaType;
+    iput-object p1, p0, Lokhttp3/RequestBody$2;->bsp:Lokhttp3/MediaType;
 
-    iput p2, p0, Lokhttp3/RequestBody$2;->bsw:I
+    iput p2, p0, Lokhttp3/RequestBody$2;->bsr:I
 
-    iput-object p3, p0, Lokhttp3/RequestBody$2;->bsx:[B
+    iput-object p3, p0, Lokhttp3/RequestBody$2;->bss:[B
 
-    iput p4, p0, Lokhttp3/RequestBody$2;->bsy:I
+    iput p4, p0, Lokhttp3/RequestBody$2;->bst: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;->bsw:I
+    iget v0, p0, Lokhttp3/RequestBody$2;->bsr:I
 
     int-to-long v0, v0
 
@@ -58,7 +58,7 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/RequestBody$2;->bsu:Lokhttp3/MediaType;
+    iget-object v0, p0, Lokhttp3/RequestBody$2;->bsp:Lokhttp3/MediaType;
 
     return-object v0
 .end method
@@ -71,11 +71,11 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/RequestBody$2;->bsx:[B
+    iget-object v0, p0, Lokhttp3/RequestBody$2;->bss:[B
 
-    iget v1, p0, Lokhttp3/RequestBody$2;->bsy:I
+    iget v1, p0, Lokhttp3/RequestBody$2;->bst:I
 
-    iget v2, p0, Lokhttp3/RequestBody$2;->bsw:I
+    iget v2, p0, Lokhttp3/RequestBody$2;->bsr: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 885261636f..bf67252a7f 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 bsu:Lokhttp3/MediaType;
+.field final synthetic bsp:Lokhttp3/MediaType;
 
-.field final synthetic bsz:Ljava/io/File;
+.field final synthetic bsu:Ljava/io/File;
 
 
 # direct methods
 .method constructor <init>(Lokhttp3/MediaType;Ljava/io/File;)V
     .locals 0
 
-    iput-object p1, p0, Lokhttp3/RequestBody$3;->bsu:Lokhttp3/MediaType;
+    iput-object p1, p0, Lokhttp3/RequestBody$3;->bsp:Lokhttp3/MediaType;
 
-    iput-object p2, p0, Lokhttp3/RequestBody$3;->bsz:Ljava/io/File;
+    iput-object p2, p0, Lokhttp3/RequestBody$3;->bsu: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;->bsz:Ljava/io/File;
+    iget-object v0, p0, Lokhttp3/RequestBody$3;->bsu: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;->bsu:Lokhttp3/MediaType;
+    iget-object v0, p0, Lokhttp3/RequestBody$3;->bsp: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;->bsz:Ljava/io/File;
+    iget-object v1, p0, Lokhttp3/RequestBody$3;->bsu: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 4d73d3b937..6cccbc97e2 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;->tw:Ljava/nio/charset/Charset;
+    sget-object v0, Lokhttp3/internal/c;->tx:Ljava/nio/charset/Charset;
 
     if-eqz p0, :cond_0
 
@@ -56,7 +56,7 @@
 
     if-nez v0, :cond_0
 
-    sget-object v0, Lokhttp3/internal/c;->tw:Ljava/nio/charset/Charset;
+    sget-object v0, Lokhttp3/internal/c;->tx: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 5b38e1be9d..e429171d5b 100644
--- a/com.discord/smali/okhttp3/Response$a.smali
+++ b/com.discord/smali/okhttp3/Response$a.smali
@@ -15,47 +15,47 @@
 
 
 # instance fields
-.field public bsA:Lokhttp3/w;
+.field bsA:Lokhttp3/Response;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public bsB:Lokhttp3/u;
+.field public bsB:Lokhttp3/Response;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public bsC:Lokhttp3/r;
+.field public bsC:J
+
+.field public bsD:J
+
+.field public bso:Lokhttp3/Headers$a;
+
+.field public bsv:Lokhttp3/w;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public bsD:Lokhttp3/x;
+.field public bsw:Lokhttp3/u;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field bsE:Lokhttp3/Response;
+.field public bsx:Lokhttp3/r;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field bsF:Lokhttp3/Response;
+.field public bsy:Lokhttp3/x;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public bsG:Lokhttp3/Response;
+.field bsz:Lokhttp3/Response;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public bsH:J
-
-.field public bsI:J
-
-.field public bst:Lokhttp3/Headers$a;
-
 .field public code:I
 
 .field public message:Ljava/lang/String;
@@ -75,7 +75,7 @@
 
     invoke-direct {v0}, Lokhttp3/Headers$a;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/Response$a;->bst:Lokhttp3/Headers$a;
+    iput-object v0, p0, Lokhttp3/Response$a;->bso: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;->bsA:Lokhttp3/w;
+    iget-object v0, p1, Lokhttp3/Response;->bsv:Lokhttp3/w;
 
-    iput-object v0, p0, Lokhttp3/Response$a;->bsA:Lokhttp3/w;
+    iput-object v0, p0, Lokhttp3/Response$a;->bsv:Lokhttp3/w;
 
-    iget-object v0, p1, Lokhttp3/Response;->bsB:Lokhttp3/u;
+    iget-object v0, p1, Lokhttp3/Response;->bsw:Lokhttp3/u;
 
-    iput-object v0, p0, Lokhttp3/Response$a;->bsB:Lokhttp3/u;
+    iput-object v0, p0, Lokhttp3/Response$a;->bsw: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;->bsC:Lokhttp3/r;
+    iget-object v0, p1, Lokhttp3/Response;->bsx:Lokhttp3/r;
 
-    iput-object v0, p0, Lokhttp3/Response$a;->bsC:Lokhttp3/r;
+    iput-object v0, p0, Lokhttp3/Response$a;->bsx:Lokhttp3/r;
 
-    iget-object v0, p1, Lokhttp3/Response;->brH:Lokhttp3/Headers;
+    iget-object v0, p1, Lokhttp3/Response;->brC:Lokhttp3/Headers;
 
-    invoke-virtual {v0}, Lokhttp3/Headers;->Fl()Lokhttp3/Headers$a;
+    invoke-virtual {v0}, Lokhttp3/Headers;->Fj()Lokhttp3/Headers$a;
 
     move-result-object v0
 
-    iput-object v0, p0, Lokhttp3/Response$a;->bst:Lokhttp3/Headers$a;
+    iput-object v0, p0, Lokhttp3/Response$a;->bso:Lokhttp3/Headers$a;
 
-    iget-object v0, p1, Lokhttp3/Response;->bsD:Lokhttp3/x;
+    iget-object v0, p1, Lokhttp3/Response;->bsy:Lokhttp3/x;
 
-    iput-object v0, p0, Lokhttp3/Response$a;->bsD:Lokhttp3/x;
+    iput-object v0, p0, Lokhttp3/Response$a;->bsy:Lokhttp3/x;
 
-    iget-object v0, p1, Lokhttp3/Response;->bsE:Lokhttp3/Response;
+    iget-object v0, p1, Lokhttp3/Response;->bsz:Lokhttp3/Response;
 
-    iput-object v0, p0, Lokhttp3/Response$a;->bsE:Lokhttp3/Response;
+    iput-object v0, p0, Lokhttp3/Response$a;->bsz:Lokhttp3/Response;
 
-    iget-object v0, p1, Lokhttp3/Response;->bsF:Lokhttp3/Response;
+    iget-object v0, p1, Lokhttp3/Response;->bsA:Lokhttp3/Response;
 
-    iput-object v0, p0, Lokhttp3/Response$a;->bsF:Lokhttp3/Response;
+    iput-object v0, p0, Lokhttp3/Response$a;->bsA:Lokhttp3/Response;
 
-    iget-object v0, p1, Lokhttp3/Response;->bsG:Lokhttp3/Response;
+    iget-object v0, p1, Lokhttp3/Response;->bsB:Lokhttp3/Response;
 
-    iput-object v0, p0, Lokhttp3/Response$a;->bsG:Lokhttp3/Response;
+    iput-object v0, p0, Lokhttp3/Response$a;->bsB:Lokhttp3/Response;
 
-    iget-wide v0, p1, Lokhttp3/Response;->bsH:J
+    iget-wide v0, p1, Lokhttp3/Response;->bsC:J
 
-    iput-wide v0, p0, Lokhttp3/Response$a;->bsH:J
+    iput-wide v0, p0, Lokhttp3/Response$a;->bsC:J
 
-    iget-wide v0, p1, Lokhttp3/Response;->bsI:J
+    iget-wide v0, p1, Lokhttp3/Response;->bsD:J
 
-    iput-wide v0, p0, Lokhttp3/Response$a;->bsI:J
+    iput-wide v0, p0, Lokhttp3/Response$a;->bsD: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;->bsD:Lokhttp3/x;
+    iget-object v0, p1, Lokhttp3/Response;->bsy:Lokhttp3/x;
 
     if-nez v0, :cond_3
 
-    iget-object v0, p1, Lokhttp3/Response;->bsE:Lokhttp3/Response;
+    iget-object v0, p1, Lokhttp3/Response;->bsz:Lokhttp3/Response;
 
     if-nez v0, :cond_2
 
-    iget-object v0, p1, Lokhttp3/Response;->bsF:Lokhttp3/Response;
+    iget-object v0, p1, Lokhttp3/Response;->bsA:Lokhttp3/Response;
 
     if-nez v0, :cond_1
 
-    iget-object p1, p1, Lokhttp3/Response;->bsG:Lokhttp3/Response;
+    iget-object p1, p1, Lokhttp3/Response;->bsB:Lokhttp3/Response;
 
     if-nez p1, :cond_0
 
@@ -252,14 +252,14 @@
 
 
 # virtual methods
-.method public final FP()Lokhttp3/Response;
+.method public final FN()Lokhttp3/Response;
     .locals 3
 
-    iget-object v0, p0, Lokhttp3/Response$a;->bsA:Lokhttp3/w;
+    iget-object v0, p0, Lokhttp3/Response$a;->bsv:Lokhttp3/w;
 
     if-eqz v0, :cond_3
 
-    iget-object v0, p0, Lokhttp3/Response$a;->bsB:Lokhttp3/u;
+    iget-object v0, p0, Lokhttp3/Response$a;->bsw: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;->bst:Lokhttp3/Headers$a;
+    iget-object v0, p0, Lokhttp3/Response$a;->bso: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;->bsE:Lokhttp3/Response;
+    iput-object p1, p0, Lokhttp3/Response$a;->bsz: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;->Fl()Lokhttp3/Headers$a;
+    invoke-virtual {p1}, Lokhttp3/Headers;->Fj()Lokhttp3/Headers$a;
 
     move-result-object p1
 
-    iput-object p1, p0, Lokhttp3/Response$a;->bst:Lokhttp3/Headers$a;
+    iput-object p1, p0, Lokhttp3/Response$a;->bso: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;->bsF:Lokhttp3/Response;
+    iput-object p1, p0, Lokhttp3/Response$a;->bsA:Lokhttp3/Response;
 
     return-object p0
 .end method
diff --git a/com.discord/smali/okhttp3/Response.smali b/com.discord/smali/okhttp3/Response.smali
index 30d6db7e98..5416e9573e 100644
--- a/com.discord/smali/okhttp3/Response.smali
+++ b/com.discord/smali/okhttp3/Response.smali
@@ -15,42 +15,42 @@
 
 
 # instance fields
-.field public final brH:Lokhttp3/Headers;
+.field public final brC:Lokhttp3/Headers;
 
-.field public final bsA:Lokhttp3/w;
-
-.field final bsB:Lokhttp3/u;
-
-.field public final bsC:Lokhttp3/r;
+.field final bsA:Lokhttp3/Response;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public final bsD:Lokhttp3/x;
+.field public final bsB:Lokhttp3/Response;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field final bsE:Lokhttp3/Response;
+.field public final bsC:J
+
+.field public final bsD:J
+
+.field private volatile bsn:Lokhttp3/d;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field final bsF:Lokhttp3/Response;
+.field public final bsv:Lokhttp3/w;
+
+.field final bsw:Lokhttp3/u;
+
+.field public final bsx:Lokhttp3/r;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public final bsG:Lokhttp3/Response;
+.field public final bsy:Lokhttp3/x;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public final bsH:J
-
-.field public final bsI:J
-
-.field private volatile bss:Lokhttp3/d;
+.field final bsz:Lokhttp3/Response;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
@@ -66,13 +66,13 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iget-object v0, p1, Lokhttp3/Response$a;->bsA:Lokhttp3/w;
+    iget-object v0, p1, Lokhttp3/Response$a;->bsv:Lokhttp3/w;
 
-    iput-object v0, p0, Lokhttp3/Response;->bsA:Lokhttp3/w;
+    iput-object v0, p0, Lokhttp3/Response;->bsv:Lokhttp3/w;
 
-    iget-object v0, p1, Lokhttp3/Response$a;->bsB:Lokhttp3/u;
+    iget-object v0, p1, Lokhttp3/Response$a;->bsw:Lokhttp3/u;
 
-    iput-object v0, p0, Lokhttp3/Response;->bsB:Lokhttp3/u;
+    iput-object v0, p0, Lokhttp3/Response;->bsw: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;->bsC:Lokhttp3/r;
+    iget-object v0, p1, Lokhttp3/Response$a;->bsx:Lokhttp3/r;
 
-    iput-object v0, p0, Lokhttp3/Response;->bsC:Lokhttp3/r;
+    iput-object v0, p0, Lokhttp3/Response;->bsx:Lokhttp3/r;
 
-    iget-object v0, p1, Lokhttp3/Response$a;->bst:Lokhttp3/Headers$a;
+    iget-object v0, p1, Lokhttp3/Response$a;->bso:Lokhttp3/Headers$a;
 
-    invoke-virtual {v0}, Lokhttp3/Headers$a;->Fm()Lokhttp3/Headers;
+    invoke-virtual {v0}, Lokhttp3/Headers$a;->Fk()Lokhttp3/Headers;
 
     move-result-object v0
 
-    iput-object v0, p0, Lokhttp3/Response;->brH:Lokhttp3/Headers;
+    iput-object v0, p0, Lokhttp3/Response;->brC:Lokhttp3/Headers;
 
-    iget-object v0, p1, Lokhttp3/Response$a;->bsD:Lokhttp3/x;
+    iget-object v0, p1, Lokhttp3/Response$a;->bsy:Lokhttp3/x;
 
-    iput-object v0, p0, Lokhttp3/Response;->bsD:Lokhttp3/x;
+    iput-object v0, p0, Lokhttp3/Response;->bsy:Lokhttp3/x;
 
-    iget-object v0, p1, Lokhttp3/Response$a;->bsE:Lokhttp3/Response;
+    iget-object v0, p1, Lokhttp3/Response$a;->bsz:Lokhttp3/Response;
 
-    iput-object v0, p0, Lokhttp3/Response;->bsE:Lokhttp3/Response;
+    iput-object v0, p0, Lokhttp3/Response;->bsz:Lokhttp3/Response;
 
-    iget-object v0, p1, Lokhttp3/Response$a;->bsF:Lokhttp3/Response;
+    iget-object v0, p1, Lokhttp3/Response$a;->bsA:Lokhttp3/Response;
 
-    iput-object v0, p0, Lokhttp3/Response;->bsF:Lokhttp3/Response;
+    iput-object v0, p0, Lokhttp3/Response;->bsA:Lokhttp3/Response;
 
-    iget-object v0, p1, Lokhttp3/Response$a;->bsG:Lokhttp3/Response;
+    iget-object v0, p1, Lokhttp3/Response$a;->bsB:Lokhttp3/Response;
 
-    iput-object v0, p0, Lokhttp3/Response;->bsG:Lokhttp3/Response;
+    iput-object v0, p0, Lokhttp3/Response;->bsB:Lokhttp3/Response;
 
-    iget-wide v0, p1, Lokhttp3/Response$a;->bsH:J
+    iget-wide v0, p1, Lokhttp3/Response$a;->bsC:J
 
-    iput-wide v0, p0, Lokhttp3/Response;->bsH:J
+    iput-wide v0, p0, Lokhttp3/Response;->bsC:J
 
-    iget-wide v0, p1, Lokhttp3/Response$a;->bsI:J
+    iget-wide v0, p1, Lokhttp3/Response$a;->bsD:J
 
-    iput-wide v0, p0, Lokhttp3/Response;->bsI:J
+    iput-wide v0, p0, Lokhttp3/Response;->bsD:J
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final FM()Lokhttp3/d;
+.method public final FK()Lokhttp3/d;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/Response;->bss:Lokhttp3/d;
+    iget-object v0, p0, Lokhttp3/Response;->bsn:Lokhttp3/d;
 
     if-eqz v0, :cond_0
 
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/Response;->brH:Lokhttp3/Headers;
+    iget-object v0, p0, Lokhttp3/Response;->brC:Lokhttp3/Headers;
 
     invoke-static {v0}, Lokhttp3/d;->a(Lokhttp3/Headers;)Lokhttp3/d;
 
     move-result-object v0
 
-    iput-object v0, p0, Lokhttp3/Response;->bss:Lokhttp3/d;
+    iput-object v0, p0, Lokhttp3/Response;->bsn:Lokhttp3/d;
 
     return-object v0
 .end method
 
-.method public final FO()Lokhttp3/Response$a;
+.method public final FM()Lokhttp3/Response$a;
     .locals 1
 
     new-instance v0, Lokhttp3/Response$a;
@@ -154,10 +154,10 @@
     return-object v0
 .end method
 
-.method public final Fx()Lokhttp3/w;
+.method public final Fv()Lokhttp3/w;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/Response;->bsA:Lokhttp3/w;
+    iget-object v0, p0, Lokhttp3/Response;->bsv:Lokhttp3/w;
 
     return-object v0
 .end method
@@ -165,7 +165,7 @@
 .method public final close()V
     .locals 2
 
-    iget-object v0, p0, Lokhttp3/Response;->bsD:Lokhttp3/x;
+    iget-object v0, p0, Lokhttp3/Response;->bsy:Lokhttp3/x;
 
     if-eqz v0, :cond_0
 
@@ -188,7 +188,7 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/Response;->brH:Lokhttp3/Headers;
+    iget-object v0, p0, Lokhttp3/Response;->brC: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;->bsB:Lokhttp3/u;
+    iget-object v1, p0, Lokhttp3/Response;->bsw: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;->bsA:Lokhttp3/w;
+    iget-object v1, p0, Lokhttp3/Response;->bsv:Lokhttp3/w;
 
-    iget-object v1, v1, Lokhttp3/w;->bnk:Lokhttp3/s;
+    iget-object v1, v1, Lokhttp3/w;->bnf: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 zg()Z
+.method public final ze()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 e5a5034626..de1b2881a0 100644
--- a/com.discord/smali/okhttp3/a.smali
+++ b/com.discord/smali/okhttp3/a.smali
@@ -4,15 +4,15 @@
 
 
 # instance fields
-.field public final bnk:Lokhttp3/s;
+.field public final bnf:Lokhttp3/s;
 
-.field public final bnl:Lokhttp3/o;
+.field public final bng:Lokhttp3/o;
 
-.field public final bnm:Ljavax/net/SocketFactory;
+.field public final bnh:Ljavax/net/SocketFactory;
 
-.field public final bnn:Lokhttp3/b;
+.field public final bni:Lokhttp3/b;
 
-.field public final bno:Ljava/util/List;
+.field public final bnj:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -22,7 +22,7 @@
     .end annotation
 .end field
 
-.field public final bnp:Ljava/util/List;
+.field public final bnk:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -32,19 +32,19 @@
     .end annotation
 .end field
 
-.field public final bnq:Ljava/net/ProxySelector;
+.field public final bnl:Ljava/net/ProxySelector;
 
-.field public final bnr:Ljava/net/Proxy;
+.field public final bnm:Ljava/net/Proxy;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public final bns:Ljavax/net/ssl/HostnameVerifier;
+.field public final bnn:Ljavax/net/ssl/HostnameVerifier;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public final bnt:Lokhttp3/g;
+.field public final bno: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;->brf:Ljava/lang/String;
+    iput-object v10, v8, Lokhttp3/s$a;->bra:Ljava/lang/String;
 
     goto :goto_1
 
@@ -150,7 +150,7 @@
 
     if-eqz v10, :cond_b
 
-    iput-object v9, v8, Lokhttp3/s$a;->brf:Ljava/lang/String;
+    iput-object v9, v8, Lokhttp3/s$a;->bra: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;->brg:Ljava/lang/String;
+    iput-object v9, v8, Lokhttp3/s$a;->brb: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;->Fw()Lokhttp3/s;
+    invoke-virtual {v8}, Lokhttp3/s$a;->Fu()Lokhttp3/s;
 
     move-result-object v1
 
-    iput-object v1, v0, Lokhttp3/a;->bnk:Lokhttp3/s;
+    iput-object v1, v0, Lokhttp3/a;->bnf:Lokhttp3/s;
 
     if-eqz v3, :cond_7
 
-    iput-object v3, v0, Lokhttp3/a;->bnl:Lokhttp3/o;
+    iput-object v3, v0, Lokhttp3/a;->bng:Lokhttp3/o;
 
     if-eqz v4, :cond_6
 
-    iput-object v4, v0, Lokhttp3/a;->bnm:Ljavax/net/SocketFactory;
+    iput-object v4, v0, Lokhttp3/a;->bnh:Ljavax/net/SocketFactory;
 
     if-eqz v6, :cond_5
 
-    iput-object v6, v0, Lokhttp3/a;->bnn:Lokhttp3/b;
+    iput-object v6, v0, Lokhttp3/a;->bni:Lokhttp3/b;
 
     if-eqz p10, :cond_4
 
@@ -201,7 +201,7 @@
 
     move-result-object v1
 
-    iput-object v1, v0, Lokhttp3/a;->bno:Ljava/util/List;
+    iput-object v1, v0, Lokhttp3/a;->bnj:Ljava/util/List;
 
     if-eqz p11, :cond_3
 
@@ -209,25 +209,25 @@
 
     move-result-object v1
 
-    iput-object v1, v0, Lokhttp3/a;->bnp:Ljava/util/List;
+    iput-object v1, v0, Lokhttp3/a;->bnk:Ljava/util/List;
 
     if-eqz v7, :cond_2
 
-    iput-object v7, v0, Lokhttp3/a;->bnq:Ljava/net/ProxySelector;
+    iput-object v7, v0, Lokhttp3/a;->bnl:Ljava/net/ProxySelector;
 
     move-object/from16 v1, p9
 
-    iput-object v1, v0, Lokhttp3/a;->bnr:Ljava/net/Proxy;
+    iput-object v1, v0, Lokhttp3/a;->bnm: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;->bns:Ljavax/net/ssl/HostnameVerifier;
+    iput-object v1, v0, Lokhttp3/a;->bnn:Ljavax/net/ssl/HostnameVerifier;
 
     move-object/from16 v1, p7
 
-    iput-object v1, v0, Lokhttp3/a;->bnt:Lokhttp3/g;
+    iput-object v1, v0, Lokhttp3/a;->bno:Lokhttp3/g;
 
     return-void
 
@@ -347,9 +347,9 @@
 .method final a(Lokhttp3/a;)Z
     .locals 2
 
-    iget-object v0, p0, Lokhttp3/a;->bnl:Lokhttp3/o;
+    iget-object v0, p0, Lokhttp3/a;->bng:Lokhttp3/o;
 
-    iget-object v1, p1, Lokhttp3/a;->bnl:Lokhttp3/o;
+    iget-object v1, p1, Lokhttp3/a;->bng: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;->bnn:Lokhttp3/b;
+    iget-object v0, p0, Lokhttp3/a;->bni:Lokhttp3/b;
 
-    iget-object v1, p1, Lokhttp3/a;->bnn:Lokhttp3/b;
+    iget-object v1, p1, Lokhttp3/a;->bni: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;->bno:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/a;->bnj:Ljava/util/List;
 
-    iget-object v1, p1, Lokhttp3/a;->bno:Ljava/util/List;
+    iget-object v1, p1, Lokhttp3/a;->bnj: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;->bnp:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/a;->bnk:Ljava/util/List;
 
-    iget-object v1, p1, Lokhttp3/a;->bnp:Ljava/util/List;
+    iget-object v1, p1, Lokhttp3/a;->bnk: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;->bnq:Ljava/net/ProxySelector;
+    iget-object v0, p0, Lokhttp3/a;->bnl:Ljava/net/ProxySelector;
 
-    iget-object v1, p1, Lokhttp3/a;->bnq:Ljava/net/ProxySelector;
+    iget-object v1, p1, Lokhttp3/a;->bnl: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;->bnr:Ljava/net/Proxy;
+    iget-object v0, p0, Lokhttp3/a;->bnm:Ljava/net/Proxy;
 
-    iget-object v1, p1, Lokhttp3/a;->bnr:Ljava/net/Proxy;
+    iget-object v1, p1, Lokhttp3/a;->bnm: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;->bns:Ljavax/net/ssl/HostnameVerifier;
+    iget-object v0, p0, Lokhttp3/a;->bnn:Ljavax/net/ssl/HostnameVerifier;
 
-    iget-object v1, p1, Lokhttp3/a;->bns:Ljavax/net/ssl/HostnameVerifier;
+    iget-object v1, p1, Lokhttp3/a;->bnn: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;->bnt:Lokhttp3/g;
+    iget-object v0, p0, Lokhttp3/a;->bno:Lokhttp3/g;
 
-    iget-object v1, p1, Lokhttp3/a;->bnt:Lokhttp3/g;
+    iget-object v1, p1, Lokhttp3/a;->bno: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;->bnk:Lokhttp3/s;
+    iget-object v0, p0, Lokhttp3/a;->bnf:Lokhttp3/s;
 
     iget v0, v0, Lokhttp3/s;->port:I
 
-    iget-object p1, p1, Lokhttp3/a;->bnk:Lokhttp3/s;
+    iget-object p1, p1, Lokhttp3/a;->bnf:Lokhttp3/s;
 
     iget p1, p1, Lokhttp3/s;->port:I
 
@@ -468,11 +468,11 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/a;->bnk:Lokhttp3/s;
+    iget-object v0, p0, Lokhttp3/a;->bnf:Lokhttp3/s;
 
     check-cast p1, Lokhttp3/a;
 
-    iget-object v1, p1, Lokhttp3/a;->bnk:Lokhttp3/s;
+    iget-object v1, p1, Lokhttp3/a;->bnf: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;->bnk:Lokhttp3/s;
+    iget-object v0, p0, Lokhttp3/a;->bnf: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;->bnl:Lokhttp3/o;
+    iget-object v1, p0, Lokhttp3/a;->bng: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;->bnn:Lokhttp3/b;
+    iget-object v1, p0, Lokhttp3/a;->bni: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;->bno:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/a;->bnj: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;->bnp:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/a;->bnk: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;->bnq:Ljava/net/ProxySelector;
+    iget-object v1, p0, Lokhttp3/a;->bnl: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;->bnr:Ljava/net/Proxy;
+    iget-object v1, p0, Lokhttp3/a;->bnm:Ljava/net/Proxy;
 
     const/4 v2, 0x0
 
@@ -597,7 +597,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lokhttp3/a;->bns:Ljavax/net/ssl/HostnameVerifier;
+    iget-object v1, p0, Lokhttp3/a;->bnn: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;->bnt:Lokhttp3/g;
+    iget-object v1, p0, Lokhttp3/a;->bno: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;->bnk:Lokhttp3/s;
+    iget-object v1, p0, Lokhttp3/a;->bnf:Lokhttp3/s;
 
-    iget-object v1, v1, Lokhttp3/s;->brg:Ljava/lang/String;
+    iget-object v1, v1, Lokhttp3/s;->brb: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;->bnk:Lokhttp3/s;
+    iget-object v1, p0, Lokhttp3/a;->bnf: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;->bnr:Ljava/net/Proxy;
+    iget-object v1, p0, Lokhttp3/a;->bnm: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;->bnr:Ljava/net/Proxy;
+    iget-object v1, p0, Lokhttp3/a;->bnm: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;->bnq:Ljava/net/ProxySelector;
+    iget-object v1, p0, Lokhttp3/a;->bnl: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 a999b2ff6f..e9d16afe4e 100644
--- a/com.discord/smali/okhttp3/d.smali
+++ b/com.discord/smali/okhttp3/d.smali
@@ -12,9 +12,9 @@
 
 
 # static fields
-.field public static final bnx:Lokhttp3/d;
+.field public static final bns:Lokhttp3/d;
 
-.field public static final bny:Lokhttp3/d;
+.field public static final bnt:Lokhttp3/d;
 
 
 # instance fields
@@ -22,27 +22,27 @@
 
 .field public final bnB:I
 
-.field private final bnC:I
+.field public final bnC:I
 
 .field public final bnD:Z
 
-.field public final bnE:Z
+.field private 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;
+.field bnF:Ljava/lang/String;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
+.field public final bnu:Z
+
+.field public final bnv:Z
+
+.field public final bnw:I
+
+.field private final bnx:I
+
+.field public final bny: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;->bnz:Z
+    iput-boolean v1, v0, Lokhttp3/d$a;->bnu:Z
 
-    invoke-virtual {v0}, Lokhttp3/d$a;->Fc()Lokhttp3/d;
+    invoke-virtual {v0}, Lokhttp3/d$a;->Fa()Lokhttp3/d;
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/d;->bnx:Lokhttp3/d;
+    sput-object v0, Lokhttp3/d;->bns:Lokhttp3/d;
 
     new-instance v0, Lokhttp3/d$a;
 
     invoke-direct {v0}, Lokhttp3/d$a;-><init>()V
 
-    iput-boolean v1, v0, Lokhttp3/d$a;->bnI:Z
+    iput-boolean v1, v0, Lokhttp3/d$a;->bnD: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;->bnG:I
+    iput v1, v0, Lokhttp3/d$a;->bnB:I
 
-    invoke-virtual {v0}, Lokhttp3/d$a;->Fc()Lokhttp3/d;
+    invoke-virtual {v0}, Lokhttp3/d$a;->Fa()Lokhttp3/d;
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/d;->bny:Lokhttp3/d;
+    sput-object v0, Lokhttp3/d;->bnt: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;->bnz:Z
+    iget-boolean v0, p1, Lokhttp3/d$a;->bnu:Z
+
+    iput-boolean v0, p0, Lokhttp3/d;->bnu:Z
+
+    iget-boolean v0, p1, Lokhttp3/d$a;->bnv:Z
+
+    iput-boolean v0, p0, Lokhttp3/d;->bnv:Z
+
+    iget v0, p1, Lokhttp3/d$a;->bnw:I
+
+    iput v0, p0, Lokhttp3/d;->bnw:I
+
+    const/4 v0, -0x1
+
+    iput v0, p0, Lokhttp3/d;->bnx:I
+
+    const/4 v0, 0x0
+
+    iput-boolean v0, p0, Lokhttp3/d;->bny: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
+    iget v0, p1, Lokhttp3/d$a;->bnC:I
 
     iput v0, p0, Lokhttp3/d;->bnC:I
 
-    const/4 v0, 0x0
+    iget-boolean v0, p1, Lokhttp3/d$a;->bnD:Z
 
     iput-boolean v0, p0, Lokhttp3/d;->bnD:Z
 
+    iget-boolean v0, p1, Lokhttp3/d$a;->bnE: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;->bnz:Z
+    iput-boolean p1, p0, Lokhttp3/d;->bnu:Z
 
-    iput-boolean p2, p0, Lokhttp3/d;->bnA:Z
+    iput-boolean p2, p0, Lokhttp3/d;->bnv:Z
 
-    iput p3, p0, Lokhttp3/d;->bnB:I
+    iput p3, p0, Lokhttp3/d;->bnw:I
 
-    iput p4, p0, Lokhttp3/d;->bnC:I
+    iput p4, p0, Lokhttp3/d;->bnx:I
 
-    iput-boolean p5, p0, Lokhttp3/d;->bnD:Z
+    iput-boolean p5, p0, Lokhttp3/d;->bny:Z
 
-    iput-boolean p6, p0, Lokhttp3/d;->bnE:Z
+    iput-boolean p6, p0, Lokhttp3/d;->bnz:Z
 
-    iput-boolean p7, p0, Lokhttp3/d;->bnF:Z
+    iput-boolean p7, p0, Lokhttp3/d;->bnA:Z
 
-    iput p8, p0, Lokhttp3/d;->bnG:I
+    iput p8, p0, Lokhttp3/d;->bnB:I
 
-    iput p9, p0, Lokhttp3/d;->bnH:I
+    iput p9, p0, Lokhttp3/d;->bnC:I
 
-    iput-boolean p10, p0, Lokhttp3/d;->bnI:Z
+    iput-boolean p10, p0, Lokhttp3/d;->bnD:Z
 
-    iput-boolean p11, p0, Lokhttp3/d;->bnJ:Z
+    iput-boolean p11, p0, Lokhttp3/d;->bnE:Z
 
     iput-boolean p12, p0, Lokhttp3/d;->immutable:Z
 
-    iput-object p13, p0, Lokhttp3/d;->bnK:Ljava/lang/String;
+    iput-object p13, p0, Lokhttp3/d;->bnF:Ljava/lang/String;
 
     return-void
 .end method
@@ -198,7 +198,7 @@
 
     move-object/from16 v0, p0
 
-    iget-object v1, v0, Lokhttp3/Headers;->brc:[Ljava/lang/String;
+    iget-object v1, v0, Lokhttp3/Headers;->bqX:[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;->bnK:Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/d;->bnF: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;->bnz:Z
+    iget-boolean v1, p0, Lokhttp3/d;->bnu: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;->bnA:Z
+    iget-boolean v1, p0, Lokhttp3/d;->bnv: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;->bnB:I
+    iget v1, p0, Lokhttp3/d;->bnw: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;->bnB:I
+    iget v1, p0, Lokhttp3/d;->bnw: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;->bnC:I
+    iget v1, p0, Lokhttp3/d;->bnx: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;->bnC:I
+    iget v1, p0, Lokhttp3/d;->bnx: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;->bnD:Z
+    iget-boolean v1, p0, Lokhttp3/d;->bny: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;->bnE:Z
+    iget-boolean v1, p0, Lokhttp3/d;->bnz: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;->bnF:Z
+    iget-boolean v1, p0, Lokhttp3/d;->bnA: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;->bnG:I
+    iget v1, p0, Lokhttp3/d;->bnB: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;->bnG: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_8
-    iget v1, p0, Lokhttp3/d;->bnH:I
+    iget v1, p0, Lokhttp3/d;->bnC: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;->bnH: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_9
-    iget-boolean v1, p0, Lokhttp3/d;->bnI:Z
+    iget-boolean v1, p0, Lokhttp3/d;->bnD: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;->bnJ:Z
+    iget-boolean v1, p0, Lokhttp3/d;->bnE:Z
 
     if-eqz v1, :cond_b
 
@@ -777,7 +777,7 @@
     move-result-object v0
 
     :goto_0
-    iput-object v0, p0, Lokhttp3/d;->bnK:Ljava/lang/String;
+    iput-object v0, p0, Lokhttp3/d;->bnF: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 f3f37a5a6d..b48c7db49a 100644
--- a/com.discord/smali/okhttp3/e.smali
+++ b/com.discord/smali/okhttp3/e.smali
@@ -15,7 +15,7 @@
 
 
 # virtual methods
-.method public abstract Fd()Lokhttp3/Response;
+.method public abstract Fb()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 fb2a8c0264..578ba0b107 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 bnL:Lokhttp3/g;
+.field public static final bnG:Lokhttp3/g;
 
 
 # instance fields
-.field final bnM:Ljava/util/Set;
+.field final bnH:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -27,7 +27,7 @@
     .end annotation
 .end field
 
-.field final bnN:Lokhttp3/internal/i/c;
+.field final bnI: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;->beP:Ljava/util/List;
+    iget-object v0, v0, Lokhttp3/g$a;->beK: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;->bnL:Lokhttp3/g;
+    sput-object v1, Lokhttp3/g;->bnG:Lokhttp3/g;
 
     return-void
 .end method
@@ -77,9 +77,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/g;->bnM:Ljava/util/Set;
+    iput-object p1, p0, Lokhttp3/g;->bnH:Ljava/util/Set;
 
-    iput-object p2, p0, Lokhttp3/g;->bnN:Lokhttp3/internal/i/c;
+    iput-object p2, p0, Lokhttp3/g;->bnI:Lokhttp3/internal/i/c;
 
     return-void
 .end method
@@ -103,7 +103,7 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lokio/ByteString;->Hu()Ljava/lang/String;
+    invoke-virtual {p0}, Lokio/ByteString;->Hs()Ljava/lang/String;
 
     move-result-object p0
 
@@ -140,7 +140,7 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lokio/ByteString;->Hw()Lokio/ByteString;
+    invoke-virtual {p0}, Lokio/ByteString;->Hu()Lokio/ByteString;
 
     move-result-object p0
 
@@ -167,11 +167,11 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lokhttp3/g;->bnN:Lokhttp3/internal/i/c;
+    iget-object v1, p0, Lokhttp3/g;->bnI:Lokhttp3/internal/i/c;
 
     check-cast p1, Lokhttp3/g;
 
-    iget-object v2, p1, Lokhttp3/g;->bnN:Lokhttp3/internal/i/c;
+    iget-object v2, p1, Lokhttp3/g;->bnI: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;->bnM:Ljava/util/Set;
+    iget-object v1, p0, Lokhttp3/g;->bnH:Ljava/util/Set;
 
-    iget-object p1, p1, Lokhttp3/g;->bnM:Ljava/util/Set;
+    iget-object p1, p1, Lokhttp3/g;->bnH: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;->bnM:Ljava/util/Set;
+    iget-object v2, v0, Lokhttp3/g;->bnH: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;->bnO:Ljava/lang/String;
+    iget-object v3, v11, Lokhttp3/g$b;->bnJ: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;->bnO:Ljava/lang/String;
+    iget-object v4, v11, Lokhttp3/g$b;->bnJ:Ljava/lang/String;
 
     const/4 v5, 0x0
 
-    iget-object v1, v11, Lokhttp3/g$b;->bnO:Ljava/lang/String;
+    iget-object v1, v11, Lokhttp3/g$b;->bnJ: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;->bnO:Ljava/lang/String;
+    iget-object v1, v11, Lokhttp3/g$b;->bnJ: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;->bnN:Lokhttp3/internal/i/c;
+    iget-object v1, v0, Lokhttp3/g;->bnI: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;->bnP:Ljava/lang/String;
+    iget-object v13, v12, Lokhttp3/g$b;->bnK:Ljava/lang/String;
 
     const-string v14, "sha256/"
 
@@ -414,7 +414,7 @@
     move-result-object v8
 
     :cond_7
-    iget-object v12, v12, Lokhttp3/g$b;->bnQ:Lokio/ByteString;
+    iget-object v12, v12, Lokhttp3/g$b;->bnL: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;->bnP:Ljava/lang/String;
+    iget-object v13, v12, Lokhttp3/g$b;->bnK:Ljava/lang/String;
 
     const-string v14, "sha1/"
 
@@ -449,12 +449,12 @@
 
     move-result-object v11
 
-    invoke-virtual {v11}, Lokio/ByteString;->Hv()Lokio/ByteString;
+    invoke-virtual {v11}, Lokio/ByteString;->Ht()Lokio/ByteString;
 
     move-result-object v11
 
     :cond_9
-    iget-object v12, v12, Lokhttp3/g$b;->bnQ:Lokio/ByteString;
+    iget-object v12, v12, Lokhttp3/g$b;->bnL: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;->bnP:Ljava/lang/String;
+    iget-object v3, v12, Lokhttp3/g$b;->bnK: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;->bnN:Lokhttp3/internal/i/c;
+    iget-object v0, p0, Lokhttp3/g;->bnI: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;->bnM:Ljava/util/Set;
+    iget-object v1, p0, Lokhttp3/g;->bnH: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 9de958df62..e37b3049ed 100644
--- a/com.discord/smali/okhttp3/i.smali
+++ b/com.discord/smali/okhttp3/i.smali
@@ -4,5 +4,5 @@
 
 
 # virtual methods
-.method public abstract Fe()Lokhttp3/u;
+.method public abstract Fc()Lokhttp3/u;
 .end method
diff --git a/com.discord/smali/okhttp3/internal/a.smali b/com.discord/smali/okhttp3/internal/a.smali
index 96dd9ddaaf..a60676e9ab 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 bsV:Lokhttp3/internal/a;
+.field public static bsQ: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 0aff3a9bfd..4fef18e10a 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 bsF:Lokhttp3/Response;
+.field public final bsA:Lokhttp3/Response;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public final bts:Lokhttp3/w;
+.field public final btn: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;->bts:Lokhttp3/w;
+    iput-object p1, p0, Lokhttp3/internal/a/c;->btn:Lokhttp3/w;
 
-    iput-object p2, p0, Lokhttp3/internal/a/c;->bsF:Lokhttp3/Response;
+    iput-object p2, p0, Lokhttp3/internal/a/c;->bsA:Lokhttp3/Response;
 
     return-void
 .end method
@@ -97,29 +97,29 @@
 
     if-nez v0, :cond_1
 
-    invoke-virtual {p0}, Lokhttp3/Response;->FM()Lokhttp3/d;
+    invoke-virtual {p0}, Lokhttp3/Response;->FK()Lokhttp3/d;
 
     move-result-object v0
 
-    iget v0, v0, Lokhttp3/d;->bnB:I
+    iget v0, v0, Lokhttp3/d;->bnw:I
 
     const/4 v1, -0x1
 
     if-ne v0, v1, :cond_1
 
-    invoke-virtual {p0}, Lokhttp3/Response;->FM()Lokhttp3/d;
+    invoke-virtual {p0}, Lokhttp3/Response;->FK()Lokhttp3/d;
 
     move-result-object v0
 
-    iget-boolean v0, v0, Lokhttp3/d;->bnE:Z
+    iget-boolean v0, v0, Lokhttp3/d;->bnz:Z
 
     if-nez v0, :cond_1
 
-    invoke-virtual {p0}, Lokhttp3/Response;->FM()Lokhttp3/d;
+    invoke-virtual {p0}, Lokhttp3/Response;->FK()Lokhttp3/d;
 
     move-result-object v0
 
-    iget-boolean v0, v0, Lokhttp3/d;->bnD:Z
+    iget-boolean v0, v0, Lokhttp3/d;->bny:Z
 
     if-nez v0, :cond_1
 
@@ -128,19 +128,19 @@
 
     :cond_1
     :pswitch_1
-    invoke-virtual {p0}, Lokhttp3/Response;->FM()Lokhttp3/d;
+    invoke-virtual {p0}, Lokhttp3/Response;->FK()Lokhttp3/d;
 
     move-result-object p0
 
-    iget-boolean p0, p0, Lokhttp3/d;->bnA:Z
+    iget-boolean p0, p0, Lokhttp3/d;->bnv:Z
 
     if-nez p0, :cond_2
 
-    invoke-virtual {p1}, Lokhttp3/w;->FM()Lokhttp3/d;
+    invoke-virtual {p1}, Lokhttp3/w;->FK()Lokhttp3/d;
 
     move-result-object p0
 
-    iget-boolean p0, p0, Lokhttp3/d;->bnA:Z
+    iget-boolean p0, p0, Lokhttp3/d;->bnv: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 1e374a8198..bf0244a712 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 brR:Lokhttp3/j;
+.field private final brM:Lokhttp3/j;
 
-.field private bsB:Lokhttp3/u;
+.field private bsw:Lokhttp3/u;
 
-.field public bsC:Lokhttp3/r;
+.field public bsx:Lokhttp3/r;
 
-.field public final btV:Lokhttp3/y;
+.field public final btQ:Lokhttp3/y;
 
-.field public btW:Ljava/net/Socket;
+.field public btR:Ljava/net/Socket;
 
-.field public btX:Ljava/net/Socket;
+.field public btS:Ljava/net/Socket;
 
-.field btY:Lokhttp3/internal/e/g;
+.field btT:Lokhttp3/internal/e/g;
 
-.field public btZ:Lokio/BufferedSink;
+.field public btU:Lokio/BufferedSink;
 
-.field public bua:Z
+.field public btV:Z
 
-.field public bub:I
+.field public btW:I
 
-.field public buc:I
+.field public btX:I
 
-.field public final bud:Ljava/util/List;
+.field public final btY:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -40,9 +40,9 @@
     .end annotation
 .end field
 
-.field public bue:J
+.field public btZ:J
 
-.field public lY:Lokio/d;
+.field public lZ:Lokio/d;
 
 
 # direct methods
@@ -53,21 +53,21 @@
 
     const/4 v0, 0x1
 
-    iput v0, p0, Lokhttp3/internal/b/c;->buc:I
+    iput v0, p0, Lokhttp3/internal/b/c;->btX:I
 
     new-instance v0, Ljava/util/ArrayList;
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/internal/b/c;->bud:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/internal/b/c;->btY:Ljava/util/List;
 
     const-wide v0, 0x7fffffffffffffffL
 
-    iput-wide v0, p0, Lokhttp3/internal/b/c;->bue:J
+    iput-wide v0, p0, Lokhttp3/internal/b/c;->btZ:J
 
-    iput-object p1, p0, Lokhttp3/internal/b/c;->brR:Lokhttp3/j;
+    iput-object p1, p0, Lokhttp3/internal/b/c;->brM:Lokhttp3/j;
 
-    iput-object p2, p0, Lokhttp3/internal/b/c;->btV:Lokhttp3/y;
+    iput-object p2, p0, Lokhttp3/internal/b/c;->btQ:Lokhttp3/y;
 
     return-void
 .end method
@@ -80,13 +80,13 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/b/c;->btV:Lokhttp3/y;
+    iget-object v0, p0, Lokhttp3/internal/b/c;->btQ:Lokhttp3/y;
 
-    iget-object v0, v0, Lokhttp3/y;->bnr:Ljava/net/Proxy;
+    iget-object v0, v0, Lokhttp3/y;->bnm:Ljava/net/Proxy;
 
-    iget-object v1, p0, Lokhttp3/internal/b/c;->btV:Lokhttp3/y;
+    iget-object v1, p0, Lokhttp3/internal/b/c;->btQ:Lokhttp3/y;
 
-    iget-object v1, v1, Lokhttp3/y;->bsN:Lokhttp3/a;
+    iget-object v1, v1, Lokhttp3/y;->bsI: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;->bnm:Ljavax/net/SocketFactory;
+    iget-object v0, v1, Lokhttp3/a;->bnh: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;->btW:Ljava/net/Socket;
+    iput-object v1, p0, Lokhttp3/internal/b/c;->btR:Ljava/net/Socket;
 
-    iget-object v0, p0, Lokhttp3/internal/b/c;->btW:Ljava/net/Socket;
+    iget-object v0, p0, Lokhttp3/internal/b/c;->btR:Ljava/net/Socket;
 
     invoke-virtual {v0, p2}, Ljava/net/Socket;->setSoTimeout(I)V
 
     :try_start_0
-    invoke-static {}, Lokhttp3/internal/g/f;->GT()Lokhttp3/internal/g/f;
+    invoke-static {}, Lokhttp3/internal/g/f;->GR()Lokhttp3/internal/g/f;
 
     move-result-object p2
 
-    iget-object v0, p0, Lokhttp3/internal/b/c;->btW:Ljava/net/Socket;
+    iget-object v0, p0, Lokhttp3/internal/b/c;->btR:Ljava/net/Socket;
 
-    iget-object v1, p0, Lokhttp3/internal/b/c;->btV:Lokhttp3/y;
+    iget-object v1, p0, Lokhttp3/internal/b/c;->btQ:Lokhttp3/y;
 
-    iget-object v1, v1, Lokhttp3/y;->bsO:Ljava/net/InetSocketAddress;
+    iget-object v1, v1, Lokhttp3/y;->bsJ: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;->btW:Ljava/net/Socket;
+    iget-object p1, p0, Lokhttp3/internal/b/c;->btR: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;->lY:Lokio/d;
+    iput-object p1, p0, Lokhttp3/internal/b/c;->lZ:Lokio/d;
 
-    iget-object p1, p0, Lokhttp3/internal/b/c;->btW:Ljava/net/Socket;
+    iget-object p1, p0, Lokhttp3/internal/b/c;->btR: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;->btZ:Lokio/BufferedSink;
+    iput-object p1, p0, Lokhttp3/internal/b/c;->btU: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;->btV:Lokhttp3/y;
+    iget-object v1, p0, Lokhttp3/internal/b/c;->btQ:Lokhttp3/y;
 
-    iget-object v1, v1, Lokhttp3/y;->bsO:Ljava/net/InetSocketAddress;
+    iget-object v1, v1, Lokhttp3/y;->bsJ: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;->btX:Ljava/net/Socket;
+    iget-object v0, p0, Lokhttp3/internal/b/c;->btS:Ljava/net/Socket;
 
     const/4 v1, 0x0
 
@@ -242,55 +242,47 @@
 
     invoke-direct {v0}, Lokhttp3/internal/e/g$a;-><init>()V
 
-    iget-object v1, p0, Lokhttp3/internal/b/c;->btX:Ljava/net/Socket;
+    iget-object v1, p0, Lokhttp3/internal/b/c;->btS:Ljava/net/Socket;
 
-    iget-object v2, p0, Lokhttp3/internal/b/c;->btV:Lokhttp3/y;
+    iget-object v2, p0, Lokhttp3/internal/b/c;->btQ:Lokhttp3/y;
 
-    iget-object v2, v2, Lokhttp3/y;->bsN:Lokhttp3/a;
+    iget-object v2, v2, Lokhttp3/y;->bsI:Lokhttp3/a;
 
-    iget-object v2, v2, Lokhttp3/a;->bnk:Lokhttp3/s;
+    iget-object v2, v2, Lokhttp3/a;->bnf:Lokhttp3/s;
 
-    iget-object v2, v2, Lokhttp3/s;->brg:Ljava/lang/String;
+    iget-object v2, v2, Lokhttp3/s;->brb:Ljava/lang/String;
 
-    iget-object v3, p0, Lokhttp3/internal/b/c;->lY:Lokio/d;
+    iget-object v3, p0, Lokhttp3/internal/b/c;->lZ:Lokio/d;
 
-    iget-object v4, p0, Lokhttp3/internal/b/c;->btZ:Lokio/BufferedSink;
+    iget-object v4, p0, Lokhttp3/internal/b/c;->btU: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;->bvK:Lokhttp3/internal/e/g$b;
+    iput-object p0, v0, Lokhttp3/internal/e/g$a;->bvF:Lokhttp3/internal/e/g$b;
 
-    iput p1, v0, Lokhttp3/internal/e/g$a;->bwh:I
+    iput p1, v0, Lokhttp3/internal/e/g$a;->bwc:I
 
-    invoke-virtual {v0}, Lokhttp3/internal/e/g$a;->Gx()Lokhttp3/internal/e/g;
+    invoke-virtual {v0}, Lokhttp3/internal/e/g$a;->Gv()Lokhttp3/internal/e/g;
 
     move-result-object p1
 
-    iput-object p1, p0, Lokhttp3/internal/b/c;->btY:Lokhttp3/internal/e/g;
+    iput-object p1, p0, Lokhttp3/internal/b/c;->btT:Lokhttp3/internal/e/g;
 
-    iget-object p1, p0, Lokhttp3/internal/b/c;->btY:Lokhttp3/internal/e/g;
+    iget-object p1, p0, Lokhttp3/internal/b/c;->btT:Lokhttp3/internal/e/g;
 
-    invoke-virtual {p1}, Lokhttp3/internal/e/g;->Gv()V
+    invoke-virtual {p1}, Lokhttp3/internal/e/g;->Gt()V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final Fe()Lokhttp3/u;
+.method public final FZ()Z
     .locals 1
 
-    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;
+    iget-object v0, p0, Lokhttp3/internal/b/c;->btT:Lokhttp3/internal/e/g;
 
     if-eqz v0, :cond_0
 
@@ -304,10 +296,18 @@
     return v0
 .end method
 
+.method public final Fc()Lokhttp3/u;
+    .locals 1
+
+    iget-object v0, p0, Lokhttp3/internal/b/c;->bsw:Lokhttp3/u;
+
+    return-object v0
+.end method
+
 .method public final X(Z)Z
     .locals 4
 
-    iget-object v0, p0, Lokhttp3/internal/b/c;->btX:Ljava/net/Socket;
+    iget-object v0, p0, Lokhttp3/internal/b/c;->btS: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;->btX:Ljava/net/Socket;
+    iget-object v0, p0, Lokhttp3/internal/b/c;->btS: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;->btX:Ljava/net/Socket;
+    iget-object v0, p0, Lokhttp3/internal/b/c;->btS: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;->btY:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/b/c;->btT: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;->btX:Ljava/net/Socket;
+    iget-object p1, p0, Lokhttp3/internal/b/c;->btS: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;->btX:Ljava/net/Socket;
+    iget-object v0, p0, Lokhttp3/internal/b/c;->btS:Ljava/net/Socket;
 
     invoke-virtual {v0, v2}, Ljava/net/Socket;->setSoTimeout(I)V
 
-    iget-object v0, p0, Lokhttp3/internal/b/c;->lY:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/b/c;->lZ:Lokio/d;
 
-    invoke-interface {v0}, Lokio/d;->Hi()Z
+    invoke-interface {v0}, Lokio/d;->Hg()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;->btX:Ljava/net/Socket;
+    iget-object v0, p0, Lokhttp3/internal/b/c;->btS: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;->btX:Ljava/net/Socket;
+    iget-object v0, p0, Lokhttp3/internal/b/c;->btS: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;->btX:Ljava/net/Socket;
+    iget-object v3, p0, Lokhttp3/internal/b/c;->btS: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;->bsB:Lokhttp3/u;
+    iget-object v0, v1, Lokhttp3/internal/b/c;->bsw:Lokhttp3/u;
 
     if-nez v0, :cond_1c
 
-    iget-object v0, v1, Lokhttp3/internal/b/c;->btV:Lokhttp3/y;
+    iget-object v0, v1, Lokhttp3/internal/b/c;->btQ:Lokhttp3/y;
 
-    iget-object v0, v0, Lokhttp3/y;->bsN:Lokhttp3/a;
+    iget-object v0, v0, Lokhttp3/y;->bsI:Lokhttp3/a;
 
-    iget-object v0, v0, Lokhttp3/a;->bnp:Ljava/util/List;
+    iget-object v0, v0, Lokhttp3/a;->bnk: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;->btV:Lokhttp3/y;
+    iget-object v4, v1, Lokhttp3/internal/b/c;->btQ:Lokhttp3/y;
 
-    iget-object v4, v4, Lokhttp3/y;->bsN:Lokhttp3/a;
+    iget-object v4, v4, Lokhttp3/y;->bsI:Lokhttp3/a;
 
     iget-object v4, v4, Lokhttp3/a;->sslSocketFactory:Ljavax/net/ssl/SSLSocketFactory;
 
     if-nez v4, :cond_2
 
-    sget-object v4, Lokhttp3/k;->bqu:Lokhttp3/k;
+    sget-object v4, Lokhttp3/k;->bqp: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;->btV:Lokhttp3/y;
+    iget-object v0, v1, Lokhttp3/internal/b/c;->btQ:Lokhttp3/y;
 
-    iget-object v0, v0, Lokhttp3/y;->bsN:Lokhttp3/a;
+    iget-object v0, v0, Lokhttp3/y;->bsI:Lokhttp3/a;
 
-    iget-object v0, v0, Lokhttp3/a;->bnk:Lokhttp3/s;
+    iget-object v0, v0, Lokhttp3/a;->bnf:Lokhttp3/s;
 
-    iget-object v0, v0, Lokhttp3/s;->brg:Ljava/lang/String;
+    iget-object v0, v0, Lokhttp3/s;->brb:Ljava/lang/String;
 
-    invoke-static {}, Lokhttp3/internal/g/f;->GT()Lokhttp3/internal/g/f;
+    invoke-static {}, Lokhttp3/internal/g/f;->GR()Lokhttp3/internal/g/f;
 
     move-result-object v4
 
@@ -517,13 +517,13 @@
     throw v0
 
     :cond_2
-    iget-object v0, v1, Lokhttp3/internal/b/c;->btV:Lokhttp3/y;
+    iget-object v0, v1, Lokhttp3/internal/b/c;->btQ:Lokhttp3/y;
 
-    iget-object v0, v0, Lokhttp3/y;->bsN:Lokhttp3/a;
+    iget-object v0, v0, Lokhttp3/y;->bsI:Lokhttp3/a;
 
-    iget-object v0, v0, Lokhttp3/a;->bno:Ljava/util/List;
+    iget-object v0, v0, Lokhttp3/a;->bnj:Ljava/util/List;
 
-    sget-object v4, Lokhttp3/u;->bse:Lokhttp3/u;
+    sget-object v4, Lokhttp3/u;->brZ: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;->btV:Lokhttp3/y;
+    iget-object v0, v1, Lokhttp3/internal/b/c;->btQ:Lokhttp3/y;
 
-    invoke-virtual {v0}, Lokhttp3/y;->FT()Z
+    invoke-virtual {v0}, Lokhttp3/y;->FR()Z
 
     move-result v0
 
@@ -554,11 +554,11 @@
 
     invoke-direct {v0}, Lokhttp3/w$a;-><init>()V
 
-    iget-object v8, v1, Lokhttp3/internal/b/c;->btV:Lokhttp3/y;
+    iget-object v8, v1, Lokhttp3/internal/b/c;->btQ:Lokhttp3/y;
 
-    iget-object v8, v8, Lokhttp3/y;->bsN:Lokhttp3/a;
+    iget-object v8, v8, Lokhttp3/y;->bsI:Lokhttp3/a;
 
-    iget-object v8, v8, Lokhttp3/a;->bnk:Lokhttp3/s;
+    iget-object v8, v8, Lokhttp3/a;->bnf: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;->btV:Lokhttp3/y;
+    iget-object v9, v1, Lokhttp3/internal/b/c;->btQ:Lokhttp3/y;
 
-    iget-object v9, v9, Lokhttp3/y;->bsN:Lokhttp3/a;
+    iget-object v9, v9, Lokhttp3/y;->bsI:Lokhttp3/a;
 
-    iget-object v9, v9, Lokhttp3/a;->bnk:Lokhttp3/s;
+    iget-object v9, v9, Lokhttp3/a;->bnf: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;->FN()Lokhttp3/w;
+    invoke-virtual {v0}, Lokhttp3/w$a;->FL()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;->bsA:Lokhttp3/w;
+    iput-object v0, v8, Lokhttp3/Response$a;->bsv:Lokhttp3/w;
 
-    sget-object v9, Lokhttp3/u;->bsb:Lokhttp3/u;
+    sget-object v9, Lokhttp3/u;->brW:Lokhttp3/u;
 
-    iput-object v9, v8, Lokhttp3/Response$a;->bsB:Lokhttp3/u;
+    iput-object v9, v8, Lokhttp3/Response$a;->bsw: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;->bsX:Lokhttp3/x;
+    sget-object v10, Lokhttp3/internal/c;->bsS:Lokhttp3/x;
 
-    iput-object v10, v8, Lokhttp3/Response$a;->bsD:Lokhttp3/x;
+    iput-object v10, v8, Lokhttp3/Response$a;->bsy:Lokhttp3/x;
 
     const-wide/16 v10, -0x1
 
-    iput-wide v10, v8, Lokhttp3/Response$a;->bsH:J
+    iput-wide v10, v8, Lokhttp3/Response$a;->bsC:J
 
-    iput-wide v10, v8, Lokhttp3/Response$a;->bsI:J
+    iput-wide v10, v8, Lokhttp3/Response$a;->bsD:J
 
     const-string v12, "Proxy-Authenticate"
 
     const-string v13, "OkHttp-Preemptive"
 
-    iget-object v14, v8, Lokhttp3/Response$a;->bst:Lokhttp3/Headers$a;
+    iget-object v14, v8, Lokhttp3/Response$a;->bso: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;->FP()Lokhttp3/Response;
+    invoke-virtual {v8}, Lokhttp3/Response$a;->FN()Lokhttp3/Response;
 
-    iget-object v8, v0, Lokhttp3/w;->bnk:Lokhttp3/s;
+    iget-object v8, v0, Lokhttp3/w;->bnf: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;->lY:Lokio/d;
+    iget-object v13, v1, Lokhttp3/internal/b/c;->lZ:Lokio/d;
 
-    iget-object v14, v1, Lokhttp3/internal/b/c;->btZ:Lokio/BufferedSink;
+    iget-object v14, v1, Lokhttp3/internal/b/c;->btU: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;->lY:Lokio/d;
+    iget-object v13, v1, Lokhttp3/internal/b/c;->lZ: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;->btZ:Lokio/BufferedSink;
+    iget-object v4, v1, Lokhttp3/internal/b/c;->btU: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;->brH:Lokhttp3/Headers;
+    iget-object v4, v0, Lokhttp3/w;->brC: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;->Gk()V
+    invoke-virtual {v12}, Lokhttp3/internal/d/a;->Gi()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;->bsA:Lokhttp3/w;
+    iput-object v0, v4, Lokhttp3/Response$a;->bsv:Lokhttp3/w;
 
-    invoke-virtual {v4}, Lokhttp3/Response$a;->FP()Lokhttp3/Response;
+    invoke-virtual {v4}, Lokhttp3/Response$a;->FN()Lokhttp3/Response;
 
     move-result-object v0
 
@@ -793,31 +793,31 @@
     throw v0
 
     :cond_5
-    iget-object v0, v1, Lokhttp3/internal/b/c;->lY:Lokio/d;
+    iget-object v0, v1, Lokhttp3/internal/b/c;->lZ:Lokio/d;
 
-    invoke-interface {v0}, Lokio/d;->Hf()Lokio/c;
+    invoke-interface {v0}, Lokio/d;->Hd()Lokio/c;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokio/c;->Hi()Z
+    invoke-virtual {v0}, Lokio/c;->Hg()Z
 
     move-result v0
 
     if-eqz v0, :cond_6
 
-    iget-object v0, v1, Lokhttp3/internal/b/c;->btZ:Lokio/BufferedSink;
+    iget-object v0, v1, Lokhttp3/internal/b/c;->btU:Lokio/BufferedSink;
 
-    invoke-interface {v0}, Lokio/BufferedSink;->Hf()Lokio/c;
+    invoke-interface {v0}, Lokio/BufferedSink;->Hd()Lokio/c;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokio/c;->Hi()Z
+    invoke-virtual {v0}, Lokio/c;->Hg()Z
 
     move-result v0
 
     if-eqz v0, :cond_6
 
-    iget-object v0, v1, Lokhttp3/internal/b/c;->btW:Ljava/net/Socket;
+    iget-object v0, v1, Lokhttp3/internal/b/c;->btR: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;->btV:Lokhttp3/y;
+    iget-object v0, v1, Lokhttp3/internal/b/c;->btQ:Lokhttp3/y;
 
-    iget-object v0, v0, Lokhttp3/y;->bsN:Lokhttp3/a;
+    iget-object v0, v0, Lokhttp3/y;->bsI: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;->btV:Lokhttp3/y;
+    iget-object v0, v1, Lokhttp3/internal/b/c;->btQ:Lokhttp3/y;
 
-    iget-object v0, v0, Lokhttp3/y;->bsN:Lokhttp3/a;
+    iget-object v0, v0, Lokhttp3/y;->bsI:Lokhttp3/a;
 
-    iget-object v0, v0, Lokhttp3/a;->bno:Ljava/util/List;
+    iget-object v0, v0, Lokhttp3/a;->bnj:Ljava/util/List;
 
-    sget-object v4, Lokhttp3/u;->bse:Lokhttp3/u;
+    sget-object v4, Lokhttp3/u;->brZ: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;->btW:Ljava/net/Socket;
+    iget-object v0, v1, Lokhttp3/internal/b/c;->btR:Ljava/net/Socket;
 
-    iput-object v0, v1, Lokhttp3/internal/b/c;->btX:Ljava/net/Socket;
+    iput-object v0, v1, Lokhttp3/internal/b/c;->btS:Ljava/net/Socket;
 
-    sget-object v0, Lokhttp3/u;->bse:Lokhttp3/u;
+    sget-object v0, Lokhttp3/u;->brZ:Lokhttp3/u;
 
-    iput-object v0, v1, Lokhttp3/internal/b/c;->bsB:Lokhttp3/u;
+    iput-object v0, v1, Lokhttp3/internal/b/c;->bsw: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;->btW:Ljava/net/Socket;
+    iget-object v0, v1, Lokhttp3/internal/b/c;->btR:Ljava/net/Socket;
 
-    iput-object v0, v1, Lokhttp3/internal/b/c;->btX:Ljava/net/Socket;
+    iput-object v0, v1, Lokhttp3/internal/b/c;->btS:Ljava/net/Socket;
 
-    sget-object v0, Lokhttp3/u;->bsb:Lokhttp3/u;
+    sget-object v0, Lokhttp3/u;->brW:Lokhttp3/u;
 
-    iput-object v0, v1, Lokhttp3/internal/b/c;->bsB:Lokhttp3/u;
+    iput-object v0, v1, Lokhttp3/internal/b/c;->bsw:Lokhttp3/u;
 
     goto/16 :goto_4
 
     :cond_a
-    iget-object v0, v1, Lokhttp3/internal/b/c;->btV:Lokhttp3/y;
+    iget-object v0, v1, Lokhttp3/internal/b/c;->btQ:Lokhttp3/y;
 
-    iget-object v0, v0, Lokhttp3/y;->bsN:Lokhttp3/a;
+    iget-object v0, v0, Lokhttp3/y;->bsI: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;->btW:Ljava/net/Socket;
+    iget-object v8, v1, Lokhttp3/internal/b/c;->btR:Ljava/net/Socket;
 
-    iget-object v9, v0, Lokhttp3/a;->bnk:Lokhttp3/s;
+    iget-object v9, v0, Lokhttp3/a;->bnf:Lokhttp3/s;
 
-    iget-object v9, v9, Lokhttp3/s;->brg:Ljava/lang/String;
+    iget-object v9, v9, Lokhttp3/s;->brb:Ljava/lang/String;
 
-    iget-object v10, v0, Lokhttp3/a;->bnk:Lokhttp3/s;
+    iget-object v10, v0, Lokhttp3/a;->bnf:Lokhttp3/s;
 
     iget v10, v10, Lokhttp3/s;->port:I
 
@@ -926,19 +926,19 @@
 
     move-result-object v8
 
-    iget-boolean v9, v8, Lokhttp3/k;->bqw:Z
+    iget-boolean v9, v8, Lokhttp3/k;->bqr:Z
 
     if-eqz v9, :cond_b
 
-    invoke-static {}, Lokhttp3/internal/g/f;->GT()Lokhttp3/internal/g/f;
+    invoke-static {}, Lokhttp3/internal/g/f;->GR()Lokhttp3/internal/g/f;
 
     move-result-object v9
 
-    iget-object v10, v0, Lokhttp3/a;->bnk:Lokhttp3/s;
+    iget-object v10, v0, Lokhttp3/a;->bnf:Lokhttp3/s;
 
-    iget-object v10, v10, Lokhttp3/s;->brg:Ljava/lang/String;
+    iget-object v10, v10, Lokhttp3/s;->brb:Ljava/lang/String;
 
-    iget-object v11, v0, Lokhttp3/a;->bno:Ljava/util/List;
+    iget-object v11, v0, Lokhttp3/a;->bnj: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;->bns:Ljavax/net/ssl/HostnameVerifier;
+    iget-object v11, v0, Lokhttp3/a;->bnn:Ljavax/net/ssl/HostnameVerifier;
 
-    iget-object v12, v0, Lokhttp3/a;->bnk:Lokhttp3/s;
+    iget-object v12, v0, Lokhttp3/a;->bnf:Lokhttp3/s;
 
-    iget-object v12, v12, Lokhttp3/s;->brg:Ljava/lang/String;
+    iget-object v12, v12, Lokhttp3/s;->brb: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;->bnt:Lokhttp3/g;
+    iget-object v9, v0, Lokhttp3/a;->bno:Lokhttp3/g;
 
-    iget-object v0, v0, Lokhttp3/a;->bnk:Lokhttp3/s;
+    iget-object v0, v0, Lokhttp3/a;->bnf:Lokhttp3/s;
 
-    iget-object v0, v0, Lokhttp3/s;->brg:Ljava/lang/String;
+    iget-object v0, v0, Lokhttp3/s;->brb:Ljava/lang/String;
 
-    iget-object v11, v10, Lokhttp3/r;->bra:Ljava/util/List;
+    iget-object v11, v10, Lokhttp3/r;->bqV:Ljava/util/List;
 
     invoke-virtual {v9, v0, v11}, Lokhttp3/g;->f(Ljava/lang/String;Ljava/util/List;)V
 
-    iget-boolean v0, v8, Lokhttp3/k;->bqw:Z
+    iget-boolean v0, v8, Lokhttp3/k;->bqr:Z
 
     if-eqz v0, :cond_c
 
-    invoke-static {}, Lokhttp3/internal/g/f;->GT()Lokhttp3/internal/g/f;
+    invoke-static {}, Lokhttp3/internal/g/f;->GR()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;->btX:Ljava/net/Socket;
+    iput-object v4, v1, Lokhttp3/internal/b/c;->btS:Ljava/net/Socket;
 
-    iget-object v8, v1, Lokhttp3/internal/b/c;->btX:Ljava/net/Socket;
+    iget-object v8, v1, Lokhttp3/internal/b/c;->btS: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;->lY:Lokio/d;
+    iput-object v8, v1, Lokhttp3/internal/b/c;->lZ:Lokio/d;
 
-    iget-object v8, v1, Lokhttp3/internal/b/c;->btX:Ljava/net/Socket;
+    iget-object v8, v1, Lokhttp3/internal/b/c;->btS: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;->btZ:Lokio/BufferedSink;
+    iput-object v8, v1, Lokhttp3/internal/b/c;->btU:Lokio/BufferedSink;
 
-    iput-object v10, v1, Lokhttp3/internal/b/c;->bsC:Lokhttp3/r;
+    iput-object v10, v1, Lokhttp3/internal/b/c;->bsx:Lokhttp3/r;
 
     if-eqz v0, :cond_d
 
@@ -1030,10 +1030,10 @@
     goto :goto_3
 
     :cond_d
-    sget-object v0, Lokhttp3/u;->bsb:Lokhttp3/u;
+    sget-object v0, Lokhttp3/u;->brW:Lokhttp3/u;
 
     :goto_3
-    iput-object v0, v1, Lokhttp3/internal/b/c;->bsB:Lokhttp3/u;
+    iput-object v0, v1, Lokhttp3/internal/b/c;->bsw: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;->GT()Lokhttp3/internal/g/f;
+    invoke-static {}, Lokhttp3/internal/g/f;->GR()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;->bsB:Lokhttp3/u;
+    iget-object v0, v1, Lokhttp3/internal/b/c;->bsw:Lokhttp3/u;
 
-    sget-object v4, Lokhttp3/u;->bsd:Lokhttp3/u;
+    sget-object v4, Lokhttp3/u;->brY:Lokhttp3/u;
 
     if-ne v0, v4, :cond_f
 
@@ -1060,15 +1060,15 @@
 
     :cond_f
     :goto_4
-    iget-object v0, v1, Lokhttp3/internal/b/c;->btV:Lokhttp3/y;
+    iget-object v0, v1, Lokhttp3/internal/b/c;->btQ:Lokhttp3/y;
 
-    invoke-virtual {v0}, Lokhttp3/y;->FT()Z
+    invoke-virtual {v0}, Lokhttp3/y;->FR()Z
 
     move-result v0
 
     if-eqz v0, :cond_11
 
-    iget-object v0, v1, Lokhttp3/internal/b/c;->btW:Ljava/net/Socket;
+    iget-object v0, v1, Lokhttp3/internal/b/c;->btR:Ljava/net/Socket;
 
     if-eqz v0, :cond_10
 
@@ -1089,22 +1089,22 @@
 
     :cond_11
     :goto_5
-    iget-object v0, v1, Lokhttp3/internal/b/c;->btY:Lokhttp3/internal/e/g;
+    iget-object v0, v1, Lokhttp3/internal/b/c;->btT:Lokhttp3/internal/e/g;
 
     if-eqz v0, :cond_12
 
-    iget-object v2, v1, Lokhttp3/internal/b/c;->brR:Lokhttp3/j;
+    iget-object v2, v1, Lokhttp3/internal/b/c;->brM:Lokhttp3/j;
 
     monitor-enter v2
 
     :try_start_6
-    iget-object v0, v1, Lokhttp3/internal/b/c;->btY:Lokhttp3/internal/e/g;
+    iget-object v0, v1, Lokhttp3/internal/b/c;->btT:Lokhttp3/internal/e/g;
 
-    invoke-virtual {v0}, Lokhttp3/internal/e/g;->Gt()I
+    invoke-virtual {v0}, Lokhttp3/internal/e/g;->Gr()I
 
     move-result v0
 
-    iput v0, v1, Lokhttp3/internal/b/c;->buc:I
+    iput v0, v1, Lokhttp3/internal/b/c;->btX:I
 
     monitor-exit v2
 
@@ -1124,7 +1124,7 @@
 
     :cond_13
     :try_start_7
-    iget-object v8, v10, Lokhttp3/r;->bra:Ljava/util/List;
+    iget-object v8, v10, Lokhttp3/r;->bqV: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;->bnk:Lokhttp3/s;
+    iget-object v0, v0, Lokhttp3/a;->bnf:Lokhttp3/s;
 
-    iget-object v0, v0, Lokhttp3/s;->brg:Ljava/lang/String;
+    iget-object v0, v0, Lokhttp3/s;->brb: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;->GT()Lokhttp3/internal/g/f;
+    invoke-static {}, Lokhttp3/internal/g/f;->GR()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;->btX:Ljava/net/Socket;
+    iget-object v4, v1, Lokhttp3/internal/b/c;->btS:Ljava/net/Socket;
 
     invoke-static {v4}, Lokhttp3/internal/c;->a(Ljava/net/Socket;)V
 
-    iget-object v4, v1, Lokhttp3/internal/b/c;->btW:Ljava/net/Socket;
+    iget-object v4, v1, Lokhttp3/internal/b/c;->btR: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;->btX:Ljava/net/Socket;
+    iput-object v4, v1, Lokhttp3/internal/b/c;->btS:Ljava/net/Socket;
 
-    iput-object v4, v1, Lokhttp3/internal/b/c;->btW:Ljava/net/Socket;
+    iput-object v4, v1, Lokhttp3/internal/b/c;->btR:Ljava/net/Socket;
 
-    iput-object v4, v1, Lokhttp3/internal/b/c;->lY:Lokio/d;
+    iput-object v4, v1, Lokhttp3/internal/b/c;->lZ:Lokio/d;
 
-    iput-object v4, v1, Lokhttp3/internal/b/c;->btZ:Lokio/BufferedSink;
+    iput-object v4, v1, Lokhttp3/internal/b/c;->btU:Lokio/BufferedSink;
 
-    iput-object v4, v1, Lokhttp3/internal/b/c;->bsC:Lokhttp3/r;
+    iput-object v4, v1, Lokhttp3/internal/b/c;->bsx:Lokhttp3/r;
 
-    iput-object v4, v1, Lokhttp3/internal/b/c;->bsB:Lokhttp3/u;
+    iput-object v4, v1, Lokhttp3/internal/b/c;->bsw:Lokhttp3/u;
 
-    iput-object v4, v1, Lokhttp3/internal/b/c;->btY:Lokhttp3/internal/e/g;
+    iput-object v4, v1, Lokhttp3/internal/b/c;->btT: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;->btU:Z
+    iput-boolean v7, v3, Lokhttp3/internal/b/b;->btP:Z
 
-    iget-boolean v9, v3, Lokhttp3/internal/b/b;->btT:Z
+    iget-boolean v9, v3, Lokhttp3/internal/b/b;->btO: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;->brR:Lokhttp3/j;
+    iget-object v0, p0, Lokhttp3/internal/b/c;->brM:Lokhttp3/j;
 
     monitor-enter v0
 
     :try_start_0
-    invoke-virtual {p1}, Lokhttp3/internal/e/g;->Gt()I
+    invoke-virtual {p1}, Lokhttp3/internal/e/g;->Gr()I
 
     move-result p1
 
-    iput p1, p0, Lokhttp3/internal/b/c;->buc:I
+    iput p1, p0, Lokhttp3/internal/b/c;->btX:I
 
     monitor-exit v0
 
@@ -1426,7 +1426,7 @@
         }
     .end annotation
 
-    sget-object v0, Lokhttp3/internal/e/b;->buT:Lokhttp3/internal/e/b;
+    sget-object v0, Lokhttp3/internal/e/b;->buO: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;->bud:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/internal/b/c;->btY:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
     move-result v0
 
-    iget v1, p0, Lokhttp3/internal/b/c;->buc:I
+    iget v1, p0, Lokhttp3/internal/b/c;->btX:I
 
     const/4 v2, 0x0
 
     if-ge v0, v1, :cond_a
 
-    iget-boolean v0, p0, Lokhttp3/internal/b/c;->bua:Z
+    iget-boolean v0, p0, Lokhttp3/internal/b/c;->btV:Z
 
     if-eqz v0, :cond_0
 
     goto :goto_0
 
     :cond_0
-    sget-object v0, Lokhttp3/internal/a;->bsV:Lokhttp3/internal/a;
+    sget-object v0, Lokhttp3/internal/a;->bsQ:Lokhttp3/internal/a;
 
-    iget-object v1, p0, Lokhttp3/internal/b/c;->btV:Lokhttp3/y;
+    iget-object v1, p0, Lokhttp3/internal/b/c;->btQ:Lokhttp3/y;
 
-    iget-object v1, v1, Lokhttp3/y;->bsN:Lokhttp3/a;
+    iget-object v1, v1, Lokhttp3/y;->bsI: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;->bnk:Lokhttp3/s;
+    iget-object v0, p1, Lokhttp3/a;->bnf:Lokhttp3/s;
 
-    iget-object v0, v0, Lokhttp3/s;->brg:Ljava/lang/String;
+    iget-object v0, v0, Lokhttp3/s;->brb:Ljava/lang/String;
 
-    iget-object v1, p0, Lokhttp3/internal/b/c;->btV:Lokhttp3/y;
+    iget-object v1, p0, Lokhttp3/internal/b/c;->btQ:Lokhttp3/y;
 
-    iget-object v1, v1, Lokhttp3/y;->bsN:Lokhttp3/a;
+    iget-object v1, v1, Lokhttp3/y;->bsI:Lokhttp3/a;
 
-    iget-object v1, v1, Lokhttp3/a;->bnk:Lokhttp3/s;
+    iget-object v1, v1, Lokhttp3/a;->bnf:Lokhttp3/s;
 
-    iget-object v1, v1, Lokhttp3/s;->brg:Ljava/lang/String;
+    iget-object v1, v1, Lokhttp3/s;->brb: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;->btY:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/b/c;->btT:Lokhttp3/internal/e/g;
 
     if-nez v0, :cond_3
 
@@ -1509,7 +1509,7 @@
     return v2
 
     :cond_4
-    iget-object v0, p2, Lokhttp3/y;->bnr:Ljava/net/Proxy;
+    iget-object v0, p2, Lokhttp3/y;->bnm: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;->btV:Lokhttp3/y;
+    iget-object v0, p0, Lokhttp3/internal/b/c;->btQ:Lokhttp3/y;
 
-    iget-object v0, v0, Lokhttp3/y;->bnr:Ljava/net/Proxy;
+    iget-object v0, v0, Lokhttp3/y;->bnm: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;->btV:Lokhttp3/y;
+    iget-object v0, p0, Lokhttp3/internal/b/c;->btQ:Lokhttp3/y;
 
-    iget-object v0, v0, Lokhttp3/y;->bsO:Ljava/net/InetSocketAddress;
+    iget-object v0, v0, Lokhttp3/y;->bsJ:Ljava/net/InetSocketAddress;
 
-    iget-object v3, p2, Lokhttp3/y;->bsO:Ljava/net/InetSocketAddress;
+    iget-object v3, p2, Lokhttp3/y;->bsJ: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;->bsN:Lokhttp3/a;
+    iget-object p2, p2, Lokhttp3/y;->bsI:Lokhttp3/a;
 
-    iget-object p2, p2, Lokhttp3/a;->bns:Ljavax/net/ssl/HostnameVerifier;
+    iget-object p2, p2, Lokhttp3/a;->bnn:Ljavax/net/ssl/HostnameVerifier;
 
-    sget-object v0, Lokhttp3/internal/i/d;->bxD:Lokhttp3/internal/i/d;
+    sget-object v0, Lokhttp3/internal/i/d;->bxy:Lokhttp3/internal/i/d;
 
     if-eq p2, v0, :cond_8
 
     return v2
 
     :cond_8
-    iget-object p2, p1, Lokhttp3/a;->bnk:Lokhttp3/s;
+    iget-object p2, p1, Lokhttp3/a;->bnf: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;->bnt:Lokhttp3/g;
+    iget-object p2, p1, Lokhttp3/a;->bno:Lokhttp3/g;
 
-    iget-object p1, p1, Lokhttp3/a;->bnk:Lokhttp3/s;
+    iget-object p1, p1, Lokhttp3/a;->bnf:Lokhttp3/s;
 
-    iget-object p1, p1, Lokhttp3/s;->brg:Ljava/lang/String;
+    iget-object p1, p1, Lokhttp3/s;->brb:Ljava/lang/String;
 
-    iget-object v0, p0, Lokhttp3/internal/b/c;->bsC:Lokhttp3/r;
+    iget-object v0, p0, Lokhttp3/internal/b/c;->bsx:Lokhttp3/r;
 
-    iget-object v0, v0, Lokhttp3/r;->bra:Ljava/util/List;
+    iget-object v0, v0, Lokhttp3/r;->bqV: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;->btV:Lokhttp3/y;
+    iget-object v1, p0, Lokhttp3/internal/b/c;->btQ:Lokhttp3/y;
 
-    iget-object v1, v1, Lokhttp3/y;->bsN:Lokhttp3/a;
+    iget-object v1, v1, Lokhttp3/y;->bsI:Lokhttp3/a;
 
-    iget-object v1, v1, Lokhttp3/a;->bnk:Lokhttp3/s;
+    iget-object v1, v1, Lokhttp3/a;->bnf:Lokhttp3/s;
 
     iget v1, v1, Lokhttp3/s;->port:I
 
@@ -1617,15 +1617,15 @@
     return v2
 
     :cond_0
-    iget-object v0, p1, Lokhttp3/s;->brg:Ljava/lang/String;
+    iget-object v0, p1, Lokhttp3/s;->brb:Ljava/lang/String;
 
-    iget-object v1, p0, Lokhttp3/internal/b/c;->btV:Lokhttp3/y;
+    iget-object v1, p0, Lokhttp3/internal/b/c;->btQ:Lokhttp3/y;
 
-    iget-object v1, v1, Lokhttp3/y;->bsN:Lokhttp3/a;
+    iget-object v1, v1, Lokhttp3/y;->bsI:Lokhttp3/a;
 
-    iget-object v1, v1, Lokhttp3/a;->bnk:Lokhttp3/s;
+    iget-object v1, v1, Lokhttp3/a;->bnf:Lokhttp3/s;
 
-    iget-object v1, v1, Lokhttp3/s;->brg:Ljava/lang/String;
+    iget-object v1, v1, Lokhttp3/s;->brb: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;->bsC:Lokhttp3/r;
+    iget-object v0, p0, Lokhttp3/internal/b/c;->bsx:Lokhttp3/r;
 
     if-eqz v0, :cond_1
 
-    sget-object v0, Lokhttp3/internal/i/d;->bxD:Lokhttp3/internal/i/d;
+    sget-object v0, Lokhttp3/internal/i/d;->bxy:Lokhttp3/internal/i/d;
 
-    iget-object p1, p1, Lokhttp3/s;->brg:Ljava/lang/String;
+    iget-object p1, p1, Lokhttp3/s;->brb:Ljava/lang/String;
 
-    iget-object v3, p0, Lokhttp3/internal/b/c;->bsC:Lokhttp3/r;
+    iget-object v3, p0, Lokhttp3/internal/b/c;->bsx:Lokhttp3/r;
 
-    iget-object v3, v3, Lokhttp3/r;->bra:Ljava/util/List;
+    iget-object v3, v3, Lokhttp3/r;->bqV: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;->btV:Lokhttp3/y;
+    iget-object v1, p0, Lokhttp3/internal/b/c;->btQ:Lokhttp3/y;
 
-    iget-object v1, v1, Lokhttp3/y;->bsN:Lokhttp3/a;
+    iget-object v1, v1, Lokhttp3/y;->bsI:Lokhttp3/a;
 
-    iget-object v1, v1, Lokhttp3/a;->bnk:Lokhttp3/s;
+    iget-object v1, v1, Lokhttp3/a;->bnf:Lokhttp3/s;
 
-    iget-object v1, v1, Lokhttp3/s;->brg:Ljava/lang/String;
+    iget-object v1, v1, Lokhttp3/s;->brb: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;->btV:Lokhttp3/y;
+    iget-object v1, p0, Lokhttp3/internal/b/c;->btQ:Lokhttp3/y;
 
-    iget-object v1, v1, Lokhttp3/y;->bsN:Lokhttp3/a;
+    iget-object v1, v1, Lokhttp3/y;->bsI:Lokhttp3/a;
 
-    iget-object v1, v1, Lokhttp3/a;->bnk:Lokhttp3/s;
+    iget-object v1, v1, Lokhttp3/a;->bnf: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;->btV:Lokhttp3/y;
+    iget-object v1, p0, Lokhttp3/internal/b/c;->btQ:Lokhttp3/y;
 
-    iget-object v1, v1, Lokhttp3/y;->bnr:Ljava/net/Proxy;
+    iget-object v1, v1, Lokhttp3/y;->bnm: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;->btV:Lokhttp3/y;
+    iget-object v1, p0, Lokhttp3/internal/b/c;->btQ:Lokhttp3/y;
 
-    iget-object v1, v1, Lokhttp3/y;->bsO:Ljava/net/InetSocketAddress;
+    iget-object v1, v1, Lokhttp3/y;->bsJ: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;->bsC:Lokhttp3/r;
+    iget-object v1, p0, Lokhttp3/internal/b/c;->bsx:Lokhttp3/r;
 
     if-eqz v1, :cond_0
 
-    iget-object v1, v1, Lokhttp3/r;->bqZ:Lokhttp3/h;
+    iget-object v1, v1, Lokhttp3/r;->bqU: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;->bsB:Lokhttp3/u;
+    iget-object v1, p0, Lokhttp3/internal/b/c;->bsw: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 d41d98262c..d84b7fa152 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 aTS:Ljava/util/Comparator;
+.field public static final aTO:Ljava/util/Comparator;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Comparator<",
@@ -16,39 +16,39 @@
     .end annotation
 .end field
 
-.field public static final biS:Ljava/nio/charset/Charset;
+.field public static final biN:Ljava/nio/charset/Charset;
 
-.field public static final bsW:[B
+.field public static final bsR:[B
 
-.field public static final bsX:Lokhttp3/x;
+.field public static final bsS:Lokhttp3/x;
 
-.field public static final bsY:Lokhttp3/RequestBody;
+.field public static final bsT:Lokhttp3/RequestBody;
 
-.field private static final bsZ:Lokio/ByteString;
+.field private static final bsU:Lokio/ByteString;
 
-.field private static final bta:Lokio/ByteString;
+.field private static final bsV:Lokio/ByteString;
 
-.field private static final btb:Lokio/ByteString;
+.field private static final bsW:Lokio/ByteString;
 
-.field private static final btc:Lokio/ByteString;
+.field private static final bsX:Lokio/ByteString;
 
-.field private static final btd:Lokio/ByteString;
+.field private static final bsY:Lokio/ByteString;
 
-.field private static final bte:Ljava/nio/charset/Charset;
+.field private static final bsZ:Ljava/nio/charset/Charset;
 
-.field private static final btf:Ljava/nio/charset/Charset;
+.field private static final bta:Ljava/nio/charset/Charset;
 
-.field private static final btg:Ljava/nio/charset/Charset;
+.field private static final btb:Ljava/nio/charset/Charset;
 
-.field private static final bth:Ljava/nio/charset/Charset;
+.field private static final btc:Ljava/nio/charset/Charset;
 
-.field public static final bti:Ljava/util/TimeZone;
+.field public static final btd:Ljava/util/TimeZone;
 
-.field private static final btj:Ljava/lang/reflect/Method;
+.field private static final bte:Ljava/lang/reflect/Method;
 
-.field private static final btk:Ljava/util/regex/Pattern;
+.field private static final btf:Ljava/util/regex/Pattern;
 
-.field public static final tw:Ljava/nio/charset/Charset;
+.field public static final tx:Ljava/nio/charset/Charset;
 
 
 # direct methods
@@ -59,21 +59,21 @@
 
     new-array v1, v0, [B
 
-    sput-object v1, Lokhttp3/internal/c;->bsW:[B
+    sput-object v1, Lokhttp3/internal/c;->bsR:[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;->bsW:[B
+    sget-object v1, Lokhttp3/internal/c;->bsR:[B
 
     invoke-static {v1}, Lokhttp3/x;->A([B)Lokhttp3/x;
 
     move-result-object v1
 
-    sput-object v1, Lokhttp3/internal/c;->bsX:Lokhttp3/x;
+    sput-object v1, Lokhttp3/internal/c;->bsS:Lokhttp3/x;
 
-    sget-object v1, Lokhttp3/internal/c;->bsW:[B
+    sget-object v1, Lokhttp3/internal/c;->bsR:[B
 
     const/4 v2, 0x0
 
@@ -81,7 +81,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lokhttp3/internal/c;->bsY:Lokhttp3/RequestBody;
+    sput-object v1, Lokhttp3/internal/c;->bsT:Lokhttp3/RequestBody;
 
     const-string v1, "efbbbf"
 
@@ -89,7 +89,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lokhttp3/internal/c;->bsZ:Lokio/ByteString;
+    sput-object v1, Lokhttp3/internal/c;->bsU:Lokio/ByteString;
 
     const-string v1, "feff"
 
@@ -97,7 +97,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lokhttp3/internal/c;->bta:Lokio/ByteString;
+    sput-object v1, Lokhttp3/internal/c;->bsV:Lokio/ByteString;
 
     const-string v1, "fffe"
 
@@ -105,7 +105,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lokhttp3/internal/c;->btb:Lokio/ByteString;
+    sput-object v1, Lokhttp3/internal/c;->bsW:Lokio/ByteString;
 
     const-string v1, "0000ffff"
 
@@ -113,7 +113,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lokhttp3/internal/c;->btc:Lokio/ByteString;
+    sput-object v1, Lokhttp3/internal/c;->bsX:Lokio/ByteString;
 
     const-string v1, "ffff0000"
 
@@ -121,7 +121,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lokhttp3/internal/c;->btd:Lokio/ByteString;
+    sput-object v1, Lokhttp3/internal/c;->bsY:Lokio/ByteString;
 
     const-string v1, "UTF-8"
 
@@ -129,7 +129,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lokhttp3/internal/c;->tw:Ljava/nio/charset/Charset;
+    sput-object v1, Lokhttp3/internal/c;->tx:Ljava/nio/charset/Charset;
 
     const-string v1, "ISO-8859-1"
 
@@ -137,7 +137,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lokhttp3/internal/c;->biS:Ljava/nio/charset/Charset;
+    sput-object v1, Lokhttp3/internal/c;->biN:Ljava/nio/charset/Charset;
 
     const-string v1, "UTF-16BE"
 
@@ -145,7 +145,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lokhttp3/internal/c;->bte:Ljava/nio/charset/Charset;
+    sput-object v1, Lokhttp3/internal/c;->bsZ:Ljava/nio/charset/Charset;
 
     const-string v1, "UTF-16LE"
 
@@ -153,7 +153,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lokhttp3/internal/c;->btf:Ljava/nio/charset/Charset;
+    sput-object v1, Lokhttp3/internal/c;->bta:Ljava/nio/charset/Charset;
 
     const-string v1, "UTF-32BE"
 
@@ -161,7 +161,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lokhttp3/internal/c;->btg:Ljava/nio/charset/Charset;
+    sput-object v1, Lokhttp3/internal/c;->btb:Ljava/nio/charset/Charset;
 
     const-string v1, "UTF-32LE"
 
@@ -169,7 +169,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lokhttp3/internal/c;->bth:Ljava/nio/charset/Charset;
+    sput-object v1, Lokhttp3/internal/c;->btc:Ljava/nio/charset/Charset;
 
     const-string v1, "GMT"
 
@@ -177,13 +177,13 @@
 
     move-result-object v1
 
-    sput-object v1, Lokhttp3/internal/c;->bti:Ljava/util/TimeZone;
+    sput-object v1, Lokhttp3/internal/c;->btd: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;->aTS:Ljava/util/Comparator;
+    sput-object v1, Lokhttp3/internal/c;->aTO: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;->btj:Ljava/lang/reflect/Method;
+    sput-object v2, Lokhttp3/internal/c;->bte: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;->btk:Ljava/util/regex/Pattern;
+    sput-object v0, Lokhttp3/internal/c;->btf:Ljava/util/regex/Pattern;
 
     return-void
 .end method
 
-.method public static FU()Ljavax/net/ssl/X509TrustManager;
+.method public static FS()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;->bsV:Lokhttp3/internal/a;
+    sget-object v2, Lokhttp3/internal/a;->bsQ:Lokhttp3/internal/a;
 
-    iget-object v3, v1, Lokhttp3/internal/e/c;->bvh:Lokio/ByteString;
+    iget-object v3, v1, Lokhttp3/internal/e/c;->bvc:Lokio/ByteString;
 
-    invoke-virtual {v3}, Lokio/ByteString;->Ht()Ljava/lang/String;
+    invoke-virtual {v3}, Lokio/ByteString;->Hr()Ljava/lang/String;
 
     move-result-object v3
 
-    iget-object v1, v1, Lokhttp3/internal/e/c;->bvi:Lokio/ByteString;
+    iget-object v1, v1, Lokhttp3/internal/e/c;->bvd:Lokio/ByteString;
 
-    invoke-virtual {v1}, Lokio/ByteString;->Ht()Ljava/lang/String;
+    invoke-virtual {v1}, Lokio/ByteString;->Hr()Ljava/lang/String;
 
     move-result-object v1
 
@@ -372,7 +372,7 @@
     goto :goto_0
 
     :cond_0
-    invoke-virtual {v0}, Lokhttp3/Headers$a;->Fm()Lokhttp3/Headers;
+    invoke-virtual {v0}, Lokhttp3/Headers$a;->Fk()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;->brg:Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/s;->brb: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;->brg:Ljava/lang/String;
+    iget-object v2, p0, Lokhttp3/s;->brb: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;->brg:Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/s;->brb:Ljava/lang/String;
 
     :goto_0
     if-nez p1, :cond_2
 
     iget p1, p0, Lokhttp3/s;->port:I
 
-    iget-object v2, p0, Lokhttp3/s;->brf:Ljava/lang/String;
+    iget-object v2, p0, Lokhttp3/s;->bra: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;->bsZ:Lokio/ByteString;
+    sget-object v0, Lokhttp3/internal/c;->bsU: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;->bsZ:Lokio/ByteString;
+    sget-object p1, Lokhttp3/internal/c;->bsU: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;->tw:Ljava/nio/charset/Charset;
+    sget-object p0, Lokhttp3/internal/c;->tx:Ljava/nio/charset/Charset;
 
     return-object p0
 
     :cond_0
-    sget-object v0, Lokhttp3/internal/c;->bta:Lokio/ByteString;
+    sget-object v0, Lokhttp3/internal/c;->bsV: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;->bta:Lokio/ByteString;
+    sget-object p1, Lokhttp3/internal/c;->bsV: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;->bte:Ljava/nio/charset/Charset;
+    sget-object p0, Lokhttp3/internal/c;->bsZ:Ljava/nio/charset/Charset;
 
     return-object p0
 
     :cond_1
-    sget-object v0, Lokhttp3/internal/c;->btb:Lokio/ByteString;
+    sget-object v0, Lokhttp3/internal/c;->bsW: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;->btb:Lokio/ByteString;
+    sget-object p1, Lokhttp3/internal/c;->bsW: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;->btf:Ljava/nio/charset/Charset;
+    sget-object p0, Lokhttp3/internal/c;->bta:Ljava/nio/charset/Charset;
 
     return-object p0
 
     :cond_2
-    sget-object v0, Lokhttp3/internal/c;->btc:Lokio/ByteString;
+    sget-object v0, Lokhttp3/internal/c;->bsX: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;->btc:Lokio/ByteString;
+    sget-object p1, Lokhttp3/internal/c;->bsX: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;->btg:Ljava/nio/charset/Charset;
+    sget-object p0, Lokhttp3/internal/c;->btb:Ljava/nio/charset/Charset;
 
     return-object p0
 
     :cond_3
-    sget-object v0, Lokhttp3/internal/c;->btd:Lokio/ByteString;
+    sget-object v0, Lokhttp3/internal/c;->bsY: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;->btd:Lokio/ByteString;
+    sget-object p1, Lokhttp3/internal/c;->bsY: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;->bth:Ljava/nio/charset/Charset;
+    sget-object p0, Lokhttp3/internal/c;->btc:Ljava/nio/charset/Charset;
 
     return-object p0
 
@@ -970,7 +970,7 @@
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lokio/s;->HD()Z
+    invoke-virtual {v2}, Lokio/s;->HB()Z
 
     move-result v2
 
@@ -982,7 +982,7 @@
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lokio/s;->HE()J
+    invoke-virtual {v2}, Lokio/s;->HC()J
 
     move-result-wide v5
 
@@ -1046,7 +1046,7 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lokio/s;->HG()Lokio/s;
+    invoke-virtual {p0}, Lokio/s;->HE()Lokio/s;
 
     goto :goto_2
 
@@ -1075,7 +1075,7 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lokio/s;->HG()Lokio/s;
+    invoke-virtual {p0}, Lokio/s;->HE()Lokio/s;
 
     goto :goto_3
 
@@ -1102,7 +1102,7 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lokio/s;->HG()Lokio/s;
+    invoke-virtual {p0}, Lokio/s;->HE()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;->btj:Ljava/lang/reflect/Method;
+    sget-object v0, Lokhttp3/internal/c;->bte:Ljava/lang/reflect/Method;
 
     if-eqz v0, :cond_0
 
@@ -1570,7 +1570,7 @@
     goto :goto_3
 
     :cond_8
-    invoke-virtual {p0}, Lokio/c;->Ho()Ljava/lang/String;
+    invoke-virtual {p0}, Lokio/c;->Hm()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;->btk:Ljava/util/regex/Pattern;
+    sget-object v0, Lokhttp3/internal/c;->btf: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 bdf3741ec7..8579d54e90 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 buG:Ljava/lang/String;
+.field private final buB:Ljava/lang/String;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
 .field private final contentLength:J
 
-.field private final lY:Lokio/d;
+.field private final lZ:Lokio/d;
 
 
 # direct methods
@@ -24,21 +24,21 @@
 
     invoke-direct {p0}, Lokhttp3/x;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/internal/c/h;->buG:Ljava/lang/String;
+    iput-object p1, p0, Lokhttp3/internal/c/h;->buB:Ljava/lang/String;
 
     iput-wide p2, p0, Lokhttp3/internal/c/h;->contentLength:J
 
-    iput-object p4, p0, Lokhttp3/internal/c/h;->lY:Lokio/d;
+    iput-object p4, p0, Lokhttp3/internal/c/h;->lZ:Lokio/d;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final FQ()Lokio/d;
+.method public final FO()Lokio/d;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/internal/c/h;->lY:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/c/h;->lZ: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;->buG:Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/internal/c/h;->buB: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 f14027ac73..0da7672db7 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 bwi:Lokhttp3/internal/e/g$b;
+.field public static final bwd: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;->bwi:Lokhttp3/internal/e/g$b;
+    sput-object v0, Lokhttp3/internal/e/g$b;->bwd: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 3931d2be17..8ee73fbf83 100644
--- a/com.discord/smali/okhttp3/internal/e/i.smali
+++ b/com.discord/smali/okhttp3/internal/e/i.smali
@@ -18,17 +18,13 @@
 
 
 # instance fields
-.field final bvE:Lokhttp3/internal/e/g;
+.field bvN:J
 
-.field bvS:J
+.field bvO:J
 
-.field bvT:J
+.field final bvz:Lokhttp3/internal/e/g;
 
-.field final bwA:Lokhttp3/internal/e/i$c;
-
-.field final bwB:Lokhttp3/internal/e/i$c;
-
-.field final bwv:Ljava/util/Deque;
+.field final bwq:Ljava/util/Deque;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Deque<",
@@ -38,13 +34,17 @@
     .end annotation
 .end field
 
-.field private bww:Lokhttp3/internal/e/c$a;
+.field private bwr:Lokhttp3/internal/e/c$a;
 
-.field bwx:Z
+.field bws:Z
 
-.field final bwy:Lokhttp3/internal/e/i$b;
+.field final bwt:Lokhttp3/internal/e/i$b;
 
-.field final bwz:Lokhttp3/internal/e/i$a;
+.field final bwu:Lokhttp3/internal/e/i$a;
+
+.field final bwv:Lokhttp3/internal/e/i$c;
+
+.field final bww:Lokhttp3/internal/e/i$c;
 
 .field errorCode:Lokhttp3/internal/e/b;
 
@@ -69,25 +69,25 @@
 
     const-wide/16 v0, 0x0
 
-    iput-wide v0, p0, Lokhttp3/internal/e/i;->bvS:J
+    iput-wide v0, p0, Lokhttp3/internal/e/i;->bvN:J
 
     new-instance v0, Ljava/util/ArrayDeque;
 
     invoke-direct {v0}, Ljava/util/ArrayDeque;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/internal/e/i;->bwv:Ljava/util/Deque;
+    iput-object v0, p0, Lokhttp3/internal/e/i;->bwq: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;->bwA:Lokhttp3/internal/e/i$c;
+    iput-object v0, p0, Lokhttp3/internal/e/i;->bwv: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;->bwB:Lokhttp3/internal/e/i$c;
+    iput-object v0, p0, Lokhttp3/internal/e/i;->bww: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;->bvE:Lokhttp3/internal/e/g;
+    iput-object p2, p0, Lokhttp3/internal/e/i;->bvz:Lokhttp3/internal/e/g;
 
-    iget-object p1, p2, Lokhttp3/internal/e/g;->bvV:Lokhttp3/internal/e/m;
+    iget-object p1, p2, Lokhttp3/internal/e/g;->bvQ:Lokhttp3/internal/e/m;
 
-    invoke-virtual {p1}, Lokhttp3/internal/e/m;->GL()I
+    invoke-virtual {p1}, Lokhttp3/internal/e/m;->GJ()I
 
     move-result p1
 
     int-to-long v0, p1
 
-    iput-wide v0, p0, Lokhttp3/internal/e/i;->bvT:J
+    iput-wide v0, p0, Lokhttp3/internal/e/i;->bvO:J
 
     new-instance p1, Lokhttp3/internal/e/i$b;
 
-    iget-object p2, p2, Lokhttp3/internal/e/g;->bvU:Lokhttp3/internal/e/m;
+    iget-object p2, p2, Lokhttp3/internal/e/g;->bvP:Lokhttp3/internal/e/m;
 
-    invoke-virtual {p2}, Lokhttp3/internal/e/m;->GL()I
+    invoke-virtual {p2}, Lokhttp3/internal/e/m;->GJ()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;->bwy:Lokhttp3/internal/e/i$b;
+    iput-object p1, p0, Lokhttp3/internal/e/i;->bwt: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;->bwz:Lokhttp3/internal/e/i$a;
+    iput-object p1, p0, Lokhttp3/internal/e/i;->bwu:Lokhttp3/internal/e/i$a;
 
-    iget-object p1, p0, Lokhttp3/internal/e/i;->bwy:Lokhttp3/internal/e/i$b;
+    iget-object p1, p0, Lokhttp3/internal/e/i;->bwt:Lokhttp3/internal/e/i$b;
 
-    iput-boolean p4, p1, Lokhttp3/internal/e/i$b;->bwD:Z
+    iput-boolean p4, p1, Lokhttp3/internal/e/i$b;->bwy:Z
 
-    iget-object p1, p0, Lokhttp3/internal/e/i;->bwz:Lokhttp3/internal/e/i$a;
+    iget-object p1, p0, Lokhttp3/internal/e/i;->bwu:Lokhttp3/internal/e/i$a;
 
-    iput-boolean p3, p1, Lokhttp3/internal/e/i$a;->bwD:Z
+    iput-boolean p3, p1, Lokhttp3/internal/e/i$a;->bwy:Z
 
     if-eqz p5, :cond_0
 
-    iget-object p1, p0, Lokhttp3/internal/e/i;->bwv:Ljava/util/Deque;
+    iget-object p1, p0, Lokhttp3/internal/e/i;->bwq:Ljava/util/Deque;
 
     invoke-interface {p1, p5}, Ljava/util/Deque;->add(Ljava/lang/Object;)Z
 
     :cond_0
-    invoke-virtual {p0}, Lokhttp3/internal/e/i;->Gz()Z
+    invoke-virtual {p0}, Lokhttp3/internal/e/i;->Gx()Z
 
     move-result p1
 
@@ -165,7 +165,7 @@
 
     :cond_2
     :goto_0
-    invoke-virtual {p0}, Lokhttp3/internal/e/i;->Gz()Z
+    invoke-virtual {p0}, Lokhttp3/internal/e/i;->Gx()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;->bwv:Ljava/util/Deque;
+    iget-object p0, p0, Lokhttp3/internal/e/i;->bwq: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;->bww:Lokhttp3/internal/e/c$a;
+    iget-object p0, p0, Lokhttp3/internal/e/i;->bwr: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;->bwy:Lokhttp3/internal/e/i$b;
+    iget-object v0, p0, Lokhttp3/internal/e/i;->bwt:Lokhttp3/internal/e/i$b;
 
-    iget-boolean v0, v0, Lokhttp3/internal/e/i$b;->bwD:Z
+    iget-boolean v0, v0, Lokhttp3/internal/e/i$b;->bwy:Z
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lokhttp3/internal/e/i;->bwz:Lokhttp3/internal/e/i$a;
+    iget-object v0, p0, Lokhttp3/internal/e/i;->bwu:Lokhttp3/internal/e/i$a;
 
-    iget-boolean v0, v0, Lokhttp3/internal/e/i$a;->bwD:Z
+    iget-boolean v0, v0, Lokhttp3/internal/e/i$a;->bwy: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;->bvE:Lokhttp3/internal/e/g;
+    iget-object p1, p0, Lokhttp3/internal/e/i;->bvz:Lokhttp3/internal/e/g;
 
     iget v0, p0, Lokhttp3/internal/e/i;->id:I
 
@@ -279,165 +279,17 @@
 
 
 # virtual methods
-.method public final declared-synchronized GA()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;->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
-
-    :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;->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;
+.method final GA()V
     .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;
+    iget-object v0, p0, Lokhttp3/internal/e/i;->bwt:Lokhttp3/internal/e/i$b;
 
     const/4 v1, 0x1
 
-    iput-boolean v1, v0, Lokhttp3/internal/e/i$b;->bwD:Z
+    iput-boolean v1, v0, Lokhttp3/internal/e/i$b;->bwy:Z
 
     invoke-virtual {p0}, Lokhttp3/internal/e/i;->isOpen()Z
 
@@ -451,7 +303,7 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/internal/e/i;->bvE:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/i;->bvz:Lokhttp3/internal/e/g;
 
     iget v1, p0, Lokhttp3/internal/e/i;->id:I
 
@@ -471,7 +323,7 @@
     throw v0
 .end method
 
-.method final GD()V
+.method final GB()V
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -482,25 +334,25 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lokhttp3/internal/e/i;->bwy:Lokhttp3/internal/e/i$b;
+    iget-object v0, p0, Lokhttp3/internal/e/i;->bwt:Lokhttp3/internal/e/i$b;
 
-    iget-boolean v0, v0, Lokhttp3/internal/e/i$b;->bwD:Z
+    iget-boolean v0, v0, Lokhttp3/internal/e/i$b;->bwy:Z
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lokhttp3/internal/e/i;->bwy:Lokhttp3/internal/e/i$b;
+    iget-object v0, p0, Lokhttp3/internal/e/i;->bwt: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;->bwz:Lokhttp3/internal/e/i$a;
+    iget-object v0, p0, Lokhttp3/internal/e/i;->bwu:Lokhttp3/internal/e/i$a;
 
-    iget-boolean v0, v0, Lokhttp3/internal/e/i$a;->bwD:Z
+    iget-boolean v0, v0, Lokhttp3/internal/e/i$a;->bwy:Z
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/internal/e/i;->bwz:Lokhttp3/internal/e/i$a;
+    iget-object v0, p0, Lokhttp3/internal/e/i;->bwu:Lokhttp3/internal/e/i$a;
 
     iget-boolean v0, v0, Lokhttp3/internal/e/i$a;->w:Z
 
@@ -525,7 +377,7 @@
 
     if-eqz v0, :cond_2
 
-    sget-object v0, Lokhttp3/internal/e/b;->buU:Lokhttp3/internal/e/b;
+    sget-object v0, Lokhttp3/internal/e/b;->buP:Lokhttp3/internal/e/b;
 
     invoke-virtual {p0, v0}, Lokhttp3/internal/e/i;->b(Lokhttp3/internal/e/b;)V
 
@@ -534,7 +386,7 @@
     :cond_2
     if-nez v1, :cond_3
 
-    iget-object v0, p0, Lokhttp3/internal/e/i;->bvE:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/i;->bvz:Lokhttp3/internal/e/g;
 
     iget v1, p0, Lokhttp3/internal/e/i;->id:I
 
@@ -554,7 +406,7 @@
     throw v0
 .end method
 
-.method final GE()V
+.method final GC()V
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -562,15 +414,15 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/e/i;->bwz:Lokhttp3/internal/e/i$a;
+    iget-object v0, p0, Lokhttp3/internal/e/i;->bwu: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;->bwz:Lokhttp3/internal/e/i$a;
+    iget-object v0, p0, Lokhttp3/internal/e/i;->bwu:Lokhttp3/internal/e/i$a;
 
-    iget-boolean v0, v0, Lokhttp3/internal/e/i$a;->bwD:Z
+    iget-boolean v0, v0, Lokhttp3/internal/e/i$a;->bwy:Z
 
     if-nez v0, :cond_1
 
@@ -606,7 +458,7 @@
     throw v0
 .end method
 
-.method final GF()V
+.method final GD()V
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -635,7 +487,7 @@
     throw v0
 .end method
 
-.method public final Gz()Z
+.method public final Gx()Z
     .locals 4
 
     iget v0, p0, Lokhttp3/internal/e/i;->id:I
@@ -656,9 +508,9 @@
     const/4 v0, 0x0
 
     :goto_0
-    iget-object v3, p0, Lokhttp3/internal/e/i;->bvE:Lokhttp3/internal/e/g;
+    iget-object v3, p0, Lokhttp3/internal/e/i;->bvz:Lokhttp3/internal/e/g;
 
-    iget-boolean v3, v3, Lokhttp3/internal/e/g;->bvJ:Z
+    iget-boolean v3, v3, Lokhttp3/internal/e/g;->bvE:Z
 
     if-ne v3, v0, :cond_1
 
@@ -668,14 +520,162 @@
     return v2
 .end method
 
+.method public final declared-synchronized Gy()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;->bwv: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;->bwq: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;->GD()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;->bwv:Lokhttp3/internal/e/i$c;
+
+    invoke-virtual {v0}, Lokhttp3/internal/e/i$c;->GE()V
+
+    iget-object v0, p0, Lokhttp3/internal/e/i;->bwq: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;->bwq: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;->bwv:Lokhttp3/internal/e/i$c;
+
+    invoke-virtual {v1}, Lokhttp3/internal/e/i$c;->GE()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 Gz()Lokio/q;
+    .locals 2
+
+    monitor-enter p0
+
+    :try_start_0
+    iget-boolean v0, p0, Lokhttp3/internal/e/i;->bws:Z
+
+    if-nez v0, :cond_1
+
+    invoke-virtual {p0}, Lokhttp3/internal/e/i;->Gx()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;->bwu: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 at(J)V
     .locals 3
 
-    iget-wide v0, p0, Lokhttp3/internal/e/i;->bvT:J
+    iget-wide v0, p0, Lokhttp3/internal/e/i;->bvO:J
 
     add-long/2addr v0, p1
 
-    iput-wide v0, p0, Lokhttp3/internal/e/i;->bvT:J
+    iput-wide v0, p0, Lokhttp3/internal/e/i;->bvO:J
 
     const-wide/16 v0, 0x0
 
@@ -706,7 +706,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/internal/e/i;->bvE:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/i;->bvz: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;->bvE:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/i;->bvz: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;->bwy:Lokhttp3/internal/e/i$b;
+    iget-object v0, p0, Lokhttp3/internal/e/i;->bwt:Lokhttp3/internal/e/i$b;
 
-    iget-boolean v0, v0, Lokhttp3/internal/e/i$b;->bwD:Z
+    iget-boolean v0, v0, Lokhttp3/internal/e/i$b;->bwy:Z
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lokhttp3/internal/e/i;->bwy:Lokhttp3/internal/e/i$b;
+    iget-object v0, p0, Lokhttp3/internal/e/i;->bwt: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;->bwz:Lokhttp3/internal/e/i$a;
+    iget-object v0, p0, Lokhttp3/internal/e/i;->bwu:Lokhttp3/internal/e/i$a;
 
-    iget-boolean v0, v0, Lokhttp3/internal/e/i$a;->bwD:Z
+    iget-boolean v0, v0, Lokhttp3/internal/e/i$a;->bwy:Z
 
     if-nez v0, :cond_2
 
-    iget-object v0, p0, Lokhttp3/internal/e/i;->bwz:Lokhttp3/internal/e/i$a;
+    iget-object v0, p0, Lokhttp3/internal/e/i;->bwu: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;->bwx:Z
+    iget-boolean v0, p0, Lokhttp3/internal/e/i;->bws: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 e6226b8bec..827c19c80a 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 bwW:Ljava/lang/Class;
+.field private final bwR:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -23,7 +23,7 @@
     .end annotation
 .end field
 
-.field private final bwX:Lokhttp3/internal/g/e;
+.field private final bwS: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 bwY:Lokhttp3/internal/g/e;
+.field private final bwT: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 bwZ:Lokhttp3/internal/g/e;
+.field private final bwU: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 bxa:Lokhttp3/internal/g/e;
+.field private final bwV: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 bxb:Lokhttp3/internal/g/a$c;
+.field private final bwW: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;->GP()Lokhttp3/internal/g/a$c;
+    invoke-static {}, Lokhttp3/internal/g/a$c;->GN()Lokhttp3/internal/g/a$c;
 
     move-result-object v0
 
-    iput-object v0, p0, Lokhttp3/internal/g/a;->bxb:Lokhttp3/internal/g/a$c;
+    iput-object v0, p0, Lokhttp3/internal/g/a;->bwW:Lokhttp3/internal/g/a$c;
 
-    iput-object p1, p0, Lokhttp3/internal/g/a;->bwW:Ljava/lang/Class;
+    iput-object p1, p0, Lokhttp3/internal/g/a;->bwR:Ljava/lang/Class;
 
-    iput-object p2, p0, Lokhttp3/internal/g/a;->bwX:Lokhttp3/internal/g/e;
+    iput-object p2, p0, Lokhttp3/internal/g/a;->bwS:Lokhttp3/internal/g/e;
 
-    iput-object p3, p0, Lokhttp3/internal/g/a;->bwY:Lokhttp3/internal/g/e;
+    iput-object p3, p0, Lokhttp3/internal/g/a;->bwT:Lokhttp3/internal/g/e;
 
-    iput-object p4, p0, Lokhttp3/internal/g/a;->bwZ:Lokhttp3/internal/g/e;
+    iput-object p4, p0, Lokhttp3/internal/g/a;->bwU:Lokhttp3/internal/g/e;
 
-    iput-object p5, p0, Lokhttp3/internal/g/a;->bxa:Lokhttp3/internal/g/e;
+    iput-object p5, p0, Lokhttp3/internal/g/a;->bwV:Lokhttp3/internal/g/e;
 
     return-void
 .end method
 
-.method private static GM()Z
+.method private static GK()Z
     .locals 2
 
     const-string v0, "GMSCore_OpenSSL"
@@ -141,7 +141,7 @@
     return v0
 .end method
 
-.method public static GN()Lokhttp3/internal/g/f;
+.method public static GL()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;->GM()Z
+    invoke-static {}, Lokhttp3/internal/g/a;->GK()Z
 
     move-result v2
 
@@ -371,7 +371,7 @@
 
 
 # virtual methods
-.method public final GO()Ljavax/net/ssl/SSLContext;
+.method public final GM()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;->bwX:Lokhttp3/internal/g/e;
+    iget-object v2, p0, Lokhttp3/internal/g/a;->bwS: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;->bwY:Lokhttp3/internal/g/e;
+    iget-object v2, p0, Lokhttp3/internal/g/a;->bwT: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;->bxa:Lokhttp3/internal/g/e;
+    iget-object p2, p0, Lokhttp3/internal/g/a;->bwV:Lokhttp3/internal/g/e;
 
     if-eqz p2, :cond_3
 
@@ -670,7 +670,7 @@
 
     check-cast v4, Lokhttp3/u;
 
-    sget-object v5, Lokhttp3/u;->bsa:Lokhttp3/u;
+    sget-object v5, Lokhttp3/u;->brV: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;->bxa:Lokhttp3/internal/g/e;
+    iget-object p3, p0, Lokhttp3/internal/g/a;->bwV: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;->bwW:Ljava/lang/Class;
+    iget-object v0, p0, Lokhttp3/internal/g/a;->bwR: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;->bwZ:Lokhttp3/internal/g/e;
+    iget-object v0, p0, Lokhttp3/internal/g/a;->bwU: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;->bwZ:Lokhttp3/internal/g/e;
+    iget-object v0, p0, Lokhttp3/internal/g/a;->bwU:Lokhttp3/internal/g/e;
 
     const/4 v2, 0x0
 
@@ -940,7 +940,7 @@
 
     new-instance v0, Ljava/lang/String;
 
-    sget-object v1, Lokhttp3/internal/c;->tw:Ljava/nio/charset/Charset;
+    sget-object v1, Lokhttp3/internal/c;->tx: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;->bxb:Lokhttp3/internal/g/a$c;
+    iget-object v0, p0, Lokhttp3/internal/g/a;->bwW: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;->bxb:Lokhttp3/internal/g/a$c;
+    iget-object v0, p0, Lokhttp3/internal/g/a;->bwW: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 47bbaec26b..960c827ec2 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 GQ()Ljava/security/Provider;
+.method private static GO()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 GR()Lokhttp3/internal/g/b;
+.method public static GP()Lokhttp3/internal/g/b;
     .locals 2
 
     const/4 v0, 0x0
@@ -63,13 +63,13 @@
 
 
 # virtual methods
-.method public final GO()Ljavax/net/ssl/SSLContext;
+.method public final GM()Ljavax/net/ssl/SSLContext;
     .locals 3
 
     :try_start_0
     const-string v0, "TLSv1.3"
 
-    invoke-static {}, Lokhttp3/internal/g/b;->GQ()Ljava/security/Provider;
+    invoke-static {}, Lokhttp3/internal/g/b;->GO()Ljava/security/Provider;
 
     move-result-object v1
 
@@ -87,7 +87,7 @@
     :try_start_1
     const-string v1, "TLS"
 
-    invoke-static {}, Lokhttp3/internal/g/b;->GQ()Ljava/security/Provider;
+    invoke-static {}, Lokhttp3/internal/g/b;->GO()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 8aa3841c05..b3dc5c127d 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 bxi:Ljava/lang/reflect/Method;
+.field final bxd:Ljava/lang/reflect/Method;
 
-.field final bxj:Ljava/lang/reflect/Method;
+.field final bxe: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;->bxi:Ljava/lang/reflect/Method;
+    iput-object p1, p0, Lokhttp3/internal/g/c;->bxd:Ljava/lang/reflect/Method;
 
-    iput-object p2, p0, Lokhttp3/internal/g/c;->bxj:Ljava/lang/reflect/Method;
+    iput-object p2, p0, Lokhttp3/internal/g/c;->bxe:Ljava/lang/reflect/Method;
 
     return-void
 .end method
 
-.method public static GS()Lokhttp3/internal/g/c;
+.method public static GQ()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;->bxi:Ljava/lang/reflect/Method;
+    iget-object v0, p0, Lokhttp3/internal/g/c;->bxd: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;->bxj:Ljava/lang/reflect/Method;
+    iget-object v0, p0, Lokhttp3/internal/g/c;->bxe: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 2bd61b275f..917f3f8fb9 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 bxk:Ljava/lang/reflect/Method;
+.field private final bxf:Ljava/lang/reflect/Method;
 
-.field private final bxl:Ljava/lang/reflect/Method;
+.field private final bxg:Ljava/lang/reflect/Method;
 
-.field private final bxm:Ljava/lang/Class;
+.field private final bxh:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -25,7 +25,7 @@
     .end annotation
 .end field
 
-.field private final bxn:Ljava/lang/Class;
+.field private final bxi: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;->bxk:Ljava/lang/reflect/Method;
+    iput-object p1, p0, Lokhttp3/internal/g/d;->bxf: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;->bxl:Ljava/lang/reflect/Method;
+    iput-object p3, p0, Lokhttp3/internal/g/d;->bxg:Ljava/lang/reflect/Method;
 
-    iput-object p4, p0, Lokhttp3/internal/g/d;->bxm:Ljava/lang/Class;
+    iput-object p4, p0, Lokhttp3/internal/g/d;->bxh:Ljava/lang/Class;
 
-    iput-object p5, p0, Lokhttp3/internal/g/d;->bxn:Ljava/lang/Class;
+    iput-object p5, p0, Lokhttp3/internal/g/d;->bxi:Ljava/lang/Class;
 
     return-void
 .end method
 
-.method public static GN()Lokhttp3/internal/g/f;
+.method public static GL()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;->bxm:Ljava/lang/Class;
+    iget-object v2, p0, Lokhttp3/internal/g/d;->bxh:Ljava/lang/Class;
 
     const/4 v3, 0x0
 
     aput-object v2, v1, v3
 
-    iget-object v2, p0, Lokhttp3/internal/g/d;->bxn:Ljava/lang/Class;
+    iget-object v2, p0, Lokhttp3/internal/g/d;->bxi:Ljava/lang/Class;
 
     const/4 v4, 0x1
 
@@ -245,7 +245,7 @@
 
     move-result-object p2
 
-    iget-object p3, p0, Lokhttp3/internal/g/d;->bxk:Ljava/lang/reflect/Method;
+    iget-object p3, p0, Lokhttp3/internal/g/d;->bxf: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;->bxo:Z
+    iget-boolean v1, v0, Lokhttp3/internal/g/d$a;->bxj:Z
 
     if-nez v1, :cond_0
 
-    iget-object v1, v0, Lokhttp3/internal/g/d$a;->bxp:Ljava/lang/String;
+    iget-object v1, v0, Lokhttp3/internal/g/d$a;->bxk:Ljava/lang/String;
 
     if-nez v1, :cond_0
 
-    invoke-static {}, Lokhttp3/internal/g/f;->GT()Lokhttp3/internal/g/f;
+    invoke-static {}, Lokhttp3/internal/g/f;->GR()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;->bxo:Z
+    iget-boolean v1, v0, Lokhttp3/internal/g/d$a;->bxj:Z
 
     if-eqz v1, :cond_1
 
     return-object p1
 
     :cond_1
-    iget-object p1, v0, Lokhttp3/internal/g/d$a;->bxp:Ljava/lang/String;
+    iget-object p1, v0, Lokhttp3/internal/g/d$a;->bxk: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;->bxl:Ljava/lang/reflect/Method;
+    iget-object v0, p0, Lokhttp3/internal/g/d;->bxg: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 2f4df872e0..71f215cb6e 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 HZ:Ljava/util/logging/Logger;
+.field private static final HV:Ljava/util/logging/Logger;
 
-.field private static final bxs:Lokhttp3/internal/g/f;
+.field private static final bxn:Lokhttp3/internal/g/f;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 2
 
-    invoke-static {}, Lokhttp3/internal/g/a;->GN()Lokhttp3/internal/g/f;
+    invoke-static {}, Lokhttp3/internal/g/a;->GL()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;->GR()Lokhttp3/internal/g/b;
+    invoke-static {}, Lokhttp3/internal/g/b;->GP()Lokhttp3/internal/g/b;
 
     move-result-object v0
 
@@ -71,7 +71,7 @@
     goto :goto_1
 
     :cond_2
-    invoke-static {}, Lokhttp3/internal/g/c;->GS()Lokhttp3/internal/g/c;
+    invoke-static {}, Lokhttp3/internal/g/c;->GQ()Lokhttp3/internal/g/c;
 
     move-result-object v0
 
@@ -80,7 +80,7 @@
     goto :goto_1
 
     :cond_3
-    invoke-static {}, Lokhttp3/internal/g/d;->GN()Lokhttp3/internal/g/f;
+    invoke-static {}, Lokhttp3/internal/g/d;->GL()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;->bxs:Lokhttp3/internal/g/f;
+    sput-object v0, Lokhttp3/internal/g/f;->bxn:Lokhttp3/internal/g/f;
 
     const-class v0, Lokhttp3/t;
 
@@ -106,7 +106,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/internal/g/f;->HZ:Ljava/util/logging/Logger;
+    sput-object v0, Lokhttp3/internal/g/f;->HV:Ljava/util/logging/Logger;
 
     return-void
 .end method
@@ -119,10 +119,10 @@
     return-void
 .end method
 
-.method public static GT()Lokhttp3/internal/g/f;
+.method public static GR()Lokhttp3/internal/g/f;
     .locals 1
 
-    sget-object v0, Lokhttp3/internal/g/f;->bxs:Lokhttp3/internal/g/f;
+    sget-object v0, Lokhttp3/internal/g/f;->bxn:Lokhttp3/internal/g/f;
 
     return-object v0
 .end method
@@ -164,7 +164,7 @@
 
     check-cast v3, Lokhttp3/u;
 
-    sget-object v4, Lokhttp3/u;->bsa:Lokhttp3/u;
+    sget-object v4, Lokhttp3/u;->brV:Lokhttp3/u;
 
     if-eq v3, v4, :cond_0
 
@@ -289,7 +289,7 @@
 
 
 # virtual methods
-.method public GO()Ljavax/net/ssl/SSLContext;
+.method public GM()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;->HZ:Ljava/util/logging/Logger;
+    sget-object v0, Lokhttp3/internal/g/f;->HV: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;->bxs:Lokhttp3/internal/g/f;
+    sget-object v2, Lokhttp3/internal/g/f;->bxn: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;->HZ:Ljava/util/logging/Logger;
+    sget-object v0, Lokhttp3/internal/g/f;->HV: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 59f71fc74e..efd19a060f 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 bxE:Ljava/util/List;
+.field public static final bxz:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -34,25 +34,25 @@
 
 
 # instance fields
-.field public final bsl:Lokhttp3/w;
+.field public final bsg:Lokhttp3/w;
 
-.field public bui:Lokhttp3/e;
+.field public bud:Lokhttp3/e;
 
-.field bvR:Z
+.field bvM:Z
 
-.field final bxF:Lokhttp3/WebSocketListener;
+.field final bxA:Lokhttp3/WebSocketListener;
 
-.field final bxG:J
+.field final bxB:J
 
-.field private final bxH:Ljava/lang/Runnable;
+.field private final bxC:Ljava/lang/Runnable;
 
-.field private bxI:Lokhttp3/internal/j/c;
+.field private bxD:Lokhttp3/internal/j/c;
 
-.field bxJ:Lokhttp3/internal/j/d;
+.field bxE:Lokhttp3/internal/j/d;
 
-.field private bxK:Lokhttp3/internal/j/a$e;
+.field private bxF:Lokhttp3/internal/j/a$e;
 
-.field private final bxL:Ljava/util/ArrayDeque;
+.field private final bxG:Ljava/util/ArrayDeque;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/ArrayDeque<",
@@ -62,7 +62,7 @@
     .end annotation
 .end field
 
-.field private final bxM:Ljava/util/ArrayDeque;
+.field private final bxH:Ljava/util/ArrayDeque;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/ArrayDeque<",
@@ -72,11 +72,11 @@
     .end annotation
 .end field
 
-.field private bxN:J
+.field private bxI:J
 
-.field private bxO:Z
+.field private bxJ:Z
 
-.field private bxP:Ljava/util/concurrent/ScheduledFuture;
+.field private bxK:Ljava/util/concurrent/ScheduledFuture;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/ScheduledFuture<",
@@ -85,21 +85,21 @@
     .end annotation
 .end field
 
+.field private bxL:I
+
+.field private bxM:Ljava/lang/String;
+
+.field bxN:Z
+
+.field bxO:I
+
+.field private bxP:I
+
 .field private bxQ:I
 
-.field private bxR:Ljava/lang/String;
-
-.field bxS:Z
-
-.field bxT:I
-
-.field private bxU:I
-
-.field private bxV:I
-
 .field public final key:Ljava/lang/String;
 
-.field private pC:Ljava/util/concurrent/ScheduledExecutorService;
+.field private pD: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;->bsb:Lokhttp3/u;
+    sget-object v0, Lokhttp3/u;->brW: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;->bxE:Ljava/util/List;
+    sput-object v0, Lokhttp3/internal/j/a;->bxz: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;->bxL:Ljava/util/ArrayDeque;
+    iput-object v0, p0, Lokhttp3/internal/j/a;->bxG: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;->bxM:Ljava/util/ArrayDeque;
+    iput-object v0, p0, Lokhttp3/internal/j/a;->bxH:Ljava/util/ArrayDeque;
 
     const/4 v0, -0x1
 
-    iput v0, p0, Lokhttp3/internal/j/a;->bxQ:I
+    iput v0, p0, Lokhttp3/internal/j/a;->bxL:I
 
-    iget-object v0, p1, Lokhttp3/w;->bsq:Ljava/lang/String;
+    iget-object v0, p1, Lokhttp3/w;->bsl:Ljava/lang/String;
 
     const-string v1, "GET"
 
@@ -150,13 +150,13 @@
 
     if-eqz v0, :cond_0
 
-    iput-object p1, p0, Lokhttp3/internal/j/a;->bsl:Lokhttp3/w;
+    iput-object p1, p0, Lokhttp3/internal/j/a;->bsg:Lokhttp3/w;
 
-    iput-object p2, p0, Lokhttp3/internal/j/a;->bxF:Lokhttp3/WebSocketListener;
+    iput-object p2, p0, Lokhttp3/internal/j/a;->bxA:Lokhttp3/WebSocketListener;
 
     iput-object p3, p0, Lokhttp3/internal/j/a;->random:Ljava/util/Random;
 
-    iput-wide p4, p0, Lokhttp3/internal/j/a;->bxG:J
+    iput-wide p4, p0, Lokhttp3/internal/j/a;->bxB:J
 
     const/16 p1, 0x10
 
@@ -168,7 +168,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lokio/ByteString;->Hu()Ljava/lang/String;
+    invoke-virtual {p1}, Lokio/ByteString;->Hs()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;->bxH:Ljava/lang/Runnable;
+    iput-object p1, p0, Lokhttp3/internal/j/a;->bxC: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;->bsq:Ljava/lang/String;
+    iget-object p1, p1, Lokhttp3/w;->bsl: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 GX()V
+.method private GV()V
     .locals 2
 
-    iget-object v0, p0, Lokhttp3/internal/j/a;->pC:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object v0, p0, Lokhttp3/internal/j/a;->pD:Ljava/util/concurrent/ScheduledExecutorService;
 
     if-eqz v0, :cond_0
 
-    iget-object v1, p0, Lokhttp3/internal/j/a;->bxH:Ljava/lang/Runnable;
+    iget-object v1, p0, Lokhttp3/internal/j/a;->bxC: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;->bxS:Z
+    iget-boolean p2, p0, Lokhttp3/internal/j/a;->bxN:Z
 
     if-nez p2, :cond_3
 
-    iget-boolean p2, p0, Lokhttp3/internal/j/a;->bxO:Z
+    iget-boolean p2, p0, Lokhttp3/internal/j/a;->bxJ:Z
 
     if-eqz p2, :cond_2
 
@@ -281,9 +281,9 @@
     :cond_2
     const/4 p2, 0x1
 
-    iput-boolean p2, p0, Lokhttp3/internal/j/a;->bxO:Z
+    iput-boolean p2, p0, Lokhttp3/internal/j/a;->bxJ:Z
 
-    iget-object v1, p0, Lokhttp3/internal/j/a;->bxM:Ljava/util/ArrayDeque;
+    iget-object v1, p0, Lokhttp3/internal/j/a;->bxH: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;->GX()V
+    invoke-direct {p0}, Lokhttp3/internal/j/a;->GV()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;->bxS:Z
+    iget-boolean v0, p0, Lokhttp3/internal/j/a;->bxN:Z
 
     const/4 v1, 0x0
 
     if-nez v0, :cond_2
 
-    iget-boolean v0, p0, Lokhttp3/internal/j/a;->bxO:Z
+    iget-boolean v0, p0, Lokhttp3/internal/j/a;->bxJ:Z
 
     if-eqz v0, :cond_0
 
     goto :goto_0
 
     :cond_0
-    iget-wide v2, p0, Lokhttp3/internal/j/a;->bxN:J
+    iget-wide v2, p0, Lokhttp3/internal/j/a;->bxI: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;->bxN:J
+    iget-wide v0, p0, Lokhttp3/internal/j/a;->bxI: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;->bxN:J
+    iput-wide v0, p0, Lokhttp3/internal/j/a;->bxI:J
 
-    iget-object v0, p0, Lokhttp3/internal/j/a;->bxM:Ljava/util/ArrayDeque;
+    iget-object v0, p0, Lokhttp3/internal/j/a;->bxH: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;->GX()V
+    invoke-direct {p0}, Lokhttp3/internal/j/a;->GV()V
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
@@ -412,7 +412,7 @@
 
 
 # virtual methods
-.method public final GV()V
+.method public final GT()V
     .locals 4
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -421,21 +421,21 @@
     .end annotation
 
     :goto_0
-    iget v0, p0, Lokhttp3/internal/j/a;->bxQ:I
+    iget v0, p0, Lokhttp3/internal/j/a;->bxL:I
 
     const/4 v1, -0x1
 
     if-ne v0, v1, :cond_4
 
-    iget-object v0, p0, Lokhttp3/internal/j/a;->bxI:Lokhttp3/internal/j/c;
+    iget-object v0, p0, Lokhttp3/internal/j/a;->bxD:Lokhttp3/internal/j/c;
 
-    invoke-virtual {v0}, Lokhttp3/internal/j/c;->GZ()V
+    invoke-virtual {v0}, Lokhttp3/internal/j/c;->GX()V
 
-    iget-boolean v1, v0, Lokhttp3/internal/j/c;->byg:Z
+    iget-boolean v1, v0, Lokhttp3/internal/j/c;->byb:Z
 
     if-eqz v1, :cond_0
 
-    invoke-virtual {v0}, Lokhttp3/internal/j/c;->Ha()V
+    invoke-virtual {v0}, Lokhttp3/internal/j/c;->GY()V
 
     goto :goto_0
 
@@ -477,15 +477,15 @@
 
     :cond_2
     :goto_1
-    invoke-virtual {v0}, Lokhttp3/internal/j/c;->Hc()V
+    invoke-virtual {v0}, Lokhttp3/internal/j/c;->Ha()V
 
     if-ne v1, v2, :cond_3
 
-    iget-object v1, v0, Lokhttp3/internal/j/c;->byd:Lokhttp3/internal/j/c$a;
+    iget-object v1, v0, Lokhttp3/internal/j/c;->bxY:Lokhttp3/internal/j/c$a;
 
-    iget-object v0, v0, Lokhttp3/internal/j/c;->byi:Lokio/c;
+    iget-object v0, v0, Lokhttp3/internal/j/c;->byd:Lokio/c;
 
-    invoke-virtual {v0}, Lokio/c;->Ho()Ljava/lang/String;
+    invoke-virtual {v0}, Lokio/c;->Hm()Ljava/lang/String;
 
     move-result-object v0
 
@@ -494,11 +494,11 @@
     goto :goto_0
 
     :cond_3
-    iget-object v1, v0, Lokhttp3/internal/j/c;->byd:Lokhttp3/internal/j/c$a;
+    iget-object v1, v0, Lokhttp3/internal/j/c;->bxY:Lokhttp3/internal/j/c$a;
 
-    iget-object v0, v0, Lokhttp3/internal/j/c;->byi:Lokio/c;
+    iget-object v0, v0, Lokhttp3/internal/j/c;->byd:Lokio/c;
 
-    invoke-virtual {v0}, Lokio/c;->Gs()Lokio/ByteString;
+    invoke-virtual {v0}, Lokio/c;->Gq()Lokio/ByteString;
 
     move-result-object v0
 
@@ -510,21 +510,21 @@
     return-void
 .end method
 
-.method public final declared-synchronized GW()V
+.method public final declared-synchronized GU()V
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    iget v0, p0, Lokhttp3/internal/j/a;->bxV:I
+    iget v0, p0, Lokhttp3/internal/j/a;->bxQ:I
 
     add-int/lit8 v0, v0, 0x1
 
-    iput v0, p0, Lokhttp3/internal/j/a;->bxV:I
+    iput v0, p0, Lokhttp3/internal/j/a;->bxQ:I
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lokhttp3/internal/j/a;->bvR:Z
+    iput-boolean v0, p0, Lokhttp3/internal/j/a;->bvM:Z
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -540,7 +540,7 @@
     throw v0
 .end method
 
-.method final GY()Z
+.method final GW()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;->bxS:Z
+    iget-boolean v0, p0, Lokhttp3/internal/j/a;->bxN:Z
 
     const/4 v1, 0x0
 
@@ -562,9 +562,9 @@
     return v1
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/internal/j/a;->bxJ:Lokhttp3/internal/j/d;
+    iget-object v0, p0, Lokhttp3/internal/j/a;->bxE:Lokhttp3/internal/j/d;
 
-    iget-object v2, p0, Lokhttp3/internal/j/a;->bxL:Ljava/util/ArrayDeque;
+    iget-object v2, p0, Lokhttp3/internal/j/a;->bxG: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;->bxM:Ljava/util/ArrayDeque;
+    iget-object v4, p0, Lokhttp3/internal/j/a;->bxH: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;->bxQ:I
+    iget v5, p0, Lokhttp3/internal/j/a;->bxL:I
 
-    iget-object v6, p0, Lokhttp3/internal/j/a;->bxR:Ljava/lang/String;
+    iget-object v6, p0, Lokhttp3/internal/j/a;->bxM:Ljava/lang/String;
 
     const/4 v7, -0x1
 
     if-eq v5, v7, :cond_1
 
-    iget-object v7, p0, Lokhttp3/internal/j/a;->bxK:Lokhttp3/internal/j/a$e;
+    iget-object v7, p0, Lokhttp3/internal/j/a;->bxF:Lokhttp3/internal/j/a$e;
 
-    iput-object v3, p0, Lokhttp3/internal/j/a;->bxK:Lokhttp3/internal/j/a$e;
+    iput-object v3, p0, Lokhttp3/internal/j/a;->bxF:Lokhttp3/internal/j/a$e;
 
-    iget-object v3, p0, Lokhttp3/internal/j/a;->pC:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object v3, p0, Lokhttp3/internal/j/a;->pD: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;->pC:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object v7, p0, Lokhttp3/internal/j/a;->pD: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;->bxZ:J
+    iget-wide v9, v9, Lokhttp3/internal/j/a$b;->bxU: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;->bxP:Ljava/util/concurrent/ScheduledFuture;
+    iput-object v7, p0, Lokhttp3/internal/j/a;->bxK: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;->byb:Lokio/ByteString;
+    iget-object v2, v2, Lokhttp3/internal/j/a$c;->bxW:Lokio/ByteString;
 
     check-cast v4, Lokhttp3/internal/j/a$c;
 
-    iget v4, v4, Lokhttp3/internal/j/a$c;->bya:I
+    iget v4, v4, Lokhttp3/internal/j/a$c;->bxV: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;->byo:Z
+    iget-boolean v8, v0, Lokhttp3/internal/j/d;->byj:Z
 
     if-nez v8, :cond_6
 
-    iput-boolean v7, v0, Lokhttp3/internal/j/d;->byo:Z
+    iput-boolean v7, v0, Lokhttp3/internal/j/d;->byj:Z
 
-    iget-object v8, v0, Lokhttp3/internal/j/d;->byn:Lokhttp3/internal/j/d$a;
+    iget-object v8, v0, Lokhttp3/internal/j/d;->byi:Lokhttp3/internal/j/d$a;
 
-    iput v4, v8, Lokhttp3/internal/j/d$a;->bya:I
+    iput v4, v8, Lokhttp3/internal/j/d$a;->bxV:I
 
-    iget-object v4, v0, Lokhttp3/internal/j/d;->byn:Lokhttp3/internal/j/d$a;
+    iget-object v4, v0, Lokhttp3/internal/j/d;->byi:Lokhttp3/internal/j/d$a;
 
     iput-wide v5, v4, Lokhttp3/internal/j/d$a;->contentLength:J
 
-    iget-object v4, v0, Lokhttp3/internal/j/d;->byn:Lokhttp3/internal/j/d$a;
+    iget-object v4, v0, Lokhttp3/internal/j/d;->byi:Lokhttp3/internal/j/d$a;
 
-    iput-boolean v7, v4, Lokhttp3/internal/j/d$a;->byp:Z
+    iput-boolean v7, v4, Lokhttp3/internal/j/d$a;->byk:Z
 
-    iget-object v4, v0, Lokhttp3/internal/j/d;->byn:Lokhttp3/internal/j/d$a;
+    iget-object v4, v0, Lokhttp3/internal/j/d;->byi:Lokhttp3/internal/j/d$a;
 
     iput-boolean v1, v4, Lokhttp3/internal/j/d$a;->w:Z
 
-    iget-object v0, v0, Lokhttp3/internal/j/d;->byn:Lokhttp3/internal/j/d$a;
+    iget-object v0, v0, Lokhttp3/internal/j/d;->byi: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;->bxN:J
+    iget-wide v0, p0, Lokhttp3/internal/j/a;->bxI: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;->bxN:J
+    iput-wide v0, p0, Lokhttp3/internal/j/a;->bxI: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;->bxY:Lokio/ByteString;
+    iget-object v2, v4, Lokhttp3/internal/j/a$b;->bxT:Lokio/ByteString;
 
-    sget-object v4, Lokio/ByteString;->byR:Lokio/ByteString;
+    sget-object v4, Lokio/ByteString;->byM: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;->Gs()Lokio/ByteString;
+    invoke-virtual {v4}, Lokio/c;->Gq()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;->bym:Z
+    iput-boolean v7, v0, Lokhttp3/internal/j/d;->byh:Z
 
     if-eqz v3, :cond_c
 
-    iget-object v0, p0, Lokhttp3/internal/j/a;->bxF:Lokhttp3/WebSocketListener;
+    iget-object v0, p0, Lokhttp3/internal/j/a;->bxA: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;->bym:Z
+    iput-boolean v7, v0, Lokhttp3/internal/j/d;->byh:Z
 
     throw v1
 
@@ -868,7 +868,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lokhttp3/internal/j/a;->bxS:Z
+    iget-boolean v0, p0, Lokhttp3/internal/j/a;->bxN:Z
 
     if-eqz v0, :cond_0
 
@@ -879,30 +879,30 @@
     :cond_0
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lokhttp3/internal/j/a;->bxS:Z
+    iput-boolean v0, p0, Lokhttp3/internal/j/a;->bxN:Z
 
-    iget-object v0, p0, Lokhttp3/internal/j/a;->bxK:Lokhttp3/internal/j/a$e;
+    iget-object v0, p0, Lokhttp3/internal/j/a;->bxF:Lokhttp3/internal/j/a$e;
 
     const/4 v1, 0x0
 
-    iput-object v1, p0, Lokhttp3/internal/j/a;->bxK:Lokhttp3/internal/j/a$e;
+    iput-object v1, p0, Lokhttp3/internal/j/a;->bxF:Lokhttp3/internal/j/a$e;
 
-    iget-object v1, p0, Lokhttp3/internal/j/a;->bxP:Ljava/util/concurrent/ScheduledFuture;
+    iget-object v1, p0, Lokhttp3/internal/j/a;->bxK:Ljava/util/concurrent/ScheduledFuture;
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lokhttp3/internal/j/a;->bxP:Ljava/util/concurrent/ScheduledFuture;
+    iget-object v1, p0, Lokhttp3/internal/j/a;->bxK: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;->pC:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object v1, p0, Lokhttp3/internal/j/a;->pD:Ljava/util/concurrent/ScheduledExecutorService;
 
     if-eqz v1, :cond_2
 
-    iget-object v1, p0, Lokhttp3/internal/j/a;->pC:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object v1, p0, Lokhttp3/internal/j/a;->pD: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;->bxF:Lokhttp3/WebSocketListener;
+    iget-object v1, p0, Lokhttp3/internal/j/a;->bxA: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;->bxK:Lokhttp3/internal/j/a$e;
+    iput-object p2, p0, Lokhttp3/internal/j/a;->bxF:Lokhttp3/internal/j/a$e;
 
     new-instance v0, Lokhttp3/internal/j/d;
 
-    iget-boolean v1, p2, Lokhttp3/internal/j/a$e;->bvJ:Z
+    iget-boolean v1, p2, Lokhttp3/internal/j/a$e;->bvE:Z
 
-    iget-object v2, p2, Lokhttp3/internal/j/a$e;->btZ:Lokio/BufferedSink;
+    iget-object v2, p2, Lokhttp3/internal/j/a$e;->btU: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;->bxJ:Lokhttp3/internal/j/d;
+    iput-object v0, p0, Lokhttp3/internal/j/a;->bxE: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;->pC:Ljava/util/concurrent/ScheduledExecutorService;
+    iput-object v0, p0, Lokhttp3/internal/j/a;->pD:Ljava/util/concurrent/ScheduledExecutorService;
 
-    iget-wide v0, p0, Lokhttp3/internal/j/a;->bxG:J
+    iget-wide v0, p0, Lokhttp3/internal/j/a;->bxB:J
 
     const-wide/16 v2, 0x0
 
@@ -987,22 +987,22 @@
 
     if-eqz p1, :cond_0
 
-    iget-object v0, p0, Lokhttp3/internal/j/a;->pC:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object v0, p0, Lokhttp3/internal/j/a;->pD: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;->bxG:J
+    iget-wide v2, p0, Lokhttp3/internal/j/a;->bxB:J
 
-    iget-wide v4, p0, Lokhttp3/internal/j/a;->bxG:J
+    iget-wide v4, p0, Lokhttp3/internal/j/a;->bxB: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;->bxM:Ljava/util/ArrayDeque;
+    iget-object p1, p0, Lokhttp3/internal/j/a;->bxH: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;->GX()V
+    invoke-direct {p0}, Lokhttp3/internal/j/a;->GV()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;->bvJ:Z
+    iget-boolean v0, p2, Lokhttp3/internal/j/a$e;->bvE:Z
 
-    iget-object p2, p2, Lokhttp3/internal/j/a$e;->lY:Lokio/d;
+    iget-object p2, p2, Lokhttp3/internal/j/a$e;->lZ: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;->bxI:Lokhttp3/internal/j/c;
+    iput-object p1, p0, Lokhttp3/internal/j/a;->bxD: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;->bui:Lokhttp3/e;
+    iget-object v0, p0, Lokhttp3/internal/j/a;->bud:Lokhttp3/e;
 
     invoke-interface {v0}, Lokhttp3/e;->cancel()V
 
@@ -1093,7 +1093,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/j/a;->bxF:Lokhttp3/WebSocketListener;
+    iget-object v0, p0, Lokhttp3/internal/j/a;->bxA: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;->bxQ:I
+    iget v1, p0, Lokhttp3/internal/j/a;->bxL:I
 
     if-ne v1, v0, :cond_3
 
-    iput p1, p0, Lokhttp3/internal/j/a;->bxQ:I
+    iput p1, p0, Lokhttp3/internal/j/a;->bxL:I
 
-    iput-object p2, p0, Lokhttp3/internal/j/a;->bxR:Ljava/lang/String;
+    iput-object p2, p0, Lokhttp3/internal/j/a;->bxM:Ljava/lang/String;
 
-    iget-boolean v0, p0, Lokhttp3/internal/j/a;->bxO:Z
+    iget-boolean v0, p0, Lokhttp3/internal/j/a;->bxJ:Z
 
     const/4 v1, 0x0
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lokhttp3/internal/j/a;->bxM:Ljava/util/ArrayDeque;
+    iget-object v0, p0, Lokhttp3/internal/j/a;->bxH: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;->bxK:Lokhttp3/internal/j/a$e;
+    iget-object v0, p0, Lokhttp3/internal/j/a;->bxF:Lokhttp3/internal/j/a$e;
 
-    iput-object v1, p0, Lokhttp3/internal/j/a;->bxK:Lokhttp3/internal/j/a$e;
+    iput-object v1, p0, Lokhttp3/internal/j/a;->bxF:Lokhttp3/internal/j/a$e;
 
-    iget-object v1, p0, Lokhttp3/internal/j/a;->bxP:Ljava/util/concurrent/ScheduledFuture;
+    iget-object v1, p0, Lokhttp3/internal/j/a;->bxK:Ljava/util/concurrent/ScheduledFuture;
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lokhttp3/internal/j/a;->bxP:Ljava/util/concurrent/ScheduledFuture;
+    iget-object v1, p0, Lokhttp3/internal/j/a;->bxK: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;->pC:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object v1, p0, Lokhttp3/internal/j/a;->pD: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;->bxF:Lokhttp3/WebSocketListener;
+    iget-object v1, p0, Lokhttp3/internal/j/a;->bxA: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;->bxF:Lokhttp3/WebSocketListener;
+    iget-object v1, p0, Lokhttp3/internal/j/a;->bxA: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;->bxF:Lokhttp3/WebSocketListener;
+    iget-object v0, p0, Lokhttp3/internal/j/a;->bxA: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;->bxS:Z
+    iget-boolean v0, p0, Lokhttp3/internal/j/a;->bxN:Z
 
     if-nez v0, :cond_1
 
-    iget-boolean v0, p0, Lokhttp3/internal/j/a;->bxO:Z
+    iget-boolean v0, p0, Lokhttp3/internal/j/a;->bxJ:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/internal/j/a;->bxM:Ljava/util/ArrayDeque;
+    iget-object v0, p0, Lokhttp3/internal/j/a;->bxH: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;->bxL:Ljava/util/ArrayDeque;
+    iget-object v0, p0, Lokhttp3/internal/j/a;->bxG:Ljava/util/ArrayDeque;
 
     invoke-virtual {v0, p1}, Ljava/util/ArrayDeque;->add(Ljava/lang/Object;)Z
 
-    invoke-direct {p0}, Lokhttp3/internal/j/a;->GX()V
+    invoke-direct {p0}, Lokhttp3/internal/j/a;->GV()V
 
-    iget p1, p0, Lokhttp3/internal/j/a;->bxU:I
+    iget p1, p0, Lokhttp3/internal/j/a;->bxP:I
 
     add-int/lit8 p1, p1, 0x1
 
-    iput p1, p0, Lokhttp3/internal/j/a;->bxU:I
+    iput p1, p0, Lokhttp3/internal/j/a;->bxP: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 2e200ba88e..4283132377 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 GW()V
+.method public abstract GU()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 c6916b5c11..4777a43e11 100644
--- a/com.discord/smali/okhttp3/k$a.smali
+++ b/com.discord/smali/okhttp3/k$a.smali
@@ -15,16 +15,16 @@
 
 
 # instance fields
-.field bqv:Z
+.field bqq:Z
 
-.field bqw:Z
+.field bqr:Z
 
-.field bqx:[Ljava/lang/String;
+.field bqs:[Ljava/lang/String;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field bqy:[Ljava/lang/String;
+.field bqt:[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;->bqv:Z
+    iget-boolean v0, p1, Lokhttp3/k;->bqq:Z
 
-    iput-boolean v0, p0, Lokhttp3/k$a;->bqv:Z
+    iput-boolean v0, p0, Lokhttp3/k$a;->bqq:Z
 
-    iget-object v0, p1, Lokhttp3/k;->bqx:[Ljava/lang/String;
+    iget-object v0, p1, Lokhttp3/k;->bqs:[Ljava/lang/String;
 
-    iput-object v0, p0, Lokhttp3/k$a;->bqx:[Ljava/lang/String;
+    iput-object v0, p0, Lokhttp3/k$a;->bqs:[Ljava/lang/String;
 
-    iget-object v0, p1, Lokhttp3/k;->bqy:[Ljava/lang/String;
+    iget-object v0, p1, Lokhttp3/k;->bqt:[Ljava/lang/String;
 
-    iput-object v0, p0, Lokhttp3/k$a;->bqy:[Ljava/lang/String;
+    iput-object v0, p0, Lokhttp3/k$a;->bqt:[Ljava/lang/String;
 
-    iget-boolean p1, p1, Lokhttp3/k;->bqw:Z
+    iget-boolean p1, p1, Lokhttp3/k;->bqr:Z
 
-    iput-boolean p1, p0, Lokhttp3/k$a;->bqw:Z
+    iput-boolean p1, p0, Lokhttp3/k$a;->bqr:Z
 
     return-void
 .end method
@@ -60,23 +60,23 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-boolean p1, p0, Lokhttp3/k$a;->bqv:Z
+    iput-boolean p1, p0, Lokhttp3/k$a;->bqq:Z
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final Ff()Lokhttp3/k$a;
+.method public final Fd()Lokhttp3/k$a;
     .locals 2
 
-    iget-boolean v0, p0, Lokhttp3/k$a;->bqv:Z
+    iget-boolean v0, p0, Lokhttp3/k$a;->bqq:Z
 
     if-eqz v0, :cond_0
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lokhttp3/k$a;->bqw:Z
+    iput-boolean v0, p0, Lokhttp3/k$a;->bqr:Z
 
     return-object p0
 
@@ -90,7 +90,7 @@
     throw v0
 .end method
 
-.method public final Fg()Lokhttp3/k;
+.method public final Fe()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;->bqv:Z
+    iget-boolean v0, p0, Lokhttp3/k$a;->bqq: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;->bqv:Z
+    iget-boolean v0, p0, Lokhttp3/k$a;->bqq: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;->bqv:Z
+    iget-boolean v0, p0, Lokhttp3/k$a;->bqq:Z
 
     if-eqz v0, :cond_1
 
@@ -219,7 +219,7 @@
 
     check-cast p1, [Ljava/lang/String;
 
-    iput-object p1, p0, Lokhttp3/k$a;->bqx:[Ljava/lang/String;
+    iput-object p1, p0, Lokhttp3/k$a;->bqs:[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;->bqv:Z
+    iget-boolean v0, p0, Lokhttp3/k$a;->bqq:Z
 
     if-eqz v0, :cond_1
 
@@ -259,7 +259,7 @@
 
     check-cast p1, [Ljava/lang/String;
 
-    iput-object p1, p0, Lokhttp3/k$a;->bqy:[Ljava/lang/String;
+    iput-object p1, p0, Lokhttp3/k$a;->bqt:[Ljava/lang/String;
 
     return-object p0
 
diff --git a/com.discord/smali/okhttp3/k.smali b/com.discord/smali/okhttp3/k.smali
index f9ba219eef..4863428b64 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 bqp:[Lokhttp3/h;
+.field private static final bqk:[Lokhttp3/h;
 
-.field private static final bqq:[Lokhttp3/h;
+.field private static final bql:[Lokhttp3/h;
 
-.field public static final bqr:Lokhttp3/k;
+.field public static final bqm:Lokhttp3/k;
 
-.field public static final bqs:Lokhttp3/k;
+.field public static final bqn:Lokhttp3/k;
 
-.field public static final bqt:Lokhttp3/k;
+.field public static final bqo:Lokhttp3/k;
 
-.field public static final bqu:Lokhttp3/k;
+.field public static final bqp:Lokhttp3/k;
 
 
 # instance fields
-.field final bqv:Z
+.field final bqq:Z
 
-.field public final bqw:Z
+.field public final bqr:Z
 
-.field final bqx:[Ljava/lang/String;
+.field final bqs:[Ljava/lang/String;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field final bqy:[Ljava/lang/String;
+.field final bqt:[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;->bqd:Lokhttp3/h;
+    sget-object v2, Lokhttp3/h;->bpY:Lokhttp3/h;
 
     const/4 v3, 0x0
 
     aput-object v2, v1, v3
 
-    sget-object v2, Lokhttp3/h;->bqe:Lokhttp3/h;
+    sget-object v2, Lokhttp3/h;->bpZ:Lokhttp3/h;
 
     const/4 v4, 0x1
 
     aput-object v2, v1, v4
 
-    sget-object v2, Lokhttp3/h;->bqf:Lokhttp3/h;
+    sget-object v2, Lokhttp3/h;->bqa:Lokhttp3/h;
 
     const/4 v5, 0x2
 
     aput-object v2, v1, v5
 
-    sget-object v2, Lokhttp3/h;->bqg:Lokhttp3/h;
+    sget-object v2, Lokhttp3/h;->bqb:Lokhttp3/h;
 
     const/4 v6, 0x3
 
     aput-object v2, v1, v6
 
-    sget-object v2, Lokhttp3/h;->bqh:Lokhttp3/h;
+    sget-object v2, Lokhttp3/h;->bqc:Lokhttp3/h;
 
     const/4 v7, 0x4
 
     aput-object v2, v1, v7
 
-    sget-object v2, Lokhttp3/h;->bpP:Lokhttp3/h;
+    sget-object v2, Lokhttp3/h;->bpK:Lokhttp3/h;
 
     const/4 v8, 0x5
 
     aput-object v2, v1, v8
 
-    sget-object v2, Lokhttp3/h;->bpT:Lokhttp3/h;
+    sget-object v2, Lokhttp3/h;->bpO:Lokhttp3/h;
 
     const/4 v9, 0x6
 
     aput-object v2, v1, v9
 
-    sget-object v2, Lokhttp3/h;->bpQ:Lokhttp3/h;
+    sget-object v2, Lokhttp3/h;->bpL:Lokhttp3/h;
 
     const/4 v10, 0x7
 
     aput-object v2, v1, v10
 
-    sget-object v2, Lokhttp3/h;->bpU:Lokhttp3/h;
+    sget-object v2, Lokhttp3/h;->bpP:Lokhttp3/h;
 
     const/16 v11, 0x8
 
     aput-object v2, v1, v11
 
-    sget-object v2, Lokhttp3/h;->bqa:Lokhttp3/h;
+    sget-object v2, Lokhttp3/h;->bpV:Lokhttp3/h;
 
     const/16 v12, 0x9
 
     aput-object v2, v1, v12
 
-    sget-object v2, Lokhttp3/h;->bpZ:Lokhttp3/h;
+    sget-object v2, Lokhttp3/h;->bpU:Lokhttp3/h;
 
     const/16 v13, 0xa
 
     aput-object v2, v1, v13
 
-    sput-object v1, Lokhttp3/k;->bqp:[Lokhttp3/h;
+    sput-object v1, Lokhttp3/k;->bqk:[Lokhttp3/h;
 
     const/16 v1, 0x12
 
     new-array v1, v1, [Lokhttp3/h;
 
-    sget-object v2, Lokhttp3/h;->bqd:Lokhttp3/h;
+    sget-object v2, Lokhttp3/h;->bpY:Lokhttp3/h;
 
     aput-object v2, v1, v3
 
-    sget-object v2, Lokhttp3/h;->bqe:Lokhttp3/h;
+    sget-object v2, Lokhttp3/h;->bpZ:Lokhttp3/h;
 
     aput-object v2, v1, v4
 
-    sget-object v2, Lokhttp3/h;->bqf:Lokhttp3/h;
+    sget-object v2, Lokhttp3/h;->bqa:Lokhttp3/h;
 
     aput-object v2, v1, v5
 
-    sget-object v2, Lokhttp3/h;->bqg:Lokhttp3/h;
+    sget-object v2, Lokhttp3/h;->bqb:Lokhttp3/h;
 
     aput-object v2, v1, v6
 
-    sget-object v2, Lokhttp3/h;->bqh:Lokhttp3/h;
+    sget-object v2, Lokhttp3/h;->bqc:Lokhttp3/h;
 
     aput-object v2, v1, v7
 
-    sget-object v2, Lokhttp3/h;->bpP:Lokhttp3/h;
+    sget-object v2, Lokhttp3/h;->bpK:Lokhttp3/h;
 
     aput-object v2, v1, v8
 
-    sget-object v2, Lokhttp3/h;->bpT:Lokhttp3/h;
+    sget-object v2, Lokhttp3/h;->bpO:Lokhttp3/h;
 
     aput-object v2, v1, v9
 
-    sget-object v2, Lokhttp3/h;->bpQ:Lokhttp3/h;
+    sget-object v2, Lokhttp3/h;->bpL:Lokhttp3/h;
 
     aput-object v2, v1, v10
 
-    sget-object v2, Lokhttp3/h;->bpU:Lokhttp3/h;
+    sget-object v2, Lokhttp3/h;->bpP:Lokhttp3/h;
 
     aput-object v2, v1, v11
 
-    sget-object v2, Lokhttp3/h;->bqa:Lokhttp3/h;
+    sget-object v2, Lokhttp3/h;->bpV:Lokhttp3/h;
 
     aput-object v2, v1, v12
 
-    sget-object v2, Lokhttp3/h;->bpZ:Lokhttp3/h;
+    sget-object v2, Lokhttp3/h;->bpU:Lokhttp3/h;
 
     aput-object v2, v1, v13
 
-    sget-object v2, Lokhttp3/h;->bpA:Lokhttp3/h;
+    sget-object v2, Lokhttp3/h;->bpv:Lokhttp3/h;
 
     aput-object v2, v1, v0
 
-    sget-object v0, Lokhttp3/h;->bpB:Lokhttp3/h;
+    sget-object v0, Lokhttp3/h;->bpw:Lokhttp3/h;
 
     const/16 v2, 0xc
 
     aput-object v0, v1, v2
 
-    sget-object v0, Lokhttp3/h;->boY:Lokhttp3/h;
+    sget-object v0, Lokhttp3/h;->boT:Lokhttp3/h;
 
     const/16 v2, 0xd
 
     aput-object v0, v1, v2
 
-    sget-object v0, Lokhttp3/h;->boZ:Lokhttp3/h;
+    sget-object v0, Lokhttp3/h;->boU:Lokhttp3/h;
 
     const/16 v2, 0xe
 
     aput-object v0, v1, v2
 
-    sget-object v0, Lokhttp3/h;->bow:Lokhttp3/h;
+    sget-object v0, Lokhttp3/h;->boq:Lokhttp3/h;
 
     const/16 v2, 0xf
 
     aput-object v0, v1, v2
 
-    sget-object v0, Lokhttp3/h;->boA:Lokhttp3/h;
+    sget-object v0, Lokhttp3/h;->bov:Lokhttp3/h;
 
     const/16 v2, 0x10
 
     aput-object v0, v1, v2
 
-    sget-object v0, Lokhttp3/h;->bnZ:Lokhttp3/h;
+    sget-object v0, Lokhttp3/h;->bnU:Lokhttp3/h;
 
     const/16 v2, 0x11
 
     aput-object v0, v1, v2
 
-    sput-object v1, Lokhttp3/k;->bqq:[Lokhttp3/h;
+    sput-object v1, Lokhttp3/k;->bql:[Lokhttp3/h;
 
     new-instance v0, Lokhttp3/k$a;
 
     invoke-direct {v0, v4}, Lokhttp3/k$a;-><init>(Z)V
 
-    sget-object v1, Lokhttp3/k;->bqp:[Lokhttp3/h;
+    sget-object v1, Lokhttp3/k;->bqk:[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;->bsP:Lokhttp3/z;
+    sget-object v2, Lokhttp3/z;->bsK:Lokhttp3/z;
 
     aput-object v2, v1, v3
 
-    sget-object v2, Lokhttp3/z;->bsQ:Lokhttp3/z;
+    sget-object v2, Lokhttp3/z;->bsL:Lokhttp3/z;
 
     aput-object v2, v1, v4
 
@@ -231,21 +231,21 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokhttp3/k$a;->Ff()Lokhttp3/k$a;
+    invoke-virtual {v0}, Lokhttp3/k$a;->Fd()Lokhttp3/k$a;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokhttp3/k$a;->Fg()Lokhttp3/k;
+    invoke-virtual {v0}, Lokhttp3/k$a;->Fe()Lokhttp3/k;
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/k;->bqr:Lokhttp3/k;
+    sput-object v0, Lokhttp3/k;->bqm:Lokhttp3/k;
 
     new-instance v0, Lokhttp3/k$a;
 
     invoke-direct {v0, v4}, Lokhttp3/k$a;-><init>(Z)V
 
-    sget-object v1, Lokhttp3/k;->bqq:[Lokhttp3/h;
+    sget-object v1, Lokhttp3/k;->bql:[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;->bsP:Lokhttp3/z;
+    sget-object v2, Lokhttp3/z;->bsK:Lokhttp3/z;
 
     aput-object v2, v1, v3
 
-    sget-object v2, Lokhttp3/z;->bsQ:Lokhttp3/z;
+    sget-object v2, Lokhttp3/z;->bsL:Lokhttp3/z;
 
     aput-object v2, v1, v4
 
-    sget-object v2, Lokhttp3/z;->bsR:Lokhttp3/z;
+    sget-object v2, Lokhttp3/z;->bsM:Lokhttp3/z;
 
     aput-object v2, v1, v5
 
-    sget-object v2, Lokhttp3/z;->bsS:Lokhttp3/z;
+    sget-object v2, Lokhttp3/z;->bsN:Lokhttp3/z;
 
     aput-object v2, v1, v6
 
@@ -273,21 +273,21 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokhttp3/k$a;->Ff()Lokhttp3/k$a;
+    invoke-virtual {v0}, Lokhttp3/k$a;->Fd()Lokhttp3/k$a;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokhttp3/k$a;->Fg()Lokhttp3/k;
+    invoke-virtual {v0}, Lokhttp3/k$a;->Fe()Lokhttp3/k;
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/k;->bqs:Lokhttp3/k;
+    sput-object v0, Lokhttp3/k;->bqn:Lokhttp3/k;
 
     new-instance v0, Lokhttp3/k$a;
 
     invoke-direct {v0, v4}, Lokhttp3/k$a;-><init>(Z)V
 
-    sget-object v1, Lokhttp3/k;->bqq:[Lokhttp3/h;
+    sget-object v1, Lokhttp3/k;->bql:[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;->bsS:Lokhttp3/z;
+    sget-object v2, Lokhttp3/z;->bsN:Lokhttp3/z;
 
     aput-object v2, v1, v3
 
@@ -303,25 +303,25 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokhttp3/k$a;->Ff()Lokhttp3/k$a;
+    invoke-virtual {v0}, Lokhttp3/k$a;->Fd()Lokhttp3/k$a;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokhttp3/k$a;->Fg()Lokhttp3/k;
+    invoke-virtual {v0}, Lokhttp3/k$a;->Fe()Lokhttp3/k;
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/k;->bqt:Lokhttp3/k;
+    sput-object v0, Lokhttp3/k;->bqo:Lokhttp3/k;
 
     new-instance v0, Lokhttp3/k$a;
 
     invoke-direct {v0, v3}, Lokhttp3/k$a;-><init>(Z)V
 
-    invoke-virtual {v0}, Lokhttp3/k$a;->Fg()Lokhttp3/k;
+    invoke-virtual {v0}, Lokhttp3/k$a;->Fe()Lokhttp3/k;
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/k;->bqu:Lokhttp3/k;
+    sput-object v0, Lokhttp3/k;->bqp: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;->bqv:Z
+    iget-boolean v0, p1, Lokhttp3/k$a;->bqq:Z
 
-    iput-boolean v0, p0, Lokhttp3/k;->bqv:Z
+    iput-boolean v0, p0, Lokhttp3/k;->bqq:Z
 
-    iget-object v0, p1, Lokhttp3/k$a;->bqx:[Ljava/lang/String;
+    iget-object v0, p1, Lokhttp3/k$a;->bqs:[Ljava/lang/String;
 
-    iput-object v0, p0, Lokhttp3/k;->bqx:[Ljava/lang/String;
+    iput-object v0, p0, Lokhttp3/k;->bqs:[Ljava/lang/String;
 
-    iget-object v0, p1, Lokhttp3/k$a;->bqy:[Ljava/lang/String;
+    iget-object v0, p1, Lokhttp3/k$a;->bqt:[Ljava/lang/String;
 
-    iput-object v0, p0, Lokhttp3/k;->bqy:[Ljava/lang/String;
+    iput-object v0, p0, Lokhttp3/k;->bqt:[Ljava/lang/String;
 
-    iget-boolean p1, p1, Lokhttp3/k$a;->bqw:Z
+    iget-boolean p1, p1, Lokhttp3/k$a;->bqr:Z
 
-    iput-boolean p1, p0, Lokhttp3/k;->bqw:Z
+    iput-boolean p1, p0, Lokhttp3/k;->bqr: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;->bqv:Z
+    iget-boolean v0, p0, Lokhttp3/k;->bqq:Z
 
     const/4 v1, 0x0
 
@@ -364,13 +364,13 @@
     return v1
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/k;->bqy:[Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/k;->bqt:[Ljava/lang/String;
 
     if-eqz v0, :cond_1
 
-    sget-object v0, Lokhttp3/internal/c;->aTS:Ljava/util/Comparator;
+    sget-object v0, Lokhttp3/internal/c;->aTO:Ljava/util/Comparator;
 
-    iget-object v2, p0, Lokhttp3/k;->bqy:[Ljava/lang/String;
+    iget-object v2, p0, Lokhttp3/k;->bqt:[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;->bqx:[Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/k;->bqs:[Ljava/lang/String;
 
     if-eqz v0, :cond_2
 
-    sget-object v0, Lokhttp3/h;->bnR:Ljava/util/Comparator;
+    sget-object v0, Lokhttp3/h;->bnM:Ljava/util/Comparator;
 
-    iget-object v2, p0, Lokhttp3/k;->bqx:[Ljava/lang/String;
+    iget-object v2, p0, Lokhttp3/k;->bqs:[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;->bqv:Z
+    iget-boolean v2, p0, Lokhttp3/k;->bqq:Z
 
-    iget-boolean v3, p1, Lokhttp3/k;->bqv:Z
+    iget-boolean v3, p1, Lokhttp3/k;->bqq:Z
 
     if-eq v2, v3, :cond_2
 
@@ -447,9 +447,9 @@
     :cond_2
     if-eqz v2, :cond_5
 
-    iget-object v2, p0, Lokhttp3/k;->bqx:[Ljava/lang/String;
+    iget-object v2, p0, Lokhttp3/k;->bqs:[Ljava/lang/String;
 
-    iget-object v3, p1, Lokhttp3/k;->bqx:[Ljava/lang/String;
+    iget-object v3, p1, Lokhttp3/k;->bqs:[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;->bqy:[Ljava/lang/String;
+    iget-object v2, p0, Lokhttp3/k;->bqt:[Ljava/lang/String;
 
-    iget-object v3, p1, Lokhttp3/k;->bqy:[Ljava/lang/String;
+    iget-object v3, p1, Lokhttp3/k;->bqt:[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;->bqw:Z
+    iget-boolean v2, p0, Lokhttp3/k;->bqr:Z
 
-    iget-boolean p1, p1, Lokhttp3/k;->bqw:Z
+    iget-boolean p1, p1, Lokhttp3/k;->bqr:Z
 
     if-eq v2, p1, :cond_5
 
@@ -488,11 +488,11 @@
 .method public final hashCode()I
     .locals 2
 
-    iget-boolean v0, p0, Lokhttp3/k;->bqv:Z
+    iget-boolean v0, p0, Lokhttp3/k;->bqq:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/k;->bqx:[Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/k;->bqs:[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;->bqy:[Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/k;->bqt:[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;->bqw:Z
+    iget-boolean v1, p0, Lokhttp3/k;->bqr: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;->bqv:Z
+    iget-boolean v0, p0, Lokhttp3/k;->bqq:Z
 
     if-nez v0, :cond_0
 
@@ -539,7 +539,7 @@
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/k;->bqx:[Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/k;->bqs:[Ljava/lang/String;
 
     const/4 v1, 0x0
 
@@ -569,7 +569,7 @@
     move-object v0, v2
 
     :goto_1
-    iget-object v3, p0, Lokhttp3/k;->bqy:[Ljava/lang/String;
+    iget-object v3, p0, Lokhttp3/k;->bqt:[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;->bqw:Z
+    iget-boolean v0, p0, Lokhttp3/k;->bqr: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 5902833a6a..aa441961d8 100644
--- a/com.discord/smali/okhttp3/l$a.smali
+++ b/com.discord/smali/okhttp3/l$a.smali
@@ -15,21 +15,21 @@
 
 
 # instance fields
-.field public bqD:J
+.field public bqA:Z
 
-.field bqE:Ljava/lang/String;
+.field public bqB:Z
+
+.field public bqC:Z
+
+.field bqD:Z
+
+.field public bqy:J
+
+.field bqz:Ljava/lang/String;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public bqF:Z
-
-.field public bqG:Z
-
-.field public bqH:Z
-
-.field bqI:Z
-
 .field public name:Ljava/lang/String;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
@@ -51,7 +51,7 @@
 
     const-wide v0, 0xe677d21fdbffL
 
-    iput-wide v0, p0, Lokhttp3/l$a;->bqD:J
+    iput-wide v0, p0, Lokhttp3/l$a;->bqy:J
 
     const-string v0, "/"
 
@@ -73,9 +73,9 @@
 
     if-eqz v0, :cond_0
 
-    iput-object v0, p0, Lokhttp3/l$a;->bqE:Ljava/lang/String;
+    iput-object v0, p0, Lokhttp3/l$a;->bqz:Ljava/lang/String;
 
-    iput-boolean p2, p0, Lokhttp3/l$a;->bqI:Z
+    iput-boolean p2, p0, Lokhttp3/l$a;->bqD:Z
 
     return-object p0
 
diff --git a/com.discord/smali/okhttp3/l.smali b/com.discord/smali/okhttp3/l.smali
index 61ea9c3e0e..0aa7314503 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 bqA:Ljava/util/regex/Pattern;
+.field private static final bqu:Ljava/util/regex/Pattern;
 
-.field private static final bqB:Ljava/util/regex/Pattern;
+.field private static final bqv:Ljava/util/regex/Pattern;
 
-.field private static final bqC:Ljava/util/regex/Pattern;
+.field private static final bqw:Ljava/util/regex/Pattern;
 
-.field private static final bqz:Ljava/util/regex/Pattern;
+.field private static final bqx:Ljava/util/regex/Pattern;
 
 
 # instance fields
-.field public final bqD:J
+.field public final bqA:Z
 
-.field public final bqE:Ljava/lang/String;
+.field public final bqB:Z
 
-.field public final bqF:Z
+.field public final bqC:Z
 
-.field public final bqG:Z
+.field public final bqD:Z
 
-.field public final bqH:Z
+.field public final bqy:J
 
-.field public final bqI:Z
+.field public final bqz:Ljava/lang/String;
 
 .field public final name:Ljava/lang/String;
 
@@ -51,7 +51,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/l;->bqz:Ljava/util/regex/Pattern;
+    sput-object v0, Lokhttp3/l;->bqu: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;->bqA:Ljava/util/regex/Pattern;
+    sput-object v0, Lokhttp3/l;->bqv:Ljava/util/regex/Pattern;
 
     const-string v0, "(\\d{1,2})[^\\d]*"
 
@@ -67,7 +67,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/l;->bqB:Ljava/util/regex/Pattern;
+    sput-object v0, Lokhttp3/l;->bqw: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;->bqC:Ljava/util/regex/Pattern;
+    sput-object v0, Lokhttp3/l;->bqx: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;->bqD:J
+    iput-wide p3, p0, Lokhttp3/l;->bqy:J
 
-    iput-object p5, p0, Lokhttp3/l;->bqE:Ljava/lang/String;
+    iput-object p5, p0, Lokhttp3/l;->bqz:Ljava/lang/String;
 
     iput-object p6, p0, Lokhttp3/l;->path:Ljava/lang/String;
 
-    iput-boolean p7, p0, Lokhttp3/l;->bqF:Z
+    iput-boolean p7, p0, Lokhttp3/l;->bqA:Z
 
-    iput-boolean p8, p0, Lokhttp3/l;->bqG:Z
+    iput-boolean p8, p0, Lokhttp3/l;->bqB:Z
 
-    iput-boolean p9, p0, Lokhttp3/l;->bqI:Z
+    iput-boolean p9, p0, Lokhttp3/l;->bqD:Z
 
-    iput-boolean p10, p0, Lokhttp3/l;->bqH:Z
+    iput-boolean p10, p0, Lokhttp3/l;->bqC:Z
 
     return-void
 .end method
@@ -119,7 +119,7 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p1, Lokhttp3/l$a;->bqE:Ljava/lang/String;
+    iget-object v0, p1, Lokhttp3/l$a;->bqz: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;->bqD:J
+    iget-wide v0, p1, Lokhttp3/l$a;->bqy:J
 
-    iput-wide v0, p0, Lokhttp3/l;->bqD:J
+    iput-wide v0, p0, Lokhttp3/l;->bqy:J
 
-    iget-object v0, p1, Lokhttp3/l$a;->bqE:Ljava/lang/String;
+    iget-object v0, p1, Lokhttp3/l$a;->bqz:Ljava/lang/String;
 
-    iput-object v0, p0, Lokhttp3/l;->bqE:Ljava/lang/String;
+    iput-object v0, p0, Lokhttp3/l;->bqz: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;->bqF:Z
+    iget-boolean v0, p1, Lokhttp3/l$a;->bqA:Z
 
-    iput-boolean v0, p0, Lokhttp3/l;->bqF:Z
+    iput-boolean v0, p0, Lokhttp3/l;->bqA:Z
 
-    iget-boolean v0, p1, Lokhttp3/l$a;->bqG:Z
+    iget-boolean v0, p1, Lokhttp3/l$a;->bqB:Z
 
-    iput-boolean v0, p0, Lokhttp3/l;->bqG:Z
+    iput-boolean v0, p0, Lokhttp3/l;->bqB:Z
 
-    iget-boolean v0, p1, Lokhttp3/l$a;->bqH:Z
+    iget-boolean v0, p1, Lokhttp3/l$a;->bqC:Z
 
-    iput-boolean v0, p0, Lokhttp3/l;->bqH:Z
+    iput-boolean v0, p0, Lokhttp3/l;->bqC:Z
 
-    iget-boolean p1, p1, Lokhttp3/l$a;->bqI:Z
+    iget-boolean p1, p1, Lokhttp3/l$a;->bqD:Z
 
-    iput-boolean p1, p0, Lokhttp3/l;->bqI:Z
+    iput-boolean p1, p0, Lokhttp3/l;->bqD:Z
 
     return-void
 
@@ -286,7 +286,7 @@
         }
     .end annotation
 
-    iget-object v0, p1, Lokhttp3/Headers;->brc:[Ljava/lang/String;
+    iget-object v0, p1, Lokhttp3/Headers;->bqX:[Ljava/lang/String;
 
     array-length v0, v0
 
@@ -538,7 +538,7 @@
 
     move-result v6
 
-    sget-object v12, Lokhttp3/l;->bqC:Ljava/util/regex/Pattern;
+    sget-object v12, Lokhttp3/l;->bqx: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;->bqC:Ljava/util/regex/Pattern;
+    sget-object v6, Lokhttp3/l;->bqx: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;->bqB:Ljava/util/regex/Pattern;
+    sget-object v9, Lokhttp3/l;->bqw: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;->bqA:Ljava/util/regex/Pattern;
+    sget-object v9, Lokhttp3/l;->bqv: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;->bqA:Ljava/util/regex/Pattern;
+    sget-object v9, Lokhttp3/l;->bqv: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;->bqz:Ljava/util/regex/Pattern;
+    sget-object v9, Lokhttp3/l;->bqu: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;->bti:Ljava/util/TimeZone;
+    sget-object v9, Lokhttp3/internal/c;->btd: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;->brg:Ljava/lang/String;
+    iget-object v1, v0, Lokhttp3/s;->brb:Ljava/lang/String;
 
     if-nez v8, :cond_22
 
@@ -1172,7 +1172,7 @@
 
     if-eq v1, v3, :cond_24
 
-    invoke-static {}, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->GU()Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;
+    invoke-static {}, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->GS()Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;
 
     move-result-object v1
 
@@ -1206,7 +1206,7 @@
 
     :cond_26
     :goto_d
-    invoke-virtual/range {p2 .. p2}, Lokhttp3/s;->Fr()Ljava/lang/String;
+    invoke-virtual/range {p2 .. p2}, Lokhttp3/s;->Fp()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;->Fr()Ljava/lang/String;
+    invoke-virtual {p0}, Lokhttp3/s;->Fp()Ljava/lang/String;
 
     move-result-object p0
 
@@ -1455,9 +1455,9 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p1, Lokhttp3/l;->bqE:Ljava/lang/String;
+    iget-object v0, p1, Lokhttp3/l;->bqz:Ljava/lang/String;
 
-    iget-object v2, p0, Lokhttp3/l;->bqE:Ljava/lang/String;
+    iget-object v2, p0, Lokhttp3/l;->bqz: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;->bqD:J
+    iget-wide v2, p1, Lokhttp3/l;->bqy:J
 
-    iget-wide v4, p0, Lokhttp3/l;->bqD:J
+    iget-wide v4, p0, Lokhttp3/l;->bqy:J
 
     cmp-long v0, v2, v4
 
     if-nez v0, :cond_1
 
-    iget-boolean v0, p1, Lokhttp3/l;->bqF:Z
+    iget-boolean v0, p1, Lokhttp3/l;->bqA:Z
 
-    iget-boolean v2, p0, Lokhttp3/l;->bqF:Z
+    iget-boolean v2, p0, Lokhttp3/l;->bqA:Z
 
     if-ne v0, v2, :cond_1
 
-    iget-boolean v0, p1, Lokhttp3/l;->bqG:Z
+    iget-boolean v0, p1, Lokhttp3/l;->bqB:Z
 
-    iget-boolean v2, p0, Lokhttp3/l;->bqG:Z
+    iget-boolean v2, p0, Lokhttp3/l;->bqB:Z
 
     if-ne v0, v2, :cond_1
 
-    iget-boolean v0, p1, Lokhttp3/l;->bqH:Z
+    iget-boolean v0, p1, Lokhttp3/l;->bqC:Z
 
-    iget-boolean v2, p0, Lokhttp3/l;->bqH:Z
+    iget-boolean v2, p0, Lokhttp3/l;->bqC:Z
 
     if-ne v0, v2, :cond_1
 
-    iget-boolean p1, p1, Lokhttp3/l;->bqI:Z
+    iget-boolean p1, p1, Lokhttp3/l;->bqD:Z
 
-    iget-boolean v0, p0, Lokhttp3/l;->bqI:Z
+    iget-boolean v0, p0, Lokhttp3/l;->bqD:Z
 
     if-ne p1, v0, :cond_1
 
@@ -1538,7 +1538,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lokhttp3/l;->bqE:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/l;->bqz: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;->bqD:J
+    iget-wide v1, p0, Lokhttp3/l;->bqy:J
 
     const/16 v3, 0x20
 
@@ -1572,7 +1572,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-boolean v1, p0, Lokhttp3/l;->bqF:Z
+    iget-boolean v1, p0, Lokhttp3/l;->bqA:Z
 
     xor-int/lit8 v1, v1, 0x1
 
@@ -1580,7 +1580,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-boolean v1, p0, Lokhttp3/l;->bqG:Z
+    iget-boolean v1, p0, Lokhttp3/l;->bqB:Z
 
     xor-int/lit8 v1, v1, 0x1
 
@@ -1588,7 +1588,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-boolean v1, p0, Lokhttp3/l;->bqH:Z
+    iget-boolean v1, p0, Lokhttp3/l;->bqC:Z
 
     xor-int/lit8 v1, v1, 0x1
 
@@ -1596,7 +1596,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-boolean v1, p0, Lokhttp3/l;->bqI:Z
+    iget-boolean v1, p0, Lokhttp3/l;->bqD: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;->bqH:Z
+    iget-boolean v1, p0, Lokhttp3/l;->bqC:Z
 
     if-eqz v1, :cond_1
 
-    iget-wide v1, p0, Lokhttp3/l;->bqD:J
+    iget-wide v1, p0, Lokhttp3/l;->bqy:J
 
     const-wide/high16 v3, -0x8000000000000000L
 
@@ -1649,7 +1649,7 @@
 
     new-instance v1, Ljava/util/Date;
 
-    iget-wide v2, p0, Lokhttp3/l;->bqD:J
+    iget-wide v2, p0, Lokhttp3/l;->bqy: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;->bqI:Z
+    iget-boolean v1, p0, Lokhttp3/l;->bqD: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;->bqE:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/l;->bqz: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;->bqF:Z
+    iget-boolean v1, p0, Lokhttp3/l;->bqA: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;->bqG:Z
+    iget-boolean v1, p0, Lokhttp3/l;->bqB:Z
 
     if-eqz v1, :cond_4
 
diff --git a/com.discord/smali/okhttp3/n.smali b/com.discord/smali/okhttp3/n.smali
index c5b7763df5..8b123e4b0b 100644
--- a/com.discord/smali/okhttp3/n.smali
+++ b/com.discord/smali/okhttp3/n.smali
@@ -8,16 +8,16 @@
 
 
 # instance fields
-.field private bqK:I
+.field private bqF:I
 
-.field private bqL:I
+.field private bqG:I
 
-.field private bqM:Ljava/lang/Runnable;
+.field private bqH:Ljava/lang/Runnable;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field final bqN:Ljava/util/Deque;
+.field final bqI:Ljava/util/Deque;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Deque<",
@@ -27,7 +27,7 @@
     .end annotation
 .end field
 
-.field private final bqO:Ljava/util/Deque;
+.field private final bqJ:Ljava/util/Deque;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Deque<",
@@ -37,7 +37,7 @@
     .end annotation
 .end field
 
-.field private final bqP:Ljava/util/Deque;
+.field private final bqK: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;->bqK:I
+    iput v0, p0, Lokhttp3/n;->bqF:I
 
     const/4 v0, 0x5
 
-    iput v0, p0, Lokhttp3/n;->bqL:I
+    iput v0, p0, Lokhttp3/n;->bqG:I
 
     new-instance v0, Ljava/util/ArrayDeque;
 
     invoke-direct {v0}, Ljava/util/ArrayDeque;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/n;->bqN:Ljava/util/Deque;
+    iput-object v0, p0, Lokhttp3/n;->bqI:Ljava/util/Deque;
 
     new-instance v0, Ljava/util/ArrayDeque;
 
     invoke-direct {v0}, Ljava/util/ArrayDeque;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/n;->bqO:Ljava/util/Deque;
+    iput-object v0, p0, Lokhttp3/n;->bqJ:Ljava/util/Deque;
 
     new-instance v0, Ljava/util/ArrayDeque;
 
     invoke-direct {v0}, Ljava/util/ArrayDeque;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/n;->bqP:Ljava/util/Deque;
+    iput-object v0, p0, Lokhttp3/n;->bqK:Ljava/util/Deque;
 
     return-void
 .end method
 
-.method private declared-synchronized Fh()Ljava/util/concurrent/ExecutorService;
+.method private declared-synchronized Ff()Ljava/util/concurrent/ExecutorService;
     .locals 9
 
     monitor-enter p0
@@ -149,19 +149,19 @@
     throw v0
 .end method
 
-.method private declared-synchronized Fj()I
+.method private declared-synchronized Fh()I
     .locals 2
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lokhttp3/n;->bqO:Ljava/util/Deque;
+    iget-object v0, p0, Lokhttp3/n;->bqJ:Ljava/util/Deque;
 
     invoke-interface {v0}, Ljava/util/Deque;->size()I
 
     move-result v0
 
-    iget-object v1, p0, Lokhttp3/n;->bqP:Ljava/util/Deque;
+    iget-object v1, p0, Lokhttp3/n;->bqK: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;->bqO:Ljava/util/Deque;
+    iget-object v0, p0, Lokhttp3/n;->bqJ: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;->bso:Lokhttp3/v;
+    iget-object v3, v2, Lokhttp3/v$a;->bsj:Lokhttp3/v;
 
-    iget-boolean v3, v3, Lokhttp3/v;->bsm:Z
+    iget-boolean v3, v3, Lokhttp3/v;->bsh:Z
 
     if-nez v3, :cond_0
 
-    invoke-virtual {v2}, Lokhttp3/v$a;->FI()Ljava/lang/String;
+    invoke-virtual {v2}, Lokhttp3/v$a;->FG()Ljava/lang/String;
 
     move-result-object v2
 
-    invoke-virtual {p1}, Lokhttp3/v$a;->FI()Ljava/lang/String;
+    invoke-virtual {p1}, Lokhttp3/v$a;->FG()Ljava/lang/String;
 
     move-result-object v3
 
@@ -257,13 +257,13 @@
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p0, Lokhttp3/n;->bqM:Ljava/lang/Runnable;
+    iget-object p1, p0, Lokhttp3/n;->bqH:Ljava/lang/Runnable;
 
     monitor-exit p0
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    invoke-virtual {p0}, Lokhttp3/n;->Fi()Z
+    invoke-virtual {p0}, Lokhttp3/n;->Fg()Z
 
     move-result p2
 
@@ -298,7 +298,7 @@
 
 
 # virtual methods
-.method final Fi()Z
+.method final Fg()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;->bqN:Ljava/util/Deque;
+    iget-object v1, p0, Lokhttp3/n;->bqI: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;->bqO:Ljava/util/Deque;
+    iget-object v3, p0, Lokhttp3/n;->bqJ:Ljava/util/Deque;
 
     invoke-interface {v3}, Ljava/util/Deque;->size()I
 
     move-result v3
 
-    iget v4, p0, Lokhttp3/n;->bqK:I
+    iget v4, p0, Lokhttp3/n;->bqF:I
 
     if-ge v3, v4, :cond_1
 
@@ -342,7 +342,7 @@
 
     move-result v3
 
-    iget v4, p0, Lokhttp3/n;->bqL:I
+    iget v4, p0, Lokhttp3/n;->bqG: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;->bqO:Ljava/util/Deque;
+    iget-object v3, p0, Lokhttp3/n;->bqJ: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;->Fj()I
+    invoke-direct {p0}, Lokhttp3/n;->Fh()I
 
     move-result v1
 
@@ -390,7 +390,7 @@
 
     check-cast v4, Lokhttp3/v$a;
 
-    invoke-direct {p0}, Lokhttp3/n;->Fh()Ljava/util/concurrent/ExecutorService;
+    invoke-direct {p0}, Lokhttp3/n;->Ff()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;->bso:Lokhttp3/v;
+    iget-object v5, v4, Lokhttp3/v$a;->bsj:Lokhttp3/v;
 
     invoke-static {v5}, Lokhttp3/v;->c(Lokhttp3/v;)Lokhttp3/p;
 
-    iget-object v5, v4, Lokhttp3/v$a;->bsp:Lokhttp3/f;
+    iget-object v5, v4, Lokhttp3/v$a;->bsk: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;->bso:Lokhttp3/v;
+    iget-object v5, v4, Lokhttp3/v$a;->bsj:Lokhttp3/v;
 
-    iget-object v5, v5, Lokhttp3/v;->bsh:Lokhttp3/t;
+    iget-object v5, v5, Lokhttp3/v;->bsc:Lokhttp3/t;
 
-    iget-object v5, v5, Lokhttp3/t;->brL:Lokhttp3/n;
+    iget-object v5, v5, Lokhttp3/t;->brG: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;->bso:Lokhttp3/v;
+    iget-object v1, v4, Lokhttp3/v$a;->bsj:Lokhttp3/v;
 
-    iget-object v1, v1, Lokhttp3/v;->bsh:Lokhttp3/t;
+    iget-object v1, v1, Lokhttp3/v;->bsc:Lokhttp3/t;
 
-    iget-object v1, v1, Lokhttp3/t;->brL:Lokhttp3/n;
+    iget-object v1, v1, Lokhttp3/t;->brG: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;->bqP:Ljava/util/Deque;
+    iget-object v0, p0, Lokhttp3/n;->bqK: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;->bqO:Ljava/util/Deque;
+    iget-object v0, p0, Lokhttp3/n;->bqJ: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;->bqP:Ljava/util/Deque;
+    iget-object v0, p0, Lokhttp3/n;->bqK: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;->bqN:Ljava/util/Deque;
+    iget-object v0, p0, Lokhttp3/n;->bqI: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;->bso:Lokhttp3/v;
+    iget-object v1, v1, Lokhttp3/v$a;->bsj:Lokhttp3/v;
 
-    iget-object v1, v1, Lokhttp3/v;->bsi:Lokhttp3/internal/c/j;
+    iget-object v1, v1, Lokhttp3/v;->bsd:Lokhttp3/internal/c/j;
 
     invoke-virtual {v1}, Lokhttp3/internal/c/j;->cancel()V
 
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/n;->bqO:Ljava/util/Deque;
+    iget-object v0, p0, Lokhttp3/n;->bqJ: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;->bso:Lokhttp3/v;
+    iget-object v1, v1, Lokhttp3/v$a;->bsj:Lokhttp3/v;
 
-    iget-object v1, v1, Lokhttp3/v;->bsi:Lokhttp3/internal/c/j;
+    iget-object v1, v1, Lokhttp3/v;->bsd:Lokhttp3/internal/c/j;
 
     invoke-virtual {v1}, Lokhttp3/internal/c/j;->cancel()V
 
     goto :goto_1
 
     :cond_1
-    iget-object v0, p0, Lokhttp3/n;->bqP:Ljava/util/Deque;
+    iget-object v0, p0, Lokhttp3/n;->bqK: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;->bsi:Lokhttp3/internal/c/j;
+    iget-object v1, v1, Lokhttp3/v;->bsd: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 13672a9f3d..02c131ed80 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 bqT:Lokhttp3/MediaType;
+.field private static final bqO:Lokhttp3/MediaType;
 
 
 # instance fields
-.field private final bqU:Ljava/util/List;
+.field private final bqP:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -26,7 +26,7 @@
     .end annotation
 .end field
 
-.field private final bqV:Ljava/util/List;
+.field private final bqQ: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;->bqT:Lokhttp3/MediaType;
+    sput-object v0, Lokhttp3/q;->bqO:Lokhttp3/MediaType;
 
     return-void
 .end method
@@ -72,13 +72,13 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lokhttp3/q;->bqU:Ljava/util/List;
+    iput-object p1, p0, Lokhttp3/q;->bqP: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;->bqV:Ljava/util/List;
+    iput-object p1, p0, Lokhttp3/q;->bqQ:Ljava/util/List;
 
     return-void
 .end method
@@ -99,14 +99,14 @@
     goto :goto_0
 
     :cond_0
-    invoke-interface {p1}, Lokio/BufferedSink;->Hf()Lokio/c;
+    invoke-interface {p1}, Lokio/BufferedSink;->Hd()Lokio/c;
 
     move-result-object p1
 
     :goto_0
     const/4 v0, 0x0
 
-    iget-object v1, p0, Lokhttp3/q;->bqU:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/q;->bqP: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;->bqU:Ljava/util/List;
+    iget-object v2, p0, Lokhttp3/q;->bqP: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;->bqV:Ljava/util/List;
+    iget-object v2, p0, Lokhttp3/q;->bqQ: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;->bqT:Lokhttp3/MediaType;
+    sget-object v0, Lokhttp3/q;->bqO:Lokhttp3/MediaType;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/okhttp3/r.smali b/com.discord/smali/okhttp3/r.smali
index 24a9946c47..84ba7fc726 100644
--- a/com.discord/smali/okhttp3/r.smali
+++ b/com.discord/smali/okhttp3/r.smali
@@ -4,11 +4,11 @@
 
 
 # instance fields
-.field private final bqY:Lokhttp3/z;
+.field private final bqT:Lokhttp3/z;
 
-.field public final bqZ:Lokhttp3/h;
+.field public final bqU:Lokhttp3/h;
 
-.field public final bra:Ljava/util/List;
+.field public final bqV:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -18,7 +18,7 @@
     .end annotation
 .end field
 
-.field private final brb:Ljava/util/List;
+.field private final bqW: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;->bqY:Lokhttp3/z;
+    iput-object p1, p0, Lokhttp3/r;->bqT:Lokhttp3/z;
 
-    iput-object p2, p0, Lokhttp3/r;->bqZ:Lokhttp3/h;
+    iput-object p2, p0, Lokhttp3/r;->bqU:Lokhttp3/h;
 
-    iput-object p3, p0, Lokhttp3/r;->bra:Ljava/util/List;
+    iput-object p3, p0, Lokhttp3/r;->bqV:Ljava/util/List;
 
-    iput-object p4, p0, Lokhttp3/r;->brb:Ljava/util/List;
+    iput-object p4, p0, Lokhttp3/r;->bqW:Ljava/util/List;
 
     return-void
 .end method
@@ -211,9 +211,9 @@
     :cond_0
     check-cast p1, Lokhttp3/r;
 
-    iget-object v0, p0, Lokhttp3/r;->bqY:Lokhttp3/z;
+    iget-object v0, p0, Lokhttp3/r;->bqT:Lokhttp3/z;
 
-    iget-object v2, p1, Lokhttp3/r;->bqY:Lokhttp3/z;
+    iget-object v2, p1, Lokhttp3/r;->bqT: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;->bqZ:Lokhttp3/h;
+    iget-object v0, p0, Lokhttp3/r;->bqU:Lokhttp3/h;
 
-    iget-object v2, p1, Lokhttp3/r;->bqZ:Lokhttp3/h;
+    iget-object v2, p1, Lokhttp3/r;->bqU: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;->bra:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/r;->bqV:Ljava/util/List;
 
-    iget-object v2, p1, Lokhttp3/r;->bra:Ljava/util/List;
+    iget-object v2, p1, Lokhttp3/r;->bqV: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;->brb:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/r;->bqW:Ljava/util/List;
 
-    iget-object p1, p1, Lokhttp3/r;->brb:Ljava/util/List;
+    iget-object p1, p1, Lokhttp3/r;->bqW: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;->bqY:Lokhttp3/z;
+    iget-object v0, p0, Lokhttp3/r;->bqT: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;->bqZ:Lokhttp3/h;
+    iget-object v1, p0, Lokhttp3/r;->bqU: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;->bra:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/r;->bqV: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;->brb:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/r;->bqW: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 7b3f6d82ac..31d307b5ad 100644
--- a/com.discord/smali/okhttp3/s$a.smali
+++ b/com.discord/smali/okhttp3/s$a.smali
@@ -15,21 +15,21 @@
 
 
 # instance fields
-.field brf:Ljava/lang/String;
+.field bra:Ljava/lang/String;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
+.field brb:Ljava/lang/String;
+    .annotation runtime Ljavax/annotation/Nullable;
+    .end annotation
+.end field
+
+.field brf:Ljava/lang/String;
+
 .field brg:Ljava/lang/String;
-    .annotation runtime Ljavax/annotation/Nullable;
-    .end annotation
-.end field
 
-.field brk:Ljava/lang/String;
-
-.field brl:Ljava/lang/String;
-
-.field final brm:Ljava/util/List;
+.field final brh:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -39,7 +39,7 @@
     .end annotation
 .end field
 
-.field brn:Ljava/util/List;
+.field bri:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -52,7 +52,7 @@
     .end annotation
 .end field
 
-.field bro:Ljava/lang/String;
+.field brj: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;->brk:Ljava/lang/String;
+    iput-object v0, p0, Lokhttp3/s$a;->brf:Ljava/lang/String;
 
-    iput-object v0, p0, Lokhttp3/s$a;->brl:Ljava/lang/String;
+    iput-object v0, p0, Lokhttp3/s$a;->brg: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;->brm:Ljava/util/List;
+    iput-object v1, p0, Lokhttp3/s$a;->brh:Ljava/util/List;
 
-    iget-object v1, p0, Lokhttp3/s$a;->brm:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/s$a;->brh: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;->brm:Ljava/util/List;
+    iget-object v3, v0, Lokhttp3/s$a;->brh: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;->brm:Ljava/util/List;
+    iget-object v3, v0, Lokhttp3/s$a;->brh:Ljava/util/List;
 
     invoke-interface {v3}, Ljava/util/List;->clear()V
 
-    iget-object v3, v0, Lokhttp3/s$a;->brm:Ljava/util/List;
+    iget-object v3, v0, Lokhttp3/s$a;->brh: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;->brm:Ljava/util/List;
+    iget-object v4, v0, Lokhttp3/s$a;->brh: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;->brm:Ljava/util/List;
+    iget-object v4, v0, Lokhttp3/s$a;->brh: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;->brm:Ljava/util/List;
+    iget-object v4, v0, Lokhttp3/s$a;->brh: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;->brm:Ljava/util/List;
+    iget-object v4, v0, Lokhttp3/s$a;->brh: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;->brm:Ljava/util/List;
+    iget-object v4, v0, Lokhttp3/s$a;->brh: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;->brm:Ljava/util/List;
+    iget-object v4, v0, Lokhttp3/s$a;->brh: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;->brm:Ljava/util/List;
+    iget-object v4, v0, Lokhttp3/s$a;->brh: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;->brm:Ljava/util/List;
+    iget-object v4, v0, Lokhttp3/s$a;->brh:Ljava/util/List;
 
     invoke-interface {v4, v5}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
@@ -595,7 +595,7 @@
 
 
 # virtual methods
-.method final Fv()I
+.method final Ft()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;->brf:Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/s$a;->bra:Ljava/lang/String;
 
     invoke-static {v0}, Lokhttp3/s;->dD(Ljava/lang/String;)I
 
@@ -616,14 +616,14 @@
     return v0
 .end method
 
-.method public final Fw()Lokhttp3/s;
+.method public final Fu()Lokhttp3/s;
     .locals 2
 
-    iget-object v0, p0, Lokhttp3/s$a;->brf:Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/s$a;->bra:Ljava/lang/String;
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lokhttp3/s$a;->brg:Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/s$a;->brb:Ljava/lang/String;
 
     if-eqz v0, :cond_0
 
@@ -661,7 +661,7 @@
 
     if-eqz p1, :cond_2
 
-    iget-object v0, p0, Lokhttp3/s$a;->brn:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/s$a;->bri: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;->brn:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/s$a;->bri:Ljava/util/List;
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/s$a;->brn:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/s$a;->bri: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;->brn:Ljava/util/List;
+    iget-object p1, p0, Lokhttp3/s$a;->bri:Ljava/util/List;
 
     if-eqz p2, :cond_1
 
@@ -741,7 +741,7 @@
 
     if-eqz p1, :cond_2
 
-    iget-object v0, p0, Lokhttp3/s$a;->brn:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/s$a;->bri: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;->brn:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/s$a;->bri:Ljava/util/List;
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/s$a;->brn:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/s$a;->bri: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;->brn:Ljava/util/List;
+    iget-object p1, p0, Lokhttp3/s$a;->bri:Ljava/util/List;
 
     if-eqz p2, :cond_1
 
@@ -871,7 +871,7 @@
 
     const-string v2, "https"
 
-    iput-object v2, v0, Lokhttp3/s$a;->brf:Ljava/lang/String;
+    iput-object v2, v0, Lokhttp3/s$a;->bra:Ljava/lang/String;
 
     add-int/lit8 v9, v9, 0x6
 
@@ -898,7 +898,7 @@
 
     const-string v2, "http"
 
-    iput-object v2, v0, Lokhttp3/s$a;->brf:Ljava/lang/String;
+    iput-object v2, v0, Lokhttp3/s$a;->bra: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;->brf:Ljava/lang/String;
+    iget-object v2, v1, Lokhttp3/s;->bra:Ljava/lang/String;
 
-    iput-object v2, v0, Lokhttp3/s$a;->brf:Ljava/lang/String;
+    iput-object v2, v0, Lokhttp3/s$a;->bra: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;->brf:Ljava/lang/String;
+    iget-object v3, v1, Lokhttp3/s;->bra:Ljava/lang/String;
 
-    iget-object v4, v0, Lokhttp3/s$a;->brf:Ljava/lang/String;
+    iget-object v4, v0, Lokhttp3/s$a;->bra: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;->Fp()Ljava/lang/String;
+    invoke-virtual/range {p1 .. p1}, Lokhttp3/s;->Fn()Ljava/lang/String;
 
     move-result-object v2
 
-    iput-object v2, v0, Lokhttp3/s$a;->brk:Ljava/lang/String;
+    iput-object v2, v0, Lokhttp3/s$a;->brf:Ljava/lang/String;
 
-    invoke-virtual/range {p1 .. p1}, Lokhttp3/s;->Fq()Ljava/lang/String;
+    invoke-virtual/range {p1 .. p1}, Lokhttp3/s;->Fo()Ljava/lang/String;
 
     move-result-object v2
 
-    iput-object v2, v0, Lokhttp3/s$a;->brl:Ljava/lang/String;
-
-    iget-object v2, v1, Lokhttp3/s;->brg:Ljava/lang/String;
-
     iput-object v2, v0, Lokhttp3/s$a;->brg:Ljava/lang/String;
 
+    iget-object v2, v1, Lokhttp3/s;->brb:Ljava/lang/String;
+
+    iput-object v2, v0, Lokhttp3/s$a;->brb: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;->brm:Ljava/util/List;
+    iget-object v2, v0, Lokhttp3/s$a;->brh:Ljava/util/List;
 
     invoke-interface {v2}, Ljava/util/List;->clear()V
 
-    iget-object v2, v0, Lokhttp3/s$a;->brm:Ljava/util/List;
+    iget-object v2, v0, Lokhttp3/s$a;->brh:Ljava/util/List;
 
-    invoke-virtual/range {p1 .. p1}, Lokhttp3/s;->Fs()Ljava/util/List;
+    invoke-virtual/range {p1 .. p1}, Lokhttp3/s;->Fq()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;->Ft()Ljava/lang/String;
+    invoke-virtual/range {p1 .. p1}, Lokhttp3/s;->Fr()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;->brk:Ljava/lang/String;
+    iget-object v3, v0, Lokhttp3/s$a;->brf: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;->brk:Ljava/lang/String;
+    iput-object v1, v0, Lokhttp3/s$a;->brf:Ljava/lang/String;
 
     if-eq v15, v12, :cond_9
 
@@ -1152,7 +1152,7 @@
 
     move-result-object v1
 
-    iput-object v1, v0, Lokhttp3/s$a;->brl:Ljava/lang/String;
+    iput-object v1, v0, Lokhttp3/s$a;->brg: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;->brl:Ljava/lang/String;
+    iget-object v1, v0, Lokhttp3/s$a;->brg: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;->brl:Ljava/lang/String;
+    iput-object v1, v0, Lokhttp3/s$a;->brg: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;->brg:Ljava/lang/String;
+    iput-object v5, v0, Lokhttp3/s$a;->brb: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;->brg:Ljava/lang/String;
+    iput-object v3, v0, Lokhttp3/s$a;->brb:Ljava/lang/String;
 
-    iget-object v3, v0, Lokhttp3/s$a;->brf:Ljava/lang/String;
+    iget-object v3, v0, Lokhttp3/s$a;->bra: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;->brg:Ljava/lang/String;
+    iget-object v3, v0, Lokhttp3/s$a;->brb:Ljava/lang/String;
 
     if-eqz v3, :cond_11
 
@@ -1343,7 +1343,7 @@
 
     move-result-object v1
 
-    iput-object v1, v0, Lokhttp3/s$a;->brn:Ljava/util/List;
+    iput-object v1, v0, Lokhttp3/s$a;->bri:Ljava/util/List;
 
     move v1, v12
 
@@ -1382,7 +1382,7 @@
 
     move-result-object v1
 
-    iput-object v1, v0, Lokhttp3/s$a;->bro:Ljava/lang/String;
+    iput-object v1, v0, Lokhttp3/s$a;->brj: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;->brn:Ljava/util/List;
+    iput-object p1, p0, Lokhttp3/s$a;->bri: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;->brf:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/s$a;->bra: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;->brk:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/s$a;->brf: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;->brl:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/s$a;->brg: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;->brk:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/s$a;->brf:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lokhttp3/s$a;->brl:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/s$a;->brg: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;->brl: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;
 
@@ -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;->brg:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/s$a;->brb: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;->brg:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/s$a;->brb: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;->brg:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/s$a;->brb: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;->brf:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/s$a;->bra:Ljava/lang/String;
 
     if-eqz v1, :cond_8
 
     :cond_6
-    invoke-virtual {p0}, Lokhttp3/s$a;->Fv()I
+    invoke-virtual {p0}, Lokhttp3/s$a;->Ft()I
 
     move-result v1
 
-    iget-object v3, p0, Lokhttp3/s$a;->brf:Ljava/lang/String;
+    iget-object v3, p0, Lokhttp3/s$a;->bra: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;->brm:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/s$a;->brh:Ljava/util/List;
 
     invoke-static {v0, v1}, Lokhttp3/s;->a(Ljava/lang/StringBuilder;Ljava/util/List;)V
 
-    iget-object v1, p0, Lokhttp3/s$a;->brn:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/s$a;->bri: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;->brn:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/s$a;->bri: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;->bro:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/s$a;->brj: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;->bro:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/s$a;->brj: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 141962eac1..31b5b902e9 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 bre:[C
+.field private static final bqZ:[C
 
 
 # instance fields
-.field public final brf:Ljava/lang/String;
+.field public final bra:Ljava/lang/String;
 
-.field public final brg:Ljava/lang/String;
+.field public final brb:Ljava/lang/String;
 
-.field public final brh:Ljava/util/List;
+.field public final brc:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -30,7 +30,7 @@
     .end annotation
 .end field
 
-.field public final bri:Ljava/util/List;
+.field public final brd:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -43,7 +43,7 @@
     .end annotation
 .end field
 
-.field private final brj:Ljava/lang/String;
+.field private final bre: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;->bre:[C
+    sput-object v0, Lokhttp3/s;->bqZ:[C
 
     return-void
 
@@ -97,12 +97,12 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
+    iget-object v0, p1, Lokhttp3/s$a;->bra:Ljava/lang/String;
+
+    iput-object v0, p0, Lokhttp3/s;->bra:Ljava/lang/String;
+
     iget-object v0, p1, Lokhttp3/s$a;->brf:Ljava/lang/String;
 
-    iput-object v0, p0, Lokhttp3/s;->brf:Ljava/lang/String;
-
-    iget-object v0, p1, Lokhttp3/s$a;->brk:Ljava/lang/String;
-
     const/4 v1, 0x0
 
     invoke-static {v0, v1}, Lokhttp3/s;->h(Ljava/lang/String;Z)Ljava/lang/String;
@@ -111,7 +111,7 @@
 
     iput-object v0, p0, Lokhttp3/s;->username:Ljava/lang/String;
 
-    iget-object v0, p1, Lokhttp3/s$a;->brl:Ljava/lang/String;
+    iget-object v0, p1, Lokhttp3/s$a;->brg: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;->brg:Ljava/lang/String;
+    iget-object v0, p1, Lokhttp3/s$a;->brb:Ljava/lang/String;
 
-    iput-object v0, p0, Lokhttp3/s;->brg:Ljava/lang/String;
+    iput-object v0, p0, Lokhttp3/s;->brb:Ljava/lang/String;
 
-    invoke-virtual {p1}, Lokhttp3/s$a;->Fv()I
+    invoke-virtual {p1}, Lokhttp3/s$a;->Ft()I
 
     move-result v0
 
     iput v0, p0, Lokhttp3/s;->port:I
 
-    iget-object v0, p1, Lokhttp3/s$a;->brm:Ljava/util/List;
+    iget-object v0, p1, Lokhttp3/s$a;->brh: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;->brh:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/s;->brc:Ljava/util/List;
 
-    iget-object v0, p1, Lokhttp3/s$a;->brn:Ljava/util/List;
+    iget-object v0, p1, Lokhttp3/s$a;->bri:Ljava/util/List;
 
     const/4 v2, 0x0
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p1, Lokhttp3/s$a;->brn:Ljava/util/List;
+    iget-object v0, p1, Lokhttp3/s$a;->bri:Ljava/util/List;
 
     const/4 v3, 0x1
 
@@ -157,20 +157,20 @@
     move-object v0, v2
 
     :goto_0
-    iput-object v0, p0, Lokhttp3/s;->bri:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/s;->brd:Ljava/util/List;
 
-    iget-object v0, p1, Lokhttp3/s$a;->bro:Ljava/lang/String;
+    iget-object v0, p1, Lokhttp3/s$a;->brj:Ljava/lang/String;
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p1, Lokhttp3/s$a;->bro:Ljava/lang/String;
+    iget-object v0, p1, Lokhttp3/s$a;->brj: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;->brj:Ljava/lang/String;
+    iput-object v2, p0, Lokhttp3/s;->bre: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;->tw:Ljava/nio/charset/Charset;
+    sget-object v14, Lokhttp3/internal/c;->tx: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;->tw:Ljava/nio/charset/Charset;
+    sget-object v15, Lokio/t;->tx: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;->Hi()Z
+    invoke-virtual {v12}, Lokio/c;->Hg()Z
 
     move-result v6
 
@@ -526,7 +526,7 @@
 
     invoke-virtual {v5, v11}, Lokio/c;->du(I)Lokio/c;
 
-    sget-object v14, Lokhttp3/s;->bre:[C
+    sget-object v14, Lokhttp3/s;->bqZ:[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;->bre:[C
+    sget-object v14, Lokhttp3/s;->bqZ:[C
 
     and-int/lit8 v6, v6, 0xf
 
@@ -559,7 +559,7 @@
     goto/16 :goto_2
 
     :cond_14
-    invoke-virtual {v5}, Lokio/c;->Ho()Ljava/lang/String;
+    invoke-virtual {v5}, Lokio/c;->Hm()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;->Ho()Ljava/lang/String;
+    invoke-virtual {v1}, Lokio/c;->Hm()Ljava/lang/String;
 
     move-result-object p0
 
@@ -1137,7 +1137,7 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lokhttp3/s$a;->Fw()Lokhttp3/s;
+    invoke-virtual {p0}, Lokhttp3/s$a;->Fu()Lokhttp3/s;
 
     move-result-object p0
 
@@ -1162,36 +1162,36 @@
 
 
 # virtual methods
-.method public final Fn()Ljava/net/URI;
+.method public final Fl()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;->brf:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/s;->bra:Ljava/lang/String;
+
+    iput-object v1, v0, Lokhttp3/s$a;->bra:Ljava/lang/String;
+
+    invoke-virtual {p0}, Lokhttp3/s;->Fn()Ljava/lang/String;
+
+    move-result-object v1
 
     iput-object v1, v0, Lokhttp3/s$a;->brf:Ljava/lang/String;
 
-    invoke-virtual {p0}, Lokhttp3/s;->Fp()Ljava/lang/String;
+    invoke-virtual {p0}, Lokhttp3/s;->Fo()Ljava/lang/String;
 
     move-result-object v1
 
-    iput-object v1, v0, Lokhttp3/s$a;->brk:Ljava/lang/String;
-
-    invoke-virtual {p0}, Lokhttp3/s;->Fq()Ljava/lang/String;
-
-    move-result-object v1
-
-    iput-object v1, v0, Lokhttp3/s$a;->brl:Ljava/lang/String;
-
-    iget-object v1, p0, Lokhttp3/s;->brg:Ljava/lang/String;
-
     iput-object v1, v0, Lokhttp3/s$a;->brg:Ljava/lang/String;
 
+    iget-object v1, p0, Lokhttp3/s;->brb:Ljava/lang/String;
+
+    iput-object v1, v0, Lokhttp3/s$a;->brb:Ljava/lang/String;
+
     iget v1, p0, Lokhttp3/s;->port:I
 
-    iget-object v2, p0, Lokhttp3/s;->brf:Ljava/lang/String;
+    iget-object v2, p0, Lokhttp3/s;->bra: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;->brm:Ljava/util/List;
+    iget-object v1, v0, Lokhttp3/s$a;->brh:Ljava/util/List;
 
     invoke-interface {v1}, Ljava/util/List;->clear()V
 
-    iget-object v1, v0, Lokhttp3/s$a;->brm:Ljava/util/List;
+    iget-object v1, v0, Lokhttp3/s$a;->brh:Ljava/util/List;
 
-    invoke-virtual {p0}, Lokhttp3/s;->Fs()Ljava/util/List;
+    invoke-virtual {p0}, Lokhttp3/s;->Fq()Ljava/util/List;
 
     move-result-object v2
 
     invoke-interface {v1, v2}, Ljava/util/List;->addAll(Ljava/util/Collection;)Z
 
-    invoke-virtual {p0}, Lokhttp3/s;->Ft()Ljava/lang/String;
+    invoke-virtual {p0}, Lokhttp3/s;->Fr()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;->brj:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/s;->bre: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;->bro:Ljava/lang/String;
+    iput-object v1, v0, Lokhttp3/s$a;->brj:Ljava/lang/String;
 
-    iget-object v1, v0, Lokhttp3/s$a;->brm:Ljava/util/List;
+    iget-object v1, v0, Lokhttp3/s$a;->brh: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;->brm:Ljava/util/List;
+    iget-object v4, v0, Lokhttp3/s$a;->brh: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;->brm:Ljava/util/List;
+    iget-object v4, v0, Lokhttp3/s$a;->brh:Ljava/util/List;
 
     const/4 v7, 0x1
 
@@ -1301,11 +1301,11 @@
     goto :goto_2
 
     :cond_2
-    iget-object v1, v0, Lokhttp3/s$a;->brn:Ljava/util/List;
+    iget-object v1, v0, Lokhttp3/s$a;->bri:Ljava/util/List;
 
     if-eqz v1, :cond_4
 
-    iget-object v1, v0, Lokhttp3/s$a;->brn:Ljava/util/List;
+    iget-object v1, v0, Lokhttp3/s$a;->bri: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;->brn:Ljava/util/List;
+    iget-object v3, v0, Lokhttp3/s$a;->bri: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;->brn:Ljava/util/List;
+    iget-object v3, v0, Lokhttp3/s$a;->bri:Ljava/util/List;
 
     const/4 v6, 0x1
 
@@ -1350,11 +1350,11 @@
     goto :goto_3
 
     :cond_4
-    iget-object v1, v0, Lokhttp3/s$a;->bro:Ljava/lang/String;
+    iget-object v1, v0, Lokhttp3/s$a;->brj:Ljava/lang/String;
 
     if-eqz v1, :cond_5
 
-    iget-object v2, v0, Lokhttp3/s$a;->bro:Ljava/lang/String;
+    iget-object v2, v0, Lokhttp3/s$a;->brj:Ljava/lang/String;
 
     const/4 v4, 0x1
 
@@ -1370,7 +1370,7 @@
 
     move-result-object v1
 
-    iput-object v1, v0, Lokhttp3/s$a;->bro:Ljava/lang/String;
+    iput-object v1, v0, Lokhttp3/s$a;->brj: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 Fo()Z
+.method public final Fm()Z
     .locals 2
 
-    iget-object v0, p0, Lokhttp3/s;->brf:Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/s;->bra:Ljava/lang/String;
 
     const-string v1, "https"
 
@@ -1434,7 +1434,7 @@
     return v0
 .end method
 
-.method public final Fp()Ljava/lang/String;
+.method public final Fn()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;->brf:Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/s;->bra:Ljava/lang/String;
 
     invoke-virtual {v0}, Ljava/lang/String;->length()I
 
@@ -1479,7 +1479,7 @@
     return-object v0
 .end method
 
-.method public final Fq()Ljava/lang/String;
+.method public final Fo()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;->brf:Ljava/lang/String;
+    iget-object v2, p0, Lokhttp3/s;->bra:Ljava/lang/String;
 
     invoke-virtual {v2}, Ljava/lang/String;->length()I
 
@@ -1530,12 +1530,12 @@
     return-object v0
 .end method
 
-.method public final Fr()Ljava/lang/String;
+.method public final Fp()Ljava/lang/String;
     .locals 4
 
     iget-object v0, p0, Lokhttp3/s;->url:Ljava/lang/String;
 
-    iget-object v1, p0, Lokhttp3/s;->brf:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/s;->bra:Ljava/lang/String;
 
     invoke-virtual {v1}, Ljava/lang/String;->length()I
 
@@ -1570,7 +1570,7 @@
     return-object v0
 .end method
 
-.method public final Fs()Ljava/util/List;
+.method public final Fq()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;->brf:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/s;->bra:Ljava/lang/String;
 
     invoke-virtual {v1}, Ljava/lang/String;->length()I
 
@@ -1640,12 +1640,12 @@
     return-object v3
 .end method
 
-.method public final Ft()Ljava/lang/String;
+.method public final Fr()Ljava/lang/String;
     .locals 4
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/s;->bri:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/s;->brd:Ljava/util/List;
 
     if-nez v0, :cond_0
 
@@ -1685,7 +1685,7 @@
     return-object v0
 .end method
 
-.method public final Fu()Ljava/lang/String;
+.method public final Fs()Ljava/lang/String;
     .locals 8
 
     const-string v0, "/..."
@@ -1710,7 +1710,7 @@
 
     move-result-object v1
 
-    iput-object v1, v0, Lokhttp3/s$a;->brk:Ljava/lang/String;
+    iput-object v1, v0, Lokhttp3/s$a;->brf:Ljava/lang/String;
 
     const-string v2, ""
 
@@ -1724,9 +1724,9 @@
 
     move-result-object v1
 
-    iput-object v1, v0, Lokhttp3/s$a;->brl:Ljava/lang/String;
+    iput-object v1, v0, Lokhttp3/s$a;->brg:Ljava/lang/String;
 
-    invoke-virtual {v0}, Lokhttp3/s$a;->Fw()Lokhttp3/s;
+    invoke-virtual {v0}, Lokhttp3/s$a;->Fu()Lokhttp3/s;
 
     move-result-object v0
 
@@ -1748,7 +1748,7 @@
 
     if-eqz p1, :cond_0
 
-    invoke-virtual {p1}, Lokhttp3/s$a;->Fw()Lokhttp3/s;
+    invoke-virtual {p1}, Lokhttp3/s$a;->Fu()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 bfb1785cbf..8cde681922 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;->bql:Ljava/util/Deque;
+    iget-object p1, p1, Lokhttp3/j;->bqg: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;->Gb()Z
+    invoke-virtual {v0}, Lokhttp3/internal/b/c;->FZ()Z
 
     move-result v1
 
     if-eqz v1, :cond_2
 
-    invoke-virtual {p3}, Lokhttp3/internal/b/g;->Gg()Lokhttp3/internal/b/c;
+    invoke-virtual {p3}, Lokhttp3/internal/b/g;->Ge()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;->brR:Lokhttp3/j;
+    iget-object p1, p3, Lokhttp3/internal/b/g;->brM: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;->buw:Lokhttp3/internal/c/c;
+    iget-object p1, p3, Lokhttp3/internal/b/g;->bur:Lokhttp3/internal/c/c;
 
     if-nez p1, :cond_5
 
-    iget-object p1, p3, Lokhttp3/internal/b/g;->but:Lokhttp3/internal/b/c;
+    iget-object p1, p3, Lokhttp3/internal/b/g;->buo:Lokhttp3/internal/b/c;
 
-    iget-object p1, p1, Lokhttp3/internal/b/c;->bud:Ljava/util/List;
+    iget-object p1, p1, Lokhttp3/internal/b/c;->btY: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;->but:Lokhttp3/internal/b/c;
+    iget-object p1, p3, Lokhttp3/internal/b/g;->buo:Lokhttp3/internal/b/c;
 
-    iget-object p1, p1, Lokhttp3/internal/b/c;->bud:Ljava/util/List;
+    iget-object p1, p1, Lokhttp3/internal/b/c;->btY:Ljava/util/List;
 
     const/4 v1, 0x0
 
@@ -169,9 +169,9 @@
 
     move-result-object p2
 
-    iput-object v0, p3, Lokhttp3/internal/b/g;->but:Lokhttp3/internal/b/c;
+    iput-object v0, p3, Lokhttp3/internal/b/g;->buo:Lokhttp3/internal/b/c;
 
-    iget-object p3, v0, Lokhttp3/internal/b/c;->bud:Ljava/util/List;
+    iget-object p3, v0, Lokhttp3/internal/b/c;->btY: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;->bql:Ljava/util/Deque;
+    iget-object p1, p1, Lokhttp3/j;->bqg: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;->bqm:Lokhttp3/internal/b/d;
+    iget-object p1, p1, Lokhttp3/j;->bqh:Lokhttp3/internal/b/d;
 
     return-object p1
 .end method
@@ -274,9 +274,9 @@
 
     check-cast p1, Lokhttp3/v;
 
-    iget-object p1, p1, Lokhttp3/v;->bsi:Lokhttp3/internal/c/j;
+    iget-object p1, p1, Lokhttp3/v;->bsd:Lokhttp3/internal/c/j;
 
-    iget-object p1, p1, Lokhttp3/internal/c/j;->buD:Lokhttp3/internal/b/g;
+    iget-object p1, p1, Lokhttp3/internal/c/j;->buy: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;->bqx:[Ljava/lang/String;
+    iget-object v0, p1, Lokhttp3/k;->bqs:[Ljava/lang/String;
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lokhttp3/h;->bnR:Ljava/util/Comparator;
+    sget-object v0, Lokhttp3/h;->bnM:Ljava/util/Comparator;
 
     invoke-virtual {p2}, Ljavax/net/ssl/SSLSocket;->getEnabledCipherSuites()[Ljava/lang/String;
 
     move-result-object v1
 
-    iget-object v2, p1, Lokhttp3/k;->bqx:[Ljava/lang/String;
+    iget-object v2, p1, Lokhttp3/k;->bqs:[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;->bqy:[Ljava/lang/String;
+    iget-object v1, p1, Lokhttp3/k;->bqt:[Ljava/lang/String;
 
     if-eqz v1, :cond_1
 
-    sget-object v1, Lokhttp3/internal/c;->aTS:Ljava/util/Comparator;
+    sget-object v1, Lokhttp3/internal/c;->aTO:Ljava/util/Comparator;
 
     invoke-virtual {p2}, Ljavax/net/ssl/SSLSocket;->getEnabledProtocols()[Ljava/lang/String;
 
     move-result-object v2
 
-    iget-object v3, p1, Lokhttp3/k;->bqy:[Ljava/lang/String;
+    iget-object v3, p1, Lokhttp3/k;->bqt:[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;->bnR:Ljava/util/Comparator;
+    sget-object v3, Lokhttp3/h;->bnM:Ljava/util/Comparator;
 
     const-string v4, "TLS_FALLBACK_SCSV"
 
@@ -431,24 +431,24 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lokhttp3/k$a;->Fg()Lokhttp3/k;
+    invoke-virtual {p1}, Lokhttp3/k$a;->Fe()Lokhttp3/k;
 
     move-result-object p1
 
-    iget-object p3, p1, Lokhttp3/k;->bqy:[Ljava/lang/String;
+    iget-object p3, p1, Lokhttp3/k;->bqt:[Ljava/lang/String;
 
     if-eqz p3, :cond_3
 
-    iget-object p3, p1, Lokhttp3/k;->bqy:[Ljava/lang/String;
+    iget-object p3, p1, Lokhttp3/k;->bqt:[Ljava/lang/String;
 
     invoke-virtual {p2, p3}, Ljavax/net/ssl/SSLSocket;->setEnabledProtocols([Ljava/lang/String;)V
 
     :cond_3
-    iget-object p3, p1, Lokhttp3/k;->bqx:[Ljava/lang/String;
+    iget-object p3, p1, Lokhttp3/k;->bqs:[Ljava/lang/String;
 
     if-eqz p3, :cond_4
 
-    iget-object p1, p1, Lokhttp3/k;->bqx:[Ljava/lang/String;
+    iget-object p1, p1, Lokhttp3/k;->bqs:[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;->bua:Z
+    iget-boolean v0, p2, Lokhttp3/internal/b/c;->btV:Z
 
     if-nez v0, :cond_3
 
-    iget v0, p1, Lokhttp3/j;->bqi:I
+    iget v0, p1, Lokhttp3/j;->bqd:I
 
     if-nez v0, :cond_2
 
@@ -509,7 +509,7 @@
 
     :cond_3
     :goto_1
-    iget-object p1, p1, Lokhttp3/j;->bql:Ljava/util/Deque;
+    iget-object p1, p1, Lokhttp3/j;->bqg: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;->bqn:Z
+    iget-boolean v0, p1, Lokhttp3/j;->bqi:Z
 
     if-nez v0, :cond_2
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p1, Lokhttp3/j;->bqn:Z
+    iput-boolean v0, p1, Lokhttp3/j;->bqi:Z
 
     sget-object v0, Lokhttp3/j;->executor:Ljava/util/concurrent/Executor;
 
-    iget-object v1, p1, Lokhttp3/j;->bqk:Ljava/lang/Runnable;
+    iget-object v1, p1, Lokhttp3/j;->bqf:Ljava/lang/Runnable;
 
     invoke-interface {v0, v1}, Ljava/util/concurrent/Executor;->execute(Ljava/lang/Runnable;)V
 
     :cond_2
-    iget-object p1, p1, Lokhttp3/j;->bql:Ljava/util/Deque;
+    iget-object p1, p1, Lokhttp3/j;->bqg: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 370bdc5883..78a5db9f04 100644
--- a/com.discord/smali/okhttp3/t$a.smali
+++ b/com.discord/smali/okhttp3/t$a.smali
@@ -15,18 +15,18 @@
 
 
 # instance fields
-.field bnN:Lokhttp3/internal/i/c;
+.field bnI:Lokhttp3/internal/i/c;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field bnl:Lokhttp3/o;
+.field bng:Lokhttp3/o;
 
-.field bnm:Ljavax/net/SocketFactory;
+.field bnh:Ljavax/net/SocketFactory;
 
-.field bnn:Lokhttp3/b;
+.field bni:Lokhttp3/b;
 
-.field bno:Ljava/util/List;
+.field bnj:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -36,7 +36,7 @@
     .end annotation
 .end field
 
-.field bnp:Ljava/util/List;
+.field bnk:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -46,25 +46,25 @@
     .end annotation
 .end field
 
-.field bnq:Ljava/net/ProxySelector;
+.field bnl:Ljava/net/ProxySelector;
 
-.field bnr:Ljava/net/Proxy;
+.field bnm:Ljava/net/Proxy;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field bns:Ljavax/net/ssl/HostnameVerifier;
+.field bnn:Ljavax/net/ssl/HostnameVerifier;
 
-.field bnt:Lokhttp3/g;
+.field bno:Lokhttp3/g;
 
-.field bnv:Lokhttp3/internal/a/e;
+.field bnq:Lokhttp3/internal/a/e;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field brL:Lokhttp3/n;
+.field brG:Lokhttp3/n;
 
-.field final brM:Ljava/util/List;
+.field final brH:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -74,7 +74,7 @@
     .end annotation
 .end field
 
-.field final brN:Ljava/util/List;
+.field final brI:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -84,32 +84,32 @@
     .end annotation
 .end field
 
-.field brO:Lokhttp3/p$a;
+.field brJ:Lokhttp3/p$a;
 
-.field brP:Lokhttp3/c;
+.field brK:Lokhttp3/c;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field brQ:Lokhttp3/b;
+.field brL:Lokhttp3/b;
 
-.field brR:Lokhttp3/j;
+.field brM:Lokhttp3/j;
 
-.field brS:Z
+.field brN:Z
 
-.field public brT:Z
+.field public brO:Z
 
-.field brU:Z
+.field brP:Z
 
-.field brV:I
+.field brQ:I
 
-.field brW:I
+.field brR:I
 
-.field brX:I
+.field brS:I
 
-.field brY:I
+.field brT:I
 
-.field brZ:I
+.field brU:I
 
 .field cookieJar:Lokhttp3/m;
 
@@ -129,43 +129,43 @@
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/t$a;->brM:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/t$a;->brH:Ljava/util/List;
 
     new-instance v0, Ljava/util/ArrayList;
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/t$a;->brN:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/t$a;->brI:Ljava/util/List;
 
     new-instance v0, Lokhttp3/n;
 
     invoke-direct {v0}, Lokhttp3/n;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/t$a;->brL:Lokhttp3/n;
+    iput-object v0, p0, Lokhttp3/t$a;->brG:Lokhttp3/n;
 
-    sget-object v0, Lokhttp3/t;->brJ:Ljava/util/List;
+    sget-object v0, Lokhttp3/t;->brE:Ljava/util/List;
 
-    iput-object v0, p0, Lokhttp3/t$a;->bno:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/t$a;->bnj:Ljava/util/List;
 
-    sget-object v0, Lokhttp3/t;->brK:Ljava/util/List;
+    sget-object v0, Lokhttp3/t;->brF:Ljava/util/List;
 
-    iput-object v0, p0, Lokhttp3/t$a;->bnp:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/t$a;->bnk:Ljava/util/List;
 
-    sget-object v0, Lokhttp3/p;->bqR:Lokhttp3/p;
+    sget-object v0, Lokhttp3/p;->bqM:Lokhttp3/p;
 
     invoke-static {v0}, Lokhttp3/p;->a(Lokhttp3/p;)Lokhttp3/p$a;
 
     move-result-object v0
 
-    iput-object v0, p0, Lokhttp3/t$a;->brO:Lokhttp3/p$a;
+    iput-object v0, p0, Lokhttp3/t$a;->brJ:Lokhttp3/p$a;
 
     invoke-static {}, Ljava/net/ProxySelector;->getDefault()Ljava/net/ProxySelector;
 
     move-result-object v0
 
-    iput-object v0, p0, Lokhttp3/t$a;->bnq:Ljava/net/ProxySelector;
+    iput-object v0, p0, Lokhttp3/t$a;->bnl:Ljava/net/ProxySelector;
 
-    iget-object v0, p0, Lokhttp3/t$a;->bnq:Ljava/net/ProxySelector;
+    iget-object v0, p0, Lokhttp3/t$a;->bnl: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;->bnq:Ljava/net/ProxySelector;
+    iput-object v0, p0, Lokhttp3/t$a;->bnl:Ljava/net/ProxySelector;
 
     :cond_0
-    sget-object v0, Lokhttp3/m;->bqJ:Lokhttp3/m;
+    sget-object v0, Lokhttp3/m;->bqE: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;->bnm:Ljavax/net/SocketFactory;
+    iput-object v0, p0, Lokhttp3/t$a;->bnh:Ljavax/net/SocketFactory;
 
-    sget-object v0, Lokhttp3/internal/i/d;->bxD:Lokhttp3/internal/i/d;
+    sget-object v0, Lokhttp3/internal/i/d;->bxy:Lokhttp3/internal/i/d;
 
-    iput-object v0, p0, Lokhttp3/t$a;->bns:Ljavax/net/ssl/HostnameVerifier;
+    iput-object v0, p0, Lokhttp3/t$a;->bnn:Ljavax/net/ssl/HostnameVerifier;
 
-    sget-object v0, Lokhttp3/g;->bnL:Lokhttp3/g;
+    sget-object v0, Lokhttp3/g;->bnG:Lokhttp3/g;
 
-    iput-object v0, p0, Lokhttp3/t$a;->bnt:Lokhttp3/g;
+    iput-object v0, p0, Lokhttp3/t$a;->bno:Lokhttp3/g;
 
-    sget-object v0, Lokhttp3/b;->bnu:Lokhttp3/b;
+    sget-object v0, Lokhttp3/b;->bnp:Lokhttp3/b;
 
-    iput-object v0, p0, Lokhttp3/t$a;->bnn:Lokhttp3/b;
+    iput-object v0, p0, Lokhttp3/t$a;->bni:Lokhttp3/b;
 
-    sget-object v0, Lokhttp3/b;->bnu:Lokhttp3/b;
+    sget-object v0, Lokhttp3/b;->bnp:Lokhttp3/b;
 
-    iput-object v0, p0, Lokhttp3/t$a;->brQ:Lokhttp3/b;
+    iput-object v0, p0, Lokhttp3/t$a;->brL:Lokhttp3/b;
 
     new-instance v0, Lokhttp3/j;
 
     invoke-direct {v0}, Lokhttp3/j;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/t$a;->brR:Lokhttp3/j;
+    iput-object v0, p0, Lokhttp3/t$a;->brM:Lokhttp3/j;
 
-    sget-object v0, Lokhttp3/o;->bqQ:Lokhttp3/o;
+    sget-object v0, Lokhttp3/o;->bqL:Lokhttp3/o;
 
-    iput-object v0, p0, Lokhttp3/t$a;->bnl:Lokhttp3/o;
+    iput-object v0, p0, Lokhttp3/t$a;->bng:Lokhttp3/o;
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lokhttp3/t$a;->brS:Z
+    iput-boolean v0, p0, Lokhttp3/t$a;->brN:Z
 
-    iput-boolean v0, p0, Lokhttp3/t$a;->brT:Z
+    iput-boolean v0, p0, Lokhttp3/t$a;->brO:Z
 
-    iput-boolean v0, p0, Lokhttp3/t$a;->brU:Z
+    iput-boolean v0, p0, Lokhttp3/t$a;->brP:Z
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lokhttp3/t$a;->brV:I
+    iput v0, p0, Lokhttp3/t$a;->brQ:I
 
     const/16 v1, 0x2710
 
-    iput v1, p0, Lokhttp3/t$a;->brW:I
+    iput v1, p0, Lokhttp3/t$a;->brR:I
 
-    iput v1, p0, Lokhttp3/t$a;->brX:I
+    iput v1, p0, Lokhttp3/t$a;->brS:I
 
-    iput v1, p0, Lokhttp3/t$a;->brY:I
+    iput v1, p0, Lokhttp3/t$a;->brT:I
 
-    iput v0, p0, Lokhttp3/t$a;->brZ:I
+    iput v0, p0, Lokhttp3/t$a;->brU:I
 
     return-void
 .end method
@@ -246,136 +246,136 @@
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/t$a;->brM:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/t$a;->brH:Ljava/util/List;
 
     new-instance v0, Ljava/util/ArrayList;
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/t$a;->brN:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/t$a;->brI:Ljava/util/List;
 
-    iget-object v0, p1, Lokhttp3/t;->brL:Lokhttp3/n;
+    iget-object v0, p1, Lokhttp3/t;->brG:Lokhttp3/n;
 
-    iput-object v0, p0, Lokhttp3/t$a;->brL:Lokhttp3/n;
+    iput-object v0, p0, Lokhttp3/t$a;->brG:Lokhttp3/n;
 
-    iget-object v0, p1, Lokhttp3/t;->bnr:Ljava/net/Proxy;
+    iget-object v0, p1, Lokhttp3/t;->bnm:Ljava/net/Proxy;
 
-    iput-object v0, p0, Lokhttp3/t$a;->bnr:Ljava/net/Proxy;
+    iput-object v0, p0, Lokhttp3/t$a;->bnm:Ljava/net/Proxy;
 
-    iget-object v0, p1, Lokhttp3/t;->bno:Ljava/util/List;
+    iget-object v0, p1, Lokhttp3/t;->bnj:Ljava/util/List;
 
-    iput-object v0, p0, Lokhttp3/t$a;->bno:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/t$a;->bnj:Ljava/util/List;
 
-    iget-object v0, p1, Lokhttp3/t;->bnp:Ljava/util/List;
+    iget-object v0, p1, Lokhttp3/t;->bnk:Ljava/util/List;
 
-    iput-object v0, p0, Lokhttp3/t$a;->bnp:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/t$a;->bnk:Ljava/util/List;
 
-    iget-object v0, p0, Lokhttp3/t$a;->brM:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/t$a;->brH:Ljava/util/List;
 
-    iget-object v1, p1, Lokhttp3/t;->brM:Ljava/util/List;
+    iget-object v1, p1, Lokhttp3/t;->brH:Ljava/util/List;
 
     invoke-interface {v0, v1}, Ljava/util/List;->addAll(Ljava/util/Collection;)Z
 
-    iget-object v0, p0, Lokhttp3/t$a;->brN:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/t$a;->brI:Ljava/util/List;
 
-    iget-object v1, p1, Lokhttp3/t;->brN:Ljava/util/List;
+    iget-object v1, p1, Lokhttp3/t;->brI:Ljava/util/List;
 
     invoke-interface {v0, v1}, Ljava/util/List;->addAll(Ljava/util/Collection;)Z
 
-    iget-object v0, p1, Lokhttp3/t;->brO:Lokhttp3/p$a;
+    iget-object v0, p1, Lokhttp3/t;->brJ:Lokhttp3/p$a;
 
-    iput-object v0, p0, Lokhttp3/t$a;->brO:Lokhttp3/p$a;
+    iput-object v0, p0, Lokhttp3/t$a;->brJ:Lokhttp3/p$a;
 
-    iget-object v0, p1, Lokhttp3/t;->bnq:Ljava/net/ProxySelector;
+    iget-object v0, p1, Lokhttp3/t;->bnl:Ljava/net/ProxySelector;
 
-    iput-object v0, p0, Lokhttp3/t$a;->bnq:Ljava/net/ProxySelector;
+    iput-object v0, p0, Lokhttp3/t$a;->bnl: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;->bnv:Lokhttp3/internal/a/e;
+    iget-object v0, p1, Lokhttp3/t;->bnq:Lokhttp3/internal/a/e;
 
-    iput-object v0, p0, Lokhttp3/t$a;->bnv:Lokhttp3/internal/a/e;
+    iput-object v0, p0, Lokhttp3/t$a;->bnq:Lokhttp3/internal/a/e;
 
-    iget-object v0, p1, Lokhttp3/t;->brP:Lokhttp3/c;
+    iget-object v0, p1, Lokhttp3/t;->brK:Lokhttp3/c;
 
-    iput-object v0, p0, Lokhttp3/t$a;->brP:Lokhttp3/c;
+    iput-object v0, p0, Lokhttp3/t$a;->brK:Lokhttp3/c;
 
-    iget-object v0, p1, Lokhttp3/t;->bnm:Ljavax/net/SocketFactory;
+    iget-object v0, p1, Lokhttp3/t;->bnh:Ljavax/net/SocketFactory;
 
-    iput-object v0, p0, Lokhttp3/t$a;->bnm:Ljavax/net/SocketFactory;
+    iput-object v0, p0, Lokhttp3/t$a;->bnh: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;->bnN:Lokhttp3/internal/i/c;
+    iget-object v0, p1, Lokhttp3/t;->bnI:Lokhttp3/internal/i/c;
 
-    iput-object v0, p0, Lokhttp3/t$a;->bnN:Lokhttp3/internal/i/c;
+    iput-object v0, p0, Lokhttp3/t$a;->bnI:Lokhttp3/internal/i/c;
 
-    iget-object v0, p1, Lokhttp3/t;->bns:Ljavax/net/ssl/HostnameVerifier;
+    iget-object v0, p1, Lokhttp3/t;->bnn:Ljavax/net/ssl/HostnameVerifier;
 
-    iput-object v0, p0, Lokhttp3/t$a;->bns:Ljavax/net/ssl/HostnameVerifier;
+    iput-object v0, p0, Lokhttp3/t$a;->bnn:Ljavax/net/ssl/HostnameVerifier;
 
-    iget-object v0, p1, Lokhttp3/t;->bnt:Lokhttp3/g;
+    iget-object v0, p1, Lokhttp3/t;->bno:Lokhttp3/g;
 
-    iput-object v0, p0, Lokhttp3/t$a;->bnt:Lokhttp3/g;
+    iput-object v0, p0, Lokhttp3/t$a;->bno:Lokhttp3/g;
 
-    iget-object v0, p1, Lokhttp3/t;->bnn:Lokhttp3/b;
+    iget-object v0, p1, Lokhttp3/t;->bni:Lokhttp3/b;
 
-    iput-object v0, p0, Lokhttp3/t$a;->bnn:Lokhttp3/b;
+    iput-object v0, p0, Lokhttp3/t$a;->bni:Lokhttp3/b;
 
-    iget-object v0, p1, Lokhttp3/t;->brQ:Lokhttp3/b;
+    iget-object v0, p1, Lokhttp3/t;->brL:Lokhttp3/b;
 
-    iput-object v0, p0, Lokhttp3/t$a;->brQ:Lokhttp3/b;
+    iput-object v0, p0, Lokhttp3/t$a;->brL:Lokhttp3/b;
 
-    iget-object v0, p1, Lokhttp3/t;->brR:Lokhttp3/j;
+    iget-object v0, p1, Lokhttp3/t;->brM:Lokhttp3/j;
 
-    iput-object v0, p0, Lokhttp3/t$a;->brR:Lokhttp3/j;
+    iput-object v0, p0, Lokhttp3/t$a;->brM:Lokhttp3/j;
 
-    iget-object v0, p1, Lokhttp3/t;->bnl:Lokhttp3/o;
+    iget-object v0, p1, Lokhttp3/t;->bng:Lokhttp3/o;
 
-    iput-object v0, p0, Lokhttp3/t$a;->bnl:Lokhttp3/o;
+    iput-object v0, p0, Lokhttp3/t$a;->bng:Lokhttp3/o;
 
-    iget-boolean v0, p1, Lokhttp3/t;->brS:Z
+    iget-boolean v0, p1, Lokhttp3/t;->brN:Z
 
-    iput-boolean v0, p0, Lokhttp3/t$a;->brS:Z
+    iput-boolean v0, p0, Lokhttp3/t$a;->brN:Z
 
-    iget-boolean v0, p1, Lokhttp3/t;->brT:Z
+    iget-boolean v0, p1, Lokhttp3/t;->brO:Z
 
-    iput-boolean v0, p0, Lokhttp3/t$a;->brT:Z
+    iput-boolean v0, p0, Lokhttp3/t$a;->brO:Z
 
-    iget-boolean v0, p1, Lokhttp3/t;->brU:Z
+    iget-boolean v0, p1, Lokhttp3/t;->brP:Z
 
-    iput-boolean v0, p0, Lokhttp3/t$a;->brU:Z
+    iput-boolean v0, p0, Lokhttp3/t$a;->brP:Z
 
-    iget v0, p1, Lokhttp3/t;->brV:I
+    iget v0, p1, Lokhttp3/t;->brQ:I
 
-    iput v0, p0, Lokhttp3/t$a;->brV:I
+    iput v0, p0, Lokhttp3/t$a;->brQ:I
 
-    iget v0, p1, Lokhttp3/t;->brW:I
+    iget v0, p1, Lokhttp3/t;->brR:I
 
-    iput v0, p0, Lokhttp3/t$a;->brW:I
+    iput v0, p0, Lokhttp3/t$a;->brR:I
 
-    iget v0, p1, Lokhttp3/t;->brX:I
+    iget v0, p1, Lokhttp3/t;->brS:I
 
-    iput v0, p0, Lokhttp3/t$a;->brX:I
+    iput v0, p0, Lokhttp3/t$a;->brS:I
 
-    iget v0, p1, Lokhttp3/t;->brY:I
+    iget v0, p1, Lokhttp3/t;->brT:I
 
-    iput v0, p0, Lokhttp3/t$a;->brY:I
+    iput v0, p0, Lokhttp3/t$a;->brT:I
 
-    iget p1, p1, Lokhttp3/t;->brZ:I
+    iget p1, p1, Lokhttp3/t;->brU:I
 
-    iput p1, p0, Lokhttp3/t$a;->brZ:I
+    iput p1, p0, Lokhttp3/t$a;->brU:I
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final FD()Lokhttp3/t;
+.method public final FB()Lokhttp3/t;
     .locals 1
 
     new-instance v0, Lokhttp3/t;
@@ -394,7 +394,7 @@
 
     move-result p1
 
-    iput p1, p0, Lokhttp3/t$a;->brW:I
+    iput p1, p0, Lokhttp3/t$a;->brR: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;->GT()Lokhttp3/internal/g/f;
+    invoke-static {}, Lokhttp3/internal/g/f;->GR()Lokhttp3/internal/g/f;
 
     move-result-object v0
 
@@ -414,7 +414,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lokhttp3/t$a;->bnN:Lokhttp3/internal/i/c;
+    iput-object p1, p0, Lokhttp3/t$a;->bnI:Lokhttp3/internal/i/c;
 
     return-object p0
 
@@ -433,7 +433,7 @@
 
     if-eqz p1, :cond_0
 
-    iget-object v0, p0, Lokhttp3/t$a;->brM:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/t$a;->brH: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;->brX:I
+    iput p1, p0, Lokhttp3/t$a;->brS:I
 
     return-object p0
 .end method
@@ -491,7 +491,7 @@
 
     move-result p1
 
-    iput p1, p0, Lokhttp3/t$a;->brY:I
+    iput p1, p0, Lokhttp3/t$a;->brT:I
 
     return-object p0
 .end method
diff --git a/com.discord/smali/okhttp3/t.smali b/com.discord/smali/okhttp3/t.smali
index 5bdb568975..aefdf7374f 100644
--- a/com.discord/smali/okhttp3/t.smali
+++ b/com.discord/smali/okhttp3/t.smali
@@ -16,7 +16,7 @@
 
 
 # static fields
-.field static final brJ:Ljava/util/List;
+.field static final brE:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -26,7 +26,7 @@
     .end annotation
 .end field
 
-.field static final brK:Ljava/util/List;
+.field static final brF:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -38,15 +38,15 @@
 
 
 # instance fields
-.field final bnN:Lokhttp3/internal/i/c;
+.field final bnI:Lokhttp3/internal/i/c;
 
-.field public final bnl:Lokhttp3/o;
+.field public final bng:Lokhttp3/o;
 
-.field public final bnm:Ljavax/net/SocketFactory;
+.field public final bnh:Ljavax/net/SocketFactory;
 
-.field public final bnn:Lokhttp3/b;
+.field public final bni:Lokhttp3/b;
 
-.field public final bno:Ljava/util/List;
+.field public final bnj:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -56,7 +56,7 @@
     .end annotation
 .end field
 
-.field public final bnp:Ljava/util/List;
+.field public final bnk:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -66,25 +66,25 @@
     .end annotation
 .end field
 
-.field public final bnq:Ljava/net/ProxySelector;
+.field public final bnl:Ljava/net/ProxySelector;
 
-.field public final bnr:Ljava/net/Proxy;
+.field public final bnm:Ljava/net/Proxy;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public final bns:Ljavax/net/ssl/HostnameVerifier;
+.field public final bnn:Ljavax/net/ssl/HostnameVerifier;
 
-.field public final bnt:Lokhttp3/g;
+.field public final bno:Lokhttp3/g;
 
-.field final bnv:Lokhttp3/internal/a/e;
+.field final bnq:Lokhttp3/internal/a/e;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public final brL:Lokhttp3/n;
+.field public final brG:Lokhttp3/n;
 
-.field final brM:Ljava/util/List;
+.field final brH:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -94,7 +94,7 @@
     .end annotation
 .end field
 
-.field final brN:Ljava/util/List;
+.field final brI:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -104,32 +104,32 @@
     .end annotation
 .end field
 
-.field final brO:Lokhttp3/p$a;
+.field final brJ:Lokhttp3/p$a;
 
-.field final brP:Lokhttp3/c;
+.field final brK:Lokhttp3/c;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public final brQ:Lokhttp3/b;
+.field public final brL:Lokhttp3/b;
 
-.field public final brR:Lokhttp3/j;
+.field public final brM:Lokhttp3/j;
 
-.field public final brS:Z
+.field public final brN:Z
 
-.field public final brT:Z
+.field public final brO:Z
 
-.field public final brU:Z
+.field public final brP:Z
 
-.field final brV:I
+.field final brQ:I
 
-.field final brW:I
+.field final brR:I
 
-.field final brX:I
+.field final brS:I
 
-.field final brY:I
+.field final brT:I
 
-.field public final brZ:I
+.field public final brU:I
 
 .field public final cookieJar:Lokhttp3/m;
 
@@ -144,13 +144,13 @@
 
     new-array v1, v0, [Lokhttp3/u;
 
-    sget-object v2, Lokhttp3/u;->bsd:Lokhttp3/u;
+    sget-object v2, Lokhttp3/u;->brY:Lokhttp3/u;
 
     const/4 v3, 0x0
 
     aput-object v2, v1, v3
 
-    sget-object v2, Lokhttp3/u;->bsb:Lokhttp3/u;
+    sget-object v2, Lokhttp3/u;->brW:Lokhttp3/u;
 
     const/4 v4, 0x1
 
@@ -160,15 +160,15 @@
 
     move-result-object v1
 
-    sput-object v1, Lokhttp3/t;->brJ:Ljava/util/List;
+    sput-object v1, Lokhttp3/t;->brE:Ljava/util/List;
 
     new-array v0, v0, [Lokhttp3/k;
 
-    sget-object v1, Lokhttp3/k;->bqs:Lokhttp3/k;
+    sget-object v1, Lokhttp3/k;->bqn:Lokhttp3/k;
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lokhttp3/k;->bqu:Lokhttp3/k;
+    sget-object v1, Lokhttp3/k;->bqp:Lokhttp3/k;
 
     aput-object v1, v0, v4
 
@@ -176,13 +176,13 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/t;->brK:Ljava/util/List;
+    sput-object v0, Lokhttp3/t;->brF:Ljava/util/List;
 
     new-instance v0, Lokhttp3/t$1;
 
     invoke-direct {v0}, Lokhttp3/t$1;-><init>()V
 
-    sput-object v0, Lokhttp3/internal/a;->bsV:Lokhttp3/internal/a;
+    sput-object v0, Lokhttp3/internal/a;->bsQ: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;->brL:Lokhttp3/n;
+    iget-object v0, p1, Lokhttp3/t$a;->brG:Lokhttp3/n;
 
-    iput-object v0, p0, Lokhttp3/t;->brL:Lokhttp3/n;
+    iput-object v0, p0, Lokhttp3/t;->brG:Lokhttp3/n;
 
-    iget-object v0, p1, Lokhttp3/t$a;->bnr:Ljava/net/Proxy;
+    iget-object v0, p1, Lokhttp3/t$a;->bnm:Ljava/net/Proxy;
 
-    iput-object v0, p0, Lokhttp3/t;->bnr:Ljava/net/Proxy;
+    iput-object v0, p0, Lokhttp3/t;->bnm:Ljava/net/Proxy;
 
-    iget-object v0, p1, Lokhttp3/t$a;->bno:Ljava/util/List;
+    iget-object v0, p1, Lokhttp3/t$a;->bnj:Ljava/util/List;
 
-    iput-object v0, p0, Lokhttp3/t;->bno:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/t;->bnj:Ljava/util/List;
 
-    iget-object v0, p1, Lokhttp3/t$a;->bnp:Ljava/util/List;
+    iget-object v0, p1, Lokhttp3/t$a;->bnk:Ljava/util/List;
 
-    iput-object v0, p0, Lokhttp3/t;->bnp:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/t;->bnk:Ljava/util/List;
 
-    iget-object v0, p1, Lokhttp3/t$a;->brM:Ljava/util/List;
+    iget-object v0, p1, Lokhttp3/t$a;->brH: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;->brM:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/t;->brH:Ljava/util/List;
 
-    iget-object v0, p1, Lokhttp3/t$a;->brN:Ljava/util/List;
+    iget-object v0, p1, Lokhttp3/t$a;->brI: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;->brN:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/t;->brI:Ljava/util/List;
 
-    iget-object v0, p1, Lokhttp3/t$a;->brO:Lokhttp3/p$a;
+    iget-object v0, p1, Lokhttp3/t$a;->brJ:Lokhttp3/p$a;
 
-    iput-object v0, p0, Lokhttp3/t;->brO:Lokhttp3/p$a;
+    iput-object v0, p0, Lokhttp3/t;->brJ:Lokhttp3/p$a;
 
-    iget-object v0, p1, Lokhttp3/t$a;->bnq:Ljava/net/ProxySelector;
+    iget-object v0, p1, Lokhttp3/t$a;->bnl:Ljava/net/ProxySelector;
 
-    iput-object v0, p0, Lokhttp3/t;->bnq:Ljava/net/ProxySelector;
+    iput-object v0, p0, Lokhttp3/t;->bnl: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;->brP:Lokhttp3/c;
+    iget-object v0, p1, Lokhttp3/t$a;->brK:Lokhttp3/c;
 
-    iput-object v0, p0, Lokhttp3/t;->brP:Lokhttp3/c;
+    iput-object v0, p0, Lokhttp3/t;->brK:Lokhttp3/c;
 
-    iget-object v0, p1, Lokhttp3/t$a;->bnv:Lokhttp3/internal/a/e;
+    iget-object v0, p1, Lokhttp3/t$a;->bnq:Lokhttp3/internal/a/e;
 
-    iput-object v0, p0, Lokhttp3/t;->bnv:Lokhttp3/internal/a/e;
+    iput-object v0, p0, Lokhttp3/t;->bnq:Lokhttp3/internal/a/e;
 
-    iget-object v0, p1, Lokhttp3/t$a;->bnm:Ljavax/net/SocketFactory;
+    iget-object v0, p1, Lokhttp3/t$a;->bnh:Ljavax/net/SocketFactory;
 
-    iput-object v0, p0, Lokhttp3/t;->bnm:Ljavax/net/SocketFactory;
+    iput-object v0, p0, Lokhttp3/t;->bnh:Ljavax/net/SocketFactory;
 
-    iget-object v0, p0, Lokhttp3/t;->bnp:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/t;->bnk: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;->bqv:Z
+    iget-boolean v2, v3, Lokhttp3/k;->bqq:Z
 
     if-eqz v2, :cond_0
 
@@ -305,7 +305,7 @@
     goto :goto_1
 
     :cond_3
-    invoke-static {}, Lokhttp3/internal/c;->FU()Ljavax/net/ssl/X509TrustManager;
+    invoke-static {}, Lokhttp3/internal/c;->FS()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;->GT()Lokhttp3/internal/g/f;
+    invoke-static {}, Lokhttp3/internal/g/f;->GR()Lokhttp3/internal/g/f;
 
     move-result-object v1
 
@@ -323,7 +323,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lokhttp3/t;->bnN:Lokhttp3/internal/i/c;
+    iput-object v0, p0, Lokhttp3/t;->bnI: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;->bnN:Lokhttp3/internal/i/c;
+    iget-object v0, p1, Lokhttp3/t$a;->bnI:Lokhttp3/internal/i/c;
 
-    iput-object v0, p0, Lokhttp3/t;->bnN:Lokhttp3/internal/i/c;
+    iput-object v0, p0, Lokhttp3/t;->bnI: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;->GT()Lokhttp3/internal/g/f;
+    invoke-static {}, Lokhttp3/internal/g/f;->GR()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;->bns:Ljavax/net/ssl/HostnameVerifier;
+    iget-object v0, p1, Lokhttp3/t$a;->bnn:Ljavax/net/ssl/HostnameVerifier;
 
-    iput-object v0, p0, Lokhttp3/t;->bns:Ljavax/net/ssl/HostnameVerifier;
+    iput-object v0, p0, Lokhttp3/t;->bnn:Ljavax/net/ssl/HostnameVerifier;
 
-    iget-object v0, p1, Lokhttp3/t$a;->bnt:Lokhttp3/g;
+    iget-object v0, p1, Lokhttp3/t$a;->bno:Lokhttp3/g;
 
-    iget-object v1, p0, Lokhttp3/t;->bnN:Lokhttp3/internal/i/c;
+    iget-object v1, p0, Lokhttp3/t;->bnI:Lokhttp3/internal/i/c;
 
-    iget-object v2, v0, Lokhttp3/g;->bnN:Lokhttp3/internal/i/c;
+    iget-object v2, v0, Lokhttp3/g;->bnI: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;->bnM:Ljava/util/Set;
+    iget-object v0, v0, Lokhttp3/g;->bnH: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;->bnt:Lokhttp3/g;
+    iput-object v0, p0, Lokhttp3/t;->bno:Lokhttp3/g;
 
-    iget-object v0, p1, Lokhttp3/t$a;->bnn:Lokhttp3/b;
+    iget-object v0, p1, Lokhttp3/t$a;->bni:Lokhttp3/b;
 
-    iput-object v0, p0, Lokhttp3/t;->bnn:Lokhttp3/b;
+    iput-object v0, p0, Lokhttp3/t;->bni:Lokhttp3/b;
 
-    iget-object v0, p1, Lokhttp3/t$a;->brQ:Lokhttp3/b;
+    iget-object v0, p1, Lokhttp3/t$a;->brL:Lokhttp3/b;
 
-    iput-object v0, p0, Lokhttp3/t;->brQ:Lokhttp3/b;
+    iput-object v0, p0, Lokhttp3/t;->brL:Lokhttp3/b;
 
-    iget-object v0, p1, Lokhttp3/t$a;->brR:Lokhttp3/j;
+    iget-object v0, p1, Lokhttp3/t$a;->brM:Lokhttp3/j;
 
-    iput-object v0, p0, Lokhttp3/t;->brR:Lokhttp3/j;
+    iput-object v0, p0, Lokhttp3/t;->brM:Lokhttp3/j;
 
-    iget-object v0, p1, Lokhttp3/t$a;->bnl:Lokhttp3/o;
+    iget-object v0, p1, Lokhttp3/t$a;->bng:Lokhttp3/o;
 
-    iput-object v0, p0, Lokhttp3/t;->bnl:Lokhttp3/o;
+    iput-object v0, p0, Lokhttp3/t;->bng:Lokhttp3/o;
 
-    iget-boolean v0, p1, Lokhttp3/t$a;->brS:Z
+    iget-boolean v0, p1, Lokhttp3/t$a;->brN:Z
 
-    iput-boolean v0, p0, Lokhttp3/t;->brS:Z
+    iput-boolean v0, p0, Lokhttp3/t;->brN:Z
 
-    iget-boolean v0, p1, Lokhttp3/t$a;->brT:Z
+    iget-boolean v0, p1, Lokhttp3/t$a;->brO:Z
 
-    iput-boolean v0, p0, Lokhttp3/t;->brT:Z
+    iput-boolean v0, p0, Lokhttp3/t;->brO:Z
 
-    iget-boolean v0, p1, Lokhttp3/t$a;->brU:Z
+    iget-boolean v0, p1, Lokhttp3/t$a;->brP:Z
 
-    iput-boolean v0, p0, Lokhttp3/t;->brU:Z
+    iput-boolean v0, p0, Lokhttp3/t;->brP:Z
 
-    iget v0, p1, Lokhttp3/t$a;->brV:I
+    iget v0, p1, Lokhttp3/t$a;->brQ:I
 
-    iput v0, p0, Lokhttp3/t;->brV:I
+    iput v0, p0, Lokhttp3/t;->brQ:I
 
-    iget v0, p1, Lokhttp3/t$a;->brW:I
+    iget v0, p1, Lokhttp3/t$a;->brR:I
 
-    iput v0, p0, Lokhttp3/t;->brW:I
+    iput v0, p0, Lokhttp3/t;->brR:I
 
-    iget v0, p1, Lokhttp3/t$a;->brX:I
+    iget v0, p1, Lokhttp3/t$a;->brS:I
 
-    iput v0, p0, Lokhttp3/t;->brX:I
+    iput v0, p0, Lokhttp3/t;->brS:I
 
-    iget v0, p1, Lokhttp3/t$a;->brY:I
+    iget v0, p1, Lokhttp3/t$a;->brT:I
 
-    iput v0, p0, Lokhttp3/t;->brY:I
+    iput v0, p0, Lokhttp3/t;->brT:I
 
-    iget p1, p1, Lokhttp3/t$a;->brZ:I
+    iget p1, p1, Lokhttp3/t$a;->brU:I
 
-    iput p1, p0, Lokhttp3/t;->brZ:I
+    iput p1, p0, Lokhttp3/t;->brU:I
 
-    iget-object p1, p0, Lokhttp3/t;->brM:Ljava/util/List;
+    iget-object p1, p0, Lokhttp3/t;->brH:Ljava/util/List;
 
     const/4 v0, 0x0
 
@@ -439,7 +439,7 @@
 
     if-nez p1, :cond_8
 
-    iget-object p1, p0, Lokhttp3/t;->brN:Ljava/util/List;
+    iget-object p1, p0, Lokhttp3/t;->brI: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;->brN:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/t;->brI: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;->brM:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/t;->brH: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;->GT()Lokhttp3/internal/g/f;
+    invoke-static {}, Lokhttp3/internal/g/f;->GR()Lokhttp3/internal/g/f;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokhttp3/internal/g/f;->GO()Ljavax/net/ssl/SSLContext;
+    invoke-virtual {v0}, Lokhttp3/internal/g/f;->GM()Ljavax/net/ssl/SSLContext;
 
     move-result-object v0
 
@@ -544,19 +544,19 @@
 
 
 # virtual methods
-.method final FC()Lokhttp3/internal/a/e;
+.method final FA()Lokhttp3/internal/a/e;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/t;->brP:Lokhttp3/c;
+    iget-object v0, p0, Lokhttp3/t;->brK:Lokhttp3/c;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, v0, Lokhttp3/c;->bnv:Lokhttp3/internal/a/e;
+    iget-object v0, v0, Lokhttp3/c;->bnq:Lokhttp3/internal/a/e;
 
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/t;->bnv:Lokhttp3/internal/a/e;
+    iget-object v0, p0, Lokhttp3/t;->bnq: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;->brZ:I
+    iget v0, p0, Lokhttp3/t;->brU: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;->bqR:Lokhttp3/p;
+    sget-object p2, Lokhttp3/p;->bqM:Lokhttp3/p;
 
     if-eqz p2, :cond_6
 
@@ -594,15 +594,15 @@
 
     move-result-object p2
 
-    iput-object p2, p1, Lokhttp3/t$a;->brO:Lokhttp3/p$a;
+    iput-object p2, p1, Lokhttp3/t$a;->brJ:Lokhttp3/p$a;
 
-    sget-object p2, Lokhttp3/internal/j/a;->bxE:Ljava/util/List;
+    sget-object p2, Lokhttp3/internal/j/a;->bxz: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;->bse:Lokhttp3/u;
+    sget-object p2, Lokhttp3/u;->brZ: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;->bsb:Lokhttp3/u;
+    sget-object p2, Lokhttp3/u;->brW: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;->bse:Lokhttp3/u;
+    sget-object p2, Lokhttp3/u;->brZ: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;->bsa:Lokhttp3/u;
+    sget-object p2, Lokhttp3/u;->brV: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;->bsc:Lokhttp3/u;
+    sget-object p2, Lokhttp3/u;->brX: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;->bno:Ljava/util/List;
+    iput-object p2, p1, Lokhttp3/t$a;->bnj:Ljava/util/List;
 
-    invoke-virtual {p1}, Lokhttp3/t$a;->FD()Lokhttp3/t;
+    invoke-virtual {p1}, Lokhttp3/t$a;->FB()Lokhttp3/t;
 
     move-result-object p1
 
-    iget-object p2, v6, Lokhttp3/internal/j/a;->bsl:Lokhttp3/w;
+    iget-object p2, v6, Lokhttp3/internal/j/a;->bsg:Lokhttp3/w;
 
-    invoke-virtual {p2}, Lokhttp3/w;->FL()Lokhttp3/w$a;
+    invoke-virtual {p2}, Lokhttp3/w;->FJ()Lokhttp3/w$a;
 
     move-result-object p2
 
@@ -742,27 +742,27 @@
 
     move-result-object p2
 
-    invoke-virtual {p2}, Lokhttp3/w$a;->FN()Lokhttp3/w;
+    invoke-virtual {p2}, Lokhttp3/w$a;->FL()Lokhttp3/w;
 
     move-result-object p2
 
-    sget-object v0, Lokhttp3/internal/a;->bsV:Lokhttp3/internal/a;
+    sget-object v0, Lokhttp3/internal/a;->bsQ: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;->bui:Lokhttp3/e;
+    iput-object p1, v6, Lokhttp3/internal/j/a;->bud:Lokhttp3/e;
 
-    iget-object p1, v6, Lokhttp3/internal/j/a;->bui:Lokhttp3/e;
+    iget-object p1, v6, Lokhttp3/internal/j/a;->bud:Lokhttp3/e;
 
     invoke-interface {p1}, Lokhttp3/e;->timeout()Lokio/s;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lokio/s;->HF()Lokio/s;
+    invoke-virtual {p1}, Lokio/s;->HD()Lokio/s;
 
-    iget-object p1, v6, Lokhttp3/internal/j/a;->bui:Lokhttp3/e;
+    iget-object p1, v6, Lokhttp3/internal/j/a;->bud: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 dc1e8a4274..b63e11c235 100644
--- a/com.discord/smali/okhttp3/v.smali
+++ b/com.discord/smali/okhttp3/v.smali
@@ -15,22 +15,22 @@
 
 
 # instance fields
-.field final bsh:Lokhttp3/t;
+.field final bsc:Lokhttp3/t;
 
-.field final bsi:Lokhttp3/internal/c/j;
+.field final bsd:Lokhttp3/internal/c/j;
 
-.field final bsj:Lokio/a;
+.field final bse:Lokio/a;
 
-.field private bsk:Lokhttp3/p;
+.field private bsf:Lokhttp3/p;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field final bsl:Lokhttp3/w;
+.field final bsg:Lokhttp3/w;
 
-.field final bsm:Z
+.field final bsh:Z
 
-.field private bsn:Z
+.field private bsi:Z
 
 
 # direct methods
@@ -39,27 +39,27 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/v;->bsh:Lokhttp3/t;
+    iput-object p1, p0, Lokhttp3/v;->bsc:Lokhttp3/t;
 
-    iput-object p2, p0, Lokhttp3/v;->bsl:Lokhttp3/w;
+    iput-object p2, p0, Lokhttp3/v;->bsg:Lokhttp3/w;
 
-    iput-boolean p3, p0, Lokhttp3/v;->bsm:Z
+    iput-boolean p3, p0, Lokhttp3/v;->bsh: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;->bsi:Lokhttp3/internal/c/j;
+    iput-object p2, p0, Lokhttp3/v;->bsd: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;->bsj:Lokio/a;
+    iput-object p2, p0, Lokhttp3/v;->bse:Lokio/a;
 
-    iget-object p2, p0, Lokhttp3/v;->bsj:Lokio/a;
+    iget-object p2, p0, Lokhttp3/v;->bse:Lokio/a;
 
-    iget p1, p1, Lokhttp3/t;->brV:I
+    iget p1, p1, Lokhttp3/t;->brQ:I
 
     int-to-long v0, p1
 
@@ -70,10 +70,10 @@
     return-void
 .end method
 
-.method private FE()V
+.method private FC()V
     .locals 2
 
-    invoke-static {}, Lokhttp3/internal/g/f;->GT()Lokhttp3/internal/g/f;
+    invoke-static {}, Lokhttp3/internal/g/f;->GR()Lokhttp3/internal/g/f;
 
     move-result-object v0
 
@@ -83,9 +83,9 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lokhttp3/v;->bsi:Lokhttp3/internal/c/j;
+    iget-object v1, p0, Lokhttp3/v;->bsd:Lokhttp3/internal/c/j;
 
-    iput-object v0, v1, Lokhttp3/internal/c/j;->buq:Ljava/lang/Object;
+    iput-object v0, v1, Lokhttp3/internal/c/j;->bul: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;->brO:Lokhttp3/p$a;
+    iget-object p0, p0, Lokhttp3/t;->brJ:Lokhttp3/p$a;
 
-    invoke-interface {p0}, Lokhttp3/p$a;->Fk()Lokhttp3/p;
+    invoke-interface {p0}, Lokhttp3/p$a;->Fi()Lokhttp3/p;
 
     move-result-object p0
 
-    iput-object p0, v0, Lokhttp3/v;->bsk:Lokhttp3/p;
+    iput-object p0, v0, Lokhttp3/v;->bsf: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;->bsk:Lokhttp3/p;
+    iget-object p0, p0, Lokhttp3/v;->bsf:Lokhttp3/p;
 
     return-object p0
 .end method
 
 
 # virtual methods
-.method final FF()Ljava/lang/String;
+.method final FD()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/v;->bsl:Lokhttp3/w;
+    iget-object v0, p0, Lokhttp3/v;->bsg:Lokhttp3/w;
 
-    iget-object v0, v0, Lokhttp3/w;->bnk:Lokhttp3/s;
+    iget-object v0, v0, Lokhttp3/w;->bnf:Lokhttp3/s;
 
-    invoke-virtual {v0}, Lokhttp3/s;->Fu()Ljava/lang/String;
+    invoke-virtual {v0}, Lokhttp3/s;->Fs()Ljava/lang/String;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method final FG()Lokhttp3/Response;
+.method final FE()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;->bsh:Lokhttp3/t;
+    iget-object v0, p0, Lokhttp3/v;->bsc:Lokhttp3/t;
 
-    iget-object v0, v0, Lokhttp3/t;->brM:Ljava/util/List;
+    iget-object v0, v0, Lokhttp3/t;->brH:Ljava/util/List;
 
     invoke-interface {v1, v0}, Ljava/util/List;->addAll(Ljava/util/Collection;)Z
 
-    iget-object v0, p0, Lokhttp3/v;->bsi:Lokhttp3/internal/c/j;
+    iget-object v0, p0, Lokhttp3/v;->bsd: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;->bsh:Lokhttp3/t;
+    iget-object v2, p0, Lokhttp3/v;->bsc: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;->bsh:Lokhttp3/t;
+    iget-object v2, p0, Lokhttp3/v;->bsc:Lokhttp3/t;
 
-    invoke-virtual {v2}, Lokhttp3/t;->FC()Lokhttp3/internal/a/e;
+    invoke-virtual {v2}, Lokhttp3/t;->FA()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;->bsh:Lokhttp3/t;
+    iget-object v2, p0, Lokhttp3/v;->bsc: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;->bsm:Z
+    iget-boolean v0, p0, Lokhttp3/v;->bsh:Z
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/v;->bsh:Lokhttp3/t;
+    iget-object v0, p0, Lokhttp3/v;->bsc:Lokhttp3/t;
 
-    iget-object v0, v0, Lokhttp3/t;->brN:Ljava/util/List;
+    iget-object v0, v0, Lokhttp3/t;->brI: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;->bsm:Z
+    iget-boolean v2, p0, Lokhttp3/v;->bsh: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;->bsl:Lokhttp3/w;
+    iget-object v6, p0, Lokhttp3/v;->bsg:Lokhttp3/w;
 
-    iget-object v8, p0, Lokhttp3/v;->bsk:Lokhttp3/p;
+    iget-object v8, p0, Lokhttp3/v;->bsf:Lokhttp3/p;
 
-    iget-object v0, p0, Lokhttp3/v;->bsh:Lokhttp3/t;
+    iget-object v0, p0, Lokhttp3/v;->bsc:Lokhttp3/t;
 
-    iget v9, v0, Lokhttp3/t;->brW:I
+    iget v9, v0, Lokhttp3/t;->brR:I
 
-    iget-object v0, p0, Lokhttp3/v;->bsh:Lokhttp3/t;
+    iget-object v0, p0, Lokhttp3/v;->bsc:Lokhttp3/t;
 
-    iget v10, v0, Lokhttp3/t;->brX:I
+    iget v10, v0, Lokhttp3/t;->brS:I
 
-    iget-object v0, p0, Lokhttp3/v;->bsh:Lokhttp3/t;
+    iget-object v0, p0, Lokhttp3/v;->bsc:Lokhttp3/t;
 
-    iget v11, v0, Lokhttp3/t;->brY:I
+    iget v11, v0, Lokhttp3/t;->brT: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;->bsl:Lokhttp3/w;
+    iget-object v0, p0, Lokhttp3/v;->bsg: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 Fd()Lokhttp3/Response;
+.method public final Fb()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;->bsn:Z
+    iget-boolean v0, p0, Lokhttp3/v;->bsi:Z
 
     if-nez v0, :cond_1
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lokhttp3/v;->bsn:Z
+    iput-boolean v0, p0, Lokhttp3/v;->bsi:Z
 
     monitor-exit p0
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_1
 
-    invoke-direct {p0}, Lokhttp3/v;->FE()V
+    invoke-direct {p0}, Lokhttp3/v;->FC()V
 
-    iget-object v0, p0, Lokhttp3/v;->bsj:Lokio/a;
+    iget-object v0, p0, Lokhttp3/v;->bse:Lokio/a;
 
     invoke-virtual {v0}, Lokio/a;->enter()V
 
     :try_start_1
-    iget-object v0, p0, Lokhttp3/v;->bsh:Lokhttp3/t;
+    iget-object v0, p0, Lokhttp3/v;->bsc:Lokhttp3/t;
 
-    iget-object v0, v0, Lokhttp3/t;->brL:Lokhttp3/n;
+    iget-object v0, v0, Lokhttp3/t;->brG:Lokhttp3/n;
 
     invoke-virtual {v0, p0}, Lokhttp3/n;->a(Lokhttp3/v;)V
 
-    invoke-virtual {p0}, Lokhttp3/v;->FG()Lokhttp3/Response;
+    invoke-virtual {p0}, Lokhttp3/v;->FE()Lokhttp3/Response;
 
     move-result-object v0
     :try_end_1
@@ -289,9 +289,9 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v1, p0, Lokhttp3/v;->bsh:Lokhttp3/t;
+    iget-object v1, p0, Lokhttp3/v;->bsc:Lokhttp3/t;
 
-    iget-object v1, v1, Lokhttp3/t;->brL:Lokhttp3/n;
+    iget-object v1, v1, Lokhttp3/t;->brG: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;->bsh:Lokhttp3/t;
+    iget-object v1, p0, Lokhttp3/v;->bsc:Lokhttp3/t;
 
-    iget-object v1, v1, Lokhttp3/t;->brL:Lokhttp3/n;
+    iget-object v1, v1, Lokhttp3/t;->brG: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;->bsn:Z
+    iget-boolean v0, p0, Lokhttp3/v;->bsi:Z
 
     if-nez v0, :cond_0
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lokhttp3/v;->bsn:Z
+    iput-boolean v0, p0, Lokhttp3/v;->bsi:Z
 
     monitor-exit p0
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_1
 
-    invoke-direct {p0}, Lokhttp3/v;->FE()V
+    invoke-direct {p0}, Lokhttp3/v;->FC()V
 
-    iget-object v0, p0, Lokhttp3/v;->bsh:Lokhttp3/t;
+    iget-object v0, p0, Lokhttp3/v;->bsc:Lokhttp3/t;
 
-    iget-object v0, v0, Lokhttp3/t;->brL:Lokhttp3/n;
+    iget-object v0, v0, Lokhttp3/t;->brG:Lokhttp3/n;
 
     new-instance v1, Lokhttp3/v$a;
 
@@ -387,7 +387,7 @@
     monitor-enter v0
 
     :try_start_1
-    iget-object p1, v0, Lokhttp3/n;->bqN:Ljava/util/Deque;
+    iget-object p1, v0, Lokhttp3/n;->bqI: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;->Fi()Z
+    invoke-virtual {v0}, Lokhttp3/n;->Fg()Z
 
     return-void
 
@@ -438,9 +438,9 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/v;->bsj:Lokio/a;
+    iget-object v0, p0, Lokhttp3/v;->bse:Lokio/a;
 
-    invoke-virtual {v0}, Lokio/a;->Hd()Z
+    invoke-virtual {v0}, Lokio/a;->Hb()Z
 
     move-result v0
 
@@ -466,7 +466,7 @@
 .method public final cancel()V
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/v;->bsi:Lokhttp3/internal/c/j;
+    iget-object v0, p0, Lokhttp3/v;->bsd: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;->bsh:Lokhttp3/t;
+    iget-object v0, p0, Lokhttp3/v;->bsc:Lokhttp3/t;
 
-    iget-object v1, p0, Lokhttp3/v;->bsl:Lokhttp3/w;
+    iget-object v1, p0, Lokhttp3/v;->bsg:Lokhttp3/w;
 
-    iget-boolean v2, p0, Lokhttp3/v;->bsm:Z
+    iget-boolean v2, p0, Lokhttp3/v;->bsh: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;->bsi:Lokhttp3/internal/c/j;
+    iget-object v0, p0, Lokhttp3/v;->bsd:Lokhttp3/internal/c/j;
 
-    iget-boolean v0, v0, Lokhttp3/internal/c/j;->buv:Z
+    iget-boolean v0, v0, Lokhttp3/internal/c/j;->buq:Z
 
     return v0
 .end method
@@ -507,7 +507,7 @@
 .method public final timeout()Lokio/s;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/v;->bsj:Lokio/a;
+    iget-object v0, p0, Lokhttp3/v;->bse: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 c88aebcb41..0095e3100b 100644
--- a/com.discord/smali/okhttp3/w$a.smali
+++ b/com.discord/smali/okhttp3/w$a.smali
@@ -15,19 +15,19 @@
 
 
 # instance fields
-.field bnk:Lokhttp3/s;
+.field bnf:Lokhttp3/s;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field brI:Lokhttp3/RequestBody;
+.field brD:Lokhttp3/RequestBody;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field bsq:Ljava/lang/String;
+.field bsl:Ljava/lang/String;
 
-.field bsr:Ljava/util/Map;
+.field bsm:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -39,7 +39,7 @@
     .end annotation
 .end field
 
-.field bst:Lokhttp3/Headers$a;
+.field bso:Lokhttp3/Headers$a;
 
 
 # direct methods
@@ -52,17 +52,17 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lokhttp3/w$a;->bsr:Ljava/util/Map;
+    iput-object v0, p0, Lokhttp3/w$a;->bsm:Ljava/util/Map;
 
     const-string v0, "GET"
 
-    iput-object v0, p0, Lokhttp3/w$a;->bsq:Ljava/lang/String;
+    iput-object v0, p0, Lokhttp3/w$a;->bsl:Ljava/lang/String;
 
     new-instance v0, Lokhttp3/Headers$a;
 
     invoke-direct {v0}, Lokhttp3/Headers$a;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/w$a;->bst:Lokhttp3/Headers$a;
+    iput-object v0, p0, Lokhttp3/w$a;->bso:Lokhttp3/Headers$a;
 
     return-void
 .end method
@@ -76,21 +76,21 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lokhttp3/w$a;->bsr:Ljava/util/Map;
+    iput-object v0, p0, Lokhttp3/w$a;->bsm:Ljava/util/Map;
 
-    iget-object v0, p1, Lokhttp3/w;->bnk:Lokhttp3/s;
+    iget-object v0, p1, Lokhttp3/w;->bnf:Lokhttp3/s;
 
-    iput-object v0, p0, Lokhttp3/w$a;->bnk:Lokhttp3/s;
+    iput-object v0, p0, Lokhttp3/w$a;->bnf:Lokhttp3/s;
 
-    iget-object v0, p1, Lokhttp3/w;->bsq:Ljava/lang/String;
+    iget-object v0, p1, Lokhttp3/w;->bsl:Ljava/lang/String;
 
-    iput-object v0, p0, Lokhttp3/w$a;->bsq:Ljava/lang/String;
+    iput-object v0, p0, Lokhttp3/w$a;->bsl:Ljava/lang/String;
 
-    iget-object v0, p1, Lokhttp3/w;->brI:Lokhttp3/RequestBody;
+    iget-object v0, p1, Lokhttp3/w;->brD:Lokhttp3/RequestBody;
 
-    iput-object v0, p0, Lokhttp3/w$a;->brI:Lokhttp3/RequestBody;
+    iput-object v0, p0, Lokhttp3/w$a;->brD:Lokhttp3/RequestBody;
 
-    iget-object v0, p1, Lokhttp3/w;->bsr:Ljava/util/Map;
+    iget-object v0, p1, Lokhttp3/w;->bsm: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;->bsr:Ljava/util/Map;
+    iget-object v1, p1, Lokhttp3/w;->bsm:Ljava/util/Map;
 
     invoke-direct {v0, v1}, Ljava/util/LinkedHashMap;-><init>(Ljava/util/Map;)V
 
     :goto_0
-    iput-object v0, p0, Lokhttp3/w$a;->bsr:Ljava/util/Map;
+    iput-object v0, p0, Lokhttp3/w$a;->bsm:Ljava/util/Map;
 
-    iget-object p1, p1, Lokhttp3/w;->brH:Lokhttp3/Headers;
+    iget-object p1, p1, Lokhttp3/w;->brC:Lokhttp3/Headers;
 
-    invoke-virtual {p1}, Lokhttp3/Headers;->Fl()Lokhttp3/Headers$a;
+    invoke-virtual {p1}, Lokhttp3/Headers;->Fj()Lokhttp3/Headers$a;
 
     move-result-object p1
 
-    iput-object p1, p0, Lokhttp3/w$a;->bst:Lokhttp3/Headers$a;
+    iput-object p1, p0, Lokhttp3/w$a;->bso:Lokhttp3/Headers$a;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final FN()Lokhttp3/w;
+.method public final FL()Lokhttp3/w;
     .locals 2
 
-    iget-object v0, p0, Lokhttp3/w$a;->bnk:Lokhttp3/s;
+    iget-object v0, p0, Lokhttp3/w$a;->bnf:Lokhttp3/s;
 
     if-eqz v0, :cond_0
 
@@ -233,9 +233,9 @@
 
     :cond_3
     :goto_1
-    iput-object p1, p0, Lokhttp3/w$a;->bsq:Ljava/lang/String;
+    iput-object p1, p0, Lokhttp3/w$a;->bsl:Ljava/lang/String;
 
-    iput-object p2, p0, Lokhttp3/w$a;->brI:Lokhttp3/RequestBody;
+    iput-object p2, p0, Lokhttp3/w$a;->brD: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;->bst:Lokhttp3/Headers$a;
+    iget-object v0, p0, Lokhttp3/w$a;->bso: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;->bst:Lokhttp3/Headers$a;
+    iget-object v0, p0, Lokhttp3/w$a;->bso: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;->Fl()Lokhttp3/Headers$a;
+    invoke-virtual {p1}, Lokhttp3/Headers;->Fj()Lokhttp3/Headers$a;
 
     move-result-object p1
 
-    iput-object p1, p0, Lokhttp3/w$a;->bst:Lokhttp3/Headers$a;
+    iput-object p1, p0, Lokhttp3/w$a;->bso:Lokhttp3/Headers$a;
 
     return-object p0
 .end method
@@ -295,7 +295,7 @@
 
     if-eqz p1, :cond_0
 
-    iput-object p1, p0, Lokhttp3/w$a;->bnk:Lokhttp3/s;
+    iput-object p1, p0, Lokhttp3/w$a;->bnf: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;->bst:Lokhttp3/Headers$a;
+    iget-object v0, p0, Lokhttp3/w$a;->bso: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 b3601be251..a4b5aca570 100644
--- a/com.discord/smali/okhttp3/w.smali
+++ b/com.discord/smali/okhttp3/w.smali
@@ -12,18 +12,18 @@
 
 
 # instance fields
-.field public final bnk:Lokhttp3/s;
+.field public final bnf:Lokhttp3/s;
 
-.field public final brH:Lokhttp3/Headers;
+.field public final brC:Lokhttp3/Headers;
 
-.field public final brI:Lokhttp3/RequestBody;
+.field public final brD:Lokhttp3/RequestBody;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public final bsq:Ljava/lang/String;
+.field public final bsl:Ljava/lang/String;
 
-.field final bsr:Ljava/util/Map;
+.field final bsm:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -35,7 +35,7 @@
     .end annotation
 .end field
 
-.field private volatile bss:Lokhttp3/d;
+.field private volatile bsn: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;->bnk:Lokhttp3/s;
+    iget-object v0, p1, Lokhttp3/w$a;->bnf:Lokhttp3/s;
 
-    iput-object v0, p0, Lokhttp3/w;->bnk:Lokhttp3/s;
+    iput-object v0, p0, Lokhttp3/w;->bnf:Lokhttp3/s;
 
-    iget-object v0, p1, Lokhttp3/w$a;->bsq:Ljava/lang/String;
+    iget-object v0, p1, Lokhttp3/w$a;->bsl:Ljava/lang/String;
 
-    iput-object v0, p0, Lokhttp3/w;->bsq:Ljava/lang/String;
+    iput-object v0, p0, Lokhttp3/w;->bsl:Ljava/lang/String;
 
-    iget-object v0, p1, Lokhttp3/w$a;->bst:Lokhttp3/Headers$a;
+    iget-object v0, p1, Lokhttp3/w$a;->bso:Lokhttp3/Headers$a;
 
-    invoke-virtual {v0}, Lokhttp3/Headers$a;->Fm()Lokhttp3/Headers;
+    invoke-virtual {v0}, Lokhttp3/Headers$a;->Fk()Lokhttp3/Headers;
 
     move-result-object v0
 
-    iput-object v0, p0, Lokhttp3/w;->brH:Lokhttp3/Headers;
+    iput-object v0, p0, Lokhttp3/w;->brC:Lokhttp3/Headers;
 
-    iget-object v0, p1, Lokhttp3/w$a;->brI:Lokhttp3/RequestBody;
+    iget-object v0, p1, Lokhttp3/w$a;->brD:Lokhttp3/RequestBody;
 
-    iput-object v0, p0, Lokhttp3/w;->brI:Lokhttp3/RequestBody;
+    iput-object v0, p0, Lokhttp3/w;->brD:Lokhttp3/RequestBody;
 
-    iget-object p1, p1, Lokhttp3/w$a;->bsr:Ljava/util/Map;
+    iget-object p1, p1, Lokhttp3/w$a;->bsm: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;->bsr:Ljava/util/Map;
+    iput-object p1, p0, Lokhttp3/w;->bsm:Ljava/util/Map;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final FJ()Lokhttp3/s;
+.method public final FH()Lokhttp3/s;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/w;->bnk:Lokhttp3/s;
+    iget-object v0, p0, Lokhttp3/w;->bnf:Lokhttp3/s;
 
     return-object v0
 .end method
 
-.method public final FK()Ljava/lang/String;
+.method public final FI()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/w;->bsq:Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/w;->bsl:Ljava/lang/String;
 
     return-object v0
 .end method
 
-.method public final FL()Lokhttp3/w$a;
+.method public final FJ()Lokhttp3/w$a;
     .locals 1
 
     new-instance v0, Lokhttp3/w$a;
@@ -106,23 +106,23 @@
     return-object v0
 .end method
 
-.method public final FM()Lokhttp3/d;
+.method public final FK()Lokhttp3/d;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/w;->bss:Lokhttp3/d;
+    iget-object v0, p0, Lokhttp3/w;->bsn:Lokhttp3/d;
 
     if-eqz v0, :cond_0
 
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/w;->brH:Lokhttp3/Headers;
+    iget-object v0, p0, Lokhttp3/w;->brC:Lokhttp3/Headers;
 
     invoke-static {v0}, Lokhttp3/d;->a(Lokhttp3/Headers;)Lokhttp3/d;
 
     move-result-object v0
 
-    iput-object v0, p0, Lokhttp3/w;->bss:Lokhttp3/d;
+    iput-object v0, p0, Lokhttp3/w;->bsn:Lokhttp3/d;
 
     return-object v0
 .end method
@@ -132,7 +132,7 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/w;->brH:Lokhttp3/Headers;
+    iget-object v0, p0, Lokhttp3/w;->brC: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;->bsq:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/w;->bsl: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;->bnk:Lokhttp3/s;
+    iget-object v1, p0, Lokhttp3/w;->bnf: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;->bsr:Ljava/util/Map;
+    iget-object v1, p0, Lokhttp3/w;->bsm: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 fcd4d0c49a..aca9dbb535 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 bsK:J
+.field final synthetic bsF:J
 
-.field final synthetic bsL:Lokio/d;
+.field final synthetic bsG:Lokio/d;
 
-.field final synthetic bsu:Lokhttp3/MediaType;
+.field final synthetic bsp:Lokhttp3/MediaType;
 
 
 # direct methods
 .method constructor <init>(Lokhttp3/MediaType;JLokio/d;)V
     .locals 0
 
-    iput-object p1, p0, Lokhttp3/x$1;->bsu:Lokhttp3/MediaType;
+    iput-object p1, p0, Lokhttp3/x$1;->bsp:Lokhttp3/MediaType;
 
-    iput-wide p2, p0, Lokhttp3/x$1;->bsK:J
+    iput-wide p2, p0, Lokhttp3/x$1;->bsF:J
 
-    iput-object p4, p0, Lokhttp3/x$1;->bsL:Lokio/d;
+    iput-object p4, p0, Lokhttp3/x$1;->bsG:Lokio/d;
 
     invoke-direct {p0}, Lokhttp3/x;-><init>()V
 
@@ -39,10 +39,10 @@
 
 
 # virtual methods
-.method public final FQ()Lokio/d;
+.method public final FO()Lokio/d;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/x$1;->bsL:Lokio/d;
+    iget-object v0, p0, Lokhttp3/x$1;->bsG: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;->bsK:J
+    iget-wide v0, p0, Lokhttp3/x$1;->bsF:J
 
     return-wide v0
 .end method
@@ -60,7 +60,7 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/x$1;->bsu:Lokhttp3/MediaType;
+    iget-object v0, p0, Lokhttp3/x$1;->bsp: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 829baca0b4..9011013334 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 bqX:Ljava/nio/charset/Charset;
+.field private final bqS:Ljava/nio/charset/Charset;
 
-.field private bsM:Ljava/io/Reader;
+.field private bsH:Ljava/io/Reader;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private final lY:Lokio/d;
+.field private final lZ: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;->lY:Lokio/d;
+    iput-object p1, p0, Lokhttp3/x$a;->lZ:Lokio/d;
 
-    iput-object p2, p0, Lokhttp3/x$a;->bqX:Ljava/nio/charset/Charset;
+    iput-object p2, p0, Lokhttp3/x$a;->bqS: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;->bsM:Ljava/io/Reader;
+    iget-object v0, p0, Lokhttp3/x$a;->bsH:Ljava/io/Reader;
 
     if-eqz v0, :cond_0
 
@@ -63,7 +63,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/x$a;->lY:Lokio/d;
+    iget-object v0, p0, Lokhttp3/x$a;->lZ: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;->bsM:Ljava/io/Reader;
+    iget-object v0, p0, Lokhttp3/x$a;->bsH:Ljava/io/Reader;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/x$a;->lY:Lokio/d;
+    iget-object v0, p0, Lokhttp3/x$a;->lZ:Lokio/d;
 
-    iget-object v1, p0, Lokhttp3/x$a;->bqX:Ljava/nio/charset/Charset;
+    iget-object v1, p0, Lokhttp3/x$a;->bqS: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;->lY:Lokio/d;
+    iget-object v2, p0, Lokhttp3/x$a;->lZ:Lokio/d;
 
-    invoke-interface {v2}, Lokio/d;->Hj()Ljava/io/InputStream;
+    invoke-interface {v2}, Lokio/d;->Hh()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;->bsM:Ljava/io/Reader;
+    iput-object v1, p0, Lokhttp3/x$a;->bsH:Ljava/io/Reader;
 
     move-object v0, v1
 
diff --git a/com.discord/smali/okhttp3/x.smali b/com.discord/smali/okhttp3/x.smali
index 7a9c406b87..1c2947e19e 100644
--- a/com.discord/smali/okhttp3/x.smali
+++ b/com.discord/smali/okhttp3/x.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field public bsJ:Ljava/io/Reader;
+.field public bsE:Ljava/io/Reader;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
@@ -81,10 +81,10 @@
 
 
 # virtual methods
-.method public abstract FQ()Lokio/d;
+.method public abstract FO()Lokio/d;
 .end method
 
-.method public final FR()Ljava/lang/String;
+.method public final FP()Ljava/lang/String;
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -92,12 +92,12 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lokhttp3/x;->FQ()Lokio/d;
+    invoke-virtual {p0}, Lokhttp3/x;->FO()Lokio/d;
 
     move-result-object v0
 
     :try_start_0
-    invoke-virtual {p0}, Lokhttp3/x;->FS()Ljava/nio/charset/Charset;
+    invoke-virtual {p0}, Lokhttp3/x;->FQ()Ljava/nio/charset/Charset;
 
     move-result-object v1
 
@@ -123,7 +123,7 @@
     throw v1
 .end method
 
-.method public final FS()Ljava/nio/charset/Charset;
+.method public final FQ()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;->tw:Ljava/nio/charset/Charset;
+    sget-object v1, Lokhttp3/internal/c;->tx: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;->tw:Ljava/nio/charset/Charset;
+    sget-object v0, Lokhttp3/internal/c;->tx:Ljava/nio/charset/Charset;
 
     return-object v0
 .end method
@@ -149,7 +149,7 @@
 .method public close()V
     .locals 1
 
-    invoke-virtual {p0}, Lokhttp3/x;->FQ()Lokio/d;
+    invoke-virtual {p0}, Lokhttp3/x;->FO()Lokio/d;
 
     move-result-object v0
 
diff --git a/com.discord/smali/okhttp3/y.smali b/com.discord/smali/okhttp3/y.smali
index 895e7d6977..7a03331dc0 100644
--- a/com.discord/smali/okhttp3/y.smali
+++ b/com.discord/smali/okhttp3/y.smali
@@ -4,11 +4,11 @@
 
 
 # instance fields
-.field public final bnr:Ljava/net/Proxy;
+.field public final bnm:Ljava/net/Proxy;
 
-.field public final bsN:Lokhttp3/a;
+.field public final bsI:Lokhttp3/a;
 
-.field public final bsO:Ljava/net/InetSocketAddress;
+.field public final bsJ:Ljava/net/InetSocketAddress;
 
 
 # direct methods
@@ -23,11 +23,11 @@
 
     if-eqz p3, :cond_0
 
-    iput-object p1, p0, Lokhttp3/y;->bsN:Lokhttp3/a;
+    iput-object p1, p0, Lokhttp3/y;->bsI:Lokhttp3/a;
 
-    iput-object p2, p0, Lokhttp3/y;->bnr:Ljava/net/Proxy;
+    iput-object p2, p0, Lokhttp3/y;->bnm:Ljava/net/Proxy;
 
-    iput-object p3, p0, Lokhttp3/y;->bsO:Ljava/net/InetSocketAddress;
+    iput-object p3, p0, Lokhttp3/y;->bsJ:Ljava/net/InetSocketAddress;
 
     return-void
 
@@ -61,16 +61,16 @@
 
 
 # virtual methods
-.method public final FT()Z
+.method public final FR()Z
     .locals 2
 
-    iget-object v0, p0, Lokhttp3/y;->bsN:Lokhttp3/a;
+    iget-object v0, p0, Lokhttp3/y;->bsI:Lokhttp3/a;
 
     iget-object v0, v0, Lokhttp3/a;->sslSocketFactory:Ljavax/net/ssl/SSLSocketFactory;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/y;->bnr:Ljava/net/Proxy;
+    iget-object v0, p0, Lokhttp3/y;->bnm: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;->bsN:Lokhttp3/a;
+    iget-object v0, p1, Lokhttp3/y;->bsI:Lokhttp3/a;
 
-    iget-object v1, p0, Lokhttp3/y;->bsN:Lokhttp3/a;
+    iget-object v1, p0, Lokhttp3/y;->bsI: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;->bnr:Ljava/net/Proxy;
+    iget-object v0, p1, Lokhttp3/y;->bnm:Ljava/net/Proxy;
 
-    iget-object v1, p0, Lokhttp3/y;->bnr:Ljava/net/Proxy;
+    iget-object v1, p0, Lokhttp3/y;->bnm: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;->bsO:Ljava/net/InetSocketAddress;
+    iget-object p1, p1, Lokhttp3/y;->bsJ:Ljava/net/InetSocketAddress;
 
-    iget-object v0, p0, Lokhttp3/y;->bsO:Ljava/net/InetSocketAddress;
+    iget-object v0, p0, Lokhttp3/y;->bsJ: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;->bsN:Lokhttp3/a;
+    iget-object v0, p0, Lokhttp3/y;->bsI: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;->bnr:Ljava/net/Proxy;
+    iget-object v1, p0, Lokhttp3/y;->bnm: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;->bsO:Ljava/net/InetSocketAddress;
+    iget-object v1, p0, Lokhttp3/y;->bsJ: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;->bsO:Ljava/net/InetSocketAddress;
+    iget-object v1, p0, Lokhttp3/y;->bsJ: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 cc735e06ed..afa9f56090 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 Hf()Lokio/c;
+.method public abstract Hd()Lokio/c;
 .end method
 
-.method public abstract Hh()Lokio/BufferedSink;
+.method public abstract Hf()Lokio/BufferedSink;
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -27,7 +27,7 @@
     .end annotation
 .end method
 
-.method public abstract Hs()Lokio/BufferedSink;
+.method public abstract Hq()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 a714d98cde..c2c939289d 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 byB:J
+.field private static final byw:J
 
-.field private static final byC:J
+.field private static final byx:J
 
-.field static byD:Lokio/a;
+.field static byy:Lokio/a;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
 
 # instance fields
-.field private byE:Z
-
-.field private byF:Lokio/a;
+.field private byA:Lokio/a;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private byG:J
+.field private byB:J
+
+.field private byz:Z
 
 
 # direct methods
@@ -45,17 +45,17 @@
 
     move-result-wide v0
 
-    sput-wide v0, Lokio/a;->byB:J
+    sput-wide v0, Lokio/a;->byw:J
 
     sget-object v0, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
 
-    sget-wide v1, Lokio/a;->byB:J
+    sget-wide v1, Lokio/a;->byw:J
 
     invoke-virtual {v0, v1, v2}, Ljava/util/concurrent/TimeUnit;->toNanos(J)J
 
     move-result-wide v0
 
-    sput-wide v0, Lokio/a;->byC:J
+    sput-wide v0, Lokio/a;->byx:J
 
     return-void
 .end method
@@ -68,7 +68,7 @@
     return-void
 .end method
 
-.method static He()Lokio/a;
+.method static Hc()Lokio/a;
     .locals 9
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -81,9 +81,9 @@
 
     const-class v0, Lokio/a;
 
-    sget-object v1, Lokio/a;->byD:Lokio/a;
+    sget-object v1, Lokio/a;->byy:Lokio/a;
 
-    iget-object v1, v1, Lokio/a;->byF:Lokio/a;
+    iget-object v1, v1, Lokio/a;->byA:Lokio/a;
 
     const/4 v2, 0x0
 
@@ -93,13 +93,13 @@
 
     move-result-wide v3
 
-    sget-wide v5, Lokio/a;->byB:J
+    sget-wide v5, Lokio/a;->byw:J
 
     invoke-virtual {v0, v5, v6}, Ljava/lang/Object;->wait(J)V
 
-    sget-object v0, Lokio/a;->byD:Lokio/a;
+    sget-object v0, Lokio/a;->byy:Lokio/a;
 
-    iget-object v0, v0, Lokio/a;->byF:Lokio/a;
+    iget-object v0, v0, Lokio/a;->byA:Lokio/a;
 
     if-nez v0, :cond_0
 
@@ -109,13 +109,13 @@
 
     sub-long/2addr v0, v3
 
-    sget-wide v3, Lokio/a;->byC:J
+    sget-wide v3, Lokio/a;->byx:J
 
     cmp-long v5, v0, v3
 
     if-ltz v5, :cond_0
 
-    sget-object v0, Lokio/a;->byD:Lokio/a;
+    sget-object v0, Lokio/a;->byy:Lokio/a;
 
     return-object v0
 
@@ -127,7 +127,7 @@
 
     move-result-wide v3
 
-    iget-wide v5, v1, Lokio/a;->byG:J
+    iget-wide v5, v1, Lokio/a;->byB:J
 
     sub-long/2addr v5, v3
 
@@ -152,13 +152,13 @@
     return-object v2
 
     :cond_2
-    sget-object v0, Lokio/a;->byD:Lokio/a;
+    sget-object v0, Lokio/a;->byy:Lokio/a;
 
-    iget-object v3, v1, Lokio/a;->byF:Lokio/a;
+    iget-object v3, v1, Lokio/a;->byA:Lokio/a;
 
-    iput-object v3, v0, Lokio/a;->byF:Lokio/a;
+    iput-object v3, v0, Lokio/a;->byA:Lokio/a;
 
-    iput-object v2, v1, Lokio/a;->byF:Lokio/a;
+    iput-object v2, v1, Lokio/a;->byA:Lokio/a;
 
     return-object v1
 .end method
@@ -171,7 +171,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lokio/a;->byD:Lokio/a;
+    sget-object v1, Lokio/a;->byy:Lokio/a;
 
     if-nez v1, :cond_0
 
@@ -179,7 +179,7 @@
 
     invoke-direct {v1}, Lokio/a;-><init>()V
 
-    sput-object v1, Lokio/a;->byD:Lokio/a;
+    sput-object v1, Lokio/a;->byy:Lokio/a;
 
     new-instance v1, Lokio/a$a;
 
@@ -200,7 +200,7 @@
 
     if-eqz p3, :cond_1
 
-    invoke-virtual {p0}, Lokio/a;->HE()J
+    invoke-virtual {p0}, Lokio/a;->HC()J
 
     move-result-wide v3
 
@@ -212,7 +212,7 @@
 
     add-long/2addr p1, v1
 
-    iput-wide p1, p0, Lokio/a;->byG:J
+    iput-wide p1, p0, Lokio/a;->byB:J
 
     goto :goto_0
 
@@ -223,34 +223,34 @@
 
     add-long/2addr p1, v1
 
-    iput-wide p1, p0, Lokio/a;->byG:J
+    iput-wide p1, p0, Lokio/a;->byB:J
 
     goto :goto_0
 
     :cond_2
     if-eqz p3, :cond_6
 
-    invoke-virtual {p0}, Lokio/a;->HE()J
+    invoke-virtual {p0}, Lokio/a;->HC()J
 
     move-result-wide p1
 
-    iput-wide p1, p0, Lokio/a;->byG:J
+    iput-wide p1, p0, Lokio/a;->byB:J
 
     :goto_0
-    iget-wide p1, p0, Lokio/a;->byG:J
+    iget-wide p1, p0, Lokio/a;->byB:J
 
     sub-long/2addr p1, v1
 
-    sget-object p3, Lokio/a;->byD:Lokio/a;
+    sget-object p3, Lokio/a;->byy:Lokio/a;
 
     :goto_1
-    iget-object v3, p3, Lokio/a;->byF:Lokio/a;
+    iget-object v3, p3, Lokio/a;->byA:Lokio/a;
 
     if-eqz v3, :cond_4
 
-    iget-object v3, p3, Lokio/a;->byF:Lokio/a;
+    iget-object v3, p3, Lokio/a;->byA:Lokio/a;
 
-    iget-wide v3, v3, Lokio/a;->byG:J
+    iget-wide v3, v3, Lokio/a;->byB:J
 
     sub-long/2addr v3, v1
 
@@ -261,19 +261,19 @@
     goto :goto_2
 
     :cond_3
-    iget-object p3, p3, Lokio/a;->byF:Lokio/a;
+    iget-object p3, p3, Lokio/a;->byA:Lokio/a;
 
     goto :goto_1
 
     :cond_4
     :goto_2
-    iget-object p1, p3, Lokio/a;->byF:Lokio/a;
+    iget-object p1, p3, Lokio/a;->byA:Lokio/a;
 
-    iput-object p1, p0, Lokio/a;->byF:Lokio/a;
+    iput-object p1, p0, Lokio/a;->byA:Lokio/a;
 
-    iput-object p0, p3, Lokio/a;->byF:Lokio/a;
+    iput-object p0, p3, Lokio/a;->byA:Lokio/a;
 
-    sget-object p0, Lokio/a;->byD:Lokio/a;
+    sget-object p0, Lokio/a;->byy:Lokio/a;
 
     if-ne p3, p0, :cond_5
 
@@ -322,22 +322,22 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lokio/a;->byD:Lokio/a;
+    sget-object v1, Lokio/a;->byy:Lokio/a;
 
     :goto_0
     if-eqz v1, :cond_1
 
-    iget-object v2, v1, Lokio/a;->byF:Lokio/a;
+    iget-object v2, v1, Lokio/a;->byA:Lokio/a;
 
     if-ne v2, p0, :cond_0
 
-    iget-object v2, p0, Lokio/a;->byF:Lokio/a;
+    iget-object v2, p0, Lokio/a;->byA:Lokio/a;
 
-    iput-object v2, v1, Lokio/a;->byF:Lokio/a;
+    iput-object v2, v1, Lokio/a;->byA:Lokio/a;
 
     const/4 v1, 0x0
 
-    iput-object v1, p0, Lokio/a;->byF:Lokio/a;
+    iput-object v1, p0, Lokio/a;->byA: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;->byF:Lokio/a;
+    iget-object v1, v1, Lokio/a;->byA:Lokio/a;
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
@@ -378,16 +378,16 @@
 
 
 # virtual methods
-.method protected FH()V
+.method protected FF()V
     .locals 0
 
     return-void
 .end method
 
-.method public final Hd()Z
+.method public final Hb()Z
     .locals 2
 
-    iget-boolean v0, p0, Lokio/a;->byE:Z
+    iget-boolean v0, p0, Lokio/a;->byz:Z
 
     const/4 v1, 0x0
 
@@ -396,7 +396,7 @@
     return v1
 
     :cond_0
-    iput-boolean v1, p0, Lokio/a;->byE:Z
+    iput-boolean v1, p0, Lokio/a;->byz:Z
 
     invoke-static {p0}, Lokio/a;->a(Lokio/a;)Z
 
@@ -413,7 +413,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lokio/a;->Hd()Z
+    invoke-virtual {p0}, Lokio/a;->Hb()Z
 
     move-result v0
 
@@ -461,15 +461,15 @@
 .method public final enter()V
     .locals 6
 
-    iget-boolean v0, p0, Lokio/a;->byE:Z
+    iget-boolean v0, p0, Lokio/a;->byz:Z
 
     if-nez v0, :cond_1
 
-    invoke-virtual {p0}, Lokio/a;->HC()J
+    invoke-virtual {p0}, Lokio/a;->HA()J
 
     move-result-wide v0
 
-    invoke-virtual {p0}, Lokio/a;->HD()Z
+    invoke-virtual {p0}, Lokio/a;->HB()Z
 
     move-result v2
 
@@ -486,7 +486,7 @@
     :cond_0
     const/4 v3, 0x1
 
-    iput-boolean v3, p0, Lokio/a;->byE:Z
+    iput-boolean v3, p0, Lokio/a;->byz: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;->Hd()Z
+    invoke-virtual {p0}, Lokio/a;->Hb()Z
 
     move-result v0
 
diff --git a/com.discord/smali/okio/c.smali b/com.discord/smali/okio/c.smali
index fedcf32f01..fdd4c417c6 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 byM:[B
+.field private static final byH:[B
 
 
 # instance fields
-.field byN:Lokio/n;
+.field byI: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;->byM:[B
+    sput-object v0, Lokio/c;->byH:[B
 
     return-void
 
@@ -108,7 +108,7 @@
     return-object p1
 
     :cond_0
-    iget-object v0, p0, Lokio/c;->byN:Lokio/n;
+    iget-object v0, p0, Lokio/c;->byI:Lokio/n;
 
     iget v1, v0, Lokio/n;->pos:I
 
@@ -167,11 +167,11 @@
 
     if-ne p1, p2, :cond_2
 
-    invoke-virtual {v0}, Lokio/n;->HL()Lokio/n;
+    invoke-virtual {v0}, Lokio/n;->HJ()Lokio/n;
 
     move-result-object p1
 
-    iput-object p1, p0, Lokio/c;->byN:Lokio/n;
+    iput-object p1, p0, Lokio/c;->byI: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;->bzi:Lokio/n;
+    iget-object p1, v1, Lokio/n;->bzd:Lokio/n;
 
     iget-object v0, p1, Lokio/n;->data:[B
 
@@ -311,7 +311,7 @@
     return-object p1
 .end method
 
-.method public final Gs()Lokio/ByteString;
+.method public final Gq()Lokio/ByteString;
     .locals 2
 
     new-instance v0, Lokio/ByteString;
@@ -325,25 +325,25 @@
     return-object v0
 .end method
 
-.method public final Hf()Lokio/c;
+.method public final Hd()Lokio/c;
     .locals 0
 
     return-object p0
 .end method
 
-.method public final Hg()Lokio/c;
+.method public final He()Lokio/c;
     .locals 0
 
     return-object p0
 .end method
 
-.method public final Hh()Lokio/BufferedSink;
+.method public final Hf()Lokio/BufferedSink;
     .locals 0
 
     return-object p0
 .end method
 
-.method public final Hi()Z
+.method public final Hg()Z
     .locals 5
 
     iget-wide v0, p0, Lokio/c;->size:J
@@ -364,7 +364,7 @@
     return v0
 .end method
 
-.method public final Hj()Ljava/io/InputStream;
+.method public final Hh()Ljava/io/InputStream;
     .locals 1
 
     new-instance v0, Lokio/c$2;
@@ -374,7 +374,7 @@
     return-object v0
 .end method
 
-.method public final Hk()J
+.method public final Hi()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;->byN:Lokio/n;
+    iget-object v2, p0, Lokio/c;->byI:Lokio/n;
 
-    iget-object v2, v2, Lokio/n;->bzj:Lokio/n;
+    iget-object v2, v2, Lokio/n;->bze:Lokio/n;
 
     iget v3, v2, Lokio/n;->limit:I
 
@@ -416,7 +416,7 @@
     return-wide v0
 .end method
 
-.method public final Hl()S
+.method public final Hj()S
     .locals 1
 
     invoke-virtual {p0}, Lokio/c;->readShort()S
@@ -430,7 +430,7 @@
     return v0
 .end method
 
-.method public final Hm()I
+.method public final Hk()I
     .locals 1
 
     invoke-virtual {p0}, Lokio/c;->readInt()I
@@ -444,7 +444,7 @@
     return v0
 .end method
 
-.method public final Hn()J
+.method public final Hl()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;->byN:Lokio/n;
+    iget-object v6, p0, Lokio/c;->byI: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;->Ho()Ljava/lang/String;
+    invoke-virtual {v0}, Lokio/c;->Hm()Ljava/lang/String;
 
     move-result-object v0
 
@@ -608,11 +608,11 @@
     :goto_3
     if-ne v8, v9, :cond_7
 
-    invoke-virtual {v6}, Lokio/n;->HL()Lokio/n;
+    invoke-virtual {v6}, Lokio/n;->HJ()Lokio/n;
 
     move-result-object v7
 
-    iput-object v7, p0, Lokio/c;->byN:Lokio/n;
+    iput-object v7, p0, Lokio/c;->byI: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;->byN:Lokio/n;
+    iget-object v6, p0, Lokio/c;->byI:Lokio/n;
 
     if-nez v6, :cond_0
 
@@ -655,13 +655,13 @@
     goto :goto_5
 .end method
 
-.method public final Ho()Ljava/lang/String;
+.method public final Hm()Ljava/lang/String;
     .locals 3
 
     :try_start_0
     iget-wide v0, p0, Lokio/c;->size:J
 
-    sget-object v2, Lokio/t;->tw:Ljava/nio/charset/Charset;
+    sget-object v2, Lokio/t;->tx: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 Hp()Ljava/lang/String;
+.method public final Hn()Ljava/lang/String;
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -698,7 +698,7 @@
     return-object v0
 .end method
 
-.method public final Hq()J
+.method public final Ho()J
     .locals 6
 
     const/4 v1, 0x0
@@ -716,7 +716,7 @@
     return-wide v0
 .end method
 
-.method public final Hr()Lokio/c;
+.method public final Hp()Lokio/c;
     .locals 6
 
     new-instance v0, Lokio/c;
@@ -734,34 +734,34 @@
     return-object v0
 
     :cond_0
-    iget-object v1, p0, Lokio/c;->byN:Lokio/n;
+    iget-object v1, p0, Lokio/c;->byI:Lokio/n;
 
-    invoke-virtual {v1}, Lokio/n;->HJ()Lokio/n;
+    invoke-virtual {v1}, Lokio/n;->HH()Lokio/n;
 
     move-result-object v1
 
-    iput-object v1, v0, Lokio/c;->byN:Lokio/n;
+    iput-object v1, v0, Lokio/c;->byI:Lokio/n;
 
-    iget-object v1, v0, Lokio/c;->byN:Lokio/n;
+    iget-object v1, v0, Lokio/c;->byI:Lokio/n;
 
-    iput-object v1, v1, Lokio/n;->bzj:Lokio/n;
+    iput-object v1, v1, Lokio/n;->bze:Lokio/n;
 
-    iput-object v1, v1, Lokio/n;->bzi:Lokio/n;
+    iput-object v1, v1, Lokio/n;->bzd:Lokio/n;
 
-    iget-object v1, p0, Lokio/c;->byN:Lokio/n;
+    iget-object v1, p0, Lokio/c;->byI:Lokio/n;
 
     :goto_0
-    iget-object v1, v1, Lokio/n;->bzi:Lokio/n;
+    iget-object v1, v1, Lokio/n;->bzd:Lokio/n;
 
-    iget-object v2, p0, Lokio/c;->byN:Lokio/n;
+    iget-object v2, p0, Lokio/c;->byI:Lokio/n;
 
     if-eq v1, v2, :cond_1
 
-    iget-object v2, v0, Lokio/c;->byN:Lokio/n;
+    iget-object v2, v0, Lokio/c;->byI:Lokio/n;
 
-    iget-object v2, v2, Lokio/n;->bzj:Lokio/n;
+    iget-object v2, v2, Lokio/n;->bze:Lokio/n;
 
-    invoke-virtual {v1}, Lokio/n;->HJ()Lokio/n;
+    invoke-virtual {v1}, Lokio/n;->HH()Lokio/n;
 
     move-result-object v3
 
@@ -777,7 +777,7 @@
     return-object v0
 .end method
 
-.method public final bridge synthetic Hs()Lokio/BufferedSink;
+.method public final bridge synthetic Hq()Lokio/BufferedSink;
     .locals 0
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -804,7 +804,7 @@
     return v1
 
     :cond_0
-    iget-object p1, p1, Lokio/k;->bzd:[Lokio/ByteString;
+    iget-object p1, p1, Lokio/k;->byY:[Lokio/ByteString;
 
     aget-object p1, p1, v0
 
@@ -836,7 +836,7 @@
 
     move-object/from16 v1, p0
 
-    iget-object v2, v1, Lokio/c;->byN:Lokio/n;
+    iget-object v2, v1, Lokio/c;->byI:Lokio/n;
 
     const/4 v3, -0x2
 
@@ -847,7 +847,7 @@
     return v3
 
     :cond_0
-    sget-object v2, Lokio/ByteString;->byR:Lokio/ByteString;
+    sget-object v2, Lokio/ByteString;->byM: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;->bze:[I
+    iget-object v0, v0, Lokio/k;->byZ:[I
 
     const/4 v8, -0x1
 
@@ -930,7 +930,7 @@
     :goto_2
     if-ne v4, v11, :cond_6
 
-    iget-object v4, v5, Lokio/n;->bzi:Lokio/n;
+    iget-object v4, v5, Lokio/n;->bzd: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;->bzi:Lokio/n;
+    iget-object v4, v5, Lokio/n;->bzd:Lokio/n;
 
     iget v5, v4, Lokio/n;->pos:I
 
@@ -1081,7 +1081,7 @@
     return-wide v5
 
     :cond_1
-    iget-object v7, v0, Lokio/c;->byN:Lokio/n;
+    iget-object v7, v0, Lokio/c;->byI:Lokio/n;
 
     if-nez v7, :cond_2
 
@@ -1101,7 +1101,7 @@
 
     if-lez v1, :cond_4
 
-    iget-object v7, v7, Lokio/n;->bzj:Lokio/n;
+    iget-object v7, v7, Lokio/n;->bze:Lokio/n;
 
     iget v1, v7, Lokio/n;->limit:I
 
@@ -1133,7 +1133,7 @@
 
     if-gez v10, :cond_4
 
-    iget-object v7, v7, Lokio/n;->bzi:Lokio/n;
+    iget-object v7, v7, Lokio/n;->bzd:Lokio/n;
 
     goto :goto_2
 
@@ -1212,7 +1212,7 @@
 
     add-long/2addr v1, v8
 
-    iget-object v7, v7, Lokio/n;->bzi:Lokio/n;
+    iget-object v7, v7, Lokio/n;->bzd:Lokio/n;
 
     move-wide v8, v1
 
@@ -1295,7 +1295,7 @@
 
     if-ltz v4, :cond_6
 
-    iget-object v4, v0, Lokio/c;->byN:Lokio/n;
+    iget-object v4, v0, Lokio/c;->byI:Lokio/n;
 
     const-wide/16 v5, -0x1
 
@@ -1317,7 +1317,7 @@
 
     if-lez v2, :cond_2
 
-    iget-object v4, v4, Lokio/n;->bzj:Lokio/n;
+    iget-object v4, v4, Lokio/n;->bze:Lokio/n;
 
     iget v2, v4, Lokio/n;->limit:I
 
@@ -1349,7 +1349,7 @@
 
     if-gez v9, :cond_2
 
-    iget-object v4, v4, Lokio/n;->bzi:Lokio/n;
+    iget-object v4, v4, Lokio/n;->bzd:Lokio/n;
 
     goto :goto_1
 
@@ -1452,7 +1452,7 @@
 
     add-long v11, v7, v5
 
-    iget-object v4, v4, Lokio/n;->bzi:Lokio/n;
+    iget-object v4, v4, Lokio/n;->bzd: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;->lZ:Lokio/c;
+    iget-object v0, p1, Lokio/c$a;->ma:Lokio/c;
 
     if-nez v0, :cond_0
 
-    iput-object p0, p1, Lokio/c$a;->lZ:Lokio/c;
+    iput-object p0, p1, Lokio/c$a;->ma:Lokio/c;
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p1, Lokio/c$a;->byP:Z
+    iput-boolean v0, p1, Lokio/c$a;->byK:Z
 
     return-object p1
 
@@ -1673,7 +1673,7 @@
 
     iput-wide v2, p1, Lokio/c;->size:J
 
-    iget-object v2, p0, Lokio/c;->byN:Lokio/n;
+    iget-object v2, p0, Lokio/c;->byI: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;->bzi:Lokio/n;
+    iget-object v2, v2, Lokio/n;->bzd:Lokio/n;
 
     goto :goto_0
 
@@ -1708,7 +1708,7 @@
 
     if-lez v3, :cond_3
 
-    invoke-virtual {v2}, Lokio/n;->HJ()Lokio/n;
+    invoke-virtual {v2}, Lokio/n;->HH()Lokio/n;
 
     move-result-object v3
 
@@ -1736,20 +1736,20 @@
 
     iput p2, v3, Lokio/n;->limit:I
 
-    iget-object p2, p1, Lokio/c;->byN:Lokio/n;
+    iget-object p2, p1, Lokio/c;->byI:Lokio/n;
 
     if-nez p2, :cond_2
 
-    iput-object v3, v3, Lokio/n;->bzj:Lokio/n;
+    iput-object v3, v3, Lokio/n;->bze:Lokio/n;
 
-    iput-object v3, v3, Lokio/n;->bzi:Lokio/n;
+    iput-object v3, v3, Lokio/n;->bzd:Lokio/n;
 
-    iput-object v3, p1, Lokio/c;->byN:Lokio/n;
+    iput-object v3, p1, Lokio/c;->byI:Lokio/n;
 
     goto :goto_2
 
     :cond_2
-    iget-object p2, p2, Lokio/n;->bzj:Lokio/n;
+    iget-object p2, p2, Lokio/n;->bze: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;->bzi:Lokio/n;
+    iget-object v2, v2, Lokio/n;->bzd:Lokio/n;
 
     move-wide p2, v0
 
@@ -1853,13 +1853,13 @@
 
     if-lez v2, :cond_2
 
-    iget-object v0, p0, Lokio/c;->byN:Lokio/n;
+    iget-object v0, p0, Lokio/c;->byI:Lokio/n;
 
     if-eqz v0, :cond_1
 
     iget v0, v0, Lokio/n;->limit:I
 
-    iget-object v1, p0, Lokio/c;->byN:Lokio/n;
+    iget-object v1, p0, Lokio/c;->byI:Lokio/n;
 
     iget v1, v1, Lokio/n;->pos:I
 
@@ -1883,7 +1883,7 @@
 
     sub-long/2addr p1, v4
 
-    iget-object v0, p0, Lokio/c;->byN:Lokio/n;
+    iget-object v0, p0, Lokio/c;->byI: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;->byN:Lokio/n;
+    iget-object v0, p0, Lokio/c;->byI:Lokio/n;
 
     iget v0, v0, Lokio/n;->pos:I
 
-    iget-object v1, p0, Lokio/c;->byN:Lokio/n;
+    iget-object v1, p0, Lokio/c;->byI:Lokio/n;
 
     iget v1, v1, Lokio/n;->limit:I
 
     if-ne v0, v1, :cond_0
 
-    iget-object v0, p0, Lokio/c;->byN:Lokio/n;
+    iget-object v0, p0, Lokio/c;->byI:Lokio/n;
 
-    invoke-virtual {v0}, Lokio/n;->HL()Lokio/n;
+    invoke-virtual {v0}, Lokio/n;->HJ()Lokio/n;
 
     move-result-object v1
 
-    iput-object v1, p0, Lokio/c;->byN:Lokio/n;
+    iput-object v1, p0, Lokio/c;->byI: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;->byM:[B
+    sget-object v9, Lokio/c;->byH:[B
 
     aget-byte v9, v9, v10
 
@@ -2279,7 +2279,7 @@
     :goto_0
     if-lt v4, v5, :cond_1
 
-    sget-object v6, Lokio/c;->byM:[B
+    sget-object v6, Lokio/c;->byH:[B
 
     const-wide/16 v7, 0xf
 
@@ -2388,7 +2388,7 @@
 
     if-lez v4, :cond_1
 
-    iget-object v0, p0, Lokio/c;->byN:Lokio/n;
+    iget-object v0, p0, Lokio/c;->byI: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;->bzi:Lokio/n;
+    iget-object v0, v0, Lokio/n;->bzd:Lokio/n;
 
     goto :goto_0
 
     :cond_1
     sub-long/2addr p1, v0
 
-    iget-object v0, p0, Lokio/c;->byN:Lokio/n;
+    iget-object v0, p0, Lokio/c;->byI:Lokio/n;
 
     :cond_2
-    iget-object v0, v0, Lokio/n;->bzj:Lokio/n;
+    iget-object v0, v0, Lokio/n;->bze:Lokio/n;
 
     iget v1, v0, Lokio/n;->limit:I
 
@@ -2486,7 +2486,7 @@
         }
     .end annotation
 
-    sget-object v0, Lokio/t;->tw:Ljava/nio/charset/Charset;
+    sget-object v0, Lokio/t;->tx: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;->Gs()Lokio/ByteString;
+    invoke-virtual {v6}, Lokio/c;->Gq()Lokio/ByteString;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lokio/ByteString;->Hx()Ljava/lang/String;
+    invoke-virtual {p1}, Lokio/ByteString;->Hv()Ljava/lang/String;
 
     move-result-object p1
 
@@ -2714,7 +2714,7 @@
 
     if-ltz v2, :cond_b
 
-    iget-object v2, p0, Lokio/c;->byN:Lokio/n;
+    iget-object v2, p0, Lokio/c;->byI:Lokio/n;
 
     const-wide/16 v3, -0x1
 
@@ -2736,7 +2736,7 @@
 
     if-lez v0, :cond_2
 
-    iget-object v2, v2, Lokio/n;->bzj:Lokio/n;
+    iget-object v2, v2, Lokio/n;->bze:Lokio/n;
 
     iget v0, v2, Lokio/n;->limit:I
 
@@ -2768,7 +2768,7 @@
 
     if-gez v7, :cond_2
 
-    iget-object v2, v2, Lokio/n;->bzi:Lokio/n;
+    iget-object v2, v2, Lokio/n;->bzd:Lokio/n;
 
     goto :goto_1
 
@@ -2854,14 +2854,14 @@
 
     add-long/2addr p2, v5
 
-    iget-object v2, v2, Lokio/n;->bzi:Lokio/n;
+    iget-object v2, v2, Lokio/n;->bzd:Lokio/n;
 
     move-wide v5, p2
 
     goto :goto_2
 
     :cond_6
-    invoke-virtual {p1}, Lokio/ByteString;->HA()[B
+    invoke-virtual {p1}, Lokio/ByteString;->Hy()[B
 
     move-result-object p1
 
@@ -2927,7 +2927,7 @@
 
     add-long/2addr p2, v5
 
-    iget-object v2, v2, Lokio/n;->bzi:Lokio/n;
+    iget-object v2, v2, Lokio/n;->bzd:Lokio/n;
 
     move-wide v5, p2
 
@@ -3034,7 +3034,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lokio/c;->Hr()Lokio/c;
+    invoke-virtual {p0}, Lokio/c;->Hp()Lokio/c;
 
     move-result-object v0
 
@@ -3343,26 +3343,26 @@
 
     if-gt p1, v0, :cond_3
 
-    iget-object v1, p0, Lokio/c;->byN:Lokio/n;
+    iget-object v1, p0, Lokio/c;->byI:Lokio/n;
 
     if-nez v1, :cond_0
 
-    invoke-static {}, Lokio/o;->HM()Lokio/n;
+    invoke-static {}, Lokio/o;->HK()Lokio/n;
 
     move-result-object p1
 
-    iput-object p1, p0, Lokio/c;->byN:Lokio/n;
+    iput-object p1, p0, Lokio/c;->byI:Lokio/n;
 
-    iget-object p1, p0, Lokio/c;->byN:Lokio/n;
+    iget-object p1, p0, Lokio/c;->byI:Lokio/n;
 
-    iput-object p1, p1, Lokio/n;->bzj:Lokio/n;
+    iput-object p1, p1, Lokio/n;->bze:Lokio/n;
 
-    iput-object p1, p1, Lokio/n;->bzi:Lokio/n;
+    iput-object p1, p1, Lokio/n;->bzd:Lokio/n;
 
     return-object p1
 
     :cond_0
-    iget-object v1, v1, Lokio/n;->bzj:Lokio/n;
+    iget-object v1, v1, Lokio/n;->bze:Lokio/n;
 
     iget v2, v1, Lokio/n;->limit:I
 
@@ -3375,7 +3375,7 @@
     if-nez p1, :cond_2
 
     :cond_1
-    invoke-static {}, Lokio/o;->HM()Lokio/n;
+    invoke-static {}, Lokio/o;->HK()Lokio/n;
 
     move-result-object p1
 
@@ -3496,9 +3496,9 @@
     return v0
 
     :cond_3
-    iget-object v1, p0, Lokio/c;->byN:Lokio/n;
+    iget-object v1, p0, Lokio/c;->byI:Lokio/n;
 
-    iget-object p1, p1, Lokio/c;->byN:Lokio/n;
+    iget-object p1, p1, Lokio/c;->byI: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;->bzi:Lokio/n;
+    iget-object v1, v1, Lokio/n;->bzd: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;->bzi:Lokio/n;
+    iget-object p1, p1, Lokio/n;->bzd: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;->byN:Lokio/n;
+    iget-object v0, p0, Lokio/c;->byI:Lokio/n;
 
     if-nez v0, :cond_0
 
@@ -3641,9 +3641,9 @@
     goto :goto_0
 
     :cond_2
-    iget-object v0, v0, Lokio/n;->bzi:Lokio/n;
+    iget-object v0, v0, Lokio/n;->bzd:Lokio/n;
 
-    iget-object v2, p0, Lokio/c;->byN:Lokio/n;
+    iget-object v2, p0, Lokio/c;->byI:Lokio/n;
 
     if-ne v0, v2, :cond_1
 
@@ -4239,7 +4239,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokio/c;->byN:Lokio/n;
+    iget-object v0, p0, Lokio/c;->byI:Lokio/n;
 
     if-nez v0, :cond_0
 
@@ -4288,11 +4288,11 @@
 
     if-ne p1, v2, :cond_1
 
-    invoke-virtual {v0}, Lokio/n;->HL()Lokio/n;
+    invoke-virtual {v0}, Lokio/n;->HJ()Lokio/n;
 
     move-result-object p1
 
-    iput-object p1, p0, Lokio/c;->byN:Lokio/n;
+    iput-object p1, p0, Lokio/c;->byI: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;->byN:Lokio/n;
+    iget-object v0, p0, Lokio/c;->byI:Lokio/n;
 
     if-nez v0, :cond_0
 
@@ -4358,11 +4358,11 @@
 
     if-ne p1, p2, :cond_1
 
-    invoke-virtual {v0}, Lokio/n;->HL()Lokio/n;
+    invoke-virtual {v0}, Lokio/n;->HJ()Lokio/n;
 
     move-result-object p1
 
-    iput-object p1, p0, Lokio/c;->byN:Lokio/n;
+    iput-object p1, p0, Lokio/c;->byI: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;->byN:Lokio/n;
+    iget-object v0, p0, Lokio/c;->byI:Lokio/n;
 
     iget v1, v0, Lokio/n;->pos:I
 
@@ -4403,11 +4403,11 @@
 
     if-ne v4, v2, :cond_0
 
-    invoke-virtual {v0}, Lokio/n;->HL()Lokio/n;
+    invoke-virtual {v0}, Lokio/n;->HJ()Lokio/n;
 
     move-result-object v2
 
-    iput-object v2, p0, Lokio/c;->byN:Lokio/n;
+    iput-object v2, p0, Lokio/c;->byI: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;->byN:Lokio/n;
+    iget-object v0, p0, Lokio/c;->byI:Lokio/n;
 
     iget v1, v0, Lokio/n;->pos:I
 
@@ -4603,11 +4603,11 @@
 
     if-ne v7, v4, :cond_1
 
-    invoke-virtual {v0}, Lokio/n;->HL()Lokio/n;
+    invoke-virtual {v0}, Lokio/n;->HJ()Lokio/n;
 
     move-result-object v2
 
-    iput-object v2, p0, Lokio/c;->byN:Lokio/n;
+    iput-object v2, p0, Lokio/c;->byI: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;->byN:Lokio/n;
+    iget-object v0, p0, Lokio/c;->byI:Lokio/n;
 
     iget v1, v0, Lokio/n;->pos:I
 
@@ -4805,11 +4805,11 @@
 
     if-ne v1, v4, :cond_1
 
-    invoke-virtual {v0}, Lokio/n;->HL()Lokio/n;
+    invoke-virtual {v0}, Lokio/n;->HJ()Lokio/n;
 
     move-result-object v1
 
-    iput-object v1, p0, Lokio/c;->byN:Lokio/n;
+    iput-object v1, p0, Lokio/c;->byI: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;->byN:Lokio/n;
+    iget-object v0, p0, Lokio/c;->byI:Lokio/n;
 
     iget v1, v0, Lokio/n;->pos:I
 
@@ -4913,11 +4913,11 @@
 
     if-ne v7, v4, :cond_1
 
-    invoke-virtual {v0}, Lokio/n;->HL()Lokio/n;
+    invoke-virtual {v0}, Lokio/n;->HJ()Lokio/n;
 
     move-result-object v2
 
-    iput-object v2, p0, Lokio/c;->byN:Lokio/n;
+    iput-object v2, p0, Lokio/c;->byI: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;->bzn:Lokio/s;
+    sget-object v0, Lokio/s;->bzi:Lokio/s;
 
     return-object v0
 .end method
@@ -4995,7 +4995,7 @@
 
     if-nez v1, :cond_0
 
-    sget-object v0, Lokio/ByteString;->byR:Lokio/ByteString;
+    sget-object v0, Lokio/ByteString;->byM:Lokio/ByteString;
 
     goto :goto_0
 
@@ -5131,11 +5131,11 @@
 
     if-lez v2, :cond_a
 
-    iget-object v0, p1, Lokio/c;->byN:Lokio/n;
+    iget-object v0, p1, Lokio/c;->byI:Lokio/n;
 
     iget v0, v0, Lokio/n;->limit:I
 
-    iget-object v1, p1, Lokio/c;->byN:Lokio/n;
+    iget-object v1, p1, Lokio/c;->byI:Lokio/n;
 
     iget v1, v1, Lokio/n;->pos:I
 
@@ -5149,11 +5149,11 @@
 
     if-gez v3, :cond_5
 
-    iget-object v0, p0, Lokio/c;->byN:Lokio/n;
+    iget-object v0, p0, Lokio/c;->byI:Lokio/n;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, v0, Lokio/n;->bzj:Lokio/n;
+    iget-object v0, v0, Lokio/n;->bze:Lokio/n;
 
     goto :goto_1
 
@@ -5173,7 +5173,7 @@
 
     add-long/2addr v3, p2
 
-    iget-boolean v1, v0, Lokio/n;->bkm:Z
+    iget-boolean v1, v0, Lokio/n;->bkh:Z
 
     if-eqz v1, :cond_1
 
@@ -5195,7 +5195,7 @@
 
     if-gtz v1, :cond_2
 
-    iget-object v1, p1, Lokio/c;->byN:Lokio/n;
+    iget-object v1, p1, Lokio/c;->byI:Lokio/n;
 
     long-to-int v2, p2
 
@@ -5216,7 +5216,7 @@
     return-void
 
     :cond_2
-    iget-object v0, p1, Lokio/c;->byN:Lokio/n;
+    iget-object v0, p1, Lokio/c;->byI:Lokio/n;
 
     long-to-int v1, p2
 
@@ -5234,14 +5234,14 @@
 
     if-lt v1, v3, :cond_3
 
-    invoke-virtual {v0}, Lokio/n;->HJ()Lokio/n;
+    invoke-virtual {v0}, Lokio/n;->HH()Lokio/n;
 
     move-result-object v3
 
     goto :goto_3
 
     :cond_3
-    invoke-static {}, Lokio/o;->HM()Lokio/n;
+    invoke-static {}, Lokio/o;->HK()Lokio/n;
 
     move-result-object v3
 
@@ -5266,11 +5266,11 @@
 
     iput v4, v0, Lokio/n;->pos:I
 
-    iget-object v0, v0, Lokio/n;->bzj:Lokio/n;
+    iget-object v0, v0, Lokio/n;->bze:Lokio/n;
 
     invoke-virtual {v0, v3}, Lokio/n;->a(Lokio/n;)Lokio/n;
 
-    iput-object v3, p1, Lokio/c;->byN:Lokio/n;
+    iput-object v3, p1, Lokio/c;->byI:Lokio/n;
 
     goto :goto_4
 
@@ -5283,7 +5283,7 @@
 
     :cond_5
     :goto_4
-    iget-object v0, p1, Lokio/c;->byN:Lokio/n;
+    iget-object v0, p1, Lokio/c;->byI:Lokio/n;
 
     iget v1, v0, Lokio/n;->limit:I
 
@@ -5293,38 +5293,38 @@
 
     int-to-long v3, v1
 
-    invoke-virtual {v0}, Lokio/n;->HL()Lokio/n;
+    invoke-virtual {v0}, Lokio/n;->HJ()Lokio/n;
 
     move-result-object v1
 
-    iput-object v1, p1, Lokio/c;->byN:Lokio/n;
+    iput-object v1, p1, Lokio/c;->byI:Lokio/n;
 
-    iget-object v1, p0, Lokio/c;->byN:Lokio/n;
+    iget-object v1, p0, Lokio/c;->byI:Lokio/n;
 
     if-nez v1, :cond_6
 
-    iput-object v0, p0, Lokio/c;->byN:Lokio/n;
+    iput-object v0, p0, Lokio/c;->byI:Lokio/n;
 
-    iget-object v0, p0, Lokio/c;->byN:Lokio/n;
+    iget-object v0, p0, Lokio/c;->byI:Lokio/n;
 
-    iput-object v0, v0, Lokio/n;->bzj:Lokio/n;
+    iput-object v0, v0, Lokio/n;->bze:Lokio/n;
 
-    iput-object v0, v0, Lokio/n;->bzi:Lokio/n;
+    iput-object v0, v0, Lokio/n;->bzd:Lokio/n;
 
     goto :goto_6
 
     :cond_6
-    iget-object v1, v1, Lokio/n;->bzj:Lokio/n;
+    iget-object v1, v1, Lokio/n;->bze:Lokio/n;
 
     invoke-virtual {v1, v0}, Lokio/n;->a(Lokio/n;)Lokio/n;
 
     move-result-object v0
 
-    iget-object v1, v0, Lokio/n;->bzj:Lokio/n;
+    iget-object v1, v0, Lokio/n;->bze:Lokio/n;
 
     if-eq v1, v0, :cond_9
 
-    iget-object v1, v0, Lokio/n;->bzj:Lokio/n;
+    iget-object v1, v0, Lokio/n;->bze: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;->bzj:Lokio/n;
+    iget-object v5, v0, Lokio/n;->bze:Lokio/n;
 
     iget v5, v5, Lokio/n;->limit:I
 
     rsub-int v5, v5, 0x2000
 
-    iget-object v6, v0, Lokio/n;->bzj:Lokio/n;
+    iget-object v6, v0, Lokio/n;->bze:Lokio/n;
 
-    iget-boolean v6, v6, Lokio/n;->bkm:Z
+    iget-boolean v6, v6, Lokio/n;->bkh:Z
 
     if-eqz v6, :cond_7
 
     goto :goto_5
 
     :cond_7
-    iget-object v2, v0, Lokio/n;->bzj:Lokio/n;
+    iget-object v2, v0, Lokio/n;->bze: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;->bzj:Lokio/n;
+    iget-object v2, v0, Lokio/n;->bze:Lokio/n;
 
     invoke-virtual {v0, v2, v1}, Lokio/n;->a(Lokio/n;I)V
 
-    invoke-virtual {v0}, Lokio/n;->HL()Lokio/n;
+    invoke-virtual {v0}, Lokio/n;->HJ()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 90bc8e12ff..a2dadb980a 100644
--- a/com.discord/smali/okio/d.smali
+++ b/com.discord/smali/okio/d.smali
@@ -8,15 +8,15 @@
 
 
 # virtual methods
-.method public abstract Hf()Lokio/c;
+.method public abstract Hd()Lokio/c;
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end method
 
-.method public abstract Hg()Lokio/c;
+.method public abstract He()Lokio/c;
 .end method
 
-.method public abstract Hi()Z
+.method public abstract Hg()Z
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -24,10 +24,10 @@
     .end annotation
 .end method
 
-.method public abstract Hj()Ljava/io/InputStream;
+.method public abstract Hh()Ljava/io/InputStream;
 .end method
 
-.method public abstract Hl()S
+.method public abstract Hj()S
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -35,7 +35,7 @@
     .end annotation
 .end method
 
-.method public abstract Hm()I
+.method public abstract Hk()I
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -43,7 +43,7 @@
     .end annotation
 .end method
 
-.method public abstract Hn()J
+.method public abstract Hl()J
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -51,7 +51,7 @@
     .end annotation
 .end method
 
-.method public abstract Hp()Ljava/lang/String;
+.method public abstract Hn()Ljava/lang/String;
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -59,7 +59,7 @@
     .end annotation
 .end method
 
-.method public abstract Hq()J
+.method public abstract Ho()J
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
diff --git a/com.discord/smali/okio/j$3.smali b/com.discord/smali/okio/j$3.smali
index 1983fda8b5..d9da626c40 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 bzc:Ljava/net/Socket;
+.field final synthetic byX:Ljava/net/Socket;
 
 
 # direct methods
 .method constructor <init>(Ljava/net/Socket;)V
     .locals 0
 
-    iput-object p1, p0, Lokio/j$3;->bzc:Ljava/net/Socket;
+    iput-object p1, p0, Lokio/j$3;->byX:Ljava/net/Socket;
 
     invoke-direct {p0}, Lokio/a;-><init>()V
 
@@ -31,13 +31,13 @@
 
 
 # virtual methods
-.method protected final FH()V
+.method protected final FF()V
     .locals 5
 
     const-string v0, "Failed to close timed out socket "
 
     :try_start_0
-    iget-object v1, p0, Lokio/j$3;->bzc:Ljava/net/Socket;
+    iget-object v1, p0, Lokio/j$3;->byX: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;->HZ:Ljava/util/logging/Logger;
+    sget-object v2, Lokio/j;->HV: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;->bzc:Ljava/net/Socket;
+    iget-object v0, p0, Lokio/j$3;->byX: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;->HZ:Ljava/util/logging/Logger;
+    sget-object v2, Lokio/j;->HV: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;->bzc:Ljava/net/Socket;
+    iget-object v0, p0, Lokio/j$3;->byX: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 114ef742f4..df0117d84a 100644
--- a/com.discord/smali/okio/n.smali
+++ b/com.discord/smali/okio/n.smali
@@ -4,11 +4,11 @@
 
 
 # instance fields
-.field bkm:Z
+.field bkh:Z
 
-.field bzi:Lokio/n;
+.field bzd:Lokio/n;
 
-.field bzj:Lokio/n;
+.field bze:Lokio/n;
 
 .field public final data:[B
 
@@ -37,7 +37,7 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lokio/n;->bkm:Z
+    iput-boolean v0, p0, Lokio/n;->bkh:Z
 
     return-void
 .end method
@@ -53,7 +53,7 @@
 
     iput p3, p0, Lokio/n;->limit:I
 
-    iput-boolean p4, p0, Lokio/n;->bkm:Z
+    iput-boolean p4, p0, Lokio/n;->bkh:Z
 
     iput-boolean p5, p0, Lokio/n;->owner:Z
 
@@ -62,12 +62,12 @@
 
 
 # virtual methods
-.method final HJ()Lokio/n;
+.method final HH()Lokio/n;
     .locals 7
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lokio/n;->bkm:Z
+    iput-boolean v0, p0, Lokio/n;->bkh:Z
 
     new-instance v0, Lokio/n;
 
@@ -88,7 +88,7 @@
     return-object v0
 .end method
 
-.method final HK()Lokio/n;
+.method final HI()Lokio/n;
     .locals 7
 
     new-instance v6, Lokio/n;
@@ -118,12 +118,12 @@
     return-object v6
 .end method
 
-.method public final HL()Lokio/n;
+.method public final HJ()Lokio/n;
     .locals 4
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lokio/n;->bzi:Lokio/n;
+    iget-object v0, p0, Lokio/n;->bzd:Lokio/n;
 
     const/4 v1, 0x0
 
@@ -135,19 +135,19 @@
     move-object v0, v1
 
     :goto_0
-    iget-object v2, p0, Lokio/n;->bzj:Lokio/n;
+    iget-object v2, p0, Lokio/n;->bze:Lokio/n;
 
-    iget-object v3, p0, Lokio/n;->bzi:Lokio/n;
+    iget-object v3, p0, Lokio/n;->bzd:Lokio/n;
 
-    iput-object v3, v2, Lokio/n;->bzi:Lokio/n;
+    iput-object v3, v2, Lokio/n;->bzd:Lokio/n;
 
-    iget-object v3, p0, Lokio/n;->bzi:Lokio/n;
+    iget-object v3, p0, Lokio/n;->bzd:Lokio/n;
 
-    iput-object v2, v3, Lokio/n;->bzj:Lokio/n;
+    iput-object v2, v3, Lokio/n;->bze:Lokio/n;
 
-    iput-object v1, p0, Lokio/n;->bzi:Lokio/n;
+    iput-object v1, p0, Lokio/n;->bzd:Lokio/n;
 
-    iput-object v1, p0, Lokio/n;->bzj:Lokio/n;
+    iput-object v1, p0, Lokio/n;->bze: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;->bzj:Lokio/n;
+    iput-object p0, p1, Lokio/n;->bze:Lokio/n;
 
-    iget-object v0, p0, Lokio/n;->bzi:Lokio/n;
+    iget-object v0, p0, Lokio/n;->bzd:Lokio/n;
 
-    iput-object v0, p1, Lokio/n;->bzi:Lokio/n;
+    iput-object v0, p1, Lokio/n;->bzd:Lokio/n;
 
-    iget-object v0, p0, Lokio/n;->bzi:Lokio/n;
+    iget-object v0, p0, Lokio/n;->bzd:Lokio/n;
 
-    iput-object p1, v0, Lokio/n;->bzj:Lokio/n;
+    iput-object p1, v0, Lokio/n;->bze:Lokio/n;
 
-    iput-object p1, p0, Lokio/n;->bzi:Lokio/n;
+    iput-object p1, p0, Lokio/n;->bzd:Lokio/n;
 
     return-object p1
 .end method
@@ -185,7 +185,7 @@
 
     if-le v1, v2, :cond_2
 
-    iget-boolean v1, p1, Lokio/n;->bkm:Z
+    iget-boolean v1, p1, Lokio/n;->bkh:Z
 
     if-nez v1, :cond_1
 
diff --git a/com.discord/smali/okio/o.smali b/com.discord/smali/okio/o.smali
index 13d570645b..a9010f2590 100644
--- a/com.discord/smali/okio/o.smali
+++ b/com.discord/smali/okio/o.smali
@@ -4,12 +4,12 @@
 
 
 # static fields
-.field static bzi:Lokio/n;
+.field static bzd:Lokio/n;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field static bzk:J
+.field static bzf:J
 
 
 # direct methods
@@ -21,7 +21,7 @@
     return-void
 .end method
 
-.method static HM()Lokio/n;
+.method static HK()Lokio/n;
     .locals 6
 
     const-class v0, Lokio/o;
@@ -29,27 +29,27 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lokio/o;->bzi:Lokio/n;
+    sget-object v1, Lokio/o;->bzd:Lokio/n;
 
     if-eqz v1, :cond_0
 
-    sget-object v1, Lokio/o;->bzi:Lokio/n;
+    sget-object v1, Lokio/o;->bzd:Lokio/n;
 
-    iget-object v2, v1, Lokio/n;->bzi:Lokio/n;
+    iget-object v2, v1, Lokio/n;->bzd:Lokio/n;
 
-    sput-object v2, Lokio/o;->bzi:Lokio/n;
+    sput-object v2, Lokio/o;->bzd:Lokio/n;
 
     const/4 v2, 0x0
 
-    iput-object v2, v1, Lokio/n;->bzi:Lokio/n;
+    iput-object v2, v1, Lokio/n;->bzd:Lokio/n;
 
-    sget-wide v2, Lokio/o;->bzk:J
+    sget-wide v2, Lokio/o;->bzf:J
 
     const-wide/16 v4, 0x2000
 
     sub-long/2addr v2, v4
 
-    sput-wide v2, Lokio/o;->bzk:J
+    sput-wide v2, Lokio/o;->bzf:J
 
     monitor-exit v0
 
@@ -80,15 +80,15 @@
 .method static b(Lokio/n;)V
     .locals 8
 
-    iget-object v0, p0, Lokio/n;->bzi:Lokio/n;
+    iget-object v0, p0, Lokio/n;->bzd:Lokio/n;
 
     if-nez v0, :cond_2
 
-    iget-object v0, p0, Lokio/n;->bzj:Lokio/n;
+    iget-object v0, p0, Lokio/n;->bze:Lokio/n;
 
     if-nez v0, :cond_2
 
-    iget-boolean v0, p0, Lokio/n;->bkm:Z
+    iget-boolean v0, p0, Lokio/n;->bkh:Z
 
     if-eqz v0, :cond_0
 
@@ -100,7 +100,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-wide v1, Lokio/o;->bzk:J
+    sget-wide v1, Lokio/o;->bzf:J
 
     const-wide/16 v3, 0x2000
 
@@ -117,15 +117,15 @@
     return-void
 
     :cond_1
-    sget-wide v1, Lokio/o;->bzk:J
+    sget-wide v1, Lokio/o;->bzf:J
 
     add-long/2addr v1, v3
 
-    sput-wide v1, Lokio/o;->bzk:J
+    sput-wide v1, Lokio/o;->bzf:J
 
-    sget-object v1, Lokio/o;->bzi:Lokio/n;
+    sget-object v1, Lokio/o;->bzd:Lokio/n;
 
-    iput-object v1, p0, Lokio/n;->bzi:Lokio/n;
+    iput-object v1, p0, Lokio/n;->bzd:Lokio/n;
 
     const/4 v1, 0x0
 
@@ -133,7 +133,7 @@
 
     iput v1, p0, Lokio/n;->pos:I
 
-    sput-object p0, Lokio/o;->bzi:Lokio/n;
+    sput-object p0, Lokio/o;->bzd:Lokio/n;
 
     monitor-exit v0
 
diff --git a/com.discord/smali/okio/s.smali b/com.discord/smali/okio/s.smali
index 0cc6514099..f04a7e445e 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 bzn:Lokio/s;
+.field public static final bzi:Lokio/s;
 
 
 # instance fields
-.field private bzo:Z
+.field private bzj:Z
 
-.field private bzp:J
+.field private bzk:J
 
-.field private bzq:J
+.field private bzl:J
 
 
 # direct methods
@@ -23,7 +23,7 @@
 
     invoke-direct {v0}, Lokio/s$1;-><init>()V
 
-    sput-object v0, Lokio/s;->bzn:Lokio/s;
+    sput-object v0, Lokio/s;->bzi:Lokio/s;
 
     return-void
 .end method
@@ -38,30 +38,30 @@
 
 
 # virtual methods
-.method public HC()J
+.method public HA()J
     .locals 2
 
-    iget-wide v0, p0, Lokio/s;->bzq:J
+    iget-wide v0, p0, Lokio/s;->bzl:J
 
     return-wide v0
 .end method
 
-.method public HD()Z
+.method public HB()Z
     .locals 1
 
-    iget-boolean v0, p0, Lokio/s;->bzo:Z
+    iget-boolean v0, p0, Lokio/s;->bzj:Z
 
     return v0
 .end method
 
-.method public HE()J
+.method public HC()J
     .locals 2
 
-    iget-boolean v0, p0, Lokio/s;->bzo:Z
+    iget-boolean v0, p0, Lokio/s;->bzj:Z
 
     if-eqz v0, :cond_0
 
-    iget-wide v0, p0, Lokio/s;->bzp:J
+    iget-wide v0, p0, Lokio/s;->bzk:J
 
     return-wide v0
 
@@ -75,27 +75,27 @@
     throw v0
 .end method
 
-.method public HF()Lokio/s;
+.method public HD()Lokio/s;
     .locals 2
 
     const-wide/16 v0, 0x0
 
-    iput-wide v0, p0, Lokio/s;->bzq:J
+    iput-wide v0, p0, Lokio/s;->bzl:J
 
     return-object p0
 .end method
 
-.method public HG()Lokio/s;
+.method public HE()Lokio/s;
     .locals 1
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lokio/s;->bzo:Z
+    iput-boolean v0, p0, Lokio/s;->bzj:Z
 
     return-object p0
 .end method
 
-.method public HH()V
+.method public HF()V
     .locals 5
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -109,11 +109,11 @@
 
     if-nez v0, :cond_2
 
-    iget-boolean v0, p0, Lokio/s;->bzo:Z
+    iget-boolean v0, p0, Lokio/s;->bzj:Z
 
     if-eqz v0, :cond_1
 
-    iget-wide v0, p0, Lokio/s;->bzp:J
+    iget-wide v0, p0, Lokio/s;->bzk:J
 
     invoke-static {}, Ljava/lang/System;->nanoTime()J
 
@@ -163,9 +163,9 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lokio/s;->bzo:Z
+    iput-boolean v0, p0, Lokio/s;->bzj:Z
 
-    iput-wide p1, p0, Lokio/s;->bzp:J
+    iput-wide p1, p0, Lokio/s;->bzk:J
 
     return-object p0
 .end method
@@ -185,7 +185,7 @@
 
     move-result-wide p1
 
-    iput-wide p1, p0, Lokio/s;->bzq:J
+    iput-wide p1, p0, Lokio/s;->bzl:J
 
     return-object p0
 
diff --git a/com.discord/smali/rx/Observable.smali b/com.discord/smali/rx/Observable.smali
index 2734deb6e9..3cbe286176 100644
--- a/com.discord/smali/rx/Observable.smali
+++ b/com.discord/smali/rx/Observable.smali
@@ -23,7 +23,7 @@
 
 
 # instance fields
-.field final bGr:Lrx/Observable$a;
+.field final bGm: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;->bGr:Lrx/Observable$a;
+    iput-object p1, p0, Lrx/Observable;->bGm:Lrx/Observable$a;
 
     return-void
 .end method
@@ -76,7 +76,7 @@
     return-object p0
 .end method
 
-.method public static IS()Lrx/Observable;
+.method public static IQ()Lrx/Observable;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -88,14 +88,14 @@
         }
     .end annotation
 
-    invoke-static {}, Lrx/internal/a/e;->Jf()Lrx/Observable;
+    invoke-static {}, Lrx/internal/a/e;->Jd()Lrx/Observable;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public static IT()Lrx/Observable;
+.method public static IR()Lrx/Observable;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -107,14 +107,14 @@
         }
     .end annotation
 
-    invoke-static {}, Lrx/internal/a/f;->Jf()Lrx/Observable;
+    invoke-static {}, Lrx/internal/a/f;->Jd()Lrx/Observable;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method private IW()Lrx/Observable;
+.method private IU()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;->bNs:Lrx/internal/util/l$b;
+    sget-object p1, Lrx/internal/util/l$b;->bNn: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;->bGr:Lrx/Observable$a;
+    iget-object v0, p1, Lrx/Observable;->bGm:Lrx/Observable$a;
 
     if-eqz v0, :cond_2
 
@@ -1123,7 +1123,7 @@
 
     :cond_0
     :try_start_0
-    iget-object v0, p1, Lrx/Observable;->bGr:Lrx/Observable$a;
+    iget-object v0, p1, Lrx/Observable;->bGm: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;->KC()Lrx/Subscription;
+    invoke-static {}, Lrx/subscriptions/c;->KA()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;->bNs:Lrx/internal/util/l$b;
+    sget-object v0, Lrx/internal/util/l$b;->bNn: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;->Jp()Lrx/internal/a/ah;
+    invoke-static {}, Lrx/internal/a/ah;->Jn()Lrx/internal/a/ah;
 
     move-result-object v0
 
@@ -1493,7 +1493,7 @@
         }
     .end annotation
 
-    sget v0, Lrx/internal/util/i;->bNf:I
+    sget v0, Lrx/internal/util/i;->bNa: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;->Kw()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Ku()Lrx/Scheduler;
 
     move-result-object v5
 
@@ -1581,7 +1581,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lrx/d/a;->Kw()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Ku()Lrx/Scheduler;
 
     move-result-object v5
 
@@ -1614,7 +1614,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lrx/internal/a/e;->Jf()Lrx/Observable;
+    invoke-static {}, Lrx/internal/a/e;->Jd()Lrx/Observable;
 
     move-result-object p0
 
@@ -1660,7 +1660,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lrx/d/a;->Kw()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Ku()Lrx/Scheduler;
 
     move-result-object v0
 
@@ -1691,7 +1691,7 @@
 
     move-result-object p0
 
-    sget-object v0, Lrx/internal/util/l$b;->bNs:Lrx/internal/util/l$b;
+    sget-object v0, Lrx/internal/util/l$b;->bNn: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 IR()Lrx/f;
+.method public final IP()Lrx/f;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -1775,7 +1775,7 @@
     return-object v0
 .end method
 
-.method public final IU()Lrx/Observable;
+.method public final IS()Lrx/Observable;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -1798,7 +1798,7 @@
     return-object v0
 .end method
 
-.method public final IV()Lrx/Observable;
+.method public final IT()Lrx/Observable;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -1821,7 +1821,7 @@
     return-object v0
 .end method
 
-.method public final IX()Lrx/Observable;
+.method public final IV()Lrx/Observable;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -1831,11 +1831,11 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lrx/Observable;->IW()Lrx/Observable;
+    invoke-direct {p0}, Lrx/Observable;->IU()Lrx/Observable;
 
     move-result-object v0
 
-    sget-object v1, Lrx/internal/util/l$b;->bNs:Lrx/internal/util/l$b;
+    sget-object v1, Lrx/internal/util/l$b;->bNn: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;->bGr:Lrx/Observable$a;
+    iget-object v1, p0, Lrx/Observable;->bGm: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;->bNf:I
+    sget v0, Lrx/internal/util/i;->bNa: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;->Je()Lrx/functions/a$b;
+    invoke-static {}, Lrx/functions/a;->Jc()Lrx/functions/a$b;
 
     move-result-object v0
 
-    invoke-static {}, Lrx/functions/a;->Je()Lrx/functions/a$b;
+    invoke-static {}, Lrx/functions/a;->Jc()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;->bGr:Lrx/Observable$a;
+    iget-object v0, p0, Lrx/Observable;->bGm: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;->KC()Lrx/Subscription;
+    invoke-static {}, Lrx/subscriptions/c;->KA()Lrx/Subscription;
 
     move-result-object p1
 
@@ -2194,7 +2194,7 @@
 
     if-eqz p2, :cond_0
 
-    invoke-static {}, Lrx/functions/a;->Je()Lrx/functions/a$b;
+    invoke-static {}, Lrx/functions/a;->Jc()Lrx/functions/a$b;
 
     move-result-object v0
 
@@ -2239,7 +2239,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/Observable;->bGr:Lrx/Observable$a;
+    iget-object v0, p0, Lrx/Observable;->bGm: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;->bNs:Lrx/internal/util/l$b;
+    sget-object v0, Lrx/internal/util/l$b;->bNn: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;->bMY:Lrx/functions/Action1;
+    sget-object v0, Lrx/internal/util/f;->bMT:Lrx/functions/Action1;
 
-    invoke-static {}, Lrx/functions/a;->Je()Lrx/functions/a$b;
+    invoke-static {}, Lrx/functions/a;->Jc()Lrx/functions/a$b;
 
     move-result-object v1
 
@@ -2484,7 +2484,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/au;->JH()Lrx/internal/a/au;
+    invoke-static {}, Lrx/internal/a/au;->JF()Lrx/internal/a/au;
 
     move-result-object v0
 
@@ -2508,7 +2508,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lrx/d/a;->Kw()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Ku()Lrx/Scheduler;
 
     move-result-object v5
 
@@ -2564,7 +2564,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lrx/d/a;->Kw()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Ku()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;->bNs:Lrx/internal/util/l$b;
+    sget-object v1, Lrx/internal/util/l$b;->bNn: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;->Kw()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Ku()Lrx/Scheduler;
 
     move-result-object v0
 
@@ -2638,7 +2638,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lrx/d/a;->Kw()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Ku()Lrx/Scheduler;
 
     move-result-object v0
 
@@ -2661,7 +2661,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lrx/d/a;->Kw()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Ku()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 adcd61d7da..81b48ea68e 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 bIP:Lrx/functions/Func2;
+.field final bIK:Lrx/functions/Func2;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/Func2<",
@@ -44,7 +44,7 @@
     .end annotation
 .end field
 
-.field final bIu:Lrx/functions/b;
+.field final bIp: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;->bNs:Lrx/internal/util/l$b;
+    sget-object v0, Lrx/internal/util/l$b;->bNn:Lrx/internal/util/l$b;
 
-    iput-object v0, p0, Lrx/internal/a/ae;->bIu:Lrx/functions/b;
+    iput-object v0, p0, Lrx/internal/a/ae;->bIp:Lrx/functions/b;
 
-    iput-object p1, p0, Lrx/internal/a/ae;->bIP:Lrx/functions/Func2;
+    iput-object p1, p0, Lrx/internal/a/ae;->bIK: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;->bIu:Lrx/functions/b;
+    iput-object p1, p0, Lrx/internal/a/ae;->bIp:Lrx/functions/b;
 
-    iput-object p0, p0, Lrx/internal/a/ae;->bIP:Lrx/functions/Func2;
+    iput-object p0, p0, Lrx/internal/a/ae;->bIK:Lrx/functions/Func2;
 
     return-void
 .end method
 
-.method public static Jo()Lrx/internal/a/ae;
+.method public static Jm()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;->bIT:Lrx/internal/a/ae;
+    sget-object v0, Lrx/internal/a/ae$a;->bIO:Lrx/internal/a/ae;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$Companion.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$Companion.smali
deleted file mode 100644
index fb0dc19bbf..0000000000
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$Companion.smali
+++ /dev/null
@@ -1,191 +0,0 @@
-.class public final Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;
-.super Ljava/lang/Object;
-.source "WidgetUserSheet.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "Companion"
-.end annotation
-
-
-# direct methods
-.method private constructor <init>()V
-    .locals 0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-.method public synthetic constructor <init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-    .locals 0
-
-    invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;-><init>()V
-
-    return-void
-.end method
-
-.method public static synthetic show$default(Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;JJLandroidx/fragment/app/FragmentManager;Ljava/lang/Long;Ljava/lang/Boolean;ILjava/lang/Object;)V
-    .locals 10
-
-    and-int/lit8 v0, p8, 0x8
-
-    const/4 v1, 0x0
-
-    if-eqz v0, :cond_0
-
-    move-object v8, v1
-
-    goto :goto_0
-
-    :cond_0
-    move-object/from16 v8, p6
-
-    :goto_0
-    and-int/lit8 v0, p8, 0x10
-
-    if-eqz v0, :cond_1
-
-    move-object v9, v1
-
-    goto :goto_1
-
-    :cond_1
-    move-object/from16 v9, p7
-
-    :goto_1
-    move-object v2, p0
-
-    move-wide v3, p1
-
-    move-wide v5, p3
-
-    move-object v7, p5
-
-    invoke-virtual/range {v2 .. v9}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;->show(JJLandroidx/fragment/app/FragmentManager;Ljava/lang/Long;Ljava/lang/Boolean;)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final show(JJLandroidx/fragment/app/FragmentManager;)V
-    .locals 10
-
-    const/4 v6, 0x0
-
-    const/4 v7, 0x0
-
-    const/16 v8, 0x18
-
-    const/4 v9, 0x0
-
-    move-object v0, p0
-
-    move-wide v1, p1
-
-    move-wide v3, p3
-
-    move-object v5, p5
-
-    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 show(JJLandroidx/fragment/app/FragmentManager;Ljava/lang/Long;)V
-    .locals 10
-
-    const/4 v7, 0x0
-
-    const/16 v8, 0x10
-
-    const/4 v9, 0x0
-
-    move-object v0, p0
-
-    move-wide v1, p1
-
-    move-wide v3, p3
-
-    move-object v5, p5
-
-    move-object/from16 v6, p6
-
-    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 show(JJLandroidx/fragment/app/FragmentManager;Ljava/lang/Long;Ljava/lang/Boolean;)V
-    .locals 3
-
-    const-string v0, "fragmentManager"
-
-    invoke-static {p5, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    new-instance v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
-
-    invoke-direct {v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;-><init>()V
-
-    new-instance v1, Landroid/os/Bundle;
-
-    invoke-direct {v1}, Landroid/os/Bundle;-><init>()V
-
-    const-string v2, "ARG_USER_ID"
-
-    invoke-virtual {v1, v2, p1, p2}, Landroid/os/Bundle;->putLong(Ljava/lang/String;J)V
-
-    const-string p1, "ARG_CHANNEL_ID"
-
-    invoke-virtual {v1, p1, p3, p4}, Landroid/os/Bundle;->putLong(Ljava/lang/String;J)V
-
-    if-eqz p6, :cond_0
-
-    check-cast p6, Ljava/lang/Number;
-
-    invoke-virtual {p6}, Ljava/lang/Number;->longValue()J
-
-    move-result-wide p1
-
-    const-string p3, "ARG_GUILD_ID"
-
-    invoke-virtual {v1, p3, p1, p2}, Landroid/os/Bundle;->putLong(Ljava/lang/String;J)V
-
-    :cond_0
-    if-eqz p7, :cond_1
-
-    invoke-virtual {p7}, Ljava/lang/Boolean;->booleanValue()Z
-
-    move-result p1
-
-    goto :goto_0
-
-    :cond_1
-    const/4 p1, 0x0
-
-    :goto_0
-    const-string p2, "ARG_IS_VOICE_CONTEXT"
-
-    invoke-virtual {v1, p2, p1}, Landroid/os/Bundle;->putBoolean(Ljava/lang/String;Z)V
-
-    invoke-virtual {v0, v1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->setArguments(Landroid/os/Bundle;)V
-
-    invoke-virtual {v0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
-
-    move-result-object p1
-
-    invoke-virtual {p1}, Ljava/lang/Class;->getName()Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-virtual {v0, p5, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->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$configureUI$$inlined$apply$lambda$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$1.smali
deleted file mode 100644
index 70f1374c1e..0000000000
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$1.smali
+++ /dev/null
@@ -1,74 +0,0 @@
-.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_classes2/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$2.smali
deleted file mode 100644
index 734927dd25..0000000000
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$2.smali
+++ /dev/null
@@ -1,75 +0,0 @@
-.class final Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$2;
-.super Ljava/lang/Object;
-.source "WidgetUserSheet.kt"
-
-# interfaces
-.implements Landroid/view/View$OnClickListener;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->configureUI(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-
-# instance fields
-.field final synthetic $isMe$inlined:Z
-
-.field final synthetic $model$inlined:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;
-
-.field final synthetic $this_apply:Landroid/widget/TextView;
-
-.field final synthetic $user$inlined:Lcom/discord/models/domain/ModelUser;
-
-.field final synthetic this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
-
-
-# direct methods
-.method constructor <init>(Landroid/widget/TextView;Lcom/discord/widgets/user/usersheet/WidgetUserSheet;ZLcom/discord/models/domain/ModelUser;Lcom/discord/widgets/user/usersheet/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 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$2;->$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 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
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final onClick(Landroid/view/View;)V
-    .locals 2
-
-    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$2;->$this_apply:Landroid/widget/TextView;
-
-    invoke-virtual {v0}, Landroid/widget/TextView;->getContext()Landroid/content/Context;
-
-    move-result-object v0
-
-    const-string v1, "context"
-
-    invoke-static {v0, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {p1, v0}, Lcom/discord/widgets/settings/WidgetSettings$Companion;->launch(Landroid/content/Context;)V
-
-    iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$2;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
-
-    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->dismiss()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$3.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$3.smali
deleted file mode 100644
index 7176e50149..0000000000
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$3.smali
+++ /dev/null
@@ -1,87 +0,0 @@
-.class final Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$3;
-.super Ljava/lang/Object;
-.source "WidgetUserSheet.kt"
-
-# interfaces
-.implements Landroid/view/View$OnClickListener;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->configureUI(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-
-# instance fields
-.field final synthetic $isMe$inlined:Z
-
-.field final synthetic $model$inlined:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;
-
-.field final synthetic $this_apply:Landroid/widget/TextView;
-
-.field final synthetic $user$inlined:Lcom/discord/models/domain/ModelUser;
-
-.field final synthetic this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
-
-
-# direct methods
-.method constructor <init>(Landroid/widget/TextView;Lcom/discord/widgets/user/usersheet/WidgetUserSheet;ZLcom/discord/models/domain/ModelUser;Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$3;->$this_apply:Landroid/widget/TextView;
-
-    iput-object p2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$3;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
-
-    iput-boolean p3, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$3;->$isMe$inlined:Z
-
-    iput-object p4, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$3;->$user$inlined:Lcom/discord/models/domain/ModelUser;
-
-    iput-object p5, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$3;->$model$inlined:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final onClick(Landroid/view/View;)V
-    .locals 3
-
-    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$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$3;->$model$inlined:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;
-
-    check-cast v2, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;
-
-    invoke-virtual {v2}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->getChannel()Lcom/discord/models/domain/ModelChannel;
-
-    move-result-object v2
-
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
-
-    move-result-object v2
-
-    invoke-static {p1, v0, v1, v2}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->launch(Landroid/content/Context;JLjava/lang/Long;)V
-
-    iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$3;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
-
-    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->dismiss()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$2.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$2.smali
deleted file mode 100644
index 8043cc0155..0000000000
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$2.smali
+++ /dev/null
@@ -1,81 +0,0 @@
-.class final Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$2;
-.super Lkotlin/jvm/internal/m;
-.source "WidgetUserSheet.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lkotlin/jvm/internal/m;",
-        "Lkotlin/jvm/functions/Function1<",
-        "Ljava/lang/Long;",
-        "Lkotlin/Unit;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field final synthetic this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$2;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
-
-    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, Ljava/lang/Number;
-
-    invoke-virtual {p1}, Ljava/lang/Number;->longValue()J
-
-    move-result-wide v0
-
-    invoke-virtual {p0, v0, v1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$2;->invoke(J)V
-
-    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
-
-    return-object p1
-.end method
-
-.method public final invoke(J)V
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$2;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
-
-    invoke-virtual {v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getContext()Landroid/content/Context;
-
-    move-result-object v0
-
-    invoke-static {v0, p1, p2}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->launch(Landroid/content/Context;J)V
-
-    iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$2;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
-
-    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->dismiss()V
-
-    return-void
-.end method
diff --git a/com.discord/smali_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 4b449832c9..1790e12bc9 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 f97bbe605e..9648a9baf8 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 8d4f604ca8..7a8df51ff3 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -65,7 +65,7 @@
 
     check-cast p1, Landroidx/fragment/app/Fragment;
 
-    const v0, 0x7f1206de
+    const v0, 0x7f1206b9
 
     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 11ea22014c..5d3b90ca2a 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, 0x7f0a082b
+    const v0, 0x7f0a07f1
 
     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, 0x7f0a082c
+    const v0, 0x7f0a07f2
 
     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, 0x7f0a082a
+    const v0, 0x7f0a07f0
 
     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, 0x7f0a0829
+    const v0, 0x7f0a07ef
 
     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, 0x7f12038f
+    const v1, 0x7f12036a
 
     const/4 v2, 0x1
 
@@ -366,7 +366,7 @@
 
     move-result-object p1
 
-    sget-object p2, Lcom/discord/app/i;->vO:Lcom/discord/app/i;
+    sget-object p2, Lcom/discord/app/i;->vP: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, 0x7f0d0084
+    const v0, 0x7f0d0083
 
     return v0
 .end method
@@ -410,7 +410,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f121160
+    const v0, 0x7f1210d4
 
     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, 0x7f120d13
+    const v0, 0x7f120cdc
 
     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 720fcc079b..44377e7c62 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 2d4349d64f..ba18e495d4 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 610368b518..631f8247c8 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;->zv:Lcom/discord/rtcconnection/RtcConnection$State$f;
+    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$f;->zw: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 4df63d5967..e04e079c4f 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 f11aa98e9c..f8f5339507 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 65407f3588..7e5883878a 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 477df18fc4..d430201ced 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 a4c78efb84..ba33f64adb 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;->IV()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->IT()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 1faa474277..4dc408e8d6 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,17 +72,11 @@
 
     invoke-static {v0, v1}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v5, Lcom/discord/widgets/voice/model/CallModel;->Companion:Lcom/discord/widgets/voice/model/CallModel$Companion;
+    sget-object v1, Lcom/discord/widgets/voice/model/CallModel;->Companion:Lcom/discord/widgets/voice/model/CallModel$Companion;
 
-    const/4 v8, 0x0
+    move-wide v5, p1
 
-    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;
+    invoke-virtual {v1, p1, p2}, Lcom/discord/widgets/voice/model/CallModel$Companion;->get(J)Lrx/Observable;
 
     move-result-object v2
 
@@ -94,7 +88,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -144,7 +138,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 883a45e70a..5718c52d81 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
@@ -54,7 +54,7 @@
 
 # virtual methods
 .method public final call(Landroid/view/MenuItem;Landroid/content/Context;)V
-    .locals 10
+    .locals 9
 
     const-string v0, "item"
 
@@ -118,27 +118,31 @@
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getId()J
 
-    move-result-wide v3
+    move-result-wide p1
+
+    invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v3
 
     iget-object p1, p0, Lcom/discord/widgets/voice/call/WidgetPrivateCall$configureActionBar$$inlined$let$lambda$1;->this$0:Lcom/discord/widgets/voice/call/WidgetPrivateCall;
 
     invoke-virtual {p1}, Lcom/discord/widgets/voice/call/WidgetPrivateCall;->getChildFragmentManager()Landroidx/fragment/app/FragmentManager;
 
-    move-result-object v5
+    move-result-object v4
 
     const-string p1, "childFragmentManager"
 
-    invoke-static {v5, p1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, p1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/4 v6, 0x0
+    const/4 v5, 0x0
 
-    sget-object v7, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
+    sget-object v6, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
-    const/16 v8, 0x8
+    const/16 v7, 0x8
 
-    const/4 v9, 0x0
+    const/4 v8, 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
+    invoke-static/range {v0 .. v8}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;->show$default(Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;JLjava/lang/Long;Landroidx/fragment/app/FragmentManager;Ljava/lang/Long;Ljava/lang/Boolean;ILjava/lang/Object;)V
 
     :cond_0
     return-void
@@ -195,7 +199,7 @@
     return-void
 
     :pswitch_data_0
-    .packed-switch 0x7f0a046e
+    .packed-switch 0x7f0a0469
         :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 2af8b6eac6..557412e2f7 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, 0x7f0a0471
+    const v0, 0x7f0a046c
 
     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, 0x7f0a0470
+    const v0, 0x7f0a046b
 
     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, 0x7f0a0472
+    const v0, 0x7f0a046d
 
     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, 0x7f0a046f
+    const v0, 0x7f0a046a
 
     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, 0x7f0a046e
+    const v0, 0x7f0a0469
 
     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 1acad733da..a39e283a9b 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 693d58d9a2..16d47bd94e 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 969c3b9813..deef65b076 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;->IT()Lrx/Observable;
+    invoke-static {}, Lrx/Observable;->IR()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 a5ef195f32..3d2e267c7d 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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$configureUI$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$configureUI$1.smali
index a6a9eb3346..b12da2a1d2 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$configureUI$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$configureUI$1.smali
@@ -51,7 +51,7 @@
 
 # virtual methods
 .method public final call(Lcom/discord/models/domain/ModelVoice$User;)V
-    .locals 10
+    .locals 9
 
     sget-object v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->Companion:Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;
 
@@ -85,25 +85,29 @@
 
     move-result-wide v3
 
+    invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v3
+
     iget-object p1, p0, Lcom/discord/widgets/voice/call/WidgetPrivateCall$configureUI$1;->this$0:Lcom/discord/widgets/voice/call/WidgetPrivateCall;
 
     invoke-virtual {p1}, Lcom/discord/widgets/voice/call/WidgetPrivateCall;->getChildFragmentManager()Landroidx/fragment/app/FragmentManager;
 
-    move-result-object v5
+    move-result-object v4
 
     const-string p1, "childFragmentManager"
 
-    invoke-static {v5, p1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, p1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v7, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
+    sget-object v6, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
-    const/4 v6, 0x0
+    const/4 v5, 0x0
 
-    const/16 v8, 0x8
+    const/16 v7, 0x8
 
-    const/4 v9, 0x0
+    const/4 v8, 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
+    invoke-static/range {v0 .. v8}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;->show$default(Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;JLjava/lang/Long;Landroidx/fragment/app/FragmentManager;Ljava/lang/Long;Ljava/lang/Boolean;ILjava/lang/Object;)V
 
     return-void
 .end method
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 a3ea5b3b1b..fb12657c6d 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 70462820dd..e315d6dc0e 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 da7d8e205d..0559e679a0 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 45c8f748d0..e4f6931460 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 93de7b6d8a..a173414cce 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 5f1f60d724..c94bc95d23 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;->bgy:Lkotlin/Unit;
+    sget-object v2, Lkotlin/Unit;->bgt: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 0b96cc30da..4ce9c03641 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 358889781b..2b6a467466 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 cd3c32263c..88cc805ead 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 a365cc6961..c237ea1eaf 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 98a76d34b9..9fae642534 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 06d7f951ee..b47c0f91bc 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, 0x7f0a0550
+    const v0, 0x7f0a0541
 
     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, 0x7f0a054c
+    const v0, 0x7f0a053d
 
     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, 0x7f0a054d
+    const v0, 0x7f0a053e
 
     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, 0x7f0a0544
+    const v0, 0x7f0a0535
 
     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, 0x7f0a054a
+    const v0, 0x7f0a053b
 
     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, 0x7f0a054f
+    const v0, 0x7f0a0540
 
     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, 0x7f0a0549
+    const v0, 0x7f0a053a
 
     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, 0x7f0a0548
+    const v0, 0x7f0a0539
 
     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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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, 0x7f0800e1
+    const v1, 0x7f0800e0
 
     invoke-virtual {v0, v1}, Landroid/view/View;->setBackgroundResource(I)V
 
@@ -895,7 +895,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f121406
+    const v0, 0x7f12137a
 
     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;->zV:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
+    sget-object v3, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;->zX: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, 0x7f0d0161
+    const v0, 0x7f0d015f
 
     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 5f81dae231..2f16f3e810 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, 0x7f0a0545
+    const p1, 0x7f0a0536
 
     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, 0x7f0a0546
+    const p1, 0x7f0a0537
 
     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, 0x7f0a0547
+    const p1, 0x7f0a0538
 
     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, 0x7f0d0162
+    const p3, 0x7f0d0160
 
     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, 0x7f0802fe
+    const v1, 0x7f0802f2
 
     goto :goto_0
 
     :cond_0
-    const v1, 0x7f080303
+    const v1, 0x7f0802f7
 
     :goto_0
     invoke-virtual {v0, v1}, Landroid/widget/ImageView;->setImageResource(I)V
@@ -377,12 +377,12 @@
 
     if-eqz v0, :cond_2
 
-    const v1, 0x7f0803cf
+    const v1, 0x7f0803c1
 
     goto :goto_2
 
     :cond_2
-    const v1, 0x7f0803ce
+    const v1, 0x7f0803c0
 
     :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 7ab10420c6..9632662049 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 6
+    .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -125,13 +125,7 @@
 
     move-result-wide v1
 
-    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;
+    invoke-virtual {v0, v1, v2}, Lcom/discord/widgets/voice/model/CallModel$Companion;->get(J)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 7996047b52..451a028e75 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 9888b56753..fd0c2619c5 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 f1d91480de..17e256166b 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, 0x7f0a03ab
+    const v0, 0x7f0a03a6
 
     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, 0x7f0a03a8
+    const v0, 0x7f0a03a3
 
     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, 0x7f0a03a9
+    const v0, 0x7f0a03a4
 
     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, 0x7f0a03a1
+    const v0, 0x7f0a039c
 
     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, 0x7f0a03a3
+    const v0, 0x7f0a039e
 
     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, 0x7f0a03a5
+    const v0, 0x7f0a03a0
 
     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, 0x7f0a03a4
+    const v0, 0x7f0a039f
 
     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, 0x7f1209ff
+    const v8, 0x7f1209c9
 
     goto :goto_2
 
     :cond_5
-    const v8, 0x7f1209fa
+    const v8, 0x7f1209c4
 
     :goto_2
     invoke-virtual {v5, v8}, Landroid/widget/TextView;->setText(I)V
@@ -446,12 +446,12 @@
 
     if-eqz v8, :cond_6
 
-    const v8, 0x7f1213e1
+    const v8, 0x7f121355
 
     goto :goto_3
 
     :cond_6
-    const v8, 0x7f1213f5
+    const v8, 0x7f121369
 
     :goto_3
     invoke-virtual {v5, v8}, Landroid/widget/TextView;->setText(I)V
@@ -509,12 +509,12 @@
 
     if-eqz v0, :cond_8
 
-    const v0, 0x7f0803cf
+    const v0, 0x7f0803c1
 
     goto :goto_4
 
     :cond_8
-    const v0, 0x7f080303
+    const v0, 0x7f0802f7
 
     :goto_4
     invoke-virtual {p1, v0}, Landroid/widget/ImageView;->setImageResource(I)V
@@ -529,12 +529,12 @@
 
     if-eqz v0, :cond_9
 
-    const v0, 0x7f120450
+    const v0, 0x7f12042b
 
     goto :goto_5
 
     :cond_9
-    const v0, 0x7f120451
+    const v0, 0x7f12042c
 
     :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, 0x7f0d01e1
+    const v0, 0x7f0d01d6
 
     return v0
 .end method
@@ -821,7 +821,7 @@
 
     check-cast p1, Landroidx/fragment/app/Fragment;
 
-    const v0, 0x7f060080
+    const v0, 0x7f06007f
 
     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 b5a5b235ff..10e348d106 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, 0x7f0a0850
+    const p1, 0x7f0a0816
 
     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 582fada80d..20f0e23a82 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, 0x7f0d0114
+    const p2, 0x7f0d0112
 
     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 a168ff8561..01b4eeff15 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 2866e60a98..90c794e02d 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;->bKX:Lrx/internal/a/ba;
+    sget-object v0, Lrx/internal/a/ba$a;->bKS: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 54fa022ac1..e70fc589e0 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()Lrx/internal/a/ae;
 
     move-result-object v4
 
@@ -182,7 +182,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 5998d816cd..2f3e436276 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 b5fb924af1..eee24421c6 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 6d2e5434fc..d50b390246 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, 0x7f0a083c
+    const v0, 0x7f0a0802
 
     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, 0x7f0a083d
+    const v0, 0x7f0a0803
 
     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, 0x7f0a083e
+    const v0, 0x7f0a0804
 
     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, 0x7f0a0841
+    const v0, 0x7f0a0807
 
     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, 0x7f0a083f
+    const v0, 0x7f0a0805
 
     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, 0x7f0a084e
+    const v0, 0x7f0a0814
 
     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, 0x7f0a084c
+    const v0, 0x7f0a0812
 
     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, 0x7f0a084d
+    const v0, 0x7f0a0813
 
     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, 0x7f0a0851
+    const v0, 0x7f0a0817
 
     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, 0x7f0a0852
+    const v0, 0x7f0a0818
 
     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, 0x7f120d16
+    const v2, 0x7f120cdf
 
     const/4 v3, 0x1
 
@@ -578,7 +578,7 @@
 
     move-result-object v2
 
-    sget-object v3, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;->zV:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
+    sget-object v3, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;->zX: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;->zv:Lcom/discord/rtcconnection/RtcConnection$State$f;
+    sget-object v6, Lcom/discord/rtcconnection/RtcConnection$State$f;->zw: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;->zv:Lcom/discord/rtcconnection/RtcConnection$State$f;
+    sget-object v6, Lcom/discord/rtcconnection/RtcConnection$State$f;->zw: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, 0x7f0d01e2
+    const v0, 0x7f0d01d7
 
     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 1d9979039f..f8040b01c5 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, 0x7f0d00b9
+    const v0, 0x7f0d00b7
 
     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 178c0a4014..59caf4bb41 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, 0x7f0d00ba
+    const v0, 0x7f0d00b8
 
     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, 0x7f0a0855
+    const v0, 0x7f0a081b
 
     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 66d98b19df..769640ec8e 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,8 +28,6 @@
 
 .field private deafenIndicator:Landroid/widget/ImageView;
 
-.field private liveIndicator:Landroid/widget/TextView;
-
 .field private muteIndicator:Landroid/widget/ImageView;
 
 .field private name:Landroid/widget/TextView;
@@ -48,13 +46,13 @@
         }
     .end annotation
 
-    const v0, 0x7f0d00bb
+    const v0, 0x7f0d00b9
 
     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, 0x7f0a0858
+    const v0, 0x7f0a081d
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -66,7 +64,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderUser;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a0859
+    const v0, 0x7f0a081e
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -78,19 +76,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderUser;->itemView:Landroid/view/View;
 
-    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
+    const v0, 0x7f0a081a
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -102,7 +88,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderUser;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a0857
+    const v0, 0x7f0a081c
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -187,7 +173,7 @@
 
 # virtual methods
 .method protected onConfigure(ILcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;)V
-    .locals 4
+    .locals 3
 
     invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
@@ -209,106 +195,81 @@
 
     invoke-virtual {p2, v0}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelVoice$User;->getStream()Lcom/discord/models/domain/ModelApplicationStream;
+    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;
 
     move-result-object p2
 
-    const/4 v0, 0x1
+    if-eqz p2, :cond_4
 
-    const/4 v1, 0x0
+    iget-object p2, p0, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderUser;->deafenIndicator:Landroid/widget/ImageView;
 
-    if-eqz p2, :cond_0
+    const/4 v0, 0x0
 
-    const/4 p2, 0x1
+    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
 
     goto :goto_0
 
     :cond_0
-    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
+    const/4 v1, 0x0
 
     goto :goto_1
 
-    :cond_2
-    const/4 v2, 0x0
+    :cond_1
+    :goto_0
+    const/4 v1, 0x1
 
-    goto :goto_2
-
-    :cond_3
     :goto_1
-    const/4 v2, 0x1
+    invoke-direct {p0, v1}, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderUser;->getDeafenIcon(Z)I
 
-    :goto_2
-    invoke-direct {p0, v2}, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderUser;->getDeafenIcon(Z)I
+    move-result v1
 
-    move-result v2
-
-    invoke-virtual {p2, v2}, Landroid/widget/ImageView;->setImageResource(I)V
+    invoke-virtual {p2, v1}, 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 v2
+    move-result-object v1
 
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelVoice$State;->isSelfMute()Z
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelVoice$State;->isSelfMute()Z
 
-    move-result v2
+    move-result v1
 
-    if-nez v2, :cond_5
+    if-nez v1, :cond_2
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelVoice$User;->getVoiceState()Lcom/discord/models/domain/ModelVoice$State;
 
@@ -318,15 +279,12 @@
 
     move-result p1
 
-    if-eqz p1, :cond_4
+    if-eqz p1, :cond_3
 
-    goto :goto_3
+    :cond_2
+    const/4 v0, 0x1
 
-    :cond_4
-    const/4 v0, 0x0
-
-    :cond_5
-    :goto_3
+    :cond_3
     invoke-direct {p0, v0}, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderUser;->getMuteIcon(Z)I
 
     move-result p1
@@ -335,14 +293,16 @@
 
     return-void
 
-    :cond_6
+    :cond_4
     iget-object p1, p0, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderUser;->deafenIndicator:Landroid/widget/ImageView;
 
-    invoke-virtual {p1, v3}, Landroid/widget/ImageView;->setVisibility(I)V
+    const/16 p2, 0x8
+
+    invoke-virtual {p1, p2}, Landroid/widget/ImageView;->setVisibility(I)V
 
     iget-object p1, p0, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderUser;->muteIndicator:Landroid/widget/ImageView;
 
-    invoke-virtual {p1, v3}, Landroid/widget/ImageView;->setVisibility(I)V
+    invoke-virtual {p1, p2}, 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 1e04083d9b..c680906ef5 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 a94b196e63..7dd8937bfc 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;->zV:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
+    sget-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;->zX: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 a4192a1bde..83510fa0f3 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, 0x7f1213b1
+    const v0, 0x7f121325
 
     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 af637fc9dd..08f8dd7156 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, 0x7f0a0849
+    const p2, 0x7f0a080f
 
     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, 0x7f0a0844
+    const p2, 0x7f0a080a
 
     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, 0x7f0a084a
+    const p2, 0x7f0a0810
 
     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, 0x7f0a0845
+    const p2, 0x7f0a080b
 
     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, 0x7f0a0846
+    const p2, 0x7f0a080c
 
     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, 0x7f0a084b
+    const p2, 0x7f0a0811
 
     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, 0x7f0a0848
+    const p2, 0x7f0a080e
 
     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, 0x7f0a0847
+    const p2, 0x7f0a080d
 
     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, 0x7f0d00b8
+    const p3, 0x7f0d00b6
 
     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, 0x7f0402b6
+    const v1, 0x7f0402b5
 
     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, 0x7f1212b7
+    const v3, 0x7f12122a
 
     goto :goto_2
 
     :cond_2
-    const v3, 0x7f120c0b
+    const v3, 0x7f120bd4
 
     :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, 0x7f1212ae
+    const p1, 0x7f121221
 
     goto :goto_3
 
     :cond_3
-    const p1, 0x7f1204fc
+    const p1, 0x7f1204d7
 
     :goto_3
     invoke-virtual {v1, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -947,7 +947,7 @@
 
     move-result-object v0
 
-    const v4, 0x7f120451
+    const v4, 0x7f12042c
 
     invoke-virtual {v0, v4}, Landroid/widget/Button;->setText(I)V
 
@@ -970,7 +970,7 @@
 
     move-result-object v0
 
-    const v4, 0x7f1212a2
+    const v4, 0x7f121215
 
     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, 0x7f1203d8
+    const v4, 0x7f1203b3
 
     invoke-virtual {v0, v4}, Landroid/widget/Button;->setText(I)V
 
@@ -1013,7 +1013,7 @@
 
     move-result-object v0
 
-    const v4, 0x7f1203d7
+    const v4, 0x7f1203b2
 
     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, 0x7f120d16
+    const v4, 0x7f120cdf
 
     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 d9ff5de917..7b46a4aabb 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 0x7f0a0464
+    .packed-switch 0x7f0a045f
         :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 5dd601f4c5..080d2651e4 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, 0x7f0a0464
+    const v1, 0x7f0a045f
 
     invoke-interface {p1, v1}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
 
@@ -101,7 +101,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    const v1, 0x7f0a0465
+    const v1, 0x7f0a0460
 
     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$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCall$configureUI$1.smali
index 57069df4b3..7c25abd350 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCall$configureUI$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCall$configureUI$1.smali
@@ -51,7 +51,7 @@
 
 # virtual methods
 .method public final call(Lcom/discord/models/domain/ModelVoice$User;)V
-    .locals 10
+    .locals 9
 
     sget-object v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->Companion:Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;
 
@@ -77,26 +77,30 @@
 
     move-result-wide v3
 
+    invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v3
+
     iget-object p1, p0, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCall$configureUI$1;->this$0:Lcom/discord/widgets/voice/fullscreen/WidgetGuildCall;
 
     invoke-virtual {p1}, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCall;->getFragmentManager()Landroidx/fragment/app/FragmentManager;
 
-    move-result-object v5
+    move-result-object v4
 
-    if-nez v5, :cond_0
+    if-nez v4, :cond_0
 
     return-void
 
     :cond_0
-    const/4 v6, 0x0
+    const/4 v5, 0x0
 
-    sget-object v7, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
+    sget-object v6, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
-    const/16 v8, 0x8
+    const/16 v7, 0x8
 
-    const/4 v9, 0x0
+    const/4 v8, 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
+    invoke-static/range {v0 .. v8}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;->show$default(Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;JLjava/lang/Long;Landroidx/fragment/app/FragmentManager;Ljava/lang/Long;Ljava/lang/Boolean;ILjava/lang/Object;)V
 
     return-void
 .end method
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 478404db31..96ccf5ce5a 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 d90d9786f6..24d937995c 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 46334e96a6..9e2c09f56e 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 448bf2bc7a..6fc9fbe18e 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, 0x7f120451
+    const v0, 0x7f12042c
 
     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 006553d90b..adeee74c48 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, 0x7f120dce
+    const v0, 0x7f120d94
 
     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 91c1b70664..027f583883 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 dec3edc025..a1d6eb897a 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, 0x7f0a034c
+    const v0, 0x7f0a0347
 
     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, 0x7f0a034a
+    const v0, 0x7f0a0345
 
     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, 0x7f0a034b
+    const v0, 0x7f0a0346
 
     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_4
+    if-eqz p1, :cond_5
 
     invoke-virtual {p1}, Lcom/discord/widgets/voice/model/CallModel;->getChannel()Lcom/discord/models/domain/ModelChannel;
 
@@ -244,15 +244,38 @@
 
     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_1
+    if-nez v1, :cond_2
 
     invoke-static {v2}, Lkotlin/jvm/internal/l;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    :cond_1
+    :cond_2
     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
@@ -265,11 +288,11 @@
 
     move-result-object v1
 
-    if-eqz v1, :cond_2
+    if-eqz v1, :cond_3
 
     invoke-direct {p0, p1}, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCall;->configureMenu(Lcom/discord/widgets/voice/model/CallModel;)V
 
-    :cond_2
+    :cond_3
     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;
@@ -308,11 +331,11 @@
 
     iget-object p2, p0, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCall;->participantsAdapter:Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter;
 
-    if-nez p2, :cond_3
+    if-nez p2, :cond_4
 
     invoke-static {v2}, Lkotlin/jvm/internal/l;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    :cond_3
+    :cond_4
     invoke-virtual {p1}, Lcom/discord/widgets/voice/model/CallModel;->getListItems()Ljava/util/List;
 
     move-result-object p1
@@ -321,17 +344,17 @@
 
     return-void
 
-    :cond_4
+    :cond_5
     :goto_0
     invoke-virtual {p0}, Lcom/discord/widgets/voice/fullscreen/WidgetGuildCall;->getActivity()Landroidx/fragment/app/FragmentActivity;
 
     move-result-object p1
 
-    if-eqz p1, :cond_5
+    if-eqz p1, :cond_6
 
     invoke-virtual {p1}, Landroidx/fragment/app/FragmentActivity;->finish()V
 
-    :cond_5
+    :cond_6
     return-void
 .end method
 
@@ -414,7 +437,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d012d
+    const v0, 0x7f0d012b
 
     return v0
 .end method
@@ -436,7 +459,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f04016c
+    const v0, 0x7f04016d
 
     const/4 v1, 0x0
 
@@ -496,17 +519,9 @@
 
     move-result-wide v0
 
-    sget-object v4, Lcom/discord/widgets/voice/model/CallModel;->Companion:Lcom/discord/widgets/voice/model/CallModel$Companion;
+    sget-object v2, Lcom/discord/widgets/voice/model/CallModel;->Companion:Lcom/discord/widgets/voice/model/CallModel$Companion;
 
-    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;
+    invoke-virtual {v2, v0, v1}, Lcom/discord/widgets/voice/model/CallModel$Companion;->get(J)Lrx/Observable;
 
     move-result-object v2
 
@@ -522,9 +537,9 @@
 
     move-result-object v2
 
-    sget-object v3, Lcom/discord/samsung/a;->Bc:Lcom/discord/samsung/a;
+    sget-object v3, Lcom/discord/samsung/a;->Bf:Lcom/discord/samsung/a;
 
-    invoke-static {}, Lcom/discord/samsung/a;->eL()Lrx/Observable;
+    invoke-static {}, Lcom/discord/samsung/a;->eK()Lrx/Observable;
 
     move-result-object v3
 
@@ -552,8 +567,12 @@
 
     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
@@ -602,7 +621,7 @@
 
     check-cast v6, Lkotlin/jvm/functions/Function1;
 
-    const v7, 0x7f0802fd
+    const v7, 0x7f0802f1
 
     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
deleted file mode 100644
index 200e8348ff..0000000000
--- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetSpectators$Companion.smali
+++ /dev/null
@@ -1,56 +0,0 @@
-.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
deleted file mode 100644
index c1931271d6..0000000000
--- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetSpectators$configureUI$1.smali
+++ /dev/null
@@ -1,111 +0,0 @@
-.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
deleted file mode 100644
index 929eeebe3e..0000000000
--- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetSpectators$onViewBoundOrOnResume$1.smali
+++ /dev/null
@@ -1,69 +0,0 @@
-.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
deleted file mode 100644
index e515f45dce..0000000000
--- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetSpectators.smali
+++ /dev/null
@@ -1,337 +0,0 @@
-.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
deleted file mode 100644
index 5a112b9830..0000000000
--- a/com.discord/smali_classes2/com/discord/widgets/voice/model/CallModel$Companion$WhenMappings.smali
+++ /dev/null
@@ -1,46 +0,0 @@
-.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
deleted file mode 100644
index 6591f6498f..0000000000
--- a/com.discord/smali_classes2/com/discord/widgets/voice/model/CallModel$Companion$createConnectedListItems$usersOnCallListItems$2.smali
+++ /dev/null
@@ -1,180 +0,0 @@
-.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 954758a505..7f1ead2ff1 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 Lcom/discord/widgets/voice/model/CallModel$Companion$get$1$1;
-.super Ljava/lang/Object;
+.class final synthetic Lcom/discord/widgets/voice/model/CallModel$Companion$get$1$1;
+.super Lkotlin/jvm/internal/j;
 .source "CallModel.kt"
 
 # interfaces
-.implements Lrx/functions/Func8;
+.implements Lkotlin/jvm/functions/Function9;
 
 
 # annotations
@@ -12,66 +12,84 @@
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
+    accessFlags = 0x1018
     name = null
 .end annotation
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "<T1:",
-        "Ljava/lang/Object;",
-        "T2:",
-        "Ljava/lang/Object;",
-        "T3:",
-        "Ljava/lang/Object;",
-        "T4:",
-        "Ljava/lang/Object;",
-        "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;>;"
+        "Lkotlin/jvm/internal/j;",
+        "Lkotlin/jvm/functions/Function9<",
+        "Lcom/discord/models/domain/ModelChannel;",
+        "Ljava/lang/Long;",
+        "Ljava/lang/Long;",
+        "Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelVoice$User;",
+        ">;",
+        "Ljava/lang/Integer;",
+        "Ljava/util/List<",
+        "+",
+        "Lco/discord/media_engine/VideoInputDeviceDescription;",
+        ">;",
+        "Lco/discord/media_engine/VideoInputDeviceDescription;",
+        "Ljava/lang/Boolean;",
+        "Lcom/discord/widgets/voice/model/CallModel;",
+        ">;"
     }
 .end annotation
 
 
-# instance fields
-.field final synthetic $channel:Lcom/discord/models/domain/ModelChannel;
-
-.field final synthetic this$0:Lcom/discord/widgets/voice/model/CallModel$Companion$get$1;
-
-
 # direct methods
-.method constructor <init>(Lcom/discord/widgets/voice/model/CallModel$Companion$get$1;Lcom/discord/models/domain/ModelChannel;)V
-    .locals 0
+.method constructor <init>(Lcom/discord/widgets/voice/model/CallModel$Companion;)V
+    .locals 1
 
-    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;
+    const/16 v0, 0x9
 
-    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
+    invoke-direct {p0, v0, p1}, Lkotlin/jvm/internal/j;-><init>(ILjava/lang/Object;)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final call(Ljava/lang/Long;Ljava/lang/Long;Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;Ljava/util/Map;Ljava/lang/Integer;Ljava/util/List;Lco/discord/media_engine/VideoInputDeviceDescription;Ljava/lang/Boolean;)Lcom/discord/widgets/voice/model/CallModel;
-    .locals 14
+.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
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
-            "Ljava/lang/Long;",
-            "Ljava/lang/Long;",
+            "Lcom/discord/models/domain/ModelChannel;",
+            "JJ",
             "Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;",
             "Ljava/util/Map<",
             "Ljava/lang/Long;",
@@ -83,107 +101,114 @@
             "Lco/discord/media_engine/VideoInputDeviceDescription;",
             ">;",
             "Lco/discord/media_engine/VideoInputDeviceDescription;",
-            "Ljava/lang/Boolean;",
-            ")",
+            "Z)",
             "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
 
-    sget-object v1, Lcom/discord/widgets/voice/model/CallModel;->Companion:Lcom/discord/widgets/voice/model/CallModel$Companion;
+    iget-object v1, v0, Lcom/discord/widgets/voice/model/CallModel$Companion$get$1$1;->receiver:Ljava/lang/Object;
 
-    iget-object v2, v0, Lcom/discord/widgets/voice/model/CallModel$Companion$get$1$1;->$channel:Lcom/discord/models/domain/ModelChannel;
+    check-cast v1, Lcom/discord/widgets/voice/model/CallModel$Companion;
 
-    const-string v3, "myUserId"
+    move-wide v3, p2
 
-    move-object v4, p1
+    move-wide/from16 v5, p4
 
-    invoke-static {p1, v3}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    move-object/from16 v9, p8
 
-    invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
+    move-object/from16 v11, p10
 
-    move-result-wide v3
+    move/from16 v12, p11
 
-    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;
+    invoke-static/range {v1 .. v12}, Lcom/discord/widgets/voice/model/CallModel$Companion;->access$create(Lcom/discord/widgets/voice/model/CallModel$Companion;Lcom/discord/models/domain/ModelChannel;JJLcom/discord/stores/StoreMediaSettings$VoiceConfiguration;Ljava/util/Map;Ljava/lang/Integer;Ljava/util/List;Lco/discord/media_engine/VideoInputDeviceDescription;Z)Lcom/discord/widgets/voice/model/CallModel;
 
     move-result-object v1
 
     return-object v1
 .end method
 
-.method public final 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
+.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
 
-    check-cast p1, Ljava/lang/Long;
+    move-object v1, p1
 
-    check-cast p2, Ljava/lang/Long;
+    check-cast v1, Lcom/discord/models/domain/ModelChannel;
 
-    check-cast p3, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
+    move-object v0, p2
 
-    check-cast p4, Ljava/util/Map;
+    check-cast v0, Ljava/lang/Number;
 
-    check-cast p5, Ljava/lang/Integer;
+    invoke-virtual {v0}, Ljava/lang/Number;->longValue()J
 
-    check-cast p6, Ljava/util/List;
+    move-result-wide v2
 
-    check-cast p7, Lco/discord/media_engine/VideoInputDeviceDescription;
+    move-object v0, p3
 
-    check-cast p8, Ljava/lang/Boolean;
+    check-cast v0, Ljava/lang/Number;
 
-    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;
+    invoke-virtual {v0}, Ljava/lang/Number;->longValue()J
 
-    move-result-object p1
+    move-result-wide v4
 
-    return-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
 .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 4c468caec5..945f97fa51 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(JLcom/discord/widgets/voice/model/CallModel$Type;)Lrx/Observable;
+    value = Lcom/discord/widgets/voice/model/CallModel$Companion;->get(J)Lrx/Observable;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -35,17 +35,13 @@
 # instance fields
 .field final synthetic $channelId:J
 
-.field final synthetic $type:Lcom/discord/widgets/voice/model/CallModel$Type;
-
 
 # direct methods
-.method constructor <init>(JLcom/discord/widgets/voice/model/CallModel$Type;)V
+.method constructor <init>(J)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
@@ -90,101 +86,111 @@
     return-object p1
 
     :cond_0
-    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;
+    invoke-static {p1}, Lrx/Observable;->bq(Ljava/lang/Object;)Lrx/Observable;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/discord/stores/StoreUser;->getMeId()Lrx/Observable;
+    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
 
-    sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+    invoke-virtual {v1}, Lcom/discord/stores/StoreUser;->getMeId()Lrx/Observable;
 
-    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getVoiceChannelSelected()Lcom/discord/stores/StoreVoiceChannelSelected;
+    move-result-object v1
 
-    move-result-object v0
+    sget-object v2, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
-    invoke-virtual {v0}, Lcom/discord/stores/StoreVoiceChannelSelected;->getTimeChannelSelected()Lrx/Observable;
+    invoke-virtual {v2}, Lcom/discord/stores/StoreStream$Companion;->getVoiceChannelSelected()Lcom/discord/stores/StoreVoiceChannelSelected;
 
     move-result-object v2
 
-    sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+    invoke-virtual {v2}, Lcom/discord/stores/StoreVoiceChannelSelected;->getTimeChannelSelected()Lrx/Observable;
 
-    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getMediaSettings()Lcom/discord/stores/StoreMediaSettings;
+    move-result-object v2
 
-    move-result-object v0
+    sget-object v3, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
-    invoke-virtual {v0}, Lcom/discord/stores/StoreMediaSettings;->getVoiceConfiguration()Lrx/Observable;
+    invoke-virtual {v3}, Lcom/discord/stores/StoreStream$Companion;->getMediaSettings()Lcom/discord/stores/StoreMediaSettings;
 
     move-result-object v3
 
-    sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+    invoke-virtual {v3}, Lcom/discord/stores/StoreMediaSettings;->getVoiceConfiguration()Lrx/Observable;
 
-    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getVoiceParticipants()Lcom/discord/stores/StoreVoiceParticipants;
+    move-result-object v3
 
-    move-result-object v0
+    sget-object v4, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
-    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;
+    invoke-virtual {v4}, Lcom/discord/stores/StoreStream$Companion;->getVoiceParticipants()Lcom/discord/stores/StoreVoiceParticipants;
 
     move-result-object v4
 
-    sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+    iget-wide v5, p0, Lcom/discord/widgets/voice/model/CallModel$Companion$get$1;->$channelId:J
 
-    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getPermissions()Lcom/discord/stores/StorePermissions;
+    invoke-virtual {v4, v5, v6}, Lcom/discord/stores/StoreVoiceParticipants;->get(J)Lrx/Observable;
 
-    move-result-object v0
+    move-result-object v4
 
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getId()J
+    sget-object v5, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
-    move-result-wide v5
-
-    invoke-virtual {v0, v5, v6}, Lcom/discord/stores/StorePermissions;->getForChannel(J)Lrx/Observable;
+    invoke-virtual {v5}, Lcom/discord/stores/StoreStream$Companion;->getPermissions()Lcom/discord/stores/StorePermissions;
 
     move-result-object v5
 
-    sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getId()J
 
-    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getMediaEngine()Lcom/discord/stores/StoreMediaEngine;
+    move-result-wide v6
 
-    move-result-object v0
+    invoke-virtual {v5, v6, v7}, Lcom/discord/stores/StorePermissions;->getForChannel(J)Lrx/Observable;
 
-    invoke-virtual {v0}, Lcom/discord/stores/StoreMediaEngine;->getVideoInputDevices()Lrx/Observable;
+    move-result-object v5
+
+    sget-object p1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+
+    invoke-virtual {p1}, Lcom/discord/stores/StoreStream$Companion;->getMediaEngine()Lcom/discord/stores/StoreMediaEngine;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Lcom/discord/stores/StoreMediaEngine;->getVideoInputDevices()Lrx/Observable;
 
     move-result-object v6
 
-    sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+    sget-object p1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
-    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getMediaEngine()Lcom/discord/stores/StoreMediaEngine;
+    invoke-virtual {p1}, Lcom/discord/stores/StoreStream$Companion;->getMediaEngine()Lcom/discord/stores/StoreMediaEngine;
 
-    move-result-object v0
+    move-result-object p1
 
-    invoke-virtual {v0}, Lcom/discord/stores/StoreMediaEngine;->getSelectedVideoInputDevice()Lrx/Observable;
+    invoke-virtual {p1}, Lcom/discord/stores/StoreMediaEngine;->getSelectedVideoInputDevice()Lrx/Observable;
 
     move-result-object v7
 
-    sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+    sget-object p1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
-    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getVideoSupport()Lcom/discord/stores/StoreVideoSupport;
+    invoke-virtual {p1}, Lcom/discord/stores/StoreStream$Companion;->getVideoSupport()Lcom/discord/stores/StoreVideoSupport;
 
-    move-result-object v0
+    move-result-object p1
 
-    invoke-virtual {v0}, Lcom/discord/stores/StoreVideoSupport;->get()Lrx/Observable;
+    invoke-virtual {p1}, Lcom/discord/stores/StoreVideoSupport;->get()Lrx/Observable;
 
     move-result-object v8
 
-    new-instance v0, Lcom/discord/widgets/voice/model/CallModel$Companion$get$1$1;
+    new-instance p1, Lcom/discord/widgets/voice/model/CallModel$Companion$get$1$1;
 
-    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
+    sget-object v9, Lcom/discord/widgets/voice/model/CallModel;->Companion:Lcom/discord/widgets/voice/model/CallModel$Companion;
 
-    move-object v9, v0
+    invoke-direct {p1, v9}, Lcom/discord/widgets/voice/model/CallModel$Companion$get$1$1;-><init>(Lcom/discord/widgets/voice/model/CallModel$Companion;)V
 
-    check-cast v9, Lrx/functions/Func8;
+    check-cast p1, Lkotlin/jvm/functions/Function9;
 
-    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;
+    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;
 
     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
deleted file mode 100644
index b1757dda57..0000000000
--- a/com.discord/smali_classes2/com/discord/widgets/voice/model/CallModel$Companion$userItemsComparator$1.smali
+++ /dev/null
@@ -1,180 +0,0 @@
-.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 a49628cbf3..04e9759521 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;ZLcom/discord/widgets/voice/model/CallModel$Type;)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;Z)Lcom/discord/widgets/voice/model/CallModel;
     .locals 0
 
-    invoke-direct/range {p0 .. p12}, Lcom/discord/widgets/voice/model/CallModel$Companion;->create(Lcom/discord/models/domain/ModelChannel;JJLcom/discord/stores/StoreMediaSettings$VoiceConfiguration;Ljava/util/Map;Ljava/lang/Integer;Ljava/util/List;Lco/discord/media_engine/VideoInputDeviceDescription;ZLcom/discord/widgets/voice/model/CallModel$Type;)Lcom/discord/widgets/voice/model/CallModel;
+    invoke-direct/range {p0 .. p11}, Lcom/discord/widgets/voice/model/CallModel$Companion;->create(Lcom/discord/models/domain/ModelChannel;JJLcom/discord/stores/StoreMediaSettings$VoiceConfiguration;Ljava/util/Map;Ljava/lang/Integer;Ljava/util/List;Lco/discord/media_engine/VideoInputDeviceDescription;Z)Lcom/discord/widgets/voice/model/CallModel;
 
     move-result-object p0
 
     return-object p0
 .end method
 
-.method private final create(Lcom/discord/models/domain/ModelChannel;JJLcom/discord/stores/StoreMediaSettings$VoiceConfiguration;Ljava/util/Map;Ljava/lang/Integer;Ljava/util/List;Lco/discord/media_engine/VideoInputDeviceDescription;ZLcom/discord/widgets/voice/model/CallModel$Type;)Lcom/discord/widgets/voice/model/CallModel;
-    .locals 16
+.method private final create(Lcom/discord/models/domain/ModelChannel;JJLcom/discord/stores/StoreMediaSettings$VoiceConfiguration;Ljava/util/Map;Ljava/lang/Integer;Ljava/util/List;Lco/discord/media_engine/VideoInputDeviceDescription;Z)Lcom/discord/widgets/voice/model/CallModel;
+    .locals 17
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -59,15 +59,11 @@
             "Lco/discord/media_engine/VideoInputDeviceDescription;",
             ">;",
             "Lco/discord/media_engine/VideoInputDeviceDescription;",
-            "Z",
-            "Lcom/discord/widgets/voice/model/CallModel$Type;",
-            ")",
+            "Z)",
             "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
@@ -76,7 +72,7 @@
 
     if-eqz v0, :cond_0
 
-    const/4 v13, 0x0
+    const/4 v15, 0x0
 
     goto :goto_1
 
@@ -93,135 +89,36 @@
     :goto_0
     invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v3
+    move-result v2
 
-    if-eqz v3, :cond_2
+    if-eqz v2, :cond_2
 
     invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object v3
+    move-result-object v2
 
-    check-cast v3, Ljava/util/Map$Entry;
+    check-cast v2, Ljava/util/Map$Entry;
 
-    invoke-interface {v3}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
+    invoke-interface {v2}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
 
-    move-result-object v3
+    move-result-object v2
 
-    check-cast v3, Lcom/discord/models/domain/ModelVoice$User;
+    check-cast v2, Lcom/discord/models/domain/ModelVoice$User;
 
-    invoke-virtual {v3}, Lcom/discord/models/domain/ModelVoice$User;->isConnected()Z
+    invoke-virtual {v2}, Lcom/discord/models/domain/ModelVoice$User;->isConnected()Z
 
-    move-result v3
+    move-result v2
 
-    if-eqz v3, :cond_1
+    if-eqz v2, :cond_1
 
     add-int/lit8 v1, v1, 0x1
 
     goto :goto_0
 
     :cond_2
-    move v13, v1
+    move v15, 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
@@ -234,531 +131,238 @@
 
     invoke-direct {v2}, Ljava/util/ArrayList;-><init>()V
 
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getType()I
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelChannel;->getType()I
 
     move-result v3
 
     const/4 v4, 0x1
 
-    if-eq v3, v4, :cond_5
+    if-eq v3, v4, :cond_7
 
-    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;
+    invoke-interface/range {p7 .. p7}, Ljava/util/Map;->values()Ljava/util/Collection;
 
     move-result-object v3
 
-    check-cast v3, Lcom/discord/models/domain/ModelVoice$User;
+    check-cast v3, Ljava/lang/Iterable;
 
-    invoke-virtual {v3}, Lcom/discord/models/domain/ModelVoice$User;->isConnected()Z
+    invoke-interface {v3}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object v3
+
+    :goto_2
+    invoke-interface {v3}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v5
 
-    if-eqz v5, :cond_0
+    if-eqz v5, :cond_4
 
-    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;
+    invoke-interface {v3}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
     move-result-object v5
 
     check-cast v5, Lcom/discord/models/domain/ModelVoice$User;
 
-    new-instance v6, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemVoiceUser;
+    invoke-virtual {v5}, Lcom/discord/models/domain/ModelVoice$User;->isConnected()Z
 
-    invoke-direct {v6, v5}, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemVoiceUser;-><init>(Lcom/discord/models/domain/ModelVoice$User;)V
+    move-result v6
 
-    invoke-interface {v3, v6}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+    if-eqz v6, :cond_3
 
-    goto :goto_1
-
-    :cond_2
-    check-cast v3, Ljava/util/List;
-
-    check-cast v3, Ljava/lang/Iterable;
-
-    sget-object v1, Lcom/discord/widgets/voice/model/CallModel$Companion$createConnectedListItems$usersOnCallListItems$2;->INSTANCE:Lcom/discord/widgets/voice/model/CallModel$Companion$createConnectedListItems$usersOnCallListItems$2;
-
-    check-cast v1, Ljava/util/Comparator;
-
-    invoke-static {v3, v1}, Lkotlin/a/m;->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
+    invoke-virtual {v0, v5}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
     goto :goto_2
 
-    :cond_5
-    check-cast v0, Ljava/util/List;
+    :cond_3
+    invoke-virtual {v1, v5}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
-    return-object v0
-.end method
+    goto :goto_2
 
-.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
+    :cond_4
+    move-object v3, v0
 
-    new-instance v0, Ljava/util/ArrayList;
+    check-cast v3, Ljava/util/Collection;
 
-    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
+    invoke-interface {v3}, Ljava/util/Collection;->isEmpty()Z
 
     move-result v3
 
-    if-eqz v3, :cond_1
+    xor-int/2addr v3, v4
 
-    invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+    if-eqz v3, :cond_5
 
-    move-result-object v3
+    new-instance v3, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemHeader;
 
-    check-cast v3, Lcom/discord/models/domain/ModelVoice$User;
+    const v4, 0x7f1209c3
 
-    invoke-virtual {v3}, Lcom/discord/models/domain/ModelVoice$User;->isConnected()Z
-
-    move-result v4
-
-    if-eqz v4, :cond_0
-
-    invoke-virtual {v1, v3}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    goto :goto_0
-
-    :cond_0
-    invoke-virtual {v2, v3}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    goto :goto_0
-
-    :cond_1
-    move-object p1, v1
-
-    check-cast p1, Ljava/util/Collection;
-
-    invoke-interface {p1}, Ljava/util/Collection;->isEmpty()Z
-
-    move-result p1
-
-    xor-int/lit8 p1, p1, 0x1
-
-    new-instance v2, Ljava/util/ArrayList;
-
-    invoke-direct {v2}, Ljava/util/ArrayList;-><init>()V
-
-    new-instance v3, Ljava/util/ArrayList;
-
-    invoke-direct {v3}, Ljava/util/ArrayList;-><init>()V
-
-    check-cast v1, Ljava/lang/Iterable;
-
-    invoke-interface {v1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object v1
-
-    :cond_2
-    :goto_1
-    invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v4
-
-    if-eqz v4, :cond_4
-
-    invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+    invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v4
 
-    check-cast v4, Lcom/discord/models/domain/ModelVoice$User;
+    invoke-direct {v3, v4}, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemHeader;-><init>(Ljava/lang/Integer;)V
 
-    invoke-virtual {v4}, Lcom/discord/models/domain/ModelVoice$User;->getStream()Lcom/discord/models/domain/ModelApplicationStream;
+    invoke-virtual {v2, v3}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
-    move-result-object v5
+    move-object v3, v0
 
-    if-nez v5, :cond_2
+    check-cast v3, Ljava/lang/Iterable;
 
-    invoke-virtual {v4}, Lcom/discord/models/domain/ModelVoice$User;->isSpectating()Z
+    invoke-interface {v3}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
-    move-result v5
+    move-result-object v3
 
-    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
-
-    invoke-direct {p1, v1}, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemHeader;-><init>(Ljava/lang/Integer;)V
-
-    invoke-virtual {v0, p1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    check-cast v2, Ljava/lang/Iterable;
-
-    new-instance p1, Ljava/util/ArrayList;
-
-    const/16 v1, 0xa
-
-    invoke-static {v2, v1}, Lkotlin/a/m;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
-
-    move-result v4
-
-    invoke-direct {p1, v4}, Ljava/util/ArrayList;-><init>(I)V
-
-    check-cast p1, Ljava/util/Collection;
-
-    invoke-interface {v2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object v2
-
-    :goto_2
-    invoke-interface {v2}, Ljava/util/Iterator;->hasNext()Z
+    :goto_3
+    invoke-interface {v3}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v4
 
     if-eqz v4, :cond_5
 
-    invoke-interface {v2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+    invoke-interface {v3}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
     move-result-object v4
 
+    move-object v5, v2
+
+    check-cast v5, Ljava/util/Collection;
+
     check-cast v4, Lcom/discord/models/domain/ModelVoice$User;
 
-    new-instance v5, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemVoiceUser;
+    new-instance v6, 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-direct {v6, 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
+    invoke-interface {v5, v6}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
 
     goto :goto_3
 
+    :cond_5
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelChannel;->getType()I
+
+    move-result v3
+
+    const/4 v4, 0x2
+
+    if-eq v3, v4, :cond_7
+
+    invoke-virtual {v1}, Ljava/util/ArrayList;->isEmpty()Z
+
+    move-result v3
+
+    if-nez v3, :cond_6
+
+    invoke-virtual {v0}, Ljava/util/ArrayList;->isEmpty()Z
+
+    move-result v0
+
+    if-nez v0, :cond_6
+
+    new-instance v0, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemDivider;
+
+    invoke-direct {v0}, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemDivider;-><init>()V
+
+    invoke-virtual {v2, v0}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
     :cond_6
-    check-cast p1, Ljava/util/List;
+    invoke-virtual {v1}, Ljava/util/ArrayList;->isEmpty()Z
 
-    check-cast p1, Ljava/lang/Iterable;
+    move-result v0
 
-    invoke-static {}, Lcom/discord/widgets/voice/model/CallModel;->access$getUserItemsComparator$cp()Ljava/util/Comparator;
+    if-nez v0, :cond_7
+
+    new-instance v0, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemHeader;
+
+    const v3, 0x7f120c43
+
+    invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v3
+
+    invoke-direct {v0, v3}, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemHeader;-><init>(Ljava/lang/Integer;)V
+
+    invoke-virtual {v2, v0}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    check-cast v1, Ljava/lang/Iterable;
+
+    invoke-interface {v1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object v0
+
+    :goto_4
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v1
+
+    if-eqz v1, :cond_7
+
+    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
     move-result-object v1
 
-    invoke-static {p1, v1}, Lkotlin/a/m;->sortedWith(Ljava/lang/Iterable;Ljava/util/Comparator;)Ljava/util/List;
+    move-object v3, v2
 
-    move-result-object p1
+    check-cast v3, Ljava/util/Collection;
 
-    check-cast p1, Ljava/util/Collection;
+    check-cast v1, Lcom/discord/models/domain/ModelVoice$User;
 
-    invoke-virtual {v0, p1}, Ljava/util/ArrayList;->addAll(Ljava/util/Collection;)Z
+    new-instance v4, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemVoiceUser;
+
+    invoke-direct {v4, v1}, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemVoiceUser;-><init>(Lcom/discord/models/domain/ModelVoice$User;)V
+
+    invoke-interface {v3, v4}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+
+    goto :goto_4
 
     :cond_7
-    check-cast v0, Ljava/util/List;
+    new-instance v0, Lcom/discord/widgets/voice/model/CallModel;
+
+    move-object v3, v2
+
+    check-cast v3, Ljava/util/List;
+
+    invoke-virtual/range {p6 .. p6}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->getInputMode()Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
+
+    move-result-object v13
+
+    invoke-virtual/range {p6 .. p6}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->getOutputMode()Lcom/discord/models/domain/ModelVoice$OutputMode;
+
+    move-result-object v14
+
+    move-object v2, v0
+
+    move-object/from16 v4, p7
+
+    move-wide/from16 v5, p2
+
+    move-wide/from16 v7, p4
+
+    move-object/from16 v9, p9
+
+    move-object/from16 v10, p10
+
+    move/from16 v11, p11
+
+    move-object/from16 v12, p1
+
+    move-object/from16 v16, p8
+
+    invoke-direct/range {v2 .. v16}, Lcom/discord/widgets/voice/model/CallModel;-><init>(Ljava/util/List;Ljava/util/Map;JJLjava/util/List;Lco/discord/media_engine/VideoInputDeviceDescription;ZLcom/discord/models/domain/ModelChannel;Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;Lcom/discord/models/domain/ModelVoice$OutputMode;ILjava/lang/Integer;)V
 
     return-object v0
 .end method
 
-.method public static synthetic get$default(Lcom/discord/widgets/voice/model/CallModel$Companion;JLcom/discord/widgets/voice/model/CallModel$Type;ILjava/lang/Object;)Lrx/Observable;
-    .locals 0
-
-    and-int/lit8 p4, p4, 0x2
-
-    if-eqz p4, :cond_0
-
-    sget-object p3, Lcom/discord/widgets/voice/model/CallModel$Type;->CONNECTED:Lcom/discord/widgets/voice/model/CallModel$Type;
-
-    :cond_0
-    invoke-virtual {p0, p1, p2, p3}, Lcom/discord/widgets/voice/model/CallModel$Companion;->get(JLcom/discord/widgets/voice/model/CallModel$Type;)Lrx/Observable;
-
-    move-result-object p0
-
-    return-object p0
-.end method
-
 
 # virtual methods
-.method public final get(JLcom/discord/widgets/voice/model/CallModel$Type;)Lrx/Observable;
+.method public final get(J)Lrx/Observable;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "(J",
-            "Lcom/discord/widgets/voice/model/CallModel$Type;",
-            ")",
+            "(J)",
             "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;
@@ -771,7 +375,7 @@
 
     new-instance v1, Lcom/discord/widgets/voice/model/CallModel$Companion$get$1;
 
-    invoke-direct {v1, p1, p2, p3}, Lcom/discord/widgets/voice/model/CallModel$Companion$get$1;-><init>(JLcom/discord/widgets/voice/model/CallModel$Type;)V
+    invoke-direct {v1, p1, p2}, Lcom/discord/widgets/voice/model/CallModel$Companion$get$1;-><init>(J)V
 
     check-cast v1, Lrx/functions/b;
 
@@ -787,7 +391,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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
deleted file mode 100644
index 78576f7553..0000000000
--- a/com.discord/smali_classes2/com/discord/widgets/voice/model/CallModel$Type.smali
+++ /dev/null
@@ -1,109 +0,0 @@
-.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
new file mode 100644
index 0000000000..d5505a68a1
--- /dev/null
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/model/CallModel$sam$rx_functions_Func9$0.smali
@@ -0,0 +1,56 @@
+.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 7215a12a3f..d2f7d6adb3 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,7 +9,6 @@
 # annotations
 .annotation system Ldalvik/annotation/MemberClasses;
     value = {
-        Lcom/discord/widgets/voice/model/CallModel$Type;,
         Lcom/discord/widgets/voice/model/CallModel$Companion;
     }
 .end annotation
@@ -18,16 +17,6 @@
 # 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;
@@ -94,12 +83,6 @@
 
     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
 
@@ -263,14 +246,6 @@
     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 6017040de9..4d0be74f63 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;->Jo()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jm()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 f1ec7d68b5..e2ecd4155e 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, 0x7f0a044f
+    const p2, 0x7f0a044a
 
     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 d84742e211..58bcf50318 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 9bf34e55f5..281508c652 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -67,7 +67,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f1203e3
+    const v0, 0x7f1203be
 
     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 fa441688e2..a186924bb0 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, 0x7f0a07b8
+    const v0, 0x7f0a078b
 
     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, 0x7f0a0251
+    const v0, 0x7f0a0250
 
     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, 0x7f0a06fe
+    const v0, 0x7f0a06e5
 
     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, 0x7f0a00cb
+    const v0, 0x7f0a00ca
 
     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, 0x7f0a0250
+    const v0, 0x7f0a024f
 
     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, 0x7f0a06a5
+    const v0, 0x7f0a068c
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -358,8 +358,8 @@
     .array-data 4
         0x7f0a0164
         0x7f0a0165
-        0x7f0a0251
         0x7f0a0250
+        0x7f0a024f
     .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, 0x7f1203e2
+    const v0, 0x7f1203bd
 
     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, 0x7f0e0020
+    const v5, 0x7f0e001a
 
     new-instance v0, Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$1;
 
@@ -581,7 +581,7 @@
 
     move-result-object v0
 
-    const v4, 0x7f12062c
+    const v4, 0x7f120607
 
     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, 0x7f120612
+    const v5, 0x7f1205ed
 
     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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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, 0x7f0d00d8
+    const v1, 0x7f0d00d6
 
     const/4 v2, 0x0
 
@@ -912,7 +912,7 @@
 
     aput-object p1, v0, v3
 
-    const p1, 0x7f120511
+    const p1, 0x7f1204ec
 
     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, 0x7f120c71
+    const v0, 0x7f120c3a
 
     invoke-virtual {p1, v0}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
@@ -1119,7 +1119,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f10008d
+    const v1, 0x7f10008b
 
     const/4 v2, 0x1
 
@@ -1244,7 +1244,7 @@
 
     move-result-object v1
 
-    sget-object v2, Lcom/discord/app/i;->vO:Lcom/discord/app/i;
+    sget-object v2, Lcom/discord/app/i;->vP: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, 0x7f0d01e3
+    const v0, 0x7f0d01d8
 
     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 fccda00a89..797f023d4a 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 FP:Lcom/discord/workers/MessageAckWorker$a;
+.field public static final FL: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;->FP:Lcom/discord/workers/MessageAckWorker$a;
+    sput-object v0, Lcom/discord/workers/MessageAckWorker;->FL: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;->vm:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vn: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;->vm:Lcom/discord/app/AppLog;
+    sget-object v7, Lcom/discord/app/AppLog;->vn: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;->Ke()Ljava/lang/Object;
+    invoke-virtual {v5}, Lrx/b/a;->Kc()Ljava/lang/Object;
 
-    sget-object v9, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
+    sget-object v9, Lcom/discord/app/AppLog;->vn: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;->vm:Lcom/discord/app/AppLog;
+    sget-object v9, Lcom/discord/app/AppLog;->vn: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 2a9c3f34c1..3bacbb9039 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 FQ:Lcom/discord/workers/MessageSendWorker$a;
+.field public static final FM: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;->FQ:Lcom/discord/workers/MessageSendWorker$a;
+    sput-object v0, Lcom/discord/workers/MessageSendWorker;->FM: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;->vm:Lcom/discord/app/AppLog;
+    sget-object v1, Lcom/discord/app/AppLog;->vn: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;->vm:Lcom/discord/app/AppLog;
+    sget-object v8, Lcom/discord/app/AppLog;->vn: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;->Ke()Ljava/lang/Object;
+    invoke-virtual {v6}, Lrx/b/a;->Kc()Ljava/lang/Object;
 
     move-result-object v6
 
     check-cast v6, Lcom/discord/models/domain/ModelMessage;
 
-    sget-object v8, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
+    sget-object v8, Lcom/discord/app/AppLog;->vn: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;->vm:Lcom/discord/app/AppLog;
+    sget-object v6, Lcom/discord/app/AppLog;->vn: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 6bd24c8232..1f9c1e0007 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 FW:J
+.field private FS:J
 
 
 # direct methods
@@ -32,7 +32,7 @@
 
     move-result-wide v0
 
-    iput-wide v0, p0, Lcom/esotericsoftware/a/a$a;->FW:J
+    iput-wide v0, p0, Lcom/esotericsoftware/a/a$a;->FS:J
 
     return-void
 .end method
@@ -56,7 +56,7 @@
 
     move-result-wide v1
 
-    iget-wide v3, p0, Lcom/esotericsoftware/a/a$a;->FW:J
+    iget-wide v3, p0, Lcom/esotericsoftware/a/a$a;->FS: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 14f0384d3b..5753f9662c 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 FR:Z = true
+.field public static FN:Z = true
 
-.field public static FS:Z = false
+.field public static FO:Z = false
 
-.field public static FT:Z = false
+.field public static FP:Z = false
 
-.field public static FU:Z = false
+.field public static FQ:Z = false
 
-.field private static FV:Lcom/esotericsoftware/a/a$a; = null
+.field private static FR: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;->FS:Z
+    sput-boolean v0, Lcom/esotericsoftware/a/a;->FO: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;->FT:Z
+    sput-boolean v0, Lcom/esotericsoftware/a/a;->FP: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;->FU:Z
+    sput-boolean v1, Lcom/esotericsoftware/a/a;->FQ: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;->FV:Lcom/esotericsoftware/a/a$a;
+    sput-object v0, Lcom/esotericsoftware/a/a;->FR: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;->FS:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->FO:Z
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lcom/esotericsoftware/a/a;->FV:Lcom/esotericsoftware/a/a$a;
+    sget-object v0, Lcom/esotericsoftware/a/a;->FR: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;->FU:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->FQ:Z
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lcom/esotericsoftware/a/a;->FV:Lcom/esotericsoftware/a/a$a;
+    sget-object v0, Lcom/esotericsoftware/a/a;->FR: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;->FS:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->FO:Z
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lcom/esotericsoftware/a/a;->FV:Lcom/esotericsoftware/a/a$a;
+    sget-object v0, Lcom/esotericsoftware/a/a;->FR: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;->FV:Lcom/esotericsoftware/a/a$a;
+    sget-object v0, Lcom/esotericsoftware/a/a;->FR: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;->FU:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->FQ:Z
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lcom/esotericsoftware/a/a;->FV:Lcom/esotericsoftware/a/a$a;
+    sget-object v0, Lcom/esotericsoftware/a/a;->FR: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;->FV:Lcom/esotericsoftware/a/a$a;
+    sget-object v0, Lcom/esotericsoftware/a/a;->FR: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 db22ea0aaa..947433f27e 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 FX:Ljava/util/WeakHashMap;
+.field private static final FT:Ljava/util/WeakHashMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/WeakHashMap<",
@@ -16,11 +16,11 @@
     .end annotation
 .end field
 
-.field private static final FY:Ljava/lang/ClassLoader;
+.field private static final FU:Ljava/lang/ClassLoader;
 
-.field private static volatile FZ:Lcom/esotericsoftware/b/a;
+.field private static volatile FV:Lcom/esotericsoftware/b/a;
 
-.field private static volatile Ga:Ljava/lang/reflect/Method;
+.field private static volatile FW: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;->FX:Ljava/util/WeakHashMap;
+    sput-object v0, Lcom/esotericsoftware/b/a;->FT: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;->FY:Ljava/lang/ClassLoader;
+    sput-object v0, Lcom/esotericsoftware/b/a;->FU:Ljava/lang/ClassLoader;
 
     new-instance v0, Lcom/esotericsoftware/b/a;
 
-    sget-object v1, Lcom/esotericsoftware/b/a;->FY:Ljava/lang/ClassLoader;
+    sget-object v1, Lcom/esotericsoftware/b/a;->FU:Ljava/lang/ClassLoader;
 
     invoke-direct {v0, v1}, Lcom/esotericsoftware/b/a;-><init>(Ljava/lang/ClassLoader;)V
 
-    sput-object v0, Lcom/esotericsoftware/b/a;->FZ:Lcom/esotericsoftware/b/a;
+    sput-object v0, Lcom/esotericsoftware/b/a;->FV:Lcom/esotericsoftware/b/a;
 
     return-void
 .end method
@@ -126,7 +126,7 @@
     return v2
 .end method
 
-.method private static fp()Ljava/lang/reflect/Method;
+.method private static fn()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;->Ga:Ljava/lang/reflect/Method;
+    sget-object v0, Lcom/esotericsoftware/b/a;->FW:Ljava/lang/reflect/Method;
 
     if-nez v0, :cond_0
 
-    sget-object v0, Lcom/esotericsoftware/b/a;->FX:Ljava/util/WeakHashMap;
+    sget-object v0, Lcom/esotericsoftware/b/a;->FT:Ljava/util/WeakHashMap;
 
     monitor-enter v0
 
@@ -185,12 +185,12 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/esotericsoftware/b/a;->Ga:Ljava/lang/reflect/Method;
+    sput-object v1, Lcom/esotericsoftware/b/a;->FW: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;->Ga:Ljava/lang/reflect/Method;
+    sget-object v1, Lcom/esotericsoftware/b/a;->FW: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;->Ga:Ljava/lang/reflect/Method;
+    sget-object v0, Lcom/esotericsoftware/b/a;->FW:Ljava/lang/reflect/Method;
 
     return-object v0
 .end method
@@ -226,7 +226,7 @@
 
     move-result-object p0
 
-    sget-object v0, Lcom/esotericsoftware/b/a;->FY:Ljava/lang/ClassLoader;
+    sget-object v0, Lcom/esotericsoftware/b/a;->FU: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;->FZ:Lcom/esotericsoftware/b/a;
+    sget-object p0, Lcom/esotericsoftware/b/a;->FV:Lcom/esotericsoftware/b/a;
 
     if-nez p0, :cond_1
 
-    sget-object p0, Lcom/esotericsoftware/b/a;->FX:Ljava/util/WeakHashMap;
+    sget-object p0, Lcom/esotericsoftware/b/a;->FT:Ljava/util/WeakHashMap;
 
     monitor-enter p0
 
     :try_start_0
-    sget-object v0, Lcom/esotericsoftware/b/a;->FZ:Lcom/esotericsoftware/b/a;
+    sget-object v0, Lcom/esotericsoftware/b/a;->FV:Lcom/esotericsoftware/b/a;
 
     if-nez v0, :cond_0
 
     new-instance v0, Lcom/esotericsoftware/b/a;
 
-    sget-object v1, Lcom/esotericsoftware/b/a;->FY:Ljava/lang/ClassLoader;
+    sget-object v1, Lcom/esotericsoftware/b/a;->FU:Ljava/lang/ClassLoader;
 
     invoke-direct {v0, v1}, Lcom/esotericsoftware/b/a;-><init>(Ljava/lang/ClassLoader;)V
 
-    sput-object v0, Lcom/esotericsoftware/b/a;->FZ:Lcom/esotericsoftware/b/a;
+    sput-object v0, Lcom/esotericsoftware/b/a;->FV:Lcom/esotericsoftware/b/a;
 
     :cond_0
     monitor-exit p0
@@ -271,17 +271,17 @@
 
     :cond_1
     :goto_0
-    sget-object p0, Lcom/esotericsoftware/b/a;->FZ:Lcom/esotericsoftware/b/a;
+    sget-object p0, Lcom/esotericsoftware/b/a;->FV:Lcom/esotericsoftware/b/a;
 
     return-object p0
 
     :cond_2
-    sget-object v0, Lcom/esotericsoftware/b/a;->FX:Ljava/util/WeakHashMap;
+    sget-object v0, Lcom/esotericsoftware/b/a;->FT:Ljava/util/WeakHashMap;
 
     monitor-enter v0
 
     :try_start_1
-    sget-object v1, Lcom/esotericsoftware/b/a;->FX:Ljava/util/WeakHashMap;
+    sget-object v1, Lcom/esotericsoftware/b/a;->FT: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;->FX:Ljava/util/WeakHashMap;
+    sget-object v1, Lcom/esotericsoftware/b/a;->FT: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;->FX:Ljava/util/WeakHashMap;
+    sget-object v2, Lcom/esotericsoftware/b/a;->FT: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;->fp()Ljava/lang/reflect/Method;
+    invoke-static {}, Lcom/esotericsoftware/b/a;->fn()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 214883148d..5047fbda04 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 Gb:Z
+.field FX: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;->Hz()[B
+    invoke-virtual {v9}, Lorg/a/a/h;->Hx()[B
 
     move-result-object v0
 
@@ -550,7 +550,7 @@
     throw v0
 
     :cond_7
-    iput-boolean v4, v2, Lcom/esotericsoftware/b/b;->Gb:Z
+    iput-boolean v4, v2, Lcom/esotericsoftware/b/b;->FX: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 02ce2bc8f6..56d4adabef 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 Gc:[Ljava/lang/String;
+.field private FY:[Ljava/lang/String;
 
-.field private Gd:[Ljava/lang/Class;
+.field private FZ:[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;->Id()I
+    invoke-virtual/range {v16 .. v16}, Lorg/a/a/aa;->Ib()I
 
     move-result v7
 
@@ -297,7 +297,7 @@
     goto/16 :goto_2
 
     :pswitch_0
-    invoke-virtual/range {v16 .. v16}, Lorg/a/a/aa;->Ib()Ljava/lang/String;
+    invoke-virtual/range {v16 .. v16}, Lorg/a/a/aa;->HZ()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;->Ic()Ljava/lang/String;
+    invoke-virtual/range {v16 .. v16}, Lorg/a/a/aa;->Ia()Ljava/lang/String;
 
     move-result-object v7
 
@@ -423,7 +423,7 @@
 
     move-result-object v8
 
-    invoke-virtual/range {v16 .. v16}, Lorg/a/a/aa;->Ic()Ljava/lang/String;
+    invoke-virtual/range {v16 .. v16}, Lorg/a/a/aa;->Ia()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;->Ic()Ljava/lang/String;
+    invoke-virtual/range {p3 .. p3}, Lorg/a/a/aa;->Ia()Ljava/lang/String;
 
     move-result-object v2
 
-    invoke-virtual/range {p3 .. p3}, Lorg/a/a/aa;->Id()I
+    invoke-virtual/range {p3 .. p3}, Lorg/a/a/aa;->Ib()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;->Ia()Ljava/lang/String;
+    invoke-virtual/range {p3 .. p3}, Lorg/a/a/aa;->HY()Ljava/lang/String;
 
     move-result-object v0
 
@@ -999,7 +999,7 @@
 
     move-result-object v6
 
-    invoke-virtual {v6}, Lorg/a/a/aa;->Id()I
+    invoke-virtual {v6}, Lorg/a/a/aa;->Ib()I
 
     move-result v6
 
@@ -1155,11 +1155,11 @@
 
     move-object/from16 v1, p2
 
-    invoke-virtual/range {p3 .. p3}, Lorg/a/a/aa;->Ic()Ljava/lang/String;
+    invoke-virtual/range {p3 .. p3}, Lorg/a/a/aa;->Ia()Ljava/lang/String;
 
     move-result-object v2
 
-    invoke-virtual/range {p3 .. p3}, Lorg/a/a/aa;->Id()I
+    invoke-virtual/range {p3 .. p3}, Lorg/a/a/aa;->Ib()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;->Ia()Ljava/lang/String;
+    invoke-virtual/range {p3 .. p3}, Lorg/a/a/aa;->HY()Ljava/lang/String;
 
     move-result-object v0
 
@@ -1980,11 +1980,43 @@
 
     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;->bDl:Lorg/a/a/aa;
+    sget-object v3, Lorg/a/a/aa;->bDg: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;->bDl:Lorg/a/a/aa;
+    sget-object v3, Lorg/a/a/aa;->bDg: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;
+
+    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;
+
+    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;->bDj: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;->bDj: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;->bDk: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;->bDk: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;->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;->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
 
@@ -1996,57 +2028,25 @@
 
     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;->bDo: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;->bDo: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;->bDp:Lorg/a/a/aa;
+    sget-object v3, Lorg/a/a/aa;->bDh: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;->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;->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;->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;->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;->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;->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;->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;->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;->bDm:Lorg/a/a/aa;
+    sget-object v3, Lorg/a/a/aa;->bDh: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;->Hz()[B
+    invoke-virtual {v7}, Lorg/a/a/h;->Hx()[B
 
     move-result-object v0
 
@@ -2067,9 +2067,9 @@
 
     check-cast v0, Lcom/esotericsoftware/b/c;
 
-    iput-object v1, v0, Lcom/esotericsoftware/b/c;->Gc:[Ljava/lang/String;
+    iput-object v1, v0, Lcom/esotericsoftware/b/c;->FY:[Ljava/lang/String;
 
-    iput-object v2, v0, Lcom/esotericsoftware/b/c;->Gd:[Ljava/lang/Class;
+    iput-object v2, v0, Lcom/esotericsoftware/b/c;->FZ:[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;->Gc:[Ljava/lang/String;
+    iget-object v0, p0, Lcom/esotericsoftware/b/c;->FY:[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;->Gc:[Ljava/lang/String;
+    iget-object v2, p0, Lcom/esotericsoftware/b/c;->FY:[Ljava/lang/String;
 
     aget-object v2, v2, v1
 
@@ -2164,32 +2164,32 @@
     goto :goto_1
 .end method
 
-.method public abstract fq()Ljava/lang/Object;
+.method public abstract fo()Ljava/lang/Object;
 .end method
 
-.method public abstract fr()Ljava/lang/String;
+.method public abstract fp()Ljava/lang/String;
 .end method
 
-.method public abstract fs()C
+.method public abstract fq()C
 .end method
 
-.method public abstract ft()Z
+.method public abstract fr()Z
 .end method
 
-.method public abstract fu()B
+.method public abstract fs()B
 .end method
 
-.method public abstract fv()S
+.method public abstract ft()S
 .end method
 
-.method public abstract fw()I
+.method public abstract fu()I
 .end method
 
-.method public abstract fx()J
+.method public abstract fv()J
 .end method
 
-.method public abstract fy()D
+.method public abstract fw()D
 .end method
 
-.method public abstract fz()F
+.method public abstract fx()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 09211f5cbd..83d523c50c 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 Ge:[Ljava/lang/String;
+.field private Ga:[Ljava/lang/String;
 
-.field private Gf:[[Ljava/lang/Class;
+.field private Gb:[[Ljava/lang/Class;
 
-.field private Gg:[Ljava/lang/Class;
+.field private Gc:[Ljava/lang/Class;
 
 
 # direct methods
@@ -514,7 +514,7 @@
 
     move-result-object v13
 
-    invoke-virtual {v13}, Lorg/a/a/aa;->Id()I
+    invoke-virtual {v13}, Lorg/a/a/aa;->Ib()I
 
     move-result v22
 
@@ -530,7 +530,7 @@
     goto/16 :goto_9
 
     :pswitch_0
-    invoke-virtual {v13}, Lorg/a/a/aa;->Ib()Ljava/lang/String;
+    invoke-virtual {v13}, Lorg/a/a/aa;->HZ()Ljava/lang/String;
 
     move-result-object v6
 
@@ -550,7 +550,7 @@
 
     const/16 v7, 0xc0
 
-    invoke-virtual {v13}, Lorg/a/a/aa;->Ic()Ljava/lang/String;
+    invoke-virtual {v13}, Lorg/a/a/aa;->Ia()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;->Ic()Ljava/lang/String;
+    invoke-virtual {v13}, Lorg/a/a/aa;->Ia()Ljava/lang/String;
 
     move-result-object v5
 
@@ -837,7 +837,7 @@
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lorg/a/a/aa;->Id()I
+    invoke-virtual {v3}, Lorg/a/a/aa;->Ib()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;->Hz()[B
+    invoke-virtual {v10}, Lorg/a/a/h;->Hx()[B
 
     move-result-object v0
 
@@ -1090,15 +1090,15 @@
 
     check-cast v0, Lcom/esotericsoftware/b/d;
 
-    iput-object v4, v0, Lcom/esotericsoftware/b/d;->Ge:[Ljava/lang/String;
+    iput-object v4, v0, Lcom/esotericsoftware/b/d;->Ga:[Ljava/lang/String;
 
     move-object/from16 v1, v31
 
-    iput-object v1, v0, Lcom/esotericsoftware/b/d;->Gf:[[Ljava/lang/Class;
+    iput-object v1, v0, Lcom/esotericsoftware/b/d;->Gb:[[Ljava/lang/Class;
 
     move-object/from16 v1, v30
 
-    iput-object v1, v0, Lcom/esotericsoftware/b/d;->Gg:[Ljava/lang/Class;
+    iput-object v1, v0, Lcom/esotericsoftware/b/d;->Gc:[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;->Ge:[Ljava/lang/String;
+    iget-object v0, p0, Lcom/esotericsoftware/b/d;->Ga:[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;->Ge:[Ljava/lang/String;
+    iget-object v2, p0, Lcom/esotericsoftware/b/d;->Ga:[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;->Gf:[[Ljava/lang/Class;
+    iget-object v2, p0, Lcom/esotericsoftware/b/d;->Gb:[[Ljava/lang/Class;
 
     aget-object v2, v2, v1
 
@@ -1244,5 +1244,5 @@
     goto :goto_1
 .end method
 
-.method public varargs abstract fA()Ljava/lang/Object;
+.method public varargs abstract fy()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 766366b907..d883d01088 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;->FU:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->FQ: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 6b86b21af3..17779c9ba4 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;->FU:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->FQ: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;->FU:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->FQ: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 1d30438dd7..328ba0402d 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;->FU:Z
+    sget-boolean v1, Lcom/esotericsoftware/a/a;->FQ: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;->FU:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->FQ: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 e268d1e25f..6f0e2ecebb 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;->ft()Z
+    invoke-virtual {p2}, Lcom/esotericsoftware/b/c;->fr()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 b0d6e97d95..144fa34a0e 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;->fu()B
+    invoke-virtual {p2}, Lcom/esotericsoftware/b/c;->fs()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 721a685c35..d4f7696581 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;->fs()C
+    invoke-virtual {p2}, Lcom/esotericsoftware/b/c;->fq()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 54362f2842..42ab7a135e 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;->fy()D
+    invoke-virtual {p2}, Lcom/esotericsoftware/b/c;->fw()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 d985d25262..2db0ae6f9a 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;->fz()F
+    invoke-virtual {p2}, Lcom/esotericsoftware/b/c;->fx()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 d5c7839d80..c03f86efb8 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;->fw()I
+    invoke-virtual {p2}, Lcom/esotericsoftware/b/c;->fu()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;->fw()I
+    invoke-virtual {p2}, Lcom/esotericsoftware/b/c;->fu()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 3aafaeea22..a945846b1f 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;->fx()J
+    invoke-virtual {p2}, Lcom/esotericsoftware/b/c;->fv()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;->fx()J
+    invoke-virtual {p2}, Lcom/esotericsoftware/b/c;->fv()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 83ceb9efb9..ddc3fbcd1c 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;->fq()Ljava/lang/Object;
+    invoke-virtual {v1}, Lcom/esotericsoftware/b/c;->fo()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;->fq()Ljava/lang/Object;
+    invoke-virtual {p1}, Lcom/esotericsoftware/b/c;->fo()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 a53e778ebf..40453175b8 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;->fv()S
+    invoke-virtual {p2}, Lcom/esotericsoftware/b/c;->ft()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 9226561cb4..5146616f14 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;->fr()Ljava/lang/String;
+    invoke-virtual {p2}, Lcom/esotericsoftware/b/c;->fp()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 239ee12b14..5b9ea81af0 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;->fA()Ljava/lang/Object;
+    invoke-virtual {p1}, Lcom/esotericsoftware/b/d;->fy()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 ad33321260..7039d4b883 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;->FU:Z
+    sget-boolean v5, Lcom/esotericsoftware/a/a;->FQ: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;->FU:Z
+    sget-boolean v6, Lcom/esotericsoftware/a/a;->FQ: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 148093f4bd..f13e7bef40 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;->FU:Z
+    sget-boolean v8, Lcom/esotericsoftware/a/a;->FQ:Z
 
     if-eqz v8, :cond_0
 
@@ -167,7 +167,7 @@
     goto :goto_2
 
     :cond_3
-    sget-boolean v6, Lcom/esotericsoftware/a/a;->FU:Z
+    sget-boolean v6, Lcom/esotericsoftware/a/a;->FQ:Z
 
     if-eqz v6, :cond_4
 
@@ -254,7 +254,7 @@
     goto :goto_8
 
     :cond_9
-    sget-boolean v7, Lcom/esotericsoftware/a/a;->FU:Z
+    sget-boolean v7, Lcom/esotericsoftware/a/a;->FQ:Z
 
     if-eqz v7, :cond_a
 
@@ -326,7 +326,7 @@
     :cond_e
     if-nez v8, :cond_10
 
-    sget-boolean v8, Lcom/esotericsoftware/a/a;->FU:Z
+    sget-boolean v8, Lcom/esotericsoftware/a/a;->FQ: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;->FU:Z
+    sget-boolean p1, Lcom/esotericsoftware/a/a;->FQ: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 51141c6351..47f5576421 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;->FU:Z
+    sget-boolean p1, Lcom/esotericsoftware/a/a;->FQ: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 fa56fdc406..76bb7c0644 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;->FU:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->FQ: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;->FU:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->FQ:Z
 
     if-eqz v0, :cond_0
 
@@ -1111,7 +1111,7 @@
 
     :cond_2
     :goto_1
-    sget-boolean v1, Lcom/esotericsoftware/a/a;->FU:Z
+    sget-boolean v1, Lcom/esotericsoftware/a/a;->FQ: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;->FU:Z
+    sget-boolean p3, Lcom/esotericsoftware/a/a;->FQ:Z
 
     if-eqz p3, :cond_3
 
@@ -1539,7 +1539,7 @@
 .method protected rebuildCachedFields(Z)V
     .locals 9
 
-    sget-boolean v0, Lcom/esotericsoftware/a/a;->FU:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->FQ:Z
 
     if-eqz v0, :cond_0
 
@@ -2341,7 +2341,7 @@
         }
     .end annotation
 
-    sget-boolean v0, Lcom/esotericsoftware/a/a;->FU:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->FQ: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 b492229762..5eeec55387 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;->FU:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->FQ: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;->FU:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->FQ: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;->FU:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->FQ: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;->FU:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->FQ: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;->FU:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->FQ: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;->FU:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->FQ: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;->FU:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->FQ: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;->FU:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->FQ: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;->FU:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->FQ: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 15c2849f59..3ccdc4bccc 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;->FU:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->FQ:Z
 
     const-string v3, "kryo"
 
@@ -106,7 +106,7 @@
 
     aget-object v7, p0, v5
 
-    sget-boolean v8, Lcom/esotericsoftware/a/a;->FU:Z
+    sget-boolean v8, Lcom/esotericsoftware/a/a;->FQ:Z
 
     if-eqz v8, :cond_4
 
@@ -327,7 +327,7 @@
     return-object p1
 
     :cond_0
-    sget-boolean p1, Lcom/esotericsoftware/a/a;->FU:Z
+    sget-boolean p1, Lcom/esotericsoftware/a/a;->FQ:Z
 
     if-eqz p1, :cond_1
 
@@ -501,7 +501,7 @@
 
     if-lez v1, :cond_d
 
-    sget-boolean v0, Lcom/esotericsoftware/a/a;->FU:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->FQ:Z
 
     const-string v1, "kryo"
 
@@ -547,7 +547,7 @@
 
     move-result-object v6
 
-    sget-boolean v7, Lcom/esotericsoftware/a/a;->FU:Z
+    sget-boolean v7, Lcom/esotericsoftware/a/a;->FQ: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;->FU:Z
+    sget-boolean v7, Lcom/esotericsoftware/a/a;->FQ:Z
 
     if-eqz v7, :cond_b
 
@@ -689,7 +689,7 @@
 
     aput-object p1, v0, v6
 
-    sget-boolean p1, Lcom/esotericsoftware/a/a;->FU:Z
+    sget-boolean p1, Lcom/esotericsoftware/a/a;->FQ:Z
 
     if-eqz p1, :cond_c
 
@@ -906,7 +906,7 @@
     goto/16 :goto_0
 
     :cond_8
-    sget-boolean p3, Lcom/esotericsoftware/a/a;->FU:Z
+    sget-boolean p3, Lcom/esotericsoftware/a/a;->FQ:Z
 
     if-eqz p3, :cond_9
 
@@ -968,7 +968,7 @@
 
     move-result-object v0
 
-    sget-boolean p3, Lcom/esotericsoftware/a/a;->FU:Z
+    sget-boolean p3, Lcom/esotericsoftware/a/a;->FQ:Z
 
     if-eqz p3, :cond_b
 
@@ -1007,7 +1007,7 @@
     goto :goto_2
 
     :cond_b
-    sget-boolean p3, Lcom/esotericsoftware/a/a;->FU:Z
+    sget-boolean p3, Lcom/esotericsoftware/a/a;->FQ: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;->FU:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->FQ: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;->FU:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->FQ: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;->FU:Z
+    sget-boolean v3, Lcom/esotericsoftware/a/a;->FQ: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;->FU:Z
+    sget-boolean p2, Lcom/esotericsoftware/a/a;->FQ: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 f72493c4e6..736547b0d2 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;->FU:Z
+    sget-boolean v6, Lcom/esotericsoftware/a/a;->FQ:Z
 
     if-eqz v6, :cond_2
 
@@ -461,7 +461,7 @@
 
     if-le v7, v5, :cond_a
 
-    sget-boolean v5, Lcom/esotericsoftware/a/a;->FU:Z
+    sget-boolean v5, Lcom/esotericsoftware/a/a;->FQ: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 e772946963..2562caf32c 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;->FU:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->FQ: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 0bd1418ec7..376767137d 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;->fq()Ljava/lang/Object;
+    invoke-virtual {p1}, Lcom/esotericsoftware/b/c;->fo()Ljava/lang/Object;
 
     move-result-object p1
 
@@ -220,7 +220,7 @@
     const-string v1, " ("
 
     :try_start_0
-    sget-boolean v2, Lcom/esotericsoftware/a/a;->FU:Z
+    sget-boolean v2, Lcom/esotericsoftware/a/a;->FQ:Z
 
     if-eqz v2, :cond_0
 
@@ -485,7 +485,7 @@
     const-string v1, " ("
 
     :try_start_0
-    sget-boolean v2, Lcom/esotericsoftware/a/a;->FU:Z
+    sget-boolean v2, Lcom/esotericsoftware/a/a;->FQ: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 e6532ffa70..94a3131e63 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;->FU:Z
+    sget-boolean v4, Lcom/esotericsoftware/a/a;->FQ: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;->FU:Z
+    sget-boolean v8, Lcom/esotericsoftware/a/a;->FQ: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 88a338bf92..64a97c9568 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;->FU:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->FQ: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 7fcd7863b6..cc4678b728 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;->FU:Z
+    sget-boolean v2, Lcom/esotericsoftware/a/a;->FQ:Z
 
     if-eqz v2, :cond_1
 
@@ -279,7 +279,7 @@
     return-object p1
 
     :cond_4
-    sget-boolean p1, Lcom/esotericsoftware/a/a;->FU:Z
+    sget-boolean p1, Lcom/esotericsoftware/a/a;->FQ:Z
 
     const/4 v1, 0x0
 
@@ -368,7 +368,7 @@
     :catch_0
     move-exception v1
 
-    sget-boolean v3, Lcom/esotericsoftware/a/a;->FS:Z
+    sget-boolean v3, Lcom/esotericsoftware/a/a;->FO: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;->FU:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->FQ:Z
 
     if-eqz v0, :cond_5
 
@@ -458,7 +458,7 @@
     goto :goto_2
 
     :cond_4
-    sget-boolean p1, Lcom/esotericsoftware/a/a;->FU:Z
+    sget-boolean p1, Lcom/esotericsoftware/a/a;->FQ:Z
 
     if-eqz p1, :cond_5
 
@@ -516,7 +516,7 @@
 
     if-eq v0, v1, :cond_1
 
-    sget-boolean v0, Lcom/esotericsoftware/a/a;->FU:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->FQ:Z
 
     if-eqz v0, :cond_0
 
@@ -582,7 +582,7 @@
     goto :goto_0
 
     :cond_1
-    sget-boolean v0, Lcom/esotericsoftware/a/a;->FU:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->FQ:Z
 
     if-eqz v0, :cond_2
 
@@ -741,7 +741,7 @@
 
     if-nez p2, :cond_2
 
-    sget-boolean p2, Lcom/esotericsoftware/a/a;->FU:Z
+    sget-boolean p2, Lcom/esotericsoftware/a/a;->FQ:Z
 
     const/4 v1, 0x0
 
@@ -791,7 +791,7 @@
     goto :goto_0
 
     :cond_3
-    sget-boolean v2, Lcom/esotericsoftware/a/a;->FU:Z
+    sget-boolean v2, Lcom/esotericsoftware/a/a;->FQ:Z
 
     if-eqz v2, :cond_4
 
@@ -859,7 +859,7 @@
 
     if-eq v0, v2, :cond_1
 
-    sget-boolean v2, Lcom/esotericsoftware/a/a;->FU:Z
+    sget-boolean v2, Lcom/esotericsoftware/a/a;->FQ:Z
 
     if-eqz v2, :cond_0
 
@@ -893,7 +893,7 @@
     return-void
 
     :cond_1
-    sget-boolean v0, Lcom/esotericsoftware/a/a;->FU:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->FQ: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 c6ceb60d02..9a62a55a87 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;->FU:Z
+    sget-boolean v1, Lcom/esotericsoftware/a/a;->FQ:Z
 
     if-eqz v1, :cond_1
 
@@ -257,7 +257,7 @@
     const-wide/16 v14, 0x0
 
     :goto_5
-    sget-boolean v7, Lcom/esotericsoftware/a/a;->FU:Z
+    sget-boolean v7, Lcom/esotericsoftware/a/a;->FQ:Z
 
     if-eqz v7, :cond_2
 
@@ -488,7 +488,7 @@
 
     check-cast v1, Ljava/lang/reflect/Field;
 
-    sget-boolean v2, Lcom/esotericsoftware/a/a;->FU:Z
+    sget-boolean v2, Lcom/esotericsoftware/a/a;->FQ: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 230bcd12bd..013ed03e00 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;->FU:Z
+    sget-boolean p1, Lcom/esotericsoftware/a/a;->FQ:Z
 
     if-eqz p1, :cond_0
 
@@ -596,7 +596,7 @@
 
     :cond_3
     :goto_0
-    sget-boolean v1, Lcom/esotericsoftware/a/a;->FU:Z
+    sget-boolean v1, Lcom/esotericsoftware/a/a;->FQ:Z
 
     if-eqz v1, :cond_4
 
@@ -671,7 +671,7 @@
 
     if-ne v1, v2, :cond_3
 
-    sget-boolean v1, Lcom/esotericsoftware/a/a;->FU:Z
+    sget-boolean v1, Lcom/esotericsoftware/a/a;->FQ: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;->FU:Z
+    sget-boolean v2, Lcom/esotericsoftware/a/a;->FQ: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 c20a429ffe..25ca8ffd94 100644
--- a/com.discord/smali_classes2/com/facebook/animated/gif/GifFrame.smali
+++ b/com.discord/smali_classes2/com/facebook/animated/gif/GifFrame.smali
@@ -54,17 +54,7 @@
     return-void
 .end method
 
-.method public final fB()I
-    .locals 1
-
-    invoke-virtual {p0}, Lcom/facebook/animated/gif/GifFrame;->nativeGetXOffset()I
-
-    move-result v0
-
-    return v0
-.end method
-
-.method public final fC()I
+.method public final fA()I
     .locals 1
 
     invoke-virtual {p0}, Lcom/facebook/animated/gif/GifFrame;->nativeGetYOffset()I
@@ -82,6 +72,16 @@
     return-void
 .end method
 
+.method public final fz()I
+    .locals 1
+
+    invoke-virtual {p0}, Lcom/facebook/animated/gif/GifFrame;->nativeGetXOffset()I
+
+    move-result v0
+
+    return v0
+.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 12ea070f3f..c6d55d0584 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 Gh:Z
+.field private static volatile Gd:Z
 
 
 # instance fields
@@ -34,7 +34,7 @@
     return-void
 .end method
 
-.method private static declared-synchronized fD()V
+.method private static declared-synchronized fB()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;->Gh:Z
+    sget-boolean v1, Lcom/facebook/animated/gif/GifImage;->Gd:Z
 
     if-nez v1, :cond_0
 
     const/4 v1, 0x1
 
-    sput-boolean v1, Lcom/facebook/animated/gif/GifImage;->Gh:Z
+    sput-boolean v1, Lcom/facebook/animated/gif/GifImage;->Gd:Z
 
     const-string v1, "gifimage"
 
@@ -133,7 +133,7 @@
 
     move-result v6
 
-    sget v7, Lcom/facebook/imagepipeline/animated/a/b$a;->Ru:I
+    sget v7, Lcom/facebook/imagepipeline/animated/a/b$a;->Rq: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;->Ry:I
+    sget v1, Lcom/facebook/imagepipeline/animated/a/b$b;->Ru:I
 
     goto :goto_0
 
@@ -158,12 +158,12 @@
 
     if-ne v1, v2, :cond_1
 
-    sget v1, Lcom/facebook/imagepipeline/animated/a/b$b;->Rz:I
+    sget v1, Lcom/facebook/imagepipeline/animated/a/b$b;->Rv:I
 
     goto :goto_0
 
     :cond_1
-    sget v1, Lcom/facebook/imagepipeline/animated/a/b$b;->Rx:I
+    sget v1, Lcom/facebook/imagepipeline/animated/a/b$b;->Rt: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;->fD()V
+    invoke-static {}, Lcom/facebook/animated/gif/GifImage;->fB()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;->fD()V
+    invoke-static {}, Lcom/facebook/animated/gif/GifImage;->fB()V
 
     const-wide/16 v0, 0x0
 
@@ -240,7 +240,7 @@
     return-object p1
 .end method
 
-.method public final fE()I
+.method public final fC()I
     .locals 1
 
     invoke-direct {p0}, Lcom/facebook/animated/gif/GifImage;->nativeGetFrameCount()I
@@ -250,7 +250,7 @@
     return v0
 .end method
 
-.method public final fF()[I
+.method public final fD()[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 fG()I
+.method public final fE()I
     .locals 3
 
     invoke-direct {p0}, Lcom/facebook/animated/gif/GifImage;->nativeGetLoopCount()I
@@ -288,7 +288,7 @@
     return v2
 .end method
 
-.method public final fH()Z
+.method public final fF()Z
     .locals 1
 
     const/4 v0, 0x0
@@ -296,7 +296,7 @@
     return v0
 .end method
 
-.method public final fI()I
+.method public final fG()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 b579c23261..5c985e82f3 100644
--- a/com.discord/smali_classes2/com/facebook/animated/webp/WebPFrame.smali
+++ b/com.discord/smali_classes2/com/facebook/animated/webp/WebPFrame.smali
@@ -48,17 +48,7 @@
     return-void
 .end method
 
-.method public final fB()I
-    .locals 1
-
-    invoke-virtual {p0}, Lcom/facebook/animated/webp/WebPFrame;->nativeGetXOffset()I
-
-    move-result v0
-
-    return v0
-.end method
-
-.method public final fC()I
+.method public final fA()I
     .locals 1
 
     invoke-virtual {p0}, Lcom/facebook/animated/webp/WebPFrame;->nativeGetYOffset()I
@@ -76,6 +66,16 @@
     return-void
 .end method
 
+.method public final fz()I
+    .locals 1
+
+    invoke-virtual {p0}, Lcom/facebook/animated/webp/WebPFrame;->nativeGetXOffset()I
+
+    move-result v0
+
+    return v0
+.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 403285a32c..6bf6365a62 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;->Ru:I
+    sget v1, Lcom/facebook/imagepipeline/animated/a/b$a;->Rq:I
 
     goto :goto_0
 
     :cond_0
-    sget v1, Lcom/facebook/imagepipeline/animated/a/b$a;->Rv:I
+    sget v1, Lcom/facebook/imagepipeline/animated/a/b$a;->Rr:I
 
     :goto_0
     move v7, v1
@@ -116,12 +116,12 @@
 
     if-eqz v1, :cond_1
 
-    sget v1, Lcom/facebook/imagepipeline/animated/a/b$b;->Ry:I
+    sget v1, Lcom/facebook/imagepipeline/animated/a/b$b;->Ru:I
 
     goto :goto_1
 
     :cond_1
-    sget v1, Lcom/facebook/imagepipeline/animated/a/b$b;->Rx:I
+    sget v1, Lcom/facebook/imagepipeline/animated/a/b$b;->Rt: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;->fD()V
+    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/d;->fB()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;->fD()V
+    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/d;->fB()V
 
     const-wide/16 v0, 0x0
 
@@ -198,7 +198,7 @@
     return-object p1
 .end method
 
-.method public final fE()I
+.method public final fC()I
     .locals 1
 
     invoke-direct {p0}, Lcom/facebook/animated/webp/WebPImage;->nativeGetFrameCount()I
@@ -208,7 +208,7 @@
     return v0
 .end method
 
-.method public final fF()[I
+.method public final fD()[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 fG()I
+.method public final fE()I
     .locals 1
 
     invoke-direct {p0}, Lcom/facebook/animated/webp/WebPImage;->nativeGetLoopCount()I
@@ -228,7 +228,7 @@
     return v0
 .end method
 
-.method public final fH()Z
+.method public final fF()Z
     .locals 1
 
     const/4 v0, 0x1
@@ -236,7 +236,7 @@
     return v0
 .end method
 
-.method public final fI()I
+.method public final fG()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 a4d0763ccf..7e4a297671 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 JA:Lcom/facebook/c/a;
+.field final synthetic Jt:Z
 
-.field final synthetic Jx:Z
+.field final synthetic Ju:Lcom/facebook/c/e;
 
-.field final synthetic Jy:Lcom/facebook/c/e;
+.field final synthetic Jv:Z
 
-.field final synthetic Jz:Z
+.field final synthetic Jw:Lcom/facebook/c/a;
 
 
 # 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;->JA:Lcom/facebook/c/a;
+    iput-object p1, p0, Lcom/facebook/c/a$1;->Jw:Lcom/facebook/c/a;
 
-    iput-boolean p2, p0, Lcom/facebook/c/a$1;->Jx:Z
+    iput-boolean p2, p0, Lcom/facebook/c/a$1;->Jt:Z
 
-    iput-object p3, p0, Lcom/facebook/c/a$1;->Jy:Lcom/facebook/c/e;
+    iput-object p3, p0, Lcom/facebook/c/a$1;->Ju:Lcom/facebook/c/e;
 
-    iput-boolean p4, p0, Lcom/facebook/c/a$1;->Jz:Z
+    iput-boolean p4, p0, Lcom/facebook/c/a$1;->Jv: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;->Jx:Z
+    iget-boolean v0, p0, Lcom/facebook/c/a$1;->Jt:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/c/a$1;->Jy:Lcom/facebook/c/e;
+    iget-object v0, p0, Lcom/facebook/c/a$1;->Ju:Lcom/facebook/c/e;
 
-    iget-object v1, p0, Lcom/facebook/c/a$1;->JA:Lcom/facebook/c/a;
+    iget-object v1, p0, Lcom/facebook/c/a$1;->Jw: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;->Jz:Z
+    iget-boolean v0, p0, Lcom/facebook/c/a$1;->Jv:Z
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/c/a$1;->Jy:Lcom/facebook/c/e;
+    iget-object v0, p0, Lcom/facebook/c/a$1;->Ju:Lcom/facebook/c/e;
 
-    invoke-interface {v0}, Lcom/facebook/c/e;->gJ()V
+    invoke-interface {v0}, Lcom/facebook/c/e;->gH()V
 
     return-void
 
     :cond_1
-    iget-object v0, p0, Lcom/facebook/c/a$1;->Jy:Lcom/facebook/c/e;
+    iget-object v0, p0, Lcom/facebook/c/a$1;->Ju:Lcom/facebook/c/e;
 
-    iget-object v1, p0, Lcom/facebook/c/a$1;->JA:Lcom/facebook/c/a;
+    iget-object v1, p0, Lcom/facebook/c/a$1;->Jw: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 0b87b2400f..2ec3a15ecd 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 JA:Lcom/facebook/c/a;
+.field final synthetic Jw:Lcom/facebook/c/a;
 
-.field final synthetic JB:Lcom/facebook/c/e;
+.field final synthetic Jx: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;->JA:Lcom/facebook/c/a;
+    iput-object p1, p0, Lcom/facebook/c/a$2;->Jw:Lcom/facebook/c/a;
 
-    iput-object p2, p0, Lcom/facebook/c/a$2;->JB:Lcom/facebook/c/e;
+    iput-object p2, p0, Lcom/facebook/c/a$2;->Jx: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;->JB:Lcom/facebook/c/e;
+    iget-object v0, p0, Lcom/facebook/c/a$2;->Jx:Lcom/facebook/c/e;
 
-    iget-object v1, p0, Lcom/facebook/c/a$2;->JA:Lcom/facebook/c/a;
+    iget-object v1, p0, Lcom/facebook/c/a$2;->Jw: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 76ba7375d3..98b731c3b9 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 JC:I = 0x1
+.field public static final JA:I = 0x3
 
-.field public static final JD:I = 0x2
+.field private static final synthetic JB:[I
 
-.field public static final JE:I = 0x3
+.field public static final Jy:I = 0x1
 
-.field private static final synthetic JF:[I
+.field public static final Jz:I = 0x2
 
 
 # direct methods
@@ -40,25 +40,25 @@
 
     new-array v0, v0, [I
 
-    sget v1, Lcom/facebook/c/a$a;->JC:I
+    sget v1, Lcom/facebook/c/a$a;->Jy:I
 
     const/4 v2, 0x0
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/c/a$a;->JD:I
+    sget v1, Lcom/facebook/c/a$a;->Jz:I
 
     const/4 v2, 0x1
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/c/a$a;->JE:I
+    sget v1, Lcom/facebook/c/a$a;->JA:I
 
     const/4 v2, 0x2
 
     aput v1, v0, v2
 
-    sput-object v0, Lcom/facebook/c/a$a;->JF:[I
+    sput-object v0, Lcom/facebook/c/a$a;->JB:[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 a29e0157fa..abe724070e 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;->gG()Z
+    invoke-interface {p1}, Lcom/facebook/c/c;->gE()Z
 
     :cond_0
     return-void
@@ -61,7 +61,7 @@
 
     if-eqz v0, :cond_1
 
-    invoke-interface {p1}, Lcom/facebook/c/c;->gG()Z
+    invoke-interface {p1}, Lcom/facebook/c/c;->gE()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;->gG()Z
+    invoke-interface {p1}, Lcom/facebook/c/c;->gE()Z
 
     return-void
 
     :catchall_0
     move-exception v0
 
-    invoke-interface {p1}, Lcom/facebook/c/c;->gG()Z
+    invoke-interface {p1}, Lcom/facebook/c/c;->gE()Z
 
     throw v0
 .end method
@@ -127,7 +127,7 @@
     .end annotation
 .end method
 
-.method public final gJ()V
+.method public final gH()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 3f4d73cd89..a3b4963473 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 JG:Ljava/lang/Throwable;
+.field final synthetic JC:Ljava/lang/Throwable;
 
 
 # direct methods
 .method public constructor <init>(Ljava/lang/Throwable;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/c/d$1;->JG:Ljava/lang/Throwable;
+    iput-object p1, p0, Lcom/facebook/c/d$1;->JC: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;->JG:Ljava/lang/Throwable;
+    iget-object v0, p0, Lcom/facebook/c/d$1;->JC: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 c97f77cf60..60eb119320 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 JH:Lcom/facebook/c/d$a;
+.field final synthetic JD:Lcom/facebook/c/d$a;
 
-.field final synthetic JI:Lcom/facebook/c/d$a;
+.field final synthetic JE: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;->JH:Lcom/facebook/c/d$a;
+    iput-object p1, p0, Lcom/facebook/c/d$2;->JD: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;->JI:Lcom/facebook/c/d$a;
+    iput-object p3, p0, Lcom/facebook/c/d$2;->JE: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;->JH:Lcom/facebook/c/d$a;
+    iget-object v0, p0, Lcom/facebook/c/d$2;->JD: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;->JI:Lcom/facebook/c/d$a;
+    iget-object v0, p0, Lcom/facebook/c/d$2;->JE:Lcom/facebook/c/d$a;
 
-    invoke-interface {p1}, Lcom/facebook/c/c;->gF()Ljava/lang/Throwable;
+    invoke-interface {p1}, Lcom/facebook/c/c;->gD()Ljava/lang/Throwable;
 
     move-result-object p1
 
@@ -146,7 +146,7 @@
     return-void
 .end method
 
-.method public final gJ()V
+.method public final gH()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 a19485d0a3..21e6f40e35 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 gJ()V
+.method public abstract gH()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 5fe9618a4f..5c09682679 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 JN:Lcom/facebook/c/f$a;
+.field final synthetic JJ: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;->JN:Lcom/facebook/c/f$a;
+    iput-object p1, p0, Lcom/facebook/c/f$a$a;->JJ: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;->gD()Z
+    invoke-interface {p1}, Lcom/facebook/c/c;->gB()Z
 
     move-result v0
 
     if-eqz v0, :cond_5
 
-    iget-object v0, p0, Lcom/facebook/c/f$a$a;->JN:Lcom/facebook/c/f$a;
+    iget-object v0, p0, Lcom/facebook/c/f$a$a;->JJ: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;->JK:Lcom/facebook/c/c;
+    iget-object v2, v0, Lcom/facebook/c/f$a;->JG:Lcom/facebook/c/c;
 
     const/4 v3, 0x0
 
     if-ne p1, v2, :cond_3
 
-    iget-object v2, v0, Lcom/facebook/c/f$a;->JL:Lcom/facebook/c/c;
+    iget-object v2, v0, Lcom/facebook/c/f$a;->JH:Lcom/facebook/c/c;
 
     if-ne p1, v2, :cond_0
 
     goto :goto_2
 
     :cond_0
-    iget-object v2, v0, Lcom/facebook/c/f$a;->JL:Lcom/facebook/c/c;
+    iget-object v2, v0, Lcom/facebook/c/f$a;->JH: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;->JL:Lcom/facebook/c/c;
+    iget-object v1, v0, Lcom/facebook/c/f$a;->JH:Lcom/facebook/c/c;
 
-    iput-object p1, v0, Lcom/facebook/c/f$a;->JL:Lcom/facebook/c/c;
+    iput-object p1, v0, Lcom/facebook/c/f$a;->JH: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;->gM()Lcom/facebook/c/c;
+    invoke-virtual {v0}, Lcom/facebook/c/f$a;->gK()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;->JN:Lcom/facebook/c/f$a;
+    iget-object v0, p0, Lcom/facebook/c/f$a$a;->JJ: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;->JN:Lcom/facebook/c/f$a;
+    iget-object v0, p0, Lcom/facebook/c/f$a$a;->JJ: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;->JN:Lcom/facebook/c/f$a;
+    iget-object v0, p0, Lcom/facebook/c/f$a$a;->JJ: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;->JN:Lcom/facebook/c/f$a;
+    iget-object v1, p0, Lcom/facebook/c/f$a$a;->JJ: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 gJ()V
+.method public final gH()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 8adf69549d..a477b6f824 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 JJ:Ljava/util/List;
+.field final JF: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;->JJ:Ljava/util/List;
+    iput-object p1, p0, Lcom/facebook/c/f;->JF: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;->JJ:Ljava/util/List;
+    iget-object v0, p0, Lcom/facebook/c/f;->JF:Ljava/util/List;
 
-    iget-object p1, p1, Lcom/facebook/c/f;->JJ:Ljava/util/List;
+    iget-object p1, p1, Lcom/facebook/c/f;->JF: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;->JJ:Ljava/util/List;
+    iget-object v0, p0, Lcom/facebook/c/f;->JF: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;->JJ:Ljava/util/List;
+    iget-object v1, p0, Lcom/facebook/c/f;->JF: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 94a9ad78dc..29bba323c5 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 JV:Lcom/facebook/c/g$a;
+.field final synthetic JR: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;->JV:Lcom/facebook/c/g$a;
+    iput-object p1, p0, Lcom/facebook/c/g$a$a;->JR: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;->gD()Z
+    invoke-interface {p1}, Lcom/facebook/c/c;->gB()Z
 
     move-result v0
 
     if-eqz v0, :cond_7
 
-    iget-object v0, p0, Lcom/facebook/c/g$a$a;->JV:Lcom/facebook/c/g$a;
+    iget-object v0, p0, Lcom/facebook/c/g$a$a;->JR: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;->JQ:I
+    iget v3, v0, Lcom/facebook/c/g$a;->JM:I
 
-    iget v4, v0, Lcom/facebook/c/g$a;->JQ:I
+    iget v4, v0, Lcom/facebook/c/g$a;->JM: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;->JQ:I
+    iget v5, v0, Lcom/facebook/c/g$a;->JM:I
 
     if-ne v1, v5, :cond_0
 
     goto :goto_1
 
     :cond_0
-    invoke-virtual {v0}, Lcom/facebook/c/g$a;->gM()Lcom/facebook/c/c;
+    invoke-virtual {v0}, Lcom/facebook/c/g$a;->gK()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;->JQ:I
+    iget v2, v0, Lcom/facebook/c/g$a;->JM:I
 
     if-ge v1, v2, :cond_2
 
     :cond_1
-    iput v1, v0, Lcom/facebook/c/g$a;->JQ:I
+    iput v1, v0, Lcom/facebook/c/g$a;->JM: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;->gM()Lcom/facebook/c/c;
+    invoke-virtual {v0}, Lcom/facebook/c/g$a;->gK()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;->gO()V
+    invoke-virtual {v0}, Lcom/facebook/c/g$a;->gM()V
 
     return-void
 
@@ -181,7 +181,7 @@
 
     if-eqz v0, :cond_8
 
-    iget-object v0, p0, Lcom/facebook/c/g$a$a;->JV:Lcom/facebook/c/g$a;
+    iget-object v0, p0, Lcom/facebook/c/g$a$a;->JR: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;->JV:Lcom/facebook/c/g$a;
+    iget-object v0, p0, Lcom/facebook/c/g$a$a;->JR: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;->JV:Lcom/facebook/c/g$a;
+    iget-object v0, p0, Lcom/facebook/c/g$a$a;->JR: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 gJ()V
+.method public final gH()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 8c417d45af..d127992743 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 JJ:Ljava/util/List;
+.field final JF:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -38,7 +38,7 @@
     .end annotation
 .end field
 
-.field final JO:Z
+.field final JK: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;->JJ:Ljava/util/List;
+    iput-object p1, p0, Lcom/facebook/c/g;->JF:Ljava/util/List;
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lcom/facebook/c/g;->JO:Z
+    iput-boolean p1, p0, Lcom/facebook/c/g;->JK: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;->JJ:Ljava/util/List;
+    iget-object v0, p0, Lcom/facebook/c/g;->JF:Ljava/util/List;
 
-    iget-object p1, p1, Lcom/facebook/c/g;->JJ:Ljava/util/List;
+    iget-object p1, p1, Lcom/facebook/c/g;->JF: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;->JJ:Ljava/util/List;
+    iget-object v0, p0, Lcom/facebook/c/g;->JF: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;->JJ:Ljava/util/List;
+    iget-object v1, p0, Lcom/facebook/c/g;->JF: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 a92d69b351..85a201297b 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 Gi:I = 0x1
+.field public static final Ge:I = 0x1
 
-.field public static final Gj:I = 0x2
+.field public static final Gf:I = 0x2
 
-.field public static final Gk:I = 0x3
+.field public static final Gg:I = 0x3
 
-.field public static final Gl:I = 0x4
+.field public static final Gh:I = 0x4
 
-.field public static final Gm:I = 0x5
+.field public static final Gi:I = 0x5
 
-.field public static final Gn:I = 0x6
+.field public static final Gj:I = 0x6
 
-.field public static final Go:I = 0x7
+.field public static final Gk:I = 0x7
 
-.field public static final Gp:I = 0x8
+.field public static final Gl:I = 0x8
 
-.field public static final Gq:I = 0x9
+.field public static final Gm:I = 0x9
 
-.field public static final Gr:I = 0xa
+.field public static final Gn:I = 0xa
 
-.field public static final Gs:I = 0xb
+.field public static final Go:I = 0xb
 
-.field public static final Gt:I = 0xc
+.field public static final Gp:I = 0xc
 
-.field public static final Gu:I = 0xd
+.field public static final Gq:I = 0xd
 
-.field public static final Gv:I = 0xe
+.field public static final Gr:I = 0xe
 
-.field public static final Gw:I = 0xf
+.field public static final Gs:I = 0xf
 
-.field public static final Gx:I = 0x10
+.field public static final Gt:I = 0x10
 
-.field public static final Gy:I = 0x11
+.field public static final Gu:I = 0x11
 
-.field private static final synthetic Gz:[I
+.field private static final synthetic Gv:[I
 
 
 # direct methods
@@ -68,109 +68,109 @@
 
     new-array v0, v0, [I
 
-    sget v1, Lcom/facebook/cache/common/a$a;->Gi:I
+    sget v1, Lcom/facebook/cache/common/a$a;->Ge:I
 
     const/4 v2, 0x0
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/cache/common/a$a;->Gj:I
+    sget v1, Lcom/facebook/cache/common/a$a;->Gf:I
 
     const/4 v2, 0x1
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/cache/common/a$a;->Gk:I
+    sget v1, Lcom/facebook/cache/common/a$a;->Gg:I
 
     const/4 v2, 0x2
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/cache/common/a$a;->Gl:I
+    sget v1, Lcom/facebook/cache/common/a$a;->Gh:I
 
     const/4 v2, 0x3
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/cache/common/a$a;->Gm:I
+    sget v1, Lcom/facebook/cache/common/a$a;->Gi:I
 
     const/4 v2, 0x4
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/cache/common/a$a;->Gn:I
+    sget v1, Lcom/facebook/cache/common/a$a;->Gj:I
 
     const/4 v2, 0x5
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/cache/common/a$a;->Go:I
+    sget v1, Lcom/facebook/cache/common/a$a;->Gk:I
 
     const/4 v2, 0x6
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/cache/common/a$a;->Gp:I
+    sget v1, Lcom/facebook/cache/common/a$a;->Gl:I
 
     const/4 v2, 0x7
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/cache/common/a$a;->Gq:I
+    sget v1, Lcom/facebook/cache/common/a$a;->Gm:I
 
     const/16 v2, 0x8
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/cache/common/a$a;->Gr:I
+    sget v1, Lcom/facebook/cache/common/a$a;->Gn:I
 
     const/16 v2, 0x9
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/cache/common/a$a;->Gs:I
+    sget v1, Lcom/facebook/cache/common/a$a;->Go:I
 
     const/16 v2, 0xa
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/cache/common/a$a;->Gt:I
+    sget v1, Lcom/facebook/cache/common/a$a;->Gp:I
 
     const/16 v2, 0xb
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/cache/common/a$a;->Gu:I
+    sget v1, Lcom/facebook/cache/common/a$a;->Gq:I
 
     const/16 v2, 0xc
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/cache/common/a$a;->Gv:I
+    sget v1, Lcom/facebook/cache/common/a$a;->Gr:I
 
     const/16 v2, 0xd
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/cache/common/a$a;->Gw:I
+    sget v1, Lcom/facebook/cache/common/a$a;->Gs:I
 
     const/16 v2, 0xe
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/cache/common/a$a;->Gx:I
+    sget v1, Lcom/facebook/cache/common/a$a;->Gt:I
 
     const/16 v2, 0xf
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/cache/common/a$a;->Gy:I
+    sget v1, Lcom/facebook/cache/common/a$a;->Gu:I
 
     const/16 v2, 0x10
 
     aput v1, v0, v2
 
-    sput-object v0, Lcom/facebook/cache/common/a$a;->Gz:[I
+    sput-object v0, Lcom/facebook/cache/common/a$a;->Gv:[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 0ebba19635..9401c5fbbe 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 GA:I = 0x1
+.field private static final synthetic GA:[I
 
-.field public static final GB:I = 0x2
+.field public static final Gw:I = 0x1
 
-.field public static final GC:I = 0x3
+.field public static final Gx:I = 0x2
 
-.field public static final GD:I = 0x4
+.field public static final Gy:I = 0x3
 
-.field private static final synthetic GE:[I
+.field public static final Gz:I = 0x4
 
 
 # direct methods
@@ -42,31 +42,31 @@
 
     new-array v0, v0, [I
 
-    sget v1, Lcom/facebook/cache/common/b$a;->GA:I
+    sget v1, Lcom/facebook/cache/common/b$a;->Gw:I
 
     const/4 v2, 0x0
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/cache/common/b$a;->GB:I
+    sget v1, Lcom/facebook/cache/common/b$a;->Gx:I
 
     const/4 v2, 0x1
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/cache/common/b$a;->GC:I
+    sget v1, Lcom/facebook/cache/common/b$a;->Gy:I
 
     const/4 v2, 0x2
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/cache/common/b$a;->GD:I
+    sget v1, Lcom/facebook/cache/common/b$a;->Gz:I
 
     const/4 v2, 0x3
 
     aput v1, v0, v2
 
-    sput-object v0, Lcom/facebook/cache/common/b$a;->GE:[I
+    sput-object v0, Lcom/facebook/cache/common/b$a;->GA:[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 a3aa0ecc47..339e4fb4f8 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;->GF:Ljava/util/List;
+    iget-object p0, p0, Lcom/facebook/cache/common/d;->GB: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;->GF:Ljava/util/List;
+    iget-object p0, p0, Lcom/facebook/cache/common/d;->GB:Ljava/util/List;
 
     const/4 v0, 0x0
 
@@ -146,7 +146,7 @@
         }
     .end annotation
 
-    invoke-interface {p0}, Lcom/facebook/cache/common/CacheKey;->fL()Ljava/lang/String;
+    invoke-interface {p0}, Lcom/facebook/cache/common/CacheKey;->fJ()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 688cb8e69f..8be5f7e547 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 GF:Ljava/util/List;
+.field final GB: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;->GF:Ljava/util/List;
+    iget-object v0, p0, Lcom/facebook/cache/common/d;->GB:Ljava/util/List;
 
-    iget-object p1, p1, Lcom/facebook/cache/common/d;->GF:Ljava/util/List;
+    iget-object p1, p1, Lcom/facebook/cache/common/d;->GB: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 fL()Ljava/lang/String;
+.method public final fJ()Ljava/lang/String;
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/cache/common/d;->GF:Ljava/util/List;
+    iget-object v0, p0, Lcom/facebook/cache/common/d;->GB: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;->fL()Ljava/lang/String;
+    invoke-interface {v0}, Lcom/facebook/cache/common/CacheKey;->fJ()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;->GF:Ljava/util/List;
+    iget-object v0, p0, Lcom/facebook/cache/common/d;->GB: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;->GF:Ljava/util/List;
+    iget-object v1, p0, Lcom/facebook/cache/common/d;->GB: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 e5d4a78758..b02ba98c13 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 fL()Ljava/lang/String;
+.method public final fJ()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 423f62a2f8..f2c97ef87a 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;->fU()Lcom/facebook/cache/disk/DiskCacheConfig;
+    value = Lcom/facebook/cache/disk/DiskCacheConfig$a;->fS()Lcom/facebook/cache/disk/DiskCacheConfig;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -27,14 +27,14 @@
 
 
 # instance fields
-.field final synthetic Hk:Lcom/facebook/cache/disk/DiskCacheConfig$a;
+.field final synthetic Hg: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;->Hk:Lcom/facebook/cache/disk/DiskCacheConfig$a;
+    iput-object p1, p0, Lcom/facebook/cache/disk/DiskCacheConfig$a$1;->Hg: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;->Hk:Lcom/facebook/cache/disk/DiskCacheConfig$a;
+    iget-object v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig$a$1;->Hg: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 4931b26931..87ef2b07cb 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 GP:Ljava/util/List;
+.field final GL:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -28,14 +28,14 @@
     .end annotation
 .end field
 
-.field final synthetic GQ:Lcom/facebook/cache/disk/a;
+.field final synthetic GM: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;->GQ:Lcom/facebook/cache/disk/a;
+    iput-object p1, p0, Lcom/facebook/cache/disk/a$a;->GM: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;->GP:Ljava/util/List;
+    iput-object p1, p0, Lcom/facebook/cache/disk/a$a;->GL: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;->GQ:Lcom/facebook/cache/disk/a;
+    iget-object v0, p0, Lcom/facebook/cache/disk/a$a;->GM: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;->GP:Ljava/util/List;
+    iget-object v1, p0, Lcom/facebook/cache/disk/a$a;->GL:Ljava/util/List;
 
     new-instance v2, Lcom/facebook/cache/disk/a$b;
 
-    iget-object v0, v0, Lcom/facebook/cache/disk/a$c;->GS:Ljava/lang/String;
+    iget-object v0, v0, Lcom/facebook/cache/disk/a$c;->GO: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 5a1909dd49..e05723e30e 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 GR:Lcom/facebook/a/b;
+.field final GN: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;->GR:Lcom/facebook/a/b;
+    iput-object p1, p0, Lcom/facebook/cache/disk/a$b;->GN:Lcom/facebook/a/b;
 
     const-wide/16 p1, -0x1
 
@@ -68,7 +68,7 @@
 
 
 # virtual methods
-.method public final fR()J
+.method public final fP()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;->GR:Lcom/facebook/a/b;
+    iget-object v0, p0, Lcom/facebook/cache/disk/a$b;->GN: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;->GR:Lcom/facebook/a/b;
+    iget-object v0, p0, Lcom/facebook/cache/disk/a$b;->GN: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 53488de2b0..9867420ad7 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 GS:Ljava/lang/String;
+.field public final GO: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;->GS:Ljava/lang/String;
+    iput-object p2, p0, Lcom/facebook/cache/disk/a$c;->GO: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;->GS:Ljava/lang/String;
+    iget-object v1, p0, Lcom/facebook/cache/disk/a$c;->GO: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 f2018bfee3..02f3762e53 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 GQ:Lcom/facebook/cache/disk/a;
+.field final synthetic GM:Lcom/facebook/cache/disk/a;
 
-.field private final GU:Ljava/lang/String;
+.field private final GP:Ljava/lang/String;
 
-.field final GV:Ljava/io/File;
+.field final GQ: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;->GQ:Lcom/facebook/cache/disk/a;
+    iput-object p1, p0, Lcom/facebook/cache/disk/a$e;->GM:Lcom/facebook/cache/disk/a;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p2, p0, Lcom/facebook/cache/disk/a$e;->GU:Ljava/lang/String;
+    iput-object p2, p0, Lcom/facebook/cache/disk/a$e;->GP:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/facebook/cache/disk/a$e;->GV:Ljava/io/File;
+    iput-object p3, p0, Lcom/facebook/cache/disk/a$e;->GQ: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;->GV:Ljava/io/File;
+    iget-object v1, p0, Lcom/facebook/cache/disk/a$e;->GQ: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;->HA:J
+    iget-wide v1, v1, Lcom/facebook/common/d/c;->Hw: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;->GV:Ljava/io/File;
+    iget-object p1, p0, Lcom/facebook/cache/disk/a$e;->GQ: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;->GV:Ljava/io/File;
+    iget-object v0, p0, Lcom/facebook/cache/disk/a$e;->GQ: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;->GQ:Lcom/facebook/cache/disk/a;
+    iget-object v0, p0, Lcom/facebook/cache/disk/a$e;->GM: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;->Go:I
+    sget v0, Lcom/facebook/cache/common/a$a;->Gk:I
 
-    invoke-static {}, Lcom/facebook/cache/disk/a;->fQ()Ljava/lang/Class;
+    invoke-static {}, Lcom/facebook/cache/disk/a;->fO()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;->GV:Ljava/io/File;
+    iget-object v0, p0, Lcom/facebook/cache/disk/a$e;->GQ: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;->GV:Ljava/io/File;
+    iget-object v0, p0, Lcom/facebook/cache/disk/a$e;->GQ:Ljava/io/File;
 
     invoke-virtual {v0}, Ljava/io/File;->delete()Z
 
@@ -153,7 +153,7 @@
     return v0
 .end method
 
-.method public final fS()Lcom/facebook/a/a;
+.method public final fQ()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;->GQ:Lcom/facebook/cache/disk/a;
+    iget-object v0, p0, Lcom/facebook/cache/disk/a$e;->GM:Lcom/facebook/cache/disk/a;
 
-    iget-object v1, p0, Lcom/facebook/cache/disk/a$e;->GU:Ljava/lang/String;
+    iget-object v1, p0, Lcom/facebook/cache/disk/a$e;->GP: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;->GV:Ljava/io/File;
+    iget-object v1, p0, Lcom/facebook/cache/disk/a$e;->GQ: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;->GQ:Lcom/facebook/cache/disk/a;
+    iget-object v1, p0, Lcom/facebook/cache/disk/a$e;->GM: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;->Gp:I
+    sget v1, Lcom/facebook/cache/common/a$a;->Gl:I
 
     goto :goto_1
 
     :cond_5
-    sget v1, Lcom/facebook/cache/common/a$a;->Gr:I
+    sget v1, Lcom/facebook/cache/common/a$a;->Gn:I
 
     goto :goto_1
 
     :cond_6
-    sget v1, Lcom/facebook/cache/common/a$a;->Gq:I
+    sget v1, Lcom/facebook/cache/common/a$a;->Gm:I
 
     goto :goto_1
 
     :cond_7
-    sget v1, Lcom/facebook/cache/common/a$a;->Gr:I
+    sget v1, Lcom/facebook/cache/common/a$a;->Gn:I
 
     :goto_1
-    iget-object v1, p0, Lcom/facebook/cache/disk/a$e;->GQ:Lcom/facebook/cache/disk/a;
+    iget-object v1, p0, Lcom/facebook/cache/disk/a$e;->GM: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;->fQ()Ljava/lang/Class;
+    invoke-static {}, Lcom/facebook/cache/disk/a;->fO()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 cb27b2a991..95b11ae572 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 GQ:Lcom/facebook/cache/disk/a;
+.field final synthetic GM:Lcom/facebook/cache/disk/a;
 
-.field private GW:Z
+.field private GR: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;->GQ:Lcom/facebook/cache/disk/a;
+    iput-object p1, p0, Lcom/facebook/cache/disk/a$f;->GM: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;->GW:Z
+    iget-boolean v0, p0, Lcom/facebook/cache/disk/a$f;->GR:Z
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/cache/disk/a$f;->GQ:Lcom/facebook/cache/disk/a;
+    iget-object v0, p0, Lcom/facebook/cache/disk/a$f;->GM: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;->GW:Z
+    iput-boolean p1, p0, Lcom/facebook/cache/disk/a$f;->GR: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;->GW:Z
+    iget-boolean v0, p0, Lcom/facebook/cache/disk/a$f;->GR:Z
 
     if-eqz v0, :cond_4
 
-    iget-object v0, p0, Lcom/facebook/cache/disk/a$f;->GQ:Lcom/facebook/cache/disk/a;
+    iget-object v0, p0, Lcom/facebook/cache/disk/a$f;->GM: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;->GQ:Lcom/facebook/cache/disk/a;
+    iget-object v0, p0, Lcom/facebook/cache/disk/a$f;->GM: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;->GJ:J
+    sget-wide v7, Lcom/facebook/cache/disk/a;->GF: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;->GQ:Lcom/facebook/cache/disk/a;
+    iget-object v0, p0, Lcom/facebook/cache/disk/a$f;->GM: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;->GW:Z
+    iget-boolean v0, p0, Lcom/facebook/cache/disk/a$f;->GR: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;->GW:Z
+    iget-boolean v0, p0, Lcom/facebook/cache/disk/a$f;->GR:Z
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/cache/disk/a$f;->GQ:Lcom/facebook/cache/disk/a;
+    iget-object v0, p0, Lcom/facebook/cache/disk/a$f;->GM: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;->GW:Z
+    iput-boolean p1, p0, Lcom/facebook/cache/disk/a$f;->GR: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 3bc9c1c58f..1fa0707722 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;->fT()Lcom/facebook/cache/disk/f;
+    value = Lcom/facebook/cache/disk/b;->fR()Lcom/facebook/cache/disk/f;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic GX:Lcom/facebook/cache/disk/b;
+.field final synthetic GS: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;->GX:Lcom/facebook/cache/disk/b;
+    iput-object p1, p0, Lcom/facebook/cache/disk/b$1;->GS: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 c9df210c10..8ecc46f09e 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 fT()Lcom/facebook/cache/disk/f;
+.method public final fR()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 174a3f75f2..cf8eae9aa8 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 fR()J
+.method public abstract fP()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 963568fa36..75c059db1e 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 fS()Lcom/facebook/a/a;
+.method public abstract fQ()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 22b13b802a..7cf3cb1916 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 Hy:Lcom/facebook/cache/disk/d;
+.field final synthetic Hu: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;->Hy:Lcom/facebook/cache/disk/d;
+    iput-object p1, p0, Lcom/facebook/cache/disk/d$1;->Hu: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;->Hy:Lcom/facebook/cache/disk/d;
+    iget-object v0, p0, Lcom/facebook/cache/disk/d$1;->Hu: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;->Hy:Lcom/facebook/cache/disk/d;
+    iget-object v1, p0, Lcom/facebook/cache/disk/d$1;->Hu: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;->Hy:Lcom/facebook/cache/disk/d;
+    iget-object v0, p0, Lcom/facebook/cache/disk/d$1;->Hu: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;->Hy:Lcom/facebook/cache/disk/d;
+    iget-object v0, p0, Lcom/facebook/cache/disk/d$1;->Hu: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 d5cc8c04d7..cf1f2bf700 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 HA:J
+.field private Hv:J
 
-.field private Hz:J
+.field private Hw:J
 
 .field private mInitialized:Z
 
@@ -34,9 +34,9 @@
 
     const-wide/16 v0, -0x1
 
-    iput-wide v0, p0, Lcom/facebook/cache/disk/d$a;->Hz:J
+    iput-wide v0, p0, Lcom/facebook/cache/disk/d$a;->Hv:J
 
-    iput-wide v0, p0, Lcom/facebook/cache/disk/d$a;->HA:J
+    iput-wide v0, p0, Lcom/facebook/cache/disk/d$a;->Hw:J
 
     return-void
 .end method
@@ -53,17 +53,17 @@
 
     if-eqz v0, :cond_0
 
-    iget-wide v0, p0, Lcom/facebook/cache/disk/d$a;->Hz:J
+    iget-wide v0, p0, Lcom/facebook/cache/disk/d$a;->Hv:J
 
     add-long/2addr v0, p1
 
-    iput-wide v0, p0, Lcom/facebook/cache/disk/d$a;->Hz:J
+    iput-wide v0, p0, Lcom/facebook/cache/disk/d$a;->Hv:J
 
-    iget-wide p1, p0, Lcom/facebook/cache/disk/d$a;->HA:J
+    iget-wide p1, p0, Lcom/facebook/cache/disk/d$a;->Hw:J
 
     add-long/2addr p1, p3
 
-    iput-wide p1, p0, Lcom/facebook/cache/disk/d$a;->HA:J
+    iput-wide p1, p0, Lcom/facebook/cache/disk/d$a;->Hw: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 fR()J
+.method public final declared-synchronized fP()J
     .locals 2
 
     monitor-enter p0
 
     :try_start_0
-    iget-wide v0, p0, Lcom/facebook/cache/disk/d$a;->Hz:J
+    iget-wide v0, p0, Lcom/facebook/cache/disk/d$a;->Hv: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 fX()J
+.method public final declared-synchronized fV()J
     .locals 2
 
     monitor-enter p0
 
     :try_start_0
-    iget-wide v0, p0, Lcom/facebook/cache/disk/d$a;->HA:J
+    iget-wide v0, p0, Lcom/facebook/cache/disk/d$a;->Hw: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;->HA:J
+    iput-wide v0, p0, Lcom/facebook/cache/disk/d$a;->Hw:J
 
-    iput-wide v0, p0, Lcom/facebook/cache/disk/d$a;->Hz:J
+    iput-wide v0, p0, Lcom/facebook/cache/disk/d$a;->Hv: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;->HA:J
+    iput-wide p3, p0, Lcom/facebook/cache/disk/d$a;->Hw:J
 
-    iput-wide p1, p0, Lcom/facebook/cache/disk/d$a;->Hz:J
+    iput-wide p1, p0, Lcom/facebook/cache/disk/d$a;->Hv: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 051432f8f7..aaf1b9d69f 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 Hn:J
+.field public final Hj:J
 
-.field public final Ho:J
+.field public final Hk:J
 
-.field public final Ht:J
+.field public final Hp: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;->Ht:J
+    iput-wide p1, p0, Lcom/facebook/cache/disk/d$b;->Hp:J
 
-    iput-wide p3, p0, Lcom/facebook/cache/disk/d$b;->Hn:J
+    iput-wide p3, p0, Lcom/facebook/cache/disk/d$b;->Hj:J
 
-    iput-wide p5, p0, Lcom/facebook/cache/disk/d$b;->Ho:J
+    iput-wide p5, p0, Lcom/facebook/cache/disk/d$b;->Hk: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 13c7573e0c..43deb20d3e 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 GI:Ljava/lang/Class;
+.field private static final GE:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -26,11 +26,11 @@
 
 
 # instance fields
-.field private final GN:Lcom/facebook/cache/common/a;
+.field private final GJ:Lcom/facebook/cache/common/a;
 
-.field private final GY:Ljava/lang/String;
+.field private final GU:Ljava/lang/String;
 
-.field private final GZ:Lcom/facebook/common/d/l;
+.field private final GV: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 HB:Lcom/facebook/cache/disk/e$a;
+.field volatile Hx: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;->GI:Ljava/lang/Class;
+    sput-object v0, Lcom/facebook/cache/disk/e;->GE: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;->GN:Lcom/facebook/cache/common/a;
+    iput-object p4, p0, Lcom/facebook/cache/disk/e;->GJ:Lcom/facebook/cache/common/a;
 
-    iput-object p2, p0, Lcom/facebook/cache/disk/e;->GZ:Lcom/facebook/common/d/l;
+    iput-object p2, p0, Lcom/facebook/cache/disk/e;->GV:Lcom/facebook/common/d/l;
 
-    iput-object p3, p0, Lcom/facebook/cache/disk/e;->GY:Ljava/lang/String;
+    iput-object p3, p0, Lcom/facebook/cache/disk/e;->GU: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;->HB:Lcom/facebook/cache/disk/e$a;
+    iput-object p1, p0, Lcom/facebook/cache/disk/e;->Hx:Lcom/facebook/cache/disk/e$a;
 
     return-void
 .end method
 
-.method private declared-synchronized fY()Lcom/facebook/cache/disk/c;
+.method private declared-synchronized fW()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;->HB:Lcom/facebook/cache/disk/e$a;
+    iget-object v0, p0, Lcom/facebook/cache/disk/e;->Hx:Lcom/facebook/cache/disk/e$a;
 
-    iget-object v1, v0, Lcom/facebook/cache/disk/e$a;->HC:Lcom/facebook/cache/disk/c;
+    iget-object v1, v0, Lcom/facebook/cache/disk/e$a;->Hy:Lcom/facebook/cache/disk/c;
 
     if-eqz v1, :cond_1
 
-    iget-object v1, v0, Lcom/facebook/cache/disk/e$a;->HD:Ljava/io/File;
+    iget-object v1, v0, Lcom/facebook/cache/disk/e$a;->Hz:Ljava/io/File;
 
     if-eqz v1, :cond_1
 
-    iget-object v0, v0, Lcom/facebook/cache/disk/e$a;->HD:Ljava/io/File;
+    iget-object v0, v0, Lcom/facebook/cache/disk/e$a;->Hz: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;->HB:Lcom/facebook/cache/disk/e$a;
+    iget-object v0, p0, Lcom/facebook/cache/disk/e;->Hx:Lcom/facebook/cache/disk/e$a;
 
-    iget-object v0, v0, Lcom/facebook/cache/disk/e$a;->HC:Lcom/facebook/cache/disk/c;
+    iget-object v0, v0, Lcom/facebook/cache/disk/e$a;->Hy:Lcom/facebook/cache/disk/c;
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/facebook/cache/disk/e;->HB:Lcom/facebook/cache/disk/e$a;
+    iget-object v0, p0, Lcom/facebook/cache/disk/e;->Hx:Lcom/facebook/cache/disk/e$a;
 
-    iget-object v0, v0, Lcom/facebook/cache/disk/e$a;->HD:Ljava/io/File;
+    iget-object v0, v0, Lcom/facebook/cache/disk/e$a;->Hz:Ljava/io/File;
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/facebook/cache/disk/e;->HB:Lcom/facebook/cache/disk/e$a;
+    iget-object v0, p0, Lcom/facebook/cache/disk/e;->Hx:Lcom/facebook/cache/disk/e$a;
 
-    iget-object v0, v0, Lcom/facebook/cache/disk/e$a;->HD:Ljava/io/File;
+    iget-object v0, v0, Lcom/facebook/cache/disk/e$a;->Hz: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;->GZ:Lcom/facebook/common/d/l;
+    iget-object v1, p0, Lcom/facebook/cache/disk/e;->GV: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;->GY:Ljava/lang/String;
+    iget-object v2, p0, Lcom/facebook/cache/disk/e;->GU: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;->GI:Ljava/lang/Class;
+    sget-object v1, Lcom/facebook/cache/disk/e;->GE: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;->GN:Lcom/facebook/cache/common/a;
+    iget-object v3, p0, Lcom/facebook/cache/disk/e;->GJ: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;->HB:Lcom/facebook/cache/disk/e$a;
+    iput-object v2, p0, Lcom/facebook/cache/disk/e;->Hx:Lcom/facebook/cache/disk/e$a;
 
     goto :goto_2
 
     :catch_0
     move-exception v0
 
-    sget v1, Lcom/facebook/cache/common/a$a;->Gs:I
+    sget v1, Lcom/facebook/cache/common/a$a;->Go:I
 
     throw v0
 
     :cond_3
     :goto_2
-    iget-object v0, p0, Lcom/facebook/cache/disk/e;->HB:Lcom/facebook/cache/disk/e$a;
+    iget-object v0, p0, Lcom/facebook/cache/disk/e;->Hx:Lcom/facebook/cache/disk/e$a;
 
-    iget-object v0, v0, Lcom/facebook/cache/disk/e$a;->HC:Lcom/facebook/cache/disk/c;
+    iget-object v0, v0, Lcom/facebook/cache/disk/e$a;->Hy: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;->fY()Lcom/facebook/cache/disk/c;
+    invoke-direct {p0}, Lcom/facebook/cache/disk/e;->fW()Lcom/facebook/cache/disk/c;
 
     move-result-object v0
 
@@ -264,7 +264,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/facebook/cache/disk/e;->fY()Lcom/facebook/cache/disk/c;
+    invoke-direct {p0}, Lcom/facebook/cache/disk/e;->fW()Lcom/facebook/cache/disk/c;
 
     move-result-object v0
 
@@ -283,7 +283,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/facebook/cache/disk/e;->fY()Lcom/facebook/cache/disk/c;
+    invoke-direct {p0}, Lcom/facebook/cache/disk/e;->fW()Lcom/facebook/cache/disk/c;
 
     move-result-object v0
 
@@ -302,7 +302,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/facebook/cache/disk/e;->fY()Lcom/facebook/cache/disk/c;
+    invoke-direct {p0}, Lcom/facebook/cache/disk/e;->fW()Lcom/facebook/cache/disk/c;
 
     move-result-object v0
 
@@ -313,15 +313,15 @@
     return-object p1
 .end method
 
-.method public final fO()V
+.method public final fM()V
     .locals 3
 
     :try_start_0
-    invoke-direct {p0}, Lcom/facebook/cache/disk/e;->fY()Lcom/facebook/cache/disk/c;
+    invoke-direct {p0}, Lcom/facebook/cache/disk/e;->fW()Lcom/facebook/cache/disk/c;
 
     move-result-object v0
 
-    invoke-interface {v0}, Lcom/facebook/cache/disk/c;->fO()V
+    invoke-interface {v0}, Lcom/facebook/cache/disk/c;->fM()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;->GI:Ljava/lang/Class;
+    sget-object v1, Lcom/facebook/cache/disk/e;->GE:Ljava/lang/Class;
 
     const-string v2, "purgeUnexpectedResources"
 
@@ -339,7 +339,7 @@
     return-void
 .end method
 
-.method public final fP()Ljava/util/Collection;
+.method public final fN()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;->fY()Lcom/facebook/cache/disk/c;
+    invoke-direct {p0}, Lcom/facebook/cache/disk/e;->fW()Lcom/facebook/cache/disk/c;
 
     move-result-object v0
 
-    invoke-interface {v0}, Lcom/facebook/cache/disk/c;->fP()Ljava/util/Collection;
+    invoke-interface {v0}, Lcom/facebook/cache/disk/c;->fN()Ljava/util/Collection;
 
     move-result-object v0
 
@@ -371,7 +371,7 @@
     .locals 1
 
     :try_start_0
-    invoke-direct {p0}, Lcom/facebook/cache/disk/e;->fY()Lcom/facebook/cache/disk/c;
+    invoke-direct {p0}, Lcom/facebook/cache/disk/e;->fW()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 639b5c89d5..bfa58ca7f3 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 fT()Lcom/facebook/cache/disk/f;
+.method public abstract fR()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 da4037be3d..99a3141e8d 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 HE:Ljava/lang/Object;
+.field private static final HA:Ljava/lang/Object;
 
-.field private static HF:Lcom/facebook/cache/disk/i;
+.field private static HB:Lcom/facebook/cache/disk/i;
 
-.field private static HG:I
+.field private static HC:I
 
 
 # instance fields
-.field GU:Ljava/lang/String;
+.field GP:Ljava/lang/String;
 
-.field HH:Lcom/facebook/cache/common/CacheKey;
+.field HD:Lcom/facebook/cache/common/CacheKey;
 
-.field HI:J
+.field HE:J
 
-.field HJ:J
+.field HF:J
 
-.field HK:J
+.field HG:J
 
-.field HL:Ljava/io/IOException;
+.field HH:Ljava/io/IOException;
 
-.field HM:I
+.field HI:I
 
-.field private HN:Lcom/facebook/cache/disk/i;
+.field private HJ: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;->HE:Ljava/lang/Object;
+    sput-object v0, Lcom/facebook/cache/disk/i;->HA:Ljava/lang/Object;
 
     return-void
 .end method
@@ -50,33 +50,33 @@
     return-void
 .end method
 
-.method public static fZ()Lcom/facebook/cache/disk/i;
+.method public static fX()Lcom/facebook/cache/disk/i;
     .locals 3
 
-    sget-object v0, Lcom/facebook/cache/disk/i;->HE:Ljava/lang/Object;
+    sget-object v0, Lcom/facebook/cache/disk/i;->HA:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/facebook/cache/disk/i;->HF:Lcom/facebook/cache/disk/i;
+    sget-object v1, Lcom/facebook/cache/disk/i;->HB:Lcom/facebook/cache/disk/i;
 
     if-eqz v1, :cond_0
 
-    sget-object v1, Lcom/facebook/cache/disk/i;->HF:Lcom/facebook/cache/disk/i;
+    sget-object v1, Lcom/facebook/cache/disk/i;->HB:Lcom/facebook/cache/disk/i;
 
-    iget-object v2, v1, Lcom/facebook/cache/disk/i;->HN:Lcom/facebook/cache/disk/i;
+    iget-object v2, v1, Lcom/facebook/cache/disk/i;->HJ:Lcom/facebook/cache/disk/i;
 
-    sput-object v2, Lcom/facebook/cache/disk/i;->HF:Lcom/facebook/cache/disk/i;
+    sput-object v2, Lcom/facebook/cache/disk/i;->HB:Lcom/facebook/cache/disk/i;
 
     const/4 v2, 0x0
 
-    iput-object v2, v1, Lcom/facebook/cache/disk/i;->HN:Lcom/facebook/cache/disk/i;
+    iput-object v2, v1, Lcom/facebook/cache/disk/i;->HJ:Lcom/facebook/cache/disk/i;
 
-    sget v2, Lcom/facebook/cache/disk/i;->HG:I
+    sget v2, Lcom/facebook/cache/disk/i;->HC:I
 
     add-int/lit8 v2, v2, -0x1
 
-    sput v2, Lcom/facebook/cache/disk/i;->HG:I
+    sput v2, Lcom/facebook/cache/disk/i;->HC:I
 
     monitor-exit v0
 
@@ -109,23 +109,23 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/facebook/cache/disk/i;->HH:Lcom/facebook/cache/common/CacheKey;
+    iput-object v0, p0, Lcom/facebook/cache/disk/i;->HD:Lcom/facebook/cache/common/CacheKey;
 
-    iput-object v0, p0, Lcom/facebook/cache/disk/i;->GU:Ljava/lang/String;
+    iput-object v0, p0, Lcom/facebook/cache/disk/i;->GP:Ljava/lang/String;
 
     const-wide/16 v1, 0x0
 
-    iput-wide v1, p0, Lcom/facebook/cache/disk/i;->HI:J
+    iput-wide v1, p0, Lcom/facebook/cache/disk/i;->HE:J
 
-    iput-wide v1, p0, Lcom/facebook/cache/disk/i;->HJ:J
+    iput-wide v1, p0, Lcom/facebook/cache/disk/i;->HF:J
 
-    iput-wide v1, p0, Lcom/facebook/cache/disk/i;->HK:J
+    iput-wide v1, p0, Lcom/facebook/cache/disk/i;->HG:J
 
-    iput-object v0, p0, Lcom/facebook/cache/disk/i;->HL:Ljava/io/IOException;
+    iput-object v0, p0, Lcom/facebook/cache/disk/i;->HH:Ljava/io/IOException;
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lcom/facebook/cache/disk/i;->HM:I
+    iput v0, p0, Lcom/facebook/cache/disk/i;->HI:I
 
     return-void
 .end method
@@ -135,12 +135,12 @@
 .method public final recycle()V
     .locals 3
 
-    sget-object v0, Lcom/facebook/cache/disk/i;->HE:Ljava/lang/Object;
+    sget-object v0, Lcom/facebook/cache/disk/i;->HA:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    sget v1, Lcom/facebook/cache/disk/i;->HG:I
+    sget v1, Lcom/facebook/cache/disk/i;->HC: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;->HG:I
+    sget v1, Lcom/facebook/cache/disk/i;->HC:I
 
     add-int/lit8 v1, v1, 0x1
 
-    sput v1, Lcom/facebook/cache/disk/i;->HG:I
+    sput v1, Lcom/facebook/cache/disk/i;->HC:I
 
-    sget-object v1, Lcom/facebook/cache/disk/i;->HF:Lcom/facebook/cache/disk/i;
+    sget-object v1, Lcom/facebook/cache/disk/i;->HB:Lcom/facebook/cache/disk/i;
 
     if-eqz v1, :cond_0
 
-    sget-object v1, Lcom/facebook/cache/disk/i;->HF:Lcom/facebook/cache/disk/i;
+    sget-object v1, Lcom/facebook/cache/disk/i;->HB:Lcom/facebook/cache/disk/i;
 
-    iput-object v1, p0, Lcom/facebook/cache/disk/i;->HN:Lcom/facebook/cache/disk/i;
+    iput-object v1, p0, Lcom/facebook/cache/disk/i;->HJ:Lcom/facebook/cache/disk/i;
 
     :cond_0
-    sput-object p0, Lcom/facebook/cache/disk/i;->HF:Lcom/facebook/cache/disk/i;
+    sput-object p0, Lcom/facebook/cache/disk/i;->HB: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 335fc5102a..a8b2531d85 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 HP:Lcom/facebook/common/b/a;
+.field private static final HL: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;->HP:Lcom/facebook/common/b/a;
+    sput-object v0, Lcom/facebook/common/b/a;->HL:Lcom/facebook/common/b/a;
 
     return-void
 .end method
@@ -28,10 +28,10 @@
     return-void
 .end method
 
-.method public static gb()Lcom/facebook/common/b/a;
+.method public static fZ()Lcom/facebook/common/b/a;
     .locals 1
 
-    sget-object v0, Lcom/facebook/common/b/a;->HP:Lcom/facebook/common/b/a;
+    sget-object v0, Lcom/facebook/common/b/a;->HL: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 cf3bee3df5..8292240a41 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 HV:Lcom/facebook/common/b/b;
+.field final synthetic HR: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;->HV:Lcom/facebook/common/b/b;
+    iput-object p1, p0, Lcom/facebook/common/b/b$a;->HR: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;->HV:Lcom/facebook/common/b/b;
+    iget-object v1, p0, Lcom/facebook/common/b/b$a;->HR: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;->ge()Ljava/lang/Class;
+    invoke-static {}, Lcom/facebook/common/b/b;->gb()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;->HV:Lcom/facebook/common/b/b;
+    iget-object v3, p0, Lcom/facebook/common/b/b$a;->HR: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;->HV:Lcom/facebook/common/b/b;
+    iget-object v1, p0, Lcom/facebook/common/b/b$a;->HR: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;->HV:Lcom/facebook/common/b/b;
+    iget-object v2, p0, Lcom/facebook/common/b/b$a;->HR: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;->HV:Lcom/facebook/common/b/b;
+    iget-object v0, p0, Lcom/facebook/common/b/b$a;->HR: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;->ge()Ljava/lang/Class;
+    invoke-static {}, Lcom/facebook/common/b/b;->gb()Ljava/lang/Class;
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/facebook/common/b/b$a;->HV:Lcom/facebook/common/b/b;
+    iget-object v3, p0, Lcom/facebook/common/b/b$a;->HR: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;->HV:Lcom/facebook/common/b/b;
+    iget-object v2, p0, Lcom/facebook/common/b/b$a;->HR: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;->HV:Lcom/facebook/common/b/b;
+    iget-object v3, p0, Lcom/facebook/common/b/b$a;->HR: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;->HV:Lcom/facebook/common/b/b;
+    iget-object v0, p0, Lcom/facebook/common/b/b$a;->HR: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;->ge()Ljava/lang/Class;
+    invoke-static {}, Lcom/facebook/common/b/b;->gb()Ljava/lang/Class;
 
     move-result-object v3
 
-    iget-object v4, p0, Lcom/facebook/common/b/b$a;->HV:Lcom/facebook/common/b/b;
+    iget-object v4, p0, Lcom/facebook/common/b/b$a;->HR: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 d6def324a6..31986af175 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 GI:Ljava/lang/Class;
+.field private static final GE:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -23,9 +23,9 @@
 
 
 # instance fields
-.field private volatile HQ:I
+.field private volatile HM:I
 
-.field private final HR:Ljava/util/concurrent/BlockingQueue;
+.field private final HN: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 HS:Lcom/facebook/common/b/b$a;
+.field private final HO:Lcom/facebook/common/b/b$a;
 
-.field private final HT:Ljava/util/concurrent/atomic/AtomicInteger;
+.field private final HP:Ljava/util/concurrent/atomic/AtomicInteger;
 
-.field private final HU:Ljava/util/concurrent/atomic/AtomicInteger;
+.field private final HQ: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;->GI:Ljava/lang/Class;
+    sput-object v0, Lcom/facebook/common/b/b;->GE:Ljava/lang/Class;
 
     return-void
 .end method
@@ -78,9 +78,9 @@
 
     const/4 p1, 0x1
 
-    iput p1, p0, Lcom/facebook/common/b/b;->HQ:I
+    iput p1, p0, Lcom/facebook/common/b/b;->HM:I
 
-    iput-object p3, p0, Lcom/facebook/common/b/b;->HR:Ljava/util/concurrent/BlockingQueue;
+    iput-object p3, p0, Lcom/facebook/common/b/b;->HN: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;->HS:Lcom/facebook/common/b/b$a;
+    iput-object p1, p0, Lcom/facebook/common/b/b;->HO: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;->HT:Ljava/util/concurrent/atomic/AtomicInteger;
+    iput-object p1, p0, Lcom/facebook/common/b/b;->HP: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;->HU:Ljava/util/concurrent/atomic/AtomicInteger;
+    iput-object p1, p0, Lcom/facebook/common/b/b;->HQ: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;->HR:Ljava/util/concurrent/BlockingQueue;
+    iget-object p0, p0, Lcom/facebook/common/b/b;->HN: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;->HT:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object p0, p0, Lcom/facebook/common/b/b;->HP: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;->gd()V
+    invoke-direct {p0}, Lcom/facebook/common/b/b;->ga()V
 
     return-void
 .end method
 
-.method private gd()V
+.method private ga()V
     .locals 5
 
-    iget-object v0, p0, Lcom/facebook/common/b/b;->HT:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v0, p0, Lcom/facebook/common/b/b;->HP: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;->HQ:I
+    iget v1, p0, Lcom/facebook/common/b/b;->HM:I
 
     if-ge v0, v1, :cond_1
 
     add-int/lit8 v1, v0, 0x1
 
-    iget-object v2, p0, Lcom/facebook/common/b/b;->HT:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v2, p0, Lcom/facebook/common/b/b;->HP: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;->GI:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/common/b/b;->GE: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;->HQ:I
+    iget v3, p0, Lcom/facebook/common/b/b;->HM: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;->HS:Lcom/facebook/common/b/b$a;
+    iget-object v1, p0, Lcom/facebook/common/b/b;->HO: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;->GI:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/common/b/b;->GE: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;->HT:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v0, p0, Lcom/facebook/common/b/b;->HP: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 ge()Ljava/lang/Class;
+.method static synthetic gb()Ljava/lang/Class;
     .locals 1
 
-    sget-object v0, Lcom/facebook/common/b/b;->GI:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/common/b/b;->GE: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;->HR:Ljava/util/concurrent/BlockingQueue;
+    iget-object v0, p0, Lcom/facebook/common/b/b;->HN: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;->HR:Ljava/util/concurrent/BlockingQueue;
+    iget-object p1, p0, Lcom/facebook/common/b/b;->HN: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;->HU:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v0, p0, Lcom/facebook/common/b/b;->HQ: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;->HU:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v1, p0, Lcom/facebook/common/b/b;->HQ: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;->GI:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/common/b/b;->GE: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;->gd()V
+    invoke-direct {p0}, Lcom/facebook/common/b/b;->ga()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;->HR:Ljava/util/concurrent/BlockingQueue;
+    iget-object v1, p0, Lcom/facebook/common/b/b;->HN: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 97df064c21..a35dbb342a 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 HA:J
+.field public Hw:J
 
 
 # direct methods
@@ -15,7 +15,7 @@
 
     const-wide/16 v0, 0x0
 
-    iput-wide v0, p0, Lcom/facebook/common/d/c;->HA:J
+    iput-wide v0, p0, Lcom/facebook/common/d/c;->Hw: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;->HA:J
+    iget-wide v0, p0, Lcom/facebook/common/d/c;->Hw:J
 
     const-wide/16 v2, 0x1
 
     add-long/2addr v0, v2
 
-    iput-wide v0, p0, Lcom/facebook/common/d/c;->HA:J
+    iput-wide v0, p0, Lcom/facebook/common/d/c;->Hw: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;->HA:J
+    iget-wide p1, p0, Lcom/facebook/common/d/c;->Hw:J
 
     int-to-long v0, p3
 
     add-long/2addr p1, v0
 
-    iput-wide p1, p0, Lcom/facebook/common/d/c;->HA:J
+    iput-wide p1, p0, Lcom/facebook/common/d/c;->Hw: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 f77e6d1d52..57653abf79 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 gj()Ljava/util/Set;
+.method public static gh()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 e9228c57de..d14c06d84b 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 Ig:Ljava/lang/Object;
+.field final synthetic Ic:Ljava/lang/Object;
 
 
 # direct methods
 .method constructor <init>(Ljava/lang/Object;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/common/d/m$1;->Ig:Ljava/lang/Object;
+    iput-object p1, p0, Lcom/facebook/common/d/m$1;->Ic: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;->Ig:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/facebook/common/d/m$1;->Ic: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 d6d18f8d8b..7a5021608d 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 Ie:Lcom/facebook/common/d/l;
+.field public static final Ia: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 If:Lcom/facebook/common/d/l;
+.field public static final Ib: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;->Ie:Lcom/facebook/common/d/l;
+    sput-object v0, Lcom/facebook/common/d/m;->Ia: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;->If:Lcom/facebook/common/d/l;
+    sput-object v0, Lcom/facebook/common/d/m;->Ib: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 91a5caf2b9..ec06ac22da 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 Ih:Lcom/facebook/common/e/c;
+.field private static Id:Lcom/facebook/common/e/c;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    invoke-static {}, Lcom/facebook/common/e/b;->gk()Lcom/facebook/common/e/b;
+    invoke-static {}, Lcom/facebook/common/e/b;->gi()Lcom/facebook/common/e/b;
 
     move-result-object v0
 
-    sput-object v0, Lcom/facebook/common/e/a;->Ih:Lcom/facebook/common/e/c;
+    sput-object v0, Lcom/facebook/common/e/a;->Id: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;->Ih:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Id: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;->Ih:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Id: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;->Ih:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Id: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;->Ih:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Id: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;->Ih:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Id: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;->Ih:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Id: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;->Ih:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Id: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;->Ih:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Id: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;->Ih:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Id: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;->Ih:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Id: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;->Ih:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Id: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;->Ih:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Id: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;->Ih:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Id: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;->Ih:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Id: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;->Ih:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Id:Lcom/facebook/common/e/c;
 
     const/4 v1, 0x0
 
@@ -429,7 +429,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/facebook/common/e/a;->Ih:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Id: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;->Ih:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Id: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;->Ih:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Id: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;->Ih:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Id: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;->Ih:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Id: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;->Ih:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Id: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;->Ih:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Id: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;->Ih:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Id: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;->Ih:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Id: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;->Ih:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Id: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;->Ih:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Id: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;->Ih:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Id:Lcom/facebook/common/e/c;
 
     const/4 v1, 0x0
 
@@ -659,7 +659,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/facebook/common/e/a;->Ih:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Id: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;->Ih:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Id: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;->Ih:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Id: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;->Ih:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Id: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;->Ih:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Id: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;->Ih:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Id: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;->Ih:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Id: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;->Ih:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Id: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;->Ih:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Id: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;->Ih:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Id: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;->Ih:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Id: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;->Ih:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Id: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;->Ih:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Id: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;->Ih:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Id: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;->Ih:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Id: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;->Ih:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Id: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;->Ih:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Id: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;->Ih:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Id: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;->Ih:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Id: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;->Ih:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Id: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 b21a961a1f..2a4f4d0d94 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 Ii:Lcom/facebook/common/e/b;
+.field public static final Ie:Lcom/facebook/common/e/b;
 
 
 # instance fields
-.field private Ij:Ljava/lang/String;
+.field private If:Ljava/lang/String;
 
-.field private Ik:I
+.field private Ig: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;->Ii:Lcom/facebook/common/e/b;
+    sput-object v0, Lcom/facebook/common/e/b;->Ie: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;->Ij:Ljava/lang/String;
+    iput-object v0, p0, Lcom/facebook/common/e/b;->If:Ljava/lang/String;
 
     const/4 v0, 0x5
 
-    iput v0, p0, Lcom/facebook/common/e/b;->Ik:I
+    iput v0, p0, Lcom/facebook/common/e/b;->Ig: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;->Ij:Ljava/lang/String;
+    iget-object v0, p0, Lcom/facebook/common/e/b;->If: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;->Ij:Ljava/lang/String;
+    iget-object v1, p0, Lcom/facebook/common/e/b;->If: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 gk()Lcom/facebook/common/e/b;
+.method public static gi()Lcom/facebook/common/e/b;
     .locals 1
 
-    sget-object v0, Lcom/facebook/common/e/b;->Ii:Lcom/facebook/common/e/b;
+    sget-object v0, Lcom/facebook/common/e/b;->Ie: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;->Ik:I
+    iget v0, p0, Lcom/facebook/common/e/b;->Ig: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 094bfa176e..6a06e04c93 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 Im:Landroid/webkit/MimeTypeMap;
+.field private static final Ii:Landroid/webkit/MimeTypeMap;
 
-.field private static final In:Ljava/util/Map;
+.field private static final Ij:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -17,7 +17,7 @@
     .end annotation
 .end field
 
-.field private static final Io:Ljava/util/Map;
+.field private static final Ik: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;->Im:Landroid/webkit/MimeTypeMap;
+    sput-object v0, Lcom/facebook/common/f/b;->Ii:Landroid/webkit/MimeTypeMap;
 
     const-string v0, "heic"
 
@@ -51,13 +51,13 @@
 
     move-result-object v4
 
-    sput-object v4, Lcom/facebook/common/f/b;->In:Ljava/util/Map;
+    sput-object v4, Lcom/facebook/common/f/b;->Ij: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;->Io:Ljava/util/Map;
+    sput-object v0, Lcom/facebook/common/f/b;->Ik: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;->Io:Ljava/util/Map;
+    sget-object v0, Lcom/facebook/common/f/b;->Ik: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;->Im:Landroid/webkit/MimeTypeMap;
+    sget-object v0, Lcom/facebook/common/f/b;->Ii: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 834b7a4293..636bce763b 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 Ip:Lcom/facebook/common/g/c;
+.field private static Il:Lcom/facebook/common/g/c;
 
 
 # direct methods
@@ -25,7 +25,7 @@
     return-void
 .end method
 
-.method public static declared-synchronized gl()Lcom/facebook/common/g/c;
+.method public static declared-synchronized gj()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;->Ip:Lcom/facebook/common/g/c;
+    sget-object v1, Lcom/facebook/common/g/c;->Il: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;->Ip:Lcom/facebook/common/g/c;
+    sput-object v1, Lcom/facebook/common/g/c;->Il:Lcom/facebook/common/g/c;
 
     :cond_0
-    sget-object v1, Lcom/facebook/common/g/c;->Ip:Lcom/facebook/common/g/c;
+    sget-object v1, Lcom/facebook/common/g/c;->Il: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 0b801f62ac..15cd69b15d 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 Iq:Ljava/io/InputStream;
+.field private final Im:Ljava/io/InputStream;
 
-.field private final Ir:[B
+.field private final In:[B
 
-.field private final Is:Lcom/facebook/common/references/b;
+.field private final Io: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 It:I
+.field private Ip:I
 
-.field private Iu:I
+.field private Iq:I
 
 .field private mClosed:Z
 
@@ -45,7 +45,7 @@
 
     check-cast p1, Ljava/io/InputStream;
 
-    iput-object p1, p0, Lcom/facebook/common/g/e;->Iq:Ljava/io/InputStream;
+    iput-object p1, p0, Lcom/facebook/common/g/e;->Im: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;->Ir:[B
+    iput-object p1, p0, Lcom/facebook/common/g/e;->In:[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;->Is:Lcom/facebook/common/references/b;
+    iput-object p1, p0, Lcom/facebook/common/g/e;->Io:Lcom/facebook/common/references/b;
 
     const/4 p1, 0x0
 
-    iput p1, p0, Lcom/facebook/common/g/e;->It:I
+    iput p1, p0, Lcom/facebook/common/g/e;->Ip:I
 
-    iput p1, p0, Lcom/facebook/common/g/e;->Iu:I
+    iput p1, p0, Lcom/facebook/common/g/e;->Iq:I
 
     iput-boolean p1, p0, Lcom/facebook/common/g/e;->mClosed:Z
 
     return-void
 .end method
 
-.method private gm()Z
+.method private gk()Z
     .locals 3
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -82,9 +82,9 @@
         }
     .end annotation
 
-    iget v0, p0, Lcom/facebook/common/g/e;->Iu:I
+    iget v0, p0, Lcom/facebook/common/g/e;->Iq:I
 
-    iget v1, p0, Lcom/facebook/common/g/e;->It:I
+    iget v1, p0, Lcom/facebook/common/g/e;->Ip:I
 
     const/4 v2, 0x1
 
@@ -93,9 +93,9 @@
     return v2
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/common/g/e;->Iq:Ljava/io/InputStream;
+    iget-object v0, p0, Lcom/facebook/common/g/e;->Im:Ljava/io/InputStream;
 
-    iget-object v1, p0, Lcom/facebook/common/g/e;->Ir:[B
+    iget-object v1, p0, Lcom/facebook/common/g/e;->In:[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;->It:I
+    iput v0, p0, Lcom/facebook/common/g/e;->Ip:I
 
-    iput v1, p0, Lcom/facebook/common/g/e;->Iu:I
+    iput v1, p0, Lcom/facebook/common/g/e;->Iq:I
 
     return v2
 .end method
 
-.method private gn()V
+.method private gl()V
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -149,9 +149,9 @@
         }
     .end annotation
 
-    iget v0, p0, Lcom/facebook/common/g/e;->Iu:I
+    iget v0, p0, Lcom/facebook/common/g/e;->Iq:I
 
-    iget v1, p0, Lcom/facebook/common/g/e;->It:I
+    iget v1, p0, Lcom/facebook/common/g/e;->Ip: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;->gn()V
+    invoke-direct {p0}, Lcom/facebook/common/g/e;->gl()V
 
-    iget v0, p0, Lcom/facebook/common/g/e;->It:I
+    iget v0, p0, Lcom/facebook/common/g/e;->Ip:I
 
-    iget v1, p0, Lcom/facebook/common/g/e;->Iu:I
+    iget v1, p0, Lcom/facebook/common/g/e;->Iq:I
 
     sub-int/2addr v0, v1
 
-    iget-object v1, p0, Lcom/facebook/common/g/e;->Iq:Ljava/io/InputStream;
+    iget-object v1, p0, Lcom/facebook/common/g/e;->Im: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;->Is:Lcom/facebook/common/references/b;
+    iget-object v0, p0, Lcom/facebook/common/g/e;->Io:Lcom/facebook/common/references/b;
 
-    iget-object v1, p0, Lcom/facebook/common/g/e;->Ir:[B
+    iget-object v1, p0, Lcom/facebook/common/g/e;->In:[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;->Iu:I
+    iget v0, p0, Lcom/facebook/common/g/e;->Iq:I
 
-    iget v1, p0, Lcom/facebook/common/g/e;->It:I
+    iget v1, p0, Lcom/facebook/common/g/e;->Ip: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;->gn()V
+    invoke-direct {p0}, Lcom/facebook/common/g/e;->gl()V
 
-    invoke-direct {p0}, Lcom/facebook/common/g/e;->gm()Z
+    invoke-direct {p0}, Lcom/facebook/common/g/e;->gk()Z
 
     move-result v0
 
@@ -275,13 +275,13 @@
     return v0
 
     :cond_1
-    iget-object v0, p0, Lcom/facebook/common/g/e;->Ir:[B
+    iget-object v0, p0, Lcom/facebook/common/g/e;->In:[B
 
-    iget v1, p0, Lcom/facebook/common/g/e;->Iu:I
+    iget v1, p0, Lcom/facebook/common/g/e;->Iq:I
 
     add-int/lit8 v2, v1, 0x1
 
-    iput v2, p0, Lcom/facebook/common/g/e;->Iu:I
+    iput v2, p0, Lcom/facebook/common/g/e;->Iq:I
 
     aget-byte v0, v0, v1
 
@@ -298,9 +298,9 @@
         }
     .end annotation
 
-    iget v0, p0, Lcom/facebook/common/g/e;->Iu:I
+    iget v0, p0, Lcom/facebook/common/g/e;->Iq:I
 
-    iget v1, p0, Lcom/facebook/common/g/e;->It:I
+    iget v1, p0, Lcom/facebook/common/g/e;->Ip: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;->gn()V
+    invoke-direct {p0}, Lcom/facebook/common/g/e;->gl()V
 
-    invoke-direct {p0}, Lcom/facebook/common/g/e;->gm()Z
+    invoke-direct {p0}, Lcom/facebook/common/g/e;->gk()Z
 
     move-result v0
 
@@ -327,9 +327,9 @@
     return p1
 
     :cond_1
-    iget v0, p0, Lcom/facebook/common/g/e;->It:I
+    iget v0, p0, Lcom/facebook/common/g/e;->Ip:I
 
-    iget v1, p0, Lcom/facebook/common/g/e;->Iu:I
+    iget v1, p0, Lcom/facebook/common/g/e;->Iq:I
 
     sub-int/2addr v0, v1
 
@@ -337,17 +337,17 @@
 
     move-result p3
 
-    iget-object v0, p0, Lcom/facebook/common/g/e;->Ir:[B
+    iget-object v0, p0, Lcom/facebook/common/g/e;->In:[B
 
-    iget v1, p0, Lcom/facebook/common/g/e;->Iu:I
+    iget v1, p0, Lcom/facebook/common/g/e;->Iq: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;->Iu:I
+    iget p1, p0, Lcom/facebook/common/g/e;->Iq:I
 
     add-int/2addr p1, p3
 
-    iput p1, p0, Lcom/facebook/common/g/e;->Iu:I
+    iput p1, p0, Lcom/facebook/common/g/e;->Iq:I
 
     return p3
 .end method
@@ -360,9 +360,9 @@
         }
     .end annotation
 
-    iget v0, p0, Lcom/facebook/common/g/e;->Iu:I
+    iget v0, p0, Lcom/facebook/common/g/e;->Iq:I
 
-    iget v1, p0, Lcom/facebook/common/g/e;->It:I
+    iget v1, p0, Lcom/facebook/common/g/e;->Ip: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;->gn()V
+    invoke-direct {p0}, Lcom/facebook/common/g/e;->gl()V
 
-    iget v0, p0, Lcom/facebook/common/g/e;->It:I
+    iget v0, p0, Lcom/facebook/common/g/e;->Ip:I
 
-    iget v1, p0, Lcom/facebook/common/g/e;->Iu:I
+    iget v1, p0, Lcom/facebook/common/g/e;->Iq:I
 
     sub-int v2, v0, v1
 
@@ -396,14 +396,14 @@
 
     long-to-int v1, v0
 
-    iput v1, p0, Lcom/facebook/common/g/e;->Iu:I
+    iput v1, p0, Lcom/facebook/common/g/e;->Iq:I
 
     return-wide p1
 
     :cond_1
-    iput v0, p0, Lcom/facebook/common/g/e;->Iu:I
+    iput v0, p0, Lcom/facebook/common/g/e;->Iq:I
 
-    iget-object v0, p0, Lcom/facebook/common/g/e;->Iq:Ljava/io/InputStream;
+    iget-object v0, p0, Lcom/facebook/common/g/e;->Im: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 715d338287..67118339f1 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 gp()Lcom/facebook/common/g/i;
+.method public abstract gn()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 11933ad153..c5a38bacea 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 Iv:Lcom/facebook/common/g/f;
+.field final Ir:Lcom/facebook/common/g/f;
 
-.field Iw:I
+.field Is: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;->Iv:Lcom/facebook/common/g/f;
+    iput-object p1, p0, Lcom/facebook/common/g/h;->Ir: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;->Iw:I
+    iput p1, p0, Lcom/facebook/common/g/h;->Is: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;->Iv:Lcom/facebook/common/g/f;
+    iget-object v0, p0, Lcom/facebook/common/g/h;->Ir: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;->Iw:I
+    iput p1, p0, Lcom/facebook/common/g/h;->Is:I
 
     return-void
 .end method
@@ -92,7 +92,7 @@
     return v0
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/common/g/h;->Iv:Lcom/facebook/common/g/f;
+    iget-object v0, p0, Lcom/facebook/common/g/h;->Ir: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;->Iv:Lcom/facebook/common/g/f;
+    iget-object v0, p0, Lcom/facebook/common/g/h;->Ir: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;->Iw:I
+    iget v0, p0, Lcom/facebook/common/g/h;->Is: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 041fd2252c..11ef9e9347 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 gq()Lcom/facebook/common/g/f;
+.method public abstract go()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 156fa7c613..eafb18249c 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 Ix:I
+.field private final It:I
 
-.field private final Iy:Lcom/facebook/common/g/a;
+.field private final Iu:Lcom/facebook/common/g/a;
 
 
 # direct methods
@@ -31,9 +31,9 @@
 
     const/16 p2, 0x4000
 
-    iput p2, p0, Lcom/facebook/common/g/j;->Ix:I
+    iput p2, p0, Lcom/facebook/common/g/j;->It:I
 
-    iput-object p1, p0, Lcom/facebook/common/g/j;->Iy:Lcom/facebook/common/g/a;
+    iput-object p1, p0, Lcom/facebook/common/g/j;->Iu:Lcom/facebook/common/g/a;
 
     return-void
 .end method
@@ -48,9 +48,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/common/g/j;->Iy:Lcom/facebook/common/g/a;
+    iget-object v0, p0, Lcom/facebook/common/g/j;->Iu:Lcom/facebook/common/g/a;
 
-    iget v1, p0, Lcom/facebook/common/g/j;->Ix:I
+    iget v1, p0, Lcom/facebook/common/g/j;->It: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;->Ix:I
+    iget v3, p0, Lcom/facebook/common/g/j;->It:I
 
     const/4 v4, 0x0
 
@@ -76,7 +76,7 @@
 
     if-ne v3, v5, :cond_0
 
-    iget-object p1, p0, Lcom/facebook/common/g/j;->Iy:Lcom/facebook/common/g/a;
+    iget-object p1, p0, Lcom/facebook/common/g/j;->Iu: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;->Iy:Lcom/facebook/common/g/a;
+    iget-object p2, p0, Lcom/facebook/common/g/j;->Iu: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 64f052cd79..1d3dc54489 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 IT:I = 0x1
+.field public static final IP:I = 0x1
 
-.field public static final IU:I = 0x2
+.field public static final IQ:I = 0x2
 
-.field private static final synthetic IV:[I
+.field private static final synthetic IR:[I
 
 
 # direct methods
@@ -38,19 +38,19 @@
 
     new-array v0, v0, [I
 
-    sget v1, Lcom/facebook/common/h/a$a;->IT:I
+    sget v1, Lcom/facebook/common/h/a$a;->IP:I
 
     const/4 v2, 0x0
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/common/h/a$a;->IU:I
+    sget v1, Lcom/facebook/common/h/a$a;->IQ:I
 
     const/4 v2, 0x1
 
     aput v1, v0, v2
 
-    sput-object v0, Lcom/facebook/common/h/a$a;->IV:[I
+    sput-object v0, Lcom/facebook/common/h/a$a;->IR:[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 821a00b8e4..ef7ce348bf 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 IW:I
+.field private IS:I
 
-.field private IX:I
+.field private IT:I
 
 
 # direct methods
@@ -19,11 +19,11 @@
 
     if-ltz p2, :cond_0
 
-    iput p2, p0, Lcom/facebook/common/i/a;->IW:I
+    iput p2, p0, Lcom/facebook/common/i/a;->IS:I
 
     const/4 p1, -0x1
 
-    iput p1, p0, Lcom/facebook/common/i/a;->IX:I
+    iput p1, p0, Lcom/facebook/common/i/a;->IT:I
 
     return-void
 
@@ -60,7 +60,7 @@
 
     move-result v0
 
-    iget v1, p0, Lcom/facebook/common/i/a;->IW:I
+    iget v1, p0, Lcom/facebook/common/i/a;->IS: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;->IW:I
+    iget p1, p0, Lcom/facebook/common/i/a;->IS:I
 
-    iput p1, p0, Lcom/facebook/common/i/a;->IX:I
+    iput p1, p0, Lcom/facebook/common/i/a;->IT:I
 
     :cond_0
     return-void
@@ -100,7 +100,7 @@
         }
     .end annotation
 
-    iget v0, p0, Lcom/facebook/common/i/a;->IW:I
+    iget v0, p0, Lcom/facebook/common/i/a;->IS:I
 
     const/4 v1, -0x1
 
@@ -117,11 +117,11 @@
 
     if-eq v0, v1, :cond_1
 
-    iget v1, p0, Lcom/facebook/common/i/a;->IW:I
+    iget v1, p0, Lcom/facebook/common/i/a;->IS:I
 
     add-int/lit8 v1, v1, -0x1
 
-    iput v1, p0, Lcom/facebook/common/i/a;->IW:I
+    iput v1, p0, Lcom/facebook/common/i/a;->IS:I
 
     :cond_1
     return v0
@@ -135,7 +135,7 @@
         }
     .end annotation
 
-    iget v0, p0, Lcom/facebook/common/i/a;->IW:I
+    iget v0, p0, Lcom/facebook/common/i/a;->IS:I
 
     if-nez v0, :cond_0
 
@@ -156,11 +156,11 @@
 
     if-lez p1, :cond_1
 
-    iget p2, p0, Lcom/facebook/common/i/a;->IW:I
+    iget p2, p0, Lcom/facebook/common/i/a;->IS:I
 
     sub-int/2addr p2, p1
 
-    iput p2, p0, Lcom/facebook/common/i/a;->IW:I
+    iput p2, p0, Lcom/facebook/common/i/a;->IS:I
 
     :cond_1
     return p1
@@ -182,7 +182,7 @@
 
     if-eqz v0, :cond_1
 
-    iget v0, p0, Lcom/facebook/common/i/a;->IX:I
+    iget v0, p0, Lcom/facebook/common/i/a;->IT: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;->IX:I
+    iget v0, p0, Lcom/facebook/common/i/a;->IT:I
 
-    iput v0, p0, Lcom/facebook/common/i/a;->IW:I
+    iput v0, p0, Lcom/facebook/common/i/a;->IS:I
 
     return-void
 
@@ -225,7 +225,7 @@
         }
     .end annotation
 
-    iget v0, p0, Lcom/facebook/common/i/a;->IW:I
+    iget v0, p0, Lcom/facebook/common/i/a;->IS:I
 
     int-to-long v0, v0
 
@@ -239,7 +239,7 @@
 
     move-result-wide p1
 
-    iget v0, p0, Lcom/facebook/common/i/a;->IW:I
+    iget v0, p0, Lcom/facebook/common/i/a;->IS:I
 
     int-to-long v0, v0
 
@@ -247,7 +247,7 @@
 
     long-to-int v1, v0
 
-    iput v1, p0, Lcom/facebook/common/i/a;->IW:I
+    iput v1, p0, Lcom/facebook/common/i/a;->IS: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 a6ccd927f7..c6cd529819 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 IY:[B
+.field private final IU:[B
 
-.field private IZ:I
+.field private IV:I
 
-.field private Ja:I
+.field private IW:I
 
 
 # direct methods
@@ -21,7 +21,7 @@
 
     if-eqz p2, :cond_0
 
-    iput-object p2, p0, Lcom/facebook/common/i/b;->IY:[B
+    iput-object p2, p0, Lcom/facebook/common/i/b;->IU:[B
 
     return-void
 
@@ -40,12 +40,12 @@
     throw p1
 .end method
 
-.method private gA()I
+.method private gy()I
     .locals 3
 
-    iget v0, p0, Lcom/facebook/common/i/b;->IZ:I
+    iget v0, p0, Lcom/facebook/common/i/b;->IV:I
 
-    iget-object v1, p0, Lcom/facebook/common/i/b;->IY:[B
+    iget-object v1, p0, Lcom/facebook/common/i/b;->IU:[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;->IZ:I
+    iput v2, p0, Lcom/facebook/common/i/b;->IV: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;->IZ:I
+    iget p1, p0, Lcom/facebook/common/i/b;->IV:I
 
-    iput p1, p0, Lcom/facebook/common/i/b;->Ja:I
+    iput p1, p0, Lcom/facebook/common/i/b;->IW:I
 
     :cond_0
     return-void
@@ -111,7 +111,7 @@
     return v0
 
     :cond_0
-    invoke-direct {p0}, Lcom/facebook/common/i/b;->gA()I
+    invoke-direct {p0}, Lcom/facebook/common/i/b;->gy()I
 
     move-result v0
 
@@ -168,7 +168,7 @@
     :goto_0
     if-ge v0, p3, :cond_2
 
-    invoke-direct {p0}, Lcom/facebook/common/i/b;->gA()I
+    invoke-direct {p0}, Lcom/facebook/common/i/b;->gy()I
 
     move-result v2
 
@@ -213,9 +213,9 @@
 
     invoke-virtual {v0}, Ljava/io/InputStream;->reset()V
 
-    iget v0, p0, Lcom/facebook/common/i/b;->Ja:I
+    iget v0, p0, Lcom/facebook/common/i/b;->IW:I
 
-    iput v0, p0, Lcom/facebook/common/i/b;->IZ:I
+    iput v0, p0, Lcom/facebook/common/i/b;->IV: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 55f1646294..f8e65ae9da 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 Jd:[B
+.field static final IZ:[B
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     fill-array-data v0, :array_0
 
-    sput-object v0, Lcom/facebook/common/j/c;->Jd:[B
+    sput-object v0, Lcom/facebook/common/j/c;->IZ:[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 12b3687c94..f19b9400a9 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 Je:Lcom/facebook/common/j/e;
+.field public static final enum Ja:Lcom/facebook/common/j/e;
 
-.field public static final enum Jf:Lcom/facebook/common/j/e;
+.field public static final enum Jb:Lcom/facebook/common/j/e;
 
-.field public static final enum Jg:Lcom/facebook/common/j/e;
+.field public static final enum Jc:Lcom/facebook/common/j/e;
 
-.field private static final synthetic Jh:[Lcom/facebook/common/j/e;
+.field private static final synthetic Jd:[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;->Je:Lcom/facebook/common/j/e;
+    sput-object v0, Lcom/facebook/common/j/e;->Ja: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;->Jf:Lcom/facebook/common/j/e;
+    sput-object v0, Lcom/facebook/common/j/e;->Jb: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;->Jg:Lcom/facebook/common/j/e;
+    sput-object v0, Lcom/facebook/common/j/e;->Jc: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;->Je:Lcom/facebook/common/j/e;
+    sget-object v4, Lcom/facebook/common/j/e;->Ja:Lcom/facebook/common/j/e;
 
     aput-object v4, v0, v1
 
-    sget-object v1, Lcom/facebook/common/j/e;->Jf:Lcom/facebook/common/j/e;
+    sget-object v1, Lcom/facebook/common/j/e;->Jb:Lcom/facebook/common/j/e;
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/facebook/common/j/e;->Jg:Lcom/facebook/common/j/e;
+    sget-object v1, Lcom/facebook/common/j/e;->Jc:Lcom/facebook/common/j/e;
 
     aput-object v1, v0, v3
 
-    sput-object v0, Lcom/facebook/common/j/e;->Jh:[Lcom/facebook/common/j/e;
+    sput-object v0, Lcom/facebook/common/j/e;->Jd:[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;->Je:Lcom/facebook/common/j/e;
+    sget-object p0, Lcom/facebook/common/j/e;->Ja:Lcom/facebook/common/j/e;
 
     return-object p0
 
     :cond_0
-    sget-object p0, Lcom/facebook/common/j/e;->Jf:Lcom/facebook/common/j/e;
+    sget-object p0, Lcom/facebook/common/j/e;->Jb: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;->Jh:[Lcom/facebook/common/j/e;
+    sget-object v0, Lcom/facebook/common/j/e;->Jd:[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 e282ccceda..35db6f60a9 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 IF:Ljava/lang/ref/SoftReference;
+.field public IB:Ljava/lang/ref/SoftReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/ref/SoftReference<",
@@ -24,7 +24,7 @@
     .end annotation
 .end field
 
-.field public IG:Ljava/lang/ref/SoftReference;
+.field public IC:Ljava/lang/ref/SoftReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/ref/SoftReference<",
@@ -33,7 +33,7 @@
     .end annotation
 .end field
 
-.field public IH:Ljava/lang/ref/SoftReference;
+.field public ID: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;->IF:Ljava/lang/ref/SoftReference;
+    iput-object v0, p0, Lcom/facebook/common/references/a;->IB: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;->IC:Ljava/lang/ref/SoftReference;
 
-    iput-object v0, p0, Lcom/facebook/common/references/a;->IH:Ljava/lang/ref/SoftReference;
+    iput-object v0, p0, Lcom/facebook/common/references/a;->ID: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 5fcc5235b0..0bd6f263a6 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 II:Ljava/util/Map;
+.field private static final IE:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -34,9 +34,9 @@
 
 
 # instance fields
-.field private IJ:I
+.field private IF:I
 
-.field final Is:Lcom/facebook/common/references/b;
+.field final Io: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;->II:Ljava/util/Map;
+    sput-object v0, Lcom/facebook/common/references/c;->IE: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;->Is:Lcom/facebook/common/references/b;
+    iput-object p2, p0, Lcom/facebook/common/references/c;->Io:Lcom/facebook/common/references/b;
 
     const/4 p2, 0x1
 
-    iput p2, p0, Lcom/facebook/common/references/c;->IJ:I
+    iput p2, p0, Lcom/facebook/common/references/c;->IF:I
 
-    sget-object v0, Lcom/facebook/common/references/c;->II:Ljava/util/Map;
+    sget-object v0, Lcom/facebook/common/references/c;->IE:Ljava/util/Map;
 
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/facebook/common/references/c;->II:Ljava/util/Map;
+    sget-object v1, Lcom/facebook/common/references/c;->IE: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;->II:Ljava/util/Map;
+    sget-object v1, Lcom/facebook/common/references/c;->IE: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;->II:Ljava/util/Map;
+    sget-object v2, Lcom/facebook/common/references/c;->IE:Ljava/util/Map;
 
     invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
 
@@ -178,7 +178,7 @@
     return p0
 .end method
 
-.method private gw()V
+.method private gu()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;->IJ:I
+    iget v0, p0, Lcom/facebook/common/references/c;->IF: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;->II:Ljava/util/Map;
+    sget-object v0, Lcom/facebook/common/references/c;->IE:Ljava/util/Map;
 
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/facebook/common/references/c;->II:Ljava/util/Map;
+    sget-object v1, Lcom/facebook/common/references/c;->IE: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;->II:Ljava/util/Map;
+    sget-object v1, Lcom/facebook/common/references/c;->IE: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;->II:Ljava/util/Map;
+    sget-object v3, Lcom/facebook/common/references/c;->IE:Ljava/util/Map;
 
     invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
 
@@ -345,19 +345,19 @@
     throw v0
 .end method
 
-.method public final declared-synchronized gu()V
+.method public final declared-synchronized gs()V
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    invoke-direct {p0}, Lcom/facebook/common/references/c;->gw()V
+    invoke-direct {p0}, Lcom/facebook/common/references/c;->gu()V
 
-    iget v0, p0, Lcom/facebook/common/references/c;->IJ:I
+    iget v0, p0, Lcom/facebook/common/references/c;->IF:I
 
     add-int/lit8 v0, v0, 0x1
 
-    iput v0, p0, Lcom/facebook/common/references/c;->IJ:I
+    iput v0, p0, Lcom/facebook/common/references/c;->IF: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 gv()I
+.method final declared-synchronized gt()I
     .locals 2
 
     monitor-enter p0
 
     :try_start_0
-    invoke-direct {p0}, Lcom/facebook/common/references/c;->gw()V
+    invoke-direct {p0}, Lcom/facebook/common/references/c;->gu()V
 
-    iget v0, p0, Lcom/facebook/common/references/c;->IJ:I
+    iget v0, p0, Lcom/facebook/common/references/c;->IF: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;->IJ:I
+    iget v0, p0, Lcom/facebook/common/references/c;->IF:I
 
     sub-int/2addr v0, v1
 
-    iput v0, p0, Lcom/facebook/common/references/c;->IJ:I
+    iput v0, p0, Lcom/facebook/common/references/c;->IF:I
 
-    iget v0, p0, Lcom/facebook/common/references/c;->IJ:I
+    iget v0, p0, Lcom/facebook/common/references/c;->IF: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 3aa58ec0b8..4999d9c4d3 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 Jb:Lcom/facebook/common/time/RealtimeSinceBootClock;
+.field private static final IX: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;->Jb:Lcom/facebook/common/time/RealtimeSinceBootClock;
+    sput-object v0, Lcom/facebook/common/time/RealtimeSinceBootClock;->IX: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;->Jb:Lcom/facebook/common/time/RealtimeSinceBootClock;
+    sget-object v0, Lcom/facebook/common/time/RealtimeSinceBootClock;->IX: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 a0ac0bd60c..fa36d18148 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 Jc:Lcom/facebook/common/time/c;
+.field private static final IY: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;->Jc:Lcom/facebook/common/time/c;
+    sput-object v0, Lcom/facebook/common/time/c;->IY:Lcom/facebook/common/time/c;
 
     return-void
 .end method
@@ -31,10 +31,10 @@
     return-void
 .end method
 
-.method public static gB()Lcom/facebook/common/time/c;
+.method public static gz()Lcom/facebook/common/time/c;
     .locals 1
 
-    sget-object v0, Lcom/facebook/common/time/c;->Jc:Lcom/facebook/common/time/c;
+    sget-object v0, Lcom/facebook/common/time/c;->IY: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 d1d16ac2fa..a0ba9adcf8 100644
--- a/com.discord/smali_classes2/com/facebook/drawee/R$a.smali
+++ b/com.discord/smali_classes2/com/facebook/drawee/R$a.smali
@@ -171,15 +171,16 @@
         0x7f04012f
         0x7f040130
         0x7f040131
-        0x7f040289
+        0x7f040288
+        0x7f040297
         0x7f040298
-        0x7f040299
-        0x7f04029e
+        0x7f04029d
+        0x7f0402c5
         0x7f0402c6
         0x7f0402c7
-        0x7f0402c8
+        0x7f0402d4
         0x7f0402d5
-        0x7f0402d6
+        0x7f0402d8
         0x7f0402d9
         0x7f0402da
         0x7f0402db
@@ -193,7 +194,6 @@
         0x7f0402e3
         0x7f0402e4
         0x7f0402e5
-        0x7f0402e6
         0x7f0403ed
     .end array-data
 
@@ -206,15 +206,16 @@
         0x7f04012f
         0x7f040130
         0x7f040131
-        0x7f040289
+        0x7f040288
+        0x7f040297
         0x7f040298
-        0x7f040299
-        0x7f04029e
+        0x7f04029d
+        0x7f0402c5
         0x7f0402c6
         0x7f0402c7
-        0x7f0402c8
+        0x7f0402d4
         0x7f0402d5
-        0x7f0402d6
+        0x7f0402d8
         0x7f0402d9
         0x7f0402da
         0x7f0402db
@@ -228,7 +229,6 @@
         0x7f0402e3
         0x7f0402e4
         0x7f0402e5
-        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 8154947e67..ca116366fa 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 Le:Lcom/facebook/drawee/a/a;
+.field final synthetic La: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;->Le:Lcom/facebook/drawee/a/a;
+    iput-object p1, p0, Lcom/facebook/drawee/a/a$1;->La: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;->hd()V
+    invoke-static {}, Lcom/facebook/drawee/a/a;->hb()V
 
-    iget-object v0, p0, Lcom/facebook/drawee/a/a$1;->Le:Lcom/facebook/drawee/a/a;
+    iget-object v0, p0, Lcom/facebook/drawee/a/a$1;->La: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;->Le:Lcom/facebook/drawee/a/a;
+    iget-object v0, p0, Lcom/facebook/drawee/a/a$1;->La: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 908c36ac9e..a562187b1e 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
@@ -27,15 +27,15 @@
 
 .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 private static final synthetic LC:[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 private static final synthetic LG:[Lcom/facebook/drawee/a/b$a;
+.field public static final enum Lh:Lcom/facebook/drawee/a/b$a;
 
 .field public static final enum Li:Lcom/facebook/drawee/a/b$a;
 
@@ -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;->Li: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;
 
@@ -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;->Lj:Lcom/facebook/drawee/a/b$a;
+    sput-object v0, Lcom/facebook/drawee/a/b$a;->Lf: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;->Lk:Lcom/facebook/drawee/a/b$a;
+    sput-object v0, Lcom/facebook/drawee/a/b$a;->Lg: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;->Ll:Lcom/facebook/drawee/a/b$a;
+    sput-object v0, Lcom/facebook/drawee/a/b$a;->Lh: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;->Lm: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;
 
@@ -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;->Ln: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;
 
@@ -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;->Lo: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;
 
@@ -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;->Lp: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;
 
@@ -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;->Lq: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;
 
@@ -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;->Lr: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;
 
@@ -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;->Ls: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;
 
@@ -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;->Lt: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;
 
@@ -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;->Lu: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;
 
@@ -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;->Lv: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;
 
@@ -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;->Lw: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;
 
@@ -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;->Lx: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;
 
@@ -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;->Ly: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;
 
@@ -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;->Lz: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;
 
@@ -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;->LA: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;
 
@@ -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;->LB: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;
 
@@ -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;->LC: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;
 
@@ -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;->LD: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;
 
@@ -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;->LE: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;
 
@@ -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;->LF:Lcom/facebook/drawee/a/b$a;
+    sput-object v0, Lcom/facebook/drawee/a/b$a;->LB: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;->Li:Lcom/facebook/drawee/a/b$a;
+    sget-object v14, Lcom/facebook/drawee/a/b$a;->Le:Lcom/facebook/drawee/a/b$a;
 
     aput-object v14, v0, v1
 
-    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;->Lf:Lcom/facebook/drawee/a/b$a;
 
     aput-object v1, v0, v2
 
-    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;->Lg:Lcom/facebook/drawee/a/b$a;
 
     aput-object v1, v0, v3
 
-    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;->Lh:Lcom/facebook/drawee/a/b$a;
 
     aput-object v1, v0, v4
 
-    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;->Li:Lcom/facebook/drawee/a/b$a;
 
     aput-object v1, v0, v5
 
-    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;->Lj:Lcom/facebook/drawee/a/b$a;
 
     aput-object v1, v0, v6
 
-    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;->Lk:Lcom/facebook/drawee/a/b$a;
 
     aput-object v1, v0, v7
 
-    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;->Ll:Lcom/facebook/drawee/a/b$a;
 
     aput-object v1, v0, v8
 
-    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;->Lm:Lcom/facebook/drawee/a/b$a;
 
     aput-object v1, v0, v9
 
-    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;->Ln:Lcom/facebook/drawee/a/b$a;
 
     aput-object v1, v0, v10
 
-    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;->Lo:Lcom/facebook/drawee/a/b$a;
 
     aput-object v1, v0, v11
 
-    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;->Lp:Lcom/facebook/drawee/a/b$a;
 
     aput-object v1, v0, v12
 
-    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;->Lq:Lcom/facebook/drawee/a/b$a;
 
     aput-object v1, v0, v13
 
-    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;->Lr:Lcom/facebook/drawee/a/b$a;
 
     const/16 v2, 0xd
 
     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;->Ls:Lcom/facebook/drawee/a/b$a;
 
     const/16 v2, 0xe
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->Lx:Lcom/facebook/drawee/a/b$a;
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->Lt:Lcom/facebook/drawee/a/b$a;
 
     const/16 v2, 0xf
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->Ly:Lcom/facebook/drawee/a/b$a;
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->Lu:Lcom/facebook/drawee/a/b$a;
 
     const/16 v2, 0x10
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->Lz: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, 0x11
 
     aput-object v1, v0, v2
 
-    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;->Lw:Lcom/facebook/drawee/a/b$a;
 
     const/16 v2, 0x12
 
     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;->Lx:Lcom/facebook/drawee/a/b$a;
 
     const/16 v2, 0x13
 
     aput-object v1, v0, v2
 
-    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;->Ly:Lcom/facebook/drawee/a/b$a;
 
     const/16 v2, 0x14
 
     aput-object v1, v0, v2
 
-    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;->Lz:Lcom/facebook/drawee/a/b$a;
 
     const/16 v2, 0x15
 
     aput-object v1, v0, v2
 
-    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;->LA:Lcom/facebook/drawee/a/b$a;
 
     const/16 v2, 0x16
 
     aput-object v1, v0, v2
 
-    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;->LB:Lcom/facebook/drawee/a/b$a;
 
     const/16 v2, 0x17
 
     aput-object v1, v0, v2
 
-    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;->LC:[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;->LG:[Lcom/facebook/drawee/a/b$a;
+    sget-object v0, Lcom/facebook/drawee/a/b$a;->LC:[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 511a0237ee..cc8dc4f661 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 Lg:Lcom/facebook/drawee/a/b;
+.field private static final Lc:Lcom/facebook/drawee/a/b;
 
-.field private static Lh:Z
+.field private static Ld:Z
 
 
 # instance fields
-.field private final Lf:Ljava/util/Queue;
+.field private final Lb: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;->Lg:Lcom/facebook/drawee/a/b;
+    sput-object v0, Lcom/facebook/drawee/a/b;->Lc:Lcom/facebook/drawee/a/b;
 
     const/4 v0, 0x1
 
-    sput-boolean v0, Lcom/facebook/drawee/a/b;->Lh:Z
+    sput-boolean v0, Lcom/facebook/drawee/a/b;->Ld: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;->Lf:Ljava/util/Queue;
+    iput-object v0, p0, Lcom/facebook/drawee/a/b;->Lb:Ljava/util/Queue;
 
     return-void
 .end method
 
-.method public static he()Lcom/facebook/drawee/a/b;
+.method public static hc()Lcom/facebook/drawee/a/b;
     .locals 1
 
-    sget-boolean v0, Lcom/facebook/drawee/a/b;->Lh:Z
+    sget-boolean v0, Lcom/facebook/drawee/a/b;->Ld:Z
 
     if-eqz v0, :cond_0
 
@@ -76,7 +76,7 @@
     return-object v0
 
     :cond_0
-    sget-object v0, Lcom/facebook/drawee/a/b;->Lg:Lcom/facebook/drawee/a/b;
+    sget-object v0, Lcom/facebook/drawee/a/b;->Lc: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;->Lh:Z
+    sget-boolean v0, Lcom/facebook/drawee/a/b;->Ld:Z
 
     if-nez v0, :cond_0
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/drawee/a/b;->Lf:Ljava/util/Queue;
+    iget-object v0, p0, Lcom/facebook/drawee/a/b;->Lb: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;->Lf:Ljava/util/Queue;
+    iget-object v0, p0, Lcom/facebook/drawee/a/b;->Lb:Ljava/util/Queue;
 
     invoke-interface {v0}, Ljava/util/Queue;->poll()Ljava/lang/Object;
 
     :cond_1
-    iget-object v0, p0, Lcom/facebook/drawee/a/b;->Lf:Ljava/util/Queue;
+    iget-object v0, p0, Lcom/facebook/drawee/a/b;->Lb: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;->Lf:Ljava/util/Queue;
+    iget-object v0, p0, Lcom/facebook/drawee/a/b;->Lb: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 8036ce2cbc..2c8faa8fbf 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 LH:Z
+.field public LD:Z
 
-.field private LI:I
+.field private LE:I
 
-.field public LJ:I
+.field public LF:I
 
 
 # direct methods
@@ -24,16 +24,16 @@
 
 
 # virtual methods
-.method public final hf()Z
+.method public final hd()Z
     .locals 2
 
-    iget-boolean v0, p0, Lcom/facebook/drawee/a/c;->LH:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/a/c;->LD:Z
 
     if-eqz v0, :cond_0
 
-    iget v0, p0, Lcom/facebook/drawee/a/c;->LJ:I
+    iget v0, p0, Lcom/facebook/drawee/a/c;->LF:I
 
-    iget v1, p0, Lcom/facebook/drawee/a/c;->LI:I
+    iget v1, p0, Lcom/facebook/drawee/a/c;->LE:I
 
     if-ge v0, v1, :cond_0
 
@@ -52,13 +52,13 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/a/c;->LH:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/a/c;->LD:Z
 
     const/4 v1, 0x4
 
-    iput v1, p0, Lcom/facebook/drawee/a/c;->LI:I
+    iput v1, p0, Lcom/facebook/drawee/a/c;->LE:I
 
-    iput v0, p0, Lcom/facebook/drawee/a/c;->LJ:I
+    iput v0, p0, Lcom/facebook/drawee/a/c;->LF: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 a5bc184e59..60c62cb3e3 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 Kt:I
+.field public Kp:I
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     const/4 v0, 0x1
 
-    iput v0, p0, Lcom/facebook/drawee/backends/pipeline/a/a;->Kt:I
+    iput v0, p0, Lcom/facebook/drawee/backends/pipeline/a/a;->Kp: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;->Kt:I
+    iput p2, p0, Lcom/facebook/drawee/backends/pipeline/a/a;->Kp: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 be458a6e12..bb9a1c7a0f 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 Ku:Ljava/util/List;
+.field private final Kq: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;->Ku:Ljava/util/List;
+    iput-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/a;->Kq:Ljava/util/List;
 
-    iget-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;->Kq: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;->Ku:Ljava/util/List;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/a;->Kq: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;->Ku:Ljava/util/List;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/a;->Kq: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;->Ku:Ljava/util/List;
+    iget-object v2, p0, Lcom/facebook/drawee/backends/pipeline/b/a;->Kq: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;->Ku:Ljava/util/List;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/a;->Kq: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 82bfd9ac69..86844ab2a1 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 KS:Lcom/facebook/drawee/backends/pipeline/b/h;
+.field private final KO:Lcom/facebook/drawee/backends/pipeline/b/h;
 
-.field private final Ki:Lcom/facebook/drawee/backends/pipeline/b/g;
+.field private final Ke: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;->KS:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iput-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/b;->KO:Lcom/facebook/drawee/backends/pipeline/b/h;
 
-    iput-object p2, p0, Lcom/facebook/drawee/backends/pipeline/b/a/b;->Ki:Lcom/facebook/drawee/backends/pipeline/b/g;
+    iput-object p2, p0, Lcom/facebook/drawee/backends/pipeline/b/a/b;->Ke: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;->KS:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/b;->KO:Lcom/facebook/drawee/backends/pipeline/b/h;
 
-    iput p2, p1, Lcom/facebook/drawee/backends/pipeline/b/h;->Kt:I
+    iput p2, p1, Lcom/facebook/drawee/backends/pipeline/b/h;->Kp:I
 
-    iput-object p4, p1, Lcom/facebook/drawee/backends/pipeline/b/h;->KI:Ljava/lang/String;
+    iput-object p4, p1, Lcom/facebook/drawee/backends/pipeline/b/h;->KE:Ljava/lang/String;
 
-    iget-object p2, p0, Lcom/facebook/drawee/backends/pipeline/b/a/b;->Ki:Lcom/facebook/drawee/backends/pipeline/b/g;
+    iget-object p2, p0, Lcom/facebook/drawee/backends/pipeline/b/a/b;->Ke: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 2464da5018..4007588135 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 KS:Lcom/facebook/drawee/backends/pipeline/b/h;
+.field private final KO:Lcom/facebook/drawee/backends/pipeline/b/h;
 
-.field private final KZ:Lcom/facebook/common/time/b;
+.field private final KV: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;->KZ:Lcom/facebook/common/time/b;
+    iput-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/c;->KV:Lcom/facebook/common/time/b;
 
-    iput-object p2, p0, Lcom/facebook/drawee/backends/pipeline/b/a/c;->KS:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iput-object p2, p0, Lcom/facebook/drawee/backends/pipeline/b/a/c;->KO: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;->KS:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/a/c;->KO:Lcom/facebook/drawee/backends/pipeline/b/h;
 
-    iget-object v1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/c;->KZ:Lcom/facebook/common/time/b;
+    iget-object v1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/c;->KV: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;->KG:J
+    iput-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KC:J
 
-    iget-object v0, 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;->KO:Lcom/facebook/drawee/backends/pipeline/b/h;
 
-    iput-object p1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Kz:Lcom/facebook/imagepipeline/request/b;
+    iput-object p1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Kv:Lcom/facebook/imagepipeline/request/b;
 
-    iput-object p2, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Ky:Ljava/lang/Object;
+    iput-object p2, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Ku:Ljava/lang/Object;
 
-    iput-object p3, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Kx:Ljava/lang/String;
+    iput-object p3, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Kt:Ljava/lang/String;
 
-    iput-boolean p4, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KJ:Z
+    iput-boolean p4, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KF: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;->KS:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iget-object p3, p0, Lcom/facebook/drawee/backends/pipeline/b/a/c;->KO:Lcom/facebook/drawee/backends/pipeline/b/h;
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/a/c;->KZ:Lcom/facebook/common/time/b;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/a/c;->KV: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;->KH:J
+    iput-wide v0, p3, Lcom/facebook/drawee/backends/pipeline/b/h;->KD:J
 
-    iget-object p3, p0, Lcom/facebook/drawee/backends/pipeline/b/a/c;->KS:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iget-object p3, p0, Lcom/facebook/drawee/backends/pipeline/b/a/c;->KO:Lcom/facebook/drawee/backends/pipeline/b/h;
 
-    iput-object p1, p3, Lcom/facebook/drawee/backends/pipeline/b/h;->Kz:Lcom/facebook/imagepipeline/request/b;
+    iput-object p1, p3, Lcom/facebook/drawee/backends/pipeline/b/h;->Kv:Lcom/facebook/imagepipeline/request/b;
 
-    iput-object p2, p3, Lcom/facebook/drawee/backends/pipeline/b/h;->Kx:Ljava/lang/String;
+    iput-object p2, p3, Lcom/facebook/drawee/backends/pipeline/b/h;->Kt:Ljava/lang/String;
 
-    iput-boolean p4, p3, Lcom/facebook/drawee/backends/pipeline/b/h;->KJ:Z
+    iput-boolean p4, p3, Lcom/facebook/drawee/backends/pipeline/b/h;->KF: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;->KS:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/a/c;->KO:Lcom/facebook/drawee/backends/pipeline/b/h;
 
-    iget-object v1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/c;->KZ:Lcom/facebook/common/time/b;
+    iget-object v1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/c;->KV: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;->KH:J
+    iput-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KD:J
 
-    iget-object v0, 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;->KO:Lcom/facebook/drawee/backends/pipeline/b/h;
 
-    iput-object p1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Kz:Lcom/facebook/imagepipeline/request/b;
+    iput-object p1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Kv:Lcom/facebook/imagepipeline/request/b;
 
-    iput-object p2, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Kx:Ljava/lang/String;
+    iput-object p2, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Kt:Ljava/lang/String;
 
-    iput-boolean p3, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KJ:Z
+    iput-boolean p3, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KF: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;->KS:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/a/c;->KO:Lcom/facebook/drawee/backends/pipeline/b/h;
 
-    iget-object v1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/c;->KZ:Lcom/facebook/common/time/b;
+    iget-object v1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/c;->KV: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;->KH:J
+    iput-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KD:J
 
-    iget-object v0, 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;->KO:Lcom/facebook/drawee/backends/pipeline/b/h;
 
-    iput-object p1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Kx:Ljava/lang/String;
+    iput-object p1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Kt: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 149bd714ae..5f395da099 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 Kn:[I
+.field static final synthetic Kj:[I
 
 
 # direct methods
@@ -30,12 +30,12 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/facebook/drawee/backends/pipeline/e$1;->Kn:[I
+    sput-object v0, Lcom/facebook/drawee/backends/pipeline/e$1;->Kj:[I
 
     :try_start_0
-    sget-object v0, Lcom/facebook/drawee/backends/pipeline/e$1;->Kn:[I
+    sget-object v0, Lcom/facebook/drawee/backends/pipeline/e$1;->Kj:[I
 
-    sget-object v1, Lcom/facebook/drawee/controller/a$a;->Ms:Lcom/facebook/drawee/controller/a$a;
+    sget-object v1, Lcom/facebook/drawee/controller/a$a;->Mo: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;->Kn:[I
+    sget-object v0, Lcom/facebook/drawee/backends/pipeline/e$1;->Kj:[I
 
-    sget-object v1, Lcom/facebook/drawee/controller/a$a;->Mt:Lcom/facebook/drawee/controller/a$a;
+    sget-object v1, Lcom/facebook/drawee/controller/a$a;->Mp: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;->Kn:[I
+    sget-object v0, Lcom/facebook/drawee/backends/pipeline/e$1;->Kj:[I
 
-    sget-object v1, Lcom/facebook/drawee/controller/a$a;->Mu:Lcom/facebook/drawee/controller/a$a;
+    sget-object v1, Lcom/facebook/drawee/controller/a$a;->Mq: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 3850ea16db..445c329b90 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;->hl()V
+    value = Lcom/facebook/drawee/controller/AbstractDraweeController;->hj()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -22,9 +22,9 @@
 
 
 # instance fields
-.field final synthetic Mb:Z
+.field final synthetic LX:Z
 
-.field final synthetic Mc:Lcom/facebook/drawee/controller/AbstractDraweeController;
+.field final synthetic LY: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;->Mc:Lcom/facebook/drawee/controller/AbstractDraweeController;
+    iput-object p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController$1;->LY: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;->Mb:Z
+    iput-boolean p3, p0, Lcom/facebook/drawee/controller/AbstractDraweeController$1;->LX: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;->Mc:Lcom/facebook/drawee/controller/AbstractDraweeController;
+    iget-object v2, p0, Lcom/facebook/drawee/controller/AbstractDraweeController$1;->LY: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;->Mc:Lcom/facebook/drawee/controller/AbstractDraweeController;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController$1;->LY: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;->Mb:Z
+    iget-boolean v6, p0, Lcom/facebook/drawee/controller/AbstractDraweeController$1;->LX: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;->Mc:Lcom/facebook/drawee/controller/AbstractDraweeController;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController$1;->LY: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;->Mc:Lcom/facebook/drawee/controller/AbstractDraweeController;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController$1;->LY: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;->gF()Ljava/lang/Throwable;
+    invoke-interface {p1}, Lcom/facebook/c/c;->gD()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 8399bb2017..1b6eaa7ab8 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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()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 fd8a222b8a..6fa5e65e10 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 Mm:Lcom/facebook/drawee/d/a;
+.field final synthetic Mi:Lcom/facebook/drawee/d/a;
 
-.field final synthetic Mn:Ljava/lang/String;
+.field final synthetic Mj:Ljava/lang/String;
 
-.field final synthetic Mo:Ljava/lang/Object;
+.field final synthetic Mk:Ljava/lang/Object;
 
-.field final synthetic Mp:Ljava/lang/Object;
+.field final synthetic Ml:Ljava/lang/Object;
 
-.field final synthetic Mq:Lcom/facebook/drawee/controller/a$a;
+.field final synthetic Mm:Lcom/facebook/drawee/controller/a$a;
 
-.field final synthetic Mr:Lcom/facebook/drawee/controller/a;
+.field final synthetic Mn: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;->Mr:Lcom/facebook/drawee/controller/a;
+    iput-object p1, p0, Lcom/facebook/drawee/controller/a$2;->Mn:Lcom/facebook/drawee/controller/a;
 
-    iput-object p2, p0, Lcom/facebook/drawee/controller/a$2;->Mm:Lcom/facebook/drawee/d/a;
+    iput-object p2, p0, Lcom/facebook/drawee/controller/a$2;->Mi:Lcom/facebook/drawee/d/a;
 
-    iput-object p3, p0, Lcom/facebook/drawee/controller/a$2;->Mn:Ljava/lang/String;
+    iput-object p3, p0, Lcom/facebook/drawee/controller/a$2;->Mj:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/facebook/drawee/controller/a$2;->Mo:Ljava/lang/Object;
+    iput-object p4, p0, Lcom/facebook/drawee/controller/a$2;->Mk:Ljava/lang/Object;
 
-    iput-object p5, p0, Lcom/facebook/drawee/controller/a$2;->Mp:Ljava/lang/Object;
+    iput-object p5, p0, Lcom/facebook/drawee/controller/a$2;->Ml:Ljava/lang/Object;
 
-    iput-object p6, p0, Lcom/facebook/drawee/controller/a$2;->Mq:Lcom/facebook/drawee/controller/a$a;
+    iput-object p6, p0, Lcom/facebook/drawee/controller/a$2;->Mm: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;->Mr:Lcom/facebook/drawee/controller/a;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/a$2;->Mn:Lcom/facebook/drawee/controller/a;
 
-    iget-object v1, p0, Lcom/facebook/drawee/controller/a$2;->Mm:Lcom/facebook/drawee/d/a;
+    iget-object v1, p0, Lcom/facebook/drawee/controller/a$2;->Mi:Lcom/facebook/drawee/d/a;
 
-    iget-object v2, p0, Lcom/facebook/drawee/controller/a$2;->Mo:Ljava/lang/Object;
+    iget-object v2, p0, Lcom/facebook/drawee/controller/a$2;->Mk:Ljava/lang/Object;
 
-    iget-object v3, p0, Lcom/facebook/drawee/controller/a$2;->Mp:Ljava/lang/Object;
+    iget-object v3, p0, Lcom/facebook/drawee/controller/a$2;->Ml:Ljava/lang/Object;
 
-    iget-object v4, p0, Lcom/facebook/drawee/controller/a$2;->Mq:Lcom/facebook/drawee/controller/a$a;
+    iget-object v4, p0, Lcom/facebook/drawee/controller/a$2;->Mm: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;->Mo:Ljava/lang/Object;
+    iget-object v1, p0, Lcom/facebook/drawee/controller/a$2;->Mk: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 63c9348d7b..1d5eec14e3 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 Ms:Lcom/facebook/drawee/controller/a$a;
+.field public static final enum Mo:Lcom/facebook/drawee/controller/a$a;
 
-.field public static final enum Mt:Lcom/facebook/drawee/controller/a$a;
+.field public static final enum Mp:Lcom/facebook/drawee/controller/a$a;
 
-.field public static final enum Mu:Lcom/facebook/drawee/controller/a$a;
+.field public static final enum Mq:Lcom/facebook/drawee/controller/a$a;
 
-.field private static final synthetic Mv:[Lcom/facebook/drawee/controller/a$a;
+.field private static final synthetic Mr:[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;->Ms:Lcom/facebook/drawee/controller/a$a;
+    sput-object v0, Lcom/facebook/drawee/controller/a$a;->Mo: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;->Mt:Lcom/facebook/drawee/controller/a$a;
+    sput-object v0, Lcom/facebook/drawee/controller/a$a;->Mp: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;->Mu:Lcom/facebook/drawee/controller/a$a;
+    sput-object v0, Lcom/facebook/drawee/controller/a$a;->Mq: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;->Ms:Lcom/facebook/drawee/controller/a$a;
+    sget-object v4, Lcom/facebook/drawee/controller/a$a;->Mo:Lcom/facebook/drawee/controller/a$a;
 
     aput-object v4, v0, v1
 
-    sget-object v1, Lcom/facebook/drawee/controller/a$a;->Mt:Lcom/facebook/drawee/controller/a$a;
+    sget-object v1, Lcom/facebook/drawee/controller/a$a;->Mp:Lcom/facebook/drawee/controller/a$a;
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/facebook/drawee/controller/a$a;->Mu:Lcom/facebook/drawee/controller/a$a;
+    sget-object v1, Lcom/facebook/drawee/controller/a$a;->Mq:Lcom/facebook/drawee/controller/a$a;
 
     aput-object v1, v0, v3
 
-    sput-object v0, Lcom/facebook/drawee/controller/a$a;->Mv:[Lcom/facebook/drawee/controller/a$a;
+    sput-object v0, Lcom/facebook/drawee/controller/a$a;->Mr:[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;->Mv:[Lcom/facebook/drawee/controller/a$a;
+    sget-object v0, Lcom/facebook/drawee/controller/a$a;->Mr:[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 dc1bd80f84..4e7e876ffd 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,6 +15,14 @@
 
 
 # static fields
+.field public static final Oi:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+
+.field public static final Oj:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+
+.field public static final Ok:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+
+.field public static final Ol:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+
 .field public static final Om:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
 .field public static final On:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
@@ -25,55 +33,47 @@
 
 .field public static final Oq:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-.field public static final Or:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
-
-.field public static final Os:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
-
-.field public static final Ot: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;->Ov:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sget-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$i;->Or:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+
+    sput-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Oi:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+
+    sget-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$h;->Or:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+
+    sput-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Oj:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+
+    sget-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$f;->Or:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+
+    sput-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Ok:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+
+    sget-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$g;->Or:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+
+    sput-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Ol:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+
+    sget-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$b;->Or: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;->Ov:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sget-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$d;->Or: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;->Ov:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sget-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$c;->Or: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;->Ov:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sget-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$j;->Or: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;->Ov:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sget-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$e;->Or: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;->Ov: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;->Ov: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;->Ov: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;->Ov: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 f0909abb13..26c5fabb8d 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 Ov:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+.field public static final Or: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;->Ov:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sput-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$b;->Or: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 2d748cfe40..d48e63696d 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 Ov:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+.field public static final Or: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;->Ov:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sput-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$c;->Or: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 6778c3bbff..f9586052ba 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 Ov:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+.field public static final Or: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;->Ov:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sput-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$d;->Or: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 84a7de2417..fc16509192 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 Ov:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+.field public static final Or: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;->Ov:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sput-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$e;->Or: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 94ed309a1f..0407d7277b 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 Ov:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+.field public static final Or: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;->Ov:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sput-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$f;->Or: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 d504913640..87012ffd55 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 Ov:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+.field public static final Or: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;->Ov:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sput-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$g;->Or: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 68ad315273..bc4f9bcaad 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 Ov:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+.field public static final Or: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;->Ov:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sput-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$h;->Or: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 bd2ef8163c..f55a8ba7c7 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 Ov:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+.field public static final Or: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;->Ov:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sput-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$i;->Or: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 58ba8272b6..f96d2d6dd5 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 Ov:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+.field public static final Or: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;->Ov:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sput-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$j;->Or: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 8af0c12f94..f7b875b4f2 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 hJ()Ljava/lang/Object;
+.method public abstract hH()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 9a898abf0f..c9a3989130 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 MY:Lcom/facebook/drawee/drawable/a;
+.field final synthetic MU: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;->MY:Lcom/facebook/drawee/drawable/a;
+    iput-object p1, p0, Lcom/facebook/drawee/drawable/a$1;->MU: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;->MY:Lcom/facebook/drawee/drawable/a;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/a$1;->MU: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 hv()Landroid/graphics/drawable/Drawable;
+.method public final ht()Landroid/graphics/drawable/Drawable;
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/a$1;->MY:Lcom/facebook/drawee/drawable/a;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/a$1;->MU: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 be6a15707c..537bce82f7 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 MZ:I
+.field private MV:I
 
-.field private Na:Z
+.field private MW:Z
 
-.field Nb:F
+.field MX:F
 
-.field private Nc:Z
+.field private MY:Z
 
 
 # direct methods
@@ -40,17 +40,17 @@
 
     const/4 p1, 0x0
 
-    iput p1, p0, Lcom/facebook/drawee/drawable/b;->Nb:F
+    iput p1, p0, Lcom/facebook/drawee/drawable/b;->MX:F
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/b;->Nc:Z
+    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/b;->MY:Z
 
-    iput p2, p0, Lcom/facebook/drawee/drawable/b;->MZ:I
+    iput p2, p0, Lcom/facebook/drawee/drawable/b;->MV:I
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/b;->Na:Z
+    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/b;->MW:Z
 
     return-void
 .end method
@@ -80,9 +80,9 @@
 
     sub-int/2addr v3, v4
 
-    iget v4, p0, Lcom/facebook/drawee/drawable/b;->Nb:F
+    iget v4, p0, Lcom/facebook/drawee/drawable/b;->MX:F
 
-    iget-boolean v5, p0, Lcom/facebook/drawee/drawable/b;->Na:Z
+    iget-boolean v5, p0, Lcom/facebook/drawee/drawable/b;->MW: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;->Nc:Z
+    iget-boolean p1, p0, Lcom/facebook/drawee/drawable/b;->MY:Z
 
     if-nez p1, :cond_1
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/b;->Nc:Z
+    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/b;->MY: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;->Nc:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/drawable/b;->MY:Z
 
-    iget v0, p0, Lcom/facebook/drawee/drawable/b;->Nb:F
+    iget v0, p0, Lcom/facebook/drawee/drawable/b;->MX:F
 
-    iget v1, p0, Lcom/facebook/drawee/drawable/b;->MZ:I
+    iget v1, p0, Lcom/facebook/drawee/drawable/b;->MV:I
 
     int-to-float v1, v1
 
@@ -162,7 +162,7 @@
 
     add-float/2addr v0, v1
 
-    iput v0, p0, Lcom/facebook/drawee/drawable/b;->Nb:F
+    iput v0, p0, Lcom/facebook/drawee/drawable/b;->MX: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 0c92485c5e..d6be98980b 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 Nd:Z
+.field private MZ:Z
 
-.field private Ne:I
+.field private Na:I
 
-.field private Nf:I
+.field private Nb:I
 
 .field public mAlpha:I
 
@@ -27,15 +27,15 @@
 
     const/4 v1, 0x0
 
-    iput-boolean v1, p0, Lcom/facebook/drawee/drawable/d;->Nd:Z
+    iput-boolean v1, p0, Lcom/facebook/drawee/drawable/d;->MZ: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;->Ne:I
+    iput v0, p0, Lcom/facebook/drawee/drawable/d;->Na:I
 
-    iput v0, p0, Lcom/facebook/drawee/drawable/d;->Nf:I
+    iput v0, p0, Lcom/facebook/drawee/drawable/d;->Nb: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;->Nd:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/d;->MZ: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;->Ne:I
+    iget v0, p0, Lcom/facebook/drawee/drawable/d;->Na: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;->Nf:I
+    iget v0, p0, Lcom/facebook/drawee/drawable/d;->Nb:I
 
     if-eq v0, v1, :cond_6
 
@@ -114,7 +114,7 @@
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/d;->Nd:Z
+    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/d;->MZ: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;->Ne:I
+    iput p1, p0, Lcom/facebook/drawee/drawable/d;->Na: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;->Nf:I
+    iput p1, p0, Lcom/facebook/drawee/drawable/d;->Nb: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 db60c03bdf..acc236d00e 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 MT:[Landroid/graphics/drawable/Drawable;
+.field private final MP:[Landroid/graphics/drawable/Drawable;
 
-.field private final Ng:Z
+.field private final Nc:Z
 
-.field private final Nh:I
+.field private final Nd:I
 
-.field Ni:I
+.field Ne:I
 
-.field Nj:I
+.field Nf:I
 
-.field Nk:J
+.field Ng:J
 
-.field Nl:[I
+.field Nh:[I
 
-.field Nm:[I
+.field Ni:[I
 
-.field Nn:[Z
+.field Nj:[Z
 
-.field No:I
+.field Nk: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;->MT:[Landroid/graphics/drawable/Drawable;
+    iput-object p1, p0, Lcom/facebook/drawee/drawable/f;->MP:[Landroid/graphics/drawable/Drawable;
 
     array-length p2, p1
 
     new-array p2, p2, [I
 
-    iput-object p2, p0, Lcom/facebook/drawee/drawable/f;->Nl:[I
+    iput-object p2, p0, Lcom/facebook/drawee/drawable/f;->Nh:[I
 
     array-length p2, p1
 
     new-array p2, p2, [I
 
-    iput-object p2, p0, Lcom/facebook/drawee/drawable/f;->Nm:[I
+    iput-object p2, p0, Lcom/facebook/drawee/drawable/f;->Ni:[I
 
     const/16 p2, 0xff
 
@@ -85,13 +85,13 @@
 
     new-array p1, p1, [Z
 
-    iput-object p1, p0, Lcom/facebook/drawee/drawable/f;->Nn:[Z
+    iput-object p1, p0, Lcom/facebook/drawee/drawable/f;->Nj:[Z
 
-    iput v1, p0, Lcom/facebook/drawee/drawable/f;->No:I
+    iput v1, p0, Lcom/facebook/drawee/drawable/f;->Nk:I
 
-    iput-boolean v1, p0, Lcom/facebook/drawee/drawable/f;->Ng:Z
+    iput-boolean v1, p0, Lcom/facebook/drawee/drawable/f;->Nc:Z
 
-    iget-boolean p1, p0, Lcom/facebook/drawee/drawable/f;->Ng:Z
+    iget-boolean p1, p0, Lcom/facebook/drawee/drawable/f;->Nc:Z
 
     if-eqz p1, :cond_1
 
@@ -103,39 +103,39 @@
     const/4 p1, 0x0
 
     :goto_1
-    iput p1, p0, Lcom/facebook/drawee/drawable/f;->Nh:I
+    iput p1, p0, Lcom/facebook/drawee/drawable/f;->Nd:I
 
     const/4 p1, 0x2
 
-    iput p1, p0, Lcom/facebook/drawee/drawable/f;->Ni:I
+    iput p1, p0, Lcom/facebook/drawee/drawable/f;->Ne:I
 
-    iget-object p1, p0, Lcom/facebook/drawee/drawable/f;->Nl:[I
+    iget-object p1, p0, Lcom/facebook/drawee/drawable/f;->Nh:[I
 
-    iget v2, p0, Lcom/facebook/drawee/drawable/f;->Nh:I
+    iget v2, p0, Lcom/facebook/drawee/drawable/f;->Nd:I
 
     invoke-static {p1, v2}, Ljava/util/Arrays;->fill([II)V
 
-    iget-object p1, p0, Lcom/facebook/drawee/drawable/f;->Nl:[I
+    iget-object p1, p0, Lcom/facebook/drawee/drawable/f;->Nh:[I
 
     aput p2, p1, v1
 
-    iget-object p1, p0, Lcom/facebook/drawee/drawable/f;->Nm:[I
+    iget-object p1, p0, Lcom/facebook/drawee/drawable/f;->Ni:[I
 
-    iget v2, p0, Lcom/facebook/drawee/drawable/f;->Nh:I
+    iget v2, p0, Lcom/facebook/drawee/drawable/f;->Nd:I
 
     invoke-static {p1, v2}, Ljava/util/Arrays;->fill([II)V
 
-    iget-object p1, p0, Lcom/facebook/drawee/drawable/f;->Nm:[I
+    iget-object p1, p0, Lcom/facebook/drawee/drawable/f;->Ni:[I
 
     aput p2, p1, v1
 
-    iget-object p1, p0, Lcom/facebook/drawee/drawable/f;->Nn:[Z
+    iget-object p1, p0, Lcom/facebook/drawee/drawable/f;->Nj:[Z
 
-    iget-boolean p2, p0, Lcom/facebook/drawee/drawable/f;->Ng:Z
+    iget-boolean p2, p0, Lcom/facebook/drawee/drawable/f;->Nc:Z
 
     invoke-static {p1, p2}, Ljava/util/Arrays;->fill([ZZ)V
 
-    iget-object p1, p0, Lcom/facebook/drawee/drawable/f;->Nn:[Z
+    iget-object p1, p0, Lcom/facebook/drawee/drawable/f;->Nj:[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;->MT:[Landroid/graphics/drawable/Drawable;
+    iget-object v4, p0, Lcom/facebook/drawee/drawable/f;->MP:[Landroid/graphics/drawable/Drawable;
 
     array-length v4, v4
 
     if-ge v2, v4, :cond_5
 
-    iget-object v4, p0, Lcom/facebook/drawee/drawable/f;->Nn:[Z
+    iget-object v4, p0, Lcom/facebook/drawee/drawable/f;->Nj:[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;->Nm:[I
+    iget-object v5, p0, Lcom/facebook/drawee/drawable/f;->Ni:[I
 
-    iget-object v6, p0, Lcom/facebook/drawee/drawable/f;->Nl:[I
+    iget-object v6, p0, Lcom/facebook/drawee/drawable/f;->Nh:[I
 
     aget v6, v6, v2
 
@@ -203,7 +203,7 @@
     aput v1, v5, v2
 
     :cond_1
-    iget-object v4, p0, Lcom/facebook/drawee/drawable/f;->Nm:[I
+    iget-object v4, p0, Lcom/facebook/drawee/drawable/f;->Ni:[I
 
     aget v5, v4, v2
 
@@ -212,13 +212,13 @@
     aput v7, v4, v2
 
     :cond_2
-    iget-object v4, p0, Lcom/facebook/drawee/drawable/f;->Nn:[Z
+    iget-object v4, p0, Lcom/facebook/drawee/drawable/f;->Nj:[Z
 
     aget-boolean v4, v4, v2
 
     if-eqz v4, :cond_3
 
-    iget-object v4, p0, Lcom/facebook/drawee/drawable/f;->Nm:[I
+    iget-object v4, p0, Lcom/facebook/drawee/drawable/f;->Ni:[I
 
     aget v4, v4, v2
 
@@ -227,13 +227,13 @@
     const/4 v3, 0x0
 
     :cond_3
-    iget-object v4, p0, Lcom/facebook/drawee/drawable/f;->Nn:[Z
+    iget-object v4, p0, Lcom/facebook/drawee/drawable/f;->Nj:[Z
 
     aget-boolean v4, v4, v2
 
     if-nez v4, :cond_4
 
-    iget-object v4, p0, Lcom/facebook/drawee/drawable/f;->Nm:[I
+    iget-object v4, p0, Lcom/facebook/drawee/drawable/f;->Ni:[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;->Nj:I
+    iput p1, p0, Lcom/facebook/drawee/drawable/f;->Nf:I
 
-    iget p1, p0, Lcom/facebook/drawee/drawable/f;->Ni:I
+    iget p1, p0, Lcom/facebook/drawee/drawable/f;->Ne:I
 
     const/4 v0, 0x1
 
@@ -265,7 +265,7 @@
 
     const/4 p1, 0x0
 
-    iput p1, p0, Lcom/facebook/drawee/drawable/f;->Ni:I
+    iput p1, p0, Lcom/facebook/drawee/drawable/f;->Ne:I
 
     :cond_0
     return-void
@@ -276,9 +276,9 @@
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lcom/facebook/drawee/drawable/f;->Ni:I
+    iput v0, p0, Lcom/facebook/drawee/drawable/f;->Ne:I
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/f;->Nn:[Z
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/f;->Nj:[Z
 
     const/4 v1, 0x1
 
@@ -294,9 +294,9 @@
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lcom/facebook/drawee/drawable/f;->Ni:I
+    iput v0, p0, Lcom/facebook/drawee/drawable/f;->Ne:I
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/f;->Nn:[Z
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/f;->Nj:[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;->Ni:I
+    iget v0, p0, Lcom/facebook/drawee/drawable/f;->Ne:I
 
     const/4 v1, 0x2
 
@@ -325,7 +325,7 @@
     goto :goto_4
 
     :cond_0
-    iget v0, p0, Lcom/facebook/drawee/drawable/f;->Nj:I
+    iget v0, p0, Lcom/facebook/drawee/drawable/f;->Nf:I
 
     if-lez v0, :cond_1
 
@@ -343,13 +343,13 @@
 
     move-result-wide v4
 
-    iget-wide v6, p0, Lcom/facebook/drawee/drawable/f;->Nk:J
+    iget-wide v6, p0, Lcom/facebook/drawee/drawable/f;->Ng:J
 
     sub-long/2addr v4, v6
 
     long-to-float v0, v4
 
-    iget v4, p0, Lcom/facebook/drawee/drawable/f;->Nj:I
+    iget v4, p0, Lcom/facebook/drawee/drawable/f;->Nf:I
 
     int-to-float v4, v4
 
@@ -367,16 +367,16 @@
     const/4 v1, 0x1
 
     :goto_1
-    iput v1, p0, Lcom/facebook/drawee/drawable/f;->Ni:I
+    iput v1, p0, Lcom/facebook/drawee/drawable/f;->Ne:I
 
     goto :goto_4
 
     :cond_3
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/f;->Nm:[I
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/f;->Ni:[I
 
-    iget-object v4, p0, Lcom/facebook/drawee/drawable/f;->Nl:[I
+    iget-object v4, p0, Lcom/facebook/drawee/drawable/f;->Nh:[I
 
-    iget-object v5, p0, Lcom/facebook/drawee/drawable/f;->MT:[Landroid/graphics/drawable/Drawable;
+    iget-object v5, p0, Lcom/facebook/drawee/drawable/f;->MP:[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;->Nk:J
+    iput-wide v4, p0, Lcom/facebook/drawee/drawable/f;->Ng:J
 
-    iget v0, p0, Lcom/facebook/drawee/drawable/f;->Nj:I
+    iget v0, p0, Lcom/facebook/drawee/drawable/f;->Nf:I
 
     if-nez v0, :cond_4
 
@@ -412,10 +412,10 @@
     const/4 v1, 0x1
 
     :goto_3
-    iput v1, p0, Lcom/facebook/drawee/drawable/f;->Ni:I
+    iput v1, p0, Lcom/facebook/drawee/drawable/f;->Ne:I
 
     :goto_4
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/f;->MT:[Landroid/graphics/drawable/Drawable;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/f;->MP:[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;->Nm:[I
+    iget-object v4, p0, Lcom/facebook/drawee/drawable/f;->Ni:[I
 
     aget v4, v4, v2
 
@@ -437,11 +437,11 @@
 
     if-lez v4, :cond_6
 
-    iget v5, p0, Lcom/facebook/drawee/drawable/f;->No:I
+    iget v5, p0, Lcom/facebook/drawee/drawable/f;->Nk:I
 
     add-int/2addr v5, v3
 
-    iput v5, p0, Lcom/facebook/drawee/drawable/f;->No:I
+    iput v5, p0, Lcom/facebook/drawee/drawable/f;->Nk: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;->No:I
+    iget v4, p0, Lcom/facebook/drawee/drawable/f;->Nk:I
 
     sub-int/2addr v4, v3
 
-    iput v4, p0, Lcom/facebook/drawee/drawable/f;->No:I
+    iput v4, p0, Lcom/facebook/drawee/drawable/f;->Nk:I
 
     invoke-virtual {v1, p1}, Landroid/graphics/drawable/Drawable;->draw(Landroid/graphics/Canvas;)V
 
@@ -479,27 +479,93 @@
     return v0
 .end method
 
-.method public final hA()V
+.method public final hu()V
+    .locals 1
+
+    iget v0, p0, Lcom/facebook/drawee/drawable/f;->Nk:I
+
+    add-int/lit8 v0, v0, 0x1
+
+    iput v0, p0, Lcom/facebook/drawee/drawable/f;->Nk:I
+
+    return-void
+.end method
+
+.method public final hv()V
+    .locals 1
+
+    iget v0, p0, Lcom/facebook/drawee/drawable/f;->Nk:I
+
+    add-int/lit8 v0, v0, -0x1
+
+    iput v0, p0, Lcom/facebook/drawee/drawable/f;->Nk:I
+
+    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;->Ne:I
+
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/f;->Nj:[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 hx()V
+    .locals 2
+
+    const/4 v0, 0x0
+
+    iput v0, p0, Lcom/facebook/drawee/drawable/f;->Ne:I
+
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/f;->Nj:[Z
+
+    invoke-static {v1, v0}, Ljava/util/Arrays;->fill([ZZ)V
+
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/f;->Nj:[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 hy()V
     .locals 4
 
     const/4 v0, 0x2
 
-    iput v0, p0, Lcom/facebook/drawee/drawable/f;->Ni:I
+    iput v0, p0, Lcom/facebook/drawee/drawable/f;->Ne:I
 
     const/4 v0, 0x0
 
     const/4 v1, 0x0
 
     :goto_0
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/f;->MT:[Landroid/graphics/drawable/Drawable;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/f;->MP:[Landroid/graphics/drawable/Drawable;
 
     array-length v2, v2
 
     if-ge v1, v2, :cond_1
 
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/f;->Nm:[I
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/f;->Ni:[I
 
-    iget-object v3, p0, Lcom/facebook/drawee/drawable/f;->Nn:[Z
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/f;->Nj:[Z
 
     aget-boolean v3, v3, v1
 
@@ -525,76 +591,10 @@
     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;->No:I
+    iget v0, p0, Lcom/facebook/drawee/drawable/f;->Nk: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 011335072a..7805864b12 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 Nr:Landroid/graphics/Matrix;
+.field private Nn:Landroid/graphics/Matrix;
 
-.field private Ns:I
+.field private No:I
 
-.field private Nt:I
+.field private Np:I
 
 .field private mMatrix:Landroid/graphics/Matrix;
 
 
 # direct methods
-.method private hB()V
+.method private hz()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;->Ns:I
+    iput v2, p0, Lcom/facebook/drawee/drawable/h;->No:I
 
     invoke-virtual {v0}, Landroid/graphics/drawable/Drawable;->getIntrinsicHeight()I
 
     move-result v3
 
-    iput v3, p0, Lcom/facebook/drawee/drawable/h;->Nt:I
+    iput v3, p0, Lcom/facebook/drawee/drawable/h;->Np: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;->Nr:Landroid/graphics/Matrix;
+    iput-object v0, p0, Lcom/facebook/drawee/drawable/h;->Nn:Landroid/graphics/Matrix;
 
     return-void
 
@@ -60,7 +60,7 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/facebook/drawee/drawable/h;->Nr:Landroid/graphics/Matrix;
+    iput-object v0, p0, Lcom/facebook/drawee/drawable/h;->Nn: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;->Nr:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/h;->Nn: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;->Ns:I
+    iget v0, p0, Lcom/facebook/drawee/drawable/h;->No: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;->Nt:I
+    iget v0, p0, Lcom/facebook/drawee/drawable/h;->Np: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;->hB()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/h;->hz()V
 
     :cond_1
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/h;->Nr:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/h;->Nn: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;->Nr:Landroid/graphics/Matrix;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/h;->Nn: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;->hB()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/h;->hz()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;->hB()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/h;->hz()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 f739940901..57b5a5f8a8 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 Nu:Landroid/graphics/Matrix;
+.field final Nq:Landroid/graphics/Matrix;
 
-.field private Nv:I
+.field private Nr:I
 
-.field private Nw:I
+.field private Ns: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;->Nu:Landroid/graphics/Matrix;
+    iput-object p1, p0, Lcom/facebook/drawee/drawable/i;->Nq:Landroid/graphics/Matrix;
 
     rem-int/lit8 p1, p2, 0x5a
 
     sub-int/2addr p2, p1
 
-    iput p2, p0, Lcom/facebook/drawee/drawable/i;->Nv:I
+    iput p2, p0, Lcom/facebook/drawee/drawable/i;->Nr:I
 
     if-ltz p3, :cond_0
 
@@ -57,7 +57,7 @@
     const/4 p3, 0x0
 
     :goto_0
-    iput p3, p0, Lcom/facebook/drawee/drawable/i;->Nw:I
+    iput p3, p0, Lcom/facebook/drawee/drawable/i;->Ns: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;->Nu:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/i;->Nq: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;->Nu:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/i;->Nq: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;->Nv:I
+    iget v0, p0, Lcom/facebook/drawee/drawable/i;->Nr:I
 
     if-gtz v0, :cond_1
 
-    iget v0, p0, Lcom/facebook/drawee/drawable/i;->Nw:I
+    iget v0, p0, Lcom/facebook/drawee/drawable/i;->Ns:I
 
     if-eqz v0, :cond_0
 
@@ -110,7 +110,7 @@
 
     move-result v0
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/i;->Nu:Landroid/graphics/Matrix;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/i;->Nq: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;->Nw:I
+    iget v0, p0, Lcom/facebook/drawee/drawable/i;->Ns:I
 
     const/4 v1, 0x5
 
@@ -134,7 +134,7 @@
 
     if-eq v0, v1, :cond_1
 
-    iget v0, p0, Lcom/facebook/drawee/drawable/i;->Nv:I
+    iget v0, p0, Lcom/facebook/drawee/drawable/i;->Nr: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;->Nw:I
+    iget v0, p0, Lcom/facebook/drawee/drawable/i;->Ns:I
 
     const/4 v1, 0x5
 
@@ -171,7 +171,7 @@
 
     if-eq v0, v1, :cond_1
 
-    iget v0, p0, Lcom/facebook/drawee/drawable/i;->Nv:I
+    iget v0, p0, Lcom/facebook/drawee/drawable/i;->Nr:I
 
     rem-int/lit16 v0, v0, 0xb4
 
@@ -202,11 +202,11 @@
 
     move-result-object v0
 
-    iget v1, p0, Lcom/facebook/drawee/drawable/i;->Nv:I
+    iget v1, p0, Lcom/facebook/drawee/drawable/i;->Nr:I
 
     if-gtz v1, :cond_1
 
-    iget v1, p0, Lcom/facebook/drawee/drawable/i;->Nw:I
+    iget v1, p0, Lcom/facebook/drawee/drawable/i;->Ns:I
 
     if-eqz v1, :cond_0
 
@@ -223,7 +223,7 @@
 
     :cond_1
     :goto_0
-    iget v1, p0, Lcom/facebook/drawee/drawable/i;->Nw:I
+    iget v1, p0, Lcom/facebook/drawee/drawable/i;->Ns:I
 
     const/4 v2, 0x2
 
@@ -247,9 +247,9 @@
 
     if-eq v1, v2, :cond_2
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/i;->Nu:Landroid/graphics/Matrix;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/i;->Nq:Landroid/graphics/Matrix;
 
-    iget v2, p0, Lcom/facebook/drawee/drawable/i;->Nv:I
+    iget v2, p0, Lcom/facebook/drawee/drawable/i;->Nr:I
 
     int-to-float v2, v2
 
@@ -270,7 +270,7 @@
     goto :goto_1
 
     :cond_2
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/i;->Nu:Landroid/graphics/Matrix;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/i;->Nq: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;->Nu:Landroid/graphics/Matrix;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/i;->Nq: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;->Nu:Landroid/graphics/Matrix;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/i;->Nq: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;->Nu:Landroid/graphics/Matrix;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/i;->Nq: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;->Nu:Landroid/graphics/Matrix;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/i;->Nq: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;->Nu:Landroid/graphics/Matrix;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/i;->Nq: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;->Nu:Landroid/graphics/Matrix;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/i;->Nq: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 e96174cbf7..99ed3b9972 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 NQ:[I
+.field static final synthetic NM:[I
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 3
 
-    invoke-static {}, Lcom/facebook/drawee/drawable/m$a;->hF()[I
+    invoke-static {}, Lcom/facebook/drawee/drawable/m$a;->hD()[I
 
     move-result-object v0
 
@@ -30,14 +30,14 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/facebook/drawee/drawable/m$1;->NQ:[I
+    sput-object v0, Lcom/facebook/drawee/drawable/m$1;->NM:[I
 
     const/4 v0, 0x1
 
     :try_start_0
-    sget-object v1, Lcom/facebook/drawee/drawable/m$1;->NQ:[I
+    sget-object v1, Lcom/facebook/drawee/drawable/m$1;->NM:[I
 
-    sget v2, Lcom/facebook/drawee/drawable/m$a;->NS:I
+    sget v2, Lcom/facebook/drawee/drawable/m$a;->NO:I
 
     sub-int/2addr v2, v0
 
@@ -47,9 +47,9 @@
 
     :catch_0
     :try_start_1
-    sget-object v1, Lcom/facebook/drawee/drawable/m$1;->NQ:[I
+    sget-object v1, Lcom/facebook/drawee/drawable/m$1;->NM:[I
 
-    sget v2, Lcom/facebook/drawee/drawable/m$a;->NR:I
+    sget v2, Lcom/facebook/drawee/drawable/m$a;->NN: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 5c57f8936a..1596e1cf71 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 NR:I = 0x1
+.field public static final NN:I = 0x1
 
-.field public static final NS:I = 0x2
+.field public static final NO:I = 0x2
 
-.field private static final synthetic NT:[I
+.field private static final synthetic NP:[I
 
 
 # direct methods
@@ -38,27 +38,27 @@
 
     new-array v0, v0, [I
 
-    sget v1, Lcom/facebook/drawee/drawable/m$a;->NR:I
+    sget v1, Lcom/facebook/drawee/drawable/m$a;->NN:I
 
     const/4 v2, 0x0
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/drawee/drawable/m$a;->NS:I
+    sget v1, Lcom/facebook/drawee/drawable/m$a;->NO:I
 
     const/4 v2, 0x1
 
     aput v1, v0, v2
 
-    sput-object v0, Lcom/facebook/drawee/drawable/m$a;->NT:[I
+    sput-object v0, Lcom/facebook/drawee/drawable/m$a;->NP:[I
 
     return-void
 .end method
 
-.method public static hF()[I
+.method public static hD()[I
     .locals 1
 
-    sget-object v0, Lcom/facebook/drawee/drawable/m$a;->NT:[I
+    sget-object v0, Lcom/facebook/drawee/drawable/m$a;->NP:[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 94886f874e..08422bfd3f 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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
-    invoke-virtual {p0}, Lcom/facebook/drawee/drawable/o;->hD()Z
+    invoke-virtual {p0}, Lcom/facebook/drawee/drawable/o;->hB()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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     return-void
 
     :cond_0
-    invoke-virtual {p0}, Lcom/facebook/drawee/drawable/o;->hH()V
+    invoke-virtual {p0}, Lcom/facebook/drawee/drawable/o;->hF()V
 
-    invoke-virtual {p0}, Lcom/facebook/drawee/drawable/o;->hE()V
+    invoke-virtual {p0}, Lcom/facebook/drawee/drawable/o;->hC()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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()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 308ca0f820..9c3aeb0488 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 OY:Lcom/facebook/drawee/generic/d$a;
+.field public static final enum OU:Lcom/facebook/drawee/generic/d$a;
 
-.field public static final enum OZ:Lcom/facebook/drawee/generic/d$a;
+.field public static final enum OV:Lcom/facebook/drawee/generic/d$a;
 
-.field private static final synthetic Pa:[Lcom/facebook/drawee/generic/d$a;
+.field private static final synthetic OW:[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;->OY:Lcom/facebook/drawee/generic/d$a;
+    sput-object v0, Lcom/facebook/drawee/generic/d$a;->OU: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;->OZ:Lcom/facebook/drawee/generic/d$a;
+    sput-object v0, Lcom/facebook/drawee/generic/d$a;->OV: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;->OY:Lcom/facebook/drawee/generic/d$a;
+    sget-object v3, Lcom/facebook/drawee/generic/d$a;->OU:Lcom/facebook/drawee/generic/d$a;
 
     aput-object v3, v0, v1
 
-    sget-object v1, Lcom/facebook/drawee/generic/d$a;->OZ:Lcom/facebook/drawee/generic/d$a;
+    sget-object v1, Lcom/facebook/drawee/generic/d$a;->OV:Lcom/facebook/drawee/generic/d$a;
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lcom/facebook/drawee/generic/d$a;->Pa:[Lcom/facebook/drawee/generic/d$a;
+    sput-object v0, Lcom/facebook/drawee/generic/d$a;->OW:[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;->Pa:[Lcom/facebook/drawee/generic/d$a;
+    sget-object v0, Lcom/facebook/drawee/generic/d$a;->OW:[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 90c04cb257..c9b61e508c 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 Pp:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
+.field final synthetic Pl: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;->Pp:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
+    iput-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$a;->Pl: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;->Pp:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
+    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$a;->Pl: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;->Pp:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
+    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$a;->Pl: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;->Pp:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
+    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$a;->Pl: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;->Pp:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
+    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$a;->Pl: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;->Pp:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
+    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$a;->Pl: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;->Pp:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
+    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$a;->Pl: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;->Pp:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
+    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$a;->Pl: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;->Pp:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
+    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$a;->Pl: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;->Pp:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
+    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$a;->Pl: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;->Pp:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
+    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$a;->Pl: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;->Pp:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
+    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$a;->Pl: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;->Pp:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
+    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$a;->Pl: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 b469ebb50a..ce2e4d2e2f 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 Pp:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
+.field final synthetic Pl:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
 
-.field private final Pq:Lcom/facebook/drawee/span/a;
+.field private final Pm:Lcom/facebook/drawee/span/a;
 
-.field private final Pr:Z
+.field private final Pn:Z
 
-.field private final Ps:I
+.field private final Po: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;->Pp:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
+    iput-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$b;->Pl: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;->Pq:Lcom/facebook/drawee/span/a;
+    iput-object p2, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$b;->Pm:Lcom/facebook/drawee/span/a;
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$b;->Pr:Z
+    iput-boolean p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$b;->Pn:Z
 
-    iput p4, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$b;->Ps:I
+    iput p4, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$b;->Po: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;->Pr:Z
+    iget-boolean p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$b;->Pn:Z
 
     if-eqz p1, :cond_4
 
     if-eqz p2, :cond_4
 
-    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$b;->Pq:Lcom/facebook/drawee/span/a;
+    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$b;->Pm:Lcom/facebook/drawee/span/a;
 
-    iget-object p1, p1, Lcom/facebook/drawee/span/a;->Pj:Lcom/facebook/drawee/view/b;
+    iget-object p1, p1, Lcom/facebook/drawee/span/a;->Pf: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;->Pq:Lcom/facebook/drawee/span/a;
+    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$b;->Pm:Lcom/facebook/drawee/span/a;
 
-    iget-object p1, p1, Lcom/facebook/drawee/span/a;->Pj:Lcom/facebook/drawee/view/b;
+    iget-object p1, p1, Lcom/facebook/drawee/span/a;->Pf: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;->Ps:I
+    iget v0, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$b;->Po:I
 
     const/4 v1, -0x1
 
@@ -126,16 +126,16 @@
 
     move-result p3
 
-    iget v0, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$b;->Ps:I
+    iget v0, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$b;->Po:I
 
     if-eq p3, v0, :cond_1
 
     :cond_0
-    iget p3, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$b;->Ps:I
+    iget p3, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$b;->Po: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;->Pp:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
+    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$b;->Pl: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;->Pp:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
+    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$b;->Pl: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;->Pp:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
+    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$b;->Pl: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;->Pp:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
+    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$b;->Pl: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 1948a399ae..524dd2182b 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 Pk:Ljava/util/Set;
+.field public final Pg:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -24,13 +24,13 @@
     .end annotation
 .end field
 
-.field public final Pl:Lcom/facebook/drawee/span/DraweeSpanStringBuilder$a;
+.field public final Ph:Lcom/facebook/drawee/span/DraweeSpanStringBuilder$a;
 
-.field private Pm:Landroid/view/View;
+.field private Pi:Landroid/view/View;
 
-.field private Pn:Landroid/graphics/drawable/Drawable;
+.field private Pj:Landroid/graphics/drawable/Drawable;
 
-.field private Po:Lcom/facebook/drawee/span/DraweeSpanStringBuilder$c;
+.field private Pk: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;->Pk:Ljava/util/Set;
+    iput-object v0, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->Pg: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;->Pl:Lcom/facebook/drawee/span/DraweeSpanStringBuilder$a;
+    iput-object v0, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->Ph: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;->Pm:Landroid/view/View;
+    iget-object p0, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->Pi: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;->Pn:Landroid/graphics/drawable/Drawable;
+    iget-object p0, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->Pj: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;->Po:Lcom/facebook/drawee/span/DraweeSpanStringBuilder$c;
+    iget-object p0, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->Pk: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;->Pm:Landroid/view/View;
+    iget-object v0, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->Pi: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;->Pm:Landroid/view/View;
+    iput-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->Pi: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;->Pm:Landroid/view/View;
+    iget-object v0, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->Pi: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;->Pn:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->Pj: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;->Pn:Landroid/graphics/drawable/Drawable;
+    iput-object v0, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->Pj:Landroid/graphics/drawable/Drawable;
 
     :cond_1
-    iput-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->Pm:Landroid/view/View;
+    iput-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->Pi:Landroid/view/View;
 
-    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->Pk:Ljava/util/Set;
+    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->Pg: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;->Pj:Lcom/facebook/drawee/view/b;
+    iget-object v0, v0, Lcom/facebook/drawee/span/a;->Pf:Lcom/facebook/drawee/view/b;
 
-    invoke-virtual {v0}, Lcom/facebook/drawee/view/b;->hj()V
+    invoke-virtual {v0}, Lcom/facebook/drawee/view/b;->hh()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;->Pk:Ljava/util/Set;
+    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->Pg: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;->Pj:Lcom/facebook/drawee/view/b;
+    iget-object v0, v0, Lcom/facebook/drawee/span/a;->Pf: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 2f31cb34a9..a7b6b1c82a 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 Pj:Lcom/facebook/drawee/view/b;
+.field final Pf: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;->Pj:Lcom/facebook/drawee/view/b;
+    iput-object p1, p0, Lcom/facebook/drawee/span/a;->Pf: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 d5cdb1408a..0bf1a767ed 100644
--- a/com.discord/smali_classes2/com/facebook/e/b.smali
+++ b/com.discord/smali_classes2/com/facebook/e/b.smali
@@ -4,6 +4,14 @@
 
 
 # static fields
+.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;
@@ -18,14 +26,6 @@
 
 .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;->QY:Lcom/facebook/e/c;
+    sput-object v0, Lcom/facebook/e/b;->QU: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;->QZ:Lcom/facebook/e/c;
+    sput-object v0, Lcom/facebook/e/b;->QV: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;->Ra:Lcom/facebook/e/c;
+    sput-object v0, Lcom/facebook/e/b;->QW: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;->Rb:Lcom/facebook/e/c;
+    sput-object v0, Lcom/facebook/e/b;->QX: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;->Rc:Lcom/facebook/e/c;
+    sput-object v0, Lcom/facebook/e/b;->QY: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;->Rd:Lcom/facebook/e/c;
+    sput-object v0, Lcom/facebook/e/b;->QZ: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;->Re:Lcom/facebook/e/c;
+    sput-object v0, Lcom/facebook/e/b;->Ra: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;->Rf:Lcom/facebook/e/c;
+    sput-object v0, Lcom/facebook/e/b;->Rb: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;->Rg:Lcom/facebook/e/c;
+    sput-object v0, Lcom/facebook/e/b;->Rc: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;->Rh:Lcom/facebook/e/c;
+    sput-object v0, Lcom/facebook/e/b;->Rd: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;->Ri:Lcom/facebook/e/c;
+    sput-object v0, Lcom/facebook/e/b;->Re:Lcom/facebook/e/c;
 
     return-void
 .end method
@@ -145,7 +145,7 @@
 
     if-nez v0, :cond_1
 
-    sget-object v0, Lcom/facebook/e/b;->Rh:Lcom/facebook/e/c;
+    sget-object v0, Lcom/facebook/e/b;->Rd: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;->Rd:Lcom/facebook/e/c;
+    sget-object v0, Lcom/facebook/e/b;->QZ:Lcom/facebook/e/c;
 
     if-eq p0, v0, :cond_1
 
-    sget-object v0, Lcom/facebook/e/b;->Re:Lcom/facebook/e/c;
+    sget-object v0, Lcom/facebook/e/b;->Ra:Lcom/facebook/e/c;
 
     if-eq p0, v0, :cond_1
 
-    sget-object v0, Lcom/facebook/e/b;->Rf:Lcom/facebook/e/c;
+    sget-object v0, Lcom/facebook/e/b;->Rb:Lcom/facebook/e/c;
 
     if-eq p0, v0, :cond_1
 
-    sget-object v0, Lcom/facebook/e/b;->Rg:Lcom/facebook/e/c;
+    sget-object v0, Lcom/facebook/e/b;->Rc: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 b3897352b2..7e303e7afb 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 acB:I
+.field private final acx:I
 
-.field private final acC:Landroid/graphics/Paint$FontMetricsInt;
+.field private final acy: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;->acC:Landroid/graphics/Paint$FontMetricsInt;
+    iput-object v0, p0, Lcom/facebook/f/a/a/a;->acy: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;->acB:I
+    iput p2, p0, Lcom/facebook/f/a/a/a;->acx: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;->acB:I
+    iget v0, p0, Lcom/facebook/f/a/a/a;->acx: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;->acC:Landroid/graphics/Paint$FontMetricsInt;
+    iget-object p2, p0, Lcom/facebook/f/a/a/a;->acy: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;->acC:Landroid/graphics/Paint$FontMetricsInt;
+    iget-object p2, p0, Lcom/facebook/f/a/a/a;->acy: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 6740783bb8..b481c7f402 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 PM:Lcom/facebook/fresco/animation/a/c;
+.field final synthetic PI: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;->PM:Lcom/facebook/fresco/animation/a/c;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/a/c$1;->PI: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;->PM:Lcom/facebook/fresco/animation/a/c;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/a/c$1;->PI:Lcom/facebook/fresco/animation/a/c;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/facebook/fresco/animation/a/c$1;->PM:Lcom/facebook/fresco/animation/a/c;
+    iget-object v1, p0, Lcom/facebook/fresco/animation/a/c$1;->PI:Lcom/facebook/fresco/animation/a/c;
 
     const/4 v2, 0x0
 
-    iput-boolean v2, v1, Lcom/facebook/fresco/animation/a/c;->PG:Z
+    iput-boolean v2, v1, Lcom/facebook/fresco/animation/a/c;->PC:Z
 
-    iget-object v1, p0, Lcom/facebook/fresco/animation/a/c$1;->PM:Lcom/facebook/fresco/animation/a/c;
+    iget-object v1, p0, Lcom/facebook/fresco/animation/a/c$1;->PI:Lcom/facebook/fresco/animation/a/c;
 
-    iget-object v3, v1, Lcom/facebook/fresco/animation/a/c;->KR:Lcom/facebook/common/time/b;
+    iget-object v3, v1, Lcom/facebook/fresco/animation/a/c;->KN: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;->PH:J
+    iget-wide v5, v1, Lcom/facebook/fresco/animation/a/c;->PD:J
 
     sub-long/2addr v3, v5
 
-    iget-wide v5, v1, Lcom/facebook/fresco/animation/a/c;->PI:J
+    iget-wide v5, v1, Lcom/facebook/fresco/animation/a/c;->PE: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;->PM:Lcom/facebook/fresco/animation/a/c;
+    iget-object v1, p0, Lcom/facebook/fresco/animation/a/c$1;->PI:Lcom/facebook/fresco/animation/a/c;
 
-    iget-object v1, v1, Lcom/facebook/fresco/animation/a/c;->PK:Lcom/facebook/fresco/animation/a/c$a;
+    iget-object v1, v1, Lcom/facebook/fresco/animation/a/c;->PG:Lcom/facebook/fresco/animation/a/c$a;
 
     if-eqz v1, :cond_2
 
-    iget-object v1, p0, Lcom/facebook/fresco/animation/a/c$1;->PM:Lcom/facebook/fresco/animation/a/c;
+    iget-object v1, p0, Lcom/facebook/fresco/animation/a/c$1;->PI:Lcom/facebook/fresco/animation/a/c;
 
-    iget-object v1, v1, Lcom/facebook/fresco/animation/a/c;->PK:Lcom/facebook/fresco/animation/a/c$a;
+    iget-object v1, v1, Lcom/facebook/fresco/animation/a/c;->PG: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;->PM:Lcom/facebook/fresco/animation/a/c;
+    iget-object v1, p0, Lcom/facebook/fresco/animation/a/c$1;->PI:Lcom/facebook/fresco/animation/a/c;
 
-    invoke-virtual {v1}, Lcom/facebook/fresco/animation/a/c;->hW()V
+    invoke-virtual {v1}, Lcom/facebook/fresco/animation/a/c;->hU()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 37b531fd0e..a705e7bed6 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 PE:Lcom/facebook/fresco/animation/a/a;
+.field private final PA:Lcom/facebook/fresco/animation/a/a;
 
-.field private final PO:Lcom/facebook/fresco/animation/b/b;
+.field private final PK:Lcom/facebook/fresco/animation/b/b;
 
-.field private final Qd:I
+.field private final PZ:I
 
-.field private final Qe:I
+.field private final Qa:I
 
-.field final synthetic Qf:Lcom/facebook/fresco/animation/b/b/c;
+.field final synthetic Qb: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;->Qf:Lcom/facebook/fresco/animation/b/b/c;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/b/b/c$a;->Qb: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;->PE:Lcom/facebook/fresco/animation/a/a;
+    iput-object p2, p0, Lcom/facebook/fresco/animation/b/b/c$a;->PA:Lcom/facebook/fresco/animation/a/a;
 
-    iput-object p3, p0, Lcom/facebook/fresco/animation/b/b/c$a;->PO:Lcom/facebook/fresco/animation/b/b;
+    iput-object p3, p0, Lcom/facebook/fresco/animation/b/b/c$a;->PK:Lcom/facebook/fresco/animation/b/b;
 
-    iput p4, p0, Lcom/facebook/fresco/animation/b/b/c$a;->Qd:I
+    iput p4, p0, Lcom/facebook/fresco/animation/b/b/c$a;->PZ:I
 
-    iput p5, p0, Lcom/facebook/fresco/animation/b/b/c$a;->Qe:I
+    iput p5, p0, Lcom/facebook/fresco/animation/b/b/c$a;->Qa: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;->Qf:Lcom/facebook/fresco/animation/b/b/c;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/b/c$a;->Qb: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;->gt()Ljava/lang/Class;
+    invoke-static {}, Lcom/facebook/fresco/animation/b/b/c;->gr()Ljava/lang/Class;
 
     move-result-object p1
 
-    iget v0, p0, Lcom/facebook/fresco/animation/b/b/c$a;->Qd:I
+    iget v0, p0, Lcom/facebook/fresco/animation/b/b/c$a;->PZ: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;->Qf:Lcom/facebook/fresco/animation/b/b/c;
+    iget-object p1, p0, Lcom/facebook/fresco/animation/b/b/c$a;->Qb: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;->PO:Lcom/facebook/fresco/animation/b/b;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/b/c$a;->PK:Lcom/facebook/fresco/animation/b/b;
 
-    iget v1, p0, Lcom/facebook/fresco/animation/b/b/c$a;->Qd:I
+    iget v1, p0, Lcom/facebook/fresco/animation/b/b/c$a;->PZ: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;->Qf:Lcom/facebook/fresco/animation/b/b/c;
+    iget-object p2, p0, Lcom/facebook/fresco/animation/b/b/c$a;->Qb: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;->PE:Lcom/facebook/fresco/animation/a/a;
+    iget-object v1, p0, Lcom/facebook/fresco/animation/b/b/c$a;->PA: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;->PE:Lcom/facebook/fresco/animation/a/a;
+    iget-object v4, p0, Lcom/facebook/fresco/animation/b/b/c$a;->PA: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;->Qf:Lcom/facebook/fresco/animation/b/b/c;
+    iget-object v5, p0, Lcom/facebook/fresco/animation/b/b/c$a;->Qb: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;->gt()Ljava/lang/Class;
+    invoke-static {}, Lcom/facebook/fresco/animation/b/b/c;->gr()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;->PO:Lcom/facebook/fresco/animation/b/b;
+    iget-object p2, p0, Lcom/facebook/fresco/animation/b/b/c$a;->PK:Lcom/facebook/fresco/animation/b/b;
 
-    iget-object v1, p0, Lcom/facebook/fresco/animation/b/b/c$a;->PE:Lcom/facebook/fresco/animation/a/a;
+    iget-object v1, p0, Lcom/facebook/fresco/animation/b/b/c$a;->PA: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;->PE:Lcom/facebook/fresco/animation/a/a;
+    iget-object v1, p0, Lcom/facebook/fresco/animation/b/b/c$a;->PA: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;->hZ()Lcom/facebook/common/references/CloseableReference;
+    invoke-interface {p2}, Lcom/facebook/fresco/animation/b/b;->hX()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;->PO:Lcom/facebook/fresco/animation/b/b;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/b/c$a;->PK:Lcom/facebook/fresco/animation/b/b;
 
-    iget v1, p0, Lcom/facebook/fresco/animation/b/b/c$a;->Qd:I
+    iget v1, p0, Lcom/facebook/fresco/animation/b/b/c$a;->PZ: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;->gt()Ljava/lang/Class;
+    invoke-static {}, Lcom/facebook/fresco/animation/b/b/c;->gr()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;->Qd:I
+    iget v2, p0, Lcom/facebook/fresco/animation/b/b/c$a;->PZ: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;->Qf:Lcom/facebook/fresco/animation/b/b/c;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/b/c$a;->Qb: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;->Qf:Lcom/facebook/fresco/animation/b/b/c;
+    iget-object v1, p0, Lcom/facebook/fresco/animation/b/b/c$a;->Qb: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;->Qe:I
+    iget v2, p0, Lcom/facebook/fresco/animation/b/b/c$a;->Qa: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;->Qd:I
+    iget v0, p0, Lcom/facebook/fresco/animation/b/b/c$a;->PZ:I
 
     const/4 v1, 0x1
 
@@ -345,13 +345,13 @@
 
     if-eqz v0, :cond_1
 
-    invoke-static {}, Lcom/facebook/fresco/animation/b/b/c;->gt()Ljava/lang/Class;
+    invoke-static {}, Lcom/facebook/fresco/animation/b/b/c;->gr()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;->Qd:I
+    iget v2, p0, Lcom/facebook/fresco/animation/b/b/c$a;->PZ: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;->gt()Ljava/lang/Class;
+    invoke-static {}, Lcom/facebook/fresco/animation/b/b/c;->gr()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;->Qd:I
+    iget v4, p0, Lcom/facebook/fresco/animation/b/b/c$a;->PZ: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;->Qf:Lcom/facebook/fresco/animation/b/b/c;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/b/c$a;->Qb: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;->Qf:Lcom/facebook/fresco/animation/b/b/c;
+    iget-object v1, p0, Lcom/facebook/fresco/animation/b/b/c$a;->Qb: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;->Qe:I
+    iget v2, p0, Lcom/facebook/fresco/animation/b/b/c$a;->Qa: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;->Qf:Lcom/facebook/fresco/animation/b/b/c;
+    iget-object v1, p0, Lcom/facebook/fresco/animation/b/b/c$a;->Qb: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;->Qf:Lcom/facebook/fresco/animation/b/b/c;
+    iget-object v2, p0, Lcom/facebook/fresco/animation/b/b/c$a;->Qb: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;->Qe:I
+    iget v3, p0, Lcom/facebook/fresco/animation/b/b/c$a;->Qa: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 5986e43d9e..aec5c338f1 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 GI:Ljava/lang/Class;
+.field private static final GE:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -26,15 +26,15 @@
 
 
 # instance fields
-.field private final PN:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+.field private final PJ:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
 
-.field private final PQ:Lcom/facebook/fresco/animation/b/c;
+.field private final PM:Lcom/facebook/fresco/animation/b/c;
 
-.field private final PT:Landroid/graphics/Bitmap$Config;
+.field private final PP:Landroid/graphics/Bitmap$Config;
 
-.field private final Qb:Ljava/util/concurrent/ExecutorService;
+.field private final PW:Ljava/util/concurrent/ExecutorService;
 
-.field private final Qc:Landroid/util/SparseArray;
+.field private final PY: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;->GI:Ljava/lang/Class;
+    sput-object v0, Lcom/facebook/fresco/animation/b/b/c;->GE: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;->PN:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/b/b/c;->PJ:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
 
-    iput-object p2, p0, Lcom/facebook/fresco/animation/b/b/c;->PQ:Lcom/facebook/fresco/animation/b/c;
+    iput-object p2, p0, Lcom/facebook/fresco/animation/b/b/c;->PM:Lcom/facebook/fresco/animation/b/c;
 
-    iput-object p3, p0, Lcom/facebook/fresco/animation/b/b/c;->PT:Landroid/graphics/Bitmap$Config;
+    iput-object p3, p0, Lcom/facebook/fresco/animation/b/b/c;->PP:Landroid/graphics/Bitmap$Config;
 
-    iput-object p4, p0, Lcom/facebook/fresco/animation/b/b/c;->Qb:Ljava/util/concurrent/ExecutorService;
+    iput-object p4, p0, Lcom/facebook/fresco/animation/b/b/c;->PW: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;->Qc:Landroid/util/SparseArray;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/b/b/c;->PY: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;->Qc:Landroid/util/SparseArray;
+    iget-object p0, p0, Lcom/facebook/fresco/animation/b/b/c;->PY: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;->PT:Landroid/graphics/Bitmap$Config;
+    iget-object p0, p0, Lcom/facebook/fresco/animation/b/b/c;->PP: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;->PN:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+    iget-object p0, p0, Lcom/facebook/fresco/animation/b/b/c;->PJ: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;->PQ:Lcom/facebook/fresco/animation/b/c;
+    iget-object p0, p0, Lcom/facebook/fresco/animation/b/b/c;->PM:Lcom/facebook/fresco/animation/b/c;
 
     return-object p0
 .end method
 
-.method static synthetic gt()Ljava/lang/Class;
+.method static synthetic gr()Ljava/lang/Class;
     .locals 1
 
-    sget-object v0, Lcom/facebook/fresco/animation/b/b/c;->GI:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/fresco/animation/b/b/c;->GE: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;->Qc:Landroid/util/SparseArray;
+    iget-object v7, p0, Lcom/facebook/fresco/animation/b/b/c;->PY:Landroid/util/SparseArray;
 
     monitor-enter v7
 
     :try_start_0
-    iget-object v1, p0, Lcom/facebook/fresco/animation/b/b/c;->Qc:Landroid/util/SparseArray;
+    iget-object v1, p0, Lcom/facebook/fresco/animation/b/b/c;->PY: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;->GI:Ljava/lang/Class;
+    sget-object p1, Lcom/facebook/fresco/animation/b/b/c;->GE: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;->GI:Ljava/lang/Class;
+    sget-object p1, Lcom/facebook/fresco/animation/b/b/c;->GE: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;->Qc:Landroid/util/SparseArray;
+    iget-object p1, p0, Lcom/facebook/fresco/animation/b/b/c;->PY: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;->Qb:Ljava/util/concurrent/ExecutorService;
+    iget-object p1, p0, Lcom/facebook/fresco/animation/b/b/c;->PW: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 0f5ba445a2..f6706d5d80 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 GI:Ljava/lang/Class;
+.field private static final GE:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -18,7 +18,7 @@
 
 
 # instance fields
-.field private final Qg:I
+.field private final Qc: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;->GI:Ljava/lang/Class;
+    sput-object v0, Lcom/facebook/fresco/animation/b/b/d;->GE: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;->Qg:I
+    iput p1, p0, Lcom/facebook/fresco/animation/b/b/d;->Qc: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;->Qg:I
+    iget v1, p0, Lcom/facebook/fresco/animation/b/b/d;->Qc:I
 
     if-gt v0, v1, :cond_1
 
     add-int v1, p4, v0
 
-    invoke-interface {p3}, Lcom/facebook/fresco/animation/a/a;->fE()I
+    invoke-interface {p3}, Lcom/facebook/fresco/animation/a/a;->fC()I
 
     move-result v2
 
@@ -80,7 +80,7 @@
 
     if-eqz v2, :cond_0
 
-    sget-object v2, Lcom/facebook/fresco/animation/b/b/d;->GI:Ljava/lang/Class;
+    sget-object v2, Lcom/facebook/fresco/animation/b/b/d;->GE: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 c75f1bb3a0..26ef4d6dd7 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 Qh:Lcom/facebook/imagepipeline/animated/a/a;
+.field private final Qd: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;->Qh:Lcom/facebook/imagepipeline/animated/a/a;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/b/c/a;->Qd: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;->Qh:Lcom/facebook/imagepipeline/animated/a/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/c/a;->Qd:Lcom/facebook/imagepipeline/animated/a/a;
 
     invoke-interface {v0, p1}, Lcom/facebook/imagepipeline/animated/a/a;->Y(I)I
 
@@ -35,10 +35,22 @@
     return p1
 .end method
 
+.method public final fC()I
+    .locals 1
+
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/c/a;->Qd:Lcom/facebook/imagepipeline/animated/a/a;
+
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/animated/a/a;->fC()I
+
+    move-result v0
+
+    return v0
+.end method
+
 .method public final fE()I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/b/c/a;->Qh:Lcom/facebook/imagepipeline/animated/a/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/c/a;->Qd:Lcom/facebook/imagepipeline/animated/a/a;
 
     invoke-interface {v0}, Lcom/facebook/imagepipeline/animated/a/a;->fE()I
 
@@ -46,15 +58,3 @@
 
     return v0
 .end method
-
-.method public final fG()I
-    .locals 1
-
-    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;->fG()I
-
-    move-result v0
-
-    return v0
-.end method
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 094cb5acb7..ca69093b4e 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 Qx:Lcom/facebook/fresco/animation/c/a;
+.field final synthetic Qt: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;->Qx:Lcom/facebook/fresco/animation/c/a;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/c/a$1;->Qt: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;->Qx:Lcom/facebook/fresco/animation/c/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a$1;->Qt: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;->Qx:Lcom/facebook/fresco/animation/c/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a$1;->Qt: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 8998002926..067206f030 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 PP:Lcom/facebook/fresco/animation/a/d;
+.field private final PL:Lcom/facebook/fresco/animation/a/d;
 
-.field private QK:J
+.field private QG:J
 
 
 # direct methods
@@ -20,17 +20,17 @@
 
     const-wide/16 v0, -0x1
 
-    iput-wide v0, p0, Lcom/facebook/fresco/animation/d/a;->QK:J
+    iput-wide v0, p0, Lcom/facebook/fresco/animation/d/a;->QG:J
 
-    iput-object p1, p0, Lcom/facebook/fresco/animation/d/a;->PP:Lcom/facebook/fresco/animation/a/d;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/d/a;->PL:Lcom/facebook/fresco/animation/a/d;
 
     return-void
 .end method
 
-.method private ic()J
+.method private ia()J
     .locals 6
 
-    iget-wide v0, p0, Lcom/facebook/fresco/animation/d/a;->QK:J
+    iget-wide v0, p0, Lcom/facebook/fresco/animation/d/a;->QG: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;->QK:J
+    iput-wide v0, p0, Lcom/facebook/fresco/animation/d/a;->QG:J
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/d/a;->PP:Lcom/facebook/fresco/animation/a/d;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/d/a;->PL:Lcom/facebook/fresco/animation/a/d;
 
-    invoke-interface {v0}, Lcom/facebook/fresco/animation/a/d;->fE()I
+    invoke-interface {v0}, Lcom/facebook/fresco/animation/a/d;->fC()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;->QK:J
+    iget-wide v2, p0, Lcom/facebook/fresco/animation/d/a;->QG:J
 
-    iget-object v4, p0, Lcom/facebook/fresco/animation/d/a;->PP:Lcom/facebook/fresco/animation/a/d;
+    iget-object v4, p0, Lcom/facebook/fresco/animation/d/a;->PL: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;->QK:J
+    iput-wide v2, p0, Lcom/facebook/fresco/animation/d/a;->QG:J
 
     add-int/lit8 v1, v1, 0x1
 
     goto :goto_0
 
     :cond_1
-    iget-wide v0, p0, Lcom/facebook/fresco/animation/d/a;->QK:J
+    iget-wide v0, p0, Lcom/facebook/fresco/animation/d/a;->QG:J
 
     return-wide v0
 .end method
 
-.method private ie()Z
+.method private ib()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/d/a;->PP:Lcom/facebook/fresco/animation/a/d;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/d/a;->PL:Lcom/facebook/fresco/animation/a/d;
 
-    invoke-interface {v0}, Lcom/facebook/fresco/animation/a/d;->fG()I
+    invoke-interface {v0}, Lcom/facebook/fresco/animation/a/d;->fE()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;->ie()Z
+    invoke-direct {p0}, Lcom/facebook/fresco/animation/d/a;->ib()Z
 
     move-result v0
 
     if-nez v0, :cond_0
 
-    invoke-direct {p0}, Lcom/facebook/fresco/animation/d/a;->ic()J
+    invoke-direct {p0}, Lcom/facebook/fresco/animation/d/a;->ia()J
 
     move-result-wide v0
 
     div-long v0, p1, v0
 
-    iget-object v2, p0, Lcom/facebook/fresco/animation/d/a;->PP:Lcom/facebook/fresco/animation/a/d;
+    iget-object v2, p0, Lcom/facebook/fresco/animation/d/a;->PL:Lcom/facebook/fresco/animation/a/d;
 
-    invoke-interface {v2}, Lcom/facebook/fresco/animation/a/d;->fG()I
+    invoke-interface {v2}, Lcom/facebook/fresco/animation/a/d;->fE()I
 
     move-result v2
 
@@ -135,7 +135,7 @@
     return p1
 
     :cond_0
-    invoke-direct {p0}, Lcom/facebook/fresco/animation/d/a;->ic()J
+    invoke-direct {p0}, Lcom/facebook/fresco/animation/d/a;->ia()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;->PP:Lcom/facebook/fresco/animation/a/d;
+    iget-object v3, p0, Lcom/facebook/fresco/animation/d/a;->PL: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;->ic()J
+    invoke-direct {p0}, Lcom/facebook/fresco/animation/d/a;->ia()J
 
     move-result-wide v0
 
@@ -185,21 +185,21 @@
     return-wide v2
 
     :cond_0
-    invoke-direct {p0}, Lcom/facebook/fresco/animation/d/a;->ie()Z
+    invoke-direct {p0}, Lcom/facebook/fresco/animation/d/a;->ib()Z
 
     move-result v6
 
     if-nez v6, :cond_1
 
-    invoke-direct {p0}, Lcom/facebook/fresco/animation/d/a;->ic()J
+    invoke-direct {p0}, Lcom/facebook/fresco/animation/d/a;->ia()J
 
     move-result-wide v6
 
     div-long v6, p1, v6
 
-    iget-object v8, p0, Lcom/facebook/fresco/animation/d/a;->PP:Lcom/facebook/fresco/animation/a/d;
+    iget-object v8, p0, Lcom/facebook/fresco/animation/d/a;->PL:Lcom/facebook/fresco/animation/a/d;
 
-    invoke-interface {v8}, Lcom/facebook/fresco/animation/a/d;->fG()I
+    invoke-interface {v8}, Lcom/facebook/fresco/animation/a/d;->fE()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;->PP:Lcom/facebook/fresco/animation/a/d;
+    iget-object v2, p0, Lcom/facebook/fresco/animation/d/a;->PL:Lcom/facebook/fresco/animation/a/d;
 
-    invoke-interface {v2}, Lcom/facebook/fresco/animation/a/d;->fE()I
+    invoke-interface {v2}, Lcom/facebook/fresco/animation/a/d;->fC()I
 
     move-result v2
 
@@ -229,7 +229,7 @@
 
     if-gtz v6, :cond_2
 
-    iget-object v6, p0, Lcom/facebook/fresco/animation/d/a;->PP:Lcom/facebook/fresco/animation/a/d;
+    iget-object v6, p0, Lcom/facebook/fresco/animation/d/a;->PL: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 f311d3c944..ba41ee157f 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 QE:Landroid/graphics/Bitmap$Config;
+.field final synthetic QA:Landroid/graphics/Bitmap$Config;
 
-.field final synthetic QF:Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;
+.field final synthetic QB: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;->QF:Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$1;->QB:Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;
 
-    iput-object p2, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$1;->QE:Landroid/graphics/Bitmap$Config;
+    iput-object p2, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$1;->QA: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;->QF:Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;
+    iget-object p2, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$1;->QB: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;->QE:Landroid/graphics/Bitmap$Config;
+    iget-object p3, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$1;->QA: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 b46a8249e5..9d07c95e81 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 QE:Landroid/graphics/Bitmap$Config;
+.field final synthetic QA:Landroid/graphics/Bitmap$Config;
 
-.field final synthetic QF:Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;
+.field final synthetic QB: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;->QF:Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$2;->QB:Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;
 
-    iput-object p2, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$2;->QE:Landroid/graphics/Bitmap$Config;
+    iput-object p2, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$2;->QA: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;->QF:Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;
+    iget-object p2, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$2;->QB: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;->QE:Landroid/graphics/Bitmap$Config;
+    iget-object p3, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$2;->QA: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 c12da30e91..d858272cc3 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 QF:Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;
+.field final synthetic QB: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;->QF:Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$3;->QB: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 5d84614d3b..4c303113e8 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 QF:Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;
+.field final synthetic QB: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;->QF:Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$4;->QB: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 9156cd4082..c08dcfb618 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 QF:Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;
+.field final synthetic QB: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;->QF:Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$5;->QB: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;->QF:Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;
+    iget-object v1, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$5;->QB: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;->QF:Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;
+    iget-object v2, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$5;->QB: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 54f4b6b6f7..434a523cb1 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 QF:Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;
+.field final synthetic QB: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;->QF:Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$6;->QB: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;->QF:Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;
+    iget-object v1, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$6;->QB: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;->QF:Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;
+    iget-object v2, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$6;->QB: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 d9fecb4bf1..ea34f7c19a 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 QJ:Ljava/lang/String;
+.field private final QF:Ljava/lang/String;
 
 
 # direct methods
@@ -37,17 +37,17 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/facebook/fresco/animation/factory/a$a;->QJ:Ljava/lang/String;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/factory/a$a;->QF:Ljava/lang/String;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final fL()Ljava/lang/String;
+.method public final fJ()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/factory/a$a;->QJ:Ljava/lang/String;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/factory/a$a;->QF: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 fe9686d656..30d7961337 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,17 +15,15 @@
 
 
 # instance fields
-.field private final KR:Lcom/facebook/common/time/b;
+.field private final KN:Lcom/facebook/common/time/b;
 
-.field private final PF:Ljava/util/concurrent/ScheduledExecutorService;
+.field private final PB:Ljava/util/concurrent/ScheduledExecutorService;
 
-.field private final PN:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+.field private final PJ:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
 
-.field private final QC:Lcom/facebook/imagepipeline/animated/c/b;
+.field private final QC:Ljava/util/concurrent/ExecutorService;
 
-.field private final QG:Ljava/util/concurrent/ExecutorService;
-
-.field private final QH:Lcom/facebook/common/d/l;
+.field private final QD:Lcom/facebook/common/d/l;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/d/l<",
@@ -35,7 +33,7 @@
     .end annotation
 .end field
 
-.field private final QI:Lcom/facebook/common/d/l;
+.field private final QE:Lcom/facebook/common/d/l;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/d/l<",
@@ -45,7 +43,7 @@
     .end annotation
 .end field
 
-.field private final Qz:Lcom/facebook/imagepipeline/cache/h;
+.field private final Qv:Lcom/facebook/imagepipeline/cache/h;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/cache/h<",
@@ -56,6 +54,8 @@
     .end annotation
 .end field
 
+.field private final Qy:Lcom/facebook/imagepipeline/animated/c/b;
+
 
 # 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;->QC:Lcom/facebook/imagepipeline/animated/c/b;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/factory/a;->Qy:Lcom/facebook/imagepipeline/animated/c/b;
 
-    iput-object p2, p0, Lcom/facebook/fresco/animation/factory/a;->PF:Ljava/util/concurrent/ScheduledExecutorService;
+    iput-object p2, p0, Lcom/facebook/fresco/animation/factory/a;->PB:Ljava/util/concurrent/ScheduledExecutorService;
 
-    iput-object p3, p0, Lcom/facebook/fresco/animation/factory/a;->QG:Ljava/util/concurrent/ExecutorService;
+    iput-object p3, p0, Lcom/facebook/fresco/animation/factory/a;->QC:Ljava/util/concurrent/ExecutorService;
 
-    iput-object p4, p0, Lcom/facebook/fresco/animation/factory/a;->KR:Lcom/facebook/common/time/b;
+    iput-object p4, p0, Lcom/facebook/fresco/animation/factory/a;->KN:Lcom/facebook/common/time/b;
 
-    iput-object p5, p0, Lcom/facebook/fresco/animation/factory/a;->PN:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+    iput-object p5, p0, Lcom/facebook/fresco/animation/factory/a;->PJ:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
 
-    iput-object p6, p0, Lcom/facebook/fresco/animation/factory/a;->Qz:Lcom/facebook/imagepipeline/cache/h;
+    iput-object p6, p0, Lcom/facebook/fresco/animation/factory/a;->Qv:Lcom/facebook/imagepipeline/cache/h;
 
-    iput-object p7, p0, Lcom/facebook/fresco/animation/factory/a;->QH:Lcom/facebook/common/d/l;
+    iput-object p7, p0, Lcom/facebook/fresco/animation/factory/a;->QD:Lcom/facebook/common/d/l;
 
-    iput-object p8, p0, Lcom/facebook/fresco/animation/factory/a;->QI:Lcom/facebook/common/d/l;
+    iput-object p8, p0, Lcom/facebook/fresco/animation/factory/a;->QE: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;->Qz:Lcom/facebook/imagepipeline/cache/h;
+    iget-object p1, p0, Lcom/facebook/fresco/animation/factory/a;->Qv: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;->jl()Lcom/facebook/imagepipeline/animated/a/e;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/a;->jj()Lcom/facebook/imagepipeline/animated/a/e;
 
     move-result-object p1
 
-    iget-object v1, p1, Lcom/facebook/imagepipeline/animated/a/e;->RB:Lcom/facebook/imagepipeline/animated/a/c;
+    iget-object v1, p1, Lcom/facebook/imagepipeline/animated/a/e;->Rx: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;->QC:Lcom/facebook/imagepipeline/animated/c/b;
+    iget-object v1, p0, Lcom/facebook/fresco/animation/factory/a;->Qy: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;->QH:Lcom/facebook/common/d/l;
+    iget-object v2, p0, Lcom/facebook/fresco/animation/factory/a;->QD: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;->QI:Lcom/facebook/common/d/l;
+    iget-object p1, p0, Lcom/facebook/fresco/animation/factory/a;->QE: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;->PN:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+    iget-object v3, p0, Lcom/facebook/fresco/animation/factory/a;->PJ: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;->QG:Ljava/util/concurrent/ExecutorService;
+    iget-object v5, p0, Lcom/facebook/fresco/animation/factory/a;->QC: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;->PN:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+    iget-object v5, p0, Lcom/facebook/fresco/animation/factory/a;->PJ: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;->KR:Lcom/facebook/common/time/b;
+    iget-object v1, p0, Lcom/facebook/fresco/animation/factory/a;->KN:Lcom/facebook/common/time/b;
 
-    iget-object v2, p0, Lcom/facebook/fresco/animation/factory/a;->PF:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object v2, p0, Lcom/facebook/fresco/animation/factory/a;->PB: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 0926310576..85bb008c37 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 To:I
+.field public final Tk:I
 
-.field public final Tp:I
+.field public final Tl:I
 
 
 # direct methods
@@ -15,9 +15,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput p1, p0, Lcom/facebook/imagepipeline/a/a;->To:I
+    iput p1, p0, Lcom/facebook/imagepipeline/a/a;->Tk:I
 
-    iput p2, p0, Lcom/facebook/imagepipeline/a/a;->Tp:I
+    iput p2, p0, Lcom/facebook/imagepipeline/a/a;->Tl: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;->To:I
+    iget v1, p0, Lcom/facebook/imagepipeline/a/a;->Tk:I
 
-    iget v3, p1, Lcom/facebook/imagepipeline/a/a;->To:I
+    iget v3, p1, Lcom/facebook/imagepipeline/a/a;->Tk:I
 
     if-ne v1, v3, :cond_2
 
-    iget v1, p0, Lcom/facebook/imagepipeline/a/a;->Tp:I
+    iget v1, p0, Lcom/facebook/imagepipeline/a/a;->Tl:I
 
-    iget p1, p1, Lcom/facebook/imagepipeline/a/a;->Tp:I
+    iget p1, p1, Lcom/facebook/imagepipeline/a/a;->Tl: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;->To:I
+    iget v0, p0, Lcom/facebook/imagepipeline/a/a;->Tk:I
 
-    iget v1, p0, Lcom/facebook/imagepipeline/a/a;->Tp:I
+    iget v1, p0, Lcom/facebook/imagepipeline/a/a;->Tl: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;->To:I
+    iget v1, p0, Lcom/facebook/imagepipeline/a/a;->Tk: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;->Tp:I
+    iget v1, p0, Lcom/facebook/imagepipeline/a/a;->Tl: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 664e2815fe..257345050a 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 TM:F
+.field public final TI:F
 
-.field public final TN:F
+.field public final TJ:F
 
 .field public final height:I
 
@@ -71,11 +71,11 @@
 
     const/high16 p1, 0x45000000    # 2048.0f
 
-    iput p1, p0, Lcom/facebook/imagepipeline/a/e;->TM:F
+    iput p1, p0, Lcom/facebook/imagepipeline/a/e;->TI:F
 
     const p1, 0x3f2aaaab
 
-    iput p1, p0, Lcom/facebook/imagepipeline/a/e;->TN:F
+    iput p1, p0, Lcom/facebook/imagepipeline/a/e;->TJ: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 4a9ab3af1f..0835f83f83 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 TQ:Lcom/facebook/imagepipeline/a/f;
+.field private static final TM:Lcom/facebook/imagepipeline/a/f;
 
-.field private static final TR:Lcom/facebook/imagepipeline/a/f;
+.field private static final TN:Lcom/facebook/imagepipeline/a/f;
 
-.field private static final TS:Lcom/facebook/imagepipeline/a/f;
+.field private static final TO:Lcom/facebook/imagepipeline/a/f;
 
 
 # instance fields
-.field private final TO:I
+.field private final TK:I
 
-.field public final TP:Z
+.field public final TL: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;->TQ:Lcom/facebook/imagepipeline/a/f;
+    sput-object v0, Lcom/facebook/imagepipeline/a/f;->TM: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;->TR:Lcom/facebook/imagepipeline/a/f;
+    sput-object v0, Lcom/facebook/imagepipeline/a/f;->TN: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;->TS:Lcom/facebook/imagepipeline/a/f;
+    sput-object v0, Lcom/facebook/imagepipeline/a/f;->TO: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;->TO:I
+    iput p1, p0, Lcom/facebook/imagepipeline/a/f;->TK:I
 
-    iput-boolean p2, p0, Lcom/facebook/imagepipeline/a/f;->TP:Z
+    iput-boolean p2, p0, Lcom/facebook/imagepipeline/a/f;->TL:Z
 
     return-void
 .end method
 
-.method public static iA()Lcom/facebook/imagepipeline/a/f;
+.method public static iy()Lcom/facebook/imagepipeline/a/f;
     .locals 1
 
-    sget-object v0, Lcom/facebook/imagepipeline/a/f;->TQ:Lcom/facebook/imagepipeline/a/f;
+    sget-object v0, Lcom/facebook/imagepipeline/a/f;->TM:Lcom/facebook/imagepipeline/a/f;
 
     return-object v0
 .end method
 
-.method public static iB()Lcom/facebook/imagepipeline/a/f;
+.method public static iz()Lcom/facebook/imagepipeline/a/f;
     .locals 1
 
-    sget-object v0, Lcom/facebook/imagepipeline/a/f;->TS:Lcom/facebook/imagepipeline/a/f;
+    sget-object v0, Lcom/facebook/imagepipeline/a/f;->TO: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;->TO:I
+    iget v1, p0, Lcom/facebook/imagepipeline/a/f;->TK:I
 
-    iget v3, p1, Lcom/facebook/imagepipeline/a/f;->TO:I
+    iget v3, p1, Lcom/facebook/imagepipeline/a/f;->TK:I
 
     if-ne v1, v3, :cond_2
 
-    iget-boolean v1, p0, Lcom/facebook/imagepipeline/a/f;->TP:Z
+    iget-boolean v1, p0, Lcom/facebook/imagepipeline/a/f;->TL:Z
 
-    iget-boolean p1, p1, Lcom/facebook/imagepipeline/a/f;->TP:Z
+    iget-boolean p1, p1, Lcom/facebook/imagepipeline/a/f;->TL: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;->TO:I
+    iget v0, p0, Lcom/facebook/imagepipeline/a/f;->TK: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;->TP:Z
+    iget-boolean v1, p0, Lcom/facebook/imagepipeline/a/f;->TL:Z
 
     invoke-static {v1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
@@ -141,10 +141,10 @@
     return v0
 .end method
 
-.method public final iC()Z
+.method public final iA()Z
     .locals 2
 
-    iget v0, p0, Lcom/facebook/imagepipeline/a/f;->TO:I
+    iget v0, p0, Lcom/facebook/imagepipeline/a/f;->TK:I
 
     const/4 v1, -0x1
 
@@ -160,10 +160,10 @@
     return v0
 .end method
 
-.method public final iD()Z
+.method public final iB()Z
     .locals 2
 
-    iget v0, p0, Lcom/facebook/imagepipeline/a/f;->TO:I
+    iget v0, p0, Lcom/facebook/imagepipeline/a/f;->TK:I
 
     const/4 v1, -0x2
 
@@ -179,16 +179,16 @@
     return v0
 .end method
 
-.method public final iE()I
+.method public final iC()I
     .locals 2
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/a/f;->iC()Z
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/a/f;->iA()Z
 
     move-result v0
 
     if-nez v0, :cond_0
 
-    iget v0, p0, Lcom/facebook/imagepipeline/a/f;->TO:I
+    iget v0, p0, Lcom/facebook/imagepipeline/a/f;->TK:I
 
     return v0
 
@@ -209,7 +209,7 @@
 
     new-array v0, v0, [Ljava/lang/Object;
 
-    iget v1, p0, Lcom/facebook/imagepipeline/a/f;->TO:I
+    iget v1, p0, Lcom/facebook/imagepipeline/a/f;->TK: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;->TP:Z
+    iget-boolean v1, p0, Lcom/facebook/imagepipeline/a/f;->TL: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 02960a5391..be27cdaf0f 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 Ru:I = 0x1
+.field public static final Rq:I = 0x1
 
-.field public static final Rv:I = 0x2
+.field public static final Rr:I = 0x2
 
-.field private static final synthetic Rw:[I
+.field private static final synthetic Rs:[I
 
 
 # direct methods
@@ -38,19 +38,19 @@
 
     new-array v0, v0, [I
 
-    sget v1, Lcom/facebook/imagepipeline/animated/a/b$a;->Ru:I
+    sget v1, Lcom/facebook/imagepipeline/animated/a/b$a;->Rq:I
 
     const/4 v2, 0x0
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/imagepipeline/animated/a/b$a;->Rv:I
+    sget v1, Lcom/facebook/imagepipeline/animated/a/b$a;->Rr:I
 
     const/4 v2, 0x1
 
     aput v1, v0, v2
 
-    sput-object v0, Lcom/facebook/imagepipeline/animated/a/b$a;->Rw:[I
+    sput-object v0, Lcom/facebook/imagepipeline/animated/a/b$a;->Rs:[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 9806d22cd2..d65e02e407 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 private static final synthetic RA:[I
+.field public static final Rt:I = 0x1
 
-.field public static final Rx:I = 0x1
+.field public static final Ru:I = 0x2
 
-.field public static final Ry:I = 0x2
+.field public static final Rv:I = 0x3
 
-.field public static final Rz:I = 0x3
+.field private static final synthetic Rw:[I
 
 
 # direct methods
@@ -40,25 +40,25 @@
 
     new-array v0, v0, [I
 
-    sget v1, Lcom/facebook/imagepipeline/animated/a/b$b;->Rx:I
+    sget v1, Lcom/facebook/imagepipeline/animated/a/b$b;->Rt:I
 
     const/4 v2, 0x0
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/imagepipeline/animated/a/b$b;->Ry:I
+    sget v1, Lcom/facebook/imagepipeline/animated/a/b$b;->Ru:I
 
     const/4 v2, 0x1
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/imagepipeline/animated/a/b$b;->Rz:I
+    sget v1, Lcom/facebook/imagepipeline/animated/a/b$b;->Rv:I
 
     const/4 v2, 0x2
 
     aput v1, v0, v2
 
-    sput-object v0, Lcom/facebook/imagepipeline/animated/a/b$b;->RA:[I
+    sput-object v0, Lcom/facebook/imagepipeline/animated/a/b$b;->Rw:[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 0e384d0c7d..cef38254af 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,16 +13,16 @@
 
 
 # instance fields
+.field public final Rl:I
+
+.field public final Rm:I
+
+.field public final Rn:I
+
+.field public final Ro:I
+
 .field public final Rp:I
 
-.field public final Rq:I
-
-.field public final Rr:I
-
-.field public final Rs:I
-
-.field public final Rt:I
-
 .field public final height:I
 
 .field public final width:I
@@ -34,19 +34,19 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput p1, p0, Lcom/facebook/imagepipeline/animated/a/b;->Rp:I
+    iput p1, p0, Lcom/facebook/imagepipeline/animated/a/b;->Rl:I
 
-    iput p2, p0, Lcom/facebook/imagepipeline/animated/a/b;->Rq:I
+    iput p2, p0, Lcom/facebook/imagepipeline/animated/a/b;->Rm:I
 
-    iput p3, p0, Lcom/facebook/imagepipeline/animated/a/b;->Rr:I
+    iput p3, p0, Lcom/facebook/imagepipeline/animated/a/b;->Rn: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;->Rs:I
+    iput p6, p0, Lcom/facebook/imagepipeline/animated/a/b;->Ro:I
 
-    iput p7, p0, Lcom/facebook/imagepipeline/animated/a/b;->Rt:I
+    iput p7, p0, Lcom/facebook/imagepipeline/animated/a/b;->Rp: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 6dc37f8f5c..5e5ad6773e 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,21 +10,21 @@
 .method public abstract C(I)Lcom/facebook/imagepipeline/animated/a/d;
 .end method
 
+.method public abstract fC()I
+.end method
+
+.method public abstract fD()[I
+.end method
+
 .method public abstract fE()I
 .end method
 
-.method public abstract fF()[I
+.method public abstract fF()Z
 .end method
 
 .method public abstract fG()I
 .end method
 
-.method public abstract fH()Z
-.end method
-
-.method public abstract fI()I
-.end method
-
 .method public abstract getHeight()I
 .end method
 
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 a526d61fce..d1ded579df 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 fB()I
+.method public abstract fA()I
 .end method
 
-.method public abstract fC()I
+.method public abstract fz()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 1d5113653d..c9de354e0b 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,21 +4,7 @@
 
 
 # instance fields
-.field final RB:Lcom/facebook/imagepipeline/animated/a/c;
-
-.field public RC:I
-
-.field public RD:Lcom/facebook/common/references/CloseableReference;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/facebook/common/references/CloseableReference<",
-            "Landroid/graphics/Bitmap;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public RE:Ljava/util/List;
+.field public RA:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -29,6 +15,20 @@
     .end annotation
 .end field
 
+.field final Rx:Lcom/facebook/imagepipeline/animated/a/c;
+
+.field public Ry:I
+
+.field public Rz:Lcom/facebook/common/references/CloseableReference;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/facebook/common/references/CloseableReference<",
+            "Landroid/graphics/Bitmap;",
+            ">;"
+        }
+    .end annotation
+.end field
+
 
 # direct methods
 .method public constructor <init>(Lcom/facebook/imagepipeline/animated/a/c;)V
@@ -36,14 +36,14 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/a/f;->RB:Lcom/facebook/imagepipeline/animated/a/c;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/a/f;->Rx:Lcom/facebook/imagepipeline/animated/a/c;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final ik()Lcom/facebook/imagepipeline/animated/a/e;
+.method public final ii()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;->RD:Lcom/facebook/common/references/CloseableReference;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/animated/a/f;->Rz: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;->RD:Lcom/facebook/common/references/CloseableReference;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/animated/a/f;->Rz:Lcom/facebook/common/references/CloseableReference;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/animated/a/f;->RE:Ljava/util/List;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/animated/a/f;->RA: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;->RE:Ljava/util/List;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/animated/a/f;->RA:Ljava/util/List;
 
     return-object v1
 
     :catchall_0
     move-exception v1
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/animated/a/f;->RD:Lcom/facebook/common/references/CloseableReference;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/animated/a/f;->Rz: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;->RD:Lcom/facebook/common/references/CloseableReference;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/animated/a/f;->Rz:Lcom/facebook/common/references/CloseableReference;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/animated/a/f;->RE:Ljava/util/List;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/animated/a/f;->RA: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;->RE:Ljava/util/List;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/animated/a/f;->RA: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 b28480ad80..249a093208 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 RF:Z
+.field private static RB:Z
 
-.field private static RG:Lcom/facebook/imagepipeline/animated/b/a;
+.field private static RC:Lcom/facebook/imagepipeline/animated/b/a;
 
 
 # direct methods
@@ -31,7 +31,7 @@
         }
     .end annotation
 
-    sget-boolean v0, Lcom/facebook/imagepipeline/animated/b/b;->RF:Z
+    sget-boolean v0, Lcom/facebook/imagepipeline/animated/b/b;->RB: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;->RG:Lcom/facebook/imagepipeline/animated/b/a;
+    sput-object p0, Lcom/facebook/imagepipeline/animated/b/b;->RC: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;->RG:Lcom/facebook/imagepipeline/animated/b/a;
+    sget-object p0, Lcom/facebook/imagepipeline/animated/b/b;->RC:Lcom/facebook/imagepipeline/animated/b/a;
 
     if-eqz p0, :cond_0
 
-    sput-boolean v0, Lcom/facebook/imagepipeline/animated/b/b;->RF:Z
+    sput-boolean v0, Lcom/facebook/imagepipeline/animated/b/b;->RB:Z
 
     :cond_0
-    sget-object p0, Lcom/facebook/imagepipeline/animated/b/b;->RG:Lcom/facebook/imagepipeline/animated/b/a;
+    sget-object p0, Lcom/facebook/imagepipeline/animated/b/b;->RC: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 23e8561d73..da03c019c3 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 RK:Lcom/facebook/imagepipeline/animated/b/e;
+.field final synthetic RG:Lcom/facebook/imagepipeline/animated/b/e;
 
-.field final synthetic RL:Ljava/util/List;
+.field final synthetic RH: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;->RK:Lcom/facebook/imagepipeline/animated/b/e;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/b/e$2;->RG:Lcom/facebook/imagepipeline/animated/b/e;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/animated/b/e$2;->RL:Ljava/util/List;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/animated/b/e$2;->RH: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;->RL:Ljava/util/List;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/b/e$2;->RH: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 268959dfa5..3b873e3371 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 RY:Lcom/facebook/imagepipeline/animated/c/c;
+.field final synthetic RU: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;->RY:Lcom/facebook/imagepipeline/animated/c/c;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/c/c$1;->RU: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;->RY:Lcom/facebook/imagepipeline/animated/c/c;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/c$1;->RU: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 a4f3f108c3..44a58dd60c 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 Sb:[I
+.field static final synthetic RX:[I
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 4
 
-    invoke-static {}, Lcom/facebook/imagepipeline/animated/c/d$b;->in()[I
+    invoke-static {}, Lcom/facebook/imagepipeline/animated/c/d$b;->il()[I
 
     move-result-object v0
 
@@ -30,14 +30,14 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/facebook/imagepipeline/animated/c/d$1;->Sb:[I
+    sput-object v0, Lcom/facebook/imagepipeline/animated/c/d$1;->RX:[I
 
     const/4 v0, 0x1
 
     :try_start_0
-    sget-object v1, Lcom/facebook/imagepipeline/animated/c/d$1;->Sb:[I
+    sget-object v1, Lcom/facebook/imagepipeline/animated/c/d$1;->RX:[I
 
-    sget v2, Lcom/facebook/imagepipeline/animated/c/d$b;->Sc:I
+    sget v2, Lcom/facebook/imagepipeline/animated/c/d$b;->RY: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;->Sb:[I
+    sget-object v1, Lcom/facebook/imagepipeline/animated/c/d$1;->RX:[I
 
-    sget v2, Lcom/facebook/imagepipeline/animated/c/d$b;->Sd:I
+    sget v2, Lcom/facebook/imagepipeline/animated/c/d$b;->RZ: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;->Sb:[I
+    sget-object v1, Lcom/facebook/imagepipeline/animated/c/d$1;->RX:[I
 
-    sget v2, Lcom/facebook/imagepipeline/animated/c/d$b;->Sf:I
+    sget v2, Lcom/facebook/imagepipeline/animated/c/d$b;->Sb: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;->Sb:[I
+    sget-object v1, Lcom/facebook/imagepipeline/animated/c/d$1;->RX:[I
 
-    sget v2, Lcom/facebook/imagepipeline/animated/c/d$b;->Se:I
+    sget v2, Lcom/facebook/imagepipeline/animated/c/d$b;->Sa: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 69307077a7..adc7f5ed3f 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 Sc:I = 0x1
+.field public static final RY:I = 0x1
 
-.field public static final Sd:I = 0x2
+.field public static final RZ:I = 0x2
 
-.field public static final Se:I = 0x3
+.field public static final Sa:I = 0x3
 
-.field public static final Sf:I = 0x4
+.field public static final Sb:I = 0x4
 
-.field private static final synthetic Sg:[I
+.field private static final synthetic Sc:[I
 
 
 # direct methods
@@ -42,39 +42,39 @@
 
     new-array v0, v0, [I
 
-    sget v1, Lcom/facebook/imagepipeline/animated/c/d$b;->Sc:I
+    sget v1, Lcom/facebook/imagepipeline/animated/c/d$b;->RY:I
 
     const/4 v2, 0x0
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/imagepipeline/animated/c/d$b;->Sd:I
+    sget v1, Lcom/facebook/imagepipeline/animated/c/d$b;->RZ:I
 
     const/4 v2, 0x1
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/imagepipeline/animated/c/d$b;->Se:I
+    sget v1, Lcom/facebook/imagepipeline/animated/c/d$b;->Sa:I
 
     const/4 v2, 0x2
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/imagepipeline/animated/c/d$b;->Sf:I
+    sget v1, Lcom/facebook/imagepipeline/animated/c/d$b;->Sb:I
 
     const/4 v2, 0x3
 
     aput v1, v0, v2
 
-    sput-object v0, Lcom/facebook/imagepipeline/animated/c/d$b;->Sg:[I
+    sput-object v0, Lcom/facebook/imagepipeline/animated/c/d$b;->Sc:[I
 
     return-void
 .end method
 
-.method public static in()[I
+.method public static il()[I
     .locals 1
 
-    sget-object v0, Lcom/facebook/imagepipeline/animated/c/d$b;->Sg:[I
+    sget-object v0, Lcom/facebook/imagepipeline/animated/c/d$b;->Sc:[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 345babc30f..bcc9c717ba 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 Qh:Lcom/facebook/imagepipeline/animated/a/a;
+.field private final Qd:Lcom/facebook/imagepipeline/animated/a/a;
 
-.field private final Qj:Lcom/facebook/imagepipeline/animated/c/d$a;
+.field private final Qf:Lcom/facebook/imagepipeline/animated/c/d$a;
 
-.field private final Sa:Landroid/graphics/Paint;
+.field private final RW: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;->Qh:Lcom/facebook/imagepipeline/animated/a/a;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/c/d;->Qd:Lcom/facebook/imagepipeline/animated/a/a;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/animated/c/d;->Qj:Lcom/facebook/imagepipeline/animated/c/d$a;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/animated/c/d;->Qf: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;->Sa:Landroid/graphics/Paint;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/c/d;->RW:Landroid/graphics/Paint;
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/animated/c/d;->Sa:Landroid/graphics/Paint;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/animated/c/d;->RW: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;->Sa:Landroid/graphics/Paint;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/animated/c/d;->RW: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;->Sa:Landroid/graphics/Paint;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/animated/c/d;->RW: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;->Rq:I
+    iget v0, p2, Lcom/facebook/imagepipeline/animated/a/b;->Rm:I
 
     int-to-float v2, v0
 
-    iget v0, p2, Lcom/facebook/imagepipeline/animated/a/b;->Rr:I
+    iget v0, p2, Lcom/facebook/imagepipeline/animated/a/b;->Rn:I
 
     int-to-float v3, v0
 
-    iget v0, p2, Lcom/facebook/imagepipeline/animated/a/b;->Rq:I
+    iget v0, p2, Lcom/facebook/imagepipeline/animated/a/b;->Rm: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;->Rr:I
+    iget v0, p2, Lcom/facebook/imagepipeline/animated/a/b;->Rn: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;->Sa:Landroid/graphics/Paint;
+    iget-object v6, p0, Lcom/facebook/imagepipeline/animated/c/d;->RW: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;->Rq:I
+    iget v0, p1, Lcom/facebook/imagepipeline/animated/a/b;->Rm:I
 
     if-nez v0, :cond_0
 
-    iget v0, p1, Lcom/facebook/imagepipeline/animated/a/b;->Rr:I
+    iget v0, p1, Lcom/facebook/imagepipeline/animated/a/b;->Rn: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;->Qh:Lcom/facebook/imagepipeline/animated/a/a;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/animated/c/d;->Qd:Lcom/facebook/imagepipeline/animated/a/a;
 
-    invoke-interface {v1}, Lcom/facebook/imagepipeline/animated/a/a;->ii()I
+    invoke-interface {v1}, Lcom/facebook/imagepipeline/animated/a/a;->ig()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;->Qh:Lcom/facebook/imagepipeline/animated/a/a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/d;->Qd:Lcom/facebook/imagepipeline/animated/a/a;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/animated/a/a;->ij()I
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/animated/a/a;->ih()I
 
     move-result v0
 
@@ -148,13 +148,13 @@
     return v0
 
     :cond_0
-    iget-object v1, p0, Lcom/facebook/imagepipeline/animated/c/d;->Qh:Lcom/facebook/imagepipeline/animated/a/a;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/animated/c/d;->Qd: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;->Qh:Lcom/facebook/imagepipeline/animated/a/a;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/animated/c/d;->Qd: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;->Rs:I
+    iget v2, v1, Lcom/facebook/imagepipeline/animated/a/b;->Ro:I
 
-    sget v3, Lcom/facebook/imagepipeline/animated/a/b$a;->Rv:I
+    sget v3, Lcom/facebook/imagepipeline/animated/a/b$a;->Rr:I
 
     if-ne v2, v3, :cond_1
 
@@ -177,9 +177,9 @@
     return v0
 
     :cond_1
-    iget v1, p1, Lcom/facebook/imagepipeline/animated/a/b;->Rt:I
+    iget v1, p1, Lcom/facebook/imagepipeline/animated/a/b;->Rp:I
 
-    sget v2, Lcom/facebook/imagepipeline/animated/a/b$b;->Ry:I
+    sget v2, Lcom/facebook/imagepipeline/animated/a/b$b;->Ru: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;->Qh:Lcom/facebook/imagepipeline/animated/a/a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/d;->Qd: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;->Rt:I
+    iget v1, v0, Lcom/facebook/imagepipeline/animated/a/b;->Rp:I
 
-    sget v2, Lcom/facebook/imagepipeline/animated/a/b$b;->Rx:I
+    sget v2, Lcom/facebook/imagepipeline/animated/a/b$b;->Rt:I
 
     if-ne v1, v2, :cond_0
 
-    sget v0, Lcom/facebook/imagepipeline/animated/c/d$b;->Sc:I
+    sget v0, Lcom/facebook/imagepipeline/animated/c/d$b;->RY:I
 
     goto :goto_1
 
     :cond_0
-    sget v2, Lcom/facebook/imagepipeline/animated/a/b$b;->Ry:I
+    sget v2, Lcom/facebook/imagepipeline/animated/a/b$b;->Ru: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;->Sd:I
+    sget v0, Lcom/facebook/imagepipeline/animated/c/d$b;->RZ:I
 
     goto :goto_1
 
     :cond_1
-    sget v0, Lcom/facebook/imagepipeline/animated/c/d$b;->Sc:I
+    sget v0, Lcom/facebook/imagepipeline/animated/c/d$b;->RY:I
 
     goto :goto_1
 
     :cond_2
-    sget v0, Lcom/facebook/imagepipeline/animated/a/b$b;->Rz:I
+    sget v0, Lcom/facebook/imagepipeline/animated/a/b$b;->Rv:I
 
     if-ne v1, v0, :cond_3
 
-    sget v0, Lcom/facebook/imagepipeline/animated/c/d$b;->Se:I
+    sget v0, Lcom/facebook/imagepipeline/animated/c/d$b;->Sa:I
 
     goto :goto_1
 
     :cond_3
-    sget v0, Lcom/facebook/imagepipeline/animated/c/d$b;->Sf:I
+    sget v0, Lcom/facebook/imagepipeline/animated/c/d$b;->Sb:I
 
     :goto_1
-    sget-object v1, Lcom/facebook/imagepipeline/animated/c/d$1;->Sb:[I
+    sget-object v1, Lcom/facebook/imagepipeline/animated/c/d$1;->RX:[I
 
     const/4 v2, 0x1
 
@@ -281,13 +281,13 @@
     return p1
 
     :cond_6
-    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/d;->Qh:Lcom/facebook/imagepipeline/animated/a/a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/d;->Qd: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;->Qj:Lcom/facebook/imagepipeline/animated/c/d$a;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/animated/c/d;->Qf: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;->Rt:I
+    iget v3, v0, Lcom/facebook/imagepipeline/animated/a/b;->Rp:I
 
-    sget v4, Lcom/facebook/imagepipeline/animated/a/b$b;->Ry:I
+    sget v4, Lcom/facebook/imagepipeline/animated/a/b$b;->Ru: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;->Qh:Lcom/facebook/imagepipeline/animated/a/a;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/animated/c/d;->Qd: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;->Rt:I
+    iget v2, v1, Lcom/facebook/imagepipeline/animated/a/b;->Rp:I
 
-    sget v3, Lcom/facebook/imagepipeline/animated/a/b$b;->Rz:I
+    sget v3, Lcom/facebook/imagepipeline/animated/a/b$b;->Rv:I
 
     if-eq v2, v3, :cond_2
 
-    iget v3, v1, Lcom/facebook/imagepipeline/animated/a/b;->Rs:I
+    iget v3, v1, Lcom/facebook/imagepipeline/animated/a/b;->Ro:I
 
-    sget v4, Lcom/facebook/imagepipeline/animated/a/b$a;->Rv:I
+    sget v4, Lcom/facebook/imagepipeline/animated/a/b$a;->Rr: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;->Qh:Lcom/facebook/imagepipeline/animated/a/a;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/animated/c/d;->Qd: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;->Ry:I
+    sget v3, Lcom/facebook/imagepipeline/animated/a/b$b;->Ru: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;->Qh:Lcom/facebook/imagepipeline/animated/a/a;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/animated/c/d;->Qd: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;->Rs:I
+    iget v1, p2, Lcom/facebook/imagepipeline/animated/a/b;->Ro:I
 
-    sget v2, Lcom/facebook/imagepipeline/animated/a/b$a;->Rv:I
+    sget v2, Lcom/facebook/imagepipeline/animated/a/b$a;->Rr: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;->Qh:Lcom/facebook/imagepipeline/animated/a/a;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/animated/c/d;->Qd: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 1b4c59ad9a..8f75bfd6ba 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 IB:Lcom/facebook/common/references/CloseableReference$a;
+.field public final Ix: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;->IB:Lcom/facebook/common/references/CloseableReference$a;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/a;->Ix: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;->IB:Lcom/facebook/common/references/CloseableReference$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/a;->Ix: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 0137eaa7b4..5e6f5e6239 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 TV:Ljava/util/concurrent/Executor;
+.field private final TR:Ljava/util/concurrent/Executor;
 
-.field private final TW:Ljava/util/concurrent/Executor;
+.field private final TS:Ljava/util/concurrent/Executor;
 
-.field private final TX:Ljava/util/concurrent/Executor;
+.field private final TT: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;->TV:Ljava/util/concurrent/Executor;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/b;->TR: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;->TW:Ljava/util/concurrent/Executor;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/b;->TS:Ljava/util/concurrent/Executor;
 
     new-instance v0, Lcom/facebook/imagepipeline/b/l;
 
@@ -72,17 +72,33 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/b/b;->TX:Ljava/util/concurrent/Executor;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/b/b;->TT:Ljava/util/concurrent/Executor;
 
     return-void
 .end method
 
 
 # virtual methods
+.method public final iD()Ljava/util/concurrent/Executor;
+    .locals 1
+
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/b;->TR: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;->TR: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;->TV:Ljava/util/concurrent/Executor;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/b;->TS:Ljava/util/concurrent/Executor;
 
     return-object v0
 .end method
@@ -90,7 +106,7 @@
 .method public final iG()Ljava/util/concurrent/Executor;
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/b;->TV:Ljava/util/concurrent/Executor;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/b;->mBackgroundExecutor:Ljava/util/concurrent/Executor;
 
     return-object v0
 .end method
@@ -98,23 +114,7 @@
 .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;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/b;->TT: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 a4e47d08a7..b4cc5605ec 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 TY:Lcom/facebook/imagepipeline/b/d;
+.field private TU: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;->TY:Lcom/facebook/imagepipeline/b/d;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/b/c;->TU: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;->TY:Lcom/facebook/imagepipeline/b/d;
+    iget-object v2, v0, Lcom/facebook/imagepipeline/b/c;->TU: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;->Hc:J
+    iget-wide v11, v1, Lcom/facebook/cache/disk/DiskCacheConfig;->GY:J
 
-    iget-wide v13, v1, Lcom/facebook/cache/disk/DiskCacheConfig;->Hb:J
+    iget-wide v13, v1, Lcom/facebook/cache/disk/DiskCacheConfig;->GX:J
 
-    iget-wide v5, v1, Lcom/facebook/cache/disk/DiskCacheConfig;->Ha:J
+    iget-wide v5, v1, Lcom/facebook/cache/disk/DiskCacheConfig;->GW: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;->Hd:Lcom/facebook/cache/disk/g;
+    iget-object v5, v1, Lcom/facebook/cache/disk/DiskCacheConfig;->GZ:Lcom/facebook/cache/disk/g;
 
-    iget-object v7, v1, Lcom/facebook/cache/disk/DiskCacheConfig;->He:Lcom/facebook/cache/common/b;
+    iget-object v7, v1, Lcom/facebook/cache/disk/DiskCacheConfig;->Ha:Lcom/facebook/cache/common/b;
 
-    iget-object v8, v1, Lcom/facebook/cache/disk/DiskCacheConfig;->GN:Lcom/facebook/cache/common/a;
+    iget-object v8, v1, Lcom/facebook/cache/disk/DiskCacheConfig;->GJ:Lcom/facebook/cache/common/a;
 
-    iget-boolean v10, v1, Lcom/facebook/cache/disk/DiskCacheConfig;->Hg:Z
+    iget-boolean v10, v1, Lcom/facebook/cache/disk/DiskCacheConfig;->Hc: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 78a22754fe..e5b4b90e6d 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;->GZ:Lcom/facebook/common/d/l;
+    iget-object v2, p1, Lcom/facebook/cache/disk/DiskCacheConfig;->GV:Lcom/facebook/common/d/l;
 
-    iget-object v3, p1, Lcom/facebook/cache/disk/DiskCacheConfig;->GY:Ljava/lang/String;
+    iget-object v3, p1, Lcom/facebook/cache/disk/DiskCacheConfig;->GU:Ljava/lang/String;
 
-    iget-object p1, p1, Lcom/facebook/cache/disk/DiskCacheConfig;->GN:Lcom/facebook/cache/common/a;
+    iget-object p1, p1, Lcom/facebook/cache/disk/DiskCacheConfig;->GJ: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 0f7ccf4e08..3142d36fab 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/b/f.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/b/f.smali
@@ -4,6 +4,12 @@
 
 
 # virtual methods
+.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
 
@@ -12,9 +18,3 @@
 
 .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 ace04bc4b7..fd7fee2e04 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 Un:Lcom/facebook/imagepipeline/b/h;
+.field final synthetic Uj: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;->Un:Lcom/facebook/imagepipeline/b/h;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/b/h$1;->Uj: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 fd38dc237e..1d3ecbf630 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 UK:Lcom/facebook/imagepipeline/b/i;
+.field final synthetic UG: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;->UK:Lcom/facebook/imagepipeline/b/i;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/b/i$1;->UG: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 a04a17bff8..7e939b2c89 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 UO:Z
+.field public UK:Z
 
 
 # direct methods
@@ -26,7 +26,7 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/i$b;->UO:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/i$b;->UK: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 9848dae391..2f543598bc 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,29 +15,37 @@
 
 
 # instance fields
-.field public QA:Z
+.field public Qw:Z
+
+.field UL:Z
+
+.field UM:Lcom/facebook/common/k/b$a;
+
+.field UN:Z
+
+.field UO:Lcom/facebook/common/k/b;
 
 .field UQ:Z
 
-.field UR:Lcom/facebook/common/k/b$a;
+.field UR:Z
 
-.field US:Z
+.field US:I
 
-.field UT:Lcom/facebook/common/k/b;
+.field UT:I
 
-.field UU:Z
+.field public UU:Z
 
-.field UV:Z
+.field UV:I
 
-.field UW:I
+.field UW:Z
 
-.field UX:I
+.field UX:Z
 
-.field public UY:Z
+.field UY:Lcom/facebook/imagepipeline/b/j$c;
 
-.field UZ:I
+.field public UZ:Z
 
-.field public Ul:Lcom/facebook/common/d/l;
+.field public Uh:Lcom/facebook/common/d/l;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/d/l<",
@@ -47,15 +55,7 @@
     .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;
+.field public final Va:Lcom/facebook/imagepipeline/b/i$a;
 
 
 # direct methods
@@ -66,29 +66,29 @@
 
     const/4 v0, 0x0
 
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/j$a;->UL:Z
+
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/j$a;->UN: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-boolean v0, p0, Lcom/facebook/imagepipeline/b/j$a;->UR:Z
+
+    iput v0, p0, Lcom/facebook/imagepipeline/b/j$a;->US:I
+
+    iput v0, p0, Lcom/facebook/imagepipeline/b/j$a;->UT:I
 
     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 v1, p0, Lcom/facebook/imagepipeline/b/j$a;->UV:I
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/j$a;->Va:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/j$a;->UW:Z
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/j$a;->Vb:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/j$a;->UX:Z
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/b/j$a;->Ve:Lcom/facebook/imagepipeline/b/i$a;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/b/j$a;->Va: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 d2252494fc..cd813fbaf6 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/b/j.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/b/j.smali
@@ -14,29 +14,37 @@
 
 
 # instance fields
-.field final QA:Z
+.field final Qw:Z
+
+.field final UL:Z
+
+.field final UM:Lcom/facebook/common/k/b$a;
+
+.field final UN:Z
+
+.field final UO:Lcom/facebook/common/k/b;
 
 .field final UQ:Z
 
-.field final UR:Lcom/facebook/common/k/b$a;
+.field final UR:Z
 
-.field final US:Z
+.field final US:I
 
-.field final UT:Lcom/facebook/common/k/b;
+.field final UT:I
 
-.field final UU:Z
+.field UU:Z
 
-.field final UV:Z
+.field final UV:I
 
-.field final UW:I
+.field final UW:Z
 
-.field final UX:I
+.field final UX:Z
 
-.field UY:Z
+.field final UY:Lcom/facebook/imagepipeline/b/j$c;
 
-.field final UZ:I
+.field final UZ:Z
 
-.field final Ul:Lcom/facebook/common/d/l;
+.field final Uh:Lcom/facebook/common/d/l;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/d/l<",
@@ -46,14 +54,6 @@
     .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;->UL:Z
+
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/j;->UL:Z
+
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/j$a;->UM:Lcom/facebook/common/k/b$a;
+
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/j;->UM:Lcom/facebook/common/k/b$a;
+
+    iget-boolean v0, p1, Lcom/facebook/imagepipeline/b/j$a;->UN:Z
+
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/j;->UN:Z
+
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/j$a;->UO:Lcom/facebook/common/k/b;
+
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/j;->UO:Lcom/facebook/common/k/b;
+
     iget-boolean v0, p1, Lcom/facebook/imagepipeline/b/j$a;->UQ:Z
 
     iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/j;->UQ:Z
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/j$a;->UR:Lcom/facebook/common/k/b$a;
+    iget-boolean v0, p1, Lcom/facebook/imagepipeline/b/j$a;->UR:Z
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/j;->UR:Lcom/facebook/common/k/b$a;
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/j;->UR:Z
 
-    iget-boolean v0, p1, Lcom/facebook/imagepipeline/b/j$a;->US:Z
+    iget v0, p1, Lcom/facebook/imagepipeline/b/j$a;->US:I
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/j;->US:Z
+    iput v0, p0, Lcom/facebook/imagepipeline/b/j;->US:I
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/j$a;->UT:Lcom/facebook/common/k/b;
+    iget v0, p1, Lcom/facebook/imagepipeline/b/j$a;->UT:I
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/j;->UT:Lcom/facebook/common/k/b;
+    iput v0, p0, Lcom/facebook/imagepipeline/b/j;->UT:I
 
     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
+    iget v0, p1, Lcom/facebook/imagepipeline/b/j$a;->UV:I
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/j;->UV:Z
+    iput v0, p0, Lcom/facebook/imagepipeline/b/j;->UV:I
 
-    iget v0, p1, Lcom/facebook/imagepipeline/b/j$a;->UW:I
+    iget-boolean v0, p1, Lcom/facebook/imagepipeline/b/j$a;->UW:Z
 
-    iput v0, p0, Lcom/facebook/imagepipeline/b/j;->UW:I
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/j;->UW:Z
 
-    iget v0, p1, Lcom/facebook/imagepipeline/b/j$a;->UX:I
+    iget-boolean v0, p1, Lcom/facebook/imagepipeline/b/j$a;->UX:Z
 
-    iput v0, p0, Lcom/facebook/imagepipeline/b/j;->UX:I
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/j;->UX:Z
 
-    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;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/j$a;->UY: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;->Vc:Lcom/facebook/imagepipeline/b/j$c;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/j;->UY:Lcom/facebook/imagepipeline/b/j$c;
 
     goto :goto_0
 
     :cond_0
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/j$a;->Vc:Lcom/facebook/imagepipeline/b/j$c;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/j$a;->UY:Lcom/facebook/imagepipeline/b/j$c;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/j;->Vc:Lcom/facebook/imagepipeline/b/j$c;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/j;->UY:Lcom/facebook/imagepipeline/b/j$c;
 
     :goto_0
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/j$a;->Ul:Lcom/facebook/common/d/l;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/j$a;->Uh:Lcom/facebook/common/d/l;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/j;->Ul:Lcom/facebook/common/d/l;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/j;->Uh:Lcom/facebook/common/d/l;
 
-    iget-boolean v0, p1, Lcom/facebook/imagepipeline/b/j$a;->Vd:Z
+    iget-boolean v0, p1, Lcom/facebook/imagepipeline/b/j$a;->UZ:Z
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/j;->Vd:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/j;->UZ:Z
 
-    iget-boolean p1, p1, Lcom/facebook/imagepipeline/b/j$a;->QA:Z
+    iget-boolean p1, p1, Lcom/facebook/imagepipeline/b/j$a;->Qw:Z
 
-    iput-boolean p1, p0, Lcom/facebook/imagepipeline/b/j;->QA:Z
+    iput-boolean p1, p0, Lcom/facebook/imagepipeline/b/j;->Qw: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 b3aa910c7c..1422bed05c 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 Vt:Lcom/facebook/imagepipeline/b/l;
+.field final synthetic Vp:Lcom/facebook/imagepipeline/b/l;
 
-.field final synthetic ry:Ljava/lang/Runnable;
+.field final synthetic rz: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;->Vt:Lcom/facebook/imagepipeline/b/l;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/b/l$1;->Vp:Lcom/facebook/imagepipeline/b/l;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/b/l$1;->ry:Ljava/lang/Runnable;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/b/l$1;->rz: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;->Vt:Lcom/facebook/imagepipeline/b/l;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/l$1;->Vp: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;->ry:Ljava/lang/Runnable;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/l$1;->rz: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 77225e5324..3ff4a1575c 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 Vq:I
+.field private final Vm:I
 
-.field private final Vr:Z
+.field private final Vn:Z
 
-.field private final Vs:Ljava/util/concurrent/atomic/AtomicInteger;
+.field private final Vo: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;->Vs:Ljava/util/concurrent/atomic/AtomicInteger;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/l;->Vo:Ljava/util/concurrent/atomic/AtomicInteger;
 
     const/16 v0, 0xa
 
-    iput v0, p0, Lcom/facebook/imagepipeline/b/l;->Vq:I
+    iput v0, p0, Lcom/facebook/imagepipeline/b/l;->Vm:I
 
     iput-object p1, p0, Lcom/facebook/imagepipeline/b/l;->mPrefix:Ljava/lang/String;
 
-    iput-boolean v1, p0, Lcom/facebook/imagepipeline/b/l;->Vr:Z
+    iput-boolean v1, p0, Lcom/facebook/imagepipeline/b/l;->Vn: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;->Vq:I
+    iget p0, p0, Lcom/facebook/imagepipeline/b/l;->Vm: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;->Vr:Z
+    iget-boolean p1, p0, Lcom/facebook/imagepipeline/b/l;->Vn: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;->Vs:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/l;->Vo: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 92ed139a94..11173c8177 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/b/m.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/b/m.smali
@@ -4,31 +4,17 @@
 
 
 # instance fields
-.field final Iy:Lcom/facebook/common/g/a;
+.field final Iu:Lcom/facebook/common/g/a;
 
-.field final PN:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+.field final PJ:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
 
-.field final Qy:Lcom/facebook/imagepipeline/b/f;
+.field final Qu:Lcom/facebook/imagepipeline/b/f;
 
-.field private final Si:Lcom/facebook/imagepipeline/b/a;
+.field private final Se:Lcom/facebook/imagepipeline/b/a;
 
-.field final Sl:Lcom/facebook/common/g/g;
+.field final Sh:Lcom/facebook/common/g/g;
 
-.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;
+.field final TZ:Lcom/facebook/imagepipeline/cache/o;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/cache/o<",
@@ -39,7 +25,17 @@
     .end annotation
 .end field
 
-.field private final Ue:Lcom/facebook/imagepipeline/cache/o;
+.field private final UN:Z
+
+.field final US:I
+
+.field final UT:I
+
+.field UU:Z
+
+.field private final UV:I
+
+.field private final Ua:Lcom/facebook/imagepipeline/cache/o;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/cache/o<",
@@ -50,19 +46,23 @@
     .end annotation
 .end field
 
-.field private final Ug:Lcom/facebook/imagepipeline/cache/e;
+.field private final Uc:Lcom/facebook/imagepipeline/cache/e;
 
-.field final Uh:Lcom/facebook/imagepipeline/cache/f;
+.field final Ud:Lcom/facebook/imagepipeline/cache/f;
 
-.field private final Uq:Z
+.field private final Um:Z
 
-.field private final Ut:Lcom/facebook/imagepipeline/e/c;
+.field private final Up:Lcom/facebook/imagepipeline/e/c;
 
-.field Vu:Landroid/content/ContentResolver;
+.field private final Uy:Lcom/facebook/imagepipeline/e/e;
 
-.field Vv:Landroid/content/res/AssetManager;
+.field private final Uz:Z
 
-.field private final Vw:Lcom/facebook/imagepipeline/cache/e;
+.field Vq:Landroid/content/ContentResolver;
+
+.field Vr:Landroid/content/res/AssetManager;
+
+.field private final Vs: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;->Vu:Landroid/content/ContentResolver;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/b/m;->Vq: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;->Vv:Landroid/content/res/AssetManager;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/b/m;->Vr:Landroid/content/res/AssetManager;
 
     move-object v1, p2
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/b/m;->Iy:Lcom/facebook/common/g/a;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/b/m;->Iu:Lcom/facebook/common/g/a;
 
     move-object v1, p3
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/b/m;->Ut:Lcom/facebook/imagepipeline/e/c;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/b/m;->Up:Lcom/facebook/imagepipeline/e/c;
 
     move-object v1, p4
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/b/m;->UC:Lcom/facebook/imagepipeline/e/e;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/b/m;->Uy:Lcom/facebook/imagepipeline/e/e;
 
     move v1, p5
 
-    iput-boolean v1, v0, Lcom/facebook/imagepipeline/b/m;->Uq:Z
+    iput-boolean v1, v0, Lcom/facebook/imagepipeline/b/m;->Um:Z
 
     move v1, p6
 
-    iput-boolean v1, v0, Lcom/facebook/imagepipeline/b/m;->UD:Z
+    iput-boolean v1, v0, Lcom/facebook/imagepipeline/b/m;->Uz:Z
 
     move v1, p7
 
-    iput-boolean v1, v0, Lcom/facebook/imagepipeline/b/m;->US:Z
+    iput-boolean v1, v0, Lcom/facebook/imagepipeline/b/m;->UN:Z
 
     move-object v1, p8
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/b/m;->Qy:Lcom/facebook/imagepipeline/b/f;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/b/m;->Qu:Lcom/facebook/imagepipeline/b/f;
 
     move-object v1, p9
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/b/m;->Sl:Lcom/facebook/common/g/g;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/b/m;->Sh:Lcom/facebook/common/g/g;
 
     move-object v1, p10
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/b/m;->Ud:Lcom/facebook/imagepipeline/cache/o;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/b/m;->TZ:Lcom/facebook/imagepipeline/cache/o;
 
     move-object v1, p11
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/b/m;->Ue:Lcom/facebook/imagepipeline/cache/o;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/b/m;->Ua:Lcom/facebook/imagepipeline/cache/o;
 
     move-object v1, p12
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/b/m;->Vw:Lcom/facebook/imagepipeline/cache/e;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/b/m;->Vs:Lcom/facebook/imagepipeline/cache/e;
 
     move-object v1, p13
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/b/m;->Ug:Lcom/facebook/imagepipeline/cache/e;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/b/m;->Uc:Lcom/facebook/imagepipeline/cache/e;
 
     move-object/from16 v1, p14
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/b/m;->Uh:Lcom/facebook/imagepipeline/cache/f;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/b/m;->Ud:Lcom/facebook/imagepipeline/cache/f;
 
     move-object/from16 v1, p15
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/b/m;->PN:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/b/m;->PJ:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
 
     move/from16 v1, p16
 
-    iput v1, v0, Lcom/facebook/imagepipeline/b/m;->UW:I
+    iput v1, v0, Lcom/facebook/imagepipeline/b/m;->US:I
 
     move/from16 v1, p17
 
-    iput v1, v0, Lcom/facebook/imagepipeline/b/m;->UX:I
+    iput v1, v0, Lcom/facebook/imagepipeline/b/m;->UT:I
 
     move/from16 v1, p18
 
-    iput-boolean v1, v0, Lcom/facebook/imagepipeline/b/m;->UY:Z
+    iput-boolean v1, v0, Lcom/facebook/imagepipeline/b/m;->UU:Z
 
     move/from16 v1, p19
 
-    iput v1, v0, Lcom/facebook/imagepipeline/b/m;->UZ:I
+    iput v1, v0, Lcom/facebook/imagepipeline/b/m;->UV:I
 
     move-object/from16 v1, p20
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/b/m;->Si:Lcom/facebook/imagepipeline/b/a;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/b/m;->Se: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;->Qy:Lcom/facebook/imagepipeline/b/f;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->Qu:Lcom/facebook/imagepipeline/b/f;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/b/f;->iI()Ljava/util/concurrent/Executor;
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/b/f;->iG()Ljava/util/concurrent/Executor;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/b/m;->Sl:Lcom/facebook/common/g/g;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/b/m;->Sh: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;->Ud:Lcom/facebook/imagepipeline/cache/o;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/m;->TZ:Lcom/facebook/imagepipeline/cache/o;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/b/m;->Uh:Lcom/facebook/imagepipeline/cache/f;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/b/m;->Ud: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;->Uh:Lcom/facebook/imagepipeline/cache/f;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/m;->Ud: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;->Ud:Lcom/facebook/imagepipeline/cache/o;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/m;->TZ:Lcom/facebook/imagepipeline/cache/o;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/b/m;->Uh:Lcom/facebook/imagepipeline/cache/f;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/b/m;->Ud: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;->Iy:Lcom/facebook/common/g/a;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/m;->Iu:Lcom/facebook/common/g/a;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->Qy:Lcom/facebook/imagepipeline/b/f;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->Qu:Lcom/facebook/imagepipeline/b/f;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/b/f;->iH()Ljava/util/concurrent/Executor;
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/b/f;->iF()Ljava/util/concurrent/Executor;
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/b/m;->Ut:Lcom/facebook/imagepipeline/e/c;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/b/m;->Up:Lcom/facebook/imagepipeline/e/c;
 
-    iget-object v4, p0, Lcom/facebook/imagepipeline/b/m;->UC:Lcom/facebook/imagepipeline/e/e;
+    iget-object v4, p0, Lcom/facebook/imagepipeline/b/m;->Uy:Lcom/facebook/imagepipeline/e/e;
 
-    iget-boolean v5, p0, Lcom/facebook/imagepipeline/b/m;->Uq:Z
+    iget-boolean v5, p0, Lcom/facebook/imagepipeline/b/m;->Um:Z
 
-    iget-boolean v6, p0, Lcom/facebook/imagepipeline/b/m;->UD:Z
+    iget-boolean v6, p0, Lcom/facebook/imagepipeline/b/m;->Uz:Z
 
-    iget-boolean v7, p0, Lcom/facebook/imagepipeline/b/m;->US:Z
+    iget-boolean v7, p0, Lcom/facebook/imagepipeline/b/m;->UN:Z
 
-    iget v9, p0, Lcom/facebook/imagepipeline/b/m;->UZ:I
+    iget v9, p0, Lcom/facebook/imagepipeline/b/m;->UV:I
 
-    iget-object v10, p0, Lcom/facebook/imagepipeline/b/m;->Si:Lcom/facebook/imagepipeline/b/a;
+    iget-object v10, p0, Lcom/facebook/imagepipeline/b/m;->Se: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;->Vw:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/m;->Vs:Lcom/facebook/imagepipeline/cache/e;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/b/m;->Ug:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/b/m;->Uc:Lcom/facebook/imagepipeline/cache/e;
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/b/m;->Uh:Lcom/facebook/imagepipeline/cache/f;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/b/m;->Ud: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;->Vw:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/m;->Vs:Lcom/facebook/imagepipeline/cache/e;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/b/m;->Ug:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/b/m;->Uc:Lcom/facebook/imagepipeline/cache/e;
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/b/m;->Uh:Lcom/facebook/imagepipeline/cache/f;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/b/m;->Ud: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;->Vw:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/m;->Vs:Lcom/facebook/imagepipeline/cache/e;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/b/m;->Uh:Lcom/facebook/imagepipeline/cache/f;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/b/m;->Ud:Lcom/facebook/imagepipeline/cache/f;
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/b/m;->Sl:Lcom/facebook/common/g/g;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/b/m;->Sh:Lcom/facebook/common/g/g;
 
-    iget-object v4, p0, Lcom/facebook/imagepipeline/b/m;->Iy:Lcom/facebook/common/g/a;
+    iget-object v4, p0, Lcom/facebook/imagepipeline/b/m;->Iu: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;->Uh:Lcom/facebook/imagepipeline/cache/f;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/m;->Ud: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 iZ()Lcom/facebook/imagepipeline/i/y;
+.method public final iX()Lcom/facebook/imagepipeline/i/y;
     .locals 4
 
     new-instance v0, Lcom/facebook/imagepipeline/i/y;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/m;->Qy:Lcom/facebook/imagepipeline/b/f;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/m;->Qu: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;->iD()Ljava/util/concurrent/Executor;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/b/m;->Sl:Lcom/facebook/common/g/g;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/b/m;->Sh:Lcom/facebook/common/g/g;
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/b/m;->Vu:Landroid/content/ContentResolver;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/b/m;->Vq: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;->Ue:Lcom/facebook/imagepipeline/cache/o;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/m;->Ua:Lcom/facebook/imagepipeline/cache/o;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/b/m;->Uh:Lcom/facebook/imagepipeline/cache/f;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/b/m;->Ud: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;->Qy:Lcom/facebook/imagepipeline/b/f;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/m;->Qu:Lcom/facebook/imagepipeline/b/f;
 
-    invoke-interface {v1}, Lcom/facebook/imagepipeline/b/f;->iJ()Ljava/util/concurrent/Executor;
+    invoke-interface {v1}, Lcom/facebook/imagepipeline/b/f;->iH()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;->Qy:Lcom/facebook/imagepipeline/b/f;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/m;->Qu:Lcom/facebook/imagepipeline/b/f;
 
-    invoke-interface {v1}, Lcom/facebook/imagepipeline/b/f;->iI()Ljava/util/concurrent/Executor;
+    invoke-interface {v1}, Lcom/facebook/imagepipeline/b/f;->iG()Ljava/util/concurrent/Executor;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/b/m;->Sl:Lcom/facebook/common/g/g;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/b/m;->Sh: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 d0f44e6dbb..636d1df38a 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/b/n.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/b/n.smali
@@ -6,19 +6,21 @@
 # instance fields
 .field private final UD:Z
 
-.field private final UH:Z
+.field private final UL:Z
 
-.field private final UQ:Z
+.field final UR:Z
 
-.field final UV:Z
+.field private final UX:Z
 
-.field private final Ui:Lcom/facebook/imagepipeline/i/as;
+.field private final Ue:Lcom/facebook/imagepipeline/i/as;
 
-.field private final Uq:Z
+.field private final Um:Z
 
-.field private final Uu:Lcom/facebook/imagepipeline/k/d;
+.field private final Uq:Lcom/facebook/imagepipeline/k/d;
 
-.field private final Uz:Lcom/facebook/imagepipeline/i/af;
+.field private final Uv:Lcom/facebook/imagepipeline/i/af;
+
+.field private final Uz:Z
 
 .field VA:Lcom/facebook/imagepipeline/i/aj;
     .annotation system Ldalvik/annotation/Signature;
@@ -42,51 +44,7 @@
     .end annotation
 .end field
 
-.field VC: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 VD: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 VE: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 VF: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 VG:Ljava/util/Map;
+.field VC:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -102,7 +60,7 @@
     .end annotation
 .end field
 
-.field VH:Ljava/util/Map;
+.field VD:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -117,7 +75,7 @@
     .end annotation
 .end field
 
-.field VI:Ljava/util/Map;
+.field VE:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -133,11 +91,52 @@
     .end annotation
 .end field
 
-.field private final Vb:Z
+.field private final Vi:Lcom/facebook/imagepipeline/b/m;
 
-.field private final Vm:Lcom/facebook/imagepipeline/b/m;
+.field private final Vq:Landroid/content/ContentResolver;
 
-.field private final Vu:Landroid/content/ContentResolver;
+.field Vt: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 Vu: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 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:Lcom/facebook/imagepipeline/i/aj;
     .annotation system Ldalvik/annotation/Signature;
@@ -150,12 +149,13 @@
     .end annotation
 .end field
 
-.field private Vy:Lcom/facebook/imagepipeline/i/aj;
+.field Vy:Lcom/facebook/imagepipeline/i/aj;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/i/aj<",
-            "Lcom/facebook/imagepipeline/g/e;",
-            ">;"
+            "Lcom/facebook/common/references/CloseableReference<",
+            "Lcom/facebook/imagepipeline/g/c;",
+            ">;>;"
         }
     .end annotation
 .end field
@@ -178,45 +178,45 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/b/n;->Vu:Landroid/content/ContentResolver;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/b/n;->Vq:Landroid/content/ContentResolver;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/b/n;->Vm:Lcom/facebook/imagepipeline/b/m;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/b/n;->Vi:Lcom/facebook/imagepipeline/b/m;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/b/n;->Uz:Lcom/facebook/imagepipeline/i/af;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/b/n;->Uv:Lcom/facebook/imagepipeline/i/af;
 
-    iput-boolean p4, p0, Lcom/facebook/imagepipeline/b/n;->UD:Z
+    iput-boolean p4, p0, Lcom/facebook/imagepipeline/b/n;->Uz:Z
 
-    iput-boolean p5, p0, Lcom/facebook/imagepipeline/b/n;->UQ:Z
+    iput-boolean p5, p0, Lcom/facebook/imagepipeline/b/n;->UL:Z
 
     new-instance p1, Ljava/util/HashMap;
 
     invoke-direct {p1}, Ljava/util/HashMap;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/b/n;->VG:Ljava/util/Map;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/b/n;->VC: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;->VH:Ljava/util/Map;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/b/n;->VD: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;->VI:Ljava/util/Map;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/b/n;->VE:Ljava/util/Map;
 
-    iput-object p6, p0, Lcom/facebook/imagepipeline/b/n;->Ui:Lcom/facebook/imagepipeline/i/as;
+    iput-object p6, p0, Lcom/facebook/imagepipeline/b/n;->Ue:Lcom/facebook/imagepipeline/i/as;
 
-    iput-boolean p7, p0, Lcom/facebook/imagepipeline/b/n;->Uq:Z
+    iput-boolean p7, p0, Lcom/facebook/imagepipeline/b/n;->Um:Z
 
-    iput-boolean p8, p0, Lcom/facebook/imagepipeline/b/n;->UV:Z
+    iput-boolean p8, p0, Lcom/facebook/imagepipeline/b/n;->UR:Z
 
-    iput-boolean p9, p0, Lcom/facebook/imagepipeline/b/n;->Vb:Z
+    iput-boolean p9, p0, Lcom/facebook/imagepipeline/b/n;->UX:Z
 
-    iput-boolean p10, p0, Lcom/facebook/imagepipeline/b/n;->UH:Z
+    iput-boolean p10, p0, Lcom/facebook/imagepipeline/b/n;->UD:Z
 
-    iput-object p11, p0, Lcom/facebook/imagepipeline/b/n;->Uu:Lcom/facebook/imagepipeline/k/d;
+    iput-object p11, p0, Lcom/facebook/imagepipeline/b/n;->Uq: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;->Vm:Lcom/facebook/imagepipeline/b/m;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vi:Lcom/facebook/imagepipeline/b/m;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/n;->Uu:Lcom/facebook/imagepipeline/k/d;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/n;->Uq: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;->Vm:Lcom/facebook/imagepipeline/b/m;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vi: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;->Vm:Lcom/facebook/imagepipeline/b/m;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vi:Lcom/facebook/imagepipeline/b/m;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/n;->Uu:Lcom/facebook/imagepipeline/k/d;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/n;->Uq:Lcom/facebook/imagepipeline/k/d;
 
     const/4 v2, 0x1
 
@@ -333,7 +333,7 @@
     return-object p1
 .end method
 
-.method private declared-synchronized ja()Lcom/facebook/imagepipeline/i/aj;
+.method private declared-synchronized iY()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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vx:Lcom/facebook/imagepipeline/i/aj;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vt:Lcom/facebook/imagepipeline/i/aj;
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/n;->jb()Lcom/facebook/imagepipeline/i/aj;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/n;->iZ()Lcom/facebook/imagepipeline/i/aj;
 
     move-result-object v0
 
@@ -364,14 +364,163 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vx:Lcom/facebook/imagepipeline/i/aj;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vt:Lcom/facebook/imagepipeline/i/aj;
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     :cond_0
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vx:Lcom/facebook/imagepipeline/i/aj;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vt: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 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;->kG()Z
+
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vu:Lcom/facebook/imagepipeline/i/aj;
+
+    if-nez v0, :cond_1
+
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
+
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vi:Lcom/facebook/imagepipeline/b/m;
+
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/n;->Uv:Lcom/facebook/imagepipeline/i/af;
+
+    new-instance v2, Lcom/facebook/imagepipeline/i/ae;
+
+    iget-object v3, v0, Lcom/facebook/imagepipeline/b/m;->Sh:Lcom/facebook/common/g/g;
+
+    iget-object v0, v0, Lcom/facebook/imagepipeline/b/m;->Iu: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;->Vu:Lcom/facebook/imagepipeline/i/aj;
+
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vi:Lcom/facebook/imagepipeline/b/m;
+
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/n;->Vu:Lcom/facebook/imagepipeline/i/aj;
+
+    iget-boolean v2, p0, Lcom/facebook/imagepipeline/b/n;->Uz:Z
+
+    if-eqz v2, :cond_0
+
+    iget-boolean v2, p0, Lcom/facebook/imagepipeline/b/n;->Um: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;->Uq: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;->Vu:Lcom/facebook/imagepipeline/i/aj;
+
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
+
+    :cond_1
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
+
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vu: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;->Vv:Lcom/facebook/imagepipeline/i/aj;
+
+    if-nez v0, :cond_0
+
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vi:Lcom/facebook/imagepipeline/b/m;
+
+    new-instance v1, Lcom/facebook/imagepipeline/i/aa;
+
+    iget-object v2, v0, Lcom/facebook/imagepipeline/b/m;->Qu:Lcom/facebook/imagepipeline/b/f;
+
+    invoke-interface {v2}, Lcom/facebook/imagepipeline/b/f;->iD()Ljava/util/concurrent/Executor;
+
+    move-result-object v2
+
+    iget-object v0, v0, Lcom/facebook/imagepipeline/b/m;->Sh: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;->Vv:Lcom/facebook/imagepipeline/i/aj;
+
+    :cond_0
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vv:Lcom/facebook/imagepipeline/i/aj;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -388,83 +537,46 @@
 .end method
 
 .method private declared-synchronized jb()Lcom/facebook/imagepipeline/i/aj;
-    .locals 4
+    .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
             "Lcom/facebook/imagepipeline/i/aj<",
-            "Lcom/facebook/imagepipeline/g/e;",
-            ">;"
+            "Lcom/facebook/common/references/CloseableReference<",
+            "Lcom/facebook/imagepipeline/g/c;",
+            ">;>;"
         }
     .end annotation
 
     monitor-enter p0
 
     :try_start_0
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vw:Lcom/facebook/imagepipeline/i/aj;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vy:Lcom/facebook/imagepipeline/i/aj;
+    if-nez v0, :cond_0
 
-    if-nez v0, :cond_1
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vi:Lcom/facebook/imagepipeline/b/m;
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    new-instance v1, Lcom/facebook/imagepipeline/i/ac;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vm:Lcom/facebook/imagepipeline/b/m;
+    iget-object v2, v0, Lcom/facebook/imagepipeline/b/m;->Qu:Lcom/facebook/imagepipeline/b/f;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/n;->Uz:Lcom/facebook/imagepipeline/i/af;
+    invoke-interface {v2}, Lcom/facebook/imagepipeline/b/f;->iD()Ljava/util/concurrent/Executor;
 
-    new-instance v2, Lcom/facebook/imagepipeline/i/ae;
+    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;->Vq:Landroid/content/ContentResolver;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/b/m;->Iy:Lcom/facebook/common/g/a;
+    invoke-direct {v1, v2, v0}, Lcom/facebook/imagepipeline/i/ac;-><init>(Ljava/util/concurrent/Executor;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
-
-    invoke-direct {p0, v2}, Lcom/facebook/imagepipeline/b/n;->o(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
 
-    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
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vw:Lcom/facebook/imagepipeline/i/aj;
 
     :cond_0
-    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;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vw:Lcom/facebook/imagepipeline/i/aj;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -481,7 +593,7 @@
 .end method
 
 .method private declared-synchronized jc()Lcom/facebook/imagepipeline/i/aj;
-    .locals 3
+    .locals 7
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
@@ -495,32 +607,68 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vz: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
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vm:Lcom/facebook/imagepipeline/b/m;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vi:Lcom/facebook/imagepipeline/b/m;
 
-    new-instance v1, Lcom/facebook/imagepipeline/i/aa;
+    new-instance v1, Lcom/facebook/imagepipeline/i/w;
 
-    iget-object v2, v0, Lcom/facebook/imagepipeline/b/m;->Qy:Lcom/facebook/imagepipeline/b/f;
+    iget-object v2, v0, Lcom/facebook/imagepipeline/b/m;->Qu:Lcom/facebook/imagepipeline/b/f;
 
-    invoke-interface {v2}, Lcom/facebook/imagepipeline/b/f;->iF()Ljava/util/concurrent/Executor;
+    invoke-interface {v2}, Lcom/facebook/imagepipeline/b/f;->iD()Ljava/util/concurrent/Executor;
 
     move-result-object v2
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/b/m;->Sl:Lcom/facebook/common/g/g;
+    iget-object v3, v0, Lcom/facebook/imagepipeline/b/m;->Sh: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
+    iget-object v0, v0, Lcom/facebook/imagepipeline/b/m;->Vq:Landroid/content/ContentResolver;
 
-    invoke-direct {p0, v1}, Lcom/facebook/imagepipeline/b/n;->m(Lcom/facebook/imagepipeline/i/aj;)Lcom/facebook/imagepipeline/i/aj;
+    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
+
+    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;->Vi:Lcom/facebook/imagepipeline/b/m;
+
+    new-instance v4, Lcom/facebook/imagepipeline/i/x;
+
+    iget-object v5, v3, Lcom/facebook/imagepipeline/b/m;->Qu:Lcom/facebook/imagepipeline/b/f;
+
+    invoke-interface {v5}, Lcom/facebook/imagepipeline/b/f;->iD()Ljava/util/concurrent/Executor;
+
+    move-result-object v5
+
+    iget-object v6, v3, Lcom/facebook/imagepipeline/b/m;->Sh:Lcom/facebook/common/g/g;
+
+    iget-object v3, v3, Lcom/facebook/imagepipeline/b/m;->Vq: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;->Vi:Lcom/facebook/imagepipeline/b/m;
+
+    invoke-virtual {v3}, Lcom/facebook/imagepipeline/b/m;->iX()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;->Vz:Lcom/facebook/imagepipeline/i/aj;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vx:Lcom/facebook/imagepipeline/i/aj;
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vz: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
 
@@ -537,7 +685,7 @@
 .end method
 
 .method private declared-synchronized jd()Lcom/facebook/imagepipeline/i/aj;
-    .locals 3
+    .locals 4
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
@@ -551,32 +699,34 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->VA: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;->Vm:Lcom/facebook/imagepipeline/b/m;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vi:Lcom/facebook/imagepipeline/b/m;
 
-    new-instance v1, Lcom/facebook/imagepipeline/i/ac;
+    new-instance v1, Lcom/facebook/imagepipeline/i/an;
 
-    iget-object v2, v0, Lcom/facebook/imagepipeline/b/m;->Qy:Lcom/facebook/imagepipeline/b/f;
+    iget-object v2, v0, Lcom/facebook/imagepipeline/b/m;->Qu:Lcom/facebook/imagepipeline/b/f;
 
-    invoke-interface {v2}, Lcom/facebook/imagepipeline/b/f;->iF()Ljava/util/concurrent/Executor;
+    invoke-interface {v2}, Lcom/facebook/imagepipeline/b/f;->iD()Ljava/util/concurrent/Executor;
 
     move-result-object v2
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/b/m;->Vu:Landroid/content/ContentResolver;
+    iget-object v3, v0, Lcom/facebook/imagepipeline/b/m;->Sh:Lcom/facebook/common/g/g;
 
-    invoke-direct {v1, v2, v0}, Lcom/facebook/imagepipeline/i/ac;-><init>(Ljava/util/concurrent/Executor;Landroid/content/ContentResolver;)V
+    iget-object v0, v0, Lcom/facebook/imagepipeline/b/m;->Vq:Landroid/content/ContentResolver;
 
-    invoke-direct {p0, v1}, Lcom/facebook/imagepipeline/b/n;->q(Lcom/facebook/imagepipeline/i/aj;)Lcom/facebook/imagepipeline/i/aj;
+    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;->VA: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;->VA: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
 
@@ -593,7 +743,7 @@
 .end method
 
 .method private declared-synchronized je()Lcom/facebook/imagepipeline/i/aj;
-    .locals 7
+    .locals 4
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
@@ -607,68 +757,34 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->VB:Lcom/facebook/imagepipeline/i/aj;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vy: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;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vi:Lcom/facebook/imagepipeline/b/m;
 
-    new-instance v1, Lcom/facebook/imagepipeline/i/w;
+    new-instance v1, Lcom/facebook/imagepipeline/i/ab;
 
-    iget-object v2, v0, Lcom/facebook/imagepipeline/b/m;->Qy:Lcom/facebook/imagepipeline/b/f;
+    iget-object v2, v0, Lcom/facebook/imagepipeline/b/m;->Qu:Lcom/facebook/imagepipeline/b/f;
 
-    invoke-interface {v2}, Lcom/facebook/imagepipeline/b/f;->iF()Ljava/util/concurrent/Executor;
+    invoke-interface {v2}, Lcom/facebook/imagepipeline/b/f;->iD()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 v3, v0, Lcom/facebook/imagepipeline/b/m;->Sh: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, v3, v0}, Lcom/facebook/imagepipeline/i/w;-><init>(Ljava/util/concurrent/Executor;Lcom/facebook/common/g/g;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
 
-    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;
+    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;->VB:Lcom/facebook/imagepipeline/i/aj;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vy:Lcom/facebook/imagepipeline/i/aj;
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->VB:Lcom/facebook/imagepipeline/i/aj;
+    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
 
@@ -699,34 +815,34 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->VF: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;->Vm:Lcom/facebook/imagepipeline/b/m;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vi:Lcom/facebook/imagepipeline/b/m;
 
-    new-instance v1, Lcom/facebook/imagepipeline/i/an;
+    new-instance v1, Lcom/facebook/imagepipeline/i/v;
 
-    iget-object v2, v0, Lcom/facebook/imagepipeline/b/m;->Qy:Lcom/facebook/imagepipeline/b/f;
+    iget-object v2, v0, Lcom/facebook/imagepipeline/b/m;->Qu:Lcom/facebook/imagepipeline/b/f;
 
-    invoke-interface {v2}, Lcom/facebook/imagepipeline/b/f;->iF()Ljava/util/concurrent/Executor;
+    invoke-interface {v2}, Lcom/facebook/imagepipeline/b/f;->iD()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 v3, v0, Lcom/facebook/imagepipeline/b/m;->Sh: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;->Vr:Landroid/content/res/AssetManager;
 
-    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, 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;->VF: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;->VF: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
 
@@ -757,148 +873,32 @@
     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;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->VA:Lcom/facebook/imagepipeline/i/aj;
 
     if-nez v0, :cond_2
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vm:Lcom/facebook/imagepipeline/b/m;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vi:Lcom/facebook/imagepipeline/b/m;
 
     new-instance v1, Lcom/facebook/imagepipeline/i/l;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/b/m;->Sl:Lcom/facebook/common/g/g;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/b/m;->Sh: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;->Jj:Z
+    sget-boolean v0, Lcom/facebook/common/k/c;->Jf:Z
 
     if-eqz v0, :cond_1
 
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/b/n;->UQ:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/b/n;->UL:Z
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lcom/facebook/common/k/c;->Jm:Lcom/facebook/common/k/b;
+    sget-object v0, Lcom/facebook/common/k/c;->Ji:Lcom/facebook/common/k/b;
 
     if-nez v0, :cond_1
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vm:Lcom/facebook/imagepipeline/b/m;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vi: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;->Vm:Lcom/facebook/imagepipeline/b/m;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/n;->Vi:Lcom/facebook/imagepipeline/b/m;
 
     const/4 v2, 0x1
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/b/n;->Uu:Lcom/facebook/imagepipeline/k/d;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/b/n;->Uq: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;->VE:Lcom/facebook/imagepipeline/i/aj;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/n;->VA:Lcom/facebook/imagepipeline/i/aj;
 
     :cond_2
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->VE: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
 
@@ -961,9 +961,9 @@
 
     new-array v0, v0, [Lcom/facebook/imagepipeline/i/av;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/n;->Vm:Lcom/facebook/imagepipeline/b/m;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/n;->Vi:Lcom/facebook/imagepipeline/b/m;
 
-    invoke-virtual {v1}, Lcom/facebook/imagepipeline/b/m;->iZ()Lcom/facebook/imagepipeline/i/y;
+    invoke-virtual {v1}, Lcom/facebook/imagepipeline/b/m;->iX()Lcom/facebook/imagepipeline/i/y;
 
     move-result-object v1
 
@@ -993,9 +993,9 @@
         }
     .end annotation
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vm:Lcom/facebook/imagepipeline/b/m;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vi: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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     return-object p1
 .end method
@@ -1024,27 +1024,27 @@
         }
     .end annotation
 
-    sget-boolean v0, Lcom/facebook/common/k/c;->Jj:Z
+    sget-boolean v0, Lcom/facebook/common/k/c;->Jf:Z
 
     if-eqz v0, :cond_1
 
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/b/n;->UQ:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/b/n;->UL:Z
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lcom/facebook/common/k/c;->Jm:Lcom/facebook/common/k/b;
+    sget-object v0, Lcom/facebook/common/k/c;->Ji:Lcom/facebook/common/k/b;
 
     if-nez v0, :cond_1
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vm:Lcom/facebook/imagepipeline/b/m;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vi: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;->UH:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/b/n;->UD: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;->Vm:Lcom/facebook/imagepipeline/b/m;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vi: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;->Vm:Lcom/facebook/imagepipeline/b/m;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vi: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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/b/n;->Vb:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/b/n;->UX:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vm:Lcom/facebook/imagepipeline/b/m;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vi: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;->Vm:Lcom/facebook/imagepipeline/b/m;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vi: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;->Vm:Lcom/facebook/imagepipeline/b/m;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vi: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;->Vm:Lcom/facebook/imagepipeline/b/m;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vi: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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     return-object p1
 .end method
@@ -1137,25 +1137,25 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vm:Lcom/facebook/imagepipeline/b/m;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vi: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;->Vm:Lcom/facebook/imagepipeline/b/m;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vi: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;->Ui:Lcom/facebook/imagepipeline/i/as;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Ue: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;->Vm:Lcom/facebook/imagepipeline/b/m;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vi: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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()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;->aaf:Landroid/net/Uri;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/request/b;->aab: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;->aag:I
+    iget p1, p1, Lcom/facebook/imagepipeline/request/b;->aac:I
 
     if-eqz p1, :cond_2
 
@@ -1249,55 +1249,55 @@
     throw p1
 
     :pswitch_0
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/n;->jf()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_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     return-object p1
 
     :pswitch_1
     :try_start_1
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/n;->ji()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_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     return-object p1
 
     :pswitch_2
     :try_start_2
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/n;->jg()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_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     return-object p1
 
     :pswitch_3
     :try_start_3
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/n;->jh()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_3
     .catchall {:try_start_3 .. :try_end_3} :catchall_0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     return-object p1
 
     :pswitch_4
     :try_start_4
-    iget-object p1, p0, Lcom/facebook/imagepipeline/b/n;->Vu:Landroid/content/ContentResolver;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/b/n;->Vq: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;->jd()Lcom/facebook/imagepipeline/i/aj;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/n;->jb()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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     return-object p1
 
     :cond_1
     :try_start_5
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/n;->je()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_5
     .catchall {:try_start_5 .. :try_end_5} :catchall_0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     return-object p1
 
     :pswitch_5
     :try_start_6
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/n;->jc()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_6
     .catchall {:try_start_6 .. :try_end_6} :catchall_0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     return-object p1
 
     :pswitch_6
     :try_start_7
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/n;->jd()Lcom/facebook/imagepipeline/i/aj;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/n;->jb()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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     return-object p1
 
     :cond_2
     :try_start_8
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/n;->ja()Lcom/facebook/imagepipeline/i/aj;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/n;->iY()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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     return-object p1
 
     :catchall_0
     move-exception p1
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     throw p1
 
@@ -1407,7 +1407,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->VG:Ljava/util/Map;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->VC: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;->Vm:Lcom/facebook/imagepipeline/b/m;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vi:Lcom/facebook/imagepipeline/b/m;
 
     new-instance v1, Lcom/facebook/imagepipeline/i/ai;
 
-    iget-object v2, v0, Lcom/facebook/imagepipeline/b/m;->PN:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+    iget-object v2, v0, Lcom/facebook/imagepipeline/b/m;->PJ:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/b/m;->Qy:Lcom/facebook/imagepipeline/b/f;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/b/m;->Qu:Lcom/facebook/imagepipeline/b/f;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/b/f;->iI()Ljava/util/concurrent/Executor;
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/b/f;->iG()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;->Vm:Lcom/facebook/imagepipeline/b/m;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vi:Lcom/facebook/imagepipeline/b/m;
 
     new-instance v2, Lcom/facebook/imagepipeline/i/ah;
 
-    iget-object v3, v0, Lcom/facebook/imagepipeline/b/m;->Ud:Lcom/facebook/imagepipeline/cache/o;
+    iget-object v3, v0, Lcom/facebook/imagepipeline/b/m;->TZ:Lcom/facebook/imagepipeline/cache/o;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/b/m;->Uh:Lcom/facebook/imagepipeline/cache/f;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/b/m;->Ud: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;->VG:Ljava/util/Map;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->VC: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;->VG:Ljava/util/Map;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->VC: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;->VI:Ljava/util/Map;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->VE: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;->Vm:Lcom/facebook/imagepipeline/b/m;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vi:Lcom/facebook/imagepipeline/b/m;
 
     new-instance v1, Lcom/facebook/imagepipeline/i/i;
 
-    iget v2, v0, Lcom/facebook/imagepipeline/b/m;->UW:I
+    iget v2, v0, Lcom/facebook/imagepipeline/b/m;->US:I
 
-    iget v3, v0, Lcom/facebook/imagepipeline/b/m;->UX:I
+    iget v3, v0, Lcom/facebook/imagepipeline/b/m;->UT:I
 
-    iget-boolean v0, v0, Lcom/facebook/imagepipeline/b/m;->UY:Z
+    iget-boolean v0, v0, Lcom/facebook/imagepipeline/b/m;->UU: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;->VI:Ljava/util/Map;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->VE: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 2963e599b8..b6901dc8c3 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 Sh:Lcom/facebook/imagepipeline/memory/d;
+.field private final Sd:Lcom/facebook/imagepipeline/memory/d;
 
-.field private final Si:Lcom/facebook/imagepipeline/b/a;
+.field private final Se: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;->Sh:Lcom/facebook/imagepipeline/memory/d;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/bitmaps/a;->Sd:Lcom/facebook/imagepipeline/memory/d;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/bitmaps/a;->Si:Lcom/facebook/imagepipeline/b/a;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/bitmaps/a;->Se: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;->Sh:Lcom/facebook/imagepipeline/memory/d;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/bitmaps/a;->Sd: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;->Si:Lcom/facebook/imagepipeline/b/a;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/bitmaps/a;->Se:Lcom/facebook/imagepipeline/b/a;
 
-    iget-object p2, p0, Lcom/facebook/imagepipeline/bitmaps/a;->Sh:Lcom/facebook/imagepipeline/memory/d;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/bitmaps/a;->Sd: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 024818533f..cd58139abd 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 Sj:[B
+.field private static final Sf:[B
 
-.field private static final Sk:[B
+.field private static final Sg:[B
 
 
 # instance fields
-.field private final Sl:Lcom/facebook/common/g/g;
+.field private final Sh: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;->Sj:[B
+    sput-object v0, Lcom/facebook/imagepipeline/bitmaps/b;->Sf:[B
 
     const/16 v0, 0x1cf
 
@@ -31,7 +31,7 @@
 
     fill-array-data v0, :array_1
 
-    sput-object v0, Lcom/facebook/imagepipeline/bitmaps/b;->Sk:[B
+    sput-object v0, Lcom/facebook/imagepipeline/bitmaps/b;->Sg:[B
 
     return-void
 
@@ -590,7 +590,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/bitmaps/b;->Sl:Lcom/facebook/common/g/g;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/bitmaps/b;->Sh: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;->Sl:Lcom/facebook/common/g/g;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/bitmaps/b;->Sh:Lcom/facebook/common/g/g;
 
-    sget-object v2, Lcom/facebook/imagepipeline/bitmaps/b;->Sj:[B
+    sget-object v2, Lcom/facebook/imagepipeline/bitmaps/b;->Sf:[B
 
     array-length v2, v2
 
-    sget-object v3, Lcom/facebook/imagepipeline/bitmaps/b;->Sk:[B
+    sget-object v3, Lcom/facebook/imagepipeline/bitmaps/b;->Sg:[B
 
     array-length v3, v3
 
@@ -629,7 +629,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/facebook/imagepipeline/bitmaps/b;->Sj:[B
+    sget-object v1, Lcom/facebook/imagepipeline/bitmaps/b;->Sf:[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;->Sk:[B
+    sget-object p1, Lcom/facebook/imagepipeline/bitmaps/b;->Sg:[B
 
     invoke-virtual {v0, p1}, Lcom/facebook/common/g/i;->write([B)V
 
-    invoke-virtual {v0}, Lcom/facebook/common/g/i;->gq()Lcom/facebook/common/g/f;
+    invoke-virtual {v0}, Lcom/facebook/common/g/i;->go()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 b1cfbf864b..31a9b67449 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;->io()Lcom/facebook/imagepipeline/bitmaps/g;
+    invoke-static {}, Lcom/facebook/imagepipeline/bitmaps/g;->im()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 9fcee80edc..5be0d1346a 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 Sm:Lcom/facebook/imagepipeline/bitmaps/b;
+.field private final Si:Lcom/facebook/imagepipeline/bitmaps/b;
 
-.field private final Sn:Lcom/facebook/imagepipeline/memory/o;
+.field private final Sj: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;->jS()Lcom/facebook/imagepipeline/memory/o;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/memory/ad;->jQ()Lcom/facebook/imagepipeline/memory/o;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/bitmaps/d;->Sn:Lcom/facebook/imagepipeline/memory/o;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/bitmaps/d;->Sj: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;->Sm:Lcom/facebook/imagepipeline/bitmaps/b;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/bitmaps/d;->Si: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;->Sm:Lcom/facebook/imagepipeline/bitmaps/b;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/bitmaps/d;->Si: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;->QY:Lcom/facebook/e/c;
+    sget-object v1, Lcom/facebook/e/b;->QU:Lcom/facebook/e/c;
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/g/e;->Wf:Lcom/facebook/e/c;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/g/e;->Wb:Lcom/facebook/e/c;
 
-    iget v1, v0, Lcom/facebook/imagepipeline/g/e;->Wg:I
+    iget v1, v0, Lcom/facebook/imagepipeline/g/e;->Wc: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;->Sn:Lcom/facebook/imagepipeline/memory/o;
+    iget-object v4, p0, Lcom/facebook/imagepipeline/bitmaps/d;->Sj: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 f5e93aec35..77521b0475 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 Si:Lcom/facebook/imagepipeline/b/a;
+.field private final Se:Lcom/facebook/imagepipeline/b/a;
 
-.field private final Sm:Lcom/facebook/imagepipeline/bitmaps/b;
+.field private final Si:Lcom/facebook/imagepipeline/bitmaps/b;
 
-.field private final So:Lcom/facebook/imagepipeline/platform/f;
+.field private final Sk:Lcom/facebook/imagepipeline/platform/f;
 
-.field private Sp:Z
+.field private Sl: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;->Sm:Lcom/facebook/imagepipeline/bitmaps/b;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/bitmaps/e;->Si:Lcom/facebook/imagepipeline/bitmaps/b;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/bitmaps/e;->So:Lcom/facebook/imagepipeline/platform/f;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/bitmaps/e;->Sk:Lcom/facebook/imagepipeline/platform/f;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/bitmaps/e;->Si:Lcom/facebook/imagepipeline/b/a;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/bitmaps/e;->Se:Lcom/facebook/imagepipeline/b/a;
 
     return-void
 .end method
@@ -59,13 +59,13 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/bitmaps/e;->Si:Lcom/facebook/imagepipeline/b/a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/bitmaps/e;->Se: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;->io()Lcom/facebook/imagepipeline/bitmaps/g;
+    invoke-static {}, Lcom/facebook/imagepipeline/bitmaps/g;->im()Lcom/facebook/imagepipeline/bitmaps/g;
 
     move-result-object p2
 
@@ -91,7 +91,7 @@
         }
     .end annotation
 
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/bitmaps/e;->Sp:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/bitmaps/e;->Sl:Z
 
     if-eqz v0, :cond_0
 
@@ -102,7 +102,7 @@
     return-object p1
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/bitmaps/e;->Sm:Lcom/facebook/imagepipeline/bitmaps/b;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/bitmaps/e;->Si: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;->QY:Lcom/facebook/e/c;
+    sget-object v2, Lcom/facebook/e/b;->QU:Lcom/facebook/e/c;
 
-    iput-object v2, v1, Lcom/facebook/imagepipeline/g/e;->Wf:Lcom/facebook/e/c;
+    iput-object v2, v1, Lcom/facebook/imagepipeline/g/e;->Wb: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;->So:Lcom/facebook/imagepipeline/platform/f;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/bitmaps/e;->Sk: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;->Sp:Z
+    iput-boolean v4, p0, Lcom/facebook/imagepipeline/bitmaps/e;->Sl: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 4e0457b7cb..be04948a3b 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;->jQ()Lcom/facebook/imagepipeline/memory/d;
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/memory/ad;->jO()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 6d85205d28..f926b450a8 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 Sq:Lcom/facebook/imagepipeline/bitmaps/g;
+.field private static Sm:Lcom/facebook/imagepipeline/bitmaps/g;
 
 
 # direct methods
@@ -30,10 +30,10 @@
     return-void
 .end method
 
-.method public static io()Lcom/facebook/imagepipeline/bitmaps/g;
+.method public static im()Lcom/facebook/imagepipeline/bitmaps/g;
     .locals 1
 
-    sget-object v0, Lcom/facebook/imagepipeline/bitmaps/g;->Sq:Lcom/facebook/imagepipeline/bitmaps/g;
+    sget-object v0, Lcom/facebook/imagepipeline/bitmaps/g;->Sm: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;->Sq:Lcom/facebook/imagepipeline/bitmaps/g;
+    sput-object v0, Lcom/facebook/imagepipeline/bitmaps/g;->Sm:Lcom/facebook/imagepipeline/bitmaps/g;
 
     :cond_0
-    sget-object v0, Lcom/facebook/imagepipeline/bitmaps/g;->Sq:Lcom/facebook/imagepipeline/bitmaps/g;
+    sget-object v0, Lcom/facebook/imagepipeline/bitmaps/g;->Sm: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 b96ab97598..c98efe1df4 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 Tc:I
+
+.field public final Td:I
+
+.field public final Te:I
+
+.field public final Tf:I
+
 .field public final Tg:I
 
-.field public final Th:I
-
-.field public final Ti:I
-
-.field public final Tj:I
-
-.field public final Tk:I
-
-.field public final Tl:J
+.field public final Th:J
 
 
 # direct methods
@@ -51,17 +51,17 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput p1, p0, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->Tg:I
+    iput p1, p0, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->Tc:I
 
-    iput p2, p0, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->Th:I
+    iput p2, p0, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->Td:I
 
-    iput p3, p0, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->Ti:I
+    iput p3, p0, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->Te:I
 
-    iput p4, p0, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->Tj:I
+    iput p4, p0, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->Tf:I
 
-    iput p5, p0, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->Tk:I
+    iput p5, p0, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->Tg:I
 
-    iput-wide p6, p0, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->Tl:J
+    iput-wide p6, p0, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->Th: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 7f88df6593..c4bbf19c88 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;->fI()I
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/c;->fG()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 6d87f2616d..bd8a49e7bc 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 Sr:Lcom/facebook/imagepipeline/cache/m;
+.field final synthetic Sn: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;->Sr:Lcom/facebook/imagepipeline/cache/m;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/cache/b$1;->Sn: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 27e31caf94..ef4ad518f1 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 SH:Lcom/facebook/cache/common/CacheKey;
+.field final synthetic SD:Lcom/facebook/cache/common/CacheKey;
 
-.field final synthetic SI:Lcom/facebook/imagepipeline/cache/e;
+.field final synthetic SE:Lcom/facebook/imagepipeline/cache/e;
 
-.field final synthetic SJ:Lcom/facebook/imagepipeline/g/e;
+.field final synthetic SF: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;->SI:Lcom/facebook/imagepipeline/cache/e;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/cache/e$2;->SE:Lcom/facebook/imagepipeline/cache/e;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/cache/e$2;->SH:Lcom/facebook/cache/common/CacheKey;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/cache/e$2;->SD:Lcom/facebook/cache/common/CacheKey;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/cache/e$2;->SJ:Lcom/facebook/imagepipeline/g/e;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/cache/e$2;->SF: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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/e$2;->SI:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/e$2;->SE:Lcom/facebook/imagepipeline/cache/e;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/e$2;->SH:Lcom/facebook/cache/common/CacheKey;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/e$2;->SD:Lcom/facebook/cache/common/CacheKey;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/cache/e$2;->SJ:Lcom/facebook/imagepipeline/g/e;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/cache/e$2;->SF: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;->SI:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/e$2;->SE: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;->SH:Lcom/facebook/cache/common/CacheKey;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/e$2;->SD:Lcom/facebook/cache/common/CacheKey;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/cache/e$2;->SJ:Lcom/facebook/imagepipeline/g/e;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/cache/e$2;->SF: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;->SJ:Lcom/facebook/imagepipeline/g/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/e$2;->SF: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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     return-void
 
     :catchall_0
     move-exception v0
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/e$2;->SI:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/e$2;->SE: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;->SH:Lcom/facebook/cache/common/CacheKey;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/cache/e$2;->SD:Lcom/facebook/cache/common/CacheKey;
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/cache/e$2;->SJ:Lcom/facebook/imagepipeline/g/e;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/cache/e$2;->SF: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;->SJ:Lcom/facebook/imagepipeline/g/e;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/e$2;->SF: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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()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 2efae2e044..937633159f 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 SH:Lcom/facebook/cache/common/CacheKey;
+.field final synthetic SD:Lcom/facebook/cache/common/CacheKey;
 
-.field final synthetic SI:Lcom/facebook/imagepipeline/cache/e;
+.field final synthetic SE: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;->SI:Lcom/facebook/imagepipeline/cache/e;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/cache/e$3;->SE:Lcom/facebook/imagepipeline/cache/e;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/cache/e$3;->SH:Lcom/facebook/cache/common/CacheKey;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/cache/e$3;->SD: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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/e$3;->SI:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/e$3;->SE: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;->SH:Lcom/facebook/cache/common/CacheKey;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/e$3;->SD: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;->SI:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/e$3;->SE: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;->SH:Lcom/facebook/cache/common/CacheKey;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/e$3;->SD: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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     const/4 v0, 0x0
 
@@ -87,7 +87,7 @@
     :catchall_0
     move-exception v0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()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 906d16b6d8..26af337c0b 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 SI:Lcom/facebook/imagepipeline/cache/e;
+.field final synthetic SE:Lcom/facebook/imagepipeline/cache/e;
 
-.field final synthetic SK:Lcom/facebook/imagepipeline/g/e;
+.field final synthetic SG: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;->SI:Lcom/facebook/imagepipeline/cache/e;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/cache/e$4;->SE:Lcom/facebook/imagepipeline/cache/e;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/cache/e$4;->SK:Lcom/facebook/imagepipeline/g/e;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/cache/e$4;->SG: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;->SI:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/e$4;->SE: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;->SK:Lcom/facebook/imagepipeline/g/e;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/e$4;->SG: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 addee4cc29..9343401d0d 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 SW:Lcom/facebook/imagepipeline/cache/t;
+.field final synthetic SS:Lcom/facebook/imagepipeline/cache/t;
 
-.field final synthetic SX:Lcom/facebook/imagepipeline/cache/h;
+.field final synthetic ST: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;->SX:Lcom/facebook/imagepipeline/cache/h;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/cache/h$1;->ST:Lcom/facebook/imagepipeline/cache/h;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/cache/h$1;->SW:Lcom/facebook/imagepipeline/cache/t;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/cache/h$1;->SS: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;->SW:Lcom/facebook/imagepipeline/cache/t;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h$1;->SS:Lcom/facebook/imagepipeline/cache/t;
 
-    iget-object p1, p1, Lcom/facebook/imagepipeline/cache/h$b;->SZ:Lcom/facebook/common/references/CloseableReference;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/cache/h$b;->SV: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 49a40dc0a7..36a776f941 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 SX:Lcom/facebook/imagepipeline/cache/h;
+.field final synthetic ST:Lcom/facebook/imagepipeline/cache/h;
 
-.field final synthetic SY:Lcom/facebook/imagepipeline/cache/h$b;
+.field final synthetic SU: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;->SX:Lcom/facebook/imagepipeline/cache/h;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/cache/h$2;->ST:Lcom/facebook/imagepipeline/cache/h;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/cache/h$2;->SY:Lcom/facebook/imagepipeline/cache/h$b;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/cache/h$2;->SU: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;->SX:Lcom/facebook/imagepipeline/cache/h;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/cache/h$2;->ST:Lcom/facebook/imagepipeline/cache/h;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h$2;->SY:Lcom/facebook/imagepipeline/cache/h$b;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h$2;->SU: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 9f6d669423..90fd071139 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 Td:Lcom/facebook/imagepipeline/cache/i;
+.field private static SZ:Lcom/facebook/imagepipeline/cache/i;
 
 
 # direct methods
@@ -25,7 +25,7 @@
     return-void
 .end method
 
-.method public static declared-synchronized iv()Lcom/facebook/imagepipeline/cache/i;
+.method public static declared-synchronized it()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;->Td:Lcom/facebook/imagepipeline/cache/i;
+    sget-object v1, Lcom/facebook/imagepipeline/cache/i;->SZ: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;->Td:Lcom/facebook/imagepipeline/cache/i;
+    sput-object v1, Lcom/facebook/imagepipeline/cache/i;->SZ:Lcom/facebook/imagepipeline/cache/i;
 
     :cond_0
-    sget-object v1, Lcom/facebook/imagepipeline/cache/i;->Td:Lcom/facebook/imagepipeline/cache/i;
+    sget-object v1, Lcom/facebook/imagepipeline/cache/i;->SZ: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;->aaf:Landroid/net/Uri;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/request/b;->aab: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;->aaf:Landroid/net/Uri;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/request/b;->aab: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;->St:Lcom/facebook/imagepipeline/a/e;
+    iget-object v2, p1, Lcom/facebook/imagepipeline/request/b;->Sp:Lcom/facebook/imagepipeline/a/e;
 
-    iget-object v3, p1, Lcom/facebook/imagepipeline/request/b;->Su:Lcom/facebook/imagepipeline/a/f;
+    iget-object v3, p1, Lcom/facebook/imagepipeline/request/b;->Sq:Lcom/facebook/imagepipeline/a/f;
 
-    iget-object v4, p1, Lcom/facebook/imagepipeline/request/b;->Sv:Lcom/facebook/imagepipeline/a/b;
+    iget-object v4, p1, Lcom/facebook/imagepipeline/request/b;->Sr: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;->Zz:Lcom/facebook/imagepipeline/request/c;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/request/b;->Zv: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;->aaf:Landroid/net/Uri;
+    iget-object v1, p1, Lcom/facebook/imagepipeline/request/b;->aab: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;->St:Lcom/facebook/imagepipeline/a/e;
+    iget-object v4, p1, Lcom/facebook/imagepipeline/request/b;->Sp:Lcom/facebook/imagepipeline/a/e;
 
-    iget-object v5, p1, Lcom/facebook/imagepipeline/request/b;->Su:Lcom/facebook/imagepipeline/a/f;
+    iget-object v5, p1, Lcom/facebook/imagepipeline/request/b;->Sq:Lcom/facebook/imagepipeline/a/f;
 
-    iget-object v6, p1, Lcom/facebook/imagepipeline/request/b;->Sv:Lcom/facebook/imagepipeline/a/b;
+    iget-object v6, p1, Lcom/facebook/imagepipeline/request/b;->Sr: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 ee0daf46ad..55f8315a1d 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 Sr:Lcom/facebook/imagepipeline/cache/m;
+.field final synthetic Sn: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;->Sr:Lcom/facebook/imagepipeline/cache/m;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/cache/l$1;->Sn: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 ba32c50806..750d1dbf5a 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 Te:Lcom/facebook/imagepipeline/cache/o;
+.field private final Ta: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 Tf:Lcom/facebook/imagepipeline/cache/p;
+.field private final Tb: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;->Te:Lcom/facebook/imagepipeline/cache/o;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/cache/n;->Ta:Lcom/facebook/imagepipeline/cache/o;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/cache/n;->Tf:Lcom/facebook/imagepipeline/cache/p;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/cache/n;->Tb:Lcom/facebook/imagepipeline/cache/p;
 
     return-void
 .end method
@@ -68,7 +68,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/n;->Te:Lcom/facebook/imagepipeline/cache/o;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/n;->Ta: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;->Te:Lcom/facebook/imagepipeline/cache/o;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/n;->Ta: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;->Te:Lcom/facebook/imagepipeline/cache/o;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/n;->Ta: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 dd0755bac7..cc9f8b8a82 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 Tm:Lcom/facebook/imagepipeline/cache/r;
+.field private static Ti:Lcom/facebook/imagepipeline/cache/r;
 
 
 # direct methods
@@ -25,7 +25,7 @@
     return-void
 .end method
 
-.method public static declared-synchronized iw()Lcom/facebook/imagepipeline/cache/r;
+.method public static declared-synchronized iu()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;->Tm:Lcom/facebook/imagepipeline/cache/r;
+    sget-object v1, Lcom/facebook/imagepipeline/cache/r;->Ti: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;->Tm:Lcom/facebook/imagepipeline/cache/r;
+    sput-object v1, Lcom/facebook/imagepipeline/cache/r;->Ti:Lcom/facebook/imagepipeline/cache/r;
 
     :cond_0
-    sget-object v1, Lcom/facebook/imagepipeline/cache/r;->Tm:Lcom/facebook/imagepipeline/cache/r;
+    sget-object v1, Lcom/facebook/imagepipeline/cache/r;->Ti: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 8e189030a6..4834e920cb 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 VP:Lcom/facebook/imagepipeline/e/b;
+.field final synthetic VL: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;->VP:Lcom/facebook/imagepipeline/e/b;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/e/b$1;->VL: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;->jr()Lcom/facebook/e/c;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->jp()Lcom/facebook/e/c;
 
     move-result-object v0
 
-    sget-object v1, Lcom/facebook/e/b;->QY:Lcom/facebook/e/c;
+    sget-object v1, Lcom/facebook/e/b;->QU:Lcom/facebook/e/c;
 
     if-ne v0, v1, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/e/b$1;->VP:Lcom/facebook/imagepipeline/e/b;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/e/b$1;->VL: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;->Ra:Lcom/facebook/e/c;
+    sget-object v1, Lcom/facebook/e/b;->QW:Lcom/facebook/e/c;
 
     if-ne v0, v1, :cond_3
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/e/b$1;->VP:Lcom/facebook/imagepipeline/e/b;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/e/b$1;->VL: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;->Tv:Z
+    iget-boolean v1, p4, Lcom/facebook/imagepipeline/a/b;->Tr:Z
 
     if-nez v1, :cond_1
 
-    iget-object v1, v0, Lcom/facebook/imagepipeline/e/b;->VL:Lcom/facebook/imagepipeline/e/c;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/e/b;->VH:Lcom/facebook/imagepipeline/e/c;
 
     if-eqz v1, :cond_1
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/e/b;->VL:Lcom/facebook/imagepipeline/e/c;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/e/b;->VH: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;->Rh:Lcom/facebook/e/c;
+    sget-object v1, Lcom/facebook/e/b;->Rd:Lcom/facebook/e/c;
 
     if-ne v0, v1, :cond_4
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/e/b$1;->VP:Lcom/facebook/imagepipeline/e/b;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/e/b$1;->VL:Lcom/facebook/imagepipeline/e/b;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/e/b;->VM:Lcom/facebook/imagepipeline/e/c;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/e/b;->VI: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;->Rj:Lcom/facebook/e/c;
+    sget-object p2, Lcom/facebook/e/c;->Rf:Lcom/facebook/e/c;
 
     if-eq v0, p2, :cond_5
 
-    iget-object p2, p0, Lcom/facebook/imagepipeline/e/b$1;->VP:Lcom/facebook/imagepipeline/e/b;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/e/b$1;->VL: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 3f73e3003b..918029710c 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 VQ:Ljava/util/Map;
+.field public final VM:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -15,7 +15,7 @@
     .end annotation
 .end field
 
-.field public final VR:Ljava/util/List;
+.field public final VN: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 5bef2546b7..9ea97e7175 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 Iy:Lcom/facebook/common/g/a;
+.field private final Iu:Lcom/facebook/common/g/a;
 
-.field private VS:I
+.field private VO:I
 
-.field private VT:I
+.field private VP:I
 
-.field private VU:I
+.field private VQ:I
 
-.field private VV:I
+.field private VR:I
 
-.field public VW:I
+.field public VS:I
 
-.field public VX:I
+.field public VT:I
 
-.field public VY:Z
+.field public VU:Z
 
 
 # direct methods
@@ -33,42 +33,42 @@
 
     check-cast p1, Lcom/facebook/common/g/a;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/e/f;->Iy:Lcom/facebook/common/g/a;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/e/f;->Iu:Lcom/facebook/common/g/a;
 
     const/4 p1, 0x0
 
-    iput p1, p0, Lcom/facebook/imagepipeline/e/f;->VU:I
+    iput p1, p0, Lcom/facebook/imagepipeline/e/f;->VQ:I
+
+    iput p1, p0, Lcom/facebook/imagepipeline/e/f;->VP:I
+
+    iput p1, p0, Lcom/facebook/imagepipeline/e/f;->VR:I
 
     iput p1, p0, Lcom/facebook/imagepipeline/e/f;->VT:I
 
-    iput p1, p0, Lcom/facebook/imagepipeline/e/f;->VV:I
-
-    iput p1, p0, Lcom/facebook/imagepipeline/e/f;->VX:I
-
-    iput p1, p0, Lcom/facebook/imagepipeline/e/f;->VW:I
-
     iput p1, p0, Lcom/facebook/imagepipeline/e/f;->VS:I
 
+    iput p1, p0, Lcom/facebook/imagepipeline/e/f;->VO:I
+
     return-void
 .end method
 
 .method private ae(I)V
     .locals 1
 
-    iget v0, p0, Lcom/facebook/imagepipeline/e/f;->VV:I
+    iget v0, p0, Lcom/facebook/imagepipeline/e/f;->VR:I
 
     if-lez v0, :cond_0
 
-    iput p1, p0, Lcom/facebook/imagepipeline/e/f;->VX:I
+    iput p1, p0, Lcom/facebook/imagepipeline/e/f;->VT:I
 
     :cond_0
-    iget p1, p0, Lcom/facebook/imagepipeline/e/f;->VV:I
+    iget p1, p0, Lcom/facebook/imagepipeline/e/f;->VR:I
 
     add-int/lit8 v0, p1, 0x1
 
-    iput v0, p0, Lcom/facebook/imagepipeline/e/f;->VV:I
+    iput v0, p0, Lcom/facebook/imagepipeline/e/f;->VR:I
 
-    iput p1, p0, Lcom/facebook/imagepipeline/e/f;->VW:I
+    iput p1, p0, Lcom/facebook/imagepipeline/e/f;->VS: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;->VW:I
+    iget v0, p0, Lcom/facebook/imagepipeline/e/f;->VS: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;->VS:I
+    iget v4, p0, Lcom/facebook/imagepipeline/e/f;->VO: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;->VU:I
+    iget v5, p0, Lcom/facebook/imagepipeline/e/f;->VQ:I
 
     add-int/2addr v5, v3
 
-    iput v5, p0, Lcom/facebook/imagepipeline/e/f;->VU:I
+    iput v5, p0, Lcom/facebook/imagepipeline/e/f;->VQ:I
 
-    iget-boolean v5, p0, Lcom/facebook/imagepipeline/e/f;->VY:Z
+    iget-boolean v5, p0, Lcom/facebook/imagepipeline/e/f;->VU:Z
 
     if-eqz v5, :cond_0
 
-    iput v2, p0, Lcom/facebook/imagepipeline/e/f;->VS:I
+    iput v2, p0, Lcom/facebook/imagepipeline/e/f;->VO:I
 
-    iput-boolean v1, p0, Lcom/facebook/imagepipeline/e/f;->VY:Z
+    iput-boolean v1, p0, Lcom/facebook/imagepipeline/e/f;->VU:Z
 
     return v1
 
     :cond_0
-    iget v5, p0, Lcom/facebook/imagepipeline/e/f;->VS:I
+    iget v5, p0, Lcom/facebook/imagepipeline/e/f;->VO:I
 
     const/16 v6, 0xff
 
@@ -146,7 +146,7 @@
     goto/16 :goto_2
 
     :cond_1
-    iget v5, p0, Lcom/facebook/imagepipeline/e/f;->VT:I
+    iget v5, p0, Lcom/facebook/imagepipeline/e/f;->VP: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;->VU:I
+    iget v6, p0, Lcom/facebook/imagepipeline/e/f;->VQ:I
 
     add-int/2addr v6, v5
 
-    iput v6, p0, Lcom/facebook/imagepipeline/e/f;->VU:I
+    iput v6, p0, Lcom/facebook/imagepipeline/e/f;->VQ:I
 
-    iput v8, p0, Lcom/facebook/imagepipeline/e/f;->VS:I
+    iput v8, p0, Lcom/facebook/imagepipeline/e/f;->VO:I
 
     goto :goto_2
 
     :cond_2
-    iput v6, p0, Lcom/facebook/imagepipeline/e/f;->VS:I
+    iput v6, p0, Lcom/facebook/imagepipeline/e/f;->VO:I
 
     goto :goto_2
 
     :cond_3
     if-ne v4, v6, :cond_4
 
-    iput v9, p0, Lcom/facebook/imagepipeline/e/f;->VS:I
+    iput v9, p0, Lcom/facebook/imagepipeline/e/f;->VO:I
 
     goto :goto_2
 
     :cond_4
     if-nez v4, :cond_5
 
-    iput v8, p0, Lcom/facebook/imagepipeline/e/f;->VS:I
+    iput v8, p0, Lcom/facebook/imagepipeline/e/f;->VO:I
 
     goto :goto_2
 
@@ -192,15 +192,15 @@
 
     if-ne v4, v5, :cond_6
 
-    iput-boolean v3, p0, Lcom/facebook/imagepipeline/e/f;->VY:Z
+    iput-boolean v3, p0, Lcom/facebook/imagepipeline/e/f;->VU:Z
 
-    iget v5, p0, Lcom/facebook/imagepipeline/e/f;->VU:I
+    iget v5, p0, Lcom/facebook/imagepipeline/e/f;->VQ: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;->VS:I
+    iput v8, p0, Lcom/facebook/imagepipeline/e/f;->VO:I
 
     goto :goto_2
 
@@ -209,7 +209,7 @@
 
     if-ne v4, v6, :cond_7
 
-    iget v6, p0, Lcom/facebook/imagepipeline/e/f;->VU:I
+    iget v6, p0, Lcom/facebook/imagepipeline/e/f;->VQ: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;->VS:I
+    iput v10, p0, Lcom/facebook/imagepipeline/e/f;->VO:I
 
     goto :goto_2
 
     :cond_a
-    iput v8, p0, Lcom/facebook/imagepipeline/e/f;->VS:I
+    iput v8, p0, Lcom/facebook/imagepipeline/e/f;->VO:I
 
     goto :goto_2
 
     :cond_b
     if-ne v4, v6, :cond_10
 
-    iput v9, p0, Lcom/facebook/imagepipeline/e/f;->VS:I
+    iput v9, p0, Lcom/facebook/imagepipeline/e/f;->VO:I
 
     goto :goto_2
 
     :cond_c
     if-ne v4, v7, :cond_d
 
-    iput v8, p0, Lcom/facebook/imagepipeline/e/f;->VS:I
+    iput v8, p0, Lcom/facebook/imagepipeline/e/f;->VO:I
 
     goto :goto_2
 
     :cond_d
-    iput v2, p0, Lcom/facebook/imagepipeline/e/f;->VS:I
+    iput v2, p0, Lcom/facebook/imagepipeline/e/f;->VO:I
 
     goto :goto_2
 
     :cond_e
     if-ne v4, v6, :cond_f
 
-    iput v3, p0, Lcom/facebook/imagepipeline/e/f;->VS:I
+    iput v3, p0, Lcom/facebook/imagepipeline/e/f;->VO:I
 
     goto :goto_2
 
     :cond_f
-    iput v2, p0, Lcom/facebook/imagepipeline/e/f;->VS:I
+    iput v2, p0, Lcom/facebook/imagepipeline/e/f;->VO:I
 
     :cond_10
     :goto_2
-    iput v4, p0, Lcom/facebook/imagepipeline/e/f;->VT:I
+    iput v4, p0, Lcom/facebook/imagepipeline/e/f;->VP: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;->VS:I
+    iget p1, p0, Lcom/facebook/imagepipeline/e/f;->VO:I
 
     if-eq p1, v2, :cond_12
 
-    iget p1, p0, Lcom/facebook/imagepipeline/e/f;->VW:I
+    iget p1, p0, Lcom/facebook/imagepipeline/e/f;->VS: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;->VS:I
+    iget v0, p0, Lcom/facebook/imagepipeline/e/f;->VO:I
 
     const/4 v1, 0x0
 
@@ -327,7 +327,7 @@
 
     move-result v0
 
-    iget v2, p0, Lcom/facebook/imagepipeline/e/f;->VU:I
+    iget v2, p0, Lcom/facebook/imagepipeline/e/f;->VQ:I
 
     if-gt v0, v2, :cond_1
 
@@ -340,7 +340,7 @@
 
     move-result-object p1
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/e/f;->Iy:Lcom/facebook/common/g/a;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/e/f;->Iu: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;->Iy:Lcom/facebook/common/g/a;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/e/f;->Iu: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;->VU:I
+    iget p1, p0, Lcom/facebook/imagepipeline/e/f;->VQ: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 1df6953c32..f0579ea5df 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 jk()Ljava/util/List;
+.method public final ji()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 a4fe34a5ca..bd49c6bb61 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 jk()Ljava/util/List;
+.method public abstract ji()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 c386acbe7b..7b85fa42fe 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 VZ:Lcom/facebook/imagepipeline/e/g$b;
+.field private final VV: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;->VZ:Lcom/facebook/imagepipeline/e/g$b;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/e/g;->VV: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;->VZ:Lcom/facebook/imagepipeline/e/g$b;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/e/g;->VV:Lcom/facebook/imagepipeline/e/g$b;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/e/g$b;->jk()Ljava/util/List;
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/e/g$b;->ji()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 c46a9f4db5..12106927bd 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 Wa:Lcom/facebook/imagepipeline/animated/a/e;
+.field private VW: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;->Wa:Lcom/facebook/imagepipeline/animated/a/e;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/g/a;->VW: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;->Wa:Lcom/facebook/imagepipeline/animated/a/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/g/a;->VW: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;->Wa:Lcom/facebook/imagepipeline/animated/a/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/g/a;->VW:Lcom/facebook/imagepipeline/animated/a/e;
 
     const/4 v1, 0x0
 
-    iput-object v1, p0, Lcom/facebook/imagepipeline/g/a;->Wa:Lcom/facebook/imagepipeline/animated/a/e;
+    iput-object v1, p0, Lcom/facebook/imagepipeline/g/a;->VW: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 fI()I
+.method public final declared-synchronized fG()I
     .locals 1
 
     monitor-enter p0
@@ -82,11 +82,11 @@
 
     :cond_0
     :try_start_1
-    iget-object v0, p0, Lcom/facebook/imagepipeline/g/a;->Wa:Lcom/facebook/imagepipeline/animated/a/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/g/a;->VW:Lcom/facebook/imagepipeline/animated/a/e;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/animated/a/e;->RB:Lcom/facebook/imagepipeline/animated/a/c;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/animated/a/e;->Rx:Lcom/facebook/imagepipeline/animated/a/c;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/animated/a/c;->fI()I
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/animated/a/c;->fG()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;->Wa:Lcom/facebook/imagepipeline/animated/a/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/g/a;->VW:Lcom/facebook/imagepipeline/animated/a/e;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/animated/a/e;->RB:Lcom/facebook/imagepipeline/animated/a/c;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/animated/a/e;->Rx: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;->Wa:Lcom/facebook/imagepipeline/animated/a/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/g/a;->VW:Lcom/facebook/imagepipeline/animated/a/e;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/animated/a/e;->RB:Lcom/facebook/imagepipeline/animated/a/c;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/animated/a/e;->Rx: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;->Wa:Lcom/facebook/imagepipeline/animated/a/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/g/a;->VW: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 jl()Lcom/facebook/imagepipeline/animated/a/e;
+.method public final declared-synchronized jj()Lcom/facebook/imagepipeline/animated/a/e;
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/g/a;->Wa:Lcom/facebook/imagepipeline/animated/a/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/g/a;->VW: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 88809cffc7..5fcd92410a 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 Wj:Lcom/facebook/imagepipeline/g/h;
+.field public static final Wf:Lcom/facebook/imagepipeline/g/h;
 
 
 # instance fields
-.field Wk:I
+.field Wg:I
 
-.field Wl:Z
+.field Wh:Z
 
-.field Wm:Z
+.field Wi:Z
 
 
 # direct methods
@@ -30,7 +30,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/facebook/imagepipeline/g/g;->Wj:Lcom/facebook/imagepipeline/g/h;
+    sput-object v0, Lcom/facebook/imagepipeline/g/g;->Wf: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;->Wk:I
+    iput p1, p0, Lcom/facebook/imagepipeline/g/g;->Wg:I
 
-    iput-boolean p2, p0, Lcom/facebook/imagepipeline/g/g;->Wl:Z
+    iput-boolean p2, p0, Lcom/facebook/imagepipeline/g/g;->Wh:Z
 
-    iput-boolean p3, p0, Lcom/facebook/imagepipeline/g/g;->Wm:Z
+    iput-boolean p3, p0, Lcom/facebook/imagepipeline/g/g;->Wi: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;->Wk:I
+    iget v1, p0, Lcom/facebook/imagepipeline/g/g;->Wg:I
 
-    iget v3, p1, Lcom/facebook/imagepipeline/g/g;->Wk:I
+    iget v3, p1, Lcom/facebook/imagepipeline/g/g;->Wg:I
 
     if-ne v1, v3, :cond_2
 
-    iget-boolean v1, p0, Lcom/facebook/imagepipeline/g/g;->Wl:Z
+    iget-boolean v1, p0, Lcom/facebook/imagepipeline/g/g;->Wh:Z
 
-    iget-boolean v3, p1, Lcom/facebook/imagepipeline/g/g;->Wl:Z
+    iget-boolean v3, p1, Lcom/facebook/imagepipeline/g/g;->Wh:Z
 
     if-ne v1, v3, :cond_2
 
-    iget-boolean v1, p0, Lcom/facebook/imagepipeline/g/g;->Wm:Z
+    iget-boolean v1, p0, Lcom/facebook/imagepipeline/g/g;->Wi:Z
 
-    iget-boolean p1, p1, Lcom/facebook/imagepipeline/g/g;->Wm:Z
+    iget-boolean p1, p1, Lcom/facebook/imagepipeline/g/g;->Wi: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;->Wk:I
+    iget v0, p0, Lcom/facebook/imagepipeline/g/g;->Wg:I
 
-    iget-boolean v1, p0, Lcom/facebook/imagepipeline/g/g;->Wl:Z
+    iget-boolean v1, p0, Lcom/facebook/imagepipeline/g/g;->Wh: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;->Wm:Z
+    iget-boolean v1, p0, Lcom/facebook/imagepipeline/g/g;->Wi:Z
 
     if-eqz v1, :cond_1
 
@@ -139,26 +139,26 @@
     return v0
 .end method
 
-.method public final jA()I
+.method public final jA()Z
     .locals 1
 
-    iget v0, p0, Lcom/facebook/imagepipeline/g/g;->Wk:I
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/g/g;->Wi:Z
 
     return v0
 .end method
 
-.method public final jB()Z
+.method public final jy()I
     .locals 1
 
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/g/g;->Wl:Z
+    iget v0, p0, Lcom/facebook/imagepipeline/g/g;->Wg:I
 
     return v0
 .end method
 
-.method public final jC()Z
+.method public final jz()Z
     .locals 1
 
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/g/g;->Wm:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/g/g;->Wh: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 33d736a1f9..9fe85b5e7e 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 jA()I
+.method public abstract jA()Z
 .end method
 
-.method public abstract jB()Z
+.method public abstract jy()I
 .end method
 
-.method public abstract jC()Z
+.method public abstract jz()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 8c3213c56f..8bc7fc2280 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;->Yp:Lcom/facebook/imagepipeline/i/k;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/n;->Yl: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;->jx()V
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->jv()V
 
     :cond_1
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yp:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yl: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 4560b4c4d6..531cba6234 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 XO:Lcom/facebook/imagepipeline/i/aj;
+.field private final XK: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;->XO:Lcom/facebook/imagepipeline/i/aj;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/a;->XK:Lcom/facebook/imagepipeline/i/aj;
 
     return-void
 .end method
@@ -69,7 +69,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/a;->XO:Lcom/facebook/imagepipeline/i/aj;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/a;->XK: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 df23a8a798..54847b4fec 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;->kG()Ljava/io/File;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/request/b;->kE()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;->kG()Ljava/io/File;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/request/b;->kE()Ljava/io/File;
 
     move-result-object p1
 
@@ -51,7 +51,7 @@
     return-object p1
 .end method
 
-.method protected final kl()Ljava/lang/String;
+.method protected final kj()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 25528b6ada..da5164e88b 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;->aaf:Landroid/net/Uri;
+    iget-object p0, p0, Lcom/facebook/imagepipeline/request/b;->aab: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 kl()Ljava/lang/String;
+.method protected final kj()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 19f5bc6326..4e3a949d5f 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 Zd:Lcom/facebook/imagepipeline/i/aq;
+.field final synthetic YZ:Lcom/facebook/imagepipeline/i/aq;
 
-.field final synthetic Zf:Lcom/facebook/imagepipeline/i/ac;
+.field final synthetic Zb: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;->Zf:Lcom/facebook/imagepipeline/i/ac;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ac$2;->Zb:Lcom/facebook/imagepipeline/i/ac;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/i/ac$2;->Zd:Lcom/facebook/imagepipeline/i/aq;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/ac$2;->YZ:Lcom/facebook/imagepipeline/i/aq;
 
     invoke-direct {p0}, Lcom/facebook/imagepipeline/i/e;-><init>()V
 
@@ -35,10 +35,10 @@
 
 
 # virtual methods
-.method public final kh()V
+.method public final kf()V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ac$2;->Zd:Lcom/facebook/imagepipeline/i/aq;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ac$2;->YZ: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 4129680684..bb16ff8257 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 Zo:Landroid/util/Pair;
+.field final synthetic Zk:Landroid/util/Pair;
 
-.field final synthetic Zp:Lcom/facebook/imagepipeline/i/ad$a;
+.field final synthetic Zl: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;->Zp:Lcom/facebook/imagepipeline/i/ad$a;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ad$a$1;->Zl:Lcom/facebook/imagepipeline/i/ad$a;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/i/ad$a$1;->Zo:Landroid/util/Pair;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/ad$a$1;->Zk:Landroid/util/Pair;
 
     invoke-direct {p0}, Lcom/facebook/imagepipeline/i/e;-><init>()V
 
@@ -35,19 +35,19 @@
 
 
 # virtual methods
-.method public final kh()V
+.method public final kf()V
     .locals 7
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a$1;->Zp:Lcom/facebook/imagepipeline/i/ad$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a$1;->Zl:Lcom/facebook/imagepipeline/i/ad$a;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ad$a$1;->Zp:Lcom/facebook/imagepipeline/i/ad$a;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ad$a$1;->Zl:Lcom/facebook/imagepipeline/i/ad$a;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/i/ad$a;->Zh:Ljava/util/concurrent/CopyOnWriteArraySet;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/i/ad$a;->Zd:Ljava/util/concurrent/CopyOnWriteArraySet;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/i/ad$a$1;->Zo:Landroid/util/Pair;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/i/ad$a$1;->Zk: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;->Zp:Lcom/facebook/imagepipeline/i/ad$a;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/i/ad$a$1;->Zl:Lcom/facebook/imagepipeline/i/ad$a;
 
-    iget-object v3, v3, Lcom/facebook/imagepipeline/i/ad$a;->Zh:Ljava/util/concurrent/CopyOnWriteArraySet;
+    iget-object v3, v3, Lcom/facebook/imagepipeline/i/ad$a;->Zd: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;->Zp:Lcom/facebook/imagepipeline/i/ad$a;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/i/ad$a$1;->Zl:Lcom/facebook/imagepipeline/i/ad$a;
 
-    iget-object v3, v3, Lcom/facebook/imagepipeline/i/ad$a;->Zl:Lcom/facebook/imagepipeline/i/d;
+    iget-object v3, v3, Lcom/facebook/imagepipeline/i/ad$a;->Zh: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;->Zp:Lcom/facebook/imagepipeline/i/ad$a;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/i/ad$a$1;->Zl:Lcom/facebook/imagepipeline/i/ad$a;
 
-    invoke-virtual {v3}, Lcom/facebook/imagepipeline/i/ad$a;->kv()Ljava/util/List;
+    invoke-virtual {v3}, Lcom/facebook/imagepipeline/i/ad$a;->kt()Ljava/util/List;
 
     move-result-object v3
 
-    iget-object v4, p0, Lcom/facebook/imagepipeline/i/ad$a$1;->Zp:Lcom/facebook/imagepipeline/i/ad$a;
+    iget-object v4, p0, Lcom/facebook/imagepipeline/i/ad$a$1;->Zl:Lcom/facebook/imagepipeline/i/ad$a;
 
-    invoke-virtual {v4}, Lcom/facebook/imagepipeline/i/ad$a;->kz()Ljava/util/List;
+    invoke-virtual {v4}, Lcom/facebook/imagepipeline/i/ad$a;->kx()Ljava/util/List;
 
     move-result-object v4
 
-    iget-object v5, p0, Lcom/facebook/imagepipeline/i/ad$a$1;->Zp:Lcom/facebook/imagepipeline/i/ad$a;
+    iget-object v5, p0, Lcom/facebook/imagepipeline/i/ad$a$1;->Zl:Lcom/facebook/imagepipeline/i/ad$a;
 
-    invoke-virtual {v5}, Lcom/facebook/imagepipeline/i/ad$a;->kx()Ljava/util/List;
+    invoke-virtual {v5}, Lcom/facebook/imagepipeline/i/ad$a;->kv()Ljava/util/List;
 
     move-result-object v5
 
@@ -123,7 +123,7 @@
 
     if-eqz v3, :cond_2
 
-    invoke-virtual {v3}, Lcom/facebook/imagepipeline/i/d;->kg()Ljava/util/List;
+    invoke-virtual {v3}, Lcom/facebook/imagepipeline/i/d;->ke()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;->Zo:Landroid/util/Pair;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a$1;->Zk: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;->gg()V
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/k;->ge()V
 
     :cond_3
     return-void
@@ -154,12 +154,12 @@
     throw v1
 .end method
 
-.method public final ki()V
+.method public final kg()V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a$1;->Zp:Lcom/facebook/imagepipeline/i/ad$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a$1;->Zl:Lcom/facebook/imagepipeline/i/ad$a;
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/ad$a;->kv()Ljava/util/List;
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/ad$a;->kt()Ljava/util/List;
 
     move-result-object v0
 
@@ -168,12 +168,12 @@
     return-void
 .end method
 
-.method public final kj()V
+.method public final kh()V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a$1;->Zp:Lcom/facebook/imagepipeline/i/ad$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a$1;->Zl:Lcom/facebook/imagepipeline/i/ad$a;
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/ad$a;->kx()Ljava/util/List;
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/ad$a;->kv()Ljava/util/List;
 
     move-result-object v0
 
@@ -182,12 +182,12 @@
     return-void
 .end method
 
-.method public final kk()V
+.method public final ki()V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a$1;->Zp:Lcom/facebook/imagepipeline/i/ad$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a$1;->Zl:Lcom/facebook/imagepipeline/i/ad$a;
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/ad$a;->kz()Ljava/util/List;
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/ad$a;->kx()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 fc6fac2b7b..936b25afd9 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 Zp:Lcom/facebook/imagepipeline/i/ad$a;
+.field final synthetic Zl: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;->Zp:Lcom/facebook/imagepipeline/i/ad$a;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ad$a$a;->Zl: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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a$a;->Zp:Lcom/facebook/imagepipeline/i/ad$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a$a;->Zl: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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     return-void
 
     :catchall_0
     move-exception p1
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     throw p1
 .end method
@@ -76,16 +76,16 @@
     .locals 4
 
     :try_start_0
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a$a;->Zp:Lcom/facebook/imagepipeline/i/ad$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a$a;->Zl: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;->Zm:Lcom/facebook/imagepipeline/i/ad$a$a;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/i/ad$a;->Zi: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;->Zh:Ljava/util/concurrent/CopyOnWriteArraySet;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/i/ad$a;->Zd: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;->Zh:Ljava/util/concurrent/CopyOnWriteArraySet;
+    iget-object v2, v0, Lcom/facebook/imagepipeline/i/ad$a;->Zd:Ljava/util/concurrent/CopyOnWriteArraySet;
 
     invoke-virtual {v2}, Ljava/util/concurrent/CopyOnWriteArraySet;->clear()V
 
-    iget-object v2, v0, Lcom/facebook/imagepipeline/i/ad$a;->Zn:Lcom/facebook/imagepipeline/i/ad;
+    iget-object v2, v0, Lcom/facebook/imagepipeline/i/ad$a;->Zj: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;->Zi:Ljava/io/Closeable;
+    iget-object v2, v0, Lcom/facebook/imagepipeline/i/ad$a;->Ze: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;->Zi:Ljava/io/Closeable;
+    iput-object v2, v0, Lcom/facebook/imagepipeline/i/ad$a;->Ze:Ljava/io/Closeable;
 
     monitor-exit v0
     :try_end_1
@@ -165,7 +165,7 @@
 
     :cond_1
     :goto_1
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     return-void
 
@@ -185,7 +185,7 @@
     :catchall_2
     move-exception p1
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     goto :goto_3
 
@@ -196,20 +196,20 @@
     goto :goto_2
 .end method
 
-.method protected final jj()V
+.method protected final jh()V
     .locals 3
 
     :try_start_0
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a$a;->Zp:Lcom/facebook/imagepipeline/i/ad$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a$a;->Zl: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;->Zm:Lcom/facebook/imagepipeline/i/ad$a$a;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/i/ad$a;->Zi: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;->Zm:Lcom/facebook/imagepipeline/i/ad$a$a;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/i/ad$a;->Zi:Lcom/facebook/imagepipeline/i/ad$a$a;
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/i/ad$a;->Zl:Lcom/facebook/imagepipeline/i/d;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/i/ad$a;->Zh:Lcom/facebook/imagepipeline/i/d;
 
-    iget-object v2, v0, Lcom/facebook/imagepipeline/i/ad$a;->Zi:Ljava/io/Closeable;
+    iget-object v2, v0, Lcom/facebook/imagepipeline/i/ad$a;->Ze: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;->Zi:Ljava/io/Closeable;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/i/ad$a;->Ze: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;->ku()V
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/ad$a;->ks()V
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_1
 
     :goto_0
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     return-void
 
@@ -260,7 +260,7 @@
     :catchall_1
     move-exception v0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     throw v0
 .end method
@@ -269,16 +269,16 @@
     .locals 3
 
     :try_start_0
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a$a;->Zp:Lcom/facebook/imagepipeline/i/ad$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a$a;->Zl: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;->Zm:Lcom/facebook/imagepipeline/i/ad$a$a;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/i/ad$a;->Zi: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;->Zj:F
+    iput p1, v0, Lcom/facebook/imagepipeline/i/ad$a;->Zf:F
 
-    iget-object v1, v0, Lcom/facebook/imagepipeline/i/ad$a;->Zh:Ljava/util/concurrent/CopyOnWriteArraySet;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/i/ad$a;->Zd: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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     return-void
 
@@ -362,7 +362,7 @@
     :catchall_2
     move-exception p1
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()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 46a5b293ef..46bebc2aea 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 XO:Lcom/facebook/imagepipeline/i/aj;
+.field final XK: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 Zg:Ljava/util/Map;
+.field final Zc: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;->XO:Lcom/facebook/imagepipeline/i/aj;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ad;->XK: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;->Zg:Ljava/util/Map;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ad;->Zc: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;->Zg:Ljava/util/Map;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ad;->Zc: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;->Zg:Ljava/util/Map;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad;->Zc: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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()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;->ku()V
+    invoke-virtual {v2}, Lcom/facebook/imagepipeline/i/ad$a;->ks()V
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_1
 
     :cond_2
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     return-void
 
@@ -233,7 +233,7 @@
     :catchall_1
     move-exception p1
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     goto :goto_1
 
@@ -257,7 +257,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad;->Zg:Ljava/util/Map;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad;->Zc: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;->Zg:Ljava/util/Map;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/i/ad;->Zc: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 7a549c2f2c..1de0e09639 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 Zq:Lcom/facebook/imagepipeline/i/s;
+.field final synthetic Zm:Lcom/facebook/imagepipeline/i/s;
 
-.field final synthetic Zr:Lcom/facebook/imagepipeline/i/ae;
+.field final synthetic Zn: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;->Zr:Lcom/facebook/imagepipeline/i/ae;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ae$1;->Zn:Lcom/facebook/imagepipeline/i/ae;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/i/ae$1;->Zq:Lcom/facebook/imagepipeline/i/s;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/ae$1;->Zm: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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ae$1;->Zr:Lcom/facebook/imagepipeline/i/ae;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ae$1;->Zn:Lcom/facebook/imagepipeline/i/ae;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ae$1;->Zq:Lcom/facebook/imagepipeline/i/s;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ae$1;->Zm:Lcom/facebook/imagepipeline/i/s;
 
-    iget-object v2, v0, Lcom/facebook/imagepipeline/i/ae;->Sl:Lcom/facebook/common/g/g;
+    iget-object v2, v0, Lcom/facebook/imagepipeline/i/ae;->Sh:Lcom/facebook/common/g/g;
 
-    invoke-interface {v2}, Lcom/facebook/common/g/g;->gp()Lcom/facebook/common/g/i;
+    invoke-interface {v2}, Lcom/facebook/common/g/g;->gn()Lcom/facebook/common/g/i;
 
     move-result-object v2
 
-    iget-object v3, v0, Lcom/facebook/imagepipeline/i/ae;->Iy:Lcom/facebook/common/g/a;
+    iget-object v3, v0, Lcom/facebook/imagepipeline/i/ae;->Iu: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;->Yw:Lcom/facebook/imagepipeline/i/ak;
+    iget-object v4, v1, Lcom/facebook/imagepipeline/i/s;->Ys:Lcom/facebook/imagepipeline/i/ak;
 
-    invoke-interface {v4}, Lcom/facebook/imagepipeline/i/ak;->kf()Z
+    invoke-interface {v4}, Lcom/facebook/imagepipeline/i/ak;->kd()Z
 
     move-result v4
 
     if-eqz v4, :cond_1
 
-    iget-wide v8, v1, Lcom/facebook/imagepipeline/i/s;->Yx:J
+    iget-wide v8, v1, Lcom/facebook/imagepipeline/i/s;->Yt:J
 
     sub-long v8, v6, v8
 
@@ -110,9 +110,9 @@
 
     if-ltz v4, :cond_1
 
-    iput-wide v6, v1, Lcom/facebook/imagepipeline/i/s;->Yx:J
+    iput-wide v6, v1, Lcom/facebook/imagepipeline/i/s;->Yt:J
 
-    invoke-virtual {v1}, Lcom/facebook/imagepipeline/i/s;->kb()Lcom/facebook/imagepipeline/i/am;
+    invoke-virtual {v1}, Lcom/facebook/imagepipeline/i/s;->jZ()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;->Yy:I
+    iget v4, v1, Lcom/facebook/imagepipeline/i/s;->Yu:I
 
-    iget-object v5, v1, Lcom/facebook/imagepipeline/i/s;->Yz:Lcom/facebook/imagepipeline/a/a;
+    iget-object v5, v1, Lcom/facebook/imagepipeline/i/s;->Yv:Lcom/facebook/imagepipeline/a/a;
 
-    iget-object v6, v1, Lcom/facebook/imagepipeline/i/s;->Yp:Lcom/facebook/imagepipeline/i/k;
+    iget-object v6, v1, Lcom/facebook/imagepipeline/i/s;->Yl: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;->Yp:Lcom/facebook/imagepipeline/i/k;
+    iget-object v4, v1, Lcom/facebook/imagepipeline/i/s;->Yl: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;->Uz:Lcom/facebook/imagepipeline/i/af;
+    iget-object p1, v0, Lcom/facebook/imagepipeline/i/ae;->Uv: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;->kb()Lcom/facebook/imagepipeline/i/am;
+    invoke-virtual {v1}, Lcom/facebook/imagepipeline/i/s;->jZ()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;->Uz:Lcom/facebook/imagepipeline/i/af;
+    iget-object v4, v0, Lcom/facebook/imagepipeline/i/ae;->Uv: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;->kb()Lcom/facebook/imagepipeline/i/am;
+    invoke-virtual {v1}, Lcom/facebook/imagepipeline/i/s;->jZ()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;->Yy:I
+    iget p1, v1, Lcom/facebook/imagepipeline/i/s;->Yu:I
 
     or-int/2addr p1, v6
 
-    iget-object v4, v1, Lcom/facebook/imagepipeline/i/s;->Yz:Lcom/facebook/imagepipeline/a/a;
+    iget-object v4, v1, Lcom/facebook/imagepipeline/i/s;->Yv:Lcom/facebook/imagepipeline/a/a;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/i/s;->Yp:Lcom/facebook/imagepipeline/i/k;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/i/s;->Yl: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;->Iy:Lcom/facebook/common/g/a;
+    iget-object p1, v0, Lcom/facebook/imagepipeline/i/ae;->Iu: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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     return-void
 
     :catchall_0
     move-exception p1
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/i/ae;->Iy:Lcom/facebook/common/g/a;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/i/ae;->Iu: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 gg()V
+.method public final ge()V
     .locals 5
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ae$1;->Zq:Lcom/facebook/imagepipeline/i/s;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ae$1;->Zm:Lcom/facebook/imagepipeline/i/s;
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/s;->kb()Lcom/facebook/imagepipeline/i/am;
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/s;->jZ()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;->Yp:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/i/s;->Yl:Lcom/facebook/imagepipeline/i/k;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/k;->gg()V
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/k;->ge()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;->Zq:Lcom/facebook/imagepipeline/i/s;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ae$1;->Zm:Lcom/facebook/imagepipeline/i/s;
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/s;->kb()Lcom/facebook/imagepipeline/i/am;
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/s;->jZ()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;->kb()Lcom/facebook/imagepipeline/i/am;
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/s;->jZ()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;->Yp:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/i/s;->Yl: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 d1b57c6545..fa90b443a6 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 gg()V
+.method public abstract ge()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 e5b517d21a..2bd0607609 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 Yl:Lcom/facebook/imagepipeline/i/ak;
+.field final synthetic Yh:Lcom/facebook/imagepipeline/i/ak;
 
-.field final synthetic Yq:Lcom/facebook/imagepipeline/i/am;
+.field final synthetic Ym:Lcom/facebook/imagepipeline/i/am;
 
-.field final synthetic Yr:Ljava/lang/String;
+.field final synthetic Yn:Ljava/lang/String;
 
-.field final synthetic Ys:Lcom/facebook/imagepipeline/i/k;
+.field final synthetic Yo:Lcom/facebook/imagepipeline/i/k;
 
-.field final synthetic Zs:Lcom/facebook/cache/common/CacheKey;
+.field final synthetic Zo:Lcom/facebook/cache/common/CacheKey;
 
-.field final synthetic Zt:Lcom/facebook/imagepipeline/i/ag;
+.field final synthetic Zp: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;->Zt:Lcom/facebook/imagepipeline/i/ag;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ag$1;->Zp:Lcom/facebook/imagepipeline/i/ag;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/i/ag$1;->Yq:Lcom/facebook/imagepipeline/i/am;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/ag$1;->Ym:Lcom/facebook/imagepipeline/i/am;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/i/ag$1;->Yr:Ljava/lang/String;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/i/ag$1;->Yn:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/facebook/imagepipeline/i/ag$1;->Ys:Lcom/facebook/imagepipeline/i/k;
+    iput-object p4, p0, Lcom/facebook/imagepipeline/i/ag$1;->Yo:Lcom/facebook/imagepipeline/i/k;
 
-    iput-object p5, p0, Lcom/facebook/imagepipeline/i/ag$1;->Yl:Lcom/facebook/imagepipeline/i/ak;
+    iput-object p5, p0, Lcom/facebook/imagepipeline/i/ag$1;->Yh:Lcom/facebook/imagepipeline/i/ak;
 
-    iput-object p6, p0, Lcom/facebook/imagepipeline/i/ag$1;->Zs:Lcom/facebook/cache/common/CacheKey;
+    iput-object p6, p0, Lcom/facebook/imagepipeline/i/ag$1;->Zo: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;->Yq:Lcom/facebook/imagepipeline/i/am;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/ag$1;->Ym:Lcom/facebook/imagepipeline/i/am;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ag$1;->Yr:Ljava/lang/String;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ag$1;->Yn: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;->Ys:Lcom/facebook/imagepipeline/i/k;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/ag$1;->Yo:Lcom/facebook/imagepipeline/i/k;
 
-    invoke-interface {p1}, Lcom/facebook/imagepipeline/i/k;->gg()V
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/i/k;->ge()V
 
     goto/16 :goto_4
 
@@ -133,9 +133,9 @@
 
     if-eqz v0, :cond_3
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ag$1;->Yq:Lcom/facebook/imagepipeline/i/am;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ag$1;->Ym:Lcom/facebook/imagepipeline/i/am;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ag$1;->Yr:Ljava/lang/String;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ag$1;->Yn: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;->Zt:Lcom/facebook/imagepipeline/i/ag;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/ag$1;->Zp:Lcom/facebook/imagepipeline/i/ag;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ag$1;->Ys:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ag$1;->Yo:Lcom/facebook/imagepipeline/i/k;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ag$1;->Yl:Lcom/facebook/imagepipeline/i/ak;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ag$1;->Yh:Lcom/facebook/imagepipeline/i/ak;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/i/ag$1;->Zs:Lcom/facebook/cache/common/CacheKey;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/i/ag$1;->Zo: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;->Yq:Lcom/facebook/imagepipeline/i/am;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ag$1;->Ym:Lcom/facebook/imagepipeline/i/am;
 
-    iget-object v5, p0, Lcom/facebook/imagepipeline/i/ag$1;->Yr:Ljava/lang/String;
+    iget-object v5, p0, Lcom/facebook/imagepipeline/i/ag$1;->Yn: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;->Wi:Lcom/facebook/imagepipeline/a/a;
+    iput-object v5, p1, Lcom/facebook/imagepipeline/g/e;->We: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;->Yl:Lcom/facebook/imagepipeline/i/ak;
+    iget-object v6, p0, Lcom/facebook/imagepipeline/i/ag$1;->Yh:Lcom/facebook/imagepipeline/i/ak;
 
-    invoke-interface {v6}, Lcom/facebook/imagepipeline/i/ak;->ka()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {v6}, Lcom/facebook/imagepipeline/i/ak;->jY()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v6
 
-    iget-object v7, v6, Lcom/facebook/imagepipeline/request/b;->Wi:Lcom/facebook/imagepipeline/a/a;
+    iget-object v7, v6, Lcom/facebook/imagepipeline/request/b;->We:Lcom/facebook/imagepipeline/a/a;
 
     if-eqz v7, :cond_5
 
-    iget v8, v5, Lcom/facebook/imagepipeline/a/a;->To:I
+    iget v8, v5, Lcom/facebook/imagepipeline/a/a;->Tk:I
 
-    iget v9, v7, Lcom/facebook/imagepipeline/a/a;->To:I
+    iget v9, v7, Lcom/facebook/imagepipeline/a/a;->Tk:I
 
     if-gt v8, v9, :cond_5
 
-    iget v5, v5, Lcom/facebook/imagepipeline/a/a;->Tp:I
+    iget v5, v5, Lcom/facebook/imagepipeline/a/a;->Tl:I
 
-    iget v7, v7, Lcom/facebook/imagepipeline/a/a;->Tp:I
+    iget v7, v7, Lcom/facebook/imagepipeline/a/a;->Tl: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;->Yq:Lcom/facebook/imagepipeline/i/am;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ag$1;->Ym:Lcom/facebook/imagepipeline/i/am;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ag$1;->Yr:Ljava/lang/String;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ag$1;->Yn: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;->Ys:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ag$1;->Yo: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;->Ys:Lcom/facebook/imagepipeline/i/k;
+    iget-object v4, p0, Lcom/facebook/imagepipeline/i/ag$1;->Yo: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;->Wi:Lcom/facebook/imagepipeline/a/a;
+    iput-object v1, v4, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->We:Lcom/facebook/imagepipeline/a/a;
 
-    invoke-virtual {v4}, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->kH()Lcom/facebook/imagepipeline/request/b;
+    invoke-virtual {v4}, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->kF()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;->Yl:Lcom/facebook/imagepipeline/i/ak;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/i/ag$1;->Yh: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;->Zt:Lcom/facebook/imagepipeline/i/ag;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ag$1;->Zp:Lcom/facebook/imagepipeline/i/ag;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/i/ag$1;->Ys:Lcom/facebook/imagepipeline/i/k;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/i/ag$1;->Yo:Lcom/facebook/imagepipeline/i/k;
 
-    iget-object v4, p0, Lcom/facebook/imagepipeline/i/ag$1;->Zs:Lcom/facebook/cache/common/CacheKey;
+    iget-object v4, p0, Lcom/facebook/imagepipeline/i/ag$1;->Zo: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;->Yq:Lcom/facebook/imagepipeline/i/am;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ag$1;->Ym:Lcom/facebook/imagepipeline/i/am;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/i/ag$1;->Yr:Ljava/lang/String;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/i/ag$1;->Yn: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;->Zt:Lcom/facebook/imagepipeline/i/ag;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ag$1;->Zp:Lcom/facebook/imagepipeline/i/ag;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ag$1;->Ys:Lcom/facebook/imagepipeline/i/k;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ag$1;->Yo:Lcom/facebook/imagepipeline/i/k;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/i/ag$1;->Yl:Lcom/facebook/imagepipeline/i/ak;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/i/ag$1;->Yh:Lcom/facebook/imagepipeline/i/ak;
 
-    iget-object v4, p0, Lcom/facebook/imagepipeline/i/ag$1;->Zs:Lcom/facebook/cache/common/CacheKey;
+    iget-object v4, p0, Lcom/facebook/imagepipeline/i/ag$1;->Zo: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 39849e0860..7903f07c2d 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 SG:Ljava/util/concurrent/atomic/AtomicBoolean;
+.field final synthetic SC:Ljava/util/concurrent/atomic/AtomicBoolean;
 
-.field final synthetic Zt:Lcom/facebook/imagepipeline/i/ag;
+.field final synthetic Zp: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;->Zt:Lcom/facebook/imagepipeline/i/ag;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ag$2;->Zp:Lcom/facebook/imagepipeline/i/ag;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/i/ag$2;->SG:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/ag$2;->SC:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     invoke-direct {p0}, Lcom/facebook/imagepipeline/i/e;-><init>()V
 
@@ -35,10 +35,10 @@
 
 
 # virtual methods
-.method public final kh()V
+.method public final kf()V
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ag$2;->SG:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ag$2;->SC: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 f6298dba86..445369ce5a 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 HH:Lcom/facebook/cache/common/CacheKey;
+.field private final HD:Lcom/facebook/cache/common/CacheKey;
 
-.field private final Kf:Lcom/facebook/imagepipeline/cache/o;
+.field private final Kb: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 Zw:Z
+.field private final Zs:Z
 
-.field private final Zx:Z
+.field private final Zt: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;->HH:Lcom/facebook/cache/common/CacheKey;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/ah$a;->HD:Lcom/facebook/cache/common/CacheKey;
 
-    iput-boolean p3, p0, Lcom/facebook/imagepipeline/i/ah$a;->Zw:Z
+    iput-boolean p3, p0, Lcom/facebook/imagepipeline/i/ah$a;->Zs:Z
 
-    iput-object p4, p0, Lcom/facebook/imagepipeline/i/ah$a;->Kf:Lcom/facebook/imagepipeline/cache/o;
+    iput-object p4, p0, Lcom/facebook/imagepipeline/i/ah$a;->Kb:Lcom/facebook/imagepipeline/cache/o;
 
-    iput-boolean p5, p0, Lcom/facebook/imagepipeline/i/ah$a;->Zx:Z
+    iput-boolean p5, p0, Lcom/facebook/imagepipeline/i/ah$a;->Zt:Z
 
     return-void
 .end method
@@ -94,7 +94,7 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/i/n;->Yp:Lcom/facebook/imagepipeline/i/k;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/n;->Yl: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;->Zw:Z
+    iget-boolean v1, p0, Lcom/facebook/imagepipeline/i/ah$a;->Zs:Z
 
     if-eqz v1, :cond_2
 
@@ -119,13 +119,13 @@
 
     :cond_3
     :goto_0
-    iget-boolean v1, p0, Lcom/facebook/imagepipeline/i/ah$a;->Zx:Z
+    iget-boolean v1, p0, Lcom/facebook/imagepipeline/i/ah$a;->Zt:Z
 
     if-eqz v1, :cond_4
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ah$a;->Kf:Lcom/facebook/imagepipeline/cache/o;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ah$a;->Kb:Lcom/facebook/imagepipeline/cache/o;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ah$a;->HH:Lcom/facebook/cache/common/CacheKey;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ah$a;->HD: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;->Yp:Lcom/facebook/imagepipeline/i/k;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/n;->Yl: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;->Yp:Lcom/facebook/imagepipeline/i/k;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/n;->Yl: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 a4d57635c3..78d95e5367 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 Kf:Lcom/facebook/imagepipeline/cache/o;
+.field private final Kb: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 Uh:Lcom/facebook/imagepipeline/cache/f;
+.field private final Ud:Lcom/facebook/imagepipeline/cache/f;
 
-.field private final XO:Lcom/facebook/imagepipeline/i/aj;
+.field private final XK: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;->Kf:Lcom/facebook/imagepipeline/cache/o;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ah;->Kb:Lcom/facebook/imagepipeline/cache/o;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/i/ah;->Uh:Lcom/facebook/imagepipeline/cache/f;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/ah;->Ud:Lcom/facebook/imagepipeline/cache/f;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/i/ah;->XO:Lcom/facebook/imagepipeline/i/aj;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/i/ah;->XK:Lcom/facebook/imagepipeline/i/aj;
 
     return-void
 .end method
@@ -95,7 +95,7 @@
         }
     .end annotation
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->kb()Lcom/facebook/imagepipeline/i/am;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->jZ()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;->ka()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->jY()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v2
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->hn()Ljava/lang/Object;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->hl()Ljava/lang/Object;
 
     move-result-object v3
 
-    iget-object v4, v2, Lcom/facebook/imagepipeline/request/b;->Zz:Lcom/facebook/imagepipeline/request/c;
+    iget-object v4, v2, Lcom/facebook/imagepipeline/request/b;->Zv: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;->Uh:Lcom/facebook/imagepipeline/cache/f;
+    iget-object v6, p0, Lcom/facebook/imagepipeline/i/ah;->Ud: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;->Kf:Lcom/facebook/imagepipeline/cache/o;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/i/ah;->Kb: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;->ka()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->jY()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v2
 
-    iget-boolean v12, v2, Lcom/facebook/imagepipeline/request/b;->Yv:Z
+    iget-boolean v12, v2, Lcom/facebook/imagepipeline/request/b;->Yr:Z
 
     new-instance v2, Lcom/facebook/imagepipeline/i/ah$a;
 
-    iget-object v11, p0, Lcom/facebook/imagepipeline/i/ah;->Kf:Lcom/facebook/imagepipeline/cache/o;
+    iget-object v11, p0, Lcom/facebook/imagepipeline/i/ah;->Kb: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;->XO:Lcom/facebook/imagepipeline/i/aj;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/ah;->XK: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;->XO:Lcom/facebook/imagepipeline/i/aj;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ah;->XK: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 4da59d3b47..73df3c52b6 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 ZE:Lcom/facebook/imagepipeline/i/ai;
+.field final synthetic ZA:Lcom/facebook/imagepipeline/i/ai;
 
-.field final synthetic ZF:Lcom/facebook/imagepipeline/i/ai$a;
+.field final synthetic ZB: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;->ZF:Lcom/facebook/imagepipeline/i/ai$a;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ai$a$1;->ZB:Lcom/facebook/imagepipeline/i/ai$a;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/i/ai$a$1;->ZE:Lcom/facebook/imagepipeline/i/ai;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/ai$a$1;->ZA:Lcom/facebook/imagepipeline/i/ai;
 
     invoke-direct {p0}, Lcom/facebook/imagepipeline/i/e;-><init>()V
 
@@ -35,12 +35,12 @@
 
 
 # virtual methods
-.method public final kh()V
+.method public final kf()V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ai$a$1;->ZF:Lcom/facebook/imagepipeline/i/ai$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ai$a$1;->ZB:Lcom/facebook/imagepipeline/i/ai$a;
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/ai$a;->kD()V
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/ai$a;->kB()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 b0f6bfa86a..98bfd195a7 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;->kB()V
+    value = Lcom/facebook/imagepipeline/i/ai$a;->kz()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic ZF:Lcom/facebook/imagepipeline/i/ai$a;
+.field final synthetic ZB: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;->ZF:Lcom/facebook/imagepipeline/i/ai$a;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ai$a$2;->ZB: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;->ZF:Lcom/facebook/imagepipeline/i/ai$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ai$a$2;->ZB:Lcom/facebook/imagepipeline/i/ai$a;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ai$a$2;->ZF:Lcom/facebook/imagepipeline/i/ai$a;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ai$a$2;->ZB:Lcom/facebook/imagepipeline/i/ai$a;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/i/ai$a;->ZA:Lcom/facebook/common/references/CloseableReference;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/i/ai$a;->Zw:Lcom/facebook/common/references/CloseableReference;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/i/ai$a$2;->ZF:Lcom/facebook/imagepipeline/i/ai$a;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/i/ai$a$2;->ZB:Lcom/facebook/imagepipeline/i/ai$a;
 
-    iget v2, v2, Lcom/facebook/imagepipeline/i/ai$a;->YL:I
+    iget v2, v2, Lcom/facebook/imagepipeline/i/ai$a;->YH:I
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/i/ai$a$2;->ZF:Lcom/facebook/imagepipeline/i/ai$a;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/i/ai$a$2;->ZB:Lcom/facebook/imagepipeline/i/ai$a;
 
     const/4 v4, 0x0
 
-    iput-object v4, v3, Lcom/facebook/imagepipeline/i/ai$a;->ZA:Lcom/facebook/common/references/CloseableReference;
+    iput-object v4, v3, Lcom/facebook/imagepipeline/i/ai$a;->Zw:Lcom/facebook/common/references/CloseableReference;
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/i/ai$a$2;->ZF:Lcom/facebook/imagepipeline/i/ai$a;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/i/ai$a$2;->ZB:Lcom/facebook/imagepipeline/i/ai$a;
 
     const/4 v5, 0x0
 
-    iput-boolean v5, v3, Lcom/facebook/imagepipeline/i/ai$a;->ZB:Z
+    iput-boolean v5, v3, Lcom/facebook/imagepipeline/i/ai$a;->Zx: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;->ZF:Lcom/facebook/imagepipeline/i/ai$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ai$a$2;->ZB: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;->Zy:Lcom/facebook/imagepipeline/i/am;
+    iget-object v3, v0, Lcom/facebook/imagepipeline/i/ai$a;->Zu:Lcom/facebook/imagepipeline/i/am;
 
-    iget-object v6, v0, Lcom/facebook/imagepipeline/i/ai$a;->Kx:Ljava/lang/String;
+    iget-object v6, v0, Lcom/facebook/imagepipeline/i/ai$a;->Kt: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;->Zy:Lcom/facebook/imagepipeline/i/am;
+    iget-object v3, v0, Lcom/facebook/imagepipeline/i/ai$a;->Zu:Lcom/facebook/imagepipeline/i/am;
 
-    iget-object v6, v0, Lcom/facebook/imagepipeline/i/ai$a;->Kx:Ljava/lang/String;
+    iget-object v6, v0, Lcom/facebook/imagepipeline/i/ai$a;->Kt:Ljava/lang/String;
 
     const-string v7, "PostprocessorProducer"
 
-    iget-object v8, v0, Lcom/facebook/imagepipeline/i/ai$a;->Zy:Lcom/facebook/imagepipeline/i/am;
+    iget-object v8, v0, Lcom/facebook/imagepipeline/i/ai$a;->Zu:Lcom/facebook/imagepipeline/i/am;
 
-    iget-object v9, v0, Lcom/facebook/imagepipeline/i/ai$a;->Kx:Ljava/lang/String;
+    iget-object v9, v0, Lcom/facebook/imagepipeline/i/ai$a;->Kt:Ljava/lang/String;
 
-    iget-object v10, v0, Lcom/facebook/imagepipeline/i/ai$a;->Zz:Lcom/facebook/imagepipeline/request/c;
+    iget-object v10, v0, Lcom/facebook/imagepipeline/i/ai$a;->Zv: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;->Zy:Lcom/facebook/imagepipeline/i/am;
+    iget-object v3, v0, Lcom/facebook/imagepipeline/i/ai$a;->Zu:Lcom/facebook/imagepipeline/i/am;
 
-    iget-object v6, v0, Lcom/facebook/imagepipeline/i/ai$a;->Kx:Ljava/lang/String;
+    iget-object v6, v0, Lcom/facebook/imagepipeline/i/ai$a;->Kt:Ljava/lang/String;
 
     const-string v7, "PostprocessorProducer"
 
-    iget-object v8, v0, Lcom/facebook/imagepipeline/i/ai$a;->Zy:Lcom/facebook/imagepipeline/i/am;
+    iget-object v8, v0, Lcom/facebook/imagepipeline/i/ai$a;->Zu:Lcom/facebook/imagepipeline/i/am;
 
-    iget-object v9, v0, Lcom/facebook/imagepipeline/i/ai$a;->Kx:Ljava/lang/String;
+    iget-object v9, v0, Lcom/facebook/imagepipeline/i/ai$a;->Kt:Ljava/lang/String;
 
-    iget-object v10, v0, Lcom/facebook/imagepipeline/i/ai$a;->Zz:Lcom/facebook/imagepipeline/request/c;
+    iget-object v10, v0, Lcom/facebook/imagepipeline/i/ai$a;->Zv: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;->ZF:Lcom/facebook/imagepipeline/i/ai$a;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ai$a$2;->ZB:Lcom/facebook/imagepipeline/i/ai$a;
 
     monitor-enter v1
 
     :try_start_7
-    iput-boolean v5, v1, Lcom/facebook/imagepipeline/i/ai$a;->ZC:Z
+    iput-boolean v5, v1, Lcom/facebook/imagepipeline/i/ai$a;->Zy:Z
 
-    invoke-virtual {v1}, Lcom/facebook/imagepipeline/i/ai$a;->kC()Z
+    invoke-virtual {v1}, Lcom/facebook/imagepipeline/i/ai$a;->kA()Z
 
     move-result v0
 
@@ -223,7 +223,7 @@
 
     if-eqz v0, :cond_2
 
-    invoke-virtual {v1}, Lcom/facebook/imagepipeline/i/ai$a;->kB()V
+    invoke-virtual {v1}, Lcom/facebook/imagepipeline/i/ai$a;->kz()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 26e90ef16c..2f06420a30 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 ZE:Lcom/facebook/imagepipeline/i/ai;
+.field final synthetic ZA:Lcom/facebook/imagepipeline/i/ai;
 
-.field final synthetic ZG:Lcom/facebook/imagepipeline/i/ai$b;
+.field final synthetic ZC: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;->ZG:Lcom/facebook/imagepipeline/i/ai$b;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ai$b$1;->ZC:Lcom/facebook/imagepipeline/i/ai$b;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/i/ai$b$1;->ZE:Lcom/facebook/imagepipeline/i/ai;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/ai$b$1;->ZA:Lcom/facebook/imagepipeline/i/ai;
 
     invoke-direct {p0}, Lcom/facebook/imagepipeline/i/e;-><init>()V
 
@@ -35,22 +35,22 @@
 
 
 # virtual methods
-.method public final kh()V
+.method public final kf()V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ai$b$1;->ZG:Lcom/facebook/imagepipeline/i/ai$b;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ai$b$1;->ZC:Lcom/facebook/imagepipeline/i/ai$b;
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/ai$b;->gG()Z
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/ai$b;->gE()Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ai$b$1;->ZG:Lcom/facebook/imagepipeline/i/ai$b;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ai$b$1;->ZC:Lcom/facebook/imagepipeline/i/ai$b;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/i/n;->Yp:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/i/n;->Yl:Lcom/facebook/imagepipeline/i/k;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/k;->gg()V
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/k;->ge()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 f8b87a9b74..c968b43ae5 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 ZD:Lcom/facebook/imagepipeline/i/ai;
+.field final synthetic Zz: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;->ZD:Lcom/facebook/imagepipeline/i/ai;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ai$c;->Zz: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;->Yp:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yl: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 d5bab57e14..e397ac5f9f 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 RH:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+.field final RD:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
 
-.field private final XO:Lcom/facebook/imagepipeline/i/aj;
+.field private final XK: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;->XO:Lcom/facebook/imagepipeline/i/aj;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ai;->XK:Lcom/facebook/imagepipeline/i/aj;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/i/ai;->RH:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/ai;->RD: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;->kb()Lcom/facebook/imagepipeline/i/am;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->jZ()Lcom/facebook/imagepipeline/i/am;
 
     move-result-object v3
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->ka()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->jY()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v0
 
-    iget-object v7, v0, Lcom/facebook/imagepipeline/request/b;->Zz:Lcom/facebook/imagepipeline/request/c;
+    iget-object v7, v0, Lcom/facebook/imagepipeline/request/b;->Zv: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;->XO:Lcom/facebook/imagepipeline/i/aj;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ai;->XK: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 3c8ebd19b6..e8f4b72d09 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 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 05639af2b9..deefd7afe8 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 Vu:Landroid/content/ContentResolver;
+.field private final Vq: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;->Vu:Landroid/content/ContentResolver;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/i/an;->Vq:Landroid/content/ContentResolver;
 
     return-void
 .end method
@@ -28,9 +28,9 @@
         }
     .end annotation
 
-    iget-object p1, p1, Lcom/facebook/imagepipeline/request/b;->aaf:Landroid/net/Uri;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/request/b;->aab:Landroid/net/Uri;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/an;->Vu:Landroid/content/ContentResolver;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/an;->Vq: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 kl()Ljava/lang/String;
+.method protected final kj()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 3fefced8d0..52c050211a 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 ZJ:Lcom/facebook/imagepipeline/i/ao;
+.field final synthetic ZF:Lcom/facebook/imagepipeline/i/ao;
 
-.field final synthetic ZK:Lcom/facebook/imagepipeline/i/ao$a;
+.field final synthetic ZG: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;->ZK:Lcom/facebook/imagepipeline/i/ao$a;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ao$a$1;->ZG:Lcom/facebook/imagepipeline/i/ao$a;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/i/ao$a$1;->ZJ:Lcom/facebook/imagepipeline/i/ao;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/ao$a$1;->ZF: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;->ZK:Lcom/facebook/imagepipeline/i/ao$a;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ao$a$1;->ZG:Lcom/facebook/imagepipeline/i/ao$a;
 
-    iget-object v2, v1, Lcom/facebook/imagepipeline/i/ao$a;->Uu:Lcom/facebook/imagepipeline/k/d;
+    iget-object v2, v1, Lcom/facebook/imagepipeline/i/ao$a;->Uq:Lcom/facebook/imagepipeline/k/d;
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->jr()Lcom/facebook/e/c;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->jp()Lcom/facebook/e/c;
 
     move-result-object v3
 
-    iget-object v4, p0, Lcom/facebook/imagepipeline/i/ao$a$1;->ZK:Lcom/facebook/imagepipeline/i/ao$a;
+    iget-object v4, p0, Lcom/facebook/imagepipeline/i/ao$a$1;->ZG:Lcom/facebook/imagepipeline/i/ao$a;
 
-    iget-boolean v4, v4, Lcom/facebook/imagepipeline/i/ao$a;->ZH:Z
+    iget-boolean v4, v4, Lcom/facebook/imagepipeline/i/ao$a;->ZD: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;->Yd:Lcom/facebook/imagepipeline/i/ak;
+    iget-object v3, v1, Lcom/facebook/imagepipeline/i/ao$a;->XZ:Lcom/facebook/imagepipeline/i/ak;
 
-    invoke-interface {v3}, Lcom/facebook/imagepipeline/i/ak;->kb()Lcom/facebook/imagepipeline/i/am;
+    invoke-interface {v3}, Lcom/facebook/imagepipeline/i/ak;->jZ()Lcom/facebook/imagepipeline/i/am;
 
     move-result-object v3
 
-    iget-object v4, v1, Lcom/facebook/imagepipeline/i/ao$a;->Yd:Lcom/facebook/imagepipeline/i/ak;
+    iget-object v4, v1, Lcom/facebook/imagepipeline/i/ao$a;->XZ: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;->Yd:Lcom/facebook/imagepipeline/i/ak;
+    iget-object v3, v1, Lcom/facebook/imagepipeline/i/ao$a;->XZ:Lcom/facebook/imagepipeline/i/ak;
 
-    invoke-interface {v3}, Lcom/facebook/imagepipeline/i/ak;->ka()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {v3}, Lcom/facebook/imagepipeline/i/ak;->jY()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v10
 
-    iget-object v3, v1, Lcom/facebook/imagepipeline/i/ao$a;->ZI:Lcom/facebook/imagepipeline/i/ao;
+    iget-object v3, v1, Lcom/facebook/imagepipeline/i/ao$a;->ZE:Lcom/facebook/imagepipeline/i/ao;
 
-    iget-object v3, v3, Lcom/facebook/imagepipeline/i/ao;->Sl:Lcom/facebook/common/g/g;
+    iget-object v3, v3, Lcom/facebook/imagepipeline/i/ao;->Sh:Lcom/facebook/common/g/g;
 
-    invoke-interface {v3}, Lcom/facebook/common/g/g;->gp()Lcom/facebook/common/g/i;
+    invoke-interface {v3}, Lcom/facebook/common/g/g;->gn()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;->Su:Lcom/facebook/imagepipeline/a/f;
+    iget-object v6, v10, Lcom/facebook/imagepipeline/request/b;->Sq:Lcom/facebook/imagepipeline/a/f;
 
-    iget-object v7, v10, Lcom/facebook/imagepipeline/request/b;->St:Lcom/facebook/imagepipeline/a/e;
+    iget-object v7, v10, Lcom/facebook/imagepipeline/request/b;->Sp: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;->aay:I
+    iget v4, v3, Lcom/facebook/imagepipeline/k/b;->aau:I
 
     const/4 v5, 0x2
 
     if-eq v4, v5, :cond_3
 
-    iget-object v4, v10, Lcom/facebook/imagepipeline/request/b;->St:Lcom/facebook/imagepipeline/a/e;
+    iget-object v4, v10, Lcom/facebook/imagepipeline/request/b;->Sp: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;->Yd:Lcom/facebook/imagepipeline/i/ak;
+    iget-object v5, v1, Lcom/facebook/imagepipeline/i/ao$a;->XZ:Lcom/facebook/imagepipeline/i/ak;
 
-    invoke-interface {v5}, Lcom/facebook/imagepipeline/i/ak;->kb()Lcom/facebook/imagepipeline/i/am;
+    invoke-interface {v5}, Lcom/facebook/imagepipeline/i/ak;->jZ()Lcom/facebook/imagepipeline/i/am;
 
     move-result-object v5
 
-    iget-object v6, v1, Lcom/facebook/imagepipeline/i/ao$a;->Yd:Lcom/facebook/imagepipeline/i/ak;
+    iget-object v6, v1, Lcom/facebook/imagepipeline/i/ao$a;->XZ: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;->jr()Lcom/facebook/e/c;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->jp()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;->Yj:Lcom/facebook/imagepipeline/i/u;
+    iget-object v0, v1, Lcom/facebook/imagepipeline/i/ao$a;->Yf:Lcom/facebook/imagepipeline/i/u;
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/u;->kq()J
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/u;->ko()J
 
     move-result-wide v5
 
@@ -256,7 +256,7 @@
     move-object v12, p1
 
     :goto_1
-    invoke-virtual {v11}, Lcom/facebook/common/g/i;->gq()Lcom/facebook/common/g/f;
+    invoke-virtual {v11}, Lcom/facebook/common/g/i;->go()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;->QY:Lcom/facebook/e/c;
+    sget-object v2, Lcom/facebook/e/b;->QU:Lcom/facebook/e/c;
 
-    iput-object v2, v0, Lcom/facebook/imagepipeline/g/e;->Wf:Lcom/facebook/e/c;
+    iput-object v2, v0, Lcom/facebook/imagepipeline/g/e;->Wb: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;->jx()V
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/g/e;->jv()V
 
-    iget-object v2, v1, Lcom/facebook/imagepipeline/i/ao$a;->Yd:Lcom/facebook/imagepipeline/i/ak;
+    iget-object v2, v1, Lcom/facebook/imagepipeline/i/ao$a;->XZ:Lcom/facebook/imagepipeline/i/ak;
 
-    invoke-interface {v2}, Lcom/facebook/imagepipeline/i/ak;->kb()Lcom/facebook/imagepipeline/i/am;
+    invoke-interface {v2}, Lcom/facebook/imagepipeline/i/ak;->jZ()Lcom/facebook/imagepipeline/i/am;
 
     move-result-object v2
 
-    iget-object v4, v1, Lcom/facebook/imagepipeline/i/ao$a;->Yd:Lcom/facebook/imagepipeline/i/ak;
+    iget-object v4, v1, Lcom/facebook/imagepipeline/i/ao$a;->XZ: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;->aay:I
+    iget v2, v3, Lcom/facebook/imagepipeline/k/b;->aau: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;->Yp:Lcom/facebook/imagepipeline/i/k;
+    iget-object v2, v1, Lcom/facebook/imagepipeline/i/n;->Yl: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;->Yd:Lcom/facebook/imagepipeline/i/ak;
+    iget-object v0, v1, Lcom/facebook/imagepipeline/i/ao$a;->XZ:Lcom/facebook/imagepipeline/i/ak;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/ak;->kb()Lcom/facebook/imagepipeline/i/am;
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/ak;->jZ()Lcom/facebook/imagepipeline/i/am;
 
     move-result-object v0
 
-    iget-object v2, v1, Lcom/facebook/imagepipeline/i/ao$a;->Yd:Lcom/facebook/imagepipeline/i/ak;
+    iget-object v2, v1, Lcom/facebook/imagepipeline/i/ao$a;->XZ: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;->Yp:Lcom/facebook/imagepipeline/i/k;
+    iget-object p2, v1, Lcom/facebook/imagepipeline/i/n;->Yl: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 e9e9bc9679..171967bd33 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 Ys:Lcom/facebook/imagepipeline/i/k;
+.field final synthetic Yo:Lcom/facebook/imagepipeline/i/k;
 
-.field final synthetic ZJ:Lcom/facebook/imagepipeline/i/ao;
+.field final synthetic ZF:Lcom/facebook/imagepipeline/i/ao;
 
-.field final synthetic ZK:Lcom/facebook/imagepipeline/i/ao$a;
+.field final synthetic ZG: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;->ZK:Lcom/facebook/imagepipeline/i/ao$a;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ao$a$2;->ZG:Lcom/facebook/imagepipeline/i/ao$a;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/i/ao$a$2;->ZJ:Lcom/facebook/imagepipeline/i/ao;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/ao$a$2;->ZF:Lcom/facebook/imagepipeline/i/ao;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/i/ao$a$2;->Ys:Lcom/facebook/imagepipeline/i/k;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/i/ao$a$2;->Yo:Lcom/facebook/imagepipeline/i/k;
 
     invoke-direct {p0}, Lcom/facebook/imagepipeline/i/e;-><init>()V
 
@@ -39,46 +39,46 @@
 
 
 # virtual methods
-.method public final kh()V
+.method public final kf()V
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ao$a$2;->ZK:Lcom/facebook/imagepipeline/i/ao$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ao$a$2;->ZG:Lcom/facebook/imagepipeline/i/ao$a;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/i/ao$a;->Yj:Lcom/facebook/imagepipeline/i/u;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/i/ao$a;->Yf:Lcom/facebook/imagepipeline/i/u;
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/u;->kn()V
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/u;->kl()V
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ao$a$2;->ZK:Lcom/facebook/imagepipeline/i/ao$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ao$a$2;->ZG:Lcom/facebook/imagepipeline/i/ao$a;
 
     const/4 v1, 0x1
 
-    iput-boolean v1, v0, Lcom/facebook/imagepipeline/i/ao$a;->XU:Z
+    iput-boolean v1, v0, Lcom/facebook/imagepipeline/i/ao$a;->XQ:Z
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ao$a$2;->Ys:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ao$a$2;->Yo:Lcom/facebook/imagepipeline/i/k;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/k;->gg()V
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/k;->ge()V
 
     return-void
 .end method
 
-.method public final kj()V
+.method public final kh()V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ao$a$2;->ZK:Lcom/facebook/imagepipeline/i/ao$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ao$a$2;->ZG:Lcom/facebook/imagepipeline/i/ao$a;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/i/ao$a;->Yd:Lcom/facebook/imagepipeline/i/ak;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/i/ao$a;->XZ:Lcom/facebook/imagepipeline/i/ak;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/ak;->kf()Z
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/ak;->kd()Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ao$a$2;->ZK:Lcom/facebook/imagepipeline/i/ao$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ao$a$2;->ZG:Lcom/facebook/imagepipeline/i/ao$a;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/i/ao$a;->Yj:Lcom/facebook/imagepipeline/i/u;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/i/ao$a;->Yf:Lcom/facebook/imagepipeline/i/u;
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/u;->ko()Z
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/u;->km()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 71e07b544a..ed3c11b0d9 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 Sl:Lcom/facebook/common/g/g;
+.field final Sh:Lcom/facebook/common/g/g;
 
-.field private final Uu:Lcom/facebook/imagepipeline/k/d;
+.field private final Uq:Lcom/facebook/imagepipeline/k/d;
 
-.field private final XO:Lcom/facebook/imagepipeline/i/aj;
+.field private final XK: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 ZH:Z
+.field private final ZD: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;->Sl:Lcom/facebook/common/g/g;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ao;->Sh: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;->XO:Lcom/facebook/imagepipeline/i/aj;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ao;->XK: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;->Uu:Lcom/facebook/imagepipeline/k/d;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ao;->Uq:Lcom/facebook/imagepipeline/k/d;
 
-    iput-boolean p4, p0, Lcom/facebook/imagepipeline/i/ao;->ZH:Z
+    iput-boolean p4, p0, Lcom/facebook/imagepipeline/i/ao;->ZD:Z
 
     return-void
 .end method
@@ -113,13 +113,13 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ao;->XO:Lcom/facebook/imagepipeline/i/aj;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ao;->XK:Lcom/facebook/imagepipeline/i/aj;
 
     new-instance v7, Lcom/facebook/imagepipeline/i/ao$a;
 
-    iget-boolean v5, p0, Lcom/facebook/imagepipeline/i/ao;->ZH:Z
+    iget-boolean v5, p0, Lcom/facebook/imagepipeline/i/ao;->ZD:Z
 
-    iget-object v6, p0, Lcom/facebook/imagepipeline/i/ao;->Uu:Lcom/facebook/imagepipeline/k/d;
+    iget-object v6, p0, Lcom/facebook/imagepipeline/i/ao;->Uq: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 7782e2365f..bbe600b6ac 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;->kb()Lcom/facebook/imagepipeline/i/am;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->jZ()Lcom/facebook/imagepipeline/i/am;
 
     move-result-object v3
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->hn()Ljava/lang/Object;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->hl()Ljava/lang/Object;
 
     move-result-object v4
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->kc()Lcom/facebook/imagepipeline/request/b$b;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->ka()Lcom/facebook/imagepipeline/request/b$b;
 
     move-result-object v5
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->kd()Z
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->kb()Z
 
     move-result v6
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->kf()Z
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->kd()Z
 
     move-result v7
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->ke()Lcom/facebook/imagepipeline/a/d;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->kc()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 a02035b277..dd57435b95 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 ZO:Lcom/facebook/imagepipeline/i/ar;
+.field final synthetic ZK:Lcom/facebook/imagepipeline/i/ar;
 
-.field final synthetic ZP:Lcom/facebook/imagepipeline/i/aq;
+.field final synthetic ZL: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;->ZO:Lcom/facebook/imagepipeline/i/ar;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ar$2;->ZK:Lcom/facebook/imagepipeline/i/ar;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/i/ar$2;->ZP:Lcom/facebook/imagepipeline/i/aq;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/ar$2;->ZL:Lcom/facebook/imagepipeline/i/aq;
 
     invoke-direct {p0}, Lcom/facebook/imagepipeline/i/e;-><init>()V
 
@@ -35,18 +35,18 @@
 
 
 # virtual methods
-.method public final kh()V
+.method public final kf()V
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ar$2;->ZP:Lcom/facebook/imagepipeline/i/aq;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ar$2;->ZL: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;->ZO:Lcom/facebook/imagepipeline/i/ar;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ar$2;->ZK:Lcom/facebook/imagepipeline/i/ar;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/i/ar;->Ui:Lcom/facebook/imagepipeline/i/as;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/i/ar;->Ue:Lcom/facebook/imagepipeline/i/as;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ar$2;->ZP:Lcom/facebook/imagepipeline/i/aq;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ar$2;->ZL: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 c3aa7d1c47..2b03bc59d7 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 Ui:Lcom/facebook/imagepipeline/i/as;
+.field final Ue:Lcom/facebook/imagepipeline/i/as;
 
-.field final XO:Lcom/facebook/imagepipeline/i/aj;
+.field final XK: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;->XO:Lcom/facebook/imagepipeline/i/aj;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ar;->XK:Lcom/facebook/imagepipeline/i/aj;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/i/ar;->Ui:Lcom/facebook/imagepipeline/i/as;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/ar;->Ue:Lcom/facebook/imagepipeline/i/as;
 
     return-void
 .end method
@@ -74,7 +74,7 @@
         }
     .end annotation
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->kb()Lcom/facebook/imagepipeline/i/am;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->jZ()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;->Ui:Lcom/facebook/imagepipeline/i/as;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/ar;->Ue: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 934c4850b5..593c2e487f 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 ZQ:Z
+.field private ZM:Z
 
-.field private final ZR:Ljava/util/Deque;
+.field private final ZN: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;->ZQ:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/i/as;->ZM: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;->ZR:Ljava/util/Deque;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/as;->ZN: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;->ZQ:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/i/as;->ZM:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/as;->ZR:Ljava/util/Deque;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/as;->ZN: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;->ZR:Ljava/util/Deque;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/as;->ZN: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 a5b81a0a13..fca4b20258 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;->kE()V
+    value = Lcom/facebook/imagepipeline/i/at$a;->kC()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic ZW:Landroid/util/Pair;
+.field final synthetic ZS:Landroid/util/Pair;
 
-.field final synthetic ZX:Lcom/facebook/imagepipeline/i/at$a;
+.field final synthetic ZT: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;->ZX:Lcom/facebook/imagepipeline/i/at$a;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/at$a$1;->ZT:Lcom/facebook/imagepipeline/i/at$a;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/i/at$a$1;->ZW:Landroid/util/Pair;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/at$a$1;->ZS: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;->ZX:Lcom/facebook/imagepipeline/i/at$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/at$a$1;->ZT:Lcom/facebook/imagepipeline/i/at$a;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/i/at$a;->ZV:Lcom/facebook/imagepipeline/i/at;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/i/at$a;->ZR:Lcom/facebook/imagepipeline/i/at;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/at$a$1;->ZW:Landroid/util/Pair;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/at$a$1;->ZS: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;->ZW:Landroid/util/Pair;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/i/at$a$1;->ZS: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 b274cec11a..0fd3363561 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 ZV:Lcom/facebook/imagepipeline/i/at;
+.field final synthetic ZR:Lcom/facebook/imagepipeline/i/at;
 
 
 # direct methods
@@ -36,7 +36,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/at$a;->ZV:Lcom/facebook/imagepipeline/i/at;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/at$a;->ZR: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 kE()V
+.method private kC()V
     .locals 3
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/at$a;->ZV:Lcom/facebook/imagepipeline/i/at;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/at$a;->ZR:Lcom/facebook/imagepipeline/i/at;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/at$a;->ZV:Lcom/facebook/imagepipeline/i/at;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/at$a;->ZR:Lcom/facebook/imagepipeline/i/at;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/i/at;->ZU:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/i/at;->ZQ: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;->ZV:Lcom/facebook/imagepipeline/i/at;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/i/at$a;->ZR: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;->ZV:Lcom/facebook/imagepipeline/i/at;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/at$a;->ZR: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;->Yp:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yl: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;->kE()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/i/at$a;->kC()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;->Yp:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yl: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;->kE()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/i/at$a;->kC()V
 
     return-void
 .end method
 
-.method protected final jj()V
+.method protected final jh()V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yp:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yl:Lcom/facebook/imagepipeline/i/k;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/k;->gg()V
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/k;->ge()V
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/i/at$a;->kE()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/i/at$a;->kC()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 819ddbfced..db4b72da98 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 XO:Lcom/facebook/imagepipeline/i/aj;
+.field private final XK: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 ZS:I
+.field private final ZO:I
 
-.field private ZT:I
+.field private ZP:I
 
-.field final ZU:Ljava/util/concurrent/ConcurrentLinkedQueue;
+.field final ZQ: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;->ZS:I
+    iput v0, p0, Lcom/facebook/imagepipeline/i/at;->ZO: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;->XO:Lcom/facebook/imagepipeline/i/aj;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/at;->XK: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;->ZU:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/at;->ZQ:Ljava/util/concurrent/ConcurrentLinkedQueue;
 
     const/4 p1, 0x0
 
-    iput p1, p0, Lcom/facebook/imagepipeline/i/at;->ZT:I
+    iput p1, p0, Lcom/facebook/imagepipeline/i/at;->ZP: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;->ZT:I
+    iget v0, p0, Lcom/facebook/imagepipeline/i/at;->ZP:I
 
     add-int/lit8 v1, v0, -0x1
 
-    iput v1, p0, Lcom/facebook/imagepipeline/i/at;->ZT:I
+    iput v1, p0, Lcom/facebook/imagepipeline/i/at;->ZP:I
 
     return v0
 .end method
@@ -128,7 +128,7 @@
         }
     .end annotation
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->kb()Lcom/facebook/imagepipeline/i/am;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->jZ()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;->ZT:I
+    iget v0, p0, Lcom/facebook/imagepipeline/i/at;->ZP:I
 
-    iget v1, p0, Lcom/facebook/imagepipeline/i/at;->ZS:I
+    iget v1, p0, Lcom/facebook/imagepipeline/i/at;->ZO:I
 
     const/4 v2, 0x1
 
     if-lt v0, v1, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/at;->ZU:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/at;->ZQ: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;->ZT:I
+    iget v0, p0, Lcom/facebook/imagepipeline/i/at;->ZP:I
 
     add-int/2addr v0, v2
 
-    iput v0, p0, Lcom/facebook/imagepipeline/i/at;->ZT:I
+    iput v0, p0, Lcom/facebook/imagepipeline/i/at;->ZP:I
 
     const/4 v2, 0x0
 
@@ -205,7 +205,7 @@
         }
     .end annotation
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->kb()Lcom/facebook/imagepipeline/i/am;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->jZ()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;->XO:Lcom/facebook/imagepipeline/i/aj;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/at;->XK: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 100226b02f..71794b1619 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 St:Lcom/facebook/imagepipeline/a/e;
+.field private final Sp:Lcom/facebook/imagepipeline/a/e;
 
-.field private final Yd:Lcom/facebook/imagepipeline/i/ak;
+.field private final XZ:Lcom/facebook/imagepipeline/i/ak;
 
-.field private final ZZ:I
+.field private final ZV:I
 
-.field final synthetic aaa:Lcom/facebook/imagepipeline/i/au;
+.field final synthetic ZW:Lcom/facebook/imagepipeline/i/au;
 
 
 # direct methods
@@ -47,23 +47,23 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/au$a;->aaa:Lcom/facebook/imagepipeline/i/au;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/au$a;->ZW: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;->Yd:Lcom/facebook/imagepipeline/i/ak;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/i/au$a;->XZ:Lcom/facebook/imagepipeline/i/ak;
 
-    iput p4, p0, Lcom/facebook/imagepipeline/i/au$a;->ZZ:I
+    iput p4, p0, Lcom/facebook/imagepipeline/i/au$a;->ZV:I
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/i/au$a;->Yd:Lcom/facebook/imagepipeline/i/ak;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/au$a;->XZ:Lcom/facebook/imagepipeline/i/ak;
 
-    invoke-interface {p1}, Lcom/facebook/imagepipeline/i/ak;->ka()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/i/ak;->jY()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/facebook/imagepipeline/request/b;->St:Lcom/facebook/imagepipeline/a/e;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/request/b;->Sp:Lcom/facebook/imagepipeline/a/e;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/au$a;->St:Lcom/facebook/imagepipeline/a/e;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/au$a;->Sp: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;->St:Lcom/facebook/imagepipeline/a/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/au$a;->Sp: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;->Yp:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yl: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;->aaa:Lcom/facebook/imagepipeline/i/au;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/au$a;->ZW:Lcom/facebook/imagepipeline/i/au;
 
-    iget p2, p0, Lcom/facebook/imagepipeline/i/au$a;->ZZ:I
+    iget p2, p0, Lcom/facebook/imagepipeline/i/au$a;->ZV:I
 
     const/4 v0, 0x1
 
     add-int/2addr p2, v0
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/n;->Yp:Lcom/facebook/imagepipeline/i/k;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/n;->Yl:Lcom/facebook/imagepipeline/i/k;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/i/au$a;->Yd:Lcom/facebook/imagepipeline/i/ak;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/i/au$a;->XZ: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;->Yp:Lcom/facebook/imagepipeline/i/k;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/n;->Yl: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;->aaa:Lcom/facebook/imagepipeline/i/au;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/au$a;->ZW:Lcom/facebook/imagepipeline/i/au;
 
-    iget v1, p0, Lcom/facebook/imagepipeline/i/au$a;->ZZ:I
+    iget v1, p0, Lcom/facebook/imagepipeline/i/au$a;->ZV:I
 
     add-int/lit8 v1, v1, 0x1
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/i/n;->Yp:Lcom/facebook/imagepipeline/i/k;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/i/n;->Yl:Lcom/facebook/imagepipeline/i/k;
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/i/au$a;->Yd:Lcom/facebook/imagepipeline/i/ak;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/i/au$a;->XZ: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;->Yp:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yl: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 ce856e3f17..1fe50862e4 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 ZY:[Lcom/facebook/imagepipeline/i/av;
+.field private final ZU:[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;->ZY:[Lcom/facebook/imagepipeline/i/av;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/au;->ZU:[Lcom/facebook/imagepipeline/i/av;
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/i/au;->ZY:[Lcom/facebook/imagepipeline/i/av;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/au;->ZU:[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;->ZY:[Lcom/facebook/imagepipeline/i/av;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/au;->ZU:[Lcom/facebook/imagepipeline/i/av;
 
     array-length v1, v0
 
@@ -171,11 +171,11 @@
         }
     .end annotation
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->ka()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->jY()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/request/b;->St:Lcom/facebook/imagepipeline/a/e;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/request/b;->Sp:Lcom/facebook/imagepipeline/a/e;
 
     const/4 v1, 0x1
 
@@ -215,11 +215,11 @@
         }
     .end annotation
 
-    invoke-interface {p3}, Lcom/facebook/imagepipeline/i/ak;->ka()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p3}, Lcom/facebook/imagepipeline/i/ak;->jY()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/request/b;->St:Lcom/facebook/imagepipeline/a/e;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/request/b;->Sp: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;->ZY:[Lcom/facebook/imagepipeline/i/av;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/au;->ZU:[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 940b27465b..317fa54eca 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;->js()I
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/g/e;->jq()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 3c68f63ecb..85de0cb89d 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 aab:Lcom/facebook/imagepipeline/g/e;
+.field final synthetic ZX:Lcom/facebook/imagepipeline/g/e;
 
-.field final synthetic aac:Lcom/facebook/imagepipeline/i/ax;
+.field final synthetic ZY: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;->aac:Lcom/facebook/imagepipeline/i/ax;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ax$1;->ZY:Lcom/facebook/imagepipeline/i/ax;
 
-    iput-object p6, p0, Lcom/facebook/imagepipeline/i/ax$1;->aab:Lcom/facebook/imagepipeline/g/e;
+    iput-object p6, p0, Lcom/facebook/imagepipeline/i/ax$1;->ZX: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 kF()Lcom/facebook/imagepipeline/g/e;
+.method private kD()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;->aac:Lcom/facebook/imagepipeline/i/ax;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ax$1;->ZY:Lcom/facebook/imagepipeline/i/ax;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/i/ax;->Sl:Lcom/facebook/common/g/g;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/i/ax;->Sh:Lcom/facebook/common/g/g;
 
-    invoke-interface {v0}, Lcom/facebook/common/g/g;->gp()Lcom/facebook/common/g/i;
+    invoke-interface {v0}, Lcom/facebook/common/g/g;->gn()Lcom/facebook/common/g/i;
 
     move-result-object v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ax$1;->aab:Lcom/facebook/imagepipeline/g/e;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ax$1;->ZX: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;->Rd:Lcom/facebook/e/c;
+    sget-object v4, Lcom/facebook/e/b;->QZ:Lcom/facebook/e/c;
 
     if-eq v3, v4, :cond_3
 
-    sget-object v4, Lcom/facebook/e/b;->Rf:Lcom/facebook/e/c;
+    sget-object v4, Lcom/facebook/e/b;->Rb:Lcom/facebook/e/c;
 
     if-ne v3, v4, :cond_0
 
     goto :goto_1
 
     :cond_0
-    sget-object v4, Lcom/facebook/e/b;->Re:Lcom/facebook/e/c;
+    sget-object v4, Lcom/facebook/e/b;->Ra:Lcom/facebook/e/c;
 
     if-eq v3, v4, :cond_2
 
-    sget-object v4, Lcom/facebook/e/b;->Rg:Lcom/facebook/e/c;
+    sget-object v4, Lcom/facebook/e/b;->Rc: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;->jY()Lcom/facebook/imagepipeline/nativecode/e;
+    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/f;->jW()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;->QZ:Lcom/facebook/e/c;
+    sget-object v2, Lcom/facebook/e/b;->QV:Lcom/facebook/e/c;
 
-    iput-object v2, v1, Lcom/facebook/imagepipeline/g/e;->Wf:Lcom/facebook/e/c;
+    iput-object v2, v1, Lcom/facebook/imagepipeline/g/e;->Wb:Lcom/facebook/e/c;
 
     goto :goto_2
 
     :cond_3
     :goto_1
-    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/f;->jY()Lcom/facebook/imagepipeline/nativecode/e;
+    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/f;->jW()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;->QY:Lcom/facebook/e/c;
+    sget-object v2, Lcom/facebook/e/b;->QU:Lcom/facebook/e/c;
 
-    iput-object v2, v1, Lcom/facebook/imagepipeline/g/e;->Wf:Lcom/facebook/e/c;
+    iput-object v2, v1, Lcom/facebook/imagepipeline/g/e;->Wb:Lcom/facebook/e/c;
 
     :goto_2
-    invoke-virtual {v0}, Lcom/facebook/common/g/i;->gq()Lcom/facebook/common/g/f;
+    invoke-virtual {v0}, Lcom/facebook/common/g/i;->go()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;->aab:Lcom/facebook/imagepipeline/g/e;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/i/ax$1;->ZX: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 gg()V
+.method public final ge()V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ax$1;->aab:Lcom/facebook/imagepipeline/g/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ax$1;->ZX: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;->gg()V
+    invoke-super {p0}, Lcom/facebook/imagepipeline/i/aq;->ge()V
 
     return-void
 .end method
@@ -195,7 +195,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/i/ax$1;->kF()Lcom/facebook/imagepipeline/g/e;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/i/ax$1;->kD()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;->aab:Lcom/facebook/imagepipeline/g/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ax$1;->ZX: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;->aab:Lcom/facebook/imagepipeline/g/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ax$1;->ZX: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 ef07a80dab..a799709fbf 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 Sl:Lcom/facebook/common/g/g;
+.field final Sh:Lcom/facebook/common/g/g;
 
-.field private final XO:Lcom/facebook/imagepipeline/i/aj;
+.field private final XK: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;->Sl:Lcom/facebook/common/g/g;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ax;->Sh: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;->XO:Lcom/facebook/imagepipeline/i/aj;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ax;->XK:Lcom/facebook/imagepipeline/i/aj;
 
     return-void
 .end method
@@ -97,7 +97,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ax;->XO:Lcom/facebook/imagepipeline/i/aj;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ax;->XK: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 cd1369e661..5e1b181937 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/i/e.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/i/e.smali
@@ -17,6 +17,18 @@
 
 
 # virtual methods
+.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
 
@@ -28,15 +40,3 @@
 
     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 6a3229a757..f477ee174e 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 kl()Ljava/lang/String;
+.method protected final kj()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 c73ef5f435..b2df0677e8 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 Uh:Lcom/facebook/imagepipeline/cache/f;
+.field private final Ud: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;->Uh:Lcom/facebook/imagepipeline/cache/f;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/g;->Ud: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;->Uh:Lcom/facebook/imagepipeline/cache/f;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/g;->Ud:Lcom/facebook/imagepipeline/cache/f;
 
-    invoke-interface {p1}, Lcom/facebook/imagepipeline/i/ak;->ka()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/i/ak;->jY()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v1
 
-    invoke-interface {p1}, Lcom/facebook/imagepipeline/i/ak;->hn()Ljava/lang/Object;
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/i/ak;->hl()Ljava/lang/Object;
 
     move-result-object v2
 
@@ -52,7 +52,7 @@
 
     move-result-object v0
 
-    invoke-interface {p1}, Lcom/facebook/imagepipeline/i/ak;->kc()Lcom/facebook/imagepipeline/request/b$b;
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/i/ak;->ka()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 7404417478..701e7d2076 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 XV:Lcom/facebook/cache/common/CacheKey;
+.field final synthetic XR:Lcom/facebook/cache/common/CacheKey;
 
-.field final synthetic XW:Z
+.field final synthetic XS:Z
 
-.field final synthetic XX:Lcom/facebook/imagepipeline/i/h;
+.field final synthetic XT: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;->XX:Lcom/facebook/imagepipeline/i/h;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/h$1;->XT:Lcom/facebook/imagepipeline/i/h;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/i/h$1;->XV:Lcom/facebook/cache/common/CacheKey;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/i/h$1;->XR:Lcom/facebook/cache/common/CacheKey;
 
-    iput-boolean p4, p0, Lcom/facebook/imagepipeline/i/h$1;->XW:Z
+    iput-boolean p4, p0, Lcom/facebook/imagepipeline/i/h$1;->XS: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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()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;->Yp:Lcom/facebook/imagepipeline/i/k;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/n;->Yl: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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     return-void
 
@@ -107,11 +107,11 @@
     :cond_2
     if-nez v0, :cond_5
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/i/h$1;->XX:Lcom/facebook/imagepipeline/i/h;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/i/h$1;->XT:Lcom/facebook/imagepipeline/i/h;
 
-    iget-object v2, v2, Lcom/facebook/imagepipeline/i/h;->Kf:Lcom/facebook/imagepipeline/cache/o;
+    iget-object v2, v2, Lcom/facebook/imagepipeline/i/h;->Kb:Lcom/facebook/imagepipeline/cache/o;
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/i/h$1;->XV:Lcom/facebook/cache/common/CacheKey;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/i/h$1;->XR: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;->jn()Lcom/facebook/imagepipeline/g/h;
+    invoke-virtual {v3}, Lcom/facebook/imagepipeline/g/c;->jl()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;->jn()Lcom/facebook/imagepipeline/g/h;
+    invoke-virtual {v4}, Lcom/facebook/imagepipeline/g/c;->jl()Lcom/facebook/imagepipeline/g/h;
 
     move-result-object v4
 
-    invoke-interface {v4}, Lcom/facebook/imagepipeline/g/h;->jC()Z
+    invoke-interface {v4}, Lcom/facebook/imagepipeline/g/h;->jA()Z
 
     move-result v5
 
     if-nez v5, :cond_4
 
-    invoke-interface {v4}, Lcom/facebook/imagepipeline/g/h;->jA()I
+    invoke-interface {v4}, Lcom/facebook/imagepipeline/g/h;->jy()I
 
     move-result v4
 
-    invoke-interface {v3}, Lcom/facebook/imagepipeline/g/h;->jA()I
+    invoke-interface {v3}, Lcom/facebook/imagepipeline/g/h;->jy()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;->Yp:Lcom/facebook/imagepipeline/i/k;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/n;->Yl: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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     return-void
 
@@ -198,15 +198,15 @@
 
     :cond_5
     :goto_1
-    iget-boolean v2, p0, Lcom/facebook/imagepipeline/i/h$1;->XW:Z
+    iget-boolean v2, p0, Lcom/facebook/imagepipeline/i/h$1;->XS:Z
 
     if-eqz v2, :cond_6
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/h$1;->XX:Lcom/facebook/imagepipeline/i/h;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/h$1;->XT:Lcom/facebook/imagepipeline/i/h;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/i/h;->Kf:Lcom/facebook/imagepipeline/cache/o;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/i/h;->Kb:Lcom/facebook/imagepipeline/cache/o;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/i/h$1;->XV:Lcom/facebook/cache/common/CacheKey;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/i/h$1;->XR: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;->Yp:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yl: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;->Yp:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yl: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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     return-void
 
@@ -255,20 +255,20 @@
 
     :cond_9
     :goto_2
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yp:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yl: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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     return-void
 
     :catchall_2
     move-exception p1
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()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 190492613c..7b108738e9 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 Kf:Lcom/facebook/imagepipeline/cache/o;
+.field final Kb: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 Uh:Lcom/facebook/imagepipeline/cache/f;
+.field private final Ud:Lcom/facebook/imagepipeline/cache/f;
 
-.field private final XO:Lcom/facebook/imagepipeline/i/aj;
+.field private final XK: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;->Kf:Lcom/facebook/imagepipeline/cache/o;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/h;->Kb:Lcom/facebook/imagepipeline/cache/o;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/i/h;->Uh:Lcom/facebook/imagepipeline/cache/f;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/h;->Ud:Lcom/facebook/imagepipeline/cache/f;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/i/h;->XO:Lcom/facebook/imagepipeline/i/aj;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/i/h;->XK: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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->kb()Lcom/facebook/imagepipeline/i/am;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->jZ()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;->kl()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/h;->kj()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;->ka()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->jY()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v2
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->hn()Ljava/lang/Object;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->hl()Ljava/lang/Object;
 
     move-result-object v3
 
-    iget-object v4, p0, Lcom/facebook/imagepipeline/i/h;->Uh:Lcom/facebook/imagepipeline/cache/f;
+    iget-object v4, p0, Lcom/facebook/imagepipeline/i/h;->Ud: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;->Kf:Lcom/facebook/imagepipeline/cache/o;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/i/h;->Kb: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;->jn()Lcom/facebook/imagepipeline/g/h;
+    invoke-virtual {v8}, Lcom/facebook/imagepipeline/g/c;->jl()Lcom/facebook/imagepipeline/g/h;
 
     move-result-object v8
 
-    invoke-interface {v8}, Lcom/facebook/imagepipeline/g/h;->jC()Z
+    invoke-interface {v8}, Lcom/facebook/imagepipeline/g/h;->jA()Z
 
     move-result v8
 
     if-eqz v8, :cond_1
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/h;->kl()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/h;->kj()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;->kl()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/h;->kj()Ljava/lang/String;
 
     move-result-object v9
 
@@ -233,19 +233,19 @@
 
     if-eqz v8, :cond_3
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     return-void
 
     :cond_3
     :try_start_2
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->kc()Lcom/facebook/imagepipeline/request/b$b;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->ka()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;->aat:Lcom/facebook/imagepipeline/request/b$b;
+    sget-object v8, Lcom/facebook/imagepipeline/request/b$b;->aap: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;->kl()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/h;->kj()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;->kl()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/h;->kj()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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     return-void
 
     :cond_5
     :try_start_4
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->ka()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->jY()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v3
 
-    iget-boolean v3, v3, Lcom/facebook/imagepipeline/request/b;->Yv:Z
+    iget-boolean v3, v3, Lcom/facebook/imagepipeline/request/b;->Yr: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;->kl()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/h;->kj()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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/h;->XO:Lcom/facebook/imagepipeline/i/aj;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/h;->XK: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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
     :try_end_4
     .catchall {:try_start_4 .. :try_end_4} :catchall_0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     return-void
 
     :catchall_0
     move-exception p1
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     throw p1
 .end method
 
-.method protected kl()Ljava/lang/String;
+.method protected kj()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 88ffdcc742..89168d4d2f 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 XY:I
+.field private final XU:I
 
-.field private final XZ:I
+.field private final XV: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;->XY:I
+    iput p2, p0, Lcom/facebook/imagepipeline/i/i$a;->XU:I
 
-    iput p3, p0, Lcom/facebook/imagepipeline/i/i$a;->XZ:I
+    iput p3, p0, Lcom/facebook/imagepipeline/i/i$a;->XV:I
 
     return-void
 .end method
@@ -109,11 +109,11 @@
 
     mul-int v1, v1, v2
 
-    iget v2, p0, Lcom/facebook/imagepipeline/i/i$a;->XY:I
+    iget v2, p0, Lcom/facebook/imagepipeline/i/i$a;->XU:I
 
     if-lt v1, v2, :cond_2
 
-    iget v2, p0, Lcom/facebook/imagepipeline/i/i$a;->XZ:I
+    iget v2, p0, Lcom/facebook/imagepipeline/i/i$a;->XV:I
 
     if-gt v1, v2, :cond_2
 
@@ -121,7 +121,7 @@
 
     :cond_2
     :goto_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yp:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yl: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 f53589fb04..0548c3ed4d 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 XO:Lcom/facebook/imagepipeline/i/aj;
+.field private final XK: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 XY:I
+.field private final XU:I
 
-.field private final XZ:I
+.field private final XV:I
 
-.field private final Ya:Z
+.field private final XW:Z
 
 
 # direct methods
@@ -76,13 +76,13 @@
 
     check-cast p1, Lcom/facebook/imagepipeline/i/aj;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/i;->XO:Lcom/facebook/imagepipeline/i/aj;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/i;->XK:Lcom/facebook/imagepipeline/i/aj;
 
-    iput p2, p0, Lcom/facebook/imagepipeline/i/i;->XY:I
+    iput p2, p0, Lcom/facebook/imagepipeline/i/i;->XU:I
 
-    iput p3, p0, Lcom/facebook/imagepipeline/i/i;->XZ:I
+    iput p3, p0, Lcom/facebook/imagepipeline/i/i;->XV:I
 
-    iput-boolean p4, p0, Lcom/facebook/imagepipeline/i/i;->Ya:Z
+    iput-boolean p4, p0, Lcom/facebook/imagepipeline/i/i;->XW:Z
 
     return-void
 .end method
@@ -103,30 +103,30 @@
         }
     .end annotation
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->kd()Z
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->kb()Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/i/i;->Ya:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/i/i;->XW:Z
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/i;->XO:Lcom/facebook/imagepipeline/i/aj;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/i;->XK: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;->XO:Lcom/facebook/imagepipeline/i/aj;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/i;->XK:Lcom/facebook/imagepipeline/i/aj;
 
     new-instance v1, Lcom/facebook/imagepipeline/i/i$a;
 
-    iget v2, p0, Lcom/facebook/imagepipeline/i/i;->XY:I
+    iget v2, p0, Lcom/facebook/imagepipeline/i/i;->XU:I
 
-    iget v3, p0, Lcom/facebook/imagepipeline/i/i;->XZ:I
+    iget v3, p0, Lcom/facebook/imagepipeline/i/i;->XV: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 d0c63bbc7a..32a9de75a1 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 Yd:Lcom/facebook/imagepipeline/i/ak;
+.field private XZ:Lcom/facebook/imagepipeline/i/ak;
 
-.field final synthetic Ye:Lcom/facebook/imagepipeline/i/j;
+.field final synthetic Ya:Lcom/facebook/imagepipeline/i/j;
 
 
 # direct methods
@@ -43,11 +43,11 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/j$a;->Ye:Lcom/facebook/imagepipeline/i/j;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/j$a;->Ya: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;->Yd:Lcom/facebook/imagepipeline/i/ak;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/i/j$a;->XZ: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;->Yd:Lcom/facebook/imagepipeline/i/ak;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/j$a;->XZ:Lcom/facebook/imagepipeline/i/ak;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/ak;->ka()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/ak;->jY()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;->St:Lcom/facebook/imagepipeline/a/e;
+    iget-object v2, v0, Lcom/facebook/imagepipeline/request/b;->Sp: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;->aai:Z
+    iget-boolean v0, v0, Lcom/facebook/imagepipeline/request/b;->aae:Z
 
     if-eqz v0, :cond_2
 
@@ -96,7 +96,7 @@
 
     if-eqz v2, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yp:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yl: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;->Yp:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yl: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;->Ye:Lcom/facebook/imagepipeline/i/j;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/j$a;->Ya:Lcom/facebook/imagepipeline/i/j;
 
-    iget-object p1, p1, Lcom/facebook/imagepipeline/i/j;->Yc:Lcom/facebook/imagepipeline/i/aj;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/i/j;->XY:Lcom/facebook/imagepipeline/i/aj;
 
-    iget-object p2, p0, Lcom/facebook/imagepipeline/i/n;->Yp:Lcom/facebook/imagepipeline/i/k;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/i/n;->Yl:Lcom/facebook/imagepipeline/i/k;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/j$a;->Yd:Lcom/facebook/imagepipeline/i/ak;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/j$a;->XZ: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;->Ye:Lcom/facebook/imagepipeline/i/j;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/j$a;->Ya:Lcom/facebook/imagepipeline/i/j;
 
-    iget-object p1, p1, Lcom/facebook/imagepipeline/i/j;->Yc:Lcom/facebook/imagepipeline/i/aj;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/i/j;->XY:Lcom/facebook/imagepipeline/i/aj;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yp:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yl:Lcom/facebook/imagepipeline/i/k;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/j$a;->Yd:Lcom/facebook/imagepipeline/i/ak;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/j$a;->XZ: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 42dbdcae6a..1279524c1a 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 Yb:Lcom/facebook/imagepipeline/i/aj;
+.field private final XX: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 Yc:Lcom/facebook/imagepipeline/i/aj;
+.field final XY: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;->Yb:Lcom/facebook/imagepipeline/i/aj;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/j;->XX:Lcom/facebook/imagepipeline/i/aj;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/i/j;->Yc:Lcom/facebook/imagepipeline/i/aj;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/j;->XY: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;->Yb:Lcom/facebook/imagepipeline/i/aj;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/j;->XX: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 081e58109b..e567301ea4 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;->gb()Lcom/facebook/common/b/a;
+    invoke-static {}, Lcom/facebook/common/b/a;->fZ()Lcom/facebook/common/b/a;
 
     move-result-object v0
 
@@ -26,7 +26,7 @@
         }
     .end annotation
 
-    iget-object p1, p1, Lcom/facebook/imagepipeline/request/b;->aaf:Landroid/net/Uri;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/request/b;->aab: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 kl()Ljava/lang/String;
+.method protected final kj()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 9364b34cfc..ceee4bd716 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 Yg:Lcom/facebook/imagepipeline/i/m;
+.field final synthetic Yc:Lcom/facebook/imagepipeline/i/m;
 
 
 # direct methods
@@ -33,7 +33,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/m$a;->Yg:Lcom/facebook/imagepipeline/i/m;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/m$a;->Yc: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 jn()Lcom/facebook/imagepipeline/g/h;
+.method protected final jl()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 50a22605d6..424522ea87 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 UC:Lcom/facebook/imagepipeline/e/e;
+.field private final Uy:Lcom/facebook/imagepipeline/e/e;
 
-.field final synthetic Yg:Lcom/facebook/imagepipeline/i/m;
+.field final synthetic Yc:Lcom/facebook/imagepipeline/i/m;
 
-.field private final Yh:Lcom/facebook/imagepipeline/e/f;
+.field private final Yd:Lcom/facebook/imagepipeline/e/f;
 
-.field private Yi:I
+.field private Ye:I
 
 
 # direct methods
@@ -41,7 +41,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/m$b;->Yg:Lcom/facebook/imagepipeline/i/m;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/m$b;->Yc: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;->Yh:Lcom/facebook/imagepipeline/e/f;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/m$b;->Yd: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;->UC:Lcom/facebook/imagepipeline/e/e;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/m$b;->Uy:Lcom/facebook/imagepipeline/e/e;
 
     const/4 p1, 0x0
 
-    iput p1, p0, Lcom/facebook/imagepipeline/i/m$b;->Yi:I
+    iput p1, p0, Lcom/facebook/imagepipeline/i/m$b;->Ye:I
 
     return-void
 .end method
@@ -121,15 +121,15 @@
 
     if-eqz p2, :cond_4
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->jr()Lcom/facebook/e/c;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->jp()Lcom/facebook/e/c;
 
     move-result-object p2
 
-    sget-object v1, Lcom/facebook/e/b;->QY:Lcom/facebook/e/c;
+    sget-object v1, Lcom/facebook/e/b;->QU:Lcom/facebook/e/c;
 
     if-ne p2, v1, :cond_4
 
-    iget-object p2, p0, Lcom/facebook/imagepipeline/i/m$b;->Yh:Lcom/facebook/imagepipeline/e/f;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/i/m$b;->Yd: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;->Yh:Lcom/facebook/imagepipeline/e/f;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/m$b;->Yd:Lcom/facebook/imagepipeline/e/f;
 
-    iget p1, p1, Lcom/facebook/imagepipeline/e/f;->VW:I
+    iget p1, p1, Lcom/facebook/imagepipeline/e/f;->VS:I
 
-    iget v1, p0, Lcom/facebook/imagepipeline/i/m$b;->Yi:I
+    iget v1, p0, Lcom/facebook/imagepipeline/i/m$b;->Ye: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;->UC:Lcom/facebook/imagepipeline/e/e;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/m$b;->Uy:Lcom/facebook/imagepipeline/e/e;
 
-    iget v2, p0, Lcom/facebook/imagepipeline/i/m$b;->Yi:I
+    iget v2, p0, Lcom/facebook/imagepipeline/i/m$b;->Ye: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;->Yh:Lcom/facebook/imagepipeline/e/f;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/m$b;->Yd:Lcom/facebook/imagepipeline/e/f;
 
-    iget-boolean v1, v1, Lcom/facebook/imagepipeline/e/f;->VY:Z
+    iget-boolean v1, v1, Lcom/facebook/imagepipeline/e/f;->VU: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;->Yi:I
+    iput p1, p0, Lcom/facebook/imagepipeline/i/m$b;->Ye: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;->Yh:Lcom/facebook/imagepipeline/e/f;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/m$b;->Yd:Lcom/facebook/imagepipeline/e/f;
 
-    iget p1, p1, Lcom/facebook/imagepipeline/e/f;->VX:I
+    iget p1, p1, Lcom/facebook/imagepipeline/e/f;->VT:I
 
     return p1
 .end method
 
-.method protected final jn()Lcom/facebook/imagepipeline/g/h;
+.method protected final jl()Lcom/facebook/imagepipeline/g/h;
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/m$b;->UC:Lcom/facebook/imagepipeline/e/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/m$b;->Uy:Lcom/facebook/imagepipeline/e/e;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/m$b;->Yh:Lcom/facebook/imagepipeline/e/f;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/m$b;->Yd:Lcom/facebook/imagepipeline/e/f;
 
-    iget v1, v1, Lcom/facebook/imagepipeline/e/f;->VW:I
+    iget v1, v1, Lcom/facebook/imagepipeline/e/f;->VS: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 7755bc9e30..3c9656a12c 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 Yk:Lcom/facebook/imagepipeline/i/m;
+.field final synthetic Yg:Lcom/facebook/imagepipeline/i/m;
 
-.field final synthetic Yl:Lcom/facebook/imagepipeline/i/ak;
+.field final synthetic Yh:Lcom/facebook/imagepipeline/i/ak;
 
-.field final synthetic Ym:I
+.field final synthetic Yi:I
 
-.field final synthetic Yn:Lcom/facebook/imagepipeline/i/m$c;
+.field final synthetic Yj: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;->Yn:Lcom/facebook/imagepipeline/i/m$c;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/m$c$1;->Yj:Lcom/facebook/imagepipeline/i/m$c;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/i/m$c$1;->Yk:Lcom/facebook/imagepipeline/i/m;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/m$c$1;->Yg:Lcom/facebook/imagepipeline/i/m;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/i/m$c$1;->Yl:Lcom/facebook/imagepipeline/i/ak;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/i/m$c$1;->Yh:Lcom/facebook/imagepipeline/i/ak;
 
-    iput p4, p0, Lcom/facebook/imagepipeline/i/m$c$1;->Ym:I
+    iput p4, p0, Lcom/facebook/imagepipeline/i/m$c$1;->Yi: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;->Yn:Lcom/facebook/imagepipeline/i/m$c;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/m$c$1;->Yj:Lcom/facebook/imagepipeline/i/m$c;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/i/m$c;->Yg:Lcom/facebook/imagepipeline/i/m;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/i/m$c;->Yc:Lcom/facebook/imagepipeline/i/m;
 
-    iget-boolean v0, v0, Lcom/facebook/imagepipeline/i/m;->Uq:Z
+    iget-boolean v0, v0, Lcom/facebook/imagepipeline/i/m;->Um: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;->Yl:Lcom/facebook/imagepipeline/i/ak;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/m$c$1;->Yh:Lcom/facebook/imagepipeline/i/ak;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/ak;->ka()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/ak;->jY()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/m$c$1;->Yn:Lcom/facebook/imagepipeline/i/m$c;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/m$c$1;->Yj:Lcom/facebook/imagepipeline/i/m$c;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/i/m$c;->Yg:Lcom/facebook/imagepipeline/i/m;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/i/m$c;->Yc:Lcom/facebook/imagepipeline/i/m;
 
-    iget-boolean v1, v1, Lcom/facebook/imagepipeline/i/m;->Yf:Z
+    iget-boolean v1, v1, Lcom/facebook/imagepipeline/i/m;->Yb:Z
 
     if-nez v1, :cond_1
 
-    iget-object v1, v0, Lcom/facebook/imagepipeline/request/b;->aaf:Landroid/net/Uri;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/request/b;->aab: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;->Su:Lcom/facebook/imagepipeline/a/f;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/request/b;->Sq:Lcom/facebook/imagepipeline/a/f;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/request/b;->St:Lcom/facebook/imagepipeline/a/e;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/request/b;->Sp:Lcom/facebook/imagepipeline/a/e;
 
-    iget v2, p0, Lcom/facebook/imagepipeline/i/m$c$1;->Ym:I
+    iget v2, p0, Lcom/facebook/imagepipeline/i/m$c$1;->Yi: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;->Wg:I
+    iput v0, p1, Lcom/facebook/imagepipeline/g/e;->Wc:I
 
     :cond_2
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/m$c$1;->Yn:Lcom/facebook/imagepipeline/i/m$c;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/m$c$1;->Yj: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 dddf4b622e..3c653bc514 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 Yk:Lcom/facebook/imagepipeline/i/m;
+.field final synthetic Yg:Lcom/facebook/imagepipeline/i/m;
 
-.field final synthetic Yn:Lcom/facebook/imagepipeline/i/m$c;
+.field final synthetic Yj:Lcom/facebook/imagepipeline/i/m$c;
 
-.field final synthetic Yo:Z
+.field final synthetic Yk: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;->Yn:Lcom/facebook/imagepipeline/i/m$c;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/m$c$2;->Yj:Lcom/facebook/imagepipeline/i/m$c;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/i/m$c$2;->Yk:Lcom/facebook/imagepipeline/i/m;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/m$c$2;->Yg:Lcom/facebook/imagepipeline/i/m;
 
-    iput-boolean p3, p0, Lcom/facebook/imagepipeline/i/m$c$2;->Yo:Z
+    iput-boolean p3, p0, Lcom/facebook/imagepipeline/i/m$c$2;->Yk:Z
 
     invoke-direct {p0}, Lcom/facebook/imagepipeline/i/e;-><init>()V
 
@@ -39,39 +39,39 @@
 
 
 # virtual methods
-.method public final kh()V
+.method public final kf()V
     .locals 1
 
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/i/m$c$2;->Yo:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/i/m$c$2;->Yk:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/m$c$2;->Yn:Lcom/facebook/imagepipeline/i/m$c;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/m$c$2;->Yj:Lcom/facebook/imagepipeline/i/m$c;
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/m$c;->km()V
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/m$c;->kk()V
 
     :cond_0
     return-void
 .end method
 
-.method public final kj()V
+.method public final kh()V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/m$c$2;->Yn:Lcom/facebook/imagepipeline/i/m$c;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/m$c$2;->Yj:Lcom/facebook/imagepipeline/i/m$c;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/i/m$c;->Yd:Lcom/facebook/imagepipeline/i/ak;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/i/m$c;->XZ:Lcom/facebook/imagepipeline/i/ak;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/ak;->kf()Z
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/ak;->kd()Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/m$c$2;->Yn:Lcom/facebook/imagepipeline/i/m$c;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/m$c$2;->Yj:Lcom/facebook/imagepipeline/i/m$c;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/i/m$c;->Yj:Lcom/facebook/imagepipeline/i/u;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/i/m$c;->Yf:Lcom/facebook/imagepipeline/i/u;
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/u;->ko()Z
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/u;->km()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 5f7efb5ba4..6a38c98db7 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 Iy:Lcom/facebook/common/g/a;
+.field private final Iu:Lcom/facebook/common/g/a;
 
-.field final Si:Lcom/facebook/imagepipeline/b/a;
+.field final Se:Lcom/facebook/imagepipeline/b/a;
 
-.field private final UC:Lcom/facebook/imagepipeline/e/e;
+.field private final UN:Z
 
-.field private final US:Z
+.field private final UV:I
 
-.field private final UZ:I
+.field final Um:Z
 
-.field final Uq:Z
+.field final Up:Lcom/facebook/imagepipeline/e/c;
 
-.field final Ut:Lcom/facebook/imagepipeline/e/c;
+.field private final Uy:Lcom/facebook/imagepipeline/e/e;
 
-.field private final XO:Lcom/facebook/imagepipeline/i/aj;
+.field private final XK: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 Yf:Z
+.field final Yb: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;->Iy:Lcom/facebook/common/g/a;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/m;->Iu: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;->Ut:Lcom/facebook/imagepipeline/e/c;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/m;->Up: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;->UC:Lcom/facebook/imagepipeline/e/e;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/m;->Uy:Lcom/facebook/imagepipeline/e/e;
 
-    iput-boolean p5, p0, Lcom/facebook/imagepipeline/i/m;->Uq:Z
+    iput-boolean p5, p0, Lcom/facebook/imagepipeline/i/m;->Um:Z
 
-    iput-boolean p6, p0, Lcom/facebook/imagepipeline/i/m;->Yf:Z
+    iput-boolean p6, p0, Lcom/facebook/imagepipeline/i/m;->Yb: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;->XO:Lcom/facebook/imagepipeline/i/aj;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/m;->XK:Lcom/facebook/imagepipeline/i/aj;
 
-    iput-boolean p7, p0, Lcom/facebook/imagepipeline/i/m;->US:Z
+    iput-boolean p7, p0, Lcom/facebook/imagepipeline/i/m;->UN:Z
 
-    iput p9, p0, Lcom/facebook/imagepipeline/i/m;->UZ:I
+    iput p9, p0, Lcom/facebook/imagepipeline/i/m;->UV:I
 
-    iput-object p10, p0, Lcom/facebook/imagepipeline/i/m;->Si:Lcom/facebook/imagepipeline/b/a;
+    iput-object p10, p0, Lcom/facebook/imagepipeline/i/m;->Se: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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->ka()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->jY()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/request/b;->aaf:Landroid/net/Uri;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/request/b;->aab: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;->US:Z
+    iget-boolean v5, p0, Lcom/facebook/imagepipeline/i/m;->UN:Z
 
-    iget v6, p0, Lcom/facebook/imagepipeline/i/m;->UZ:I
+    iget v6, p0, Lcom/facebook/imagepipeline/i/m;->UV: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;->Iy:Lcom/facebook/common/g/a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/m;->Iu: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;->UC:Lcom/facebook/imagepipeline/e/e;
+    iget-object v5, p0, Lcom/facebook/imagepipeline/i/m;->Uy:Lcom/facebook/imagepipeline/e/e;
 
-    iget-boolean v6, p0, Lcom/facebook/imagepipeline/i/m;->US:Z
+    iget-boolean v6, p0, Lcom/facebook/imagepipeline/i/m;->UN:Z
 
-    iget v7, p0, Lcom/facebook/imagepipeline/i/m;->UZ:I
+    iget v7, p0, Lcom/facebook/imagepipeline/i/m;->UV:I
 
     move-object v0, v8
 
@@ -207,20 +207,20 @@
     move-object v0, v8
 
     :goto_0
-    iget-object p1, p0, Lcom/facebook/imagepipeline/i/m;->XO:Lcom/facebook/imagepipeline/i/aj;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/m;->XK: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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     return-void
 
     :catchall_0
     move-exception p1
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()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 24945f7e6a..9a42303c09 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 Yl:Lcom/facebook/imagepipeline/i/ak;
+.field final synthetic Yh:Lcom/facebook/imagepipeline/i/ak;
 
-.field final synthetic Yq:Lcom/facebook/imagepipeline/i/am;
+.field final synthetic Ym:Lcom/facebook/imagepipeline/i/am;
 
-.field final synthetic Yr:Ljava/lang/String;
+.field final synthetic Yn:Ljava/lang/String;
 
-.field final synthetic Ys:Lcom/facebook/imagepipeline/i/k;
+.field final synthetic Yo:Lcom/facebook/imagepipeline/i/k;
 
-.field final synthetic Yt:Lcom/facebook/imagepipeline/i/o;
+.field final synthetic Yp: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;->Yt:Lcom/facebook/imagepipeline/i/o;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/o$1;->Yp:Lcom/facebook/imagepipeline/i/o;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/i/o$1;->Yq:Lcom/facebook/imagepipeline/i/am;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/o$1;->Ym:Lcom/facebook/imagepipeline/i/am;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/i/o$1;->Yr:Ljava/lang/String;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/i/o$1;->Yn:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/facebook/imagepipeline/i/o$1;->Ys:Lcom/facebook/imagepipeline/i/k;
+    iput-object p4, p0, Lcom/facebook/imagepipeline/i/o$1;->Yo:Lcom/facebook/imagepipeline/i/k;
 
-    iput-object p5, p0, Lcom/facebook/imagepipeline/i/o$1;->Yl:Lcom/facebook/imagepipeline/i/ak;
+    iput-object p5, p0, Lcom/facebook/imagepipeline/i/o$1;->Yh: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;->Yq:Lcom/facebook/imagepipeline/i/am;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/o$1;->Ym:Lcom/facebook/imagepipeline/i/am;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/o$1;->Yr:Ljava/lang/String;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/o$1;->Yn: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;->Ys:Lcom/facebook/imagepipeline/i/k;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/o$1;->Yo:Lcom/facebook/imagepipeline/i/k;
 
-    invoke-interface {p1}, Lcom/facebook/imagepipeline/i/k;->gg()V
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/i/k;->ge()V
 
     goto :goto_2
 
@@ -129,9 +129,9 @@
 
     if-eqz v0, :cond_3
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/o$1;->Yq:Lcom/facebook/imagepipeline/i/am;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/o$1;->Ym:Lcom/facebook/imagepipeline/i/am;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/o$1;->Yr:Ljava/lang/String;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/o$1;->Yn: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;->Yt:Lcom/facebook/imagepipeline/i/o;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/o$1;->Yp:Lcom/facebook/imagepipeline/i/o;
 
-    iget-object p1, p1, Lcom/facebook/imagepipeline/i/o;->XO:Lcom/facebook/imagepipeline/i/aj;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/i/o;->XK:Lcom/facebook/imagepipeline/i/aj;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/o$1;->Ys:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/o$1;->Yo:Lcom/facebook/imagepipeline/i/k;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/o$1;->Yl:Lcom/facebook/imagepipeline/i/ak;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/o$1;->Yh: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;->Yq:Lcom/facebook/imagepipeline/i/am;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/o$1;->Ym:Lcom/facebook/imagepipeline/i/am;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/o$1;->Yr:Ljava/lang/String;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/o$1;->Yn: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;->Yq:Lcom/facebook/imagepipeline/i/am;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/o$1;->Ym:Lcom/facebook/imagepipeline/i/am;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/o$1;->Yr:Ljava/lang/String;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/o$1;->Yn: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;->Ys:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/o$1;->Yo: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;->Ys:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/o$1;->Yo: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;->Yq:Lcom/facebook/imagepipeline/i/am;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/o$1;->Ym:Lcom/facebook/imagepipeline/i/am;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/o$1;->Yr:Ljava/lang/String;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/o$1;->Yn: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;->Yt:Lcom/facebook/imagepipeline/i/o;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/o$1;->Yp:Lcom/facebook/imagepipeline/i/o;
 
-    iget-object p1, p1, Lcom/facebook/imagepipeline/i/o;->XO:Lcom/facebook/imagepipeline/i/aj;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/i/o;->XK:Lcom/facebook/imagepipeline/i/aj;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/o$1;->Ys:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/o$1;->Yo:Lcom/facebook/imagepipeline/i/k;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/o$1;->Yl:Lcom/facebook/imagepipeline/i/ak;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/o$1;->Yh: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 b33d4d01bf..66c680b959 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 SG:Ljava/util/concurrent/atomic/AtomicBoolean;
+.field final synthetic SC:Ljava/util/concurrent/atomic/AtomicBoolean;
 
-.field final synthetic Yt:Lcom/facebook/imagepipeline/i/o;
+.field final synthetic Yp: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;->Yt:Lcom/facebook/imagepipeline/i/o;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/o$2;->Yp:Lcom/facebook/imagepipeline/i/o;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/i/o$2;->SG:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/o$2;->SC:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     invoke-direct {p0}, Lcom/facebook/imagepipeline/i/e;-><init>()V
 
@@ -35,10 +35,10 @@
 
 
 # virtual methods
-.method public final kh()V
+.method public final kf()V
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/o$2;->SG:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/o$2;->SC: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 8351176320..c50db97903 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 Ug:Lcom/facebook/imagepipeline/cache/e;
+.field private final Uc:Lcom/facebook/imagepipeline/cache/e;
 
-.field private final Uh:Lcom/facebook/imagepipeline/cache/f;
+.field private final Ud:Lcom/facebook/imagepipeline/cache/f;
 
-.field private final Vw:Lcom/facebook/imagepipeline/cache/e;
+.field private final Vs:Lcom/facebook/imagepipeline/cache/e;
 
-.field private final Yd:Lcom/facebook/imagepipeline/i/ak;
+.field private final XZ: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;->Yd:Lcom/facebook/imagepipeline/i/ak;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/p$a;->XZ:Lcom/facebook/imagepipeline/i/ak;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/i/p$a;->Vw:Lcom/facebook/imagepipeline/cache/e;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/i/p$a;->Vs:Lcom/facebook/imagepipeline/cache/e;
 
-    iput-object p4, p0, Lcom/facebook/imagepipeline/i/p$a;->Ug:Lcom/facebook/imagepipeline/cache/e;
+    iput-object p4, p0, Lcom/facebook/imagepipeline/i/p$a;->Uc:Lcom/facebook/imagepipeline/cache/e;
 
-    iput-object p5, p0, Lcom/facebook/imagepipeline/i/p$a;->Uh:Lcom/facebook/imagepipeline/cache/f;
+    iput-object p5, p0, Lcom/facebook/imagepipeline/i/p$a;->Ud: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;->jr()Lcom/facebook/e/c;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->jp()Lcom/facebook/e/c;
 
     move-result-object v0
 
-    sget-object v1, Lcom/facebook/e/c;->Rj:Lcom/facebook/e/c;
+    sget-object v1, Lcom/facebook/e/c;->Rf: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;->Yd:Lcom/facebook/imagepipeline/i/ak;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/p$a;->XZ:Lcom/facebook/imagepipeline/i/ak;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/ak;->ka()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/ak;->jY()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/p$a;->Uh:Lcom/facebook/imagepipeline/cache/f;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/p$a;->Ud:Lcom/facebook/imagepipeline/cache/f;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/i/p$a;->Yd:Lcom/facebook/imagepipeline/i/ak;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/i/p$a;->XZ:Lcom/facebook/imagepipeline/i/ak;
 
-    invoke-interface {v2}, Lcom/facebook/imagepipeline/i/ak;->hn()Ljava/lang/Object;
+    invoke-interface {v2}, Lcom/facebook/imagepipeline/i/ak;->hl()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;->aae:Lcom/facebook/imagepipeline/request/b$a;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/request/b;->aaa:Lcom/facebook/imagepipeline/request/b$a;
 
-    sget-object v2, Lcom/facebook/imagepipeline/request/b$a;->aan:Lcom/facebook/imagepipeline/request/b$a;
+    sget-object v2, Lcom/facebook/imagepipeline/request/b$a;->aaj:Lcom/facebook/imagepipeline/request/b$a;
 
     if-ne v0, v2, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/p$a;->Ug:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/p$a;->Uc: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;->Vw:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/p$a;->Vs: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;->Yp:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yl: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;->Yp:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yl: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 f146892fd1..e22a53584c 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 Ug:Lcom/facebook/imagepipeline/cache/e;
+.field private final Uc:Lcom/facebook/imagepipeline/cache/e;
 
-.field private final Uh:Lcom/facebook/imagepipeline/cache/f;
+.field private final Ud:Lcom/facebook/imagepipeline/cache/f;
 
-.field private final Vw:Lcom/facebook/imagepipeline/cache/e;
+.field private final Vs:Lcom/facebook/imagepipeline/cache/e;
 
-.field private final XO:Lcom/facebook/imagepipeline/i/aj;
+.field private final XK: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;->Vw:Lcom/facebook/imagepipeline/cache/e;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/p;->Vs:Lcom/facebook/imagepipeline/cache/e;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/i/p;->Ug:Lcom/facebook/imagepipeline/cache/e;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/p;->Uc:Lcom/facebook/imagepipeline/cache/e;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/i/p;->Uh:Lcom/facebook/imagepipeline/cache/f;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/i/p;->Ud:Lcom/facebook/imagepipeline/cache/f;
 
-    iput-object p4, p0, Lcom/facebook/imagepipeline/i/p;->XO:Lcom/facebook/imagepipeline/i/aj;
+    iput-object p4, p0, Lcom/facebook/imagepipeline/i/p;->XK:Lcom/facebook/imagepipeline/i/aj;
 
     return-void
 .end method
@@ -84,13 +84,13 @@
         }
     .end annotation
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->kc()Lcom/facebook/imagepipeline/request/b$b;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->ka()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;->aar:Lcom/facebook/imagepipeline/request/b$b;
+    sget-object v1, Lcom/facebook/imagepipeline/request/b$b;->aan: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;->ka()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->jY()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v0
 
-    iget-boolean v0, v0, Lcom/facebook/imagepipeline/request/b;->aak:Z
+    iget-boolean v0, v0, Lcom/facebook/imagepipeline/request/b;->aag:Z
 
     if-eqz v0, :cond_1
 
     new-instance v0, Lcom/facebook/imagepipeline/i/p$a;
 
-    iget-object v4, p0, Lcom/facebook/imagepipeline/i/p;->Vw:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v4, p0, Lcom/facebook/imagepipeline/i/p;->Vs:Lcom/facebook/imagepipeline/cache/e;
 
-    iget-object v5, p0, Lcom/facebook/imagepipeline/i/p;->Ug:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v5, p0, Lcom/facebook/imagepipeline/i/p;->Uc:Lcom/facebook/imagepipeline/cache/e;
 
-    iget-object v6, p0, Lcom/facebook/imagepipeline/i/p;->Uh:Lcom/facebook/imagepipeline/cache/f;
+    iget-object v6, p0, Lcom/facebook/imagepipeline/i/p;->Ud: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;->XO:Lcom/facebook/imagepipeline/i/aj;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/p;->XK: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 5388592156..3ae7c71138 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 Uh:Lcom/facebook/imagepipeline/cache/f;
+.field private final Ud: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;->Uh:Lcom/facebook/imagepipeline/cache/f;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/q;->Ud: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;->Uh:Lcom/facebook/imagepipeline/cache/f;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/q;->Ud:Lcom/facebook/imagepipeline/cache/f;
 
-    invoke-interface {p1}, Lcom/facebook/imagepipeline/i/ak;->ka()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/i/ak;->jY()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v1
 
-    invoke-interface {p1}, Lcom/facebook/imagepipeline/i/ak;->hn()Ljava/lang/Object;
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/i/ak;->hl()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;->kc()Lcom/facebook/imagepipeline/request/b$b;
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/i/ak;->ka()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 118e7d8c6c..12fa626203 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 Kf:Lcom/facebook/imagepipeline/cache/o;
+.field private final Kb: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 Yu:Lcom/facebook/cache/common/CacheKey;
+.field private final Yq:Lcom/facebook/cache/common/CacheKey;
 
-.field private final Yv:Z
+.field private final Yr: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;->Kf:Lcom/facebook/imagepipeline/cache/o;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/r$a;->Kb:Lcom/facebook/imagepipeline/cache/o;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/i/r$a;->Yu:Lcom/facebook/cache/common/CacheKey;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/i/r$a;->Yq:Lcom/facebook/cache/common/CacheKey;
 
-    iput-boolean p4, p0, Lcom/facebook/imagepipeline/i/r$a;->Yv:Z
+    iput-boolean p4, p0, Lcom/facebook/imagepipeline/i/r$a;->Yr: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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()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;->jr()Lcom/facebook/e/c;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->jp()Lcom/facebook/e/c;
 
     move-result-object v0
 
-    sget-object v1, Lcom/facebook/e/c;->Rj:Lcom/facebook/e/c;
+    sget-object v1, Lcom/facebook/e/c;->Rf:Lcom/facebook/e/c;
 
     if-ne v0, v1, :cond_0
 
     goto :goto_0
 
     :cond_0
-    iget-object v0, p1, Lcom/facebook/imagepipeline/g/e;->Wd:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/g/e;->VZ: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;->Yv:Z
+    iget-boolean v2, p0, Lcom/facebook/imagepipeline/i/r$a;->Yr:Z
 
     if-eqz v2, :cond_1
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/r$a;->Kf:Lcom/facebook/imagepipeline/cache/o;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/r$a;->Kb:Lcom/facebook/imagepipeline/cache/o;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/i/r$a;->Yu:Lcom/facebook/cache/common/CacheKey;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/i/r$a;->Yq: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;->Yp:Lcom/facebook/imagepipeline/i/k;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/n;->Yl: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;->Yp:Lcom/facebook/imagepipeline/i/k;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/n;->Yl: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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     return-void
 
@@ -198,33 +198,33 @@
     throw p1
 
     :cond_2
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yp:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yl: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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     return-void
 
     :cond_3
     :goto_0
     :try_start_8
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yp:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yl: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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     return-void
 
     :catchall_3
     move-exception p1
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()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 fb0d1d005e..4d0416a78a 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 Kf:Lcom/facebook/imagepipeline/cache/o;
+.field private final Kb: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 Uh:Lcom/facebook/imagepipeline/cache/f;
+.field private final Ud:Lcom/facebook/imagepipeline/cache/f;
 
-.field private final XO:Lcom/facebook/imagepipeline/i/aj;
+.field private final XK: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;->Kf:Lcom/facebook/imagepipeline/cache/o;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/r;->Kb:Lcom/facebook/imagepipeline/cache/o;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/i/r;->Uh:Lcom/facebook/imagepipeline/cache/f;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/r;->Ud:Lcom/facebook/imagepipeline/cache/f;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/i/r;->XO:Lcom/facebook/imagepipeline/i/aj;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/i/r;->XK: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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()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;->kb()Lcom/facebook/imagepipeline/i/am;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->jZ()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;->ka()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->jY()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v3
 
-    iget-object v4, p0, Lcom/facebook/imagepipeline/i/r;->Uh:Lcom/facebook/imagepipeline/cache/f;
+    iget-object v4, p0, Lcom/facebook/imagepipeline/i/r;->Ud:Lcom/facebook/imagepipeline/cache/f;
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->hn()Ljava/lang/Object;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->hl()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;->Kf:Lcom/facebook/imagepipeline/cache/o;
+    iget-object v4, p0, Lcom/facebook/imagepipeline/i/r;->Kb: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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     return-void
 
@@ -190,13 +190,13 @@
     throw p1
 
     :cond_1
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->kc()Lcom/facebook/imagepipeline/request/b$b;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->ka()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;->aas:Lcom/facebook/imagepipeline/request/b$b;
+    sget-object v9, Lcom/facebook/imagepipeline/request/b$b;->aao: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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     return-void
 
     :cond_3
     :try_start_8
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->ka()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->jY()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v5
 
-    iget-boolean v5, v5, Lcom/facebook/imagepipeline/request/b;->Yv:Z
+    iget-boolean v5, v5, Lcom/facebook/imagepipeline/request/b;->Yr:Z
 
     new-instance v8, Lcom/facebook/imagepipeline/i/r$a;
 
-    iget-object v9, p0, Lcom/facebook/imagepipeline/i/r;->Kf:Lcom/facebook/imagepipeline/cache/o;
+    iget-object v9, p0, Lcom/facebook/imagepipeline/i/r;->Kb: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;->XO:Lcom/facebook/imagepipeline/i/aj;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/r;->XK: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;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
     return-void
 
@@ -297,7 +297,7 @@
     :catchall_2
     move-exception p1
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()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 ed176860dd..8383fa263b 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 YA:Lcom/facebook/imagepipeline/i/t$a;
+.field final synthetic Yw:Lcom/facebook/imagepipeline/i/t$a;
 
-.field final synthetic YB:Lcom/facebook/imagepipeline/i/af$a;
+.field final synthetic Yx:Lcom/facebook/imagepipeline/i/af$a;
 
-.field final synthetic YC:Lcom/facebook/imagepipeline/i/t;
+.field final synthetic Yy: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;->YC:Lcom/facebook/imagepipeline/i/t;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/t$1;->Yy:Lcom/facebook/imagepipeline/i/t;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/i/t$1;->YA:Lcom/facebook/imagepipeline/i/t$a;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/t$1;->Yw:Lcom/facebook/imagepipeline/i/t$a;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/i/t$1;->YB:Lcom/facebook/imagepipeline/i/af$a;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/i/t$1;->Yx: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;->YC:Lcom/facebook/imagepipeline/i/t;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/t$1;->Yy:Lcom/facebook/imagepipeline/i/t;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/t$1;->YA:Lcom/facebook/imagepipeline/i/t$a;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/t$1;->Yw:Lcom/facebook/imagepipeline/i/t$a;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/i/t$1;->YB:Lcom/facebook/imagepipeline/i/af$a;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/i/t$1;->Yx:Lcom/facebook/imagepipeline/i/af$a;
 
     const/4 v3, 0x0
 
     :try_start_0
-    iget-object v4, v1, Lcom/facebook/imagepipeline/i/s;->Yw:Lcom/facebook/imagepipeline/i/ak;
+    iget-object v4, v1, Lcom/facebook/imagepipeline/i/s;->Ys:Lcom/facebook/imagepipeline/i/ak;
 
-    invoke-interface {v4}, Lcom/facebook/imagepipeline/i/ak;->ka()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {v4}, Lcom/facebook/imagepipeline/i/ak;->jY()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v4
 
-    iget-object v4, v4, Lcom/facebook/imagepipeline/request/b;->aaf:Landroid/net/Uri;
+    iget-object v4, v4, Lcom/facebook/imagepipeline/request/b;->aab: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;->UM:I
+    iget v7, v0, Lcom/facebook/imagepipeline/i/t;->UI: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;->KR:Lcom/facebook/common/time/b;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/i/t;->KN: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;->YF:J
+    iput-wide v4, v1, Lcom/facebook/imagepipeline/i/t$a;->YB: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 7e91e276b1..29d8d86845 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 YB:Lcom/facebook/imagepipeline/i/af$a;
+.field final synthetic Yx:Lcom/facebook/imagepipeline/i/af$a;
 
-.field final synthetic YC:Lcom/facebook/imagepipeline/i/t;
+.field final synthetic Yy:Lcom/facebook/imagepipeline/i/t;
 
-.field final synthetic YD:Ljava/util/concurrent/Future;
+.field final synthetic Yz: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;->YC:Lcom/facebook/imagepipeline/i/t;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/t$2;->Yy:Lcom/facebook/imagepipeline/i/t;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/i/t$2;->YD:Ljava/util/concurrent/Future;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/t$2;->Yz:Ljava/util/concurrent/Future;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/i/t$2;->YB:Lcom/facebook/imagepipeline/i/af$a;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/i/t$2;->Yx: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 kh()V
+.method public final kf()V
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/t$2;->YD:Ljava/util/concurrent/Future;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/t$2;->Yz: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;->YB:Lcom/facebook/imagepipeline/i/af$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/t$2;->Yx:Lcom/facebook/imagepipeline/i/af$a;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/af$a;->gg()V
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/af$a;->ge()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 ec93a9315e..314f2fd48f 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 YE:J
+.field YA:J
 
-.field YF:J
+.field YB:J
 
-.field YG:J
+.field YC: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 860745bbaa..c9c3052b43 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 KR:Lcom/facebook/common/time/b;
+.field final KN:Lcom/facebook/common/time/b;
 
-.field private final Qb:Ljava/util/concurrent/ExecutorService;
+.field private final PW:Ljava/util/concurrent/ExecutorService;
 
-.field UM:I
+.field UI: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;->UM:I
+    iput p1, p0, Lcom/facebook/imagepipeline/i/t;->UI:I
 
     return-void
 .end method
@@ -65,9 +65,9 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/i/t;->Qb:Ljava/util/concurrent/ExecutorService;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/i/t;->PW:Ljava/util/concurrent/ExecutorService;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/t;->KR:Lcom/facebook/common/time/b;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/t;->KN: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;->YF:J
+    iget-wide v1, p1, Lcom/facebook/imagepipeline/i/t$a;->YB:J
 
-    iget-wide v3, p1, Lcom/facebook/imagepipeline/i/t$a;->YE:J
+    iget-wide v3, p1, Lcom/facebook/imagepipeline/i/t$a;->YA: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;->YG:J
+    iget-wide v1, p1, Lcom/facebook/imagepipeline/i/t$a;->YC:J
 
-    iget-wide v3, p1, Lcom/facebook/imagepipeline/i/t$a;->YF:J
+    iget-wide v3, p1, Lcom/facebook/imagepipeline/i/t$a;->YB: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;->YG:J
+    iget-wide v1, p1, Lcom/facebook/imagepipeline/i/t$a;->YC:J
 
-    iget-wide v3, p1, Lcom/facebook/imagepipeline/i/t$a;->YE:J
+    iget-wide v3, p1, Lcom/facebook/imagepipeline/i/t$a;->YA: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;->KR:Lcom/facebook/common/time/b;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/t;->KN: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;->YG:J
+    iput-wide v0, p1, Lcom/facebook/imagepipeline/i/t$a;->YC: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;->KR:Lcom/facebook/common/time/b;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/t;->KN: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;->YE:J
+    iput-wide v0, p1, Lcom/facebook/imagepipeline/i/t$a;->YA:J
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/t;->Qb:Ljava/util/concurrent/ExecutorService;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/t;->PW: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;->Yw:Lcom/facebook/imagepipeline/i/ak;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/i/s;->Ys: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 38f2e00fab..7f601c345f 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 YP:Lcom/facebook/imagepipeline/i/u;
+.field final synthetic YL: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;->YP:Lcom/facebook/imagepipeline/i/u;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/u$1;->YL: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;->YP:Lcom/facebook/imagepipeline/i/u;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/u$1;->YL: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;->YL:I
+    iget v4, v0, Lcom/facebook/imagepipeline/i/u;->YH:I
 
     const/4 v5, 0x0
 
@@ -56,13 +56,13 @@
 
     const/4 v5, 0x0
 
-    iput v5, v0, Lcom/facebook/imagepipeline/i/u;->YL:I
+    iput v5, v0, Lcom/facebook/imagepipeline/i/u;->YH:I
 
-    sget v5, Lcom/facebook/imagepipeline/i/u$c;->YU:I
+    sget v5, Lcom/facebook/imagepipeline/i/u$c;->YQ:I
 
-    iput v5, v0, Lcom/facebook/imagepipeline/i/u;->YM:I
+    iput v5, v0, Lcom/facebook/imagepipeline/i/u;->YI:I
 
-    iput-wide v1, v0, Lcom/facebook/imagepipeline/i/u;->YO:J
+    iput-wide v1, v0, Lcom/facebook/imagepipeline/i/u;->YK: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;->YH:Lcom/facebook/imagepipeline/i/u$a;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/i/u;->YD: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;->kp()V
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/u;->kn()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;->kp()V
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/u;->kn()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 2dad0728a4..6f2da8e590 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 YP:Lcom/facebook/imagepipeline/i/u;
+.field final synthetic YL: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;->YP:Lcom/facebook/imagepipeline/i/u;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/u$2;->YL: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;->YP:Lcom/facebook/imagepipeline/i/u;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/u$2;->YL: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;->YI:Ljava/lang/Runnable;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/i/u;->YE: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 453809b925..e457b18e10 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 YQ:[I
+.field static final synthetic YM:[I
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 4
 
-    invoke-static {}, Lcom/facebook/imagepipeline/i/u$c;->ks()[I
+    invoke-static {}, Lcom/facebook/imagepipeline/i/u$c;->kq()[I
 
     move-result-object v0
 
@@ -30,14 +30,14 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/facebook/imagepipeline/i/u$3;->YQ:[I
+    sput-object v0, Lcom/facebook/imagepipeline/i/u$3;->YM:[I
 
     const/4 v0, 0x1
 
     :try_start_0
-    sget-object v1, Lcom/facebook/imagepipeline/i/u$3;->YQ:[I
+    sget-object v1, Lcom/facebook/imagepipeline/i/u$3;->YM:[I
 
-    sget v2, Lcom/facebook/imagepipeline/i/u$c;->YS:I
+    sget v2, Lcom/facebook/imagepipeline/i/u$c;->YO:I
 
     sub-int/2addr v2, v0
 
@@ -47,9 +47,9 @@
 
     :catch_0
     :try_start_1
-    sget-object v1, Lcom/facebook/imagepipeline/i/u$3;->YQ:[I
+    sget-object v1, Lcom/facebook/imagepipeline/i/u$3;->YM:[I
 
-    sget v2, Lcom/facebook/imagepipeline/i/u$c;->YT:I
+    sget v2, Lcom/facebook/imagepipeline/i/u$c;->YP:I
 
     sub-int/2addr v2, v0
 
@@ -61,9 +61,9 @@
 
     :catch_1
     :try_start_2
-    sget-object v1, Lcom/facebook/imagepipeline/i/u$3;->YQ:[I
+    sget-object v1, Lcom/facebook/imagepipeline/i/u$3;->YM:[I
 
-    sget v2, Lcom/facebook/imagepipeline/i/u$c;->YU:I
+    sget v2, Lcom/facebook/imagepipeline/i/u$c;->YQ:I
 
     sub-int/2addr v2, v0
 
@@ -75,9 +75,9 @@
 
     :catch_2
     :try_start_3
-    sget-object v1, Lcom/facebook/imagepipeline/i/u$3;->YQ:[I
+    sget-object v1, Lcom/facebook/imagepipeline/i/u$3;->YM:[I
 
-    sget v2, Lcom/facebook/imagepipeline/i/u$c;->YV:I
+    sget v2, Lcom/facebook/imagepipeline/i/u$c;->YR: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 8d64d1dd37..bcc82dfb91 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 YR:Ljava/util/concurrent/ScheduledExecutorService;
+.field private static YN:Ljava/util/concurrent/ScheduledExecutorService;
 
 
 # direct methods
-.method static kr()Ljava/util/concurrent/ScheduledExecutorService;
+.method static kp()Ljava/util/concurrent/ScheduledExecutorService;
     .locals 1
 
-    sget-object v0, Lcom/facebook/imagepipeline/i/u$b;->YR:Ljava/util/concurrent/ScheduledExecutorService;
+    sget-object v0, Lcom/facebook/imagepipeline/i/u$b;->YN: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;->YR:Ljava/util/concurrent/ScheduledExecutorService;
+    sput-object v0, Lcom/facebook/imagepipeline/i/u$b;->YN:Ljava/util/concurrent/ScheduledExecutorService;
 
     :cond_0
-    sget-object v0, Lcom/facebook/imagepipeline/i/u$b;->YR:Ljava/util/concurrent/ScheduledExecutorService;
+    sget-object v0, Lcom/facebook/imagepipeline/i/u$b;->YN: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 b06d933708..aae7a1438c 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 YS:I = 0x1
+.field public static final YO:I = 0x1
 
-.field public static final YT:I = 0x2
+.field public static final YP:I = 0x2
 
-.field public static final YU:I = 0x3
+.field public static final YQ:I = 0x3
 
-.field public static final YV:I = 0x4
+.field public static final YR:I = 0x4
 
-.field private static final synthetic YW:[I
+.field private static final synthetic YS:[I
 
 
 # direct methods
@@ -42,39 +42,39 @@
 
     new-array v0, v0, [I
 
-    sget v1, Lcom/facebook/imagepipeline/i/u$c;->YS:I
+    sget v1, Lcom/facebook/imagepipeline/i/u$c;->YO:I
 
     const/4 v2, 0x0
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/imagepipeline/i/u$c;->YT:I
+    sget v1, Lcom/facebook/imagepipeline/i/u$c;->YP:I
 
     const/4 v2, 0x1
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/imagepipeline/i/u$c;->YU:I
+    sget v1, Lcom/facebook/imagepipeline/i/u$c;->YQ:I
 
     const/4 v2, 0x2
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/imagepipeline/i/u$c;->YV:I
+    sget v1, Lcom/facebook/imagepipeline/i/u$c;->YR:I
 
     const/4 v2, 0x3
 
     aput v1, v0, v2
 
-    sput-object v0, Lcom/facebook/imagepipeline/i/u$c;->YW:[I
+    sput-object v0, Lcom/facebook/imagepipeline/i/u$c;->YS:[I
 
     return-void
 .end method
 
-.method public static ks()[I
+.method public static kq()[I
     .locals 1
 
-    sget-object v0, Lcom/facebook/imagepipeline/i/u$c;->YW:[I
+    sget-object v0, Lcom/facebook/imagepipeline/i/u$c;->YS:[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 ed620ee2d5..76931f20d2 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 final YH:Lcom/facebook/imagepipeline/i/u$a;
+.field final YD:Lcom/facebook/imagepipeline/i/u$a;
 
-.field final YI:Ljava/lang/Runnable;
+.field final YE:Ljava/lang/Runnable;
 
-.field private final YJ:Ljava/lang/Runnable;
+.field private final YF:Ljava/lang/Runnable;
 
-.field private final YK:I
+.field private final YG:I
 
-.field YL:I
+.field YH:I
 
-.field YM:I
+.field YI:I
 
-.field YN:J
+.field YJ:J
 
-.field YO:J
+.field YK: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;->YH:Lcom/facebook/imagepipeline/i/u$a;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/u;->YD:Lcom/facebook/imagepipeline/i/u$a;
 
-    iput p3, p0, Lcom/facebook/imagepipeline/i/u;->YK:I
+    iput p3, p0, Lcom/facebook/imagepipeline/i/u;->YG: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;->YI:Ljava/lang/Runnable;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/u;->YE: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;->YJ:Ljava/lang/Runnable;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/u;->YF:Ljava/lang/Runnable;
 
     const/4 p1, 0x0
 
@@ -65,17 +65,17 @@
 
     const/4 p1, 0x0
 
-    iput p1, p0, Lcom/facebook/imagepipeline/i/u;->YL:I
+    iput p1, p0, Lcom/facebook/imagepipeline/i/u;->YH:I
 
-    sget p1, Lcom/facebook/imagepipeline/i/u$c;->YS:I
+    sget p1, Lcom/facebook/imagepipeline/i/u$c;->YO:I
 
-    iput p1, p0, Lcom/facebook/imagepipeline/i/u;->YM:I
+    iput p1, p0, Lcom/facebook/imagepipeline/i/u;->YI:I
 
     const-wide/16 p1, 0x0
 
-    iput-wide p1, p0, Lcom/facebook/imagepipeline/i/u;->YN:J
+    iput-wide p1, p0, Lcom/facebook/imagepipeline/i/u;->YJ:J
 
-    iput-wide p1, p0, Lcom/facebook/imagepipeline/i/u;->YO:J
+    iput-wide p1, p0, Lcom/facebook/imagepipeline/i/u;->YK:J
 
     return-void
 .end method
@@ -126,11 +126,11 @@
 
     if-lez v2, :cond_0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/i/u$b;->kr()Ljava/util/concurrent/ScheduledExecutorService;
+    invoke-static {}, Lcom/facebook/imagepipeline/i/u$b;->kp()Ljava/util/concurrent/ScheduledExecutorService;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/u;->YJ:Ljava/lang/Runnable;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/u;->YF: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;->YJ:Ljava/lang/Runnable;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/u;->YF: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;->YL:I
+    iput p2, p0, Lcom/facebook/imagepipeline/i/u;->YH:I
 
     monitor-exit p0
     :try_end_0
@@ -196,7 +196,7 @@
     throw p1
 .end method
 
-.method public final kn()V
+.method public final kl()V
     .locals 2
 
     monitor-enter p0
@@ -210,7 +210,7 @@
 
     const/4 v1, 0x0
 
-    iput v1, p0, Lcom/facebook/imagepipeline/i/u;->YL:I
+    iput v1, p0, Lcom/facebook/imagepipeline/i/u;->YH:I
 
     monitor-exit p0
     :try_end_0
@@ -231,7 +231,7 @@
     throw v0
 .end method
 
-.method public final ko()Z
+.method public final km()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;->YL:I
+    iget v3, p0, Lcom/facebook/imagepipeline/i/u;->YH: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;->YQ:[I
+    sget-object v2, Lcom/facebook/imagepipeline/i/u$3;->YM:[I
 
-    iget v4, p0, Lcom/facebook/imagepipeline/i/u;->YM:I
+    iget v4, p0, Lcom/facebook/imagepipeline/i/u;->YI:I
 
     const/4 v5, 0x1
 
@@ -281,9 +281,9 @@
     goto :goto_0
 
     :cond_1
-    sget v2, Lcom/facebook/imagepipeline/i/u$c;->YV:I
+    sget v2, Lcom/facebook/imagepipeline/i/u$c;->YR:I
 
-    iput v2, p0, Lcom/facebook/imagepipeline/i/u;->YM:I
+    iput v2, p0, Lcom/facebook/imagepipeline/i/u;->YI:I
 
     :cond_2
     :goto_0
@@ -292,9 +292,9 @@
     goto :goto_1
 
     :cond_3
-    iget-wide v2, p0, Lcom/facebook/imagepipeline/i/u;->YO:J
+    iget-wide v2, p0, Lcom/facebook/imagepipeline/i/u;->YK:J
 
-    iget v4, p0, Lcom/facebook/imagepipeline/i/u;->YK:I
+    iget v4, p0, Lcom/facebook/imagepipeline/i/u;->YG:I
 
     int-to-long v6, v4
 
@@ -304,11 +304,11 @@
 
     move-result-wide v6
 
-    iput-wide v0, p0, Lcom/facebook/imagepipeline/i/u;->YN:J
+    iput-wide v0, p0, Lcom/facebook/imagepipeline/i/u;->YJ:J
 
-    sget v2, Lcom/facebook/imagepipeline/i/u$c;->YT:I
+    sget v2, Lcom/facebook/imagepipeline/i/u$c;->YP:I
 
-    iput v2, p0, Lcom/facebook/imagepipeline/i/u;->YM:I
+    iput v2, p0, Lcom/facebook/imagepipeline/i/u;->YI:I
 
     const/4 v3, 0x1
 
@@ -337,7 +337,7 @@
     throw v0
 .end method
 
-.method final kp()V
+.method final kn()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;->YM:I
+    iget v2, p0, Lcom/facebook/imagepipeline/i/u;->YI:I
 
-    sget v3, Lcom/facebook/imagepipeline/i/u$c;->YV:I
+    sget v3, Lcom/facebook/imagepipeline/i/u$c;->YR:I
 
     if-ne v2, v3, :cond_0
 
-    iget-wide v2, p0, Lcom/facebook/imagepipeline/i/u;->YO:J
+    iget-wide v2, p0, Lcom/facebook/imagepipeline/i/u;->YK:J
 
-    iget v4, p0, Lcom/facebook/imagepipeline/i/u;->YK:I
+    iget v4, p0, Lcom/facebook/imagepipeline/i/u;->YG:I
 
     int-to-long v4, v4
 
@@ -367,18 +367,18 @@
 
     const/4 v4, 0x1
 
-    iput-wide v0, p0, Lcom/facebook/imagepipeline/i/u;->YN:J
+    iput-wide v0, p0, Lcom/facebook/imagepipeline/i/u;->YJ:J
 
-    sget v5, Lcom/facebook/imagepipeline/i/u$c;->YT:I
+    sget v5, Lcom/facebook/imagepipeline/i/u$c;->YP:I
 
-    iput v5, p0, Lcom/facebook/imagepipeline/i/u;->YM:I
+    iput v5, p0, Lcom/facebook/imagepipeline/i/u;->YI:I
 
     goto :goto_0
 
     :cond_0
-    sget v2, Lcom/facebook/imagepipeline/i/u$c;->YS:I
+    sget v2, Lcom/facebook/imagepipeline/i/u$c;->YO:I
 
-    iput v2, p0, Lcom/facebook/imagepipeline/i/u;->YM:I
+    iput v2, p0, Lcom/facebook/imagepipeline/i/u;->YI:I
 
     const-wide/16 v2, 0x0
 
@@ -409,15 +409,15 @@
     throw v0
 .end method
 
-.method public final declared-synchronized kq()J
+.method public final declared-synchronized ko()J
     .locals 4
 
     monitor-enter p0
 
     :try_start_0
-    iget-wide v0, p0, Lcom/facebook/imagepipeline/i/u;->YO:J
+    iget-wide v0, p0, Lcom/facebook/imagepipeline/i/u;->YK:J
 
-    iget-wide v2, p0, Lcom/facebook/imagepipeline/i/u;->YN:J
+    iget-wide v2, p0, Lcom/facebook/imagepipeline/i/u;->YJ: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 a3621df799..84a906e54b 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 Vv:Landroid/content/res/AssetManager;
+.field private final Vr: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;->Vv:Landroid/content/res/AssetManager;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/i/v;->Vr: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;->Vv:Landroid/content/res/AssetManager;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/v;->Vr: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;->aaf:Landroid/net/Uri;
+    iget-object p0, p0, Lcom/facebook/imagepipeline/request/b;->aab: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;->Vv:Landroid/content/res/AssetManager;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/v;->Vr: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 kl()Ljava/lang/String;
+.method protected final kj()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 6fef5ec7f2..2aff4fec77 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 Zc:Lcom/facebook/imagepipeline/i/y;
+.field final synthetic YY:Lcom/facebook/imagepipeline/i/y;
 
-.field final synthetic Zd:Lcom/facebook/imagepipeline/i/aq;
+.field final synthetic YZ: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;->Zc:Lcom/facebook/imagepipeline/i/y;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/y$2;->YY:Lcom/facebook/imagepipeline/i/y;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/i/y$2;->Zd:Lcom/facebook/imagepipeline/i/aq;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/y$2;->YZ:Lcom/facebook/imagepipeline/i/aq;
 
     invoke-direct {p0}, Lcom/facebook/imagepipeline/i/e;-><init>()V
 
@@ -35,10 +35,10 @@
 
 
 # virtual methods
-.method public final kh()V
+.method public final kf()V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/y$2;->Zd:Lcom/facebook/imagepipeline/i/aq;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/y$2;->YZ: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 0316d18ce5..b21322d583 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 Zd:Lcom/facebook/imagepipeline/i/aq;
+.field final synthetic YZ:Lcom/facebook/imagepipeline/i/aq;
 
-.field final synthetic Ze:Lcom/facebook/imagepipeline/i/z;
+.field final synthetic Za: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;->Ze:Lcom/facebook/imagepipeline/i/z;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/z$2;->Za:Lcom/facebook/imagepipeline/i/z;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/i/z$2;->Zd:Lcom/facebook/imagepipeline/i/aq;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/z$2;->YZ:Lcom/facebook/imagepipeline/i/aq;
 
     invoke-direct {p0}, Lcom/facebook/imagepipeline/i/e;-><init>()V
 
@@ -35,10 +35,10 @@
 
 
 # virtual methods
-.method public final kh()V
+.method public final kf()V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/z$2;->Zd:Lcom/facebook/imagepipeline/i/aq;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/z$2;->YZ: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 bcbce02030..984d5ef362 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 aay:I
+.field public final aau:I
 
 
 # direct methods
@@ -13,7 +13,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput p1, p0, Lcom/facebook/imagepipeline/k/b;->aay:I
+    iput p1, p0, Lcom/facebook/imagepipeline/k/b;->aau:I
 
     return-void
 .end method
@@ -27,7 +27,7 @@
 
     new-array v0, v0, [Ljava/lang/Object;
 
-    iget v1, p0, Lcom/facebook/imagepipeline/k/b;->aay:I
+    iget v1, p0, Lcom/facebook/imagepipeline/k/b;->aau: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 995e7a749e..4cb017738e 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 UZ:I
+.field private final UV:I
 
 
 # direct methods
@@ -16,7 +16,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput p1, p0, Lcom/facebook/imagepipeline/k/h;->UZ:I
+    iput p1, p0, Lcom/facebook/imagepipeline/k/h;->UV: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;->UZ:I
+    iget v0, p0, Lcom/facebook/imagepipeline/k/h;->UV: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 d3214d51e0..7f93a78bee 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 kK()Z
+.method public abstract kI()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 d2bac5e76f..ce1252da18 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 Wv:I
+.field Wr: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;->Wv:I
+    iget v0, p0, Lcom/facebook/imagepipeline/memory/a$a;->Wr:I
 
     add-int/2addr v0, p1
 
-    iput v0, p0, Lcom/facebook/imagepipeline/memory/a$a;->Wv:I
+    iput v0, p0, Lcom/facebook/imagepipeline/memory/a$a;->Wr: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;->Wv:I
+    iget v0, p0, Lcom/facebook/imagepipeline/memory/a$a;->Wr:I
 
     const/4 v1, 0x1
 
@@ -68,7 +68,7 @@
 
     sub-int/2addr v0, p1
 
-    iput v0, p0, Lcom/facebook/imagepipeline/memory/a$a;->Wv:I
+    iput v0, p0, Lcom/facebook/imagepipeline/memory/a$a;->Wr:I
 
     return-void
 
@@ -85,7 +85,7 @@
 
     aput-object p1, v0, v2
 
-    iget p1, p0, Lcom/facebook/imagepipeline/memory/a$a;->Wv:I
+    iget p1, p0, Lcom/facebook/imagepipeline/memory/a$a;->Wr: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 1aa90aeff2..4f545ccd25 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 Xf:Ljava/util/LinkedList;
+.field private Xb: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;->Xf:Ljava/util/LinkedList;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/aa;->Xb:Ljava/util/LinkedList;
 
     return-void
 .end method
@@ -54,7 +54,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/aa;->Xf:Ljava/util/LinkedList;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/aa;->Xb: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;->IF:Ljava/lang/ref/SoftReference;
+    iput-object v1, v0, Lcom/facebook/common/references/a;->IB: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;->IG:Ljava/lang/ref/SoftReference;
+    iput-object v1, v0, Lcom/facebook/common/references/a;->IC: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;->IH:Ljava/lang/ref/SoftReference;
+    iput-object v1, v0, Lcom/facebook/common/references/a;->ID:Ljava/lang/ref/SoftReference;
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/memory/aa;->WF:Ljava/util/Queue;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/memory/aa;->WB:Ljava/util/Queue;
 
     invoke-interface {p1, v0}, Ljava/util/Queue;->add(Ljava/lang/Object;)Z
 
     return-void
 .end method
 
-.method public final jJ()Ljava/lang/Object;
+.method public final jH()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;->WF:Ljava/util/Queue;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/aa;->WB: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;->IF:Ljava/lang/ref/SoftReference;
+    iget-object v1, v0, Lcom/facebook/common/references/a;->IB: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;->IF:Ljava/lang/ref/SoftReference;
+    iget-object v1, v0, Lcom/facebook/common/references/a;->IB: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;->IF:Ljava/lang/ref/SoftReference;
+    iget-object v3, v0, Lcom/facebook/common/references/a;->IB:Ljava/lang/ref/SoftReference;
 
     if-eqz v3, :cond_1
 
-    iget-object v3, v0, Lcom/facebook/common/references/a;->IF:Ljava/lang/ref/SoftReference;
+    iget-object v3, v0, Lcom/facebook/common/references/a;->IB:Ljava/lang/ref/SoftReference;
 
     invoke-virtual {v3}, Ljava/lang/ref/SoftReference;->clear()V
 
-    iput-object v2, v0, Lcom/facebook/common/references/a;->IF:Ljava/lang/ref/SoftReference;
+    iput-object v2, v0, Lcom/facebook/common/references/a;->IB:Ljava/lang/ref/SoftReference;
 
     :cond_1
-    iget-object v3, v0, Lcom/facebook/common/references/a;->IG:Ljava/lang/ref/SoftReference;
+    iget-object v3, v0, Lcom/facebook/common/references/a;->IC:Ljava/lang/ref/SoftReference;
 
     if-eqz v3, :cond_2
 
-    iget-object v3, v0, Lcom/facebook/common/references/a;->IG:Ljava/lang/ref/SoftReference;
+    iget-object v3, v0, Lcom/facebook/common/references/a;->IC:Ljava/lang/ref/SoftReference;
 
     invoke-virtual {v3}, Ljava/lang/ref/SoftReference;->clear()V
 
-    iput-object v2, v0, Lcom/facebook/common/references/a;->IG:Ljava/lang/ref/SoftReference;
+    iput-object v2, v0, Lcom/facebook/common/references/a;->IC:Ljava/lang/ref/SoftReference;
 
     :cond_2
-    iget-object v3, v0, Lcom/facebook/common/references/a;->IH:Ljava/lang/ref/SoftReference;
+    iget-object v3, v0, Lcom/facebook/common/references/a;->ID:Ljava/lang/ref/SoftReference;
 
     if-eqz v3, :cond_3
 
-    iget-object v3, v0, Lcom/facebook/common/references/a;->IH:Ljava/lang/ref/SoftReference;
+    iget-object v3, v0, Lcom/facebook/common/references/a;->ID:Ljava/lang/ref/SoftReference;
 
     invoke-virtual {v3}, Ljava/lang/ref/SoftReference;->clear()V
 
-    iput-object v2, v0, Lcom/facebook/common/references/a;->IH:Ljava/lang/ref/SoftReference;
+    iput-object v2, v0, Lcom/facebook/common/references/a;->ID:Ljava/lang/ref/SoftReference;
 
     :cond_3
-    iget-object v2, p0, Lcom/facebook/imagepipeline/memory/aa;->Xf:Ljava/util/LinkedList;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/memory/aa;->Xb: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 3c82b42be4..d5451fcda7 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 Ux:Lcom/facebook/common/g/b;
+.field Ut:Lcom/facebook/common/g/b;
 
-.field Xg:Lcom/facebook/imagepipeline/memory/ae;
+.field Xc:Lcom/facebook/imagepipeline/memory/ae;
 
-.field Xh:Lcom/facebook/imagepipeline/memory/af;
+.field Xd:Lcom/facebook/imagepipeline/memory/af;
 
-.field Xi:Lcom/facebook/imagepipeline/memory/ae;
+.field Xe:Lcom/facebook/imagepipeline/memory/ae;
 
-.field Xj:Lcom/facebook/imagepipeline/memory/ae;
+.field Xf:Lcom/facebook/imagepipeline/memory/ae;
 
-.field Xk:Lcom/facebook/imagepipeline/memory/af;
+.field Xg:Lcom/facebook/imagepipeline/memory/af;
 
-.field Xl:Lcom/facebook/imagepipeline/memory/ae;
+.field Xh:Lcom/facebook/imagepipeline/memory/ae;
 
-.field Xm:Lcom/facebook/imagepipeline/memory/af;
+.field Xi:Lcom/facebook/imagepipeline/memory/af;
 
-.field Xn:Ljava/lang/String;
+.field Xj:Ljava/lang/String;
 
-.field Xo:I
+.field Xk:I
 
-.field Xp:I
+.field Xl:I
 
-.field Xq:Z
+.field Xm: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 b552626181..653a48b500 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 Ux:Lcom/facebook/common/g/b;
+.field final Ut:Lcom/facebook/common/g/b;
 
-.field final Xg:Lcom/facebook/imagepipeline/memory/ae;
+.field final Xc:Lcom/facebook/imagepipeline/memory/ae;
 
-.field final Xh:Lcom/facebook/imagepipeline/memory/af;
+.field final Xd:Lcom/facebook/imagepipeline/memory/af;
 
-.field final Xi:Lcom/facebook/imagepipeline/memory/ae;
+.field final Xe:Lcom/facebook/imagepipeline/memory/ae;
 
-.field final Xj:Lcom/facebook/imagepipeline/memory/ae;
+.field final Xf:Lcom/facebook/imagepipeline/memory/ae;
 
-.field final Xk:Lcom/facebook/imagepipeline/memory/af;
+.field final Xg:Lcom/facebook/imagepipeline/memory/af;
 
-.field final Xl:Lcom/facebook/imagepipeline/memory/ae;
+.field final Xh:Lcom/facebook/imagepipeline/memory/ae;
 
-.field final Xm:Lcom/facebook/imagepipeline/memory/af;
+.field final Xi:Lcom/facebook/imagepipeline/memory/af;
 
-.field final Xn:Ljava/lang/String;
+.field final Xj:Ljava/lang/String;
 
-.field final Xo:I
+.field final Xk:I
 
-.field final Xp:I
+.field final Xl:I
 
-.field final Xq:Z
+.field final Xm:Z
 
 
 # direct methods
@@ -43,73 +43,73 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Z
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ac$a;->Xg:Lcom/facebook/imagepipeline/memory/ae;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ac$a;->Xc:Lcom/facebook/imagepipeline/memory/ae;
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/memory/k;->jN()Lcom/facebook/imagepipeline/memory/ae;
+    invoke-static {}, Lcom/facebook/imagepipeline/memory/k;->jL()Lcom/facebook/imagepipeline/memory/ae;
 
     move-result-object v0
 
     goto :goto_0
 
     :cond_0
-    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ac$a;->Xg:Lcom/facebook/imagepipeline/memory/ae;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ac$a;->Xc:Lcom/facebook/imagepipeline/memory/ae;
 
     :goto_0
-    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->Xg:Lcom/facebook/imagepipeline/memory/ae;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->Xc:Lcom/facebook/imagepipeline/memory/ae;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ac$a;->Xh:Lcom/facebook/imagepipeline/memory/af;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ac$a;->Xd:Lcom/facebook/imagepipeline/memory/af;
 
     if-nez v0, :cond_1
 
-    invoke-static {}, Lcom/facebook/imagepipeline/memory/z;->jP()Lcom/facebook/imagepipeline/memory/z;
+    invoke-static {}, Lcom/facebook/imagepipeline/memory/z;->jN()Lcom/facebook/imagepipeline/memory/z;
 
     move-result-object v0
 
     goto :goto_1
 
     :cond_1
-    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ac$a;->Xh:Lcom/facebook/imagepipeline/memory/af;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ac$a;->Xd:Lcom/facebook/imagepipeline/memory/af;
 
     :goto_1
-    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->Xh:Lcom/facebook/imagepipeline/memory/af;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->Xd:Lcom/facebook/imagepipeline/memory/af;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ac$a;->Xi:Lcom/facebook/imagepipeline/memory/ae;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ac$a;->Xe:Lcom/facebook/imagepipeline/memory/ae;
 
     if-nez v0, :cond_2
 
-    invoke-static {}, Lcom/facebook/imagepipeline/memory/l;->jN()Lcom/facebook/imagepipeline/memory/ae;
+    invoke-static {}, Lcom/facebook/imagepipeline/memory/l;->jL()Lcom/facebook/imagepipeline/memory/ae;
 
     move-result-object v0
 
     goto :goto_2
 
     :cond_2
-    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ac$a;->Xi:Lcom/facebook/imagepipeline/memory/ae;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ac$a;->Xe:Lcom/facebook/imagepipeline/memory/ae;
 
     :goto_2
-    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->Xi:Lcom/facebook/imagepipeline/memory/ae;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->Xe:Lcom/facebook/imagepipeline/memory/ae;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ac$a;->Ux:Lcom/facebook/common/g/b;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ac$a;->Ut:Lcom/facebook/common/g/b;
 
     if-nez v0, :cond_3
 
-    invoke-static {}, Lcom/facebook/common/g/c;->gl()Lcom/facebook/common/g/c;
+    invoke-static {}, Lcom/facebook/common/g/c;->gj()Lcom/facebook/common/g/c;
 
     move-result-object v0
 
     goto :goto_3
 
     :cond_3
-    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ac$a;->Ux:Lcom/facebook/common/g/b;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ac$a;->Ut:Lcom/facebook/common/g/b;
 
     :goto_3
-    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->Ux:Lcom/facebook/common/g/b;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->Ut:Lcom/facebook/common/g/b;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ac$a;->Xj:Lcom/facebook/imagepipeline/memory/ae;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ac$a;->Xf: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;->Xj:Lcom/facebook/imagepipeline/memory/ae;
+    iget-object v4, p1, Lcom/facebook/imagepipeline/memory/ac$a;->Xf:Lcom/facebook/imagepipeline/memory/ae;
 
     :goto_6
-    iput-object v4, p0, Lcom/facebook/imagepipeline/memory/ac;->Xj:Lcom/facebook/imagepipeline/memory/ae;
+    iput-object v4, p0, Lcom/facebook/imagepipeline/memory/ac;->Xf:Lcom/facebook/imagepipeline/memory/ae;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ac$a;->Xk:Lcom/facebook/imagepipeline/memory/af;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ac$a;->Xg:Lcom/facebook/imagepipeline/memory/af;
 
     if-nez v0, :cond_8
 
-    invoke-static {}, Lcom/facebook/imagepipeline/memory/z;->jP()Lcom/facebook/imagepipeline/memory/z;
+    invoke-static {}, Lcom/facebook/imagepipeline/memory/z;->jN()Lcom/facebook/imagepipeline/memory/z;
 
     move-result-object v0
 
     goto :goto_7
 
     :cond_8
-    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ac$a;->Xk:Lcom/facebook/imagepipeline/memory/af;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ac$a;->Xg:Lcom/facebook/imagepipeline/memory/af;
 
     :goto_7
-    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->Xk:Lcom/facebook/imagepipeline/memory/af;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->Xg:Lcom/facebook/imagepipeline/memory/af;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ac$a;->Xl:Lcom/facebook/imagepipeline/memory/ae;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ac$a;->Xh: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;->Xl:Lcom/facebook/imagepipeline/memory/ae;
+    iget-object v2, p1, Lcom/facebook/imagepipeline/memory/ac$a;->Xh:Lcom/facebook/imagepipeline/memory/ae;
 
     :goto_8
-    iput-object v2, p0, Lcom/facebook/imagepipeline/memory/ac;->Xl:Lcom/facebook/imagepipeline/memory/ae;
+    iput-object v2, p0, Lcom/facebook/imagepipeline/memory/ac;->Xh:Lcom/facebook/imagepipeline/memory/ae;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ac$a;->Xm:Lcom/facebook/imagepipeline/memory/af;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ac$a;->Xi:Lcom/facebook/imagepipeline/memory/af;
 
     if-nez v0, :cond_a
 
-    invoke-static {}, Lcom/facebook/imagepipeline/memory/z;->jP()Lcom/facebook/imagepipeline/memory/z;
+    invoke-static {}, Lcom/facebook/imagepipeline/memory/z;->jN()Lcom/facebook/imagepipeline/memory/z;
 
     move-result-object v0
 
     goto :goto_9
 
     :cond_a
-    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ac$a;->Xm:Lcom/facebook/imagepipeline/memory/af;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ac$a;->Xi:Lcom/facebook/imagepipeline/memory/af;
 
     :goto_9
-    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->Xm:Lcom/facebook/imagepipeline/memory/af;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->Xi:Lcom/facebook/imagepipeline/memory/af;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ac$a;->Xn:Ljava/lang/String;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ac$a;->Xj: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;->Xn:Ljava/lang/String;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ac$a;->Xj:Ljava/lang/String;
 
     :goto_a
-    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->Xn:Ljava/lang/String;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->Xj:Ljava/lang/String;
 
-    iget v0, p1, Lcom/facebook/imagepipeline/memory/ac$a;->Xo:I
+    iget v0, p1, Lcom/facebook/imagepipeline/memory/ac$a;->Xk:I
 
-    iput v0, p0, Lcom/facebook/imagepipeline/memory/ac;->Xo:I
+    iput v0, p0, Lcom/facebook/imagepipeline/memory/ac;->Xk:I
 
-    iget v0, p1, Lcom/facebook/imagepipeline/memory/ac$a;->Xp:I
+    iget v0, p1, Lcom/facebook/imagepipeline/memory/ac$a;->Xl:I
 
     if-lez v0, :cond_c
 
-    iget v0, p1, Lcom/facebook/imagepipeline/memory/ac$a;->Xp:I
+    iget v0, p1, Lcom/facebook/imagepipeline/memory/ac$a;->Xl:I
 
     goto :goto_b
 
@@ -326,13 +326,13 @@
     const/high16 v0, 0x400000
 
     :goto_b
-    iput v0, p0, Lcom/facebook/imagepipeline/memory/ac;->Xp:I
+    iput v0, p0, Lcom/facebook/imagepipeline/memory/ac;->Xl:I
 
-    iget-boolean p1, p1, Lcom/facebook/imagepipeline/memory/ac$a;->Xq:Z
+    iget-boolean p1, p1, Lcom/facebook/imagepipeline/memory/ac$a;->Xm:Z
 
-    iput-boolean p1, p0, Lcom/facebook/imagepipeline/memory/ac;->Xq:Z
+    iput-boolean p1, p0, Lcom/facebook/imagepipeline/memory/ac;->Xm:Z
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()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 4551ab4811..2c85f1d223 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 SB:Lcom/facebook/common/g/j;
+.field private Sd:Lcom/facebook/imagepipeline/memory/d;
 
-.field private Sh:Lcom/facebook/imagepipeline/memory/d;
+.field private Sh:Lcom/facebook/common/g/g;
 
-.field private Sl:Lcom/facebook/common/g/g;
+.field private Sj:Lcom/facebook/imagepipeline/memory/o;
 
-.field private Sn:Lcom/facebook/imagepipeline/memory/o;
+.field private Sx:Lcom/facebook/common/g/j;
 
-.field private final Xr:Lcom/facebook/imagepipeline/memory/ac;
+.field private final Xn:Lcom/facebook/imagepipeline/memory/ac;
 
-.field private Xs:Lcom/facebook/imagepipeline/memory/j;
+.field private Xo:Lcom/facebook/imagepipeline/memory/j;
 
-.field private Xt:Lcom/facebook/imagepipeline/memory/y;
+.field private Xp:Lcom/facebook/imagepipeline/memory/y;
 
-.field private Xu:Lcom/facebook/common/g/a;
+.field private Xq: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;->Xr:Lcom/facebook/imagepipeline/memory/ac;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/ad;->Xn: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;->jR()Lcom/facebook/imagepipeline/memory/j;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/ad;->jP()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;->jU()Lcom/facebook/imagepipeline/memory/y;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/ad;->jS()Lcom/facebook/imagepipeline/memory/y;
 
     move-result-object p1
 
     return-object p1
 .end method
 
-.method private jR()Lcom/facebook/imagepipeline/memory/j;
+.method private jP()Lcom/facebook/imagepipeline/memory/j;
     .locals 4
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->Xs:Lcom/facebook/imagepipeline/memory/j;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->Xo: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;->Xr:Lcom/facebook/imagepipeline/memory/ac;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/ad;->Xn:Lcom/facebook/imagepipeline/memory/ac;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/memory/ac;->Ux:Lcom/facebook/common/g/b;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/memory/ac;->Ut:Lcom/facebook/common/g/b;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/memory/ad;->Xr:Lcom/facebook/imagepipeline/memory/ac;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/memory/ad;->Xn:Lcom/facebook/imagepipeline/memory/ac;
 
-    iget-object v2, v2, Lcom/facebook/imagepipeline/memory/ac;->Xj:Lcom/facebook/imagepipeline/memory/ae;
+    iget-object v2, v2, Lcom/facebook/imagepipeline/memory/ac;->Xf:Lcom/facebook/imagepipeline/memory/ae;
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/ad;->Xr:Lcom/facebook/imagepipeline/memory/ac;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/ad;->Xn:Lcom/facebook/imagepipeline/memory/ac;
 
-    iget-object v3, v3, Lcom/facebook/imagepipeline/memory/ac;->Xk:Lcom/facebook/imagepipeline/memory/af;
+    iget-object v3, v3, Lcom/facebook/imagepipeline/memory/ac;->Xg: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;->Xs:Lcom/facebook/imagepipeline/memory/j;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->Xo:Lcom/facebook/imagepipeline/memory/j;
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->Xs:Lcom/facebook/imagepipeline/memory/j;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->Xo:Lcom/facebook/imagepipeline/memory/j;
 
     return-object v0
 .end method
 
-.method private jU()Lcom/facebook/imagepipeline/memory/y;
+.method private jS()Lcom/facebook/imagepipeline/memory/y;
     .locals 4
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->Xt:Lcom/facebook/imagepipeline/memory/y;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->Xp: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;->Xr:Lcom/facebook/imagepipeline/memory/ac;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/ad;->Xn:Lcom/facebook/imagepipeline/memory/ac;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/memory/ac;->Ux:Lcom/facebook/common/g/b;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/memory/ac;->Ut:Lcom/facebook/common/g/b;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/memory/ad;->Xr:Lcom/facebook/imagepipeline/memory/ac;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/memory/ad;->Xn:Lcom/facebook/imagepipeline/memory/ac;
 
-    iget-object v2, v2, Lcom/facebook/imagepipeline/memory/ac;->Xj:Lcom/facebook/imagepipeline/memory/ae;
+    iget-object v2, v2, Lcom/facebook/imagepipeline/memory/ac;->Xf:Lcom/facebook/imagepipeline/memory/ae;
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/ad;->Xr:Lcom/facebook/imagepipeline/memory/ac;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/ad;->Xn:Lcom/facebook/imagepipeline/memory/ac;
 
-    iget-object v3, v3, Lcom/facebook/imagepipeline/memory/ac;->Xk:Lcom/facebook/imagepipeline/memory/af;
+    iget-object v3, v3, Lcom/facebook/imagepipeline/memory/ac;->Xg: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;->Xt:Lcom/facebook/imagepipeline/memory/y;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->Xp:Lcom/facebook/imagepipeline/memory/y;
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->Xt:Lcom/facebook/imagepipeline/memory/y;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->Xp: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;->Sl:Lcom/facebook/common/g/g;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->Sh: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;->jV()Lcom/facebook/common/g/j;
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/memory/ad;->jT()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;->Sl:Lcom/facebook/common/g/g;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->Sh:Lcom/facebook/common/g/g;
 
     :cond_0
-    iget-object p1, p0, Lcom/facebook/imagepipeline/memory/ad;->Sl:Lcom/facebook/common/g/g;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/memory/ad;->Sh:Lcom/facebook/common/g/g;
 
     return-object p1
 .end method
 
-.method public final jQ()Lcom/facebook/imagepipeline/memory/d;
+.method public final jO()Lcom/facebook/imagepipeline/memory/d;
     .locals 6
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->Sh:Lcom/facebook/imagepipeline/memory/d;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->Sd:Lcom/facebook/imagepipeline/memory/d;
 
     if-nez v0, :cond_5
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->Xr:Lcom/facebook/imagepipeline/memory/ac;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->Xn:Lcom/facebook/imagepipeline/memory/ac;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/memory/ac;->Xn:Ljava/lang/String;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/memory/ac;->Xj: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;->Xr:Lcom/facebook/imagepipeline/memory/ac;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/ad;->Xn:Lcom/facebook/imagepipeline/memory/ac;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/memory/ac;->Ux:Lcom/facebook/common/g/b;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/memory/ac;->Ut:Lcom/facebook/common/g/b;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/memory/ad;->Xr:Lcom/facebook/imagepipeline/memory/ac;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/memory/ad;->Xn:Lcom/facebook/imagepipeline/memory/ac;
 
-    iget-object v2, v2, Lcom/facebook/imagepipeline/memory/ac;->Xg:Lcom/facebook/imagepipeline/memory/ae;
+    iget-object v2, v2, Lcom/facebook/imagepipeline/memory/ac;->Xc:Lcom/facebook/imagepipeline/memory/ae;
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/ad;->Xr:Lcom/facebook/imagepipeline/memory/ac;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/ad;->Xn:Lcom/facebook/imagepipeline/memory/ac;
 
-    iget-object v3, v3, Lcom/facebook/imagepipeline/memory/ac;->Xh:Lcom/facebook/imagepipeline/memory/af;
+    iget-object v3, v3, Lcom/facebook/imagepipeline/memory/ac;->Xd: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;->Sh:Lcom/facebook/imagepipeline/memory/d;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->Sd: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;->Xr:Lcom/facebook/imagepipeline/memory/ac;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/ad;->Xn:Lcom/facebook/imagepipeline/memory/ac;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/memory/ac;->Ux:Lcom/facebook/common/g/b;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/memory/ac;->Ut:Lcom/facebook/common/g/b;
 
-    invoke-static {}, Lcom/facebook/imagepipeline/memory/k;->jN()Lcom/facebook/imagepipeline/memory/ae;
+    invoke-static {}, Lcom/facebook/imagepipeline/memory/k;->jL()Lcom/facebook/imagepipeline/memory/ae;
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/ad;->Xr:Lcom/facebook/imagepipeline/memory/ac;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/ad;->Xn:Lcom/facebook/imagepipeline/memory/ac;
 
-    iget-object v3, v3, Lcom/facebook/imagepipeline/memory/ac;->Xh:Lcom/facebook/imagepipeline/memory/af;
+    iget-object v3, v3, Lcom/facebook/imagepipeline/memory/ac;->Xd: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;->Sh:Lcom/facebook/imagepipeline/memory/d;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->Sd: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;->Xr:Lcom/facebook/imagepipeline/memory/ac;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/ad;->Xn:Lcom/facebook/imagepipeline/memory/ac;
 
-    iget v1, v1, Lcom/facebook/imagepipeline/memory/ac;->Xo:I
+    iget v1, v1, Lcom/facebook/imagepipeline/memory/ac;->Xk:I
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/memory/ad;->Xr:Lcom/facebook/imagepipeline/memory/ac;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/memory/ad;->Xn:Lcom/facebook/imagepipeline/memory/ac;
 
-    iget v2, v2, Lcom/facebook/imagepipeline/memory/ac;->Xp:I
+    iget v2, v2, Lcom/facebook/imagepipeline/memory/ac;->Xl:I
 
-    invoke-static {}, Lcom/facebook/imagepipeline/memory/z;->jP()Lcom/facebook/imagepipeline/memory/z;
+    invoke-static {}, Lcom/facebook/imagepipeline/memory/z;->jN()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;->Sh:Lcom/facebook/imagepipeline/memory/d;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->Sd: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;->Sh:Lcom/facebook/imagepipeline/memory/d;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->Sd: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;->Sh:Lcom/facebook/imagepipeline/memory/d;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->Sd:Lcom/facebook/imagepipeline/memory/d;
 
     :cond_5
     :goto_1
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->Sh:Lcom/facebook/imagepipeline/memory/d;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->Sd:Lcom/facebook/imagepipeline/memory/d;
 
     return-object v0
 
@@ -357,95 +357,95 @@
     .end sparse-switch
 .end method
 
-.method public final jS()Lcom/facebook/imagepipeline/memory/o;
+.method public final jQ()Lcom/facebook/imagepipeline/memory/o;
     .locals 3
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->Sn:Lcom/facebook/imagepipeline/memory/o;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->Sj: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;->Xr:Lcom/facebook/imagepipeline/memory/ac;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/ad;->Xn:Lcom/facebook/imagepipeline/memory/ac;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/memory/ac;->Ux:Lcom/facebook/common/g/b;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/memory/ac;->Ut:Lcom/facebook/common/g/b;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/memory/ad;->Xr:Lcom/facebook/imagepipeline/memory/ac;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/memory/ad;->Xn:Lcom/facebook/imagepipeline/memory/ac;
 
-    iget-object v2, v2, Lcom/facebook/imagepipeline/memory/ac;->Xi:Lcom/facebook/imagepipeline/memory/ae;
+    iget-object v2, v2, Lcom/facebook/imagepipeline/memory/ac;->Xe: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;->Sn:Lcom/facebook/imagepipeline/memory/o;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->Sj:Lcom/facebook/imagepipeline/memory/o;
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->Sn:Lcom/facebook/imagepipeline/memory/o;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->Sj:Lcom/facebook/imagepipeline/memory/o;
 
     return-object v0
 .end method
 
-.method public final jT()I
+.method public final jR()I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->Xr:Lcom/facebook/imagepipeline/memory/ac;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->Xn:Lcom/facebook/imagepipeline/memory/ac;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/memory/ac;->Xi:Lcom/facebook/imagepipeline/memory/ae;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/memory/ac;->Xe:Lcom/facebook/imagepipeline/memory/ae;
 
-    iget v0, v0, Lcom/facebook/imagepipeline/memory/ae;->XB:I
+    iget v0, v0, Lcom/facebook/imagepipeline/memory/ae;->Xx:I
 
     return v0
 .end method
 
-.method public final jV()Lcom/facebook/common/g/j;
+.method public final jT()Lcom/facebook/common/g/j;
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->SB:Lcom/facebook/common/g/j;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->Sx: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;->jW()Lcom/facebook/common/g/a;
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/memory/ad;->jU()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;->SB:Lcom/facebook/common/g/j;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->Sx:Lcom/facebook/common/g/j;
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->SB:Lcom/facebook/common/g/j;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->Sx:Lcom/facebook/common/g/j;
 
     return-object v0
 .end method
 
-.method public final jW()Lcom/facebook/common/g/a;
+.method public final jU()Lcom/facebook/common/g/a;
     .locals 4
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->Xu:Lcom/facebook/common/g/a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->Xq: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;->Xr:Lcom/facebook/imagepipeline/memory/ac;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/ad;->Xn:Lcom/facebook/imagepipeline/memory/ac;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/memory/ac;->Ux:Lcom/facebook/common/g/b;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/memory/ac;->Ut:Lcom/facebook/common/g/b;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/memory/ad;->Xr:Lcom/facebook/imagepipeline/memory/ac;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/memory/ad;->Xn:Lcom/facebook/imagepipeline/memory/ac;
 
-    iget-object v2, v2, Lcom/facebook/imagepipeline/memory/ac;->Xl:Lcom/facebook/imagepipeline/memory/ae;
+    iget-object v2, v2, Lcom/facebook/imagepipeline/memory/ac;->Xh:Lcom/facebook/imagepipeline/memory/ae;
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/ad;->Xr:Lcom/facebook/imagepipeline/memory/ac;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/ad;->Xn:Lcom/facebook/imagepipeline/memory/ac;
 
-    iget-object v3, v3, Lcom/facebook/imagepipeline/memory/ac;->Xm:Lcom/facebook/imagepipeline/memory/af;
+    iget-object v3, v3, Lcom/facebook/imagepipeline/memory/ac;->Xi: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;->Xu:Lcom/facebook/common/g/a;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->Xq:Lcom/facebook/common/g/a;
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->Xu:Lcom/facebook/common/g/a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->Xq: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 786f630127..11b48e8a03 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 Wz:Lcom/facebook/imagepipeline/memory/b;
+.field final synthetic Wv: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;->Wz:Lcom/facebook/imagepipeline/memory/b;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/b$1;->Wv: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;->Wz:Lcom/facebook/imagepipeline/memory/b;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/b$1;->Wv: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 d7aae54df9..8aa8be5ddb 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 Hz:J
+.field private Hv:J
 
-.field private final Ww:I
+.field private final Ws:I
 
-.field private final Wx:I
+.field private final Wt:I
 
-.field public final Wy:Lcom/facebook/common/references/b;
+.field public final Wu: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;->Ww:I
+    iput p1, p0, Lcom/facebook/imagepipeline/memory/b;->Ws:I
 
-    iput p2, p0, Lcom/facebook/imagepipeline/memory/b;->Wx:I
+    iput p2, p0, Lcom/facebook/imagepipeline/memory/b;->Wt: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;->Wy:Lcom/facebook/common/references/b;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/b;->Wu: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;->Ww:I
+    iget v1, p0, Lcom/facebook/imagepipeline/memory/b;->Ws:I
 
     if-ge v0, v1, :cond_1
 
-    iget-wide v0, p0, Lcom/facebook/imagepipeline/memory/b;->Hz:J
+    iget-wide v0, p0, Lcom/facebook/imagepipeline/memory/b;->Hv:J
 
     int-to-long v2, p1
 
     add-long/2addr v0, v2
 
-    iget p1, p0, Lcom/facebook/imagepipeline/memory/b;->Wx:I
+    iget p1, p0, Lcom/facebook/imagepipeline/memory/b;->Wt: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;->Hz:J
+    iget-wide v4, p0, Lcom/facebook/imagepipeline/memory/b;->Hv:J
 
     add-long/2addr v4, v2
 
-    iput-wide v4, p0, Lcom/facebook/imagepipeline/memory/b;->Hz:J
+    iput-wide v4, p0, Lcom/facebook/imagepipeline/memory/b;->Hv: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;->Hz:J
+    iget-wide v5, p0, Lcom/facebook/imagepipeline/memory/b;->Hv:J
 
     cmp-long v0, v3, v5
 
@@ -197,7 +197,7 @@
 
     aput-object p1, v6, v1
 
-    iget-wide v7, p0, Lcom/facebook/imagepipeline/memory/b;->Hz:J
+    iget-wide v7, p0, Lcom/facebook/imagepipeline/memory/b;->Hv: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;->Hz:J
+    iget-wide v0, p0, Lcom/facebook/imagepipeline/memory/b;->Hv:J
 
     sub-long/2addr v0, v3
 
-    iput-wide v0, p0, Lcom/facebook/imagepipeline/memory/b;->Hz:J
+    iput-wide v0, p0, Lcom/facebook/imagepipeline/memory/b;->Hv:J
 
     iget p1, p0, Lcom/facebook/imagepipeline/memory/b;->mCount:I
 
@@ -247,13 +247,13 @@
     throw p1
 .end method
 
-.method public final declared-synchronized fR()J
+.method public final declared-synchronized fP()J
     .locals 2
 
     monitor-enter p0
 
     :try_start_0
-    iget-wide v0, p0, Lcom/facebook/imagepipeline/memory/b;->Hz:J
+    iget-wide v0, p0, Lcom/facebook/imagepipeline/memory/b;->Hv: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;->Wx:I
+    iget v0, p0, Lcom/facebook/imagepipeline/memory/b;->Wt: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 jH()I
+.method public final declared-synchronized jF()I
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    iget v0, p0, Lcom/facebook/imagepipeline/memory/b;->Ww:I
+    iget v0, p0, Lcom/facebook/imagepipeline/memory/b;->Ws: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 b7d1f89fe5..222f0a4af9 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 GI:Ljava/lang/Class;
+.field private static final GE:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -13,11 +13,11 @@
     .end annotation
 .end field
 
-.field public static final WA:I
+.field public static final Ww:I
 
-.field private static WB:I
+.field private static Wx:I
 
-.field private static volatile WC:Lcom/facebook/imagepipeline/memory/b;
+.field private static volatile Wy: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;->GI:Ljava/lang/Class;
+    sput-object v0, Lcom/facebook/imagepipeline/memory/c;->GE: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;->WA:I
+    sput v1, Lcom/facebook/imagepipeline/memory/c;->Ww:I
 
     const/16 v0, 0x180
 
-    sput v0, Lcom/facebook/imagepipeline/memory/c;->WB:I
+    sput v0, Lcom/facebook/imagepipeline/memory/c;->Wx:I
 
     return-void
 .end method
@@ -79,10 +79,10 @@
     return-void
 .end method
 
-.method public static jI()Lcom/facebook/imagepipeline/memory/b;
+.method public static jG()Lcom/facebook/imagepipeline/memory/b;
     .locals 4
 
-    sget-object v0, Lcom/facebook/imagepipeline/memory/c;->WC:Lcom/facebook/imagepipeline/memory/b;
+    sget-object v0, Lcom/facebook/imagepipeline/memory/c;->Wy: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;->WC:Lcom/facebook/imagepipeline/memory/b;
+    sget-object v1, Lcom/facebook/imagepipeline/memory/c;->Wy: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;->WB:I
+    sget v2, Lcom/facebook/imagepipeline/memory/c;->Wx:I
 
-    sget v3, Lcom/facebook/imagepipeline/memory/c;->WA:I
+    sget v3, Lcom/facebook/imagepipeline/memory/c;->Ww:I
 
     invoke-direct {v1, v2, v3}, Lcom/facebook/imagepipeline/memory/b;-><init>(II)V
 
-    sput-object v1, Lcom/facebook/imagepipeline/memory/c;->WC:Lcom/facebook/imagepipeline/memory/b;
+    sput-object v1, Lcom/facebook/imagepipeline/memory/c;->Wy: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;->WC:Lcom/facebook/imagepipeline/memory/b;
+    sget-object v0, Lcom/facebook/imagepipeline/memory/c;->Wy: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 04bd5bb408..aa8b29c930 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 WQ:Landroid/util/SparseIntArray;
+.field private static final WM: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;->WQ:Landroid/util/SparseIntArray;
+    sput-object v0, Lcom/facebook/imagepipeline/memory/k;->WM:Landroid/util/SparseIntArray;
 
     return-void
 .end method
 
-.method public static jN()Lcom/facebook/imagepipeline/memory/ae;
+.method public static jL()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;->WQ:Landroid/util/SparseIntArray;
+    sget-object v1, Lcom/facebook/imagepipeline/memory/k;->WM: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 6e7a9f2f51..e4fcd49486 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 WR:I
+.field public static final WN:I
 
 
 # direct methods
@@ -19,7 +19,7 @@
 
     move-result v0
 
-    sput v0, Lcom/facebook/imagepipeline/memory/l;->WR:I
+    sput v0, Lcom/facebook/imagepipeline/memory/l;->WN:I
 
     return-void
 .end method
@@ -48,12 +48,12 @@
     return-object v0
 .end method
 
-.method public static jN()Lcom/facebook/imagepipeline/memory/ae;
+.method public static jL()Lcom/facebook/imagepipeline/memory/ae;
     .locals 8
 
     new-instance v7, Lcom/facebook/imagepipeline/memory/ae;
 
-    sget v0, Lcom/facebook/imagepipeline/memory/l;->WR:I
+    sget v0, Lcom/facebook/imagepipeline/memory/l;->WN:I
 
     const/high16 v1, 0x400000
 
@@ -63,7 +63,7 @@
 
     move-result-object v3
 
-    sget v6, Lcom/facebook/imagepipeline/memory/l;->WR:I
+    sget v6, Lcom/facebook/imagepipeline/memory/l;->WN: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 8e6e79e515..38100e4ff9 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 Wq:Ljava/util/Set;
+.field private final Wm: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;->gj()Ljava/util/Set;
+    invoke-static {}, Lcom/facebook/common/d/k;->gh()Ljava/util/Set;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/n;->Wq:Ljava/util/Set;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/n;->Wm:Ljava/util/Set;
 
     return-void
 .end method
@@ -60,7 +60,7 @@
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/n;->Wq:Ljava/util/Set;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/n;->Wm: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;->Wq:Ljava/util/Set;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/n;->Wm: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 f15c7591f3..eeaef2147e 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 WU:Lcom/facebook/imagepipeline/memory/o;
+.field final synthetic WP: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;->WU:Lcom/facebook/imagepipeline/memory/o;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/o$1;->WP: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;->WU:Lcom/facebook/imagepipeline/memory/o;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/o$1;->WP:Lcom/facebook/imagepipeline/memory/o;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/memory/o;->WT:Lcom/facebook/imagepipeline/memory/o$a;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/memory/o;->WO: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 99c13d8d91..81ec50b8ed 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;->Wo:Lcom/facebook/imagepipeline/memory/ae;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/o$a;->Wk:Lcom/facebook/imagepipeline/memory/ae;
 
-    iget v1, v1, Lcom/facebook/imagepipeline/memory/ae;->XB:I
+    iget v1, v1, Lcom/facebook/imagepipeline/memory/ae;->Xx: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 15d413d6e4..bbd32b7301 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 Is:Lcom/facebook/common/references/b;
+.field private final Io: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 WT:Lcom/facebook/imagepipeline/memory/o$a;
+.field final WO: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;->XB:I
+    iget v0, p2, Lcom/facebook/imagepipeline/memory/ae;->Xx: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;->jP()Lcom/facebook/imagepipeline/memory/z;
+    invoke-static {}, Lcom/facebook/imagepipeline/memory/z;->jN()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;->WT:Lcom/facebook/imagepipeline/memory/o$a;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/o;->WO: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;->Is:Lcom/facebook/common/references/b;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/o;->Io:Lcom/facebook/common/references/b;
 
     return-void
 .end method
@@ -75,13 +75,13 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/o;->WT:Lcom/facebook/imagepipeline/memory/o$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/o;->WO: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;->Is:Lcom/facebook/common/references/b;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/o;->Io: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 e4f6559501..57cf0ef5f6 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 WV:[I
+.field private final WQ:[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;->Xx:Landroid/util/SparseIntArray;
+    iget-object p1, p2, Lcom/facebook/imagepipeline/memory/ae;->Xt: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;->WV:[I
+    iput-object p2, p0, Lcom/facebook/imagepipeline/memory/p;->WQ:[I
 
     const/4 p2, 0x0
 
@@ -45,7 +45,7 @@
 
     if-ge p2, p3, :cond_0
 
-    iget-object p3, p0, Lcom/facebook/imagepipeline/memory/p;->WV:[I
+    iget-object p3, p0, Lcom/facebook/imagepipeline/memory/p;->WQ:[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;->WV:[I
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/p;->WQ:[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 f26fa76671..07fb4dc1f2 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 UZ:I
+.field private UV:I
 
-.field protected final WW:Lcom/facebook/imagepipeline/memory/ab;
+.field protected final WR: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 WX:I
+.field private final WT:I
 
-.field private WY:I
+.field private WU:I
 
-.field private final Wu:Lcom/facebook/imagepipeline/memory/af;
+.field private final Wq: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;->WW:Lcom/facebook/imagepipeline/memory/ab;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/q;->WR:Lcom/facebook/imagepipeline/memory/ab;
 
-    iput p1, p0, Lcom/facebook/imagepipeline/memory/q;->WX:I
+    iput p1, p0, Lcom/facebook/imagepipeline/memory/q;->WT:I
 
-    iput p2, p0, Lcom/facebook/imagepipeline/memory/q;->UZ:I
+    iput p2, p0, Lcom/facebook/imagepipeline/memory/q;->UV:I
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/memory/q;->Wu:Lcom/facebook/imagepipeline/memory/af;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/memory/q;->Wq: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;->WY:I
+    iget v0, p0, Lcom/facebook/imagepipeline/memory/q;->WU:I
 
     if-le v0, p1, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/q;->WW:Lcom/facebook/imagepipeline/memory/ab;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/q;->WR:Lcom/facebook/imagepipeline/memory/ab;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/memory/ab;->jJ()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/memory/ab;->jH()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;->WW:Lcom/facebook/imagepipeline/memory/ab;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/q;->WR: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;->WY:I
+    iget v1, p0, Lcom/facebook/imagepipeline/memory/q;->WU:I
 
     sub-int/2addr v1, v0
 
-    iput v1, p0, Lcom/facebook/imagepipeline/memory/q;->WY:I
+    iput v1, p0, Lcom/facebook/imagepipeline/memory/q;->WU: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;->WY:I
+    iget v0, p0, Lcom/facebook/imagepipeline/memory/q;->WU:I
 
-    iget v1, p0, Lcom/facebook/imagepipeline/memory/q;->WX:I
+    iget v1, p0, Lcom/facebook/imagepipeline/memory/q;->WT:I
 
     if-le v0, v1, :cond_0
 
-    iget v0, p0, Lcom/facebook/imagepipeline/memory/q;->WX:I
+    iget v0, p0, Lcom/facebook/imagepipeline/memory/q;->WT:I
 
     invoke-direct {p0, v0}, Lcom/facebook/imagepipeline/memory/q;->at(I)V
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/q;->WW:Lcom/facebook/imagepipeline/memory/ab;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/q;->WR: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;->WW:Lcom/facebook/imagepipeline/memory/ab;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/memory/q;->WR: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;->WY:I
+    iget v1, p0, Lcom/facebook/imagepipeline/memory/q;->WU:I
 
     sub-int/2addr v1, p1
 
-    iput v1, p0, Lcom/facebook/imagepipeline/memory/q;->WY:I
+    iput v1, p0, Lcom/facebook/imagepipeline/memory/q;->WU: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;->WW:Lcom/facebook/imagepipeline/memory/ab;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/q;->WR: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;->UZ:I
+    iget v1, p0, Lcom/facebook/imagepipeline/memory/q;->UV:I
 
     if-gt v0, v1, :cond_0
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/q;->WW:Lcom/facebook/imagepipeline/memory/ab;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/q;->WR: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;->WY:I
+    iget p1, p0, Lcom/facebook/imagepipeline/memory/q;->WU:I
 
     add-int/2addr p1, v0
 
-    iput p1, p0, Lcom/facebook/imagepipeline/memory/q;->WY:I
+    iput p1, p0, Lcom/facebook/imagepipeline/memory/q;->WU: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 1d57197b97..d68e8f53b2 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 WV:[I
+.field final WQ:[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;->Xx:Landroid/util/SparseIntArray;
+    iget-object p1, p2, Lcom/facebook/imagepipeline/memory/ae;->Xt: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;->WV:[I
+    iput-object p2, p0, Lcom/facebook/imagepipeline/memory/t;->WQ:[I
 
     const/4 p2, 0x0
 
     :goto_0
-    iget-object p3, p0, Lcom/facebook/imagepipeline/memory/t;->WV:[I
+    iget-object p3, p0, Lcom/facebook/imagepipeline/memory/t;->WQ:[I
 
     array-length v0, p3
 
@@ -122,7 +122,7 @@
 
     if-lez p1, :cond_2
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/t;->WV:[I
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/t;->WQ:[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 865267b7c3..de5eb3ab20 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 SB:Lcom/facebook/common/g/j;
+.field private final Sx:Lcom/facebook/common/g/j;
 
-.field private final Xc:Lcom/facebook/imagepipeline/memory/t;
+.field private final WY: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;->Xc:Lcom/facebook/imagepipeline/memory/t;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/w;->WY:Lcom/facebook/imagepipeline/memory/t;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/memory/w;->SB:Lcom/facebook/common/g/j;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/memory/w;->Sx:Lcom/facebook/common/g/j;
 
     return-void
 .end method
@@ -33,11 +33,11 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/w;->SB:Lcom/facebook/common/g/j;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/w;->Sx: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;->jO()Lcom/facebook/imagepipeline/memory/v;
+    invoke-virtual {p2}, Lcom/facebook/imagepipeline/memory/x;->jM()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;->Xc:Lcom/facebook/imagepipeline/memory/t;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/w;->WY: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;->Xc:Lcom/facebook/imagepipeline/memory/t;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/w;->WY: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;->Xc:Lcom/facebook/imagepipeline/memory/t;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/w;->WY: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;->jO()Lcom/facebook/imagepipeline/memory/v;
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/memory/x;->jM()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;->Xc:Lcom/facebook/imagepipeline/memory/t;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/w;->WY: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 gp()Lcom/facebook/common/g/i;
+.method public final synthetic gn()Lcom/facebook/common/g/i;
     .locals 2
 
     new-instance v0, Lcom/facebook/imagepipeline/memory/x;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/w;->Xc:Lcom/facebook/imagepipeline/memory/t;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/w;->WY: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 2f3db25e04..7ff8758680 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 Xb:Lcom/facebook/common/references/CloseableReference;
+.field private WX: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 Xc:Lcom/facebook/imagepipeline/memory/t;
+.field private final WY: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;->WV:[I
+    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/t;->WQ:[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;->Xc:Lcom/facebook/imagepipeline/memory/t;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/x;->WY:Lcom/facebook/imagepipeline/memory/t;
 
     iput v0, p0, Lcom/facebook/imagepipeline/memory/x;->mCount:I
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/memory/x;->Xc:Lcom/facebook/imagepipeline/memory/t;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/memory/x;->WY: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;->Xc:Lcom/facebook/imagepipeline/memory/t;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/memory/x;->WY: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;->Xb:Lcom/facebook/common/references/CloseableReference;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/x;->WX:Lcom/facebook/common/references/CloseableReference;
 
     return-void
 .end method
 
-.method private gw()V
+.method private gu()V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/x;->Xb:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/x;->WX: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;->Xb:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/x;->WX: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;->Xb:Lcom/facebook/common/references/CloseableReference;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/x;->WX:Lcom/facebook/common/references/CloseableReference;
 
     const/4 v0, -0x1
 
@@ -131,24 +131,24 @@
     return-void
 .end method
 
-.method public final synthetic gq()Lcom/facebook/common/g/f;
+.method public final synthetic go()Lcom/facebook/common/g/f;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/memory/x;->jO()Lcom/facebook/imagepipeline/memory/v;
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/memory/x;->jM()Lcom/facebook/imagepipeline/memory/v;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final jO()Lcom/facebook/imagepipeline/memory/v;
+.method public final jM()Lcom/facebook/imagepipeline/memory/v;
     .locals 3
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/x;->gw()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/x;->gu()V
 
     new-instance v0, Lcom/facebook/imagepipeline/memory/v;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/x;->Xb:Lcom/facebook/common/references/CloseableReference;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/x;->WX: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;->gw()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/x;->gu()V
 
     iget v0, p0, Lcom/facebook/imagepipeline/memory/x;->mCount:I
 
     add-int/2addr v0, p3
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/x;->gw()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/x;->gu()V
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/x;->Xb:Lcom/facebook/common/references/CloseableReference;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/x;->WX: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;->Xc:Lcom/facebook/imagepipeline/memory/t;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/x;->WY: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;->Xb:Lcom/facebook/common/references/CloseableReference;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/x;->WX: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;->Xb:Lcom/facebook/common/references/CloseableReference;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/x;->WX:Lcom/facebook/common/references/CloseableReference;
 
     invoke-virtual {v1}, Lcom/facebook/common/references/CloseableReference;->close()V
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/x;->Xc:Lcom/facebook/imagepipeline/memory/t;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/x;->WY: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;->Xb:Lcom/facebook/common/references/CloseableReference;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/x;->WX:Lcom/facebook/common/references/CloseableReference;
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/x;->Xb:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/x;->WX: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 029290f84b..6ce222d966 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 Xe:Lcom/facebook/imagepipeline/memory/z;
+.field private static Xa:Lcom/facebook/imagepipeline/memory/z;
 
 
 # direct methods
@@ -25,7 +25,7 @@
     return-void
 .end method
 
-.method public static declared-synchronized jP()Lcom/facebook/imagepipeline/memory/z;
+.method public static declared-synchronized jN()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;->Xe:Lcom/facebook/imagepipeline/memory/z;
+    sget-object v1, Lcom/facebook/imagepipeline/memory/z;->Xa: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;->Xe:Lcom/facebook/imagepipeline/memory/z;
+    sput-object v1, Lcom/facebook/imagepipeline/memory/z;->Xa:Lcom/facebook/imagepipeline/memory/z;
 
     :cond_0
-    sget-object v1, Lcom/facebook/imagepipeline/memory/z;->Xe:Lcom/facebook/imagepipeline/memory/z;
+    sget-object v1, Lcom/facebook/imagepipeline/memory/z;->Xa: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 9ed030cee3..1d10e0708b 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;->jX()V
+    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/a;->jV()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 26240aa646..a07bed35ad 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;->fD()V
+    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/d;->fB()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;->fD()V
+    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/d;->fB()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;->Rd:Lcom/facebook/e/c;
+    sget-object v0, Lcom/facebook/e/b;->QZ:Lcom/facebook/e/c;
 
     const/4 v1, 0x0
 
@@ -112,22 +112,22 @@
     return v1
 
     :cond_1
-    sget-object v0, Lcom/facebook/e/b;->Re:Lcom/facebook/e/c;
+    sget-object v0, Lcom/facebook/e/b;->Ra:Lcom/facebook/e/c;
 
     if-eq p1, v0, :cond_4
 
-    sget-object v0, Lcom/facebook/e/b;->Rf:Lcom/facebook/e/c;
+    sget-object v0, Lcom/facebook/e/b;->Rb:Lcom/facebook/e/c;
 
     if-eq p1, v0, :cond_4
 
-    sget-object v0, Lcom/facebook/e/b;->Rg:Lcom/facebook/e/c;
+    sget-object v0, Lcom/facebook/e/b;->Rc:Lcom/facebook/e/c;
 
     if-ne p1, v0, :cond_2
 
     goto :goto_0
 
     :cond_2
-    sget-object v0, Lcom/facebook/e/b;->Rh:Lcom/facebook/e/c;
+    sget-object v0, Lcom/facebook/e/b;->Rd: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;->Jl:Z
+    sget-boolean p1, Lcom/facebook/common/k/c;->Jh: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 34d8e432ae..debe9005ab 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 XE:Ljava/util/List;
+.field public static final XA: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;->XE:Ljava/util/List;
+    sput-object v0, Lcom/facebook/imagepipeline/nativecode/a;->XA:Ljava/util/List;
 
     return-void
 .end method
 
-.method public static jX()V
+.method public static jV()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 6abc0aa871..38f536326e 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 Gh:Z
+.field private static Gd:Z
 
 
 # direct methods
-.method public static declared-synchronized fD()V
+.method public static declared-synchronized fB()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;->Gh:Z
+    sget-boolean v1, Lcom/facebook/imagepipeline/nativecode/c;->Gd:Z
 
     if-nez v1, :cond_1
 
@@ -45,7 +45,7 @@
 
     const/4 v1, 0x1
 
-    sput-boolean v1, Lcom/facebook/imagepipeline/nativecode/c;->Gh:Z
+    sput-boolean v1, Lcom/facebook/imagepipeline/nativecode/c;->Gd: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 0b3be7dfb0..dbc03ac2db 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 Gh:Z
+.field private static Gd:Z
 
 
 # direct methods
-.method public static declared-synchronized fD()V
+.method public static declared-synchronized fB()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;->Gh:Z
+    sget-boolean v1, Lcom/facebook/imagepipeline/nativecode/d;->Gd:Z
 
     if-nez v1, :cond_1
 
@@ -45,7 +45,7 @@
 
     const/4 v1, 0x1
 
-    sput-boolean v1, Lcom/facebook/imagepipeline/nativecode/d;->Gh:Z
+    sput-boolean v1, Lcom/facebook/imagepipeline/nativecode/d;->Gd: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 d4d8686f59..5339540d43 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/nativecode/f.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/nativecode/f.smali
@@ -4,9 +4,9 @@
 
 
 # static fields
-.field private static XI:Lcom/facebook/imagepipeline/nativecode/e; = null
+.field private static XE:Lcom/facebook/imagepipeline/nativecode/e; = null
 
-.field public static XJ:Z = false
+.field public static XF:Z = false
 
 
 # direct methods
@@ -26,11 +26,11 @@
 
     check-cast v0, Lcom/facebook/imagepipeline/nativecode/e;
 
-    sput-object v0, Lcom/facebook/imagepipeline/nativecode/f;->XI:Lcom/facebook/imagepipeline/nativecode/e;
+    sput-object v0, Lcom/facebook/imagepipeline/nativecode/f;->XE:Lcom/facebook/imagepipeline/nativecode/e;
 
     const/4 v0, 0x1
 
-    sput-boolean v0, Lcom/facebook/imagepipeline/nativecode/f;->XJ:Z
+    sput-boolean v0, Lcom/facebook/imagepipeline/nativecode/f;->XF: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;->XJ:Z
+    sput-boolean v0, Lcom/facebook/imagepipeline/nativecode/f;->XF:Z
 
     return-void
 .end method
 
-.method public static jY()Lcom/facebook/imagepipeline/nativecode/e;
+.method public static jW()Lcom/facebook/imagepipeline/nativecode/e;
     .locals 1
 
-    sget-object v0, Lcom/facebook/imagepipeline/nativecode/f;->XI:Lcom/facebook/imagepipeline/nativecode/e;
+    sget-object v0, Lcom/facebook/imagepipeline/nativecode/f;->XE: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 5ee702d906..be3a0ac23e 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 Sn:Lcom/facebook/imagepipeline/memory/o;
+.field private final Sj: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;->Sn:Lcom/facebook/imagepipeline/memory/o;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/platform/d;->Sj: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;->XC:[B
+    sget-object v0, Lcom/facebook/imagepipeline/platform/d;->Xy:[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;->Sn:Lcom/facebook/imagepipeline/memory/o;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/platform/d;->Sj: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;->Sn:Lcom/facebook/imagepipeline/memory/o;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/platform/d;->Sj: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 45b8606d83..fdebeb952c 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;->jT()I
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/memory/ad;->jR()I
 
     move-result p1
 
     new-instance v0, Lcom/facebook/imagepipeline/platform/e;
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/memory/ad;->jQ()Lcom/facebook/imagepipeline/memory/d;
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/memory/ad;->jO()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;->jT()I
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/memory/ad;->jR()I
 
     move-result p1
 
     new-instance v0, Lcom/facebook/imagepipeline/platform/a;
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/memory/ad;->jQ()Lcom/facebook/imagepipeline/memory/d;
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/memory/ad;->jO()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;->jS()Lcom/facebook/imagepipeline/memory/o;
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/memory/ad;->jQ()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 496008d597..3c5de92f9f 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 aan:Lcom/facebook/imagepipeline/request/b$a;
+.field public static final enum aaj:Lcom/facebook/imagepipeline/request/b$a;
 
-.field public static final enum aao:Lcom/facebook/imagepipeline/request/b$a;
+.field public static final enum aak:Lcom/facebook/imagepipeline/request/b$a;
 
-.field private static final synthetic aap:[Lcom/facebook/imagepipeline/request/b$a;
+.field private static final synthetic aal:[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;->aan:Lcom/facebook/imagepipeline/request/b$a;
+    sput-object v0, Lcom/facebook/imagepipeline/request/b$a;->aaj: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;->aao:Lcom/facebook/imagepipeline/request/b$a;
+    sput-object v0, Lcom/facebook/imagepipeline/request/b$a;->aak: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;->aan:Lcom/facebook/imagepipeline/request/b$a;
+    sget-object v3, Lcom/facebook/imagepipeline/request/b$a;->aaj:Lcom/facebook/imagepipeline/request/b$a;
 
     aput-object v3, v0, v1
 
-    sget-object v1, Lcom/facebook/imagepipeline/request/b$a;->aao:Lcom/facebook/imagepipeline/request/b$a;
+    sget-object v1, Lcom/facebook/imagepipeline/request/b$a;->aak:Lcom/facebook/imagepipeline/request/b$a;
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lcom/facebook/imagepipeline/request/b$a;->aap:[Lcom/facebook/imagepipeline/request/b$a;
+    sput-object v0, Lcom/facebook/imagepipeline/request/b$a;->aal:[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;->aap:[Lcom/facebook/imagepipeline/request/b$a;
+    sget-object v0, Lcom/facebook/imagepipeline/request/b$a;->aal:[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 c0052e8e18..d23241e037 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 aaq:Lcom/facebook/imagepipeline/request/b$b;
+.field public static final enum aam:Lcom/facebook/imagepipeline/request/b$b;
 
-.field public static final enum aar:Lcom/facebook/imagepipeline/request/b$b;
+.field public static final enum aan:Lcom/facebook/imagepipeline/request/b$b;
 
-.field public static final enum aas:Lcom/facebook/imagepipeline/request/b$b;
+.field public static final enum aao:Lcom/facebook/imagepipeline/request/b$b;
 
-.field public static final enum aat:Lcom/facebook/imagepipeline/request/b$b;
+.field public static final enum aap:Lcom/facebook/imagepipeline/request/b$b;
 
-.field private static final synthetic aau:[Lcom/facebook/imagepipeline/request/b$b;
+.field private static final synthetic aaq:[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;->aaq:Lcom/facebook/imagepipeline/request/b$b;
+    sput-object v0, Lcom/facebook/imagepipeline/request/b$b;->aam: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;->aar:Lcom/facebook/imagepipeline/request/b$b;
+    sput-object v0, Lcom/facebook/imagepipeline/request/b$b;->aan: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;->aas:Lcom/facebook/imagepipeline/request/b$b;
+    sput-object v0, Lcom/facebook/imagepipeline/request/b$b;->aao: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;->aat:Lcom/facebook/imagepipeline/request/b$b;
+    sput-object v0, Lcom/facebook/imagepipeline/request/b$b;->aap: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;->aaq:Lcom/facebook/imagepipeline/request/b$b;
+    sget-object v5, Lcom/facebook/imagepipeline/request/b$b;->aam:Lcom/facebook/imagepipeline/request/b$b;
 
     aput-object v5, v0, v1
 
-    sget-object v1, Lcom/facebook/imagepipeline/request/b$b;->aar:Lcom/facebook/imagepipeline/request/b$b;
+    sget-object v1, Lcom/facebook/imagepipeline/request/b$b;->aan:Lcom/facebook/imagepipeline/request/b$b;
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/facebook/imagepipeline/request/b$b;->aas:Lcom/facebook/imagepipeline/request/b$b;
+    sget-object v1, Lcom/facebook/imagepipeline/request/b$b;->aao:Lcom/facebook/imagepipeline/request/b$b;
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/facebook/imagepipeline/request/b$b;->aat:Lcom/facebook/imagepipeline/request/b$b;
+    sget-object v1, Lcom/facebook/imagepipeline/request/b$b;->aap:Lcom/facebook/imagepipeline/request/b$b;
 
     aput-object v1, v0, v4
 
-    sput-object v0, Lcom/facebook/imagepipeline/request/b$b;->aau:[Lcom/facebook/imagepipeline/request/b$b;
+    sput-object v0, Lcom/facebook/imagepipeline/request/b$b;->aaq:[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;->aau:[Lcom/facebook/imagepipeline/request/b$b;
+    sget-object v0, Lcom/facebook/imagepipeline/request/b$b;->aaq:[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 950c3711bf..ec8e24ae47 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 aaC:[I
+.field static final synthetic aay:[I
 
 
 # direct methods
@@ -30,10 +30,10 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/facebook/imageutils/a$1;->aaC:[I
+    sput-object v0, Lcom/facebook/imageutils/a$1;->aay:[I
 
     :try_start_0
-    sget-object v0, Lcom/facebook/imageutils/a$1;->aaC:[I
+    sget-object v0, Lcom/facebook/imageutils/a$1;->aay:[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;->aaC:[I
+    sget-object v0, Lcom/facebook/imageutils/a$1;->aay:[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;->aaC:[I
+    sget-object v0, Lcom/facebook/imageutils/a$1;->aay:[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;->aaC:[I
+    sget-object v0, Lcom/facebook/imageutils/a$1;->aay:[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;->aaC:[I
+    sget-object v0, Lcom/facebook/imageutils/a$1;->aay:[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 d1f1fd3a7d..dc4afb8e09 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 aaE:I
+.field aaA:I
 
-.field aaF:I
+.field aaB: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 80a74bd222..e0f695a014 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 GI:Ljava/lang/Class;
+.field private static final GE: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;->GI:Ljava/lang/Class;
+    sput-object v0, Lcom/facebook/imageutils/e;->GE:Ljava/lang/Class;
 
     return-void
 .end method
@@ -117,23 +117,23 @@
 
     move-result v5
 
-    iput v5, v0, Lcom/facebook/imageutils/e$a;->aaE:I
+    iput v5, v0, Lcom/facebook/imageutils/e$a;->aaA:I
 
     add-int/lit8 p1, p1, -0x4
 
-    iget v5, v0, Lcom/facebook/imageutils/e$a;->aaE:I
+    iget v5, v0, Lcom/facebook/imageutils/e$a;->aaA:I
 
     const v6, 0x49492a00    # 823968.0f
 
     if-eq v5, v6, :cond_1
 
-    iget v5, v0, Lcom/facebook/imageutils/e$a;->aaE:I
+    iget v5, v0, Lcom/facebook/imageutils/e$a;->aaA:I
 
     const v7, 0x4d4d002a    # 2.14958752E8f
 
     if-eq v5, v7, :cond_1
 
-    sget-object p1, Lcom/facebook/imageutils/e;->GI:Ljava/lang/Class;
+    sget-object p1, Lcom/facebook/imageutils/e;->GE: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;->aaE:I
+    iget v5, v0, Lcom/facebook/imageutils/e$a;->aaA:I
 
     if-ne v5, v6, :cond_2
 
@@ -162,22 +162,22 @@
 
     move-result v5
 
-    iput v5, v0, Lcom/facebook/imageutils/e$a;->aaF:I
+    iput v5, v0, Lcom/facebook/imageutils/e$a;->aaB:I
 
     add-int/lit8 p1, p1, -0x4
 
-    iget v5, v0, Lcom/facebook/imageutils/e$a;->aaF:I
+    iget v5, v0, Lcom/facebook/imageutils/e$a;->aaB:I
 
     if-lt v5, v4, :cond_3
 
-    iget v5, v0, Lcom/facebook/imageutils/e$a;->aaF:I
+    iget v5, v0, Lcom/facebook/imageutils/e$a;->aaB:I
 
     sub-int/2addr v5, v4
 
     if-le v5, p1, :cond_4
 
     :cond_3
-    sget-object p1, Lcom/facebook/imageutils/e;->GI:Ljava/lang/Class;
+    sget-object p1, Lcom/facebook/imageutils/e;->GE:Ljava/lang/Class;
 
     const-string v5, "Invalid offset"
 
@@ -187,7 +187,7 @@
 
     :cond_4
     :goto_2
-    iget v5, v0, Lcom/facebook/imageutils/e$a;->aaF:I
+    iget v5, v0, Lcom/facebook/imageutils/e$a;->aaB: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 169226494a..98267663b1 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 kL()V
+.end method
+
+.method public abstract kM()V
+.end method
+
 .method public abstract kN()V
 .end method
-
-.method public abstract kO()V
-.end method
-
-.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 a37c50eda8..62b44b73c8 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 aaG:Z
+.field public aaC:Z
 
-.field public aaH:I
+.field public aaD:I
 
-.field public aaI:I
+.field public aaE:I
 
-.field public final aaJ:[I
+.field public final aaF:[I
 
-.field public final aaK:[F
+.field public final aaG:[F
 
-.field public final aaL:[F
+.field public final aaH:[F
 
-.field public final aaM:[F
+.field public final aaI:[F
 
-.field public final aaN:[F
+.field public final aaJ:[F
 
-.field public aaO:Lcom/facebook/samples/a/a$a;
+.field public aaK: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;->aaJ:[I
+    iput-object v1, p0, Lcom/facebook/samples/a/a;->aaF:[I
 
     new-array v1, v0, [F
 
-    iput-object v1, p0, Lcom/facebook/samples/a/a;->aaK:[F
+    iput-object v1, p0, Lcom/facebook/samples/a/a;->aaG:[F
 
     new-array v1, v0, [F
 
-    iput-object v1, p0, Lcom/facebook/samples/a/a;->aaL:[F
+    iput-object v1, p0, Lcom/facebook/samples/a/a;->aaH:[F
 
     new-array v1, v0, [F
 
-    iput-object v1, p0, Lcom/facebook/samples/a/a;->aaM:[F
+    iput-object v1, p0, Lcom/facebook/samples/a/a;->aaI:[F
 
     new-array v0, v0, [F
 
-    iput-object v0, p0, Lcom/facebook/samples/a/a;->aaN:[F
+    iput-object v0, p0, Lcom/facebook/samples/a/a;->aaJ:[F
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/facebook/samples/a/a;->aaO:Lcom/facebook/samples/a/a$a;
+    iput-object v0, p0, Lcom/facebook/samples/a/a;->aaK: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 kL()V
+.method public final kJ()V
     .locals 1
 
-    iget-boolean v0, p0, Lcom/facebook/samples/a/a;->aaG:Z
+    iget-boolean v0, p0, Lcom/facebook/samples/a/a;->aaC:Z
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/samples/a/a;->aaO:Lcom/facebook/samples/a/a$a;
+    iget-object v0, p0, Lcom/facebook/samples/a/a;->aaK:Lcom/facebook/samples/a/a$a;
 
     if-eqz v0, :cond_0
 
-    invoke-interface {v0}, Lcom/facebook/samples/a/a$a;->kN()V
+    invoke-interface {v0}, Lcom/facebook/samples/a/a$a;->kL()V
 
     :cond_0
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/facebook/samples/a/a;->aaG:Z
+    iput-boolean v0, p0, Lcom/facebook/samples/a/a;->aaC:Z
 
     :cond_1
     return-void
 .end method
 
-.method public final kM()V
+.method public final kK()V
     .locals 1
 
-    iget-boolean v0, p0, Lcom/facebook/samples/a/a;->aaG:Z
+    iget-boolean v0, p0, Lcom/facebook/samples/a/a;->aaC:Z
 
     if-eqz v0, :cond_0
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/facebook/samples/a/a;->aaG:Z
+    iput-boolean v0, p0, Lcom/facebook/samples/a/a;->aaC:Z
 
-    iget-object v0, p0, Lcom/facebook/samples/a/a;->aaO:Lcom/facebook/samples/a/a$a;
+    iget-object v0, p0, Lcom/facebook/samples/a/a;->aaK:Lcom/facebook/samples/a/a$a;
 
     if-eqz v0, :cond_0
 
-    invoke-interface {v0}, Lcom/facebook/samples/a/a$a;->kP()V
+    invoke-interface {v0}, Lcom/facebook/samples/a/a$a;->kN()V
 
     :cond_0
     return-void
@@ -118,16 +118,16 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/facebook/samples/a/a;->aaG:Z
+    iput-boolean v0, p0, Lcom/facebook/samples/a/a;->aaC:Z
 
-    iput v0, p0, Lcom/facebook/samples/a/a;->aaH:I
+    iput v0, p0, Lcom/facebook/samples/a/a;->aaD:I
 
     :goto_0
     const/4 v1, 0x2
 
     if-ge v0, v1, :cond_0
 
-    iget-object v1, p0, Lcom/facebook/samples/a/a;->aaJ:[I
+    iget-object v1, p0, Lcom/facebook/samples/a/a;->aaF:[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 122226894a..de7eca0902 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 kR()V
+.method public abstract kP()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 f5a7544d76..e4ec8bc046 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 aaP:Lcom/facebook/samples/a/a;
+.field public final aaL:Lcom/facebook/samples/a/a;
 
-.field public aaQ:Lcom/facebook/samples/a/b$a;
+.field public aaM: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;->aaQ:Lcom/facebook/samples/a/b$a;
+    iput-object v0, p0, Lcom/facebook/samples/a/b;->aaM:Lcom/facebook/samples/a/b$a;
 
-    iput-object p1, p0, Lcom/facebook/samples/a/b;->aaP:Lcom/facebook/samples/a/a;
+    iput-object p1, p0, Lcom/facebook/samples/a/b;->aaL:Lcom/facebook/samples/a/a;
 
-    iget-object p1, p0, Lcom/facebook/samples/a/b;->aaP:Lcom/facebook/samples/a/a;
+    iget-object p1, p0, Lcom/facebook/samples/a/b;->aaL:Lcom/facebook/samples/a/a;
 
-    iput-object p0, p1, Lcom/facebook/samples/a/a;->aaO:Lcom/facebook/samples/a/a$a;
+    iput-object p0, p1, Lcom/facebook/samples/a/a;->aaK: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;->aaP:Lcom/facebook/samples/a/a;
+    iget-object v0, p0, Lcom/facebook/samples/a/b;->aaL:Lcom/facebook/samples/a/a;
 
-    iget-object v0, v0, Lcom/facebook/samples/a/a;->aaK:[F
+    iget-object v0, v0, Lcom/facebook/samples/a/a;->aaG:[F
 
-    iget-object v1, p0, Lcom/facebook/samples/a/b;->aaP:Lcom/facebook/samples/a/a;
+    iget-object v1, p0, Lcom/facebook/samples/a/b;->aaL:Lcom/facebook/samples/a/a;
 
-    iget v1, v1, Lcom/facebook/samples/a/a;->aaH:I
+    iget v1, v1, Lcom/facebook/samples/a/a;->aaD: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;->aaP:Lcom/facebook/samples/a/a;
+    iget-object v0, p0, Lcom/facebook/samples/a/b;->aaL:Lcom/facebook/samples/a/a;
 
-    iget-object v0, v0, Lcom/facebook/samples/a/a;->aaL:[F
+    iget-object v0, v0, Lcom/facebook/samples/a/a;->aaH:[F
 
-    iget-object v1, p0, Lcom/facebook/samples/a/b;->aaP:Lcom/facebook/samples/a/a;
+    iget-object v1, p0, Lcom/facebook/samples/a/b;->aaL:Lcom/facebook/samples/a/a;
 
-    iget v1, v1, Lcom/facebook/samples/a/a;->aaH:I
+    iget v1, v1, Lcom/facebook/samples/a/a;->aaD:I
 
     invoke-static {v0, v1}, Lcom/facebook/samples/a/b;->a([FI)F
 
@@ -110,10 +110,10 @@
     return v0
 .end method
 
-.method public final kN()V
+.method public final kL()V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/samples/a/b;->aaQ:Lcom/facebook/samples/a/b$a;
+    iget-object v0, p0, Lcom/facebook/samples/a/b;->aaM:Lcom/facebook/samples/a/b$a;
 
     if-eqz v0, :cond_0
 
@@ -123,10 +123,10 @@
     return-void
 .end method
 
-.method public final kO()V
+.method public final kM()V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/samples/a/b;->aaQ:Lcom/facebook/samples/a/b$a;
+    iget-object v0, p0, Lcom/facebook/samples/a/b;->aaM:Lcom/facebook/samples/a/b$a;
 
     if-eqz v0, :cond_0
 
@@ -136,29 +136,29 @@
     return-void
 .end method
 
-.method public final kP()V
+.method public final kN()V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/samples/a/b;->aaQ:Lcom/facebook/samples/a/b$a;
+    iget-object v0, p0, Lcom/facebook/samples/a/b;->aaM:Lcom/facebook/samples/a/b$a;
 
     if-eqz v0, :cond_0
 
-    invoke-interface {v0}, Lcom/facebook/samples/a/b$a;->kR()V
+    invoke-interface {v0}, Lcom/facebook/samples/a/b$a;->kP()V
 
     :cond_0
     return-void
 .end method
 
-.method public final kQ()V
+.method public final kO()V
     .locals 4
 
-    iget-object v0, p0, Lcom/facebook/samples/a/b;->aaP:Lcom/facebook/samples/a/a;
+    iget-object v0, p0, Lcom/facebook/samples/a/b;->aaL:Lcom/facebook/samples/a/a;
 
-    iget-boolean v1, v0, Lcom/facebook/samples/a/a;->aaG:Z
+    iget-boolean v1, v0, Lcom/facebook/samples/a/a;->aaC:Z
 
     if-eqz v1, :cond_1
 
-    invoke-virtual {v0}, Lcom/facebook/samples/a/a;->kM()V
+    invoke-virtual {v0}, Lcom/facebook/samples/a/a;->kK()V
 
     const/4 v1, 0x0
 
@@ -167,17 +167,17 @@
 
     if-ge v1, v2, :cond_0
 
-    iget-object v2, v0, Lcom/facebook/samples/a/a;->aaK:[F
+    iget-object v2, v0, Lcom/facebook/samples/a/a;->aaG:[F
 
-    iget-object v3, v0, Lcom/facebook/samples/a/a;->aaM:[F
+    iget-object v3, v0, Lcom/facebook/samples/a/a;->aaI:[F
 
     aget v3, v3, v1
 
     aput v3, v2, v1
 
-    iget-object v2, v0, Lcom/facebook/samples/a/a;->aaL:[F
+    iget-object v2, v0, Lcom/facebook/samples/a/a;->aaH:[F
 
-    iget-object v3, v0, Lcom/facebook/samples/a/a;->aaN:[F
+    iget-object v3, v0, Lcom/facebook/samples/a/a;->aaJ:[F
 
     aget v3, v3, v1
 
@@ -188,7 +188,7 @@
     goto :goto_0
 
     :cond_0
-    invoke-virtual {v0}, Lcom/facebook/samples/a/a;->kL()V
+    invoke-virtual {v0}, Lcom/facebook/samples/a/a;->kJ()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 bd984ce066..aca0dac6c5 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 abD:Lcom/facebook/samples/zoomable/ZoomableDraweeView;
+.field final synthetic abz: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;->abD:Lcom/facebook/samples/zoomable/ZoomableDraweeView;
+    iput-object p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView$1;->abz: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;->abD:Lcom/facebook/samples/zoomable/ZoomableDraweeView;
+    iget-object p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView$1;->abz: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;->abD:Lcom/facebook/samples/zoomable/ZoomableDraweeView;
+    iget-object p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView$1;->abz: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 a552ef4a69..9d55a176bf 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 abD:Lcom/facebook/samples/zoomable/ZoomableDraweeView;
+.field final synthetic abz: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;->abD:Lcom/facebook/samples/zoomable/ZoomableDraweeView;
+    iput-object p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView$2;->abz: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;->abD:Lcom/facebook/samples/zoomable/ZoomableDraweeView;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView$2;->abz: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 77f2c376d7..68a1313666 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 GI:Ljava/lang/Class;
+.field private static final GE:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -29,25 +29,25 @@
 
 
 # instance fields
-.field private final LP:Lcom/facebook/drawee/controller/ControllerListener;
+.field private final LL:Lcom/facebook/drawee/controller/ControllerListener;
 
-.field private abA:Z
+.field private final abe:Landroid/graphics/RectF;
 
-.field private final abB:Lcom/facebook/samples/zoomable/f$a;
+.field private final abf:Landroid/graphics/RectF;
 
-.field private final abC:Lcom/facebook/samples/zoomable/e;
+.field private abs:Z
 
-.field private final abi:Landroid/graphics/RectF;
+.field private abt:Lcom/facebook/drawee/d/a;
 
-.field private final abj:Landroid/graphics/RectF;
+.field private abu:Lcom/facebook/samples/zoomable/f;
+
+.field private abv:Landroid/view/GestureDetector;
 
 .field private abw:Z
 
-.field private abx:Lcom/facebook/drawee/d/a;
+.field private final abx:Lcom/facebook/samples/zoomable/f$a;
 
-.field private aby:Lcom/facebook/samples/zoomable/f;
-
-.field private abz:Landroid/view/GestureDetector;
+.field private final aby:Lcom/facebook/samples/zoomable/e;
 
 
 # direct methods
@@ -56,7 +56,7 @@
 
     const-class v0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;
 
-    sput-object v0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->GI:Ljava/lang/Class;
+    sput-object v0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->GE:Ljava/lang/Class;
 
     return-void
 .end method
@@ -68,41 +68,41 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abw:Z
+    iput-boolean v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abs:Z
 
     new-instance v0, Landroid/graphics/RectF;
 
     invoke-direct {v0}, Landroid/graphics/RectF;-><init>()V
 
-    iput-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abj:Landroid/graphics/RectF;
+    iput-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abf: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;->abi:Landroid/graphics/RectF;
+    iput-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abe:Landroid/graphics/RectF;
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abA:Z
+    iput-boolean v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abw: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;->LP:Lcom/facebook/drawee/controller/ControllerListener;
+    iput-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->LL: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;->abB:Lcom/facebook/samples/zoomable/f$a;
+    iput-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abx: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;->abC:Lcom/facebook/samples/zoomable/e;
+    iput-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aby: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;->abw:Z
+    iput-boolean v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abs:Z
 
     new-instance v0, Landroid/graphics/RectF;
 
     invoke-direct {v0}, Landroid/graphics/RectF;-><init>()V
 
-    iput-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abj:Landroid/graphics/RectF;
+    iput-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abf: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;->abi:Landroid/graphics/RectF;
+    iput-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abe:Landroid/graphics/RectF;
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abA:Z
+    iput-boolean v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abw: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;->LP:Lcom/facebook/drawee/controller/ControllerListener;
+    iput-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->LL: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;->abB:Lcom/facebook/samples/zoomable/f$a;
+    iput-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abx: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;->abC:Lcom/facebook/samples/zoomable/e;
+    iput-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aby: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;->abw:Z
+    iput-boolean p3, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abs:Z
 
     new-instance p3, Landroid/graphics/RectF;
 
     invoke-direct {p3}, Landroid/graphics/RectF;-><init>()V
 
-    iput-object p3, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abj:Landroid/graphics/RectF;
+    iput-object p3, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abf: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;->abi:Landroid/graphics/RectF;
+    iput-object p3, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abe:Landroid/graphics/RectF;
 
     const/4 p3, 0x1
 
-    iput-boolean p3, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abA:Z
+    iput-boolean p3, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abw: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;->LP:Lcom/facebook/drawee/controller/ControllerListener;
+    iput-object p3, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->LL: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;->abB:Lcom/facebook/samples/zoomable/f$a;
+    iput-object p3, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abx: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;->abC:Lcom/facebook/samples/zoomable/e;
+    iput-object p3, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aby: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;->abw:Z
+    iput-boolean p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abs:Z
 
     new-instance p1, Landroid/graphics/RectF;
 
     invoke-direct {p1}, Landroid/graphics/RectF;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abj:Landroid/graphics/RectF;
+    iput-object p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abf: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;->abi:Landroid/graphics/RectF;
+    iput-object p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abe:Landroid/graphics/RectF;
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abA:Z
+    iput-boolean p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abw: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;->LP:Lcom/facebook/drawee/controller/ControllerListener;
+    iput-object p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->LL: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;->abB:Lcom/facebook/samples/zoomable/f$a;
+    iput-object p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abx: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;->abC:Lcom/facebook/samples/zoomable/e;
+    iput-object p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aby: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;->abx:Lcom/facebook/drawee/d/a;
+    iput-object p2, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abt: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;->aby:Lcom/facebook/samples/zoomable/f;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abu: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;->la()V
+    invoke-direct {p0}, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->kY()V
 
-    iget-object p0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aby:Lcom/facebook/samples/zoomable/f;
+    iget-object p0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abu: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;->aby:Lcom/facebook/samples/zoomable/f;
+    iget-object p0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abu: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;->LP:Lcom/facebook/drawee/controller/ControllerListener;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->LL: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;->Oo:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sget-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Ok: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;->OE:F
+    iget p1, v0, Lcom/facebook/drawee/generic/a;->OA:F
 
     invoke-virtual {p0, p1}, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->setAspectRatio(F)V
 
-    invoke-virtual {v0}, Lcom/facebook/drawee/generic/a;->hP()Lcom/facebook/drawee/generic/GenericDraweeHierarchy;
+    invoke-virtual {v0}, Lcom/facebook/drawee/generic/a;->hN()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;->LP:Lcom/facebook/drawee/controller/ControllerListener;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->LL: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;->OA:Lcom/facebook/drawee/drawable/g;
+    iget-object v0, v0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Ow: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;->kU()Lcom/facebook/samples/zoomable/b;
+    invoke-static {}, Lcom/facebook/samples/zoomable/b;->kS()Lcom/facebook/samples/zoomable/b;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aby:Lcom/facebook/samples/zoomable/f;
+    iput-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abu:Lcom/facebook/samples/zoomable/f;
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aby:Lcom/facebook/samples/zoomable/f;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abu:Lcom/facebook/samples/zoomable/f;
 
-    iget-object v1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abB:Lcom/facebook/samples/zoomable/f$a;
+    iget-object v1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abx: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;->abC:Lcom/facebook/samples/zoomable/e;
+    iget-object v2, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aby: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;->abz:Landroid/view/GestureDetector;
+    iput-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abv:Landroid/view/GestureDetector;
 
     return-void
 .end method
 
-.method private la()V
+.method private kY()V
     .locals 5
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abj:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abf: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;->abi:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abe: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;->aby:Lcom/facebook/samples/zoomable/f;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abu:Lcom/facebook/samples/zoomable/f;
 
-    iget-object v1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abj:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abf: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;->aby:Lcom/facebook/samples/zoomable/f;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abu:Lcom/facebook/samples/zoomable/f;
 
-    iget-object v1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abi:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abe: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;->abi:Landroid/graphics/RectF;
+    iget-object v2, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abe:Landroid/graphics/RectF;
 
-    iget-object v3, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abj:Landroid/graphics/RectF;
+    iget-object v3, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abf: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;->aby:Lcom/facebook/samples/zoomable/f;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abu: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;->aby:Lcom/facebook/samples/zoomable/f;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abu: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;->aby:Lcom/facebook/samples/zoomable/f;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abu: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;->aby:Lcom/facebook/samples/zoomable/f;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abu: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;->aby:Lcom/facebook/samples/zoomable/f;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abu: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;->aby:Lcom/facebook/samples/zoomable/f;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abu: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;->GI:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->GE: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;->aby:Lcom/facebook/samples/zoomable/f;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abu: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;->abx:Lcom/facebook/drawee/d/a;
+    iget-object p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abt:Lcom/facebook/drawee/d/a;
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aby:Lcom/facebook/samples/zoomable/f;
+    iget-object p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abu:Lcom/facebook/samples/zoomable/f;
 
-    invoke-interface {p1}, Lcom/facebook/samples/zoomable/f;->kW()F
+    invoke-interface {p1}, Lcom/facebook/samples/zoomable/f;->kU()F
 
     move-result p1
 
@@ -662,7 +662,7 @@
 
     if-lez p1, :cond_0
 
-    iget-object p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abx:Lcom/facebook/drawee/d/a;
+    iget-object p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abt: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;->aby:Lcom/facebook/samples/zoomable/f;
+    iget-object v1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abu:Lcom/facebook/samples/zoomable/f;
 
-    invoke-interface {v1}, Lcom/facebook/samples/zoomable/f;->kY()Landroid/graphics/Matrix;
+    invoke-interface {v1}, Lcom/facebook/samples/zoomable/f;->kW()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;->la()V
+    invoke-direct {p0}, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->kY()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;->abz:Landroid/view/GestureDetector;
+    iget-object v1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abv: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;->abw:Z
+    iget-boolean v1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abs:Z
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aby:Lcom/facebook/samples/zoomable/f;
+    iget-object v1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abu: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;->aby:Lcom/facebook/samples/zoomable/f;
+    iget-object v1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abu: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;->abA:Z
+    iget-boolean p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abw:Z
 
     if-nez p1, :cond_2
 
-    iget-object p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aby:Lcom/facebook/samples/zoomable/f;
+    iget-object p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abu:Lcom/facebook/samples/zoomable/f;
 
-    invoke-interface {p1}, Lcom/facebook/samples/zoomable/f;->kS()Z
+    invoke-interface {p1}, Lcom/facebook/samples/zoomable/f;->kQ()Z
 
     move-result p1
 
     if-eqz p1, :cond_3
 
     :cond_2
-    iget-boolean p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abA:Z
+    iget-boolean p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abw:Z
 
     if-eqz p1, :cond_4
 
-    iget-object p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aby:Lcom/facebook/samples/zoomable/f;
+    iget-object p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abu:Lcom/facebook/samples/zoomable/f;
 
-    invoke-interface {p1}, Lcom/facebook/samples/zoomable/f;->kX()Z
+    invoke-interface {p1}, Lcom/facebook/samples/zoomable/f;->kV()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;->abz:Landroid/view/GestureDetector;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abv:Landroid/view/GestureDetector;
 
     invoke-virtual {v0, p1}, Landroid/view/GestureDetector;->onTouchEvent(Landroid/view/MotionEvent;)Z
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aby:Lcom/facebook/samples/zoomable/f;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abu: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;->abA:Z
+    iput-boolean p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abw: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;->aby:Lcom/facebook/samples/zoomable/f;
+    iget-object v1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abu: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;->abw:Z
+    iput-boolean p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abs: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;->abz:Landroid/view/GestureDetector;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abv: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;->abC:Lcom/facebook/samples/zoomable/e;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aby:Lcom/facebook/samples/zoomable/e;
 
-    iput-object p1, v0, Lcom/facebook/samples/zoomable/e;->abv:Landroid/view/GestureDetector$SimpleOnGestureListener;
+    iput-object p1, v0, Lcom/facebook/samples/zoomable/e;->abr: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;->aby:Lcom/facebook/samples/zoomable/f;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abu: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;->aby:Lcom/facebook/samples/zoomable/f;
+    iput-object p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abu:Lcom/facebook/samples/zoomable/f;
 
-    iget-object p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aby:Lcom/facebook/samples/zoomable/f;
+    iget-object p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abu:Lcom/facebook/samples/zoomable/f;
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abB:Lcom/facebook/samples/zoomable/f$a;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abx: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 eb7be72a0b..1660a6ae72 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 aaR:Z
+.field aaN:Z
 
-.field final aaS:[F
+.field final aaO:[F
 
-.field final aaT:[F
+.field final aaP:[F
 
-.field final aaU:[F
+.field final aaQ:[F
 
-.field private final aaV:Landroid/graphics/Matrix;
+.field private final aaR:Landroid/graphics/Matrix;
 
-.field final aaW:Landroid/graphics/Matrix;
+.field final aaS:Landroid/graphics/Matrix;
 
 
 # direct methods
@@ -27,27 +27,27 @@
 
     new-array v0, p1, [F
 
-    iput-object v0, p0, Lcom/facebook/samples/zoomable/a;->aaS:[F
+    iput-object v0, p0, Lcom/facebook/samples/zoomable/a;->aaO:[F
 
     new-array v0, p1, [F
 
-    iput-object v0, p0, Lcom/facebook/samples/zoomable/a;->aaT:[F
+    iput-object v0, p0, Lcom/facebook/samples/zoomable/a;->aaP:[F
 
     new-array p1, p1, [F
 
-    iput-object p1, p0, Lcom/facebook/samples/zoomable/a;->aaU:[F
+    iput-object p1, p0, Lcom/facebook/samples/zoomable/a;->aaQ:[F
 
     new-instance p1, Landroid/graphics/Matrix;
 
     invoke-direct {p1}, Landroid/graphics/Matrix;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/samples/zoomable/a;->aaV:Landroid/graphics/Matrix;
+    iput-object p1, p0, Lcom/facebook/samples/zoomable/a;->aaR: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;->aaW:Landroid/graphics/Matrix;
+    iput-object p1, p0, Lcom/facebook/samples/zoomable/a;->aaS: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;->kT()V
+    invoke-virtual {p0}, Lcom/facebook/samples/zoomable/a;->kR()V
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/a;->aaW:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/a;->aaS: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;->aba:Lcom/facebook/samples/a/b;
+    iget-object p1, p0, Lcom/facebook/samples/zoomable/c;->aaW:Lcom/facebook/samples/a/b;
 
-    invoke-virtual {p1}, Lcom/facebook/samples/a/b;->kQ()V
+    invoke-virtual {p1}, Lcom/facebook/samples/a/b;->kO()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;->aaV:Landroid/graphics/Matrix;
+    iget-object v4, p0, Lcom/facebook/samples/zoomable/a;->aaR: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;->aaV:Landroid/graphics/Matrix;
+    iget-object p1, p0, Lcom/facebook/samples/zoomable/a;->aaR: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;->kT()V
+    invoke-virtual {p0}, Lcom/facebook/samples/zoomable/a;->kR()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;->aaR:Z
+    iget-boolean v1, p0, Lcom/facebook/samples/zoomable/a;->aaN: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;->aaR:Z
+    iget-boolean v0, p0, Lcom/facebook/samples/zoomable/a;->aaN:Z
 
     if-eqz v0, :cond_1
 
@@ -235,14 +235,14 @@
     .end annotation
 .end method
 
-.method public final kS()Z
+.method public final kQ()Z
     .locals 1
 
-    iget-boolean v0, p0, Lcom/facebook/samples/zoomable/a;->aaR:Z
+    iget-boolean v0, p0, Lcom/facebook/samples/zoomable/a;->aaN:Z
 
     if-nez v0, :cond_0
 
-    invoke-super {p0}, Lcom/facebook/samples/zoomable/c;->kS()Z
+    invoke-super {p0}, Lcom/facebook/samples/zoomable/c;->kQ()Z
 
     move-result v0
 
@@ -258,7 +258,7 @@
     return v0
 .end method
 
-.method protected abstract kT()V
+.method protected abstract kR()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;->kT()V
+    invoke-virtual {p0}, Lcom/facebook/samples/zoomable/a;->kR()V
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/a;->aaW:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/a;->aaS:Landroid/graphics/Matrix;
 
     invoke-virtual {v0}, Landroid/graphics/Matrix;->reset()V
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/a;->aaV:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/a;->aaR: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 d29d8cba29..a750d05b8d 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 aaX:Lcom/facebook/samples/zoomable/b;
+.field final synthetic aaT: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;->aaX:Lcom/facebook/samples/zoomable/b;
+    iput-object p1, p0, Lcom/facebook/samples/zoomable/b$1;->aaT: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;->aaX:Lcom/facebook/samples/zoomable/b;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/b$1;->aaT:Lcom/facebook/samples/zoomable/b;
 
-    iget-object v1, v0, Lcom/facebook/samples/zoomable/a;->aaW:Landroid/graphics/Matrix;
+    iget-object v1, v0, Lcom/facebook/samples/zoomable/a;->aaS: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;->aaU:[F
+    iget-object v3, v0, Lcom/facebook/samples/zoomable/a;->aaQ:[F
 
     const/high16 v4, 0x3f800000    # 1.0f
 
     sub-float/2addr v4, p1
 
-    iget-object v5, v0, Lcom/facebook/samples/zoomable/a;->aaS:[F
+    iget-object v5, v0, Lcom/facebook/samples/zoomable/a;->aaO:[F
 
     aget v5, v5, v2
 
     mul-float v4, v4, v5
 
-    iget-object v5, v0, Lcom/facebook/samples/zoomable/a;->aaT:[F
+    iget-object v5, v0, Lcom/facebook/samples/zoomable/a;->aaP:[F
 
     aget v5, v5, v2
 
@@ -85,13 +85,13 @@
     goto :goto_0
 
     :cond_0
-    iget-object p1, v0, Lcom/facebook/samples/zoomable/a;->aaU:[F
+    iget-object p1, v0, Lcom/facebook/samples/zoomable/a;->aaQ:[F
 
     invoke-virtual {v1, p1}, Landroid/graphics/Matrix;->setValues([F)V
 
-    iget-object p1, p0, Lcom/facebook/samples/zoomable/b$1;->aaX:Lcom/facebook/samples/zoomable/b;
+    iget-object p1, p0, Lcom/facebook/samples/zoomable/b$1;->aaT:Lcom/facebook/samples/zoomable/b;
 
-    iget-object v0, p1, Lcom/facebook/samples/zoomable/a;->aaW:Landroid/graphics/Matrix;
+    iget-object v0, p1, Lcom/facebook/samples/zoomable/a;->aaS: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 cc4bc1057a..a92423533c 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 aaX:Lcom/facebook/samples/zoomable/b;
+.field final synthetic aaT:Lcom/facebook/samples/zoomable/b;
 
-.field final synthetic aaY:Ljava/lang/Runnable;
+.field final synthetic aaU: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;->aaX:Lcom/facebook/samples/zoomable/b;
+    iput-object p1, p0, Lcom/facebook/samples/zoomable/b$2;->aaT:Lcom/facebook/samples/zoomable/b;
 
-    iput-object p2, p0, Lcom/facebook/samples/zoomable/b$2;->aaY:Ljava/lang/Runnable;
+    iput-object p2, p0, Lcom/facebook/samples/zoomable/b$2;->aaU:Ljava/lang/Runnable;
 
     invoke-direct {p0}, Landroid/animation/AnimatorListenerAdapter;-><init>()V
 
     return-void
 .end method
 
-.method private kV()V
+.method private kT()V
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/b$2;->aaY:Ljava/lang/Runnable;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/b$2;->aaU: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;->aaX:Lcom/facebook/samples/zoomable/b;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/b$2;->aaT:Lcom/facebook/samples/zoomable/b;
 
     const/4 v1, 0x0
 
-    iput-boolean v1, v0, Lcom/facebook/samples/zoomable/a;->aaR:Z
+    iput-boolean v1, v0, Lcom/facebook/samples/zoomable/a;->aaN:Z
 
-    iget-object v0, v0, Lcom/facebook/samples/zoomable/c;->aba:Lcom/facebook/samples/a/b;
+    iget-object v0, v0, Lcom/facebook/samples/zoomable/c;->aaW:Lcom/facebook/samples/a/b;
 
-    invoke-virtual {v0}, Lcom/facebook/samples/a/b;->kQ()V
+    invoke-virtual {v0}, Lcom/facebook/samples/a/b;->kO()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;->GI:Ljava/lang/Class;
+    sget-object p1, Lcom/facebook/samples/zoomable/b;->GE: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;->kV()V
+    invoke-direct {p0}, Lcom/facebook/samples/zoomable/b$2;->kT()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;->GI:Ljava/lang/Class;
+    sget-object p1, Lcom/facebook/samples/zoomable/b;->GE: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;->kV()V
+    invoke-direct {p0}, Lcom/facebook/samples/zoomable/b$2;->kT()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 5b705e0978..be90ee58d7 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 GI:Ljava/lang/Class;
+.field static final GE: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;->GI:Ljava/lang/Class;
+    sput-object v0, Lcom/facebook/samples/zoomable/b;->GE:Ljava/lang/Class;
 
     return-void
 .end method
@@ -71,7 +71,7 @@
     return-void
 .end method
 
-.method public static kU()Lcom/facebook/samples/zoomable/b;
+.method public static kS()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;->GI:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/samples/zoomable/b;->GE: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;->kT()V
+    invoke-virtual {p0}, Lcom/facebook/samples/zoomable/b;->kR()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;->aaR:Z
+    iget-boolean v1, p0, Lcom/facebook/samples/zoomable/a;->aaN: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;->aaR:Z
+    iput-boolean v0, p0, Lcom/facebook/samples/zoomable/a;->aaN: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;->kY()Landroid/graphics/Matrix;
+    invoke-virtual {p0}, Lcom/facebook/samples/zoomable/b;->kW()Landroid/graphics/Matrix;
 
     move-result-object p2
 
-    iget-object p3, p0, Lcom/facebook/samples/zoomable/a;->aaS:[F
+    iget-object p3, p0, Lcom/facebook/samples/zoomable/a;->aaO:[F
 
     invoke-virtual {p2, p3}, Landroid/graphics/Matrix;->getValues([F)V
 
-    iget-object p2, p0, Lcom/facebook/samples/zoomable/a;->aaT:[F
+    iget-object p2, p0, Lcom/facebook/samples/zoomable/a;->aaP:[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;->GI:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/samples/zoomable/b;->GE:Ljava/lang/Class;
 
     return-object v0
 .end method
 
-.method public final kT()V
+.method public final kR()V
     .locals 2
 
-    iget-boolean v0, p0, Lcom/facebook/samples/zoomable/a;->aaR:Z
+    iget-boolean v0, p0, Lcom/facebook/samples/zoomable/a;->aaN:Z
 
     if-nez v0, :cond_0
 
     return-void
 
     :cond_0
-    sget-object v0, Lcom/facebook/samples/zoomable/b;->GI:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/samples/zoomable/b;->GE: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 92867e1d9f..28bee72c10 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 GI:Ljava/lang/Class;
+.field private static final GE:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -17,43 +17,43 @@
     .end annotation
 .end field
 
-.field private static final aaZ:Landroid/graphics/RectF;
+.field private static final aaV:Landroid/graphics/RectF;
 
 
 # instance fields
-.field private final NI:Landroid/graphics/RectF;
+.field private final NE:Landroid/graphics/RectF;
 
-.field aba:Lcom/facebook/samples/a/b;
+.field aaW:Lcom/facebook/samples/a/b;
 
-.field private abb:Lcom/facebook/samples/zoomable/f$a;
+.field private aaX:Lcom/facebook/samples/zoomable/f$a;
 
-.field private abc:Z
+.field private aaY:Z
 
-.field private abd:Z
+.field private aaZ:Z
 
-.field private abe:Z
+.field private aba:Z
 
-.field private abf:Z
+.field private abb:Z
 
-.field abg:F
+.field abc:F
 
-.field abh:F
+.field abd:F
 
-.field private final abi:Landroid/graphics/RectF;
+.field private final abe:Landroid/graphics/RectF;
 
-.field private final abj:Landroid/graphics/RectF;
+.field private final abf:Landroid/graphics/RectF;
 
-.field private final abk:Landroid/graphics/RectF;
+.field private final abg:Landroid/graphics/RectF;
 
-.field private final abl:Landroid/graphics/Matrix;
+.field private final abh:Landroid/graphics/Matrix;
 
-.field private final abm:Landroid/graphics/Matrix;
+.field private final abi:Landroid/graphics/Matrix;
 
-.field private final abn:Landroid/graphics/Matrix;
+.field private final abj:Landroid/graphics/Matrix;
 
-.field private final abo:[F
+.field private final abk:[F
 
-.field private abp:Z
+.field private abl:Z
 
 
 # direct methods
@@ -62,7 +62,7 @@
 
     const-class v0, Lcom/facebook/samples/zoomable/c;
 
-    sput-object v0, Lcom/facebook/samples/zoomable/c;->GI:Ljava/lang/Class;
+    sput-object v0, Lcom/facebook/samples/zoomable/c;->GE: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;->aaZ:Landroid/graphics/RectF;
+    sput-object v0, Lcom/facebook/samples/zoomable/c;->aaV:Landroid/graphics/RectF;
 
     return-void
 .end method
@@ -84,81 +84,81 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/facebook/samples/zoomable/c;->abb:Lcom/facebook/samples/zoomable/f$a;
+    iput-object v0, p0, Lcom/facebook/samples/zoomable/c;->aaX:Lcom/facebook/samples/zoomable/f$a;
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/facebook/samples/zoomable/c;->abc:Z
+    iput-boolean v0, p0, Lcom/facebook/samples/zoomable/c;->aaY:Z
 
-    iput-boolean v0, p0, Lcom/facebook/samples/zoomable/c;->abd:Z
+    iput-boolean v0, p0, Lcom/facebook/samples/zoomable/c;->aaZ:Z
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/facebook/samples/zoomable/c;->abe:Z
+    iput-boolean v0, p0, Lcom/facebook/samples/zoomable/c;->aba:Z
 
-    iput-boolean v0, p0, Lcom/facebook/samples/zoomable/c;->abf:Z
+    iput-boolean v0, p0, Lcom/facebook/samples/zoomable/c;->abb:Z
 
     const/high16 v0, 0x3f800000    # 1.0f
 
-    iput v0, p0, Lcom/facebook/samples/zoomable/c;->abg:F
+    iput v0, p0, Lcom/facebook/samples/zoomable/c;->abc:F
 
     const/high16 v0, 0x40000000    # 2.0f
 
-    iput v0, p0, Lcom/facebook/samples/zoomable/c;->abh:F
+    iput v0, p0, Lcom/facebook/samples/zoomable/c;->abd:F
 
     new-instance v0, Landroid/graphics/RectF;
 
     invoke-direct {v0}, Landroid/graphics/RectF;-><init>()V
 
-    iput-object v0, p0, Lcom/facebook/samples/zoomable/c;->abi:Landroid/graphics/RectF;
+    iput-object v0, p0, Lcom/facebook/samples/zoomable/c;->abe: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;->abj:Landroid/graphics/RectF;
+    iput-object v0, p0, Lcom/facebook/samples/zoomable/c;->abf: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;->abk:Landroid/graphics/RectF;
+    iput-object v0, p0, Lcom/facebook/samples/zoomable/c;->abg: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;->abl:Landroid/graphics/Matrix;
+    iput-object v0, p0, Lcom/facebook/samples/zoomable/c;->abh: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;->abm:Landroid/graphics/Matrix;
+    iput-object v0, p0, Lcom/facebook/samples/zoomable/c;->abi: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;->abn:Landroid/graphics/Matrix;
+    iput-object v0, p0, Lcom/facebook/samples/zoomable/c;->abj:Landroid/graphics/Matrix;
 
     const/16 v0, 0x9
 
     new-array v0, v0, [F
 
-    iput-object v0, p0, Lcom/facebook/samples/zoomable/c;->abo:[F
+    iput-object v0, p0, Lcom/facebook/samples/zoomable/c;->abk:[F
 
     new-instance v0, Landroid/graphics/RectF;
 
     invoke-direct {v0}, Landroid/graphics/RectF;-><init>()V
 
-    iput-object v0, p0, Lcom/facebook/samples/zoomable/c;->NI:Landroid/graphics/RectF;
+    iput-object v0, p0, Lcom/facebook/samples/zoomable/c;->NE:Landroid/graphics/RectF;
 
-    iput-object p1, p0, Lcom/facebook/samples/zoomable/c;->aba:Lcom/facebook/samples/a/b;
+    iput-object p1, p0, Lcom/facebook/samples/zoomable/c;->aaW:Lcom/facebook/samples/a/b;
 
-    iget-object p1, p0, Lcom/facebook/samples/zoomable/c;->aba:Lcom/facebook/samples/a/b;
+    iget-object p1, p0, Lcom/facebook/samples/zoomable/c;->aaW:Lcom/facebook/samples/a/b;
 
-    iput-object p0, p1, Lcom/facebook/samples/a/b;->aaQ:Lcom/facebook/samples/a/b$a;
+    iput-object p0, p1, Lcom/facebook/samples/a/b;->aaM: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;->abj:Landroid/graphics/RectF;
+    iget-object v3, p0, Lcom/facebook/samples/zoomable/c;->abf: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;->abj:Landroid/graphics/RectF;
+    iget-object v3, p0, Lcom/facebook/samples/zoomable/c;->abf: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;->abj:Landroid/graphics/RectF;
+    iget-object v4, p0, Lcom/facebook/samples/zoomable/c;->abf: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;->abj:Landroid/graphics/RectF;
+    iget-object v4, p0, Lcom/facebook/samples/zoomable/c;->abf: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;->abg:F
+    iget v1, p0, Lcom/facebook/samples/zoomable/c;->abc:F
 
-    iget v2, p0, Lcom/facebook/samples/zoomable/c;->abh:F
+    iget v2, p0, Lcom/facebook/samples/zoomable/c;->abd: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;->NI:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->NE:Landroid/graphics/RectF;
 
-    iget-object v2, p0, Lcom/facebook/samples/zoomable/c;->abj:Landroid/graphics/RectF;
+    iget-object v2, p0, Lcom/facebook/samples/zoomable/c;->abf: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;->abi:Landroid/graphics/RectF;
+    iget-object v6, p0, Lcom/facebook/samples/zoomable/c;->abe:Landroid/graphics/RectF;
 
     iget v6, v6, Landroid/graphics/RectF;->left:F
 
-    iget-object v7, p0, Lcom/facebook/samples/zoomable/c;->abi:Landroid/graphics/RectF;
+    iget-object v7, p0, Lcom/facebook/samples/zoomable/c;->abe:Landroid/graphics/RectF;
 
     iget v7, v7, Landroid/graphics/RectF;->right:F
 
-    iget-object v8, p0, Lcom/facebook/samples/zoomable/c;->abj:Landroid/graphics/RectF;
+    iget-object v8, p0, Lcom/facebook/samples/zoomable/c;->abf: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;->abi:Landroid/graphics/RectF;
+    iget-object v5, p0, Lcom/facebook/samples/zoomable/c;->abe:Landroid/graphics/RectF;
 
     iget v5, v5, Landroid/graphics/RectF;->top:F
 
-    iget-object v6, p0, Lcom/facebook/samples/zoomable/c;->abi:Landroid/graphics/RectF;
+    iget-object v6, p0, Lcom/facebook/samples/zoomable/c;->abe:Landroid/graphics/RectF;
 
     iget v6, v6, Landroid/graphics/RectF;->bottom:F
 
-    iget-object v7, p0, Lcom/facebook/samples/zoomable/c;->abj:Landroid/graphics/RectF;
+    iget-object v7, p0, Lcom/facebook/samples/zoomable/c;->abf: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;->abo:[F
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->abk:[F
 
     invoke-virtual {p1, v0}, Landroid/graphics/Matrix;->getValues([F)V
 
-    iget-object p1, p0, Lcom/facebook/samples/zoomable/c;->abo:[F
+    iget-object p1, p0, Lcom/facebook/samples/zoomable/c;->abk:[F
 
     const/4 v0, 0x0
 
@@ -488,26 +488,26 @@
     return p1
 .end method
 
-.method private kZ()V
+.method private kX()V
     .locals 3
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->abm:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->abi:Landroid/graphics/Matrix;
 
-    iget-object v1, p0, Lcom/facebook/samples/zoomable/c;->abk:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/facebook/samples/zoomable/c;->abg:Landroid/graphics/RectF;
 
-    iget-object v2, p0, Lcom/facebook/samples/zoomable/c;->abj:Landroid/graphics/RectF;
+    iget-object v2, p0, Lcom/facebook/samples/zoomable/c;->abf: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;->abb:Lcom/facebook/samples/zoomable/f$a;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->aaX:Lcom/facebook/samples/zoomable/f$a;
 
     if-eqz v0, :cond_0
 
-    iget-boolean v1, p0, Lcom/facebook/samples/zoomable/c;->abc:Z
+    iget-boolean v1, p0, Lcom/facebook/samples/zoomable/c;->aaY:Z
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/facebook/samples/zoomable/c;->abm:Landroid/graphics/Matrix;
+    iget-object v1, p0, Lcom/facebook/samples/zoomable/c;->abi: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;->GI:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/samples/zoomable/c;->GE: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;->abm:Landroid/graphics/Matrix;
+    iget-object v3, p0, Lcom/facebook/samples/zoomable/c;->abi: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;->kZ()V
+    invoke-direct {p0}, Lcom/facebook/samples/zoomable/c;->kX()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;->GI:Ljava/lang/Class;
+    sget-object p1, Lcom/facebook/samples/zoomable/c;->GE: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;->abl:Landroid/graphics/Matrix;
+    iget-object p1, p0, Lcom/facebook/samples/zoomable/c;->abh:Landroid/graphics/Matrix;
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->abm:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->abi:Landroid/graphics/Matrix;
 
     invoke-virtual {p1, v0}, Landroid/graphics/Matrix;->set(Landroid/graphics/Matrix;)V
 
-    iget-object p1, p0, Lcom/facebook/samples/zoomable/c;->abk:Landroid/graphics/RectF;
+    iget-object p1, p0, Lcom/facebook/samples/zoomable/c;->abg:Landroid/graphics/RectF;
 
     iget p1, p1, Landroid/graphics/RectF;->left:F
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->abi:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->abe: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;->abk:Landroid/graphics/RectF;
+    iget-object p1, p0, Lcom/facebook/samples/zoomable/c;->abg:Landroid/graphics/RectF;
 
     iget p1, p1, Landroid/graphics/RectF;->top:F
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->abi:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->abe: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;->abk:Landroid/graphics/RectF;
+    iget-object p1, p0, Lcom/facebook/samples/zoomable/c;->abg:Landroid/graphics/RectF;
 
     iget p1, p1, Landroid/graphics/RectF;->right:F
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->abi:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->abe: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;->abk:Landroid/graphics/RectF;
+    iget-object p1, p0, Lcom/facebook/samples/zoomable/c;->abg:Landroid/graphics/RectF;
 
     iget p1, p1, Landroid/graphics/RectF;->bottom:F
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->abi:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->abe: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;->abp:Z
+    iput-boolean p1, p0, Lcom/facebook/samples/zoomable/c;->abl: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;->abb:Lcom/facebook/samples/zoomable/f$a;
+    iput-object p1, p0, Lcom/facebook/samples/zoomable/c;->aaX: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;->abo:[F
+    iget-object p5, p0, Lcom/facebook/samples/zoomable/c;->abk:[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;->abo:[F
+    iget-object v6, p0, Lcom/facebook/samples/zoomable/c;->abk:[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;->abm:Landroid/graphics/Matrix;
+    iget-object p1, p0, Lcom/facebook/samples/zoomable/c;->abi:Landroid/graphics/Matrix;
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->abn:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->abj:Landroid/graphics/Matrix;
 
     invoke-virtual {p1, v0}, Landroid/graphics/Matrix;->invert(Landroid/graphics/Matrix;)Z
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->abn:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->abj:Landroid/graphics/Matrix;
 
     const/4 v2, 0x0
 
@@ -764,13 +764,13 @@
 
     aget v0, v6, v7
 
-    iget-object v1, p0, Lcom/facebook/samples/zoomable/c;->abj:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/facebook/samples/zoomable/c;->abf: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;->abj:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/facebook/samples/zoomable/c;->abf: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;->abj:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/facebook/samples/zoomable/c;->abf: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;->abj:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/facebook/samples/zoomable/c;->abf: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;->GI:Ljava/lang/Class;
+    sget-object p1, Lcom/facebook/samples/zoomable/c;->GE: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;->abm:Landroid/graphics/Matrix;
+    iget-object p1, p0, Lcom/facebook/samples/zoomable/c;->abi:Landroid/graphics/Matrix;
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->aba:Lcom/facebook/samples/a/b;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->aaW:Lcom/facebook/samples/a/b;
 
-    iget-object v1, p0, Lcom/facebook/samples/zoomable/c;->abl:Landroid/graphics/Matrix;
+    iget-object v1, p0, Lcom/facebook/samples/zoomable/c;->abh:Landroid/graphics/Matrix;
 
     invoke-virtual {p1, v1}, Landroid/graphics/Matrix;->set(Landroid/graphics/Matrix;)V
 
-    iget-boolean v1, p0, Lcom/facebook/samples/zoomable/c;->abd:Z
+    iget-boolean v1, p0, Lcom/facebook/samples/zoomable/c;->aaZ:Z
 
     const/4 v2, 0x2
 
@@ -841,9 +841,9 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, v0, Lcom/facebook/samples/a/b;->aaP:Lcom/facebook/samples/a/a;
+    iget-object v1, v0, Lcom/facebook/samples/a/b;->aaL:Lcom/facebook/samples/a/a;
 
-    iget v1, v1, Lcom/facebook/samples/a/a;->aaH:I
+    iget v1, v1, Lcom/facebook/samples/a/a;->aaD: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;->aaP:Lcom/facebook/samples/a/a;
+    iget-object v1, v0, Lcom/facebook/samples/a/b;->aaL:Lcom/facebook/samples/a/a;
 
-    iget-object v1, v1, Lcom/facebook/samples/a/a;->aaK:[F
+    iget-object v1, v1, Lcom/facebook/samples/a/a;->aaG:[F
 
     aget v1, v1, v3
 
-    iget-object v5, v0, Lcom/facebook/samples/a/b;->aaP:Lcom/facebook/samples/a/a;
+    iget-object v5, v0, Lcom/facebook/samples/a/b;->aaL:Lcom/facebook/samples/a/a;
 
-    iget-object v5, v5, Lcom/facebook/samples/a/a;->aaK:[F
+    iget-object v5, v5, Lcom/facebook/samples/a/a;->aaG:[F
 
     aget v5, v5, v4
 
     sub-float/2addr v1, v5
 
-    iget-object v5, v0, Lcom/facebook/samples/a/b;->aaP:Lcom/facebook/samples/a/a;
+    iget-object v5, v0, Lcom/facebook/samples/a/b;->aaL:Lcom/facebook/samples/a/a;
 
-    iget-object v5, v5, Lcom/facebook/samples/a/a;->aaL:[F
+    iget-object v5, v5, Lcom/facebook/samples/a/a;->aaH:[F
 
     aget v5, v5, v3
 
-    iget-object v6, v0, Lcom/facebook/samples/a/b;->aaP:Lcom/facebook/samples/a/a;
+    iget-object v6, v0, Lcom/facebook/samples/a/b;->aaL:Lcom/facebook/samples/a/a;
 
-    iget-object v6, v6, Lcom/facebook/samples/a/a;->aaL:[F
+    iget-object v6, v6, Lcom/facebook/samples/a/a;->aaH:[F
 
     aget v6, v6, v4
 
     sub-float/2addr v5, v6
 
-    iget-object v6, v0, Lcom/facebook/samples/a/b;->aaP:Lcom/facebook/samples/a/a;
+    iget-object v6, v0, Lcom/facebook/samples/a/b;->aaL:Lcom/facebook/samples/a/a;
 
-    iget-object v6, v6, Lcom/facebook/samples/a/a;->aaM:[F
+    iget-object v6, v6, Lcom/facebook/samples/a/a;->aaI:[F
 
     aget v6, v6, v3
 
-    iget-object v7, v0, Lcom/facebook/samples/a/b;->aaP:Lcom/facebook/samples/a/a;
+    iget-object v7, v0, Lcom/facebook/samples/a/b;->aaL:Lcom/facebook/samples/a/a;
 
-    iget-object v7, v7, Lcom/facebook/samples/a/a;->aaM:[F
+    iget-object v7, v7, Lcom/facebook/samples/a/a;->aaI:[F
 
     aget v7, v7, v4
 
     sub-float/2addr v6, v7
 
-    iget-object v7, v0, Lcom/facebook/samples/a/b;->aaP:Lcom/facebook/samples/a/a;
+    iget-object v7, v0, Lcom/facebook/samples/a/b;->aaL:Lcom/facebook/samples/a/a;
 
-    iget-object v7, v7, Lcom/facebook/samples/a/a;->aaN:[F
+    iget-object v7, v7, Lcom/facebook/samples/a/a;->aaJ:[F
 
     aget v7, v7, v3
 
-    iget-object v8, v0, Lcom/facebook/samples/a/b;->aaP:Lcom/facebook/samples/a/a;
+    iget-object v8, v0, Lcom/facebook/samples/a/b;->aaL:Lcom/facebook/samples/a/a;
 
-    iget-object v8, v8, Lcom/facebook/samples/a/a;->aaN:[F
+    iget-object v8, v8, Lcom/facebook/samples/a/a;->aaJ:[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;->abe:Z
+    iget-boolean v1, p0, Lcom/facebook/samples/zoomable/c;->aba:Z
 
     if-eqz v1, :cond_3
 
-    iget-object v1, v0, Lcom/facebook/samples/a/b;->aaP:Lcom/facebook/samples/a/a;
+    iget-object v1, v0, Lcom/facebook/samples/a/b;->aaL:Lcom/facebook/samples/a/a;
 
-    iget v1, v1, Lcom/facebook/samples/a/a;->aaH:I
+    iget v1, v1, Lcom/facebook/samples/a/a;->aaD: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;->aaP:Lcom/facebook/samples/a/a;
+    iget-object v1, v0, Lcom/facebook/samples/a/b;->aaL:Lcom/facebook/samples/a/a;
 
-    iget-object v1, v1, Lcom/facebook/samples/a/a;->aaK:[F
+    iget-object v1, v1, Lcom/facebook/samples/a/a;->aaG:[F
 
     aget v1, v1, v3
 
-    iget-object v2, v0, Lcom/facebook/samples/a/b;->aaP:Lcom/facebook/samples/a/a;
+    iget-object v2, v0, Lcom/facebook/samples/a/b;->aaL:Lcom/facebook/samples/a/a;
 
-    iget-object v2, v2, Lcom/facebook/samples/a/a;->aaK:[F
+    iget-object v2, v2, Lcom/facebook/samples/a/a;->aaG:[F
 
     aget v2, v2, v4
 
     sub-float/2addr v1, v2
 
-    iget-object v2, v0, Lcom/facebook/samples/a/b;->aaP:Lcom/facebook/samples/a/a;
+    iget-object v2, v0, Lcom/facebook/samples/a/b;->aaL:Lcom/facebook/samples/a/a;
 
-    iget-object v2, v2, Lcom/facebook/samples/a/a;->aaL:[F
+    iget-object v2, v2, Lcom/facebook/samples/a/a;->aaH:[F
 
     aget v2, v2, v3
 
-    iget-object v5, v0, Lcom/facebook/samples/a/b;->aaP:Lcom/facebook/samples/a/a;
+    iget-object v5, v0, Lcom/facebook/samples/a/b;->aaL:Lcom/facebook/samples/a/a;
 
-    iget-object v5, v5, Lcom/facebook/samples/a/a;->aaL:[F
+    iget-object v5, v5, Lcom/facebook/samples/a/a;->aaH:[F
 
     aget v5, v5, v4
 
     sub-float/2addr v2, v5
 
-    iget-object v5, v0, Lcom/facebook/samples/a/b;->aaP:Lcom/facebook/samples/a/a;
+    iget-object v5, v0, Lcom/facebook/samples/a/b;->aaL:Lcom/facebook/samples/a/a;
 
-    iget-object v5, v5, Lcom/facebook/samples/a/a;->aaM:[F
+    iget-object v5, v5, Lcom/facebook/samples/a/a;->aaI:[F
 
     aget v5, v5, v3
 
-    iget-object v6, v0, Lcom/facebook/samples/a/b;->aaP:Lcom/facebook/samples/a/a;
+    iget-object v6, v0, Lcom/facebook/samples/a/b;->aaL:Lcom/facebook/samples/a/a;
 
-    iget-object v6, v6, Lcom/facebook/samples/a/a;->aaM:[F
+    iget-object v6, v6, Lcom/facebook/samples/a/a;->aaI:[F
 
     aget v6, v6, v4
 
     sub-float/2addr v5, v6
 
-    iget-object v6, v0, Lcom/facebook/samples/a/b;->aaP:Lcom/facebook/samples/a/a;
+    iget-object v6, v0, Lcom/facebook/samples/a/b;->aaL:Lcom/facebook/samples/a/a;
 
-    iget-object v6, v6, Lcom/facebook/samples/a/a;->aaN:[F
+    iget-object v6, v6, Lcom/facebook/samples/a/a;->aaJ:[F
 
     aget v3, v6, v3
 
-    iget-object v6, v0, Lcom/facebook/samples/a/b;->aaP:Lcom/facebook/samples/a/a;
+    iget-object v6, v0, Lcom/facebook/samples/a/b;->aaL:Lcom/facebook/samples/a/a;
 
-    iget-object v6, v6, Lcom/facebook/samples/a/a;->aaN:[F
+    iget-object v6, v6, Lcom/facebook/samples/a/a;->aaJ:[F
 
     aget v6, v6, v4
 
@@ -1067,29 +1067,29 @@
 
     or-int/2addr v1, v4
 
-    iget-boolean v2, p0, Lcom/facebook/samples/zoomable/c;->abf:Z
+    iget-boolean v2, p0, Lcom/facebook/samples/zoomable/c;->abb:Z
 
     if-eqz v2, :cond_4
 
-    iget-object v2, v0, Lcom/facebook/samples/a/b;->aaP:Lcom/facebook/samples/a/a;
+    iget-object v2, v0, Lcom/facebook/samples/a/b;->aaL:Lcom/facebook/samples/a/a;
 
-    iget-object v2, v2, Lcom/facebook/samples/a/a;->aaM:[F
+    iget-object v2, v2, Lcom/facebook/samples/a/a;->aaI:[F
 
-    iget-object v4, v0, Lcom/facebook/samples/a/b;->aaP:Lcom/facebook/samples/a/a;
+    iget-object v4, v0, Lcom/facebook/samples/a/b;->aaL:Lcom/facebook/samples/a/a;
 
-    iget v4, v4, Lcom/facebook/samples/a/a;->aaH:I
+    iget v4, v4, Lcom/facebook/samples/a/a;->aaD: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;->aaP:Lcom/facebook/samples/a/a;
+    iget-object v4, v0, Lcom/facebook/samples/a/b;->aaL:Lcom/facebook/samples/a/a;
 
-    iget-object v4, v4, Lcom/facebook/samples/a/a;->aaK:[F
+    iget-object v4, v4, Lcom/facebook/samples/a/a;->aaG:[F
 
-    iget-object v5, v0, Lcom/facebook/samples/a/b;->aaP:Lcom/facebook/samples/a/a;
+    iget-object v5, v0, Lcom/facebook/samples/a/b;->aaL:Lcom/facebook/samples/a/a;
 
-    iget v5, v5, Lcom/facebook/samples/a/a;->aaH:I
+    iget v5, v5, Lcom/facebook/samples/a/a;->aaD: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;->aaP:Lcom/facebook/samples/a/a;
+    iget-object v4, v0, Lcom/facebook/samples/a/b;->aaL:Lcom/facebook/samples/a/a;
 
-    iget-object v4, v4, Lcom/facebook/samples/a/a;->aaN:[F
+    iget-object v4, v4, Lcom/facebook/samples/a/a;->aaJ:[F
 
-    iget-object v5, v0, Lcom/facebook/samples/a/b;->aaP:Lcom/facebook/samples/a/a;
+    iget-object v5, v0, Lcom/facebook/samples/a/b;->aaL:Lcom/facebook/samples/a/a;
 
-    iget v5, v5, Lcom/facebook/samples/a/a;->aaH:I
+    iget v5, v5, Lcom/facebook/samples/a/a;->aaD: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;->aaP:Lcom/facebook/samples/a/a;
+    iget-object v5, v0, Lcom/facebook/samples/a/b;->aaL:Lcom/facebook/samples/a/a;
 
-    iget-object v5, v5, Lcom/facebook/samples/a/a;->aaL:[F
+    iget-object v5, v5, Lcom/facebook/samples/a/a;->aaH:[F
 
-    iget-object v0, v0, Lcom/facebook/samples/a/b;->aaP:Lcom/facebook/samples/a/a;
+    iget-object v0, v0, Lcom/facebook/samples/a/b;->aaL:Lcom/facebook/samples/a/a;
 
-    iget v0, v0, Lcom/facebook/samples/a/a;->aaH:I
+    iget v0, v0, Lcom/facebook/samples/a/a;->aaD: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;->kZ()V
+    invoke-direct {p0}, Lcom/facebook/samples/zoomable/c;->kX()V
 
     if-eqz p1, :cond_5
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->aba:Lcom/facebook/samples/a/b;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->aaW:Lcom/facebook/samples/a/b;
 
-    invoke-virtual {v0}, Lcom/facebook/samples/a/b;->kQ()V
+    invoke-virtual {v0}, Lcom/facebook/samples/a/b;->kO()V
 
     :cond_5
-    iput-boolean p1, p0, Lcom/facebook/samples/zoomable/c;->abp:Z
+    iput-boolean p1, p0, Lcom/facebook/samples/zoomable/c;->abl: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;->abj:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->abf: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;->abj:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->abf:Landroid/graphics/RectF;
 
     invoke-virtual {v0, p1}, Landroid/graphics/RectF;->set(Landroid/graphics/RectF;)V
 
-    invoke-direct {p0}, Lcom/facebook/samples/zoomable/c;->kZ()V
+    invoke-direct {p0}, Lcom/facebook/samples/zoomable/c;->kX()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;->abi:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->abe: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;->abi:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->abe:Landroid/graphics/RectF;
 
     iget v0, v0, Landroid/graphics/RectF;->left:F
 
-    iget-object v1, p0, Lcom/facebook/samples/zoomable/c;->abk:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/facebook/samples/zoomable/c;->abg: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;->abk:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->abg: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;->abi:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->abe: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;->abi:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->abe:Landroid/graphics/RectF;
 
     iget v0, v0, Landroid/graphics/RectF;->top:F
 
-    iget-object v1, p0, Lcom/facebook/samples/zoomable/c;->abk:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/facebook/samples/zoomable/c;->abg: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;->abk:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->abg: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;->abi:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->abe: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;->GI:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/samples/zoomable/c;->GE: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;->abm:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->abi:Landroid/graphics/Matrix;
 
     invoke-virtual {v0, p1}, Landroid/graphics/Matrix;->set(Landroid/graphics/Matrix;)V
 
-    invoke-direct {p0}, Lcom/facebook/samples/zoomable/c;->kZ()V
+    invoke-direct {p0}, Lcom/facebook/samples/zoomable/c;->kX()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;->abc:Z
+    iget-boolean v0, p0, Lcom/facebook/samples/zoomable/c;->aaY:Z
 
     return v0
 .end method
 
-.method public final kR()V
+.method public final kP()V
     .locals 2
 
-    sget-object v0, Lcom/facebook/samples/zoomable/c;->GI:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/samples/zoomable/c;->GE:Ljava/lang/Class;
 
     const-string v1, "onGestureEnd"
 
@@ -1307,16 +1307,16 @@
     return-void
 .end method
 
-.method public kS()Z
+.method public kQ()Z
     .locals 5
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->abm:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->abi:Landroid/graphics/Matrix;
 
-    iget-object v1, p0, Lcom/facebook/samples/zoomable/c;->abo:[F
+    iget-object v1, p0, Lcom/facebook/samples/zoomable/c;->abk:[F
 
     invoke-virtual {v0, v1}, Landroid/graphics/Matrix;->getValues([F)V
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->abo:[F
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->abk:[F
 
     const/4 v1, 0x0
 
@@ -1351,7 +1351,7 @@
 
     if-ge v0, v2, :cond_1
 
-    iget-object v2, p0, Lcom/facebook/samples/zoomable/c;->abo:[F
+    iget-object v2, p0, Lcom/facebook/samples/zoomable/c;->abk:[F
 
     aget v2, v2, v0
 
@@ -1378,10 +1378,10 @@
     return v0
 .end method
 
-.method public final kW()F
+.method public final kU()F
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->abm:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->abi: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 kX()Z
+.method public final kV()Z
     .locals 1
 
-    iget-boolean v0, p0, Lcom/facebook/samples/zoomable/c;->abp:Z
+    iget-boolean v0, p0, Lcom/facebook/samples/zoomable/c;->abl:Z
 
     return v0
 .end method
 
-.method public final kY()Landroid/graphics/Matrix;
+.method public final kW()Landroid/graphics/Matrix;
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->abm:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->abi: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;->GI:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/samples/zoomable/c;->GE: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;->abc:Z
+    iget-boolean v0, p0, Lcom/facebook/samples/zoomable/c;->aaY:Z
 
     const/4 v1, 0x0
 
     if-eqz v0, :cond_e
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->aba:Lcom/facebook/samples/a/b;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->aaW:Lcom/facebook/samples/a/b;
 
-    iget-object v0, v0, Lcom/facebook/samples/a/b;->aaP:Lcom/facebook/samples/a/a;
+    iget-object v0, v0, Lcom/facebook/samples/a/b;->aaL: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;->aaI:I
+    iput v1, v0, Lcom/facebook/samples/a/a;->aaE:I
 
-    invoke-virtual {v0}, Lcom/facebook/samples/a/a;->kM()V
+    invoke-virtual {v0}, Lcom/facebook/samples/a/a;->kK()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;->aaJ:[I
+    iget-object v2, v0, Lcom/facebook/samples/a/a;->aaF:[I
 
     aget v2, v2, v1
 
@@ -1486,7 +1486,7 @@
 
     if-eq v2, v5, :cond_2
 
-    iget-object v3, v0, Lcom/facebook/samples/a/a;->aaM:[F
+    iget-object v3, v0, Lcom/facebook/samples/a/a;->aaI:[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;->aaN:[F
+    iget-object v3, v0, Lcom/facebook/samples/a/a;->aaJ:[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;->aaG:Z
+    iget-boolean p1, v0, Lcom/facebook/samples/a/a;->aaC:Z
 
     if-nez p1, :cond_4
 
-    iget p1, v0, Lcom/facebook/samples/a/a;->aaH:I
+    iget p1, v0, Lcom/facebook/samples/a/a;->aaD:I
 
     if-lez p1, :cond_4
 
-    invoke-virtual {v0}, Lcom/facebook/samples/a/a;->kL()V
+    invoke-virtual {v0}, Lcom/facebook/samples/a/a;->kJ()V
 
     :cond_4
-    iget-boolean p1, v0, Lcom/facebook/samples/a/a;->aaG:Z
+    iget-boolean p1, v0, Lcom/facebook/samples/a/a;->aaC:Z
 
     if-eqz p1, :cond_d
 
-    iget-object p1, v0, Lcom/facebook/samples/a/a;->aaO:Lcom/facebook/samples/a/a$a;
+    iget-object p1, v0, Lcom/facebook/samples/a/a;->aaK:Lcom/facebook/samples/a/a$a;
 
     if-eqz p1, :cond_d
 
-    iget-object p1, v0, Lcom/facebook/samples/a/a;->aaO:Lcom/facebook/samples/a/a$a;
+    iget-object p1, v0, Lcom/facebook/samples/a/a;->aaK:Lcom/facebook/samples/a/a$a;
 
-    invoke-interface {p1}, Lcom/facebook/samples/a/a$a;->kO()V
+    invoke-interface {p1}, Lcom/facebook/samples/a/a$a;->kM()V
 
     goto :goto_5
 
@@ -1550,11 +1550,11 @@
     add-int/lit8 v2, v2, -0x1
 
     :cond_7
-    iput v2, v0, Lcom/facebook/samples/a/a;->aaI:I
+    iput v2, v0, Lcom/facebook/samples/a/a;->aaE:I
 
-    invoke-virtual {v0}, Lcom/facebook/samples/a/a;->kM()V
+    invoke-virtual {v0}, Lcom/facebook/samples/a/a;->kK()V
 
-    iput v1, v0, Lcom/facebook/samples/a/a;->aaH:I
+    iput v1, v0, Lcom/facebook/samples/a/a;->aaD: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;->aaJ:[I
+    iget-object v2, v0, Lcom/facebook/samples/a/a;->aaF:[I
 
     aput v5, v2, v1
 
     goto :goto_4
 
     :cond_b
-    iget-object v2, v0, Lcom/facebook/samples/a/a;->aaJ:[I
+    iget-object v2, v0, Lcom/facebook/samples/a/a;->aaF:[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;->aaM:[F
+    iget-object v2, v0, Lcom/facebook/samples/a/a;->aaI:[F
 
-    iget-object v8, v0, Lcom/facebook/samples/a/a;->aaK:[F
+    iget-object v8, v0, Lcom/facebook/samples/a/a;->aaG:[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;->aaN:[F
+    iget-object v2, v0, Lcom/facebook/samples/a/a;->aaJ:[F
 
-    iget-object v8, v0, Lcom/facebook/samples/a/a;->aaL:[F
+    iget-object v8, v0, Lcom/facebook/samples/a/a;->aaH:[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;->aaH:I
+    iget v2, v0, Lcom/facebook/samples/a/a;->aaD:I
 
     add-int/2addr v2, v6
 
-    iput v2, v0, Lcom/facebook/samples/a/a;->aaH:I
+    iput v2, v0, Lcom/facebook/samples/a/a;->aaD: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;->aaH:I
+    iget p1, v0, Lcom/facebook/samples/a/a;->aaD:I
 
     if-lez p1, :cond_d
 
-    invoke-virtual {v0}, Lcom/facebook/samples/a/a;->kL()V
+    invoke-virtual {v0}, Lcom/facebook/samples/a/a;->kJ()V
 
     :cond_d
     :goto_5
@@ -1664,27 +1664,27 @@
 .method public reset()V
     .locals 2
 
-    sget-object v0, Lcom/facebook/samples/zoomable/c;->GI:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/samples/zoomable/c;->GE: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;->aba:Lcom/facebook/samples/a/b;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->aaW:Lcom/facebook/samples/a/b;
 
-    iget-object v0, v0, Lcom/facebook/samples/a/b;->aaP:Lcom/facebook/samples/a/a;
+    iget-object v0, v0, Lcom/facebook/samples/a/b;->aaL:Lcom/facebook/samples/a/a;
 
     invoke-virtual {v0}, Lcom/facebook/samples/a/a;->reset()V
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->abl:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->abh:Landroid/graphics/Matrix;
 
     invoke-virtual {v0}, Landroid/graphics/Matrix;->reset()V
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->abm:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->abi:Landroid/graphics/Matrix;
 
     invoke-virtual {v0}, Landroid/graphics/Matrix;->reset()V
 
-    invoke-direct {p0}, Lcom/facebook/samples/zoomable/c;->kZ()V
+    invoke-direct {p0}, Lcom/facebook/samples/zoomable/c;->kX()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;->abc:Z
+    iput-boolean p1, p0, Lcom/facebook/samples/zoomable/c;->aaY: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 e12b0a281b..73210a2e1d 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 abq:Lcom/facebook/samples/zoomable/ZoomableDraweeView;
+.field private final abm:Lcom/facebook/samples/zoomable/ZoomableDraweeView;
 
-.field private final abr:Landroid/graphics/PointF;
+.field private final abn:Landroid/graphics/PointF;
 
-.field private final abs:Landroid/graphics/PointF;
+.field private final abo:Landroid/graphics/PointF;
 
-.field private abt:F
+.field private abp:F
 
-.field private abu:Z
+.field private abq:Z
 
 
 # direct methods
@@ -25,23 +25,23 @@
 
     invoke-direct {v0}, Landroid/graphics/PointF;-><init>()V
 
-    iput-object v0, p0, Lcom/facebook/samples/zoomable/d;->abr:Landroid/graphics/PointF;
+    iput-object v0, p0, Lcom/facebook/samples/zoomable/d;->abn: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;->abs:Landroid/graphics/PointF;
+    iput-object v0, p0, Lcom/facebook/samples/zoomable/d;->abo:Landroid/graphics/PointF;
 
     const/high16 v0, 0x3f800000    # 1.0f
 
-    iput v0, p0, Lcom/facebook/samples/zoomable/d;->abt:F
+    iput v0, p0, Lcom/facebook/samples/zoomable/d;->abp:F
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/facebook/samples/zoomable/d;->abu:Z
+    iput-boolean v0, p0, Lcom/facebook/samples/zoomable/d;->abq:Z
 
-    iput-object p1, p0, Lcom/facebook/samples/zoomable/d;->abq:Lcom/facebook/samples/zoomable/ZoomableDraweeView;
+    iput-object p1, p0, Lcom/facebook/samples/zoomable/d;->abm: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;->abr:Landroid/graphics/PointF;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/d;->abn: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;->abt:F
+    iget p1, p0, Lcom/facebook/samples/zoomable/d;->abp:F
 
     div-float/2addr p1, v0
 
     return p1
 
     :cond_0
-    iget p1, p0, Lcom/facebook/samples/zoomable/d;->abt:F
+    iget p1, p0, Lcom/facebook/samples/zoomable/d;->abp: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;->abq:Lcom/facebook/samples/zoomable/ZoomableDraweeView;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/d;->abm: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;->abu:Z
+    iget-boolean p1, p0, Lcom/facebook/samples/zoomable/d;->abq:Z
 
     if-nez p1, :cond_2
 
     iget p1, v4, Landroid/graphics/PointF;->x:F
 
-    iget-object v2, p0, Lcom/facebook/samples/zoomable/d;->abr:Landroid/graphics/PointF;
+    iget-object v2, p0, Lcom/facebook/samples/zoomable/d;->abn: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;->abr:Landroid/graphics/PointF;
+    iget-object v5, p0, Lcom/facebook/samples/zoomable/d;->abn: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;->abu:Z
+    iput-boolean v7, p0, Lcom/facebook/samples/zoomable/d;->abq:Z
 
-    iget-boolean p1, p0, Lcom/facebook/samples/zoomable/d;->abu:Z
+    iget-boolean p1, p0, Lcom/facebook/samples/zoomable/d;->abq:Z
 
     if-eqz p1, :cond_8
 
@@ -197,16 +197,16 @@
 
     move-result p1
 
-    iget-object v2, p0, Lcom/facebook/samples/zoomable/d;->abs:Landroid/graphics/PointF;
+    iget-object v2, p0, Lcom/facebook/samples/zoomable/d;->abo:Landroid/graphics/PointF;
 
-    iget-object v3, p0, Lcom/facebook/samples/zoomable/d;->abr:Landroid/graphics/PointF;
+    iget-object v3, p0, Lcom/facebook/samples/zoomable/d;->abn: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;->abu:Z
+    iget-boolean p1, p0, Lcom/facebook/samples/zoomable/d;->abq:Z
 
     if-eqz p1, :cond_5
 
@@ -214,20 +214,20 @@
 
     move-result p1
 
-    iget-object v2, p0, Lcom/facebook/samples/zoomable/d;->abs:Landroid/graphics/PointF;
+    iget-object v2, p0, Lcom/facebook/samples/zoomable/d;->abo:Landroid/graphics/PointF;
 
-    iget-object v3, p0, Lcom/facebook/samples/zoomable/d;->abr:Landroid/graphics/PointF;
+    iget-object v3, p0, Lcom/facebook/samples/zoomable/d;->abn: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;->abh:F
+    iget v2, v1, Lcom/facebook/samples/zoomable/c;->abd:F
 
-    iget p1, v1, Lcom/facebook/samples/zoomable/c;->abg:F
+    iget p1, v1, Lcom/facebook/samples/zoomable/c;->abc:F
 
-    invoke-virtual {v1}, Lcom/facebook/samples/zoomable/a;->kW()F
+    invoke-virtual {v1}, Lcom/facebook/samples/zoomable/a;->kU()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;->abu:Z
+    iput-boolean v7, p0, Lcom/facebook/samples/zoomable/d;->abq:Z
 
     goto :goto_2
 
     :cond_7
-    iget-object p1, p0, Lcom/facebook/samples/zoomable/d;->abr:Landroid/graphics/PointF;
+    iget-object p1, p0, Lcom/facebook/samples/zoomable/d;->abn:Landroid/graphics/PointF;
 
     invoke-virtual {p1, v4}, Landroid/graphics/PointF;->set(Landroid/graphics/PointF;)V
 
-    iget-object p1, p0, Lcom/facebook/samples/zoomable/d;->abs:Landroid/graphics/PointF;
+    iget-object p1, p0, Lcom/facebook/samples/zoomable/d;->abo:Landroid/graphics/PointF;
 
     invoke-virtual {p1, v3}, Landroid/graphics/PointF;->set(Landroid/graphics/PointF;)V
 
-    invoke-virtual {v1}, Lcom/facebook/samples/zoomable/a;->kW()F
+    invoke-virtual {v1}, Lcom/facebook/samples/zoomable/a;->kU()F
 
     move-result p1
 
-    iput p1, p0, Lcom/facebook/samples/zoomable/d;->abt:F
+    iput p1, p0, Lcom/facebook/samples/zoomable/d;->abp: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 9cdb78ccbe..b5defbdad6 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 abv:Landroid/view/GestureDetector$SimpleOnGestureListener;
+.field abr: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;->abv:Landroid/view/GestureDetector$SimpleOnGestureListener;
+    iput-object v0, p0, Lcom/facebook/samples/zoomable/e;->abr: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;->abv:Landroid/view/GestureDetector$SimpleOnGestureListener;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/e;->abr: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;->abv:Landroid/view/GestureDetector$SimpleOnGestureListener;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/e;->abr: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;->abv:Landroid/view/GestureDetector$SimpleOnGestureListener;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/e;->abr: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;->abv:Landroid/view/GestureDetector$SimpleOnGestureListener;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/e;->abr: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;->abv:Landroid/view/GestureDetector$SimpleOnGestureListener;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/e;->abr: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;->abv:Landroid/view/GestureDetector$SimpleOnGestureListener;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/e;->abr: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;->abv:Landroid/view/GestureDetector$SimpleOnGestureListener;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/e;->abr: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;->abv:Landroid/view/GestureDetector$SimpleOnGestureListener;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/e;->abr: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;->abv:Landroid/view/GestureDetector$SimpleOnGestureListener;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/e;->abr: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 cced9cbfd4..d0662ef9bc 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 kS()Z
+.method public abstract kQ()Z
 .end method
 
-.method public abstract kW()F
+.method public abstract kU()F
 .end method
 
-.method public abstract kX()Z
+.method public abstract kV()Z
 .end method
 
-.method public abstract kY()Landroid/graphics/Matrix;
+.method public abstract kW()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 632b9996fb..11bd0612e1 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 acg:Z
+.field final synthetic acc:Z
 
-.field final synthetic ach:Ljava/lang/String;
+.field final synthetic acd:Ljava/lang/String;
 
-.field final synthetic aci:Ljava/lang/String;
+.field final synthetic ace:Ljava/lang/String;
 
-.field final synthetic acj:Ljava/lang/Runtime;
+.field final synthetic acf:Ljava/lang/Runtime;
 
-.field final synthetic acl:Ljava/lang/reflect/Method;
+.field final synthetic acg: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;->acg:Z
+    iput-boolean p1, p0, Lcom/facebook/soloader/SoLoader$1;->acc:Z
 
-    iput-object p2, p0, Lcom/facebook/soloader/SoLoader$1;->ach:Ljava/lang/String;
+    iput-object p2, p0, Lcom/facebook/soloader/SoLoader$1;->acd:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/facebook/soloader/SoLoader$1;->aci:Ljava/lang/String;
+    iput-object p3, p0, Lcom/facebook/soloader/SoLoader$1;->ace:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/facebook/soloader/SoLoader$1;->acj:Ljava/lang/Runtime;
+    iput-object p4, p0, Lcom/facebook/soloader/SoLoader$1;->acf:Ljava/lang/Runtime;
 
-    iput-object p5, p0, Lcom/facebook/soloader/SoLoader$1;->acl:Ljava/lang/reflect/Method;
+    iput-object p5, p0, Lcom/facebook/soloader/SoLoader$1;->acg: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;->acg:Z
+    iget-boolean v0, p0, Lcom/facebook/soloader/SoLoader$1;->acc: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;->ach:Ljava/lang/String;
+    iget-object p2, p0, Lcom/facebook/soloader/SoLoader$1;->acd:Ljava/lang/String;
 
     goto :goto_1
 
     :cond_1
-    iget-object p2, p0, Lcom/facebook/soloader/SoLoader$1;->aci:Ljava/lang/String;
+    iget-object p2, p0, Lcom/facebook/soloader/SoLoader$1;->ace:Ljava/lang/String;
 
     :goto_1
     const/4 v0, 0x0
 
     :try_start_0
-    iget-object v3, p0, Lcom/facebook/soloader/SoLoader$1;->acj:Ljava/lang/Runtime;
+    iget-object v3, p0, Lcom/facebook/soloader/SoLoader$1;->acf: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;->acl:Ljava/lang/reflect/Method;
+    iget-object v4, p0, Lcom/facebook/soloader/SoLoader$1;->acg:Ljava/lang/reflect/Method;
 
-    iget-object v5, p0, Lcom/facebook/soloader/SoLoader$1;->acj:Ljava/lang/Runtime;
+    iget-object v5, p0, Lcom/facebook/soloader/SoLoader$1;->acf: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 dbe39f2f34..68b335a201 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 lk()Ljava/lang/String;
+.method public static li()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 60970403d2..0f54a08946 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 abE:Ljava/io/File;
+.field private abA:Ljava/io/File;
 
-.field final synthetic abF:Lcom/facebook/soloader/a;
+.field final synthetic abB:Lcom/facebook/soloader/a;
 
 .field private final mFlags:I
 
@@ -31,7 +31,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/facebook/soloader/a$a;->abF:Lcom/facebook/soloader/a;
+    iput-object p1, p0, Lcom/facebook/soloader/a$a;->abB: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;->abE:Ljava/io/File;
+    iput-object p2, p0, Lcom/facebook/soloader/a$a;->abA: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;->abF:Lcom/facebook/soloader/a;
+    iget-object v1, p0, Lcom/facebook/soloader/a$a;->abB:Lcom/facebook/soloader/a;
 
-    iget-object v1, v1, Lcom/facebook/soloader/a;->acm:Ljava/lang/String;
+    iget-object v1, v1, Lcom/facebook/soloader/a;->ach: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;->abF:Lcom/facebook/soloader/a;
+    iget-object p1, p0, Lcom/facebook/soloader/a$a;->abB:Lcom/facebook/soloader/a;
 
     const/4 v0, 0x0
 
-    iput-object v0, p1, Lcom/facebook/soloader/a;->acm:Ljava/lang/String;
+    iput-object v0, p1, Lcom/facebook/soloader/a;->ach: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;->abE:Ljava/io/File;
+    iget-object v4, p0, Lcom/facebook/soloader/a$a;->abA: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 644806cf0e..97e9679f8b 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 lb()Lcom/facebook/soloader/k$e;
+.method protected final kZ()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 lc()[B
+.method protected final la()[B
     .locals 5
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -53,7 +53,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/soloader/a;->abI:Ljava/io/File;
+    iget-object v0, p0, Lcom/facebook/soloader/a;->abE: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 e12fe8e5d2..87551863c5 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 abG:Lcom/facebook/soloader/c;
+.field private abC: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;->abG:Lcom/facebook/soloader/c;
+    iput-object p1, p0, Lcom/facebook/soloader/b;->abC:Lcom/facebook/soloader/c;
 
     return-void
 .end method
@@ -69,7 +69,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/soloader/b;->abG:Lcom/facebook/soloader/c;
+    iget-object v0, p0, Lcom/facebook/soloader/b;->abC: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;->abG:Lcom/facebook/soloader/c;
+    iget-object v0, p0, Lcom/facebook/soloader/b;->abC:Lcom/facebook/soloader/c;
 
     invoke-virtual {v0, p1}, Lcom/facebook/soloader/c;->aF(I)V
 
     return-void
 .end method
 
-.method public final ld()Z
+.method public final lb()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;->abG:Lcom/facebook/soloader/c;
+    iget-object v0, p0, Lcom/facebook/soloader/b;->abC:Lcom/facebook/soloader/c;
 
-    iget-object v0, v0, Lcom/facebook/soloader/c;->abH:Ljava/io/File;
+    iget-object v0, v0, Lcom/facebook/soloader/c;->abD: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;->abG:Lcom/facebook/soloader/c;
+    iput-object v0, p0, Lcom/facebook/soloader/b;->abC:Lcom/facebook/soloader/c;
 
-    iget-object v0, p0, Lcom/facebook/soloader/b;->abG:Lcom/facebook/soloader/c;
+    iget-object v0, p0, Lcom/facebook/soloader/b;->abC: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;->abG:Lcom/facebook/soloader/c;
+    iget-object v0, p0, Lcom/facebook/soloader/b;->abC: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 8cb9c810d4..96022f657e 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 abK:Ljava/util/zip/ZipEntry;
+.field final abG:Ljava/util/zip/ZipEntry;
 
-.field final abL:I
+.field final abH: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;->abK:Ljava/util/zip/ZipEntry;
+    iput-object p2, p0, Lcom/facebook/soloader/e$a;->abG:Ljava/util/zip/ZipEntry;
 
-    iput p3, p0, Lcom/facebook/soloader/e$a;->abL:I
+    iput p3, p0, Lcom/facebook/soloader/e$a;->abH: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 5a3dca1ead..356fbc2809 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 abQ:I
+.field private abM:I
 
-.field final synthetic abR:Lcom/facebook/soloader/e$b;
+.field final synthetic abN: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;->abR:Lcom/facebook/soloader/e$b;
+    iput-object p1, p0, Lcom/facebook/soloader/e$b$a;->abN: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;->abR:Lcom/facebook/soloader/e$b;
+    iget-object v0, p0, Lcom/facebook/soloader/e$b$a;->abN:Lcom/facebook/soloader/e$b;
 
-    invoke-virtual {v0}, Lcom/facebook/soloader/e$b;->le()[Lcom/facebook/soloader/e$a;
+    invoke-virtual {v0}, Lcom/facebook/soloader/e$b;->lc()[Lcom/facebook/soloader/e$a;
 
-    iget v0, p0, Lcom/facebook/soloader/e$b$a;->abQ:I
+    iget v0, p0, Lcom/facebook/soloader/e$b$a;->abM:I
 
-    iget-object v1, p0, Lcom/facebook/soloader/e$b$a;->abR:Lcom/facebook/soloader/e$b;
+    iget-object v1, p0, Lcom/facebook/soloader/e$b$a;->abN:Lcom/facebook/soloader/e$b;
 
-    iget-object v1, v1, Lcom/facebook/soloader/e$b;->abM:[Lcom/facebook/soloader/e$a;
+    iget-object v1, v1, Lcom/facebook/soloader/e$b;->abI:[Lcom/facebook/soloader/e$a;
 
     array-length v1, v1
 
@@ -68,7 +68,7 @@
     return v0
 .end method
 
-.method public final lh()Lcom/facebook/soloader/k$c;
+.method public final lf()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;->abR:Lcom/facebook/soloader/e$b;
+    iget-object v0, p0, Lcom/facebook/soloader/e$b$a;->abN:Lcom/facebook/soloader/e$b;
 
-    invoke-virtual {v0}, Lcom/facebook/soloader/e$b;->le()[Lcom/facebook/soloader/e$a;
+    invoke-virtual {v0}, Lcom/facebook/soloader/e$b;->lc()[Lcom/facebook/soloader/e$a;
 
-    iget-object v0, p0, Lcom/facebook/soloader/e$b$a;->abR:Lcom/facebook/soloader/e$b;
+    iget-object v0, p0, Lcom/facebook/soloader/e$b$a;->abN:Lcom/facebook/soloader/e$b;
 
-    iget-object v0, v0, Lcom/facebook/soloader/e$b;->abM:[Lcom/facebook/soloader/e$a;
+    iget-object v0, v0, Lcom/facebook/soloader/e$b;->abI:[Lcom/facebook/soloader/e$a;
 
-    iget v1, p0, Lcom/facebook/soloader/e$b$a;->abQ:I
+    iget v1, p0, Lcom/facebook/soloader/e$b$a;->abM:I
 
     add-int/lit8 v2, v1, 0x1
 
-    iput v2, p0, Lcom/facebook/soloader/e$b$a;->abQ:I
+    iput v2, p0, Lcom/facebook/soloader/e$b$a;->abM:I
 
     aget-object v0, v0, v1
 
-    iget-object v1, p0, Lcom/facebook/soloader/e$b$a;->abR:Lcom/facebook/soloader/e$b;
+    iget-object v1, p0, Lcom/facebook/soloader/e$b$a;->abN:Lcom/facebook/soloader/e$b;
 
-    iget-object v1, v1, Lcom/facebook/soloader/e$b;->abN:Ljava/util/zip/ZipFile;
+    iget-object v1, v1, Lcom/facebook/soloader/e$b;->abJ:Ljava/util/zip/ZipFile;
 
-    iget-object v2, v0, Lcom/facebook/soloader/e$a;->abK:Ljava/util/zip/ZipEntry;
+    iget-object v2, v0, Lcom/facebook/soloader/e$a;->abG: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 006a0d81c8..4e1eeba931 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 abI:Ljava/io/File;
+.field protected final abE:Ljava/io/File;
 
-.field protected final abJ:Ljava/lang/String;
+.field protected final abF: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;->abI:Ljava/io/File;
+    iput-object p3, p0, Lcom/facebook/soloader/e;->abE:Ljava/io/File;
 
-    iput-object p4, p0, Lcom/facebook/soloader/e;->abJ:Ljava/lang/String;
+    iput-object p4, p0, Lcom/facebook/soloader/e;->abF:Ljava/lang/String;
 
     return-void
 .end method
 
 
 # virtual methods
-.method protected lb()Lcom/facebook/soloader/k$e;
+.method protected kZ()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 73a273e87a..5630ee286f 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 acp:Ljava/io/File;
+.field final synthetic acl:Ljava/io/File;
 
-.field final synthetic acq:[B
+.field final synthetic acm:[B
 
-.field final synthetic acr:Lcom/facebook/soloader/k$b;
+.field final synthetic acn:Lcom/facebook/soloader/k$b;
 
-.field final synthetic acs:Ljava/io/File;
+.field final synthetic aco:Ljava/io/File;
 
-.field final synthetic act:Lcom/facebook/soloader/f;
+.field final synthetic acp:Lcom/facebook/soloader/f;
 
-.field final synthetic acu:Lcom/facebook/soloader/k;
+.field final synthetic acq: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;->acu:Lcom/facebook/soloader/k;
+    iput-object p1, p0, Lcom/facebook/soloader/k$1;->acq:Lcom/facebook/soloader/k;
 
-    iput-object p2, p0, Lcom/facebook/soloader/k$1;->acp:Ljava/io/File;
+    iput-object p2, p0, Lcom/facebook/soloader/k$1;->acl:Ljava/io/File;
 
-    iput-object p3, p0, Lcom/facebook/soloader/k$1;->acq:[B
+    iput-object p3, p0, Lcom/facebook/soloader/k$1;->acm:[B
 
-    iput-object p4, p0, Lcom/facebook/soloader/k$1;->acr:Lcom/facebook/soloader/k$b;
+    iput-object p4, p0, Lcom/facebook/soloader/k$1;->acn:Lcom/facebook/soloader/k$b;
 
-    iput-object p5, p0, Lcom/facebook/soloader/k$1;->acs:Ljava/io/File;
+    iput-object p5, p0, Lcom/facebook/soloader/k$1;->aco:Ljava/io/File;
 
-    iput-object p6, p0, Lcom/facebook/soloader/k$1;->act:Lcom/facebook/soloader/f;
+    iput-object p6, p0, Lcom/facebook/soloader/k$1;->acp: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;->acp:Ljava/io/File;
+    iget-object v5, p0, Lcom/facebook/soloader/k$1;->acl: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;->acq:[B
+    iget-object v5, p0, Lcom/facebook/soloader/k$1;->acm:[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;->acu:Lcom/facebook/soloader/k;
+    iget-object v5, p0, Lcom/facebook/soloader/k$1;->acq:Lcom/facebook/soloader/k;
 
-    iget-object v5, v5, Lcom/facebook/soloader/k;->abH:Ljava/io/File;
+    iget-object v5, v5, Lcom/facebook/soloader/k;->abD: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;->acr:Lcom/facebook/soloader/k$b;
+    iget-object v1, p0, Lcom/facebook/soloader/k$1;->acn: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;->acu:Lcom/facebook/soloader/k;
+    iget-object v1, p0, Lcom/facebook/soloader/k$1;->acq:Lcom/facebook/soloader/k;
 
-    iget-object v1, v1, Lcom/facebook/soloader/k;->abH:Ljava/io/File;
+    iget-object v1, v1, Lcom/facebook/soloader/k;->abD:Ljava/io/File;
 
     invoke-static {v1}, Lcom/facebook/soloader/SysUtil;->s(Ljava/io/File;)V
 
-    iget-object v1, p0, Lcom/facebook/soloader/k$1;->acs:Ljava/io/File;
+    iget-object v1, p0, Lcom/facebook/soloader/k$1;->aco: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;->acu:Lcom/facebook/soloader/k;
+    iget-object v2, p0, Lcom/facebook/soloader/k$1;->acq:Lcom/facebook/soloader/k;
 
-    iget-object v2, v2, Lcom/facebook/soloader/k;->abH:Ljava/io/File;
+    iget-object v2, v2, Lcom/facebook/soloader/k;->abD: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;->act:Lcom/facebook/soloader/f;
+    iget-object v0, p0, Lcom/facebook/soloader/k$1;->acp: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;->acu:Lcom/facebook/soloader/k;
+    iget-object v2, p0, Lcom/facebook/soloader/k$1;->acq:Lcom/facebook/soloader/k;
 
-    iget-object v2, v2, Lcom/facebook/soloader/k;->abH:Ljava/io/File;
+    iget-object v2, v2, Lcom/facebook/soloader/k;->abD: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;->act:Lcom/facebook/soloader/f;
+    iget-object v0, p0, Lcom/facebook/soloader/k$1;->acp: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 03760ecda5..9cf7a220d9 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 acv:Ljava/lang/String;
+.field public final acr: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;->acv:Ljava/lang/String;
+    iput-object p2, p0, Lcom/facebook/soloader/k$a;->acr: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 02ed7a9260..b3f0902b2f 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 acw:[Lcom/facebook/soloader/k$a;
+.field public final acs:[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;->acw:[Lcom/facebook/soloader/k$a;
+    iput-object p1, p0, Lcom/facebook/soloader/k$b;->acs:[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;->acw:[Lcom/facebook/soloader/k$a;
+    iget-object v0, p0, Lcom/facebook/soloader/k$b;->acs:[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;->acw:[Lcom/facebook/soloader/k$a;
+    iget-object v1, p0, Lcom/facebook/soloader/k$b;->acs:[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;->acw:[Lcom/facebook/soloader/k$a;
+    iget-object v1, p0, Lcom/facebook/soloader/k$b;->acs:[Lcom/facebook/soloader/k$a;
 
     aget-object v1, v1, v0
 
-    iget-object v1, v1, Lcom/facebook/soloader/k$a;->acv:Ljava/lang/String;
+    iget-object v1, v1, Lcom/facebook/soloader/k$a;->acr: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 8fc6e4af68..7c070f1365 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 acx:Lcom/facebook/soloader/k$a;
+.field public final act:Lcom/facebook/soloader/k$a;
 
-.field public final acy:Ljava/io/InputStream;
+.field public final acu: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;->acx:Lcom/facebook/soloader/k$a;
+    iput-object p1, p0, Lcom/facebook/soloader/k$c;->act:Lcom/facebook/soloader/k$a;
 
-    iput-object p2, p0, Lcom/facebook/soloader/k$c;->acy:Ljava/io/InputStream;
+    iput-object p2, p0, Lcom/facebook/soloader/k$c;->acu:Ljava/io/InputStream;
 
     return-void
 .end method
@@ -46,7 +46,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/soloader/k$c;->acy:Ljava/io/InputStream;
+    iget-object v0, p0, Lcom/facebook/soloader/k$c;->acu: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 040adee104..f70b083840 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 lh()Lcom/facebook/soloader/k$c;
+.method public abstract lf()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 c3ab3c096c..6720662cf1 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 acD:Lcom/franmontiel/persistentcookiejar/cache/CookieCache;
+.field private acA:Lcom/franmontiel/persistentcookiejar/persistence/CookiePersistor;
 
-.field private acE:Lcom/franmontiel/persistentcookiejar/persistence/CookiePersistor;
+.field private acz:Lcom/franmontiel/persistentcookiejar/cache/CookieCache;
 
 
 # direct methods
@@ -18,13 +18,13 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/franmontiel/persistentcookiejar/PersistentCookieJar;->acD:Lcom/franmontiel/persistentcookiejar/cache/CookieCache;
+    iput-object p1, p0, Lcom/franmontiel/persistentcookiejar/PersistentCookieJar;->acz:Lcom/franmontiel/persistentcookiejar/cache/CookieCache;
 
-    iput-object p2, p0, Lcom/franmontiel/persistentcookiejar/PersistentCookieJar;->acE:Lcom/franmontiel/persistentcookiejar/persistence/CookiePersistor;
+    iput-object p2, p0, Lcom/franmontiel/persistentcookiejar/PersistentCookieJar;->acA:Lcom/franmontiel/persistentcookiejar/persistence/CookiePersistor;
 
-    iget-object p1, p0, Lcom/franmontiel/persistentcookiejar/PersistentCookieJar;->acD:Lcom/franmontiel/persistentcookiejar/cache/CookieCache;
+    iget-object p1, p0, Lcom/franmontiel/persistentcookiejar/PersistentCookieJar;->acz:Lcom/franmontiel/persistentcookiejar/cache/CookieCache;
 
-    invoke-interface {p2}, Lcom/franmontiel/persistentcookiejar/persistence/CookiePersistor;->ll()Ljava/util/List;
+    invoke-interface {p2}, Lcom/franmontiel/persistentcookiejar/persistence/CookiePersistor;->lj()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;->acD:Lcom/franmontiel/persistentcookiejar/cache/CookieCache;
+    iget-object v2, p0, Lcom/franmontiel/persistentcookiejar/PersistentCookieJar;->acz: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;->bqD:J
+    iget-wide v4, v3, Lokhttp3/l;->bqy:J
 
     invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
 
@@ -110,13 +110,13 @@
     goto :goto_0
 
     :cond_2
-    iget-boolean v4, v3, Lokhttp3/l;->bqI:Z
+    iget-boolean v4, v3, Lokhttp3/l;->bqD:Z
 
     if-eqz v4, :cond_3
 
-    iget-object v4, p1, Lokhttp3/s;->brg:Ljava/lang/String;
+    iget-object v4, p1, Lokhttp3/s;->brb:Ljava/lang/String;
 
-    iget-object v5, v3, Lokhttp3/l;->bqE:Ljava/lang/String;
+    iget-object v5, v3, Lokhttp3/l;->bqz: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;->brg:Ljava/lang/String;
+    iget-object v4, p1, Lokhttp3/s;->brb:Ljava/lang/String;
 
-    iget-object v5, v3, Lokhttp3/l;->bqE:Ljava/lang/String;
+    iget-object v5, v3, Lokhttp3/l;->bqz: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;->bqF:Z
+    iget-boolean v4, v3, Lokhttp3/l;->bqA:Z
 
     if-eqz v4, :cond_6
 
-    invoke-virtual {p1}, Lokhttp3/s;->Fo()Z
+    invoke-virtual {p1}, Lokhttp3/s;->Fm()Z
 
     move-result v4
 
@@ -173,7 +173,7 @@
     goto :goto_0
 
     :cond_7
-    iget-object p1, p0, Lcom/franmontiel/persistentcookiejar/PersistentCookieJar;->acE:Lcom/franmontiel/persistentcookiejar/persistence/CookiePersistor;
+    iget-object p1, p0, Lcom/franmontiel/persistentcookiejar/PersistentCookieJar;->acA: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;->acD:Lcom/franmontiel/persistentcookiejar/cache/CookieCache;
+    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/PersistentCookieJar;->acz: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;->acE:Lcom/franmontiel/persistentcookiejar/persistence/CookiePersistor;
+    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/PersistentCookieJar;->acA: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;->bqH:Z
+    iget-boolean v3, v2, Lokhttp3/l;->bqC: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 ccf43e4741..644adcc2a2 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 acF:Lokhttp3/l;
+.field acB: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;->acF:Lokhttp3/l;
+    iput-object p1, p0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->acB: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;->acF:Lokhttp3/l;
+    iget-object v0, p1, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->acB:Lokhttp3/l;
 
     iget-object v0, v0, Lokhttp3/l;->name:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->acF:Lokhttp3/l;
+    iget-object v2, p0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->acB: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;->acF:Lokhttp3/l;
+    iget-object v0, p1, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->acB:Lokhttp3/l;
 
-    iget-object v0, v0, Lokhttp3/l;->bqE:Ljava/lang/String;
+    iget-object v0, v0, Lokhttp3/l;->bqz:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->acF:Lokhttp3/l;
+    iget-object v2, p0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->acB:Lokhttp3/l;
 
-    iget-object v2, v2, Lokhttp3/l;->bqE:Ljava/lang/String;
+    iget-object v2, v2, Lokhttp3/l;->bqz: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;->acF:Lokhttp3/l;
+    iget-object v0, p1, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->acB:Lokhttp3/l;
 
     iget-object v0, v0, Lokhttp3/l;->path:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->acF:Lokhttp3/l;
+    iget-object v2, p0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->acB: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;->acF:Lokhttp3/l;
+    iget-object v0, p1, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->acB:Lokhttp3/l;
 
-    iget-boolean v0, v0, Lokhttp3/l;->bqF:Z
+    iget-boolean v0, v0, Lokhttp3/l;->bqA:Z
 
-    iget-object v2, p0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->acF:Lokhttp3/l;
+    iget-object v2, p0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->acB:Lokhttp3/l;
 
-    iget-boolean v2, v2, Lokhttp3/l;->bqF:Z
+    iget-boolean v2, v2, Lokhttp3/l;->bqA:Z
 
     if-ne v0, v2, :cond_1
 
-    iget-object p1, p1, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->acF:Lokhttp3/l;
+    iget-object p1, p1, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->acB:Lokhttp3/l;
 
-    iget-boolean p1, p1, Lokhttp3/l;->bqI:Z
+    iget-boolean p1, p1, Lokhttp3/l;->bqD:Z
 
-    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->acF:Lokhttp3/l;
+    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->acB:Lokhttp3/l;
 
-    iget-boolean v0, v0, Lokhttp3/l;->bqI:Z
+    iget-boolean v0, v0, Lokhttp3/l;->bqD: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;->acF:Lokhttp3/l;
+    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->acB: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;->acF:Lokhttp3/l;
+    iget-object v1, p0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->acB:Lokhttp3/l;
 
-    iget-object v1, v1, Lokhttp3/l;->bqE:Ljava/lang/String;
+    iget-object v1, v1, Lokhttp3/l;->bqz: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;->acF:Lokhttp3/l;
+    iget-object v1, p0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->acB: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;->acF:Lokhttp3/l;
+    iget-object v1, p0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->acB:Lokhttp3/l;
 
-    iget-boolean v1, v1, Lokhttp3/l;->bqF:Z
+    iget-boolean v1, v1, Lokhttp3/l;->bqA: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;->acF:Lokhttp3/l;
+    iget-object v1, p0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->acB:Lokhttp3/l;
 
-    iget-boolean v1, v1, Lokhttp3/l;->bqI:Z
+    iget-boolean v1, v1, Lokhttp3/l;->bqD: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 0a6f69cf59..0a8aa0d792 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 acH:Ljava/util/Iterator;
+.field private acD:Ljava/util/Iterator;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Iterator<",
@@ -37,14 +37,14 @@
     .end annotation
 .end field
 
-.field final synthetic acI:Lcom/franmontiel/persistentcookiejar/cache/SetCookieCache;
+.field final synthetic acE: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;->acI:Lcom/franmontiel/persistentcookiejar/cache/SetCookieCache;
+    iput-object p1, p0, Lcom/franmontiel/persistentcookiejar/cache/SetCookieCache$SetCookieCacheIterator;->acE: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;->acH:Ljava/util/Iterator;
+    iput-object p1, p0, Lcom/franmontiel/persistentcookiejar/cache/SetCookieCache$SetCookieCacheIterator;->acD: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;->acH:Ljava/util/Iterator;
+    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/cache/SetCookieCache$SetCookieCacheIterator;->acD: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;->acH:Ljava/util/Iterator;
+    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/cache/SetCookieCache$SetCookieCacheIterator;->acD: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;->acF:Lokhttp3/l;
+    iget-object v0, v0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->acB: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;->acH:Ljava/util/Iterator;
+    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/cache/SetCookieCache$SetCookieCacheIterator;->acD: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 d2e2240add..3070ea0ccf 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 acG:Ljava/util/Set;
+.field private acC: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;->acG:Ljava/util/Set;
+    iput-object v0, p0, Lcom/franmontiel/persistentcookiejar/cache/SetCookieCache;->acC: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;->acG:Ljava/util/Set;
+    iget-object p0, p0, Lcom/franmontiel/persistentcookiejar/cache/SetCookieCache;->acC: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;->acG:Ljava/util/Set;
+    iget-object v1, p0, Lcom/franmontiel/persistentcookiejar/cache/SetCookieCache;->acC:Ljava/util/Set;
 
     invoke-interface {v1, v0}, Ljava/util/Set;->remove(Ljava/lang/Object;)Z
 
-    iget-object v1, p0, Lcom/franmontiel/persistentcookiejar/cache/SetCookieCache;->acG:Ljava/util/Set;
+    iget-object v1, p0, Lcom/franmontiel/persistentcookiejar/cache/SetCookieCache;->acC: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 5b580f1ce8..0930fb67d0 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 ll()Ljava/util/List;
+.method public abstract lj()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 99575c6952..4c91a9a4b4 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 acJ:J = 0x0L
+.field private static acF:J = 0x0L
 
 .field private static final serialVersionUID:J = -0x77442f0b309f5e9eL
 
 
 # instance fields
-.field private transient acF:Lokhttp3/l;
+.field private transient acB:Lokhttp3/l;
 
 
 # direct methods
@@ -32,7 +32,7 @@
 
     const-wide/16 v0, -0x1
 
-    sput-wide v0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->acJ:J
+    sput-wide v0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->acF: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;->acF:Lokhttp3/l;
+    iget-object v1, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->acB: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;->acJ:J
+    sget-wide v3, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->acF:J
 
     const/4 v5, 0x1
 
@@ -372,9 +372,9 @@
     move-wide v1, v3
 
     :cond_1
-    iput-wide v1, v0, Lokhttp3/l$a;->bqD:J
+    iput-wide v1, v0, Lokhttp3/l$a;->bqy:J
 
-    iput-boolean v5, v0, Lokhttp3/l$a;->bqH:Z
+    iput-boolean v5, v0, Lokhttp3/l$a;->bqC: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;->bqF:Z
+    iput-boolean v5, v0, Lokhttp3/l$a;->bqA: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;->bqG:Z
+    iput-boolean v5, v0, Lokhttp3/l$a;->bqB: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;->acF:Lokhttp3/l;
+    iput-object p1, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->acB:Lokhttp3/l;
 
     return-void
 
@@ -492,63 +492,63 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->acF:Lokhttp3/l;
+    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->acB: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;->acF:Lokhttp3/l;
+    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->acB: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;->acF:Lokhttp3/l;
+    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->acB:Lokhttp3/l;
 
-    iget-boolean v0, v0, Lokhttp3/l;->bqH:Z
+    iget-boolean v0, v0, Lokhttp3/l;->bqC:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->acF:Lokhttp3/l;
+    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->acB:Lokhttp3/l;
 
-    iget-wide v0, v0, Lokhttp3/l;->bqD:J
+    iget-wide v0, v0, Lokhttp3/l;->bqy:J
 
     goto :goto_0
 
     :cond_0
-    sget-wide v0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->acJ:J
+    sget-wide v0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->acF:J
 
     :goto_0
     invoke-virtual {p1, v0, v1}, Ljava/io/ObjectOutputStream;->writeLong(J)V
 
-    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->acF:Lokhttp3/l;
+    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->acB:Lokhttp3/l;
 
-    iget-object v0, v0, Lokhttp3/l;->bqE:Ljava/lang/String;
+    iget-object v0, v0, Lokhttp3/l;->bqz:Ljava/lang/String;
 
     invoke-virtual {p1, v0}, Ljava/io/ObjectOutputStream;->writeObject(Ljava/lang/Object;)V
 
-    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->acF:Lokhttp3/l;
+    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->acB: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;->acF:Lokhttp3/l;
+    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->acB:Lokhttp3/l;
 
-    iget-boolean v0, v0, Lokhttp3/l;->bqF:Z
+    iget-boolean v0, v0, Lokhttp3/l;->bqA:Z
 
     invoke-virtual {p1, v0}, Ljava/io/ObjectOutputStream;->writeBoolean(Z)V
 
-    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->acF:Lokhttp3/l;
+    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->acB:Lokhttp3/l;
 
-    iget-boolean v0, v0, Lokhttp3/l;->bqG:Z
+    iget-boolean v0, v0, Lokhttp3/l;->bqB:Z
 
     invoke-virtual {p1, v0}, Ljava/io/ObjectOutputStream;->writeBoolean(Z)V
 
-    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->acF:Lokhttp3/l;
+    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->acB:Lokhttp3/l;
 
-    iget-boolean v0, v0, Lokhttp3/l;->bqI:Z
+    iget-boolean v0, v0, Lokhttp3/l;->bqD: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;->acF:Lokhttp3/l;
+    iput-object p1, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->acB: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 3137a1c164..6233f724ad 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;->bqF:Z
+    iget-boolean v1, p0, Lokhttp3/l;->bqA: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;->bqE:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/l;->bqz: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 ll()Ljava/util/List;
+.method public final lj()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 da9943feea..94f57324fd 100644
--- a/com.discord/smali_classes2/com/google/android/flexbox/FlexItem.smali
+++ b/com.discord/smali_classes2/com/google/android/flexbox/FlexItem.smali
@@ -28,19 +28,25 @@
 .method public abstract getWidth()I
 .end method
 
-.method public abstract ln()F
+.method public abstract ll()F
 .end method
 
-.method public abstract lo()F
+.method public abstract lm()F
 .end method
 
-.method public abstract lp()I
+.method public abstract ln()I
 .end method
 
-.method public abstract lq()Z
+.method public abstract lo()Z
 .end method
 
-.method public abstract lr()F
+.method public abstract lp()F
+.end method
+
+.method public abstract lq()I
+.end method
+
+.method public abstract lr()I
 .end method
 
 .method public abstract ls()I
@@ -48,9 +54,3 @@
 
 .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 787061f95c..833f04a214 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 ads:I
+.field private ado:I
 
-.field private adt:F
+.field private adp:F
 
-.field private adu:F
+.field private adq:F
 
-.field private adv:I
+.field private adr:I
 
-.field private adw:F
+.field private ads:F
 
-.field private adx:Z
+.field private adt:Z
 
 .field private mMaxHeight:I
 
@@ -71,23 +71,23 @@
 
     const/4 v0, 0x1
 
-    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->ads:I
+    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->ado:I
 
     const/4 v1, 0x0
 
-    iput v1, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adt:F
+    iput v1, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adp:F
 
     const/high16 v2, 0x3f800000    # 1.0f
 
-    iput v2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adu:F
+    iput v2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adq:F
 
     const/4 v3, -0x1
 
-    iput v3, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adv:I
+    iput v3, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adr:I
 
     const/high16 v4, -0x40800000    # -1.0f
 
-    iput v4, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adw:F
+    iput v4, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->ads:F
 
     const v5, 0xffffff
 
@@ -107,7 +107,7 @@
 
     move-result p2
 
-    iput p2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->ads:I
+    iput p2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->ado: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;->adt:F
+    iput p2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adp: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;->adu:F
+    iput p2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adq: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;->adv:I
+    iput p2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adr: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;->adw:F
+    iput p2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->ads: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;->adx:Z
+    iput-boolean p2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adt: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;->ads:I
+    iput v1, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->ado:I
 
     const/4 v2, 0x0
 
-    iput v2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adt:F
+    iput v2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adp:F
 
     const/high16 v2, 0x3f800000    # 1.0f
 
-    iput v2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adu:F
+    iput v2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adq:F
 
     const/4 v2, -0x1
 
-    iput v2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adv:I
+    iput v2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adr:I
 
     const/high16 v2, -0x40800000    # -1.0f
 
-    iput v2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adw:F
+    iput v2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->ads:F
 
     const v2, 0xffffff
 
@@ -225,31 +225,31 @@
 
     move-result v2
 
-    iput v2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->ads:I
+    iput v2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->ado:I
 
     invoke-virtual {p1}, Landroid/os/Parcel;->readFloat()F
 
     move-result v2
 
-    iput v2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adt:F
+    iput v2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adp:F
 
     invoke-virtual {p1}, Landroid/os/Parcel;->readFloat()F
 
     move-result v2
 
-    iput v2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adu:F
+    iput v2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adq:F
 
     invoke-virtual {p1}, Landroid/os/Parcel;->readInt()I
 
     move-result v2
 
-    iput v2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adv:I
+    iput v2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adr:I
 
     invoke-virtual {p1}, Landroid/os/Parcel;->readFloat()F
 
     move-result v2
 
-    iput v2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adw:F
+    iput v2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->ads: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;->adx:Z
+    iput-boolean v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adt: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;->ads:I
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->ado:I
 
     const/4 p1, 0x0
 
-    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adt:F
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adp:F
 
     const/high16 p1, 0x3f800000    # 1.0f
 
-    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adu:F
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adq:F
 
     const/4 p1, -0x1
 
-    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adv:I
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adr:I
 
     const/high16 p1, -0x40800000    # -1.0f
 
-    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adw:F
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->ads:F
 
     const p1, 0xffffff
 
@@ -366,23 +366,23 @@
 
     const/4 p1, 0x1
 
-    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->ads:I
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->ado:I
 
     const/4 p1, 0x0
 
-    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adt:F
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adp:F
 
     const/high16 p1, 0x3f800000    # 1.0f
 
-    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adu:F
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adq:F
 
     const/4 p1, -0x1
 
-    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adv:I
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adr:I
 
     const/high16 p1, -0x40800000    # -1.0f
 
-    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adw:F
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->ads:F
 
     const p1, 0xffffff
 
@@ -400,23 +400,23 @@
 
     const/4 v0, 0x1
 
-    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->ads:I
+    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->ado:I
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adt:F
+    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adp:F
 
     const/high16 v0, 0x3f800000    # 1.0f
 
-    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adu:F
+    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adq:F
 
     const/4 v0, -0x1
 
-    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adv:I
+    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adr:I
 
     const/high16 v0, -0x40800000    # -1.0f
 
-    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adw:F
+    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->ads: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;->ads:I
+    iget v0, p1, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->ado:I
 
-    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->ads:I
+    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->ado:I
 
-    iget v0, p1, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adt:F
+    iget v0, p1, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adp:F
 
-    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adt:F
+    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adp:F
 
-    iget v0, p1, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adu:F
+    iget v0, p1, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adq:F
 
-    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adu:F
+    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adq:F
 
-    iget v0, p1, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adv:I
+    iget v0, p1, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adr:I
 
-    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adv:I
+    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adr:I
 
-    iget v0, p1, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adw:F
+    iget v0, p1, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->ads:F
 
-    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adw:F
+    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->ads: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;->adx:Z
+    iget-boolean p1, p1, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adt:Z
 
-    iput-boolean p1, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adx:Z
+    iput-boolean p1, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adt: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;->ads:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->ado:I
 
     return v0
 .end method
@@ -533,47 +533,47 @@
     return v0
 .end method
 
-.method public final ln()F
+.method public final ll()F
     .locals 1
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adt:F
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adp:F
 
     return v0
 .end method
 
-.method public final lo()F
+.method public final lm()F
     .locals 1
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adu:F
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adq:F
 
     return v0
 .end method
 
-.method public final lp()I
+.method public final ln()I
     .locals 1
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adv:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adr:I
 
     return v0
 .end method
 
-.method public final lq()Z
+.method public final lo()Z
     .locals 1
 
-    iget-boolean v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adx:Z
+    iget-boolean v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adt:Z
 
     return v0
 .end method
 
-.method public final lr()F
+.method public final lp()F
     .locals 1
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adw:F
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->ads:F
 
     return v0
 .end method
 
-.method public final ls()I
+.method public final lq()I
     .locals 1
 
     iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->leftMargin:I
@@ -581,7 +581,7 @@
     return v0
 .end method
 
-.method public final lt()I
+.method public final lr()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 lu()I
+.method public final ls()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 lv()I
+.method public final lt()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;->ads:I
+    iget p2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->ado:I
 
     invoke-virtual {p1, p2}, Landroid/os/Parcel;->writeInt(I)V
 
-    iget p2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adt:F
+    iget p2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adp:F
 
     invoke-virtual {p1, p2}, Landroid/os/Parcel;->writeFloat(F)V
 
-    iget p2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adu:F
+    iget p2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adq:F
 
     invoke-virtual {p1, p2}, Landroid/os/Parcel;->writeFloat(F)V
 
-    iget p2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adv:I
+    iget p2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adr:I
 
     invoke-virtual {p1, p2}, Landroid/os/Parcel;->writeInt(I)V
 
-    iget p2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adw:F
+    iget p2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->ads: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;->adx:Z
+    iget-boolean p2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adt: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 99a31665b3..ea270cefcf 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 acZ:Ljava/util/List;
+.field private acV:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -25,35 +25,35 @@
     .end annotation
 .end field
 
+.field private acY:I
+
+.field private acZ:I
+
+.field private ada:I
+
+.field private adb:I
+
 .field private adc:I
 
-.field private ade:I
+.field private ade:Landroid/graphics/drawable/Drawable;
 
-.field private adf:I
+.field private adf:Landroid/graphics/drawable/Drawable;
 
 .field private adg:I
 
 .field private adh:I
 
-.field private adi:Landroid/graphics/drawable/Drawable;
+.field private adi:I
 
-.field private adj:Landroid/graphics/drawable/Drawable;
+.field private adj:I
 
-.field private adk:I
+.field private adk:[I
 
-.field private adl:I
+.field private adl:Landroid/util/SparseIntArray;
 
-.field private adm:I
+.field private adm:Lcom/google/android/flexbox/c;
 
-.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;
+.field private adn: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;->adq:Lcom/google/android/flexbox/c;
+    iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adm: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;->acZ:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->acV: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;->adr:Lcom/google/android/flexbox/c$a;
+    iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adn: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;->adc:I
+    iput p2, p0, Lcom/google/android/flexbox/FlexboxLayout;->acY: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;->ade:I
+    iput p2, p0, Lcom/google/android/flexbox/FlexboxLayout;->acZ: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;->adf:I
+    iput p2, p0, Lcom/google/android/flexbox/FlexboxLayout;->ada: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;->adg:I
+    iput p2, p0, Lcom/google/android/flexbox/FlexboxLayout;->adb: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;->adh:I
+    iput p2, p0, Lcom/google/android/flexbox/FlexboxLayout;->adc: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;->adl:I
+    iput p2, p0, Lcom/google/android/flexbox/FlexboxLayout;->adh:I
 
-    iput p2, p0, Lcom/google/android/flexbox/FlexboxLayout;->adk:I
+    iput p2, p0, Lcom/google/android/flexbox/FlexboxLayout;->adg: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;->adl:I
+    iput p2, p0, Lcom/google/android/flexbox/FlexboxLayout;->adh: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;->adk:I
+    iput p2, p0, Lcom/google/android/flexbox/FlexboxLayout;->adg: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;->adj:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adf:Landroid/graphics/drawable/Drawable;
 
     if-nez v0, :cond_0
 
     return-void
 
     :cond_0
-    iget v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adn:I
+    iget v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adj: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;->adj:Landroid/graphics/drawable/Drawable;
+    iget-object p2, p0, Lcom/google/android/flexbox/FlexboxLayout;->adf: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;->acZ:Ljava/util/List;
+    iget-object v3, p0, Lcom/google/android/flexbox/FlexboxLayout;->acV: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;->acZ:Ljava/util/List;
+    iget-object v5, p0, Lcom/google/android/flexbox/FlexboxLayout;->acV: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;->acT:I
+    iget v7, v5, Lcom/google/android/flexbox/b;->acP:I
 
     add-int/2addr v7, v6
 
@@ -584,14 +584,14 @@
 
     sub-int/2addr v7, v10
 
-    iget v10, p0, Lcom/google/android/flexbox/FlexboxLayout;->adn:I
+    iget v10, p0, Lcom/google/android/flexbox/FlexboxLayout;->adj: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;->acM:I
+    iget v11, v5, Lcom/google/android/flexbox/b;->acI: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;->adl:I
+    iget v7, p0, Lcom/google/android/flexbox/FlexboxLayout;->adh:I
 
     and-int/lit8 v7, v7, 0x4
 
@@ -618,7 +618,7 @@
 
     sub-int/2addr v7, v8
 
-    iget v8, p0, Lcom/google/android/flexbox/FlexboxLayout;->adn:I
+    iget v8, p0, Lcom/google/android/flexbox/FlexboxLayout;->adj: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;->acM:I
+    iget v9, v5, Lcom/google/android/flexbox/b;->acI: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;->adm:I
+    iget v7, p0, Lcom/google/android/flexbox/FlexboxLayout;->adi:I
 
     sub-int/2addr v6, v7
 
@@ -675,7 +675,7 @@
 
     if-eqz v6, :cond_8
 
-    iget v6, p0, Lcom/google/android/flexbox/FlexboxLayout;->adk:I
+    iget v6, p0, Lcom/google/android/flexbox/FlexboxLayout;->adg: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;->adm:I
+    iget v6, p0, Lcom/google/android/flexbox/FlexboxLayout;->adi:I
 
     sub-int/2addr v5, v6
 
@@ -733,7 +733,7 @@
 
     move-result v5
 
-    iget-object v6, v0, Lcom/google/android/flexbox/FlexboxLayout;->acZ:Ljava/util/List;
+    iget-object v6, v0, Lcom/google/android/flexbox/FlexboxLayout;->acV: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;->acZ:Ljava/util/List;
+    iget-object v9, v0, Lcom/google/android/flexbox/FlexboxLayout;->acV: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;->adm:I
+    iget v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->adi:I
 
     sub-int/2addr v5, v10
 
     add-int/2addr v8, v10
 
     :cond_0
-    iget v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->adf:I
+    iget v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->ada:I
 
     const/4 v15, 0x4
 
@@ -793,13 +793,13 @@
 
     if-ne v10, v15, :cond_2
 
-    invoke-virtual {v9}, Lcom/google/android/flexbox/b;->lw()I
+    invoke-virtual {v9}, Lcom/google/android/flexbox/b;->lu()I
 
     move-result v7
 
     if-eqz v7, :cond_1
 
-    iget v10, v9, Lcom/google/android/flexbox/b;->acK:I
+    iget v10, v9, Lcom/google/android/flexbox/b;->acG: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;->adf:I
+    iget v3, v0, Lcom/google/android/flexbox/FlexboxLayout;->ada: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;->lw()I
+    invoke-virtual {v9}, Lcom/google/android/flexbox/b;->lu()I
 
     move-result v7
 
@@ -869,7 +869,7 @@
     const/high16 v7, 0x3f800000    # 1.0f
 
     :goto_2
-    iget v12, v9, Lcom/google/android/flexbox/b;->acK:I
+    iget v12, v9, Lcom/google/android/flexbox/b;->acG: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;->acK:I
+    iget v10, v9, Lcom/google/android/flexbox/b;->acG:I
 
     sub-int v10, v4, v10
 
@@ -900,7 +900,7 @@
 
     int-to-float v7, v7
 
-    iget v14, v9, Lcom/google/android/flexbox/b;->acK:I
+    iget v14, v9, Lcom/google/android/flexbox/b;->acG:I
 
     sub-int v14, v4, v14
 
@@ -913,7 +913,7 @@
     goto :goto_4
 
     :cond_6
-    iget v7, v9, Lcom/google/android/flexbox/b;->acK:I
+    iget v7, v9, Lcom/google/android/flexbox/b;->acG:I
 
     sub-int v7, v4, v7
 
@@ -921,7 +921,7 @@
 
     int-to-float v10, v7
 
-    iget v7, v9, Lcom/google/android/flexbox/b;->acK:I
+    iget v7, v9, Lcom/google/android/flexbox/b;->acG:I
 
     sub-int/2addr v7, v1
 
@@ -952,7 +952,7 @@
 
     if-ge v14, v12, :cond_10
 
-    iget v12, v9, Lcom/google/android/flexbox/b;->acT:I
+    iget v12, v9, Lcom/google/android/flexbox/b;->acP:I
 
     add-int/2addr v12, v14
 
@@ -996,7 +996,7 @@
 
     if-eqz v12, :cond_8
 
-    iget v12, v0, Lcom/google/android/flexbox/FlexboxLayout;->adn:I
+    iget v12, v0, Lcom/google/android/flexbox/FlexboxLayout;->adj:I
 
     int-to-float v13, v12
 
@@ -1028,7 +1028,7 @@
 
     if-ne v14, v10, :cond_9
 
-    iget v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->adl:I
+    iget v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->adh:I
 
     const/16 v16, 0x4
 
@@ -1036,7 +1036,7 @@
 
     if-lez v10, :cond_a
 
-    iget v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->adn:I
+    iget v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->adj:I
 
     move/from16 v21, v10
 
@@ -1049,7 +1049,7 @@
     const/16 v21, 0x0
 
     :goto_8
-    iget v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->ade:I
+    iget v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->acZ:I
 
     const/4 v12, 0x2
 
@@ -1057,7 +1057,7 @@
 
     if-eqz p1, :cond_b
 
-    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->adq:Lcom/google/android/flexbox/c;
+    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->adm: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;->adq:Lcom/google/android/flexbox/c;
+    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->adm: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;->adq:Lcom/google/android/flexbox/c;
+    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->adm: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;->adq:Lcom/google/android/flexbox/c;
+    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->adm: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;->acM:I
+    iget v1, v9, Lcom/google/android/flexbox/b;->acI:I
 
     add-int/2addr v8, v1
 
-    iget v1, v9, Lcom/google/android/flexbox/b;->acM:I
+    iget v1, v9, Lcom/google/android/flexbox/b;->acI:I
 
     sub-int/2addr v5, v1
 
@@ -1373,7 +1373,7 @@
 
     sub-int/2addr v5, v3
 
-    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayout;->acZ:Ljava/util/List;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayout;->acV: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;->acZ:Ljava/util/List;
+    iget-object v9, v0, Lcom/google/android/flexbox/FlexboxLayout;->acV: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;->adn:I
+    iget v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->adj:I
 
     add-int/2addr v5, v10
 
     sub-int/2addr v8, v10
 
     :cond_0
-    iget v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->adf:I
+    iget v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->ada:I
 
     const/4 v15, 0x4
 
@@ -1433,13 +1433,13 @@
 
     if-ne v10, v15, :cond_2
 
-    invoke-virtual {v9}, Lcom/google/android/flexbox/b;->lw()I
+    invoke-virtual {v9}, Lcom/google/android/flexbox/b;->lu()I
 
     move-result v10
 
     if-eqz v10, :cond_1
 
-    iget v12, v9, Lcom/google/android/flexbox/b;->acK:I
+    iget v12, v9, Lcom/google/android/flexbox/b;->acG: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;->adf:I
+    iget v3, v0, Lcom/google/android/flexbox/FlexboxLayout;->ada: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;->lw()I
+    invoke-virtual {v9}, Lcom/google/android/flexbox/b;->lu()I
 
     move-result v7
 
@@ -1509,7 +1509,7 @@
     const/high16 v7, 0x3f800000    # 1.0f
 
     :goto_2
-    iget v10, v9, Lcom/google/android/flexbox/b;->acK:I
+    iget v10, v9, Lcom/google/android/flexbox/b;->acG: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;->acK:I
+    iget v10, v9, Lcom/google/android/flexbox/b;->acG:I
 
     sub-int v10, v6, v10
 
@@ -1546,7 +1546,7 @@
 
     int-to-float v7, v7
 
-    iget v10, v9, Lcom/google/android/flexbox/b;->acK:I
+    iget v10, v9, Lcom/google/android/flexbox/b;->acG:I
 
     sub-int v10, v6, v10
 
@@ -1559,7 +1559,7 @@
     goto :goto_4
 
     :cond_6
-    iget v7, v9, Lcom/google/android/flexbox/b;->acK:I
+    iget v7, v9, Lcom/google/android/flexbox/b;->acG:I
 
     sub-int v7, v6, v7
 
@@ -1567,7 +1567,7 @@
 
     int-to-float v12, v7
 
-    iget v7, v9, Lcom/google/android/flexbox/b;->acK:I
+    iget v7, v9, Lcom/google/android/flexbox/b;->acG:I
 
     sub-int/2addr v7, v1
 
@@ -1598,7 +1598,7 @@
 
     if-ge v7, v11, :cond_10
 
-    iget v11, v9, Lcom/google/android/flexbox/b;->acT:I
+    iget v11, v9, Lcom/google/android/flexbox/b;->acP:I
 
     add-int/2addr v11, v7
 
@@ -1642,7 +1642,7 @@
 
     if-eqz v11, :cond_8
 
-    iget v11, v0, Lcom/google/android/flexbox/FlexboxLayout;->adm:I
+    iget v11, v0, Lcom/google/android/flexbox/FlexboxLayout;->adi:I
 
     int-to-float v13, v11
 
@@ -1672,7 +1672,7 @@
 
     if-ne v7, v10, :cond_9
 
-    iget v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->adk:I
+    iget v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->adg:I
 
     const/16 v16, 0x4
 
@@ -1680,7 +1680,7 @@
 
     if-lez v10, :cond_a
 
-    iget v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->adm:I
+    iget v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->adi:I
 
     move/from16 v23, v10
 
@@ -1697,7 +1697,7 @@
 
     if-eqz p2, :cond_b
 
-    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->adq:Lcom/google/android/flexbox/c;
+    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->adm: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;->adq:Lcom/google/android/flexbox/c;
+    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->adm: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;->adq:Lcom/google/android/flexbox/c;
+    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->adm: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;->adq:Lcom/google/android/flexbox/c;
+    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->adm: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;->acM:I
+    iget v7, v9, Lcom/google/android/flexbox/b;->acI:I
 
     add-int/2addr v5, v7
 
-    iget v7, v9, Lcom/google/android/flexbox/b;->acM:I
+    iget v7, v9, Lcom/google/android/flexbox/b;->acI:I
 
     sub-int/2addr v8, v7
 
@@ -1971,7 +1971,7 @@
 
     if-ltz p1, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->ado:[I
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adk:[I
 
     array-length v1, v0
 
@@ -2002,7 +2002,7 @@
 
     if-ltz p1, :cond_7
 
-    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->acZ:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->acV: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;->lm()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->lk()Z
 
     move-result p1
 
     if-eqz p1, :cond_2
 
-    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adk:I
+    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adg:I
 
     and-int/2addr p1, v1
 
@@ -2039,7 +2039,7 @@
     return v0
 
     :cond_2
-    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adl:I
+    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adh:I
 
     and-int/2addr p1, v1
 
@@ -2051,13 +2051,13 @@
     return v0
 
     :cond_4
-    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->lm()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->lk()Z
 
     move-result p1
 
     if-eqz p1, :cond_6
 
-    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adk:I
+    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adg:I
 
     and-int/lit8 p1, p1, 0x2
 
@@ -2069,7 +2069,7 @@
     return v0
 
     :cond_6
-    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adl:I
+    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adh: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;->acZ:Ljava/util/List;
+    iget-object v2, p0, Lcom/google/android/flexbox/FlexboxLayout;->acV: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;->lw()I
+    invoke-virtual {v2}, Lcom/google/android/flexbox/b;->lu()I
 
     move-result v2
 
@@ -2126,7 +2126,7 @@
 
     if-ltz p1, :cond_5
 
-    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->acZ:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->acV: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;->acZ:Ljava/util/List;
+    iget-object v2, p0, Lcom/google/android/flexbox/FlexboxLayout;->acV: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;->acZ:Ljava/util/List;
+    iget-object v2, p0, Lcom/google/android/flexbox/FlexboxLayout;->acV: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;->lw()I
+    invoke-virtual {v2}, Lcom/google/android/flexbox/b;->lu()I
 
     move-result v2
 
@@ -2172,13 +2172,13 @@
     goto :goto_0
 
     :cond_2
-    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->lm()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->lk()Z
 
     move-result p1
 
     if-eqz p1, :cond_4
 
-    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adk:I
+    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adg:I
 
     and-int/lit8 p1, p1, 0x4
 
@@ -2190,7 +2190,7 @@
     return v0
 
     :cond_4
-    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adl:I
+    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adh: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;->adi:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->ade: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;->adm:I
+    iget v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adi: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;->adi:Landroid/graphics/drawable/Drawable;
+    iget-object p2, p0, Lcom/google/android/flexbox/FlexboxLayout;->ade: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;->acZ:Ljava/util/List;
+    iget-object v3, p0, Lcom/google/android/flexbox/FlexboxLayout;->acV: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;->acZ:Ljava/util/List;
+    iget-object v5, p0, Lcom/google/android/flexbox/FlexboxLayout;->acV: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;->acT:I
+    iget v7, v5, Lcom/google/android/flexbox/b;->acP:I
 
     add-int/2addr v7, v6
 
@@ -2330,14 +2330,14 @@
 
     sub-int/2addr v7, v10
 
-    iget v10, p0, Lcom/google/android/flexbox/FlexboxLayout;->adm:I
+    iget v10, p0, Lcom/google/android/flexbox/FlexboxLayout;->adi: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;->acM:I
+    iget v11, v5, Lcom/google/android/flexbox/b;->acI: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;->adk:I
+    iget v7, p0, Lcom/google/android/flexbox/FlexboxLayout;->adg:I
 
     and-int/lit8 v7, v7, 0x4
 
@@ -2364,7 +2364,7 @@
 
     sub-int/2addr v7, v8
 
-    iget v8, p0, Lcom/google/android/flexbox/FlexboxLayout;->adm:I
+    iget v8, p0, Lcom/google/android/flexbox/FlexboxLayout;->adi: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;->acM:I
+    iget v9, v5, Lcom/google/android/flexbox/b;->acI: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;->adn:I
+    iget v7, p0, Lcom/google/android/flexbox/FlexboxLayout;->adj:I
 
     sub-int/2addr v6, v7
 
@@ -2421,7 +2421,7 @@
 
     if-eqz v6, :cond_8
 
-    iget v6, p0, Lcom/google/android/flexbox/FlexboxLayout;->adl:I
+    iget v6, p0, Lcom/google/android/flexbox/FlexboxLayout;->adh: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;->adn:I
+    iget v6, p0, Lcom/google/android/flexbox/FlexboxLayout;->adj:I
 
     sub-int/2addr v5, v6
 
@@ -2452,14 +2452,14 @@
     return-void
 .end method
 
-.method private ly()V
+.method private lw()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adi:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->ade:Landroid/graphics/drawable/Drawable;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adj:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adf: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;->acZ:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->acV:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->clear()V
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adr:Lcom/google/android/flexbox/c$a;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adn: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;->adq:Lcom/google/android/flexbox/c;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adm:Lcom/google/android/flexbox/c;
 
-    iget-object v2, p0, Lcom/google/android/flexbox/FlexboxLayout;->adr:Lcom/google/android/flexbox/c$a;
+    iget-object v2, p0, Lcom/google/android/flexbox/FlexboxLayout;->adn: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;->adr:Lcom/google/android/flexbox/c$a;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adn:Lcom/google/android/flexbox/c$a;
 
-    iget-object v0, v0, Lcom/google/android/flexbox/c$a;->acZ:Ljava/util/List;
+    iget-object v0, v0, Lcom/google/android/flexbox/c$a;->acV:Ljava/util/List;
 
-    iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->acZ:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->acV:Ljava/util/List;
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adq:Lcom/google/android/flexbox/c;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adm: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;->adg:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adb:I
 
     const/4 v2, 0x3
 
     if-ne v0, v2, :cond_3
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->acZ:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->acV: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;->acT:I
+    iget v5, v2, Lcom/google/android/flexbox/b;->acP: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;->ade:I
+    iget v7, p0, Lcom/google/android/flexbox/FlexboxLayout;->acZ:I
 
     const/4 v8, 0x2
 
     if-eq v7, v8, :cond_0
 
-    iget v7, v2, Lcom/google/android/flexbox/b;->acQ:I
+    iget v7, v2, Lcom/google/android/flexbox/b;->acM: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;->acQ:I
+    iget v7, v2, Lcom/google/android/flexbox/b;->acM: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;->acM:I
+    iput v4, v2, Lcom/google/android/flexbox/b;->acI:I
 
     goto :goto_0
 
     :cond_3
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adq:Lcom/google/android/flexbox/c;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adm: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;->adq:Lcom/google/android/flexbox/c;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adm: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;->adc:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->acY:I
 
-    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adr:Lcom/google/android/flexbox/c$a;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adn:Lcom/google/android/flexbox/c$a;
 
-    iget v1, v1, Lcom/google/android/flexbox/c$a;->ada:I
+    iget v1, v1, Lcom/google/android/flexbox/c$a;->acW: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;->lm()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->lk()Z
 
     move-result p1
 
     if-eqz p1, :cond_1
 
-    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adl:I
+    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adh:I
 
     and-int/2addr p1, v0
 
@@ -2721,7 +2721,7 @@
     return p2
 
     :cond_1
-    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adk:I
+    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adg:I
 
     and-int/2addr p1, v0
 
@@ -2733,13 +2733,13 @@
     return p2
 
     :cond_3
-    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->lm()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->lk()Z
 
     move-result p1
 
     if-eqz p1, :cond_5
 
-    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adl:I
+    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adh:I
 
     and-int/lit8 p1, p1, 0x2
 
@@ -2751,7 +2751,7 @@
     return p2
 
     :cond_5
-    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adk:I
+    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adg: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;->lm()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->lk()Z
 
     move-result p1
 
@@ -2821,18 +2821,18 @@
 
     if-eqz p1, :cond_0
 
-    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adn:I
+    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adj:I
 
     add-int/2addr v0, p1
 
     :cond_0
-    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adl:I
+    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adh:I
 
     and-int/lit8 p1, p1, 0x4
 
     if-lez p1, :cond_3
 
-    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adn:I
+    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adj:I
 
     goto :goto_0
 
@@ -2843,18 +2843,18 @@
 
     if-eqz p1, :cond_2
 
-    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adm:I
+    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adi:I
 
     add-int/2addr v0, p1
 
     :cond_2
-    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adk:I
+    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adg:I
 
     and-int/lit8 p1, p1, 0x4
 
     if-lez p1, :cond_3
 
-    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adm:I
+    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adi:I
 
     :goto_0
     add-int/2addr v0, p1
@@ -2863,12 +2863,6 @@
     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
 
@@ -2878,46 +2872,46 @@
 
     if-eqz p1, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->lm()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->lk()Z
 
     move-result p1
 
     if-eqz p1, :cond_0
 
-    iget p1, p4, Lcom/google/android/flexbox/b;->acK:I
+    iget p1, p4, Lcom/google/android/flexbox/b;->acG:I
 
-    iget p2, p0, Lcom/google/android/flexbox/FlexboxLayout;->adn:I
+    iget p2, p0, Lcom/google/android/flexbox/FlexboxLayout;->adj:I
 
     add-int/2addr p1, p2
 
-    iput p1, p4, Lcom/google/android/flexbox/b;->acK:I
+    iput p1, p4, Lcom/google/android/flexbox/b;->acG:I
 
-    iget p1, p4, Lcom/google/android/flexbox/b;->acL:I
+    iget p1, p4, Lcom/google/android/flexbox/b;->acH:I
 
-    iget p2, p0, Lcom/google/android/flexbox/FlexboxLayout;->adn:I
+    iget p2, p0, Lcom/google/android/flexbox/FlexboxLayout;->adj:I
 
     add-int/2addr p1, p2
 
-    iput p1, p4, Lcom/google/android/flexbox/b;->acL:I
+    iput p1, p4, Lcom/google/android/flexbox/b;->acH:I
 
     return-void
 
     :cond_0
-    iget p1, p4, Lcom/google/android/flexbox/b;->acK:I
+    iget p1, p4, Lcom/google/android/flexbox/b;->acG:I
 
-    iget p2, p0, Lcom/google/android/flexbox/FlexboxLayout;->adm:I
+    iget p2, p0, Lcom/google/android/flexbox/FlexboxLayout;->adi:I
 
     add-int/2addr p1, p2
 
-    iput p1, p4, Lcom/google/android/flexbox/b;->acK:I
+    iput p1, p4, Lcom/google/android/flexbox/b;->acG:I
 
-    iget p1, p4, Lcom/google/android/flexbox/b;->acL:I
+    iget p1, p4, Lcom/google/android/flexbox/b;->acH:I
 
-    iget p2, p0, Lcom/google/android/flexbox/FlexboxLayout;->adm:I
+    iget p2, p0, Lcom/google/android/flexbox/FlexboxLayout;->adi:I
 
     add-int/2addr p1, p2
 
-    iput p1, p4, Lcom/google/android/flexbox/b;->acL:I
+    iput p1, p4, Lcom/google/android/flexbox/b;->acH:I
 
     :cond_1
     return-void
@@ -2926,58 +2920,58 @@
 .method public final a(Lcom/google/android/flexbox/b;)V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->lm()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->lk()Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adl:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adh:I
 
     and-int/lit8 v0, v0, 0x4
 
     if-lez v0, :cond_1
 
-    iget v0, p1, Lcom/google/android/flexbox/b;->acK:I
+    iget v0, p1, Lcom/google/android/flexbox/b;->acG:I
 
-    iget v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adn:I
+    iget v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adj:I
 
     add-int/2addr v0, v1
 
-    iput v0, p1, Lcom/google/android/flexbox/b;->acK:I
+    iput v0, p1, Lcom/google/android/flexbox/b;->acG:I
 
-    iget v0, p1, Lcom/google/android/flexbox/b;->acL:I
+    iget v0, p1, Lcom/google/android/flexbox/b;->acH:I
 
-    iget v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adn:I
+    iget v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adj:I
 
     add-int/2addr v0, v1
 
-    iput v0, p1, Lcom/google/android/flexbox/b;->acL:I
+    iput v0, p1, Lcom/google/android/flexbox/b;->acH:I
 
     return-void
 
     :cond_0
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adk:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adg:I
 
     and-int/lit8 v0, v0, 0x4
 
     if-lez v0, :cond_1
 
-    iget v0, p1, Lcom/google/android/flexbox/b;->acK:I
+    iget v0, p1, Lcom/google/android/flexbox/b;->acG:I
 
-    iget v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adm:I
+    iget v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adi:I
 
     add-int/2addr v0, v1
 
-    iput v0, p1, Lcom/google/android/flexbox/b;->acK:I
+    iput v0, p1, Lcom/google/android/flexbox/b;->acG:I
 
-    iget v0, p1, Lcom/google/android/flexbox/b;->acL:I
+    iget v0, p1, Lcom/google/android/flexbox/b;->acH:I
 
-    iget v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adm:I
+    iget v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adi:I
 
     add-int/2addr v0, v1
 
-    iput v0, p1, Lcom/google/android/flexbox/b;->acL:I
+    iput v0, p1, Lcom/google/android/flexbox/b;->acH:I
 
     :cond_1
     return-void
@@ -3006,7 +3000,7 @@
 .method public addView(Landroid/view/View;ILandroid/view/ViewGroup$LayoutParams;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adp:Landroid/util/SparseIntArray;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adl:Landroid/util/SparseIntArray;
 
     if-nez v0, :cond_0
 
@@ -3018,24 +3012,30 @@
 
     invoke-direct {v0, v1}, Landroid/util/SparseIntArray;-><init>(I)V
 
-    iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adp:Landroid/util/SparseIntArray;
+    iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adl:Landroid/util/SparseIntArray;
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adq:Lcom/google/android/flexbox/c;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adm:Lcom/google/android/flexbox/c;
 
-    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adp:Landroid/util/SparseIntArray;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adl: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;->ado:[I
+    iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adk:[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;->adh:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adc:I
 
     return v0
 .end method
@@ -3125,7 +3125,7 @@
 .method public getAlignItems()I
     .locals 1
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adg:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adb: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;->adi:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->ade: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;->adj:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adf: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;->adc:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->acY:I
 
     return v0
 .end method
@@ -3177,7 +3177,7 @@
 
     new-instance v0, Ljava/util/ArrayList;
 
-    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->acZ:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->acV: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;->acZ:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->acV: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;->lw()I
+    invoke-virtual {v2}, Lcom/google/android/flexbox/b;->lu()I
 
     move-result v3
 
@@ -3230,7 +3230,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->acZ:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->acV: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;->ade:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->acZ:I
 
     return v0
 .end method
@@ -3246,7 +3246,7 @@
 .method public getJustifyContent()I
     .locals 1
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adf:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->ada:I
 
     return v0
 .end method
@@ -3254,7 +3254,7 @@
 .method public getLargestMainSize()I
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->acZ:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->acV: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;->acK:I
+    iget v2, v2, Lcom/google/android/flexbox/b;->acG: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;->adk:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adg:I
 
     return v0
 .end method
@@ -3298,7 +3298,7 @@
 .method public getShowDividerVertical()I
     .locals 1
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adl:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adh:I
 
     return v0
 .end method
@@ -3306,7 +3306,7 @@
 .method public getSumOfCrossSize()I
     .locals 5
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->acZ:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->acV: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;->acZ:Ljava/util/List;
+    iget-object v3, p0, Lcom/google/android/flexbox/FlexboxLayout;->acV: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;->lm()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->lk()Z
 
     move-result v4
 
     if-eqz v4, :cond_0
 
-    iget v4, p0, Lcom/google/android/flexbox/FlexboxLayout;->adm:I
+    iget v4, p0, Lcom/google/android/flexbox/FlexboxLayout;->adi:I
 
     goto :goto_1
 
     :cond_0
-    iget v4, p0, Lcom/google/android/flexbox/FlexboxLayout;->adn:I
+    iget v4, p0, Lcom/google/android/flexbox/FlexboxLayout;->adj: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;->lm()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->lk()Z
 
     move-result v4
 
     if-eqz v4, :cond_2
 
-    iget v4, p0, Lcom/google/android/flexbox/FlexboxLayout;->adm:I
+    iget v4, p0, Lcom/google/android/flexbox/FlexboxLayout;->adi:I
 
     goto :goto_2
 
     :cond_2
-    iget v4, p0, Lcom/google/android/flexbox/FlexboxLayout;->adn:I
+    iget v4, p0, Lcom/google/android/flexbox/FlexboxLayout;->adj:I
 
     :goto_2
     add-int/2addr v2, v4
 
     :cond_3
-    iget v3, v3, Lcom/google/android/flexbox/b;->acM:I
+    iget v3, v3, Lcom/google/android/flexbox/b;->acI:I
 
     add-int/2addr v2, v3
 
@@ -3393,10 +3393,10 @@
     return p1
 .end method
 
-.method public final lm()Z
+.method public final lk()Z
     .locals 2
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adc:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->acY: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;->adj:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adf:Landroid/graphics/drawable/Drawable;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adi:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->ade:Landroid/graphics/drawable/Drawable;
 
     if-nez v0, :cond_0
 
     return-void
 
     :cond_0
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adk:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adg:I
 
     if-nez v0, :cond_1
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adl:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adh:I
 
     if-nez v0, :cond_1
 
@@ -3445,7 +3445,7 @@
 
     move-result v0
 
-    iget v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adc:I
+    iget v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->acY:I
 
     const/4 v2, 0x2
 
@@ -3471,7 +3471,7 @@
     const/4 v3, 0x1
 
     :cond_3
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->ade:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->acZ: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;->ade:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->acZ: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;->ade:I
+    iget v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->acZ: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;->ade:I
+    iget v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->acZ:I
 
     if-ne v1, v2, :cond_d
 
@@ -3555,7 +3555,7 @@
 
     move-result v0
 
-    iget v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adc:I
+    iget v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->acY:I
 
     const/4 v2, 0x0
 
@@ -3578,7 +3578,7 @@
     const/4 v2, 0x1
 
     :cond_0
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->ade:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->acZ: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;->adc:I
+    iget v2, p0, Lcom/google/android/flexbox/FlexboxLayout;->acY: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;->ade:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->acZ: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;->adp:Landroid/util/SparseIntArray;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adl: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;->adp:Landroid/util/SparseIntArray;
+    iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adl:Landroid/util/SparseIntArray;
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adq:Lcom/google/android/flexbox/c;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adm:Lcom/google/android/flexbox/c;
 
-    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adp:Landroid/util/SparseIntArray;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adl: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;->adq:Lcom/google/android/flexbox/c;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adm:Lcom/google/android/flexbox/c;
 
-    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adp:Landroid/util/SparseIntArray;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adl: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;->ado:[I
+    iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adk:[I
 
     :cond_1
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adc:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->acY: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;->adc:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->acY: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;->acZ:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->acV:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->clear()V
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adr:Lcom/google/android/flexbox/c$a;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adn: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;->adq:Lcom/google/android/flexbox/c;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adm:Lcom/google/android/flexbox/c;
 
-    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adr:Lcom/google/android/flexbox/c$a;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adn: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;->adr:Lcom/google/android/flexbox/c$a;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adn:Lcom/google/android/flexbox/c$a;
 
-    iget-object v0, v0, Lcom/google/android/flexbox/c$a;->acZ:Ljava/util/List;
+    iget-object v0, v0, Lcom/google/android/flexbox/c$a;->acV:Ljava/util/List;
 
-    iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->acZ:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->acV:Ljava/util/List;
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adq:Lcom/google/android/flexbox/c;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adm: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;->adq:Lcom/google/android/flexbox/c;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adm: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;->adq:Lcom/google/android/flexbox/c;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adm:Lcom/google/android/flexbox/c;
 
-    invoke-virtual {v0}, Lcom/google/android/flexbox/c;->lx()V
+    invoke-virtual {v0}, Lcom/google/android/flexbox/c;->lv()V
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adc:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->acY:I
 
-    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adr:Lcom/google/android/flexbox/c$a;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adn:Lcom/google/android/flexbox/c$a;
 
-    iget v1, v1, Lcom/google/android/flexbox/c$a;->ada:I
+    iget v1, v1, Lcom/google/android/flexbox/c$a;->acW: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;->adh: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;->adh:I
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adc: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;->adg:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adb:I
 
     if-eq v0, p1, :cond_0
 
-    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adg:I
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adb: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;->adi:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->ade:Landroid/graphics/drawable/Drawable;
 
     if-ne p1, v0, :cond_0
 
     return-void
 
     :cond_0
-    iput-object p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adi:Landroid/graphics/drawable/Drawable;
+    iput-object p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->ade:Landroid/graphics/drawable/Drawable;
 
     if-eqz p1, :cond_1
 
@@ -3914,17 +3914,17 @@
 
     move-result p1
 
-    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adm:I
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adi:I
 
     goto :goto_0
 
     :cond_1
     const/4 p1, 0x0
 
-    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adm:I
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adi:I
 
     :goto_0
-    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayout;->ly()V
+    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayout;->lw()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;->adj:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adf:Landroid/graphics/drawable/Drawable;
 
     if-ne p1, v0, :cond_0
 
     return-void
 
     :cond_0
-    iput-object p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adj:Landroid/graphics/drawable/Drawable;
+    iput-object p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adf:Landroid/graphics/drawable/Drawable;
 
     if-eqz p1, :cond_1
 
@@ -3949,17 +3949,17 @@
 
     move-result p1
 
-    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adn:I
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adj:I
 
     goto :goto_0
 
     :cond_1
     const/4 p1, 0x0
 
-    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adn:I
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adj:I
 
     :goto_0
-    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayout;->ly()V
+    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayout;->lw()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;->adc:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->acY:I
 
     if-eq v0, p1, :cond_0
 
-    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adc:I
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->acY: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;->acZ:Ljava/util/List;
+    iput-object p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->acV: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;->ade:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->acZ:I
 
     if-eq v0, p1, :cond_0
 
-    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->ade:I
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->acZ: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;->adf:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->ada:I
 
     if-eq v0, p1, :cond_0
 
-    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adf:I
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->ada: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;->adk:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adg:I
 
     if-eq p1, v0, :cond_0
 
-    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adk:I
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adg: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;->adl:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adh:I
 
     if-eq p1, v0, :cond_0
 
-    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adl:I
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adh: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 a91c2690e9..2202548b03 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 adt:F
+.field private adp:F
 
-.field private adu:F
+.field private adq:F
 
-.field private adv:I
+.field private adr:I
 
-.field private adw:F
+.field private ads:F
 
-.field private adx:Z
+.field private adt:Z
 
 .field private mMaxHeight:I
 
@@ -71,19 +71,19 @@
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adt:F
+    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adp:F
 
     const/high16 v0, 0x3f800000    # 1.0f
 
-    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adu:F
+    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adq:F
 
     const/4 v0, -0x1
 
-    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adv:I
+    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adr:I
 
     const/high16 v0, -0x40800000    # -1.0f
 
-    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adw:F
+    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->ads:F
 
     const v0, 0xffffff
 
@@ -101,19 +101,19 @@
 
     const/4 p1, 0x0
 
-    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adt:F
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adp:F
 
     const/high16 p1, 0x3f800000    # 1.0f
 
-    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adu:F
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adq:F
 
     const/4 p1, -0x1
 
-    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adv:I
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adr:I
 
     const/high16 p1, -0x40800000    # -1.0f
 
-    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adw:F
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->ads:F
 
     const p1, 0xffffff
 
@@ -133,19 +133,19 @@
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adt:F
+    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adp:F
 
     const/high16 v0, 0x3f800000    # 1.0f
 
-    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adu:F
+    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adq:F
 
     const/4 v0, -0x1
 
-    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adv:I
+    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adr:I
 
     const/high16 v0, -0x40800000    # -1.0f
 
-    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adw:F
+    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->ads:F
 
     const v0, 0xffffff
 
@@ -157,25 +157,25 @@
 
     move-result v0
 
-    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adt:F
+    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adp:F
 
     invoke-virtual {p1}, Landroid/os/Parcel;->readFloat()F
 
     move-result v0
 
-    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adu:F
+    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adq:F
 
     invoke-virtual {p1}, Landroid/os/Parcel;->readInt()I
 
     move-result v0
 
-    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adv:I
+    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adr:I
 
     invoke-virtual {p1}, Landroid/os/Parcel;->readFloat()F
 
     move-result v0
 
-    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adw:F
+    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->ads: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;->adx:Z
+    iput-boolean v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adt:Z
 
     invoke-virtual {p1}, Landroid/os/Parcel;->readInt()I
 
@@ -322,47 +322,47 @@
     return v0
 .end method
 
-.method public final ln()F
+.method public final ll()F
     .locals 1
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adt:F
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adp:F
 
     return v0
 .end method
 
-.method public final lo()F
+.method public final lm()F
     .locals 1
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adu:F
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adq:F
 
     return v0
 .end method
 
-.method public final lp()I
+.method public final ln()I
     .locals 1
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adv:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adr:I
 
     return v0
 .end method
 
-.method public final lq()Z
+.method public final lo()Z
     .locals 1
 
-    iget-boolean v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adx:Z
+    iget-boolean v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adt:Z
 
     return v0
 .end method
 
-.method public final lr()F
+.method public final lp()F
     .locals 1
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adw:F
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->ads:F
 
     return v0
 .end method
 
-.method public final ls()I
+.method public final lq()I
     .locals 1
 
     iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->leftMargin:I
@@ -370,7 +370,7 @@
     return v0
 .end method
 
-.method public final lt()I
+.method public final lr()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 lu()I
+.method public final ls()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 lv()I
+.method public final lt()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;->adt:F
+    iget p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adp:F
 
     invoke-virtual {p1, p2}, Landroid/os/Parcel;->writeFloat(F)V
 
-    iget p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adu:F
+    iget p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adq:F
 
     invoke-virtual {p1, p2}, Landroid/os/Parcel;->writeFloat(F)V
 
-    iget p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adv:I
+    iget p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adr:I
 
     invoke-virtual {p1, p2}, Landroid/os/Parcel;->writeInt(I)V
 
-    iget p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adw:F
+    iget p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->ads: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;->adx:Z
+    iget-boolean p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adt: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 6b1d1d4f89..1ab5056fdc 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 adJ:I
+.field private adF:I
 
-.field private adK:I
+.field private adG:I
 
-.field private adL:Z
+.field private adH:Z
 
-.field final synthetic adM:Lcom/google/android/flexbox/FlexboxLayoutManager;
+.field final synthetic adI: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;->adM:Lcom/google/android/flexbox/FlexboxLayoutManager;
+    iput-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adI: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;->adK:I
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adG: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;->adJ:I
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adF: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;->adM:Lcom/google/android/flexbox/FlexboxLayoutManager;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adI:Lcom/google/android/flexbox/FlexboxLayoutManager;
 
-    invoke-virtual {v0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lm()Z
+    invoke-virtual {v0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lk()Z
 
     move-result v0
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adM:Lcom/google/android/flexbox/FlexboxLayoutManager;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adI: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;->adM:Lcom/google/android/flexbox/FlexboxLayoutManager;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adI: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;->adM:Lcom/google/android/flexbox/FlexboxLayoutManager;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adI: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;->adM:Lcom/google/android/flexbox/FlexboxLayoutManager;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adI: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;->adM:Lcom/google/android/flexbox/FlexboxLayoutManager;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adI: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;->adM:Lcom/google/android/flexbox/FlexboxLayoutManager;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adI: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;->adM:Lcom/google/android/flexbox/FlexboxLayoutManager;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adI: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;->adM:Lcom/google/android/flexbox/FlexboxLayoutManager;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adI: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;->adL:Z
+    iput-boolean p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adH:Z
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adM:Lcom/google/android/flexbox/FlexboxLayoutManager;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adI: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;->acW:[I
+    iget-object v0, v0, Lcom/google/android/flexbox/c;->acS:[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;->adJ:I
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adF:I
 
-    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adM:Lcom/google/android/flexbox/FlexboxLayoutManager;
+    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adI: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;->adJ:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adF:I
 
     if-le p1, v0, :cond_4
 
-    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adM:Lcom/google/android/flexbox/FlexboxLayoutManager;
+    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adI: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;->adJ:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adF: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;->acT:I
+    iget p1, p1, Lcom/google/android/flexbox/b;->acP: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;->adJ:I
+    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adF: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;->adL:Z
+    iput-boolean v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adH:Z
 
-    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adM:Lcom/google/android/flexbox/FlexboxLayoutManager;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adI:Lcom/google/android/flexbox/FlexboxLayoutManager;
 
-    invoke-virtual {v1}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lm()Z
+    invoke-virtual {v1}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lk()Z
 
     move-result v1
 
@@ -308,7 +308,7 @@
 
     if-eqz v1, :cond_3
 
-    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adM:Lcom/google/android/flexbox/FlexboxLayoutManager;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adI: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;->adM:Lcom/google/android/flexbox/FlexboxLayoutManager;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adI: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;->adM:Lcom/google/android/flexbox/FlexboxLayoutManager;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adI: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;->adM:Lcom/google/android/flexbox/FlexboxLayoutManager;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adI: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;->adM:Lcom/google/android/flexbox/FlexboxLayoutManager;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adI: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;->adM:Lcom/google/android/flexbox/FlexboxLayoutManager;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adI: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;->adK:I
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adG: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;->adJ:I
+    iget p0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adF: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;->adM:Lcom/google/android/flexbox/FlexboxLayoutManager;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adI:Lcom/google/android/flexbox/FlexboxLayoutManager;
 
-    invoke-virtual {v0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lm()Z
+    invoke-virtual {v0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lk()Z
 
     move-result v0
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adM:Lcom/google/android/flexbox/FlexboxLayoutManager;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adI: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;->adM:Lcom/google/android/flexbox/FlexboxLayoutManager;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adI: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;->adM:Lcom/google/android/flexbox/FlexboxLayoutManager;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adI: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;->adM:Lcom/google/android/flexbox/FlexboxLayoutManager;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adI: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;->adM:Lcom/google/android/flexbox/FlexboxLayoutManager;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adI: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;->adM:Lcom/google/android/flexbox/FlexboxLayoutManager;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adI: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;->adL:Z
+    iput-boolean v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adH: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;->adK:I
+    iget p0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adG: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;->adJ:I
+    iget v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adF: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;->adK:I
+    iget v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adG: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;->adL:Z
+    iget-boolean v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adH: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 976c24f33e..220ad40981 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 adJ:I
+.field adF:I
 
-.field adN:Z
+.field adJ: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;->adJ:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->adF:I
 
     add-int/lit8 v1, v0, 0x1
 
-    iput v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->adJ:I
+    iput v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->adF: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;->adJ:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->adF:I
 
     add-int/lit8 v1, v0, -0x1
 
-    iput v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->adJ:I
+    iput v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->adF: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;->adJ:I
+    iget v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->adF: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 41e5f6eef0..a487f809f4 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 ady:Landroid/graphics/Rect;
+.field private static final adu:Landroid/graphics/Rect;
 
 
 # instance fields
-.field private acZ:Ljava/util/List;
+.field private acV:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -35,19 +35,15 @@
     .end annotation
 .end field
 
-.field private adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+.field private acY:I
 
-.field private adB:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+.field private acZ:I
 
-.field private adC:Landroidx/recyclerview/widget/OrientationHelper;
+.field private adA:I
 
-.field private adD:Lcom/google/android/flexbox/FlexboxLayoutManager$SavedState;
+.field private adB:I
 
-.field private adE:I
-
-.field private adF:I
-
-.field private adG:Landroid/util/SparseArray;
+.field private adC:Landroid/util/SparseArray;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Landroid/util/SparseArray<",
@@ -57,23 +53,27 @@
     .end annotation
 .end field
 
-.field private adH:Landroid/view/View;
+.field private adD:Landroid/view/View;
 
-.field private adI:I
+.field private adE:I
 
-.field private adc:I
+.field private ada:I
 
-.field private ade:I
+.field private adb:I
 
-.field private adf:I
+.field private final adm:Lcom/google/android/flexbox/c;
 
-.field private adg:I
+.field private adn:Lcom/google/android/flexbox/c$a;
 
-.field private final adq:Lcom/google/android/flexbox/c;
+.field private adv:Z
 
-.field private adr:Lcom/google/android/flexbox/c$a;
+.field private adw:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
-.field private adz:Z
+.field private adx:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+
+.field private ady:Landroidx/recyclerview/widget/OrientationHelper;
+
+.field private adz:Lcom/google/android/flexbox/FlexboxLayoutManager$SavedState;
 
 .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;->ady:Landroid/graphics/Rect;
+    sput-object v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adu: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;->acZ:Ljava/util/List;
+    iput-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acV: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;->adq:Lcom/google/android/flexbox/c;
+    iput-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adm: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;->adB:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iput-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adx: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;->adE:I
+    iput v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA:I
 
-    iput v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adF:I
+    iput v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adB:I
 
     new-instance v1, Landroid/util/SparseArray;
 
     invoke-direct {v1}, Landroid/util/SparseArray;-><init>()V
 
-    iput-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adG:Landroid/util/SparseArray;
+    iput-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adC:Landroid/util/SparseArray;
 
-    iput p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adI:I
+    iput p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adE: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;->adr:Lcom/google/android/flexbox/c$a;
+    iput-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adn: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;->lz()V
+    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lx()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;->acZ:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acV: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;->adq:Lcom/google/android/flexbox/c;
+    iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adm: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;->adB:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adx: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;->adE:I
+    iput v2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA:I
 
-    iput v2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adF:I
+    iput v2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adB:I
 
     new-instance v2, Landroid/util/SparseArray;
 
     invoke-direct {v2}, Landroid/util/SparseArray;-><init>()V
 
-    iput-object v2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adG:Landroid/util/SparseArray;
+    iput-object v2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adC:Landroid/util/SparseArray;
 
-    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adI:I
+    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adE: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;->adr:Lcom/google/android/flexbox/c$a;
+    iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adn: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;->lz()V
+    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lx()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;->lB()V
+    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lz()V
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adw:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
     const/4 v2, 0x1
 
-    iput-boolean v2, v0, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->adN:Z
+    iput-boolean v2, v0, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->adJ:Z
 
-    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lm()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lk()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;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v4, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adw: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;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v5, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adw: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;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adw: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;->lm()Z
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lk()Z
 
     move-result v6
 
@@ -448,7 +448,7 @@
     :goto_0
     if-gtz v5, :cond_3
 
-    iget-object v9, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v9, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adw: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;->acZ:Ljava/util/List;
+    iget-object v9, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acV: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;->adJ:I
+    iget v10, v2, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->adF:I
 
     if-ltz v10, :cond_4
 
-    iget v10, v2, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->adJ:I
+    iget v10, v2, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->adF: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;->acZ:Ljava/util/List;
+    iget-object v9, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acV:Ljava/util/List;
 
-    iget v10, v2, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->adJ:I
+    iget v10, v2, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->adF: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;->acT:I
+    iget v10, v9, Lcom/google/android/flexbox/b;->acP:I
 
     iput v10, v2, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mPosition:I
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lm()Z
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lk()Z
 
     move-result v10
 
@@ -541,7 +541,7 @@
 
     if-ne v15, v7, :cond_5
 
-    iget v7, v9, Lcom/google/android/flexbox/b;->acM:I
+    iget v7, v9, Lcom/google/android/flexbox/b;->acI: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;->adf:I
+    iget v14, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->ada:I
 
     if-eqz v14, :cond_c
 
@@ -574,7 +574,7 @@
 
     if-eqz v4, :cond_6
 
-    iget v4, v9, Lcom/google/android/flexbox/b;->acK:I
+    iget v4, v9, Lcom/google/android/flexbox/b;->acG: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;->adf:I
+    iget v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->ada: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;->acK:I
+    iget v14, v9, Lcom/google/android/flexbox/b;->acG: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;->acK:I
+    iget v10, v9, Lcom/google/android/flexbox/b;->acG:I
 
     sub-int v10, v13, v10
 
@@ -677,7 +677,7 @@
 
     int-to-float v4, v4
 
-    iget v12, v9, Lcom/google/android/flexbox/b;->acK:I
+    iget v12, v9, Lcom/google/android/flexbox/b;->acG:I
 
     sub-int/2addr v13, v12
 
@@ -690,7 +690,7 @@
     goto :goto_5
 
     :cond_b
-    iget v4, v9, Lcom/google/android/flexbox/b;->acK:I
+    iget v4, v9, Lcom/google/android/flexbox/b;->acG:I
 
     sub-int/2addr v13, v4
 
@@ -698,7 +698,7 @@
 
     int-to-float v4, v13
 
-    iget v12, v9, Lcom/google/android/flexbox/b;->acK:I
+    iget v12, v9, Lcom/google/android/flexbox/b;->acG: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;->adB:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v13, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adx: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;->adB:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v13, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adx: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;->ady:Landroid/graphics/Rect;
+    sget-object v14, Lcom/google/android/flexbox/FlexboxLayoutManager;->adu: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;->ady:Landroid/graphics/Rect;
+    sget-object v14, Lcom/google/android/flexbox/FlexboxLayoutManager;->adu: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;->adq:Lcom/google/android/flexbox/c;
+    iget-object v12, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adm:Lcom/google/android/flexbox/c;
 
-    iget-object v12, v12, Lcom/google/android/flexbox/c;->acX:[J
+    iget-object v12, v12, Lcom/google/android/flexbox/c;->acT:[J
 
     aget-wide v21, v12, v10
 
@@ -861,7 +861,7 @@
 
     if-eqz v12, :cond_f
 
-    iget-object v12, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adq:Lcom/google/android/flexbox/c;
+    iget-object v12, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adm: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;->adq:Lcom/google/android/flexbox/c;
+    iget-object v12, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adm: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;->adJ:I
+    iget v3, v2, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->adF:I
 
-    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adw: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;->adJ:I
+    iput v3, v2, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->adF:I
 
-    iget v3, v9, Lcom/google/android/flexbox/b;->acM:I
+    iget v3, v9, Lcom/google/android/flexbox/b;->acI: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;->acM:I
+    iget v4, v9, Lcom/google/android/flexbox/b;->acI: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;->acM:I
+    iget v4, v9, Lcom/google/android/flexbox/b;->acI: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;->acM:I
+    iget v3, v9, Lcom/google/android/flexbox/b;->acI: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;->ade:I
+    iget p0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acZ:I
 
     return p0
 .end method
@@ -1153,11 +1153,11 @@
 
     if-ne v6, v7, :cond_0
 
-    iget v6, v9, Lcom/google/android/flexbox/b;->acM:I
+    iget v6, v9, Lcom/google/android/flexbox/b;->acI:I
 
     sub-int/2addr v4, v6
 
-    iget v6, v9, Lcom/google/android/flexbox/b;->acM:I
+    iget v6, v9, Lcom/google/android/flexbox/b;->acI: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;->adf:I
+    iget v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->ada:I
 
     const/4 v5, 0x0
 
@@ -1196,7 +1196,7 @@
 
     if-eqz v4, :cond_1
 
-    iget v4, v9, Lcom/google/android/flexbox/b;->acK:I
+    iget v4, v9, Lcom/google/android/flexbox/b;->acG: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;->adf:I
+    iget v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->ada: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;->acK:I
+    iget v6, v9, Lcom/google/android/flexbox/b;->acG: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;->acK:I
+    iget v4, v9, Lcom/google/android/flexbox/b;->acG:I
 
     sub-int v4, v3, v4
 
@@ -1299,7 +1299,7 @@
 
     int-to-float v2, v2
 
-    iget v4, v9, Lcom/google/android/flexbox/b;->acK:I
+    iget v4, v9, Lcom/google/android/flexbox/b;->acG:I
 
     sub-int/2addr v3, v4
 
@@ -1312,7 +1312,7 @@
     goto :goto_2
 
     :cond_6
-    iget v4, v9, Lcom/google/android/flexbox/b;->acK:I
+    iget v4, v9, Lcom/google/android/flexbox/b;->acG:I
 
     sub-int/2addr v3, v4
 
@@ -1320,7 +1320,7 @@
 
     int-to-float v2, v3
 
-    iget v3, v9, Lcom/google/android/flexbox/b;->acK:I
+    iget v3, v9, Lcom/google/android/flexbox/b;->acG: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;->adB:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adx: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;->adB:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adx: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;->adq:Lcom/google/android/flexbox/c;
+    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adm:Lcom/google/android/flexbox/c;
 
-    iget-object v4, v4, Lcom/google/android/flexbox/c;->acX:[J
+    iget-object v4, v4, Lcom/google/android/flexbox/c;->acT:[J
 
     aget-wide v16, v4, v7
 
@@ -1449,7 +1449,7 @@
 
     if-ne v1, v5, :cond_9
 
-    sget-object v1, Lcom/google/android/flexbox/FlexboxLayoutManager;->ady:Landroid/graphics/Rect;
+    sget-object v1, Lcom/google/android/flexbox/FlexboxLayoutManager;->adu: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;->ady:Landroid/graphics/Rect;
+    sget-object v1, Lcom/google/android/flexbox/FlexboxLayoutManager;->adu: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;->adz:Z
+    iget-boolean v1, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adv:Z
 
     if-eqz v1, :cond_a
 
-    iget-object v1, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adq:Lcom/google/android/flexbox/c;
+    iget-object v1, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adm: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;->adq:Lcom/google/android/flexbox/c;
+    iget-object v1, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adm: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;->adz:Z
+    iget-boolean v1, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adv:Z
 
     if-eqz v1, :cond_c
 
-    iget-object v1, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adq:Lcom/google/android/flexbox/c;
+    iget-object v1, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adm: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;->adq:Lcom/google/android/flexbox/c;
+    iget-object v1, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adm: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;->adJ:I
+    iget v1, v10, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->adF:I
 
-    iget-object v2, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v2, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adw: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;->adJ:I
+    iput v1, v10, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->adF:I
 
-    iget v1, v9, Lcom/google/android/flexbox/b;->acM:I
+    iget v1, v9, Lcom/google/android/flexbox/b;->acI: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;->lm()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lk()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;->adN:Z
+    iget-boolean v0, p2, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->adJ:Z
 
     if-nez v0, :cond_0
 
@@ -1843,19 +1843,19 @@
 
     if-eqz p3, :cond_0
 
-    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lA()V
+    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->ly()V
 
     goto :goto_0
 
     :cond_0
-    iget-object p3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object p3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adw: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;->lm()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lk()Z
 
     move-result p3
 
@@ -1865,7 +1865,7 @@
 
     if-eqz p3, :cond_1
 
-    iget-object p3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object p3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adw: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;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object p3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adw: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;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object p3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adw: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;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object p3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adw: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;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object p3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adw: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;->adJ:I
+    iput v1, p3, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->adF:I
 
     if-eqz p2, :cond_2
 
-    iget-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acZ:Ljava/util/List;
+    iget-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acV: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;->acZ:Ljava/util/List;
+    iget-object p3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acV: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;->acZ:Ljava/util/List;
+    iget-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acV: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;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adw: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;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adw: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;->adq:Lcom/google/android/flexbox/c;
+    iget-object v3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adm: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;->adq:Lcom/google/android/flexbox/c;
+    iget-object v3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adm: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;->adq:Lcom/google/android/flexbox/c;
+    iget-object v3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adm: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;->adq:Lcom/google/android/flexbox/c;
+    iget-object v2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adm:Lcom/google/android/flexbox/c;
 
-    iget-object v2, v2, Lcom/google/android/flexbox/c;->acW:[I
+    iget-object v2, v2, Lcom/google/android/flexbox/c;->acS:[I
 
     array-length v2, v2
 
@@ -2036,7 +2036,7 @@
     return-void
 
     :cond_1
-    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adI:I
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adE: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;->lm()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lk()Z
 
     move-result p1
 
@@ -2134,9 +2134,9 @@
 
     move-result v1
 
-    iget-object v2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adq:Lcom/google/android/flexbox/c;
+    iget-object v2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adm:Lcom/google/android/flexbox/c;
 
-    iget-object v2, v2, Lcom/google/android/flexbox/c;->acW:[I
+    iget-object v2, v2, Lcom/google/android/flexbox/c;->acS:[I
 
     aget v1, v2, v1
 
@@ -2147,7 +2147,7 @@
     return-object v0
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acZ:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acV: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;->adq:Lcom/google/android/flexbox/c;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adm:Lcom/google/android/flexbox/c;
 
-    iget-object v1, v1, Lcom/google/android/flexbox/c;->acW:[I
+    iget-object v1, v1, Lcom/google/android/flexbox/c;->acS:[I
 
     aget v0, v1, v0
 
-    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acZ:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acV: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;->lB()V
+    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lz()V
 
-    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lm()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lk()Z
 
     move-result v0
 
-    iget-object v2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adH:Landroid/view/View;
+    iget-object v2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adD: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;->adB:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adx: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;->adB:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adx: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;->adB:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adx: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;->adB:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adx: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;->adB:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adx: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;->adB:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adx: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;->adc:I
+    iget p0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acY: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;->lm()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lk()Z
 
     move-result v0
 
@@ -2490,9 +2490,9 @@
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adq:Lcom/google/android/flexbox/c;
+    iget-object v3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adm:Lcom/google/android/flexbox/c;
 
-    iget-object v3, v3, Lcom/google/android/flexbox/c;->acW:[I
+    iget-object v3, v3, Lcom/google/android/flexbox/c;->acS:[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;->acZ:Ljava/util/List;
+    iget-object v4, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acV: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;->acZ:Ljava/util/List;
+    iget-object v4, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acV: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;->acZ:Ljava/util/List;
+    iget-object v4, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acV: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;->lA()V
+    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->ly()V
 
     goto :goto_0
 
     :cond_0
-    iget-object p3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object p3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adw: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;->lm()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lk()Z
 
     move-result p3
 
@@ -2609,9 +2609,9 @@
 
     if-eqz p3, :cond_1
 
-    iget-object p3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object p3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adw:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adH:Landroid/view/View;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adD: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;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object p3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adw: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;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object p3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adw: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;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object p3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adw: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;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object p3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adw: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;->adJ:I
+    iput v0, p3, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->adF:I
 
     if-eqz p2, :cond_2
 
@@ -2697,7 +2697,7 @@
 
     if-lez p2, :cond_2
 
-    iget-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acZ:Ljava/util/List;
+    iget-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acV: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;->acZ:Ljava/util/List;
+    iget-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acV: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;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adw: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;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adw: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;->lm()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lk()Z
 
     move-result v0
 
@@ -2821,9 +2821,9 @@
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adq:Lcom/google/android/flexbox/c;
+    iget-object v3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adm:Lcom/google/android/flexbox/c;
 
-    iget-object v3, v3, Lcom/google/android/flexbox/c;->acW:[I
+    iget-object v3, v3, Lcom/google/android/flexbox/c;->acS:[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;->acZ:Ljava/util/List;
+    iget-object v3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acV: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;->acT:I
+    iget v6, v3, Lcom/google/android/flexbox/b;->acP: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;->acZ:Ljava/util/List;
+    iget-object v3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acV: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;->lm()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lk()Z
 
     move-result v0
 
@@ -3115,7 +3115,7 @@
 
     move-result v0
 
-    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lB()V
+    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lz()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;->adq:Lcom/google/android/flexbox/c;
+    iget-object v4, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adm:Lcom/google/android/flexbox/c;
 
-    iget-object v4, v4, Lcom/google/android/flexbox/c;->acW:[I
+    iget-object v4, v4, Lcom/google/android/flexbox/c;->acS:[I
 
     aget p1, v4, p1
 
@@ -3249,9 +3249,9 @@
     goto :goto_0
 
     :cond_2
-    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adq:Lcom/google/android/flexbox/c;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adm:Lcom/google/android/flexbox/c;
 
-    iget-object v1, v1, Lcom/google/android/flexbox/c;->acW:[I
+    iget-object v1, v1, Lcom/google/android/flexbox/c;->acS:[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;->adq:Lcom/google/android/flexbox/c;
+    iget-object p0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adm: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;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adw: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;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adw: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;->acZ:Ljava/util/List;
+    iget-object p0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acV: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;->lm()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lk()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;->lm()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lk()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;->lB()V
+    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lz()V
 
     invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->ensureLayoutState()V
 
@@ -3827,9 +3827,50 @@
 .end method
 
 .method private lA()V
+    .locals 2
+
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acV:Ljava/util/List;
+
+    invoke-interface {v0}, Ljava/util/List;->clear()V
+
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adx: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;->adx: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
+
+.method private lx()V
+    .locals 2
+
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adb: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;->lA()V
+
+    iput v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adb:I
+
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->requestLayout()V
+
+    :cond_0
+    return-void
+.end method
+
+.method private ly()V
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lm()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lk()Z
 
     move-result v0
 
@@ -3847,7 +3888,7 @@
     move-result v0
 
     :goto_0
-    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adw:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
     if-eqz v0, :cond_2
 
@@ -3872,7 +3913,7 @@
     return-void
 .end method
 
-.method private lB()V
+.method private lz()V
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->mOrientationHelper:Landroidx/recyclerview/widget/OrientationHelper;
@@ -3882,13 +3923,13 @@
     return-void
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lm()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lk()Z
 
     move-result v0
 
     if-eqz v0, :cond_1
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->ade:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acZ:I
 
     if-eqz v0, :cond_2
 
@@ -3902,12 +3943,12 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adC:Landroidx/recyclerview/widget/OrientationHelper;
+    iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->ady:Landroidx/recyclerview/widget/OrientationHelper;
 
     return-void
 
     :cond_1
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->ade:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acZ:I
 
     if-nez v0, :cond_2
 
@@ -3921,7 +3962,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adC:Landroidx/recyclerview/widget/OrientationHelper;
+    iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->ady:Landroidx/recyclerview/widget/OrientationHelper;
 
     return-void
 
@@ -3936,52 +3977,11 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adC:Landroidx/recyclerview/widget/OrientationHelper;
+    iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->ady: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
-
-.method private lz()V
-    .locals 2
-
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adg: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;->lC()V
-
-    iput v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adg:I
-
-    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->requestLayout()V
-
-    :cond_0
-    return-void
-.end method
-
 .method private recycleChildren(Landroidx/recyclerview/widget/RecyclerView$Recycler;II)V
     .locals 0
 
@@ -4001,21 +4001,21 @@
 .method private setFlexDirection(I)V
     .locals 1
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adc:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acY: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;->adc:I
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acY: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;->adC:Landroidx/recyclerview/widget/OrientationHelper;
+    iput-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->ady:Landroidx/recyclerview/widget/OrientationHelper;
 
-    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lC()V
+    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lA()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;->ade:I
+    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acZ: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;->lC()V
+    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lA()V
 
     :cond_0
-    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->ade:I
+    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acZ: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;->adC:Landroidx/recyclerview/widget/OrientationHelper;
+    iput-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->ady: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;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adw: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;->lm()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lk()Z
 
     move-result v0
 
@@ -4173,7 +4173,7 @@
 
     move-result-object p1
 
-    iget-object v7, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v7, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adw: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;->adq:Lcom/google/android/flexbox/c;
+    iget-object v8, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adm:Lcom/google/android/flexbox/c;
 
-    iget-object v8, v8, Lcom/google/android/flexbox/c;->acW:[I
+    iget-object v8, v8, Lcom/google/android/flexbox/c;->acS:[I
 
     aget v8, v8, v7
 
-    iget-object v9, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acZ:Ljava/util/List;
+    iget-object v9, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acV: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;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v8, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adw: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;->adq:Lcom/google/android/flexbox/c;
+    iget-object v7, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adm:Lcom/google/android/flexbox/c;
 
-    iget-object v7, v7, Lcom/google/android/flexbox/c;->acW:[I
+    iget-object v7, v7, Lcom/google/android/flexbox/c;->acS:[I
 
     array-length v7, v7
 
-    iget-object v8, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v8, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adw: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;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v7, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adw:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
-    iput v6, v7, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->adJ:I
+    iput v6, v7, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->adF:I
 
     goto :goto_1
 
     :cond_1
-    iget-object v7, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v7, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adw:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
-    iget-object v8, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adq:Lcom/google/android/flexbox/c;
+    iget-object v8, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adm:Lcom/google/android/flexbox/c;
 
-    iget-object v8, v8, Lcom/google/android/flexbox/c;->acW:[I
+    iget-object v8, v8, Lcom/google/android/flexbox/c;->acS:[I
 
-    iget-object v9, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v9, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adw: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;->adJ:I
+    iput v8, v7, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->adF:I
 
     :goto_1
     if-eqz v5, :cond_3
 
-    iget-object v5, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v5, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adw: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;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v5, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adw: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;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adw: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;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adw: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;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adw: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;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adw: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;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adw:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
-    iget p1, p1, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->adJ:I
+    iget p1, p1, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->adF:I
 
     if-eq p1, v6, :cond_4
 
-    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adw:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
-    iget p1, p1, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->adJ:I
+    iget p1, p1, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->adF:I
 
-    iget-object v3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acZ:Ljava/util/List;
+    iget-object v3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acV: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;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adw: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;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adw: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;->adr:Lcom/google/android/flexbox/c$a;
+    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adn: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;->adq:Lcom/google/android/flexbox/c;
+    iget-object v3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adm:Lcom/google/android/flexbox/c;
 
-    iget-object v4, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adr:Lcom/google/android/flexbox/c$a;
+    iget-object v4, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adn:Lcom/google/android/flexbox/c$a;
 
-    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adw: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;->acZ:Ljava/util/List;
+    iget-object v9, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acV:Ljava/util/List;
 
     move v5, v1
 
@@ -4390,15 +4390,15 @@
     goto :goto_3
 
     :cond_5
-    iget-object v3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adq:Lcom/google/android/flexbox/c;
+    iget-object v3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adm:Lcom/google/android/flexbox/c;
 
-    iget-object v4, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adr:Lcom/google/android/flexbox/c$a;
+    iget-object v4, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adn:Lcom/google/android/flexbox/c$a;
 
-    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adw: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;->acZ:Ljava/util/List;
+    iget-object v9, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acV: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;->adq:Lcom/google/android/flexbox/c;
+    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adm:Lcom/google/android/flexbox/c;
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adw: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;->adq:Lcom/google/android/flexbox/c;
+    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adm:Lcom/google/android/flexbox/c;
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adw: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;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adw: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;->adq:Lcom/google/android/flexbox/c;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adm:Lcom/google/android/flexbox/c;
 
-    iget-object v1, v1, Lcom/google/android/flexbox/c;->acW:[I
+    iget-object v1, v1, Lcom/google/android/flexbox/c;->acS:[I
 
     aget v1, v1, v0
 
-    iget-object v2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acZ:Ljava/util/List;
+    iget-object v2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acV: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;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adw: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;->adq:Lcom/google/android/flexbox/c;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adm:Lcom/google/android/flexbox/c;
 
-    iget-object v1, v1, Lcom/google/android/flexbox/c;->acW:[I
+    iget-object v1, v1, Lcom/google/android/flexbox/c;->acS:[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;->acZ:Ljava/util/List;
+    iget-object v2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acV: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;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v6, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adw: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;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adw: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;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adw: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;->adJ:I
+    iput v1, v0, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->adF:I
 
     if-eqz v5, :cond_b
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adw: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;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adw: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;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adw: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;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adw: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;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adw: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;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adw: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;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adw: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;->lm()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lk()Z
 
     move-result p2
 
@@ -4684,24 +4684,14 @@
     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;->ady:Landroid/graphics/Rect;
+    sget-object p2, Lcom/google/android/flexbox/FlexboxLayoutManager;->adu: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;->lm()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lk()Z
 
     move-result p2
 
@@ -4717,17 +4707,17 @@
 
     add-int/2addr p2, p1
 
-    iget p1, p4, Lcom/google/android/flexbox/b;->acK:I
+    iget p1, p4, Lcom/google/android/flexbox/b;->acG:I
 
     add-int/2addr p1, p2
 
-    iput p1, p4, Lcom/google/android/flexbox/b;->acK:I
+    iput p1, p4, Lcom/google/android/flexbox/b;->acG:I
 
-    iget p1, p4, Lcom/google/android/flexbox/b;->acL:I
+    iget p1, p4, Lcom/google/android/flexbox/b;->acH:I
 
     add-int/2addr p1, p2
 
-    iput p1, p4, Lcom/google/android/flexbox/b;->acL:I
+    iput p1, p4, Lcom/google/android/flexbox/b;->acH:I
 
     return-void
 
@@ -4742,17 +4732,17 @@
 
     add-int/2addr p2, p1
 
-    iget p1, p4, Lcom/google/android/flexbox/b;->acK:I
+    iget p1, p4, Lcom/google/android/flexbox/b;->acG:I
 
     add-int/2addr p1, p2
 
-    iput p1, p4, Lcom/google/android/flexbox/b;->acK:I
+    iput p1, p4, Lcom/google/android/flexbox/b;->acG:I
 
-    iget p1, p4, Lcom/google/android/flexbox/b;->acL:I
+    iget p1, p4, Lcom/google/android/flexbox/b;->acH:I
 
     add-int/2addr p1, p2
 
-    iput p1, p4, Lcom/google/android/flexbox/b;->acL:I
+    iput p1, p4, Lcom/google/android/flexbox/b;->acH:I
 
     return-void
 .end method
@@ -4766,7 +4756,7 @@
 .method public final aG(I)Landroid/view/View;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adG:Landroid/util/SparseArray;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adC:Landroid/util/SparseArray;
 
     invoke-virtual {v0, p1}, Landroid/util/SparseArray;->get(I)Ljava/lang/Object;
 
@@ -4798,6 +4788,16 @@
     return-object p1
 .end method
 
+.method public final b(ILandroid/view/View;)V
+    .locals 1
+
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adC: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;->lm()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lk()Z
 
     move-result v0
 
@@ -4833,7 +4833,7 @@
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adH:Landroid/view/View;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adD: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;->lm()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lk()Z
 
     move-result v0
 
@@ -4868,7 +4868,7 @@
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adH:Landroid/view/View;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adD: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;->lm()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lk()Z
 
     move-result v0
 
@@ -5073,7 +5073,7 @@
 .method public getAlignItems()I
     .locals 1
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adg:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adb:I
 
     return v0
 .end method
@@ -5081,7 +5081,7 @@
 .method public getFlexDirection()I
     .locals 1
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adc:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acY:I
 
     return v0
 .end method
@@ -5109,7 +5109,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acZ:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acV: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;->ade:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acZ:I
 
     return v0
 .end method
@@ -5125,7 +5125,7 @@
 .method public getLargestMainSize()I
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acZ:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acV: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;->acZ:Ljava/util/List;
+    iget-object v2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acV: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;->acZ:Ljava/util/List;
+    iget-object v3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acV: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;->acK:I
+    iget v3, v3, Lcom/google/android/flexbox/b;->acG: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;->acZ:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acV: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;->acZ:Ljava/util/List;
+    iget-object v3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acV: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;->acM:I
+    iget v3, v3, Lcom/google/android/flexbox/b;->acI: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;->lm()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lk()Z
 
     move-result v0
 
@@ -5241,10 +5241,10 @@
     goto :goto_0
 .end method
 
-.method public final lm()Z
+.method public final lk()Z
     .locals 2
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adc:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acY:I
 
     const/4 v1, 0x1
 
@@ -5283,7 +5283,7 @@
 
     check-cast p1, Landroid/view/View;
 
-    iput-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adH:Landroid/view/View;
+    iput-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adD:Landroid/view/View;
 
     return-void
 .end method
@@ -5391,7 +5391,7 @@
 
     move-result v4
 
-    iget v5, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adc:I
+    iget v5, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acY: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;->adz:Z
+    iput-boolean v7, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adv: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;->ade:I
+    iget v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acZ: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;->adz:Z
+    iput-boolean v8, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adv: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;->ade:I
+    iget v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acZ: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;->adz:Z
+    iput-boolean v7, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adv: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;->ade:I
+    iget v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acZ: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;->adz:Z
+    iput-boolean v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adv: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;->ade:I
+    iget v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acZ: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;->adz:Z
+    iput-boolean v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adv:Z
 
     :goto_6
-    invoke-direct/range {p0 .. p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lB()V
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lz()V
 
     invoke-direct/range {p0 .. p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->ensureLayoutState()V
 
-    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adq:Lcom/google/android/flexbox/c;
+    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adm: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;->adq:Lcom/google/android/flexbox/c;
+    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adm: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;->adq:Lcom/google/android/flexbox/c;
+    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adm: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;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adw:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
-    iput-boolean v7, v4, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->adN:Z
+    iput-boolean v7, v4, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->adJ:Z
 
-    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adD:Lcom/google/android/flexbox/FlexboxLayoutManager$SavedState;
+    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adz: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;->adD:Lcom/google/android/flexbox/FlexboxLayoutManager$SavedState;
+    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adz: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;->adB:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adx: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;->adD:Lcom/google/android/flexbox/FlexboxLayoutManager$SavedState;
+    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adz:Lcom/google/android/flexbox/FlexboxLayoutManager$SavedState;
 
     if-eqz v4, :cond_24
 
     :cond_e
-    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adB:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adx: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;->adB:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adx:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
 
-    iget-object v9, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adD:Lcom/google/android/flexbox/FlexboxLayoutManager$SavedState;
+    iget-object v9, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adz: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;->adq:Lcom/google/android/flexbox/c;
+    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adm:Lcom/google/android/flexbox/c;
 
-    iget-object v10, v10, Lcom/google/android/flexbox/c;->acW:[I
+    iget-object v10, v10, Lcom/google/android/flexbox/c;->acS:[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;->adD:Lcom/google/android/flexbox/FlexboxLayoutManager$SavedState;
+    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adz: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;->lm()Z
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lk()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;->adB:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adx: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;->adB:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adx: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;->adB:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adx: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;->adB:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adx: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;->lm()Z
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lk()Z
 
     move-result v12
 
     if-eqz v12, :cond_28
 
-    iget v12, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adE:I
+    iget v12, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA: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;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v12, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adw: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;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v12, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adw: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;->adF:I
+    iget v12, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adB: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;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v12, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adw: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;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v12, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adw: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;->adE:I
+    iput v10, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA:I
 
-    iput v11, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adF:I
+    iput v11, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adB:I
 
-    iget v10, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adI:I
+    iget v10, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adE: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;->adB:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adx: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;->acZ:Ljava/util/List;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acV:Ljava/util/List;
 
     invoke-interface {v3}, Ljava/util/List;->clear()V
 
-    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adr:Lcom/google/android/flexbox/c$a;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adn: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;->lm()Z
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lk()Z
 
     move-result v3
 
     if-eqz v3, :cond_2c
 
-    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adq:Lcom/google/android/flexbox/c;
+    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adm:Lcom/google/android/flexbox/c;
 
-    iget-object v11, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adr:Lcom/google/android/flexbox/c$a;
+    iget-object v11, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adn:Lcom/google/android/flexbox/c$a;
 
-    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adB:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adx: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;->acZ:Ljava/util/List;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acV:Ljava/util/List;
 
     move v12, v4
 
@@ -6225,17 +6225,17 @@
     goto :goto_16
 
     :cond_2c
-    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adq:Lcom/google/android/flexbox/c;
+    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adm:Lcom/google/android/flexbox/c;
 
-    iget-object v11, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adr:Lcom/google/android/flexbox/c$a;
+    iget-object v11, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adn:Lcom/google/android/flexbox/c$a;
 
-    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adB:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adx: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;->acZ:Ljava/util/List;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acV: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;->adr:Lcom/google/android/flexbox/c$a;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adn:Lcom/google/android/flexbox/c$a;
 
-    iget-object v3, v3, Lcom/google/android/flexbox/c$a;->acZ:Ljava/util/List;
+    iget-object v3, v3, Lcom/google/android/flexbox/c$a;->acV:Ljava/util/List;
 
-    iput-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acZ:Ljava/util/List;
+    iput-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acV:Ljava/util/List;
 
-    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adq:Lcom/google/android/flexbox/c;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adm: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;->adq:Lcom/google/android/flexbox/c;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adm:Lcom/google/android/flexbox/c;
 
-    invoke-virtual {v3}, Lcom/google/android/flexbox/c;->lx()V
+    invoke-virtual {v3}, Lcom/google/android/flexbox/c;->lv()V
 
-    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adB:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adx:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
 
-    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adq:Lcom/google/android/flexbox/c;
+    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adm:Lcom/google/android/flexbox/c;
 
-    iget-object v4, v4, Lcom/google/android/flexbox/c;->acW:[I
+    iget-object v4, v4, Lcom/google/android/flexbox/c;->acS:[I
 
-    iget-object v5, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adB:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v5, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adx: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;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adw:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
-    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adB:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adx: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;->adJ:I
+    iput v4, v3, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->adF:I
 
     goto/16 :goto_19
 
     :cond_2d
-    iget v5, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adI:I
+    iget v5, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adE:I
 
     if-eq v5, v6, :cond_2e
 
-    iget-object v6, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adB:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v6, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adx: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;->adB:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v5, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adx: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;->adr:Lcom/google/android/flexbox/c$a;
+    iget-object v6, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adn: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;->lm()Z
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lk()Z
 
     move-result v6
 
     if-eqz v6, :cond_30
 
-    iget-object v6, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acZ:Ljava/util/List;
+    iget-object v6, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acV: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;->adq:Lcom/google/android/flexbox/c;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adm:Lcom/google/android/flexbox/c;
 
-    iget-object v6, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acZ:Ljava/util/List;
+    iget-object v6, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acV: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;->adq:Lcom/google/android/flexbox/c;
+    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adm:Lcom/google/android/flexbox/c;
 
-    iget-object v11, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adr:Lcom/google/android/flexbox/c$a;
+    iget-object v11, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adn:Lcom/google/android/flexbox/c$a;
 
-    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adB:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adx: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;->acZ:Ljava/util/List;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acV:Ljava/util/List;
 
     move v12, v4
 
@@ -6362,17 +6362,17 @@
     goto :goto_18
 
     :cond_2f
-    iget-object v6, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adq:Lcom/google/android/flexbox/c;
+    iget-object v6, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adm: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;->adq:Lcom/google/android/flexbox/c;
+    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adm:Lcom/google/android/flexbox/c;
 
-    iget-object v11, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adr:Lcom/google/android/flexbox/c$a;
+    iget-object v11, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adn:Lcom/google/android/flexbox/c$a;
 
     const/4 v15, 0x0
 
-    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acZ:Ljava/util/List;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acV:Ljava/util/List;
 
     move v12, v4
 
@@ -6385,7 +6385,7 @@
     goto :goto_18
 
     :cond_30
-    iget-object v6, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acZ:Ljava/util/List;
+    iget-object v6, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acV: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;->adq:Lcom/google/android/flexbox/c;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adm:Lcom/google/android/flexbox/c;
 
-    iget-object v6, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acZ:Ljava/util/List;
+    iget-object v6, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acV: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;->adq:Lcom/google/android/flexbox/c;
+    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adm:Lcom/google/android/flexbox/c;
 
-    iget-object v11, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adr:Lcom/google/android/flexbox/c$a;
+    iget-object v11, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adn:Lcom/google/android/flexbox/c$a;
 
-    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adB:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adx: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;->acZ:Ljava/util/List;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acV:Ljava/util/List;
 
     move v12, v9
 
@@ -6424,17 +6424,17 @@
     goto :goto_18
 
     :cond_31
-    iget-object v6, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adq:Lcom/google/android/flexbox/c;
+    iget-object v6, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adm: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;->adq:Lcom/google/android/flexbox/c;
+    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adm:Lcom/google/android/flexbox/c;
 
-    iget-object v11, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adr:Lcom/google/android/flexbox/c$a;
+    iget-object v11, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adn:Lcom/google/android/flexbox/c$a;
 
     const/4 v15, 0x0
 
-    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acZ:Ljava/util/List;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acV: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;->adr:Lcom/google/android/flexbox/c$a;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adn:Lcom/google/android/flexbox/c$a;
 
-    iget-object v3, v3, Lcom/google/android/flexbox/c$a;->acZ:Ljava/util/List;
+    iget-object v3, v3, Lcom/google/android/flexbox/c$a;->acV:Ljava/util/List;
 
-    iput-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acZ:Ljava/util/List;
+    iput-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acV:Ljava/util/List;
 
-    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adq:Lcom/google/android/flexbox/c;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adm: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;->adq:Lcom/google/android/flexbox/c;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adm: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;->adB:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adx: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;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adw: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;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adw: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;->adB:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adx: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;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adw: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;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adw: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;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adw: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;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adw: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;->adB:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adx: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;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adw: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;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adw: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;->adB:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v5, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adx: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;->adD:Lcom/google/android/flexbox/FlexboxLayoutManager$SavedState;
+    iput-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adz: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;->adI:I
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adE:I
 
-    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adB:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adx: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;->adG:Landroid/util/SparseArray;
+    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adC: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;->adD:Lcom/google/android/flexbox/FlexboxLayoutManager$SavedState;
+    iput-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adz: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;->adD:Lcom/google/android/flexbox/FlexboxLayoutManager$SavedState;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adz: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;->lm()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lk()Z
 
     move-result v0
 
@@ -6671,7 +6671,7 @@
 
     move-result p1
 
-    iget-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adG:Landroid/util/SparseArray;
+    iget-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adC: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;->adB:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adx: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;->adC:Landroidx/recyclerview/widget/OrientationHelper;
+    iget-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->ady: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;->adD:Lcom/google/android/flexbox/FlexboxLayoutManager$SavedState;
+    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adz: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;->lm()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lk()Z
 
     move-result v0
 
@@ -6735,7 +6735,7 @@
 
     move-result p1
 
-    iget-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adG:Landroid/util/SparseArray;
+    iget-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adC: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;->adB:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adx: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;->adC:Landroidx/recyclerview/widget/OrientationHelper;
+    iget-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->ady:Landroidx/recyclerview/widget/OrientationHelper;
 
     neg-int p3, p1
 
@@ -6776,7 +6776,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acZ:Ljava/util/List;
+    iput-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acV: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 178d5189a4..d45bb8b9ab 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 8c7538fabe..dbe7809116 100644
--- a/com.discord/smali_classes2/com/google/android/flexbox/a.smali
+++ b/com.discord/smali_classes2/com/google/android/flexbox/a.smali
@@ -7,9 +7,6 @@
 .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
 
@@ -22,6 +19,9 @@
 .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 lm()Z
+.method public abstract lk()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 2ae74bdab3..a34fbf9d01 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 acK:I
+.field acG:I
 
-.field acL:I
+.field acH:I
+
+.field acI:I
+
+.field acJ:I
+
+.field acK:F
+
+.field acL:F
 
 .field acM:I
 
 .field acN:I
 
-.field acO:F
-
-.field acP:F
-
-.field acQ:I
-
-.field acR:I
-
-.field acS:Ljava/util/List;
+.field acO:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -30,7 +30,7 @@
     .end annotation
 .end field
 
-.field acT:I
+.field acP: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;->acS:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/android/flexbox/b;->acO:Ljava/util/List;
 
     return-void
 .end method
@@ -89,7 +89,7 @@
 
     move-result v2
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->ls()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->lq()I
 
     move-result v3
 
@@ -109,7 +109,7 @@
 
     move-result v1
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->lt()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->lr()I
 
     move-result v2
 
@@ -129,7 +129,7 @@
 
     move-result p3
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->lu()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->ls()I
 
     move-result v1
 
@@ -149,7 +149,7 @@
 
     move-result p1
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->lv()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->lt()I
 
     move-result p3
 
@@ -166,12 +166,12 @@
     return-void
 .end method
 
-.method public final lw()I
+.method public final lu()I
     .locals 2
 
     iget v0, p0, Lcom/google/android/flexbox/b;->mItemCount:I
 
-    iget v1, p0, Lcom/google/android/flexbox/b;->acN:I
+    iget v1, p0, Lcom/google/android/flexbox/b;->acJ: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 f3ab9ab91f..4f83adb1c4 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 acZ:Ljava/util/List;
+.field acV:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -25,7 +25,7 @@
     .end annotation
 .end field
 
-.field ada:I
+.field acW:I
 
 
 # direct methods
@@ -44,11 +44,11 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/google/android/flexbox/c$a;->acZ:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/android/flexbox/c$a;->acV:Ljava/util/List;
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lcom/google/android/flexbox/c$a;->ada:I
+    iput v0, p0, Lcom/google/android/flexbox/c$a;->acW: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 2b3cae31b1..d06c869926 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 adb:I
+.field acX: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;->adb:I
+    iget v0, p0, Lcom/google/android/flexbox/c$b;->acX:I
 
-    iget v1, p1, Lcom/google/android/flexbox/c$b;->adb:I
+    iget v1, p1, Lcom/google/android/flexbox/c$b;->acX: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;->adb:I
+    iget v1, p0, Lcom/google/android/flexbox/c$b;->acX: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 fa139e651f..a8309d5503 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 acU:Lcom/google/android/flexbox/a;
+.field private final acQ:Lcom/google/android/flexbox/a;
 
-.field private acV:[Z
+.field private acR:[Z
 
-.field acW:[I
+.field acS:[I
 
-.field acX:[J
+.field acT:[J
 
-.field private acY:[J
+.field private acU:[J
 
 
 # direct methods
@@ -40,7 +40,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/flexbox/c;->acU:Lcom/google/android/flexbox/a;
+    iput-object p1, p0, Lcom/google/android/flexbox/c;->acQ: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;->acU:Lcom/google/android/flexbox/a;
+    iget-object p1, p0, Lcom/google/android/flexbox/c;->acQ: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;->acU:Lcom/google/android/flexbox/a;
+    iget-object p1, p0, Lcom/google/android/flexbox/c;->acQ: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;->acU:Lcom/google/android/flexbox/a;
+    iget-object p1, p0, Lcom/google/android/flexbox/c;->acQ: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;->acU:Lcom/google/android/flexbox/a;
+    iget-object p1, p0, Lcom/google/android/flexbox/c;->acQ: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;->acU:Lcom/google/android/flexbox/a;
+    iget-object p1, p0, Lcom/google/android/flexbox/c;->acQ: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;->acU:Lcom/google/android/flexbox/a;
+    iget-object p1, p0, Lcom/google/android/flexbox/c;->acQ: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;->acU:Lcom/google/android/flexbox/a;
+    iget-object p1, p0, Lcom/google/android/flexbox/c;->acQ: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;->acU:Lcom/google/android/flexbox/a;
+    iget-object p1, p0, Lcom/google/android/flexbox/c;->acQ: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;->acU:Lcom/google/android/flexbox/a;
+    iget-object v0, p0, Lcom/google/android/flexbox/c;->acQ: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;->acU:Lcom/google/android/flexbox/a;
+    iget-object v2, p0, Lcom/google/android/flexbox/c;->acQ: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;->ls()I
+    invoke-interface {p2}, Lcom/google/android/flexbox/FlexItem;->lq()I
 
     move-result v2
 
     add-int/2addr v1, v2
 
-    invoke-interface {p2}, Lcom/google/android/flexbox/FlexItem;->lu()I
+    invoke-interface {p2}, Lcom/google/android/flexbox/FlexItem;->ls()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;->acM:I
+    iput p1, v0, Lcom/google/android/flexbox/b;->acI: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;->acX:[J
+    iget-object v0, p0, Lcom/google/android/flexbox/c;->acT:[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;->acY:[J
+    iget-object p2, p0, Lcom/google/android/flexbox/c;->acU:[J
 
     if-eqz p2, :cond_1
 
@@ -381,7 +381,7 @@
     move/from16 v4, p6
 
     :goto_0
-    iget v5, v1, Lcom/google/android/flexbox/b;->acO:F
+    iget v5, v1, Lcom/google/android/flexbox/b;->acK:F
 
     const/4 v6, 0x0
 
@@ -389,36 +389,36 @@
 
     if-lez v5, :cond_14
 
-    iget v5, v1, Lcom/google/android/flexbox/b;->acK:I
+    iget v5, v1, Lcom/google/android/flexbox/b;->acG:I
 
     if-ge v2, v5, :cond_0
 
     goto/16 :goto_b
 
     :cond_0
-    iget v5, v1, Lcom/google/android/flexbox/b;->acK:I
+    iget v5, v1, Lcom/google/android/flexbox/b;->acG:I
 
-    iget v7, v1, Lcom/google/android/flexbox/b;->acK:I
+    iget v7, v1, Lcom/google/android/flexbox/b;->acG:I
 
     sub-int v7, v2, v7
 
     int-to-float v7, v7
 
-    iget v8, v1, Lcom/google/android/flexbox/b;->acO:F
+    iget v8, v1, Lcom/google/android/flexbox/b;->acK:F
 
     div-float/2addr v7, v8
 
-    iget v8, v1, Lcom/google/android/flexbox/b;->acL:I
+    iget v8, v1, Lcom/google/android/flexbox/b;->acH:I
 
     add-int v8, p5, v8
 
-    iput v8, v1, Lcom/google/android/flexbox/b;->acK:I
+    iput v8, v1, Lcom/google/android/flexbox/b;->acG:I
 
     if-nez v4, :cond_1
 
     const/high16 v4, -0x80000000
 
-    iput v4, v1, Lcom/google/android/flexbox/b;->acM:I
+    iput v4, v1, Lcom/google/android/flexbox/b;->acI: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;->acT:I
+    iget v11, v1, Lcom/google/android/flexbox/b;->acP:I
 
     add-int/2addr v11, v4
 
-    iget-object v12, v0, Lcom/google/android/flexbox/c;->acU:Lcom/google/android/flexbox/a;
+    iget-object v12, v0, Lcom/google/android/flexbox/c;->acQ: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;->acU:Lcom/google/android/flexbox/a;
+    iget-object v14, v0, Lcom/google/android/flexbox/c;->acQ: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;->acY:[J
+    iget-object v15, v0, Lcom/google/android/flexbox/c;->acU:[J
 
     if-eqz v15, :cond_3
 
@@ -498,7 +498,7 @@
 
     move-result v15
 
-    iget-object v3, v0, Lcom/google/android/flexbox/c;->acY:[J
+    iget-object v3, v0, Lcom/google/android/flexbox/c;->acU:[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;->acV:[Z
+    iget-object v3, v0, Lcom/google/android/flexbox/c;->acR:[Z
 
     aget-boolean v3, v3, v11
 
     if-nez v3, :cond_9
 
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->ln()F
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->ll()F
 
     move-result v3
 
@@ -527,7 +527,7 @@
 
     int-to-float v3, v14
 
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->ln()F
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->ll()F
 
     move-result v6
 
@@ -562,19 +562,19 @@
 
     move-result v6
 
-    iget-object v3, v0, Lcom/google/android/flexbox/c;->acV:[Z
+    iget-object v3, v0, Lcom/google/android/flexbox/c;->acR:[Z
 
     aput-boolean v7, v3, v11
 
-    iget v3, v1, Lcom/google/android/flexbox/b;->acO:F
+    iget v3, v1, Lcom/google/android/flexbox/b;->acK:F
 
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->ln()F
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->ll()F
 
     move-result v7
 
     sub-float/2addr v3, v7
 
-    iput v3, v1, Lcom/google/android/flexbox/b;->acO:F
+    iput v3, v1, Lcom/google/android/flexbox/b;->acK:F
 
     const/4 v8, 0x1
 
@@ -621,7 +621,7 @@
 
     :cond_8
     :goto_3
-    iget v3, v1, Lcom/google/android/flexbox/b;->acR:I
+    iget v3, v1, Lcom/google/android/flexbox/b;->acN: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;->acU:Lcom/google/android/flexbox/a;
+    iget-object v3, v0, Lcom/google/android/flexbox/c;->acQ:Lcom/google/android/flexbox/a;
 
-    invoke-interface {v3, v11, v12}, Lcom/google/android/flexbox/a;->a(ILandroid/view/View;)V
+    invoke-interface {v3, v11, v12}, Lcom/google/android/flexbox/a;->b(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;->lq()I
+
+    move-result v3
+
+    add-int/2addr v15, v3
+
     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;->lu()I
-
-    move-result v3
-
-    add-int/2addr v15, v3
-
-    iget-object v3, v0, Lcom/google/android/flexbox/c;->acU:Lcom/google/android/flexbox/a;
+    iget-object v3, v0, Lcom/google/android/flexbox/c;->acQ:Lcom/google/android/flexbox/a;
 
     invoke-interface {v3, v12}, Lcom/google/android/flexbox/a;->h(Landroid/view/View;)I
 
@@ -681,7 +681,13 @@
 
     move-result v3
 
-    iget v6, v1, Lcom/google/android/flexbox/b;->acK:I
+    iget v6, v1, Lcom/google/android/flexbox/b;->acG:I
+
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->lr()I
+
+    move-result v10
+
+    add-int/2addr v14, v10
 
     invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->lt()I
 
@@ -689,15 +695,9 @@
 
     add-int/2addr v14, v10
 
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->lv()I
-
-    move-result v10
-
-    add-int/2addr v14, v10
-
     add-int/2addr v6, v14
 
-    iput v6, v1, Lcom/google/android/flexbox/b;->acK:I
+    iput v6, v1, Lcom/google/android/flexbox/b;->acG:I
 
     move/from16 v14, p2
 
@@ -713,7 +713,7 @@
 
     move-result v3
 
-    iget-object v6, v0, Lcom/google/android/flexbox/c;->acY:[J
+    iget-object v6, v0, Lcom/google/android/flexbox/c;->acU:[J
 
     if-eqz v6, :cond_b
 
@@ -726,7 +726,7 @@
 
     move-result v6
 
-    iget-object v14, v0, Lcom/google/android/flexbox/c;->acY:[J
+    iget-object v14, v0, Lcom/google/android/flexbox/c;->acU:[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;->acV:[Z
+    iget-object v14, v0, Lcom/google/android/flexbox/c;->acR:[Z
 
     aget-boolean v14, v14, v11
 
     if-nez v14, :cond_11
 
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->ln()F
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->ll()F
 
     move-result v14
 
@@ -755,7 +755,7 @@
 
     int-to-float v3, v3
 
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->ln()F
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->ll()F
 
     move-result v6
 
@@ -790,19 +790,19 @@
 
     move-result v6
 
-    iget-object v3, v0, Lcom/google/android/flexbox/c;->acV:[Z
+    iget-object v3, v0, Lcom/google/android/flexbox/c;->acR:[Z
 
     aput-boolean v14, v3, v11
 
-    iget v3, v1, Lcom/google/android/flexbox/b;->acO:F
+    iget v3, v1, Lcom/google/android/flexbox/b;->acK:F
 
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->ln()F
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->ll()F
 
     move-result v8
 
     sub-float/2addr v3, v8
 
-    iput v3, v1, Lcom/google/android/flexbox/b;->acO:F
+    iput v3, v1, Lcom/google/android/flexbox/b;->acK:F
 
     const/4 v8, 0x1
 
@@ -849,7 +849,7 @@
 
     :cond_10
     :goto_7
-    iget v3, v1, Lcom/google/android/flexbox/b;->acR:I
+    iget v3, v1, Lcom/google/android/flexbox/b;->acN: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;->acU:Lcom/google/android/flexbox/a;
+    iget-object v3, v0, Lcom/google/android/flexbox/c;->acQ:Lcom/google/android/flexbox/a;
 
-    invoke-interface {v3, v11, v12}, Lcom/google/android/flexbox/a;->a(ILandroid/view/View;)V
+    invoke-interface {v3, v11, v12}, Lcom/google/android/flexbox/a;->b(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;->lr()I
+
+    move-result v3
+
+    add-int v16, v16, v3
+
     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;->lv()I
-
-    move-result v3
-
-    add-int v16, v16, v3
-
-    iget-object v3, v0, Lcom/google/android/flexbox/c;->acU:Lcom/google/android/flexbox/a;
+    iget-object v3, v0, Lcom/google/android/flexbox/c;->acQ:Lcom/google/android/flexbox/a;
 
     invoke-interface {v3, v12}, Lcom/google/android/flexbox/a;->h(Landroid/view/View;)I
 
@@ -913,7 +913,13 @@
 
     move-result v3
 
-    iget v6, v1, Lcom/google/android/flexbox/b;->acK:I
+    iget v6, v1, Lcom/google/android/flexbox/b;->acG:I
+
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->lq()I
+
+    move-result v10
+
+    add-int/2addr v15, v10
 
     invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->ls()I
 
@@ -921,24 +927,18 @@
 
     add-int/2addr v15, v10
 
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->lu()I
-
-    move-result v10
-
-    add-int/2addr v15, v10
-
     add-int/2addr v6, v15
 
-    iput v6, v1, Lcom/google/android/flexbox/b;->acK:I
+    iput v6, v1, Lcom/google/android/flexbox/b;->acG:I
 
     :goto_9
-    iget v6, v1, Lcom/google/android/flexbox/b;->acM:I
+    iget v6, v1, Lcom/google/android/flexbox/b;->acI:I
 
     invoke-static {v6, v3}, Ljava/lang/Math;->max(II)I
 
     move-result v6
 
-    iput v6, v1, Lcom/google/android/flexbox/b;->acM:I
+    iput v6, v1, Lcom/google/android/flexbox/b;->acI:I
 
     move v10, v3
 
@@ -969,7 +969,7 @@
 
     if-eqz v8, :cond_14
 
-    iget v3, v1, Lcom/google/android/flexbox/b;->acK:I
+    iget v3, v1, Lcom/google/android/flexbox/b;->acG: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;->acU:Lcom/google/android/flexbox/a;
+    iget-object v0, p0, Lcom/google/android/flexbox/c;->acQ:Lcom/google/android/flexbox/a;
 
-    invoke-interface {v0, p2, p1}, Lcom/google/android/flexbox/a;->a(ILandroid/view/View;)V
+    invoke-interface {v0, p2, p1}, Lcom/google/android/flexbox/a;->b(ILandroid/view/View;)V
 
     :cond_4
     return-void
@@ -1101,9 +1101,9 @@
         }
     .end annotation
 
-    iput p4, p2, Lcom/google/android/flexbox/b;->acR:I
+    iput p4, p2, Lcom/google/android/flexbox/b;->acN:I
 
-    iget-object p4, p0, Lcom/google/android/flexbox/c;->acU:Lcom/google/android/flexbox/a;
+    iget-object p4, p0, Lcom/google/android/flexbox/c;->acQ: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;->lw()I
+    invoke-virtual {p2}, Lcom/google/android/flexbox/b;->lu()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;->acU:Lcom/google/android/flexbox/a;
+    iget-object v0, p0, Lcom/google/android/flexbox/c;->acQ: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;->lq()Z
+    invoke-interface {p6}, Lcom/google/android/flexbox/FlexItem;->lo()Z
 
     move-result p6
 
@@ -1169,7 +1169,7 @@
     return v1
 
     :cond_2
-    iget-object p2, p0, Lcom/google/android/flexbox/c;->acU:Lcom/google/android/flexbox/a;
+    iget-object p2, p0, Lcom/google/android/flexbox/c;->acQ: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;->adb:I
+    iget v1, v1, Lcom/google/android/flexbox/c$b;->acX: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;->acU:Lcom/google/android/flexbox/a;
+    iget-object v3, p0, Lcom/google/android/flexbox/c;->acQ: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;->adb:I
+    iput v3, v4, Lcom/google/android/flexbox/c$b;->acX: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;->acV:[Z
+    iget-object v0, p0, Lcom/google/android/flexbox/c;->acR:[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;->acV:[Z
+    iput-object p1, p0, Lcom/google/android/flexbox/c;->acR:[Z
 
     return-void
 
@@ -1338,7 +1338,7 @@
     :cond_2
     new-array p1, p1, [Z
 
-    iput-object p1, p0, Lcom/google/android/flexbox/c;->acV:[Z
+    iput-object p1, p0, Lcom/google/android/flexbox/c;->acR:[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;->acU:Lcom/google/android/flexbox/a;
+    iget-object v0, p0, Lcom/google/android/flexbox/c;->acQ: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;->acU:Lcom/google/android/flexbox/a;
+    iget-object v2, p0, Lcom/google/android/flexbox/c;->acQ: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;->lt()I
+    invoke-interface {p2}, Lcom/google/android/flexbox/FlexItem;->lr()I
 
     move-result v2
 
     add-int/2addr v1, v2
 
-    invoke-interface {p2}, Lcom/google/android/flexbox/FlexItem;->lv()I
+    invoke-interface {p2}, Lcom/google/android/flexbox/FlexItem;->lt()I
 
     move-result v2
 
@@ -1489,9 +1489,9 @@
     move/from16 v4, p6
 
     :goto_0
-    iget v5, v1, Lcom/google/android/flexbox/b;->acK:I
+    iget v5, v1, Lcom/google/android/flexbox/b;->acG:I
 
-    iget v6, v1, Lcom/google/android/flexbox/b;->acP:F
+    iget v6, v1, Lcom/google/android/flexbox/b;->acL:F
 
     const/4 v7, 0x0
 
@@ -1499,34 +1499,34 @@
 
     if-lez v6, :cond_14
 
-    iget v6, v1, Lcom/google/android/flexbox/b;->acK:I
+    iget v6, v1, Lcom/google/android/flexbox/b;->acG:I
 
     if-le v2, v6, :cond_0
 
     goto/16 :goto_9
 
     :cond_0
-    iget v6, v1, Lcom/google/android/flexbox/b;->acK:I
+    iget v6, v1, Lcom/google/android/flexbox/b;->acG:I
 
     sub-int/2addr v6, v2
 
     int-to-float v6, v6
 
-    iget v8, v1, Lcom/google/android/flexbox/b;->acP:F
+    iget v8, v1, Lcom/google/android/flexbox/b;->acL:F
 
     div-float/2addr v6, v8
 
-    iget v8, v1, Lcom/google/android/flexbox/b;->acL:I
+    iget v8, v1, Lcom/google/android/flexbox/b;->acH:I
 
     add-int v8, p5, v8
 
-    iput v8, v1, Lcom/google/android/flexbox/b;->acK:I
+    iput v8, v1, Lcom/google/android/flexbox/b;->acG:I
 
     if-nez v4, :cond_1
 
     const/high16 v4, -0x80000000
 
-    iput v4, v1, Lcom/google/android/flexbox/b;->acM:I
+    iput v4, v1, Lcom/google/android/flexbox/b;->acI: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;->acT:I
+    iget v11, v1, Lcom/google/android/flexbox/b;->acP:I
 
     add-int/2addr v11, v4
 
-    iget-object v12, v0, Lcom/google/android/flexbox/c;->acU:Lcom/google/android/flexbox/a;
+    iget-object v12, v0, Lcom/google/android/flexbox/c;->acQ: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;->acU:Lcom/google/android/flexbox/a;
+    iget-object v14, v0, Lcom/google/android/flexbox/c;->acQ: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;->acY:[J
+    iget-object v15, v0, Lcom/google/android/flexbox/c;->acU:[J
 
     if-eqz v15, :cond_3
 
@@ -1608,7 +1608,7 @@
 
     move-result v15
 
-    iget-object v3, v0, Lcom/google/android/flexbox/c;->acY:[J
+    iget-object v3, v0, Lcom/google/android/flexbox/c;->acU:[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;->acV:[Z
+    iget-object v3, v0, Lcom/google/android/flexbox/c;->acR:[Z
 
     aget-boolean v3, v3, v11
 
     if-nez v3, :cond_9
 
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->lo()F
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->lm()F
 
     move-result v3
 
@@ -1637,7 +1637,7 @@
 
     int-to-float v3, v14
 
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->lo()F
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->lm()F
 
     move-result v7
 
@@ -1672,19 +1672,19 @@
 
     move-result v7
 
-    iget-object v3, v0, Lcom/google/android/flexbox/c;->acV:[Z
+    iget-object v3, v0, Lcom/google/android/flexbox/c;->acR:[Z
 
     aput-boolean v8, v3, v11
 
-    iget v3, v1, Lcom/google/android/flexbox/b;->acP:F
+    iget v3, v1, Lcom/google/android/flexbox/b;->acL:F
 
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->lo()F
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->lm()F
 
     move-result v8
 
     sub-float/2addr v3, v8
 
-    iput v3, v1, Lcom/google/android/flexbox/b;->acP:F
+    iput v3, v1, Lcom/google/android/flexbox/b;->acL:F
 
     const/4 v8, 0x1
 
@@ -1723,7 +1723,7 @@
     move/from16 v8, v22
 
     :goto_3
-    iget v3, v1, Lcom/google/android/flexbox/b;->acR:I
+    iget v3, v1, Lcom/google/android/flexbox/b;->acN: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;->acU:Lcom/google/android/flexbox/a;
+    iget-object v3, v0, Lcom/google/android/flexbox/c;->acQ:Lcom/google/android/flexbox/a;
 
-    invoke-interface {v3, v11, v12}, Lcom/google/android/flexbox/a;->a(ILandroid/view/View;)V
+    invoke-interface {v3, v11, v12}, Lcom/google/android/flexbox/a;->b(ILandroid/view/View;)V
 
     move/from16 v22, v8
 
     move/from16 v14, v16
 
     :cond_9
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->lq()I
+
+    move-result v3
+
+    add-int/2addr v15, v3
+
     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;->lu()I
-
-    move-result v3
-
-    add-int/2addr v15, v3
-
-    iget-object v3, v0, Lcom/google/android/flexbox/c;->acU:Lcom/google/android/flexbox/a;
+    iget-object v3, v0, Lcom/google/android/flexbox/c;->acQ:Lcom/google/android/flexbox/a;
 
     invoke-interface {v3, v12}, Lcom/google/android/flexbox/a;->h(Landroid/view/View;)I
 
@@ -1782,7 +1782,13 @@
 
     move-result v3
 
-    iget v7, v1, Lcom/google/android/flexbox/b;->acK:I
+    iget v7, v1, Lcom/google/android/flexbox/b;->acG:I
+
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->lr()I
+
+    move-result v8
+
+    add-int/2addr v14, v8
 
     invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->lt()I
 
@@ -1790,15 +1796,9 @@
 
     add-int/2addr v14, v8
 
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->lv()I
-
-    move-result v8
-
-    add-int/2addr v14, v8
-
     add-int/2addr v7, v14
 
-    iput v7, v1, Lcom/google/android/flexbox/b;->acK:I
+    iput v7, v1, Lcom/google/android/flexbox/b;->acG:I
 
     move/from16 v14, p2
 
@@ -1814,7 +1814,7 @@
 
     move-result v3
 
-    iget-object v7, v0, Lcom/google/android/flexbox/c;->acY:[J
+    iget-object v7, v0, Lcom/google/android/flexbox/c;->acU:[J
 
     if-eqz v7, :cond_b
 
@@ -1827,7 +1827,7 @@
 
     move-result v7
 
-    iget-object v8, v0, Lcom/google/android/flexbox/c;->acY:[J
+    iget-object v8, v0, Lcom/google/android/flexbox/c;->acU:[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;->acV:[Z
+    iget-object v8, v0, Lcom/google/android/flexbox/c;->acR:[Z
 
     aget-boolean v8, v8, v11
 
     if-nez v8, :cond_11
 
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->lo()F
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->lm()F
 
     move-result v8
 
@@ -1856,7 +1856,7 @@
 
     int-to-float v3, v3
 
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->lo()F
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->lm()F
 
     move-result v7
 
@@ -1891,19 +1891,19 @@
 
     move-result v7
 
-    iget-object v3, v0, Lcom/google/android/flexbox/c;->acV:[Z
+    iget-object v3, v0, Lcom/google/android/flexbox/c;->acR:[Z
 
     aput-boolean v8, v3, v11
 
-    iget v3, v1, Lcom/google/android/flexbox/b;->acP:F
+    iget v3, v1, Lcom/google/android/flexbox/b;->acL:F
 
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->lo()F
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->lm()F
 
     move-result v15
 
     sub-float/2addr v3, v15
 
-    iput v3, v1, Lcom/google/android/flexbox/b;->acP:F
+    iput v3, v1, Lcom/google/android/flexbox/b;->acL:F
 
     const/16 v22, 0x1
 
@@ -1939,7 +1939,7 @@
 
     :cond_10
     :goto_5
-    iget v3, v1, Lcom/google/android/flexbox/b;->acR:I
+    iget v3, v1, Lcom/google/android/flexbox/b;->acN: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;->acU:Lcom/google/android/flexbox/a;
+    iget-object v3, v0, Lcom/google/android/flexbox/c;->acQ:Lcom/google/android/flexbox/a;
 
-    invoke-interface {v3, v11, v12}, Lcom/google/android/flexbox/a;->a(ILandroid/view/View;)V
+    invoke-interface {v3, v11, v12}, Lcom/google/android/flexbox/a;->b(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;->lr()I
+
+    move-result v3
+
+    add-int v16, v16, v3
+
     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;->lv()I
-
-    move-result v3
-
-    add-int v16, v16, v3
-
-    iget-object v3, v0, Lcom/google/android/flexbox/c;->acU:Lcom/google/android/flexbox/a;
+    iget-object v3, v0, Lcom/google/android/flexbox/c;->acQ:Lcom/google/android/flexbox/a;
 
     invoke-interface {v3, v12}, Lcom/google/android/flexbox/a;->h(Landroid/view/View;)I
 
@@ -2005,7 +2005,13 @@
 
     move-result v3
 
-    iget v7, v1, Lcom/google/android/flexbox/b;->acK:I
+    iget v7, v1, Lcom/google/android/flexbox/b;->acG:I
+
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->lq()I
+
+    move-result v10
+
+    add-int/2addr v15, v10
 
     invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->ls()I
 
@@ -2013,24 +2019,18 @@
 
     add-int/2addr v15, v10
 
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->lu()I
-
-    move-result v10
-
-    add-int/2addr v15, v10
-
     add-int/2addr v7, v15
 
-    iput v7, v1, Lcom/google/android/flexbox/b;->acK:I
+    iput v7, v1, Lcom/google/android/flexbox/b;->acG:I
 
     :goto_7
-    iget v7, v1, Lcom/google/android/flexbox/b;->acM:I
+    iget v7, v1, Lcom/google/android/flexbox/b;->acI:I
 
     invoke-static {v7, v3}, Ljava/lang/Math;->max(II)I
 
     move-result v7
 
-    iput v7, v1, Lcom/google/android/flexbox/b;->acM:I
+    iput v7, v1, Lcom/google/android/flexbox/b;->acI:I
 
     move v10, v3
 
@@ -2063,7 +2063,7 @@
 
     if-eqz v22, :cond_14
 
-    iget v3, v1, Lcom/google/android/flexbox/b;->acK:I
+    iget v3, v1, Lcom/google/android/flexbox/b;->acG: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;->lr()I
+
+    move-result v1
+
+    sub-int/2addr p2, v1
+
     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;->lv()I
-
-    move-result v1
-
-    sub-int/2addr p2, v1
-
-    iget-object v1, p0, Lcom/google/android/flexbox/c;->acU:Lcom/google/android/flexbox/a;
+    iget-object v1, p0, Lcom/google/android/flexbox/c;->acQ: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;->acY:[J
+    iget-object v0, p0, Lcom/google/android/flexbox/c;->acU:[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;->acU:Lcom/google/android/flexbox/a;
+    iget-object p2, p0, Lcom/google/android/flexbox/c;->acQ:Lcom/google/android/flexbox/a;
 
-    invoke-interface {p2, p3, p1}, Lcom/google/android/flexbox/a;->a(ILandroid/view/View;)V
+    invoke-interface {p2, p3, p1}, Lcom/google/android/flexbox/a;->b(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;->ls()I
+    invoke-interface {p0}, Lcom/google/android/flexbox/FlexItem;->lq()I
 
     move-result p0
 
     return p0
 
     :cond_0
-    invoke-interface {p0}, Lcom/google/android/flexbox/FlexItem;->lt()I
+    invoke-interface {p0}, Lcom/google/android/flexbox/FlexItem;->lr()I
 
     move-result p0
 
@@ -2188,19 +2188,19 @@
 
     check-cast v0, Lcom/google/android/flexbox/FlexItem;
 
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->lq()I
+
+    move-result v1
+
+    sub-int/2addr p2, v1
+
     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;->lu()I
-
-    move-result v1
-
-    sub-int/2addr p2, v1
-
-    iget-object v1, p0, Lcom/google/android/flexbox/c;->acU:Lcom/google/android/flexbox/a;
+    iget-object v1, p0, Lcom/google/android/flexbox/c;->acQ: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;->acY:[J
+    iget-object v0, p0, Lcom/google/android/flexbox/c;->acU:[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;->acU:Lcom/google/android/flexbox/a;
+    iget-object p2, p0, Lcom/google/android/flexbox/c;->acQ:Lcom/google/android/flexbox/a;
 
-    invoke-interface {p2, p3, p1}, Lcom/google/android/flexbox/a;->a(ILandroid/view/View;)V
+    invoke-interface {p2, p3, p1}, Lcom/google/android/flexbox/a;->b(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;->lu()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;->lv()I
+    invoke-interface {p0}, Lcom/google/android/flexbox/FlexItem;->lt()I
 
     move-result p0
 
@@ -2289,6 +2289,25 @@
 
     if-eqz p1, :cond_0
 
+    invoke-interface {p0}, Lcom/google/android/flexbox/FlexItem;->lr()I
+
+    move-result p0
+
+    return p0
+
+    :cond_0
+    invoke-interface {p0}, Lcom/google/android/flexbox/FlexItem;->lq()I
+
+    move-result p0
+
+    return p0
+.end method
+
+.method private static f(Lcom/google/android/flexbox/FlexItem;Z)I
+    .locals 0
+
+    if-eqz p1, :cond_0
+
     invoke-interface {p0}, Lcom/google/android/flexbox/FlexItem;->lt()I
 
     move-result p0
@@ -2303,25 +2322,6 @@
     return p0
 .end method
 
-.method private static f(Lcom/google/android/flexbox/FlexItem;Z)I
-    .locals 0
-
-    if-eqz p1, :cond_0
-
-    invoke-interface {p0}, Lcom/google/android/flexbox/FlexItem;->lv()I
-
-    move-result p0
-
-    return p0
-
-    :cond_0
-    invoke-interface {p0}, Lcom/google/android/flexbox/FlexItem;->lu()I
-
-    move-result p0
-
-    return p0
-.end method
-
 .method static q(J)I
     .locals 0
 
@@ -2373,13 +2373,13 @@
 
     check-cast v0, Lcom/google/android/flexbox/FlexItem;
 
-    iget-object v1, p0, Lcom/google/android/flexbox/c;->acU:Lcom/google/android/flexbox/a;
+    iget-object v1, p0, Lcom/google/android/flexbox/c;->acQ: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;->lp()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->ln()I
 
     move-result v2
 
@@ -2387,12 +2387,12 @@
 
     if-eq v2, v3, :cond_0
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->lp()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->ln()I
 
     move-result v1
 
     :cond_0
-    iget v2, p2, Lcom/google/android/flexbox/b;->acM:I
+    iget v2, p2, Lcom/google/android/flexbox/b;->acI:I
 
     const/4 v3, 0x2
 
@@ -2415,7 +2415,7 @@
     goto :goto_0
 
     :cond_1
-    iget-object v1, p0, Lcom/google/android/flexbox/c;->acU:Lcom/google/android/flexbox/a;
+    iget-object v1, p0, Lcom/google/android/flexbox/c;->acQ: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;->acQ:I
+    iget p2, p2, Lcom/google/android/flexbox/b;->acM: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;->lt()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->lr()I
 
     move-result v0
 
@@ -2448,7 +2448,7 @@
     return-void
 
     :cond_2
-    iget p2, p2, Lcom/google/android/flexbox/b;->acQ:I
+    iget p2, p2, Lcom/google/android/flexbox/b;->acM: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;->lv()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->lt()I
 
     move-result v0
 
@@ -2485,13 +2485,13 @@
 
     sub-int/2addr v2, p2
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->lt()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->lr()I
 
     move-result p2
 
     add-int/2addr v2, p2
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->lv()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->lt()I
 
     move-result p2
 
@@ -2499,7 +2499,7 @@
 
     div-int/2addr v2, v3
 
-    iget-object p2, p0, Lcom/google/android/flexbox/c;->acU:Lcom/google/android/flexbox/a;
+    iget-object p2, p0, Lcom/google/android/flexbox/c;->acQ: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;->acU:Lcom/google/android/flexbox/a;
+    iget-object p2, p0, Lcom/google/android/flexbox/c;->acQ: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;->lv()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->lt()I
 
     move-result p6
 
     sub-int/2addr p2, p6
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->lv()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->lt()I
 
     move-result p6
 
@@ -2575,7 +2575,7 @@
 
     add-int/2addr p4, p2
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->lt()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->lr()I
 
     move-result p2
 
@@ -2589,7 +2589,7 @@
 
     add-int/2addr p6, p2
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->lt()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->lr()I
 
     move-result p2
 
@@ -2600,7 +2600,7 @@
     return-void
 
     :cond_7
-    iget-object p2, p0, Lcom/google/android/flexbox/c;->acU:Lcom/google/android/flexbox/a;
+    iget-object p2, p0, Lcom/google/android/flexbox/c;->acQ: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;->lt()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->lr()I
 
     move-result p2
 
     add-int/2addr p4, p2
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->lt()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->lr()I
 
     move-result p2
 
@@ -2625,13 +2625,13 @@
     return-void
 
     :cond_8
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->lv()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->lt()I
 
     move-result p2
 
     sub-int/2addr p4, p2
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->lv()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->lt()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;->acU:Lcom/google/android/flexbox/a;
+    iget-object v1, p0, Lcom/google/android/flexbox/c;->acQ: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;->lp()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->ln()I
 
     move-result v2
 
@@ -2665,12 +2665,12 @@
 
     if-eq v2, v3, :cond_0
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->lp()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->ln()I
 
     move-result v1
 
     :cond_0
-    iget p2, p2, Lcom/google/android/flexbox/b;->acM:I
+    iget p2, p2, Lcom/google/android/flexbox/b;->acI:I
 
     if-eqz v1, :cond_5
 
@@ -2750,7 +2750,7 @@
 
     sub-int/2addr p4, p3
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->lu()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->ls()I
 
     move-result p3
 
@@ -2764,7 +2764,7 @@
 
     sub-int/2addr p6, p2
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->lu()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->ls()I
 
     move-result p2
 
@@ -2783,7 +2783,7 @@
 
     add-int/2addr p4, p3
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->ls()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->lq()I
 
     move-result p3
 
@@ -2797,7 +2797,7 @@
 
     add-int/2addr p6, p2
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->ls()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->lq()I
 
     move-result p2
 
@@ -2810,13 +2810,13 @@
     :cond_5
     if-nez p3, :cond_6
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->ls()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->lq()I
 
     move-result p2
 
     add-int/2addr p4, p2
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->ls()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->lq()I
 
     move-result p2
 
@@ -2827,13 +2827,13 @@
     return-void
 
     :cond_6
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->lu()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->ls()I
 
     move-result p2
 
     sub-int/2addr p4, p2
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->lu()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->ls()I
 
     move-result p2
 
@@ -2891,9 +2891,9 @@
 
     move/from16 v13, p6
 
-    iget-object v0, v9, Lcom/google/android/flexbox/c;->acU:Lcom/google/android/flexbox/a;
+    iget-object v0, v9, Lcom/google/android/flexbox/c;->acQ:Lcom/google/android/flexbox/a;
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/a;->lm()Z
+    invoke-interface {v0}, Lcom/google/android/flexbox/a;->lk()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;->acZ:Ljava/util/List;
+    iput-object v7, v10, Lcom/google/android/flexbox/c$a;->acV:Ljava/util/List;
 
     const/4 v6, -0x1
 
@@ -2955,13 +2955,13 @@
 
     move/from16 v6, p5
 
-    iput v6, v3, Lcom/google/android/flexbox/b;->acT:I
+    iput v6, v3, Lcom/google/android/flexbox/b;->acP:I
 
     add-int/2addr v2, v1
 
-    iput v2, v3, Lcom/google/android/flexbox/b;->acK:I
+    iput v2, v3, Lcom/google/android/flexbox/b;->acG:I
 
-    iget-object v1, v9, Lcom/google/android/flexbox/c;->acU:Lcom/google/android/flexbox/a;
+    iget-object v1, v9, Lcom/google/android/flexbox/c;->acQ: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;->acU:Lcom/google/android/flexbox/a;
+    iget-object v5, v9, Lcom/google/android/flexbox/c;->acQ: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;->acN:I
+    iget v4, v3, Lcom/google/android/flexbox/b;->acJ:I
 
     const/4 v5, 0x1
 
     add-int/2addr v4, v5
 
-    iput v4, v3, Lcom/google/android/flexbox/b;->acN:I
+    iput v4, v3, Lcom/google/android/flexbox/b;->acJ: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;->lp()I
+    invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->ln()I
 
     move-result v4
 
@@ -3070,7 +3070,7 @@
 
     if-ne v4, v1, :cond_5
 
-    iget-object v1, v3, Lcom/google/android/flexbox/b;->acS:Ljava/util/List;
+    iget-object v1, v3, Lcom/google/android/flexbox/b;->acO: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;->lr()F
+    invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->lp()F
 
     move-result v4
 
@@ -3099,7 +3099,7 @@
 
     int-to-float v1, v8
 
-    invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->lr()F
+    invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->lp()F
 
     move-result v4
 
@@ -3112,7 +3112,7 @@
     :cond_6
     if-eqz v14, :cond_7
 
-    iget-object v4, v9, Lcom/google/android/flexbox/c;->acU:Lcom/google/android/flexbox/a;
+    iget-object v4, v9, Lcom/google/android/flexbox/c;->acQ: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;->acU:Lcom/google/android/flexbox/a;
+    iget-object v4, v9, Lcom/google/android/flexbox/c;->acQ: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;->acU:Lcom/google/android/flexbox/a;
+    iget-object v4, v9, Lcom/google/android/flexbox/c;->acQ: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;->acU:Lcom/google/android/flexbox/a;
+    iget-object v7, v9, Lcom/google/android/flexbox/c;->acQ: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;->acU:Lcom/google/android/flexbox/a;
+    iget-object v1, v9, Lcom/google/android/flexbox/c;->acQ:Lcom/google/android/flexbox/a;
 
-    invoke-interface {v1, v6, v5}, Lcom/google/android/flexbox/a;->a(ILandroid/view/View;)V
+    invoke-interface {v1, v6, v5}, Lcom/google/android/flexbox/a;->b(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;->acK:I
+    iget v4, v3, Lcom/google/android/flexbox/b;->acG: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;->lw()I
+    invoke-virtual/range {v23 .. v23}, Lcom/google/android/flexbox/b;->lu()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;->acM:I
+    iget v0, v3, Lcom/google/android/flexbox/b;->acI: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;->acU:Lcom/google/android/flexbox/a;
+    iget-object v1, v9, Lcom/google/android/flexbox/c;->acQ: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;->acU:Lcom/google/android/flexbox/a;
+    iget-object v3, v9, Lcom/google/android/flexbox/c;->acQ: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;->lt()I
+    invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->lr()I
 
     move-result v3
 
     add-int/2addr v2, v3
 
-    invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->lv()I
+    invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->lt()I
 
     move-result v3
 
@@ -3415,13 +3415,13 @@
 
     if-ne v1, v3, :cond_b
 
-    iget-object v1, v9, Lcom/google/android/flexbox/c;->acU:Lcom/google/android/flexbox/a;
+    iget-object v1, v9, Lcom/google/android/flexbox/c;->acQ: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;->acU:Lcom/google/android/flexbox/a;
+    iget-object v4, v9, Lcom/google/android/flexbox/c;->acQ: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;->ls()I
+    invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->lq()I
 
     move-result v4
 
     add-int/2addr v3, v4
 
-    invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->lu()I
+    invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->ls()I
 
     move-result v4
 
@@ -3467,9 +3467,9 @@
 
     move/from16 v2, v28
 
-    iput v2, v3, Lcom/google/android/flexbox/b;->acK:I
+    iput v2, v3, Lcom/google/android/flexbox/b;->acG:I
 
-    iput v6, v3, Lcom/google/android/flexbox/b;->acT:I
+    iput v6, v3, Lcom/google/android/flexbox/b;->acP:I
 
     move v11, v0
 
@@ -3499,7 +3499,7 @@
     move/from16 v0, v21
 
     :goto_8
-    iget-object v1, v9, Lcom/google/android/flexbox/c;->acW:[I
+    iget-object v1, v9, Lcom/google/android/flexbox/c;->acS:[I
 
     if-eqz v1, :cond_d
 
@@ -3510,7 +3510,7 @@
     aput v4, v1, v6
 
     :cond_d
-    iget v1, v3, Lcom/google/android/flexbox/b;->acK:I
+    iget v1, v3, Lcom/google/android/flexbox/b;->acG: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;->acK:I
+    iput v1, v3, Lcom/google/android/flexbox/b;->acG:I
 
-    iget v1, v3, Lcom/google/android/flexbox/b;->acO:F
+    iget v1, v3, Lcom/google/android/flexbox/b;->acK:F
 
-    invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->ln()F
+    invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->ll()F
 
     move-result v4
 
     add-float/2addr v1, v4
 
-    iput v1, v3, Lcom/google/android/flexbox/b;->acO:F
+    iput v1, v3, Lcom/google/android/flexbox/b;->acK:F
 
-    iget v1, v3, Lcom/google/android/flexbox/b;->acP:F
+    iget v1, v3, Lcom/google/android/flexbox/b;->acL:F
 
-    invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->lo()F
+    invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->lm()F
 
     move-result v4
 
     add-float/2addr v1, v4
 
-    iput v1, v3, Lcom/google/android/flexbox/b;->acP:F
+    iput v1, v3, Lcom/google/android/flexbox/b;->acL:F
 
-    iget-object v1, v9, Lcom/google/android/flexbox/c;->acU:Lcom/google/android/flexbox/a;
+    iget-object v1, v9, Lcom/google/android/flexbox/c;->acQ: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;->acU:Lcom/google/android/flexbox/a;
+    iget-object v4, v9, Lcom/google/android/flexbox/c;->acQ: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;->acM:I
+    iget v1, v3, Lcom/google/android/flexbox/b;->acI:I
 
     invoke-static {v1, v0}, Ljava/lang/Math;->max(II)I
 
     move-result v1
 
-    iput v1, v3, Lcom/google/android/flexbox/b;->acM:I
+    iput v1, v3, Lcom/google/android/flexbox/b;->acI:I
 
     if-eqz v14, :cond_f
 
-    iget-object v1, v9, Lcom/google/android/flexbox/c;->acU:Lcom/google/android/flexbox/a;
+    iget-object v1, v9, Lcom/google/android/flexbox/c;->acQ: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;->acQ:I
+    iget v1, v3, Lcom/google/android/flexbox/b;->acM:I
 
     invoke-virtual {v13}, Landroid/view/View;->getBaseline()I
 
     move-result v4
 
-    invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->lt()I
+    invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->lr()I
 
     move-result v7
 
@@ -3620,12 +3620,12 @@
 
     move-result v1
 
-    iput v1, v3, Lcom/google/android/flexbox/b;->acQ:I
+    iput v1, v3, Lcom/google/android/flexbox/b;->acM:I
 
     goto :goto_9
 
     :cond_e
-    iget v1, v3, Lcom/google/android/flexbox/b;->acQ:I
+    iget v1, v3, Lcom/google/android/flexbox/b;->acM: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;->lv()I
+    invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->lt()I
 
     move-result v7
 
@@ -3647,7 +3647,7 @@
 
     move-result v1
 
-    iput v1, v3, Lcom/google/android/flexbox/b;->acQ:I
+    iput v1, v3, Lcom/google/android/flexbox/b;->acM: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;->acM:I
+    iget v4, v3, Lcom/google/android/flexbox/b;->acI:I
 
     add-int/2addr v11, v4
 
@@ -3700,7 +3700,7 @@
 
     if-nez v22, :cond_12
 
-    iget v4, v3, Lcom/google/android/flexbox/b;->acM:I
+    iget v4, v3, Lcom/google/android/flexbox/b;->acI: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;->ada:I
+    iput v4, v0, Lcom/google/android/flexbox/c$a;->acW:I
 
     return-void
 .end method
@@ -3813,7 +3813,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/flexbox/c;->acW:[I
+    iget-object v0, p0, Lcom/google/android/flexbox/c;->acS:[I
 
     aget v0, v0, p2
 
@@ -3840,7 +3840,7 @@
     goto :goto_0
 
     :cond_1
-    iget-object p1, p0, Lcom/google/android/flexbox/c;->acW:[I
+    iget-object p1, p0, Lcom/google/android/flexbox/c;->acS:[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;->acX:[J
+    iget-object p1, p0, Lcom/google/android/flexbox/c;->acT:[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;->acU:Lcom/google/android/flexbox/a;
+    iget-object v0, p0, Lcom/google/android/flexbox/c;->acQ: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;->adb:I
+    iput p1, v2, Lcom/google/android/flexbox/c$b;->acX:I
 
     goto :goto_0
 
     :cond_0
-    iput v3, v2, Lcom/google/android/flexbox/c$b;->adb:I
+    iput v3, v2, Lcom/google/android/flexbox/c$b;->acX: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;->acU:Lcom/google/android/flexbox/a;
+    iget-object p1, p0, Lcom/google/android/flexbox/c;->acQ: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;->acU:Lcom/google/android/flexbox/a;
+    iget-object v2, v0, Lcom/google/android/flexbox/c;->acQ: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;->acU:Lcom/google/android/flexbox/a;
+    iget-object v2, v0, Lcom/google/android/flexbox/c;->acQ: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;->acU:Lcom/google/android/flexbox/a;
+    iget-object v3, v0, Lcom/google/android/flexbox/c;->acQ: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;->acW:[I
+    iget-object v3, v0, Lcom/google/android/flexbox/c;->acS:[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;->acU:Lcom/google/android/flexbox/a;
+    iget-object v3, v0, Lcom/google/android/flexbox/c;->acQ: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;->acT:I
+    iget v14, v11, Lcom/google/android/flexbox/b;->acP:I
 
     add-int/2addr v14, v13
 
-    iget-object v15, v0, Lcom/google/android/flexbox/c;->acU:Lcom/google/android/flexbox/a;
+    iget-object v15, v0, Lcom/google/android/flexbox/c;->acQ: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;->acU:Lcom/google/android/flexbox/a;
+    iget-object v15, v0, Lcom/google/android/flexbox/c;->acQ: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;->lp()I
+    invoke-interface {v5}, Lcom/google/android/flexbox/FlexItem;->ln()I
 
     move-result v9
 
@@ -4095,7 +4095,7 @@
 
     if-eq v9, v6, :cond_2
 
-    invoke-interface {v5}, Lcom/google/android/flexbox/FlexItem;->lp()I
+    invoke-interface {v5}, Lcom/google/android/flexbox/FlexItem;->ln()I
 
     move-result v5
 
@@ -4133,14 +4133,14 @@
 
     :cond_4
     :goto_3
-    iget v5, v11, Lcom/google/android/flexbox/b;->acM:I
+    iget v5, v11, Lcom/google/android/flexbox/b;->acI: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;->acM:I
+    iget v5, v11, Lcom/google/android/flexbox/b;->acI: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;->acU:Lcom/google/android/flexbox/a;
+    iget-object v1, v0, Lcom/google/android/flexbox/c;->acQ: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;->acS:Ljava/util/List;
+    iget-object v5, v3, Lcom/google/android/flexbox/b;->acO: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;->acU:Lcom/google/android/flexbox/a;
+    iget-object v7, v0, Lcom/google/android/flexbox/c;->acQ: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;->acM:I
+    iget v11, v3, Lcom/google/android/flexbox/b;->acI: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;->acM:I
+    iget v11, v3, Lcom/google/android/flexbox/b;->acI: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;->acY:[J
+    iget-object v0, p0, Lcom/google/android/flexbox/c;->acU:[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;->acY:[J
+    iput-object p1, p0, Lcom/google/android/flexbox/c;->acU:[J
 
     return-void
 
@@ -4305,13 +4305,13 @@
     move p1, v0
 
     :cond_2
-    iget-object v0, p0, Lcom/google/android/flexbox/c;->acY:[J
+    iget-object v0, p0, Lcom/google/android/flexbox/c;->acU:[J
 
     invoke-static {v0, p1}, Ljava/util/Arrays;->copyOf([JI)[J
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/flexbox/c;->acY:[J
+    iput-object p1, p0, Lcom/google/android/flexbox/c;->acU:[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;->acX:[J
+    iget-object v0, p0, Lcom/google/android/flexbox/c;->acT:[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;->acX:[J
+    iput-object p1, p0, Lcom/google/android/flexbox/c;->acT:[J
 
     return-void
 
@@ -4351,13 +4351,13 @@
     move p1, v0
 
     :cond_2
-    iget-object v0, p0, Lcom/google/android/flexbox/c;->acX:[J
+    iget-object v0, p0, Lcom/google/android/flexbox/c;->acT:[J
 
     invoke-static {v0, p1}, Ljava/util/Arrays;->copyOf([JI)[J
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/flexbox/c;->acX:[J
+    iput-object p1, p0, Lcom/google/android/flexbox/c;->acT:[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;->acW:[I
+    iget-object v0, p0, Lcom/google/android/flexbox/c;->acS:[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;->acW:[I
+    iput-object p1, p0, Lcom/google/android/flexbox/c;->acS:[I
 
     return-void
 
@@ -4397,13 +4397,13 @@
     move p1, v0
 
     :cond_2
-    iget-object v0, p0, Lcom/google/android/flexbox/c;->acW:[I
+    iget-object v0, p0, Lcom/google/android/flexbox/c;->acS:[I
 
     invoke-static {v0, p1}, Ljava/util/Arrays;->copyOf([II)[I
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/flexbox/c;->acW:[I
+    iput-object p1, p0, Lcom/google/android/flexbox/c;->acS:[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;->acU:Lcom/google/android/flexbox/a;
+    iget-object v0, p0, Lcom/google/android/flexbox/c;->acQ: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;->acU:Lcom/google/android/flexbox/a;
+    iget-object v0, p0, Lcom/google/android/flexbox/c;->acQ: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;->acU:Lcom/google/android/flexbox/a;
+    iget-object v4, p0, Lcom/google/android/flexbox/c;->acQ: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;->acU:Lcom/google/android/flexbox/a;
+    iget-object v0, p0, Lcom/google/android/flexbox/c;->acQ: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;->acU:Lcom/google/android/flexbox/a;
+    iget-object v0, p0, Lcom/google/android/flexbox/c;->acQ: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;->acU:Lcom/google/android/flexbox/a;
+    iget-object v0, p0, Lcom/google/android/flexbox/c;->acQ: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;->acU:Lcom/google/android/flexbox/a;
+    iget-object v1, p0, Lcom/google/android/flexbox/c;->acQ: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;->acU:Lcom/google/android/flexbox/a;
+    iget-object v0, p0, Lcom/google/android/flexbox/c;->acQ: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;->acU:Lcom/google/android/flexbox/a;
+    iget-object v0, p0, Lcom/google/android/flexbox/c;->acQ: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;->acU:Lcom/google/android/flexbox/a;
+    iget-object v2, p0, Lcom/google/android/flexbox/c;->acQ: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;->acU:Lcom/google/android/flexbox/a;
+    iget-object v0, p0, Lcom/google/android/flexbox/c;->acQ: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;->acU:Lcom/google/android/flexbox/a;
+    iget-object v0, p0, Lcom/google/android/flexbox/c;->acQ: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;->acU:Lcom/google/android/flexbox/a;
+    iget-object v2, p0, Lcom/google/android/flexbox/c;->acQ: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;->acW:[I
+    iget-object v3, p0, Lcom/google/android/flexbox/c;->acS:[I
 
     if-eqz v3, :cond_6
 
     aget v2, v3, p3
 
     :cond_6
-    iget-object p3, p0, Lcom/google/android/flexbox/c;->acU:Lcom/google/android/flexbox/a;
+    iget-object p3, p0, Lcom/google/android/flexbox/c;->acQ: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;->acK:I
+    iget v2, v5, Lcom/google/android/flexbox/b;->acG: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;->acU:Lcom/google/android/flexbox/a;
+    iget-object v0, p0, Lcom/google/android/flexbox/c;->acQ: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;->acU:Lcom/google/android/flexbox/a;
+    iget-object v0, p0, Lcom/google/android/flexbox/c;->acQ: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;->acU:Lcom/google/android/flexbox/a;
+    iget-object p1, p0, Lcom/google/android/flexbox/c;->acQ: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;->acM:I
+    iput p2, p1, Lcom/google/android/flexbox/b;->acI:I
 
     return-void
 
@@ -4927,7 +4927,7 @@
 
     if-lt p3, v2, :cond_14
 
-    iget-object p3, p0, Lcom/google/android/flexbox/c;->acU:Lcom/google/android/flexbox/a;
+    iget-object p3, p0, Lcom/google/android/flexbox/c;->acQ: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;->acM:I
+    iget v2, v1, Lcom/google/android/flexbox/b;->acI:I
 
     int-to-float v2, v2
 
@@ -5035,7 +5035,7 @@
 
     :cond_7
     :goto_3
-    iput v8, v1, Lcom/google/android/flexbox/b;->acM:I
+    iput v8, v1, Lcom/google/android/flexbox/b;->acI: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;->acU:Lcom/google/android/flexbox/a;
+    iget-object p3, p0, Lcom/google/android/flexbox/c;->acQ: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;->acM:I
+    iput p2, p3, Lcom/google/android/flexbox/b;->acI: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;->acU:Lcom/google/android/flexbox/a;
+    iget-object p2, p0, Lcom/google/android/flexbox/c;->acQ: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;->acM:I
+    iput v1, v8, Lcom/google/android/flexbox/b;->acI:I
 
     const/4 v1, 0x0
 
@@ -5185,10 +5185,10 @@
 
     move-result v9
 
-    iput v9, v8, Lcom/google/android/flexbox/b;->acM:I
+    iput v9, v8, Lcom/google/android/flexbox/b;->acI:I
 
     :goto_6
-    iget v9, v8, Lcom/google/android/flexbox/b;->acM:I
+    iget v9, v8, Lcom/google/android/flexbox/b;->acI:I
 
     int-to-float v9, v9
 
@@ -5200,11 +5200,11 @@
 
     if-lez v9, :cond_e
 
-    iget v9, v8, Lcom/google/android/flexbox/b;->acM:I
+    iget v9, v8, Lcom/google/android/flexbox/b;->acI:I
 
     add-int/2addr v9, v3
 
-    iput v9, v8, Lcom/google/android/flexbox/b;->acM:I
+    iput v9, v8, Lcom/google/android/flexbox/b;->acI:I
 
     sub-float/2addr v1, v7
 
@@ -5215,11 +5215,11 @@
 
     if-gez v9, :cond_f
 
-    iget v9, v8, Lcom/google/android/flexbox/b;->acM:I
+    iget v9, v8, Lcom/google/android/flexbox/b;->acI:I
 
     sub-int/2addr v9, v3
 
-    iput v9, v8, Lcom/google/android/flexbox/b;->acM:I
+    iput v9, v8, Lcom/google/android/flexbox/b;->acI:I
 
     add-float/2addr v1, v7
 
@@ -5233,14 +5233,14 @@
     goto :goto_5
 
     :cond_11
-    iget-object p1, p0, Lcom/google/android/flexbox/c;->acU:Lcom/google/android/flexbox/a;
+    iget-object p1, p0, Lcom/google/android/flexbox/c;->acQ: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;->acU:Lcom/google/android/flexbox/a;
+    iget-object p3, p0, Lcom/google/android/flexbox/c;->acQ: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;->acM:I
+    iput p2, p1, Lcom/google/android/flexbox/b;->acI:I
 
     invoke-interface {v0, v5, p1}, Ljava/util/List;->add(ILjava/lang/Object;)V
 
@@ -5266,7 +5266,7 @@
     return-void
 .end method
 
-.method final lx()V
+.method final lv()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 f9beb51a9d..2108b495c3 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 amJ:Ljava/lang/Object;
+.field private final amF: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;->amJ:Ljava/lang/Object;
+    iput-object p1, p0, Lcom/google/android/gms/a/b;->amF: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;->amJ:Ljava/lang/Object;
+    iget-object p0, p0, Lcom/google/android/gms/a/b;->amF: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 c9df1b4243..fc5c0d2d30 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 adO:Ljava/lang/ref/WeakReference;
+.field private adK:Ljava/lang/ref/WeakReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/ref/WeakReference<",
@@ -24,11 +24,11 @@
     .end annotation
 .end field
 
-.field private adP:J
+.field private adL:J
 
-.field adQ:Ljava/util/concurrent/CountDownLatch;
+.field adM:Ljava/util/concurrent/CountDownLatch;
 
-.field adR:Z
+.field adN: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;->adO:Ljava/lang/ref/WeakReference;
+    iput-object v0, p0, Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$a;->adK:Ljava/lang/ref/WeakReference;
 
-    iput-wide p2, p0, Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$a;->adP:J
+    iput-wide p2, p0, Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$a;->adL: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;->adQ:Ljava/util/concurrent/CountDownLatch;
+    iput-object p1, p0, Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$a;->adM:Ljava/util/concurrent/CountDownLatch;
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$a;->adR:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$a;->adN: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;->adO:Ljava/lang/ref/WeakReference;
+    iget-object v0, p0, Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$a;->adK: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;->adR:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$a;->adN: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;->adQ:Ljava/util/concurrent/CountDownLatch;
+    iget-object v0, p0, Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$a;->adM:Ljava/util/concurrent/CountDownLatch;
 
-    iget-wide v1, p0, Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$a;->adP:J
+    iget-wide v1, p0, Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$a;->adL: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 5345422e91..e179ae2288 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 adS:Ljava/util/Map;
+.field private final synthetic adO: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;->adS:Ljava/util/Map;
+    iput-object p1, p0, Lcom/google/android/gms/ads/identifier/a;->adO: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;->adS:Ljava/util/Map;
+    iget-object v2, p0, Lcom/google/android/gms/ads/identifier/a;->adO: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 292cf7078a..3826972d4e 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 adT:Landroid/content/SharedPreferences;
+.field private adP: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;->adT:Landroid/content/SharedPreferences;
+    iput-object p1, p0, Lcom/google/android/gms/ads/identifier/b;->adP: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;->adT:Landroid/content/SharedPreferences;
+    iput-object v0, p0, Lcom/google/android/gms/ads/identifier/b;->adP: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;->adT:Landroid/content/SharedPreferences;
+    iget-object v1, p0, Lcom/google/android/gms/ads/identifier/b;->adP:Landroid/content/SharedPreferences;
 
     if-nez v1, :cond_0
 
     return v0
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/ads/identifier/b;->adT:Landroid/content/SharedPreferences;
+    iget-object v1, p0, Lcom/google/android/gms/ads/identifier/b;->adP: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;->adT:Landroid/content/SharedPreferences;
+    iget-object v1, p0, Lcom/google/android/gms/ads/identifier/b;->adP:Landroid/content/SharedPreferences;
 
     if-nez v1, :cond_0
 
     return v0
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/ads/identifier/b;->adT:Landroid/content/SharedPreferences;
+    iget-object v1, p0, Lcom/google/android/gms/ads/identifier/b;->adP: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;->adT:Landroid/content/SharedPreferences;
+    iget-object v0, p0, Lcom/google/android/gms/ads/identifier/b;->adP:Landroid/content/SharedPreferences;
 
     if-nez v0, :cond_0
 
     return-object p2
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/ads/identifier/b;->adT:Landroid/content/SharedPreferences;
+    iget-object v0, p0, Lcom/google/android/gms/ads/identifier/b;->adP: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 1307e5bf14..4f92193275 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 adU:Lcom/google/android/gms/internal/gtm/bk;
+.field private adQ: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 lD()Lcom/google/android/gms/internal/gtm/bk;
+.method private final lB()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;->adU:Lcom/google/android/gms/internal/gtm/bk;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/AnalyticsJobService;->adQ: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;->adU:Lcom/google/android/gms/internal/gtm/bk;
+    iput-object v0, p0, Lcom/google/android/gms/analytics/AnalyticsJobService;->adQ:Lcom/google/android/gms/internal/gtm/bk;
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/analytics/AnalyticsJobService;->adU:Lcom/google/android/gms/internal/gtm/bk;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/AnalyticsJobService;->adQ: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;->lD()Lcom/google/android/gms/internal/gtm/bk;
+    invoke-direct {p0}, Lcom/google/android/gms/analytics/AnalyticsJobService;->lB()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;->lD()Lcom/google/android/gms/internal/gtm/bk;
+    invoke-direct {p0}, Lcom/google/android/gms/analytics/AnalyticsJobService;->lB()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;->lD()Lcom/google/android/gms/internal/gtm/bk;
+    invoke-direct {p0}, Lcom/google/android/gms/analytics/AnalyticsJobService;->lB()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;->lD()Lcom/google/android/gms/internal/gtm/bk;
+    invoke-direct {p0}, Lcom/google/android/gms/analytics/AnalyticsJobService;->lB()Lcom/google/android/gms/internal/gtm/bk;
 
     move-result-object v0
 
-    iget-object v1, v0, Lcom/google/android/gms/internal/gtm/bk;->arl:Landroid/content/Context;
+    iget-object v1, v0, Lcom/google/android/gms/internal/gtm/bk;->arh: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;->om()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/m;->ok()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 6a9e7b702f..4e68c88386 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 adV:Lcom/google/android/gms/internal/gtm/bj;
+.field private adR: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;->adV:Lcom/google/android/gms/internal/gtm/bj;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/AnalyticsReceiver;->adR: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;->adV:Lcom/google/android/gms/internal/gtm/bj;
+    iput-object v0, p0, Lcom/google/android/gms/analytics/AnalyticsReceiver;->adR: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 5a39a0f64e..7d651dda85 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 adU:Lcom/google/android/gms/internal/gtm/bk;
+.field private adQ: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 lD()Lcom/google/android/gms/internal/gtm/bk;
+.method private final lB()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;->adU:Lcom/google/android/gms/internal/gtm/bk;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/AnalyticsService;->adQ: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;->adU:Lcom/google/android/gms/internal/gtm/bk;
+    iput-object v0, p0, Lcom/google/android/gms/analytics/AnalyticsService;->adQ:Lcom/google/android/gms/internal/gtm/bk;
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/analytics/AnalyticsService;->adU:Lcom/google/android/gms/internal/gtm/bk;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/AnalyticsService;->adQ: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;->lD()Lcom/google/android/gms/internal/gtm/bk;
+    invoke-direct {p0}, Lcom/google/android/gms/analytics/AnalyticsService;->lB()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;->lD()Lcom/google/android/gms/internal/gtm/bk;
+    invoke-direct {p0}, Lcom/google/android/gms/analytics/AnalyticsService;->lB()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;->lD()Lcom/google/android/gms/internal/gtm/bk;
+    invoke-direct {p0}, Lcom/google/android/gms/analytics/AnalyticsService;->lB()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;->lD()Lcom/google/android/gms/internal/gtm/bk;
+    invoke-direct {p0}, Lcom/google/android/gms/analytics/AnalyticsService;->lB()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 58e5e37ff7..7f54b10aa6 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 adW:Ljava/lang/Boolean;
+.field private static adS: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;->adW:Ljava/lang/Boolean;
+    sget-object v0, Lcom/google/android/gms/analytics/a;->adS: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;->adW:Ljava/lang/Boolean;
+    sput-object v0, Lcom/google/android/gms/analytics/a;->adS: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;->om()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/m;->ok()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;->oO()I
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oM()I
 
     move-result p2
 
@@ -141,7 +141,7 @@
 
     move-result-object p2
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/m;->oe()Lcom/google/android/gms/internal/gtm/e;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/m;->oc()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 b68c4ced28..adb98f663b 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 aed:Ljava/util/Map;
+.field private adY: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;->aed:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/android/gms/analytics/a/a;->adY: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;->aed:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/analytics/a/a;->adY: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;->aed:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/a/a;->adY: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 bb00f7ed94..0c4db2cae2 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 aed:Ljava/util/Map;
+.field private adY:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -16,7 +16,7 @@
 
 
 # virtual methods
-.method public final lG()Ljava/util/Map;
+.method public final lE()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;->aed:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/analytics/a/b;->adY: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;->aed:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/analytics/a/b;->adY: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 a00531df17..0bc4242d88 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 aed:Ljava/util/Map;
+.field private adY: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;->aed:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/android/gms/analytics/a/c;->adY: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;->aed:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/analytics/a/c;->adY: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;->aed:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/a/c;->adY: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 963170c289..9d1edaa933 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 adX:Ljava/util/List;
+.field private static adT:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -15,9 +15,9 @@
 
 
 # instance fields
-.field public adY:Z
+.field public adU:Z
 
-.field private adZ:Ljava/util/Set;
+.field private adV:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -27,9 +27,9 @@
     .end annotation
 .end field
 
-.field public aea:Z
+.field public adW:Z
 
-.field volatile aeb:Z
+.field volatile adX:Z
 
 
 # direct methods
@@ -40,7 +40,7 @@
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/analytics/b;->adX:Ljava/util/List;
+    sput-object v0, Lcom/google/android/gms/analytics/b;->adT: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;->adZ:Ljava/util/Set;
+    iput-object p1, p0, Lcom/google/android/gms/analytics/b;->adV:Ljava/util/Set;
 
     return-void
 .end method
 
-.method public static lE()V
+.method public static lC()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;->adX:Ljava/util/List;
+    sget-object v1, Lcom/google/android/gms/analytics/b;->adT:Ljava/util/List;
 
     if-eqz v1, :cond_1
 
-    sget-object v1, Lcom/google/android/gms/analytics/b;->adX:Ljava/util/List;
+    sget-object v1, Lcom/google/android/gms/analytics/b;->adT: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;->adX:Ljava/util/List;
+    sput-object v1, Lcom/google/android/gms/analytics/b;->adT: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;->adY:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/analytics/b;->adU: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 0f453df6c3..88c92157ec 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 lF()I
+.method public abstract lD()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 2c092db4ee..c165979626 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 aee:Lcom/google/android/gms/internal/gtm/m;
+.field public final adZ:Lcom/google/android/gms/internal/gtm/m;
 
-.field public aef:Z
+.field public aea: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;->od()Lcom/google/android/gms/analytics/m;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/m;->ob()Lcom/google/android/gms/analytics/m;
 
     move-result-object v0
 
-    iget-object v1, p1, Lcom/google/android/gms/internal/gtm/m;->aem:Lcom/google/android/gms/common/util/e;
+    iget-object v1, p1, Lcom/google/android/gms/internal/gtm/m;->aei: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;->aee:Lcom/google/android/gms/internal/gtm/m;
+    iput-object p1, p0, Lcom/google/android/gms/analytics/d;->adZ: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;->aoE:Ljava/lang/String;
+    iget-object v0, p1, Lcom/google/android/gms/internal/gtm/ch;->aoA: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;->aee:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/d;->adZ:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->oo()Lcom/google/android/gms/internal/gtm/ae;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->om()Lcom/google/android/gms/internal/gtm/ae;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/ae;->oH()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/ae;->oF()Ljava/lang/String;
 
     move-result-object v0
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/ch;->aoE:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/ch;->aoA:Ljava/lang/String;
 
     :cond_0
-    iget-boolean v0, p0, Lcom/google/android/gms/analytics/d;->aef:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/analytics/d;->aea:Z
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p1, Lcom/google/android/gms/internal/gtm/ch;->asm:Ljava/lang/String;
+    iget-object v0, p1, Lcom/google/android/gms/internal/gtm/ch;->asi: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;->aee:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/d;->adZ:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v1, v0, Lcom/google/android/gms/internal/gtm/m;->aox:Lcom/google/android/gms/internal/gtm/d;
+    iget-object v1, v0, Lcom/google/android/gms/internal/gtm/m;->aot: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;->aox:Lcom/google/android/gms/internal/gtm/d;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aot:Lcom/google/android/gms/internal/gtm/d;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/d;->nV()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/d;->nT()Ljava/lang/String;
 
     move-result-object v1
 
-    iput-object v1, p1, Lcom/google/android/gms/internal/gtm/ch;->asm:Ljava/lang/String;
+    iput-object v1, p1, Lcom/google/android/gms/internal/gtm/ch;->asi:Ljava/lang/String;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/d;->nU()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/d;->nS()Z
 
     move-result v0
 
-    iput-boolean v0, p1, Lcom/google/android/gms/internal/gtm/ch;->asn:Z
+    iput-boolean v0, p1, Lcom/google/android/gms/internal/gtm/ch;->asj:Z
 
     :cond_1
     return-void
@@ -114,9 +114,9 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/analytics/l;->aex:Lcom/google/android/gms/analytics/j;
+    iget-object v1, p0, Lcom/google/android/gms/analytics/l;->aet:Lcom/google/android/gms/analytics/j;
 
-    iget-object v1, v1, Lcom/google/android/gms/analytics/j;->aev:Ljava/util/List;
+    iget-object v1, v1, Lcom/google/android/gms/analytics/j;->aer: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;->lI()Landroid/net/Uri;
+    invoke-interface {v2}, Lcom/google/android/gms/analytics/p;->lG()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;->aex:Lcom/google/android/gms/analytics/j;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/l;->aet:Lcom/google/android/gms/analytics/j;
 
-    iget-object v0, v0, Lcom/google/android/gms/analytics/j;->aev:Ljava/util/List;
+    iget-object v0, v0, Lcom/google/android/gms/analytics/j;->aer:Ljava/util/List;
 
     new-instance v1, Lcom/google/android/gms/analytics/e;
 
-    iget-object v2, p0, Lcom/google/android/gms/analytics/d;->aee:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v2, p0, Lcom/google/android/gms/analytics/d;->adZ: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 lH()Lcom/google/android/gms/analytics/j;
+.method public final lF()Lcom/google/android/gms/analytics/j;
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/analytics/l;->aex:Lcom/google/android/gms/analytics/j;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/l;->aet:Lcom/google/android/gms/analytics/j;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/analytics/j;->lJ()Lcom/google/android/gms/analytics/j;
+    invoke-virtual {v0}, Lcom/google/android/gms/analytics/j;->lH()Lcom/google/android/gms/analytics/j;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/analytics/d;->aee:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v1, p0, Lcom/google/android/gms/analytics/d;->adZ:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v2, v1, Lcom/google/android/gms/internal/gtm/m;->aoy:Lcom/google/android/gms/internal/gtm/x;
+    iget-object v2, v1, Lcom/google/android/gms/internal/gtm/m;->aou: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;->aoy:Lcom/google/android/gms/internal/gtm/x;
+    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/m;->aou:Lcom/google/android/gms/internal/gtm/x;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/x;->ox()Lcom/google/android/gms/internal/gtm/by;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/x;->ov()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;->aee:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v1, p0, Lcom/google/android/gms/analytics/d;->adZ:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/m;->aoz:Lcom/google/android/gms/internal/gtm/aq;
+    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/m;->aov:Lcom/google/android/gms/internal/gtm/aq;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/aq;->pa()Lcom/google/android/gms/internal/gtm/cd;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/aq;->oY()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;->lL()V
+    invoke-virtual {p0}, Lcom/google/android/gms/analytics/l;->lJ()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 7f305284e8..455abaee1b 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 aeg:Ljava/text/DecimalFormat;
+.field private static aeb:Ljava/text/DecimalFormat;
 
 
 # instance fields
-.field private final aee:Lcom/google/android/gms/internal/gtm/m;
+.field private final adZ:Lcom/google/android/gms/internal/gtm/m;
 
-.field private final aeh:Ljava/lang/String;
+.field private final aed:Ljava/lang/String;
 
-.field private final aei:Landroid/net/Uri;
+.field private final aee: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;->aee:Lcom/google/android/gms/internal/gtm/m;
+    iput-object p1, p0, Lcom/google/android/gms/analytics/e;->adZ:Lcom/google/android/gms/internal/gtm/m;
 
-    iput-object p2, p0, Lcom/google/android/gms/analytics/e;->aeh:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/analytics/e;->aed:Ljava/lang/String;
 
-    iget-object p1, p0, Lcom/google/android/gms/analytics/e;->aeh:Ljava/lang/String;
+    iget-object p1, p0, Lcom/google/android/gms/analytics/e;->aed: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;->aei:Landroid/net/Uri;
+    iput-object p1, p0, Lcom/google/android/gms/analytics/e;->aee: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;->aeg:Ljava/text/DecimalFormat;
+    sget-object v0, Lcom/google/android/gms/analytics/e;->aeb: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;->aeg:Ljava/text/DecimalFormat;
+    sput-object v0, Lcom/google/android/gms/analytics/e;->aeb:Ljava/text/DecimalFormat;
 
     :cond_0
-    sget-object v0, Lcom/google/android/gms/analytics/e;->aeg:Ljava/text/DecimalFormat;
+    sget-object v0, Lcom/google/android/gms/analytics/e;->aeb: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;->aoI:Ljava/util/Map;
+    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/cc;->aoE: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;->ask:Ljava/lang/String;
+    iget-object v2, v1, Lcom/google/android/gms/internal/gtm/ch;->asg: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;->aoE:Ljava/lang/String;
+    iget-object v2, v1, Lcom/google/android/gms/internal/gtm/ch;->aoA: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;->asl:Ljava/lang/String;
+    iget-object v2, v1, Lcom/google/android/gms/internal/gtm/ch;->ash: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;->aso:Ljava/lang/String;
+    iget-object v2, v1, Lcom/google/android/gms/internal/gtm/ch;->ask: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;->asq:D
+    iget-wide v2, v1, Lcom/google/android/gms/internal/gtm/ch;->asm: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;->asp:Z
+    iget-boolean v2, v1, Lcom/google/android/gms/internal/gtm/ch;->asl: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;->asm:Ljava/lang/String;
+    iget-object v2, v1, Lcom/google/android/gms/internal/gtm/ch;->asi: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;->asn:Z
+    iget-boolean v1, v1, Lcom/google/android/gms/internal/gtm/ch;->asj: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;->anJ:Ljava/lang/String;
+    iget-object v3, v1, Lcom/google/android/gms/internal/gtm/a;->anF: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;->anK:I
+    iget v3, v1, Lcom/google/android/gms/internal/gtm/a;->anG: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;->anN:Ljava/lang/String;
+    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/a;->anJ: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;->asf:Ljava/lang/String;
+    iget-object v3, v1, Lcom/google/android/gms/internal/gtm/cf;->asb: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;->asg:Ljava/lang/String;
+    iget-object v3, v1, Lcom/google/android/gms/internal/gtm/cf;->asc: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;->ash:J
+    iget-wide v3, v1, Lcom/google/android/gms/internal/gtm/cf;->asd: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;->arL:Ljava/lang/String;
+    iget-object v4, v1, Lcom/google/android/gms/internal/gtm/bz;->arH: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;->arM:Ljava/lang/String;
+    iget-object v4, v1, Lcom/google/android/gms/internal/gtm/bz;->arI: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;->arN:Ljava/lang/String;
+    iget-object v4, v1, Lcom/google/android/gms/internal/gtm/bz;->arJ: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;->arO:Ljava/lang/String;
+    iget-object v4, v1, Lcom/google/android/gms/internal/gtm/bz;->arK: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;->apw:Ljava/lang/String;
+    iget-object v4, v1, Lcom/google/android/gms/internal/gtm/bz;->aps: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;->arP:Ljava/lang/String;
+    iget-object v4, v1, Lcom/google/android/gms/internal/gtm/bz;->arL: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;->arQ:Ljava/lang/String;
+    iget-object v4, v1, Lcom/google/android/gms/internal/gtm/bz;->arM: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;->arR:Ljava/lang/String;
+    iget-object v4, v1, Lcom/google/android/gms/internal/gtm/bz;->arN: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;->arS:Ljava/lang/String;
+    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/bz;->arO: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;->asi:Ljava/lang/String;
+    iget-object v4, v1, Lcom/google/android/gms/internal/gtm/cg;->ase: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;->asj:Z
+    iget-boolean v1, v1, Lcom/google/android/gms/internal/gtm/cg;->asf: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;->anQ:Ljava/lang/String;
+    iget-object v4, v1, Lcom/google/android/gms/internal/gtm/b;->anM: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;->anR:Ljava/lang/String;
+    iget-object v4, v1, Lcom/google/android/gms/internal/gtm/b;->anN: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;->anS:Ljava/lang/String;
+    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/b;->anO: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;->anT:Ljava/lang/String;
+    iget-object v4, v1, Lcom/google/android/gms/internal/gtm/c;->anP: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;->anU:J
+    iget-wide v4, v1, Lcom/google/android/gms/internal/gtm/c;->anQ: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;->anV:Ljava/lang/String;
+    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/c;->anR: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;->arT:Ljava/util/Map;
+    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/ca;->arP: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;->arU:Ljava/util/Map;
+    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/cb;->arQ: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;->ase:Lcom/google/android/gms/analytics/a/b;
+    iget-object v2, v1, Lcom/google/android/gms/internal/gtm/ce;->asa: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;->lG()Ljava/util/Map;
+    invoke-virtual {v2}, Lcom/google/android/gms/analytics/a/b;->lE()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;->asc:Ljava/util/List;
+    iget-object v2, v1, Lcom/google/android/gms/internal/gtm/ce;->arY: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;->asb:Ljava/util/List;
+    iget-object v2, v1, Lcom/google/android/gms/internal/gtm/ce;->arX: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;->asd:Ljava/util/Map;
+    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/ce;->arZ: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;->arV:Ljava/lang/String;
+    iget-object v2, v1, Lcom/google/android/gms/internal/gtm/cd;->arR: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;->arW:I
+    iget v2, v1, Lcom/google/android/gms/internal/gtm/cd;->arS: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;->arX:I
+    iget v2, v1, Lcom/google/android/gms/internal/gtm/cd;->arT:I
 
-    iget v3, v1, Lcom/google/android/gms/internal/gtm/cd;->arY:I
+    iget v3, v1, Lcom/google/android/gms/internal/gtm/cd;->arU: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;->arZ:I
+    iget v2, v1, Lcom/google/android/gms/internal/gtm/cd;->arV:I
 
-    iget v1, v1, Lcom/google/android/gms/internal/gtm/cd;->asa:I
+    iget v1, v1, Lcom/google/android/gms/internal/gtm/cd;->arW: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;->arH:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/by;->arD: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;->arJ:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/by;->arF: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;->arK:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/by;->arG: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;->arI:Ljava/lang/String;
+    iget-object p0, p0, Lcom/google/android/gms/internal/gtm/by;->arE: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;->aen:Z
+    iget-boolean v0, p1, Lcom/google/android/gms/analytics/j;->aej: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;->lJ()Lcom/google/android/gms/analytics/j;
+    invoke-virtual {p1}, Lcom/google/android/gms/analytics/j;->lH()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;->ask:Ljava/lang/String;
+    iget-object v2, v1, Lcom/google/android/gms/internal/gtm/ch;->asg: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;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/j;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/m;->om()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/m;->ok()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;->aoE:Ljava/lang/String;
+    iget-object v2, v1, Lcom/google/android/gms/internal/gtm/ch;->aoA: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;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/j;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/m;->om()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/m;->ok()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;->aee:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v2, p0, Lcom/google/android/gms/analytics/e;->adZ:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/gtm/m;->on()Lcom/google/android/gms/analytics/b;
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/gtm/m;->ol()Lcom/google/android/gms/analytics/b;
 
     move-result-object v2
 
-    iget-boolean v2, v2, Lcom/google/android/gms/analytics/b;->aeb:Z
+    iget-boolean v2, v2, Lcom/google/android/gms/analytics/b;->adX:Z
 
     if-eqz v2, :cond_2
 
     return-void
 
     :cond_2
-    iget-wide v2, v1, Lcom/google/android/gms/internal/gtm/ch;->asq:D
+    iget-wide v2, v1, Lcom/google/android/gms/internal/gtm/ch;->asm:D
 
-    iget-object v4, v1, Lcom/google/android/gms/internal/gtm/ch;->aoE:Ljava/lang/String;
+    iget-object v4, v1, Lcom/google/android/gms/internal/gtm/ch;->aoA: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;->aol:Ljava/lang/String;
+    sget-object v2, Lcom/google/android/gms/internal/gtm/l;->aoh: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;->aeh:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/analytics/e;->aed: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;->aee:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v2, p0, Lcom/google/android/gms/analytics/e;->adZ:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/gtm/m;->on()Lcom/google/android/gms/analytics/b;
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/gtm/m;->ol()Lcom/google/android/gms/analytics/b;
 
     move-result-object v2
 
-    iget-boolean v2, v2, Lcom/google/android/gms/analytics/b;->aea:Z
+    iget-boolean v2, v2, Lcom/google/android/gms/analytics/b;->adW: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;->asl:Ljava/lang/String;
+    iget-object v2, v1, Lcom/google/android/gms/internal/gtm/ch;->ash: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;->arH:Ljava/lang/String;
+    iget-object v3, v2, Lcom/google/android/gms/internal/gtm/by;->arD: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;->arJ:Ljava/lang/String;
+    iget-object v3, v2, Lcom/google/android/gms/internal/gtm/by;->arF: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;->arI:Ljava/lang/String;
+    iget-object v3, v2, Lcom/google/android/gms/internal/gtm/by;->arE: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;->arK:Ljava/lang/String;
+    iget-object v2, v2, Lcom/google/android/gms/internal/gtm/by;->arG: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;->aoE:Ljava/lang/String;
+    iget-object v2, v1, Lcom/google/android/gms/internal/gtm/ch;->aoA:Ljava/lang/String;
 
-    iget-object v3, p0, Lcom/google/android/gms/analytics/e;->aeh:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/analytics/e;->aed:Ljava/lang/String;
 
-    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/ch;->asm:Ljava/lang/String;
+    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/ch;->asi: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;->oe()Lcom/google/android/gms/internal/gtm/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->oc()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;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/j;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/gtm/m;->om()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/gtm/m;->ok()Lcom/google/android/gms/internal/gtm/bd;
 
     move-result-object v2
 
-    iget-wide v3, p1, Lcom/google/android/gms/analytics/j;->aeo:J
+    iget-wide v3, p1, Lcom/google/android/gms/analytics/j;->aek: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;->oe()Lcom/google/android/gms/internal/gtm/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->oc()Lcom/google/android/gms/internal/gtm/e;
 
     move-result-object p1
 
@@ -1526,10 +1526,10 @@
     return-void
 .end method
 
-.method public final lI()Landroid/net/Uri;
+.method public final lG()Landroid/net/Uri;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/analytics/e;->aei:Landroid/net/Uri;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/e;->aee: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 f8490de060..2f89b014b1 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 aej:Landroid/content/BroadcastReceiver$PendingResult;
+.field private final synthetic aef: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;->aej:Landroid/content/BroadcastReceiver$PendingResult;
+    iput-object p1, p0, Lcom/google/android/gms/analytics/f;->aef: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;->aej:Landroid/content/BroadcastReceiver$PendingResult;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/f;->aef: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 02b53c9632..d244cb3ff9 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 aei:Landroid/net/Uri;
+.field private static final aee:Landroid/net/Uri;
 
 
 # instance fields
-.field private final aek:Landroid/util/LogPrinter;
+.field private final aeg:Landroid/util/LogPrinter;
 
 
 # direct methods
@@ -33,7 +33,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/analytics/h;->aei:Landroid/net/Uri;
+    sput-object v0, Lcom/google/android/gms/analytics/h;->aee: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;->aek:Landroid/util/LogPrinter;
+    iput-object v0, p0, Lcom/google/android/gms/analytics/h;->aeg: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;->aeu:Ljava/util/Map;
+    iget-object p1, p1, Lcom/google/android/gms/analytics/j;->aeq: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;->aek:Landroid/util/LogPrinter;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/h;->aeg:Landroid/util/LogPrinter;
 
     invoke-virtual {p1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
@@ -138,10 +138,10 @@
     return-void
 .end method
 
-.method public final lI()Landroid/net/Uri;
+.method public final lG()Landroid/net/Uri;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/analytics/h;->aei:Landroid/net/Uri;
+    sget-object v0, Lcom/google/android/gms/analytics/h;->aee: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 7e67541a74..1f88c00340 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 ael:Lcom/google/android/gms/analytics/l;
+.field final aeh:Lcom/google/android/gms/analytics/l;
 
-.field private final aem:Lcom/google/android/gms/common/util/e;
+.field private final aei:Lcom/google/android/gms/common/util/e;
 
-.field aen:Z
+.field aej:Z
 
-.field aeo:J
+.field aek:J
 
-.field public aep:J
+.field public ael:J
 
-.field private aeq:J
+.field private aem:J
 
-.field private aer:J
+.field private aen:J
 
-.field private aes:J
+.field private aeo:J
 
-.field aet:Z
+.field aep:Z
 
-.field final aeu:Ljava/util/Map;
+.field final aeq:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -35,7 +35,7 @@
     .end annotation
 .end field
 
-.field final aev:Ljava/util/List;
+.field final aer: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;->ael:Lcom/google/android/gms/analytics/l;
+    iget-object v0, p1, Lcom/google/android/gms/analytics/j;->aeh:Lcom/google/android/gms/analytics/l;
 
-    iput-object v0, p0, Lcom/google/android/gms/analytics/j;->ael:Lcom/google/android/gms/analytics/l;
+    iput-object v0, p0, Lcom/google/android/gms/analytics/j;->aeh:Lcom/google/android/gms/analytics/l;
 
-    iget-object v0, p1, Lcom/google/android/gms/analytics/j;->aem:Lcom/google/android/gms/common/util/e;
+    iget-object v0, p1, Lcom/google/android/gms/analytics/j;->aei: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;
+    iput-object v0, p0, Lcom/google/android/gms/analytics/j;->aei:Lcom/google/android/gms/common/util/e;
+
+    iget-wide v0, p1, Lcom/google/android/gms/analytics/j;->aek:J
+
+    iput-wide v0, p0, Lcom/google/android/gms/analytics/j;->aek:J
+
+    iget-wide v0, p1, Lcom/google/android/gms/analytics/j;->ael:J
+
+    iput-wide v0, p0, Lcom/google/android/gms/analytics/j;->ael:J
+
+    iget-wide v0, p1, Lcom/google/android/gms/analytics/j;->aem:J
+
+    iput-wide v0, p0, Lcom/google/android/gms/analytics/j;->aem:J
+
+    iget-wide v0, p1, Lcom/google/android/gms/analytics/j;->aen:J
+
+    iput-wide v0, p0, Lcom/google/android/gms/analytics/j;->aen:J
 
     iget-wide v0, p1, Lcom/google/android/gms/analytics/j;->aeo:J
 
     iput-wide v0, p0, Lcom/google/android/gms/analytics/j;->aeo:J
 
-    iget-wide v0, p1, Lcom/google/android/gms/analytics/j;->aep:J
-
-    iput-wide v0, p0, Lcom/google/android/gms/analytics/j;->aep:J
-
-    iget-wide v0, p1, Lcom/google/android/gms/analytics/j;->aeq:J
-
-    iput-wide v0, p0, Lcom/google/android/gms/analytics/j;->aeq:J
-
-    iget-wide v0, p1, Lcom/google/android/gms/analytics/j;->aer:J
-
-    iput-wide v0, p0, Lcom/google/android/gms/analytics/j;->aer:J
-
-    iget-wide v0, p1, Lcom/google/android/gms/analytics/j;->aes: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;->aev:Ljava/util/List;
+    iget-object v1, p1, Lcom/google/android/gms/analytics/j;->aer: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;->aev:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/android/gms/analytics/j;->aer:Ljava/util/List;
 
     new-instance v0, Ljava/util/HashMap;
 
-    iget-object v1, p1, Lcom/google/android/gms/analytics/j;->aeu:Ljava/util/Map;
+    iget-object v1, p1, Lcom/google/android/gms/analytics/j;->aeq: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;->aeu:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/android/gms/analytics/j;->aeq:Ljava/util/Map;
 
-    iget-object p1, p1, Lcom/google/android/gms/analytics/j;->aeu:Ljava/util/Map;
+    iget-object p1, p1, Lcom/google/android/gms/analytics/j;->aeq: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;->aeu:Ljava/util/Map;
+    iget-object v2, p0, Lcom/google/android/gms/analytics/j;->aeq: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;->ael:Lcom/google/android/gms/analytics/l;
+    iput-object p1, p0, Lcom/google/android/gms/analytics/j;->aeh:Lcom/google/android/gms/analytics/l;
 
-    iput-object p2, p0, Lcom/google/android/gms/analytics/j;->aem:Lcom/google/android/gms/common/util/e;
+    iput-object p2, p0, Lcom/google/android/gms/analytics/j;->aei:Lcom/google/android/gms/common/util/e;
 
     const-wide/32 p1, 0x1b7740
 
-    iput-wide p1, p0, Lcom/google/android/gms/analytics/j;->aer:J
+    iput-wide p1, p0, Lcom/google/android/gms/analytics/j;->aen:J
 
     const-wide p1, 0xb43e9400L
 
-    iput-wide p1, p0, Lcom/google/android/gms/analytics/j;->aes:J
+    iput-wide p1, p0, Lcom/google/android/gms/analytics/j;->aeo: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;->aeu:Ljava/util/Map;
+    iput-object p1, p0, Lcom/google/android/gms/analytics/j;->aeq: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;->aev:Ljava/util/List;
+    iput-object p1, p0, Lcom/google/android/gms/analytics/j;->aer:Ljava/util/List;
 
     return-void
 .end method
@@ -328,7 +328,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/analytics/j;->aeu:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/j;->aeq: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 lJ()Lcom/google/android/gms/analytics/j;
+.method public final lH()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 lK()V
+.method public final lI()V
     .locals 7
 
-    iget-object v0, p0, Lcom/google/android/gms/analytics/j;->ael:Lcom/google/android/gms/analytics/l;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/j;->aeh:Lcom/google/android/gms/analytics/l;
 
-    iget-object v0, v0, Lcom/google/android/gms/analytics/l;->aew:Lcom/google/android/gms/analytics/m;
+    iget-object v0, v0, Lcom/google/android/gms/analytics/l;->aes:Lcom/google/android/gms/analytics/m;
 
-    iget-boolean v1, p0, Lcom/google/android/gms/analytics/j;->aet:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/analytics/j;->aep:Z
 
     if-nez v1, :cond_2
 
-    iget-boolean v1, p0, Lcom/google/android/gms/analytics/j;->aen:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/analytics/j;->aej:Z
 
     if-nez v1, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/analytics/j;->lJ()Lcom/google/android/gms/analytics/j;
+    invoke-virtual {p0}, Lcom/google/android/gms/analytics/j;->lH()Lcom/google/android/gms/analytics/j;
 
     move-result-object v1
 
-    iget-object v2, v1, Lcom/google/android/gms/analytics/j;->aem:Lcom/google/android/gms/common/util/e;
+    iget-object v2, v1, Lcom/google/android/gms/analytics/j;->aei:Lcom/google/android/gms/common/util/e;
 
-    invoke-interface {v2}, Lcom/google/android/gms/common/util/e;->nr()J
+    invoke-interface {v2}, Lcom/google/android/gms/common/util/e;->np()J
 
     move-result-wide v2
 
-    iput-wide v2, v1, Lcom/google/android/gms/analytics/j;->aeq:J
+    iput-wide v2, v1, Lcom/google/android/gms/analytics/j;->aem:J
 
-    iget-wide v2, v1, Lcom/google/android/gms/analytics/j;->aep:J
+    iget-wide v2, v1, Lcom/google/android/gms/analytics/j;->ael: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;->aeo:J
+    iput-wide v2, v1, Lcom/google/android/gms/analytics/j;->aek:J
 
     goto :goto_0
 
     :cond_0
-    iget-object v2, v1, Lcom/google/android/gms/analytics/j;->aem:Lcom/google/android/gms/common/util/e;
+    iget-object v2, v1, Lcom/google/android/gms/analytics/j;->aei: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;->aeo:J
+    iput-wide v2, v1, Lcom/google/android/gms/analytics/j;->aek:J
 
     :goto_0
     const/4 v2, 0x1
 
-    iput-boolean v2, v1, Lcom/google/android/gms/analytics/j;->aen:Z
+    iput-boolean v2, v1, Lcom/google/android/gms/analytics/j;->aej:Z
 
-    iget-object v2, v0, Lcom/google/android/gms/analytics/m;->aeD:Lcom/google/android/gms/analytics/m$a;
+    iget-object v2, v0, Lcom/google/android/gms/analytics/m;->aez: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;->aeu:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/j;->aeq: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;->aeu:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/analytics/j;->aeq: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 b6686bbe61..19ae1f53eb 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 aew:Lcom/google/android/gms/analytics/m;
+.field final aes:Lcom/google/android/gms/analytics/m;
 
-.field protected final aex:Lcom/google/android/gms/analytics/j;
+.field protected final aet:Lcom/google/android/gms/analytics/j;
 
-.field private final aey:Ljava/util/List;
+.field private final aeu: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;->aew:Lcom/google/android/gms/analytics/m;
+    iput-object p1, p0, Lcom/google/android/gms/analytics/l;->aes: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;->aey:Ljava/util/List;
+    iput-object p1, p0, Lcom/google/android/gms/analytics/l;->aeu: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;->aet:Z
+    iput-boolean p2, p1, Lcom/google/android/gms/analytics/j;->aep:Z
 
-    iput-object p1, p0, Lcom/google/android/gms/analytics/l;->aex:Lcom/google/android/gms/analytics/j;
+    iput-object p1, p0, Lcom/google/android/gms/analytics/l;->aet:Lcom/google/android/gms/analytics/j;
 
     return-void
 .end method
@@ -66,24 +66,24 @@
     return-void
 .end method
 
-.method public lH()Lcom/google/android/gms/analytics/j;
+.method public lF()Lcom/google/android/gms/analytics/j;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/analytics/l;->aex:Lcom/google/android/gms/analytics/j;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/l;->aet:Lcom/google/android/gms/analytics/j;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/analytics/j;->lJ()Lcom/google/android/gms/analytics/j;
+    invoke-virtual {v0}, Lcom/google/android/gms/analytics/j;->lH()Lcom/google/android/gms/analytics/j;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/analytics/l;->lL()V
+    invoke-virtual {p0}, Lcom/google/android/gms/analytics/l;->lJ()V
 
     return-object v0
 .end method
 
-.method protected final lL()V
+.method protected final lJ()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/analytics/l;->aey:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/l;->aeu: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 85a156dcea..4b2fd83aa9 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 aeG:Lcom/google/android/gms/analytics/m;
+.field final synthetic aeC: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;->aeG:Lcom/google/android/gms/analytics/m;
+    iput-object p1, p0, Lcom/google/android/gms/analytics/m$a;->aeC: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 2bd1e3fa82..b5d37fe74b 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 aeH:Ljava/util/concurrent/atomic/AtomicInteger;
+.field private static final aeD: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;->aeH:Ljava/util/concurrent/atomic/AtomicInteger;
+    sput-object v0, Lcom/google/android/gms/analytics/m$b;->aeD: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;->aeH:Ljava/util/concurrent/atomic/AtomicInteger;
+    sget-object v0, Lcom/google/android/gms/analytics/m$b;->aeD: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 a6974c8b1c..c9b7df5aa5 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,17 @@
 
 
 # static fields
-.field private static volatile aez:Lcom/google/android/gms/analytics/m;
+.field private static volatile aev:Lcom/google/android/gms/analytics/m;
 
 
 # instance fields
-.field public final aeA:Landroid/content/Context;
+.field private volatile aeA:Lcom/google/android/gms/internal/gtm/by;
 
-.field private final aeB:Ljava/util/List;
+.field public aeB:Ljava/lang/Thread$UncaughtExceptionHandler;
+
+.field public final aew:Landroid/content/Context;
+
+.field private final aex:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -29,13 +33,9 @@
     .end annotation
 .end field
 
-.field private final aeC:Lcom/google/android/gms/analytics/h;
+.field private final aey:Lcom/google/android/gms/analytics/h;
 
-.field final aeD:Lcom/google/android/gms/analytics/m$a;
-
-.field private volatile aeE:Lcom/google/android/gms/internal/gtm/by;
-
-.field public aeF:Ljava/lang/Thread$UncaughtExceptionHandler;
+.field final aez:Lcom/google/android/gms/analytics/m$a;
 
 
 # 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;->aeA:Landroid/content/Context;
+    iput-object p1, p0, Lcom/google/android/gms/analytics/m;->aew: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;->aeD:Lcom/google/android/gms/analytics/m$a;
+    iput-object p1, p0, Lcom/google/android/gms/analytics/m;->aez: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;->aeB:Ljava/util/List;
+    iput-object p1, p0, Lcom/google/android/gms/analytics/m;->aex: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;->aeC:Lcom/google/android/gms/analytics/h;
+    iput-object p1, p0, Lcom/google/android/gms/analytics/m;->aey: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;->aez:Lcom/google/android/gms/analytics/m;
+    sget-object v0, Lcom/google/android/gms/analytics/m;->aev: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;->aez:Lcom/google/android/gms/analytics/m;
+    sget-object v1, Lcom/google/android/gms/analytics/m;->aev: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;->aez:Lcom/google/android/gms/analytics/m;
+    sput-object v1, Lcom/google/android/gms/analytics/m;->aev: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;->aez:Lcom/google/android/gms/analytics/m;
+    sget-object p0, Lcom/google/android/gms/analytics/m;->aev: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;->aeB:Ljava/util/List;
+    iget-object p0, p0, Lcom/google/android/gms/analytics/m;->aex: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;->aeF:Ljava/lang/Thread$UncaughtExceptionHandler;
+    iget-object p0, p0, Lcom/google/android/gms/analytics/m;->aeB: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;->aen:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/analytics/j;->aej: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;->aev:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/j;->aer: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;->lI()Landroid/net/Uri;
+    invoke-interface {v2}, Lcom/google/android/gms/analytics/p;->lG()Landroid/net/Uri;
 
     move-result-object v3
 
@@ -197,7 +197,7 @@
     return-void
 .end method
 
-.method public static lN()V
+.method public static lL()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;->aeD:Lcom/google/android/gms/analytics/m$a;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/m;->aez: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;->aeD:Lcom/google/android/gms/analytics/m$a;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/m;->aez: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 lM()Lcom/google/android/gms/internal/gtm/by;
+.method public final lK()Lcom/google/android/gms/internal/gtm/by;
     .locals 7
 
-    iget-object v0, p0, Lcom/google/android/gms/analytics/m;->aeE:Lcom/google/android/gms/internal/gtm/by;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/m;->aeA: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;->aeE:Lcom/google/android/gms/internal/gtm/by;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/m;->aeA: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;->aeA:Landroid/content/Context;
+    iget-object v1, p0, Lcom/google/android/gms/analytics/m;->aew: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;->aeA:Landroid/content/Context;
+    iget-object v2, p0, Lcom/google/android/gms/analytics/m;->aew: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;->arJ:Ljava/lang/String;
+    iput-object v2, v0, Lcom/google/android/gms/internal/gtm/by;->arF: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;->arK:Ljava/lang/String;
+    iput-object v3, v0, Lcom/google/android/gms/internal/gtm/by;->arG: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;->aeA:Landroid/content/Context;
+    iget-object v4, p0, Lcom/google/android/gms/analytics/m;->aew: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;->arH:Ljava/lang/String;
+    iput-object v2, v0, Lcom/google/android/gms/internal/gtm/by;->arD:Ljava/lang/String;
 
-    iput-object v3, v0, Lcom/google/android/gms/internal/gtm/by;->arI:Ljava/lang/String;
+    iput-object v3, v0, Lcom/google/android/gms/internal/gtm/by;->arE:Ljava/lang/String;
 
-    iput-object v0, p0, Lcom/google/android/gms/analytics/m;->aeE:Lcom/google/android/gms/internal/gtm/by;
+    iput-object v0, p0, Lcom/google/android/gms/analytics/m;->aeA: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;->aeE:Lcom/google/android/gms/internal/gtm/by;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/m;->aeA: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 e9f261029e..249c874bb5 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 aeG:Lcom/google/android/gms/analytics/m;
+.field private final synthetic aeC:Lcom/google/android/gms/analytics/m;
 
-.field private final synthetic aeI:Lcom/google/android/gms/analytics/j;
+.field private final synthetic aeE: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;->aeG:Lcom/google/android/gms/analytics/m;
+    iput-object p1, p0, Lcom/google/android/gms/analytics/n;->aeC:Lcom/google/android/gms/analytics/m;
 
-    iput-object p2, p0, Lcom/google/android/gms/analytics/n;->aeI:Lcom/google/android/gms/analytics/j;
+    iput-object p2, p0, Lcom/google/android/gms/analytics/n;->aeE: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;->aeI:Lcom/google/android/gms/analytics/j;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/n;->aeE:Lcom/google/android/gms/analytics/j;
 
-    iget-object v0, v0, Lcom/google/android/gms/analytics/j;->ael:Lcom/google/android/gms/analytics/l;
+    iget-object v0, v0, Lcom/google/android/gms/analytics/j;->aeh:Lcom/google/android/gms/analytics/l;
 
-    iget-object v1, p0, Lcom/google/android/gms/analytics/n;->aeI:Lcom/google/android/gms/analytics/j;
+    iget-object v1, p0, Lcom/google/android/gms/analytics/n;->aeE: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;->aeG:Lcom/google/android/gms/analytics/m;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/n;->aeC: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;->aeI:Lcom/google/android/gms/analytics/j;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/n;->aeE: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 de065414b6..add593351b 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 aeJ:Lcom/google/android/gms/analytics/m$a;
+.field private final synthetic aeF: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;->aeJ:Lcom/google/android/gms/analytics/m$a;
+    iput-object p1, p0, Lcom/google/android/gms/analytics/o;->aeF: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;->aeJ:Lcom/google/android/gms/analytics/m$a;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/o;->aeF:Lcom/google/android/gms/analytics/m$a;
 
-    iget-object v0, v0, Lcom/google/android/gms/analytics/m$a;->aeG:Lcom/google/android/gms/analytics/m;
+    iget-object v0, v0, Lcom/google/android/gms/analytics/m$a;->aeC: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 1459c5c3da..e1c830e1a9 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 lI()Landroid/net/Uri;
+.method public abstract lG()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 e21df7326c..c9047240e5 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 aeK:Lcom/google/android/gms/appinvite/PreviewActivity;
+.field private final synthetic aeG: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;->aeK:Lcom/google/android/gms/appinvite/PreviewActivity;
+    iput-object p1, p0, Lcom/google/android/gms/appinvite/a;->aeG: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;->aeK:Lcom/google/android/gms/appinvite/PreviewActivity;
+    iget-object p1, p0, Lcom/google/android/gms/appinvite/a;->aeG: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 3b0420839b..f2fb3a7ca4 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 aeL:Lcom/google/android/gms/common/util/e;
+.field private static aeH:Lcom/google/android/gms/common/util/e;
 
 
 # instance fields
-.field private final aeM:I
+.field private final aeI:I
+
+.field private aeJ:Ljava/lang/String;
+
+.field public aeK:Ljava/lang/String;
+
+.field private aeL:Ljava/lang/String;
+
+.field private aeM:Landroid/net/Uri;
 
 .field private aeN:Ljava/lang/String;
 
-.field public aeO:Ljava/lang/String;
+.field private aeO:J
 
 .field private aeP:Ljava/lang/String;
 
-.field private aeQ:Landroid/net/Uri;
-
-.field private aeR:Ljava/lang/String;
-
-.field private aeS:J
-
-.field private aeT:Ljava/lang/String;
-
-.field private aeU:Ljava/util/List;
+.field private aeQ:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -46,11 +46,11 @@
     .end annotation
 .end field
 
-.field private aeV:Ljava/lang/String;
+.field private aeR:Ljava/lang/String;
 
-.field private aeW:Ljava/lang/String;
+.field private aeS:Ljava/lang/String;
 
-.field private aeX:Ljava/util/Set;
+.field private aeT: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;->nt()Lcom/google/android/gms/common/util/e;
+    invoke-static {}, Lcom/google/android/gms/common/util/g;->nr()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeL:Lcom/google/android/gms/common/util/e;
+    sput-object v0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeH: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;->aeX:Ljava/util/Set;
+    iput-object v0, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeT:Ljava/util/Set;
 
-    iput p1, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeM:I
+    iput p1, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeI: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;->aeN:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeJ:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeO:Ljava/lang/String;
+    iput-object p4, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeK:Ljava/lang/String;
 
-    iput-object p5, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeP:Ljava/lang/String;
+    iput-object p5, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeL:Ljava/lang/String;
 
-    iput-object p6, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeQ:Landroid/net/Uri;
+    iput-object p6, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeM:Landroid/net/Uri;
 
-    iput-object p7, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeR:Ljava/lang/String;
+    iput-object p7, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeN:Ljava/lang/String;
 
-    iput-wide p8, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeS:J
+    iput-wide p8, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeO:J
 
-    iput-object p10, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeT:Ljava/lang/String;
+    iput-object p10, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeP:Ljava/lang/String;
 
-    iput-object p11, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeU:Ljava/util/List;
+    iput-object p11, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeQ:Ljava/util/List;
 
-    iput-object p12, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeV:Ljava/lang/String;
+    iput-object p12, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeR:Ljava/lang/String;
 
-    iput-object p13, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeW:Ljava/lang/String;
+    iput-object p13, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeS: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;->aeL:Lcom/google/android/gms/common/util/e;
+    sget-object v2, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeH: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;->aeR:Ljava/lang/String;
+    iput-object v0, v2, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeN: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;->aeT:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeP:Ljava/lang/String;
 
-    iget-object v3, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeT:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeP: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;->lO()Ljava/util/Set;
+    invoke-virtual {p1}, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->lM()Ljava/util/Set;
 
     move-result-object p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->lO()Ljava/util/Set;
+    invoke-virtual {p0}, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->lM()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;->aeT:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeP: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;->lO()Ljava/util/Set;
+    invoke-virtual {p0}, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->lM()Ljava/util/Set;
 
     move-result-object v1
 
@@ -427,7 +427,7 @@
     return v0
 .end method
 
-.method public final lO()Ljava/util/Set;
+.method public final lM()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;->aeU:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeQ: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;->aeX:Ljava/util/Set;
+    iget-object v1, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeT: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;->aeM:I
+    iget v1, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeI: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;->aeN:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeJ: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;->aeO:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeK: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;->aeP:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeL: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;->aeQ:Landroid/net/Uri;
+    iget-object v1, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeM: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;->aeR:Ljava/lang/String;
+    iget-object p2, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeN: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;->aeS:J
+    iget-wide v1, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeO: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;->aeT:Ljava/lang/String;
+    iget-object p2, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeP: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;->aeU:Ljava/util/List;
+    iget-object p2, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeQ: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;->aeV:Ljava/lang/String;
+    iget-object p2, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeR: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;->aeW:Ljava/lang/String;
+    iget-object p2, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeS: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 14259f74aa..5718a429ba 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 aLn:Lcom/google/android/gms/common/c;
+.field private static final aLj:Lcom/google/android/gms/common/c;
 
-.field private static aLo:Ljava/lang/reflect/Method;
+.field private static aLk: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;->lU()Lcom/google/android/gms/common/c;
+    invoke-static {}, Lcom/google/android/gms/common/c;->lS()Lcom/google/android/gms/common/c;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/b/a;->aLn:Lcom/google/android/gms/common/c;
+    sput-object v0, Lcom/google/android/gms/b/a;->aLj: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;->aLo:Ljava/lang/reflect/Method;
+    sput-object v0, Lcom/google/android/gms/b/a;->aLk: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;->aLo:Ljava/lang/reflect/Method;
+    sget-object v3, Lcom/google/android/gms/b/a;->aLk: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;->aLo:Ljava/lang/reflect/Method;
+    sput-object v3, Lcom/google/android/gms/b/a;->aLk:Ljava/lang/reflect/Method;
 
     :cond_1
-    sget-object v3, Lcom/google/android/gms/b/a;->aLo:Ljava/lang/reflect/Method;
+    sget-object v3, Lcom/google/android/gms/b/a;->aLk: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;->amU:Lcom/google/android/gms/dynamite/DynamiteModule$b;
+    sget-object v0, Lcom/google/android/gms/dynamite/DynamiteModule;->amQ: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;->amX:Landroid/content/Context;
+    iget-object p0, p0, Lcom/google/android/gms/dynamite/DynamiteModule;->amT: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 ec8711fa92..292888622b 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 = 0x7f0800a2
+.field public static final common_full_open_on_phone:I = 0x7f0800a1
 
-.field public static final common_google_signin_btn_icon_dark:I = 0x7f0800a3
+.field public static final common_google_signin_btn_icon_dark:I = 0x7f0800a2
 
-.field public static final common_google_signin_btn_icon_dark_focused:I = 0x7f0800a4
+.field public static final common_google_signin_btn_icon_dark_focused:I = 0x7f0800a3
 
-.field public static final common_google_signin_btn_icon_dark_normal:I = 0x7f0800a5
+.field public static final common_google_signin_btn_icon_dark_normal:I = 0x7f0800a4
 
-.field public static final common_google_signin_btn_icon_dark_normal_background:I = 0x7f0800a6
+.field public static final common_google_signin_btn_icon_dark_normal_background:I = 0x7f0800a5
 
-.field public static final common_google_signin_btn_icon_disabled:I = 0x7f0800a7
+.field public static final common_google_signin_btn_icon_disabled:I = 0x7f0800a6
 
-.field public static final common_google_signin_btn_icon_light:I = 0x7f0800a8
+.field public static final common_google_signin_btn_icon_light:I = 0x7f0800a7
 
-.field public static final common_google_signin_btn_icon_light_focused:I = 0x7f0800a9
+.field public static final common_google_signin_btn_icon_light_focused:I = 0x7f0800a8
 
-.field public static final common_google_signin_btn_icon_light_normal:I = 0x7f0800aa
+.field public static final common_google_signin_btn_icon_light_normal:I = 0x7f0800a9
 
-.field public static final common_google_signin_btn_icon_light_normal_background:I = 0x7f0800ab
+.field public static final common_google_signin_btn_icon_light_normal_background:I = 0x7f0800aa
 
-.field public static final common_google_signin_btn_text_dark:I = 0x7f0800ac
+.field public static final common_google_signin_btn_text_dark:I = 0x7f0800ab
 
-.field public static final common_google_signin_btn_text_dark_focused:I = 0x7f0800ad
+.field public static final common_google_signin_btn_text_dark_focused:I = 0x7f0800ac
 
-.field public static final common_google_signin_btn_text_dark_normal:I = 0x7f0800ae
+.field public static final common_google_signin_btn_text_dark_normal:I = 0x7f0800ad
 
-.field public static final common_google_signin_btn_text_dark_normal_background:I = 0x7f0800af
+.field public static final common_google_signin_btn_text_dark_normal_background:I = 0x7f0800ae
 
-.field public static final common_google_signin_btn_text_disabled:I = 0x7f0800b0
+.field public static final common_google_signin_btn_text_disabled:I = 0x7f0800af
 
-.field public static final common_google_signin_btn_text_light:I = 0x7f0800b1
+.field public static final common_google_signin_btn_text_light:I = 0x7f0800b0
 
-.field public static final common_google_signin_btn_text_light_focused:I = 0x7f0800b2
+.field public static final common_google_signin_btn_text_light_focused:I = 0x7f0800b1
 
-.field public static final common_google_signin_btn_text_light_normal:I = 0x7f0800b3
+.field public static final common_google_signin_btn_text_light_normal:I = 0x7f0800b2
 
-.field public static final common_google_signin_btn_text_light_normal_background:I = 0x7f0800b4
+.field public static final common_google_signin_btn_text_light_normal_background:I = 0x7f0800b3
 
-.field public static final googleg_disabled_color_18:I = 0x7f0801bb
+.field public static final googleg_disabled_color_18:I = 0x7f0801b0
 
-.field public static final googleg_standard_color_18:I = 0x7f0801bc
+.field public static final googleg_standard_color_18:I = 0x7f0801b1
 
 
 # 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 a6da452d18..76302bff90 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 = 0x7f120430
+.field public static final common_google_play_services_enable_button:I = 0x7f12040b
 
-.field public static final common_google_play_services_enable_text:I = 0x7f120431
+.field public static final common_google_play_services_enable_text:I = 0x7f12040c
 
-.field public static final common_google_play_services_enable_title:I = 0x7f120432
+.field public static final common_google_play_services_enable_title:I = 0x7f12040d
 
-.field public static final common_google_play_services_install_button:I = 0x7f120433
+.field public static final common_google_play_services_install_button:I = 0x7f12040e
 
-.field public static final common_google_play_services_install_text:I = 0x7f120434
+.field public static final common_google_play_services_install_text:I = 0x7f12040f
 
-.field public static final common_google_play_services_install_title:I = 0x7f120435
+.field public static final common_google_play_services_install_title:I = 0x7f120410
 
-.field public static final common_google_play_services_notification_channel_name:I = 0x7f120436
+.field public static final common_google_play_services_notification_channel_name:I = 0x7f120411
 
-.field public static final common_google_play_services_notification_ticker:I = 0x7f120437
+.field public static final common_google_play_services_notification_ticker:I = 0x7f120412
 
-.field public static final common_google_play_services_unsupported_text:I = 0x7f120439
+.field public static final common_google_play_services_unsupported_text:I = 0x7f120414
 
-.field public static final common_google_play_services_update_button:I = 0x7f12043a
+.field public static final common_google_play_services_update_button:I = 0x7f120415
 
-.field public static final common_google_play_services_update_text:I = 0x7f12043b
+.field public static final common_google_play_services_update_text:I = 0x7f120416
 
-.field public static final common_google_play_services_update_title:I = 0x7f12043c
+.field public static final common_google_play_services_update_title:I = 0x7f120417
 
-.field public static final common_google_play_services_updating_text:I = 0x7f12043d
+.field public static final common_google_play_services_updating_text:I = 0x7f120418
 
-.field public static final common_google_play_services_wear_update_text:I = 0x7f12043e
+.field public static final common_google_play_services_wear_update_text:I = 0x7f120419
 
-.field public static final common_open_on_phone:I = 0x7f12043f
+.field public static final common_open_on_phone:I = 0x7f12041a
 
-.field public static final common_signin_button_text:I = 0x7f120440
+.field public static final common_signin_button_text:I = 0x7f12041b
 
-.field public static final common_signin_button_text_long:I = 0x7f120441
+.field public static final common_signin_button_text_long:I = 0x7f12041c
 
 
 # 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 c5640f7dce..4035315d68 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 afd:Lcom/google/android/gms/common/ConnectionResult;
+.field public static final aeZ:Lcom/google/android/gms/common/ConnectionResult;
 
 
 # instance fields
-.field public final afe:Landroid/app/PendingIntent;
+.field public final afa: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;->afd:Lcom/google/android/gms/common/ConnectionResult;
+    sput-object v0, Lcom/google/android/gms/common/ConnectionResult;->aeZ: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;->afe:Landroid/app/PendingIntent;
+    iput-object p3, p0, Lcom/google/android/gms/common/ConnectionResult;->afa: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;->afe:Landroid/app/PendingIntent;
+    iget-object v1, p0, Lcom/google/android/gms/common/ConnectionResult;->afa:Landroid/app/PendingIntent;
 
-    iget-object v3, p1, Lcom/google/android/gms/common/ConnectionResult;->afe:Landroid/app/PendingIntent;
+    iget-object v3, p1, Lcom/google/android/gms/common/ConnectionResult;->afa: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;->afe:Landroid/app/PendingIntent;
+    iget-object v1, p0, Lcom/google/android/gms/common/ConnectionResult;->afa:Landroid/app/PendingIntent;
 
     const/4 v2, 0x1
 
@@ -378,14 +378,14 @@
     return v0
 .end method
 
-.method public final lP()Z
+.method public final lN()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;->afe:Landroid/app/PendingIntent;
+    iget-object v0, p0, Lcom/google/android/gms/common/ConnectionResult;->afa:Landroid/app/PendingIntent;
 
     if-eqz v0, :cond_0
 
@@ -399,7 +399,7 @@
     return v0
 .end method
 
-.method public final lQ()Z
+.method public final lO()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;->afe:Landroid/app/PendingIntent;
+    iget-object v1, p0, Lcom/google/android/gms/common/ConnectionResult;->afa: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;->afe:Landroid/app/PendingIntent;
+    iget-object v1, p0, Lcom/google/android/gms/common/ConnectionResult;->afa: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 275f8c3784..8daa7ffba0 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 afg:I
+.field private final afc: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;->afg:I
+    iput p2, p0, Lcom/google/android/gms/common/Feature;->afc: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;->lR()J
+    invoke-virtual {p0}, Lcom/google/android/gms/common/Feature;->lP()J
 
     move-result-wide v2
 
-    invoke-virtual {p1}, Lcom/google/android/gms/common/Feature;->lR()J
+    invoke-virtual {p1}, Lcom/google/android/gms/common/Feature;->lP()J
 
     move-result-wide v4
 
@@ -120,7 +120,7 @@
 
     aput-object v1, v0, v2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/common/Feature;->lR()J
+    invoke-virtual {p0}, Lcom/google/android/gms/common/Feature;->lP()J
 
     move-result-wide v1
 
@@ -139,7 +139,7 @@
     return v0
 .end method
 
-.method public final lR()J
+.method public final lP()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;->afg:I
+    iget v0, p0, Lcom/google/android/gms/common/Feature;->afc:I
 
     int-to-long v0, v0
 
@@ -173,7 +173,7 @@
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/common/Feature;->lR()J
+    invoke-virtual {p0}, Lcom/google/android/gms/common/Feature;->lP()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;->afg:I
+    iget v0, p0, Lcom/google/android/gms/common/Feature;->afc: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;->lR()J
+    invoke-virtual {p0}, Lcom/google/android/gms/common/Feature;->lP()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 10ea84128b..5406dc165b 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 afj:Landroid/content/Context;
+.field private final aff:Landroid/content/Context;
 
-.field private final synthetic afl:Lcom/google/android/gms/common/GoogleApiAvailability;
+.field private final synthetic afg: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;->afl:Lcom/google/android/gms/common/GoogleApiAvailability;
+    iput-object p1, p0, Lcom/google/android/gms/common/GoogleApiAvailability$a;->afg: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;->afj:Landroid/content/Context;
+    iput-object p1, p0, Lcom/google/android/gms/common/GoogleApiAvailability$a;->aff: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;->afl:Lcom/google/android/gms/common/GoogleApiAvailability;
+    iget-object p1, p0, Lcom/google/android/gms/common/GoogleApiAvailability$a;->afg:Lcom/google/android/gms/common/GoogleApiAvailability;
 
-    iget-object v0, p0, Lcom/google/android/gms/common/GoogleApiAvailability$a;->afj:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/android/gms/common/GoogleApiAvailability$a;->aff: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;->afl:Lcom/google/android/gms/common/GoogleApiAvailability;
+    iget-object v0, p0, Lcom/google/android/gms/common/GoogleApiAvailability$a;->afg: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;->afl:Lcom/google/android/gms/common/GoogleApiAvailability;
+    iget-object v0, p0, Lcom/google/android/gms/common/GoogleApiAvailability$a;->afg:Lcom/google/android/gms/common/GoogleApiAvailability;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/GoogleApiAvailability$a;->afj:Landroid/content/Context;
+    iget-object v1, p0, Lcom/google/android/gms/common/GoogleApiAvailability$a;->aff: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 7aece9c560..257e90565d 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 afh:Lcom/google/android/gms/common/GoogleApiAvailability;
+.field private static final afd:Lcom/google/android/gms/common/GoogleApiAvailability;
 
 .field private static final mLock:Ljava/lang/Object;
 
 
 # instance fields
-.field private afi:Ljava/lang/String;
+.field private afe: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;->afh:Lcom/google/android/gms/common/GoogleApiAvailability;
+    sput-object v0, Lcom/google/android/gms/common/GoogleApiAvailability;->afd: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;->nv()Z
+    invoke-static {}, Lcom/google/android/gms/common/util/l;->nt()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;->lT()Ljava/lang/String;
+    invoke-direct {p0}, Lcom/google/android/gms/common/GoogleApiAvailability;->lR()Ljava/lang/String;
 
     move-result-object p3
 
@@ -478,15 +478,15 @@
     return-void
 .end method
 
-.method public static lS()Lcom/google/android/gms/common/GoogleApiAvailability;
+.method public static lQ()Lcom/google/android/gms/common/GoogleApiAvailability;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/common/GoogleApiAvailability;->afh:Lcom/google/android/gms/common/GoogleApiAvailability;
+    sget-object v0, Lcom/google/android/gms/common/GoogleApiAvailability;->afd:Lcom/google/android/gms/common/GoogleApiAvailability;
 
     return-object v0
 .end method
 
-.method private final lT()Ljava/lang/String;
+.method private final lR()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;->afi:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/common/GoogleApiAvailability;->afe: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;->lP()Z
+    invoke-virtual {p2}, Lcom/google/android/gms/common/ConnectionResult;->lN()Z
 
     move-result v0
 
@@ -602,7 +602,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p2, Lcom/google/android/gms/common/ConnectionResult;->afe:Landroid/app/PendingIntent;
+    iget-object v0, p2, Lcom/google/android/gms/common/ConnectionResult;->afa: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 c92ed6d437..815f57b50b 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;->lS()Lcom/google/android/gms/common/GoogleApiAvailability;
+    invoke-static {}, Lcom/google/android/gms/common/GoogleApiAvailability;->lQ()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;->lS()Lcom/google/android/gms/common/GoogleApiAvailability;
+    invoke-static {}, Lcom/google/android/gms/common/GoogleApiAvailability;->lQ()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;->lS()Lcom/google/android/gms/common/GoogleApiAvailability;
+    invoke-static {}, Lcom/google/android/gms/common/GoogleApiAvailability;->lQ()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;->lS()Lcom/google/android/gms/common/GoogleApiAvailability;
+    invoke-static {}, Lcom/google/android/gms/common/GoogleApiAvailability;->lQ()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 a9c623dbe9..3f3af7ffd2 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 = 0x7f120438
+.field public static final common_google_play_services_unknown_issue:I = 0x7f120413
 
 
 # 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 412923c79a..0e5b87179f 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 afc:Ljava/util/concurrent/BlockingQueue;
+.field public final aeY: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;->afc:Ljava/util/concurrent/BlockingQueue;
+    iput-object v0, p0, Lcom/google/android/gms/common/a;->aeY: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;->afc:Ljava/util/concurrent/BlockingQueue;
+    iget-object p1, p0, Lcom/google/android/gms/common/a;->aeY: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 3461fff2be..d72d5fa9d4 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 aiy:Lcom/google/android/gms/common/a/a$a;
+.field private static aiu:Lcom/google/android/gms/common/a/a$a;
 
-.field private static aiz:I
+.field private static aiv:I
 
 .field private static final sLock:Ljava/lang/Object;
 
 
 # instance fields
-.field protected final aiA:Ljava/lang/Object;
+.field protected final aiw:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TT;"
@@ -36,7 +36,7 @@
     .end annotation
 .end field
 
-.field private aiB:Ljava/lang/Object;
+.field private aix: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;->aiy:Lcom/google/android/gms/common/a/a$a;
+    sput-object v0, Lcom/google/android/gms/common/a/a;->aiu:Lcom/google/android/gms/common/a/a$a;
 
     const/4 v0, 0x0
 
-    sput v0, Lcom/google/android/gms/common/a/a;->aiz:I
+    sput v0, Lcom/google/android/gms/common/a/a;->aiv:I
 
     return-void
 .end method
@@ -82,11 +82,11 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/google/android/gms/common/a/a;->aiB:Ljava/lang/Object;
+    iput-object v0, p0, Lcom/google/android/gms/common/a/a;->aix: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;->aiA:Ljava/lang/Object;
+    iput-object p2, p0, Lcom/google/android/gms/common/a/a;->aiw: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 d0b0ac2412..f003601f88 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 afC:I
+.field private afy:I
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lcom/google/android/gms/common/api/GoogleApiActivity;->afC:I
+    iput v0, p0, Lcom/google/android/gms/common/api/GoogleApiActivity;->afy:I
 
     return-void
 .end method
@@ -89,7 +89,7 @@
 
     move-result p1
 
-    iput v0, p0, Lcom/google/android/gms/common/api/GoogleApiActivity;->afC:I
+    iput v0, p0, Lcom/google/android/gms/common/api/GoogleApiActivity;->afy: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;->ms()V
+    invoke-virtual {p1}, Lcom/google/android/gms/common/api/internal/d;->mq()V
 
     goto :goto_0
 
@@ -140,7 +140,7 @@
 
     if-ne p1, v1, :cond_3
 
-    iput v0, p0, Lcom/google/android/gms/common/api/GoogleApiActivity;->afC:I
+    iput v0, p0, Lcom/google/android/gms/common/api/GoogleApiActivity;->afy: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;->afC:I
+    iput p1, p0, Lcom/google/android/gms/common/api/GoogleApiActivity;->afy: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;->afC:I
+    iput p1, p0, Lcom/google/android/gms/common/api/GoogleApiActivity;->afy:I
 
     :cond_0
-    iget p1, p0, Lcom/google/android/gms/common/api/GoogleApiActivity;->afC:I
+    iget p1, p0, Lcom/google/android/gms/common/api/GoogleApiActivity;->afy: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;->afC:I
+    iput v0, p0, Lcom/google/android/gms/common/api/GoogleApiActivity;->afy: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;->lS()Lcom/google/android/gms/common/GoogleApiAvailability;
+    invoke-static {}, Lcom/google/android/gms/common/GoogleApiAvailability;->lQ()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;->afC:I
+    iput v0, p0, Lcom/google/android/gms/common/api/GoogleApiActivity;->afy: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;->afC:I
+    iget v0, p0, Lcom/google/android/gms/common/api/GoogleApiActivity;->afy: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 c9136735e3..49e61b2871 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 afF:Ljava/lang/String;
+.field private final afB: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;->afF:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/Scope;->afB: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;->afF:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/Scope;->afB:Ljava/lang/String;
 
     check-cast p1, Lcom/google/android/gms/common/api/Scope;
 
-    iget-object p1, p1, Lcom/google/android/gms/common/api/Scope;->afF:Ljava/lang/String;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/Scope;->afB: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;->afF:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/Scope;->afB: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;->afF:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/Scope;->afB: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;->afF:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/Scope;->afB: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 6747d12eb5..0bc2e3a9fc 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 afC:Lcom/google/android/gms/common/api/Status;
+
+.field public static final afD:Lcom/google/android/gms/common/api/Status;
+
+.field public static final afE:Lcom/google/android/gms/common/api/Status;
+
+.field public static final afF:Lcom/google/android/gms/common/api/Status;
+
 .field public static final afG:Lcom/google/android/gms/common/api/Status;
 
-.field public static final afH:Lcom/google/android/gms/common/api/Status;
+.field private static final afH:Lcom/google/android/gms/common/api/Status;
 
 .field public static final afI:Lcom/google/android/gms/common/api/Status;
 
-.field public static final afJ:Lcom/google/android/gms/common/api/Status;
-
-.field public static final afK:Lcom/google/android/gms/common/api/Status;
-
-.field private static final afL:Lcom/google/android/gms/common/api/Status;
-
-.field public static final afM:Lcom/google/android/gms/common/api/Status;
-
 
 # instance fields
-.field private final afe:Landroid/app/PendingIntent;
+.field private final afa: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;->afG:Lcom/google/android/gms/common/api/Status;
+    sput-object v0, Lcom/google/android/gms/common/api/Status;->afC: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;->afH:Lcom/google/android/gms/common/api/Status;
+    sput-object v0, Lcom/google/android/gms/common/api/Status;->afD: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;->afI:Lcom/google/android/gms/common/api/Status;
+    sput-object v0, Lcom/google/android/gms/common/api/Status;->afE: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;->afJ:Lcom/google/android/gms/common/api/Status;
+    sput-object v0, Lcom/google/android/gms/common/api/Status;->afF: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;->afK: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;
 
@@ -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;->afL: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;
 
@@ -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;->afM: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/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;->afe:Landroid/app/PendingIntent;
+    iput-object p4, p0, Lcom/google/android/gms/common/api/Status;->afa: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;->afe:Landroid/app/PendingIntent;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/Status;->afa:Landroid/app/PendingIntent;
 
-    iget-object p1, p1, Lcom/google/android/gms/common/api/Status;->afe:Landroid/app/PendingIntent;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/Status;->afa: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;->afe:Landroid/app/PendingIntent;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/Status;->afa:Landroid/app/PendingIntent;
 
     const/4 v2, 0x3
 
@@ -261,10 +261,10 @@
     return v0
 .end method
 
-.method public final lP()Z
+.method public final lN()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/Status;->afe:Landroid/app/PendingIntent;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/Status;->afa:Landroid/app/PendingIntent;
 
     if-eqz v0, :cond_0
 
@@ -278,7 +278,7 @@
     return v0
 .end method
 
-.method public final lQ()Z
+.method public final lO()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 mo()Lcom/google/android/gms/common/api/Status;
+.method public final mm()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;->afe:Landroid/app/PendingIntent;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/Status;->afa: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;->afe:Landroid/app/PendingIntent;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/Status;->afa: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 73eb986356..b786df07d1 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 lV()Landroid/accounts/Account;
+.method public abstract lT()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 69230653c7..2ef2fbcfd6 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 lW()Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;
+.method public abstract lU()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 11309cc021..ef0713c59f 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 lV()Z
+.end method
+
+.method public abstract lW()Z
+.end method
+
 .method public abstract lX()Z
 .end method
 
-.method public abstract lY()Z
+.method public abstract lY()Ljava/lang/String;
 .end method
 
-.method public abstract lZ()Z
+.method public abstract lZ()I
 .end method
 
-.method public abstract ma()Ljava/lang/String;
-.end method
-
-.method public abstract mb()I
-.end method
-
-.method public abstract mc()[Lcom/google/android/gms/common/Feature;
+.method public abstract ma()[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 45805fdd10..29055e4d84 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 md()Ljava/lang/String;
+.method public abstract mb()Ljava/lang/String;
 .end method
 
-.method public abstract me()Ljava/lang/String;
+.method public abstract mc()Ljava/lang/String;
 .end method
 
-.method public abstract mf()Landroid/os/IInterface;
+.method public abstract md()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 1f2329d00d..cb4fd3f6e8 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 afo:Lcom/google/android/gms/common/api/a$a;
+.field public final afj: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 afp:Lcom/google/android/gms/common/api/a$i;
+.field private final afl: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 afq:Lcom/google/android/gms/common/api/a$g;
+.field public final afm: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 afr:Lcom/google/android/gms/common/api/a$j;
+.field private final afn: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;->afo:Lcom/google/android/gms/common/api/a$a;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/a;->afj:Lcom/google/android/gms/common/api/a$a;
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/a;->afp:Lcom/google/android/gms/common/api/a$i;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/a;->afl:Lcom/google/android/gms/common/api/a$i;
 
-    iput-object p3, p0, Lcom/google/android/gms/common/api/a;->afq:Lcom/google/android/gms/common/api/a$g;
+    iput-object p3, p0, Lcom/google/android/gms/common/api/a;->afm:Lcom/google/android/gms/common/api/a$g;
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/a;->afr:Lcom/google/android/gms/common/api/a$j;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/a;->afn: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 c3e13aeee3..68e1d03a5d 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;->lQ()Z
+    invoke-virtual {v4}, Lcom/google/android/gms/common/ConnectionResult;->lO()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;->afs:Lcom/google/android/gms/common/api/a;
+    iget-object v3, v3, Lcom/google/android/gms/common/api/internal/aw;->afo: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 cc67b2fa01..8785b2b916 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 afv:Landroid/os/Looper;
+.field afr:Landroid/os/Looper;
 
-.field afx:Lcom/google/android/gms/common/api/internal/k;
+.field aft:Lcom/google/android/gms/common/api/internal/k;
 
 
 # direct methods
@@ -30,10 +30,10 @@
 
 
 # virtual methods
-.method public final mi()Lcom/google/android/gms/common/api/h$a;
+.method public final mg()Lcom/google/android/gms/common/api/h$a;
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/h$a$a;->afx:Lcom/google/android/gms/common/api/internal/k;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/h$a$a;->aft: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;->afx:Lcom/google/android/gms/common/api/internal/k;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/h$a$a;->aft:Lcom/google/android/gms/common/api/internal/k;
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/common/api/h$a$a;->afv:Landroid/os/Looper;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/h$a$a;->afr: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;->afv:Landroid/os/Looper;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/h$a$a;->afr: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;->afx:Lcom/google/android/gms/common/api/internal/k;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/h$a$a;->aft:Lcom/google/android/gms/common/api/internal/k;
 
-    iget-object v2, p0, Lcom/google/android/gms/common/api/h$a$a;->afv:Landroid/os/Looper;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/h$a$a;->afr: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 a91620f98c..373ee26507 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 afz:Lcom/google/android/gms/common/api/h$a;
+.field public static final afv:Lcom/google/android/gms/common/api/h$a;
 
 
 # instance fields
-.field public final afA:Lcom/google/android/gms/common/api/internal/k;
+.field public final afw:Lcom/google/android/gms/common/api/internal/k;
 
-.field public final afB:Landroid/os/Looper;
+.field public final afx: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;->mi()Lcom/google/android/gms/common/api/h$a;
+    invoke-virtual {v0}, Lcom/google/android/gms/common/api/h$a$a;->mg()Lcom/google/android/gms/common/api/h$a;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/common/api/h$a;->afz:Lcom/google/android/gms/common/api/h$a;
+    sput-object v0, Lcom/google/android/gms/common/api/h$a;->afv: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;->afA:Lcom/google/android/gms/common/api/internal/k;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/h$a;->afw:Lcom/google/android/gms/common/api/internal/k;
 
-    iput-object p2, p0, Lcom/google/android/gms/common/api/h$a;->afB:Landroid/os/Looper;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/h$a;->afx: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 ac8afd510a..628f5a91c9 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 afs:Lcom/google/android/gms/common/api/a;
+.field public final afo: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 aft:Lcom/google/android/gms/common/api/a$d;
+.field public final afp: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 afu:Lcom/google/android/gms/common/api/internal/aw;
+.field public final afq: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 afv:Landroid/os/Looper;
+.field public final afr:Landroid/os/Looper;
 
-.field public final afw:Lcom/google/android/gms/common/api/i;
+.field public final afs:Lcom/google/android/gms/common/api/i;
 
-.field private final afx:Lcom/google/android/gms/common/api/internal/k;
+.field private final aft:Lcom/google/android/gms/common/api/internal/k;
 
-.field protected final afy:Lcom/google/android/gms/common/api/internal/d;
+.field protected final afu: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;->afs:Lcom/google/android/gms/common/api/a;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/h;->afo:Lcom/google/android/gms/common/api/a;
 
-    iput-object p3, p0, Lcom/google/android/gms/common/api/h;->aft:Lcom/google/android/gms/common/api/a$d;
+    iput-object p3, p0, Lcom/google/android/gms/common/api/h;->afp:Lcom/google/android/gms/common/api/a$d;
 
-    iget-object p2, p4, Lcom/google/android/gms/common/api/h$a;->afB:Landroid/os/Looper;
+    iget-object p2, p4, Lcom/google/android/gms/common/api/h$a;->afx:Landroid/os/Looper;
 
-    iput-object p2, p0, Lcom/google/android/gms/common/api/h;->afv:Landroid/os/Looper;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/h;->afr:Landroid/os/Looper;
 
-    iget-object p2, 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;->afo:Lcom/google/android/gms/common/api/a;
 
-    iget-object p3, p0, Lcom/google/android/gms/common/api/h;->aft:Lcom/google/android/gms/common/api/a$d;
+    iget-object p3, p0, Lcom/google/android/gms/common/api/h;->afp: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;->afu:Lcom/google/android/gms/common/api/internal/aw;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/h;->afq: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;->afw:Lcom/google/android/gms/common/api/i;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/h;->afs: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;->afy:Lcom/google/android/gms/common/api/internal/d;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/h;->afu: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, p0, Lcom/google/android/gms/common/api/h;->afu:Lcom/google/android/gms/common/api/internal/d;
 
-    iget-object p2, p2, Lcom/google/android/gms/common/api/internal/d;->ags:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object p2, p2, Lcom/google/android/gms/common/api/internal/d;->ago: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;->afA:Lcom/google/android/gms/common/api/internal/k;
+    iget-object p2, p4, Lcom/google/android/gms/common/api/h$a;->afw: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;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/h;->aft: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;->afy:Lcom/google/android/gms/common/api/internal/d;
+    iget-object p2, p0, Lcom/google/android/gms/common/api/h;->afu:Lcom/google/android/gms/common/api/internal/d;
 
-    iget-object p3, p0, Lcom/google/android/gms/common/api/h;->afu:Lcom/google/android/gms/common/api/internal/aw;
+    iget-object p3, p0, Lcom/google/android/gms/common/api/h;->afq: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;->afy:Lcom/google/android/gms/common/api/internal/d;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/h;->afu: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;->afx:Lcom/google/android/gms/common/api/internal/k;
+    iput-object p3, v0, Lcom/google/android/gms/common/api/h$a$a;->aft: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;->afv:Landroid/os/Looper;
+    iput-object p3, v0, Lcom/google/android/gms/common/api/h$a$a;->afr:Landroid/os/Looper;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/api/h$a$a;->mi()Lcom/google/android/gms/common/api/h$a;
+    invoke-virtual {v0}, Lcom/google/android/gms/common/api/h$a$a;->mg()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;->afs:Lcom/google/android/gms/common/api/a;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/h;->afo:Lcom/google/android/gms/common/api/a;
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/h;->aft:Lcom/google/android/gms/common/api/a$d;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/h;->afp:Lcom/google/android/gms/common/api/a$d;
 
-    iget-object p1, p3, Lcom/google/android/gms/common/api/h$a;->afB:Landroid/os/Looper;
+    iget-object p1, p3, Lcom/google/android/gms/common/api/h$a;->afx:Landroid/os/Looper;
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/h;->afv:Landroid/os/Looper;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/h;->afr:Landroid/os/Looper;
 
-    iget-object p1, p0, Lcom/google/android/gms/common/api/h;->afs:Lcom/google/android/gms/common/api/a;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/h;->afo:Lcom/google/android/gms/common/api/a;
 
-    iget-object p2, p0, Lcom/google/android/gms/common/api/h;->aft:Lcom/google/android/gms/common/api/a$d;
+    iget-object p2, p0, Lcom/google/android/gms/common/api/h;->afp: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;->afu:Lcom/google/android/gms/common/api/internal/aw;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/h;->afq: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;->afw:Lcom/google/android/gms/common/api/i;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/h;->afs: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;->afy:Lcom/google/android/gms/common/api/internal/d;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/h;->afu: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, p0, Lcom/google/android/gms/common/api/h;->afu:Lcom/google/android/gms/common/api/internal/d;
 
-    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/d;->ags:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/d;->ago: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;->afA:Lcom/google/android/gms/common/api/internal/k;
+    iget-object p1, p3, Lcom/google/android/gms/common/api/h$a;->afw: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;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/h;->aft:Lcom/google/android/gms/common/api/internal/k;
 
-    iget-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;->afu: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;->agh:Z
+    iget-boolean v0, p1, Lcom/google/android/gms/common/api/internal/BasePendingResult;->agd:Z
 
     const/4 v1, 0x0
 
     if-nez v0, :cond_1
 
-    sget-object v0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afT:Ljava/lang/ThreadLocal;
+    sget-object v0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afP: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;->agh:Z
+    iput-boolean v0, p1, Lcom/google/android/gms/common/api/internal/BasePendingResult;->agd:Z
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/h;->afy:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/h;->afu: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;->agt:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/d;->agp: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;->afy:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/h;->afu: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;->agt:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/d;->agp: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;->aLU:Lcom/google/android/gms/tasks/ac;
+    iget-object p1, v1, Lcom/google/android/gms/tasks/h;->aLQ: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;->ahc:Lcom/google/android/gms/common/api/internal/h;
+    iget-object v0, p1, Lcom/google/android/gms/common/api/internal/j;->agY:Lcom/google/android/gms/common/api/internal/h;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/h;->agZ:Lcom/google/android/gms/common/api/internal/h$a;
+    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/h;->agV: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;->agZ:Lcom/google/android/gms/common/api/internal/h$a;
+    iget-object v0, p2, Lcom/google/android/gms/common/api/internal/m;->agV: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;->ahc:Lcom/google/android/gms/common/api/internal/h;
+    iget-object v0, p1, Lcom/google/android/gms/common/api/internal/j;->agY:Lcom/google/android/gms/common/api/internal/h;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/h;->agZ:Lcom/google/android/gms/common/api/internal/h$a;
+    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/h;->agV: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;
+    iget-object v1, p2, Lcom/google/android/gms/common/api/internal/m;->agV: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;->afy:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/h;->afu: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;->agt:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/d;->agp: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;->aLU:Lcom/google/android/gms/tasks/ac;
+    iget-object p1, v1, Lcom/google/android/gms/tasks/h;->aLQ: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;->afy:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/h;->afu:Lcom/google/android/gms/common/api/internal/d;
 
-    iget-object v2, p0, Lcom/google/android/gms/common/api/h;->afx:Lcom/google/android/gms/common/api/internal/k;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/h;->aft: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;->agt:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/d;->agp: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;->aLU:Lcom/google/android/gms/tasks/ac;
+    iget-object p1, v0, Lcom/google/android/gms/tasks/h;->aLQ: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;->afv:Landroid/os/Looper;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/h;->afr:Landroid/os/Looper;
 
     const-string v1, "Listener must not be null"
 
@@ -613,7 +613,7 @@
     return-object v1
 .end method
 
-.method public final mg()Lcom/google/android/gms/common/api/a$d;
+.method public final me()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;->aft:Lcom/google/android/gms/common/api/a$d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/h;->afp:Lcom/google/android/gms/common/api/a$d;
 
     return-object v0
 .end method
 
-.method public mh()Lcom/google/android/gms/common/internal/d$a;
+.method public mf()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;->aft:Lcom/google/android/gms/common/api/a$d;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/h;->afp: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;->lW()Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;
+    invoke-interface {v1}, Lcom/google/android/gms/common/api/a$d$b;->lU()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;->aeO:Ljava/lang/String;
+    iget-object v2, v1, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeK: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;->aeO:Ljava/lang/String;
+    iget-object v1, v1, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeK: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;->aft:Lcom/google/android/gms/common/api/a$d;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/h;->afp: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;->lV()Landroid/accounts/Account;
+    invoke-interface {v1}, Lcom/google/android/gms/common/api/a$d$a;->lT()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;->ajz:Landroid/accounts/Account;
+    iput-object v2, v0, Lcom/google/android/gms/common/internal/d$a;->ajv:Landroid/accounts/Account;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/h;->aft:Lcom/google/android/gms/common/api/a$d;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/h;->afp: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;->lW()Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;
+    invoke-interface {v1}, Lcom/google/android/gms/common/api/a$d$b;->lU()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;->lO()Ljava/util/Set;
+    invoke-virtual {v1}, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->lM()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;->ajK:Landroidx/collection/ArraySet;
+    iget-object v2, v0, Lcom/google/android/gms/common/internal/d$a;->ajG: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;->ajK:Landroidx/collection/ArraySet;
+    iput-object v2, v0, Lcom/google/android/gms/common/internal/d$a;->ajG:Landroidx/collection/ArraySet;
 
     :cond_3
-    iget-object v2, v0, Lcom/google/android/gms/common/internal/d$a;->ajK:Landroidx/collection/ArraySet;
+    iget-object v2, v0, Lcom/google/android/gms/common/internal/d$a;->ajG: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;->ajG:Ljava/lang/String;
+    iput-object v1, v0, Lcom/google/android/gms/common/internal/d$a;->ajC: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;->ajF:Ljava/lang/String;
+    iput-object v1, v0, Lcom/google/android/gms/common/internal/d$a;->ajB: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 3afadfcb74..764f386cc7 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 mm()V
+.method public abstract mk()V
 .end method
 
-.method public abstract mn()V
+.method public abstract ml()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 a6c094707c..41522b5e63 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 afD:Ljava/util/Set;
+.field private static final afz: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;->afD:Ljava/util/Set;
+    sput-object v0, Lcom/google/android/gms/common/api/i;->afz:Ljava/util/Set;
 
     return-void
 .end method
@@ -71,7 +71,7 @@
     throw p1
 .end method
 
-.method public mj()Landroid/os/Looper;
+.method public mh()Landroid/os/Looper;
     .locals 1
 
     new-instance v0, Ljava/lang/UnsupportedOperationException;
@@ -81,7 +81,7 @@
     throw v0
 .end method
 
-.method public mk()V
+.method public mi()V
     .locals 1
 
     new-instance v0, Ljava/lang/UnsupportedOperationException;
@@ -91,7 +91,7 @@
     throw v0
 .end method
 
-.method public ml()V
+.method public mj()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 9759d4bd3a..33a3b0856b 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;->afJ:Lcom/google/android/gms/common/api/Status;
+    sget-object v0, Lcom/google/android/gms/common/api/Status;->afF: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 d350d4b9d6..43fbaa81dc 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 agi:Lcom/google/android/gms/common/api/internal/BasePendingResult;
+.field private final synthetic age: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;->agi:Lcom/google/android/gms/common/api/internal/BasePendingResult;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult$b;->age: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;->agi:Lcom/google/android/gms/common/api/internal/BasePendingResult;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult$b;->age: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 2bc503dcc6..d214aa7c25 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 afT:Ljava/lang/ThreadLocal;
+.field public static final afP:Ljava/lang/ThreadLocal;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/ThreadLocal<",
@@ -34,9 +34,9 @@
 
 
 # instance fields
-.field private final afU:Ljava/lang/Object;
+.field private final afQ:Ljava/lang/Object;
 
-.field private final afV:Lcom/google/android/gms/common/api/internal/BasePendingResult$a;
+.field private final afR: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 afW:Ljava/lang/ref/WeakReference;
+.field private final afS: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 afX:Ljava/util/concurrent/CountDownLatch;
+.field private final afT:Ljava/util/concurrent/CountDownLatch;
 
-.field private final afY:Ljava/util/ArrayList;
+.field private final afU:Ljava/util/ArrayList;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/ArrayList<",
@@ -67,7 +67,7 @@
     .end annotation
 .end field
 
-.field private afZ:Lcom/google/android/gms/common/api/o;
+.field private afV: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 aga:Ljava/util/concurrent/atomic/AtomicReference;
+.field private final afW: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 agb:Lcom/google/android/gms/common/api/n;
+.field private afX: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 agc:Z
+.field private volatile afY:Z
 
-.field private agd:Z
+.field private afZ:Z
 
-.field private age:Z
+.field private aga:Z
 
-.field private agf:Lcom/google/android/gms/common/internal/l;
+.field private agb:Lcom/google/android/gms/common/internal/l;
 
-.field private volatile agg:Lcom/google/android/gms/common/api/internal/an;
+.field private volatile agc: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 agh:Z
+.field public agd: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;->afT:Ljava/lang/ThreadLocal;
+    sput-object v0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afP: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;->afU:Ljava/lang/Object;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afQ: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;->afX:Ljava/util/concurrent/CountDownLatch;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afT: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;->afY:Ljava/util/ArrayList;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afU: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;->aga:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afW:Ljava/util/concurrent/atomic/AtomicReference;
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->agh:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->agd: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;->afV:Lcom/google/android/gms/common/api/internal/BasePendingResult$a;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afR: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;->afW:Ljava/lang/ref/WeakReference;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afS: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;->afU:Ljava/lang/Object;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afQ: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;->afX:Ljava/util/concurrent/CountDownLatch;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afT: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;->afY:Ljava/util/ArrayList;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afU: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;->aga:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afW:Ljava/util/concurrent/atomic/AtomicReference;
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->agh:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->agd:Z
 
     if-eqz p1, :cond_0
 
-    invoke-virtual {p1}, Lcom/google/android/gms/common/api/i;->mj()Landroid/os/Looper;
+    invoke-virtual {p1}, Lcom/google/android/gms/common/api/i;->mh()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;->afV:Lcom/google/android/gms/common/api/internal/BasePendingResult$a;
+    iput-object v1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afR: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;->afW:Ljava/lang/ref/WeakReference;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afS: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;->agb:Lcom/google/android/gms/common/api/n;
+    iget-object p0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afX: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;->afX:Ljava/util/concurrent/CountDownLatch;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afT:Ljava/util/concurrent/CountDownLatch;
 
     invoke-virtual {v0}, Ljava/util/concurrent/CountDownLatch;->getCount()J
 
@@ -303,7 +303,7 @@
     return v0
 .end method
 
-.method private final mr()Lcom/google/android/gms/common/api/n;
+.method private final mp()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;->afU:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afQ:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    iget-boolean v1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->agc:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afY: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;->agb:Lcom/google/android/gms/common/api/n;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afX:Lcom/google/android/gms/common/api/n;
 
     const/4 v3, 0x0
 
-    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;->afX:Lcom/google/android/gms/common/api/n;
 
-    iput-object v3, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afZ:Lcom/google/android/gms/common/api/o;
+    iput-object v3, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afV:Lcom/google/android/gms/common/api/o;
 
-    iput-boolean v2, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->agc:Z
+    iput-boolean v2, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afY: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;->aga:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afW: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;->agc:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afY: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;->agg:Lcom/google/android/gms/common/api/internal/an;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->agc: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;->afX:Ljava/util/concurrent/CountDownLatch;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afT: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;->afJ:Lcom/google/android/gms/common/api/Status;
+    sget-object p1, Lcom/google/android/gms/common/api/Status;->afF: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;->afH:Lcom/google/android/gms/common/api/Status;
+    sget-object p1, Lcom/google/android/gms/common/api/Status;->afD: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;->mr()Lcom/google/android/gms/common/api/n;
+    invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/BasePendingResult;->mp()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;->afU:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afQ: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;->afY:Ljava/util/ArrayList;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afU: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;->afU:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afQ:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    iget-boolean v1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->agc:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afY: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;->agg:Lcom/google/android/gms/common/api/internal/an;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->agc: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;->afV:Lcom/google/android/gms/common/api/internal/BasePendingResult$a;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afR:Lcom/google/android/gms/common/api/internal/BasePendingResult$a;
 
-    invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/BasePendingResult;->mr()Lcom/google/android/gms/common/api/n;
+    invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/BasePendingResult;->mp()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;->afZ:Lcom/google/android/gms/common/api/o;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afV: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;->afU:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afQ:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    iget-boolean v1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->age:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aga:Z
 
     if-nez v1, :cond_6
 
-    iget-boolean v1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->agd:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afZ: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;->agc:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afY: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;->agb:Lcom/google/android/gms/common/api/n;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afX:Lcom/google/android/gms/common/api/n;
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->agf:Lcom/google/android/gms/common/internal/l;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->agb:Lcom/google/android/gms/common/internal/l;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afX:Ljava/util/concurrent/CountDownLatch;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afT: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;->agb:Lcom/google/android/gms/common/api/n;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afX:Lcom/google/android/gms/common/api/n;
 
-    invoke-interface {v1}, Lcom/google/android/gms/common/api/n;->mo()Lcom/google/android/gms/common/api/Status;
+    invoke-interface {v1}, Lcom/google/android/gms/common/api/n;->mm()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;->agd:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afZ:Z
 
     if-eqz v1, :cond_2
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afZ:Lcom/google/android/gms/common/api/o;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afV:Lcom/google/android/gms/common/api/o;
 
     goto :goto_2
 
     :cond_2
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afZ:Lcom/google/android/gms/common/api/o;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afV:Lcom/google/android/gms/common/api/o;
 
     if-nez p1, :cond_3
 
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->agb:Lcom/google/android/gms/common/api/n;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afX: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;->afV:Lcom/google/android/gms/common/api/internal/BasePendingResult$a;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afR: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;->afV:Lcom/google/android/gms/common/api/internal/BasePendingResult$a;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afR:Lcom/google/android/gms/common/api/internal/BasePendingResult$a;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afZ:Lcom/google/android/gms/common/api/o;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afV:Lcom/google/android/gms/common/api/o;
 
-    invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/BasePendingResult;->mr()Lcom/google/android/gms/common/api/n;
+    invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/BasePendingResult;->mp()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;->afY:Ljava/util/ArrayList;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afU: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;->afY:Ljava/util/ArrayList;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afU: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;->afU:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afQ: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;->age:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aga: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;->afU:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afQ:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    iget-boolean v1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->agd:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afZ: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 251ef76575..e41568c52d 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 agW:Lcom/google/android/gms/common/api/internal/g;
+.field protected final agS: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;->agW:Lcom/google/android/gms/common/api/internal/g;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/LifecycleCallback;->agS: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;->agV:Ljava/lang/Object;
+    iget-object p0, v0, Lcom/google/android/gms/common/api/internal/f;->agR: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;->agV:Ljava/lang/Object;
+    iget-object p0, v0, Lcom/google/android/gms/common/api/internal/f;->agR: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;->agV:Ljava/lang/Object;
+    iget-object p0, v0, Lcom/google/android/gms/common/api/internal/f;->agR: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;->agV:Ljava/lang/Object;
+    iget-object p0, v0, Lcom/google/android/gms/common/api/internal/f;->agR: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;->agW:Lcom/google/android/gms/common/api/internal/g;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/LifecycleCallback;->agS:Lcom/google/android/gms/common/api/internal/g;
 
-    invoke-interface {v0}, Lcom/google/android/gms/common/api/internal/g;->mG()Landroid/app/Activity;
+    invoke-interface {v0}, Lcom/google/android/gms/common/api/internal/g;->mE()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 62a5518324..4d177984ce 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 aht:Lcom/google/android/gms/common/api/h;
+.field private final ahp: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;->aht:Lcom/google/android/gms/common/api/h;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/aa;->ahp: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;->aht:Lcom/google/android/gms/common/api/h;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/aa;->ahp: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 mj()Landroid/os/Looper;
+.method public final mh()Landroid/os/Looper;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/aa;->aht:Lcom/google/android/gms/common/api/h;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/aa;->ahp:Lcom/google/android/gms/common/api/h;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/api/h;->afv:Landroid/os/Looper;
+    iget-object v0, v0, Lcom/google/android/gms/common/api/h;->afr:Landroid/os/Looper;
 
     return-object v0
 .end method
 
-.method public final mk()V
+.method public final mi()V
     .locals 0
 
     return-void
 .end method
 
-.method public final ml()V
+.method public final mj()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 551d527960..71b194c85d 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 ahu:Lcom/google/android/gms/common/api/internal/ac;
+.field private final ahq: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;->ahu:Lcom/google/android/gms/common/api/internal/ac;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/ab;->ahq: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;->ahu:Lcom/google/android/gms/common/api/internal/ac;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/ab;->ahq:Lcom/google/android/gms/common/api/internal/ac;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/common/api/internal/ac;->mM()V
+    invoke-virtual {p1}, Lcom/google/android/gms/common/api/internal/ac;->mK()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 94152d6021..58b32920ac 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 mM()V
+.method public abstract mK()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 bbc2781e60..5ec1860ed3 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 ahv:Lcom/google/android/gms/tasks/h;
+.field public ahr: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;->ahv:Lcom/google/android/gms/tasks/h;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/ad;->ahr:Lcom/google/android/gms/tasks/h;
 
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/ad;->agW:Lcom/google/android/gms/common/api/internal/g;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/ad;->agS: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;->ahv:Lcom/google/android/gms/tasks/h;
+    iget-object p0, v0, Lcom/google/android/gms/common/api/internal/ad;->ahr:Lcom/google/android/gms/tasks/h;
 
-    iget-object p0, p0, Lcom/google/android/gms/tasks/h;->aLU:Lcom/google/android/gms/tasks/ac;
+    iget-object p0, p0, Lcom/google/android/gms/tasks/h;->aLQ: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;->ahv:Lcom/google/android/gms/tasks/h;
+    iput-object p0, v0, Lcom/google/android/gms/common/api/internal/ad;->ahr: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;->ahv:Lcom/google/android/gms/tasks/h;
+    iget-object p2, p0, Lcom/google/android/gms/common/api/internal/ad;->ahr: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;->afe:Landroid/app/PendingIntent;
+    iget-object p1, p1, Lcom/google/android/gms/common/ConnectionResult;->afa: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 ms()V
+.method protected final mq()V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ad;->aij:Lcom/google/android/gms/common/GoogleApiAvailability;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ad;->aif:Lcom/google/android/gms/common/GoogleApiAvailability;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/ad;->agW:Lcom/google/android/gms/common/api/internal/g;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/ad;->agS:Lcom/google/android/gms/common/api/internal/g;
 
-    invoke-interface {v1}, Lcom/google/android/gms/common/api/internal/g;->mG()Landroid/app/Activity;
+    invoke-interface {v1}, Lcom/google/android/gms/common/api/internal/g;->mE()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;->ahv:Lcom/google/android/gms/tasks/h;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ad;->ahr: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;->ahv:Lcom/google/android/gms/tasks/h;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/ad;->ahr:Lcom/google/android/gms/tasks/h;
 
-    iget-object v2, v2, Lcom/google/android/gms/tasks/h;->aLU:Lcom/google/android/gms/tasks/ac;
+    iget-object v2, v2, Lcom/google/android/gms/tasks/h;->aLQ: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;->ahv:Lcom/google/android/gms/tasks/h;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ad;->ahr: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 fdcd352e69..04d3e1a636 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 ahw:Lcom/google/android/gms/common/api/internal/t;
+.field public final ahs:Lcom/google/android/gms/common/api/internal/t;
 
-.field public final ahx:I
+.field public final aht:I
 
-.field public final ahy:Lcom/google/android/gms/common/api/h;
+.field public final ahu: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;->ahw:Lcom/google/android/gms/common/api/internal/t;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/ae;->ahs:Lcom/google/android/gms/common/api/internal/t;
 
-    iput p2, p0, Lcom/google/android/gms/common/api/internal/ae;->ahx:I
+    iput p2, p0, Lcom/google/android/gms/common/api/internal/ae;->aht:I
 
-    iput-object p3, p0, Lcom/google/android/gms/common/api/internal/ae;->ahy:Lcom/google/android/gms/common/api/h;
+    iput-object p3, p0, Lcom/google/android/gms/common/api/internal/ae;->ahu: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 da9b634d1d..254078bfd0 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 ahA:Lcom/google/android/gms/common/api/internal/m;
+.field public final ahv: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;",
             "*>;"
         }
     .end annotation
 .end field
 
-.field public final ahz:Lcom/google/android/gms/common/api/internal/j;
+.field public final ahw: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;",
             "*>;"
         }
@@ -41,9 +41,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/af;->ahz:Lcom/google/android/gms/common/api/internal/j;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/af;->ahv:Lcom/google/android/gms/common/api/internal/j;
 
-    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/af;->ahA:Lcom/google/android/gms/common/api/internal/m;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/af;->ahw: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 9c5096ba1e..26b444a7fc 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 ahB:Ljava/util/concurrent/ExecutorService;
+.field private static final ahx: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;->ahB:Ljava/util/concurrent/ExecutorService;
+    sput-object v8, Lcom/google/android/gms/common/api/internal/ah;->ahx:Ljava/util/concurrent/ExecutorService;
 
     return-void
 .end method
 
-.method public static mN()Ljava/util/concurrent/ExecutorService;
+.method public static mL()Ljava/util/concurrent/ExecutorService;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/common/api/internal/ah;->ahB:Ljava/util/concurrent/ExecutorService;
+    sget-object v0, Lcom/google/android/gms/common/api/internal/ah;->ahx: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 7dad1ccff4..4ae3c40e62 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 ahC:Lcom/google/android/gms/common/api/a$a;
+.field private static ahy: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 afo:Lcom/google/android/gms/common/api/a$a;
+.field private final afj: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,13 @@
     .end annotation
 .end field
 
-.field private ahD:Ljava/util/Set;
+.field private ahA:Lcom/google/android/gms/common/internal/d;
+
+.field ahB:Lcom/google/android/gms/signin/e;
+
+.field private ahC:Lcom/google/android/gms/common/api/internal/am;
+
+.field private ahz:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -43,12 +49,6 @@
     .end annotation
 .end field
 
-.field private ahE:Lcom/google/android/gms/common/internal/d;
-
-.field ahF:Lcom/google/android/gms/signin/e;
-
-.field private ahG:Lcom/google/android/gms/common/api/internal/am;
-
 .field private final mContext:Landroid/content/Context;
 
 .field private final mHandler:Landroid/os/Handler;
@@ -58,9 +58,9 @@
 .method static constructor <clinit>()V
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/signin/b;->aLF:Lcom/google/android/gms/common/api/a$a;
+    sget-object v0, Lcom/google/android/gms/signin/b;->aLB: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;
+    sput-object v0, Lcom/google/android/gms/common/api/internal/aj;->ahy: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;->ahC:Lcom/google/android/gms/common/api/a$a;
+    sget-object v0, Lcom/google/android/gms/common/api/internal/aj;->ahy: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;->ahE:Lcom/google/android/gms/common/internal/d;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/aj;->ahA:Lcom/google/android/gms/common/internal/d;
 
-    iget-object p1, p3, Lcom/google/android/gms/common/internal/d;->ajA:Ljava/util/Set;
+    iget-object p1, p3, Lcom/google/android/gms/common/internal/d;->ajw:Ljava/util/Set;
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/aj;->ahD:Ljava/util/Set;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/aj;->ahz:Ljava/util/Set;
 
-    iput-object p4, p0, Lcom/google/android/gms/common/api/internal/aj;->afo:Lcom/google/android/gms/common/api/a$a;
+    iput-object p4, p0, Lcom/google/android/gms/common/api/internal/aj;->afj: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;->ahG:Lcom/google/android/gms/common/api/internal/am;
+    iget-object p0, p0, Lcom/google/android/gms/common/api/internal/aj;->ahC: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;->ail:Lcom/google/android/gms/common/ConnectionResult;
+    iget-object v0, p1, Lcom/google/android/gms/signin/internal/zaj;->aih:Lcom/google/android/gms/common/ConnectionResult;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/ConnectionResult;->lQ()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/common/ConnectionResult;->lO()Z
 
     move-result v1
 
     if-eqz v1, :cond_1
 
-    iget-object p1, p1, Lcom/google/android/gms/signin/internal/zaj;->aLD:Lcom/google/android/gms/common/internal/ResolveAccountResponse;
+    iget-object p1, p1, Lcom/google/android/gms/signin/internal/zaj;->aLz:Lcom/google/android/gms/common/internal/ResolveAccountResponse;
 
-    iget-object v0, p1, Lcom/google/android/gms/common/internal/ResolveAccountResponse;->ail:Lcom/google/android/gms/common/ConnectionResult;
+    iget-object v0, p1, Lcom/google/android/gms/common/internal/ResolveAccountResponse;->aih:Lcom/google/android/gms/common/ConnectionResult;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/ConnectionResult;->lQ()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/common/ConnectionResult;->lO()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;->ahG:Lcom/google/android/gms/common/api/internal/am;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/aj;->ahC: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;->ahG:Lcom/google/android/gms/common/api/internal/am;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/aj;->ahC:Lcom/google/android/gms/common/api/internal/am;
 
-    iget-object p1, p1, Lcom/google/android/gms/common/internal/ResolveAccountResponse;->akp:Landroid/os/IBinder;
+    iget-object p1, p1, Lcom/google/android/gms/common/internal/ResolveAccountResponse;->akl: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;->ahD:Ljava/util/Set;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/aj;->ahz: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;->ahG:Lcom/google/android/gms/common/api/internal/am;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/aj;->ahC: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;->ahF:Lcom/google/android/gms/signin/e;
+    iget-object p0, p0, Lcom/google/android/gms/common/api/internal/aj;->ahB: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;->ahG:Lcom/google/android/gms/common/api/internal/am;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/aj;->ahC: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;->ahF:Lcom/google/android/gms/signin/e;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/aj;->ahB: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;->ahE:Lcom/google/android/gms/common/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/aj;->ahA: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;->ajJ:Ljava/lang/Integer;
+    iput-object v1, v0, Lcom/google/android/gms/common/internal/d;->ajF:Ljava/lang/Integer;
 
-    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/aj;->afo:Lcom/google/android/gms/common/api/a$a;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/aj;->afj: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;->ahE:Lcom/google/android/gms/common/internal/d;
+    iget-object v5, p0, Lcom/google/android/gms/common/api/internal/aj;->ahA:Lcom/google/android/gms/common/internal/d;
 
-    iget-object v6, v5, Lcom/google/android/gms/common/internal/d;->ajH:Lcom/google/android/gms/signin/a;
+    iget-object v6, v5, Lcom/google/android/gms/common/internal/d;->ajD: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;->ahF:Lcom/google/android/gms/signin/e;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/aj;->ahB:Lcom/google/android/gms/signin/e;
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/aj;->ahG:Lcom/google/android/gms/common/api/internal/am;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/aj;->ahC:Lcom/google/android/gms/common/api/internal/am;
 
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/aj;->ahD:Ljava/util/Set;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/aj;->ahz: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;->ahF:Lcom/google/android/gms/signin/e;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/aj;->ahB: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 mm()V
+.method public final mk()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/aj;->ahF:Lcom/google/android/gms/signin/e;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/aj;->ahB: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 mn()V
+.method public final ml()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/aj;->ahF:Lcom/google/android/gms/signin/e;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/aj;->ahB: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 ce9f707e90..bacf7a9ac6 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 ahH:Lcom/google/android/gms/common/api/internal/aj;
+.field private final synthetic ahD: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;->ahH:Lcom/google/android/gms/common/api/internal/aj;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/ak;->ahD: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;->ahH:Lcom/google/android/gms/common/api/internal/aj;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ak;->ahD: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 a18f25e9f8..2c272f13c4 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 ahH:Lcom/google/android/gms/common/api/internal/aj;
+.field private final synthetic ahD:Lcom/google/android/gms/common/api/internal/aj;
 
-.field private final synthetic ahI:Lcom/google/android/gms/signin/internal/zaj;
+.field private final synthetic ahE: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;->ahH:Lcom/google/android/gms/common/api/internal/aj;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/al;->ahD:Lcom/google/android/gms/common/api/internal/aj;
 
-    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/al;->ahI:Lcom/google/android/gms/signin/internal/zaj;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/al;->ahE: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;->ahH:Lcom/google/android/gms/common/api/internal/aj;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/al;->ahD:Lcom/google/android/gms/common/api/internal/aj;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/al;->ahI:Lcom/google/android/gms/signin/internal/zaj;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/al;->ahE: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 cc4ea7c11e..58c98388b2 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 afU:Ljava/lang/Object;
+.field final afQ:Ljava/lang/Object;
 
-.field final afW:Ljava/lang/ref/WeakReference;
+.field final afS:Ljava/lang/ref/WeakReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/ref/WeakReference<",
@@ -32,7 +32,7 @@
     .end annotation
 .end field
 
-.field ahJ:Lcom/google/android/gms/common/api/q;
+.field ahF: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 ahK:Lcom/google/android/gms/common/api/internal/an;
+.field ahG: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 ahL:Lcom/google/android/gms/common/api/p;
+.field volatile ahH: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 ahM:Lcom/google/android/gms/common/api/j;
+.field ahI: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 ahN:Lcom/google/android/gms/common/api/Status;
+.field ahJ:Lcom/google/android/gms/common/api/Status;
 
-.field final ahO:Lcom/google/android/gms/common/api/internal/ap;
+.field final ahK: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 ahP:Z
+.field ahL:Z
 
 
 # direct methods
-.method private final mO()Z
+.method private final mM()Z
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/an;->afW:Ljava/lang/ref/WeakReference;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/an;->afS: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;->ahL:Lcom/google/android/gms/common/api/p;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/an;->ahH: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;->afU:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/an;->afQ:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    invoke-interface {p1}, Lcom/google/android/gms/common/api/n;->mo()Lcom/google/android/gms/common/api/Status;
+    invoke-interface {p1}, Lcom/google/android/gms/common/api/n;->mm()Lcom/google/android/gms/common/api/Status;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/common/api/Status;->lQ()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/common/api/Status;->lO()Z
 
     move-result v1
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/an;->ahJ:Lcom/google/android/gms/common/api/q;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/an;->ahF:Lcom/google/android/gms/common/api/q;
 
     if-eqz v1, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/common/api/internal/ah;->mN()Ljava/util/concurrent/ExecutorService;
+    invoke-static {}, Lcom/google/android/gms/common/api/internal/ah;->mL()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;->mO()Z
+    invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/an;->mM()Z
 
     move-result p1
 
     if-eqz p1, :cond_2
 
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/an;->ahL:Lcom/google/android/gms/common/api/p;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/an;->ahH:Lcom/google/android/gms/common/api/p;
 
     goto :goto_0
 
     :cond_1
-    invoke-interface {p1}, Lcom/google/android/gms/common/api/n;->mo()Lcom/google/android/gms/common/api/Status;
+    invoke-interface {p1}, Lcom/google/android/gms/common/api/n;->mm()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;->afU:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/an;->afQ:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/an;->ahN:Lcom/google/android/gms/common/api/Status;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/an;->ahJ: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;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/an;->ahJ: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;->afU:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/an;->afQ:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/an;->ahJ:Lcom/google/android/gms/common/api/q;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/an;->ahF: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;->ahK:Lcom/google/android/gms/common/api/internal/an;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/an;->ahG: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;->mO()Z
+    invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/an;->mM()Z
 
     move-result p1
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/an;->ahL:Lcom/google/android/gms/common/api/p;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/an;->ahH: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 fda73bcf5e..5ff59bb3a2 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 ahQ:Lcom/google/android/gms/common/api/n;
+.field private final synthetic ahM:Lcom/google/android/gms/common/api/n;
 
-.field private final synthetic ahR:Lcom/google/android/gms/common/api/internal/an;
+.field private final synthetic ahN: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;->ahR:Lcom/google/android/gms/common/api/internal/an;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/ao;->ahN:Lcom/google/android/gms/common/api/internal/an;
 
-    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/ao;->ahQ:Lcom/google/android/gms/common/api/n;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/ao;->ahM: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;->afT:Ljava/lang/ThreadLocal;
+    sget-object v0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afP: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;->ahR:Lcom/google/android/gms/common/api/internal/an;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ao;->ahN:Lcom/google/android/gms/common/api/internal/an;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/an;->ahJ:Lcom/google/android/gms/common/api/q;
+    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/an;->ahF:Lcom/google/android/gms/common/api/q;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/api/q;->mp()Lcom/google/android/gms/common/api/j;
+    invoke-virtual {v0}, Lcom/google/android/gms/common/api/q;->mn()Lcom/google/android/gms/common/api/j;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/ao;->ahR:Lcom/google/android/gms/common/api/internal/an;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/ao;->ahN:Lcom/google/android/gms/common/api/internal/an;
 
-    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/an;->ahO:Lcom/google/android/gms/common/api/internal/ap;
+    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/an;->ahK:Lcom/google/android/gms/common/api/internal/ap;
 
-    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/ao;->ahR:Lcom/google/android/gms/common/api/internal/an;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/ao;->ahN:Lcom/google/android/gms/common/api/internal/an;
 
-    iget-object v2, v2, Lcom/google/android/gms/common/api/internal/an;->ahO:Lcom/google/android/gms/common/api/internal/ap;
+    iget-object v2, v2, Lcom/google/android/gms/common/api/internal/an;->ahK: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;->afT:Ljava/lang/ThreadLocal;
+    sget-object v0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afP: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;->ahR:Lcom/google/android/gms/common/api/internal/an;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ao;->ahN:Lcom/google/android/gms/common/api/internal/an;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/an;->afW:Ljava/lang/ref/WeakReference;
+    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/an;->afS: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;->ml()V
+    invoke-virtual {v0}, Lcom/google/android/gms/common/api/i;->mj()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;->ahR:Lcom/google/android/gms/common/api/internal/an;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/ao;->ahN:Lcom/google/android/gms/common/api/internal/an;
 
-    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/an;->ahO:Lcom/google/android/gms/common/api/internal/ap;
+    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/an;->ahK:Lcom/google/android/gms/common/api/internal/ap;
 
-    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/ao;->ahR:Lcom/google/android/gms/common/api/internal/an;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/ao;->ahN:Lcom/google/android/gms/common/api/internal/an;
 
-    iget-object v2, v2, Lcom/google/android/gms/common/api/internal/an;->ahO:Lcom/google/android/gms/common/api/internal/ap;
+    iget-object v2, v2, Lcom/google/android/gms/common/api/internal/an;->ahK: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;->afT:Ljava/lang/ThreadLocal;
+    sget-object v0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afP: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;->ahR:Lcom/google/android/gms/common/api/internal/an;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ao;->ahN:Lcom/google/android/gms/common/api/internal/an;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/an;->afW:Ljava/lang/ref/WeakReference;
+    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/an;->afS: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;->ml()V
+    invoke-virtual {v0}, Lcom/google/android/gms/common/api/i;->mj()V
 
     :cond_1
     return-void
 
     :goto_0
-    sget-object v1, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afT:Ljava/lang/ThreadLocal;
+    sget-object v1, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afP: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;->ahR:Lcom/google/android/gms/common/api/internal/an;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/ao;->ahN:Lcom/google/android/gms/common/api/internal/an;
 
-    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/an;->afW:Ljava/lang/ref/WeakReference;
+    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/an;->afS: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;->ml()V
+    invoke-virtual {v1}, Lcom/google/android/gms/common/api/i;->mj()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 9b54e9d06b..086764336f 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 ahR:Lcom/google/android/gms/common/api/internal/an;
+.field private final synthetic ahN: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;->ahR:Lcom/google/android/gms/common/api/internal/an;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ap;->ahN:Lcom/google/android/gms/common/api/internal/an;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/an;->afU:Ljava/lang/Object;
+    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/an;->afQ: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;->ahR:Lcom/google/android/gms/common/api/internal/an;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/ap;->ahN: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;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/an;->ahG: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;->ahR:Lcom/google/android/gms/common/api/internal/an;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/ap;->ahN: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;
+    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/an;->ahG: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;->ahR:Lcom/google/android/gms/common/api/internal/an;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/ap;->ahN: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 v2, v2, Lcom/google/android/gms/common/api/internal/an;->ahG:Lcom/google/android/gms/common/api/internal/an;
 
-    iget-object v3, v2, Lcom/google/android/gms/common/api/internal/an;->afU:Ljava/lang/Object;
+    iget-object v3, v2, Lcom/google/android/gms/common/api/internal/an;->afQ: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;->ahM:Lcom/google/android/gms/common/api/j;
+    iput-object p1, v2, Lcom/google/android/gms/common/api/internal/an;->ahI:Lcom/google/android/gms/common/api/j;
 
-    iget-object p1, v2, Lcom/google/android/gms/common/api/internal/an;->ahJ:Lcom/google/android/gms/common/api/q;
+    iget-object p1, v2, Lcom/google/android/gms/common/api/internal/an;->ahF:Lcom/google/android/gms/common/api/q;
 
     if-nez p1, :cond_5
 
-    iget-object p1, v2, Lcom/google/android/gms/common/api/internal/an;->ahL:Lcom/google/android/gms/common/api/p;
+    iget-object p1, v2, Lcom/google/android/gms/common/api/internal/an;->ahH: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;->afW:Ljava/lang/ref/WeakReference;
+    iget-object p1, v2, Lcom/google/android/gms/common/api/internal/an;->afS: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;->ahP:Z
+    iget-boolean v4, v2, Lcom/google/android/gms/common/api/internal/an;->ahL:Z
 
     if-nez v4, :cond_6
 
-    iget-object v4, v2, Lcom/google/android/gms/common/api/internal/an;->ahJ:Lcom/google/android/gms/common/api/q;
+    iget-object v4, v2, Lcom/google/android/gms/common/api/internal/an;->ahF: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;->mk()V
+    invoke-virtual {p1}, Lcom/google/android/gms/common/api/i;->mi()V
 
-    iput-boolean v1, v2, Lcom/google/android/gms/common/api/internal/an;->ahP:Z
+    iput-boolean v1, v2, Lcom/google/android/gms/common/api/internal/an;->ahL:Z
 
     :cond_6
-    iget-object p1, v2, Lcom/google/android/gms/common/api/internal/an;->ahN:Lcom/google/android/gms/common/api/Status;
+    iget-object p1, v2, Lcom/google/android/gms/common/api/internal/an;->ahJ:Lcom/google/android/gms/common/api/Status;
 
     if-eqz p1, :cond_7
 
-    iget-object p1, v2, Lcom/google/android/gms/common/api/internal/an;->ahN:Lcom/google/android/gms/common/api/Status;
+    iget-object p1, v2, Lcom/google/android/gms/common/api/internal/an;->ahJ: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;->ahM:Lcom/google/android/gms/common/api/j;
+    iget-object p1, v2, Lcom/google/android/gms/common/api/internal/an;->ahI:Lcom/google/android/gms/common/api/j;
 
     if-eqz p1, :cond_8
 
-    iget-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;->ahI: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 726b9eaf4c..707c324107 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 ahS:Lcom/google/android/gms/common/api/Status;
+.field public static final ahO:Lcom/google/android/gms/common/api/Status;
 
-.field private static final ahT:[Lcom/google/android/gms/common/api/internal/BasePendingResult;
+.field private static final ahP:[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;->ahS:Lcom/google/android/gms/common/api/Status;
+    sput-object v0, Lcom/google/android/gms/common/api/internal/aq;->ahO: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;->ahT:[Lcom/google/android/gms/common/api/internal/BasePendingResult;
+    sput-object v0, Lcom/google/android/gms/common/api/internal/aq;->ahP:[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 f7db95caa1..3199387335 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 ahU:Lcom/google/android/gms/tasks/h;
+.field protected final ahQ: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;->ahU:Lcom/google/android/gms/tasks/h;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/ar;->ahQ: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;->ahU:Lcom/google/android/gms/tasks/h;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ar;->ahQ: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;->ahU:Lcom/google/android/gms/tasks/h;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ar;->ahQ: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 313be2b2b2..9ba75318fd 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 ahV:Lcom/google/android/gms/common/api/internal/c$a;
+.field private final ahR: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;->ahV:Lcom/google/android/gms/common/api/internal/c$a;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/as;->ahR: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;->ahV:Lcom/google/android/gms/common/api/internal/c$a;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/as;->ahR:Lcom/google/android/gms/common/api/internal/c$a;
 
-    iget-object v1, p1, Lcom/google/android/gms/common/api/internal/n;->ahh:Ljava/util/Map;
+    iget-object v1, p1, Lcom/google/android/gms/common/api/internal/n;->ahd: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;->ahV:Lcom/google/android/gms/common/api/internal/c$a;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/as;->ahR:Lcom/google/android/gms/common/api/internal/c$a;
 
-    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/d$a;->agz:Lcom/google/android/gms/common/api/a$f;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/d$a;->agv: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;->ahV:Lcom/google/android/gms/common/api/internal/c$a;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/as;->ahR: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;->ahV:Lcom/google/android/gms/common/api/internal/c$a;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/as;->ahR: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 20a30fc8ea..1ce8368f24 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 ahW:Lcom/google/android/gms/common/api/internal/j;
+.field private final ahS: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 ahX:Lcom/google/android/gms/common/api/internal/m;
+.field private final ahT: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;->ahz:Lcom/google/android/gms/common/api/internal/j;
+    iget-object p2, p1, Lcom/google/android/gms/common/api/internal/af;->ahv: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;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/at;->ahS:Lcom/google/android/gms/common/api/internal/j;
 
-    iget-object p1, p1, 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/af;->ahw: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;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/at;->ahT: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;->ahW:Lcom/google/android/gms/common/api/internal/j;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/at;->ahS:Lcom/google/android/gms/common/api/internal/j;
 
-    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/j;->ahd:[Lcom/google/android/gms/common/Feature;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/j;->agZ:[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;->ahW:Lcom/google/android/gms/common/api/internal/j;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/at;->ahS:Lcom/google/android/gms/common/api/internal/j;
 
-    iget-boolean p1, p1, Lcom/google/android/gms/common/api/internal/j;->ahe:Z
+    iget-boolean p1, p1, Lcom/google/android/gms/common/api/internal/j;->aha:Z
 
     return p1
 .end method
@@ -129,35 +129,35 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/at;->ahW:Lcom/google/android/gms/common/api/internal/j;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/at;->ahS:Lcom/google/android/gms/common/api/internal/j;
 
-    iget-object v1, p1, Lcom/google/android/gms/common/api/internal/d$a;->agz:Lcom/google/android/gms/common/api/a$f;
+    iget-object v1, p1, Lcom/google/android/gms/common/api/internal/d$a;->agv:Lcom/google/android/gms/common/api/a$f;
 
-    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/at;->ahU:Lcom/google/android/gms/tasks/h;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/at;->ahQ: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;->ahW:Lcom/google/android/gms/common/api/internal/j;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/at;->ahS:Lcom/google/android/gms/common/api/internal/j;
 
-    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/j;->agY:Lcom/google/android/gms/common/api/internal/h;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/h;->agZ:Lcom/google/android/gms/common/api/internal/h$a;
+    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/h;->agV: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;->agE:Ljava/util/Map;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/d$a;->agA:Ljava/util/Map;
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/at;->ahW:Lcom/google/android/gms/common/api/internal/j;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/at;->ahS:Lcom/google/android/gms/common/api/internal/j;
 
-    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/j;->agY:Lcom/google/android/gms/common/api/internal/h;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/h;->agZ:Lcom/google/android/gms/common/api/internal/h$a;
+    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/h;->agV: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;->ahW:Lcom/google/android/gms/common/api/internal/j;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/at;->ahS:Lcom/google/android/gms/common/api/internal/j;
 
-    iget-object v3, p0, Lcom/google/android/gms/common/api/internal/at;->ahX:Lcom/google/android/gms/common/api/internal/m;
+    iget-object v3, p0, Lcom/google/android/gms/common/api/internal/at;->ahT: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 57f91c7364..25cb80bbf8 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 ahU:Lcom/google/android/gms/tasks/h;
+.field private final ahQ: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 ahY:Lcom/google/android/gms/common/api/internal/l;
+.field private final ahU: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 ahZ:Lcom/google/android/gms/common/api/internal/k;
+.field private final ahV: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;->ahU:Lcom/google/android/gms/tasks/h;
+    iput-object p3, p0, Lcom/google/android/gms/common/api/internal/au;->ahQ:Lcom/google/android/gms/tasks/h;
 
-    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/au;->ahY:Lcom/google/android/gms/common/api/internal/l;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/au;->ahU:Lcom/google/android/gms/common/api/internal/l;
 
-    iput-object p4, p0, Lcom/google/android/gms/common/api/internal/au;->ahZ:Lcom/google/android/gms/common/api/internal/k;
+    iput-object p4, p0, Lcom/google/android/gms/common/api/internal/au;->ahV: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;->ahU:Lcom/google/android/gms/tasks/h;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/au;->ahQ:Lcom/google/android/gms/tasks/h;
 
-    iget-object v1, p1, Lcom/google/android/gms/common/api/internal/n;->ahi:Ljava/util/Map;
+    iget-object v1, p1, Lcom/google/android/gms/common/api/internal/n;->ahe: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;->aLU:Lcom/google/android/gms/tasks/ac;
+    iget-object p2, v0, Lcom/google/android/gms/tasks/h;->aLQ: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;->ahY:Lcom/google/android/gms/common/api/internal/l;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/au;->ahU:Lcom/google/android/gms/common/api/internal/l;
 
-    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/d$a;->agz:Lcom/google/android/gms/common/api/a$f;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/d$a;->agv:Lcom/google/android/gms/common/api/a$f;
 
-    iget-object v1, 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/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;->ahU:Lcom/google/android/gms/tasks/h;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/au;->ahQ: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;->ahY:Lcom/google/android/gms/common/api/internal/l;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/au;->ahU:Lcom/google/android/gms/common/api/internal/l;
 
-    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/l;->ahf:[Lcom/google/android/gms/common/Feature;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/l;->ahb:[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;->ahY:Lcom/google/android/gms/common/api/internal/l;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/au;->ahU:Lcom/google/android/gms/common/api/internal/l;
 
-    iget-boolean p1, p1, Lcom/google/android/gms/common/api/internal/l;->ahg:Z
+    iget-boolean p1, p1, Lcom/google/android/gms/common/api/internal/l;->ahc: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;->ahU:Lcom/google/android/gms/tasks/h;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/au;->ahQ:Lcom/google/android/gms/tasks/h;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/au;->ahZ:Lcom/google/android/gms/common/api/internal/k;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/au;->ahV: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 dba535c4a6..725b32985a 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 aia:Lcom/google/android/gms/common/api/internal/h$a;
+.field private final ahW: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;->aia:Lcom/google/android/gms/common/api/internal/h$a;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/av;->ahW: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;->agE:Ljava/util/Map;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/d$a;->agA:Ljava/util/Map;
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/av;->aia:Lcom/google/android/gms/common/api/internal/h$a;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/av;->ahW: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;->ahz:Lcom/google/android/gms/common/api/internal/j;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/af;->ahv:Lcom/google/android/gms/common/api/internal/j;
 
-    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/j;->ahd:[Lcom/google/android/gms/common/Feature;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/j;->agZ:[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;->agE:Ljava/util/Map;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/d$a;->agA:Ljava/util/Map;
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/av;->aia:Lcom/google/android/gms/common/api/internal/h$a;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/av;->ahW: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;->ahz:Lcom/google/android/gms/common/api/internal/j;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/af;->ahv:Lcom/google/android/gms/common/api/internal/j;
 
-    iget-boolean p1, p1, Lcom/google/android/gms/common/api/internal/j;->ahe:Z
+    iget-boolean p1, p1, Lcom/google/android/gms/common/api/internal/j;->aha: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;->agE:Ljava/util/Map;
+    iget-object v0, p1, Lcom/google/android/gms/common/api/internal/d$a;->agA:Ljava/util/Map;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/av;->aia:Lcom/google/android/gms/common/api/internal/h$a;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/av;->ahW: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;->ahA:Lcom/google/android/gms/common/api/internal/m;
+    iget-object v1, v0, Lcom/google/android/gms/common/api/internal/af;->ahw:Lcom/google/android/gms/common/api/internal/m;
 
-    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/d$a;->agz:Lcom/google/android/gms/common/api/a$f;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/d$a;->agv:Lcom/google/android/gms/common/api/a$f;
 
-    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/av;->ahU:Lcom/google/android/gms/tasks/h;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/av;->ahQ: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;->ahz:Lcom/google/android/gms/common/api/internal/j;
+    iget-object p1, v0, Lcom/google/android/gms/common/api/internal/af;->ahv:Lcom/google/android/gms/common/api/internal/j;
 
-    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/j;->ahc:Lcom/google/android/gms/common/api/internal/h;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/j;->agY:Lcom/google/android/gms/common/api/internal/h;
 
     const/4 v0, 0x0
 
-    iput-object v0, p1, Lcom/google/android/gms/common/api/internal/h;->agY:Ljava/lang/Object;
+    iput-object v0, p1, Lcom/google/android/gms/common/api/internal/h;->agU:Ljava/lang/Object;
 
     return-void
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/av;->ahU:Lcom/google/android/gms/tasks/h;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/av;->ahQ: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;->aLU:Lcom/google/android/gms/tasks/ac;
+    iget-object p1, p1, Lcom/google/android/gms/tasks/h;->aLQ: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 96b4c26eea..278c4ab079 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 afs:Lcom/google/android/gms/common/api/a;
+.field public final afo: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 aft:Lcom/google/android/gms/common/api/a$d;
+.field private final afp: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 aib:Z
+.field private final ahX:Z
 
-.field private final aic:I
+.field private final ahY:I
 
 
 # direct methods
@@ -51,21 +51,21 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/google/android/gms/common/api/internal/aw;->aib:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/common/api/internal/aw;->ahX:Z
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/aw;->afs:Lcom/google/android/gms/common/api/a;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/aw;->afo:Lcom/google/android/gms/common/api/a;
 
-    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/aw;->aft:Lcom/google/android/gms/common/api/a$d;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/aw;->afp: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;->afs:Lcom/google/android/gms/common/api/a;
+    iget-object p2, p0, Lcom/google/android/gms/common/api/internal/aw;->afo:Lcom/google/android/gms/common/api/a;
 
     aput-object p2, p1, v0
 
-    iget-object p2, p0, Lcom/google/android/gms/common/api/internal/aw;->aft:Lcom/google/android/gms/common/api/a$d;
+    iget-object p2, p0, Lcom/google/android/gms/common/api/internal/aw;->afp: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;->aic:I
+    iput p1, p0, Lcom/google/android/gms/common/api/internal/aw;->ahY: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;->aib:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/common/api/internal/aw;->ahX:Z
 
     if-nez v1, :cond_2
 
-    iget-boolean v1, p1, Lcom/google/android/gms/common/api/internal/aw;->aib:Z
+    iget-boolean v1, p1, Lcom/google/android/gms/common/api/internal/aw;->ahX:Z
 
     if-nez v1, :cond_2
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/aw;->afs:Lcom/google/android/gms/common/api/a;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/aw;->afo: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;
+    iget-object v3, p1, Lcom/google/android/gms/common/api/internal/aw;->afo: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;->aft:Lcom/google/android/gms/common/api/a$d;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/aw;->afp: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;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/aw;->afp: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;->aic:I
+    iget v0, p0, Lcom/google/android/gms/common/api/internal/aw;->ahY: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 b0fd3a359d..1d479b0081 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 aid:Landroidx/collection/ArrayMap;
+.field private final ahZ:Landroidx/collection/ArrayMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Landroidx/collection/ArrayMap<",
@@ -15,7 +15,7 @@
     .end annotation
 .end field
 
-.field private final aie:Lcom/google/android/gms/tasks/h;
+.field private final aia: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 aif:I
+.field private aib:I
 
-.field private aig:Z
+.field private aic: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;->aid:Landroidx/collection/ArrayMap;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ax;->ahZ: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;->aif:I
+    iget p1, p0, Lcom/google/android/gms/common/api/internal/ax;->aib:I
 
     const/4 p3, 0x1
 
     sub-int/2addr p1, p3
 
-    iput p1, p0, Lcom/google/android/gms/common/api/internal/ax;->aif:I
+    iput p1, p0, Lcom/google/android/gms/common/api/internal/ax;->aib:I
 
-    invoke-virtual {p2}, Lcom/google/android/gms/common/ConnectionResult;->lQ()Z
+    invoke-virtual {p2}, Lcom/google/android/gms/common/ConnectionResult;->lO()Z
 
     move-result p1
 
     if-nez p1, :cond_0
 
-    iput-boolean p3, p0, Lcom/google/android/gms/common/api/internal/ax;->aig:Z
+    iput-boolean p3, p0, Lcom/google/android/gms/common/api/internal/ax;->aic:Z
 
     :cond_0
-    iget p1, p0, Lcom/google/android/gms/common/api/internal/ax;->aif:I
+    iget p1, p0, Lcom/google/android/gms/common/api/internal/ax;->aib:I
 
     if-nez p1, :cond_2
 
-    iget-boolean p1, p0, Lcom/google/android/gms/common/api/internal/ax;->aig:Z
+    iget-boolean p1, p0, Lcom/google/android/gms/common/api/internal/ax;->aic: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;->aie:Lcom/google/android/gms/tasks/h;
+    iget-object p2, p0, Lcom/google/android/gms/common/api/internal/ax;->aia: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;->aie:Lcom/google/android/gms/tasks/h;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/ax;->aia:Lcom/google/android/gms/tasks/h;
 
-    iget-object p2, p0, Lcom/google/android/gms/common/api/internal/ax;->aid:Landroidx/collection/ArrayMap;
+    iget-object p2, p0, Lcom/google/android/gms/common/api/internal/ax;->ahZ: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 86aa5ec18d..2fb16474d7 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 aih:Ljava/util/concurrent/atomic/AtomicReference;
+.field protected final aid: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 aii:Landroid/os/Handler;
+.field private final aie:Landroid/os/Handler;
 
-.field protected final aij:Lcom/google/android/gms/common/GoogleApiAvailability;
+.field protected final aif: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;->lS()Lcom/google/android/gms/common/GoogleApiAvailability;
+    invoke-static {}, Lcom/google/android/gms/common/GoogleApiAvailability;->lQ()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;->aih:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/ay;->aid: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;->aii:Landroid/os/Handler;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/ay;->aie:Landroid/os/Handler;
 
-    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/ay;->aij:Lcom/google/android/gms/common/GoogleApiAvailability;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/ay;->aif: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;->aik:I
+    iget p0, p0, Lcom/google/android/gms/common/api/internal/az;->aig: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;->aih:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/ay;->aid: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;->aii:Landroid/os/Handler;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/ay;->aie: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 mP()V
+.method protected final mN()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ay;->aih:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ay;->aid: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;->ms()V
+    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/ay;->mq()V
 
     return-void
 .end method
 
-.method protected abstract ms()V
+.method protected abstract mq()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;->aih:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ay;->aid: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;->aij:Lcom/google/android/gms/common/GoogleApiAvailability;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/ay;->aif: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;->ail:Lcom/google/android/gms/common/ConnectionResult;
+    iget-object p2, v0, Lcom/google/android/gms/common/api/internal/az;->aih: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;->aih:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/ay;->aid: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;->mP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/ay;->mN()V
 
     return-void
 
     :cond_8
     if-eqz v0, :cond_9
 
-    iget-object p1, v0, Lcom/google/android/gms/common/api/internal/az;->ail:Lcom/google/android/gms/common/ConnectionResult;
+    iget-object p1, v0, Lcom/google/android/gms/common/api/internal/az;->aih:Lcom/google/android/gms/common/ConnectionResult;
 
-    iget p2, v0, Lcom/google/android/gms/common/api/internal/az;->aik:I
+    iget p2, v0, Lcom/google/android/gms/common/api/internal/az;->aig: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;->aih:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ay;->aid: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;->mP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/ay;->mN()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;->aih:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ay;->aid: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;->aih:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ay;->aid: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;->aik:I
+    iget v1, v0, Lcom/google/android/gms/common/api/internal/az;->aig: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;->ail:Lcom/google/android/gms/common/ConnectionResult;
+    iget-object v1, v0, Lcom/google/android/gms/common/api/internal/az;->aih: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;->ail:Lcom/google/android/gms/common/ConnectionResult;
+    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/az;->aih:Lcom/google/android/gms/common/ConnectionResult;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/ConnectionResult;->afe:Landroid/app/PendingIntent;
+    iget-object v0, v0, Lcom/google/android/gms/common/ConnectionResult;->afa: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 362ff77648..3c2509c2b7 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 aik:I
+.field final aig:I
 
-.field final ail:Lcom/google/android/gms/common/ConnectionResult;
+.field final aih: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;->ail:Lcom/google/android/gms/common/ConnectionResult;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/az;->aih:Lcom/google/android/gms/common/ConnectionResult;
 
-    iput p2, p0, Lcom/google/android/gms/common/api/internal/az;->aik:I
+    iput p2, p0, Lcom/google/android/gms/common/api/internal/az;->aig: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 18aa2e5dec..59d5c73c5d 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 afN:Lcom/google/android/gms/common/api/internal/b;
+.field private static final afJ:Lcom/google/android/gms/common/api/internal/b;
 
 
 # instance fields
-.field final afO:Ljava/util/concurrent/atomic/AtomicBoolean;
+.field final afK:Ljava/util/concurrent/atomic/AtomicBoolean;
 
-.field final afP:Ljava/util/concurrent/atomic/AtomicBoolean;
+.field final afL:Ljava/util/concurrent/atomic/AtomicBoolean;
 
-.field private final afQ:Ljava/util/ArrayList;
+.field private final afM:Ljava/util/ArrayList;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/ArrayList<",
@@ -33,7 +33,7 @@
     .end annotation
 .end field
 
-.field private afR:Z
+.field private afN: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;->afN:Lcom/google/android/gms/common/api/internal/b;
+    sput-object v0, Lcom/google/android/gms/common/api/internal/b;->afJ: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;->afO:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/b;->afK: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;->afP:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/b;->afL: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;->afQ:Ljava/util/ArrayList;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/b;->afM:Ljava/util/ArrayList;
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/google/android/gms/common/api/internal/b;->afR:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/common/api/internal/b;->afN: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;->afN:Lcom/google/android/gms/common/api/internal/b;
+    sget-object v0, Lcom/google/android/gms/common/api/internal/b;->afJ: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;->afQ:Ljava/util/ArrayList;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/b;->afM: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;->afN:Lcom/google/android/gms/common/api/internal/b;
+    sget-object v0, Lcom/google/android/gms/common/api/internal/b;->afJ: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;->afN:Lcom/google/android/gms/common/api/internal/b;
+    sget-object v1, Lcom/google/android/gms/common/api/internal/b;->afJ:Lcom/google/android/gms/common/api/internal/b;
 
-    iget-boolean v1, v1, Lcom/google/android/gms/common/api/internal/b;->afR:Z
+    iget-boolean v1, v1, Lcom/google/android/gms/common/api/internal/b;->afN:Z
 
     if-nez v1, :cond_0
 
-    sget-object v1, Lcom/google/android/gms/common/api/internal/b;->afN:Lcom/google/android/gms/common/api/internal/b;
+    sget-object v1, Lcom/google/android/gms/common/api/internal/b;->afJ: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;->afN:Lcom/google/android/gms/common/api/internal/b;
+    sget-object v1, Lcom/google/android/gms/common/api/internal/b;->afJ: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;->afN:Lcom/google/android/gms/common/api/internal/b;
+    sget-object p0, Lcom/google/android/gms/common/api/internal/b;->afJ:Lcom/google/android/gms/common/api/internal/b;
 
     const/4 v1, 0x1
 
-    iput-boolean v1, p0, Lcom/google/android/gms/common/api/internal/b;->afR:Z
+    iput-boolean v1, p0, Lcom/google/android/gms/common/api/internal/b;->afN:Z
 
     :cond_0
     monitor-exit v0
@@ -176,10 +176,10 @@
     throw p0
 .end method
 
-.method public static mq()Lcom/google/android/gms/common/api/internal/b;
+.method public static mo()Lcom/google/android/gms/common/api/internal/b;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/common/api/internal/b;->afN:Lcom/google/android/gms/common/api/internal/b;
+    sget-object v0, Lcom/google/android/gms/common/api/internal/b;->afJ: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;->afN:Lcom/google/android/gms/common/api/internal/b;
+    sget-object v0, Lcom/google/android/gms/common/api/internal/b;->afJ: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;->afQ:Ljava/util/ArrayList;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/b;->afM: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;->afO:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/b;->afK: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;->afP:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/b;->afL: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;->afO:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/b;->afK: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;->afP:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/b;->afL: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;->afO:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/b;->afK: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;->afP:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/b;->afL: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 089d345be0..16a2a1da33 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 aim:Lcom/google/android/gms/common/api/internal/az;
+.field private final aii:Lcom/google/android/gms/common/api/internal/az;
 
-.field final synthetic ain:Lcom/google/android/gms/common/api/internal/ay;
+.field final synthetic aij: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;->ain:Lcom/google/android/gms/common/api/internal/ay;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/ba;->aij: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;->aim:Lcom/google/android/gms/common/api/internal/az;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/ba;->aii: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;->ain:Lcom/google/android/gms/common/api/internal/ay;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ba;->aij: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;->aim:Lcom/google/android/gms/common/api/internal/az;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ba;->aii:Lcom/google/android/gms/common/api/internal/az;
 
-    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/api/internal/az;->aih:Lcom/google/android/gms/common/ConnectionResult;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/ConnectionResult;->lP()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/common/ConnectionResult;->lN()Z
 
     move-result v1
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/ba;->ain:Lcom/google/android/gms/common/api/internal/ay;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/ba;->aij:Lcom/google/android/gms/common/api/internal/ay;
 
-    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/ay;->agW:Lcom/google/android/gms/common/api/internal/g;
+    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/ay;->agS:Lcom/google/android/gms/common/api/internal/g;
 
-    iget-object v2, 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;->aij: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;->afe:Landroid/app/PendingIntent;
+    iget-object v0, v0, Lcom/google/android/gms/common/ConnectionResult;->afa:Landroid/app/PendingIntent;
 
-    iget-object v3, p0, Lcom/google/android/gms/common/api/internal/ba;->aim:Lcom/google/android/gms/common/api/internal/az;
+    iget-object v3, p0, Lcom/google/android/gms/common/api/internal/ba;->aii:Lcom/google/android/gms/common/api/internal/az;
 
-    iget v3, v3, Lcom/google/android/gms/common/api/internal/az;->aik:I
+    iget v3, v3, Lcom/google/android/gms/common/api/internal/az;->aig: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;->ain:Lcom/google/android/gms/common/api/internal/ay;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/ba;->aij:Lcom/google/android/gms/common/api/internal/ay;
 
-    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/ay;->aij:Lcom/google/android/gms/common/GoogleApiAvailability;
+    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/ay;->aif: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;->ain:Lcom/google/android/gms/common/api/internal/ay;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/ba;->aij:Lcom/google/android/gms/common/api/internal/ay;
 
-    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/ay;->aij:Lcom/google/android/gms/common/GoogleApiAvailability;
+    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/ay;->aif:Lcom/google/android/gms/common/GoogleApiAvailability;
 
-    iget-object v2, 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;->aij: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;->ain:Lcom/google/android/gms/common/api/internal/ay;
+    iget-object v3, p0, Lcom/google/android/gms/common/api/internal/ba;->aij:Lcom/google/android/gms/common/api/internal/ay;
 
-    iget-object v3, v3, Lcom/google/android/gms/common/api/internal/ay;->agW:Lcom/google/android/gms/common/api/internal/g;
+    iget-object v3, v3, Lcom/google/android/gms/common/api/internal/ay;->agS: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;->ain:Lcom/google/android/gms/common/api/internal/ay;
+    iget-object v4, p0, Lcom/google/android/gms/common/api/internal/ba;->aij: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;->ain:Lcom/google/android/gms/common/api/internal/ay;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ba;->aij: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;->ain:Lcom/google/android/gms/common/api/internal/ay;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/ba;->aij: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;->ain:Lcom/google/android/gms/common/api/internal/ay;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/ba;->aij: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;->mM()V
+    invoke-virtual {v2}, Lcom/google/android/gms/common/api/internal/ac;->mK()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;->ain:Lcom/google/android/gms/common/api/internal/ay;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/ba;->aij:Lcom/google/android/gms/common/api/internal/ay;
 
-    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/ba;->aim:Lcom/google/android/gms/common/api/internal/az;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/ba;->aii:Lcom/google/android/gms/common/api/internal/az;
 
-    iget v2, v2, Lcom/google/android/gms/common/api/internal/az;->aik:I
+    iget v2, v2, Lcom/google/android/gms/common/api/internal/az;->aig: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 7b6f6d20d5..7458416b72 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 aio:Landroid/app/Dialog;
+.field private final synthetic aik:Landroid/app/Dialog;
 
-.field private final synthetic aip:Lcom/google/android/gms/common/api/internal/ba;
+.field private final synthetic ail: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;->aip:Lcom/google/android/gms/common/api/internal/ba;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/bb;->ail:Lcom/google/android/gms/common/api/internal/ba;
 
-    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/bb;->aio:Landroid/app/Dialog;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/bb;->aik: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 mM()V
+.method public final mK()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bb;->aip:Lcom/google/android/gms/common/api/internal/ba;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bb;->ail:Lcom/google/android/gms/common/api/internal/ba;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/ba;->ain:Lcom/google/android/gms/common/api/internal/ay;
+    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/ba;->aij:Lcom/google/android/gms/common/api/internal/ay;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/ay;->mP()V
+    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/ay;->mN()V
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bb;->aio:Landroid/app/Dialog;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bb;->aik: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;->aio:Landroid/app/Dialog;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bb;->aik: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 063c584cee..5cd413c70f 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 aiq:Ljava/util/WeakHashMap;
+.field private static aim:Ljava/util/WeakHashMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/WeakHashMap<",
@@ -20,7 +20,7 @@
 
 
 # instance fields
-.field private air:Ljava/util/Map;
+.field private ain:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -31,9 +31,9 @@
     .end annotation
 .end field
 
-.field private ais:I
+.field private aio:I
 
-.field private ait:Landroid/os/Bundle;
+.field private aip: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;->aiq:Ljava/util/WeakHashMap;
+    sput-object v0, Lcom/google/android/gms/common/api/internal/be;->aim: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;->air:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/be;->ain:Ljava/util/Map;
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lcom/google/android/gms/common/api/internal/be;->ais:I
+    iput v0, p0, Lcom/google/android/gms/common/api/internal/be;->aio: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;->ais:I
+    iget p0, p0, Lcom/google/android/gms/common/api/internal/be;->aio: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;->ait:Landroid/os/Bundle;
+    iget-object p0, p0, Lcom/google/android/gms/common/api/internal/be;->aip: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;->aiq:Ljava/util/WeakHashMap;
+    sget-object v1, Lcom/google/android/gms/common/api/internal/be;->aim: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;->aiq:Ljava/util/WeakHashMap;
+    sget-object v0, Lcom/google/android/gms/common/api/internal/be;->aim: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;->air:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/be;->ain: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;->air:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/be;->ain: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;->air:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/be;->ain: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;->ais:I
+    iget v0, p0, Lcom/google/android/gms/common/api/internal/be;->aio: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;->air:Ljava/util/Map;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/be;->ain:Ljava/util/Map;
 
     invoke-interface {p1}, Ljava/util/Map;->values()Ljava/util/Collection;
 
@@ -304,7 +304,7 @@
     return-void
 .end method
 
-.method public final mG()Landroid/app/Activity;
+.method public final mE()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;->air:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/be;->ain: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;->ais:I
+    iput v0, p0, Lcom/google/android/gms/common/api/internal/be;->aio:I
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/be;->ait:Landroid/os/Bundle;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/be;->aip:Landroid/os/Bundle;
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/be;->air:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/be;->ain: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;->ais:I
+    iput v0, p0, Lcom/google/android/gms/common/api/internal/be;->aio:I
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/be;->air:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/be;->ain: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;->ais:I
+    iput v0, p0, Lcom/google/android/gms/common/api/internal/be;->aio:I
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/be;->air:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/be;->ain: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;->air:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/be;->ain: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;->ais:I
+    iput v0, p0, Lcom/google/android/gms/common/api/internal/be;->aio:I
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/be;->air:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/be;->ain: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;->ais:I
+    iput v0, p0, Lcom/google/android/gms/common/api/internal/be;->aio:I
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/be;->air:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/be;->ain: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 35115f1264..4619105269 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 aiu:Lcom/google/android/gms/common/api/internal/LifecycleCallback;
+.field private final synthetic aiq:Lcom/google/android/gms/common/api/internal/LifecycleCallback;
 
-.field private final synthetic aiv:Ljava/lang/String;
+.field private final synthetic air:Ljava/lang/String;
 
-.field private final synthetic aiw:Lcom/google/android/gms/common/api/internal/be;
+.field private final synthetic ais: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;->aiw:Lcom/google/android/gms/common/api/internal/be;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/bf;->ais:Lcom/google/android/gms/common/api/internal/be;
 
-    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/bf;->aiu:Lcom/google/android/gms/common/api/internal/LifecycleCallback;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/bf;->aiq:Lcom/google/android/gms/common/api/internal/LifecycleCallback;
 
-    iput-object p3, p0, Lcom/google/android/gms/common/api/internal/bf;->aiv:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/common/api/internal/bf;->air: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;->aiw:Lcom/google/android/gms/common/api/internal/be;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bf;->ais: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;->aiu:Lcom/google/android/gms/common/api/internal/LifecycleCallback;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bf;->aiq:Lcom/google/android/gms/common/api/internal/LifecycleCallback;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/bf;->aiw:Lcom/google/android/gms/common/api/internal/be;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/bf;->ais: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;->aiw:Lcom/google/android/gms/common/api/internal/be;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/bf;->ais: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;->aiv:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/bf;->air: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;->aiw:Lcom/google/android/gms/common/api/internal/be;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bf;->ais: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;->aiu:Lcom/google/android/gms/common/api/internal/LifecycleCallback;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bf;->aiq: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;->aiw:Lcom/google/android/gms/common/api/internal/be;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bf;->ais: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;->aiu:Lcom/google/android/gms/common/api/internal/LifecycleCallback;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bf;->aiq: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;->aiw:Lcom/google/android/gms/common/api/internal/be;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bf;->ais: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;->aiu:Lcom/google/android/gms/common/api/internal/LifecycleCallback;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bf;->aiq: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;->aiw:Lcom/google/android/gms/common/api/internal/be;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bf;->ais: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;->aiu:Lcom/google/android/gms/common/api/internal/LifecycleCallback;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bf;->aiq: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 a28e4e0f5f..ec86fca753 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 aiq:Ljava/util/WeakHashMap;
+.field private static aim:Ljava/util/WeakHashMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/WeakHashMap<",
@@ -20,7 +20,7 @@
 
 
 # instance fields
-.field private air:Ljava/util/Map;
+.field private ain:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -31,9 +31,9 @@
     .end annotation
 .end field
 
-.field private ais:I
+.field private aio:I
 
-.field private ait:Landroid/os/Bundle;
+.field private aip: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;->aiq:Ljava/util/WeakHashMap;
+    sput-object v0, Lcom/google/android/gms/common/api/internal/bg;->aim: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;->air:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/bg;->ain:Ljava/util/Map;
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lcom/google/android/gms/common/api/internal/bg;->ais:I
+    iput v0, p0, Lcom/google/android/gms/common/api/internal/bg;->aio: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;->ais:I
+    iget p0, p0, Lcom/google/android/gms/common/api/internal/bg;->aio:I
 
     return p0
 .end method
@@ -80,7 +80,7 @@
 
     const-string v0, "SupportLifecycleFragmentImpl"
 
-    sget-object v1, Lcom/google/android/gms/common/api/internal/bg;->aiq:Ljava/util/WeakHashMap;
+    sget-object v1, Lcom/google/android/gms/common/api/internal/bg;->aim: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;->aiq:Ljava/util/WeakHashMap;
+    sget-object v0, Lcom/google/android/gms/common/api/internal/bg;->aim: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;->ait:Landroid/os/Bundle;
+    iget-object p0, p0, Lcom/google/android/gms/common/api/internal/bg;->aip: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;->air:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bg;->ain: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;->air:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bg;->ain: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;->air:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bg;->ain: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;->ais:I
+    iget v0, p0, Lcom/google/android/gms/common/api/internal/bg;->aio: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;->air:Ljava/util/Map;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/bg;->ain: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 mG()Landroid/app/Activity;
+.method public final synthetic mE()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;->air:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bg;->ain: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;->ais:I
+    iput v0, p0, Lcom/google/android/gms/common/api/internal/bg;->aio:I
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/bg;->ait:Landroid/os/Bundle;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/bg;->aip:Landroid/os/Bundle;
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bg;->air:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bg;->ain: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;->ais:I
+    iput v0, p0, Lcom/google/android/gms/common/api/internal/bg;->aio:I
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bg;->air:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bg;->ain: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;->ais:I
+    iput v0, p0, Lcom/google/android/gms/common/api/internal/bg;->aio:I
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bg;->air:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bg;->ain: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;->air:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bg;->ain: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;->ais:I
+    iput v0, p0, Lcom/google/android/gms/common/api/internal/bg;->aio:I
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bg;->air:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bg;->ain: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;->ais:I
+    iput v0, p0, Lcom/google/android/gms/common/api/internal/bg;->aio:I
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bg;->air:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bg;->ain: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 11afd41c37..de6a2337df 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 aiu:Lcom/google/android/gms/common/api/internal/LifecycleCallback;
+.field private final synthetic aiq:Lcom/google/android/gms/common/api/internal/LifecycleCallback;
 
-.field private final synthetic aiv:Ljava/lang/String;
+.field private final synthetic air:Ljava/lang/String;
 
-.field private final synthetic aix:Lcom/google/android/gms/common/api/internal/bg;
+.field private final synthetic ait: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;->aix:Lcom/google/android/gms/common/api/internal/bg;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/bh;->ait:Lcom/google/android/gms/common/api/internal/bg;
 
-    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/bh;->aiu:Lcom/google/android/gms/common/api/internal/LifecycleCallback;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/bh;->aiq:Lcom/google/android/gms/common/api/internal/LifecycleCallback;
 
-    iput-object p3, p0, Lcom/google/android/gms/common/api/internal/bh;->aiv:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/common/api/internal/bh;->air: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;->aix:Lcom/google/android/gms/common/api/internal/bg;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bh;->ait: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;->aiu:Lcom/google/android/gms/common/api/internal/LifecycleCallback;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bh;->aiq:Lcom/google/android/gms/common/api/internal/LifecycleCallback;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/bh;->aix:Lcom/google/android/gms/common/api/internal/bg;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/bh;->ait: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;->aix:Lcom/google/android/gms/common/api/internal/bg;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/bh;->ait: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;->aiv:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/bh;->air: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;->aix:Lcom/google/android/gms/common/api/internal/bg;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bh;->ait: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;->aiu:Lcom/google/android/gms/common/api/internal/LifecycleCallback;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bh;->aiq: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;->aix:Lcom/google/android/gms/common/api/internal/bg;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bh;->ait: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;->aiu:Lcom/google/android/gms/common/api/internal/LifecycleCallback;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bh;->aiq: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;->aix:Lcom/google/android/gms/common/api/internal/bg;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bh;->ait: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;->aiu:Lcom/google/android/gms/common/api/internal/LifecycleCallback;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bh;->aiq: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;->aix:Lcom/google/android/gms/common/api/internal/bg;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bh;->ait: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;->aiu:Lcom/google/android/gms/common/api/internal/LifecycleCallback;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bh;->aiq: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 6fc575fe7a..efaf148b4c 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 afS:Lcom/google/android/gms/common/api/a$c;
+.field private final afO: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 afs:Lcom/google/android/gms/common/api/a;
+.field private final afo: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;->afq:Lcom/google/android/gms/common/api/a$g;
+    iget-object p2, p1, Lcom/google/android/gms/common/api/a;->afm:Lcom/google/android/gms/common/api/a$g;
 
     if-eqz p2, :cond_0
 
-    iget-object p2, p1, Lcom/google/android/gms/common/api/a;->afq:Lcom/google/android/gms/common/api/a$g;
+    iget-object p2, p1, Lcom/google/android/gms/common/api/a;->afm:Lcom/google/android/gms/common/api/a$g;
 
-    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/c$a;->afS:Lcom/google/android/gms/common/api/a$c;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/c$a;->afO:Lcom/google/android/gms/common/api/a$c;
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/c$a;->afs:Lcom/google/android/gms/common/api/a;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/c$a;->afo: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;->aks:Lcom/google/android/gms/common/api/a$h;
+    iget-object p1, p1, Lcom/google/android/gms/common/internal/s;->ako: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;->lQ()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/common/api/Status;->lO()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 bba12488f1..39d6b70b18 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,30 +31,7 @@
 
 
 # instance fields
-.field private final agA:Lcom/google/android/gms/common/api/a$b;
-
-.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<",
-            "TO;>;"
-        }
-    .end annotation
-.end field
-
-.field private final agC:Lcom/google/android/gms/common/api/internal/n;
-
-.field final agD:Ljava/util/Set;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/Set<",
-            "Lcom/google/android/gms/common/api/internal/ax;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field final agE:Ljava/util/Map;
+.field final agA:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -66,13 +43,13 @@
     .end annotation
 .end field
 
-.field final agF:I
+.field final agB:I
 
-.field private final agG:Lcom/google/android/gms/common/api/internal/aj;
+.field private final agC:Lcom/google/android/gms/common/api/internal/aj;
 
-.field agH:Z
+.field agD:Z
 
-.field final agI:Ljava/util/List;
+.field final agE:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -82,11 +59,11 @@
     .end annotation
 .end field
 
-.field private agJ:Lcom/google/android/gms/common/ConnectionResult;
+.field private agF:Lcom/google/android/gms/common/ConnectionResult;
 
-.field final synthetic agK:Lcom/google/android/gms/common/api/internal/d;
+.field final synthetic agG:Lcom/google/android/gms/common/api/internal/d;
 
-.field private final agy:Ljava/util/Queue;
+.field private final agu:Ljava/util/Queue;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Queue<",
@@ -96,7 +73,30 @@
     .end annotation
 .end field
 
-.field final agz:Lcom/google/android/gms/common/api/a$f;
+.field final agv:Lcom/google/android/gms/common/api/a$f;
+
+.field private final agw:Lcom/google/android/gms/common/api/a$b;
+
+.field private final agx:Lcom/google/android/gms/common/api/internal/aw;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/common/api/internal/aw<",
+            "TO;>;"
+        }
+    .end annotation
+.end field
+
+.field private final agy:Lcom/google/android/gms/common/api/internal/n;
+
+.field final agz:Ljava/util/Set;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/Set<",
+            "Lcom/google/android/gms/common/api/internal/ax;",
+            ">;"
+        }
+    .end annotation
+.end field
 
 
 # direct methods
@@ -110,7 +110,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agK:Lcom/google/android/gms/common/api/internal/d;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agG: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;->agy:Ljava/util/Queue;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agu: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;->agD:Ljava/util/Set;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agz: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;->agE:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agA: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;->agI:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agE:Ljava/util/List;
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agJ:Lcom/google/android/gms/common/ConnectionResult;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agF: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;->mh()Lcom/google/android/gms/common/internal/d$a;
+    invoke-virtual {p2}, Lcom/google/android/gms/common/api/h;->mf()Lcom/google/android/gms/common/internal/d$a;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/common/internal/d$a;->mZ()Lcom/google/android/gms/common/internal/d;
+    invoke-virtual {v1}, Lcom/google/android/gms/common/internal/d$a;->mX()Lcom/google/android/gms/common/internal/d;
 
     move-result-object v5
 
-    iget-object v1, p2, Lcom/google/android/gms/common/api/h;->afs:Lcom/google/android/gms/common/api/a;
+    iget-object v1, p2, Lcom/google/android/gms/common/api/h;->afo:Lcom/google/android/gms/common/api/a;
 
-    iget-object v2, v1, Lcom/google/android/gms/common/api/a;->afo:Lcom/google/android/gms/common/api/a$a;
+    iget-object v2, v1, Lcom/google/android/gms/common/api/a;->afj: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;->afo:Lcom/google/android/gms/common/api/a$a;
+    iget-object v2, v1, Lcom/google/android/gms/common/api/a;->afj: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;->aft:Lcom/google/android/gms/common/api/a$d;
+    iget-object v6, p2, Lcom/google/android/gms/common/api/h;->afp: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;->agz:Lcom/google/android/gms/common/api/a$f;
+    iput-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agv: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;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agv: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;->aks:Lcom/google/android/gms/common/api/a$h;
+    iget-object v1, v1, Lcom/google/android/gms/common/internal/s;->ako:Lcom/google/android/gms/common/api/a$h;
 
-    iput-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agA:Lcom/google/android/gms/common/api/a$b;
+    iput-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agw: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;->agA:Lcom/google/android/gms/common/api/a$b;
+    iput-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agw:Lcom/google/android/gms/common/api/a$b;
 
     :goto_1
-    iget-object v1, p2, Lcom/google/android/gms/common/api/h;->afu:Lcom/google/android/gms/common/api/internal/aw;
+    iget-object v1, p2, Lcom/google/android/gms/common/api/h;->afq: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;
+    iput-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agx: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;->agC:Lcom/google/android/gms/common/api/internal/n;
+    iput-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agy: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;->agF:I
+    iput v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agB:I
 
-    iget-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;->agv:Lcom/google/android/gms/common/api/a$f;
 
-    invoke-interface {v1}, Lcom/google/android/gms/common/api/a$f;->lY()Z
+    invoke-interface {v1}, Lcom/google/android/gms/common/api/a$f;->lW()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;->mh()Lcom/google/android/gms/common/internal/d$a;
+    invoke-virtual {p2}, Lcom/google/android/gms/common/api/h;->mf()Lcom/google/android/gms/common/internal/d$a;
 
     move-result-object p2
 
-    invoke-virtual {p2}, Lcom/google/android/gms/common/internal/d$a;->mZ()Lcom/google/android/gms/common/internal/d;
+    invoke-virtual {p2}, Lcom/google/android/gms/common/internal/d$a;->mX()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;->agG:Lcom/google/android/gms/common/api/internal/aj;
+    iput-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agC: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;->agG:Lcom/google/android/gms/common/api/internal/aj;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agC: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;->agz:Lcom/google/android/gms/common/api/a$f;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agv:Lcom/google/android/gms/common/api/a$f;
 
-    invoke-interface {v1}, Lcom/google/android/gms/common/api/a$f;->mc()[Lcom/google/android/gms/common/Feature;
+    invoke-interface {v1}, Lcom/google/android/gms/common/api/a$f;->ma()[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;->lR()J
+    invoke-virtual {v6}, Lcom/google/android/gms/common/Feature;->lP()J
 
     move-result-wide v8
 
@@ -348,7 +348,7 @@
 
     move-result-wide v5
 
-    invoke-virtual {v4}, Lcom/google/android/gms/common/Feature;->lR()J
+    invoke-virtual {v4}, Lcom/google/android/gms/common/Feature;->lP()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;->mv()V
+    invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/d$a;->mt()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;->mt()Ljava/lang/Object;
+    invoke-static {}, Lcom/google/android/gms/common/api/internal/d;->mr()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;->agK:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agG: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;->agK:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agG: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;->agB:Lcom/google/android/gms/common/api/internal/aw;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d$a;->agx: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;->agK:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agG: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;->agF:I
+    iget v2, p0, Lcom/google/android/gms/common/api/internal/d$a;->agB: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;->agB:Lcom/google/android/gms/common/api/internal/aw;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agx: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;->agI:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agE: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;->agI:Ljava/util/List;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agE: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;->agK:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agG: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;->agK:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agG: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;->agK:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v3, p0, Lcom/google/android/gms/common/api/internal/d$a;->agG: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;->agK:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d$a;->agG: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;->agI:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agE: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;->agK:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agG: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;->agK:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v3, p0, Lcom/google/android/gms/common/api/internal/d$a;->agG: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;->agK:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v3, p0, Lcom/google/android/gms/common/api/internal/d$a;->agG: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;->agK:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agG: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;->agK:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d$a;->agG: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;->agK:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d$a;->agG: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;->agK:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agG:Lcom/google/android/gms/common/api/internal/d;
 
-    iget v2, p0, Lcom/google/android/gms/common/api/internal/d$a;->agF:I
+    iget v2, p0, Lcom/google/android/gms/common/api/internal/d$a;->agB: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;->agD:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agz: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;->afd:Lcom/google/android/gms/common/ConnectionResult;
+    sget-object v3, Lcom/google/android/gms/common/ConnectionResult;->aeZ: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;->agz:Lcom/google/android/gms/common/api/a$f;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d$a;->agv:Lcom/google/android/gms/common/api/a$f;
 
-    invoke-interface {v2}, Lcom/google/android/gms/common/api/a$f;->ma()Ljava/lang/String;
+    invoke-interface {v2}, Lcom/google/android/gms/common/api/a$f;->lY()Ljava/lang/String;
 
     move-result-object v2
 
     :cond_0
-    iget-object v3, p0, Lcom/google/android/gms/common/api/internal/d$a;->agB:Lcom/google/android/gms/common/api/internal/aw;
+    iget-object v3, p0, Lcom/google/android/gms/common/api/internal/d$a;->agx: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;->agD:Ljava/util/Set;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agz: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;->agC:Lcom/google/android/gms/common/api/internal/n;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agy:Lcom/google/android/gms/common/api/internal/n;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/d$a;->lY()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/d$a;->lW()Z
 
     move-result v1
 
@@ -705,49 +705,49 @@
     return-void
 
     :catch_0
-    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/d$a;->mn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/d$a;->ml()V
 
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agz:Lcom/google/android/gms/common/api/a$f;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agv: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 mC()V
+.method private final mA()V
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agK:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agG: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/aw;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agx: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;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agG: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;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agG: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;
+    iget-object v3, p0, Lcom/google/android/gms/common/api/internal/d$a;->agx: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;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d$a;->agG: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
 
@@ -758,18 +758,18 @@
     return-void
 .end method
 
-.method private final mv()V
+.method private final mt()V
     .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/d$a;->mz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/d$a;->mx()V
 
-    sget-object v0, Lcom/google/android/gms/common/ConnectionResult;->afd:Lcom/google/android/gms/common/ConnectionResult;
+    sget-object v0, Lcom/google/android/gms/common/ConnectionResult;->aeZ: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;->mB()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;->agE:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agA:Ljava/util/Map;
 
     invoke-interface {v0}, Ljava/util/Map;->values()Ljava/util/Collection;
 
@@ -792,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;->ahz:Lcom/google/android/gms/common/api/internal/j;
+    iget-object v2, v1, Lcom/google/android/gms/common/api/internal/af;->ahv:Lcom/google/android/gms/common/api/internal/j;
 
-    iget-object v2, v2, Lcom/google/android/gms/common/api/internal/j;->ahd:[Lcom/google/android/gms/common/Feature;
+    iget-object v2, v2, Lcom/google/android/gms/common/api/internal/j;->agZ:[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;
 
@@ -808,9 +808,9 @@
 
     :cond_0
     :try_start_0
-    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/af;->ahz:Lcom/google/android/gms/common/api/internal/j;
+    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/af;->ahv:Lcom/google/android/gms/common/api/internal/j;
 
-    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d$a;->agA:Lcom/google/android/gms/common/api/a$b;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d$a;->agw:Lcom/google/android/gms/common/api/a$b;
 
     new-instance v3, Lcom/google/android/gms/tasks/h;
 
@@ -829,16 +829,16 @@
     goto :goto_0
 
     :catch_1
-    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/d$a;->mn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/d$a;->ml()V
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agz:Lcom/google/android/gms/common/api/a$f;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agv: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;->mx()V
+    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/d$a;->mv()V
 
-    invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/d$a;->mC()V
+    invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/d$a;->mA()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;->agK:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agG: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;->agz:Lcom/google/android/gms/common/api/a$f;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agv: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;->agE:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agA: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;->agC:Lcom/google/android/gms/common/api/internal/n;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agy:Lcom/google/android/gms/common/api/internal/n;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/n;->mH()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/n;->mF()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;->mC()V
+    invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/d$a;->mA()V
 
     :cond_0
     return v1
 
     :cond_1
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agz:Lcom/google/android/gms/common/api/a$f;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agv: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;->agK:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agG: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;->agG:Lcom/google/android/gms/common/api/internal/aj;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agC: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;->ahF:Lcom/google/android/gms/signin/e;
+    iget-object v1, v0, Lcom/google/android/gms/common/api/internal/aj;->ahB:Lcom/google/android/gms/signin/e;
 
     if-eqz v1, :cond_0
 
-    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/aj;->ahF:Lcom/google/android/gms/signin/e;
+    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/aj;->ahB: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;->mz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/d$a;->mx()V
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agK:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agG: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;->ake:Landroid/util/SparseIntArray;
+    iget-object v0, v0, Lcom/google/android/gms/common/internal/j;->aka: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;->mu()Lcom/google/android/gms/common/api/Status;
+    invoke-static {}, Lcom/google/android/gms/common/api/internal/d;->ms()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;->agy:Ljava/util/Queue;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agu: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;->agJ:Lcom/google/android/gms/common/ConnectionResult;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agF: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;->agK:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agG:Lcom/google/android/gms/common/api/internal/d;
 
-    iget v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agF:I
+    iget v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agB: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;->agH:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agD:Z
 
     :cond_4
-    iget-boolean p1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agH:Z
+    iget-boolean p1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agD:Z
 
     if-eqz p1, :cond_5
 
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agK:Lcom/google/android/gms/common/api/internal/d;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agG: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;->agK:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agG: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;->agB:Lcom/google/android/gms/common/api/internal/aw;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d$a;->agx: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;->agK:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agG: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;->agB:Lcom/google/android/gms/common/api/internal/aw;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agx:Lcom/google/android/gms/common/api/internal/aw;
 
-    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/internal/aw;->afo: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;->agI:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agE: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;->agK:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agG: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;->agK:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agG: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;->agM:Lcom/google/android/gms/common/Feature;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/d$b;->agI: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;->agy:Ljava/util/Queue;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agu: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;->agy:Ljava/util/Queue;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agu: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;->agy:Ljava/util/Queue;
+    iget-object v4, p0, Lcom/google/android/gms/common/api/internal/d$a;->agu: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;->agK:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agG: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;->agz:Lcom/google/android/gms/common/api/a$f;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agv: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;->mC()V
+    invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/d$a;->mA()V
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agy:Ljava/util/Queue;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agu: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;->agy:Ljava/util/Queue;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agu: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;->agJ:Lcom/google/android/gms/common/ConnectionResult;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agF:Lcom/google/android/gms/common/ConnectionResult;
 
     if-eqz p1, :cond_2
 
-    invoke-virtual {p1}, Lcom/google/android/gms/common/ConnectionResult;->lP()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/common/ConnectionResult;->lN()Z
 
     move-result p1
 
     if-eqz p1, :cond_2
 
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agJ:Lcom/google/android/gms/common/ConnectionResult;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agF: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;->agK:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agG: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;->agz:Lcom/google/android/gms/common/api/a$f;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agv: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;->agz:Lcom/google/android/gms/common/api/a$f;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agv:Lcom/google/android/gms/common/api/a$f;
 
-    invoke-interface {v0}, Lcom/google/android/gms/common/api/a$f;->lX()Z
+    invoke-interface {v0}, Lcom/google/android/gms/common/api/a$f;->lV()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;->agK:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agG: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;->agK:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agG: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;->agz:Lcom/google/android/gms/common/api/a$f;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d$a;->agv: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;->agK:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agG:Lcom/google/android/gms/common/api/internal/d;
 
-    iget-object v2, p0, 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/d$a;->agv:Lcom/google/android/gms/common/api/a$f;
 
-    iget-object v3, p0, Lcom/google/android/gms/common/api/internal/d$a;->agB:Lcom/google/android/gms/common/api/internal/aw;
+    iget-object v3, p0, Lcom/google/android/gms/common/api/internal/d$a;->agx: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;->agz:Lcom/google/android/gms/common/api/a$f;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agv:Lcom/google/android/gms/common/api/a$f;
 
-    invoke-interface {v1}, Lcom/google/android/gms/common/api/a$f;->lY()Z
+    invoke-interface {v1}, Lcom/google/android/gms/common/api/a$f;->lW()Z
 
     move-result v1
 
     if-eqz v1, :cond_2
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agG:Lcom/google/android/gms/common/api/internal/aj;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agC: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;->agz:Lcom/google/android/gms/common/api/a$f;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agv: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;->agK:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agG: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;->agy:Ljava/util/Queue;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agu:Ljava/util/Queue;
 
     invoke-interface {v0}, Ljava/util/Queue;->iterator()Ljava/util/Iterator;
 
@@ -1403,90 +1403,33 @@
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agy:Ljava/util/Queue;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agu:Ljava/util/Queue;
 
     invoke-interface {p1}, Ljava/util/Queue;->clear()V
 
     return-void
 .end method
 
-.method public final lY()Z
+.method public final lW()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agz:Lcom/google/android/gms/common/api/a$f;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agv:Lcom/google/android/gms/common/api/a$f;
 
-    invoke-interface {v0}, Lcom/google/android/gms/common/api/a$f;->lY()Z
+    invoke-interface {v0}, Lcom/google/android/gms/common/api/a$f;->lW()Z
 
     move-result v0
 
     return v0
 .end method
 
-.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
+.method public final mk()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;->agK:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agG: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;
 
@@ -1498,12 +1441,12 @@
 
     if-ne v0, v1, :cond_0
 
-    invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/d$a;->mv()V
+    invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/d$a;->mt()V
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agK:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agG: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;
 
@@ -1518,14 +1461,14 @@
     return-void
 .end method
 
-.method public final mn()V
+.method public final ml()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;->agK:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agG: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;
 
@@ -1537,12 +1480,12 @@
 
     if-ne v0, v1, :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;->mu()V
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agK:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agG: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;
 
@@ -1557,32 +1500,32 @@
     return-void
 .end method
 
-.method final mw()V
+.method final mu()V
     .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/d$a;->mz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/d$a;->mx()V
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agH:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agD:Z
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agC:Lcom/google/android/gms/common/api/internal/n;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agy:Lcom/google/android/gms/common/api/internal/n;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/n;->mJ()V
+    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/n;->mH()V
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agK:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agG: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;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agG: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;->agB:Lcom/google/android/gms/common/api/internal/aw;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d$a;->agx:Lcom/google/android/gms/common/api/internal/aw;
 
     const/16 v3, 0x9
 
@@ -1590,7 +1533,7 @@
 
     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;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d$a;->agG: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
 
@@ -1598,19 +1541,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;->agK:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agG: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;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agG: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;->agB:Lcom/google/android/gms/common/api/internal/aw;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d$a;->agx:Lcom/google/android/gms/common/api/internal/aw;
 
     const/16 v3, 0xb
 
@@ -1618,7 +1561,7 @@
 
     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;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d$a;->agG: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
 
@@ -1626,25 +1569,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;->agK:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agG: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;->ake:Landroid/util/SparseIntArray;
+    iget-object v0, v0, Lcom/google/android/gms/common/internal/j;->aka:Landroid/util/SparseIntArray;
 
     invoke-virtual {v0}, Landroid/util/SparseIntArray;->clear()V
 
     return-void
 .end method
 
-.method final mx()V
+.method final mv()V
     .locals 5
 
     new-instance v0, Ljava/util/ArrayList;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agy:Ljava/util/Queue;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agu:Ljava/util/Queue;
 
     invoke-direct {v0, v1}, Ljava/util/ArrayList;-><init>(Ljava/util/Collection;)V
 
@@ -1668,7 +1611,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;->agz:Lcom/google/android/gms/common/api/a$f;
+    iget-object v4, p0, Lcom/google/android/gms/common/api/internal/d$a;->agv:Lcom/google/android/gms/common/api/a$f;
 
     invoke-interface {v4}, Lcom/google/android/gms/common/api/a$f;->isConnected()Z
 
@@ -1682,7 +1625,7 @@
 
     if-eqz v4, :cond_0
 
-    iget-object v4, p0, Lcom/google/android/gms/common/api/internal/d$a;->agy:Ljava/util/Queue;
+    iget-object v4, p0, Lcom/google/android/gms/common/api/internal/d$a;->agu:Ljava/util/Queue;
 
     invoke-interface {v4, v3}, Ljava/util/Queue;->remove(Ljava/lang/Object;)Z
 
@@ -1692,10 +1635,10 @@
     return-void
 .end method
 
-.method public final my()V
+.method public final mw()V
     .locals 6
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agK:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agG: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;
 
@@ -1705,21 +1648,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;->agj:Lcom/google/android/gms/common/api/Status;
+    sget-object v0, Lcom/google/android/gms/common/api/internal/d;->agf: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;->agC:Lcom/google/android/gms/common/api/internal/n;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agy:Lcom/google/android/gms/common/api/internal/n;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/n;->mI()V
+    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/n;->mG()V
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agE:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agA: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;->agE:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agA:Ljava/util/Map;
 
     invoke-interface {v1}, Ljava/util/Map;->size()I
 
@@ -1765,7 +1708,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;->agz:Lcom/google/android/gms/common/api/a$f;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agv:Lcom/google/android/gms/common/api/a$f;
 
     invoke-interface {v0}, Lcom/google/android/gms/common/api/a$f;->isConnected()Z
 
@@ -1773,7 +1716,7 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agz:Lcom/google/android/gms/common/api/a$f;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agv:Lcom/google/android/gms/common/api/a$f;
 
     new-instance v1, Lcom/google/android/gms/common/api/internal/x;
 
@@ -1785,10 +1728,10 @@
     return-void
 .end method
 
-.method public final mz()V
+.method public final mx()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agK:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agG: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;
 
@@ -1800,7 +1743,64 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agJ:Lcom/google/android/gms/common/ConnectionResult;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agF:Lcom/google/android/gms/common/ConnectionResult;
 
     return-void
 .end method
+
+.method public final my()Lcom/google/android/gms/common/ConnectionResult;
+    .locals 2
+
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agG: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;->agF:Lcom/google/android/gms/common/ConnectionResult;
+
+    return-object v0
+.end method
+
+.method final mz()V
+    .locals 3
+
+    iget-boolean v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agD:Z
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agG: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;->agx: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;->agG: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;->agx: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;->agD: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 713b1403ad..e869986fae 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 agL:Lcom/google/android/gms/common/api/internal/aw;
+.field final agH: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 agM:Lcom/google/android/gms/common/Feature;
+.field final agI: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;->agL:Lcom/google/android/gms/common/api/internal/aw;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/d$b;->agH:Lcom/google/android/gms/common/api/internal/aw;
 
-    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/d$b;->agM:Lcom/google/android/gms/common/Feature;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/d$b;->agI: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;->agL:Lcom/google/android/gms/common/api/internal/aw;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$b;->agH: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;
+    iget-object v2, p1, Lcom/google/android/gms/common/api/internal/d$b;->agH: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;->agM:Lcom/google/android/gms/common/Feature;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$b;->agI: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;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/d$b;->agI: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;->agL:Lcom/google/android/gms/common/api/internal/aw;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$b;->agH: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;->agM:Lcom/google/android/gms/common/Feature;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$b;->agI: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;->agL:Lcom/google/android/gms/common/api/internal/aw;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$b;->agH: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;->agM:Lcom/google/android/gms/common/Feature;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$b;->agI: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 2df335efc3..4520d6e8fb 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,20 +18,11 @@
 
 
 # instance fields
-.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 final synthetic agG:Lcom/google/android/gms/common/api/internal/d;
 
-.field final synthetic agK:Lcom/google/android/gms/common/api/internal/d;
+.field private agJ:Lcom/google/android/gms/common/internal/k;
 
-.field private agN:Lcom/google/android/gms/common/internal/k;
-
-.field private agO:Ljava/util/Set;
+.field private agK:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -41,9 +32,18 @@
     .end annotation
 .end field
 
-.field agP:Z
+.field agL:Z
 
-.field final agz:Lcom/google/android/gms/common/api/a$f;
+.field final agv:Lcom/google/android/gms/common/api/a$f;
+
+.field final agx: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
 
 
 # direct methods
@@ -58,23 +58,23 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/d$c;->agK:Lcom/google/android/gms/common/api/internal/d;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/d$c;->agG: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;->agN:Lcom/google/android/gms/common/internal/k;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/d$c;->agJ:Lcom/google/android/gms/common/internal/k;
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/d$c;->agO:Ljava/util/Set;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/d$c;->agK:Ljava/util/Set;
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lcom/google/android/gms/common/api/internal/d$c;->agP:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/common/api/internal/d$c;->agL:Z
 
-    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/d$c;->agz:Lcom/google/android/gms/common/api/a$f;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/d$c;->agv:Lcom/google/android/gms/common/api/a$f;
 
-    iput-object p3, p0, Lcom/google/android/gms/common/api/internal/d$c;->agB:Lcom/google/android/gms/common/api/internal/aw;
+    iput-object p3, p0, Lcom/google/android/gms/common/api/internal/d$c;->agx: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;->agN:Lcom/google/android/gms/common/internal/k;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/d$c;->agJ:Lcom/google/android/gms/common/internal/k;
 
-    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/d$c;->agO:Ljava/util/Set;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/d$c;->agK:Ljava/util/Set;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/d$c;->mD()V
+    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/d$c;->mB()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;->agK:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$c;->agG: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;->agK:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$c;->agG: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;->agB:Lcom/google/android/gms/common/api/internal/aw;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$c;->agx: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;->agK:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v1, v0, Lcom/google/android/gms/common/api/internal/d$a;->agG: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;->agz:Lcom/google/android/gms/common/api/a$f;
+    iget-object v1, v0, Lcom/google/android/gms/common/api/internal/d$a;->agv: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 mD()V
+.method final mB()V
     .locals 3
 
-    iget-boolean v0, p0, Lcom/google/android/gms/common/api/internal/d$c;->agP:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/common/api/internal/d$c;->agL:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$c;->agN:Lcom/google/android/gms/common/internal/k;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$c;->agJ: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;->agz:Lcom/google/android/gms/common/api/a$f;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$c;->agv:Lcom/google/android/gms/common/api/a$f;
 
-    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d$c;->agO:Ljava/util/Set;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d$c;->agK: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 6467b84fed..f876304a8b 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 agj:Lcom/google/android/gms/common/api/Status;
+.field public static final agf:Lcom/google/android/gms/common/api/Status;
 
-.field private static final agk:Lcom/google/android/gms/common/api/Status;
+.field private static final agg:Lcom/google/android/gms/common/api/Status;
 
-.field private static ago:Lcom/google/android/gms/common/api/internal/d;
+.field private static agk:Lcom/google/android/gms/common/api/internal/d;
 
 .field static final lock:Ljava/lang/Object;
 
 
 # instance fields
-.field private agl:J
+.field private agh:J
 
-.field private agm:J
+.field private agi:J
 
-.field private agn:J
+.field private agj:J
 
-.field private final agp:Landroid/content/Context;
+.field private final agl:Landroid/content/Context;
 
-.field private final agq:Lcom/google/android/gms/common/GoogleApiAvailability;
+.field private final agm:Lcom/google/android/gms/common/GoogleApiAvailability;
 
-.field private final agr:Lcom/google/android/gms/common/internal/j;
+.field private final agn:Lcom/google/android/gms/common/internal/j;
 
-.field public final ags:Ljava/util/concurrent/atomic/AtomicInteger;
+.field public final ago:Ljava/util/concurrent/atomic/AtomicInteger;
 
-.field public final agt:Ljava/util/concurrent/atomic/AtomicInteger;
+.field public final agp:Ljava/util/concurrent/atomic/AtomicInteger;
 
-.field private final agu:Ljava/util/Map;
+.field private final agq:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -54,9 +54,9 @@
     .end annotation
 .end field
 
-.field agv:Lcom/google/android/gms/common/api/internal/q;
+.field agr:Lcom/google/android/gms/common/api/internal/q;
 
-.field final agw:Ljava/util/Set;
+.field final ags:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -66,7 +66,7 @@
     .end annotation
 .end field
 
-.field private final agx:Ljava/util/Set;
+.field private final agt: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;->agj:Lcom/google/android/gms/common/api/Status;
+    sput-object v0, Lcom/google/android/gms/common/api/internal/d;->agf: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;->agk:Lcom/google/android/gms/common/api/Status;
+    sput-object v0, Lcom/google/android/gms/common/api/internal/d;->agg: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;->agl:J
+    iput-wide v0, p0, Lcom/google/android/gms/common/api/internal/d;->agh:J
 
     const-wide/32 v0, 0x1d4c0
 
-    iput-wide v0, p0, Lcom/google/android/gms/common/api/internal/d;->agm:J
+    iput-wide v0, p0, Lcom/google/android/gms/common/api/internal/d;->agi:J
 
     const-wide/16 v0, 0x2710
 
-    iput-wide v0, p0, Lcom/google/android/gms/common/api/internal/d;->agn:J
+    iput-wide v0, p0, Lcom/google/android/gms/common/api/internal/d;->agj: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;->ags:Ljava/util/concurrent/atomic/AtomicInteger;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->ago: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;->agt:Ljava/util/concurrent/atomic/AtomicInteger;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->agp: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;->agu:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->agq:Ljava/util/Map;
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->agv:Lcom/google/android/gms/common/api/internal/q;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->agr: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;->agw:Ljava/util/Set;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->ags: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;->agx:Ljava/util/Set;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->agt:Ljava/util/Set;
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/d;->agp:Landroid/content/Context;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/d;->agl: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;->agq:Lcom/google/android/gms/common/GoogleApiAvailability;
+    iput-object p3, p0, Lcom/google/android/gms/common/api/internal/d;->agm: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;->agr:Lcom/google/android/gms/common/internal/j;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/d;->agn: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;->ago:Lcom/google/android/gms/common/api/internal/d;
+    sget-object v1, Lcom/google/android/gms/common/api/internal/d;->agk: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;->lS()Lcom/google/android/gms/common/GoogleApiAvailability;
+    invoke-static {}, Lcom/google/android/gms/common/GoogleApiAvailability;->lQ()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;->ago:Lcom/google/android/gms/common/api/internal/d;
+    sput-object v2, Lcom/google/android/gms/common/api/internal/d;->agk:Lcom/google/android/gms/common/api/internal/d;
 
     :cond_0
-    sget-object p0, Lcom/google/android/gms/common/api/internal/d;->ago:Lcom/google/android/gms/common/api/internal/d;
+    sget-object p0, Lcom/google/android/gms/common/api/internal/d;->agk: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;->agp:Landroid/content/Context;
+    iget-object p0, p0, Lcom/google/android/gms/common/api/internal/d;->agl: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;->afu:Lcom/google/android/gms/common/api/internal/aw;
+    iget-object v0, p1, Lcom/google/android/gms/common/api/h;->afq:Lcom/google/android/gms/common/api/internal/aw;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d;->agu:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d;->agq: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;->agu:Ljava/util/Map;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d;->agq: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;->lY()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/common/api/internal/d$a;->lW()Z
 
     move-result p1
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d;->agx:Ljava/util/Set;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d;->agt: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;->agl:J
+    iget-wide v0, p0, Lcom/google/android/gms/common/api/internal/d;->agh: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;->agm:J
+    iget-wide v0, p0, Lcom/google/android/gms/common/api/internal/d;->agi: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;->agr:Lcom/google/android/gms/common/internal/j;
+    iget-object p0, p0, Lcom/google/android/gms/common/api/internal/d;->agn: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;->agv:Lcom/google/android/gms/common/api/internal/q;
+    iget-object p0, p0, Lcom/google/android/gms/common/api/internal/d;->agr: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;->agw:Ljava/util/Set;
+    iget-object p0, p0, Lcom/google/android/gms/common/api/internal/d;->ags: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;->agn:J
+    iget-wide v0, p0, Lcom/google/android/gms/common/api/internal/d;->agj: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;->agu:Ljava/util/Map;
+    iget-object p0, p0, Lcom/google/android/gms/common/api/internal/d;->agq:Ljava/util/Map;
 
     return-object p0
 .end method
 
-.method static synthetic mt()Ljava/lang/Object;
+.method static synthetic mr()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 mu()Lcom/google/android/gms/common/api/Status;
+.method static synthetic ms()Lcom/google/android/gms/common/api/Status;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/common/api/internal/d;->agk:Lcom/google/android/gms/common/api/Status;
+    sget-object v0, Lcom/google/android/gms/common/api/internal/d;->agg: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;->agv:Lcom/google/android/gms/common/api/internal/q;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d;->agr: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;->agv:Lcom/google/android/gms/common/api/internal/q;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/d;->agr:Lcom/google/android/gms/common/api/internal/q;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d;->agw:Ljava/util/Set;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d;->ags: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;->agw:Ljava/util/Set;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d;->ags:Ljava/util/Set;
 
-    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/q;->ahm:Landroidx/collection/ArraySet;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/q;->ahi: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;->agq:Lcom/google/android/gms/common/GoogleApiAvailability;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->agm:Lcom/google/android/gms/common/GoogleApiAvailability;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d;->agp:Landroid/content/Context;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d;->agl: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;->agu:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->agq:Ljava/util/Map;
 
-    iget-object v1, p1, Lcom/google/android/gms/common/api/internal/d$b;->agL:Lcom/google/android/gms/common/api/internal/aw;
+    iget-object v1, p1, Lcom/google/android/gms/common/api/internal/d$b;->agH: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;->agu:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->agq:Ljava/util/Map;
 
-    iget-object v1, p1, Lcom/google/android/gms/common/api/internal/d$b;->agL:Lcom/google/android/gms/common/api/internal/aw;
+    iget-object v1, p1, Lcom/google/android/gms/common/api/internal/d$b;->agH: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;->agu:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->agq:Ljava/util/Map;
 
-    iget-object v1, p1, Lcom/google/android/gms/common/api/internal/d$b;->agL:Lcom/google/android/gms/common/api/internal/aw;
+    iget-object v1, p1, Lcom/google/android/gms/common/api/internal/d$b;->agH: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;->agu:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->agq:Ljava/util/Map;
 
-    iget-object v1, p1, Lcom/google/android/gms/common/api/internal/d$b;->agL:Lcom/google/android/gms/common/api/internal/aw;
+    iget-object v1, p1, Lcom/google/android/gms/common/api/internal/d$b;->agH: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;->agI:Ljava/util/List;
+    iget-object v1, v0, Lcom/google/android/gms/common/api/internal/d$a;->agE: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;->agH:Z
+    iget-boolean p1, v0, Lcom/google/android/gms/common/api/internal/d$a;->agD:Z
 
     if-nez p1, :cond_e
 
-    iget-object p1, v0, Lcom/google/android/gms/common/api/internal/d$a;->agz:Lcom/google/android/gms/common/api/a$f;
+    iget-object p1, v0, Lcom/google/android/gms/common/api/internal/d$a;->agv: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;->mx()V
+    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/d$a;->mv()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;->agB:Lcom/google/android/gms/common/api/internal/aw;
+    iget-object v0, p1, Lcom/google/android/gms/common/api/internal/r;->agx:Lcom/google/android/gms/common/api/internal/aw;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d;->agu:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d;->agq: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;->ahn:Lcom/google/android/gms/tasks/h;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/r;->ahj: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;->agu:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d;->agq: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;->ahn:Lcom/google/android/gms/tasks/h;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/r;->ahj: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;->agu:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->agq: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;->agu:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->agq: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;->agu:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->agq: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;->agu:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->agq: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;->agK:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p1, Lcom/google/android/gms/common/api/internal/d$a;->agG: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;->agH:Z
+    iget-boolean v0, p1, Lcom/google/android/gms/common/api/internal/d$a;->agD:Z
 
     if-eqz v0, :cond_e
 
-    invoke-virtual {p1}, Lcom/google/android/gms/common/api/internal/d$a;->mB()V
+    invoke-virtual {p1}, Lcom/google/android/gms/common/api/internal/d$a;->mz()V
 
-    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, p1, Lcom/google/android/gms/common/api/internal/d$a;->agG:Lcom/google/android/gms/common/api/internal/d;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/d;->agq:Lcom/google/android/gms/common/GoogleApiAvailability;
+    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/d;->agm:Lcom/google/android/gms/common/GoogleApiAvailability;
 
-    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, p1, Lcom/google/android/gms/common/api/internal/d$a;->agG:Lcom/google/android/gms/common/api/internal/d;
 
-    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/d;->agp:Landroid/content/Context;
+    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/d;->agl: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;->agz:Lcom/google/android/gms/common/api/a$f;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/d$a;->agv: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;->agx:Ljava/util/Set;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d;->agt: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;->agu:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d;->agq: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;->my()V
+    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/d$a;->mw()V
 
     goto :goto_1
 
     :cond_3
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d;->agx:Ljava/util/Set;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d;->agt: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;->agu:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->agq: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;->agu:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->agq: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;->agK:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p1, Lcom/google/android/gms/common/api/internal/d$a;->agG: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;->agH:Z
+    iget-boolean v0, p1, Lcom/google/android/gms/common/api/internal/d$a;->agD: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;->agp:Landroid/content/Context;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d;->agl: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;->agp:Landroid/content/Context;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d;->agl: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;->mq()Lcom/google/android/gms/common/api/internal/b;
+    invoke-static {}, Lcom/google/android/gms/common/api/internal/b;->mo()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;->mq()Lcom/google/android/gms/common/api/internal/b;
+    invoke-static {}, Lcom/google/android/gms/common/api/internal/b;->mo()Lcom/google/android/gms/common/api/internal/b;
 
     move-result-object p1
 
-    iget-object v0, p1, Lcom/google/android/gms/common/api/internal/b;->afP:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v0, p1, Lcom/google/android/gms/common/api/internal/b;->afL: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;->afP:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v3, p1, Lcom/google/android/gms/common/api/internal/b;->afL: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;->afO:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v0, p1, Lcom/google/android/gms/common/api/internal/b;->afK: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;->afO:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/b;->afK: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;->agn:J
+    iput-wide v1, p0, Lcom/google/android/gms/common/api/internal/d;->agj: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;->agu:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d;->agq: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;->agF:I
+    iget v3, v2, Lcom/google/android/gms/common/api/internal/d$a;->agB: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;->agq:Lcom/google/android/gms/common/GoogleApiAvailability;
+    iget-object v3, p0, Lcom/google/android/gms/common/api/internal/d;->agm: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;->agu:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->agq:Ljava/util/Map;
 
-    iget-object v1, p1, Lcom/google/android/gms/common/api/internal/ae;->ahy:Lcom/google/android/gms/common/api/h;
+    iget-object v1, p1, Lcom/google/android/gms/common/api/internal/ae;->ahu:Lcom/google/android/gms/common/api/h;
 
-    iget-object v1, v1, Lcom/google/android/gms/common/api/h;->afu:Lcom/google/android/gms/common/api/internal/aw;
+    iget-object v1, v1, Lcom/google/android/gms/common/api/h;->afq: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;->ahy:Lcom/google/android/gms/common/api/h;
+    iget-object v0, p1, Lcom/google/android/gms/common/api/internal/ae;->ahu: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;->agu:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->agq:Ljava/util/Map;
 
-    iget-object v1, p1, Lcom/google/android/gms/common/api/internal/ae;->ahy:Lcom/google/android/gms/common/api/h;
+    iget-object v1, p1, Lcom/google/android/gms/common/api/internal/ae;->ahu:Lcom/google/android/gms/common/api/h;
 
-    iget-object v1, v1, Lcom/google/android/gms/common/api/h;->afu:Lcom/google/android/gms/common/api/internal/aw;
+    iget-object v1, v1, Lcom/google/android/gms/common/api/h;->afq: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;->lY()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/d$a;->lW()Z
 
     move-result v1
 
     if-eqz v1, :cond_9
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d;->agt:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d;->agp: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;->ahx:I
+    iget v2, p1, Lcom/google/android/gms/common/api/internal/ae;->aht:I
 
     if-eq v1, v2, :cond_9
 
-    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/ae;->ahw:Lcom/google/android/gms/common/api/internal/t;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/ae;->ahs:Lcom/google/android/gms/common/api/internal/t;
 
-    sget-object v1, Lcom/google/android/gms/common/api/internal/d;->agj:Lcom/google/android/gms/common/api/Status;
+    sget-object v1, Lcom/google/android/gms/common/api/internal/d;->agf: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;->my()V
+    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/d$a;->mw()V
 
     goto/16 :goto_6
 
     :cond_9
-    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/ae;->ahw:Lcom/google/android/gms/common/api/internal/t;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/ae;->ahs: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;->agu:Ljava/util/Map;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d;->agq: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;->mz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/d$a;->mx()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;->agu:Ljava/util/Map;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d;->agq: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;->agz:Lcom/google/android/gms/common/api/a$f;
+    iget-object v3, v2, Lcom/google/android/gms/common/api/internal/d$a;->agv: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;->afd:Lcom/google/android/gms/common/ConnectionResult;
+    sget-object v3, Lcom/google/android/gms/common/ConnectionResult;->aeZ:Lcom/google/android/gms/common/ConnectionResult;
 
-    iget-object v2, v2, Lcom/google/android/gms/common/api/internal/d$a;->agz:Lcom/google/android/gms/common/api/a$f;
+    iget-object v2, v2, Lcom/google/android/gms/common/api/internal/d$a;->agv:Lcom/google/android/gms/common/api/a$f;
 
-    invoke-interface {v2}, Lcom/google/android/gms/common/api/a$f;->ma()Ljava/lang/String;
+    invoke-interface {v2}, Lcom/google/android/gms/common/api/a$f;->lY()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;->mA()Lcom/google/android/gms/common/ConnectionResult;
+    invoke-virtual {v2}, Lcom/google/android/gms/common/api/internal/d$a;->my()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;->mA()Lcom/google/android/gms/common/ConnectionResult;
+    invoke-virtual {v2}, Lcom/google/android/gms/common/api/internal/d$a;->my()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;->agK:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v1, v2, Lcom/google/android/gms/common/api/internal/d$a;->agG: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;->agD:Ljava/util/Set;
+    iget-object v1, v2, Lcom/google/android/gms/common/api/internal/d$a;->agz: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;->agn:J
+    iput-wide v1, p0, Lcom/google/android/gms/common/api/internal/d;->agj: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;->agu:Ljava/util/Map;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d;->agq: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;->agn:J
+    iget-wide v3, p0, Lcom/google/android/gms/common/api/internal/d;->agj: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 ms()V
+.method public final mq()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 5ff01102d0..745893505e 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 agQ:Lcom/google/android/gms/common/api/internal/e;
+.field private static agM:Lcom/google/android/gms/common/api/internal/e;
 
 .field private static final sLock:Ljava/lang/Object;
 
 
 # instance fields
-.field private final agR:Ljava/lang/String;
+.field private final agN:Ljava/lang/String;
 
-.field private final agS:Lcom/google/android/gms/common/api/Status;
+.field private final agO:Lcom/google/android/gms/common/api/Status;
 
-.field private final agT:Z
+.field private final agP:Z
 
-.field private final agU:Z
+.field private final agQ: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;->agU:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/common/api/internal/e;->agQ:Z
 
     goto :goto_1
 
     :cond_1
-    iput-boolean v2, p0, Lcom/google/android/gms/common/api/internal/e;->agU:Z
+    iput-boolean v2, p0, Lcom/google/android/gms/common/api/internal/e;->agQ:Z
 
     :goto_1
-    iput-boolean v3, p0, Lcom/google/android/gms/common/api/internal/e;->agT:Z
+    iput-boolean v3, p0, Lcom/google/android/gms/common/api/internal/e;->agP: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;->agS:Lcom/google/android/gms/common/api/Status;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/e;->agO:Lcom/google/android/gms/common/api/Status;
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/e;->agR:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/e;->agN:Ljava/lang/String;
 
     return-void
 
     :cond_3
-    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/e;->agR:Ljava/lang/String;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/e;->agN:Ljava/lang/String;
 
-    sget-object p1, Lcom/google/android/gms/common/api/Status;->afG:Lcom/google/android/gms/common/api/Status;
+    sget-object p1, Lcom/google/android/gms/common/api/Status;->afC: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;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/e;->agO: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;->agQ:Lcom/google/android/gms/common/api/internal/e;
+    sget-object v1, Lcom/google/android/gms/common/api/internal/e;->agM: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;->agQ:Lcom/google/android/gms/common/api/internal/e;
+    sput-object v1, Lcom/google/android/gms/common/api/internal/e;->agM:Lcom/google/android/gms/common/api/internal/e;
 
     :cond_0
-    sget-object p0, Lcom/google/android/gms/common/api/internal/e;->agQ:Lcom/google/android/gms/common/api/internal/e;
+    sget-object p0, Lcom/google/android/gms/common/api/internal/e;->agM:Lcom/google/android/gms/common/api/internal/e;
 
-    iget-object p0, p0, Lcom/google/android/gms/common/api/internal/e;->agS:Lcom/google/android/gms/common/api/Status;
+    iget-object p0, p0, Lcom/google/android/gms/common/api/internal/e;->agO: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;->agQ:Lcom/google/android/gms/common/api/internal/e;
+    sget-object v1, Lcom/google/android/gms/common/api/internal/e;->agM:Lcom/google/android/gms/common/api/internal/e;
 
     if-eqz v1, :cond_0
 
-    sget-object p0, Lcom/google/android/gms/common/api/internal/e;->agQ:Lcom/google/android/gms/common/api/internal/e;
+    sget-object p0, Lcom/google/android/gms/common/api/internal/e;->agM:Lcom/google/android/gms/common/api/internal/e;
 
     monitor-exit v0
 
@@ -242,7 +242,7 @@
     throw p0
 .end method
 
-.method public static mE()Ljava/lang/String;
+.method public static mC()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;->agR:Ljava/lang/String;
+    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/e;->agN:Ljava/lang/String;
 
     return-object v0
 .end method
 
-.method public static mF()Z
+.method public static mD()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;->agU:Z
+    iget-boolean v0, v0, Lcom/google/android/gms/common/api/internal/e;->agQ: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 5d39458d9b..23c9cb7da3 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 agV:Ljava/lang/Object;
+.field final agR: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;->agV:Ljava/lang/Object;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/f;->agR: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 0c53d3289d..ef8b3da3fb 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 mG()Landroid/app/Activity;
+.method public abstract mE()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 f8936c3545..157e4f3d2b 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 agY:Ljava/lang/Object;
+.field private final agU:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "T",
@@ -32,7 +32,7 @@
     .end annotation
 .end field
 
-.field private final aha:Ljava/lang/String;
+.field private final agW: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;->agY:Ljava/lang/Object;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/h$a;->agU:Ljava/lang/Object;
 
-    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/h$a;->aha:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/h$a;->agW: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;->agY:Ljava/lang/Object;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/h$a;->agU:Ljava/lang/Object;
 
-    iget-object v3, p1, 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;->agU:Ljava/lang/Object;
 
     if-ne v1, v3, :cond_2
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/h$a;->aha:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/h$a;->agW:Ljava/lang/String;
 
-    iget-object p1, p1, 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;->agW: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;->agY:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/h$a;->agU: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;->aha:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/h$a;->agW: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 f789d49f8b..a4491dee88 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 ahb:Lcom/google/android/gms/common/api/internal/h;
+.field private final synthetic agX: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;->ahb:Lcom/google/android/gms/common/api/internal/h;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/h$c;->agX: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;->ahb:Lcom/google/android/gms/common/api/internal/h;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/h$c;->agX: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;->agY:Ljava/lang/Object;
+    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/h;->agU: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 ee4ca8d487..d351173e82 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 agX:Lcom/google/android/gms/common/api/internal/h$c;
+.field private final agT: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 agY:Ljava/lang/Object;
+.field volatile agU:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "T",
@@ -39,7 +39,7 @@
     .end annotation
 .end field
 
-.field public final agZ:Lcom/google/android/gms/common/api/internal/h$a;
+.field public final agV: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;->agX:Lcom/google/android/gms/common/api/internal/h$c;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/h;->agT: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;->agY:Ljava/lang/Object;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/h;->agU: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;->agZ:Lcom/google/android/gms/common/api/internal/h$a;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/h;->agV: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;->agX:Lcom/google/android/gms/common/api/internal/h$c;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/h;->agT: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;->agX:Lcom/google/android/gms/common/api/internal/h$c;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/h;->agT: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 877ba149ab..7f5d4fa247 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 ahc:Lcom/google/android/gms/common/api/internal/h;
+.field public final agY: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 ahd:[Lcom/google/android/gms/common/Feature;
+.field final agZ:[Lcom/google/android/gms/common/Feature;
 
-.field final ahe:Z
+.field final aha: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;->ahc:Lcom/google/android/gms/common/api/internal/h;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/j;->agY:Lcom/google/android/gms/common/api/internal/h;
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/j;->ahd:[Lcom/google/android/gms/common/Feature;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/j;->agZ:[Lcom/google/android/gms/common/Feature;
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lcom/google/android/gms/common/api/internal/j;->ahe:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/common/api/internal/j;->aha: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 1fd79efa1e..d137fec815 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 ahf:[Lcom/google/android/gms/common/Feature;
+.field final ahb:[Lcom/google/android/gms/common/Feature;
 
-.field final ahg:Z
+.field final ahc:Z
 
 
 # direct methods
@@ -31,11 +31,11 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/l;->ahf:[Lcom/google/android/gms/common/Feature;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/l;->ahb:[Lcom/google/android/gms/common/Feature;
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/google/android/gms/common/api/internal/l;->ahg:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/common/api/internal/l;->ahc: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 168df15c8a..dac200dd27 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 agZ:Lcom/google/android/gms/common/api/internal/h$a;
+.field public final agV: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;->agZ:Lcom/google/android/gms/common/api/internal/h$a;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/m;->agV: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 db6cff1794..6648678efe 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 ahh:Ljava/util/Map;
+.field final ahd:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -15,7 +15,7 @@
     .end annotation
 .end field
 
-.field final ahi:Ljava/util/Map;
+.field final ahe: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;->ahh:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/n;->ahd: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;->ahi:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/n;->ahe: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;->ahh:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/n;->ahd: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;->ahh:Ljava/util/Map;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/n;->ahd: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;->ahi:Ljava/util/Map;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/n;->ahe: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;->ahi:Ljava/util/Map;
+    iget-object v3, p0, Lcom/google/android/gms/common/api/internal/n;->ahe:Ljava/util/Map;
 
     invoke-direct {v0, v3}, Ljava/util/HashMap;-><init>(Ljava/util/Map;)V
 
@@ -221,10 +221,10 @@
 
 
 # virtual methods
-.method final mH()Z
+.method final mF()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/n;->ahh:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/n;->ahd: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;->ahi:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/n;->ahe:Ljava/util/Map;
 
     invoke-interface {v0}, Ljava/util/Map;->isEmpty()Z
 
@@ -254,10 +254,10 @@
     return v0
 .end method
 
-.method public final mI()V
+.method public final mG()V
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/common/api/internal/d;->agj:Lcom/google/android/gms/common/api/Status;
+    sget-object v0, Lcom/google/android/gms/common/api/internal/d;->agf:Lcom/google/android/gms/common/api/Status;
 
     const/4 v1, 0x0
 
@@ -266,10 +266,10 @@
     return-void
 .end method
 
-.method public final mJ()V
+.method public final mH()V
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/common/api/internal/aq;->ahS:Lcom/google/android/gms/common/api/Status;
+    sget-object v0, Lcom/google/android/gms/common/api/internal/aq;->ahO: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 490f60fef5..4012429355 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 ahj:Lcom/google/android/gms/common/api/internal/BasePendingResult;
+.field private final synthetic ahf:Lcom/google/android/gms/common/api/internal/BasePendingResult;
 
-.field private final synthetic ahk:Lcom/google/android/gms/common/api/internal/n;
+.field private final synthetic ahg: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;->ahk:Lcom/google/android/gms/common/api/internal/n;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/o;->ahg:Lcom/google/android/gms/common/api/internal/n;
 
-    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/o;->ahj:Lcom/google/android/gms/common/api/internal/BasePendingResult;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/o;->ahf: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;->ahk:Lcom/google/android/gms/common/api/internal/n;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/o;->ahg:Lcom/google/android/gms/common/api/internal/n;
 
-    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/n;->ahh:Ljava/util/Map;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/n;->ahd:Ljava/util/Map;
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/o;->ahj:Lcom/google/android/gms/common/api/internal/BasePendingResult;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/o;->ahf: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 eff5e04de1..a768aafcdc 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 ahk:Lcom/google/android/gms/common/api/internal/n;
+.field private final synthetic ahg:Lcom/google/android/gms/common/api/internal/n;
 
-.field private final synthetic ahl:Lcom/google/android/gms/tasks/h;
+.field private final synthetic ahh: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;->ahk:Lcom/google/android/gms/common/api/internal/n;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/p;->ahg:Lcom/google/android/gms/common/api/internal/n;
 
-    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/p;->ahl:Lcom/google/android/gms/tasks/h;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/p;->ahh: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;->ahk:Lcom/google/android/gms/common/api/internal/n;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/p;->ahg:Lcom/google/android/gms/common/api/internal/n;
 
-    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/n;->ahi:Ljava/util/Map;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/n;->ahe:Ljava/util/Map;
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/p;->ahl:Lcom/google/android/gms/tasks/h;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/p;->ahh: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 dd3cd6e44b..cc30aa6877 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 afy:Lcom/google/android/gms/common/api/internal/d;
+.field private afu:Lcom/google/android/gms/common/api/internal/d;
 
-.field final ahm:Landroidx/collection/ArraySet;
+.field final ahi: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;->ahm:Landroidx/collection/ArraySet;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/q;->ahi:Landroidx/collection/ArraySet;
 
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/q;->agW:Lcom/google/android/gms/common/api/internal/g;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/q;->agS: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;->afy:Lcom/google/android/gms/common/api/internal/d;
+    iput-object p1, v0, Lcom/google/android/gms/common/api/internal/q;->afu: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;->ahm:Landroidx/collection/ArraySet;
+    iget-object p0, v0, Lcom/google/android/gms/common/api/internal/q;->ahi: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 mK()V
+.method private final mI()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/q;->ahm:Landroidx/collection/ArraySet;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/q;->ahi: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;->afy:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/q;->afu: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;->afy:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/q;->afu: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 ms()V
+.method protected final mq()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/q;->afy:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/q;->afu:Lcom/google/android/gms/common/api/internal/d;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/d;->ms()V
+    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/d;->mq()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;->mK()V
+    invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/q;->mI()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;->mK()V
+    invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/q;->mI()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;->afy:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/q;->afu: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;->agv:Lcom/google/android/gms/common/api/internal/q;
+    iget-object v2, v0, Lcom/google/android/gms/common/api/internal/d;->agr: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;->agv:Lcom/google/android/gms/common/api/internal/q;
+    iput-object v2, v0, Lcom/google/android/gms/common/api/internal/d;->agr:Lcom/google/android/gms/common/api/internal/q;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/d;->agw:Ljava/util/Set;
+    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/d;->ags: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 109dd80633..f32c974036 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 agB:Lcom/google/android/gms/common/api/internal/aw;
+.field final agx: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 ahn:Lcom/google/android/gms/tasks/h;
+.field final ahj: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 908368d5e6..276743c7da 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 aho:Ljava/lang/String;
+.field private final ahk: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;->aho:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/s;->ahk: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 527bed01d5..ea3ab60b3e 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 agK:Lcom/google/android/gms/common/api/internal/d;
+.field private final synthetic agG: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;->agK:Lcom/google/android/gms/common/api/internal/d;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/u;->agG: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;->agK:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/u;->agG: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;->agK:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/u;->agG: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 5d2451b41c..946edffaf2 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 ahp:Lcom/google/android/gms/common/api/internal/d$a;
+.field private final synthetic ahl: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;->ahp:Lcom/google/android/gms/common/api/internal/d$a;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/v;->ahl: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;->ahp:Lcom/google/android/gms/common/api/internal/d$a;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/v;->ahl: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 a61c9c3885..fef2df021d 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 ahp:Lcom/google/android/gms/common/api/internal/d$a;
+.field private final synthetic ahl: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;->ahp:Lcom/google/android/gms/common/api/internal/d$a;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/w;->ahl: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;->ahp:Lcom/google/android/gms/common/api/internal/d$a;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/w;->ahl: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;->mu()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 bd2e00045a..21e6f1ea97 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 ahp:Lcom/google/android/gms/common/api/internal/d$a;
+.field final synthetic ahl: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;->ahp:Lcom/google/android/gms/common/api/internal/d$a;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/x;->ahl: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 mL()V
+.method public final mJ()V
     .locals 2
 
-    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, p0, Lcom/google/android/gms/common/api/internal/x;->ahl:Lcom/google/android/gms/common/api/internal/d$a;
 
-    iget-object v0, v0, 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$a;->agG: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 efda847bf9..c4980cade8 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 ahq:Lcom/google/android/gms/common/api/internal/x;
+.field private final synthetic ahm: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;->ahq:Lcom/google/android/gms/common/api/internal/x;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/y;->ahm: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;->ahq:Lcom/google/android/gms/common/api/internal/x;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/y;->ahm:Lcom/google/android/gms/common/api/internal/x;
 
-    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/x;->ahl:Lcom/google/android/gms/common/api/internal/d$a;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/d$a;->agz:Lcom/google/android/gms/common/api/a$f;
+    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/d$a;->agv: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 53e7a2dd9d..277609c696 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 ahr:Lcom/google/android/gms/common/ConnectionResult;
+.field private final synthetic ahn:Lcom/google/android/gms/common/ConnectionResult;
 
-.field private final synthetic ahs:Lcom/google/android/gms/common/api/internal/d$c;
+.field private final synthetic aho: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;->ahs:Lcom/google/android/gms/common/api/internal/d$c;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/z;->aho:Lcom/google/android/gms/common/api/internal/d$c;
 
-    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/z;->ahr:Lcom/google/android/gms/common/ConnectionResult;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/z;->ahn: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;->ahr:Lcom/google/android/gms/common/ConnectionResult;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/z;->ahn:Lcom/google/android/gms/common/ConnectionResult;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/ConnectionResult;->lQ()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/common/ConnectionResult;->lO()Z
 
     move-result v0
 
     if-eqz v0, :cond_1
 
-    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, p0, Lcom/google/android/gms/common/api/internal/z;->aho: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;->agP:Z
+    iput-boolean v1, v0, Lcom/google/android/gms/common/api/internal/d$c;->agL:Z
 
-    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/d$c;->agz:Lcom/google/android/gms/common/api/a$f;
+    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/d$c;->agv:Lcom/google/android/gms/common/api/a$f;
 
-    invoke-interface {v0}, Lcom/google/android/gms/common/api/a$f;->lY()Z
+    invoke-interface {v0}, Lcom/google/android/gms/common/api/a$f;->lW()Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    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, p0, Lcom/google/android/gms/common/api/internal/z;->aho:Lcom/google/android/gms/common/api/internal/d$c;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/d$c;->mD()V
+    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/d$c;->mB()V
 
     return-void
 
     :cond_0
     :try_start_0
-    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, p0, Lcom/google/android/gms/common/api/internal/z;->aho:Lcom/google/android/gms/common/api/internal/d$c;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/d$c;->agz:Lcom/google/android/gms/common/api/a$f;
+    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/d$c;->agv: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;->ahs:Lcom/google/android/gms/common/api/internal/d$c;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/z;->aho:Lcom/google/android/gms/common/api/internal/d$c;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/d$c;->agK:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/d$c;->agG: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;->ahs:Lcom/google/android/gms/common/api/internal/d$c;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/z;->aho:Lcom/google/android/gms/common/api/internal/d$c;
 
-    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/d$c;->agB:Lcom/google/android/gms/common/api/internal/aw;
+    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/d$c;->agx: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;->ahs:Lcom/google/android/gms/common/api/internal/d$c;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/z;->aho:Lcom/google/android/gms/common/api/internal/d$c;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/d$c;->agK:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/d$c;->agG: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;->ahs:Lcom/google/android/gms/common/api/internal/d$c;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/z;->aho:Lcom/google/android/gms/common/api/internal/d$c;
 
-    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/d$c;->agB:Lcom/google/android/gms/common/api/internal/aw;
+    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/d$c;->agx: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;->ahr:Lcom/google/android/gms/common/ConnectionResult;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/z;->ahn: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 641c32c63d..aba8bca7a4 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 afE:Lcom/google/android/gms/common/api/n;
+.field public afA: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 ec40c5fa63..f566fbc86b 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 mo()Lcom/google/android/gms/common/api/Status;
+.method public abstract mm()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 a708103d9c..b147133e7d 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 mp()Lcom/google/android/gms/common/api/j;
+.method public abstract mn()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 dc712159dc..c07f45682e 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 aff:Landroid/content/DialogInterface$OnCancelListener;
+.field private afb: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;->aff:Landroid/content/DialogInterface$OnCancelListener;
+    iput-object v0, p0, Lcom/google/android/gms/common/b;->afb: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;->aff:Landroid/content/DialogInterface$OnCancelListener;
+    iput-object p1, v0, Lcom/google/android/gms/common/b;->afb: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;->aff:Landroid/content/DialogInterface$OnCancelListener;
+    iget-object v0, p0, Lcom/google/android/gms/common/b;->afb: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 f3adf23941..192f854be1 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 nj()Ljava/util/concurrent/ScheduledExecutorService;
+.method public abstract nh()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 1d6f5d49f1..4ae2ee4d71 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 akY:Lcom/google/android/gms/common/b/a$a;
+.field private static akU:Lcom/google/android/gms/common/b/a$a;
 
 
 # direct methods
-.method public static declared-synchronized ni()Lcom/google/android/gms/common/b/a$a;
+.method public static declared-synchronized ng()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;->akY:Lcom/google/android/gms/common/b/a$a;
+    sget-object v1, Lcom/google/android/gms/common/b/a;->akU: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;->akY:Lcom/google/android/gms/common/b/a$a;
+    sput-object v1, Lcom/google/android/gms/common/b/a;->akU:Lcom/google/android/gms/common/b/a$a;
 
     :cond_0
-    sget-object v1, Lcom/google/android/gms/common/b/a;->akY:Lcom/google/android/gms/common/b/a$a;
+    sget-object v1, Lcom/google/android/gms/common/b/a;->akU: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 bcb2641649..973df63d81 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 nj()Ljava/util/concurrent/ScheduledExecutorService;
+.method public final nh()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 fcc3d439d4..740289a463 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 afm:Lcom/google/android/gms/common/c;
+.field private static final afh: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;->afm:Lcom/google/android/gms/common/c;
+    sput-object v0, Lcom/google/android/gms/common/c;->afh:Lcom/google/android/gms/common/c;
 
     return-void
 .end method
@@ -132,10 +132,10 @@
     return p0
 .end method
 
-.method public static lU()Lcom/google/android/gms/common/c;
+.method public static lS()Lcom/google/android/gms/common/c;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/common/c;->afm:Lcom/google/android/gms/common/c;
+    sget-object v0, Lcom/google/android/gms/common/c;->afh: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;->nf()Landroid/content/Intent;
+    invoke-static {}, Lcom/google/android/gms/common/internal/ai;->nd()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 cd295c1f62..57a5c93226 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 amp:Landroid/content/Context;
+.field private static aml:Landroid/content/Context;
 
-.field private static amq:Ljava/lang/Boolean;
+.field private static amm:Ljava/lang/Boolean;
 
 
 # direct methods
@@ -21,19 +21,19 @@
 
     move-result-object v1
 
-    sget-object v2, Lcom/google/android/gms/common/c/a;->amp:Landroid/content/Context;
+    sget-object v2, Lcom/google/android/gms/common/c/a;->aml:Landroid/content/Context;
 
     if-eqz v2, :cond_0
 
-    sget-object v2, Lcom/google/android/gms/common/c/a;->amq:Ljava/lang/Boolean;
+    sget-object v2, Lcom/google/android/gms/common/c/a;->amm:Ljava/lang/Boolean;
 
     if-eqz v2, :cond_0
 
-    sget-object v2, Lcom/google/android/gms/common/c/a;->amp:Landroid/content/Context;
+    sget-object v2, Lcom/google/android/gms/common/c/a;->aml:Landroid/content/Context;
 
     if-ne v2, v1, :cond_0
 
-    sget-object p0, Lcom/google/android/gms/common/c/a;->amq:Ljava/lang/Boolean;
+    sget-object p0, Lcom/google/android/gms/common/c/a;->amm: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;->amq:Ljava/lang/Boolean;
+    sput-object v2, Lcom/google/android/gms/common/c/a;->amm: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;->amq:Ljava/lang/Boolean;
+    sput-object p0, Lcom/google/android/gms/common/c/a;->amm: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;->amq:Ljava/lang/Boolean;
+    sput-object p0, Lcom/google/android/gms/common/c/a;->amm: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;->amq:Ljava/lang/Boolean;
+    sput-object p0, Lcom/google/android/gms/common/c/a;->amm:Ljava/lang/Boolean;
 
     :goto_0
-    sput-object v1, Lcom/google/android/gms/common/c/a;->amp:Landroid/content/Context;
+    sput-object v1, Lcom/google/android/gms/common/c/a;->aml:Landroid/content/Context;
 
-    sget-object p0, Lcom/google/android/gms/common/c/a;->amq:Ljava/lang/Boolean;
+    sget-object p0, Lcom/google/android/gms/common/c/a;->amm: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 c045df4a86..fc459d171a 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 amr:Landroid/content/Context;
+.field public final amn: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;->amr:Landroid/content/Context;
+    iput-object p1, p0, Lcom/google/android/gms/common/c/b;->amn: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;->amr:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/android/gms/common/c/b;->amn: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;->amr:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/android/gms/common/c/b;->amn: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;->amr:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/android/gms/common/c/b;->amn: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;->amr:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/android/gms/common/c/b;->amn: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;->amr:Landroid/content/Context;
+    iget-object v1, p0, Lcom/google/android/gms/common/c/b;->amn: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;->amr:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/android/gms/common/c/b;->amn: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;->amr:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/android/gms/common/c/b;->amn: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 nF()Z
+.method public final nD()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;->amr:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/android/gms/common/c/b;->amn: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;->amr:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/android/gms/common/c/b;->amn: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;->amr:Landroid/content/Context;
+    iget-object v1, p0, Lcom/google/android/gms/common/c/b;->amn: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 fb3350b085..f4fe1cb21f 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 amt:Lcom/google/android/gms/common/c/c;
+.field private static amp:Lcom/google/android/gms/common/c/c;
 
 
 # instance fields
-.field private ams:Lcom/google/android/gms/common/c/b;
+.field private amo: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;->amt:Lcom/google/android/gms/common/c/c;
+    sput-object v0, Lcom/google/android/gms/common/c/c;->amp: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;->ams:Lcom/google/android/gms/common/c/b;
+    iput-object v0, p0, Lcom/google/android/gms/common/c/c;->amo: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;->ams:Lcom/google/android/gms/common/c/b;
+    iget-object v0, p0, Lcom/google/android/gms/common/c/c;->amo: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;->ams:Lcom/google/android/gms/common/c/b;
+    iput-object v0, p0, Lcom/google/android/gms/common/c/c;->amo:Lcom/google/android/gms/common/c/b;
 
     :cond_1
-    iget-object p1, p0, Lcom/google/android/gms/common/c/c;->ams:Lcom/google/android/gms/common/c/b;
+    iget-object p1, p0, Lcom/google/android/gms/common/c/c;->amo: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;->amt:Lcom/google/android/gms/common/c/c;
+    sget-object v0, Lcom/google/android/gms/common/c/c;->amp: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 25586294c9..ffd585c1f2 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/data/DataHolder$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/data/DataHolder$a.smali
@@ -14,9 +14,7 @@
 
 
 # instance fields
-.field private final aiD:[Ljava/lang/String;
-
-.field private final aiM:Ljava/util/ArrayList;
+.field private final aiI:Ljava/util/ArrayList;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/ArrayList<",
@@ -28,9 +26,9 @@
     .end annotation
 .end field
 
-.field private final aiN:Ljava/lang/String;
+.field private final aiJ:Ljava/lang/String;
 
-.field private final aiO:Ljava/util/HashMap;
+.field private final aiK:Ljava/util/HashMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/HashMap<",
@@ -41,9 +39,11 @@
     .end annotation
 .end field
 
-.field private aiP:Z
+.field private aiL:Z
 
-.field private aiQ:Ljava/lang/String;
+.field private aiM:Ljava/lang/String;
+
+.field private final aiz:[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;->aiD:[Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/common/data/DataHolder$a;->aiz:[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;->aiM:Ljava/util/ArrayList;
+    iput-object p1, p0, Lcom/google/android/gms/common/data/DataHolder$a;->aiI:Ljava/util/ArrayList;
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/google/android/gms/common/data/DataHolder$a;->aiN:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/common/data/DataHolder$a;->aiJ: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;->aiO:Ljava/util/HashMap;
+    iput-object v0, p0, Lcom/google/android/gms/common/data/DataHolder$a;->aiK:Ljava/util/HashMap;
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/google/android/gms/common/data/DataHolder$a;->aiP:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/common/data/DataHolder$a;->aiL:Z
 
-    iput-object p1, p0, Lcom/google/android/gms/common/data/DataHolder$a;->aiQ:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/common/data/DataHolder$a;->aiM: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 bed890a488..7ef6fe9183 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 aiL:Lcom/google/android/gms/common/data/DataHolder$a;
+.field private static final aiH:Lcom/google/android/gms/common/data/DataHolder$a;
 
 
 # instance fields
+.field aiA:Landroid/os/Bundle;
+
+.field final aiB:[Landroid/database/CursorWindow;
+
 .field private final aiC:I
 
-.field final aiD:[Ljava/lang/String;
+.field private final aiD:Landroid/os/Bundle;
 
-.field aiE:Landroid/os/Bundle;
+.field aiE:[I
 
-.field final aiF:[Landroid/database/CursorWindow;
+.field aiF:I
 
-.field private final aiG:I
+.field private aiG:Z
 
-.field private final aiH:Landroid/os/Bundle;
+.field private final aiy:I
 
-.field aiI:[I
-
-.field aiJ:I
-
-.field private aiK:Z
+.field final aiz:[Ljava/lang/String;
 
 .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;->aiL:Lcom/google/android/gms/common/data/DataHolder$a;
+    sput-object v0, Lcom/google/android/gms/common/data/DataHolder;->aiH: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;->aiK:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/common/data/DataHolder;->aiG:Z
 
-    iput p1, p0, Lcom/google/android/gms/common/data/DataHolder;->aiC:I
+    iput p1, p0, Lcom/google/android/gms/common/data/DataHolder;->aiy:I
 
-    iput-object p2, p0, Lcom/google/android/gms/common/data/DataHolder;->aiD:[Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/common/data/DataHolder;->aiz:[Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/google/android/gms/common/data/DataHolder;->aiF:[Landroid/database/CursorWindow;
+    iput-object p3, p0, Lcom/google/android/gms/common/data/DataHolder;->aiB:[Landroid/database/CursorWindow;
 
-    iput p4, p0, Lcom/google/android/gms/common/data/DataHolder;->aiG:I
+    iput p4, p0, Lcom/google/android/gms/common/data/DataHolder;->aiC:I
 
-    iput-object p5, p0, Lcom/google/android/gms/common/data/DataHolder;->aiH:Landroid/os/Bundle;
+    iput-object p5, p0, Lcom/google/android/gms/common/data/DataHolder;->aiD: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;->aiF:[Landroid/database/CursorWindow;
+    iget-object v1, p0, Lcom/google/android/gms/common/data/DataHolder;->aiB:[Landroid/database/CursorWindow;
 
     array-length v1, v1
 
     if-ge v0, v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/common/data/DataHolder;->aiF:[Landroid/database/CursorWindow;
+    iget-object v1, p0, Lcom/google/android/gms/common/data/DataHolder;->aiB:[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;->aiK:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/common/data/DataHolder;->aiG:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/common/data/DataHolder;->aiF:[Landroid/database/CursorWindow;
+    iget-object v0, p0, Lcom/google/android/gms/common/data/DataHolder;->aiB:[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;->aiD:[Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/common/data/DataHolder;->aiz:[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;->aiF:[Landroid/database/CursorWindow;
+    iget-object v3, p0, Lcom/google/android/gms/common/data/DataHolder;->aiB:[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;->aiG: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
 
     const/4 v1, 0x4
 
-    iget-object v3, p0, Lcom/google/android/gms/common/data/DataHolder;->aiH:Landroid/os/Bundle;
+    iget-object v3, p0, Lcom/google/android/gms/common/data/DataHolder;->aiD: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;->aiC:I
+    iget v3, p0, Lcom/google/android/gms/common/data/DataHolder;->aiy: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 44b6e08cef..0cc496aa45 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;->aiE:Landroid/os/Bundle;
+    iput-object v0, p1, Lcom/google/android/gms/common/data/DataHolder;->aiA:Landroid/os/Bundle;
 
     const/4 v0, 0x0
 
     :goto_1
-    iget-object v1, p1, Lcom/google/android/gms/common/data/DataHolder;->aiD:[Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/common/data/DataHolder;->aiz:[Ljava/lang/String;
 
     array-length v1, v1
 
     if-ge v0, v1, :cond_7
 
-    iget-object v1, p1, Lcom/google/android/gms/common/data/DataHolder;->aiE:Landroid/os/Bundle;
+    iget-object v1, p1, Lcom/google/android/gms/common/data/DataHolder;->aiA:Landroid/os/Bundle;
 
-    iget-object v3, p1, Lcom/google/android/gms/common/data/DataHolder;->aiD:[Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/common/data/DataHolder;->aiz:[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;->aiF:[Landroid/database/CursorWindow;
+    iget-object v0, p1, Lcom/google/android/gms/common/data/DataHolder;->aiB:[Landroid/database/CursorWindow;
 
     array-length v0, v0
 
     new-array v0, v0, [I
 
-    iput-object v0, p1, Lcom/google/android/gms/common/data/DataHolder;->aiI:[I
+    iput-object v0, p1, Lcom/google/android/gms/common/data/DataHolder;->aiE:[I
 
     const/4 v0, 0x0
 
     :goto_2
-    iget-object v1, p1, Lcom/google/android/gms/common/data/DataHolder;->aiF:[Landroid/database/CursorWindow;
+    iget-object v1, p1, Lcom/google/android/gms/common/data/DataHolder;->aiB:[Landroid/database/CursorWindow;
 
     array-length v1, v1
 
     if-ge v2, v1, :cond_8
 
-    iget-object v1, p1, Lcom/google/android/gms/common/data/DataHolder;->aiI:[I
+    iget-object v1, p1, Lcom/google/android/gms/common/data/DataHolder;->aiE:[I
 
     aput v0, v1, v2
 
-    iget-object v1, p1, Lcom/google/android/gms/common/data/DataHolder;->aiF:[Landroid/database/CursorWindow;
+    iget-object v1, p1, Lcom/google/android/gms/common/data/DataHolder;->aiB:[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;->aiF:[Landroid/database/CursorWindow;
+    iget-object v3, p1, Lcom/google/android/gms/common/data/DataHolder;->aiB:[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;->aiJ:I
+    iput v0, p1, Lcom/google/android/gms/common/data/DataHolder;->aiF: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 a7910f466c..da810c3dcf 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;->lU()Lcom/google/android/gms/common/c;
+    invoke-static {}, Lcom/google/android/gms/common/c;->lS()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;->lU()Lcom/google/android/gms/common/c;
+    invoke-static {}, Lcom/google/android/gms/common/c;->lS()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;->lU()Lcom/google/android/gms/common/c;
+    invoke-static {}, Lcom/google/android/gms/common/c;->lS()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;->lU()Lcom/google/android/gms/common/c;
+    invoke-static {}, Lcom/google/android/gms/common/c;->lS()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;->alR:Ljava/lang/Boolean;
+    sget-object v0, Lcom/google/android/gms/common/util/h;->alN: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;->alR:Ljava/lang/Boolean;
+    sput-object v0, Lcom/google/android/gms/common/util/h;->alN:Ljava/lang/Boolean;
 
     :cond_5
-    sget-object v0, Lcom/google/android/gms/common/util/h;->alR:Ljava/lang/Boolean;
+    sget-object v0, Lcom/google/android/gms/common/util/h;->alN: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;->nu()Z
+    invoke-static {}, Lcom/google/android/gms/common/util/l;->ns()Z
 
     move-result v0
 
@@ -800,7 +800,7 @@
 
     move-result v0
 
-    invoke-static {}, Lcom/google/android/gms/common/util/l;->nw()Z
+    invoke-static {}, Lcom/google/android/gms/common/util/l;->nu()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 79c1ced1cf..7453200baa 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 aff:Landroid/content/DialogInterface$OnCancelListener;
+.field private afb: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;->aff:Landroid/content/DialogInterface$OnCancelListener;
+    iput-object v0, p0, Lcom/google/android/gms/common/h;->afb: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;->aff:Landroid/content/DialogInterface$OnCancelListener;
+    iput-object p1, v0, Lcom/google/android/gms/common/h;->afb: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;->aff:Landroid/content/DialogInterface$OnCancelListener;
+    iget-object v0, p0, Lcom/google/android/gms/common/h;->afb: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 decc4c2c50..83282f6052 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 ajM:I
+.field private final ajI:I
 
-.field private ajN:I
+.field private ajJ:I
 
-.field ajO:Landroid/os/IBinder;
+.field ajK:Landroid/os/IBinder;
 
-.field ajP:[Lcom/google/android/gms/common/api/Scope;
+.field ajL:[Lcom/google/android/gms/common/api/Scope;
 
-.field ajQ:Landroid/os/Bundle;
+.field ajM:Landroid/os/Bundle;
 
-.field ajR:Landroid/accounts/Account;
+.field ajN:Landroid/accounts/Account;
 
-.field ajS:[Lcom/google/android/gms/common/Feature;
+.field ajO:[Lcom/google/android/gms/common/Feature;
 
-.field ajT:[Lcom/google/android/gms/common/Feature;
+.field ajP:[Lcom/google/android/gms/common/Feature;
 
-.field private ajU:Z
+.field private ajQ: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;->ajN:I
+    iput v0, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->ajJ:I
 
-    iput p1, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->ajM:I
+    iput p1, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->ajI:I
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->ajU:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->ajQ: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;->ajM:I
+    iput p2, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->ajI:I
 
-    iput p3, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->ajN:I
+    iput p3, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->ajJ: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;->ajR:Landroid/accounts/Account;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->ajN:Landroid/accounts/Account;
 
     goto :goto_1
 
     :cond_2
-    iput-object p5, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->ajO:Landroid/os/IBinder;
+    iput-object p5, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->ajK:Landroid/os/IBinder;
 
-    iput-object p8, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->ajR:Landroid/accounts/Account;
+    iput-object p8, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->ajN:Landroid/accounts/Account;
 
     :goto_1
-    iput-object p6, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->ajP:[Lcom/google/android/gms/common/api/Scope;
+    iput-object p6, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->ajL:[Lcom/google/android/gms/common/api/Scope;
 
-    iput-object p7, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->ajQ:Landroid/os/Bundle;
+    iput-object p7, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->ajM:Landroid/os/Bundle;
 
-    iput-object p9, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->ajS:[Lcom/google/android/gms/common/Feature;
+    iput-object p9, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->ajO:[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-object p10, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->ajP:[Lcom/google/android/gms/common/Feature;
 
-    iput-boolean p11, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->ajU:Z
+    iput-boolean p11, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->ajQ: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;->ajM:I
+    iget v1, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->ajI: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;->ajN:I
+    iget v1, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->ajJ: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;->ajO:Landroid/os/IBinder;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->ajK: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;->ajP:[Lcom/google/android/gms/common/api/Scope;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->ajL:[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;->ajQ:Landroid/os/Bundle;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->ajM: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;->ajR:Landroid/accounts/Account;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->ajN: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;->ajS:[Lcom/google/android/gms/common/Feature;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->ajO:[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;->ajT:[Lcom/google/android/gms/common/Feature;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->ajP:[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;->ajU:Z
+    iget-boolean p2, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->ajQ: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 693afd6d60..af64ecab21 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 aiC:I
+.field private final aiy:I
 
-.field private final ajz:Landroid/accounts/Account;
+.field private final ajv:Landroid/accounts/Account;
 
-.field private final akn:I
+.field private final akj:I
 
-.field private final ako:Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;
+.field private final akk: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;->aiC:I
+    iput p1, p0, Lcom/google/android/gms/common/internal/ResolveAccountRequest;->aiy:I
 
-    iput-object p2, p0, Lcom/google/android/gms/common/internal/ResolveAccountRequest;->ajz:Landroid/accounts/Account;
+    iput-object p2, p0, Lcom/google/android/gms/common/internal/ResolveAccountRequest;->ajv:Landroid/accounts/Account;
 
-    iput p3, p0, Lcom/google/android/gms/common/internal/ResolveAccountRequest;->akn:I
+    iput p3, p0, Lcom/google/android/gms/common/internal/ResolveAccountRequest;->akj:I
 
-    iput-object p4, p0, Lcom/google/android/gms/common/internal/ResolveAccountRequest;->ako:Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;
+    iput-object p4, p0, Lcom/google/android/gms/common/internal/ResolveAccountRequest;->akk: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;->aiC:I
+    iget v1, p0, Lcom/google/android/gms/common/internal/ResolveAccountRequest;->aiy: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;->ajz:Landroid/accounts/Account;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/ResolveAccountRequest;->ajv: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;->akn:I
+    iget v1, p0, Lcom/google/android/gms/common/internal/ResolveAccountRequest;->akj: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;->ako:Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/ResolveAccountRequest;->akk: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 13d1f135bb..f2b7a41c64 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/internal/ResolveAccountResponse.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/internal/ResolveAccountResponse.smali
@@ -15,15 +15,15 @@
 
 
 # instance fields
-.field private final aiC:I
+.field public aih:Lcom/google/android/gms/common/ConnectionResult;
 
-.field public ail:Lcom/google/android/gms/common/ConnectionResult;
+.field private final aiy:I
 
-.field public akp:Landroid/os/IBinder;
+.field public akl:Landroid/os/IBinder;
 
-.field private akq:Z
+.field private akm:Z
 
-.field private akr:Z
+.field private akn: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;->aiC:I
+    iput p1, p0, Lcom/google/android/gms/common/internal/ResolveAccountResponse;->aiy:I
 
-    iput-object p2, p0, Lcom/google/android/gms/common/internal/ResolveAccountResponse;->akp:Landroid/os/IBinder;
+    iput-object p2, p0, Lcom/google/android/gms/common/internal/ResolveAccountResponse;->akl:Landroid/os/IBinder;
 
-    iput-object p3, p0, Lcom/google/android/gms/common/internal/ResolveAccountResponse;->ail:Lcom/google/android/gms/common/ConnectionResult;
+    iput-object p3, p0, Lcom/google/android/gms/common/internal/ResolveAccountResponse;->aih:Lcom/google/android/gms/common/ConnectionResult;
 
-    iput-boolean p4, p0, Lcom/google/android/gms/common/internal/ResolveAccountResponse;->akq:Z
+    iput-boolean p4, p0, Lcom/google/android/gms/common/internal/ResolveAccountResponse;->akm:Z
 
-    iput-boolean p5, p0, Lcom/google/android/gms/common/internal/ResolveAccountResponse;->akr:Z
+    iput-boolean p5, p0, Lcom/google/android/gms/common/internal/ResolveAccountResponse;->akn: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;->ail:Lcom/google/android/gms/common/ConnectionResult;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/ResolveAccountResponse;->aih:Lcom/google/android/gms/common/ConnectionResult;
 
-    iget-object v3, p1, 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;->aih: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;->akp:Landroid/os/IBinder;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/ResolveAccountResponse;->akl: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;->akp:Landroid/os/IBinder;
+    iget-object p1, p1, Lcom/google/android/gms/common/internal/ResolveAccountResponse;->akl: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;->aiC:I
+    iget v1, p0, Lcom/google/android/gms/common/internal/ResolveAccountResponse;->aiy: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;->akp:Landroid/os/IBinder;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/ResolveAccountResponse;->akl: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;->ail:Lcom/google/android/gms/common/ConnectionResult;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/ResolveAccountResponse;->aih: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;->akq:Z
+    iget-boolean p2, p0, Lcom/google/android/gms/common/internal/ResolveAccountResponse;->akm: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;->akr:Z
+    iget-boolean p2, p0, Lcom/google/android/gms/common/internal/ResolveAccountResponse;->akn: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 8a869e1aee..ccd7804231 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;->lV()Landroid/accounts/Account;
+    invoke-interface {p0}, Lcom/google/android/gms/common/internal/k;->lT()Landroid/accounts/Account;
 
     move-result-object p0
     :try_end_0
@@ -68,7 +68,7 @@
     throw p1
 .end method
 
-.method public final lV()Landroid/accounts/Account;
+.method public final lT()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 d628600558..85c5883d4e 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 akA:Lcom/google/android/gms/tasks/h;
+.field private final synthetic akv:Lcom/google/android/gms/common/api/j;
 
-.field private final synthetic akB:Lcom/google/android/gms/common/internal/q$a;
+.field private final synthetic akw:Lcom/google/android/gms/tasks/h;
 
-.field private final synthetic akC:Lcom/google/android/gms/common/internal/q$b;
+.field private final synthetic akx:Lcom/google/android/gms/common/internal/q$a;
 
-.field private final synthetic akz:Lcom/google/android/gms/common/api/j;
+.field private final synthetic aky:Lcom/google/android/gms/common/internal/q$b;
 
 
 # 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;->akz:Lcom/google/android/gms/common/api/j;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/aa;->akv:Lcom/google/android/gms/common/api/j;
 
-    iput-object p2, p0, Lcom/google/android/gms/common/internal/aa;->akA:Lcom/google/android/gms/tasks/h;
+    iput-object p2, p0, Lcom/google/android/gms/common/internal/aa;->akw:Lcom/google/android/gms/tasks/h;
 
-    iput-object p3, p0, Lcom/google/android/gms/common/internal/aa;->akB:Lcom/google/android/gms/common/internal/q$a;
+    iput-object p3, p0, Lcom/google/android/gms/common/internal/aa;->akx:Lcom/google/android/gms/common/internal/q$a;
 
-    iput-object p4, p0, Lcom/google/android/gms/common/internal/aa;->akC:Lcom/google/android/gms/common/internal/q$b;
+    iput-object p4, p0, Lcom/google/android/gms/common/internal/aa;->aky: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;->lQ()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/common/api/Status;->lO()Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/gms/common/internal/aa;->akz:Lcom/google/android/gms/common/api/j;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/aa;->akv: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;->akA:Lcom/google/android/gms/tasks/h;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/aa;->akw:Lcom/google/android/gms/tasks/h;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/internal/aa;->akB:Lcom/google/android/gms/common/internal/q$a;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/aa;->akx: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;->akA:Lcom/google/android/gms/tasks/h;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/aa;->akw:Lcom/google/android/gms/tasks/h;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/internal/aa;->akC:Lcom/google/android/gms/common/internal/q$b;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/aa;->aky: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 3b28024e50..28e6e61262 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 akD:Lcom/google/android/gms/common/api/m;
+.field private final synthetic akz: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;->akD:Lcom/google/android/gms/common/api/m;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/ab;->akz: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;->akD:Lcom/google/android/gms/common/api/m;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/ab;->akz:Lcom/google/android/gms/common/api/m;
 
-    iput-object p1, v0, Lcom/google/android/gms/common/api/m;->afE:Lcom/google/android/gms/common/api/n;
+    iput-object p1, v0, Lcom/google/android/gms/common/api/m;->afA: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 ad99218dd8..836c22e4f8 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/internal/ag.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/internal/ag.smali
@@ -6,7 +6,7 @@
 
 
 # instance fields
-.field private final akG:Ljava/util/HashMap;
+.field private final akC:Ljava/util/HashMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/HashMap<",
@@ -17,13 +17,13 @@
     .end annotation
 .end field
 
-.field private final akH:Landroid/content/Context;
+.field private final akD:Landroid/content/Context;
 
-.field private final akI:Lcom/google/android/gms/common/stats/a;
+.field private final akE:Lcom/google/android/gms/common/stats/a;
 
-.field private final akJ:J
+.field private final akF:J
 
-.field private final akK:J
+.field private final akG: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;->akG:Ljava/util/HashMap;
+    iput-object v0, p0, Lcom/google/android/gms/common/internal/ag;->akC: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;->akH:Landroid/content/Context;
+    iput-object v0, p0, Lcom/google/android/gms/common/internal/ag;->akD: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;->nk()Lcom/google/android/gms/common/stats/a;
+    invoke-static {}, Lcom/google/android/gms/common/stats/a;->ni()Lcom/google/android/gms/common/stats/a;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/common/internal/ag;->akI:Lcom/google/android/gms/common/stats/a;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/ag;->akE:Lcom/google/android/gms/common/stats/a;
 
     const-wide/16 v0, 0x1388
 
-    iput-wide v0, p0, Lcom/google/android/gms/common/internal/ag;->akJ:J
+    iput-wide v0, p0, Lcom/google/android/gms/common/internal/ag;->akF:J
 
     const-wide/32 v0, 0x493e0
 
-    iput-wide v0, p0, Lcom/google/android/gms/common/internal/ag;->akK:J
+    iput-wide v0, p0, Lcom/google/android/gms/common/internal/ag;->akG: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;->akG:Ljava/util/HashMap;
+    iget-object p0, p0, Lcom/google/android/gms/common/internal/ag;->akC: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;->akH:Landroid/content/Context;
+    iget-object p0, p0, Lcom/google/android/gms/common/internal/ag;->akD: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;->akI:Lcom/google/android/gms/common/stats/a;
+    iget-object p0, p0, Lcom/google/android/gms/common/internal/ag;->akE: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;->akK:J
+    iget-wide v0, p0, Lcom/google/android/gms/common/internal/ag;->akG: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;->akG:Ljava/util/HashMap;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/ag;->akC:Ljava/util/HashMap;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/common/internal/ag;->akG:Ljava/util/HashMap;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/ag;->akC: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;->akL:Ljava/util/Set;
+    iget-object v2, v1, Lcom/google/android/gms/common/internal/ah;->akH: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;->ne()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/common/internal/ah;->nc()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;->akJ:J
+    iget-wide v1, p0, Lcom/google/android/gms/common/internal/ag;->akF: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;->akG:Ljava/util/HashMap;
+    iget-object p3, p0, Lcom/google/android/gms/common/internal/ag;->akC:Ljava/util/HashMap;
 
     monitor-enter p3
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/ag;->akG:Ljava/util/HashMap;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/ag;->akC: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;->nd()V
+    invoke-virtual {v0}, Lcom/google/android/gms/common/internal/ah;->nb()V
 
-    iget-object p2, p0, Lcom/google/android/gms/common/internal/ag;->akG:Ljava/util/HashMap;
+    iget-object p2, p0, Lcom/google/android/gms/common/internal/ag;->akC: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;->nd()V
+    invoke-virtual {v0}, Lcom/google/android/gms/common/internal/ah;->nb()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;->akN:Landroid/os/IBinder;
+    iget-object v1, v0, Lcom/google/android/gms/common/internal/ah;->akJ: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;->akM:Z
+    iget-boolean p1, v0, Lcom/google/android/gms/common/internal/ah;->akI:Z
 
     monitor-exit p3
 
@@ -395,7 +395,7 @@
     return v1
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/ag;->akG:Ljava/util/HashMap;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/ag;->akC: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;->akG:Ljava/util/HashMap;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/ag;->akC: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;->ajY:Ljava/lang/String;
+    iget-object p1, p1, Lcom/google/android/gms/common/internal/h$a;->ajU: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;->akG:Ljava/util/HashMap;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/ag;->akC: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;->akG:Ljava/util/HashMap;
+    iget-object v3, p0, Lcom/google/android/gms/common/internal/ag;->akC: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;->ne()Z
+    invoke-virtual {v3}, Lcom/google/android/gms/common/internal/ah;->nc()Z
 
     move-result v4
 
     if-eqz v4, :cond_6
 
-    iget-boolean v4, v3, Lcom/google/android/gms/common/internal/ah;->akM:Z
+    iget-boolean v4, v3, Lcom/google/android/gms/common/internal/ah;->akI:Z
 
     if-eqz v4, :cond_5
 
-    iget-object v4, v3, Lcom/google/android/gms/common/internal/ah;->akP:Lcom/google/android/gms/common/internal/ag;
+    iget-object v4, v3, Lcom/google/android/gms/common/internal/ah;->akL: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;->akO:Lcom/google/android/gms/common/internal/h$a;
+    iget-object v5, v3, Lcom/google/android/gms/common/internal/ah;->akK: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;->akP:Lcom/google/android/gms/common/internal/ag;
+    iget-object v4, v3, Lcom/google/android/gms/common/internal/ah;->akL:Lcom/google/android/gms/common/internal/ag;
 
-    iget-object v4, v4, Lcom/google/android/gms/common/internal/ag;->akH:Landroid/content/Context;
+    iget-object v4, v4, Lcom/google/android/gms/common/internal/ag;->akD: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;->akM:Z
+    iput-boolean v1, v3, Lcom/google/android/gms/common/internal/ah;->akI: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;->akG:Ljava/util/HashMap;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/ag;->akC: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 f9ccfb4e5b..c1ba212fce 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 akL:Ljava/util/Set;
+.field final akH:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -16,13 +16,13 @@
     .end annotation
 .end field
 
-.field akM:Z
+.field akI:Z
 
-.field akN:Landroid/os/IBinder;
+.field akJ:Landroid/os/IBinder;
 
-.field final akO:Lcom/google/android/gms/common/internal/h$a;
+.field final akK:Lcom/google/android/gms/common/internal/h$a;
 
-.field final synthetic akP:Lcom/google/android/gms/common/internal/ag;
+.field final synthetic akL: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;->akP:Lcom/google/android/gms/common/internal/ag;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/ah;->akL: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;->akO:Lcom/google/android/gms/common/internal/h$a;
+    iput-object p2, p0, Lcom/google/android/gms/common/internal/ah;->akK: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;->akL:Ljava/util/Set;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/ah;->akH: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;->akP:Lcom/google/android/gms/common/internal/ag;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/ah;->akL: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;->akP:Lcom/google/android/gms/common/internal/ag;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/ah;->akL: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;->akO:Lcom/google/android/gms/common/internal/h$a;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/ah;->akK:Lcom/google/android/gms/common/internal/h$a;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/internal/ah;->akP:Lcom/google/android/gms/common/internal/ag;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/ah;->akL: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;->nb()Landroid/content/Intent;
+    invoke-virtual {v0}, Lcom/google/android/gms/common/internal/h$a;->mZ()Landroid/content/Intent;
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/ah;->akL:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/ah;->akH: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;->akL:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/ah;->akH: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 nd()V
+.method public final nb()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;->akP:Lcom/google/android/gms/common/internal/ag;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/ah;->akL: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;->akP:Lcom/google/android/gms/common/internal/ag;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/ah;->akL: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;->akO:Lcom/google/android/gms/common/internal/h$a;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/ah;->akK:Lcom/google/android/gms/common/internal/h$a;
 
-    iget-object v2, p0, Lcom/google/android/gms/common/internal/ah;->akP:Lcom/google/android/gms/common/internal/ag;
+    iget-object v2, p0, Lcom/google/android/gms/common/internal/ah;->akL: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;->nb()Landroid/content/Intent;
+    invoke-virtual {v1}, Lcom/google/android/gms/common/internal/h$a;->mZ()Landroid/content/Intent;
 
     move-result-object v1
 
-    iget-object v2, 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;->akK:Lcom/google/android/gms/common/internal/h$a;
 
-    iget v2, v2, Lcom/google/android/gms/common/internal/h$a;->ajZ:I
+    iget v2, v2, Lcom/google/android/gms/common/internal/h$a;->ajV: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;->akM:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/common/internal/ah;->akI:Z
 
-    iget-boolean v0, p0, Lcom/google/android/gms/common/internal/ah;->akM:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/common/internal/ah;->akI:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/ah;->akP:Lcom/google/android/gms/common/internal/ag;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/ah;->akL: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;->akO:Lcom/google/android/gms/common/internal/h$a;
+    iget-object v2, p0, Lcom/google/android/gms/common/internal/ah;->akK: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;->akP:Lcom/google/android/gms/common/internal/ag;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/ah;->akL: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;->akP:Lcom/google/android/gms/common/internal/ag;
+    iget-object v2, p0, Lcom/google/android/gms/common/internal/ah;->akL: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;->akP:Lcom/google/android/gms/common/internal/ag;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/ah;->akL: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;->akP:Lcom/google/android/gms/common/internal/ag;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/ah;->akL: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 ne()Z
+.method public final nc()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/ah;->akL:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/ah;->akH: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;->akP:Lcom/google/android/gms/common/internal/ag;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/ah;->akL: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;->akP:Lcom/google/android/gms/common/internal/ag;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/ah;->akL: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;->akO:Lcom/google/android/gms/common/internal/h$a;
+    iget-object v2, p0, Lcom/google/android/gms/common/internal/ah;->akK: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;->akN:Landroid/os/IBinder;
+    iput-object p2, p0, Lcom/google/android/gms/common/internal/ah;->akJ: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;->akL:Ljava/util/Set;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/ah;->akH: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;->akP:Lcom/google/android/gms/common/internal/ag;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/ah;->akL: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;->akP:Lcom/google/android/gms/common/internal/ag;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/ah;->akL: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;->akO:Lcom/google/android/gms/common/internal/h$a;
+    iget-object v3, p0, Lcom/google/android/gms/common/internal/ah;->akK: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;->akN:Landroid/os/IBinder;
+    iput-object v1, p0, Lcom/google/android/gms/common/internal/ah;->akJ: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;->akL:Ljava/util/Set;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/ah;->akH: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 ae611b39cd..ff9b7c4046 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 akQ:Landroid/net/Uri;
+.field private static final akM:Landroid/net/Uri;
 
-.field private static final akR:Landroid/net/Uri;
+.field private static final akN:Landroid/net/Uri;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/common/internal/ai;->akQ:Landroid/net/Uri;
+    sput-object v0, Lcom/google/android/gms/common/internal/ai;->akM: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;->akR:Landroid/net/Uri;
+    sput-object v0, Lcom/google/android/gms/common/internal/ai;->akN:Landroid/net/Uri;
 
     return-void
 .end method
@@ -120,7 +120,7 @@
     return-object v0
 .end method
 
-.method public static nf()Landroid/content/Intent;
+.method public static nd()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 5d71a4d32e..3568a7dff3 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 ajZ:I
+.field final ajV:I
 
-.field final akS:Ljava/lang/String;
+.field final akO:Ljava/lang/String;
 
-.field final akT:Ljava/lang/String;
+.field final akP:Ljava/lang/String;
 
-.field private final akU:Z
+.field private final akQ: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;->akT:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/aj;->akP:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/google/android/gms/common/internal/aj;->akS:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/common/internal/aj;->akO:Ljava/lang/String;
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lcom/google/android/gms/common/internal/aj;->akU:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/common/internal/aj;->akQ:Z
 
     const/16 p1, 0x81
 
-    iput p1, p0, Lcom/google/android/gms/common/internal/aj;->ajZ:I
+    iput p1, p0, Lcom/google/android/gms/common/internal/aj;->ajV: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 46090a975d..a9aed87396 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 ng()Lcom/google/android/gms/a/a;
+.method public abstract ne()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 nh()I
+.method public abstract nf()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 00747d899a..4923ac3ca9 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;->nh()I
+    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/al;->nf()I
 
     move-result p1
 
@@ -82,7 +82,7 @@
     goto :goto_0
 
     :cond_1
-    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/al;->ng()Lcom/google/android/gms/a/a;
+    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/al;->ne()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 ff47c3c8d2..ca4449d790 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 ng()Lcom/google/android/gms/a/a;
+.method public final ne()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;->nQ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->nO()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -49,7 +49,7 @@
     return-object v1
 .end method
 
-.method public final nh()I
+.method public final nf()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;->nQ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->nO()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 db743b28c5..a1aa5c0235 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;->nQ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->nO()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -49,7 +49,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->nQ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->nO()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -74,7 +74,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->nQ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->nO()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 2d19992d45..20f4498377 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;->nQ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->nO()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 85604be6a2..1f3b18f3c5 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 akV:Z
+.field private static akR:Z
 
-.field private static akW:Ljava/lang/String;
+.field private static akS:Ljava/lang/String;
 
-.field private static akX:I
+.field private static akT: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;->akW:Ljava/lang/String;
+    sget-object p0, Lcom/google/android/gms/common/internal/ar;->akS: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;->akX:I
+    sget p0, Lcom/google/android/gms/common/internal/ar;->akT: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;->akV:Z
+    sget-boolean v1, Lcom/google/android/gms/common/internal/ar;->akR: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;->akV:Z
+    sput-boolean v1, Lcom/google/android/gms/common/internal/ar;->akR: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;->akW:Ljava/lang/String;
+    sput-object v1, Lcom/google/android/gms/common/internal/ar;->akS: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;->akX:I
+    sput p0, Lcom/google/android/gms/common/internal/ar;->akT: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 0d2f848872..7f1e13fdbd 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;->lP()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/common/api/Status;->lN()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 e7fe11320a..e52d79c932 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 mm()V
+.method public abstract mk()V
 .end method
 
-.method public abstract mn()V
+.method public abstract ml()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 ec7f71d674..a6789c175e 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 ajr:Lcom/google/android/gms/common/internal/c;
+.field private final synthetic ajn: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;->ajr:Lcom/google/android/gms/common/internal/c;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/c$d;->ajn: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;->lQ()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/common/ConnectionResult;->lO()Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$d;->ajr:Lcom/google/android/gms/common/internal/c;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$d;->ajn:Lcom/google/android/gms/common/internal/c;
 
     const/4 v0, 0x0
 
-    invoke-virtual {p1}, Lcom/google/android/gms/common/internal/c;->mV()Ljava/util/Set;
+    invoke-virtual {p1}, Lcom/google/android/gms/common/internal/c;->mT()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;->ajr:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$d;->ajn: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;->ajr:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$d;->ajn: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 6ca01c4b4c..33416030ea 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 mL()V
+.method public abstract mJ()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 7780e75683..b0c6186896 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 ajr:Lcom/google/android/gms/common/internal/c;
+.field private final synthetic ajn:Lcom/google/android/gms/common/internal/c;
 
-.field private final ajs:I
+.field private final ajo:I
 
-.field private final ajt:Landroid/os/Bundle;
+.field private final ajp: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;->ajr:Lcom/google/android/gms/common/internal/c;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/c$f;->ajn: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;->ajs:I
+    iput p2, p0, Lcom/google/android/gms/common/internal/c$f;->ajo:I
 
-    iput-object p3, p0, Lcom/google/android/gms/common/internal/c$f;->ajt:Landroid/os/Bundle;
+    iput-object p3, p0, Lcom/google/android/gms/common/internal/c$f;->ajp: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;->ajr:Lcom/google/android/gms/common/internal/c;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$f;->ajn: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;->ajs:I
+    iget p1, p0, Lcom/google/android/gms/common/internal/c$f;->ajo: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;->ajr:Lcom/google/android/gms/common/internal/c;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$f;->ajn: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;->ajt:Landroid/os/Bundle;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$f;->ajp: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;->ajs:I
+    iget v0, p0, Lcom/google/android/gms/common/internal/c$f;->ajo: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;->ajr:Lcom/google/android/gms/common/internal/c;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$f;->ajn: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;->ajr:Lcom/google/android/gms/common/internal/c;
+    iget-object v2, p0, Lcom/google/android/gms/common/internal/c$f;->ajn:Lcom/google/android/gms/common/internal/c;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/common/internal/c;->md()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/google/android/gms/common/internal/c;->mb()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;->ajr:Lcom/google/android/gms/common/internal/c;
+    iget-object v2, p0, Lcom/google/android/gms/common/internal/c$f;->ajn:Lcom/google/android/gms/common/internal/c;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/common/internal/c;->me()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/google/android/gms/common/internal/c;->mc()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;->mX()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/c$f;->mV()Z
 
     move-result p1
 
     if-nez p1, :cond_4
 
-    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$f;->ajr:Lcom/google/android/gms/common/internal/c;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$f;->ajn: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 mX()Z
+.method protected abstract mV()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 7bec6a7161..1d5e8b0627 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 ajr:Lcom/google/android/gms/common/internal/c;
+.field private final synthetic ajn: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;->ajr:Lcom/google/android/gms/common/internal/c;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/c$g;->ajn: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;->ajr:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$g;->ajn:Lcom/google/android/gms/common/internal/c;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/internal/c;->ajp:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v0, v0, Lcom/google/android/gms/common/internal/c;->ajl: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;->ajr:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$g;->ajn:Lcom/google/android/gms/common/internal/c;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/internal/c;->lX()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/common/internal/c;->lV()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;->ajr:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$g;->ajn: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;->ajr:Lcom/google/android/gms/common/internal/c;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$g;->ajn: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;->ajr:Lcom/google/android/gms/common/internal/c;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$g;->ajn: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;->ajr:Lcom/google/android/gms/common/internal/c;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$g;->ajn: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;->ajr:Lcom/google/android/gms/common/internal/c;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$g;->ajn: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;->ajr:Lcom/google/android/gms/common/internal/c;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$g;->ajn: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;->ajr:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$g;->ajn:Lcom/google/android/gms/common/internal/c;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/internal/c;->ajd:Lcom/google/android/gms/common/internal/c$c;
+    iget-object v0, v0, Lcom/google/android/gms/common/internal/c;->aiZ: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;->ajr:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$g;->ajn: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;->ajr:Lcom/google/android/gms/common/internal/c;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$g;->ajn: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;->ajr:Lcom/google/android/gms/common/internal/c;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$g;->ajn: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;->ajr:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$g;->ajn:Lcom/google/android/gms/common/internal/c;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/internal/c;->ajd:Lcom/google/android/gms/common/internal/c$c;
+    iget-object v0, v0, Lcom/google/android/gms/common/internal/c;->aiZ: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;->ajr:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$g;->ajn: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;->ajr:Lcom/google/android/gms/common/internal/c;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$g;->ajn:Lcom/google/android/gms/common/internal/c;
 
-    iget-object p1, p1, Lcom/google/android/gms/common/internal/c;->ajd:Lcom/google/android/gms/common/internal/c$c;
+    iget-object p1, p1, Lcom/google/android/gms/common/internal/c;->aiZ: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;->ajr:Lcom/google/android/gms/common/internal/c;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$g;->ajn: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;->ajr:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$g;->ajn: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;->ajr:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$g;->ajn: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;->ajr:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$g;->ajn: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;->mn()V
+    invoke-interface {v0}, Lcom/google/android/gms/common/internal/c$a;->ml()V
 
     :cond_b
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$g;->ajr:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$g;->ajn: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;->ajr:Lcom/google/android/gms/common/internal/c;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$g;->ajn: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;->ajr:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$g;->ajn: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;->mY()V
+    invoke-virtual {p1}, Lcom/google/android/gms/common/internal/c$h;->mW()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 795c161f5e..c5d39bae83 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 ajr:Lcom/google/android/gms/common/internal/c;
+.field private final synthetic ajn:Lcom/google/android/gms/common/internal/c;
 
-.field private aju:Ljava/lang/Object;
+.field private ajq:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TT",
@@ -34,7 +34,7 @@
     .end annotation
 .end field
 
-.field private ajv:Z
+.field private ajr:Z
 
 
 # direct methods
@@ -48,15 +48,15 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/google/android/gms/common/internal/c$h;->ajr:Lcom/google/android/gms/common/internal/c;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/c$h;->ajn: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;->aju:Ljava/lang/Object;
+    iput-object p2, p0, Lcom/google/android/gms/common/internal/c$h;->ajq:Ljava/lang/Object;
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lcom/google/android/gms/common/internal/c$h;->ajv:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/common/internal/c$h;->ajr:Z
 
     return-void
 .end method
@@ -73,15 +73,15 @@
     .end annotation
 .end method
 
-.method public final mY()V
+.method public final mW()V
     .locals 5
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$h;->aju:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$h;->ajq:Ljava/lang/Object;
 
-    iget-boolean v1, p0, Lcom/google/android/gms/common/internal/c$h;->ajv:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/common/internal/c$h;->ajr: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;->ajv:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/common/internal/c$h;->ajr: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;->aju:Ljava/lang/Object;
+    iput-object v0, p0, Lcom/google/android/gms/common/internal/c$h;->ajq: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;->ajr:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$h;->ajn: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;->ajr:Lcom/google/android/gms/common/internal/c;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/c$h;->ajn: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 6d4b5afca6..bab3b90eca 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 ajw:Lcom/google/android/gms/common/internal/c;
+.field private ajs:Lcom/google/android/gms/common/internal/c;
 
-.field private final ajx:I
+.field private final ajt: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;->ajw:Lcom/google/android/gms/common/internal/c;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/c$i;->ajs:Lcom/google/android/gms/common/internal/c;
 
-    iput p2, p0, Lcom/google/android/gms/common/internal/c$i;->ajx:I
+    iput p2, p0, Lcom/google/android/gms/common/internal/c$i;->ajt: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;->ajw:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$i;->ajs: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;->ajw:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$i;->ajs:Lcom/google/android/gms/common/internal/c;
 
-    iget v1, p0, Lcom/google/android/gms/common/internal/c$i;->ajx:I
+    iget v1, p0, Lcom/google/android/gms/common/internal/c$i;->ajt: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;->ajw:Lcom/google/android/gms/common/internal/c;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/c$i;->ajs: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;->ajw:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$i;->ajs: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;->ajw:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$i;->ajs: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;->akE:Landroid/os/Bundle;
+    iget-object p3, p3, Lcom/google/android/gms/common/internal/zzb;->akA: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 a937c308f0..cab0766c37 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 ajr:Lcom/google/android/gms/common/internal/c;
+.field private final synthetic ajn:Lcom/google/android/gms/common/internal/c;
 
-.field private final ajx:I
+.field private final ajt: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;->ajr:Lcom/google/android/gms/common/internal/c;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/c$j;->ajn: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;->ajx:I
+    iput p2, p0, Lcom/google/android/gms/common/internal/c$j;->ajt: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;->ajr:Lcom/google/android/gms/common/internal/c;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$j;->ajn: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;->ajr:Lcom/google/android/gms/common/internal/c;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$j;->ajn: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;->ajr:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$j;->ajn: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;->ajr:Lcom/google/android/gms/common/internal/c;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$j;->ajn:Lcom/google/android/gms/common/internal/c;
 
     const/4 p2, 0x0
 
-    iget v0, p0, Lcom/google/android/gms/common/internal/c$j;->ajx:I
+    iget v0, p0, Lcom/google/android/gms/common/internal/c$j;->ajt: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;->ajr:Lcom/google/android/gms/common/internal/c;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$j;->ajn: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;->ajr:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$j;->ajn: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;->ajr:Lcom/google/android/gms/common/internal/c;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$j;->ajn: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;->ajr:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$j;->ajn: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;->ajx:I
+    iget v2, p0, Lcom/google/android/gms/common/internal/c$j;->ajt: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 52fcd20d5d..57bee516a0 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 ajr:Lcom/google/android/gms/common/internal/c;
+.field private final synthetic ajn:Lcom/google/android/gms/common/internal/c;
 
-.field private final ajy:Landroid/os/IBinder;
+.field private final aju: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;->ajr:Lcom/google/android/gms/common/internal/c;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/c$k;->ajn: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;->ajy:Landroid/os/IBinder;
+    iput-object p3, p0, Lcom/google/android/gms/common/internal/c$k;->aju: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;->ajr:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$k;->ajn: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;->ajr:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$k;->ajn: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;->ajr:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$k;->ajn: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 mX()Z
+.method protected final mV()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;->ajy:Landroid/os/IBinder;
+    iget-object v2, p0, Lcom/google/android/gms/common/internal/c$k;->aju: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;->ajr:Lcom/google/android/gms/common/internal/c;
+    iget-object v3, p0, Lcom/google/android/gms/common/internal/c$k;->ajn:Lcom/google/android/gms/common/internal/c;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/common/internal/c;->me()Ljava/lang/String;
+    invoke-virtual {v3}, Lcom/google/android/gms/common/internal/c;->mc()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;->ajr:Lcom/google/android/gms/common/internal/c;
+    iget-object v3, p0, Lcom/google/android/gms/common/internal/c$k;->ajn:Lcom/google/android/gms/common/internal/c;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/common/internal/c;->me()Ljava/lang/String;
+    invoke-virtual {v3}, Lcom/google/android/gms/common/internal/c;->mc()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;->ajr:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$k;->ajn:Lcom/google/android/gms/common/internal/c;
 
-    iget-object v2, p0, Lcom/google/android/gms/common/internal/c$k;->ajy:Landroid/os/IBinder;
+    iget-object v2, p0, Lcom/google/android/gms/common/internal/c$k;->aju: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;->ajr:Lcom/google/android/gms/common/internal/c;
+    iget-object v2, p0, Lcom/google/android/gms/common/internal/c$k;->ajn: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;->ajr:Lcom/google/android/gms/common/internal/c;
+    iget-object v2, p0, Lcom/google/android/gms/common/internal/c$k;->ajn: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;->ajr:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$k;->ajn: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;->ajr:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$k;->ajn: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;->ajr:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$k;->ajn: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;->mm()V
+    invoke-interface {v0}, Lcom/google/android/gms/common/internal/c$a;->mk()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 01bb80fe36..caf602449b 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 ajr:Lcom/google/android/gms/common/internal/c;
+.field private final synthetic ajn: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;->ajr:Lcom/google/android/gms/common/internal/c;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/c$l;->ajn: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;->ajr:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$l;->ajn:Lcom/google/android/gms/common/internal/c;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/internal/c;->ajd:Lcom/google/android/gms/common/internal/c$c;
+    iget-object v0, v0, Lcom/google/android/gms/common/internal/c;->aiZ: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;->ajr:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$l;->ajn: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 mX()Z
+.method protected final mV()Z
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$l;->ajr:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$l;->ajn:Lcom/google/android/gms/common/internal/c;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/internal/c;->ajd:Lcom/google/android/gms/common/internal/c$c;
+    iget-object v0, v0, Lcom/google/android/gms/common/internal/c;->aiZ:Lcom/google/android/gms/common/internal/c$c;
 
-    sget-object v1, Lcom/google/android/gms/common/ConnectionResult;->afd:Lcom/google/android/gms/common/ConnectionResult;
+    sget-object v1, Lcom/google/android/gms/common/ConnectionResult;->aeZ: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 d763fe62c9..bd382ca0c5 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 aiR:[Lcom/google/android/gms/common/Feature;
+.field private static final aiN:[Lcom/google/android/gms/common/Feature;
 
-.field public static final ajq:[Ljava/lang/String;
+.field public static final ajm:[Ljava/lang/String;
 
 
 # instance fields
-.field private aiS:I
+.field private aiO:I
 
-.field private aiT:J
+.field private aiP:J
 
-.field private aiU:J
+.field private aiQ:J
 
-.field private aiV:I
+.field private aiR:I
 
-.field private aiW:J
+.field private aiS:J
 
-.field private aiX:Lcom/google/android/gms/common/internal/aj;
+.field private aiT:Lcom/google/android/gms/common/internal/aj;
 
-.field private final aiY:Landroid/os/Looper;
+.field private final aiU:Landroid/os/Looper;
 
-.field private final aiZ:Lcom/google/android/gms/common/internal/h;
+.field private final aiV:Lcom/google/android/gms/common/internal/h;
 
-.field private final aja:Lcom/google/android/gms/common/c;
+.field private final aiW:Lcom/google/android/gms/common/c;
 
-.field private final ajb:Ljava/lang/Object;
+.field private final aiX:Ljava/lang/Object;
 
-.field private ajc:Lcom/google/android/gms/common/internal/n;
+.field private aiY:Lcom/google/android/gms/common/internal/n;
 
-.field protected ajd:Lcom/google/android/gms/common/internal/c$c;
+.field protected aiZ:Lcom/google/android/gms/common/internal/c$c;
 
-.field private aje:Landroid/os/IInterface;
+.field private aja:Landroid/os/IInterface;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TT;"
@@ -69,7 +69,7 @@
     .end annotation
 .end field
 
-.field private final ajf:Ljava/util/ArrayList;
+.field private final ajb:Ljava/util/ArrayList;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/ArrayList<",
@@ -79,7 +79,7 @@
     .end annotation
 .end field
 
-.field private ajg:Lcom/google/android/gms/common/internal/c$j;
+.field private ajc: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 ajh:I
+.field private ajd:I
 
-.field private final aji:Lcom/google/android/gms/common/internal/c$a;
+.field private final aje:Lcom/google/android/gms/common/internal/c$a;
 
-.field private final ajj:Lcom/google/android/gms/common/internal/c$b;
+.field private final ajf:Lcom/google/android/gms/common/internal/c$b;
 
-.field private final ajk:I
+.field private final ajg:I
 
-.field private final ajl:Ljava/lang/String;
+.field private final ajh:Ljava/lang/String;
 
-.field private ajm:Lcom/google/android/gms/common/ConnectionResult;
+.field private aji:Lcom/google/android/gms/common/ConnectionResult;
 
-.field private ajn:Z
+.field private ajj:Z
 
-.field private volatile ajo:Lcom/google/android/gms/common/internal/zzb;
+.field private volatile ajk:Lcom/google/android/gms/common/internal/zzb;
 
-.field protected ajp:Ljava/util/concurrent/atomic/AtomicInteger;
+.field protected ajl: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;->aiR:[Lcom/google/android/gms/common/Feature;
+    sput-object v1, Lcom/google/android/gms/common/internal/c;->aiN:[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;->ajq:[Ljava/lang/String;
+    sput-object v1, Lcom/google/android/gms/common/internal/c;->ajm:[Ljava/lang/String;
 
     return-void
 .end method
@@ -148,7 +148,7 @@
 
     move-result-object v3
 
-    invoke-static {}, Lcom/google/android/gms/common/c;->lU()Lcom/google/android/gms/common/c;
+    invoke-static {}, Lcom/google/android/gms/common/c;->lS()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;->ajb:Ljava/lang/Object;
+    iput-object v0, p0, Lcom/google/android/gms/common/internal/c;->aiX: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;->ajf:Ljava/util/ArrayList;
+    iput-object v0, p0, Lcom/google/android/gms/common/internal/c;->ajb:Ljava/util/ArrayList;
 
     const/4 v0, 0x1
 
-    iput v0, p0, Lcom/google/android/gms/common/internal/c;->ajh:I
+    iput v0, p0, Lcom/google/android/gms/common/internal/c;->ajd:I
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/google/android/gms/common/internal/c;->ajm:Lcom/google/android/gms/common/ConnectionResult;
+    iput-object v0, p0, Lcom/google/android/gms/common/internal/c;->aji:Lcom/google/android/gms/common/ConnectionResult;
 
     const/4 v1, 0x0
 
-    iput-boolean v1, p0, Lcom/google/android/gms/common/internal/c;->ajn:Z
+    iput-boolean v1, p0, Lcom/google/android/gms/common/internal/c;->ajj:Z
 
-    iput-object v0, p0, Lcom/google/android/gms/common/internal/c;->ajo:Lcom/google/android/gms/common/internal/zzb;
+    iput-object v0, p0, Lcom/google/android/gms/common/internal/c;->ajk: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;->ajp:Ljava/util/concurrent/atomic/AtomicInteger;
+    iput-object v0, p0, Lcom/google/android/gms/common/internal/c;->ajl: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;->aiY:Landroid/os/Looper;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/c;->aiU: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;->aiZ:Lcom/google/android/gms/common/internal/h;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/c;->aiV: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;->aja:Lcom/google/android/gms/common/c;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/c;->aiW: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;->ajk:I
+    iput p5, p0, Lcom/google/android/gms/common/internal/c;->ajg:I
 
-    iput-object p6, p0, Lcom/google/android/gms/common/internal/c;->aji:Lcom/google/android/gms/common/internal/c$a;
+    iput-object p6, p0, Lcom/google/android/gms/common/internal/c;->aje:Lcom/google/android/gms/common/internal/c$a;
 
-    iput-object p7, p0, Lcom/google/android/gms/common/internal/c;->ajj:Lcom/google/android/gms/common/internal/c$b;
+    iput-object p7, p0, Lcom/google/android/gms/common/internal/c;->ajf:Lcom/google/android/gms/common/internal/c$b;
 
-    iput-object p8, p0, Lcom/google/android/gms/common/internal/c;->ajl:Ljava/lang/String;
+    iput-object p8, p0, Lcom/google/android/gms/common/internal/c;->ajh: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;->ajm:Lcom/google/android/gms/common/ConnectionResult;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/c;->aji: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;->ajc:Lcom/google/android/gms/common/internal/n;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/c;->aiY: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;->ajh:I
+    iput p1, p0, Lcom/google/android/gms/common/internal/c;->ajd:I
 
-    iput-object p2, p0, Lcom/google/android/gms/common/internal/c;->aje:Landroid/os/IInterface;
+    iput-object p2, p0, Lcom/google/android/gms/common/internal/c;->aja: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;->ajg:Lcom/google/android/gms/common/internal/c$j;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c;->ajc:Lcom/google/android/gms/common/internal/c$j;
 
     if-eqz p1, :cond_5
 
-    iget-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;->aiT: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;->aiX:Lcom/google/android/gms/common/internal/aj;
+    iget-object p2, p0, Lcom/google/android/gms/common/internal/c;->aiT:Lcom/google/android/gms/common/internal/aj;
 
-    iget-object p2, p2, Lcom/google/android/gms/common/internal/aj;->akS:Ljava/lang/String;
+    iget-object p2, p2, Lcom/google/android/gms/common/internal/aj;->akO:Ljava/lang/String;
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/c;->aiX:Lcom/google/android/gms/common/internal/aj;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c;->aiT:Lcom/google/android/gms/common/internal/aj;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/internal/aj;->akT:Ljava/lang/String;
+    iget-object v0, v0, Lcom/google/android/gms/common/internal/aj;->akP: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;->aiZ:Lcom/google/android/gms/common/internal/h;
+    iget-object v4, p0, Lcom/google/android/gms/common/internal/c;->aiV:Lcom/google/android/gms/common/internal/h;
 
-    iget-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;->aiT:Lcom/google/android/gms/common/internal/aj;
 
-    iget-object v5, p1, Lcom/google/android/gms/common/internal/aj;->akS:Ljava/lang/String;
+    iget-object v5, p1, Lcom/google/android/gms/common/internal/aj;->akO:Ljava/lang/String;
 
-    iget-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;->aiT:Lcom/google/android/gms/common/internal/aj;
 
-    iget-object v6, p1, Lcom/google/android/gms/common/internal/aj;->akT:Ljava/lang/String;
+    iget-object v6, p1, Lcom/google/android/gms/common/internal/aj;->akP:Ljava/lang/String;
 
-    iget-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;->aiT:Lcom/google/android/gms/common/internal/aj;
 
-    iget v7, p1, Lcom/google/android/gms/common/internal/aj;->ajZ:I
+    iget v7, p1, Lcom/google/android/gms/common/internal/aj;->ajV:I
 
-    iget-object v8, p0, Lcom/google/android/gms/common/internal/c;->ajg:Lcom/google/android/gms/common/internal/c$j;
+    iget-object v8, p0, Lcom/google/android/gms/common/internal/c;->ajc:Lcom/google/android/gms/common/internal/c$j;
 
-    invoke-direct {p0}, Lcom/google/android/gms/common/internal/c;->mQ()Ljava/lang/String;
+    invoke-direct {p0}, Lcom/google/android/gms/common/internal/c;->mO()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;->ajp:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c;->ajl: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;->ajp:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object p2, p0, Lcom/google/android/gms/common/internal/c;->ajl: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;->ajg:Lcom/google/android/gms/common/internal/c$j;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/c;->ajc: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;->md()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/c;->mb()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;->aiX:Lcom/google/android/gms/common/internal/aj;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/c;->aiT:Lcom/google/android/gms/common/internal/aj;
 
-    iget-object p1, 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;->aiV:Lcom/google/android/gms/common/internal/h;
 
-    iget-object p2, p0, Lcom/google/android/gms/common/internal/c;->aiX:Lcom/google/android/gms/common/internal/aj;
+    iget-object p2, p0, Lcom/google/android/gms/common/internal/c;->aiT:Lcom/google/android/gms/common/internal/aj;
 
-    iget-object p2, p2, Lcom/google/android/gms/common/internal/aj;->akS:Ljava/lang/String;
+    iget-object p2, p2, Lcom/google/android/gms/common/internal/aj;->akO:Ljava/lang/String;
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/c;->aiX:Lcom/google/android/gms/common/internal/aj;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c;->aiT:Lcom/google/android/gms/common/internal/aj;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/internal/aj;->akT:Ljava/lang/String;
+    iget-object v0, v0, Lcom/google/android/gms/common/internal/aj;->akP:Ljava/lang/String;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/internal/c;->aiX:Lcom/google/android/gms/common/internal/aj;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/c;->aiT:Lcom/google/android/gms/common/internal/aj;
 
-    iget v1, v1, Lcom/google/android/gms/common/internal/aj;->ajZ:I
+    iget v1, v1, Lcom/google/android/gms/common/internal/aj;->ajV:I
 
-    iget-object v2, p0, Lcom/google/android/gms/common/internal/c;->ajg:Lcom/google/android/gms/common/internal/c$j;
+    iget-object v2, p0, Lcom/google/android/gms/common/internal/c;->ajc:Lcom/google/android/gms/common/internal/c$j;
 
-    invoke-direct {p0}, Lcom/google/android/gms/common/internal/c;->mQ()Ljava/lang/String;
+    invoke-direct {p0}, Lcom/google/android/gms/common/internal/c;->mO()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;->aiX:Lcom/google/android/gms/common/internal/aj;
+    iget-object p2, p0, Lcom/google/android/gms/common/internal/c;->aiT:Lcom/google/android/gms/common/internal/aj;
 
-    iget-object p2, p2, Lcom/google/android/gms/common/internal/aj;->akS:Ljava/lang/String;
+    iget-object p2, p2, Lcom/google/android/gms/common/internal/aj;->akO:Ljava/lang/String;
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/c;->aiX:Lcom/google/android/gms/common/internal/aj;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c;->aiT:Lcom/google/android/gms/common/internal/aj;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/internal/aj;->akT:Ljava/lang/String;
+    iget-object v0, v0, Lcom/google/android/gms/common/internal/aj;->akP: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;->ajp:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object p2, p0, Lcom/google/android/gms/common/internal/c;->ajl: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;->ajg:Lcom/google/android/gms/common/internal/c$j;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c;->ajc:Lcom/google/android/gms/common/internal/c$j;
 
     if-eqz p1, :cond_7
 
-    iget-object v4, p0, Lcom/google/android/gms/common/internal/c;->aiZ:Lcom/google/android/gms/common/internal/h;
+    iget-object v4, p0, Lcom/google/android/gms/common/internal/c;->aiV:Lcom/google/android/gms/common/internal/h;
 
-    iget-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;->aiT:Lcom/google/android/gms/common/internal/aj;
 
-    iget-object v5, p1, Lcom/google/android/gms/common/internal/aj;->akS:Ljava/lang/String;
+    iget-object v5, p1, Lcom/google/android/gms/common/internal/aj;->akO:Ljava/lang/String;
 
-    iget-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;->aiT:Lcom/google/android/gms/common/internal/aj;
 
-    iget-object v6, p1, Lcom/google/android/gms/common/internal/aj;->akT:Ljava/lang/String;
+    iget-object v6, p1, Lcom/google/android/gms/common/internal/aj;->akP:Ljava/lang/String;
 
-    iget-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;->aiT:Lcom/google/android/gms/common/internal/aj;
 
-    iget v7, p1, Lcom/google/android/gms/common/internal/aj;->ajZ:I
+    iget v7, p1, Lcom/google/android/gms/common/internal/aj;->ajV:I
 
-    iget-object v8, p0, Lcom/google/android/gms/common/internal/c;->ajg:Lcom/google/android/gms/common/internal/c$j;
+    iget-object v8, p0, Lcom/google/android/gms/common/internal/c;->ajc:Lcom/google/android/gms/common/internal/c$j;
 
-    invoke-direct {p0}, Lcom/google/android/gms/common/internal/c;->mQ()Ljava/lang/String;
+    invoke-direct {p0}, Lcom/google/android/gms/common/internal/c;->mO()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;->ajg:Lcom/google/android/gms/common/internal/c$j;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/c;->ajc: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;->mS()Z
+    invoke-direct {p0}, Lcom/google/android/gms/common/internal/c;->mQ()Z
 
     move-result v0
 
@@ -639,7 +639,7 @@
 
     const/4 v1, 0x1
 
-    iput-boolean v1, p0, Lcom/google/android/gms/common/internal/c;->ajn:Z
+    iput-boolean v1, p0, Lcom/google/android/gms/common/internal/c;->ajj: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;->ajp:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object p0, p0, Lcom/google/android/gms/common/internal/c;->ajl: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;->ajo:Lcom/google/android/gms/common/internal/zzb;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/c;->ajk: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;->ajh:I
+    iget v1, p0, Lcom/google/android/gms/common/internal/c;->ajd: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;->ajb:Ljava/lang/Object;
+    iget-object p0, p0, Lcom/google/android/gms/common/internal/c;->aiX: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;->mW()Z
+    invoke-direct {p0}, Lcom/google/android/gms/common/internal/c;->mU()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;->ajn:Z
+    iget-boolean p0, p0, Lcom/google/android/gms/common/internal/c;->ajj: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;->ajm:Lcom/google/android/gms/common/ConnectionResult;
+    iget-object p0, p0, Lcom/google/android/gms/common/internal/c;->aji: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;->aji:Lcom/google/android/gms/common/internal/c$a;
+    iget-object p0, p0, Lcom/google/android/gms/common/internal/c;->aje: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;->ajf:Ljava/util/ArrayList;
+    iget-object p0, p0, Lcom/google/android/gms/common/internal/c;->ajb: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;->ajj:Lcom/google/android/gms/common/internal/c$b;
+    iget-object p0, p0, Lcom/google/android/gms/common/internal/c;->ajf:Lcom/google/android/gms/common/internal/c$b;
 
     return-object p0
 .end method
 
-.method private final mQ()Ljava/lang/String;
+.method private final mO()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/c;->ajl:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c;->ajh:Ljava/lang/String;
 
     if-nez v0, :cond_0
 
@@ -815,7 +815,7 @@
     return-object v0
 .end method
 
-.method private final mS()Z
+.method private final mQ()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;->ajh:I
+    iget v1, p0, Lcom/google/android/gms/common/internal/c;->ajd:I
 
     const/4 v2, 0x3
 
@@ -851,10 +851,10 @@
     throw v1
 .end method
 
-.method private final mW()Z
+.method private final mU()Z
     .locals 2
 
-    iget-boolean v0, p0, Lcom/google/android/gms/common/internal/c;->ajn:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/common/internal/c;->ajj:Z
 
     const/4 v1, 0x0
 
@@ -863,7 +863,7 @@
     return v1
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/c;->me()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/c;->mc()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;->me()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/c;->mc()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;->aiU:J
+    iput-wide v0, p0, Lcom/google/android/gms/common/internal/c;->aiQ: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;->aiV:I
+    iput p1, p0, Lcom/google/android/gms/common/internal/c;->aiR:I
 
     invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
 
     move-result-wide v0
 
-    iput-wide v0, p0, Lcom/google/android/gms/common/internal/c;->aiW:J
+    iput-wide v0, p0, Lcom/google/android/gms/common/internal/c;->aiS: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;->ajd:Lcom/google/android/gms/common/internal/c$c;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/c;->aiZ: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;->mL()V
+    invoke-interface {p1}, Lcom/google/android/gms/common/internal/c$e;->mJ()V
 
     return-void
 .end method
@@ -1013,13 +1013,13 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/c;->mT()Landroid/os/Bundle;
+    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/c;->mR()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;->ajk:I
+    iget v2, p0, Lcom/google/android/gms/common/internal/c;->ajg: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;->ajQ:Landroid/os/Bundle;
+    iput-object v0, v1, Lcom/google/android/gms/common/internal/GetServiceRequest;->ajM: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;->ajP:[Lcom/google/android/gms/common/api/Scope;
+    iput-object p2, v1, Lcom/google/android/gms/common/internal/GetServiceRequest;->ajL:[Lcom/google/android/gms/common/api/Scope;
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/c;->lY()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/c;->lW()Z
 
     move-result p2
 
     if-eqz p2, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/c;->lV()Landroid/accounts/Account;
+    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/c;->lT()Landroid/accounts/Account;
 
     move-result-object p2
 
     if-eqz p2, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/c;->lV()Landroid/accounts/Account;
+    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/c;->lT()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;->ajR:Landroid/accounts/Account;
+    iput-object p2, v1, Lcom/google/android/gms/common/internal/GetServiceRequest;->ajN: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;->ajO:Landroid/os/IBinder;
+    iput-object p1, v1, Lcom/google/android/gms/common/internal/GetServiceRequest;->ajK:Landroid/os/IBinder;
 
     :cond_2
-    sget-object p1, Lcom/google/android/gms/common/internal/c;->aiR:[Lcom/google/android/gms/common/Feature;
+    sget-object p1, Lcom/google/android/gms/common/internal/c;->aiN:[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;->ajO:[Lcom/google/android/gms/common/Feature;
 
-    iput-object p1, v1, Lcom/google/android/gms/common/internal/GetServiceRequest;->ajT:[Lcom/google/android/gms/common/Feature;
+    iput-object p1, v1, Lcom/google/android/gms/common/internal/GetServiceRequest;->ajP:[Lcom/google/android/gms/common/Feature;
 
     :try_start_0
-    iget-object p1, p0, Lcom/google/android/gms/common/internal/c;->ajb:Ljava/lang/Object;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c;->aiX: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;->ajc:Lcom/google/android/gms/common/internal/n;
+    iget-object p2, p0, Lcom/google/android/gms/common/internal/c;->aiY:Lcom/google/android/gms/common/internal/n;
 
     if-eqz p2, :cond_3
 
-    iget-object p2, p0, Lcom/google/android/gms/common/internal/c;->ajc:Lcom/google/android/gms/common/internal/n;
+    iget-object p2, p0, Lcom/google/android/gms/common/internal/c;->aiY: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;->ajp:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v2, p0, Lcom/google/android/gms/common/internal/c;->ajl: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;->ajp:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object p2, p0, Lcom/google/android/gms/common/internal/c;->ajl: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;->ajp:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c;->ajl: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;->aiS:I
+    iput p1, p0, Lcom/google/android/gms/common/internal/c;->aiO:I
 
     invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
 
     move-result-wide v0
 
-    iput-wide v0, p0, Lcom/google/android/gms/common/internal/c;->aiT:J
+    iput-wide v0, p0, Lcom/google/android/gms/common/internal/c;->aiP: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;->ajp:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c;->ajl: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;->ajf:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c;->ajb:Ljava/util/ArrayList;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/common/internal/c;->ajf:Ljava/util/ArrayList;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/c;->ajb: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;->ajf:Ljava/util/ArrayList;
+    iget-object v3, p0, Lcom/google/android/gms/common/internal/c;->ajb: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;->ajf:Ljava/util/ArrayList;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/c;->ajb: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;->ajb:Ljava/lang/Object;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/c;->aiX:Ljava/lang/Object;
 
     monitor-enter v1
 
     const/4 v0, 0x0
 
     :try_start_1
-    iput-object v0, p0, Lcom/google/android/gms/common/internal/c;->ajc:Lcom/google/android/gms/common/internal/n;
+    iput-object v0, p0, Lcom/google/android/gms/common/internal/c;->aiY: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;->ajh:I
+    iget v1, p0, Lcom/google/android/gms/common/internal/c;->ajd:I
 
     const/4 v2, 0x4
 
@@ -1367,7 +1367,7 @@
     throw v1
 .end method
 
-.method public lV()Landroid/accounts/Account;
+.method public lT()Landroid/accounts/Account;
     .locals 1
 
     const/4 v0, 0x0
@@ -1375,7 +1375,7 @@
     return-object v0
 .end method
 
-.method public final lX()Z
+.method public final lV()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;->ajh:I
+    iget v1, p0, Lcom/google/android/gms/common/internal/c;->ajd:I
 
     const/4 v2, 0x2
 
     if-eq v1, v2, :cond_1
 
-    iget v1, p0, Lcom/google/android/gms/common/internal/c;->ajh:I
+    iget v1, p0, Lcom/google/android/gms/common/internal/c;->ajd:I
 
     const/4 v2, 0x3
 
@@ -1421,7 +1421,7 @@
     throw v1
 .end method
 
-.method public lY()Z
+.method public lW()Z
     .locals 1
 
     const/4 v0, 0x0
@@ -1429,7 +1429,7 @@
     return v0
 .end method
 
-.method public lZ()Z
+.method public lX()Z
     .locals 1
 
     const/4 v0, 0x1
@@ -1437,14 +1437,49 @@
     return v0
 .end method
 
-.method public final mR()V
+.method public final lY()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;->aiT:Lcom/google/android/gms/common/internal/aj;
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, v0, Lcom/google/android/gms/common/internal/aj;->akP: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 lZ()I
+    .locals 1
+
+    sget v0, Lcom/google/android/gms/common/c;->GOOGLE_PLAY_SERVICES_VERSION_CODE:I
+
+    return v0
+.end method
+
+.method public final mP()V
     .locals 5
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/c;->aja:Lcom/google/android/gms/common/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c;->aiW: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;->mb()I
+    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/c;->lZ()I
 
     move-result v2
 
@@ -1472,13 +1507,13 @@
 
     check-cast v1, 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;
+    iput-object v1, p0, Lcom/google/android/gms/common/internal/c;->aiZ: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;->ajp:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v4, p0, Lcom/google/android/gms/common/internal/c;->ajl:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {v4}, Ljava/util/concurrent/atomic/AtomicInteger;->get()I
 
@@ -1502,7 +1537,7 @@
     return-void
 .end method
 
-.method public mT()Landroid/os/Bundle;
+.method public mR()Landroid/os/Bundle;
     .locals 1
 
     new-instance v0, Landroid/os/Bundle;
@@ -1512,7 +1547,7 @@
     return-object v0
 .end method
 
-.method public final mU()Landroid/os/IInterface;
+.method public final mS()Landroid/os/IInterface;
     .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -1531,7 +1566,7 @@
     monitor-enter v0
 
     :try_start_0
-    iget v1, p0, Lcom/google/android/gms/common/internal/c;->ajh:I
+    iget v1, p0, Lcom/google/android/gms/common/internal/c;->ajd:I
 
     const/4 v2, 0x5
 
@@ -1543,7 +1578,7 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/common/internal/c;->aje:Landroid/os/IInterface;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/c;->aja:Landroid/os/IInterface;
 
     if-eqz v1, :cond_0
 
@@ -1559,7 +1594,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;->aje:Landroid/os/IInterface;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/c;->aja:Landroid/os/IInterface;
 
     monitor-exit v0
 
@@ -1591,7 +1626,7 @@
     throw v1
 .end method
 
-.method protected mV()Ljava/util/Set;
+.method protected mT()Ljava/util/Set;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -1607,45 +1642,10 @@
     return-object v0
 .end method
 
-.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 public mb()I
+.method public final ma()[Lcom/google/android/gms/common/Feature;
     .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;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c;->ajk:Lcom/google/android/gms/common/internal/zzb;
 
     if-nez v0, :cond_0
 
@@ -1654,15 +1654,15 @@
     return-object v0
 
     :cond_0
-    iget-object v0, v0, Lcom/google/android/gms/common/internal/zzb;->akF:[Lcom/google/android/gms/common/Feature;
+    iget-object v0, v0, Lcom/google/android/gms/common/internal/zzb;->akB:[Lcom/google/android/gms/common/Feature;
 
     return-object v0
 .end method
 
-.method protected abstract md()Ljava/lang/String;
+.method protected abstract mb()Ljava/lang/String;
 .end method
 
-.method protected abstract me()Ljava/lang/String;
+.method protected abstract mc()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 464f6c065a..f6d9874aaa 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,7 +14,29 @@
 
 
 # instance fields
-.field private ajC:Ljava/util/Map;
+.field private ajA:Landroid/view/View;
+
+.field public ajB:Ljava/lang/String;
+
+.field public ajC:Ljava/lang/String;
+
+.field private ajD:Lcom/google/android/gms/signin/a;
+
+.field private ajE:Z
+
+.field public ajG: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 ajv:Landroid/accounts/Account;
+
+.field private ajy:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -26,29 +48,7 @@
     .end annotation
 .end field
 
-.field private ajD:I
-
-.field private ajE:Landroid/view/View;
-
-.field public ajF:Ljava/lang/String;
-
-.field public ajG:Ljava/lang/String;
-
-.field private ajH:Lcom/google/android/gms/signin/a;
-
-.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;
+.field private ajz:I
 
 
 # direct methods
@@ -59,39 +59,39 @@
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lcom/google/android/gms/common/internal/d$a;->ajD:I
+    iput v0, p0, Lcom/google/android/gms/common/internal/d$a;->ajz:I
 
-    sget-object v0, Lcom/google/android/gms/signin/a;->aLp:Lcom/google/android/gms/signin/a;
+    sget-object v0, Lcom/google/android/gms/signin/a;->aLl: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;
+    iput-object v0, p0, Lcom/google/android/gms/common/internal/d$a;->ajD:Lcom/google/android/gms/signin/a;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final mZ()Lcom/google/android/gms/common/internal/d;
+.method public final mX()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;->ajz:Landroid/accounts/Account;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/d$a;->ajv:Landroid/accounts/Account;
 
-    iget-object v2, p0, Lcom/google/android/gms/common/internal/d$a;->ajK:Landroidx/collection/ArraySet;
+    iget-object v2, p0, Lcom/google/android/gms/common/internal/d$a;->ajG:Landroidx/collection/ArraySet;
 
-    iget-object v3, p0, Lcom/google/android/gms/common/internal/d$a;->ajC:Ljava/util/Map;
+    iget-object v3, p0, Lcom/google/android/gms/common/internal/d$a;->ajy:Ljava/util/Map;
 
-    iget v4, p0, Lcom/google/android/gms/common/internal/d$a;->ajD:I
+    iget v4, p0, Lcom/google/android/gms/common/internal/d$a;->ajz:I
 
-    iget-object v5, p0, Lcom/google/android/gms/common/internal/d$a;->ajE:Landroid/view/View;
+    iget-object v5, p0, Lcom/google/android/gms/common/internal/d$a;->ajA:Landroid/view/View;
 
-    iget-object v6, p0, Lcom/google/android/gms/common/internal/d$a;->ajF:Ljava/lang/String;
+    iget-object v6, p0, Lcom/google/android/gms/common/internal/d$a;->ajB:Ljava/lang/String;
 
-    iget-object v7, p0, Lcom/google/android/gms/common/internal/d$a;->ajG:Ljava/lang/String;
+    iget-object v7, p0, Lcom/google/android/gms/common/internal/d$a;->ajC:Ljava/lang/String;
 
-    iget-object v8, p0, Lcom/google/android/gms/common/internal/d$a;->ajH:Lcom/google/android/gms/signin/a;
+    iget-object v8, p0, Lcom/google/android/gms/common/internal/d$a;->ajD:Lcom/google/android/gms/signin/a;
 
-    iget-boolean v9, p0, Lcom/google/android/gms/common/internal/d$a;->ajI:Z
+    iget-boolean v9, p0, Lcom/google/android/gms/common/internal/d$a;->ajE: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 660ec17edd..628d39bd34 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 ahD:Ljava/util/Set;
+.field public final ahz: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 87da7ff733..0667864564 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,7 +12,21 @@
 
 
 # instance fields
-.field public final ajA:Ljava/util/Set;
+.field private final ajA:Landroid/view/View;
+
+.field public final ajB:Ljava/lang/String;
+
+.field final ajC:Ljava/lang/String;
+
+.field public final ajD:Lcom/google/android/gms/signin/a;
+
+.field private final ajE:Z
+
+.field public ajF:Ljava/lang/Integer;
+
+.field public final ajv:Landroid/accounts/Account;
+
+.field public final ajw:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -22,7 +36,7 @@
     .end annotation
 .end field
 
-.field final ajB:Ljava/util/Set;
+.field final ajx:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -32,7 +46,7 @@
     .end annotation
 .end field
 
-.field private final ajC:Ljava/util/Map;
+.field private final ajy:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -44,21 +58,7 @@
     .end annotation
 .end field
 
-.field private final ajD:I
-
-.field private final ajE:Landroid/view/View;
-
-.field public final ajF:Ljava/lang/String;
-
-.field final ajG:Ljava/lang/String;
-
-.field public final ajH:Lcom/google/android/gms/signin/a;
-
-.field private final ajI:Z
-
-.field public ajJ:Ljava/lang/Integer;
-
-.field public final ajz:Landroid/accounts/Account;
+.field private final ajz:I
 
 
 # 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;->ajz:Landroid/accounts/Account;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/d;->ajv: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;->ajA:Ljava/util/Set;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/d;->ajw: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;->ajC:Ljava/util/Map;
+    iput-object p3, p0, Lcom/google/android/gms/common/internal/d;->ajy:Ljava/util/Map;
 
-    iput-object p5, p0, Lcom/google/android/gms/common/internal/d;->ajE:Landroid/view/View;
+    iput-object p5, p0, Lcom/google/android/gms/common/internal/d;->ajA:Landroid/view/View;
 
-    iput p4, p0, Lcom/google/android/gms/common/internal/d;->ajD:I
+    iput p4, p0, Lcom/google/android/gms/common/internal/d;->ajz:I
 
-    iput-object p6, p0, Lcom/google/android/gms/common/internal/d;->ajF:Ljava/lang/String;
+    iput-object p6, p0, Lcom/google/android/gms/common/internal/d;->ajB:Ljava/lang/String;
 
-    iput-object p7, p0, Lcom/google/android/gms/common/internal/d;->ajG:Ljava/lang/String;
+    iput-object p7, p0, Lcom/google/android/gms/common/internal/d;->ajC:Ljava/lang/String;
 
-    iput-object p8, p0, Lcom/google/android/gms/common/internal/d;->ajH:Lcom/google/android/gms/signin/a;
+    iput-object p8, p0, Lcom/google/android/gms/common/internal/d;->ajD:Lcom/google/android/gms/signin/a;
 
-    iput-boolean p9, p0, Lcom/google/android/gms/common/internal/d;->ajI:Z
+    iput-boolean p9, p0, Lcom/google/android/gms/common/internal/d;->ajE:Z
 
     new-instance p1, Ljava/util/HashSet;
 
-    iget-object p2, p0, Lcom/google/android/gms/common/internal/d;->ajA:Ljava/util/Set;
+    iget-object p2, p0, Lcom/google/android/gms/common/internal/d;->ajw: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;->ajC:Ljava/util/Map;
+    iget-object p2, p0, Lcom/google/android/gms/common/internal/d;->ajy: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;->ahD:Ljava/util/Set;
+    iget-object p3, p3, Lcom/google/android/gms/common/internal/d$b;->ahz: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;->ajB:Ljava/util/Set;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/d;->ajx: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 6c81034e4e..05fcef2963 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 ajL:Landroidx/collection/SimpleArrayMap;
+.field private static final ajH: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;->ajL:Landroidx/collection/SimpleArrayMap;
+    sput-object v0, Lcom/google/android/gms/common/internal/e;->ajH: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;->ajL:Landroidx/collection/SimpleArrayMap;
+    sget-object v0, Lcom/google/android/gms/common/internal/e;->ajH:Landroidx/collection/SimpleArrayMap;
 
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/android/gms/common/internal/e;->ajL:Landroidx/collection/SimpleArrayMap;
+    sget-object v1, Lcom/google/android/gms/common/internal/e;->ajH: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;->ajL:Landroidx/collection/SimpleArrayMap;
+    sget-object v1, Lcom/google/android/gms/common/internal/e;->ajH: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 fbdb5985d7..26ba51d66a 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 na()V
+.method protected abstract mY()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;->na()V
+    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/f;->mY()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 e0f7b48ebf..a69d7db46e 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,9 @@
 
 
 # instance fields
-.field private final ahD:Ljava/util/Set;
+.field private final ahA:Lcom/google/android/gms/common/internal/d;
+
+.field private final ahz:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -29,9 +31,7 @@
     .end annotation
 .end field
 
-.field private final ahE:Lcom/google/android/gms/common/internal/d;
-
-.field private final ajz:Landroid/accounts/Account;
+.field private final ajv:Landroid/accounts/Account;
 
 
 # direct methods
@@ -42,7 +42,7 @@
 
     move-result-object v3
 
-    invoke-static {}, Lcom/google/android/gms/common/GoogleApiAvailability;->lS()Lcom/google/android/gms/common/GoogleApiAvailability;
+    invoke-static {}, Lcom/google/android/gms/common/GoogleApiAvailability;->lQ()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;->ajG:Ljava/lang/String;
+    iget-object v8, v10, Lcom/google/android/gms/common/internal/d;->ajC: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;->ahE:Lcom/google/android/gms/common/internal/d;
+    iput-object v10, v9, Lcom/google/android/gms/common/internal/g;->ahA:Lcom/google/android/gms/common/internal/d;
 
-    iget-object v0, v10, Lcom/google/android/gms/common/internal/d;->ajz:Landroid/accounts/Account;
+    iget-object v0, v10, Lcom/google/android/gms/common/internal/d;->ajv:Landroid/accounts/Account;
 
-    iput-object v0, v9, Lcom/google/android/gms/common/internal/g;->ajz:Landroid/accounts/Account;
+    iput-object v0, v9, Lcom/google/android/gms/common/internal/g;->ajv:Landroid/accounts/Account;
 
-    iget-object v0, v10, Lcom/google/android/gms/common/internal/d;->ajB:Ljava/util/Set;
+    iget-object v0, v10, Lcom/google/android/gms/common/internal/d;->ajx:Ljava/util/Set;
 
     invoke-interface {v0}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
 
@@ -177,22 +177,32 @@
     throw v0
 
     :cond_3
-    iput-object v0, v9, Lcom/google/android/gms/common/internal/g;->ahD:Ljava/util/Set;
+    iput-object v0, v9, Lcom/google/android/gms/common/internal/g;->ahz:Ljava/util/Set;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final lV()Landroid/accounts/Account;
+.method public final lT()Landroid/accounts/Account;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/g;->ajz:Landroid/accounts/Account;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/g;->ajv:Landroid/accounts/Account;
 
     return-object v0
 .end method
 
-.method protected final mV()Ljava/util/Set;
+.method public lZ()I
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/common/internal/c;->lZ()I
+
+    move-result v0
+
+    return v0
+.end method
+
+.method protected final mT()Ljava/util/Set;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -203,17 +213,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/g;->ahD:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/g;->ahz: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 168da002ca..509de0ae5f 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 ajX:Ljava/lang/String;
+.field private final ajT:Ljava/lang/String;
 
-.field final ajY:Ljava/lang/String;
+.field final ajU:Ljava/lang/String;
 
-.field final ajZ:I
+.field final ajV: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;->ajX:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/h$a;->ajT: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;->ajY:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/h$a;->ajU: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;->ajZ:I
+    iput p3, p0, Lcom/google/android/gms/common/internal/h$a;->ajV: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;->ajX:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/h$a;->ajT:Ljava/lang/String;
 
-    iget-object v3, p1, Lcom/google/android/gms/common/internal/h$a;->ajX:Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/common/internal/h$a;->ajT: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;->ajY:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/h$a;->ajU:Ljava/lang/String;
 
-    iget-object v3, p1, Lcom/google/android/gms/common/internal/h$a;->ajY:Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/common/internal/h$a;->ajU: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;->ajZ:I
+    iget v1, p0, Lcom/google/android/gms/common/internal/h$a;->ajV:I
 
-    iget p1, p1, Lcom/google/android/gms/common/internal/h$a;->ajZ:I
+    iget p1, p1, Lcom/google/android/gms/common/internal/h$a;->ajV: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;->ajX:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/h$a;->ajT:Ljava/lang/String;
 
     const/4 v2, 0x0
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/google/android/gms/common/internal/h$a;->ajY:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/h$a;->ajU: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;->ajZ:I
+    iget v1, p0, Lcom/google/android/gms/common/internal/h$a;->ajV:I
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -157,10 +157,10 @@
     return v0
 .end method
 
-.method public final nb()Landroid/content/Intent;
+.method public final mZ()Landroid/content/Intent;
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/h$a;->ajX:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/h$a;->ajT: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;->ajY:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/h$a;->ajU: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;->ajX:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/h$a;->ajT: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 7ad0709363..13a164720b 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 ajV:Ljava/lang/Object;
+.field private static final ajR:Ljava/lang/Object;
 
-.field private static ajW:Lcom/google/android/gms/common/internal/h;
+.field private static ajS: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;->ajV:Ljava/lang/Object;
+    sput-object v0, Lcom/google/android/gms/common/internal/h;->ajR: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;->ajV:Ljava/lang/Object;
+    sget-object v0, Lcom/google/android/gms/common/internal/h;->ajR:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/android/gms/common/internal/h;->ajW:Lcom/google/android/gms/common/internal/h;
+    sget-object v1, Lcom/google/android/gms/common/internal/h;->ajS: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;->ajW:Lcom/google/android/gms/common/internal/h;
+    sput-object v1, Lcom/google/android/gms/common/internal/h;->ajS: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;->ajW:Lcom/google/android/gms/common/internal/h;
+    sget-object p0, Lcom/google/android/gms/common/internal/h;->ajS: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 e339dd4c8e..f973d0e510 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 aka:I = 0xf
+.field private static final ajW:I = 0xf
 
-.field private static final akb:Ljava/lang/String;
+.field private static final ajX:Ljava/lang/String;
 
 
 # instance fields
-.field private final akc:Ljava/lang/String;
+.field private final ajY:Ljava/lang/String;
 
-.field private final akd:Ljava/lang/String;
+.field private final ajZ: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;->akc:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/i;->ajY: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;->akd:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/i;->ajZ:Ljava/lang/String;
 
     return-void
 
     :cond_1
-    iput-object p2, p0, Lcom/google/android/gms/common/internal/i;->akd:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/common/internal/i;->ajZ: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;->akd:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/i;->ajZ: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;->akc:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/i;->ajY: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 71a3f7f515..780564535f 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 ake:Landroid/util/SparseIntArray;
+.field public final aka:Landroid/util/SparseIntArray;
 
-.field private akf:Lcom/google/android/gms/common/c;
+.field private akb:Lcom/google/android/gms/common/c;
 
 
 # direct methods
 .method public constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/common/GoogleApiAvailability;->lS()Lcom/google/android/gms/common/GoogleApiAvailability;
+    invoke-static {}, Lcom/google/android/gms/common/GoogleApiAvailability;->lQ()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;->ake:Landroid/util/SparseIntArray;
+    iput-object v0, p0, Lcom/google/android/gms/common/internal/j;->aka: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;->akf:Lcom/google/android/gms/common/c;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/j;->akb: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;->lZ()Z
+    invoke-interface {p2}, Lcom/google/android/gms/common/api/a$f;->lX()Z
 
     move-result v0
 
@@ -59,11 +59,11 @@
     return v1
 
     :cond_0
-    invoke-interface {p2}, Lcom/google/android/gms/common/api/a$f;->mb()I
+    invoke-interface {p2}, Lcom/google/android/gms/common/api/a$f;->lZ()I
 
     move-result p2
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/j;->ake:Landroid/util/SparseIntArray;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/j;->aka: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;->ake:Landroid/util/SparseIntArray;
+    iget-object v4, p0, Lcom/google/android/gms/common/internal/j;->aka: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;->ake:Landroid/util/SparseIntArray;
+    iget-object v4, p0, Lcom/google/android/gms/common/internal/j;->aka: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;->ake:Landroid/util/SparseIntArray;
+    iget-object v5, p0, Lcom/google/android/gms/common/internal/j;->aka: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;->akf:Lcom/google/android/gms/common/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/j;->akb: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;->ake:Landroid/util/SparseIntArray;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/j;->aka: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 cf2c6c5002..21a5bc5e2e 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 lV()Landroid/accounts/Account;
+.method public final lT()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;->nQ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->nO()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 5da2a74b88..9fce23ba0e 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;->lV()Landroid/accounts/Account;
+    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/k$a;->lT()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 85e52e0164..b12fbce162 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 lV()Landroid/accounts/Account;
+.method public abstract lT()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 551308f0b4..7faa1262d4 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 akg:Landroid/os/IBinder;
+.field private final akc: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;->akg:Landroid/os/IBinder;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/n$a$a;->akc: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;->akg:Landroid/os/IBinder;
+    iget-object p2, p0, Lcom/google/android/gms/common/internal/n$a$a;->akc: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;->akg:Landroid/os/IBinder;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/n$a$a;->akc: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 3606dcb829..9ea6acd28b 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 akh:Lcom/google/android/gms/common/internal/i;
+.field private static final akd:Lcom/google/android/gms/common/internal/i;
 
-.field private static aki:Lcom/google/android/gms/common/internal/o;
+.field private static ake:Lcom/google/android/gms/common/internal/o;
 
 
 # instance fields
-.field private akj:Ljava/util/concurrent/ConcurrentHashMap;
+.field private akf: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;->akh:Lcom/google/android/gms/common/internal/i;
+    sput-object v0, Lcom/google/android/gms/common/internal/o;->akd: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;->aki:Lcom/google/android/gms/common/internal/o;
+    sput-object v0, Lcom/google/android/gms/common/internal/o;->ake: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;->akj:Ljava/util/concurrent/ConcurrentHashMap;
+    iput-object v0, p0, Lcom/google/android/gms/common/internal/o;->akf:Ljava/util/concurrent/ConcurrentHashMap;
 
     return-void
 .end method
 
-.method public static nc()Lcom/google/android/gms/common/internal/o;
+.method public static na()Lcom/google/android/gms/common/internal/o;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/common/internal/o;->aki:Lcom/google/android/gms/common/internal/o;
+    sget-object v0, Lcom/google/android/gms/common/internal/o;->ake: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;->akj:Ljava/util/concurrent/ConcurrentHashMap;
+    iget-object v2, p0, Lcom/google/android/gms/common/internal/o;->akf: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;->akj:Ljava/util/concurrent/ConcurrentHashMap;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/o;->akf: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;->akh:Lcom/google/android/gms/common/internal/i;
+    sget-object v2, Lcom/google/android/gms/common/internal/o;->akd: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;->akh:Lcom/google/android/gms/common/internal/i;
+    sget-object v2, Lcom/google/android/gms/common/internal/o;->akd: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;->akh:Lcom/google/android/gms/common/internal/i;
+    sget-object v5, Lcom/google/android/gms/common/internal/o;->akd: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;->akh:Lcom/google/android/gms/common/internal/i;
+    sget-object v0, Lcom/google/android/gms/common/internal/o;->akd: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;->akj:Ljava/util/concurrent/ConcurrentHashMap;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/o;->akf: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 fe608a17ea..9efd30ea74 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 akk:Ljava/util/List;
+.field private final akg:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -24,7 +24,7 @@
     .end annotation
 .end field
 
-.field private final akl:Ljava/lang/Object;
+.field private final akh: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;->akl:Ljava/lang/Object;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/p$a;->akh: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;->akk:Ljava/util/List;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/p$a;->akg: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;->akk:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/p$a;->akg: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;->akl:Ljava/lang/Object;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/p$a;->akh: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;->akk:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/p$a;->akg: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;->akk:Ljava/util/List;
+    iget-object v3, p0, Lcom/google/android/gms/common/internal/p$a;->akg: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 54b3723f4e..d7304e1ccd 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 akm:Lcom/google/android/gms/common/internal/q$b;
+.field private static final aki: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;->akm:Lcom/google/android/gms/common/internal/q$b;
+    sput-object v0, Lcom/google/android/gms/common/internal/q;->aki: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;->akm:Lcom/google/android/gms/common/internal/q$b;
+    sget-object p1, Lcom/google/android/gms/common/internal/q;->aki: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;->aLU:Lcom/google/android/gms/tasks/ac;
+    iget-object p0, v1, Lcom/google/android/gms/tasks/h;->aLQ: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 2f74fdeb37..ce170166b0 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 aks:Lcom/google/android/gms/common/api/a$h;
+.field public final ako: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;->aks:Lcom/google/android/gms/common/api/a$h;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/s;->ako:Lcom/google/android/gms/common/api/a$h;
 
-    invoke-interface {p1}, Lcom/google/android/gms/common/api/a$h;->mf()Landroid/os/IInterface;
+    invoke-interface {p1}, Lcom/google/android/gms/common/api/a$h;->md()Landroid/os/IInterface;
 
     move-result-object p1
 
     return-object p1
 .end method
 
-.method public final mb()I
+.method public final lZ()I
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/common/internal/g;->mb()I
+    invoke-super {p0}, Lcom/google/android/gms/common/internal/g;->lZ()I
 
     move-result v0
 
     return v0
 .end method
 
-.method protected final md()Ljava/lang/String;
+.method protected final mb()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/s;->aks:Lcom/google/android/gms/common/api/a$h;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/s;->ako:Lcom/google/android/gms/common/api/a$h;
 
-    invoke-interface {v0}, Lcom/google/android/gms/common/api/a$h;->md()Ljava/lang/String;
+    invoke-interface {v0}, Lcom/google/android/gms/common/api/a$h;->mb()Ljava/lang/String;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method protected final me()Ljava/lang/String;
+.method protected final mc()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/s;->aks:Lcom/google/android/gms/common/api/a$h;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/s;->ako:Lcom/google/android/gms/common/api/a$h;
 
-    invoke-interface {v0}, Lcom/google/android/gms/common/api/a$h;->me()Ljava/lang/String;
+    invoke-interface {v0}, Lcom/google/android/gms/common/api/a$h;->mc()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 b7c5fcf920..cc3cd0e0fb 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 akv:Landroid/content/Intent;
+.field private final synthetic akr: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;->akv:Landroid/content/Intent;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/u;->akr: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 na()V
+.method public final mY()V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/u;->akv:Landroid/content/Intent;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/u;->akr: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 5076308ed7..0b986ebead 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 akv:Landroid/content/Intent;
+.field private final synthetic akr: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;->akv:Landroid/content/Intent;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/v;->akr: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 na()V
+.method public final mY()V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/v;->akv:Landroid/content/Intent;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/v;->akr: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 9b5e38ea98..1d9dce02ca 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 akv:Landroid/content/Intent;
+.field private final synthetic akr:Landroid/content/Intent;
 
-.field private final synthetic akw:Lcom/google/android/gms/common/api/internal/g;
+.field private final synthetic aks: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;->akv:Landroid/content/Intent;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/w;->akr:Landroid/content/Intent;
 
-    iput-object p2, p0, Lcom/google/android/gms/common/internal/w;->akw:Lcom/google/android/gms/common/api/internal/g;
+    iput-object p2, p0, Lcom/google/android/gms/common/internal/w;->aks:Lcom/google/android/gms/common/api/internal/g;
 
     const/4 p1, 0x2
 
@@ -29,14 +29,14 @@
 
 
 # virtual methods
-.method public final na()V
+.method public final mY()V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/w;->akv:Landroid/content/Intent;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/w;->akr:Landroid/content/Intent;
 
     if-eqz v0, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/common/internal/w;->akw:Lcom/google/android/gms/common/api/internal/g;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/w;->aks: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 051f6888f5..1ed5ae0649 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 akx:Lcom/google/android/gms/common/api/i$a;
+.field private final synthetic akt: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;->akx:Lcom/google/android/gms/common/api/i$a;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/x;->akt: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 mm()V
+.method public final mk()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/x;->akx:Lcom/google/android/gms/common/api/i$a;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/x;->akt:Lcom/google/android/gms/common/api/i$a;
 
-    invoke-interface {v0}, Lcom/google/android/gms/common/api/i$a;->mm()V
+    invoke-interface {v0}, Lcom/google/android/gms/common/api/i$a;->mk()V
 
     return-void
 .end method
 
-.method public final mn()V
+.method public final ml()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/x;->akx:Lcom/google/android/gms/common/api/i$a;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/x;->akt:Lcom/google/android/gms/common/api/i$a;
 
-    invoke-interface {v0}, Lcom/google/android/gms/common/api/i$a;->mn()V
+    invoke-interface {v0}, Lcom/google/android/gms/common/api/i$a;->ml()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 40a1b2f68b..3daca0b72a 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 aky:Lcom/google/android/gms/common/api/i$b;
+.field private final synthetic aku: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;->aky:Lcom/google/android/gms/common/api/i$b;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/y;->aku: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;->aky:Lcom/google/android/gms/common/api/i$b;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/y;->aku: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 6c68dbe4f8..2dbb9600e1 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 akE:Landroid/os/Bundle;
+.field akA:Landroid/os/Bundle;
 
-.field akF:[Lcom/google/android/gms/common/Feature;
+.field akB:[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;->akE:Landroid/os/Bundle;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/zzb;->akA:Landroid/os/Bundle;
 
-    iput-object p2, p0, Lcom/google/android/gms/common/internal/zzb;->akF:[Lcom/google/android/gms/common/Feature;
+    iput-object p2, p0, Lcom/google/android/gms/common/internal/zzb;->akB:[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;->akE:Landroid/os/Bundle;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/zzb;->akA: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;->akF:[Lcom/google/android/gms/common/Feature;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/zzb;->akB:[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 8e82bebd0e..4bfbe8220b 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 amx:Z
+.field private final amt:Z
 
-.field private final amy:Lcom/google/android/gms/common/n;
+.field private final amu: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;->amx:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/common/m;->amt: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;->amy:Lcom/google/android/gms/common/n;
+    iput-object p3, p0, Lcom/google/android/gms/common/m;->amu: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;->amx:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/common/m;->amt: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;->amy:Lcom/google/android/gms/common/n;
+    iget-object v2, p0, Lcom/google/android/gms/common/m;->amu: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 dd83b5fc0f..d631053f43 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;->nh()I
+    invoke-interface {p1}, Lcom/google/android/gms/common/internal/ak;->nf()I
 
     move-result v1
 
@@ -93,7 +93,7 @@
     return v0
 
     :cond_1
-    invoke-interface {p1}, Lcom/google/android/gms/common/internal/ak;->ng()Lcom/google/android/gms/a/a;
+    invoke-interface {p1}, Lcom/google/android/gms/common/internal/ak;->ne()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;->nG()[B
+    invoke-virtual {p0}, Lcom/google/android/gms/common/n;->nE()[B
 
     move-result-object v1
 
@@ -142,13 +142,13 @@
     return v0
 .end method
 
-.method abstract nG()[B
+.method abstract nE()[B
 .end method
 
-.method public final ng()Lcom/google/android/gms/a/a;
+.method public final ne()Lcom/google/android/gms/a/a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/common/n;->nG()[B
+    invoke-virtual {p0}, Lcom/google/android/gms/common/n;->nE()[B
 
     move-result-object v0
 
@@ -159,7 +159,7 @@
     return-object v0
 .end method
 
-.method public final nh()I
+.method public final nf()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 86aee1062b..acbbf8b741 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 amz:[B
+.field private final amv:[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;->amz:[B
+    iput-object p1, p0, Lcom/google/android/gms/common/o;->amv:[B
 
     return-void
 .end method
 
 
 # virtual methods
-.method final nG()[B
+.method final nE()[B
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/o;->amz:[B
+    iget-object v0, p0, Lcom/google/android/gms/common/o;->amv:[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 8869c0a43d..68e466c964 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 amB:Ljava/lang/ref/WeakReference;
+.field private static final amx:Ljava/lang/ref/WeakReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/ref/WeakReference<",
@@ -14,7 +14,7 @@
 
 
 # instance fields
-.field private amA:Ljava/lang/ref/WeakReference;
+.field private amw: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;->amB:Ljava/lang/ref/WeakReference;
+    sput-object v0, Lcom/google/android/gms/common/p;->amx: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;->amB:Ljava/lang/ref/WeakReference;
+    sget-object p1, Lcom/google/android/gms/common/p;->amx:Ljava/lang/ref/WeakReference;
 
-    iput-object p1, p0, Lcom/google/android/gms/common/p;->amA:Ljava/lang/ref/WeakReference;
+    iput-object p1, p0, Lcom/google/android/gms/common/p;->amw:Ljava/lang/ref/WeakReference;
 
     return-void
 .end method
 
 
 # virtual methods
-.method final nG()[B
+.method final nE()[B
     .locals 2
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/common/p;->amA:Ljava/lang/ref/WeakReference;
+    iget-object v0, p0, Lcom/google/android/gms/common/p;->amw: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;->nH()[B
+    invoke-virtual {p0}, Lcom/google/android/gms/common/p;->nF()[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;->amA:Ljava/lang/ref/WeakReference;
+    iput-object v1, p0, Lcom/google/android/gms/common/p;->amw:Ljava/lang/ref/WeakReference;
 
     :cond_0
     monitor-exit p0
@@ -94,5 +94,5 @@
     throw v0
 .end method
 
-.method protected abstract nH()[B
+.method protected abstract nF()[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 1b645e55fe..b237835a97 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 amC:[Lcom/google/android/gms/common/n;
+.field static final amy:[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;->amC:[Lcom/google/android/gms/common/n;
+    sput-object v0, Lcom/google/android/gms/common/q;->amy:[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 d6b7728b4b..2d67770b06 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 nH()[B
+.method protected final nF()[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 81a48f6c77..d5f0cbcea7 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 nj()J
+.end method
+
+.method public abstract nk()I
+.end method
+
 .method public abstract nl()J
 .end method
 
-.method public abstract nm()I
-.end method
-
-.method public abstract nn()J
-.end method
-
-.method public abstract no()Ljava/lang/String;
+.method public abstract nm()Ljava/lang/String;
 .end method
 
 .method public toString()Ljava/lang/String;
     .locals 8
 
-    invoke-virtual {p0}, Lcom/google/android/gms/common/stats/StatsEvent;->nl()J
+    invoke-virtual {p0}, Lcom/google/android/gms/common/stats/StatsEvent;->nj()J
 
     move-result-wide v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/common/stats/StatsEvent;->nm()I
+    invoke-virtual {p0}, Lcom/google/android/gms/common/stats/StatsEvent;->nk()I
 
     move-result v2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/common/stats/StatsEvent;->nn()J
+    invoke-virtual {p0}, Lcom/google/android/gms/common/stats/StatsEvent;->nl()J
 
     move-result-wide v3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/common/stats/StatsEvent;->no()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/google/android/gms/common/stats/StatsEvent;->nm()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 0a230fc7da..f7b8720172 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,29 +15,21 @@
 
 
 # instance fields
-.field private final aeM:I
+.field private final aeI:I
 
-.field private final alA:F
+.field private final alk:J
 
-.field private final alB:J
+.field private alm:I
 
-.field private final alC:Z
+.field private final aln:Ljava/lang/String;
 
-.field private alD:J
+.field private final alo:Ljava/lang/String;
 
-.field private final alp:J
+.field private final alp:Ljava/lang/String;
 
-.field private alq:I
+.field private final alq:I
 
-.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;
+.field private final alr:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -47,13 +39,21 @@
     .end annotation
 .end field
 
-.field private final alw:Ljava/lang/String;
+.field private final als:Ljava/lang/String;
+
+.field private final alt:J
+
+.field private alu:I
+
+.field private final alv:Ljava/lang/String;
+
+.field private final alw:F
 
 .field private final alx:J
 
-.field private aly:I
+.field private final aly:Z
 
-.field private final alz:Ljava/lang/String;
+.field private alz:J
 
 
 # direct methods
@@ -95,67 +95,67 @@
 
     move v1, p1
 
-    iput v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->aeM:I
+    iput v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->aeI:I
 
     move-wide v1, p2
 
-    iput-wide v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alp:J
+    iput-wide v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alk:J
 
     move v1, p4
 
-    iput v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alq:I
+    iput v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alm:I
 
     move-object v1, p5
 
-    iput-object v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alr:Ljava/lang/String;
+    iput-object v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->aln:Ljava/lang/String;
 
     move-object v1, p12
 
-    iput-object v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->als:Ljava/lang/String;
+    iput-object v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alo:Ljava/lang/String;
 
     move-object/from16 v1, p17
 
-    iput-object v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alt:Ljava/lang/String;
+    iput-object v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alp:Ljava/lang/String;
 
     move v1, p6
 
-    iput v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alu:I
+    iput v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alq:I
 
     const-wide/16 v1, -0x1
 
-    iput-wide v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alD:J
+    iput-wide v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alz:J
 
     move-object v1, p7
 
-    iput-object v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alv:Ljava/util/List;
+    iput-object v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alr:Ljava/util/List;
 
     move-object v1, p8
 
-    iput-object v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alw:Ljava/lang/String;
+    iput-object v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->als:Ljava/lang/String;
 
     move-wide v1, p9
 
-    iput-wide v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alx:J
+    iput-wide v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alt:J
 
     move v1, p11
 
-    iput v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->aly:I
+    iput v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alu:I
 
     move-object/from16 v1, p13
 
-    iput-object v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alz:Ljava/lang/String;
+    iput-object v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alv:Ljava/lang/String;
 
     move/from16 v1, p14
 
-    iput v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alA:F
+    iput v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alw:F
 
     move-wide/from16 v1, p15
 
-    iput-wide v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alB:J
+    iput-wide v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alx:J
 
     move/from16 v1, p18
 
-    iput-boolean v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alC:Z
+    iput-boolean v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->aly:Z
 
     return-void
 .end method
@@ -219,38 +219,38 @@
 
 
 # virtual methods
-.method public final nl()J
+.method public final nj()J
     .locals 2
 
-    iget-wide v0, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alp:J
+    iget-wide v0, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alk:J
 
     return-wide v0
 .end method
 
-.method public final nm()I
+.method public final nk()I
     .locals 1
 
-    iget v0, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alq:I
+    iget v0, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alm:I
 
     return v0
 .end method
 
-.method public final nn()J
+.method public final nl()J
     .locals 2
 
-    iget-wide v0, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alD:J
+    iget-wide v0, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alz:J
 
     return-wide v0
 .end method
 
-.method public final no()Ljava/lang/String;
+.method public final nm()Ljava/lang/String;
     .locals 11
 
-    iget-object v0, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alr:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->aln:Ljava/lang/String;
 
-    iget v1, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alu:I
+    iget v1, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alq:I
 
-    iget-object v2, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alv:Ljava/util/List;
+    iget-object v2, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alr: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;->aly:I
+    iget v4, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alu:I
 
-    iget-object v5, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->als:Ljava/lang/String;
+    iget-object v5, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alo: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;->alz:Ljava/lang/String;
+    iget-object v6, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alv:Ljava/lang/String;
 
     if-nez v6, :cond_2
 
     move-object v6, v3
 
     :cond_2
-    iget v7, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alA:F
+    iget v7, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alw:F
 
-    iget-object v8, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alt:Ljava/lang/String;
+    iget-object v8, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alp: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;->alC:Z
+    iget-boolean v8, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->aly: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;->aeM:I
+    iget v0, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->aeI: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;->nl()J
+    invoke-virtual {p0}, Lcom/google/android/gms/common/stats/StatsEvent;->nj()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;->alr:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->aln: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;->alu:I
+    iget v0, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alq: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;->alv:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alr: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;->alx:J
+    iget-wide v2, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alt: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;->als:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alo: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;->nm()I
+    invoke-virtual {p0}, Lcom/google/android/gms/common/stats/StatsEvent;->nk()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;->alw:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->als: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;->alz:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alv: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;->aly:I
+    iget v0, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alu: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;->alA:F
+    iget v0, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alw: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;->alB:J
+    iget-wide v0, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alx: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;->alt:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alp: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;->alC:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->aly: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 15d62db204..f1a45cc8e2 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 ajV:Ljava/lang/Object;
+.field private static final ajR:Ljava/lang/Object;
 
-.field private static volatile akZ:Lcom/google/android/gms/common/stats/a;
+.field private static volatile akV:Lcom/google/android/gms/common/stats/a;
 
-.field private static ala:Z
+.field private static akW:Z
 
 
 # instance fields
-.field private final alb:Ljava/util/List;
+.field private final akX:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -21,7 +21,7 @@
     .end annotation
 .end field
 
-.field private final alc:Ljava/util/List;
+.field private final akY:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -31,7 +31,7 @@
     .end annotation
 .end field
 
-.field private final ald:Ljava/util/List;
+.field private final akZ:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -41,7 +41,7 @@
     .end annotation
 .end field
 
-.field private final ale:Ljava/util/List;
+.field private final ala: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;->ajV:Ljava/lang/Object;
+    sput-object v0, Lcom/google/android/gms/common/stats/a;->ajR:Ljava/lang/Object;
 
     const/4 v0, 0x0
 
-    sput-boolean v0, Lcom/google/android/gms/common/stats/a;->ala:Z
+    sput-boolean v0, Lcom/google/android/gms/common/stats/a;->akW: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;->alb:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/android/gms/common/stats/a;->akX: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;->alc:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/android/gms/common/stats/a;->akY: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;->ald:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/android/gms/common/stats/a;->akZ: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;->ale:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/android/gms/common/stats/a;->ala:Ljava/util/List;
 
     return-void
 .end method
@@ -160,19 +160,19 @@
     return p0
 .end method
 
-.method public static nk()Lcom/google/android/gms/common/stats/a;
+.method public static ni()Lcom/google/android/gms/common/stats/a;
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/common/stats/a;->akZ:Lcom/google/android/gms/common/stats/a;
+    sget-object v0, Lcom/google/android/gms/common/stats/a;->akV:Lcom/google/android/gms/common/stats/a;
 
     if-nez v0, :cond_1
 
-    sget-object v0, Lcom/google/android/gms/common/stats/a;->ajV:Ljava/lang/Object;
+    sget-object v0, Lcom/google/android/gms/common/stats/a;->ajR:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/android/gms/common/stats/a;->akZ:Lcom/google/android/gms/common/stats/a;
+    sget-object v1, Lcom/google/android/gms/common/stats/a;->akV: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;->akZ:Lcom/google/android/gms/common/stats/a;
+    sput-object v1, Lcom/google/android/gms/common/stats/a;->akV: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;->akZ:Lcom/google/android/gms/common/stats/a;
+    sget-object v0, Lcom/google/android/gms/common/stats/a;->akV: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 470bd0d3c8..5a8f97e9d5 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,7 +3,15 @@
 
 
 # static fields
-.field public static final alf:Landroid/content/ComponentName;
+.field public static final alb:Landroid/content/ComponentName;
+
+.field private static alc:I
+
+.field private static ald:I
+
+.field private static ale:I
+
+.field private static alf:I
 
 .field private static alg:I
 
@@ -13,14 +21,6 @@
 
 .field private static alj:I
 
-.field private static alk:I
-
-.field private static alm:I
-
-.field private static aln:I
-
-.field private static alo:I
-
 
 # direct methods
 .method static constructor <clinit>()V
@@ -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;->alf:Landroid/content/ComponentName;
+    sput-object v0, Lcom/google/android/gms/common/stats/b;->alb:Landroid/content/ComponentName;
 
     const/4 v0, 0x0
 
-    sput v0, Lcom/google/android/gms/common/stats/b;->alg:I
+    sput v0, Lcom/google/android/gms/common/stats/b;->alc:I
 
     const/4 v0, 0x1
 
-    sput v0, Lcom/google/android/gms/common/stats/b;->alh:I
+    sput v0, Lcom/google/android/gms/common/stats/b;->ald:I
 
     const/4 v1, 0x2
 
-    sput v1, Lcom/google/android/gms/common/stats/b;->ali:I
+    sput v1, Lcom/google/android/gms/common/stats/b;->ale:I
 
     const/4 v1, 0x4
 
-    sput v1, Lcom/google/android/gms/common/stats/b;->alj:I
+    sput v1, Lcom/google/android/gms/common/stats/b;->alf:I
 
     const/16 v1, 0x8
 
-    sput v1, Lcom/google/android/gms/common/stats/b;->alk:I
+    sput v1, Lcom/google/android/gms/common/stats/b;->alg:I
 
     const/16 v1, 0x10
 
-    sput v1, Lcom/google/android/gms/common/stats/b;->alm:I
+    sput v1, Lcom/google/android/gms/common/stats/b;->alh:I
 
     const/16 v1, 0x20
 
-    sput v1, Lcom/google/android/gms/common/stats/b;->aln:I
+    sput v1, Lcom/google/android/gms/common/stats/b;->ali:I
 
-    sput v0, Lcom/google/android/gms/common/stats/b;->alo:I
+    sput v0, Lcom/google/android/gms/common/stats/b;->alj: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 33072f6cc4..532a0c8ed5 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 alE:Lcom/google/android/gms/common/stats/d;
+.field private static alA:Lcom/google/android/gms/common/stats/d;
 
-.field private static alF:Ljava/lang/Boolean;
+.field private static alB:Ljava/lang/Boolean;
 
-.field private static alG:Z
+.field private static alC: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;->alE:Lcom/google/android/gms/common/stats/d;
+    sput-object v0, Lcom/google/android/gms/common/stats/d;->alA:Lcom/google/android/gms/common/stats/d;
 
     const/4 v0, 0x0
 
-    sput-boolean v0, Lcom/google/android/gms/common/stats/d;->alG:Z
+    sput-boolean v0, Lcom/google/android/gms/common/stats/d;->alC: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;->alf:Landroid/content/ComponentName;
+    sget-object v1, Lcom/google/android/gms/common/stats/b;->alb: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;->nq()Z
+    invoke-static {}, Lcom/google/android/gms/common/stats/d;->no()Z
 
     move-result v0
 
@@ -255,27 +255,27 @@
     return-void
 .end method
 
-.method public static np()Lcom/google/android/gms/common/stats/d;
+.method public static nn()Lcom/google/android/gms/common/stats/d;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/common/stats/d;->alE:Lcom/google/android/gms/common/stats/d;
+    sget-object v0, Lcom/google/android/gms/common/stats/d;->alA:Lcom/google/android/gms/common/stats/d;
 
     return-object v0
 .end method
 
-.method private static nq()Z
+.method private static no()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/common/stats/d;->alF:Ljava/lang/Boolean;
+    sget-object v0, Lcom/google/android/gms/common/stats/d;->alB: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;->alF:Ljava/lang/Boolean;
+    sput-object v0, Lcom/google/android/gms/common/stats/d;->alB:Ljava/lang/Boolean;
 
     :cond_0
-    sget-object v0, Lcom/google/android/gms/common/stats/d;->alF:Ljava/lang/Boolean;
+    sget-object v0, Lcom/google/android/gms/common/stats/d;->alB: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 cf0b7bf687..ebf8e9ed49 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 nH()[B
+.method protected final nF()[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 cbe1c45998..e404af7072 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 alH:I = -0x1
+.field private static volatile alD: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 6519a8b4e3..c71ff125a5 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 ami:Ljava/util/concurrent/ThreadFactory;
+.field private final ame: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;->ami:Ljava/util/concurrent/ThreadFactory;
+    iput-object p2, p0, Lcom/google/android/gms/common/util/a/a;->ame: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;->ami:Ljava/util/concurrent/ThreadFactory;
+    iget-object v0, p0, Lcom/google/android/gms/common/util/a/a;->ame: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 550fbb0160..4c36612e09 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 ami:Ljava/util/concurrent/ThreadFactory;
+.field private final ame:Ljava/util/concurrent/ThreadFactory;
 
-.field private final amj:Ljava/lang/String;
+.field private final amf:Ljava/lang/String;
 
-.field private final amk:Ljava/util/concurrent/atomic/AtomicInteger;
+.field private final amg: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;->amk:Ljava/util/concurrent/atomic/AtomicInteger;
+    iput-object p2, p0, Lcom/google/android/gms/common/util/a/b;->amg: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;->ami:Ljava/util/concurrent/ThreadFactory;
+    iput-object p2, p0, Lcom/google/android/gms/common/util/a/b;->ame: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;->amj:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/common/util/a/b;->amf: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;->ami:Ljava/util/concurrent/ThreadFactory;
+    iget-object v0, p0, Lcom/google/android/gms/common/util/a/b;->ame: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;->amj:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/common/util/a/b;->amf:Ljava/lang/String;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/util/a/b;->amk:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v1, p0, Lcom/google/android/gms/common/util/a/b;->amg: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 eb77561473..0dbb636286 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 aml:Ljava/lang/Runnable;
+.field private final amh: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;->aml:Ljava/lang/Runnable;
+    iput-object p1, p0, Lcom/google/android/gms/common/util/a/c;->amh: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;->aml:Ljava/lang/Runnable;
+    iget-object v0, p0, Lcom/google/android/gms/common/util/a/c;->amh: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 089dc3a2b7..0fb61c6aa7 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 nr()J
+.method public abstract np()J
 .end method
 
-.method public abstract ns()J
+.method public abstract nq()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 a6f1f3031f..f603bb2f19 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/util/f.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/util/f.smali
@@ -3,17 +3,17 @@
 
 
 # static fields
-.field private static final alI:[Ljava/lang/String;
+.field private static final alE:[Ljava/lang/String;
 
-.field private static alJ:Landroid/os/DropBoxManager; = null
+.field private static alF:Landroid/os/DropBoxManager; = null
 
-.field private static alK:Z = false
+.field private static alG:Z = false
 
-.field private static alL:I = -0x1
+.field private static alH:I = -0x1
 
-.field private static alM:I
+.field private static alI:I
 
-.field private static alN:I
+.field private static alJ:I
 
 
 # direct methods
@@ -54,7 +54,7 @@
 
     aput-object v2, v0, v1
 
-    sput-object v0, Lcom/google/android/gms/common/util/f;->alI:[Ljava/lang/String;
+    sput-object v0, Lcom/google/android/gms/common/util/f;->alE:[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 5394d7ea18..7fe101526c 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 alO:Lcom/google/android/gms/common/util/g;
+.field private static final alK: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;->alO:Lcom/google/android/gms/common/util/g;
+    sput-object v0, Lcom/google/android/gms/common/util/g;->alK:Lcom/google/android/gms/common/util/g;
 
     return-void
 .end method
@@ -30,10 +30,10 @@
     return-void
 .end method
 
-.method public static nt()Lcom/google/android/gms/common/util/e;
+.method public static nr()Lcom/google/android/gms/common/util/e;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/common/util/g;->alO:Lcom/google/android/gms/common/util/g;
+    sget-object v0, Lcom/google/android/gms/common/util/g;->alK:Lcom/google/android/gms/common/util/g;
 
     return-object v0
 .end method
@@ -50,7 +50,7 @@
     return-wide v0
 .end method
 
-.method public final nr()J
+.method public final np()J
     .locals 2
 
     invoke-static {}, Landroid/os/SystemClock;->elapsedRealtime()J
@@ -60,7 +60,7 @@
     return-wide v0
 .end method
 
-.method public final ns()J
+.method public final nq()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 b7768f7eb1..0654333e28 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 alP:Ljava/lang/Boolean;
+.field private static alL:Ljava/lang/Boolean;
 
-.field private static alQ:Ljava/lang/Boolean;
+.field private static alM:Ljava/lang/Boolean;
 
-.field public static alR:Ljava/lang/Boolean;
+.field public static alN: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;->alP:Ljava/lang/Boolean;
+    sget-object v0, Lcom/google/android/gms/common/util/h;->alL:Ljava/lang/Boolean;
 
     if-nez v0, :cond_1
 
-    invoke-static {}, Lcom/google/android/gms/common/util/l;->nv()Z
+    invoke-static {}, Lcom/google/android/gms/common/util/l;->nt()Z
 
     move-result v0
 
@@ -48,10 +48,10 @@
 
     move-result-object p0
 
-    sput-object p0, Lcom/google/android/gms/common/util/h;->alP:Ljava/lang/Boolean;
+    sput-object p0, Lcom/google/android/gms/common/util/h;->alL:Ljava/lang/Boolean;
 
     :cond_1
-    sget-object p0, Lcom/google/android/gms/common/util/h;->alP:Ljava/lang/Boolean;
+    sget-object p0, Lcom/google/android/gms/common/util/h;->alL: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;->alQ:Ljava/lang/Boolean;
+    sget-object v0, Lcom/google/android/gms/common/util/h;->alM:Ljava/lang/Boolean;
 
     if-nez v0, :cond_1
 
-    invoke-static {}, Lcom/google/android/gms/common/util/l;->nw()Z
+    invoke-static {}, Lcom/google/android/gms/common/util/l;->nu()Z
 
     move-result v0
 
@@ -135,10 +135,10 @@
 
     move-result-object p0
 
-    sput-object p0, Lcom/google/android/gms/common/util/h;->alQ:Ljava/lang/Boolean;
+    sput-object p0, Lcom/google/android/gms/common/util/h;->alM:Ljava/lang/Boolean;
 
     :cond_1
-    sget-object p0, Lcom/google/android/gms/common/util/h;->alQ:Ljava/lang/Boolean;
+    sget-object p0, Lcom/google/android/gms/common/util/h;->alM: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 8a3def881c..e5dcea393c 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 alS:[C
+.field private static final alO:[C
 
-.field private static final alT:[C
+.field private static final alP:[C
 
 
 # direct methods
@@ -18,13 +18,13 @@
 
     fill-array-data v1, :array_0
 
-    sput-object v1, Lcom/google/android/gms/common/util/i;->alS:[C
+    sput-object v1, Lcom/google/android/gms/common/util/i;->alO:[C
 
     new-array v0, v0, [C
 
     fill-array-data v0, :array_1
 
-    sput-object v0, Lcom/google/android/gms/common/util/i;->alT:[C
+    sput-object v0, Lcom/google/android/gms/common/util/i;->alP:[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;->alS:[C
+    sget-object v3, Lcom/google/android/gms/common/util/i;->alO:[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;->alS:[C
+    sget-object v3, Lcom/google/android/gms/common/util/i;->alO:[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;->alT:[C
+    sget-object v5, Lcom/google/android/gms/common/util/i;->alP:[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 c429193a99..4f039468fa 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 alU:Ljava/util/regex/Pattern;
+.field private static final alQ:Ljava/util/regex/Pattern;
 
-.field private static final alV:Ljava/util/regex/Pattern;
+.field private static final alR:Ljava/util/regex/Pattern;
 
-.field private static final alW:Ljava/util/regex/Pattern;
+.field private static final alS:Ljava/util/regex/Pattern;
 
 
 # direct methods
@@ -20,7 +20,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/common/util/j;->alU:Ljava/util/regex/Pattern;
+    sput-object v0, Lcom/google/android/gms/common/util/j;->alQ: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;->alV:Ljava/util/regex/Pattern;
+    sput-object v0, Lcom/google/android/gms/common/util/j;->alR: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;->alW:Ljava/util/regex/Pattern;
+    sput-object v0, Lcom/google/android/gms/common/util/j;->alS: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 74858ee49b..11bfa05863 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 nu()Z
+.method public static ns()Z
     .locals 2
 
     sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
@@ -79,7 +79,7 @@
     return v0
 .end method
 
-.method public static nv()Z
+.method public static nt()Z
     .locals 2
 
     sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
@@ -98,7 +98,7 @@
     return v0
 .end method
 
-.method public static nw()Z
+.method public static nu()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 b1e19246b4..d2f9c71dd6 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 alZ:Ljava/util/regex/Pattern;
+.field private static final alV:Ljava/util/regex/Pattern;
 
 
 # direct methods
@@ -16,7 +16,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/common/util/n;->alZ:Ljava/util/regex/Pattern;
+    sput-object v0, Lcom/google/android/gms/common/util/n;->alV: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 c7ed28f908..237c725ba7 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,7 +3,15 @@
 
 
 # static fields
-.field private static final ama:I
+.field private static final alW:I
+
+.field private static final alX:Ljava/lang/reflect/Method;
+
+.field private static final alY:Ljava/lang/reflect/Method;
+
+.field private static final alZ:Ljava/lang/reflect/Method;
+
+.field private static final ama:Ljava/lang/reflect/Method;
 
 .field private static final amb:Ljava/lang/reflect/Method;
 
@@ -11,14 +19,6 @@
 
 .field private static final amd:Ljava/lang/reflect/Method;
 
-.field private static final ame:Ljava/lang/reflect/Method;
-
-.field private static final amf:Ljava/lang/reflect/Method;
-
-.field private static final amg:Ljava/lang/reflect/Method;
-
-.field private static final amh:Ljava/lang/reflect/Method;
-
 
 # direct methods
 .method static constructor <clinit>()V
@@ -28,49 +28,49 @@
 
     move-result v0
 
-    sput v0, Lcom/google/android/gms/common/util/p;->ama:I
+    sput v0, Lcom/google/android/gms/common/util/p;->alW:I
+
+    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;->alX: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;->alY:Ljava/lang/reflect/Method;
 
     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;->amb:Ljava/lang/reflect/Method;
+    sput-object v0, Lcom/google/android/gms/common/util/p;->alZ: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;->amc:Ljava/lang/reflect/Method;
+    sput-object v0, Lcom/google/android/gms/common/util/p;->ama: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;->amd: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;->nB()Ljava/lang/reflect/Method;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/common/util/p;->ame: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;->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;
+    sput-object v0, Lcom/google/android/gms/common/util/p;->amd: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;->amr:Landroid/content/Context;
+    iget-object v1, v1, Lcom/google/android/gms/common/c/b;->amn: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;->amd:Ljava/lang/reflect/Method;
+    sget-object v0, Lcom/google/android/gms/common/util/p;->alZ: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;->amc:Ljava/lang/reflect/Method;
+    sget-object v1, Lcom/google/android/gms/common/util/p;->alY: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;->amc:Ljava/lang/reflect/Method;
+    sget-object v1, Lcom/google/android/gms/common/util/p;->alY: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;->amb:Ljava/lang/reflect/Method;
+    sget-object p1, Lcom/google/android/gms/common/util/p;->alX: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;->amf:Ljava/lang/reflect/Method;
+    sget-object v0, Lcom/google/android/gms/common/util/p;->amb:Ljava/lang/reflect/Method;
 
     if-eqz v0, :cond_0
 
@@ -465,69 +465,9 @@
 .end 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
+    invoke-static {}, Lcom/google/android/gms/common/util/l;->ns()Z
 
     move-result v0
 
@@ -564,7 +504,7 @@
     return-object v0
 .end method
 
-.method private static final nD()Ljava/lang/reflect/Method;
+.method private static final nB()Ljava/lang/reflect/Method;
     .locals 3
 
     invoke-static {}, Lcom/google/android/gms/common/util/l;->isAtLeastP()Z
@@ -606,7 +546,7 @@
     return-object v0
 .end method
 
-.method private static final nE()Ljava/lang/reflect/Method;
+.method private static final nC()Ljava/lang/reflect/Method;
     .locals 5
 
     invoke-static {}, Lcom/google/android/gms/common/util/l;->isAtLeastP()Z
@@ -664,7 +604,7 @@
     return-object v0
 .end method
 
-.method private static ny()Ljava/lang/reflect/Method;
+.method private static nw()Ljava/lang/reflect/Method;
     .locals 5
 
     :try_start_0
@@ -697,10 +637,10 @@
     return-object v0
 .end method
 
-.method private static nz()Ljava/lang/reflect/Method;
+.method private static nx()Ljava/lang/reflect/Method;
     .locals 5
 
-    invoke-static {}, Lcom/google/android/gms/common/util/l;->nu()Z
+    invoke-static {}, Lcom/google/android/gms/common/util/l;->ns()Z
 
     move-result v0
 
@@ -742,3 +682,63 @@
     :goto_0
     return-object v0
 .end method
+
+.method private static ny()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 nz()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
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 0a934bb1b2..403b4a1c61 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 amm:J
+.field private static ami:J
 
-.field private static amn:F
+.field private static amj: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;->amn:F
+    sput v0, Lcom/google/android/gms/common/util/q;->amj:F
 
     return-void
 .end method
@@ -98,7 +98,7 @@
     return v0
 
     :cond_3
-    invoke-static {}, Lcom/google/android/gms/common/util/l;->nv()Z
+    invoke-static {}, Lcom/google/android/gms/common/util/l;->nt()Z
 
     move-result v0
 
@@ -142,7 +142,7 @@
 
     move-result-wide v1
 
-    sget-wide v3, Lcom/google/android/gms/common/util/q;->amm:J
+    sget-wide v3, Lcom/google/android/gms/common/util/q;->ami:J
 
     sub-long/2addr v1, v3
 
@@ -152,7 +152,7 @@
 
     if-gez v5, :cond_0
 
-    sget v1, Lcom/google/android/gms/common/util/q;->amn:F
+    sget v1, Lcom/google/android/gms/common/util/q;->amj: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;->amn:F
+    sget p0, Lcom/google/android/gms/common/util/q;->amj: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;->amn:F
+    sput v1, Lcom/google/android/gms/common/util/q;->amj:F
 
     :cond_1
     invoke-static {}, Landroid/os/SystemClock;->elapsedRealtime()J
 
     move-result-wide v1
 
-    sput-wide v1, Lcom/google/android/gms/common/util/q;->amm:J
+    sput-wide v1, Lcom/google/android/gms/common/util/q;->ami:J
 
-    sget p0, Lcom/google/android/gms/common/util/q;->amn:F
+    sget p0, Lcom/google/android/gms/common/util/q;->amj: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 19c28999ac..447547bcd8 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 amo:Ljava/util/regex/Pattern;
+.field private static amk: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 725eae0254..a7bc3d6c8e 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 amI:Ljava/util/concurrent/Callable;
+.field private final amE: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;->amI:Ljava/util/concurrent/Callable;
+    iput-object p1, p0, Lcom/google/android/gms/common/w;->amE:Ljava/util/concurrent/Callable;
 
     return-void
 .end method
@@ -47,11 +47,11 @@
 
 
 # virtual methods
-.method final nJ()Ljava/lang/String;
+.method final nH()Ljava/lang/String;
     .locals 2
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/common/w;->amI:Ljava/util/concurrent/Callable;
+    iget-object v0, p0, Lcom/google/android/gms/common/w;->amE: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 67a13b50a2..cd0566254a 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 amY:I
+.field public amU:I
 
-.field public amZ:I
+.field public amV:I
 
-.field public ana:I
+.field public amW:I
 
 
 # direct methods
@@ -29,11 +29,11 @@
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amY:I
+    iput v0, p0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amU: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;->amV:I
 
-    iput v0, p0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ana:I
+    iput v0, p0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amW: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 912aeb3663..796facfbfd 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 anb:Landroid/database/Cursor;
+.field public amX: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 0fddbed091..a3d689f3f6 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 anc:I
+.field private final amY:I
 
-.field private final and:I
+.field private final amZ: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;->anc:I
+    iput p1, p0, Lcom/google/android/gms/dynamite/DynamiteModule$d;->amY:I
 
     const/4 p1, 0x0
 
-    iput p1, p0, Lcom/google/android/gms/dynamite/DynamiteModule$d;->and:I
+    iput p1, p0, Lcom/google/android/gms/dynamite/DynamiteModule$d;->amZ: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;->anc:I
+    iget p1, p0, Lcom/google/android/gms/dynamite/DynamiteModule$d;->amY: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 328618a9dd..049294c498 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 amK:Ljava/lang/Boolean; = null
+.field private static amG:Ljava/lang/Boolean; = null
 
-.field private static amL:Lcom/google/android/gms/dynamite/i; = null
+.field private static amH:Lcom/google/android/gms/dynamite/i; = null
 
-.field private static amM:Lcom/google/android/gms/dynamite/k; = null
+.field private static amI:Lcom/google/android/gms/dynamite/k; = null
 
-.field private static amN:Ljava/lang/String; = null
+.field private static amJ:Ljava/lang/String; = null
 
-.field private static amO:I = -0x1
+.field private static amK:I = -0x1
 
-.field private static final amP:Ljava/lang/ThreadLocal;
+.field private static final amL:Ljava/lang/ThreadLocal;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/ThreadLocal<",
@@ -35,23 +35,23 @@
     .end annotation
 .end field
 
-.field private static final amQ:Lcom/google/android/gms/dynamite/DynamiteModule$b$a;
+.field private static final amM:Lcom/google/android/gms/dynamite/DynamiteModule$b$a;
+
+.field public static final amN:Lcom/google/android/gms/dynamite/DynamiteModule$b;
+
+.field public static final amO:Lcom/google/android/gms/dynamite/DynamiteModule$b;
+
+.field public static final amP:Lcom/google/android/gms/dynamite/DynamiteModule$b;
+
+.field public static final amQ:Lcom/google/android/gms/dynamite/DynamiteModule$b;
 
 .field public static final amR:Lcom/google/android/gms/dynamite/DynamiteModule$b;
 
-.field public static final amS:Lcom/google/android/gms/dynamite/DynamiteModule$b;
-
-.field public static final amT:Lcom/google/android/gms/dynamite/DynamiteModule$b;
-
-.field public static final amU:Lcom/google/android/gms/dynamite/DynamiteModule$b;
-
-.field public static final amV:Lcom/google/android/gms/dynamite/DynamiteModule$b;
-
-.field private static final amW:Lcom/google/android/gms/dynamite/DynamiteModule$b;
+.field private static final amS:Lcom/google/android/gms/dynamite/DynamiteModule$b;
 
 
 # instance fields
-.field public final amX:Landroid/content/Context;
+.field public final amT: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;->amP:Ljava/lang/ThreadLocal;
+    sput-object v0, Lcom/google/android/gms/dynamite/DynamiteModule;->amL: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;->amQ:Lcom/google/android/gms/dynamite/DynamiteModule$b$a;
+    sput-object v0, Lcom/google/android/gms/dynamite/DynamiteModule;->amM: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;->amR:Lcom/google/android/gms/dynamite/DynamiteModule$b;
+    sput-object v0, Lcom/google/android/gms/dynamite/DynamiteModule;->amN: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;->amS:Lcom/google/android/gms/dynamite/DynamiteModule$b;
+    sput-object v0, Lcom/google/android/gms/dynamite/DynamiteModule;->amO: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;->amT:Lcom/google/android/gms/dynamite/DynamiteModule$b;
+    sput-object v0, Lcom/google/android/gms/dynamite/DynamiteModule;->amP: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;->amU:Lcom/google/android/gms/dynamite/DynamiteModule$b;
+    sput-object v0, Lcom/google/android/gms/dynamite/DynamiteModule;->amQ: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;->amV: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/g;
 
     invoke-direct {v0}, Lcom/google/android/gms/dynamite/g;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/dynamite/DynamiteModule;->amW:Lcom/google/android/gms/dynamite/DynamiteModule$b;
+    sput-object v0, Lcom/google/android/gms/dynamite/DynamiteModule;->amS: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;->amX:Landroid/content/Context;
+    iput-object p1, p0, Lcom/google/android/gms/dynamite/DynamiteModule;->amT: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;->amK:Ljava/lang/Boolean;
+    sget-object v1, Lcom/google/android/gms/dynamite/DynamiteModule;->amG: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;->amN:Ljava/lang/String;
+    sget-object v5, Lcom/google/android/gms/dynamite/DynamiteModule;->amJ:Ljava/lang/String;
 
     if-eqz v5, :cond_4
 
-    sget-object v5, Lcom/google/android/gms/dynamite/DynamiteModule;->amN:Ljava/lang/String;
+    sget-object v5, Lcom/google/android/gms/dynamite/DynamiteModule;->amJ: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;->amN:Ljava/lang/String;
+    sget-object v6, Lcom/google/android/gms/dynamite/DynamiteModule;->amJ: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;->amK:Ljava/lang/Boolean;
+    sput-object v5, Lcom/google/android/gms/dynamite/DynamiteModule;->amG: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;->amK:Ljava/lang/Boolean;
+    sput-object v1, Lcom/google/android/gms/dynamite/DynamiteModule;->amG: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;->amP:Ljava/lang/ThreadLocal;
+    sget-object v2, Lcom/google/android/gms/dynamite/DynamiteModule;->amL: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;->amP:Ljava/lang/ThreadLocal;
+    sget-object v5, Lcom/google/android/gms/dynamite/DynamiteModule;->amL: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;->amQ:Lcom/google/android/gms/dynamite/DynamiteModule$b$a;
+    sget-object v5, Lcom/google/android/gms/dynamite/DynamiteModule;->amM: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;->amY:I
+    iget v6, v5, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amU:I
 
-    iget v7, v5, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amZ:I
+    iget v7, v5, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amV: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;->ana:I
+    iget v0, v5, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amW:I
 
     if-eqz v0, :cond_9
 
-    iget v0, v5, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ana:I
+    iget v0, v5, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amW:I
 
     const/4 v6, -0x1
 
     if-ne v0, v6, :cond_0
 
-    iget v0, v5, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amY:I
+    iget v0, v5, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amU:I
 
     if-eqz v0, :cond_9
 
     :cond_0
-    iget v0, v5, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ana:I
+    iget v0, v5, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amW:I
 
     const/4 v7, 0x1
 
     if-ne v0, v7, :cond_1
 
-    iget v0, v5, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amZ:I
+    iget v0, v5, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amV:I
 
     if-eqz v0, :cond_9
 
     :cond_1
-    iget v0, v5, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ana:I
+    iget v0, v5, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amW: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;->anb:Landroid/database/Cursor;
+    iget-object p1, v3, Lcom/google/android/gms/dynamite/DynamiteModule$c;->amX:Landroid/database/Cursor;
 
     if-eqz p1, :cond_2
 
-    iget-object p1, v3, Lcom/google/android/gms/dynamite/DynamiteModule$c;->anb:Landroid/database/Cursor;
+    iget-object p1, v3, Lcom/google/android/gms/dynamite/DynamiteModule$c;->amX:Landroid/database/Cursor;
 
     invoke-interface {p1}, Landroid/database/Cursor;->close()V
 
     :cond_2
-    sget-object p1, Lcom/google/android/gms/dynamite/DynamiteModule;->amP:Ljava/lang/ThreadLocal;
+    sget-object p1, Lcom/google/android/gms/dynamite/DynamiteModule;->amL: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;->ana:I
+    iget v0, v5, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amW: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;->amZ:I
+    iget v0, v5, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amV: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;->anb:Landroid/database/Cursor;
+    iget-object p1, v3, Lcom/google/android/gms/dynamite/DynamiteModule$c;->amX:Landroid/database/Cursor;
 
     if-eqz p1, :cond_4
 
-    iget-object p1, v3, Lcom/google/android/gms/dynamite/DynamiteModule$c;->anb:Landroid/database/Cursor;
+    iget-object p1, v3, Lcom/google/android/gms/dynamite/DynamiteModule$c;->amX:Landroid/database/Cursor;
 
     invoke-interface {p1}, Landroid/database/Cursor;->close()V
 
     :cond_4
-    sget-object p1, Lcom/google/android/gms/dynamite/DynamiteModule;->amP:Ljava/lang/ThreadLocal;
+    sget-object p1, Lcom/google/android/gms/dynamite/DynamiteModule;->amL: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;->amY:I
+    iget v1, v5, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amU: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;->amY:I
+    iget v5, v5, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amU: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;->ana:I
+    iget p1, p1, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amW: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;->anb:Landroid/database/Cursor;
+    iget-object p1, v3, Lcom/google/android/gms/dynamite/DynamiteModule$c;->amX:Landroid/database/Cursor;
 
     if-eqz p1, :cond_6
 
-    iget-object p1, v3, Lcom/google/android/gms/dynamite/DynamiteModule$c;->anb:Landroid/database/Cursor;
+    iget-object p1, v3, Lcom/google/android/gms/dynamite/DynamiteModule$c;->amX:Landroid/database/Cursor;
 
     invoke-interface {p1}, Landroid/database/Cursor;->close()V
 
     :cond_6
-    sget-object p1, Lcom/google/android/gms/dynamite/DynamiteModule;->amP:Ljava/lang/ThreadLocal;
+    sget-object p1, Lcom/google/android/gms/dynamite/DynamiteModule;->amL: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;->ana:I
+    iget p1, v5, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amW: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;->amY:I
+    iget p1, v5, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amU:I
 
-    iget p2, v5, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amZ:I
+    iget p2, v5, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amV: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;->anb:Landroid/database/Cursor;
+    iget-object p1, v3, Lcom/google/android/gms/dynamite/DynamiteModule$c;->amX:Landroid/database/Cursor;
 
     if-eqz p1, :cond_a
 
-    iget-object p1, v3, Lcom/google/android/gms/dynamite/DynamiteModule$c;->anb:Landroid/database/Cursor;
+    iget-object p1, v3, Lcom/google/android/gms/dynamite/DynamiteModule$c;->amX:Landroid/database/Cursor;
 
     invoke-interface {p1}, Landroid/database/Cursor;->close()V
 
     :cond_a
-    sget-object p1, Lcom/google/android/gms/dynamite/DynamiteModule;->amP:Ljava/lang/ThreadLocal;
+    sget-object p1, Lcom/google/android/gms/dynamite/DynamiteModule;->amL: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;->amK:Ljava/lang/Boolean;
+    sget-object v2, Lcom/google/android/gms/dynamite/DynamiteModule;->amG: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;->nL()I
+    invoke-interface {v1}, Lcom/google/android/gms/dynamite/i;->nJ()I
 
     move-result v2
 
@@ -1100,7 +1100,7 @@
     move-object p0, v1
 
     :goto_0
-    sput-object p0, Lcom/google/android/gms/dynamite/DynamiteModule;->amM:Lcom/google/android/gms/dynamite/k;
+    sput-object p0, Lcom/google/android/gms/dynamite/DynamiteModule;->amI: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;->amL:Lcom/google/android/gms/dynamite/i;
+    sget-object v1, Lcom/google/android/gms/dynamite/DynamiteModule;->amH:Lcom/google/android/gms/dynamite/i;
 
     if-eqz v1, :cond_0
 
-    sget-object p0, Lcom/google/android/gms/dynamite/DynamiteModule;->amL:Lcom/google/android/gms/dynamite/i;
+    sget-object p0, Lcom/google/android/gms/dynamite/DynamiteModule;->amH:Lcom/google/android/gms/dynamite/i;
 
     monitor-exit v0
 
     return-object p0
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/common/c;->lU()Lcom/google/android/gms/common/c;
+    invoke-static {}, Lcom/google/android/gms/common/c;->lS()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;->amL:Lcom/google/android/gms/dynamite/i;
+    sput-object p0, Lcom/google/android/gms/dynamite/DynamiteModule;->amH: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;->nL()I
+    invoke-interface {v1}, Lcom/google/android/gms/dynamite/i;->nJ()I
 
     move-result v3
 
@@ -1435,7 +1435,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/android/gms/dynamite/DynamiteModule;->amM:Lcom/google/android/gms/dynamite/k;
+    sget-object v1, Lcom/google/android/gms/dynamite/DynamiteModule;->amI: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;->amP:Ljava/lang/ThreadLocal;
+    sget-object v2, Lcom/google/android/gms/dynamite/DynamiteModule;->amL: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;->anb:Landroid/database/Cursor;
+    iget-object v3, v2, Lcom/google/android/gms/dynamite/DynamiteModule$c;->amX: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;->anb:Landroid/database/Cursor;
+    iget-object v2, v2, Lcom/google/android/gms/dynamite/DynamiteModule$c;->amX: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;->nK()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/dynamite/DynamiteModule;->nI()Ljava/lang/Boolean;
 
     move-result-object v3
 
@@ -1682,7 +1682,7 @@
 
     move-result-object v2
 
-    sput-object v2, Lcom/google/android/gms/dynamite/DynamiteModule;->amN:Ljava/lang/String;
+    sput-object v2, Lcom/google/android/gms/dynamite/DynamiteModule;->amJ:Ljava/lang/String;
 
     const-string v2, "loaderVersion"
 
@@ -1696,7 +1696,7 @@
 
     move-result v2
 
-    sput v2, Lcom/google/android/gms/dynamite/DynamiteModule;->amO:I
+    sput v2, Lcom/google/android/gms/dynamite/DynamiteModule;->amK: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;->amP:Ljava/lang/ThreadLocal;
+    sget-object p2, Lcom/google/android/gms/dynamite/DynamiteModule;->amL: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;->anb:Landroid/database/Cursor;
+    iget-object v2, p2, Lcom/google/android/gms/dynamite/DynamiteModule$c;->amX:Landroid/database/Cursor;
 
     if-nez v2, :cond_2
 
-    iput-object p0, p2, Lcom/google/android/gms/dynamite/DynamiteModule$c;->anb:Landroid/database/Cursor;
+    iput-object p0, p2, Lcom/google/android/gms/dynamite/DynamiteModule$c;->amX: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 nK()Ljava/lang/Boolean;
+.method private static nI()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;->amO:I
+    sget v1, Lcom/google/android/gms/dynamite/DynamiteModule;->amK:I
 
     const/4 v2, 0x2
 
@@ -2136,7 +2136,7 @@
     .end annotation
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/dynamite/DynamiteModule;->amX:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/android/gms/dynamite/DynamiteModule;->amT: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 0de07c477f..6dcf468cfb 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;->amZ:I
+    iput v2, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amV:I
 
-    iget v2, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amZ:I
+    iget v2, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amV:I
 
     if-eqz v2, :cond_0
 
-    iput v1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ana:I
+    iput v1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amW:I
 
     goto :goto_0
 
@@ -49,15 +49,15 @@
 
     move-result p1
 
-    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amY:I
+    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amU:I
 
-    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amY:I
+    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amU:I
 
     if-eqz p1, :cond_1
 
     const/4 p1, -0x1
 
-    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ana:I
+    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amW: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 590b8397b8..87500d7338 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;->amY:I
+    iput v1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amU:I
 
-    iget v1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amY:I
+    iget v1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amU:I
 
     if-eqz v1, :cond_0
 
     const/4 p1, -0x1
 
-    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ana:I
+    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amW:I
 
     goto :goto_0
 
@@ -51,13 +51,13 @@
 
     move-result p1
 
-    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amZ:I
+    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amV:I
 
-    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amZ:I
+    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amV:I
 
     if-eqz p1, :cond_1
 
-    iput v1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ana:I
+    iput v1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amW: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 ed633da610..9c03652815 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;->amY:I
+    iput v1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amU:I
 
     const/4 v1, 0x1
 
@@ -40,37 +40,37 @@
 
     move-result p1
 
-    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amZ:I
+    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amV:I
 
-    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amY:I
+    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amU:I
 
     if-nez p1, :cond_0
 
-    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amZ:I
+    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amV:I
 
     if-nez p1, :cond_0
 
     const/4 p1, 0x0
 
-    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ana:I
+    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amW:I
 
     goto :goto_0
 
     :cond_0
-    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amY:I
+    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amU:I
 
-    iget p2, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amZ:I
+    iget p2, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amV:I
 
     if-lt p1, p2, :cond_1
 
     const/4 p1, -0x1
 
-    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ana:I
+    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amW:I
 
     goto :goto_0
 
     :cond_1
-    iput v1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ana:I
+    iput v1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amW: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 e46fee93f7..24ae0ea02f 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;->amY:I
+    iput v1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amU:I
 
-    iget v1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amY:I
+    iget v1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amU:I
 
     const/4 v2, 0x0
 
@@ -46,7 +46,7 @@
 
     move-result p1
 
-    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amZ:I
+    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amV:I
 
     goto :goto_0
 
@@ -55,36 +55,36 @@
 
     move-result p1
 
-    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amZ:I
+    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amV:I
 
     :goto_0
-    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amY:I
+    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amU:I
 
     if-nez p1, :cond_1
 
-    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amZ:I
+    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amV:I
 
     if-nez p1, :cond_1
 
-    iput v2, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ana:I
+    iput v2, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amW:I
 
     goto :goto_1
 
     :cond_1
-    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amY:I
+    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amU:I
 
-    iget p2, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amZ:I
+    iget p2, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amV:I
 
     if-lt p1, p2, :cond_2
 
     const/4 p1, -0x1
 
-    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ana:I
+    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amW:I
 
     goto :goto_1
 
     :cond_2
-    iput v3, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ana:I
+    iput v3, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amW: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 66771cf02c..a1afacc005 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;->amY:I
+    iput v1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amU:I
 
     const/4 v1, 0x1
 
@@ -40,37 +40,37 @@
 
     move-result p1
 
-    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amZ:I
+    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amV:I
 
-    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amY:I
+    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amU:I
 
     if-nez p1, :cond_0
 
-    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amZ:I
+    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amV:I
 
     if-nez p1, :cond_0
 
     const/4 p1, 0x0
 
-    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ana:I
+    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amW:I
 
     goto :goto_0
 
     :cond_0
-    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amZ:I
+    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amV:I
 
-    iget p2, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amY:I
+    iget p2, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amU:I
 
     if-lt p1, p2, :cond_1
 
-    iput v1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ana:I
+    iput v1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amW:I
 
     goto :goto_0
 
     :cond_1
     const/4 p1, -0x1
 
-    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ana:I
+    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amW: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 db251be328..d3f7f016b3 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;->amY:I
+    iput v1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amU:I
 
-    iget v1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amY:I
+    iget v1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amU:I
 
     const/4 v2, 0x0
 
@@ -46,7 +46,7 @@
 
     move-result p1
 
-    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amZ:I
+    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amV:I
 
     goto :goto_0
 
@@ -55,36 +55,36 @@
 
     move-result p1
 
-    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amZ:I
+    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amV:I
 
     :goto_0
-    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amY:I
+    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amU:I
 
     if-nez p1, :cond_1
 
-    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amZ:I
+    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amV:I
 
     if-nez p1, :cond_1
 
-    iput v2, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ana:I
+    iput v2, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amW:I
 
     goto :goto_1
 
     :cond_1
-    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amZ:I
+    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amV:I
 
-    iget p2, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amY:I
+    iget p2, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amU:I
 
     if-lt p1, p2, :cond_2
 
-    iput v3, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ana:I
+    iput v3, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amW:I
 
     goto :goto_1
 
     :cond_2
     const/4 p1, -0x1
 
-    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ana:I
+    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amW: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 497d441d24..a8bd8d3e31 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 nL()I
+.method public abstract nJ()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 06767fa297..d3e40613b6 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;->nQ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->nO()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -59,7 +59,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->nQ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->nO()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -96,7 +96,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->nQ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->nO()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -129,7 +129,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->nQ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->nO()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -158,7 +158,7 @@
     return-object p2
 .end method
 
-.method public final nL()I
+.method public final nJ()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;->nQ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->nO()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 0dd2e80717..4f5b1cbefb 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;->nQ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->nO()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -65,7 +65,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->nQ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->nO()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 04b70e7938..3ab3683071 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 akg:Landroid/os/IBinder;
+.field private final akc:Landroid/os/IBinder;
 
-.field private final ane:Ljava/lang/String;
+.field private final ana: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;->akg:Landroid/os/IBinder;
+    iput-object p1, p0, Lcom/google/android/gms/internal/a/a;->akc:Landroid/os/IBinder;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/a/a;->ane:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/internal/a/a;->ana: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;->akg:Landroid/os/IBinder;
+    iget-object v1, p0, Lcom/google/android/gms/internal/a/a;->akc: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;->akg:Landroid/os/IBinder;
+    iget-object v0, p0, Lcom/google/android/gms/internal/a/a;->akc:Landroid/os/IBinder;
 
     return-object v0
 .end method
 
-.method protected final nM()Landroid/os/Parcel;
+.method protected final nK()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;->ane:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/a/a;->ana: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 90049cd2ac..779c1d52a8 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 anf:Lcom/google/android/gms/internal/a/d;
+.field private static anb: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 5685acecfc..20de9fdb19 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 ang:Ljava/lang/ClassLoader;
+.field private static final anc:Ljava/lang/ClassLoader;
 
 
 # direct methods
@@ -16,7 +16,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/a/c;->ang:Ljava/lang/ClassLoader;
+    sput-object v0, Lcom/google/android/gms/internal/a/c;->anc: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 9cf7ce3f1f..358add2940 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 nN()Z
+.method public abstract nL()Z
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Landroid/os/RemoteException;
@@ -22,7 +22,7 @@
     .end annotation
 .end method
 
-.method public abstract nO()Z
+.method public abstract nM()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 333440d428..e02e78c840 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;->nM()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/a/a;->nK()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -45,7 +45,7 @@
     return-object v1
 .end method
 
-.method public final nN()Z
+.method public final nL()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;->nM()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/a/a;->nK()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -74,7 +74,7 @@
     return v1
 .end method
 
-.method public final nO()Z
+.method public final nM()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;->nM()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/a/a;->nK()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 cbb11b058c..114bfc70af 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 anh:Landroid/os/IBinder;
+.field private final and:Landroid/os/IBinder;
 
-.field private final ani: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/b/a;->anh:Landroid/os/IBinder;
+    iput-object p1, p0, Lcom/google/android/gms/internal/b/a;->and:Landroid/os/IBinder;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/b/a;->ani:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/internal/b/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/b/a;->anh:Landroid/os/IBinder;
+    iget-object v0, p0, Lcom/google/android/gms/internal/b/a;->and: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;->anh:Landroid/os/IBinder;
+    iget-object v1, p0, Lcom/google/android/gms/internal/b/a;->and:Landroid/os/IBinder;
 
     const/16 v2, 0xc
 
@@ -75,14 +75,14 @@
     throw v1
 .end method
 
-.method public final nP()Landroid/os/Parcel;
+.method public final nN()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;->ani:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/b/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/b/b.smali b/com.discord/smali_classes2/com/google/android/gms/internal/b/b.smali
index a8cd19f720..af59263c64 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 anj:Lcom/google/android/gms/internal/b/d;
+.field private static anf: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 6d823c5fad..5f96ce9acd 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 ank: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/b/c;->ank:Ljava/lang/ClassLoader;
+    sput-object v0, Lcom/google/android/gms/internal/b/c;->ang: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 64c19196cb..fc9be78f90 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 anl:Lcom/google/android/gms/internal/b/f;
+.field private static volatile anh: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 98101c5b67..30c6d80c10 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 akg:Landroid/os/IBinder;
+.field private final akc:Landroid/os/IBinder;
 
-.field private final ane:Ljava/lang/String;
+.field private final ana: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;->akg:Landroid/os/IBinder;
+    iput-object p1, p0, Lcom/google/android/gms/internal/c/a;->akc:Landroid/os/IBinder;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/c/a;->ane:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/internal/c/a;->ana: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;->akg:Landroid/os/IBinder;
+    iget-object v0, p0, Lcom/google/android/gms/internal/c/a;->akc: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;->akg:Landroid/os/IBinder;
+    iget-object v1, p0, Lcom/google/android/gms/internal/c/a;->akc: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;->akg:Landroid/os/IBinder;
+    iget-object v1, p0, Lcom/google/android/gms/internal/c/a;->akc:Landroid/os/IBinder;
 
     const/4 v2, 0x0
 
@@ -122,14 +122,14 @@
     throw p1
 .end method
 
-.method public final nQ()Landroid/os/Parcel;
+.method public final nO()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;->ane:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/c/a;->ana: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 f4fd27885d..74e9d966bf 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 anm:Lcom/google/android/gms/internal/c/d;
+.field private static ani: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 05a3652c21..2b788c6ebe 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 ang:Ljava/lang/ClassLoader;
+.field private static final anc:Ljava/lang/ClassLoader;
 
 
 # direct methods
@@ -16,7 +16,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/c/c;->ang:Ljava/lang/ClassLoader;
+    sput-object v0, Lcom/google/android/gms/internal/c/c;->anc: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 a56042fe39..dd75a60831 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 ann:Lcom/google/android/gms/internal/c/f;
+.field private static volatile anj: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 b4d219c03e..ca2c4e3c45 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 ano:Lcom/google/android/gms/internal/d/c;
+.field private static ank: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 b50dcc5528..30ad80383a 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 anp:Landroid/os/IBinder;
+.field private final anl:Landroid/os/IBinder;
 
-.field private final anq:Ljava/lang/String;
+.field private final anm: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;->anp:Landroid/os/IBinder;
+    iput-object p1, p0, Lcom/google/android/gms/internal/d/b;->anl:Landroid/os/IBinder;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/d/b;->anq:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/internal/d/b;->anm: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;->anp:Landroid/os/IBinder;
+    iget-object v0, p0, Lcom/google/android/gms/internal/d/b;->anl: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;->anp:Landroid/os/IBinder;
+    iget-object v1, p0, Lcom/google/android/gms/internal/d/b;->anl:Landroid/os/IBinder;
 
     const/4 v2, 0x1
 
@@ -75,14 +75,14 @@
     throw v1
 .end method
 
-.method public final nQ()Landroid/os/Parcel;
+.method public final nO()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;->anq:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/d/b;->anm: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 59fb6c3853..aa254f8afa 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 ang:Ljava/lang/ClassLoader;
+.field private static final anc:Ljava/lang/ClassLoader;
 
 
 # direct methods
@@ -16,7 +16,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/d/d;->ang:Ljava/lang/ClassLoader;
+    sput-object v0, Lcom/google/android/gms/internal/d/d;->anc: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 06d9f6c0f1..da882dbd79 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 anr:Lcom/google/android/gms/internal/e/b;
+.field private static final ann:Lcom/google/android/gms/internal/e/b;
 
-.field private static volatile ans:Lcom/google/android/gms/internal/e/b;
+.field private static volatile ano: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;->anr:Lcom/google/android/gms/internal/e/b;
+    sput-object v0, Lcom/google/android/gms/internal/e/a;->ann: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;
+    sput-object v0, Lcom/google/android/gms/internal/e/a;->ano:Lcom/google/android/gms/internal/e/b;
 
     return-void
 .end method
 
-.method public static nR()Lcom/google/android/gms/internal/e/b;
+.method public static nP()Lcom/google/android/gms/internal/e/b;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/e/a;->ans:Lcom/google/android/gms/internal/e/b;
+    sget-object v0, Lcom/google/android/gms/internal/e/a;->ano: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 8d849af6f3..d23de72007 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 ant:Lcom/google/android/gms/internal/e/g;
+.field private static volatile anp: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 d33dac40e8..eb47bd7ab1 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 anu:I = 0x1
+.field private static final enum anq:I = 0x1
 
-.field private static final synthetic anv:[I
+.field private static final synthetic anr:[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;->anv:[I
+    sput-object v0, Lcom/google/android/gms/internal/e/e;->anr:[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 66f3fc706d..058c173b30 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 anw:Ljava/io/OutputStream;
+.field private static final ans: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;->anw:Ljava/io/OutputStream;
+    sput-object v0, Lcom/google/android/gms/internal/e/i;->ans: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 f01c3a10d8..e4673e89f0 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 any:J
+.field private anu:J
 
-.field private anz:J
+.field private anv:J
 
 
 # direct methods
@@ -17,13 +17,13 @@
 
     const-wide/16 v0, -0x1
 
-    iput-wide v0, p0, Lcom/google/android/gms/internal/e/k;->anz:J
+    iput-wide v0, p0, Lcom/google/android/gms/internal/e/k;->anv: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;->any:J
+    iput-wide v0, p0, Lcom/google/android/gms/internal/e/k;->anu: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;->any:J
+    iget-wide v2, p0, Lcom/google/android/gms/internal/e/k;->anu: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;->any:J
+    iget-wide v0, p0, Lcom/google/android/gms/internal/e/k;->anu:J
 
-    iput-wide v0, p0, Lcom/google/android/gms/internal/e/k;->anz:J
+    iput-wide v0, p0, Lcom/google/android/gms/internal/e/k;->anv: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;->any:J
+    iget-wide v0, p0, Lcom/google/android/gms/internal/e/k;->anu: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;->any:J
+    iget-wide v1, p0, Lcom/google/android/gms/internal/e/k;->anu:J
 
     const-wide/16 v3, 0x1
 
     sub-long/2addr v1, v3
 
-    iput-wide v1, p0, Lcom/google/android/gms/internal/e/k;->any:J
+    iput-wide v1, p0, Lcom/google/android/gms/internal/e/k;->anu:J
 
     :cond_1
     return v0
@@ -134,7 +134,7 @@
         }
     .end annotation
 
-    iget-wide v0, p0, Lcom/google/android/gms/internal/e/k;->any:J
+    iget-wide v0, p0, Lcom/google/android/gms/internal/e/k;->anu: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;->any:J
+    iget-wide p2, p0, Lcom/google/android/gms/internal/e/k;->anu:J
 
     int-to-long v0, p1
 
     sub-long/2addr p2, v0
 
-    iput-wide p2, p0, Lcom/google/android/gms/internal/e/k;->any:J
+    iput-wide p2, p0, Lcom/google/android/gms/internal/e/k;->anu: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;->anz:J
+    iget-wide v0, p0, Lcom/google/android/gms/internal/e/k;->anv: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;->anz:J
+    iget-wide v0, p0, Lcom/google/android/gms/internal/e/k;->anv:J
 
-    iput-wide v0, p0, Lcom/google/android/gms/internal/e/k;->any:J
+    iput-wide v0, p0, Lcom/google/android/gms/internal/e/k;->anu: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;->any:J
+    iget-wide v0, p0, Lcom/google/android/gms/internal/e/k;->anu: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;->any:J
+    iget-wide v0, p0, Lcom/google/android/gms/internal/e/k;->anu:J
 
     sub-long/2addr v0, p1
 
-    iput-wide v0, p0, Lcom/google/android/gms/internal/e/k;->any:J
+    iput-wide v0, p0, Lcom/google/android/gms/internal/e/k;->anu: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 d1fef23b16..25a0878ba7 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 anA:Lcom/google/android/gms/internal/e/o;
+.field private static final anq:I
 
-.field private static final anu:I
+.field private static final anw:Lcom/google/android/gms/internal/e/o;
 
 
 # direct methods
@@ -24,7 +24,7 @@
     const/4 v0, 0x1
 
     :try_start_0
-    invoke-static {}, Lcom/google/android/gms/internal/e/l;->nS()Ljava/lang/Integer;
+    invoke-static {}, Lcom/google/android/gms/internal/e/l;->nQ()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;->anA:Lcom/google/android/gms/internal/e/o;
+    sput-object v2, Lcom/google/android/gms/internal/e/l;->anw: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;->anu:I
+    sput v0, Lcom/google/android/gms/internal/e/l;->anq: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;->anA:Lcom/google/android/gms/internal/e/o;
+    sget-object v0, Lcom/google/android/gms/internal/e/l;->anw: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 nS()Ljava/lang/Integer;
+.method private static nQ()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 936da6de65..a17f134049 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 anB:[B
+.field private static anA:[I
 
-.field private static final anC:[I
+.field private static final anr:[I
 
-.field private static final anD:[I
+.field private static final anx:[B
 
-.field private static anE:[I
+.field private static final any:[I
 
-.field private static final anv:[I
+.field private static final anz:[I
 
 
 # direct methods
@@ -25,7 +25,7 @@
 
     fill-array-data v0, :array_0
 
-    sput-object v0, Lcom/google/android/gms/internal/e/m;->anB:[B
+    sput-object v0, Lcom/google/android/gms/internal/e/m;->anx:[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;->anC:[I
+    sput-object v1, Lcom/google/android/gms/internal/e/m;->any:[I
 
     new-array v0, v0, [I
 
     fill-array-data v0, :array_2
 
-    sput-object v0, Lcom/google/android/gms/internal/e/m;->anv:[I
+    sput-object v0, Lcom/google/android/gms/internal/e/m;->anr:[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;->anD:[I
+    sput-object v0, Lcom/google/android/gms/internal/e/m;->anz:[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;->anE:[I
+    sput-object v0, Lcom/google/android/gms/internal/e/m;->anA:[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 ab115305ce..37ec935e8d 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 anF:Ljava/util/concurrent/ConcurrentHashMap;
+.field private final anB: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 anG:Ljava/lang/ref/ReferenceQueue;
+.field private final anC: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;->anF:Ljava/util/concurrent/ConcurrentHashMap;
+    iput-object v0, p0, Lcom/google/android/gms/internal/e/n;->anB: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;->anG:Ljava/lang/ref/ReferenceQueue;
+    iput-object v0, p0, Lcom/google/android/gms/internal/e/n;->anC: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;->anG:Ljava/lang/ref/ReferenceQueue;
+    iget-object v0, p0, Lcom/google/android/gms/internal/e/n;->anC: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;->anF:Ljava/util/concurrent/ConcurrentHashMap;
+    iget-object v1, p0, Lcom/google/android/gms/internal/e/n;->anB: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;->anG:Ljava/lang/ref/ReferenceQueue;
+    iget-object v0, p0, Lcom/google/android/gms/internal/e/n;->anC: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;->anF:Ljava/util/concurrent/ConcurrentHashMap;
+    iget-object v1, p0, Lcom/google/android/gms/internal/e/n;->anB: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;->anF:Ljava/util/concurrent/ConcurrentHashMap;
+    iget-object v1, p0, Lcom/google/android/gms/internal/e/n;->anB: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;->anG:Ljava/lang/ref/ReferenceQueue;
+    iget-object v3, p0, Lcom/google/android/gms/internal/e/n;->anC: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 298b6c04a8..ee53a23c4c 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 anH:[Ljava/lang/Throwable;
+.field private static final anD:[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;->anH:[Ljava/lang/Throwable;
+    sput-object v0, Lcom/google/android/gms/internal/e/o;->anD:[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 dda57ac8d7..adcc2942ff 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 anI:Lcom/google/android/gms/internal/e/n;
+.field private final anE: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;->anI:Lcom/google/android/gms/internal/e/n;
+    iput-object v0, p0, Lcom/google/android/gms/internal/e/p;->anE: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;->anI:Lcom/google/android/gms/internal/e/n;
+    iget-object v0, p0, Lcom/google/android/gms/internal/e/p;->anE: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 27670a2fd0..f1432501f6 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 akg:Landroid/os/IBinder;
+.field private final akc:Landroid/os/IBinder;
 
-.field private final ane:Ljava/lang/String;
+.field private final ana: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;->akg:Landroid/os/IBinder;
+    iput-object p1, p0, Lcom/google/android/gms/internal/f/a;->akc:Landroid/os/IBinder;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/f/a;->ane:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/internal/f/a;->ana: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;->akg:Landroid/os/IBinder;
+    iget-object v0, p0, Lcom/google/android/gms/internal/f/a;->akc: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;->akg:Landroid/os/IBinder;
+    iget-object v1, p0, Lcom/google/android/gms/internal/f/a;->akc:Landroid/os/IBinder;
 
     const/4 v2, 0x6
 
@@ -75,14 +75,14 @@
     throw v1
 .end method
 
-.method protected final nM()Landroid/os/Parcel;
+.method protected final nK()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;->ane:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/f/a;->ana: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 fafa6897af..44c45392e8 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 aBD:Lcom/google/android/gms/internal/f/d;
+.field private static aBz: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 cfaf6ba6cc..c41d613ac8 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 ang:Ljava/lang/ClassLoader;
+.field private static final anc:Ljava/lang/ClassLoader;
 
 
 # direct methods
@@ -16,7 +16,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/f/c;->ang:Ljava/lang/ClassLoader;
+    sput-object v0, Lcom/google/android/gms/internal/f/c;->anc: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 340e894886..b287a77b67 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/f/e.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/f/e.smali
@@ -23,6 +23,31 @@
     throw p1
 .end method
 
+.method public final uK()V
+    .locals 1
+
+    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
+    .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 uM()V
     .locals 1
 
@@ -35,11 +60,6 @@
 
 .method public final uN()V
     .locals 1
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
 
     new-instance v0, Ljava/lang/UnsupportedOperationException;
 
@@ -87,23 +107,3 @@
 
     throw v0
 .end method
-
-.method public final 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 718d78c0a4..057c2b8470 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;->aLj:Lcom/google/android/gms/common/api/a;
+    sget-object v0, Lcom/google/android/gms/safetynet/a;->aLf: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 006f735835..7c8efa02a0 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/f/g.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/f/g.smali
@@ -14,6 +14,22 @@
     .end annotation
 .end method
 
+.method public abstract 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 = {
@@ -61,19 +77,3 @@
         }
     .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 6c81433a68..1caf1af7d3 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;->uS()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/f/h;->uQ()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;->uR()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/f/h;->uP()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;->uT()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/f/h;->uR()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;->uQ()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/f/h;->uO()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;->uP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/f/h;->uN()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;->uO()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/f/h;->uM()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;->uN()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/f/h;->uL()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;->uM()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/f/h;->uK()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 ad7093fac8..7fab32addc 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;->nM()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/f/a;->nK()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 e210b6e101..edb439ff56 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 aBE:Lcom/google/android/gms/internal/f/g;
+.field protected aBA: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;->aBE:Lcom/google/android/gms/internal/f/g;
+    iput-object p1, p0, Lcom/google/android/gms/internal/f/k$a;->aBA: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 d924433013..b204e0a422 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 aBF:Lcom/google/android/gms/common/api/Status;
+.field private final aBB:Lcom/google/android/gms/common/api/Status;
 
-.field private final aBG:Lcom/google/android/gms/safetynet/zzf;
+.field private final aBC: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;->aBF:Lcom/google/android/gms/common/api/Status;
+    iput-object p1, p0, Lcom/google/android/gms/internal/f/k$b;->aBB:Lcom/google/android/gms/common/api/Status;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/f/k$b;->aBG:Lcom/google/android/gms/safetynet/zzf;
+    iput-object p2, p0, Lcom/google/android/gms/internal/f/k$b;->aBC:Lcom/google/android/gms/safetynet/zzf;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final mo()Lcom/google/android/gms/common/api/Status;
+.method public final mm()Lcom/google/android/gms/common/api/Status;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/f/k$b;->aBF:Lcom/google/android/gms/common/api/Status;
+    iget-object v0, p0, Lcom/google/android/gms/internal/f/k$b;->aBB:Lcom/google/android/gms/common/api/Status;
 
     return-object v0
 .end method
 
-.method public final uU()Ljava/lang/String;
+.method public final uS()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/f/k$b;->aBG:Lcom/google/android/gms/safetynet/zzf;
+    iget-object v0, p0, Lcom/google/android/gms/internal/f/k$b;->aBC: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 009abe479f..77561bcb33 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;->aBE:Lcom/google/android/gms/internal/f/g;
+    iget-object v0, p0, Lcom/google/android/gms/internal/f/l;->aBA: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;->mU()Landroid/os/IInterface;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/f/n;->mS()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 0cdedb2781..20c179627f 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 aBH:Lcom/google/android/gms/internal/f/k$a;
+.field private final synthetic aBD: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;->aBH:Lcom/google/android/gms/internal/f/k$a;
+    iput-object p1, p0, Lcom/google/android/gms/internal/f/m;->aBD: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;->aBH:Lcom/google/android/gms/internal/f/k$a;
+    iget-object v0, p0, Lcom/google/android/gms/internal/f/m;->aBD: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 357e97e612..771bb7ab0c 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 aBI:Landroid/content/Context;
+.field private final aBE: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;->aBI:Landroid/content/Context;
+    iput-object p1, p0, Lcom/google/android/gms/internal/f/n;->aBE:Landroid/content/Context;
 
     return-void
 .end method
@@ -75,7 +75,7 @@
     return-object v0
 .end method
 
-.method public final mb()I
+.method public final lZ()I
     .locals 1
 
     const v0, 0xba2840
@@ -83,7 +83,7 @@
     return v0
 .end method
 
-.method public final md()Ljava/lang/String;
+.method public final mb()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 me()Ljava/lang/String;
+.method public final mc()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 a9171f3480..6d51a0e49b 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 anF:Ljava/lang/String;
+
+.field public anG:I
+
+.field private anH:I
+
+.field private anI:Ljava/lang/String;
+
 .field public anJ:Ljava/lang/String;
 
-.field public anK:I
+.field private anK:Z
 
-.field private anL:I
-
-.field private anM:Ljava/lang/String;
-
-.field public anN:Ljava/lang/String;
-
-.field private anO:Z
-
-.field private anP:Z
+.field private anL: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;->anK:I
+    iput p1, p0, Lcom/google/android/gms/internal/gtm/a;->anG:I
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lcom/google/android/gms/internal/gtm/a;->anP:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/internal/gtm/a;->anL: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;->anJ:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/a;->anF: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;->anJ:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/a;->anF:Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/a;->anJ:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/a;->anF:Ljava/lang/String;
 
     :cond_0
-    iget v0, p0, Lcom/google/android/gms/internal/gtm/a;->anK:I
+    iget v0, p0, Lcom/google/android/gms/internal/gtm/a;->anG:I
 
     if-eqz v0, :cond_1
 
-    iput v0, p1, Lcom/google/android/gms/internal/gtm/a;->anK:I
+    iput v0, p1, Lcom/google/android/gms/internal/gtm/a;->anG:I
 
     :cond_1
-    iget v0, p0, Lcom/google/android/gms/internal/gtm/a;->anL:I
+    iget v0, p0, Lcom/google/android/gms/internal/gtm/a;->anH:I
 
     if-eqz v0, :cond_2
 
-    iput v0, p1, Lcom/google/android/gms/internal/gtm/a;->anL:I
+    iput v0, p1, Lcom/google/android/gms/internal/gtm/a;->anH:I
 
     :cond_2
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/a;->anM:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/a;->anI: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;->anM:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/a;->anI:Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/a;->anM:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/a;->anI:Ljava/lang/String;
 
     :cond_3
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/a;->anN: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
 
@@ -159,7 +159,7 @@
 
     if-nez v0, :cond_5
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/a;->anN: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
 
@@ -169,27 +169,27 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/a;->anN:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/a;->anJ:Ljava/lang/String;
 
     goto :goto_0
 
     :cond_4
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/a;->anN:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/a;->anJ:Ljava/lang/String;
 
     :cond_5
     :goto_0
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/a;->anO:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/a;->anK:Z
 
     if-eqz v0, :cond_6
 
-    iput-boolean v0, p1, Lcom/google/android/gms/internal/gtm/a;->anO:Z
+    iput-boolean v0, p1, Lcom/google/android/gms/internal/gtm/a;->anK:Z
 
     :cond_6
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/a;->anP:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/a;->anL:Z
 
     if-eqz v0, :cond_7
 
-    iput-boolean v0, p1, Lcom/google/android/gms/internal/gtm/a;->anP:Z
+    iput-boolean v0, p1, Lcom/google/android/gms/internal/gtm/a;->anL: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;->anJ:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/a;->anF: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;->anO:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/internal/gtm/a;->anK: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;->anP:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/internal/gtm/a;->anL: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;->anK:I
+    iget v1, p0, Lcom/google/android/gms/internal/gtm/a;->anG: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;->anL:I
+    iget v1, p0, Lcom/google/android/gms/internal/gtm/a;->anH: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;->anM:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/a;->anI: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;->anN:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/a;->anJ: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 2df63cb4c5..82502ed7e1 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 apl:Lcom/google/android/gms/internal/gtm/y;
+.field private final synthetic apg: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;->apl:Lcom/google/android/gms/internal/gtm/y;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/aa;->apg: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;->apl:Lcom/google/android/gms/internal/gtm/y;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/aa;->apg: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 13f5f78c69..8f9dc33a31 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 apl:Lcom/google/android/gms/internal/gtm/y;
+.field private final synthetic apg: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;->apl:Lcom/google/android/gms/internal/gtm/y;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/ab;->apg: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;->apl:Lcom/google/android/gms/internal/gtm/y;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ab;->apg: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;->ow()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 f5aeab229d..9ebca0483e 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 apl:Lcom/google/android/gms/internal/gtm/y;
+.field private final synthetic apg: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;->apl:Lcom/google/android/gms/internal/gtm/y;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/ac;->apg:Lcom/google/android/gms/internal/gtm/y;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -22,12 +22,12 @@
 
 
 # virtual methods
-.method public final oG()V
+.method public final oE()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ac;->apl:Lcom/google/android/gms/internal/gtm/y;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ac;->apg:Lcom/google/android/gms/internal/gtm/y;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/y;->oB()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/y;->oz()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 e88e32fab6..d53a2e063f 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 aph:Lcom/google/android/gms/internal/gtm/ad;
+
+.field private static final enum apj:Lcom/google/android/gms/internal/gtm/ad;
+
+.field private static final enum apk:Lcom/google/android/gms/internal/gtm/ad;
+
+.field private static final enum apl: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 apn: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 apq: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 aps:Lcom/google/android/gms/internal/gtm/ad;
-
-.field private static final synthetic apt:[Lcom/google/android/gms/internal/gtm/ad;
+.field private static final synthetic apo:[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;->apm:Lcom/google/android/gms/internal/gtm/ad;
+    sput-object v0, Lcom/google/android/gms/internal/gtm/ad;->aph: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;->apn:Lcom/google/android/gms/internal/gtm/ad;
+    sput-object v0, Lcom/google/android/gms/internal/gtm/ad;->apj: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;->apo:Lcom/google/android/gms/internal/gtm/ad;
+    sput-object v0, Lcom/google/android/gms/internal/gtm/ad;->apk: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;->apq:Lcom/google/android/gms/internal/gtm/ad;
+    sput-object v0, Lcom/google/android/gms/internal/gtm/ad;->apl: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;->apr: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;
 
@@ -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;->aps: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;
 
     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;->apm:Lcom/google/android/gms/internal/gtm/ad;
+    sget-object v7, Lcom/google/android/gms/internal/gtm/ad;->aph:Lcom/google/android/gms/internal/gtm/ad;
 
     aput-object v7, v0, v1
 
-    sget-object v1, Lcom/google/android/gms/internal/gtm/ad;->apn:Lcom/google/android/gms/internal/gtm/ad;
+    sget-object v1, Lcom/google/android/gms/internal/gtm/ad;->apj:Lcom/google/android/gms/internal/gtm/ad;
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/google/android/gms/internal/gtm/ad;->apo:Lcom/google/android/gms/internal/gtm/ad;
+    sget-object v1, Lcom/google/android/gms/internal/gtm/ad;->apk:Lcom/google/android/gms/internal/gtm/ad;
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/gtm/ad;->apq:Lcom/google/android/gms/internal/gtm/ad;
+    sget-object v1, Lcom/google/android/gms/internal/gtm/ad;->apl:Lcom/google/android/gms/internal/gtm/ad;
 
     aput-object v1, v0, v4
 
-    sget-object v1, Lcom/google/android/gms/internal/gtm/ad;->apr:Lcom/google/android/gms/internal/gtm/ad;
+    sget-object v1, Lcom/google/android/gms/internal/gtm/ad;->apm:Lcom/google/android/gms/internal/gtm/ad;
 
     aput-object v1, v0, v5
 
-    sget-object v1, Lcom/google/android/gms/internal/gtm/ad;->aps: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, v6
 
-    sput-object v0, Lcom/google/android/gms/internal/gtm/ad;->apt:[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;
 
     return-void
 .end method
@@ -149,7 +149,7 @@
 
     if-eqz v0, :cond_0
 
-    sget-object p0, Lcom/google/android/gms/internal/gtm/ad;->apn:Lcom/google/android/gms/internal/gtm/ad;
+    sget-object p0, Lcom/google/android/gms/internal/gtm/ad;->apj: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;->apo:Lcom/google/android/gms/internal/gtm/ad;
+    sget-object p0, Lcom/google/android/gms/internal/gtm/ad;->apk: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;->apq:Lcom/google/android/gms/internal/gtm/ad;
+    sget-object p0, Lcom/google/android/gms/internal/gtm/ad;->apl: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;->apr: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
 
@@ -201,12 +201,12 @@
 
     if-eqz p0, :cond_4
 
-    sget-object p0, Lcom/google/android/gms/internal/gtm/ad;->aps: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
 
     :cond_4
-    sget-object p0, Lcom/google/android/gms/internal/gtm/ad;->apm:Lcom/google/android/gms/internal/gtm/ad;
+    sget-object p0, Lcom/google/android/gms/internal/gtm/ad;->aph: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;->apt:[Lcom/google/android/gms/internal/gtm/ad;
+    sget-object v0, Lcom/google/android/gms/internal/gtm/ad;->apo:[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 60f9f05528..efdb81493c 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 aoE:Ljava/lang/String;
+.field private volatile aoA:Ljava/lang/String;
 
-.field private apu:Ljava/util/concurrent/Future;
+.field private apq:Ljava/util/concurrent/Future;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/Future<",
@@ -398,25 +398,25 @@
 
 
 # virtual methods
-.method protected final nT()V
+.method protected final nR()V
     .locals 0
 
     return-void
 .end method
 
-.method public final oH()Ljava/lang/String;
+.method public final oF()Ljava/lang/String;
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oi()V
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ae;->aoE:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ae;->aoA:Ljava/lang/String;
 
     if-nez v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->od()Lcom/google/android/gms/analytics/m;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->ob()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;->apu:Ljava/util/concurrent/Future;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/ae;->apq:Ljava/util/concurrent/Future;
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ae;->apu:Ljava/util/concurrent/Future;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ae;->apq: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;->apu:Ljava/util/concurrent/Future;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ae;->apq: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;->aoE:Ljava/lang/String;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/ae;->aoA: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;->aoE:Ljava/lang/String;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/ae;->aoA: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;->aoE:Ljava/lang/String;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/ae;->aoA:Ljava/lang/String;
 
     :goto_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ae;->aoE:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ae;->aoA:Ljava/lang/String;
 
     if-nez v0, :cond_1
 
     const-string v0, "0"
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/ae;->aoE:Ljava/lang/String;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/ae;->aoA:Ljava/lang/String;
 
     :cond_1
     const-string v0, "Loaded clientId"
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ae;->aoE:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ae;->aoA: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;->apu:Ljava/util/concurrent/Future;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/ae;->apq:Ljava/util/concurrent/Future;
 
     :cond_2
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ae;->aoE:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ae;->aoA:Ljava/lang/String;
 
     monitor-exit p0
 
@@ -516,7 +516,7 @@
     throw v0
 .end method
 
-.method final oI()Ljava/lang/String;
+.method final oG()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;->aoE:Ljava/lang/String;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/ae;->aoA:Ljava/lang/String;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->od()Lcom/google/android/gms/analytics/m;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->ob()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;->apu:Ljava/util/concurrent/Future;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/ae;->apq: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;->oH()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/ae;->oF()Ljava/lang/String;
 
     move-result-object v0
 
@@ -561,14 +561,14 @@
     throw v0
 .end method
 
-.method final oJ()Ljava/lang/String;
+.method final oH()Ljava/lang/String;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->od()Lcom/google/android/gms/analytics/m;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->ob()Lcom/google/android/gms/analytics/m;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/analytics/m;->aeA:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/android/gms/analytics/m;->aew: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;->oK()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/ae;->oI()Ljava/lang/String;
 
     move-result-object v0
 
@@ -584,7 +584,7 @@
     return-object v0
 .end method
 
-.method final oK()Ljava/lang/String;
+.method final oI()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;->od()Lcom/google/android/gms/analytics/m;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->ob()Lcom/google/android/gms/analytics/m;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/analytics/m;->aeA:Landroid/content/Context;
+    iget-object v2, v2, Lcom/google/android/gms/analytics/m;->aew: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 a4bd723a6a..ebb282fcb2 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 apv:Lcom/google/android/gms/internal/gtm/ae;
+.field private final synthetic apr: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;->apv:Lcom/google/android/gms/internal/gtm/ae;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/af;->apr: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;->apv:Lcom/google/android/gms/internal/gtm/ae;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/af;->apr:Lcom/google/android/gms/internal/gtm/ae;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/ae;->oJ()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/ae;->oH()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 12e4c1ea38..71879b95d6 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 apv:Lcom/google/android/gms/internal/gtm/ae;
+.field private final synthetic apr: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;->apv:Lcom/google/android/gms/internal/gtm/ae;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/ag;->apr: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;->apv:Lcom/google/android/gms/internal/gtm/ae;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ag;->apr:Lcom/google/android/gms/internal/gtm/ae;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/ae;->oK()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/ae;->oI()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 25530f6551..ab13cd5a20 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 synthetic apA:[Lcom/google/android/gms/internal/gtm/ai;
+.field private static final enum apu:Lcom/google/android/gms/internal/gtm/ai;
 
-.field private static final enum apy:Lcom/google/android/gms/internal/gtm/ai;
+.field public static final enum apv:Lcom/google/android/gms/internal/gtm/ai;
 
-.field public static final enum apz:Lcom/google/android/gms/internal/gtm/ai;
+.field private static final synthetic apw:[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;->apy:Lcom/google/android/gms/internal/gtm/ai;
+    sput-object v0, Lcom/google/android/gms/internal/gtm/ai;->apu: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;->apz:Lcom/google/android/gms/internal/gtm/ai;
+    sput-object v0, Lcom/google/android/gms/internal/gtm/ai;->apv: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;->apy:Lcom/google/android/gms/internal/gtm/ai;
+    sget-object v3, Lcom/google/android/gms/internal/gtm/ai;->apu:Lcom/google/android/gms/internal/gtm/ai;
 
     aput-object v3, v0, v1
 
-    sget-object v1, Lcom/google/android/gms/internal/gtm/ai;->apz:Lcom/google/android/gms/internal/gtm/ai;
+    sget-object v1, Lcom/google/android/gms/internal/gtm/ai;->apv:Lcom/google/android/gms/internal/gtm/ai;
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lcom/google/android/gms/internal/gtm/ai;->apA:[Lcom/google/android/gms/internal/gtm/ai;
+    sput-object v0, Lcom/google/android/gms/internal/gtm/ai;->apw:[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;->apz:Lcom/google/android/gms/internal/gtm/ai;
+    sget-object p0, Lcom/google/android/gms/internal/gtm/ai;->apv:Lcom/google/android/gms/internal/gtm/ai;
 
     return-object p0
 
     :cond_0
-    sget-object p0, Lcom/google/android/gms/internal/gtm/ai;->apy:Lcom/google/android/gms/internal/gtm/ai;
+    sget-object p0, Lcom/google/android/gms/internal/gtm/ai;->apu: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;->apA:[Lcom/google/android/gms/internal/gtm/ai;
+    sget-object v0, Lcom/google/android/gms/internal/gtm/ai;->apw:[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 54b7904a66..1430d1dd49 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 apB:Lcom/google/android/gms/internal/gtm/al;
+.field private apx: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;->apB:Lcom/google/android/gms/internal/gtm/al;
+    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/ak;->apx: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;->apB:Lcom/google/android/gms/internal/gtm/al;
+    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/ak;->apx: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;->apB:Lcom/google/android/gms/internal/gtm/al;
+    iget-object v3, p0, Lcom/google/android/gms/internal/gtm/ak;->apx: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;->apB:Lcom/google/android/gms/internal/gtm/al;
+    iget-object v3, p0, Lcom/google/android/gms/internal/gtm/ak;->apx: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;->apB:Lcom/google/android/gms/internal/gtm/al;
+    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/ak;->apx:Lcom/google/android/gms/internal/gtm/al;
 
-    invoke-interface {p1}, Lcom/google/android/gms/internal/gtm/al;->oL()Lcom/google/android/gms/internal/gtm/aj;
+    invoke-interface {p1}, Lcom/google/android/gms/internal/gtm/al;->oJ()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;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aon:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aoj: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 efa89f2ca9..6afe0ce485 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 oL()Lcom/google/android/gms/internal/gtm/aj;
+.method public abstract oJ()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 f3bafc68d3..87b281f04a 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,9 @@
 
 
 # instance fields
-.field private final aee:Lcom/google/android/gms/internal/gtm/m;
+.field private final adZ:Lcom/google/android/gms/internal/gtm/m;
 
-.field private volatile apC:Ljava/lang/Boolean;
-
-.field private apD:Ljava/lang/String;
-
-.field private apE:Ljava/util/Set;
+.field private apA:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -19,6 +15,10 @@
     .end annotation
 .end field
 
+.field private volatile apy:Ljava/lang/Boolean;
+
+.field private apz:Ljava/lang/String;
+
 
 # direct methods
 .method protected constructor <init>(Lcom/google/android/gms/internal/gtm/m;)V
@@ -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;->aee:Lcom/google/android/gms/internal/gtm/m;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/am;->adZ:Lcom/google/android/gms/internal/gtm/m;
 
     return-void
 .end method
 
-.method public static oN()Z
+.method public static oL()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->apO:Lcom/google/android/gms/internal/gtm/av;
+    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->apK:Lcom/google/android/gms/internal/gtm/av;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aqF:Ljava/lang/Object;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aqB:Ljava/lang/Object;
 
     check-cast v0, Ljava/lang/Boolean;
 
@@ -49,12 +49,12 @@
     return v0
 .end method
 
-.method public static oO()I
+.method public static oM()I
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->aql:Lcom/google/android/gms/internal/gtm/av;
+    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->aqh:Lcom/google/android/gms/internal/gtm/av;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aqF:Ljava/lang/Object;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aqB:Ljava/lang/Object;
 
     check-cast v0, Ljava/lang/Integer;
 
@@ -65,12 +65,12 @@
     return v0
 .end method
 
-.method public static oP()J
+.method public static oN()J
     .locals 2
 
-    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;->apS:Lcom/google/android/gms/internal/gtm/av;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aqF:Ljava/lang/Object;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aqB:Ljava/lang/Object;
 
     check-cast v0, Ljava/lang/Long;
 
@@ -81,96 +81,96 @@
     return-wide v0
 .end method
 
-.method public static oQ()J
+.method public static oO()J
     .locals 2
 
+    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;->aqB: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 oP()I
+    .locals 1
+
+    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->apX:Lcom/google/android/gms/internal/gtm/av;
+
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aqB: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()I
+    .locals 1
+
+    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->apY:Lcom/google/android/gms/internal/gtm/av;
+
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aqB: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 oR()Ljava/lang/String;
+    .locals 1
+
+    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->aqa:Lcom/google/android/gms/internal/gtm/av;
+
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aqB:Ljava/lang/Object;
+
+    check-cast v0, Ljava/lang/String;
+
+    return-object v0
+.end method
+
+.method public static oS()Ljava/lang/String;
+    .locals 1
+
     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;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aqB:Ljava/lang/Object;
 
-    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
-.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;->aqF:Ljava/lang/Object;
-
-    check-cast v0, Ljava/lang/Integer;
-
-    invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
-
-    move-result v0
-
-    return v0
+    return-object v0
 .end method
 
 .method public static oT()Ljava/lang/String;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->aqe:Lcom/google/android/gms/internal/gtm/av;
+    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;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aqB:Ljava/lang/Object;
 
     check-cast v0, Ljava/lang/String;
 
     return-object v0
 .end method
 
-.method public static oU()Ljava/lang/String;
-    .locals 1
-
-    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;->aqF:Ljava/lang/Object;
-
-    check-cast v0, Ljava/lang/String;
-
-    return-object v0
-.end method
-
-.method public static oV()Ljava/lang/String;
-    .locals 1
-
-    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;->aqF:Ljava/lang/Object;
-
-    check-cast v0, Ljava/lang/String;
-
-    return-object v0
-.end method
-
-.method public static oX()J
+.method public static oV()J
     .locals 2
 
-    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;->aqp:Lcom/google/android/gms/internal/gtm/av;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aqF:Ljava/lang/Object;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aqB:Ljava/lang/Object;
 
     check-cast v0, Ljava/lang/Long;
 
@@ -183,29 +183,29 @@
 
 
 # virtual methods
-.method public final oM()Z
+.method public final oK()Z
     .locals 2
 
-    iget-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;->apy: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;->apC:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/am;->apy:Ljava/lang/Boolean;
 
     if-nez v0, :cond_4
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/am;->aee:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/am;->adZ:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aeA:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aew: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;->nx()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/common/util/m;->nv()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;->apC:Ljava/lang/Boolean;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/am;->apy:Ljava/lang/Boolean;
 
     :cond_1
-    iget-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;->apy:Ljava/lang/Boolean;
 
     if-eqz v0, :cond_2
 
-    iget-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;->apy: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;->apC:Ljava/lang/Boolean;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/am;->apy:Ljava/lang/Boolean;
 
     :cond_3
-    iget-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;->apy: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;->apC:Ljava/lang/Boolean;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/am;->apy:Ljava/lang/Boolean;
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/am;->aee:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/am;->adZ:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->om()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->ok()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;->apC:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/am;->apy:Ljava/lang/Boolean;
 
     invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -305,7 +305,7 @@
     return v0
 .end method
 
-.method public final oW()Ljava/util/Set;
+.method public final oU()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;->aqo:Lcom/google/android/gms/internal/gtm/av;
+    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->aqk:Lcom/google/android/gms/internal/gtm/av;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aqF:Ljava/lang/Object;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aqB:Ljava/lang/Object;
 
     check-cast v0, Ljava/lang/String;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/am;->apE:Ljava/util/Set;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/am;->apA:Ljava/util/Set;
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/am;->apD:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/am;->apz: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;->apD:Ljava/lang/String;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/am;->apz:Ljava/lang/String;
 
-    iput-object v2, p0, Lcom/google/android/gms/internal/gtm/am;->apE:Ljava/util/Set;
+    iput-object v2, p0, Lcom/google/android/gms/internal/gtm/am;->apA:Ljava/util/Set;
 
     :cond_2
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/am;->apE:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/am;->apA: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 d5e481843a..efacdd5a86 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 apF:I
+.field private apB:I
 
 
 # direct methods
@@ -17,17 +17,17 @@
 
     const/4 v0, 0x2
 
-    iput v0, p0, Lcom/google/android/gms/internal/gtm/an;->apF:I
+    iput v0, p0, Lcom/google/android/gms/internal/gtm/an;->apB:I
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final lF()I
+.method public final lD()I
     .locals 1
 
-    iget v0, p0, Lcom/google/android/gms/internal/gtm/an;->apF:I
+    iget v0, p0, Lcom/google/android/gms/internal/gtm/an;->apB: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 9f4570779b..559f79b293 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 aoj:Lcom/google/android/gms/internal/gtm/m;
+.field private final aof:Lcom/google/android/gms/internal/gtm/m;
 
-.field private final apG:Ljava/lang/Runnable;
+.field private final apC:Ljava/lang/Runnable;
 
-.field private volatile apH:J
+.field private volatile apD: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;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/ao;->aof: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;->apG:Ljava/lang/Runnable;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/ao;->apC: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;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iget-object p0, p0, Lcom/google/android/gms/internal/gtm/ao;->aof: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;->apH:J
+    iput-wide v0, p0, Lcom/google/android/gms/internal/gtm/ao;->apD: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;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/ao;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v2, v2, Lcom/google/android/gms/internal/gtm/m;->aeA:Landroid/content/Context;
+    iget-object v2, v2, Lcom/google/android/gms/internal/gtm/m;->aew: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;->apH:J
+    iput-wide v0, p0, Lcom/google/android/gms/internal/gtm/ao;->apD: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;->apG:Ljava/lang/Runnable;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ao;->apC:Ljava/lang/Runnable;
 
     invoke-virtual {v0, v1}, Landroid/os/Handler;->removeCallbacks(Ljava/lang/Runnable;)V
 
     return-void
 .end method
 
-.method public final oY()J
+.method public final oW()J
     .locals 5
 
-    iget-wide v0, p0, Lcom/google/android/gms/internal/gtm/ao;->apH:J
+    iget-wide v0, p0, Lcom/google/android/gms/internal/gtm/ao;->apD: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;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ao;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aem:Lcom/google/android/gms/common/util/e;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aei: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;->apH:J
+    iget-wide v2, p0, Lcom/google/android/gms/internal/gtm/ao;->apD:J
 
     sub-long/2addr v0, v2
 
@@ -156,10 +156,10 @@
     return-wide v0
 .end method
 
-.method public final oZ()Z
+.method public final oX()Z
     .locals 5
 
-    iget-wide v0, p0, Lcom/google/android/gms/internal/gtm/ao;->apH:J
+    iget-wide v0, p0, Lcom/google/android/gms/internal/gtm/ao;->apD: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;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ao;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aem:Lcom/google/android/gms/common/util/e;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aei: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;->apH:J
+    iput-wide v0, p0, Lcom/google/android/gms/internal/gtm/ao;->apD: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;->apG:Ljava/lang/Runnable;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ao;->apC: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;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ao;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->om()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->ok()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;->oZ()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/ao;->oX()Z
 
     move-result v0
 
@@ -254,15 +254,15 @@
     return-void
 
     :cond_1
-    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/ao;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/ao;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v2, v2, Lcom/google/android/gms/internal/gtm/m;->aem:Lcom/google/android/gms/common/util/e;
+    iget-object v2, v2, Lcom/google/android/gms/internal/gtm/m;->aei: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;->apH:J
+    iget-wide v4, p0, Lcom/google/android/gms/internal/gtm/ao;->apD: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;->apG:Ljava/lang/Runnable;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ao;->apC: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;->apG:Ljava/lang/Runnable;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ao;->apC: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;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ao;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->om()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->ok()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 05adb344ba..64fbb210be 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 apI:Lcom/google/android/gms/internal/gtm/ao;
+.field private final synthetic apE: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;->apI:Lcom/google/android/gms/internal/gtm/ao;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/ap;->apE: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;->apI:Lcom/google/android/gms/internal/gtm/ao;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ap;->apE: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;->od()Lcom/google/android/gms/analytics/m;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->ob()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;->apI:Lcom/google/android/gms/internal/gtm/ao;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ap;->apE:Lcom/google/android/gms/internal/gtm/ao;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/ao;->oZ()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/ao;->oX()Z
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ap;->apI:Lcom/google/android/gms/internal/gtm/ao;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ap;->apE: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;->apI:Lcom/google/android/gms/internal/gtm/ao;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ap;->apE: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 ea7dea7f19..96a3fb335a 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 nT()V
+.method protected final nR()V
     .locals 0
 
     return-void
 .end method
 
-.method public final pa()Lcom/google/android/gms/internal/gtm/cd;
+.method public final oY()Lcom/google/android/gms/internal/gtm/cd;
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oi()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->od()Lcom/google/android/gms/analytics/m;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->ob()Lcom/google/android/gms/analytics/m;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/analytics/m;->aeA:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/android/gms/analytics/m;->aew: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;->arV:Ljava/lang/String;
+    iput-object v2, v1, Lcom/google/android/gms/internal/gtm/cd;->arR:Ljava/lang/String;
 
     iget v2, v0, Landroid/util/DisplayMetrics;->widthPixels:I
 
-    iput v2, v1, Lcom/google/android/gms/internal/gtm/cd;->arX:I
+    iput v2, v1, Lcom/google/android/gms/internal/gtm/cd;->arT:I
 
     iget v0, v0, Landroid/util/DisplayMetrics;->heightPixels:I
 
-    iput v0, v1, Lcom/google/android/gms/internal/gtm/cd;->arY:I
+    iput v0, v1, Lcom/google/android/gms/internal/gtm/cd;->arU: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 03af7acfe5..b270613503 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 apJ:Z
+.field apF:Z
 
-.field apK:Z
+.field apG:Z
 
-.field private final apL:Landroid/app/AlarmManager;
+.field private final apH:Landroid/app/AlarmManager;
 
-.field private apM:Ljava/lang/Integer;
+.field private apI: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;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/j;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/gtm/m;->aeA:Landroid/content/Context;
+    iget-object p1, p1, Lcom/google/android/gms/internal/gtm/m;->aew: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;->apL:Landroid/app/AlarmManager;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/ar;->apH:Landroid/app/AlarmManager;
 
     return-void
 .end method
 
-.method private final pc()Landroid/app/PendingIntent;
+.method private final pa()Landroid/app/PendingIntent;
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aeA:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aew:Landroid/content/Context;
 
     new-instance v1, Landroid/content/Intent;
 
@@ -67,18 +67,18 @@
     return-object v0
 .end method
 
-.method private final pd()I
+.method private final pb()I
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ar;->apM:Ljava/lang/Integer;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ar;->apI:Ljava/lang/Integer;
 
     if-nez v0, :cond_1
 
     const-string v0, "analytics"
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/j;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/m;->aeA:Landroid/content/Context;
+    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/m;->aew: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;->apM:Ljava/lang/Integer;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/ar;->apI:Ljava/lang/Integer;
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ar;->apM:Ljava/lang/Integer;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ar;->apI: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;->apK:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/internal/gtm/ar;->apG:Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ar;->apL:Landroid/app/AlarmManager;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ar;->apH:Landroid/app/AlarmManager;
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/ar;->pc()Landroid/app/PendingIntent;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/ar;->pa()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;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aeA:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aew: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;->pd()I
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/ar;->pb()I
 
     move-result v1
 
@@ -181,13 +181,13 @@
     return-void
 .end method
 
-.method protected final nT()V
+.method protected final nR()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;->oQ()J
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oO()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;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aeA:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aew: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;->apJ:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/internal/gtm/ar;->apF: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 pb()V
+.method public final oZ()V
     .locals 9
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oi()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/ar;->apJ:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/ar;->apF: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;->oQ()J
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oO()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;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aem:Lcom/google/android/gms/common/util/e;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aei:Lcom/google/android/gms/common/util/e;
 
-    invoke-interface {v0}, Lcom/google/android/gms/common/util/e;->nr()J
+    invoke-interface {v0}, Lcom/google/android/gms/common/util/e;->np()J
 
     move-result-wide v0
 
@@ -273,11 +273,11 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/internal/gtm/ar;->apK:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/internal/gtm/ar;->apG:Z
 
-    sget-object v1, Lcom/google/android/gms/internal/gtm/au;->aqE:Lcom/google/android/gms/internal/gtm/av;
+    sget-object v1, Lcom/google/android/gms/internal/gtm/au;->aqA:Lcom/google/android/gms/internal/gtm/av;
 
-    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/av;->aqF:Ljava/lang/Object;
+    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/av;->aqB: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;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/j;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/m;->aeA:Landroid/content/Context;
+    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/m;->aew: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;->pd()I
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/ar;->pb()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;->apL:Landroid/app/AlarmManager;
+    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/ar;->apH:Landroid/app/AlarmManager;
 
     const/4 v3, 0x2
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/ar;->pc()Landroid/app/PendingIntent;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/ar;->pa()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 fdc91696fe..7c97904bf0 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 oG()V
+.method public abstract oE()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 9fe632ee1d..0758284ba7 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 apN:Lcom/google/android/gms/internal/gtm/av;
+.field private static apJ: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 apO:Lcom/google/android/gms/internal/gtm/av;
+.field public static apK: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 apP:Lcom/google/android/gms/internal/gtm/av;
+.field public static apL: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 apQ:Lcom/google/android/gms/internal/gtm/av;
+.field private static apM: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 apR: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<",
@@ -53,7 +53,7 @@
     .end annotation
 .end field
 
-.field public static apS: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<",
@@ -63,21 +63,61 @@
     .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/Integer;",
+            ">;"
+        }
+    .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/Integer;",
+            ">;"
+        }
+    .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 = {
+            "Lcom/google/android/gms/internal/gtm/av<",
+            "Ljava/lang/Long;",
+            ">;"
+        }
+    .end annotation
+.end field
+
 .field private static apT:Lcom/google/android/gms/internal/gtm/av;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/gtm/av<",
-            "Ljava/lang/Integer;",
+            "Ljava/lang/Long;",
             ">;"
         }
     .end annotation
 .end field
 
-.field public static apU:Lcom/google/android/gms/internal/gtm/av;
+.field private static apU: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
@@ -103,21 +143,21 @@
     .end annotation
 .end field
 
-.field private static apX:Lcom/google/android/gms/internal/gtm/av;
+.field public static apX:Lcom/google/android/gms/internal/gtm/av;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/gtm/av<",
-            "Ljava/lang/Long;",
+            "Ljava/lang/Integer;",
             ">;"
         }
     .end annotation
 .end field
 
-.field private static apY:Lcom/google/android/gms/internal/gtm/av;
+.field public static apY: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
@@ -127,53 +167,13 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/gtm/av<",
-            "Ljava/lang/Long;",
+            "Ljava/lang/String;",
             ">;"
         }
     .end annotation
 .end field
 
-.field private static 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;
+.field public static aqA:Lcom/google/android/gms/internal/gtm/av;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/gtm/av<",
@@ -187,7 +187,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/gtm/av<",
-            "Ljava/lang/Long;",
+            "Ljava/lang/String;",
             ">;"
         }
     .end annotation
@@ -197,7 +197,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/gtm/av<",
-            "Ljava/lang/Integer;",
+            "Ljava/lang/String;",
             ">;"
         }
     .end annotation
@@ -207,7 +207,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/gtm/av<",
-            "Ljava/lang/Integer;",
+            "Ljava/lang/String;",
             ">;"
         }
     .end annotation
@@ -217,7 +217,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/gtm/av<",
-            "Ljava/lang/String;",
+            "Ljava/lang/Integer;",
             ">;"
         }
     .end annotation
@@ -243,11 +243,11 @@
     .end annotation
 .end field
 
-.field public static aqg:Lcom/google/android/gms/internal/gtm/av;
+.field private static aqg: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/Integer;",
             ">;"
         }
     .end annotation
@@ -267,7 +267,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/gtm/av<",
-            "Ljava/lang/String;",
+            "Ljava/lang/Integer;",
             ">;"
         }
     .end annotation
@@ -277,17 +277,17 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/gtm/av<",
-            "Ljava/lang/String;",
+            "Ljava/lang/Integer;",
             ">;"
         }
     .end annotation
 .end field
 
-.field private static aqk:Lcom/google/android/gms/internal/gtm/av;
+.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/Integer;",
+            "Ljava/lang/String;",
             ">;"
         }
     .end annotation
@@ -303,11 +303,11 @@
     .end annotation
 .end field
 
-.field public static aqm:Lcom/google/android/gms/internal/gtm/av;
+.field private static aqm: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
@@ -327,7 +327,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/gtm/av<",
-            "Ljava/lang/String;",
+            "Ljava/lang/Integer;",
             ">;"
         }
     .end annotation
@@ -337,7 +337,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/gtm/av<",
-            "Ljava/lang/Integer;",
+            "Ljava/lang/Long;",
             ">;"
         }
     .end annotation
@@ -347,13 +347,13 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/gtm/av<",
-            "Ljava/lang/Long;",
+            "Ljava/lang/String;",
             ">;"
         }
     .end annotation
 .end field
 
-.field public static aqr:Lcom/google/android/gms/internal/gtm/av;
+.field private static aqr:Lcom/google/android/gms/internal/gtm/av;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/gtm/av<",
@@ -367,7 +367,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/gtm/av<",
-            "Ljava/lang/Integer;",
+            "Ljava/lang/Boolean;",
             ">;"
         }
     .end annotation
@@ -383,11 +383,11 @@
     .end annotation
 .end field
 
-.field private static aqu:Lcom/google/android/gms/internal/gtm/av;
+.field public 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;",
+            "Ljava/lang/Long;",
             ">;"
         }
     .end annotation
@@ -397,17 +397,17 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/gtm/av<",
-            "Ljava/lang/Integer;",
+            "Ljava/lang/Long;",
             ">;"
         }
     .end annotation
 .end field
 
-.field public static aqw:Lcom/google/android/gms/internal/gtm/av;
+.field private 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;",
+            "Ljava/lang/Long;",
             ">;"
         }
     .end annotation
@@ -433,7 +433,7 @@
     .end annotation
 .end field
 
-.field private static aqz:Lcom/google/android/gms/internal/gtm/av;
+.field public static aqz:Lcom/google/android/gms/internal/gtm/av;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/gtm/av<",
@@ -456,7 +456,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/google/android/gms/internal/gtm/au;->apN:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v1, Lcom/google/android/gms/internal/gtm/au;->apJ: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;->apO:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v1, Lcom/google/android/gms/internal/gtm/au;->apK: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;->apP:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v1, Lcom/google/android/gms/internal/gtm/au;->apL: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;->apQ:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v1, Lcom/google/android/gms/internal/gtm/au;->apM: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;->apR: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/16 v1, 0x7d0
 
@@ -518,7 +518,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;->apO: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;->apT: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/16 v1, 0x64
 
@@ -536,7 +536,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/google/android/gms/internal/gtm/au;->apU: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;
 
     const-wide/32 v1, 0x1d4c0
 
@@ -548,7 +548,7 @@
 
     move-result-object v5
 
-    sput-object v5, Lcom/google/android/gms/internal/gtm/au;->apV:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v5, Lcom/google/android/gms/internal/gtm/au;->apR: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;->apW:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v7, Lcom/google/android/gms/internal/gtm/au;->apS: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;->apX: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-wide/32 v1, 0x6ddd00
 
@@ -576,7 +576,7 @@
 
     move-result-object v7
 
-    sput-object v7, Lcom/google/android/gms/internal/gtm/au;->apY:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v7, Lcom/google/android/gms/internal/gtm/au;->apU: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;->apZ:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v1, Lcom/google/android/gms/internal/gtm/au;->apV: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;->aqa:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v1, Lcom/google/android/gms/internal/gtm/au;->apW: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;->aqb:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v2, Lcom/google/android/gms/internal/gtm/au;->apX: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;->aqc:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v2, Lcom/google/android/gms/internal/gtm/au;->apY: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;->aqd:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v2, Lcom/google/android/gms/internal/gtm/au;->apZ: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;->aqe:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v2, Lcom/google/android/gms/internal/gtm/au;->aqa: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;->aqf: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.batching_endpoint"
 
@@ -652,7 +652,7 @@
 
     move-result-object v2
 
-    sput-object v2, Lcom/google/android/gms/internal/gtm/au;->aqg: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/16 v2, 0x7f4
 
@@ -662,15 +662,15 @@
 
     move-result-object v2
 
-    sput-object v2, Lcom/google/android/gms/internal/gtm/au;->aqh: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;
 
-    sget-object v2, Lcom/google/android/gms/internal/gtm/ad;->apr:Lcom/google/android/gms/internal/gtm/ad;
+    sget-object v2, Lcom/google/android/gms/internal/gtm/ad;->apm: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;->apr: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;
 
     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;->aqi: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;
 
-    sget-object v2, Lcom/google/android/gms/internal/gtm/ai;->apz:Lcom/google/android/gms/internal/gtm/ai;
+    sget-object v2, Lcom/google/android/gms/internal/gtm/ai;->apv: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;->aqj: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.max_hits_per_request.k"
 
@@ -704,7 +704,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/google/android/gms/internal/gtm/au;->aqk:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v1, Lcom/google/android/gms/internal/gtm/au;->aqg: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;->aql: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;
 
     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;->aqm: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;
 
     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;->aqn:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v1, Lcom/google/android/gms/internal/gtm/au;->aqj: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;->aqo: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-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;->aqp:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v1, Lcom/google/android/gms/internal/gtm/au;->aql: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;->aqq:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v7, Lcom/google/android/gms/internal/gtm/au;->aqm: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;->aqr:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v7, Lcom/google/android/gms/internal/gtm/au;->aqn: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;->aqs:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v7, Lcom/google/android/gms/internal/gtm/au;->aqo: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;->aqt:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v7, Lcom/google/android/gms/internal/gtm/au;->aqp: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;->aqu: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.first_party_experiment_variant"
 
@@ -812,7 +812,7 @@
 
     move-result-object v7
 
-    sput-object v7, Lcom/google/android/gms/internal/gtm/au;->aqv: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.test.disable_receiver"
 
@@ -820,7 +820,7 @@
 
     move-result-object v7
 
-    sput-object v7, Lcom/google/android/gms/internal/gtm/au;->aqw: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.service_client.idle_disconnect_millis"
 
@@ -832,7 +832,7 @@
 
     move-result-object v7
 
-    sput-object v7, Lcom/google/android/gms/internal/gtm/au;->aqx: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.service_client.connect_timeout_millis"
 
@@ -840,7 +840,7 @@
 
     move-result-object v7
 
-    sput-object v7, Lcom/google/android/gms/internal/gtm/au;->aqy: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.service_client.second_connect_delay_millis"
 
@@ -848,7 +848,7 @@
 
     move-result-object v7
 
-    sput-object v7, Lcom/google/android/gms/internal/gtm/au;->aqz: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.service_client.unexpected_reconnect_millis"
 
@@ -860,7 +860,7 @@
 
     move-result-object v7
 
-    sput-object v7, Lcom/google/android/gms/internal/gtm/au;->aqA: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.reconnect_throttle_millis"
 
@@ -868,7 +868,7 @@
 
     move-result-object v3
 
-    sput-object v3, Lcom/google/android/gms/internal/gtm/au;->aqB:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v3, Lcom/google/android/gms/internal/gtm/au;->aqx: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;->aqC:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v1, Lcom/google/android/gms/internal/gtm/au;->aqy: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;->aqD:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v1, Lcom/google/android/gms/internal/gtm/au;->aqz: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;->aqE:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v0, Lcom/google/android/gms/internal/gtm/au;->aqA: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 9755377796..d2bb077381 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 aqF:Ljava/lang/Object;
+.field final aqB:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TV;"
@@ -22,7 +22,7 @@
     .end annotation
 .end field
 
-.field private final aqG:Lcom/google/android/gms/common/a/a;
+.field private final aqC: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;->aqG:Lcom/google/android/gms/common/a/a;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/av;->aqC:Lcom/google/android/gms/common/a/a;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/av;->aqF:Ljava/lang/Object;
+    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/av;->aqB: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 529c3df8cd..9b9b390f2c 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 aoj:Lcom/google/android/gms/internal/gtm/m;
+.field private final aof:Lcom/google/android/gms/internal/gtm/m;
 
-.field private final aqH:Lcom/google/android/gms/internal/gtm/ay;
+.field private final aqD: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;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/ax;->aof: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;->aqH:Lcom/google/android/gms/internal/gtm/ay;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/ax;->aqD: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;->aqH:Lcom/google/android/gms/internal/gtm/ay;
+    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/ax;->aqD:Lcom/google/android/gms/internal/gtm/ay;
 
-    iput-object p2, p1, Lcom/google/android/gms/internal/gtm/ay;->aqI:Ljava/lang/String;
+    iput-object p2, p1, Lcom/google/android/gms/internal/gtm/ay;->aqE: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;->aqH:Lcom/google/android/gms/internal/gtm/ay;
+    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/ax;->aqD:Lcom/google/android/gms/internal/gtm/ay;
 
-    iput-object p2, p1, Lcom/google/android/gms/internal/gtm/ay;->aqJ:Ljava/lang/String;
+    iput-object p2, p1, Lcom/google/android/gms/internal/gtm/ay;->aqF: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;->aqH:Lcom/google/android/gms/internal/gtm/ay;
+    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/ax;->aqD:Lcom/google/android/gms/internal/gtm/ay;
 
-    iput-object p2, p1, Lcom/google/android/gms/internal/gtm/ay;->aqK:Ljava/lang/String;
+    iput-object p2, p1, Lcom/google/android/gms/internal/gtm/ay;->aqG:Ljava/lang/String;
 
     return-void
 
     :cond_2
-    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/ax;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/ax;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/gtm/m;->om()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/gtm/m;->ok()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;->aqH:Lcom/google/android/gms/internal/gtm/ay;
+    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/ax;->aqD:Lcom/google/android/gms/internal/gtm/ay;
 
-    iput p2, p1, Lcom/google/android/gms/internal/gtm/ay;->aqM:I
+    iput p2, p1, Lcom/google/android/gms/internal/gtm/ay;->aqI:I
 
     return-void
 
     :cond_0
-    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/ax;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/ax;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/gtm/m;->om()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/gtm/m;->ok()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;->aqH:Lcom/google/android/gms/internal/gtm/ay;
+    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/ax;->aqD:Lcom/google/android/gms/internal/gtm/ay;
 
-    iput p2, p1, Lcom/google/android/gms/internal/gtm/ay;->aqL:I
+    iput p2, p1, Lcom/google/android/gms/internal/gtm/ay;->aqH:I
 
     return-void
 
     :cond_0
-    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/ax;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/ax;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/gtm/m;->om()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/gtm/m;->ok()Lcom/google/android/gms/internal/gtm/bd;
 
     move-result-object p2
 
@@ -164,10 +164,10 @@
     return-void
 .end method
 
-.method public final synthetic oL()Lcom/google/android/gms/internal/gtm/aj;
+.method public final synthetic oJ()Lcom/google/android/gms/internal/gtm/aj;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ax;->aqH:Lcom/google/android/gms/internal/gtm/ay;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ax;->aqD: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 457288c191..ee25a2d5df 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 aqI:Ljava/lang/String;
+.field public aqE:Ljava/lang/String;
 
-.field public aqJ:Ljava/lang/String;
+.field public aqF:Ljava/lang/String;
 
-.field public aqK:Ljava/lang/String;
+.field public aqG:Ljava/lang/String;
 
-.field public aqL:I
+.field public aqH:I
 
-.field public aqM:I
+.field public aqI:I
 
 
 # direct methods
@@ -25,9 +25,9 @@
 
     const/4 v0, -0x1
 
-    iput v0, p0, Lcom/google/android/gms/internal/gtm/ay;->aqL:I
+    iput v0, p0, Lcom/google/android/gms/internal/gtm/ay;->aqH:I
 
-    iput v0, p0, Lcom/google/android/gms/internal/gtm/ay;->aqM:I
+    iput v0, p0, Lcom/google/android/gms/internal/gtm/ay;->aqI: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 52a4d93a50..4d92a6165a 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 aoI:Ljava/util/Map;
+.field final aoE:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -14,7 +14,7 @@
     .end annotation
 .end field
 
-.field final aqN:Ljava/util/List;
+.field final aqJ:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -24,15 +24,15 @@
     .end annotation
 .end field
 
-.field final aqO:J
+.field final aqK:J
 
-.field final aqP:J
+.field final aqL:J
 
-.field final aqQ:I
+.field final aqM:I
 
-.field final aqR:Z
+.field final aqN:Z
 
-.field private final aqS:Ljava/lang/String;
+.field private final aqO: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;->aqP:J
+    iput-wide p3, p0, Lcom/google/android/gms/internal/gtm/az;->aqL:J
 
-    iput-boolean p5, p0, Lcom/google/android/gms/internal/gtm/az;->aqR:Z
+    iput-boolean p5, p0, Lcom/google/android/gms/internal/gtm/az;->aqN:Z
 
-    iput-wide p6, p0, Lcom/google/android/gms/internal/gtm/az;->aqO:J
+    iput-wide p6, p0, Lcom/google/android/gms/internal/gtm/az;->aqK:J
 
-    iput p8, p0, Lcom/google/android/gms/internal/gtm/az;->aqQ:I
+    iput p8, p0, Lcom/google/android/gms/internal/gtm/az;->aqM: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;->aqN:Ljava/util/List;
+    iput-object p3, p0, Lcom/google/android/gms/internal/gtm/az;->aqJ: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;->apw:Ljava/lang/String;
+    iget-object p6, p5, Lcom/google/android/gms/internal/gtm/zzbk;->aps: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;->aqS:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/internal/gtm/az;->aqO: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;->aqS:Ljava/lang/String;
+    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/az;->aqO: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;->aqS:Ljava/lang/String;
+    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/az;->aqO: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;->aqS:Ljava/lang/String;
+    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/az;->aqO: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;->aqS:Ljava/lang/String;
+    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/az;->aqO: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;->aoI:Ljava/util/Map;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/az;->aoE: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;->aoI:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/az;->aoE: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;->aqP:J
+    iget-wide v1, p0, Lcom/google/android/gms/internal/gtm/az;->aqL: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;->aqO:J
+    iget-wide v1, p0, Lcom/google/android/gms/internal/gtm/az;->aqK: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;->aqO:J
+    iget-wide v1, p0, Lcom/google/android/gms/internal/gtm/az;->aqK: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;->aqQ:I
+    iget v1, p0, Lcom/google/android/gms/internal/gtm/az;->aqM: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;->aqQ:I
+    iget v1, p0, Lcom/google/android/gms/internal/gtm/az;->aqM: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;->aoI:Ljava/util/Map;
+    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/az;->aoE: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;->aoI:Ljava/util/Map;
+    iget-object v5, p0, Lcom/google/android/gms/internal/gtm/az;->aoE: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 95ed0b3dfb..efa9bf14b8 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 anQ:Ljava/lang/String;
+.field public anM:Ljava/lang/String;
 
-.field public anR:Ljava/lang/String;
+.field public anN:Ljava/lang/String;
 
-.field public anS:Ljava/lang/String;
+.field public anO: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;->anQ:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/b;->anM: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;->anQ:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/b;->anM:Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/b;->anQ:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/b;->anM:Ljava/lang/String;
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/b;->anR:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/b;->anN: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;->anR:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/b;->anN:Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/b;->anR:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/b;->anN:Ljava/lang/String;
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/b;->anS:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/b;->anO: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;->anS:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/b;->anO:Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/b;->anS:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/b;->anO: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;->anQ:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/b;->anM: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;->anR:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/b;->anN: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;->anS:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/b;->anO: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 725a28089a..e35e7b00c9 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;->nM()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/bx;->nK()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 8056b8908c..df4ca32b25 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 aqT:Lcom/google/android/gms/analytics/c;
+.field private static volatile aqP: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;->aqT:Lcom/google/android/gms/analytics/c;
+    sput-object v0, Lcom/google/android/gms/internal/gtm/bc;->aqP: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;->pe()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/bd;->pc()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;->aqT:Lcom/google/android/gms/analytics/c;
+    sget-object v0, Lcom/google/android/gms/internal/gtm/bc;->aqP: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;->aqT:Lcom/google/android/gms/analytics/c;
+    sget-object v0, Lcom/google/android/gms/internal/gtm/bc;->aqP:Lcom/google/android/gms/analytics/c;
 
-    invoke-interface {v0}, Lcom/google/android/gms/analytics/c;->lF()I
+    invoke-interface {v0}, Lcom/google/android/gms/analytics/c;->lD()I
 
     move-result v0
 
@@ -104,9 +104,9 @@
     move-result-object p0
 
     :cond_2
-    sget-object p1, Lcom/google/android/gms/internal/gtm/au;->apP:Lcom/google/android/gms/internal/gtm/av;
+    sget-object p1, Lcom/google/android/gms/internal/gtm/au;->apL:Lcom/google/android/gms/internal/gtm/av;
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/gtm/av;->aqF:Ljava/lang/Object;
+    iget-object p1, p1, Lcom/google/android/gms/internal/gtm/av;->aqB: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 e964d91b0e..1d90bdca27 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 aqU:Lcom/google/android/gms/internal/gtm/bd;
+.field private static aqQ:Lcom/google/android/gms/internal/gtm/bd;
 
 
 # direct methods
@@ -193,10 +193,10 @@
     return-object v1
 .end method
 
-.method public static pe()Lcom/google/android/gms/internal/gtm/bd;
+.method public static pc()Lcom/google/android/gms/internal/gtm/bd;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/gtm/bd;->aqU:Lcom/google/android/gms/internal/gtm/bd;
+    sget-object v0, Lcom/google/android/gms/internal/gtm/bd;->aqQ: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;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/j;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/m;->aoo:Lcom/google/android/gms/internal/gtm/am;
+    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/m;->aok:Lcom/google/android/gms/internal/gtm/am;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/am;->oM()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/am;->oK()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;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/j;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object p3, p2, Lcom/google/android/gms/internal/gtm/m;->aou:Lcom/google/android/gms/internal/gtm/bh;
+    iget-object p3, p2, Lcom/google/android/gms/internal/gtm/m;->aoq:Lcom/google/android/gms/internal/gtm/bh;
 
     if-eqz p3, :cond_5
 
-    iget-object p3, p2, Lcom/google/android/gms/internal/gtm/m;->aou:Lcom/google/android/gms/internal/gtm/bh;
+    iget-object p3, p2, Lcom/google/android/gms/internal/gtm/m;->aoq: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;->aou:Lcom/google/android/gms/internal/gtm/bh;
+    iget-object p2, p2, Lcom/google/android/gms/internal/gtm/m;->aoq: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;->arh:Lcom/google/android/gms/internal/gtm/bi;
+    iget-object p2, p2, Lcom/google/android/gms/internal/gtm/bh;->ard:Lcom/google/android/gms/internal/gtm/bi;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/gtm/bi;->pr()J
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/gtm/bi;->pp()J
 
     move-result-wide p3
 
@@ -408,7 +408,7 @@
 
     if-nez p5, :cond_6
 
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/gtm/bi;->pp()V
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/gtm/bi;->pn()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;->arj:Lcom/google/android/gms/internal/gtm/bh;
+    iget-object p3, p2, Lcom/google/android/gms/internal/gtm/bi;->arf:Lcom/google/android/gms/internal/gtm/bh;
 
-    iget-object p3, p3, Lcom/google/android/gms/internal/gtm/bh;->are:Landroid/content/SharedPreferences;
+    iget-object p3, p3, Lcom/google/android/gms/internal/gtm/bh;->ara:Landroid/content/SharedPreferences;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/gtm/bi;->pt()Ljava/lang/String;
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/gtm/bi;->pr()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;->arj:Lcom/google/android/gms/internal/gtm/bh;
+    iget-object p3, p2, Lcom/google/android/gms/internal/gtm/bi;->arf:Lcom/google/android/gms/internal/gtm/bh;
 
-    iget-object p3, p3, Lcom/google/android/gms/internal/gtm/bh;->are:Landroid/content/SharedPreferences;
+    iget-object p3, p3, Lcom/google/android/gms/internal/gtm/bh;->ara: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;->pu()Ljava/lang/String;
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/gtm/bi;->ps()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;->pt()Ljava/lang/String;
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/gtm/bi;->pr()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;->arj:Lcom/google/android/gms/internal/gtm/bh;
+    iget-object p5, p2, Lcom/google/android/gms/internal/gtm/bi;->arf:Lcom/google/android/gms/internal/gtm/bh;
 
-    iget-object p5, p5, Lcom/google/android/gms/internal/gtm/bh;->are:Landroid/content/SharedPreferences;
+    iget-object p5, p5, Lcom/google/android/gms/internal/gtm/bh;->ara: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;->pu()Ljava/lang/String;
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/gtm/bi;->ps()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;->pt()Ljava/lang/String;
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/gtm/bi;->pr()Ljava/lang/String;
 
     move-result-object p1
 
@@ -667,7 +667,7 @@
     return-void
 .end method
 
-.method protected final nT()V
+.method protected final nR()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;->aqU:Lcom/google/android/gms/internal/gtm/bd;
+    sput-object p0, Lcom/google/android/gms/internal/gtm/bd;->aqQ: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 f78058265a..00347aea4b 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 aqV:Ljava/lang/String;
+.field static final aqR:Ljava/lang/String;
 
 
 # instance fields
-.field final aoj:Lcom/google/android/gms/internal/gtm/m;
+.field final aof:Lcom/google/android/gms/internal/gtm/m;
 
-.field private aqW:Z
+.field private aqS:Z
 
-.field private aqX:Z
+.field private aqT:Z
 
 
 # direct methods
@@ -24,7 +24,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/gtm/be;->aqV:Ljava/lang/String;
+    sput-object v0, Lcom/google/android/gms/internal/gtm/be;->aqR: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;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/be;->aof:Lcom/google/android/gms/internal/gtm/m;
 
     return-void
 .end method
 
-.method private final pg()V
+.method private final pe()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/be;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/be;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->om()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->ok()Lcom/google/android/gms/internal/gtm/bd;
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/be;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/be;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->oe()Lcom/google/android/gms/internal/gtm/e;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->oc()Lcom/google/android/gms/internal/gtm/e;
 
     return-void
 .end method
 
-.method private final ph()Z
+.method private final pf()Z
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/be;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/be;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aeA:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aew: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;->aqW:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/be;->aqS:Z
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/be;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/be;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->om()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->ok()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;->aqX:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/be;->aqT: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;->pg()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/be;->pe()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;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/be;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->om()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->ok()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;->ph()Z
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/be;->pf()Z
 
     move-result p1
 
-    iget-boolean p2, p0, Lcom/google/android/gms/internal/gtm/be;->aqX:Z
+    iget-boolean p2, p0, Lcom/google/android/gms/internal/gtm/be;->aqT:Z
 
     if-eq p2, p1, :cond_0
 
-    iput-boolean p1, p0, Lcom/google/android/gms/internal/gtm/be;->aqX:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/internal/gtm/be;->aqT:Z
 
-    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/be;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/be;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/gtm/m;->oe()Lcom/google/android/gms/internal/gtm/e;
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/gtm/m;->oc()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;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p2, Lcom/google/android/gms/internal/gtm/j;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->od()Lcom/google/android/gms/analytics/m;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->ob()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;->aqV:Ljava/lang/String;
+    sget-object p1, Lcom/google/android/gms/internal/gtm/be;->aqR: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;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/be;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/m;->oe()Lcom/google/android/gms/internal/gtm/e;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/m;->oc()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;->nZ()V
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/e;->nX()V
 
     :cond_2
     return-void
 
     :cond_3
-    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/be;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/be;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/gtm/m;->om()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/gtm/m;->ok()Lcom/google/android/gms/internal/gtm/bd;
 
     move-result-object p2
 
@@ -233,21 +233,21 @@
     return-void
 .end method
 
-.method public final pf()V
+.method public final pd()V
     .locals 3
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/be;->pg()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/be;->pe()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/be;->aqW:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/be;->aqS:Z
 
     if-eqz v0, :cond_0
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/be;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/be;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aeA:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aew: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;->ph()Z
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/be;->pf()Z
 
     move-result v0
 
-    iput-boolean v0, p0, Lcom/google/android/gms/internal/gtm/be;->aqX:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/internal/gtm/be;->aqT:Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/be;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/be;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->om()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->ok()Lcom/google/android/gms/internal/gtm/bd;
 
     move-result-object v0
 
-    iget-boolean v1, p0, Lcom/google/android/gms/internal/gtm/be;->aqX:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/internal/gtm/be;->aqT: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;->aqW:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/internal/gtm/be;->aqS: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;->aqW:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/be;->aqS:Z
 
     if-nez v0, :cond_0
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/be;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/be;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->om()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->ok()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;->aqW:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/internal/gtm/be;->aqS:Z
 
-    iput-boolean v0, p0, Lcom/google/android/gms/internal/gtm/be;->aqX:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/internal/gtm/be;->aqT:Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/be;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/be;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aeA:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aew: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;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/be;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/m;->om()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/m;->ok()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 e67e3df389..1b507b0674 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 ara:[B
+.field private static final aqW:[B
 
 
 # instance fields
-.field private final aqY:Ljava/lang/String;
+.field private final aqU:Ljava/lang/String;
 
-.field private final aqZ:Lcom/google/android/gms/internal/gtm/bp;
+.field private final aqV: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;->ara:[B
+    sput-object v0, Lcom/google/android/gms/internal/gtm/bf;->aqW:[B
 
     return-void
 .end method
@@ -84,15 +84,15 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/bf;->aqY:Ljava/lang/String;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/bf;->aqU:Ljava/lang/String;
 
     new-instance v0, Lcom/google/android/gms/internal/gtm/bp;
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/gtm/m;->aem:Lcom/google/android/gms/common/util/e;
+    iget-object p1, p1, Lcom/google/android/gms/internal/gtm/m;->aei: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;->aqZ:Lcom/google/android/gms/internal/gtm/bp;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/bf;->aqV: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;->oj()Z
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/bf;->oh()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;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/j;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v2, v2, Lcom/google/android/gms/internal/gtm/m;->aeA:Landroid/content/Context;
+    iget-object v2, v2, Lcom/google/android/gms/internal/gtm/m;->aew: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;->oe()Lcom/google/android/gms/internal/gtm/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->oc()Lcom/google/android/gms/internal/gtm/e;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/gtm/e;->oc()V
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/gtm/e;->oa()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;->oe()Lcom/google/android/gms/internal/gtm/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->oc()Lcom/google/android/gms/internal/gtm/e;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/e;->oc()V
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/e;->oa()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;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/j;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v2, v2, Lcom/google/android/gms/internal/gtm/m;->aeA:Landroid/content/Context;
+    iget-object v2, v2, Lcom/google/android/gms/internal/gtm/m;->aew: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;->oj()Z
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/bf;->oh()Z
 
     move-result v3
 
@@ -591,11 +591,11 @@
 
     if-ne p2, v2, :cond_3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->oe()Lcom/google/android/gms/internal/gtm/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->oc()Lcom/google/android/gms/internal/gtm/e;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/gtm/e;->oc()V
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/gtm/e;->oa()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;->aqR:Z
+    iget-boolean p1, p1, Lcom/google/android/gms/internal/gtm/az;->aqN:Z
 
     const-string v0, "?"
 
     if-eqz p1, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oT()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oR()Ljava/lang/String;
 
     move-result-object p1
 
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oV()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oT()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;->oU()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oS()Ljava/lang/String;
 
     move-result-object p1
 
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oV()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oT()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;->aqr:Lcom/google/android/gms/internal/gtm/av;
+    sget-object v1, Lcom/google/android/gms/internal/gtm/au;->aqn:Lcom/google/android/gms/internal/gtm/av;
 
-    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/av;->aqF:Ljava/lang/Object;
+    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/av;->aqB: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;->aqs:Lcom/google/android/gms/internal/gtm/av;
+    sget-object v1, Lcom/google/android/gms/internal/gtm/au;->aqo:Lcom/google/android/gms/internal/gtm/av;
 
-    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/av;->aqF:Ljava/lang/Object;
+    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/av;->aqB: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;->aqY:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bf;->aqU: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;->aqR:Z
+    iget-boolean p1, p1, Lcom/google/android/gms/internal/gtm/az;->aqN:Z
 
     if-eqz p1, :cond_1
 
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oT()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oR()Ljava/lang/String;
 
     move-result-object p1
 
@@ -1048,7 +1048,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oV()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oT()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;->oU()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oS()Ljava/lang/String;
 
     move-result-object p1
 
@@ -1087,7 +1087,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oV()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oT()Ljava/lang/String;
 
     move-result-object v0
 
@@ -1136,10 +1136,10 @@
     return-object p1
 .end method
 
-.method private final pi()Ljava/net/URL;
+.method private final pg()Ljava/net/URL;
     .locals 3
 
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oT()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oR()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;->aqg:Lcom/google/android/gms/internal/gtm/av;
+    sget-object v1, Lcom/google/android/gms/internal/gtm/au;->aqc:Lcom/google/android/gms/internal/gtm/av;
 
-    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/av;->aqF:Ljava/lang/Object;
+    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/av;->aqB:Ljava/lang/Object;
 
     check-cast v1, Ljava/lang/String;
 
@@ -1198,10 +1198,10 @@
     return-object v0
 .end method
 
-.method static synthetic pj()[B
+.method static synthetic ph()[B
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/gtm/bf;->ara:[B
+    sget-object v0, Lcom/google/android/gms/internal/gtm/bf;->aqW:[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;->aoI:Ljava/util/Map;
+    iget-object v1, p1, Lcom/google/android/gms/internal/gtm/az;->aoE: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;->aqP:J
+    iget-wide v1, p1, Lcom/google/android/gms/internal/gtm/az;->aqL: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;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/j;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/m;->aem:Lcom/google/android/gms/common/util/e;
+    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/m;->aei: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;->aqP:J
+    iget-wide v5, p1, Lcom/google/android/gms/internal/gtm/az;->aqL: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;->aqO:J
+    iget-wide p1, p1, Lcom/google/android/gms/internal/gtm/az;->aqK: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;->lN()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lL()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oi()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;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aoo:Lcom/google/android/gms/internal/gtm/am;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aok:Lcom/google/android/gms/internal/gtm/am;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/am;->oW()Ljava/util/Set;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/am;->oU()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;->aqZ:Lcom/google/android/gms/internal/gtm/bp;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bf;->aqV:Lcom/google/android/gms/internal/gtm/bp;
 
-    sget-object v3, Lcom/google/android/gms/internal/gtm/au;->aqp:Lcom/google/android/gms/internal/gtm/av;
+    sget-object v3, Lcom/google/android/gms/internal/gtm/au;->aql:Lcom/google/android/gms/internal/gtm/av;
 
-    iget-object v3, v3, Lcom/google/android/gms/internal/gtm/av;->aqF:Ljava/lang/Object;
+    iget-object v3, v3, Lcom/google/android/gms/internal/gtm/av;->aqB: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;->aqi: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;->aqF:Ljava/lang/Object;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aqB: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;->apm:Lcom/google/android/gms/internal/gtm/ad;
+    sget-object v3, Lcom/google/android/gms/internal/gtm/ad;->aph: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;->aqj:Lcom/google/android/gms/internal/gtm/av;
+    sget-object v3, Lcom/google/android/gms/internal/gtm/au;->aqf:Lcom/google/android/gms/internal/gtm/av;
 
-    iget-object v3, v3, Lcom/google/android/gms/internal/gtm/av;->aqF:Ljava/lang/Object;
+    iget-object v3, v3, Lcom/google/android/gms/internal/gtm/av;->aqB: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;->apz:Lcom/google/android/gms/internal/gtm/ai;
+    sget-object v4, Lcom/google/android/gms/internal/gtm/ai;->apv: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;->aqO:J
+    iget-wide v5, v3, Lcom/google/android/gms/internal/gtm/az;->aqK: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;->arb:I
+    iget p1, v1, Lcom/google/android/gms/internal/gtm/bg;->aqX:I
 
     if-nez p1, :cond_5
 
     return-object v2
 
     :cond_5
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/bf;->pi()Ljava/net/URL;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/bf;->pg()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;->arc:Ljava/io/ByteArrayOutputStream;
+    iget-object v0, v1, Lcom/google/android/gms/internal/gtm/bg;->aqY: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;->arc:Ljava/io/ByteArrayOutputStream;
+    iget-object v0, v1, Lcom/google/android/gms/internal/gtm/bg;->aqY: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;->arb:I
+    iget p1, v1, Lcom/google/android/gms/internal/gtm/bg;->aqX: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;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aoo:Lcom/google/android/gms/internal/gtm/am;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aok:Lcom/google/android/gms/internal/gtm/am;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/am;->oW()Ljava/util/Set;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/am;->oU()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;->aqZ:Lcom/google/android/gms/internal/gtm/bp;
+    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/bf;->aqV: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;->aqR:Z
+    iget-boolean v5, v3, Lcom/google/android/gms/internal/gtm/az;->aqN: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;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v5, p0, Lcom/google/android/gms/internal/gtm/j;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/internal/gtm/m;->om()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {v5}, Lcom/google/android/gms/internal/gtm/m;->ok()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;->aqh:Lcom/google/android/gms/internal/gtm/av;
+    sget-object v7, Lcom/google/android/gms/internal/gtm/au;->aqd:Lcom/google/android/gms/internal/gtm/av;
 
-    iget-object v7, v7, Lcom/google/android/gms/internal/gtm/av;->aqF:Ljava/lang/Object;
+    iget-object v7, v7, Lcom/google/android/gms/internal/gtm/av;->aqB: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;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v5, p0, Lcom/google/android/gms/internal/gtm/j;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/internal/gtm/m;->om()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {v5}, Lcom/google/android/gms/internal/gtm/m;->ok()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;->aqm:Lcom/google/android/gms/internal/gtm/av;
+    sget-object v7, Lcom/google/android/gms/internal/gtm/au;->aqi:Lcom/google/android/gms/internal/gtm/av;
 
-    iget-object v7, v7, Lcom/google/android/gms/internal/gtm/av;->aqF:Ljava/lang/Object;
+    iget-object v7, v7, Lcom/google/android/gms/internal/gtm/av;->aqB: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;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v5, p0, Lcom/google/android/gms/internal/gtm/j;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/internal/gtm/m;->om()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {v5}, Lcom/google/android/gms/internal/gtm/m;->ok()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;->aqO:J
+    iget-wide v5, v3, Lcom/google/android/gms/internal/gtm/az;->aqK: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;->oR()I
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oP()I
 
     move-result v5
 
@@ -1870,10 +1870,10 @@
     return-object v0
 .end method
 
-.method protected final nT()V
+.method protected final nR()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bf;->aqY:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bf;->aqU:Ljava/lang/String;
 
     const-string v1, "Network initialized. User agent"
 
@@ -1882,16 +1882,16 @@
     return-void
 .end method
 
-.method public final ph()Z
+.method public final pf()Z
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->lN()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lL()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oi()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aeA:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aew: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 d4711cb76f..e4a17fb6b0 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 arb:I
+.field aqX:I
 
-.field arc:Ljava/io/ByteArrayOutputStream;
+.field aqY:Ljava/io/ByteArrayOutputStream;
 
-.field private final synthetic ard:Lcom/google/android/gms/internal/gtm/bf;
+.field private final synthetic aqZ: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;->ard:Lcom/google/android/gms/internal/gtm/bf;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/bg;->aqZ: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;->arc:Ljava/io/ByteArrayOutputStream;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/bg;->aqY: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;->arb:I
+    iget v0, p0, Lcom/google/android/gms/internal/gtm/bg;->aqX:I
 
     const/4 v1, 0x1
 
     add-int/2addr v0, v1
 
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oS()I
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oQ()I
 
     move-result v2
 
@@ -51,7 +51,7 @@
     return v3
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bg;->ard:Lcom/google/android/gms/internal/gtm/bf;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bg;->aqZ: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;->ard:Lcom/google/android/gms/internal/gtm/bf;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bg;->aqZ:Lcom/google/android/gms/internal/gtm/bf;
 
-    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/j;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->om()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->ok()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;->oO()I
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oM()I
 
     move-result v4
 
     if-le v2, v4, :cond_2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bg;->ard:Lcom/google/android/gms/internal/gtm/bf;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bg;->aqZ:Lcom/google/android/gms/internal/gtm/bf;
 
-    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/j;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->om()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->ok()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;->arc:Ljava/io/ByteArrayOutputStream;
+    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/bg;->aqY: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;->arc:Ljava/io/ByteArrayOutputStream;
+    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/bg;->aqY: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;->aqn:Lcom/google/android/gms/internal/gtm/av;
+    sget-object v2, Lcom/google/android/gms/internal/gtm/au;->aqj:Lcom/google/android/gms/internal/gtm/av;
 
-    iget-object v2, v2, Lcom/google/android/gms/internal/gtm/av;->aqF:Ljava/lang/Object;
+    iget-object v2, v2, Lcom/google/android/gms/internal/gtm/av;->aqB: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;->arc:Ljava/io/ByteArrayOutputStream;
+    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/bg;->aqY: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;->arc:Ljava/io/ByteArrayOutputStream;
+    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/bg;->aqY:Ljava/io/ByteArrayOutputStream;
 
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/bf;->pj()[B
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/bf;->ph()[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;->arc:Ljava/io/ByteArrayOutputStream;
+    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/bg;->aqY: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;->arb:I
+    iget p1, p0, Lcom/google/android/gms/internal/gtm/bg;->aqX:I
 
     add-int/2addr p1, v1
 
-    iput p1, p0, Lcom/google/android/gms/internal/gtm/bg;->arb:I
+    iput p1, p0, Lcom/google/android/gms/internal/gtm/bg;->aqX:I
 
     return v1
 
     :catch_0
     move-exception p1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bg;->ard:Lcom/google/android/gms/internal/gtm/bf;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bg;->aqZ: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 57bc5306e0..d83cc79ac5 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 are:Landroid/content/SharedPreferences;
+.field ara:Landroid/content/SharedPreferences;
 
-.field private arf:J
+.field private arb:J
 
-.field private arg:J
+.field private arc:J
 
-.field final arh:Lcom/google/android/gms/internal/gtm/bi;
+.field final ard: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;->arg:J
+    iput-wide v0, p0, Lcom/google/android/gms/internal/gtm/bh;->arc:J
 
     new-instance p1, Lcom/google/android/gms/internal/gtm/bi;
 
-    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->aqC:Lcom/google/android/gms/internal/gtm/av;
+    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;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aqB: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;->arh:Lcom/google/android/gms/internal/gtm/bi;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/bh;->ard: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;->lN()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lL()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oi()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bh;->are:Landroid/content/SharedPreferences;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bh;->ara: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 nT()V
+.method protected final nR()V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aeA:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aew: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;->are:Landroid/content/SharedPreferences;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/bh;->ara:Landroid/content/SharedPreferences;
 
     return-void
 .end method
 
-.method public final pk()J
+.method public final pi()J
     .locals 6
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->lN()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lL()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oi()V
 
-    iget-wide v0, p0, Lcom/google/android/gms/internal/gtm/bh;->arf:J
+    iget-wide v0, p0, Lcom/google/android/gms/internal/gtm/bh;->arb: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;->are:Landroid/content/SharedPreferences;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bh;->ara: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;->arf:J
+    iput-wide v4, p0, Lcom/google/android/gms/internal/gtm/bh;->arb:J
 
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aem:Lcom/google/android/gms/common/util/e;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aei: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;->are:Landroid/content/SharedPreferences;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bh;->ara: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;->arf:J
+    iput-wide v2, p0, Lcom/google/android/gms/internal/gtm/bh;->arb:J
 
     :cond_2
     :goto_0
-    iget-wide v0, p0, Lcom/google/android/gms/internal/gtm/bh;->arf:J
+    iget-wide v0, p0, Lcom/google/android/gms/internal/gtm/bh;->arb:J
 
     return-wide v0
 .end method
 
-.method public final pl()Lcom/google/android/gms/internal/gtm/bp;
+.method public final pj()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;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/j;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/m;->aem:Lcom/google/android/gms/common/util/e;
+    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/m;->aei:Lcom/google/android/gms/common/util/e;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/bh;->pk()J
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/bh;->pi()J
 
     move-result-wide v2
 
@@ -200,14 +200,14 @@
     return-object v0
 .end method
 
-.method public final pm()J
+.method public final pk()J
     .locals 5
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->lN()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lL()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oi()V
 
-    iget-wide v0, p0, Lcom/google/android/gms/internal/gtm/bh;->arg:J
+    iget-wide v0, p0, Lcom/google/android/gms/internal/gtm/bh;->arc: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;->are:Landroid/content/SharedPreferences;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bh;->ara: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;->arg:J
+    iput-wide v0, p0, Lcom/google/android/gms/internal/gtm/bh;->arc:J
 
     :cond_0
-    iget-wide v0, p0, Lcom/google/android/gms/internal/gtm/bh;->arg:J
+    iget-wide v0, p0, Lcom/google/android/gms/internal/gtm/bh;->arc:J
 
     return-wide v0
 .end method
 
-.method public final pn()V
+.method public final pl()V
     .locals 4
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->lN()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lL()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oi()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aem:Lcom/google/android/gms/common/util/e;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aei: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;->are:Landroid/content/SharedPreferences;
+    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/bh;->ara: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;->arg:J
+    iput-wide v0, p0, Lcom/google/android/gms/internal/gtm/bh;->arc:J
 
     return-void
 .end method
 
-.method public final po()Ljava/lang/String;
+.method public final pm()Ljava/lang/String;
     .locals 3
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->lN()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lL()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oi()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bh;->are:Landroid/content/SharedPreferences;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bh;->ara: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 047a36be40..a0ed047353 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 ari:J
+.field private final are:J
 
-.field final synthetic arj:Lcom/google/android/gms/internal/gtm/bh;
+.field final synthetic arf: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;->arj:Lcom/google/android/gms/internal/gtm/bh;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/bi;->arf: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;->ari:J
+    iput-wide p3, p0, Lcom/google/android/gms/internal/gtm/bi;->are:J
 
     return-void
 .end method
@@ -51,7 +51,7 @@
     return-void
 .end method
 
-.method private final ps()Ljava/lang/String;
+.method private final pq()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 pp()V
+.method final pn()V
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bi;->arj:Lcom/google/android/gms/internal/gtm/bh;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bi;->arf:Lcom/google/android/gms/internal/gtm/bh;
 
-    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/j;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aem:Lcom/google/android/gms/common/util/e;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aei: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;->arj:Lcom/google/android/gms/internal/gtm/bh;
+    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/bi;->arf:Lcom/google/android/gms/internal/gtm/bh;
 
-    iget-object v2, v2, Lcom/google/android/gms/internal/gtm/bh;->are:Landroid/content/SharedPreferences;
+    iget-object v2, v2, Lcom/google/android/gms/internal/gtm/bh;->ara: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;->pt()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/bi;->pr()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;->pu()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/bi;->ps()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;->ps()Ljava/lang/String;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/bi;->pq()Ljava/lang/String;
 
     move-result-object v3
 
@@ -115,7 +115,7 @@
     return-void
 .end method
 
-.method public final pq()Landroid/util/Pair;
+.method public final po()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;->pr()J
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/bi;->pp()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;->arj:Lcom/google/android/gms/internal/gtm/bh;
+    iget-object v4, p0, Lcom/google/android/gms/internal/gtm/bi;->arf:Lcom/google/android/gms/internal/gtm/bh;
 
-    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/j;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v4, v4, Lcom/google/android/gms/internal/gtm/m;->aem:Lcom/google/android/gms/common/util/e;
+    iget-object v4, v4, Lcom/google/android/gms/internal/gtm/m;->aei: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;->ari:J
+    iget-wide v4, p0, Lcom/google/android/gms/internal/gtm/bi;->are:J
 
     const/4 v6, 0x0
 
@@ -178,16 +178,16 @@
 
     if-lez v7, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/bi;->pp()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/bi;->pn()V
 
     return-object v6
 
     :cond_2
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bi;->arj:Lcom/google/android/gms/internal/gtm/bh;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bi;->arf:Lcom/google/android/gms/internal/gtm/bh;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/bh;->are:Landroid/content/SharedPreferences;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/bh;->ara:Landroid/content/SharedPreferences;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/bi;->pu()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/bi;->ps()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;->arj:Lcom/google/android/gms/internal/gtm/bh;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/bi;->arf:Lcom/google/android/gms/internal/gtm/bh;
 
-    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/bh;->are:Landroid/content/SharedPreferences;
+    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/bh;->ara:Landroid/content/SharedPreferences;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/bi;->pt()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/bi;->pr()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;->pp()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/bi;->pn()V
 
     if-eqz v0, :cond_4
 
@@ -233,14 +233,14 @@
     return-object v6
 .end method
 
-.method final pr()J
+.method final pp()J
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bi;->arj:Lcom/google/android/gms/internal/gtm/bh;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bi;->arf:Lcom/google/android/gms/internal/gtm/bh;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/bh;->are:Landroid/content/SharedPreferences;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/bh;->ara:Landroid/content/SharedPreferences;
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/bi;->ps()Ljava/lang/String;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/bi;->pq()Ljava/lang/String;
 
     move-result-object v1
 
@@ -253,7 +253,7 @@
     return-wide v0
 .end method
 
-.method final pt()Ljava/lang/String;
+.method final pr()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 pu()Ljava/lang/String;
+.method final ps()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 4a39efd6ae..0bea79aa8b 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 adW:Ljava/lang/Boolean;
+.field private static adS:Ljava/lang/Boolean;
 
-.field static ark:Lcom/google/android/gms/stats/a;
+.field static arg: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;->adW:Ljava/lang/Boolean;
+    sget-object v0, Lcom/google/android/gms/internal/gtm/bj;->adS: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;->adW:Ljava/lang/Boolean;
+    sput-object v0, Lcom/google/android/gms/internal/gtm/bj;->adS: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;->om()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->ok()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;->ark:Lcom/google/android/gms/stats/a;
+    sget-object p1, Lcom/google/android/gms/internal/gtm/bj;->arg: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;->ark:Lcom/google/android/gms/stats/a;
+    sput-object p1, Lcom/google/android/gms/internal/gtm/bj;->arg: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;->ark:Lcom/google/android/gms/stats/a;
+    sget-object p0, Lcom/google/android/gms/internal/gtm/bj;->arg: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 29016eeb76..de3ffa177a 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 arm:Ljava/lang/Boolean;
+.field private static ari:Ljava/lang/Boolean;
 
 
 # instance fields
-.field public final arl:Landroid/content/Context;
+.field public final arh: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;->arl:Landroid/content/Context;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/bk;->arh: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;->arm:Ljava/lang/Boolean;
+    sget-object v0, Lcom/google/android/gms/internal/gtm/bk;->ari: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;->arm:Ljava/lang/Boolean;
+    sput-object v0, Lcom/google/android/gms/internal/gtm/bk;->ari: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;->ark:Lcom/google/android/gms/stats/a;
+    sget-object v1, Lcom/google/android/gms/internal/gtm/bj;->arg:Lcom/google/android/gms/stats/a;
 
     if-eqz v1, :cond_0
 
-    iget-object v2, v1, Lcom/google/android/gms/stats/a;->aLK:Landroid/os/PowerManager$WakeLock;
+    iget-object v2, v1, Lcom/google/android/gms/stats/a;->aLG: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;->arl:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bk;->arh: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;->om()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->ok()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;->arl:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bk;->arh: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;->oe()Lcom/google/android/gms/internal/gtm/e;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->oc()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;->arl:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bk;->arh: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;->om()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->ok()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;->arl:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bk;->arh: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;->om()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->ok()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 fade2d2d2f..92f9bbae03 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 arn:Lcom/google/android/gms/internal/gtm/bk;
+.field private final arj:Lcom/google/android/gms/internal/gtm/bk;
 
-.field private final aro:I
+.field private final ark:I
 
-.field private final arp:Lcom/google/android/gms/internal/gtm/bd;
+.field private final arl: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;->arn:Lcom/google/android/gms/internal/gtm/bk;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/bl;->arj:Lcom/google/android/gms/internal/gtm/bk;
 
-    iput p2, p0, Lcom/google/android/gms/internal/gtm/bl;->aro:I
+    iput p2, p0, Lcom/google/android/gms/internal/gtm/bl;->ark:I
 
-    iput-object p3, p0, Lcom/google/android/gms/internal/gtm/bl;->arp:Lcom/google/android/gms/internal/gtm/bd;
+    iput-object p3, p0, Lcom/google/android/gms/internal/gtm/bl;->arl: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;->arn:Lcom/google/android/gms/internal/gtm/bk;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bl;->arj:Lcom/google/android/gms/internal/gtm/bk;
 
-    iget v1, p0, Lcom/google/android/gms/internal/gtm/bl;->aro:I
+    iget v1, p0, Lcom/google/android/gms/internal/gtm/bl;->ark:I
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/bl;->arp:Lcom/google/android/gms/internal/gtm/bd;
+    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/bl;->arl:Lcom/google/android/gms/internal/gtm/bd;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/bk;->arl:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/bk;->arh: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 95a49b7064..0eca50fbb0 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 arn:Lcom/google/android/gms/internal/gtm/bk;
+.field private final arj:Lcom/google/android/gms/internal/gtm/bk;
 
-.field private final arq:Lcom/google/android/gms/internal/gtm/bd;
+.field private final arm:Lcom/google/android/gms/internal/gtm/bd;
 
-.field private final arr:Landroid/app/job/JobParameters;
+.field private final arn: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;->arn:Lcom/google/android/gms/internal/gtm/bk;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/bm;->arj:Lcom/google/android/gms/internal/gtm/bk;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/bm;->arq:Lcom/google/android/gms/internal/gtm/bd;
+    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/bm;->arm:Lcom/google/android/gms/internal/gtm/bd;
 
-    iput-object p3, p0, Lcom/google/android/gms/internal/gtm/bm;->arr:Landroid/app/job/JobParameters;
+    iput-object p3, p0, Lcom/google/android/gms/internal/gtm/bm;->arn: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;->arn:Lcom/google/android/gms/internal/gtm/bk;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bm;->arj:Lcom/google/android/gms/internal/gtm/bk;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/bm;->arq:Lcom/google/android/gms/internal/gtm/bd;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/bm;->arm:Lcom/google/android/gms/internal/gtm/bd;
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/bm;->arr:Landroid/app/job/JobParameters;
+    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/bm;->arn: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;->arl:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/bk;->arh: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 5c2b0cff5a..528486e132 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 ars:Ljava/lang/Runnable;
+.field private final synthetic aro:Ljava/lang/Runnable;
 
-.field private final synthetic art:Lcom/google/android/gms/internal/gtm/bk;
+.field private final synthetic arp: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;->art:Lcom/google/android/gms/internal/gtm/bk;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/bn;->arp:Lcom/google/android/gms/internal/gtm/bk;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/bn;->ars:Ljava/lang/Runnable;
+    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/bn;->aro:Ljava/lang/Runnable;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -26,14 +26,14 @@
 
 
 # virtual methods
-.method public final oG()V
+.method public final oE()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bn;->art:Lcom/google/android/gms/internal/gtm/bk;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bn;->arp: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;->ars:Ljava/lang/Runnable;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/bn;->aro: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 4207e4343d..cf74c0067a 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 aem:Lcom/google/android/gms/common/util/e;
+.field private final aei:Lcom/google/android/gms/common/util/e;
 
-.field sL:J
+.field sM: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;->aem:Lcom/google/android/gms/common/util/e;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/bp;->aei: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;->aem:Lcom/google/android/gms/common/util/e;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/bp;->aei:Lcom/google/android/gms/common/util/e;
 
-    iput-wide p2, p0, Lcom/google/android/gms/internal/gtm/bp;->sL:J
+    iput-wide p2, p0, Lcom/google/android/gms/internal/gtm/bp;->sM: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;->aem:Lcom/google/android/gms/common/util/e;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bp;->aei:Lcom/google/android/gms/common/util/e;
 
-    invoke-interface {v0}, Lcom/google/android/gms/common/util/e;->nr()J
+    invoke-interface {v0}, Lcom/google/android/gms/common/util/e;->np()J
 
     move-result-wide v0
 
-    iput-wide v0, p0, Lcom/google/android/gms/internal/gtm/bp;->sL:J
+    iput-wide v0, p0, Lcom/google/android/gms/internal/gtm/bp;->sM: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;->sL:J
+    iget-wide v0, p0, Lcom/google/android/gms/internal/gtm/bp;->sM:J
 
     const/4 v2, 0x1
 
@@ -67,13 +67,13 @@
     return v2
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bp;->aem:Lcom/google/android/gms/common/util/e;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bp;->aei:Lcom/google/android/gms/common/util/e;
 
-    invoke-interface {v0}, Lcom/google/android/gms/common/util/e;->nr()J
+    invoke-interface {v0}, Lcom/google/android/gms/common/util/e;->np()J
 
     move-result-wide v0
 
-    iget-wide v3, p0, Lcom/google/android/gms/internal/gtm/bp;->sL:J
+    iget-wide v3, p0, Lcom/google/android/gms/internal/gtm/bp;->sM: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 51cd9875bb..ca58ff63cb 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 aru:[C
+.field private static final arq:[C
 
 
 # direct methods
@@ -16,7 +16,7 @@
 
     fill-array-data v0, :array_0
 
-    sput-object v0, Lcom/google/android/gms/internal/gtm/bq;->aru:[C
+    sput-object v0, Lcom/google/android/gms/internal/gtm/bq;->arq:[C
 
     return-void
 
@@ -110,7 +110,7 @@
 
     check-cast v0, Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/bz;->arO:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/bz;->arK: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;->arM:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/bz;->arI: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;->arL:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/bz;->arH: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;->arN:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/bz;->arJ: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;->apw:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/bz;->aps: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;->arP:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/bz;->arL: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;->arQ:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/bz;->arM: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;->arR:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/bz;->arN: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;->arS:Ljava/lang/String;
+    iput-object p0, p1, Lcom/google/android/gms/internal/gtm/bz;->arO: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 2e2befd716..ee9e6c606d 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 aqI:Ljava/lang/String;
+.field private aqE:Ljava/lang/String;
 
-.field private aqJ:Ljava/lang/String;
+.field private aqF:Ljava/lang/String;
 
-.field protected aqL:I
+.field protected aqH:I
 
-.field private arv:I
+.field private arr:I
 
-.field protected arw:Z
+.field protected ars:Z
 
-.field private arx:Z
+.field private art:Z
 
-.field private ary:Z
+.field private aru:Z
 
 
 # direct methods
@@ -29,12 +29,12 @@
 
 
 # virtual methods
-.method protected final nT()V
+.method protected final nR()V
     .locals 6
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aeA:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aew: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;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/j;->aof: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;->aqI:Ljava/lang/String;
+    iget-object v1, v0, Lcom/google/android/gms/internal/gtm/ay;->aqE: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;->aqI:Ljava/lang/String;
+    iget-object v1, v0, Lcom/google/android/gms/internal/gtm/ay;->aqE:Ljava/lang/String;
 
-    iput-object v1, p0, Lcom/google/android/gms/internal/gtm/br;->aqI:Ljava/lang/String;
+    iput-object v1, p0, Lcom/google/android/gms/internal/gtm/br;->aqE: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;->aqJ:Ljava/lang/String;
+    iget-object v1, v0, Lcom/google/android/gms/internal/gtm/ay;->aqF: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;->aqJ:Ljava/lang/String;
+    iget-object v1, v0, Lcom/google/android/gms/internal/gtm/ay;->aqF:Ljava/lang/String;
 
-    iput-object v1, p0, Lcom/google/android/gms/internal/gtm/br;->aqJ:Ljava/lang/String;
+    iput-object v1, p0, Lcom/google/android/gms/internal/gtm/br;->aqF: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;->aqK:Ljava/lang/String;
+    iget-object v1, v0, Lcom/google/android/gms/internal/gtm/ay;->aqG: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;->aqK:Ljava/lang/String;
+    iget-object v1, v0, Lcom/google/android/gms/internal/gtm/ay;->aqG: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;->arv:I
+    iput v1, p0, Lcom/google/android/gms/internal/gtm/br;->arr: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;->aqL:I
+    iget v1, v0, Lcom/google/android/gms/internal/gtm/ay;->aqH: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;->aqL:I
+    iget v1, v0, Lcom/google/android/gms/internal/gtm/ay;->aqH:I
 
-    iput v1, p0, Lcom/google/android/gms/internal/gtm/br;->aqL:I
+    iput v1, p0, Lcom/google/android/gms/internal/gtm/br;->aqH:I
 
-    iput-boolean v3, p0, Lcom/google/android/gms/internal/gtm/br;->arw:Z
+    iput-boolean v3, p0, Lcom/google/android/gms/internal/gtm/br;->ars: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;->aqM:I
+    iget v1, v0, Lcom/google/android/gms/internal/gtm/ay;->aqI:I
 
     if-eq v1, v4, :cond_e
 
-    iget v0, v0, Lcom/google/android/gms/internal/gtm/ay;->aqM:I
+    iget v0, v0, Lcom/google/android/gms/internal/gtm/ay;->aqI:I
 
     if-ne v0, v3, :cond_d
 
     const/4 v2, 0x1
 
     :cond_d
-    iput-boolean v2, p0, Lcom/google/android/gms/internal/gtm/br;->ary:Z
+    iput-boolean v2, p0, Lcom/google/android/gms/internal/gtm/br;->aru:Z
 
-    iput-boolean v3, p0, Lcom/google/android/gms/internal/gtm/br;->arx:Z
+    iput-boolean v3, p0, Lcom/google/android/gms/internal/gtm/br;->art:Z
 
     invoke-static {v2}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
@@ -302,52 +302,52 @@
     return-void
 .end method
 
-.method public final pv()Ljava/lang/String;
+.method public final pt()Ljava/lang/String;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oi()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/br;->aqJ:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/br;->aqF:Ljava/lang/String;
 
     return-object v0
 .end method
 
-.method public final pw()Ljava/lang/String;
+.method public final pu()Ljava/lang/String;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oi()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/br;->aqI:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/br;->aqE:Ljava/lang/String;
 
     return-object v0
 .end method
 
-.method public final px()Z
+.method public final pv()Z
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oi()V
 
     const/4 v0, 0x0
 
     return v0
 .end method
 
-.method public final py()Z
+.method public final pw()Z
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oi()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/br;->arx:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/br;->art:Z
 
     return v0
 .end method
 
-.method public final pz()Z
+.method public final px()Z
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oi()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/br;->ary:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/br;->aru: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 af72b36eb6..ec0aa4791e 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 arA:Ljava/lang/reflect/Method;
+.field private static final arw:Ljava/lang/reflect/Method;
 
-.field private static final arB:Ljava/lang/reflect/Method;
+.field private static final arx:Ljava/lang/reflect/Method;
 
-.field private static volatile arC:Lcom/google/android/gms/internal/gtm/bu;
+.field private static volatile ary:Lcom/google/android/gms/internal/gtm/bu;
 
 
 # instance fields
-.field private final arz:Landroid/app/job/JobScheduler;
+.field private final arv:Landroid/app/job/JobScheduler;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/bs;->pA()Ljava/lang/reflect/Method;
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/bs;->py()Ljava/lang/reflect/Method;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/gtm/bs;->arA:Ljava/lang/reflect/Method;
+    sput-object v0, Lcom/google/android/gms/internal/gtm/bs;->arw:Ljava/lang/reflect/Method;
 
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/bs;->pB()Ljava/lang/reflect/Method;
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/bs;->pz()Ljava/lang/reflect/Method;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/gtm/bs;->arB:Ljava/lang/reflect/Method;
+    sput-object v0, Lcom/google/android/gms/internal/gtm/bs;->arx:Ljava/lang/reflect/Method;
 
-    sget-object v0, Lcom/google/android/gms/internal/gtm/bt;->arD:Lcom/google/android/gms/internal/gtm/bu;
+    sget-object v0, Lcom/google/android/gms/internal/gtm/bt;->arz: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;
+    sput-object v0, Lcom/google/android/gms/internal/gtm/bs;->ary: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;->arz:Landroid/app/job/JobScheduler;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/bs;->arv: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;->arA:Ljava/lang/reflect/Method;
+    sget-object v0, Lcom/google/android/gms/internal/gtm/bs;->arw:Ljava/lang/reflect/Method;
 
     if-eqz v0, :cond_0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/bs;->arz:Landroid/app/job/JobScheduler;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/bs;->arv: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;->arz:Landroid/app/job/JobScheduler;
+    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/bs;->arv: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;->arA:Ljava/lang/reflect/Method;
+    sget-object v1, Lcom/google/android/gms/internal/gtm/bs;->arw:Ljava/lang/reflect/Method;
 
     if-eqz v1, :cond_1
 
-    sget-object v1, Lcom/google/android/gms/internal/gtm/bs;->arC:Lcom/google/android/gms/internal/gtm/bu;
+    sget-object v1, Lcom/google/android/gms/internal/gtm/bs;->ary:Lcom/google/android/gms/internal/gtm/bu;
 
-    invoke-interface {v1}, Lcom/google/android/gms/internal/gtm/bu;->pE()Z
+    invoke-interface {v1}, Lcom/google/android/gms/internal/gtm/bu;->pC()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;->pC()I
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/bs;->pA()I
 
     move-result v0
 
@@ -176,7 +176,71 @@
     return p0
 .end method
 
-.method private static pA()Ljava/lang/reflect/Method;
+.method private static pA()I
+    .locals 4
+
+    sget-object v0, Lcom/google/android/gms/internal/gtm/bs;->arx:Ljava/lang/reflect/Method;
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_0
+
+    const/4 v2, 0x0
+
+    :try_start_0
+    new-array v3, v1, [Ljava/lang/Object;
+
+    invoke-virtual {v0, v2, v3}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/lang/Integer;
+
+    invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
+
+    move-result v0
+    :try_end_0
+    .catch Ljava/lang/IllegalAccessException; {:try_start_0 .. :try_end_0} :catch_1
+    .catch Ljava/lang/reflect/InvocationTargetException; {:try_start_0 .. :try_end_0} :catch_0
+
+    return v0
+
+    :catch_0
+    move-exception v0
+
+    goto :goto_0
+
+    :catch_1
+    move-exception v0
+
+    :goto_0
+    const/4 v2, 0x6
+
+    const-string v3, "JobSchedulerCompat"
+
+    invoke-static {v3, v2}, Landroid/util/Log;->isLoggable(Ljava/lang/String;I)Z
+
+    move-result v2
+
+    if-eqz v2, :cond_0
+
+    const-string v2, "myUserId invocation illegal"
+
+    invoke-static {v3, v2, v0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
+
+    :cond_0
+    return v1
+.end method
+
+.method static final synthetic pB()Z
+    .locals 1
+
+    const/4 v0, 0x0
+
+    return v0
+.end method
+
+.method private static py()Ljava/lang/reflect/Method;
     .locals 5
 
     sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
@@ -249,7 +313,7 @@
     return-object v0
 .end method
 
-.method private static pB()Ljava/lang/reflect/Method;
+.method private static pz()Ljava/lang/reflect/Method;
     .locals 3
 
     sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
@@ -293,67 +357,3 @@
     :cond_0
     return-object v1
 .end method
-
-.method private static pC()I
-    .locals 4
-
-    sget-object v0, Lcom/google/android/gms/internal/gtm/bs;->arB:Ljava/lang/reflect/Method;
-
-    const/4 v1, 0x0
-
-    if-eqz v0, :cond_0
-
-    const/4 v2, 0x0
-
-    :try_start_0
-    new-array v3, v1, [Ljava/lang/Object;
-
-    invoke-virtual {v0, v2, v3}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/lang/Integer;
-
-    invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
-
-    move-result v0
-    :try_end_0
-    .catch Ljava/lang/IllegalAccessException; {:try_start_0 .. :try_end_0} :catch_1
-    .catch Ljava/lang/reflect/InvocationTargetException; {:try_start_0 .. :try_end_0} :catch_0
-
-    return v0
-
-    :catch_0
-    move-exception v0
-
-    goto :goto_0
-
-    :catch_1
-    move-exception v0
-
-    :goto_0
-    const/4 v2, 0x6
-
-    const-string v3, "JobSchedulerCompat"
-
-    invoke-static {v3, v2}, Landroid/util/Log;->isLoggable(Ljava/lang/String;I)Z
-
-    move-result v2
-
-    if-eqz v2, :cond_0
-
-    const-string v2, "myUserId invocation illegal"
-
-    invoke-static {v3, v2, v0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
-
-    :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 7f8cf6a0bd..461da190cf 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 arD:Lcom/google/android/gms/internal/gtm/bu;
+.field static final arz: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;->arD:Lcom/google/android/gms/internal/gtm/bu;
+    sput-object v0, Lcom/google/android/gms/internal/gtm/bt;->arz:Lcom/google/android/gms/internal/gtm/bu;
 
     return-void
 .end method
@@ -32,10 +32,10 @@
 
 
 # virtual methods
-.method public final pE()Z
+.method public final pC()Z
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/bs;->pD()Z
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/bs;->pB()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 2187078a89..fcd0b9d278 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 pE()Z
+.method public abstract pC()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 0963746d17..46cee948ec 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 arE:Lcom/google/android/gms/internal/gtm/bw;
+.field private static volatile arA: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 fc3a804d72..4a724088b0 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 arF:Landroid/os/IBinder;
+.field private final arB:Landroid/os/IBinder;
 
-.field private final arG:Ljava/lang/String;
+.field private final arC: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;->arF:Landroid/os/IBinder;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/bx;->arB:Landroid/os/IBinder;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/bx;->arG:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/bx;->arC: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;->arF:Landroid/os/IBinder;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bx;->arB: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;->arF:Landroid/os/IBinder;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/bx;->arB:Landroid/os/IBinder;
 
     const/4 v2, 0x1
 
@@ -75,14 +75,14 @@
     throw v1
 .end method
 
-.method protected final nM()Landroid/os/Parcel;
+.method protected final nK()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;->arG:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/bx;->arC: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 435ddc073a..425c95b444 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 arH:Ljava/lang/String;
+.field public arD:Ljava/lang/String;
 
-.field public arI:Ljava/lang/String;
+.field public arE:Ljava/lang/String;
 
-.field public arJ:Ljava/lang/String;
+.field public arF:Ljava/lang/String;
 
-.field public arK:Ljava/lang/String;
+.field public arG: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;->arH:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/by;->arD: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;->arH:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/by;->arD:Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/by;->arH:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/by;->arD:Ljava/lang/String;
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/by;->arI:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/by;->arE: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;->arI:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/by;->arE:Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/by;->arI:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/by;->arE:Ljava/lang/String;
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/by;->arJ:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/by;->arF: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;->arJ:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/by;->arF:Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/by;->arJ:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/by;->arF:Ljava/lang/String;
 
     :cond_2
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/by;->arK:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/by;->arG: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;->arK:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/by;->arG:Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/by;->arK:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/by;->arG: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;->arH:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/by;->arD: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;->arI:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/by;->arE: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;->arJ:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/by;->arF: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;->arK:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/by;->arG: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 341a14365c..13afe39f53 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,7 +13,15 @@
 
 
 # instance fields
-.field public apw:Ljava/lang/String;
+.field public aps:Ljava/lang/String;
+
+.field public arH:Ljava/lang/String;
+
+.field public arI:Ljava/lang/String;
+
+.field public arJ:Ljava/lang/String;
+
+.field public arK:Ljava/lang/String;
 
 .field public arL:Ljava/lang/String;
 
@@ -23,14 +31,6 @@
 
 .field public arO:Ljava/lang/String;
 
-.field public arP:Ljava/lang/String;
-
-.field public arQ:Ljava/lang/String;
-
-.field public arR: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;->arL:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bz;->arH: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;->arL:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bz;->arH:Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/bz;->arL:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/bz;->arH:Ljava/lang/String;
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bz;->arM:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bz;->arI: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;->arM:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bz;->arI:Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/bz;->arM:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/bz;->arI:Ljava/lang/String;
 
     :cond_2
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bz;->arN:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bz;->arJ: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;->arN:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bz;->arJ:Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/bz;->arN:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/bz;->arJ:Ljava/lang/String;
 
     :cond_3
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bz;->arO:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bz;->arK: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;->arO:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bz;->arK:Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/bz;->arO:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/bz;->arK:Ljava/lang/String;
 
     :cond_4
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bz;->apw:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bz;->aps: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;->apw:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bz;->aps:Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/bz;->apw:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/bz;->aps:Ljava/lang/String;
 
     :cond_5
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bz;->arP: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
 
@@ -136,12 +136,12 @@
 
     if-nez v0, :cond_6
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bz;->arP: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;->arP:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/bz;->arL:Ljava/lang/String;
 
     :cond_6
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bz;->arQ: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
 
@@ -149,12 +149,12 @@
 
     if-nez v0, :cond_7
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bz;->arQ: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;->arQ:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/bz;->arM:Ljava/lang/String;
 
     :cond_7
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bz;->arR: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
 
@@ -162,12 +162,12 @@
 
     if-nez v0, :cond_8
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bz;->arR: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;->arR:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/bz;->arN:Ljava/lang/String;
 
     :cond_8
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bz;->arS: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
 
@@ -175,9 +175,9 @@
 
     if-nez v0, :cond_9
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bz;->arS: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;->arS:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/bz;->arO: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;->arL:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/bz;->arH: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;->arM:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/bz;->arI: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;->arN:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/bz;->arJ: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;->arO:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/bz;->arK: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;->apw:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/bz;->aps: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;->arP:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/bz;->arL: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;->arQ:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/bz;->arM: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;->arR:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/bz;->arN: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;->arS:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/bz;->arO: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 aab812d109..c2373d70f5 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 anT:Ljava/lang/String;
+.field public anP:Ljava/lang/String;
 
-.field public anU:J
+.field public anQ:J
 
-.field public anV:Ljava/lang/String;
+.field public anR: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;->anT:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/c;->anP: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;->anT:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/c;->anP:Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/c;->anT:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/c;->anP:Ljava/lang/String;
 
     :cond_0
-    iget-wide v0, p0, Lcom/google/android/gms/internal/gtm/c;->anU:J
+    iget-wide v0, p0, Lcom/google/android/gms/internal/gtm/c;->anQ: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;->anU:J
+    iput-wide v0, p1, Lcom/google/android/gms/internal/gtm/c;->anQ: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;->anV:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/c;->anR: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;->anV:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/c;->anR:Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/c;->anV:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/c;->anR: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;->anT:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/c;->anP: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;->anU:J
+    iget-wide v1, p0, Lcom/google/android/gms/internal/gtm/c;->anQ: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;->anV:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/c;->anR: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 501b19a6eb..9691a1a2cd 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 arT:Ljava/util/Map;
+.field public arP: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;->arT:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/ca;->arP: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;->arT:Ljava/util/Map;
+    iget-object p1, p1, Lcom/google/android/gms/internal/gtm/ca;->arP:Ljava/util/Map;
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ca;->arT:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ca;->arP: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;->arT:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ca;->arP: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 80888fdc39..5f83dbd168 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 arU:Ljava/util/Map;
+.field public arQ: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;->arU:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/cb;->arQ: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;->arU:Ljava/util/Map;
+    iget-object p1, p1, Lcom/google/android/gms/internal/gtm/cb;->arQ:Ljava/util/Map;
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/cb;->arU:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/cb;->arQ: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;->arU:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/cb;->arQ: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 1759e31e2f..851e4f1362 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 aoI:Ljava/util/Map;
+.field public final aoE: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;->aoI:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/cc;->aoE: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;->aoI:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/cc;->aoE: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;->aoI:Ljava/util/Map;
+    iget-object p1, p1, Lcom/google/android/gms/internal/gtm/cc;->aoE:Ljava/util/Map;
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/cc;->aoI:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/cc;->aoE: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;->aoI:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/cc;->aoE: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 108bf3ca17..6461a5634c 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,18 +13,18 @@
 
 
 # instance fields
-.field public arV:Ljava/lang/String;
+.field public arR:Ljava/lang/String;
+
+.field public arS:I
+
+.field public arT:I
+
+.field public arU:I
+
+.field public arV:I
 
 .field public arW:I
 
-.field public arX:I
-
-.field public arY:I
-
-.field public arZ:I
-
-.field public asa:I
-
 
 # direct methods
 .method public constructor <init>()V
@@ -42,42 +42,42 @@
 
     check-cast p1, Lcom/google/android/gms/internal/gtm/cd;
 
-    iget v0, p0, Lcom/google/android/gms/internal/gtm/cd;->arW:I
+    iget v0, p0, Lcom/google/android/gms/internal/gtm/cd;->arS:I
 
     if-eqz v0, :cond_0
 
-    iput v0, p1, Lcom/google/android/gms/internal/gtm/cd;->arW:I
+    iput v0, p1, Lcom/google/android/gms/internal/gtm/cd;->arS:I
 
     :cond_0
-    iget v0, p0, Lcom/google/android/gms/internal/gtm/cd;->arX:I
+    iget v0, p0, Lcom/google/android/gms/internal/gtm/cd;->arT:I
 
     if-eqz v0, :cond_1
 
-    iput v0, p1, Lcom/google/android/gms/internal/gtm/cd;->arX:I
+    iput v0, p1, Lcom/google/android/gms/internal/gtm/cd;->arT:I
 
     :cond_1
-    iget v0, p0, Lcom/google/android/gms/internal/gtm/cd;->arY:I
+    iget v0, p0, Lcom/google/android/gms/internal/gtm/cd;->arU:I
 
     if-eqz v0, :cond_2
 
-    iput v0, p1, Lcom/google/android/gms/internal/gtm/cd;->arY:I
+    iput v0, p1, Lcom/google/android/gms/internal/gtm/cd;->arU:I
 
     :cond_2
-    iget v0, p0, Lcom/google/android/gms/internal/gtm/cd;->arZ:I
+    iget v0, p0, Lcom/google/android/gms/internal/gtm/cd;->arV:I
 
     if-eqz v0, :cond_3
 
-    iput v0, p1, Lcom/google/android/gms/internal/gtm/cd;->arZ:I
+    iput v0, p1, Lcom/google/android/gms/internal/gtm/cd;->arV:I
 
     :cond_3
-    iget v0, p0, Lcom/google/android/gms/internal/gtm/cd;->asa:I
+    iget v0, p0, Lcom/google/android/gms/internal/gtm/cd;->arW:I
 
     if-eqz v0, :cond_4
 
-    iput v0, p1, Lcom/google/android/gms/internal/gtm/cd;->asa:I
+    iput v0, p1, Lcom/google/android/gms/internal/gtm/cd;->arW:I
 
     :cond_4
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/cd;->arV:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/cd;->arR: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;->arV:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/cd;->arR:Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/cd;->arV:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/cd;->arR: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;->arV:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/cd;->arR: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;->arW:I
+    iget v1, p0, Lcom/google/android/gms/internal/gtm/cd;->arS: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;->arX:I
+    iget v1, p0, Lcom/google/android/gms/internal/gtm/cd;->arT: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;->arY:I
+    iget v1, p0, Lcom/google/android/gms/internal/gtm/cd;->arU: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;->arZ:I
+    iget v1, p0, Lcom/google/android/gms/internal/gtm/cd;->arV: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;->asa:I
+    iget v1, p0, Lcom/google/android/gms/internal/gtm/cd;->arW: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 1737629f8e..d21e00f601 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 asb:Ljava/util/List;
+.field public final arX:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -23,7 +23,7 @@
     .end annotation
 .end field
 
-.field public final asc:Ljava/util/List;
+.field public final arY:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -33,7 +33,7 @@
     .end annotation
 .end field
 
-.field public final asd:Ljava/util/Map;
+.field public final arZ:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -45,7 +45,7 @@
     .end annotation
 .end field
 
-.field public ase:Lcom/google/android/gms/analytics/a/b;
+.field public asa: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;->asb:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/ce;->arX: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;->asc:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/ce;->arY: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;->asd:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/ce;->arZ: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;->asb:Ljava/util/List;
+    iget-object v0, p1, Lcom/google/android/gms/internal/gtm/ce;->arX:Ljava/util/List;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ce;->asb:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ce;->arX: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;->asc:Ljava/util/List;
+    iget-object v0, p1, Lcom/google/android/gms/internal/gtm/ce;->arY:Ljava/util/List;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ce;->asc:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ce;->arY: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;->asd:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ce;->arZ: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;->asd:Ljava/util/Map;
+    iget-object v5, p1, Lcom/google/android/gms/internal/gtm/ce;->arZ: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;->asd:Ljava/util/Map;
+    iget-object v5, p1, Lcom/google/android/gms/internal/gtm/ce;->arZ: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;->asd:Ljava/util/Map;
+    iget-object v5, p1, Lcom/google/android/gms/internal/gtm/ce;->arZ: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;->ase:Lcom/google/android/gms/analytics/a/b;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ce;->asa:Lcom/google/android/gms/analytics/a/b;
 
     if-eqz v0, :cond_5
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/ce;->ase:Lcom/google/android/gms/analytics/a/b;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/ce;->asa: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;->asb:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ce;->arX: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;->asb:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ce;->arX: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;->asc:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ce;->arY: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;->asc:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ce;->arY: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;->asd:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ce;->arZ: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;->asd:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ce;->arZ: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;->ase:Lcom/google/android/gms/analytics/a/b;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ce;->asa: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 6f6078aa4e..b5d3f4a6ce 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 asf:Ljava/lang/String;
+.field public asb:Ljava/lang/String;
 
-.field public asg:Ljava/lang/String;
+.field public asc:Ljava/lang/String;
 
-.field public ash:J
+.field public asd: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;->asf:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/cf;->asb: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;->asf:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/cf;->asb:Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/cf;->asf:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/cf;->asb:Ljava/lang/String;
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/cf;->asg:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/cf;->asc: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;->asg:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/cf;->asc:Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/cf;->asg:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/cf;->asc: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;->ash:J
+    iget-wide v0, p0, Lcom/google/android/gms/internal/gtm/cf;->asd: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;->ash:J
+    iput-wide v0, p1, Lcom/google/android/gms/internal/gtm/cf;->asd: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;->asf:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/cf;->asb: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;->asg:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/cf;->asc: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;->ash:J
+    iget-wide v1, p0, Lcom/google/android/gms/internal/gtm/cf;->asd: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 9b4c82dd61..c38272b455 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 asi:Ljava/lang/String;
+.field public ase:Ljava/lang/String;
 
-.field public asj:Z
+.field public asf: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;->asi:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/cg;->ase: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;->asi:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/cg;->ase:Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/cg;->asi:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/cg;->ase:Ljava/lang/String;
 
     :cond_0
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/cg;->asj:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/cg;->asf:Z
 
     if-eqz v0, :cond_1
 
-    iput-boolean v0, p1, Lcom/google/android/gms/internal/gtm/cg;->asj:Z
+    iput-boolean v0, p1, Lcom/google/android/gms/internal/gtm/cg;->asf: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;->asi:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/cg;->ase: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;->asj:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/internal/gtm/cg;->asf: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 5bb454ee1c..224fe2d771 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 aoE:Ljava/lang/String;
+.field public aoA:Ljava/lang/String;
+
+.field public asg:Ljava/lang/String;
+
+.field public ash:Ljava/lang/String;
+
+.field public asi:Ljava/lang/String;
+
+.field public asj:Z
 
 .field public ask:Ljava/lang/String;
 
-.field public asl:Ljava/lang/String;
+.field public asl:Z
 
-.field public asm:Ljava/lang/String;
-
-.field public asn:Z
-
-.field public aso:Ljava/lang/String;
-
-.field public asp:Z
-
-.field public asq:D
+.field public asm: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;->ask:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ch;->asg: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;->ask:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ch;->asg:Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/ch;->ask:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/ch;->asg:Ljava/lang/String;
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ch;->aoE:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ch;->aoA: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;->aoE:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ch;->aoA:Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/ch;->aoE:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/ch;->aoA:Ljava/lang/String;
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ch;->asl:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ch;->ash: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;->asl:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ch;->ash:Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/ch;->asl:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/ch;->ash:Ljava/lang/String;
 
     :cond_2
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ch;->asm:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ch;->asi: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;->asm:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ch;->asi:Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/ch;->asm:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/ch;->asi:Ljava/lang/String;
 
     :cond_3
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/ch;->asn:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/ch;->asj:Z
 
     const/4 v1, 0x1
 
     if-eqz v0, :cond_4
 
-    iput-boolean v1, p1, Lcom/google/android/gms/internal/gtm/ch;->asn:Z
+    iput-boolean v1, p1, Lcom/google/android/gms/internal/gtm/ch;->asj:Z
 
     :cond_4
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ch;->aso: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
 
@@ -115,19 +115,19 @@
 
     if-nez v0, :cond_5
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ch;->aso: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;->aso:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/ch;->ask:Ljava/lang/String;
 
     :cond_5
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/ch;->asp:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/ch;->asl:Z
 
     if-eqz v0, :cond_6
 
-    iput-boolean v0, p1, Lcom/google/android/gms/internal/gtm/ch;->asp:Z
+    iput-boolean v0, p1, Lcom/google/android/gms/internal/gtm/ch;->asl:Z
 
     :cond_6
-    iget-wide v2, p0, Lcom/google/android/gms/internal/gtm/ch;->asq:D
+    iget-wide v2, p0, Lcom/google/android/gms/internal/gtm/ch;->asm: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;->asq:D
+    iput-wide v2, p1, Lcom/google/android/gms/internal/gtm/ch;->asm: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;->ask:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ch;->asg: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;->aoE:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ch;->aoA: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;->asl:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ch;->ash: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;->asm:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ch;->asi: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;->asn:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/internal/gtm/ch;->asj: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;->aso:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ch;->ask: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;->asp:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/internal/gtm/ch;->asl: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;->asq:D
+    iget-wide v1, p0, Lcom/google/android/gms/internal/gtm/ch;->asm: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 4cac243f11..e1df8b2b8d 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 anW:Z
+.field private static anS:Z
 
 
 # instance fields
-.field private anX:Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$Info;
+.field private anT:Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$Info;
 
-.field private final anY:Lcom/google/android/gms/internal/gtm/bp;
+.field private final anU:Lcom/google/android/gms/internal/gtm/bp;
 
-.field private anZ:Ljava/lang/String;
+.field private anV:Ljava/lang/String;
 
-.field private aoa:Z
+.field private anW:Z
 
-.field private final aob:Ljava/lang/Object;
+.field private final anX:Ljava/lang/Object;
 
 
 # direct methods
@@ -26,21 +26,21 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/google/android/gms/internal/gtm/d;->aoa:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/internal/gtm/d;->anW: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;->aob:Ljava/lang/Object;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/d;->anX:Ljava/lang/Object;
 
     new-instance v0, Lcom/google/android/gms/internal/gtm/bp;
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/gtm/m;->aem:Lcom/google/android/gms/common/util/e;
+    iget-object p1, p1, Lcom/google/android/gms/internal/gtm/m;->aei: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;->anY:Lcom/google/android/gms/internal/gtm/bp;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/d;->anU: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;->oi()Lcom/google/android/gms/internal/gtm/ae;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->og()Lcom/google/android/gms/internal/gtm/ae;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/ae;->oH()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/ae;->oF()Ljava/lang/String;
 
     move-result-object v1
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/gtm/d;->aob:Ljava/lang/Object;
+    iget-object v3, p0, Lcom/google/android/gms/internal/gtm/d;->anX:Ljava/lang/Object;
 
     monitor-enter v3
 
     :try_start_0
-    iget-boolean v4, p0, Lcom/google/android/gms/internal/gtm/d;->aoa:Z
+    iget-boolean v4, p0, Lcom/google/android/gms/internal/gtm/d;->anW:Z
 
     if-nez v4, :cond_2
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/d;->nY()Ljava/lang/String;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/d;->nW()Ljava/lang/String;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/d;->anZ:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/d;->anV:Ljava/lang/String;
 
-    iput-boolean v2, p0, Lcom/google/android/gms/internal/gtm/d;->aoa:Z
+    iput-boolean v2, p0, Lcom/google/android/gms/internal/gtm/d;->anW:Z
 
     goto :goto_4
 
     :cond_2
-    iget-object v4, p0, Lcom/google/android/gms/internal/gtm/d;->anZ:Ljava/lang/String;
+    iget-object v4, p0, Lcom/google/android/gms/internal/gtm/d;->anV: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;->anZ:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/d;->anV: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;->anZ:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/d;->anV: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;->anZ:Ljava/lang/String;
+    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/d;->anV: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;->oi()Lcom/google/android/gms/internal/gtm/ae;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->og()Lcom/google/android/gms/internal/gtm/ae;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/ae;->oI()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/ae;->oG()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;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/j;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/m;->aeA:Landroid/content/Context;
+    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/m;->aew: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;->anZ:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/d;->anV: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 nW()Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$Info;
+.method private final declared-synchronized nU()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;->anY:Lcom/google/android/gms/internal/gtm/bp;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/d;->anU: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;->anY:Lcom/google/android/gms/internal/gtm/bp;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/d;->anU: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;->nX()Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$Info;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/d;->nV()Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$Info;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/d;->anX:Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$Info;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/d;->anT: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;->anX:Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$Info;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/d;->anT: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;->anX:Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$Info;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/d;->anT:Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$Info;
 
     :cond_1
     :goto_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/d;->anX:Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$Info;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/d;->anT: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 nX()Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$Info;
+.method private final nV()Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$Info;
     .locals 2
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aeA:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aew: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;->anW:Z
+    sget-boolean v1, Lcom/google/android/gms/internal/gtm/d;->anS:Z
 
     if-nez v1, :cond_0
 
     const/4 v1, 0x1
 
-    sput-boolean v1, Lcom/google/android/gms/internal/gtm/d;->anW:Z
+    sput-boolean v1, Lcom/google/android/gms/internal/gtm/d;->anS:Z
 
     const-string v1, "Error getting advertiser id"
 
@@ -536,7 +536,7 @@
     return-object v0
 .end method
 
-.method private final nY()Ljava/lang/String;
+.method private final nW()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;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/j;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v2, v2, Lcom/google/android/gms/internal/gtm/m;->aeA:Landroid/content/Context;
+    iget-object v2, v2, Lcom/google/android/gms/internal/gtm/m;->aew: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;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/j;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v2, v2, Lcom/google/android/gms/internal/gtm/m;->aeA:Landroid/content/Context;
+    iget-object v2, v2, Lcom/google/android/gms/internal/gtm/m;->aew: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;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/j;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v2, v2, Lcom/google/android/gms/internal/gtm/m;->aeA:Landroid/content/Context;
+    iget-object v2, v2, Lcom/google/android/gms/internal/gtm/m;->aew:Landroid/content/Context;
 
     invoke-virtual {v2, v0}, Landroid/content/Context;->deleteFile(Ljava/lang/String;)Z
 
@@ -640,18 +640,18 @@
 
 
 # virtual methods
-.method protected final nT()V
+.method protected final nR()V
     .locals 0
 
     return-void
 .end method
 
-.method public final nU()Z
+.method public final nS()Z
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oi()V
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/d;->nW()Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$Info;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/d;->nU()Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$Info;
 
     move-result-object v0
 
@@ -673,12 +673,12 @@
     return v1
 .end method
 
-.method public final nV()Ljava/lang/String;
+.method public final nT()Ljava/lang/String;
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oi()V
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/d;->nW()Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$Info;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/d;->nU()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 e368dfbdf0..77e41ffb54 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 aoc:Lcom/google/android/gms/internal/gtm/y;
+.field final anY: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;->aoc:Lcom/google/android/gms/internal/gtm/y;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/e;->anY: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;->ok()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oi()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;->lN()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lL()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/e;->aoc:Lcom/google/android/gms/internal/gtm/y;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/e;->anY: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;->aoc:Lcom/google/android/gms/internal/gtm/y;
+    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/e;->anY: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;->ok()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oi()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->od()Lcom/google/android/gms/analytics/m;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->ob()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;->ok()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oi()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;->od()Lcom/google/android/gms/analytics/m;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->ob()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;->od()Lcom/google/android/gms/analytics/m;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->ob()Lcom/google/android/gms/analytics/m;
 
     move-result-object v0
 
@@ -116,24 +116,24 @@
     return-void
 .end method
 
-.method protected final nT()V
+.method protected final nR()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/e;->aoc:Lcom/google/android/gms/internal/gtm/y;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/e;->anY:Lcom/google/android/gms/internal/gtm/y;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/k;->ol()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/k;->oj()V
 
     return-void
 .end method
 
-.method public final nZ()V
+.method public final nX()V
     .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oi()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aeA:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aew: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 oa()V
+.method public final nY()V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oi()V
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->lN()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lL()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/e;->aoc:Lcom/google/android/gms/internal/gtm/y;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/e;->anY:Lcom/google/android/gms/internal/gtm/y;
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->lN()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lL()V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/k;->ok()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/k;->oi()V
 
     const-string v1, "Service disconnected"
 
@@ -193,26 +193,26 @@
     return-void
 .end method
 
-.method final ob()V
+.method final nZ()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->lN()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lL()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/e;->aoc:Lcom/google/android/gms/internal/gtm/y;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/e;->anY:Lcom/google/android/gms/internal/gtm/y;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/y;->ob()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/y;->nZ()V
 
     return-void
 .end method
 
-.method final oc()V
+.method final oa()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->lN()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lL()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/e;->aoc:Lcom/google/android/gms/internal/gtm/y;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/e;->anY:Lcom/google/android/gms/internal/gtm/y;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/y;->oc()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/y;->oa()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 105e56274e..f6d4ea1562 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 aod:Z
+.field private final synthetic anZ:Z
 
-.field private final synthetic aoe:Lcom/google/android/gms/internal/gtm/e;
+.field private final synthetic aoa: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;->aoe:Lcom/google/android/gms/internal/gtm/e;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/f;->aoa:Lcom/google/android/gms/internal/gtm/e;
 
-    iput-boolean p2, p0, Lcom/google/android/gms/internal/gtm/f;->aod:Z
+    iput-boolean p2, p0, Lcom/google/android/gms/internal/gtm/f;->anZ: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;->aoe:Lcom/google/android/gms/internal/gtm/e;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/f;->aoa:Lcom/google/android/gms/internal/gtm/e;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/e;->aoc:Lcom/google/android/gms/internal/gtm/y;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/e;->anY:Lcom/google/android/gms/internal/gtm/y;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/y;->oB()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/y;->oz()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 7d31ee3c76..bbc2dddb15 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 aoe:Lcom/google/android/gms/internal/gtm/e;
+.field private final synthetic aoa:Lcom/google/android/gms/internal/gtm/e;
 
-.field private final synthetic aof:Ljava/lang/String;
+.field private final synthetic aob:Ljava/lang/String;
 
-.field private final synthetic aog:Ljava/lang/Runnable;
+.field private final synthetic aoc: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;->aoe:Lcom/google/android/gms/internal/gtm/e;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/g;->aoa:Lcom/google/android/gms/internal/gtm/e;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/g;->aof:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/g;->aob:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/google/android/gms/internal/gtm/g;->aog:Ljava/lang/Runnable;
+    iput-object p3, p0, Lcom/google/android/gms/internal/gtm/g;->aoc: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;->aoe:Lcom/google/android/gms/internal/gtm/e;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/g;->aoa:Lcom/google/android/gms/internal/gtm/e;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/e;->aoc:Lcom/google/android/gms/internal/gtm/y;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/e;->anY:Lcom/google/android/gms/internal/gtm/y;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/g;->aof:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/g;->aob: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;->aog:Ljava/lang/Runnable;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/g;->aoc: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 e5fa634399..19ebce8cc3 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 aoe:Lcom/google/android/gms/internal/gtm/e;
+.field private final synthetic aoa:Lcom/google/android/gms/internal/gtm/e;
 
-.field private final synthetic aoh:Lcom/google/android/gms/internal/gtm/az;
+.field private final synthetic aod: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;->aoe:Lcom/google/android/gms/internal/gtm/e;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/h;->aoa:Lcom/google/android/gms/internal/gtm/e;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/h;->aoh:Lcom/google/android/gms/internal/gtm/az;
+    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/h;->aod: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;->aoe:Lcom/google/android/gms/internal/gtm/e;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/h;->aoa:Lcom/google/android/gms/internal/gtm/e;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/e;->aoc:Lcom/google/android/gms/internal/gtm/y;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/e;->anY:Lcom/google/android/gms/internal/gtm/y;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/h;->aoh:Lcom/google/android/gms/internal/gtm/az;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/h;->aod: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 c47e5ca464..73ebe6fe00 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 aoe:Lcom/google/android/gms/internal/gtm/e;
+.field private final synthetic aoa:Lcom/google/android/gms/internal/gtm/e;
 
-.field private final synthetic aoi:Lcom/google/android/gms/internal/gtm/as;
+.field private final synthetic aoe: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;->aoe:Lcom/google/android/gms/internal/gtm/e;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/i;->aoa:Lcom/google/android/gms/internal/gtm/e;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/i;->aoi:Lcom/google/android/gms/internal/gtm/as;
+    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/i;->aoe: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;->aoe:Lcom/google/android/gms/internal/gtm/e;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/i;->aoa:Lcom/google/android/gms/internal/gtm/e;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/e;->aoc:Lcom/google/android/gms/internal/gtm/y;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/e;->anY:Lcom/google/android/gms/internal/gtm/y;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/i;->aoi:Lcom/google/android/gms/internal/gtm/as;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/i;->aoe: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 93ad61ade1..efb42fd5e6 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 aoj:Lcom/google/android/gms/internal/gtm/m;
+.field public final aof: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;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/j;->aof: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;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aof:Lcom/google/android/gms/internal/gtm/m;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aop:Lcom/google/android/gms/internal/gtm/bd;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aol: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;->apP:Lcom/google/android/gms/internal/gtm/av;
+    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->apL:Lcom/google/android/gms/internal/gtm/av;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aqF:Ljava/lang/Object;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aqB: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;->apP:Lcom/google/android/gms/internal/gtm/av;
+    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->apL:Lcom/google/android/gms/internal/gtm/av;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aqF:Ljava/lang/Object;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aqB:Ljava/lang/Object;
 
     check-cast v0, Ljava/lang/String;
 
@@ -239,12 +239,12 @@
     return-object p0
 .end method
 
-.method public static oj()Z
+.method public static oh()Z
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->apP:Lcom/google/android/gms/internal/gtm/av;
+    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->apL:Lcom/google/android/gms/internal/gtm/av;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aqF:Ljava/lang/Object;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aqB:Ljava/lang/Object;
 
     check-cast v0, Ljava/lang/String;
 
@@ -579,76 +579,76 @@
     return-void
 .end method
 
-.method protected final od()Lcom/google/android/gms/analytics/m;
+.method protected final ob()Lcom/google/android/gms/analytics/m;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->od()Lcom/google/android/gms/analytics/m;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->ob()Lcom/google/android/gms/analytics/m;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final oe()Lcom/google/android/gms/internal/gtm/e;
+.method public final oc()Lcom/google/android/gms/internal/gtm/e;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->oe()Lcom/google/android/gms/internal/gtm/e;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->oc()Lcom/google/android/gms/internal/gtm/e;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method protected final of()Lcom/google/android/gms/internal/gtm/ar;
+.method protected final od()Lcom/google/android/gms/internal/gtm/ar;
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v1, v0, Lcom/google/android/gms/internal/gtm/m;->aos:Lcom/google/android/gms/internal/gtm/ar;
+    iget-object v1, v0, Lcom/google/android/gms/internal/gtm/m;->aoo: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;->aos:Lcom/google/android/gms/internal/gtm/ar;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aoo:Lcom/google/android/gms/internal/gtm/ar;
 
     return-object v0
 .end method
 
-.method protected final og()Lcom/google/android/gms/internal/gtm/br;
+.method protected final oe()Lcom/google/android/gms/internal/gtm/br;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->og()Lcom/google/android/gms/internal/gtm/br;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->oe()Lcom/google/android/gms/internal/gtm/br;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method protected final oh()Lcom/google/android/gms/internal/gtm/bh;
+.method protected final of()Lcom/google/android/gms/internal/gtm/bh;
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v1, v0, Lcom/google/android/gms/internal/gtm/m;->aou:Lcom/google/android/gms/internal/gtm/bh;
+    iget-object v1, v0, Lcom/google/android/gms/internal/gtm/m;->aoq: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;->aou:Lcom/google/android/gms/internal/gtm/bh;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aoq:Lcom/google/android/gms/internal/gtm/bh;
 
     return-object v0
 .end method
 
-.method protected final oi()Lcom/google/android/gms/internal/gtm/ae;
+.method protected final og()Lcom/google/android/gms/internal/gtm/ae;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->oo()Lcom/google/android/gms/internal/gtm/ae;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->om()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 48305a3bc1..ce1707c847 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 aok:Z
+.field private aog: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;->aok:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/k;->aog:Z
 
     if-eqz v0, :cond_0
 
@@ -34,10 +34,10 @@
     return v0
 .end method
 
-.method protected abstract nT()V
+.method protected abstract nR()V
 .end method
 
-.method protected final ok()V
+.method protected final oi()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 ol()V
+.method public final oj()V
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nT()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nR()V
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/internal/gtm/k;->aok:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/internal/gtm/k;->aog: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 3080e7fecd..f299d9e67b 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 aol:Ljava/lang/String;
+.field public static final aoh: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;->aol:Ljava/lang/String;
+    sput-object v0, Lcom/google/android/gms/internal/gtm/l;->aoh: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 a389dbbe07..7b91a66b90 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 aom:Lcom/google/android/gms/internal/gtm/m;
+.field private static volatile aoi:Lcom/google/android/gms/internal/gtm/m;
 
 
 # instance fields
-.field final aeA:Landroid/content/Context;
+.field public final aei:Lcom/google/android/gms/common/util/e;
 
-.field public final aem:Lcom/google/android/gms/common/util/e;
+.field final aew:Landroid/content/Context;
 
-.field final aon:Landroid/content/Context;
+.field final aoj:Landroid/content/Context;
 
-.field final aoo:Lcom/google/android/gms/internal/gtm/am;
+.field final aok:Lcom/google/android/gms/internal/gtm/am;
 
-.field final aop:Lcom/google/android/gms/internal/gtm/bd;
+.field final aol:Lcom/google/android/gms/internal/gtm/bd;
 
-.field private final aoq:Lcom/google/android/gms/analytics/m;
+.field private final aom:Lcom/google/android/gms/analytics/m;
 
-.field private final aor:Lcom/google/android/gms/internal/gtm/e;
+.field private final aon:Lcom/google/android/gms/internal/gtm/e;
 
-.field final aos:Lcom/google/android/gms/internal/gtm/ar;
+.field final aoo:Lcom/google/android/gms/internal/gtm/ar;
 
-.field private final aot:Lcom/google/android/gms/internal/gtm/br;
+.field private final aop:Lcom/google/android/gms/internal/gtm/br;
 
-.field final aou:Lcom/google/android/gms/internal/gtm/bh;
+.field final aoq:Lcom/google/android/gms/internal/gtm/bh;
 
-.field private final aov:Lcom/google/android/gms/analytics/b;
+.field private final aor:Lcom/google/android/gms/analytics/b;
 
-.field private final aow:Lcom/google/android/gms/internal/gtm/ae;
+.field private final aos:Lcom/google/android/gms/internal/gtm/ae;
 
-.field public final aox:Lcom/google/android/gms/internal/gtm/d;
+.field public final aot:Lcom/google/android/gms/internal/gtm/d;
 
-.field public final aoy:Lcom/google/android/gms/internal/gtm/x;
+.field public final aou:Lcom/google/android/gms/internal/gtm/x;
 
-.field public final aoz:Lcom/google/android/gms/internal/gtm/aq;
+.field public final aov: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;->aoB:Landroid/content/Context;
+    iget-object v0, p1, Lcom/google/android/gms/internal/gtm/o;->aox: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;->aoC:Landroid/content/Context;
+    iget-object v1, p1, Lcom/google/android/gms/internal/gtm/o;->aoy: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;->aeA:Landroid/content/Context;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/m;->aew:Landroid/content/Context;
 
-    iput-object v1, p0, Lcom/google/android/gms/internal/gtm/m;->aon:Landroid/content/Context;
+    iput-object v1, p0, Lcom/google/android/gms/internal/gtm/m;->aoj:Landroid/content/Context;
 
-    invoke-static {}, Lcom/google/android/gms/common/util/g;->nt()Lcom/google/android/gms/common/util/e;
+    invoke-static {}, Lcom/google/android/gms/common/util/g;->nr()Lcom/google/android/gms/common/util/e;
 
     move-result-object v1
 
-    iput-object v1, p0, Lcom/google/android/gms/internal/gtm/m;->aem:Lcom/google/android/gms/common/util/e;
+    iput-object v1, p0, Lcom/google/android/gms/internal/gtm/m;->aei: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;->aoo:Lcom/google/android/gms/internal/gtm/am;
+    iput-object v1, p0, Lcom/google/android/gms/internal/gtm/m;->aok: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;->ol()V
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/k;->oj()V
 
-    iput-object v1, p0, Lcom/google/android/gms/internal/gtm/m;->aop:Lcom/google/android/gms/internal/gtm/bd;
+    iput-object v1, p0, Lcom/google/android/gms/internal/gtm/m;->aol: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;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/m;->ok()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;->ol()V
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/k;->oj()V
 
-    iput-object v1, p0, Lcom/google/android/gms/internal/gtm/m;->aou:Lcom/google/android/gms/internal/gtm/bh;
+    iput-object v1, p0, Lcom/google/android/gms/internal/gtm/m;->aoq: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;->ol()V
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/k;->oj()V
 
-    iput-object v1, p0, Lcom/google/android/gms/internal/gtm/m;->aot:Lcom/google/android/gms/internal/gtm/br;
+    iput-object v1, p0, Lcom/google/android/gms/internal/gtm/m;->aop: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;->aeF:Ljava/lang/Thread$UncaughtExceptionHandler;
+    iput-object v5, v0, Lcom/google/android/gms/analytics/m;->aeB:Ljava/lang/Thread$UncaughtExceptionHandler;
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/m;->aoq:Lcom/google/android/gms/analytics/m;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/m;->aom: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;->ol()V
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/k;->oj()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/m;->aow:Lcom/google/android/gms/internal/gtm/ae;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/m;->aos:Lcom/google/android/gms/internal/gtm/ae;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/gtm/k;->ol()V
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/gtm/k;->oj()V
 
-    iput-object v2, p0, Lcom/google/android/gms/internal/gtm/m;->aox:Lcom/google/android/gms/internal/gtm/d;
+    iput-object v2, p0, Lcom/google/android/gms/internal/gtm/m;->aot:Lcom/google/android/gms/internal/gtm/d;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/internal/gtm/k;->ol()V
+    invoke-virtual {v3}, Lcom/google/android/gms/internal/gtm/k;->oj()V
 
-    iput-object v3, p0, Lcom/google/android/gms/internal/gtm/m;->aoy:Lcom/google/android/gms/internal/gtm/x;
+    iput-object v3, p0, Lcom/google/android/gms/internal/gtm/m;->aou:Lcom/google/android/gms/internal/gtm/x;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/internal/gtm/k;->ol()V
+    invoke-virtual {v4}, Lcom/google/android/gms/internal/gtm/k;->oj()V
 
-    iput-object v4, p0, Lcom/google/android/gms/internal/gtm/m;->aoz:Lcom/google/android/gms/internal/gtm/aq;
+    iput-object v4, p0, Lcom/google/android/gms/internal/gtm/m;->aov: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;->ol()V
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/k;->oj()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/m;->aos:Lcom/google/android/gms/internal/gtm/ar;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/m;->aoo:Lcom/google/android/gms/internal/gtm/ar;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/k;->ol()V
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/k;->oj()V
 
-    iput-object v1, p0, Lcom/google/android/gms/internal/gtm/m;->aor:Lcom/google/android/gms/internal/gtm/e;
+    iput-object v1, p0, Lcom/google/android/gms/internal/gtm/m;->aon:Lcom/google/android/gms/internal/gtm/e;
 
-    iget-object p1, v0, Lcom/google/android/gms/analytics/d;->aee:Lcom/google/android/gms/internal/gtm/m;
+    iget-object p1, v0, Lcom/google/android/gms/analytics/d;->adZ:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/m;->og()Lcom/google/android/gms/internal/gtm/br;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/m;->oe()Lcom/google/android/gms/internal/gtm/br;
 
     move-result-object p1
 
-    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
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/br;->pw()Z
 
     move-result v2
 
     if-eqz v2, :cond_0
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/br;->pz()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/br;->px()Z
 
     move-result v2
 
-    iput-boolean v2, v0, Lcom/google/android/gms/analytics/b;->aea:Z
+    iput-boolean v2, v0, Lcom/google/android/gms/analytics/b;->adW:Z
 
     :cond_0
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/br;->px()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/br;->pv()Z
 
     const/4 p1, 0x1
 
-    iput-boolean p1, v0, Lcom/google/android/gms/analytics/b;->adY:Z
+    iput-boolean p1, v0, Lcom/google/android/gms/analytics/b;->adU:Z
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/m;->aov:Lcom/google/android/gms/analytics/b;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/m;->aor:Lcom/google/android/gms/analytics/b;
 
-    iget-object p1, v1, Lcom/google/android/gms/internal/gtm/e;->aoc:Lcom/google/android/gms/internal/gtm/y;
+    iget-object p1, v1, Lcom/google/android/gms/internal/gtm/e;->anY: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;->aom:Lcom/google/android/gms/internal/gtm/m;
+    sget-object v0, Lcom/google/android/gms/internal/gtm/m;->aoi: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;->aom:Lcom/google/android/gms/internal/gtm/m;
+    sget-object v1, Lcom/google/android/gms/internal/gtm/m;->aoi:Lcom/google/android/gms/internal/gtm/m;
 
     if-nez v1, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/common/util/g;->nt()Lcom/google/android/gms/common/util/e;
+    invoke-static {}, Lcom/google/android/gms/common/util/g;->nr()Lcom/google/android/gms/common/util/e;
 
     move-result-object v1
 
-    invoke-interface {v1}, Lcom/google/android/gms/common/util/e;->nr()J
+    invoke-interface {v1}, Lcom/google/android/gms/common/util/e;->np()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;->aom:Lcom/google/android/gms/internal/gtm/m;
+    sput-object p0, Lcom/google/android/gms/internal/gtm/m;->aoi:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-static {}, Lcom/google/android/gms/analytics/b;->lE()V
+    invoke-static {}, Lcom/google/android/gms/analytics/b;->lC()V
 
-    invoke-interface {v1}, Lcom/google/android/gms/common/util/e;->nr()J
+    invoke-interface {v1}, Lcom/google/android/gms/common/util/e;->np()J
 
     move-result-wide v4
 
     sub-long/2addr v4, v2
 
-    sget-object v1, Lcom/google/android/gms/internal/gtm/au;->aqD:Lcom/google/android/gms/internal/gtm/av;
+    sget-object v1, Lcom/google/android/gms/internal/gtm/au;->aqz:Lcom/google/android/gms/internal/gtm/av;
 
-    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/av;->aqF:Ljava/lang/Object;
+    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/av;->aqB: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;->om()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/m;->ok()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;->aom:Lcom/google/android/gms/internal/gtm/m;
+    sget-object p0, Lcom/google/android/gms/internal/gtm/m;->aoi:Lcom/google/android/gms/internal/gtm/m;
 
     return-object p0
 .end method
 
 
 # virtual methods
-.method public final od()Lcom/google/android/gms/analytics/m;
+.method public final ob()Lcom/google/android/gms/analytics/m;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/m;->aoq:Lcom/google/android/gms/analytics/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/m;->aom: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;->aoq:Lcom/google/android/gms/analytics/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/m;->aom:Lcom/google/android/gms/analytics/m;
 
     return-object v0
 .end method
 
-.method public final oe()Lcom/google/android/gms/internal/gtm/e;
+.method public final oc()Lcom/google/android/gms/internal/gtm/e;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/m;->aor:Lcom/google/android/gms/internal/gtm/e;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/m;->aon: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;->aor:Lcom/google/android/gms/internal/gtm/e;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/m;->aon:Lcom/google/android/gms/internal/gtm/e;
 
     return-object v0
 .end method
 
-.method public final og()Lcom/google/android/gms/internal/gtm/br;
+.method public final oe()Lcom/google/android/gms/internal/gtm/br;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/m;->aot:Lcom/google/android/gms/internal/gtm/br;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/m;->aop: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;->aot:Lcom/google/android/gms/internal/gtm/br;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/m;->aop:Lcom/google/android/gms/internal/gtm/br;
 
     return-object v0
 .end method
 
-.method public final om()Lcom/google/android/gms/internal/gtm/bd;
+.method public final ok()Lcom/google/android/gms/internal/gtm/bd;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/m;->aop:Lcom/google/android/gms/internal/gtm/bd;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/m;->aol: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;->aop:Lcom/google/android/gms/internal/gtm/bd;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/m;->aol:Lcom/google/android/gms/internal/gtm/bd;
 
     return-object v0
 .end method
 
-.method public final on()Lcom/google/android/gms/analytics/b;
+.method public final ol()Lcom/google/android/gms/analytics/b;
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/m;->aov:Lcom/google/android/gms/analytics/b;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/m;->aor: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;->aov:Lcom/google/android/gms/analytics/b;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/m;->aor: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;->aov:Lcom/google/android/gms/analytics/b;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/m;->aor:Lcom/google/android/gms/analytics/b;
 
     return-object v0
 .end method
 
-.method public final oo()Lcom/google/android/gms/internal/gtm/ae;
+.method public final om()Lcom/google/android/gms/internal/gtm/ae;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/m;->aow:Lcom/google/android/gms/internal/gtm/ae;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/m;->aos: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;->aow:Lcom/google/android/gms/internal/gtm/ae;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/m;->aos: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 2696b7f486..5153ea5ada 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 aoA:Lcom/google/android/gms/internal/gtm/m;
+.field private final synthetic aow: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;->aoA:Lcom/google/android/gms/internal/gtm/m;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/n;->aow: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;->aoA:Lcom/google/android/gms/internal/gtm/m;
+    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/n;->aow:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/gtm/m;->aop:Lcom/google/android/gms/internal/gtm/bd;
+    iget-object p1, p1, Lcom/google/android/gms/internal/gtm/m;->aol: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 d79a7a34c0..0c5ad52c1f 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 aoB:Landroid/content/Context;
+.field final aox:Landroid/content/Context;
 
-.field final aoC:Landroid/content/Context;
+.field final aoy: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;->aoB:Landroid/content/Context;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/o;->aox:Landroid/content/Context;
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/o;->aoC:Landroid/content/Context;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/o;->aoy: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 ea8ff5a74f..a15e91d6dc 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,15 @@
 
 
 # instance fields
-.field final aoD:J
+.field final aoA:Ljava/lang/String;
 
-.field final aoE:Ljava/lang/String;
+.field final aoB:Ljava/lang/String;
 
-.field final aoF:Ljava/lang/String;
+.field final aoC:Z
 
-.field final aoG:Z
+.field aoD:J
 
-.field aoH:J
-
-.field final aoI:Ljava/util/Map;
+.field final aoE:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -24,6 +22,8 @@
     .end annotation
 .end field
 
+.field final aoz:J
+
 
 # direct methods
 .method public constructor <init>(Ljava/lang/String;Ljava/lang/String;ZJLjava/util/Map;)V
@@ -49,15 +49,15 @@
 
     const-wide/16 v0, 0x0
 
-    iput-wide v0, p0, Lcom/google/android/gms/internal/gtm/p;->aoD:J
+    iput-wide v0, p0, Lcom/google/android/gms/internal/gtm/p;->aoz:J
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/p;->aoE:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/p;->aoA:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/p;->aoF:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/p;->aoB:Ljava/lang/String;
 
-    iput-boolean p3, p0, Lcom/google/android/gms/internal/gtm/p;->aoG:Z
+    iput-boolean p3, p0, Lcom/google/android/gms/internal/gtm/p;->aoC:Z
 
-    iput-wide p4, p0, Lcom/google/android/gms/internal/gtm/p;->aoH:J
+    iput-wide p4, p0, Lcom/google/android/gms/internal/gtm/p;->aoD: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;->aoI:Ljava/util/Map;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/p;->aoE:Ljava/util/Map;
 
     return-void
 
@@ -74,7 +74,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/p;->aoI:Ljava/util/Map;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/p;->aoE: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 7ab6167895..1ecb863e1c 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 aoJ:Lcom/google/android/gms/internal/gtm/s;
+.field final aoF:Lcom/google/android/gms/internal/gtm/s;
 
-.field aoK:Lcom/google/android/gms/internal/gtm/ba;
+.field aoG:Lcom/google/android/gms/internal/gtm/ba;
 
-.field private final aoL:Lcom/google/android/gms/internal/gtm/ao;
+.field private final aoH:Lcom/google/android/gms/internal/gtm/ao;
 
-.field private final aoM:Lcom/google/android/gms/internal/gtm/bp;
+.field private final aoI: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;->aem:Lcom/google/android/gms/common/util/e;
+    iget-object v1, p1, Lcom/google/android/gms/internal/gtm/m;->aei: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;->aoM:Lcom/google/android/gms/internal/gtm/bp;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/q;->aoI: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;->aoJ:Lcom/google/android/gms/internal/gtm/s;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/q;->aoF: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;->aoL:Lcom/google/android/gms/internal/gtm/ao;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/q;->aoH: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;->lN()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lL()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;->lN()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lL()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oi()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/q;->aoK:Lcom/google/android/gms/internal/gtm/ba;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/q;->aoG: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;->aqR:Z
+    iget-boolean v1, p1, Lcom/google/android/gms/internal/gtm/az;->aqN:Z
 
     if-eqz v1, :cond_1
 
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oT()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oR()Ljava/lang/String;
 
     move-result-object v1
 
     goto :goto_0
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oU()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oS()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;->aoI:Ljava/util/Map;
+    iget-object v1, p1, Lcom/google/android/gms/internal/gtm/az;->aoE:Ljava/util/Map;
 
-    iget-wide v2, p1, Lcom/google/android/gms/internal/gtm/az;->aqP:J
+    iget-wide v2, p1, Lcom/google/android/gms/internal/gtm/az;->aqL: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;->op()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/q;->on()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;->lN()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lL()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oi()V
 
     :try_start_0
-    invoke-static {}, Lcom/google/android/gms/common/stats/a;->nk()Lcom/google/android/gms/common/stats/a;
+    invoke-static {}, Lcom/google/android/gms/common/stats/a;->ni()Lcom/google/android/gms/common/stats/a;
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aeA:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aew:Landroid/content/Context;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/q;->aoJ:Lcom/google/android/gms/internal/gtm/s;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/q;->aoF: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;->aoK:Lcom/google/android/gms/internal/gtm/ba;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/q;->aoG: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;->aoK:Lcom/google/android/gms/internal/gtm/ba;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/q;->aoG:Lcom/google/android/gms/internal/gtm/ba;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->oe()Lcom/google/android/gms/internal/gtm/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->oc()Lcom/google/android/gms/internal/gtm/e;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/e;->oa()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/e;->nY()V
 
     :cond_0
     return-void
 .end method
 
-.method public final eE()Z
+.method public final eD()Z
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->lN()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lL()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oi()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/q;->aoK:Lcom/google/android/gms/internal/gtm/ba;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/q;->aoG: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;->aoJ:Lcom/google/android/gms/internal/gtm/s;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/q;->aoF:Lcom/google/android/gms/internal/gtm/s;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/s;->oq()Lcom/google/android/gms/internal/gtm/ba;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/s;->oo()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;->aoK:Lcom/google/android/gms/internal/gtm/ba;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/q;->aoG:Lcom/google/android/gms/internal/gtm/ba;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/q;->op()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/q;->on()V
 
     return v1
 
@@ -211,11 +211,11 @@
 .method public final isConnected()Z
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->lN()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lL()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oi()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/q;->aoK:Lcom/google/android/gms/internal/gtm/ba;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/q;->aoG:Lcom/google/android/gms/internal/gtm/ba;
 
     if-eqz v0, :cond_0
 
@@ -229,24 +229,24 @@
     return v0
 .end method
 
-.method protected final nT()V
+.method protected final nR()V
     .locals 0
 
     return-void
 .end method
 
-.method final op()V
+.method final on()V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/q;->aoM:Lcom/google/android/gms/internal/gtm/bp;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/q;->aoI: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;->aoL:Lcom/google/android/gms/internal/gtm/ao;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/q;->aoH:Lcom/google/android/gms/internal/gtm/ao;
 
-    sget-object v1, Lcom/google/android/gms/internal/gtm/au;->aqx:Lcom/google/android/gms/internal/gtm/av;
+    sget-object v1, Lcom/google/android/gms/internal/gtm/au;->aqt:Lcom/google/android/gms/internal/gtm/av;
 
-    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/av;->aqF:Ljava/lang/Object;
+    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/av;->aqB: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 632db857e1..00d39d37e5 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 aoN:Lcom/google/android/gms/internal/gtm/q;
+.field private final synthetic aoJ: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;->aoN:Lcom/google/android/gms/internal/gtm/q;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/r;->aoJ: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;->aoN:Lcom/google/android/gms/internal/gtm/q;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/r;->aoJ: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 e3df0cdec4..f25a3f9892 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 aoN:Lcom/google/android/gms/internal/gtm/q;
+.field final synthetic aoJ:Lcom/google/android/gms/internal/gtm/q;
 
-.field private volatile aoO:Lcom/google/android/gms/internal/gtm/ba;
+.field private volatile aoK:Lcom/google/android/gms/internal/gtm/ba;
 
-.field private volatile aoP:Z
+.field private volatile aoL: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;->aoN:Lcom/google/android/gms/internal/gtm/q;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/s;->aoJ:Lcom/google/android/gms/internal/gtm/q;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -38,7 +38,7 @@
     if-nez p2, :cond_0
 
     :try_start_0
-    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/s;->aoN:Lcom/google/android/gms/internal/gtm/q;
+    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/s;->aoJ:Lcom/google/android/gms/internal/gtm/q;
 
     const-string p2, "Service connected with null binder"
 
@@ -104,7 +104,7 @@
     move-object p1, v0
 
     :goto_1
-    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/s;->aoN:Lcom/google/android/gms/internal/gtm/q;
+    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/s;->aoJ:Lcom/google/android/gms/internal/gtm/q;
 
     const-string v0, "Bound to IAnalyticsService interface"
 
@@ -113,7 +113,7 @@
     goto :goto_2
 
     :cond_3
-    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/s;->aoN:Lcom/google/android/gms/internal/gtm/q;
+    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/s;->aoJ:Lcom/google/android/gms/internal/gtm/q;
 
     const-string v1, "Got binder with a wrong descriptor"
 
@@ -126,7 +126,7 @@
 
     :catch_0
     :try_start_3
-    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/s;->aoN:Lcom/google/android/gms/internal/gtm/q;
+    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/s;->aoJ:Lcom/google/android/gms/internal/gtm/q;
 
     const-string v0, "Service connect failed to get IAnalyticsService"
 
@@ -138,17 +138,17 @@
     if-nez p1, :cond_4
 
     :try_start_4
-    invoke-static {}, Lcom/google/android/gms/common/stats/a;->nk()Lcom/google/android/gms/common/stats/a;
+    invoke-static {}, Lcom/google/android/gms/common/stats/a;->ni()Lcom/google/android/gms/common/stats/a;
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/s;->aoN:Lcom/google/android/gms/internal/gtm/q;
+    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/s;->aoJ:Lcom/google/android/gms/internal/gtm/q;
 
-    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/j;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/gtm/m;->aeA:Landroid/content/Context;
+    iget-object p1, p1, Lcom/google/android/gms/internal/gtm/m;->aew:Landroid/content/Context;
 
-    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/s;->aoN:Lcom/google/android/gms/internal/gtm/q;
+    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/s;->aoJ:Lcom/google/android/gms/internal/gtm/q;
 
-    iget-object p2, p2, Lcom/google/android/gms/internal/gtm/q;->aoJ:Lcom/google/android/gms/internal/gtm/s;
+    iget-object p2, p2, Lcom/google/android/gms/internal/gtm/q;->aoF: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
@@ -159,21 +159,21 @@
 
     :cond_4
     :try_start_5
-    iget-boolean p2, p0, Lcom/google/android/gms/internal/gtm/s;->aoP:Z
+    iget-boolean p2, p0, Lcom/google/android/gms/internal/gtm/s;->aoL:Z
 
     if-nez p2, :cond_5
 
-    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/s;->aoN:Lcom/google/android/gms/internal/gtm/q;
+    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/s;->aoJ: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;->aoN:Lcom/google/android/gms/internal/gtm/q;
+    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/s;->aoJ:Lcom/google/android/gms/internal/gtm/q;
 
-    iget-object p2, p2, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iget-object p2, p2, Lcom/google/android/gms/internal/gtm/j;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/gtm/m;->od()Lcom/google/android/gms/analytics/m;
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/gtm/m;->ob()Lcom/google/android/gms/analytics/m;
 
     move-result-object p2
 
@@ -186,7 +186,7 @@
     goto :goto_3
 
     :cond_5
-    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/s;->aoO:Lcom/google/android/gms/internal/gtm/ba;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/s;->aoK:Lcom/google/android/gms/internal/gtm/ba;
     :try_end_5
     .catchall {:try_start_5 .. :try_end_5} :catchall_0
 
@@ -221,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;->aoN:Lcom/google/android/gms/internal/gtm/q;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/s;->aoJ:Lcom/google/android/gms/internal/gtm/q;
 
-    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/j;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->od()Lcom/google/android/gms/analytics/m;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->ob()Lcom/google/android/gms/analytics/m;
 
     move-result-object v0
 
@@ -238,10 +238,10 @@
     return-void
 .end method
 
-.method public final oq()Lcom/google/android/gms/internal/gtm/ba;
+.method public final oo()Lcom/google/android/gms/internal/gtm/ba;
     .locals 5
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->lN()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lL()V
 
     new-instance v0, Landroid/content/Intent;
 
@@ -259,11 +259,11 @@
 
     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, p0, Lcom/google/android/gms/internal/gtm/s;->aoJ: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/j;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/m;->aeA:Landroid/content/Context;
+    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/m;->aew:Landroid/content/Context;
 
     invoke-virtual {v1}, Landroid/content/Context;->getPackageName()Ljava/lang/String;
 
@@ -273,22 +273,22 @@
 
     invoke-virtual {v0, v3, v2}, Landroid/content/Intent;->putExtra(Ljava/lang/String;Ljava/lang/String;)Landroid/content/Intent;
 
-    invoke-static {}, Lcom/google/android/gms/common/stats/a;->nk()Lcom/google/android/gms/common/stats/a;
+    invoke-static {}, Lcom/google/android/gms/common/stats/a;->ni()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;
+    iput-object v2, p0, Lcom/google/android/gms/internal/gtm/s;->aoK:Lcom/google/android/gms/internal/gtm/ba;
 
     const/4 v3, 0x1
 
-    iput-boolean v3, p0, Lcom/google/android/gms/internal/gtm/s;->aoP:Z
+    iput-boolean v3, p0, Lcom/google/android/gms/internal/gtm/s;->aoL:Z
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/gtm/s;->aoN:Lcom/google/android/gms/internal/gtm/q;
+    iget-object v3, p0, Lcom/google/android/gms/internal/gtm/s;->aoJ: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;
+    iget-object v3, v3, Lcom/google/android/gms/internal/gtm/q;->aoF:Lcom/google/android/gms/internal/gtm/s;
 
     const/16 v4, 0x81
 
@@ -296,7 +296,7 @@
 
     move-result v0
 
-    iget-object v1, p0, 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/s;->aoJ:Lcom/google/android/gms/internal/gtm/q;
 
     const-string v3, "Bind to service requested"
 
@@ -310,7 +310,7 @@
 
     if-nez v0, :cond_0
 
-    iput-boolean v1, p0, Lcom/google/android/gms/internal/gtm/s;->aoP:Z
+    iput-boolean v1, p0, Lcom/google/android/gms/internal/gtm/s;->aoL:Z
 
     monitor-exit p0
     :try_end_0
@@ -320,9 +320,9 @@
 
     :cond_0
     :try_start_1
-    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->aqy:Lcom/google/android/gms/internal/gtm/av;
+    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->aqu:Lcom/google/android/gms/internal/gtm/av;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aqF:Ljava/lang/Object;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aqB:Ljava/lang/Object;
 
     check-cast v0, Ljava/lang/Long;
 
@@ -339,22 +339,22 @@
 
     :catch_0
     :try_start_2
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/s;->aoN:Lcom/google/android/gms/internal/gtm/q;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/s;->aoJ: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
+    iput-boolean v1, p0, Lcom/google/android/gms/internal/gtm/s;->aoL:Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/s;->aoO:Lcom/google/android/gms/internal/gtm/ba;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/s;->aoK: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;
+    iput-object v2, p0, Lcom/google/android/gms/internal/gtm/s;->aoK: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;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/s;->aoJ:Lcom/google/android/gms/internal/gtm/q;
 
     const-string v2, "Successfully bound to service but never got onServiceConnected callback"
 
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 8cee597638..f548b8faf8 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 aoQ:Lcom/google/android/gms/internal/gtm/ba;
+.field private final synthetic aoM:Lcom/google/android/gms/internal/gtm/ba;
 
-.field private final synthetic aoR:Lcom/google/android/gms/internal/gtm/s;
+.field private final synthetic aoN: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;->aoR:Lcom/google/android/gms/internal/gtm/s;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/t;->aoN:Lcom/google/android/gms/internal/gtm/s;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/t;->aoQ:Lcom/google/android/gms/internal/gtm/ba;
+    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/t;->aoM: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;->aoR:Lcom/google/android/gms/internal/gtm/s;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/t;->aoN:Lcom/google/android/gms/internal/gtm/s;
 
-    iget-object v0, v0, 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/s;->aoJ: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;->aoR:Lcom/google/android/gms/internal/gtm/s;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/t;->aoN:Lcom/google/android/gms/internal/gtm/s;
 
-    iget-object v0, v0, 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/s;->aoJ: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;->aoR:Lcom/google/android/gms/internal/gtm/s;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/t;->aoN:Lcom/google/android/gms/internal/gtm/s;
 
-    iget-object v0, v0, 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/s;->aoJ:Lcom/google/android/gms/internal/gtm/q;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/t;->aoQ:Lcom/google/android/gms/internal/gtm/ba;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/t;->aoM:Lcom/google/android/gms/internal/gtm/ba;
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->lN()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lL()V
 
-    iput-object v1, v0, Lcom/google/android/gms/internal/gtm/q;->aoK:Lcom/google/android/gms/internal/gtm/ba;
+    iput-object v1, v0, Lcom/google/android/gms/internal/gtm/q;->aoG:Lcom/google/android/gms/internal/gtm/ba;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/q;->op()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/q;->on()V
 
-    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/j;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->oe()Lcom/google/android/gms/internal/gtm/e;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->oc()Lcom/google/android/gms/internal/gtm/e;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/e;->ob()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/e;->nZ()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 0aad31f776..38e265a31f 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 aoR:Lcom/google/android/gms/internal/gtm/s;
+.field private final synthetic aoN:Lcom/google/android/gms/internal/gtm/s;
 
-.field private final synthetic aoS:Landroid/content/ComponentName;
+.field private final synthetic aoO: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;->aoR:Lcom/google/android/gms/internal/gtm/s;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/u;->aoN:Lcom/google/android/gms/internal/gtm/s;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/u;->aoS:Landroid/content/ComponentName;
+    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/u;->aoO: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;->aoR:Lcom/google/android/gms/internal/gtm/s;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/u;->aoN:Lcom/google/android/gms/internal/gtm/s;
 
-    iget-object v0, v0, 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/s;->aoJ:Lcom/google/android/gms/internal/gtm/q;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/u;->aoS:Landroid/content/ComponentName;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/u;->aoO:Landroid/content/ComponentName;
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->lN()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lL()V
 
-    iget-object v2, v0, Lcom/google/android/gms/internal/gtm/q;->aoK:Lcom/google/android/gms/internal/gtm/ba;
+    iget-object v2, v0, Lcom/google/android/gms/internal/gtm/q;->aoG: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;->aoK:Lcom/google/android/gms/internal/gtm/ba;
+    iput-object v2, v0, Lcom/google/android/gms/internal/gtm/q;->aoG: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;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/j;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->oe()Lcom/google/android/gms/internal/gtm/e;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->oc()Lcom/google/android/gms/internal/gtm/e;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/e;->oa()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/e;->nY()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 fa083d523b..000e827ea4 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 aoT:Ljava/lang/String;
+.field private static final aoP:Ljava/lang/String;
 
-.field private static final aoU:Ljava/lang/String;
+.field private static final aoQ:Ljava/lang/String;
 
 
 # instance fields
-.field private final aoV:Lcom/google/android/gms/internal/gtm/w;
+.field private final aoR:Lcom/google/android/gms/internal/gtm/w;
 
-.field private final aoW:Lcom/google/android/gms/internal/gtm/bp;
+.field private final aoS:Lcom/google/android/gms/internal/gtm/bp;
 
-.field private final aoX:Lcom/google/android/gms/internal/gtm/bp;
+.field private final aoT: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;->aoT:Ljava/lang/String;
+    sput-object v0, Lcom/google/android/gms/internal/gtm/v;->aoP: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;->aoU:Ljava/lang/String;
+    sput-object v0, Lcom/google/android/gms/internal/gtm/v;->aoQ: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;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/j;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/m;->aem:Lcom/google/android/gms/common/util/e;
+    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/m;->aei: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;->aoW:Lcom/google/android/gms/internal/gtm/bp;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/v;->aoS: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;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/j;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/m;->aem:Lcom/google/android/gms/common/util/e;
+    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/m;->aei: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;->aoX:Lcom/google/android/gms/internal/gtm/bp;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/v;->aoT: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;->aeA:Landroid/content/Context;
+    iget-object p1, p1, Lcom/google/android/gms/internal/gtm/m;->aew: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;->aoV:Lcom/google/android/gms/internal/gtm/w;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/v;->aoR: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;->aoX:Lcom/google/android/gms/internal/gtm/bp;
+    iget-object p0, p0, Lcom/google/android/gms/internal/gtm/v;->aoT:Lcom/google/android/gms/internal/gtm/bp;
 
     return-object p0
 .end method
@@ -454,12 +454,12 @@
     return-object p1
 .end method
 
-.method private final or()J
+.method private final op()J
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->lN()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lL()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oi()V
 
     const-string v0, "SELECT COUNT(*) FROM hits2"
 
@@ -470,7 +470,7 @@
     return-wide v0
 .end method
 
-.method static synthetic ov()Ljava/lang/String;
+.method static synthetic ot()Ljava/lang/String;
     .locals 1
 
     const-string v0, "google_analytics_v4.db"
@@ -478,10 +478,10 @@
     return-object v0
 .end method
 
-.method static synthetic ow()Ljava/lang/String;
+.method static synthetic ou()Ljava/lang/String;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/gtm/v;->aoT:Ljava/lang/String;
+    sget-object v0, Lcom/google/android/gms/internal/gtm/v;->aoP: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;->lN()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lL()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oi()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;->ok()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oi()V
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->lN()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lL()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;->ok()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oi()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;->lN()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lL()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oi()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;->aoI:Ljava/util/Map;
+    iget-object v1, p1, Lcom/google/android/gms/internal/gtm/az;->aoE: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;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->om()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->ok()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;->apS:Lcom/google/android/gms/internal/gtm/av;
+    sget-object v1, Lcom/google/android/gms/internal/gtm/au;->apO:Lcom/google/android/gms/internal/gtm/av;
 
-    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/av;->aqF:Ljava/lang/Object;
+    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/av;->aqB: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;->or()J
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/v;->op()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;->aqP:J
+    iget-wide v3, p1, Lcom/google/android/gms/internal/gtm/az;->aqL: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;->aqQ:I
+    iget v0, p1, Lcom/google/android/gms/internal/gtm/az;->aqM: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;->aqR:Z
+    iget-boolean v0, p1, Lcom/google/android/gms/internal/gtm/az;->aqN:Z
 
     if-eqz v0, :cond_5
 
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oT()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oR()Ljava/lang/String;
 
     move-result-object v0
 
     goto :goto_1
 
     :cond_5
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oU()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oS()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;->aoV:Lcom/google/android/gms/internal/gtm/w;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/v;->aoR: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;->ok()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oi()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;->aoV:Lcom/google/android/gms/internal/gtm/w;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/v;->aoR: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;->or()J
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/v;->op()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;->lN()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lL()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oi()V
 
     invoke-interface {p1}, Ljava/util/List;->isEmpty()Z
 
@@ -1222,20 +1222,20 @@
     goto :goto_1
 .end method
 
-.method protected final nT()V
+.method protected final nR()V
     .locals 0
 
     return-void
 .end method
 
-.method public final os()I
+.method public final oq()I
     .locals 6
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->lN()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lL()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oi()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/v;->aoW:Lcom/google/android/gms/internal/gtm/bp;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/v;->aoS: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;->aoW:Lcom/google/android/gms/internal/gtm/bp;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/v;->aoS: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;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/j;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v2, v2, Lcom/google/android/gms/internal/gtm/m;->aem:Lcom/google/android/gms/common/util/e;
+    iget-object v2, v2, Lcom/google/android/gms/internal/gtm/m;->aei: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 ot()J
+.method public final or()J
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->lN()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lL()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oi()V
 
-    sget-object v0, Lcom/google/android/gms/internal/gtm/v;->aoU:Ljava/lang/String;
+    sget-object v0, Lcom/google/android/gms/internal/gtm/v;->aoQ:Ljava/lang/String;
 
     const/4 v1, 0x0
 
@@ -1321,7 +1321,7 @@
     return-wide v0
 .end method
 
-.method public final ou()Ljava/util/List;
+.method public final os()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;->ok()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/internal/gtm/k;->oi()V
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->lN()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lL()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;->apU:Lcom/google/android/gms/internal/gtm/av;
+    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;->aqF:Ljava/lang/Object;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aqB: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;->ok()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oi()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;->lN()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lL()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/k;->oi()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;->lN()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lL()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oi()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 6b82efdf13..d92bf8864e 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 aoY:Lcom/google/android/gms/internal/gtm/v;
+.field private final synthetic aoU: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;->aoY:Lcom/google/android/gms/internal/gtm/v;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/w;->aoU: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;->aoY:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/w;->aoU: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;->aoY:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/w;->aoU: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;->aoY:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/w;->aoU: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;->aoY:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/w;->aoU: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;->ov()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/v;->ot()Ljava/lang/String;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/w;->aoY:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/w;->aoU:Lcom/google/android/gms/internal/gtm/v;
 
-    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/j;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/m;->aeA:Landroid/content/Context;
+    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/m;->aew: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;->aoY:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/w;->aoU: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;->sL:J
+    iput-wide v2, v1, Lcom/google/android/gms/internal/gtm/bp;->sM: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;->aoY:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/w;->aoU: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;->ow()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/v;->ou()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 f5a170fa63..23f9b8be2b 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 aeE:Lcom/google/android/gms/internal/gtm/by;
+.field private final aeA: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;->aeE:Lcom/google/android/gms/internal/gtm/by;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/x;->aeA:Lcom/google/android/gms/internal/gtm/by;
 
     return-void
 .end method
 
 
 # virtual methods
-.method protected final nT()V
+.method protected final nR()V
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->od()Lcom/google/android/gms/analytics/m;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->ob()Lcom/google/android/gms/analytics/m;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/analytics/m;->lM()Lcom/google/android/gms/internal/gtm/by;
+    invoke-virtual {v0}, Lcom/google/android/gms/analytics/m;->lK()Lcom/google/android/gms/internal/gtm/by;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/x;->aeE:Lcom/google/android/gms/internal/gtm/by;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/x;->aeA: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;->og()Lcom/google/android/gms/internal/gtm/br;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->oe()Lcom/google/android/gms/internal/gtm/br;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/br;->pw()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/br;->pu()Ljava/lang/String;
 
     move-result-object v1
 
     if-eqz v1, :cond_0
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/x;->aeE:Lcom/google/android/gms/internal/gtm/by;
+    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/x;->aeA:Lcom/google/android/gms/internal/gtm/by;
 
-    iput-object v1, v2, Lcom/google/android/gms/internal/gtm/by;->arH:Ljava/lang/String;
+    iput-object v1, v2, Lcom/google/android/gms/internal/gtm/by;->arD:Ljava/lang/String;
 
     :cond_0
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/br;->pv()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/br;->pt()Ljava/lang/String;
 
     move-result-object v0
 
     if-eqz v0, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/x;->aeE:Lcom/google/android/gms/internal/gtm/by;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/x;->aeA:Lcom/google/android/gms/internal/gtm/by;
 
-    iput-object v0, v1, Lcom/google/android/gms/internal/gtm/by;->arI:Ljava/lang/String;
+    iput-object v0, v1, Lcom/google/android/gms/internal/gtm/by;->arE:Ljava/lang/String;
 
     :cond_1
     return-void
 .end method
 
-.method public final ox()Lcom/google/android/gms/internal/gtm/by;
+.method public final ov()Lcom/google/android/gms/internal/gtm/by;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oi()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/x;->aeE:Lcom/google/android/gms/internal/gtm/by;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/x;->aeA: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 93d079ac80..d855829910 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 aoZ:Z
+.field private aoV:Z
 
-.field private final apa:Lcom/google/android/gms/internal/gtm/v;
+.field private final aoW:Lcom/google/android/gms/internal/gtm/v;
 
-.field private final apb:Lcom/google/android/gms/internal/gtm/bf;
+.field private final aoX:Lcom/google/android/gms/internal/gtm/bf;
 
-.field private final apc:Lcom/google/android/gms/internal/gtm/be;
+.field private final aoY:Lcom/google/android/gms/internal/gtm/be;
 
-.field private final apd:Lcom/google/android/gms/internal/gtm/q;
+.field private final aoZ:Lcom/google/android/gms/internal/gtm/q;
+
+.field private apa:J
+
+.field private final apb:Lcom/google/android/gms/internal/gtm/ao;
+
+.field private final apc:Lcom/google/android/gms/internal/gtm/ao;
+
+.field private final apd:Lcom/google/android/gms/internal/gtm/bp;
 
 .field private ape:J
 
-.field private final apf:Lcom/google/android/gms/internal/gtm/ao;
-
-.field private final apg:Lcom/google/android/gms/internal/gtm/ao;
-
-.field private final aph:Lcom/google/android/gms/internal/gtm/bp;
-
-.field private apj:J
-
-.field private apk:Z
+.field private apf:Z
 
 
 # direct methods
@@ -36,53 +36,53 @@
 
     const-wide/high16 v0, -0x8000000000000000L
 
-    iput-wide v0, p0, Lcom/google/android/gms/internal/gtm/y;->ape:J
+    iput-wide v0, p0, Lcom/google/android/gms/internal/gtm/y;->apa: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;->apc:Lcom/google/android/gms/internal/gtm/be;
+    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/y;->aoY: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;->apa:Lcom/google/android/gms/internal/gtm/v;
+    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/y;->aoW: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;->apb:Lcom/google/android/gms/internal/gtm/bf;
+    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/y;->aoX: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;->apd:Lcom/google/android/gms/internal/gtm/q;
+    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/y;->aoZ: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;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aem:Lcom/google/android/gms/common/util/e;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aei: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;->aph:Lcom/google/android/gms/internal/gtm/bp;
+    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/y;->apd: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;->apf:Lcom/google/android/gms/internal/gtm/ao;
+    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/y;->apb: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;->apg:Lcom/google/android/gms/internal/gtm/ao;
+    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/y;->apc: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;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/j;->aof: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;->aoF:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/internal/gtm/p;->aoB: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;->aoG:Z
+    iget-boolean v1, p1, Lcom/google/android/gms/internal/gtm/p;->aoC:Z
 
-    iput-boolean v1, v0, Lcom/google/android/gms/analytics/d;->aef:Z
+    iput-boolean v1, v0, Lcom/google/android/gms/analytics/d;->aea:Z
 
-    invoke-virtual {v0}, Lcom/google/android/gms/analytics/l;->lH()Lcom/google/android/gms/analytics/j;
+    invoke-virtual {v0}, Lcom/google/android/gms/analytics/l;->lF()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;->ask:Ljava/lang/String;
+    iput-object v2, v1, Lcom/google/android/gms/internal/gtm/ch;->asg:Ljava/lang/String;
 
     const/4 v2, 0x1
 
-    iput-boolean v2, v1, Lcom/google/android/gms/internal/gtm/ch;->asp:Z
+    iput-boolean v2, v1, Lcom/google/android/gms/internal/gtm/ch;->asl: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;->aoI:Ljava/util/Map;
+    iget-object v4, p1, Lcom/google/android/gms/internal/gtm/p;->aoE: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;->arH:Ljava/lang/String;
+    iput-object v5, v3, Lcom/google/android/gms/internal/gtm/by;->arD: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;->arI:Ljava/lang/String;
+    iput-object v5, v3, Lcom/google/android/gms/internal/gtm/by;->arE: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;->arJ:Ljava/lang/String;
+    iput-object v5, v3, Lcom/google/android/gms/internal/gtm/by;->arF: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;->arK:Ljava/lang/String;
+    iput-object v5, v3, Lcom/google/android/gms/internal/gtm/by;->arG: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;->asl:Ljava/lang/String;
+    iput-object v5, v1, Lcom/google/android/gms/internal/gtm/ch;->ash: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;->aoF:Ljava/lang/String;
+    iget-object p1, p1, Lcom/google/android/gms/internal/gtm/p;->aoB: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;->oh()Lcom/google/android/gms/internal/gtm/bh;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->of()Lcom/google/android/gms/internal/gtm/bh;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/bh;->pk()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/bh;->pi()J
 
     move-result-wide p1
 
-    iput-wide p1, v0, Lcom/google/android/gms/analytics/j;->aep:J
+    iput-wide p1, v0, Lcom/google/android/gms/analytics/j;->ael:J
 
-    invoke-virtual {v0}, Lcom/google/android/gms/analytics/j;->lK()V
+    invoke-virtual {v0}, Lcom/google/android/gms/analytics/j;->lI()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;->apa:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->aoW:Lcom/google/android/gms/internal/gtm/v;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/v;->os()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/v;->oq()I
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/y;->oB()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/y;->oz()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;->apg:Lcom/google/android/gms/internal/gtm/ao;
+    iget-object p0, p0, Lcom/google/android/gms/internal/gtm/y;->apc: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;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aeA:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aew: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,20 +342,310 @@
     return p1
 .end method
 
-.method private final oA()Z
+.method private final oA()V
+    .locals 6
+
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->od()Lcom/google/android/gms/internal/gtm/ar;
+
+    move-result-object v0
+
+    iget-boolean v1, v0, Lcom/google/android/gms/internal/gtm/ar;->apF:Z
+
+    if-nez v1, :cond_0
+
+    return-void
+
+    :cond_0
+    iget-boolean v1, v0, Lcom/google/android/gms/internal/gtm/ar;->apG:Z
+
+    if-nez v1, :cond_1
+
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->or()J
+
+    move-result-wide v1
+
+    const-wide/16 v3, 0x0
+
+    cmp-long v5, v1, v3
+
+    if-eqz v5, :cond_1
+
+    iget-object v3, p0, Lcom/google/android/gms/internal/gtm/j;->aof:Lcom/google/android/gms/internal/gtm/m;
+
+    iget-object v3, v3, Lcom/google/android/gms/internal/gtm/m;->aei:Lcom/google/android/gms/common/util/e;
+
+    invoke-interface {v3}, Lcom/google/android/gms/common/util/e;->currentTimeMillis()J
+
+    move-result-wide v3
+
+    sub-long/2addr v3, v1
+
+    invoke-static {v3, v4}, Ljava/lang/Math;->abs(J)J
+
+    move-result-wide v1
+
+    sget-object v3, Lcom/google/android/gms/internal/gtm/au;->apW:Lcom/google/android/gms/internal/gtm/av;
+
+    iget-object v3, v3, Lcom/google/android/gms/internal/gtm/av;->aqB:Ljava/lang/Object;
+
+    check-cast v3, Ljava/lang/Long;
+
+    invoke-virtual {v3}, Ljava/lang/Long;->longValue()J
+
+    move-result-wide v3
+
+    cmp-long v5, v1, v3
+
+    if-gtz v5, :cond_1
+
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oO()J
+
+    move-result-wide v1
+
+    invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v1
+
+    const-string v2, "Dispatch alarm scheduled (ms)"
+
+    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;->oZ()V
+
+    :cond_1
+    return-void
+.end method
+
+.method private final oB()V
+    .locals 2
+
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->apb:Lcom/google/android/gms/internal/gtm/ao;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/ao;->oX()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;->apb: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;->od()Lcom/google/android/gms/internal/gtm/ar;
+
+    move-result-object v0
+
+    iget-boolean v1, v0, Lcom/google/android/gms/internal/gtm/ar;->apG: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 oC()J
+    .locals 5
+
+    iget-wide v0, p0, Lcom/google/android/gms/internal/gtm/y;->apa: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;->apR:Lcom/google/android/gms/internal/gtm/av;
+
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aqB: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;->oe()Lcom/google/android/gms/internal/gtm/br;
+
+    move-result-object v2
+
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/gtm/k;->oi()V
+
+    iget-boolean v2, v2, Lcom/google/android/gms/internal/gtm/br;->ars:Z
+
+    if-eqz v2, :cond_1
+
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->oe()Lcom/google/android/gms/internal/gtm/br;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/k;->oi()V
+
+    iget v0, v0, Lcom/google/android/gms/internal/gtm/br;->aqH: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 oD()V
+    .locals 1
+
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oi()V
+
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lL()V
+
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Lcom/google/android/gms/internal/gtm/y;->apf:Z
+
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->aoZ: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;->oz()V
+
+    return-void
+.end method
+
+.method private final or()J
+    .locals 2
+
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lL()V
+
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oi()V
+
+    :try_start_0
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->aoW:Lcom/google/android/gms/internal/gtm/v;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/v;->or()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 ox()V
+    .locals 3
+
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/y;->apf:Z
+
+    if-eqz v0, :cond_0
+
+    return-void
+
+    :cond_0
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oL()Z
+
+    move-result v0
+
+    if-nez v0, :cond_1
+
+    return-void
+
+    :cond_1
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->aoZ: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;->aqx:Lcom/google/android/gms/internal/gtm/av;
+
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aqB: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;->apd: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;->apd: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;->aoZ:Lcom/google/android/gms/internal/gtm/q;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/q;->eD()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;->apd: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;->nZ()V
+
+    :cond_3
+    return-void
+.end method
+
+.method private final oy()Z
     .locals 12
 
     const-string v0, "Failed to commit local dispatch transaction"
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->lN()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lL()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oi()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;->apd:Lcom/google/android/gms/internal/gtm/q;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/y;->aoZ:Lcom/google/android/gms/internal/gtm/q;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/q;->isConnected()Z
 
@@ -363,9 +653,9 @@
 
     xor-int/lit8 v1, v1, 0x1
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/y;->apb:Lcom/google/android/gms/internal/gtm/bf;
+    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/y;->aoX:Lcom/google/android/gms/internal/gtm/bf;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/gtm/bf;->ph()Z
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/gtm/bf;->pf()Z
 
     move-result v2
 
@@ -384,11 +674,11 @@
     return v3
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oR()I
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oP()I
 
     move-result v1
 
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oS()I
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oQ()I
 
     move-result v2
 
@@ -406,7 +696,7 @@
 
     :goto_0
     :try_start_0
-    iget-object v7, p0, Lcom/google/android/gms/internal/gtm/y;->apa:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v7, p0, Lcom/google/android/gms/internal/gtm/y;->aoW:Lcom/google/android/gms/internal/gtm/v;
 
     invoke-virtual {v7}, Lcom/google/android/gms/internal/gtm/v;->beginTransaction()V
 
@@ -415,7 +705,7 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     :try_start_1
-    iget-object v7, p0, Lcom/google/android/gms/internal/gtm/y;->apa:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v7, p0, Lcom/google/android/gms/internal/gtm/y;->aoW:Lcom/google/android/gms/internal/gtm/v;
 
     invoke-virtual {v7, v1, v2}, Lcom/google/android/gms/internal/gtm/v;->t(J)Ljava/util/List;
 
@@ -431,17 +721,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;->oD()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->oB()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;->apa:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/y;->aoW: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;->apa:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/y;->aoW:Lcom/google/android/gms/internal/gtm/v;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/v;->endTransaction()V
     :try_end_2
@@ -454,7 +744,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;->oD()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->oB()V
 
     return v3
 
@@ -493,7 +783,7 @@
 
     check-cast v9, Lcom/google/android/gms/internal/gtm/az;
 
-    iget-wide v9, v9, Lcom/google/android/gms/internal/gtm/az;->aqO:J
+    iget-wide v9, v9, Lcom/google/android/gms/internal/gtm/az;->aqK:J
 
     cmp-long v11, v9, v5
 
@@ -515,16 +805,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;->oD()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->oB()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;->apa:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/y;->aoW: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;->apa:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/y;->aoW:Lcom/google/android/gms/internal/gtm/v;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/v;->endTransaction()V
     :try_end_5
@@ -537,13 +827,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;->oD()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->oB()V
 
     return v3
 
     :cond_3
     :try_start_6
-    iget-object v8, p0, Lcom/google/android/gms/internal/gtm/y;->apd:Lcom/google/android/gms/internal/gtm/q;
+    iget-object v8, p0, Lcom/google/android/gms/internal/gtm/y;->aoZ:Lcom/google/android/gms/internal/gtm/q;
 
     invoke-virtual {v8}, Lcom/google/android/gms/internal/gtm/q;->isConnected()Z
 
@@ -568,7 +858,7 @@
 
     check-cast v8, Lcom/google/android/gms/internal/gtm/az;
 
-    iget-object v9, p0, Lcom/google/android/gms/internal/gtm/y;->apd:Lcom/google/android/gms/internal/gtm/q;
+    iget-object v9, p0, Lcom/google/android/gms/internal/gtm/y;->aoZ: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
 
@@ -576,7 +866,7 @@
 
     if-eqz v9, :cond_4
 
-    iget-wide v9, v8, Lcom/google/android/gms/internal/gtm/az;->aqO:J
+    iget-wide v9, v8, Lcom/google/android/gms/internal/gtm/az;->aqK:J
 
     invoke-static {v5, v6, v9, v10}, Ljava/lang/Math;->max(JJ)J
 
@@ -591,13 +881,13 @@
     .catchall {:try_start_6 .. :try_end_6} :catchall_0
 
     :try_start_7
-    iget-object v9, p0, Lcom/google/android/gms/internal/gtm/y;->apa:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v9, p0, Lcom/google/android/gms/internal/gtm/y;->aoW:Lcom/google/android/gms/internal/gtm/v;
 
-    iget-wide v10, v8, Lcom/google/android/gms/internal/gtm/az;->aqO:J
+    iget-wide v10, v8, Lcom/google/android/gms/internal/gtm/az;->aqK: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;->aqO:J
+    iget-wide v8, v8, Lcom/google/android/gms/internal/gtm/az;->aqK:J
 
     invoke-static {v8, v9}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -618,16 +908,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;->oD()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->oB()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;->apa:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/y;->aoW: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;->apa:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/y;->aoW:Lcom/google/android/gms/internal/gtm/v;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/v;->endTransaction()V
     :try_end_9
@@ -640,21 +930,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;->oD()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->oB()V
 
     return v3
 
     :cond_4
     :try_start_a
-    iget-object v8, p0, Lcom/google/android/gms/internal/gtm/y;->apb:Lcom/google/android/gms/internal/gtm/bf;
+    iget-object v8, p0, Lcom/google/android/gms/internal/gtm/y;->aoX:Lcom/google/android/gms/internal/gtm/bf;
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/gtm/bf;->ph()Z
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/gtm/bf;->pf()Z
 
     move-result v8
 
     if-eqz v8, :cond_6
 
-    iget-object v8, p0, Lcom/google/android/gms/internal/gtm/y;->apb:Lcom/google/android/gms/internal/gtm/bf;
+    iget-object v8, p0, Lcom/google/android/gms/internal/gtm/y;->aoX: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;
 
@@ -691,7 +981,7 @@
 
     :cond_5
     :try_start_b
-    iget-object v8, p0, Lcom/google/android/gms/internal/gtm/y;->apa:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v8, p0, Lcom/google/android/gms/internal/gtm/y;->aoW:Lcom/google/android/gms/internal/gtm/v;
 
     invoke-virtual {v8, v7}, Lcom/google/android/gms/internal/gtm/v;->m(Ljava/util/List;)V
 
@@ -710,16 +1000,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;->oD()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->oB()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;->apa:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/y;->aoW: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;->apa:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/y;->aoW:Lcom/google/android/gms/internal/gtm/v;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/v;->endTransaction()V
     :try_end_d
@@ -732,7 +1022,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;->oD()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->oB()V
 
     return v3
 
@@ -748,11 +1038,11 @@
     if-eqz v7, :cond_7
 
     :try_start_f
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/y;->apa:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/y;->aoW: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;->apa:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/y;->aoW:Lcom/google/android/gms/internal/gtm/v;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/v;->endTransaction()V
     :try_end_f
@@ -765,17 +1055,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;->oD()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->oB()V
 
     return v3
 
     :cond_7
     :try_start_10
-    iget-object v7, p0, Lcom/google/android/gms/internal/gtm/y;->apa:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v7, p0, Lcom/google/android/gms/internal/gtm/y;->aoW: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;->apa:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v7, p0, Lcom/google/android/gms/internal/gtm/y;->aoW:Lcom/google/android/gms/internal/gtm/v;
 
     invoke-virtual {v7}, Lcom/google/android/gms/internal/gtm/v;->endTransaction()V
     :try_end_10
@@ -788,7 +1078,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;->oD()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->oB()V
 
     return v3
 
@@ -800,16 +1090,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;->oD()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->oB()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;->apa:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/y;->aoW: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;->apa:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/y;->aoW:Lcom/google/android/gms/internal/gtm/v;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/v;->endTransaction()V
     :try_end_12
@@ -822,7 +1112,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;->oD()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->oB()V
 
     return v3
 
@@ -830,11 +1120,11 @@
     move-exception v1
 
     :try_start_13
-    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/y;->apa:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/y;->aoW: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;->apa:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/y;->aoW:Lcom/google/android/gms/internal/gtm/v;
 
     invoke-virtual {v2}, Lcom/google/android/gms/internal/gtm/v;->endTransaction()V
     :try_end_13
@@ -847,301 +1137,11 @@
 
     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;->oD()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->oB()V
 
     return v3
 .end method
 
-.method private final oC()V
-    .locals 6
-
-    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;->apJ:Z
-
-    if-nez v1, :cond_0
-
-    return-void
-
-    :cond_0
-    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;->ot()J
-
-    move-result-wide v1
-
-    const-wide/16 v3, 0x0
-
-    cmp-long v5, v1, v3
-
-    if-eqz v5, :cond_1
-
-    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;->aem:Lcom/google/android/gms/common/util/e;
-
-    invoke-interface {v3}, Lcom/google/android/gms/common/util/e;->currentTimeMillis()J
-
-    move-result-wide v3
-
-    sub-long/2addr v3, v1
-
-    invoke-static {v3, v4}, Ljava/lang/Math;->abs(J)J
-
-    move-result-wide v1
-
-    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;->aqF:Ljava/lang/Object;
-
-    check-cast v3, Ljava/lang/Long;
-
-    invoke-virtual {v3}, Ljava/lang/Long;->longValue()J
-
-    move-result-wide v3
-
-    cmp-long v5, v1, v3
-
-    if-gtz v5, :cond_1
-
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oQ()J
-
-    move-result-wide v1
-
-    invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object v1
-
-    const-string v2, "Dispatch alarm scheduled (ms)"
-
-    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;->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;->lN()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lL()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oi()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/y;->apk:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/y;->apf: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;->oh()Lcom/google/android/gms/internal/gtm/bh;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->of()Lcom/google/android/gms/internal/gtm/bh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/bh;->arh:Lcom/google/android/gms/internal/gtm/bi;
+    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/bh;->ard:Lcom/google/android/gms/internal/gtm/bi;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/bi;->pq()Landroid/util/Pair;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/bi;->po()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;->aoI:Ljava/util/Map;
+    iget-object v2, p1, Lcom/google/android/gms/internal/gtm/az;->aoE: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;->aqP:J
+    iget-wide v5, p1, Lcom/google/android/gms/internal/gtm/az;->aqL:J
 
-    iget-boolean v7, p1, Lcom/google/android/gms/internal/gtm/az;->aqR:Z
+    iget-boolean v7, p1, Lcom/google/android/gms/internal/gtm/az;->aqN:Z
 
-    iget-wide v8, p1, Lcom/google/android/gms/internal/gtm/az;->aqO:J
+    iget-wide v8, p1, Lcom/google/android/gms/internal/gtm/az;->aqK:J
 
-    iget v10, p1, Lcom/google/android/gms/internal/gtm/az;->aqQ:I
+    iget v10, p1, Lcom/google/android/gms/internal/gtm/az;->aqM:I
 
-    iget-object v11, p1, Lcom/google/android/gms/internal/gtm/az;->aqN:Ljava/util/List;
+    iget-object v11, p1, Lcom/google/android/gms/internal/gtm/az;->aqJ: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;->oz()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->ox()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->apd:Lcom/google/android/gms/internal/gtm/q;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->aoZ: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;->apa:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->aoW: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;->oB()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/y;->oz()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;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->om()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->ok()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;->apj:J
+    iget-wide v0, p0, Lcom/google/android/gms/internal/gtm/y;->ape:J
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->lN()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lL()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oi()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->oh()Lcom/google/android/gms/internal/gtm/bh;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->of()Lcom/google/android/gms/internal/gtm/bh;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/gtm/bh;->pm()J
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/gtm/bh;->pk()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;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v4, p0, Lcom/google/android/gms/internal/gtm/j;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v4, v4, Lcom/google/android/gms/internal/gtm/m;->aem:Lcom/google/android/gms/common/util/e;
+    iget-object v4, v4, Lcom/google/android/gms/internal/gtm/m;->aei: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;->oz()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->ox()V
 
     :try_start_0
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->oA()Z
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->oy()Z
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->oh()Lcom/google/android/gms/internal/gtm/bh;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->of()Lcom/google/android/gms/internal/gtm/bh;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/gtm/bh;->pn()V
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/gtm/bh;->pl()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/y;->oB()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/y;->oz()V
 
     if-eqz p1, :cond_1
 
-    invoke-interface {p1}, Lcom/google/android/gms/internal/gtm/as;->oG()V
+    invoke-interface {p1}, Lcom/google/android/gms/internal/gtm/as;->oE()V
 
     :cond_1
-    iget-wide v2, p0, Lcom/google/android/gms/internal/gtm/y;->apj:J
+    iget-wide v2, p0, Lcom/google/android/gms/internal/gtm/y;->ape:J
 
     cmp-long v4, v2, v0
 
     if-eqz v4, :cond_2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->apc:Lcom/google/android/gms/internal/gtm/be;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->aoY:Lcom/google/android/gms/internal/gtm/be;
 
-    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/be;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aeA:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aew: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;->aqV:Ljava/lang/String;
+    sget-object v2, Lcom/google/android/gms/internal/gtm/be;->aqR: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;->oh()Lcom/google/android/gms/internal/gtm/bh;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->of()Lcom/google/android/gms/internal/gtm/bh;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/bh;->pn()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/bh;->pl()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/y;->oB()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/y;->oz()V
 
     if-eqz p1, :cond_3
 
-    invoke-interface {p1}, Lcom/google/android/gms/internal/gtm/as;->oG()V
+    invoke-interface {p1}, Lcom/google/android/gms/internal/gtm/as;->oE()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;->lN()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lL()V
 
-    iget-object v0, p1, Lcom/google/android/gms/internal/gtm/p;->aoF:Ljava/lang/String;
+    iget-object v0, p1, Lcom/google/android/gms/internal/gtm/p;->aoB: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;->oh()Lcom/google/android/gms/internal/gtm/bh;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->of()Lcom/google/android/gms/internal/gtm/bh;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/bh;->pl()Lcom/google/android/gms/internal/gtm/bp;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/bh;->pj()Lcom/google/android/gms/internal/gtm/bp;
 
     move-result-object v0
 
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oX()J
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oV()J
 
     move-result-wide v1
 
@@ -1489,11 +1489,11 @@
     return-void
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->oh()Lcom/google/android/gms/internal/gtm/bh;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->of()Lcom/google/android/gms/internal/gtm/bh;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/bh;->po()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/bh;->pm()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;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/j;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/m;->om()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/m;->ok()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;->lN()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lL()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->om()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->ok()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;->oh()Lcom/google/android/gms/internal/gtm/bh;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->of()Lcom/google/android/gms/internal/gtm/bh;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/bh;->po()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/bh;->pm()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;->oh()Lcom/google/android/gms/internal/gtm/bh;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->of()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;->oh()Lcom/google/android/gms/internal/gtm/bh;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->of()Lcom/google/android/gms/internal/gtm/bh;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/bh;->pl()Lcom/google/android/gms/internal/gtm/bp;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/bh;->pj()Lcom/google/android/gms/internal/gtm/bp;
 
     move-result-object p1
 
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oX()J
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oV()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;->apa:Lcom/google/android/gms/internal/gtm/v;
+    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/y;->aoW:Lcom/google/android/gms/internal/gtm/v;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/v;->ou()Ljava/util/List;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/v;->os()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;->ok()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/internal/gtm/k;->oi()V
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->lN()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lL()V
 
     const-wide/16 v4, -0x1
 
     :try_start_0
-    iget-object v6, v1, Lcom/google/android/gms/internal/gtm/y;->apa:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v6, v1, Lcom/google/android/gms/internal/gtm/y;->aoW: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;->apa:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v6, v1, Lcom/google/android/gms/internal/gtm/y;->aoW:Lcom/google/android/gms/internal/gtm/v;
 
-    iget-wide v7, v0, Lcom/google/android/gms/internal/gtm/p;->aoD:J
+    iget-wide v7, v0, Lcom/google/android/gms/internal/gtm/p;->aoz:J
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/gtm/p;->aoE:Ljava/lang/String;
+    iget-object v9, v0, Lcom/google/android/gms/internal/gtm/p;->aoA: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;->ok()V
+    invoke-virtual {v6}, Lcom/google/android/gms/internal/gtm/k;->oi()V
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->lN()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lL()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;->apa:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v6, v1, Lcom/google/android/gms/internal/gtm/y;->aoW:Lcom/google/android/gms/internal/gtm/v;
 
-    iget-wide v9, v0, Lcom/google/android/gms/internal/gtm/p;->aoD:J
+    iget-wide v9, v0, Lcom/google/android/gms/internal/gtm/p;->aoz:J
 
-    iget-object v11, v0, Lcom/google/android/gms/internal/gtm/p;->aoE:Ljava/lang/String;
+    iget-object v11, v0, Lcom/google/android/gms/internal/gtm/p;->aoA:Ljava/lang/String;
 
-    iget-object v12, v0, Lcom/google/android/gms/internal/gtm/p;->aoF:Ljava/lang/String;
+    iget-object v12, v0, Lcom/google/android/gms/internal/gtm/p;->aoB: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;->aoH:J
+    iput-wide v11, v0, Lcom/google/android/gms/internal/gtm/p;->aoD:J
 
-    iget-object v6, v1, Lcom/google/android/gms/internal/gtm/y;->apa:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v6, v1, Lcom/google/android/gms/internal/gtm/y;->aoW: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;->ok()V
+    invoke-virtual {v6}, Lcom/google/android/gms/internal/gtm/k;->oi()V
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->lN()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lL()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;->aoI:Ljava/util/Map;
+    iget-object v12, v0, Lcom/google/android/gms/internal/gtm/p;->aoE: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;->aoD:J
+    iget-wide v7, v0, Lcom/google/android/gms/internal/gtm/p;->aoz: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;->aoE:Ljava/lang/String;
+    iget-object v8, v0, Lcom/google/android/gms/internal/gtm/p;->aoA: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;->aoF:Ljava/lang/String;
+    iget-object v8, v0, Lcom/google/android/gms/internal/gtm/p;->aoB: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;->aoG:Z
+    iget-boolean v8, v0, Lcom/google/android/gms/internal/gtm/p;->aoC: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;->aoH:J
+    iget-wide v14, v0, Lcom/google/android/gms/internal/gtm/p;->aoD: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;->apa:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v0, v1, Lcom/google/android/gms/internal/gtm/y;->aoW: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;->apa:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v0, v1, Lcom/google/android/gms/internal/gtm/y;->aoW: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;->apa:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v0, v1, Lcom/google/android/gms/internal/gtm/y;->aoW: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;->apa:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v0, v1, Lcom/google/android/gms/internal/gtm/y;->aoW:Lcom/google/android/gms/internal/gtm/v;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/v;->endTransaction()V
     :try_end_6
@@ -1991,230 +1991,34 @@
     goto :goto_7
 .end method
 
-.method protected final nT()V
+.method protected final nR()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->apa:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->aoW:Lcom/google/android/gms/internal/gtm/v;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/k;->ol()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/k;->oj()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->apb:Lcom/google/android/gms/internal/gtm/bf;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->aoX:Lcom/google/android/gms/internal/gtm/bf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/k;->ol()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/k;->oj()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->apd:Lcom/google/android/gms/internal/gtm/q;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->aoZ:Lcom/google/android/gms/internal/gtm/q;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/k;->ol()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/k;->oj()V
 
     return-void
 .end method
 
-.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
+.method protected final nZ()V
     .locals 5
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->lN()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lL()V
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->lN()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lL()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oi()V
 
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oN()Z
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oL()Z
 
     move-result v0
 
@@ -2225,7 +2029,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;->apd:Lcom/google/android/gms/internal/gtm/q;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->aoZ:Lcom/google/android/gms/internal/gtm/q;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/q;->isConnected()Z
 
@@ -2240,7 +2044,7 @@
     return-void
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->apa:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->aoW:Lcom/google/android/gms/internal/gtm/v;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/v;->isEmpty()Z
 
@@ -2254,9 +2058,9 @@
 
     :cond_2
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->apa:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->aoW:Lcom/google/android/gms/internal/gtm/v;
 
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oR()I
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oP()I
 
     move-result v1
 
@@ -2272,7 +2076,7 @@
 
     if-eqz v1, :cond_3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/y;->oB()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/y;->oz()V
     :try_end_0
     .catch Landroid/database/sqlite/SQLiteException; {:try_start_0 .. :try_end_0} :catch_1
 
@@ -2294,7 +2098,7 @@
 
     check-cast v1, Lcom/google/android/gms/internal/gtm/az;
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/y;->apd:Lcom/google/android/gms/internal/gtm/q;
+    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/y;->aoZ: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
 
@@ -2302,7 +2106,7 @@
 
     if-nez v2, :cond_4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/y;->oB()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/y;->oz()V
 
     return-void
 
@@ -2310,9 +2114,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;->apa:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/y;->aoW:Lcom/google/android/gms/internal/gtm/v;
 
-    iget-wide v3, v1, Lcom/google/android/gms/internal/gtm/az;->aqO:J
+    iget-wide v3, v1, Lcom/google/android/gms/internal/gtm/az;->aqK:J
 
     invoke-virtual {v2, v3, v4}, Lcom/google/android/gms/internal/gtm/v;->u(J)V
     :try_end_1
@@ -2327,7 +2131,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;->oD()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->oB()V
 
     return-void
 
@@ -2338,40 +2142,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;->oD()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->oB()V
 
     :cond_5
     return-void
 .end method
 
-.method final oc()V
+.method final oa()V
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->lN()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lL()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aem:Lcom/google/android/gms/common/util/e;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aei: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;->apj:J
+    iput-wide v0, p0, Lcom/google/android/gms/internal/gtm/y;->ape:J
 
     return-void
 .end method
 
-.method protected final oy()V
+.method protected final ow()V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oi()V
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->lN()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lL()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aeA:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aew:Landroid/content/Context;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/gtm/bj;->C(Landroid/content/Context;)Z
 
@@ -2409,11 +2213,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;->oh()Lcom/google/android/gms/internal/gtm/bh;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->of()Lcom/google/android/gms/internal/gtm/bh;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/bh;->pk()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/bh;->pi()J
 
     const-string v0, "android.permission.ACCESS_NETWORK_STATE"
 
@@ -2427,7 +2231,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;->oF()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->oD()V
 
     :cond_3
     const-string v0, "android.permission.INTERNET"
@@ -2442,12 +2246,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;->oF()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->oD()V
 
     :cond_4
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aof:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aeA:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aew:Landroid/content/Context;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/gtm/bk;->ad(Landroid/content/Context;)Z
 
@@ -2467,11 +2271,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;->apk:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/y;->apf:Z
 
     if-nez v0, :cond_6
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->apa:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->aoW:Lcom/google/android/gms/internal/gtm/v;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/v;->isEmpty()Z
 
@@ -2479,10 +2283,206 @@
 
     if-nez v0, :cond_6
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->oz()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->ox()V
 
     :cond_6
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/y;->oB()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/y;->oz()V
+
+    return-void
+.end method
+
+.method public final oz()V
+    .locals 8
+
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lL()V
+
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oi()V
+
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/y;->apf: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;->oC()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;->aoY: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;->oB()V
+
+    return-void
+
+    :cond_1
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->aoW: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;->aoY: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;->oB()V
+
+    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;->aqB: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;->aoY:Lcom/google/android/gms/internal/gtm/be;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/be;->pd()V
+
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->aoY: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;->oA()V
+
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->oC()J
+
+    move-result-wide v0
+
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->of()Lcom/google/android/gms/internal/gtm/bh;
+
+    move-result-object v4
+
+    invoke-virtual {v4}, Lcom/google/android/gms/internal/gtm/bh;->pk()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;->aof:Lcom/google/android/gms/internal/gtm/m;
+
+    iget-object v6, v6, Lcom/google/android/gms/internal/gtm/m;->aei: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;->oN()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;->oN()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;->apb:Lcom/google/android/gms/internal/gtm/ao;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/ao;->oX()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;->apb:Lcom/google/android/gms/internal/gtm/ao;
+
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/gtm/ao;->oW()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;->apb: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;->apb: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;->oB()V
+
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->oA()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;->ok()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oi()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/y;->aoZ:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/y;->aoV: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;->aoZ:Z
+    iput-boolean v1, p0, Lcom/google/android/gms/internal/gtm/y;->aoV:Z
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->od()Lcom/google/android/gms/analytics/m;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->ob()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 5e546ae05f..556e0f9139 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 apl:Lcom/google/android/gms/internal/gtm/y;
+.field private final synthetic apg: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;->apl:Lcom/google/android/gms/internal/gtm/y;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/z;->apg: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;->apl:Lcom/google/android/gms/internal/gtm/y;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/z;->apg: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 aaff233777..a39cf42e2b 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 apw:Ljava/lang/String;
+.field aps:Ljava/lang/String;
 
-.field private apx:Ljava/lang/String;
+.field private apt: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;->apw:Ljava/lang/String;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/zzbk;->aps: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;->apx:Ljava/lang/String;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/zzbk;->apt: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;->apw:Ljava/lang/String;
+    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/zzbk;->aps: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;->apx:Ljava/lang/String;
+    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/zzbk;->apt: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 0d801e44e3..0e1581aff8 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 akg:Landroid/os/IBinder;
+.field private final akc:Landroid/os/IBinder;
 
-.field private final ane:Ljava/lang/String;
+.field private final ana: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;->akg:Landroid/os/IBinder;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/a;->akc:Landroid/os/IBinder;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/a;->ane:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/a;->ana: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;->akg:Landroid/os/IBinder;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/a;->akc: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;->akg:Landroid/os/IBinder;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/a;->akc: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;->akg:Landroid/os/IBinder;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/a;->akc:Landroid/os/IBinder;
 
     const/4 v2, 0x0
 
@@ -123,14 +123,14 @@
     throw p1
 .end method
 
-.method public final pF()Landroid/os/Parcel;
+.method public final pD()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;->ane:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/a;->ana: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 0af2a3254c..829d3240e0 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 asO:Lcom/google/android/gms/internal/measurement/me$c;
+.field private final synthetic asK:Lcom/google/android/gms/internal/measurement/me$c;
 
-.field private final synthetic asx:Landroid/app/Activity;
+.field private final synthetic ast: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;->asO:Lcom/google/android/gms/internal/measurement/me$c;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/aa;->asK:Lcom/google/android/gms/internal/measurement/me$c;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/aa;->asx:Landroid/app/Activity;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/aa;->ast:Landroid/app/Activity;
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/me$c;->azS:Lcom/google/android/gms/internal/measurement/me;
+    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/me$c;->azO: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;->asO:Lcom/google/android/gms/internal/measurement/me$c;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/aa;->asK:Lcom/google/android/gms/internal/measurement/me$c;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/me$c;->azS:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/me$c;->azO: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;->asx:Landroid/app/Activity;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/aa;->ast: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;->anz:J
+    iget-wide v2, p0, Lcom/google/android/gms/internal/measurement/aa;->anv: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 e237ed18aa..8220fb771a 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/it;
+.field private final synthetic asA:Lcom/google/android/gms/internal/measurement/it;
 
-.field private final synthetic asN:Lcom/google/android/gms/internal/measurement/me$c;
+.field private final synthetic asJ:Lcom/google/android/gms/internal/measurement/me$c;
 
-.field private final synthetic asx:Landroid/app/Activity;
+.field private final synthetic ast: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;->asN:Lcom/google/android/gms/internal/measurement/me$c;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ab;->asJ:Lcom/google/android/gms/internal/measurement/me$c;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/ab;->asx:Landroid/app/Activity;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/ab;->ast:Landroid/app/Activity;
 
-    iput-object p3, p0, Lcom/google/android/gms/internal/measurement/ab;->asE:Lcom/google/android/gms/internal/measurement/it;
+    iput-object p3, p0, Lcom/google/android/gms/internal/measurement/ab;->asA:Lcom/google/android/gms/internal/measurement/it;
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/me$c;->azS:Lcom/google/android/gms/internal/measurement/me;
+    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/me$c;->azO: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;->asN:Lcom/google/android/gms/internal/measurement/me$c;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ab;->asJ:Lcom/google/android/gms/internal/measurement/me$c;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/me$c;->azS:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/me$c;->azO: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;->asx:Landroid/app/Activity;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ab;->ast: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;->asE:Lcom/google/android/gms/internal/measurement/it;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ab;->asA:Lcom/google/android/gms/internal/measurement/it;
 
-    iget-wide v3, p0, Lcom/google/android/gms/internal/measurement/ab;->anz:J
+    iget-wide v3, p0, Lcom/google/android/gms/internal/measurement/ab;->anv: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 6435ebdcc7..37ee21d85f 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;->pI()Lcom/google/android/gms/internal/measurement/ac$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ac$a;->pG()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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ac$a$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ac$a$a;->avJ: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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ac$a$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ac$a$a;->avJ: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;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ac$a$a;->avJ: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;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ac$a$a;->avJ: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 pJ()I
+.method public final pH()I
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ac$a$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ac$a$a;->avJ: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 pK()I
+.method public final pI()I
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ac$a$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ac$a$a;->avJ: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 3bf236fa79..cc1c149468 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;->tM()Lcom/google/android/gms/internal/measurement/fv;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fv;->tK()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;->tM()Lcom/google/android/gms/internal/measurement/fv;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fv;->tK()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;->pH()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ee;->pF()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;->sZ()Lcom/google/android/gms/internal/measurement/dw;
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()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;->pH()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ee;->pF()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;->sZ()Lcom/google/android/gms/internal/measurement/dw;
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()Lcom/google/android/gms/internal/measurement/dw;
 
     move-result-object p2
 
@@ -184,7 +184,7 @@
     return-void
 .end method
 
-.method static synthetic pI()Lcom/google/android/gms/internal/measurement/ac$a;
+.method static synthetic pG()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;->atf:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ad;->atb:[I
 
     const/4 v1, 0x1
 
@@ -359,7 +359,7 @@
     .end packed-switch
 .end method
 
-.method public final pH()Z
+.method public final pF()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 4513840c84..675cdc7587 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;->pN()Lcom/google/android/gms/internal/measurement/ac$b;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ac$b;->pL()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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ac$b$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ac$b$a;->avJ: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;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ac$b$a;->avJ: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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ac$b$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ac$b$a;->avJ: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 pK()I
+.method public final pI()I
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ac$b$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ac$b$a;->avJ: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 pO()Ljava/lang/String;
+.method public final pM()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ac$b$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ac$b$a;->avJ: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 c270c5fc0c..4daf895cc8 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;->tM()Lcom/google/android/gms/internal/measurement/fv;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fv;->tK()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;->pH()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ee;->pF()Z
 
     move-result v0
 
@@ -169,12 +169,12 @@
     throw p0
 .end method
 
-.method public static pM()Lcom/google/android/gms/internal/measurement/ac$b$a;
+.method public static pK()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;->sQ()Lcom/google/android/gms/internal/measurement/dw$b;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dw;->sO()Lcom/google/android/gms/internal/measurement/dw$b;
 
     move-result-object v0
 
@@ -183,7 +183,7 @@
     return-object v0
 .end method
 
-.method static synthetic pN()Lcom/google/android/gms/internal/measurement/ac$b;
+.method static synthetic pL()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;->atf:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ad;->atb:[I
 
     const/4 v1, 0x1
 
@@ -370,7 +370,7 @@
     .end packed-switch
 .end method
 
-.method public final pH()Z
+.method public final pF()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 pL()Lcom/google/android/gms/internal/measurement/ac$d;
+.method public final pJ()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;->pV()Lcom/google/android/gms/internal/measurement/ac$d;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ac$d;->pT()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 b932c45a5d..e86dd07224 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;->pT()Lcom/google/android/gms/internal/measurement/ac$c;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ac$c;->pR()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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ac$c$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ac$c$a;->avJ: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 b27aaf5a6d..465fa84d8d 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 pS()Lcom/google/android/gms/internal/measurement/ac$c;
+.method public static pQ()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 pT()Lcom/google/android/gms/internal/measurement/ac$c;
+.method static synthetic pR()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;->atf:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ad;->atb:[I
 
     const/4 v1, 0x1
 
@@ -276,7 +276,7 @@
     .end packed-switch
 .end method
 
-.method public final nO()Z
+.method public final nM()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 pH()Z
+.method public final pF()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 pP()Lcom/google/android/gms/internal/measurement/ac$f;
+.method public final pN()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;->qd()Lcom/google/android/gms/internal/measurement/ac$f;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ac$f;->qb()Lcom/google/android/gms/internal/measurement/ac$f;
 
     move-result-object v0
 
@@ -329,14 +329,14 @@
     return-object v0
 .end method
 
-.method public final pQ()Lcom/google/android/gms/internal/measurement/ac$d;
+.method public final pO()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;->pV()Lcom/google/android/gms/internal/measurement/ac$d;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ac$d;->pT()Lcom/google/android/gms/internal/measurement/ac$d;
 
     move-result-object v0
 
@@ -344,7 +344,7 @@
     return-object v0
 .end method
 
-.method public final pR()Z
+.method public final pP()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 6f2827a422..c46578419a 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 asL:Lcom/google/android/gms/internal/measurement/ac$d$a;
+
+.field public static final enum asM:Lcom/google/android/gms/internal/measurement/ac$d$a;
+
+.field public static final enum asN:Lcom/google/android/gms/internal/measurement/ac$d$a;
+
+.field public static final enum asO: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 asQ: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 asS: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 asU:Lcom/google/android/gms/internal/measurement/ea;
+.field private static final asQ: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 asV:[Lcom/google/android/gms/internal/measurement/ac$d$a;
+.field private static final synthetic asR:[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;->asP:Lcom/google/android/gms/internal/measurement/ac$d$a;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ac$d$a;->asL: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;->asQ:Lcom/google/android/gms/internal/measurement/ac$d$a;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ac$d$a;->asM: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;->asR:Lcom/google/android/gms/internal/measurement/ac$d$a;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ac$d$a;->asN: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;->asS:Lcom/google/android/gms/internal/measurement/ac$d$a;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ac$d$a;->asO: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;->asT: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;
 
     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;->asP:Lcom/google/android/gms/internal/measurement/ac$d$a;
+    sget-object v6, Lcom/google/android/gms/internal/measurement/ac$d$a;->asL: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;->asQ:Lcom/google/android/gms/internal/measurement/ac$d$a;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ac$d$a;->asM: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;->asR:Lcom/google/android/gms/internal/measurement/ac$d$a;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ac$d$a;->asN: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;->asS:Lcom/google/android/gms/internal/measurement/ac$d$a;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ac$d$a;->asO: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;->asT:Lcom/google/android/gms/internal/measurement/ac$d$a;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ac$d$a;->asP: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;->asV:[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/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;->asU:Lcom/google/android/gms/internal/measurement/ea;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ac$d$a;->asQ: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;->asT: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
 
     :cond_1
-    sget-object p0, Lcom/google/android/gms/internal/measurement/ac$d$a;->asS:Lcom/google/android/gms/internal/measurement/ac$d$a;
+    sget-object p0, Lcom/google/android/gms/internal/measurement/ac$d$a;->asO: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;->asR:Lcom/google/android/gms/internal/measurement/ac$d$a;
+    sget-object p0, Lcom/google/android/gms/internal/measurement/ac$d$a;->asN: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;->asQ:Lcom/google/android/gms/internal/measurement/ac$d$a;
+    sget-object p0, Lcom/google/android/gms/internal/measurement/ac$d$a;->asM: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;->asP:Lcom/google/android/gms/internal/measurement/ac$d$a;
+    sget-object p0, Lcom/google/android/gms/internal/measurement/ac$d$a;->asL:Lcom/google/android/gms/internal/measurement/ac$d$a;
 
     return-object p0
 .end method
 
-.method public static pX()Lcom/google/android/gms/internal/measurement/ed;
+.method public static pV()Lcom/google/android/gms/internal/measurement/ed;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ae;->atg:Lcom/google/android/gms/internal/measurement/ed;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ae;->atc: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;->asV:[Lcom/google/android/gms/internal/measurement/ac$d$a;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ac$d$a;->asR:[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 pJ()I
+.method public final pH()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 92b98d7d0e..b564959da1 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;->pW()Lcom/google/android/gms/internal/measurement/ac$d;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ac$d;->pU()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 988f5636ff..2dab008baf 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 pV()Lcom/google/android/gms/internal/measurement/ac$d;
+.method public static pT()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 pW()Lcom/google/android/gms/internal/measurement/ac$d;
+.method static synthetic pU()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;->atf:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ad;->atb:[I
 
     const/4 v1, 0x1
 
@@ -206,7 +206,7 @@
 
     const/4 v0, 0x2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ac$d$a;->pX()Lcom/google/android/gms/internal/measurement/ed;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ac$d$a;->pV()Lcom/google/android/gms/internal/measurement/ed;
 
     move-result-object v1
 
@@ -274,7 +274,7 @@
     .end packed-switch
 .end method
 
-.method public final nO()Z
+.method public final nM()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 pH()Z
+.method public final pF()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 pU()Lcom/google/android/gms/internal/measurement/ac$d$a;
+.method public final pS()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;->asP:Lcom/google/android/gms/internal/measurement/ac$d$a;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ac$d$a;->asL: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 96ecfbd0d7..fe29460d89 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;->qa()Lcom/google/android/gms/internal/measurement/ac$e;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ac$e;->pY()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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ac$e$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ac$e$a;->avJ: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 e787911e03..7832ab4edb 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 pZ()Lcom/google/android/gms/internal/measurement/ac$e$a;
+.method public static pX()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;->sQ()Lcom/google/android/gms/internal/measurement/dw$b;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dw;->sO()Lcom/google/android/gms/internal/measurement/dw$b;
 
     move-result-object v0
 
@@ -129,7 +129,7 @@
     return-object v0
 .end method
 
-.method static synthetic qa()Lcom/google/android/gms/internal/measurement/ac$e;
+.method static synthetic pY()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;->atf:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ad;->atb:[I
 
     const/4 v1, 0x1
 
@@ -298,7 +298,7 @@
     .end packed-switch
 .end method
 
-.method public final pH()Z
+.method public final pF()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 pY()Lcom/google/android/gms/internal/measurement/ac$c;
+.method public final pW()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;->pS()Lcom/google/android/gms/internal/measurement/ac$c;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ac$c;->pQ()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 bd4c91698b..4285515dab 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;->qe()Lcom/google/android/gms/internal/measurement/ac$f;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ac$f;->qc()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 8a974a905c..191bb82605 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 asS: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 asU:Lcom/google/android/gms/internal/measurement/ac$f$b;
+
+.field public static final enum asV: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 asX: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 asZ: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 atb: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 atd:Lcom/google/android/gms/internal/measurement/ea;
+.field private static final asZ: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 ate:[Lcom/google/android/gms/internal/measurement/ac$f$b;
+.field private static final synthetic ata:[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;->asW:Lcom/google/android/gms/internal/measurement/ac$f$b;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ac$f$b;->asS: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;->asX:Lcom/google/android/gms/internal/measurement/ac$f$b;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ac$f$b;->asT: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;->asY:Lcom/google/android/gms/internal/measurement/ac$f$b;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ac$f$b;->asU: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;->asZ:Lcom/google/android/gms/internal/measurement/ac$f$b;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ac$f$b;->asV: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;->ata: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;
 
@@ -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;->atb: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;
 
@@ -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;->atc: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;
 
     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;->asW:Lcom/google/android/gms/internal/measurement/ac$f$b;
+    sget-object v8, Lcom/google/android/gms/internal/measurement/ac$f$b;->asS: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;->asX:Lcom/google/android/gms/internal/measurement/ac$f$b;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ac$f$b;->asT: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;->asY:Lcom/google/android/gms/internal/measurement/ac$f$b;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ac$f$b;->asU: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;->asZ:Lcom/google/android/gms/internal/measurement/ac$f$b;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ac$f$b;->asV: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;->ata:Lcom/google/android/gms/internal/measurement/ac$f$b;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ac$f$b;->asW: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;->atb: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, v6
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ac$f$b;->atc: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, v7
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ac$f$b;->ate:[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/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;->atd:Lcom/google/android/gms/internal/measurement/ea;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ac$f$b;->asZ:Lcom/google/android/gms/internal/measurement/ea;
 
     return-void
 .end method
@@ -200,40 +200,40 @@
     return-object p0
 
     :pswitch_0
-    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;->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;->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;->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;->asY:Lcom/google/android/gms/internal/measurement/ac$f$b;
 
     return-object p0
 
-    :pswitch_5
+    :pswitch_1
     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
+    :pswitch_2
     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
 
+    :pswitch_3
+    sget-object p0, Lcom/google/android/gms/internal/measurement/ac$f$b;->asV: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;->asU: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;->asT: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;->asS:Lcom/google/android/gms/internal/measurement/ac$f$b;
+
+    return-object p0
+
     :pswitch_data_0
     .packed-switch 0x0
         :pswitch_6
@@ -246,10 +246,10 @@
     .end packed-switch
 .end method
 
-.method public static pX()Lcom/google/android/gms/internal/measurement/ed;
+.method public static pV()Lcom/google/android/gms/internal/measurement/ed;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ai;->atg:Lcom/google/android/gms/internal/measurement/ed;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ai;->atc: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;->ate:[Lcom/google/android/gms/internal/measurement/ac$f$b;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ac$f$b;->ata:[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 pJ()I
+.method public final pH()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 a5affee3f4..d9bafaf3f2 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;->tM()Lcom/google/android/gms/internal/measurement/fv;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fv;->tK()Lcom/google/android/gms/internal/measurement/fv;
 
     move-result-object v0
 
@@ -103,7 +103,7 @@
     return-void
 .end method
 
-.method public static qd()Lcom/google/android/gms/internal/measurement/ac$f;
+.method public static qb()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 qe()Lcom/google/android/gms/internal/measurement/ac$f;
+.method static synthetic qc()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;->atf:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ad;->atb:[I
 
     const/4 v1, 0x1
 
@@ -214,7 +214,7 @@
 
     const/4 v0, 0x2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ac$f$b;->pX()Lcom/google/android/gms/internal/measurement/ed;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ac$f$b;->pV()Lcom/google/android/gms/internal/measurement/ed;
 
     move-result-object v1
 
@@ -274,7 +274,7 @@
     .end packed-switch
 .end method
 
-.method public final pH()Z
+.method public final pF()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 qb()Lcom/google/android/gms/internal/measurement/ac$f$b;
+.method public final pZ()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;->asW:Lcom/google/android/gms/internal/measurement/ac$f$b;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ac$f$b;->asS:Lcom/google/android/gms/internal/measurement/ac$f$b;
 
     :cond_0
     return-object v0
 .end method
 
-.method public final qc()I
+.method public final qa()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 ddd6d4d2b2..65bf5d2a2d 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 atf:[I
+.field static final synthetic atb:[I
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 4
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/dw$d;->tc()[I
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/dw$d;->ta()[I
 
     move-result-object v0
 
@@ -19,12 +19,12 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ad;->atf:[I
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ad;->atb:[I
 
     const/4 v0, 0x1
 
     :try_start_0
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ad;->atf:[I
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ad;->atb:[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;->atf:[I
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ad;->atb:[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;->atf:[I
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ad;->atb:[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;->atf:[I
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ad;->atb:[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;->atf:[I
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ad;->atb:[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;->atf:[I
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ad;->atb:[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;->atf:[I
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ad;->atb:[I
 
-    sget v2, Lcom/google/android/gms/internal/measurement/dw$d;->anu:I
+    sget v2, Lcom/google/android/gms/internal/measurement/dw$d;->anq: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 a356eb1009..697075c106 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 atg:Lcom/google/android/gms/internal/measurement/ed;
+.field static final atc: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;->atg:Lcom/google/android/gms/internal/measurement/ed;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ae;->atc: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 862448da47..5020069561 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;->qf()Lcom/google/android/gms/internal/measurement/ah$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ah$a;->qd()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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ah$a$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ah$a$a;->avJ: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 nO()Z
+.method public final nM()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ah$a$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ah$a$a;->avJ: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 pO()Ljava/lang/String;
+.method public final pM()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ah$a$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ah$a$a;->avJ: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 qg()Z
+.method public final qe()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ah$a$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ah$a$a;->avJ: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 qh()I
+.method public final qf()I
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ah$a$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ah$a$a;->avJ: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;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ah$a$a;->avJ: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 eda70b8f26..a6948ba359 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 qf()Lcom/google/android/gms/internal/measurement/ah$a;
+.method static synthetic qd()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;->atf:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/aj;->atb:[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 0eb5b41464..54f2a0b478 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;->qk()Lcom/google/android/gms/internal/measurement/ah$b;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ah$b;->qi()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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ah$b$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ah$b$a;->avJ: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;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ah$b$a;->avJ: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 pJ()I
+.method public final pH()I
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ah$b$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ah$b$a;->avJ: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 ql()Ljava/util/List;
+.method public final qj()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;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ah$b$a;->avJ: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 qm()Lcom/google/android/gms/internal/measurement/ah$b$a;
+.method public final qk()Lcom/google/android/gms/internal/measurement/ah$b$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ah$b$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ah$b$a;->avJ: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 76bae0a463..9939fb9bf8 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;->tM()Lcom/google/android/gms/internal/measurement/fv;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fv;->tK()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;->tM()Lcom/google/android/gms/internal/measurement/fv;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fv;->tK()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;->tM()Lcom/google/android/gms/internal/measurement/fv;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fv;->tK()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;->tM()Lcom/google/android/gms/internal/measurement/fv;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fv;->tK()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;->pH()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ee;->pF()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;->sZ()Lcom/google/android/gms/internal/measurement/dw;
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()Lcom/google/android/gms/internal/measurement/dw;
 
     move-result-object p2
 
@@ -187,12 +187,12 @@
     return-void
 .end method
 
-.method public static qi()Lcom/google/android/gms/internal/measurement/ah$b$a;
+.method public static qg()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;->sQ()Lcom/google/android/gms/internal/measurement/dw$b;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dw;->sO()Lcom/google/android/gms/internal/measurement/dw$b;
 
     move-result-object v0
 
@@ -201,7 +201,7 @@
     return-object v0
 .end method
 
-.method public static qj()Lcom/google/android/gms/internal/measurement/ah$b;
+.method public static qh()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 qk()Lcom/google/android/gms/internal/measurement/ah$b;
+.method static synthetic qi()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;->atf:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/aj;->atb:[I
 
     const/4 v1, 0x1
 
@@ -408,7 +408,7 @@
     .end packed-switch
 .end method
 
-.method public final pH()Z
+.method public final pF()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 eaa10d98c7..774b87ab12 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;->qn()Lcom/google/android/gms/internal/measurement/ah$c;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ah$c;->ql()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 11fc75c438..169f2a36d4 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 qn()Lcom/google/android/gms/internal/measurement/ah$c;
+.method static synthetic ql()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;->atf:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/aj;->atb:[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 e72c2e4358..9ac2bf190a 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 atg:Lcom/google/android/gms/internal/measurement/ed;
+.field static final atc: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;->atg:Lcom/google/android/gms/internal/measurement/ed;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ai;->atc: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 069337816a..9be6291e14 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 atf:[I
+.field static final synthetic atb:[I
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 4
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/dw$d;->tc()[I
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/dw$d;->ta()[I
 
     move-result-object v0
 
@@ -19,12 +19,12 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/aj;->atf:[I
+    sput-object v0, Lcom/google/android/gms/internal/measurement/aj;->atb:[I
 
     const/4 v0, 0x1
 
     :try_start_0
-    sget-object v1, Lcom/google/android/gms/internal/measurement/aj;->atf:[I
+    sget-object v1, Lcom/google/android/gms/internal/measurement/aj;->atb:[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;->atf:[I
+    sget-object v1, Lcom/google/android/gms/internal/measurement/aj;->atb:[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;->atf:[I
+    sget-object v1, Lcom/google/android/gms/internal/measurement/aj;->atb:[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;->atf:[I
+    sget-object v1, Lcom/google/android/gms/internal/measurement/aj;->atb:[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;->atf:[I
+    sget-object v1, Lcom/google/android/gms/internal/measurement/aj;->atb:[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;->atf:[I
+    sget-object v1, Lcom/google/android/gms/internal/measurement/aj;->atb:[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;->atf:[I
+    sget-object v1, Lcom/google/android/gms/internal/measurement/aj;->atb:[I
 
-    sget v2, Lcom/google/android/gms/internal/measurement/dw$d;->anu:I
+    sget v2, Lcom/google/android/gms/internal/measurement/dw$d;->anq: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 565c38bd3c..ede6f1967f 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;->qr()Lcom/google/android/gms/internal/measurement/ak$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$a;->qp()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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$a$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$a$a;->avJ: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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$a$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$a$a;->avJ: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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$a$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$a$a;->avJ: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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$a$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$a$a;->avJ: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 pH()Z
+.method public final pF()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$a$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$a$a;->avJ: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 qs()Lcom/google/android/gms/internal/measurement/ak$i;
+.method public final qq()Lcom/google/android/gms/internal/measurement/ak$i;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$a$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$a$a;->avJ: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;->qp()Lcom/google/android/gms/internal/measurement/ak$i;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ak$a;->qn()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 b472a1e895..e3a6afe571 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;->sZ()Lcom/google/android/gms/internal/measurement/dw;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()Lcom/google/android/gms/internal/measurement/dw;
 
     move-result-object p1
 
@@ -157,12 +157,12 @@
     return-void
 .end method
 
-.method public static qq()Lcom/google/android/gms/internal/measurement/ak$a$a;
+.method public static qo()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;->sQ()Lcom/google/android/gms/internal/measurement/dw$b;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dw;->sO()Lcom/google/android/gms/internal/measurement/dw$b;
 
     move-result-object v0
 
@@ -171,7 +171,7 @@
     return-object v0
 .end method
 
-.method static synthetic qr()Lcom/google/android/gms/internal/measurement/ak$a;
+.method static synthetic qp()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;->atf:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/al;->atb:[I
 
     const/4 v1, 0x1
 
@@ -328,14 +328,14 @@
     .end packed-switch
 .end method
 
-.method public final qo()Lcom/google/android/gms/internal/measurement/ak$i;
+.method public final qm()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;->ri()Lcom/google/android/gms/internal/measurement/ak$i;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$i;->rg()Lcom/google/android/gms/internal/measurement/ak$i;
 
     move-result-object v0
 
@@ -343,14 +343,14 @@
     return-object v0
 .end method
 
-.method public final qp()Lcom/google/android/gms/internal/measurement/ak$i;
+.method public final qn()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;->ri()Lcom/google/android/gms/internal/measurement/ak$i;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$i;->rg()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 67069ed9d2..f2ab4b655e 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;->qu()Lcom/google/android/gms/internal/measurement/ak$b;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$b;->qs()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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$b$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$b$a;->avJ: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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$b$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$b$a;->avJ: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 b0e43bade2..4927c92c97 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 qt()Lcom/google/android/gms/internal/measurement/ak$b$a;
+.method public static qr()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;->sQ()Lcom/google/android/gms/internal/measurement/dw$b;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dw;->sO()Lcom/google/android/gms/internal/measurement/dw$b;
 
     move-result-object v0
 
@@ -122,7 +122,7 @@
     return-object v0
 .end method
 
-.method static synthetic qu()Lcom/google/android/gms/internal/measurement/ak$b;
+.method static synthetic qs()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;->atf:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/al;->atb:[I
 
     const/4 v1, 0x1
 
@@ -267,7 +267,7 @@
     .end packed-switch
 .end method
 
-.method public final nO()Z
+.method public final nM()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 pH()Z
+.method public final pF()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 773505563a..dd524319d7 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;->qx()Lcom/google/android/gms/internal/measurement/ak$c;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$c;->qv()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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$c$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$c$a;->avJ: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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$c$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$c$a;->avJ: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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$c$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$c$a;->avJ: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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$c$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$c$a;->avJ: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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$c$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$c$a;->avJ: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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$c$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$c$a;->avJ: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;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$c$a;->avJ: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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$c$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$c$a;->avJ:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$c;
 
@@ -166,59 +166,35 @@
     return-object p0
 .end method
 
-.method public final pK()I
+.method public final pI()I
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$c$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$c$a;->avJ: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;->pK()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ak$c;->pI()I
 
     move-result v0
 
     return v0
 .end method
 
-.method public final qA()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;->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
+.method public final qe()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$c$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$c$a;->avJ: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
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ak$c;->qe()Z
 
     move-result v0
 
     return v0
 .end method
 
-.method public final qy()Ljava/util/List;
+.method public final qw()Ljava/util/List;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -229,7 +205,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$c$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$c$a;->avJ:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$c;
 
@@ -242,10 +218,10 @@
     return-object v0
 .end method
 
-.method public final qz()Ljava/lang/String;
+.method public final qx()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$c$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$c$a;->avJ:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$c;
 
@@ -254,12 +230,36 @@
     return-object v0
 .end method
 
+.method public final qy()J
+    .locals 2
+
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$c$a;->avJ: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 qz()J
+    .locals 2
+
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$c$a;->avJ: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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$c$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$c$a;->avJ: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 4c814c8d9f..8cc99c9c48 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;->tM()Lcom/google/android/gms/internal/measurement/fv;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fv;->tK()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;->qv()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ak$c;->qt()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;->qv()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ak$c;->qt()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;->sZ()Lcom/google/android/gms/internal/measurement/dw;
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()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;->qv()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ak$c;->qt()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;->qv()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ak$c;->qt()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;->sZ()Lcom/google/android/gms/internal/measurement/dw;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()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;->qv()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ak$c;->qt()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 qv()V
+.method private final qt()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;->pH()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ee;->pF()Z
 
     move-result v0
 
@@ -272,12 +272,12 @@
     return-void
 .end method
 
-.method public static qw()Lcom/google/android/gms/internal/measurement/ak$c$a;
+.method public static qu()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;->sQ()Lcom/google/android/gms/internal/measurement/dw$b;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dw;->sO()Lcom/google/android/gms/internal/measurement/dw$b;
 
     move-result-object v0
 
@@ -286,7 +286,7 @@
     return-object v0
 .end method
 
-.method static synthetic qx()Lcom/google/android/gms/internal/measurement/ak$c;
+.method static synthetic qv()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;->atf:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/al;->atb:[I
 
     const/4 v1, 0x1
 
@@ -455,7 +455,7 @@
     .end packed-switch
 .end method
 
-.method public final pK()I
+.method public final pI()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 qg()Z
+.method public final qe()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 b7b2f71c17..baef14e1f9 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;->qD()Lcom/google/android/gms/internal/measurement/ak$d;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$d;->qB()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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$d$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$d$a;->avJ: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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$d$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$d$a;->avJ: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 7be33240f2..8b4f699eef 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,12 +121,12 @@
     throw p0
 .end method
 
-.method public static qC()Lcom/google/android/gms/internal/measurement/ak$d$a;
+.method public static qA()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;->sQ()Lcom/google/android/gms/internal/measurement/dw$b;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dw;->sO()Lcom/google/android/gms/internal/measurement/dw$b;
 
     move-result-object v0
 
@@ -135,7 +135,7 @@
     return-object v0
 .end method
 
-.method static synthetic qD()Lcom/google/android/gms/internal/measurement/ak$d;
+.method static synthetic qB()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;
@@ -148,7 +148,7 @@
 .method protected final bi(I)Ljava/lang/Object;
     .locals 3
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/al;->atf:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/al;->atb:[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 eafb8bbb87..f0e5f7b3c1 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;->qG()Lcom/google/android/gms/internal/measurement/ak$e;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$e;->qE()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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$e$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$e$a;->avJ: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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$e$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$e$a;->avJ: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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$e$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$e$a;->avJ: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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$e$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$e$a;->avJ: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 qH()Lcom/google/android/gms/internal/measurement/ak$e$a;
+.method public final qF()Lcom/google/android/gms/internal/measurement/ak$e$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$e$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$e$a;->avJ: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 qI()Lcom/google/android/gms/internal/measurement/ak$e$a;
+.method public final qG()Lcom/google/android/gms/internal/measurement/ak$e$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$e$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$e$a;->avJ: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 qJ()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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$e$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$e$a;->avJ: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 3bc49a54cf..fb5227aade 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 qF()Lcom/google/android/gms/internal/measurement/ak$e$a;
+.method public static qD()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;->sQ()Lcom/google/android/gms/internal/measurement/dw$b;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dw;->sO()Lcom/google/android/gms/internal/measurement/dw$b;
 
     move-result-object v0
 
@@ -230,7 +230,7 @@
     return-object v0
 .end method
 
-.method static synthetic qG()Lcom/google/android/gms/internal/measurement/ak$e;
+.method static synthetic qE()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;->atf:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/al;->atb:[I
 
     const/4 v1, 0x1
 
@@ -391,7 +391,7 @@
     .end packed-switch
 .end method
 
-.method public final qE()Z
+.method public final qC()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 qg()Z
+.method public final qe()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 cbb9564cf8..9ea91ae5ee 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;->qL()Lcom/google/android/gms/internal/measurement/ak$f;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$f;->qJ()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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$f$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$f$a;->avJ: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 qM()Lcom/google/android/gms/internal/measurement/ak$g;
+.method public final qK()Lcom/google/android/gms/internal/measurement/ak$g;
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$f$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$f$a;->avJ: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 e907e153dc..b75299a493 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;->tM()Lcom/google/android/gms/internal/measurement/fv;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fv;->tK()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;->pH()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ee;->pF()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;->sZ()Lcom/google/android/gms/internal/measurement/dw;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()Lcom/google/android/gms/internal/measurement/dw;
 
     move-result-object p1
 
@@ -125,12 +125,12 @@
     return-void
 .end method
 
-.method public static qK()Lcom/google/android/gms/internal/measurement/ak$f$a;
+.method public static qI()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;->sQ()Lcom/google/android/gms/internal/measurement/dw$b;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dw;->sO()Lcom/google/android/gms/internal/measurement/dw$b;
 
     move-result-object v0
 
@@ -139,7 +139,7 @@
     return-object v0
 .end method
 
-.method static synthetic qL()Lcom/google/android/gms/internal/measurement/ak$f;
+.method static synthetic qJ()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;->atf:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/al;->atb:[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 40671054d6..76bc159bef 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;->qR()Lcom/google/android/gms/internal/measurement/ak$g;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$g;->qP()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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avJ: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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avJ: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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avJ: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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avJ: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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avJ: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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avJ: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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avJ: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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avJ: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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avJ: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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avJ: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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avJ: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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avJ: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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avJ: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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avJ: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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avJ: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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avJ: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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avJ: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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avJ: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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avJ: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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avJ: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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avJ: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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avJ: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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avJ: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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avJ: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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avJ: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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avJ: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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avJ: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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avJ: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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avJ: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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avJ: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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avJ: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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avJ: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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avJ: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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avJ: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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avJ: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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avJ: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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avJ: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;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avJ: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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avJ: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;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avJ: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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avJ: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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avJ: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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avJ: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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avJ: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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avJ: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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avJ: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 mQ()Ljava/lang/String;
+.method public final mO()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avJ: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 pK()I
+.method public final pI()I
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avJ:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$g;
 
@@ -772,24 +772,12 @@
     return v0
 .end method
 
-.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;
+.method public final qQ()Lcom/google/android/gms/internal/measurement/ak$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avJ:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$g;
 
@@ -798,12 +786,12 @@
     return-object p0
 .end method
 
-.method public final qT()Lcom/google/android/gms/internal/measurement/ak$g$a;
+.method public final qR()Lcom/google/android/gms/internal/measurement/ak$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avJ:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$g;
 
@@ -812,7 +800,7 @@
     return-object p0
 .end method
 
-.method public final qU()Ljava/util/List;
+.method public final qS()Ljava/util/List;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -823,7 +811,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avJ:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$g;
 
@@ -836,10 +824,10 @@
     return-object v0
 .end method
 
-.method public final qV()J
+.method public final qT()J
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avJ:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$g;
 
@@ -848,12 +836,12 @@
     return-wide v0
 .end method
 
-.method public final qW()Lcom/google/android/gms/internal/measurement/ak$g$a;
+.method public final qU()Lcom/google/android/gms/internal/measurement/ak$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avJ:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$g;
 
@@ -862,12 +850,12 @@
     return-object p0
 .end method
 
-.method public final qX()Lcom/google/android/gms/internal/measurement/ak$g$a;
+.method public final qV()Lcom/google/android/gms/internal/measurement/ak$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avJ:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$g;
 
@@ -876,12 +864,12 @@
     return-object p0
 .end method
 
-.method public final qY()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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avJ:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$g;
 
@@ -890,10 +878,10 @@
     return-object p0
 .end method
 
-.method public final qZ()Ljava/lang/String;
+.method public final qX()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avJ:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$g;
 
@@ -902,10 +890,38 @@
     return-object v0
 .end method
 
-.method public final qh()I
+.method public final qY()Lcom/google/android/gms/internal/measurement/ak$g$a;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
+
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avJ: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 qZ()Lcom/google/android/gms/internal/measurement/ak$g$a;
+    .locals 1
+
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
+
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avJ: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 qf()I
+    .locals 1
+
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avJ:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$g;
 
@@ -918,7 +934,7 @@
     return v0
 .end method
 
-.method public final qy()Ljava/util/List;
+.method public final qw()Ljava/util/List;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -929,7 +945,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avJ:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$g;
 
@@ -942,40 +958,24 @@
     return-object v0
 .end method
 
+.method public final qz()J
+    .locals 2
+
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avJ: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 ra()Lcom/google/android/gms/internal/measurement/ak$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()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;->f(Lcom/google/android/gms/internal/measurement/ak$g;)V
-
-    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;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avJ:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$g;
 
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 f91694a7c4..a7ba01afdf 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;->tM()Lcom/google/android/gms/internal/measurement/fv;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fv;->tK()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;->tM()Lcom/google/android/gms/internal/measurement/fv;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fv;->tK()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;->tM()Lcom/google/android/gms/internal/measurement/fv;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fv;->tK()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;->tf()Lcom/google/android/gms/internal/measurement/dz;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/dz;->td()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;->qN()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ak$g;->qL()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;->qN()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ak$g;->qL()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;->sZ()Lcom/google/android/gms/internal/measurement/dw;
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()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;->qO()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ak$g;->qM()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;->qN()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ak$g;->qL()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;->sZ()Lcom/google/android/gms/internal/measurement/dw;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()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;->sZ()Lcom/google/android/gms/internal/measurement/dw;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()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;->qO()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ak$g;->qM()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;->sZ()Lcom/google/android/gms/internal/measurement/dw;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()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;->qO()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ak$g;->qM()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;->qN()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ak$g;->qL()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;->tM()Lcom/google/android/gms/internal/measurement/fv;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fv;->tK()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;->qO()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ak$g;->qM()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;->qO()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ak$g;->qM()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;->pH()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ee;->pF()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;->pH()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ec;->pF()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;->tM()Lcom/google/android/gms/internal/measurement/fv;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fv;->tK()Lcom/google/android/gms/internal/measurement/fv;
 
     move-result-object v0
 
@@ -1212,12 +1212,12 @@
     throw p0
 .end method
 
-.method private final qN()V
+.method private final qL()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;->pH()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ee;->pF()Z
 
     move-result v0
 
@@ -1235,12 +1235,12 @@
     return-void
 .end method
 
-.method private final qO()V
+.method private final qM()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;->pH()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ee;->pF()Z
 
     move-result v0
 
@@ -1258,12 +1258,12 @@
     return-void
 .end method
 
-.method public static qQ()Lcom/google/android/gms/internal/measurement/ak$g$a;
+.method public static qO()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;->sQ()Lcom/google/android/gms/internal/measurement/dw$b;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dw;->sO()Lcom/google/android/gms/internal/measurement/dw$b;
 
     move-result-object v0
 
@@ -1272,7 +1272,7 @@
     return-object v0
 .end method
 
-.method static synthetic qR()Lcom/google/android/gms/internal/measurement/ak$g;
+.method static synthetic qP()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;->atf:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/al;->atb:[I
 
     const/4 v1, 0x1
 
@@ -1687,7 +1687,7 @@
     .end packed-switch
 .end method
 
-.method public final mS()Z
+.method public final mQ()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 qP()Z
+.method public final qN()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 9a40c38561..99b3a0f739 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 ath:Lcom/google/android/gms/internal/measurement/ak$h$a;
+.field private static final enum atd: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 enum ate:Lcom/google/android/gms/internal/measurement/ak$h$a;
 
-.field private static final atj:Lcom/google/android/gms/internal/measurement/ea;
+.field private static final atf: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 atk:[Lcom/google/android/gms/internal/measurement/ak$h$a;
+.field private static final synthetic atg:[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;->ath:Lcom/google/android/gms/internal/measurement/ak$h$a;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ak$h$a;->atd: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;->ati:Lcom/google/android/gms/internal/measurement/ak$h$a;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ak$h$a;->ate: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;->ath:Lcom/google/android/gms/internal/measurement/ak$h$a;
+    sget-object v3, Lcom/google/android/gms/internal/measurement/ak$h$a;->atd: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;->ati:Lcom/google/android/gms/internal/measurement/ak$h$a;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ak$h$a;->ate: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;->atk:[Lcom/google/android/gms/internal/measurement/ak$h$a;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ak$h$a;->atg:[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;->atj:Lcom/google/android/gms/internal/measurement/ea;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ak$h$a;->atf: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;->ati:Lcom/google/android/gms/internal/measurement/ak$h$a;
+    sget-object p0, Lcom/google/android/gms/internal/measurement/ak$h$a;->ate: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;->ath:Lcom/google/android/gms/internal/measurement/ak$h$a;
+    sget-object p0, Lcom/google/android/gms/internal/measurement/ak$h$a;->atd:Lcom/google/android/gms/internal/measurement/ak$h$a;
 
     return-object p0
 .end method
 
-.method public static pX()Lcom/google/android/gms/internal/measurement/ed;
+.method public static pV()Lcom/google/android/gms/internal/measurement/ed;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/am;->atg:Lcom/google/android/gms/internal/measurement/ed;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/am;->atc: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;->atk:[Lcom/google/android/gms/internal/measurement/ak$h$a;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ak$h$a;->atg:[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 pJ()I
+.method public final pH()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 89ed8a3539..bad3286a45 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;->re()Lcom/google/android/gms/internal/measurement/ak$h;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$h;->rc()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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$h$b;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$h$b;->avJ: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 139caed46e..0db5eb0d6e 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;->tM()Lcom/google/android/gms/internal/measurement/fv;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fv;->tK()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;->pH()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ee;->pF()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;->sZ()Lcom/google/android/gms/internal/measurement/dw;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()Lcom/google/android/gms/internal/measurement/dw;
 
     move-result-object p1
 
@@ -134,12 +134,12 @@
     return-void
 .end method
 
-.method public static rd()Lcom/google/android/gms/internal/measurement/ak$h$b;
+.method public static rb()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;->sQ()Lcom/google/android/gms/internal/measurement/dw$b;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dw;->sO()Lcom/google/android/gms/internal/measurement/dw$b;
 
     move-result-object v0
 
@@ -148,7 +148,7 @@
     return-object v0
 .end method
 
-.method static synthetic re()Lcom/google/android/gms/internal/measurement/ak$h;
+.method static synthetic rc()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;->atf:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/al;->atb:[I
 
     const/4 v1, 0x1
 
@@ -251,7 +251,7 @@
 
     const/4 v0, 0x2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$h$a;->pX()Lcom/google/android/gms/internal/measurement/ed;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$h$a;->pV()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 3982779a21..4270ce2c9c 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;->rj()Lcom/google/android/gms/internal/measurement/ak$i;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$i;->rh()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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$i$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$i$a;->avJ: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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$i$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$i$a;->avJ: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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$i$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$i$a;->avJ: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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$i$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$i$a;->avJ: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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$i$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$i$a;->avJ: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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$i$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$i$a;->avJ: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 rk()Lcom/google/android/gms/internal/measurement/ak$i$a;
+.method public final ri()Lcom/google/android/gms/internal/measurement/ak$i$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$i$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$i$a;->avJ: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 rl()Lcom/google/android/gms/internal/measurement/ak$i$a;
+.method public final rj()Lcom/google/android/gms/internal/measurement/ak$i$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$i$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$i$a;->avJ: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 dd58c0d2fb..164861ee35 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;->tv()Lcom/google/android/gms/internal/measurement/eu;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eu;->tt()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;->tv()Lcom/google/android/gms/internal/measurement/eu;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eu;->tt()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;->tM()Lcom/google/android/gms/internal/measurement/fv;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fv;->tK()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;->tM()Lcom/google/android/gms/internal/measurement/fv;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fv;->tK()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;->rg()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ak$i;->re()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;->pH()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ef;->pF()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;->tv()Lcom/google/android/gms/internal/measurement/eu;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eu;->tt()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;->mY()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ak$i;->mW()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;->pH()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ef;->pF()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;->tv()Lcom/google/android/gms/internal/measurement/eu;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eu;->tt()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;->rg()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ak$i;->re()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;->mY()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ak$i;->mW()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 mY()V
+.method private final mW()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;->pH()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ee;->pF()Z
 
     move-result v0
 
@@ -271,12 +271,12 @@
     return-void
 .end method
 
-.method private final rg()V
+.method private final re()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;->pH()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ee;->pF()Z
 
     move-result v0
 
@@ -294,12 +294,12 @@
     return-void
 .end method
 
-.method public static rh()Lcom/google/android/gms/internal/measurement/ak$i$a;
+.method public static rf()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;->sQ()Lcom/google/android/gms/internal/measurement/dw$b;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dw;->sO()Lcom/google/android/gms/internal/measurement/dw$b;
 
     move-result-object v0
 
@@ -308,7 +308,7 @@
     return-object v0
 .end method
 
-.method public static ri()Lcom/google/android/gms/internal/measurement/ak$i;
+.method public static rg()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 rj()Lcom/google/android/gms/internal/measurement/ak$i;
+.method static synthetic rh()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;->atf:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/al;->atb:[I
 
     const/4 v1, 0x1
 
@@ -477,7 +477,7 @@
     .end packed-switch
 .end method
 
-.method public final pK()I
+.method public final pI()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 qc()I
+.method public final qa()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 rf()I
+.method public final rd()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 1c21ebf4b4..10d573d09f 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;->rp()Lcom/google/android/gms/internal/measurement/ak$j;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$j;->rn()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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$j$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$j$a;->avJ: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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$j$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$j$a;->avJ: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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$j$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$j$a;->avJ: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 rq()Lcom/google/android/gms/internal/measurement/ak$j$a;
+.method public final ro()Lcom/google/android/gms/internal/measurement/ak$j$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$j$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$j$a;->avJ: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 546a6b2a21..0649d36823 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;->tv()Lcom/google/android/gms/internal/measurement/eu;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eu;->tt()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;->tv()Lcom/google/android/gms/internal/measurement/eu;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eu;->tt()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;->rn()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ak$j;->rl()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;->rn()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ak$j;->rl()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 rn()V
+.method private final rl()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;->pH()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ef;->pF()Z
 
     move-result v0
 
@@ -159,12 +159,12 @@
     return-void
 .end method
 
-.method public static ro()Lcom/google/android/gms/internal/measurement/ak$j$a;
+.method public static rm()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;->sQ()Lcom/google/android/gms/internal/measurement/dw$b;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dw;->sO()Lcom/google/android/gms/internal/measurement/dw$b;
 
     move-result-object v0
 
@@ -173,7 +173,7 @@
     return-object v0
 .end method
 
-.method static synthetic rp()Lcom/google/android/gms/internal/measurement/ak$j;
+.method static synthetic rn()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;->atf:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/al;->atb:[I
 
     const/4 v1, 0x1
 
@@ -330,7 +330,7 @@
     .end packed-switch
 .end method
 
-.method public final pH()Z
+.method public final pF()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 rm()I
+.method public final rk()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 91a03afdb6..988b091fa0 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;->rt()Lcom/google/android/gms/internal/measurement/ak$k;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$k;->rr()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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$k$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$k$a;->avJ: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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$k$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$k$a;->avJ: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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$k$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$k$a;->avJ: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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$k$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$k$a;->avJ: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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$k$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$k$a;->avJ: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 ru()Lcom/google/android/gms/internal/measurement/ak$k$a;
+.method public final rs()Lcom/google/android/gms/internal/measurement/ak$k$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$k$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$k$a;->avJ: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 rv()Lcom/google/android/gms/internal/measurement/ak$k$a;
+.method public final rt()Lcom/google/android/gms/internal/measurement/ak$k$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$k$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$k$a;->avJ: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 rw()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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$k$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$k$a;->avJ: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 79a7651a67..2c12058904 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 rs()Lcom/google/android/gms/internal/measurement/ak$k$a;
+.method public static rq()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;->sQ()Lcom/google/android/gms/internal/measurement/dw$b;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dw;->sO()Lcom/google/android/gms/internal/measurement/dw$b;
 
     move-result-object v0
 
@@ -246,7 +246,7 @@
     return-object v0
 .end method
 
-.method static synthetic rt()Lcom/google/android/gms/internal/measurement/ak$k;
+.method static synthetic rr()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;->atf:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/al;->atb:[I
 
     const/4 v1, 0x1
 
@@ -415,7 +415,7 @@
     .end packed-switch
 .end method
 
-.method public final pH()Z
+.method public final pF()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 qE()Z
+.method public final qC()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 rr()Z
+.method public final rp()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 cb03540d10..c064dea316 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 atf:[I
+.field static final synthetic atb:[I
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 4
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/dw$d;->tc()[I
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/dw$d;->ta()[I
 
     move-result-object v0
 
@@ -19,12 +19,12 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/al;->atf:[I
+    sput-object v0, Lcom/google/android/gms/internal/measurement/al;->atb:[I
 
     const/4 v0, 0x1
 
     :try_start_0
-    sget-object v1, Lcom/google/android/gms/internal/measurement/al;->atf:[I
+    sget-object v1, Lcom/google/android/gms/internal/measurement/al;->atb:[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;->atf:[I
+    sget-object v1, Lcom/google/android/gms/internal/measurement/al;->atb:[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;->atf:[I
+    sget-object v1, Lcom/google/android/gms/internal/measurement/al;->atb:[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;->atf:[I
+    sget-object v1, Lcom/google/android/gms/internal/measurement/al;->atb:[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;->atf:[I
+    sget-object v1, Lcom/google/android/gms/internal/measurement/al;->atb:[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;->atf:[I
+    sget-object v1, Lcom/google/android/gms/internal/measurement/al;->atb:[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;->atf:[I
+    sget-object v1, Lcom/google/android/gms/internal/measurement/al;->atb:[I
 
-    sget v2, Lcom/google/android/gms/internal/measurement/dw$d;->anu:I
+    sget v2, Lcom/google/android/gms/internal/measurement/dw$d;->anq: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 bd0fb076d2..0a25d889a7 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 atg:Lcom/google/android/gms/internal/measurement/ed;
+.field static final atc: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;->atg:Lcom/google/android/gms/internal/measurement/ed;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/am;->atc: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 a8e7322589..b1c19d21ab 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;->rx()Ljava/util/concurrent/atomic/AtomicBoolean;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ap;->rv()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 353984df74..3400fffd30 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 atl:Landroid/net/Uri;
+.field public static final ath:Landroid/net/Uri;
 
-.field private static final atm:Landroid/net/Uri;
+.field private static final ati:Landroid/net/Uri;
 
-.field public static final atn:Ljava/util/regex/Pattern;
+.field public static final atj:Ljava/util/regex/Pattern;
 
-.field public static final ato:Ljava/util/regex/Pattern;
+.field public static final atk:Ljava/util/regex/Pattern;
 
-.field private static final atp:Ljava/util/concurrent/atomic/AtomicBoolean;
+.field private static final atl:Ljava/util/concurrent/atomic/AtomicBoolean;
 
-.field private static atq:Ljava/util/HashMap;
+.field private static atm:Ljava/util/HashMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/HashMap<",
@@ -25,7 +25,7 @@
     .end annotation
 .end field
 
-.field private static final atr:Ljava/util/HashMap;
+.field private static final atn:Ljava/util/HashMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/HashMap<",
@@ -36,7 +36,7 @@
     .end annotation
 .end field
 
-.field private static final ats:Ljava/util/HashMap;
+.field private static final ato:Ljava/util/HashMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/HashMap<",
@@ -47,7 +47,7 @@
     .end annotation
 .end field
 
-.field private static final att:Ljava/util/HashMap;
+.field private static final atp:Ljava/util/HashMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/HashMap<",
@@ -58,7 +58,7 @@
     .end annotation
 .end field
 
-.field private static final atu:Ljava/util/HashMap;
+.field private static final atq:Ljava/util/HashMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/HashMap<",
@@ -69,11 +69,11 @@
     .end annotation
 .end field
 
-.field private static atv:Ljava/lang/Object;
+.field private static atr:Ljava/lang/Object;
 
-.field private static atw:Z
+.field private static ats:Z
 
-.field private static atx:[Ljava/lang/String;
+.field private static att:[Ljava/lang/String;
 
 
 # direct methods
@@ -86,7 +86,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ap;->atl:Landroid/net/Uri;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ap;->ath: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;->atm:Landroid/net/Uri;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ap;->ati: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;->atn:Ljava/util/regex/Pattern;
+    sput-object v1, Lcom/google/android/gms/internal/measurement/ap;->atj: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;->ato:Ljava/util/regex/Pattern;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ap;->atk: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;->atp:Ljava/util/concurrent/atomic/AtomicBoolean;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ap;->atl: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;->atr:Ljava/util/HashMap;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ap;->atn: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;->ats:Ljava/util/HashMap;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ap;->ato: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;->att:Ljava/util/HashMap;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ap;->atp: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;->atu:Ljava/util/HashMap;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ap;->atq:Ljava/util/HashMap;
 
     const/4 v0, 0x0
 
     new-array v0, v0, [Ljava/lang/String;
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ap;->atx:[Ljava/lang/String;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ap;->att:[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;->atq:Ljava/util/HashMap;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ap;->atm: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;->atp:Ljava/util/concurrent/atomic/AtomicBoolean;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ap;->atl: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;->atq:Ljava/util/HashMap;
+    sput-object v1, Lcom/google/android/gms/internal/measurement/ap;->atm: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;->atv:Ljava/lang/Object;
+    sput-object v1, Lcom/google/android/gms/internal/measurement/ap;->atr:Ljava/lang/Object;
 
-    sput-boolean v3, Lcom/google/android/gms/internal/measurement/ap;->atw:Z
+    sput-boolean v3, Lcom/google/android/gms/internal/measurement/ap;->ats:Z
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ap;->atl:Landroid/net/Uri;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ap;->ath: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;->atp:Ljava/util/concurrent/atomic/AtomicBoolean;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ap;->atl:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     invoke-virtual {v1, v3}, Ljava/util/concurrent/atomic/AtomicBoolean;->getAndSet(Z)Z
 
@@ -214,39 +214,39 @@
 
     if-eqz v1, :cond_1
 
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ap;->atm:Ljava/util/HashMap;
+
+    invoke-virtual {v1}, Ljava/util/HashMap;->clear()V
+
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ap;->atn:Ljava/util/HashMap;
+
+    invoke-virtual {v1}, Ljava/util/HashMap;->clear()V
+
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ap;->ato:Ljava/util/HashMap;
+
+    invoke-virtual {v1}, Ljava/util/HashMap;->clear()V
+
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ap;->atp:Ljava/util/HashMap;
+
+    invoke-virtual {v1}, Ljava/util/HashMap;->clear()V
+
     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;->atr:Ljava/util/HashMap;
-
-    invoke-virtual {v1}, Ljava/util/HashMap;->clear()V
-
-    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;->att:Ljava/util/HashMap;
-
-    invoke-virtual {v1}, Ljava/util/HashMap;->clear()V
-
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ap;->atu:Ljava/util/HashMap;
-
-    invoke-virtual {v1}, Ljava/util/HashMap;->clear()V
-
     new-instance v1, Ljava/lang/Object;
 
     invoke-direct {v1}, Ljava/lang/Object;-><init>()V
 
-    sput-object v1, Lcom/google/android/gms/internal/measurement/ap;->atv:Ljava/lang/Object;
+    sput-object v1, Lcom/google/android/gms/internal/measurement/ap;->atr:Ljava/lang/Object;
 
-    sput-boolean v3, Lcom/google/android/gms/internal/measurement/ap;->atw:Z
+    sput-boolean v3, Lcom/google/android/gms/internal/measurement/ap;->ats:Z
 
     :cond_1
     :goto_0
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ap;->atv:Ljava/lang/Object;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ap;->atr:Ljava/lang/Object;
 
-    sget-object v4, Lcom/google/android/gms/internal/measurement/ap;->atq:Ljava/util/HashMap;
+    sget-object v4, Lcom/google/android/gms/internal/measurement/ap;->atm: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;->atq:Ljava/util/HashMap;
+    sget-object p0, Lcom/google/android/gms/internal/measurement/ap;->atm: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;->atx:[Ljava/lang/String;
+    sget-object v4, Lcom/google/android/gms/internal/measurement/ap;->att:[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;->atw:Z
+    sget-boolean v1, Lcom/google/android/gms/internal/measurement/ap;->ats:Z
 
     if-eqz v1, :cond_4
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ap;->atq:Ljava/util/HashMap;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ap;->atm: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;->atx:[Ljava/lang/String;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ap;->att:[Ljava/lang/String;
 
-    sget-object v3, Lcom/google/android/gms/internal/measurement/ap;->atq:Ljava/util/HashMap;
+    sget-object v3, Lcom/google/android/gms/internal/measurement/ap;->atm: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;->atw:Z
+    sput-boolean v2, Lcom/google/android/gms/internal/measurement/ap;->ats:Z
 
-    sget-object p0, Lcom/google/android/gms/internal/measurement/ap;->atq:Ljava/util/HashMap;
+    sget-object p0, Lcom/google/android/gms/internal/measurement/ap;->atm: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;->atq:Ljava/util/HashMap;
+    sget-object p0, Lcom/google/android/gms/internal/measurement/ap;->atm: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;->atl:Landroid/net/Uri;
+    sget-object v7, Lcom/google/android/gms/internal/measurement/ap;->ath:Landroid/net/Uri;
 
     const/4 v8, 0x0
 
@@ -487,7 +487,7 @@
         }
     .end annotation
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ap;->atm:Landroid/net/Uri;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ap;->ati: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;->atv:Ljava/lang/Object;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ap;->atr:Ljava/lang/Object;
 
     if-ne p0, v1, :cond_0
 
-    sget-object p0, Lcom/google/android/gms/internal/measurement/ap;->atq:Ljava/util/HashMap;
+    sget-object p0, Lcom/google/android/gms/internal/measurement/ap;->atm: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 rx()Ljava/util/concurrent/atomic/AtomicBoolean;
+.method static synthetic rv()Ljava/util/concurrent/atomic/AtomicBoolean;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ap;->atp:Ljava/util/concurrent/atomic/AtomicBoolean;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ap;->atl: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 42a125b02e..09143501d5 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,9 +7,9 @@
 
 
 # static fields
-.field private static final atE:[Ljava/lang/String;
+.field private static final atA:[Ljava/lang/String;
 
-.field private static final aty:Ljava/util/Map;
+.field private static final atu:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -22,13 +22,15 @@
 
 
 # instance fields
-.field final asA:Ljava/lang/Object;
+.field final asw:Ljava/lang/Object;
 
-.field private final atA:Landroid/net/Uri;
+.field private final atv:Landroid/content/ContentResolver;
 
-.field private final atB:Landroid/database/ContentObserver;
+.field private final atw:Landroid/net/Uri;
 
-.field volatile atC:Ljava/util/Map;
+.field private final atx:Landroid/database/ContentObserver;
+
+.field volatile aty:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -39,7 +41,7 @@
     .end annotation
 .end field
 
-.field final atD:Ljava/util/List;
+.field final atz:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -49,8 +51,6 @@
     .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;->aty:Ljava/util/Map;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/aq;->atu: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;->atE:[Ljava/lang/String;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/aq;->atA:[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;->atB:Landroid/database/ContentObserver;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/aq;->atx: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;->asA:Ljava/lang/Object;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/aq;->asw: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;->atD:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/aq;->atz:Ljava/util/List;
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/aq;->atz:Landroid/content/ContentResolver;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/aq;->atv:Landroid/content/ContentResolver;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/aq;->atA:Landroid/net/Uri;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/aq;->atw:Landroid/net/Uri;
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/aq;->atB:Landroid/database/ContentObserver;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/aq;->atx: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;->aty:Ljava/util/Map;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/aq;->atu: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;->aty:Ljava/util/Map;
+    sget-object p0, Lcom/google/android/gms/internal/measurement/aq;->atu: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,71 +175,7 @@
     throw p0
 .end method
 
-.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;
+.method private final rx()Ljava/util/Map;
     .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -302,12 +238,76 @@
     throw v1
 .end method
 
+.method static declared-synchronized ry()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;->atu: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;->atv:Landroid/content/ContentResolver;
+
+    iget-object v2, v2, Lcom/google/android/gms/internal/measurement/aq;->atx: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;->atu: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;->ry()Ljava/util/Map;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/aq;->rw()Ljava/util/Map;
 
     move-result-object v0
 
@@ -320,14 +320,73 @@
     return-object p1
 .end method
 
-.method final synthetic rB()Ljava/util/Map;
+.method public final rw()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;->aty:Ljava/util/Map;
+
+    if-nez v0, :cond_1
+
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/aq;->asw:Ljava/lang/Object;
+
+    monitor-enter v1
+
+    :try_start_0
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/aq;->aty:Ljava/util/Map;
+
+    if-nez v0, :cond_0
+
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/aq;->rx()Ljava/util/Map;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/aq;->aty: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 rz()Ljava/util/Map;
     .locals 6
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/aq;->atz:Landroid/content/ContentResolver;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/aq;->atv:Landroid/content/ContentResolver;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/aq;->atA:Landroid/net/Uri;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/aq;->atw:Landroid/net/Uri;
 
-    sget-object v2, Lcom/google/android/gms/internal/measurement/aq;->atE:[Ljava/lang/String;
+    sget-object v2, Lcom/google/android/gms/internal/measurement/aq;->atA:[Ljava/lang/String;
 
     const/4 v3, 0x0
 
@@ -427,62 +486,3 @@
     :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 03345111c4..67f58bee0e 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 asH:Z
+.field private static asD:Z
 
-.field private static atF:Landroid/os/UserManager;
+.field private static atB:Landroid/os/UserManager;
 
-.field private static volatile atG:Z
+.field private static volatile atC:Z
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ar;->pH()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ar;->pF()Z
 
     move-result v0
 
     xor-int/lit8 v0, v0, 0x1
 
-    sput-boolean v0, Lcom/google/android/gms/internal/measurement/ar;->atG:Z
+    sput-boolean v0, Lcom/google/android/gms/internal/measurement/ar;->atC:Z
 
     const/4 v0, 0x0
 
-    sput-boolean v0, Lcom/google/android/gms/internal/measurement/ar;->asH:Z
+    sput-boolean v0, Lcom/google/android/gms/internal/measurement/ar;->asD: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;->pH()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ar;->pF()Z
 
     move-result v0
 
@@ -83,7 +83,7 @@
 
     if-gt v1, v2, :cond_3
 
-    sget-object v2, Lcom/google/android/gms/internal/measurement/ar;->atF:Landroid/os/UserManager;
+    sget-object v2, Lcom/google/android/gms/internal/measurement/ar;->atB: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;->atF:Landroid/os/UserManager;
+    sput-object v2, Lcom/google/android/gms/internal/measurement/ar;->atB:Landroid/os/UserManager;
 
     :cond_0
-    sget-object v2, Lcom/google/android/gms/internal/measurement/ar;->atF:Landroid/os/UserManager;
+    sget-object v2, Lcom/google/android/gms/internal/measurement/ar;->atB: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;->atF:Landroid/os/UserManager;
+    sput-object v3, Lcom/google/android/gms/internal/measurement/ar;->atB: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;->atF:Landroid/os/UserManager;
+    sput-object v3, Lcom/google/android/gms/internal/measurement/ar;->atB: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;->atG:Z
+    sget-boolean v0, Lcom/google/android/gms/internal/measurement/ar;->atC: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;->atG:Z
+    sget-boolean v2, Lcom/google/android/gms/internal/measurement/ar;->atC: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;->atG:Z
+    sput-boolean p0, Lcom/google/android/gms/internal/measurement/ar;->atC:Z
 
     :cond_2
     monitor-exit v0
@@ -203,7 +203,7 @@
     throw p0
 .end method
 
-.method public static pH()Z
+.method public static pF()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 2f5ccdae5c..1b2e2e991f 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 atH:Lcom/google/android/gms/internal/measurement/aq;
+.field private final synthetic atD: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;->atH:Lcom/google/android/gms/internal/measurement/aq;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/as;->atD: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;->atH:Lcom/google/android/gms/internal/measurement/aq;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/as;->atD:Lcom/google/android/gms/internal/measurement/aq;
 
-    iget-object v0, p1, Lcom/google/android/gms/internal/measurement/aq;->asA:Ljava/lang/Object;
+    iget-object v0, p1, Lcom/google/android/gms/internal/measurement/aq;->asw:Ljava/lang/Object;
 
     monitor-enter v0
 
     const/4 v1, 0x0
 
     :try_start_0
-    iput-object v1, p1, Lcom/google/android/gms/internal/measurement/aq;->atC:Ljava/util/Map;
+    iput-object v1, p1, Lcom/google/android/gms/internal/measurement/aq;->aty: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;->atD:Ljava/util/List;
+    iget-object v0, p1, Lcom/google/android/gms/internal/measurement/aq;->atz: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 1967a43443..f41e4cb5c5 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 atI:Lcom/google/android/gms/internal/measurement/ct;
+.field private static atE: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 04e5eaa589..beb5aee26c 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 atH:Lcom/google/android/gms/internal/measurement/aq;
+.field private final atD: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;->atH:Lcom/google/android/gms/internal/measurement/aq;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/au;->atD:Lcom/google/android/gms/internal/measurement/aq;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/au;->atH:Lcom/google/android/gms/internal/measurement/aq;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/au;->atD:Lcom/google/android/gms/internal/measurement/aq;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/aq;->rB()Ljava/util/Map;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/aq;->rz()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 f9914f6571..e003ac8087 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 rC()Ljava/lang/Object;
+.method public abstract rA()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 3027ff58a4..1a79e5221a 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;->rC()Ljava/lang/Object;
+    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/aw;->rA()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;->rC()Ljava/lang/Object;
+    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/aw;->rA()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 abbfdbca46..038409bc74 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 ane:Ljava/lang/String;
+.field private final ana:Ljava/lang/String;
 
-.field private final atJ:Lcom/google/android/gms/internal/measurement/az;
+.field private final atF: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;->atJ:Lcom/google/android/gms/internal/measurement/az;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ay;->atF:Lcom/google/android/gms/internal/measurement/az;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/ay;->ane:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/ay;->ana:Ljava/lang/String;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()Ljava/lang/Object;
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ay;->atJ:Lcom/google/android/gms/internal/measurement/az;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ay;->atF:Lcom/google/android/gms/internal/measurement/az;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ay;->ane:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ay;->ana:Ljava/lang/String;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/az;->atK:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/az;->atG: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 7125cf6fba..91e59bb161 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 anq:Ljava/lang/String;
+.field private final synthetic anm:Ljava/lang/String;
 
-.field private final synthetic asr:Landroid/content/Context;
+.field private final synthetic asn:Landroid/content/Context;
 
-.field private final synthetic ass:Landroid/os/Bundle;
+.field private final synthetic aso:Landroid/os/Bundle;
 
-.field private final synthetic ast:Lcom/google/android/gms/internal/measurement/me;
+.field private final synthetic asp: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;->ast:Lcom/google/android/gms/internal/measurement/me;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/b;->asp:Lcom/google/android/gms/internal/measurement/me;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/b;->anq:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/b;->anm: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;->asr:Landroid/content/Context;
+    iput-object p4, p0, Lcom/google/android/gms/internal/measurement/b;->asn:Landroid/content/Context;
 
-    iput-object p5, p0, Lcom/google/android/gms/internal/measurement/b;->ass:Landroid/os/Bundle;
+    iput-object p5, p0, Lcom/google/android/gms/internal/measurement/b;->aso: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;->ast:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/b;->asp: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;->anq:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/b;->anm: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;->anq:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/b;->anm:Ljava/lang/String;
 
-    iget-object v4, 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;->asp: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;->asr:Landroid/content/Context;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/b;->asn: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;->uK()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/me;->uI()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;->ast:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/b;->asp: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 v4, p0, Lcom/google/android/gms/internal/measurement/b;->asp:Lcom/google/android/gms/internal/measurement/me;
 
-    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/b;->asr:Landroid/content/Context;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/b;->asn: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;->ast:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/b;->asp: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;->ast:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/b;->asp: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;->asr:Landroid/content/Context;
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/b;->asn: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;->asr:Landroid/content/Context;
+    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/b;->asn: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;->ass:Landroid/os/Bundle;
+    iget-object v12, p0, Lcom/google/android/gms/internal/measurement/b;->aso: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;->ast:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/b;->asp: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;->asr:Landroid/content/Context;
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/b;->asn: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;->any:J
+    iget-wide v4, p0, Lcom/google/android/gms/internal/measurement/b;->anu: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;->ast:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/b;->asp: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 f7c57d9ee2..ce64619cac 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 atM:Lcom/google/android/gms/internal/measurement/br;
+.field private static volatile atI: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 atN:Ljava/lang/Object;
+.field private static final atJ:Ljava/lang/Object;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/br;->rH()Lcom/google/android/gms/internal/measurement/br;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/br;->rF()Lcom/google/android/gms/internal/measurement/br;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/bc;->atM:Lcom/google/android/gms/internal/measurement/br;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/bc;->atI: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;->atN:Ljava/lang/Object;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/bc;->atJ: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;->atM:Lcom/google/android/gms/internal/measurement/br;
+    sget-object p1, Lcom/google/android/gms/internal/measurement/bc;->atI:Lcom/google/android/gms/internal/measurement/br;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/br;->pH()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/br;->pF()Z
 
     move-result p1
 
     if-eqz p1, :cond_1
 
-    sget-object p0, Lcom/google/android/gms/internal/measurement/bc;->atM:Lcom/google/android/gms/internal/measurement/br;
+    sget-object p0, Lcom/google/android/gms/internal/measurement/bc;->atI:Lcom/google/android/gms/internal/measurement/br;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/br;->rG()Ljava/lang/Object;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/br;->rE()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;->atN:Ljava/lang/Object;
+    sget-object p1, Lcom/google/android/gms/internal/measurement/bc;->atJ:Ljava/lang/Object;
 
     monitor-enter p1
 
     :try_start_0
-    sget-object v0, Lcom/google/android/gms/internal/measurement/bc;->atM:Lcom/google/android/gms/internal/measurement/br;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/bc;->atI:Lcom/google/android/gms/internal/measurement/br;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/br;->pH()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/br;->pF()Z
 
     move-result v0
 
     if-eqz v0, :cond_2
 
-    sget-object p0, Lcom/google/android/gms/internal/measurement/bc;->atM:Lcom/google/android/gms/internal/measurement/br;
+    sget-object p0, Lcom/google/android/gms/internal/measurement/bc;->atI:Lcom/google/android/gms/internal/measurement/br;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/br;->rG()Ljava/lang/Object;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/br;->rE()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;->atM:Lcom/google/android/gms/internal/measurement/br;
+    sput-object p0, Lcom/google/android/gms/internal/measurement/bc;->atI: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;->atM:Lcom/google/android/gms/internal/measurement/br;
+    sget-object p0, Lcom/google/android/gms/internal/measurement/bc;->atI:Lcom/google/android/gms/internal/measurement/br;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/br;->rG()Ljava/lang/Object;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/br;->rE()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 01b23dea96..a8e441c765 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;->rH()Lcom/google/android/gms/internal/measurement/br;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/br;->rF()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;->rH()Lcom/google/android/gms/internal/measurement/br;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/br;->rF()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 414dfa6736..c632704c52 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 asH:Z
+.field private static asD:Z
 
-.field private static atK:Landroid/content/Context;
+.field private static atG:Landroid/content/Context;
 
-.field private static atO:Lcom/google/android/gms/internal/measurement/bs;
+.field private static atK: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 atQ:Ljava/util/concurrent/atomic/AtomicInteger;
+.field private static final atM:Ljava/util/concurrent/atomic/AtomicInteger;
 
 .field private static final zza:Ljava/lang/Object;
 
 
 # instance fields
-.field private final asC:Ljava/lang/Object;
+.field private final asy:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TT;"
@@ -43,7 +43,7 @@
     .end annotation
 .end field
 
-.field private final atP:Lcom/google/android/gms/internal/measurement/bk;
+.field private final atL: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;->atK:Landroid/content/Context;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/be;->atG:Landroid/content/Context;
 
     const/4 v0, 0x0
 
-    sput-boolean v0, Lcom/google/android/gms/internal/measurement/be;->asH:Z
+    sput-boolean v0, Lcom/google/android/gms/internal/measurement/be;->asD: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;->atQ:Ljava/util/concurrent/atomic/AtomicInteger;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/be;->atM: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;->atT:Landroid/net/Uri;
+    iget-object v0, p1, Lcom/google/android/gms/internal/measurement/bk;->atP:Landroid/net/Uri;
 
     if-eqz v0, :cond_0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/be;->atP:Lcom/google/android/gms/internal/measurement/bk;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/be;->atL: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;->asC:Ljava/lang/Object;
+    iput-object p3, p0, Lcom/google/android/gms/internal/measurement/be;->asy: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;->atK:Landroid/content/Context;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/be;->atG:Landroid/content/Context;
 
     if-eq v1, p0, :cond_1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/aq;->rA()V
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/aq;->ry()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;->atQ:Ljava/util/concurrent/atomic/AtomicInteger;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/be;->atM: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;->atK:Landroid/content/Context;
+    sput-object p0, Lcom/google/android/gms/internal/measurement/be;->atG: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;->atO:Lcom/google/android/gms/internal/measurement/bs;
+    sput-object p0, Lcom/google/android/gms/internal/measurement/be;->atK: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 rF()Lcom/google/android/gms/internal/measurement/ba;
+.method static final synthetic rD()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;->atK:Landroid/content/Context;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/be;->atG: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;->pH()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ar;->pF()Z
 
     move-result v1
 
@@ -403,13 +403,13 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/br;->pH()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/br;->pF()Z
 
     move-result v1
 
     if-eqz v1, :cond_5
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/br;->rG()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/br;->rE()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;->atQ:Ljava/util/concurrent/atomic/AtomicInteger;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/be;->atM: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 rD()Ljava/lang/String;
+.method public final rB()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/be;->atP:Lcom/google/android/gms/internal/measurement/bk;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/be;->atL: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 rE()Ljava/lang/Object;
+.method public final rC()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;->atQ:Ljava/util/concurrent/atomic/AtomicInteger;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/be;->atM: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;->atK:Landroid/content/Context;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/be;->atG:Landroid/content/Context;
 
     if-eqz v1, :cond_f
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/be;->atO:Lcom/google/android/gms/internal/measurement/bs;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/be;->atK:Lcom/google/android/gms/internal/measurement/bs;
 
-    invoke-interface {v1}, Lcom/google/android/gms/internal/measurement/bs;->rC()Ljava/lang/Object;
+    invoke-interface {v1}, Lcom/google/android/gms/internal/measurement/bs;->rA()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;->atP:Lcom/google/android/gms/internal/measurement/bk;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/be;->atL:Lcom/google/android/gms/internal/measurement/bk;
 
-    iget-object v2, v2, Lcom/google/android/gms/internal/measurement/bk;->atT:Landroid/net/Uri;
+    iget-object v2, v2, Lcom/google/android/gms/internal/measurement/bk;->atP:Landroid/net/Uri;
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/be;->atP:Lcom/google/android/gms/internal/measurement/bk;
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/be;->atL: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;->aty:Ljava/util/Map;
+    iget-object v5, v1, Lcom/google/android/gms/internal/measurement/ba;->atu: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;->aty:Ljava/util/Map;
+    iget-object v1, v1, Lcom/google/android/gms/internal/measurement/ba;->atu: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;->atK:Landroid/content/Context;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/be;->atG: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;->atn:Ljava/util/regex/Pattern;
+    sget-object v2, Lcom/google/android/gms/internal/measurement/ap;->atj: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;->atP:Lcom/google/android/gms/internal/measurement/bk;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/be;->atL:Lcom/google/android/gms/internal/measurement/bk;
 
-    iget-object v1, v1, Lcom/google/android/gms/internal/measurement/bk;->atT:Landroid/net/Uri;
+    iget-object v1, v1, Lcom/google/android/gms/internal/measurement/bk;->atP:Landroid/net/Uri;
 
     if-eqz v1, :cond_8
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/be;->atK:Landroid/content/Context;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/be;->atG:Landroid/content/Context;
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/be;->atP:Lcom/google/android/gms/internal/measurement/bk;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/be;->atL:Lcom/google/android/gms/internal/measurement/bk;
 
-    iget-object v2, v2, Lcom/google/android/gms/internal/measurement/bk;->atT:Landroid/net/Uri;
+    iget-object v2, v2, Lcom/google/android/gms/internal/measurement/bk;->atP: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;->atK:Landroid/content/Context;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/be;->atG: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;->atP:Lcom/google/android/gms/internal/measurement/bk;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/be;->atL:Lcom/google/android/gms/internal/measurement/bk;
 
-    iget-object v2, v2, Lcom/google/android/gms/internal/measurement/bk;->atT:Landroid/net/Uri;
+    iget-object v2, v2, Lcom/google/android/gms/internal/measurement/bk;->atP: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;->atK:Landroid/content/Context;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/be;->atG: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;->rD()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/be;->rB()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;->rD()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/be;->rB()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;->atK:Landroid/content/Context;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/be;->atG: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;->atP:Lcom/google/android/gms/internal/measurement/bk;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/be;->atL:Lcom/google/android/gms/internal/measurement/bk;
 
-    iget-object v2, v2, Lcom/google/android/gms/internal/measurement/bk;->anq:Ljava/lang/String;
+    iget-object v2, v2, Lcom/google/android/gms/internal/measurement/bk;->anm: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;->asC:Ljava/lang/Object;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/be;->asy: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 437337220a..0422701a3d 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 atR:Landroidx/collection/ArrayMap;
+.field private static final atN: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;->atR:Landroidx/collection/ArrayMap;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/bf;->atN: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;->atR:Landroidx/collection/ArrayMap;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/bf;->atN: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;->atR:Landroidx/collection/ArrayMap;
+    sget-object v2, Lcom/google/android/gms/internal/measurement/bf;->atN: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 7db30bd711..77148df772 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;->rD()Ljava/lang/String;
+    invoke-super {p0}, Lcom/google/android/gms/internal/measurement/be;->rB()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 7794bf924d..59fed92a32 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 rC()Ljava/lang/Object;
+.method public final rA()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/be;->rF()Lcom/google/android/gms/internal/measurement/ba;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/be;->rD()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 cf6c106f5f..bb31a23509 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;->rD()Ljava/lang/String;
+    invoke-super {p0}, Lcom/google/android/gms/internal/measurement/be;->rB()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 da111e4ecf..a04fa0c046 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;->atn:Ljava/util/regex/Pattern;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ap;->atj: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;->ato:Ljava/util/regex/Pattern;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ap;->atk: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;->rD()Ljava/lang/String;
+    invoke-super {p0}, Lcom/google/android/gms/internal/measurement/be;->rB()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 47645774f6..603acf22ab 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 atV:Lcom/google/android/gms/internal/measurement/bn;
+.field private final atR: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;->atV:Lcom/google/android/gms/internal/measurement/bn;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/bm;->atR: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;->atV:Lcom/google/android/gms/internal/measurement/bn;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/bm;->atR:Lcom/google/android/gms/internal/measurement/bn;
 
-    iget-object p2, p1, Lcom/google/android/gms/internal/measurement/bn;->atY:Ljava/lang/Object;
+    iget-object p2, p1, Lcom/google/android/gms/internal/measurement/bn;->atU:Ljava/lang/Object;
 
     monitor-enter p2
 
     const/4 v0, 0x0
 
     :try_start_0
-    iput-object v0, p1, Lcom/google/android/gms/internal/measurement/bn;->atZ:Ljava/util/Map;
+    iput-object v0, p1, Lcom/google/android/gms/internal/measurement/bn;->atV: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;->aua:Ljava/util/List;
+    iget-object p2, p1, Lcom/google/android/gms/internal/measurement/bn;->atW: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 1356edcc2f..aae6b9a5d1 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 aty:Ljava/util/Map;
+.field private static final atu:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -20,13 +20,13 @@
 
 
 # instance fields
-.field private final atW:Landroid/content/SharedPreferences;
+.field private final atS:Landroid/content/SharedPreferences;
 
-.field private final atX:Landroid/content/SharedPreferences$OnSharedPreferenceChangeListener;
+.field private final atT:Landroid/content/SharedPreferences$OnSharedPreferenceChangeListener;
 
-.field final atY:Ljava/lang/Object;
+.field final atU:Ljava/lang/Object;
 
-.field volatile atZ:Ljava/util/Map;
+.field volatile atV:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -36,7 +36,7 @@
     .end annotation
 .end field
 
-.field final aua:Ljava/util/List;
+.field final atW: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;->aty:Ljava/util/Map;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/bn;->atu: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;->atX:Landroid/content/SharedPreferences$OnSharedPreferenceChangeListener;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/bn;->atT: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;->atY:Ljava/lang/Object;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/bn;->atU: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;->aua:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/bn;->atW:Ljava/util/List;
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/bn;->atW:Landroid/content/SharedPreferences;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/bn;->atS:Landroid/content/SharedPreferences;
 
-    iget-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;->atS:Landroid/content/SharedPreferences;
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/bn;->atX:Landroid/content/SharedPreferences$OnSharedPreferenceChangeListener;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/bn;->atT: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;->pH()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ar;->pF()Z
 
     move-result v0
 
@@ -133,7 +133,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v2, Lcom/google/android/gms/internal/measurement/bn;->aty:Ljava/util/Map;
+    sget-object v2, Lcom/google/android/gms/internal/measurement/bn;->atu: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;->pH()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ar;->pF()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;->aty:Ljava/util/Map;
+    sget-object p0, Lcom/google/android/gms/internal/measurement/bn;->atu: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;->aty:Ljava/util/Map;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/bn;->atu: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;->atW:Landroid/content/SharedPreferences;
+    iget-object v3, v2, Lcom/google/android/gms/internal/measurement/bn;->atS:Landroid/content/SharedPreferences;
 
-    iget-object v2, v2, Lcom/google/android/gms/internal/measurement/bn;->atX:Landroid/content/SharedPreferences$OnSharedPreferenceChangeListener;
+    iget-object v2, v2, Lcom/google/android/gms/internal/measurement/bn;->atT: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;->aty:Ljava/util/Map;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/bn;->atu: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;->atZ:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/bn;->atV:Ljava/util/Map;
 
     if-nez v0, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/bn;->atY:Ljava/lang/Object;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/bn;->atU:Ljava/lang/Object;
 
     monitor-enter v1
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/bn;->atZ:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/bn;->atV:Ljava/util/Map;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/bn;->atW:Landroid/content/SharedPreferences;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/bn;->atS: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;->atZ:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/bn;->atV: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 c9b99a76d8..325621d8ba 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 anH:[Ljava/lang/Throwable;
+.field private static final anD:[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;->anH:[Ljava/lang/Throwable;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/bz;->anD:[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 f59f161565..72ba7c9387 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 anq:Ljava/lang/String;
+.field private final synthetic anm:Ljava/lang/String;
 
-.field private final synthetic asu:Lcom/google/android/gms/internal/measurement/me;
+.field private final synthetic asq: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;->asu:Lcom/google/android/gms/internal/measurement/me;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/c;->asq:Lcom/google/android/gms/internal/measurement/me;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/c;->anq:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/c;->anm: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;->asu:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/c;->asq: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;->anq:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/c;->anm:Ljava/lang/String;
 
-    iget-wide v2, p0, Lcom/google/android/gms/internal/measurement/c;->any:J
+    iget-wide v2, p0, Lcom/google/android/gms/internal/measurement/c;->anu: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 e0376fa921..c9370dae68 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 anu:I
+.field private static final anq:I
 
-.field private static final auc:Lcom/google/android/gms/internal/measurement/bz;
+.field private static final atY: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;->nS()Ljava/lang/Integer;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ca;->nQ()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;->auc:Lcom/google/android/gms/internal/measurement/bz;
+    sput-object v2, Lcom/google/android/gms/internal/measurement/ca;->atY: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;->anu:I
+    sput v0, Lcom/google/android/gms/internal/measurement/ca;->anq: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;->auc:Lcom/google/android/gms/internal/measurement/bz;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ca;->atY: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 nS()Ljava/lang/Integer;
+.method private static nQ()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 847bc9016f..21c80173dd 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 anF:Ljava/util/concurrent/ConcurrentHashMap;
+.field private final anB: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 anG:Ljava/lang/ref/ReferenceQueue;
+.field private final anC: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;->anF:Ljava/util/concurrent/ConcurrentHashMap;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/cc;->anB: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;->anG:Ljava/lang/ref/ReferenceQueue;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/cc;->anC: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;->anG:Ljava/lang/ref/ReferenceQueue;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cc;->anC: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;->anF:Ljava/util/concurrent/ConcurrentHashMap;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cc;->anB: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;->anG:Ljava/lang/ref/ReferenceQueue;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cc;->anC: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;->anF:Ljava/util/concurrent/ConcurrentHashMap;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cc;->anB: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;->anF:Ljava/util/concurrent/ConcurrentHashMap;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cc;->anB: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;->anG:Ljava/lang/ref/ReferenceQueue;
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/cc;->anC: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 462bebb3bc..9f51fa05e0 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 aud:Lcom/google/android/gms/internal/measurement/cc;
+.field private final atZ: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;->aud:Lcom/google/android/gms/internal/measurement/cc;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/cd;->atZ: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;->aud:Lcom/google/android/gms/internal/measurement/cc;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cd;->atZ: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 222ecc82b0..5c09019914 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;->ql()Ljava/util/List;
+    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/en;->qj()Ljava/util/List;
 
     move-result-object p0
 
@@ -282,11 +282,11 @@
     throw p1
 .end method
 
-.method public final rI()Lcom/google/android/gms/internal/measurement/cn;
+.method public final rG()Lcom/google/android/gms/internal/measurement/cn;
     .locals 6
 
     :try_start_0
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cf;->sT()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cf;->sR()I
 
     move-result v0
 
@@ -294,11 +294,11 @@
 
     move-result-object v0
 
-    iget-object v1, v0, Lcom/google/android/gms/internal/measurement/cw;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iget-object v1, v0, Lcom/google/android/gms/internal/measurement/cw;->auj: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;->rP()Lcom/google/android/gms/internal/measurement/cn;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cw;->rN()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 rJ()[B
+.method public final rH()[B
     .locals 6
 
     :try_start_0
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cf;->sT()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cf;->sR()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;->pG()V
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/df;->pE()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 rK()I
+.method rI()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 58f70405cc..c9b9f4fce5 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;->sW()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cg;->sU()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;->rL()Lcom/google/android/gms/internal/measurement/cg;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cg;->rJ()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;->sC()Lcom/google/android/gms/internal/measurement/di;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/di;->sA()Lcom/google/android/gms/internal/measurement/di;
 
     move-result-object p2
 
@@ -306,7 +306,7 @@
     return-object p1
 .end method
 
-.method public abstract rL()Lcom/google/android/gms/internal/measurement/cg;
+.method public abstract rJ()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 b8df9b6348..b6e774c855 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;->rA()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->ry()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;->rA()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->ry()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;->rA()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->ry()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;->rA()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->ry()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;->rA()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->ry()V
 
     invoke-super {p0}, Ljava/util/AbstractList;->clear()V
 
@@ -228,7 +228,7 @@
     return v1
 .end method
 
-.method public pH()Z
+.method public pF()Z
     .locals 1
 
     iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/ch;->zza:Z
@@ -236,24 +236,7 @@
     return v0
 .end method
 
-.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
+.method public final rK()V
     .locals 1
 
     const/4 v0, 0x0
@@ -271,7 +254,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rA()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->ry()V
 
     invoke-super {p0, p1}, Ljava/util/AbstractList;->remove(I)Ljava/lang/Object;
 
@@ -283,7 +266,7 @@
 .method public remove(Ljava/lang/Object;)Z
     .locals 0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rA()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->ry()V
 
     invoke-super {p0, p1}, Ljava/util/AbstractList;->remove(Ljava/lang/Object;)Z
 
@@ -302,7 +285,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rA()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->ry()V
 
     invoke-super {p0, p1}, Ljava/util/AbstractList;->removeAll(Ljava/util/Collection;)Z
 
@@ -321,7 +304,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rA()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->ry()V
 
     invoke-super {p0, p1}, Ljava/util/AbstractList;->retainAll(Ljava/util/Collection;)Z
 
@@ -330,6 +313,23 @@
     return p1
 .end method
 
+.method protected final ry()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;->rA()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->ry()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 55a3f770f1..594e71fddf 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 aue:Lcom/google/android/gms/internal/measurement/di;
+.field private static final aua: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;->sC()Lcom/google/android/gms/internal/measurement/di;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/di;->sA()Lcom/google/android/gms/internal/measurement/di;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ci;->aue:Lcom/google/android/gms/internal/measurement/di;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ci;->aua: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 bc25f96fa3..0602fd25fe 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;->tj()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
 
@@ -79,7 +79,7 @@
     return p2
 
     :cond_3
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tm()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 p0
 
@@ -109,7 +109,7 @@
     return p0
 
     :cond_7
-    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;->th()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;->tj()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
 
     throw p0
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gq;->ua()Lcom/google/android/gms/internal/measurement/gq;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gq;->tY()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;->tm()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 p0
 
@@ -302,7 +302,7 @@
 
     if-nez p3, :cond_6
 
-    sget-object p1, Lcom/google/android/gms/internal/measurement/cn;->auj:Lcom/google/android/gms/internal/measurement/cn;
+    sget-object p1, Lcom/google/android/gms/internal/measurement/cn;->auf: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;->tg()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->te()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object p0
 
     throw p0
 
     :cond_8
-    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;->tf()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;->anz:J
+    iget-wide p2, p5, Lcom/google/android/gms/internal/measurement/cm;->anv: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;->tj()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
 
@@ -547,7 +547,7 @@
 
     check-cast p0, Lcom/google/android/gms/internal/measurement/fk;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/fk;->rC()Ljava/lang/Object;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/fk;->rA()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;->rC()Ljava/lang/Object;
+    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/fw;->rA()Ljava/lang/Object;
 
     move-result-object p3
 
@@ -630,7 +630,7 @@
     return p2
 
     :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;->te()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;->tg()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->te()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;->anz:J
+    iput-wide v1, p2, Lcom/google/android/gms/internal/measurement/cm;->anv:J
 
     return v0
 
@@ -784,7 +784,7 @@
     goto :goto_0
 
     :cond_1
-    iput-wide v1, p2, Lcom/google/android/gms/internal/measurement/cm;->anz:J
+    iput-wide v1, p2, Lcom/google/android/gms/internal/measurement/cm;->anv: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;->avT:Ljava/nio/charset/Charset;
+    sget-object v2, Lcom/google/android/gms/internal/measurement/dy;->avP: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;->th()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tf()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;->th()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tf()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;->auj:Lcom/google/android/gms/internal/measurement/cn;
+    sget-object p0, Lcom/google/android/gms/internal/measurement/cn;->auf: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;->tg()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->te()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object p0
 
     throw p0
 
     :cond_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;->tf()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 a88c170a91..46f301e786 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,9 +4,9 @@
 
 
 # static fields
-.field private static final atG:Z
+.field private static final atC:Z
 
-.field private static final auf:Ljava/lang/Class;
+.field private static final aub:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -26,7 +26,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ck;->auf:Ljava/lang/Class;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ck;->aub: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;->atG:Z
+    sput-boolean v0, Lcom/google/android/gms/internal/measurement/ck;->atC:Z
 
     return-void
 .end method
@@ -78,14 +78,14 @@
     return-object p0
 .end method
 
-.method static pH()Z
+.method static pF()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ck;->auf:Ljava/lang/Class;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ck;->aub:Ljava/lang/Class;
 
     if-eqz v0, :cond_0
 
-    sget-boolean v0, Lcom/google/android/gms/internal/measurement/ck;->atG:Z
+    sget-boolean v0, Lcom/google/android/gms/internal/measurement/ck;->atC:Z
 
     if-nez v0, :cond_0
 
@@ -99,7 +99,7 @@
     return v0
 .end method
 
-.method static rN()Ljava/lang/Class;
+.method static rL()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;->auf:Ljava/lang/Class;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ck;->aub: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 b28a1bc827..7ca98074b5 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 aug:Lcom/google/android/gms/internal/measurement/cl;
+.field private static final auc:Lcom/google/android/gms/internal/measurement/cl;
 
 
 # instance fields
-.field private auh:[Z
+.field private aud:[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;->aug:Lcom/google/android/gms/internal/measurement/cl;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/cl;->auc:Lcom/google/android/gms/internal/measurement/cl;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ch;->rM()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ch;->rK()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;->auh:[Z
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/cl;->aud:[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;->rA()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->ry()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;->auh:[Z
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cl;->aud:[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;->auh:[Z
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cl;->aud:[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;->auh:[Z
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/cl;->aud:[Z
 
     :goto_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cl;->auh:[Z
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cl;->aud:[Z
 
     aput-boolean p2, v0, p1
 
@@ -248,7 +248,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rA()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->ry()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;->auh:[Z
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cl;->aud:[Z
 
     array-length v2, v0
 
@@ -294,12 +294,12 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/cl;->auh:[Z
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/cl;->aud:[Z
 
     :cond_2
-    iget-object v0, p1, Lcom/google/android/gms/internal/measurement/cl;->auh:[Z
+    iget-object v0, p1, Lcom/google/android/gms/internal/measurement/cl;->aud:[Z
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/cl;->auh:[Z
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/cl;->aud:[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;->auh:[Z
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cl;->aud:[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;->auh:[Z
+    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/cl;->aud:[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;->auh:[Z
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/cl;->aud:[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;->auh:[Z
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cl;->aud:[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;->auh:[Z
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/cl;->aud:[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;->rA()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->ry()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;->auh:[Z
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cl;->aud:[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;->rA()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->ry()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;->auh:[Z
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/cl;->aud:[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;->auh:[Z
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cl;->aud:[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;->rA()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->ry()V
 
     if-lt p2, p1, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cl;->auh:[Z
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cl;->aud:[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;->rA()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->ry()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;->auh:[Z
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cl;->aud:[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;->rA()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->ry()V
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/cl;->zzc:I
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cl;->auh:[Z
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cl;->aud:[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;->auh:[Z
+    iput-object v2, p0, Lcom/google/android/gms/internal/measurement/cl;->aud:[Z
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cl;->auh:[Z
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cl;->aud:[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 647178b44c..52cffd2ce5 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 anz:J
+.field public anv:J
 
-.field public final aui:Lcom/google/android/gms/internal/measurement/di;
+.field public final aue: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;->sC()Lcom/google/android/gms/internal/measurement/di;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/di;->sA()Lcom/google/android/gms/internal/measurement/di;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/cm;->aui:Lcom/google/android/gms/internal/measurement/di;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/cm;->aue: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;->aui:Lcom/google/android/gms/internal/measurement/di;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/cm;->aue: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 ff24941128..23e4f1b6b5 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 auj:Lcom/google/android/gms/internal/measurement/cn;
+.field public static final auf:Lcom/google/android/gms/internal/measurement/cn;
 
-.field private static final auk:Lcom/google/android/gms/internal/measurement/cu;
+.field private static final aug:Lcom/google/android/gms/internal/measurement/cu;
 
-.field private static final aul:Ljava/util/Comparator;
+.field private static final auh: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;->auj:Lcom/google/android/gms/internal/measurement/cn;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/cn;->auf:Lcom/google/android/gms/internal/measurement/cn;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ck;->pH()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ck;->pF()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;->auk:Lcom/google/android/gms/internal/measurement/cu;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/cn;->aug: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;->aul:Ljava/util/Comparator;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/cn;->auh: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;->auk:Lcom/google/android/gms/internal/measurement/cu;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/cn;->aug: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;->avT:Ljava/nio/charset/Charset;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dy;->avP: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;->pJ()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cn;->pH()I
 
     move-result v0
 
@@ -330,18 +330,18 @@
     return-object v0
 .end method
 
-.method public abstract nO()Z
+.method public abstract nM()Z
 .end method
 
-.method public abstract pJ()I
+.method public abstract pH()I
 .end method
 
-.method public final rD()Ljava/lang/String;
+.method public final rB()Ljava/lang/String;
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/dy;->avT:Ljava/nio/charset/Charset;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dy;->avP:Ljava/nio/charset/Charset;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cn;->pJ()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cn;->pH()I
 
     move-result v1
 
@@ -359,7 +359,7 @@
     return-object v0
 .end method
 
-.method protected final rm()I
+.method protected final rk()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;->pJ()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cn;->pH()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 8a246e7f5b..4acbe6a6a7 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;->rO()B
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/cx;->rM()B
 
     move-result v2
 
@@ -68,7 +68,7 @@
 
     move-result v2
 
-    invoke-interface {v1}, Lcom/google/android/gms/internal/measurement/cx;->rO()B
+    invoke-interface {v1}, Lcom/google/android/gms/internal/measurement/cx;->rM()B
 
     move-result v3
 
@@ -85,11 +85,11 @@
     return v2
 
     :cond_1
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cn;->pJ()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cn;->pH()I
 
     move-result p1
 
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/cn;->pJ()I
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/cn;->pH()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 60b7e0d2d4..1bd8e20eba 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 anu:I
+.field private final anq:I
 
-.field private final synthetic aum:Lcom/google/android/gms/internal/measurement/cn;
+.field private final synthetic aui: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;->aum:Lcom/google/android/gms/internal/measurement/cn;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/cq;->aui: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;->aum:Lcom/google/android/gms/internal/measurement/cn;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cq;->aui:Lcom/google/android/gms/internal/measurement/cn;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cn;->pJ()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cn;->pH()I
 
     move-result p1
 
-    iput p1, p0, Lcom/google/android/gms/internal/measurement/cq;->anu:I
+    iput p1, p0, Lcom/google/android/gms/internal/measurement/cq;->anq: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;->anu:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/cq;->anq:I
 
     if-ge v0, v1, :cond_0
 
@@ -55,12 +55,12 @@
     return v0
 .end method
 
-.method public final rO()B
+.method public final rM()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;->anu:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/cq;->anq: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;->aum:Lcom/google/android/gms/internal/measurement/cn;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cq;->aui: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 e0dbfd2072..9cd014237d 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;->rO()B
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cs;->rM()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 2832f94ea3..19a3fc4ee7 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;->pJ()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cn;->pH()I
 
     move-result v0
 
@@ -124,7 +124,7 @@
     return p1
 .end method
 
-.method public final pJ()I
+.method public final pH()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 qh()I
+.method protected final qf()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 30c19ac01e..a2a588d605 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 aun:Lcom/google/android/gms/internal/measurement/df;
+.field final auj: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;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->auj:Lcom/google/android/gms/internal/measurement/df;
 
     return-void
 .end method
@@ -40,12 +40,12 @@
 
 
 # virtual methods
-.method public final rP()Lcom/google/android/gms/internal/measurement/cn;
+.method public final rN()Lcom/google/android/gms/internal/measurement/cn;
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->auj:Lcom/google/android/gms/internal/measurement/df;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/df;->pG()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/df;->pE()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 1fb780d632..8300cf9916 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 rO()B
+.method public abstract rM()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 31b57e5959..d66cb9a5d8 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;->qh()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cy;->qf()I
 
     move-result v2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cn;->pJ()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cn;->pH()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;->qh()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cy;->qf()I
 
     move-result v1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cn;->pJ()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cn;->pH()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;->pJ()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cn;->pH()I
 
     move-result v0
 
     if-gt p2, v0, :cond_4
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cn;->pJ()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cn;->pH()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;->qh()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cy;->qf()I
 
     move-result v2
 
     add-int/2addr v2, p2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cy;->qh()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cy;->qf()I
 
     move-result p2
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cy;->qh()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cy;->qf()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;->pJ()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cn;->pH()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;->pJ()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cn;->pH()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;->pJ()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cn;->pH()I
 
     move-result v0
 
@@ -255,7 +255,7 @@
 
     if-nez p1, :cond_0
 
-    sget-object p1, Lcom/google/android/gms/internal/measurement/cn;->auj:Lcom/google/android/gms/internal/measurement/cn;
+    sget-object p1, Lcom/google/android/gms/internal/measurement/cn;->auf: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;->qh()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cy;->qf()I
 
     move-result v2
 
@@ -292,7 +292,7 @@
     return v2
 
     :cond_1
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cn;->pJ()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cn;->pH()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;->pJ()I
+    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/cn;->pH()I
 
     move-result v3
 
@@ -309,7 +309,7 @@
     return v2
 
     :cond_2
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cn;->pJ()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cn;->pH()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;->rm()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cn;->rk()I
 
     move-result v0
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cn;->rm()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cn;->rk()I
 
     move-result v1
 
@@ -341,7 +341,7 @@
     return v2
 
     :cond_4
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cn;->pJ()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cn;->pH()I
 
     move-result v0
 
@@ -359,16 +359,16 @@
     return p1
 .end method
 
-.method public final nO()Z
+.method public final nM()Z
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cy;->qh()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cy;->qf()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;->pJ()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cn;->pH()I
 
     move-result v2
 
@@ -381,7 +381,7 @@
     return v0
 .end method
 
-.method public pJ()I
+.method public pH()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 qh()I
+.method protected qf()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;->qh()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cy;->qf()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 ac85215445..18adb8f71a 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 anq:Ljava/lang/String;
+.field private final synthetic anm:Ljava/lang/String;
 
-.field private final synthetic asv:Lcom/google/android/gms/internal/measurement/it;
+.field private final synthetic asr:Lcom/google/android/gms/internal/measurement/it;
 
-.field private final synthetic asw:Lcom/google/android/gms/internal/measurement/me;
+.field private final synthetic ass: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;->asw:Lcom/google/android/gms/internal/measurement/me;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/d;->ass:Lcom/google/android/gms/internal/measurement/me;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/d;->anq:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/d;->anm: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;->asv:Lcom/google/android/gms/internal/measurement/it;
+    iput-object p4, p0, Lcom/google/android/gms/internal/measurement/d;->asr: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 pG()V
+.method protected final pE()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/d;->asv:Lcom/google/android/gms/internal/measurement/it;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/d;->asr: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;->asw:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/d;->ass: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;->anq:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/d;->anm: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;->asv:Lcom/google/android/gms/internal/measurement/it;
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/d;->asr: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 c3c989c1c5..3709053c5b 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 anu:I
+.field anq:I
 
-.field auo:Lcom/google/android/gms/internal/measurement/de;
+.field auk: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;->anu:I
+    iput v0, p0, Lcom/google/android/gms/internal/measurement/da;->anq:I
 
     const v0, 0x7fffffff
 
@@ -129,7 +129,7 @@
     .end annotation
 .end method
 
-.method public abstract mQ()Ljava/lang/String;
+.method public abstract mO()Ljava/lang/String;
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -137,7 +137,7 @@
     .end annotation
 .end method
 
-.method public abstract pJ()I
+.method public abstract pH()I
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -145,7 +145,7 @@
     .end annotation
 .end method
 
-.method public abstract qA()J
+.method public abstract qT()J
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -153,7 +153,7 @@
     .end annotation
 .end method
 
-.method public abstract qV()J
+.method public abstract qa()I
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -161,7 +161,7 @@
     .end annotation
 .end method
 
-.method public abstract qc()I
+.method public abstract qy()J
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -169,7 +169,7 @@
     .end annotation
 .end method
 
-.method public abstract rQ()D
+.method public abstract rO()D
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -177,7 +177,7 @@
     .end annotation
 .end method
 
-.method public abstract rR()F
+.method public abstract rP()F
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -185,7 +185,7 @@
     .end annotation
 .end method
 
-.method public abstract rS()J
+.method public abstract rQ()J
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -193,7 +193,7 @@
     .end annotation
 .end method
 
-.method public abstract rT()Z
+.method public abstract rR()Z
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -201,7 +201,7 @@
     .end annotation
 .end method
 
-.method public abstract rU()Ljava/lang/String;
+.method public abstract rS()Ljava/lang/String;
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -209,7 +209,23 @@
     .end annotation
 .end method
 
-.method public abstract rV()Lcom/google/android/gms/internal/measurement/cn;
+.method public abstract rT()Lcom/google/android/gms/internal/measurement/cn;
+    .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;
@@ -225,7 +241,7 @@
     .end annotation
 .end method
 
-.method public abstract rX()I
+.method public abstract rX()J
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -249,7 +265,7 @@
     .end annotation
 .end method
 
-.method public abstract rf()I
+.method public abstract rd()I
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -257,7 +273,7 @@
     .end annotation
 .end method
 
-.method public abstract sa()I
+.method abstract sa()J
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -265,7 +281,7 @@
     .end annotation
 .end method
 
-.method public abstract sb()J
+.method public abstract sb()Z
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -273,21 +289,5 @@
     .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
+.method public abstract sc()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 b3c6d4885c..e01a7e24b8 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 afg:I
+.field private afc:I
 
-.field private final aup:[B
+.field private final aul:[B
 
-.field private auq:I
+.field private aum:I
 
 .field private final zze:Z
 
@@ -41,9 +41,9 @@
 
     const p4, 0x7fffffff
 
-    iput p4, p0, Lcom/google/android/gms/internal/measurement/dc;->afg:I
+    iput p4, p0, Lcom/google/android/gms/internal/measurement/dc;->afc:I
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/dc;->aup:[B
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/dc;->aul:[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;->th()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tf()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object p1
 
     throw p1
 
     :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;->te()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object p1
 
     throw p1
 .end method
 
-.method private final sf()I
+.method private final sd()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;->aup:[B
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/dc;->aul:[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;->sc()J
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/da;->sa()J
 
     move-result-wide v0
 
@@ -244,7 +244,7 @@
     return v1
 .end method
 
-.method private final sg()J
+.method private final se()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;->aup:[B
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/dc;->aul:[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;->sc()J
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/da;->sa()J
 
     move-result-wide v0
 
     return-wide v0
 .end method
 
-.method private final sh()I
+.method private final sf()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;->aup:[B
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dc;->aul:[B
 
     add-int/lit8 v2, v0, 0x4
 
@@ -542,14 +542,14 @@
     return v0
 
     :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;->te()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object v0
 
     throw v0
 .end method
 
-.method private final si()J
+.method private final sg()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;->aup:[B
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dc;->aul:[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;->tg()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->te()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object v0
 
     throw v0
 .end method
 
-.method private final sj()V
+.method private final sh()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;->afg:I
+    iget v2, p0, Lcom/google/android/gms/internal/measurement/dc;->afc:I
 
     if-le v1, v2, :cond_0
 
@@ -728,7 +728,7 @@
     return-void
 .end method
 
-.method private final sk()B
+.method private final si()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;->aup:[B
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dc;->aul:[B
 
     add-int/lit8 v2, v0, 0x1
 
@@ -753,7 +753,7 @@
     return v0
 
     :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;->te()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;->auq:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/dc;->aum:I
 
     if-ne v0, p1, :cond_0
 
     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;->ti()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;->tl()Lcom/google/android/gms/internal/measurement/eg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tj()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;->pJ()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/da;->pH()I
 
     move-result v0
 
@@ -857,7 +857,7 @@
     return v2
 
     :cond_4
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dc;->sf()I
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dc;->sd()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;->aup:[B
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dc;->aul:[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;->ti()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
 
@@ -913,7 +913,7 @@
     :goto_1
     if-ge v1, v0, :cond_a
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dc;->sk()B
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dc;->si()B
 
     move-result p1
 
@@ -927,7 +927,7 @@
     return v2
 
     :cond_a
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->ti()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
 
@@ -943,9 +943,9 @@
 .method public final bR(I)V
     .locals 0
 
-    iput p1, p0, Lcom/google/android/gms/internal/measurement/dc;->afg:I
+    iput p1, p0, Lcom/google/android/gms/internal/measurement/dc;->afc:I
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dc;->sj()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dc;->sh()V
 
     return-void
 .end method
@@ -960,38 +960,38 @@
 
     if-ltz p1, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/da;->se()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/da;->sc()I
 
     move-result v0
 
     add-int/2addr p1, v0
 
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/dc;->afg:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/dc;->afc:I
 
     if-gt p1, v0, :cond_0
 
-    iput p1, p0, Lcom/google/android/gms/internal/measurement/dc;->afg:I
+    iput p1, p0, Lcom/google/android/gms/internal/measurement/dc;->afc:I
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dc;->sj()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dc;->sh()V
 
     return v0
 
     :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;->te()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object p1
 
     throw p1
 
     :cond_1
-    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;->tf()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object p1
 
     throw p1
 .end method
 
-.method public final mQ()Ljava/lang/String;
+.method public final mO()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;->sf()I
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dc;->sd()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;->aup:[B
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/dc;->aul:[B
 
-    sget-object v4, Lcom/google/android/gms/internal/measurement/dy;->avT:Ljava/nio/charset/Charset;
+    sget-object v4, Lcom/google/android/gms/internal/measurement/dy;->avP: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;->th()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tf()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object v0
 
     throw v0
 
     :cond_2
-    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;->te()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object v0
 
     throw v0
 .end method
 
-.method public final pJ()I
+.method public final pH()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;->sd()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/da;->sb()Z
 
     move-result v0
 
@@ -1069,18 +1069,18 @@
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lcom/google/android/gms/internal/measurement/dc;->auq:I
+    iput v0, p0, Lcom/google/android/gms/internal/measurement/dc;->aum:I
 
     return v0
 
     :cond_0
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dc;->sf()I
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dc;->sd()I
 
     move-result v0
 
-    iput v0, p0, Lcom/google/android/gms/internal/measurement/dc;->auq:I
+    iput v0, p0, Lcom/google/android/gms/internal/measurement/dc;->aum:I
 
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/dc;->auq:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/dc;->aum:I
 
     ushr-int/lit8 v1, v0, 0x3
 
@@ -1089,14 +1089,14 @@
     return v0
 
     :cond_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;->th()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object v0
 
     throw v0
 .end method
 
-.method public final qA()J
+.method public final qT()J
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -1111,22 +1111,7 @@
     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
+.method public final qa()I
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -1134,14 +1119,14 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dc;->sh()I
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dc;->sf()I
 
     move-result v0
 
     return v0
 .end method
 
-.method public final rQ()D
+.method public final qy()J
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -1149,7 +1134,22 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dc;->si()J
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dc;->se()J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
+
+.method public final rO()D
+    .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
 
@@ -1160,7 +1160,7 @@
     return-wide v0
 .end method
 
-.method public final rR()F
+.method public final rP()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;->sh()I
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dc;->sf()I
 
     move-result v0
 
@@ -1179,7 +1179,7 @@
     return v0
 .end method
 
-.method public final rS()J
+.method public final rQ()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;->sg()J
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dc;->se()J
 
     move-result-wide v0
 
     return-wide v0
 .end method
 
-.method public final rT()Z
+.method public final rR()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;->sg()J
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dc;->se()J
 
     move-result-wide v0
 
@@ -1222,7 +1222,7 @@
     return v0
 .end method
 
-.method public final rU()Ljava/lang/String;
+.method public final rS()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;->sf()I
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dc;->sd()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;->aup:[B
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dc;->aul:[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;->th()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tf()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object v0
 
     throw v0
 
     :cond_2
-    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;->te()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object v0
 
     throw v0
 .end method
 
-.method public final rV()Lcom/google/android/gms/internal/measurement/cn;
+.method public final rT()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;->sf()I
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dc;->sd()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;->aup:[B
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dc;->aul:[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;->auj:Lcom/google/android/gms/internal/measurement/cn;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/cn;->auf: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;->aup:[B
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dc;->aul:[B
 
     iget v1, p0, Lcom/google/android/gms/internal/measurement/dc;->zzh:I
 
@@ -1365,20 +1365,50 @@
     return-object v0
 
     :cond_3
-    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;->tf()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object v0
 
     throw v0
 
     :cond_4
-    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;->te()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object v0
 
     throw 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;->sd()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;->sd()I
+
+    move-result v0
+
+    return v0
+.end method
+
 .method public final rW()I
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
@@ -1394,19 +1424,19 @@
     return v0
 .end method
 
-.method public final rX()I
-    .locals 1
+.method public final rX()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()I
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dc;->sg()J
 
-    move-result v0
+    move-result-wide v0
 
-    return v0
+    return-wide v0
 .end method
 
 .method public final rY()I
@@ -1417,7 +1447,11 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dc;->sh()I
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dc;->sd()I
+
+    move-result v0
+
+    invoke-static {v0}, Lcom/google/android/gms/internal/measurement/dc;->bS(I)I
 
     move-result v0
 
@@ -1432,56 +1466,7 @@
         }
     .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
-
-    invoke-static {v0}, Lcom/google/android/gms/internal/measurement/dc;->bS(I)I
-
-    move-result v0
-
-    return v0
-.end method
-
-.method public final sb()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
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dc;->se()J
 
     move-result-wide v0
 
@@ -1492,7 +1477,22 @@
     return-wide v0
 .end method
 
-.method final sc()J
+.method public final rd()I
+    .locals 1
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dc;->sd()I
+
+    move-result v0
+
+    return v0
+.end method
+
+.method final sa()J
     .locals 6
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -1509,7 +1509,7 @@
 
     if-ge v2, v3, :cond_1
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dc;->sk()B
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dc;->si()B
 
     move-result v3
 
@@ -1533,7 +1533,7 @@
     goto :goto_0
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->ti()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
 
@@ -1546,7 +1546,7 @@
     goto :goto_1
 .end method
 
-.method public final sd()Z
+.method public final sb()Z
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -1570,7 +1570,7 @@
     return v0
 .end method
 
-.method public final se()I
+.method public final sc()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 b0f3bbddbf..38baca4c38 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 atf:[I
+.field static final synthetic atb:[I
 
 
 # direct methods
@@ -19,12 +19,12 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dd;->atf:[I
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dd;->atb:[I
 
     :try_start_0
-    sget-object v0, Lcom/google/android/gms/internal/measurement/dd;->atf:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dd;->atb:[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;->axH: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;->atf:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dd;->atb:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axP: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
 
@@ -54,9 +54,9 @@
 
     :catch_1
     :try_start_2
-    sget-object v0, Lcom/google/android/gms/internal/measurement/dd;->atf:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dd;->atb:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->awy:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->awu: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;->atf:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dd;->atb:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axR: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;
 
     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;->atf:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dd;->atb:[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;->axG: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;->atf:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dd;->atb:[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;->axF: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;->atf:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dd;->atb:[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;->axC: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;->atf:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dd;->atb:[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;->axE: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;->atf:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dd;->atb:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->awz:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->awv: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;->atf:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dd;->atb:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axO: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
 
@@ -182,9 +182,9 @@
 
     :catch_9
     :try_start_a
-    sget-object v0, Lcom/google/android/gms/internal/measurement/dd;->atf:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dd;->atb:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axS: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
 
@@ -198,9 +198,9 @@
 
     :catch_a
     :try_start_b
-    sget-object v0, Lcom/google/android/gms/internal/measurement/dd;->atf:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dd;->atb:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axT: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
 
@@ -214,9 +214,9 @@
 
     :catch_b
     :try_start_c
-    sget-object v0, Lcom/google/android/gms/internal/measurement/dd;->atf:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dd;->atb:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axU: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
 
@@ -230,9 +230,9 @@
 
     :catch_c
     :try_start_d
-    sget-object v0, Lcom/google/android/gms/internal/measurement/dd;->atf:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dd;->atb:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axV: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
 
@@ -246,9 +246,9 @@
 
     :catch_d
     :try_start_e
-    sget-object v0, Lcom/google/android/gms/internal/measurement/dd;->atf:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dd;->atb:[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;->axI: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;->atf:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dd;->atb:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axQ: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
 
@@ -278,9 +278,9 @@
 
     :catch_f
     :try_start_10
-    sget-object v0, Lcom/google/android/gms/internal/measurement/dd;->atf:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dd;->atb:[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;->axD: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 4a457299cb..e5f58512e4 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 anu:I
+.field private anq:I
 
-.field private final aur:Lcom/google/android/gms/internal/measurement/da;
+.field private final aun: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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aun: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-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    iput-object p0, p1, Lcom/google/android/gms/internal/measurement/da;->auo:Lcom/google/android/gms/internal/measurement/de;
+    iput-object p0, p1, Lcom/google/android/gms/internal/measurement/da;->auk: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;->atf:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dd;->atb:[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;->qB()J
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->qz()J
 
     move-result-wide p1
 
@@ -93,7 +93,7 @@
     return-object p1
 
     :pswitch_1
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->rY()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->rW()I
 
     move-result p1
 
@@ -104,14 +104,14 @@
     return-object p1
 
     :pswitch_2
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->sp()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->sn()Ljava/lang/String;
 
     move-result-object p1
 
     return-object p1
 
     :pswitch_3
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->st()J
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->sr()J
 
     move-result-wide p1
 
@@ -122,7 +122,7 @@
     return-object p1
 
     :pswitch_4
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->ss()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->sq()I
 
     move-result p1
 
@@ -133,7 +133,7 @@
     return-object p1
 
     :pswitch_5
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->sb()J
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->rZ()J
 
     move-result-wide p1
 
@@ -144,7 +144,7 @@
     return-object p1
 
     :pswitch_6
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->sa()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->rY()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;->tJ()Lcom/google/android/gms/internal/measurement/fr;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fr;->tH()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;->qV()J
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->qT()J
 
     move-result-wide p1
 
@@ -185,7 +185,7 @@
     return-object p1
 
     :pswitch_9
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->qc()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->qa()I
 
     move-result p1
 
@@ -196,7 +196,7 @@
     return-object p1
 
     :pswitch_a
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->sm()F
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->sk()F
 
     move-result p1
 
@@ -207,7 +207,7 @@
     return-object p1
 
     :pswitch_b
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->sn()J
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->sl()J
 
     move-result-wide p1
 
@@ -218,7 +218,7 @@
     return-object p1
 
     :pswitch_c
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->so()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->sm()I
 
     move-result p1
 
@@ -229,7 +229,7 @@
     return-object p1
 
     :pswitch_d
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->sr()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->sp()I
 
     move-result p1
 
@@ -240,7 +240,7 @@
     return-object p1
 
     :pswitch_e
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->sl()D
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->sj()D
 
     move-result-wide p1
 
@@ -251,14 +251,14 @@
     return-object p1
 
     :pswitch_f
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->sq()Lcom/google/android/gms/internal/measurement/cn;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->so()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;->mS()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->mQ()Z
 
     move-result p1
 
@@ -307,7 +307,7 @@
         }
     .end annotation
 
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/de;->anq: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;->sq()Lcom/google/android/gms/internal/measurement/cn;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->so()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sd()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sb()Z
 
     move-result p1
 
@@ -343,13 +343,13 @@
     return-void
 
     :cond_1
-    iget-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;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->pJ()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->pH()I
 
     move-result p1
 
-    iget p2, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
+    iget p2, p0, Lcom/google/android/gms/internal/measurement/de;->anq: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;->sp()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->sn()Ljava/lang/String;
 
     move-result-object v0
 
     goto :goto_0
 
     :cond_3
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->qZ()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->qX()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sd()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sb()Z
 
     move-result v0
 
@@ -385,13 +385,13 @@
     return-void
 
     :cond_4
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->pJ()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->pH()I
 
     move-result v0
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anq:I
 
     if-eq v0, v1, :cond_2
 
@@ -400,7 +400,7 @@
     return-void
 
     :cond_5
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()Lcom/google/android/gms/internal/measurement/eg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tj()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;->tm()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 p0
 
@@ -450,7 +450,7 @@
     return-void
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tm()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 p0
 
@@ -465,7 +465,7 @@
         }
     .end annotation
 
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/de;->anq:I
 
     and-int/lit8 v0, v0, 0x7
 
@@ -474,7 +474,7 @@
     return-void
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()Lcom/google/android/gms/internal/measurement/eg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tj()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->se()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sc()I
 
     move-result v0
 
@@ -500,7 +500,7 @@
     return-void
 
     :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;->te()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rW()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rU()I
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aun: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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    iget v2, v2, Lcom/google/android/gms/internal/measurement/da;->anu:I
+    iget v2, v2, Lcom/google/android/gms/internal/measurement/da;->anq:I
 
     if-ge v1, v2, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aun: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;->rC()Ljava/lang/Object;
+    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/fw;->rA()Ljava/lang/Object;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/de;->aun: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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aun: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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aun: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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aun: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;->anu:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anq: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;->rC()Ljava/lang/Object;
+    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/fw;->rA()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;->anu:I
+    iget p1, p0, Lcom/google/android/gms/internal/measurement/de;->anq: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;->tm()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
 
@@ -697,7 +697,7 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/dz;
 
-    iget p1, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
+    iget p1, p0, Lcom/google/android/gms/internal/measurement/de;->anq: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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rY()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sd()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sb()Z
 
     move-result p1
 
@@ -725,13 +725,13 @@
     return-void
 
     :cond_1
-    iget-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;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->pJ()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->pH()I
 
     move-result p1
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anq:I
 
     if-eq p1, v1, :cond_0
 
@@ -740,41 +740,41 @@
     return-void
 
     :cond_2
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()Lcom/google/android/gms/internal/measurement/eg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tj()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rW()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rU()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->se()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->sc()I
 
     move-result v1
 
     add-int v3, v1, p1
 
     :cond_4
-    iget-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;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rY()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->se()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sc()I
 
     move-result p1
 
@@ -783,7 +783,7 @@
     return-void
 
     :cond_5
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/de;->anq: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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rY()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rW()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sd()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sb()Z
 
     move-result v0
 
@@ -815,13 +815,13 @@
     return-void
 
     :cond_7
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->pJ()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->pH()I
 
     move-result v0
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anq:I
 
     if-eq v0, v1, :cond_6
 
@@ -830,33 +830,33 @@
     return-void
 
     :cond_8
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()Lcom/google/android/gms/internal/measurement/eg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tj()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rW()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rU()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->se()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->sc()I
 
     move-result v1
 
     add-int/2addr v1, v0
 
     :cond_a
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rY()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rW()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->se()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sc()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;->anu:I
+    iget p1, p0, Lcom/google/android/gms/internal/measurement/de;->anq: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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rW()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rU()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->se()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->sc()I
 
     move-result v1
 
     add-int/2addr v1, p1
 
     :cond_0
-    iget-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;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rZ()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rX()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->se()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sc()I
 
     move-result p1
 
@@ -950,24 +950,24 @@
     return-void
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()Lcom/google/android/gms/internal/measurement/eg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tj()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rZ()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rX()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sd()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sb()Z
 
     move-result p1
 
@@ -976,13 +976,13 @@
     return-void
 
     :cond_3
-    iget-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;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->pJ()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->pH()I
 
     move-result p1
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anq: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;->anu:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/de;->anq: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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rW()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rU()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->se()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->sc()I
 
     move-result v1
 
     add-int/2addr v1, v0
 
     :cond_5
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rZ()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rX()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->se()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sc()I
 
     move-result v0
 
@@ -1039,16 +1039,16 @@
     return-void
 
     :cond_6
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()Lcom/google/android/gms/internal/measurement/eg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tj()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rZ()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rX()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sd()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sb()Z
 
     move-result v0
 
@@ -1069,13 +1069,13 @@
     return-void
 
     :cond_8
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->pJ()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->pH()I
 
     move-result v0
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anq: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;->anu:I
+    iget p1, p0, Lcom/google/android/gms/internal/measurement/de;->anq: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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rW()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rU()I
 
     move-result p1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->se()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->sc()I
 
     move-result v1
 
     add-int/2addr v1, p1
 
     :cond_0
-    iget-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;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sa()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->se()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sc()I
 
     move-result p1
 
@@ -1155,24 +1155,24 @@
     return-void
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()Lcom/google/android/gms/internal/measurement/eg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tj()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sa()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sd()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sb()Z
 
     move-result p1
 
@@ -1181,13 +1181,13 @@
     return-void
 
     :cond_3
-    iget-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;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->pJ()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->pH()I
 
     move-result p1
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anq: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;->anu:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/de;->anq: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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rW()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rU()I
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->se()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->sc()I
 
     move-result v1
 
     add-int/2addr v1, v0
 
     :cond_5
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sa()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rY()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->se()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sc()I
 
     move-result v0
 
@@ -1244,16 +1244,16 @@
     return-void
 
     :cond_6
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()Lcom/google/android/gms/internal/measurement/eg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tj()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sa()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rY()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sd()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sb()Z
 
     move-result v0
 
@@ -1274,13 +1274,13 @@
     return-void
 
     :cond_8
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->pJ()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->pH()I
 
     move-result v0
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anq: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;->anu:I
+    iget p1, p0, Lcom/google/android/gms/internal/measurement/de;->anq: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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rW()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rU()I
 
     move-result p1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->se()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->sc()I
 
     move-result v1
 
     add-int/2addr v1, p1
 
     :cond_0
-    iget-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;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sb()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->se()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sc()I
 
     move-result p1
 
@@ -1360,24 +1360,24 @@
     return-void
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()Lcom/google/android/gms/internal/measurement/eg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tj()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sb()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sd()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sb()Z
 
     move-result p1
 
@@ -1386,13 +1386,13 @@
     return-void
 
     :cond_3
-    iget-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;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->pJ()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->pH()I
 
     move-result p1
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anq: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;->anu:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/de;->anq: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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rW()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rU()I
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->se()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->sc()I
 
     move-result v1
 
     add-int/2addr v1, v0
 
     :cond_5
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sb()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rZ()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->se()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sc()I
 
     move-result v0
 
@@ -1449,16 +1449,16 @@
     return-void
 
     :cond_6
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()Lcom/google/android/gms/internal/measurement/eg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tj()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sb()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rZ()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sd()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sb()Z
 
     move-result v0
 
@@ -1479,13 +1479,13 @@
     return-void
 
     :cond_8
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->pJ()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->pH()I
 
     move-result v0
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anq:I
 
     if-eq v0, v1, :cond_7
 
@@ -1547,7 +1547,7 @@
         }
     .end annotation
 
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/de;->anq: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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->sd()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->sb()Z
 
     move-result v1
 
@@ -1577,9 +1577,9 @@
     goto :goto_0
 
     :cond_1
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->pJ()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->pH()I
 
     move-result v1
 
@@ -1592,7 +1592,7 @@
     return-void
 
     :cond_3
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()Lcom/google/android/gms/internal/measurement/eg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tj()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->rW()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->rU()I
 
     move-result v1
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/de;->aun: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;->atN:Ljava/lang/Object;
+    iget-object v2, p2, Lcom/google/android/gms/internal/measurement/ex;->atJ:Ljava/lang/Object;
 
-    iget-object v3, p2, Lcom/google/android/gms/internal/measurement/ex;->atY:Ljava/lang/Object;
+    iget-object v3, p2, Lcom/google/android/gms/internal/measurement/ex;->atU:Ljava/lang/Object;
 
     :goto_0
     :try_start_0
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->pJ()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->pH()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/da;->sd()Z
+    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/da;->sb()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;->nO()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->nM()Z
 
     move-result v4
 
@@ -1694,9 +1694,9 @@
     throw v4
 
     :cond_1
-    iget-object v4, p2, Lcom/google/android/gms/internal/measurement/ex;->awz:Lcom/google/android/gms/internal/measurement/he;
+    iget-object v4, p2, Lcom/google/android/gms/internal/measurement/ex;->awv:Lcom/google/android/gms/internal/measurement/he;
 
-    iget-object v5, p2, Lcom/google/android/gms/internal/measurement/ex;->atY:Ljava/lang/Object;
+    iget-object v5, p2, Lcom/google/android/gms/internal/measurement/ex;->atU: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;->awy:Lcom/google/android/gms/internal/measurement/he;
+    iget-object v4, p2, Lcom/google/android/gms/internal/measurement/ex;->awu: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;->nO()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->nM()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aun: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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p2, p0, Lcom/google/android/gms/internal/measurement/de;->aun: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;->anu:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/de;->anq: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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->sd()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->sb()Z
 
     move-result v1
 
@@ -1849,9 +1849,9 @@
     goto :goto_0
 
     :cond_1
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->pJ()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->pH()I
 
     move-result v1
 
@@ -1864,7 +1864,7 @@
     return-void
 
     :cond_3
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()Lcom/google/android/gms/internal/measurement/eg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tj()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;->anu:I
+    iget p1, p0, Lcom/google/android/gms/internal/measurement/de;->anq: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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rW()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rU()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->se()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->sc()I
 
     move-result v1
 
     add-int/2addr v1, p1
 
     :cond_0
-    iget-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;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rQ()D
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rO()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->se()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sc()I
 
     move-result p1
 
@@ -1950,24 +1950,24 @@
     return-void
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()Lcom/google/android/gms/internal/measurement/eg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tj()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rQ()D
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rO()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sd()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sb()Z
 
     move-result p1
 
@@ -1976,13 +1976,13 @@
     return-void
 
     :cond_3
-    iget-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;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->pJ()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->pH()I
 
     move-result p1
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anq: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;->anu:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/de;->anq: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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rW()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rU()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->se()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->sc()I
 
     move-result v1
 
     add-int/2addr v1, v0
 
     :cond_5
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rQ()D
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rO()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->se()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sc()I
 
     move-result v0
 
@@ -2039,16 +2039,16 @@
     return-void
 
     :cond_6
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()Lcom/google/android/gms/internal/measurement/eg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tj()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rQ()D
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rO()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sd()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sb()Z
 
     move-result v0
 
@@ -2069,13 +2069,13 @@
     return-void
 
     :cond_8
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->pJ()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->pH()I
 
     move-result v0
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anq:I
 
     if-eq v0, v1, :cond_7
 
@@ -2084,7 +2084,7 @@
     return-void
 .end method
 
-.method public final mS()Z
+.method public final mQ()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rT()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rR()Z
 
     move-result v0
 
     return v0
 .end method
 
-.method public final nO()Z
+.method public final nM()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sd()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sb()Z
 
     move-result v0
 
     if-nez v0, :cond_1
 
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/de;->anq: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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aun: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;->anu:I
+    iget p1, p0, Lcom/google/android/gms/internal/measurement/de;->anq: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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rR()F
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rP()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sd()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sb()Z
 
     move-result p1
 
@@ -2202,13 +2202,13 @@
     return-void
 
     :cond_1
-    iget-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;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->pJ()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->pH()I
 
     move-result p1
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anq:I
 
     if-eq p1, v1, :cond_0
 
@@ -2217,41 +2217,41 @@
     return-void
 
     :cond_2
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()Lcom/google/android/gms/internal/measurement/eg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tj()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rW()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rU()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->se()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->sc()I
 
     move-result v1
 
     add-int v3, v1, p1
 
     :cond_4
-    iget-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;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rR()F
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rP()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->se()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sc()I
 
     move-result p1
 
@@ -2260,7 +2260,7 @@
     return-void
 
     :cond_5
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/de;->anq: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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rR()F
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rP()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sd()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sb()Z
 
     move-result v0
 
@@ -2292,13 +2292,13 @@
     return-void
 
     :cond_7
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->pJ()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->pH()I
 
     move-result v0
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anq:I
 
     if-eq v0, v1, :cond_6
 
@@ -2307,33 +2307,33 @@
     return-void
 
     :cond_8
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()Lcom/google/android/gms/internal/measurement/eg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tj()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rW()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rU()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->se()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->sc()I
 
     move-result v1
 
     add-int/2addr v1, v0
 
     :cond_a
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rR()F
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rP()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->se()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sc()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;->anu:I
+    iget p1, p0, Lcom/google/android/gms/internal/measurement/de;->anq: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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rW()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rU()I
 
     move-result p1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->se()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->sc()I
 
     move-result v1
 
     add-int/2addr v1, p1
 
     :cond_0
-    iget-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;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rS()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rQ()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->se()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sc()I
 
     move-result p1
 
@@ -2425,24 +2425,24 @@
     return-void
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()Lcom/google/android/gms/internal/measurement/eg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tj()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rS()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rQ()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sd()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sb()Z
 
     move-result p1
 
@@ -2451,13 +2451,13 @@
     return-void
 
     :cond_3
-    iget-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;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->pJ()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->pH()I
 
     move-result p1
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anq: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;->anu:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/de;->anq: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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rW()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rU()I
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->se()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->sc()I
 
     move-result v1
 
     add-int/2addr v1, v0
 
     :cond_5
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rS()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rQ()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->se()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sc()I
 
     move-result v0
 
@@ -2514,16 +2514,16 @@
     return-void
 
     :cond_6
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()Lcom/google/android/gms/internal/measurement/eg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tj()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rS()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rQ()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sd()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sb()Z
 
     move-result v0
 
@@ -2544,13 +2544,13 @@
     return-void
 
     :cond_8
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->pJ()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->pH()I
 
     move-result v0
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anq:I
 
     if-eq v0, v1, :cond_7
 
@@ -2559,7 +2559,7 @@
     return-void
 .end method
 
-.method public final pJ()I
+.method public final pH()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;->anu:I
+    iput v0, p0, Lcom/google/android/gms/internal/measurement/de;->anq: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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->pJ()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->pH()I
 
     move-result v0
 
-    iput v0, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
+    iput v0, p0, Lcom/google/android/gms/internal/measurement/de;->anq:I
 
     :goto_0
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/de;->anq:I
 
     if-eqz v0, :cond_2
 
@@ -2611,10 +2611,10 @@
     return v0
 .end method
 
-.method public final pK()I
+.method public final pI()I
     .locals 1
 
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/de;->anq:I
 
     return v0
 .end method
@@ -2646,7 +2646,7 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/eu;
 
-    iget p1, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
+    iget p1, p0, Lcom/google/android/gms/internal/measurement/de;->anq:I
 
     and-int/lit8 p1, p1, 0x7
 
@@ -2654,32 +2654,32 @@
 
     if-ne p1, v1, :cond_1
 
-    iget-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;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rW()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rU()I
 
     move-result p1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->se()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->sc()I
 
     move-result v1
 
     add-int/2addr v1, p1
 
     :cond_0
-    iget-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;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->qA()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->qy()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->se()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sc()I
 
     move-result p1
 
@@ -2690,24 +2690,24 @@
     return-void
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()Lcom/google/android/gms/internal/measurement/eg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tj()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->qA()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->qy()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sd()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sb()Z
 
     move-result p1
 
@@ -2716,13 +2716,13 @@
     return-void
 
     :cond_3
-    iget-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;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->pJ()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->pH()I
 
     move-result p1
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anq:I
 
     if-eq p1, v1, :cond_2
 
@@ -2731,7 +2731,7 @@
     return-void
 
     :cond_4
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/de;->anq:I
 
     and-int/lit8 v0, v0, 0x7
 
@@ -2739,24 +2739,24 @@
 
     if-ne v0, v1, :cond_6
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rW()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rU()I
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->se()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->sc()I
 
     move-result v1
 
     add-int/2addr v1, v0
 
     :cond_5
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->qA()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->qy()J
 
     move-result-wide v2
 
@@ -2766,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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->se()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sc()I
 
     move-result v0
 
@@ -2779,16 +2779,16 @@
     return-void
 
     :cond_6
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()Lcom/google/android/gms/internal/measurement/eg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tj()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->qA()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->qy()J
 
     move-result-wide v0
 
@@ -2798,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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sd()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sb()Z
 
     move-result v0
 
@@ -2809,13 +2809,13 @@
     return-void
 
     :cond_8
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->pJ()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->pH()I
 
     move-result v0
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anq:I
 
     if-eq v0, v1, :cond_7
 
@@ -2824,7 +2824,7 @@
     return-void
 .end method
 
-.method public final qB()J
+.method public final qT()J
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -2836,37 +2836,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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rS()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->qy()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
-
-    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;
+.method public final qX()Ljava/lang/String;
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -2878,16 +2857,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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->mQ()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->mO()Ljava/lang/String;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final qc()I
+.method public final qa()I
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -2899,15 +2878,36 @@
 
     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;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rf()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rd()I
 
     move-result v0
 
     return v0
 .end method
 
+.method public final qz()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;->aun:Lcom/google/android/gms/internal/measurement/da;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rQ()J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
+
 .method public final r(Ljava/util/List;)V
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
@@ -2935,7 +2935,7 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/dz;
 
-    iget p1, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
+    iget p1, p0, Lcom/google/android/gms/internal/measurement/de;->anq: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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rW()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rU()I
 
     move-result p1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->se()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->sc()I
 
     move-result v1
 
     add-int/2addr v1, p1
 
     :cond_0
-    iget-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;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rf()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rd()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->se()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sc()I
 
     move-result p1
 
@@ -2979,24 +2979,24 @@
     return-void
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()Lcom/google/android/gms/internal/measurement/eg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tj()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rf()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rd()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sd()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sb()Z
 
     move-result p1
 
@@ -3005,13 +3005,13 @@
     return-void
 
     :cond_3
-    iget-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;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->pJ()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->pH()I
 
     move-result p1
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anq: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;->anu:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/de;->anq: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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rW()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rU()I
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->se()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->sc()I
 
     move-result v1
 
     add-int/2addr v1, v0
 
     :cond_5
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rf()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rd()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->se()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sc()I
 
     move-result v0
 
@@ -3068,16 +3068,16 @@
     return-void
 
     :cond_6
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()Lcom/google/android/gms/internal/measurement/eg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tj()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rf()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rd()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sd()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sb()Z
 
     move-result v0
 
@@ -3098,13 +3098,13 @@
     return-void
 
     :cond_8
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->pJ()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->pH()I
 
     move-result v0
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anq:I
 
     if-eq v0, v1, :cond_7
 
@@ -3113,7 +3113,7 @@
     return-void
 .end method
 
-.method public final rY()I
+.method public final rW()I
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -3125,7 +3125,28 @@
 
     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;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rU()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
+
+    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;->aun:Lcom/google/android/gms/internal/measurement/da;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rW()I
 
@@ -3134,6 +3155,27 @@
     return v0
 .end method
 
+.method public final rZ()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;->aun:Lcom/google/android/gms/internal/measurement/da;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rX()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;
@@ -3163,7 +3205,7 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/eu;
 
-    iget p1, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
+    iget p1, p0, Lcom/google/android/gms/internal/measurement/de;->anq:I
 
     and-int/lit8 p1, p1, 0x7
 
@@ -3171,34 +3213,34 @@
 
     if-ne p1, v1, :cond_1
 
-    iget-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;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rW()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rU()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->se()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->sc()I
 
     move-result v1
 
     add-int/2addr v1, p1
 
     :cond_0
-    iget-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;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->qV()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->qT()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->se()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sc()I
 
     move-result p1
 
@@ -3207,24 +3249,24 @@
     return-void
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()Lcom/google/android/gms/internal/measurement/eg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tj()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->qV()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->qT()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sd()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sb()Z
 
     move-result p1
 
@@ -3233,13 +3275,13 @@
     return-void
 
     :cond_3
-    iget-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;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->pJ()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->pH()I
 
     move-result p1
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anq:I
 
     if-eq p1, v1, :cond_2
 
@@ -3248,7 +3290,7 @@
     return-void
 
     :cond_4
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/de;->anq:I
 
     and-int/lit8 v0, v0, 0x7
 
@@ -3256,26 +3298,26 @@
 
     if-ne v0, v1, :cond_6
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rW()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rU()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->se()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->sc()I
 
     move-result v1
 
     add-int/2addr v1, v0
 
     :cond_5
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->qV()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->qT()J
 
     move-result-wide v2
 
@@ -3285,9 +3327,9 @@
 
     invoke-interface {p1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->se()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sc()I
 
     move-result v0
 
@@ -3296,16 +3338,16 @@
     return-void
 
     :cond_6
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()Lcom/google/android/gms/internal/measurement/eg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tj()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->qV()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->qT()J
 
     move-result-wide v0
 
@@ -3315,9 +3357,9 @@
 
     invoke-interface {p1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sd()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sb()Z
 
     move-result v0
 
@@ -3326,13 +3368,13 @@
     return-void
 
     :cond_8
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->pJ()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->pH()I
 
     move-result v0
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anq:I
 
     if-eq v0, v1, :cond_7
 
@@ -3341,7 +3383,28 @@
     return-void
 .end method
 
-.method public final sa()I
+.method public final sj()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;->aun:Lcom/google/android/gms/internal/measurement/da;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rO()D
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
+
+.method public final sk()F
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -3353,7 +3416,133 @@
 
     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;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rP()F
+
+    move-result v0
+
+    return v0
+.end method
+
+.method public final sl()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;->aun:Lcom/google/android/gms/internal/measurement/da;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->qT()J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
+
+.method public final sm()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;->aun:Lcom/google/android/gms/internal/measurement/da;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->qa()I
+
+    move-result v0
+
+    return v0
+.end method
+
+.method public final sn()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;->aun:Lcom/google/android/gms/internal/measurement/da;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rS()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final so()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;->aun:Lcom/google/android/gms/internal/measurement/da;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rT()Lcom/google/android/gms/internal/measurement/cn;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final sp()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;->aun: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 sq()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;->aun:Lcom/google/android/gms/internal/measurement/da;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rY()I
 
@@ -3362,7 +3551,7 @@
     return v0
 .end method
 
-.method public final sb()J
+.method public final sr()J
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -3370,11 +3559,11 @@
         }
     .end annotation
 
-    const/4 v0, 0x1
+    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;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rZ()J
 
@@ -3383,195 +3572,6 @@
     return-wide v0
 .end method
 
-.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 = {
-            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;->aur:Lcom/google/android/gms/internal/measurement/da;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rR()F
-
-    move-result v0
-
-    return v0
-.end method
-
-.method public final sn()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;->aur:Lcom/google/android/gms/internal/measurement/da;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->qV()J
-
-    move-result-wide v0
-
-    return-wide v0
-.end method
-
-.method public final so()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;->aur:Lcom/google/android/gms/internal/measurement/da;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->qc()I
-
-    move-result v0
-
-    return v0
-.end method
-
-.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 = {
-            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;->rX()I
-
-    move-result v0
-
-    return v0
-.end method
-
-.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 = {
-            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;->sb()J
-
-    move-result-wide v0
-
-    return-wide v0
-.end method
-
 .method public final t(Ljava/util/List;)V
     .locals 4
     .annotation system Ldalvik/annotation/Signature;
@@ -3601,7 +3601,7 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/dz;
 
-    iget p1, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
+    iget p1, p0, Lcom/google/android/gms/internal/measurement/de;->anq: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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->qc()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->qa()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sd()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sb()Z
 
     move-result p1
 
@@ -3629,13 +3629,13 @@
     return-void
 
     :cond_1
-    iget-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;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->pJ()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->pH()I
 
     move-result p1
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anq:I
 
     if-eq p1, v1, :cond_0
 
@@ -3644,41 +3644,41 @@
     return-void
 
     :cond_2
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()Lcom/google/android/gms/internal/measurement/eg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tj()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rW()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rU()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->se()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->sc()I
 
     move-result v1
 
     add-int v3, v1, p1
 
     :cond_4
-    iget-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;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->qc()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->qa()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->se()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sc()I
 
     move-result p1
 
@@ -3687,7 +3687,7 @@
     return-void
 
     :cond_5
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/de;->anq: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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->qc()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->qa()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sd()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sb()Z
 
     move-result v0
 
@@ -3719,13 +3719,13 @@
     return-void
 
     :cond_7
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->pJ()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->pH()I
 
     move-result v0
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anq:I
 
     if-eq v0, v1, :cond_6
 
@@ -3734,33 +3734,33 @@
     return-void
 
     :cond_8
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()Lcom/google/android/gms/internal/measurement/eg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tj()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rW()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rU()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->se()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->sc()I
 
     move-result v1
 
     add-int/2addr v1, v0
 
     :cond_a
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->qc()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->qa()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->se()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sc()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;->anu:I
+    iget p1, p0, Lcom/google/android/gms/internal/measurement/de;->anq: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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rW()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rU()I
 
     move-result p1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->se()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->sc()I
 
     move-result v1
 
     add-int/2addr v1, p1
 
     :cond_0
-    iget-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;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rT()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rR()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->se()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sc()I
 
     move-result p1
 
@@ -3852,24 +3852,24 @@
     return-void
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()Lcom/google/android/gms/internal/measurement/eg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tj()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rT()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rR()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sd()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sb()Z
 
     move-result p1
 
@@ -3878,13 +3878,13 @@
     return-void
 
     :cond_3
-    iget-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;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->pJ()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->pH()I
 
     move-result p1
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anq: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;->anu:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/de;->anq: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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rW()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rU()I
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->se()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->sc()I
 
     move-result v1
 
     add-int/2addr v1, v0
 
     :cond_5
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rT()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rR()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->se()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sc()I
 
     move-result v0
 
@@ -3941,16 +3941,16 @@
     return-void
 
     :cond_6
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()Lcom/google/android/gms/internal/measurement/eg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tj()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rT()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rR()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sd()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sb()Z
 
     move-result v0
 
@@ -3971,13 +3971,13 @@
     return-void
 
     :cond_8
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->pJ()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->pH()I
 
     move-result v0
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anq:I
 
     if-eq v0, v1, :cond_7
 
@@ -4051,7 +4051,7 @@
         }
     .end annotation
 
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/de;->anq: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;->sq()Lcom/google/android/gms/internal/measurement/cn;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->so()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sd()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sb()Z
 
     move-result v0
 
@@ -4077,13 +4077,13 @@
     return-void
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->pJ()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->pH()I
 
     move-result v0
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anq:I
 
     if-eq v0, v1, :cond_0
 
@@ -4092,7 +4092,7 @@
     return-void
 
     :cond_2
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()Lcom/google/android/gms/internal/measurement/eg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tj()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;->anu:I
+    iget p1, p0, Lcom/google/android/gms/internal/measurement/de;->anq: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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rW()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rU()I
 
     move-result p1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->se()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->sc()I
 
     move-result v1
 
     add-int/2addr v1, p1
 
     :cond_0
-    iget-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;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rW()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rU()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->se()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sc()I
 
     move-result p1
 
@@ -4176,24 +4176,24 @@
     return-void
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()Lcom/google/android/gms/internal/measurement/eg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tj()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rW()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rU()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sd()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sb()Z
 
     move-result p1
 
@@ -4202,13 +4202,13 @@
     return-void
 
     :cond_3
-    iget-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;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->pJ()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->pH()I
 
     move-result p1
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anq: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;->anu:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/de;->anq: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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rW()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rU()I
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->se()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->sc()I
 
     move-result v1
 
     add-int/2addr v1, v0
 
     :cond_5
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rW()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rU()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->se()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sc()I
 
     move-result v0
 
@@ -4265,16 +4265,16 @@
     return-void
 
     :cond_6
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()Lcom/google/android/gms/internal/measurement/eg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tj()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rW()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rU()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sd()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sb()Z
 
     move-result v0
 
@@ -4295,13 +4295,13 @@
     return-void
 
     :cond_8
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->pJ()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->pH()I
 
     move-result v0
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anq: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;->anu:I
+    iget p1, p0, Lcom/google/android/gms/internal/measurement/de;->anq: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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rW()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rU()I
 
     move-result p1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->se()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->sc()I
 
     move-result v1
 
     add-int/2addr v1, p1
 
     :cond_0
-    iget-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;->aun: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;->rV()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->se()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sc()I
 
     move-result p1
 
@@ -4381,24 +4381,24 @@
     return-void
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()Lcom/google/android/gms/internal/measurement/eg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tj()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aun: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;->rV()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sd()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sb()Z
 
     move-result p1
 
@@ -4407,13 +4407,13 @@
     return-void
 
     :cond_3
-    iget-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;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->pJ()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->pH()I
 
     move-result p1
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anq: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;->anu:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/de;->anq: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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rW()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rU()I
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->se()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->sc()I
 
     move-result v1
 
     add-int/2addr v1, v0
 
     :cond_5
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun: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;->rV()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->se()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sc()I
 
     move-result v0
 
@@ -4470,16 +4470,16 @@
     return-void
 
     :cond_6
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()Lcom/google/android/gms/internal/measurement/eg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tj()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun: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;->rV()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;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sd()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sb()Z
 
     move-result v0
 
@@ -4500,13 +4500,13 @@
     return-void
 
     :cond_8
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aun:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->pJ()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->pH()I
 
     move-result v0
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anq: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 dead2b3aeb..2afb446d95 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;->nO()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/df;->nM()Z
 
     move-result v0
 
@@ -236,7 +236,7 @@
 
     if-eqz v0, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/df;->pJ()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/df;->pH()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;->rK()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cf;->rI()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;->aut:Lcom/google/android/gms/internal/measurement/dh;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/df$b;->aup: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;->pJ()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cn;->pH()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;->pJ()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/df;->pH()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;->pJ()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/df;->pH()I
 
     move-result v3
 
@@ -843,7 +843,7 @@
         }
     .end annotation
 
-    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/fg;->sT()I
+    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/fg;->sR()I
 
     move-result v0
 
@@ -862,19 +862,19 @@
         }
     .end annotation
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/df;->nO()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/df;->nM()Z
 
     move-result v0
 
     if-eqz v0, :cond_4
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ck;->pH()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ck;->pF()Z
 
     move-result v0
 
     if-nez v0, :cond_4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/df;->pJ()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/df;->pH()I
 
     move-result v0
 
@@ -1460,7 +1460,7 @@
     return-void
 .end method
 
-.method public final pJ()I
+.method public final pH()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 4a5a26aaea..013f4ebb4a 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 asH:Z
+.field private static final asD:Z
 
-.field private static final aus:Ljava/util/logging/Logger;
+.field private static final auo:Ljava/util/logging/Logger;
 
 
 # instance fields
-.field aut:Lcom/google/android/gms/internal/measurement/dh;
+.field aup: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;->aus:Ljava/util/logging/Logger;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/df;->auo:Ljava/util/logging/Logger;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gu;->pH()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gu;->pF()Z
 
     move-result v0
 
-    sput-boolean v0, Lcom/google/android/gms/internal/measurement/df;->asH:Z
+    sput-boolean v0, Lcom/google/android/gms/internal/measurement/df;->asD:Z
 
     return-void
 .end method
@@ -264,7 +264,7 @@
 
     move-result p0
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/el;->pK()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/el;->pI()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;->pK()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/el;->pI()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;->rK()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cf;->rI()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;->pJ()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cn;->pH()I
 
     move-result p0
 
@@ -529,7 +529,7 @@
 
     move-result p0
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cn;->pJ()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cn;->pH()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;->rK()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cf;->rI()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;->sT()I
+    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/fg;->sR()I
 
     move-result p0
 
@@ -701,7 +701,7 @@
     goto :goto_0
 
     :catch_0
-    sget-object v0, Lcom/google/android/gms/internal/measurement/dy;->avT:Ljava/nio/charset/Charset;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dy;->avP: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;->sT()I
+    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/fg;->sR()I
 
     move-result p0
 
@@ -871,10 +871,10 @@
     return p0
 .end method
 
-.method static synthetic nO()Z
+.method static synthetic nM()Z
     .locals 1
 
-    sget-boolean v0, Lcom/google/android/gms/internal/measurement/df;->asH:Z
+    sget-boolean v0, Lcom/google/android/gms/internal/measurement/df;->asD:Z
 
     return v0
 .end method
@@ -905,10 +905,18 @@
     return v0
 .end method
 
-.method public static sA()I
+.method public static ss()I
     .locals 1
 
-    const/4 v0, 0x1
+    const/4 v0, 0x4
+
+    return v0
+.end method
+
+.method public static st()I
+    .locals 1
+
+    const/4 v0, 0x4
 
     return v0
 .end method
@@ -916,7 +924,7 @@
 .method public static su()I
     .locals 1
 
-    const/4 v0, 0x4
+    const/16 v0, 0x8
 
     return v0
 .end method
@@ -924,7 +932,7 @@
 .method public static sv()I
     .locals 1
 
-    const/4 v0, 0x4
+    const/16 v0, 0x8
 
     return v0
 .end method
@@ -932,7 +940,7 @@
 .method public static sw()I
     .locals 1
 
-    const/16 v0, 0x8
+    const/4 v0, 0x4
 
     return v0
 .end method
@@ -948,15 +956,7 @@
 .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
+    const/4 v0, 0x1
 
     return v0
 .end method
@@ -1086,7 +1086,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/df;->aus:Ljava/util/logging/Logger;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/df;->auo: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;->avT:Ljava/nio/charset/Charset;
+    sget-object p2, Lcom/google/android/gms/internal/measurement/dy;->avP: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 pG()V
+.method public final pE()V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/df;->pJ()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/df;->pH()I
 
     move-result v0
 
@@ -1322,7 +1322,7 @@
     throw v0
 .end method
 
-.method public abstract pJ()I
+.method public abstract pH()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 f30440bded..ca152f4095 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 auu:Lcom/google/android/gms/internal/measurement/dg;
+.field private static final auq:Lcom/google/android/gms/internal/measurement/dg;
 
 
 # instance fields
-.field private auv:[D
+.field private aur:[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;->auu:Lcom/google/android/gms/internal/measurement/dg;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dg;->auq:Lcom/google/android/gms/internal/measurement/dg;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ch;->rM()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ch;->rK()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;->auv:[D
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/dg;->aur:[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;->rA()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->ry()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;->auv:[D
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/dg;->aur:[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;->auv:[D
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/dg;->aur:[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;->auv:[D
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/dg;->aur:[D
 
     :goto_0
-    iget-object p2, p0, Lcom/google/android/gms/internal/measurement/dg;->auv:[D
+    iget-object p2, p0, Lcom/google/android/gms/internal/measurement/dg;->aur:[D
 
     aput-wide v0, p2, p1
 
@@ -248,7 +248,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rA()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->ry()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;->auv:[D
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dg;->aur:[D
 
     array-length v2, v0
 
@@ -294,12 +294,12 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/dg;->auv:[D
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/dg;->aur:[D
 
     :cond_2
-    iget-object v0, p1, Lcom/google/android/gms/internal/measurement/dg;->auv:[D
+    iget-object v0, p1, Lcom/google/android/gms/internal/measurement/dg;->aur:[D
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/dg;->auv:[D
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/dg;->aur:[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;->auv:[D
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dg;->aur:[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;->rA()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->ry()V
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/dg;->zzc:I
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dg;->auv:[D
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dg;->aur:[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;->auv:[D
+    iput-object v2, p0, Lcom/google/android/gms/internal/measurement/dg;->aur:[D
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dg;->auv:[D
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dg;->aur:[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;->auv:[D
+    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/dg;->aur:[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;->auv:[D
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/dg;->aur:[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;->auv:[D
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dg;->aur:[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;->auv:[D
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/dg;->aur:[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;->rA()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->ry()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;->auv:[D
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dg;->aur:[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;->rA()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->ry()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;->auv:[D
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/dg;->aur:[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;->auv:[D
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dg;->aur:[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;->rA()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->ry()V
 
     if-lt p2, p1, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dg;->auv:[D
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dg;->aur:[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;->rA()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->ry()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;->auv:[D
+    iget-object p2, p0, Lcom/google/android/gms/internal/measurement/dg;->aur:[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 dc516d2675..b47f3a0b6e 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 aun:Lcom/google/android/gms/internal/measurement/df;
+.field private final auj: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;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->auj: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;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->auj:Lcom/google/android/gms/internal/measurement/df;
 
-    iput-object p0, p1, Lcom/google/android/gms/internal/measurement/df;->aut:Lcom/google/android/gms/internal/measurement/dh;
+    iput-object p0, p1, Lcom/google/android/gms/internal/measurement/df;->aup: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;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->auj: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;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->auj: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;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->auj: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;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->auj: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;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->auj: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;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->auj: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;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dh;->auj: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;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dh;->auj: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;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dh;->auj: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;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->auj: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;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/dh;->auj: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;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/dh;->auj: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;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->auj: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;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->auj: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;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->auj: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;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->auj: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;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->auj: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;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->auj: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;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->auj: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;->aut:Lcom/google/android/gms/internal/measurement/dh;
+    iget-object v1, v0, Lcom/google/android/gms/internal/measurement/df;->aup: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;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dh;->auj: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;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->auj: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;->su()I
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/df;->ss()I
 
     move-result v1
 
@@ -662,7 +662,7 @@
     goto :goto_0
 
     :cond_0
-    iget-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;->auj: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;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->auj: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;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->auj: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;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->auj: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;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->auj: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;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->auj: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;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->auj: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;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->auj: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;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->auj: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;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->auj: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;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->auj: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;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->auj: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;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->auj: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;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->auj: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;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->auj: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;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->auj: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;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->auj: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;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->auj: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;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->auj: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;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->auj: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;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->auj: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;->sw()I
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/df;->su()I
 
     move-result v1
 
@@ -1162,7 +1162,7 @@
     goto :goto_0
 
     :cond_0
-    iget-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;->auj: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;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->auj: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;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->auj: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;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->auj: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;->sy()I
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/df;->sw()I
 
     move-result v1
 
@@ -1281,7 +1281,7 @@
     goto :goto_0
 
     :cond_0
-    iget-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;->auj: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;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->auj: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;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->auj: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;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->auj: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;->sz()I
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/df;->sx()I
 
     move-result v1
 
@@ -1400,7 +1400,7 @@
     goto :goto_0
 
     :cond_0
-    iget-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;->auj: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;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->auj: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;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->auj: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;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->auj: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;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->auj: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;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->auj: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;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->auj: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;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->auj: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;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->auj: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;->sA()I
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/df;->sy()I
 
     move-result v1
 
@@ -1655,7 +1655,7 @@
     goto :goto_0
 
     :cond_0
-    iget-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;->auj: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;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->auj: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;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->auj: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;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->auj: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;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->auj: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;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->auj: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;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->auj: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;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->auj: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;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->auj: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;->sv()I
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/df;->st()I
 
     move-result v1
 
@@ -1910,7 +1910,7 @@
     goto :goto_0
 
     :cond_0
-    iget-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;->auj: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;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->auj: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;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->auj: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;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->auj: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;->sx()I
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/df;->sv()I
 
     move-result v1
 
@@ -2029,7 +2029,7 @@
     goto :goto_0
 
     :cond_0
-    iget-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;->auj: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;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->auj: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;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->auj: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;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->auj: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;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->auj: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;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->auj: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;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->auj: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;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->auj: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;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->auj: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;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->auj: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;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->auj: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 pJ()I
+.method public final pH()I
     .locals 1
 
-    sget v0, Lcom/google/android/gms/internal/measurement/dw$d;->auq:I
+    sget v0, Lcom/google/android/gms/internal/measurement/dw$d;->aum:I
 
     return v0
 .end method
@@ -2349,7 +2349,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->auj: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;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->auj: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 04a0d9af9c..7969bd3498 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 anu:I
+.field private final anq: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;->anu:I
+    iput p2, p0, Lcom/google/android/gms/internal/measurement/di$a;->anq: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;->anu:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/di$a;->anq:I
 
-    iget p1, p1, Lcom/google/android/gms/internal/measurement/di$a;->anu:I
+    iget p1, p1, Lcom/google/android/gms/internal/measurement/di$a;->anq: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;->anu:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/di$a;->anq: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 7224c2db20..42965d8a99 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 atG:Z = true
+.field private static atC:Z = true
 
-.field private static volatile aui:Lcom/google/android/gms/internal/measurement/di; = null
+.field private static volatile aue:Lcom/google/android/gms/internal/measurement/di; = null
 
-.field private static final auw:Ljava/lang/Class;
+.field private static final aus:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -25,15 +25,15 @@
     .end annotation
 .end field
 
-.field private static volatile aux:Lcom/google/android/gms/internal/measurement/di; = null
+.field private static volatile aut:Lcom/google/android/gms/internal/measurement/di; = null
 
-.field private static final auy:Lcom/google/android/gms/internal/measurement/di;
+.field private static final auu:Lcom/google/android/gms/internal/measurement/di;
 
 .field private static volatile zza:Z = false
 
 
 # instance fields
-.field private final auz:Ljava/util/Map;
+.field private final auv: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;->sB()Ljava/lang/Class;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/di;->sz()Ljava/lang/Class;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/di;->auw:Ljava/lang/Class;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/di;->aus: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;->auy:Lcom/google/android/gms/internal/measurement/di;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/di;->auu: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;->auz:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/di;->auv:Ljava/util/Map;
 
     return-void
 .end method
@@ -89,12 +89,92 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/di;->auz:Ljava/util/Map;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/di;->auv:Ljava/util/Map;
 
     return-void
 .end method
 
-.method private static sB()Ljava/lang/Class;
+.method public static sA()Lcom/google/android/gms/internal/measurement/di;
+    .locals 2
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/di;->aue:Lcom/google/android/gms/internal/measurement/di;
+
+    if-nez v0, :cond_1
+
+    const-class v1, Lcom/google/android/gms/internal/measurement/di;
+
+    monitor-enter v1
+
+    :try_start_0
+    sget-object v0, Lcom/google/android/gms/internal/measurement/di;->aue:Lcom/google/android/gms/internal/measurement/di;
+
+    if-nez v0, :cond_0
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/di;->auu:Lcom/google/android/gms/internal/measurement/di;
+
+    sput-object v0, Lcom/google/android/gms/internal/measurement/di;->aue:Lcom/google/android/gms/internal/measurement/di;
+
+    :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
+    return-object v0
+.end method
+
+.method public static sB()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;->aut: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;->aut: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;->aut: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 sz()Ljava/lang/Class;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -121,86 +201,6 @@
     return-object v0
 .end method
 
-.method public static sC()Lcom/google/android/gms/internal/measurement/di;
-    .locals 2
-
-    sget-object v0, Lcom/google/android/gms/internal/measurement/di;->aui:Lcom/google/android/gms/internal/measurement/di;
-
-    if-nez v0, :cond_1
-
-    const-class v1, Lcom/google/android/gms/internal/measurement/di;
-
-    monitor-enter v1
-
-    :try_start_0
-    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;->auy: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
-
-    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
-    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;->auz:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/di;->auv: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 9a043ac89d..26b1f62feb 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 sE()Ljava/lang/Object;
+.method abstract sC()Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "<UT:",
@@ -102,7 +102,7 @@
     .end annotation
 .end method
 
-.method abstract sF()V
+.method abstract sD()V
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()V"
@@ -116,7 +116,7 @@
     .end annotation
 .end method
 
-.method abstract sG()V
+.method abstract sE()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 c222d460fc..39f80a55c9 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 auA:Lcom/google/android/gms/internal/measurement/dk;
+.field private static final auw: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 auB:Lcom/google/android/gms/internal/measurement/dk;
+.field private static final aux: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;->auA:Lcom/google/android/gms/internal/measurement/dk;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dl;->auw:Lcom/google/android/gms/internal/measurement/dk;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/dl;->sH()Lcom/google/android/gms/internal/measurement/dk;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/dl;->sF()Lcom/google/android/gms/internal/measurement/dk;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dl;->auB:Lcom/google/android/gms/internal/measurement/dk;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dl;->aux:Lcom/google/android/gms/internal/measurement/dk;
 
     return-void
 .end method
 
-.method private static sH()Lcom/google/android/gms/internal/measurement/dk;
+.method private static sF()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 sI()Lcom/google/android/gms/internal/measurement/dk;
+.method static sG()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;->auA:Lcom/google/android/gms/internal/measurement/dk;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dl;->auw:Lcom/google/android/gms/internal/measurement/dk;
 
     return-object v0
 .end method
 
-.method static sJ()Lcom/google/android/gms/internal/measurement/dk;
+.method static sH()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;->auB:Lcom/google/android/gms/internal/measurement/dk;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dl;->aux: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 41d90c9b4b..cd69fd8c46 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;->sK()Lcom/google/android/gms/internal/measurement/do;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/dw$c;->sI()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;->pG()V
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/do;->pE()V
 
     return-void
 .end method
@@ -140,7 +140,7 @@
     return p1
 .end method
 
-.method final sE()Ljava/lang/Object;
+.method final sC()Ljava/lang/Object;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -165,7 +165,7 @@
     throw v0
 .end method
 
-.method final sF()V
+.method final sD()V
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -186,7 +186,7 @@
     throw v0
 .end method
 
-.method final sG()V
+.method final sE()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 5f864938a7..77fe36ff04 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 anC:[I
+.field static final synthetic any:[I
 
-.field static final synthetic atf:[I
+.field static final synthetic atb:[I
 
 
 # direct methods
@@ -21,14 +21,14 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dn;->anC:[I
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dn;->any:[I
 
     const/4 v0, 0x1
 
     :try_start_0
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dn;->anC:[I
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dn;->any:[I
 
-    sget-object v2, Lcom/google/android/gms/internal/measurement/he;->awy:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v2, Lcom/google/android/gms/internal/measurement/he;->awu: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;->anC:[I
+    sget-object v2, Lcom/google/android/gms/internal/measurement/dn;->any:[I
 
-    sget-object v3, Lcom/google/android/gms/internal/measurement/he;->axG:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v3, Lcom/google/android/gms/internal/measurement/he;->axC: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;->anC:[I
+    sget-object v3, Lcom/google/android/gms/internal/measurement/dn;->any:[I
 
-    sget-object v4, Lcom/google/android/gms/internal/measurement/he;->awz:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v4, Lcom/google/android/gms/internal/measurement/he;->awv: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;->anC:[I
+    sget-object v4, Lcom/google/android/gms/internal/measurement/dn;->any:[I
 
-    sget-object v5, Lcom/google/android/gms/internal/measurement/he;->axH:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/he;->axD: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;->anC:[I
+    sget-object v5, Lcom/google/android/gms/internal/measurement/dn;->any:[I
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/he;->axI:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v6, Lcom/google/android/gms/internal/measurement/he;->axE: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;->anC:[I
+    sget-object v6, Lcom/google/android/gms/internal/measurement/dn;->any:[I
 
-    sget-object v7, Lcom/google/android/gms/internal/measurement/he;->axJ:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v7, Lcom/google/android/gms/internal/measurement/he;->axF: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;->anC:[I
+    sget-object v7, Lcom/google/android/gms/internal/measurement/dn;->any:[I
 
-    sget-object v8, Lcom/google/android/gms/internal/measurement/he;->axK:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v8, Lcom/google/android/gms/internal/measurement/he;->axG: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;->anC:[I
+    sget-object v8, Lcom/google/android/gms/internal/measurement/dn;->any:[I
 
-    sget-object v9, Lcom/google/android/gms/internal/measurement/he;->axL:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v9, Lcom/google/android/gms/internal/measurement/he;->axH: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;->anC:[I
+    sget-object v9, Lcom/google/android/gms/internal/measurement/dn;->any:[I
 
-    sget-object v10, Lcom/google/android/gms/internal/measurement/he;->axN:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v10, Lcom/google/android/gms/internal/measurement/he;->axJ: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;->anC:[I
+    sget-object v9, Lcom/google/android/gms/internal/measurement/dn;->any:[I
 
-    sget-object v10, Lcom/google/android/gms/internal/measurement/he;->axO:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v10, Lcom/google/android/gms/internal/measurement/he;->axK: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;->anC:[I
+    sget-object v9, Lcom/google/android/gms/internal/measurement/dn;->any:[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;->axI: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;->anC:[I
+    sget-object v9, Lcom/google/android/gms/internal/measurement/dn;->any:[I
 
-    sget-object v10, Lcom/google/android/gms/internal/measurement/he;->axP:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v10, Lcom/google/android/gms/internal/measurement/he;->axL: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;->anC:[I
+    sget-object v9, Lcom/google/android/gms/internal/measurement/dn;->any:[I
 
-    sget-object v10, Lcom/google/android/gms/internal/measurement/he;->axQ: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
 
@@ -232,9 +232,9 @@
 
     :catch_c
     :try_start_d
-    sget-object v9, Lcom/google/android/gms/internal/measurement/dn;->anC:[I
+    sget-object v9, Lcom/google/android/gms/internal/measurement/dn;->any:[I
 
-    sget-object v10, Lcom/google/android/gms/internal/measurement/he;->axS: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
 
@@ -248,9 +248,9 @@
 
     :catch_d
     :try_start_e
-    sget-object v9, Lcom/google/android/gms/internal/measurement/dn;->anC:[I
+    sget-object v9, Lcom/google/android/gms/internal/measurement/dn;->any:[I
 
-    sget-object v10, Lcom/google/android/gms/internal/measurement/he;->axT: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
 
@@ -264,9 +264,9 @@
 
     :catch_e
     :try_start_f
-    sget-object v9, Lcom/google/android/gms/internal/measurement/dn;->anC:[I
+    sget-object v9, Lcom/google/android/gms/internal/measurement/dn;->any:[I
 
-    sget-object v10, Lcom/google/android/gms/internal/measurement/he;->axU: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
 
@@ -280,9 +280,9 @@
 
     :catch_f
     :try_start_10
-    sget-object v9, Lcom/google/android/gms/internal/measurement/dn;->anC:[I
+    sget-object v9, Lcom/google/android/gms/internal/measurement/dn;->any:[I
 
-    sget-object v10, Lcom/google/android/gms/internal/measurement/he;->axV: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
 
@@ -296,9 +296,9 @@
 
     :catch_10
     :try_start_11
-    sget-object v9, Lcom/google/android/gms/internal/measurement/dn;->anC:[I
+    sget-object v9, Lcom/google/android/gms/internal/measurement/dn;->any:[I
 
-    sget-object v10, Lcom/google/android/gms/internal/measurement/he;->axR: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
 
@@ -319,12 +319,12 @@
 
     new-array v9, v9, [I
 
-    sput-object v9, Lcom/google/android/gms/internal/measurement/dn;->atf:[I
+    sput-object v9, Lcom/google/android/gms/internal/measurement/dn;->atb:[I
 
     :try_start_12
-    sget-object v9, Lcom/google/android/gms/internal/measurement/dn;->atf:[I
+    sget-object v9, Lcom/google/android/gms/internal/measurement/dn;->atb:[I
 
-    sget-object v10, Lcom/google/android/gms/internal/measurement/hh;->axX:Lcom/google/android/gms/internal/measurement/hh;
+    sget-object v10, Lcom/google/android/gms/internal/measurement/hh;->axT: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;->atf:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dn;->atb:[I
 
-    sget-object v9, Lcom/google/android/gms/internal/measurement/hh;->axY:Lcom/google/android/gms/internal/measurement/hh;
+    sget-object v9, Lcom/google/android/gms/internal/measurement/hh;->axU: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;->atf:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dn;->atb:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->axZ:Lcom/google/android/gms/internal/measurement/hh;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->axV: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;->atf:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dn;->atb:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->aya:Lcom/google/android/gms/internal/measurement/hh;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->axW: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;->atf:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dn;->atb:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->ayb: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;
 
     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;->atf:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dn;->atb:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->ayc: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;
 
     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;->atf:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dn;->atb:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->ayd: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
 
@@ -420,9 +420,9 @@
 
     :catch_18
     :try_start_19
-    sget-object v0, Lcom/google/android/gms/internal/measurement/dn;->atf:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dn;->atb:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->aye: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
 
@@ -434,9 +434,9 @@
 
     :catch_19
     :try_start_1a
-    sget-object v0, Lcom/google/android/gms/internal/measurement/dn;->atf:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dn;->atb:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->ayf: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
 
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 3aa67cbcc2..26b1e1bbdc 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 auD:Lcom/google/android/gms/internal/measurement/do;
+.field private static final auz:Lcom/google/android/gms/internal/measurement/do;
 
 
 # instance fields
-.field asH:Z
+.field asD:Z
 
-.field atG:Z
+.field atC:Z
 
-.field final auC:Lcom/google/android/gms/internal/measurement/gb;
+.field final auy: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;->auD:Lcom/google/android/gms/internal/measurement/do;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/do;->auz:Lcom/google/android/gms/internal/measurement/do;
 
     return-void
 .end method
@@ -61,7 +61,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/do;->auC:Lcom/google/android/gms/internal/measurement/gb;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/do;->auy: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;->pG()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/do;->pE()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;->auC:Lcom/google/android/gms/internal/measurement/gb;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/do;->auy:Lcom/google/android/gms/internal/measurement/gb;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/do;->pG()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/do;->pE()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;->tF()Lcom/google/android/gms/internal/measurement/fl;
+    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/fl;->tD()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;->axN:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/he;->axJ:Lcom/google/android/gms/internal/measurement/he;
 
     if-ne p0, v0, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/dy;->te()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/dy;->tc()Z
 
     shl-int/lit8 p1, p1, 0x1
 
@@ -175,7 +175,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/do;->auC:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/do;->auy: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;->tp()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ei;->tm()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;->axN:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/he;->axJ:Lcom/google/android/gms/internal/measurement/he;
 
     if-ne p1, v0, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/dy;->te()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/dy;->tc()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;->anC:[I
+    sget-object p2, Lcom/google/android/gms/internal/measurement/dn;->any:[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;->pJ()I
+    invoke-interface {p3}, Lcom/google/android/gms/internal/measurement/eb;->pH()I
 
     move-result p1
 
@@ -495,7 +495,7 @@
         }
     .end annotation
 
-    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/dq;->qg()Z
+    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/dq;->qe()Z
 
     move-result v0
 
@@ -532,7 +532,7 @@
 
     add-int/lit8 v2, v2, 0x1
 
-    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/dq;->sM()Lcom/google/android/gms/internal/measurement/he;
+    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/dq;->sK()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;->sM()Lcom/google/android/gms/internal/measurement/he;
+    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/dq;->sK()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;->asH:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/internal/measurement/do;->asD:Z
 
     :cond_3
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/do;->auC:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/do;->auy: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;->atf:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dn;->atb:[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;->sM()Lcom/google/android/gms/internal/measurement/he;
+    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/dq;->sK()Lcom/google/android/gms/internal/measurement/he;
 
     move-result-object v0
 
-    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/dq;->pJ()I
+    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/dq;->pH()I
 
     move-result v1
 
-    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/dq;->qg()Z
+    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/dq;->qe()Z
 
     move-result v2
 
     if-eqz v2, :cond_3
 
-    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/dq;->pR()Z
+    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/dq;->pP()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;->anC:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dn;->any:[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;->pJ()I
+    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/eb;->pH()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;->sx()I
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/df;->sv()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;->sv()I
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/df;->st()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;->sA()I
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/df;->sy()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;->su()I
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/df;->ss()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;->sw()I
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/df;->su()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;->sy()I
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/df;->sw()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;->sz()I
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/df;->sx()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;->sN()Lcom/google/android/gms/internal/measurement/hh;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/dq;->sL()Lcom/google/android/gms/internal/measurement/hh;
 
     move-result-object v1
 
-    sget-object v2, Lcom/google/android/gms/internal/measurement/hh;->ayf:Lcom/google/android/gms/internal/measurement/hh;
+    sget-object v2, Lcom/google/android/gms/internal/measurement/hh;->ayb: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;->qg()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/dq;->qe()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;->sR()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/fg;->sP()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;->sR()Z
+    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/fg;->sP()Z
 
     move-result p0
 
@@ -1247,21 +1247,21 @@
 
     move-result-object v1
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/dq;->sN()Lcom/google/android/gms/internal/measurement/hh;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/dq;->sL()Lcom/google/android/gms/internal/measurement/hh;
 
     move-result-object v2
 
-    sget-object v3, Lcom/google/android/gms/internal/measurement/hh;->ayf:Lcom/google/android/gms/internal/measurement/hh;
+    sget-object v3, Lcom/google/android/gms/internal/measurement/hh;->ayb:Lcom/google/android/gms/internal/measurement/hh;
 
     if-ne v2, v3, :cond_1
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/dq;->qg()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/dq;->qe()Z
 
     move-result v2
 
     if-nez v2, :cond_1
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/dq;->pR()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/dq;->pP()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;->pJ()I
+    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/dq;->pH()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;->pJ()I
+    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/dq;->pH()I
 
     move-result p0
 
@@ -1316,7 +1316,7 @@
     return p0
 .end method
 
-.method public static sK()Lcom/google/android/gms/internal/measurement/do;
+.method public static sI()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;->auD:Lcom/google/android/gms/internal/measurement/do;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/do;->auz: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;->auC:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/do;->auy:Lcom/google/android/gms/internal/measurement/gb;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/gb;->nh()I
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/gb;->nf()I
 
     move-result v2
 
     if-ge v1, v2, :cond_0
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/do;->auC:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/do;->auy: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;->auC:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/do;->auy:Lcom/google/android/gms/internal/measurement/gb;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/gb;->tS()Ljava/lang/Iterable;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/gb;->tQ()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;->asH:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/internal/measurement/do;->asD:Z
 
-    iput-boolean v1, v0, Lcom/google/android/gms/internal/measurement/do;->asH:Z
+    iput-boolean v1, v0, Lcom/google/android/gms/internal/measurement/do;->asD:Z
 
     return-object v0
 .end method
@@ -1452,12 +1452,12 @@
 
     if-eqz v1, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ei;->tp()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ei;->tm()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object p1
 
     :cond_0
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/dq;->qg()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/dq;->qe()Z
 
     move-result v1
 
@@ -1504,18 +1504,18 @@
     goto :goto_0
 
     :cond_2
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/do;->auC:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/do;->auy: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;->sN()Lcom/google/android/gms/internal/measurement/hh;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/dq;->sL()Lcom/google/android/gms/internal/measurement/hh;
 
     move-result-object v1
 
-    sget-object v2, Lcom/google/android/gms/internal/measurement/hh;->ayf:Lcom/google/android/gms/internal/measurement/hh;
+    sget-object v2, Lcom/google/android/gms/internal/measurement/hh;->ayb: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;->auC:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/do;->auy: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;->sP()Lcom/google/android/gms/internal/measurement/fl;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/dq;->sN()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;->sU()Lcom/google/android/gms/internal/measurement/ff;
+    invoke-interface {v1}, Lcom/google/android/gms/internal/measurement/fg;->sS()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;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/dq;->sM()Lcom/google/android/gms/internal/measurement/ff;
 
     move-result-object p1
 
-    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/ff;->tb()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/ff;->sZ()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object p1
 
     :goto_1
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/do;->auC:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/do;->auy: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;->auC:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/do;->auy: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;->auC:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/do;->auy: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;
+    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/do;->auy: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;->auC:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/do;->auy: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 pG()V
+.method public final pE()V
     .locals 1
 
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/do;->atG:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/do;->atC:Z
 
     if-eqz v0, :cond_0
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/do;->auC:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/do;->auy: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;->atG:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/internal/measurement/do;->atC:Z
 
     return-void
 .end method
 
-.method public final qE()Z
+.method public final qC()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;->auC:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/do;->auy:Lcom/google/android/gms/internal/measurement/gb;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/gb;->nh()I
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/gb;->nf()I
 
     move-result v2
 
     if-ge v1, v2, :cond_1
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/do;->auC:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/do;->auy: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;->auC:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/do;->auy:Lcom/google/android/gms/internal/measurement/gb;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/gb;->tS()Ljava/lang/Iterable;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/gb;->tQ()Ljava/lang/Iterable;
 
     move-result-object v1
 
@@ -1716,7 +1716,7 @@
     return v0
 .end method
 
-.method public final sL()Ljava/util/Iterator;
+.method public final sJ()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;->asH:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/do;->asD: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;->auC:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/do;->auy: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;->auC:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/do;->auy: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 1113fcb4b8..c7012f175c 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,6 +14,14 @@
 
 
 # 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;
@@ -58,17 +66,9 @@
 
 .field private static final enum auZ:Lcom/google/android/gms/internal/measurement/dp;
 
-.field public static final enum avA:Lcom/google/android/gms/internal/measurement/dp;
+.field private static final avA:[Ljava/lang/reflect/Type;
 
-.field private static final enum avB:Lcom/google/android/gms/internal/measurement/dp;
-
-.field private static final enum avC:Lcom/google/android/gms/internal/measurement/dp;
-
-.field private static final avD:[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 synthetic avB:[Lcom/google/android/gms/internal/measurement/dp;
 
 .field private static final enum ava:Lcom/google/android/gms/internal/measurement/dp;
 
@@ -88,7 +88,7 @@
 
 .field private static final enum avi:Lcom/google/android/gms/internal/measurement/dp;
 
-.field private static final enum avj:Lcom/google/android/gms/internal/measurement/dp;
+.field public static final enum avj:Lcom/google/android/gms/internal/measurement/dp;
 
 .field private static final enum avk:Lcom/google/android/gms/internal/measurement/dp;
 
@@ -96,7 +96,7 @@
 
 .field private static final enum avm: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 avn:Lcom/google/android/gms/internal/measurement/dp;
 
 .field private static final enum avo:Lcom/google/android/gms/internal/measurement/dp;
 
@@ -114,13 +114,13 @@
 
 .field private static final enum avv:Lcom/google/android/gms/internal/measurement/dp;
 
-.field private static final enum avw:Lcom/google/android/gms/internal/measurement/dp;
+.field public 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;
+.field private static final 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;->avG:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v4, Lcom/google/android/gms/internal/measurement/dr;->avC:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v5, Lcom/google/android/gms/internal/measurement/ej;->awc:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/ej;->avY: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;->auE:Lcom/google/android/gms/internal/measurement/dp;
+    sput-object v6, Lcom/google/android/gms/internal/measurement/dp;->auA: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;->avG:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/dr;->avC:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->awb:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->avX: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;->auF:Lcom/google/android/gms/internal/measurement/dp;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->auB: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;->avG:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/dr;->avC:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->awa:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->avW: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;->auG:Lcom/google/android/gms/internal/measurement/dp;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->auC: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;->avG:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/dr;->avC:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->awa:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->avW: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;->auH:Lcom/google/android/gms/internal/measurement/dp;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->auD: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;->avG:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/dr;->avC:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->avZ:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->avV: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;->auI:Lcom/google/android/gms/internal/measurement/dp;
+    sput-object v0, 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;->avG:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/dr;->avC:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->awa:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->avW: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;->auJ: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;->avG:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/dr;->avC:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->avZ:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->avV: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;->auK: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;->avG:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/dr;->avC:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->awd: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, "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;->auL: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;->avG:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/dr;->avC:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->awe: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, "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;->auM: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;->avG:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/dr;->avC:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->awh: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, "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;->auN: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;->avG:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/dr;->avC:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->awf: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, "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;->auO: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;->avG:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/dr;->avC:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->avZ:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->avV: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;->auP: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;->avG:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/dr;->avC:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->awg: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, "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;->auQ: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;->avG:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/dr;->avC:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->avZ:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->avV: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;->auR: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;->avG:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/dr;->avC:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->awa:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->avW: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;->auS: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;->avG:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/dr;->avC:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->avZ:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->avV: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;->auT: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;->avG:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/dr;->avC:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->awa:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->avW: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;->auU: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;->avG:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/dr;->avC:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->awh: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, "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;->auV: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;->avH:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/dr;->avD:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->awc: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, "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;->auW: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;->avH:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/dr;->avD:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->awb:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->avX: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;->auX: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;->avH:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/dr;->avD:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->awa:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->avW: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;->auY: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;->avH:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/dr;->avD:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->awa:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->avW: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;->auZ: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;->avH:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/dr;->avD:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->avZ:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->avV: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;->ava: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;->avH:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/dr;->avD:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->awa:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->avW: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;->avb: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;->avH:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/dr;->avD:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->avZ:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->avV: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;->avc: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;->avH:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/dr;->avD:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->awd: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, "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;->avd: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;->avH:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/dr;->avD:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->awe: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, "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;->ave: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;->avH:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/dr;->avD:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->awh: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, "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;->avf: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;->avH:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/dr;->avD:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->awf: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, "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;->avg: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;->avH:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/dr;->avD:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->avZ:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->avV: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;->avh: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;->avH:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/dr;->avD:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->awg: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, "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;->avi: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;->avH:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/dr;->avD:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->avZ:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->avV: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;->avj: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;->avH:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/dr;->avD:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->awa:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->avW: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;->avk: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;->avH:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/dr;->avD:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->avZ:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->avV: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;->avl: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;->avH:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/dr;->avD:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->awa:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->avW: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;->avm: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;->avI:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/dr;->avE:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->awc:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->avY: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;->avn: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;->avI:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/dr;->avE:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->awb:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->avX: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;->avo: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;->avI:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/dr;->avE:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->awa:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->avW: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;->avp: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;->avI:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/dr;->avE:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->awa:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->avW: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;->avq: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;->avI:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/dr;->avE:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->avZ:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->avV: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;->avr: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;->avI:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/dr;->avE:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->awa:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->avW: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;->avs: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;->avI:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/dr;->avE:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->avZ:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->avV: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;->avt: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;->avI:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/dr;->avE:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->awd: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, "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;->avu: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;->avI:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/dr;->avE:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->avZ:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->avV: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;->avv: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;->avI:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/dr;->avE:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->awg: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, "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;->avw: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;->avI:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/dr;->avE:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->avZ:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->avV: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;->avx: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;->avI:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/dr;->avE:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->awa:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->avW: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;->avy: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;->avI:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/dr;->avE:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->avZ:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->avV: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;->avz: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;->avI:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/dr;->avE:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->awa:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->avW: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;->avA: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;->avH:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/dr;->avD:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->awh: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, "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;->avB: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;->avJ:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/dr;->avF:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->avY:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->avU: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;->avC: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;
 
     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;->auE:Lcom/google/android/gms/internal/measurement/dp;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->auA: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;->auF:Lcom/google/android/gms/internal/measurement/dp;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->auB: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;->auG:Lcom/google/android/gms/internal/measurement/dp;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->auC: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;->auH:Lcom/google/android/gms/internal/measurement/dp;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->auD: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;->auI: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 v3, 0x4
 
     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;->auF: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;->auK: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, 0x6
 
     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;->auH: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;->auM: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/16 v3, 0x8
 
     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;->auJ: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;->auO: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/16 v3, 0xa
 
     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;->auL: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;->auQ: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, 0xc
 
     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;->auN: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;->auS: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, 0xe
 
     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;->auP: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;->auU: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, 0x10
 
     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;->auR: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;->auW: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, 0x12
 
     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;->auT: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;->auY: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, 0x14
 
     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;->auV: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;->ava: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, 0x16
 
     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;->auX: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;->avc: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, 0x18
 
     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;->auZ: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;->ave: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, 0x1a
 
     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;->avb: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;->avg: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, 0x1c
 
     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;->avd: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;->avi: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, 0x1e
 
     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;->avf: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;->avk: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, 0x20
 
     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;->avh: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;->avm: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, 0x22
 
     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;->avj: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;->avo: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, 0x24
 
     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;->avl: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;->avq: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, 0x26
 
     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;->avn: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;->avs: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, 0x28
 
     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;->avp: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;->avu: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, 0x2a
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->avv: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, 0x2b
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->avw: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, 0x2c
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->avx: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, 0x2d
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->avy: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, 0x2e
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->avz: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, 0x2f
 
     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;->avw: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;->avB: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, 0x31
 
     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;->avy: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;->avF:[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-array v0, v2, [Ljava/lang/reflect/Type;
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->avE:[Ljava/lang/reflect/Type;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->avA:[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;->avD:[Lcom/google/android/gms/internal/measurement/dp;
+    sput-object v1, Lcom/google/android/gms/internal/measurement/dp;->avz:[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;->avD:[Lcom/google/android/gms/internal/measurement/dp;
+    sget-object v4, Lcom/google/android/gms/internal/measurement/dp;->avz:[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;->atf:[I
+    sget-object p1, Lcom/google/android/gms/internal/measurement/dt;->atb:[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;->avG:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dr;->avC:Lcom/google/android/gms/internal/measurement/dr;
 
     if-ne p4, v0, :cond_2
 
-    sget-object p4, Lcom/google/android/gms/internal/measurement/dt;->anC:[I
+    sget-object p4, Lcom/google/android/gms/internal/measurement/dt;->any:[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;->avF:[Lcom/google/android/gms/internal/measurement/dp;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dp;->avB:[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 e0a9e539ac..53bdd242cd 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 pJ()I
+.method public abstract pH()I
 .end method
 
-.method public abstract pR()Z
+.method public abstract pP()Z
 .end method
 
-.method public abstract qg()Z
+.method public abstract qe()Z
 .end method
 
-.method public abstract sM()Lcom/google/android/gms/internal/measurement/he;
+.method public abstract sK()Lcom/google/android/gms/internal/measurement/he;
 .end method
 
-.method public abstract sN()Lcom/google/android/gms/internal/measurement/hh;
+.method public abstract sL()Lcom/google/android/gms/internal/measurement/hh;
 .end method
 
-.method public abstract sO()Lcom/google/android/gms/internal/measurement/ff;
+.method public abstract sM()Lcom/google/android/gms/internal/measurement/ff;
 .end method
 
-.method public abstract sP()Lcom/google/android/gms/internal/measurement/fl;
+.method public abstract sN()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 e2b4457949..c32eb25a44 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 avG:Lcom/google/android/gms/internal/measurement/dr;
+.field public static final enum avC: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 avD: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 avE: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 avF:Lcom/google/android/gms/internal/measurement/dr;
 
-.field private static final synthetic avK:[Lcom/google/android/gms/internal/measurement/dr;
+.field private static final synthetic avG:[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;->avG:Lcom/google/android/gms/internal/measurement/dr;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dr;->avC: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;->avH:Lcom/google/android/gms/internal/measurement/dr;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dr;->avD: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;->avI:Lcom/google/android/gms/internal/measurement/dr;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dr;->avE: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;->avJ:Lcom/google/android/gms/internal/measurement/dr;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dr;->avF: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;->avG:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/dr;->avC:Lcom/google/android/gms/internal/measurement/dr;
 
     aput-object v5, v0, v1
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dr;->avH:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dr;->avD:Lcom/google/android/gms/internal/measurement/dr;
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dr;->avI:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dr;->avE:Lcom/google/android/gms/internal/measurement/dr;
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dr;->avJ:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dr;->avF:Lcom/google/android/gms/internal/measurement/dr;
 
     aput-object v1, v0, v4
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dr;->avK:[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;
 
     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;->avK:[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;
 
     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 e99b6ff208..a80a4f14b8 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;->pF()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pD()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 25ce40656c..1a2775c2a0 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 anC:[I
+.field static final synthetic any:[I
 
-.field static final synthetic atf:[I
+.field static final synthetic atb:[I
 
 
 # direct methods
@@ -21,14 +21,14 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dt;->anC:[I
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dt;->any:[I
 
     const/4 v0, 0x1
 
     :try_start_0
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dt;->anC:[I
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dt;->any:[I
 
-    sget-object v2, Lcom/google/android/gms/internal/measurement/ej;->awf:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v2, Lcom/google/android/gms/internal/measurement/ej;->awb: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;->anC:[I
+    sget-object v2, Lcom/google/android/gms/internal/measurement/dt;->any:[I
 
-    sget-object v3, Lcom/google/android/gms/internal/measurement/ej;->awh:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v3, Lcom/google/android/gms/internal/measurement/ej;->awd: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;->anC:[I
+    sget-object v3, Lcom/google/android/gms/internal/measurement/dt;->any:[I
 
-    sget-object v4, Lcom/google/android/gms/internal/measurement/ej;->awe:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v4, Lcom/google/android/gms/internal/measurement/ej;->awa: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;->atf:[I
+    sput-object v3, Lcom/google/android/gms/internal/measurement/dt;->atb:[I
 
     :try_start_3
-    sget-object v3, Lcom/google/android/gms/internal/measurement/dt;->atf:[I
+    sget-object v3, Lcom/google/android/gms/internal/measurement/dt;->atb:[I
 
-    sget-object v4, Lcom/google/android/gms/internal/measurement/dr;->avJ:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v4, Lcom/google/android/gms/internal/measurement/dr;->avF: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;->atf:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dt;->atb:[I
 
-    sget-object v3, Lcom/google/android/gms/internal/measurement/dr;->avH:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v3, Lcom/google/android/gms/internal/measurement/dr;->avD: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;->atf:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dt;->atb:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dr;->avG:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dr;->avC: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 d5e63b8aa2..071cdb4edb 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 ane:Ljava/lang/String;
+.field private static ana:Ljava/lang/String;
 
-.field private static final anx:Ljava/util/logging/Logger;
+.field private static final ant:Ljava/util/logging/Logger;
 
 
 # direct methods
@@ -34,11 +34,11 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/du;->anx:Ljava/util/logging/Logger;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/du;->ant:Ljava/util/logging/Logger;
 
     const-string v0, "com.google.protobuf.BlazeGeneratedExtensionRegistryLiteLoader"
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/du;->ane:Ljava/lang/String;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/du;->ana: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;->ane:Ljava/lang/String;
+    sget-object v2, Lcom/google/android/gms/internal/measurement/du;->ana: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;->sC()Lcom/google/android/gms/internal/measurement/di;
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/du;->sA()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;->sC()Lcom/google/android/gms/internal/measurement/di;
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/du;->sA()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;->anx:Ljava/util/logging/Logger;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/du;->ant: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 sC()Lcom/google/android/gms/internal/measurement/di;
+.method protected abstract sA()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 2839c3f0c9..8d8f95aea0 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 avL:Lcom/google/android/gms/internal/measurement/dv;
+.field private static final avH:Lcom/google/android/gms/internal/measurement/dv;
 
 
 # instance fields
-.field private avM:[F
+.field private avI:[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;->avL:Lcom/google/android/gms/internal/measurement/dv;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dv;->avH:Lcom/google/android/gms/internal/measurement/dv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ch;->rM()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ch;->rK()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;->avM:[F
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/dv;->avI:[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;->rA()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->ry()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;->avM:[F
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dv;->avI:[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;->avM:[F
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dv;->avI:[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;->avM:[F
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/dv;->avI:[F
 
     :goto_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dv;->avM:[F
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dv;->avI:[F
 
     aput p2, v0, p1
 
@@ -248,7 +248,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rA()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->ry()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;->avM:[F
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dv;->avI:[F
 
     array-length v2, v0
 
@@ -294,12 +294,12 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/dv;->avM:[F
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/dv;->avI:[F
 
     :cond_2
-    iget-object v0, p1, Lcom/google/android/gms/internal/measurement/dv;->avM:[F
+    iget-object v0, p1, Lcom/google/android/gms/internal/measurement/dv;->avI:[F
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/dv;->avM:[F
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/dv;->avI:[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;->avM:[F
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dv;->avI:[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;->avM:[F
+    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/dv;->avI:[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;->avM:[F
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/dv;->avI:[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;->avM:[F
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dv;->avI:[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;->avM:[F
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/dv;->avI:[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;->rA()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->ry()V
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/dv;->zzc:I
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dv;->avM:[F
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dv;->avI:[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;->avM:[F
+    iput-object v2, p0, Lcom/google/android/gms/internal/measurement/dv;->avI:[F
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dv;->avM:[F
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dv;->avI:[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;->rA()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->ry()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;->avM:[F
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dv;->avI:[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;->rA()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->ry()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;->avM:[F
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/dv;->avI:[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;->avM:[F
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dv;->avI:[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;->rA()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->ry()V
 
     if-lt p2, p1, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dv;->avM:[F
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dv;->avI:[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;->rA()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->ry()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;->avM:[F
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dv;->avI:[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 d95f0ea038..8f7579d673 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 avN:Lcom/google/android/gms/internal/measurement/dw;
+.field private final avJ: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;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/dw$a;->avJ: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 85f9572842..a94dfd1cad 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 asH:Z
+.field private asD:Z
 
-.field protected avN:Lcom/google/android/gms/internal/measurement/dw;
+.field protected avJ: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 avO:Lcom/google/android/gms/internal/measurement/dw;
+.field private final avK: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;->avO:Lcom/google/android/gms/internal/measurement/dw;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/dw$b;->avK: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;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/dw$b;->avJ:Lcom/google/android/gms/internal/measurement/dw;
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lcom/google/android/gms/internal/measurement/dw$b;->asH:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/internal/measurement/dw$b;->asD:Z
 
     return-void
 .end method
@@ -84,7 +84,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fr;->tJ()Lcom/google/android/gms/internal/measurement/fr;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fr;->tH()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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
     :try_start_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fr;->tJ()Lcom/google/android/gms/internal/measurement/fr;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fr;->tH()Lcom/google/android/gms/internal/measurement/fr;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dw$b;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dw$b;->avJ: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;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dw$b;->avJ:Lcom/google/android/gms/internal/measurement/dw;
 
-    iget-object v2, p1, Lcom/google/android/gms/internal/measurement/da;->auo:Lcom/google/android/gms/internal/measurement/de;
+    iget-object v2, p1, Lcom/google/android/gms/internal/measurement/da;->auk:Lcom/google/android/gms/internal/measurement/de;
 
     if-eqz v2, :cond_0
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/da;->auo:Lcom/google/android/gms/internal/measurement/de;
+    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/da;->auk: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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
     :try_start_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fr;->tJ()Lcom/google/android/gms/internal/measurement/fr;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fr;->tH()Lcom/google/android/gms/internal/measurement/fr;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dw$b;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dw$b;->avJ: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;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/dw$b;->avJ: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;->tg()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->te()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object p1
 
@@ -247,7 +247,7 @@
     throw p1
 .end method
 
-.method private sY()Lcom/google/android/gms/internal/measurement/dw;
+.method private sW()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;->asH:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/dw$b;->asD:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dw$b;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dw$b;->avJ:Lcom/google/android/gms/internal/measurement/dw;
 
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dw$b;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dw$b;->avJ:Lcom/google/android/gms/internal/measurement/dw;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fr;->tJ()Lcom/google/android/gms/internal/measurement/fr;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fr;->tH()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;->asH:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/internal/measurement/dw$b;->asD:Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dw$b;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dw$b;->avJ: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;->sX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dw$b;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dw$b;->avJ: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;->avO:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dw$b;->avK: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;->sY()Lcom/google/android/gms/internal/measurement/dw;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sW()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;->sC()Lcom/google/android/gms/internal/measurement/di;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/di;->sA()Lcom/google/android/gms/internal/measurement/di;
 
     move-result-object v0
 
@@ -396,7 +396,7 @@
     return-object p1
 .end method
 
-.method public final synthetic rL()Lcom/google/android/gms/internal/measurement/cg;
+.method public final synthetic rJ()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 sR()Z
+.method public final sP()Z
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dw$b;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dw$b;->avJ:Lcom/google/android/gms/internal/measurement/dw;
 
     const/4 v1, 0x0
 
@@ -422,22 +422,22 @@
     return v0
 .end method
 
-.method public final synthetic sW()Lcom/google/android/gms/internal/measurement/fg;
+.method public final synthetic sU()Lcom/google/android/gms/internal/measurement/fg;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dw$b;->avO:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dw$b;->avK:Lcom/google/android/gms/internal/measurement/dw;
 
     return-object v0
 .end method
 
-.method protected final sX()V
+.method protected final sV()V
     .locals 2
 
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/dw$b;->asH:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/dw$b;->asD:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dw$b;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dw$b;->avJ: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;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dw$b;->avJ: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;->avN:Lcom/google/android/gms/internal/measurement/dw;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/dw$b;->avJ:Lcom/google/android/gms/internal/measurement/dw;
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/google/android/gms/internal/measurement/dw$b;->asH:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/internal/measurement/dw$b;->asD:Z
 
     :cond_0
     return-void
 .end method
 
-.method public final sZ()Lcom/google/android/gms/internal/measurement/dw;
+.method public final sX()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;->sY()Lcom/google/android/gms/internal/measurement/dw;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sW()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;->sR()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dw;->sP()Z
 
     move-result v1
 
@@ -491,20 +491,20 @@
     throw v0
 .end method
 
-.method public final synthetic ta()Lcom/google/android/gms/internal/measurement/fg;
+.method public final synthetic sY()Lcom/google/android/gms/internal/measurement/fg;
     .locals 1
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sY()Lcom/google/android/gms/internal/measurement/dw;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sW()Lcom/google/android/gms/internal/measurement/dw;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final synthetic tb()Lcom/google/android/gms/internal/measurement/fg;
+.method public final synthetic sZ()Lcom/google/android/gms/internal/measurement/fg;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sZ()Lcom/google/android/gms/internal/measurement/dw;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()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 e9a163d5b1..d263d7ba18 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;->sK()Lcom/google/android/gms/internal/measurement/do;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/do;->sI()Lcom/google/android/gms/internal/measurement/do;
 
     move-result-object v0
 
@@ -59,7 +59,7 @@
 
 
 # virtual methods
-.method final sK()Lcom/google/android/gms/internal/measurement/do;
+.method final sI()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;->atG:Z
+    iget-boolean v0, v0, Lcom/google/android/gms/internal/measurement/do;->atC: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 49bf8d749c..1f78bbf94a 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 afg:I = 0x2
+.field public static final enum afc:I = 0x2
 
-.field public static final enum anu:I = 0x2
+.field public static final enum anq:I = 0x2
 
-.field public static final enum auq:I = 0x1
+.field public static final enum aum:I = 0x1
 
-.field private static final synthetic avP:[I
+.field private static final synthetic avL:[I
 
-.field private static final synthetic avQ:[I
+.field private static final synthetic avM:[I
 
-.field private static final synthetic avR:[I
+.field private static final synthetic avN:[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;->anu:I
+    sget v1, Lcom/google/android/gms/internal/measurement/dw$d;->anq:I
 
     const/4 v3, 0x1
 
@@ -100,7 +100,7 @@
 
     aput v1, v0, v5
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dw$d;->avP:[I
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dw$d;->avL:[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;->avQ:[I
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dw$d;->avM:[I
 
     new-array v0, v4, [I
 
-    sget v1, Lcom/google/android/gms/internal/measurement/dw$d;->auq:I
+    sget v1, Lcom/google/android/gms/internal/measurement/dw$d;->aum:I
 
     aput v1, v0, v2
 
-    sget v1, Lcom/google/android/gms/internal/measurement/dw$d;->afg:I
+    sget v1, Lcom/google/android/gms/internal/measurement/dw$d;->afc:I
 
     aput v1, v0, v3
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dw$d;->avR:[I
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dw$d;->avN:[I
 
     return-void
 .end method
 
-.method public static tc()[I
+.method public static ta()[I
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/dw$d;->avP:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dw$d;->avL:[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 f41c6728ba..d93db54927 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;->tZ()Lcom/google/android/gms/internal/measurement/gq;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gq;->tX()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;->tJ()Lcom/google/android/gms/internal/measurement/fr;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fr;->tH()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;->anu:I
+    sget p1, Lcom/google/android/gms/internal/measurement/dw$d;->anq: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;->tJ()Lcom/google/android/gms/internal/measurement/fr;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fr;->tH()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;->aut:Lcom/google/android/gms/internal/measurement/dh;
+    iget-object v1, p1, Lcom/google/android/gms/internal/measurement/df;->aup:Lcom/google/android/gms/internal/measurement/dh;
 
     if-eqz v1, :cond_0
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/df;->aut:Lcom/google/android/gms/internal/measurement/dh;
+    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/df;->aup: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;->tJ()Lcom/google/android/gms/internal/measurement/fr;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fr;->tH()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;->tJ()Lcom/google/android/gms/internal/measurement/fr;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fr;->tH()Lcom/google/android/gms/internal/measurement/fr;
 
     move-result-object v0
 
@@ -508,7 +508,7 @@
     return v0
 .end method
 
-.method final rK()I
+.method final rI()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 sQ()Lcom/google/android/gms/internal/measurement/dw$b;
+.method protected final sO()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 sR()Z
+.method public final sP()Z
     .locals 1
 
     const/4 v0, 0x1
@@ -551,7 +551,7 @@
     return v0
 .end method
 
-.method public final sS()Lcom/google/android/gms/internal/measurement/dw$b;
+.method public final sQ()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 sT()I
+.method public final sR()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;->tJ()Lcom/google/android/gms/internal/measurement/fr;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fr;->tH()Lcom/google/android/gms/internal/measurement/fr;
 
     move-result-object v0
 
@@ -601,7 +601,7 @@
     return v0
 .end method
 
-.method public final synthetic sU()Lcom/google/android/gms/internal/measurement/ff;
+.method public final synthetic sS()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 sV()Lcom/google/android/gms/internal/measurement/ff;
+.method public final synthetic sT()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 sW()Lcom/google/android/gms/internal/measurement/fg;
+.method public final synthetic sU()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 184f9e85ed..7b8bd9ecd5 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 avS:Lcom/google/android/gms/internal/measurement/dx;
+.field private static final avO: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;->avS:Lcom/google/android/gms/internal/measurement/dx;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dx;->avO:Lcom/google/android/gms/internal/measurement/dx;
 
     return-void
 .end method
@@ -31,10 +31,10 @@
     return-void
 .end method
 
-.method public static td()Lcom/google/android/gms/internal/measurement/dx;
+.method public static tb()Lcom/google/android/gms/internal/measurement/dx;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/dx;->avS:Lcom/google/android/gms/internal/measurement/dx;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dx;->avO: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 30dd8989b7..007e309078 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 avT:Ljava/nio/charset/Charset;
+.field static final avP:Ljava/nio/charset/Charset;
 
-.field private static final avU:Ljava/nio/charset/Charset;
+.field private static final avQ:Ljava/nio/charset/Charset;
 
-.field private static final avV:Ljava/nio/ByteBuffer;
+.field private static final avR:Ljava/nio/ByteBuffer;
 
-.field private static final avW:Lcom/google/android/gms/internal/measurement/da;
+.field private static final avS: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;->avT:Ljava/nio/charset/Charset;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dy;->avP: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;->avU:Ljava/nio/charset/Charset;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dy;->avQ: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;->avV:Ljava/nio/ByteBuffer;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dy;->avR: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;->avW:Lcom/google/android/gms/internal/measurement/da;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dy;->avS: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;->sU()Lcom/google/android/gms/internal/measurement/ff;
+    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/fg;->sS()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;->ta()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/ff;->sY()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;->avT:Ljava/nio/charset/Charset;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dy;->avP: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 te()Z
+.method static tc()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 735aa62f0f..a6b96525d3 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 avX:Lcom/google/android/gms/internal/measurement/dz;
+.field private static final avT:Lcom/google/android/gms/internal/measurement/dz;
 
 
 # instance fields
-.field private anC:[I
+.field private any:[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;->avX:Lcom/google/android/gms/internal/measurement/dz;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dz;->avT:Lcom/google/android/gms/internal/measurement/dz;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ch;->rM()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ch;->rK()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;->anC:[I
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/dz;->any:[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 tf()Lcom/google/android/gms/internal/measurement/dz;
+.method public static td()Lcom/google/android/gms/internal/measurement/dz;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/dz;->avX:Lcom/google/android/gms/internal/measurement/dz;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dz;->avT: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;->rA()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->ry()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;->anC:[I
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dz;->any:[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;->anC:[I
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dz;->any:[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;->anC:[I
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/dz;->any:[I
 
     :goto_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dz;->anC:[I
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dz;->any:[I
 
     aput p2, v0, p1
 
@@ -254,7 +254,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rA()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->ry()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;->anC:[I
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dz;->any:[I
 
     array-length v2, v0
 
@@ -300,12 +300,12 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/dz;->anC:[I
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/dz;->any:[I
 
     :cond_2
-    iget-object v0, p1, Lcom/google/android/gms/internal/measurement/dz;->anC:[I
+    iget-object v0, p1, Lcom/google/android/gms/internal/measurement/dz;->any:[I
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/dz;->anC:[I
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/dz;->any:[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;->rA()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->ry()V
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/dz;->zzc:I
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dz;->anC:[I
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dz;->any:[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;->anC:[I
+    iput-object v2, p0, Lcom/google/android/gms/internal/measurement/dz;->any:[I
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dz;->anC:[I
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dz;->any:[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;->anC:[I
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dz;->any:[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;->anC:[I
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dz;->any:[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;->anC:[I
+    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/dz;->any:[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;->anC:[I
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/dz;->any:[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;->anC:[I
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/dz;->any:[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;->rA()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->ry()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;->anC:[I
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dz;->any:[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;->rA()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->ry()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;->anC:[I
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/dz;->any:[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;->anC:[I
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dz;->any:[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;->rA()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->ry()V
 
     if-lt p2, p1, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dz;->anC:[I
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dz;->any:[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;->rA()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->ry()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;->anC:[I
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dz;->any:[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 40fb168123..4461f58d8b 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 asw:Lcom/google/android/gms/internal/measurement/me;
+.field private final synthetic ass:Lcom/google/android/gms/internal/measurement/me;
 
-.field private final synthetic asx:Landroid/app/Activity;
+.field private final synthetic ast: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;->asw:Lcom/google/android/gms/internal/measurement/me;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/e;->ass:Lcom/google/android/gms/internal/measurement/me;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/e;->asx:Landroid/app/Activity;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/e;->ast: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;->asw:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/e;->ass: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;->asx:Landroid/app/Activity;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/e;->ast: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;->any:J
+    iget-wide v5, p0, Lcom/google/android/gms/internal/measurement/e;->anu: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 99a0aa91d9..b84f3233c0 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 pJ()I
+.method public abstract pH()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 b390ce42d1..50ec96bd3d 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 pH()Z
+.method public abstract pF()Z
 .end method
 
-.method public abstract rM()V
+.method public abstract rK()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 af3818e564..57d5bb8834 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 tg()Lcom/google/android/gms/internal/measurement/eh;
+.method static te()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 th()Lcom/google/android/gms/internal/measurement/eh;
+.method static tf()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 ti()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;
@@ -56,7 +56,7 @@
     return-object v0
 .end method
 
-.method static tj()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;
@@ -68,7 +68,7 @@
     return-object v0
 .end method
 
-.method static tk()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;
@@ -80,7 +80,7 @@
     return-object v0
 .end method
 
-.method static tl()Lcom/google/android/gms/internal/measurement/eg;
+.method static tj()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 tm()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;
@@ -104,7 +104,7 @@
     return-object v0
 .end method
 
-.method static tn()Lcom/google/android/gms/internal/measurement/eh;
+.method static tl()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 0cbf9fce56..71c8bf3b8e 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 tp()Lcom/google/android/gms/internal/measurement/fg;
+.method public static tm()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 ba697a5bd9..cdde6fb318 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,6 +14,14 @@
 
 
 # static fields
+.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 public static final enum avZ:Lcom/google/android/gms/internal/measurement/ej;
@@ -26,15 +34,7 @@
 
 .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;
+.field private static final synthetic awe:[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;->avY:Lcom/google/android/gms/internal/measurement/ej;
+    sput-object v6, Lcom/google/android/gms/internal/measurement/ej;->avU: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;->avZ:Lcom/google/android/gms/internal/measurement/ej;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ej;->avV: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;->awa:Lcom/google/android/gms/internal/measurement/ej;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ej;->avW: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;->awb:Lcom/google/android/gms/internal/measurement/ej;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ej;->avX: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;->awc:Lcom/google/android/gms/internal/measurement/ej;
+    sput-object v0, 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;
 
@@ -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;->awd: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;
 
@@ -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;->awe: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;
 
@@ -211,7 +211,7 @@
 
     const-class v12, 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;
+    sget-object v13, Lcom/google/android/gms/internal/measurement/cn;->auf: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;->awf: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;
 
@@ -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;->awg: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;
 
@@ -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;->awh: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;
 
     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;->avY:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v2, Lcom/google/android/gms/internal/measurement/ej;->avU:Lcom/google/android/gms/internal/measurement/ej;
 
     aput-object v2, v0, v1
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ej;->avZ:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ej;->avV: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;->awa:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ej;->avW: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;->awb:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ej;->avX: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;->awc:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ej;->avY: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;->awd: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, 0x5
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ej;->awe: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, 0x6
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ej;->awf: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, 0x7
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ej;->awg: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/16 v2, 0x8
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ej;->awh: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/16 v2, 0x9
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ej;->awi:[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;
 
     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;->awi:[Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ej;->awe:[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 00efd18173..f7ceccb701 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 awj:Ljava/util/Map$Entry;
+.field awf: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;->awj:Ljava/util/Map$Entry;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ek;->awf: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;->awj:Ljava/util/Map$Entry;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ek;->awf: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;->awj:Ljava/util/Map$Entry;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ek;->awf: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;->tp()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ei;->tm()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;->awj:Ljava/util/Map$Entry;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ek;->awf: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;->awl:Lcom/google/android/gms/internal/measurement/fg;
+    iget-object v1, v0, Lcom/google/android/gms/internal/measurement/el;->awh:Lcom/google/android/gms/internal/measurement/fg;
 
     const/4 v2, 0x0
 
-    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;->awg: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 v2, v0, Lcom/google/android/gms/internal/measurement/el;->awi:Lcom/google/android/gms/internal/measurement/cn;
 
-    iput-object p1, v0, Lcom/google/android/gms/internal/measurement/el;->awl:Lcom/google/android/gms/internal/measurement/fg;
+    iput-object p1, v0, Lcom/google/android/gms/internal/measurement/el;->awh: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 3348dd8b0d..0ddf66e536 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 aue:Lcom/google/android/gms/internal/measurement/di;
+.field private static final aua:Lcom/google/android/gms/internal/measurement/di;
 
 
 # instance fields
-.field awk:Lcom/google/android/gms/internal/measurement/cn;
+.field awg:Lcom/google/android/gms/internal/measurement/cn;
 
-.field volatile awl:Lcom/google/android/gms/internal/measurement/fg;
+.field volatile awh:Lcom/google/android/gms/internal/measurement/fg;
 
-.field volatile awm:Lcom/google/android/gms/internal/measurement/cn;
+.field volatile awi: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;->sC()Lcom/google/android/gms/internal/measurement/di;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/di;->sA()Lcom/google/android/gms/internal/measurement/di;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/el;->aue:Lcom/google/android/gms/internal/measurement/di;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/el;->aua: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;->awl:Lcom/google/android/gms/internal/measurement/fg;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/el;->awh: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;->awl:Lcom/google/android/gms/internal/measurement/fg;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/el;->awh: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;->awl:Lcom/google/android/gms/internal/measurement/fg;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/el;->awh:Lcom/google/android/gms/internal/measurement/fg;
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/cn;->auj:Lcom/google/android/gms/internal/measurement/cn;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/cn;->auf: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;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/el;->awi: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;->awl:Lcom/google/android/gms/internal/measurement/fg;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/el;->awh:Lcom/google/android/gms/internal/measurement/fg;
 
-    sget-object p1, Lcom/google/android/gms/internal/measurement/cn;->auj:Lcom/google/android/gms/internal/measurement/cn;
+    sget-object p1, Lcom/google/android/gms/internal/measurement/cn;->auf: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;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/el;->awi: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;->awl:Lcom/google/android/gms/internal/measurement/fg;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/el;->awh: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;->awl:Lcom/google/android/gms/internal/measurement/fg;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/el;->awh: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;
+    iget-object v1, p1, Lcom/google/android/gms/internal/measurement/el;->awh: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;->tq()Lcom/google/android/gms/internal/measurement/cn;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/el;->tn()Lcom/google/android/gms/internal/measurement/cn;
 
     move-result-object v0
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/el;->tq()Lcom/google/android/gms/internal/measurement/cn;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/el;->tn()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;->sW()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/fg;->sU()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;->sW()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-interface {v1}, Lcom/google/android/gms/internal/measurement/fg;->sU()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object p1
 
@@ -195,29 +195,29 @@
     return v0
 .end method
 
-.method public final pK()I
+.method public final pI()I
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/el;->awm:Lcom/google/android/gms/internal/measurement/cn;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/el;->awi:Lcom/google/android/gms/internal/measurement/cn;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/el;->awm:Lcom/google/android/gms/internal/measurement/cn;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/el;->awi:Lcom/google/android/gms/internal/measurement/cn;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cn;->pJ()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cn;->pH()I
 
     move-result v0
 
     return v0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/el;->awl:Lcom/google/android/gms/internal/measurement/fg;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/el;->awh:Lcom/google/android/gms/internal/measurement/fg;
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/el;->awl:Lcom/google/android/gms/internal/measurement/fg;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/el;->awh:Lcom/google/android/gms/internal/measurement/fg;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/fg;->sT()I
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/fg;->sR()I
 
     move-result v0
 
@@ -229,14 +229,14 @@
     return v0
 .end method
 
-.method public final tq()Lcom/google/android/gms/internal/measurement/cn;
+.method public final tn()Lcom/google/android/gms/internal/measurement/cn;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/el;->awm:Lcom/google/android/gms/internal/measurement/cn;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/el;->awi:Lcom/google/android/gms/internal/measurement/cn;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/el;->awm:Lcom/google/android/gms/internal/measurement/cn;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/el;->awi: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;->awm:Lcom/google/android/gms/internal/measurement/cn;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/el;->awi:Lcom/google/android/gms/internal/measurement/cn;
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/el;->awm:Lcom/google/android/gms/internal/measurement/cn;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/el;->awi: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;->awl:Lcom/google/android/gms/internal/measurement/fg;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/el;->awh:Lcom/google/android/gms/internal/measurement/fg;
 
     if-nez v0, :cond_2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/cn;->auj:Lcom/google/android/gms/internal/measurement/cn;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/cn;->auf: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;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/el;->awi:Lcom/google/android/gms/internal/measurement/cn;
 
     goto :goto_0
 
     :cond_2
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/el;->awl:Lcom/google/android/gms/internal/measurement/fg;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/el;->awh:Lcom/google/android/gms/internal/measurement/fg;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/fg;->rI()Lcom/google/android/gms/internal/measurement/cn;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/fg;->rG()Lcom/google/android/gms/internal/measurement/cn;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/el;->awm:Lcom/google/android/gms/internal/measurement/cn;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/el;->awi:Lcom/google/android/gms/internal/measurement/cn;
 
     :goto_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/el;->awm:Lcom/google/android/gms/internal/measurement/cn;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/el;->awi: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 b816944496..8d78058d44 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 awn:Ljava/util/Iterator;
+.field private awj: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;->awn:Ljava/util/Iterator;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/em;->awj: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;->awn:Ljava/util/Iterator;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/em;->awj: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;->awn:Ljava/util/Iterator;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/em;->awj: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;->awn:Ljava/util/Iterator;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/em;->awj: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 1a2d5b6c30..30befb8162 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 ql()Ljava/util/List;
+.method public abstract qj()Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
@@ -23,5 +23,5 @@
     .end annotation
 .end method
 
-.method public abstract tr()Lcom/google/android/gms/internal/measurement/en;
+.method public abstract tp()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 7e08ffd60f..949697819c 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 awo:Lcom/google/android/gms/internal/measurement/eo;
+.field private static final awk:Lcom/google/android/gms/internal/measurement/eo;
 
-.field private static final awp:Lcom/google/android/gms/internal/measurement/en;
+.field private static final awl:Lcom/google/android/gms/internal/measurement/en;
 
 
 # instance fields
-.field private final awq:Ljava/util/List;
+.field private final awm: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;->awo:Lcom/google/android/gms/internal/measurement/eo;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/eo;->awk:Lcom/google/android/gms/internal/measurement/eo;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ch;->rM()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ch;->rK()V
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/eo;->awo:Lcom/google/android/gms/internal/measurement/eo;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/eo;->awk:Lcom/google/android/gms/internal/measurement/eo;
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/eo;->awp:Lcom/google/android/gms/internal/measurement/en;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/eo;->awl: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;->awq:Ljava/util/List;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/eo;->awm: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;->rD()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cn;->rB()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;->rA()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->ry()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eo;->awq:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eo;->awm: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;->rA()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->ry()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eo;->awq:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eo;->awm: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;->rA()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->ry()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;->ql()Ljava/util/List;
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/en;->qj()Ljava/util/List;
 
     move-result-object p2
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eo;->awq:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eo;->awm: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;->awq:Ljava/util/List;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/eo;->awm: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;->rA()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->ry()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eo;->awq:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eo;->awm: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;->awq:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eo;->awm: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;->awq:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eo;->awm: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;->rD()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cn;->rB()Ljava/lang/String;
 
     move-result-object v1
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cn;->nO()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cn;->nM()Z
 
     move-result v0
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eo;->awq:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eo;->awm: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;->awq:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eo;->awm: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 pH()Z
+.method public final bridge synthetic pF()Z
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/internal/measurement/ch;->pH()Z
+    invoke-super {p0}, Lcom/google/android/gms/internal/measurement/ch;->pF()Z
 
     move-result v0
 
     return v0
 .end method
 
-.method public final ql()Ljava/util/List;
+.method public final qj()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;->awq:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eo;->awm: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;->rA()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->ry()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eo;->awq:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eo;->awm: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;->rA()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->ry()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eo;->awq:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eo;->awm: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;->awq:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eo;->awm:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
@@ -491,10 +491,10 @@
     return v0
 .end method
 
-.method public final tr()Lcom/google/android/gms/internal/measurement/en;
+.method public final tp()Lcom/google/android/gms/internal/measurement/en;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->pH()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->pF()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 331f0f3b80..0acc4e848b 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 awr:Lcom/google/android/gms/internal/measurement/ep;
+.field private static final awn:Lcom/google/android/gms/internal/measurement/ep;
 
-.field private static final aws:Lcom/google/android/gms/internal/measurement/ep;
+.field private static final awo: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;->awr:Lcom/google/android/gms/internal/measurement/ep;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ep;->awn: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;->aws:Lcom/google/android/gms/internal/measurement/ep;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ep;->awo:Lcom/google/android/gms/internal/measurement/ep;
 
     return-void
 .end method
@@ -46,18 +46,18 @@
     return-void
 .end method
 
-.method static ts()Lcom/google/android/gms/internal/measurement/ep;
+.method static tq()Lcom/google/android/gms/internal/measurement/ep;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ep;->awr:Lcom/google/android/gms/internal/measurement/ep;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ep;->awn:Lcom/google/android/gms/internal/measurement/ep;
 
     return-object v0
 .end method
 
-.method static tt()Lcom/google/android/gms/internal/measurement/ep;
+.method static tr()Lcom/google/android/gms/internal/measurement/ep;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ep;->aws:Lcom/google/android/gms/internal/measurement/ep;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ep;->awo: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 6345972005..ea2817ffa0 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;->pH()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ee;->pF()Z
 
     move-result v1
 
@@ -130,7 +130,7 @@
 
     if-lez v2, :cond_1
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ee;->pH()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ee;->pF()Z
 
     move-result v3
 
@@ -163,7 +163,7 @@
 
     move-result-object p1
 
-    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/ee;->rM()V
+    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/ee;->rK()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 aaeea487b7..f89f7b3c2a 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 auf:Ljava/lang/Class;
+.field private static final aub: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;->auf:Ljava/lang/Class;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/es;->aub: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;->auf:Ljava/lang/Class;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/es;->aub: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;->pH()Z
+    invoke-interface {v1}, Lcom/google/android/gms/internal/measurement/ee;->pF()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;->tr()Lcom/google/android/gms/internal/measurement/en;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/en;->tp()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;->auf:Ljava/lang/Class;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/es;->aub: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;->pH()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ee;->pF()Z
 
     move-result p1
 
     if-eqz p1, :cond_2
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ee;->rM()V
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ee;->rK()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 a5ce997fc6..a6746a02c3 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 awu:Lcom/google/android/gms/internal/measurement/fd;
+.field private static final awq:Lcom/google/android/gms/internal/measurement/fd;
 
 
 # instance fields
-.field private final awt:Lcom/google/android/gms/internal/measurement/fd;
+.field private final awp: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;->awu:Lcom/google/android/gms/internal/measurement/fd;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/et;->awq: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;->td()Lcom/google/android/gms/internal/measurement/dx;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/dx;->tb()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;->tu()Lcom/google/android/gms/internal/measurement/fd;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/et;->ts()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;->awt:Lcom/google/android/gms/internal/measurement/fd;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/et;->awp: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;->pJ()I
+    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/fe;->pH()I
 
     move-result p0
 
@@ -98,7 +98,7 @@
     return p0
 .end method
 
-.method private static tu()Lcom/google/android/gms/internal/measurement/fd;
+.method private static ts()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;->awu:Lcom/google/android/gms/internal/measurement/fd;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/et;->awq: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;->awt:Lcom/google/android/gms/internal/measurement/fd;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/et;->awp: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;->tP()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;->sI()Lcom/google/android/gms/internal/measurement/dk;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/dl;->sG()Lcom/google/android/gms/internal/measurement/dk;
 
     move-result-object v0
 
-    invoke-interface {v1}, Lcom/google/android/gms/internal/measurement/fe;->tE()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-interface {v1}, Lcom/google/android/gms/internal/measurement/fe;->tC()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;->tN()Lcom/google/android/gms/internal/measurement/gn;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fy;->tL()Lcom/google/android/gms/internal/measurement/gn;
 
     move-result-object p1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/dl;->sJ()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
 
-    invoke-interface {v1}, Lcom/google/android/gms/internal/measurement/fe;->tE()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-interface {v1}, Lcom/google/android/gms/internal/measurement/fe;->tC()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;->tH()Lcom/google/android/gms/internal/measurement/fo;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fq;->tF()Lcom/google/android/gms/internal/measurement/fo;
 
     move-result-object v2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ep;->tt()Lcom/google/android/gms/internal/measurement/ep;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ep;->tr()Lcom/google/android/gms/internal/measurement/ep;
 
     move-result-object v3
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fy;->tP()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;->sI()Lcom/google/android/gms/internal/measurement/dk;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/dl;->sG()Lcom/google/android/gms/internal/measurement/dk;
 
     move-result-object v5
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fb;->tC()Lcom/google/android/gms/internal/measurement/ez;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fb;->tA()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;->tH()Lcom/google/android/gms/internal/measurement/fo;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fq;->tF()Lcom/google/android/gms/internal/measurement/fo;
 
     move-result-object v2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ep;->tt()Lcom/google/android/gms/internal/measurement/ep;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ep;->tr()Lcom/google/android/gms/internal/measurement/ep;
 
     move-result-object v3
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fy;->tP()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
 
     const/4 v5, 0x0
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fb;->tC()Lcom/google/android/gms/internal/measurement/ez;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fb;->tA()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;->tG()Lcom/google/android/gms/internal/measurement/fo;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fq;->tE()Lcom/google/android/gms/internal/measurement/fo;
 
     move-result-object v2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ep;->ts()Lcom/google/android/gms/internal/measurement/ep;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ep;->tq()Lcom/google/android/gms/internal/measurement/ep;
 
     move-result-object v3
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fy;->tN()Lcom/google/android/gms/internal/measurement/gn;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fy;->tL()Lcom/google/android/gms/internal/measurement/gn;
 
     move-result-object v4
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/dl;->sJ()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 v5
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fb;->tB()Lcom/google/android/gms/internal/measurement/ez;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fb;->tz()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;->tG()Lcom/google/android/gms/internal/measurement/fo;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fq;->tE()Lcom/google/android/gms/internal/measurement/fo;
 
     move-result-object v2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ep;->ts()Lcom/google/android/gms/internal/measurement/ep;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ep;->tq()Lcom/google/android/gms/internal/measurement/ep;
 
     move-result-object v3
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fy;->tO()Lcom/google/android/gms/internal/measurement/gn;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fy;->tM()Lcom/google/android/gms/internal/measurement/gn;
 
     move-result-object v4
 
     const/4 v5, 0x0
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fb;->tB()Lcom/google/android/gms/internal/measurement/ez;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fb;->tz()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 0fae049f10..e60fa3481f 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 awv:Lcom/google/android/gms/internal/measurement/eu;
+.field private static final awr:Lcom/google/android/gms/internal/measurement/eu;
 
 
 # instance fields
-.field private aww:[J
+.field private aws:[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;->awv:Lcom/google/android/gms/internal/measurement/eu;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/eu;->awr:Lcom/google/android/gms/internal/measurement/eu;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ch;->rM()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ch;->rK()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;->aww:[J
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/eu;->aws:[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 tv()Lcom/google/android/gms/internal/measurement/eu;
+.method public static tt()Lcom/google/android/gms/internal/measurement/eu;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/eu;->awv:Lcom/google/android/gms/internal/measurement/eu;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/eu;->awr: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;->rA()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->ry()V
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/eu;->zzc:I
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/eu;->aww:[J
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/eu;->aws:[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;->aww:[J
+    iput-object v2, p0, Lcom/google/android/gms/internal/measurement/eu;->aws:[J
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eu;->aww:[J
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eu;->aws:[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;->rA()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->ry()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;->aww:[J
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/eu;->aws:[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;->aww:[J
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/eu;->aws:[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;->aww:[J
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/eu;->aws:[J
 
     :goto_0
-    iget-object p2, p0, Lcom/google/android/gms/internal/measurement/eu;->aww:[J
+    iget-object p2, p0, Lcom/google/android/gms/internal/measurement/eu;->aws:[J
 
     aput-wide v0, p2, p1
 
@@ -295,7 +295,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rA()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->ry()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;->aww:[J
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eu;->aws:[J
 
     array-length v2, v0
 
@@ -341,12 +341,12 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/eu;->aww:[J
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/eu;->aws:[J
 
     :cond_2
-    iget-object v0, p1, Lcom/google/android/gms/internal/measurement/eu;->aww:[J
+    iget-object v0, p1, Lcom/google/android/gms/internal/measurement/eu;->aws:[J
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/eu;->aww:[J
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/eu;->aws:[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;->aww:[J
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eu;->aws:[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;->aww:[J
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/eu;->aws:[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;->aww:[J
+    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/eu;->aws:[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;->aww:[J
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/eu;->aws:[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;->aww:[J
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/eu;->aws:[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;->rA()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->ry()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;->aww:[J
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eu;->aws:[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;->rA()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->ry()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;->aww:[J
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/eu;->aws:[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;->aww:[J
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/eu;->aws:[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;->rA()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->ry()V
 
     if-lt p2, p1, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eu;->aww:[J
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eu;->aws:[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;->rA()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->ry()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;->aww:[J
+    iget-object p2, p0, Lcom/google/android/gms/internal/measurement/eu;->aws:[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 6dd332c0e7..4fb1c8d1de 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 awx:[Lcom/google/android/gms/internal/measurement/fd;
+.field private awt:[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;->awx:[Lcom/google/android/gms/internal/measurement/fd;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ev;->awt:[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;->awx:[Lcom/google/android/gms/internal/measurement/fd;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ev;->awt:[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;->awx:[Lcom/google/android/gms/internal/measurement/fd;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ev;->awt:[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 f1bb7aa8f8..93fdf31192 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 atN:Ljava/lang/Object;
+.field public final atJ:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TK;"
@@ -25,7 +25,7 @@
     .end annotation
 .end field
 
-.field public final atY:Ljava/lang/Object;
+.field public final atU:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TV;"
@@ -33,6 +33,6 @@
     .end annotation
 .end field
 
-.field public final awy:Lcom/google/android/gms/internal/measurement/he;
+.field public final awu:Lcom/google/android/gms/internal/measurement/he;
 
-.field public final awz:Lcom/google/android/gms/internal/measurement/he;
+.field public final awv: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 badeeb46a0..d8eb293dd0 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;->awy:Lcom/google/android/gms/internal/measurement/he;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ex;->awu: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;->awz:Lcom/google/android/gms/internal/measurement/he;
+    iget-object p0, p0, Lcom/google/android/gms/internal/measurement/ex;->awv: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;->awy:Lcom/google/android/gms/internal/measurement/he;
+    iget-object v0, p1, Lcom/google/android/gms/internal/measurement/ex;->awu: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;->awz:Lcom/google/android/gms/internal/measurement/he;
+    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/ex;->awv: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 a94c5b2f9e..ed4560ae2d 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 tw()Ljava/lang/Object;
+.method public abstract tu()Ljava/lang/Object;
 .end method
 
-.method public abstract tx()Lcom/google/android/gms/internal/measurement/ex;
+.method public abstract tv()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 4226457206..919344c647 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 anq:Ljava/lang/String;
+.field private final synthetic anm:Ljava/lang/String;
 
-.field private final synthetic asu:Lcom/google/android/gms/internal/measurement/me;
+.field private final synthetic asq: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;->asu:Lcom/google/android/gms/internal/measurement/me;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/f;->asq:Lcom/google/android/gms/internal/measurement/me;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/f;->anq:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/f;->anm: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;->asu:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/f;->asq: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;->anq:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/f;->anm:Ljava/lang/String;
 
-    iget-wide v2, p0, Lcom/google/android/gms/internal/measurement/f;->anz:J
+    iget-wide v2, p0, Lcom/google/android/gms/internal/measurement/f;->anv: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 c7a6a2ad5d..af22e45360 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 awA:Lcom/google/android/gms/internal/measurement/fa;
+.field private static final aww: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;->awA:Lcom/google/android/gms/internal/measurement/fa;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/fa;->aww:Lcom/google/android/gms/internal/measurement/fa;
 
     const/4 v1, 0x0
 
@@ -107,7 +107,7 @@
     throw p0
 .end method
 
-.method public static ty()Lcom/google/android/gms/internal/measurement/fa;
+.method public static tw()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;->awA:Lcom/google/android/gms/internal/measurement/fa;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fa;->aww: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;->tA()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/fa;->ty()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;->tA()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/fa;->ty()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;->tA()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/fa;->ty()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;->tA()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/fa;->ty()V
 
     invoke-super {p0, p1}, Ljava/util/LinkedHashMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -425,24 +425,7 @@
     return-object p1
 .end method
 
-.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;
+.method public final tx()Lcom/google/android/gms/internal/measurement/fa;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -471,3 +454,20 @@
 
     return-object v0
 .end method
+
+.method final ty()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 2c4a7d64b5..c6d1c070a6 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,47 +4,39 @@
 
 
 # static fields
-.field private static final awB:Lcom/google/android/gms/internal/measurement/ez;
+.field private static final awx:Lcom/google/android/gms/internal/measurement/ez;
 
-.field private static final awC:Lcom/google/android/gms/internal/measurement/ez;
+.field private static final awy: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;->tD()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 v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/fb;->awB:Lcom/google/android/gms/internal/measurement/ez;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/fb;->awx: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;->awC:Lcom/google/android/gms/internal/measurement/ez;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/fb;->awy:Lcom/google/android/gms/internal/measurement/ez;
 
     return-void
 .end method
 
-.method static tB()Lcom/google/android/gms/internal/measurement/ez;
+.method static tA()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;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fb;->awy: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;
+.method private static tB()Lcom/google/android/gms/internal/measurement/ez;
     .locals 3
 
     :try_start_0
@@ -79,3 +71,11 @@
 
     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;->awx: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 91ce0a0fc3..48f53464da 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;->tz()Lcom/google/android/gms/internal/measurement/fa;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/fa;->tx()Lcom/google/android/gms/internal/measurement/fa;
 
     move-result-object p1
 
     :cond_0
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/fa;->tA()V
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/fa;->ty()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 tw()Ljava/lang/Object;
+.method public final tu()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fa;->ty()Lcom/google/android/gms/internal/measurement/fa;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fa;->tw()Lcom/google/android/gms/internal/measurement/fa;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/fa;->tz()Lcom/google/android/gms/internal/measurement/fa;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/fa;->tx()Lcom/google/android/gms/internal/measurement/fa;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final tx()Lcom/google/android/gms/internal/measurement/ex;
+.method public final tv()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 3867fa3726..1f2a2df0cb 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 pJ()I
+.method public abstract pH()I
 .end method
 
-.method public abstract tE()Lcom/google/android/gms/internal/measurement/fg;
+.method public abstract tC()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 651f9d64f8..eecf27520c 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 ta()Lcom/google/android/gms/internal/measurement/fg;
+.method public abstract sY()Lcom/google/android/gms/internal/measurement/fg;
 .end method
 
-.method public abstract tb()Lcom/google/android/gms/internal/measurement/fg;
+.method public abstract sZ()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 d6f3bad7c9..fbc5a6947d 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 rI()Lcom/google/android/gms/internal/measurement/cn;
+.method public abstract rG()Lcom/google/android/gms/internal/measurement/cn;
 .end method
 
-.method public abstract sT()I
+.method public abstract sR()I
 .end method
 
-.method public abstract sU()Lcom/google/android/gms/internal/measurement/ff;
+.method public abstract sS()Lcom/google/android/gms/internal/measurement/ff;
 .end method
 
-.method public abstract sV()Lcom/google/android/gms/internal/measurement/ff;
+.method public abstract sT()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 a3d7151e75..86ec4712ff 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;->auj:Lcom/google/android/gms/internal/measurement/cn;
+    sget-object v7, Lcom/google/android/gms/internal/measurement/cn;->auf: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;->sW()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-interface {v7}, Lcom/google/android/gms/internal/measurement/fg;->sU()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;->sL()Ljava/util/Iterator;
+    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/do;->sJ()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 07e40b7464..7351ae3b4f 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 sR()Z
+.method public abstract sP()Z
 .end method
 
-.method public abstract sW()Lcom/google/android/gms/internal/measurement/fg;
+.method public abstract sU()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 6093c8b03a..79d5cfe591 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 atf:[I
+.field static final synthetic atb:[I
 
 
 # direct methods
@@ -19,12 +19,12 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/fj;->atf:[I
+    sput-object v0, Lcom/google/android/gms/internal/measurement/fj;->atb:[I
 
     :try_start_0
-    sget-object v0, Lcom/google/android/gms/internal/measurement/fj;->atf:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fj;->atb:[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;->axH: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;->atf:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fj;->atb:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axP: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
 
@@ -54,9 +54,9 @@
 
     :catch_1
     :try_start_2
-    sget-object v0, Lcom/google/android/gms/internal/measurement/fj;->atf:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fj;->atb:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->awy:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->awu: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;->atf:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fj;->atb:[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;->axG: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;->atf:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fj;->atb:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axS: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
 
@@ -102,9 +102,9 @@
 
     :catch_4
     :try_start_5
-    sget-object v0, Lcom/google/android/gms/internal/measurement/fj;->atf:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fj;->atb:[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;->axF: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;->atf:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fj;->atb:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axT: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
 
@@ -134,9 +134,9 @@
 
     :catch_6
     :try_start_7
-    sget-object v0, Lcom/google/android/gms/internal/measurement/fj;->atf:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fj;->atb:[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;->axC: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;->atf:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fj;->atb:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axR: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;
 
     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;->atf:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fj;->atb:[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;->axE: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;->atf:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fj;->atb:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axQ: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
 
@@ -198,9 +198,9 @@
 
     :catch_a
     :try_start_b
-    sget-object v0, Lcom/google/android/gms/internal/measurement/fj;->atf:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fj;->atb:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->awz:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->awv: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;->atf:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fj;->atb:[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;->axD: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;->atf:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fj;->atb:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axO: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
 
@@ -246,9 +246,9 @@
 
     :catch_d
     :try_start_e
-    sget-object v0, Lcom/google/android/gms/internal/measurement/fj;->atf:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fj;->atb:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axU: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
 
@@ -262,9 +262,9 @@
 
     :catch_e
     :try_start_f
-    sget-object v0, Lcom/google/android/gms/internal/measurement/fj;->atf:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fj;->atb:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axV: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
 
@@ -278,9 +278,9 @@
 
     :catch_f
     :try_start_10
-    sget-object v0, Lcom/google/android/gms/internal/measurement/fj;->atf:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fj;->atb:[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;->axI: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 42b891ecfb..0c6f87f8bf 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,29 +20,29 @@
 
 
 # static fields
-.field private static final atf:[I
+.field private static final atb:[I
 
-.field private static final awD:Lsun/misc/Unsafe;
+.field private static final awz:Lsun/misc/Unsafe;
 
 
 # instance fields
-.field private final anv:[I
+.field private final anr:[I
 
-.field private final avP:[I
+.field private final avL:[I
 
-.field private final awE:[Ljava/lang/Object;
+.field private final awA:[Ljava/lang/Object;
 
-.field private final awF:Lcom/google/android/gms/internal/measurement/fg;
+.field private final awB:Lcom/google/android/gms/internal/measurement/fg;
 
-.field private final awG:I
+.field private final awC:I
 
-.field private final awH:I
+.field private final awD:I
 
-.field private final awI:Lcom/google/android/gms/internal/measurement/fo;
+.field private final awE:Lcom/google/android/gms/internal/measurement/fo;
 
-.field private final awJ:Lcom/google/android/gms/internal/measurement/ep;
+.field private final awF:Lcom/google/android/gms/internal/measurement/ep;
 
-.field private final awK:Lcom/google/android/gms/internal/measurement/gn;
+.field private final awG:Lcom/google/android/gms/internal/measurement/gn;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/gn<",
@@ -51,7 +51,7 @@
     .end annotation
 .end field
 
-.field private final awL:Lcom/google/android/gms/internal/measurement/dk;
+.field private final awH:Lcom/google/android/gms/internal/measurement/dk;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/dk<",
@@ -60,7 +60,7 @@
     .end annotation
 .end field
 
-.field private final awM:Lcom/google/android/gms/internal/measurement/ez;
+.field private final awI: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;->atf:[I
+    sput-object v0, Lcom/google/android/gms/internal/measurement/fk;->atb:[I
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gu;->ub()Lsun/misc/Unsafe;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gu;->tZ()Lsun/misc/Unsafe;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/fk;->awD:Lsun/misc/Unsafe;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/fk;->awz: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;->anv:[I
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/fk;->anr:[I
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/fk;->awE:[Ljava/lang/Object;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/fk;->awA:[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;->avP:[I
+    iput-object p7, p0, Lcom/google/android/gms/internal/measurement/fk;->avL:[I
 
-    iput p8, p0, Lcom/google/android/gms/internal/measurement/fk;->awG:I
+    iput p8, p0, Lcom/google/android/gms/internal/measurement/fk;->awC:I
 
-    iput p9, p0, Lcom/google/android/gms/internal/measurement/fk;->awH:I
+    iput p9, p0, Lcom/google/android/gms/internal/measurement/fk;->awD:I
 
-    iput-object p10, p0, Lcom/google/android/gms/internal/measurement/fk;->awI:Lcom/google/android/gms/internal/measurement/fo;
+    iput-object p10, p0, Lcom/google/android/gms/internal/measurement/fk;->awE:Lcom/google/android/gms/internal/measurement/fo;
 
-    iput-object p11, p0, Lcom/google/android/gms/internal/measurement/fk;->awJ:Lcom/google/android/gms/internal/measurement/ep;
+    iput-object p11, p0, Lcom/google/android/gms/internal/measurement/fk;->awF:Lcom/google/android/gms/internal/measurement/ep;
 
-    iput-object p12, p0, Lcom/google/android/gms/internal/measurement/fk;->awK:Lcom/google/android/gms/internal/measurement/gn;
+    iput-object p12, p0, Lcom/google/android/gms/internal/measurement/fk;->awG:Lcom/google/android/gms/internal/measurement/gn;
 
-    iput-object p13, p0, Lcom/google/android/gms/internal/measurement/fk;->awL:Lcom/google/android/gms/internal/measurement/dk;
+    iput-object p13, p0, Lcom/google/android/gms/internal/measurement/fk;->awH:Lcom/google/android/gms/internal/measurement/dk;
 
-    iput-object p5, p0, Lcom/google/android/gms/internal/measurement/fk;->awF:Lcom/google/android/gms/internal/measurement/fg;
+    iput-object p5, p0, Lcom/google/android/gms/internal/measurement/fk;->awB:Lcom/google/android/gms/internal/measurement/fg;
 
-    iput-object p14, p0, Lcom/google/android/gms/internal/measurement/fk;->awM:Lcom/google/android/gms/internal/measurement/ez;
+    iput-object p14, p0, Lcom/google/android/gms/internal/measurement/fk;->awI: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;->anv:[I
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/fk;->anr:[I
 
     aget v3, v3, v2
 
@@ -303,9 +303,9 @@
 
     move-object/from16 v11, p13
 
-    sget-object v12, Lcom/google/android/gms/internal/measurement/fk;->awD:Lsun/misc/Unsafe;
+    sget-object v12, Lcom/google/android/gms/internal/measurement/fk;->awz:Lsun/misc/Unsafe;
 
-    iget-object v7, v0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
+    iget-object v7, v0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anz:J
+    iget-wide v3, v11, Lcom/google/android/gms/internal/measurement/cm;->anv: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;->tn()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()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;->avT:Ljava/nio/charset/Charset;
+    sget-object v6, Lcom/google/android/gms/internal/measurement/dy;->avP: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;->anz:J
+    iget-wide v3, v11, Lcom/google/android/gms/internal/measurement/cm;->anv:J
 
     const-wide/16 v5, 0x0
 
@@ -690,7 +690,7 @@
 
     move-result v2
 
-    iget-wide v3, v11, Lcom/google/android/gms/internal/measurement/cm;->anz:J
+    iget-wide v3, v11, Lcom/google/android/gms/internal/measurement/cm;->anv: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;->awD:Lsun/misc/Unsafe;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/fk;->awz: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;->pH()Z
+    invoke-interface {v11}, Lcom/google/android/gms/internal/measurement/ee;->pF()Z
 
     move-result v12
 
@@ -843,7 +843,7 @@
 
     move-result-object v11
 
-    sget-object v12, Lcom/google/android/gms/internal/measurement/fk;->awD:Lsun/misc/Unsafe;
+    sget-object v12, Lcom/google/android/gms/internal/measurement/fk;->awz: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;->anz:J
+    iget-wide v4, v7, Lcom/google/android/gms/internal/measurement/cm;->anv: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;->tg()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->te()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;->anz:J
+    iget-wide v8, v7, Lcom/google/android/gms/internal/measurement/cm;->anv: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;->anz:J
+    iget-wide v8, v7, Lcom/google/android/gms/internal/measurement/cm;->anv: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;->tg()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->te()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;->tZ()Lcom/google/android/gms/internal/measurement/gq;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gq;->tX()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;->awK:Lcom/google/android/gms/internal/measurement/gn;
+    iget-object v5, v0, Lcom/google/android/gms/internal/measurement/fk;->awG: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;->auj:Lcom/google/android/gms/internal/measurement/cn;
+    sget-object v4, Lcom/google/android/gms/internal/measurement/cn;->auf: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;->auj:Lcom/google/android/gms/internal/measurement/cn;
+    sget-object v4, Lcom/google/android/gms/internal/measurement/cn;->auf: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;->tg()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->te()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object v1
 
     throw v1
 
     :cond_e
-    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;->tf()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object v1
 
     throw v1
 
     :cond_f
-    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;->te()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object v1
 
     throw v1
 
     :cond_10
-    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;->tf()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;->avT:Ljava/nio/charset/Charset;
+    sget-object v9, Lcom/google/android/gms/internal/measurement/dy;->avP: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;->avT:Ljava/nio/charset/Charset;
+    sget-object v9, Lcom/google/android/gms/internal/measurement/dy;->avP: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;->th()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tf()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object v1
 
     throw v1
 
     :cond_14
-    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;->tf()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;->avT:Ljava/nio/charset/Charset;
+    sget-object v10, Lcom/google/android/gms/internal/measurement/dy;->avP: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;->avT:Ljava/nio/charset/Charset;
+    sget-object v10, Lcom/google/android/gms/internal/measurement/dy;->avP: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;->tn()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object v1
 
     throw v1
 
     :cond_19
-    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;->tf()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object v1
 
     throw v1
 
     :cond_1a
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tn()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object v1
 
     throw v1
 
     :cond_1b
-    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;->tf()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;->anz:J
+    iget-wide v5, v7, Lcom/google/android/gms/internal/measurement/cm;->anv: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;->tg()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->te()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;->anz:J
+    iget-wide v8, v7, Lcom/google/android/gms/internal/measurement/cm;->anv:J
 
     cmp-long v6, v8, v14
 
@@ -1578,7 +1578,7 @@
 
     move-result v4
 
-    iget-wide v8, v7, Lcom/google/android/gms/internal/measurement/cm;->anz:J
+    iget-wide v8, v7, Lcom/google/android/gms/internal/measurement/cm;->anv: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;->tg()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->te()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;->tg()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->te()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;->anz:J
+    iget-wide v4, v7, Lcom/google/android/gms/internal/measurement/cm;->anv: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;->tg()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->te()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;->anz:J
+    iget-wide v8, v7, Lcom/google/android/gms/internal/measurement/cm;->anv: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;->anz:J
+    iget-wide v8, v7, Lcom/google/android/gms/internal/measurement/cm;->anv: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;->tg()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->te()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;->tg()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->te()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;->awD:Lsun/misc/Unsafe;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fk;->awz: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;->awM:Lcom/google/android/gms/internal/measurement/ez;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fk;->awI: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;->awM:Lcom/google/android/gms/internal/measurement/ez;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fk;->awI:Lcom/google/android/gms/internal/measurement/ez;
 
-    invoke-interface {v1}, Lcom/google/android/gms/internal/measurement/ez;->tw()Ljava/lang/Object;
+    invoke-interface {v1}, Lcom/google/android/gms/internal/measurement/ez;->tu()Ljava/lang/Object;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/fk;->awM:Lcom/google/android/gms/internal/measurement/ez;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/fk;->awI: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;->awM:Lcom/google/android/gms/internal/measurement/ez;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/fk;->awI:Lcom/google/android/gms/internal/measurement/ez;
 
-    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/ez;->tx()Lcom/google/android/gms/internal/measurement/ex;
+    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/ez;->tv()Lcom/google/android/gms/internal/measurement/ex;
 
     move-result-object p1
 
-    iget-object p6, p0, Lcom/google/android/gms/internal/measurement/fk;->awM:Lcom/google/android/gms/internal/measurement/ez;
+    iget-object p6, p0, Lcom/google/android/gms/internal/measurement/fk;->awI: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;->atN:Ljava/lang/Object;
+    iget-object p7, p1, Lcom/google/android/gms/internal/measurement/ex;->atJ:Ljava/lang/Object;
 
-    iget-object v0, p1, Lcom/google/android/gms/internal/measurement/ex;->atY:Ljava/lang/Object;
+    iget-object v0, p1, Lcom/google/android/gms/internal/measurement/ex;->atU: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;->awz:Lcom/google/android/gms/internal/measurement/he;
+    iget-object v1, p1, Lcom/google/android/gms/internal/measurement/ex;->awv: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;->awz:Lcom/google/android/gms/internal/measurement/he;
+    iget-object v4, p1, Lcom/google/android/gms/internal/measurement/ex;->awv:Lcom/google/android/gms/internal/measurement/he;
 
-    iget-object p3, p1, Lcom/google/android/gms/internal/measurement/ex;->atY:Ljava/lang/Object;
+    iget-object p3, p1, Lcom/google/android/gms/internal/measurement/ex;->atU: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;->awy:Lcom/google/android/gms/internal/measurement/he;
+    iget-object v1, p1, Lcom/google/android/gms/internal/measurement/ex;->awu: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;->awy:Lcom/google/android/gms/internal/measurement/he;
+    iget-object v4, p1, Lcom/google/android/gms/internal/measurement/ex;->awu: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;->tm()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_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;->te()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;->atf:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fj;->atb:[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;->anz:J
+    iget-wide p1, p5, Lcom/google/android/gms/internal/measurement/cm;->anv: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;->tJ()Lcom/google/android/gms/internal/measurement/fr;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fr;->tH()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;->anz:J
+    iget-wide p1, p5, Lcom/google/android/gms/internal/measurement/cm;->anv: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;->anz:J
+    iget-wide p1, p5, Lcom/google/android/gms/internal/measurement/cm;->anv: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;->pJ()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/fu;->pH()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;->ane:Ljava/lang/String;
+    iget-object v1, v0, Lcom/google/android/gms/internal/measurement/fu;->ana: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;->atf:[I
+    sget-object v8, Lcom/google/android/gms/internal/measurement/fk;->atb:[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;->awD:Lsun/misc/Unsafe;
+    sget-object v6, Lcom/google/android/gms/internal/measurement/fk;->awz:Lsun/misc/Unsafe;
 
-    iget-object v7, v0, Lcom/google/android/gms/internal/measurement/fu;->awX:[Ljava/lang/Object;
+    iget-object v7, v0, Lcom/google/android/gms/internal/measurement/fu;->awT:[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;->awM:Lcom/google/android/gms/internal/measurement/ez;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->awI: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;->tx()Lcom/google/android/gms/internal/measurement/ex;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ez;->tv()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;->rC()Ljava/lang/Object;
+    invoke-virtual {p6}, Lcom/google/android/gms/internal/measurement/gn;->rA()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;->aun:Lcom/google/android/gms/internal/measurement/df;
+    iget-object v2, v1, Lcom/google/android/gms/internal/measurement/cw;->auj: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;->rP()Lcom/google/android/gms/internal/measurement/cn;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/cw;->rN()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;->anv:[I
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->awM:Lcom/google/android/gms/internal/measurement/ez;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->awI: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;->awM:Lcom/google/android/gms/internal/measurement/ez;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->awI: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;->tx()Lcom/google/android/gms/internal/measurement/ex;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ez;->tv()Lcom/google/android/gms/internal/measurement/ex;
 
     move-result-object p4
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->awM:Lcom/google/android/gms/internal/measurement/ez;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->awI: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;->sp()Ljava/lang/String;
+    invoke-interface {p3}, Lcom/google/android/gms/internal/measurement/fx;->sn()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;->qZ()Ljava/lang/String;
+    invoke-interface {p3}, Lcom/google/android/gms/internal/measurement/fx;->qX()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;->sq()Lcom/google/android/gms/internal/measurement/cn;
+    invoke-interface {p3}, Lcom/google/android/gms/internal/measurement/fx;->so()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;->tZ()Lcom/google/android/gms/internal/measurement/gq;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gq;->tX()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;->ua()Lcom/google/android/gms/internal/measurement/gq;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gq;->tY()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;->awL:Lcom/google/android/gms/internal/measurement/dk;
+    iget-object v3, v0, Lcom/google/android/gms/internal/measurement/fk;->awH: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;->auC:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v5, v3, Lcom/google/android/gms/internal/measurement/do;->auy: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;->sL()Ljava/util/Iterator;
+    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/do;->sJ()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;->anv:[I
+    iget-object v7, v0, Lcom/google/android/gms/internal/measurement/fk;->anr:[I
 
     array-length v7, v7
 
-    sget-object v8, Lcom/google/android/gms/internal/measurement/fk;->awD:Lsun/misc/Unsafe;
+    sget-object v8, Lcom/google/android/gms/internal/measurement/fk;->awz: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;->anv:[I
+    iget-object v13, v0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->awL:Lcom/google/android/gms/internal/measurement/dk;
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->awH: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;->awL:Lcom/google/android/gms/internal/measurement/dk;
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->awH: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;->anv:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->awL:Lcom/google/android/gms/internal/measurement/dk;
+    iget-object v5, v0, Lcom/google/android/gms/internal/measurement/fk;->awH: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;->awK:Lcom/google/android/gms/internal/measurement/gn;
+    iget-object v3, v0, Lcom/google/android/gms/internal/measurement/fk;->awG: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;->anv:[I
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->awE:[Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->awA:[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;->awE:[Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->awA:[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;->tJ()Lcom/google/android/gms/internal/measurement/fr;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fr;->tH()Lcom/google/android/gms/internal/measurement/fr;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fk;->awE:[Ljava/lang/Object;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fk;->awA:[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;->awE:[Ljava/lang/Object;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fk;->awA:[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;->awE:[Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->awA:[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;->anv:[I
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->auj:Lcom/google/android/gms/internal/measurement/cn;
+    sget-object p2, Lcom/google/android/gms/internal/measurement/cn;->auf: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;->auj:Lcom/google/android/gms/internal/measurement/cn;
+    sget-object p2, Lcom/google/android/gms/internal/measurement/cn;->auf: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;->awD:Lsun/misc/Unsafe;
+    sget-object v10, Lcom/google/android/gms/internal/measurement/fk;->awz: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;->anv:[I
+    iget-object v1, v15, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anz:J
+    iget-wide v0, v5, Lcom/google/android/gms/internal/measurement/cm;->anv: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;->anz:J
+    iget-wide v0, v13, Lcom/google/android/gms/internal/measurement/cm;->anv:J
 
     const-wide/16 v19, 0x0
 
@@ -7476,7 +7476,7 @@
 
     move-result v7
 
-    iget-wide v4, v13, Lcom/google/android/gms/internal/measurement/cm;->anz:J
+    iget-wide v4, v13, Lcom/google/android/gms/internal/measurement/cm;->anv: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;->pH()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ee;->pF()Z
 
     move-result v1
 
@@ -7948,17 +7948,17 @@
 
     move-object/from16 v9, p6
 
-    iget-object v0, v9, Lcom/google/android/gms/internal/measurement/cm;->aui:Lcom/google/android/gms/internal/measurement/di;
+    iget-object v0, v9, Lcom/google/android/gms/internal/measurement/cm;->aue:Lcom/google/android/gms/internal/measurement/di;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/di;->sC()Lcom/google/android/gms/internal/measurement/di;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/di;->sA()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;->awF:Lcom/google/android/gms/internal/measurement/fg;
+    iget-object v0, v8, Lcom/google/android/gms/internal/measurement/fk;->awB:Lcom/google/android/gms/internal/measurement/fg;
 
-    iget-object v1, v9, Lcom/google/android/gms/internal/measurement/cm;->aui:Lcom/google/android/gms/internal/measurement/di;
+    iget-object v1, v9, Lcom/google/android/gms/internal/measurement/cm;->aue: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;->sK()Lcom/google/android/gms/internal/measurement/do;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dw$c;->sI()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;->awG:I
+    iget v1, v8, Lcom/google/android/gms/internal/measurement/fk;->awC:I
 
     :goto_1b
-    iget v4, v8, Lcom/google/android/gms/internal/measurement/fk;->awH:I
+    iget v4, v8, Lcom/google/android/gms/internal/measurement/fk;->awD:I
 
     if-ge v1, v4, :cond_21
 
-    iget-object v4, v8, Lcom/google/android/gms/internal/measurement/fk;->avP:[I
+    iget-object v4, v8, Lcom/google/android/gms/internal/measurement/fk;->avL:[I
 
     aget v4, v4, v1
 
-    iget-object v5, v8, Lcom/google/android/gms/internal/measurement/fk;->awK:Lcom/google/android/gms/internal/measurement/gn;
+    iget-object v5, v8, Lcom/google/android/gms/internal/measurement/fk;->awG: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;->awK:Lcom/google/android/gms/internal/measurement/gn;
+    iget-object v1, v8, Lcom/google/android/gms/internal/measurement/fk;->awG: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;->tm()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 v0
 
@@ -8186,7 +8186,7 @@
     return v2
 
     :cond_25
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tm()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 v0
 
@@ -8240,9 +8240,9 @@
 
     if-eqz p3, :cond_1d
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->awK:Lcom/google/android/gms/internal/measurement/gn;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->awG:Lcom/google/android/gms/internal/measurement/gn;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fk;->awL:Lcom/google/android/gms/internal/measurement/dk;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fk;->awH: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;->pJ()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->pH()I
 
     move-result v5
 
@@ -8269,14 +8269,14 @@
 
     if-ne v5, v6, :cond_3
 
-    iget p2, p0, Lcom/google/android/gms/internal/measurement/fk;->awG:I
+    iget p2, p0, Lcom/google/android/gms/internal/measurement/fk;->awC:I
 
     :goto_1
-    iget p3, p0, Lcom/google/android/gms/internal/measurement/fk;->awH:I
+    iget p3, p0, Lcom/google/android/gms/internal/measurement/fk;->awD:I
 
     if-ge p2, p3, :cond_1
 
-    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/fk;->avP:[I
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/fk;->avL:[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;->awF:Lcom/google/android/gms/internal/measurement/fg;
+    iget-object v6, p0, Lcom/google/android/gms/internal/measurement/fk;->awB: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;->sE()Ljava/lang/Object;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/dk;->sC()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;->awG:I
+    iget p2, p0, Lcom/google/android/gms/internal/measurement/fk;->awC:I
 
     :goto_3
-    iget p3, p0, Lcom/google/android/gms/internal/measurement/fk;->awH:I
+    iget p3, p0, Lcom/google/android/gms/internal/measurement/fk;->awD:I
 
     if-ge p2, p3, :cond_8
 
-    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/fk;->avP:[I
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/fk;->avL:[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;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/gn;->rA()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;->st()J
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->sr()J
 
     move-result-wide v9
 
@@ -8442,7 +8442,7 @@
 
     int-to-long v7, v7
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->ss()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->sq()I
 
     move-result v9
 
@@ -8461,7 +8461,7 @@
 
     int-to-long v7, v7
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->sb()J
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->rZ()J
 
     move-result-wide v9
 
@@ -8480,7 +8480,7 @@
 
     int-to-long v7, v7
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->sa()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->rY()I
 
     move-result v9
 
@@ -8495,7 +8495,7 @@
     goto/16 :goto_0
 
     :pswitch_5
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->sr()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->sp()I
 
     move-result v8
 
@@ -8541,7 +8541,7 @@
 
     int-to-long v7, v7
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->rY()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->rW()I
 
     move-result v9
 
@@ -8560,7 +8560,7 @@
 
     int-to-long v7, v7
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->sq()Lcom/google/android/gms/internal/measurement/cn;
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->so()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;->mS()Z
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->mQ()Z
 
     move-result v9
 
@@ -8654,7 +8654,7 @@
 
     int-to-long v7, v7
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->so()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->sm()I
 
     move-result v9
 
@@ -8673,7 +8673,7 @@
 
     int-to-long v7, v7
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->sn()J
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->sl()J
 
     move-result-wide v9
 
@@ -8692,7 +8692,7 @@
 
     int-to-long v7, v7
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->qc()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->qa()I
 
     move-result v9
 
@@ -8711,7 +8711,7 @@
 
     int-to-long v7, v7
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->qB()J
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->qz()J
 
     move-result-wide v9
 
@@ -8730,7 +8730,7 @@
 
     int-to-long v7, v7
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->qV()J
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->qT()J
 
     move-result-wide v9
 
@@ -8749,7 +8749,7 @@
 
     int-to-long v7, v7
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->sm()F
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->sk()F
 
     move-result v9
 
@@ -8768,7 +8768,7 @@
 
     int-to-long v7, v7
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->sl()D
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->sj()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;->awM:Lcom/google/android/gms/internal/measurement/ez;
+    iget-object v7, p0, Lcom/google/android/gms/internal/measurement/fk;->awI:Lcom/google/android/gms/internal/measurement/ez;
 
-    invoke-interface {v7}, Lcom/google/android/gms/internal/measurement/ez;->tw()Ljava/lang/Object;
+    invoke-interface {v7}, Lcom/google/android/gms/internal/measurement/ez;->tu()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;->awM:Lcom/google/android/gms/internal/measurement/ez;
+    iget-object v8, p0, Lcom/google/android/gms/internal/measurement/fk;->awI: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;->awM:Lcom/google/android/gms/internal/measurement/ez;
+    iget-object v8, p0, Lcom/google/android/gms/internal/measurement/fk;->awI:Lcom/google/android/gms/internal/measurement/ez;
 
-    invoke-interface {v8}, Lcom/google/android/gms/internal/measurement/ez;->tw()Ljava/lang/Object;
+    invoke-interface {v8}, Lcom/google/android/gms/internal/measurement/ez;->tu()Ljava/lang/Object;
 
     move-result-object v8
 
-    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->awM:Lcom/google/android/gms/internal/measurement/ez;
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->awI: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;->awM:Lcom/google/android/gms/internal/measurement/ez;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awI: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;->awM:Lcom/google/android/gms/internal/measurement/ez;
+    iget-object v6, p0, Lcom/google/android/gms/internal/measurement/fk;->awI:Lcom/google/android/gms/internal/measurement/ez;
 
-    invoke-interface {v6}, Lcom/google/android/gms/internal/measurement/ez;->tx()Lcom/google/android/gms/internal/measurement/ex;
+    invoke-interface {v6}, Lcom/google/android/gms/internal/measurement/ez;->tv()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;->awJ:Lcom/google/android/gms/internal/measurement/ep;
+    iget-object v6, p0, Lcom/google/android/gms/internal/measurement/fk;->awF: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;->awJ:Lcom/google/android/gms/internal/measurement/ep;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awF: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;->awJ:Lcom/google/android/gms/internal/measurement/ep;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awF: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;->awJ:Lcom/google/android/gms/internal/measurement/ep;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awF: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;->awJ:Lcom/google/android/gms/internal/measurement/ep;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awF: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;->awJ:Lcom/google/android/gms/internal/measurement/ep;
+    iget-object v8, p0, Lcom/google/android/gms/internal/measurement/fk;->awF: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;->awJ:Lcom/google/android/gms/internal/measurement/ep;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awF: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;->awJ:Lcom/google/android/gms/internal/measurement/ep;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awF: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;->awJ:Lcom/google/android/gms/internal/measurement/ep;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awF: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;->awJ:Lcom/google/android/gms/internal/measurement/ep;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awF: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;->awJ:Lcom/google/android/gms/internal/measurement/ep;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awF: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;->awJ:Lcom/google/android/gms/internal/measurement/ep;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awF: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;->awJ:Lcom/google/android/gms/internal/measurement/ep;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awF: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;->awJ:Lcom/google/android/gms/internal/measurement/ep;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awF: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;->awJ:Lcom/google/android/gms/internal/measurement/ep;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awF: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;->awJ:Lcom/google/android/gms/internal/measurement/ep;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awF: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;->awJ:Lcom/google/android/gms/internal/measurement/ep;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awF: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;->awJ:Lcom/google/android/gms/internal/measurement/ep;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awF: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;->awJ:Lcom/google/android/gms/internal/measurement/ep;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awF: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;->awJ:Lcom/google/android/gms/internal/measurement/ep;
+    iget-object v8, p0, Lcom/google/android/gms/internal/measurement/fk;->awF: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;->awJ:Lcom/google/android/gms/internal/measurement/ep;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awF: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;->awJ:Lcom/google/android/gms/internal/measurement/ep;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awF: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;->awJ:Lcom/google/android/gms/internal/measurement/ep;
+    iget-object v8, p0, Lcom/google/android/gms/internal/measurement/fk;->awF: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;->awJ:Lcom/google/android/gms/internal/measurement/ep;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awF: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;->awJ:Lcom/google/android/gms/internal/measurement/ep;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awF: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;->awJ:Lcom/google/android/gms/internal/measurement/ep;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awF: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;->awJ:Lcom/google/android/gms/internal/measurement/ep;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awF: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;->awJ:Lcom/google/android/gms/internal/measurement/ep;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awF: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;->awJ:Lcom/google/android/gms/internal/measurement/ep;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awF: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;->awJ:Lcom/google/android/gms/internal/measurement/ep;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awF: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;->awJ:Lcom/google/android/gms/internal/measurement/ep;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awF: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;->awJ:Lcom/google/android/gms/internal/measurement/ep;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awF: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;->awJ:Lcom/google/android/gms/internal/measurement/ep;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awF: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;->st()J
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->sr()J
 
     move-result-wide v9
 
@@ -9445,7 +9445,7 @@
 
     int-to-long v7, v5
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->ss()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->sq()I
 
     move-result v5
 
@@ -9460,7 +9460,7 @@
 
     int-to-long v7, v5
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->sb()J
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->rZ()J
 
     move-result-wide v9
 
@@ -9475,7 +9475,7 @@
 
     int-to-long v7, v5
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->sa()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->rY()I
 
     move-result v5
 
@@ -9486,7 +9486,7 @@
     goto/16 :goto_0
 
     :pswitch_38
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->sr()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->sp()I
 
     move-result v8
 
@@ -9528,7 +9528,7 @@
 
     int-to-long v7, v5
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->rY()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->rW()I
 
     move-result v5
 
@@ -9543,7 +9543,7 @@
 
     int-to-long v7, v5
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->sq()Lcom/google/android/gms/internal/measurement/cn;
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->so()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;->mS()Z
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->mQ()Z
 
     move-result v5
 
@@ -9630,7 +9630,7 @@
 
     int-to-long v7, v5
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->so()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->sm()I
 
     move-result v5
 
@@ -9645,7 +9645,7 @@
 
     int-to-long v7, v5
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->sn()J
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->sl()J
 
     move-result-wide v9
 
@@ -9660,7 +9660,7 @@
 
     int-to-long v7, v5
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->qc()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->qa()I
 
     move-result v5
 
@@ -9675,7 +9675,7 @@
 
     int-to-long v7, v5
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->qB()J
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->qz()J
 
     move-result-wide v9
 
@@ -9690,7 +9690,7 @@
 
     int-to-long v7, v5
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->qV()J
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->qT()J
 
     move-result-wide v9
 
@@ -9705,7 +9705,7 @@
 
     int-to-long v7, v5
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->sm()F
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->sk()F
 
     move-result v5
 
@@ -9720,7 +9720,7 @@
 
     int-to-long v7, v5
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->sl()D
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->sj()D
 
     move-result-wide v9
 
@@ -9741,14 +9741,14 @@
 
     if-nez v5, :cond_0
 
-    iget p2, p0, Lcom/google/android/gms/internal/measurement/fk;->awG:I
+    iget p2, p0, Lcom/google/android/gms/internal/measurement/fk;->awC:I
 
     :goto_9
-    iget p3, p0, Lcom/google/android/gms/internal/measurement/fk;->awH:I
+    iget p3, p0, Lcom/google/android/gms/internal/measurement/fk;->awD:I
 
     if-ge p2, p3, :cond_16
 
-    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/fk;->avP:[I
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/fk;->avL:[I
 
     aget p3, p3, p2
 
@@ -9785,14 +9785,14 @@
 
     if-nez v5, :cond_0
 
-    iget p2, p0, Lcom/google/android/gms/internal/measurement/fk;->awG:I
+    iget p2, p0, Lcom/google/android/gms/internal/measurement/fk;->awC:I
 
     :goto_a
-    iget p3, p0, Lcom/google/android/gms/internal/measurement/fk;->awH:I
+    iget p3, p0, Lcom/google/android/gms/internal/measurement/fk;->awD:I
 
     if-ge p2, p3, :cond_19
 
-    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/fk;->avP:[I
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/fk;->avL:[I
 
     aget p3, p3, p2
 
@@ -9815,14 +9815,14 @@
     :catchall_0
     move-exception p2
 
-    iget p3, p0, Lcom/google/android/gms/internal/measurement/fk;->awG:I
+    iget p3, p0, Lcom/google/android/gms/internal/measurement/fk;->awC:I
 
     :goto_b
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/fk;->awH:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/fk;->awD:I
 
     if-ge p3, v1, :cond_1b
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fk;->avP:[I
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fk;->avL:[I
 
     aget v1, v1, p3
 
@@ -9947,11 +9947,11 @@
         }
     .end annotation
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hk;->pJ()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hk;->pH()I
 
     move-result v0
 
-    sget v1, Lcom/google/android/gms/internal/measurement/dw$d;->afg:I
+    sget v1, Lcom/google/android/gms/internal/measurement/dw$d;->afc: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;->awK:Lcom/google/android/gms/internal/measurement/gn;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->awG: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;->awL:Lcom/google/android/gms/internal/measurement/dk;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->awH: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;->auC:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v1, v0, Lcom/google/android/gms/internal/measurement/do;->auy: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;->asH:Z
+    iget-boolean v1, v0, Lcom/google/android/gms/internal/measurement/do;->asD: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;->auC:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/do;->auy:Lcom/google/android/gms/internal/measurement/gb;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/gb;->tT()Ljava/util/Set;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/gb;->tR()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;->auC:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/do;->auy:Lcom/google/android/gms/internal/measurement/gb;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/gb;->tT()Ljava/util/Set;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/gb;->tR()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;->anv:[I
+    iget-object v7, p0, Lcom/google/android/gms/internal/measurement/fk;->anr:[I
 
     array-length v7, v7
 
@@ -10048,14 +10048,14 @@
 
     move-result v8
 
-    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anr:[I
 
     aget v9, v9, v7
 
     :goto_3
     if-eqz v1, :cond_3
 
-    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->awL:Lcom/google/android/gms/internal/measurement/dk;
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->awH: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;->awL:Lcom/google/android/gms/internal/measurement/dk;
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->awH: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;->anv:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->awL:Lcom/google/android/gms/internal/measurement/dk;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/fk;->awH: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;->awL:Lcom/google/android/gms/internal/measurement/dk;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->awH: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;->auC:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v1, v0, Lcom/google/android/gms/internal/measurement/do;->auy: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;->sL()Ljava/util/Iterator;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/do;->sJ()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;->anv:[I
+    iget-object v7, p0, Lcom/google/android/gms/internal/measurement/fk;->anr:[I
 
     array-length v7, v7
 
@@ -11520,14 +11520,14 @@
 
     move-result v9
 
-    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anr:[I
 
     aget v10, v10, v1
 
     :goto_8
     if-eqz v8, :cond_b
 
-    iget-object v11, p0, Lcom/google/android/gms/internal/measurement/fk;->awL:Lcom/google/android/gms/internal/measurement/dk;
+    iget-object v11, p0, Lcom/google/android/gms/internal/measurement/fk;->awH: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;->awL:Lcom/google/android/gms/internal/measurement/dk;
+    iget-object v11, p0, Lcom/google/android/gms/internal/measurement/fk;->awH: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;->anv:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->awL:Lcom/google/android/gms/internal/measurement/dk;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fk;->awH: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;->awK:Lcom/google/android/gms/internal/measurement/gn;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->awG: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;->awD:Lsun/misc/Unsafe;
+    sget-object v9, Lcom/google/android/gms/internal/measurement/fk;->awz: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;->anv:[I
+    iget-object v0, v15, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anz:J
+    iget-wide v0, v11, Lcom/google/android/gms/internal/measurement/cm;->anv: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;->anz:J
+    iget-wide v5, v11, Lcom/google/android/gms/internal/measurement/cm;->anv:J
 
     const-wide/16 v19, 0x0
 
@@ -13477,7 +13477,7 @@
 
     move-result v6
 
-    iget-wide v4, v11, Lcom/google/android/gms/internal/measurement/cm;->anz:J
+    iget-wide v4, v11, Lcom/google/android/gms/internal/measurement/cm;->anv: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;->pH()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ee;->pF()Z
 
     move-result v3
 
@@ -13823,7 +13823,7 @@
     return-void
 
     :cond_11
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tm()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 v0
 
@@ -13882,14 +13882,14 @@
         }
     .end annotation
 
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/fk;->awG:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/fk;->awC:I
 
     :goto_0
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/fk;->awH:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/fk;->awD:I
 
     if-ge v0, v1, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fk;->avP:[I
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fk;->avL:[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;->awM:Lcom/google/android/gms/internal/measurement/ez;
+    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/fk;->awI: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;->avP:[I
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->avL:[I
 
     array-length v0, v0
 
     :goto_1
     if-ge v1, v0, :cond_2
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/fk;->awJ:Lcom/google/android/gms/internal/measurement/ep;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/fk;->awF:Lcom/google/android/gms/internal/measurement/ep;
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/fk;->avP:[I
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/fk;->avL:[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;->awK:Lcom/google/android/gms/internal/measurement/gn;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->awG: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;->awL:Lcom/google/android/gms/internal/measurement/dk;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->awH: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;->anv:[I
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->anr:[I
 
     array-length v0, v0
 
@@ -13984,7 +13984,7 @@
 
     move-result v3
 
-    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
+    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->awK:Lcom/google/android/gms/internal/measurement/gn;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->awG: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;->awL:Lcom/google/android/gms/internal/measurement/dk;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->awH: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;->awD:Lsun/misc/Unsafe;
+    sget-object v2, Lcom/google/android/gms/internal/measurement/fk;->awz:Lsun/misc/Unsafe;
 
     const/4 v6, 0x0
 
     const/4 v7, 0x0
 
     :goto_0
-    iget-object v8, v0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
+    iget-object v8, v0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v10, v0, Lcom/google/android/gms/internal/measurement/fk;->anr:[I
 
     aget v10, v10, v6
 
@@ -14748,19 +14748,19 @@
 
     int-to-long v11, v8
 
-    sget-object v8, Lcom/google/android/gms/internal/measurement/dp;->avn:Lcom/google/android/gms/internal/measurement/dp;
+    sget-object v8, Lcom/google/android/gms/internal/measurement/dp;->avj: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;->avA:Lcom/google/android/gms/internal/measurement/dp;
+    sget-object v8, Lcom/google/android/gms/internal/measurement/dp;->avw: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;->anv:[I
+    iget-object v8, v0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->awM:Lcom/google/android/gms/internal/measurement/ez;
+    iget-object v8, v0, Lcom/google/android/gms/internal/measurement/fk;->awI: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;->awK:Lcom/google/android/gms/internal/measurement/gn;
+    iget-object v2, v0, Lcom/google/android/gms/internal/measurement/fk;->awG: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;->awD:Lsun/misc/Unsafe;
+    sget-object v2, Lcom/google/android/gms/internal/measurement/fk;->awz: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;->anv:[I
+    iget-object v10, v0, Lcom/google/android/gms/internal/measurement/fk;->anr:[I
 
     array-length v10, v10
 
@@ -16106,7 +16106,7 @@
 
     move-result v10
 
-    iget-object v11, v0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
+    iget-object v11, v0, Lcom/google/android/gms/internal/measurement/fk;->anr:[I
 
     aget v12, v11, v6
 
@@ -16153,19 +16153,19 @@
 
     if-eqz v11, :cond_16
 
-    sget-object v11, Lcom/google/android/gms/internal/measurement/dp;->avn:Lcom/google/android/gms/internal/measurement/dp;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/dp;->avj: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;->avA:Lcom/google/android/gms/internal/measurement/dp;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/dp;->avw: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;->anv:[I
+    iget-object v11, v0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->awM:Lcom/google/android/gms/internal/measurement/ez;
+    iget-object v10, v0, Lcom/google/android/gms/internal/measurement/fk;->awI: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;->awK:Lcom/google/android/gms/internal/measurement/gn;
+    iget-object v2, v0, Lcom/google/android/gms/internal/measurement/fk;->awG: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;->awL:Lcom/google/android/gms/internal/measurement/dk;
+    iget-object v2, v0, Lcom/google/android/gms/internal/measurement/fk;->awH: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;->auC:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v3, v1, Lcom/google/android/gms/internal/measurement/do;->auy:Lcom/google/android/gms/internal/measurement/gb;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/gb;->nh()I
+    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/gb;->nf()I
 
     move-result v3
 
     if-ge v5, v3, :cond_29
 
-    iget-object v3, v1, Lcom/google/android/gms/internal/measurement/do;->auC:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v3, v1, Lcom/google/android/gms/internal/measurement/do;->auy: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;->auC:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v1, v1, Lcom/google/android/gms/internal/measurement/do;->auy:Lcom/google/android/gms/internal/measurement/gb;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/gb;->tS()Ljava/lang/Iterable;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/gb;->tQ()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;->awG:I
+    iget v4, p0, Lcom/google/android/gms/internal/measurement/fk;->awC:I
 
     const/4 v5, 0x1
 
     if-ge v1, v4, :cond_e
 
-    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/fk;->avP:[I
+    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/fk;->avL:[I
 
     aget v4, v4, v1
 
-    iget-object v6, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
+    iget-object v6, p0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v8, p0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->awD:Lsun/misc/Unsafe;
+    sget-object v2, Lcom/google/android/gms/internal/measurement/fk;->awz: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;->awM:Lcom/google/android/gms/internal/measurement/ez;
+    iget-object v6, p0, Lcom/google/android/gms/internal/measurement/fk;->awI: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;->awM:Lcom/google/android/gms/internal/measurement/ez;
+    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/fk;->awI:Lcom/google/android/gms/internal/measurement/ez;
 
-    invoke-interface {v4}, Lcom/google/android/gms/internal/measurement/ez;->tx()Lcom/google/android/gms/internal/measurement/ex;
+    invoke-interface {v4}, Lcom/google/android/gms/internal/measurement/ez;->tv()Lcom/google/android/gms/internal/measurement/ex;
 
     move-result-object v4
 
-    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/ex;->awv: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;->ayf:Lcom/google/android/gms/internal/measurement/hh;
+    sget-object v7, Lcom/google/android/gms/internal/measurement/hh;->ayb: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;->tJ()Lcom/google/android/gms/internal/measurement/fr;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fr;->tH()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;->awL:Lcom/google/android/gms/internal/measurement/dk;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fk;->awH: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;->qE()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/do;->qC()Z
 
     move-result p1
 
@@ -18093,7 +18093,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->awK:Lcom/google/android/gms/internal/measurement/gn;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->awG: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;->awK:Lcom/google/android/gms/internal/measurement/gn;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/fk;->awG: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;->awL:Lcom/google/android/gms/internal/measurement/dk;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->awH: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;->awL:Lcom/google/android/gms/internal/measurement/dk;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->awH: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;->anv:[I
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->anv:[I
+    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/fk;->anr:[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;->awM:Lcom/google/android/gms/internal/measurement/ez;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fk;->awI: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;->awJ:Lcom/google/android/gms/internal/measurement/ep;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fk;->awF: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;->awK:Lcom/google/android/gms/internal/measurement/gn;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->awG: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;->awL:Lcom/google/android/gms/internal/measurement/dk;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->awH: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 rC()Ljava/lang/Object;
+.method public final rA()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;->awI:Lcom/google/android/gms/internal/measurement/fo;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->awE:Lcom/google/android/gms/internal/measurement/fo;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fk;->awF:Lcom/google/android/gms/internal/measurement/fg;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fk;->awB: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 46e99bed94..aab7686fc6 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 tF()Lcom/google/android/gms/internal/measurement/fl;
+.method public abstract tD()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 b744a3393e..85981fce05 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 asH:Z
+.field private final asD:Z
 
-.field private final awN:Lcom/google/android/gms/internal/measurement/gn;
+.field private final awJ: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 awO:Lcom/google/android/gms/internal/measurement/dk;
+.field private final awK: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;->awN:Lcom/google/android/gms/internal/measurement/gn;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/fm;->awJ: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;->asH:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/internal/measurement/fm;->asD:Z
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/fm;->awO:Lcom/google/android/gms/internal/measurement/dk;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/fm;->awK: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;->awN:Lcom/google/android/gms/internal/measurement/gn;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fm;->awJ:Lcom/google/android/gms/internal/measurement/gn;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fm;->awO:Lcom/google/android/gms/internal/measurement/dk;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fm;->awK: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;->pJ()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->pH()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;->pK()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->pI()I
 
     move-result v3
 
@@ -171,7 +171,7 @@
 
     if-eqz v3, :cond_2
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/dk;->sF()V
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/dk;->sD()V
 
     goto :goto_1
 
@@ -183,7 +183,7 @@
     goto :goto_2
 
     :cond_3
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->nO()Z
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->nM()Z
 
     move-result v3
 
@@ -198,13 +198,13 @@
 
     :cond_5
     :goto_0
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->pJ()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->pH()I
 
     move-result v7
 
     if-eq v7, v4, :cond_9
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->pK()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->pI()I
 
     move-result v7
 
@@ -212,7 +212,7 @@
 
     if-ne v7, v8, :cond_6
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->rY()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->rW()I
 
     move-result v3
 
@@ -231,26 +231,26 @@
 
     if-eqz v5, :cond_7
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/dk;->sF()V
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/dk;->sD()V
 
     goto :goto_0
 
     :cond_7
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->sq()Lcom/google/android/gms/internal/measurement/cn;
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->so()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;->nO()Z
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->nM()Z
 
     move-result v7
 
     if-nez v7, :cond_5
 
     :cond_9
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->pK()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->pI()I
 
     move-result v4
 
@@ -262,7 +262,7 @@
 
     if-eqz v5, :cond_a
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/dk;->sG()V
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/dk;->sE()V
 
     goto :goto_1
 
@@ -284,7 +284,7 @@
 
     :cond_c
     :try_start_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;->ti()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;->awO:Lcom/google/android/gms/internal/measurement/dk;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fm;->awK: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;->sL()Ljava/util/Iterator;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/do;->sJ()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;->sN()Lcom/google/android/gms/internal/measurement/hh;
+    invoke-interface {v2}, Lcom/google/android/gms/internal/measurement/dq;->sL()Lcom/google/android/gms/internal/measurement/hh;
 
     move-result-object v3
 
-    sget-object v4, Lcom/google/android/gms/internal/measurement/hh;->ayf:Lcom/google/android/gms/internal/measurement/hh;
+    sget-object v4, Lcom/google/android/gms/internal/measurement/hh;->ayb:Lcom/google/android/gms/internal/measurement/hh;
 
     if-ne v3, v4, :cond_1
 
-    invoke-interface {v2}, Lcom/google/android/gms/internal/measurement/dq;->qg()Z
+    invoke-interface {v2}, Lcom/google/android/gms/internal/measurement/dq;->qe()Z
 
     move-result v3
 
     if-nez v3, :cond_1
 
-    invoke-interface {v2}, Lcom/google/android/gms/internal/measurement/dq;->pR()Z
+    invoke-interface {v2}, Lcom/google/android/gms/internal/measurement/dq;->pP()Z
 
     move-result v3
 
@@ -375,13 +375,13 @@
 
     if-eqz v3, :cond_0
 
-    invoke-interface {v2}, Lcom/google/android/gms/internal/measurement/dq;->pJ()I
+    invoke-interface {v2}, Lcom/google/android/gms/internal/measurement/dq;->pH()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;->awj:Ljava/util/Map$Entry;
+    iget-object v1, v1, Lcom/google/android/gms/internal/measurement/ek;->awf: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;->tq()Lcom/google/android/gms/internal/measurement/cn;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/el;->tn()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;->pJ()I
+    invoke-interface {v2}, Lcom/google/android/gms/internal/measurement/dq;->pH()I
 
     move-result v2
 
@@ -420,7 +420,7 @@
     throw p1
 
     :cond_2
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fm;->awN:Lcom/google/android/gms/internal/measurement/gn;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fm;->awJ: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;->tZ()Lcom/google/android/gms/internal/measurement/gq;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gq;->tX()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;->ua()Lcom/google/android/gms/internal/measurement/gq;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gq;->tY()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;->sK()Lcom/google/android/gms/internal/measurement/do;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/dw$c;->sI()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;->awO:Lcom/google/android/gms/internal/measurement/dk;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/fm;->awK:Lcom/google/android/gms/internal/measurement/dk;
 
-    iget-object v0, p5, Lcom/google/android/gms/internal/measurement/cm;->aui:Lcom/google/android/gms/internal/measurement/di;
+    iget-object v0, p5, Lcom/google/android/gms/internal/measurement/cm;->aue: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;->tJ()Lcom/google/android/gms/internal/measurement/fr;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fr;->tH()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;->tJ()Lcom/google/android/gms/internal/measurement/fr;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fr;->tH()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;->awO:Lcom/google/android/gms/internal/measurement/dk;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fm;->awK:Lcom/google/android/gms/internal/measurement/dk;
 
-    iget-object v5, p5, Lcom/google/android/gms/internal/measurement/cm;->aui:Lcom/google/android/gms/internal/measurement/di;
+    iget-object v5, p5, Lcom/google/android/gms/internal/measurement/cm;->aue: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;->tm()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
 
@@ -667,11 +667,11 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fm;->awN:Lcom/google/android/gms/internal/measurement/gn;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fm;->awJ: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;->awO:Lcom/google/android/gms/internal/measurement/dk;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fm;->awK: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;->awN:Lcom/google/android/gms/internal/measurement/gn;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fm;->awJ: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;->asH:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/internal/measurement/fm;->asD:Z
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fm;->awO:Lcom/google/android/gms/internal/measurement/dk;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fm;->awK: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;->awN:Lcom/google/android/gms/internal/measurement/gn;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fm;->awJ: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;->asH:Z
+    iget-boolean v2, p0, Lcom/google/android/gms/internal/measurement/fm;->asD:Z
 
     if-eqz v2, :cond_2
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/fm;->awO:Lcom/google/android/gms/internal/measurement/dk;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/fm;->awK: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;->auC:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v3, p1, Lcom/google/android/gms/internal/measurement/do;->auy:Lcom/google/android/gms/internal/measurement/gb;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/gb;->nh()I
+    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/gb;->nf()I
 
     move-result v3
 
     if-ge v1, v3, :cond_0
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/measurement/do;->auC:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v3, p1, Lcom/google/android/gms/internal/measurement/do;->auy: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;->auC:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/do;->auy:Lcom/google/android/gms/internal/measurement/gb;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/gb;->tS()Ljava/lang/Iterable;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/gb;->tQ()Ljava/lang/Iterable;
 
     move-result-object p1
 
@@ -824,13 +824,13 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fm;->awO:Lcom/google/android/gms/internal/measurement/dk;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fm;->awK: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;->qE()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/do;->qC()Z
 
     move-result p1
 
@@ -845,13 +845,13 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fm;->awN:Lcom/google/android/gms/internal/measurement/gn;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fm;->awJ: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;->awN:Lcom/google/android/gms/internal/measurement/gn;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fm;->awJ: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;->asH:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/fm;->asD:Z
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fm;->awO:Lcom/google/android/gms/internal/measurement/dk;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fm;->awK: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;->awO:Lcom/google/android/gms/internal/measurement/dk;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fm;->awK: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;->awN:Lcom/google/android/gms/internal/measurement/gn;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fm;->awJ: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;->asH:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/fm;->asD:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fm;->awO:Lcom/google/android/gms/internal/measurement/dk;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fm;->awK: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 rC()Ljava/lang/Object;
+.method public final rA()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;->sV()Lcom/google/android/gms/internal/measurement/ff;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/fg;->sT()Lcom/google/android/gms/internal/measurement/ff;
 
     move-result-object v0
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ff;->ta()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ff;->sY()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 e5596371be..42b9c8491c 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 awP:Lcom/google/android/gms/internal/measurement/fo;
+.field private static final awL:Lcom/google/android/gms/internal/measurement/fo;
 
-.field private static final awQ:Lcom/google/android/gms/internal/measurement/fo;
+.field private static final awM: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;->tI()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 v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/fq;->awP:Lcom/google/android/gms/internal/measurement/fo;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/fq;->awL: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;->awQ:Lcom/google/android/gms/internal/measurement/fo;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/fq;->awM:Lcom/google/android/gms/internal/measurement/fo;
 
     return-void
 .end method
 
-.method static tG()Lcom/google/android/gms/internal/measurement/fo;
+.method static tE()Lcom/google/android/gms/internal/measurement/fo;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/fq;->awP:Lcom/google/android/gms/internal/measurement/fo;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fq;->awL:Lcom/google/android/gms/internal/measurement/fo;
 
     return-object v0
 .end method
 
-.method static tH()Lcom/google/android/gms/internal/measurement/fo;
+.method static tF()Lcom/google/android/gms/internal/measurement/fo;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/fq;->awQ:Lcom/google/android/gms/internal/measurement/fo;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fq;->awM:Lcom/google/android/gms/internal/measurement/fo;
 
     return-object v0
 .end method
 
-.method private static tI()Lcom/google/android/gms/internal/measurement/fo;
+.method private static tG()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 42cc1dc754..114aca946d 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 awR:Lcom/google/android/gms/internal/measurement/fr;
+.field private static final awN:Lcom/google/android/gms/internal/measurement/fr;
 
 
 # instance fields
-.field private final awS:Lcom/google/android/gms/internal/measurement/fz;
+.field private final awO:Lcom/google/android/gms/internal/measurement/fz;
 
-.field private final awT:Ljava/util/concurrent/ConcurrentMap;
+.field private final awP: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;->awR:Lcom/google/android/gms/internal/measurement/fr;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/fr;->awN: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;->awT:Ljava/util/concurrent/ConcurrentMap;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/fr;->awP: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;->awS:Lcom/google/android/gms/internal/measurement/fz;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/fr;->awO:Lcom/google/android/gms/internal/measurement/fz;
 
     return-void
 .end method
 
-.method public static tJ()Lcom/google/android/gms/internal/measurement/fr;
+.method public static tH()Lcom/google/android/gms/internal/measurement/fr;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/fr;->awR:Lcom/google/android/gms/internal/measurement/fr;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fr;->awN: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;->awT:Ljava/util/concurrent/ConcurrentMap;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fr;->awP: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;->awS:Lcom/google/android/gms/internal/measurement/fz;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fr;->awO: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;->awT:Ljava/util/concurrent/ConcurrentMap;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fr;->awP: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 efdb885eb6..502e89e979 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 awV:Ljava/lang/reflect/Method;
+.field private static final awR:Ljava/lang/reflect/Method;
 
-.field private static final awW:Ljava/lang/reflect/Method;
+.field private static final awS:Ljava/lang/reflect/Method;
 
 
 # instance fields
-.field private final awU:Landroid/app/job/JobScheduler;
+.field private final awQ:Landroid/app/job/JobScheduler;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fs;->tK()Ljava/lang/reflect/Method;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fs;->tI()Ljava/lang/reflect/Method;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/fs;->awV:Ljava/lang/reflect/Method;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/fs;->awR:Ljava/lang/reflect/Method;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fs;->tL()Ljava/lang/reflect/Method;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fs;->tJ()Ljava/lang/reflect/Method;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/fs;->awW:Ljava/lang/reflect/Method;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/fs;->awS: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;->awU:Landroid/app/job/JobScheduler;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/fs;->awQ: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;->awV:Ljava/lang/reflect/Method;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fs;->awR:Ljava/lang/reflect/Method;
 
     if-eqz v0, :cond_0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fs;->awU:Landroid/app/job/JobScheduler;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fs;->awQ: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;->awU:Landroid/app/job/JobScheduler;
+    iget-object p2, p0, Lcom/google/android/gms/internal/measurement/fs;->awQ: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;->awV:Ljava/lang/reflect/Method;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/fs;->awR: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;->nh()I
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fs;->nf()I
 
     move-result v0
 
@@ -163,10 +163,10 @@
     return p0
 .end method
 
-.method private static nh()I
+.method private static nf()I
     .locals 4
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/fs;->awW:Ljava/lang/reflect/Method;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fs;->awS:Ljava/lang/reflect/Method;
 
     const/4 v1, 0x0
 
@@ -219,7 +219,7 @@
     return v1
 .end method
 
-.method private static tK()Ljava/lang/reflect/Method;
+.method private static tI()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 tL()Ljava/lang/reflect/Method;
+.method private static tJ()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 5efddcb234..214f214fdc 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 ane:Ljava/lang/String;
+.field final ana:Ljava/lang/String;
 
-.field final awX:[Ljava/lang/Object;
+.field final awT:[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;->ane:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/fu;->ana:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/google/android/gms/internal/measurement/fu;->awX:[Ljava/lang/Object;
+    iput-object p3, p0, Lcom/google/android/gms/internal/measurement/fu;->awT:[Ljava/lang/Object;
 
     const/4 p1, 0x0
 
@@ -82,7 +82,7 @@
 
 
 # virtual methods
-.method public final pJ()I
+.method public final pH()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 tE()Lcom/google/android/gms/internal/measurement/fg;
+.method public final tC()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 5a08093d6e..cd57eb7392 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 awY:Lcom/google/android/gms/internal/measurement/fv;
+.field private static final awU: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 awZ:[Ljava/lang/Object;
+.field private awV:[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;->awY:Lcom/google/android/gms/internal/measurement/fv;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/fv;->awU:Lcom/google/android/gms/internal/measurement/fv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ch;->rM()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ch;->rK()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;->awZ:[Ljava/lang/Object;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/fv;->awV:[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 tM()Lcom/google/android/gms/internal/measurement/fv;
+.method public static tK()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;->awY:Lcom/google/android/gms/internal/measurement/fv;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fv;->awU: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;->rA()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->ry()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;->awZ:[Ljava/lang/Object;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fv;->awV:[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;->awZ:[Ljava/lang/Object;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fv;->awV:[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;->awZ:[Ljava/lang/Object;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/fv;->awV:[Ljava/lang/Object;
 
     :goto_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fv;->awZ:[Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fv;->awV:[Ljava/lang/Object;
 
     aput-object p2, v0, p1
 
@@ -259,11 +259,11 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rA()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->ry()V
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/fv;->zzc:I
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fv;->awZ:[Ljava/lang/Object;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fv;->awV:[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;->awZ:[Ljava/lang/Object;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/fv;->awV:[Ljava/lang/Object;
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fv;->awZ:[Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fv;->awV:[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;->awZ:[Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fv;->awV:[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;->awZ:[Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fv;->awV:[Ljava/lang/Object;
 
     aget-object p1, v0, p1
 
@@ -357,11 +357,11 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rA()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->ry()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;->awZ:[Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fv;->awV:[Ljava/lang/Object;
 
     aget-object v1, v0, p1
 
@@ -403,11 +403,11 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rA()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->ry()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;->awZ:[Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fv;->awV:[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 39ed68b1ee..0b3a160d60 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 rC()Ljava/lang/Object;
+.method public abstract rA()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 579dfee3fd..eac5c41668 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 mS()Z
+.method public abstract mQ()Z
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -211,7 +211,7 @@
     .end annotation
 .end method
 
-.method public abstract nO()Z
+.method public abstract nM()Z
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -253,7 +253,7 @@
     .end annotation
 .end method
 
-.method public abstract pJ()I
+.method public abstract pH()I
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -261,7 +261,7 @@
     .end annotation
 .end method
 
-.method public abstract pK()I
+.method public abstract pI()I
 .end method
 
 .method public abstract q(Ljava/util/List;)V
@@ -281,7 +281,7 @@
     .end annotation
 .end method
 
-.method public abstract qB()J
+.method public abstract qT()J
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -289,7 +289,7 @@
     .end annotation
 .end method
 
-.method public abstract qV()J
+.method public abstract qX()Ljava/lang/String;
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -297,7 +297,7 @@
     .end annotation
 .end method
 
-.method public abstract qZ()Ljava/lang/String;
+.method public abstract qa()I
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -305,7 +305,7 @@
     .end annotation
 .end method
 
-.method public abstract qc()I
+.method public abstract qz()J
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -330,6 +330,14 @@
     .end annotation
 .end method
 
+.method public abstract rW()I
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+.end method
+
 .method public abstract rY()I
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -338,6 +346,14 @@
     .end annotation
 .end method
 
+.method public abstract rZ()J
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+.end method
+
 .method public abstract s(Ljava/util/List;)V
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -355,7 +371,7 @@
     .end annotation
 .end method
 
-.method public abstract sa()I
+.method public abstract sj()D
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -363,7 +379,7 @@
     .end annotation
 .end method
 
-.method public abstract sb()J
+.method public abstract sk()F
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -371,7 +387,7 @@
     .end annotation
 .end method
 
-.method public abstract sl()D
+.method public abstract sl()J
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -379,7 +395,7 @@
     .end annotation
 .end method
 
-.method public abstract sm()F
+.method public abstract sm()I
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -387,7 +403,7 @@
     .end annotation
 .end method
 
-.method public abstract sn()J
+.method public abstract sn()Ljava/lang/String;
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -395,7 +411,7 @@
     .end annotation
 .end method
 
-.method public abstract so()I
+.method public abstract so()Lcom/google/android/gms/internal/measurement/cn;
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -403,7 +419,7 @@
     .end annotation
 .end method
 
-.method public abstract sp()Ljava/lang/String;
+.method public abstract sp()I
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -411,7 +427,7 @@
     .end annotation
 .end method
 
-.method public abstract sq()Lcom/google/android/gms/internal/measurement/cn;
+.method public abstract sq()I
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -419,23 +435,7 @@
     .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
+.method public abstract sr()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 c2a014145f..f81c3331c6 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 auf:Ljava/lang/Class;
+.field private static final aub:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -13,7 +13,7 @@
     .end annotation
 .end field
 
-.field private static final awN:Lcom/google/android/gms/internal/measurement/gn;
+.field private static final awJ: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 axa:Lcom/google/android/gms/internal/measurement/gn;
+.field private static final awW: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 axb:Lcom/google/android/gms/internal/measurement/gn;
+.field private static final awX: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;->tQ()Ljava/lang/Class;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fy;->tO()Ljava/lang/Class;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/fy;->auf:Ljava/lang/Class;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/fy;->aub: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;->awN:Lcom/google/android/gms/internal/measurement/gn;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/fy;->awJ: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;->axa:Lcom/google/android/gms/internal/measurement/gn;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/fy;->awW: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;->axb:Lcom/google/android/gms/internal/measurement/gn;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/fy;->awX: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;->tR()Ljava/lang/Class;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fy;->tP()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;->rC()Ljava/lang/Object;
+    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/gn;->rA()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;->auC:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v0, p2, Lcom/google/android/gms/internal/measurement/do;->auy: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;->auC:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v0, p2, Lcom/google/android/gms/internal/measurement/do;->auy:Lcom/google/android/gms/internal/measurement/gb;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/gb;->nh()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/gb;->nf()I
 
     move-result v0
 
     if-ge p1, v0, :cond_0
 
-    iget-object v0, p2, Lcom/google/android/gms/internal/measurement/do;->auC:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v0, p2, Lcom/google/android/gms/internal/measurement/do;->auy: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;->auC:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object p1, p2, Lcom/google/android/gms/internal/measurement/do;->auy:Lcom/google/android/gms/internal/measurement/gb;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/gb;->tS()Ljava/lang/Iterable;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/gb;->tQ()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;->auf:Ljava/lang/Class;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fy;->aub:Ljava/lang/Class;
 
     if-eqz v0, :cond_1
 
@@ -2355,6 +2355,36 @@
     return-void
 .end method
 
+.method public static tL()Lcom/google/android/gms/internal/measurement/gn;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Lcom/google/android/gms/internal/measurement/gn<",
+            "**>;"
+        }
+    .end annotation
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fy;->awJ:Lcom/google/android/gms/internal/measurement/gn;
+
+    return-object v0
+.end method
+
+.method public static tM()Lcom/google/android/gms/internal/measurement/gn;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Lcom/google/android/gms/internal/measurement/gn<",
+            "**>;"
+        }
+    .end annotation
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fy;->awW:Lcom/google/android/gms/internal/measurement/gn;
+
+    return-object v0
+.end method
+
 .method public static tN()Lcom/google/android/gms/internal/measurement/gn;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
@@ -2365,42 +2395,12 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/fy;->awN:Lcom/google/android/gms/internal/measurement/gn;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fy;->awX:Lcom/google/android/gms/internal/measurement/gn;
 
     return-object v0
 .end method
 
-.method public static tO()Lcom/google/android/gms/internal/measurement/gn;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Lcom/google/android/gms/internal/measurement/gn<",
-            "**>;"
-        }
-    .end annotation
-
-    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 tP()Lcom/google/android/gms/internal/measurement/gn;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Lcom/google/android/gms/internal/measurement/gn<",
-            "**>;"
-        }
-    .end annotation
-
-    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 tQ()Ljava/lang/Class;
+.method private static tO()Ljava/lang/Class;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -2427,7 +2427,7 @@
     return-object v0
 .end method
 
-.method private static tR()Ljava/lang/Class;
+.method private static tP()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 ba49d209ab..03252176d0 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 anq:Ljava/lang/String;
+.field private final synthetic anm:Ljava/lang/String;
 
-.field private final synthetic asu:Lcom/google/android/gms/internal/measurement/me;
+.field private final synthetic asq: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;->asu:Lcom/google/android/gms/internal/measurement/me;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/g;->asq:Lcom/google/android/gms/internal/measurement/me;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/g;->anq:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/g;->anm: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;->asu:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/g;->asq: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;->anq:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/g;->anm:Ljava/lang/String;
 
-    iget-wide v2, p0, Lcom/google/android/gms/internal/measurement/g;->anz:J
+    iget-wide v2, p0, Lcom/google/android/gms/internal/measurement/g;->anv: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 4beed609da..4c0fca7654 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;->nh()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/gb;->nf()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;->qg()Z
+    invoke-interface {v2}, Lcom/google/android/gms/internal/measurement/dq;->qe()Z
 
     move-result v2
 
@@ -79,7 +79,7 @@
     goto :goto_0
 
     :cond_1
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/gb;->tS()Ljava/lang/Iterable;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/gb;->tQ()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;->qg()Z
+    invoke-interface {v2}, Lcom/google/android/gms/internal/measurement/dq;->qe()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 4c2373be3b..ba3e3e703f 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 atC:Ljava/util/Map;
+.field private aty:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -27,7 +27,7 @@
     .end annotation
 .end field
 
-.field private axc:Ljava/util/List;
+.field private awY:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -37,7 +37,7 @@
     .end annotation
 .end field
 
-.field private axd:Ljava/util/Map;
+.field private awZ:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -46,9 +46,9 @@
     .end annotation
 .end field
 
-.field private axe:Z
+.field private axa:Z
 
-.field private volatile axf:Lcom/google/android/gms/internal/measurement/gi;
+.field private volatile axb: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 axg:Lcom/google/android/gms/internal/measurement/gc;
+.field private volatile axc: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;->axc:Ljava/util/List;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/gb;->awY: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;->axd:Ljava/util/Map;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/gb;->awZ: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;->atC:Ljava/util/Map;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/gb;->aty:Ljava/util/Map;
 
     return-void
 .end method
@@ -112,7 +112,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->axc:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->awY: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;->axc:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/gb;->awY: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;->axc:Ljava/util/List;
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/gb;->awY: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;->tU()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/gb;->tS()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;->axc:Ljava/util/List;
+    iget-object p0, p0, Lcom/google/android/gms/internal/measurement/gb;->awY: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;->axd:Ljava/util/Map;
+    iget-object p0, p0, Lcom/google/android/gms/internal/measurement/gb;->awZ:Ljava/util/Map;
 
     return-object p0
 .end method
@@ -268,9 +268,9 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/gb;->tU()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/gb;->tS()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->axc:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->awY: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;->axd:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->awZ: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;->tV()Ljava/util/SortedMap;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/gb;->tT()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;->axc:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/gb;->awY: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;->atC:Ljava/util/Map;
+    iget-object p0, p0, Lcom/google/android/gms/internal/measurement/gb;->aty:Ljava/util/Map;
 
     return-object p0
 .end method
 
-.method private final tU()V
+.method private final tS()V
     .locals 1
 
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/gb;->axe:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/gb;->axa:Z
 
     if-nez v0, :cond_0
 
@@ -347,7 +347,7 @@
     throw v0
 .end method
 
-.method private final tV()Ljava/util/SortedMap;
+.method private final tT()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;->tU()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/gb;->tS()V
 
-    iget-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;->awZ: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;->axd:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->awZ: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;->axd:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->awZ:Ljava/util/Map;
 
-    iget-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;->awZ: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;->atC:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->aty:Ljava/util/Map;
 
     :cond_0
-    iget-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;->awZ: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;->tU()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/gb;->tS()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;->axc:Ljava/util/List;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/gb;->awY: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;->tU()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/gb;->tS()V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/gb;->axc:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/gb;->awY: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;->axc:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/gb;->awY: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;->axc:Ljava/util/List;
+    iput-object v1, p0, Lcom/google/android/gms/internal/measurement/gb;->awY: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;->tV()Ljava/util/SortedMap;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/gb;->tT()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;->axc:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/gb;->awY: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;->axc:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/gb;->awY: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;->tV()Ljava/util/SortedMap;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/gb;->tT()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;->axc:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/gb;->awY: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;->tU()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/gb;->tS()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->axc:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->awY: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;->axc:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->awY:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->clear()V
 
     :cond_0
-    iget-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;->awZ: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;->axd:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->awZ: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;->axd:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->awZ: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;->axc:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->awY: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;->axf:Lcom/google/android/gms/internal/measurement/gi;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->axb: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;->axf:Lcom/google/android/gms/internal/measurement/gi;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->axb:Lcom/google/android/gms/internal/measurement/gi;
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->axf:Lcom/google/android/gms/internal/measurement/gi;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->axb: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;->nh()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/gb;->nf()I
 
     move-result v2
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/gb;->nh()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/gb;->nf()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;->axd:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->awZ:Ljava/util/Map;
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/gb;->axd:Ljava/util/Map;
+    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/gb;->awZ: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;->axc:Ljava/util/List;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/gb;->awY: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;->axd:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->awZ: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;->nh()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/gb;->nf()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;->axc:Ljava/util/List;
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/gb;->awY: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;->axd:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->awZ: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;->axd:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->awZ:Ljava/util/Map;
 
     invoke-interface {v0}, Ljava/util/Map;->hashCode()I
 
@@ -842,10 +842,10 @@
     return v2
 .end method
 
-.method public final nh()I
+.method public final nf()I
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->axc:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->awY: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;->tU()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/gb;->tS()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;->axd:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->awZ: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;->axd:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->awZ: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;->axc:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->awY: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;->axd:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/gb;->awZ:Ljava/util/Map;
 
     invoke-interface {v1}, Ljava/util/Map;->size()I
 
@@ -935,7 +935,7 @@
     return v0
 .end method
 
-.method public final tS()Ljava/lang/Iterable;
+.method public final tQ()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;->axd:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->awZ: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;->tX()Ljava/lang/Iterable;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gf;->tV()Ljava/lang/Iterable;
 
     move-result-object v0
 
     return-object v0
 
     :cond_0
-    iget-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;->awZ:Ljava/util/Map;
 
     invoke-interface {v0}, Ljava/util/Map;->entrySet()Ljava/util/Set;
 
@@ -970,7 +970,7 @@
     return-object v0
 .end method
 
-.method final tT()Ljava/util/Set;
+.method final tR()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;->axg:Lcom/google/android/gms/internal/measurement/gc;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->axc: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;->axg:Lcom/google/android/gms/internal/measurement/gc;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->axc:Lcom/google/android/gms/internal/measurement/gc;
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->axg:Lcom/google/android/gms/internal/measurement/gc;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->axc: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;->axe:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/gb;->axa:Z
 
     if-nez v0, :cond_2
 
-    iget-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;->awZ: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;->axd:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->awZ: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;->axd:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->awZ:Ljava/util/Map;
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->atC:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->aty: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;->atC:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->aty: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;->atC:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->aty:Ljava/util/Map;
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/internal/measurement/gb;->axe:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/internal/measurement/gb;->axa: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;->axe:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/gb;->axa: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 1f28c25b77..bd7119d0ee 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 auC:Lcom/google/android/gms/internal/measurement/gb;
+.field private final synthetic auy: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;->auC:Lcom/google/android/gms/internal/measurement/gb;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/gc;->auy: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;->auC:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/gc;->auy: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 f453d156cb..aaa662c30c 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 axh:Ljava/util/Iterator;
+.field private axd:Ljava/util/Iterator;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Iterator<",
@@ -28,7 +28,7 @@
     .end annotation
 .end field
 
-.field private final synthetic axi:Lcom/google/android/gms/internal/measurement/gb;
+.field private final synthetic axe: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;->axi:Lcom/google/android/gms/internal/measurement/gb;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/gd;->axe: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;->axi:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/gd;->axe: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 tW()Ljava/util/Iterator;
+.method private final tU()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;->axh:Ljava/util/Iterator;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gd;->axd:Ljava/util/Iterator;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gd;->axi:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gd;->axe: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;->axh:Ljava/util/Iterator;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/gd;->axd:Ljava/util/Iterator;
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gd;->axh:Ljava/util/Iterator;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gd;->axd: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;->axi:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/gd;->axe: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;->tW()Ljava/util/Iterator;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/gd;->tU()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;->tW()Ljava/util/Iterator;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/gd;->tU()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;->tW()Ljava/util/Iterator;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/gd;->tU()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;->axi:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gd;->axe: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 08ee324a37..9957e6b1c1 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 awn:Ljava/util/Iterator;
+.field private static final awj:Ljava/util/Iterator;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Iterator<",
@@ -14,7 +14,7 @@
     .end annotation
 .end field
 
-.field private static final axj:Ljava/lang/Iterable;
+.field private static final axf: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;->awn:Ljava/util/Iterator;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/gf;->awj: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;->axj:Ljava/lang/Iterable;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/gf;->axf:Ljava/lang/Iterable;
 
     return-void
 .end method
 
-.method static tX()Ljava/lang/Iterable;
+.method static tV()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;->axj:Ljava/lang/Iterable;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/gf;->axf:Ljava/lang/Iterable;
 
     return-object v0
 .end method
 
-.method static synthetic tY()Ljava/util/Iterator;
+.method static synthetic tW()Ljava/util/Iterator;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/gf;->awn:Ljava/util/Iterator;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/gf;->awj: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 9fb4ae189e..f16f8449c5 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 atN:Ljava/lang/Object;
+.field private atJ:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TV;"
@@ -29,9 +29,9 @@
     .end annotation
 .end field
 
-.field private final synthetic axi:Lcom/google/android/gms/internal/measurement/gb;
+.field private final synthetic axe:Lcom/google/android/gms/internal/measurement/gb;
 
-.field private final axk:Ljava/lang/Comparable;
+.field private final axg: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;->axi:Lcom/google/android/gms/internal/measurement/gb;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/gg;->axe: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;->axk:Ljava/lang/Comparable;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/gg;->axg:Ljava/lang/Comparable;
 
-    iput-object p3, p0, Lcom/google/android/gms/internal/measurement/gg;->atN:Ljava/lang/Object;
+    iput-object p3, p0, Lcom/google/android/gms/internal/measurement/gg;->atJ: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;->axk:Ljava/lang/Comparable;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/gg;->axg: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;->atN:Ljava/lang/Object;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/gg;->atJ: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;->axk:Ljava/lang/Comparable;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gg;->axg: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;->atN:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gg;->atJ: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;->axk:Ljava/lang/Comparable;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gg;->axg: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;->atN:Ljava/lang/Object;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/gg;->atJ: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;->axi:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gg;->axe: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;->atN:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gg;->atJ:Ljava/lang/Object;
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/gg;->atN:Ljava/lang/Object;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/gg;->atJ: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;->axk:Ljava/lang/Comparable;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gg;->axg: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;->atN:Ljava/lang/Object;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/gg;->atJ: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 6b64dbeec7..9c5270c0d2 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;->tY()Ljava/util/Iterator;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gf;->tW()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 245d141136..63a1acb711 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 auC:Lcom/google/android/gms/internal/measurement/gb;
+.field private final synthetic auy: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;->auC:Lcom/google/android/gms/internal/measurement/gb;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/gi;->auy: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;->auC:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gi;->auy: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;->auC:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gi;->auy: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;->auC:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gi;->auy: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;->auC:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/gi;->auy: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;->auC:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gi;->auy: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;->auC:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gi;->auy: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 61c579a93a..a8252b76bf 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 atG:Z
+.field private atC:Z
 
-.field private axl:Ljava/util/Iterator;
+.field private axh:Ljava/util/Iterator;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Iterator<",
@@ -30,7 +30,7 @@
     .end annotation
 .end field
 
-.field private final synthetic axm:Lcom/google/android/gms/internal/measurement/gb;
+.field private final synthetic axi: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;->axm:Lcom/google/android/gms/internal/measurement/gb;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/gj;->axi: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 tW()Ljava/util/Iterator;
+.method private final tU()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;->axl:Ljava/util/Iterator;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gj;->axh:Ljava/util/Iterator;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gj;->axm:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gj;->axi: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;->axl:Ljava/util/Iterator;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/gj;->axh:Ljava/util/Iterator;
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gj;->axl:Ljava/util/Iterator;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gj;->axh: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;->axm:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/gj;->axi: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;->axm:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gj;->axi: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;->tW()Ljava/util/Iterator;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/gj;->tU()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;->atG:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/internal/measurement/gj;->atC: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;->axm:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gj;->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;
 
@@ -177,7 +177,7 @@
 
     if-ge v1, v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gj;->axm:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gj;->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;
 
@@ -194,7 +194,7 @@
     return-object v0
 
     :cond_0
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/gj;->tW()Ljava/util/Iterator;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/gj;->tU()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;->atG:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/gj;->atC:Z
 
     if-eqz v0, :cond_1
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/google/android/gms/internal/measurement/gj;->atG:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/internal/measurement/gj;->atC:Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gj;->axm:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gj;->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 v0, p0, Lcom/google/android/gms/internal/measurement/gj;->zza:I
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/gj;->axm:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/gj;->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;
 
@@ -236,7 +236,7 @@
 
     if-ge v0, v1, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gj;->axm:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gj;->axi: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;->tW()Ljava/util/Iterator;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/gj;->tU()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 3a4589f8b7..c83795448b 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;->pJ()I
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/gl;->pH()I
 
     move-result v1
 
@@ -22,7 +22,7 @@
     const/4 v1, 0x0
 
     :goto_0
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/gl;->pJ()I
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/gl;->pH()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 f6cb5b63a5..e02b992769 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 pJ()I
+.method public abstract pH()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 101c1146e8..8d5ed476e2 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 auj:Lcom/google/android/gms/internal/measurement/cn;
+.field private final synthetic auf: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;->auj:Lcom/google/android/gms/internal/measurement/cn;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/gm;->auf: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;->auj:Lcom/google/android/gms/internal/measurement/cn;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gm;->auf: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 pJ()I
+.method public final pH()I
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gm;->auj:Lcom/google/android/gms/internal/measurement/cn;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gm;->auf:Lcom/google/android/gms/internal/measurement/cn;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cn;->pJ()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cn;->pH()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 8baf82d9fe..5a9669b44a 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;->pK()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->pI()I
 
     move-result v0
 
@@ -123,7 +123,7 @@
 
     if-ne v0, v3, :cond_0
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->so()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->sm()I
 
     move-result p2
 
@@ -132,7 +132,7 @@
     return v2
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()Lcom/google/android/gms/internal/measurement/eg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tj()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;->rC()Ljava/lang/Object;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/gn;->rA()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;->pJ()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->pH()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;->pK()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->pI()I
 
     move-result p2
 
@@ -183,14 +183,14 @@
     return v2
 
     :cond_5
-    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;->ti()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;->sq()Lcom/google/android/gms/internal/measurement/cn;
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->so()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;->sn()J
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->sl()J
 
     move-result-wide v3
 
@@ -208,7 +208,7 @@
     return v2
 
     :cond_8
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->qV()J
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->qT()J
 
     move-result-wide v3
 
@@ -316,7 +316,7 @@
     .end annotation
 .end method
 
-.method abstract rC()Ljava/lang/Object;
+.method abstract rA()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 2fd6249e7e..a031ed0860 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;->tZ()Lcom/google/android/gms/internal/measurement/gq;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gq;->tX()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;->ua()Lcom/google/android/gms/internal/measurement/gq;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gq;->tY()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;->anu:I
+    iget v2, p1, Lcom/google/android/gms/internal/measurement/gq;->anq:I
 
     if-ge v0, v2, :cond_1
 
-    iget-object v2, p1, Lcom/google/android/gms/internal/measurement/gq;->anv:[I
+    iget-object v2, p1, Lcom/google/android/gms/internal/measurement/gq;->anr:[I
 
     aget v2, v2, v0
 
     ushr-int/lit8 v2, v2, 0x3
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/measurement/gq;->awE:[Ljava/lang/Object;
+    iget-object v3, p1, Lcom/google/android/gms/internal/measurement/gq;->awA:[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;->qh()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/gq;->qf()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;->pJ()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hk;->pH()I
 
     move-result v0
 
-    sget v1, Lcom/google/android/gms/internal/measurement/dw$d;->afg:I
+    sget v1, Lcom/google/android/gms/internal/measurement/dw$d;->afc:I
 
     if-ne v0, v1, :cond_1
 
-    iget v0, p1, Lcom/google/android/gms/internal/measurement/gq;->anu:I
+    iget v0, p1, Lcom/google/android/gms/internal/measurement/gq;->anq: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;->anv:[I
+    iget-object v1, p1, Lcom/google/android/gms/internal/measurement/gq;->anr:[I
 
     aget v1, v1, v0
 
     ushr-int/lit8 v1, v1, 0x3
 
-    iget-object v2, p1, Lcom/google/android/gms/internal/measurement/gq;->awE:[Ljava/lang/Object;
+    iget-object v2, p1, Lcom/google/android/gms/internal/measurement/gq;->awA:[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;->anu:I
+    iget v1, p1, Lcom/google/android/gms/internal/measurement/gq;->anq:I
 
     if-ge v0, v1, :cond_2
 
-    iget-object v1, p1, Lcom/google/android/gms/internal/measurement/gq;->anv:[I
+    iget-object v1, p1, Lcom/google/android/gms/internal/measurement/gq;->anr:[I
 
     aget v1, v1, v0
 
     ushr-int/lit8 v1, v1, 0x3
 
-    iget-object v2, p1, Lcom/google/android/gms/internal/measurement/gq;->awE:[Ljava/lang/Object;
+    iget-object v2, p1, Lcom/google/android/gms/internal/measurement/gq;->awA:[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;->tZ()Lcom/google/android/gms/internal/measurement/gq;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gq;->tX()Lcom/google/android/gms/internal/measurement/gq;
 
     move-result-object v0
 
@@ -375,10 +375,10 @@
     return-object p1
 .end method
 
-.method final synthetic rC()Ljava/lang/Object;
+.method final synthetic rA()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gq;->ua()Lcom/google/android/gms/internal/measurement/gq;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gq;->tY()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 e58e389462..1eab5b3ff2 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 axn:Lcom/google/android/gms/internal/measurement/gq;
+.field private static final axj:Lcom/google/android/gms/internal/measurement/gq;
 
 
 # instance fields
-.field anu:I
+.field anq:I
 
-.field anv:[I
+.field anr:[I
 
-.field awE:[Ljava/lang/Object;
+.field awA:[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;->axn:Lcom/google/android/gms/internal/measurement/gq;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/gq;->axj: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;->anu:I
+    iput p1, p0, Lcom/google/android/gms/internal/measurement/gq;->anq:I
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/gq;->anv:[I
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/gq;->anr:[I
 
-    iput-object p3, p0, Lcom/google/android/gms/internal/measurement/gq;->awE:[Ljava/lang/Object;
+    iput-object p3, p0, Lcom/google/android/gms/internal/measurement/gq;->awA:[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;->anu:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/gq;->anq:I
 
-    iget v1, p1, Lcom/google/android/gms/internal/measurement/gq;->anu:I
+    iget v1, p1, Lcom/google/android/gms/internal/measurement/gq;->anq:I
 
     add-int/2addr v0, v1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/gq;->anv:[I
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/gq;->anr:[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;->anv:[I
+    iget-object v2, p1, Lcom/google/android/gms/internal/measurement/gq;->anr:[I
 
-    iget v3, p0, Lcom/google/android/gms/internal/measurement/gq;->anu:I
+    iget v3, p0, Lcom/google/android/gms/internal/measurement/gq;->anq:I
 
-    iget v4, p1, Lcom/google/android/gms/internal/measurement/gq;->anu:I
+    iget v4, p1, Lcom/google/android/gms/internal/measurement/gq;->anq: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;->awE:[Ljava/lang/Object;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/gq;->awA:[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;->awE:[Ljava/lang/Object;
+    iget-object v3, p1, Lcom/google/android/gms/internal/measurement/gq;->awA:[Ljava/lang/Object;
 
-    iget p0, p0, Lcom/google/android/gms/internal/measurement/gq;->anu:I
+    iget p0, p0, Lcom/google/android/gms/internal/measurement/gq;->anq:I
 
-    iget p1, p1, Lcom/google/android/gms/internal/measurement/gq;->anu:I
+    iget p1, p1, Lcom/google/android/gms/internal/measurement/gq;->anq: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;->tl()Lcom/google/android/gms/internal/measurement/eg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tj()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;->pJ()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hk;->pH()I
 
     move-result p0
 
-    sget v1, Lcom/google/android/gms/internal/measurement/dw$d;->auq:I
+    sget v1, Lcom/google/android/gms/internal/measurement/dw$d;->aum:I
 
     if-ne p0, v1, :cond_2
 
@@ -235,15 +235,15 @@
     return-void
 .end method
 
-.method public static tZ()Lcom/google/android/gms/internal/measurement/gq;
+.method public static tX()Lcom/google/android/gms/internal/measurement/gq;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/gq;->axn:Lcom/google/android/gms/internal/measurement/gq;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/gq;->axj:Lcom/google/android/gms/internal/measurement/gq;
 
     return-object v0
 .end method
 
-.method static ua()Lcom/google/android/gms/internal/measurement/gq;
+.method static tY()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;->anu:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/gq;->anq:I
 
     if-nez v0, :cond_0
 
     return-void
 
     :cond_0
-    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/hk;->pJ()I
+    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/hk;->pH()I
 
     move-result v0
 
-    sget v1, Lcom/google/android/gms/internal/measurement/dw$d;->auq:I
+    sget v1, Lcom/google/android/gms/internal/measurement/dw$d;->aum:I
 
     if-ne v0, v1, :cond_2
 
     const/4 v0, 0x0
 
     :goto_0
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/gq;->anu:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/gq;->anq:I
 
     if-ge v0, v1, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/gq;->anv:[I
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/gq;->anr:[I
 
     aget v1, v1, v0
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/gq;->awE:[Ljava/lang/Object;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/gq;->awA:[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;->anu:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/gq;->anq: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;->anv:[I
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/gq;->anr:[I
 
     aget v1, v1, v0
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/gq;->awE:[Ljava/lang/Object;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/gq;->awA:[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;->anu:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/gq;->anq:I
 
     if-ge v0, v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/gq;->anv:[I
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/gq;->anr:[I
 
     aget v1, v1, v0
 
@@ -348,7 +348,7 @@
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/gq;->awE:[Ljava/lang/Object;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/gq;->awA:[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;->anu:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/gq;->anq:I
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/gq;->anv:[I
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/gq;->anr:[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;->anu:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/gq;->anq:I
 
     add-int/2addr v1, v0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gq;->anv:[I
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gq;->anr:[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;->anv:[I
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/gq;->anr:[I
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gq;->awE:[Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gq;->awA:[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;->awE:[Ljava/lang/Object;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/gq;->awA:[Ljava/lang/Object;
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gq;->anv:[I
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gq;->anr:[I
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/gq;->anu:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/gq;->anq:I
 
     aput p1, v0, v1
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/gq;->awE:[Ljava/lang/Object;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/gq;->awA:[Ljava/lang/Object;
 
     aput-object p2, p1, v1
 
     add-int/lit8 v1, v1, 0x1
 
-    iput v1, p0, Lcom/google/android/gms/internal/measurement/gq;->anu:I
+    iput v1, p0, Lcom/google/android/gms/internal/measurement/gq;->anq: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;->anu:I
+    iget v2, p0, Lcom/google/android/gms/internal/measurement/gq;->anq:I
 
-    iget v3, p1, Lcom/google/android/gms/internal/measurement/gq;->anu:I
+    iget v3, p1, Lcom/google/android/gms/internal/measurement/gq;->anq:I
 
     if-ne v2, v3, :cond_8
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/gq;->anv:[I
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/gq;->anr:[I
 
-    iget-object v4, p1, Lcom/google/android/gms/internal/measurement/gq;->anv:[I
+    iget-object v4, p1, Lcom/google/android/gms/internal/measurement/gq;->anr:[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;->awE:[Ljava/lang/Object;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/gq;->awA:[Ljava/lang/Object;
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/gq;->awE:[Ljava/lang/Object;
+    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/gq;->awA:[Ljava/lang/Object;
 
-    iget v3, p0, Lcom/google/android/gms/internal/measurement/gq;->anu:I
+    iget v3, p0, Lcom/google/android/gms/internal/measurement/gq;->anq: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;->anu:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/gq;->anq:I
 
     add-int/lit16 v1, v0, 0x20f
 
     mul-int/lit8 v1, v1, 0x1f
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/gq;->anv:[I
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/gq;->anr:[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;->awE:[Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gq;->awA:[Ljava/lang/Object;
 
-    iget v2, p0, Lcom/google/android/gms/internal/measurement/gq;->anu:I
+    iget v2, p0, Lcom/google/android/gms/internal/measurement/gq;->anq:I
 
     :goto_1
     if-ge v3, v2, :cond_1
@@ -606,7 +606,7 @@
     return v1
 .end method
 
-.method public final qh()I
+.method public final qf()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;->anu:I
+    iget v2, p0, Lcom/google/android/gms/internal/measurement/gq;->anq:I
 
     if-ge v0, v2, :cond_6
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/gq;->anv:[I
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/gq;->anr:[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;->awE:[Ljava/lang/Object;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/gq;->awA:[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;->tl()Lcom/google/android/gms/internal/measurement/eg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tj()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;->awE:[Ljava/lang/Object;
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/gq;->awA:[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;->qh()I
+    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/gq;->qf()I
 
     move-result v3
 
@@ -700,7 +700,7 @@
     goto :goto_1
 
     :cond_3
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/gq;->awE:[Ljava/lang/Object;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/gq;->awA:[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;->awE:[Ljava/lang/Object;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/gq;->awA:[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;->awE:[Ljava/lang/Object;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/gq;->awA:[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 cc4f4e9629..bf3c852fc9 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 anu:I
+.field private final synthetic anq:I
 
-.field private axo:Ljava/util/ListIterator;
+.field private axk:Ljava/util/ListIterator;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/ListIterator<",
@@ -30,32 +30,32 @@
     .end annotation
 .end field
 
-.field private final synthetic axp:Lcom/google/android/gms/internal/measurement/gt;
+.field private final synthetic axl: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;->axp:Lcom/google/android/gms/internal/measurement/gt;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/gr;->axl:Lcom/google/android/gms/internal/measurement/gt;
 
-    iput p2, p0, Lcom/google/android/gms/internal/measurement/gr;->anu:I
+    iput p2, p0, Lcom/google/android/gms/internal/measurement/gr;->anq:I
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/gr;->axp:Lcom/google/android/gms/internal/measurement/gt;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/gr;->axl: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;->anu:I
+    iget p2, p0, Lcom/google/android/gms/internal/measurement/gr;->anq: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;->axo:Ljava/util/ListIterator;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/gr;->axk: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;->axo:Ljava/util/ListIterator;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gr;->axk: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;->axo:Ljava/util/ListIterator;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gr;->axk: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;->axo:Ljava/util/ListIterator;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gr;->axk: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;->axo:Ljava/util/ListIterator;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gr;->axk: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;->axo:Ljava/util/ListIterator;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gr;->axk: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;->axo:Ljava/util/ListIterator;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gr;->axk: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 68737746ff..61da9c4893 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 axq:Lcom/google/android/gms/internal/measurement/en;
+.field private final axm: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;->axq:Lcom/google/android/gms/internal/measurement/en;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/gt;->axm: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;->axq:Lcom/google/android/gms/internal/measurement/en;
+    iget-object p0, p0, Lcom/google/android/gms/internal/measurement/gt;->axm: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;->axq:Lcom/google/android/gms/internal/measurement/en;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gt;->axm: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;->axq:Lcom/google/android/gms/internal/measurement/en;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gt;->axm: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 ql()Ljava/util/List;
+.method public final qj()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;->axq:Lcom/google/android/gms/internal/measurement/en;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gt;->axm:Lcom/google/android/gms/internal/measurement/en;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/en;->ql()Ljava/util/List;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/en;->qj()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;->axq:Lcom/google/android/gms/internal/measurement/en;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gt;->axm: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 tr()Lcom/google/android/gms/internal/measurement/en;
+.method public final tp()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 3c0035ffca..0f682d6e85 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;->axD:Lsun/misc/Unsafe;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gu$b;->axz: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;->axD:Lsun/misc/Unsafe;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gu$b;->axz: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;->axD:Lsun/misc/Unsafe;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gu$b;->axz: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;->axD:Lsun/misc/Unsafe;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gu$b;->axz: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;->axD:Lsun/misc/Unsafe;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gu$b;->axz: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;->axD:Lsun/misc/Unsafe;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gu$b;->axz: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;->axD:Lsun/misc/Unsafe;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gu$b;->axz: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;->axD:Lsun/misc/Unsafe;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gu$b;->axz: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 9d40e4aae1..b00debf84c 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 axD:Lsun/misc/Unsafe;
+.field axz: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;->axD:Lsun/misc/Unsafe;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/gu$d;->axz: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;->axD:Lsun/misc/Unsafe;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gu$d;->axz: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;->axD:Lsun/misc/Unsafe;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gu$d;->axz: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;->axD:Lsun/misc/Unsafe;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gu$d;->axz: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;->axD:Lsun/misc/Unsafe;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gu$d;->axz: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 cfd6d30222..907ca57cb9 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,19 +15,13 @@
 
 
 # static fields
-.field private static final adP:J
+.field private static final adL:J
 
-.field private static final aus:Ljava/util/logging/Logger;
+.field private static final auo:Ljava/util/logging/Logger;
 
-.field private static final axA:J
+.field private static final axn:Lsun/misc/Unsafe;
 
-.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;
+.field private static final axo:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -36,7 +30,15 @@
     .end annotation
 .end field
 
-.field private static final axt:Lcom/google/android/gms/internal/measurement/gu$d;
+.field private static final axp:Lcom/google/android/gms/internal/measurement/gu$d;
+
+.field private static final axq:J
+
+.field private static final axr:J
+
+.field private static final axs:J
+
+.field private static final axt:J
 
 .field private static final axu:J
 
@@ -46,9 +48,7 @@
 
 .field private static final axx:J
 
-.field private static final axy:J
-
-.field private static final axz:J
+.field private static final axy:I
 
 .field static final zza:Z
 
@@ -95,19 +95,19 @@
 
     move-result-object v5
 
-    sput-object v5, Lcom/google/android/gms/internal/measurement/gu;->aus:Ljava/util/logging/Logger;
+    sput-object v5, Lcom/google/android/gms/internal/measurement/gu;->auo:Ljava/util/logging/Logger;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gu;->ub()Lsun/misc/Unsafe;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gu;->tZ()Lsun/misc/Unsafe;
 
     move-result-object v5
 
-    sput-object v5, Lcom/google/android/gms/internal/measurement/gu;->axr:Lsun/misc/Unsafe;
+    sput-object v5, Lcom/google/android/gms/internal/measurement/gu;->axn:Lsun/misc/Unsafe;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ck;->rN()Ljava/lang/Class;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ck;->rL()Ljava/lang/Class;
 
     move-result-object v5
 
-    sput-object v5, Lcom/google/android/gms/internal/measurement/gu;->axs:Ljava/lang/Class;
+    sput-object v5, Lcom/google/android/gms/internal/measurement/gu;->axo: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;->axr:Lsun/misc/Unsafe;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/gu;->axn: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;->pH()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ck;->pF()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;->axr:Lsun/misc/Unsafe;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/gu;->axn: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;->axr:Lsun/misc/Unsafe;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/gu;->axn: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;->axr:Lsun/misc/Unsafe;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/gu;->axn: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;->axt:Lcom/google/android/gms/internal/measurement/gu$d;
+    sput-object v6, Lcom/google/android/gms/internal/measurement/gu;->axp:Lcom/google/android/gms/internal/measurement/gu$d;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gu;->pR()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gu;->pP()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;->qg()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gu;->qe()Z
 
     move-result v5
 
@@ -220,7 +220,7 @@
 
     int-to-long v4, v4
 
-    sput-wide v4, Lcom/google/android/gms/internal/measurement/gu;->axu:J
+    sput-wide v4, Lcom/google/android/gms/internal/measurement/gu;->axq: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;->adP:J
+    sput-wide v3, Lcom/google/android/gms/internal/measurement/gu;->adL: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;->axv:J
+    sput-wide v3, Lcom/google/android/gms/internal/measurement/gu;->axr: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;->axw:J
+    sput-wide v2, Lcom/google/android/gms/internal/measurement/gu;->axs: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;->axx:J
+    sput-wide v2, Lcom/google/android/gms/internal/measurement/gu;->axt: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;->axy:J
+    sput-wide v1, Lcom/google/android/gms/internal/measurement/gu;->axu: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;->axz:J
+    sput-wide v1, Lcom/google/android/gms/internal/measurement/gu;->axv: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;->axA:J
+    sput-wide v0, Lcom/google/android/gms/internal/measurement/gu;->axw: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;->uc()Ljava/lang/reflect/Field;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gu;->ua()Ljava/lang/reflect/Field;
 
     move-result-object v0
 
     if-eqz v0, :cond_5
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/gu;->axt:Lcom/google/android/gms/internal/measurement/gu$d;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/gu;->axp: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;->axD:Lsun/misc/Unsafe;
+    iget-object v1, v1, Lcom/google/android/gms/internal/measurement/gu$d;->axz: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;->axB:J
+    sput-wide v0, Lcom/google/android/gms/internal/measurement/gu;->axx: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;->axC:I
+    sput v1, Lcom/google/android/gms/internal/measurement/gu;->axy: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;->axt:Lcom/google/android/gms/internal/measurement/gu$d;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/gu;->axp: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;->axt:Lcom/google/android/gms/internal/measurement/gu$d;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/gu;->axp: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;->axt:Lcom/google/android/gms/internal/measurement/gu$d;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/gu;->axp: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;->axt:Lcom/google/android/gms/internal/measurement/gu$d;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/gu;->axp: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;->axt:Lcom/google/android/gms/internal/measurement/gu$d;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/gu;->axp:Lcom/google/android/gms/internal/measurement/gu$d;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/gu$d;->axD:Lsun/misc/Unsafe;
+    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/gu$d;->axz: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;->axt:Lcom/google/android/gms/internal/measurement/gu$d;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/gu;->axp: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;->axt:Lcom/google/android/gms/internal/measurement/gu$d;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/gu;->axp: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;->axt:Lcom/google/android/gms/internal/measurement/gu$d;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/gu;->axp: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;->axt:Lcom/google/android/gms/internal/measurement/gu$d;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/gu;->axp: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;->axt:Lcom/google/android/gms/internal/measurement/gu$d;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/gu;->axp: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;->axt:Lcom/google/android/gms/internal/measurement/gu$d;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/gu;->axp: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;->axt:Lcom/google/android/gms/internal/measurement/gu$d;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/gu;->axp: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;->axt:Lcom/google/android/gms/internal/measurement/gu$d;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/gu;->axp: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;->axt:Lcom/google/android/gms/internal/measurement/gu$d;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/gu;->axp:Lcom/google/android/gms/internal/measurement/gu$d;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/gu$d;->axD:Lsun/misc/Unsafe;
+    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/gu$d;->axz: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 pH()Z
+.method static pF()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 pR()Z
+.method private static pP()Z
     .locals 9
 
     const-string v0, "copyMemory"
 
     const-string v1, "getLong"
 
-    sget-object v2, Lcom/google/android/gms/internal/measurement/gu;->axr:Lsun/misc/Unsafe;
+    sget-object v2, Lcom/google/android/gms/internal/measurement/gu;->axn: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;->uc()Ljava/lang/reflect/Field;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gu;->ua()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;->pH()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ck;->pF()Z
 
     move-result v6
 
@@ -910,7 +910,7 @@
     :catchall_0
     move-exception v0
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/gu;->aus:Ljava/util/logging/Logger;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/gu;->auo: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 qg()Z
+.method private static qe()Z
     .locals 8
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/gu;->axr:Lsun/misc/Unsafe;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/gu;->axn: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;->pH()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ck;->pF()Z
 
     move-result v2
 
@@ -1272,7 +1272,7 @@
     :catchall_0
     move-exception v0
 
-    sget-object v2, Lcom/google/android/gms/internal/measurement/gu;->aus:Ljava/util/logging/Logger;
+    sget-object v2, Lcom/google/android/gms/internal/measurement/gu;->auo:Ljava/util/logging/Logger;
 
     sget-object v3, Ljava/util/logging/Level;->WARNING:Ljava/util/logging/Level;
 
@@ -1352,6 +1352,31 @@
     return p0
 .end method
 
+.method static tZ()Lsun/misc/Unsafe;
+    .locals 1
+
+    :try_start_0
+    new-instance v0, Lcom/google/android/gms/internal/measurement/gw;
+
+    invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/gw;-><init>()V
+
+    invoke-static {v0}, Ljava/security/AccessController;->doPrivileged(Ljava/security/PrivilegedExceptionAction;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lsun/misc/Unsafe;
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    goto :goto_0
+
+    :catchall_0
+    const/4 v0, 0x0
+
+    :goto_0
+    return-object v0
+.end method
+
 .method static u(Ljava/lang/Class;)Ljava/lang/Object;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
@@ -1365,7 +1390,7 @@
     .end annotation
 
     :try_start_0
-    sget-object v0, Lcom/google/android/gms/internal/measurement/gu;->axr:Lsun/misc/Unsafe;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/gu;->axn:Lsun/misc/Unsafe;
 
     invoke-virtual {v0, p0}, Lsun/misc/Unsafe;->allocateInstance(Ljava/lang/Class;)Ljava/lang/Object;
 
@@ -1404,35 +1429,10 @@
     return p0
 .end method
 
-.method static ub()Lsun/misc/Unsafe;
-    .locals 1
-
-    :try_start_0
-    new-instance v0, Lcom/google/android/gms/internal/measurement/gw;
-
-    invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/gw;-><init>()V
-
-    invoke-static {v0}, Ljava/security/AccessController;->doPrivileged(Ljava/security/PrivilegedExceptionAction;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lsun/misc/Unsafe;
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    goto :goto_0
-
-    :catchall_0
-    const/4 v0, 0x0
-
-    :goto_0
-    return-object v0
-.end method
-
-.method private static uc()Ljava/lang/reflect/Field;
+.method private static ua()Ljava/lang/reflect/Field;
     .locals 3
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ck;->pH()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ck;->pF()Z
 
     move-result v0
 
@@ -1491,9 +1491,9 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/gu;->axt:Lcom/google/android/gms/internal/measurement/gu$d;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/gu;->axp:Lcom/google/android/gms/internal/measurement/gu$d;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/gu$d;->axD:Lsun/misc/Unsafe;
+    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/gu$d;->axz: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;->axt:Lcom/google/android/gms/internal/measurement/gu$d;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/gu;->axp:Lcom/google/android/gms/internal/measurement/gu$d;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/gu$d;->axD:Lsun/misc/Unsafe;
+    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/gu$d;->axz: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;->pH()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ck;->pF()Z
 
     move-result v1
 
@@ -1561,7 +1561,7 @@
 
     :cond_0
     :try_start_0
-    sget-object v1, Lcom/google/android/gms/internal/measurement/gu;->axs:Ljava/lang/Class;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/gu;->axo: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 0bb1544b31..a61ef24f7a 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 awn:Ljava/util/Iterator;
+.field private awj:Ljava/util/Iterator;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Iterator<",
@@ -28,18 +28,18 @@
     .end annotation
 .end field
 
-.field private final synthetic axE:Lcom/google/android/gms/internal/measurement/gt;
+.field private final synthetic axA: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;->axE:Lcom/google/android/gms/internal/measurement/gt;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/gv;->axA: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;->axE:Lcom/google/android/gms/internal/measurement/gt;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/gv;->axA: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;->awn:Ljava/util/Iterator;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/gv;->awj: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;->awn:Ljava/util/Iterator;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gv;->awj: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;->awn:Ljava/util/Iterator;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gv;->awj: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 b2622913fc..7b2157cf23 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 axF:Lcom/google/android/gms/internal/measurement/gy;
+.field private static final axB: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;->pH()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gu;->pF()Z
 
     move-result v0
 
@@ -33,7 +33,7 @@
     :goto_0
     if-eqz v0, :cond_1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ck;->pH()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ck;->pF()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;->axF:Lcom/google/android/gms/internal/measurement/gy;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/gx;->axB: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;->axF:Lcom/google/android/gms/internal/measurement/gy;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/gx;->axB: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;->axF:Lcom/google/android/gms/internal/measurement/gy;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/gx;->axB: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;->axF:Lcom/google/android/gms/internal/measurement/gy;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/gx;->axB: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;->axF:Lcom/google/android/gms/internal/measurement/gy;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/gx;->axB: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 2e55a8afc5..9d39199285 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;->tn()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()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;->tn()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()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;->tn()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()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 665cb84f52..22b03cc5ce 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 asu:Lcom/google/android/gms/internal/measurement/me;
+.field private final synthetic asq:Lcom/google/android/gms/internal/measurement/me;
 
-.field private final synthetic asy:Lcom/google/android/gms/internal/measurement/it;
+.field private final synthetic asu: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;->asu:Lcom/google/android/gms/internal/measurement/me;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/h;->asq:Lcom/google/android/gms/internal/measurement/me;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/h;->asy:Lcom/google/android/gms/internal/measurement/it;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/h;->asu: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 pG()V
+.method protected final pE()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/h;->asy:Lcom/google/android/gms/internal/measurement/it;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/h;->asu: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;->asu:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/h;->asq: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;->asy:Lcom/google/android/gms/internal/measurement/it;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/h;->asu: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 6d22322ecd..a104d8016f 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;->tn()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()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;->tn()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()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;->tn()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()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 9b9f398d88..ccf4d116d4 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;->tn()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()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;->tn()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()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;->tn()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()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 cbd7f572b5..938536512d 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,9 +14,17 @@
 
 
 # static fields
-.field public static final enum awy:Lcom/google/android/gms/internal/measurement/he;
+.field public static final enum awu: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 awv: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 axG:Lcom/google/android/gms/internal/measurement/he;
 
@@ -42,15 +50,7 @@
 
 .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;
+.field private static final synthetic axS:[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;->aya:Lcom/google/android/gms/internal/measurement/hh;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->axW: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;->awy:Lcom/google/android/gms/internal/measurement/he;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/he;->awu: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;->axZ:Lcom/google/android/gms/internal/measurement/hh;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->axV: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;->axG:Lcom/google/android/gms/internal/measurement/he;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/he;->axC: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;->axY:Lcom/google/android/gms/internal/measurement/hh;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->axU: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;->awz:Lcom/google/android/gms/internal/measurement/he;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/he;->awv: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;->axY:Lcom/google/android/gms/internal/measurement/hh;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->axU: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;->axH:Lcom/google/android/gms/internal/measurement/he;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/he;->axD: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;->axX:Lcom/google/android/gms/internal/measurement/hh;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->axT: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;->axI:Lcom/google/android/gms/internal/measurement/he;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/he;->axE: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;->axY:Lcom/google/android/gms/internal/measurement/hh;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->axU: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;->axJ:Lcom/google/android/gms/internal/measurement/he;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/he;->axF: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;->axX:Lcom/google/android/gms/internal/measurement/hh;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->axT: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;->axK: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;->ayb: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 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;->axL: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/hd;
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->ayc: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 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;->axM: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/hg;
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->ayf: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-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;->axN: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/hf;
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->ayf: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-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;->axO: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/hi;
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->ayd: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-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;->axP: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/he;
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->axX:Lcom/google/android/gms/internal/measurement/hh;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->axT: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;->axQ: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/he;
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->aye: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/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;->axR: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/he;
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->axX:Lcom/google/android/gms/internal/measurement/hh;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->axT: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;->axS: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/he;
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->axY:Lcom/google/android/gms/internal/measurement/hh;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->axU: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;->axT: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;->axX:Lcom/google/android/gms/internal/measurement/hh;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->axT: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;->axU: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;->axY:Lcom/google/android/gms/internal/measurement/hh;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->axU: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;->axV: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;
 
     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;->awy:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->awu:Lcom/google/android/gms/internal/measurement/he;
 
     aput-object v1, v0, v3
 
-    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;->axC:Lcom/google/android/gms/internal/measurement/he;
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->awz:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->awv:Lcom/google/android/gms/internal/measurement/he;
 
     aput-object v1, v0, v5
 
-    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;->axD:Lcom/google/android/gms/internal/measurement/he;
 
     aput-object v1, v0, v6
 
-    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;->axE:Lcom/google/android/gms/internal/measurement/he;
 
     aput-object v1, v0, v7
 
-    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;->axF:Lcom/google/android/gms/internal/measurement/he;
 
     aput-object v1, v0, v4
 
-    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;->axG:Lcom/google/android/gms/internal/measurement/he;
 
     aput-object v1, v0, v8
 
-    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;->axH:Lcom/google/android/gms/internal/measurement/he;
 
     aput-object v1, v0, v9
 
-    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;->axI: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;->axN: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;
 
     const/16 v2, 0x9
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axO: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;
 
     const/16 v2, 0xa
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axP: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;
 
     const/16 v2, 0xb
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axQ: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;
 
     aput-object v1, v0, v10
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axR: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;
 
     aput-object v1, v0, v11
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axS: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;
 
     aput-object v1, v0, v12
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axT: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;
 
     aput-object v1, v0, v13
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axU: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;
 
     const/16 v2, 0x10
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axV: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, v15
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/he;->axW:[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;
 
     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;->axW:[Lcom/google/android/gms/internal/measurement/he;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/he;->axS:[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 558bc651b4..1991a31063 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,6 +14,14 @@
 
 
 # static fields
+.field public static final enum axT: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 axV: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 axX:Lcom/google/android/gms/internal/measurement/hh;
 
 .field public static final enum axY:Lcom/google/android/gms/internal/measurement/hh;
@@ -24,15 +32,7 @@
 
 .field public static final enum ayb: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 ayd: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 ayf:Lcom/google/android/gms/internal/measurement/hh;
-
-.field private static final synthetic ayg:[Lcom/google/android/gms/internal/measurement/hh;
+.field private static final synthetic ayc:[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;->axX:Lcom/google/android/gms/internal/measurement/hh;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/hh;->axT: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;->axY:Lcom/google/android/gms/internal/measurement/hh;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/hh;->axU: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;->axZ:Lcom/google/android/gms/internal/measurement/hh;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/hh;->axV: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;->aya:Lcom/google/android/gms/internal/measurement/hh;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/hh;->axW: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;->ayb: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;
 
@@ -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;->ayc: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;
 
-    sget-object v7, Lcom/google/android/gms/internal/measurement/cn;->auj:Lcom/google/android/gms/internal/measurement/cn;
+    sget-object v7, Lcom/google/android/gms/internal/measurement/cn;->auf: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;->ayd: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;
 
@@ -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;->aye: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;
 
@@ -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;->ayf: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;
 
     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;->axX:Lcom/google/android/gms/internal/measurement/hh;
+    sget-object v7, Lcom/google/android/gms/internal/measurement/hh;->axT:Lcom/google/android/gms/internal/measurement/hh;
 
     aput-object v7, v0, v1
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->axY:Lcom/google/android/gms/internal/measurement/hh;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->axU:Lcom/google/android/gms/internal/measurement/hh;
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->axZ:Lcom/google/android/gms/internal/measurement/hh;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->axV:Lcom/google/android/gms/internal/measurement/hh;
 
     aput-object v1, v0, v4
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->aya:Lcom/google/android/gms/internal/measurement/hh;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->axW:Lcom/google/android/gms/internal/measurement/hh;
 
     aput-object v1, v0, v5
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->ayb: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;
 
     aput-object v1, v0, v6
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->ayc: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, v2
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->ayd: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, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->aye: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, v9
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->ayf: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, v10
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/hh;->ayg:[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;
 
     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;->ayg:[Lcom/google/android/gms/internal/measurement/hh;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/hh;->ayc:[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 665d446f02..aec8c0978a 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 ayh:Lcom/google/android/gms/internal/measurement/hj;
+.field private static ayd:Lcom/google/android/gms/internal/measurement/hj;
 
 
 # instance fields
-.field private final ayi:Lcom/google/android/gms/internal/measurement/bs;
+.field private final aye: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;->ayh:Lcom/google/android/gms/internal/measurement/hj;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/hj;->ayd: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;->ayi:Lcom/google/android/gms/internal/measurement/bs;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/hj;->aye: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;->ayh:Lcom/google/android/gms/internal/measurement/hj;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/hj;->ayd:Lcom/google/android/gms/internal/measurement/hj;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/hj;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/hj;->rA()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;->pH()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/hm;->pF()Z
 
     move-result v0
 
@@ -104,12 +104,12 @@
 
 
 # virtual methods
-.method public final synthetic rC()Ljava/lang/Object;
+.method public final synthetic rA()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/hj;->ayi:Lcom/google/android/gms/internal/measurement/bs;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/hj;->aye:Lcom/google/android/gms/internal/measurement/bs;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rC()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rA()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 2d1ed1ae96..70d9d0f4e3 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 pJ()I
+.method public abstract pH()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 246d1f2b48..8d5e640fed 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 ayj:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayf: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;->ayj:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/hl;->ayf:Lcom/google/android/gms/internal/measurement/be;
 
     return-void
 .end method
@@ -55,12 +55,12 @@
 
 
 # virtual methods
-.method public final pH()Z
+.method public final pF()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/hl;->ayj:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/hl;->ayf:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()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 d9654ba768..69cf20b50d 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 pH()Z
+.method public abstract pF()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 a0ddf6f51f..bc06cf4c22 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 pH()Z
+.method public abstract pF()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 8b2ca4261e..45f7151f0f 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 ayk:Lcom/google/android/gms/internal/measurement/ho;
+.field private static ayg:Lcom/google/android/gms/internal/measurement/ho;
 
 
 # instance fields
-.field private final ayi:Lcom/google/android/gms/internal/measurement/bs;
+.field private final aye: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;->ayk:Lcom/google/android/gms/internal/measurement/ho;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ho;->ayg: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;->ayi:Lcom/google/android/gms/internal/measurement/bs;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ho;->aye: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;->ayk:Lcom/google/android/gms/internal/measurement/ho;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ho;->ayg:Lcom/google/android/gms/internal/measurement/ho;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ho;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ho;->rA()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;->pH()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/hn;->pF()Z
 
     move-result v0
 
@@ -104,12 +104,12 @@
 
 
 # virtual methods
-.method public final synthetic rC()Ljava/lang/Object;
+.method public final synthetic rA()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ho;->ayi:Lcom/google/android/gms/internal/measurement/bs;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ho;->aye:Lcom/google/android/gms/internal/measurement/bs;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rC()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rA()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 e4cfabfc0d..fd79829d79 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 ayl:Lcom/google/android/gms/internal/measurement/hp;
+.field private static ayh:Lcom/google/android/gms/internal/measurement/hp;
 
 
 # instance fields
-.field private final ayi:Lcom/google/android/gms/internal/measurement/bs;
+.field private final aye: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;->ayl:Lcom/google/android/gms/internal/measurement/hp;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/hp;->ayh: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;->ayi:Lcom/google/android/gms/internal/measurement/bs;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/hp;->aye: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;->ayl:Lcom/google/android/gms/internal/measurement/hp;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/hp;->ayh:Lcom/google/android/gms/internal/measurement/hp;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/hp;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/hp;->rA()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;->pH()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ht;->pF()Z
 
     move-result v0
 
@@ -104,12 +104,12 @@
 
 
 # virtual methods
-.method public final synthetic rC()Ljava/lang/Object;
+.method public final synthetic rA()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/hp;->ayi:Lcom/google/android/gms/internal/measurement/bs;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/hp;->aye:Lcom/google/android/gms/internal/measurement/bs;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rC()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rA()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 7f38468f86..cf12606f3c 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 ayj:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayf: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;->ayj:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/hq;->ayf:Lcom/google/android/gms/internal/measurement/be;
 
     return-void
 .end method
@@ -55,12 +55,12 @@
 
 
 # virtual methods
-.method public final pH()Z
+.method public final pF()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/hq;->ayj:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/hq;->ayf:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()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 e146b80bae..6bb4b9c900 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 ayj:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayf: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;->ayj:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/hr;->ayf:Lcom/google/android/gms/internal/measurement/be;
 
     return-void
 .end method
@@ -55,12 +55,12 @@
 
 
 # virtual methods
-.method public final pH()Z
+.method public final pF()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/hr;->ayj:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/hr;->ayf:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()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 9d63a76e4c..be779e3799 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 aym:Lcom/google/android/gms/internal/measurement/gs;
+.field private static volatile ayi: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 e79427ae45..9673f6ea1b 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 pH()Z
+.method public abstract pF()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 a4c0acae41..7cae0094b6 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 pH()Z
+.method public abstract pF()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 77387389e6..deabcf88dd 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 ayn:Lcom/google/android/gms/internal/measurement/hv;
+.field private static ayj:Lcom/google/android/gms/internal/measurement/hv;
 
 
 # instance fields
-.field private final ayi:Lcom/google/android/gms/internal/measurement/bs;
+.field private final aye: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;->ayn:Lcom/google/android/gms/internal/measurement/hv;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/hv;->ayj: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;->ayi:Lcom/google/android/gms/internal/measurement/bs;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/hv;->aye: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;->ayn:Lcom/google/android/gms/internal/measurement/hv;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/hv;->ayj:Lcom/google/android/gms/internal/measurement/hv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/hv;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/hv;->rA()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;->pH()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/hu;->pF()Z
 
     move-result v0
 
@@ -104,12 +104,12 @@
 
 
 # virtual methods
-.method public final synthetic rC()Ljava/lang/Object;
+.method public final synthetic rA()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/hv;->ayi:Lcom/google/android/gms/internal/measurement/bs;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/hv;->aye:Lcom/google/android/gms/internal/measurement/bs;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rC()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rA()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 c3e7ed09c0..3bee298ddc 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 ayo:Lcom/google/android/gms/internal/measurement/hw;
+.field private static ayk:Lcom/google/android/gms/internal/measurement/hw;
 
 
 # instance fields
-.field private final ayi:Lcom/google/android/gms/internal/measurement/bs;
+.field private final aye: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;->ayo:Lcom/google/android/gms/internal/measurement/hw;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/hw;->ayk: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;->ayi:Lcom/google/android/gms/internal/measurement/bs;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/hw;->aye: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;->ayo:Lcom/google/android/gms/internal/measurement/hw;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/hw;->ayk:Lcom/google/android/gms/internal/measurement/hw;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/hw;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/hw;->rA()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;->pH()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/hz;->pF()Z
 
     move-result v0
 
@@ -104,12 +104,12 @@
 
 
 # virtual methods
-.method public final synthetic rC()Ljava/lang/Object;
+.method public final synthetic rA()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/hw;->ayi:Lcom/google/android/gms/internal/measurement/bs;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/hw;->aye:Lcom/google/android/gms/internal/measurement/bs;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rC()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rA()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 8d8d735a80..d5ea57f095 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 ayj:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayf: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 ayp:Lcom/google/android/gms/internal/measurement/be;
+.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<",
@@ -50,7 +50,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/google/android/gms/internal/measurement/hx;->ayj:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v1, Lcom/google/android/gms/internal/measurement/hx;->ayf: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;->ayp:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/hx;->ayl:Lcom/google/android/gms/internal/measurement/be;
 
     return-void
 .end method
@@ -75,12 +75,12 @@
 
 
 # virtual methods
-.method public final pH()Z
+.method public final pF()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/hx;->ayj:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/hx;->ayf:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()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 b2fb4d9161..ac67c1b583 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 ayj:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayf: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;->ayj:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/hy;->ayf:Lcom/google/android/gms/internal/measurement/be;
 
     return-void
 .end method
@@ -55,12 +55,12 @@
 
 
 # virtual methods
-.method public final pH()Z
+.method public final pF()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/hy;->ayj:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/hy;->ayf:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()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 4ce82510c0..a266bc7f88 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 pH()Z
+.method public abstract pF()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 1d45d8ca35..3cb2b0b4ce 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 asu:Lcom/google/android/gms/internal/measurement/me;
+.field private final synthetic asq:Lcom/google/android/gms/internal/measurement/me;
 
-.field private final synthetic asy:Lcom/google/android/gms/internal/measurement/it;
+.field private final synthetic asu: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;->asu:Lcom/google/android/gms/internal/measurement/me;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/i;->asq:Lcom/google/android/gms/internal/measurement/me;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/i;->asy:Lcom/google/android/gms/internal/measurement/it;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/i;->asu: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 pG()V
+.method protected final pE()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/i;->asy:Lcom/google/android/gms/internal/measurement/it;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/i;->asu: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;->asu:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/i;->asq: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;->asy:Lcom/google/android/gms/internal/measurement/it;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/i;->asu: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 a7abae37b8..a3fd973c5a 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,49 +4,49 @@
 
 
 # virtual methods
-.method public abstract nn()J
+.method public abstract nl()J
 .end method
 
-.method public abstract qB()J
+.method public abstract qT()J
 .end method
 
-.method public abstract qV()J
+.method public abstract qx()Ljava/lang/String;
 .end method
 
-.method public abstract qz()Ljava/lang/String;
+.method public abstract qz()J
 .end method
 
-.method public abstract sc()J
+.method public abstract sa()J
+.end method
+
+.method public abstract se()J
 .end method
 
 .method public abstract sg()J
 .end method
 
-.method public abstract si()J
+.method public abstract sl()J
 .end method
 
-.method public abstract sn()J
+.method public abstract sr()J
 .end method
 
-.method public abstract st()J
+.method public abstract ub()J
 .end method
 
-.method public abstract uA()Ljava/lang/String;
+.method public abstract uc()J
 .end method
 
-.method public abstract uB()J
+.method public abstract ud()Ljava/lang/String;
 .end method
 
-.method public abstract ud()J
+.method public abstract ue()Ljava/lang/String;
 .end method
 
-.method public abstract ue()J
+.method public abstract uf()J
 .end method
 
-.method public abstract uf()Ljava/lang/String;
-.end method
-
-.method public abstract ug()Ljava/lang/String;
+.method public abstract ug()J
 .end method
 
 .method public abstract uh()J
@@ -100,7 +100,7 @@
 .method public abstract ux()J
 .end method
 
-.method public abstract uy()J
+.method public abstract uy()Ljava/lang/String;
 .end method
 
 .method public abstract uz()J
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 7e3caaff04..13a1f2ee98 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 ayq:Lcom/google/android/gms/internal/measurement/ib;
+.field private static aym:Lcom/google/android/gms/internal/measurement/ib;
 
 
 # instance fields
-.field private final ayi:Lcom/google/android/gms/internal/measurement/bs;
+.field private final aye: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;->ayq:Lcom/google/android/gms/internal/measurement/ib;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ib;->aym:Lcom/google/android/gms/internal/measurement/ib;
 
     return-void
 .end method
@@ -79,41 +79,59 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ib;->ayi:Lcom/google/android/gms/internal/measurement/bs;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ib;->aye:Lcom/google/android/gms/internal/measurement/bs;
 
     return-void
 .end method
 
-.method public static nn()J
+.method public static nl()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayq:Lcom/google/android/gms/internal/measurement/ib;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->aym:Lcom/google/android/gms/internal/measurement/ib;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rA()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;->st()J
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ia;->sr()J
 
     move-result-wide v0
 
     return-wide v0
 .end method
 
-.method public static qV()J
+.method public static qT()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayq:Lcom/google/android/gms/internal/measurement/ib;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->aym:Lcom/google/android/gms/internal/measurement/ib;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rA()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;->qB()J
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ia;->qz()J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
+
+.method public static rX()J
+    .locals 2
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->aym:Lcom/google/android/gms/internal/measurement/ib;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rA()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
 
@@ -123,9 +141,27 @@
 .method public static rZ()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayq:Lcom/google/android/gms/internal/measurement/ib;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->aym:Lcom/google/android/gms/internal/measurement/ib;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rA()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 se()J
+    .locals 2
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->aym:Lcom/google/android/gms/internal/measurement/ib;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rA()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -138,12 +174,12 @@
     return-wide v0
 .end method
 
-.method public static sb()J
+.method public static sg()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayq:Lcom/google/android/gms/internal/measurement/ib;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->aym:Lcom/google/android/gms/internal/measurement/ib;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rA()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -156,90 +192,90 @@
     return-wide v0
 .end method
 
-.method public static sg()J
+.method public static sl()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayq:Lcom/google/android/gms/internal/measurement/ib;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->aym:Lcom/google/android/gms/internal/measurement/ib;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rA()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;->uf()J
 
     move-result-wide v0
 
     return-wide v0
 .end method
 
-.method public static si()J
+.method public static sr()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayq:Lcom/google/android/gms/internal/measurement/ib;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->aym:Lcom/google/android/gms/internal/measurement/ib;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rA()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;->sa()J
 
     move-result-wide v0
 
     return-wide v0
 .end method
 
-.method public static sn()J
+.method public static uA()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayq:Lcom/google/android/gms/internal/measurement/ib;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->aym:Lcom/google/android/gms/internal/measurement/ib;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rA()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;->uh()J
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ia;->uc()J
 
     move-result-wide v0
 
     return-wide v0
 .end method
 
-.method public static st()J
-    .locals 2
+.method public static uB()Ljava/lang/String;
+    .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayq:Lcom/google/android/gms/internal/measurement/ib;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->aym:Lcom/google/android/gms/internal/measurement/ib;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rA()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
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ia;->ue()Ljava/lang/String;
 
-    move-result-wide v0
+    move-result-object v0
 
-    return-wide v0
+    return-object 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;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->aym:Lcom/google/android/gms/internal/measurement/ib;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rA()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;->ux()J
 
     move-result-wide v0
 
@@ -249,15 +285,15 @@
 .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;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->aym:Lcom/google/android/gms/internal/measurement/ib;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rA()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;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ia;->uy()Ljava/lang/String;
 
     move-result-object v0
 
@@ -267,9 +303,9 @@
 .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;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->aym:Lcom/google/android/gms/internal/measurement/ib;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rA()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -282,108 +318,108 @@
     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
+.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;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->aym:Lcom/google/android/gms/internal/measurement/ib;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rA()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;->ub()J
 
     move-result-wide v0
 
     return-wide v0
 .end method
 
-.method public static ue()J
-    .locals 2
+.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;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->aym:Lcom/google/android/gms/internal/measurement/ib;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rA()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
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ia;->qx()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public static ue()Ljava/lang/String;
+    .locals 1
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->aym:Lcom/google/android/gms/internal/measurement/ib;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rA()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 uf()J
+    .locals 2
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->aym:Lcom/google/android/gms/internal/measurement/ib;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rA()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;->qT()J
 
     move-result-wide v0
 
     return-wide v0
 .end method
 
-.method public static uf()Ljava/lang/String;
-    .locals 1
+.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;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->aym:Lcom/google/android/gms/internal/measurement/ib;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rA()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;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ia;->sl()J
 
-    move-result-object v0
+    move-result-wide 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
+    return-wide 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;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->aym:Lcom/google/android/gms/internal/measurement/ib;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rA()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
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ia;->ug()J
 
     move-result-wide v0
 
@@ -393,15 +429,15 @@
 .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;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->aym:Lcom/google/android/gms/internal/measurement/ib;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rA()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
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ia;->uh()J
 
     move-result-wide v0
 
@@ -411,9 +447,9 @@
 .method public static uj()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayq:Lcom/google/android/gms/internal/measurement/ib;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->aym:Lcom/google/android/gms/internal/measurement/ib;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rA()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -429,9 +465,9 @@
 .method public static uk()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayq:Lcom/google/android/gms/internal/measurement/ib;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->aym:Lcom/google/android/gms/internal/measurement/ib;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rA()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -447,9 +483,9 @@
 .method public static ul()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayq:Lcom/google/android/gms/internal/measurement/ib;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->aym:Lcom/google/android/gms/internal/measurement/ib;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rA()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -462,36 +498,36 @@
     return-wide v0
 .end method
 
-.method public static um()J
+.method public static un()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayq:Lcom/google/android/gms/internal/measurement/ib;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->aym:Lcom/google/android/gms/internal/measurement/ib;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rA()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
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ia;->nl()J
 
     move-result-wide v0
 
     return-wide v0
 .end method
 
-.method public static un()J
+.method public static uo()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayq:Lcom/google/android/gms/internal/measurement/ib;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->aym:Lcom/google/android/gms/internal/measurement/ib;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rA()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
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ia;->se()J
 
     move-result-wide v0
 
@@ -501,27 +537,9 @@
 .method public static up()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayq:Lcom/google/android/gms/internal/measurement/ib;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->aym: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;->nn()J
-
-    move-result-wide v0
-
-    return-wide v0
-.end method
-
-.method public static uq()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;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rA()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -534,18 +552,36 @@
     return-wide v0
 .end method
 
-.method public static ur()J
+.method public static uq()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayq:Lcom/google/android/gms/internal/measurement/ib;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->aym:Lcom/google/android/gms/internal/measurement/ib;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rA()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;->si()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 ur()J
+    .locals 2
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->aym:Lcom/google/android/gms/internal/measurement/ib;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rA()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
 
     move-result-wide v0
 
@@ -555,9 +591,9 @@
 .method public static us()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayq:Lcom/google/android/gms/internal/measurement/ib;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->aym:Lcom/google/android/gms/internal/measurement/ib;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rA()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -573,9 +609,9 @@
 .method public static ut()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayq:Lcom/google/android/gms/internal/measurement/ib;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->aym:Lcom/google/android/gms/internal/measurement/ib;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rA()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -591,9 +627,9 @@
 .method public static uu()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayq:Lcom/google/android/gms/internal/measurement/ib;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->aym:Lcom/google/android/gms/internal/measurement/ib;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rA()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -609,9 +645,9 @@
 .method public static uv()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayq:Lcom/google/android/gms/internal/measurement/ib;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->aym:Lcom/google/android/gms/internal/measurement/ib;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rA()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -627,9 +663,9 @@
 .method public static uw()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayq:Lcom/google/android/gms/internal/measurement/ib;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->aym:Lcom/google/android/gms/internal/measurement/ib;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rA()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -645,9 +681,9 @@
 .method public static ux()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayq:Lcom/google/android/gms/internal/measurement/ib;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->aym:Lcom/google/android/gms/internal/measurement/ib;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rA()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -660,50 +696,14 @@
     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
-
-    return-wide v0
-.end method
-
 
 # virtual methods
-.method public final synthetic rC()Ljava/lang/Object;
+.method public final synthetic rA()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ib;->ayi:Lcom/google/android/gms/internal/measurement/bs;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ib;->aye:Lcom/google/android/gms/internal/measurement/bs;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rC()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rA()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 f6c35529cb..ac085f7c69 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 ayr:Lcom/google/android/gms/internal/measurement/ic;
+.field private static ayn:Lcom/google/android/gms/internal/measurement/ic;
 
 
 # instance fields
-.field private final ayi:Lcom/google/android/gms/internal/measurement/bs;
+.field private final aye: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;->ayr:Lcom/google/android/gms/internal/measurement/ic;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ic;->ayn: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;->ayi:Lcom/google/android/gms/internal/measurement/bs;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ic;->aye:Lcom/google/android/gms/internal/measurement/bs;
 
     return-void
 .end method
 
-.method public static nO()Z
+.method public static nM()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ic;->ayr:Lcom/google/android/gms/internal/measurement/ic;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ic;->ayn:Lcom/google/android/gms/internal/measurement/ic;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ic;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ic;->rA()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;->ayr:Lcom/google/android/gms/internal/measurement/ic;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ic;->ayn:Lcom/google/android/gms/internal/measurement/ic;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ic;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ic;->rA()Ljava/lang/Object;
 
     const/4 v0, 0x1
 
@@ -116,12 +116,12 @@
 
 
 # virtual methods
-.method public final synthetic rC()Ljava/lang/Object;
+.method public final synthetic rA()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ic;->ayi:Lcom/google/android/gms/internal/measurement/bs;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ic;->aye:Lcom/google/android/gms/internal/measurement/bs;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rC()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rA()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 88109509f2..25f724c0cd 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
@@ -41,7 +41,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/be<",
-            "Ljava/lang/Long;",
+            "Ljava/lang/String;",
             ">;"
         }
     .end annotation
@@ -81,7 +81,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/be<",
-            "Ljava/lang/String;",
+            "Ljava/lang/Long;",
             ">;"
         }
     .end annotation
@@ -211,7 +211,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/be<",
-            "Ljava/lang/Long;",
+            "Ljava/lang/String;",
             ">;"
         }
     .end annotation
@@ -227,7 +227,7 @@
     .end annotation
 .end field
 
-.field private static final ayW:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayf:Lcom/google/android/gms/internal/measurement/be;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/be<",
@@ -237,7 +237,7 @@
     .end annotation
 .end field
 
-.field private static final ayX:Lcom/google/android/gms/internal/measurement/be;
+.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<",
@@ -247,7 +247,7 @@
     .end annotation
 .end field
 
-.field private static final ayY:Lcom/google/android/gms/internal/measurement/be;
+.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<",
@@ -257,27 +257,27 @@
     .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<",
-            "Ljava/lang/Long;",
-            ">;"
-        }
-    .end annotation
-.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/Long;",
-            ">;"
-        }
-    .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/String;",
+            ">;"
+        }
+    .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/String;",
+            ">;"
+        }
+    .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<",
@@ -291,7 +291,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/be<",
-            "Ljava/lang/String;",
+            "Ljava/lang/Long;",
             ">;"
         }
     .end annotation
@@ -301,7 +301,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/be<",
-            "Ljava/lang/String;",
+            "Ljava/lang/Long;",
             ">;"
         }
     .end annotation
@@ -311,7 +311,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;->ayj:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v3, Lcom/google/android/gms/internal/measurement/id;->ayf: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;->ayp:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v5, Lcom/google/android/gms/internal/measurement/id;->ayl: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;->ays:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v5, Lcom/google/android/gms/internal/measurement/id;->ayo: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;->ayt: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.config.url_scheme"
 
@@ -430,7 +430,7 @@
 
     move-result-object v5
 
-    sput-object v5, Lcom/google/android/gms/internal/measurement/id;->ayu: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-wide/16 v5, 0x3e8
 
@@ -440,7 +440,7 @@
 
     move-result-object v7
 
-    sput-object v7, Lcom/google/android/gms/internal/measurement/id;->ayv:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v7, Lcom/google/android/gms/internal/measurement/id;->ayr: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;->ayw:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v7, Lcom/google/android/gms/internal/measurement/id;->ays: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;->ayx:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v9, Lcom/google/android/gms/internal/measurement/id;->ayt: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;->ayy:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v9, Lcom/google/android/gms/internal/measurement/id;->ayu: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;->ayz:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v9, Lcom/google/android/gms/internal/measurement/id;->ayv: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;->ayA:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v9, Lcom/google/android/gms/internal/measurement/id;->ayw: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;->ayB:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v11, Lcom/google/android/gms/internal/measurement/id;->ayx: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;->ayC:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v11, Lcom/google/android/gms/internal/measurement/id;->ayy: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;->ayD:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v1, Lcom/google/android/gms/internal/measurement/id;->ayz: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;->ayE:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v1, Lcom/google/android/gms/internal/measurement/id;->ayA: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;->ayF: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.service_client.idle_disconnect_millis"
 
@@ -546,7 +546,7 @@
 
     move-result-object v11
 
-    sput-object v11, Lcom/google/android/gms/internal/measurement/id;->ayG: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.log_tag.service"
 
@@ -556,7 +556,7 @@
 
     move-result-object v11
 
-    sput-object v11, Lcom/google/android/gms/internal/measurement/id;->ayH:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v11, Lcom/google/android/gms/internal/measurement/id;->ayD: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;->ayI:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v3, Lcom/google/android/gms/internal/measurement/id;->ayE: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;->ayJ:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v3, Lcom/google/android/gms/internal/measurement/id;->ayF: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;->ayK:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v3, Lcom/google/android/gms/internal/measurement/id;->ayG: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;->ayL:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v3, Lcom/google/android/gms/internal/measurement/id;->ayH: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;->ayM:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v11, Lcom/google/android/gms/internal/measurement/id;->ayI: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;->ayN:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v11, Lcom/google/android/gms/internal/measurement/id;->ayJ: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;->ayO:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v9, Lcom/google/android/gms/internal/measurement/id;->ayK: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;->ayP:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v9, Lcom/google/android/gms/internal/measurement/id;->ayL: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;->ayQ:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v5, Lcom/google/android/gms/internal/measurement/id;->ayM: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;->ayR:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v5, Lcom/google/android/gms/internal/measurement/id;->ayN: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;->ayS:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v5, Lcom/google/android/gms/internal/measurement/id;->ayO: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;->ayT: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.upload.max_realtime_events_per_day"
 
@@ -674,7 +674,7 @@
 
     move-result-object v5
 
-    sput-object v5, Lcom/google/android/gms/internal/measurement/id;->ayU: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_batch_size"
 
@@ -682,7 +682,7 @@
 
     move-result-object v3
 
-    sput-object v3, Lcom/google/android/gms/internal/measurement/id;->ayV:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v3, Lcom/google/android/gms/internal/measurement/id;->ayR: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;->ayW:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v3, Lcom/google/android/gms/internal/measurement/id;->ayS: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;->ayX:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v3, Lcom/google/android/gms/internal/measurement/id;->ayT: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;->ayY:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v3, Lcom/google/android/gms/internal/measurement/id;->ayU: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;->ayZ:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/id;->ayV:Lcom/google/android/gms/internal/measurement/be;
 
     return-void
 .end method
@@ -735,12 +735,12 @@
 
 
 # virtual methods
-.method public final nn()J
+.method public final nl()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;->ayG:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -753,48 +753,30 @@
     return-wide v0
 .end method
 
-.method public final qB()J
+.method public final qT()J
     .locals 2
 
-    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;->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 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;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()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 qx()Ljava/lang/String;
+    .locals 1
+
+    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;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -803,12 +785,48 @@
     return-object v0
 .end method
 
-.method public final sc()J
+.method public final qz()J
+    .locals 2
+
+    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;->rC()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 sa()J
+    .locals 2
+
+    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;->rC()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 se()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;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -824,9 +842,9 @@
 .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;
+    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;->rE()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -839,148 +857,84 @@
     return-wide v0
 .end method
 
-.method public final si()J
+.method public final sl()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;->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 ue()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;->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 uf()Ljava/lang/String;
-    .locals 1
-
-    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;->rE()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/lang/String;
-
-    return-object v0
-.end method
-
-.method public final ug()Ljava/lang/String;
-    .locals 1
-
     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;->rE()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()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 sr()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;->rC()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;->ayf:Lcom/google/android/gms/internal/measurement/be;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/lang/Long;
+
+    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
+
+.method public final uc()J
+    .locals 2
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/id;->ayl:Lcom/google/android/gms/internal/measurement/be;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()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()Ljava/lang/String;
+    .locals 1
+
+    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;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -989,12 +943,62 @@
     return-object v0
 .end method
 
+.method public final ue()Ljava/lang/String;
+    .locals 1
+
+    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;->rC()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/lang/String;
+
+    return-object v0
+.end method
+
+.method public final uf()J
+    .locals 2
+
+    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;->rC()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/lang/Long;
+
+    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
+
+.method public final ug()J
+    .locals 2
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/id;->ayv:Lcom/google/android/gms/internal/measurement/be;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/lang/Long;
+
+    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
+
 .method public final uh()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/id;->ayx: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;->rE()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -1010,9 +1014,9 @@
 .method public final ui()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/id;->ayz: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;->rE()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -1028,9 +1032,9 @@
 .method public final uj()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/id;->ayA:Lcom/google/android/gms/internal/measurement/be;
+    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;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -1046,9 +1050,9 @@
 .method public final uk()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;->ayz:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -1064,9 +1068,9 @@
 .method public final ul()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;->ayA:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -1082,9 +1086,9 @@
 .method public final um()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/id;->ayD: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;->rE()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -1100,9 +1104,9 @@
 .method public final un()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/id;->ayE:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/id;->ayH:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -1118,9 +1122,9 @@
 .method public final uo()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/id;->ayG:Lcom/google/android/gms/internal/measurement/be;
+    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;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -1138,7 +1142,7 @@
 
     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;->rE()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -1154,9 +1158,9 @@
 .method public final uq()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;->ayM:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -1172,9 +1176,9 @@
 .method public final ur()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;->ayN:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -1190,9 +1194,9 @@
 .method public final us()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;->ayO:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -1208,9 +1212,9 @@
 .method public final ut()J
     .locals 2
 
-    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;->ayP:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -1226,9 +1230,9 @@
 .method public final uu()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;->ayQ:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -1244,9 +1248,9 @@
 .method public final uv()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;->ayR:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -1262,9 +1266,9 @@
 .method public final uw()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;->ayS:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -1280,9 +1284,9 @@
 .method public final ux()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;->ayT:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -1295,30 +1299,26 @@
     return-wide v0
 .end method
 
-.method public final uy()J
-    .locals 2
+.method public final uy()Ljava/lang/String;
+    .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/id;->ayW: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;->rE()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()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 uz()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;->ayV:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()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 78a687e001..7a230c4da8 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 ayj:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayf: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 ayp:Lcom/google/android/gms/internal/measurement/be;
+.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<",
@@ -50,7 +50,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/google/android/gms/internal/measurement/ie;->ayj:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v1, Lcom/google/android/gms/internal/measurement/ie;->ayf: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;->ayp:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ie;->ayl: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;->ayj:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ie;->ayf:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()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 5e8f740d55..db5ea6c352 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 pH()Z
+.method public abstract pF()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 7fdbf4245b..f0866e840c 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 aza:Lcom/google/android/gms/internal/measurement/ih;
+.field private static ayW:Lcom/google/android/gms/internal/measurement/ih;
 
 
 # instance fields
-.field private final ayi:Lcom/google/android/gms/internal/measurement/bs;
+.field private final aye: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;->aza:Lcom/google/android/gms/internal/measurement/ih;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ih;->ayW: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;->ayi:Lcom/google/android/gms/internal/measurement/bs;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ih;->aye: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;->aza:Lcom/google/android/gms/internal/measurement/ih;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ih;->ayW:Lcom/google/android/gms/internal/measurement/ih;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ih;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ih;->rA()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;->pH()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ig;->pF()Z
 
     move-result v0
 
@@ -104,12 +104,12 @@
 
 
 # virtual methods
-.method public final synthetic rC()Ljava/lang/Object;
+.method public final synthetic rA()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ih;->ayi:Lcom/google/android/gms/internal/measurement/bs;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ih;->aye:Lcom/google/android/gms/internal/measurement/bs;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rC()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rA()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 e5d5d29da1..48991a0c6c 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 azb:Lcom/google/android/gms/internal/measurement/ii;
+.field private static ayX:Lcom/google/android/gms/internal/measurement/ii;
 
 
 # instance fields
-.field private final ayi:Lcom/google/android/gms/internal/measurement/bs;
+.field private final aye: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;->azb:Lcom/google/android/gms/internal/measurement/ii;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ii;->ayX: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;->ayi:Lcom/google/android/gms/internal/measurement/bs;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ii;->aye: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;->azb:Lcom/google/android/gms/internal/measurement/ii;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ii;->ayX:Lcom/google/android/gms/internal/measurement/ii;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ii;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ii;->rA()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;->pH()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/il;->pF()Z
 
     move-result v0
 
@@ -104,12 +104,12 @@
 
 
 # virtual methods
-.method public final synthetic rC()Ljava/lang/Object;
+.method public final synthetic rA()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ii;->ayi:Lcom/google/android/gms/internal/measurement/bs;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ii;->aye:Lcom/google/android/gms/internal/measurement/bs;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rC()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rA()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 12c8087841..c13850455f 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 ayj:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayf: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;->ayj:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ij;->ayf:Lcom/google/android/gms/internal/measurement/be;
 
     return-void
 .end method
@@ -55,12 +55,12 @@
 
 
 # virtual methods
-.method public final pH()Z
+.method public final pF()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ij;->ayj:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ij;->ayf:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()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 1b0172c5ce..024a325515 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 ayj:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayf: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;->ayj:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ik;->ayf:Lcom/google/android/gms/internal/measurement/be;
 
     return-void
 .end method
@@ -55,12 +55,12 @@
 
 
 # virtual methods
-.method public final pH()Z
+.method public final pF()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ik;->ayj:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ik;->ayf:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()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 0b95c2a40e..f2bdf284d0 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 pH()Z
+.method public abstract pF()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 def2ce1ae7..5a9b98e028 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 pH()Z
+.method public abstract pF()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 2a2ef88e27..b141864f0f 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 azc:Lcom/google/android/gms/internal/measurement/in;
+.field private static ayY:Lcom/google/android/gms/internal/measurement/in;
 
 
 # instance fields
-.field private final ayi:Lcom/google/android/gms/internal/measurement/bs;
+.field private final aye: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;->azc:Lcom/google/android/gms/internal/measurement/in;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/in;->ayY: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;->ayi:Lcom/google/android/gms/internal/measurement/bs;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/in;->aye: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;->azc:Lcom/google/android/gms/internal/measurement/in;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/in;->ayY:Lcom/google/android/gms/internal/measurement/in;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/in;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/in;->rA()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;->pH()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/im;->pF()Z
 
     move-result v0
 
@@ -104,12 +104,12 @@
 
 
 # virtual methods
-.method public final synthetic rC()Ljava/lang/Object;
+.method public final synthetic rA()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/in;->ayi:Lcom/google/android/gms/internal/measurement/bs;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/in;->aye:Lcom/google/android/gms/internal/measurement/bs;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rC()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rA()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 248f095725..ac58bc293d 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 azd:Lcom/google/android/gms/internal/measurement/io;
+.field private static ayZ:Lcom/google/android/gms/internal/measurement/io;
 
 
 # instance fields
-.field private final ayi:Lcom/google/android/gms/internal/measurement/bs;
+.field private final aye: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;->azd:Lcom/google/android/gms/internal/measurement/io;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/io;->ayZ: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;->ayi:Lcom/google/android/gms/internal/measurement/bs;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/io;->aye:Lcom/google/android/gms/internal/measurement/bs;
 
     return-void
 .end method
 
-.method public static nO()Z
+.method public static nM()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/io;->azd:Lcom/google/android/gms/internal/measurement/io;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/io;->ayZ:Lcom/google/android/gms/internal/measurement/io;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/io;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/io;->rA()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -102,18 +102,18 @@
     return v0
 .end method
 
-.method public static qg()Z
+.method public static qe()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/io;->azd:Lcom/google/android/gms/internal/measurement/io;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/io;->ayZ:Lcom/google/android/gms/internal/measurement/io;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/io;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/io;->rA()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;->nO()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ir;->nM()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;->azd:Lcom/google/android/gms/internal/measurement/io;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/io;->ayZ:Lcom/google/android/gms/internal/measurement/io;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/io;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/io;->rA()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;->pH()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ir;->pF()Z
 
     move-result v0
 
@@ -140,12 +140,12 @@
 
 
 # virtual methods
-.method public final synthetic rC()Ljava/lang/Object;
+.method public final synthetic rA()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/io;->ayi:Lcom/google/android/gms/internal/measurement/bs;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/io;->aye:Lcom/google/android/gms/internal/measurement/bs;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rC()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rA()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 529b1bbd29..4c2a45d009 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 ayj:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayf: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 ayp:Lcom/google/android/gms/internal/measurement/be;
+.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<",
@@ -50,7 +50,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/google/android/gms/internal/measurement/ip;->ayj:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v1, Lcom/google/android/gms/internal/measurement/ip;->ayf: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;->ayp:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ip;->ayl:Lcom/google/android/gms/internal/measurement/be;
 
     return-void
 .end method
@@ -75,12 +75,12 @@
 
 
 # virtual methods
-.method public final pH()Z
+.method public final pF()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ip;->ayj:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ip;->ayf:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()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 6c52dadfc6..5104cc8850 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,7 +7,27 @@
 
 
 # static fields
-.field private static final ayj:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayf: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 ayl: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 ayo:Lcom/google/android/gms/internal/measurement/be;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/be<",
@@ -18,26 +38,6 @@
 .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
-
-.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;->ayj:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v2, Lcom/google/android/gms/internal/measurement/iq;->ayf: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;->ayp:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v2, Lcom/google/android/gms/internal/measurement/iq;->ayl: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;->ays:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v1, Lcom/google/android/gms/internal/measurement/iq;->ayo: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;->ayt:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/iq;->ayp:Lcom/google/android/gms/internal/measurement/be;
 
     return-void
 .end method
@@ -113,12 +113,12 @@
 
 
 # virtual methods
-.method public final nO()Z
+.method public final nM()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/iq;->ays:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/iq;->ayo:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -131,12 +131,12 @@
     return v0
 .end method
 
-.method public final pH()Z
+.method public final pF()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;->ayf:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()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;->ayp:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/iq;->ayl:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()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 da054f6241..c70a19d5dc 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 nO()Z
+.method public abstract nM()Z
 .end method
 
-.method public abstract pH()Z
+.method public abstract pF()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 e0a2c80fb0..819266b853 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 pH()Z
+.method public abstract pF()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 85e64786a0..865aeddb4d 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 atG:Z
+.field private atC:Z
 
-.field private final aze:Ljava/util/concurrent/atomic/AtomicReference;
+.field private final aza: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;->aze:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/it;->aza: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;->aze:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/it;->aza:Ljava/util/concurrent/atomic/AtomicReference;
 
     monitor-enter v0
 
     :try_start_0
-    iget-boolean v1, p0, Lcom/google/android/gms/internal/measurement/it;->atG:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/internal/measurement/it;->atC: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;->aze:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/it;->aza: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;->aze:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/it;->aza: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;->aze:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/it;->aza:Ljava/util/concurrent/atomic/AtomicReference;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/it;->aze:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/it;->aza: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;->atG:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/internal/measurement/it;->atC: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;->aze:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/it;->aza: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;->aze:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/it;->aza: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 0ca5c79d2c..ead35aa187 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 azf:Lcom/google/android/gms/internal/measurement/iu;
+.field private static azb:Lcom/google/android/gms/internal/measurement/iu;
 
 
 # instance fields
-.field private final ayi:Lcom/google/android/gms/internal/measurement/bs;
+.field private final aye: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;->azf:Lcom/google/android/gms/internal/measurement/iu;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/iu;->azb: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;->ayi:Lcom/google/android/gms/internal/measurement/bs;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/iu;->aye: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;->azf:Lcom/google/android/gms/internal/measurement/iu;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/iu;->azb:Lcom/google/android/gms/internal/measurement/iu;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/iu;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/iu;->rA()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;->pH()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/is;->pF()Z
 
     move-result v0
 
@@ -104,12 +104,12 @@
 
 
 # virtual methods
-.method public final synthetic rC()Ljava/lang/Object;
+.method public final synthetic rA()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/iu;->ayi:Lcom/google/android/gms/internal/measurement/bs;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/iu;->aye:Lcom/google/android/gms/internal/measurement/bs;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rC()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rA()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 b0049ffb1c..2562132b4e 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 azg:Lcom/google/android/gms/internal/measurement/iv;
+.field private static azc:Lcom/google/android/gms/internal/measurement/iv;
 
 
 # instance fields
-.field private final ayi:Lcom/google/android/gms/internal/measurement/bs;
+.field private final aye: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;->azg:Lcom/google/android/gms/internal/measurement/iv;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/iv;->azc: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;->ayi:Lcom/google/android/gms/internal/measurement/bs;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/iv;->aye:Lcom/google/android/gms/internal/measurement/bs;
 
     return-void
 .end method
 
-.method public static nO()Z
+.method public static nM()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/iv;->azg:Lcom/google/android/gms/internal/measurement/iv;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/iv;->azc:Lcom/google/android/gms/internal/measurement/iv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/iv;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/iv;->rA()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;->azg:Lcom/google/android/gms/internal/measurement/iv;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/iv;->azc:Lcom/google/android/gms/internal/measurement/iv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/iv;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/iv;->rA()Ljava/lang/Object;
 
     const/4 v0, 0x1
 
@@ -116,12 +116,12 @@
 
 
 # virtual methods
-.method public final synthetic rC()Ljava/lang/Object;
+.method public final synthetic rA()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/iv;->ayi:Lcom/google/android/gms/internal/measurement/bs;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/iv;->aye:Lcom/google/android/gms/internal/measurement/bs;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rC()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rA()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 bb18c40ddb..cccf0abf66 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 ayj:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayf: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;->ayj:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/iw;->ayf:Lcom/google/android/gms/internal/measurement/be;
 
     return-void
 .end method
@@ -55,12 +55,12 @@
 
 
 # virtual methods
-.method public final pH()Z
+.method public final pF()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/iw;->ayj:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/iw;->ayf:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()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 d6e1e78f20..c8a023cc52 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 ayj:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayf: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;->ayj:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ix;->ayf: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;->ayj:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ix;->ayf:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()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 a4a161011e..69c295d833 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 pH()Z
+.method public abstract pF()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 b52efcb3b8..b6ec8b926a 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 asu:Lcom/google/android/gms/internal/measurement/me;
+.field private final synthetic asq:Lcom/google/android/gms/internal/measurement/me;
 
-.field private final synthetic asy:Lcom/google/android/gms/internal/measurement/it;
+.field private final synthetic asu: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;->asu:Lcom/google/android/gms/internal/measurement/me;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/j;->asq:Lcom/google/android/gms/internal/measurement/me;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/j;->asy:Lcom/google/android/gms/internal/measurement/it;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/j;->asu: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 pG()V
+.method protected final pE()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/j;->asy:Lcom/google/android/gms/internal/measurement/it;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/j;->asu: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;->asu:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/j;->asq: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;->asy:Lcom/google/android/gms/internal/measurement/it;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/j;->asu: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 369acbab14..dac5623e02 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 azh:Lcom/google/android/gms/internal/measurement/ja;
+.field private static azd:Lcom/google/android/gms/internal/measurement/ja;
 
 
 # instance fields
-.field private final ayi:Lcom/google/android/gms/internal/measurement/bs;
+.field private final aye: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;->azh:Lcom/google/android/gms/internal/measurement/ja;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ja;->azd: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;->ayi:Lcom/google/android/gms/internal/measurement/bs;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ja;->aye: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;->azh:Lcom/google/android/gms/internal/measurement/ja;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ja;->azd:Lcom/google/android/gms/internal/measurement/ja;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ja;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ja;->rA()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;->pH()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/iz;->pF()Z
 
     move-result v0
 
@@ -104,12 +104,12 @@
 
 
 # virtual methods
-.method public final synthetic rC()Ljava/lang/Object;
+.method public final synthetic rA()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ja;->ayi:Lcom/google/android/gms/internal/measurement/bs;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ja;->aye:Lcom/google/android/gms/internal/measurement/bs;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rC()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rA()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 b0f4986801..ebf41eb7b9 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 azi:Lcom/google/android/gms/internal/measurement/jb;
+.field private static aze:Lcom/google/android/gms/internal/measurement/jb;
 
 
 # instance fields
-.field private final ayi:Lcom/google/android/gms/internal/measurement/bs;
+.field private final aye: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;->azi:Lcom/google/android/gms/internal/measurement/jb;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/jb;->aze: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;->ayi:Lcom/google/android/gms/internal/measurement/bs;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/jb;->aye:Lcom/google/android/gms/internal/measurement/bs;
 
     return-void
 .end method
 
-.method public static nO()Z
+.method public static nM()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/jb;->azi:Lcom/google/android/gms/internal/measurement/jb;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/jb;->aze:Lcom/google/android/gms/internal/measurement/jb;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jb;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jb;->rA()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;->azi:Lcom/google/android/gms/internal/measurement/jb;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/jb;->aze:Lcom/google/android/gms/internal/measurement/jb;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jb;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jb;->rA()Ljava/lang/Object;
 
     const/4 v0, 0x1
 
@@ -116,12 +116,12 @@
 
 
 # virtual methods
-.method public final synthetic rC()Ljava/lang/Object;
+.method public final synthetic rA()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/jb;->ayi:Lcom/google/android/gms/internal/measurement/bs;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/jb;->aye:Lcom/google/android/gms/internal/measurement/bs;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rC()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rA()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 4550de12c2..5290136293 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 ayj:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayf: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;->ayj:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/jc;->ayf:Lcom/google/android/gms/internal/measurement/be;
 
     return-void
 .end method
@@ -55,12 +55,12 @@
 
 
 # virtual methods
-.method public final pH()Z
+.method public final pF()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/jc;->ayj:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/jc;->ayf:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()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 5ba94476b2..3b0fd29814 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 ayj:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayf: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 ayp:Lcom/google/android/gms/internal/measurement/be;
+.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<",
@@ -50,7 +50,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/google/android/gms/internal/measurement/jd;->ayj:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v1, Lcom/google/android/gms/internal/measurement/jd;->ayf: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;->ayp:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/jd;->ayl: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;->ayj:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/jd;->ayf:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()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 a2377ea6da..39e718013b 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 azj:Lcom/google/android/gms/internal/measurement/jg;
+.field private static azf:Lcom/google/android/gms/internal/measurement/jg;
 
 
 # instance fields
-.field private final ayi:Lcom/google/android/gms/internal/measurement/bs;
+.field private final aye: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;->azj:Lcom/google/android/gms/internal/measurement/jg;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/jg;->azf: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;->ayi:Lcom/google/android/gms/internal/measurement/bs;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/jg;->aye:Lcom/google/android/gms/internal/measurement/bs;
 
     return-void
 .end method
 
-.method public static nO()Z
+.method public static nM()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/jg;->azj:Lcom/google/android/gms/internal/measurement/jg;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/jg;->azf:Lcom/google/android/gms/internal/measurement/jg;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jg;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jg;->rA()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;->azj:Lcom/google/android/gms/internal/measurement/jg;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/jg;->azf:Lcom/google/android/gms/internal/measurement/jg;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jg;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jg;->rA()Ljava/lang/Object;
 
     const/4 v0, 0x1
 
@@ -116,12 +116,12 @@
 
 
 # virtual methods
-.method public final synthetic rC()Ljava/lang/Object;
+.method public final synthetic rA()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/jg;->ayi:Lcom/google/android/gms/internal/measurement/bs;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/jg;->aye:Lcom/google/android/gms/internal/measurement/bs;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rC()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rA()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 d562e4778e..5abd18b48e 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 azk:Lcom/google/android/gms/internal/measurement/jh;
+.field private static azg:Lcom/google/android/gms/internal/measurement/jh;
 
 
 # instance fields
-.field private final ayi:Lcom/google/android/gms/internal/measurement/bs;
+.field private final aye: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;->azk:Lcom/google/android/gms/internal/measurement/jh;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/jh;->azg: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;->ayi:Lcom/google/android/gms/internal/measurement/bs;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/jh;->aye:Lcom/google/android/gms/internal/measurement/bs;
 
     return-void
 .end method
 
-.method public static nO()Z
+.method public static nM()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/jh;->azk:Lcom/google/android/gms/internal/measurement/jh;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/jh;->azg:Lcom/google/android/gms/internal/measurement/jh;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jh;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jh;->rA()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -102,18 +102,18 @@
     return v0
 .end method
 
-.method public static qg()Z
+.method public static qe()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/jh;->azk:Lcom/google/android/gms/internal/measurement/jh;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/jh;->azg:Lcom/google/android/gms/internal/measurement/jh;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jh;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jh;->rA()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;->nO()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/jk;->nM()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;->azk:Lcom/google/android/gms/internal/measurement/jh;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/jh;->azg:Lcom/google/android/gms/internal/measurement/jh;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jh;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jh;->rA()Ljava/lang/Object;
 
     const/4 v0, 0x1
 
@@ -134,12 +134,12 @@
 
 
 # virtual methods
-.method public final synthetic rC()Ljava/lang/Object;
+.method public final synthetic rA()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/jh;->ayi:Lcom/google/android/gms/internal/measurement/bs;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/jh;->aye:Lcom/google/android/gms/internal/measurement/bs;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rC()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rA()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 d73004d052..960af21951 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 ayj:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayf: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;->ayj:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ji;->ayf: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;->ayj:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ji;->ayf:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()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 b1bc0bf4aa..f192b684d9 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 ayj:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayf: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 ayp:Lcom/google/android/gms/internal/measurement/be;
+.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<",
@@ -50,7 +50,7 @@
 
     move-result-object v2
 
-    sput-object v2, Lcom/google/android/gms/internal/measurement/jj;->ayj:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v2, Lcom/google/android/gms/internal/measurement/jj;->ayf: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;->ayp:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/jj;->ayl:Lcom/google/android/gms/internal/measurement/be;
 
     return-void
 .end method
@@ -73,12 +73,12 @@
 
 
 # virtual methods
-.method public final nO()Z
+.method public final nM()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/jj;->ayp:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/jj;->ayl:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()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;->ayj:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/jj;->ayf:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()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 73f2b10c15..b84874b1dc 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 nO()Z
+.method public abstract nM()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 3045cdc9fb..92c0097a5b 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 pH()Z
+.method public abstract pF()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 aeeda9b1dc..ff6c8188aa 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 azl:Lcom/google/android/gms/internal/measurement/jm;
+.field private static azh:Lcom/google/android/gms/internal/measurement/jm;
 
 
 # instance fields
-.field private final ayi:Lcom/google/android/gms/internal/measurement/bs;
+.field private final aye: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;->azl:Lcom/google/android/gms/internal/measurement/jm;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/jm;->azh: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;->ayi:Lcom/google/android/gms/internal/measurement/bs;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/jm;->aye:Lcom/google/android/gms/internal/measurement/bs;
 
     return-void
 .end method
 
-.method public static nO()Z
+.method public static nM()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/jm;->azl:Lcom/google/android/gms/internal/measurement/jm;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/jm;->azh:Lcom/google/android/gms/internal/measurement/jm;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jm;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jm;->rA()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;->azl:Lcom/google/android/gms/internal/measurement/jm;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/jm;->azh:Lcom/google/android/gms/internal/measurement/jm;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jm;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jm;->rA()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;->pH()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/jl;->pF()Z
 
     move-result v0
 
@@ -122,12 +122,12 @@
 
 
 # virtual methods
-.method public final synthetic rC()Ljava/lang/Object;
+.method public final synthetic rA()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/jm;->ayi:Lcom/google/android/gms/internal/measurement/bs;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/jm;->aye:Lcom/google/android/gms/internal/measurement/bs;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rC()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rA()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 45dd92246c..e48ae30bed 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 azm:Lcom/google/android/gms/internal/measurement/jn;
+.field private static azi:Lcom/google/android/gms/internal/measurement/jn;
 
 
 # instance fields
-.field private final ayi:Lcom/google/android/gms/internal/measurement/bs;
+.field private final aye: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;->azm:Lcom/google/android/gms/internal/measurement/jn;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/jn;->azi: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;->ayi:Lcom/google/android/gms/internal/measurement/bs;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/jn;->aye: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;->azm:Lcom/google/android/gms/internal/measurement/jn;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/jn;->azi:Lcom/google/android/gms/internal/measurement/jn;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jn;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jn;->rA()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;->pH()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/jq;->pF()Z
 
     move-result v0
 
@@ -104,12 +104,12 @@
 
 
 # virtual methods
-.method public final synthetic rC()Ljava/lang/Object;
+.method public final synthetic rA()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/jn;->ayi:Lcom/google/android/gms/internal/measurement/bs;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/jn;->aye:Lcom/google/android/gms/internal/measurement/bs;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rC()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rA()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 10820938ed..4ef630d381 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 ayj:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayf: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 ayp:Lcom/google/android/gms/internal/measurement/be;
+.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<",
@@ -50,7 +50,7 @@
 
     move-result-object v2
 
-    sput-object v2, Lcom/google/android/gms/internal/measurement/jo;->ayj:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v2, Lcom/google/android/gms/internal/measurement/jo;->ayf: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;->ayp:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/jo;->ayl:Lcom/google/android/gms/internal/measurement/be;
 
     return-void
 .end method
@@ -73,12 +73,12 @@
 
 
 # virtual methods
-.method public final pH()Z
+.method public final pF()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/jo;->ayj:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/jo;->ayf:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()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;->ayp:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/jo;->ayl:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()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 69c1887918..32ae8bfb9d 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 ayj:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayf: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;->ayj:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/jp;->ayf:Lcom/google/android/gms/internal/measurement/be;
 
     return-void
 .end method
@@ -55,12 +55,12 @@
 
 
 # virtual methods
-.method public final pH()Z
+.method public final pF()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/jp;->ayj:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/jp;->ayf:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()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 cf8d683f24..49bcb95fec 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 pH()Z
+.method public abstract pF()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 ff167756ca..2ba43d63ee 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 azn:Lcom/google/android/gms/internal/measurement/js;
+.field private static azj:Lcom/google/android/gms/internal/measurement/js;
 
 
 # instance fields
-.field private final ayi:Lcom/google/android/gms/internal/measurement/bs;
+.field private final aye: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;->azn:Lcom/google/android/gms/internal/measurement/js;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/js;->azj: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;->ayi:Lcom/google/android/gms/internal/measurement/bs;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/js;->aye:Lcom/google/android/gms/internal/measurement/bs;
 
     return-void
 .end method
 
-.method public static nO()Z
+.method public static nM()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/js;->azn:Lcom/google/android/gms/internal/measurement/js;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/js;->azj:Lcom/google/android/gms/internal/measurement/js;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/js;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/js;->rA()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;->azn:Lcom/google/android/gms/internal/measurement/js;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/js;->azj:Lcom/google/android/gms/internal/measurement/js;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/js;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/js;->rA()Ljava/lang/Object;
 
     const/4 v0, 0x1
 
@@ -116,12 +116,12 @@
 
 
 # virtual methods
-.method public final synthetic rC()Ljava/lang/Object;
+.method public final synthetic rA()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/js;->ayi:Lcom/google/android/gms/internal/measurement/bs;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/js;->aye:Lcom/google/android/gms/internal/measurement/bs;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rC()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rA()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 9f80e8358d..0e924f46ae 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 azo:Lcom/google/android/gms/internal/measurement/jt;
+.field private static azk:Lcom/google/android/gms/internal/measurement/jt;
 
 
 # instance fields
-.field private final ayi:Lcom/google/android/gms/internal/measurement/bs;
+.field private final aye: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;->azo:Lcom/google/android/gms/internal/measurement/jt;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/jt;->azk: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;->ayi:Lcom/google/android/gms/internal/measurement/bs;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/jt;->aye: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;->azo:Lcom/google/android/gms/internal/measurement/jt;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/jt;->azk:Lcom/google/android/gms/internal/measurement/jt;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jt;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jt;->rA()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;->pH()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/jx;->pF()Z
 
     move-result v0
 
@@ -104,12 +104,12 @@
 
 
 # virtual methods
-.method public final synthetic rC()Ljava/lang/Object;
+.method public final synthetic rA()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/jt;->ayi:Lcom/google/android/gms/internal/measurement/bs;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/jt;->aye:Lcom/google/android/gms/internal/measurement/bs;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rC()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rA()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 1fb1978a11..175602a435 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 ayj:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayf: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;->ayj:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/jv;->ayf: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;->ayj:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/jv;->ayf:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()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 9ac798a517..a2f33f4ac9 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 ayj:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayf: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;->ayj:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/jw;->ayf:Lcom/google/android/gms/internal/measurement/be;
 
     return-void
 .end method
@@ -55,12 +55,12 @@
 
 
 # virtual methods
-.method public final pH()Z
+.method public final pF()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/jw;->ayj:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/jw;->ayf:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()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 e4b3dcf5e5..d2b1af808d 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 pH()Z
+.method public abstract pF()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 b0d2ed2edb..e4ccdf1a83 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 nO()Z
+.method public abstract nM()Z
 .end method
 
-.method public abstract pR()Z
+.method public abstract pP()Z
 .end method
 
-.method public abstract qg()Z
+.method public abstract qe()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 e329f31ab9..a1ae15f900 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 azp:Lcom/google/android/gms/internal/measurement/jz;
+.field private static azl:Lcom/google/android/gms/internal/measurement/jz;
 
 
 # instance fields
-.field private final ayi:Lcom/google/android/gms/internal/measurement/bs;
+.field private final aye: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;->azp:Lcom/google/android/gms/internal/measurement/jz;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/jz;->azl: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;->ayi:Lcom/google/android/gms/internal/measurement/bs;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/jz;->aye:Lcom/google/android/gms/internal/measurement/bs;
 
     return-void
 .end method
 
-.method public static nO()Z
+.method public static nM()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/jz;->azp:Lcom/google/android/gms/internal/measurement/jz;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/jz;->azl:Lcom/google/android/gms/internal/measurement/jz;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jz;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jz;->rA()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -102,54 +102,54 @@
     return v0
 .end method
 
-.method public static pR()Z
+.method public static pP()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/jz;->azp:Lcom/google/android/gms/internal/measurement/jz;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/jz;->azl:Lcom/google/android/gms/internal/measurement/jz;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jz;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jz;->rA()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;->qg()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/jy;->qe()Z
 
     move-result v0
 
     return v0
 .end method
 
-.method public static qE()Z
+.method public static qC()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/jz;->azp:Lcom/google/android/gms/internal/measurement/jz;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/jz;->azl:Lcom/google/android/gms/internal/measurement/jz;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jz;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jz;->rA()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;->pR()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/jy;->pP()Z
 
     move-result v0
 
     return v0
 .end method
 
-.method public static qg()Z
+.method public static qe()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/jz;->azp:Lcom/google/android/gms/internal/measurement/jz;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/jz;->azl:Lcom/google/android/gms/internal/measurement/jz;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jz;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jz;->rA()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;->nO()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/jy;->nM()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;->azp:Lcom/google/android/gms/internal/measurement/jz;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/jz;->azl:Lcom/google/android/gms/internal/measurement/jz;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jz;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jz;->rA()Ljava/lang/Object;
 
     const/4 v0, 0x1
 
@@ -170,12 +170,12 @@
 
 
 # virtual methods
-.method public final synthetic rC()Ljava/lang/Object;
+.method public final synthetic rA()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/jz;->ayi:Lcom/google/android/gms/internal/measurement/bs;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/jz;->aye:Lcom/google/android/gms/internal/measurement/bs;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rC()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rA()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 6598f5677e..6eed423f22 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 asu:Lcom/google/android/gms/internal/measurement/me;
+.field private final synthetic asq:Lcom/google/android/gms/internal/measurement/me;
 
-.field private final synthetic asy:Lcom/google/android/gms/internal/measurement/it;
+.field private final synthetic asu: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;->asu:Lcom/google/android/gms/internal/measurement/me;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/k;->asq:Lcom/google/android/gms/internal/measurement/me;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/k;->asy:Lcom/google/android/gms/internal/measurement/it;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/k;->asu: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 pG()V
+.method protected final pE()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/k;->asy:Lcom/google/android/gms/internal/measurement/it;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/k;->asu: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;->asu:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/k;->asq: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;->asy:Lcom/google/android/gms/internal/measurement/it;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/k;->asu: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 80b4385fff..6020931383 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 azq:Lcom/google/android/gms/internal/measurement/ka;
+.field private static azm:Lcom/google/android/gms/internal/measurement/ka;
 
 
 # instance fields
-.field private final ayi:Lcom/google/android/gms/internal/measurement/bs;
+.field private final aye: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;->azq:Lcom/google/android/gms/internal/measurement/ka;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ka;->azm: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;->ayi:Lcom/google/android/gms/internal/measurement/bs;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ka;->aye:Lcom/google/android/gms/internal/measurement/bs;
 
     return-void
 .end method
 
-.method public static nO()Z
+.method public static nM()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ka;->azq:Lcom/google/android/gms/internal/measurement/ka;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ka;->azm:Lcom/google/android/gms/internal/measurement/ka;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ka;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ka;->rA()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -102,18 +102,18 @@
     return v0
 .end method
 
-.method public static qg()Z
+.method public static qe()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ka;->azq:Lcom/google/android/gms/internal/measurement/ka;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ka;->azm:Lcom/google/android/gms/internal/measurement/ka;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ka;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ka;->rA()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;->nO()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/kd;->nM()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;->azq:Lcom/google/android/gms/internal/measurement/ka;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ka;->azm:Lcom/google/android/gms/internal/measurement/ka;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ka;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ka;->rA()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;->pH()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/kd;->pF()Z
 
     move-result v0
 
@@ -140,12 +140,12 @@
 
 
 # virtual methods
-.method public final synthetic rC()Ljava/lang/Object;
+.method public final synthetic rA()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ka;->ayi:Lcom/google/android/gms/internal/measurement/bs;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ka;->aye:Lcom/google/android/gms/internal/measurement/bs;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rC()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rA()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 1c7dba1031..96562d4f1f 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,7 +7,27 @@
 
 
 # static fields
-.field private static final ayj:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayf: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 ayl: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 ayo:Lcom/google/android/gms/internal/measurement/be;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/be<",
@@ -27,26 +47,6 @@
     .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<",
-            "Ljava/lang/Boolean;",
-            ">;"
-        }
-    .end annotation
-.end field
-
 
 # direct methods
 .method static constructor <clinit>()V
@@ -70,7 +70,7 @@
 
     move-result-object v2
 
-    sput-object v2, Lcom/google/android/gms/internal/measurement/kb;->ayj:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v2, Lcom/google/android/gms/internal/measurement/kb;->ayf: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;->ayp:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v2, Lcom/google/android/gms/internal/measurement/kb;->ayl: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;->ays:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v1, Lcom/google/android/gms/internal/measurement/kb;->ayo: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;->ayt:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/kb;->ayp:Lcom/google/android/gms/internal/measurement/be;
 
     return-void
 .end method
@@ -111,12 +111,30 @@
 
 
 # virtual methods
-.method public final nO()Z
+.method public final nM()Z
+    .locals 1
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kb;->ayl:Lcom/google/android/gms/internal/measurement/be;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()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 pP()Z
     .locals 1
 
     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;->rE()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -129,30 +147,12 @@
     return v0
 .end method
 
-.method public final pR()Z
+.method public final qe()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/kb;->ayt:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kb;->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/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/kb;->ays:Lcom/google/android/gms/internal/measurement/be;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()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;->ayj:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kb;->ayf:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()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 855e2ee5b5..31b6ae93e3 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,7 +7,7 @@
 
 
 # static fields
-.field private static final ayj:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayf: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 ayp:Lcom/google/android/gms/internal/measurement/be;
+.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<",
@@ -27,7 +27,7 @@
     .end annotation
 .end field
 
-.field private static final ays:Lcom/google/android/gms/internal/measurement/be;
+.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<",
@@ -60,7 +60,7 @@
 
     move-result-object v2
 
-    sput-object v2, Lcom/google/android/gms/internal/measurement/kc;->ayj:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v2, Lcom/google/android/gms/internal/measurement/kc;->ayf: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;->ayp:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v2, Lcom/google/android/gms/internal/measurement/kc;->ayl: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;->ays:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/kc;->ayo:Lcom/google/android/gms/internal/measurement/be;
 
     return-void
 .end method
@@ -91,12 +91,12 @@
 
 
 # virtual methods
-.method public final nO()Z
+.method public final nM()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/kc;->ays:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kc;->ayo:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -109,12 +109,12 @@
     return v0
 .end method
 
-.method public final pH()Z
+.method public final pF()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;->ayf:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()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;->ayp:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kc;->ayl:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()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 112bd58c5d..3d15dc1c61 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 nO()Z
+.method public abstract nM()Z
 .end method
 
-.method public abstract pH()Z
+.method public abstract pF()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 bd433fe921..3bbf9a700e 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 pH()Z
+.method public abstract pF()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 48528da208..7e393711c1 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 azr:Lcom/google/android/gms/internal/measurement/kf;
+.field private static azn:Lcom/google/android/gms/internal/measurement/kf;
 
 
 # instance fields
-.field private final ayi:Lcom/google/android/gms/internal/measurement/bs;
+.field private final aye: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;->azr:Lcom/google/android/gms/internal/measurement/kf;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/kf;->azn: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;->ayi:Lcom/google/android/gms/internal/measurement/bs;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/kf;->aye:Lcom/google/android/gms/internal/measurement/bs;
 
     return-void
 .end method
 
-.method public static nO()Z
+.method public static nM()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/kf;->azr:Lcom/google/android/gms/internal/measurement/kf;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kf;->azn:Lcom/google/android/gms/internal/measurement/kf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kf;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kf;->rA()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;->azr:Lcom/google/android/gms/internal/measurement/kf;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kf;->azn:Lcom/google/android/gms/internal/measurement/kf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kf;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kf;->rA()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;->pH()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ke;->pF()Z
 
     move-result v0
 
@@ -122,12 +122,12 @@
 
 
 # virtual methods
-.method public final synthetic rC()Ljava/lang/Object;
+.method public final synthetic rA()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/kf;->ayi:Lcom/google/android/gms/internal/measurement/bs;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/kf;->aye:Lcom/google/android/gms/internal/measurement/bs;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rC()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rA()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 e15261913d..b78782b87e 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 azs:Lcom/google/android/gms/internal/measurement/kg;
+.field private static azo:Lcom/google/android/gms/internal/measurement/kg;
 
 
 # instance fields
-.field private final ayi:Lcom/google/android/gms/internal/measurement/bs;
+.field private final aye: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;->azs:Lcom/google/android/gms/internal/measurement/kg;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/kg;->azo: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;->ayi:Lcom/google/android/gms/internal/measurement/bs;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/kg;->aye: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;->azs:Lcom/google/android/gms/internal/measurement/kg;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kg;->azo:Lcom/google/android/gms/internal/measurement/kg;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kg;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kg;->rA()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;->pH()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/kj;->pF()Z
 
     move-result v0
 
@@ -104,12 +104,12 @@
 
 
 # virtual methods
-.method public final synthetic rC()Ljava/lang/Object;
+.method public final synthetic rA()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/kg;->ayi:Lcom/google/android/gms/internal/measurement/bs;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/kg;->aye:Lcom/google/android/gms/internal/measurement/bs;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rC()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rA()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 27b5f437e5..8a39e3e010 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 ayj:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayf: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 ayp:Lcom/google/android/gms/internal/measurement/be;
+.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<",
@@ -50,7 +50,7 @@
 
     move-result-object v2
 
-    sput-object v2, Lcom/google/android/gms/internal/measurement/kh;->ayj:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v2, Lcom/google/android/gms/internal/measurement/kh;->ayf: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;->ayp:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/kh;->ayl:Lcom/google/android/gms/internal/measurement/be;
 
     return-void
 .end method
@@ -73,12 +73,12 @@
 
 
 # virtual methods
-.method public final pH()Z
+.method public final pF()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/kh;->ayj:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kh;->ayf:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()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;->ayp:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kh;->ayl:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()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 be5ad9b926..8bf544651d 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 ayj:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayf: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;->ayj:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ki;->ayf:Lcom/google/android/gms/internal/measurement/be;
 
     return-void
 .end method
@@ -55,12 +55,12 @@
 
 
 # virtual methods
-.method public final pH()Z
+.method public final pF()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ki;->ayj:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ki;->ayf:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()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 e10aa4569f..2f300391d4 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 pH()Z
+.method public abstract pF()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 065b481d4a..7822ff0b65 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 pH()Z
+.method public abstract pF()Z
 .end method
 
-.method public abstract rQ()D
+.method public abstract rO()D
 .end method
 
-.method public abstract rS()J
+.method public abstract rQ()J
 .end method
 
-.method public abstract uC()J
+.method public abstract uA()J
 .end method
 
-.method public abstract ug()Ljava/lang/String;
+.method public abstract ue()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 442255092b..1c171809ac 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 azt:Lcom/google/android/gms/internal/measurement/kl;
+.field private static azp:Lcom/google/android/gms/internal/measurement/kl;
 
 
 # instance fields
-.field private final ayi:Lcom/google/android/gms/internal/measurement/bs;
+.field private final aye: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;->azt:Lcom/google/android/gms/internal/measurement/kl;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/kl;->azp: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;->ayi:Lcom/google/android/gms/internal/measurement/bs;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/kl;->aye:Lcom/google/android/gms/internal/measurement/bs;
 
     return-void
 .end method
 
-.method public static qA()J
+.method public static qy()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/kl;->azt:Lcom/google/android/gms/internal/measurement/kl;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kl;->azp:Lcom/google/android/gms/internal/measurement/kl;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kl;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kl;->rA()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;->rS()J
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/kk;->rQ()J
 
     move-result-wide v0
 
     return-wide v0
 .end method
 
-.method public static rS()J
+.method public static rQ()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/kl;->azt:Lcom/google/android/gms/internal/measurement/kl;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kl;->azp:Lcom/google/android/gms/internal/measurement/kl;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kl;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kl;->rA()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;->uC()J
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/kk;->uA()J
 
     move-result-wide v0
 
     return-wide v0
 .end method
 
-.method public static uD()Ljava/lang/String;
+.method public static uB()Ljava/lang/String;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/kl;->azt:Lcom/google/android/gms/internal/measurement/kl;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kl;->azp:Lcom/google/android/gms/internal/measurement/kl;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kl;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kl;->rA()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;->ug()Ljava/lang/String;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/kk;->ue()Ljava/lang/String;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public static uH()D
+.method public static uF()D
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/kl;->azt:Lcom/google/android/gms/internal/measurement/kl;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kl;->azp:Lcom/google/android/gms/internal/measurement/kl;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kl;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kl;->rA()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;->rQ()D
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/kk;->rO()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;->azt:Lcom/google/android/gms/internal/measurement/kl;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kl;->azp:Lcom/google/android/gms/internal/measurement/kl;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kl;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kl;->rA()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;->pH()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/kk;->pF()Z
 
     move-result v0
 
@@ -176,12 +176,12 @@
 
 
 # virtual methods
-.method public final synthetic rC()Ljava/lang/Object;
+.method public final synthetic rA()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/kl;->ayi:Lcom/google/android/gms/internal/measurement/bs;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/kl;->aye:Lcom/google/android/gms/internal/measurement/bs;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rC()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rA()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 7179b0846f..d458cb626b 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 azu:Lcom/google/android/gms/internal/measurement/km;
+.field private static azq:Lcom/google/android/gms/internal/measurement/km;
 
 
 # instance fields
-.field private final ayi:Lcom/google/android/gms/internal/measurement/bs;
+.field private final aye: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;->azu:Lcom/google/android/gms/internal/measurement/km;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/km;->azq: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;->ayi:Lcom/google/android/gms/internal/measurement/bs;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/km;->aye: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;->azu:Lcom/google/android/gms/internal/measurement/km;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/km;->azq:Lcom/google/android/gms/internal/measurement/km;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/km;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/km;->rA()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;->pH()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/kp;->pF()Z
 
     move-result v0
 
@@ -104,12 +104,12 @@
 
 
 # virtual methods
-.method public final synthetic rC()Ljava/lang/Object;
+.method public final synthetic rA()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/km;->ayi:Lcom/google/android/gms/internal/measurement/bs;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/km;->aye:Lcom/google/android/gms/internal/measurement/bs;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rC()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rA()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 4b5c96c000..ee51a9a9e4 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 ayj:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayf: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 ayp:Lcom/google/android/gms/internal/measurement/be;
+.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<",
@@ -27,7 +27,7 @@
     .end annotation
 .end field
 
-.field private static final ays:Lcom/google/android/gms/internal/measurement/be;
+.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<",
@@ -37,7 +37,7 @@
     .end annotation
 .end field
 
-.field private static final ayt: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 +47,7 @@
     .end annotation
 .end field
 
-.field private static final ayu:Lcom/google/android/gms/internal/measurement/be;
+.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<",
@@ -80,7 +80,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;->ayf: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;->ayp:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v1, Lcom/google/android/gms/internal/measurement/kn;->ayl: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;->ays:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v1, Lcom/google/android/gms/internal/measurement/kn;->ayo: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;->ayt: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.string_flag"
 
@@ -118,7 +118,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/kn;->ayu:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/kn;->ayq:Lcom/google/android/gms/internal/measurement/be;
 
     return-void
 .end method
@@ -133,12 +133,12 @@
 
 
 # virtual methods
-.method public final pH()Z
+.method public final pF()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/kn;->ayj:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kn;->ayf:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -151,12 +151,12 @@
     return v0
 .end method
 
-.method public final rQ()D
+.method public final rO()D
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/kn;->ayp:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kn;->ayl:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -169,12 +169,12 @@
     return-wide v0
 .end method
 
-.method public final rS()J
+.method public final rQ()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/kn;->ayt: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;->rE()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -187,12 +187,12 @@
     return-wide v0
 .end method
 
-.method public final uC()J
+.method public final uA()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/kn;->ays:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kn;->ayo:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -205,12 +205,12 @@
     return-wide v0
 .end method
 
-.method public final ug()Ljava/lang/String;
+.method public final ue()Ljava/lang/String;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/kn;->ayu:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kn;->ayq:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
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 858acce107..16266a9db6 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 ayj:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayf: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;->ayj:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ko;->ayf:Lcom/google/android/gms/internal/measurement/be;
 
     return-void
 .end method
@@ -55,12 +55,12 @@
 
 
 # virtual methods
-.method public final pH()Z
+.method public final pF()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ko;->ayj:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ko;->ayf:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()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 60ae8f9045..23e24aab95 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 pH()Z
+.method public abstract pF()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 1fb9e88d8e..6be812fa39 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 pH()Z
+.method public abstract pF()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 9ac2966cf4..dcd288c464 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 azv:Lcom/google/android/gms/internal/measurement/kr;
+.field private static azr:Lcom/google/android/gms/internal/measurement/kr;
 
 
 # instance fields
-.field private final ayi:Lcom/google/android/gms/internal/measurement/bs;
+.field private final aye: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;->azv:Lcom/google/android/gms/internal/measurement/kr;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/kr;->azr: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;->ayi:Lcom/google/android/gms/internal/measurement/bs;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/kr;->aye: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;->azv:Lcom/google/android/gms/internal/measurement/kr;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kr;->azr:Lcom/google/android/gms/internal/measurement/kr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kr;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kr;->rA()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;->pH()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/kq;->pF()Z
 
     move-result v0
 
@@ -104,12 +104,12 @@
 
 
 # virtual methods
-.method public final synthetic rC()Ljava/lang/Object;
+.method public final synthetic rA()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/kr;->ayi:Lcom/google/android/gms/internal/measurement/bs;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/kr;->aye:Lcom/google/android/gms/internal/measurement/bs;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rC()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rA()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 bcb5d3a8cb..7a094cad16 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 azw:Lcom/google/android/gms/internal/measurement/ks;
+.field private static azs:Lcom/google/android/gms/internal/measurement/ks;
 
 
 # instance fields
-.field private final ayi:Lcom/google/android/gms/internal/measurement/bs;
+.field private final aye: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;->azw:Lcom/google/android/gms/internal/measurement/ks;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ks;->azs: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;->ayi:Lcom/google/android/gms/internal/measurement/bs;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ks;->aye: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;->azw:Lcom/google/android/gms/internal/measurement/ks;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ks;->azs:Lcom/google/android/gms/internal/measurement/ks;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ks;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ks;->rA()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;->pH()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/kw;->pF()Z
 
     move-result v0
 
@@ -104,12 +104,12 @@
 
 
 # virtual methods
-.method public final synthetic rC()Ljava/lang/Object;
+.method public final synthetic rA()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ks;->ayi:Lcom/google/android/gms/internal/measurement/bs;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ks;->aye:Lcom/google/android/gms/internal/measurement/bs;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rC()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rA()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 70888b1995..b3ad01be11 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 ayj:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayf: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;->ayj:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/kt;->ayf:Lcom/google/android/gms/internal/measurement/be;
 
     return-void
 .end method
@@ -55,12 +55,12 @@
 
 
 # virtual methods
-.method public final pH()Z
+.method public final pF()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/kt;->ayj:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kt;->ayf:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()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 96ca33f595..4da830f8ec 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 ayj:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayf: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;->ayj:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ku;->ayf:Lcom/google/android/gms/internal/measurement/be;
 
     return-void
 .end method
@@ -55,12 +55,12 @@
 
 
 # virtual methods
-.method public final pH()Z
+.method public final pF()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ku;->ayj:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ku;->ayf:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()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 8b31b5f33d..49813d0201 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 pH()Z
+.method public abstract pF()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 844c68e1fb..96f210b6f5 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 pH()Z
+.method public abstract pF()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 d7c062c90e..21a11af048 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 azx:Lcom/google/android/gms/internal/measurement/ky;
+.field private static azt:Lcom/google/android/gms/internal/measurement/ky;
 
 
 # instance fields
-.field private final ayi:Lcom/google/android/gms/internal/measurement/bs;
+.field private final aye: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;->azx:Lcom/google/android/gms/internal/measurement/ky;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ky;->azt: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;->ayi:Lcom/google/android/gms/internal/measurement/bs;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ky;->aye: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;->azx:Lcom/google/android/gms/internal/measurement/ky;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ky;->azt:Lcom/google/android/gms/internal/measurement/ky;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ky;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ky;->rA()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;->pH()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/kx;->pF()Z
 
     move-result v0
 
@@ -104,12 +104,12 @@
 
 
 # virtual methods
-.method public final synthetic rC()Ljava/lang/Object;
+.method public final synthetic rA()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ky;->ayi:Lcom/google/android/gms/internal/measurement/bs;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ky;->aye:Lcom/google/android/gms/internal/measurement/bs;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rC()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rA()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 1aa31152bf..1bef328060 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 azy:Lcom/google/android/gms/internal/measurement/kz;
+.field private static azu:Lcom/google/android/gms/internal/measurement/kz;
 
 
 # instance fields
-.field private final ayi:Lcom/google/android/gms/internal/measurement/bs;
+.field private final aye: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;->azy:Lcom/google/android/gms/internal/measurement/kz;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/kz;->azu: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;->ayi:Lcom/google/android/gms/internal/measurement/bs;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/kz;->aye:Lcom/google/android/gms/internal/measurement/bs;
 
     return-void
 .end method
 
-.method public static nO()Z
+.method public static nM()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/kz;->azy:Lcom/google/android/gms/internal/measurement/kz;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kz;->azu:Lcom/google/android/gms/internal/measurement/kz;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kz;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kz;->rA()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -102,126 +102,126 @@
     return v0
 .end method
 
-.method public static pR()Z
+.method public static pP()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/kz;->azy:Lcom/google/android/gms/internal/measurement/kz;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kz;->azu:Lcom/google/android/gms/internal/measurement/kz;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kz;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kz;->rA()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;->qg()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/lc;->qe()Z
 
     move-result v0
 
     return v0
 .end method
 
-.method public static qE()Z
+.method public static qC()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/kz;->azy:Lcom/google/android/gms/internal/measurement/kz;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kz;->azu:Lcom/google/android/gms/internal/measurement/kz;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kz;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kz;->rA()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;->pR()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/lc;->pP()Z
 
     move-result v0
 
     return v0
 .end method
 
-.method public static qg()Z
+.method public static qe()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/kz;->azy:Lcom/google/android/gms/internal/measurement/kz;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kz;->azu:Lcom/google/android/gms/internal/measurement/kz;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kz;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kz;->rA()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;->nO()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/lc;->nM()Z
 
     move-result v0
 
     return v0
 .end method
 
-.method public static rT()Z
+.method public static rR()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/kz;->azy:Lcom/google/android/gms/internal/measurement/kz;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kz;->azu:Lcom/google/android/gms/internal/measurement/kz;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kz;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kz;->rA()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;->rr()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/lc;->rp()Z
 
     move-result v0
 
     return v0
 .end method
 
-.method public static rr()Z
+.method public static rp()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/kz;->azy:Lcom/google/android/gms/internal/measurement/kz;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kz;->azu:Lcom/google/android/gms/internal/measurement/kz;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kz;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kz;->rA()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;->uI()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/lc;->uG()Z
 
     move-result v0
 
     return v0
 .end method
 
-.method public static uI()Z
+.method public static uG()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/kz;->azy:Lcom/google/android/gms/internal/measurement/kz;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kz;->azu:Lcom/google/android/gms/internal/measurement/kz;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kz;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kz;->rA()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;->qE()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/lc;->qC()Z
 
     move-result v0
 
     return v0
 .end method
 
-.method public static uJ()Z
+.method public static uH()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/kz;->azy:Lcom/google/android/gms/internal/measurement/kz;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kz;->azu:Lcom/google/android/gms/internal/measurement/kz;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kz;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kz;->rA()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;->rT()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/lc;->rR()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;->azy:Lcom/google/android/gms/internal/measurement/kz;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kz;->azu:Lcom/google/android/gms/internal/measurement/kz;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kz;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kz;->rA()Ljava/lang/Object;
 
     const/4 v0, 0x1
 
@@ -242,12 +242,12 @@
 
 
 # virtual methods
-.method public final synthetic rC()Ljava/lang/Object;
+.method public final synthetic rA()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/kz;->ayi:Lcom/google/android/gms/internal/measurement/bs;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/kz;->aye:Lcom/google/android/gms/internal/measurement/bs;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rC()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rA()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 1062c8c7f4..b771e8f275 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 anq:Ljava/lang/String;
+.field private final synthetic anm:Ljava/lang/String;
 
-.field private final synthetic ast:Lcom/google/android/gms/internal/measurement/me;
+.field private final synthetic asp:Lcom/google/android/gms/internal/measurement/me;
 
-.field private final synthetic asz:Lcom/google/android/gms/internal/measurement/it;
+.field private final synthetic asv: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;->ast:Lcom/google/android/gms/internal/measurement/me;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/l;->asp:Lcom/google/android/gms/internal/measurement/me;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/l;->anq:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/l;->anm: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;->asz:Lcom/google/android/gms/internal/measurement/it;
+    iput-object p5, p0, Lcom/google/android/gms/internal/measurement/l;->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
 
@@ -36,10 +36,10 @@
 
 
 # virtual methods
-.method protected final pG()V
+.method protected final pE()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/l;->asz:Lcom/google/android/gms/internal/measurement/it;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/l;->asv: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;->ast:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/l;->asp: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;->anq:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/l;->anm: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;->asz:Lcom/google/android/gms/internal/measurement/it;
+    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/l;->asv: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 70f74fac4c..3e35d97b9d 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 ayj:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayf: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;->ayj:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/la;->ayf:Lcom/google/android/gms/internal/measurement/be;
 
     return-void
 .end method
@@ -55,12 +55,12 @@
 
 
 # virtual methods
-.method public final pH()Z
+.method public final pF()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/la;->ayj:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/la;->ayf:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()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 6ea743c1cb..72622359ea 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,7 +7,27 @@
 
 
 # static fields
-.field private static final ayj:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayf: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 ayl: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 ayo:Lcom/google/android/gms/internal/measurement/be;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/be<",
@@ -27,7 +47,7 @@
     .end annotation
 .end field
 
-.field private static final ays:Lcom/google/android/gms/internal/measurement/be;
+.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<",
@@ -37,6 +57,26 @@
     .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/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/Long;",
+            ">;"
+        }
+    .end annotation
+.end field
+
 .field private static final ayt:Lcom/google/android/gms/internal/measurement/be;
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -57,46 +97,6 @@
     .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<",
-            "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/Boolean;",
-            ">;"
-        }
-    .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/Boolean;",
-            ">;"
-        }
-    .end annotation
-.end field
-
 
 # direct methods
 .method static constructor <clinit>()V
@@ -120,7 +120,7 @@
 
     move-result-object v2
 
-    sput-object v2, Lcom/google/android/gms/internal/measurement/lb;->ayj:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v2, Lcom/google/android/gms/internal/measurement/lb;->ayf: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;->ayp:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v2, Lcom/google/android/gms/internal/measurement/lb;->ayl: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;->ays:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v3, Lcom/google/android/gms/internal/measurement/lb;->ayo: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;->ayt: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-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;->ayu:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v2, Lcom/google/android/gms/internal/measurement/lb;->ayq: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;->ayv:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v2, Lcom/google/android/gms/internal/measurement/lb;->ayr: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;->ayw:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v2, Lcom/google/android/gms/internal/measurement/lb;->ays: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;->ayx: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.remove_disabled_session_scoped_user_engagement"
 
@@ -188,7 +188,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/lb;->ayy:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/lb;->ayu:Lcom/google/android/gms/internal/measurement/be;
 
     return-void
 .end method
@@ -203,12 +203,30 @@
 
 
 # virtual methods
-.method public final nO()Z
+.method public final nM()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;->rC()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 pP()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;->rE()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -221,12 +239,12 @@
     return v0
 .end method
 
-.method public final pR()Z
+.method public final qC()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/lb;->ayt:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/lb;->ayq:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -239,12 +257,30 @@
     return v0
 .end method
 
-.method public final qE()Z
+.method public final qe()Z
+    .locals 1
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/lb;->ayo:Lcom/google/android/gms/internal/measurement/be;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()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;->ayu:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -257,12 +293,12 @@
     return v0
 .end method
 
-.method public final qg()Z
+.method public final rp()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/lb;->ays: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;->rE()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -275,48 +311,12 @@
     return v0
 .end method
 
-.method public final rT()Z
+.method public final uG()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/lb;->ayy:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/lb;->ayr: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;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()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;->ayj:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/lb;->ayf:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()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 5e5d577130..b0122a6cc5 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 nO()Z
+.method public abstract nM()Z
 .end method
 
-.method public abstract pR()Z
+.method public abstract pP()Z
 .end method
 
-.method public abstract qE()Z
+.method public abstract qC()Z
 .end method
 
-.method public abstract qg()Z
+.method public abstract qe()Z
 .end method
 
-.method public abstract rT()Z
+.method public abstract rR()Z
 .end method
 
-.method public abstract rr()Z
+.method public abstract rp()Z
 .end method
 
-.method public abstract uI()Z
+.method public abstract uG()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 78a7eabb4d..b641237e09 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 nO()Z
+.method public abstract nM()Z
 .end method
 
-.method public abstract pH()Z
+.method public abstract pF()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 73bf69d5dd..55fe39a445 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 azz:Lcom/google/android/gms/internal/measurement/le;
+.field private static azv:Lcom/google/android/gms/internal/measurement/le;
 
 
 # instance fields
-.field private final ayi:Lcom/google/android/gms/internal/measurement/bs;
+.field private final aye: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;->azz:Lcom/google/android/gms/internal/measurement/le;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/le;->azv: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;->ayi:Lcom/google/android/gms/internal/measurement/bs;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/le;->aye:Lcom/google/android/gms/internal/measurement/bs;
 
     return-void
 .end method
 
-.method public static nO()Z
+.method public static nM()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/le;->azz:Lcom/google/android/gms/internal/measurement/le;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/le;->azv:Lcom/google/android/gms/internal/measurement/le;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/le;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/le;->rA()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -102,18 +102,18 @@
     return v0
 .end method
 
-.method public static qg()Z
+.method public static qe()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/le;->azz:Lcom/google/android/gms/internal/measurement/le;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/le;->azv:Lcom/google/android/gms/internal/measurement/le;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/le;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/le;->rA()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;->nO()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ld;->nM()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;->azz:Lcom/google/android/gms/internal/measurement/le;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/le;->azv:Lcom/google/android/gms/internal/measurement/le;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/le;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/le;->rA()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;->pH()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ld;->pF()Z
 
     move-result v0
 
@@ -140,12 +140,12 @@
 
 
 # virtual methods
-.method public final synthetic rC()Ljava/lang/Object;
+.method public final synthetic rA()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/le;->ayi:Lcom/google/android/gms/internal/measurement/bs;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/le;->aye:Lcom/google/android/gms/internal/measurement/bs;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rC()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rA()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 c30b69026b..52e0c1329d 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 azA:Lcom/google/android/gms/internal/measurement/lf;
+.field private static azw:Lcom/google/android/gms/internal/measurement/lf;
 
 
 # instance fields
-.field private final ayi:Lcom/google/android/gms/internal/measurement/bs;
+.field private final aye: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;->azA:Lcom/google/android/gms/internal/measurement/lf;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/lf;->azw: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;->ayi:Lcom/google/android/gms/internal/measurement/bs;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/lf;->aye:Lcom/google/android/gms/internal/measurement/bs;
 
     return-void
 .end method
 
-.method public static nO()Z
+.method public static nM()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/lf;->azA:Lcom/google/android/gms/internal/measurement/lf;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/lf;->azw:Lcom/google/android/gms/internal/measurement/lf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/lf;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/lf;->rA()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -102,36 +102,36 @@
     return v0
 .end method
 
-.method public static pR()Z
+.method public static pP()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/lf;->azA:Lcom/google/android/gms/internal/measurement/lf;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/lf;->azw:Lcom/google/android/gms/internal/measurement/lf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/lf;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/lf;->rA()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;->qg()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/li;->qe()Z
 
     move-result v0
 
     return v0
 .end method
 
-.method public static qg()Z
+.method public static qe()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/lf;->azA:Lcom/google/android/gms/internal/measurement/lf;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/lf;->azw:Lcom/google/android/gms/internal/measurement/lf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/lf;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/lf;->rA()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;->nO()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/li;->nM()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;->azA:Lcom/google/android/gms/internal/measurement/lf;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/lf;->azw:Lcom/google/android/gms/internal/measurement/lf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/lf;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/lf;->rA()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;->pH()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/li;->pF()Z
 
     move-result v0
 
@@ -158,12 +158,12 @@
 
 
 # virtual methods
-.method public final synthetic rC()Ljava/lang/Object;
+.method public final synthetic rA()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/lf;->ayi:Lcom/google/android/gms/internal/measurement/bs;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/lf;->aye:Lcom/google/android/gms/internal/measurement/bs;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rC()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rA()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 8a58087933..55125e48d0 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,7 +7,7 @@
 
 
 # static fields
-.field private static final ayj:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayf: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 ayp:Lcom/google/android/gms/internal/measurement/be;
+.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<",
@@ -27,7 +27,7 @@
     .end annotation
 .end field
 
-.field private static final ays:Lcom/google/android/gms/internal/measurement/be;
+.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<",
@@ -60,7 +60,7 @@
 
     move-result-object v2
 
-    sput-object v2, Lcom/google/android/gms/internal/measurement/lg;->ayj:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v2, Lcom/google/android/gms/internal/measurement/lg;->ayf: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;->ayp:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v2, Lcom/google/android/gms/internal/measurement/lg;->ayl: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;->ays:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/lg;->ayo:Lcom/google/android/gms/internal/measurement/be;
 
     return-void
 .end method
@@ -91,12 +91,12 @@
 
 
 # virtual methods
-.method public final nO()Z
+.method public final nM()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/lg;->ays:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/lg;->ayo:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -109,12 +109,12 @@
     return v0
 .end method
 
-.method public final pH()Z
+.method public final pF()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;->ayf:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()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;->ayp:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/lg;->ayl:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()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 816c336ef9..b81c9a3528 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,7 +7,27 @@
 
 
 # static fields
-.field private static final ayj:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayf: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 ayl: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 ayo:Lcom/google/android/gms/internal/measurement/be;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/be<",
@@ -27,26 +47,6 @@
     .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<",
-            "Ljava/lang/Boolean;",
-            ">;"
-        }
-    .end annotation
-.end field
-
 
 # direct methods
 .method static constructor <clinit>()V
@@ -70,7 +70,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;->ayf: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;->ayp:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v2, Lcom/google/android/gms/internal/measurement/lh;->ayl: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;->ays:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v2, Lcom/google/android/gms/internal/measurement/lh;->ayo: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;->ayt:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/lh;->ayp:Lcom/google/android/gms/internal/measurement/be;
 
     return-void
 .end method
@@ -109,12 +109,12 @@
 
 
 # virtual methods
-.method public final nO()Z
+.method public final nM()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/lh;->ays:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/lh;->ayo:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -127,12 +127,12 @@
     return v0
 .end method
 
-.method public final pH()Z
+.method public final pF()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/lh;->ayj:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/lh;->ayf:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -145,12 +145,12 @@
     return v0
 .end method
 
-.method public final qg()Z
+.method public final qe()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/lh;->ayt: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;->rE()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()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;->ayp:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/lh;->ayl:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()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 a9cc45180f..dc28e8f6ce 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 nO()Z
+.method public abstract nM()Z
 .end method
 
-.method public abstract pH()Z
+.method public abstract pF()Z
 .end method
 
-.method public abstract qg()Z
+.method public abstract qe()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 9d258a301f..ce09b94f58 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 azB:Lcom/google/android/gms/internal/measurement/lk;
+.field private static azx:Lcom/google/android/gms/internal/measurement/lk;
 
 
 # instance fields
-.field private final ayi:Lcom/google/android/gms/internal/measurement/bs;
+.field private final aye: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;->azB:Lcom/google/android/gms/internal/measurement/lk;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/lk;->azx: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;->ayi:Lcom/google/android/gms/internal/measurement/bs;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/lk;->aye:Lcom/google/android/gms/internal/measurement/bs;
 
     return-void
 .end method
 
-.method public static nO()Z
+.method public static nM()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/lk;->azB:Lcom/google/android/gms/internal/measurement/lk;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/lk;->azx:Lcom/google/android/gms/internal/measurement/lk;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/lk;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/lk;->rA()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;->azB:Lcom/google/android/gms/internal/measurement/lk;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/lk;->azx:Lcom/google/android/gms/internal/measurement/lk;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/lk;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/lk;->rA()Ljava/lang/Object;
 
     const/4 v0, 0x1
 
@@ -116,12 +116,12 @@
 
 
 # virtual methods
-.method public final synthetic rC()Ljava/lang/Object;
+.method public final synthetic rA()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/lk;->ayi:Lcom/google/android/gms/internal/measurement/bs;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/lk;->aye:Lcom/google/android/gms/internal/measurement/bs;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rC()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rA()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 c151ff8066..c8cbe68999 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 azC:Lcom/google/android/gms/internal/measurement/ll;
+.field private static azy:Lcom/google/android/gms/internal/measurement/ll;
 
 
 # instance fields
-.field private final ayi:Lcom/google/android/gms/internal/measurement/bs;
+.field private final aye: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;->azC:Lcom/google/android/gms/internal/measurement/ll;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ll;->azy: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;->ayi:Lcom/google/android/gms/internal/measurement/bs;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ll;->aye: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;->azC:Lcom/google/android/gms/internal/measurement/ll;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ll;->azy:Lcom/google/android/gms/internal/measurement/ll;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ll;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ll;->rA()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;->pH()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/lo;->pF()Z
 
     move-result v0
 
@@ -104,12 +104,12 @@
 
 
 # virtual methods
-.method public final synthetic rC()Ljava/lang/Object;
+.method public final synthetic rA()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ll;->ayi:Lcom/google/android/gms/internal/measurement/bs;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ll;->aye:Lcom/google/android/gms/internal/measurement/bs;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rC()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rA()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 6b8ea8b9eb..44bc5a917e 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 ayj:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayf: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;->ayj:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/lm;->ayf: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;->ayj:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/lm;->ayf:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()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 df3534eebf..3c6d16e46c 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 ayj:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayf: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;->ayj:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ln;->ayf:Lcom/google/android/gms/internal/measurement/be;
 
     return-void
 .end method
@@ -55,12 +55,12 @@
 
 
 # virtual methods
-.method public final pH()Z
+.method public final pF()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ln;->ayj:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ln;->ayf:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()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 1fef7be0ad..a59c13c814 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 pH()Z
+.method public abstract pF()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 490e44b3c6..d944831022 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 pH()Z
+.method public abstract pF()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 31f930c71c..222b4ae299 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 azD:Lcom/google/android/gms/internal/measurement/lq;
+.field private static azz:Lcom/google/android/gms/internal/measurement/lq;
 
 
 # instance fields
-.field private final ayi:Lcom/google/android/gms/internal/measurement/bs;
+.field private final aye: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;->azD:Lcom/google/android/gms/internal/measurement/lq;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/lq;->azz: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;->ayi:Lcom/google/android/gms/internal/measurement/bs;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/lq;->aye: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;->azD:Lcom/google/android/gms/internal/measurement/lq;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/lq;->azz:Lcom/google/android/gms/internal/measurement/lq;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/lq;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/lq;->rA()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;->pH()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/lp;->pF()Z
 
     move-result v0
 
@@ -104,12 +104,12 @@
 
 
 # virtual methods
-.method public final synthetic rC()Ljava/lang/Object;
+.method public final synthetic rA()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/lq;->ayi:Lcom/google/android/gms/internal/measurement/bs;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/lq;->aye:Lcom/google/android/gms/internal/measurement/bs;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rC()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rA()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 503b48edb2..9a38d427d3 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 azE:Lcom/google/android/gms/internal/measurement/lr;
+.field private static azA:Lcom/google/android/gms/internal/measurement/lr;
 
 
 # instance fields
-.field private final ayi:Lcom/google/android/gms/internal/measurement/bs;
+.field private final aye: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;->azE:Lcom/google/android/gms/internal/measurement/lr;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/lr;->azA: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;->ayi:Lcom/google/android/gms/internal/measurement/bs;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/lr;->aye: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;->azE:Lcom/google/android/gms/internal/measurement/lr;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/lr;->azA:Lcom/google/android/gms/internal/measurement/lr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/lr;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/lr;->rA()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;->pH()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/lu;->pF()Z
 
     move-result v0
 
@@ -104,12 +104,12 @@
 
 
 # virtual methods
-.method public final synthetic rC()Ljava/lang/Object;
+.method public final synthetic rA()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/lr;->ayi:Lcom/google/android/gms/internal/measurement/bs;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/lr;->aye:Lcom/google/android/gms/internal/measurement/bs;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rC()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rA()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 11b133a374..041eb8e16d 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 ayj:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayf: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;->ayj:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ls;->ayf:Lcom/google/android/gms/internal/measurement/be;
 
     return-void
 .end method
@@ -55,12 +55,12 @@
 
 
 # virtual methods
-.method public final pH()Z
+.method public final pF()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ls;->ayj:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ls;->ayf:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()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 a83dbc72f7..86beb94fd1 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 ayj:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayf: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;->ayj:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/lt;->ayf:Lcom/google/android/gms/internal/measurement/be;
 
     return-void
 .end method
@@ -55,12 +55,12 @@
 
 
 # virtual methods
-.method public final pH()Z
+.method public final pF()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/lt;->ayj:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/lt;->ayf:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rC()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 fda8fefd2a..5783520383 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 pH()Z
+.method public abstract pF()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 311a0866ce..7703720935 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;->pF()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pD()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -50,7 +50,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pD()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -75,7 +75,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pD()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -98,7 +98,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pD()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -119,7 +119,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pD()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -140,7 +140,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pD()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -161,7 +161,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pD()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -186,7 +186,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pD()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -207,7 +207,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pD()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -228,7 +228,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pD()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -249,7 +249,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pD()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -272,7 +272,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pD()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -295,7 +295,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pD()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -322,7 +322,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pD()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -343,7 +343,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pD()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -368,7 +368,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pD()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -389,7 +389,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pD()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -420,7 +420,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pD()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -449,7 +449,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pD()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -478,7 +478,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pD()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -503,7 +503,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pD()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -526,7 +526,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pD()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -549,7 +549,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pD()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -572,7 +572,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pD()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -597,7 +597,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pD()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -620,7 +620,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pD()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -643,7 +643,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pD()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -668,7 +668,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pD()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -689,7 +689,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pD()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -710,7 +710,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pD()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -733,7 +733,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pD()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -760,7 +760,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pD()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -781,7 +781,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pD()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -802,7 +802,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pD()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -823,7 +823,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pD()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -846,7 +846,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pD()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -867,7 +867,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pD()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -888,7 +888,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pD()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -911,7 +911,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pD()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -940,7 +940,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pD()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 8c34df4425..61eca0c778 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;->pF()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pD()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 eb3c4486b5..8339844031 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;->pJ()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/lz;->pH()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 21b7743ed9..cb71d327d4 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 asu:Lcom/google/android/gms/internal/measurement/me;
+.field private final synthetic asq:Lcom/google/android/gms/internal/measurement/me;
 
-.field private final synthetic asy:Lcom/google/android/gms/internal/measurement/it;
+.field private final synthetic asu: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;->asu:Lcom/google/android/gms/internal/measurement/me;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/m;->asq:Lcom/google/android/gms/internal/measurement/me;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/m;->asy:Lcom/google/android/gms/internal/measurement/it;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/m;->asu: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 pG()V
+.method protected final pE()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/m;->asy:Lcom/google/android/gms/internal/measurement/it;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/m;->asu: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;->asu:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/m;->asq: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;->asy:Lcom/google/android/gms/internal/measurement/it;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/m;->asu: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 4b233d1b60..703da863b4 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 pJ()I
+.method public abstract pH()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 0c3ca38857..b7f355fbce 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;->pF()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pD()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -46,7 +46,7 @@
     return-void
 .end method
 
-.method public final pJ()I
+.method public final pH()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;->pF()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pD()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 da12453a23..6fda6cee60 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 any:J
+.field final anu:J
 
-.field final anz:J
+.field final anv:J
 
-.field private final asH:Z
+.field private final asD:Z
 
-.field private final synthetic asu:Lcom/google/android/gms/internal/measurement/me;
+.field private final synthetic asq: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;->asu:Lcom/google/android/gms/internal/measurement/me;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/me$a;->asq: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;->azH:Lcom/google/android/gms/common/util/e;
+    iget-object v0, p1, Lcom/google/android/gms/internal/measurement/me;->azD: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;->any:J
+    iput-wide v0, p0, Lcom/google/android/gms/internal/measurement/me$a;->anu:J
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/me;->azH:Lcom/google/android/gms/common/util/e;
+    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/me;->azD:Lcom/google/android/gms/common/util/e;
 
-    invoke-interface {p1}, Lcom/google/android/gms/common/util/e;->nr()J
+    invoke-interface {p1}, Lcom/google/android/gms/common/util/e;->np()J
 
     move-result-wide v0
 
-    iput-wide v0, p0, Lcom/google/android/gms/internal/measurement/me$a;->anz:J
+    iput-wide v0, p0, Lcom/google/android/gms/internal/measurement/me$a;->anv:J
 
-    iput-boolean p2, p0, Lcom/google/android/gms/internal/measurement/me$a;->asH:Z
+    iput-boolean p2, p0, Lcom/google/android/gms/internal/measurement/me$a;->asD:Z
 
     return-void
 .end method
 
 
 # virtual methods
-.method protected pG()V
+.method protected pE()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;->asu:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/me$a;->asq: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;->pG()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/me$a;->pE()V
 
     return-void
 
@@ -100,15 +100,15 @@
     :catch_0
     move-exception v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/me$a;->asu:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/me$a;->asq:Lcom/google/android/gms/internal/measurement/me;
 
     const/4 v2, 0x0
 
-    iget-boolean v3, p0, Lcom/google/android/gms/internal/measurement/me$a;->asH:Z
+    iget-boolean v3, p0, Lcom/google/android/gms/internal/measurement/me$a;->asD: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;->pG()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/me$a;->pE()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 8e1c13b394..b2b19e9f97 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 azR:Lcom/google/android/gms/measurement/internal/gd;
+.field private final azN: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;->azR:Lcom/google/android/gms/measurement/internal/gd;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/me$b;->azN: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;->azR:Lcom/google/android/gms/measurement/internal/gd;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/me$b;->azN:Lcom/google/android/gms/measurement/internal/gd;
 
     move-object v1, p1
 
@@ -49,10 +49,10 @@
     return-void
 .end method
 
-.method public final pJ()I
+.method public final pH()I
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/me$b;->azR:Lcom/google/android/gms/measurement/internal/gd;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/me$b;->azN: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 9b2ded1328..fc86b49c5f 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 azS:Lcom/google/android/gms/internal/measurement/me;
+.field final synthetic azO: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;->azS:Lcom/google/android/gms/internal/measurement/me;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/me$c;->azO: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;->azS:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/me$c;->azO: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;->azS:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/me$c;->azO: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;->azS:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/me$c;->azO: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;->azS:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/me$c;->azO: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;->azS:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/me$c;->azO: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;->azS:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/me$c;->azO: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;->azS:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/me$c;->azO: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 830c78e249..0b0ae4dff3 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 volatile azG:Lcom/google/android/gms/internal/measurement/me; = null
+.field private static volatile azC:Lcom/google/android/gms/internal/measurement/me; = null
 
-.field private static azK:Ljava/lang/Boolean; = null
+.field private static azG:Ljava/lang/Boolean; = null
 
-.field private static azL:Ljava/lang/Boolean; = null
+.field private static azH:Ljava/lang/Boolean; = null
 
-.field private static azM:Ljava/lang/Boolean; = null
+.field private static azI:Ljava/lang/Boolean; = null
 
-.field private static azN:Ljava/lang/String; = "use_dynamite_api"
+.field private static azJ:Ljava/lang/String; = "use_dynamite_api"
 
-.field private static azO:Z = false
+.field private static azK:Z = false
 
-.field private static azP:Z = false
+.field private static azL:Z = false
 
 .field private static zzj:Z = false
 
@@ -34,11 +34,11 @@
 
 
 # instance fields
-.field private adR:Z
+.field private adN:Z
 
-.field private final anq:Ljava/lang/String;
+.field private final anm:Ljava/lang/String;
 
-.field private aua:Ljava/util/List;
+.field private atW:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -50,13 +50,13 @@
     .end annotation
 .end field
 
-.field protected final azH:Lcom/google/android/gms/common/util/e;
+.field protected final azD:Lcom/google/android/gms/common/util/e;
 
-.field private final azI:Ljava/util/concurrent/ExecutorService;
+.field private final azE:Ljava/util/concurrent/ExecutorService;
 
-.field private final azJ:Lcom/google/android/gms/measurement/api/a;
+.field private final azF:Lcom/google/android/gms/measurement/api/a;
 
-.field private azQ:Lcom/google/android/gms/internal/measurement/kv;
+.field private azM: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;->anq:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/me;->anm:Ljava/lang/String;
 
-    invoke-static {}, Lcom/google/android/gms/common/util/g;->nt()Lcom/google/android/gms/common/util/e;
+    invoke-static {}, Lcom/google/android/gms/common/util/g;->nr()Lcom/google/android/gms/common/util/e;
 
     move-result-object p2
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/me;->azH:Lcom/google/android/gms/common/util/e;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/me;->azD: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;->azI:Ljava/util/concurrent/ExecutorService;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/me;->azE: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;->azJ:Lcom/google/android/gms/measurement/api/a;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/me;->azF: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;->mS()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/me;->mQ()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;->adR:Z
+    iput-boolean p3, p0, Lcom/google/android/gms/internal/measurement/me;->adN:Z
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/me;->anq:Ljava/lang/String;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/me;->anm: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;->anq:Ljava/lang/String;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/me;->anm: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;->mS()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/me;->mQ()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;->azQ:Lcom/google/android/gms/internal/measurement/kv;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/me;->azM: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;->azG:Lcom/google/android/gms/internal/measurement/me;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/me;->azC: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;->azG:Lcom/google/android/gms/internal/measurement/me;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/me;->azC: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;->azG:Lcom/google/android/gms/internal/measurement/me;
+    sput-object v1, Lcom/google/android/gms/internal/measurement/me;->azC: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;->azG:Lcom/google/android/gms/internal/measurement/me;
+    sget-object p0, Lcom/google/android/gms/internal/measurement/me;->azC: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;->aua:Ljava/util/List;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/me;->atW: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;->adR:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/me;->adN:Z
 
     or-int/2addr v0, p2
 
-    iput-boolean v0, p0, Lcom/google/android/gms/internal/measurement/me;->adR:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/internal/measurement/me;->adN:Z
 
     if-eqz p2, :cond_0
 
-    iget-object p2, p0, Lcom/google/android/gms/internal/measurement/me;->anq:Ljava/lang/String;
+    iget-object p2, p0, Lcom/google/android/gms/internal/measurement/me;->anm: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;->anq:Ljava/lang/String;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/me;->anm: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;->adR:Z
+    iget-boolean p0, p0, Lcom/google/android/gms/internal/measurement/me;->adN: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;->azM:Ljava/lang/Boolean;
+    sput-object v2, Lcom/google/android/gms/internal/measurement/me;->azI: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;->azM:Ljava/lang/Boolean;
+    sput-object v2, Lcom/google/android/gms/internal/measurement/me;->azI:Ljava/lang/Boolean;
 
     goto :goto_0
 
     :cond_2
-    sput-object v0, Lcom/google/android/gms/internal/measurement/me;->azM:Ljava/lang/Boolean;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/me;->azI: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;->azM:Ljava/lang/Boolean;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/me;->azI: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;->azM:Ljava/lang/Boolean;
+    sget-object p0, Lcom/google/android/gms/internal/measurement/me;->azI:Ljava/lang/Boolean;
 
     if-nez p0, :cond_3
 
-    sget-object p0, Lcom/google/android/gms/internal/measurement/me;->azK:Ljava/lang/Boolean;
+    sget-object p0, Lcom/google/android/gms/internal/measurement/me;->azG: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;->mE()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/common/api/internal/e;->mC()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;->azK:Ljava/lang/Boolean;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/me;->azG:Ljava/lang/Boolean;
 
     if-eqz v1, :cond_0
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/me;->azL:Ljava/lang/Boolean;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/me;->azH: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;->azK:Ljava/lang/Boolean;
+    sput-object p0, Lcom/google/android/gms/internal/measurement/me;->azG:Ljava/lang/Boolean;
 
     sget-object p0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    sput-object p0, Lcom/google/android/gms/internal/measurement/me;->azL:Ljava/lang/Boolean;
+    sput-object p0, Lcom/google/android/gms/internal/measurement/me;->azH: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;->azN:Ljava/lang/String;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/me;->azJ: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;->azK:Ljava/lang/Boolean;
+    sput-object v1, Lcom/google/android/gms/internal/measurement/me;->azG: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;->azL:Ljava/lang/Boolean;
+    sput-object v1, Lcom/google/android/gms/internal/measurement/me;->azH: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;->azN:Ljava/lang/String;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/me;->azJ: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;->azK:Ljava/lang/Boolean;
+    sput-object p0, Lcom/google/android/gms/internal/measurement/me;->azG:Ljava/lang/Boolean;
 
     sget-object p0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    sput-object p0, Lcom/google/android/gms/internal/measurement/me;->azL:Ljava/lang/Boolean;
+    sput-object p0, Lcom/google/android/gms/internal/measurement/me;->azH: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;->anq:Ljava/lang/String;
+    iget-object p0, p0, Lcom/google/android/gms/internal/measurement/me;->anm: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;->azQ:Lcom/google/android/gms/internal/measurement/kv;
+    iget-object p0, p0, Lcom/google/android/gms/internal/measurement/me;->azM: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;->aua:Ljava/util/List;
+    iget-object p0, p0, Lcom/google/android/gms/internal/measurement/me;->atW:Ljava/util/List;
 
     return-object p0
 .end method
 
-.method private static mS()Z
+.method private static mQ()Z
     .locals 1
 
     :try_start_0
@@ -861,10 +861,10 @@
     return-void
 .end method
 
-.method static synthetic uK()Ljava/lang/Boolean;
+.method static synthetic uI()Ljava/lang/Boolean;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/me;->azL:Ljava/lang/Boolean;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/me;->azH: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;->amV:Lcom/google/android/gms/dynamite/DynamiteModule$b;
+    sget-object p2, Lcom/google/android/gms/dynamite/DynamiteModule;->amR:Lcom/google/android/gms/dynamite/DynamiteModule$b;
 
     goto :goto_0
 
     :cond_0
-    sget-object p2, Lcom/google/android/gms/dynamite/DynamiteModule;->amS:Lcom/google/android/gms/dynamite/DynamiteModule$b;
+    sget-object p2, Lcom/google/android/gms/dynamite/DynamiteModule;->amO: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;->azI:Ljava/util/concurrent/ExecutorService;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/me;->azE: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 qA()J
+.method public final qy()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;->azH:Lcom/google/android/gms/common/util/e;
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/me;->azD: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 64b18471f6..059175e864 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 anq:Ljava/lang/String;
+.field private final synthetic anm:Ljava/lang/String;
 
-.field private final synthetic asw:Lcom/google/android/gms/internal/measurement/me;
+.field private final synthetic ass:Lcom/google/android/gms/internal/measurement/me;
 
-.field private final synthetic azT:Landroid/os/Bundle;
+.field private final synthetic azP: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;->asw:Lcom/google/android/gms/internal/measurement/me;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/mg;->ass:Lcom/google/android/gms/internal/measurement/me;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/mg;->anq:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/mg;->anm: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;->azT:Landroid/os/Bundle;
+    iput-object p4, p0, Lcom/google/android/gms/internal/measurement/mg;->azP: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;->asw:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/mg;->ass: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;->anq:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/mg;->anm: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;->azT:Landroid/os/Bundle;
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/mg;->azP: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 8f967ba3a7..332e53a2a9 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 asA:Ljava/lang/Object;
+.field private final synthetic asw:Ljava/lang/Object;
 
-.field private final synthetic asB:Ljava/lang/Object;
+.field private final synthetic asx:Ljava/lang/Object;
 
-.field private final synthetic asC:Ljava/lang/Object;
+.field private final synthetic asy:Ljava/lang/Object;
 
-.field private final synthetic asD:Lcom/google/android/gms/internal/measurement/me;
+.field private final synthetic asz: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;->asD:Lcom/google/android/gms/internal/measurement/me;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/n;->asz: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;->asA:Ljava/lang/Object;
+    iput-object p3, p0, Lcom/google/android/gms/internal/measurement/n;->asw:Ljava/lang/Object;
 
     const/4 p2, 0x0
 
-    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;->asx:Ljava/lang/Object;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/n;->asC:Ljava/lang/Object;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/n;->asy:Ljava/lang/Object;
 
     const/4 p2, 0x0
 
@@ -54,7 +54,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/n;->asD:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/n;->asz: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;->asA:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/n;->asw: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;->asB:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/n;->asx: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;->asC:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/n;->asy: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 03ded6b724..eb857df586 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 anq:Ljava/lang/String;
+.field private final synthetic anm:Ljava/lang/String;
 
-.field private final synthetic asE:Lcom/google/android/gms/internal/measurement/it;
+.field private final synthetic asA:Lcom/google/android/gms/internal/measurement/it;
 
-.field private final synthetic asF:Lcom/google/android/gms/internal/measurement/me;
+.field private final synthetic asB: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;->asF:Lcom/google/android/gms/internal/measurement/me;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/o;->asB:Lcom/google/android/gms/internal/measurement/me;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/o;->anq:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/o;->anm:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/google/android/gms/internal/measurement/o;->asE:Lcom/google/android/gms/internal/measurement/it;
+    iput-object p3, p0, Lcom/google/android/gms/internal/measurement/o;->asA: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 pG()V
+.method protected final pE()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/o;->asE:Lcom/google/android/gms/internal/measurement/it;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/o;->asA: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;->asF:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/o;->asB: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;->anq:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/o;->anm:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/o;->asE:Lcom/google/android/gms/internal/measurement/it;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/o;->asA: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 f4e07cf4e2..30d31cc6e9 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 asG:Lcom/google/android/gms/measurement/internal/gd;
+.field private final synthetic asC:Lcom/google/android/gms/measurement/internal/gd;
 
-.field private final synthetic asu:Lcom/google/android/gms/internal/measurement/me;
+.field private final synthetic asq: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;->asu:Lcom/google/android/gms/internal/measurement/me;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/p;->asq:Lcom/google/android/gms/internal/measurement/me;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/p;->asG:Lcom/google/android/gms/measurement/internal/gd;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/p;->asC: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;->asu:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/p;->asq: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;->asG:Lcom/google/android/gms/measurement/internal/gd;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/p;->asC:Lcom/google/android/gms/measurement/internal/gd;
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/p;->asu:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/p;->asq: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;->asu:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/p;->asq: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;->asG:Lcom/google/android/gms/measurement/internal/gd;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/p;->asC: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;->asu:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/p;->asq: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;->asG:Lcom/google/android/gms/measurement/internal/gd;
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/p;->asC: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;->asu:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/p;->asq: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 4a220c6c49..3993521d0a 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 asH:Z
+.field private final synthetic asD:Z
 
-.field private final synthetic asu:Lcom/google/android/gms/internal/measurement/me;
+.field private final synthetic asq: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;->asu:Lcom/google/android/gms/internal/measurement/me;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/q;->asq:Lcom/google/android/gms/internal/measurement/me;
 
-    iput-boolean p2, p0, Lcom/google/android/gms/internal/measurement/q;->asH:Z
+    iput-boolean p2, p0, Lcom/google/android/gms/internal/measurement/q;->asD: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;->asu:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/q;->asq: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;->asH:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/internal/measurement/q;->asD: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 8e07b794b2..9795ac59e9 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 anq:Ljava/lang/String;
+.field private final synthetic anm:Ljava/lang/String;
 
-.field private final synthetic asA:Ljava/lang/Object;
+.field private final synthetic asp:Lcom/google/android/gms/internal/measurement/me;
 
-.field private final synthetic ast:Lcom/google/android/gms/internal/measurement/me;
+.field private final synthetic asw:Ljava/lang/Object;
 
 .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;->ast:Lcom/google/android/gms/internal/measurement/me;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/r;->asp:Lcom/google/android/gms/internal/measurement/me;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/r;->anq:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/r;->anm: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;->asA:Ljava/lang/Object;
+    iput-object p4, p0, Lcom/google/android/gms/internal/measurement/r;->asw:Ljava/lang/Object;
 
     const/4 p2, 0x1
 
@@ -46,17 +46,17 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/r;->ast:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/r;->asp: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;->anq:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/r;->anm: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;->asA:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/r;->asw: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;->any:J
+    iget-wide v6, p0, Lcom/google/android/gms/internal/measurement/r;->anu: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 73304df468..86d03f0f22 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 asI:Ljava/lang/ClassLoader;
+.field private static final asE:Ljava/lang/ClassLoader;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/s;->asI:Ljava/lang/ClassLoader;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/s;->asE: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;->asI:Ljava/lang/ClassLoader;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/s;->asE: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 52d93327f6..6940c9fb76 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 asJ:Ljava/lang/Long;
+.field private final synthetic asF:Ljava/lang/Long;
 
-.field private final synthetic asK:Lcom/google/android/gms/internal/measurement/me;
+.field private final synthetic asG:Lcom/google/android/gms/internal/measurement/me;
 
-.field private final synthetic ass:Landroid/os/Bundle;
+.field private final synthetic aso: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;->asK:Lcom/google/android/gms/internal/measurement/me;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/t;->asG:Lcom/google/android/gms/internal/measurement/me;
 
     const/4 p2, 0x0
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/t;->asJ:Ljava/lang/Long;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/t;->asF: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;->ass:Landroid/os/Bundle;
+    iput-object p5, p0, Lcom/google/android/gms/internal/measurement/t;->aso: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;->asJ:Ljava/lang/Long;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/t;->asF:Ljava/lang/Long;
 
     if-nez v0, :cond_0
 
-    iget-wide v0, p0, Lcom/google/android/gms/internal/measurement/t;->any:J
+    iget-wide v0, p0, Lcom/google/android/gms/internal/measurement/t;->anu: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;->asK:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/t;->asG: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;->ass:Landroid/os/Bundle;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/t;->aso: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 7f9cbdd962..48b450d2c7 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 asL:Landroid/os/Bundle;
+.field private final synthetic asH:Landroid/os/Bundle;
 
-.field private final synthetic asu:Lcom/google/android/gms/internal/measurement/me;
+.field private final synthetic asq: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;->asu:Lcom/google/android/gms/internal/measurement/me;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/u;->asq:Lcom/google/android/gms/internal/measurement/me;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/u;->asL:Landroid/os/Bundle;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/u;->asH: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;->asu:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/u;->asq: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;->asL:Landroid/os/Bundle;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/u;->asH:Landroid/os/Bundle;
 
-    iget-wide v2, p0, Lcom/google/android/gms/internal/measurement/u;->any:J
+    iget-wide v2, p0, Lcom/google/android/gms/internal/measurement/u;->anu: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 728b0927f9..6f80a2e61c 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 asM:Landroid/os/Bundle;
+.field private final synthetic asI:Landroid/os/Bundle;
 
-.field private final synthetic asN:Lcom/google/android/gms/internal/measurement/me$c;
+.field private final synthetic asJ:Lcom/google/android/gms/internal/measurement/me$c;
 
-.field private final synthetic asx:Landroid/app/Activity;
+.field private final synthetic ast: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;->asN:Lcom/google/android/gms/internal/measurement/me$c;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/v;->asJ:Lcom/google/android/gms/internal/measurement/me$c;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/v;->asx:Landroid/app/Activity;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/v;->ast:Landroid/app/Activity;
 
-    iput-object p3, p0, Lcom/google/android/gms/internal/measurement/v;->asM:Landroid/os/Bundle;
+    iput-object p3, p0, Lcom/google/android/gms/internal/measurement/v;->asI:Landroid/os/Bundle;
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/me$c;->azS:Lcom/google/android/gms/internal/measurement/me;
+    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/me$c;->azO: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;->asN:Lcom/google/android/gms/internal/measurement/me$c;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/v;->asJ:Lcom/google/android/gms/internal/measurement/me$c;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/me$c;->azS:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/me$c;->azO: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;->asx:Landroid/app/Activity;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/v;->ast: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;->asM:Landroid/os/Bundle;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/v;->asI:Landroid/os/Bundle;
 
-    iget-wide v3, p0, Lcom/google/android/gms/internal/measurement/v;->anz:J
+    iget-wide v3, p0, Lcom/google/android/gms/internal/measurement/v;->anv: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 f122cc3b0e..c9b0094b2b 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 asO:Lcom/google/android/gms/internal/measurement/me$c;
+.field private final synthetic asK:Lcom/google/android/gms/internal/measurement/me$c;
 
-.field private final synthetic asx:Landroid/app/Activity;
+.field private final synthetic ast: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;->asO:Lcom/google/android/gms/internal/measurement/me$c;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/w;->asK:Lcom/google/android/gms/internal/measurement/me$c;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/w;->asx:Landroid/app/Activity;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/w;->ast:Landroid/app/Activity;
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/me$c;->azS:Lcom/google/android/gms/internal/measurement/me;
+    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/me$c;->azO: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;->asO:Lcom/google/android/gms/internal/measurement/me$c;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/w;->asK:Lcom/google/android/gms/internal/measurement/me$c;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/me$c;->azS:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/me$c;->azO: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;->asx:Landroid/app/Activity;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/w;->ast: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;->anz:J
+    iget-wide v2, p0, Lcom/google/android/gms/internal/measurement/w;->anv: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 b164af83bf..107eea9bc3 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 asO:Lcom/google/android/gms/internal/measurement/me$c;
+.field private final synthetic asK:Lcom/google/android/gms/internal/measurement/me$c;
 
-.field private final synthetic asx:Landroid/app/Activity;
+.field private final synthetic ast: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;->asO:Lcom/google/android/gms/internal/measurement/me$c;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/x;->asK:Lcom/google/android/gms/internal/measurement/me$c;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/x;->asx:Landroid/app/Activity;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/x;->ast:Landroid/app/Activity;
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/me$c;->azS:Lcom/google/android/gms/internal/measurement/me;
+    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/me$c;->azO: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;->asO:Lcom/google/android/gms/internal/measurement/me$c;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/x;->asK:Lcom/google/android/gms/internal/measurement/me$c;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/me$c;->azS:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/me$c;->azO: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;->asx:Landroid/app/Activity;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/x;->ast: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;->anz:J
+    iget-wide v2, p0, Lcom/google/android/gms/internal/measurement/x;->anv: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 f093fe6da7..cb488f35eb 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 asO:Lcom/google/android/gms/internal/measurement/me$c;
+.field private final synthetic asK:Lcom/google/android/gms/internal/measurement/me$c;
 
-.field private final synthetic asx:Landroid/app/Activity;
+.field private final synthetic ast: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;->asO:Lcom/google/android/gms/internal/measurement/me$c;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/y;->asK:Lcom/google/android/gms/internal/measurement/me$c;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/y;->asx:Landroid/app/Activity;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/y;->ast:Landroid/app/Activity;
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/me$c;->azS:Lcom/google/android/gms/internal/measurement/me;
+    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/me$c;->azO: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;->asO:Lcom/google/android/gms/internal/measurement/me$c;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/y;->asK:Lcom/google/android/gms/internal/measurement/me$c;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/me$c;->azS:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/me$c;->azO: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;->asx:Landroid/app/Activity;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/y;->ast: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;->anz:J
+    iget-wide v2, p0, Lcom/google/android/gms/internal/measurement/y;->anv: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 d2edd2e42a..f2133a3c54 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 asO:Lcom/google/android/gms/internal/measurement/me$c;
+.field private final synthetic asK:Lcom/google/android/gms/internal/measurement/me$c;
 
-.field private final synthetic asx:Landroid/app/Activity;
+.field private final synthetic ast: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;->asO:Lcom/google/android/gms/internal/measurement/me$c;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/z;->asK:Lcom/google/android/gms/internal/measurement/me$c;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/z;->asx:Landroid/app/Activity;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/z;->ast:Landroid/app/Activity;
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/me$c;->azS:Lcom/google/android/gms/internal/measurement/me;
+    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/me$c;->azO: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;->asO:Lcom/google/android/gms/internal/measurement/me$c;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/z;->asK:Lcom/google/android/gms/internal/measurement/me$c;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/me$c;->azS:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/me$c;->azO: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;->asx:Landroid/app/Activity;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/z;->ast: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;->anz:J
+    iget-wide v2, p0, Lcom/google/android/gms/internal/measurement/z;->anv: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 910a4282b9..cad7d1070e 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 any:J
+.field public final anu:J
 
-.field public final anz:J
+.field public final anv:J
 
-.field public final asH:Z
+.field public final asD:Z
 
-.field public final azF:Landroid/os/Bundle;
+.field public final azB: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;->any:J
+    iput-wide p1, p0, Lcom/google/android/gms/internal/measurement/zzv;->anu:J
 
-    iput-wide p3, p0, Lcom/google/android/gms/internal/measurement/zzv;->anz:J
+    iput-wide p3, p0, Lcom/google/android/gms/internal/measurement/zzv;->anv:J
 
-    iput-boolean p5, p0, Lcom/google/android/gms/internal/measurement/zzv;->asH:Z
+    iput-boolean p5, p0, Lcom/google/android/gms/internal/measurement/zzv;->asD: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;->azF:Landroid/os/Bundle;
+    iput-object p9, p0, Lcom/google/android/gms/internal/measurement/zzv;->azB: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;->any:J
+    iget-wide v0, p0, Lcom/google/android/gms/internal/measurement/zzv;->anu: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;->anz:J
+    iget-wide v0, p0, Lcom/google/android/gms/internal/measurement/zzv;->anv: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;->asH:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/zzv;->asD: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;->azF:Landroid/os/Bundle;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/zzv;->azB: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 0a4f80d0fe..0c3f31e7af 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 akg:Landroid/os/IBinder;
+.field private final akc:Landroid/os/IBinder;
 
-.field private final ane:Ljava/lang/String;
+.field private final ana: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;->akg:Landroid/os/IBinder;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/a;->akc:Landroid/os/IBinder;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/nearby/a;->ane:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/internal/nearby/a;->ana: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;->akg:Landroid/os/IBinder;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/a;->akc: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;->akg:Landroid/os/IBinder;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/a;->akc: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;->akg:Landroid/os/IBinder;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/a;->akc:Landroid/os/IBinder;
 
     const/16 v2, 0x7db
 
@@ -106,14 +106,14 @@
     throw v1
 .end method
 
-.method public final nM()Landroid/os/Parcel;
+.method public final nK()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;->ane:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/a;->ana: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 920eb3bfc0..c8ba755761 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;->nM()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->nK()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 c58456ce16..7504cea7c1 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 mb()I
+.method public final lZ()I
     .locals 1
 
     const v0, 0xbdfcb8
@@ -77,7 +77,7 @@
     return v0
 .end method
 
-.method public final md()Ljava/lang/String;
+.method public final mb()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 me()Ljava/lang/String;
+.method public final mc()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 3c9ef0a6d1..eca2dd346e 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 aAA:Ljava/util/concurrent/ExecutorService;
+.field private final aAw:Ljava/util/concurrent/ExecutorService;
 
-.field private volatile aAB:Ljava/io/InputStream;
+.field private volatile aAx:Ljava/io/InputStream;
 
-.field private volatile aAC:Z
+.field private volatile aAy:Z
 
 
 # direct methods
@@ -20,15 +20,15 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/nearby/ap;->aAA:Ljava/util/concurrent/ExecutorService;
+    iput-object v0, p0, Lcom/google/android/gms/internal/nearby/ap;->aAw:Ljava/util/concurrent/ExecutorService;
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/nearby/ap;->aAB:Ljava/io/InputStream;
+    iput-object v0, p0, Lcom/google/android/gms/internal/nearby/ap;->aAx:Ljava/io/InputStream;
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/google/android/gms/internal/nearby/ap;->aAC:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/internal/nearby/ap;->aAy:Z
 
     return-void
 .end method
@@ -40,13 +40,13 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/internal/nearby/ap;->aAC:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/internal/nearby/ap;->aAy:Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/ap;->aAA:Ljava/util/concurrent/ExecutorService;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/ap;->aAw: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;->aAB:Ljava/io/InputStream;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/ap;->aAx: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 fdddec298d..414a7bf41f 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;->aAE:Landroid/os/ParcelFileDescriptor;
+    iget-object p0, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aAA: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;->aAF:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aAB: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;->akJ:J
+    iget-wide v6, p0, Lcom/google/android/gms/internal/nearby/zzfh;->akF: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;->aAE:Landroid/os/ParcelFileDescriptor;
+    iget-object p0, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aAA: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;->aAD:[B
+    iget-object v4, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aAz:[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 3c4f630716..8fddaf6bf6 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 aAn:Lcom/google/android/gms/common/api/a$g;
+.field public static final aAj: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 aAo:Lcom/google/android/gms/common/api/a$a;
+.field public static final aAk: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;->aAn:Lcom/google/android/gms/common/api/a$g;
+    sput-object v0, Lcom/google/android/gms/internal/nearby/as;->aAj: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;->aAo:Lcom/google/android/gms/common/api/a$a;
+    sput-object v0, Lcom/google/android/gms/internal/nearby/as;->aAk: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 a7b1de838c..8c6f2ba49c 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 aAP:Landroid/os/ParcelUuid;
+.field private static final aAL:Landroid/os/ParcelUuid;
 
 
 # instance fields
-.field private final aAQ:I
+.field private final aAM:I
 
-.field private final aAR:Ljava/util/List;
+.field private final aAN:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -19,7 +19,7 @@
     .end annotation
 .end field
 
-.field private final aAS:Landroid/util/SparseArray;
+.field private final aAO:Landroid/util/SparseArray;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Landroid/util/SparseArray<",
@@ -28,7 +28,7 @@
     .end annotation
 .end field
 
-.field private final aAT:Ljava/util/Map;
+.field private final aAP:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -38,11 +38,11 @@
     .end annotation
 .end field
 
-.field private final aAU:I
+.field private final aAQ:I
 
-.field private final aAV:Ljava/lang/String;
+.field private final aAR:Ljava/lang/String;
 
-.field private final aAW:[B
+.field private final aAS:[B
 
 
 # direct methods
@@ -55,7 +55,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/nearby/au;->aAP:Landroid/os/ParcelUuid;
+    sput-object v0, Lcom/google/android/gms/internal/nearby/au;->aAL: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;->aAR:Ljava/util/List;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/au;->aAN:Ljava/util/List;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/nearby/au;->aAS:Landroid/util/SparseArray;
+    iput-object p2, p0, Lcom/google/android/gms/internal/nearby/au;->aAO:Landroid/util/SparseArray;
 
-    iput-object p3, p0, Lcom/google/android/gms/internal/nearby/au;->aAT:Ljava/util/Map;
+    iput-object p3, p0, Lcom/google/android/gms/internal/nearby/au;->aAP:Ljava/util/Map;
 
-    iput-object p6, p0, Lcom/google/android/gms/internal/nearby/au;->aAV:Ljava/lang/String;
+    iput-object p6, p0, Lcom/google/android/gms/internal/nearby/au;->aAR:Ljava/lang/String;
 
-    iput p4, p0, Lcom/google/android/gms/internal/nearby/au;->aAQ:I
+    iput p4, p0, Lcom/google/android/gms/internal/nearby/au;->aAM:I
 
-    iput p5, p0, Lcom/google/android/gms/internal/nearby/au;->aAU:I
+    iput p5, p0, Lcom/google/android/gms/internal/nearby/au;->aAQ:I
 
-    iput-object p7, p0, Lcom/google/android/gms/internal/nearby/au;->aAW:[B
+    iput-object p7, p0, Lcom/google/android/gms/internal/nearby/au;->aAS:[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;->aAP:Landroid/os/ParcelUuid;
+    sget-object p0, Lcom/google/android/gms/internal/nearby/au;->aAL: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;->aAP:Landroid/os/ParcelUuid;
+    sget-object p0, Lcom/google/android/gms/internal/nearby/au;->aAL: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;->aAW:[B
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/au;->aAS:[B
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/nearby/au;->aAW:[B
+    iget-object p1, p1, Lcom/google/android/gms/internal/nearby/au;->aAS:[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;->aAW:[B
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/au;->aAS:[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;->aAQ:I
+    iget v0, p0, Lcom/google/android/gms/internal/nearby/au;->aAM:I
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/au;->aAR:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/au;->aAN: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;->aAS:Landroid/util/SparseArray;
+    iget-object v2, p0, Lcom/google/android/gms/internal/nearby/au;->aAO: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;->aAT:Ljava/util/Map;
+    iget-object v3, p0, Lcom/google/android/gms/internal/nearby/au;->aAP: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;->aAU:I
+    iget v3, p0, Lcom/google/android/gms/internal/nearby/au;->aAQ:I
 
-    iget-object v4, p0, Lcom/google/android/gms/internal/nearby/au;->aAV:Ljava/lang/String;
+    iget-object v4, p0, Lcom/google/android/gms/internal/nearby/au;->aAR: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 ad14069ccc..0105f5168a 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 aBe:Lcom/google/android/gms/common/api/internal/h;
+.field private final aBa: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;->aBe:Lcom/google/android/gms/common/api/internal/h;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/ax;->aBa: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;->aKp:Lcom/google/android/gms/nearby/messages/Message;
+    iget-object v1, v0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKl: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;->aKp:Lcom/google/android/gms/nearby/messages/Message;
+    iget-object v1, v0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKl: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;->aKp:Lcom/google/android/gms/nearby/messages/Message;
+    iget-object v1, v0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKl:Lcom/google/android/gms/nearby/messages/Message;
 
-    iget-object v2, v0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKq:Lcom/google/android/gms/nearby/messages/internal/zze;
+    iget-object v2, v0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKm: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;->aKp:Lcom/google/android/gms/nearby/messages/Message;
+    iget-object v1, v0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKl:Lcom/google/android/gms/nearby/messages/Message;
 
-    iget-object v2, v0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKr:Lcom/google/android/gms/nearby/messages/internal/zza;
+    iget-object v2, v0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKn: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;->aBe:Lcom/google/android/gms/common/api/internal/h;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/ax;->aBa: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 a003656678..17deef0421 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 aBf:Ljava/util/List;
+.field private final synthetic aBb: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;->aBf:Ljava/util/List;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/ay;->aBb: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;->aBf:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/ay;->aBb: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 549265a058..85f917a1bf 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 aBe:Lcom/google/android/gms/common/api/internal/h;
+.field private final aBa: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 aBg:Z
+.field private aBc:Z
 
 
 # direct methods
@@ -34,9 +34,9 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/google/android/gms/internal/nearby/az;->aBg:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/internal/nearby/az;->aBc:Z
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/az;->aBe:Lcom/google/android/gms/common/api/internal/h;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/az;->aBa: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;->aBg:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/nearby/az;->aBc:Z
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/az;->aBe:Lcom/google/android/gms/common/api/internal/h;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/az;->aBa: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;->aBg:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/internal/nearby/az;->aBc: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 def630cda6..f6f87099c8 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 azU:Lcom/google/android/gms/internal/nearby/zzeh;
+.field private final synthetic azQ: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;->azU:Lcom/google/android/gms/internal/nearby/zzeh;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/b;->azQ: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;->azU:Lcom/google/android/gms/internal/nearby/zzeh;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/b;->azQ:Lcom/google/android/gms/internal/nearby/zzeh;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/nearby/zzeh;->aAr:Ljava/lang/String;
+    iget-object v0, v0, Lcom/google/android/gms/internal/nearby/zzeh;->aAn:Ljava/lang/String;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/b;->azU:Lcom/google/android/gms/internal/nearby/zzeh;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/b;->azQ: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;->azU:Lcom/google/android/gms/internal/nearby/zzeh;
+    iget-object v2, p0, Lcom/google/android/gms/internal/nearby/b;->azQ:Lcom/google/android/gms/internal/nearby/zzeh;
 
-    iget-boolean v2, v2, Lcom/google/android/gms/internal/nearby/zzeh;->aAs:Z
+    iget-boolean v2, v2, Lcom/google/android/gms/internal/nearby/zzeh;->aAo: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 2044037bf2..1dfed406c1 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 azW:Lcom/google/android/gms/common/api/Status;
+.field private final synthetic azS: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;->azW:Lcom/google/android/gms/common/api/Status;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/ba;->azS: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;->azW:Lcom/google/android/gms/common/api/Status;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/ba;->azS:Lcom/google/android/gms/common/api/Status;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/api/Status;->lQ()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/common/api/Status;->lO()Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/ba;->azW:Lcom/google/android/gms/common/api/Status;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/ba;->azS: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;->azW:Lcom/google/android/gms/common/api/Status;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/ba;->azS: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 3def164c30..c23956f29a 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 aBe:Lcom/google/android/gms/common/api/internal/h;
+.field private final aBa: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;->aBe:Lcom/google/android/gms/common/api/internal/h;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/bd;->aBa: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;->aBe:Lcom/google/android/gms/common/api/internal/h;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/bd;->aBa: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 97ec0ec311..359eccfae8 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 aBh:Z
+.field private final synthetic aBd:Z
 
 
 # direct methods
 .method constructor <init>(Z)V
     .locals 0
 
-    iput-boolean p1, p0, Lcom/google/android/gms/internal/nearby/be;->aBh:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/internal/nearby/be;->aBd: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;->aBh:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/nearby/be;->aBd: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 49d9724f9b..3136718f83 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 aBi:Landroid/net/Uri;
+.field private static final aBe:Landroid/net/Uri;
 
-.field private static final aBj:Landroid/net/Uri;
+.field private static final aBf:Landroid/net/Uri;
 
-.field private static final aBk:Ljava/util/regex/Pattern;
+.field private static final aBg:Ljava/util/regex/Pattern;
 
-.field private static final aBl:Ljava/util/regex/Pattern;
+.field private static final aBh:Ljava/util/regex/Pattern;
 
-.field private static final aBm:Ljava/util/concurrent/atomic/AtomicBoolean;
+.field private static final aBi:Ljava/util/concurrent/atomic/AtomicBoolean;
 
-.field private static aBn:Ljava/util/HashMap;
+.field private static aBj:Ljava/util/HashMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/HashMap<",
@@ -24,7 +24,7 @@
     .end annotation
 .end field
 
-.field private static final aBo:Ljava/util/HashMap;
+.field private static final aBk:Ljava/util/HashMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/HashMap<",
@@ -35,7 +35,7 @@
     .end annotation
 .end field
 
-.field private static final aBp:Ljava/util/HashMap;
+.field private static final aBl:Ljava/util/HashMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/HashMap<",
@@ -46,7 +46,7 @@
     .end annotation
 .end field
 
-.field private static final aBq:Ljava/util/HashMap;
+.field private static final aBm:Ljava/util/HashMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/HashMap<",
@@ -57,7 +57,7 @@
     .end annotation
 .end field
 
-.field private static final aBr:Ljava/util/HashMap;
+.field private static final aBn:Ljava/util/HashMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/HashMap<",
@@ -68,11 +68,11 @@
     .end annotation
 .end field
 
-.field private static aBs:Ljava/lang/Object;
+.field private static aBo:Ljava/lang/Object;
 
-.field private static aBt:Z
+.field private static aBp:Z
 
-.field private static aBu:[Ljava/lang/String;
+.field private static aBq:[Ljava/lang/String;
 
 
 # direct methods
@@ -85,7 +85,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/nearby/bg;->aBi:Landroid/net/Uri;
+    sput-object v0, Lcom/google/android/gms/internal/nearby/bg;->aBe: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;->aBj:Landroid/net/Uri;
+    sput-object v0, Lcom/google/android/gms/internal/nearby/bg;->aBf: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;->aBk:Ljava/util/regex/Pattern;
+    sput-object v1, Lcom/google/android/gms/internal/nearby/bg;->aBg: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;->aBl:Ljava/util/regex/Pattern;
+    sput-object v0, Lcom/google/android/gms/internal/nearby/bg;->aBh: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;->aBm:Ljava/util/concurrent/atomic/AtomicBoolean;
+    sput-object v0, Lcom/google/android/gms/internal/nearby/bg;->aBi: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;->aBo:Ljava/util/HashMap;
+    sput-object v0, Lcom/google/android/gms/internal/nearby/bg;->aBk: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;->aBp:Ljava/util/HashMap;
+    sput-object v0, Lcom/google/android/gms/internal/nearby/bg;->aBl: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;->aBq:Ljava/util/HashMap;
+    sput-object v0, Lcom/google/android/gms/internal/nearby/bg;->aBm: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;->aBr:Ljava/util/HashMap;
+    sput-object v0, Lcom/google/android/gms/internal/nearby/bg;->aBn:Ljava/util/HashMap;
 
     const/4 v0, 0x0
 
     new-array v0, v0, [Ljava/lang/String;
 
-    sput-object v0, Lcom/google/android/gms/internal/nearby/bg;->aBu:[Ljava/lang/String;
+    sput-object v0, Lcom/google/android/gms/internal/nearby/bg;->aBq:[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;->aBs:Ljava/lang/Object;
+    sget-object v1, Lcom/google/android/gms/internal/nearby/bg;->aBo:Ljava/lang/Object;
 
-    sget-object v2, Lcom/google/android/gms/internal/nearby/bg;->aBn:Ljava/util/HashMap;
+    sget-object v2, Lcom/google/android/gms/internal/nearby/bg;->aBj: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;->aBn:Ljava/util/HashMap;
+    sget-object p0, Lcom/google/android/gms/internal/nearby/bg;->aBj: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;->aBu:[Ljava/lang/String;
+    sget-object v2, Lcom/google/android/gms/internal/nearby/bg;->aBq:[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;->aBt:Z
+    sget-boolean v1, Lcom/google/android/gms/internal/nearby/bg;->aBp:Z
 
     if-eqz v1, :cond_2
 
-    sget-object v1, Lcom/google/android/gms/internal/nearby/bg;->aBn:Ljava/util/HashMap;
+    sget-object v1, Lcom/google/android/gms/internal/nearby/bg;->aBj: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;->aBu:[Ljava/lang/String;
+    sget-object v1, Lcom/google/android/gms/internal/nearby/bg;->aBq:[Ljava/lang/String;
 
-    sget-object v2, Lcom/google/android/gms/internal/nearby/bg;->aBn:Ljava/util/HashMap;
+    sget-object v2, Lcom/google/android/gms/internal/nearby/bg;->aBj: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;->aBt:Z
+    sput-boolean v7, Lcom/google/android/gms/internal/nearby/bg;->aBp:Z
 
-    sget-object p0, Lcom/google/android/gms/internal/nearby/bg;->aBn:Ljava/util/HashMap;
+    sget-object p0, Lcom/google/android/gms/internal/nearby/bg;->aBj: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;->aBn:Ljava/util/HashMap;
+    sget-object p0, Lcom/google/android/gms/internal/nearby/bg;->aBj: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;->aBi:Landroid/net/Uri;
+    sget-object v9, Lcom/google/android/gms/internal/nearby/bg;->aBe:Landroid/net/Uri;
 
     const/4 v10, 0x0
 
@@ -472,7 +472,7 @@
         }
     .end annotation
 
-    sget-object v1, Lcom/google/android/gms/internal/nearby/bg;->aBj:Landroid/net/Uri;
+    sget-object v1, Lcom/google/android/gms/internal/nearby/bg;->aBf: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;->aBs:Ljava/lang/Object;
+    sget-object v1, Lcom/google/android/gms/internal/nearby/bg;->aBo:Ljava/lang/Object;
 
     if-ne p0, v1, :cond_0
 
-    sget-object p0, Lcom/google/android/gms/internal/nearby/bg;->aBn:Ljava/util/HashMap;
+    sget-object p0, Lcom/google/android/gms/internal/nearby/bg;->aBj: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;->aBo:Ljava/util/HashMap;
+    sget-object v1, Lcom/google/android/gms/internal/nearby/bg;->aBk: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;->aBk:Ljava/util/regex/Pattern;
+    sget-object v3, Lcom/google/android/gms/internal/nearby/bg;->aBg: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;->aBl:Ljava/util/regex/Pattern;
+    sget-object v3, Lcom/google/android/gms/internal/nearby/bg;->aBh: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;->aBo:Ljava/util/HashMap;
+    sget-object p0, Lcom/google/android/gms/internal/nearby/bg;->aBk: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;->aBs:Ljava/lang/Object;
+    sget-object v4, Lcom/google/android/gms/internal/nearby/bg;->aBo: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;->aBn:Ljava/util/HashMap;
+    sget-object p0, Lcom/google/android/gms/internal/nearby/bg;->aBj: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;->aBn:Ljava/util/HashMap;
+    sget-object v0, Lcom/google/android/gms/internal/nearby/bg;->aBj:Ljava/util/HashMap;
 
     const/4 v1, 0x0
 
     if-nez v0, :cond_0
 
-    sget-object v0, Lcom/google/android/gms/internal/nearby/bg;->aBm:Ljava/util/concurrent/atomic/AtomicBoolean;
+    sget-object v0, Lcom/google/android/gms/internal/nearby/bg;->aBi: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;->aBn:Ljava/util/HashMap;
+    sput-object v0, Lcom/google/android/gms/internal/nearby/bg;->aBj: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;->aBs:Ljava/lang/Object;
+    sput-object v0, Lcom/google/android/gms/internal/nearby/bg;->aBo:Ljava/lang/Object;
 
-    sput-boolean v1, Lcom/google/android/gms/internal/nearby/bg;->aBt:Z
+    sput-boolean v1, Lcom/google/android/gms/internal/nearby/bg;->aBp:Z
 
-    sget-object v0, Lcom/google/android/gms/internal/nearby/bg;->aBi:Landroid/net/Uri;
+    sget-object v0, Lcom/google/android/gms/internal/nearby/bg;->aBe: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;->aBm:Ljava/util/concurrent/atomic/AtomicBoolean;
+    sget-object p0, Lcom/google/android/gms/internal/nearby/bg;->aBi:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     invoke-virtual {p0, v1}, Ljava/util/concurrent/atomic/AtomicBoolean;->getAndSet(Z)Z
 
@@ -762,33 +762,33 @@
 
     if-eqz p0, :cond_1
 
+    sget-object p0, Lcom/google/android/gms/internal/nearby/bg;->aBj:Ljava/util/HashMap;
+
+    invoke-virtual {p0}, Ljava/util/HashMap;->clear()V
+
+    sget-object p0, Lcom/google/android/gms/internal/nearby/bg;->aBk:Ljava/util/HashMap;
+
+    invoke-virtual {p0}, Ljava/util/HashMap;->clear()V
+
+    sget-object p0, Lcom/google/android/gms/internal/nearby/bg;->aBl:Ljava/util/HashMap;
+
+    invoke-virtual {p0}, Ljava/util/HashMap;->clear()V
+
+    sget-object p0, Lcom/google/android/gms/internal/nearby/bg;->aBm:Ljava/util/HashMap;
+
+    invoke-virtual {p0}, Ljava/util/HashMap;->clear()V
+
     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;->aBo:Ljava/util/HashMap;
-
-    invoke-virtual {p0}, Ljava/util/HashMap;->clear()V
-
-    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;->aBq:Ljava/util/HashMap;
-
-    invoke-virtual {p0}, Ljava/util/HashMap;->clear()V
-
-    sget-object p0, Lcom/google/android/gms/internal/nearby/bg;->aBr:Ljava/util/HashMap;
-
-    invoke-virtual {p0}, Ljava/util/HashMap;->clear()V
-
     new-instance p0, Ljava/lang/Object;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    sput-object p0, Lcom/google/android/gms/internal/nearby/bg;->aBs:Ljava/lang/Object;
+    sput-object p0, Lcom/google/android/gms/internal/nearby/bg;->aBo:Ljava/lang/Object;
 
-    sput-boolean v1, Lcom/google/android/gms/internal/nearby/bg;->aBt:Z
+    sput-boolean v1, Lcom/google/android/gms/internal/nearby/bg;->aBp: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;->aBs:Ljava/lang/Object;
+    sget-object p0, Lcom/google/android/gms/internal/nearby/bg;->aBo:Ljava/lang/Object;
 
     monitor-exit v0
 
@@ -820,10 +820,10 @@
     throw p0
 .end method
 
-.method static synthetic uL()Ljava/util/concurrent/atomic/AtomicBoolean;
+.method static synthetic uJ()Ljava/util/concurrent/atomic/AtomicBoolean;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/nearby/bg;->aBm:Ljava/util/concurrent/atomic/AtomicBoolean;
+    sget-object v0, Lcom/google/android/gms/internal/nearby/bg;->aBi: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 28e1fb0723..39d9312bf5 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;->uL()Ljava/util/concurrent/atomic/AtomicBoolean;
+    invoke-static {}, Lcom/google/android/gms/internal/nearby/bg;->uJ()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 4f1db04ec0..773609c3f5 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 aBv:Lcom/google/android/gms/internal/nearby/zzu;
+.field final aBr: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;->aBv:Lcom/google/android/gms/internal/nearby/zzu;
+    iput-object v0, p0, Lcom/google/android/gms/internal/nearby/bk;->aBr: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 f9d3ff4ec7..c122c76662 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,11 +13,9 @@
 
 
 # instance fields
-.field private aBA:Lcom/google/android/gms/internal/nearby/ap;
+.field private final aBs:J
 
-.field private final aBw:J
-
-.field private final aBx:Ljava/util/Set;
+.field private final aBt:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -27,7 +25,7 @@
     .end annotation
 .end field
 
-.field private final aBy:Ljava/util/Set;
+.field private final aBu:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -37,7 +35,7 @@
     .end annotation
 .end field
 
-.field private final aBz:Ljava/util/Set;
+.field private final aBv:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -47,6 +45,8 @@
     .end annotation
 .end field
 
+.field private aBw: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;->aBx:Ljava/util/Set;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/bm;->aBt: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;->aBy:Ljava/util/Set;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/bm;->aBu: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;->aBz:Ljava/util/Set;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/bm;->aBv: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;->aBw:J
+    iput-wide p1, p0, Lcom/google/android/gms/internal/nearby/bm;->aBs: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;->aBx:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/bm;->aBt: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;->aBy:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/bm;->aBu: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;->aBz:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/bm;->aBv: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;->aBx:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/bm;->aBt:Ljava/util/Set;
 
     invoke-interface {v0}, Ljava/util/Set;->clear()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/bm;->aBy:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/bm;->aBu:Ljava/util/Set;
 
     invoke-interface {v0}, Ljava/util/Set;->clear()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/bm;->aBz:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/bm;->aBv:Ljava/util/Set;
 
     invoke-interface {v0}, Ljava/util/Set;->clear()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/bm;->aBA:Lcom/google/android/gms/internal/nearby/ap;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/bm;->aBw: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;->aBA:Lcom/google/android/gms/internal/nearby/ap;
+    iput-object v0, p0, Lcom/google/android/gms/internal/nearby/bm;->aBw: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;->aBA:Lcom/google/android/gms/internal/nearby/ap;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/bm;->aBw: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;->mU()Landroid/os/IInterface;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/bm;->mS()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;->aBv:Lcom/google/android/gms/internal/nearby/zzu;
+    iget-object v1, v1, Lcom/google/android/gms/internal/nearby/bk;->aBr: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 lZ()Z
+.method public final lX()Z
     .locals 1
 
     invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/bm;->getContext()Landroid/content/Context;
@@ -496,14 +496,22 @@
     return v0
 .end method
 
-.method public final mT()Landroid/os/Bundle;
+.method public final lZ()I
+    .locals 1
+
+    const v0, 0xbdfcb8
+
+    return v0
+.end method
+
+.method public final mR()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;->aBw:J
+    iget-wide v1, p0, Lcom/google/android/gms/internal/nearby/bm;->aBs:J
 
     const-string v3, "clientId"
 
@@ -512,15 +520,7 @@
     return-object v0
 .end method
 
-.method public final mb()I
-    .locals 1
-
-    const v0, 0xbdfcb8
-
-    return v0
-.end method
-
-.method public final md()Ljava/lang/String;
+.method public final mb()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 me()Ljava/lang/String;
+.method public final mc()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 d9f81c3b1d..bb4e68c54a 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/nearby/bn.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/nearby/bn.smali
@@ -3,7 +3,27 @@
 
 
 # instance fields
-.field private final aAa:Lcom/google/android/gms/common/api/internal/h;
+.field private final aBx:Ljava/util/Set;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/Set<",
+            "Ljava/lang/String;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private final aBy:Ljava/util/Set;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/Set<",
+            "Ljava/lang/String;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private final azW:Lcom/google/android/gms/common/api/internal/h;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/internal/h<",
@@ -13,32 +33,12 @@
     .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;->aAa:Lcom/google/android/gms/common/api/internal/h;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/bn;->azW: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;->aBB:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/bn;->aBx:Ljava/util/Set;
 
-    iget-object v1, p1, Lcom/google/android/gms/internal/nearby/zzeh;->aAp:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/internal/nearby/zzeh;->aAl: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;->aAa:Lcom/google/android/gms/common/api/internal/h;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/bn;->azW: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;->aBB:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/bn;->aBx:Ljava/util/Set;
 
-    iget-object v1, p1, Lcom/google/android/gms/internal/nearby/zzen;->aAp:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/internal/nearby/zzen;->aAl: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;->ajs:I
+    iget v0, p1, Lcom/google/android/gms/internal/nearby/zzen;->ajo: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;->lQ()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/common/api/Status;->lO()Z
 
     move-result v1
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/bn;->aBC:Ljava/util/Set;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/bn;->aBy:Ljava/util/Set;
 
-    iget-object v2, p1, Lcom/google/android/gms/internal/nearby/zzen;->aAp:Ljava/lang/String;
+    iget-object v2, p1, Lcom/google/android/gms/internal/nearby/zzen;->aAl: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;->aAa:Lcom/google/android/gms/common/api/internal/h;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/bn;->azW: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;->aBC:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/bn;->aBy:Ljava/util/Set;
 
-    iget-object v1, p1, Lcom/google/android/gms/internal/nearby/zzep;->aAp:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/internal/nearby/zzep;->aAl: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;->aAa:Lcom/google/android/gms/common/api/internal/h;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/bn;->azW: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;->aBB:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/bn;->aBx: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;->aAa:Lcom/google/android/gms/common/api/internal/h;
+    iget-object v2, p0, Lcom/google/android/gms/internal/nearby/bn;->azW: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;->aBB:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/bn;->aBx:Ljava/util/Set;
 
     invoke-interface {v0}, Ljava/util/Set;->clear()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/bn;->aBC:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/bn;->aBy: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;->aAa:Lcom/google/android/gms/common/api/internal/h;
+    iget-object v2, p0, Lcom/google/android/gms/internal/nearby/bn;->azW: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;->aBC:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/bn;->aBy: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 b44624cdd9..0cdf98e1d2 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 azV:Lcom/google/android/gms/internal/nearby/zzen;
+.field private final synthetic azR:Lcom/google/android/gms/internal/nearby/zzen;
 
-.field private final synthetic azW:Lcom/google/android/gms/common/api/Status;
+.field private final synthetic azS: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;->azV:Lcom/google/android/gms/internal/nearby/zzen;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/c;->azR:Lcom/google/android/gms/internal/nearby/zzen;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/nearby/c;->azW:Lcom/google/android/gms/common/api/Status;
+    iput-object p2, p0, Lcom/google/android/gms/internal/nearby/c;->azS: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;->azW:Lcom/google/android/gms/common/api/Status;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/c;->azS: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 e19f385ee4..aee98b5e03 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 azX:Lcom/google/android/gms/internal/nearby/zzep;
+.field private final synthetic azT: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;->azX:Lcom/google/android/gms/internal/nearby/zzep;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/d;->azT: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 87eed4af9a..d0bb796b76 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 azY:Lcom/google/android/gms/internal/nearby/zzef;
+.field private final synthetic azU: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;->azY:Lcom/google/android/gms/internal/nearby/zzef;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/e;->azU: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;->azY:Lcom/google/android/gms/internal/nearby/zzef;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/e;->azU:Lcom/google/android/gms/internal/nearby/zzef;
 
-    iget v0, v0, Lcom/google/android/gms/internal/nearby/zzef;->aAq:I
+    iget v0, v0, Lcom/google/android/gms/internal/nearby/zzef;->aAm: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 9951fd38e9..fb06ee6250 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 azZ:Ljava/lang/String;
+.field private final synthetic azV: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;->azZ:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/f;->azV: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 5beaf83094..95fb03a9f0 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 azZ:Ljava/lang/String;
+.field private final synthetic azV: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;->azZ:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/g;->azV: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 76058212f1..58dbf3fb0f 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 aAa:Lcom/google/android/gms/common/api/internal/h;
+.field private final azW: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 aAb:Ljava/util/Set;
+.field private final azX: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;->aAb:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/h;->azX:Ljava/util/Set;
 
-    iget-object v1, p1, Lcom/google/android/gms/internal/nearby/zzer;->aAk:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/internal/nearby/zzer;->aAg: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;->aAa:Lcom/google/android/gms/common/api/internal/h;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/h;->azW: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;->aAb:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/h;->azX:Ljava/util/Set;
 
-    iget-object v1, p1, Lcom/google/android/gms/internal/nearby/zzet;->aAk:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/internal/nearby/zzet;->aAg: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;->aAa:Lcom/google/android/gms/common/api/internal/h;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/h;->azW: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;->aAb:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/h;->azX: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;->aAa:Lcom/google/android/gms/common/api/internal/h;
+    iget-object v2, p0, Lcom/google/android/gms/internal/nearby/h;->azW: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;->aAb:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/h;->azX: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 72836024f2..7f68daea64 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 aAc:Lcom/google/android/gms/internal/nearby/zzer;
+.field private final synthetic azY: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;->aAc:Lcom/google/android/gms/internal/nearby/zzer;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/i;->azY: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;->aAc:Lcom/google/android/gms/internal/nearby/zzer;
+    iget-object p1, p0, Lcom/google/android/gms/internal/nearby/i;->azY:Lcom/google/android/gms/internal/nearby/zzer;
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/nearby/zzer;->aAk:Ljava/lang/String;
+    iget-object p1, p1, Lcom/google/android/gms/internal/nearby/zzer;->aAg: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;->aAc:Lcom/google/android/gms/internal/nearby/zzer;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/i;->azY:Lcom/google/android/gms/internal/nearby/zzer;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/nearby/zzer;->aAu:Ljava/lang/String;
+    iget-object v0, v0, Lcom/google/android/gms/internal/nearby/zzer;->aAq:Ljava/lang/String;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/i;->aAc:Lcom/google/android/gms/internal/nearby/zzer;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/i;->azY:Lcom/google/android/gms/internal/nearby/zzer;
 
-    iget-object v1, v1, Lcom/google/android/gms/internal/nearby/zzer;->aAv:Landroid/bluetooth/BluetoothDevice;
+    iget-object v1, v1, Lcom/google/android/gms/internal/nearby/zzer;->aAr: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;->aAc:Lcom/google/android/gms/internal/nearby/zzer;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/i;->azY:Lcom/google/android/gms/internal/nearby/zzer;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/nearby/zzer;->aAu:Ljava/lang/String;
+    iget-object v0, v0, Lcom/google/android/gms/internal/nearby/zzer;->aAq:Ljava/lang/String;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/i;->aAc:Lcom/google/android/gms/internal/nearby/zzer;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/i;->azY: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 bae1306976..ca6d7d2ac2 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 aAd:Lcom/google/android/gms/internal/nearby/zzet;
+.field private final synthetic azZ: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;->aAd:Lcom/google/android/gms/internal/nearby/zzet;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/j;->azZ: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 2953c88a1c..9440562e0d 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 azZ:Ljava/lang/String;
+.field private final synthetic azV: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;->azZ:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/k;->azV: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 0a2901c99c..69408224eb 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 aAe: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 aAf:Ljava/util/Map;
+.field private final aAb: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;->aAw:Lcom/google/android/gms/internal/nearby/zzfh;
+    iget-object v0, p1, Lcom/google/android/gms/internal/nearby/zzev;->aAs: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;->aAw:Lcom/google/android/gms/internal/nearby/zzfh;
+    iget-object p1, p1, Lcom/google/android/gms/internal/nearby/zzev;->aAs: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;->aAf:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/m;->aAb:Ljava/util/Map;
 
     new-instance v2, Lcom/google/android/gms/internal/nearby/q;
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzev;->aAp:Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzev;->aAl:Ljava/lang/String;
 
-    iget-object v4, p1, Lcom/google/android/gms/internal/nearby/zzev;->aAw:Lcom/google/android/gms/internal/nearby/zzfh;
+    iget-object v4, p1, Lcom/google/android/gms/internal/nearby/zzev;->aAs: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;->aAw:Lcom/google/android/gms/internal/nearby/zzfh;
+    iget-object v4, p1, Lcom/google/android/gms/internal/nearby/zzev;->aAs: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;->aJr:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
+    iget-object v6, v3, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate$a;->aJn: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;->aJr:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
+    iget-object v3, v3, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate$a;->aJn: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;->aAe:Lcom/google/android/gms/common/api/internal/h;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/m;->aAa: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;->aAy:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
+    iget-object v0, p1, Lcom/google/android/gms/internal/nearby/zzex;->aAu: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;->aAf:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/m;->aAb:Ljava/util/Map;
 
     new-instance v1, Lcom/google/android/gms/internal/nearby/q;
 
-    iget-object v2, p1, Lcom/google/android/gms/internal/nearby/zzex;->aAp:Ljava/lang/String;
+    iget-object v2, p1, Lcom/google/android/gms/internal/nearby/zzex;->aAl:Ljava/lang/String;
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzex;->aAy:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
+    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzex;->aAu:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
 
-    iget-wide v3, v3, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aAl:J
+    iget-wide v3, v3, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aAh: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;->aAy:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
+    iget-object v2, p1, Lcom/google/android/gms/internal/nearby/zzex;->aAu: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;->aAf:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/m;->aAb:Ljava/util/Map;
 
     new-instance v1, Lcom/google/android/gms/internal/nearby/q;
 
-    iget-object v2, p1, Lcom/google/android/gms/internal/nearby/zzex;->aAp:Ljava/lang/String;
+    iget-object v2, p1, Lcom/google/android/gms/internal/nearby/zzex;->aAl:Ljava/lang/String;
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzex;->aAy:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
+    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzex;->aAu:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
 
-    iget-wide v3, v3, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aAl:J
+    iget-wide v3, v3, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aAh: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;->aAe:Lcom/google/android/gms/common/api/internal/h;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/m;->aAa: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;->aAf:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/m;->aAb: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;->aAk:Ljava/lang/String;
+    iget-object v2, v2, Lcom/google/android/gms/internal/nearby/q;->aAg: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;->aAe:Lcom/google/android/gms/common/api/internal/h;
+    iget-object v3, p0, Lcom/google/android/gms/internal/nearby/m;->aAa: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;->aAf:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/m;->aAb: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 62b9a81556..3232df3462 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 aAg:Lcom/google/android/gms/internal/nearby/zzev;
+.field private final synthetic aAc:Lcom/google/android/gms/internal/nearby/zzev;
 
-.field private final synthetic aAh:Lcom/google/android/gms/nearby/connection/e;
+.field private final synthetic aAd: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;->aAg:Lcom/google/android/gms/internal/nearby/zzev;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/n;->aAc:Lcom/google/android/gms/internal/nearby/zzev;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/nearby/n;->aAh:Lcom/google/android/gms/nearby/connection/e;
+    iput-object p2, p0, Lcom/google/android/gms/internal/nearby/n;->aAd: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 8dd8926ebb..93e070ce22 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 aAi:Lcom/google/android/gms/internal/nearby/zzex;
+.field private final synthetic aAe: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;->aAi:Lcom/google/android/gms/internal/nearby/zzex;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/o;->aAe: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 500f835ea2..f43f7628e2 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 aAj:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
+.field private final synthetic aAf:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
 
-.field private final synthetic azZ:Ljava/lang/String;
+.field private final synthetic azV: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;->azZ:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/p;->azV:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/nearby/p;->aAj:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
+    iput-object p2, p0, Lcom/google/android/gms/internal/nearby/p;->aAf: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;->aAj:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/p;->aAf: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;->aJr:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
+    iget-object p1, p1, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate$a;->aJn: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 f9b72db3d2..4106b87174 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 aAk:Ljava/lang/String;
+.field final aAg:Ljava/lang/String;
 
-.field private final aAl:J
+.field private final aAh: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;->aAk:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/q;->aAg:Ljava/lang/String;
 
-    iput-wide p2, p0, Lcom/google/android/gms/internal/nearby/q;->aAl:J
+    iput-wide p2, p0, Lcom/google/android/gms/internal/nearby/q;->aAh: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;->aAk:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/q;->aAg:Ljava/lang/String;
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/q;->aAk:Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/q;->aAg: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;->aAl:J
+    iget-wide v3, p0, Lcom/google/android/gms/internal/nearby/q;->aAh: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;->aAl:J
+    iget-wide v3, p1, Lcom/google/android/gms/internal/nearby/q;->aAh: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;->aAk:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/q;->aAg:Ljava/lang/String;
 
     const/4 v2, 0x0
 
     aput-object v1, v0, v2
 
-    iget-wide v1, p0, Lcom/google/android/gms/internal/nearby/q;->aAl:J
+    iget-wide v1, p0, Lcom/google/android/gms/internal/nearby/q;->aAh: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 15b6d427cb..4decdad831 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 aAm:Lcom/google/android/gms/internal/nearby/v;
+.field private static aAi: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 7d60437759..a1987379dc 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 ang:Ljava/lang/ClassLoader;
+.field private static final anc:Ljava/lang/ClassLoader;
 
 
 # direct methods
@@ -16,7 +16,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/nearby/s;->ang:Ljava/lang/ClassLoader;
+    sput-object v0, Lcom/google/android/gms/internal/nearby/s;->anc: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 256d3703f6..f714522330 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 aAn:Lcom/google/android/gms/common/api/a$g;
+.field public static final aAj: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 aAo:Lcom/google/android/gms/common/api/a$a;
+.field public static final aAk: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;->aAn:Lcom/google/android/gms/common/api/a$g;
+    sput-object v0, Lcom/google/android/gms/internal/nearby/t;->aAj: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;->aAo:Lcom/google/android/gms/common/api/a$a;
+    sput-object v0, Lcom/google/android/gms/internal/nearby/t;->aAk: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 bed55694c5..6bf39861be 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 aAp:Ljava/lang/String;
+.field aAl:Ljava/lang/String;
 
-.field aAq:I
+.field aAm: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;->aAp:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/zzef;->aAl:Ljava/lang/String;
 
-    iput p2, p0, Lcom/google/android/gms/internal/nearby/zzef;->aAq:I
+    iput p2, p0, Lcom/google/android/gms/internal/nearby/zzef;->aAm: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;->aAp:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzef;->aAl:Ljava/lang/String;
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzef;->aAp:Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzef;->aAl: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;->aAq:I
+    iget v1, p0, Lcom/google/android/gms/internal/nearby/zzef;->aAm: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;->aAq:I
+    iget p1, p1, Lcom/google/android/gms/internal/nearby/zzef;->aAm: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;->aAp:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzef;->aAl:Ljava/lang/String;
 
     const/4 v2, 0x0
 
     aput-object v1, v0, v2
 
-    iget v1, p0, Lcom/google/android/gms/internal/nearby/zzef;->aAq:I
+    iget v1, p0, Lcom/google/android/gms/internal/nearby/zzef;->aAm: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;->aAp:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/zzef;->aAl: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;->aAq:I
+    iget v0, p0, Lcom/google/android/gms/internal/nearby/zzef;->aAm: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 00a612adac..a9ee30c411 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 aAp:Ljava/lang/String;
+.field aAl:Ljava/lang/String;
 
-.field aAr:Ljava/lang/String;
+.field aAn:Ljava/lang/String;
 
-.field aAs:Z
+.field aAo:Z
 
-.field private aAt:[B
+.field private aAp:[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;->aAp:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/zzeh;->aAl:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/nearby/zzeh;->aAr:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/internal/nearby/zzeh;->aAn: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;->aAs:Z
+    iput-boolean p4, p0, Lcom/google/android/gms/internal/nearby/zzeh;->aAo:Z
 
-    iput-object p5, p0, Lcom/google/android/gms/internal/nearby/zzeh;->aAt:[B
+    iput-object p5, p0, Lcom/google/android/gms/internal/nearby/zzeh;->aAp:[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;->aAp:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzeh;->aAl:Ljava/lang/String;
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzeh;->aAp:Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzeh;->aAl: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;->aAr:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzeh;->aAn:Ljava/lang/String;
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzeh;->aAr:Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzeh;->aAn: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;->aAs:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/internal/nearby/zzeh;->aAo: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;->aAs:Z
+    iget-boolean v3, p1, Lcom/google/android/gms/internal/nearby/zzeh;->aAo: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;->aAt:[B
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzeh;->aAp:[B
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/nearby/zzeh;->aAt:[B
+    iget-object p1, p1, Lcom/google/android/gms/internal/nearby/zzeh;->aAp:[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;->aAp:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzeh;->aAl:Ljava/lang/String;
 
     const/4 v2, 0x0
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzeh;->aAr:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzeh;->aAn: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;->aAs:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/internal/nearby/zzeh;->aAo: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;->aAt:[B
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzeh;->aAp:[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;->aAp:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/zzeh;->aAl: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;->aAr:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/zzeh;->aAn: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;->aAs:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/nearby/zzeh;->aAo: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;->aAt:[B
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/zzeh;->aAp:[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 fbf395f95b..716bb72dac 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 aAp:Ljava/lang/String;
+.field aAl:Ljava/lang/String;
 
-.field private aAt:[B
+.field private aAp:[B
 
-.field ajs:I
+.field ajo: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;->aAp:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/zzen;->aAl:Ljava/lang/String;
 
-    iput p2, p0, Lcom/google/android/gms/internal/nearby/zzen;->ajs:I
+    iput p2, p0, Lcom/google/android/gms/internal/nearby/zzen;->ajo:I
 
-    iput-object p3, p0, Lcom/google/android/gms/internal/nearby/zzen;->aAt:[B
+    iput-object p3, p0, Lcom/google/android/gms/internal/nearby/zzen;->aAp:[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;->aAp:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzen;->aAl:Ljava/lang/String;
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzen;->aAp:Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzen;->aAl: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;->ajs:I
+    iget v1, p0, Lcom/google/android/gms/internal/nearby/zzen;->ajo: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;->ajs:I
+    iget v3, p1, Lcom/google/android/gms/internal/nearby/zzen;->ajo: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;->aAt:[B
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzen;->aAp:[B
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/nearby/zzen;->aAt:[B
+    iget-object p1, p1, Lcom/google/android/gms/internal/nearby/zzen;->aAp:[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;->aAp:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzen;->aAl:Ljava/lang/String;
 
     const/4 v2, 0x0
 
     aput-object v1, v0, v2
 
-    iget v1, p0, Lcom/google/android/gms/internal/nearby/zzen;->ajs:I
+    iget v1, p0, Lcom/google/android/gms/internal/nearby/zzen;->ajo: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;->aAt:[B
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzen;->aAp:[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;->aAp:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/zzen;->aAl: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;->ajs:I
+    iget v0, p0, Lcom/google/android/gms/internal/nearby/zzen;->ajo: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;->aAt:[B
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/zzen;->aAp:[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 daafa1d66f..337b3769bc 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 aAp:Ljava/lang/String;
+.field aAl: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;->aAp:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/zzep;->aAl: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;->aAp:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/zzep;->aAl:Ljava/lang/String;
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/nearby/zzep;->aAp:Ljava/lang/String;
+    iget-object p1, p1, Lcom/google/android/gms/internal/nearby/zzep;->aAl: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;->aAp:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzep;->aAl: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;->aAp:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/zzep;->aAl: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 b259d23132..3be9799306 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 aAk:Ljava/lang/String;
+.field aAg:Ljava/lang/String;
 
-.field aAu:Ljava/lang/String;
+.field aAq:Ljava/lang/String;
 
-.field aAv:Landroid/bluetooth/BluetoothDevice;
+.field aAr: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;->aAk:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/zzer;->aAg:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/nearby/zzer;->aAu:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/internal/nearby/zzer;->aAq: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;->aAv:Landroid/bluetooth/BluetoothDevice;
+    iput-object p4, p0, Lcom/google/android/gms/internal/nearby/zzer;->aAr: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;->aAk:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzer;->aAg:Ljava/lang/String;
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzer;->aAk:Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzer;->aAg: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;->aAu:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzer;->aAq:Ljava/lang/String;
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzer;->aAu:Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzer;->aAq: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;->aAv:Landroid/bluetooth/BluetoothDevice;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzer;->aAr:Landroid/bluetooth/BluetoothDevice;
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/nearby/zzer;->aAv:Landroid/bluetooth/BluetoothDevice;
+    iget-object p1, p1, Lcom/google/android/gms/internal/nearby/zzer;->aAr: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;->aAk:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzer;->aAg:Ljava/lang/String;
 
     const/4 v2, 0x0
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzer;->aAu:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzer;->aAq: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;->aAv:Landroid/bluetooth/BluetoothDevice;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzer;->aAr: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;->aAk:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzer;->aAg: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;->aAu:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzer;->aAq: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;->aAv:Landroid/bluetooth/BluetoothDevice;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzer;->aAr: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 011ca8e06b..b2a2336d8a 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 aAk:Ljava/lang/String;
+.field aAg: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;->aAk:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/zzet;->aAg: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;->aAk:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/zzet;->aAg:Ljava/lang/String;
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/nearby/zzet;->aAk:Ljava/lang/String;
+    iget-object p1, p1, Lcom/google/android/gms/internal/nearby/zzet;->aAg: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;->aAk:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzet;->aAg: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;->aAk:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/zzet;->aAg: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 474142149f..c36c2353c9 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 aAp:Ljava/lang/String;
+.field aAl:Ljava/lang/String;
 
-.field aAw:Lcom/google/android/gms/internal/nearby/zzfh;
+.field aAs:Lcom/google/android/gms/internal/nearby/zzfh;
 
-.field private aAx:Z
+.field private aAt: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;->aAp:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/zzev;->aAl:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/nearby/zzev;->aAw:Lcom/google/android/gms/internal/nearby/zzfh;
+    iput-object p2, p0, Lcom/google/android/gms/internal/nearby/zzev;->aAs:Lcom/google/android/gms/internal/nearby/zzfh;
 
-    iput-boolean p3, p0, Lcom/google/android/gms/internal/nearby/zzev;->aAx:Z
+    iput-boolean p3, p0, Lcom/google/android/gms/internal/nearby/zzev;->aAt: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;->aAp:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzev;->aAl:Ljava/lang/String;
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzev;->aAp:Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzev;->aAl: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;->aAw:Lcom/google/android/gms/internal/nearby/zzfh;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzev;->aAs: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;
+    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzev;->aAs: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;->aAx:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/internal/nearby/zzev;->aAt: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;->aAx:Z
+    iget-boolean p1, p1, Lcom/google/android/gms/internal/nearby/zzev;->aAt: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;->aAp:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzev;->aAl:Ljava/lang/String;
 
     const/4 v2, 0x0
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzev;->aAw:Lcom/google/android/gms/internal/nearby/zzfh;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzev;->aAs: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;->aAx:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/internal/nearby/zzev;->aAt: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;->aAp:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzev;->aAl: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;->aAw:Lcom/google/android/gms/internal/nearby/zzfh;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzev;->aAs: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;->aAx:Z
+    iget-boolean p2, p0, Lcom/google/android/gms/internal/nearby/zzev;->aAt: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 93a591dde7..7f3570bdc2 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 aAp:Ljava/lang/String;
+.field aAl:Ljava/lang/String;
 
-.field aAy:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
+.field aAu: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;->aAp:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/zzex;->aAl:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/nearby/zzex;->aAy:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
+    iput-object p2, p0, Lcom/google/android/gms/internal/nearby/zzex;->aAu: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;->aAp:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzex;->aAl:Ljava/lang/String;
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzex;->aAp:Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzex;->aAl: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;->aAy:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzex;->aAu: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;
+    iget-object p1, p1, Lcom/google/android/gms/internal/nearby/zzex;->aAu: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;->aAp:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzex;->aAl:Ljava/lang/String;
 
     const/4 v2, 0x0
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzex;->aAy:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzex;->aAu: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;->aAp:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzex;->aAl: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;->aAy:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzex;->aAu: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 6cba777688..f3ca47a8e4 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 aAz:I
+.field private aAv: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;->aAz:I
+    iput p1, p0, Lcom/google/android/gms/internal/nearby/zzfd;->aAv: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;->aAz:I
+    iget v0, p0, Lcom/google/android/gms/internal/nearby/zzfd;->aAv: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;->aAz:I
+    iget p1, p1, Lcom/google/android/gms/internal/nearby/zzfd;->aAv: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;->aAz:I
+    iget v1, p0, Lcom/google/android/gms/internal/nearby/zzfd;->aAv: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;->aAz:I
+    iget v0, p0, Lcom/google/android/gms/internal/nearby/zzfd;->aAv: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 3f31217a8a..8fd65136dc 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 aAD:[B
+.field aAA:Landroid/os/ParcelFileDescriptor;
 
-.field aAE:Landroid/os/ParcelFileDescriptor;
+.field aAB:Ljava/lang/String;
 
-.field aAF:Ljava/lang/String;
+.field private aAC:Landroid/os/ParcelFileDescriptor;
 
-.field private aAG:Landroid/os/ParcelFileDescriptor;
+.field aAz:[B
 
-.field akJ:J
+.field akF:J
 
 .field id:J
 
@@ -50,7 +50,7 @@
 
     const-wide/16 v0, -0x1
 
-    iput-wide v0, p0, Lcom/google/android/gms/internal/nearby/zzfh;->akJ:J
+    iput-wide v0, p0, Lcom/google/android/gms/internal/nearby/zzfh;->akF: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;->akJ:J
+    iput-wide v0, p0, Lcom/google/android/gms/internal/nearby/zzfh;->akF: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;->aAD:[B
+    iput-object p4, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aAz:[B
 
-    iput-object p5, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aAE:Landroid/os/ParcelFileDescriptor;
+    iput-object p5, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aAA:Landroid/os/ParcelFileDescriptor;
 
-    iput-object p6, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aAF:Ljava/lang/String;
+    iput-object p6, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aAB:Ljava/lang/String;
 
-    iput-wide p7, p0, Lcom/google/android/gms/internal/nearby/zzfh;->akJ:J
+    iput-wide p7, p0, Lcom/google/android/gms/internal/nearby/zzfh;->akF:J
 
-    iput-object p9, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aAG:Landroid/os/ParcelFileDescriptor;
+    iput-object p9, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aAC: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;->aAD:[B
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aAz:[B
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzfh;->aAD:[B
+    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzfh;->aAz:[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;->aAE:Landroid/os/ParcelFileDescriptor;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aAA:Landroid/os/ParcelFileDescriptor;
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzfh;->aAE:Landroid/os/ParcelFileDescriptor;
+    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzfh;->aAA: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;->aAF:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aAB:Ljava/lang/String;
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzfh;->aAF:Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzfh;->aAB: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;->akJ:J
+    iget-wide v3, p0, Lcom/google/android/gms/internal/nearby/zzfh;->akF: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;->akJ:J
+    iget-wide v3, p1, Lcom/google/android/gms/internal/nearby/zzfh;->akF: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;->aAG:Landroid/os/ParcelFileDescriptor;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aAC:Landroid/os/ParcelFileDescriptor;
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/nearby/zzfh;->aAG:Landroid/os/ParcelFileDescriptor;
+    iget-object p1, p1, Lcom/google/android/gms/internal/nearby/zzfh;->aAC: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;->aAD:[B
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aAz:[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;->aAE:Landroid/os/ParcelFileDescriptor;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aAA:Landroid/os/ParcelFileDescriptor;
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aAF:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aAB:Ljava/lang/String;
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    iget-wide v1, p0, Lcom/google/android/gms/internal/nearby/zzfh;->akJ:J
+    iget-wide v1, p0, Lcom/google/android/gms/internal/nearby/zzfh;->akF: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;->aAG:Landroid/os/ParcelFileDescriptor;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aAC: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;->aAD:[B
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aAz:[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;->aAE:Landroid/os/ParcelFileDescriptor;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aAA: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;->aAF:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aAB: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;->akJ:J
+    iget-wide v1, p0, Lcom/google/android/gms/internal/nearby/zzfh;->akF: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;->aAG:Landroid/os/ParcelFileDescriptor;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aAC: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 8bc0a51b97..85b7e5cc0f 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 aAH:I
+.field private final aAD:I
 
-.field private final aAI:Landroid/os/ParcelUuid;
+.field private final aAE:Landroid/os/ParcelUuid;
 
-.field private final aAJ:Landroid/os/ParcelUuid;
+.field private final aAF:Landroid/os/ParcelUuid;
 
-.field private final aAK:Landroid/os/ParcelUuid;
+.field private final aAG:Landroid/os/ParcelUuid;
 
-.field private final aAL:[B
+.field private final aAH:[B
 
-.field private final aAM:[B
+.field private final aAI:[B
 
-.field private final aAN:[B
+.field private final aAJ:[B
 
-.field private final aAO:[B
+.field private final aAK:[B
 
-.field private final alL:I
+.field private final alH: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;->aAH:I
+    iput p1, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aAD:I
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aAI:Landroid/os/ParcelUuid;
+    iput-object p2, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aAE:Landroid/os/ParcelUuid;
 
-    iput-object p3, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aAJ:Landroid/os/ParcelUuid;
+    iput-object p3, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aAF:Landroid/os/ParcelUuid;
 
-    iput-object p4, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aAK:Landroid/os/ParcelUuid;
+    iput-object p4, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aAG:Landroid/os/ParcelUuid;
 
-    iput-object p5, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aAL:[B
+    iput-object p5, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aAH:[B
 
-    iput-object p6, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aAM:[B
+    iput-object p6, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aAI:[B
 
-    iput p7, p0, Lcom/google/android/gms/internal/nearby/zzgp;->alL:I
+    iput p7, p0, Lcom/google/android/gms/internal/nearby/zzgp;->alH:I
 
-    iput-object p8, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aAN:[B
+    iput-object p8, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aAJ:[B
 
-    iput-object p9, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aAO:[B
+    iput-object p9, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aAK:[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;->alL:I
+    iget v2, p0, Lcom/google/android/gms/internal/nearby/zzgp;->alH:I
 
-    iget v3, p1, Lcom/google/android/gms/internal/nearby/zzgp;->alL:I
+    iget v3, p1, Lcom/google/android/gms/internal/nearby/zzgp;->alH:I
 
     if-ne v2, v3, :cond_2
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aAN:[B
+    iget-object v2, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aAJ:[B
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzgp;->aAN:[B
+    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzgp;->aAJ:[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;->aAO:[B
+    iget-object v2, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aAK:[B
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzgp;->aAO:[B
+    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzgp;->aAK:[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;->aAK:Landroid/os/ParcelUuid;
+    iget-object v2, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aAG:Landroid/os/ParcelUuid;
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzgp;->aAK:Landroid/os/ParcelUuid;
+    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzgp;->aAG: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;->aAL:[B
+    iget-object v2, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aAH:[B
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzgp;->aAL:[B
+    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzgp;->aAH:[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;->aAM:[B
+    iget-object v2, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aAI:[B
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzgp;->aAM:[B
+    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzgp;->aAI:[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;->aAI:Landroid/os/ParcelUuid;
+    iget-object v2, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aAE:Landroid/os/ParcelUuid;
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzgp;->aAI:Landroid/os/ParcelUuid;
+    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzgp;->aAE: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;->aAJ:Landroid/os/ParcelUuid;
+    iget-object v2, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aAF:Landroid/os/ParcelUuid;
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/nearby/zzgp;->aAJ:Landroid/os/ParcelUuid;
+    iget-object p1, p1, Lcom/google/android/gms/internal/nearby/zzgp;->aAF: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;->alL:I
+    iget v1, p0, Lcom/google/android/gms/internal/nearby/zzgp;->alH: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;->aAN:[B
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aAJ:[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;->aAO:[B
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aAK:[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;->aAK:Landroid/os/ParcelUuid;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aAG:Landroid/os/ParcelUuid;
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aAL:[B
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aAH:[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;->aAM:[B
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aAI:[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;->aAI:Landroid/os/ParcelUuid;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aAE:Landroid/os/ParcelUuid;
 
     const/4 v2, 0x6
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aAJ:Landroid/os/ParcelUuid;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aAF:Landroid/os/ParcelUuid;
 
     const/4 v2, 0x7
 
@@ -294,55 +294,55 @@
 
     move-result v0
 
-    iget v1, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aAH:I
+    iget v1, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aAD: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;->aAI:Landroid/os/ParcelUuid;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aAE: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;->aAJ:Landroid/os/ParcelUuid;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aAF: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;->aAK:Landroid/os/ParcelUuid;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aAG: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;->aAL:[B
+    iget-object p2, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aAH:[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;->aAM:[B
+    iget-object p2, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aAI:[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;->alL:I
+    iget p2, p0, Lcom/google/android/gms/internal/nearby/zzgp;->alH: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;->aAN:[B
+    iget-object p2, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aAJ:[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;->aAO:[B
+    iget-object p2, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aAK:[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 ab859b08b7..25e1dfe4d9 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 aAX:Ljava/lang/String;
+.field private static final aAT:Ljava/lang/String;
 
-.field public static final aAY:Lcom/google/android/gms/internal/nearby/zzgs;
+.field public static final aAU:Lcom/google/android/gms/internal/nearby/zzgs;
 
 
 # instance fields
-.field private final aAH:I
+.field private final aAD:I
 
-.field private final aAZ:Ljava/lang/String;
+.field private final aAV:Ljava/lang/String;
 
-.field private final aBa:Ljava/lang/String;
+.field private final aAW:Ljava/lang/String;
 
 
 # direct methods
@@ -38,7 +38,7 @@
 
     const/4 v0, 0x0
 
-    sput-object v0, Lcom/google/android/gms/internal/nearby/zzgs;->aAX:Ljava/lang/String;
+    sput-object v0, Lcom/google/android/gms/internal/nearby/zzgs;->aAT: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;->aAY:Lcom/google/android/gms/internal/nearby/zzgs;
+    sput-object v0, Lcom/google/android/gms/internal/nearby/zzgs;->aAU: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;->aAH:I
+    iput p1, p0, Lcom/google/android/gms/internal/nearby/zzgs;->aAD:I
 
     if-nez p2, :cond_0
 
     const-string p2, ""
 
     :cond_0
-    iput-object p2, p0, Lcom/google/android/gms/internal/nearby/zzgs;->aAZ:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/internal/nearby/zzgs;->aAV:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/google/android/gms/internal/nearby/zzgs;->aBa:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/internal/nearby/zzgs;->aAW: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;->aAZ:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzgs;->aAV:Ljava/lang/String;
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzgs;->aAZ:Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzgs;->aAV: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;->aBa:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzgs;->aAW:Ljava/lang/String;
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/nearby/zzgs;->aBa:Ljava/lang/String;
+    iget-object p1, p1, Lcom/google/android/gms/internal/nearby/zzgs;->aAW: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;->aAZ:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzgs;->aAV:Ljava/lang/String;
 
     const/4 v2, 0x0
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzgs;->aBa:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzgs;->aAW: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;->aAZ:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/zzgs;->aAV:Ljava/lang/String;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzgs;->aBa:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzgs;->aAW: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;->aAZ:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/zzgs;->aAV: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;->aBa:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/zzgs;->aAW: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;->aAH:I
+    iget v0, p0, Lcom/google/android/gms/internal/nearby/zzgs;->aAD: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 36c03f2500..3449afacde 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 aAH:I
+.field private final aAD:I
 
-.field private final aBb:I
+.field private final aAX:I
 
-.field private final aBc:[B
+.field private final aAY:[B
 
-.field private final aBd:Z
+.field private final aAZ: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;->aAH:I
+    iput p1, p0, Lcom/google/android/gms/internal/nearby/zzgu;->aAD:I
 
-    iput p2, p0, Lcom/google/android/gms/internal/nearby/zzgu;->aBb:I
+    iput p2, p0, Lcom/google/android/gms/internal/nearby/zzgu;->aAX:I
 
-    iput-object p3, p0, Lcom/google/android/gms/internal/nearby/zzgu;->aBc:[B
+    iput-object p3, p0, Lcom/google/android/gms/internal/nearby/zzgu;->aAY:[B
 
-    iput-boolean p4, p0, Lcom/google/android/gms/internal/nearby/zzgu;->aBd:Z
+    iput-boolean p4, p0, Lcom/google/android/gms/internal/nearby/zzgu;->aAZ:Z
 
     return-void
 .end method
@@ -64,25 +64,25 @@
 
     move-result p2
 
-    iget v0, p0, Lcom/google/android/gms/internal/nearby/zzgu;->aBb:I
+    iget v0, p0, Lcom/google/android/gms/internal/nearby/zzgu;->aAX: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;->aBc:[B
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/zzgu;->aAY:[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;->aBd:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/nearby/zzgu;->aAZ: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;->aAH:I
+    iget v0, p0, Lcom/google/android/gms/internal/nearby/zzgu;->aAD: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 930b09c036..e6f758adb2 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 aBJ:Lcom/google/android/gms/measurement/AppMeasurement;
+.field private static volatile aBF:Lcom/google/android/gms/measurement/AppMeasurement;
 
 
 # instance fields
-.field public final aBK:Lcom/google/android/gms/measurement/internal/ey;
+.field public final aBG:Lcom/google/android/gms/measurement/internal/ey;
 
-.field public final aBL:Lcom/google/android/gms/measurement/internal/gy;
+.field public final aBH:Lcom/google/android/gms/measurement/internal/gy;
 
-.field public final axe:Z
+.field public final axa: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;->aBK:Lcom/google/android/gms/measurement/internal/ey;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBG:Lcom/google/android/gms/measurement/internal/ey;
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBL:Lcom/google/android/gms/measurement/internal/gy;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBH:Lcom/google/android/gms/measurement/internal/gy;
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lcom/google/android/gms/measurement/AppMeasurement;->axe:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/measurement/AppMeasurement;->axa: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;->aBL:Lcom/google/android/gms/measurement/internal/gy;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBH:Lcom/google/android/gms/measurement/internal/gy;
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBK:Lcom/google/android/gms/measurement/internal/ey;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBG:Lcom/google/android/gms/measurement/internal/ey;
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lcom/google/android/gms/measurement/AppMeasurement;->axe:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/measurement/AppMeasurement;->axa: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;->aBJ:Lcom/google/android/gms/measurement/AppMeasurement;
+    sget-object v0, Lcom/google/android/gms/measurement/AppMeasurement;->aBF: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;->aBJ:Lcom/google/android/gms/measurement/AppMeasurement;
+    sget-object v1, Lcom/google/android/gms/measurement/AppMeasurement;->aBF: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;->aBJ:Lcom/google/android/gms/measurement/AppMeasurement;
+    sput-object p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBF: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;->aBJ:Lcom/google/android/gms/measurement/AppMeasurement;
+    sput-object v1, Lcom/google/android/gms/measurement/AppMeasurement;->aBF: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;->aBJ:Lcom/google/android/gms/measurement/AppMeasurement;
+    sget-object p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBF: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;->aBJ:Lcom/google/android/gms/measurement/AppMeasurement;
+    sget-object v0, Lcom/google/android/gms/measurement/AppMeasurement;->aBF: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;->aBJ:Lcom/google/android/gms/measurement/AppMeasurement;
+    sget-object v1, Lcom/google/android/gms/measurement/AppMeasurement;->aBF: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;->aBJ:Lcom/google/android/gms/measurement/AppMeasurement;
+    sput-object p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBF: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;->aBJ:Lcom/google/android/gms/measurement/AppMeasurement;
+    sput-object p1, Lcom/google/android/gms/measurement/AppMeasurement;->aBF: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;->aBJ:Lcom/google/android/gms/measurement/AppMeasurement;
+    sget-object p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBF: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;->axe:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->axa:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBL:Lcom/google/android/gms/measurement/internal/gy;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBH: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;->aBK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yl()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yj()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vq()Lcom/google/android/gms/common/util/e;
 
     move-result-object v1
 
-    invoke-interface {v1}, Lcom/google/android/gms/common/util/e;->nr()J
+    invoke-interface {v1}, Lcom/google/android/gms/common/util/e;->np()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;->axe:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->axa:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBL:Lcom/google/android/gms/measurement/internal/gy;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBH: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;->aBK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->ya()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;->axe:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->axa:Z
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->ya()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;->axe:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->axa:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBL:Lcom/google/android/gms/measurement/internal/gy;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBH: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;->aBK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yl()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yj()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vq()Lcom/google/android/gms/common/util/e;
 
     move-result-object v1
 
-    invoke-interface {v1}, Lcom/google/android/gms/common/util/e;->nr()J
+    invoke-interface {v1}, Lcom/google/android/gms/common/util/e;->np()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;->axe:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->axa:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBL:Lcom/google/android/gms/measurement/internal/gy;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBH:Lcom/google/android/gms/measurement/internal/gy;
 
-    invoke-interface {v0}, Lcom/google/android/gms/measurement/internal/gy;->qA()J
+    invoke-interface {v0}, Lcom/google/android/gms/measurement/internal/gy;->qy()J
 
     move-result-wide v0
 
     return-wide v0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yb()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jm;->qV()J
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jm;->qT()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;->axe:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->axa:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBL:Lcom/google/android/gms/measurement/internal/gy;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBH:Lcom/google/android/gms/measurement/internal/gy;
 
-    invoke-interface {v0}, Lcom/google/android/gms/measurement/internal/gy;->qz()Ljava/lang/String;
+    invoke-interface {v0}, Lcom/google/android/gms/measurement/internal/gy;->qx()Ljava/lang/String;
 
     move-result-object v0
 
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/gf;->xK()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/gf;->xI()Ljava/lang/String;
 
     move-result-object v0
 
@@ -466,11 +466,11 @@
         }
     .end annotation
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->axe:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->axa:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBL:Lcom/google/android/gms/measurement/internal/gy;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBH: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;->aBK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->ya()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;->axe:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->axa:Z
 
     if-nez v0, :cond_2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->ya()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;->axe:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->axa:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBL:Lcom/google/android/gms/measurement/internal/gy;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBH:Lcom/google/android/gms/measurement/internal/gy;
 
-    invoke-interface {v0}, Lcom/google/android/gms/measurement/internal/gy;->rD()Ljava/lang/String;
+    invoke-interface {v0}, Lcom/google/android/gms/measurement/internal/gy;->rB()Ljava/lang/String;
 
     move-result-object v0
 
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/gf;->yx()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/gf;->yv()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;->axe:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->axa:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBL:Lcom/google/android/gms/measurement/internal/gy;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBH:Lcom/google/android/gms/measurement/internal/gy;
 
-    invoke-interface {v0}, Lcom/google/android/gms/measurement/internal/gy;->pO()Ljava/lang/String;
+    invoke-interface {v0}, Lcom/google/android/gms/measurement/internal/gy;->pM()Ljava/lang/String;
 
     move-result-object v0
 
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/gf;->uF()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/gf;->uD()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;->axe:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->axa:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBL:Lcom/google/android/gms/measurement/internal/gy;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBH:Lcom/google/android/gms/measurement/internal/gy;
 
-    invoke-interface {v0}, Lcom/google/android/gms/measurement/internal/gy;->uf()Ljava/lang/String;
+    invoke-interface {v0}, Lcom/google/android/gms/measurement/internal/gy;->ud()Ljava/lang/String;
 
     move-result-object v0
 
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/gf;->yy()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/gf;->yw()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;->axe:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->axa:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBL:Lcom/google/android/gms/measurement/internal/gy;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBH: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;->aBK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->ya()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;->axe:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->axa:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBL:Lcom/google/android/gms/measurement/internal/gy;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBH: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;->aBK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->ya()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;->axe:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->axa:Z
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->ya()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;->axe:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->axa:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBL:Lcom/google/android/gms/measurement/internal/gy;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBH: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;->aBK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->ya()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;->axe:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->axa:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBL:Lcom/google/android/gms/measurement/internal/gy;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBH: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;->aBK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->ya()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;->axe:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->axa:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBL:Lcom/google/android/gms/measurement/internal/gy;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBH: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;->aBK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->ya()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;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()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;->axe:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->axa:Z
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->ya()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;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()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 50546dc9cb..746f0b72b3 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 aBM:Lcom/google/android/gms/measurement/internal/eo;
+.field private aBI: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;->aBM:Lcom/google/android/gms/measurement/internal/eo;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurementInstallReferrerReceiver;->aBI: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;->aBM:Lcom/google/android/gms/measurement/internal/eo;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurementInstallReferrerReceiver;->aBI:Lcom/google/android/gms/measurement/internal/eo;
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurementInstallReferrerReceiver;->aBM:Lcom/google/android/gms/measurement/internal/eo;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurementInstallReferrerReceiver;->aBI: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 uV()Landroid/content/BroadcastReceiver$PendingResult;
+.method public final uT()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 e2d8742a82..52b82b7cf7 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 aBN:Lcom/google/android/gms/measurement/internal/ik;
+.field private aBJ: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 uW()Lcom/google/android/gms/measurement/internal/ik;
+.method private final uU()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;->aBN:Lcom/google/android/gms/measurement/internal/ik;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurementJobService;->aBJ: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;->aBN:Lcom/google/android/gms/measurement/internal/ik;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurementJobService;->aBJ:Lcom/google/android/gms/measurement/internal/ik;
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurementJobService;->aBN:Lcom/google/android/gms/measurement/internal/ik;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurementJobService;->aBJ: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;->uW()Lcom/google/android/gms/measurement/internal/ik;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/AppMeasurementJobService;->uU()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;->uW()Lcom/google/android/gms/measurement/internal/ik;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/AppMeasurementJobService;->uU()Lcom/google/android/gms/measurement/internal/ik;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ik;->pG()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ik;->pE()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;->uW()Lcom/google/android/gms/measurement/internal/ik;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/AppMeasurementJobService;->uU()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;->uW()Lcom/google/android/gms/measurement/internal/ik;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/AppMeasurementJobService;->uU()Lcom/google/android/gms/measurement/internal/ik;
 
     move-result-object v0
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ik;->aGM:Landroid/content/Context;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ik;->aGI: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vv()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;->vA()Lcom/google/android/gms/measurement/internal/jz;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vy()Lcom/google/android/gms/measurement/internal/jz;
 
-    iget-object v1, v2, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v2, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->uW()Lcom/google/android/gms/measurement/internal/ik;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/AppMeasurementJobService;->uU()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 7a373ae22b..26d5f8fd71 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 aBM:Lcom/google/android/gms/measurement/internal/eo;
+.field private aBI: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;->aBM:Lcom/google/android/gms/measurement/internal/eo;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurementReceiver;->aBI: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;->aBM:Lcom/google/android/gms/measurement/internal/eo;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurementReceiver;->aBI:Lcom/google/android/gms/measurement/internal/eo;
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurementReceiver;->aBM:Lcom/google/android/gms/measurement/internal/eo;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurementReceiver;->aBI: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 uV()Landroid/content/BroadcastReceiver$PendingResult;
+.method public final uT()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 c71a9ffd30..00725ce3dd 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 aBN:Lcom/google/android/gms/measurement/internal/ik;
+.field private aBJ: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 uW()Lcom/google/android/gms/measurement/internal/ik;
+.method private final uU()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;->aBN:Lcom/google/android/gms/measurement/internal/ik;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurementService;->aBJ: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;->aBN:Lcom/google/android/gms/measurement/internal/ik;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurementService;->aBJ:Lcom/google/android/gms/measurement/internal/ik;
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurementService;->aBN:Lcom/google/android/gms/measurement/internal/ik;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurementService;->aBJ: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;->uW()Lcom/google/android/gms/measurement/internal/ik;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/AppMeasurementService;->uU()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;->yD()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ik;->yB()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, 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/dv;->aEw: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;->aGM:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ik;->aGI: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;->yD()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ik;->yB()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;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->uW()Lcom/google/android/gms/measurement/internal/ik;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/AppMeasurementService;->uU()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;->uW()Lcom/google/android/gms/measurement/internal/ik;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/AppMeasurementService;->uU()Lcom/google/android/gms/measurement/internal/ik;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ik;->pG()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ik;->pE()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;->uW()Lcom/google/android/gms/measurement/internal/ik;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/AppMeasurementService;->uU()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;->uW()Lcom/google/android/gms/measurement/internal/ik;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/AppMeasurementService;->uU()Lcom/google/android/gms/measurement/internal/ik;
 
     move-result-object p2
 
-    iget-object v0, p2, Lcom/google/android/gms/measurement/internal/ik;->aGM:Landroid/content/Context;
+    iget-object v0, p2, Lcom/google/android/gms/measurement/internal/ik;->aGI: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vv()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;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->vA()Lcom/google/android/gms/measurement/internal/jz;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vy()Lcom/google/android/gms/measurement/internal/jz;
 
-    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->uW()Lcom/google/android/gms/measurement/internal/ik;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/AppMeasurementService;->uU()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 fc8f74b0e9..4272cbc654 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 azS:Lcom/google/android/gms/internal/measurement/me;
+.field private final azO: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;->azS:Lcom/google/android/gms/internal/measurement/me;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/api/a;->azO: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 52b9d90104..48767a38b6 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 aBQ:Lcom/google/android/gms/internal/measurement/ma;
+.field private aBM:Lcom/google/android/gms/internal/measurement/ma;
 
-.field private final synthetic aBR:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
+.field private final synthetic aBN: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;->aBR:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService$a;->aBN: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;->aBQ:Lcom/google/android/gms/internal/measurement/ma;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService$a;->aBM: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;->aBQ:Lcom/google/android/gms/internal/measurement/ma;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService$a;->aBM: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;->aBR:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService$a;->aBN:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEz: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 d8af6741d1..fcdb289ce1 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 aBQ:Lcom/google/android/gms/internal/measurement/ma;
+.field private aBM:Lcom/google/android/gms/internal/measurement/ma;
 
-.field private final synthetic aBR:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
+.field private final synthetic aBN: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;->aBR:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService$b;->aBN: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;->aBQ:Lcom/google/android/gms/internal/measurement/ma;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService$b;->aBM: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;->aBQ:Lcom/google/android/gms/internal/measurement/ma;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService$b;->aBM: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;->aBR:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService$b;->aBN:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEz: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 1f29c44c2e..cb933585a7 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 aBO:Lcom/google/android/gms/measurement/internal/ey;
+.field aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-.field private aBP:Ljava/util/Map;
+.field private aBL: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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBK: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;->aBP:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBL: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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yb()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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBK: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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yl()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yj()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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->ya()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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yl()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yj()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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yb()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jm;->qV()J
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jm;->qT()J
 
     move-result-wide v0
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->yb()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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBK: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;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/gf;->xK()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/gf;->xI()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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBK: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;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/gf;->yx()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/gf;->yv()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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/gf;->uF()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/gf;->uD()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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/gf;->yy()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/gf;->yw()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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->ya()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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->yb()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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->yb()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object p2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->ya()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;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vu()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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->yb()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object p2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->ya()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;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vu()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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->yb()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object p2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->ya()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;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vu()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;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/jm;->aGG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->yb()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object p2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->ya()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;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vu()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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->yb()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object p2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->ya()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;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vu()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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBK: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;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBK: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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
     return-void
 
     :cond_0
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBK: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;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->ya()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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vu()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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ey;->vv()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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object p3
 
-    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/gf;->aGS:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/gf;->aGO:Lcom/google/android/gms/measurement/internal/gw;
 
     if-eqz p3, :cond_0
 
-    iget-object p4, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p4, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object p4
 
-    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/gf;->xF()V
+    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/gf;->xD()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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/gf;->aGS:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/gf;->aGO:Lcom/google/android/gms/measurement/internal/gw;
 
     if-eqz p2, :cond_0
 
-    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object p3
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/gf;->xF()V
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/gf;->xD()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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/gf;->aGS:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/gf;->aGO:Lcom/google/android/gms/measurement/internal/gw;
 
     if-eqz p2, :cond_0
 
-    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object p3
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/gf;->xF()V
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/gf;->xD()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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/gf;->aGS:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/gf;->aGO:Lcom/google/android/gms/measurement/internal/gw;
 
     if-eqz p2, :cond_0
 
-    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object p3
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/gf;->xF()V
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/gf;->xD()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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object p3
 
-    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/gf;->aGS:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/gf;->aGO: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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/gf;->xF()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/gf;->xD()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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/gf;->aGS:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/gf;->aGO:Lcom/google/android/gms/measurement/internal/gw;
 
     if-eqz p2, :cond_0
 
-    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object p3
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/gf;->xF()V
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/gf;->xD()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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/gf;->aGS:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/gf;->aGO:Lcom/google/android/gms/measurement/internal/gw;
 
     if-eqz p2, :cond_0
 
-    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object p3
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/gf;->xF()V
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/gf;->xD()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;->aBP:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBL:Ljava/util/Map;
 
-    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/ma;->pJ()I
+    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/ma;->pH()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;->aBP:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBL:Ljava/util/Map;
 
-    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/ma;->pJ()I
+    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/ma;->pH()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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->ya()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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->ya()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;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vu()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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, 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/dv;->aEw: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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->ya()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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p4, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/ey;->yh()Lcom/google/android/gms/measurement/internal/hh;
+    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/ey;->yf()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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->ya()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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->ya()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;->xB()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dc;->xz()V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vu()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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->ya()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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vu()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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vu()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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->ya()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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ey;->ya()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;->aBP:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBL:Ljava/util/Map;
 
-    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/ma;->pJ()I
+    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/ma;->pH()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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->ya()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 d1d4e1c3c8..028a6db138 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 aBS:Lcom/google/android/gms/measurement/internal/z;
+.field private final synthetic aBO:Lcom/google/android/gms/measurement/internal/z;
 
-.field private final synthetic anz:J
+.field private final synthetic anv:J
 
-.field private final synthetic atS:Ljava/lang/String;
+.field private final synthetic atO: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;->aBS:Lcom/google/android/gms/measurement/internal/z;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/a;->aBO:Lcom/google/android/gms/measurement/internal/z;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/a;->atS:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/a;->atO:Ljava/lang/String;
 
-    iput-wide p3, p0, Lcom/google/android/gms/measurement/internal/a;->anz:J
+    iput-wide p3, p0, Lcom/google/android/gms/measurement/internal/a;->anv: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;->aBS:Lcom/google/android/gms/measurement/internal/z;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/a;->aBO:Lcom/google/android/gms/measurement/internal/z;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/a;->atS:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/a;->atO:Ljava/lang/String;
 
-    iget-wide v2, p0, Lcom/google/android/gms/measurement/internal/a;->anz:J
+    iget-wide v2, p0, Lcom/google/android/gms/measurement/internal/a;->anv:J
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()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;->aBP:Ljava/util/Map;
+    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/z;->aBL: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;->aBU:J
+    iput-wide v2, v0, Lcom/google/android/gms/measurement/internal/z;->aBQ:J
 
     :cond_0
-    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/z;->aBP:Ljava/util/Map;
+    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/z;->aBL: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;->aBP:Ljava/util/Map;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/z;->aBL: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;->aBP:Ljava/util/Map;
+    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/z;->aBL: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()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;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->aBP:Ljava/util/Map;
+    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/z;->aBL: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;->aty:Ljava/util/Map;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/z;->atu: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 4fcf2a003d..c5dda67a57 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/aa;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()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;->wZ()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 af44ce0ad0..53319062fb 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/ab;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wY()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/ac.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ac.smali
index a3f3c5e0b5..63181981eb 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/ac;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wZ()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wX()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 335d793784..effc346956 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/ad;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wX()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/ae.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ae.smali
index df3778fb00..89d8e7c3c8 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/ae;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->xp()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->xn()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 115a171761..017687dad1 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/af;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()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;->wT()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 6106c929ae..aa2c61d19b 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/ag;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wW()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/ah.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ah.smali
index e810b1a5e8..f06037423d 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/ah;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()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;->wR()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 c4c6a90314..8e847c38bc 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/ai;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()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;->wS()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 93c087ea7d..32baeda7d6 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/aj;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()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;->wP()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 08f87958a9..00a74e3b51 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/ak;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()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;->wQ()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 63c11f7c48..de3de0e139 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/al;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()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;->wN()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 0df961374e..a0717a7ecf 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/am;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()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;->wO()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 be5596b4e4..c3e0a3d50d 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/an;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->xo()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/ao.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ao.smali
index f04fccd4ce..eecf2bc226 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/ao;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()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;->wM()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 901dd29752..d95f59e659 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/ap;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()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;->wK()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 efe4231a76..e404c2b433 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/aq;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wN()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/ar.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ar.smali
index 5179b856c4..8c41fd000f 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/ar;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()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;->wI()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 f89477614b..8c5b21847d 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/as;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wL()Ljava/lang/Integer;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wJ()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 e411987bf8..aaad9f9ab7 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/at;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()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;->wG()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 fc0851d6d5..d560d89493 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/au;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()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;->wH()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 3af87c5fe6..fc143d3d67 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/av;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()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;->wE()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 d33e014a9d..5c9e0b4ad9 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/aw;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wH()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wF()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 7817edfbfa..6d2b74221c 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/ax;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wE()Ljava/lang/Double;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wC()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 2a5a3f0356..dd61b0af53 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/ay;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wF()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/az.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/az.smali
index 5d7eac42a7..0a38b4ba01 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/az;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wD()Ljava/lang/Integer;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wB()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 1226a346aa..ef7a4656a0 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 aBT:Lcom/google/android/gms/measurement/internal/kc;
+.field static final aBP: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;->aBT:Lcom/google/android/gms/measurement/internal/kc;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/b;->aBP: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 1cb06f5dde..0ecd43aabd 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 aEr:Lcom/google/android/gms/measurement/internal/z;
+.field private final synthetic aEn:Lcom/google/android/gms/measurement/internal/z;
 
-.field private final synthetic any:J
+.field private final synthetic anu: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;->aEr:Lcom/google/android/gms/measurement/internal/z;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ba;->aEn:Lcom/google/android/gms/measurement/internal/z;
 
-    iput-wide p2, p0, Lcom/google/android/gms/measurement/internal/ba;->any:J
+    iput-wide p2, p0, Lcom/google/android/gms/measurement/internal/ba;->anu: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;->aEr:Lcom/google/android/gms/measurement/internal/z;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ba;->aEn:Lcom/google/android/gms/measurement/internal/z;
 
-    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/ba;->any:J
+    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/ba;->anu: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 13ad3682cd..106fb28046 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/bb;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->xn()Ljava/lang/Long;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->xl()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 4bb4988163..77195e577f 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/bc;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()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;->wz()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 0babc6a876..19debef806 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/bd;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()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;->wA()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 ca7583ec3b..3a56412ebd 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/be;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()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;->wx()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 117fba6ad7..ae60b2c4cf 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/bf;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()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;->wy()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 69f9fce5f6..3b68c49d2a 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/bg;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()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;->wv()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 546631df11..581d7cd15c 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/bh;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()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;->ww()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 b47c327092..b6d729c616 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/bi;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()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;->wt()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 54d52391f2..f04fdb07ec 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/bj;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()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;->wu()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 6117edfa4c..dce5ff6410 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/bk;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->xm()Ljava/lang/Long;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->xk()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 d175bd357a..66f79a98d0 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/bl;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()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;->ws()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 15dd019a42..43de5450c6 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/bm;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()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;->wq()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 8b98e9c536..9115c2dc17 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/bn;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()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;->wr()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 7a40bb965c..5809337893 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/bo;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()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;->wo()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 c3c31cd560..b0abad458e 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/bp;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()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;->wp()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 fc1d44bf03..5c575be3c9 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/bq;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()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;->wm()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 28525cc8ac..40e4c29d49 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/br;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()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;->wn()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 1efd3605e6..8b15f1f983 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/bs;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()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;->wk()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 97ae442811..761d535e24 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/bt;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()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;->wl()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 f087e75237..1d05a0248a 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/bu;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()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;->wi()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 ec551bf8c3..7ecaa6b88b 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/bv;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()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;->wj()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 795ecec293..bc3036bc65 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/bw;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->nK()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->nI()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 573b77670d..dad6be6a66 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/bx;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->xl()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->xj()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 e3f58110ce..0f52a3f858 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/by;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()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;->wg()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 e2f86313c0..8a21318bcf 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/bz;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()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;->wh()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 3d981a5738..73dee5ce6c 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 aBU:J
+.field aBQ:J
 
-.field any:J
+.field anu:J
 
-.field anz:J
+.field anv: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 f377e3101b..1b9d9e2baa 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/ca;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()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;->we()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 f1681ac154..7017c4af90 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 aBS:Lcom/google/android/gms/measurement/internal/z;
+.field private final synthetic aBO:Lcom/google/android/gms/measurement/internal/z;
 
-.field private final synthetic anz:J
+.field private final synthetic anv:J
 
-.field private final synthetic atS:Ljava/lang/String;
+.field private final synthetic atO: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;->aBS:Lcom/google/android/gms/measurement/internal/z;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/cb;->aBO:Lcom/google/android/gms/measurement/internal/z;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/cb;->atS:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/cb;->atO:Ljava/lang/String;
 
-    iput-wide p3, p0, Lcom/google/android/gms/measurement/internal/cb;->anz:J
+    iput-wide p3, p0, Lcom/google/android/gms/measurement/internal/cb;->anv: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;->aBS:Lcom/google/android/gms/measurement/internal/z;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/cb;->aBO:Lcom/google/android/gms/measurement/internal/z;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/cb;->atS:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/cb;->atO:Ljava/lang/String;
 
-    iget-wide v2, p0, Lcom/google/android/gms/measurement/internal/cb;->anz:J
+    iget-wide v2, p0, Lcom/google/android/gms/measurement/internal/cb;->anv:J
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()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;->aBP:Ljava/util/Map;
+    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/z;->aBL: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;->xx()Lcom/google/android/gms/measurement/internal/hh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xv()Lcom/google/android/gms/measurement/internal/hh;
 
     move-result-object v5
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/hh;->yA()Lcom/google/android/gms/measurement/internal/hi;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/hh;->yy()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;->aBP:Ljava/util/Map;
+    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/z;->aBL: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;->aty:Ljava/util/Map;
+    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/z;->atu: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->aty:Ljava/util/Map;
+    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/z;->atu: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;->aBP:Ljava/util/Map;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/z;->aBL: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;->aBU:J
+    iget-wide v6, v0, Lcom/google/android/gms/measurement/internal/z;->aBQ: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->aBU:J
+    iget-wide v6, v0, Lcom/google/android/gms/measurement/internal/z;->aBQ: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;->aBU:J
+    iput-wide v8, v0, Lcom/google/android/gms/measurement/internal/z;->aBQ:J
 
     :cond_2
     return-void
 
     :cond_3
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/z;->aBP:Ljava/util/Map;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/z;->aBL: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEw: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 71d740cd28..c963d809c9 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/cc;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()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;->wf()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 27fb87c305..f535c6111f 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/cd;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()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;->wc()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 401f3d08f3..354b66d832 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/ce;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()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;->wd()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 5b8b679042..6c9d4003de 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/cf;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()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;->wa()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 56c3ff3582..297cf8c2c4 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/cg;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()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;->wb()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 e90361da50..5c10e19d9d 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/ch;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->xk()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->xi()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 dca9745f1b..82348ac4dc 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/ci;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()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;->vZ()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 730c3ec9e9..ad31d427fa 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/cj;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()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;->vX()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 e77c483e64..ac627949f7 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/ck;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()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;->vY()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 949f0bfb34..e308f2b3a5 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/cl;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()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;->vV()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 fb6137ddd3..c20fc4e28f 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/cm;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()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;->vW()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 363e1e01c0..6713d3d27a 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/cn;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()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;->vT()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 7784910db1..9d9d25d7f9 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/co;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()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;->vU()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 d08fa622f0..de22957f4e 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/cp;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()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;->vR()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 9bf895814c..2a6d7d6dee 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/cq;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()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;->vS()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 c07eff74bf..54b72a2bf2 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/cr;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()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;->vP()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 ffb7181554..7d40578bcc 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/cs;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()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;->vQ()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 6c4841fbe1..ab36f098b1 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/ct;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()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;->vO()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 b1620ef676..1ff74754a4 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/cu;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->xj()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/cv.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/cv.smali
index 37d3348a2a..a707fb9a3d 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/cv;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()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;->vM()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 ea6e3750c4..125774b080 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/cw;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()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;->vN()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 bb63bcf532..f3085a5335 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/cx;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()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;->vK()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 60c30cba51..050c5e0ca0 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/cy;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()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;->vL()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 3f9a0711dd..af572f9a18 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/cz;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->uK()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->uI()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 e8e53dbe6b..1da7288cf7 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 aBR:[Ljava/lang/String;
+
+.field private static final aBS:[Ljava/lang/String;
+
+.field private static final aBT:[Ljava/lang/String;
+
+.field private static final aBU:[Ljava/lang/String;
+
 .field private static final aBV:[Ljava/lang/String;
 
 .field private static final aBW:[Ljava/lang/String;
 
 .field private static final aBX:[Ljava/lang/String;
 
-.field private static final aBY:[Ljava/lang/String;
-
-.field private static final aBZ:[Ljava/lang/String;
-
-.field private static final aCa:[Ljava/lang/String;
-
-.field private static final aCb:[Ljava/lang/String;
-
-.field private static final atE:[Ljava/lang/String;
+.field private static final atA:[Ljava/lang/String;
 
 
 # instance fields
-.field private final aCc:Lcom/google/android/gms/measurement/internal/e;
+.field private final aBY:Lcom/google/android/gms/measurement/internal/e;
 
-.field private final aCd:Lcom/google/android/gms/measurement/internal/ix;
+.field private final aBZ: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;->aBV:[Ljava/lang/String;
+    sput-object v1, Lcom/google/android/gms/measurement/internal/d;->aBR:[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;->aBW:[Ljava/lang/String;
+    sput-object v1, Lcom/google/android/gms/measurement/internal/d;->aBS:[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;->aBX:[Ljava/lang/String;
+    sput-object v1, Lcom/google/android/gms/measurement/internal/d;->aBT:[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;->aBY:[Ljava/lang/String;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/d;->aBU:[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;->aBZ:[Ljava/lang/String;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/d;->aBV:[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;->aCa:[Ljava/lang/String;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/d;->aBW:[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;->atE:[Ljava/lang/String;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/d;->atA:[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;->aCb:[Ljava/lang/String;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/d;->aBX:[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;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()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;->aCd:Lcom/google/android/gms/measurement/internal/ix;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/d;->aBZ: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;->vt()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()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;->aCc:Lcom/google/android/gms/measurement/internal/e;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/d;->aBY: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;->uZ()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uX()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p3
 
-    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->aCd:Lcom/google/android/gms/measurement/internal/ix;
+    iget-object p0, p0, Lcom/google/android/gms/measurement/internal/d;->aBZ: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, 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/dv;->aEw: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, 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/dv;->aEw: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, 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/dv;->aEw: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;->yI()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yG()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()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;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->pH()Z
+    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/ac$b;->pF()Z
 
     move-result v3
 
@@ -805,7 +805,7 @@
     return v1
 
     :cond_1
-    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/cf;->rJ()[B
+    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/cf;->rH()[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;->pH()Z
+    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/ac$b;->pF()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;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object p2
 
-    sget-object v4, Lcom/google/android/gms/measurement/internal/o;->aDO: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 {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;->uZ()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uX()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p3
 
-    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->yI()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yG()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()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;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->pH()Z
+    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/ac$e;->pF()Z
 
     move-result v3
 
@@ -1023,7 +1023,7 @@
     return v1
 
     :cond_1
-    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/cf;->rJ()[B
+    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/cf;->rH()[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;->pH()Z
+    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/ac$e;->pF()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;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object p2
 
-    sget-object v4, Lcom/google/android/gms/measurement/internal/o;->aDO: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 {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;->uZ()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uX()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p3
 
-    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->uZ()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uX()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->yI()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yG()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uZ()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uX()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;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v2
 
-    sget-object v6, Lcom/google/android/gms/measurement/internal/o;->aDe:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v6, Lcom/google/android/gms/measurement/internal/o;->aDa: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEw: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 ve()Z
+.method private final vc()Z
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()Landroid/content/Context;
 
     move-result-object v0
 
@@ -1505,10 +1505,26 @@
     return v0
 .end method
 
+.method static synthetic vd()[Ljava/lang/String;
+    .locals 1
+
+    sget-object v0, Lcom/google/android/gms/measurement/internal/d;->aBR:[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;->aBS:[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;->aBV:[Ljava/lang/String;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/d;->aBT:[Ljava/lang/String;
 
     return-object v0
 .end method
@@ -1516,7 +1532,7 @@
 .method static synthetic vg()[Ljava/lang/String;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/d;->aBW:[Ljava/lang/String;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/d;->aBV:[Ljava/lang/String;
 
     return-object v0
 .end method
@@ -1524,7 +1540,7 @@
 .method static synthetic vh()[Ljava/lang/String;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/d;->aBX:[Ljava/lang/String;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/d;->aBU:[Ljava/lang/String;
 
     return-object v0
 .end method
@@ -1532,7 +1548,7 @@
 .method static synthetic vi()[Ljava/lang/String;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/d;->aBZ:[Ljava/lang/String;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/d;->aBW:[Ljava/lang/String;
 
     return-object v0
 .end method
@@ -1540,7 +1556,7 @@
 .method static synthetic vj()[Ljava/lang/String;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/d;->aBY:[Ljava/lang/String;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/d;->atA:[Ljava/lang/String;
 
     return-object v0
 .end method
@@ -1548,23 +1564,7 @@
 .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;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/d;->aBX:[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;->vq()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()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/jb;->yG()V
 
-    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/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     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;->aDL: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;->uZ()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/d;->uX()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->vu()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()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;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yG()V
 
     :try_start_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uZ()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uX()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->vu()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()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;->vq()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()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/jb;->yG()V
 
     const/4 v9, 0x0
 
     :try_start_0
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/d;->uZ()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/d;->uX()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->vu()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()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;->vq()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()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/jb;->yG()V
 
     const/4 v8, 0x0
 
     :try_start_0
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/d;->uZ()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/d;->uX()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;->xR()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xP()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;->xR()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xP()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;->xR()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xP()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->vu()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->vu()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()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;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yG()V
 
     const/4 v0, 0x0
 
     :try_start_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uZ()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uX()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()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;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->vu()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()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;->yI()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yG()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()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;->uZ()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uX()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;->pM()Lcom/google/android/gms/internal/measurement/ac$b$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ac$b;->pK()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;->tb()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/dw$b;->sZ()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()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;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->yI()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yG()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()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;->uZ()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uX()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;->pZ()Lcom/google/android/gms/internal/measurement/ac$e$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ac$e;->pX()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;->tb()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/dw$b;->sZ()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()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;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->vq()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()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/jb;->yG()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/d;->uZ()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/d;->uX()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()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;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->vq()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()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/jb;->yG()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;->uZ()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/d;->uX()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()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;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->anz:J
+    iput-wide v11, v9, Lcom/google/android/gms/measurement/internal/c;->anv:J
 
     const/4 v6, 0x2
 
@@ -3723,7 +3723,7 @@
 
     move-result-wide v11
 
-    iput-wide v11, v9, Lcom/google/android/gms/measurement/internal/c;->any:J
+    iput-wide v11, v9, Lcom/google/android/gms/measurement/internal/c;->anu:J
 
     const/4 v6, 0x3
 
@@ -3731,7 +3731,7 @@
 
     move-result-wide v11
 
-    iput-wide v11, v9, Lcom/google/android/gms/measurement/internal/c;->aBU:J
+    iput-wide v11, v9, Lcom/google/android/gms/measurement/internal/c;->aBQ: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;->anz:J
+    iget-wide v13, v9, Lcom/google/android/gms/measurement/internal/c;->anv:J
 
     add-long/2addr v13, v11
 
-    iput-wide v13, v9, Lcom/google/android/gms/measurement/internal/c;->anz:J
+    iput-wide v13, v9, Lcom/google/android/gms/measurement/internal/c;->anv:J
 
     :cond_3
     if-eqz p5, :cond_4
 
-    iget-wide v13, v9, Lcom/google/android/gms/measurement/internal/c;->any:J
+    iget-wide v13, v9, Lcom/google/android/gms/measurement/internal/c;->anu:J
 
     add-long/2addr v13, v11
 
-    iput-wide v13, v9, Lcom/google/android/gms/measurement/internal/c;->any:J
+    iput-wide v13, v9, Lcom/google/android/gms/measurement/internal/c;->anu:J
 
     :cond_4
     if-eqz p6, :cond_5
 
-    iget-wide v13, v9, Lcom/google/android/gms/measurement/internal/c;->aBU:J
+    iget-wide v13, v9, Lcom/google/android/gms/measurement/internal/c;->aBQ:J
 
     add-long/2addr v13, v11
 
-    iput-wide v13, v9, Lcom/google/android/gms/measurement/internal/c;->aBU:J
+    iput-wide v13, v9, Lcom/google/android/gms/measurement/internal/c;->aBQ: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;->any:J
+    iget-wide v11, v9, Lcom/google/android/gms/measurement/internal/c;->anu: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;->anz:J
+    iget-wide v11, v9, Lcom/google/android/gms/measurement/internal/c;->anv: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;->aBU:J
+    iget-wide v3, v9, Lcom/google/android/gms/measurement/internal/c;->aBQ: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yG()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;->qz()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->qx()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;->uf()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->ud()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;->ug()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->ue()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;->xX()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->xV()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;->sc()J
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->sa()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;->ui()J
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->ug()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;->uj()J
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->uh()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;->qZ()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->qX()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;->yt()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->yr()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;->un()J
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->ul()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;->rZ()J
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->rX()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;->ne()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->nc()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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/fb;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    iget-wide v2, p1, Lcom/google/android/gms/measurement/internal/fb;->aGu:J
+    iget-wide v2, p1, Lcom/google/android/gms/measurement/internal/fb;->aGq: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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/fb;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    iget-wide v2, p1, Lcom/google/android/gms/measurement/internal/fb;->aGv:J
+    iget-wide v2, p1, Lcom/google/android/gms/measurement/internal/fb;->aGr: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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/fb;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vo()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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/fb;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    iget-wide v2, p1, Lcom/google/android/gms/measurement/internal/fb;->aGi:J
+    iget-wide v2, p1, Lcom/google/android/gms/measurement/internal/fb;->aGe: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;->st()J
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->sr()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;->nn()J
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->nl()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;->ul()J
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->uj()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;->ys()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->yq()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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/fb;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    iget-wide v2, p1, Lcom/google/android/gms/measurement/internal/fb;->aFf:J
+    iget-wide v2, p1, Lcom/google/android/gms/measurement/internal/fb;->aFb: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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/fb;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    iget-wide v2, p1, Lcom/google/android/gms/measurement/internal/fb;->aGw:J
+    iget-wide v2, p1, Lcom/google/android/gms/measurement/internal/fb;->aGs: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;->xM()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->xK()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;->uw()J
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->uu()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;->xJ()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->xH()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;->yr()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->yp()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;->uD()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->uB()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;->uo()J
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->um()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;->yu()Ljava/util/List;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->ys()Ljava/util/List;
 
     move-result-object v2
 
     if-eqz v2, :cond_1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->yu()Ljava/util/List;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->ys()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->qz()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->qx()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;->yu()Ljava/util/List;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->ys()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;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v2
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->qz()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->qx()Ljava/lang/String;
 
     move-result-object v3
 
-    sget-object v4, Lcom/google/android/gms/measurement/internal/o;->aEf:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v4, Lcom/google/android/gms/measurement/internal/o;->aEb: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;->vo()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->vm()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;->uZ()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uX()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;->qz()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->qx()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->qz()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->qx()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEw:Lcom/google/android/gms/measurement/internal/dx;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->qz()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->qx()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;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yG()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;->atS:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/k;->atO: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;->ane:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/k;->ana: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;->aBU:J
+    iget-wide v1, p1, Lcom/google/android/gms/measurement/internal/k;->aBQ: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;->aCm:Ljava/lang/Long;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/k;->aCi: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;->aCn:Ljava/lang/Long;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/k;->aCj: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;->aCo:Ljava/lang/Long;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/k;->aCk: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;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v1
 
-    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/k;->atS:Ljava/lang/String;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/k;->atO:Ljava/lang/String;
 
-    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;->aDL: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;->azM:Ljava/lang/Boolean;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/k;->azI:Ljava/lang/Boolean;
 
     const/4 v2, 0x0
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/k;->azM:Ljava/lang/Boolean;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/k;->azI: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;->uZ()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uX()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->atS:Ljava/lang/String;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/k;->atO: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, 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/k;->atS:Ljava/lang/String;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/k;->atO: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;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yG()V
 
-    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/jn;->atS:Ljava/lang/String;
+    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/jn;->atO:Ljava/lang/String;
 
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/jn;->anq:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/jn;->anm: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;->anq:Ljava/lang/String;
+    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/jn;->anm: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;->atS:Ljava/lang/String;
+    iget-object v5, p1, Lcom/google/android/gms/measurement/internal/jn;->atO: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;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
-    iget-object v5, p1, Lcom/google/android/gms/measurement/internal/jn;->atS:Ljava/lang/String;
+    iget-object v5, p1, Lcom/google/android/gms/measurement/internal/jn;->atO:Ljava/lang/String;
 
-    sget-object v6, Lcom/google/android/gms/measurement/internal/o;->aDC:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v6, Lcom/google/android/gms/measurement/internal/o;->aDy: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;->anq:Ljava/lang/String;
+    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/jn;->anm: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;->atS:Ljava/lang/String;
+    iget-object v5, p1, Lcom/google/android/gms/measurement/internal/jn;->atO:Ljava/lang/String;
 
     aput-object v5, v0, v4
 
-    iget-object v5, p1, Lcom/google/android/gms/measurement/internal/jn;->ane:Ljava/lang/String;
+    iget-object v5, p1, Lcom/google/android/gms/measurement/internal/jn;->ana: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;->atS:Ljava/lang/String;
+    iget-object v5, p1, Lcom/google/android/gms/measurement/internal/jn;->atO:Ljava/lang/String;
 
     aput-object v5, v0, v4
 
-    iget-object v5, p1, Lcom/google/android/gms/measurement/internal/jn;->ane:Ljava/lang/String;
+    iget-object v5, p1, Lcom/google/android/gms/measurement/internal/jn;->ana: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;->atS:Ljava/lang/String;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/jn;->atO: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;->ane:Ljava/lang/String;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/jn;->ana: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;->anq:Ljava/lang/String;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/jn;->anm: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;->asA:Ljava/lang/Object;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/jn;->asw: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;->uZ()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uX()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->atS:Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/measurement/internal/jn;->atO: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()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;
+    iget-object v2, v2, 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/jn;->atS:Ljava/lang/String;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/jn;->atO: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;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yG()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;->atS:Ljava/lang/String;
+    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/l;->atO: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;->qw()Lcom/google/android/gms/internal/measurement/ak$c$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$c;->qu()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;->aCp:Lcom/google/android/gms/measurement/internal/zzam;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/l;->aCl: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;->qF()Lcom/google/android/gms/internal/measurement/ak$e$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$e;->qD()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;->aCp:Lcom/google/android/gms/measurement/internal/zzam;
+    iget-object v4, p1, Lcom/google/android/gms/measurement/internal/l;->aCl: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;->xR()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jd;->xP()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;->tb()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dw$b;->sZ()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;->rJ()[B
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cf;->rH()[B
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEE:Lcom/google/android/gms/measurement/internal/dx;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v2
 
-    iget-object v3, p1, Lcom/google/android/gms/measurement/internal/l;->ane:Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/measurement/internal/l;->ana: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;->atS:Ljava/lang/String;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/l;->atO: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;->ane:Ljava/lang/String;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/l;->ana: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;->aBU:J
+    iget-wide v2, p1, Lcom/google/android/gms/measurement/internal/l;->aBQ: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;->uZ()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uX()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p3
 
-    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->atS:Ljava/lang/String;
+    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/l;->atO: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p4
 
-    iget-object p4, p4, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p4, p4, 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/l;->atS:Ljava/lang/String;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/l;->atO: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;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yG()V
 
-    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzv;->atS:Ljava/lang/String;
+    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzv;->atO:Ljava/lang/String;
 
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIR:Lcom/google/android/gms/measurement/internal/zzkj;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/zzkj;->atO: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;->atS:Ljava/lang/String;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzv;->atO: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;->atS:Ljava/lang/String;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzv;->atO: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;->ane:Ljava/lang/String;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzv;->ana: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;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIR:Lcom/google/android/gms/measurement/internal/zzkj;
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/zzkj;->atO: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;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIR:Lcom/google/android/gms/measurement/internal/zzkj;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/zzkj;->rC()Ljava/lang/Object;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/zzkj;->rA()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;->vv()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Lcom/google/android/gms/measurement/internal/jm;
 
-    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIW:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIS: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;->vv()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Lcom/google/android/gms/measurement/internal/jm;
 
-    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIX:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIT: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;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIR:Lcom/google/android/gms/measurement/internal/zzkj;
 
-    iget-wide v2, v2, Lcom/google/android/gms/measurement/internal/zzkj;->anz:J
+    iget-wide v2, v2, Lcom/google/android/gms/measurement/internal/zzkj;->anv: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;->vv()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Lcom/google/android/gms/measurement/internal/jm;
 
-    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIY:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIU: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;->uZ()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uX()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->atS:Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/measurement/internal/zzv;->atO: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()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;
+    iget-object v2, v2, 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/zzv;->atS:Ljava/lang/String;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/zzv;->atO: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;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yG()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;->rJ()[B
+    invoke-virtual {p5}, Lcom/google/android/gms/internal/measurement/cf;->rH()[B
 
     move-result-object p5
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()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 v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEE:Lcom/google/android/gms/measurement/internal/dx;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()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;->uZ()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uX()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p3
 
-    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p4
 
-    iget-object p4, p4, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p4, p4, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yG()V
 
     const/4 v0, 0x0
 
     :try_start_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uZ()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uX()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yG()V
 
     const/4 v0, 0x0
 
     :try_start_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uZ()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uX()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->qw()Lcom/google/android/gms/internal/measurement/ak$c$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$c;->qu()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;->tb()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/dw$b;->sZ()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yG()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;->uZ()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uX()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;->xR()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jd;->xP()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;->qQ()Lcom/google/android/gms/internal/measurement/ak$g$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$g;->qO()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;->tb()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v9}, Lcom/google/android/gms/internal/measurement/dw$b;->sZ()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v7
 
-    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v7
 
-    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->vq()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()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/jb;->yG()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;->uZ()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/d;->uX()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->xR()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xP()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;->xR()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xP()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;->xR()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xP()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()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;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->yI()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yG()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()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;->uZ()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uX()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;->yI()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yG()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()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;->uZ()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uX()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;->yI()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yG()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()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;->pH()Z
+    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/ac$a;->pF()Z
 
     move-result v7
 
     if-nez v7, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v5
 
-    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->pH()Z
+    invoke-virtual {v10}, Lcom/google/android/gms/internal/measurement/ac$b;->pF()Z
 
     move-result v10
 
     if-nez v10, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v5
 
-    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->pH()Z
+    invoke-virtual {v10}, Lcom/google/android/gms/internal/measurement/ac$e;->pF()Z
 
     move-result v10
 
     if-nez v10, :cond_4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v5
 
-    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->yI()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yG()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()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;->uZ()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uX()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;->pH()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ac$a;->pF()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;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yG()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;->mS()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ak$g;->mQ()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;->vb()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uZ()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()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;->uj()J
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/ka;->uh()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;->uj()J
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/ka;->uh()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->rJ()[B
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cf;->rH()[B
 
     move-result-object v0
 
     const/4 v1, 0x0
 
     :try_start_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jd;->xR()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jd;->xP()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->qP()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ak$g;->qN()Z
 
     move-result p2
 
@@ -7108,7 +7108,7 @@
 
     :cond_2
     :try_start_1
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uZ()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uX()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->vq()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()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/jb;->yG()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;->uZ()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/d;->uX()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()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;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()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;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->vq()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()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/jb;->yG()V
 
     const/4 v2, 0x0
 
     :try_start_0
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/d;->uZ()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/d;->uX()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;->aGB:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v6, v5, Lcom/google/android/gms/measurement/internal/d;->aGx:Lcom/google/android/gms/measurement/internal/jf;
 
-    iget-object v6, v6, 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/jf;->aIm: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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, v4, Lcom/google/android/gms/measurement/internal/fb;->aBK: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;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    iget-boolean v0, v4, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
+    iget-boolean v0, v4, Lcom/google/android/gms/measurement/internal/fb;->aGu:Z
 
-    iget-wide v8, v4, Lcom/google/android/gms/measurement/internal/fb;->aGu:J
+    iget-wide v8, v4, Lcom/google/android/gms/measurement/internal/fb;->aGq: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;->aGy:Z
+    iput-boolean v0, v4, Lcom/google/android/gms/measurement/internal/fb;->aGu:Z
 
-    iput-wide v6, v4, Lcom/google/android/gms/measurement/internal/fb;->aGu:J
+    iput-wide v6, v4, Lcom/google/android/gms/measurement/internal/fb;->aGq:J
 
     const/16 v0, 0xc
 
@@ -7853,17 +7853,17 @@
 
     move-result-wide v6
 
-    iget-object v0, v4, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, v4, Lcom/google/android/gms/measurement/internal/fb;->aBK: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;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    iget-boolean v0, v4, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
+    iget-boolean v0, v4, Lcom/google/android/gms/measurement/internal/fb;->aGu:Z
 
-    iget-wide v8, v4, Lcom/google/android/gms/measurement/internal/fb;->aGv:J
+    iget-wide v8, v4, Lcom/google/android/gms/measurement/internal/fb;->aGr: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;->aGy:Z
+    iput-boolean v0, v4, Lcom/google/android/gms/measurement/internal/fb;->aGu:Z
 
-    iput-wide v6, v4, Lcom/google/android/gms/measurement/internal/fb;->aGv:J
+    iput-wide v6, v4, Lcom/google/android/gms/measurement/internal/fb;->aGr:J
 
     const/16 v0, 0xd
 
@@ -7889,15 +7889,15 @@
 
     move-result-wide v6
 
-    iget-object v0, v4, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, v4, Lcom/google/android/gms/measurement/internal/fb;->aBK: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;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    iget-boolean v0, v4, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
+    iget-boolean v0, v4, Lcom/google/android/gms/measurement/internal/fb;->aGu: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;->aGy:Z
+    iput-boolean v0, v4, Lcom/google/android/gms/measurement/internal/fb;->aGu: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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, v4, Lcom/google/android/gms/measurement/internal/fb;->aBK: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;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    iget-boolean v0, v4, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
+    iget-boolean v0, v4, Lcom/google/android/gms/measurement/internal/fb;->aGu:Z
 
-    iget-wide v8, v4, Lcom/google/android/gms/measurement/internal/fb;->aGi:J
+    iget-wide v8, v4, Lcom/google/android/gms/measurement/internal/fb;->aGe: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;->aGy:Z
+    iput-boolean v0, v4, Lcom/google/android/gms/measurement/internal/fb;->aGu:Z
 
-    iput-wide v6, v4, Lcom/google/android/gms/measurement/internal/fb;->aGi:J
+    iput-wide v6, v4, Lcom/google/android/gms/measurement/internal/fb;->aGe:J
 
     const/16 v0, 0xf
 
@@ -8007,17 +8007,17 @@
 
     move-result-wide v6
 
-    iget-object v0, v4, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, v4, Lcom/google/android/gms/measurement/internal/fb;->aBK: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;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    iget-boolean v0, v4, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
+    iget-boolean v0, v4, Lcom/google/android/gms/measurement/internal/fb;->aGu:Z
 
-    iget-wide v8, v4, Lcom/google/android/gms/measurement/internal/fb;->aFf:J
+    iget-wide v8, v4, Lcom/google/android/gms/measurement/internal/fb;->aFb: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;->aGy:Z
+    iput-boolean v0, v4, Lcom/google/android/gms/measurement/internal/fb;->aGu:Z
 
-    iput-wide v6, v4, Lcom/google/android/gms/measurement/internal/fb;->aFf:J
+    iput-wide v6, v4, Lcom/google/android/gms/measurement/internal/fb;->aFb:J
 
     const/16 v0, 0x14
 
@@ -8043,17 +8043,17 @@
 
     move-result-wide v6
 
-    iget-object v0, v4, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, v4, Lcom/google/android/gms/measurement/internal/fb;->aBK: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;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    iget-boolean v0, v4, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
+    iget-boolean v0, v4, Lcom/google/android/gms/measurement/internal/fb;->aGu:Z
 
-    iget-wide v8, v4, Lcom/google/android/gms/measurement/internal/fb;->aGw:J
+    iget-wide v8, v4, Lcom/google/android/gms/measurement/internal/fb;->aGs: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;->aGy:Z
+    iput-boolean v0, v4, Lcom/google/android/gms/measurement/internal/fb;->aGu:Z
 
-    iput-wide v6, v4, Lcom/google/android/gms/measurement/internal/fb;->aGw:J
+    iput-wide v6, v4, Lcom/google/android/gms/measurement/internal/fb;->aGs:J
 
     const/16 v0, 0x15
 
@@ -8209,15 +8209,15 @@
 
     move-result-object v0
 
-    iget-object v6, v4, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v6, v4, Lcom/google/android/gms/measurement/internal/fb;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v6
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    iget-object v6, v4, Lcom/google/android/gms/measurement/internal/fb;->aGt:Ljava/util/List;
+    iget-object v6, v4, Lcom/google/android/gms/measurement/internal/fb;->aGp: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;->aGy:Z
+    iput-boolean v12, v4, Lcom/google/android/gms/measurement/internal/fb;->aGu: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;->aGt:Ljava/util/List;
+    iput-object v6, v4, Lcom/google/android/gms/measurement/internal/fb;->aGp: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;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
-    sget-object v6, Lcom/google/android/gms/measurement/internal/o;->aEf:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v6, Lcom/google/android/gms/measurement/internal/o;->aEb: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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, v4, Lcom/google/android/gms/measurement/internal/fb;->aBK: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;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    iput-boolean v11, v4, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
+    iput-boolean v11, v4, Lcom/google/android/gms/measurement/internal/fb;->aGu: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()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;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yG()V
 
     :try_start_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uZ()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uX()Landroid/database/sqlite/SQLiteDatabase;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v1
 
-    sget-object v2, Lcom/google/android/gms/measurement/internal/o;->aCO:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v2, Lcom/google/android/gms/measurement/internal/o;->aCK: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yG()V
 
     const/4 v0, 0x0
 
     :try_start_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uZ()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uX()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->yI()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yG()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()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;->uZ()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uX()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->yI()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yG()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()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;->uZ()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uX()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;->rh()Lcom/google/android/gms/internal/measurement/ak$i$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$i;->rf()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;->tb()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/dw$b;->sZ()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()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;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()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;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->vq()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()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/jb;->yG()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;->uZ()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/d;->uX()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()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;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->yI()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yG()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()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;->uZ()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uX()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()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;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yG()V
 
     new-instance v0, Ljava/util/ArrayList;
 
@@ -9886,9 +9886,9 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yG()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;->rJ()[B
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cf;->rH()[B
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jd;->xR()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jd;->xP()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;->uZ()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uX()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yG()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;->ve()Z
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/d;->vc()Z
 
     move-result v0
 
@@ -10075,11 +10075,11 @@
 
     if-lez v4, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()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;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->uZ()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uX()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEw: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 mS()Z
+.method public final mQ()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 pR()Z
+.method protected final pP()Z
     .locals 1
 
     const/4 v0, 0x0
@@ -10176,7 +10176,7 @@
     return v0
 .end method
 
-.method public final sg()J
+.method public final se()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 tU()V
+.method public final tS()V
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yG()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uZ()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uX()Landroid/database/sqlite/SQLiteDatabase;
 
     move-result-object v0
 
@@ -10206,12 +10206,12 @@
     return-void
 .end method
 
-.method public final uX()V
+.method public final uV()V
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yG()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uZ()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uX()Landroid/database/sqlite/SQLiteDatabase;
 
     move-result-object v0
 
@@ -10220,12 +10220,12 @@
     return-void
 .end method
 
-.method public final uY()V
+.method public final uW()V
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yG()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uZ()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uX()Landroid/database/sqlite/SQLiteDatabase;
 
     move-result-object v0
 
@@ -10234,13 +10234,13 @@
     return-void
 .end method
 
-.method final uZ()Landroid/database/sqlite/SQLiteDatabase;
+.method final uX()Landroid/database/sqlite/SQLiteDatabase;
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/d;->aCc:Lcom/google/android/gms/measurement/internal/e;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/d;->aBY: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Error opening database"
 
@@ -10266,115 +10266,10 @@
     throw v0
 .end method
 
-.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
+.method public final uY()Ljava/lang/String;
     .locals 6
 
-    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;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uX()Landroid/database/sqlite/SQLiteDatabase;
 
     move-result-object v0
 
@@ -10444,11 +10339,11 @@
 
     :goto_0
     :try_start_2
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEw:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v4, "Database error getting next bundle app id"
 
@@ -10475,14 +10370,14 @@
     throw v1
 .end method
 
-.method final vb()V
+.method final uZ()V
     .locals 7
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yG()V
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/d;->ve()Z
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/d;->vc()Z
 
     move-result v0
 
@@ -10491,21 +10386,21 @@
     return-void
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()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/ei;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aEV:Lcom/google/android/gms/measurement/internal/ei;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ei;->ud()J
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ei;->ub()J
 
     move-result-wide v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()Lcom/google/android/gms/common/util/e;
 
     move-result-object v2
 
-    invoke-interface {v2}, Lcom/google/android/gms/common/util/e;->nr()J
+    invoke-interface {v2}, Lcom/google/android/gms/common/util/e;->np()J
 
     move-result-wide v2
 
@@ -10515,7 +10410,7 @@
 
     move-result-wide v0
 
-    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;->aCT:Lcom/google/android/gms/measurement/internal/do;
 
     const/4 v5, 0x0
 
@@ -10533,25 +10428,25 @@
 
     if-lez v6, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()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/ei;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aEV: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;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yG()V
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/d;->ve()Z
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/d;->vc()Z
 
     move-result v0
 
     if-eqz v0, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uZ()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uX()Landroid/database/sqlite/SQLiteDatabase;
 
     move-result-object v0
 
@@ -10561,7 +10456,7 @@
 
     const/4 v2, 0x0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()Lcom/google/android/gms/common/util/e;
 
     move-result-object v3
 
@@ -10577,7 +10472,7 @@
 
     const/4 v2, 0x1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/ka;->uj()J
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/ka;->uh()J
 
     move-result-wide v3
 
@@ -10597,11 +10492,11 @@
 
     if-lez v0, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEE:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -10615,7 +10510,112 @@
     return-void
 .end method
 
-.method public final vc()Z
+.method public final uo()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 uq()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;->uX()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;->vv()Lcom/google/android/gms/measurement/internal/dv;
+
+    move-result-object v4
+
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dv;->aEw: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
     .locals 5
 
     const-string v0, "select count(1) > 0 from raw_events"
@@ -10642,7 +10642,7 @@
     return v0
 .end method
 
-.method public final vd()Z
+.method public final vb()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 76bf26bdf1..cbf94d43d1 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/da;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()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;->vJ()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 ff60a99c3e..fad31f2457 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/db;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()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;->vH()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 db1b858f71..2f4482774d 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,76 +13,38 @@
 
     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;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/dc;->aGG:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget v0, p1, Lcom/google/android/gms/measurement/internal/ey;->aGm:I
+    iget v0, p1, Lcom/google/android/gms/measurement/internal/ey;->aGi:I
 
     add-int/lit8 v0, v0, 0x1
 
-    iput v0, p1, Lcom/google/android/gms/measurement/internal/ey;->aGm:I
+    iput v0, p1, Lcom/google/android/gms/measurement/internal/ey;->aGi:I
 
     return-void
 .end method
 
 
 # virtual methods
-.method protected abstract vd()Z
+.method protected abstract vb()Z
 .end method
 
-.method final xA()Z
-    .locals 1
-
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/dc;->zza:Z
-
-    if-eqz v0, :cond_0
-
-    const/4 v0, 0x1
-
-    return v0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    return v0
-.end method
-
-.method protected final xB()V
-    .locals 2
-
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xA()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    return-void
-
-    :cond_0
-    new-instance v0, Ljava/lang/IllegalStateException;
-
-    const-string v1, "Not initialized"
-
-    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public final xC()V
+.method public final xA()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;->vd()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->vb()Z
 
     move-result v0
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dc;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dc;->aGG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yq()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yo()V
 
     const/4 v0, 0x1
 
@@ -101,18 +63,18 @@
     throw v0
 .end method
 
-.method public final xD()V
+.method public final xB()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
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xC()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dc;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dc;->aGG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yq()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yo()V
 
     const/4 v0, 0x1
 
@@ -130,8 +92,46 @@
     throw v0
 .end method
 
-.method protected xE()V
+.method protected xC()V
     .locals 0
 
     return-void
 .end method
+
+.method final xy()Z
+    .locals 1
+
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/dc;->zza:Z
+
+    if-eqz v0, :cond_0
+
+    const/4 v0, 0x1
+
+    return v0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    return v0
+.end method
+
+.method protected final xz()V
+    .locals 2
+
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xy()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    return-void
+
+    :cond_0
+    new-instance v0, Ljava/lang/IllegalStateException;
+
+    const-string v1, "Not initialized"
+
+    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/dd.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dd.smali
index 740c532420..516c9a63ef 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/dd;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()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;->vI()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 4807e73758..614bdeb133 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/de;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->xi()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/df.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/df.smali
index e1fb22d60e..9a5cb85dd4 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/df;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()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;->vG()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 d57ecfbcec..1755e073b1 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/dg;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()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;->vE()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 283f0d14d9..58a38c55ea 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/dh;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()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;->vF()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 5d16ac45c5..b974ff634d 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/di;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()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;->vC()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 7813694350..b07999ff88 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/dj;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()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;->vD()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 6fb8798e63..b79851643b 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/dk;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()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;->vA()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 edd55c07d3..41dc4ecd56 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/dl;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()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;->vB()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 ba7d870ea7..f3411b3ade 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 rC()Ljava/lang/Object;
+.method public abstract rA()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 f393237ac6..0e0f53ee2e 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 asB:Ljava/lang/Object;
+.field private static final asx:Ljava/lang/Object;
 
 
 # instance fields
-.field private final aEs:Lcom/google/android/gms/measurement/internal/dm;
+.field private final aEo: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 asA:Ljava/lang/Object;
+.field private final asw:Ljava/lang/Object;
 
-.field private volatile asC:Ljava/lang/Object;
+.field private volatile asy:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TV;"
@@ -38,9 +38,9 @@
     .end annotation
 .end field
 
-.field final atS:Ljava/lang/String;
+.field final atO:Ljava/lang/String;
 
-.field private final atY:Ljava/lang/Object;
+.field private final atU: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;->asB:Ljava/lang/Object;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/do;->asx: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;->asA:Ljava/lang/Object;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/do;->asw:Ljava/lang/Object;
 
     const/4 v0, 0x0
 
-    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;->asy: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;->atS:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/do;->atO: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;->atY:Ljava/lang/Object;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/do;->atU:Ljava/lang/Object;
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/do;->aEs:Lcom/google/android/gms/measurement/internal/dm;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/do;->aEo: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;->asA:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/do;->asw:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/do;->asC:Ljava/lang/Object;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/do;->asy: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;->aCs:Lcom/google/android/gms/measurement/internal/jz;
+    sget-object p1, Lcom/google/android/gms/measurement/internal/o;->aCo: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;->aCs:Lcom/google/android/gms/measurement/internal/jz;
+    sget-object p1, Lcom/google/android/gms/measurement/internal/o;->aCo:Lcom/google/android/gms/measurement/internal/jz;
 
-    sget-object p1, Lcom/google/android/gms/measurement/internal/do;->asB:Ljava/lang/Object;
+    sget-object p1, Lcom/google/android/gms/measurement/internal/do;->asx:Ljava/lang/Object;
 
     monitor-enter p1
 
     :try_start_1
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/jz;->pH()Z
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/jz;->pF()Z
 
     move-result v0
 
@@ -188,18 +188,18 @@
     return-object v0
 
     :cond_3
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/jz;->pH()Z
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/jz;->pF()Z
 
     move-result v0
 
     if-nez v0, :cond_8
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/o;->aCs:Lcom/google/android/gms/measurement/internal/jz;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/o;->aCo: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;->xs()Ljava/util/List;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->xq()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;->asB:Ljava/lang/Object;
+    sget-object v2, Lcom/google/android/gms/measurement/internal/do;->asx: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;->pH()Z
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/jz;->pF()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;->aEs:Lcom/google/android/gms/measurement/internal/dm;
+    iget-object v4, v1, Lcom/google/android/gms/measurement/internal/do;->aEo:Lcom/google/android/gms/measurement/internal/dm;
 
     if-eqz v4, :cond_4
 
-    iget-object v4, v1, Lcom/google/android/gms/measurement/internal/do;->aEs:Lcom/google/android/gms/measurement/internal/dm;
+    iget-object v4, v1, Lcom/google/android/gms/measurement/internal/do;->aEo:Lcom/google/android/gms/measurement/internal/dm;
 
-    invoke-interface {v4}, Lcom/google/android/gms/measurement/internal/dm;->rC()Ljava/lang/Object;
+    invoke-interface {v4}, Lcom/google/android/gms/measurement/internal/dm;->rA()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;->aEs:Lcom/google/android/gms/measurement/internal/dm;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/do;->aEo:Lcom/google/android/gms/measurement/internal/dm;
 
     if-nez p1, :cond_7
 
-    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/o;->aCo: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;->rC()Ljava/lang/Object;
+    invoke-interface {p1}, Lcom/google/android/gms/measurement/internal/dm;->rA()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;->aCs:Lcom/google/android/gms/measurement/internal/jz;
+    sget-object p1, Lcom/google/android/gms/measurement/internal/o;->aCo: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;->aCs:Lcom/google/android/gms/measurement/internal/jz;
+    sget-object p1, Lcom/google/android/gms/measurement/internal/o;->aCo: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 755d9ba54a..b81d8435b8 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;->pF()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pD()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -84,7 +84,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pD()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -132,7 +132,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pD()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -183,7 +183,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pD()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -220,7 +220,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pD()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -247,7 +247,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pD()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -270,7 +270,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pD()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -295,7 +295,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pD()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -318,7 +318,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pD()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -339,7 +339,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pD()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -362,7 +362,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pD()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -393,7 +393,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pD()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -414,7 +414,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pD()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -435,7 +435,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pD()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -477,7 +477,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pD()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -512,7 +512,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pD()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 938c0b607e..b765c194b0 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 aEt:Lcom/google/android/gms/measurement/internal/du;
+.field private final aEp:Lcom/google/android/gms/measurement/internal/du;
 
-.field private atG:Z
+.field private atC: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;->vt()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()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;->aEt:Lcom/google/android/gms/measurement/internal/du;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/dr;->aEp:Lcom/google/android/gms/measurement/internal/du;
 
     return-void
 .end method
@@ -110,7 +110,7 @@
     throw p0
 .end method
 
-.method private final xI()Landroid/database/sqlite/SQLiteDatabase;
+.method private final xG()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;->atG:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/dr;->atC: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;->aEt:Lcom/google/android/gms/measurement/internal/du;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dr;->aEp: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;->atG:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/dr;->atC:Z
 
     return-object v1
 
@@ -145,10 +145,10 @@
     return-object v0
 .end method
 
-.method private final xJ()Z
+.method private final xH()Z
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()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;->vq()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    iget-boolean v0, v1, Lcom/google/android/gms/measurement/internal/dr;->atG:Z
+    iget-boolean v0, v1, Lcom/google/android/gms/measurement/internal/dr;->atC: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;->xI()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->xG()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;->atG:Z
+    iput-boolean v9, v1, Lcom/google/android/gms/measurement/internal/dr;->atC: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v5
 
-    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v5
 
-    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->atG:Z
+    iput-boolean v3, v1, Lcom/google/android/gms/measurement/internal/dr;->atC: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->atG:Z
+    iput-boolean v3, v1, Lcom/google/android/gms/measurement/internal/dr;->atC: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()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;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Failed to write entry to local database"
 
@@ -613,25 +613,15 @@
     return v2
 .end method
 
-.method public final bridge synthetic rA()V
+.method public final bridge synthetic ry()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->rA()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->ry()V
 
     return-void
 .end method
 
-.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
+.method protected final vb()Z
     .locals 1
 
     const/4 v0, 0x0
@@ -639,111 +629,121 @@
     return v0
 .end method
 
-.method public final bridge synthetic vq()V
+.method public final bridge synthetic vo()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vq()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vo()V
 
     return-void
 .end method
 
-.method public final bridge synthetic vr()Lcom/google/android/gms/measurement/internal/i;
+.method public final bridge synthetic vp()Lcom/google/android/gms/measurement/internal/i;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vr()Lcom/google/android/gms/measurement/internal/i;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vp()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vs()Lcom/google/android/gms/common/util/e;
+.method public final bridge synthetic vq()Lcom/google/android/gms/common/util/e;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vq()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vt()Landroid/content/Context;
+.method public final bridge synthetic vr()Landroid/content/Context;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vt()Landroid/content/Context;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vr()Landroid/content/Context;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vu()Lcom/google/android/gms/measurement/internal/dt;
+.method public final bridge synthetic vs()Lcom/google/android/gms/measurement/internal/dt;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vu()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vs()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vv()Lcom/google/android/gms/measurement/internal/jm;
+.method public final bridge synthetic vt()Lcom/google/android/gms/measurement/internal/jm;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vv()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vt()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vw()Lcom/google/android/gms/measurement/internal/ev;
+.method public final bridge synthetic vu()Lcom/google/android/gms/measurement/internal/ev;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vx()Lcom/google/android/gms/measurement/internal/dv;
+.method public final bridge synthetic vv()Lcom/google/android/gms/measurement/internal/dv;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vy()Lcom/google/android/gms/measurement/internal/eh;
+.method public final bridge synthetic vw()Lcom/google/android/gms/measurement/internal/eh;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vy()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vw()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vz()Lcom/google/android/gms/measurement/internal/ka;
+.method public final bridge synthetic vx()Lcom/google/android/gms/measurement/internal/ka;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final xF()V
+.method public final bridge synthetic vy()Lcom/google/android/gms/measurement/internal/jz;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vy()Lcom/google/android/gms/measurement/internal/jz;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final xD()V
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
     :try_start_0
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dr;->xI()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dr;->xG()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEw: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 xG()Ljava/util/List;
+.method public final xE()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;->vq()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    iget-boolean v0, v1, Lcom/google/android/gms/measurement/internal/dr;->atG:Z
+    iget-boolean v0, v1, Lcom/google/android/gms/measurement/internal/dr;->atC: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;->xJ()Z
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->xH()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;->xI()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->xG()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;->atG:Z
+    iput-boolean v9, v1, Lcom/google/android/gms/measurement/internal/dr;->atC: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;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
-    sget-object v10, Lcom/google/android/gms/measurement/internal/o;->aDY: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 {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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v12
 
-    iget-object v12, v12, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v12, v12, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v12
 
-    iget-object v12, v12, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v12, v12, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v12
 
-    iget-object v12, v12, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v12, v12, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v11
 
-    iget-object v11, v11, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v11, v11, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v11
 
-    iget-object v11, v11, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v11, v11, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v5
 
-    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->atG:Z
+    iput-boolean v9, v1, Lcom/google/android/gms/measurement/internal/dr;->atC: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v5
 
-    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->atG:Z
+    iput-boolean v9, v1, Lcom/google/android/gms/measurement/internal/dr;->atC: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()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;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEz: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 xH()Z
+.method public final xF()Z
     .locals 11
 
     const-string v0, "Error deleting app launch break from local database"
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    iget-boolean v1, p0, Lcom/google/android/gms/measurement/internal/dr;->atG:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/measurement/internal/dr;->atC:Z
 
     const/4 v2, 0x0
 
@@ -1666,7 +1666,7 @@
     return v2
 
     :cond_0
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dr;->xJ()Z
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dr;->xH()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;->xI()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dr;->xG()Landroid/database/sqlite/SQLiteDatabase;
 
     move-result-object v5
 
     if-nez v5, :cond_3
 
-    iput-boolean v6, p0, Lcom/google/android/gms/measurement/internal/dr;->atG:Z
+    iput-boolean v6, p0, Lcom/google/android/gms/measurement/internal/dr;->atC: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v8
 
-    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->atG:Z
+    iput-boolean v6, p0, Lcom/google/android/gms/measurement/internal/dr;->atC: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v8
 
-    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->atG:Z
+    iput-boolean v6, p0, Lcom/google/android/gms/measurement/internal/dr;->atC: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()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;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEz: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 xt()Lcom/google/android/gms/measurement/internal/z;
+.method public final bridge synthetic xr()Lcom/google/android/gms/measurement/internal/z;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xt()Lcom/google/android/gms/measurement/internal/z;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xr()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xu()Lcom/google/android/gms/measurement/internal/gf;
+.method public final bridge synthetic xs()Lcom/google/android/gms/measurement/internal/gf;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xu()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xs()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xv()Lcom/google/android/gms/measurement/internal/ds;
+.method public final bridge synthetic xt()Lcom/google/android/gms/measurement/internal/ds;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xv()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xt()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xw()Lcom/google/android/gms/measurement/internal/hm;
+.method public final bridge synthetic xu()Lcom/google/android/gms/measurement/internal/hm;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xw()Lcom/google/android/gms/measurement/internal/hm;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xu()Lcom/google/android/gms/measurement/internal/hm;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xx()Lcom/google/android/gms/measurement/internal/hh;
+.method public final bridge synthetic xv()Lcom/google/android/gms/measurement/internal/hh;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xx()Lcom/google/android/gms/measurement/internal/hh;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xv()Lcom/google/android/gms/measurement/internal/hh;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xy()Lcom/google/android/gms/measurement/internal/dr;
+.method public final bridge synthetic xw()Lcom/google/android/gms/measurement/internal/dr;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xy()Lcom/google/android/gms/measurement/internal/dr;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xw()Lcom/google/android/gms/measurement/internal/dr;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xz()Lcom/google/android/gms/measurement/internal/in;
+.method public final bridge synthetic xx()Lcom/google/android/gms/measurement/internal/in;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xz()Lcom/google/android/gms/measurement/internal/in;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xx()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 74b59abd01..88a6fe3574 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 aEu:Ljava/util/List;
+.field aEq:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -14,15 +14,15 @@
     .end annotation
 .end field
 
-.field private aEv:Ljava/lang/String;
+.field private aEr:Ljava/lang/String;
 
-.field private ane:Ljava/lang/String;
+.field private ana:Ljava/lang/String;
 
-.field private atS:Ljava/lang/String;
+.field private atO:Ljava/lang/String;
 
-.field private auq:I
+.field private aum:I
 
-.field private azN:Ljava/lang/String;
+.field private azJ:Ljava/lang/String;
 
 .field private zzc:I
 
@@ -50,16 +50,16 @@
     return-void
 .end method
 
-.method private final xK()Ljava/lang/String;
+.method private final xI()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;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/o;->aEi:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/o;->aEe: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()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 v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->vt()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()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;->vt()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEF:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEB: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEE: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 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;->vq()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
     new-instance v30, Lcom/google/android/gms/measurement/internal/zzm;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ds;->xL()Ljava/lang/String;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ds;->xJ()Ljava/lang/String;
 
     move-result-object v2
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ds;->xM()Ljava/lang/String;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ds;->xK()Ljava/lang/String;
 
     move-result-object v3
 
-    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/dc;->xz()V
 
-    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/ds;->ane:Ljava/lang/String;
+    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/ds;->ana:Ljava/lang/String;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ds;->xO()I
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ds;->xM()I
 
     move-result v1
 
     int-to-long v5, v1
 
-    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/dc;->xz()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;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
-    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/dc;->xz()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/fu;->vo()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;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ds;->aGG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->yb()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v1
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()Landroid/content/Context;
 
     move-result-object v8
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()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;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ds;->aGG: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;->ym()Z
 
     move-result v14
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v1
 
-    iget-boolean v1, v1, Lcom/google/android/gms/measurement/internal/eh;->aAs:Z
+    iget-boolean v1, v1, Lcom/google/android/gms/measurement/internal/eh;->aAo:Z
 
     const/4 v8, 0x1
 
     xor-int/lit8 v15, v1, 0x1
 
-    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/fu;->vo()V
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ds;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ds;->aGG: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;->ym()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;->xK()Ljava/lang/String;
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ds;->xI()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;->xB()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dc;->xz()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;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ds;->aGG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->xY()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v10
 
-    iget-object v10, v10, Lcom/google/android/gms/measurement/internal/eh;->aFb:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object v10, v10, Lcom/google/android/gms/measurement/internal/eh;->aEX:Lcom/google/android/gms/measurement/internal/ei;
 
-    invoke-virtual {v10}, Lcom/google/android/gms/measurement/internal/ei;->ud()J
+    invoke-virtual {v10}, Lcom/google/android/gms/measurement/internal/ei;->ub()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;->aGo:J
+    iget-wide v10, v1, Lcom/google/android/gms/measurement/internal/ey;->aGk: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;->aGo:J
+    iget-wide v8, v1, Lcom/google/android/gms/measurement/internal/ey;->aGk: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;->xP()I
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ds;->xN()I
 
     move-result v23
 
-    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/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ka;->uK()Ljava/lang/Boolean;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ka;->uI()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;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()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;->vy()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/eh;->xW()Landroid/content/SharedPreferences;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/eh;->xU()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;->xN()Ljava/lang/String;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ds;->xL()Ljava/lang/String;
 
     move-result-object v27
 
-    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/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v1
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ds;->xL()Ljava/lang/String;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ds;->xJ()Ljava/lang/String;
 
     move-result-object v8
 
-    sget-object v9, Lcom/google/android/gms/measurement/internal/o;->aDC:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v9, Lcom/google/android/gms/measurement/internal/o;->aDy: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;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()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;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v1
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ds;->xL()Ljava/lang/String;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ds;->xJ()Ljava/lang/String;
 
     move-result-object v8
 
-    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;->aDJ: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;->aEu:Ljava/util/List;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ds;->aEq: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;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v1
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ds;->xL()Ljava/lang/String;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ds;->xJ()Ljava/lang/String;
 
     move-result-object v8
 
-    sget-object v9, Lcom/google/android/gms/measurement/internal/o;->aEf: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 {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;->xB()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dc;->xz()V
 
     iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ds;->zzm:Ljava/lang/String;
 
@@ -574,25 +574,15 @@
     return-object v30
 .end method
 
-.method public final bridge synthetic rA()V
+.method public final bridge synthetic ry()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->rA()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->ry()V
 
     return-void
 .end method
 
-.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
+.method protected final vb()Z
     .locals 1
 
     const/4 v0, 0x1
@@ -600,108 +590,118 @@
     return v0
 .end method
 
-.method public final bridge synthetic vq()V
+.method public final bridge synthetic vo()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vq()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vo()V
 
     return-void
 .end method
 
-.method public final bridge synthetic vr()Lcom/google/android/gms/measurement/internal/i;
+.method public final bridge synthetic vp()Lcom/google/android/gms/measurement/internal/i;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vr()Lcom/google/android/gms/measurement/internal/i;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vp()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vs()Lcom/google/android/gms/common/util/e;
+.method public final bridge synthetic vq()Lcom/google/android/gms/common/util/e;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vq()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vt()Landroid/content/Context;
+.method public final bridge synthetic vr()Landroid/content/Context;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vt()Landroid/content/Context;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vr()Landroid/content/Context;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vu()Lcom/google/android/gms/measurement/internal/dt;
+.method public final bridge synthetic vs()Lcom/google/android/gms/measurement/internal/dt;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vu()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vs()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vv()Lcom/google/android/gms/measurement/internal/jm;
+.method public final bridge synthetic vt()Lcom/google/android/gms/measurement/internal/jm;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vv()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vt()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vw()Lcom/google/android/gms/measurement/internal/ev;
+.method public final bridge synthetic vu()Lcom/google/android/gms/measurement/internal/ev;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vx()Lcom/google/android/gms/measurement/internal/dv;
+.method public final bridge synthetic vv()Lcom/google/android/gms/measurement/internal/dv;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vy()Lcom/google/android/gms/measurement/internal/eh;
+.method public final bridge synthetic vw()Lcom/google/android/gms/measurement/internal/eh;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vy()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vw()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vz()Lcom/google/android/gms/measurement/internal/ka;
+.method public final bridge synthetic vx()Lcom/google/android/gms/measurement/internal/ka;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method protected final xE()V
+.method public final bridge synthetic vy()Lcom/google/android/gms/measurement/internal/jz;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vy()Lcom/google/android/gms/measurement/internal/jz;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method protected final xC()V
     .locals 13
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()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;->vt()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v7
 
-    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v7
 
-    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->vt()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v8
 
-    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->atS:Ljava/lang/String;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ds;->atO: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;->ane:Ljava/lang/String;
+    iput-object v2, p0, Lcom/google/android/gms/measurement/internal/ds;->ana: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;->vA()Lcom/google/android/gms/measurement/internal/jz;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/jz;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()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;->lQ()Z
+    invoke-virtual {v2}, Lcom/google/android/gms/common/api/Status;->lO()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;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v9, p0, Lcom/google/android/gms/measurement/internal/ds;->aGG:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v9, v9, Lcom/google/android/gms/measurement/internal/ey;->anq:Ljava/lang/String;
+    iget-object v9, v9, Lcom/google/android/gms/measurement/internal/ey;->anm: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;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v9, p0, Lcom/google/android/gms/measurement/internal/ds;->aGG: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()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;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v9
 
-    iget-object v9, v9, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v9, v9, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ka;->vK()Ljava/lang/Boolean;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ka;->vI()Ljava/lang/Boolean;
 
     move-result-object v2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v8
 
-    invoke-virtual {v8}, Lcom/google/android/gms/measurement/internal/ka;->rr()Z
+    invoke-virtual {v8}, Lcom/google/android/gms/measurement/internal/ka;->rp()Z
 
     move-result v8
 
     if-eqz v8, :cond_9
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ds;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ds;->aGG:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/ey;->anq:Ljava/lang/String;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/ey;->anm: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEG: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;
 
     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;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ds;->aGG:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/ey;->anq:Ljava/lang/String;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/ey;->anm: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEG: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;
 
     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;->mF()Z
+    invoke-static {}, Lcom/google/android/gms/common/api/internal/e;->mD()Z
 
     move-result v2
 
     if-eqz v2, :cond_b
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEG: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;
 
     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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->aEv:Ljava/lang/String;
+    iput-object v3, p0, Lcom/google/android/gms/measurement/internal/ds;->aEr: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;->azJ: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;->vA()Lcom/google/android/gms/measurement/internal/jz;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/jz;
 
-    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/ds;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/ds;->aGG:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/ey;->anq:Ljava/lang/String;
+    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/ey;->anm: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;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/ds;->aGG: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;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/ds;->aGG:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/ey;->anq:Ljava/lang/String;
+    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/ey;->anm:Ljava/lang/String;
 
-    iput-object v5, p0, Lcom/google/android/gms/measurement/internal/ds;->azN:Ljava/lang/String;
+    iput-object v5, p0, Lcom/google/android/gms/measurement/internal/ds;->azJ:Ljava/lang/String;
 
     :cond_d
     :try_start_3
-    invoke-static {}, Lcom/google/android/gms/common/api/internal/e;->mE()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/common/api/internal/e;->mC()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;->aEv:Ljava/lang/String;
+    iput-object v6, p0, Lcom/google/android/gms/measurement/internal/ds;->aEr:Ljava/lang/String;
 
     invoke-static {}, Lcom/google/android/gms/internal/measurement/js;->zzb()Z
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v6
 
-    sget-object v8, Lcom/google/android/gms/measurement/internal/o;->aEf:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v8, Lcom/google/android/gms/measurement/internal/o;->aEb: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;->vt()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()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;->azN:Ljava/lang/String;
+    iput-object v3, p0, Lcom/google/android/gms/measurement/internal/ds;->azJ: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;->vt()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()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;->azN:Ljava/lang/String;
+    iput-object v3, p0, Lcom/google/android/gms/measurement/internal/ds;->azJ:Ljava/lang/String;
 
     :cond_12
     :goto_c
     if-eqz v2, :cond_13
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->atS:Ljava/lang/String;
+    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/ds;->atO:Ljava/lang/String;
 
-    iget-object v6, p0, Lcom/google/android/gms/measurement/internal/ds;->aEv:Ljava/lang/String;
+    iget-object v6, p0, Lcom/google/android/gms/measurement/internal/ds;->aEr: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->aEu:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ds;->aEq:Ljava/util/List;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ds;->atS:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ds;->atO:Ljava/lang/String;
 
-    sget-object v3, Lcom/google/android/gms/measurement/internal/o;->aDN:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v3, Lcom/google/android/gms/measurement/internal/o;->aDJ: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;->vA()Lcom/google/android/gms/measurement/internal/jz;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/jz;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->vv()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()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;->aEu:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ds;->aEq: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;->vt()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()Landroid/content/Context;
 
     move-result-object v0
 
@@ -1392,135 +1392,135 @@
 
     move-result v0
 
-    iput v0, p0, Lcom/google/android/gms/measurement/internal/ds;->auq:I
+    iput v0, p0, Lcom/google/android/gms/measurement/internal/ds;->aum:I
 
     return-void
 
     :cond_18
-    iput v4, p0, Lcom/google/android/gms/measurement/internal/ds;->auq:I
+    iput v4, p0, Lcom/google/android/gms/measurement/internal/ds;->aum:I
 
     return-void
 
     :cond_19
-    iput v4, p0, Lcom/google/android/gms/measurement/internal/ds;->auq:I
+    iput v4, p0, Lcom/google/android/gms/measurement/internal/ds;->aum:I
 
     return-void
 .end method
 
+.method final xJ()Ljava/lang/String;
+    .locals 1
+
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xz()V
+
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ds;->atO:Ljava/lang/String;
+
+    return-object v0
+.end method
+
+.method final xK()Ljava/lang/String;
+    .locals 1
+
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xz()V
+
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ds;->aEr:Ljava/lang/String;
+
+    return-object v0
+.end method
+
 .method final xL()Ljava/lang/String;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xB()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xz()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ds;->atS:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ds;->azJ:Ljava/lang/String;
 
     return-object v0
 .end method
 
-.method final xM()Ljava/lang/String;
+.method final xM()I
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xB()V
-
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ds;->aEv:Ljava/lang/String;
-
-    return-object v0
-.end method
-
-.method final xN()Ljava/lang/String;
-    .locals 1
-
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xB()V
-
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ds;->azN:Ljava/lang/String;
-
-    return-object v0
-.end method
-
-.method final xO()I
-    .locals 1
-
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xB()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xz()V
 
     iget v0, p0, Lcom/google/android/gms/measurement/internal/ds;->zzc:I
 
     return v0
 .end method
 
-.method final xP()I
+.method final xN()I
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xB()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xz()V
 
-    iget v0, p0, Lcom/google/android/gms/measurement/internal/ds;->auq:I
+    iget v0, p0, Lcom/google/android/gms/measurement/internal/ds;->aum:I
 
     return v0
 .end method
 
-.method public final bridge synthetic xt()Lcom/google/android/gms/measurement/internal/z;
+.method public final bridge synthetic xr()Lcom/google/android/gms/measurement/internal/z;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xt()Lcom/google/android/gms/measurement/internal/z;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xr()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xu()Lcom/google/android/gms/measurement/internal/gf;
+.method public final bridge synthetic xs()Lcom/google/android/gms/measurement/internal/gf;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xu()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xs()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xv()Lcom/google/android/gms/measurement/internal/ds;
+.method public final bridge synthetic xt()Lcom/google/android/gms/measurement/internal/ds;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xv()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xt()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xw()Lcom/google/android/gms/measurement/internal/hm;
+.method public final bridge synthetic xu()Lcom/google/android/gms/measurement/internal/hm;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xw()Lcom/google/android/gms/measurement/internal/hm;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xu()Lcom/google/android/gms/measurement/internal/hm;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xx()Lcom/google/android/gms/measurement/internal/hh;
+.method public final bridge synthetic xv()Lcom/google/android/gms/measurement/internal/hh;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xx()Lcom/google/android/gms/measurement/internal/hh;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xv()Lcom/google/android/gms/measurement/internal/hh;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xy()Lcom/google/android/gms/measurement/internal/dr;
+.method public final bridge synthetic xw()Lcom/google/android/gms/measurement/internal/dr;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xy()Lcom/google/android/gms/measurement/internal/dr;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xw()Lcom/google/android/gms/measurement/internal/dr;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xz()Lcom/google/android/gms/measurement/internal/in;
+.method public final bridge synthetic xx()Lcom/google/android/gms/measurement/internal/in;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xz()Lcom/google/android/gms/measurement/internal/in;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xx()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 905eb20445..88278b0f5b 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 aEw:Ljava/util/concurrent/atomic/AtomicReference;
+.field private static final aEs: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 aEx:Ljava/util/concurrent/atomic/AtomicReference;
+.field private static final aEt: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 aze:Ljava/util/concurrent/atomic/AtomicReference;
+.field private static final aza: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;->aze:Ljava/util/concurrent/atomic/AtomicReference;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/dt;->aza: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;->aEw:Ljava/util/concurrent/atomic/AtomicReference;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/dt;->aEs: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;->aEx:Ljava/util/concurrent/atomic/AtomicReference;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/dt;->aEt: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;->uI()Z
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dt;->uG()Z
 
     move-result v0
 
@@ -222,7 +222,7 @@
     return-object p1
 
     :cond_1
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/zzam;->vB()Landroid/os/Bundle;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/zzam;->vz()Landroid/os/Bundle;
 
     move-result-object p1
 
@@ -233,14 +233,14 @@
     return-object p1
 .end method
 
-.method private final uI()Z
+.method private final uG()Z
     .locals 2
 
-    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;->vy()Lcom/google/android/gms/measurement/internal/jz;
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dt;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dt;->aGG:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ey;->anq:Ljava/lang/String;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ey;->anm: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;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dt;->aGG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vv()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;->uI()Z
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dt;->uG()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;->atS:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/l;->atO: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;->ane:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/l;->ana: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;->aCp:Lcom/google/android/gms/measurement/internal/zzam;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/l;->aCl: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;->uI()Z
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dt;->uG()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;->anq:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzan;->anm: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;->atS:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzan;->atO: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;->aCq:Lcom/google/android/gms/measurement/internal/zzam;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/zzan;->aCm: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;->uI()Z
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dt;->uG()Z
 
     move-result v0
 
@@ -462,11 +462,11 @@
     return-object p1
 
     :cond_2
-    sget-object v0, Lcom/google/android/gms/measurement/internal/ga;->aBV:[Ljava/lang/String;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/ga;->aBR:[Ljava/lang/String;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/ga;->aGL:[Ljava/lang/String;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/ga;->aGH:[Ljava/lang/String;
 
-    sget-object v2, Lcom/google/android/gms/measurement/internal/dt;->aEx:Ljava/util/concurrent/atomic/AtomicReference;
+    sget-object v2, Lcom/google/android/gms/measurement/internal/dt;->aEt: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;->uI()Z
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dt;->uG()Z
 
     move-result v0
 
@@ -494,11 +494,11 @@
     return-object p1
 
     :cond_1
-    sget-object v0, Lcom/google/android/gms/measurement/internal/fy;->aBV:[Ljava/lang/String;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/fy;->aBR:[Ljava/lang/String;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/fy;->aGL:[Ljava/lang/String;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/fy;->aGH:[Ljava/lang/String;
 
-    sget-object v2, Lcom/google/android/gms/measurement/internal/dt;->aze:Ljava/util/concurrent/atomic/AtomicReference;
+    sget-object v2, Lcom/google/android/gms/measurement/internal/dt;->aza: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;->uI()Z
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dt;->uG()Z
 
     move-result v0
 
@@ -613,7 +613,7 @@
     return-object p1
 
     :cond_0
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dt;->uI()Z
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dt;->uG()Z
 
     move-result v0
 
@@ -622,11 +622,11 @@
     return-object p1
 
     :cond_1
-    sget-object v0, Lcom/google/android/gms/measurement/internal/fx;->aBV:[Ljava/lang/String;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/fx;->aBR:[Ljava/lang/String;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/fx;->aGL:[Ljava/lang/String;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/fx;->aGH:[Ljava/lang/String;
 
-    sget-object v2, Lcom/google/android/gms/measurement/internal/dt;->aEw:Ljava/util/concurrent/atomic/AtomicReference;
+    sget-object v2, Lcom/google/android/gms/measurement/internal/dt;->aEs: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 pR()Z
+.method protected final pP()Z
     .locals 1
 
     const/4 v0, 0x0
@@ -643,116 +643,116 @@
     return v0
 .end method
 
-.method public final bridge synthetic rA()V
+.method public final bridge synthetic ry()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->rA()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->ry()V
 
     return-void
 .end method
 
-.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
+.method public final bridge synthetic vo()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vq()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vo()V
 
     return-void
 .end method
 
-.method public final bridge synthetic vr()Lcom/google/android/gms/measurement/internal/i;
+.method public final bridge synthetic vp()Lcom/google/android/gms/measurement/internal/i;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vr()Lcom/google/android/gms/measurement/internal/i;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vp()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vs()Lcom/google/android/gms/common/util/e;
+.method public final bridge synthetic vq()Lcom/google/android/gms/common/util/e;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vq()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vt()Landroid/content/Context;
+.method public final bridge synthetic vr()Landroid/content/Context;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vt()Landroid/content/Context;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vr()Landroid/content/Context;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vu()Lcom/google/android/gms/measurement/internal/dt;
+.method public final bridge synthetic vs()Lcom/google/android/gms/measurement/internal/dt;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vu()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vs()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vv()Lcom/google/android/gms/measurement/internal/jm;
+.method public final bridge synthetic vt()Lcom/google/android/gms/measurement/internal/jm;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vv()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vt()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vw()Lcom/google/android/gms/measurement/internal/ev;
+.method public final bridge synthetic vu()Lcom/google/android/gms/measurement/internal/ev;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vx()Lcom/google/android/gms/measurement/internal/dv;
+.method public final bridge synthetic vv()Lcom/google/android/gms/measurement/internal/dv;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vy()Lcom/google/android/gms/measurement/internal/eh;
+.method public final bridge synthetic vw()Lcom/google/android/gms/measurement/internal/eh;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vy()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vw()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vz()Lcom/google/android/gms/measurement/internal/ka;
+.method public final bridge synthetic vx()Lcom/google/android/gms/measurement/internal/ka;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vx()Lcom/google/android/gms/measurement/internal/ka;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic vy()Lcom/google/android/gms/measurement/internal/jz;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vy()Lcom/google/android/gms/measurement/internal/jz;
 
     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 978c73d1de..6217b42638 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 aEy:Lcom/google/android/gms/measurement/internal/dr;
+.field private final synthetic aEu: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;->aEy:Lcom/google/android/gms/measurement/internal/dr;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/du;->aEu: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;->aEy:Lcom/google/android/gms/measurement/internal/dr;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/du;->aEu:Lcom/google/android/gms/measurement/internal/dr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->aEy:Lcom/google/android/gms/measurement/internal/dr;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/du;->aEu:Lcom/google/android/gms/measurement/internal/dr;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vr()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;->aEy:Lcom/google/android/gms/measurement/internal/dr;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/du;->aEu:Lcom/google/android/gms/measurement/internal/dr;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->aEy:Lcom/google/android/gms/measurement/internal/dr;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/du;->aEu:Lcom/google/android/gms/measurement/internal/dr;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->aEy:Lcom/google/android/gms/measurement/internal/dr;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/du;->aEu:Lcom/google/android/gms/measurement/internal/dr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()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;->aEy:Lcom/google/android/gms/measurement/internal/dr;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/du;->aEu:Lcom/google/android/gms/measurement/internal/dr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()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 29337e7a5d..4a9ee28bc0 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 public final aEA:Lcom/google/android/gms/measurement/internal/dx;
+.field final aEA:Lcom/google/android/gms/measurement/internal/dx;
 
 .field final aEB:Lcom/google/android/gms/measurement/internal/dx;
 
 .field final aEC:Lcom/google/android/gms/measurement/internal/dx;
 
-.field public final aED:Lcom/google/android/gms/measurement/internal/dx;
+.field final aED:Lcom/google/android/gms/measurement/internal/dx;
 
-.field final aEE:Lcom/google/android/gms/measurement/internal/dx;
+.field public final aEE:Lcom/google/android/gms/measurement/internal/dx;
 
-.field final aEF:Lcom/google/android/gms/measurement/internal/dx;
+.field aEv:C
 
-.field final aEG:Lcom/google/android/gms/measurement/internal/dx;
+.field public final aEw:Lcom/google/android/gms/measurement/internal/dx;
 
-.field final aEH:Lcom/google/android/gms/measurement/internal/dx;
+.field final aEx:Lcom/google/android/gms/measurement/internal/dx;
 
-.field public final aEI:Lcom/google/android/gms/measurement/internal/dx;
+.field final aEy:Lcom/google/android/gms/measurement/internal/dx;
 
-.field aEz:C
+.field public final aEz:Lcom/google/android/gms/measurement/internal/dx;
 
-.field private anq:Ljava/lang/String;
+.field private anm:Ljava/lang/String;
 
-.field anz:J
+.field anv:J
 
 
 # direct methods
@@ -37,11 +37,11 @@
 
     const/4 p1, 0x0
 
-    iput-char p1, p0, Lcom/google/android/gms/measurement/internal/dv;->aEz:C
+    iput-char p1, p0, Lcom/google/android/gms/measurement/internal/dv;->aEv:C
 
     const-wide/16 v0, -0x1
 
-    iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/dv;->anz:J
+    iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/dv;->anv: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;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->aEB:Lcom/google/android/gms/measurement/internal/dx;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/dv;->aEx: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;->aEC:Lcom/google/android/gms/measurement/internal/dx;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/dv;->aEy: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;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->aEE: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;
 
     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;->aEF: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;
 
@@ -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;->aEG: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;
 
@@ -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;->aEH: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;
 
@@ -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;->aEI: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;
 
     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;->atS:Ljava/lang/String;
+    iget-object p0, p1, Lcom/google/android/gms/measurement/internal/ea;->atO:Ljava/lang/String;
 
     return-object p0
 
@@ -542,40 +542,40 @@
     return-object p0
 .end method
 
-.method private final xN()Ljava/lang/String;
+.method private final xL()Ljava/lang/String;
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dv;->anq:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dv;->anm:Ljava/lang/String;
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dv;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dv;->aGG: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;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dv;->aGG: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;->anq:Ljava/lang/String;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/dv;->anm:Ljava/lang/String;
 
     goto :goto_0
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/ka;->ug()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/ka;->ue()Ljava/lang/String;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/dv;->anq:Ljava/lang/String;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/dv;->anm:Ljava/lang/String;
 
     :cond_1
     :goto_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dv;->anq:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dv;->anm: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;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/dv;->aGG:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/ey;->aFS:Lcom/google/android/gms/measurement/internal/ev;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/ey;->aFO: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;->vd()Z
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ft;->vb()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;->xN()Ljava/lang/String;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dv;->xL()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;->xN()Ljava/lang/String;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dv;->xL()Ljava/lang/String;
 
     move-result-object v0
 
@@ -716,7 +716,7 @@
     return-void
 .end method
 
-.method protected final pR()Z
+.method protected final pP()Z
     .locals 1
 
     const/4 v0, 0x0
@@ -724,140 +724,140 @@
     return v0
 .end method
 
-.method public final bridge synthetic rA()V
+.method public final bridge synthetic ry()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->rA()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->ry()V
 
     return-void
 .end method
 
-.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
+.method public final bridge synthetic vo()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vq()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vo()V
 
     return-void
 .end method
 
-.method public final bridge synthetic vr()Lcom/google/android/gms/measurement/internal/i;
+.method public final bridge synthetic vp()Lcom/google/android/gms/measurement/internal/i;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vr()Lcom/google/android/gms/measurement/internal/i;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vp()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vs()Lcom/google/android/gms/common/util/e;
+.method public final bridge synthetic vq()Lcom/google/android/gms/common/util/e;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vq()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vt()Landroid/content/Context;
+.method public final bridge synthetic vr()Landroid/content/Context;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vt()Landroid/content/Context;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vr()Landroid/content/Context;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vu()Lcom/google/android/gms/measurement/internal/dt;
+.method public final bridge synthetic vs()Lcom/google/android/gms/measurement/internal/dt;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vu()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vs()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vv()Lcom/google/android/gms/measurement/internal/jm;
+.method public final bridge synthetic vt()Lcom/google/android/gms/measurement/internal/jm;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vv()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vt()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vw()Lcom/google/android/gms/measurement/internal/ev;
+.method public final bridge synthetic vu()Lcom/google/android/gms/measurement/internal/ev;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vx()Lcom/google/android/gms/measurement/internal/dv;
+.method public final bridge synthetic vv()Lcom/google/android/gms/measurement/internal/dv;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vy()Lcom/google/android/gms/measurement/internal/eh;
+.method public final bridge synthetic vw()Lcom/google/android/gms/measurement/internal/eh;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vy()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vw()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vz()Lcom/google/android/gms/measurement/internal/ka;
+.method public final bridge synthetic vx()Lcom/google/android/gms/measurement/internal/ka;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final xQ()Ljava/lang/String;
+.method public final bridge synthetic vy()Lcom/google/android/gms/measurement/internal/jz;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vy()Lcom/google/android/gms/measurement/internal/jz;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final xO()Ljava/lang/String;
     .locals 10
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aEV:Lcom/google/android/gms/measurement/internal/el;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aER:Lcom/google/android/gms/measurement/internal/el;
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/el;->aFs:Lcom/google/android/gms/measurement/internal/eh;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/el;->aFo:Lcom/google/android/gms/measurement/internal/eh;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/el;->aFs:Lcom/google/android/gms/measurement/internal/eh;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/el;->aFo:Lcom/google/android/gms/measurement/internal/eh;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/el;->uC()J
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/el;->uA()J
 
     move-result-wide v1
 
@@ -867,16 +867,16 @@
 
     if-nez v5, :cond_0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/el;->pG()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/el;->pE()V
 
     move-wide v1, v3
 
     goto :goto_0
 
     :cond_0
-    iget-object v5, v0, Lcom/google/android/gms/measurement/internal/el;->aFs:Lcom/google/android/gms/measurement/internal/eh;
+    iget-object v5, v0, Lcom/google/android/gms/measurement/internal/el;->aFo:Lcom/google/android/gms/measurement/internal/eh;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/fu;->vq()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;->pG()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/el;->pE()V
 
     goto :goto_1
 
     :cond_2
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/el;->aFs:Lcom/google/android/gms/measurement/internal/eh;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/el;->aFo: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;->anq:Ljava/lang/String;
+    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/el;->anm: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;->aFs:Lcom/google/android/gms/measurement/internal/eh;
+    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/el;->aFo: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;->ane:Ljava/lang/String;
+    iget-object v5, v0, Lcom/google/android/gms/measurement/internal/el;->ana: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;->pG()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/el;->pE()V
 
     if-eqz v1, :cond_4
 
@@ -967,12 +967,12 @@
 
     :cond_4
     :goto_2
-    sget-object v0, Lcom/google/android/gms/measurement/internal/eh;->aET:Landroid/util/Pair;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/eh;->aEP:Landroid/util/Pair;
 
     :goto_3
     if-eqz v0, :cond_6
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/eh;->aET:Landroid/util/Pair;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/eh;->aEP: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 a4391d0a91..874e01d1bc 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 mb()I
+.method public final lZ()I
     .locals 1
 
     const v0, 0xbdfcb8
@@ -64,7 +64,7 @@
     return v0
 .end method
 
-.method public final md()Ljava/lang/String;
+.method public final mb()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 me()Ljava/lang/String;
+.method public final mc()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 a8dd5e9ae3..db329d397c 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 aEJ:Lcom/google/android/gms/measurement/internal/dv;
+.field private final synthetic aEF:Lcom/google/android/gms/measurement/internal/dv;
 
-.field private final asH:Z
+.field private final asD:Z
 
-.field private final atG:Z
+.field private final atC: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;->aEJ:Lcom/google/android/gms/measurement/internal/dv;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/dx;->aEF: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;->atG:Z
+    iput-boolean p3, p0, Lcom/google/android/gms/measurement/internal/dx;->atC:Z
 
-    iput-boolean p4, p0, Lcom/google/android/gms/measurement/internal/dx;->asH:Z
+    iput-boolean p4, p0, Lcom/google/android/gms/measurement/internal/dx;->asD: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;->aEJ:Lcom/google/android/gms/measurement/internal/dv;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dx;->aEF: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;->atG:Z
+    iget-boolean v2, p0, Lcom/google/android/gms/measurement/internal/dx;->atC:Z
 
-    iget-boolean v3, p0, Lcom/google/android/gms/measurement/internal/dx;->asH:Z
+    iget-boolean v3, p0, Lcom/google/android/gms/measurement/internal/dx;->asD: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;->aEJ:Lcom/google/android/gms/measurement/internal/dv;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dx;->aEF: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;->atG:Z
+    iget-boolean v2, p0, Lcom/google/android/gms/measurement/internal/dx;->atC:Z
 
-    iget-boolean v3, p0, Lcom/google/android/gms/measurement/internal/dx;->asH:Z
+    iget-boolean v3, p0, Lcom/google/android/gms/measurement/internal/dx;->asD: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;->aEJ:Lcom/google/android/gms/measurement/internal/dv;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dx;->aEF: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;->atG:Z
+    iget-boolean v2, p0, Lcom/google/android/gms/measurement/internal/dx;->atC:Z
 
-    iget-boolean v3, p0, Lcom/google/android/gms/measurement/internal/dx;->asH:Z
+    iget-boolean v3, p0, Lcom/google/android/gms/measurement/internal/dx;->asD: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;->aEJ:Lcom/google/android/gms/measurement/internal/dv;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dx;->aEF: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;->atG:Z
+    iget-boolean v2, p0, Lcom/google/android/gms/measurement/internal/dx;->atC:Z
 
-    iget-boolean v3, p0, Lcom/google/android/gms/measurement/internal/dx;->asH:Z
+    iget-boolean v3, p0, Lcom/google/android/gms/measurement/internal/dx;->asD: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 2500dc5590..320324ea72 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 aEK:Lcom/google/android/gms/measurement/internal/dv;
+.field private final synthetic aEG:Lcom/google/android/gms/measurement/internal/dv;
 
-.field private final synthetic ane:Ljava/lang/String;
+.field private final synthetic ana:Ljava/lang/String;
 
-.field private final synthetic asA:Ljava/lang/Object;
+.field private final synthetic asw:Ljava/lang/Object;
 
-.field private final synthetic atY:Ljava/lang/Object;
+.field private final synthetic atU: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;->aEK:Lcom/google/android/gms/measurement/internal/dv;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/dy;->aEG: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;->ane:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/dy;->ana: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;->atY:Ljava/lang/Object;
+    iput-object p5, p0, Lcom/google/android/gms/measurement/internal/dy;->atU:Ljava/lang/Object;
 
-    iput-object p6, p0, Lcom/google/android/gms/measurement/internal/dy;->asA:Ljava/lang/Object;
+    iput-object p6, p0, Lcom/google/android/gms/measurement/internal/dy;->asw: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;->aEK:Lcom/google/android/gms/measurement/internal/dv;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dy;->aEG:Lcom/google/android/gms/measurement/internal/dv;
 
-    iget-object v0, v0, 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/dv;->aGG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->xY()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ft;->vd()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ft;->vb()Z
 
     move-result v1
 
     if-nez v1, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dy;->aEK:Lcom/google/android/gms/measurement/internal/dv;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dy;->aEG: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;->aEK:Lcom/google/android/gms/measurement/internal/dv;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dy;->aEG:Lcom/google/android/gms/measurement/internal/dv;
 
-    iget-char v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEz:C
+    iget-char v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEv:C
 
     if-nez v1, :cond_2
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dy;->aEK:Lcom/google/android/gms/measurement/internal/dv;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dy;->aEG:Lcom/google/android/gms/measurement/internal/dv;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ka;->uI()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ka;->uG()Z
 
     move-result v1
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dy;->aEK:Lcom/google/android/gms/measurement/internal/dv;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dy;->aEG:Lcom/google/android/gms/measurement/internal/dv;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vA()Lcom/google/android/gms/measurement/internal/jz;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/jz;
 
     const/16 v2, 0x43
 
-    iput-char v2, v1, Lcom/google/android/gms/measurement/internal/dv;->aEz:C
+    iput-char v2, v1, Lcom/google/android/gms/measurement/internal/dv;->aEv:C
 
     goto :goto_0
 
     :cond_1
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dy;->aEK:Lcom/google/android/gms/measurement/internal/dv;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dy;->aEG:Lcom/google/android/gms/measurement/internal/dv;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vA()Lcom/google/android/gms/measurement/internal/jz;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/jz;
 
     const/16 v2, 0x63
 
-    iput-char v2, v1, Lcom/google/android/gms/measurement/internal/dv;->aEz:C
+    iput-char v2, v1, Lcom/google/android/gms/measurement/internal/dv;->aEv:C
 
     :cond_2
     :goto_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dy;->aEK:Lcom/google/android/gms/measurement/internal/dv;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dy;->aEG:Lcom/google/android/gms/measurement/internal/dv;
 
-    iget-wide v1, v1, Lcom/google/android/gms/measurement/internal/dv;->anz:J
+    iget-wide v1, v1, Lcom/google/android/gms/measurement/internal/dv;->anv: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;->aEK:Lcom/google/android/gms/measurement/internal/dv;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dy;->aEG:Lcom/google/android/gms/measurement/internal/dv;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     const-wide/16 v5, 0x471a
 
-    iput-wide v5, v1, Lcom/google/android/gms/measurement/internal/dv;->anz:J
+    iput-wide v5, v1, Lcom/google/android/gms/measurement/internal/dv;->anv: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;->aEK:Lcom/google/android/gms/measurement/internal/dv;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/dy;->aEG:Lcom/google/android/gms/measurement/internal/dv;
 
-    iget-char v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEz:C
+    iget-char v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEv:C
 
-    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/dy;->aEK:Lcom/google/android/gms/measurement/internal/dv;
+    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/dy;->aEG:Lcom/google/android/gms/measurement/internal/dv;
 
-    iget-wide v5, v5, Lcom/google/android/gms/measurement/internal/dv;->anz:J
+    iget-wide v5, v5, Lcom/google/android/gms/measurement/internal/dv;->anv:J
 
-    iget-object v7, p0, Lcom/google/android/gms/measurement/internal/dy;->ane:Ljava/lang/String;
+    iget-object v7, p0, Lcom/google/android/gms/measurement/internal/dy;->ana: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;->atY:Ljava/lang/Object;
+    iget-object v9, p0, Lcom/google/android/gms/measurement/internal/dy;->atU:Ljava/lang/Object;
 
-    iget-object v10, p0, Lcom/google/android/gms/measurement/internal/dy;->asA:Ljava/lang/Object;
+    iget-object v10, p0, Lcom/google/android/gms/measurement/internal/dy;->asw: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;->ane:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dy;->ana: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;->aEV:Lcom/google/android/gms/measurement/internal/el;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aER:Lcom/google/android/gms/measurement/internal/el;
 
-    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/el;->aFs:Lcom/google/android/gms/measurement/internal/eh;
+    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/el;->aFo:Lcom/google/android/gms/measurement/internal/eh;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/el;->uC()J
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/el;->uA()J
 
     move-result-wide v6
 
@@ -224,7 +224,7 @@
 
     if-nez v2, :cond_5
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/el;->pG()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/el;->pE()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;->aFs:Lcom/google/android/gms/measurement/internal/eh;
+    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/el;->aFo: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;->ane:Ljava/lang/String;
+    iget-object v6, v0, Lcom/google/android/gms/measurement/internal/el;->ana: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;->aFs:Lcom/google/android/gms/measurement/internal/eh;
+    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/el;->aFo: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;->anq:Ljava/lang/String;
+    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/el;->anm: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;->ane:Ljava/lang/String;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/el;->ana: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;->aFs:Lcom/google/android/gms/measurement/internal/eh;
+    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/el;->aFo:Lcom/google/android/gms/measurement/internal/eh;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vt()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/jm;->yS()Ljava/security/SecureRandom;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/jm;->yQ()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;->aFs:Lcom/google/android/gms/measurement/internal/eh;
+    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/el;->aFo: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;->anq:Ljava/lang/String;
+    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/el;->anm: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;->ane:Ljava/lang/String;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/el;->ana: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 bbbbbd119b..1a6707c80f 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 aEL:Ljavax/net/ssl/SSLSocketFactory;
+.field final aEH: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;->aEL:Ljavax/net/ssl/SSLSocketFactory;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/dz;->aEH:Ljavax/net/ssl/SSLSocketFactory;
 
     return-void
 .end method
@@ -103,7 +103,7 @@
 
 
 # virtual methods
-.method protected final pR()Z
+.method protected final pP()Z
     .locals 1
 
     const/4 v0, 0x0
@@ -111,12 +111,12 @@
     return v0
 .end method
 
-.method public final qE()Z
+.method public final qC()Z
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yG()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()Landroid/content/Context;
 
     move-result-object v0
 
@@ -159,156 +159,156 @@
     return v0
 .end method
 
-.method public final bridge synthetic rA()V
+.method public final bridge synthetic ry()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->rA()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->ry()V
 
     return-void
 .end method
 
-.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
+.method public final bridge synthetic vo()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vq()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vo()V
 
     return-void
 .end method
 
-.method public final bridge synthetic vr()Lcom/google/android/gms/measurement/internal/i;
+.method public final bridge synthetic vp()Lcom/google/android/gms/measurement/internal/i;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vr()Lcom/google/android/gms/measurement/internal/i;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vp()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vs()Lcom/google/android/gms/common/util/e;
+.method public final bridge synthetic vq()Lcom/google/android/gms/common/util/e;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vq()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vt()Landroid/content/Context;
+.method public final bridge synthetic vr()Landroid/content/Context;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vt()Landroid/content/Context;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vr()Landroid/content/Context;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vu()Lcom/google/android/gms/measurement/internal/dt;
+.method public final bridge synthetic vs()Lcom/google/android/gms/measurement/internal/dt;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vu()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vs()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vv()Lcom/google/android/gms/measurement/internal/jm;
+.method public final bridge synthetic vt()Lcom/google/android/gms/measurement/internal/jm;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vv()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vt()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vw()Lcom/google/android/gms/measurement/internal/ev;
+.method public final bridge synthetic vu()Lcom/google/android/gms/measurement/internal/ev;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vx()Lcom/google/android/gms/measurement/internal/dv;
+.method public final bridge synthetic vv()Lcom/google/android/gms/measurement/internal/dv;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vy()Lcom/google/android/gms/measurement/internal/eh;
+.method public final bridge synthetic vw()Lcom/google/android/gms/measurement/internal/eh;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vy()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vw()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vz()Lcom/google/android/gms/measurement/internal/ka;
+.method public final bridge synthetic vx()Lcom/google/android/gms/measurement/internal/ka;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xR()Lcom/google/android/gms/measurement/internal/jj;
+.method public final bridge synthetic vy()Lcom/google/android/gms/measurement/internal/jz;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->xR()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vy()Lcom/google/android/gms/measurement/internal/jz;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xS()Lcom/google/android/gms/measurement/internal/jr;
+.method public final bridge synthetic xP()Lcom/google/android/gms/measurement/internal/jj;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->xS()Lcom/google/android/gms/measurement/internal/jr;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->xP()Lcom/google/android/gms/measurement/internal/jj;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xT()Lcom/google/android/gms/measurement/internal/d;
+.method public final bridge synthetic xQ()Lcom/google/android/gms/measurement/internal/jr;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->xT()Lcom/google/android/gms/measurement/internal/d;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->xQ()Lcom/google/android/gms/measurement/internal/jr;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xU()Lcom/google/android/gms/measurement/internal/es;
+.method public final bridge synthetic xR()Lcom/google/android/gms/measurement/internal/d;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->xU()Lcom/google/android/gms/measurement/internal/es;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->xR()Lcom/google/android/gms/measurement/internal/d;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic xS()Lcom/google/android/gms/measurement/internal/es;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->xS()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 cf60c92a8f..c2e10dd137 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 aCe:Lcom/google/android/gms/measurement/internal/d;
+.field private final synthetic aCa: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;->aCe:Lcom/google/android/gms/measurement/internal/d;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/e;->aCa: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;->aCe:Lcom/google/android/gms/measurement/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/e;->aCa: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;->anz:J
+    iget-wide v1, v0, Lcom/google/android/gms/measurement/internal/ix;->anv: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;->azH:Lcom/google/android/gms/common/util/e;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ix;->azD:Lcom/google/android/gms/common/util/e;
 
-    invoke-interface {v1}, Lcom/google/android/gms/common/util/e;->nr()J
+    invoke-interface {v1}, Lcom/google/android/gms/common/util/e;->np()J
 
     move-result-wide v1
 
-    iget-wide v6, v0, Lcom/google/android/gms/measurement/internal/ix;->anz:J
+    iget-wide v6, v0, Lcom/google/android/gms/measurement/internal/ix;->anv: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;->aCe:Lcom/google/android/gms/measurement/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/e;->aCa: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;->aCe:Lcom/google/android/gms/measurement/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/e;->aCa:Lcom/google/android/gms/measurement/internal/d;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->aCe:Lcom/google/android/gms/measurement/internal/d;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/e;->aCa:Lcom/google/android/gms/measurement/internal/d;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vr()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;->aCe:Lcom/google/android/gms/measurement/internal/d;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/e;->aCa:Lcom/google/android/gms/measurement/internal/d;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->aCe:Lcom/google/android/gms/measurement/internal/d;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/e;->aCa: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;->anz:J
+    iput-wide v4, v1, Lcom/google/android/gms/measurement/internal/ix;->anv: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;->aCe:Lcom/google/android/gms/measurement/internal/d;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/e;->aCa:Lcom/google/android/gms/measurement/internal/d;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->aCe:Lcom/google/android/gms/measurement/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/e;->aCa:Lcom/google/android/gms/measurement/internal/d;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()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;->aCe:Lcom/google/android/gms/measurement/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/e;->aCa:Lcom/google/android/gms/measurement/internal/d;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()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;->vd()[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;->aCe:Lcom/google/android/gms/measurement/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/e;->aCa:Lcom/google/android/gms/measurement/internal/d;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()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;->aCe:Lcom/google/android/gms/measurement/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/e;->aCa:Lcom/google/android/gms/measurement/internal/d;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()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;->ve()[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;->aCe:Lcom/google/android/gms/measurement/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/e;->aCa:Lcom/google/android/gms/measurement/internal/d;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()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;->vf()[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;->aCe:Lcom/google/android/gms/measurement/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/e;->aCa:Lcom/google/android/gms/measurement/internal/d;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()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;->vg()[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;->aCe:Lcom/google/android/gms/measurement/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/e;->aCa:Lcom/google/android/gms/measurement/internal/d;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()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;->aCe:Lcom/google/android/gms/measurement/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/e;->aCa:Lcom/google/android/gms/measurement/internal/d;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()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;->vh()[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;->aCe:Lcom/google/android/gms/measurement/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/e;->aCa:Lcom/google/android/gms/measurement/internal/d;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/d;->vk()[Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/d;->vi()[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;->aCe:Lcom/google/android/gms/measurement/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/e;->aCa:Lcom/google/android/gms/measurement/internal/d;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/d;->vl()[Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/d;->vj()[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;->aCe:Lcom/google/android/gms/measurement/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/e;->aCa:Lcom/google/android/gms/measurement/internal/d;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()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;->aCe:Lcom/google/android/gms/measurement/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/e;->aCa:Lcom/google/android/gms/measurement/internal/d;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/d;->vm()[Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/d;->vk()[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;->aCe:Lcom/google/android/gms/measurement/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/e;->aCa:Lcom/google/android/gms/measurement/internal/d;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()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 a4e6bed763..19d3903ad4 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 atS:Ljava/lang/String;
+.field final atO: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;->atS:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ea;->atO: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 05a20df466..d345ae7b1f 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 rA()V
+.method public ry()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ec;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ec;->aGG: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;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->rA()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->ry()V
 
     return-void
 .end method
 
-.method public vq()V
+.method public vo()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ec;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ec;->aGG: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;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
     return-void
 .end method
 
-.method public xt()Lcom/google/android/gms/measurement/internal/z;
+.method public xr()Lcom/google/android/gms/measurement/internal/z;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ec;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ec;->aGG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yl()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yj()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public xu()Lcom/google/android/gms/measurement/internal/gf;
+.method public xs()Lcom/google/android/gms/measurement/internal/gf;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ec;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ec;->aGG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public xv()Lcom/google/android/gms/measurement/internal/ds;
+.method public xt()Lcom/google/android/gms/measurement/internal/ds;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ec;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ec;->aGG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yk()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yi()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public xw()Lcom/google/android/gms/measurement/internal/hm;
+.method public xu()Lcom/google/android/gms/measurement/internal/hm;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ec;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ec;->aGG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yi()Lcom/google/android/gms/measurement/internal/hm;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yg()Lcom/google/android/gms/measurement/internal/hm;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public xx()Lcom/google/android/gms/measurement/internal/hh;
+.method public xv()Lcom/google/android/gms/measurement/internal/hh;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ec;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ec;->aGG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yh()Lcom/google/android/gms/measurement/internal/hh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yf()Lcom/google/android/gms/measurement/internal/hh;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public xy()Lcom/google/android/gms/measurement/internal/dr;
+.method public xw()Lcom/google/android/gms/measurement/internal/dr;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ec;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ec;->aGG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yf()Lcom/google/android/gms/measurement/internal/dr;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/dr;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public xz()Lcom/google/android/gms/measurement/internal/in;
+.method public xx()Lcom/google/android/gms/measurement/internal/in;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ec;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ec;->aGG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yb()Lcom/google/android/gms/measurement/internal/in;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->xZ()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;->yp()V
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/ey;->yn()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 c0ed4bcd79..5ad28e0961 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 aEM:Ljava/net/URL;
+.field private final aEI:Ljava/net/URL;
 
-.field private final aEN:Lcom/google/android/gms/measurement/internal/eb;
+.field private final aEJ:Lcom/google/android/gms/measurement/internal/eb;
 
-.field private final synthetic aEO:Lcom/google/android/gms/measurement/internal/dz;
+.field private final synthetic aEK:Lcom/google/android/gms/measurement/internal/dz;
 
-.field private final atZ:Ljava/util/Map;
+.field private final atV: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;->aEO:Lcom/google/android/gms/measurement/internal/dz;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ed;->aEK: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;->aEM:Ljava/net/URL;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/ed;->aEI: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;->aEN:Lcom/google/android/gms/measurement/internal/eb;
+    iput-object p6, p0, Lcom/google/android/gms/measurement/internal/ed;->aEJ: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;->atZ:Ljava/util/Map;
+    iput-object p5, p0, Lcom/google/android/gms/measurement/internal/ed;->atV: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;->aEO:Lcom/google/android/gms/measurement/internal/dz;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ed;->aEK:Lcom/google/android/gms/measurement/internal/dz;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->rA()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->ry()V
 
     const/4 v1, 0x0
 
     const/4 v2, 0x0
 
     :try_start_0
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ed;->aEO:Lcom/google/android/gms/measurement/internal/dz;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ed;->aEK:Lcom/google/android/gms/measurement/internal/dz;
 
-    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/ed;->aEM:Ljava/net/URL;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/ed;->aEI: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;->aEL:Ljavax/net/ssl/SSLSocketFactory;
+    iget-object v5, v3, Lcom/google/android/gms/measurement/internal/dz;->aEH: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;->aEL:Ljavax/net/ssl/SSLSocketFactory;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dz;->aEH: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;->atZ:Ljava/util/Map;
+    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/ed;->atV:Ljava/util/Map;
 
     if-eqz v5, :cond_1
 
-    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/ed;->atZ:Ljava/util/Map;
+    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/ed;->atV: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;->aEO:Lcom/google/android/gms/measurement/internal/dz;
+    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/ed;->aEK:Lcom/google/android/gms/measurement/internal/dz;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/jd;->xR()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/jd;->xP()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;->aEO:Lcom/google/android/gms/measurement/internal/dz;
+    iget-object v6, p0, Lcom/google/android/gms/measurement/internal/ed;->aEK:Lcom/google/android/gms/measurement/internal/dz;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v6
 
-    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->aEO:Lcom/google/android/gms/measurement/internal/dz;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->aEK:Lcom/google/android/gms/measurement/internal/dz;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vu()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;->aEN:Lcom/google/android/gms/measurement/internal/eb;
+    iget-object v7, p0, Lcom/google/android/gms/measurement/internal/ed;->aEJ: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;->aEO:Lcom/google/android/gms/measurement/internal/dz;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ed;->aEK:Lcom/google/android/gms/measurement/internal/dz;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vv()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;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->aEO:Lcom/google/android/gms/measurement/internal/dz;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->aEK:Lcom/google/android/gms/measurement/internal/dz;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vu()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;->aEN:Lcom/google/android/gms/measurement/internal/eb;
+    iget-object v7, p0, Lcom/google/android/gms/measurement/internal/ed;->aEJ: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;->aEO:Lcom/google/android/gms/measurement/internal/dz;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ed;->aEK:Lcom/google/android/gms/measurement/internal/dz;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vv()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;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->aEO:Lcom/google/android/gms/measurement/internal/dz;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->aEK:Lcom/google/android/gms/measurement/internal/dz;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vu()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;->aEN:Lcom/google/android/gms/measurement/internal/eb;
+    iget-object v6, p0, Lcom/google/android/gms/measurement/internal/ed;->aEJ: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 1fc545334d..86a80a3928 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 aEP:Lcom/google/android/gms/measurement/internal/eb;
+.field private final aEL:Lcom/google/android/gms/measurement/internal/eb;
 
-.field private final aEQ:Ljava/lang/Throwable;
+.field private final aEM:Ljava/lang/Throwable;
 
-.field private final anu:I
+.field private final anq:I
 
-.field private final atC:Ljava/util/Map;
+.field private final aty:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -25,7 +25,7 @@
     .end annotation
 .end field
 
-.field private final aup:[B
+.field private final aul:[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;->aEP:Lcom/google/android/gms/measurement/internal/eb;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ee;->aEL:Lcom/google/android/gms/measurement/internal/eb;
 
-    iput p3, p0, Lcom/google/android/gms/measurement/internal/ee;->anu:I
+    iput p3, p0, Lcom/google/android/gms/measurement/internal/ee;->anq:I
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/ee;->aEQ:Ljava/lang/Throwable;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/ee;->aEM:Ljava/lang/Throwable;
 
-    iput-object p5, p0, Lcom/google/android/gms/measurement/internal/ee;->aup:[B
+    iput-object p5, p0, Lcom/google/android/gms/measurement/internal/ee;->aul:[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;->atC:Ljava/util/Map;
+    iput-object p6, p0, Lcom/google/android/gms/measurement/internal/ee;->aty: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;->aEP:Lcom/google/android/gms/measurement/internal/eb;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ee;->aEL: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;->anu:I
+    iget v2, p0, Lcom/google/android/gms/measurement/internal/ee;->anq:I
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ee;->aEQ:Ljava/lang/Throwable;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ee;->aEM:Ljava/lang/Throwable;
 
-    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/ee;->aup:[B
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/ee;->aul:[B
 
-    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/ee;->atC:Ljava/util/Map;
+    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/ee;->aty: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 83409c663d..28218f95e0 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 aER:Lcom/google/android/gms/measurement/internal/eg;
+.field private final synthetic aEN: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;->aER:Lcom/google/android/gms/measurement/internal/eg;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ef;->aEN: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;->aER:Lcom/google/android/gms/measurement/internal/eg;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ef;->aEN: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;->sj()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->sh()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 a5136834cd..1f347cfc2e 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 atS:Ljava/lang/String;
+.field private static final atO:Ljava/lang/String;
 
 
 # instance fields
-.field private final aES:Lcom/google/android/gms/measurement/internal/jf;
+.field private final aEO:Lcom/google/android/gms/measurement/internal/jf;
 
-.field private asH:Z
+.field private asD:Z
 
-.field private axe:Z
+.field private axa:Z
 
 
 # direct methods
@@ -25,7 +25,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/eg;->atS:Ljava/lang/String;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/eg;->atO: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;->aES:Lcom/google/android/gms/measurement/internal/jf;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/eg;->aEO: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;->aES:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object p0, p0, Lcom/google/android/gms/measurement/internal/eg;->aEO: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;->aES:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/eg;->aEO:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/jf;->yF()V
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/jf;->yD()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;->aES:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/eg;->aEO:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/jf;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/jf;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->aES:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/eg;->aEO:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/jf;->yK()Lcom/google/android/gms/measurement/internal/dz;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/dz;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/dz;->qE()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/dz;->qC()Z
 
     move-result p1
 
-    iget-boolean p2, p0, Lcom/google/android/gms/measurement/internal/eg;->axe:Z
+    iget-boolean p2, p0, Lcom/google/android/gms/measurement/internal/eg;->axa:Z
 
     if-eq p2, p1, :cond_0
 
-    iput-boolean p1, p0, Lcom/google/android/gms/measurement/internal/eg;->axe:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/measurement/internal/eg;->axa:Z
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/eg;->aES:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/eg;->aEO:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/jf;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/jf;->vu()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;->aES:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/eg;->aEO:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/jf;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/jf;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEz: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 pG()V
+.method public final pE()V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eg;->aES:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eg;->aEO:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->yF()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->yD()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eg;->aES:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eg;->aEO:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eg;->aES:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eg;->aEO:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/eg;->asH:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/eg;->asD:Z
 
     if-nez v0, :cond_0
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eg;->aES:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eg;->aEO:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vv()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 v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->asH:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/eg;->asD:Z
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/eg;->axe:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/eg;->axa:Z
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eg;->aES:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eg;->aEO:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vt()Landroid/content/Context;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vr()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;->aES:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/eg;->aEO:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/jf;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/jf;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->aES:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eg;->aEO:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->yF()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->yD()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eg;->aES:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eg;->aEO:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/eg;->asH:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/eg;->asD:Z
 
     if-eqz v0, :cond_0
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eg;->aES:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eg;->aEO:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vt()Landroid/content/Context;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vr()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;->aES:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eg;->aEO:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->yK()Lcom/google/android/gms/measurement/internal/dz;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/dz;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dz;->qE()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dz;->qC()Z
 
     move-result v0
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/eg;->axe:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/eg;->axa:Z
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eg;->aES:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eg;->aEO:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vv()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 v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEE:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-boolean v1, p0, Lcom/google/android/gms/measurement/internal/eg;->axe:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/measurement/internal/eg;->axa: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;->asH:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/eg;->asD: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 7369fccc21..ec4df9033f 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 aET:Landroid/util/Pair;
+.field static final aEP:Landroid/util/Pair;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Landroid/util/Pair<",
@@ -17,11 +17,19 @@
 
 
 # instance fields
-.field public aAs:Z
+.field public aAo:Z
 
-.field aEU:Landroid/content/SharedPreferences;
+.field aEQ:Landroid/content/SharedPreferences;
 
-.field public aEV:Lcom/google/android/gms/measurement/internal/el;
+.field public aER:Lcom/google/android/gms/measurement/internal/el;
+
+.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/ei;
+
+.field public final aEV:Lcom/google/android/gms/measurement/internal/ei;
 
 .field public final aEW:Lcom/google/android/gms/measurement/internal/ei;
 
@@ -29,45 +37,37 @@
 
 .field public final aEY:Lcom/google/android/gms/measurement/internal/ei;
 
-.field public final aEZ:Lcom/google/android/gms/measurement/internal/ei;
+.field public final aEZ:Lcom/google/android/gms/measurement/internal/ek;
 
-.field public final aFa:Lcom/google/android/gms/measurement/internal/ei;
+.field private aFa:Ljava/lang/String;
 
-.field public final aFb:Lcom/google/android/gms/measurement/internal/ei;
+.field private aFb:J
 
 .field public final aFc:Lcom/google/android/gms/measurement/internal/ei;
 
-.field public final aFd:Lcom/google/android/gms/measurement/internal/ek;
+.field public final aFd:Lcom/google/android/gms/measurement/internal/ei;
 
-.field private aFe:Ljava/lang/String;
+.field public final aFe:Lcom/google/android/gms/measurement/internal/ej;
 
-.field private aFf:J
+.field public final aFf:Lcom/google/android/gms/measurement/internal/ek;
 
-.field public final aFg:Lcom/google/android/gms/measurement/internal/ei;
+.field public final aFg:Lcom/google/android/gms/measurement/internal/ej;
 
-.field public final aFh:Lcom/google/android/gms/measurement/internal/ei;
+.field public final aFh:Lcom/google/android/gms/measurement/internal/ej;
 
-.field public final aFi:Lcom/google/android/gms/measurement/internal/ej;
+.field public final aFi:Lcom/google/android/gms/measurement/internal/ei;
 
-.field public final aFj:Lcom/google/android/gms/measurement/internal/ek;
+.field public final aFj:Lcom/google/android/gms/measurement/internal/ei;
 
-.field public final aFk:Lcom/google/android/gms/measurement/internal/ej;
+.field public aFk:Lcom/google/android/gms/measurement/internal/ej;
 
-.field public final aFl:Lcom/google/android/gms/measurement/internal/ej;
+.field public aFl:Lcom/google/android/gms/measurement/internal/ej;
 
-.field public final aFm:Lcom/google/android/gms/measurement/internal/ei;
+.field public aFm:Lcom/google/android/gms/measurement/internal/ei;
 
-.field public final aFn:Lcom/google/android/gms/measurement/internal/ei;
+.field public final aFn:Lcom/google/android/gms/measurement/internal/ek;
 
-.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
+.field private amA: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;->aET:Landroid/util/Pair;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/eh;->aEP: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;->aEW:Lcom/google/android/gms/measurement/internal/ei;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/eh;->aES: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;->aEX:Lcom/google/android/gms/measurement/internal/ei;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/eh;->aET: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;->aEY:Lcom/google/android/gms/measurement/internal/ei;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/eh;->aEU: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;->aEZ:Lcom/google/android/gms/measurement/internal/ei;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/eh;->aEV: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;->aFg: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/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;->aFh:Lcom/google/android/gms/measurement/internal/ei;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/eh;->aFd: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;->aFi:Lcom/google/android/gms/measurement/internal/ej;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/eh;->aFe: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;->aFm:Lcom/google/android/gms/measurement/internal/ei;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/eh;->aFi: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;->aFn:Lcom/google/android/gms/measurement/internal/ei;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/eh;->aFj: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;->aFj:Lcom/google/android/gms/measurement/internal/ek;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/eh;->aFf: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;->aFk:Lcom/google/android/gms/measurement/internal/ej;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/eh;->aFg: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;->aFl:Lcom/google/android/gms/measurement/internal/ej;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/eh;->aFh: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;->aFa: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;
 
@@ -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;->aFb: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;
 
@@ -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;->aFc: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/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;->aFd:Lcom/google/android/gms/measurement/internal/ek;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/eh;->aEZ: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;->aFo: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;
 
@@ -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;->aFp: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;
 
@@ -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;->aFq: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/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;->aFr:Lcom/google/android/gms/measurement/internal/ek;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/eh;->aFn: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;->xW()Landroid/content/SharedPreferences;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/eh;->xU()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;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()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 v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->xW()Landroid/content/SharedPreferences;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/eh;->xU()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;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/eh;->xW()Landroid/content/SharedPreferences;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/eh;->xU()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;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()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 v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->xW()Landroid/content/SharedPreferences;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/eh;->xU()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;->aFh:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eh;->aFd:Lcom/google/android/gms/measurement/internal/ei;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ei;->ud()J
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ei;->ub()J
 
     move-result-wide v0
 
     sub-long/2addr p1, v0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eh;->aFm:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eh;->aFi:Lcom/google/android/gms/measurement/internal/ei;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ei;->ud()J
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ei;->ub()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;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()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;->yT()Ljava/security/MessageDigest;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/jm;->yR()Ljava/security/MessageDigest;
 
     move-result-object v0
 
@@ -473,21 +473,21 @@
 
     const-string v0, ""
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()Lcom/google/android/gms/common/util/e;
 
     move-result-object v1
 
-    invoke-interface {v1}, Lcom/google/android/gms/common/util/e;->nr()J
+    invoke-interface {v1}, Lcom/google/android/gms/common/util/e;->np()J
 
     move-result-wide v1
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/eh;->aFe:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/eh;->aFa:Ljava/lang/String;
 
     if-eqz v3, :cond_0
 
-    iget-wide v4, p0, Lcom/google/android/gms/measurement/internal/eh;->aFf:J
+    iget-wide v4, p0, Lcom/google/android/gms/measurement/internal/eh;->aFb: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;->amE:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/eh;->amA: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;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v3
 
-    sget-object v4, Lcom/google/android/gms/measurement/internal/o;->aCA:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v4, Lcom/google/android/gms/measurement/internal/o;->aCw: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;->aFf:J
+    iput-wide v1, p0, Lcom/google/android/gms/measurement/internal/eh;->aFb: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;->vt()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()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;->aFe:Ljava/lang/String;
+    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/eh;->aFa: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;->amE:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/measurement/internal/eh;->amA:Z
 
     :cond_1
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/eh;->aFe:Ljava/lang/String;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/eh;->aFa:Ljava/lang/String;
 
     if-nez p1, :cond_2
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/eh;->aFe:Ljava/lang/String;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/eh;->aFa: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEH: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, "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;->aFe:Ljava/lang/String;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/eh;->aFa: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;->aFe:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eh;->aFa:Ljava/lang/String;
 
-    iget-boolean v1, p0, Lcom/google/android/gms/measurement/internal/eh;->amE:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/measurement/internal/eh;->amA: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;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/eh;->xW()Landroid/content/SharedPreferences;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/eh;->xU()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;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/eh;->xW()Landroid/content/SharedPreferences;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/eh;->xU()Landroid/content/SharedPreferences;
 
     move-result-object v0
 
@@ -638,12 +638,12 @@
     return-void
 .end method
 
-.method protected final no()Ljava/lang/String;
+.method protected final nm()Ljava/lang/String;
     .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/eh;->xW()Landroid/content/SharedPreferences;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/eh;->xU()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;->vr()Lcom/google/android/gms/measurement/internal/i;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vp()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ft;->xE()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ft;->xC()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;->xW()Landroid/content/SharedPreferences;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/eh;->xU()Landroid/content/SharedPreferences;
 
     move-result-object v3
 
@@ -691,7 +691,7 @@
     return-object v0
 .end method
 
-.method protected final pR()Z
+.method protected final pP()Z
     .locals 1
 
     const/4 v0, 0x1
@@ -699,12 +699,12 @@
     return v0
 .end method
 
-.method final vK()Ljava/lang/Boolean;
+.method final vI()Ljava/lang/Boolean;
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/eh;->xW()Landroid/content/SharedPreferences;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/eh;->xU()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;->xW()Landroid/content/SharedPreferences;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/eh;->xU()Landroid/content/SharedPreferences;
 
     move-result-object v0
 
@@ -738,12 +738,12 @@
     return-object v0
 .end method
 
-.method final vL()Ljava/lang/Boolean;
+.method final vJ()Ljava/lang/Boolean;
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/eh;->xW()Landroid/content/SharedPreferences;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/eh;->xU()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;->xW()Landroid/content/SharedPreferences;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/eh;->xU()Landroid/content/SharedPreferences;
 
     move-result-object v0
 
@@ -777,12 +777,12 @@
     return-object v0
 .end method
 
-.method final vo()Ljava/lang/String;
+.method final vm()Ljava/lang/String;
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/eh;->xW()Landroid/content/SharedPreferences;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/eh;->xU()Landroid/content/SharedPreferences;
 
     move-result-object v0
 
@@ -797,10 +797,10 @@
     return-object v0
 .end method
 
-.method protected final xV()V
+.method protected final xT()V
     .locals 9
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()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;->aEU:Landroid/content/SharedPreferences;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/eh;->aEQ:Landroid/content/SharedPreferences;
 
-    iget-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;->aEQ: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;->aAs:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/eh;->aAo:Z
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/eh;->aAs:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/eh;->aAo:Z
 
     if-nez v0, :cond_0
 
-    iget-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;->aEQ: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;->aCB:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v3, Lcom/google/android/gms/measurement/internal/o;->aCx: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;->aEV:Lcom/google/android/gms/measurement/internal/el;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/eh;->aER:Lcom/google/android/gms/measurement/internal/el;
 
     return-void
 .end method
 
-.method final xW()Landroid/content/SharedPreferences;
+.method final xU()Landroid/content/SharedPreferences;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ft;->xE()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ft;->xC()V
 
-    iget-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;->aEQ:Landroid/content/SharedPreferences;
 
     return-object v0
 .end method
 
-.method final xX()Ljava/lang/String;
+.method final xV()Ljava/lang/String;
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/eh;->xW()Landroid/content/SharedPreferences;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/eh;->xU()Landroid/content/SharedPreferences;
 
     move-result-object v0
 
@@ -910,26 +910,26 @@
     return-object v0
 .end method
 
-.method final xY()V
+.method final xW()V
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()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 v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/o;->aDE:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/o;->aDA: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;->vL()Ljava/lang/Boolean;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/eh;->vJ()Ljava/lang/Boolean;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/eh;->xW()Landroid/content/SharedPreferences;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/eh;->xU()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;->xW()Landroid/content/SharedPreferences;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/eh;->xU()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;->xW()Landroid/content/SharedPreferences;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/eh;->xU()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;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()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 v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->xW()Landroid/content/SharedPreferences;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/eh;->xU()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 3f8ff5e7b9..c065c50541 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 aFs:Lcom/google/android/gms/measurement/internal/eh;
+.field private final synthetic aFo:Lcom/google/android/gms/measurement/internal/eh;
 
-.field private final anz:J
+.field private final anv:J
 
-.field private asH:Z
+.field private asD:Z
 
-.field private final atS:Ljava/lang/String;
+.field private final atO: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;->aFs:Lcom/google/android/gms/measurement/internal/eh;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ei;->aFo: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;->atS:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ei;->atO:Ljava/lang/String;
 
-    iput-wide p3, p0, Lcom/google/android/gms/measurement/internal/ei;->anz:J
+    iput-wide p3, p0, Lcom/google/android/gms/measurement/internal/ei;->anv: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;->aFs:Lcom/google/android/gms/measurement/internal/eh;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ei;->aFo: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;->atS:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ei;->atO: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 ud()J
+.method public final ub()J
     .locals 4
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ei;->asH:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ei;->asD:Z
 
     if-nez v0, :cond_0
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ei;->asH:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ei;->asD:Z
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ei;->aFs:Lcom/google/android/gms/measurement/internal/eh;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ei;->aFo: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;->atS:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ei;->atO:Ljava/lang/String;
 
-    iget-wide v2, p0, Lcom/google/android/gms/measurement/internal/ei;->anz:J
+    iget-wide v2, p0, Lcom/google/android/gms/measurement/internal/ei;->anv: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 f673cde5ff..736157add0 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 aFs:Lcom/google/android/gms/measurement/internal/eh;
+.field private final synthetic aFo:Lcom/google/android/gms/measurement/internal/eh;
 
-.field private asH:Z
+.field private asD:Z
 
-.field private final atG:Z
+.field private final atC:Z
 
-.field private final atS:Ljava/lang/String;
+.field private final atO:Ljava/lang/String;
 
-.field private axe:Z
+.field private axa: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;->aFs:Lcom/google/android/gms/measurement/internal/eh;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ej;->aFo: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;->atS:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ej;->atO:Ljava/lang/String;
 
-    iput-boolean p3, p0, Lcom/google/android/gms/measurement/internal/ej;->atG:Z
+    iput-boolean p3, p0, Lcom/google/android/gms/measurement/internal/ej;->atC:Z
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final pH()Z
+.method public final pF()Z
     .locals 3
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ej;->asH:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ej;->asD:Z
 
     if-nez v0, :cond_0
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ej;->asH:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ej;->asD:Z
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ej;->aFs:Lcom/google/android/gms/measurement/internal/eh;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ej;->aFo: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;->atS:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ej;->atO:Ljava/lang/String;
 
-    iget-boolean v2, p0, Lcom/google/android/gms/measurement/internal/ej;->atG:Z
+    iget-boolean v2, p0, Lcom/google/android/gms/measurement/internal/ej;->atC: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;->axe:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ej;->axa:Z
 
     :cond_0
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ej;->axe:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ej;->axa: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;->aFs:Lcom/google/android/gms/measurement/internal/eh;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ej;->aFo: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;->atS:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ej;->atO: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;->axe:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/measurement/internal/ej;->axa: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 7225bebf6d..d4549b9b5a 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 aFs:Lcom/google/android/gms/measurement/internal/eh;
+.field private final synthetic aFo:Lcom/google/android/gms/measurement/internal/eh;
 
-.field private final ane:Ljava/lang/String;
+.field private final ana:Ljava/lang/String;
 
-.field private asH:Z
+.field private asD:Z
 
-.field private final atS:Ljava/lang/String;
+.field private final atO: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;->aFs:Lcom/google/android/gms/measurement/internal/eh;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ek;->aFo: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;->atS:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ek;->atO:Ljava/lang/String;
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ek;->ane:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ek;->ana: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;->aFs:Lcom/google/android/gms/measurement/internal/eh;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aFo: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;->atS:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ek;->atO: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 pO()Ljava/lang/String;
+.method public final pM()Ljava/lang/String;
     .locals 3
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ek;->asH:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ek;->asD:Z
 
     if-nez v0, :cond_0
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ek;->asH:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ek;->asD:Z
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aFs:Lcom/google/android/gms/measurement/internal/eh;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aFo: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;->atS:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ek;->atO: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 57d6e52f59..e283194e50 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 aFs:Lcom/google/android/gms/measurement/internal/eh;
+.field final synthetic aFo:Lcom/google/android/gms/measurement/internal/eh;
 
-.field final ane:Ljava/lang/String;
+.field final ana:Ljava/lang/String;
 
-.field final anq:Ljava/lang/String;
+.field final anm:Ljava/lang/String;
 
-.field private final atS:Ljava/lang/String;
+.field private final atO: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;->aFs:Lcom/google/android/gms/measurement/internal/eh;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/el;->aFo: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;->atS:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/el;->atO: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;->ane:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/el;->ana: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;->anq:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/el;->anm:Ljava/lang/String;
 
     iput-wide p3, p0, Lcom/google/android/gms/measurement/internal/el;->zzd:J
 
@@ -92,16 +92,16 @@
 
 
 # virtual methods
-.method final pG()V
+.method final pE()V
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/el;->aFs:Lcom/google/android/gms/measurement/internal/eh;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/el;->aFo:Lcom/google/android/gms/measurement/internal/eh;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/el;->aFs:Lcom/google/android/gms/measurement/internal/eh;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/el;->aFo:Lcom/google/android/gms/measurement/internal/eh;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()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;->aFs:Lcom/google/android/gms/measurement/internal/eh;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/el;->aFo: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;->ane:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/el;->ana: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;->anq:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/el;->anm: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;->atS:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/el;->atO: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 uC()J
+.method final uA()J
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/el;->aFs:Lcom/google/android/gms/measurement/internal/eh;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/el;->aFo: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;->atS:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/el;->atO: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 1be01e9842..f2bc004254 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 aFt:Lcom/google/android/gms/measurement/internal/en;
+.field final synthetic aFp:Lcom/google/android/gms/measurement/internal/en;
 
-.field private final ane:Ljava/lang/String;
+.field private final ana: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;->aFt:Lcom/google/android/gms/measurement/internal/en;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/em;->aFp: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;->ane:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/em;->ana: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;->ane:Ljava/lang/String;
+    iget-object p0, p0, Lcom/google/android/gms/measurement/internal/em;->ana: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;->aFt:Lcom/google/android/gms/measurement/internal/en;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/em;->aFp:Lcom/google/android/gms/measurement/internal/en;
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/en;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/en;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->aFt:Lcom/google/android/gms/measurement/internal/en;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/em;->aFp:Lcom/google/android/gms/measurement/internal/en;
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/en;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/en;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->aFt:Lcom/google/android/gms/measurement/internal/en;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/em;->aFp:Lcom/google/android/gms/measurement/internal/en;
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/en;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/en;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEG: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 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;->aFt:Lcom/google/android/gms/measurement/internal/en;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/em;->aFp:Lcom/google/android/gms/measurement/internal/en;
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/en;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/en;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vu()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;->aFt:Lcom/google/android/gms/measurement/internal/en;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/em;->aFp:Lcom/google/android/gms/measurement/internal/en;
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/en;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/en;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->aFt:Lcom/google/android/gms/measurement/internal/en;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/em;->aFp:Lcom/google/android/gms/measurement/internal/en;
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/en;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/en;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEG: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 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 6783c64a19..4ced707416 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 aBO:Lcom/google/android/gms/measurement/internal/ey;
+.field final aBK: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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/en;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
     return-void
 .end method
 
-.method private final pH()Z
+.method private final pF()Z
     .locals 4
 
     const/4 v0, 0x0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/en;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/en;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vt()Landroid/content/Context;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vr()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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/en;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEG: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, "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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/en;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEG: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;
 
     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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/en;->aBK: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;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
     const/4 v0, 0x0
 
     if-nez p2, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/en;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/en;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/en;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, 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/dv;->aEw: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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/en;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/en;->aBK: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;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/en;->pH()Z
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/en;->pF()Z
 
     move-result v0
 
     if-nez v0, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/en;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/en;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEG: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 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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/en;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEG:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEC: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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/en;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vo()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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/en;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vt()Landroid/content/Context;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vr()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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/en;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->pH()Z
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/en;->pF()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;->nk()Lcom/google/android/gms/common/stats/a;
+    invoke-static {}, Lcom/google/android/gms/common/stats/a;->ni()Lcom/google/android/gms/common/stats/a;
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/en;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/en;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vt()Landroid/content/Context;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vr()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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/en;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEG:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEC: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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/en;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/en;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEG: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 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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/en;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEG: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 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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/en;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEG: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 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 6fd32bde41..e830cbe0fc 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 aFu:Lcom/google/android/gms/measurement/internal/et;
+.field private final aFq: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;->aFu:Lcom/google/android/gms/measurement/internal/et;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/eo;->aFq: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vv()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;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, v7, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->vA()Lcom/google/android/gms/measurement/internal/jz;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vy()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;->aEI:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v7, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->aEI:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v7, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->aFu:Lcom/google/android/gms/measurement/internal/et;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eo;->aFq: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;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vu()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;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v7, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->aFu:Lcom/google/android/gms/measurement/internal/et;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eo;->aFq:Lcom/google/android/gms/measurement/internal/et;
 
-    invoke-interface {v0}, Lcom/google/android/gms/measurement/internal/et;->uV()Landroid/content/BroadcastReceiver$PendingResult;
+    invoke-interface {v0}, Lcom/google/android/gms/measurement/internal/et;->uT()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;->aEI:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, v7, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->aEG:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v7, Lcom/google/android/gms/measurement/internal/dv;->aEC: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;->yd()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->yb()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;->aEI:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, v7, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, v7, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vu()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 9a556b6c58..3aec19e844 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 aFv:Lcom/google/android/gms/internal/measurement/bt;
+.field private final synthetic aFr:Lcom/google/android/gms/internal/measurement/bt;
 
-.field private final synthetic aFw:Landroid/content/ServiceConnection;
+.field private final synthetic aFs:Landroid/content/ServiceConnection;
 
-.field private final synthetic aFx:Lcom/google/android/gms/measurement/internal/em;
+.field private final synthetic aFt: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;->aFx:Lcom/google/android/gms/measurement/internal/em;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ep;->aFt:Lcom/google/android/gms/measurement/internal/em;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ep;->aFv:Lcom/google/android/gms/internal/measurement/bt;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ep;->aFr:Lcom/google/android/gms/internal/measurement/bt;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/ep;->aFw:Landroid/content/ServiceConnection;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/ep;->aFs: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;->aFx:Lcom/google/android/gms/measurement/internal/em;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ep;->aFt:Lcom/google/android/gms/measurement/internal/em;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/em;->aFt:Lcom/google/android/gms/measurement/internal/en;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/em;->aFp:Lcom/google/android/gms/measurement/internal/en;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ep;->aFx:Lcom/google/android/gms/measurement/internal/em;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ep;->aFt: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;->aFv:Lcom/google/android/gms/internal/measurement/bt;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ep;->aFr:Lcom/google/android/gms/internal/measurement/bt;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ep;->aFw:Landroid/content/ServiceConnection;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ep;->aFs: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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/en;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vo()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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/en;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v10, v0, Lcom/google/android/gms/measurement/internal/en;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v10}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v10}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v10
 
-    iget-object v10, v10, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v10, v10, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v10, v0, Lcom/google/android/gms/measurement/internal/en;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v10}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v10}, Lcom/google/android/gms/measurement/internal/ey;->yb()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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/en;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/en;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/en;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->xY()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/eh;->aFc: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;->ud()J
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ei;->ub()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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/en;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vA()Lcom/google/android/gms/measurement/internal/jz;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vy()Lcom/google/android/gms/measurement/internal/jz;
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/en;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/en;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/en;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->xY()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/eh;->aFc: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, v6, v7}, Lcom/google/android/gms/measurement/internal/ei;->T(J)V
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/en;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/en;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vA()Lcom/google/android/gms/measurement/internal/jz;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vy()Lcom/google/android/gms/measurement/internal/jz;
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/en;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/en;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/en;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->ya()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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/en;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->nk()Lcom/google/android/gms/common/stats/a;
+    invoke-static {}, Lcom/google/android/gms/common/stats/a;->ni()Lcom/google/android/gms/common/stats/a;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/en;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/en;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Landroid/content/Context;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vr()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 3c87452955..c547f475a5 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 aBO:Lcom/google/android/gms/measurement/internal/ey;
+.field private final synthetic aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-.field private final synthetic aFA:Landroid/content/BroadcastReceiver$PendingResult;
+.field private final synthetic aFu:Landroid/content/Context;
 
-.field private final synthetic aFy:Landroid/content/Context;
+.field private final synthetic aFv:Lcom/google/android/gms/measurement/internal/dv;
 
-.field private final synthetic aFz:Lcom/google/android/gms/measurement/internal/dv;
+.field private final synthetic aFw:Landroid/content/BroadcastReceiver$PendingResult;
 
-.field private final synthetic anz:J
+.field private final synthetic anv:J
 
-.field private final synthetic asL:Landroid/os/Bundle;
+.field private final synthetic asH: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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/eq;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    iput-wide p2, p0, Lcom/google/android/gms/measurement/internal/eq;->anz:J
+    iput-wide p2, p0, Lcom/google/android/gms/measurement/internal/eq;->anv:J
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/eq;->asL:Landroid/os/Bundle;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/eq;->asH:Landroid/os/Bundle;
 
-    iput-object p5, p0, Lcom/google/android/gms/measurement/internal/eq;->aFy:Landroid/content/Context;
+    iput-object p5, p0, Lcom/google/android/gms/measurement/internal/eq;->aFu:Landroid/content/Context;
 
-    iput-object p6, p0, Lcom/google/android/gms/measurement/internal/eq;->aFz:Lcom/google/android/gms/measurement/internal/dv;
+    iput-object p6, p0, Lcom/google/android/gms/measurement/internal/eq;->aFv:Lcom/google/android/gms/measurement/internal/dv;
 
-    iput-object p7, p0, Lcom/google/android/gms/measurement/internal/eq;->aFA:Landroid/content/BroadcastReceiver$PendingResult;
+    iput-object p7, p0, Lcom/google/android/gms/measurement/internal/eq;->aFw: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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eq;->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/eh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->xY()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/ei;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aEX:Lcom/google/android/gms/measurement/internal/ei;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ei;->ud()J
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ei;->ub()J
 
     move-result-wide v0
 
-    iget-wide v2, p0, Lcom/google/android/gms/measurement/internal/eq;->anz:J
+    iget-wide v2, p0, Lcom/google/android/gms/measurement/internal/eq;->anv: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;->asL:Landroid/os/Bundle;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eq;->asH: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;->asL:Landroid/os/Bundle;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eq;->asH: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;->aFy:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eq;->aFu: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;->yc()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/eq;->asL:Landroid/os/Bundle;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/eq;->asH: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;->aFz:Lcom/google/android/gms/measurement/internal/dv;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eq;->aFv:Lcom/google/android/gms/measurement/internal/dv;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEI: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 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;->aFA:Landroid/content/BroadcastReceiver$PendingResult;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eq;->aFw: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 fe475a41fd..0ed228be0a 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 aBO:Lcom/google/android/gms/measurement/internal/ey;
+.field private final synthetic aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-.field private final synthetic aFB:Lcom/google/android/gms/measurement/internal/dv;
+.field private final synthetic aFx: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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/er;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/er;->aFB:Lcom/google/android/gms/measurement/internal/dv;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/er;->aFx: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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/er;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ey;->aGf:Lcom/google/android/gms/measurement/internal/en;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ey;->aGb:Lcom/google/android/gms/measurement/internal/en;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/er;->aFB:Lcom/google/android/gms/measurement/internal/dv;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/er;->aFx:Lcom/google/android/gms/measurement/internal/dv;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/er;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ey;->aGf:Lcom/google/android/gms/measurement/internal/en;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ey;->aGb:Lcom/google/android/gms/measurement/internal/en;
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/en;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/en;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vt()Landroid/content/Context;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vr()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 88c188bfa6..c643f98462 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 anu:I = 0xffff
+.field private static anq:I = 0xffff
 
 .field private static zzc:I = 0x2
 
 
 # instance fields
-.field private final aFC:Ljava/util/Map;
+.field private final aFy:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -26,7 +26,7 @@
     .end annotation
 .end field
 
-.field private final aFD:Ljava/util/Map;
+.field private final aFz:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -37,7 +37,7 @@
     .end annotation
 .end field
 
-.field private final atC:Ljava/util/Map;
+.field private final atV:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -50,7 +50,7 @@
     .end annotation
 .end field
 
-.field private final atZ:Ljava/util/Map;
+.field private final aty:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -63,7 +63,7 @@
     .end annotation
 .end field
 
-.field private final auz:Ljava/util/Map;
+.field private final auv: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;->atZ:Ljava/util/Map;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/es;->atV: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;->atC:Ljava/util/Map;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/es;->aty: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;->auz:Ljava/util/Map;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/es;->auv: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;->aFD:Ljava/util/Map;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/es;->aFz: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;->aFC:Ljava/util/Map;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/es;->aFy: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;->pJ()I
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/ah$b$a;->pH()I
 
     move-result v4
 
@@ -169,7 +169,7 @@
 
     move-result-object v4
 
-    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/dw;->sS()Lcom/google/android/gms/internal/measurement/dw$b;
+    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/dw;->sQ()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;->pO()Ljava/lang/String;
+    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/ah$a$a;->pM()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v4
 
-    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->pO()Ljava/lang/String;
+    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/ah$a$a;->pM()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;->pO()Ljava/lang/String;
+    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/ah$a$a;->pM()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;->pO()Ljava/lang/String;
+    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/ah$a$a;->pM()Ljava/lang/String;
 
     move-result-object v5
 
-    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/ah$a$a;->nO()Z
+    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/ah$a$a;->nM()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;->qg()Z
+    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/ah$a$a;->qe()Z
 
     move-result v5
 
     if-eqz v5, :cond_4
 
-    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/ah$a$a;->qh()I
+    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/ah$a$a;->qf()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;->qh()I
+    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/ah$a$a;->qf()I
 
     move-result v5
 
-    sget v6, Lcom/google/android/gms/measurement/internal/es;->anu:I
+    sget v6, Lcom/google/android/gms/measurement/internal/es;->anq:I
 
     if-le v5, v6, :cond_2
 
     goto :goto_1
 
     :cond_2
-    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/ah$a$a;->pO()Ljava/lang/String;
+    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/ah$a$a;->pM()Ljava/lang/String;
 
     move-result-object v5
 
-    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/ah$a$a;->qh()I
+    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/ah$a$a;->qf()I
 
     move-result v4
 
@@ -292,17 +292,17 @@
 
     :cond_3
     :goto_1
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v5
 
-    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/ah$a$a;->pO()Ljava/lang/String;
+    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/ah$a$a;->pM()Ljava/lang/String;
 
     move-result-object v6
 
-    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/ah$a$a;->qh()I
+    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/ah$a$a;->qf()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;->atZ:Ljava/util/Map;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/es;->atV: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;->atC:Ljava/util/Map;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/es;->aty: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;->aFC:Ljava/util/Map;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/es;->aFy: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;->qj()Lcom/google/android/gms/internal/measurement/ah$b;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ah$b;->qh()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;->qi()Lcom/google/android/gms/internal/measurement/ah$b$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ah$b;->qg()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;->tb()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/dw$b;->sZ()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->pH()Z
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/ah$b;->pF()Z
 
     move-result v3
 
@@ -426,11 +426,11 @@
     :catch_0
     move-exception p2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->qj()Lcom/google/android/gms/internal/measurement/ah$b;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ah$b;->qh()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->qj()Lcom/google/android/gms/internal/measurement/ah$b;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ah$b;->qh()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;->yI()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yG()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()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;->auz:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/es;->auv: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;->xT()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jd;->xR()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;->atZ:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/es;->atV: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;->atC:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/es;->aty: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;->auz:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/es;->auv: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;->aFD:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/es;->aFz: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;->aFC:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/es;->aFy: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;->sS()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
 
@@ -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;->tb()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dw$b;->sZ()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;->auz:Ljava/util/Map;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/es;->auv:Ljava/util/Map;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dw$b;->tb()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dw$b;->sZ()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;->aFD:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/es;->aFz: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;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()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;->atC:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/es;->aty: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;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()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;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()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;->atZ:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/es;->atV: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;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()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;->aFC:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/es;->aFy: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;->yI()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jb;->yG()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/fu;->vo()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;->sS()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
 
@@ -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;->auz:Ljava/util/Map;
+    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/es;->auv:Ljava/util/Map;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/dw$b;->tb()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/dw$b;->sZ()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;->aFD:Ljava/util/Map;
+    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/es;->aFz: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;->tb()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/dw$b;->sZ()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;->xS()Lcom/google/android/gms/measurement/internal/jr;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xQ()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;->ql()Ljava/util/List;
+    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/ah$b$a;->qj()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;->sS()Lcom/google/android/gms/internal/measurement/dw$b;
+    invoke-virtual {v7}, Lcom/google/android/gms/internal/measurement/dw;->sQ()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;->pK()I
+    invoke-virtual {v7}, Lcom/google/android/gms/internal/measurement/ac$a$a;->pI()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;->pK()I
+    invoke-virtual {v9}, Lcom/google/android/gms/internal/measurement/ac$a$a;->pI()I
 
     move-result v10
 
@@ -951,7 +951,7 @@
 
     move-result-object v10
 
-    invoke-virtual {v10}, Lcom/google/android/gms/internal/measurement/dw;->sS()Lcom/google/android/gms/internal/measurement/dw$b;
+    invoke-virtual {v10}, Lcom/google/android/gms/internal/measurement/dw;->sQ()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;->pO()Ljava/lang/String;
+    invoke-virtual {v10}, Lcom/google/android/gms/internal/measurement/ac$b$a;->pM()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;->pK()I
+    invoke-virtual {v10}, Lcom/google/android/gms/internal/measurement/ac$b$a;->pI()I
 
     move-result v14
 
@@ -1010,7 +1010,7 @@
 
     if-eqz v15, :cond_2
 
-    invoke-virtual {v14}, Lcom/google/android/gms/internal/measurement/dw;->sS()Lcom/google/android/gms/internal/measurement/dw$b;
+    invoke-virtual {v14}, Lcom/google/android/gms/internal/measurement/dw;->sQ()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;->tb()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v13}, Lcom/google/android/gms/internal/measurement/dw$b;->sZ()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;->tb()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v9}, Lcom/google/android/gms/internal/measurement/dw$b;->sZ()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;->pJ()I
+    invoke-virtual {v7}, Lcom/google/android/gms/internal/measurement/ac$a$a;->pH()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;->pJ()I
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ac$a$a;->pH()I
 
     move-result v9
 
@@ -1094,7 +1094,7 @@
 
     if-eqz v10, :cond_7
 
-    invoke-virtual {v9}, Lcom/google/android/gms/internal/measurement/dw;->sS()Lcom/google/android/gms/internal/measurement/dw$b;
+    invoke-virtual {v9}, Lcom/google/android/gms/internal/measurement/dw;->sQ()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;->tb()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/dw$b;->sZ()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;->xT()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jd;->xR()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;->qm()Lcom/google/android/gms/internal/measurement/ah$b$a;
+    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/ah$b$a;->qk()Lcom/google/android/gms/internal/measurement/ah$b$a;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/dw$b;->tb()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/dw$b;->sZ()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;->rJ()[B
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cf;->rH()[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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v5
 
-    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->xT()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xR()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;->vq()V
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/jb;->yG()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;->uZ()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/d;->uX()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/fu;->vv()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;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->auz:Ljava/util/Map;
+    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/es;->auv:Ljava/util/Map;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/dw$b;->tb()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/dw$b;->sZ()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;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/es;->aFD:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/es;->aFz: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;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/es;->aFD:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/es;->aFz: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;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/es;->auz:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/es;->auv: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;->yI()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yG()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()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;->auz:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/es;->auv: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;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEz: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 pR()Z
+.method protected final pP()Z
     .locals 1
 
     const/4 v0, 0x0
@@ -1447,156 +1447,156 @@
     return v0
 .end method
 
-.method public final bridge synthetic rA()V
+.method public final bridge synthetic ry()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->rA()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->ry()V
 
     return-void
 .end method
 
-.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
+.method public final bridge synthetic vo()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vq()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vo()V
 
     return-void
 .end method
 
-.method public final bridge synthetic vr()Lcom/google/android/gms/measurement/internal/i;
+.method public final bridge synthetic vp()Lcom/google/android/gms/measurement/internal/i;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vr()Lcom/google/android/gms/measurement/internal/i;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vp()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vs()Lcom/google/android/gms/common/util/e;
+.method public final bridge synthetic vq()Lcom/google/android/gms/common/util/e;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vq()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vt()Landroid/content/Context;
+.method public final bridge synthetic vr()Landroid/content/Context;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vt()Landroid/content/Context;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vr()Landroid/content/Context;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vu()Lcom/google/android/gms/measurement/internal/dt;
+.method public final bridge synthetic vs()Lcom/google/android/gms/measurement/internal/dt;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vu()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vs()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vv()Lcom/google/android/gms/measurement/internal/jm;
+.method public final bridge synthetic vt()Lcom/google/android/gms/measurement/internal/jm;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vv()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vt()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vw()Lcom/google/android/gms/measurement/internal/ev;
+.method public final bridge synthetic vu()Lcom/google/android/gms/measurement/internal/ev;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vx()Lcom/google/android/gms/measurement/internal/dv;
+.method public final bridge synthetic vv()Lcom/google/android/gms/measurement/internal/dv;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vy()Lcom/google/android/gms/measurement/internal/eh;
+.method public final bridge synthetic vw()Lcom/google/android/gms/measurement/internal/eh;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vy()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vw()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vz()Lcom/google/android/gms/measurement/internal/ka;
+.method public final bridge synthetic vx()Lcom/google/android/gms/measurement/internal/ka;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xR()Lcom/google/android/gms/measurement/internal/jj;
+.method public final bridge synthetic vy()Lcom/google/android/gms/measurement/internal/jz;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->xR()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vy()Lcom/google/android/gms/measurement/internal/jz;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xS()Lcom/google/android/gms/measurement/internal/jr;
+.method public final bridge synthetic xP()Lcom/google/android/gms/measurement/internal/jj;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->xS()Lcom/google/android/gms/measurement/internal/jr;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->xP()Lcom/google/android/gms/measurement/internal/jj;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xT()Lcom/google/android/gms/measurement/internal/d;
+.method public final bridge synthetic xQ()Lcom/google/android/gms/measurement/internal/jr;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->xT()Lcom/google/android/gms/measurement/internal/d;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->xQ()Lcom/google/android/gms/measurement/internal/jr;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xU()Lcom/google/android/gms/measurement/internal/es;
+.method public final bridge synthetic xR()Lcom/google/android/gms/measurement/internal/d;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->xU()Lcom/google/android/gms/measurement/internal/es;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->xR()Lcom/google/android/gms/measurement/internal/d;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic xS()Lcom/google/android/gms/measurement/internal/es;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->xS()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 85a9f87ad8..5642fd7524 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 uV()Landroid/content/BroadcastReceiver$PendingResult;
+.method public abstract uT()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 23603e4fd8..52353f6037 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,15 +4,15 @@
 
 
 # static fields
-.field private static final aFL:Ljava/util/concurrent/atomic/AtomicLong;
+.field private static final aFH:Ljava/util/concurrent/atomic/AtomicLong;
 
 
 # instance fields
-.field private aFE:Lcom/google/android/gms/measurement/internal/ez;
+.field private aFA:Lcom/google/android/gms/measurement/internal/ez;
 
-.field private aFF:Lcom/google/android/gms/measurement/internal/ez;
+.field private aFB:Lcom/google/android/gms/measurement/internal/ez;
 
-.field private final aFG:Ljava/util/concurrent/PriorityBlockingQueue;
+.field private final aFC:Ljava/util/concurrent/PriorityBlockingQueue;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/PriorityBlockingQueue<",
@@ -22,7 +22,7 @@
     .end annotation
 .end field
 
-.field private final aFH:Ljava/util/concurrent/BlockingQueue;
+.field private final aFD:Ljava/util/concurrent/BlockingQueue;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/BlockingQueue<",
@@ -32,13 +32,13 @@
     .end annotation
 .end field
 
-.field private final aFI:Ljava/lang/Thread$UncaughtExceptionHandler;
+.field private final aFE:Ljava/lang/Thread$UncaughtExceptionHandler;
 
-.field private final aFJ:Ljava/lang/Thread$UncaughtExceptionHandler;
+.field private final aFF:Ljava/lang/Thread$UncaughtExceptionHandler;
 
-.field private final aFK:Ljava/util/concurrent/Semaphore;
+.field private final aFG:Ljava/util/concurrent/Semaphore;
 
-.field private final asC:Ljava/lang/Object;
+.field private final asy: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;->aFL:Ljava/util/concurrent/atomic/AtomicLong;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/ev;->aFH: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;->asC:Ljava/lang/Object;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ev;->asy: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;->aFK:Ljava/util/concurrent/Semaphore;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ev;->aFG: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;->aFG:Ljava/util/concurrent/PriorityBlockingQueue;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ev;->aFC: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;->aFH:Ljava/util/concurrent/BlockingQueue;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ev;->aFD: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;->aFI:Ljava/lang/Thread$UncaughtExceptionHandler;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ev;->aFE: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;->aFJ:Ljava/lang/Thread$UncaughtExceptionHandler;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ev;->aFF: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;->aFK:Ljava/util/concurrent/Semaphore;
+    iget-object p0, p0, Lcom/google/android/gms/measurement/internal/ev;->aFG: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;->asC:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ev;->asy:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ev;->aFG:Ljava/util/concurrent/PriorityBlockingQueue;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ev;->aFC: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;->aFE:Lcom/google/android/gms/measurement/internal/ez;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ev;->aFA: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;->aFG:Ljava/util/concurrent/PriorityBlockingQueue;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ev;->aFC: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;->aFE:Lcom/google/android/gms/measurement/internal/ez;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ev;->aFA: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 p1, p0, Lcom/google/android/gms/measurement/internal/ev;->aFA:Lcom/google/android/gms/measurement/internal/ez;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ev;->aFI:Ljava/lang/Thread$UncaughtExceptionHandler;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ev;->aFE: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;->aFE:Lcom/google/android/gms/measurement/internal/ez;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ev;->aFA: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;->aFE:Lcom/google/android/gms/measurement/internal/ez;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ev;->aFA: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;->asC:Ljava/lang/Object;
+    iget-object p0, p0, Lcom/google/android/gms/measurement/internal/ev;->asy: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;->aFE:Lcom/google/android/gms/measurement/internal/ez;
+    iget-object p0, p0, Lcom/google/android/gms/measurement/internal/ev;->aFA: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;->aFE:Lcom/google/android/gms/measurement/internal/ez;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ev;->aFA: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;->aFF:Lcom/google/android/gms/measurement/internal/ez;
+    iget-object p0, p0, Lcom/google/android/gms/measurement/internal/ev;->aFB: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;->aFF:Lcom/google/android/gms/measurement/internal/ez;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ev;->aFB:Lcom/google/android/gms/measurement/internal/ez;
 
     return-object v0
 .end method
 
-.method static synthetic xZ()Ljava/util/concurrent/atomic/AtomicLong;
+.method static synthetic xX()Ljava/util/concurrent/atomic/AtomicLong;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/ev;->aFL:Ljava/util/concurrent/atomic/AtomicLong;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/ev;->aFH: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;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p3
 
-    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p3
 
-    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->xE()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ft;->xC()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;->aFE:Lcom/google/android/gms/measurement/internal/ez;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ev;->aFA:Lcom/google/android/gms/measurement/internal/ez;
 
     if-ne p1, v1, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ev;->aFG:Ljava/util/concurrent/PriorityBlockingQueue;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ev;->aFC: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->xE()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ft;->xC()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;->aFE:Lcom/google/android/gms/measurement/internal/ez;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ev;->aFA: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;->xE()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ft;->xC()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;->xE()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ft;->xC()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;->asC:Ljava/lang/Object;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ev;->asy:Ljava/lang/Object;
 
     monitor-enter p1
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ev;->aFH:Ljava/util/concurrent/BlockingQueue;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ev;->aFD: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;->aFF:Lcom/google/android/gms/measurement/internal/ez;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ev;->aFB: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;->aFH:Ljava/util/concurrent/BlockingQueue;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ev;->aFD: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;->aFF:Lcom/google/android/gms/measurement/internal/ez;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ev;->aFB: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 v0, p0, Lcom/google/android/gms/measurement/internal/ev;->aFB:Lcom/google/android/gms/measurement/internal/ez;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ev;->aFJ:Ljava/lang/Thread$UncaughtExceptionHandler;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ev;->aFF: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;->aFF:Lcom/google/android/gms/measurement/internal/ez;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ev;->aFB: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;->aFF:Lcom/google/android/gms/measurement/internal/ez;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ev;->aFB: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 pR()Z
+.method protected final pP()Z
     .locals 1
 
     const/4 v0, 0x0
@@ -598,14 +598,14 @@
     return v0
 .end method
 
-.method public final rA()V
+.method public final ry()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;->aFF:Lcom/google/android/gms/measurement/internal/ez;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ev;->aFB:Lcom/google/android/gms/measurement/internal/ez;
 
     if-ne v0, v1, :cond_0
 
@@ -621,14 +621,14 @@
     throw v0
 .end method
 
-.method public final uI()Z
+.method public final uG()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;->aFE:Lcom/google/android/gms/measurement/internal/ez;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ev;->aFA:Lcom/google/android/gms/measurement/internal/ez;
 
     if-ne v0, v1, :cond_0
 
@@ -642,24 +642,14 @@
     return v0
 .end method
 
-.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
+.method public final vo()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;->aFE:Lcom/google/android/gms/measurement/internal/ez;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ev;->aFA:Lcom/google/android/gms/measurement/internal/ez;
 
     if-ne v0, v1, :cond_0
 
@@ -675,90 +665,100 @@
     throw v0
 .end method
 
-.method public final bridge synthetic vr()Lcom/google/android/gms/measurement/internal/i;
+.method public final bridge synthetic vp()Lcom/google/android/gms/measurement/internal/i;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vr()Lcom/google/android/gms/measurement/internal/i;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vp()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vs()Lcom/google/android/gms/common/util/e;
+.method public final bridge synthetic vq()Lcom/google/android/gms/common/util/e;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vq()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vt()Landroid/content/Context;
+.method public final bridge synthetic vr()Landroid/content/Context;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vt()Landroid/content/Context;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vr()Landroid/content/Context;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vu()Lcom/google/android/gms/measurement/internal/dt;
+.method public final bridge synthetic vs()Lcom/google/android/gms/measurement/internal/dt;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vu()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vs()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vv()Lcom/google/android/gms/measurement/internal/jm;
+.method public final bridge synthetic vt()Lcom/google/android/gms/measurement/internal/jm;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vv()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vt()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vw()Lcom/google/android/gms/measurement/internal/ev;
+.method public final bridge synthetic vu()Lcom/google/android/gms/measurement/internal/ev;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vx()Lcom/google/android/gms/measurement/internal/dv;
+.method public final bridge synthetic vv()Lcom/google/android/gms/measurement/internal/dv;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vy()Lcom/google/android/gms/measurement/internal/eh;
+.method public final bridge synthetic vw()Lcom/google/android/gms/measurement/internal/eh;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vy()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vw()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vz()Lcom/google/android/gms/measurement/internal/ka;
+.method public final bridge synthetic vx()Lcom/google/android/gms/measurement/internal/ka;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vx()Lcom/google/android/gms/measurement/internal/ka;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic vy()Lcom/google/android/gms/measurement/internal/jz;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vy()Lcom/google/android/gms/measurement/internal/jz;
 
     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 cf72a52952..693bf14807 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 aFM:Lcom/google/android/gms/measurement/internal/ev;
+.field private final synthetic aFI:Lcom/google/android/gms/measurement/internal/ev;
 
-.field private final anq:Ljava/lang/String;
+.field private final anm:Ljava/lang/String;
 
-.field private final anz:J
+.field private final anv: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;->aFM:Lcom/google/android/gms/measurement/internal/ev;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ew;->aFI: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;->xZ()Ljava/util/concurrent/atomic/AtomicLong;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/ev;->xX()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;->anz:J
+    iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/ew;->anv:J
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/ew;->anq:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/ew;->anm: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;->anz:J
+    iget-wide p2, p0, Lcom/google/android/gms/measurement/internal/ew;->anv:J
 
     const-wide v0, 0x7fffffffffffffffL
 
@@ -67,11 +67,11 @@
 
     if-nez v2, :cond_0
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, 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/dv;->aEw: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;->aFM:Lcom/google/android/gms/measurement/internal/ev;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ew;->aFI: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;->xZ()Ljava/util/concurrent/atomic/AtomicLong;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/ev;->xX()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;->anz:J
+    iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/ew;->anv:J
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/ew;->anq:Ljava/lang/String;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/ew;->anm: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;->anz:J
+    iget-wide p2, p0, Lcom/google/android/gms/measurement/internal/ew;->anv:J
 
     const-wide v0, 0x7fffffffffffffffL
 
@@ -121,11 +121,11 @@
 
     if-nez p4, :cond_0
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, 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/dv;->aEw: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;->anz:J
+    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/ew;->anv:J
 
-    iget-wide v4, p1, Lcom/google/android/gms/measurement/internal/ew;->anz:J
+    iget-wide v4, p1, Lcom/google/android/gms/measurement/internal/ew;->anv: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;->aFM:Lcom/google/android/gms/measurement/internal/ev;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ew;->aFI:Lcom/google/android/gms/measurement/internal/ev;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEB:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEx:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/ew;->anz:J
+    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/ew;->anv: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;->aFM:Lcom/google/android/gms/measurement/internal/ev;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ew;->aFI:Lcom/google/android/gms/measurement/internal/ev;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEw:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ew;->anq:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ew;->anm: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 36fde33b5b..d4ccd4ba56 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 aFN:Lcom/google/android/gms/measurement/internal/ev;
+.field private final synthetic aFJ:Lcom/google/android/gms/measurement/internal/ev;
 
-.field private final atS:Ljava/lang/String;
+.field private final atO: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;->aFN:Lcom/google/android/gms/measurement/internal/ev;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ex;->aFJ: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;->atS:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ex;->atO: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;->aFN:Lcom/google/android/gms/measurement/internal/ev;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ex;->aFJ:Lcom/google/android/gms/measurement/internal/ev;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, 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/dv;->aEw:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ex;->atS:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ex;->atO: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 0d6a004fb2..4e2cf00488 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 aBO:Lcom/google/android/gms/measurement/internal/ey;
+.field private static volatile aBK:Lcom/google/android/gms/measurement/internal/ey;
 
 
 # instance fields
-.field private final aFO:Lcom/google/android/gms/measurement/internal/jz;
+.field private final aFK:Lcom/google/android/gms/measurement/internal/jz;
 
-.field final aFP:Lcom/google/android/gms/measurement/internal/ka;
+.field final aFL:Lcom/google/android/gms/measurement/internal/ka;
 
-.field private final aFQ:Lcom/google/android/gms/measurement/internal/eh;
+.field private final aFM:Lcom/google/android/gms/measurement/internal/eh;
 
-.field final aFR:Lcom/google/android/gms/measurement/internal/dv;
+.field final aFN:Lcom/google/android/gms/measurement/internal/dv;
 
-.field final aFS:Lcom/google/android/gms/measurement/internal/ev;
+.field final aFO:Lcom/google/android/gms/measurement/internal/ev;
 
-.field private final aFT:Lcom/google/android/gms/measurement/internal/in;
+.field private final aFP:Lcom/google/android/gms/measurement/internal/in;
 
-.field private final aFU:Lcom/google/android/gms/measurement/internal/jm;
+.field private final aFQ:Lcom/google/android/gms/measurement/internal/jm;
 
-.field private final aFV:Lcom/google/android/gms/measurement/internal/dt;
+.field private final aFR:Lcom/google/android/gms/measurement/internal/dt;
 
-.field private final aFW:Lcom/google/android/gms/common/util/e;
+.field private final aFS:Lcom/google/android/gms/common/util/e;
 
-.field private final aFX:Lcom/google/android/gms/measurement/internal/hh;
+.field private final aFT:Lcom/google/android/gms/measurement/internal/hh;
 
-.field private final aFY:Lcom/google/android/gms/measurement/internal/gf;
+.field private final aFU:Lcom/google/android/gms/measurement/internal/gf;
 
-.field private final aFZ:Lcom/google/android/gms/measurement/internal/z;
+.field private final aFV:Lcom/google/android/gms/measurement/internal/z;
 
-.field private final aGa:Lcom/google/android/gms/measurement/internal/hc;
+.field private final aFW:Lcom/google/android/gms/measurement/internal/hc;
 
-.field private aGb:Lcom/google/android/gms/measurement/internal/dr;
+.field private aFX:Lcom/google/android/gms/measurement/internal/dr;
 
-.field private aGc:Lcom/google/android/gms/measurement/internal/hm;
+.field private aFY:Lcom/google/android/gms/measurement/internal/hm;
 
-.field private aGd:Lcom/google/android/gms/measurement/internal/i;
+.field private aFZ:Lcom/google/android/gms/measurement/internal/i;
 
-.field private aGe:Lcom/google/android/gms/measurement/internal/ds;
+.field private aGa:Lcom/google/android/gms/measurement/internal/ds;
 
-.field aGf:Lcom/google/android/gms/measurement/internal/en;
+.field aGb:Lcom/google/android/gms/measurement/internal/en;
 
-.field private aGg:Z
+.field private aGc:Z
+
+.field private aGd:Ljava/lang/Boolean;
+
+.field private aGe:J
+
+.field private volatile aGf:Ljava/lang/Boolean;
+
+.field private aGg:Ljava/lang/Boolean;
 
 .field private aGh:Ljava/lang/Boolean;
 
-.field private aGi:J
+.field aGi:I
 
-.field private volatile aGj:Ljava/lang/Boolean;
+.field private aGj:Ljava/util/concurrent/atomic/AtomicInteger;
 
-.field private aGk:Ljava/lang/Boolean;
+.field final aGk:J
 
-.field private aGl:Ljava/lang/Boolean;
+.field final anm:Ljava/lang/String;
 
-.field aGm:I
-
-.field private aGn:Ljava/util/concurrent/atomic/AtomicInteger;
-
-.field final aGo:J
-
-.field final anq:Ljava/lang/String;
-
-.field private final atK:Landroid/content/Context;
+.field private final atG: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;->aGg:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aGc: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;->aGn:Ljava/util/concurrent/atomic/AtomicInteger;
+    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aGj: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;->aFO:Lcom/google/android/gms/measurement/internal/jz;
+    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aFK: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;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aFK: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;->aGM:Landroid/content/Context;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/gb;->aGI:Landroid/content/Context;
 
-    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->atK:Landroid/content/Context;
+    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->atG:Landroid/content/Context;
 
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/gb;->ane:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/gb;->ana:Ljava/lang/String;
 
-    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->anq:Ljava/lang/String;
+    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->anm:Ljava/lang/String;
 
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/gb;->anq:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/gb;->anm: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;->aCk:Ljava/lang/Boolean;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/gb;->aCg:Ljava/lang/Boolean;
 
-    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aGj:Ljava/lang/Boolean;
+    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aGf:Ljava/lang/Boolean;
 
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/gb;->aGN:Lcom/google/android/gms/internal/measurement/zzv;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/gb;->aGJ:Lcom/google/android/gms/internal/measurement/zzv;
 
     if-eqz v1, :cond_1
 
-    iget-object v2, v1, Lcom/google/android/gms/internal/measurement/zzv;->azF:Landroid/os/Bundle;
+    iget-object v2, v1, Lcom/google/android/gms/internal/measurement/zzv;->azB:Landroid/os/Bundle;
 
     if-eqz v2, :cond_1
 
-    iget-object v2, v1, Lcom/google/android/gms/internal/measurement/zzv;->azF:Landroid/os/Bundle;
+    iget-object v2, v1, Lcom/google/android/gms/internal/measurement/zzv;->azB: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;->aGk:Ljava/lang/Boolean;
+    iput-object v2, p0, Lcom/google/android/gms/measurement/internal/ey;->aGg:Ljava/lang/Boolean;
 
     :cond_0
-    iget-object v1, v1, Lcom/google/android/gms/internal/measurement/zzv;->azF:Landroid/os/Bundle;
+    iget-object v1, v1, Lcom/google/android/gms/internal/measurement/zzv;->azB: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;->aGl:Ljava/lang/Boolean;
+    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aGh:Ljava/lang/Boolean;
 
     :cond_1
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->atK:Landroid/content/Context;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->atG: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;->nt()Lcom/google/android/gms/common/util/e;
+    invoke-static {}, Lcom/google/android/gms/common/util/g;->nr()Lcom/google/android/gms/common/util/e;
 
     move-result-object v1
 
-    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aFW:Lcom/google/android/gms/common/util/e;
+    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aFS: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;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aFS: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;->aGo:J
+    iput-wide v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aGk: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;->aFP:Lcom/google/android/gms/measurement/internal/ka;
+    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aFL: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;->xF()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ft;->xD()V
 
-    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aFQ:Lcom/google/android/gms/measurement/internal/eh;
+    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aFM: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;->xF()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ft;->xD()V
 
-    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aFR:Lcom/google/android/gms/measurement/internal/dv;
+    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aFN: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;->xF()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ft;->xD()V
 
-    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aFU:Lcom/google/android/gms/measurement/internal/jm;
+    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aFQ: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;->xF()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ft;->xD()V
 
-    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aFV:Lcom/google/android/gms/measurement/internal/dt;
+    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aFR: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;->aFZ:Lcom/google/android/gms/measurement/internal/z;
+    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aFV: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;->xC()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/dc;->xA()V
 
-    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aFX:Lcom/google/android/gms/measurement/internal/hh;
+    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aFT: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;->xC()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/dc;->xA()V
 
-    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aFY:Lcom/google/android/gms/measurement/internal/gf;
+    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aFU: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;->xC()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/dc;->xA()V
 
-    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aFT:Lcom/google/android/gms/measurement/internal/in;
+    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aFP: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;->xF()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ft;->xD()V
 
-    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aGa:Lcom/google/android/gms/measurement/internal/hc;
+    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aFW: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;->xF()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ft;->xD()V
 
-    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aFS:Lcom/google/android/gms/measurement/internal/ev;
+    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aFO:Lcom/google/android/gms/measurement/internal/ev;
 
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/gb;->aGN:Lcom/google/android/gms/internal/measurement/zzv;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/gb;->aGJ: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;->aGN:Lcom/google/android/gms/internal/measurement/zzv;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/gb;->aGJ:Lcom/google/android/gms/internal/measurement/zzv;
 
-    iget-wide v3, v1, Lcom/google/android/gms/internal/measurement/zzv;->anz:J
+    iget-wide v3, v1, Lcom/google/android/gms/internal/measurement/zzv;->anv: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;->atK:Landroid/content/Context;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ey;->atG: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;->yc()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vr()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;->vt()Landroid/content/Context;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vr()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;->aGS:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v4, v2, Lcom/google/android/gms/measurement/internal/gf;->aGO: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;->aGS:Lcom/google/android/gms/measurement/internal/gw;
+    iput-object v4, v2, Lcom/google/android/gms/measurement/internal/gf;->aGO: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;->aGS:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v0, v2, Lcom/google/android/gms/measurement/internal/gf;->aGO: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;->aGS:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v0, v2, Lcom/google/android/gms/measurement/internal/gf;->aGO: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vv()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 v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vv()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;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->aFS:Lcom/google/android/gms/measurement/internal/ev;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFO: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;->any:J
+    iget-wide v2, p1, Lcom/google/android/gms/internal/measurement/zzv;->anu:J
 
-    iget-wide v4, p1, Lcom/google/android/gms/internal/measurement/zzv;->anz:J
+    iget-wide v4, p1, Lcom/google/android/gms/internal/measurement/zzv;->anv:J
 
-    iget-boolean v6, p1, Lcom/google/android/gms/internal/measurement/zzv;->asH:Z
+    iget-boolean v6, p1, Lcom/google/android/gms/internal/measurement/zzv;->asD: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;->azF:Landroid/os/Bundle;
+    iget-object v10, p1, Lcom/google/android/gms/internal/measurement/zzv;->azB: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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/ey;->aBK: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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/ey;->aBK: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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    sput-object p0, Lcom/google/android/gms/measurement/internal/ey;->aBK: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;->azF:Landroid/os/Bundle;
+    iget-object p0, p1, Lcom/google/android/gms/internal/measurement/zzv;->azB:Landroid/os/Bundle;
 
     if-eqz p0, :cond_4
 
-    iget-object p0, p1, Lcom/google/android/gms/internal/measurement/zzv;->azF:Landroid/os/Bundle;
+    iget-object p0, p1, Lcom/google/android/gms/internal/measurement/zzv;->azB: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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    sget-object p0, Lcom/google/android/gms/measurement/internal/ey;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/zzv;->azF:Landroid/os/Bundle;
+    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/zzv;->azB: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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    sget-object p0, Lcom/google/android/gms/measurement/internal/ey;->aBK: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;->xA()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xy()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;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/ka;->ug()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/ka;->ue()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;->xF()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ft;->xD()V
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aGd:Lcom/google/android/gms/measurement/internal/i;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFZ: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;->xC()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dc;->xA()V
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aGe:Lcom/google/android/gms/measurement/internal/ds;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aGa: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;->xC()V
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/dc;->xA()V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ey;->aGb:Lcom/google/android/gms/measurement/internal/dr;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ey;->aFX: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;->xC()V
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/dc;->xA()V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ey;->aGc:Lcom/google/android/gms/measurement/internal/hm;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ey;->aFY:Lcom/google/android/gms/measurement/internal/hm;
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ey;->aFU:Lcom/google/android/gms/measurement/internal/jm;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ey;->aFQ:Lcom/google/android/gms/measurement/internal/jm;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ft;->yv()V
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ft;->yt()V
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ey;->aFQ:Lcom/google/android/gms/measurement/internal/eh;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ey;->aFM:Lcom/google/android/gms/measurement/internal/eh;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ft;->yv()V
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ft;->yt()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;->aGf:Lcom/google/android/gms/measurement/internal/en;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ey;->aGb:Lcom/google/android/gms/measurement/internal/en;
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ey;->aGe:Lcom/google/android/gms/measurement/internal/ds;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ey;->aGa:Lcom/google/android/gms/measurement/internal/ds;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/dc;->xD()V
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/dc;->xB()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEG: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-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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEG: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 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;->xL()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ds;->xJ()Ljava/lang/String;
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->anq:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->anm: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;->yd()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yb()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEG: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 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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEG:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEC: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEH: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, "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;->aGm:I
+    iget p1, p0, Lcom/google/android/gms/measurement/internal/ey;->aGi:I
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aGn:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aGj: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, 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/dv;->aEw:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aGm:I
+    iget v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aGi: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;->aGn:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aGj: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;->aGg:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/measurement/internal/ey;->aGc:Z
 
     return-void
 .end method
@@ -791,7 +791,7 @@
 
     if-eqz p0, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ft;->vd()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ft;->vb()Z
 
     move-result v0
 
@@ -895,22 +895,22 @@
     return-object p0
 .end method
 
-.method private final yg()Lcom/google/android/gms/measurement/internal/hc;
+.method private final ye()Lcom/google/android/gms/measurement/internal/hc;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aGa:Lcom/google/android/gms/measurement/internal/hc;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFW: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;->aGa:Lcom/google/android/gms/measurement/internal/hc;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFW:Lcom/google/android/gms/measurement/internal/hc;
 
     return-object v0
 .end method
 
-.method private final ym()V
+.method private final yk()V
     .locals 2
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aGg:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aGc:Z
 
     if-eqz v0, :cond_0
 
@@ -926,7 +926,7 @@
     throw v0
 .end method
 
-.method static yp()V
+.method static yn()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p3
 
-    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->ya()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->xY()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/eh;->aFp:Lcom/google/android/gms/measurement/internal/ej;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/eh;->aFl: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEH: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, "Deferred Deep Link response empty."
 
@@ -1051,11 +1051,11 @@
 
     if-eqz p2, :cond_4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEH: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, "Deferred Deep Link is empty."
 
@@ -1064,7 +1064,7 @@
     return-void
 
     :cond_4
-    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;->yb()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;->vt()Landroid/content/Context;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fu;->vr()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->aFY:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/ey;->aFU: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;->yd()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yb()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;->vt()Landroid/content/Context;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fu;->vr()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEw: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 lE()V
+.method public final lC()V
     .locals 10
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ey;->yg()Lcom/google/android/gms/measurement/internal/hc;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ey;->ye()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;->yk()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yi()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ds;->xL()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ds;->xJ()Ljava/lang/String;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->xY()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;->aFP:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ey;->aFL:Lcom/google/android/gms/measurement/internal/ka;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ka;->uK()Ljava/lang/Boolean;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ka;->uI()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;->yg()Lcom/google/android/gms/measurement/internal/hc;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ey;->ye()Lcom/google/android/gms/measurement/internal/hc;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/hc;->uI()Z
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/hc;->uG()Z
 
     move-result v2
 
     if-nez v2, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vv()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;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->yd()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yb()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yk()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yi()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vx()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;->ya()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->xY()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/eh;->aFq: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;->ud()J
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ei;->ub()J
 
     move-result-wide v6
 
@@ -1325,7 +1325,7 @@
 
     move-result-object v1
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ey;->yg()Lcom/google/android/gms/measurement/internal/hc;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ey;->ye()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;->vq()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ft;->xE()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ft;->xC()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;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vu()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, 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/dv;->aED: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 vA()Lcom/google/android/gms/measurement/internal/jz;
+.method public final vq()Lcom/google/android/gms/common/util/e;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFO:Lcom/google/android/gms/measurement/internal/jz;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFS:Lcom/google/android/gms/common/util/e;
 
     return-object v0
 .end method
 
-.method public final vs()Lcom/google/android/gms/common/util/e;
+.method public final vr()Landroid/content/Context;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFW:Lcom/google/android/gms/common/util/e;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->atG:Landroid/content/Context;
 
     return-object v0
 .end method
 
-.method public final vt()Landroid/content/Context;
+.method public final vu()Lcom/google/android/gms/measurement/internal/ev;
     .locals 1
 
-    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;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFO: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;->aFS:Lcom/google/android/gms/measurement/internal/ev;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFO:Lcom/google/android/gms/measurement/internal/ev;
 
     return-object v0
 .end method
 
-.method public final vx()Lcom/google/android/gms/measurement/internal/dv;
+.method public final vv()Lcom/google/android/gms/measurement/internal/dv;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFR:Lcom/google/android/gms/measurement/internal/dv;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFN: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;->aFR:Lcom/google/android/gms/measurement/internal/dv;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFN:Lcom/google/android/gms/measurement/internal/dv;
 
     return-object v0
 .end method
 
-.method public final ya()Lcom/google/android/gms/measurement/internal/eh;
+.method public final vy()Lcom/google/android/gms/measurement/internal/jz;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFQ:Lcom/google/android/gms/measurement/internal/eh;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFK:Lcom/google/android/gms/measurement/internal/jz;
+
+    return-object v0
+.end method
+
+.method public final xY()Lcom/google/android/gms/measurement/internal/eh;
+    .locals 1
+
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFM: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;->aFQ:Lcom/google/android/gms/measurement/internal/eh;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFM:Lcom/google/android/gms/measurement/internal/eh;
 
     return-object v0
 .end method
 
-.method public final yb()Lcom/google/android/gms/measurement/internal/in;
+.method public final xZ()Lcom/google/android/gms/measurement/internal/in;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFT:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFP: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;->aFT:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/in;
 
     return-object v0
 .end method
 
-.method public final yc()Lcom/google/android/gms/measurement/internal/gf;
+.method public final ya()Lcom/google/android/gms/measurement/internal/gf;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFY:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFU: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;->aFY:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFU:Lcom/google/android/gms/measurement/internal/gf;
 
     return-object v0
 .end method
 
-.method public final yd()Lcom/google/android/gms/measurement/internal/jm;
+.method public final yb()Lcom/google/android/gms/measurement/internal/jm;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFU:Lcom/google/android/gms/measurement/internal/jm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFQ: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;->aFU:Lcom/google/android/gms/measurement/internal/jm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFQ:Lcom/google/android/gms/measurement/internal/jm;
 
     return-object v0
 .end method
 
-.method public final ye()Lcom/google/android/gms/measurement/internal/dt;
+.method public final yc()Lcom/google/android/gms/measurement/internal/dt;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFV:Lcom/google/android/gms/measurement/internal/dt;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFR: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;->aFV:Lcom/google/android/gms/measurement/internal/dt;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFR:Lcom/google/android/gms/measurement/internal/dt;
 
     return-object v0
 .end method
 
-.method public final yf()Lcom/google/android/gms/measurement/internal/dr;
+.method public final yd()Lcom/google/android/gms/measurement/internal/dr;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aGb:Lcom/google/android/gms/measurement/internal/dr;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFX: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;->aGb:Lcom/google/android/gms/measurement/internal/dr;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFX:Lcom/google/android/gms/measurement/internal/dr;
 
     return-object v0
 .end method
 
-.method public final yh()Lcom/google/android/gms/measurement/internal/hh;
+.method public final yf()Lcom/google/android/gms/measurement/internal/hh;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFX:Lcom/google/android/gms/measurement/internal/hh;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFT: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;->aFX:Lcom/google/android/gms/measurement/internal/hh;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFT:Lcom/google/android/gms/measurement/internal/hh;
 
     return-object v0
 .end method
 
-.method public final yi()Lcom/google/android/gms/measurement/internal/hm;
+.method public final yg()Lcom/google/android/gms/measurement/internal/hm;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aGc:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFY: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;->aGc:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFY:Lcom/google/android/gms/measurement/internal/hm;
 
     return-object v0
 .end method
 
-.method public final yj()Lcom/google/android/gms/measurement/internal/i;
+.method public final yh()Lcom/google/android/gms/measurement/internal/i;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aGd:Lcom/google/android/gms/measurement/internal/i;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFZ: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;->aGd:Lcom/google/android/gms/measurement/internal/i;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFZ:Lcom/google/android/gms/measurement/internal/i;
 
     return-object v0
 .end method
 
-.method public final yk()Lcom/google/android/gms/measurement/internal/ds;
+.method public final yi()Lcom/google/android/gms/measurement/internal/ds;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aGe:Lcom/google/android/gms/measurement/internal/ds;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aGa: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;->aGe:Lcom/google/android/gms/measurement/internal/ds;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aGa:Lcom/google/android/gms/measurement/internal/ds;
 
     return-object v0
 .end method
 
-.method public final yl()Lcom/google/android/gms/measurement/internal/z;
+.method public final yj()Lcom/google/android/gms/measurement/internal/z;
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFZ:Lcom/google/android/gms/measurement/internal/z;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFV:Lcom/google/android/gms/measurement/internal/z;
 
     if-eqz v0, :cond_0
 
@@ -1555,14 +1555,14 @@
     throw v0
 .end method
 
-.method public final yn()Z
+.method public final yl()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aGj:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aGf:Ljava/lang/Boolean;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aGj:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aGf:Ljava/lang/Boolean;
 
     invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -1580,20 +1580,20 @@
     return v0
 .end method
 
-.method public final yo()Z
+.method public final ym()Z
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ey;->ym()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ey;->yk()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFL:Lcom/google/android/gms/measurement/internal/ka;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/o;->aDE:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/o;->aDA: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;->aFP:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFL:Lcom/google/android/gms/measurement/internal/ka;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ka;->rr()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ka;->rp()Z
 
     move-result v0
 
@@ -1616,7 +1616,7 @@
     return v2
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aGl:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aGh: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;->ya()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->xY()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/eh;->vL()Ljava/lang/Boolean;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/eh;->vJ()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;->aFP:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFL:Lcom/google/android/gms/measurement/internal/ka;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ka;->vK()Ljava/lang/Boolean;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ka;->vI()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;->aGk:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aGg: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;->mF()Z
+    invoke-static {}, Lcom/google/android/gms/common/api/internal/e;->mD()Z
 
     move-result v0
 
@@ -1681,9 +1681,9 @@
     return v2
 
     :cond_5
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFL:Lcom/google/android/gms/measurement/internal/ka;
 
-    sget-object v2, Lcom/google/android/gms/measurement/internal/o;->aDz:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v2, Lcom/google/android/gms/measurement/internal/o;->aDv: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;->aGj:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aGf:Ljava/lang/Boolean;
 
     if-eqz v0, :cond_6
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aGj:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aGf: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;->aFP:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFL:Lcom/google/android/gms/measurement/internal/ka;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ka;->rr()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ka;->rp()Z
 
     move-result v0
 
@@ -1718,9 +1718,9 @@
     return v2
 
     :cond_8
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFL:Lcom/google/android/gms/measurement/internal/ka;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ka;->vK()Ljava/lang/Boolean;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ka;->vI()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;->mF()Z
+    invoke-static {}, Lcom/google/android/gms/common/api/internal/e;->mD()Z
 
     move-result v0
 
@@ -1741,11 +1741,11 @@
 
     if-eqz v0, :cond_a
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aGj:Ljava/lang/Boolean;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aGf:Ljava/lang/Boolean;
 
     if-eqz v1, :cond_a
 
-    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;->aDv: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;->aGj:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aGf: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;->ya()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->xY()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v1
 
@@ -1780,32 +1780,32 @@
     return v0
 .end method
 
-.method final yq()V
+.method final yo()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aGn:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aGj:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicInteger;->incrementAndGet()I
 
     return-void
 .end method
 
-.method protected final yr()Z
+.method protected final yp()Z
     .locals 6
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ey;->ym()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ey;->yk()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    iget-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;->aGd:Ljava/lang/Boolean;
 
     if-eqz v0, :cond_0
 
-    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aGi:J
+    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aGe: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;->aFW:Lcom/google/android/gms/common/util/e;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFS:Lcom/google/android/gms/common/util/e;
 
-    invoke-interface {v0}, Lcom/google/android/gms/common/util/e;->nr()J
+    invoke-interface {v0}, Lcom/google/android/gms/common/util/e;->np()J
 
     move-result-wide v0
 
-    iget-wide v2, p0, Lcom/google/android/gms/measurement/internal/ey;->aGi:J
+    iget-wide v2, p0, Lcom/google/android/gms/measurement/internal/ey;->aGe: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;->aFW:Lcom/google/android/gms/common/util/e;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFS:Lcom/google/android/gms/common/util/e;
 
-    invoke-interface {v0}, Lcom/google/android/gms/common/util/e;->nr()J
+    invoke-interface {v0}, Lcom/google/android/gms/common/util/e;->np()J
 
     move-result-wide v0
 
-    iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aGi:J
+    iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aGe:J
 
-    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;->yb()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;->yd()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yb()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;->atK:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->atG: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;->nF()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/common/c/b;->nD()Z
 
     move-result v0
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFL:Lcom/google/android/gms/measurement/internal/ka;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ka;->vd()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ka;->vb()Z
 
     move-result v0
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->atK:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->atG: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;->atK:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->atG: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;->aGh:Ljava/lang/Boolean;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aGd:Ljava/lang/Boolean;
 
-    iget-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;->aGd: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;->yd()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yb()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yk()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yi()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ds;->xM()Ljava/lang/String;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ds;->xK()Ljava/lang/String;
 
     move-result-object v3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yk()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yi()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v4
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ds;->xN()Ljava/lang/String;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ds;->xL()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;->yk()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yi()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ds;->xN()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ds;->xL()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;->aGh:Ljava/lang/Boolean;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aGd:Ljava/lang/Boolean;
 
     :cond_5
-    iget-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;->aGd: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;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->xY()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aEW:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aES:Lcom/google/android/gms/measurement/internal/ei;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ei;->ud()J
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ei;->ub()J
 
     move-result-wide v0
 
@@ -2025,13 +2025,13 @@
 
     if-nez v4, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->xY()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aEW:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aES:Lcom/google/android/gms/measurement/internal/ei;
 
-    iget-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;->aFS: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;->ya()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->xY()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/ei;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aEX:Lcom/google/android/gms/measurement/internal/ei;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ei;->ud()J
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ei;->ub()J
 
     move-result-wide v0
 
@@ -2054,13 +2054,13 @@
 
     if-nez v4, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vv()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 v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEE:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aGo:J
+    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aGk: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;->ya()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->xY()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/ei;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aEX:Lcom/google/android/gms/measurement/internal/ei;
 
-    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aGo:J
+    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aGk: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;->yr()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yp()Z
 
     move-result v0
 
     if-nez v0, :cond_6
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yo()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->ym()Z
 
     move-result v0
 
     if-eqz v0, :cond_f
 
-    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;->yb()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->yd()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yb()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->atK:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->atG: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;->nF()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/common/c/b;->nD()Z
 
     move-result v0
 
     if-nez v0, :cond_5
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFL:Lcom/google/android/gms/measurement/internal/ka;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ka;->vd()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ka;->vb()Z
 
     move-result v0
 
     if-nez v0, :cond_5
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->atK:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->atG: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->atK:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->atG: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->yk()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yi()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ds;->xM()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ds;->xK()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;->yk()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yi()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ds;->xN()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ds;->xL()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;->yd()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yb()Lcom/google/android/gms/measurement/internal/jm;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yk()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yi()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ds;->xM()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ds;->xK()Ljava/lang/String;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->xY()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/eh;->vo()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/eh;->vm()Ljava/lang/String;
 
     move-result-object v2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yk()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yi()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ds;->xN()Ljava/lang/String;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ds;->xL()Ljava/lang/String;
 
     move-result-object v3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->xY()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v4
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/eh;->xX()Ljava/lang/String;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/eh;->xV()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEG:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEC: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;->ya()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->xY()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/eh;->xY()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/eh;->xW()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yf()Lcom/google/android/gms/measurement/internal/dr;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/dr;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->xF()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->xD()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aGc:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFY:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/hm;->lE()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/hm;->lC()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aGc:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFY:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/hm;->yq()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/hm;->yo()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->xY()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/ei;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aEX:Lcom/google/android/gms/measurement/internal/ei;
 
-    iget-wide v2, p0, Lcom/google/android/gms/measurement/internal/ey;->aGo:J
+    iget-wide v2, p0, Lcom/google/android/gms/measurement/internal/ey;->aGk: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;->ya()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->xY()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/ek;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aEZ: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;->ya()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->xY()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yk()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yi()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ds;->xM()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ds;->xK()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;->ya()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->xY()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yk()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yi()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ds;->xN()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ds;->xL()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;->yc()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->xY()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/ek;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/eh;->aEZ:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->pO()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->pM()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;->aFP:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFL:Lcom/google/android/gms/measurement/internal/ka;
 
-    sget-object v2, Lcom/google/android/gms/measurement/internal/o;->aEp:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v2, Lcom/google/android/gms/measurement/internal/o;->aEl: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;->yd()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yb()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jm;->xA()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jm;->xy()Z
 
     move-result v0
 
     if-nez v0, :cond_a
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->xY()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aFr:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aFn:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->pO()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->pM()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vv()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;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->ya()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->xY()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aFr:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aFn: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;->yk()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yi()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ds;->xM()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ds;->xK()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;->yk()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yi()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ds;->xN()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ds;->xL()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;->yo()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->ym()Z
 
     move-result v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->xY()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/eh;->aEU:Landroid/content/SharedPreferences;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/eh;->aEQ: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;->aFP:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aFL:Lcom/google/android/gms/measurement/internal/ka;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ka;->rr()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ka;->rp()Z
 
     move-result v1
 
     if-nez v1, :cond_c
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->xY()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;->yc()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/gf;->yw()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/gf;->yu()V
 
     :cond_d
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yb()Lcom/google/android/gms/measurement/internal/in;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->xZ()Lcom/google/android/gms/measurement/internal/in;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/in;->aHU:Lcom/google/android/gms/measurement/internal/iv;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/in;->aHQ:Lcom/google/android/gms/measurement/internal/iv;
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/iv;->aHV:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v1
 
-    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/iv;->aHV:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ec;->xv()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ec;->xt()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ds;->xL()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ds;->xJ()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;->aHZ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/iv;->aHV:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v1
 
-    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/iv;->aHV:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ec;->xv()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ec;->xt()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ds;->xL()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ds;->xJ()Ljava/lang/String;
 
     move-result-object v2
 
-    sget-object v3, Lcom/google/android/gms/measurement/internal/o;->aDy: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
 
@@ -2559,19 +2559,19 @@
 
     if-eqz v1, :cond_e
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/iv;->aHV:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/iv;->aHV:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v1
 
-    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/iv;->aHV:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vq()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;->aHZ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/iv;->aHV:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vw()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/ej;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/eh;->aFe: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;->aHZ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/iv;->aHV:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->aHZ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/iv;->aHV:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vq()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;->yi()Lcom/google/android/gms/measurement/internal/hm;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yg()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;->ya()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->xY()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aFk:Lcom/google/android/gms/measurement/internal/ej;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aFg:Lcom/google/android/gms/measurement/internal/ej;
 
-    iget-object v1, p0, 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/ey;->aFL:Lcom/google/android/gms/measurement/internal/ka;
 
-    sget-object v2, Lcom/google/android/gms/measurement/internal/o;->aDK:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v2, Lcom/google/android/gms/measurement/internal/o;->aDG: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;->ya()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->xY()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aFl:Lcom/google/android/gms/measurement/internal/ej;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aFh:Lcom/google/android/gms/measurement/internal/ej;
 
-    iget-object v1, p0, 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/ey;->aFL:Lcom/google/android/gms/measurement/internal/ka;
 
-    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;->aDH: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;->aGj:Ljava/lang/Boolean;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ey;->aGf: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 bc26caa49d..3f17639df0 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 aGp:Ljava/util/concurrent/BlockingQueue;
+.field private final aGl: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 aGq:Lcom/google/android/gms/measurement/internal/ev;
+.field private final synthetic aGm: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;->aGq:Lcom/google/android/gms/measurement/internal/ev;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ez;->aGm: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;->aGp:Ljava/util/concurrent/BlockingQueue;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/ez;->aGl: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;->aGq:Lcom/google/android/gms/measurement/internal/ev;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ez;->aGm:Lcom/google/android/gms/measurement/internal/ev;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()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;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->aGq:Lcom/google/android/gms/measurement/internal/ev;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ez;->aGm: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;->aGp:Ljava/util/concurrent/BlockingQueue;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ez;->aGl: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;->aGp:Ljava/util/concurrent/BlockingQueue;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ez;->aGl: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;->aGq:Lcom/google/android/gms/measurement/internal/ev;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ez;->aGm: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;->aGq:Lcom/google/android/gms/measurement/internal/ev;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ez;->aGm: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;->aGp:Ljava/util/concurrent/BlockingQueue;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ez;->aGl: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;->aGq:Lcom/google/android/gms/measurement/internal/ev;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ez;->aGm: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;->aGq:Lcom/google/android/gms/measurement/internal/ev;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ez;->aGm: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;->aGq:Lcom/google/android/gms/measurement/internal/ev;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ez;->aGm: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;->aGq:Lcom/google/android/gms/measurement/internal/ev;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ez;->aGm: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;->aGq:Lcom/google/android/gms/measurement/internal/ev;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ez;->aGm: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;->aGq:Lcom/google/android/gms/measurement/internal/ev;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ez;->aGm: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;->aGq:Lcom/google/android/gms/measurement/internal/ev;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ez;->aGm: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;->aGq:Lcom/google/android/gms/measurement/internal/ev;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ez;->aGm:Lcom/google/android/gms/measurement/internal/ev;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->aGq:Lcom/google/android/gms/measurement/internal/ev;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ez;->aGm: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;->aGq:Lcom/google/android/gms/measurement/internal/ev;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ez;->aGm: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;->aGq:Lcom/google/android/gms/measurement/internal/ev;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ez;->aGm: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;->aGq:Lcom/google/android/gms/measurement/internal/ev;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ez;->aGm: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;->aGq:Lcom/google/android/gms/measurement/internal/ev;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ez;->aGm: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;->aGq:Lcom/google/android/gms/measurement/internal/ev;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ez;->aGm: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;->aGq:Lcom/google/android/gms/measurement/internal/ev;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ez;->aGm:Lcom/google/android/gms/measurement/internal/ev;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vv()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;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->aGq:Lcom/google/android/gms/measurement/internal/ev;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ez;->aGm: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 657f12aa3e..b3432223b0 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 aBK:Lcom/google/android/gms/measurement/internal/ey;
+.field private final synthetic aBG:Lcom/google/android/gms/measurement/internal/ey;
 
-.field private final synthetic aGr:Lcom/google/android/gms/measurement/internal/gb;
+.field private final synthetic aGn: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;->aBK:Lcom/google/android/gms/measurement/internal/ey;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fa;->aBG:Lcom/google/android/gms/measurement/internal/ey;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fa;->aGr:Lcom/google/android/gms/measurement/internal/gb;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fa;->aGn: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;->aBK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fa;->aBG:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fa;->aGr:Lcom/google/android/gms/measurement/internal/gb;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fa;->aGn: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;->aBK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fa;->aBG: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 21008b0170..0d038b20d6 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 aAl:J
+.field private aAh:J
 
-.field final aBO:Lcom/google/android/gms/measurement/internal/ey;
+.field final aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-.field aFf:J
+.field aFb:J
 
-.field aGi:J
+.field aGe:J
 
-.field private aGo:J
+.field private aGk:J
 
-.field private aGs:Ljava/lang/Boolean;
+.field private aGo:Ljava/lang/Boolean;
 
-.field aGt:Ljava/util/List;
+.field aGp:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -26,31 +26,31 @@
     .end annotation
 .end field
 
-.field aGu:J
+.field aGq:J
 
-.field aGv:J
+.field aGr:J
 
-.field aGw:J
+.field aGs:J
 
-.field aGx:Ljava/lang/String;
+.field aGt:Ljava/lang/String;
 
-.field aGy:Z
+.field aGu:Z
 
-.field private adP:J
+.field private adL:J
 
-.field private amx:Z
+.field private amt:Z
 
-.field private final ane:Ljava/lang/String;
+.field private final ana:Ljava/lang/String;
 
-.field private anq:Ljava/lang/String;
+.field private anm:Ljava/lang/String;
 
-.field private axu:J
+.field private axq:J
 
-.field private axw:J
+.field private axs:J
 
-.field private azN:Ljava/lang/String;
+.field private azJ:Ljava/lang/String;
 
-.field private azP:Z
+.field private azL: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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fb;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fb;->ane:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fb;->ana:Ljava/lang/String;
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/fb;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vo()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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBK: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;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGu:Z
 
-    iget-boolean v1, p0, Lcom/google/android/gms/measurement/internal/fb;->amx:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/measurement/internal/fb;->amt: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;->aGy:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGu:Z
 
-    iput-boolean p1, p0, Lcom/google/android/gms/measurement/internal/fb;->amx:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/measurement/internal/fb;->amt: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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBK: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;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGu: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;->aGy:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGu: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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBK: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;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGu: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;->aGy:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGu: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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBK: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;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGu: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;->aGy:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGu: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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBK: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;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGu: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;->aGy:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGu: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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBK: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;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGu:Z
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fb;->anq:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fb;->anm: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;->aGy:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGu:Z
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fb;->anq:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fb;->anm: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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBK: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;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGu:Z
 
-    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/fb;->axu:J
+    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/fb;->axq: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;->aGy:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGu:Z
 
-    iput-wide p1, p0, Lcom/google/android/gms/measurement/internal/fb;->axu:J
+    iput-wide p1, p0, Lcom/google/android/gms/measurement/internal/fb;->axq: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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBK: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;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGu: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;->aGy:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGu: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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/fb;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    iget-boolean v2, p0, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
+    iget-boolean v2, p0, Lcom/google/android/gms/measurement/internal/fb;->aGu: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;->aGy:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGu: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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBK: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;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGu:Z
 
-    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/fb;->axw:J
+    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/fb;->axs: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;->aGy:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGu:Z
 
-    iput-wide p1, p0, Lcom/google/android/gms/measurement/internal/fb;->axw:J
+    iput-wide p1, p0, Lcom/google/android/gms/measurement/internal/fb;->axs: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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBK: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;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGu:Z
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fb;->aGs:Ljava/lang/Boolean;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fb;->aGo: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;->aGy:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGu:Z
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fb;->aGs:Ljava/lang/Boolean;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fb;->aGo: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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBK: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;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGu: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;->aGy:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGu: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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBK: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;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGu: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;->aGy:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGu: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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBK: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;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGu: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;->aGy:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGu: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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBK: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;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGu:Z
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fb;->azN:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fb;->azJ: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;->aGy:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGu:Z
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fb;->azN:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fb;->azJ: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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBK: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;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()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;->aGy:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGu: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;->aGy:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGu: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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBK: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;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()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;->aGy:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGu: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;->aGy:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGu: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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBK: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;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGu:Z
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fb;->aGx:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fb;->aGt: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;->aGy:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGu:Z
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fb;->aGx:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fb;->aGt: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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBK: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;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()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;->aGy:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGu: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;->aGy:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGu:Z
 
     iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fb;->zzd:Ljava/lang/String;
 
     return-void
 .end method
 
-.method public final ne()Z
+.method public final nc()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBK: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;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->azP:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->azL:Z
 
     return v0
 .end method
 
-.method public final nn()J
+.method public final nl()J
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBK: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;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGo:J
+    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGk:J
 
     return-wide v0
 .end method
 
-.method public final pH()Z
+.method public final pF()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBK: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;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGu:Z
 
     return v0
 .end method
 
-.method public final qZ()Ljava/lang/String;
+.method public final qX()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBK: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;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->zzj:Ljava/lang/String;
 
     return-object v0
 .end method
 
-.method public final qz()Ljava/lang/String;
+.method public final qx()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBK: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;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->ane:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->ana:Ljava/lang/String;
 
     return-object v0
 .end method
 
-.method public final rZ()J
+.method public final rX()J
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBK: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;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/fb;->adP:J
+    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/fb;->adL:J
 
     return-wide v0
 .end method
 
-.method public final sc()J
+.method public final sa()J
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBK: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;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
     iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/fb;->zzg:J
 
     return-wide v0
 .end method
 
-.method public final st()J
+.method public final sr()J
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBK: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;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aAl:J
+    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aAh: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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBK: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;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGu:Z
 
-    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/fb;->adP:J
+    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/fb;->adL:J
 
     cmp-long v3, v1, p1
 
@@ -928,203 +928,39 @@
     :goto_0
     or-int/2addr v0, v1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGu:Z
 
-    iput-wide p1, p0, Lcom/google/android/gms/measurement/internal/fb;->adP:J
+    iput-wide p1, p0, Lcom/google/android/gms/measurement/internal/fb;->adL:J
 
     return-void
 .end method
 
-.method public final uD()Ljava/lang/String;
+.method public final uB()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBK: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;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->zzs:Ljava/lang/String;
 
     return-object v0
 .end method
 
-.method public final uf()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;->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
+.method public final uZ()V
     .locals 5
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBK: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;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
     iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/fb;->zzg:J
 
@@ -1138,15 +974,15 @@
 
     if-lez v4, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vv()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;
+    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/fb;->ane:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fb;->ana:Ljava/lang/String;
 
     invoke-static {v1}, Lcom/google/android/gms/measurement/internal/dv;->bX(Ljava/lang/String;)Ljava/lang/Object;
 
@@ -1161,43 +997,155 @@
     :cond_0
     const/4 v2, 0x1
 
-    iput-boolean v2, p0, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
+    iput-boolean v2, p0, Lcom/google/android/gms/measurement/internal/fb;->aGu:Z
 
     iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/fb;->zzg:J
 
     return-void
 .end method
 
-.method public final vo()Ljava/lang/String;
+.method public final ud()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBK: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;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->zzw:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->anm:Ljava/lang/String;
 
     return-object v0
 .end method
 
-.method public final w(J)V
-    .locals 4
+.method public final ue()Ljava/lang/String;
+    .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBK: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;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->zzd:Ljava/lang/String;
 
-    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/fb;->aGo:J
+    return-object v0
+.end method
+
+.method public final ug()J
+    .locals 2
+
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBK:Lcom/google/android/gms/measurement/internal/ey;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
+
+    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/fb;->zzh:J
+
+    return-wide v0
+.end method
+
+.method public final uh()J
+    .locals 2
+
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBK:Lcom/google/android/gms/measurement/internal/ey;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
+
+    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/fb;->zzi:J
+
+    return-wide v0
+.end method
+
+.method public final uj()J
+    .locals 2
+
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBK:Lcom/google/android/gms/measurement/internal/ey;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
+
+    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/fb;->zzk:J
+
+    return-wide v0
+.end method
+
+.method public final ul()J
+    .locals 2
+
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBK:Lcom/google/android/gms/measurement/internal/ey;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
+
+    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/fb;->axq:J
+
+    return-wide v0
+.end method
+
+.method public final um()J
+    .locals 2
+
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBK:Lcom/google/android/gms/measurement/internal/ey;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
+
+    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/fb;->zzu:J
+
+    return-wide v0
+.end method
+
+.method public final uu()J
+    .locals 2
+
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBK:Lcom/google/android/gms/measurement/internal/ey;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
+
+    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/fb;->axs: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;->aBK:Lcom/google/android/gms/measurement/internal/ey;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
+
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGu:Z
+
+    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/fb;->aAh:J
 
     cmp-long v3, v1, p1
 
@@ -1213,126 +1161,178 @@
     :goto_0
     or-int/2addr v0, v1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGu:Z
 
-    iput-wide p1, p0, Lcom/google/android/gms/measurement/internal/fb;->aGo:J
+    iput-wide p1, p0, Lcom/google/android/gms/measurement/internal/fb;->aAh:J
 
     return-void
 .end method
 
-.method public final wi()Ljava/lang/Boolean;
+.method public final vm()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBK: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;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGs:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->zzw:Ljava/lang/String;
 
     return-object v0
 .end method
 
-.method public final xJ()Z
-    .locals 1
+.method public final w(J)V
+    .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBK: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;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->amx:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGu:Z
+
+    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/fb;->aGk: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;->aGu:Z
+
+    iput-wide p1, p0, Lcom/google/android/gms/measurement/internal/fb;->aGk:J
+
+    return-void
+.end method
+
+.method public final wg()Ljava/lang/Boolean;
+    .locals 1
+
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBK:Lcom/google/android/gms/measurement/internal/ey;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
+
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGo:Ljava/lang/Boolean;
+
+    return-object v0
+.end method
+
+.method public final xH()Z
+    .locals 1
+
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBK:Lcom/google/android/gms/measurement/internal/ey;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
+
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->amt:Z
 
     return v0
 .end method
 
-.method public final xM()Ljava/lang/String;
+.method public final xK()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBK: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;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGx:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGt:Ljava/lang/String;
 
     return-object v0
 .end method
 
-.method public final xX()Ljava/lang/String;
+.method public final xV()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBK: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;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->zze:Ljava/lang/String;
 
     return-object v0
 .end method
 
-.method public final yr()Z
+.method public final yp()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBK: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;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
     iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->zzr:Z
 
     return v0
 .end method
 
-.method public final ys()Ljava/lang/String;
+.method public final yq()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBK: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;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->zzf:Ljava/lang/String;
 
     return-object v0
 .end method
 
-.method public final yt()Ljava/lang/String;
+.method public final yr()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBK: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;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->azN:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->azJ:Ljava/lang/String;
 
     return-object v0
 .end method
 
-.method public final yu()Ljava/util/List;
+.method public final ys()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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBK: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;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGt:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGp: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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBK: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;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGu:Z
 
-    iget-boolean v1, p0, Lcom/google/android/gms/measurement/internal/fb;->azP:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/measurement/internal/fb;->azL: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;->aGy:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGu:Z
 
-    iput-boolean p1, p0, Lcom/google/android/gms/measurement/internal/fb;->azP:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/measurement/internal/fb;->azL: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 bd6a05768b..f4a383aafd 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 aBO:Lcom/google/android/gms/measurement/internal/ey;
+.field private final aBK: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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fc;->aBK: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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fc;->aBK: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 0a66912679..9a91e0b2ac 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 aGA:Lcom/google/android/gms/measurement/internal/fe;
+.field private final synthetic aGv:Lcom/google/android/gms/measurement/internal/zzm;
 
-.field private final synthetic aGz:Lcom/google/android/gms/measurement/internal/zzm;
+.field private final synthetic aGw:Lcom/google/android/gms/measurement/internal/fe;
 
 
 # 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;->aGA:Lcom/google/android/gms/measurement/internal/fe;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fd;->aGw:Lcom/google/android/gms/measurement/internal/fe;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fd;->aGz:Lcom/google/android/gms/measurement/internal/zzm;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fd;->aGv: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;->aGA:Lcom/google/android/gms/measurement/internal/fe;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fd;->aGw: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;->mY()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->mW()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fd;->aGA:Lcom/google/android/gms/measurement/internal/fe;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fd;->aGw: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;->aGz:Lcom/google/android/gms/measurement/internal/zzm;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fd;->aGv:Lcom/google/android/gms/measurement/internal/zzm;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->yF()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->yD()V
 
-    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
+    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/zzm;->atO: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 e12aa1d3e9..d81e39f091 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 aGB:Lcom/google/android/gms/measurement/internal/jf;
+.field final aGx:Lcom/google/android/gms/measurement/internal/jf;
 
-.field private aGC:Ljava/lang/Boolean;
+.field private aGy:Ljava/lang/Boolean;
 
-.field private anq:Ljava/lang/String;
+.field private anm: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;->aGB:Lcom/google/android/gms/measurement/internal/jf;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fe;->aGx:Lcom/google/android/gms/measurement/internal/jf;
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fe;->anq:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fe;->anm: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;->aGB:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object p0, p0, Lcom/google/android/gms/measurement/internal/fe;->aGx: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;->atS:Ljava/lang/String;
+    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzm;->atO: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;->aGB:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fe;->aGx:Lcom/google/android/gms/measurement/internal/jf;
 
-    iget-object v0, v0, 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/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yb()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->ane:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->ana: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;->aGC:Ljava/lang/Boolean;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/fe;->aGy: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;->anq:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/fe;->anm: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;->aGB:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/fe;->aGx:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/jf;->vt()Landroid/content/Context;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/jf;->vr()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;->aGB:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/fe;->aGx:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/jf;->vt()Landroid/content/Context;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/jf;->vr()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;->aGC:Ljava/lang/Boolean;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fe;->aGy:Ljava/lang/Boolean;
 
     :cond_2
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/fe;->aGC:Ljava/lang/Boolean;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/fe;->aGy: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;->anq:Ljava/lang/String;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/fe;->anm:Ljava/lang/String;
 
     if-nez p2, :cond_4
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/fe;->aGB:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/fe;->aGx:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/jf;->vt()Landroid/content/Context;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/jf;->vr()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;->anq:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fe;->anm:Ljava/lang/String;
 
     :cond_4
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/fe;->anq:Ljava/lang/String;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/fe;->anm: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;->aGB:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fe;->aGx:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->aGB:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/fe;->aGx:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/jf;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/jf;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, 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/dv;->aEw: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;->aGB:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fe;->aGx:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ev;->uI()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ev;->uG()Z
 
     move-result v0
 
@@ -284,9 +284,9 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fe;->aGB:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fe;->aGx:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vu()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;->aGB:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fe;->aGx:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vu()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;->anq:Ljava/lang/String;
+    iget-object v3, v2, Lcom/google/android/gms/measurement/internal/jn;->anm: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;->aGB:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fe;->aGx:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, 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/zzm;->atS:Ljava/lang/String;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/zzm;->atO: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;->aGB:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fe;->aGx:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vu()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;->aGB:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/fe;->aGx:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/jf;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/jf;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->aGB:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fe;->aGx:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vu()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;->anq:Ljava/lang/String;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jn;->anm: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;->aGB:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/fe;->aGx:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/jf;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/jf;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p3
 
-    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->aGB:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fe;->aGx:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vu()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;->anq:Ljava/lang/String;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jn;->anm: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;->aGB:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/fe;->aGx:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/jf;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/jf;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEw:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-object p3, p4, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
+    iget-object p3, p4, Lcom/google/android/gms/measurement/internal/zzm;->atO: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;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIR: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;->atS:Ljava/lang/String;
+    iget-object p1, p2, Lcom/google/android/gms/measurement/internal/zzm;->atO:Ljava/lang/String;
 
-    iput-object p1, v0, Lcom/google/android/gms/measurement/internal/zzv;->atS:Ljava/lang/String;
+    iput-object p1, v0, Lcom/google/android/gms/measurement/internal/zzv;->atO: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;->aGB:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fe;->aGx:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, 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/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fe;->aGB:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fe;->aGx:Lcom/google/android/gms/measurement/internal/jf;
 
-    iget-object v1, v1, 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/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->ye()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v1
 
-    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzan;->atS:Ljava/lang/String;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzan;->atO: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;->aGB:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fe;->aGx:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vq()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
-    invoke-interface {v0}, Lcom/google/android/gms/common/util/e;->ns()J
+    invoke-interface {v0}, Lcom/google/android/gms/common/util/e;->nq()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;->aGB:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/fe;->aGx:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/jf;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/jf;->vu()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;->aGB:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/fe;->aGx:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/jf;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/jf;->vv()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;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->aGB:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/fe;->aGx:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/jf;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/jf;->vq()Lcom/google/android/gms/common/util/e;
 
     move-result-object v5
 
-    invoke-interface {v5}, Lcom/google/android/gms/common/util/e;->ns()J
+    invoke-interface {v5}, Lcom/google/android/gms/common/util/e;->nq()J
 
     move-result-wide v5
 
     div-long/2addr v5, v2
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/fe;->aGB:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/fe;->aGx:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/jf;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/jf;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEH: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, "Log and bundle processed. event, size, time_ms"
 
-    iget-object v7, p0, Lcom/google/android/gms/measurement/internal/fe;->aGB:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v7, p0, Lcom/google/android/gms/measurement/internal/fe;->aGx:Lcom/google/android/gms/measurement/internal/jf;
 
-    iget-object v7, v7, 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/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->ye()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v7
 
-    iget-object v8, p1, Lcom/google/android/gms/measurement/internal/zzan;->atS:Ljava/lang/String;
+    iget-object v8, p1, Lcom/google/android/gms/measurement/internal/zzan;->atO: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;->aGB:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fe;->aGx:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/jf;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/jf;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->aGB:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/fe;->aGx:Lcom/google/android/gms/measurement/internal/jf;
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->ye()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v2
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/zzan;->atS:Ljava/lang/String;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/zzan;->atO: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;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIR: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;->atS:Ljava/lang/String;
+    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzv;->atO: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;->aGB:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fe;->aGx: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;->aGB:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fe;->aGx:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vu()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;->aGB:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/fe;->aGx:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/jf;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/jf;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->atS:Ljava/lang/String;
+    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzm;->atO: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 934e4d5bde..9ccd5c48a8 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 aGD:Lcom/google/android/gms/measurement/internal/fe;
+.field private final synthetic aGv:Lcom/google/android/gms/measurement/internal/zzm;
 
-.field private final synthetic aGz:Lcom/google/android/gms/measurement/internal/zzm;
+.field private final synthetic aGz:Lcom/google/android/gms/measurement/internal/fe;
 
-.field private final synthetic ane:Ljava/lang/String;
+.field private final synthetic ana:Ljava/lang/String;
 
-.field private final synthetic anq:Ljava/lang/String;
+.field private final synthetic anm: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;->aGD:Lcom/google/android/gms/measurement/internal/fe;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ff;->aGz:Lcom/google/android/gms/measurement/internal/fe;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ff;->aGz:Lcom/google/android/gms/measurement/internal/zzm;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ff;->aGv:Lcom/google/android/gms/measurement/internal/zzm;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/ff;->ane:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/ff;->ana:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/ff;->anq:Ljava/lang/String;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/ff;->anm: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;->aGD:Lcom/google/android/gms/measurement/internal/fe;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ff;->aGz: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;->mY()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->mW()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ff;->aGD:Lcom/google/android/gms/measurement/internal/fe;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ff;->aGz: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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ff;->aGz:Lcom/google/android/gms/measurement/internal/zzm;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ff;->aGv:Lcom/google/android/gms/measurement/internal/zzm;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/zzm;->atO:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ff;->ane:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ff;->ana:Ljava/lang/String;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ff;->anq:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ff;->anm: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 1fe7d657de..63ca371fcc 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 aGA:Lcom/google/android/gms/measurement/internal/fe;
+.field private final synthetic aGA:Lcom/google/android/gms/measurement/internal/zzv;
 
-.field private final synthetic aGE:Lcom/google/android/gms/measurement/internal/zzv;
+.field private final synthetic aGw:Lcom/google/android/gms/measurement/internal/fe;
 
 
 # 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;->aGA:Lcom/google/android/gms/measurement/internal/fe;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fg;->aGw:Lcom/google/android/gms/measurement/internal/fe;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fg;->aGE:Lcom/google/android/gms/measurement/internal/zzv;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fg;->aGA: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;->aGA:Lcom/google/android/gms/measurement/internal/fe;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fg;->aGw: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;->mY()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->mW()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fg;->aGE:Lcom/google/android/gms/measurement/internal/zzv;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fg;->aGA:Lcom/google/android/gms/measurement/internal/zzv;
 
-    iget-object v0, v0, 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/zzv;->aIR:Lcom/google/android/gms/measurement/internal/zzkj;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/zzkj;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/zzkj;->rA()Ljava/lang/Object;
 
     move-result-object v0
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fg;->aGA:Lcom/google/android/gms/measurement/internal/fe;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fg;->aGw: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;->aGE:Lcom/google/android/gms/measurement/internal/zzv;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fg;->aGA:Lcom/google/android/gms/measurement/internal/zzv;
 
-    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/zzv;->atS:Ljava/lang/String;
+    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/zzv;->atO: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;->aGA:Lcom/google/android/gms/measurement/internal/fe;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fg;->aGw: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;->aGE:Lcom/google/android/gms/measurement/internal/zzv;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fg;->aGA:Lcom/google/android/gms/measurement/internal/zzv;
 
-    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/zzv;->atS:Ljava/lang/String;
+    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/zzv;->atO: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 2419dbd905..79b711f0e2 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 aGD:Lcom/google/android/gms/measurement/internal/fe;
+.field private final synthetic aGv:Lcom/google/android/gms/measurement/internal/zzm;
 
-.field private final synthetic aGz:Lcom/google/android/gms/measurement/internal/zzm;
+.field private final synthetic aGz:Lcom/google/android/gms/measurement/internal/fe;
 
-.field private final synthetic ane:Ljava/lang/String;
+.field private final synthetic ana:Ljava/lang/String;
 
-.field private final synthetic anq:Ljava/lang/String;
+.field private final synthetic anm: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;->aGD:Lcom/google/android/gms/measurement/internal/fe;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fh;->aGz:Lcom/google/android/gms/measurement/internal/fe;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fh;->aGz:Lcom/google/android/gms/measurement/internal/zzm;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fh;->aGv:Lcom/google/android/gms/measurement/internal/zzm;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/fh;->ane:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/fh;->ana:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/fh;->anq:Ljava/lang/String;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/fh;->anm: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;->aGD:Lcom/google/android/gms/measurement/internal/fe;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fh;->aGz: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;->mY()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->mW()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fh;->aGD:Lcom/google/android/gms/measurement/internal/fe;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fh;->aGz: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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fh;->aGz:Lcom/google/android/gms/measurement/internal/zzm;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fh;->aGv:Lcom/google/android/gms/measurement/internal/zzm;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/zzm;->atO:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/fh;->ane:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/fh;->ana:Ljava/lang/String;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/fh;->anq:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/fh;->anm: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 4c1eeb53ee..544dac3cf1 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 aGD:Lcom/google/android/gms/measurement/internal/fe;
+.field private final synthetic aGz:Lcom/google/android/gms/measurement/internal/fe;
 
-.field private final synthetic ane:Ljava/lang/String;
+.field private final synthetic ana:Ljava/lang/String;
 
-.field private final synthetic anq:Ljava/lang/String;
+.field private final synthetic anm:Ljava/lang/String;
 
-.field private final synthetic atS:Ljava/lang/String;
+.field private final synthetic atO: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;->aGD:Lcom/google/android/gms/measurement/internal/fe;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fi;->aGz:Lcom/google/android/gms/measurement/internal/fe;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fi;->atS:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fi;->atO:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/fi;->ane:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/fi;->ana:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/fi;->anq:Ljava/lang/String;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/fi;->anm: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;->aGD:Lcom/google/android/gms/measurement/internal/fe;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fi;->aGz: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;->mY()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->mW()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fi;->aGD:Lcom/google/android/gms/measurement/internal/fe;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fi;->aGz: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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fi;->atS:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fi;->atO:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/fi;->ane:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/fi;->ana:Ljava/lang/String;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/fi;->anq:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/fi;->anm: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 5031697aec..d5d9283f6f 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 aGA:Lcom/google/android/gms/measurement/internal/fe;
+.field private final synthetic aGv:Lcom/google/android/gms/measurement/internal/zzm;
 
-.field private final synthetic aGz:Lcom/google/android/gms/measurement/internal/zzm;
+.field private final synthetic aGw:Lcom/google/android/gms/measurement/internal/fe;
 
 
 # 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;->aGA:Lcom/google/android/gms/measurement/internal/fe;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fj;->aGw:Lcom/google/android/gms/measurement/internal/fe;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fj;->aGz:Lcom/google/android/gms/measurement/internal/zzm;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fj;->aGv: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;->aGA:Lcom/google/android/gms/measurement/internal/fe;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fj;->aGw: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;->mY()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->mW()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fj;->aGA:Lcom/google/android/gms/measurement/internal/fe;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fj;->aGw: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;->aGz:Lcom/google/android/gms/measurement/internal/zzm;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fj;->aGv: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 5b65d07edf..3941336616 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 aGD:Lcom/google/android/gms/measurement/internal/fe;
+.field private final synthetic aGz:Lcom/google/android/gms/measurement/internal/fe;
 
-.field private final synthetic ane:Ljava/lang/String;
+.field private final synthetic ana:Ljava/lang/String;
 
-.field private final synthetic anq:Ljava/lang/String;
+.field private final synthetic anm:Ljava/lang/String;
 
-.field private final synthetic atS:Ljava/lang/String;
+.field private final synthetic atO: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;->aGD:Lcom/google/android/gms/measurement/internal/fe;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fk;->aGz:Lcom/google/android/gms/measurement/internal/fe;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fk;->atS:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fk;->atO:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/fk;->ane:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/fk;->ana:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/fk;->anq:Ljava/lang/String;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/fk;->anm: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;->aGD:Lcom/google/android/gms/measurement/internal/fe;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fk;->aGz: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;->mY()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->mW()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fk;->aGD:Lcom/google/android/gms/measurement/internal/fe;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fk;->aGz: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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fk;->atS:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fk;->atO:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/fk;->ane:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/fk;->ana:Ljava/lang/String;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/fk;->anq:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/fk;->anm: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 06b6376d75..ee6b6e994d 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 aGF:Lcom/google/android/gms/measurement/internal/zzan;
+.field private final synthetic aGB:Lcom/google/android/gms/measurement/internal/zzan;
 
-.field private final synthetic aGG:Lcom/google/android/gms/measurement/internal/fe;
+.field private final synthetic aGC:Lcom/google/android/gms/measurement/internal/fe;
 
-.field private final synthetic ane:Ljava/lang/String;
+.field private final synthetic ana: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;->aGG:Lcom/google/android/gms/measurement/internal/fe;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fl;->aGC:Lcom/google/android/gms/measurement/internal/fe;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fl;->aGF:Lcom/google/android/gms/measurement/internal/zzan;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fl;->aGB:Lcom/google/android/gms/measurement/internal/zzan;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/fl;->ane:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/fl;->ana: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;->aGG:Lcom/google/android/gms/measurement/internal/fe;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fl;->aGC: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;->mY()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->mW()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fl;->aGG:Lcom/google/android/gms/measurement/internal/fe;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fl;->aGC: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;->aGF:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fl;->aGB:Lcom/google/android/gms/measurement/internal/zzan;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/fl;->ane:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/fl;->ana: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 6b3d7273f6..d298fe827c 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 aGF:Lcom/google/android/gms/measurement/internal/zzan;
+.field private final synthetic aGB:Lcom/google/android/gms/measurement/internal/zzan;
 
-.field private final synthetic aGG:Lcom/google/android/gms/measurement/internal/fe;
+.field private final synthetic aGC:Lcom/google/android/gms/measurement/internal/fe;
 
-.field private final synthetic aGH:Lcom/google/android/gms/measurement/internal/zzm;
+.field private final synthetic aGD: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;->aGG:Lcom/google/android/gms/measurement/internal/fe;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fm;->aGC:Lcom/google/android/gms/measurement/internal/fe;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fm;->aGF:Lcom/google/android/gms/measurement/internal/zzan;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fm;->aGB:Lcom/google/android/gms/measurement/internal/zzan;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/fm;->aGH:Lcom/google/android/gms/measurement/internal/zzm;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/fm;->aGD: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;->aGG:Lcom/google/android/gms/measurement/internal/fe;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fm;->aGC:Lcom/google/android/gms/measurement/internal/fe;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fm;->aGF:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fm;->aGB:Lcom/google/android/gms/measurement/internal/zzan;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/fm;->aGH:Lcom/google/android/gms/measurement/internal/zzm;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/fm;->aGD:Lcom/google/android/gms/measurement/internal/zzm;
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzan;->atS:Ljava/lang/String;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzan;->atO: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;->aCq:Lcom/google/android/gms/measurement/internal/zzam;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzan;->aCm:Lcom/google/android/gms/measurement/internal/zzam;
 
     if-eqz v3, :cond_2
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzan;->aCq:Lcom/google/android/gms/measurement/internal/zzam;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzan;->aCm:Lcom/google/android/gms/measurement/internal/zzam;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/zzam;->aCr:Landroid/os/Bundle;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/zzam;->aCn: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;->aCq:Lcom/google/android/gms/measurement/internal/zzam;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzan;->aCm: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;->aGB:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/fe;->aGx:Lcom/google/android/gms/measurement/internal/jf;
 
-    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/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ey;->aFL:Lcom/google/android/gms/measurement/internal/ka;
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/zzm;->atO: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;->aGB:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/fe;->aGx:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEG:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEC: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;->aCq:Lcom/google/android/gms/measurement/internal/zzam;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/zzan;->aCm:Lcom/google/android/gms/measurement/internal/zzam;
 
-    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/zzan;->anq:Ljava/lang/String;
+    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/zzan;->anm: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;->aGG:Lcom/google/android/gms/measurement/internal/fe;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fm;->aGC: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;->mY()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/jf;->mW()V
 
-    iget-object v1, 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;->aGC: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;->aGH:Lcom/google/android/gms/measurement/internal/zzm;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/fm;->aGD: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 3888aafda9..43fe4702f7 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 aGG:Lcom/google/android/gms/measurement/internal/fe;
+.field private final synthetic aGC:Lcom/google/android/gms/measurement/internal/fe;
 
-.field private final synthetic aGH:Lcom/google/android/gms/measurement/internal/zzm;
+.field private final synthetic aGD:Lcom/google/android/gms/measurement/internal/zzm;
 
-.field private final synthetic aGI:Lcom/google/android/gms/measurement/internal/zzkj;
+.field private final synthetic aGE: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;->aGG:Lcom/google/android/gms/measurement/internal/fe;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fn;->aGC:Lcom/google/android/gms/measurement/internal/fe;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fn;->aGI:Lcom/google/android/gms/measurement/internal/zzkj;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fn;->aGE:Lcom/google/android/gms/measurement/internal/zzkj;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/fn;->aGH:Lcom/google/android/gms/measurement/internal/zzm;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/fn;->aGD: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;->aGG:Lcom/google/android/gms/measurement/internal/fe;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fn;->aGC: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;->mY()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->mW()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fn;->aGI:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fn;->aGE:Lcom/google/android/gms/measurement/internal/zzkj;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/zzkj;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/zzkj;->rA()Ljava/lang/Object;
 
     move-result-object v0
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fn;->aGG:Lcom/google/android/gms/measurement/internal/fe;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fn;->aGC: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;->aGI:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fn;->aGE:Lcom/google/android/gms/measurement/internal/zzkj;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/fn;->aGH:Lcom/google/android/gms/measurement/internal/zzm;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/fn;->aGD: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;->aGG:Lcom/google/android/gms/measurement/internal/fe;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fn;->aGC: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;->aGI:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fn;->aGE:Lcom/google/android/gms/measurement/internal/zzkj;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/fn;->aGH:Lcom/google/android/gms/measurement/internal/zzm;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/fn;->aGD: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 3810b0162e..3f1145b1a6 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 aGF:Lcom/google/android/gms/measurement/internal/zzan;
+.field private final synthetic aGB:Lcom/google/android/gms/measurement/internal/zzan;
 
-.field private final synthetic aGG:Lcom/google/android/gms/measurement/internal/fe;
+.field private final synthetic aGC:Lcom/google/android/gms/measurement/internal/fe;
 
-.field private final synthetic ane:Ljava/lang/String;
+.field private final synthetic ana: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;->aGG:Lcom/google/android/gms/measurement/internal/fe;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fo;->aGC:Lcom/google/android/gms/measurement/internal/fe;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fo;->aGF:Lcom/google/android/gms/measurement/internal/zzan;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fo;->aGB:Lcom/google/android/gms/measurement/internal/zzan;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/fo;->ane:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/fo;->ana: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;->aGG:Lcom/google/android/gms/measurement/internal/fe;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fo;->aGC: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;->mY()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->mW()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fo;->aGG:Lcom/google/android/gms/measurement/internal/fe;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fo;->aGC: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;->aIp:Lcom/google/android/gms/measurement/internal/hg;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jf;->aIl: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;->aIp:Lcom/google/android/gms/measurement/internal/hg;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/jf;->aIl:Lcom/google/android/gms/measurement/internal/hg;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fo;->aGF:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fo;->aGB:Lcom/google/android/gms/measurement/internal/zzan;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/fo;->ane:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/fo;->ana: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 a72d1e9c28..f50d7fb49c 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 aGA:Lcom/google/android/gms/measurement/internal/fe;
+.field private final synthetic aGv:Lcom/google/android/gms/measurement/internal/zzm;
 
-.field private final synthetic aGz:Lcom/google/android/gms/measurement/internal/zzm;
+.field private final synthetic aGw:Lcom/google/android/gms/measurement/internal/fe;
 
 
 # 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;->aGA:Lcom/google/android/gms/measurement/internal/fe;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fp;->aGw:Lcom/google/android/gms/measurement/internal/fe;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fp;->aGz:Lcom/google/android/gms/measurement/internal/zzm;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fp;->aGv: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;->aGA:Lcom/google/android/gms/measurement/internal/fe;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fp;->aGw: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;->mY()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->mW()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fp;->aGA:Lcom/google/android/gms/measurement/internal/fe;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fp;->aGw: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;->aGz:Lcom/google/android/gms/measurement/internal/zzm;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fp;->aGv: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 e207012ff8..420006b777 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 aGA:Lcom/google/android/gms/measurement/internal/fe;
+.field private final synthetic aGv:Lcom/google/android/gms/measurement/internal/zzm;
 
-.field private final synthetic aGz:Lcom/google/android/gms/measurement/internal/zzm;
+.field private final synthetic aGw:Lcom/google/android/gms/measurement/internal/fe;
 
 
 # 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;->aGA:Lcom/google/android/gms/measurement/internal/fe;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fq;->aGw:Lcom/google/android/gms/measurement/internal/fe;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fq;->aGz:Lcom/google/android/gms/measurement/internal/zzm;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fq;->aGv: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;->aGA:Lcom/google/android/gms/measurement/internal/fe;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fq;->aGw: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;->mY()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->mW()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fq;->aGA:Lcom/google/android/gms/measurement/internal/fe;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fq;->aGw: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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fq;->aGz:Lcom/google/android/gms/measurement/internal/zzm;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fq;->aGv:Lcom/google/android/gms/measurement/internal/zzm;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/zzm;->atO: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 69fa501ce8..7316422e48 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 aGE:Lcom/google/android/gms/measurement/internal/zzv;
+.field private final synthetic aGA:Lcom/google/android/gms/measurement/internal/zzv;
 
-.field private final synthetic aGG:Lcom/google/android/gms/measurement/internal/fe;
+.field private final synthetic aGC:Lcom/google/android/gms/measurement/internal/fe;
 
-.field private final synthetic aGH:Lcom/google/android/gms/measurement/internal/zzm;
+.field private final synthetic aGD: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;->aGG:Lcom/google/android/gms/measurement/internal/fe;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fr;->aGC:Lcom/google/android/gms/measurement/internal/fe;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fr;->aGE:Lcom/google/android/gms/measurement/internal/zzv;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fr;->aGA:Lcom/google/android/gms/measurement/internal/zzv;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/fr;->aGH:Lcom/google/android/gms/measurement/internal/zzm;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/fr;->aGD: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;->aGG:Lcom/google/android/gms/measurement/internal/fe;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fr;->aGC: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;->mY()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->mW()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fr;->aGE:Lcom/google/android/gms/measurement/internal/zzv;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fr;->aGA:Lcom/google/android/gms/measurement/internal/zzv;
 
-    iget-object v0, v0, 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/zzv;->aIR:Lcom/google/android/gms/measurement/internal/zzkj;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/zzkj;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/zzkj;->rA()Ljava/lang/Object;
 
     move-result-object v0
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fr;->aGG:Lcom/google/android/gms/measurement/internal/fe;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fr;->aGC: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;->aGE:Lcom/google/android/gms/measurement/internal/zzv;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fr;->aGA:Lcom/google/android/gms/measurement/internal/zzv;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/fr;->aGH:Lcom/google/android/gms/measurement/internal/zzm;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/fr;->aGD: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;->aGG:Lcom/google/android/gms/measurement/internal/fe;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fr;->aGC: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;->aGE:Lcom/google/android/gms/measurement/internal/zzv;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fr;->aGA:Lcom/google/android/gms/measurement/internal/zzv;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/fr;->aGH:Lcom/google/android/gms/measurement/internal/zzm;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/fr;->aGD: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 8206c6b530..a1803a76c4 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 aGJ:Lcom/google/android/gms/measurement/internal/fe;
+.field private final synthetic aGF:Lcom/google/android/gms/measurement/internal/fe;
 
-.field private final synthetic ane:Ljava/lang/String;
+.field private final synthetic ana:Ljava/lang/String;
 
-.field private final synthetic anq:Ljava/lang/String;
+.field private final synthetic anm:Ljava/lang/String;
 
-.field private final synthetic atS:Ljava/lang/String;
+.field private final synthetic atO: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;->aGJ:Lcom/google/android/gms/measurement/internal/fe;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fs;->aGF:Lcom/google/android/gms/measurement/internal/fe;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fs;->atS:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fs;->atO:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/fs;->ane:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/fs;->ana:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/fs;->anq:Ljava/lang/String;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/fs;->anm: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;->atS:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fs;->atO:Ljava/lang/String;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fs;->aGJ:Lcom/google/android/gms/measurement/internal/fe;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fs;->aGF: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yh()Lcom/google/android/gms/measurement/internal/hh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yf()Lcom/google/android/gms/measurement/internal/hh;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fs;->ane:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fs;->ana: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;->anq:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/fs;->anm: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;->aGJ:Lcom/google/android/gms/measurement/internal/fe;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fs;->aGF: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yh()Lcom/google/android/gms/measurement/internal/hh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yf()Lcom/google/android/gms/measurement/internal/hh;
 
     move-result-object v0
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/fs;->ane:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/fs;->ana: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 2b6957f46d..005e612ee1 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;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ft;->aGG:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget v0, p1, Lcom/google/android/gms/measurement/internal/ey;->aGm:I
+    iget v0, p1, Lcom/google/android/gms/measurement/internal/ey;->aGi:I
 
     add-int/lit8 v0, v0, 0x1
 
-    iput v0, p1, Lcom/google/android/gms/measurement/internal/ey;->aGm:I
+    iput v0, p1, Lcom/google/android/gms/measurement/internal/ey;->aGi:I
 
     return-void
 .end method
 
 
 # virtual methods
-.method protected abstract pR()Z
+.method protected abstract pP()Z
 .end method
 
-.method final vd()Z
+.method final vb()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 xE()V
+.method protected final xC()V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ft;->vd()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ft;->vb()Z
 
     move-result v0
 
@@ -67,22 +67,22 @@
     throw v0
 .end method
 
-.method public final xF()V
+.method public final xD()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;->pR()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ft;->pP()Z
 
     move-result v0
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ft;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ft;->aGG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yq()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yo()V
 
     const/4 v0, 0x1
 
@@ -101,24 +101,24 @@
     throw v0
 .end method
 
-.method protected xV()V
+.method protected xT()V
     .locals 0
 
     return-void
 .end method
 
-.method public final yv()V
+.method public final yt()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;->xV()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ft;->xT()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ft;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ft;->aGG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yq()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yo()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 5d5a31e92e..b9d9d72a96 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 aGK:Lcom/google/android/gms/measurement/internal/ey;
+.field protected final aGG: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;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fu;->aGG:Lcom/google/android/gms/measurement/internal/ey;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public rA()V
+.method public ry()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fu;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fu;->aGG: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;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->rA()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->ry()V
 
     return-void
 .end method
 
-.method public vA()Lcom/google/android/gms/measurement/internal/jz;
+.method public vo()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fu;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fu;->aGG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vA()Lcom/google/android/gms/measurement/internal/jz;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    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
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
     return-void
 .end method
 
-.method public vr()Lcom/google/android/gms/measurement/internal/i;
+.method public vp()Lcom/google/android/gms/measurement/internal/i;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fu;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fu;->aGG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yj()Lcom/google/android/gms/measurement/internal/i;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yh()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public vs()Lcom/google/android/gms/common/util/e;
+.method public vq()Lcom/google/android/gms/common/util/e;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fu;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fu;->aGG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vq()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public vt()Landroid/content/Context;
+.method public vr()Landroid/content/Context;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fu;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fu;->aGG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Landroid/content/Context;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vr()Landroid/content/Context;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public vu()Lcom/google/android/gms/measurement/internal/dt;
+.method public vs()Lcom/google/android/gms/measurement/internal/dt;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fu;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fu;->aGG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->ye()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public vv()Lcom/google/android/gms/measurement/internal/jm;
+.method public vt()Lcom/google/android/gms/measurement/internal/jm;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fu;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fu;->aGG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yb()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public vw()Lcom/google/android/gms/measurement/internal/ev;
+.method public vu()Lcom/google/android/gms/measurement/internal/ev;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fu;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fu;->aGG: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;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public vx()Lcom/google/android/gms/measurement/internal/dv;
+.method public vv()Lcom/google/android/gms/measurement/internal/dv;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fu;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fu;->aGG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public vy()Lcom/google/android/gms/measurement/internal/eh;
+.method public vw()Lcom/google/android/gms/measurement/internal/eh;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fu;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fu;->aGG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->xY()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public vz()Lcom/google/android/gms/measurement/internal/ka;
+.method public vx()Lcom/google/android/gms/measurement/internal/ka;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fu;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fu;->aGG:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ey;->aFL:Lcom/google/android/gms/measurement/internal/ka;
+
+    return-object v0
+.end method
+
+.method public vy()Lcom/google/android/gms/measurement/internal/jz;
+    .locals 1
+
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fu;->aGG:Lcom/google/android/gms/measurement/internal/ey;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vy()Lcom/google/android/gms/measurement/internal/jz;
+
+    move-result-object v0
 
     return-object v0
 .end method
@@ -174,7 +174,7 @@
 .method public zza()V
     .locals 0
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/ey;->yp()V
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/ey;->yn()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 02b61089ed..2a39d321ec 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 vA()Lcom/google/android/gms/measurement/internal/jz;
+.method public abstract vq()Lcom/google/android/gms/common/util/e;
 .end method
 
-.method public abstract vs()Lcom/google/android/gms/common/util/e;
+.method public abstract vr()Landroid/content/Context;
 .end method
 
-.method public abstract vt()Landroid/content/Context;
+.method public abstract vu()Lcom/google/android/gms/measurement/internal/ev;
 .end method
 
-.method public abstract vw()Lcom/google/android/gms/measurement/internal/ev;
+.method public abstract vv()Lcom/google/android/gms/measurement/internal/dv;
 .end method
 
-.method public abstract vx()Lcom/google/android/gms/measurement/internal/dv;
+.method public abstract vy()Lcom/google/android/gms/measurement/internal/jz;
 .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 bec6a323e6..80e76f5832 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 aBV:[Ljava/lang/String;
+.field public static final aBR:[Ljava/lang/String;
 
-.field public static final aGL:[Ljava/lang/String;
+.field public static final aGH:[Ljava/lang/String;
 
 
 # direct methods
@@ -347,7 +347,7 @@
 
     aput-object v17, v1, v16
 
-    sput-object v1, Lcom/google/android/gms/measurement/internal/fx;->aGL:[Ljava/lang/String;
+    sput-object v1, Lcom/google/android/gms/measurement/internal/fx;->aGH:[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;->aBV:[Ljava/lang/String;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/fx;->aBR:[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;->aGL:[Ljava/lang/String;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/fx;->aGH:[Ljava/lang/String;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/fx;->aBV:[Ljava/lang/String;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/fx;->aBR:[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 eba5733da1..efa57c49fe 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 aBV:[Ljava/lang/String;
+.field public static final aBR:[Ljava/lang/String;
 
-.field public static final aGL:[Ljava/lang/String;
+.field public static final aGH:[Ljava/lang/String;
 
 
 # direct methods
@@ -197,7 +197,7 @@
 
     aput-object v17, v1, v16
 
-    sput-object v1, Lcom/google/android/gms/measurement/internal/fy;->aGL:[Ljava/lang/String;
+    sput-object v1, Lcom/google/android/gms/measurement/internal/fy;->aGH:[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;->aBV:[Ljava/lang/String;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/fy;->aBR:[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;->aGL:[Ljava/lang/String;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/fy;->aGH:[Ljava/lang/String;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/fy;->aBV:[Ljava/lang/String;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/fy;->aBR:[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 10e972a65f..a2d3c03ef8 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 aCg:Landroid/os/Handler;
+.field private static volatile aCc:Landroid/os/Handler;
 
 
 # instance fields
-.field private final aCf:Lcom/google/android/gms/measurement/internal/fw;
+.field private final aCb:Lcom/google/android/gms/measurement/internal/fw;
 
-.field private final aCh:Ljava/lang/Runnable;
+.field private final aCd: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;->aCf:Lcom/google/android/gms/measurement/internal/fw;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/g;->aCb: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;->aCh:Ljava/lang/Runnable;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/g;->aCd:Ljava/lang/Runnable;
 
     return-void
 .end method
@@ -44,14 +44,14 @@
     return-wide v0
 .end method
 
-.method private final vn()Landroid/os/Handler;
+.method private final vl()Landroid/os/Handler;
     .locals 3
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/g;->aCg:Landroid/os/Handler;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/g;->aCc:Landroid/os/Handler;
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/g;->aCg:Landroid/os/Handler;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/g;->aCc: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;->aCg:Landroid/os/Handler;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/g;->aCc: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;->aCf:Lcom/google/android/gms/measurement/internal/fw;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/g;->aCb:Lcom/google/android/gms/measurement/internal/fw;
 
-    invoke-interface {v2}, Lcom/google/android/gms/measurement/internal/fw;->vt()Landroid/content/Context;
+    invoke-interface {v2}, Lcom/google/android/gms/measurement/internal/fw;->vr()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;->aCg:Landroid/os/Handler;
+    sput-object v1, Lcom/google/android/gms/measurement/internal/g;->aCc:Landroid/os/Handler;
 
     :cond_1
-    sget-object v1, Lcom/google/android/gms/measurement/internal/g;->aCg:Landroid/os/Handler;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/g;->aCc: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;->rA()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/g;->ry()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;->aCf:Lcom/google/android/gms/measurement/internal/fw;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/g;->aCb:Lcom/google/android/gms/measurement/internal/fw;
 
-    invoke-interface {v0}, Lcom/google/android/gms/measurement/internal/fw;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-interface {v0}, Lcom/google/android/gms/measurement/internal/fw;->vq()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;->vn()Landroid/os/Handler;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/g;->vl()Landroid/os/Handler;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/g;->aCh:Ljava/lang/Runnable;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/g;->aCd: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;->aCf:Lcom/google/android/gms/measurement/internal/fw;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/g;->aCb:Lcom/google/android/gms/measurement/internal/fw;
 
-    invoke-interface {v0}, Lcom/google/android/gms/measurement/internal/fw;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-interface {v0}, Lcom/google/android/gms/measurement/internal/fw;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEw: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 rA()V
+.method final ry()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;->vn()Landroid/os/Handler;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/g;->vl()Landroid/os/Handler;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/g;->aCh:Ljava/lang/Runnable;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/g;->aCd: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 a34eb8f72c..35c4e02626 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 aBV:[Ljava/lang/String;
+.field public static final aBR:[Ljava/lang/String;
 
-.field public static final aGL:[Ljava/lang/String;
+.field public static final aGH:[Ljava/lang/String;
 
 
 # direct methods
@@ -101,7 +101,7 @@
 
     aput-object v16, v1, v15
 
-    sput-object v1, Lcom/google/android/gms/measurement/internal/ga;->aGL:[Ljava/lang/String;
+    sput-object v1, Lcom/google/android/gms/measurement/internal/ga;->aGH:[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;->aBV:[Ljava/lang/String;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/ga;->aBR:[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;->aGL:[Ljava/lang/String;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/ga;->aGH:[Ljava/lang/String;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/ga;->aBV:[Ljava/lang/String;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/ga;->aBR:[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 9e74a203d2..1bae8b666c 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 aCk:Ljava/lang/Boolean;
+.field aCg:Ljava/lang/Boolean;
 
-.field final aGM:Landroid/content/Context;
+.field final aGI:Landroid/content/Context;
 
-.field aGN:Lcom/google/android/gms/internal/measurement/zzv;
+.field aGJ:Lcom/google/android/gms/internal/measurement/zzv;
 
-.field ane:Ljava/lang/String;
+.field ana:Ljava/lang/String;
 
-.field anq:Ljava/lang/String;
+.field anm: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;->aGM:Landroid/content/Context;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gb;->aGI:Landroid/content/Context;
 
     if-eqz p2, :cond_0
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/gb;->aGN:Lcom/google/android/gms/internal/measurement/zzv;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/gb;->aGJ: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;->ane:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gb;->ana: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;->anq:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gb;->anm: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;->asH:Z
+    iget-boolean p1, p2, Lcom/google/android/gms/internal/measurement/zzv;->asD: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;->anz:J
+    iget-wide v1, p2, Lcom/google/android/gms/internal/measurement/zzv;->anv: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;->azF:Landroid/os/Bundle;
+    iget-object p1, p2, Lcom/google/android/gms/internal/measurement/zzv;->azB:Landroid/os/Bundle;
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p2, Lcom/google/android/gms/internal/measurement/zzv;->azF:Landroid/os/Bundle;
+    iget-object p1, p2, Lcom/google/android/gms/internal/measurement/zzv;->azB: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;->aCk:Ljava/lang/Boolean;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gb;->aCg: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 17add65ffb..c4dfd4d2bc 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 aGO:Lcom/google/android/gms/internal/measurement/lv;
+.field private final synthetic aGK:Lcom/google/android/gms/internal/measurement/lv;
 
-.field private final synthetic aGP:Lcom/google/android/gms/measurement/internal/zzan;
+.field private final synthetic aGL:Lcom/google/android/gms/measurement/internal/zzan;
 
-.field private final synthetic aGQ:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
+.field private final synthetic aGM:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
 
-.field private final synthetic anq:Ljava/lang/String;
+.field private final synthetic anm: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;->aGQ:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gc;->aGM:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/gc;->aGO:Lcom/google/android/gms/internal/measurement/lv;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/gc;->aGK:Lcom/google/android/gms/internal/measurement/lv;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/gc;->aGP:Lcom/google/android/gms/measurement/internal/zzan;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/gc;->aGL:Lcom/google/android/gms/measurement/internal/zzan;
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/gc;->anq:Ljava/lang/String;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/gc;->anm: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;->aGQ:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gc;->aGM:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->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/hm;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yg()Lcom/google/android/gms/measurement/internal/hm;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gc;->aGO:Lcom/google/android/gms/internal/measurement/lv;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gc;->aGK:Lcom/google/android/gms/internal/measurement/lv;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gc;->aGP:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gc;->aGL:Lcom/google/android/gms/measurement/internal/zzan;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/gc;->anq:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/gc;->anm: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 b600f57e80..1ede3d4c16 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 aGR:Lcom/google/android/gms/measurement/internal/gf;
+.field private final aGN: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;->aGR:Lcom/google/android/gms/measurement/internal/gf;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ge;->aGN: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;->aGR:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ge;->aGN:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/eh;->aFp:Lcom/google/android/gms/measurement/internal/ej;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/eh;->aFl:Lcom/google/android/gms/measurement/internal/ej;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ej;->pH()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ej;->pF()Z
 
     move-result v1
 
     if-eqz v1, :cond_0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, 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/dv;->aED: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;->vy()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/eh;->aFq: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;->ud()J
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ei;->ub()J
 
     move-result-wide v1
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/eh;->aFq:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/eh;->aFm: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->vy()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aFp: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;
 
     const/4 v1, 0x1
 
@@ -106,9 +106,9 @@
     return-void
 
     :cond_1
-    iget-object v0, v0, 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/gf;->aGG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->lE()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->lC()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 1584bdcaf5..2897522288 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 aGS:Lcom/google/android/gms/measurement/internal/gw;
+.field protected aGO:Lcom/google/android/gms/measurement/internal/gw;
 
-.field private aGT:Lcom/google/android/gms/measurement/internal/fz;
+.field private aGP:Lcom/google/android/gms/measurement/internal/fz;
 
-.field private final aGU:Ljava/util/Set;
+.field private final aGQ:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -18,7 +18,7 @@
     .end annotation
 .end field
 
-.field private final aGV:Ljava/util/concurrent/atomic/AtomicReference;
+.field private final aGR: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 atG:Z
+.field protected atC: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;->aGU:Ljava/util/Set;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gf;->aGQ:Ljava/util/Set;
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lcom/google/android/gms/measurement/internal/gf;->atG:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/measurement/internal/gf;->atC: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;->aGV:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gf;->aGR: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;->lK()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/gf;->lI()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;->vq()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()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/dc;->xz()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;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v6, v5, Lcom/google/android/gms/measurement/internal/gf;->aGG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ey;->yo()Z
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ey;->ym()Z
 
     move-result v6
 
     if-nez v6, :cond_0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, 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/dv;->aED: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;->vv()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()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;->vv()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()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;->vv()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()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;->xw()Lcom/google/android/gms/measurement/internal/hm;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ec;->xu()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;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xB()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xz()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, 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/dv;->aED: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;->vy()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()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;->lK()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/gf;->lI()V
 
     return-void
 .end method
@@ -336,7 +336,7 @@
 
     move-result-object v6
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()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;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()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;->vq()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()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/dc;->xz()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;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v6, v5, Lcom/google/android/gms/measurement/internal/gf;->aGG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ey;->yo()Z
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ey;->ym()Z
 
     move-result v6
 
     if-nez v6, :cond_0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, 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/dv;->aED: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;->vv()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()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;->xw()Lcom/google/android/gms/measurement/internal/hm;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ec;->xu()Lcom/google/android/gms/measurement/internal/hm;
 
     move-result-object v0
 
@@ -554,22 +554,22 @@
     return-void
 .end method
 
-.method private final lK()V
+.method private final lI()V
     .locals 8
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ec;->xv()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ec;->xt()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ds;->xL()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ds;->xJ()Ljava/lang/String;
 
     move-result-object v1
 
-    sget-object v2, Lcom/google/android/gms/measurement/internal/o;->aDD: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
 
@@ -577,15 +577,15 @@
 
     if-eqz v0, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aFj:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aFf:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->pO()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->pM()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;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()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;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()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;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gf;->aGG: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;->ym()Z
 
     move-result v0
 
     if-eqz v0, :cond_3
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/gf;->atG:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/gf;->atC:Z
 
     if-eqz v0, :cond_3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, 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/dv;->aED: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;->yw()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/gf;->yu()V
 
     return-void
 
     :cond_3
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, 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/dv;->aED: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;->xw()Lcom/google/android/gms/measurement/internal/hm;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ec;->xu()Lcom/google/android/gms/measurement/internal/hm;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/hm;->yv()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/hm;->yt()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;->xB()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xz()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xB()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xz()V
 
     if-eqz p1, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gf;->aGT:Lcom/google/android/gms/measurement/internal/fz;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gf;->aGP: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;->aGT:Lcom/google/android/gms/measurement/internal/fz;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gf;->aGP: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;->xB()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xz()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;->aGU:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gf;->aGQ: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
     move-object v10, p0
 
-    iget-object v0, v10, Lcom/google/android/gms/measurement/internal/gf;->aGT:Lcom/google/android/gms/measurement/internal/fz;
+    iget-object v0, v10, Lcom/google/android/gms/measurement/internal/gf;->aGP: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;->vq()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()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/dc;->xz()V
 
-    iget-object v0, v7, Lcom/google/android/gms/measurement/internal/gf;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, v7, Lcom/google/android/gms/measurement/internal/gf;->aGG: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;->ym()Z
 
     move-result v0
 
     if-nez v0, :cond_0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, 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/dv;->aED: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;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ec;->xv()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ec;->xt()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ds;->xL()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ds;->xJ()Ljava/lang/String;
 
     move-result-object v1
 
-    sget-object v2, Lcom/google/android/gms/measurement/internal/o;->aDN:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v2, Lcom/google/android/gms/measurement/internal/o;->aDJ: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;->xv()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ec;->xt()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ds;->aEu:Ljava/util/List;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ds;->aEq: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, 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/dv;->aED: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;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, v7, Lcom/google/android/gms/measurement/internal/gf;->aGG: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;->vt()Landroid/content/Context;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()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;->vt()Landroid/content/Context;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEG:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEC: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;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ec;->xv()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ec;->xt()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ds;->xL()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ds;->xJ()Ljava/lang/String;
 
     move-result-object v1
 
-    sget-object v2, Lcom/google/android/gms/measurement/internal/o;->aDZ:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v2, Lcom/google/android/gms/measurement/internal/o;->aDV: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;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()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;->vA()Lcom/google/android/gms/measurement/internal/jz;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vy()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;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, v7, Lcom/google/android/gms/measurement/internal/gf;->aGG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->yb()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;->aGL:[Ljava/lang/String;
+    sget-object v5, Lcom/google/android/gms/measurement/internal/fy;->aGH:[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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEC:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEy:Lcom/google/android/gms/measurement/internal/dx;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()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;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v2, v7, Lcom/google/android/gms/measurement/internal/gf;->aGG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->yb()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;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v4, v7, Lcom/google/android/gms/measurement/internal/gf;->aGG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ey;->yb()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;->vA()Lcom/google/android/gms/measurement/internal/jz;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/jz;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ec;->xx()Lcom/google/android/gms/measurement/internal/hh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ec;->xv()Lcom/google/android/gms/measurement/internal/hh;
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/hh;->yA()Lcom/google/android/gms/measurement/internal/hi;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/hh;->yy()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;->axe:Z
+    iput-boolean v9, v3, Lcom/google/android/gms/measurement/internal/hi;->axa: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;->aGT:Lcom/google/android/gms/measurement/internal/fz;
+    iget-object v6, v7, Lcom/google/android/gms/measurement/internal/gf;->aGP: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, 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/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()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;->vu()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()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;->aGT:Lcom/google/android/gms/measurement/internal/fz;
+    iget-object v1, v7, Lcom/google/android/gms/measurement/internal/gf;->aGP: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;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v5, v7, Lcom/google/android/gms/measurement/internal/gf;->aGG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ey;->yr()Z
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ey;->yp()Z
 
     move-result v5
 
@@ -1357,7 +1357,7 @@
     return-void
 
     :cond_d
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEC:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEy:Lcom/google/android/gms/measurement/internal/dx;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()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;->vv()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()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;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, v7, Lcom/google/android/gms/measurement/internal/gf;->aGG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->yb()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;->vv()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()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;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()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;->vA()Lcom/google/android/gms/measurement/internal/jz;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/jz;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ec;->xx()Lcom/google/android/gms/measurement/internal/hh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ec;->xv()Lcom/google/android/gms/measurement/internal/hh;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/hh;->yA()Lcom/google/android/gms/measurement/internal/hi;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/hh;->yy()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;->xz()Lcom/google/android/gms/measurement/internal/in;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ec;->xx()Lcom/google/android/gms/measurement/internal/in;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/in;->aHV:Lcom/google/android/gms/measurement/internal/it;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/in;->aHR:Lcom/google/android/gms/measurement/internal/it;
 
     move-object v6, v5
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/it;->ue()J
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/it;->uc()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;->vv()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()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;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v1
 
-    sget-object v4, Lcom/google/android/gms/measurement/internal/o;->aEp:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v4, Lcom/google/android/gms/measurement/internal/o;->aEl: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;->vv()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()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;->vy()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v5
 
-    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/eh;->aFr:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/eh;->aFn:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ek;->pO()Ljava/lang/String;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ek;->pM()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEH: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 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;->vy()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/eh;->aFr:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/eh;->aFn: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;->vv()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/eh;->aFr:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/eh;->aFn:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->pO()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->pM()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;->vv()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/jm;->yS()Ljava/security/SecureRandom;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/jm;->yQ()Ljava/security/SecureRandom;
 
     move-result-object v1
 
@@ -1749,83 +1749,15 @@
 
     move-result-wide v4
 
-    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/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v1
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ec;->xv()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ec;->xt()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v18
 
-    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;->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
-
-    move-result v1
-
-    if-eqz v1, :cond_1b
-
-    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;->aFm:Lcom/google/android/gms/measurement/internal/ei;
-
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ei;->ud()J
-
-    move-result-wide v9
-
-    const-wide/16 v20, 0x0
-
-    cmp-long v1, v9, v20
-
-    if-lez v1, :cond_1b
-
-    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, v2, v3}, Lcom/google/android/gms/measurement/internal/eh;->ae(J)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_1b
-
-    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;->aFo:Lcom/google/android/gms/measurement/internal/ej;
-
-    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;->vx()Lcom/google/android/gms/measurement/internal/dv;
-
-    move-result-object v1
-
-    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;->vz()Lcom/google/android/gms/measurement/internal/ka;
-
-    move-result-object v1
-
-    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;->xL()Ljava/lang/String;
+    invoke-virtual/range {v18 .. v18}, Lcom/google/android/gms/measurement/internal/ds;->xJ()Ljava/lang/String;
 
     move-result-object v9
 
@@ -1835,11 +1767,79 @@
 
     move-result v1
 
+    if-eqz v1, :cond_1b
+
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()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/ei;
+
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ei;->ub()J
+
+    move-result-wide v9
+
+    const-wide/16 v20, 0x0
+
+    cmp-long v1, v9, v20
+
+    if-lez v1, :cond_1b
+
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/eh;
+
+    move-result-object v1
+
+    invoke-virtual {v1, v2, v3}, Lcom/google/android/gms/measurement/internal/eh;->ae(J)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_1b
+
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/eh;
+
+    move-result-object v1
+
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/eh;->aFk:Lcom/google/android/gms/measurement/internal/ej;
+
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ej;->pF()Z
+
+    move-result v1
+
+    if-eqz v1, :cond_1b
+
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
+
+    move-result-object v1
+
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->vx()Lcom/google/android/gms/measurement/internal/ka;
+
+    move-result-object v1
+
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ec;->xt()Lcom/google/android/gms/measurement/internal/ds;
+
+    move-result-object v9
+
+    invoke-virtual {v9}, Lcom/google/android/gms/measurement/internal/ds;->xJ()Ljava/lang/String;
+
+    move-result-object v9
+
+    sget-object v10, Lcom/google/android/gms/measurement/internal/o;->aDm: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
+
+    move-result v1
+
     if-eqz v1, :cond_19
 
     const/4 v9, 0x0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()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;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v1
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ec;->xv()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ec;->xt()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ds;->xL()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ds;->xJ()Ljava/lang/String;
 
     move-result-object v2
 
-    sget-object v3, Lcom/google/android/gms/measurement/internal/o;->aDr: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 {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;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()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;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v1
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ec;->xv()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ec;->xt()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ds;->xL()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ds;->xJ()Ljava/lang/String;
 
     move-result-object v2
 
-    sget-object v3, Lcom/google/android/gms/measurement/internal/o;->aDS: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 {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;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()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;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v1
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ec;->xv()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ec;->xt()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ds;->xL()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ds;->xJ()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v5, Lcom/google/android/gms/measurement/internal/gf;->aGG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->yb()Lcom/google/android/gms/measurement/internal/in;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->xZ()Lcom/google/android/gms/measurement/internal/in;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/in;->aHU:Lcom/google/android/gms/measurement/internal/iv;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/in;->aHQ: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;->vv()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()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;->vv()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()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;->vv()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEH: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/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()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;->vu()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()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;->xw()Lcom/google/android/gms/measurement/internal/hm;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ec;->xu()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;->aGU:Ljava/util/Set;
+    iget-object v1, v13, Lcom/google/android/gms/measurement/internal/gf;->aGQ: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;->vA()Lcom/google/android/gms/measurement/internal/jz;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/jz;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ec;->xx()Lcom/google/android/gms/measurement/internal/hh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ec;->xv()Lcom/google/android/gms/measurement/internal/hh;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/hh;->yA()Lcom/google/android/gms/measurement/internal/hi;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/hh;->yy()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;->xz()Lcom/google/android/gms/measurement/internal/in;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ec;->xx()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;->aGT:Lcom/google/android/gms/measurement/internal/fz;
+    iget-object v2, v9, Lcom/google/android/gms/measurement/internal/gf;->aGP: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;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xB()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xz()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ec;->xv()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ec;->xt()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ds;->xL()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ds;->xJ()Ljava/lang/String;
 
     move-result-object v1
 
-    sget-object v2, Lcom/google/android/gms/measurement/internal/o;->aDD: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
 
@@ -2620,11 +2620,11 @@
 
     move-result-object p2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aFj:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aFf: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;->vy()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/eh;->aFj:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/eh;->aFf: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;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/gf;->aGG: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;->ym()Z
 
     move-result p2
 
     if-nez p2, :cond_4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEH: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, "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;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/gf;->aGG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->yr()Z
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->yp()Z
 
     move-result p2
 
@@ -2705,13 +2705,13 @@
     return-void
 
     :cond_5
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEH: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-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()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;->xw()Lcom/google/android/gms/measurement/internal/hm;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ec;->xu()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;->vv()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()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;->vv()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()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;->aGL:[Ljava/lang/String;
+    sget-object v4, Lcom/google/android/gms/measurement/internal/ga;->aGH:[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;->vv()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()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;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/gf;->aGG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->yb()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;->vv()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()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;->vv()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()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;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/gf;->aGG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ey;->yb()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;->vv()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()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;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()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;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()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;->aGV:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gf;->aGR: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;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ev;->uI()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ev;->uG()Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, 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/dv;->aEw: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;->pH()Z
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/jz;->pF()Z
 
     move-result v0
 
     if-eqz v0, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, 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/dv;->aEw: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;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gf;->aGG: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;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->atS:Ljava/lang/String;
+    iget-object p4, p3, Lcom/google/android/gms/measurement/internal/zzkj;->atO:Ljava/lang/String;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/zzkj;->rC()Ljava/lang/Object;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/zzkj;->rA()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;->vv()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, 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/dv;->aEw:Lcom/google/android/gms/measurement/internal/dx;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()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;->vv()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, 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/dv;->aEw:Lcom/google/android/gms/measurement/internal/dx;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()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;->vv()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, 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/dv;->aEw:Lcom/google/android/gms/measurement/internal/dx;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, 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/dv;->aEw:Lcom/google/android/gms/measurement/internal/dx;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()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;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, 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/dv;->aEw:Lcom/google/android/gms/measurement/internal/dx;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()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;->xB()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xz()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;->aGU:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gf;->aGQ: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()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;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()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;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()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;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ev;->uI()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ev;->uG()Z
 
     move-result v0
 
@@ -3663,11 +3663,11 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, 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/dv;->aEw: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;->pH()Z
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/jz;->pF()Z
 
     move-result v0
 
     if-eqz v0, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, 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/dv;->aEw: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;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gf;->aGG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vu()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p3
 
-    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEz: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 rA()V
+.method public final bridge synthetic ry()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->rA()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->ry()V
 
     return-void
 .end method
 
-.method public final uF()Ljava/lang/String;
+.method public final uD()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gf;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gf;->aGG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yh()Lcom/google/android/gms/measurement/internal/hh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yf()Lcom/google/android/gms/measurement/internal/hh;
 
     move-result-object v0
 
-    iget-object v0, v0, 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/hh;->aHe:Lcom/google/android/gms/measurement/internal/hi;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/hi;->atS:Ljava/lang/String;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/hi;->atO:Ljava/lang/String;
 
     return-object v0
 
@@ -3838,17 +3838,7 @@
     return-object v0
 .end method
 
-.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
+.method protected final vb()Z
     .locals 1
 
     const/4 v0, 0x0
@@ -3856,108 +3846,118 @@
     return v0
 .end method
 
-.method public final bridge synthetic vq()V
+.method public final bridge synthetic vo()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vq()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vo()V
 
     return-void
 .end method
 
-.method public final bridge synthetic vr()Lcom/google/android/gms/measurement/internal/i;
+.method public final bridge synthetic vp()Lcom/google/android/gms/measurement/internal/i;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vr()Lcom/google/android/gms/measurement/internal/i;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vp()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vs()Lcom/google/android/gms/common/util/e;
+.method public final bridge synthetic vq()Lcom/google/android/gms/common/util/e;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vq()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vt()Landroid/content/Context;
+.method public final bridge synthetic vr()Landroid/content/Context;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vt()Landroid/content/Context;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vr()Landroid/content/Context;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vu()Lcom/google/android/gms/measurement/internal/dt;
+.method public final bridge synthetic vs()Lcom/google/android/gms/measurement/internal/dt;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vu()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vs()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vv()Lcom/google/android/gms/measurement/internal/jm;
+.method public final bridge synthetic vt()Lcom/google/android/gms/measurement/internal/jm;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vv()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vt()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vw()Lcom/google/android/gms/measurement/internal/ev;
+.method public final bridge synthetic vu()Lcom/google/android/gms/measurement/internal/ev;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vx()Lcom/google/android/gms/measurement/internal/dv;
+.method public final bridge synthetic vv()Lcom/google/android/gms/measurement/internal/dv;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vy()Lcom/google/android/gms/measurement/internal/eh;
+.method public final bridge synthetic vw()Lcom/google/android/gms/measurement/internal/eh;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vy()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vw()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vz()Lcom/google/android/gms/measurement/internal/ka;
+.method public final bridge synthetic vx()Lcom/google/android/gms/measurement/internal/ka;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final xF()V
+.method public final bridge synthetic vy()Lcom/google/android/gms/measurement/internal/jz;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vy()Lcom/google/android/gms/measurement/internal/jz;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final xD()V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()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;->vt()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()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;->aGS:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gf;->aGO: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 xK()Ljava/lang/String;
+.method public final xI()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gf;->aGV:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gf;->aGR: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 xt()Lcom/google/android/gms/measurement/internal/z;
+.method public final bridge synthetic xr()Lcom/google/android/gms/measurement/internal/z;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xt()Lcom/google/android/gms/measurement/internal/z;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xr()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xu()Lcom/google/android/gms/measurement/internal/gf;
+.method public final bridge synthetic xs()Lcom/google/android/gms/measurement/internal/gf;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xu()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xs()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xv()Lcom/google/android/gms/measurement/internal/ds;
+.method public final bridge synthetic xt()Lcom/google/android/gms/measurement/internal/ds;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xv()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xt()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xw()Lcom/google/android/gms/measurement/internal/hm;
+.method public final bridge synthetic xu()Lcom/google/android/gms/measurement/internal/hm;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xw()Lcom/google/android/gms/measurement/internal/hm;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xu()Lcom/google/android/gms/measurement/internal/hm;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xx()Lcom/google/android/gms/measurement/internal/hh;
+.method public final bridge synthetic xv()Lcom/google/android/gms/measurement/internal/hh;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xx()Lcom/google/android/gms/measurement/internal/hh;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xv()Lcom/google/android/gms/measurement/internal/hh;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xy()Lcom/google/android/gms/measurement/internal/dr;
+.method public final bridge synthetic xw()Lcom/google/android/gms/measurement/internal/dr;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xy()Lcom/google/android/gms/measurement/internal/dr;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xw()Lcom/google/android/gms/measurement/internal/dr;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xz()Lcom/google/android/gms/measurement/internal/in;
+.method public final bridge synthetic xx()Lcom/google/android/gms/measurement/internal/in;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xz()Lcom/google/android/gms/measurement/internal/in;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xx()Lcom/google/android/gms/measurement/internal/in;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final yw()V
+.method public final yu()V
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xB()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xz()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gf;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gf;->aGG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yr()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yp()Z
 
     move-result v0
 
@@ -4089,21 +4089,21 @@
     return-void
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gf;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gf;->aGG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->yk()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->yi()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ds;->xL()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ds;->xJ()Ljava/lang/String;
 
     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;->aDT: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;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vA()Lcom/google/android/gms/measurement/internal/jz;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vy()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, 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/dv;->aED: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;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()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;->xw()Lcom/google/android/gms/measurement/internal/hm;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ec;->xu()Lcom/google/android/gms/measurement/internal/hm;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/hm;->yp()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/hm;->yn()V
 
-    iput-boolean v1, p0, Lcom/google/android/gms/measurement/internal/gf;->atG:Z
+    iput-boolean v1, p0, Lcom/google/android/gms/measurement/internal/gf;->atC:Z
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/eh;->no()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/eh;->nm()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;->vr()Lcom/google/android/gms/measurement/internal/i;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vp()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ft;->xE()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ft;->xC()V
 
     sget-object v1, Landroid/os/Build$VERSION;->RELEASE:Ljava/lang/String;
 
@@ -4218,20 +4218,20 @@
     return-void
 .end method
 
-.method public final yx()Ljava/lang/String;
+.method public final yv()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gf;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gf;->aGG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yh()Lcom/google/android/gms/measurement/internal/hh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yf()Lcom/google/android/gms/measurement/internal/hh;
 
     move-result-object v0
 
-    iget-object v0, v0, 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/hh;->aHe:Lcom/google/android/gms/measurement/internal/hi;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/hi;->ane:Ljava/lang/String;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/hi;->ana:Ljava/lang/String;
 
     return-object v0
 
@@ -4241,24 +4241,24 @@
     return-object v0
 .end method
 
-.method public final yy()Ljava/lang/String;
+.method public final yw()Ljava/lang/String;
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gf;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gf;->aGG:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ey;->anq:Ljava/lang/String;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ey;->anm:Ljava/lang/String;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gf;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gf;->aGG:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ey;->anq:Ljava/lang/String;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ey;->anm:Ljava/lang/String;
 
     return-object v0
 
     :cond_0
     :try_start_0
-    invoke-static {}, Lcom/google/android/gms/common/api/internal/e;->mE()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/common/api/internal/e;->mC()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;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gf;->aGG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->xB()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xz()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()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 183bd24058..8981ff7e27 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 aBU:J
+.field private final synthetic aBQ:J
 
-.field private final synthetic aGW:Lcom/google/android/gms/measurement/internal/gf;
+.field private final synthetic aGS:Lcom/google/android/gms/measurement/internal/gf;
 
-.field private final synthetic ane:Ljava/lang/String;
+.field private final synthetic ana:Ljava/lang/String;
 
-.field private final synthetic asM:Landroid/os/Bundle;
+.field private final synthetic asI:Landroid/os/Bundle;
 
-.field private final synthetic atS:Ljava/lang/String;
+.field private final synthetic atO: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;->aGW:Lcom/google/android/gms/measurement/internal/gf;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gg;->aGS:Lcom/google/android/gms/measurement/internal/gf;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/gg;->atS:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/gg;->atO:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/gg;->ane:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/gg;->ana:Ljava/lang/String;
 
-    iput-wide p4, p0, Lcom/google/android/gms/measurement/internal/gg;->aBU:J
+    iput-wide p4, p0, Lcom/google/android/gms/measurement/internal/gg;->aBQ:J
 
-    iput-object p6, p0, Lcom/google/android/gms/measurement/internal/gg;->asM:Landroid/os/Bundle;
+    iput-object p6, p0, Lcom/google/android/gms/measurement/internal/gg;->asI: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;->aGW:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gg;->aGS:Lcom/google/android/gms/measurement/internal/gf;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gg;->atS:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gg;->atO:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gg;->ane:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gg;->ana:Ljava/lang/String;
 
-    iget-wide v3, p0, Lcom/google/android/gms/measurement/internal/gg;->aBU:J
+    iget-wide v3, p0, Lcom/google/android/gms/measurement/internal/gg;->aBQ:J
 
-    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/gg;->asM:Landroid/os/Bundle;
+    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/gg;->asI: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 af4dbc0cad..d7f643182b 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 aGX:Lcom/google/android/gms/measurement/internal/gf;
+.field private final synthetic aGT:Lcom/google/android/gms/measurement/internal/gf;
 
-.field private final synthetic aze:Ljava/util/concurrent/atomic/AtomicReference;
+.field private final synthetic aza: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;->aGX:Lcom/google/android/gms/measurement/internal/gf;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gh;->aGT:Lcom/google/android/gms/measurement/internal/gf;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/gh;->aze:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/gh;->aza: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;->aze:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gh;->aza:Ljava/util/concurrent/atomic/AtomicReference;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gh;->aze:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gh;->aza:Ljava/util/concurrent/atomic/AtomicReference;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gh;->aGX:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gh;->aGT:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/gh;->aGX:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/gh;->aGT:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ec;->xv()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ec;->xt()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ds;->xL()Ljava/lang/String;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ds;->xJ()Ljava/lang/String;
 
     move-result-object v3
 
-    sget-object v4, Lcom/google/android/gms/measurement/internal/o;->aDg:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v4, Lcom/google/android/gms/measurement/internal/o;->aDc: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;->aze:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gh;->aza: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;->aze:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gh;->aza: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 45e9f41616..e37c61b783 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 aGY:Lcom/google/android/gms/measurement/internal/gf;
+.field private final synthetic aGU:Lcom/google/android/gms/measurement/internal/gf;
 
-.field private final synthetic ane:Ljava/lang/String;
+.field private final synthetic ana:Ljava/lang/String;
 
-.field private final synthetic atS:Ljava/lang/String;
+.field private final synthetic atO: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;->aGY:Lcom/google/android/gms/measurement/internal/gf;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gi;->aGU:Lcom/google/android/gms/measurement/internal/gf;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/gi;->atS:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/gi;->atO:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/gi;->ane:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/gi;->ana: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;->aGY:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gi;->aGU:Lcom/google/android/gms/measurement/internal/gf;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gi;->atS:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gi;->atO:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gi;->ane:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gi;->ana: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 bc2f19f172..8eb77add11 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 aGX:Lcom/google/android/gms/measurement/internal/gf;
+.field private final synthetic aGT:Lcom/google/android/gms/measurement/internal/gf;
 
-.field private final synthetic any:J
+.field private final synthetic anu: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;->aGX:Lcom/google/android/gms/measurement/internal/gf;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gj;->aGT:Lcom/google/android/gms/measurement/internal/gf;
 
-    iput-wide p2, p0, Lcom/google/android/gms/measurement/internal/gj;->any:J
+    iput-wide p2, p0, Lcom/google/android/gms/measurement/internal/gj;->anu: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;->aGX:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gj;->aGT:Lcom/google/android/gms/measurement/internal/gf;
 
-    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/gj;->any:J
+    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/gj;->anu:J
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dc;->xB()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dc;->xz()V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEH: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, "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;->xz()Lcom/google/android/gms/measurement/internal/in;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xx()Lcom/google/android/gms/measurement/internal/in;
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/in;->aHV:Lcom/google/android/gms/measurement/internal/it;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/in;->aHR:Lcom/google/android/gms/measurement/internal/it;
 
-    iget-object v4, v3, Lcom/google/android/gms/measurement/internal/it;->aIa:Lcom/google/android/gms/measurement/internal/g;
+    iget-object v4, v3, Lcom/google/android/gms/measurement/internal/it;->aHW:Lcom/google/android/gms/measurement/internal/g;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/g;->rA()V
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/g;->ry()V
 
     const-wide/16 v4, 0x0
 
-    iput-wide v4, v3, Lcom/google/android/gms/measurement/internal/it;->any:J
+    iput-wide v4, v3, Lcom/google/android/gms/measurement/internal/it;->anu:J
 
-    iget-wide v4, v3, Lcom/google/android/gms/measurement/internal/it;->any:J
+    iget-wide v4, v3, Lcom/google/android/gms/measurement/internal/it;->anu:J
 
-    iput-wide v4, v3, Lcom/google/android/gms/measurement/internal/it;->anz:J
+    iput-wide v4, v3, Lcom/google/android/gms/measurement/internal/it;->anv:J
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v3
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xv()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xt()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v4
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ds;->xL()Ljava/lang/String;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ds;->xJ()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;->vy()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/eh;->aFb:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/eh;->aEX: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;->vy()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/eh;->aFr:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/eh;->aFn:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->pO()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->pM()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;->vy()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/eh;->aFr:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/eh;->aFn: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;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/gf;->aGG: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;->ym()Z
 
     move-result v1
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ka;->rr()Z
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ka;->rp()Z
 
     move-result v2
 
     if-nez v2, :cond_2
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vw()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;->xw()Lcom/google/android/gms/measurement/internal/hm;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xu()Lcom/google/android/gms/measurement/internal/hm;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/hm;->yB()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/hm;->yz()V
 
     xor-int/lit8 v1, v1, 0x1
 
-    iput-boolean v1, v0, Lcom/google/android/gms/measurement/internal/gf;->atG:Z
+    iput-boolean v1, v0, Lcom/google/android/gms/measurement/internal/gf;->atC:Z
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gj;->aGX:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gj;->aGT:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xw()Lcom/google/android/gms/measurement/internal/hm;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xu()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 c1f6849c63..b886424c54 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 aCr:Landroid/os/Bundle;
+.field private final synthetic aCn:Landroid/os/Bundle;
 
-.field private final synthetic aGX:Lcom/google/android/gms/measurement/internal/gf;
+.field private final synthetic aGT: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;->aGX:Lcom/google/android/gms/measurement/internal/gf;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gk;->aGT:Lcom/google/android/gms/measurement/internal/gf;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/gk;->aCr:Landroid/os/Bundle;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/gk;->aCn: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;->aGX:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gk;->aGT:Lcom/google/android/gms/measurement/internal/gf;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gk;->aCr:Landroid/os/Bundle;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gk;->aCn: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 d5992ec029..4879953a6d 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 aGX:Lcom/google/android/gms/measurement/internal/gf;
+.field private final synthetic aGT:Lcom/google/android/gms/measurement/internal/gf;
 
-.field private final synthetic aGZ:Lcom/google/android/gms/measurement/internal/fz;
+.field private final synthetic aGV: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;->aGX:Lcom/google/android/gms/measurement/internal/gf;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gl;->aGT:Lcom/google/android/gms/measurement/internal/gf;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/gl;->aGZ:Lcom/google/android/gms/measurement/internal/fz;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/gl;->aGV: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;->aGX:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gl;->aGT:Lcom/google/android/gms/measurement/internal/gf;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gl;->aGZ:Lcom/google/android/gms/measurement/internal/fz;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gl;->aGV: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 62e4d227ea..95e6a99818 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 aGY:Lcom/google/android/gms/measurement/internal/gf;
+.field private final synthetic aGU:Lcom/google/android/gms/measurement/internal/gf;
 
-.field private final synthetic ane:Ljava/lang/String;
+.field private final synthetic ana:Ljava/lang/String;
 
-.field private final synthetic anq:Ljava/lang/String;
+.field private final synthetic anm:Ljava/lang/String;
 
-.field private final synthetic aze:Ljava/util/concurrent/atomic/AtomicReference;
+.field private final synthetic aza: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;->aGY:Lcom/google/android/gms/measurement/internal/gf;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gm;->aGU:Lcom/google/android/gms/measurement/internal/gf;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/gm;->aze:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/gm;->aza:Ljava/util/concurrent/atomic/AtomicReference;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/gm;->ane:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/gm;->ana:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/gm;->anq:Ljava/lang/String;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/gm;->anm: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;->aGY:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gm;->aGU:Lcom/google/android/gms/measurement/internal/gf;
 
-    iget-object v0, v0, 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/gf;->aGG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yi()Lcom/google/android/gms/measurement/internal/hm;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yg()Lcom/google/android/gms/measurement/internal/hm;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gm;->aze:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gm;->aza:Ljava/util/concurrent/atomic/AtomicReference;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gm;->ane:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gm;->ana:Ljava/lang/String;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/gm;->anq:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/gm;->anm: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 418619998b..d25b644c53 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 aCr:Landroid/os/Bundle;
+.field private final synthetic aCn:Landroid/os/Bundle;
 
-.field private final synthetic aGX:Lcom/google/android/gms/measurement/internal/gf;
+.field private final synthetic aGT: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;->aGX:Lcom/google/android/gms/measurement/internal/gf;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gn;->aGT:Lcom/google/android/gms/measurement/internal/gf;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/gn;->aCr:Landroid/os/Bundle;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/gn;->aCn: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;->aGX:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gn;->aGT:Lcom/google/android/gms/measurement/internal/gf;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gn;->aCr:Landroid/os/Bundle;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gn;->aCn: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 e648598d6c..a29f68bbab 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 aHa:Lcom/google/android/gms/measurement/internal/gf;
+.field private final synthetic aGW:Lcom/google/android/gms/measurement/internal/gf;
 
-.field private final synthetic ane:Ljava/lang/String;
+.field private final synthetic ana:Ljava/lang/String;
 
-.field private final synthetic anq:Ljava/lang/String;
+.field private final synthetic anm:Ljava/lang/String;
 
-.field private final synthetic aze:Ljava/util/concurrent/atomic/AtomicReference;
+.field private final synthetic aza: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;->aHa:Lcom/google/android/gms/measurement/internal/gf;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/go;->aGW:Lcom/google/android/gms/measurement/internal/gf;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/go;->aze:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/go;->aza:Ljava/util/concurrent/atomic/AtomicReference;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/go;->ane:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/go;->ana:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/go;->anq:Ljava/lang/String;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/go;->anm: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;->aHa:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/go;->aGW:Lcom/google/android/gms/measurement/internal/gf;
 
-    iget-object v0, v0, 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/gf;->aGG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yi()Lcom/google/android/gms/measurement/internal/hm;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yg()Lcom/google/android/gms/measurement/internal/hm;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/go;->aze:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/go;->aza:Ljava/util/concurrent/atomic/AtomicReference;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/go;->ane:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/go;->ana:Ljava/lang/String;
 
-    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/go;->anq:Ljava/lang/String;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/go;->anm: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 340b52935e..e6a949a271 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 aGX:Lcom/google/android/gms/measurement/internal/gf;
+.field private final synthetic aGT:Lcom/google/android/gms/measurement/internal/gf;
 
-.field private final synthetic aze:Ljava/util/concurrent/atomic/AtomicReference;
+.field private final synthetic aza: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;->aGX:Lcom/google/android/gms/measurement/internal/gf;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gp;->aGT:Lcom/google/android/gms/measurement/internal/gf;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/gp;->aze:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/gp;->aza: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;->aze:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gp;->aza:Ljava/util/concurrent/atomic/AtomicReference;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gp;->aze:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gp;->aza:Ljava/util/concurrent/atomic/AtomicReference;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gp;->aGX:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gp;->aGT:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/gp;->aGX:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/gp;->aGT:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ec;->xv()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ec;->xt()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ds;->xL()Ljava/lang/String;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ds;->xJ()Ljava/lang/String;
 
     move-result-object v3
 
-    sget-object v4, Lcom/google/android/gms/measurement/internal/o;->aDh:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v4, Lcom/google/android/gms/measurement/internal/o;->aDd: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;->aJa:Lcom/google/android/gms/measurement/internal/kc;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/ka;->aIW:Lcom/google/android/gms/measurement/internal/kc;
 
-    iget-object v5, v4, Lcom/google/android/gms/measurement/internal/do;->atS:Ljava/lang/String;
+    iget-object v5, v4, Lcom/google/android/gms/measurement/internal/do;->atO: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;->aze:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gp;->aza: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;->aze:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gp;->aza: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 c6ebe618e6..78c5630c81 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 aGX:Lcom/google/android/gms/measurement/internal/gf;
+.field private final synthetic aGT:Lcom/google/android/gms/measurement/internal/gf;
 
-.field private final synthetic aze:Ljava/util/concurrent/atomic/AtomicReference;
+.field private final synthetic aza: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;->aGX:Lcom/google/android/gms/measurement/internal/gf;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gq;->aGT:Lcom/google/android/gms/measurement/internal/gf;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/gq;->aze:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/gq;->aza: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;->aze:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gq;->aza:Ljava/util/concurrent/atomic/AtomicReference;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gq;->aze:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gq;->aza:Ljava/util/concurrent/atomic/AtomicReference;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gq;->aGX:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gq;->aGT:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/gq;->aGX:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/gq;->aGT:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ec;->xv()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ec;->xt()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ds;->xL()Ljava/lang/String;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ds;->xJ()Ljava/lang/String;
 
     move-result-object v3
 
-    sget-object v4, Lcom/google/android/gms/measurement/internal/o;->aDj:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v4, Lcom/google/android/gms/measurement/internal/o;->aDf: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;->aze:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gq;->aza: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;->aze:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gq;->aza: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 bbc4f04d95..b9d86d1958 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 aGX:Lcom/google/android/gms/measurement/internal/gf;
+.field private final synthetic aGT:Lcom/google/android/gms/measurement/internal/gf;
 
-.field private final synthetic aze:Ljava/util/concurrent/atomic/AtomicReference;
+.field private final synthetic aza: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;->aGX:Lcom/google/android/gms/measurement/internal/gf;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gr;->aGT:Lcom/google/android/gms/measurement/internal/gf;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/gr;->aze:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/gr;->aza: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;->aze:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gr;->aza:Ljava/util/concurrent/atomic/AtomicReference;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gr;->aze:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gr;->aza:Ljava/util/concurrent/atomic/AtomicReference;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gr;->aGX:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gr;->aGT:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/gr;->aGX:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/gr;->aGT:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ec;->xv()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ec;->xt()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ds;->xL()Ljava/lang/String;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ds;->xJ()Ljava/lang/String;
 
     move-result-object v3
 
-    sget-object v4, Lcom/google/android/gms/measurement/internal/o;->aDi:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v4, Lcom/google/android/gms/measurement/internal/o;->aDe: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;->aze:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gr;->aza: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;->aze:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gr;->aza: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 0cd800f1a9..a57cb72add 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 aGX:Lcom/google/android/gms/measurement/internal/gf;
+.field private final synthetic aGT: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;->aGX:Lcom/google/android/gms/measurement/internal/gf;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gs;->aGT: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;->aGX:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gs;->aGT: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 e2b001fbca..0352dba9de 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 aGX:Lcom/google/android/gms/measurement/internal/gf;
+.field private final synthetic aGT:Lcom/google/android/gms/measurement/internal/gf;
 
-.field private final synthetic aze:Ljava/util/concurrent/atomic/AtomicReference;
+.field private final synthetic aza: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;->aGX:Lcom/google/android/gms/measurement/internal/gf;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gt;->aGT:Lcom/google/android/gms/measurement/internal/gf;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/gt;->aze:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/gt;->aza: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;->aze:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gt;->aza:Ljava/util/concurrent/atomic/AtomicReference;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gt;->aze:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gt;->aza:Ljava/util/concurrent/atomic/AtomicReference;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gt;->aGX:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gt;->aGT:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/gt;->aGX:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/gt;->aGT:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ec;->xv()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ec;->xt()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ds;->xL()Ljava/lang/String;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ds;->xJ()Ljava/lang/String;
 
     move-result-object v3
 
-    sget-object v4, Lcom/google/android/gms/measurement/internal/o;->aDk: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;->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;->aze:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gt;->aza: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;->aze:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gt;->aza: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 cdba7ecee4..545d0ebe4f 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 aGX:Lcom/google/android/gms/measurement/internal/gf;
+.field private final synthetic aGT:Lcom/google/android/gms/measurement/internal/gf;
 
-.field private final synthetic any:J
+.field private final synthetic anu: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;->aGX:Lcom/google/android/gms/measurement/internal/gf;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gu;->aGT:Lcom/google/android/gms/measurement/internal/gf;
 
-    iput-wide p2, p0, Lcom/google/android/gms/measurement/internal/gu;->any:J
+    iput-wide p2, p0, Lcom/google/android/gms/measurement/internal/gu;->anu: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;->aGX:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gu;->aGT:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vw()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/ei;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aFc:Lcom/google/android/gms/measurement/internal/ei;
 
-    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/gu;->any:J
+    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/gu;->anu: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;->aGX:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gu;->aGT:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, 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/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/gu;->any:J
+    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/gu;->anu: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 60dc0c70a7..9f42d161a4 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 aGX:Lcom/google/android/gms/measurement/internal/gf;
+.field private final synthetic aGT: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;->aGX:Lcom/google/android/gms/measurement/internal/gf;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gv;->aGT: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;->aGX:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gv;->aGT:Lcom/google/android/gms/measurement/internal/gf;
 
-    iget-object v0, v0, 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/gf;->aGG: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;->ym()Z
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gv;->aGX:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gv;->aGT:Lcom/google/android/gms/measurement/internal/gf;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/gf;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/gf;->aGG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->yn()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->yl()Z
 
     move-result v1
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gv;->aGX:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gv;->aGT:Lcom/google/android/gms/measurement/internal/gf;
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/gf;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/gf;->aGG: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;->aGX:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gv;->aGT:Lcom/google/android/gms/measurement/internal/gf;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/gf;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/gf;->aGG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->aGX:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gv;->aGT:Lcom/google/android/gms/measurement/internal/gf;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/gf;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/gf;->aGG: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;->ym()Z
 
     move-result v1
 
     if-eq v1, v0, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gv;->aGX:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gv;->aGT:Lcom/google/android/gms/measurement/internal/gf;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/gf;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/gf;->aGG: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;->ym()Z
 
     move-result v1
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gv;->aGX:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gv;->aGT:Lcom/google/android/gms/measurement/internal/gf;
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/gf;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/gf;->aGG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->yn()Z
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->yl()Z
 
     move-result v2
 
     if-eq v1, v2, :cond_2
 
     :cond_1
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gv;->aGX:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gv;->aGT:Lcom/google/android/gms/measurement/internal/gf;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/gf;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/gf;->aGG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEF:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEB: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;->aGX:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gv;->aGT: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 809ef638ce..40b8658e0c 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 aGR:Lcom/google/android/gms/measurement/internal/gf;
+.field private final synthetic aGN: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;->aGR:Lcom/google/android/gms/measurement/internal/gf;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gw;->aGN: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;->aGR:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/gw;->aGN:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v3
 
-    sget-object v4, Lcom/google/android/gms/measurement/internal/o;->aDZ: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 {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;->aGR:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/gw;->aGN:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v3
 
-    sget-object v11, Lcom/google/android/gms/measurement/internal/o;->aEb:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v11, Lcom/google/android/gms/measurement/internal/o;->aDX: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;->aGR:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/gw;->aGN:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v3
 
-    sget-object v11, Lcom/google/android/gms/measurement/internal/o;->aEa:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v11, Lcom/google/android/gms/measurement/internal/o;->aDW: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;->aGR:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/gw;->aGN:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vt()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEH: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-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;->aGR:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v14, v1, Lcom/google/android/gms/measurement/internal/gw;->aGN:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v14}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v14}, Lcom/google/android/gms/measurement/internal/fu;->vt()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;->aGR:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/gw;->aGN:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v6
 
-    sget-object v15, Lcom/google/android/gms/measurement/internal/o;->aDZ:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v15, Lcom/google/android/gms/measurement/internal/o;->aDV: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;->aGR:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/gw;->aGN: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;->aGR:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/gw;->aGN:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v6
 
-    sget-object v9, Lcom/google/android/gms/measurement/internal/o;->aEb:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v9, Lcom/google/android/gms/measurement/internal/o;->aDX: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;->aGR:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/gw;->aGN:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v6
 
-    sget-object v15, Lcom/google/android/gms/measurement/internal/o;->aEa:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v15, Lcom/google/android/gms/measurement/internal/o;->aDW: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;->aGR:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/gw;->aGN: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;->aGR:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/gw;->aGN:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v6
 
-    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/dv;->aEH: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 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;->aGR:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/gw;->aGN:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v6
 
-    sget-object v14, Lcom/google/android/gms/measurement/internal/o;->aEa:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v14, Lcom/google/android/gms/measurement/internal/o;->aDW: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;->aGR:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/gw;->aGN: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;->aGR:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/gw;->aGN:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, 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/dv;->aED: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;->aGR:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/gw;->aGN: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;->aGR:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/gw;->aGN:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, 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/dv;->aED: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;->aGR:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/gw;->aGN: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;->aGR:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/gw;->aGN:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vv()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;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->aGR:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gw;->aGN:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()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 v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->aGR:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gw;->aGN:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xx()Lcom/google/android/gms/measurement/internal/hh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xv()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;->aGR:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gw;->aGN:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vt()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;->aEc:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/o;->aDY: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;->aGR:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gw;->aGN:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vu()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;->aGR:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gw;->aGN:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xx()Lcom/google/android/gms/measurement/internal/hh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xv()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;->aGR:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gw;->aGN:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xx()Lcom/google/android/gms/measurement/internal/hh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xv()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;->aGR:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gw;->aGN:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->aGR:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gw;->aGN:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xx()Lcom/google/android/gms/measurement/internal/hh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xv()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;->aGR:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gw;->aGN:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ec;->xx()Lcom/google/android/gms/measurement/internal/hh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ec;->xv()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;->aGR:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gw;->aGN:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xx()Lcom/google/android/gms/measurement/internal/hh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xv()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;->aGR:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gw;->aGN:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xx()Lcom/google/android/gms/measurement/internal/hh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xv()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;->aHi:Lcom/google/android/gms/measurement/internal/hi;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/hh;->aHe: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;
+    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/hh;->aHf:Lcom/google/android/gms/measurement/internal/hi;
 
     const/4 v1, 0x0
 
-    iput-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;->aHe:Lcom/google/android/gms/measurement/internal/hi;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vu()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;->aGR:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/gw;->aGN:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ec;->xz()Lcom/google/android/gms/measurement/internal/in;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ec;->xx()Lcom/google/android/gms/measurement/internal/in;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vq()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
-    invoke-interface {v0}, Lcom/google/android/gms/common/util/e;->nr()J
+    invoke-interface {v0}, Lcom/google/android/gms/common/util/e;->np()J
 
     move-result-wide v0
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vu()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;->aDx: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;
 
     const/4 v1, 0x0
 
@@ -819,17 +819,17 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gw;->aGR:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gw;->aGN:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xz()Lcom/google/android/gms/measurement/internal/in;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xx()Lcom/google/android/gms/measurement/internal/in;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/in;->xF()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/in;->xD()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gw;->aGR:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gw;->aGN:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xx()Lcom/google/android/gms/measurement/internal/hh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xv()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;->aGR:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gw;->aGN:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xx()Lcom/google/android/gms/measurement/internal/hh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xv()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;->aGR:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/gw;->aGN:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ec;->xz()Lcom/google/android/gms/measurement/internal/in;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ec;->xx()Lcom/google/android/gms/measurement/internal/in;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/in;->xF()V
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/in;->xD()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;->aGR:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gw;->aGN:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xx()Lcom/google/android/gms/measurement/internal/hh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xv()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;->aBU:J
+    iget-wide v1, p1, Lcom/google/android/gms/measurement/internal/hi;->aBQ: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;->atS:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/hi;->atO: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;->ane:Ljava/lang/String;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/hi;->ana: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 5b43cfcfe6..609a12483f 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 aGX:Lcom/google/android/gms/measurement/internal/gf;
+.field private final synthetic aGT:Lcom/google/android/gms/measurement/internal/gf;
 
-.field private final synthetic any:J
+.field private final synthetic anu: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;->aGX:Lcom/google/android/gms/measurement/internal/gf;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gx;->aGT:Lcom/google/android/gms/measurement/internal/gf;
 
-    iput-wide p2, p0, Lcom/google/android/gms/measurement/internal/gx;->any:J
+    iput-wide p2, p0, Lcom/google/android/gms/measurement/internal/gx;->anu: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;->aGX:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gx;->aGT:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aFh:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aFd:Lcom/google/android/gms/measurement/internal/ei;
 
-    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/gx;->any:J
+    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/gx;->anu: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;->aGX:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gx;->aGT:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, 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/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/gx;->any:J
+    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/gx;->anu: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 54c959ed0d..d45e215310 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 pO()Ljava/lang/String;
+.method public abstract pM()Ljava/lang/String;
 .end method
 
-.method public abstract qA()J
+.method public abstract qx()Ljava/lang/String;
 .end method
 
-.method public abstract qz()Ljava/lang/String;
+.method public abstract qy()J
 .end method
 
-.method public abstract rD()Ljava/lang/String;
+.method public abstract rB()Ljava/lang/String;
 .end method
 
-.method public abstract uf()Ljava/lang/String;
+.method public abstract ud()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 32837e4625..fc8b4e7482 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 aHb:Lcom/google/android/gms/measurement/internal/gw;
+.field private final synthetic aGX:Lcom/google/android/gms/measurement/internal/gw;
 
-.field private final synthetic anq:Ljava/lang/String;
+.field private final synthetic anm:Ljava/lang/String;
 
-.field private final synthetic atT:Landroid/net/Uri;
+.field private final synthetic atP: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;->aHb:Lcom/google/android/gms/measurement/internal/gw;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gz;->aGX: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;->atT:Landroid/net/Uri;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/gz;->atP:Landroid/net/Uri;
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/gz;->anq:Ljava/lang/String;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/gz;->anm: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;->aHb:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gz;->aGX: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;->atT:Landroid/net/Uri;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gz;->atP:Landroid/net/Uri;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/gz;->anq:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/gz;->anm: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 1f728a514a..41018695bd 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;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p0, p0, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p0, p0, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p0, p0, Lcom/google/android/gms/measurement/internal/dv;->aEz: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 bd601ebe13..b74ecead90 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 aBR:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
+.field private final synthetic aBN:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
 
-.field private final synthetic aGO:Lcom/google/android/gms/internal/measurement/lv;
+.field private final synthetic aGK: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;->aBR:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hb;->aBN:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/hb;->aGO:Lcom/google/android/gms/internal/measurement/lv;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/hb;->aGK: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;->aBR:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hb;->aBN:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->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/hm;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yg()Lcom/google/android/gms/measurement/internal/hm;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hb;->aGO:Lcom/google/android/gms/internal/measurement/lv;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hb;->aGK: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 c21cdbd2bf..88c76c7d07 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 aHc:Ljavax/net/ssl/SSLSocketFactory;
+.field final aGY: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;->aHc:Ljavax/net/ssl/SSLSocketFactory;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hc;->aGY:Ljavax/net/ssl/SSLSocketFactory;
 
     return-void
 .end method
@@ -103,7 +103,7 @@
 
 
 # virtual methods
-.method protected final pR()Z
+.method protected final pP()Z
     .locals 1
 
     const/4 v0, 0x0
@@ -111,20 +111,20 @@
     return v0
 .end method
 
-.method public final bridge synthetic rA()V
+.method public final bridge synthetic ry()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->rA()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->ry()V
 
     return-void
 .end method
 
-.method public final uI()Z
+.method public final uG()Z
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ft;->xE()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ft;->xC()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()Landroid/content/Context;
 
     move-result-object v0
 
@@ -167,108 +167,108 @@
     return v0
 .end method
 
-.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
+.method public final bridge synthetic vo()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vq()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vo()V
 
     return-void
 .end method
 
-.method public final bridge synthetic vr()Lcom/google/android/gms/measurement/internal/i;
+.method public final bridge synthetic vp()Lcom/google/android/gms/measurement/internal/i;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vr()Lcom/google/android/gms/measurement/internal/i;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vp()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vs()Lcom/google/android/gms/common/util/e;
+.method public final bridge synthetic vq()Lcom/google/android/gms/common/util/e;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vq()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vt()Landroid/content/Context;
+.method public final bridge synthetic vr()Landroid/content/Context;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vt()Landroid/content/Context;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vr()Landroid/content/Context;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vu()Lcom/google/android/gms/measurement/internal/dt;
+.method public final bridge synthetic vs()Lcom/google/android/gms/measurement/internal/dt;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vu()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vs()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vv()Lcom/google/android/gms/measurement/internal/jm;
+.method public final bridge synthetic vt()Lcom/google/android/gms/measurement/internal/jm;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vv()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vt()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vw()Lcom/google/android/gms/measurement/internal/ev;
+.method public final bridge synthetic vu()Lcom/google/android/gms/measurement/internal/ev;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vx()Lcom/google/android/gms/measurement/internal/dv;
+.method public final bridge synthetic vv()Lcom/google/android/gms/measurement/internal/dv;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vy()Lcom/google/android/gms/measurement/internal/eh;
+.method public final bridge synthetic vw()Lcom/google/android/gms/measurement/internal/eh;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vy()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vw()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vz()Lcom/google/android/gms/measurement/internal/ka;
+.method public final bridge synthetic vx()Lcom/google/android/gms/measurement/internal/ka;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vx()Lcom/google/android/gms/measurement/internal/ka;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic vy()Lcom/google/android/gms/measurement/internal/jz;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vy()Lcom/google/android/gms/measurement/internal/jz;
 
     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 032ea56dc7..c3437aa514 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 aHd:Lcom/google/android/gms/measurement/internal/he;
+.field private final aGZ:Lcom/google/android/gms/measurement/internal/he;
 
-.field private final aHe:Ljava/lang/Exception;
+.field private final aHa:Ljava/lang/Exception;
 
-.field private final anu:I
+.field private final anq:I
 
-.field private final atZ:Ljava/util/Map;
+.field private final atV:Ljava/util/Map;
 
-.field private final aup:[B
+.field private final aul:[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;->aHd:Lcom/google/android/gms/measurement/internal/he;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hd;->aGZ:Lcom/google/android/gms/measurement/internal/he;
 
-    iput p2, p0, Lcom/google/android/gms/measurement/internal/hd;->anu:I
+    iput p2, p0, Lcom/google/android/gms/measurement/internal/hd;->anq:I
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/hd;->aHe:Ljava/lang/Exception;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/hd;->aHa:Ljava/lang/Exception;
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/hd;->aup:[B
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/hd;->aul:[B
 
-    iput-object p5, p0, Lcom/google/android/gms/measurement/internal/hd;->atZ:Ljava/util/Map;
+    iput-object p5, p0, Lcom/google/android/gms/measurement/internal/hd;->atV: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;->aHd:Lcom/google/android/gms/measurement/internal/he;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hd;->aGZ:Lcom/google/android/gms/measurement/internal/he;
 
-    iget v1, p0, Lcom/google/android/gms/measurement/internal/hd;->anu:I
+    iget v1, p0, Lcom/google/android/gms/measurement/internal/hd;->anq:I
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hd;->aHe:Ljava/lang/Exception;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hd;->aHa:Ljava/lang/Exception;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hd;->aup:[B
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hd;->aul:[B
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/he;->aHf:Lcom/google/android/gms/measurement/internal/ha;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/he;->aHb: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 293dc370e3..dc1b3f3fc6 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 aEM:Ljava/net/URL;
+.field private final aEI:Ljava/net/URL;
 
-.field final aHf:Lcom/google/android/gms/measurement/internal/ha;
+.field final aHb:Lcom/google/android/gms/measurement/internal/ha;
 
-.field private final synthetic aHg:Lcom/google/android/gms/measurement/internal/hc;
+.field private final synthetic aHc:Lcom/google/android/gms/measurement/internal/hc;
 
-.field private final atZ:Ljava/util/Map;
+.field private final atV: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;->aHg:Lcom/google/android/gms/measurement/internal/hc;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/he;->aHc: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;->aEM:Ljava/net/URL;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/he;->aEI: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;->aHf:Lcom/google/android/gms/measurement/internal/ha;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/he;->aHb: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;->atZ:Ljava/util/Map;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/he;->atV:Ljava/util/Map;
 
     return-void
 .end method
@@ -82,9 +82,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/he;->aHg:Lcom/google/android/gms/measurement/internal/hc;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/he;->aHc:Lcom/google/android/gms/measurement/internal/hc;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vu()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;->aHg:Lcom/google/android/gms/measurement/internal/hc;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/he;->aHc:Lcom/google/android/gms/measurement/internal/hc;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->rA()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->ry()V
 
     const/4 v0, 0x0
 
     const/4 v1, 0x0
 
     :try_start_0
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/he;->aHg:Lcom/google/android/gms/measurement/internal/hc;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/he;->aHc:Lcom/google/android/gms/measurement/internal/hc;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/he;->aEM:Ljava/net/URL;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/he;->aEI: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;->aHc:Ljavax/net/ssl/SSLSocketFactory;
+    iget-object v4, v2, Lcom/google/android/gms/measurement/internal/hc;->aGY: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;->aHc:Ljavax/net/ssl/SSLSocketFactory;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/hc;->aGY: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;->atZ:Ljava/util/Map;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/he;->atV:Ljava/util/Map;
 
     if-eqz v3, :cond_1
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/he;->atZ:Ljava/util/Map;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/he;->atV: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 f4783d8639..89cf6b8c9c 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 yz()Ljava/lang/String;
+.method private static yx()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;->vq()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/ey;->yp()V
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/ey;->yn()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;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v3
 
-    sget-object v4, Lcom/google/android/gms/measurement/internal/o;->aDH:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v4, Lcom/google/android/gms/measurement/internal/o;->aDD: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, 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/dv;->aED: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;->atS:Ljava/lang/String;
+    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/zzan;->atO: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;->atS:Ljava/lang/String;
+    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/zzan;->atO: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEH: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 v0, v0, Lcom/google/android/gms/measurement/internal/zzan;->atS:Ljava/lang/String;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/zzan;->atO: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;->qK()Lcom/google/android/gms/internal/measurement/ak$f$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$f;->qI()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;->xT()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xR()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/d;->tU()V
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/d;->tS()V
 
     :try_start_0
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xT()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xR()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, 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/dv;->aED: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;->xT()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xR()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/d;->uY()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/d;->uW()V
 
     return-object v0
 
     :cond_2
     :try_start_1
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->ne()Z
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->nc()Z
 
     move-result v3
 
     if-nez v3, :cond_3
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, 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/dv;->aED: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;->xT()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xR()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/d;->uY()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/d;->uW()V
 
     return-object v0
 
     :cond_3
     :try_start_2
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$g;->qQ()Lcom/google/android/gms/internal/measurement/ak$g$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$g;->qO()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;->qS()Lcom/google/android/gms/internal/measurement/ak$g$a;
+    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/ak$g$a;->qQ()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;->qz()Ljava/lang/String;
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->qx()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;->qz()Ljava/lang/String;
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->qx()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;->yt()Ljava/lang/String;
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->yr()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;->yt()Ljava/lang/String;
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->yr()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;->qZ()Ljava/lang/String;
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->qX()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;->qZ()Ljava/lang/String;
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->qX()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;->ul()J
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->uj()J
 
     move-result-wide v5
 
@@ -261,7 +261,7 @@
 
     if-eqz v3, :cond_7
 
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->ul()J
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->uj()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;->un()J
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->ul()J
 
     move-result-wide v5
 
@@ -278,13 +278,13 @@
 
     move-result-object v3
 
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->uo()J
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->um()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;->ug()Ljava/lang/String;
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->ue()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;->ug()Ljava/lang/String;
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->ue()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;->uD()Ljava/lang/String;
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->uB()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;->uD()Ljava/lang/String;
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->uB()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;->rZ()J
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->rX()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;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/hg;->aGG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->yo()Z
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->ym()Z
 
     move-result v3
 
     if-eqz v3, :cond_a
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/ka;->vc()Z
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/ka;->va()Z
 
     move-result v3
 
     if-eqz v3, :cond_a
 
-    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/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v3
 
-    invoke-virtual {v11}, Lcom/google/android/gms/internal/measurement/ak$g$a;->mQ()Ljava/lang/String;
+    invoke-virtual {v11}, Lcom/google/android/gms/internal/measurement/ak$g$a;->mO()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;->mQ()Ljava/lang/String;
+    invoke-virtual {v11}, Lcom/google/android/gms/internal/measurement/ak$g$a;->mO()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;->rb()Lcom/google/android/gms/internal/measurement/ak$g$a;
+    invoke-virtual {v11}, Lcom/google/android/gms/internal/measurement/ak$g$a;->qZ()Lcom/google/android/gms/internal/measurement/ak$g$a;
 
     :cond_a
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v3
 
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->qz()Ljava/lang/String;
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->qx()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;->xJ()Z
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->xH()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;->yz()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/hg;->yx()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEH: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, "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;->xT()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xR()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/d;->uY()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/d;->uW()V
 
     return-object v0
 
     :cond_b
     :goto_1
     :try_start_5
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()Lcom/google/android/gms/measurement/internal/i;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vp()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ft;->xE()V
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ft;->xC()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;->vr()Lcom/google/android/gms/measurement/internal/i;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vp()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v5
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ft;->xE()V
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ft;->xC()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;->vr()Lcom/google/android/gms/measurement/internal/i;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vp()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v5
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/i;->qB()J
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/i;->qz()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;->vr()Lcom/google/android/gms/measurement/internal/i;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vp()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v5
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/i;->vo()Ljava/lang/String;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/i;->vm()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;->uf()Ljava/lang/String;
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->ud()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;->yz()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/hg;->yx()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;->ys()Ljava/lang/String;
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->yq()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;->ys()Ljava/lang/String;
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->yq()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;->qz()Ljava/lang/String;
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->qx()Ljava/lang/String;
 
     move-result-object v3
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xT()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xR()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;->anq:Ljava/lang/String;
+    iget-object v9, v7, Lcom/google/android/gms/measurement/internal/jn;->anm: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;->asA:Ljava/lang/Object;
+    iget-object v6, v7, Lcom/google/android/gms/measurement/internal/jn;->asw: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;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()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;->xT()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xR()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;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v6
 
-    sget-object v7, Lcom/google/android/gms/measurement/internal/o;->aDC:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v7, Lcom/google/android/gms/measurement/internal/o;->aDy: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;->xR()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xP()Lcom/google/android/gms/measurement/internal/jj;
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v8
 
-    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->vr()Lcom/google/android/gms/measurement/internal/i;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vp()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v8
 
-    invoke-virtual {v8}, Lcom/google/android/gms/measurement/internal/i;->uJ()Z
+    invoke-virtual {v8}, Lcom/google/android/gms/measurement/internal/i;->uH()Z
 
     move-result v8
 
     if-eqz v8, :cond_13
 
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->qz()Ljava/lang/String;
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->qx()Ljava/lang/String;
 
     move-result-object v8
 
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->xJ()Z
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->xH()Z
 
     move-result v9
 
     if-eqz v9, :cond_13
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/jd;->xU()Lcom/google/android/gms/measurement/internal/es;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/jd;->xS()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v9
 
-    iget-object v9, v9, Lcom/google/android/gms/measurement/internal/dv;->aEH:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v9, v9, Lcom/google/android/gms/measurement/internal/dv;->aED: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;->anq:Ljava/lang/String;
+    iget-object v10, v10, Lcom/google/android/gms/measurement/internal/jn;->anm: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;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vq()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;->rs()Lcom/google/android/gms/internal/measurement/ak$k$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$k;->rq()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;->anq:Ljava/lang/String;
+    iget-object v9, v9, Lcom/google/android/gms/measurement/internal/jn;->anm: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;->xR()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xP()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;->asA:Ljava/lang/Object;
+    iget-object v10, v10, Lcom/google/android/gms/measurement/internal/jn;->asw: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;->tb()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/dw$b;->sZ()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;->aCq:Lcom/google/android/gms/measurement/internal/zzam;
+    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/zzan;->aCm:Lcom/google/android/gms/measurement/internal/zzam;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/zzam;->vB()Landroid/os/Bundle;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/zzam;->vz()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEH: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, "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;->anq:Ljava/lang/String;
+    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/zzan;->anm: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;->vv()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v3
 
-    invoke-virtual {v11}, Lcom/google/android/gms/internal/measurement/ak$g$a;->mQ()Ljava/lang/String;
+    invoke-virtual {v11}, Lcom/google/android/gms/internal/measurement/ak$g$a;->mO()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;->vv()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()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;->vv()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()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;->xT()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xR()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v2
 
-    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/zzan;->atS:Ljava/lang/String;
+    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/zzan;->atO: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;->atS:Ljava/lang/String;
+    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/zzan;->atO: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;->xT()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xR()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;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/hg;->aGG:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/zzan;->anq:Ljava/lang/String;
+    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/zzan;->anm:Ljava/lang/String;
 
-    iget-object v6, v0, Lcom/google/android/gms/measurement/internal/zzan;->atS:Ljava/lang/String;
+    iget-object v6, v0, Lcom/google/android/gms/measurement/internal/zzan;->atO: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;->qw()Lcom/google/android/gms/internal/measurement/ak$c$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$c;->qu()Lcom/google/android/gms/internal/measurement/ak$c$a;
 
     move-result-object v2
 
-    iget-wide v3, v1, Lcom/google/android/gms/measurement/internal/l;->aBU:J
+    iget-wide v3, v1, Lcom/google/android/gms/measurement/internal/l;->aBQ: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;->ane:Ljava/lang/String;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/l;->ana: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;->aCp:Lcom/google/android/gms/measurement/internal/zzam;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/l;->aCl: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;->qF()Lcom/google/android/gms/internal/measurement/ak$e$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$e;->qD()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;->aCp:Lcom/google/android/gms/measurement/internal/zzam;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/l;->aCl: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;->xR()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xP()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;->rd()Lcom/google/android/gms/internal/measurement/ak$h$b;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$h;->rb()Lcom/google/android/gms/internal/measurement/ak$h$b;
 
     move-result-object v3
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$d;->qC()Lcom/google/android/gms/internal/measurement/ak$d$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$d;->qA()Lcom/google/android/gms/internal/measurement/ak$d$a;
 
     move-result-object v4
 
-    iget-wide v5, v13, Lcom/google/android/gms/measurement/internal/k;->aBU:J
+    iget-wide v5, v13, Lcom/google/android/gms/measurement/internal/k;->aBQ: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;->atS:Ljava/lang/String;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/zzan;->atO: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;->xS()Lcom/google/android/gms/measurement/internal/jr;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xQ()Lcom/google/android/gms/measurement/internal/jr;
 
     move-result-object v0
 
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->qz()Ljava/lang/String;
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->qx()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;->qU()Ljava/util/List;
+    invoke-virtual {v12}, Lcom/google/android/gms/internal/measurement/ak$g$a;->qS()Ljava/util/List;
 
     move-result-object v4
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qA()J
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qy()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;->qg()Z
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qe()Z
 
     move-result v0
 
     if-eqz v0, :cond_18
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qA()J
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qy()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;->qA()J
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qy()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;->uj()J
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->uh()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;->ui()J
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->ug()J
 
     move-result-wide v2
 
@@ -1175,9 +1175,9 @@
 
     :cond_1b
     :goto_8
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->vb()V
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->uZ()V
 
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->sc()J
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->sa()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;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()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;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()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;->qB()J
+    invoke-virtual {v12}, Lcom/google/android/gms/internal/measurement/ak$g$a;->qz()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;->qV()J
+    invoke-virtual {v12}, Lcom/google/android/gms/internal/measurement/ak$g$a;->qT()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;->xT()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xR()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;->xT()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xR()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/d;->uX()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/d;->uV()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;->xT()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xR()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/d;->uY()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/d;->uW()V
 
     :try_start_8
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xR()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xP()Lcom/google/android/gms/measurement/internal/jj;
 
     move-result-object v0
 
-    invoke-virtual {v14}, Lcom/google/android/gms/internal/measurement/dw$b;->tb()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v14}, Lcom/google/android/gms/internal/measurement/dw$b;->sZ()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;->rJ()[B
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/cf;->rH()[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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEH: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, "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;->xT()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xR()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;->uW()V
 
     return-object v0
 
     :catchall_0
     move-exception v0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xT()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xR()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;->uW()V
 
     goto :goto_a
 
@@ -1341,7 +1341,7 @@
     goto :goto_9
 .end method
 
-.method protected final pR()Z
+.method protected final pP()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 89d40c6064..083c87d502 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 aHh:Lcom/google/android/gms/measurement/internal/hi;
+.field protected aHd:Lcom/google/android/gms/measurement/internal/hi;
 
-.field volatile aHi:Lcom/google/android/gms/measurement/internal/hi;
+.field volatile aHe:Lcom/google/android/gms/measurement/internal/hi;
 
-.field aHj:Lcom/google/android/gms/measurement/internal/hi;
+.field aHf:Lcom/google/android/gms/measurement/internal/hi;
 
-.field private aHk:Lcom/google/android/gms/measurement/internal/hi;
+.field private aHg: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;->aHi:Lcom/google/android/gms/measurement/internal/hi;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hh;->aHe:Lcom/google/android/gms/measurement/internal/hi;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hh;->aHj:Lcom/google/android/gms/measurement/internal/hi;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hh;->aHf:Lcom/google/android/gms/measurement/internal/hi;
 
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hh;->aHi:Lcom/google/android/gms/measurement/internal/hi;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hh;->aHe:Lcom/google/android/gms/measurement/internal/hi;
 
     :goto_0
-    iget-object v1, p2, Lcom/google/android/gms/measurement/internal/hi;->ane:Ljava/lang/String;
+    iget-object v1, p2, Lcom/google/android/gms/measurement/internal/hi;->ana: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;->atS:Ljava/lang/String;
+    iget-object v2, p2, Lcom/google/android/gms/measurement/internal/hi;->atO: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;->aBU:J
+    iget-wide v3, p2, Lcom/google/android/gms/measurement/internal/hi;->aBQ: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;->aHi:Lcom/google/android/gms/measurement/internal/hi;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/hh;->aHe: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 p1, p0, Lcom/google/android/gms/measurement/internal/hh;->aHf: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;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/hh;->aHe:Lcom/google/android/gms/measurement/internal/hi;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()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;->xt()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ec;->xr()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()Lcom/google/android/gms/common/util/e;
 
     move-result-object v1
 
-    invoke-interface {v1}, Lcom/google/android/gms/common/util/e;->nr()J
+    invoke-interface {v1}, Lcom/google/android/gms/common/util/e;->np()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;->xz()Lcom/google/android/gms/measurement/internal/in;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ec;->xx()Lcom/google/android/gms/measurement/internal/in;
 
     move-result-object p0
 
-    iget-boolean v0, p1, Lcom/google/android/gms/measurement/internal/hi;->axe:Z
+    iget-boolean v0, p1, Lcom/google/android/gms/measurement/internal/hi;->axa: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;->axe:Z
+    iput-boolean p0, p1, Lcom/google/android/gms/measurement/internal/hi;->axa: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;->atS:Ljava/lang/String;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/hi;->atO:Ljava/lang/String;
 
     if-eqz p2, :cond_1
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/hi;->atS:Ljava/lang/String;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/hi;->atO: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;->ane:Ljava/lang/String;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/hi;->ana: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;->aBU:J
+    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/hi;->aBQ: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;->aHi:Lcom/google/android/gms/measurement/internal/hi;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hh;->aHe:Lcom/google/android/gms/measurement/internal/hi;
 
     if-nez v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEF: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;
 
     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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEF: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;
 
     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;->aHi:Lcom/google/android/gms/measurement/internal/hi;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hh;->aHe:Lcom/google/android/gms/measurement/internal/hi;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/hi;->ane:Ljava/lang/String;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/hi;->ana: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;->aHi:Lcom/google/android/gms/measurement/internal/hi;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hh;->aHe:Lcom/google/android/gms/measurement/internal/hi;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/hi;->atS:Ljava/lang/String;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/hi;->atO: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEF: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;
 
     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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEF: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;
 
     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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEF: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;
 
     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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()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 v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->vv()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/jm;->qV()J
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/jm;->qT()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;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()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;->aHk:Lcom/google/android/gms/measurement/internal/hi;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/hh;->aHg: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;->vv()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/jm;->qV()J
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/jm;->qT()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;->xt()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ec;->xr()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vq()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
-    invoke-interface {v0}, Lcom/google/android/gms/common/util/e;->nr()J
+    invoke-interface {v0}, Lcom/google/android/gms/common/util/e;->np()J
 
     move-result-wide v0
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v2
 
@@ -630,25 +630,15 @@
     return-void
 .end method
 
-.method public final bridge synthetic rA()V
+.method public final bridge synthetic ry()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->rA()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->ry()V
 
     return-void
 .end method
 
-.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
+.method protected final vb()Z
     .locals 1
 
     const/4 v0, 0x0
@@ -656,182 +646,192 @@
     return v0
 .end method
 
-.method public final bridge synthetic vq()V
+.method public final bridge synthetic vo()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vq()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vo()V
 
     return-void
 .end method
 
-.method public final bridge synthetic vr()Lcom/google/android/gms/measurement/internal/i;
+.method public final bridge synthetic vp()Lcom/google/android/gms/measurement/internal/i;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vr()Lcom/google/android/gms/measurement/internal/i;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vp()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vs()Lcom/google/android/gms/common/util/e;
+.method public final bridge synthetic vq()Lcom/google/android/gms/common/util/e;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vq()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vt()Landroid/content/Context;
+.method public final bridge synthetic vr()Landroid/content/Context;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vt()Landroid/content/Context;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vr()Landroid/content/Context;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vu()Lcom/google/android/gms/measurement/internal/dt;
+.method public final bridge synthetic vs()Lcom/google/android/gms/measurement/internal/dt;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vu()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vs()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vv()Lcom/google/android/gms/measurement/internal/jm;
+.method public final bridge synthetic vt()Lcom/google/android/gms/measurement/internal/jm;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vv()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vt()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vw()Lcom/google/android/gms/measurement/internal/ev;
+.method public final bridge synthetic vu()Lcom/google/android/gms/measurement/internal/ev;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vx()Lcom/google/android/gms/measurement/internal/dv;
+.method public final bridge synthetic vv()Lcom/google/android/gms/measurement/internal/dv;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vy()Lcom/google/android/gms/measurement/internal/eh;
+.method public final bridge synthetic vw()Lcom/google/android/gms/measurement/internal/eh;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vy()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vw()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vz()Lcom/google/android/gms/measurement/internal/ka;
+.method public final bridge synthetic vx()Lcom/google/android/gms/measurement/internal/ka;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xt()Lcom/google/android/gms/measurement/internal/z;
+.method public final bridge synthetic vy()Lcom/google/android/gms/measurement/internal/jz;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xt()Lcom/google/android/gms/measurement/internal/z;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vy()Lcom/google/android/gms/measurement/internal/jz;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xu()Lcom/google/android/gms/measurement/internal/gf;
+.method public final bridge synthetic xr()Lcom/google/android/gms/measurement/internal/z;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xu()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xr()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xv()Lcom/google/android/gms/measurement/internal/ds;
+.method public final bridge synthetic xs()Lcom/google/android/gms/measurement/internal/gf;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xv()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xs()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xw()Lcom/google/android/gms/measurement/internal/hm;
+.method public final bridge synthetic xt()Lcom/google/android/gms/measurement/internal/ds;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xw()Lcom/google/android/gms/measurement/internal/hm;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xt()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xx()Lcom/google/android/gms/measurement/internal/hh;
+.method public final bridge synthetic xu()Lcom/google/android/gms/measurement/internal/hm;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xx()Lcom/google/android/gms/measurement/internal/hh;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xu()Lcom/google/android/gms/measurement/internal/hm;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xy()Lcom/google/android/gms/measurement/internal/dr;
+.method public final bridge synthetic xv()Lcom/google/android/gms/measurement/internal/hh;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xy()Lcom/google/android/gms/measurement/internal/dr;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xv()Lcom/google/android/gms/measurement/internal/hh;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xz()Lcom/google/android/gms/measurement/internal/in;
+.method public final bridge synthetic xw()Lcom/google/android/gms/measurement/internal/dr;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xz()Lcom/google/android/gms/measurement/internal/in;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xw()Lcom/google/android/gms/measurement/internal/dr;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final yA()Lcom/google/android/gms/measurement/internal/hi;
+.method public final bridge synthetic xx()Lcom/google/android/gms/measurement/internal/in;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xB()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xx()Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    move-result-object v0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hh;->aHh:Lcom/google/android/gms/measurement/internal/hi;
+    return-object v0
+.end method
+
+.method public final yy()Lcom/google/android/gms/measurement/internal/hi;
+    .locals 1
+
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xz()V
+
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
+
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hh;->aHd: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 6c57822a24..6b87bda574 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 aBU:J
+.field public final aBQ:J
 
-.field public final ane:Ljava/lang/String;
+.field public final ana:Ljava/lang/String;
 
-.field public final atS:Ljava/lang/String;
+.field public final atO:Ljava/lang/String;
 
-.field axe:Z
+.field axa: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;->atS:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hi;->atO:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/hi;->ane:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/hi;->ana:Ljava/lang/String;
 
-    iput-wide p3, p0, Lcom/google/android/gms/measurement/internal/hi;->aBU:J
+    iput-wide p3, p0, Lcom/google/android/gms/measurement/internal/hi;->aBQ:J
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lcom/google/android/gms/measurement/internal/hi;->axe:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/measurement/internal/hi;->axa: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 e7e2052b58..9bae860842 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 aHh:Lcom/google/android/gms/measurement/internal/hi;
+.field private final synthetic aHd:Lcom/google/android/gms/measurement/internal/hi;
 
-.field private final synthetic aHl:Lcom/google/android/gms/measurement/internal/hh;
+.field private final synthetic aHh: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;->aHl:Lcom/google/android/gms/measurement/internal/hh;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hj;->aHh:Lcom/google/android/gms/measurement/internal/hh;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/hj;->aHh:Lcom/google/android/gms/measurement/internal/hi;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/hj;->aHd: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;->aHl:Lcom/google/android/gms/measurement/internal/hh;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hj;->aHh:Lcom/google/android/gms/measurement/internal/hh;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hj;->aHh:Lcom/google/android/gms/measurement/internal/hi;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hj;->aHd: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;->aHl:Lcom/google/android/gms/measurement/internal/hh;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hj;->aHh:Lcom/google/android/gms/measurement/internal/hh;
 
     const/4 v1, 0x0
 
-    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/hh;->aHh:Lcom/google/android/gms/measurement/internal/hi;
+    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/hh;->aHd:Lcom/google/android/gms/measurement/internal/hi;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xw()Lcom/google/android/gms/measurement/internal/hm;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xu()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 848afe72b8..9c9774c168 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 aHi:Lcom/google/android/gms/measurement/internal/hi;
+.field private final synthetic aHe:Lcom/google/android/gms/measurement/internal/hi;
 
-.field private final synthetic aHj:Lcom/google/android/gms/measurement/internal/hi;
+.field private final synthetic aHf:Lcom/google/android/gms/measurement/internal/hi;
 
-.field private final synthetic aHm:Lcom/google/android/gms/measurement/internal/hh;
+.field private final synthetic aHi: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;->aHm:Lcom/google/android/gms/measurement/internal/hh;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hk;->aHi: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;->aHi:Lcom/google/android/gms/measurement/internal/hi;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/hk;->aHe: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;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/hk;->aHf: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;->aHm:Lcom/google/android/gms/measurement/internal/hh;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hk;->aHi:Lcom/google/android/gms/measurement/internal/hh;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
-    iget-object v1, 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;->aHi:Lcom/google/android/gms/measurement/internal/hh;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ec;->xv()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ec;->xt()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ds;->xL()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ds;->xJ()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;->aHm:Lcom/google/android/gms/measurement/internal/hh;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hk;->aHi:Lcom/google/android/gms/measurement/internal/hh;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/hh;->aHh:Lcom/google/android/gms/measurement/internal/hi;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/hh;->aHd: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;->aHm:Lcom/google/android/gms/measurement/internal/hh;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hk;->aHi:Lcom/google/android/gms/measurement/internal/hh;
 
-    iget-object v4, v3, Lcom/google/android/gms/measurement/internal/hh;->aHh:Lcom/google/android/gms/measurement/internal/hi;
+    iget-object v4, v3, Lcom/google/android/gms/measurement/internal/hh;->aHd: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;->aHm:Lcom/google/android/gms/measurement/internal/hh;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hk;->aHi:Lcom/google/android/gms/measurement/internal/hh;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/hh;->aHh:Lcom/google/android/gms/measurement/internal/hi;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/hh;->aHd:Lcom/google/android/gms/measurement/internal/hi;
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hk;->aHm:Lcom/google/android/gms/measurement/internal/hh;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hk;->aHi:Lcom/google/android/gms/measurement/internal/hh;
 
-    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/hh;->aHh:Lcom/google/android/gms/measurement/internal/hi;
+    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/hh;->aHd: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;->aHi:Lcom/google/android/gms/measurement/internal/hi;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hk;->aHe:Lcom/google/android/gms/measurement/internal/hi;
 
     if-eqz v3, :cond_4
 
-    iget-wide v3, v3, Lcom/google/android/gms/measurement/internal/hi;->aBU:J
+    iget-wide v3, v3, Lcom/google/android/gms/measurement/internal/hi;->aBQ:J
 
-    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/hk;->aHj:Lcom/google/android/gms/measurement/internal/hi;
+    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/hk;->aHf:Lcom/google/android/gms/measurement/internal/hi;
 
-    iget-wide v5, v5, Lcom/google/android/gms/measurement/internal/hi;->aBU:J
+    iget-wide v5, v5, Lcom/google/android/gms/measurement/internal/hi;->aBQ:J
 
     cmp-long v7, v3, v5
 
     if-nez v7, :cond_4
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hk;->aHi:Lcom/google/android/gms/measurement/internal/hi;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hk;->aHe:Lcom/google/android/gms/measurement/internal/hi;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/hi;->ane:Ljava/lang/String;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/hi;->ana:Ljava/lang/String;
 
-    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/hk;->aHj:Lcom/google/android/gms/measurement/internal/hi;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/hk;->aHf:Lcom/google/android/gms/measurement/internal/hi;
 
-    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/hi;->ane:Ljava/lang/String;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/hi;->ana: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;->aHi:Lcom/google/android/gms/measurement/internal/hi;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hk;->aHe:Lcom/google/android/gms/measurement/internal/hi;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/hi;->atS:Ljava/lang/String;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/hi;->atO:Ljava/lang/String;
 
-    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/hk;->aHj:Lcom/google/android/gms/measurement/internal/hi;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/hk;->aHf:Lcom/google/android/gms/measurement/internal/hi;
 
-    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/hi;->atS:Ljava/lang/String;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/hi;->atO: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;->aHj:Lcom/google/android/gms/measurement/internal/hi;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hk;->aHf: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;->aHi:Lcom/google/android/gms/measurement/internal/hi;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hk;->aHe:Lcom/google/android/gms/measurement/internal/hi;
 
     if-eqz v2, :cond_7
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/hi;->atS:Ljava/lang/String;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/hi;->atO:Ljava/lang/String;
 
     if-eqz v2, :cond_6
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hk;->aHi:Lcom/google/android/gms/measurement/internal/hi;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hk;->aHe:Lcom/google/android/gms/measurement/internal/hi;
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/hi;->atS:Ljava/lang/String;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/hi;->atO: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;->aHi:Lcom/google/android/gms/measurement/internal/hi;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hk;->aHe:Lcom/google/android/gms/measurement/internal/hi;
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/hi;->ane:Ljava/lang/String;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/hi;->ana: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;->aHi:Lcom/google/android/gms/measurement/internal/hi;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hk;->aHe:Lcom/google/android/gms/measurement/internal/hi;
 
-    iget-wide v2, v2, Lcom/google/android/gms/measurement/internal/hi;->aBU:J
+    iget-wide v2, v2, Lcom/google/android/gms/measurement/internal/hi;->aBQ: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;->aHm:Lcom/google/android/gms/measurement/internal/hh;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hk;->aHi:Lcom/google/android/gms/measurement/internal/hh;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hk;->aHm:Lcom/google/android/gms/measurement/internal/hh;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hk;->aHi:Lcom/google/android/gms/measurement/internal/hh;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ec;->xv()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ec;->xt()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ds;->xL()Ljava/lang/String;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ds;->xJ()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;->aHm:Lcom/google/android/gms/measurement/internal/hh;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hk;->aHi:Lcom/google/android/gms/measurement/internal/hh;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xz()Lcom/google/android/gms/measurement/internal/in;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xx()Lcom/google/android/gms/measurement/internal/in;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/in;->aHV:Lcom/google/android/gms/measurement/internal/it;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/in;->aHR:Lcom/google/android/gms/measurement/internal/it;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/it;->ue()J
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/it;->uc()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;->aHm:Lcom/google/android/gms/measurement/internal/hh;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hk;->aHi:Lcom/google/android/gms/measurement/internal/hh;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vt()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;->aHm:Lcom/google/android/gms/measurement/internal/hh;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hk;->aHi:Lcom/google/android/gms/measurement/internal/hh;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xu()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xs()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;->aHm:Lcom/google/android/gms/measurement/internal/hh;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hk;->aHi:Lcom/google/android/gms/measurement/internal/hh;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hk;->aHj:Lcom/google/android/gms/measurement/internal/hi;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hk;->aHf: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;
+    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/hh;->aHd:Lcom/google/android/gms/measurement/internal/hi;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xw()Lcom/google/android/gms/measurement/internal/hm;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xu()Lcom/google/android/gms/measurement/internal/hm;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hk;->aHj:Lcom/google/android/gms/measurement/internal/hi;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hk;->aHf: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 587b2a04e8..d08bbe52ce 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 aHn:Lcom/google/android/gms/measurement/internal/hm;
+.field private final synthetic aHj: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;->aHn:Lcom/google/android/gms/measurement/internal/hm;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hl;->aHj: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;->aHn:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hl;->aHj:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/hm;->yo()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/hm;->ym()Z
 
     move-result v1
 
     if-eqz v1, :cond_0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->lE()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/hm;->lC()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 fe01b312b0..510fc11786 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 aCi:Ljava/lang/Boolean;
+.field volatile aCe:Ljava/lang/Boolean;
 
-.field final aHo:Lcom/google/android/gms/measurement/internal/ie;
+.field final aHk:Lcom/google/android/gms/measurement/internal/ie;
 
-.field aHp:Lcom/google/android/gms/measurement/internal/dn;
+.field aHl:Lcom/google/android/gms/measurement/internal/dn;
 
-.field private final aHq:Lcom/google/android/gms/measurement/internal/g;
+.field private final aHm:Lcom/google/android/gms/measurement/internal/g;
 
-.field private final aHr:Lcom/google/android/gms/measurement/internal/ix;
+.field private final aHn:Lcom/google/android/gms/measurement/internal/ix;
 
-.field private final aHs:Lcom/google/android/gms/measurement/internal/g;
+.field private final aHo:Lcom/google/android/gms/measurement/internal/g;
 
-.field private final aua:Ljava/util/List;
+.field private final atW: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;->aua:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/hm;->atW:Ljava/util/List;
 
     new-instance v0, Lcom/google/android/gms/measurement/internal/ix;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vq()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;->aHr:Lcom/google/android/gms/measurement/internal/ix;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/hm;->aHn: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;->aHo:Lcom/google/android/gms/measurement/internal/ie;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/hm;->aHk: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;->aHq:Lcom/google/android/gms/measurement/internal/g;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/hm;->aHm: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;->aHs:Lcom/google/android/gms/measurement/internal/g;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/hm;->aHo: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;->vA()Lcom/google/android/gms/measurement/internal/jz;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/jz;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ec;->xv()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ec;->xt()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/dv;->xQ()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/dv;->xO()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;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    iget-object v0, p0, 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/hm;->aHl: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;->aHp:Lcom/google/android/gms/measurement/internal/dn;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/hm;->aHl:Lcom/google/android/gms/measurement/internal/dn;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()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 v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/hm;->yq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/hm;->yo()V
 
     :cond_0
     return-void
@@ -141,9 +141,9 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/hm;->yo()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/hm;->ym()Z
 
     move-result v0
 
@@ -154,7 +154,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hm;->aua:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hm;->atW: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, 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/dv;->aEw: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;->aua:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hm;->atW: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;->aHs:Lcom/google/android/gms/measurement/internal/g;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/hm;->aHo: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;->yq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/hm;->yo()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;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xB()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xz()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;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xB()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xz()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jm;->yU()I
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jm;->yS()I
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->vv()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()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;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xB()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xz()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;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xB()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xz()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;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()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;->aHp:Lcom/google/android/gms/measurement/internal/dn;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hm;->aHl:Lcom/google/android/gms/measurement/internal/dn;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/hm;->ym()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/hm;->yk()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/hm;->yC()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/hm;->yA()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;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xB()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xz()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;->xy()Lcom/google/android/gms/measurement/internal/dr;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ec;->xw()Lcom/google/android/gms/measurement/internal/dr;
 
     move-result-object v4
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/dr;->xG()Ljava/util/List;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/dr;->xE()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v8
 
-    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v8
 
-    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v8
 
-    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v7
 
-    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xB()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xz()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;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xB()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xz()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ec;->xy()Lcom/google/android/gms/measurement/internal/dr;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ec;->xw()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()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;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xB()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xz()V
 
     const/4 v0, 0x0
 
@@ -661,9 +661,9 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xB()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xz()V
 
     const/4 v0, 0x0
 
@@ -708,9 +708,9 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xB()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xz()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;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xB()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xz()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ec;->xy()Lcom/google/android/gms/measurement/internal/dr;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ec;->xw()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()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;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xB()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xz()V
 
-    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;->vy()Lcom/google/android/gms/measurement/internal/jz;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ec;->xy()Lcom/google/android/gms/measurement/internal/dr;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ec;->xw()Lcom/google/android/gms/measurement/internal/dr;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vt()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()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;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEz: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 lE()V
+.method public final lC()V
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xB()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xz()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hm;->aHo:Lcom/google/android/gms/measurement/internal/ie;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hm;->aHk:Lcom/google/android/gms/measurement/internal/ie;
 
-    iget-object v1, 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;->aHJ:Lcom/google/android/gms/measurement/internal/dw;
 
     if-eqz v1, :cond_1
 
-    iget-object v1, 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;->aHJ: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;->aHN:Lcom/google/android/gms/measurement/internal/dw;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ie;->aHJ:Lcom/google/android/gms/measurement/internal/dw;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/dw;->lX()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/dw;->lV()Z
 
     move-result v1
 
     if-eqz v1, :cond_1
 
     :cond_0
-    iget-object v1, 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;->aHJ: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;->aHN:Lcom/google/android/gms/measurement/internal/dw;
+    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/ie;->aHJ:Lcom/google/android/gms/measurement/internal/dw;
 
     :try_start_0
-    invoke-static {}, Lcom/google/android/gms/common/stats/a;->nk()Lcom/google/android/gms/common/stats/a;
+    invoke-static {}, Lcom/google/android/gms/common/stats/a;->ni()Lcom/google/android/gms/common/stats/a;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()Landroid/content/Context;
 
     move-result-object v0
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hm;->aHo:Lcom/google/android/gms/measurement/internal/ie;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hm;->aHk: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,30 +953,20 @@
     .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;->aHp:Lcom/google/android/gms/measurement/internal/dn;
+    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/hm;->aHl:Lcom/google/android/gms/measurement/internal/dn;
 
     return-void
 .end method
 
-.method public final bridge synthetic rA()V
+.method public final bridge synthetic ry()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->rA()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->ry()V
 
     return-void
 .end method
 
-.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
+.method protected final vb()Z
     .locals 1
 
     const/4 v0, 0x0
@@ -984,214 +974,196 @@
     return v0
 .end method
 
-.method public final bridge synthetic vq()V
+.method public final bridge synthetic vo()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vq()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vo()V
 
     return-void
 .end method
 
-.method public final bridge synthetic vr()Lcom/google/android/gms/measurement/internal/i;
+.method public final bridge synthetic vp()Lcom/google/android/gms/measurement/internal/i;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vr()Lcom/google/android/gms/measurement/internal/i;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vp()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vs()Lcom/google/android/gms/common/util/e;
+.method public final bridge synthetic vq()Lcom/google/android/gms/common/util/e;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vq()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vt()Landroid/content/Context;
+.method public final bridge synthetic vr()Landroid/content/Context;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vt()Landroid/content/Context;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vr()Landroid/content/Context;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vu()Lcom/google/android/gms/measurement/internal/dt;
+.method public final bridge synthetic vs()Lcom/google/android/gms/measurement/internal/dt;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vu()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vs()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vv()Lcom/google/android/gms/measurement/internal/jm;
+.method public final bridge synthetic vt()Lcom/google/android/gms/measurement/internal/jm;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vv()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vt()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vw()Lcom/google/android/gms/measurement/internal/ev;
+.method public final bridge synthetic vu()Lcom/google/android/gms/measurement/internal/ev;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vx()Lcom/google/android/gms/measurement/internal/dv;
+.method public final bridge synthetic vv()Lcom/google/android/gms/measurement/internal/dv;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vy()Lcom/google/android/gms/measurement/internal/eh;
+.method public final bridge synthetic vw()Lcom/google/android/gms/measurement/internal/eh;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vy()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vw()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vz()Lcom/google/android/gms/measurement/internal/ka;
+.method public final bridge synthetic vx()Lcom/google/android/gms/measurement/internal/ka;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xt()Lcom/google/android/gms/measurement/internal/z;
+.method public final bridge synthetic vy()Lcom/google/android/gms/measurement/internal/jz;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xt()Lcom/google/android/gms/measurement/internal/z;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vy()Lcom/google/android/gms/measurement/internal/jz;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xu()Lcom/google/android/gms/measurement/internal/gf;
+.method public final bridge synthetic xr()Lcom/google/android/gms/measurement/internal/z;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xu()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xr()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xv()Lcom/google/android/gms/measurement/internal/ds;
+.method public final bridge synthetic xs()Lcom/google/android/gms/measurement/internal/gf;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xv()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xs()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xw()Lcom/google/android/gms/measurement/internal/hm;
+.method public final bridge synthetic xt()Lcom/google/android/gms/measurement/internal/ds;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xw()Lcom/google/android/gms/measurement/internal/hm;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xt()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xx()Lcom/google/android/gms/measurement/internal/hh;
+.method public final bridge synthetic xu()Lcom/google/android/gms/measurement/internal/hm;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xx()Lcom/google/android/gms/measurement/internal/hh;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xu()Lcom/google/android/gms/measurement/internal/hm;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xy()Lcom/google/android/gms/measurement/internal/dr;
+.method public final bridge synthetic xv()Lcom/google/android/gms/measurement/internal/hh;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xy()Lcom/google/android/gms/measurement/internal/dr;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xv()Lcom/google/android/gms/measurement/internal/hh;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xz()Lcom/google/android/gms/measurement/internal/in;
+.method public final bridge synthetic xw()Lcom/google/android/gms/measurement/internal/dr;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xz()Lcom/google/android/gms/measurement/internal/in;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xw()Lcom/google/android/gms/measurement/internal/dr;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method protected final yB()V
-    .locals 2
+.method public final bridge synthetic xx()Lcom/google/android/gms/measurement/internal/in;
+    .locals 1
 
-    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;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xx()Lcom/google/android/gms/measurement/internal/in;
 
     move-result-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
+    return-object v0
 .end method
 
-.method final yC()V
+.method final yA()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;->vo()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()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 v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEE:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hm;->aua:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hm;->atW:Ljava/util/List;
 
     invoke-interface {v1}, Ljava/util/List;->size()I
 
@@ -1205,7 +1177,7 @@
 
     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;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hm;->atW:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->iterator()Ljava/util/Iterator;
 
@@ -1234,11 +1206,11 @@
     :catch_0
     move-exception v1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()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;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEw:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v3, "Task exception while flushing queue"
 
@@ -1247,29 +1219,29 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hm;->aua:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hm;->atW: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;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hm;->aHo:Lcom/google/android/gms/measurement/internal/g;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/g;->rA()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/g;->ry()V
 
     return-void
 .end method
 
-.method final ym()V
+.method final yk()V
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hm;->aHr:Lcom/google/android/gms/measurement/internal/ix;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hm;->aHn: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;->aHq:Lcom/google/android/gms/measurement/internal/g;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hm;->aHm:Lcom/google/android/gms/measurement/internal/g;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/o;->aDf:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/o;->aDb:Lcom/google/android/gms/measurement/internal/do;
 
     const/4 v2, 0x0
 
@@ -1288,14 +1260,14 @@
     return-void
 .end method
 
-.method public final yo()Z
+.method public final ym()Z
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xB()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xz()V
 
-    iget-object v0, p0, 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/hm;->aHl:Lcom/google/android/gms/measurement/internal/dn;
 
     if-eqz v0, :cond_0
 
@@ -1309,12 +1281,12 @@
     return v0
 .end method
 
-.method protected final yp()V
+.method protected final yn()V
     .locals 5
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xB()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xz()V
 
     const/4 v0, 0x1
 
@@ -1322,11 +1294,11 @@
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v1
 
-    sget-object v2, Lcom/google/android/gms/measurement/internal/o;->aDY: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 {v1, v2}, Lcom/google/android/gms/measurement/internal/ka;->a(Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -1334,7 +1306,7 @@
 
     if-eqz v1, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ec;->xy()Lcom/google/android/gms/measurement/internal/dr;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ec;->xw()Lcom/google/android/gms/measurement/internal/dr;
 
     move-result-object v2
 
@@ -1356,14 +1328,14 @@
     return-void
 .end method
 
-.method final yq()V
+.method final yo()V
     .locals 6
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xB()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xz()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/hm;->yo()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/hm;->ym()Z
 
     move-result v0
 
@@ -1372,7 +1344,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hm;->aCi:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hm;->aCe:Ljava/lang/Boolean;
 
     const/4 v1, 0x0
 
@@ -1380,15 +1352,15 @@
 
     if-nez v0, :cond_e
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xB()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xz()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/eh;->vK()Ljava/lang/Boolean;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/eh;->vI()Ljava/lang/Boolean;
 
     move-result-object v0
 
@@ -1405,13 +1377,13 @@
     goto/16 :goto_6
 
     :cond_1
-    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;->vy()Lcom/google/android/gms/measurement/internal/jz;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ec;->xv()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ec;->xt()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ds;->xP()I
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ds;->xN()I
 
     move-result v0
 
@@ -1426,21 +1398,21 @@
     goto/16 :goto_5
 
     :cond_2
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()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 v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->vv()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jm;->yU()I
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jm;->yS()I
 
     move-result v0
 
@@ -1464,11 +1436,11 @@
 
     if-eq v0, v3, :cond_4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v3
 
-    iget-object v3, v3, 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/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -1488,11 +1460,11 @@
     goto :goto_5
 
     :cond_4
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()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;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v3, "Service updating"
 
@@ -1501,11 +1473,11 @@
     goto :goto_0
 
     :cond_5
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()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;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v3, "Service invalid"
 
@@ -1514,11 +1486,11 @@
     goto :goto_2
 
     :cond_6
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()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;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v3, "Service disabled"
 
@@ -1527,21 +1499,21 @@
     goto :goto_2
 
     :cond_7
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, 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/dv;->aED: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;->vv()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jm;->so()I
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jm;->sm()I
 
     move-result v0
 
@@ -1552,11 +1524,11 @@
     goto :goto_4
 
     :cond_8
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/eh;->vK()Ljava/lang/Boolean;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/eh;->vI()Ljava/lang/Boolean;
 
     move-result-object v0
 
@@ -1574,11 +1546,11 @@
     goto :goto_3
 
     :cond_a
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()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 v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEE:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v3, "Service missing"
 
@@ -1590,11 +1562,11 @@
     goto/16 :goto_1
 
     :cond_b
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()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 v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEE:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v3, "Service available"
 
@@ -1605,21 +1577,21 @@
     :goto_5
     if-nez v0, :cond_c
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v4
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ka;->vd()Z
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ka;->vb()Z
 
     move-result v4
 
     if-eqz v4, :cond_c
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEw:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v4, "No way to upload. Consider using the full version of Analytics"
 
@@ -1630,7 +1602,7 @@
     :cond_c
     if-eqz v3, :cond_d
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v3
 
@@ -1642,10 +1614,10 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/hm;->aCi:Ljava/lang/Boolean;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/hm;->aCe:Ljava/lang/Boolean;
 
     :cond_e
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hm;->aCi:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hm;->aCe:Ljava/lang/Boolean;
 
     invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -1653,32 +1625,32 @@
 
     if-eqz v0, :cond_12
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hm;->aHo:Lcom/google/android/gms/measurement/internal/ie;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hm;->aHk:Lcom/google/android/gms/measurement/internal/ie;
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ie;->aHn:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ie;->aHj:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ie;->aHn:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ie;->aHj:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vr()Landroid/content/Context;
 
     move-result-object v1
 
     monitor-enter v0
 
     :try_start_0
-    iget-boolean v3, v0, Lcom/google/android/gms/measurement/internal/ie;->atG:Z
+    iget-boolean v3, v0, Lcom/google/android/gms/measurement/internal/ie;->atC:Z
 
     if-eqz v3, :cond_f
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ie;->aHn:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ie;->aHj:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEE:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Connection attempt already in progress"
 
@@ -1689,19 +1661,19 @@
     return-void
 
     :cond_f
-    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/ie;->aHN:Lcom/google/android/gms/measurement/internal/dw;
+    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/ie;->aHJ:Lcom/google/android/gms/measurement/internal/dw;
 
     if-eqz v3, :cond_11
 
-    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/ie;->aHN:Lcom/google/android/gms/measurement/internal/dw;
+    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/ie;->aHJ:Lcom/google/android/gms/measurement/internal/dw;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/dw;->lX()Z
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/dw;->lV()Z
 
     move-result v3
 
     if-nez v3, :cond_10
 
-    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/ie;->aHN:Lcom/google/android/gms/measurement/internal/dw;
+    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/ie;->aHJ:Lcom/google/android/gms/measurement/internal/dw;
 
     invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/dw;->isConnected()Z
 
@@ -1710,13 +1682,13 @@
     if-eqz v3, :cond_11
 
     :cond_10
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ie;->aHn:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ie;->aHj:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEE:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Already awaiting connection attempt"
 
@@ -1735,25 +1707,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;->aHN:Lcom/google/android/gms/measurement/internal/dw;
+    iput-object v3, v0, Lcom/google/android/gms/measurement/internal/ie;->aHJ: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/hm;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ie;->aHj:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->atG:Z
+    iput-boolean v2, v0, Lcom/google/android/gms/measurement/internal/ie;->atC:Z
 
-    iget-object v1, 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;->aHJ:Lcom/google/android/gms/measurement/internal/dw;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/dw;->mR()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/dw;->mP()V
 
     monitor-exit v0
 
@@ -1769,19 +1741,19 @@
     throw v1
 
     :cond_12
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ka;->vd()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ka;->vb()Z
 
     move-result v0
 
     if-nez v0, :cond_16
 
-    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;->vy()Lcom/google/android/gms/measurement/internal/jz;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()Landroid/content/Context;
 
     move-result-object v0
 
@@ -1793,7 +1765,7 @@
 
     invoke-direct {v3}, Landroid/content/Intent;-><init>()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()Landroid/content/Context;
 
     move-result-object v4
 
@@ -1830,11 +1802,11 @@
 
     new-instance v1, Landroid/content/ComponentName;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()Landroid/content/Context;
 
     move-result-object v3
 
-    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;->vy()Lcom/google/android/gms/measurement/internal/jz;
 
     const-string v4, "com.google.android.gms.measurement.AppMeasurementService"
 
@@ -1842,34 +1814,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;->aHo:Lcom/google/android/gms/measurement/internal/ie;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hm;->aHk:Lcom/google/android/gms/measurement/internal/ie;
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/ie;->aHn:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/ie;->aHj:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/ie;->aHn:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/ie;->aHj:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vr()Landroid/content/Context;
 
     move-result-object v3
 
-    invoke-static {}, Lcom/google/android/gms/common/stats/a;->nk()Lcom/google/android/gms/common/stats/a;
+    invoke-static {}, Lcom/google/android/gms/common/stats/a;->ni()Lcom/google/android/gms/common/stats/a;
 
     monitor-enter v1
 
     :try_start_1
-    iget-boolean v4, v1, Lcom/google/android/gms/measurement/internal/ie;->atG:Z
+    iget-boolean v4, v1, Lcom/google/android/gms/measurement/internal/ie;->atC:Z
 
     if-eqz v4, :cond_14
 
-    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/ie;->aHn:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/ie;->aHj:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()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 v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEE:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Connection attempt already in progress"
 
@@ -1880,23 +1852,23 @@
     return-void
 
     :cond_14
-    iget-object v4, v1, Lcom/google/android/gms/measurement/internal/ie;->aHn:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v4, v1, Lcom/google/android/gms/measurement/internal/ie;->aHj:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v4
 
-    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->atG:Z
+    iput-boolean v2, v1, Lcom/google/android/gms/measurement/internal/ie;->atC:Z
 
-    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/ie;->aHn:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/ie;->aHj:Lcom/google/android/gms/measurement/internal/hm;
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/hm;->aHo:Lcom/google/android/gms/measurement/internal/ie;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/hm;->aHk:Lcom/google/android/gms/measurement/internal/ie;
 
     const/16 v4, 0x81
 
@@ -1916,11 +1888,11 @@
     throw v0
 
     :cond_15
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEw: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"
 
@@ -1930,12 +1902,12 @@
     return-void
 .end method
 
-.method protected final yv()V
+.method protected final yt()V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xB()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xz()V
 
     const/4 v0, 0x1
 
@@ -1952,6 +1924,34 @@
     return-void
 .end method
 
+.method protected final yz()V
+    .locals 2
+
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
+
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xz()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;->xw()Lcom/google/android/gms/measurement/internal/dr;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/dr;->xD()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 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 bf582d2f75..420ee0541a 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 aHt:Lcom/google/android/gms/measurement/internal/zzkj;
+.field private final synthetic aHp:Lcom/google/android/gms/measurement/internal/zzkj;
 
-.field private final synthetic aHu:Lcom/google/android/gms/measurement/internal/zzm;
+.field private final synthetic aHq:Lcom/google/android/gms/measurement/internal/zzm;
 
-.field private final synthetic aHv:Lcom/google/android/gms/measurement/internal/hm;
+.field private final synthetic aHr: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;->aHv:Lcom/google/android/gms/measurement/internal/hm;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hn;->aHr: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;->aHt:Lcom/google/android/gms/measurement/internal/zzkj;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/hn;->aHp:Lcom/google/android/gms/measurement/internal/zzkj;
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/hn;->aHu:Lcom/google/android/gms/measurement/internal/zzm;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/hn;->aHq: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;->aHv:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hn;->aHr:Lcom/google/android/gms/measurement/internal/hm;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/hm;->aHp:Lcom/google/android/gms/measurement/internal/dn;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/hm;->aHl:Lcom/google/android/gms/measurement/internal/dn;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hn;->aHv:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hn;->aHr:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->aHv:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hn;->aHr: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;->aHt:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hn;->aHp:Lcom/google/android/gms/measurement/internal/zzkj;
 
     :goto_0
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hn;->aHu:Lcom/google/android/gms/measurement/internal/zzm;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hn;->aHq: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;->aHv:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hn;->aHr:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/hm;->ym()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/hm;->yk()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 cddcd05809..e1397ba36d 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 aGH:Lcom/google/android/gms/measurement/internal/zzm;
+.field private final synthetic aGD:Lcom/google/android/gms/measurement/internal/zzm;
 
-.field private final synthetic aHw:Lcom/google/android/gms/measurement/internal/hm;
+.field private final synthetic aHs:Lcom/google/android/gms/measurement/internal/hm;
 
-.field private final synthetic aze:Ljava/util/concurrent/atomic/AtomicReference;
+.field private final synthetic aza: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;->aHw:Lcom/google/android/gms/measurement/internal/hm;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ho;->aHs:Lcom/google/android/gms/measurement/internal/hm;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ho;->aze:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ho;->aza:Ljava/util/concurrent/atomic/AtomicReference;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/ho;->aGH:Lcom/google/android/gms/measurement/internal/zzm;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/ho;->aGD: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;->aze:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ho;->aza:Ljava/util/concurrent/atomic/AtomicReference;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ho;->aHw:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ho;->aHs:Lcom/google/android/gms/measurement/internal/hm;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/hm;->aHp:Lcom/google/android/gms/measurement/internal/dn;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/hm;->aHl:Lcom/google/android/gms/measurement/internal/dn;
 
     if-nez v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ho;->aHw:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ho;->aHs:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->aze:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ho;->aza: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;->aze:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ho;->aza:Ljava/util/concurrent/atomic/AtomicReference;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ho;->aGH:Lcom/google/android/gms/measurement/internal/zzm;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ho;->aGD: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;->aze:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ho;->aza: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;->aHw:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ho;->aHs:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ec;->xu()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ec;->xs()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;->aHw:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ho;->aHs:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vw()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/ek;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/eh;->aEZ: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;->aHw:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ho;->aHs:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/hm;->ym()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/hm;->yk()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;->aze:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ho;->aza: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;->aHw:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ho;->aHs:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vv()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;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->aze:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ho;->aza: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;->aze:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ho;->aza: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 8cfb5b64de..1481b54085 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 aGz:Lcom/google/android/gms/measurement/internal/zzm;
+.field private final synthetic aGv:Lcom/google/android/gms/measurement/internal/zzm;
 
-.field private final synthetic aHx:Lcom/google/android/gms/measurement/internal/hm;
+.field private final synthetic aHt: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;->aHx:Lcom/google/android/gms/measurement/internal/hm;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hp;->aHt:Lcom/google/android/gms/measurement/internal/hm;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/hp;->aGz:Lcom/google/android/gms/measurement/internal/zzm;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/hp;->aGv: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;->aHx:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hp;->aHt:Lcom/google/android/gms/measurement/internal/hm;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/hm;->aHp:Lcom/google/android/gms/measurement/internal/dn;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/hm;->aHl:Lcom/google/android/gms/measurement/internal/dn;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hp;->aHx:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hp;->aHt:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->aGz:Lcom/google/android/gms/measurement/internal/zzm;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hp;->aGv: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;->aHx:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hp;->aHt:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->aHx:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hp;->aHt:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/hm;->ym()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/hm;->yk()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 9698f1774a..628f72d789 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 aGz:Lcom/google/android/gms/measurement/internal/zzm;
+.field private final synthetic aGv:Lcom/google/android/gms/measurement/internal/zzm;
 
-.field private final synthetic aHw:Lcom/google/android/gms/measurement/internal/hm;
+.field private final synthetic aHs:Lcom/google/android/gms/measurement/internal/hm;
 
-.field private final synthetic atG:Z
+.field private final synthetic atC: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;->aHw:Lcom/google/android/gms/measurement/internal/hm;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hq;->aHs:Lcom/google/android/gms/measurement/internal/hm;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/hq;->aGz:Lcom/google/android/gms/measurement/internal/zzm;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/hq;->aGv:Lcom/google/android/gms/measurement/internal/zzm;
 
-    iput-boolean p3, p0, Lcom/google/android/gms/measurement/internal/hq;->atG:Z
+    iput-boolean p3, p0, Lcom/google/android/gms/measurement/internal/hq;->atC: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;->aHw:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hq;->aHs:Lcom/google/android/gms/measurement/internal/hm;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/hm;->aHp:Lcom/google/android/gms/measurement/internal/dn;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/hm;->aHl:Lcom/google/android/gms/measurement/internal/dn;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hq;->aHw:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hq;->aHs:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->aGz:Lcom/google/android/gms/measurement/internal/zzm;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hq;->aGv: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;->atG:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/measurement/internal/hq;->atC:Z
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hq;->aHw:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hq;->aHs:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ec;->xy()Lcom/google/android/gms/measurement/internal/dr;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ec;->xw()Lcom/google/android/gms/measurement/internal/dr;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/dr;->xH()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/dr;->xF()Z
 
     :cond_1
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hq;->aHw:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hq;->aHs:Lcom/google/android/gms/measurement/internal/hm;
 
     const/4 v2, 0x0
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hq;->aGz:Lcom/google/android/gms/measurement/internal/zzm;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hq;->aGv: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;->aHw:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hq;->aHs:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/hm;->ym()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/hm;->yk()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;->aHw:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hq;->aHs:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEw: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 ac751bf5e4..a8a8164b6a 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 aGz:Lcom/google/android/gms/measurement/internal/zzm;
+.field private final synthetic aGv:Lcom/google/android/gms/measurement/internal/zzm;
 
-.field private final synthetic aHw:Lcom/google/android/gms/measurement/internal/hm;
+.field private final synthetic aHs:Lcom/google/android/gms/measurement/internal/hm;
 
-.field private final synthetic aHy:Lcom/google/android/gms/internal/measurement/lv;
+.field private final synthetic aHu: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;->aHw:Lcom/google/android/gms/measurement/internal/hm;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hr;->aHs:Lcom/google/android/gms/measurement/internal/hm;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/hr;->aGz:Lcom/google/android/gms/measurement/internal/zzm;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/hr;->aGv:Lcom/google/android/gms/measurement/internal/zzm;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/hr;->aHy:Lcom/google/android/gms/internal/measurement/lv;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/hr;->aHu: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;->aHw:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hr;->aHs:Lcom/google/android/gms/measurement/internal/hm;
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/hm;->aHp:Lcom/google/android/gms/measurement/internal/dn;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/hm;->aHl:Lcom/google/android/gms/measurement/internal/dn;
 
     if-nez v2, :cond_0
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hr;->aHw:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hr;->aHs:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vv()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;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->aHw:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hr;->aHs:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hr;->aHy:Lcom/google/android/gms/internal/measurement/lv;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hr;->aHu: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;->aGz:Lcom/google/android/gms/measurement/internal/zzm;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hr;->aGv: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;->aHw:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hr;->aHs:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ec;->xu()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ec;->xs()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;->aHw:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hr;->aHs:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vw()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/ek;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/eh;->aEZ: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;->aHw:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hr;->aHs:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/hm;->ym()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/hm;->yk()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;->aHw:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hr;->aHs:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hr;->aHy:Lcom/google/android/gms/internal/measurement/lv;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hr;->aHu: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;->aHw:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hr;->aHs:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->aHw:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hr;->aHs:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hr;->aHy:Lcom/google/android/gms/internal/measurement/lv;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hr;->aHu: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;->aHw:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hr;->aHs:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vt()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hr;->aHy:Lcom/google/android/gms/internal/measurement/lv;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hr;->aHu: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 036ef7b720..92f4197615 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 aGF:Lcom/google/android/gms/measurement/internal/zzan;
+.field private final synthetic aGB:Lcom/google/android/gms/measurement/internal/zzan;
 
-.field private final synthetic aHv:Lcom/google/android/gms/measurement/internal/hm;
+.field private final synthetic aHr:Lcom/google/android/gms/measurement/internal/hm;
 
-.field private final synthetic aHz:Lcom/google/android/gms/internal/measurement/lv;
+.field private final synthetic aHv:Lcom/google/android/gms/internal/measurement/lv;
 
-.field private final synthetic ane:Ljava/lang/String;
+.field private final synthetic ana: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;->aHv:Lcom/google/android/gms/measurement/internal/hm;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hs;->aHr:Lcom/google/android/gms/measurement/internal/hm;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/hs;->aGF:Lcom/google/android/gms/measurement/internal/zzan;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/hs;->aGB:Lcom/google/android/gms/measurement/internal/zzan;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/hs;->ane:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/hs;->ana:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/hs;->aHz:Lcom/google/android/gms/internal/measurement/lv;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/hs;->aHv: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;->aHv:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hs;->aHr:Lcom/google/android/gms/measurement/internal/hm;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/hm;->aHp:Lcom/google/android/gms/measurement/internal/dn;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/hm;->aHl:Lcom/google/android/gms/measurement/internal/dn;
 
     if-nez v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hs;->aHv:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hs;->aHr:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->aHv:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hs;->aHr:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vt()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hs;->aHz:Lcom/google/android/gms/internal/measurement/lv;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hs;->aHv: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;->aGF:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hs;->aGB:Lcom/google/android/gms/measurement/internal/zzan;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hs;->ane:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hs;->ana: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;->aHv:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hs;->aHr:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/hm;->ym()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/hm;->yk()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;->aHv:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hs;->aHr:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vt()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hs;->aHz:Lcom/google/android/gms/internal/measurement/lv;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hs;->aHv: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;->aHv:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hs;->aHr:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vv()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;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->aHv:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hs;->aHr:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vt()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hs;->aHz:Lcom/google/android/gms/internal/measurement/lv;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hs;->aHv: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;->aHv:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hs;->aHr:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vt()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hs;->aHz:Lcom/google/android/gms/internal/measurement/lv;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hs;->aHv: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 4d0c9a24fb..afe1684507 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 aHh:Lcom/google/android/gms/measurement/internal/hi;
+.field private final synthetic aHd:Lcom/google/android/gms/measurement/internal/hi;
 
-.field private final synthetic aHx:Lcom/google/android/gms/measurement/internal/hm;
+.field private final synthetic aHt: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;->aHx:Lcom/google/android/gms/measurement/internal/hm;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ht;->aHt:Lcom/google/android/gms/measurement/internal/hm;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ht;->aHh:Lcom/google/android/gms/measurement/internal/hi;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ht;->aHd: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;->aHx:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ht;->aHt:Lcom/google/android/gms/measurement/internal/hm;
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/hm;->aHp:Lcom/google/android/gms/measurement/internal/dn;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/hm;->aHl:Lcom/google/android/gms/measurement/internal/dn;
 
     if-nez v1, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ht;->aHx:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ht;->aHt:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->aHh:Lcom/google/android/gms/measurement/internal/hi;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ht;->aHd: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;->aHx:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ht;->aHt:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vr()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;->aHh:Lcom/google/android/gms/measurement/internal/hi;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ht;->aHd:Lcom/google/android/gms/measurement/internal/hi;
 
-    iget-wide v2, v0, Lcom/google/android/gms/measurement/internal/hi;->aBU:J
+    iget-wide v2, v0, Lcom/google/android/gms/measurement/internal/hi;->aBQ:J
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ht;->aHh:Lcom/google/android/gms/measurement/internal/hi;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ht;->aHd:Lcom/google/android/gms/measurement/internal/hi;
 
-    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/hi;->atS:Ljava/lang/String;
+    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/hi;->atO:Ljava/lang/String;
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ht;->aHh:Lcom/google/android/gms/measurement/internal/hi;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ht;->aHd:Lcom/google/android/gms/measurement/internal/hi;
 
-    iget-object v5, v0, Lcom/google/android/gms/measurement/internal/hi;->ane:Ljava/lang/String;
+    iget-object v5, v0, Lcom/google/android/gms/measurement/internal/hi;->ana:Ljava/lang/String;
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ht;->aHx:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ht;->aHt:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vr()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;->aHx:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ht;->aHt:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/hm;->ym()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/hm;->yk()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;->aHx:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ht;->aHt:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEw: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 02091b7eb4..c46dd24cd7 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 aGz:Lcom/google/android/gms/measurement/internal/zzm;
+.field private final synthetic aGv:Lcom/google/android/gms/measurement/internal/zzm;
 
-.field private final synthetic aHx:Lcom/google/android/gms/measurement/internal/hm;
+.field private final synthetic aHt: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;->aHx:Lcom/google/android/gms/measurement/internal/hm;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hu;->aHt:Lcom/google/android/gms/measurement/internal/hm;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/hu;->aGz:Lcom/google/android/gms/measurement/internal/zzm;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/hu;->aGv: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;->aHx:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hu;->aHt:Lcom/google/android/gms/measurement/internal/hm;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/hm;->aHp:Lcom/google/android/gms/measurement/internal/dn;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/hm;->aHl:Lcom/google/android/gms/measurement/internal/dn;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hu;->aHx:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hu;->aHt:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->aGz:Lcom/google/android/gms/measurement/internal/zzm;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hu;->aGv: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;->aHx:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hu;->aHt:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/hm;->ym()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/hm;->yk()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;->aHx:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hu;->aHt:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEw: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 6aa8706154..b9bd3c006c 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 aHn:Lcom/google/android/gms/measurement/internal/hm;
+.field private final synthetic aHj: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;->aHn:Lcom/google/android/gms/measurement/internal/hm;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hv;->aHj: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;->aHn:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hv;->aHj:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()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;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEz: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 45eadb91e5..1ed55d3e20 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 aHA:Lcom/google/android/gms/measurement/internal/zzv;
+.field private final synthetic aHw:Lcom/google/android/gms/measurement/internal/zzv;
 
-.field private final synthetic aHB:Lcom/google/android/gms/measurement/internal/zzm;
+.field private final synthetic aHx:Lcom/google/android/gms/measurement/internal/zzm;
 
-.field private final synthetic aHC:Lcom/google/android/gms/measurement/internal/zzv;
+.field private final synthetic aHy:Lcom/google/android/gms/measurement/internal/zzv;
 
-.field private final synthetic aHD:Lcom/google/android/gms/measurement/internal/hm;
+.field private final synthetic aHz:Lcom/google/android/gms/measurement/internal/hm;
 
-.field private final synthetic atG:Z
+.field private final synthetic atC: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;->aHD:Lcom/google/android/gms/measurement/internal/hm;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hw;->aHz: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;->atG:Z
+    iput-boolean p2, p0, Lcom/google/android/gms/measurement/internal/hw;->atC:Z
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/hw;->aHA:Lcom/google/android/gms/measurement/internal/zzv;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/hw;->aHw:Lcom/google/android/gms/measurement/internal/zzv;
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/hw;->aHB:Lcom/google/android/gms/measurement/internal/zzm;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/hw;->aHx:Lcom/google/android/gms/measurement/internal/zzm;
 
-    iput-object p5, p0, Lcom/google/android/gms/measurement/internal/hw;->aHC:Lcom/google/android/gms/measurement/internal/zzv;
+    iput-object p5, p0, Lcom/google/android/gms/measurement/internal/hw;->aHy: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;->aHD:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hw;->aHz:Lcom/google/android/gms/measurement/internal/hm;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/hm;->aHp:Lcom/google/android/gms/measurement/internal/dn;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/hm;->aHl:Lcom/google/android/gms/measurement/internal/dn;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hw;->aHD:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hw;->aHz:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->aHD:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hw;->aHz:Lcom/google/android/gms/measurement/internal/hm;
 
-    iget-boolean v2, p0, Lcom/google/android/gms/measurement/internal/hw;->atG:Z
+    iget-boolean v2, p0, Lcom/google/android/gms/measurement/internal/hw;->atC: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;->aHA:Lcom/google/android/gms/measurement/internal/zzv;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hw;->aHw:Lcom/google/android/gms/measurement/internal/zzv;
 
     :goto_0
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hw;->aHB:Lcom/google/android/gms/measurement/internal/zzm;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hw;->aHx: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;->aHC:Lcom/google/android/gms/measurement/internal/zzv;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hw;->aHy:Lcom/google/android/gms/measurement/internal/zzv;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/zzv;->atS:Ljava/lang/String;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/zzv;->atO: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;->aHA:Lcom/google/android/gms/measurement/internal/zzv;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hw;->aHw:Lcom/google/android/gms/measurement/internal/zzv;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hw;->aHB:Lcom/google/android/gms/measurement/internal/zzm;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hw;->aHx: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;->aHA:Lcom/google/android/gms/measurement/internal/zzv;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hw;->aHw: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;->aHD:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hw;->aHz:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->aHD:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hw;->aHz:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/hm;->ym()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/hm;->yk()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 a871b83918..dc2fb54ff1 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 aHB:Lcom/google/android/gms/measurement/internal/zzm;
+.field private final synthetic aHA:Lcom/google/android/gms/measurement/internal/zzan;
 
-.field private final synthetic aHD:Lcom/google/android/gms/measurement/internal/hm;
+.field private final synthetic aHx:Lcom/google/android/gms/measurement/internal/zzm;
 
-.field private final synthetic aHE:Lcom/google/android/gms/measurement/internal/zzan;
+.field private final synthetic aHz:Lcom/google/android/gms/measurement/internal/hm;
 
-.field private final synthetic atG:Z
+.field private final synthetic atC: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;->aHD:Lcom/google/android/gms/measurement/internal/hm;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hx;->aHz: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;->atG:Z
+    iput-boolean p3, p0, Lcom/google/android/gms/measurement/internal/hx;->atC:Z
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/hx;->aHE:Lcom/google/android/gms/measurement/internal/zzan;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/hx;->aHA:Lcom/google/android/gms/measurement/internal/zzan;
 
-    iput-object p5, p0, Lcom/google/android/gms/measurement/internal/hx;->aHB:Lcom/google/android/gms/measurement/internal/zzm;
+    iput-object p5, p0, Lcom/google/android/gms/measurement/internal/hx;->aHx: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;->aHD:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hx;->aHz:Lcom/google/android/gms/measurement/internal/hm;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/hm;->aHp:Lcom/google/android/gms/measurement/internal/dn;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/hm;->aHl:Lcom/google/android/gms/measurement/internal/dn;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hx;->aHD:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hx;->aHz:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->aHD:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hx;->aHz:Lcom/google/android/gms/measurement/internal/hm;
 
-    iget-boolean v2, p0, Lcom/google/android/gms/measurement/internal/hx;->atG:Z
+    iget-boolean v2, p0, Lcom/google/android/gms/measurement/internal/hx;->atC: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;->aHE:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hx;->aHA:Lcom/google/android/gms/measurement/internal/zzan;
 
     :goto_0
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hx;->aHB:Lcom/google/android/gms/measurement/internal/zzm;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hx;->aHx: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;->aHE:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hx;->aHA:Lcom/google/android/gms/measurement/internal/zzan;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hx;->aHB:Lcom/google/android/gms/measurement/internal/zzm;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hx;->aHx: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;->aHE:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hx;->aHA: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;->aHD:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hx;->aHz:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/dv;->xQ()Ljava/lang/String;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/dv;->xO()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;->aHD:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hx;->aHz:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->aHD:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hx;->aHz:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/hm;->ym()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/hm;->yk()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 bbbe72ab8d..0385c4d064 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 aHF:Lcom/google/android/gms/internal/measurement/lv;
+.field private final synthetic aHB:Lcom/google/android/gms/internal/measurement/lv;
 
-.field private final synthetic aHG:Lcom/google/android/gms/measurement/internal/hm;
+.field private final synthetic aHC:Lcom/google/android/gms/measurement/internal/hm;
 
-.field private final synthetic aHu:Lcom/google/android/gms/measurement/internal/zzm;
+.field private final synthetic aHq:Lcom/google/android/gms/measurement/internal/zzm;
 
-.field private final synthetic ane:Ljava/lang/String;
+.field private final synthetic ana:Ljava/lang/String;
 
-.field private final synthetic atS:Ljava/lang/String;
+.field private final synthetic atO: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;->aHG:Lcom/google/android/gms/measurement/internal/hm;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hy;->aHC:Lcom/google/android/gms/measurement/internal/hm;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/hy;->atS:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/hy;->atO:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/hy;->ane:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/hy;->ana:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/hy;->aHu:Lcom/google/android/gms/measurement/internal/zzm;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/hy;->aHq:Lcom/google/android/gms/measurement/internal/zzm;
 
-    iput-object p5, p0, Lcom/google/android/gms/measurement/internal/hy;->aHF:Lcom/google/android/gms/internal/measurement/lv;
+    iput-object p5, p0, Lcom/google/android/gms/measurement/internal/hy;->aHB: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;->aHG:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hy;->aHC:Lcom/google/android/gms/measurement/internal/hm;
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/hm;->aHp:Lcom/google/android/gms/measurement/internal/dn;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/hm;->aHl:Lcom/google/android/gms/measurement/internal/dn;
 
     if-nez v2, :cond_0
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hy;->aHG:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hy;->aHC:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vv()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;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEw:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hy;->atS:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hy;->atO:Ljava/lang/String;
 
-    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/hy;->ane:Ljava/lang/String;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/hy;->ana: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;->aHG:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hy;->aHC:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hy;->aHF:Lcom/google/android/gms/internal/measurement/lv;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hy;->aHB: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;->atS:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hy;->atO:Ljava/lang/String;
 
-    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/hy;->ane:Ljava/lang/String;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/hy;->ana:Ljava/lang/String;
 
-    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/hy;->aHu:Lcom/google/android/gms/measurement/internal/zzm;
+    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/hy;->aHq: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;->aHG:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hy;->aHC:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/hm;->ym()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/hm;->yk()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;->aHG:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hy;->aHC:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hy;->aHF:Lcom/google/android/gms/internal/measurement/lv;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hy;->aHB: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;->aHG:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hy;->aHC:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEw:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/hy;->atS:Ljava/lang/String;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/hy;->atO:Ljava/lang/String;
 
-    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/hy;->ane:Ljava/lang/String;
+    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/hy;->ana: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;->aHG:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hy;->aHC:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hy;->aHF:Lcom/google/android/gms/internal/measurement/lv;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hy;->aHB: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;->aHG:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hy;->aHC:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vt()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hy;->aHF:Lcom/google/android/gms/internal/measurement/lv;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hy;->aHB: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 eb949ea4bf..0e4d246177 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 aHD:Lcom/google/android/gms/measurement/internal/hm;
+.field private final synthetic aHD:Lcom/google/android/gms/measurement/internal/zzm;
 
-.field private final synthetic aHH:Lcom/google/android/gms/measurement/internal/zzm;
+.field private final synthetic aHz:Lcom/google/android/gms/measurement/internal/hm;
 
-.field private final synthetic ane:Ljava/lang/String;
+.field private final synthetic ana:Ljava/lang/String;
 
-.field private final synthetic anq:Ljava/lang/String;
+.field private final synthetic anm:Ljava/lang/String;
 
-.field private final synthetic aze:Ljava/util/concurrent/atomic/AtomicReference;
+.field private final synthetic aza: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;->aHD:Lcom/google/android/gms/measurement/internal/hm;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hz;->aHz:Lcom/google/android/gms/measurement/internal/hm;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/hz;->aze:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/hz;->aza:Ljava/util/concurrent/atomic/AtomicReference;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/hz;->ane:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/hz;->ana:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/hz;->anq:Ljava/lang/String;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/hz;->anm: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;->aHH:Lcom/google/android/gms/measurement/internal/zzm;
+    iput-object p6, p0, Lcom/google/android/gms/measurement/internal/hz;->aHD: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;->aze:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hz;->aza:Ljava/util/concurrent/atomic/AtomicReference;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hz;->aHD:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hz;->aHz:Lcom/google/android/gms/measurement/internal/hm;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/hm;->aHp:Lcom/google/android/gms/measurement/internal/dn;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/hm;->aHl:Lcom/google/android/gms/measurement/internal/dn;
 
     if-nez v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hz;->aHD:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hz;->aHz:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->ane:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hz;->ana: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;->anq:Ljava/lang/String;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/hz;->anm: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;->aze:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hz;->aza: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;->aze:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hz;->aza: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;->ane:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hz;->ana: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;->aze:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hz;->aza:Ljava/util/concurrent/atomic/AtomicReference;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hz;->anq:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hz;->anm: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;->aHH:Lcom/google/android/gms/measurement/internal/zzm;
+    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/hz;->aHD: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;->aze:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hz;->aza:Ljava/util/concurrent/atomic/AtomicReference;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hz;->ane:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hz;->ana:Ljava/lang/String;
 
-    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/hz;->anq:Ljava/lang/String;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/hz;->anm: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;->aHD:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hz;->aHz:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/hm;->ym()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/hm;->yk()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;->aze:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hz;->aza: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;->aHD:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hz;->aHz:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vv()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;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->ane:Ljava/lang/String;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/hz;->ana: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;->anq:Ljava/lang/String;
+    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/hz;->anm: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;->aze:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hz;->aza: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;->aze:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hz;->aza: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;->aze:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hz;->aza: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 933ed6a978..47780057f8 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 aCi:Ljava/lang/Boolean;
+.field private aCe:Ljava/lang/Boolean;
 
-.field private aCj:Landroid/accounts/AccountManager;
+.field private aCf:Landroid/accounts/AccountManager;
 
-.field private aCk:Ljava/lang/Boolean;
+.field private aCg:Ljava/lang/Boolean;
 
-.field private ane:Ljava/lang/String;
+.field private ana:Ljava/lang/String;
 
-.field private any:J
+.field private anu: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;->aCi:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/i;->aCe:Ljava/lang/Boolean;
 
     if-nez v0, :cond_0
 
-    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;->vy()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;->aCi:Ljava/lang/Boolean;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/i;->aCe: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;->aCi:Ljava/lang/Boolean;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/i;->aCe: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;->aCi:Ljava/lang/Boolean;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/i;->aCe:Ljava/lang/Boolean;
 
     invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -71,7 +71,7 @@
     return p1
 .end method
 
-.method protected final pR()Z
+.method protected final pP()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;->any:J
+    iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/i;->anu: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;->ane:Ljava/lang/String;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/i;->ana:Ljava/lang/String;
 
     const/4 v0, 0x0
 
     return v0
 .end method
 
-.method public final qB()J
+.method public final qz()J
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ft;->xE()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ft;->xC()V
 
-    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/i;->any:J
+    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/i;->anu:J
 
     return-wide v0
 .end method
 
-.method public final bridge synthetic rA()V
+.method public final bridge synthetic ry()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->rA()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->ry()V
 
     return-void
 .end method
 
-.method final uJ()Z
+.method final uH()Z
     .locals 9
 
     const-string v0, "com.google"
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()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;->aCk:Ljava/lang/Boolean;
+    iput-object v5, p0, Lcom/google/android/gms/measurement/internal/i;->aCg:Ljava/lang/Boolean;
 
     :cond_0
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/i;->aCk:Ljava/lang/Boolean;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/i;->aCg: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;->vt()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEE: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, "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;->aCk:Ljava/lang/Boolean;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/i;->aCg:Ljava/lang/Boolean;
 
     return v4
 
     :cond_2
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/i;->aCj:Landroid/accounts/AccountManager;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/i;->aCf:Landroid/accounts/AccountManager;
 
     if-nez v3, :cond_3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()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;->aCj:Landroid/accounts/AccountManager;
+    iput-object v3, p0, Lcom/google/android/gms/measurement/internal/i;->aCf:Landroid/accounts/AccountManager;
 
     :cond_3
     :try_start_0
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/i;->aCj:Landroid/accounts/AccountManager;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/i;->aCf: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;->aCk:Ljava/lang/Boolean;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/i;->aCg: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;->aCj:Landroid/accounts/AccountManager;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/i;->aCf: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;->aCk:Ljava/lang/Boolean;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/i;->aCg: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEB:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEx:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v5, "Exception checking account types"
 
@@ -379,39 +379,29 @@
 
     sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/i;->aCk:Ljava/lang/Boolean;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/i;->aCg:Ljava/lang/Boolean;
 
     return v4
 .end method
 
-.method public final bridge synthetic vA()Lcom/google/android/gms/measurement/internal/jz;
+.method public final vm()Ljava/lang/String;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vA()Lcom/google/android/gms/measurement/internal/jz;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ft;->xC()V
 
-    move-result-object v0
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/i;->ana:Ljava/lang/String;
 
     return-object v0
 .end method
 
-.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
+.method final vn()V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/i;->aCk:Ljava/lang/Boolean;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/i;->aCg:Ljava/lang/Boolean;
 
     const-wide/16 v0, 0x0
 
@@ -420,98 +410,108 @@
     return-void
 .end method
 
-.method public final bridge synthetic vq()V
+.method public final bridge synthetic vo()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vq()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vo()V
 
     return-void
 .end method
 
-.method public final bridge synthetic vr()Lcom/google/android/gms/measurement/internal/i;
+.method public final bridge synthetic vp()Lcom/google/android/gms/measurement/internal/i;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vr()Lcom/google/android/gms/measurement/internal/i;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vp()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vs()Lcom/google/android/gms/common/util/e;
+.method public final bridge synthetic vq()Lcom/google/android/gms/common/util/e;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vq()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vt()Landroid/content/Context;
+.method public final bridge synthetic vr()Landroid/content/Context;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vt()Landroid/content/Context;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vr()Landroid/content/Context;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vu()Lcom/google/android/gms/measurement/internal/dt;
+.method public final bridge synthetic vs()Lcom/google/android/gms/measurement/internal/dt;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vu()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vs()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vv()Lcom/google/android/gms/measurement/internal/jm;
+.method public final bridge synthetic vt()Lcom/google/android/gms/measurement/internal/jm;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vv()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vt()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vw()Lcom/google/android/gms/measurement/internal/ev;
+.method public final bridge synthetic vu()Lcom/google/android/gms/measurement/internal/ev;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vx()Lcom/google/android/gms/measurement/internal/dv;
+.method public final bridge synthetic vv()Lcom/google/android/gms/measurement/internal/dv;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vy()Lcom/google/android/gms/measurement/internal/eh;
+.method public final bridge synthetic vw()Lcom/google/android/gms/measurement/internal/eh;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vy()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vw()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vz()Lcom/google/android/gms/measurement/internal/ka;
+.method public final bridge synthetic vx()Lcom/google/android/gms/measurement/internal/ka;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vx()Lcom/google/android/gms/measurement/internal/ka;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic vy()Lcom/google/android/gms/measurement/internal/jz;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vy()Lcom/google/android/gms/measurement/internal/jz;
 
     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 d68a2f566d..04815ff6c3 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 aHB:Lcom/google/android/gms/measurement/internal/zzm;
+.field private final synthetic aHE:Lcom/google/android/gms/internal/measurement/lv;
 
-.field private final synthetic aHD:Lcom/google/android/gms/measurement/internal/hm;
+.field private final synthetic aHx:Lcom/google/android/gms/measurement/internal/zzm;
 
-.field private final synthetic aHI:Lcom/google/android/gms/internal/measurement/lv;
+.field private final synthetic aHz:Lcom/google/android/gms/measurement/internal/hm;
 
-.field private final synthetic ane:Ljava/lang/String;
+.field private final synthetic ana:Ljava/lang/String;
 
-.field private final synthetic asH:Z
+.field private final synthetic asD:Z
 
-.field private final synthetic atS:Ljava/lang/String;
+.field private final synthetic atO: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;->aHD:Lcom/google/android/gms/measurement/internal/hm;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ia;->aHz:Lcom/google/android/gms/measurement/internal/hm;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ia;->atS:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ia;->atO:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/ia;->ane:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/ia;->ana:Ljava/lang/String;
 
-    iput-boolean p4, p0, Lcom/google/android/gms/measurement/internal/ia;->asH:Z
+    iput-boolean p4, p0, Lcom/google/android/gms/measurement/internal/ia;->asD:Z
 
-    iput-object p5, p0, Lcom/google/android/gms/measurement/internal/ia;->aHB:Lcom/google/android/gms/measurement/internal/zzm;
+    iput-object p5, p0, Lcom/google/android/gms/measurement/internal/ia;->aHx:Lcom/google/android/gms/measurement/internal/zzm;
 
-    iput-object p6, p0, Lcom/google/android/gms/measurement/internal/ia;->aHI:Lcom/google/android/gms/internal/measurement/lv;
+    iput-object p6, p0, Lcom/google/android/gms/measurement/internal/ia;->aHE: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;->aHD:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ia;->aHz:Lcom/google/android/gms/measurement/internal/hm;
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/hm;->aHp:Lcom/google/android/gms/measurement/internal/dn;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/hm;->aHl:Lcom/google/android/gms/measurement/internal/dn;
 
     if-nez v2, :cond_0
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ia;->aHD:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ia;->aHz:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vv()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;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEw:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ia;->atS:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ia;->atO:Ljava/lang/String;
 
-    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/ia;->ane:Ljava/lang/String;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/ia;->ana: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;->aHD:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ia;->aHz:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ia;->aHI:Lcom/google/android/gms/internal/measurement/lv;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ia;->aHE: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;->atS:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ia;->atO:Ljava/lang/String;
 
-    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/ia;->ane:Ljava/lang/String;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/ia;->ana:Ljava/lang/String;
 
-    iget-boolean v5, p0, Lcom/google/android/gms/measurement/internal/ia;->asH:Z
+    iget-boolean v5, p0, Lcom/google/android/gms/measurement/internal/ia;->asD:Z
 
-    iget-object v6, p0, Lcom/google/android/gms/measurement/internal/ia;->aHB:Lcom/google/android/gms/measurement/internal/zzm;
+    iget-object v6, p0, Lcom/google/android/gms/measurement/internal/ia;->aHx: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;->aHD:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ia;->aHz:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/hm;->ym()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/hm;->yk()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;->aHD:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ia;->aHz:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ia;->aHI:Lcom/google/android/gms/internal/measurement/lv;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ia;->aHE: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;->aHD:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ia;->aHz:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEw:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/ia;->atS:Ljava/lang/String;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/ia;->atO: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;->aHD:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ia;->aHz:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ia;->aHI:Lcom/google/android/gms/internal/measurement/lv;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ia;->aHE: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;->aHD:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ia;->aHz:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vt()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ia;->aHI:Lcom/google/android/gms/internal/measurement/lv;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ia;->aHE: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 f1005adca3..e16df83fcc 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 aGO:Lcom/google/android/gms/internal/measurement/lv;
+.field private final synthetic aGK:Lcom/google/android/gms/internal/measurement/lv;
 
-.field private final synthetic aGQ:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
+.field private final synthetic aGM:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
 
-.field private final synthetic ane:Ljava/lang/String;
+.field private final synthetic ana:Ljava/lang/String;
 
-.field private final synthetic anq:Ljava/lang/String;
+.field private final synthetic anm: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;->aGQ:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ib;->aGM:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ib;->aGO:Lcom/google/android/gms/internal/measurement/lv;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ib;->aGK:Lcom/google/android/gms/internal/measurement/lv;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/ib;->ane:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/ib;->ana:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/ib;->anq:Ljava/lang/String;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/ib;->anm: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;->aGQ:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ib;->aGM:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->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/hm;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yg()Lcom/google/android/gms/measurement/internal/hm;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ib;->aGO:Lcom/google/android/gms/internal/measurement/lv;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ib;->aGK:Lcom/google/android/gms/internal/measurement/lv;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ib;->ane:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ib;->ana:Ljava/lang/String;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ib;->anq:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ib;->anm: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 b5aced7add..a1b3474067 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 aHJ:Lcom/google/android/gms/measurement/internal/zzm;
+.field private final synthetic aHF:Lcom/google/android/gms/measurement/internal/zzm;
 
-.field private final synthetic aHK:Lcom/google/android/gms/measurement/internal/hm;
+.field private final synthetic aHG:Lcom/google/android/gms/measurement/internal/hm;
 
-.field private final synthetic ane:Ljava/lang/String;
+.field private final synthetic ana:Ljava/lang/String;
 
-.field private final synthetic anq:Ljava/lang/String;
+.field private final synthetic anm:Ljava/lang/String;
 
-.field private final synthetic aze:Ljava/util/concurrent/atomic/AtomicReference;
+.field private final synthetic aza: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;->aHK:Lcom/google/android/gms/measurement/internal/hm;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ic;->aHG:Lcom/google/android/gms/measurement/internal/hm;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ic;->aze:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ic;->aza:Ljava/util/concurrent/atomic/AtomicReference;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/ic;->ane:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/ic;->ana:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/ic;->anq:Ljava/lang/String;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/ic;->anm: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;->aHJ:Lcom/google/android/gms/measurement/internal/zzm;
+    iput-object p7, p0, Lcom/google/android/gms/measurement/internal/ic;->aHF: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;->aze:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ic;->aza:Ljava/util/concurrent/atomic/AtomicReference;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ic;->aHK:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ic;->aHG:Lcom/google/android/gms/measurement/internal/hm;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/hm;->aHp:Lcom/google/android/gms/measurement/internal/dn;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/hm;->aHl:Lcom/google/android/gms/measurement/internal/dn;
 
     if-nez v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ic;->aHK:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ic;->aHG:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->ane:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ic;->ana: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;->anq:Ljava/lang/String;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/ic;->anm: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;->aze:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ic;->aza: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;->aze:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ic;->aza: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;->ane:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ic;->ana: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;->aze:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ic;->aza:Ljava/util/concurrent/atomic/AtomicReference;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ic;->anq:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ic;->anm: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;->aHJ:Lcom/google/android/gms/measurement/internal/zzm;
+    iget-object v6, p0, Lcom/google/android/gms/measurement/internal/ic;->aHF: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;->aze:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ic;->aza:Ljava/util/concurrent/atomic/AtomicReference;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ic;->ane:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ic;->ana:Ljava/lang/String;
 
-    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/ic;->anq:Ljava/lang/String;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/ic;->anm: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;->aHK:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ic;->aHG:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/hm;->ym()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/hm;->yk()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;->aze:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ic;->aza: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;->aHK:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ic;->aHG:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vv()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;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->ane:Ljava/lang/String;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/ic;->ana: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;->anq:Ljava/lang/String;
+    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/ic;->anm: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;->aze:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ic;->aza: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;->aze:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ic;->aza: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;->aze:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ic;->aza: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 f9db187a11..378ac788e5 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 aHL:Lcom/google/android/gms/measurement/internal/dn;
+.field private final synthetic aHH:Lcom/google/android/gms/measurement/internal/dn;
 
-.field private final synthetic aHM:Lcom/google/android/gms/measurement/internal/ie;
+.field private final synthetic aHI: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;->aHM:Lcom/google/android/gms/measurement/internal/ie;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/id;->aHI:Lcom/google/android/gms/measurement/internal/ie;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/id;->aHL:Lcom/google/android/gms/measurement/internal/dn;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/id;->aHH: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;->aHM:Lcom/google/android/gms/measurement/internal/ie;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/id;->aHI:Lcom/google/android/gms/measurement/internal/ie;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/id;->aHM:Lcom/google/android/gms/measurement/internal/ie;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/id;->aHI: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;->aHM:Lcom/google/android/gms/measurement/internal/ie;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/id;->aHI:Lcom/google/android/gms/measurement/internal/ie;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/ie;->aHn:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/ie;->aHj:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/hm;->yo()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/hm;->ym()Z
 
     move-result v1
 
     if-nez v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/id;->aHM:Lcom/google/android/gms/measurement/internal/ie;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/id;->aHI:Lcom/google/android/gms/measurement/internal/ie;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/ie;->aHn:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/ie;->aHj:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->aHM:Lcom/google/android/gms/measurement/internal/ie;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/id;->aHI:Lcom/google/android/gms/measurement/internal/ie;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/ie;->aHn:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/ie;->aHj:Lcom/google/android/gms/measurement/internal/hm;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/id;->aHL:Lcom/google/android/gms/measurement/internal/dn;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/id;->aHH: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 6eb0be8b69..6b1c418039 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 aHN:Lcom/google/android/gms/measurement/internal/dw;
+.field volatile aHJ:Lcom/google/android/gms/measurement/internal/dw;
 
-.field final synthetic aHn:Lcom/google/android/gms/measurement/internal/hm;
+.field final synthetic aHj:Lcom/google/android/gms/measurement/internal/hm;
 
-.field volatile atG:Z
+.field volatile atC: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;->aHn:Lcom/google/android/gms/measurement/internal/hm;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ie;->aHj: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;->atG:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ie;->atC: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;->aHn:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ie;->aHj:Lcom/google/android/gms/measurement/internal/hm;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/hm;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/hm;->aGG:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ey;->aFR:Lcom/google/android/gms/measurement/internal/dv;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ey;->aFN: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;->aFR:Lcom/google/android/gms/measurement/internal/dv;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ey;->aFN:Lcom/google/android/gms/measurement/internal/dv;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ft;->vd()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ft;->vb()Z
 
     move-result v1
 
     if-eqz v1, :cond_0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ey;->aFR:Lcom/google/android/gms/measurement/internal/dv;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ey;->aFN: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;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->atG:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/measurement/internal/ie;->atC:Z
 
-    iput-object v2, p0, Lcom/google/android/gms/measurement/internal/ie;->aHN:Lcom/google/android/gms/measurement/internal/dw;
+    iput-object v2, p0, Lcom/google/android/gms/measurement/internal/ie;->aHJ: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;->aHn:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ie;->aHj:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object p1
 
@@ -119,7 +119,7 @@
     throw p1
 .end method
 
-.method public final mm()V
+.method public final mk()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;->aHN:Lcom/google/android/gms/measurement/internal/dw;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ie;->aHJ:Lcom/google/android/gms/measurement/internal/dw;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dw;->mU()Landroid/os/IInterface;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dw;->mS()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;->aHn:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ie;->aHj:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vu()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;->aHN:Lcom/google/android/gms/measurement/internal/dw;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ie;->aHJ:Lcom/google/android/gms/measurement/internal/dw;
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ie;->atG:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ie;->atC:Z
 
     :goto_0
     monitor-exit p0
@@ -183,28 +183,28 @@
     throw v0
 .end method
 
-.method public final mn()V
+.method public final ml()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;->aHn:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ie;->aHj:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, 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/dv;->aED: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;->aHn:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ie;->aHj:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vu()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;->atG:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/measurement/internal/ie;->atC:Z
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ie;->aHn:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ie;->aHj:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, 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/dv;->aEw: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;->aHn:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/ie;->aHj:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->aHn:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/ie;->aHj:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->aHn:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/ie;->aHj:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->atG:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/measurement/internal/ie;->atC: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;->nk()Lcom/google/android/gms/common/stats/a;
+    invoke-static {}, Lcom/google/android/gms/common/stats/a;->ni()Lcom/google/android/gms/common/stats/a;
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ie;->aHn:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ie;->aHj:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vr()Landroid/content/Context;
 
     move-result-object p1
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/ie;->aHn:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/ie;->aHj:Lcom/google/android/gms/measurement/internal/hm;
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/hm;->aHo:Lcom/google/android/gms/measurement/internal/ie;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/hm;->aHk: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;->aHn:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ie;->aHj:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vu()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;->aHn:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ie;->aHj:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, 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/dv;->aED: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;->aHn:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ie;->aHj:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vu()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 dc5c9fcf33..e3d290e10f 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 aHL:Lcom/google/android/gms/measurement/internal/dn;
+.field private final synthetic aHH:Lcom/google/android/gms/measurement/internal/dn;
 
-.field private final synthetic aHM:Lcom/google/android/gms/measurement/internal/ie;
+.field private final synthetic aHI: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;->aHM:Lcom/google/android/gms/measurement/internal/ie;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/if;->aHI:Lcom/google/android/gms/measurement/internal/ie;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/if;->aHL:Lcom/google/android/gms/measurement/internal/dn;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/if;->aHH: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;->aHM:Lcom/google/android/gms/measurement/internal/ie;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/if;->aHI:Lcom/google/android/gms/measurement/internal/ie;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/if;->aHM:Lcom/google/android/gms/measurement/internal/ie;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/if;->aHI: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;->aHM:Lcom/google/android/gms/measurement/internal/ie;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/if;->aHI:Lcom/google/android/gms/measurement/internal/ie;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/ie;->aHn:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/ie;->aHj:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/hm;->yo()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/hm;->ym()Z
 
     move-result v1
 
     if-nez v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/if;->aHM:Lcom/google/android/gms/measurement/internal/ie;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/if;->aHI:Lcom/google/android/gms/measurement/internal/ie;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/ie;->aHn:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/ie;->aHj:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEH: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, "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;->aHM:Lcom/google/android/gms/measurement/internal/ie;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/if;->aHI:Lcom/google/android/gms/measurement/internal/ie;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/ie;->aHn:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/ie;->aHj:Lcom/google/android/gms/measurement/internal/hm;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/if;->aHL:Lcom/google/android/gms/measurement/internal/dn;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/if;->aHH: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 1ca42fc0eb..39c356c773 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 aHM:Lcom/google/android/gms/measurement/internal/ie;
+.field private final synthetic aHI:Lcom/google/android/gms/measurement/internal/ie;
 
-.field private final synthetic aHO:Landroid/content/ComponentName;
+.field private final synthetic aHK: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;->aHM:Lcom/google/android/gms/measurement/internal/ie;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ig;->aHI:Lcom/google/android/gms/measurement/internal/ie;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ig;->aHO:Landroid/content/ComponentName;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ig;->aHK: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;->aHM:Lcom/google/android/gms/measurement/internal/ie;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ig;->aHI:Lcom/google/android/gms/measurement/internal/ie;
 
-    iget-object v0, v0, 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/ie;->aHj:Lcom/google/android/gms/measurement/internal/hm;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ig;->aHO:Landroid/content/ComponentName;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ig;->aHK: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 b087c307c3..34ea51c16e 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 aHo:Lcom/google/android/gms/measurement/internal/ie;
+.field private final synthetic aHk: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;->aHo:Lcom/google/android/gms/measurement/internal/ie;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ih;->aHk: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;->aHo:Lcom/google/android/gms/measurement/internal/ie;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ih;->aHk:Lcom/google/android/gms/measurement/internal/ie;
 
-    iget-object v0, v0, 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/ie;->aHj:Lcom/google/android/gms/measurement/internal/hm;
 
     const/4 v1, 0x0
 
-    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/hm;->aHp:Lcom/google/android/gms/measurement/internal/dn;
+    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/hm;->aHl:Lcom/google/android/gms/measurement/internal/dn;
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ih;->aHo:Lcom/google/android/gms/measurement/internal/ie;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ih;->aHk:Lcom/google/android/gms/measurement/internal/ie;
 
-    iget-object v0, v0, 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/ie;->aHj:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/hm;->yC()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/hm;->yA()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 c8774087f3..a576aba3f1 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 aHo:Lcom/google/android/gms/measurement/internal/ie;
+.field private final synthetic aHk: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;->aHo:Lcom/google/android/gms/measurement/internal/ie;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ii;->aHk: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;->aHo:Lcom/google/android/gms/measurement/internal/ie;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aHk:Lcom/google/android/gms/measurement/internal/ie;
 
-    iget-object v0, v0, 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/ie;->aHj:Lcom/google/android/gms/measurement/internal/hm;
 
     new-instance v1, Landroid/content/ComponentName;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ii;->aHo:Lcom/google/android/gms/measurement/internal/ie;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ii;->aHk:Lcom/google/android/gms/measurement/internal/ie;
 
-    iget-object v2, v2, 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/ie;->aHj:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vr()Landroid/content/Context;
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ii;->aHo:Lcom/google/android/gms/measurement/internal/ie;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ii;->aHk:Lcom/google/android/gms/measurement/internal/ie;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ie;->aHn:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ie;->aHj:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vA()Lcom/google/android/gms/measurement/internal/jz;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vy()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 24b06e1200..8454bb91ab 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 aBN:Lcom/google/android/gms/measurement/internal/ik;
+.field private final aBJ:Lcom/google/android/gms/measurement/internal/ik;
 
-.field private final aHP:Lcom/google/android/gms/measurement/internal/dv;
+.field private final aHL:Lcom/google/android/gms/measurement/internal/dv;
 
-.field private final aHQ:Landroid/content/Intent;
+.field private final aHM:Landroid/content/Intent;
 
-.field private final anu:I
+.field private final anq: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;->aBN:Lcom/google/android/gms/measurement/internal/ik;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ij;->aBJ:Lcom/google/android/gms/measurement/internal/ik;
 
-    iput p2, p0, Lcom/google/android/gms/measurement/internal/ij;->anu:I
+    iput p2, p0, Lcom/google/android/gms/measurement/internal/ij;->anq:I
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/ij;->aHP:Lcom/google/android/gms/measurement/internal/dv;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/ij;->aHL:Lcom/google/android/gms/measurement/internal/dv;
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/ij;->aHQ:Landroid/content/Intent;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/ij;->aHM: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;->aBN:Lcom/google/android/gms/measurement/internal/ik;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ij;->aBJ:Lcom/google/android/gms/measurement/internal/ik;
 
-    iget v1, p0, Lcom/google/android/gms/measurement/internal/ij;->anu:I
+    iget v1, p0, Lcom/google/android/gms/measurement/internal/ij;->anq:I
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ij;->aHP:Lcom/google/android/gms/measurement/internal/dv;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ij;->aHL:Lcom/google/android/gms/measurement/internal/dv;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ij;->aHQ:Landroid/content/Intent;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ij;->aHM:Landroid/content/Intent;
 
-    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/ik;->aGM:Landroid/content/Context;
+    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/ik;->aGI: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;->aEI:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->yD()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ik;->yB()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->aGM:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ik;->aGI: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 0f08a3adfa..cdbe93f5b8 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 aGM:Landroid/content/Context;
+.field public final aGI: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;->aGM:Landroid/content/Context;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ik;->aGI: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;->aGM:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ik;->aGI: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;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v1
 
@@ -68,10 +68,10 @@
     return-void
 .end method
 
-.method public final pG()V
+.method public final pE()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ik;->aGM:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ik;->aGI: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vA()Lcom/google/android/gms/measurement/internal/jz;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vy()Lcom/google/android/gms/measurement/internal/jz;
 
-    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/dv;->aEE: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 yD()Lcom/google/android/gms/measurement/internal/dv;
+.method public final yB()Lcom/google/android/gms/measurement/internal/dv;
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ik;->aGM:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ik;->aGI: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vv()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;->aGM:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ik;->aGI: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vA()Lcom/google/android/gms/measurement/internal/jz;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vy()Lcom/google/android/gms/measurement/internal/jz;
 
-    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->yD()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ik;->yB()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, 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/dv;->aEw: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;->yD()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ik;->yB()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->yD()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ik;->yB()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, 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/dv;->aEw: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;->yD()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ik;->yB()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 v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEE: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 a8c519f2d1..a52e60ecfe 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 aGB:Lcom/google/android/gms/measurement/internal/jf;
+.field private final synthetic aGx:Lcom/google/android/gms/measurement/internal/jf;
 
-.field private final synthetic aHR:Ljava/lang/Runnable;
+.field private final synthetic aHN: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;->aGB:Lcom/google/android/gms/measurement/internal/jf;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/il;->aGx:Lcom/google/android/gms/measurement/internal/jf;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/il;->aHR:Ljava/lang/Runnable;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/il;->aHN: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;->aGB:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/il;->aGx:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->mY()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->mW()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/il;->aGB:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/il;->aGx:Lcom/google/android/gms/measurement/internal/jf;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/il;->aHR:Ljava/lang/Runnable;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/il;->aHN:Ljava/lang/Runnable;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->xB()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->xz()V
 
-    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/jf;->aIs:Ljava/util/List;
+    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/jf;->aIo: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;->aIs:Ljava/util/List;
+    iput-object v2, v0, Lcom/google/android/gms/measurement/internal/jf;->aIo:Ljava/util/List;
 
     :cond_0
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/jf;->aIs:Ljava/util/List;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/jf;->aIo: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;->aGB:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/il;->aGx:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->qv()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->qt()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 00c9852b67..f5ed5afcfc 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 aBN:Lcom/google/android/gms/measurement/internal/ik;
+.field private final aBJ:Lcom/google/android/gms/measurement/internal/ik;
 
-.field private final aFB:Lcom/google/android/gms/measurement/internal/dv;
+.field private final aFx:Lcom/google/android/gms/measurement/internal/dv;
 
-.field private final aHS:Landroid/app/job/JobParameters;
+.field private final aHO: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;->aBN:Lcom/google/android/gms/measurement/internal/ik;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/im;->aBJ:Lcom/google/android/gms/measurement/internal/ik;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/im;->aFB:Lcom/google/android/gms/measurement/internal/dv;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/im;->aFx:Lcom/google/android/gms/measurement/internal/dv;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/im;->aHS:Landroid/app/job/JobParameters;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/im;->aHO: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;->aBN:Lcom/google/android/gms/measurement/internal/ik;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/im;->aBJ:Lcom/google/android/gms/measurement/internal/ik;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/im;->aFB:Lcom/google/android/gms/measurement/internal/dv;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/im;->aFx:Lcom/google/android/gms/measurement/internal/dv;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/im;->aHS:Landroid/app/job/JobParameters;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/im;->aHO:Landroid/app/job/JobParameters;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->aGM:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ik;->aGI: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 4f2966ddbc..300b7f691e 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 aHT:Landroid/os/Handler;
+.field aHP:Landroid/os/Handler;
 
-.field protected aHU:Lcom/google/android/gms/measurement/internal/iv;
+.field protected aHQ:Lcom/google/android/gms/measurement/internal/iv;
 
-.field protected aHV:Lcom/google/android/gms/measurement/internal/it;
+.field protected aHR:Lcom/google/android/gms/measurement/internal/it;
 
-.field private aHW:Lcom/google/android/gms/measurement/internal/is;
+.field private aHS: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;->aHU:Lcom/google/android/gms/measurement/internal/iv;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/in;->aHQ: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;->aHV:Lcom/google/android/gms/measurement/internal/it;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/in;->aHR: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;->aHW:Lcom/google/android/gms/measurement/internal/is;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/in;->aHS: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;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/in;->yv()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/in;->yt()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()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 v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->aHW:Lcom/google/android/gms/measurement/internal/is;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/in;->aHS:Lcom/google/android/gms/measurement/internal/is;
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/is;->aHZ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/is;->aHV:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/is;->aHZ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/is;->aHV:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v1
 
-    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;->aEc: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;->aHZ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/is;->aHV:Lcom/google/android/gms/measurement/internal/in;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/in;->aHT:Landroid/os/Handler;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/in;->aHP:Landroid/os/Handler;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/is;->aHR:Ljava/lang/Runnable;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/is;->aHN: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;->aHV:Lcom/google/android/gms/measurement/internal/it;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/in;->aHR:Lcom/google/android/gms/measurement/internal/it;
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/it;->aIb:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/it;->aHX:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/it;->aIa:Lcom/google/android/gms/measurement/internal/g;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/it;->aHW:Lcom/google/android/gms/measurement/internal/g;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/g;->rA()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/g;->ry()V
 
-    iput-wide p1, v0, Lcom/google/android/gms/measurement/internal/it;->any:J
+    iput-wide p1, v0, Lcom/google/android/gms/measurement/internal/it;->anu:J
 
-    iget-wide p1, v0, Lcom/google/android/gms/measurement/internal/it;->any:J
+    iget-wide p1, v0, Lcom/google/android/gms/measurement/internal/it;->anu:J
 
-    iput-wide p1, v0, Lcom/google/android/gms/measurement/internal/it;->anz:J
+    iput-wide p1, v0, Lcom/google/android/gms/measurement/internal/it;->anv:J
 
-    iget-object p0, p0, Lcom/google/android/gms/measurement/internal/in;->aHU:Lcom/google/android/gms/measurement/internal/iv;
+    iget-object p0, p0, Lcom/google/android/gms/measurement/internal/in;->aHQ:Lcom/google/android/gms/measurement/internal/iv;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/iv;->yE()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/iv;->yC()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;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/in;->yv()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/in;->yt()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()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 v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->aHW:Lcom/google/android/gms/measurement/internal/is;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/in;->aHS:Lcom/google/android/gms/measurement/internal/is;
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/is;->aHZ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/is;->aHV:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v1
 
-    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;->aEc: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;->aHZ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/is;->aHV:Lcom/google/android/gms/measurement/internal/in;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/in;->aHT:Landroid/os/Handler;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/in;->aHP:Landroid/os/Handler;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/is;->aHR:Ljava/lang/Runnable;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/is;->aHN: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;->aHV:Lcom/google/android/gms/measurement/internal/it;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/in;->aHR:Lcom/google/android/gms/measurement/internal/it;
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/it;->aIa:Lcom/google/android/gms/measurement/internal/g;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/it;->aHW:Lcom/google/android/gms/measurement/internal/g;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/g;->rA()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/g;->ry()V
 
-    iget-wide v1, v0, Lcom/google/android/gms/measurement/internal/it;->any:J
+    iget-wide v1, v0, Lcom/google/android/gms/measurement/internal/it;->anu: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;->aIb:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/it;->aHX:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/eh;->aFn:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/eh;->aFj:Lcom/google/android/gms/measurement/internal/ei;
 
-    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/it;->aIb:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/it;->aHX:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/eh;->aFn:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/eh;->aFj:Lcom/google/android/gms/measurement/internal/ei;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ei;->ud()J
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ei;->ub()J
 
     move-result-wide v2
 
-    iget-wide v4, v0, Lcom/google/android/gms/measurement/internal/it;->any:J
+    iget-wide v4, v0, Lcom/google/android/gms/measurement/internal/it;->anu: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;->aHU:Lcom/google/android/gms/measurement/internal/iv;
+    iget-object p0, p0, Lcom/google/android/gms/measurement/internal/in;->aHQ:Lcom/google/android/gms/measurement/internal/iv;
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/iv;->aHV:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object p1
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/iv;->aHV:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ec;->xv()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ec;->xt()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object p2
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ds;->xL()Ljava/lang/String;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ds;->xJ()Ljava/lang/String;
 
     move-result-object p2
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/o;->aDu: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 {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;->aHZ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object p0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHV:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object p0
 
-    iget-object p0, p0, Lcom/google/android/gms/measurement/internal/eh;->aFo:Lcom/google/android/gms/measurement/internal/ej;
+    iget-object p0, p0, Lcom/google/android/gms/measurement/internal/eh;->aFk: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;->aHV:Lcom/google/android/gms/measurement/internal/it;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/in;->aHR:Lcom/google/android/gms/measurement/internal/it;
 
     invoke-virtual {v0, p1, p2}, Lcom/google/android/gms/measurement/internal/it;->c(ZZ)Z
 
@@ -260,25 +260,15 @@
     return p1
 .end method
 
-.method public final bridge synthetic rA()V
+.method public final bridge synthetic ry()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->rA()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->ry()V
 
     return-void
 .end method
 
-.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
+.method protected final vb()Z
     .locals 1
 
     const/4 v0, 0x0
@@ -286,116 +276,126 @@
     return v0
 .end method
 
-.method public final bridge synthetic vq()V
+.method public final bridge synthetic vo()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vq()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vo()V
 
     return-void
 .end method
 
-.method public final bridge synthetic vr()Lcom/google/android/gms/measurement/internal/i;
+.method public final bridge synthetic vp()Lcom/google/android/gms/measurement/internal/i;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vr()Lcom/google/android/gms/measurement/internal/i;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vp()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vs()Lcom/google/android/gms/common/util/e;
+.method public final bridge synthetic vq()Lcom/google/android/gms/common/util/e;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vq()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vt()Landroid/content/Context;
+.method public final bridge synthetic vr()Landroid/content/Context;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vt()Landroid/content/Context;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vr()Landroid/content/Context;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vu()Lcom/google/android/gms/measurement/internal/dt;
+.method public final bridge synthetic vs()Lcom/google/android/gms/measurement/internal/dt;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vu()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vs()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vv()Lcom/google/android/gms/measurement/internal/jm;
+.method public final bridge synthetic vt()Lcom/google/android/gms/measurement/internal/jm;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vv()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vt()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vw()Lcom/google/android/gms/measurement/internal/ev;
+.method public final bridge synthetic vu()Lcom/google/android/gms/measurement/internal/ev;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vx()Lcom/google/android/gms/measurement/internal/dv;
+.method public final bridge synthetic vv()Lcom/google/android/gms/measurement/internal/dv;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vy()Lcom/google/android/gms/measurement/internal/eh;
+.method public final bridge synthetic vw()Lcom/google/android/gms/measurement/internal/eh;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vy()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vw()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vz()Lcom/google/android/gms/measurement/internal/ka;
+.method public final bridge synthetic vx()Lcom/google/android/gms/measurement/internal/ka;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method protected final xF()V
+.method public final bridge synthetic vy()Lcom/google/android/gms/measurement/internal/jz;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vy()Lcom/google/android/gms/measurement/internal/jz;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method protected final xD()V
     .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
-    invoke-interface {v0}, Lcom/google/android/gms/common/util/e;->nr()J
+    invoke-interface {v0}, Lcom/google/android/gms/common/util/e;->np()J
 
     move-result-wide v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v2
 
@@ -408,82 +408,82 @@
     return-void
 .end method
 
-.method public final bridge synthetic xt()Lcom/google/android/gms/measurement/internal/z;
+.method public final bridge synthetic xr()Lcom/google/android/gms/measurement/internal/z;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xt()Lcom/google/android/gms/measurement/internal/z;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xr()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xu()Lcom/google/android/gms/measurement/internal/gf;
+.method public final bridge synthetic xs()Lcom/google/android/gms/measurement/internal/gf;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xu()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xs()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xv()Lcom/google/android/gms/measurement/internal/ds;
+.method public final bridge synthetic xt()Lcom/google/android/gms/measurement/internal/ds;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xv()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xt()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xw()Lcom/google/android/gms/measurement/internal/hm;
+.method public final bridge synthetic xu()Lcom/google/android/gms/measurement/internal/hm;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xw()Lcom/google/android/gms/measurement/internal/hm;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xu()Lcom/google/android/gms/measurement/internal/hm;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xx()Lcom/google/android/gms/measurement/internal/hh;
+.method public final bridge synthetic xv()Lcom/google/android/gms/measurement/internal/hh;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xx()Lcom/google/android/gms/measurement/internal/hh;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xv()Lcom/google/android/gms/measurement/internal/hh;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xy()Lcom/google/android/gms/measurement/internal/dr;
+.method public final bridge synthetic xw()Lcom/google/android/gms/measurement/internal/dr;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xy()Lcom/google/android/gms/measurement/internal/dr;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xw()Lcom/google/android/gms/measurement/internal/dr;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xz()Lcom/google/android/gms/measurement/internal/in;
+.method public final bridge synthetic xx()Lcom/google/android/gms/measurement/internal/in;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xz()Lcom/google/android/gms/measurement/internal/in;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xx()Lcom/google/android/gms/measurement/internal/in;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method final yv()V
+.method final yt()V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/in;->aHT:Landroid/os/Handler;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/in;->aHP: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;->aHT:Landroid/os/Handler;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/in;->aHP: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 7c29304e6a..229aa95309 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 aHX:Lcom/google/android/gms/measurement/internal/in;
+.field private final synthetic aHT:Lcom/google/android/gms/measurement/internal/in;
 
-.field private final synthetic any:J
+.field private final synthetic anu: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;->aHX:Lcom/google/android/gms/measurement/internal/in;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ip;->aHT:Lcom/google/android/gms/measurement/internal/in;
 
-    iput-wide p2, p0, Lcom/google/android/gms/measurement/internal/ip;->any:J
+    iput-wide p2, p0, Lcom/google/android/gms/measurement/internal/ip;->anu: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;->aHX:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ip;->aHT:Lcom/google/android/gms/measurement/internal/in;
 
-    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/ip;->any:J
+    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/ip;->anu: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 72e887c4c5..6eec5c6925 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 aHX:Lcom/google/android/gms/measurement/internal/in;
+.field private final synthetic aHT:Lcom/google/android/gms/measurement/internal/in;
 
-.field private final synthetic any:J
+.field private final synthetic anu: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;->aHX:Lcom/google/android/gms/measurement/internal/in;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/iq;->aHT:Lcom/google/android/gms/measurement/internal/in;
 
-    iput-wide p2, p0, Lcom/google/android/gms/measurement/internal/iq;->any:J
+    iput-wide p2, p0, Lcom/google/android/gms/measurement/internal/iq;->anu: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;->aHX:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iq;->aHT:Lcom/google/android/gms/measurement/internal/in;
 
-    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/iq;->any:J
+    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/iq;->anu: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 5015afbcaf..a5a4cea886 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 aHY:Lcom/google/android/gms/measurement/internal/is;
+.field private final aHU: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;->aHY:Lcom/google/android/gms/measurement/internal/is;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ir;->aHU: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;->aHY:Lcom/google/android/gms/measurement/internal/is;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ir;->aHU:Lcom/google/android/gms/measurement/internal/is;
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/is;->aHZ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/is;->aHV:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vu()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 caac441ce5..14845a1e9c 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 aHR:Ljava/lang/Runnable;
+.field final aHN:Ljava/lang/Runnable;
 
-.field final synthetic aHZ:Lcom/google/android/gms/measurement/internal/in;
+.field final synthetic aHV: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;->aHZ:Lcom/google/android/gms/measurement/internal/in;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/is;->aHV: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;->aHR:Ljava/lang/Runnable;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/is;->aHN: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 5fb7c21827..b0503f9251 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 aIa:Lcom/google/android/gms/measurement/internal/g;
+.field final aHW:Lcom/google/android/gms/measurement/internal/g;
 
-.field final synthetic aIb:Lcom/google/android/gms/measurement/internal/in;
+.field final synthetic aHX:Lcom/google/android/gms/measurement/internal/in;
 
-.field any:J
+.field anu:J
 
-.field anz:J
+.field anv: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;->aIb:Lcom/google/android/gms/measurement/internal/in;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/it;->aHX: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;->aIb:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/it;->aHX:Lcom/google/android/gms/measurement/internal/in;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/in;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/in;->aGG: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;->aIa:Lcom/google/android/gms/measurement/internal/g;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/it;->aHW:Lcom/google/android/gms/measurement/internal/g;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vq()Lcom/google/android/gms/common/util/e;
 
     move-result-object p1
 
-    invoke-interface {p1}, Lcom/google/android/gms/common/util/e;->nr()J
+    invoke-interface {p1}, Lcom/google/android/gms/common/util/e;->np()J
 
     move-result-wide v0
 
-    iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/it;->any:J
+    iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/it;->anu:J
 
-    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/it;->any:J
+    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/it;->anu:J
 
-    iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/it;->anz:J
+    iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/it;->anv: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;->aIb:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/it;->aHX:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()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;->aIb:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/it;->aHX:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xt()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xr()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v0
 
-    iget-object p0, p0, Lcom/google/android/gms/measurement/internal/it;->aIb:Lcom/google/android/gms/measurement/internal/in;
+    iget-object p0, p0, Lcom/google/android/gms/measurement/internal/it;->aHX:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()Lcom/google/android/gms/common/util/e;
 
     move-result-object p0
 
-    invoke-interface {p0}, Lcom/google/android/gms/common/util/e;->nr()J
+    invoke-interface {p0}, Lcom/google/android/gms/common/util/e;->np()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;->aIb:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/it;->aHX:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/it;->aIb:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/it;->aHX:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dc;->xB()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dc;->xz()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/it;->aIb:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/it;->aHX:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
-    invoke-interface {v0}, Lcom/google/android/gms/common/util/e;->nr()J
+    invoke-interface {v0}, Lcom/google/android/gms/common/util/e;->np()J
 
     move-result-wide v0
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/it;->aIb:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/it;->aHX:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/eh;->aFm:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/eh;->aFi:Lcom/google/android/gms/measurement/internal/ei;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/it;->aIb:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/it;->aHX:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vq()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;->any:J
+    iget-wide v2, p0, Lcom/google/android/gms/measurement/internal/it;->anu: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;->aIb:Lcom/google/android/gms/measurement/internal/in;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/it;->aHX:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->aIb:Lcom/google/android/gms/measurement/internal/in;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/it;->aHX:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/eh;->aFn:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/eh;->aFj: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;->aIb:Lcom/google/android/gms/measurement/internal/in;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/it;->aHX:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->aIb:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/it;->aHX:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ec;->xx()Lcom/google/android/gms/measurement/internal/hh;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ec;->xv()Lcom/google/android/gms/measurement/internal/hh;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/hh;->yA()Lcom/google/android/gms/measurement/internal/hi;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/hh;->yy()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;->aIb:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/it;->aHX:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v2
 
-    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/it;->aIb:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/it;->aHX:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ec;->xv()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ec;->xt()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v4
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ds;->xL()Ljava/lang/String;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ds;->xJ()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;->aIb:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/it;->aHX:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v2
 
-    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/it;->aIb:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/it;->aHX:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ec;->xv()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ec;->xt()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v4
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ds;->xL()Ljava/lang/String;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ds;->xJ()Ljava/lang/String;
 
     move-result-object v4
 
-    sget-object v5, Lcom/google/android/gms/measurement/internal/o;->aDB:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v5, Lcom/google/android/gms/measurement/internal/o;->aDx: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;->ue()J
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/it;->uc()J
 
     goto :goto_0
 
@@ -268,27 +268,27 @@
     goto :goto_0
 
     :cond_2
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/it;->ue()J
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/it;->uc()J
 
     :cond_3
     :goto_0
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/it;->aIb:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/it;->aHX:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v2
 
-    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/it;->aIb:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/it;->aHX:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ec;->xv()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ec;->xt()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v4
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ds;->xL()Ljava/lang/String;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ds;->xJ()Ljava/lang/String;
 
     move-result-object v4
 
-    sget-object v5, Lcom/google/android/gms/measurement/internal/o;->aDB:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v5, Lcom/google/android/gms/measurement/internal/o;->aDx: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;->aIb:Lcom/google/android/gms/measurement/internal/in;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/it;->aHX:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ec;->xu()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ec;->xs()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;->any:J
+    iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/it;->anu:J
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/it;->aIa:Lcom/google/android/gms/measurement/internal/g;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/it;->aHW:Lcom/google/android/gms/measurement/internal/g;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/g;->rA()V
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/g;->ry()V
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/it;->aIa:Lcom/google/android/gms/measurement/internal/g;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/it;->aHW: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;->aIb:Lcom/google/android/gms/measurement/internal/in;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/it;->aHX:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/eh;->aFn:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/eh;->aFj:Lcom/google/android/gms/measurement/internal/ei;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ei;->ud()J
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ei;->ub()J
 
     move-result-wide v6
 
@@ -347,24 +347,24 @@
     return v3
 .end method
 
-.method final ue()J
+.method final uc()J
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/it;->aIb:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/it;->aHX:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
-    invoke-interface {v0}, Lcom/google/android/gms/common/util/e;->nr()J
+    invoke-interface {v0}, Lcom/google/android/gms/common/util/e;->np()J
 
     move-result-wide v0
 
-    iget-wide v2, p0, Lcom/google/android/gms/measurement/internal/it;->anz:J
+    iget-wide v2, p0, Lcom/google/android/gms/measurement/internal/it;->anv:J
 
     sub-long v2, v0, v2
 
-    iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/it;->anz:J
+    iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/it;->anv: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 fb1d214d95..b8c9fd70b7 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 aHY:Lcom/google/android/gms/measurement/internal/is;
+.field private final aHU: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;->aHY:Lcom/google/android/gms/measurement/internal/is;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/iu;->aHU: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;->aHY:Lcom/google/android/gms/measurement/internal/is;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aHU:Lcom/google/android/gms/measurement/internal/is;
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/is;->aHZ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/is;->aHV:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/is;->aHZ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/is;->aHV:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEH: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, "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;->aHZ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/is;->aHV:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xu()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xs()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 8d46c9f1f9..795ddcd4d2 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 aCl:Lcom/google/android/gms/measurement/internal/g;
+.field private final aCh:Lcom/google/android/gms/measurement/internal/g;
 
-.field final synthetic aHZ:Lcom/google/android/gms/measurement/internal/in;
+.field final synthetic aHV: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;->aHZ:Lcom/google/android/gms/measurement/internal/in;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/iv;->aHV: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;->aHZ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHV:Lcom/google/android/gms/measurement/internal/in;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/in;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/in;->aGG: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;->aCl:Lcom/google/android/gms/measurement/internal/g;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/iv;->aCh: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;->aHZ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHV:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHV:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/in;->yv()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/in;->yt()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHV:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vw()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;->aHZ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHV:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vw()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/ej;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aFe: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;->aHZ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHV:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aFn:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aFj: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;->aHZ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHV:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/iv;->aHV:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ec;->xv()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ec;->xt()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ds;->xL()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ds;->xJ()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;->aHZ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHV:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aFm:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aFi: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;->aHZ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHV:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vw()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/ej;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aFe:Lcom/google/android/gms/measurement/internal/ej;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ej;->pH()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ej;->pF()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;->aHZ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHV:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
     invoke-static {}, Lcom/google/android/gms/internal/measurement/jh;->zzb()Z
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHV:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/iv;->aHV:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ec;->xv()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ec;->xt()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ds;->xL()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ds;->xJ()Ljava/lang/String;
 
     move-result-object v1
 
-    sget-object v2, Lcom/google/android/gms/measurement/internal/o;->aDy: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
 
@@ -168,11 +168,11 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHV:Lcom/google/android/gms/measurement/internal/in;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/in;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/in;->aGG: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;->ym()Z
 
     move-result v0
 
@@ -181,34 +181,34 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHV:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aFm:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aFi: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;->aHZ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHV:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
-    invoke-interface {v0}, Lcom/google/android/gms/common/util/e;->nr()J
+    invoke-interface {v0}, Lcom/google/android/gms/common/util/e;->np()J
 
     move-result-wide v0
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/iv;->aHV:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->aHZ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/iv;->aHV:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/iv;->aHV:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ec;->xv()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ec;->xt()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ds;->xL()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ds;->xJ()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;->aHZ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/iv;->aHV:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ec;->xu()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ec;->xs()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;->aHZ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/iv;->aHV:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vw()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/ej;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/eh;->aFe: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;->aHZ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/iv;->aHV:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/iv;->aHV:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ec;->xv()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ec;->xt()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ds;->xL()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ds;->xJ()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;->aHZ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHV:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/o;->aEh: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
 
@@ -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;->aHZ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/iv;->aHV:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ec;->xu()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ec;->xs()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;->aHZ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/iv;->aHV:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object p3
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/o;->aEp:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/o;->aEl: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;->aHZ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/iv;->aHV:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object p3
 
-    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/eh;->aFr:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/eh;->aFn:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ek;->pO()Ljava/lang/String;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ek;->pM()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;->aHZ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/iv;->aHV:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ec;->xu()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ec;->xs()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;->aHZ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/iv;->aHV:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object p3
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHV:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xv()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xt()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ds;->xL()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ds;->xJ()Ljava/lang/String;
 
     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;->aDu: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;->aHZ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/iv;->aHV:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object p3
 
-    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/eh;->aFm:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/eh;->aFi: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 yE()V
+.method final yC()V
     .locals 7
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHV:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHV:Lcom/google/android/gms/measurement/internal/in;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/in;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/in;->aGG: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;->ym()Z
 
     move-result v0
 
@@ -468,23 +468,23 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHV:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/iv;->aHV:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ec;->xv()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ec;->xt()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ds;->xL()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ds;->xJ()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;->aDq: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;->aHZ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHV:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aFo: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;
 
     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;->aHZ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHV:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/iv;->aHV:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ec;->xv()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ec;->xt()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ds;->xL()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ds;->xJ()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;->aHZ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHV:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()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;->aCl:Lcom/google/android/gms/measurement/internal/g;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aCh:Lcom/google/android/gms/measurement/internal/g;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/g;->rA()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/g;->ry()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHV:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/iv;->aHV:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vq()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;->aHZ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHV:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vw()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/ej;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aFe: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;->aHZ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHV:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aFn:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aFj: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;->aHZ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHV:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vw()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/ej;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aFe:Lcom/google/android/gms/measurement/internal/ej;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ej;->pH()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ej;->pF()Z
 
     move-result v0
 
     if-eqz v0, :cond_4
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aCl:Lcom/google/android/gms/measurement/internal/g;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aCh:Lcom/google/android/gms/measurement/internal/g;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/iv;->aHV:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/eh;->aFg:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/eh;->aFc:Lcom/google/android/gms/measurement/internal/ei;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ei;->ud()J
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ei;->ub()J
 
     move-result-wide v3
 
-    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/iv;->aHV:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v5
 
-    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/eh;->aFn:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/eh;->aFj:Lcom/google/android/gms/measurement/internal/ei;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ei;->ud()J
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ei;->ub()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 bda1194f01..4a61cb916f 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 aIc:Lcom/google/android/gms/measurement/internal/it;
+.field private final synthetic aHY: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;->aIc:Lcom/google/android/gms/measurement/internal/it;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/iw;->aHY: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;->aIc:Lcom/google/android/gms/measurement/internal/it;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iw;->aHY: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 f694ef76d3..4c75104a67 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 anz:J
+.field anv:J
 
-.field final azH:Lcom/google/android/gms/common/util/e;
+.field final azD: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;->azH:Lcom/google/android/gms/common/util/e;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ix;->azD: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;->azH:Lcom/google/android/gms/common/util/e;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ix;->azD:Lcom/google/android/gms/common/util/e;
 
-    invoke-interface {v0}, Lcom/google/android/gms/common/util/e;->nr()J
+    invoke-interface {v0}, Lcom/google/android/gms/common/util/e;->np()J
 
     move-result-wide v0
 
-    iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/ix;->anz:J
+    iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/ix;->anv: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 f07f4c7c14..0c8d7c6ad6 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 aHU:Lcom/google/android/gms/measurement/internal/iv;
+.field private final synthetic aHQ: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;->aHU:Lcom/google/android/gms/measurement/internal/iv;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/iy;->aHQ: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;->aHU:Lcom/google/android/gms/measurement/internal/iv;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iy;->aHQ:Lcom/google/android/gms/measurement/internal/iv;
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/iv;->aHV:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/iv;->aHV:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vq()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 e91b51d049..a2e720d18c 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 aGB:Lcom/google/android/gms/measurement/internal/jf;
+.field private final synthetic aGx:Lcom/google/android/gms/measurement/internal/jf;
 
-.field private final synthetic aId:Lcom/google/android/gms/measurement/internal/ja;
+.field private final synthetic aHZ: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;->aId:Lcom/google/android/gms/measurement/internal/ja;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/iz;->aHZ:Lcom/google/android/gms/measurement/internal/ja;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/iz;->aGB:Lcom/google/android/gms/measurement/internal/jf;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/iz;->aGx: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;->aId:Lcom/google/android/gms/measurement/internal/ja;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iz;->aHZ:Lcom/google/android/gms/measurement/internal/ja;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ja;->tU()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ja;->tS()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iz;->aId:Lcom/google/android/gms/measurement/internal/ja;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iz;->aHZ:Lcom/google/android/gms/measurement/internal/ja;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()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 v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->aGB:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iz;->aGx:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->qv()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->qt()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 b7b5a425af..4de43460da 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 aCf:Lcom/google/android/gms/measurement/internal/fw;
+.field private final synthetic aCb:Lcom/google/android/gms/measurement/internal/fw;
 
-.field private final synthetic aCl:Lcom/google/android/gms/measurement/internal/g;
+.field private final synthetic aCh: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;->aCl:Lcom/google/android/gms/measurement/internal/g;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/j;->aCh:Lcom/google/android/gms/measurement/internal/g;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/j;->aCf:Lcom/google/android/gms/measurement/internal/fw;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/j;->aCb: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;->aCf:Lcom/google/android/gms/measurement/internal/fw;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/j;->aCb:Lcom/google/android/gms/measurement/internal/fw;
 
-    invoke-interface {v0}, Lcom/google/android/gms/measurement/internal/fw;->vA()Lcom/google/android/gms/measurement/internal/jz;
+    invoke-interface {v0}, Lcom/google/android/gms/measurement/internal/fw;->vy()Lcom/google/android/gms/measurement/internal/jz;
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/jz;->pH()Z
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/jz;->pF()Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/j;->aCf:Lcom/google/android/gms/measurement/internal/fw;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/j;->aCb:Lcom/google/android/gms/measurement/internal/fw;
 
-    invoke-interface {v0}, Lcom/google/android/gms/measurement/internal/fw;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-interface {v0}, Lcom/google/android/gms/measurement/internal/fw;->vu()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;->aCl:Lcom/google/android/gms/measurement/internal/g;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/j;->aCh: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;->aCl:Lcom/google/android/gms/measurement/internal/g;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/j;->aCh: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;->aCl:Lcom/google/android/gms/measurement/internal/g;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/j;->aCh: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 29a70c5429..7cf1e8326c 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 aIa:Lcom/google/android/gms/measurement/internal/g;
+.field private final aHW:Lcom/google/android/gms/measurement/internal/g;
 
-.field private final aIe:Landroid/app/AlarmManager;
+.field private final aIa:Landroid/app/AlarmManager;
 
-.field private aIf:Ljava/lang/Integer;
+.field private aIb: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;->vt()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()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;->aIe:Landroid/app/AlarmManager;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ja;->aIa:Landroid/app/AlarmManager;
 
     new-instance v0, Lcom/google/android/gms/measurement/internal/iz;
 
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/jf;->aIm: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;->aIa:Lcom/google/android/gms/measurement/internal/g;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ja;->aHW:Lcom/google/android/gms/measurement/internal/g;
 
     return-void
 .end method
 
-.method private final sf()I
+.method private final sd()I
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ja;->aIf:Ljava/lang/Integer;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ja;->aIb:Ljava/lang/Integer;
 
     if-nez v0, :cond_1
 
     const-string v0, "measurement"
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()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;->aIf:Ljava/lang/Integer;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ja;->aIb:Ljava/lang/Integer;
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ja;->aIf:Ljava/lang/Integer;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ja;->aIb:Ljava/lang/Integer;
 
     invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
 
@@ -103,10 +103,10 @@
     return v0
 .end method
 
-.method private final yF()V
+.method private final yD()V
     .locals 5
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()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;->sf()I
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ja;->sd()I
 
     move-result v1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEE: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 yG()Landroid/app/PendingIntent;
+.method private final yE()Landroid/app/PendingIntent;
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()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;->yI()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yG()V
 
-    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;->vy()Lcom/google/android/gms/measurement/internal/jz;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEH: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, "Receiver not registered/enabled"
 
@@ -209,24 +209,24 @@
 
     if-nez v0, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, 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/dv;->aED: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;->tU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ja;->tS()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
-    invoke-interface {v0}, Lcom/google/android/gms/common/util/e;->nr()J
+    invoke-interface {v0}, Lcom/google/android/gms/common/util/e;->np()J
 
     move-result-wide v0
 
@@ -234,7 +234,7 @@
 
     const-wide/16 v0, 0x0
 
-    sget-object v2, Lcom/google/android/gms/measurement/internal/o;->aCW:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v2, Lcom/google/android/gms/measurement/internal/o;->aCS: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;->aIa:Lcom/google/android/gms/measurement/internal/g;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ja;->aHW: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()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 v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->aIa:Lcom/google/android/gms/measurement/internal/g;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ja;->aHW: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;->vA()Lcom/google/android/gms/measurement/internal/jz;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vy()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()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 v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->vt()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()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;->sf()I
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ja;->sd()I
 
     move-result v2
 
@@ -345,11 +345,11 @@
 
     move-result-object p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()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 v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->aIe:Landroid/app/AlarmManager;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ja;->aIa:Landroid/app/AlarmManager;
 
     const/4 v0, 0x2
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/o;->aCR:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/o;->aCN: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;->yG()Landroid/app/PendingIntent;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ja;->yE()Landroid/app/PendingIntent;
 
     move-result-object v8
 
@@ -409,12 +409,12 @@
     return-void
 .end method
 
-.method protected final pR()Z
+.method protected final pP()Z
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ja;->aIe:Landroid/app/AlarmManager;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ja;->aIa:Landroid/app/AlarmManager;
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ja;->yG()Landroid/app/PendingIntent;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ja;->yE()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;->yF()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ja;->yD()V
 
     :cond_0
     const/4 v0, 0x0
@@ -434,30 +434,30 @@
     return v0
 .end method
 
-.method public final bridge synthetic rA()V
+.method public final bridge synthetic ry()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->rA()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->ry()V
 
     return-void
 .end method
 
-.method public final tU()V
+.method public final tS()V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yG()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ja;->aIe:Landroid/app/AlarmManager;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ja;->aIa:Landroid/app/AlarmManager;
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ja;->yG()Landroid/app/PendingIntent;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ja;->yE()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;->aIa:Lcom/google/android/gms/measurement/internal/g;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ja;->aHW:Lcom/google/android/gms/measurement/internal/g;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/g;->rA()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/g;->ry()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;->yF()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ja;->yD()V
 
     :cond_0
     return-void
 .end method
 
-.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
+.method public final bridge synthetic vo()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vq()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vo()V
 
     return-void
 .end method
 
-.method public final bridge synthetic vr()Lcom/google/android/gms/measurement/internal/i;
+.method public final bridge synthetic vp()Lcom/google/android/gms/measurement/internal/i;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vr()Lcom/google/android/gms/measurement/internal/i;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vp()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vs()Lcom/google/android/gms/common/util/e;
+.method public final bridge synthetic vq()Lcom/google/android/gms/common/util/e;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vq()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vt()Landroid/content/Context;
+.method public final bridge synthetic vr()Landroid/content/Context;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vt()Landroid/content/Context;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vr()Landroid/content/Context;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vu()Lcom/google/android/gms/measurement/internal/dt;
+.method public final bridge synthetic vs()Lcom/google/android/gms/measurement/internal/dt;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vu()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vs()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vv()Lcom/google/android/gms/measurement/internal/jm;
+.method public final bridge synthetic vt()Lcom/google/android/gms/measurement/internal/jm;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vv()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vt()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vw()Lcom/google/android/gms/measurement/internal/ev;
+.method public final bridge synthetic vu()Lcom/google/android/gms/measurement/internal/ev;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vx()Lcom/google/android/gms/measurement/internal/dv;
+.method public final bridge synthetic vv()Lcom/google/android/gms/measurement/internal/dv;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vy()Lcom/google/android/gms/measurement/internal/eh;
+.method public final bridge synthetic vw()Lcom/google/android/gms/measurement/internal/eh;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vy()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vw()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vz()Lcom/google/android/gms/measurement/internal/ka;
+.method public final bridge synthetic vx()Lcom/google/android/gms/measurement/internal/ka;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xR()Lcom/google/android/gms/measurement/internal/jj;
+.method public final bridge synthetic vy()Lcom/google/android/gms/measurement/internal/jz;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->xR()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vy()Lcom/google/android/gms/measurement/internal/jz;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xS()Lcom/google/android/gms/measurement/internal/jr;
+.method public final bridge synthetic xP()Lcom/google/android/gms/measurement/internal/jj;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->xS()Lcom/google/android/gms/measurement/internal/jr;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->xP()Lcom/google/android/gms/measurement/internal/jj;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xT()Lcom/google/android/gms/measurement/internal/d;
+.method public final bridge synthetic xQ()Lcom/google/android/gms/measurement/internal/jr;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->xT()Lcom/google/android/gms/measurement/internal/d;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->xQ()Lcom/google/android/gms/measurement/internal/jr;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xU()Lcom/google/android/gms/measurement/internal/es;
+.method public final bridge synthetic xR()Lcom/google/android/gms/measurement/internal/d;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->xU()Lcom/google/android/gms/measurement/internal/es;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->xR()Lcom/google/android/gms/measurement/internal/d;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic xS()Lcom/google/android/gms/measurement/internal/es;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->xS()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 b772837f40..c4c8c90cf7 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 atG:Z
+.field private atC:Z
 
 
 # direct methods
@@ -13,32 +13,32 @@
 
     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;->aGB:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/jb;->aGx:Lcom/google/android/gms/measurement/internal/jf;
 
-    iget v0, p1, Lcom/google/android/gms/measurement/internal/jf;->aIt:I
+    iget v0, p1, Lcom/google/android/gms/measurement/internal/jf;->aIp:I
 
     add-int/lit8 v0, v0, 0x1
 
-    iput v0, p1, Lcom/google/android/gms/measurement/internal/jf;->aIt:I
+    iput v0, p1, Lcom/google/android/gms/measurement/internal/jf;->aIp:I
 
     return-void
 .end method
 
 
 # virtual methods
-.method protected abstract pR()Z
+.method protected abstract pP()Z
 .end method
 
-.method public final yC()V
+.method public final yA()V
     .locals 3
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/jb;->atG:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/jb;->atC:Z
 
     if-nez v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->pR()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->pP()Z
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jb;->aGB:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jb;->aGx:Lcom/google/android/gms/measurement/internal/jf;
 
     iget v1, v0, Lcom/google/android/gms/measurement/internal/jf;->zzq:I
 
@@ -48,7 +48,7 @@
 
     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
+    iput-boolean v2, p0, Lcom/google/android/gms/measurement/internal/jb;->atC:Z
 
     return-void
 
@@ -62,10 +62,10 @@
     throw v0
 .end method
 
-.method final yH()Z
+.method final yF()Z
     .locals 1
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/jb;->atG:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/jb;->atC:Z
 
     if-eqz v0, :cond_0
 
@@ -79,10 +79,10 @@
     return v0
 .end method
 
-.method protected final yI()V
+.method protected final yG()V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yH()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yF()Z
 
     move-result v0
 
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 e051453eda..8723c435b4 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 aGO:Lcom/google/android/gms/internal/measurement/lv;
+.field private final synthetic aGK:Lcom/google/android/gms/internal/measurement/lv;
 
-.field private final synthetic aIg:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
+.field private final synthetic aIc:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
 
-.field private final synthetic ane:Ljava/lang/String;
+.field private final synthetic ana:Ljava/lang/String;
 
-.field private final synthetic anq:Ljava/lang/String;
+.field private final synthetic anm:Ljava/lang/String;
 
-.field private final synthetic axe:Z
+.field private final synthetic axa: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;->aIg:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jc;->aIc:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/jc;->aGO:Lcom/google/android/gms/internal/measurement/lv;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/jc;->aGK:Lcom/google/android/gms/internal/measurement/lv;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/jc;->ane:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/jc;->ana:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/jc;->anq:Ljava/lang/String;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/jc;->anm:Ljava/lang/String;
 
-    iput-boolean p5, p0, Lcom/google/android/gms/measurement/internal/jc;->axe:Z
+    iput-boolean p5, p0, Lcom/google/android/gms/measurement/internal/jc;->axa: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;->aIg:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jc;->aIc:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->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/hm;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yg()Lcom/google/android/gms/measurement/internal/hm;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jc;->aGO:Lcom/google/android/gms/internal/measurement/lv;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jc;->aGK:Lcom/google/android/gms/internal/measurement/lv;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/jc;->ane:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/jc;->ana:Ljava/lang/String;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/jc;->anq:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/jc;->anm:Ljava/lang/String;
 
-    iget-boolean v4, p0, Lcom/google/android/gms/measurement/internal/jc;->axe:Z
+    iget-boolean v4, p0, Lcom/google/android/gms/measurement/internal/jc;->axa: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 90acf9791a..67ceaa04ab 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 aGB:Lcom/google/android/gms/measurement/internal/jf;
+.field protected final aGx: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/jf;->aIm: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;->aGB:Lcom/google/android/gms/measurement/internal/jf;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jd;->aGx:Lcom/google/android/gms/measurement/internal/jf;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public xR()Lcom/google/android/gms/measurement/internal/jj;
+.method public xP()Lcom/google/android/gms/measurement/internal/jj;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jd;->aGB:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jd;->aGx:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->yP()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->yN()Lcom/google/android/gms/measurement/internal/jj;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public xS()Lcom/google/android/gms/measurement/internal/jr;
+.method public xQ()Lcom/google/android/gms/measurement/internal/jr;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jd;->aGB:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jd;->aGx:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->yO()Lcom/google/android/gms/measurement/internal/jr;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->yM()Lcom/google/android/gms/measurement/internal/jr;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public xT()Lcom/google/android/gms/measurement/internal/d;
+.method public xR()Lcom/google/android/gms/measurement/internal/d;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jd;->aGB:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jd;->aGx:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public xU()Lcom/google/android/gms/measurement/internal/es;
+.method public xS()Lcom/google/android/gms/measurement/internal/es;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jd;->aGB:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jd;->aGx:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/es;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->yH()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 d30e6b83b9..c56f374a50 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 aES:Lcom/google/android/gms/measurement/internal/jf;
+.field private final synthetic aEO:Lcom/google/android/gms/measurement/internal/jf;
 
-.field private final synthetic aIh:Lcom/google/android/gms/measurement/internal/jk;
+.field private final synthetic aId: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;->aES:Lcom/google/android/gms/measurement/internal/jf;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/je;->aEO:Lcom/google/android/gms/measurement/internal/jf;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/je;->aIh:Lcom/google/android/gms/measurement/internal/jk;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/je;->aId: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;->aES:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/je;->aEO: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;->aES:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/je;->aEO:Lcom/google/android/gms/measurement/internal/jf;
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/d;->vb()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/d;->uZ()V
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->xY()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/eh;->aEW:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/eh;->aES:Lcom/google/android/gms/measurement/internal/ei;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ei;->ud()J
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ei;->ub()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->xY()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/eh;->aEW:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/eh;->aES:Lcom/google/android/gms/measurement/internal/ei;
 
-    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vq()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;->sj()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->sh()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 97d34abfaf..e8b60d850a 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 private final synthetic aIA:Lcom/google/android/gms/measurement/internal/jf;
+.field aIv:Lcom/google/android/gms/internal/measurement/ak$g;
 
-.field aIz:Lcom/google/android/gms/internal/measurement/ak$g;
+.field private final synthetic aIw:Lcom/google/android/gms/measurement/internal/jf;
 
-.field awq:Ljava/util/List;
+.field awY: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
 .end field
 
-.field axc:Ljava/util/List;
+.field awm: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
@@ -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;->aIA:Lcom/google/android/gms/measurement/internal/jf;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jf$a;->aIw: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;->awq:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf$a;->awm: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;->awq:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/jf$a;->awm:Ljava/util/List;
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf$a;->axc:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf$a;->awY: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;->axc:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/jf$a;->awY:Ljava/util/List;
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf$a;->awq:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf$a;->awm: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;->awq:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf$a;->awm: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;->sT()I
+    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/dw;->sR()I
 
     move-result v0
 
@@ -154,7 +154,7 @@
 
     add-long/2addr v2, v4
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/o;->aCH:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/o;->aCD: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;->awq:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf$a;->awm: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;->axc:Ljava/util/List;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/jf$a;->awY: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;->awq:Ljava/util/List;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/jf$a;->awm:Ljava/util/List;
 
     invoke-interface {p1}, Ljava/util/List;->size()I
 
     move-result p1
 
-    sget-object p2, Lcom/google/android/gms/measurement/internal/o;->aCI:Lcom/google/android/gms/measurement/internal/do;
+    sget-object p2, Lcom/google/android/gms/measurement/internal/o;->aCE: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;->aIz:Lcom/google/android/gms/internal/measurement/ak$g;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jf$a;->aIv: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 696b99b2cc..3bdfc81ded 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 aGB:Lcom/google/android/gms/measurement/internal/jf;
+.field private static volatile aGx:Lcom/google/android/gms/measurement/internal/jf;
 
 
 # instance fields
-.field private aAs:Z
+.field private aAo:Z
 
-.field private aGv:J
+.field private aGr:J
 
-.field private aIi:Lcom/google/android/gms/measurement/internal/es;
+.field private aIe:Lcom/google/android/gms/measurement/internal/es;
 
-.field private aIj:Lcom/google/android/gms/measurement/internal/dz;
+.field private aIf:Lcom/google/android/gms/measurement/internal/dz;
 
-.field private aIk:Lcom/google/android/gms/measurement/internal/d;
+.field private aIg:Lcom/google/android/gms/measurement/internal/d;
 
-.field private aIl:Lcom/google/android/gms/measurement/internal/eg;
+.field private aIh:Lcom/google/android/gms/measurement/internal/eg;
 
-.field private aIm:Lcom/google/android/gms/measurement/internal/ja;
+.field private aIi:Lcom/google/android/gms/measurement/internal/ja;
 
-.field private aIn:Lcom/google/android/gms/measurement/internal/jr;
+.field private aIj:Lcom/google/android/gms/measurement/internal/jr;
 
-.field private final aIo:Lcom/google/android/gms/measurement/internal/jj;
+.field private final aIk:Lcom/google/android/gms/measurement/internal/jj;
 
-.field aIp:Lcom/google/android/gms/measurement/internal/hg;
+.field aIl:Lcom/google/android/gms/measurement/internal/hg;
 
-.field final aIq:Lcom/google/android/gms/measurement/internal/ey;
+.field final aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-.field private aIr:Z
+.field private aIn:Z
 
-.field aIs:Ljava/util/List;
+.field aIo:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -53,15 +53,15 @@
     .end annotation
 .end field
 
-.field aIt:I
+.field aIp:I
 
-.field private aIu:Z
+.field private aIq:Z
 
-.field private aIv:Ljava/nio/channels/FileLock;
+.field private aIr:Ljava/nio/channels/FileLock;
 
-.field private aIw:Ljava/nio/channels/FileChannel;
+.field private aIs:Ljava/nio/channels/FileChannel;
 
-.field private aIx:Ljava/util/List;
+.field private aIt:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -71,7 +71,7 @@
     .end annotation
 .end field
 
-.field private aIy:Ljava/util/List;
+.field private aIu:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -81,9 +81,9 @@
     .end annotation
 .end field
 
-.field private adP:J
+.field private adL:J
 
-.field private atw:Z
+.field private ats: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;->aGM:Landroid/content/Context;
+    iget-object p2, p1, Lcom/google/android/gms/measurement/internal/jk;->aGI: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
     const-wide/16 v0, -0x1
 
-    iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aGv:J
+    iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aGr: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;->yC()V
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/jb;->yA()V
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIo:Lcom/google/android/gms/measurement/internal/jj;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIk: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;->yC()V
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/jb;->yA()V
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIj:Lcom/google/android/gms/measurement/internal/dz;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIf: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;->yC()V
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/jb;->yA()V
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIi:Lcom/google/android/gms/measurement/internal/es;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIe:Lcom/google/android/gms/measurement/internal/es;
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vu()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzm;->atO: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->yb()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/jm;->rU()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/jm;->rS()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;->xX()Ljava/lang/String;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fb;->xV()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ey;->yb()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object p3
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/jm;->rU()Ljava/lang/String;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/jm;->rS()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;->ane:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->ana:Ljava/lang/String;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fb;->ug()Ljava/lang/String;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fb;->ue()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;->ane:Ljava/lang/String;
+    iget-object p3, p1, Lcom/google/android/gms/measurement/internal/zzm;->ana: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;->uD()Ljava/lang/String;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fb;->uB()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/ey;->aFL:Lcom/google/android/gms/measurement/internal/ka;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fb;->qz()Ljava/lang/String;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fb;->qx()Ljava/lang/String;
 
     move-result-object v2
 
-    sget-object v3, Lcom/google/android/gms/measurement/internal/o;->aEf:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v3, Lcom/google/android/gms/measurement/internal/o;->aEb: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;->aIJ:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->aIF:Ljava/lang/String;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fb;->vo()Ljava/lang/String;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fb;->vm()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;->aIJ:Ljava/lang/String;
+    iget-object p3, p1, Lcom/google/android/gms/measurement/internal/zzm;->aIF: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;->aEv:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->aEr: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;->aEv:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->aEr:Ljava/lang/String;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fb;->ys()Ljava/lang/String;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fb;->yq()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;->aEv:Ljava/lang/String;
+    iget-object p3, p1, Lcom/google/android/gms/measurement/internal/zzm;->aEr: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;->un()J
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fb;->ul()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;->anq:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->anm: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;->anq:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->anm:Ljava/lang/String;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fb;->qZ()Ljava/lang/String;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fb;->qX()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;->anq:Ljava/lang/String;
+    iget-object p3, p1, Lcom/google/android/gms/measurement/internal/zzm;->anm: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;->ul()J
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fb;->uj()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;->yt()Ljava/lang/String;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fb;->yr()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;->rZ()J
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fb;->rX()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;->ne()Z
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fb;->nc()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;->xM()Ljava/lang/String;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fb;->xK()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;->uw()J
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fb;->uu()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;->azP:Z
+    iget-boolean v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->azL:Z
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fb;->xJ()Z
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fb;->xH()Z
 
     move-result v2
 
     if-eq v1, v2, :cond_e
 
-    iget-boolean p3, p1, Lcom/google/android/gms/measurement/internal/zzm;->azP:Z
+    iget-boolean p3, p1, Lcom/google/android/gms/measurement/internal/zzm;->azL: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;->adR:Z
+    iget-boolean v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->adN:Z
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fb;->yr()Z
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fb;->yp()Z
 
     move-result v2
 
     if-eq v1, v2, :cond_f
 
-    iget-boolean p3, p1, Lcom/google/android/gms/measurement/internal/zzm;->adR:Z
+    iget-boolean p3, p1, Lcom/google/android/gms/measurement/internal/zzm;->adN: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/ey;->aFL:Lcom/google/android/gms/measurement/internal/ka;
 
-    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzm;->atO:Ljava/lang/String;
 
-    sget-object v5, Lcom/google/android/gms/measurement/internal/o;->aDC:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v5, Lcom/google/android/gms/measurement/internal/o;->aDy: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;->aIH:Ljava/lang/Boolean;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->aID:Ljava/lang/Boolean;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fb;->wi()Ljava/lang/Boolean;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fb;->wg()Ljava/lang/Boolean;
 
     move-result-object v2
 
     if-eq v1, v2, :cond_10
 
-    iget-object p3, p1, Lcom/google/android/gms/measurement/internal/zzm;->aIH:Ljava/lang/Boolean;
+    iget-object p3, p1, Lcom/google/android/gms/measurement/internal/zzm;->aID: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;->axA:J
+    iget-wide v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->axw:J
 
     cmp-long v5, v1, v3
 
     if-eqz v5, :cond_11
 
-    iget-wide v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->axA:J
+    iget-wide v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->axw:J
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fb;->uo()J
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fb;->um()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;->axA:J
+    iget-wide v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->axw: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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->vA()Lcom/google/android/gms/measurement/internal/jz;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->vy()Lcom/google/android/gms/measurement/internal/jz;
 
     const-wide/16 v8, 0x0
 
-    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ey;->aFL: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->yb()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/ey;->aFL:Lcom/google/android/gms/measurement/internal/ka;
 
-    sget-object v3, Lcom/google/android/gms/measurement/internal/o;->aEf:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v3, Lcom/google/android/gms/measurement/internal/o;->aEb: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->qy()Ljava/util/List;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qw()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;->qF()Lcom/google/android/gms/internal/measurement/ak$e$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$e;->qD()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;->tb()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/dw$b;->sZ()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;->qF()Lcom/google/android/gms/internal/measurement/ak$e$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$e;->qD()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;->tb()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/dw$b;->sZ()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;->qy()Ljava/util/List;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qw()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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ak$g$a;->mQ()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ak$g$a;->mO()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;->asA:Ljava/lang/Object;
+    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/jn;->asw: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;->mQ()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ak$g$a;->mO()Ljava/lang/String;
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->vq()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;->asA:Ljava/lang/Object;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/jn;->asw: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;->mQ()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ak$g$a;->mO()Ljava/lang/String;
 
     move-result-object v2
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vq()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;->rs()Lcom/google/android/gms/internal/measurement/ak$k$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$k;->rq()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vq()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;->asA:Ljava/lang/Object;
+    iget-object v2, v8, Lcom/google/android/gms/measurement/internal/jn;->asw: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;->tb()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/dw$b;->sZ()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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEH: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;
 
-    iget-object p3, v8, Lcom/google/android/gms/measurement/internal/jn;->asA:Ljava/lang/Object;
+    iget-object p3, v8, Lcom/google/android/gms/measurement/internal/jn;->asw: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;->xB()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->xz()V
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->ug()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->ue()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;->uD()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->uB()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;->qz()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->qx()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;->ug()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->ue()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;->uD()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->uB()Ljava/lang/String;
 
     move-result-object v1
 
     :cond_1
-    sget-object v2, Lcom/google/android/gms/measurement/internal/o;->aCD:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v2, Lcom/google/android/gms/measurement/internal/o;->aCz: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;->aCE: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 {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;->uf()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->ud()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEE:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Fetching remote configuration"
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->qz()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->qx()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;->yJ()Lcom/google/android/gms/measurement/internal/es;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yH()Lcom/google/android/gms/measurement/internal/es;
 
     move-result-object v1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->qz()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->qx()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;->yJ()Lcom/google/android/gms/measurement/internal/es;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yH()Lcom/google/android/gms/measurement/internal/es;
 
     move-result-object v2
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->qz()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->qx()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;->yK()Lcom/google/android/gms/measurement/internal/dz;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/dz;
 
     move-result-object v5
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->qz()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->qx()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;->vq()V
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/jb;->yG()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;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/fu;->vu()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEw:Lcom/google/android/gms/measurement/internal/dx;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->qz()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->qx()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;->yH()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yF()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm: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;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()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;->yC()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jb;->yA()V
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIk:Lcom/google/android/gms/measurement/internal/d;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIg:Lcom/google/android/gms/measurement/internal/d;
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ey;->aFL:Lcom/google/android/gms/measurement/internal/ka;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIi:Lcom/google/android/gms/measurement/internal/es;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIe:Lcom/google/android/gms/measurement/internal/es;
 
-    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/ka;->aJa:Lcom/google/android/gms/measurement/internal/kc;
+    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/ka;->aIW: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;->yC()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jb;->yA()V
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIn:Lcom/google/android/gms/measurement/internal/jr;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIj: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;->yC()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jb;->yA()V
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIp:Lcom/google/android/gms/measurement/internal/hg;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIl: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;->yC()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jb;->yA()V
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ja;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIi: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;->aIl:Lcom/google/android/gms/measurement/internal/eg;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/eg;
 
-    iget v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIt:I
+    iget v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIp: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEw:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIt:I
+    iget v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIp: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;->xB()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->xz()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, 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/dv;->aEw: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;->qz()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qx()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;->yP()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yN()Lcom/google/android/gms/measurement/internal/jj;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/dw$b;->tb()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/dw$b;->sZ()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;->yP()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yN()Lcom/google/android/gms/measurement/internal/jj;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/dw$b;->tb()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/dw$b;->sZ()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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/d;->tU()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/d;->tS()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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v4
 
-    iget-wide v5, v1, Lcom/google/android/gms/measurement/internal/jf;->aGv:J
+    iget-wide v5, v1, Lcom/google/android/gms/measurement/internal/jf;->aGr: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;->vq()V
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/jb;->yG()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;->uZ()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/d;->uX()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v5
 
-    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->qQ()Lcom/google/android/gms/internal/measurement/ak$g$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$g;->qO()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;->tb()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v9}, Lcom/google/android/gms/internal/measurement/dw$b;->sZ()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v13
 
-    iget-object v13, v13, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v13, v13, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v6
 
-    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->qw()Lcom/google/android/gms/internal/measurement/ak$c$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$c;->qu()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;->tb()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/dw$b;->sZ()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v7
 
-    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v6
 
-    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fu;->vv()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;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->awq:Ljava/util/List;
+    iget-object v4, v2, Lcom/google/android/gms/measurement/internal/jf$a;->awm:Ljava/util/List;
 
     if-eqz v4, :cond_e
 
-    iget-object v4, v2, Lcom/google/android/gms/measurement/internal/jf$a;->awq:Ljava/util/List;
+    iget-object v4, v2, Lcom/google/android/gms/measurement/internal/jf$a;->awm: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;->aIz:Lcom/google/android/gms/internal/measurement/ak$g;
+    iget-object v4, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIv:Lcom/google/android/gms/internal/measurement/ak$g;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/dw;->sS()Lcom/google/android/gms/internal/measurement/dw$b;
+    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/dw;->sQ()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;->qT()Lcom/google/android/gms/internal/measurement/ak$g$a;
+    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/ak$g$a;->qR()Lcom/google/android/gms/internal/measurement/ak$g$a;
 
     move-result-object v4
 
-    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/ey;->aFL:Lcom/google/android/gms/measurement/internal/ka;
 
-    iget-object v6, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIz:Lcom/google/android/gms/internal/measurement/ak$g;
+    iget-object v6, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIv: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;->aDB:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v7, Lcom/google/android/gms/measurement/internal/o;->aDx: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;->awq:Ljava/util/List;
+    iget-object v8, v2, Lcom/google/android/gms/measurement/internal/jf$a;->awm: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;->awq:Ljava/util/List;
+    iget-object v8, v2, Lcom/google/android/gms/measurement/internal/jf$a;->awm: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;->sS()Lcom/google/android/gms/internal/measurement/dw$b;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/dw;->sQ()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;->yJ()Lcom/google/android/gms/measurement/internal/es;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yH()Lcom/google/android/gms/measurement/internal/es;
 
     move-result-object v3
 
-    iget-object v4, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIz:Lcom/google/android/gms/internal/measurement/ak$g;
+    iget-object v4, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIv: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;->qz()Ljava/lang/String;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qx()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v3
 
-    iget-object v3, v3, 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/dv;->aEz: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;->aIz:Lcom/google/android/gms/internal/measurement/ak$g;
+    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIv: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v12, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v12}, Lcom/google/android/gms/measurement/internal/ey;->ye()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {v12}, Lcom/google/android/gms/measurement/internal/ey;->yc()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;->qz()Ljava/lang/String;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qx()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;->yJ()Lcom/google/android/gms/measurement/internal/es;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yH()Lcom/google/android/gms/measurement/internal/es;
 
     move-result-object v3
 
-    iget-object v10, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIz:Lcom/google/android/gms/internal/measurement/ak$g;
+    iget-object v10, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIv: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;->yJ()Lcom/google/android/gms/measurement/internal/es;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yH()Lcom/google/android/gms/measurement/internal/es;
 
     move-result-object v3
 
-    iget-object v10, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIz:Lcom/google/android/gms/internal/measurement/ak$g;
+    iget-object v10, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIv: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;->qz()Ljava/lang/String;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qx()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->yb()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;->qz()Ljava/lang/String;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qx()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;->yJ()Lcom/google/android/gms/measurement/internal/es;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yH()Lcom/google/android/gms/measurement/internal/es;
 
     move-result-object v3
 
-    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIz:Lcom/google/android/gms/internal/measurement/ak$g;
+    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIv: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;->qz()Ljava/lang/String;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qx()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;->yP()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yN()Lcom/google/android/gms/measurement/internal/jj;
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qz()Ljava/lang/String;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qx()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;->pK()I
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->pI()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;->sS()Lcom/google/android/gms/internal/measurement/dw$b;
+    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/dw;->sQ()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;->tb()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/dw$b;->sZ()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;->sS()Lcom/google/android/gms/internal/measurement/dw$b;
+    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/dw;->sQ()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;->tb()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/dw$b;->sZ()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v9, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v9}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v9}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v9
 
-    iget-object v9, v9, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v9, v9, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v15, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ey;->ye()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ey;->yc()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;->qz()Ljava/lang/String;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qx()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;->qF()Lcom/google/android/gms/internal/measurement/ak$e$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$e;->qD()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v9, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v9}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v9}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v9
 
-    iget-object v9, v9, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v9, v9, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v13, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v13}, Lcom/google/android/gms/measurement/internal/ey;->ye()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {v13}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v13
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qz()Ljava/lang/String;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qx()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;->qF()Lcom/google/android/gms/internal/measurement/ak$e$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$e;->qD()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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v32
 
-    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->uq()J
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->uo()J
 
     move-result-wide v33
 
-    iget-object v9, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIz:Lcom/google/android/gms/internal/measurement/ak$g;
+    iget-object v9, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIv: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v9, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v9, v9, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v9, v9, Lcom/google/android/gms/measurement/internal/ey;->aFL:Lcom/google/android/gms/measurement/internal/ka;
 
-    iget-object v14, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIz:Lcom/google/android/gms/internal/measurement/ak$g;
+    iget-object v14, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIv: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;->qz()Ljava/lang/String;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qx()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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v32
 
-    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->uq()J
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->uo()J
 
     move-result-wide v33
 
-    iget-object v5, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIz:Lcom/google/android/gms/internal/measurement/ak$g;
+    iget-object v5, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIv: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;->aBU:J
+    iget-wide v12, v5, Lcom/google/android/gms/measurement/internal/c;->aBQ:J
 
-    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/ey;->aFL:Lcom/google/android/gms/measurement/internal/ka;
 
-    iget-object v9, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIz:Lcom/google/android/gms/internal/measurement/ak$g;
+    iget-object v9, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIv: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;->aCM:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v14, Lcom/google/android/gms/measurement/internal/o;->aCI: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v5
 
-    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->aIz:Lcom/google/android/gms/internal/measurement/ak$g;
+    iget-object v12, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIv: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;->pK()I
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->pI()I
 
     move-result v14
 
@@ -3425,7 +3425,7 @@
 
     if-eqz v15, :cond_20
 
-    invoke-virtual {v14}, Lcom/google/android/gms/internal/measurement/dw;->sS()Lcom/google/android/gms/internal/measurement/dw$b;
+    invoke-virtual {v14}, Lcom/google/android/gms/internal/measurement/dw;->sQ()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;->tb()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/dw$b;->sZ()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v4, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ey;->vv()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;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->aIz:Lcom/google/android/gms/internal/measurement/ak$g;
+    iget-object v9, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIv: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;->qy()Ljava/util/List;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qw()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;->qg()Z
+    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/ak$e;->qe()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;->qE()Z
+    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/ak$e;->qC()Z
 
     move-result v4
 
     if-nez v4, :cond_29
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEF: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 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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEF: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 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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ey;->aFL:Lcom/google/android/gms/measurement/internal/ka;
 
-    iget-object v5, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIz:Lcom/google/android/gms/internal/measurement/ak$g;
+    iget-object v5, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIv: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;->aDA: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 {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;->qz()Ljava/lang/String;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qx()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;->yP()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yN()Lcom/google/android/gms/measurement/internal/jj;
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/dw$b;->tb()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/dw$b;->sZ()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;->qA()J
+    invoke-virtual/range {v17 .. v17}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qy()J
 
     move-result-wide v13
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qA()J
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qy()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;->qz()Ljava/lang/String;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qx()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;->yP()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yN()Lcom/google/android/gms/measurement/internal/jj;
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/dw$b;->tb()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/dw$b;->sZ()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;->qA()J
+    invoke-virtual/range {v16 .. v16}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qy()J
 
     move-result-wide v13
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qA()J
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qy()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ey;->aFL:Lcom/google/android/gms/measurement/internal/ka;
 
-    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIz:Lcom/google/android/gms/internal/measurement/ak$g;
+    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIv: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;->aEj:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v13, Lcom/google/android/gms/measurement/internal/o;->aEf: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;->qz()Ljava/lang/String;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qx()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;->yP()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yN()Lcom/google/android/gms/measurement/internal/jj;
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/dw$b;->tb()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/dw$b;->sZ()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;->qA()J
+    invoke-virtual/range {v16 .. v16}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qy()J
 
     move-result-wide v13
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qA()J
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qy()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;->qz()Ljava/lang/String;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qx()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;->pK()I
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->pI()I
 
     move-result v3
 
     if-nez v3, :cond_37
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v3
 
-    iget-object v3, v3, 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/dv;->aEz: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;->aIz:Lcom/google/android/gms/internal/measurement/ak$g;
+    iget-object v10, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIv: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;->yP()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yN()Lcom/google/android/gms/measurement/internal/jj;
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/dw$b;->tb()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/dw$b;->sZ()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v3
 
-    iget-object v3, v3, 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/dv;->aEz: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;->aIz:Lcom/google/android/gms/internal/measurement/ak$g;
+    iget-object v10, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIv: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;->awq:Ljava/util/List;
+    iget-object v3, v2, Lcom/google/android/gms/measurement/internal/jf$a;->awm:Ljava/util/List;
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/dw$b;->tb()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/dw$b;->sZ()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;->yP()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yN()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;->yP()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yN()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;->qg()Z
+    invoke-virtual {v6}, Lcom/google/android/gms/internal/measurement/ak$e;->qe()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ey;->aFL:Lcom/google/android/gms/measurement/internal/ka;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/ak$g$a;->mQ()Ljava/lang/String;
+    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/ak$g$a;->mO()Ljava/lang/String;
 
     move-result-object v4
 
-    sget-object v6, Lcom/google/android/gms/measurement/internal/o;->aDQ:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v6, Lcom/google/android/gms/measurement/internal/o;->aDM: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;->qy()Ljava/util/List;
+    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/ak$g$a;->qw()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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v3
 
-    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/ak$g$a;->mQ()Ljava/lang/String;
+    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/ak$g$a;->mO()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ey;->aFL:Lcom/google/android/gms/measurement/internal/ka;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/ak$g$a;->mQ()Ljava/lang/String;
+    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/ak$g$a;->mO()Ljava/lang/String;
 
     move-result-object v6
 
-    sget-object v7, Lcom/google/android/gms/measurement/internal/o;->aDR:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v7, Lcom/google/android/gms/measurement/internal/o;->aDN: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v3
 
-    iget-object v3, v3, 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/dv;->aEz: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;->aIz:Lcom/google/android/gms/internal/measurement/ak$g;
+    iget-object v6, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIv: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ey;->aFL:Lcom/google/android/gms/measurement/internal/ka;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/ak$g$a;->mQ()Ljava/lang/String;
+    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/ak$g$a;->mO()Ljava/lang/String;
 
     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;->aDP: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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v3
 
-    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/ak$g$a;->mQ()Ljava/lang/String;
+    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/ak$g$a;->mO()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ey;->aFL:Lcom/google/android/gms/measurement/internal/ka;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/ak$g$a;->mQ()Ljava/lang/String;
+    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/ak$g$a;->mO()Ljava/lang/String;
 
     move-result-object v4
 
-    sget-object v6, Lcom/google/android/gms/measurement/internal/o;->aDC:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v6, Lcom/google/android/gms/measurement/internal/o;->aDy: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;->yP()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yN()Lcom/google/android/gms/measurement/internal/jj;
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v4
 
-    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->xU()Lcom/google/android/gms/measurement/internal/es;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/jd;->xS()Lcom/google/android/gms/measurement/internal/es;
 
     move-result-object v4
 
-    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/ak$g$a;->mQ()Ljava/lang/String;
+    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/ak$g$a;->mO()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;->xT()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/jd;->xR()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v4
 
-    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/ak$g$a;->mQ()Ljava/lang/String;
+    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/ak$g$a;->mO()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;->xJ()Z
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fb;->xH()Z
 
     move-result v4
 
     if-eqz v4, :cond_49
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vr()Lcom/google/android/gms/measurement/internal/i;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vp()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v4
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/i;->uJ()Z
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/i;->uH()Z
 
     move-result v4
 
     if-eqz v4, :cond_49
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v4
 
-    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dv;->aEH: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 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;->rs()Lcom/google/android/gms/internal/measurement/ak$k$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$k;->rq()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;->vr()Lcom/google/android/gms/measurement/internal/i;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vp()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vo()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;->tb()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/dw$b;->sZ()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;->qh()I
+    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/ak$g$a;->qf()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ey;->aFL:Lcom/google/android/gms/measurement/internal/ka;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/ak$g$a;->mQ()Ljava/lang/String;
+    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/ak$g$a;->mO()Ljava/lang/String;
 
     move-result-object v4
 
-    sget-object v6, Lcom/google/android/gms/measurement/internal/o;->aEe:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v6, Lcom/google/android/gms/measurement/internal/o;->aEa: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;->ra()Lcom/google/android/gms/internal/measurement/ak$g$a;
+    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/ak$g$a;->qY()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;->mQ()Ljava/lang/String;
+    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/ak$g$a;->mO()Ljava/lang/String;
 
     move-result-object v4
 
-    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/ak$g$a;->qU()Ljava/util/List;
+    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/ak$g$a;->qS()Ljava/util/List;
 
     move-result-object v6
 
-    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/ak$g$a;->qy()Ljava/util/List;
+    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/ak$g$a;->qw()Ljava/util/List;
 
     move-result-object v7
 
-    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/ak$g$a;->qB()J
+    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/ak$g$a;->qz()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;->yO()Lcom/google/android/gms/measurement/internal/jr;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yM()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ey;->aFL:Lcom/google/android/gms/measurement/internal/ka;
 
-    iget-object v4, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIz:Lcom/google/android/gms/internal/measurement/ak$g;
+    iget-object v4, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIv: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;->aJa:Lcom/google/android/gms/measurement/internal/kc;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ka;->aIW: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ey;->yb()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v6
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/jm;->yS()Ljava/security/SecureRandom;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/jm;->yQ()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;->pK()I
+    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/ak$g$a;->pI()I
 
     move-result v8
 
@@ -4716,7 +4716,7 @@
 
     move-result-object v8
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/dw;->sS()Lcom/google/android/gms/internal/measurement/dw$b;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/dw;->sQ()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;->qz()Ljava/lang/String;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qx()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;->yP()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yN()Lcom/google/android/gms/measurement/internal/jj;
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/dw$b;->tb()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/dw$b;->sZ()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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v10
 
-    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIz:Lcom/google/android/gms/internal/measurement/ak$g;
+    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIv: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;->aCn:Ljava/lang/Long;
+    iget-object v9, v10, Lcom/google/android/gms/measurement/internal/k;->aCj:Ljava/lang/Long;
 
     if-nez v9, :cond_4e
 
-    iget-object v9, v10, Lcom/google/android/gms/measurement/internal/k;->aCo:Ljava/lang/Long;
+    iget-object v9, v10, Lcom/google/android/gms/measurement/internal/k;->aCk: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;->yP()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yN()Lcom/google/android/gms/measurement/internal/jj;
 
     const-string v9, "_sr"
 
-    iget-object v11, v10, Lcom/google/android/gms/measurement/internal/k;->aCo:Ljava/lang/Long;
+    iget-object v11, v10, Lcom/google/android/gms/measurement/internal/k;->aCk: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;->azM:Ljava/lang/Boolean;
+    iget-object v9, v10, Lcom/google/android/gms/measurement/internal/k;->azI:Ljava/lang/Boolean;
 
     if-eqz v9, :cond_4d
 
-    iget-object v9, v10, Lcom/google/android/gms/measurement/internal/k;->azM:Ljava/lang/Boolean;
+    iget-object v9, v10, Lcom/google/android/gms/measurement/internal/k;->azI: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;->yP()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yN()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;->tb()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/dw$b;->sZ()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;->yJ()Lcom/google/android/gms/measurement/internal/es;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yH()Lcom/google/android/gms/measurement/internal/es;
 
     move-result-object v9
 
-    iget-object v10, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIz:Lcom/google/android/gms/internal/measurement/ak$g;
+    iget-object v10, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIv: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v11, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v11}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v11}, Lcom/google/android/gms/measurement/internal/ey;->yb()Lcom/google/android/gms/measurement/internal/jm;
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qA()J
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qy()J
 
     move-result-wide v11
 
@@ -4880,7 +4880,7 @@
 
     move-result-wide v11
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/dw$b;->tb()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/dw$b;->sZ()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;->yJ()Lcom/google/android/gms/measurement/internal/es;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yH()Lcom/google/android/gms/measurement/internal/es;
 
     move-result-object v9
 
-    iget-object v10, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIz:Lcom/google/android/gms/internal/measurement/ak$g;
+    iget-object v10, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIv: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;->qz()Ljava/lang/String;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qx()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v10, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v10}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v10}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v10
 
-    iget-object v10, v10, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v10, v10, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->qz()Ljava/lang/String;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qx()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;->tb()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/dw$b;->sZ()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;->qz()Ljava/lang/String;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qx()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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v10
 
-    iget-object v13, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIz:Lcom/google/android/gms/internal/measurement/ak$g;
+    iget-object v13, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIv: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;->qz()Ljava/lang/String;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qx()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v10, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v10}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v10}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v10
 
-    iget-object v10, v10, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v10, v10, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->aIz:Lcom/google/android/gms/internal/measurement/ak$g;
+    iget-object v14, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIv: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;->qz()Ljava/lang/String;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qx()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v10, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v10, v10, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v10, v10, Lcom/google/android/gms/measurement/internal/ey;->aFL:Lcom/google/android/gms/measurement/internal/ka;
 
-    iget-object v13, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIz:Lcom/google/android/gms/internal/measurement/ak$g;
+    iget-object v13, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIv: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;->aDP:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v14, Lcom/google/android/gms/measurement/internal/o;->aDL: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;->aIz:Lcom/google/android/gms/internal/measurement/ak$g;
+    iget-object v13, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIv: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;->qz()Ljava/lang/String;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qx()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;->qA()J
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qy()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;->aIz:Lcom/google/android/gms/internal/measurement/ak$g;
+    iget-object v13, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIv: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;->qz()Ljava/lang/String;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qx()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;->qA()J
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qy()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;->yP()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yN()Lcom/google/android/gms/measurement/internal/jj;
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/dw$b;->tb()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/dw$b;->sZ()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;->tb()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/dw$b;->sZ()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;->aCn:Ljava/lang/Long;
+    iget-object v9, v10, Lcom/google/android/gms/measurement/internal/k;->aCj:Ljava/lang/Long;
 
     if-nez v9, :cond_59
 
-    iget-object v9, v10, Lcom/google/android/gms/measurement/internal/k;->aCo:Ljava/lang/Long;
+    iget-object v9, v10, Lcom/google/android/gms/measurement/internal/k;->aCk:Ljava/lang/Long;
 
     if-nez v9, :cond_59
 
-    iget-object v9, v10, Lcom/google/android/gms/measurement/internal/k;->azM:Ljava/lang/Boolean;
+    iget-object v9, v10, Lcom/google/android/gms/measurement/internal/k;->azI: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;->qz()Ljava/lang/String;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qx()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;->yP()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yN()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;->tb()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/dw$b;->sZ()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;->qz()Ljava/lang/String;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qx()Ljava/lang/String;
 
     move-result-object v5
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qA()J
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qy()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/ey;->aFL:Lcom/google/android/gms/measurement/internal/ka;
 
-    iget-object v6, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIz:Lcom/google/android/gms/internal/measurement/ak$g;
+    iget-object v6, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIv: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;->aDo:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v15, Lcom/google/android/gms/measurement/internal/o;->aDk: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;->aCm:Ljava/lang/Long;
+    iget-object v5, v10, Lcom/google/android/gms/measurement/internal/k;->aCi: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;->aCm:Ljava/lang/Long;
+    iget-object v5, v10, Lcom/google/android/gms/measurement/internal/k;->aCi: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ey;->yb()Lcom/google/android/gms/measurement/internal/jm;
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qB()J
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qz()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;->qA()J
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qy()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;->yP()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yN()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;->yP()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yN()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;->tb()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/dw$b;->sZ()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;->qz()Ljava/lang/String;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qx()Ljava/lang/String;
 
     move-result-object v1
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qA()J
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qy()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;->qz()Ljava/lang/String;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qx()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;->pK()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ak$g$a;->pI()I
 
     move-result v5
 
     if-ge v2, v5, :cond_65
 
-    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;->qR()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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, v2, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ey;->aFL:Lcom/google/android/gms/measurement/internal/ka;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ak$g$a;->mQ()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ak$g$a;->mO()Ljava/lang/String;
 
     move-result-object v4
 
-    sget-object v5, Lcom/google/android/gms/measurement/internal/o;->aEe:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v5, Lcom/google/android/gms/measurement/internal/o;->aEa: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;->aIz:Lcom/google/android/gms/internal/measurement/ak$g;
+    iget-object v4, v3, Lcom/google/android/gms/measurement/internal/jf$a;->aIv: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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v5, v2, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v5
 
-    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->aIz:Lcom/google/android/gms/internal/measurement/ak$g;
+    iget-object v7, v3, Lcom/google/android/gms/measurement/internal/jf$a;->aIv: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;->pK()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ak$g$a;->pI()I
 
     move-result v6
 
     if-lez v6, :cond_6e
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/fb;->uj()J
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/fb;->uh()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;->qX()Lcom/google/android/gms/internal/measurement/ak$g$a;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ak$g$a;->qV()Lcom/google/android/gms/internal/measurement/ak$g$a;
 
     :goto_3e
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/fb;->ui()J
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/fb;->ug()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;->qW()Lcom/google/android/gms/internal/measurement/ak$g$a;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ak$g$a;->qU()Lcom/google/android/gms/internal/measurement/ak$g$a;
 
     :goto_40
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/fb;->vb()V
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/fb;->uZ()V
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/fb;->sc()J
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/fb;->sa()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;->qB()J
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ak$g$a;->qz()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;->qV()J
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ak$g$a;->qT()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;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v6, v5, Lcom/google/android/gms/measurement/internal/fb;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v6
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    iget-object v6, v5, Lcom/google/android/gms/measurement/internal/fb;->aGx:Ljava/lang/String;
+    iget-object v6, v5, Lcom/google/android/gms/measurement/internal/fb;->aGt: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;->qY()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_41
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()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;->pK()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ak$g$a;->pI()I
 
     move-result v5
 
     if-lez v5, :cond_72
 
-    iget-object v5, v2, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v5, v2, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ey;->vA()Lcom/google/android/gms/measurement/internal/jz;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ey;->vy()Lcom/google/android/gms/measurement/internal/jz;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/es;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yH()Lcom/google/android/gms/measurement/internal/es;
 
     move-result-object v5
 
-    iget-object v6, v3, Lcom/google/android/gms/measurement/internal/jf$a;->aIz:Lcom/google/android/gms/internal/measurement/ak$g;
+    iget-object v6, v3, Lcom/google/android/gms/measurement/internal/jf$a;->aIv: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;->pH()Z
+    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/ah$b;->pF()Z
 
     move-result v6
 
@@ -5823,7 +5823,7 @@
 
     :cond_70
     :goto_43
-    iget-object v5, v3, Lcom/google/android/gms/measurement/internal/jf$a;->aIz:Lcom/google/android/gms/internal/measurement/ak$g;
+    iget-object v5, v3, Lcom/google/android/gms/measurement/internal/jf$a;->aIv: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v5, v2, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v5
 
-    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->aIz:Lcom/google/android/gms/internal/measurement/ak$g;
+    iget-object v7, v3, Lcom/google/android/gms/measurement/internal/jf$a;->aIv: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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v5
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/dw$b;->tb()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/dw$b;->sZ()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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v1
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/jf$a;->axc:Ljava/util/List;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/jf$a;->awY: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;->vq()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/jb;->yG()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;->uZ()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/d;->uX()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/d;->uZ()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/d;->uX()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/d;->uX()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/d;->uV()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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()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;->uW()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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/d;->uX()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/d;->uV()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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()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;->uW()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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/d;->uY()V
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/d;->uW()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;->aGB:Lcom/google/android/gms/measurement/internal/jf;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/jf;->aGx: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;->aGB:Lcom/google/android/gms/measurement/internal/jf;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/jf;->aGx: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;->aGB:Lcom/google/android/gms/measurement/internal/jf;
+    sput-object p0, Lcom/google/android/gms/measurement/internal/jf;->aGx: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;->aGB:Lcom/google/android/gms/measurement/internal/jf;
+    sget-object p0, Lcom/google/android/gms/measurement/internal/jf;->aGx: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;->xB()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->xz()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, 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/dv;->aEw: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;->ul()J
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->uj()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Landroid/content/Context;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vr()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;->qz()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->qx()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;->ul()J
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->uj()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Landroid/content/Context;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vr()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;->qz()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->qx()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;->qZ()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->qX()Ljava/lang/String;
 
     move-result-object v1
 
     if-eqz v1, :cond_1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->qZ()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->qX()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;->qz()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qx()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;->yP()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yN()Lcom/google/android/gms/measurement/internal/jj;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/dw$b;->tb()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/dw$b;->sZ()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;->qg()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ak$e;->qe()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;->yP()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yN()Lcom/google/android/gms/measurement/internal/jj;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/dw$b;->tb()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/dw$b;->sZ()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;->yP()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yN()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;->yP()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yN()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;->pK()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ak$g$a;->pI()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;->qB()J
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ak$g$a;->qz()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;->qV()J
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ak$g$a;->qT()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;->atS:Ljava/lang/String;
+    iget-object v5, v3, Lcom/google/android/gms/measurement/internal/zzm;->atO: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;->xB()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->xz()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yF()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yD()V
 
-    iget-object v15, v3, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
+    iget-object v15, v3, Lcom/google/android/gms/measurement/internal/zzm;->atO:Ljava/lang/String;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yP()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yN()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;->yJ()Lcom/google/android/gms/measurement/internal/es;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yH()Lcom/google/android/gms/measurement/internal/es;
 
     move-result-object v7
 
-    iget-object v8, v2, Lcom/google/android/gms/measurement/internal/zzan;->atS:Ljava/lang/String;
+    iget-object v8, v2, Lcom/google/android/gms/measurement/internal/zzan;->atO: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v3
 
-    iget-object v3, v3, 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/dv;->aEz: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ey;->ye()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v5
 
-    iget-object v6, v2, Lcom/google/android/gms/measurement/internal/zzan;->atS:Ljava/lang/String;
+    iget-object v6, v2, Lcom/google/android/gms/measurement/internal/zzan;->atO: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;->yJ()Lcom/google/android/gms/measurement/internal/es;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yH()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;->yJ()Lcom/google/android/gms/measurement/internal/es;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yH()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;->atS:Ljava/lang/String;
+    iget-object v3, v2, Lcom/google/android/gms/measurement/internal/zzan;->atO: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->yb()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;->atS:Ljava/lang/String;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/zzan;->atO: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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()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;->nn()J
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fb;->nl()J
 
     move-result-wide v3
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fb;->st()J
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fb;->sr()J
 
     move-result-wide v5
 
@@ -6719,9 +6719,9 @@
 
     move-result-wide v3
 
-    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ey;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ey;->vq()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;->aCY:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v5, Lcom/google/android/gms/measurement/internal/o;->aCU: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEH: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, "Fetching config for blacklisted app"
 
@@ -6769,9 +6769,9 @@
     return-void
 
     :cond_6
-    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->vv()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v7
 
-    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/dv;->aEE:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-object v8, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v8, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v8}, Lcom/google/android/gms/measurement/internal/ey;->ye()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {v8}, Lcom/google/android/gms/measurement/internal/ey;->yc()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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v7
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/d;->tU()V
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/d;->tS()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;->atS:Ljava/lang/String;
+    iget-object v8, v2, Lcom/google/android/gms/measurement/internal/zzan;->atO: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;->atS:Ljava/lang/String;
+    iget-object v7, v2, Lcom/google/android/gms/measurement/internal/zzan;->atO: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;->aCq:Lcom/google/android/gms/measurement/internal/zzam;
+    iget-object v7, v2, Lcom/google/android/gms/measurement/internal/zzan;->aCm: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;->atS:Ljava/lang/String;
+    iget-object v9, v2, Lcom/google/android/gms/measurement/internal/zzan;->atO: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;->aCq:Lcom/google/android/gms/measurement/internal/zzam;
+    iget-object v8, v2, Lcom/google/android/gms/measurement/internal/zzan;->aCm: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;->aCq:Lcom/google/android/gms/measurement/internal/zzam;
+    iget-object v8, v2, Lcom/google/android/gms/measurement/internal/zzan;->aCm: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v7
 
-    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->aCq:Lcom/google/android/gms/measurement/internal/zzam;
+    iget-object v8, v2, Lcom/google/android/gms/measurement/internal/zzan;->aCm: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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()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;->asA:Ljava/lang/Object;
+    iget-object v11, v7, Lcom/google/android/gms/measurement/internal/jn;->asw: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;->asA:Ljava/lang/Object;
+    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/jn;->asw: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;->anq:Ljava/lang/String;
+    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/zzan;->anm:Ljava/lang/String;
 
-    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->vq()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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v7
 
-    iget-object v11, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v11, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v11, v11, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v11, v11, Lcom/google/android/gms/measurement/internal/ey;->aFL:Lcom/google/android/gms/measurement/internal/ka;
 
-    sget-object v12, Lcom/google/android/gms/measurement/internal/o;->aDd:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v12, Lcom/google/android/gms/measurement/internal/o;->aCZ: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;->vq()V
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/jb;->yG()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;->uZ()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/d;->uX()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v7
 
-    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->anq:Ljava/lang/String;
+    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/zzan;->anm:Ljava/lang/String;
 
-    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->vq()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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v7
 
-    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v10, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v10}, Lcom/google/android/gms/measurement/internal/ey;->ye()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {v10}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v10
 
-    iget-object v11, v5, Lcom/google/android/gms/measurement/internal/jn;->anq:Ljava/lang/String;
+    iget-object v11, v5, Lcom/google/android/gms/measurement/internal/jn;->anm: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;->asA:Ljava/lang/Object;
+    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/jn;->asw: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ey;->yb()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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/d;->uX()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/d;->uV()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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/d;->uY()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/d;->uW()V
 
     return-void
 
     :cond_12
     :goto_9
     :try_start_6
-    iget-object v5, v2, Lcom/google/android/gms/measurement/internal/zzan;->atS:Ljava/lang/String;
+    iget-object v5, v2, Lcom/google/android/gms/measurement/internal/zzan;->atO: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;->atS:Ljava/lang/String;
+    iget-object v7, v2, Lcom/google/android/gms/measurement/internal/zzan;->atO: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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v7
 
-    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->uq()J
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->uo()J
 
     move-result-wide v8
 
@@ -7337,9 +7337,9 @@
 
     move-result-object v7
 
-    iget-wide v8, v7, Lcom/google/android/gms/measurement/internal/c;->anz:J
+    iget-wide v8, v7, Lcom/google/android/gms/measurement/internal/c;->anv:J
 
-    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;->aCF: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vv()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;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->anz:J
+    iget-wide v5, v7, Lcom/google/android/gms/measurement/internal/c;->anv: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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/d;->uX()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/d;->uV()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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/d;->uY()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/d;->uW()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;->any:J
+    iget-wide v8, v7, Lcom/google/android/gms/measurement/internal/c;->anu:J
 
-    sget-object v12, Lcom/google/android/gms/measurement/internal/o;->aCL:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v12, Lcom/google/android/gms/measurement/internal/o;->aCH: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->any:J
+    iget-wide v7, v7, Lcom/google/android/gms/measurement/internal/c;->anu: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->yb()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;->atS:Ljava/lang/String;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/zzan;->atO: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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/d;->uX()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/d;->uV()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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/d;->uY()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/d;->uW()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/ey;->aFL:Lcom/google/android/gms/measurement/internal/ka;
 
-    iget-object v10, v3, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
+    iget-object v10, v3, Lcom/google/android/gms/measurement/internal/zzm;->atO:Ljava/lang/String;
 
-    sget-object v11, Lcom/google/android/gms/measurement/internal/o;->aCK:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v11, Lcom/google/android/gms/measurement/internal/o;->aCG: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vv()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;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/d;->uX()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/d;->uV()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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/d;->uY()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/d;->uW()V
 
     return-void
 
     :cond_18
     :try_start_9
-    iget-object v6, v2, Lcom/google/android/gms/measurement/internal/zzan;->aCq:Lcom/google/android/gms/measurement/internal/zzam;
+    iget-object v6, v2, Lcom/google/android/gms/measurement/internal/zzan;->aCm:Lcom/google/android/gms/measurement/internal/zzam;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/zzam;->vB()Landroid/os/Bundle;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/zzam;->vz()Landroid/os/Bundle;
 
     move-result-object v6
 
-    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->yb()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;->anq:Ljava/lang/String;
+    iget-object v9, v2, Lcom/google/android/gms/measurement/internal/zzan;->anm: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->yb()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->yb()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->yb()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;->atS:Ljava/lang/String;
+    iget-object v7, v2, Lcom/google/android/gms/measurement/internal/zzan;->atO: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/ey;->aFL:Lcom/google/android/gms/measurement/internal/ka;
 
-    iget-object v9, v3, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
+    iget-object v9, v3, Lcom/google/android/gms/measurement/internal/zzm;->atO: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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v7
 
-    iget-object v9, v3, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
+    iget-object v9, v3, Lcom/google/android/gms/measurement/internal/zzm;->atO: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;->asA:Ljava/lang/Object;
+    iget-object v9, v7, Lcom/google/android/gms/measurement/internal/jn;->asw: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v9, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v9}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v9}, Lcom/google/android/gms/measurement/internal/ey;->yb()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v9
 
-    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/jn;->asA:Ljava/lang/Object;
+    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/jn;->asw: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;->atS:Ljava/lang/String;
+    iget-object v7, v2, Lcom/google/android/gms/measurement/internal/zzan;->atO: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v4, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/ey;->aFL:Lcom/google/android/gms/measurement/internal/ka;
 
-    iget-object v7, v3, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
+    iget-object v7, v3, Lcom/google/android/gms/measurement/internal/zzm;->atO:Ljava/lang/String;
 
-    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;->aDs: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v4, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/ey;->aFL:Lcom/google/android/gms/measurement/internal/ka;
 
-    iget-object v7, v3, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
+    iget-object v7, v3, Lcom/google/android/gms/measurement/internal/zzm;->atO: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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v4, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v4
 
-    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v8, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v9, v2, Lcom/google/android/gms/measurement/internal/zzan;->anq:Ljava/lang/String;
+    iget-object v9, v2, Lcom/google/android/gms/measurement/internal/zzan;->anm:Ljava/lang/String;
 
-    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/zzan;->atS:Ljava/lang/String;
+    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/zzan;->atO: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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v6
 
-    iget-object v7, v4, Lcom/google/android/gms/measurement/internal/l;->ane:Ljava/lang/String;
+    iget-object v7, v4, Lcom/google/android/gms/measurement/internal/l;->ana: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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ey;->ye()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v6
 
-    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/l;->ane:Ljava/lang/String;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/l;->ana: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->yb()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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/d;->uY()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/d;->uW()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;->ane:Ljava/lang/String;
+    iget-object v9, v4, Lcom/google/android/gms/measurement/internal/l;->ana:Ljava/lang/String;
 
     const-wide/16 v10, 0x0
 
     const-wide/16 v12, 0x0
 
-    iget-wide v14, v4, Lcom/google/android/gms/measurement/internal/l;->aBU:J
+    iget-wide v14, v4, Lcom/google/android/gms/measurement/internal/l;->aBQ: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm: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;->aBU:J
+    iget-wide v7, v4, Lcom/google/android/gms/measurement/internal/l;->aBQ: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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()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;->xB()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->xz()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yF()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yD()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;->atS:Ljava/lang/String;
+    iget-object v2, v4, Lcom/google/android/gms/measurement/internal/l;->atO: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;->atS:Ljava/lang/String;
+    iget-object v2, v4, Lcom/google/android/gms/measurement/internal/l;->atO:Ljava/lang/String;
 
-    iget-object v6, v3, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
+    iget-object v6, v3, Lcom/google/android/gms/measurement/internal/zzm;->atO: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;->qQ()Lcom/google/android/gms/internal/measurement/ak$g$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$g;->qO()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;->qS()Lcom/google/android/gms/internal/measurement/ak$g$a;
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/ak$g$a;->qQ()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;->atS:Ljava/lang/String;
+    iget-object v6, v3, Lcom/google/android/gms/measurement/internal/zzm;->atO: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;->atS:Ljava/lang/String;
+    iget-object v6, v3, Lcom/google/android/gms/measurement/internal/zzm;->atO: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;->anq:Ljava/lang/String;
+    iget-object v6, v3, Lcom/google/android/gms/measurement/internal/zzm;->anm: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;->anq:Ljava/lang/String;
+    iget-object v6, v3, Lcom/google/android/gms/measurement/internal/zzm;->anm: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;->ane:Ljava/lang/String;
+    iget-object v6, v3, Lcom/google/android/gms/measurement/internal/zzm;->ana: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;->ane:Ljava/lang/String;
+    iget-object v6, v3, Lcom/google/android/gms/measurement/internal/zzm;->ana: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/ey;->aFL:Lcom/google/android/gms/measurement/internal/ka;
 
-    sget-object v7, Lcom/google/android/gms/measurement/internal/o;->aDJ:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v7, Lcom/google/android/gms/measurement/internal/o;->aDF: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;->qZ()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/ak$g$a;->qX()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;->axA:J
+    iget-wide v6, v3, Lcom/google/android/gms/measurement/internal/zzm;->axw: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/ey;->aFL:Lcom/google/android/gms/measurement/internal/ka;
 
-    iget-object v7, v3, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
+    iget-object v7, v3, Lcom/google/android/gms/measurement/internal/zzm;->atO:Ljava/lang/String;
 
-    sget-object v10, Lcom/google/android/gms/measurement/internal/o;->aDG:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v10, Lcom/google/android/gms/measurement/internal/o;->aDC: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;->yP()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yN()Lcom/google/android/gms/measurement/internal/jj;
 
     move-result-object v6
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/jj;->yR()Ljava/util/List;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/jj;->yP()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ey;->xY()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v6
 
-    iget-object v7, v3, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
+    iget-object v7, v3, Lcom/google/android/gms/measurement/internal/zzm;->atO: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;->azP:Z
+    iget-boolean v7, v3, Lcom/google/android/gms/measurement/internal/zzm;->azL: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ey;->yj()Lcom/google/android/gms/measurement/internal/i;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ey;->yh()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v6
 
-    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->vt()Landroid/content/Context;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->vr()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;->adR:Z
+    iget-boolean v6, v3, Lcom/google/android/gms/measurement/internal/zzm;->adN:Z
 
     if-eqz v6, :cond_2b
 
-    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ey;->vt()Landroid/content/Context;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ey;->vr()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v6
 
-    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->mQ()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/ak$g$a;->mO()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v7
 
-    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->mQ()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/ak$g$a;->mO()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ey;->yj()Lcom/google/android/gms/measurement/internal/i;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ey;->yh()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v6
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ft;->xE()V
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ft;->xC()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->yj()Lcom/google/android/gms/measurement/internal/i;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->yh()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v7
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ft;->xE()V
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ft;->xC()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->yj()Lcom/google/android/gms/measurement/internal/i;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->yh()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v7
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/i;->qB()J
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/i;->qz()J
 
     move-result-wide v10
 
@@ -8332,13 +8332,13 @@
 
     move-result-object v6
 
-    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->yj()Lcom/google/android/gms/measurement/internal/i;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->yh()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v7
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/i;->vo()Ljava/lang/String;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/i;->vm()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ey;->yo()Z
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ey;->ym()Z
 
     move-result v6
 
     if-eqz v6, :cond_2c
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/ka;->vc()Z
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/ka;->va()Z
 
     move-result v6
 
     if-eqz v6, :cond_2c
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/ak$g$a;->mQ()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/ak$g$a;->mO()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;->rb()Lcom/google/android/gms/internal/measurement/ak$g$a;
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/ak$g$a;->qZ()Lcom/google/android/gms/internal/measurement/ak$g$a;
 
     :cond_2c
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v6
 
-    iget-object v7, v3, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
+    iget-object v7, v3, Lcom/google/android/gms/measurement/internal/zzm;->atO: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v10, v3, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
+    iget-object v10, v3, Lcom/google/android/gms/measurement/internal/zzm;->atO: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->yb()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v7
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/jm;->rU()Ljava/lang/String;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/jm;->rS()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;->aEv:Ljava/lang/String;
+    iget-object v7, v3, Lcom/google/android/gms/measurement/internal/zzm;->aEr: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;->ane:Ljava/lang/String;
+    iget-object v7, v3, Lcom/google/android/gms/measurement/internal/zzm;->ana: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->xY()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v7
 
-    iget-object v10, v3, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
+    iget-object v10, v3, Lcom/google/android/gms/measurement/internal/zzm;->atO: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;->anq:Ljava/lang/String;
+    iget-object v7, v3, Lcom/google/android/gms/measurement/internal/zzm;->anm: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;->axA:J
+    iget-wide v10, v3, Lcom/google/android/gms/measurement/internal/zzm;->axw: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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()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;->uf()Ljava/lang/String;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/fb;->ud()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;->uf()Ljava/lang/String;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/fb;->ud()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;->ys()Ljava/lang/String;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/fb;->yq()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;->ys()Ljava/lang/String;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/fb;->yq()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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v6
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/zzm;->atO: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;->rs()Lcom/google/android/gms/internal/measurement/ak$k$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$k;->rq()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;->anq:Ljava/lang/String;
+    iget-object v10, v10, Lcom/google/android/gms/measurement/internal/jn;->anm: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;->yP()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yN()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;->asA:Ljava/lang/Object;
+    iget-object v11, v11, Lcom/google/android/gms/measurement/internal/jn;->asw: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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v3
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/dw$b;->tb()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/dw$b;->sZ()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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v6
 
-    iget-object v7, v4, Lcom/google/android/gms/measurement/internal/l;->aCp:Lcom/google/android/gms/measurement/internal/zzam;
+    iget-object v7, v4, Lcom/google/android/gms/measurement/internal/l;->aCl:Lcom/google/android/gms/measurement/internal/zzam;
 
     if-eqz v7, :cond_33
 
-    iget-object v7, v4, Lcom/google/android/gms/measurement/internal/l;->aCp:Lcom/google/android/gms/measurement/internal/zzam;
+    iget-object v7, v4, Lcom/google/android/gms/measurement/internal/l;->aCl: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;->yJ()Lcom/google/android/gms/measurement/internal/es;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yH()Lcom/google/android/gms/measurement/internal/es;
 
     move-result-object v7
 
-    iget-object v10, v4, Lcom/google/android/gms/measurement/internal/l;->atS:Ljava/lang/String;
+    iget-object v10, v4, Lcom/google/android/gms/measurement/internal/l;->atO:Ljava/lang/String;
 
-    iget-object v11, v4, Lcom/google/android/gms/measurement/internal/l;->ane:Ljava/lang/String;
+    iget-object v11, v4, Lcom/google/android/gms/measurement/internal/l;->ana: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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v26
 
-    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->uq()J
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->uo()J
 
     move-result-wide v27
 
-    iget-object v10, v4, Lcom/google/android/gms/measurement/internal/l;->atS:Ljava/lang/String;
+    iget-object v10, v4, Lcom/google/android/gms/measurement/internal/l;->atO: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/ey;->aFL:Lcom/google/android/gms/measurement/internal/ka;
 
-    iget-object v12, v4, Lcom/google/android/gms/measurement/internal/l;->atS:Ljava/lang/String;
+    iget-object v12, v4, Lcom/google/android/gms/measurement/internal/l;->atO: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;->adP:J
+    iput-wide v8, v1, Lcom/google/android/gms/measurement/internal/jf;->adL:J
 
     goto :goto_12
 
@@ -8724,17 +8724,17 @@
 
     move-object v3, v0
 
-    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v5
 
-    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->mQ()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/ak$g$a;->mO()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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/d;->uX()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/d;->uV()V
 
-    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vv()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEE:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v3, "Event recorded"
 
-    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ey;->ye()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ey;->yc()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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/d;->uY()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/d;->uW()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->sj()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->sh()V
 
-    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/d;->uY()V
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/d;->uW()V
 
     goto :goto_14
 
@@ -8851,12 +8851,12 @@
     goto :goto_13
 .end method
 
-.method private final uq()J
+.method private final uo()J
     .locals 8
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vq()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
@@ -8864,19 +8864,19 @@
 
     move-result-wide v0
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->xY()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ft;->xE()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ft;->xC()V
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    iget-object v3, v2, Lcom/google/android/gms/measurement/internal/eh;->aFa:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object v3, v2, Lcom/google/android/gms/measurement/internal/eh;->aEW:Lcom/google/android/gms/measurement/internal/ei;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ei;->ud()J
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ei;->ub()J
 
     move-result-wide v3
 
@@ -8888,11 +8888,11 @@
 
     const-wide/16 v3, 0x1
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vt()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v5
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/jm;->yS()Ljava/security/SecureRandom;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/jm;->yQ()Ljava/security/SecureRandom;
 
     move-result-object v5
 
@@ -8906,7 +8906,7 @@
 
     add-long/2addr v3, v5
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/eh;->aFa:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/eh;->aEW:Lcom/google/android/gms/measurement/internal/ei;
 
     invoke-virtual {v2, v3, v4}, Lcom/google/android/gms/measurement/internal/ei;->T(J)V
 
@@ -8930,28 +8930,28 @@
     return-wide v0
 .end method
 
-.method private final vc()Z
+.method private final va()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;->xz()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yF()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yD()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/d;->vc()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/d;->va()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;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()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;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/d;->uY()Ljava/lang/String;
 
     move-result-object v0
 
@@ -8975,39 +8975,39 @@
     return v0
 .end method
 
-.method private final xE()V
+.method private final xC()V
     .locals 5
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->xB()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->xz()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;->aAs:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aAo:Z
 
     if-nez v0, :cond_3
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIu:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Z
 
     if-eqz v0, :cond_0
 
     goto :goto_1
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vv()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 v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->aIs:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIo: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;->aIs:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIo: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vv()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 v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->aAs:Z
+    iget-boolean v2, p0, Lcom/google/android/gms/measurement/internal/jf;->aAo: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;->aIu:Z
+    iget-boolean v3, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Z
 
     invoke-static {v3}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
@@ -9077,10 +9077,10 @@
     return-void
 .end method
 
-.method private final yM()Lcom/google/android/gms/measurement/internal/eg;
+.method private final yK()Lcom/google/android/gms/measurement/internal/eg;
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIl:Lcom/google/android/gms/measurement/internal/eg;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/eg;
 
     if-eqz v0, :cond_0
 
@@ -9096,26 +9096,26 @@
     throw v0
 .end method
 
-.method private final yN()Lcom/google/android/gms/measurement/internal/ja;
+.method private final yL()Lcom/google/android/gms/measurement/internal/ja;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ja;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIi: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;->aIm:Lcom/google/android/gms/measurement/internal/ja;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIi:Lcom/google/android/gms/measurement/internal/ja;
 
     return-object v0
 .end method
 
-.method private final yQ()Z
+.method private final yO()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;->xz()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yF()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yD()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/jf;->atw:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/jf;->ats:Z
 
     if-eqz v0, :cond_0
 
@@ -9129,16 +9129,16 @@
     return v0
 .end method
 
-.method private final yo()Z
+.method private final ym()Z
     .locals 5
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->xB()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->xz()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ey;->aFL:Lcom/google/android/gms/measurement/internal/ka;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/o;->aEd: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;
 
     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;->aIv:Ljava/nio/channels/FileLock;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIr: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vv()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 v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Landroid/content/Context;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vr()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;->aIw:Ljava/nio/channels/FileChannel;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIs:Ljava/nio/channels/FileChannel;
 
-    iget-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;->aIs: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;->aIv:Ljava/nio/channels/FileLock;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIr:Ljava/nio/channels/FileLock;
 
-    iget-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;->aIr:Ljava/nio/channels/FileLock;
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vv()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 v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->atS:Ljava/lang/String;
+    iget-object v3, v2, Lcom/google/android/gms/measurement/internal/zzm;->atO: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;->xB()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->xz()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yF()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yD()V
 
-    iget-object v3, v2, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
+    iget-object v3, v2, Lcom/google/android/gms/measurement/internal/zzm;->atO: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;->yP()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yN()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v4, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/ey;->aFL:Lcom/google/android/gms/measurement/internal/ka;
 
-    sget-object v5, Lcom/google/android/gms/measurement/internal/o;->aDN:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v5, Lcom/google/android/gms/measurement/internal/o;->aDJ: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;->aII:Ljava/util/List;
+    iget-object v4, v2, Lcom/google/android/gms/measurement/internal/zzm;->aIE:Ljava/util/List;
 
     if-eqz v4, :cond_3
 
-    iget-object v4, v2, Lcom/google/android/gms/measurement/internal/zzm;->aII:Ljava/util/List;
+    iget-object v4, v2, Lcom/google/android/gms/measurement/internal/zzm;->aIE:Ljava/util/List;
 
-    iget-object v5, v0, Lcom/google/android/gms/measurement/internal/zzan;->atS:Ljava/lang/String;
+    iget-object v5, v0, Lcom/google/android/gms/measurement/internal/zzan;->atO: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;->aCq:Lcom/google/android/gms/measurement/internal/zzam;
+    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/zzan;->aCm:Lcom/google/android/gms/measurement/internal/zzam;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/zzam;->vB()Landroid/os/Bundle;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/zzam;->vz()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;->atS:Ljava/lang/String;
+    iget-object v14, v0, Lcom/google/android/gms/measurement/internal/zzan;->atO: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;->anq:Ljava/lang/String;
+    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/zzan;->anm: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEH: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 v4, v0, Lcom/google/android/gms/measurement/internal/zzan;->atS:Ljava/lang/String;
+    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/zzan;->atO:Ljava/lang/String;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/zzan;->anq:Ljava/lang/String;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/zzan;->anm: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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v4
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/d;->tU()V
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/d;->tS()V
 
     :try_start_0
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()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;->vq()V
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/jb;->yG()V
 
     const/4 v5, 0x2
 
@@ -9459,11 +9459,11 @@
 
     if-gez v8, :cond_4
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v4
 
-    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v9, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v9}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v9}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v9
 
-    iget-object v9, v9, Lcom/google/android/gms/measurement/internal/dv;->aEH:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v9, v9, Lcom/google/android/gms/measurement/internal/dv;->aED: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;->atS:Ljava/lang/String;
+    iget-object v15, v8, Lcom/google/android/gms/measurement/internal/zzv;->atO:Ljava/lang/String;
 
-    iget-object v14, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v14, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v14}, Lcom/google/android/gms/measurement/internal/ey;->ye()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {v14}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v14
 
-    iget-object v13, v8, Lcom/google/android/gms/measurement/internal/zzv;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v13, v8, Lcom/google/android/gms/measurement/internal/zzv;->aIR:Lcom/google/android/gms/measurement/internal/zzkj;
 
-    iget-object v13, v13, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
+    iget-object v13, v13, Lcom/google/android/gms/measurement/internal/zzkj;->atO: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;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v14, v8, Lcom/google/android/gms/measurement/internal/zzv;->aIR:Lcom/google/android/gms/measurement/internal/zzkj;
 
-    invoke-virtual {v14}, Lcom/google/android/gms/measurement/internal/zzkj;->rC()Ljava/lang/Object;
+    invoke-virtual {v14}, Lcom/google/android/gms/measurement/internal/zzkj;->rA()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;->aIW:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object v9, v8, Lcom/google/android/gms/measurement/internal/zzv;->aIS: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;->aIW:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object v10, v8, Lcom/google/android/gms/measurement/internal/zzv;->aIS: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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v9
 
-    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/zzv;->aIR:Lcom/google/android/gms/measurement/internal/zzkj;
 
-    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
+    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/zzkj;->atO: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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()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;->vq()V
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/jb;->yG()V
 
     cmp-long v8, v11, v6
 
     if-gez v8, :cond_8
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v4
 
-    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v10, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v10}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v10}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v10
 
-    iget-object v10, v10, Lcom/google/android/gms/measurement/internal/dv;->aEH: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, "User property expired"
 
-    iget-object v14, v9, Lcom/google/android/gms/measurement/internal/zzv;->atS:Ljava/lang/String;
+    iget-object v14, v9, Lcom/google/android/gms/measurement/internal/zzv;->atO:Ljava/lang/String;
 
-    iget-object v15, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v15, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ey;->ye()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v15
 
-    iget-object v5, v9, Lcom/google/android/gms/measurement/internal/zzv;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v5, v9, Lcom/google/android/gms/measurement/internal/zzv;->aIR:Lcom/google/android/gms/measurement/internal/zzkj;
 
-    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
+    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/zzkj;->atO: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;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v15, v9, Lcom/google/android/gms/measurement/internal/zzv;->aIR:Lcom/google/android/gms/measurement/internal/zzkj;
 
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/zzkj;->rC()Ljava/lang/Object;
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/zzkj;->rA()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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v5
 
-    iget-object v10, v9, Lcom/google/android/gms/measurement/internal/zzv;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v10, v9, Lcom/google/android/gms/measurement/internal/zzv;->aIR:Lcom/google/android/gms/measurement/internal/zzkj;
 
-    iget-object v10, v10, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
+    iget-object v10, v10, Lcom/google/android/gms/measurement/internal/zzkj;->atO: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;->aIY:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object v5, v9, Lcom/google/android/gms/measurement/internal/zzv;->aIU:Lcom/google/android/gms/measurement/internal/zzan;
 
     if-eqz v5, :cond_a
 
-    iget-object v5, v9, Lcom/google/android/gms/measurement/internal/zzv;->aIY:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object v5, v9, Lcom/google/android/gms/measurement/internal/zzv;->aIU: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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v5
 
-    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/zzv;->aIR:Lcom/google/android/gms/measurement/internal/zzkj;
 
-    iget-object v9, v9, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
+    iget-object v9, v9, Lcom/google/android/gms/measurement/internal/zzkj;->atO: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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v4
 
-    iget-object v5, v0, Lcom/google/android/gms/measurement/internal/zzan;->atS:Ljava/lang/String;
+    iget-object v5, v0, Lcom/google/android/gms/measurement/internal/zzan;->atO: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;->vq()V
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/jb;->yG()V
 
     cmp-long v8, v11, v6
 
     if-gez v8, :cond_d
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v6
 
-    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->vu()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fu;->vs()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;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v4, v15, Lcom/google/android/gms/measurement/internal/zzv;->aIR: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;->atS:Ljava/lang/String;
+    iget-object v5, v15, Lcom/google/android/gms/measurement/internal/zzv;->atO:Ljava/lang/String;
 
-    iget-object v6, v15, Lcom/google/android/gms/measurement/internal/zzv;->ane:Ljava/lang/String;
+    iget-object v6, v15, Lcom/google/android/gms/measurement/internal/zzv;->ana:Ljava/lang/String;
 
-    iget-object v7, v4, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
+    iget-object v7, v4, Lcom/google/android/gms/measurement/internal/zzkj;->atO:Ljava/lang/String;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/zzkj;->rC()Ljava/lang/Object;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/zzkj;->rA()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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v4, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v4
 
-    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dv;->aEH: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, "User property triggered"
 
-    iget-object v6, v15, Lcom/google/android/gms/measurement/internal/zzv;->atS:Ljava/lang/String;
+    iget-object v6, v15, Lcom/google/android/gms/measurement/internal/zzv;->atO:Ljava/lang/String;
 
-    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->ye()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v7
 
-    iget-object v8, v13, Lcom/google/android/gms/measurement/internal/jn;->anq:Ljava/lang/String;
+    iget-object v8, v13, Lcom/google/android/gms/measurement/internal/jn;->anm: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;->asA:Ljava/lang/Object;
+    iget-object v8, v13, Lcom/google/android/gms/measurement/internal/jn;->asw: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v4, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ey;->vv()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;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->atS:Ljava/lang/String;
+    iget-object v6, v15, Lcom/google/android/gms/measurement/internal/zzv;->atO: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->ye()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v7
 
-    iget-object v8, v13, Lcom/google/android/gms/measurement/internal/jn;->anq:Ljava/lang/String;
+    iget-object v8, v13, Lcom/google/android/gms/measurement/internal/jn;->anm: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;->asA:Ljava/lang/Object;
+    iget-object v8, v13, Lcom/google/android/gms/measurement/internal/jn;->asw: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;->aIX:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object v4, v15, Lcom/google/android/gms/measurement/internal/zzv;->aIT:Lcom/google/android/gms/measurement/internal/zzan;
 
     if-eqz v4, :cond_10
 
-    iget-object v4, v15, Lcom/google/android/gms/measurement/internal/zzv;->aIX:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object v4, v15, Lcom/google/android/gms/measurement/internal/zzv;->aIT: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;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
+    iput-object v4, v15, Lcom/google/android/gms/measurement/internal/zzv;->aIR: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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/d;->uX()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/d;->uV()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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/d;->uY()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/d;->uW()V
 
     return-void
 
     :catchall_0
     move-exception v0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/d;->uY()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/d;->uW()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;->xB()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->xz()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yF()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yD()V
 
-    iget-object v0, p2, Lcom/google/android/gms/measurement/internal/zzm;->ane:Ljava/lang/String;
+    iget-object v0, p2, Lcom/google/android/gms/measurement/internal/zzm;->ana: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yb()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzkj;->atO: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->yb()Lcom/google/android/gms/measurement/internal/jm;
 
-    iget-object p2, p1, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
+    iget-object p2, p1, Lcom/google/android/gms/measurement/internal/zzkj;->atO: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;->atS:Ljava/lang/String;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzkj;->atO:Ljava/lang/String;
 
     if-eqz v2, :cond_2
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/zzkj;->atO: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->yb()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yb()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
-    iget-object v5, p1, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
+    iget-object v5, p1, Lcom/google/android/gms/measurement/internal/zzkj;->atO:Ljava/lang/String;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/zzkj;->rC()Ljava/lang/Object;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/zzkj;->rA()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->yb()Lcom/google/android/gms/measurement/internal/jm;
 
-    iget-object p2, p1, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
+    iget-object p2, p1, Lcom/google/android/gms/measurement/internal/zzkj;->atO: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;->rC()Ljava/lang/Object;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/zzkj;->rA()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->yb()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yb()Lcom/google/android/gms/measurement/internal/jm;
 
-    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
+    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzkj;->atO:Ljava/lang/String;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/zzkj;->rC()Ljava/lang/Object;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/zzkj;->rA()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;->atS:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzkj;->atO: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/ey;->aFL:Lcom/google/android/gms/measurement/internal/ka;
 
-    iget-object v2, p2, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
+    iget-object v2, p2, Lcom/google/android/gms/measurement/internal/zzm;->atO: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;->anz:J
+    iget-wide v7, p1, Lcom/google/android/gms/measurement/internal/zzkj;->anv: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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v3
 
-    iget-object v5, p2, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
+    iget-object v5, p2, Lcom/google/android/gms/measurement/internal/zzm;->atO: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;->asA:Ljava/lang/Object;
+    iget-object v5, v3, Lcom/google/android/gms/measurement/internal/jn;->asw: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;->asA:Ljava/lang/Object;
+    iget-object v1, v3, Lcom/google/android/gms/measurement/internal/jn;->asw: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v5
 
-    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v5, v5, 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/jn;->asA:Ljava/lang/Object;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/jn;->asw: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ey;->aFL:Lcom/google/android/gms/measurement/internal/ka;
 
-    iget-object v5, p2, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
+    iget-object v5, p2, Lcom/google/android/gms/measurement/internal/zzm;->atO:Ljava/lang/String;
 
-    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;->aDr: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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v3
 
-    iget-object v5, p2, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
+    iget-object v5, p2, Lcom/google/android/gms/measurement/internal/zzm;->atO: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;->aBU:J
+    iget-wide v1, v3, Lcom/google/android/gms/measurement/internal/k;->aBQ:J
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->atS:Ljava/lang/String;
+    iget-object v6, p2, Lcom/google/android/gms/measurement/internal/zzm;->atO: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;->atS:Ljava/lang/String;
+    iget-object v8, p1, Lcom/google/android/gms/measurement/internal/zzkj;->atO:Ljava/lang/String;
 
-    iget-wide v9, p1, Lcom/google/android/gms/measurement/internal/zzkj;->anz:J
+    iget-wide v9, p1, Lcom/google/android/gms/measurement/internal/zzkj;->anv: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEH: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 v2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->ye()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v2
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jn;->anq:Ljava/lang/String;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jn;->anm: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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/d;->tU()V
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/d;->tS()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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object p2
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/d;->uX()V
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/d;->uV()V
 
     if-eqz p1, :cond_c
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEH: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, "User property set"
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->ye()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v0
 
-    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/jn;->anq:Ljava/lang/String;
+    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/jn;->anm: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;->asA:Ljava/lang/Object;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/jn;->asw: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, 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/dv;->aEw: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->ye()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v0
 
-    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/jn;->anq:Ljava/lang/String;
+    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/jn;->anm: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;->asA:Ljava/lang/Object;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/jn;->asw: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->yb()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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/d;->uY()V
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/d;->uW()V
 
     return-void
 
     :catchall_0
     move-exception p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object p2
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/d;->uY()V
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/d;->uW()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;->aIx:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIt: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;->aIy:Ljava/util/List;
+    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIu:Ljava/util/List;
 
-    iget-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;->aIu:Ljava/util/List;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIx:Ljava/util/List;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIt: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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v1
 
-    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzm;->atO: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;->vq()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/jb;->yG()V
 
     :try_start_0
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/d;->uZ()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/d;->uX()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vv()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 v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ey;->aFL:Lcom/google/android/gms/measurement/internal/ka;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/o;->aEk:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/o;->aEg: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Landroid/content/Context;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vr()Landroid/content/Context;
 
     move-result-object v2
 
-    iget-object v3, p1, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/measurement/internal/zzm;->atO:Ljava/lang/String;
 
-    iget-object v4, p1, Lcom/google/android/gms/measurement/internal/zzm;->ane:Ljava/lang/String;
+    iget-object v4, p1, Lcom/google/android/gms/measurement/internal/zzm;->ana: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;->azP:Z
+    iget-boolean v6, p1, Lcom/google/android/gms/measurement/internal/zzm;->azL:Z
 
-    iget-boolean v7, p1, Lcom/google/android/gms/measurement/internal/zzm;->adR:Z
+    iget-boolean v7, p1, Lcom/google/android/gms/measurement/internal/zzm;->adN:Z
 
-    iget-wide v8, p1, Lcom/google/android/gms/measurement/internal/zzm;->axu:J
+    iget-wide v8, p1, Lcom/google/android/gms/measurement/internal/zzm;->axq: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;->aIJ:Ljava/lang/String;
+    iget-object v11, p1, Lcom/google/android/gms/measurement/internal/zzm;->aIF: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;->atS:Ljava/lang/String;
+    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzv;->atO: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;->ane:Ljava/lang/String;
+    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzv;->ana: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;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIR: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;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIR:Lcom/google/android/gms/measurement/internal/zzkj;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/zzkj;->atO: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;->xB()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->xz()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yF()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yD()V
 
-    iget-object v0, p2, Lcom/google/android/gms/measurement/internal/zzm;->ane:Ljava/lang/String;
+    iget-object v0, p2, Lcom/google/android/gms/measurement/internal/zzm;->ana: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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/d;->tU()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/d;->tS()V
 
     :try_start_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v1
 
-    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/zzv;->atS:Ljava/lang/String;
+    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/zzv;->atO:Ljava/lang/String;
 
-    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/zzv;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/zzv;->aIR:Lcom/google/android/gms/measurement/internal/zzkj;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/zzkj;->atO: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;->ane:Ljava/lang/String;
+    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/zzv;->ana:Ljava/lang/String;
 
-    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/zzv;->ane:Ljava/lang/String;
+    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/zzv;->ana: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ey;->ye()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v4
 
-    iget-object v5, v0, Lcom/google/android/gms/measurement/internal/zzv;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v5, v0, Lcom/google/android/gms/measurement/internal/zzv;->aIR:Lcom/google/android/gms/measurement/internal/zzkj;
 
-    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
+    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/zzkj;->atO: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;->ane:Ljava/lang/String;
+    iget-object v5, v0, Lcom/google/android/gms/measurement/internal/zzv;->ana:Ljava/lang/String;
 
-    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/zzv;->ane:Ljava/lang/String;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/zzv;->ana: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;->ane:Ljava/lang/String;
+    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/zzv;->ana:Ljava/lang/String;
 
-    iput-object v2, v0, Lcom/google/android/gms/measurement/internal/zzv;->ane:Ljava/lang/String;
+    iput-object v2, v0, Lcom/google/android/gms/measurement/internal/zzv;->ana: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;->aIX:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/zzv;->aIT: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;
+    iput-object v2, v0, Lcom/google/android/gms/measurement/internal/zzv;->aIT: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;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/zzv;->aIR:Lcom/google/android/gms/measurement/internal/zzkj;
 
-    iget-object v4, v3, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
+    iget-object v4, v3, Lcom/google/android/gms/measurement/internal/zzkj;->atO:Ljava/lang/String;
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzv;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzv;->aIR:Lcom/google/android/gms/measurement/internal/zzkj;
 
-    iget-wide v5, v3, Lcom/google/android/gms/measurement/internal/zzkj;->anz:J
+    iget-wide v5, v3, Lcom/google/android/gms/measurement/internal/zzkj;->anv:J
 
-    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/zzv;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/zzv;->aIR:Lcom/google/android/gms/measurement/internal/zzkj;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/zzkj;->rC()Ljava/lang/Object;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/zzkj;->rA()Ljava/lang/Object;
 
     move-result-object v7
 
-    iget-object v1, v1, 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/zzv;->aIR: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;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
+    iput-object v2, v0, Lcom/google/android/gms/measurement/internal/zzv;->aIR: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;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/zzv;->aIR:Lcom/google/android/gms/measurement/internal/zzkj;
 
-    iget-object v4, v1, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
+    iget-object v4, v1, Lcom/google/android/gms/measurement/internal/zzkj;->atO: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;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/zzv;->aIR:Lcom/google/android/gms/measurement/internal/zzkj;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/zzkj;->rC()Ljava/lang/Object;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/zzkj;->rA()Ljava/lang/Object;
 
     move-result-object v7
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/zzv;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/zzv;->aIR: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;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
+    iput-object p1, v0, Lcom/google/android/gms/measurement/internal/zzv;->aIR: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;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/zzv;->aIR: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;->atS:Ljava/lang/String;
+    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/zzv;->atO:Ljava/lang/String;
 
-    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/zzv;->ane:Ljava/lang/String;
+    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/zzv;->ana:Ljava/lang/String;
 
-    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
+    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/zzkj;->atO:Ljava/lang/String;
 
-    iget-wide v6, v1, Lcom/google/android/gms/measurement/internal/zzkj;->anz:J
+    iget-wide v6, v1, Lcom/google/android/gms/measurement/internal/zzkj;->anv:J
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/zzkj;->rC()Ljava/lang/Object;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/zzkj;->rA()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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEH: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, "User property updated immediately"
 
-    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/zzv;->atS:Ljava/lang/String;
+    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/zzv;->atO:Ljava/lang/String;
 
-    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ey;->ye()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v4
 
-    iget-object v5, v9, Lcom/google/android/gms/measurement/internal/jn;->anq:Ljava/lang/String;
+    iget-object v5, v9, Lcom/google/android/gms/measurement/internal/jn;->anm: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;->asA:Ljava/lang/Object;
+    iget-object v5, v9, Lcom/google/android/gms/measurement/internal/jn;->asw: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->atS:Ljava/lang/String;
+    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/zzv;->atO: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ey;->ye()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v4
 
-    iget-object v5, v9, Lcom/google/android/gms/measurement/internal/jn;->anq:Ljava/lang/String;
+    iget-object v5, v9, Lcom/google/android/gms/measurement/internal/jn;->anm: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;->asA:Ljava/lang/Object;
+    iget-object v5, v9, Lcom/google/android/gms/measurement/internal/jn;->asw: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;->aIX:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object p1, v0, Lcom/google/android/gms/measurement/internal/zzv;->aIT: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;->aIX:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/zzv;->aIT: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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEH: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, "Conditional property added"
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/zzv;->atS:Ljava/lang/String;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/zzv;->atO:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->ye()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v2
 
-    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/zzv;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/zzv;->aIR:Lcom/google/android/gms/measurement/internal/zzkj;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/zzkj;->atO: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;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/zzv;->aIR:Lcom/google/android/gms/measurement/internal/zzkj;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/zzkj;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/zzkj;->rA()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, 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/dv;->aEw: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;->atS:Ljava/lang/String;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/zzv;->atO: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->ye()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v2
 
-    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/zzv;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/zzv;->aIR:Lcom/google/android/gms/measurement/internal/zzkj;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/zzkj;->atO: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;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/zzv;->aIR:Lcom/google/android/gms/measurement/internal/zzkj;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/zzkj;->rC()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/zzkj;->rA()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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/d;->uX()V
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/d;->uV()V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/d;->uY()V
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/d;->uW()V
 
     return-void
 
     :catchall_0
     move-exception p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object p2
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/d;->uY()V
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/d;->uW()V
 
     throw p1
 .end method
@@ -11231,9 +11231,9 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->xB()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->xz()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yF()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yD()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/d;->tU()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/d;->tS()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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p4, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/ey;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/ey;->vq()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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p4, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p4
 
-    iget-object p4, p4, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p4, p4, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->yJ()Lcom/google/android/gms/measurement/internal/es;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yH()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->xY()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/eh;->aEX:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/eh;->aET:Lcom/google/android/gms/measurement/internal/ei;
 
-    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ey;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ey;->vq()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->xY()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/eh;->aEY:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/eh;->aEU:Lcom/google/android/gms/measurement/internal/ei;
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vq()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;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->sh()V
 
     goto/16 :goto_7
 
@@ -11484,7 +11484,7 @@
     goto :goto_5
 
     :cond_b
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/es;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yH()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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/d;->uY()V
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/d;->uW()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;->xE()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/jf;->xC()V
 
     return-void
 
     :cond_c
     :goto_5
     :try_start_3
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/es;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yH()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;->yJ()Lcom/google/android/gms/measurement/internal/es;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yH()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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/d;->uY()V
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/d;->uW()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;->xE()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/jf;->xC()V
 
     return-void
 
     :cond_d
     :try_start_5
-    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ey;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ey;->vq()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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEF:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEB: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->yK()Lcom/google/android/gms/measurement/internal/dz;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/dz;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/dz;->qE()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/dz;->qC()Z
 
     move-result p1
 
     if-eqz p1, :cond_f
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/jf;->vc()Z
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/jf;->va()Z
 
     move-result p1
 
     if-eqz p1, :cond_f
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->qv()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->qt()V
 
     goto :goto_7
 
     :cond_f
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->sh()V
 
     :goto_7
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/d;->uX()V
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/d;->uV()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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/d;->uY()V
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/d;->uW()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;->xE()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/jf;->xC()V
 
     return-void
 
@@ -11662,11 +11662,11 @@
     move-exception p1
 
     :try_start_7
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object p2
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/d;->uY()V
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/d;->uW()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;->xE()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/jf;->xC()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;->xB()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->xz()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yF()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yD()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;->aIx:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIt:Ljava/util/List;
 
     const/4 v2, 0x0
 
-    iput-object v2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIx:Ljava/util/List;
+    iput-object v2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIt: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->xY()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/eh;->aEW:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/eh;->aES:Lcom/google/android/gms/measurement/internal/ei;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->vq()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->xY()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/eh;->aEX:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/eh;->aET: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;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->sh()V
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/d;->tU()V
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/d;->tS()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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()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;->vq()V
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/jb;->yG()V
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/d;->uZ()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/d;->uX()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p3
 
-    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->aIy:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIu:Ljava/util/List;
 
     if-eqz v1, :cond_3
 
-    iget-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;->aIu: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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/d;->uX()V
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/d;->uV()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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/d;->uY()V
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/d;->uW()V
 
-    iput-object v2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIy:Ljava/util/List;
+    iput-object v2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIu:Ljava/util/List;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yK()Lcom/google/android/gms/measurement/internal/dz;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/dz;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/dz;->qE()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/dz;->qC()Z
 
     move-result p1
 
     if-eqz p1, :cond_5
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/jf;->vc()Z
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/jf;->va()Z
 
     move-result p1
 
     if-eqz p1, :cond_5
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->qv()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->qt()V
 
     goto :goto_1
 
     :cond_5
     const-wide/16 p1, -0x1
 
-    iput-wide p1, p0, Lcom/google/android/gms/measurement/internal/jf;->aGv:J
+    iput-wide p1, p0, Lcom/google/android/gms/measurement/internal/jf;->aGr:J
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->sh()V
 
     :goto_1
-    iput-wide v5, p0, Lcom/google/android/gms/measurement/internal/jf;->adP:J
+    iput-wide v5, p0, Lcom/google/android/gms/measurement/internal/jf;->adL:J
 
     goto/16 :goto_3
 
     :catchall_0
     move-exception p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object p2
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/d;->uY()V
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/d;->uW()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vq()Lcom/google/android/gms/common/util/e;
 
     move-result-object p1
 
-    invoke-interface {p1}, Lcom/google/android/gms/common/util/e;->nr()J
+    invoke-interface {p1}, Lcom/google/android/gms/common/util/e;->np()J
 
     move-result-wide p1
 
-    iput-wide p1, p0, Lcom/google/android/gms/measurement/internal/jf;->adP:J
+    iput-wide p1, p0, Lcom/google/android/gms/measurement/internal/jf;->adL:J
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEE:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string p2, "Disable upload, time"
 
-    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/jf;->adP:J
+    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/jf;->adL: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p3
 
-    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->xY()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/eh;->aEX:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/eh;->aET:Lcom/google/android/gms/measurement/internal/ei;
 
-    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ey;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ey;->vq()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->xY()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/eh;->aEY:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/eh;->aEU:Lcom/google/android/gms/measurement/internal/ei;
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vq()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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()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;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->sh()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;->aAs:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aAo:Z
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/jf;->xE()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/jf;->xC()V
 
     return-void
 
     :catchall_1
     move-exception p1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aAs:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aAo:Z
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/jf;->xE()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/jf;->xC()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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()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;->qZ()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fb;->qX()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;->atS:Ljava/lang/String;
+    iget-object v4, v1, Lcom/google/android/gms/measurement/internal/zzan;->atO: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v4
 
-    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->ug()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fb;->ue()Ljava/lang/String;
 
     move-result-object v4
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fb;->qZ()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fb;->qX()Ljava/lang/String;
 
     move-result-object v5
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fb;->ul()J
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fb;->uj()J
 
     move-result-wide v6
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fb;->yt()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fb;->yr()Ljava/lang/String;
 
     move-result-object v8
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fb;->un()J
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fb;->ul()J
 
     move-result-wide v9
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fb;->rZ()J
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fb;->rX()J
 
     move-result-wide v11
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fb;->ne()Z
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fb;->nc()Z
 
     move-result v14
 
     const/16 v16, 0x0
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fb;->ys()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fb;->yq()Ljava/lang/String;
 
     move-result-object v17
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fb;->uw()J
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fb;->uu()J
 
     move-result-wide v18
 
@@ -12254,43 +12254,43 @@
 
     const/16 v22, 0x0
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fb;->xJ()Z
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fb;->xH()Z
 
     move-result v23
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fb;->yr()Z
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fb;->yp()Z
 
     move-result v24
 
     const/16 v25, 0x0
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fb;->uD()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fb;->uB()Ljava/lang/String;
 
     move-result-object v26
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fb;->wi()Ljava/lang/Boolean;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fb;->wg()Ljava/lang/Boolean;
 
     move-result-object v27
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fb;->uo()J
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fb;->um()J
 
     move-result-wide v28
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fb;->yu()Ljava/util/List;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fb;->ys()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v13, v0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v13, v13, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v13, v13, Lcom/google/android/gms/measurement/internal/ey;->aFL:Lcom/google/android/gms/measurement/internal/ka;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fb;->qz()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fb;->qx()Ljava/lang/String;
 
     move-result-object v3
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/o;->aEf:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/o;->aEb: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;->vo()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fb;->vm()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEH: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, "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;->xB()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->xz()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yF()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yD()V
 
-    iget-object v0, p2, Lcom/google/android/gms/measurement/internal/zzm;->ane:Ljava/lang/String;
+    iget-object v0, p2, Lcom/google/android/gms/measurement/internal/zzm;->ana: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ey;->aFL:Lcom/google/android/gms/measurement/internal/ka;
 
-    iget-object v1, p2, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
+    iget-object v1, p2, Lcom/google/android/gms/measurement/internal/zzm;->atO:Ljava/lang/String;
 
-    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;->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
 
@@ -12424,7 +12424,7 @@
 
     if-eqz v0, :cond_4
 
-    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
+    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzkj;->atO: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;->aIH:Ljava/lang/Boolean;
+    iget-object v0, p2, Lcom/google/android/gms/measurement/internal/zzm;->aID:Ljava/lang/Boolean;
 
     if-eqz v0, :cond_3
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEH: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, "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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vq()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;->aIH:Ljava/lang/Boolean;
+    iget-object v0, p2, Lcom/google/android/gms/measurement/internal/zzm;->aID: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, 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/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->ye()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v3
 
-    iget-object v4, p1, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
+    iget-object v4, p1, Lcom/google/android/gms/measurement/internal/zzkj;->atO: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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/d;->tU()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/d;->tS()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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v0
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/zzm;->atO:Ljava/lang/String;
 
-    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzkj;->atO: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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object p2
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/d;->uX()V
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/d;->uV()V
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEH: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;
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->ye()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v0
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/zzkj;->atO: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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/d;->uY()V
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/d;->uW()V
 
     return-void
 
     :catchall_0
     move-exception p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object p2
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/d;->uY()V
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/d;->uW()V
 
     throw p1
 
     :cond_4
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, 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/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->ye()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v3
 
-    iget-object v4, p1, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
+    iget-object v4, p1, Lcom/google/android/gms/measurement/internal/zzkj;->atO: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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/d;->tU()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/d;->tS()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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v0
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/zzm;->atO:Ljava/lang/String;
 
-    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzkj;->atO: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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object p2
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/d;->uX()V
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/d;->uV()V
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEH: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;
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->ye()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v0
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/zzkj;->atO: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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/d;->uY()V
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/d;->uW()V
 
     return-void
 
     :catchall_1
     move-exception p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object p2
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/d;->uY()V
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/d;->uW()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;->xB()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->xz()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yF()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yD()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;->atS:Ljava/lang/String;
+    iget-object v6, v2, Lcom/google/android/gms/measurement/internal/zzm;->atO: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;->ane:Ljava/lang/String;
+    iget-object v6, v2, Lcom/google/android/gms/measurement/internal/zzm;->ana: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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v6
 
-    iget-object v7, v2, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
+    iget-object v7, v2, Lcom/google/android/gms/measurement/internal/zzm;->atO: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;->ug()Ljava/lang/String;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/fb;->ue()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;->ane:Ljava/lang/String;
+    iget-object v9, v2, Lcom/google/android/gms/measurement/internal/zzm;->ana: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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()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;->yJ()Lcom/google/android/gms/measurement/internal/es;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yH()Lcom/google/android/gms/measurement/internal/es;
 
     move-result-object v6
 
-    iget-object v9, v2, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
+    iget-object v9, v2, Lcom/google/android/gms/measurement/internal/zzm;->atO: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;->axu:J
+    iget-wide v9, v2, Lcom/google/android/gms/measurement/internal/zzm;->axq:J
 
     cmp-long v6, v9, v7
 
     if-nez v6, :cond_3
 
-    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ey;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ey;->vq()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/ey;->aFL:Lcom/google/android/gms/measurement/internal/ka;
 
-    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
+    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/zzm;->atO:Ljava/lang/String;
 
-    sget-object v12, Lcom/google/android/gms/measurement/internal/o;->aDC:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v12, Lcom/google/android/gms/measurement/internal/o;->aDy: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ey;->yj()Lcom/google/android/gms/measurement/internal/i;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ey;->yh()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v6
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/i;->vp()V
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/i;->vn()V
 
     :cond_4
-    iget v6, v2, Lcom/google/android/gms/measurement/internal/zzm;->awH:I
+    iget v6, v2, Lcom/google/android/gms/measurement/internal/zzm;->awD: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v11, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v11}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v11}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v11
 
-    iget-object v11, v11, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v11, v11, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-object v12, v2, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
+    iget-object v12, v2, Lcom/google/android/gms/measurement/internal/zzm;->atO: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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v11
 
-    invoke-virtual {v11}, Lcom/google/android/gms/measurement/internal/d;->tU()V
+    invoke-virtual {v11}, Lcom/google/android/gms/measurement/internal/d;->tS()V
 
     :try_start_0
-    iget-object v11, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v11, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v11, v11, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v11, v11, Lcom/google/android/gms/measurement/internal/ey;->aFL:Lcom/google/android/gms/measurement/internal/ka;
 
-    iget-object v12, v2, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
+    iget-object v12, v2, Lcom/google/android/gms/measurement/internal/zzm;->atO:Ljava/lang/String;
 
-    sget-object v14, Lcom/google/android/gms/measurement/internal/o;->aDC:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v14, Lcom/google/android/gms/measurement/internal/o;->aDy: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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v11
 
-    iget-object v12, v2, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
+    iget-object v12, v2, Lcom/google/android/gms/measurement/internal/zzm;->atO: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;->ane:Ljava/lang/String;
+    iget-object v12, v14, Lcom/google/android/gms/measurement/internal/jn;->ana: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;->aIH:Ljava/lang/Boolean;
+    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/zzm;->aID: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;->aIH:Ljava/lang/Boolean;
+    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/zzm;->aID: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;->asA:Ljava/lang/Object;
+    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/jn;->asw:Ljava/lang/Object;
 
-    iget-object v11, v7, Lcom/google/android/gms/measurement/internal/zzkj;->asJ:Ljava/lang/Long;
+    iget-object v11, v7, Lcom/google/android/gms/measurement/internal/zzkj;->asF: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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v7
 
-    iget-object v8, v2, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
+    iget-object v8, v2, Lcom/google/android/gms/measurement/internal/zzm;->atO: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v11, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v11}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v11}, Lcom/google/android/gms/measurement/internal/ey;->yb()Lcom/google/android/gms/measurement/internal/jm;
 
-    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/zzm;->ane:Ljava/lang/String;
+    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/zzm;->ana:Ljava/lang/String;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/fb;->ug()Ljava/lang/String;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/fb;->ue()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;->uD()Ljava/lang/String;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/fb;->uB()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v11, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v11}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v11}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v11
 
-    iget-object v11, v11, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v11, v11, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->qz()Ljava/lang/String;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/fb;->qx()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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v11
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/fb;->qz()Ljava/lang/String;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/fb;->qx()Ljava/lang/String;
 
     move-result-object v7
 
-    invoke-virtual {v11}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
+    invoke-virtual {v11}, Lcom/google/android/gms/measurement/internal/jb;->yG()V
 
-    invoke-virtual {v11}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v11}, Lcom/google/android/gms/measurement/internal/fu;->vo()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;->uZ()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {v11}, Lcom/google/android/gms/measurement/internal/d;->uX()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v11}, Lcom/google/android/gms/measurement/internal/fu;->vv()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 v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v11}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v8
 
-    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->ul()J
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/fb;->uj()J
 
     move-result-wide v11
 
@@ -13227,7 +13227,7 @@
 
     if-eqz v0, :cond_e
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/fb;->ul()J
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/fb;->uj()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;->ul()J
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/fb;->uj()J
 
     move-result-wide v3
 
@@ -13258,17 +13258,17 @@
 
     if-nez v11, :cond_10
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/fb;->qZ()Ljava/lang/String;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/fb;->qX()Ljava/lang/String;
 
     move-result-object v3
 
     if-eqz v3, :cond_10
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/fb;->qZ()Ljava/lang/String;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/fb;->qX()Ljava/lang/String;
 
     move-result-object v3
 
-    iget-object v4, v2, Lcom/google/android/gms/measurement/internal/zzm;->anq:Ljava/lang/String;
+    iget-object v4, v2, Lcom/google/android/gms/measurement/internal/zzm;->anm: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;->qZ()Ljava/lang/String;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/fb;->qX()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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v0
 
-    iget-object v3, v2, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
+    iget-object v3, v2, Lcom/google/android/gms/measurement/internal/zzm;->atO: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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v0
 
-    iget-object v3, v2, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
+    iget-object v3, v2, Lcom/google/android/gms/measurement/internal/zzm;->atO: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/ey;->aFL:Lcom/google/android/gms/measurement/internal/ka;
 
-    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/zzm;->ane:Ljava/lang/String;
+    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/zzm;->ana: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;->xB()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->xz()V
 
-    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/ey;->aGf:Lcom/google/android/gms/measurement/internal/en;
+    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/ey;->aGb:Lcom/google/android/gms/measurement/internal/en;
 
-    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
+    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/zzm;->atO: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;->xB()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->xz()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yF()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yD()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/ey;->aFL:Lcom/google/android/gms/measurement/internal/ka;
 
-    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
+    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/zzm;->atO: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;->amx:Z
+    iget-boolean v7, v2, Lcom/google/android/gms/measurement/internal/zzm;->amt: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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v0
 
-    iget-object v7, v2, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
+    iget-object v7, v2, Lcom/google/android/gms/measurement/internal/zzm;->atO: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;->vq()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jb;->yG()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Landroid/content/Context;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vr()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->atS:Ljava/lang/String;
+    iget-object v5, v2, Lcom/google/android/gms/measurement/internal/zzm;->atO: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Landroid/content/Context;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vr()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;->atS:Ljava/lang/String;
+    iget-object v7, v2, Lcom/google/android/gms/measurement/internal/zzm;->atO: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v7
 
-    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->atS:Ljava/lang/String;
+    iget-object v12, v2, Lcom/google/android/gms/measurement/internal/zzm;->atO: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ey;->aFL:Lcom/google/android/gms/measurement/internal/ka;
 
-    sget-object v7, Lcom/google/android/gms/measurement/internal/o;->aEl:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v7, Lcom/google/android/gms/measurement/internal/o;->aEh: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Landroid/content/Context;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vr()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;->atS:Ljava/lang/String;
+    iget-object v5, v2, Lcom/google/android/gms/measurement/internal/zzm;->atO: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v5
 
-    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->atS:Ljava/lang/String;
+    iget-object v12, v2, Lcom/google/android/gms/measurement/internal/zzm;->atO: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;->xB()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->xz()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yF()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yD()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ey;->aFL:Lcom/google/android/gms/measurement/internal/ka;
 
-    iget-object v6, v2, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
+    iget-object v6, v2, Lcom/google/android/gms/measurement/internal/zzm;->atO: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;->amx:Z
+    iget-boolean v3, v2, Lcom/google/android/gms/measurement/internal/zzm;->amt: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ey;->aFL:Lcom/google/android/gms/measurement/internal/ka;
 
-    iget-object v3, v2, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
+    iget-object v3, v2, Lcom/google/android/gms/measurement/internal/zzm;->atO:Ljava/lang/String;
 
-    sget-object v5, Lcom/google/android/gms/measurement/internal/o;->aDB:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v5, Lcom/google/android/gms/measurement/internal/o;->aDx: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ey;->aFL:Lcom/google/android/gms/measurement/internal/ka;
 
-    iget-object v4, v2, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
+    iget-object v4, v2, Lcom/google/android/gms/measurement/internal/zzm;->atO: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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/d;->uX()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/d;->uV()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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/d;->uY()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/d;->uW()V
 
     return-void
 
     :catchall_0
     move-exception v0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/d;->uY()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/d;->uW()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;->atS:Ljava/lang/String;
+    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzv;->atO: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;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIR: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;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIR:Lcom/google/android/gms/measurement/internal/zzkj;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/zzkj;->atO: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;->xB()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->xz()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yF()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yD()V
 
-    iget-object v0, p2, Lcom/google/android/gms/measurement/internal/zzm;->ane:Ljava/lang/String;
+    iget-object v0, p2, Lcom/google/android/gms/measurement/internal/zzm;->ana: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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/d;->tU()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/d;->tS()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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v0
 
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzv;->atS:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzv;->atO:Ljava/lang/String;
 
-    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIR:Lcom/google/android/gms/measurement/internal/zzkj;
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/zzkj;->atO: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEH: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, "Removing conditional user property"
 
-    iget-object v3, p1, Lcom/google/android/gms/measurement/internal/zzv;->atS:Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/measurement/internal/zzv;->atO:Ljava/lang/String;
 
-    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ey;->ye()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v4
 
-    iget-object v5, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v5, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIR:Lcom/google/android/gms/measurement/internal/zzkj;
 
-    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
+    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/zzkj;->atO: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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v1
 
-    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzv;->atS:Ljava/lang/String;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzv;->atO:Ljava/lang/String;
 
-    iget-object v3, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v3, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIR:Lcom/google/android/gms/measurement/internal/zzkj;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/zzkj;->atO: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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v1
 
-    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzv;->atS:Ljava/lang/String;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzv;->atO:Ljava/lang/String;
 
-    iget-object v3, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v3, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIR:Lcom/google/android/gms/measurement/internal/zzkj;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/zzkj;->atO: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;->aIY:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIU: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;->aIY:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIU:Lcom/google/android/gms/measurement/internal/zzan;
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/zzan;->aCq:Lcom/google/android/gms/measurement/internal/zzam;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/zzan;->aCm:Lcom/google/android/gms/measurement/internal/zzam;
 
     if-eqz v2, :cond_3
 
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIY:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIU:Lcom/google/android/gms/measurement/internal/zzan;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/zzan;->aCq:Lcom/google/android/gms/measurement/internal/zzam;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/zzan;->aCm:Lcom/google/android/gms/measurement/internal/zzam;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/zzam;->vB()Landroid/os/Bundle;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/zzam;->vz()Landroid/os/Bundle;
 
     move-result-object v1
 
     :cond_3
     move-object v3, v1
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->yb()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v1
 
-    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzv;->atS:Ljava/lang/String;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzv;->atO:Ljava/lang/String;
 
-    iget-object v4, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIY:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object v4, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIU:Lcom/google/android/gms/measurement/internal/zzan;
 
-    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/zzan;->atS:Ljava/lang/String;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/zzan;->atO:Ljava/lang/String;
 
-    iget-object v5, v0, Lcom/google/android/gms/measurement/internal/zzv;->ane:Ljava/lang/String;
+    iget-object v5, v0, Lcom/google/android/gms/measurement/internal/zzv;->ana:Ljava/lang/String;
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIY:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIU: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->atS:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzv;->atO: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->ye()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v2
 
-    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/zzv;->aIR:Lcom/google/android/gms/measurement/internal/zzkj;
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/zzkj;->atO: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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/d;->uX()V
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/d;->uV()V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/d;->uY()V
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/d;->uW()V
 
     return-void
 
     :catchall_0
     move-exception p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object p2
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/d;->uY()V
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/d;->uW()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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()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;->qZ()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fb;->qX()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->ug()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fb;->ue()Ljava/lang/String;
 
     move-result-object v4
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fb;->qZ()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fb;->qX()Ljava/lang/String;
 
     move-result-object v5
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fb;->ul()J
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fb;->uj()J
 
     move-result-wide v6
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fb;->yt()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fb;->yr()Ljava/lang/String;
 
     move-result-object v8
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fb;->un()J
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fb;->ul()J
 
     move-result-wide v9
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fb;->rZ()J
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fb;->rX()J
 
     move-result-wide v11
 
     const/4 v13, 0x0
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fb;->ne()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fb;->nc()Z
 
     move-result v14
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fb;->ys()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fb;->yq()Ljava/lang/String;
 
     move-result-object v16
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fb;->uw()J
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fb;->uu()J
 
     move-result-wide v17
 
@@ -14380,39 +14380,39 @@
 
     const/16 v21, 0x0
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fb;->xJ()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fb;->xH()Z
 
     move-result v22
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fb;->yr()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fb;->yp()Z
 
     move-result v23
 
     const/16 v24, 0x0
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fb;->uD()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fb;->uB()Ljava/lang/String;
 
     move-result-object v25
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fb;->wi()Ljava/lang/Boolean;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fb;->wg()Ljava/lang/Boolean;
 
     move-result-object v26
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fb;->uo()J
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fb;->um()J
 
     move-result-wide v27
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fb;->yu()Ljava/util/List;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fb;->ys()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ey;->aFL:Lcom/google/android/gms/measurement/internal/ka;
 
-    sget-object v15, Lcom/google/android/gms/measurement/internal/o;->aEf:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v15, Lcom/google/android/gms/measurement/internal/o;->aEb: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;->vo()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fb;->vm()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEH: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 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;->xB()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->xz()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yF()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yD()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;->atS:Ljava/lang/String;
+    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzm;->atO: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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v0
 
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->atO: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->xY()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v1
 
-    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzm;->atO: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;->aEn:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v2, Lcom/google/android/gms/measurement/internal/o;->aEj: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v3, p1, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/measurement/internal/zzm;->atO: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->yb()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/jm;->rU()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/jm;->rS()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;->xX()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fb;->xV()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->yb()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/jm;->rU()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/jm;->rS()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;->ane:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->ana: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/ey;->aFL:Lcom/google/android/gms/measurement/internal/ka;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fb;->qz()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fb;->qx()Ljava/lang/String;
 
     move-result-object v2
 
-    sget-object v3, Lcom/google/android/gms/measurement/internal/o;->aEf:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v3, Lcom/google/android/gms/measurement/internal/o;->aEb: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;->aIJ:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->aIF: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;->aEv:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->aEr: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;->aEv:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->aEr: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;->anq:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->anm: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;->anq:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->anm: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;->azP:Z
+    iget-boolean v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->azL: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;->adR:Z
+    iget-boolean v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->adN: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/ey;->aFL:Lcom/google/android/gms/measurement/internal/ka;
 
-    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzm;->atO:Ljava/lang/String;
 
-    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;->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
 
@@ -14737,22 +14737,22 @@
 
     if-eqz v1, :cond_8
 
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->aIH:Ljava/lang/Boolean;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->aID: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;->axA:J
+    iget-wide v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->axw: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;->pH()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fb;->pF()Z
 
     move-result p1
 
     if-eqz p1, :cond_9
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm: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;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, 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/zzm;->atS:Ljava/lang/String;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/zzm;->atO: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 mY()V
+.method final mW()V
     .locals 5
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->xB()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->xz()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yF()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yD()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIr:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIn:Z
 
     const/4 v1, 0x1
 
     if-nez v0, :cond_3
 
-    iput-boolean v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIr:Z
+    iput-boolean v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIn:Z
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->xB()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->xz()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yF()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yD()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ey;->aFL:Lcom/google/android/gms/measurement/internal/ka;
 
-    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;->aDB: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;->yQ()Z
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/jf;->yO()Z
 
     move-result v0
 
     if-eqz v0, :cond_3
 
     :cond_0
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/jf;->yo()Z
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/jf;->ym()Z
 
     move-result v0
 
     if-eqz v0, :cond_3
 
-    iget-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;->aIs: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->yk()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->yi()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ds;->xO()I
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ds;->xM()I
 
     move-result v2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->xB()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->xz()V
 
     if-le v0, v2, :cond_1
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->aIw:Ljava/nio/channels/FileChannel;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/jf;->aIs: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->atw:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/jf;->ats:Z
 
     if-nez v0, :cond_4
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ey;->aFL:Lcom/google/android/gms/measurement/internal/ka;
 
-    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;->aDB: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEG:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEC: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;->atw:Z
+    iput-boolean v1, p0, Lcom/google/android/gms/measurement/internal/jf;->ats:Z
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->sh()V
 
     :cond_4
     return-void
 .end method
 
-.method final qv()V
+.method final qt()V
     .locals 15
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->xB()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->xz()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yF()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yD()V
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIu:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Z
 
     const/4 v1, 0x0
 
     :try_start_0
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vA()Lcom/google/android/gms/measurement/internal/jz;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vy()Lcom/google/android/gms/measurement/internal/jz;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->yi()Lcom/google/android/gms/measurement/internal/hm;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->yg()Lcom/google/android/gms/measurement/internal/hm;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/hm;->aCi:Ljava/lang/Boolean;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/hm;->aCe:Ljava/lang/Boolean;
 
     if-nez v2, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vv()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;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->aIu:Z
+    iput-boolean v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Z
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/jf;->xE()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/jf;->xC()V
 
     return-void
 
@@ -15074,13 +15074,13 @@
 
     if-eqz v2, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->aIu:Z
+    iput-boolean v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Z
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/jf;->xE()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/jf;->xC()V
 
     return-void
 
     :cond_1
     :try_start_2
-    iget-wide v2, p0, Lcom/google/android/gms/measurement/internal/jf;->adP:J
+    iget-wide v2, p0, Lcom/google/android/gms/measurement/internal/jf;->adL: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;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->sh()V
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
-    iput-boolean v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIu:Z
+    iput-boolean v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Z
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/jf;->xE()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/jf;->xC()V
 
     return-void
 
     :cond_2
     :try_start_3
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->xB()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->xz()V
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIx:Ljava/util/List;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIt: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vv()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 v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->aIu:Z
+    iput-boolean v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Z
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/jf;->xE()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/jf;->xC()V
 
     return-void
 
     :cond_4
     :try_start_4
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yK()Lcom/google/android/gms/measurement/internal/dz;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/dz;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/dz;->qE()Z
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/dz;->qC()Z
 
     move-result v2
 
     if-nez v2, :cond_5
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vv()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 v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->sj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->sh()V
     :try_end_4
     .catchall {:try_start_4 .. :try_end_4} :catchall_0
 
-    iput-boolean v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIu:Z
+    iput-boolean v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Z
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/jf;->xE()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/jf;->xC()V
 
     return-void
 
     :cond_5
     :try_start_5
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vq()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;->up()J
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/ka;->un()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v6, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ey;->xY()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v6
 
-    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/eh;->aEW:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/eh;->aES:Lcom/google/android/gms/measurement/internal/ei;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ei;->ud()J
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ei;->ub()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v4
 
-    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dv;->aEH: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, "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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v4
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/d;->va()Ljava/lang/String;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/d;->uY()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;->aGv:J
+    iget-wide v8, p0, Lcom/google/android/gms/measurement/internal/jf;->aGr:J
 
     cmp-long v5, v8, v6
 
     if-nez v5, :cond_7
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v5
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/d;->us()J
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/d;->uq()J
 
     move-result-wide v5
 
-    iput-wide v5, p0, Lcom/google/android/gms/measurement/internal/jf;->aGv:J
+    iput-wide v5, p0, Lcom/google/android/gms/measurement/internal/jf;->aGr:J
 
     :cond_7
-    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/ey;->aFL:Lcom/google/android/gms/measurement/internal/ka;
 
-    sget-object v6, Lcom/google/android/gms/measurement/internal/o;->aCF:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v6, Lcom/google/android/gms/measurement/internal/o;->aCB: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v6, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/ey;->aFL:Lcom/google/android/gms/measurement/internal/ka;
 
-    sget-object v7, Lcom/google/android/gms/measurement/internal/o;->aCG:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v7, Lcom/google/android/gms/measurement/internal/o;->aCC: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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()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;->qK()Lcom/google/android/gms/internal/measurement/ak$f$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$f;->qI()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;->vc()Z
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/ka;->va()Z
 
     move-result v10
 
     if-eqz v10, :cond_c
 
-    iget-object v10, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v10, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v10, v10, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v10, v10, Lcom/google/android/gms/measurement/internal/ey;->aFL: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;->sS()Lcom/google/android/gms/internal/measurement/dw$b;
+    invoke-virtual {v12}, Lcom/google/android/gms/internal/measurement/dw;->sQ()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v14, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v14}, Lcom/google/android/gms/measurement/internal/ey;->vA()Lcom/google/android/gms/measurement/internal/jz;
+    invoke-virtual {v14}, Lcom/google/android/gms/measurement/internal/ey;->vy()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;->rc()Lcom/google/android/gms/internal/measurement/ak$g$a;
+    invoke-virtual {v12}, Lcom/google/android/gms/internal/measurement/ak$g$a;->ra()Lcom/google/android/gms/internal/measurement/ak$g$a;
 
     :cond_d
-    iget-object v13, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v13, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v13, v13, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v13, v13, Lcom/google/android/gms/measurement/internal/ey;->aFL:Lcom/google/android/gms/measurement/internal/ka;
 
-    sget-object v14, Lcom/google/android/gms/measurement/internal/o;->aDI:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v14, Lcom/google/android/gms/measurement/internal/o;->aDE: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;->tb()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v12}, Lcom/google/android/gms/internal/measurement/dw$b;->sZ()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;->rJ()[B
+    invoke-virtual {v13}, Lcom/google/android/gms/internal/measurement/cf;->rH()[B
 
     move-result-object v13
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yP()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yN()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ey;->vv()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;->yP()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yN()Lcom/google/android/gms/measurement/internal/jj;
 
     move-result-object v5
 
-    invoke-virtual {v6}, Lcom/google/android/gms/internal/measurement/dw$b;->tb()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v6}, Lcom/google/android/gms/internal/measurement/dw$b;->sZ()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;->yP()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yN()Lcom/google/android/gms/measurement/internal/jj;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/internal/measurement/dw$b;->tb()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v6}, Lcom/google/android/gms/internal/measurement/dw$b;->sZ()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;->rJ()[B
+    invoke-virtual {v10}, Lcom/google/android/gms/internal/measurement/cf;->rH()[B
 
     move-result-object v10
 
-    sget-object v11, Lcom/google/android/gms/measurement/internal/o;->aCP:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v11, Lcom/google/android/gms/measurement/internal/o;->aCL: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;->aIx:Ljava/util/List;
+    iget-object v11, p0, Lcom/google/android/gms/measurement/internal/jf;->aIt:Ljava/util/List;
 
     if-eqz v11, :cond_12
 
-    iget-object v9, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v9, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v9}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v9}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v9
 
-    iget-object v9, v9, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v9, v9, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->aIx:Ljava/util/List;
+    iput-object v11, p0, Lcom/google/android/gms/measurement/internal/jf;->aIt:Ljava/util/List;
 
     :goto_8
-    iget-object v9, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v9, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v9}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v9}, Lcom/google/android/gms/measurement/internal/ey;->xY()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v9
 
-    iget-object v9, v9, Lcom/google/android/gms/measurement/internal/eh;->aEX:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object v9, v9, Lcom/google/android/gms/measurement/internal/eh;->aET: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;->qM()Lcom/google/android/gms/internal/measurement/ak$g;
+    invoke-virtual {v6}, Lcom/google/android/gms/internal/measurement/ak$f$a;->qK()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->aAs:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aAo:Z
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yK()Lcom/google/android/gms/measurement/internal/dz;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()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;->vq()V
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/jb;->yG()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;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/fu;->vu()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->aGv:J
+    iput-wide v6, p0, Lcom/google/android/gms/measurement/internal/jf;->aGr:J
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v0
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/ka;->up()J
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/ka;->un()J
 
     move-result-wide v4
 
@@ -15779,7 +15779,7 @@
 
     if-nez v2, :cond_15
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()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;->aIu:Z
+    iput-boolean v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Z
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/jf;->xE()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/jf;->xC()V
 
     return-void
 
     :catchall_0
     move-exception v0
 
-    iput-boolean v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIu:Z
+    iput-boolean v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Z
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/jf;->xE()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/jf;->xC()V
 
     goto :goto_b
 
@@ -15817,26 +15817,26 @@
     goto :goto_a
 .end method
 
-.method final sj()V
+.method final sh()V
     .locals 21
 
     move-object/from16 v0, p0
 
-    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;->xz()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yF()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yD()V
 
-    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yQ()Z
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yO()Z
 
     move-result v1
 
     if-nez v1, :cond_0
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/ey;->aFL:Lcom/google/android/gms/measurement/internal/ka;
 
-    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;->aDB: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;->adP:J
+    iget-wide v1, v0, Lcom/google/android/gms/measurement/internal/jf;->adL: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vq()Lcom/google/android/gms/common/util/e;
 
     move-result-object v1
 
-    invoke-interface {v1}, Lcom/google/android/gms/common/util/e;->nr()J
+    invoke-interface {v1}, Lcom/google/android/gms/common/util/e;->np()J
 
     move-result-wide v1
 
     const-wide/32 v5, 0x36ee80
 
-    iget-wide v7, v0, Lcom/google/android/gms/measurement/internal/jf;->adP:J
+    iget-wide v7, v0, Lcom/google/android/gms/measurement/internal/jf;->adL: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->yM()Lcom/google/android/gms/measurement/internal/eg;
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yK()Lcom/google/android/gms/measurement/internal/eg;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/eg;->pG()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/eg;->pE()V
 
-    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yN()Lcom/google/android/gms/measurement/internal/ja;
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/ja;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ja;->tU()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ja;->tS()V
 
     return-void
 
     :cond_1
-    iput-wide v3, v0, Lcom/google/android/gms/measurement/internal/jf;->adP:J
+    iput-wide v3, v0, Lcom/google/android/gms/measurement/internal/jf;->adL:J
 
     :cond_2
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->yr()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->yp()Z
 
     move-result v1
 
     if-eqz v1, :cond_12
 
-    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->vc()Z
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->va()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vq()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;->aCZ:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v5, Lcom/google/android/gms/measurement/internal/o;->aCV: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;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v5
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/d;->vd()Z
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/d;->vb()Z
 
     move-result v5
 
     if-nez v5, :cond_5
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v5
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/d;->mS()Z
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/d;->mQ()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v10, v0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v10, v10, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v10, v10, Lcom/google/android/gms/measurement/internal/ey;->aFL:Lcom/google/android/gms/measurement/internal/ka;
 
-    invoke-virtual {v10}, Lcom/google/android/gms/measurement/internal/ka;->yW()Ljava/lang/String;
+    invoke-virtual {v10}, Lcom/google/android/gms/measurement/internal/ka;->yU()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;->aCU:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v10, Lcom/google/android/gms/measurement/internal/o;->aCQ: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;->aCT:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v10, Lcom/google/android/gms/measurement/internal/o;->aCP: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;->aCS:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v10, Lcom/google/android/gms/measurement/internal/o;->aCO: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v12, v0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v12}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v12}, Lcom/google/android/gms/measurement/internal/ey;->xY()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v12
 
-    iget-object v12, v12, Lcom/google/android/gms/measurement/internal/eh;->aEW:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object v12, v12, Lcom/google/android/gms/measurement/internal/eh;->aES:Lcom/google/android/gms/measurement/internal/ei;
 
-    invoke-virtual {v12}, Lcom/google/android/gms/measurement/internal/ei;->ud()J
+    invoke-virtual {v12}, Lcom/google/android/gms/measurement/internal/ei;->ub()J
 
     move-result-wide v12
 
-    iget-object v14, v0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v14, v0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v14}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v14}, Lcom/google/android/gms/measurement/internal/ey;->xY()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v14
 
-    iget-object v14, v14, Lcom/google/android/gms/measurement/internal/eh;->aEX:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object v14, v14, Lcom/google/android/gms/measurement/internal/eh;->aET:Lcom/google/android/gms/measurement/internal/ei;
 
-    invoke-virtual {v14}, Lcom/google/android/gms/measurement/internal/ei;->ud()J
+    invoke-virtual {v14}, Lcom/google/android/gms/measurement/internal/ei;->ub()J
 
     move-result-wide v14
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()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;->sg()J
+    invoke-virtual/range {v16 .. v16}, Lcom/google/android/gms/measurement/internal/d;->se()J
 
     move-result-wide v9
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()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;->uq()J
+    invoke-virtual {v11}, Lcom/google/android/gms/measurement/internal/d;->uo()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;->yP()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yN()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;->aDb:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v7, Lcom/google/android/gms/measurement/internal/o;->aCX: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;->aDa:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v12, Lcom/google/android/gms/measurement/internal/o;->aCW: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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->yM()Lcom/google/android/gms/measurement/internal/eg;
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yK()Lcom/google/android/gms/measurement/internal/eg;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/eg;->pG()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/eg;->pE()V
 
-    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yN()Lcom/google/android/gms/measurement/internal/ja;
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/ja;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ja;->tU()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ja;->tS()V
 
     return-void
 
     :cond_e
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yK()Lcom/google/android/gms/measurement/internal/dz;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/dz;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/dz;->qE()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/dz;->qC()Z
 
     move-result v1
 
     if-nez v1, :cond_f
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->yM()Lcom/google/android/gms/measurement/internal/eg;
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yK()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;->yN()Lcom/google/android/gms/measurement/internal/ja;
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/ja;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ja;->tU()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ja;->tS()V
 
     return-void
 
     :cond_f
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->xY()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/eh;->aEY:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/eh;->aEU:Lcom/google/android/gms/measurement/internal/ei;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ei;->ud()J
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ei;->ub()J
 
     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;->aCM: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;->yP()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yN()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;->yM()Lcom/google/android/gms/measurement/internal/eg;
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yK()Lcom/google/android/gms/measurement/internal/eg;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/eg;->pG()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/eg;->pE()V
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vq()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;->aCV: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;
 
     const/4 v2, 0x0
 
@@ -16423,17 +16423,17 @@
 
     move-result-wide v8
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->xY()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/eh;->aEW:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/eh;->aES:Lcom/google/android/gms/measurement/internal/ei;
 
-    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vq()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->yN()Lcom/google/android/gms/measurement/internal/ja;
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()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;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->yM()Lcom/google/android/gms/measurement/internal/eg;
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yK()Lcom/google/android/gms/measurement/internal/eg;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/eg;->pG()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/eg;->pE()V
 
-    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yN()Lcom/google/android/gms/measurement/internal/ja;
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/ja;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ja;->tU()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ja;->tS()V
 
     return-void
 .end method
 
-.method public final vA()Lcom/google/android/gms/measurement/internal/jz;
+.method public final vq()Lcom/google/android/gms/common/util/e;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vA()Lcom/google/android/gms/measurement/internal/jz;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vq()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final vs()Lcom/google/android/gms/common/util/e;
+.method public final vr()Landroid/content/Context;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vr()Landroid/content/Context;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final vt()Landroid/content/Context;
+.method public final vu()Lcom/google/android/gms/measurement/internal/ev;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Landroid/content/Context;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final vw()Lcom/google/android/gms/measurement/internal/ev;
+.method public final vv()Lcom/google/android/gms/measurement/internal/dv;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm: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;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final vx()Lcom/google/android/gms/measurement/internal/dv;
+.method public final vy()Lcom/google/android/gms/measurement/internal/jz;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vy()Lcom/google/android/gms/measurement/internal/jz;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method final xB()V
+.method final xz()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm: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;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
     return-void
 .end method
 
-.method final yF()V
+.method final yD()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 yJ()Lcom/google/android/gms/measurement/internal/es;
+.method public final yH()Lcom/google/android/gms/measurement/internal/es;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIi:Lcom/google/android/gms/measurement/internal/es;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIe: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;->aIi:Lcom/google/android/gms/measurement/internal/es;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIe:Lcom/google/android/gms/measurement/internal/es;
 
     return-object v0
 .end method
 
-.method public final yK()Lcom/google/android/gms/measurement/internal/dz;
+.method public final yI()Lcom/google/android/gms/measurement/internal/dz;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIj:Lcom/google/android/gms/measurement/internal/dz;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIf: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;->aIj:Lcom/google/android/gms/measurement/internal/dz;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIf:Lcom/google/android/gms/measurement/internal/dz;
 
     return-object v0
 .end method
 
-.method public final yL()Lcom/google/android/gms/measurement/internal/d;
+.method public final yJ()Lcom/google/android/gms/measurement/internal/d;
     .locals 1
 
-    iget-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;->aIg: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;->aIk:Lcom/google/android/gms/measurement/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIg:Lcom/google/android/gms/measurement/internal/d;
 
     return-object v0
 .end method
 
-.method public final yO()Lcom/google/android/gms/measurement/internal/jr;
+.method public final yM()Lcom/google/android/gms/measurement/internal/jr;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIn:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIj: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;->aIn:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIj:Lcom/google/android/gms/measurement/internal/jr;
 
     return-object v0
 .end method
 
-.method public final yP()Lcom/google/android/gms/measurement/internal/jj;
+.method public final yN()Lcom/google/android/gms/measurement/internal/jj;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIo:Lcom/google/android/gms/measurement/internal/jj;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIk: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;->aIo:Lcom/google/android/gms/measurement/internal/jj;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIk: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 16334f0037..62402efa92 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 aGB:Lcom/google/android/gms/measurement/internal/jf;
+.field private final synthetic aGx: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;->aGB:Lcom/google/android/gms/measurement/internal/jf;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jg;->aGx: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;->aGB:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jg;->aGx: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 aef64da2a3..35dafea8ec 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 aES:Lcom/google/android/gms/measurement/internal/jf;
+.field private final synthetic aEO:Lcom/google/android/gms/measurement/internal/jf;
 
-.field private final synthetic atS:Ljava/lang/String;
+.field private final synthetic atO: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;->aES:Lcom/google/android/gms/measurement/internal/jf;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jh;->aEO:Lcom/google/android/gms/measurement/internal/jf;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/jh;->atS:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/jh;->atO: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;->aES:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/jh;->aEO: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 83cdbd0c2b..5418aff61c 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 aES:Lcom/google/android/gms/measurement/internal/jf;
+.field private final synthetic aEO:Lcom/google/android/gms/measurement/internal/jf;
 
-.field private final synthetic aGz:Lcom/google/android/gms/measurement/internal/zzm;
+.field private final synthetic aGv: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;->aES:Lcom/google/android/gms/measurement/internal/jf;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ji;->aEO:Lcom/google/android/gms/measurement/internal/jf;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ji;->aGz:Lcom/google/android/gms/measurement/internal/zzm;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ji;->aGv: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;->aES:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ji;->aEO:Lcom/google/android/gms/measurement/internal/jf;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ji;->aGz:Lcom/google/android/gms/measurement/internal/zzm;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ji;->aGv: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;->aES:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ji;->aEO:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vv()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;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->uf()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fb;->ud()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 420176644f..9c69bccaaa 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;->qh()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ak$g$a;->qf()I
 
     move-result v2
 
@@ -70,7 +70,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/di;->sD()Lcom/google/android/gms/internal/measurement/di;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/di;->sB()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;->qy()Ljava/util/List;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qw()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;->qF()Lcom/google/android/gms/internal/measurement/ak$e$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$e;->qD()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;->pR()Z
+    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/ac$c;->pP()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;->vu()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()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;->pP()Lcom/google/android/gms/internal/measurement/ac$f;
+    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/ac$c;->pN()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;->pH()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ac$f;->pF()Z
 
     move-result v3
 
     if-eqz v3, :cond_2
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ac$f;->qb()Lcom/google/android/gms/internal/measurement/ac$f$b;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ac$f;->pZ()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;->qc()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ac$f;->qa()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;->pQ()Lcom/google/android/gms/internal/measurement/ac$d;
+    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/ac$c;->pO()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;->pH()Z
+    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/ac$d;->pF()Z
 
     move-result p2
 
     if-eqz p2, :cond_1
 
-    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/ac$d;->pU()Lcom/google/android/gms/internal/measurement/ac$d$a;
+    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/ac$d;->pS()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;->nO()Z
+    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/ac$d;->nM()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;->pK()I
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/ak$i;->pI()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;->rf()I
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/ak$i;->rd()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;->pH()Z
+    invoke-virtual {v7}, Lcom/google/android/gms/internal/measurement/ak$b;->pF()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;->nO()Z
+    invoke-virtual {v7}, Lcom/google/android/gms/internal/measurement/ak$b;->nM()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;->qc()I
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/ak$i;->qa()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;->pH()Z
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/ak$j;->pF()Z
 
     move-result p2
 
@@ -1055,7 +1055,7 @@
     return-object p0
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ak$e;->qg()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ak$e;->qe()Z
 
     move-result p1
 
@@ -1070,7 +1070,7 @@
     return-object p0
 
     :cond_1
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ak$e;->qE()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ak$e;->qC()Z
 
     move-result p1
 
@@ -1175,11 +1175,11 @@
 
     :catch_0
     :try_start_1
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, 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/dv;->aEw: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;->pH()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ac$b;->pF()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;->vu()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()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;->pL()Lcom/google/android/gms/internal/measurement/ac$d;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ac$b;->pJ()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;->pH()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ac$e;->pF()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;->vu()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()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;->pY()Lcom/google/android/gms/internal/measurement/ac$c;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ac$e;->pW()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;->mS()Z
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/ak$g;->mQ()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;->qP()Z
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/ak$g;->qN()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;->pH()Z
+    invoke-virtual {v13}, Lcom/google/android/gms/internal/measurement/ak$k;->pF()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;->vu()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()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;->qE()Z
+    invoke-virtual {v13}, Lcom/google/android/gms/internal/measurement/ak$k;->qC()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;->rr()Z
+    invoke-virtual {v13}, Lcom/google/android/gms/internal/measurement/ak$k;->rp()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;->qo()Lcom/google/android/gms/internal/measurement/ak$i;
+    invoke-virtual {v13}, Lcom/google/android/gms/internal/measurement/ak$a;->qm()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;->qp()Lcom/google/android/gms/internal/measurement/ak$i;
+    invoke-virtual {v13}, Lcom/google/android/gms/internal/measurement/ak$a;->qn()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;->vu()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()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;->qg()Z
+    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/ak$c;->qe()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;->pK()I
+    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/ak$c;->pI()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;->vu()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()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;->qg()Z
+    invoke-virtual {v13}, Lcom/google/android/gms/internal/measurement/ak$e;->qe()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;->qE()Z
+    invoke-virtual {v13}, Lcom/google/android/gms/internal/measurement/ak$e;->qC()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;->qH()Lcom/google/android/gms/internal/measurement/ak$e$a;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ak$e$a;->qF()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;->qI()Lcom/google/android/gms/internal/measurement/ak$e$a;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ak$e$a;->qG()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;->qJ()Lcom/google/android/gms/internal/measurement/ak$e$a;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ak$e$a;->qH()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, 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/dv;->aEw: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;->ru()Lcom/google/android/gms/internal/measurement/ak$k$a;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ak$k$a;->rs()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;->rv()Lcom/google/android/gms/internal/measurement/ak$k$a;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ak$k$a;->rt()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;->rw()Lcom/google/android/gms/internal/measurement/ak$k$a;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ak$k$a;->ru()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, 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/dv;->aEw: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object p1
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/o;->aEm:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/o;->aEi: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;->ane:Ljava/lang/String;
+    iget-object p1, p2, Lcom/google/android/gms/measurement/internal/zzm;->ana: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;->ane:Ljava/lang/String;
+    iget-object p1, p2, Lcom/google/android/gms/measurement/internal/zzm;->ana: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;->vA()Lcom/google/android/gms/measurement/internal/jz;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vy()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;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
@@ -2951,7 +2951,7 @@
     return p1
 .end method
 
-.method protected final pR()Z
+.method protected final pP()Z
     .locals 1
 
     const/4 v0, 0x0
@@ -2959,10 +2959,10 @@
     return v0
 .end method
 
-.method public final bridge synthetic rA()V
+.method public final bridge synthetic ry()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->rA()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->ry()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;->vv()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/jm;->yT()Ljava/security/MessageDigest;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/jm;->yR()Ljava/security/MessageDigest;
 
     move-result-object v0
 
     if-nez v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, 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/dv;->aEw: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 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
+.method public final bridge synthetic vo()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vq()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vo()V
 
     return-void
 .end method
 
-.method public final bridge synthetic vr()Lcom/google/android/gms/measurement/internal/i;
+.method public final bridge synthetic vp()Lcom/google/android/gms/measurement/internal/i;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vr()Lcom/google/android/gms/measurement/internal/i;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vp()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vs()Lcom/google/android/gms/common/util/e;
+.method public final bridge synthetic vq()Lcom/google/android/gms/common/util/e;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vq()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vt()Landroid/content/Context;
+.method public final bridge synthetic vr()Landroid/content/Context;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vt()Landroid/content/Context;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vr()Landroid/content/Context;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vu()Lcom/google/android/gms/measurement/internal/dt;
+.method public final bridge synthetic vs()Lcom/google/android/gms/measurement/internal/dt;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vu()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vs()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vv()Lcom/google/android/gms/measurement/internal/jm;
+.method public final bridge synthetic vt()Lcom/google/android/gms/measurement/internal/jm;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vv()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vt()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vw()Lcom/google/android/gms/measurement/internal/ev;
+.method public final bridge synthetic vu()Lcom/google/android/gms/measurement/internal/ev;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vx()Lcom/google/android/gms/measurement/internal/dv;
+.method public final bridge synthetic vv()Lcom/google/android/gms/measurement/internal/dv;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vy()Lcom/google/android/gms/measurement/internal/eh;
+.method public final bridge synthetic vw()Lcom/google/android/gms/measurement/internal/eh;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vy()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vw()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vz()Lcom/google/android/gms/measurement/internal/ka;
+.method public final bridge synthetic vx()Lcom/google/android/gms/measurement/internal/ka;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vx()Lcom/google/android/gms/measurement/internal/ka;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic vy()Lcom/google/android/gms/measurement/internal/jz;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vy()Lcom/google/android/gms/measurement/internal/jz;
 
     move-result-object v0
 
@@ -3172,11 +3172,11 @@
     :catch_0
     move-exception p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEw: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 xR()Lcom/google/android/gms/measurement/internal/jj;
+.method public final bridge synthetic xP()Lcom/google/android/gms/measurement/internal/jj;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->xR()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->xP()Lcom/google/android/gms/measurement/internal/jj;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xS()Lcom/google/android/gms/measurement/internal/jr;
+.method public final bridge synthetic xQ()Lcom/google/android/gms/measurement/internal/jr;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->xS()Lcom/google/android/gms/measurement/internal/jr;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->xQ()Lcom/google/android/gms/measurement/internal/jr;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xT()Lcom/google/android/gms/measurement/internal/d;
+.method public final bridge synthetic xR()Lcom/google/android/gms/measurement/internal/d;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->xT()Lcom/google/android/gms/measurement/internal/d;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->xR()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xU()Lcom/google/android/gms/measurement/internal/es;
+.method public final bridge synthetic xS()Lcom/google/android/gms/measurement/internal/es;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->xU()Lcom/google/android/gms/measurement/internal/es;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->xS()Lcom/google/android/gms/measurement/internal/es;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method final yR()Ljava/util/List;
+.method final yP()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;->aGB:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jj;->aGx:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vt()Landroid/content/Context;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vr()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;->aDl:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v3, Lcom/google/android/gms/measurement/internal/o;->aDh: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v4
 
-    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v5
 
-    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dv;->aEz: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 7eaa45bf53..d334aa816b 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 aGM:Landroid/content/Context;
+.field final aGI: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;->aGM:Landroid/content/Context;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jk;->aGI: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 5a8c9acca1..1a0b600a79 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 aGL:[Ljava/lang/String;
+.field private static final aGH:[Ljava/lang/String;
 
 
 # instance fields
-.field private aID:Ljava/security/SecureRandom;
+.field private final aIA:Ljava/util/concurrent/atomic/AtomicLong;
 
-.field private final aIE:Ljava/util/concurrent/atomic/AtomicLong;
+.field private aIB:Ljava/lang/Integer;
 
-.field private aIF:Ljava/lang/Integer;
+.field private aIz:Ljava/security/SecureRandom;
 
 .field private zzd:I
 
@@ -43,7 +43,7 @@
 
     aput-object v2, v0, v1
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/jm;->aGL:[Ljava/lang/String;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/jm;->aGH:[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;->aIF:Ljava/lang/Integer;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jm;->aIB: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;->aIE:Ljava/util/concurrent/atomic/AtomicLong;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jm;->aIA: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;->atS:Ljava/lang/String;
+    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/zzkj;->atO: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;->asJ:Ljava/lang/Long;
+    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/zzkj;->asF:Ljava/lang/Long;
 
     if-eqz v2, :cond_3
 
-    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
+    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/zzkj;->atO:Ljava/lang/String;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/zzkj;->asJ:Ljava/lang/Long;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/zzkj;->asF: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;->aIC:Ljava/lang/Double;
+    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/zzkj;->aIy:Ljava/lang/Double;
 
     if-eqz v2, :cond_1
 
-    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
+    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/zzkj;->atO:Ljava/lang/String;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/zzkj;->aIC:Ljava/lang/Double;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/zzkj;->aIy: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;->atS:Ljava/lang/String;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzv;->atO: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;->ane:Ljava/lang/String;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzv;->ana: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;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzv;->aIR:Lcom/google/android/gms/measurement/internal/zzkj;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/zzkj;->atO: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;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzv;->aIR:Lcom/google/android/gms/measurement/internal/zzkj;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/zzkj;->rC()Ljava/lang/Object;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/zzkj;->rA()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;->aIW:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzv;->aIS:Lcom/google/android/gms/measurement/internal/zzan;
 
     if-eqz v3, :cond_2
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzv;->aIW:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzv;->aIS:Lcom/google/android/gms/measurement/internal/zzan;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/zzan;->atS:Ljava/lang/String;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/zzan;->atO: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;->aIW:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzv;->aIS:Lcom/google/android/gms/measurement/internal/zzan;
 
-    iget-object v3, v3, 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/zzan;->aCm:Lcom/google/android/gms/measurement/internal/zzam;
 
     if-eqz v3, :cond_2
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzv;->aIW:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzv;->aIS:Lcom/google/android/gms/measurement/internal/zzan;
 
-    iget-object v3, v3, 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/zzan;->aCm:Lcom/google/android/gms/measurement/internal/zzam;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/zzam;->vB()Landroid/os/Bundle;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/zzam;->vz()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;->aIX:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzv;->aIT:Lcom/google/android/gms/measurement/internal/zzan;
 
     if-eqz v3, :cond_3
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzv;->aIX:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzv;->aIT:Lcom/google/android/gms/measurement/internal/zzan;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/zzan;->atS:Ljava/lang/String;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/zzan;->atO: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;->aIX:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzv;->aIT:Lcom/google/android/gms/measurement/internal/zzan;
 
-    iget-object v3, v3, 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/zzan;->aCm:Lcom/google/android/gms/measurement/internal/zzam;
 
     if-eqz v3, :cond_3
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzv;->aIX:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzv;->aIT:Lcom/google/android/gms/measurement/internal/zzan;
 
-    iget-object v3, v3, 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/zzan;->aCm:Lcom/google/android/gms/measurement/internal/zzam;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/zzam;->vB()Landroid/os/Bundle;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/zzam;->vz()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;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzv;->aIR:Lcom/google/android/gms/measurement/internal/zzkj;
 
-    iget-wide v3, v3, Lcom/google/android/gms/measurement/internal/zzkj;->anz:J
+    iget-wide v3, v3, Lcom/google/android/gms/measurement/internal/zzkj;->anv: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;->aIY:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzv;->aIU:Lcom/google/android/gms/measurement/internal/zzan;
 
     if-eqz v3, :cond_4
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzv;->aIY:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzv;->aIU:Lcom/google/android/gms/measurement/internal/zzan;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/zzan;->atS:Ljava/lang/String;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/zzan;->atO: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;->aIY:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzv;->aIU:Lcom/google/android/gms/measurement/internal/zzan;
 
-    iget-object v3, v3, 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/zzan;->aCm:Lcom/google/android/gms/measurement/internal/zzam;
 
     if-eqz v3, :cond_4
 
-    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/zzv;->aIU:Lcom/google/android/gms/measurement/internal/zzan;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/zzan;->aCq:Lcom/google/android/gms/measurement/internal/zzam;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/zzan;->aCm:Lcom/google/android/gms/measurement/internal/zzam;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/zzam;->vB()Landroid/os/Bundle;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/zzam;->vz()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEF: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;
 
     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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEF: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;
 
     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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p3
 
-    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aEF:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aEB: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEw:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v0, "Error obtaining certificate"
 
@@ -1793,7 +1793,7 @@
     return-wide v3
 .end method
 
-.method static yT()Ljava/security/MessageDigest;
+.method static yR()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;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jm;->aGG:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/ey;->anq:Ljava/lang/String;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/ey;->anm: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEC:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEy: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEC:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEy: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;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/jm;->aGG:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/ey;->anq:Ljava/lang/String;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/ey;->anm: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEC:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEy: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEC:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEy: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEC:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEy: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEC:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEy: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEC:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEy: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEC:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEy: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEC:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEy: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEC:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEy: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEC:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEy: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEF: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;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()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;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/o;->aDM:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/o;->aDI: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;->vq()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEF:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEB: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;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/o;->aDm:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/o;->aDi: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEC:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEy:Lcom/google/android/gms/measurement/internal/dx;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()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;->vu()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, 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/dv;->aEw:Lcom/google/android/gms/measurement/internal/dx;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()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;->so()I
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jm;->sm()I
 
     move-result v3
 
@@ -2873,7 +2873,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v3
 
-    iget-object v3, v3, 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/dv;->aEz: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p3
 
-    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aEF:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aEB:Lcom/google/android/gms/measurement/internal/dx;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()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;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jm;->aGG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jm;->aGG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jm;->aGG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jm;->aGG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jm;->aGG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jm;->aGG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jm;->aGG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->vt()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEC:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEy: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;->aGL:[Ljava/lang/String;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/jm;->aGH:[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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEC:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEy: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEC:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEy: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;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/jm;->aGG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vA()Lcom/google/android/gms/measurement/internal/jz;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vy()Lcom/google/android/gms/measurement/internal/jz;
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/jm;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/jm;->aGG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->ya()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEC:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEy: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEC:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEy: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;->aGL:[Ljava/lang/String;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/ga;->aGH:[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;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, 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/dv;->aED: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;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ka;->yW()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ka;->yU()Ljava/lang/String;
 
     move-result-object v0
 
-    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;->vy()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;->aGL:[Ljava/lang/String;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/fy;->aGH:[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;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()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;->yT()Ljava/security/MessageDigest;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/jm;->yR()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, 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/dv;->aEw: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;->vt()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEw: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 pR()Z
+.method protected final pP()Z
     .locals 1
 
     const/4 v0, 0x1
@@ -3910,10 +3910,10 @@
     return v0
 .end method
 
-.method public final qV()J
+.method public final qT()J
     .locals 6
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jm;->aIE:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jm;->aIA: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;->aIE:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jm;->aIA: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;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()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;->aIE:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jm;->aIA:Ljava/util/concurrent/atomic/AtomicLong;
 
     monitor-enter v0
 
     :try_start_1
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jm;->aIE:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jm;->aIA: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;->aIE:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jm;->aIA:Ljava/util/concurrent/atomic/AtomicLong;
 
     invoke-virtual {v1}, Ljava/util/concurrent/atomic/AtomicLong;->getAndIncrement()J
 
@@ -4009,22 +4009,14 @@
     throw v1
 .end method
 
-.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;
+.method final rS()Ljava/lang/String;
     .locals 5
 
     const/16 v0, 0x10
 
     new-array v0, v0, [B
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jm;->yS()Ljava/security/SecureRandom;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jm;->yQ()Ljava/security/SecureRandom;
 
     move-result-object v1
 
@@ -4053,6 +4045,14 @@
     return-object v0
 .end method
 
+.method public final bridge synthetic ry()V
+    .locals 0
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->ry()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEz: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 so()I
+.method public final sm()I
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jm;->aIF:Ljava/lang/Integer;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jm;->aIB:Ljava/lang/Integer;
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/common/c;->lU()Lcom/google/android/gms/common/c;
+    invoke-static {}, Lcom/google/android/gms/common/c;->lS()Lcom/google/android/gms/common/c;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()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;->aIF:Ljava/lang/Integer;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/jm;->aIB:Ljava/lang/Integer;
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jm;->aIF:Ljava/lang/Integer;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jm;->aIB:Ljava/lang/Integer;
 
     invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
 
@@ -4383,146 +4383,118 @@
     return v0
 .end method
 
-.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
+.method public final bridge synthetic vo()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vq()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vo()V
 
     return-void
 .end method
 
-.method public final bridge synthetic vr()Lcom/google/android/gms/measurement/internal/i;
+.method public final bridge synthetic vp()Lcom/google/android/gms/measurement/internal/i;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vr()Lcom/google/android/gms/measurement/internal/i;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vp()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vs()Lcom/google/android/gms/common/util/e;
+.method public final bridge synthetic vq()Lcom/google/android/gms/common/util/e;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vq()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vt()Landroid/content/Context;
+.method public final bridge synthetic vr()Landroid/content/Context;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vt()Landroid/content/Context;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vr()Landroid/content/Context;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vu()Lcom/google/android/gms/measurement/internal/dt;
+.method public final bridge synthetic vs()Lcom/google/android/gms/measurement/internal/dt;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vu()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vs()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vv()Lcom/google/android/gms/measurement/internal/jm;
+.method public final bridge synthetic vt()Lcom/google/android/gms/measurement/internal/jm;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vv()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vt()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vw()Lcom/google/android/gms/measurement/internal/ev;
+.method public final bridge synthetic vu()Lcom/google/android/gms/measurement/internal/ev;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vx()Lcom/google/android/gms/measurement/internal/dv;
+.method public final bridge synthetic vv()Lcom/google/android/gms/measurement/internal/dv;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vy()Lcom/google/android/gms/measurement/internal/eh;
+.method public final bridge synthetic vw()Lcom/google/android/gms/measurement/internal/eh;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vy()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vw()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vz()Lcom/google/android/gms/measurement/internal/ka;
+.method public final bridge synthetic vx()Lcom/google/android/gms/measurement/internal/ka;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final xA()Z
-    .locals 2
+.method public final bridge synthetic vy()Lcom/google/android/gms/measurement/internal/jz;
+    .locals 1
 
-    :try_start_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vy()Lcom/google/android/gms/measurement/internal/jz;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Landroid/content/Context;->getClassLoader()Ljava/lang/ClassLoader;
-
-    move-result-object v0
-
-    const-string v1, "com.google.firebase.remoteconfig.FirebaseRemoteConfig"
-
-    invoke-virtual {v0, v1}, Ljava/lang/ClassLoader;->loadClass(Ljava/lang/String;)Ljava/lang/Class;
-    :try_end_0
-    .catch Ljava/lang/ClassNotFoundException; {:try_start_0 .. :try_end_0} :catch_0
-
-    const/4 v0, 0x1
-
-    return v0
-
-    :catch_0
-    const/4 v0, 0x0
-
-    return v0
+    return-object v0
 .end method
 
-.method protected final xV()V
+.method protected final xT()V
     .locals 6
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
     new-instance v0, Ljava/security/SecureRandom;
 
@@ -4546,30 +4518,58 @@
 
     if-nez v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()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;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jm;->aIA: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;
+.method public final xy()Z
+    .locals 2
+
+    :try_start_0
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()Landroid/content/Context;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Landroid/content/Context;->getClassLoader()Ljava/lang/ClassLoader;
+
+    move-result-object v0
+
+    const-string v1, "com.google.firebase.remoteconfig.FirebaseRemoteConfig"
+
+    invoke-virtual {v0, v1}, Ljava/lang/ClassLoader;->loadClass(Ljava/lang/String;)Ljava/lang/Class;
+    :try_end_0
+    .catch Ljava/lang/ClassNotFoundException; {:try_start_0 .. :try_end_0} :catch_0
+
+    const/4 v0, 0x1
+
+    return v0
+
+    :catch_0
+    const/4 v0, 0x0
+
+    return v0
+.end method
+
+.method final yQ()Ljava/security/SecureRandom;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jm;->aID:Ljava/security/SecureRandom;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jm;->aIz: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;->aID:Ljava/security/SecureRandom;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/jm;->aIz:Ljava/security/SecureRandom;
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jm;->aID:Ljava/security/SecureRandom;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jm;->aIz:Ljava/security/SecureRandom;
 
     return-object v0
 .end method
 
-.method public final yU()I
+.method public final yS()I
     .locals 3
 
-    invoke-static {}, Lcom/google/android/gms/common/c;->lU()Lcom/google/android/gms/common/c;
+    invoke-static {}, Lcom/google/android/gms/common/c;->lS()Lcom/google/android/gms/common/c;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()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 3e73a75389..ea5773d8fe 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 ane:Ljava/lang/String;
+.field final ana:Ljava/lang/String;
 
-.field final anq:Ljava/lang/String;
+.field final anm:Ljava/lang/String;
 
-.field final asA:Ljava/lang/Object;
+.field final asw:Ljava/lang/Object;
 
-.field final atS:Ljava/lang/String;
+.field final atO: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;->atS:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jn;->atO:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/jn;->ane:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/jn;->ana:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/jn;->anq:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/jn;->anm: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;->asA:Ljava/lang/Object;
+    iput-object p6, p0, Lcom/google/android/gms/measurement/internal/jn;->asw: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 f8a81c36a4..3853792235 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 aIG:Ljavax/net/ssl/SSLSocket;
+.field private final aIC: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;->aIG:Ljavax/net/ssl/SSLSocket;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jo;->aIC: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;->aIG:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIC: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;->aIG:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIC: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;->aIG:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIC: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;->aIG:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIC: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;->aIG:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIC: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;->aIG:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIC: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;->aIG:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIC: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;->aIG:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIC: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;->aIG:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIC: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;->aIG:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIC: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;->aIG:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIC: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;->aIG:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIC: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;->aIG:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIC: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;->aIG:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIC: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;->aIG:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIC: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;->aIG:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIC: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;->aIG:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIC: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;->aIG:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIC: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;->aIG:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIC: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;->aIG:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIC: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;->aIG:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIC: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;->aIG:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIC: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;->aIG:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIC: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;->aIG:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIC: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;->aIG:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIC: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;->aIG:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIC: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;->aIG:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIC: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;->aIG:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIC: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;->aIG:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIC: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;->aIG:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIC: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;->aIG:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIC: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;->aIG:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIC: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;->aIG:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIC: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;->aIG:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIC: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;->aIG:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIC: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;->aIG:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIC: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;->aIG:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIC: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;->aIG:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIC: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;->aIG:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIC: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;->aIG:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIC: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;->aIG:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIC: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;->aIG:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIC: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;->aIG:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIC: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;->aIG:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIC: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;->aIG:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIC: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;->aIG:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIC: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;->aIG:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIC: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;->aIG:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIC: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;->aIG:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIC: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;->aIG:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIC: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;->aIG:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIC: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;->aIG:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIC: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;->aIG:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIC: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;->aIG:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIC: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;->aIG:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIC: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;->aIG:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIC: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;->aIG:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIC: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;->aIG:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIC: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;->aIG:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIC: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;->aIG:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIC: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;->aIG:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIC: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 dcd209fec4..ae6d7da6be 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 aHc:Ljavax/net/ssl/SSLSocketFactory;
+.field private final aGY: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;->aHc:Ljavax/net/ssl/SSLSocketFactory;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jp;->aGY: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;->aHc:Ljavax/net/ssl/SSLSocketFactory;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jp;->aGY: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;->aHc:Ljavax/net/ssl/SSLSocketFactory;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jp;->aGY: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;->aHc:Ljavax/net/ssl/SSLSocketFactory;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jp;->aGY: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;->aHc:Ljavax/net/ssl/SSLSocketFactory;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jp;->aGY: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;->aHc:Ljavax/net/ssl/SSLSocketFactory;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jp;->aGY: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;->aHc:Ljavax/net/ssl/SSLSocketFactory;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jp;->aGY: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;->aHc:Ljavax/net/ssl/SSLSocketFactory;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jp;->aGY: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;->aHc:Ljavax/net/ssl/SSLSocketFactory;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jp;->aGY: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 8ac1732cdc..ed590e81e9 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 aBR:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
+.field private final synthetic aBN:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
 
-.field private final synthetic aGO:Lcom/google/android/gms/internal/measurement/lv;
+.field private final synthetic aGK: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;->aBR:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jq;->aBN:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/jq;->aGO:Lcom/google/android/gms/internal/measurement/lv;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/jq;->aGK: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;->aBR:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jq;->aBN:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yb()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jq;->aGO:Lcom/google/android/gms/internal/measurement/lv;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jq;->aGK:Lcom/google/android/gms/internal/measurement/lv;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/jq;->aBR:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/jq;->aBN:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->yn()Z
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->yl()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 c727beb5c3..fa0191653b 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 pR()Z
+.method protected final pP()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 b304173407..81467342b6 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,15 +4,28 @@
 
 
 # instance fields
-.field private aIK:Lcom/google/android/gms/internal/measurement/ak$a;
+.field private aIG:Lcom/google/android/gms/internal/measurement/ak$a;
 
-.field aIL:Ljava/util/BitSet;
+.field aIH:Ljava/util/BitSet;
 
-.field private aIM:Ljava/util/BitSet;
+.field private aII:Ljava/util/BitSet;
 
-.field private final synthetic aIn:Lcom/google/android/gms/measurement/internal/jr;
+.field private final synthetic aIj:Lcom/google/android/gms/measurement/internal/jr;
 
-.field private atC:Ljava/util/Map;
+.field private atO:Ljava/lang/String;
+
+.field private atV:Ljava/util/Map;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/Map<",
+            "Ljava/lang/Integer;",
+            "Ljava/lang/Long;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private aty:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -24,31 +37,18 @@
     .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;->aIn:Lcom/google/android/gms/measurement/internal/jr;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jt;->aIj: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;->atS:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/jt;->atO:Ljava/lang/String;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$a;->qq()Lcom/google/android/gms/internal/measurement/ak$a$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$a;->qo()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;->tb()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/dw$b;->sZ()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;->aIK:Lcom/google/android/gms/internal/measurement/ak$a;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jt;->aIG: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;->aIL:Ljava/util/BitSet;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jt;->aIH: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;->aIM:Ljava/util/BitSet;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jt;->aII: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;->atZ:Ljava/util/Map;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jt;->atV: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;->atC:Ljava/util/Map;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jt;->aty: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;->pH()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ak$j;->pF()Z
 
     move-result v2
 
     if-eqz v2, :cond_1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ak$j;->rm()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ak$j;->rk()I
 
     move-result v2
 
@@ -176,7 +176,7 @@
 
     move-result-object v2
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ak$j;->rm()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ak$j;->rk()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;->pH()Z
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/ak$j;->pF()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;->sS()Lcom/google/android/gms/internal/measurement/dw$b;
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/dw;->sQ()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;->rq()Lcom/google/android/gms/internal/measurement/ak$j$a;
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/ak$j$a;->ro()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;->tb()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/dw$b;->sZ()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;->ro()Lcom/google/android/gms/internal/measurement/ak$j$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$j;->rm()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;->tb()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/dw$b;->sZ()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object p2
 
@@ -371,7 +371,7 @@
     return-object v0
 .end method
 
-.method private final qy()Ljava/util/List;
+.method private final qw()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;->atZ:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jt;->atV: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;->atZ:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jt;->atV: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;->qt()Lcom/google/android/gms/internal/measurement/ak$b$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$b;->qr()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;->atZ:Ljava/util/Map;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/jt;->atV: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;->tb()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/dw$b;->sZ()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;->aIK:Lcom/google/android/gms/internal/measurement/ak$a;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jt;->aIG:Lcom/google/android/gms/internal/measurement/ak$a;
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$a;->qq()Lcom/google/android/gms/internal/measurement/ak$a$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$a;->qo()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;->sS()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
 
@@ -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;->rh()Lcom/google/android/gms/internal/measurement/ak$i$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$i;->rf()Lcom/google/android/gms/internal/measurement/ak$i$a;
 
     move-result-object p1
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jt;->aIL:Ljava/util/BitSet;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jt;->aIH: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;->aIM:Ljava/util/BitSet;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jt;->aII: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;->qy()Ljava/util/List;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/jt;->qw()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;->atC:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jt;->aty: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;->atC:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jt;->aty: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;->ro()Lcom/google/android/gms/internal/measurement/ak$j$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$j;->rm()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;->atC:Ljava/util/Map;
+    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/jt;->aty: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;->tb()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/dw$b;->sZ()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;->pH()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ak$a$a;->pF()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;->aIn:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/jt;->aIj:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/jt;->atS:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/jt;->atO:Ljava/lang/String;
 
-    sget-object v4, Lcom/google/android/gms/measurement/internal/o;->aDV:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v4, Lcom/google/android/gms/measurement/internal/o;->aDR: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;->qs()Lcom/google/android/gms/internal/measurement/ak$i;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ak$a$a;->qq()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;->tb()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dw$b;->sZ()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;->aIL:Ljava/util/BitSet;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/jt;->aIH:Ljava/util/BitSet;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/jt;->aIM:Ljava/util/BitSet;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/jt;->aII:Ljava/util/BitSet;
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/jt;->atZ:Ljava/util/Map;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/jt;->atV:Ljava/util/Map;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$i;->rh()Lcom/google/android/gms/internal/measurement/ak$i$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$i;->rf()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;->qy()Ljava/util/List;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/jt;->qw()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;->qq()Lcom/google/android/gms/internal/measurement/ak$a$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$a;->qo()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;->tb()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/dw$b;->sZ()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;->aIK:Lcom/google/android/gms/internal/measurement/ak$a;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jt;->aIG: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;->pJ()I
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/jy;->pH()I
 
     move-result v0
 
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/jy;->aCi:Ljava/lang/Boolean;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/jy;->aCe:Ljava/lang/Boolean;
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jt;->aIM:Ljava/util/BitSet;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jt;->aII:Ljava/util/BitSet;
 
-    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/jy;->aCi:Ljava/lang/Boolean;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/jy;->aCe: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;->aIS:Ljava/lang/Boolean;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/jy;->aIO:Ljava/lang/Boolean;
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jt;->aIL:Ljava/util/BitSet;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jt;->aIH:Ljava/util/BitSet;
 
-    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/jy;->aIS:Ljava/lang/Boolean;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/jy;->aIO: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;->aIT:Ljava/lang/Long;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/jy;->aIP:Ljava/lang/Long;
 
     const-wide/16 v2, 0x3e8
 
     if-eqz v1, :cond_3
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jt;->atZ:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jt;->atV: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;->aIT:Ljava/lang/Long;
+    iget-object v4, p1, Lcom/google/android/gms/measurement/internal/jy;->aIP: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;->atZ:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jt;->atV: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;->aIU:Ljava/lang/Long;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/jy;->aIQ:Ljava/lang/Long;
 
     if-eqz v1, :cond_5
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jt;->atC:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jt;->aty: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;->atC:Ljava/util/Map;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/jt;->aty: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;->aIU:Ljava/lang/Long;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/jy;->aIQ: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 d52529f71e..77a14acfe4 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 anC:[I
+.field static final synthetic any:[I
 
-.field static final synthetic atf:[I
+.field static final synthetic atb:[I
 
 
 # direct methods
@@ -21,14 +21,14 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/ju;->anC:[I
+    sput-object v0, Lcom/google/android/gms/measurement/internal/ju;->any:[I
 
     const/4 v0, 0x1
 
     :try_start_0
-    sget-object v1, Lcom/google/android/gms/measurement/internal/ju;->anC:[I
+    sget-object v1, Lcom/google/android/gms/measurement/internal/ju;->any:[I
 
-    sget-object v2, Lcom/google/android/gms/internal/measurement/ac$d$a;->asQ:Lcom/google/android/gms/internal/measurement/ac$d$a;
+    sget-object v2, Lcom/google/android/gms/internal/measurement/ac$d$a;->asM: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;->anC:[I
+    sget-object v2, Lcom/google/android/gms/measurement/internal/ju;->any:[I
 
-    sget-object v3, Lcom/google/android/gms/internal/measurement/ac$d$a;->asR:Lcom/google/android/gms/internal/measurement/ac$d$a;
+    sget-object v3, Lcom/google/android/gms/internal/measurement/ac$d$a;->asN: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;->anC:[I
+    sget-object v3, Lcom/google/android/gms/measurement/internal/ju;->any:[I
 
-    sget-object v4, Lcom/google/android/gms/internal/measurement/ac$d$a;->asS:Lcom/google/android/gms/internal/measurement/ac$d$a;
+    sget-object v4, Lcom/google/android/gms/internal/measurement/ac$d$a;->asO: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;->anC:[I
+    sget-object v4, Lcom/google/android/gms/measurement/internal/ju;->any:[I
 
-    sget-object v5, Lcom/google/android/gms/internal/measurement/ac$d$a;->asT:Lcom/google/android/gms/internal/measurement/ac$d$a;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/ac$d$a;->asP: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;->atf:[I
+    sput-object v4, Lcom/google/android/gms/measurement/internal/ju;->atb:[I
 
     :try_start_4
-    sget-object v4, Lcom/google/android/gms/measurement/internal/ju;->atf:[I
+    sget-object v4, Lcom/google/android/gms/measurement/internal/ju;->atb:[I
 
-    sget-object v5, Lcom/google/android/gms/internal/measurement/ac$f$b;->asX:Lcom/google/android/gms/internal/measurement/ac$f$b;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/ac$f$b;->asT: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;->atf:[I
+    sget-object v0, Lcom/google/android/gms/measurement/internal/ju;->atb:[I
 
-    sget-object v4, Lcom/google/android/gms/internal/measurement/ac$f$b;->asY:Lcom/google/android/gms/internal/measurement/ac$f$b;
+    sget-object v4, Lcom/google/android/gms/internal/measurement/ac$f$b;->asU: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;->atf:[I
+    sget-object v0, Lcom/google/android/gms/measurement/internal/ju;->atb:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ac$f$b;->asZ:Lcom/google/android/gms/internal/measurement/ac$f$b;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ac$f$b;->asV: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;->atf:[I
+    sget-object v0, Lcom/google/android/gms/measurement/internal/ju;->atb:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ac$f$b;->ata:Lcom/google/android/gms/internal/measurement/ac$f$b;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ac$f$b;->asW: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;->atf:[I
+    sget-object v0, Lcom/google/android/gms/measurement/internal/ju;->atb:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ac$f$b;->atb: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;
 
     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;->atf:[I
+    sget-object v0, Lcom/google/android/gms/measurement/internal/ju;->atb:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ac$f$b;->atc: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;
 
     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 804134aaf1..4be7d9ee52 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 aIN:Lcom/google/android/gms/internal/measurement/ac$b;
+.field private aIJ:Lcom/google/android/gms/internal/measurement/ac$b;
 
-.field private final synthetic aIO:Lcom/google/android/gms/measurement/internal/jr;
+.field private final synthetic aIK: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;->aIO:Lcom/google/android/gms/measurement/internal/jr;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jv;->aIK: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;->aIN:Lcom/google/android/gms/internal/measurement/ac$b;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/jv;->aIJ: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;->aIO:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jv;->aIK:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jv;->atS:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jv;->atO:Ljava/lang/String;
 
-    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;->aDK: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;->aIO:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jv;->aIK:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/jv;->atS:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/jv;->atO:Ljava/lang/String;
 
-    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;->aDL: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;->aIN:Lcom/google/android/gms/internal/measurement/ac$b;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jv;->aIJ: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;->aIO:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object p6, p0, Lcom/google/android/gms/measurement/internal/jv;->aIK:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {p6}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p6}, Lcom/google/android/gms/measurement/internal/fu;->vv()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;->aIO:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object p6, p0, Lcom/google/android/gms/measurement/internal/jv;->aIK:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {p6}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p6}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p6
 
-    iget-object p6, p6, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p6, p6, Lcom/google/android/gms/measurement/internal/dv;->aEE:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget v2, p0, Lcom/google/android/gms/measurement/internal/jv;->anu:I
+    iget v2, p0, Lcom/google/android/gms/measurement/internal/jv;->anq: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;->aIN:Lcom/google/android/gms/internal/measurement/ac$b;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/jv;->aIJ:Lcom/google/android/gms/internal/measurement/ac$b;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/ac$b;->pH()Z
+    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/ac$b;->pF()Z
 
     move-result v3
 
     if-eqz v3, :cond_1
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/jv;->aIN:Lcom/google/android/gms/internal/measurement/ac$b;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/jv;->aIJ: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;->aIO:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/jv;->aIK:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v4
 
-    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/jv;->aIN:Lcom/google/android/gms/internal/measurement/ac$b;
+    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/jv;->aIJ: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;->aIO:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object p6, p0, Lcom/google/android/gms/measurement/internal/jv;->aIK:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {p6}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p6}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p6
 
-    iget-object p6, p6, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p6, p6, Lcom/google/android/gms/measurement/internal/dv;->aEE:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/jv;->aIO:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/jv;->aIK:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/jd;->xR()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/jd;->xP()Lcom/google/android/gms/measurement/internal/jj;
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/jv;->aIN:Lcom/google/android/gms/internal/measurement/ac$b;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/jv;->aIJ: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;->aIN:Lcom/google/android/gms/internal/measurement/ac$b;
+    iget-object p6, p0, Lcom/google/android/gms/measurement/internal/jv;->aIJ:Lcom/google/android/gms/internal/measurement/ac$b;
 
-    invoke-virtual {p6}, Lcom/google/android/gms/internal/measurement/ac$b;->pH()Z
+    invoke-virtual {p6}, Lcom/google/android/gms/internal/measurement/ac$b;->pF()Z
 
     move-result p6
 
@@ -185,7 +185,7 @@
 
     if-eqz p6, :cond_2b
 
-    iget-object p6, p0, Lcom/google/android/gms/measurement/internal/jv;->aIN:Lcom/google/android/gms/internal/measurement/ac$b;
+    iget-object p6, p0, Lcom/google/android/gms/measurement/internal/jv;->aIJ: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;->aIN:Lcom/google/android/gms/internal/measurement/ac$b;
+    iget-object p6, p0, Lcom/google/android/gms/measurement/internal/jv;->aIJ: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;->aIN:Lcom/google/android/gms/internal/measurement/ac$b;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/jv;->aIJ: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;->aIN:Lcom/google/android/gms/internal/measurement/ac$b;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jv;->aIJ: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;->aIO:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/jv;->aIK:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEE:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget p2, p0, Lcom/google/android/gms/measurement/internal/jv;->anu:I
+    iget p2, p0, Lcom/google/android/gms/measurement/internal/jv;->anq: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;->aIN:Lcom/google/android/gms/internal/measurement/ac$b;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/jv;->aIJ:Lcom/google/android/gms/internal/measurement/ac$b;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/ac$b;->pH()Z
+    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/ac$b;->pF()Z
 
     move-result p3
 
     if-eqz p3, :cond_7
 
-    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/jv;->aIN:Lcom/google/android/gms/internal/measurement/ac$b;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/jv;->aIJ: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;->aIN:Lcom/google/android/gms/internal/measurement/ac$b;
+    iget-object p7, p0, Lcom/google/android/gms/measurement/internal/jv;->aIJ: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;->pL()Lcom/google/android/gms/internal/measurement/ac$d;
+    invoke-virtual {p7}, Lcom/google/android/gms/internal/measurement/ac$b;->pJ()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;->aIO:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/jv;->aIK:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p3
 
-    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-object p4, p0, Lcom/google/android/gms/measurement/internal/jv;->aIO:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object p4, p0, Lcom/google/android/gms/measurement/internal/jv;->aIK:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/fu;->vs()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;->qg()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ak$e;->qe()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;->qg()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ak$e;->qe()Z
 
     move-result v6
 
@@ -448,7 +448,7 @@
     goto :goto_6
 
     :cond_10
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ak$e;->qE()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ak$e;->qC()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;->qE()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ak$e;->qC()Z
 
     move-result v6
 
@@ -494,17 +494,17 @@
     goto :goto_6
 
     :cond_13
-    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/jv;->aIO:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/jv;->aIK:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p3
 
-    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-object p4, p0, Lcom/google/android/gms/measurement/internal/jv;->aIO:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object p4, p0, Lcom/google/android/gms/measurement/internal/jv;->aIK:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/fu;->vs()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;->aIO:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object p4, p0, Lcom/google/android/gms/measurement/internal/jv;->aIK:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/fu;->vs()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;->pR()Z
+    invoke-virtual {p4}, Lcom/google/android/gms/internal/measurement/ac$c;->pP()Z
 
     move-result p7
 
@@ -576,17 +576,17 @@
 
     if-eqz v5, :cond_17
 
-    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/jv;->aIO:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/jv;->aIK:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p3
 
-    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-object p4, p0, Lcom/google/android/gms/measurement/internal/jv;->aIO:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object p4, p0, Lcom/google/android/gms/measurement/internal/jv;->aIK:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/fu;->vs()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;->nO()Z
+    invoke-virtual {p4}, Lcom/google/android/gms/internal/measurement/ac$c;->nM()Z
 
     move-result v6
 
     if-nez v6, :cond_18
 
-    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/jv;->aIO:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/jv;->aIK:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p3
 
-    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-object p4, p0, Lcom/google/android/gms/measurement/internal/jv;->aIO:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object p4, p0, Lcom/google/android/gms/measurement/internal/jv;->aIK:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/fu;->vs()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;->aIO:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object p4, p0, Lcom/google/android/gms/measurement/internal/jv;->aIK:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/fu;->vs()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;->pQ()Lcom/google/android/gms/internal/measurement/ac$d;
+    invoke-virtual {p4}, Lcom/google/android/gms/internal/measurement/ac$c;->pO()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;->nO()Z
+    invoke-virtual {p4}, Lcom/google/android/gms/internal/measurement/ac$c;->nM()Z
 
     move-result v6
 
     if-nez v6, :cond_1b
 
-    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/jv;->aIO:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/jv;->aIK:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p3
 
-    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-object p4, p0, Lcom/google/android/gms/measurement/internal/jv;->aIO:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object p4, p0, Lcom/google/android/gms/measurement/internal/jv;->aIK:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/fu;->vs()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;->aIO:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object p4, p0, Lcom/google/android/gms/measurement/internal/jv;->aIK:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/fu;->vs()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;->pQ()Lcom/google/android/gms/internal/measurement/ac$d;
+    invoke-virtual {p4}, Lcom/google/android/gms/internal/measurement/ac$c;->pO()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;->pH()Z
+    invoke-virtual {p4}, Lcom/google/android/gms/internal/measurement/ac$c;->pF()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;->pP()Lcom/google/android/gms/internal/measurement/ac$f;
+    invoke-virtual {p4}, Lcom/google/android/gms/internal/measurement/ac$c;->pN()Lcom/google/android/gms/internal/measurement/ac$f;
 
     move-result-object p4
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jv;->aIO:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jv;->aIK:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()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;->nO()Z
+    invoke-virtual {p4}, Lcom/google/android/gms/internal/measurement/ac$c;->nM()Z
 
     move-result v6
 
@@ -798,7 +798,7 @@
 
     if-eqz v6, :cond_20
 
-    invoke-virtual {p4}, Lcom/google/android/gms/internal/measurement/ac$c;->pQ()Lcom/google/android/gms/internal/measurement/ac$d;
+    invoke-virtual {p4}, Lcom/google/android/gms/internal/measurement/ac$c;->pO()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;->aIO:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/jv;->aIK:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p3
 
-    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-object p4, p0, Lcom/google/android/gms/measurement/internal/jv;->aIO:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object p4, p0, Lcom/google/android/gms/measurement/internal/jv;->aIK:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/fu;->vs()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;->aIO:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object p4, p0, Lcom/google/android/gms/measurement/internal/jv;->aIK:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/fu;->vs()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;->aIO:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/jv;->aIK:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p3
 
-    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-object p4, p0, Lcom/google/android/gms/measurement/internal/jv;->aIO:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object p4, p0, Lcom/google/android/gms/measurement/internal/jv;->aIK:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/fu;->vs()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;->aIO:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object p4, p0, Lcom/google/android/gms/measurement/internal/jv;->aIK:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/fu;->vs()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;->aIO:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/jv;->aIK:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p3
 
-    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aEE:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-object p4, p0, Lcom/google/android/gms/measurement/internal/jv;->aIO:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object p4, p0, Lcom/google/android/gms/measurement/internal/jv;->aIK:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/fu;->vs()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;->aIO:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object p4, p0, Lcom/google/android/gms/measurement/internal/jv;->aIK:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/fu;->vs()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;->aIO:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/jv;->aIK:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p3
 
-    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-object p4, p0, Lcom/google/android/gms/measurement/internal/jv;->aIO:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object p4, p0, Lcom/google/android/gms/measurement/internal/jv;->aIK:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/fu;->vs()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;->aIO:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object p4, p0, Lcom/google/android/gms/measurement/internal/jv;->aIK:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/fu;->vs()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;->aIO:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jv;->aIK:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->aCi:Ljava/lang/Boolean;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/jv;->aCe: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;->aIS:Ljava/lang/Boolean;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/jv;->aIO:Ljava/lang/Boolean;
 
     if-eqz p6, :cond_2a
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ak$c;->qg()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ak$c;->qe()Z
 
     move-result p2
 
@@ -1033,7 +1033,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jv;->aIU:Ljava/lang/Long;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jv;->aIQ: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;->aIT:Ljava/lang/Long;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jv;->aIP: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;->aIO:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/jv;->aIK:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jv;->atS:Ljava/lang/String;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jv;->atO: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;->aIN:Lcom/google/android/gms/internal/measurement/ac$b;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/jv;->aIJ:Lcom/google/android/gms/internal/measurement/ac$b;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/ac$b;->pH()Z
+    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/ac$b;->pF()Z
 
     move-result p3
 
     if-eqz p3, :cond_2c
 
-    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/jv;->aIN:Lcom/google/android/gms/internal/measurement/ac$b;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/jv;->aIJ: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 pJ()I
+.method final pH()I
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jv;->aIN:Lcom/google/android/gms/internal/measurement/ac$b;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jv;->aIJ: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 95574f2ed9..6517b4a469 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 aIP:Ljava/util/Set;
+.field private aIL:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -14,11 +14,11 @@
     .end annotation
 .end field
 
-.field private final synthetic aIQ:Lcom/google/android/gms/measurement/internal/jr;
+.field private final synthetic aIM:Lcom/google/android/gms/measurement/internal/jr;
 
-.field private atS:Ljava/lang/String;
+.field private atO:Ljava/lang/String;
 
-.field private axd:Ljava/util/Map;
+.field private awZ: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;->aIQ:Lcom/google/android/gms/measurement/internal/jr;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jw;->aIM: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;->aIP:Ljava/util/Set;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jw;->aIL: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;->axd:Ljava/util/Map;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jw;->awZ:Ljava/util/Map;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/jw;->atS:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/jw;->atO: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;->axd:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jw;->awZ: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;->axd:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jw;->awZ: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;->aIL:Ljava/util/BitSet;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/jt;->aIH: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;->axd:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jw;->awZ: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;->axd:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jw;->awZ: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;->aIQ:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jw;->aIM:Lcom/google/android/gms/measurement/internal/jr;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/jw;->atS:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/jw;->atO: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;->axd:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jw;->awZ: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;->aIQ:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/jw;->aIM:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
-    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/jw;->atS:Ljava/lang/String;
+    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/jw;->atO:Ljava/lang/String;
 
-    sget-object v3, Lcom/google/android/gms/measurement/internal/o;->aDO:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v3, Lcom/google/android/gms/measurement/internal/o;->aDK: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;->aIQ:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/jw;->aIM:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
-    iget-object v4, v1, Lcom/google/android/gms/measurement/internal/jw;->atS:Ljava/lang/String;
+    iget-object v4, v1, Lcom/google/android/gms/measurement/internal/jw;->atO:Ljava/lang/String;
 
-    sget-object v5, Lcom/google/android/gms/measurement/internal/o;->aDP:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v5, Lcom/google/android/gms/measurement/internal/o;->aDL: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;->aIQ:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/jw;->aIM:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
-    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/jw;->atS:Ljava/lang/String;
+    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/jw;->atO:Ljava/lang/String;
 
-    sget-object v6, Lcom/google/android/gms/measurement/internal/o;->aDO:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v6, Lcom/google/android/gms/measurement/internal/o;->aDK: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;->aIQ:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/jw;->aIM:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
-    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/jw;->atS:Ljava/lang/String;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/jw;->atO:Ljava/lang/String;
 
-    sget-object v7, Lcom/google/android/gms/measurement/internal/o;->aDP:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v7, Lcom/google/android/gms/measurement/internal/o;->aDL: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;->aIQ:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/jw;->aIM:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jd;->xT()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jd;->xR()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v6
 
-    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jw;->atS:Ljava/lang/String;
+    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jw;->atO:Ljava/lang/String;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/jb;->yG()V
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/fu;->vo()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;->uZ()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/d;->uX()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v6
 
-    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->aIQ:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/jw;->aIM:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jd;->xT()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jd;->xR()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v0
 
-    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/jw;->atS:Ljava/lang/String;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/jw;->atO: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;->aIQ:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v8, v1, Lcom/google/android/gms/measurement/internal/jw;->aIM:Lcom/google/android/gms/measurement/internal/jr;
 
-    iget-object v9, v1, Lcom/google/android/gms/measurement/internal/jw;->atS:Ljava/lang/String;
+    iget-object v9, v1, Lcom/google/android/gms/measurement/internal/jw;->atO: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;->xT()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {v8}, Lcom/google/android/gms/measurement/internal/jd;->xR()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;->xR()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual {v8}, Lcom/google/android/gms/measurement/internal/jd;->xP()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;->sS()Lcom/google/android/gms/internal/measurement/dw$b;
+    invoke-virtual {v13}, Lcom/google/android/gms/internal/measurement/dw;->sQ()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;->rl()Lcom/google/android/gms/internal/measurement/ak$i$a;
+    invoke-virtual {v15}, Lcom/google/android/gms/internal/measurement/ak$i$a;->rj()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;->xR()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual {v8}, Lcom/google/android/gms/measurement/internal/jd;->xP()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;->rk()Lcom/google/android/gms/internal/measurement/ak$i$a;
+    invoke-virtual {v6}, Lcom/google/android/gms/internal/measurement/ak$i$a;->ri()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;->rf()I
+    invoke-virtual {v13}, Lcom/google/android/gms/internal/measurement/ak$i;->rd()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;->qc()I
+    invoke-virtual {v13}, Lcom/google/android/gms/internal/measurement/ak$i;->qa()I
 
     move-result v15
 
@@ -582,7 +582,7 @@
 
     move-result-object v3
 
-    invoke-virtual {v6}, Lcom/google/android/gms/internal/measurement/dw$b;->tb()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v6}, Lcom/google/android/gms/internal/measurement/dw$b;->sZ()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;->rf()I
+    invoke-virtual {v7}, Lcom/google/android/gms/internal/measurement/ak$i;->rd()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;->pH()Z
+    invoke-virtual {v13}, Lcom/google/android/gms/internal/measurement/ak$b;->pF()Z
 
     move-result v14
 
@@ -696,7 +696,7 @@
 
     move-result-object v14
 
-    invoke-virtual {v13}, Lcom/google/android/gms/internal/measurement/ak$b;->nO()Z
+    invoke-virtual {v13}, Lcom/google/android/gms/internal/measurement/ak$b;->nM()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;->pK()I
+    invoke-virtual {v7}, Lcom/google/android/gms/internal/measurement/ak$i;->pI()I
 
     move-result v3
 
@@ -757,13 +757,13 @@
 
     if-eqz v3, :cond_12
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jw;->aIQ:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jw;->aIM:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->aIQ:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v14, v1, Lcom/google/android/gms/measurement/internal/jw;->aIM:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v14}, Lcom/google/android/gms/measurement/internal/jd;->xR()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual {v14}, Lcom/google/android/gms/measurement/internal/jd;->xP()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;->aIQ:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/jw;->aIM:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/jd;->xR()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/jd;->xP()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;->aIQ:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/jw;->aIM:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v6
 
-    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->aIQ:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jw;->aIM:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/jd;->xT()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/jd;->xR()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v7
 
-    iget-object v12, v1, Lcom/google/android/gms/measurement/internal/jw;->atS:Ljava/lang/String;
+    iget-object v12, v1, Lcom/google/android/gms/measurement/internal/jw;->atO: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;->aIQ:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jw;->aIM:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/jd;->xR()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/jd;->xP()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;->aIQ:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/jw;->aIM:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jd;->xT()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jd;->xR()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v12
 
-    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/jw;->atS:Ljava/lang/String;
+    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/jw;->atO:Ljava/lang/String;
 
-    invoke-virtual {v12}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v12}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
-    invoke-virtual {v12}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v12}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v14
 
-    iget-object v14, v14, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v14, v14, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->uZ()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {v12}, Lcom/google/android/gms/measurement/internal/d;->uX()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v12}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v8
 
-    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->aIQ:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/jw;->aIM:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jd;->xT()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jd;->xR()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v18
 
-    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/jw;->atS:Ljava/lang/String;
+    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/jw;->atO: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;->aIQ:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v14, v1, Lcom/google/android/gms/measurement/internal/jw;->aIM:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v14}, Lcom/google/android/gms/measurement/internal/jd;->xR()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual {v14}, Lcom/google/android/gms/measurement/internal/jd;->xP()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;->aIQ:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/jw;->aIM:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()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;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->aIQ:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jw;->aIM:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v7
 
-    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->aIQ:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/jw;->aIM:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jd;->xR()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jd;->xP()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;->aIQ:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/jw;->aIM:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()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;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->aIQ:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/jw;->aIM:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jd;->xT()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jd;->xR()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v17
 
-    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/jw;->atS:Ljava/lang/String;
+    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/jw;->atO: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;->aIQ:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v14, v1, Lcom/google/android/gms/measurement/internal/jw;->aIM:Lcom/google/android/gms/measurement/internal/jr;
 
-    iget-object v15, v1, Lcom/google/android/gms/measurement/internal/jw;->atS:Ljava/lang/String;
+    iget-object v15, v1, Lcom/google/android/gms/measurement/internal/jw;->atO:Ljava/lang/String;
 
-    invoke-virtual {v14}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v14}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v5
 
-    sget-object v6, Lcom/google/android/gms/measurement/internal/o;->aDP:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v6, Lcom/google/android/gms/measurement/internal/o;->aDL: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;->xT()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {v14}, Lcom/google/android/gms/measurement/internal/jd;->xR()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v14}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v6
 
-    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->vu()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {v14}, Lcom/google/android/gms/measurement/internal/fu;->vs()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;->atS:Ljava/lang/String;
+    iget-object v5, v6, Lcom/google/android/gms/measurement/internal/k;->atO:Ljava/lang/String;
 
     move-object/from16 v29, v5
 
-    iget-object v5, v6, Lcom/google/android/gms/measurement/internal/k;->ane:Ljava/lang/String;
+    iget-object v5, v6, Lcom/google/android/gms/measurement/internal/k;->ana:Ljava/lang/String;
 
     move-object/from16 v30, v5
 
-    iget-wide v14, v6, Lcom/google/android/gms/measurement/internal/k;->aBU:J
+    iget-wide v14, v6, Lcom/google/android/gms/measurement/internal/k;->aBQ: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;->aCm:Ljava/lang/Long;
+    iget-object v5, v6, Lcom/google/android/gms/measurement/internal/k;->aCi:Ljava/lang/Long;
 
     move-object/from16 v41, v5
 
-    iget-object v5, v6, Lcom/google/android/gms/measurement/internal/k;->aCn:Ljava/lang/Long;
+    iget-object v5, v6, Lcom/google/android/gms/measurement/internal/k;->aCj:Ljava/lang/Long;
 
     move-object/from16 v42, v5
 
-    iget-object v5, v6, Lcom/google/android/gms/measurement/internal/k;->aCo:Ljava/lang/Long;
+    iget-object v5, v6, Lcom/google/android/gms/measurement/internal/k;->aCk:Ljava/lang/Long;
 
     move-object/from16 v43, v5
 
-    iget-object v5, v6, Lcom/google/android/gms/measurement/internal/k;->azM:Ljava/lang/Boolean;
+    iget-object v5, v6, Lcom/google/android/gms/measurement/internal/k;->azI: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;->atS:Ljava/lang/String;
+    iget-object v5, v6, Lcom/google/android/gms/measurement/internal/k;->atO:Ljava/lang/String;
 
     move-object/from16 v47, v5
 
-    iget-object v5, v6, Lcom/google/android/gms/measurement/internal/k;->ane:Ljava/lang/String;
+    iget-object v5, v6, Lcom/google/android/gms/measurement/internal/k;->ana:Ljava/lang/String;
 
     move-object/from16 v48, v5
 
-    iget-wide v14, v6, Lcom/google/android/gms/measurement/internal/k;->aBU:J
+    iget-wide v14, v6, Lcom/google/android/gms/measurement/internal/k;->aBQ: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;->aCm:Ljava/lang/Long;
+    iget-object v5, v6, Lcom/google/android/gms/measurement/internal/k;->aCi:Ljava/lang/Long;
 
     move-object/from16 v59, v5
 
-    iget-object v5, v6, Lcom/google/android/gms/measurement/internal/k;->aCn:Ljava/lang/Long;
+    iget-object v5, v6, Lcom/google/android/gms/measurement/internal/k;->aCj:Ljava/lang/Long;
 
     move-object/from16 v60, v5
 
-    iget-object v5, v6, Lcom/google/android/gms/measurement/internal/k;->aCo:Ljava/lang/Long;
+    iget-object v5, v6, Lcom/google/android/gms/measurement/internal/k;->aCk:Ljava/lang/Long;
 
     move-object/from16 v61, v5
 
-    iget-object v5, v6, Lcom/google/android/gms/measurement/internal/k;->azM:Ljava/lang/Boolean;
+    iget-object v5, v6, Lcom/google/android/gms/measurement/internal/k;->azI: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;->aIQ:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/jw;->aIM:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/jd;->xT()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/jd;->xR()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;->aBU:J
+    iget-wide v5, v0, Lcom/google/android/gms/measurement/internal/k;->aBQ: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;->aIQ:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jw;->aIM:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/jd;->xT()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/jd;->xR()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v7
 
-    iget-object v14, v1, Lcom/google/android/gms/measurement/internal/jw;->atS:Ljava/lang/String;
+    iget-object v14, v1, Lcom/google/android/gms/measurement/internal/jw;->atO: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;->aIP:Ljava/util/Set;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jw;->aIL: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;->aIQ:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jw;->aIM:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->aIQ:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jw;->aIM:Lcom/google/android/gms/measurement/internal/jr;
 
     move-wide/from16 v29, v9
 
-    iget-object v9, v1, Lcom/google/android/gms/measurement/internal/jw;->atS:Ljava/lang/String;
+    iget-object v9, v1, Lcom/google/android/gms/measurement/internal/jw;->atO: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;->aIP:Ljava/util/Set;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jw;->aIL: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;->aIQ:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v8, v1, Lcom/google/android/gms/measurement/internal/jw;->aIM:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v8}, Lcom/google/android/gms/measurement/internal/jd;->xT()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {v8}, Lcom/google/android/gms/measurement/internal/jd;->xR()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v8
 
-    iget-object v9, v1, Lcom/google/android/gms/measurement/internal/jw;->atS:Ljava/lang/String;
+    iget-object v9, v1, Lcom/google/android/gms/measurement/internal/jw;->atO: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;->aIP:Ljava/util/Set;
+    iget-object v10, v1, Lcom/google/android/gms/measurement/internal/jw;->aIL: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;->aIQ:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/jw;->aIM:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v6
 
-    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->aIQ:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v12, v1, Lcom/google/android/gms/measurement/internal/jw;->aIM:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v12}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v12}, Lcom/google/android/gms/measurement/internal/fu;->vv()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;->aIQ:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v12, v1, Lcom/google/android/gms/measurement/internal/jw;->aIM:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v12}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v12}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v12
 
-    iget-object v12, v12, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v12, v12, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->pH()Z
+    invoke-virtual {v11}, Lcom/google/android/gms/internal/measurement/ac$e;->pF()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;->aIQ:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v15, v1, Lcom/google/android/gms/measurement/internal/jw;->aIM:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fu;->vs()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;->aIQ:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/jw;->aIM:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEE:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-object v12, v1, Lcom/google/android/gms/measurement/internal/jw;->aIQ:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v12, v1, Lcom/google/android/gms/measurement/internal/jw;->aIM:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v12}, Lcom/google/android/gms/measurement/internal/jd;->xR()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual {v12}, Lcom/google/android/gms/measurement/internal/jd;->xP()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;->pH()Z
+    invoke-virtual {v11}, Lcom/google/android/gms/internal/measurement/ac$e;->pF()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;->aIQ:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v12, v1, Lcom/google/android/gms/measurement/internal/jw;->aIM:Lcom/google/android/gms/measurement/internal/jr;
 
-    iget-object v13, v1, Lcom/google/android/gms/measurement/internal/jw;->atS:Ljava/lang/String;
+    iget-object v13, v1, Lcom/google/android/gms/measurement/internal/jw;->atO: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;->aIQ:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/jw;->aIM:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-object v10, v1, Lcom/google/android/gms/measurement/internal/jw;->atS:Ljava/lang/String;
+    iget-object v10, v1, Lcom/google/android/gms/measurement/internal/jw;->atO: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;->pH()Z
+    invoke-virtual {v11}, Lcom/google/android/gms/internal/measurement/ac$e;->pF()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;->aIP:Ljava/util/Set;
+    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/jw;->aIL: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;->aIQ:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/jw;->aIM:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v2
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jw;->atS:Ljava/lang/String;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jw;->atO:Ljava/lang/String;
 
-    sget-object v5, Lcom/google/android/gms/measurement/internal/o;->aDU:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v5, Lcom/google/android/gms/measurement/internal/o;->aDQ: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;->aIQ:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/jw;->aIM:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/jd;->xT()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/jd;->xR()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v2
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jw;->atS:Ljava/lang/String;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jw;->atO: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;->axd:Ljava/util/Map;
+    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/jw;->awZ: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;->aIP:Ljava/util/Set;
+    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/jw;->aIL: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;->axd:Ljava/util/Map;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/jw;->awZ: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;->aIQ:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jw;->aIM:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/jd;->xT()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/jd;->xR()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v7
 
-    iget-object v8, v1, Lcom/google/android/gms/measurement/internal/jw;->atS:Ljava/lang/String;
+    iget-object v8, v1, Lcom/google/android/gms/measurement/internal/jw;->atO:Ljava/lang/String;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/internal/measurement/ak$a;->qo()Lcom/google/android/gms/internal/measurement/ak$i;
+    invoke-virtual {v6}, Lcom/google/android/gms/internal/measurement/ak$a;->qm()Lcom/google/android/gms/internal/measurement/ak$i;
 
     move-result-object v6
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/jb;->yG()V
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/fu;->vo()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;->rJ()[B
+    invoke-virtual {v6}, Lcom/google/android/gms/internal/measurement/cf;->rH()[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;->uZ()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/d;->uX()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v6
 
-    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/dv;->aEw: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 c0340ae2f3..31242c9a83 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 aIO:Lcom/google/android/gms/measurement/internal/jr;
+.field private final synthetic aIK:Lcom/google/android/gms/measurement/internal/jr;
 
-.field private aIR:Lcom/google/android/gms/internal/measurement/ac$e;
+.field private aIN: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;->aIO:Lcom/google/android/gms/measurement/internal/jr;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jx;->aIK: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;->aIR:Lcom/google/android/gms/internal/measurement/ac$e;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/jx;->aIN: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;->aIO:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jx;->aIK:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jx;->atS:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jx;->atO:Ljava/lang/String;
 
-    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;->aDK: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;->aIO:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jx;->aIK:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/jx;->atS:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/jx;->atO:Ljava/lang/String;
 
-    sget-object v3, Lcom/google/android/gms/measurement/internal/o;->aDU:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v3, Lcom/google/android/gms/measurement/internal/o;->aDQ: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;->aIR:Lcom/google/android/gms/internal/measurement/ac$e;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/jx;->aIN: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;->aIR:Lcom/google/android/gms/internal/measurement/ac$e;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/jx;->aIN: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;->aIR:Lcom/google/android/gms/internal/measurement/ac$e;
+    iget-object v6, p0, Lcom/google/android/gms/measurement/internal/jx;->aIN: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;->aIO:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/jx;->aIK:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEE:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget p2, p0, Lcom/google/android/gms/measurement/internal/jx;->anu:I
+    iget p2, p0, Lcom/google/android/gms/measurement/internal/jx;->anq: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;->aIR:Lcom/google/android/gms/internal/measurement/ac$e;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/jx;->aIN:Lcom/google/android/gms/internal/measurement/ac$e;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/ac$e;->pH()Z
+    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/ac$e;->pF()Z
 
     move-result p3
 
     if-eqz p3, :cond_3
 
-    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/jx;->aIR:Lcom/google/android/gms/internal/measurement/ac$e;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/jx;->aIN: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;->aIR:Lcom/google/android/gms/internal/measurement/ac$e;
+    iget-object v8, p0, Lcom/google/android/gms/measurement/internal/jx;->aIN:Lcom/google/android/gms/internal/measurement/ac$e;
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ac$e;->pY()Lcom/google/android/gms/internal/measurement/ac$c;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ac$e;->pW()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;->qE()Z
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/ak$k;->qC()Z
 
     move-result v10
 
     if-eqz v10, :cond_6
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ac$c;->nO()Z
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ac$c;->nM()Z
 
     move-result v10
 
     if-nez v10, :cond_5
 
-    iget-object v8, p0, Lcom/google/android/gms/measurement/internal/jx;->aIO:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v8, p0, Lcom/google/android/gms/measurement/internal/jx;->aIK:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v8}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v8}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v8
 
-    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-object v9, p0, Lcom/google/android/gms/measurement/internal/jx;->aIO:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v9, p0, Lcom/google/android/gms/measurement/internal/jx;->aIK:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v9}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {v9}, Lcom/google/android/gms/measurement/internal/fu;->vs()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;->pQ()Lcom/google/android/gms/internal/measurement/ac$d;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ac$c;->pO()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;->rr()Z
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/ak$k;->rp()Z
 
     move-result v10
 
     if-eqz v10, :cond_8
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ac$c;->nO()Z
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ac$c;->nM()Z
 
     move-result v10
 
     if-nez v10, :cond_7
 
-    iget-object v8, p0, Lcom/google/android/gms/measurement/internal/jx;->aIO:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v8, p0, Lcom/google/android/gms/measurement/internal/jx;->aIK:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v8}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v8}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v8
 
-    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-object v9, p0, Lcom/google/android/gms/measurement/internal/jx;->aIO:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v9, p0, Lcom/google/android/gms/measurement/internal/jx;->aIK:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v9}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {v9}, Lcom/google/android/gms/measurement/internal/fu;->vs()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;->pQ()Lcom/google/android/gms/internal/measurement/ac$d;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ac$c;->pO()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;->pH()Z
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ac$c;->pF()Z
 
     move-result v10
 
     if-nez v10, :cond_c
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ac$c;->nO()Z
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ac$c;->nM()Z
 
     move-result v10
 
     if-nez v10, :cond_a
 
-    iget-object v8, p0, Lcom/google/android/gms/measurement/internal/jx;->aIO:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v8, p0, Lcom/google/android/gms/measurement/internal/jx;->aIK:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v8}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v8}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v8
 
-    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-object v9, p0, Lcom/google/android/gms/measurement/internal/jx;->aIO:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v9, p0, Lcom/google/android/gms/measurement/internal/jx;->aIK:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v9}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {v9}, Lcom/google/android/gms/measurement/internal/fu;->vs()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;->pQ()Lcom/google/android/gms/internal/measurement/ac$d;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ac$c;->pO()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;->aIO:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v8, p0, Lcom/google/android/gms/measurement/internal/jx;->aIK:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v8}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v8}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v8
 
-    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-object v9, p0, Lcom/google/android/gms/measurement/internal/jx;->aIO:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v9, p0, Lcom/google/android/gms/measurement/internal/jx;->aIK:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v9}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {v9}, Lcom/google/android/gms/measurement/internal/fu;->vs()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;->pP()Lcom/google/android/gms/internal/measurement/ac$f;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ac$c;->pN()Lcom/google/android/gms/internal/measurement/ac$f;
 
     move-result-object v8
 
-    iget-object v10, p0, Lcom/google/android/gms/measurement/internal/jx;->aIO:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v10, p0, Lcom/google/android/gms/measurement/internal/jx;->aIK:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v10}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v10}, Lcom/google/android/gms/measurement/internal/fu;->vv()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;->aIO:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v8, p0, Lcom/google/android/gms/measurement/internal/jx;->aIK:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v8}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v8}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v8
 
-    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-object v9, p0, Lcom/google/android/gms/measurement/internal/jx;->aIO:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v9, p0, Lcom/google/android/gms/measurement/internal/jx;->aIK:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v9}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {v9}, Lcom/google/android/gms/measurement/internal/fu;->vs()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;->aIO:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v8, p0, Lcom/google/android/gms/measurement/internal/jx;->aIK:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v8}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v8}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v8
 
-    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->aCi:Ljava/lang/Boolean;
+    iput-object v4, p0, Lcom/google/android/gms/measurement/internal/jx;->aCe: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;->aIR:Lcom/google/android/gms/internal/measurement/ac$e;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/jx;->aIN: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;->aIS:Ljava/lang/Boolean;
+    iput-object v7, p0, Lcom/google/android/gms/measurement/internal/jx;->aIO: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;->pH()Z
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/ak$k;->pF()Z
 
     move-result p3
 
@@ -512,7 +512,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jx;->aIU:Ljava/lang/Long;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jx;->aIQ: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;->aIT:Ljava/lang/Long;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jx;->aIP:Ljava/lang/Long;
 
     :cond_16
     :goto_6
     return v5
 .end method
 
-.method final pJ()I
+.method final pH()I
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jx;->aIR:Lcom/google/android/gms/internal/measurement/ac$e;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jx;->aIN: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 b0f06c50f0..ce53341df0 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 aCi:Ljava/lang/Boolean;
+.field aCe:Ljava/lang/Boolean;
 
-.field aIS:Ljava/lang/Boolean;
+.field aIO:Ljava/lang/Boolean;
 
-.field aIT:Ljava/lang/Long;
+.field aIP:Ljava/lang/Long;
 
-.field aIU:Ljava/lang/Long;
+.field aIQ:Ljava/lang/Long;
 
-.field anu:I
+.field anq:I
 
-.field atS:Ljava/lang/String;
+.field atO: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;->atS:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jy;->atO:Ljava/lang/String;
 
-    iput p2, p0, Lcom/google/android/gms/measurement/internal/jy;->anu:I
+    iput p2, p0, Lcom/google/android/gms/measurement/internal/jy;->anq: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;->atc: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;
 
     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;->asX:Lcom/google/android/gms/internal/measurement/ac$f$b;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ac$f$b;->asT: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;->atf:[I
+    sget-object v1, Lcom/google/android/gms/measurement/internal/ju;->atb:[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;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p0, p6, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->pH()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ac$f;->pF()Z
 
     move-result v1
 
     if-eqz v1, :cond_b
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ac$f;->qb()Lcom/google/android/gms/internal/measurement/ac$f$b;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ac$f;->pZ()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;->asW:Lcom/google/android/gms/internal/measurement/ac$f$b;
+    sget-object v2, Lcom/google/android/gms/internal/measurement/ac$f$b;->asS: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;->qb()Lcom/google/android/gms/internal/measurement/ac$f$b;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ac$f;->pZ()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;->atc:Lcom/google/android/gms/internal/measurement/ac$f$b;
+    sget-object v2, Lcom/google/android/gms/internal/measurement/ac$f$b;->asY: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;->qc()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ac$f;->qa()I
 
     move-result v1
 
@@ -397,7 +397,7 @@
     return-object v0
 
     :cond_4
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ac$f;->qb()Lcom/google/android/gms/internal/measurement/ac$f$b;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ac$f;->pZ()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;->asX:Lcom/google/android/gms/internal/measurement/ac$f$b;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ac$f$b;->asT: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;->atc: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;
 
     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;->qc()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ac$f;->qa()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;->asX:Lcom/google/android/gms/internal/measurement/ac$f$b;
+    sget-object p1, Lcom/google/android/gms/internal/measurement/ac$f$b;->asT: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;->pH()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ac$d;->pF()Z
 
     move-result v0
 
@@ -537,22 +537,22 @@
 
     if-eqz v0, :cond_17
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ac$d;->pU()Lcom/google/android/gms/internal/measurement/ac$d$a;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ac$d;->pS()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;->asP:Lcom/google/android/gms/internal/measurement/ac$d$a;
+    sget-object v2, Lcom/google/android/gms/internal/measurement/ac$d$a;->asL: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;->pU()Lcom/google/android/gms/internal/measurement/ac$d$a;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ac$d;->pS()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;->asT: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;
 
     const/4 v3, 0x4
 
@@ -617,15 +617,15 @@
     return-object v1
 
     :cond_6
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ac$d;->pU()Lcom/google/android/gms/internal/measurement/ac$d$a;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ac$d;->pS()Lcom/google/android/gms/internal/measurement/ac$d$a;
 
     move-result-object v0
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ac$d;->pU()Lcom/google/android/gms/internal/measurement/ac$d$a;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ac$d;->pS()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;->asT: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;
 
     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;->asT:Lcom/google/android/gms/internal/measurement/ac$d$a;
+    sget-object v7, Lcom/google/android/gms/internal/measurement/ac$d$a;->asP: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;->anC:[I
+    sget-object v7, Lcom/google/android/gms/measurement/internal/ju;->any:[I
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ac$d$a;->ordinal()I
 
@@ -874,5 +874,5 @@
 
 
 # virtual methods
-.method abstract pJ()I
+.method abstract pH()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 2d1442fe66..5cddaf607d 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 pH()Z
+.method public static pF()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 3195d611f5..24993e6e83 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 aBU:J
+.field final aBQ:J
 
-.field final aCm:Ljava/lang/Long;
+.field final aCi:Ljava/lang/Long;
 
-.field final aCn:Ljava/lang/Long;
+.field final aCj:Ljava/lang/Long;
 
-.field final aCo:Ljava/lang/Long;
+.field final aCk:Ljava/lang/Long;
 
-.field final ane:Ljava/lang/String;
+.field final ana:Ljava/lang/String;
 
-.field final atS:Ljava/lang/String;
+.field final atO:Ljava/lang/String;
 
-.field final azM:Ljava/lang/Boolean;
+.field final azI: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;->atS:Ljava/lang/String;
+    iput-object v9, v0, Lcom/google/android/gms/measurement/internal/k;->atO:Ljava/lang/String;
 
     move-object/from16 v9, p2
 
-    iput-object v9, v0, Lcom/google/android/gms/measurement/internal/k;->ane:Ljava/lang/String;
+    iput-object v9, v0, Lcom/google/android/gms/measurement/internal/k;->ana:Ljava/lang/String;
 
-    iput-wide v1, v0, Lcom/google/android/gms/measurement/internal/k;->aBU:J
+    iput-wide v1, v0, Lcom/google/android/gms/measurement/internal/k;->aBQ: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;->aCm:Ljava/lang/Long;
+    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/k;->aCi:Ljava/lang/Long;
 
     move-object/from16 v1, p14
 
-    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/k;->aCn:Ljava/lang/Long;
+    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/k;->aCj:Ljava/lang/Long;
 
     move-object/from16 v1, p15
 
-    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/k;->aCo:Ljava/lang/Long;
+    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/k;->aCk:Ljava/lang/Long;
 
     move-object/from16 v1, p16
 
-    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/k;->azM:Ljava/lang/Boolean;
+    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/k;->azI: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;->atS:Ljava/lang/String;
+    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/k;->atO:Ljava/lang/String;
 
-    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/k;->ane:Ljava/lang/String;
+    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/k;->ana:Ljava/lang/String;
 
-    iget-wide v5, v0, Lcom/google/android/gms/measurement/internal/k;->aBU:J
+    iget-wide v5, v0, Lcom/google/android/gms/measurement/internal/k;->aBQ: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;->aCm:Ljava/lang/Long;
+    iget-object v15, v0, Lcom/google/android/gms/measurement/internal/k;->aCi: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;->atS:Ljava/lang/String;
+    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/k;->atO:Ljava/lang/String;
 
-    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/k;->ane:Ljava/lang/String;
+    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/k;->ana:Ljava/lang/String;
 
-    iget-wide v4, v0, Lcom/google/android/gms/measurement/internal/k;->aBU:J
+    iget-wide v4, v0, Lcom/google/android/gms/measurement/internal/k;->aBQ: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;->aCm:Ljava/lang/Long;
+    iget-object v14, v0, Lcom/google/android/gms/measurement/internal/k;->aCi:Ljava/lang/Long;
 
-    iget-object v15, v0, Lcom/google/android/gms/measurement/internal/k;->aCn:Ljava/lang/Long;
+    iget-object v15, v0, Lcom/google/android/gms/measurement/internal/k;->aCj:Ljava/lang/Long;
 
     move-object/from16 p1, v1
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/k;->aCo:Ljava/lang/Long;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/k;->aCk:Ljava/lang/Long;
 
     move-object/from16 v16, v1
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/k;->azM:Ljava/lang/Boolean;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/k;->azI: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;->atS:Ljava/lang/String;
+    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/k;->atO:Ljava/lang/String;
 
-    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/k;->ane:Ljava/lang/String;
+    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/k;->ana:Ljava/lang/String;
 
-    iget-wide v4, v0, Lcom/google/android/gms/measurement/internal/k;->aBU:J
+    iget-wide v4, v0, Lcom/google/android/gms/measurement/internal/k;->aBQ: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;->aCn:Ljava/lang/Long;
+    iget-object v15, v0, Lcom/google/android/gms/measurement/internal/k;->aCj:Ljava/lang/Long;
 
     move-object/from16 p1, v1
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/k;->aCo:Ljava/lang/Long;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/k;->aCk:Ljava/lang/Long;
 
     move-object/from16 v16, v1
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/k;->azM:Ljava/lang/Boolean;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/k;->azI: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 05277b9b83..997a61e81c 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 aCi:Ljava/lang/Boolean;
+.field private aCe:Ljava/lang/Boolean;
 
-.field private aIZ:Ljava/lang/Boolean;
+.field private aIV:Ljava/lang/Boolean;
 
-.field aJa:Lcom/google/android/gms/measurement/internal/kc;
+.field aIW:Lcom/google/android/gms/measurement/internal/kc;
 
 
 # direct methods
@@ -17,19 +17,19 @@
 
     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;->aBT:Lcom/google/android/gms/measurement/internal/kc;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/b;->aBP: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;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ka;->aIW: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 static ug()Ljava/lang/String;
+.method static ue()Ljava/lang/String;
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/o;->aCz:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/o;->aCv:Lcom/google/android/gms/measurement/internal/do;
 
     const/4 v1, 0x0
 
@@ -42,10 +42,10 @@
     return-object v0
 .end method
 
-.method public static uj()J
+.method public static uh()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/o;->aDc:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/o;->aCY:Lcom/google/android/gms/measurement/internal/do;
 
     const/4 v1, 0x0
 
@@ -62,27 +62,7 @@
     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
+.method public static un()J
     .locals 2
 
     sget-object v0, Lcom/google/android/gms/measurement/internal/o;->aCy:Lcom/google/android/gms/measurement/internal/do;
@@ -93,6 +73,26 @@
 
     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 va()Z
+    .locals 2
+
+    sget-object v0, Lcom/google/android/gms/measurement/internal/o;->aCu: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/Boolean;
 
     invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
@@ -102,13 +102,13 @@
     return v0
 .end method
 
-.method private final yV()Landroid/os/Bundle;
+.method private final yT()Landroid/os/Bundle;
     .locals 4
 
     const/4 v0, 0x0
 
     :try_start_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->vt()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()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;->vt()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()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;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->aJa:Lcom/google/android/gms/measurement/internal/kc;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ka;->aIW:Lcom/google/android/gms/measurement/internal/kc;
 
-    iget-object v2, p2, Lcom/google/android/gms/measurement/internal/do;->atS:Ljava/lang/String;
+    iget-object v2, p2, Lcom/google/android/gms/measurement/internal/do;->atO: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;->aJa:Lcom/google/android/gms/measurement/internal/kc;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ka;->aIW:Lcom/google/android/gms/measurement/internal/kc;
 
-    iget-object v2, p2, Lcom/google/android/gms/measurement/internal/do;->atS:Ljava/lang/String;
+    iget-object v2, p2, Lcom/google/android/gms/measurement/internal/do;->atO: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;->aDA:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/o;->aDw: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;->aJa:Lcom/google/android/gms/measurement/internal/kc;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ka;->aIW:Lcom/google/android/gms/measurement/internal/kc;
 
-    iget-object v2, p2, Lcom/google/android/gms/measurement/internal/do;->atS:Ljava/lang/String;
+    iget-object v2, p2, Lcom/google/android/gms/measurement/internal/do;->atO: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;->aJa:Lcom/google/android/gms/measurement/internal/kc;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ka;->aIW: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;->aCN:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/o;->aCJ: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;->yV()Landroid/os/Bundle;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ka;->yT()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, 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/dv;->aEw: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;->yV()Landroid/os/Bundle;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ka;->yT()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, 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/dv;->aEw: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;->vt()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->aDn:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/o;->aDj: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;->aDp:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/o;->aDl: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;->aDq:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/o;->aDm: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;->aDr: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
 
@@ -855,7 +855,7 @@
 .method final cQ(Ljava/lang/String;)Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/o;->aDs:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/o;->aDo: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;->aDt: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
 
@@ -905,9 +905,9 @@
     return p1
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ka;->aJa:Lcom/google/android/gms/measurement/internal/kc;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ka;->aIW:Lcom/google/android/gms/measurement/internal/kc;
 
-    iget-object v2, p2, Lcom/google/android/gms/measurement/internal/do;->atS:Ljava/lang/String;
+    iget-object v2, p2, Lcom/google/android/gms/measurement/internal/do;->atO: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,18 +953,10 @@
     return p1
 .end method
 
-.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
+.method public final rp()Z
     .locals 1
 
-    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;->vy()Lcom/google/android/gms/measurement/internal/jz;
 
     const-string v0, "firebase_analytics_collection_deactivated"
 
@@ -990,21 +982,29 @@
     return v0
 .end method
 
-.method public final uI()Z
+.method public final bridge synthetic ry()V
+    .locals 0
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fu;->ry()V
+
+    return-void
+.end method
+
+.method public final uG()Z
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ka;->aCi:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ka;->aCe: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;->aCi:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ka;->aCe:Ljava/lang/Boolean;
 
     if-nez v0, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()Landroid/content/Context;
 
     move-result-object v0
 
@@ -1012,7 +1012,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lcom/google/android/gms/common/util/m;->nx()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/common/util/m;->nv()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;->aCi:Ljava/lang/Boolean;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ka;->aCe:Ljava/lang/Boolean;
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ka;->aCi:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ka;->aCe: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;->aCi:Ljava/lang/Boolean;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ka;->aCe:Ljava/lang/Boolean;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->aCi:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ka;->aCe:Ljava/lang/Boolean;
 
     invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -1086,7 +1086,7 @@
     return v0
 .end method
 
-.method public final uK()Ljava/lang/Boolean;
+.method public final uI()Ljava/lang/Boolean;
     .locals 1
 
     const-string v0, "google_analytics_adid_collection_enabled"
@@ -1122,20 +1122,10 @@
     return-object v0
 .end method
 
-.method public final bridge synthetic vA()Lcom/google/android/gms/measurement/internal/jz;
+.method public final vI()Ljava/lang/Boolean;
     .locals 1
 
-    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;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/jz;
 
     const-string v0, "firebase_analytics_collection_enabled"
 
@@ -1146,10 +1136,10 @@
     return-object v0
 .end method
 
-.method final vd()Z
+.method final vb()Z
     .locals 1
 
-    iget-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;->aIV:Ljava/lang/Boolean;
 
     if-nez v0, :cond_0
 
@@ -1159,18 +1149,18 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ka;->aIZ:Ljava/lang/Boolean;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ka;->aIV:Ljava/lang/Boolean;
 
-    iget-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;->aIV: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;->aIZ:Ljava/lang/Boolean;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ka;->aIV:Ljava/lang/Boolean;
 
     :cond_0
-    iget-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;->aIV:Ljava/lang/Boolean;
 
     invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -1178,7 +1168,7 @@
 
     if-nez v0, :cond_2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ka;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ka;->aGG:Lcom/google/android/gms/measurement/internal/ey;
 
     iget-boolean v0, v0, Lcom/google/android/gms/measurement/internal/ey;->zzf:Z
 
@@ -1198,105 +1188,115 @@
     return v0
 .end method
 
-.method public final bridge synthetic vq()V
+.method public final bridge synthetic vo()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()V
 
     return-void
 .end method
 
-.method public final bridge synthetic vr()Lcom/google/android/gms/measurement/internal/i;
+.method public final bridge synthetic vp()Lcom/google/android/gms/measurement/internal/i;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()Lcom/google/android/gms/measurement/internal/i;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fu;->vp()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vs()Lcom/google/android/gms/common/util/e;
+.method public final bridge synthetic vq()Lcom/google/android/gms/common/util/e;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vt()Landroid/content/Context;
+.method public final bridge synthetic vr()Landroid/content/Context;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()Landroid/content/Context;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vu()Lcom/google/android/gms/measurement/internal/dt;
+.method public final bridge synthetic vs()Lcom/google/android/gms/measurement/internal/dt;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vv()Lcom/google/android/gms/measurement/internal/jm;
+.method public final bridge synthetic vt()Lcom/google/android/gms/measurement/internal/jm;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vw()Lcom/google/android/gms/measurement/internal/ev;
+.method public final bridge synthetic vu()Lcom/google/android/gms/measurement/internal/ev;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vx()Lcom/google/android/gms/measurement/internal/dv;
+.method public final bridge synthetic vv()Lcom/google/android/gms/measurement/internal/dv;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vy()Lcom/google/android/gms/measurement/internal/eh;
+.method public final bridge synthetic vw()Lcom/google/android/gms/measurement/internal/eh;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vz()Lcom/google/android/gms/measurement/internal/ka;
+.method public final bridge synthetic vx()Lcom/google/android/gms/measurement/internal/ka;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final yW()Ljava/lang/String;
+.method public final bridge synthetic vy()Lcom/google/android/gms/measurement/internal/jz;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/jz;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final yU()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 e3490e5353..9c9fec53c7 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 aBU:J
+.field final aBQ:J
 
-.field final aCp:Lcom/google/android/gms/measurement/internal/zzam;
+.field final aCl:Lcom/google/android/gms/measurement/internal/zzam;
 
-.field final ane:Ljava/lang/String;
+.field final ana:Ljava/lang/String;
 
-.field final atS:Ljava/lang/String;
+.field final atO: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;->atS:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/l;->atO:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/l;->ane:Ljava/lang/String;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/l;->ana: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;->aBU:J
+    iput-wide p5, p0, Lcom/google/android/gms/measurement/internal/l;->aBQ: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;->aBU:J
+    iget-wide p6, p0, Lcom/google/android/gms/measurement/internal/l;->aBQ:J
 
     cmp-long p2, p4, p6
 
     if-lez p2, :cond_1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p4
 
-    iget-object p4, p4, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p4, p4, Lcom/google/android/gms/measurement/internal/dv;->aEw: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;->yd()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->yb()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p5
 
-    iget-object p5, p5, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p5, p5, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->ye()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->yc()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;->yd()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->yb()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;->aCp:Lcom/google/android/gms/measurement/internal/zzam;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/l;->aCl: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;->atS:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/l;->atO:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/l;->ane:Ljava/lang/String;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/l;->ana: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;->aBU:J
+    iput-wide p5, p0, Lcom/google/android/gms/measurement/internal/l;->aBQ: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;->aBU:J
+    iget-wide p7, p0, Lcom/google/android/gms/measurement/internal/l;->aBQ:J
 
     cmp-long p2, p5, p7
 
     if-lez p2, :cond_1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->aCp:Lcom/google/android/gms/measurement/internal/zzam;
+    iput-object p9, p0, Lcom/google/android/gms/measurement/internal/l;->aCl: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;->atS:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/l;->atO:Ljava/lang/String;
 
-    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/l;->ane:Ljava/lang/String;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/l;->ana:Ljava/lang/String;
 
-    iget-wide v5, p0, Lcom/google/android/gms/measurement/internal/l;->aBU:J
+    iget-wide v5, p0, Lcom/google/android/gms/measurement/internal/l;->aBQ:J
 
-    iget-object v9, p0, Lcom/google/android/gms/measurement/internal/l;->aCp:Lcom/google/android/gms/measurement/internal/zzam;
+    iget-object v9, p0, Lcom/google/android/gms/measurement/internal/l;->aCl: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;->atS:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/l;->atO:Ljava/lang/String;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/l;->ane:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/l;->ana:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/l;->aCp:Lcom/google/android/gms/measurement/internal/zzam;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/l;->aCl: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 599d271224..0a53dbbb6b 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 aCq:Lcom/google/android/gms/measurement/internal/zzam;
+.field private final synthetic aCm:Lcom/google/android/gms/measurement/internal/zzam;
 
-.field private awn:Ljava/util/Iterator;
+.field private awj: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;->aCq:Lcom/google/android/gms/measurement/internal/zzam;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/m;->aCm: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;->aCq:Lcom/google/android/gms/measurement/internal/zzam;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/m;->aCm: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;->awn:Ljava/util/Iterator;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/m;->awj: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;->awn:Ljava/util/Iterator;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/m;->awj: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;->awn:Ljava/util/Iterator;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/m;->awj: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 425a04e200..4f4d26f5a4 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/Long;",
+            "Ljava/lang/String;",
             ">;"
         }
     .end annotation
@@ -18,7 +18,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/do<",
-            "Ljava/lang/Long;",
+            "Ljava/lang/Integer;",
             ">;"
         }
     .end annotation
@@ -28,7 +28,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/do<",
-            "Ljava/lang/Long;",
+            "Ljava/lang/Integer;",
             ">;"
         }
     .end annotation
@@ -38,7 +38,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/do<",
-            "Ljava/lang/String;",
+            "Ljava/lang/Integer;",
             ">;"
         }
     .end annotation
@@ -48,7 +48,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/do<",
-            "Ljava/lang/String;",
+            "Ljava/lang/Integer;",
             ">;"
         }
     .end annotation
@@ -118,7 +118,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/do<",
-            "Ljava/lang/Integer;",
+            "Ljava/lang/String;",
             ">;"
         }
     .end annotation
@@ -128,7 +128,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/do<",
-            "Ljava/lang/Integer;",
+            "Ljava/lang/Long;",
             ">;"
         }
     .end annotation
@@ -138,7 +138,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/do<",
-            "Ljava/lang/Integer;",
+            "Ljava/lang/Long;",
             ">;"
         }
     .end annotation
@@ -148,7 +148,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/do<",
-            "Ljava/lang/Integer;",
+            "Ljava/lang/Long;",
             ">;"
         }
     .end annotation
@@ -158,7 +158,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/do<",
-            "Ljava/lang/String;",
+            "Ljava/lang/Long;",
             ">;"
         }
     .end annotation
@@ -238,7 +238,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/do<",
-            "Ljava/lang/Long;",
+            "Ljava/lang/Integer;",
             ">;"
         }
     .end annotation
@@ -258,15 +258,15 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/do<",
-            "Ljava/lang/Long;",
+            "Ljava/lang/Integer;",
             ">;"
         }
     .end annotation
 .end field
 
-.field static aCs:Lcom/google/android/gms/measurement/internal/jz;
+.field static aCo:Lcom/google/android/gms/measurement/internal/jz;
 
-.field private static aCt:Ljava/util/List;
+.field private static aCp:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -276,7 +276,7 @@
     .end annotation
 .end field
 
-.field private static aCu:Ljava/util/Set;
+.field private static aCq:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -286,11 +286,11 @@
     .end annotation
 .end field
 
-.field private static volatile aCv:Lcom/google/android/gms/measurement/internal/ey;
+.field private static volatile aCr:Lcom/google/android/gms/measurement/internal/ey;
 
-.field private static aCw:Ljava/lang/Boolean;
+.field private static aCs:Ljava/lang/Boolean;
 
-.field public static aCx:Lcom/google/android/gms/measurement/internal/do;
+.field public static aCt:Lcom/google/android/gms/measurement/internal/do;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/do<",
@@ -300,7 +300,7 @@
     .end annotation
 .end field
 
-.field public static aCy:Lcom/google/android/gms/measurement/internal/do;
+.field public static aCu:Lcom/google/android/gms/measurement/internal/do;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/do<",
@@ -310,6 +310,46 @@
     .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/Long;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.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/Long;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public static aCy: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 aCz:Lcom/google/android/gms/measurement/internal/do;
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -500,7 +540,7 @@
     .end annotation
 .end field
 
-.field public static aDS:Lcom/google/android/gms/measurement/internal/do;
+.field private static aDS:Lcom/google/android/gms/measurement/internal/do;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/do<",
@@ -540,7 +580,7 @@
     .end annotation
 .end field
 
-.field private static aDW:Lcom/google/android/gms/measurement/internal/do;
+.field public static aDW:Lcom/google/android/gms/measurement/internal/do;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/do<",
@@ -584,7 +624,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/do<",
-            "Ljava/lang/Long;",
+            "Ljava/lang/Integer;",
             ">;"
         }
     .end annotation
@@ -594,7 +634,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/do<",
-            "Ljava/lang/Integer;",
+            "Ljava/lang/Long;",
             ">;"
         }
     .end annotation
@@ -604,7 +644,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/do<",
-            "Ljava/lang/Long;",
+            "Ljava/lang/Boolean;",
             ">;"
         }
     .end annotation
@@ -614,7 +654,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/do<",
-            "Ljava/lang/Integer;",
+            "Ljava/lang/String;",
             ">;"
         }
     .end annotation
@@ -624,7 +664,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/do<",
-            "Ljava/lang/Integer;",
+            "Ljava/lang/Long;",
             ">;"
         }
     .end annotation
@@ -634,7 +674,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/do<",
-            "Ljava/lang/Long;",
+            "Ljava/lang/Integer;",
             ">;"
         }
     .end annotation
@@ -644,7 +684,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/do<",
-            "Ljava/lang/Boolean;",
+            "Ljava/lang/Double;",
             ">;"
         }
     .end annotation
@@ -654,7 +694,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/do<",
-            "Ljava/lang/String;",
+            "Ljava/lang/Integer;",
             ">;"
         }
     .end annotation
@@ -664,7 +704,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/do<",
-            "Ljava/lang/Long;",
+            "Ljava/lang/Boolean;",
             ">;"
         }
     .end annotation
@@ -674,7 +714,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/do<",
-            "Ljava/lang/Integer;",
+            "Ljava/lang/Boolean;",
             ">;"
         }
     .end annotation
@@ -684,7 +724,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/do<",
-            "Ljava/lang/Double;",
+            "Ljava/lang/Boolean;",
             ">;"
         }
     .end annotation
@@ -694,7 +734,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/do<",
-            "Ljava/lang/Integer;",
+            "Ljava/lang/Boolean;",
             ">;"
         }
     .end annotation
@@ -940,7 +980,7 @@
     .end annotation
 .end field
 
-.field public static aEk:Lcom/google/android/gms/measurement/internal/do;
+.field private static aEk:Lcom/google/android/gms/measurement/internal/do;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/do<",
@@ -960,46 +1000,6 @@
     .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;->aCt:Ljava/util/List;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aCp: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;->aCu:Ljava/util/Set;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aCq:Ljava/util/Set;
 
     sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/r;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/r;->aEm: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;->aCx: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;
 
     sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/q;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/q;->aEm: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;->aCy: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;
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/ae;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/ae;->aEm: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;->aCz: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/16 v0, 0x2710
 
@@ -1069,7 +1069,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/an;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/an;->aEm: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;->aCA:Lcom/google/android/gms/measurement/internal/do;
+    sput-object v1, Lcom/google/android/gms/measurement/internal/o;->aCw: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v2, Lcom/google/android/gms/measurement/internal/bb;->aEm: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;->aCB:Lcom/google/android/gms/measurement/internal/do;
+    sput-object v2, Lcom/google/android/gms/measurement/internal/o;->aCx: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v3, Lcom/google/android/gms/measurement/internal/bk;->aEm: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;->aCC:Lcom/google/android/gms/measurement/internal/do;
+    sput-object v3, Lcom/google/android/gms/measurement/internal/o;->aCy:Lcom/google/android/gms/measurement/internal/do;
 
-    sget-object v3, Lcom/google/android/gms/measurement/internal/bx;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v3, Lcom/google/android/gms/measurement/internal/bx;->aEm: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;->aCD:Lcom/google/android/gms/measurement/internal/do;
+    sput-object v3, Lcom/google/android/gms/measurement/internal/o;->aCz:Lcom/google/android/gms/measurement/internal/do;
 
-    sget-object v3, Lcom/google/android/gms/measurement/internal/ch;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v3, Lcom/google/android/gms/measurement/internal/ch;->aEm: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;->aCE:Lcom/google/android/gms/measurement/internal/do;
+    sput-object v3, Lcom/google/android/gms/measurement/internal/o;->aCA: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v4, Lcom/google/android/gms/measurement/internal/cu;->aEm: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;->aCF:Lcom/google/android/gms/measurement/internal/do;
+    sput-object v3, Lcom/google/android/gms/measurement/internal/o;->aCB: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v4, Lcom/google/android/gms/measurement/internal/de;->aEm: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;->aCG:Lcom/google/android/gms/measurement/internal/do;
+    sput-object v4, Lcom/google/android/gms/measurement/internal/o;->aCC:Lcom/google/android/gms/measurement/internal/do;
 
-    sget-object v4, Lcom/google/android/gms/measurement/internal/t;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v4, Lcom/google/android/gms/measurement/internal/t;->aEm: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;->aCH: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;
 
     const/16 v3, 0x3e8
 
@@ -1183,7 +1183,7 @@
 
     move-result-object v3
 
-    sget-object v4, Lcom/google/android/gms/measurement/internal/s;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v4, Lcom/google/android/gms/measurement/internal/s;->aEm: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;->aCI:Lcom/google/android/gms/measurement/internal/do;
+    sput-object v4, Lcom/google/android/gms/measurement/internal/o;->aCE: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v5, Lcom/google/android/gms/measurement/internal/v;->aEm: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;->aCJ:Lcom/google/android/gms/measurement/internal/do;
+    sput-object v5, Lcom/google/android/gms/measurement/internal/o;->aCF:Lcom/google/android/gms/measurement/internal/do;
 
-    sget-object v5, Lcom/google/android/gms/measurement/internal/u;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v5, Lcom/google/android/gms/measurement/internal/u;->aEm: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;->aCK:Lcom/google/android/gms/measurement/internal/do;
+    sput-object v3, Lcom/google/android/gms/measurement/internal/o;->aCG: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v5, Lcom/google/android/gms/measurement/internal/x;->aEm: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;->aCL: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, 0x1f4
 
@@ -1241,7 +1241,7 @@
 
     move-result-object v3
 
-    sget-object v5, Lcom/google/android/gms/measurement/internal/w;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v5, Lcom/google/android/gms/measurement/internal/w;->aEm: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;->aCM:Lcom/google/android/gms/measurement/internal/do;
+    sput-object v3, Lcom/google/android/gms/measurement/internal/o;->aCI: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v5, Lcom/google/android/gms/measurement/internal/aa;->aEm: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;->aCN:Lcom/google/android/gms/measurement/internal/do;
+    sput-object v3, Lcom/google/android/gms/measurement/internal/o;->aCJ:Lcom/google/android/gms/measurement/internal/do;
 
-    sget-object v3, Lcom/google/android/gms/measurement/internal/y;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v3, Lcom/google/android/gms/measurement/internal/y;->aEm: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;->aCO: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;
 
-    sget-object v3, Lcom/google/android/gms/measurement/internal/ac;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v3, Lcom/google/android/gms/measurement/internal/ac;->aEm: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;->aCP: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-wide/32 v3, 0x2932e00
 
@@ -1295,7 +1295,7 @@
 
     move-result-object v3
 
-    sget-object v4, Lcom/google/android/gms/measurement/internal/ab;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v4, Lcom/google/android/gms/measurement/internal/ab;->aEm: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;->aCQ: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;
 
-    sget-object v3, Lcom/google/android/gms/measurement/internal/ad;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v3, Lcom/google/android/gms/measurement/internal/ad;->aEm: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;->aCR: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/ag;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v3, Lcom/google/android/gms/measurement/internal/ag;->aEm: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;->aCS:Lcom/google/android/gms/measurement/internal/do;
+    sput-object v2, Lcom/google/android/gms/measurement/internal/o;->aCO:Lcom/google/android/gms/measurement/internal/do;
 
-    sget-object v2, Lcom/google/android/gms/measurement/internal/af;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v2, Lcom/google/android/gms/measurement/internal/af;->aEm: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;->aCT:Lcom/google/android/gms/measurement/internal/do;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aCP: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v2, Lcom/google/android/gms/measurement/internal/ai;->aEm: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;->aCU:Lcom/google/android/gms/measurement/internal/do;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aCQ: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v2, Lcom/google/android/gms/measurement/internal/ah;->aEm: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;->aCV:Lcom/google/android/gms/measurement/internal/do;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aCR: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v2, Lcom/google/android/gms/measurement/internal/ak;->aEm: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;->aCW:Lcom/google/android/gms/measurement/internal/do;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aCS:Lcom/google/android/gms/measurement/internal/do;
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/aj;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/aj;->aEm: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;->aCX: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/32 v0, 0x240c8400
 
@@ -1399,7 +1399,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/am;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/am;->aEm: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;->aCY: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 v0, 0x3a98
 
@@ -1415,7 +1415,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/al;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/al;->aEm: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;->aCZ: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 v0, 0x1b7740
 
@@ -1431,7 +1431,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/ao;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/ao;->aEm: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;->aDa: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;
 
     const/4 v0, 0x6
 
@@ -1447,7 +1447,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/aq;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/aq;->aEm: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;->aDb: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 v0, 0x90321000L
 
@@ -1463,7 +1463,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/ap;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/ap;->aEm: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;->aDc: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/4 v0, 0x4
 
@@ -1479,7 +1479,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/as;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/as;->aEm: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;->aDd: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/16 v0, 0xc8
 
@@ -1495,7 +1495,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/ar;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/ar;->aEm: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;->aDe: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-wide/16 v0, 0x1388
 
@@ -1511,7 +1511,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/au;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/au;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     const-string v2, "measurement.service_client.idle_disconnect_millis"
 
@@ -1519,11 +1519,11 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aDf: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;
 
     sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/at;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/at;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     const-string v2, "measurement.test.boolean_flag"
 
@@ -1531,9 +1531,9 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aDg: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;
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/aw;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/aw;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     const-string v1, "measurement.test.string_flag"
 
@@ -1543,7 +1543,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aDh: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-wide/16 v0, -0x1
 
@@ -1551,7 +1551,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/av;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/av;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     const-string v2, "measurement.test.long_flag"
 
@@ -1559,7 +1559,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aDi: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/4 v0, -0x2
 
@@ -1567,7 +1567,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/ay;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/ay;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     const-string v2, "measurement.test.int_flag"
 
@@ -1575,7 +1575,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aDj:Lcom/google/android/gms/measurement/internal/do;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aDf:Lcom/google/android/gms/measurement/internal/do;
 
     const-wide/high16 v0, -0x3ff8000000000000L    # -3.0
 
@@ -1583,7 +1583,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/ax;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/ax;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     const-string v2, "measurement.test.double_flag"
 
@@ -1591,7 +1591,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aDk:Lcom/google/android/gms/measurement/internal/do;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aDg:Lcom/google/android/gms/measurement/internal/do;
 
     const/16 v0, 0x32
 
@@ -1599,7 +1599,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/az;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/az;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     const-string v2, "measurement.experiment.max_ids"
 
@@ -1607,11 +1607,11 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aDl: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;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/bd;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/bd;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     const-string v2, "measurement.validation.internal_limits_internal_event_params"
 
@@ -1619,13 +1619,61 @@
 
     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/bc;->aEm: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;->aDj: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;->aEm: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;->aDk: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;->aEm:Lcom/google/android/gms/measurement/internal/dm;
+
+    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;
+
+    move-result-object v0
+
+    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 v1, Lcom/google/android/gms/measurement/internal/bh;->aEm:Lcom/google/android/gms/measurement/internal/dm;
+
+    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;
+
+    move-result-object v0
+
     sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aDm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/bg;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
-    const-string v2, "measurement.reset_analytics.persist_time"
+    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;
 
@@ -1633,11 +1681,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;->FALSE:Ljava/lang/Boolean;
+    sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/bf;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/bj;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
-    const-string v2, "measurement.sampling.time_zone_offset_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;
 
@@ -1645,11 +1693,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;->FALSE:Ljava/lang/Boolean;
+    sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/be;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/bi;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
-    const-string v2, "measurement.referrer.enable_logging_install_referrer_cmp_from_apk"
+    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;
 
@@ -1659,9 +1707,9 @@
 
     sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/bh;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/bl;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
-    const-string v2, "measurement.client.sessions.session_id_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;
 
@@ -1671,9 +1719,9 @@
 
     sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/bg;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/bn;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
-    const-string v2, "measurement.service.sessions.session_number_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;
 
@@ -1683,9 +1731,9 @@
 
     sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/bj;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/bm;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
-    const-string v2, "measurement.client.sessions.immediate_start_enabled_foreground"
+    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;
 
@@ -1695,9 +1743,9 @@
 
     sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/bi;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/bp;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
-    const-string v2, "measurement.client.sessions.background_sessions_enabled"
+    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;
 
@@ -1707,9 +1755,9 @@
 
     sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/bl;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/bo;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
-    const-string v2, "measurement.client.sessions.remove_expired_session_properties_enabled"
+    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;
 
@@ -1719,9 +1767,9 @@
 
     sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/bn;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/br;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
-    const-string v2, "measurement.service.sessions.session_number_backfill_enabled"
+    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;
 
@@ -1729,11 +1777,11 @@
 
     sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aDv: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/bm;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/bq;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
-    const-string v2, "measurement.service.sessions.remove_disabled_session_number"
+    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;
 
@@ -1741,11 +1789,11 @@
 
     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 v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/bp;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/bt;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
-    const-string v2, "measurement.client.sessions.start_session_before_view_screen"
+    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;
 
@@ -1755,9 +1803,9 @@
 
     sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/bo;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/bs;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
-    const-string v2, "measurement.client.sessions.check_on_startup"
+    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;
 
@@ -1767,9 +1815,9 @@
 
     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;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/bv;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
-    const-string v2, "measurement.collection.firebase_global_collection_flag_enabled"
+    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;
 
@@ -1777,11 +1825,11 @@
 
     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 v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/bq;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/bu;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
-    const-string v2, "measurement.collection.efficient_engagement_reporting_enabled"
+    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;
 
@@ -1789,11 +1837,11 @@
 
     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 v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/bt;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/bw;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
-    const-string v2, "measurement.collection.redundant_engagement_removal_enabled"
+    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;
 
@@ -1803,9 +1851,9 @@
 
     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;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/bz;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
-    const-string v2, "measurement.personalized_ads_signals_collection_enabled"
+    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;
 
@@ -1815,55 +1863,7 @@
 
     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;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/by;->aEm: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;->aDH: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;
 
     sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
@@ -1883,13 +1883,61 @@
 
     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/cc;->aEm: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;->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/ca;->aEm: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;->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/ce;->aEm: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;->aDH: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;->aEm: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;->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/cc;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/cg;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
-    const-string v2, "measurement.module.collection.conditionally_omit_admob_app_id"
+    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;
 
@@ -1899,9 +1947,9 @@
 
     sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/ca;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/cf;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
-    const-string v2, "measurement.sdk.dynamite.use_dynamite2"
+    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;
 
@@ -1911,9 +1959,9 @@
 
     sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/ce;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/ci;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
-    const-string v2, "measurement.sdk.dynamite.allow_remote_dynamite"
+    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;
 
@@ -1923,9 +1971,9 @@
 
     sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/cd;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/ck;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
-    const-string v2, "measurement.sdk.collection.validate_param_names_alphabetical"
+    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;
 
@@ -1935,9 +1983,9 @@
 
     sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/cg;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/cj;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
-    const-string v2, "measurement.collection.event_safelist"
+    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;
 
@@ -1945,11 +1993,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;->FALSE:Ljava/lang/Boolean;
+    sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/cf;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/cm;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
-    const-string v2, "measurement.service.audience.scoped_filters_v27"
+    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;
 
@@ -1959,9 +2007,9 @@
 
     sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/ci;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/cl;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
-    const-string v2, "measurement.service.audience.session_scoped_event_aggregates"
+    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;
 
@@ -1971,9 +2019,9 @@
 
     sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/ck;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/co;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
-    const-string v2, "measurement.service.audience.session_scoped_user_engagement"
+    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;
 
@@ -1981,11 +2029,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;->TRUE:Ljava/lang/Boolean;
+    sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/cj;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/cn;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
-    const-string v2, "measurement.service.audience.scoped_engagement_removal_when_session_expired"
+    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;
 
@@ -1993,11 +2041,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;->TRUE:Ljava/lang/Boolean;
+    sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/cm;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/cq;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
-    const-string v2, "measurement.client.audience.scoped_engagement_removal_when_session_expired"
+    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;
 
@@ -2005,11 +2053,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;->FALSE:Ljava/lang/Boolean;
+    sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/cl;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/cp;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
-    const-string v2, "measurement.service.audience.remove_disabled_session_scoped_user_engagement"
+    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;
 
@@ -2019,9 +2067,9 @@
 
     sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/co;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/cs;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
-    const-string v2, "measurement.service.audience.use_bundle_timestamp_for_property_filters"
+    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;
 
@@ -2031,9 +2079,9 @@
 
     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;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/cr;->aEm: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.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;
 
@@ -2043,9 +2091,9 @@
 
     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;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/ct;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
-    const-string v2, "measurement.service.audience.invalidate_config_cache_after_app_unisntall"
+    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;
 
@@ -2053,11 +2101,11 @@
 
     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 v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/cp;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/cw;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
-    const-string v2, "measurement.sdk.collection.retrieve_deeplink_from_bow_2"
+    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;
 
@@ -2065,11 +2113,11 @@
 
     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 v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/cs;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/cv;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
-    const-string v2, "measurement.app_launch.event_ordering_fix"
+    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;
 
@@ -2079,55 +2127,7 @@
 
     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;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/cy;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     const-string v2, "measurement.upload.file_lock_state_check"
 
@@ -2135,11 +2135,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;->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/cx;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/cx;->aEm: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;->aEe:Lcom/google/android/gms/measurement/internal/do;
+    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;
 
@@ -2159,7 +2159,7 @@
 
     move-result-object v1
 
-    sget-object v2, Lcom/google/android/gms/measurement/internal/da;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v2, Lcom/google/android/gms/measurement/internal/da;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     const-string v3, "measurement.ga.ga_app_id"
 
@@ -2167,13 +2167,61 @@
 
     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;->FALSE:Ljava/lang/Boolean;
+
+    sget-object v1, Lcom/google/android/gms/measurement/internal/cz;->aEm:Lcom/google/android/gms/measurement/internal/dm;
+
+    const-string v2, "measurement.lifecycle.app_backgrounded_tracking"
+
+    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/dd;->aEm:Lcom/google/android/gms/measurement/internal/dm;
+
+    const-string v2, "measurement.lifecycle.app_in_background_parameter"
+
+    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;->FALSE:Ljava/lang/Boolean;
+
+    sget-object v1, Lcom/google/android/gms/measurement/internal/db;->aEm:Lcom/google/android/gms/measurement/internal/dm;
+
+    const-string v2, "measurement.integration.disable_firebase_instance_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;->aEe: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;->aEm:Lcom/google/android/gms/measurement/internal/dm;
+
+    const-string v2, "measurement.lifecycle.app_backgrounded_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;->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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/dh;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
-    const-string v2, "measurement.lifecycle.app_backgrounded_tracking"
+    const-string v2, "measurement.service.fix_gmp_version"
 
     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;
 
@@ -2183,9 +2231,9 @@
 
     sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/dd;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/dg;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
-    const-string v2, "measurement.lifecycle.app_in_background_parameter"
+    const-string v2, "measurement.collection.service.update_with_analytics_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;
 
@@ -2195,9 +2243,9 @@
 
     sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/db;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/dj;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
-    const-string v2, "measurement.integration.disable_firebase_instance_id"
+    const-string v2, "measurement.service.disable_install_state_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;
 
@@ -2207,55 +2255,7 @@
 
     sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    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"
-
-    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;->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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
-
-    const-string v2, "measurement.service.fix_gmp_version"
-
-    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;->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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
-
-    const-string v2, "measurement.collection.service.update_with_analytics_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;->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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
-
-    const-string v2, "measurement.service.disable_install_state_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;->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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/di;->aEm: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;->aEn: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;->TRUE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/dl;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/dl;->aEm: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;->aEo: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;->TRUE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/dk;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/dk;->aEm: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;->aEp: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;
 
     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;->aCt:Ljava/util/List;
+    sget-object p0, Lcom/google/android/gms/measurement/internal/o;->aCp: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;->aCv:Lcom/google/android/gms/measurement/internal/ey;
+    sput-object p0, Lcom/google/android/gms/measurement/internal/o;->aCr: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;->aCs:Lcom/google/android/gms/measurement/internal/jz;
+    sput-object p0, Lcom/google/android/gms/measurement/internal/o;->aCo: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;->ry()Ljava/util/Map;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/aq;->rw()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;->aCv:Lcom/google/android/gms/measurement/internal/ey;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/o;->aCr: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;->aCv:Lcom/google/android/gms/measurement/internal/ey;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/o;->aCr:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Landroid/content/Context;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vr()Landroid/content/Context;
 
     move-result-object v0
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/o;->aCw:Ljava/lang/Boolean;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/o;->aCs:Ljava/lang/Boolean;
 
     if-nez v1, :cond_2
 
-    invoke-static {}, Lcom/google/android/gms/common/c;->lU()Lcom/google/android/gms/common/c;
+    invoke-static {}, Lcom/google/android/gms/common/c;->lS()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;->aCw:Ljava/lang/Boolean;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aCs:Ljava/lang/Boolean;
 
     :cond_2
-    sget-object v0, Lcom/google/android/gms/measurement/internal/o;->aCw:Ljava/lang/Boolean;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/o;->aCs: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;->aCv:Lcom/google/android/gms/measurement/internal/ey;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/o;->aCr:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEw: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 nK()Ljava/lang/Boolean;
+.method static final synthetic nI()Ljava/lang/Boolean;
     .locals 1
 
     invoke-static {}, Lcom/google/android/gms/internal/measurement/ih;->zzb()Z
@@ -2476,10 +2476,10 @@
     return-object v0
 .end method
 
-.method static final synthetic uK()Ljava/lang/Boolean;
+.method static final synthetic uI()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ka;->nO()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ka;->nM()Z
 
     move-result v0
 
@@ -2490,10 +2490,10 @@
     return-object v0
 .end method
 
-.method static final synthetic vC()Ljava/lang/Boolean;
+.method static final synthetic vA()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/iv;->nO()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/iv;->nM()Z
 
     move-result v0
 
@@ -2504,7 +2504,7 @@
     return-object v0
 .end method
 
-.method static final synthetic vD()Ljava/lang/Boolean;
+.method static final synthetic vB()Ljava/lang/Boolean;
     .locals 1
 
     invoke-static {}, Lcom/google/android/gms/internal/measurement/ii;->zzb()Z
@@ -2518,37 +2518,37 @@
     return-object v0
 .end method
 
+.method static final synthetic vC()Ljava/lang/Boolean;
+    .locals 1
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/jg;->nM()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 vD()Ljava/lang/Boolean;
+    .locals 1
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ic;->nM()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 vE()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/jg;->nO()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 vF()Ljava/lang/Boolean;
-    .locals 1
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ic;->nO()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 vG()Ljava/lang/Boolean;
-    .locals 1
-
     invoke-static {}, Lcom/google/android/gms/internal/measurement/lq;->zzb()Z
 
     move-result v0
@@ -2560,10 +2560,10 @@
     return-object v0
 .end method
 
-.method static final synthetic vH()Ljava/lang/Boolean;
+.method static final synthetic vF()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/jb;->nO()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/jb;->nM()Z
 
     move-result v0
 
@@ -2574,7 +2574,7 @@
     return-object v0
 .end method
 
-.method static final synthetic vI()Ljava/lang/Boolean;
+.method static final synthetic vG()Ljava/lang/Boolean;
     .locals 1
 
     invoke-static {}, Lcom/google/android/gms/internal/measurement/ka;->zzb()Z
@@ -2588,10 +2588,38 @@
     return-object v0
 .end method
 
+.method static final synthetic vH()Ljava/lang/Boolean;
+    .locals 1
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/lk;->nM()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 vI()Ljava/lang/Boolean;
+    .locals 1
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ka;->qe()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 vJ()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/lk;->nO()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/js;->nM()Z
 
     move-result v0
 
@@ -2605,7 +2633,7 @@
 .method static final synthetic vK()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ka;->qg()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/hw;->zzb()Z
 
     move-result v0
 
@@ -2619,7 +2647,7 @@
 .method static final synthetic vL()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/js;->nO()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/lr;->zzb()Z
 
     move-result v0
 
@@ -2633,7 +2661,7 @@
 .method static final synthetic vM()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/hw;->zzb()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/jz;->qC()Z
 
     move-result v0
 
@@ -2647,7 +2675,7 @@
 .method static final synthetic vN()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/lr;->zzb()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/jz;->pP()Z
 
     move-result v0
 
@@ -2661,7 +2689,7 @@
 .method static final synthetic vO()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/jz;->qE()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/jz;->qe()Z
 
     move-result v0
 
@@ -2675,7 +2703,7 @@
 .method static final synthetic vP()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/jz;->pR()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/jz;->nM()Z
 
     move-result v0
 
@@ -2689,7 +2717,7 @@
 .method static final synthetic vQ()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/jz;->qg()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/hv;->zzb()Z
 
     move-result v0
 
@@ -2703,7 +2731,7 @@
 .method static final synthetic vR()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/jz;->nO()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ll;->zzb()Z
 
     move-result v0
 
@@ -2717,7 +2745,7 @@
 .method static final synthetic vS()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/hv;->zzb()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ja;->zzb()Z
 
     move-result v0
 
@@ -2731,7 +2759,7 @@
 .method static final synthetic vT()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ll;->zzb()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/kz;->rR()Z
 
     move-result v0
 
@@ -2745,7 +2773,7 @@
 .method static final synthetic vU()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ja;->zzb()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/kz;->rp()Z
 
     move-result v0
 
@@ -2759,7 +2787,7 @@
 .method static final synthetic vV()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/kz;->rT()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/kz;->uH()Z
 
     move-result v0
 
@@ -2773,7 +2801,7 @@
 .method static final synthetic vW()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/kz;->rr()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/kz;->pP()Z
 
     move-result v0
 
@@ -2787,7 +2815,7 @@
 .method static final synthetic vX()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/kz;->uJ()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/kz;->qC()Z
 
     move-result v0
 
@@ -2801,7 +2829,7 @@
 .method static final synthetic vY()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/kz;->pR()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/kz;->qe()Z
 
     move-result v0
 
@@ -2815,7 +2843,7 @@
 .method static final synthetic vZ()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/kz;->qE()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/kz;->uG()Z
 
     move-result v0
 
@@ -2829,34 +2857,6 @@
 .method static final synthetic wA()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ky;->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 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
@@ -2868,10 +2868,10 @@
     return-object v0
 .end method
 
-.method static final synthetic wD()Ljava/lang/Integer;
+.method static final synthetic wB()Ljava/lang/Integer;
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->ui()J
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->ug()J
 
     move-result-wide v0
 
@@ -2884,10 +2884,10 @@
     return-object v0
 .end method
 
-.method static final synthetic wE()Ljava/lang/Double;
+.method static final synthetic wC()Ljava/lang/Double;
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/kl;->uH()D
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/kl;->uF()D
 
     move-result-wide v0
 
@@ -2898,10 +2898,10 @@
     return-object v0
 .end method
 
-.method static final synthetic wF()Ljava/lang/Integer;
+.method static final synthetic wD()Ljava/lang/Integer;
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/kl;->rS()J
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/kl;->rQ()J
 
     move-result-wide v0
 
@@ -2914,10 +2914,10 @@
     return-object v0
 .end method
 
-.method static final synthetic wG()Ljava/lang/Long;
+.method static final synthetic wE()Ljava/lang/Long;
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/kl;->qA()J
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/kl;->qy()J
 
     move-result-wide v0
 
@@ -2928,17 +2928,17 @@
     return-object v0
 .end method
 
-.method static final synthetic wH()Ljava/lang/String;
+.method static final synthetic wF()Ljava/lang/String;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/kl;->uD()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/kl;->uB()Ljava/lang/String;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method static final synthetic wI()Ljava/lang/Boolean;
+.method static final synthetic wG()Ljava/lang/Boolean;
     .locals 1
 
     invoke-static {}, Lcom/google/android/gms/internal/measurement/kl;->zzb()Z
@@ -2952,10 +2952,10 @@
     return-object v0
 .end method
 
-.method static final synthetic wJ()Ljava/lang/Long;
+.method static final synthetic wH()Ljava/lang/Long;
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->sb()J
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->rZ()J
 
     move-result-wide v0
 
@@ -2966,23 +2966,7 @@
     return-object v0
 .end method
 
-.method static final synthetic wK()Ljava/lang/Integer;
-    .locals 2
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->uj()J
-
-    move-result-wide v0
-
-    long-to-int v1, v0
-
-    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method static final synthetic wL()Ljava/lang/Integer;
+.method static final synthetic wI()Ljava/lang/Integer;
     .locals 2
 
     invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->uh()J
@@ -2998,24 +2982,10 @@
     return-object v0
 .end method
 
-.method static final synthetic wM()Ljava/lang/Long;
+.method static final synthetic wJ()Ljava/lang/Integer;
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->uw()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 wN()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;->uf()J
 
     move-result-wide v0
 
@@ -3028,10 +2998,68 @@
     return-object v0
 .end method
 
+.method static final synthetic wK()Ljava/lang/Long;
+    .locals 2
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->uu()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 wL()Ljava/lang/Integer;
+    .locals 2
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->ux()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 wM()Ljava/lang/Long;
+    .locals 2
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->uC()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 wN()Ljava/lang/Long;
+    .locals 2
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->un()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 wO()Ljava/lang/Long;
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->uE()J
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->rX()J
 
     move-result-wide v0
 
@@ -3045,7 +3073,7 @@
 .method static final synthetic wP()Ljava/lang/Long;
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->up()J
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->sr()J
 
     move-result-wide v0
 
@@ -3059,7 +3087,7 @@
 .method static final synthetic wQ()Ljava/lang/Long;
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->rZ()J
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->ui()J
 
     move-result-wide v0
 
@@ -3073,7 +3101,7 @@
 .method static final synthetic wR()Ljava/lang/Long;
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->st()J
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->uj()J
 
     move-result-wide v0
 
@@ -3087,7 +3115,7 @@
 .method static final synthetic wS()Ljava/lang/Long;
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->uk()J
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->qT()J
 
     move-result-wide v0
 
@@ -3115,7 +3143,7 @@
 .method static final synthetic wU()Ljava/lang/Long;
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->qV()J
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->se()J
 
     move-result-wide v0
 
@@ -3129,7 +3157,7 @@
 .method static final synthetic wV()Ljava/lang/Long;
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->un()J
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->uE()J
 
     move-result-wide v0
 
@@ -3143,7 +3171,7 @@
 .method static final synthetic wW()Ljava/lang/Long;
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->sg()J
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->nl()J
 
     move-result-wide v0
 
@@ -3154,412 +3182,20 @@
     return-object v0
 .end method
 
-.method static final synthetic wX()Ljava/lang/Long;
+.method static final synthetic wX()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 wY()Ljava/lang/Integer;
     .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;->uF()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method static final synthetic wa()Ljava/lang/Boolean;
-    .locals 1
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/kz;->qg()Z
-
-    move-result v0
-
-    invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method static final synthetic wb()Ljava/lang/Boolean;
-    .locals 1
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/kz;->uI()Z
-
-    move-result v0
-
-    invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method static final synthetic wc()Ljava/lang/Boolean;
-    .locals 1
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/kz;->nO()Z
-
-    move-result v0
-
-    invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method static final synthetic wd()Ljava/lang/Boolean;
-    .locals 1
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/iu;->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 we()Ljava/lang/Boolean;
-    .locals 1
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/hj;->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 wf()Ljava/lang/Boolean;
-    .locals 1
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/io;->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 wg()Ljava/lang/Boolean;
-    .locals 1
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/io;->qg()Z
-
-    move-result v0
-
-    invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method static final synthetic wh()Ljava/lang/Boolean;
-    .locals 1
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/hp;->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 wi()Ljava/lang/Boolean;
-    .locals 1
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/km;->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 wj()Ljava/lang/Boolean;
-    .locals 1
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/kr;->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 wk()Ljava/lang/Boolean;
-    .locals 1
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/io;->nO()Z
-
-    move-result v0
-
-    invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method static final synthetic wl()Ljava/lang/Boolean;
-    .locals 1
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/kf;->nO()Z
-
-    move-result v0
-
-    invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method static final synthetic wm()Ljava/lang/Boolean;
-    .locals 1
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/kf;->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 wn()Ljava/lang/Boolean;
-    .locals 1
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/jm;->nO()Z
-
-    move-result v0
-
-    invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method static final synthetic wo()Ljava/lang/Boolean;
-    .locals 1
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/jm;->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 wp()Ljava/lang/Boolean;
-    .locals 1
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/jn;->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 wq()Ljava/lang/Boolean;
-    .locals 1
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/jh;->nO()Z
-
-    move-result v0
-
-    invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method static final synthetic wr()Ljava/lang/Boolean;
-    .locals 1
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/jh;->qg()Z
-
-    move-result v0
-
-    invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method static final synthetic ws()Ljava/lang/Boolean;
-    .locals 1
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/le;->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 wt()Ljava/lang/Boolean;
-    .locals 1
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/le;->qg()Z
-
-    move-result v0
-
-    invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method static final synthetic wu()Ljava/lang/Boolean;
-    .locals 1
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/lf;->qg()Z
-
-    move-result v0
-
-    invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method static final synthetic wv()Ljava/lang/Boolean;
-    .locals 1
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/lf;->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 ww()Ljava/lang/Boolean;
-    .locals 1
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/lf;->nO()Z
-
-    move-result v0
-
-    invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method static final synthetic wx()Ljava/lang/Boolean;
-    .locals 1
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/le;->nO()Z
-
-    move-result v0
-
-    invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method static final synthetic wy()Ljava/lang/Boolean;
-    .locals 1
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/lf;->pR()Z
-
-    move-result v0
-
-    invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method static final synthetic wz()Ljava/lang/Boolean;
-    .locals 1
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/jt;->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 xa()Ljava/lang/Integer;
-    .locals 2
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->sn()J
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->sl()J
 
     move-result-wide v0
 
@@ -3572,39 +3208,7 @@
     return-object v0
 .end method
 
-.method static final synthetic xb()Ljava/lang/Integer;
-    .locals 2
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->ux()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 xc()Ljava/lang/Integer;
-    .locals 2
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->ur()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 xd()Ljava/lang/Integer;
+.method static final synthetic wZ()Ljava/lang/Integer;
     .locals 2
 
     invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->uv()J
@@ -3620,10 +3224,374 @@
     return-object v0
 .end method
 
-.method static final synthetic xe()Ljava/lang/Integer;
+.method static final synthetic wa()Ljava/lang/Boolean;
+    .locals 1
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/kz;->nM()Z
+
+    move-result v0
+
+    invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method static final synthetic wb()Ljava/lang/Boolean;
+    .locals 1
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/iu;->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/hj;->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/Boolean;
+    .locals 1
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/io;->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 we()Ljava/lang/Boolean;
+    .locals 1
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/io;->qe()Z
+
+    move-result v0
+
+    invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method static final synthetic wf()Ljava/lang/Boolean;
+    .locals 1
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/hp;->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 wg()Ljava/lang/Boolean;
+    .locals 1
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/km;->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 wh()Ljava/lang/Boolean;
+    .locals 1
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/kr;->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 wi()Ljava/lang/Boolean;
+    .locals 1
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/io;->nM()Z
+
+    move-result v0
+
+    invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method static final synthetic wj()Ljava/lang/Boolean;
+    .locals 1
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/kf;->nM()Z
+
+    move-result v0
+
+    invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method static final synthetic wk()Ljava/lang/Boolean;
+    .locals 1
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/kf;->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 wl()Ljava/lang/Boolean;
+    .locals 1
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/jm;->nM()Z
+
+    move-result v0
+
+    invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method static final synthetic wm()Ljava/lang/Boolean;
+    .locals 1
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/jm;->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 wn()Ljava/lang/Boolean;
+    .locals 1
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/jn;->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 wo()Ljava/lang/Boolean;
+    .locals 1
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/jh;->nM()Z
+
+    move-result v0
+
+    invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method static final synthetic wp()Ljava/lang/Boolean;
+    .locals 1
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/jh;->qe()Z
+
+    move-result v0
+
+    invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method static final synthetic wq()Ljava/lang/Boolean;
+    .locals 1
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/le;->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 wr()Ljava/lang/Boolean;
+    .locals 1
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/le;->qe()Z
+
+    move-result v0
+
+    invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method static final synthetic ws()Ljava/lang/Boolean;
+    .locals 1
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/lf;->qe()Z
+
+    move-result v0
+
+    invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method static final synthetic wt()Ljava/lang/Boolean;
+    .locals 1
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/lf;->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 wu()Ljava/lang/Boolean;
+    .locals 1
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/lf;->nM()Z
+
+    move-result v0
+
+    invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method static final synthetic wv()Ljava/lang/Boolean;
+    .locals 1
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/le;->nM()Z
+
+    move-result v0
+
+    invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method static final synthetic ww()Ljava/lang/Boolean;
+    .locals 1
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/lf;->pP()Z
+
+    move-result v0
+
+    invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method static final synthetic wx()Ljava/lang/Boolean;
+    .locals 1
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/jt;->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 wy()Ljava/lang/Boolean;
+    .locals 1
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ky;->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 wz()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 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;->up()J
 
     move-result-wide v0
 
@@ -3636,23 +3604,7 @@
     return-object v0
 .end method
 
-.method static final synthetic xf()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 xg()Ljava/lang/Integer;
+.method static final synthetic xb()Ljava/lang/Integer;
     .locals 2
 
     invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->ut()J
@@ -3668,7 +3620,7 @@
     return-object v0
 .end method
 
-.method static final synthetic xh()Ljava/lang/Integer;
+.method static final synthetic xc()Ljava/lang/Integer;
     .locals 2
 
     invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->uq()J
@@ -3684,10 +3636,10 @@
     return-object v0
 .end method
 
-.method static final synthetic xi()Ljava/lang/Integer;
+.method static final synthetic xd()Ljava/lang/Integer;
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->uy()J
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->us()J
 
     move-result-wide v0
 
@@ -3700,10 +3652,10 @@
     return-object v0
 .end method
 
-.method static final synthetic xj()Ljava/lang/Integer;
+.method static final synthetic xe()Ljava/lang/Integer;
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->si()J
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->ur()J
 
     move-result-wide v0
 
@@ -3716,20 +3668,96 @@
     return-object v0
 .end method
 
-.method static final synthetic xk()Ljava/lang/String;
-    .locals 1
+.method static final synthetic xf()Ljava/lang/Integer;
+    .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->ug()Ljava/lang/String;
+    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;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method static final synthetic xl()Ljava/lang/String;
+.method static final synthetic xg()Ljava/lang/Integer;
+    .locals 2
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->uw()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 xh()Ljava/lang/Integer;
+    .locals 2
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->sg()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/String;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->uD()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->ue()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method static final synthetic xj()Ljava/lang/String;
+    .locals 1
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->uB()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method static final synthetic xk()Ljava/lang/Long;
+    .locals 2
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->uA()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 xl()Ljava/lang/Long;
+    .locals 2
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->uk()J
+
+    move-result-wide v0
+
+    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
     move-result-object v0
 
@@ -3739,7 +3767,7 @@
 .method static final synthetic xm()Ljava/lang/Long;
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->uC()J
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->uc()J
 
     move-result-wide v0
 
@@ -3750,45 +3778,17 @@
     return-object v0
 .end method
 
-.method static final synthetic xn()Ljava/lang/Long;
-    .locals 2
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->um()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 xo()Ljava/lang/Long;
-    .locals 2
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->ue()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 xp()Ljava/lang/String;
+.method static final synthetic xn()Ljava/lang/String;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->uf()Ljava/lang/String;
+    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 xq()Ljava/lang/Boolean;
+.method static final synthetic xo()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 xr()Ljava/lang/Boolean;
+.method static final synthetic xp()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 xs()Ljava/util/List;
+.method static synthetic xq()Ljava/util/List;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/o;->aCt:Ljava/util/List;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/o;->aCp: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 7ca119c549..c5c2dadee8 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/q;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->xq()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->xo()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 2ebb0ae382..939b96e918 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/r;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->xr()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->xp()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 5bc4b73db7..8ba7796434 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/s;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()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;->xe()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 2d41fa4ef8..6543f740be 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/t;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->xh()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/u.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/u.smali
index a87fc8508e..cf3ca8206f 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/u;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()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;->xc()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 d2bc3756be..2cc2eca8e2 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/v;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()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;->xd()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 78395540ac..16405cce02 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/w;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()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;->xa()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 947dd276dd..e9bfd57164 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/x;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()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;->xb()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 eb3d6e49bb..a0406d0f88 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 aEq:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEm: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;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/y;->aEm:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rC()Ljava/lang/Object;
+.method public final rA()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;->wY()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 fa92cfa787..c658f7813c 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 aBP:Ljava/util/Map;
+.field final aBL:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -15,9 +15,9 @@
     .end annotation
 .end field
 
-.field aBU:J
+.field aBQ:J
 
-.field final aty:Ljava/util/Map;
+.field final atu: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;->aBP:Ljava/util/Map;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/z;->aBL: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;->aty:Ljava/util/Map;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/z;->atu: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;->xx()Lcom/google/android/gms/measurement/internal/hh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ec;->xv()Lcom/google/android/gms/measurement/internal/hh;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/hh;->yA()Lcom/google/android/gms/measurement/internal/hi;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/hh;->yy()Lcom/google/android/gms/measurement/internal/hi;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/z;->aty:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/z;->atu: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;->aty:Ljava/util/Map;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/z;->atu: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;->aty:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/z;->atu: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;->aBU:J
+    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/z;->aBQ: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;->aty:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/z;->atu: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;->aty:Ljava/util/Map;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/z;->atu: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;->aty:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/z;->atu: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;->aBU:J
+    iput-wide p1, p0, Lcom/google/android/gms/measurement/internal/z;->aBQ:J
 
     :cond_1
     return-void
@@ -181,11 +181,11 @@
 
     if-nez p3, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p3
 
-    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->xu()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ec;->xs()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEE: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;->xu()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ec;->xs()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;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, 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/dv;->aEw: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;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()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;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, 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/dv;->aEw: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 rA()V
+.method public final bridge synthetic ry()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ec;->rA()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ec;->ry()V
 
     return-void
 .end method
 
-.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
+.method public final bridge synthetic vo()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ec;->vq()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ec;->vo()V
 
     return-void
 .end method
 
-.method public final bridge synthetic vr()Lcom/google/android/gms/measurement/internal/i;
+.method public final bridge synthetic vp()Lcom/google/android/gms/measurement/internal/i;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ec;->vr()Lcom/google/android/gms/measurement/internal/i;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ec;->vp()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vs()Lcom/google/android/gms/common/util/e;
+.method public final bridge synthetic vq()Lcom/google/android/gms/common/util/e;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ec;->vs()Lcom/google/android/gms/common/util/e;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ec;->vq()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vt()Landroid/content/Context;
+.method public final bridge synthetic vr()Landroid/content/Context;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ec;->vt()Landroid/content/Context;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ec;->vr()Landroid/content/Context;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vu()Lcom/google/android/gms/measurement/internal/dt;
+.method public final bridge synthetic vs()Lcom/google/android/gms/measurement/internal/dt;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ec;->vu()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ec;->vs()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vv()Lcom/google/android/gms/measurement/internal/jm;
+.method public final bridge synthetic vt()Lcom/google/android/gms/measurement/internal/jm;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ec;->vv()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ec;->vt()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vw()Lcom/google/android/gms/measurement/internal/ev;
+.method public final bridge synthetic vu()Lcom/google/android/gms/measurement/internal/ev;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ec;->vw()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ec;->vu()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vx()Lcom/google/android/gms/measurement/internal/dv;
+.method public final bridge synthetic vv()Lcom/google/android/gms/measurement/internal/dv;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ec;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ec;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vy()Lcom/google/android/gms/measurement/internal/eh;
+.method public final bridge synthetic vw()Lcom/google/android/gms/measurement/internal/eh;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ec;->vy()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ec;->vw()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vz()Lcom/google/android/gms/measurement/internal/ka;
+.method public final bridge synthetic vx()Lcom/google/android/gms/measurement/internal/ka;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ec;->vz()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ec;->vx()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xt()Lcom/google/android/gms/measurement/internal/z;
+.method public final bridge synthetic vy()Lcom/google/android/gms/measurement/internal/jz;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ec;->xt()Lcom/google/android/gms/measurement/internal/z;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ec;->vy()Lcom/google/android/gms/measurement/internal/jz;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xu()Lcom/google/android/gms/measurement/internal/gf;
+.method public final bridge synthetic xr()Lcom/google/android/gms/measurement/internal/z;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ec;->xu()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ec;->xr()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xv()Lcom/google/android/gms/measurement/internal/ds;
+.method public final bridge synthetic xs()Lcom/google/android/gms/measurement/internal/gf;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ec;->xv()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ec;->xs()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xw()Lcom/google/android/gms/measurement/internal/hm;
+.method public final bridge synthetic xt()Lcom/google/android/gms/measurement/internal/ds;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ec;->xw()Lcom/google/android/gms/measurement/internal/hm;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ec;->xt()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xx()Lcom/google/android/gms/measurement/internal/hh;
+.method public final bridge synthetic xu()Lcom/google/android/gms/measurement/internal/hm;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ec;->xx()Lcom/google/android/gms/measurement/internal/hh;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ec;->xu()Lcom/google/android/gms/measurement/internal/hm;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xy()Lcom/google/android/gms/measurement/internal/dr;
+.method public final bridge synthetic xv()Lcom/google/android/gms/measurement/internal/hh;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ec;->xy()Lcom/google/android/gms/measurement/internal/dr;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ec;->xv()Lcom/google/android/gms/measurement/internal/hh;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xz()Lcom/google/android/gms/measurement/internal/in;
+.method public final bridge synthetic xw()Lcom/google/android/gms/measurement/internal/dr;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ec;->xz()Lcom/google/android/gms/measurement/internal/in;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ec;->xw()Lcom/google/android/gms/measurement/internal/dr;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic xx()Lcom/google/android/gms/measurement/internal/in;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ec;->xx()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 dd69c503c9..5b75e4fcd3 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 aCr:Landroid/os/Bundle;
+.field final aCn: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;->aCr:Landroid/os/Bundle;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzam;->aCn: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;->aCr:Landroid/os/Bundle;
+    iget-object p0, p0, Lcom/google/android/gms/measurement/internal/zzam;->aCn: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;->aCr:Landroid/os/Bundle;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/zzam;->aCn: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;->aCr:Landroid/os/Bundle;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/zzam;->aCn: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;->aCr:Landroid/os/Bundle;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/zzam;->aCn: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;->aCr:Landroid/os/Bundle;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/zzam;->aCn: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;->aCr:Landroid/os/Bundle;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/zzam;->aCn: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 vB()Landroid/os/Bundle;
+.method public final vz()Landroid/os/Bundle;
     .locals 2
 
     new-instance v0, Landroid/os/Bundle;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/zzam;->aCr:Landroid/os/Bundle;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/zzam;->aCn: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;->vB()Landroid/os/Bundle;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/zzam;->vz()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 e72a1433f9..b0f477d0b3 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 aCq:Lcom/google/android/gms/measurement/internal/zzam;
+.field public final aCm:Lcom/google/android/gms/measurement/internal/zzam;
 
-.field public final anq:Ljava/lang/String;
+.field public final anm:Ljava/lang/String;
 
-.field public final atS:Ljava/lang/String;
+.field public final atO: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;->atS:Ljava/lang/String;
+    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzan;->atO:Ljava/lang/String;
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/zzan;->atS:Ljava/lang/String;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/zzan;->atO:Ljava/lang/String;
 
-    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzan;->aCq:Lcom/google/android/gms/measurement/internal/zzam;
+    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzan;->aCm: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;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/zzan;->aCm:Lcom/google/android/gms/measurement/internal/zzam;
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/zzan;->anq:Ljava/lang/String;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/zzan;->anm:Ljava/lang/String;
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzan;->anq:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzan;->anm: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;->atS:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzan;->atO:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/zzan;->aCq:Lcom/google/android/gms/measurement/internal/zzam;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/zzan;->aCm:Lcom/google/android/gms/measurement/internal/zzam;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/zzan;->anq:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/zzan;->anm: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;->anq:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/zzan;->anm:Ljava/lang/String;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/zzan;->atS:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/zzan;->atO:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/zzan;->aCq:Lcom/google/android/gms/measurement/internal/zzam;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/zzan;->aCm: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;->atS:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/zzan;->atO: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;->aCq:Lcom/google/android/gms/measurement/internal/zzam;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/zzan;->aCm: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;->anq:Ljava/lang/String;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/zzan;->anm: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 b517441899..b52b0bb314 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 aIB:Ljava/lang/Float;
+.field private final aIx:Ljava/lang/Float;
 
-.field public final aIC:Ljava/lang/Double;
+.field public final aIy:Ljava/lang/Double;
 
-.field public final anz:J
+.field public final anv:J
 
-.field public final asJ:Ljava/lang/Long;
+.field public final asF:Ljava/lang/Long;
 
-.field public final atS:Ljava/lang/String;
+.field public final atO: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;->atS:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/zzkj;->atO:Ljava/lang/String;
 
-    iput-wide p3, p0, Lcom/google/android/gms/measurement/internal/zzkj;->anz:J
+    iput-wide p3, p0, Lcom/google/android/gms/measurement/internal/zzkj;->anv:J
 
-    iput-object p5, p0, Lcom/google/android/gms/measurement/internal/zzkj;->asJ:Ljava/lang/Long;
+    iput-object p5, p0, Lcom/google/android/gms/measurement/internal/zzkj;->asF:Ljava/lang/Long;
 
     const/4 p2, 0x0
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/zzkj;->aIB:Ljava/lang/Float;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/zzkj;->aIx: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;->aIC:Ljava/lang/Double;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/zzkj;->aIy:Ljava/lang/Double;
 
     goto :goto_0
 
     :cond_1
-    iput-object p9, p0, Lcom/google/android/gms/measurement/internal/zzkj;->aIC:Ljava/lang/Double;
+    iput-object p9, p0, Lcom/google/android/gms/measurement/internal/zzkj;->aIy: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;->anq:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/jn;->anm: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;->asA:Ljava/lang/Object;
+    iget-object v4, p1, Lcom/google/android/gms/measurement/internal/jn;->asw:Ljava/lang/Object;
 
-    iget-object v5, p1, Lcom/google/android/gms/measurement/internal/jn;->ane:Ljava/lang/String;
+    iget-object v5, p1, Lcom/google/android/gms/measurement/internal/jn;->ana: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;->atS:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzkj;->atO:Ljava/lang/String;
 
     const-wide/16 v0, 0x0
 
-    iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/zzkj;->anz:J
+    iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/zzkj;->anv:J
 
     const/4 p1, 0x0
 
-    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;->asF:Ljava/lang/Long;
 
-    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;->aIx:Ljava/lang/Float;
 
-    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;->aIy: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;->atS:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzkj;->atO:Ljava/lang/String;
 
-    iput-wide p2, p0, Lcom/google/android/gms/measurement/internal/zzkj;->anz:J
+    iput-wide p2, p0, Lcom/google/android/gms/measurement/internal/zzkj;->anv: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;->asJ:Ljava/lang/Long;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzkj;->asF:Ljava/lang/Long;
 
-    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;->aIx:Ljava/lang/Float;
 
-    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;->aIy: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;->asJ:Ljava/lang/Long;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/zzkj;->asF:Ljava/lang/Long;
 
-    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;->aIx:Ljava/lang/Float;
 
-    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;->aIy: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;->asJ:Ljava/lang/Long;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzkj;->asF:Ljava/lang/Long;
 
-    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;->aIx:Ljava/lang/Float;
 
-    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;->aIy: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;->asJ:Ljava/lang/Long;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzkj;->asF:Ljava/lang/Long;
 
-    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;->aIx:Ljava/lang/Float;
 
     check-cast p4, Ljava/lang/Double;
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/zzkj;->aIC:Ljava/lang/Double;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/zzkj;->aIy: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 rC()Ljava/lang/Object;
+.method public final rA()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/zzkj;->asJ:Ljava/lang/Long;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/zzkj;->asF:Ljava/lang/Long;
 
     if-eqz v0, :cond_0
 
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/zzkj;->aIC:Ljava/lang/Double;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/zzkj;->aIy: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;->atS:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/zzkj;->atO: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;->anz:J
+    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/zzkj;->anv: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;->asJ:Ljava/lang/Long;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/zzkj;->asF: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;->aIC:Ljava/lang/Double;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/zzkj;->aIy: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 d0ce57d259..7d1304ab26 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,11 +16,11 @@
 
 
 # instance fields
-.field public final aEv:Ljava/lang/String;
+.field public final aEr:Ljava/lang/String;
 
-.field public final aIH:Ljava/lang/Boolean;
+.field public final aID:Ljava/lang/Boolean;
 
-.field public final aII:Ljava/util/List;
+.field public final aIE:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -30,25 +30,25 @@
     .end annotation
 .end field
 
-.field public final aIJ:Ljava/lang/String;
+.field public final aIF:Ljava/lang/String;
 
-.field public final adR:Z
+.field public final adN:Z
 
-.field public final amx:Z
+.field public final amt:Z
 
-.field public final ane:Ljava/lang/String;
+.field public final ana:Ljava/lang/String;
 
-.field public final anq:Ljava/lang/String;
+.field public final anm:Ljava/lang/String;
 
-.field public final atS:Ljava/lang/String;
+.field public final atO:Ljava/lang/String;
 
-.field public final awH:I
+.field public final awD:I
 
-.field public final axA:J
+.field public final axq:J
 
-.field public final axu:J
+.field public final axw:J
 
-.field public final azP:Z
+.field public final azL: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;->atS:Ljava/lang/String;
+    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->atO: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;->ane:Ljava/lang/String;
+    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->ana:Ljava/lang/String;
 
     move-object v1, p3
 
-    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->anq:Ljava/lang/String;
+    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->anm: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;->aEv:Ljava/lang/String;
+    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->aEr: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;->axu:J
+    iput-wide v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->axq:J
 
     move/from16 v1, p19
 
-    iput v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->awH:I
+    iput v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->awD:I
 
     move/from16 v1, p20
 
-    iput-boolean v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->azP:Z
+    iput-boolean v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->azL:Z
 
     move/from16 v1, p21
 
-    iput-boolean v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->adR:Z
+    iput-boolean v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->adN:Z
 
     move/from16 v1, p22
 
-    iput-boolean v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->amx:Z
+    iput-boolean v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->amt: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;->aIH:Ljava/lang/Boolean;
+    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->aID:Ljava/lang/Boolean;
 
     move-wide/from16 v1, p25
 
-    iput-wide v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->axA:J
+    iput-wide v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->axw:J
 
     move-object/from16 v1, p27
 
-    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->aII:Ljava/util/List;
+    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->aIE:Ljava/util/List;
 
     move-object/from16 v1, p28
 
-    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->aIJ:Ljava/lang/String;
+    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->aIF: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;->atS:Ljava/lang/String;
+    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->atO:Ljava/lang/String;
 
     move-object v1, p2
 
-    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->ane:Ljava/lang/String;
+    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->ana:Ljava/lang/String;
 
     move-object v1, p3
 
-    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->anq:Ljava/lang/String;
+    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->anm: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;->aEv:Ljava/lang/String;
+    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->aEr: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;->axu:J
+    iput-wide v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->axq:J
 
     move/from16 v1, p19
 
-    iput v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->awH:I
+    iput v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->awD:I
 
     move/from16 v1, p20
 
-    iput-boolean v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->azP:Z
+    iput-boolean v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->azL:Z
 
     move/from16 v1, p21
 
-    iput-boolean v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->adR:Z
+    iput-boolean v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->adN:Z
 
     move/from16 v1, p22
 
-    iput-boolean v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->amx:Z
+    iput-boolean v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->amt: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;->aIH:Ljava/lang/Boolean;
+    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->aID:Ljava/lang/Boolean;
 
     move-wide/from16 v1, p25
 
-    iput-wide v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->axA:J
+    iput-wide v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->axw:J
 
     move-object/from16 v1, p27
 
-    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->aII:Ljava/util/List;
+    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->aIE:Ljava/util/List;
 
     move-object/from16 v1, p28
 
-    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->aIJ:Ljava/lang/String;
+    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->aIF: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;->atS:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/zzm;->atO: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;->ane:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/zzm;->ana: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;->anq:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/zzm;->anm: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;->aEv:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/zzm;->aEr: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;->axu:J
+    iget-wide v2, p0, Lcom/google/android/gms/measurement/internal/zzm;->axq: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;->awH:I
+    iget v0, p0, Lcom/google/android/gms/measurement/internal/zzm;->awD: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;->azP:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/zzm;->azL: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;->adR:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/zzm;->adN: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;->amx:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/zzm;->amt: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;->aIH:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/zzm;->aID: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;->axA:J
+    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/zzm;->axw: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;->aII:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/zzm;->aIE: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;->aIJ:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/zzm;->aIF: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 0c9daaf6a6..72ad1de68c 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 aIV:Lcom/google/android/gms/measurement/internal/zzkj;
+.field public aIR:Lcom/google/android/gms/measurement/internal/zzkj;
 
-.field public aIW:Lcom/google/android/gms/measurement/internal/zzan;
+.field public aIS:Lcom/google/android/gms/measurement/internal/zzan;
 
-.field public aIX:Lcom/google/android/gms/measurement/internal/zzan;
+.field public aIT:Lcom/google/android/gms/measurement/internal/zzan;
 
-.field public aIY:Lcom/google/android/gms/measurement/internal/zzan;
+.field public aIU:Lcom/google/android/gms/measurement/internal/zzan;
 
-.field public ane:Ljava/lang/String;
+.field public ana:Ljava/lang/String;
 
-.field public atS:Ljava/lang/String;
+.field public atO: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;->atS:Ljava/lang/String;
+    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzv;->atO:Ljava/lang/String;
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/zzv;->atS:Ljava/lang/String;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/zzv;->atO:Ljava/lang/String;
 
-    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzv;->ane:Ljava/lang/String;
+    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzv;->ana:Ljava/lang/String;
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/zzv;->ane:Ljava/lang/String;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/zzv;->ana:Ljava/lang/String;
 
-    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIR: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;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/zzv;->aIR: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;->aIW:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIS: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;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/zzv;->aIS: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;->aIX:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIT: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;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/zzv;->aIT: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;->aIY:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIU: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;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzv;->aIU: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;->atS:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzv;->atO:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/zzv;->ane:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/zzv;->ana:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/zzv;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/zzv;->aIR: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;->aIW:Lcom/google/android/gms/measurement/internal/zzan;
+    iput-object p8, p0, Lcom/google/android/gms/measurement/internal/zzv;->aIS: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;->aIX:Lcom/google/android/gms/measurement/internal/zzan;
+    iput-object p11, p0, Lcom/google/android/gms/measurement/internal/zzv;->aIT: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;->aIY:Lcom/google/android/gms/measurement/internal/zzan;
+    iput-object p14, p0, Lcom/google/android/gms/measurement/internal/zzv;->aIU: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;->atS:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/zzv;->atO: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;->ane:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/zzv;->ana: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;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/zzv;->aIR: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;->aIW:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/zzv;->aIS: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;->aIX:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/zzv;->aIT: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;->aIY:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/zzv;->aIU: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 9775be7557..af84dd91fa 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 aJb:Lcom/google/android/gms/measurement/module/Analytics;
+.field private static volatile aIX:Lcom/google/android/gms/measurement/module/Analytics;
 
 
 # instance fields
-.field private final aBK:Lcom/google/android/gms/measurement/internal/ey;
+.field private final aBG: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;->aBK:Lcom/google/android/gms/measurement/internal/ey;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/module/Analytics;->aBG: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;->aJb:Lcom/google/android/gms/measurement/module/Analytics;
+    sget-object v0, Lcom/google/android/gms/measurement/module/Analytics;->aIX: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;->aJb:Lcom/google/android/gms/measurement/module/Analytics;
+    sget-object v1, Lcom/google/android/gms/measurement/module/Analytics;->aIX: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;->aJb:Lcom/google/android/gms/measurement/module/Analytics;
+    sput-object v1, Lcom/google/android/gms/measurement/module/Analytics;->aIX: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;->aJb:Lcom/google/android/gms/measurement/module/Analytics;
+    sget-object p0, Lcom/google/android/gms/measurement/module/Analytics;->aIX: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 d22c7f9630..394c24b0c8 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 aJc:Lcom/google/android/gms/common/api/a;
+.field public static final aIY: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 aJd:Lcom/google/android/gms/nearby/connection/c;
+.field public static final aIZ:Lcom/google/android/gms/nearby/connection/c;
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field public static final aJe:Lcom/google/android/gms/common/api/a;
+.field public static final aJa: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 aJf:Lcom/google/android/gms/nearby/messages/a;
+.field public static final aJb:Lcom/google/android/gms/nearby/messages/a;
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field private static final aJg:Lcom/google/android/gms/nearby/messages/h;
+.field private static final aJc:Lcom/google/android/gms/nearby/messages/h;
 
-.field private static final aJh:Lcom/google/android/gms/common/api/a;
+.field private static final aJd: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 aJi:Lcom/google/android/gms/internal/nearby/ae;
+.field private static final aJe: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;->aAo:Lcom/google/android/gms/common/api/a$a;
+    sget-object v1, Lcom/google/android/gms/internal/nearby/t;->aAk:Lcom/google/android/gms/common/api/a$a;
 
-    sget-object v2, Lcom/google/android/gms/internal/nearby/t;->aAn:Lcom/google/android/gms/common/api/a$g;
+    sget-object v2, Lcom/google/android/gms/internal/nearby/t;->aAj: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;->aJc:Lcom/google/android/gms/common/api/a;
+    sput-object v0, Lcom/google/android/gms/nearby/a;->aIY: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;->aJd:Lcom/google/android/gms/nearby/connection/c;
+    sput-object v0, Lcom/google/android/gms/nearby/a;->aIZ: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;->aAo:Lcom/google/android/gms/common/api/a$a;
+    sget-object v1, Lcom/google/android/gms/nearby/messages/internal/ae;->aAk:Lcom/google/android/gms/common/api/a$a;
 
-    sget-object v2, Lcom/google/android/gms/nearby/messages/internal/ae;->aAn:Lcom/google/android/gms/common/api/a$g;
+    sget-object v2, Lcom/google/android/gms/nearby/messages/internal/ae;->aAj: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;->aJe:Lcom/google/android/gms/common/api/a;
+    sput-object v0, Lcom/google/android/gms/nearby/a;->aJa:Lcom/google/android/gms/common/api/a;
 
-    sget-object v0, Lcom/google/android/gms/nearby/messages/internal/ae;->aKU:Lcom/google/android/gms/nearby/messages/internal/ae;
+    sget-object v0, Lcom/google/android/gms/nearby/messages/internal/ae;->aKQ:Lcom/google/android/gms/nearby/messages/internal/ae;
 
-    sput-object v0, Lcom/google/android/gms/nearby/a;->aJf:Lcom/google/android/gms/nearby/messages/a;
+    sput-object v0, Lcom/google/android/gms/nearby/a;->aJb: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;->aJg:Lcom/google/android/gms/nearby/messages/h;
+    sput-object v0, Lcom/google/android/gms/nearby/a;->aJc: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;->aAo:Lcom/google/android/gms/common/api/a$a;
+    sget-object v1, Lcom/google/android/gms/internal/nearby/as;->aAk:Lcom/google/android/gms/common/api/a$a;
 
-    sget-object v2, Lcom/google/android/gms/internal/nearby/as;->aAn:Lcom/google/android/gms/common/api/a$g;
+    sget-object v2, Lcom/google/android/gms/internal/nearby/as;->aAj: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;->aJh:Lcom/google/android/gms/common/api/a;
+    sput-object v0, Lcom/google/android/gms/nearby/a;->aJd: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;->aJi:Lcom/google/android/gms/internal/nearby/ae;
+    sput-object v0, Lcom/google/android/gms/nearby/a;->aJe: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 236fc0fbb5..95e51df942 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 aJr:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
+.field public final aJn: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;->aJr:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
+    iput-object v0, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate$a;->aJn: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;->aJr:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
+    iput-object v0, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate$a;->aJn: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;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate$a;->aJn: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;->aJr:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate$a;->aJn: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;->aJr:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate$a;->aJn: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;->aJr:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate$a;->aJn: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 832b9f364d..dab36b2949 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 aAl:J
+.field public aAh:J
 
-.field private aGo:J
+.field private aGk:J
 
-.field private aJq:J
+.field private aJm: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;->aAl:J
+    iput-wide p1, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aAh:J
 
     iput p3, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->status:I
 
-    iput-wide p4, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aGo:J
+    iput-wide p4, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aGk:J
 
-    iput-wide p6, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aJq:J
+    iput-wide p6, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aJm: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;->aAl:J
+    iget-wide v0, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aAh: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;->aAl:J
+    iput-wide p1, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aAh: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;->aGo:J
+    iput-wide p1, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aGk: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;->aGo:J
+    iget-wide v0, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aGk: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;->aJq:J
+    iput-wide p1, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aJm: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;->aJq:J
+    iget-wide v0, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aJm: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;->aAl:J
+    iget-wide v3, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aAh: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;->aAl:J
+    iget-wide v3, p1, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aAh: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;->aGo:J
+    iget-wide v3, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aGk: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;->aGo:J
+    iget-wide v3, p1, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aGk: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;->aJq:J
+    iget-wide v3, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aJm: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;->aJq:J
+    iget-wide v3, p1, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aJm: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;->aAl:J
+    iget-wide v1, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aAh: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;->aGo:J
+    iget-wide v1, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aGk: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;->aJq:J
+    iget-wide v1, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aJm: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;->aAl:J
+    iget-wide v0, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aAh: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;->aGo:J
+    iget-wide v0, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aGk: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;->aJq:J
+    iget-wide v0, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aJm: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 0305ce8fe9..75a4885b1e 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 aAs:Z
+.field private final aAo: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;->aAs:Z
+    iput-boolean p3, p0, Lcom/google/android/gms/nearby/connection/a;->aAo: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 2315712f92..f4eae68c51 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 aJj:Lcom/google/android/gms/common/api/Status;
+.field private final aJf: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;->aJj:Lcom/google/android/gms/common/api/Status;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/connection/b;->aJf: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 54d3241557..34a139622d 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 aAu:Ljava/lang/String;
+.field private final aAq:Ljava/lang/String;
 
-.field private final aAv:Landroid/bluetooth/BluetoothDevice;
+.field private final aAr: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;->aAu:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/connection/d;->aAq: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;->aAv:Landroid/bluetooth/BluetoothDevice;
+    iput-object p2, p0, Lcom/google/android/gms/nearby/connection/d;->aAr: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;->aAu:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/connection/d;->aAq: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;->aAv:Landroid/bluetooth/BluetoothDevice;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/connection/d;->aAr: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 23fb898521..4dcc874e68 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 aJm:Ljava/io/File;
+.field private final aJi:Ljava/io/File;
 
-.field private final aJn:Landroid/os/ParcelFileDescriptor;
+.field private final aJj:Landroid/os/ParcelFileDescriptor;
 
-.field private final aJo:J
+.field private final aJk: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;->aJm:Ljava/io/File;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/connection/e$a;->aJi:Ljava/io/File;
 
-    iput-object p2, p0, Lcom/google/android/gms/nearby/connection/e$a;->aJn:Landroid/os/ParcelFileDescriptor;
+    iput-object p2, p0, Lcom/google/android/gms/nearby/connection/e$a;->aJj:Landroid/os/ParcelFileDescriptor;
 
-    iput-wide p3, p0, Lcom/google/android/gms/nearby/connection/e$a;->aJo:J
+    iput-wide p3, p0, Lcom/google/android/gms/nearby/connection/e$a;->aJk: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 1cc490b99a..89e3dd3150 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 aJn:Landroid/os/ParcelFileDescriptor;
+.field private final aJj:Landroid/os/ParcelFileDescriptor;
 
-.field private aJp:Ljava/io/InputStream;
+.field private aJl: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;->aJn:Landroid/os/ParcelFileDescriptor;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/connection/e$b;->aJj:Landroid/os/ParcelFileDescriptor;
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/google/android/gms/nearby/connection/e$b;->aJp:Ljava/io/InputStream;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/connection/e$b;->aJl: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 21914949cb..ddf54c3a12 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 aAD:[B
+.field private final aAz:[B
 
-.field private final aJk:Lcom/google/android/gms/nearby/connection/e$a;
+.field private final aJg:Lcom/google/android/gms/nearby/connection/e$a;
 
-.field private final aJl:Lcom/google/android/gms/nearby/connection/e$b;
+.field private final aJh: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;->aAD:[B
+    iput-object p4, p0, Lcom/google/android/gms/nearby/connection/e;->aAz:[B
 
-    iput-object p5, p0, Lcom/google/android/gms/nearby/connection/e;->aJk:Lcom/google/android/gms/nearby/connection/e$a;
+    iput-object p5, p0, Lcom/google/android/gms/nearby/connection/e;->aJg:Lcom/google/android/gms/nearby/connection/e$a;
 
-    iput-object p6, p0, Lcom/google/android/gms/nearby/connection/e;->aJl:Lcom/google/android/gms/nearby/connection/e$b;
+    iput-object p6, p0, Lcom/google/android/gms/nearby/connection/e;->aJh: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 f95c9ce6ca..ca3d393b92 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 aAq:I
+.field private final aAm: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;->aAq:I
+    iput p1, p0, Lcom/google/android/gms/nearby/connection/f;->aAm: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 942f5581dc..cffc70ce73 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 yX()I
+.method public abstract yV()I
 .end method
 
-.method public abstract yY()I
+.method public abstract yW()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 7f3731ea97..47f75ef15a 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 aJs:Lcom/google/android/gms/nearby/messages/Distance;
+.field public static final aJo: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;->aJs:Lcom/google/android/gms/nearby/messages/Distance;
+    sput-object v0, Lcom/google/android/gms/nearby/messages/Distance;->aJo:Lcom/google/android/gms/nearby/messages/Distance;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public abstract yZ()D
+.method public abstract yX()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 aaa11a48b9..c329cfc79c 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 aJt:[Lcom/google/android/gms/internal/nearby/zzgs;
+.field private static final aJp:[Lcom/google/android/gms/internal/nearby/zzgs;
 
 
 # instance fields
-.field public final aJu:[B
+.field public final aJq:[B
 
-.field private final aJv:Ljava/lang/String;
+.field private final aJr:Ljava/lang/String;
 
-.field private final aJw:[Lcom/google/android/gms/internal/nearby/zzgs;
+.field private final aJs:[Lcom/google/android/gms/internal/nearby/zzgs;
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field private final aJx:J
+.field private final aJt:J
 
-.field private final aeM:I
+.field private final aeI: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;->aAY:Lcom/google/android/gms/internal/nearby/zzgs;
+    sget-object v1, Lcom/google/android/gms/internal/nearby/zzgs;->aAU: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;->aJt:[Lcom/google/android/gms/internal/nearby/zzgs;
+    sput-object v0, Lcom/google/android/gms/nearby/messages/Message;->aJp:[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;->aeM:I
+    iput p1, p0, Lcom/google/android/gms/nearby/messages/Message;->aeI: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;->aJv:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/nearby/messages/Message;->aJr:Ljava/lang/String;
 
-    iput-wide p6, p0, Lcom/google/android/gms/nearby/messages/Message;->aJx:J
+    iput-wide p6, p0, Lcom/google/android/gms/nearby/messages/Message;->aJt: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;->aJu:[B
+    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/Message;->aJq:[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;->aJt:[Lcom/google/android/gms/internal/nearby/zzgs;
+    sget-object p5, Lcom/google/android/gms/nearby/messages/Message;->aJp:[Lcom/google/android/gms/internal/nearby/zzgs;
 
     :cond_3
-    iput-object p5, p0, Lcom/google/android/gms/nearby/messages/Message;->aJw:[Lcom/google/android/gms/internal/nearby/zzgs;
+    iput-object p5, p0, Lcom/google/android/gms/nearby/messages/Message;->aJs:[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;->aJt:[Lcom/google/android/gms/internal/nearby/zzgs;
+    sget-object v0, Lcom/google/android/gms/nearby/messages/Message;->aJp:[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;->aJv:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/Message;->aJr:Ljava/lang/String;
 
-    iget-object v3, p1, Lcom/google/android/gms/nearby/messages/Message;->aJv:Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/nearby/messages/Message;->aJr: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;->aJu:[B
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/Message;->aJq:[B
 
-    iget-object v3, p1, Lcom/google/android/gms/nearby/messages/Message;->aJu:[B
+    iget-object v3, p1, Lcom/google/android/gms/nearby/messages/Message;->aJq:[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;->aJx:J
+    iget-wide v3, p0, Lcom/google/android/gms/nearby/messages/Message;->aJt:J
 
-    iget-wide v5, p1, Lcom/google/android/gms/nearby/messages/Message;->aJx:J
+    iget-wide v5, p1, Lcom/google/android/gms/nearby/messages/Message;->aJt: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;->aJv:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/Message;->aJr: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;->aJu:[B
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/Message;->aJq:[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;->aJx:J
+    iget-wide v1, p0, Lcom/google/android/gms/nearby/messages/Message;->aJt: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;->aJv:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/Message;->aJr: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;->aJu:[B
+    iget-object v2, p0, Lcom/google/android/gms/nearby/messages/Message;->aJq:[B
 
     if-nez v2, :cond_0
 
@@ -442,7 +442,7 @@
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/Message;->aJu:[B
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/Message;->aJq:[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;->aJv:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/Message;->aJr: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;->aJw:[Lcom/google/android/gms/internal/nearby/zzgs;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/Message;->aJs:[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;->aJx:J
+    iget-wide v1, p0, Lcom/google/android/gms/nearby/messages/Message;->aJt: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;->aeM:I
+    iget p2, p0, Lcom/google/android/gms/nearby/messages/Message;->aeI: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 2b5b69078e..a30a279b88 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,21 +14,7 @@
 
 
 # instance fields
-.field final aJA:Ljava/util/List;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/List<",
-            "Lcom/google/android/gms/internal/nearby/zzgu;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field aJB:Z
-
-.field aJD:I
-
-.field final aJE:Ljava/util/Set;
+.field final aJA:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -38,7 +24,7 @@
     .end annotation
 .end field
 
-.field final aJF:Ljava/util/Set;
+.field final aJB:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -48,6 +34,20 @@
     .end annotation
 .end field
 
+.field final aJw:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "Lcom/google/android/gms/internal/nearby/zzgu;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field aJx:Z
+
+.field aJz:I
+
 
 # direct methods
 .method public constructor <init>()V
@@ -59,23 +59,23 @@
 
     invoke-direct {v0}, Ljava/util/HashSet;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/gms/nearby/messages/MessageFilter$a;->aJE:Ljava/util/Set;
+    iput-object v0, p0, Lcom/google/android/gms/nearby/messages/MessageFilter$a;->aJA: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;->aJA:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/android/gms/nearby/messages/MessageFilter$a;->aJw: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;->aJF:Ljava/util/Set;
+    iput-object v0, p0, Lcom/google/android/gms/nearby/messages/MessageFilter$a;->aJB:Ljava/util/Set;
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lcom/google/android/gms/nearby/messages/MessageFilter$a;->aJD:I
+    iput v0, p0, Lcom/google/android/gms/nearby/messages/MessageFilter$a;->aJz: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 b80bc128c7..de33d3c942 100644
--- a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/MessageFilter.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/MessageFilter.smali
@@ -21,13 +21,23 @@
     .end annotation
 .end field
 
-.field public static final aJy:Lcom/google/android/gms/nearby/messages/MessageFilter;
+.field public static final aJu:Lcom/google/android/gms/nearby/messages/MessageFilter;
 
 
 # instance fields
-.field private final aAH:I
+.field private final aAD:I
 
-.field private final aJA:Ljava/util/List;
+.field private final aJv: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 aJw:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -37,9 +47,9 @@
     .end annotation
 .end field
 
-.field private final aJB:Z
+.field private final aJx:Z
 
-.field private final aJC:Ljava/util/List;
+.field private final aJy:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -49,17 +59,7 @@
     .end annotation
 .end field
 
-.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
+.field private final aJz:I
 
 
 # direct methods
@@ -78,13 +78,13 @@
 
     const/4 v1, 0x1
 
-    iput-boolean v1, v0, Lcom/google/android/gms/nearby/messages/MessageFilter$a;->aJB:Z
+    iput-boolean v1, v0, Lcom/google/android/gms/nearby/messages/MessageFilter$a;->aJx:Z
 
-    iget-boolean v2, v0, Lcom/google/android/gms/nearby/messages/MessageFilter$a;->aJB:Z
+    iget-boolean v2, v0, Lcom/google/android/gms/nearby/messages/MessageFilter$a;->aJx:Z
 
     if-nez v2, :cond_1
 
-    iget-object v2, v0, Lcom/google/android/gms/nearby/messages/MessageFilter$a;->aJE:Ljava/util/Set;
+    iget-object v2, v0, Lcom/google/android/gms/nearby/messages/MessageFilter$a;->aJA: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;->aJE:Ljava/util/Set;
+    iget-object v2, v0, Lcom/google/android/gms/nearby/messages/MessageFilter$a;->aJA: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;->aJA:Ljava/util/List;
+    iget-object v5, v0, Lcom/google/android/gms/nearby/messages/MessageFilter$a;->aJw:Ljava/util/List;
 
-    iget-boolean v6, v0, Lcom/google/android/gms/nearby/messages/MessageFilter$a;->aJB:Z
+    iget-boolean v6, v0, Lcom/google/android/gms/nearby/messages/MessageFilter$a;->aJx:Z
 
     new-instance v7, Ljava/util/ArrayList;
 
-    iget-object v2, v0, Lcom/google/android/gms/nearby/messages/MessageFilter$a;->aJF:Ljava/util/Set;
+    iget-object v2, v0, Lcom/google/android/gms/nearby/messages/MessageFilter$a;->aJB: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;->aJD:I
+    iget v8, v0, Lcom/google/android/gms/nearby/messages/MessageFilter$a;->aJz: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;->aJy:Lcom/google/android/gms/nearby/messages/MessageFilter;
+    sput-object v1, Lcom/google/android/gms/nearby/messages/MessageFilter;->aJu: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;->aAH:I
+    iput p1, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aAD: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;->aJz:Ljava/util/List;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aJv:Ljava/util/List;
 
-    iput-boolean p4, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aJB:Z
+    iput-boolean p4, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aJx: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;->aJA:Ljava/util/List;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aJw: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;->aJC:Ljava/util/List;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aJy:Ljava/util/List;
 
-    iput p6, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aJD:I
+    iput p6, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aJz: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;->aJB:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aJx:Z
 
-    iget-boolean v3, p1, Lcom/google/android/gms/nearby/messages/MessageFilter;->aJB:Z
+    iget-boolean v3, p1, Lcom/google/android/gms/nearby/messages/MessageFilter;->aJx:Z
 
     if-ne v1, v3, :cond_2
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aJz:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aJv:Ljava/util/List;
 
-    iget-object v3, p1, Lcom/google/android/gms/nearby/messages/MessageFilter;->aJz:Ljava/util/List;
+    iget-object v3, p1, Lcom/google/android/gms/nearby/messages/MessageFilter;->aJv: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;->aJA:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aJw:Ljava/util/List;
 
-    iget-object v3, p1, Lcom/google/android/gms/nearby/messages/MessageFilter;->aJA:Ljava/util/List;
+    iget-object v3, p1, Lcom/google/android/gms/nearby/messages/MessageFilter;->aJw: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;->aJC:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aJy:Ljava/util/List;
 
-    iget-object p1, p1, Lcom/google/android/gms/nearby/messages/MessageFilter;->aJC:Ljava/util/List;
+    iget-object p1, p1, Lcom/google/android/gms/nearby/messages/MessageFilter;->aJy: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;->aJz:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aJv:Ljava/util/List;
 
     const/4 v2, 0x0
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aJA:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aJw:Ljava/util/List;
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    iget-boolean v1, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aJB:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aJx: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;->aJC:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aJy: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;->aJB:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aJx:Z
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aJz:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aJv: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;->aJz:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aJv: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;->aJA:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aJw: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;->aJB:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aJx: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;->aJC:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aJy: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;->aJD:I
+    iget v0, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aJz: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;->aAH:I
+    iget v0, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aAD: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 05e42f175e..ca62de83b5 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 aJL:Lcom/google/android/gms/nearby/messages/Strategy;
+.field private aJH:Lcom/google/android/gms/nearby/messages/Strategy;
 
-.field public aJM:Lcom/google/android/gms/nearby/messages/c;
+.field public aJI: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;->aJN:Lcom/google/android/gms/nearby/messages/Strategy;
+    sget-object v0, Lcom/google/android/gms/nearby/messages/Strategy;->aJJ: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;
+    iput-object v0, p0, Lcom/google/android/gms/nearby/messages/PublishOptions$a;->aJH:Lcom/google/android/gms/nearby/messages/Strategy;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final za()Lcom/google/android/gms/nearby/messages/PublishOptions;
+.method public final yY()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;->aJL:Lcom/google/android/gms/nearby/messages/Strategy;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/PublishOptions$a;->aJH:Lcom/google/android/gms/nearby/messages/Strategy;
 
-    iget-object v2, p0, Lcom/google/android/gms/nearby/messages/PublishOptions$a;->aJM:Lcom/google/android/gms/nearby/messages/c;
+    iget-object v2, p0, Lcom/google/android/gms/nearby/messages/PublishOptions$a;->aJI: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 61f52447a1..1f7b375fd8 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 aJK:Lcom/google/android/gms/nearby/messages/PublishOptions;
+.field public static final aJG:Lcom/google/android/gms/nearby/messages/PublishOptions;
 
 
 # instance fields
-.field public final aJL:Lcom/google/android/gms/nearby/messages/Strategy;
+.field public final aJH:Lcom/google/android/gms/nearby/messages/Strategy;
 
-.field public final aJM:Lcom/google/android/gms/nearby/messages/c;
+.field public final aJI: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;->za()Lcom/google/android/gms/nearby/messages/PublishOptions;
+    invoke-virtual {v0}, Lcom/google/android/gms/nearby/messages/PublishOptions$a;->yY()Lcom/google/android/gms/nearby/messages/PublishOptions;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/nearby/messages/PublishOptions;->aJK:Lcom/google/android/gms/nearby/messages/PublishOptions;
+    sput-object v0, Lcom/google/android/gms/nearby/messages/PublishOptions;->aJG: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;->aJL:Lcom/google/android/gms/nearby/messages/Strategy;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/PublishOptions;->aJH:Lcom/google/android/gms/nearby/messages/Strategy;
 
-    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/PublishOptions;->aJM:Lcom/google/android/gms/nearby/messages/c;
+    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/PublishOptions;->aJI: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 9721c64223..d5d96f4b1f 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 aJU:I
+.field private aJQ:I
 
-.field aJV:I
+.field aJR:I
 
-.field private aJW:I
+.field private aJS:I
 
-.field private aJX:I
+.field private aJT:I
 
-.field aly:I
+.field alu:I
 
 
 # direct methods
@@ -33,37 +33,37 @@
 
     const/4 v0, 0x3
 
-    iput v0, p0, Lcom/google/android/gms/nearby/messages/Strategy$a;->aJU:I
+    iput v0, p0, Lcom/google/android/gms/nearby/messages/Strategy$a;->aJQ:I
 
     const/16 v0, 0x12c
 
-    iput v0, p0, Lcom/google/android/gms/nearby/messages/Strategy$a;->aJV:I
+    iput v0, p0, Lcom/google/android/gms/nearby/messages/Strategy$a;->aJR:I
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lcom/google/android/gms/nearby/messages/Strategy$a;->aJW:I
+    iput v0, p0, Lcom/google/android/gms/nearby/messages/Strategy$a;->aJS:I
 
     const/4 v1, -0x1
 
-    iput v1, p0, Lcom/google/android/gms/nearby/messages/Strategy$a;->aly:I
+    iput v1, p0, Lcom/google/android/gms/nearby/messages/Strategy$a;->alu:I
 
-    iput v0, p0, Lcom/google/android/gms/nearby/messages/Strategy$a;->aJX:I
+    iput v0, p0, Lcom/google/android/gms/nearby/messages/Strategy$a;->aJT:I
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final zb()Lcom/google/android/gms/nearby/messages/Strategy;
+.method public final yZ()Lcom/google/android/gms/nearby/messages/Strategy;
     .locals 11
 
-    iget v0, p0, Lcom/google/android/gms/nearby/messages/Strategy$a;->aly:I
+    iget v0, p0, Lcom/google/android/gms/nearby/messages/Strategy$a;->alu:I
 
     const/4 v1, 0x2
 
     if-ne v0, v1, :cond_1
 
-    iget v0, p0, Lcom/google/android/gms/nearby/messages/Strategy$a;->aJW:I
+    iget v0, p0, Lcom/google/android/gms/nearby/messages/Strategy$a;->aJS:I
 
     const/4 v1, 0x1
 
@@ -88,15 +88,15 @@
 
     const/4 v4, 0x0
 
-    iget v5, p0, Lcom/google/android/gms/nearby/messages/Strategy$a;->aJV:I
+    iget v5, p0, Lcom/google/android/gms/nearby/messages/Strategy$a;->aJR:I
 
-    iget v6, p0, Lcom/google/android/gms/nearby/messages/Strategy$a;->aJW:I
+    iget v6, p0, Lcom/google/android/gms/nearby/messages/Strategy$a;->aJS:I
 
     const/4 v7, 0x0
 
-    iget v8, p0, Lcom/google/android/gms/nearby/messages/Strategy$a;->aly:I
+    iget v8, p0, Lcom/google/android/gms/nearby/messages/Strategy$a;->alu:I
 
-    iget v9, p0, Lcom/google/android/gms/nearby/messages/Strategy$a;->aJU:I
+    iget v9, p0, Lcom/google/android/gms/nearby/messages/Strategy$a;->aJQ: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 b02b1fca07..29c69b9d29 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 aJN:Lcom/google/android/gms/nearby/messages/Strategy;
+.field public static final aJJ:Lcom/google/android/gms/nearby/messages/Strategy;
 
-.field public static final aJO:Lcom/google/android/gms/nearby/messages/Strategy;
+.field public static final aJK:Lcom/google/android/gms/nearby/messages/Strategy;
 
-.field private static final aJP:Lcom/google/android/gms/nearby/messages/Strategy;
+.field private static final aJL:Lcom/google/android/gms/nearby/messages/Strategy;
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
 
 # instance fields
-.field private final aAH:I
+.field private final aAD:I
 
-.field private final aJQ:I
+.field private final aJM:I
 
-.field private final aJR:Z
+.field private final aJN:Z
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field private final aJS:I
+.field private final aJO:I
 
-.field private final aJT:I
+.field private final aJP:I
 
-.field private final alo:I
+.field private final alj:I
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field private final alq:I
+.field private final alm:I
 
-.field public final alu:I
+.field public final alq: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;->zb()Lcom/google/android/gms/nearby/messages/Strategy;
+    invoke-virtual {v0}, Lcom/google/android/gms/nearby/messages/Strategy$a;->yZ()Lcom/google/android/gms/nearby/messages/Strategy;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/nearby/messages/Strategy;->aJN:Lcom/google/android/gms/nearby/messages/Strategy;
+    sput-object v0, Lcom/google/android/gms/nearby/messages/Strategy;->aJJ: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;->aly:I
+    iput v1, v0, Lcom/google/android/gms/nearby/messages/Strategy$a;->alu: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;->aJV:I
+    iput v2, v0, Lcom/google/android/gms/nearby/messages/Strategy$a;->aJR:I
 
-    invoke-virtual {v0}, Lcom/google/android/gms/nearby/messages/Strategy$a;->zb()Lcom/google/android/gms/nearby/messages/Strategy;
+    invoke-virtual {v0}, Lcom/google/android/gms/nearby/messages/Strategy$a;->yZ()Lcom/google/android/gms/nearby/messages/Strategy;
 
     move-result-object v0
 
-    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;->aJK: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;
+    sput-object v0, Lcom/google/android/gms/nearby/messages/Strategy;->aJL: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;->aAH:I
+    iput p1, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aAD:I
 
-    iput p2, p0, Lcom/google/android/gms/nearby/messages/Strategy;->alo:I
+    iput p2, p0, Lcom/google/android/gms/nearby/messages/Strategy;->alj: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;->aJT:I
+    iput p7, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aJP:I
 
     goto :goto_1
 
@@ -152,30 +152,30 @@
     goto :goto_0
 
     :cond_1
-    iput v0, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aJT:I
+    iput v0, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aJP:I
 
     goto :goto_1
 
     :cond_2
-    iput p1, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aJT:I
+    iput p1, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aJP:I
 
     :goto_1
-    iput p4, p0, Lcom/google/android/gms/nearby/messages/Strategy;->alq:I
+    iput p4, p0, Lcom/google/android/gms/nearby/messages/Strategy;->alm:I
 
-    iput-boolean p5, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aJR:Z
+    iput-boolean p5, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aJN:Z
 
     if-eqz p5, :cond_3
 
-    iput v0, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aJS:I
+    iput v0, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aJO:I
 
     const p1, 0x7fffffff
 
-    iput p1, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aJQ:I
+    iput p1, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aJM:I
 
     goto :goto_2
 
     :cond_3
-    iput p3, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aJQ:I
+    iput p3, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aJM: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;->aJS:I
+    iput p6, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aJO:I
 
     goto :goto_2
 
     :cond_4
-    iput p2, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aJS:I
+    iput p2, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aJO:I
 
     :goto_2
-    iput p8, p0, Lcom/google/android/gms/nearby/messages/Strategy;->alu:I
+    iput p8, p0, Lcom/google/android/gms/nearby/messages/Strategy;->alq: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;->aAH:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aAD:I
 
-    iget v3, p1, Lcom/google/android/gms/nearby/messages/Strategy;->aAH:I
+    iget v3, p1, Lcom/google/android/gms/nearby/messages/Strategy;->aAD:I
 
     if-ne v1, v3, :cond_2
 
-    iget v1, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aJT:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aJP:I
 
-    iget v3, p1, Lcom/google/android/gms/nearby/messages/Strategy;->aJT:I
+    iget v3, p1, Lcom/google/android/gms/nearby/messages/Strategy;->aJP:I
 
     if-ne v1, v3, :cond_2
 
-    iget v1, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aJQ:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aJM:I
 
-    iget v3, p1, Lcom/google/android/gms/nearby/messages/Strategy;->aJQ:I
+    iget v3, p1, Lcom/google/android/gms/nearby/messages/Strategy;->aJM:I
+
+    if-ne v1, v3, :cond_2
+
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/Strategy;->alm:I
+
+    iget v3, p1, Lcom/google/android/gms/nearby/messages/Strategy;->alm:I
+
+    if-ne v1, v3, :cond_2
+
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aJO:I
+
+    iget v3, p1, Lcom/google/android/gms/nearby/messages/Strategy;->aJO:I
 
     if-ne v1, v3, :cond_2
 
     iget v1, p0, Lcom/google/android/gms/nearby/messages/Strategy;->alq: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;->aJS: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;->alu:I
-
-    iget p1, p1, Lcom/google/android/gms/nearby/messages/Strategy;->alu:I
+    iget p1, p1, Lcom/google/android/gms/nearby/messages/Strategy;->alq:I
 
     if-ne v1, p1, :cond_2
 
@@ -270,17 +270,29 @@
 .method public hashCode()I
     .locals 2
 
-    iget v0, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aAH:I
+    iget v0, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aAD:I
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget v1, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aJT:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aJP:I
 
     add-int/2addr v0, v1
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget v1, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aJQ:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aJM:I
+
+    add-int/2addr v0, v1
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/Strategy;->alm:I
+
+    add-int/2addr v0, v1
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aJO:I
 
     add-int/2addr v0, v1
 
@@ -290,27 +302,15 @@
 
     add-int/2addr v0, v1
 
-    mul-int/lit8 v0, v0, 0x1f
-
-    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;->alu:I
-
-    add-int/2addr v0, v1
-
     return v0
 .end method
 
 .method public toString()Ljava/lang/String;
     .locals 10
 
-    iget v0, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aJQ:I
+    iget v0, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aJM:I
 
-    iget v1, p0, Lcom/google/android/gms/nearby/messages/Strategy;->alq:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/Strategy;->alm: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;->aJS:I
+    iget v6, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aJO: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;->aJT:I
+    iget v7, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aJP: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;->alu:I
+    iget v3, p0, Lcom/google/android/gms/nearby/messages/Strategy;->alq:I
 
     if-eqz v3, :cond_b
 
@@ -588,49 +588,49 @@
 
     move-result p2
 
-    iget v0, p0, Lcom/google/android/gms/nearby/messages/Strategy;->alo:I
+    iget v0, p0, Lcom/google/android/gms/nearby/messages/Strategy;->alj: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;->aJQ:I
+    iget v0, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aJM: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;->alq:I
+    iget v0, p0, Lcom/google/android/gms/nearby/messages/Strategy;->alm: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;->aJR:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aJN: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;->aJS:I
+    iget v0, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aJO: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;->aJT:I
+    iget v0, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aJP: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;->alu:I
+    iget v0, p0, Lcom/google/android/gms/nearby/messages/Strategy;->alq: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;->aAH:I
+    iget v0, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aAD: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 3474aeb3d1..2566147397 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 aJL:Lcom/google/android/gms/nearby/messages/Strategy;
+.field public aJH:Lcom/google/android/gms/nearby/messages/Strategy;
 
-.field private aJZ:Lcom/google/android/gms/nearby/messages/MessageFilter;
+.field private aJV:Lcom/google/android/gms/nearby/messages/MessageFilter;
 
-.field private aKa:Lcom/google/android/gms/nearby/messages/e;
+.field private aJW: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;->aJN:Lcom/google/android/gms/nearby/messages/Strategy;
+    sget-object v0, Lcom/google/android/gms/nearby/messages/Strategy;->aJJ: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;
+    iput-object v0, p0, Lcom/google/android/gms/nearby/messages/SubscribeOptions$a;->aJH:Lcom/google/android/gms/nearby/messages/Strategy;
 
-    sget-object v0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aJy:Lcom/google/android/gms/nearby/messages/MessageFilter;
+    sget-object v0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aJu: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;
+    iput-object v0, p0, Lcom/google/android/gms/nearby/messages/SubscribeOptions$a;->aJV:Lcom/google/android/gms/nearby/messages/MessageFilter;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final zc()Lcom/google/android/gms/nearby/messages/SubscribeOptions;
+.method public final za()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;->aJL:Lcom/google/android/gms/nearby/messages/Strategy;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/SubscribeOptions$a;->aJH:Lcom/google/android/gms/nearby/messages/Strategy;
 
-    iget-object v2, p0, Lcom/google/android/gms/nearby/messages/SubscribeOptions$a;->aJZ:Lcom/google/android/gms/nearby/messages/MessageFilter;
+    iget-object v2, p0, Lcom/google/android/gms/nearby/messages/SubscribeOptions$a;->aJV:Lcom/google/android/gms/nearby/messages/MessageFilter;
 
-    iget-object v3, p0, Lcom/google/android/gms/nearby/messages/SubscribeOptions$a;->aKa:Lcom/google/android/gms/nearby/messages/e;
+    iget-object v3, p0, Lcom/google/android/gms/nearby/messages/SubscribeOptions$a;->aJW: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 27ad6de6b2..51f0cee856 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 aJY:Lcom/google/android/gms/nearby/messages/SubscribeOptions;
+.field public static final aJU:Lcom/google/android/gms/nearby/messages/SubscribeOptions;
 
 
 # instance fields
-.field public final aJL:Lcom/google/android/gms/nearby/messages/Strategy;
+.field public final aJH:Lcom/google/android/gms/nearby/messages/Strategy;
 
-.field public final aJZ:Lcom/google/android/gms/nearby/messages/MessageFilter;
+.field public final aJV:Lcom/google/android/gms/nearby/messages/MessageFilter;
 
-.field public final aKa:Lcom/google/android/gms/nearby/messages/e;
+.field public final aJW:Lcom/google/android/gms/nearby/messages/e;
 
-.field public final aKb:I
+.field public final aJX:I
 
-.field public final alC:Z
+.field public final aly: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;->zc()Lcom/google/android/gms/nearby/messages/SubscribeOptions;
+    invoke-virtual {v0}, Lcom/google/android/gms/nearby/messages/SubscribeOptions$a;->za()Lcom/google/android/gms/nearby/messages/SubscribeOptions;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/nearby/messages/SubscribeOptions;->aJY:Lcom/google/android/gms/nearby/messages/SubscribeOptions;
+    sput-object v0, Lcom/google/android/gms/nearby/messages/SubscribeOptions;->aJU: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;->aJL:Lcom/google/android/gms/nearby/messages/Strategy;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/SubscribeOptions;->aJH:Lcom/google/android/gms/nearby/messages/Strategy;
 
-    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/SubscribeOptions;->aJZ:Lcom/google/android/gms/nearby/messages/MessageFilter;
+    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/SubscribeOptions;->aJV:Lcom/google/android/gms/nearby/messages/MessageFilter;
 
-    iput-object p3, p0, Lcom/google/android/gms/nearby/messages/SubscribeOptions;->aKa:Lcom/google/android/gms/nearby/messages/e;
+    iput-object p3, p0, Lcom/google/android/gms/nearby/messages/SubscribeOptions;->aJW:Lcom/google/android/gms/nearby/messages/e;
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lcom/google/android/gms/nearby/messages/SubscribeOptions;->alC:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/nearby/messages/SubscribeOptions;->aly:Z
 
-    iput p1, p0, Lcom/google/android/gms/nearby/messages/SubscribeOptions;->aKb:I
+    iput p1, p0, Lcom/google/android/gms/nearby/messages/SubscribeOptions;->aJX: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;->aJL:Lcom/google/android/gms/nearby/messages/Strategy;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/SubscribeOptions;->aJH: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;->aJZ:Lcom/google/android/gms/nearby/messages/MessageFilter;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/SubscribeOptions;->aJV: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 ca3cf9831a..4863c73517 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 alh:I
+.field ald:I
 
 
 # direct methods
@@ -25,7 +25,7 @@
 
     const/4 v0, -0x1
 
-    iput v0, p0, Lcom/google/android/gms/nearby/messages/b$a;->alh:I
+    iput v0, p0, Lcom/google/android/gms/nearby/messages/b$a;->ald: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 b6c8d80fe1..f5242369e1 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 aJG:Ljava/lang/String;
+.field public final aJC:Ljava/lang/String;
 
-.field public final aJH:Z
+.field public final aJD:Z
 
-.field public final aJI:Ljava/lang/String;
+.field public final aJE:Ljava/lang/String;
 
-.field public final aJJ:Ljava/lang/String;
+.field public final aJF:Ljava/lang/String;
 
-.field public final alh:I
+.field public final ald:I
 
 
 # direct methods
@@ -33,19 +33,19 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/google/android/gms/nearby/messages/b;->aJG:Ljava/lang/String;
+    iput-object v0, p0, Lcom/google/android/gms/nearby/messages/b;->aJC:Ljava/lang/String;
 
     const/4 v1, 0x0
 
-    iput-boolean v1, p0, Lcom/google/android/gms/nearby/messages/b;->aJH:Z
+    iput-boolean v1, p0, Lcom/google/android/gms/nearby/messages/b;->aJD:Z
 
-    iget p1, p1, Lcom/google/android/gms/nearby/messages/b$a;->alh:I
+    iget p1, p1, Lcom/google/android/gms/nearby/messages/b$a;->ald:I
 
-    iput p1, p0, Lcom/google/android/gms/nearby/messages/b;->alh:I
+    iput p1, p0, Lcom/google/android/gms/nearby/messages/b;->ald:I
 
-    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;->aJE:Ljava/lang/String;
 
-    iput-object v0, p0, Lcom/google/android/gms/nearby/messages/b;->aJJ:Ljava/lang/String;
+    iput-object v0, p0, Lcom/google/android/gms/nearby/messages/b;->aJF: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 a55eaaae67..64d1c86cb9 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 aJH:Z
+.field private final aJD:Z
 
-.field private final aJI:Ljava/lang/String;
+.field private final aJE:Ljava/lang/String;
 
-.field private final aJJ:Ljava/lang/String;
+.field private final aJF:Ljava/lang/String;
 
-.field private final aKc:Ljava/lang/String;
+.field private final aJY:Ljava/lang/String;
 
-.field public final aKd:I
+.field public final aJZ:I
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field private final aeM:I
+.field private final aeI: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;->aeM:I
+    iput p1, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aeI: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;->aJJ:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aJF: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;->aKc:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aJY:Ljava/lang/String;
 
-    iput-boolean p4, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aJH:Z
+    iput-boolean p4, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aJD:Z
 
-    iput p5, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aKd:I
+    iput p5, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aJZ:I
 
-    iput-object p6, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aJI:Ljava/lang/String;
+    iput-object p6, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aJE: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;->aJJ:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aJF:Ljava/lang/String;
 
-    iget-object v3, p1, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aJJ:Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aJF: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;->aKc:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aJY:Ljava/lang/String;
 
-    iget-object v3, p1, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aKc:Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aJY: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;->aJH:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aJD:Z
 
-    iget-boolean v3, p1, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aJH:Z
+    iget-boolean v3, p1, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aJD:Z
 
     if-ne v1, v3, :cond_2
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aJI:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aJE:Ljava/lang/String;
 
-    iget-object v3, p1, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aJI:Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aJE: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;->aKd:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aJZ:I
 
-    iget p1, p1, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aKd:I
+    iget p1, p1, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aJZ: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;->aJJ:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aJF:Ljava/lang/String;
 
     const/4 v2, 0x0
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aKc:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aJY:Ljava/lang/String;
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    iget-boolean v1, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aJH:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aJD: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;->aJI:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aJE:Ljava/lang/String;
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aKd:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aJZ: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;->aJJ:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aJF:Ljava/lang/String;
 
     const/4 v3, 0x0
 
     aput-object v2, v1, v3
 
-    iget-object v2, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aKc:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aJY:Ljava/lang/String;
 
     const/4 v3, 0x1
 
     aput-object v2, v1, v3
 
-    iget-boolean v2, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aJH:Z
+    iget-boolean v2, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aJD: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;->aJI:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aJE:Ljava/lang/String;
 
     const/4 v3, 0x3
 
     aput-object v2, v1, v3
 
-    iget v2, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aKd:I
+    iget v2, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aJZ: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;->aeM:I
+    iget v0, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aeI: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;->aJJ:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aJF: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;->aKc:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aJY: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;->aJH:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aJD: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;->aKd:I
+    iget v0, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aJZ: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;->aJI:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aJE: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 d11bb0920f..1331b2d8f3 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 aJG:Ljava/lang/String;
+.field private final aJC:Ljava/lang/String;
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field private final aJH:Z
+.field private final aJD:Z
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field private final aJJ:Ljava/lang/String;
+.field private final aJF:Ljava/lang/String;
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field private final aKb:I
+.field private final aJX:I
 
-.field private final aKd:I
+.field private final aJZ:I
 
-.field private final aKe:Lcom/google/android/gms/nearby/messages/internal/aq;
+.field private final aKa:Lcom/google/android/gms/nearby/messages/internal/aq;
 
-.field private final aKf:Lcom/google/android/gms/nearby/messages/Strategy;
+.field private final aKb:Lcom/google/android/gms/nearby/messages/Strategy;
 
-.field private final aKg:Lcom/google/android/gms/nearby/messages/internal/at;
+.field private final aKc:Lcom/google/android/gms/nearby/messages/internal/at;
 
-.field private final aKh:Lcom/google/android/gms/nearby/messages/MessageFilter;
+.field private final aKd:Lcom/google/android/gms/nearby/messages/MessageFilter;
 
-.field private final aKi:Landroid/app/PendingIntent;
+.field private final aKe:Landroid/app/PendingIntent;
 
-.field private final aKj:I
+.field private final aKf:I
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field private final aKk:[B
+.field private final aKg:[B
 
-.field private final aKl:Z
+.field private final aKh:Z
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field private final aKm:Lcom/google/android/gms/nearby/messages/internal/a;
+.field private final aKi:Lcom/google/android/gms/nearby/messages/internal/a;
 
-.field private final aKn:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
+.field private final aKj:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field private final aeM:I
+.field private final aeI:I
 
-.field private final alC:Z
+.field private final aly:Z
 
 
 # direct methods
@@ -105,7 +105,7 @@
 
     move v7, p1
 
-    iput v7, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aeM:I
+    iput v7, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aeI: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;->aKe:Lcom/google/android/gms/nearby/messages/internal/aq;
+    iput-object v1, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aKa:Lcom/google/android/gms/nearby/messages/internal/aq;
 
     move-object v1, p3
 
-    iput-object v1, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aKf:Lcom/google/android/gms/nearby/messages/Strategy;
+    iput-object v1, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aKb: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;->aKg:Lcom/google/android/gms/nearby/messages/internal/at;
+    iput-object v1, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aKc:Lcom/google/android/gms/nearby/messages/internal/at;
 
     move-object v1, p5
 
-    iput-object v1, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aKh:Lcom/google/android/gms/nearby/messages/MessageFilter;
+    iput-object v1, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aKd:Lcom/google/android/gms/nearby/messages/MessageFilter;
 
     move-object/from16 v1, p6
 
-    iput-object v1, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aKi:Landroid/app/PendingIntent;
+    iput-object v1, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aKe:Landroid/app/PendingIntent;
 
     move/from16 v1, p7
 
-    iput v1, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aKj:I
+    iput v1, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aKf:I
 
-    iput-object v3, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aJG:Ljava/lang/String;
+    iput-object v3, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aJC:Ljava/lang/String;
 
-    iput-object v4, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aJJ:Ljava/lang/String;
+    iput-object v4, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aJF:Ljava/lang/String;
 
     move-object/from16 v1, p10
 
-    iput-object v1, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aKk:[B
+    iput-object v1, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aKg:[B
 
     move/from16 v1, p11
 
-    iput-boolean v1, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aKl:Z
+    iput-boolean v1, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aKh: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;->aKm:Lcom/google/android/gms/nearby/messages/internal/a;
+    iput-object v7, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aKi:Lcom/google/android/gms/nearby/messages/internal/a;
 
-    iput-boolean v6, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aJH:Z
+    iput-boolean v6, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aJD: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;->aKn:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
+    iput-object v1, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aKj:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
 
     move/from16 v1, p15
 
-    iput-boolean v1, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->alC:Z
+    iput-boolean v1, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aly:Z
 
     move/from16 v1, p16
 
-    iput v1, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aKb:I
+    iput v1, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aJX:I
 
     move/from16 v1, p17
 
-    iput v1, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aKd:I
+    iput v1, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aJZ: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;->aKe:Lcom/google/android/gms/nearby/messages/internal/aq;
+    iget-object v1, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aKa: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;->aKf:Lcom/google/android/gms/nearby/messages/Strategy;
+    iget-object v2, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aKb: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;->aKg:Lcom/google/android/gms/nearby/messages/internal/at;
+    iget-object v3, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aKc: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;->aKh:Lcom/google/android/gms/nearby/messages/MessageFilter;
+    iget-object v4, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aKd: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;->aKi:Landroid/app/PendingIntent;
+    iget-object v5, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aKe: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;->aKk:[B
+    iget-object v6, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aKg:[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;->aKm:Lcom/google/android/gms/nearby/messages/internal/a;
+    iget-object v7, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aKi: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;->aJH:Z
+    iget-boolean v8, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aJD:Z
 
-    iget-object v9, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aKn:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
+    iget-object v9, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aKj: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;->alC:Z
+    iget-boolean v10, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aly:Z
 
-    iget-object v11, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aJG:Ljava/lang/String;
+    iget-object v11, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aJC:Ljava/lang/String;
 
-    iget-object v12, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aJJ:Ljava/lang/String;
+    iget-object v12, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aJF:Ljava/lang/String;
 
-    iget-boolean v13, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aKl:Z
+    iget-boolean v13, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aKh:Z
 
-    iget v14, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aKd:I
+    iget v14, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aJZ: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;->aeM:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aeI: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;->aKe:Lcom/google/android/gms/nearby/messages/internal/aq;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aKa: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;->aKf:Lcom/google/android/gms/nearby/messages/Strategy;
+    iget-object v3, p0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aKb: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;->aKg:Lcom/google/android/gms/nearby/messages/internal/at;
+    iget-object v3, p0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aKc: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;->aKh:Lcom/google/android/gms/nearby/messages/MessageFilter;
+    iget-object v3, p0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aKd: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;->aKi:Landroid/app/PendingIntent;
+    iget-object v3, p0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aKe: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;->aKj:I
+    iget v3, p0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aKf: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;->aJG:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aJC: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;->aJJ:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aJF: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;->aKk:[B
+    iget-object v3, p0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aKg:[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;->aKl:Z
+    iget-boolean v3, p0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aKh: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;->aKm:Lcom/google/android/gms/nearby/messages/internal/a;
+    iget-object v3, p0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aKi: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;->aJH:Z
+    iget-boolean v2, p0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aJD: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;->aKn:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
+    iget-object v2, p0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aKj: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;->alC:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aly: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;->aKb:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aJX: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;->aKd:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aJZ: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 002437f462..4889630cc5 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 aKo:I
+.field private final aKk:I
 
-.field public final aKp:Lcom/google/android/gms/nearby/messages/Message;
+.field public final aKl:Lcom/google/android/gms/nearby/messages/Message;
 
-.field public final aKq:Lcom/google/android/gms/nearby/messages/internal/zze;
+.field public final aKm:Lcom/google/android/gms/nearby/messages/internal/zze;
 
-.field public final aKr:Lcom/google/android/gms/nearby/messages/internal/zza;
+.field public final aKn:Lcom/google/android/gms/nearby/messages/internal/zza;
 
-.field public final aKs:Lcom/google/android/gms/internal/nearby/zzgs;
+.field public final aKo:Lcom/google/android/gms/internal/nearby/zzgs;
 
-.field private final aKt:[B
+.field private final aKp:[B
 
-.field private final aeM:I
+.field private final aeI: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;->aeM:I
+    iput p1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aeI: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;->aKo:I
+    iput p1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKk:I
 
-    iput-object p3, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKp:Lcom/google/android/gms/nearby/messages/Message;
+    iput-object p3, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKl:Lcom/google/android/gms/nearby/messages/Message;
 
-    iput-object p4, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKq:Lcom/google/android/gms/nearby/messages/internal/zze;
+    iput-object p4, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKm:Lcom/google/android/gms/nearby/messages/internal/zze;
 
-    iput-object p5, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKr:Lcom/google/android/gms/nearby/messages/internal/zza;
+    iput-object p5, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKn:Lcom/google/android/gms/nearby/messages/internal/zza;
 
-    iput-object p6, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKs:Lcom/google/android/gms/internal/nearby/zzgs;
+    iput-object p6, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKo:Lcom/google/android/gms/internal/nearby/zzgs;
 
-    iput-object p7, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKt:[B
+    iput-object p7, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKp:[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;->aKo:I
+    iget v0, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKk: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;->aKo:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKk:I
 
-    iget v3, p1, Lcom/google/android/gms/nearby/messages/internal/Update;->aKo:I
+    iget v3, p1, Lcom/google/android/gms/nearby/messages/internal/Update;->aKk:I
 
     if-ne v1, v3, :cond_2
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKp:Lcom/google/android/gms/nearby/messages/Message;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKl: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;
+    iget-object v3, p1, Lcom/google/android/gms/nearby/messages/internal/Update;->aKl: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;->aKq:Lcom/google/android/gms/nearby/messages/internal/zze;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKm: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;
+    iget-object v3, p1, Lcom/google/android/gms/nearby/messages/internal/Update;->aKm: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;->aKr:Lcom/google/android/gms/nearby/messages/internal/zza;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKn: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;
+    iget-object v3, p1, Lcom/google/android/gms/nearby/messages/internal/Update;->aKn: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;->aKs:Lcom/google/android/gms/internal/nearby/zzgs;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKo: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;
+    iget-object v3, p1, Lcom/google/android/gms/nearby/messages/internal/Update;->aKo: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;->aKt:[B
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKp:[B
 
-    iget-object p1, p1, Lcom/google/android/gms/nearby/messages/internal/Update;->aKt:[B
+    iget-object p1, p1, Lcom/google/android/gms/nearby/messages/internal/Update;->aKp:[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;->aKo:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKk: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;->aKp:Lcom/google/android/gms/nearby/messages/Message;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKl: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;->aKq:Lcom/google/android/gms/nearby/messages/internal/zze;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKm: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;->aKr:Lcom/google/android/gms/nearby/messages/internal/zza;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKn: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;->aKs:Lcom/google/android/gms/internal/nearby/zzgs;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKo: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;->aKt:[B
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKp:[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;->aKp:Lcom/google/android/gms/nearby/messages/Message;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKl: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;->aKq:Lcom/google/android/gms/nearby/messages/internal/zze;
+    iget-object v2, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKm: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;->aKr:Lcom/google/android/gms/nearby/messages/internal/zza;
+    iget-object v3, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKn: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;->aKs:Lcom/google/android/gms/internal/nearby/zzgs;
+    iget-object v4, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKo: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;->aKt:[B
+    iget-object v5, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKp:[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;->aeM:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aeI: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;->aKo:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKk: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;->aKp:Lcom/google/android/gms/nearby/messages/Message;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKl: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;->aKq:Lcom/google/android/gms/nearby/messages/internal/zze;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKm: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;->aKr:Lcom/google/android/gms/nearby/messages/internal/zza;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKn: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;->aKs:Lcom/google/android/gms/internal/nearby/zzgs;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKo: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;->aKt:[B
+    iget-object p2, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKp:[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 806a6fbde0..2706094f0b 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 aKS:Lcom/google/android/gms/internal/nearby/bc;
+.field private static final aKO: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 aKT:Lcom/google/android/gms/common/api/internal/h;
+.field private final aKP: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;->aKS:Lcom/google/android/gms/internal/nearby/bc;
+    sput-object v0, Lcom/google/android/gms/nearby/messages/internal/aa;->aKO: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;->aKT:Lcom/google/android/gms/common/api/internal/h;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/aa;->aKP: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;->aKT:Lcom/google/android/gms/common/api/internal/h;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/aa;->aKP:Lcom/google/android/gms/common/api/internal/h;
 
     if-eqz v0, :cond_0
 
-    sget-object v1, Lcom/google/android/gms/nearby/messages/internal/aa;->aKS:Lcom/google/android/gms/internal/nearby/bc;
+    sget-object v1, Lcom/google/android/gms/nearby/messages/internal/aa;->aKO: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 5cd466fd97..4fc2d92d12 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 aKS:Lcom/google/android/gms/internal/nearby/bc;
+.field private static final aKO: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 aKT:Lcom/google/android/gms/common/api/internal/h;
+.field private final aKP: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;->aKS:Lcom/google/android/gms/internal/nearby/bc;
+    sput-object v0, Lcom/google/android/gms/nearby/messages/internal/ac;->aKO: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;->aKT:Lcom/google/android/gms/common/api/internal/h;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/ac;->aKP: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;->aKT:Lcom/google/android/gms/common/api/internal/h;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/ac;->aKP:Lcom/google/android/gms/common/api/internal/h;
 
     if-eqz v0, :cond_0
 
-    sget-object v1, Lcom/google/android/gms/nearby/messages/internal/ac;->aKS:Lcom/google/android/gms/internal/nearby/bc;
+    sget-object v1, Lcom/google/android/gms/nearby/messages/internal/ac;->aKO: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 e883e02be3..94d8b93e59 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 aAn:Lcom/google/android/gms/common/api/a$g;
+.field public static final aAj: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 aAo:Lcom/google/android/gms/common/api/a$a;
+.field public static final aAk: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 aKU:Lcom/google/android/gms/nearby/messages/internal/ae;
+.field public static final aKQ: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;->aKU:Lcom/google/android/gms/nearby/messages/internal/ae;
+    sput-object v0, Lcom/google/android/gms/nearby/messages/internal/ae;->aKQ: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;->aAn:Lcom/google/android/gms/common/api/a$g;
+    sput-object v0, Lcom/google/android/gms/nearby/messages/internal/ae;->aAj: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;->aAo:Lcom/google/android/gms/common/api/a$a;
+    sput-object v0, Lcom/google/android/gms/nearby/messages/internal/ae;->aAk: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 228a86f94c..d0340868a6 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 aAn:Lcom/google/android/gms/common/api/a$g;
+.field private static final aAj: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;->aAn:Lcom/google/android/gms/common/api/a$g;
+    sput-object v0, Lcom/google/android/gms/nearby/messages/internal/ag;->aAj: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 7899931a79..0578fff78a 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;->nM()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->nK()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -47,7 +47,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->nM()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->nK()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -77,7 +77,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->nM()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->nK()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 60e2963c72..49f657259e 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;->nM()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->nK()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 81c4ae15f6..7fd509330c 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;->nM()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->nK()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -47,7 +47,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->nM()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->nK()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -68,7 +68,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->nM()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->nK()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -89,7 +89,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->nM()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->nK()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -110,7 +110,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->nM()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->nK()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -131,7 +131,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->nM()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->nK()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 6cfdc717a8..0cb05f5ce6 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;->nM()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->nK()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 93c5381a4d..f8436fdd1c 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;->nM()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->nK()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 5c043c74b5..3df98c6cec 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;->nM()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->nK()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 5f8dbeca85..35ca3392e7 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 aKn:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
+.field private final aKj:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
 
-.field final aKw:Lcom/google/android/gms/internal/nearby/bf;
+.field final aKs: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 alh:I
+.field private final ald: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;->aKw:Lcom/google/android/gms/internal/nearby/bf;
+    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/internal/f;->aKs:Lcom/google/android/gms/internal/nearby/bf;
 
-    iget-object p2, p5, Lcom/google/android/gms/common/internal/d;->ajF:Ljava/lang/String;
+    iget-object p2, p5, Lcom/google/android/gms/common/internal/d;->ajB: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;->aKn:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
+    iput-object v2, p0, Lcom/google/android/gms/nearby/messages/internal/f;->aKj:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
 
-    iget p2, p6, Lcom/google/android/gms/nearby/messages/b;->alh:I
+    iget p2, p6, Lcom/google/android/gms/nearby/messages/b;->ald: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;->aKn:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
+    iput-object p6, p0, Lcom/google/android/gms/nearby/messages/internal/f;->aKj: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;->alh:I
+    iput p2, p0, Lcom/google/android/gms/nearby/messages/internal/f;->ald: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;->mU()Landroid/os/IInterface;
+    invoke-virtual {p0}, Lcom/google/android/gms/nearby/messages/internal/f;->mS()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;->aKw:Lcom/google/android/gms/internal/nearby/bf;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/f;->aKs: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 lZ()Z
+.method public final lX()Z
     .locals 1
 
     invoke-virtual {p0}, Lcom/google/android/gms/nearby/messages/internal/f;->getContext()Landroid/content/Context;
@@ -382,20 +382,28 @@
     return v0
 .end method
 
-.method public final mT()Landroid/os/Bundle;
+.method public final lZ()I
+    .locals 1
+
+    const v0, 0xbdfcb8
+
+    return v0
+.end method
+
+.method public final mR()Landroid/os/Bundle;
     .locals 3
 
-    invoke-super {p0}, Lcom/google/android/gms/common/internal/g;->mT()Landroid/os/Bundle;
+    invoke-super {p0}, Lcom/google/android/gms/common/internal/g;->mR()Landroid/os/Bundle;
 
     move-result-object v0
 
-    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/f;->alh:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/f;->ald: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;->aKn:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/f;->aKj:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
 
     const-string v2, "ClientAppContext"
 
@@ -404,15 +412,7 @@
     return-object v0
 .end method
 
-.method public final mb()I
-    .locals 1
-
-    const v0, 0xbdfcb8
-
-    return v0
-.end method
-
-.method public final md()Ljava/lang/String;
+.method public final mb()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 me()Ljava/lang/String;
+.method public final mc()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 ed2766c5bb..4895406e69 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 aKx:Landroid/app/Activity;
+.field private final aKt:Landroid/app/Activity;
 
-.field private final aKy:Lcom/google/android/gms/nearby/messages/internal/f;
+.field private final aKu: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;->aKx:Landroid/app/Activity;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/g;->aKt:Landroid/app/Activity;
 
-    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/internal/g;->aKy:Lcom/google/android/gms/nearby/messages/internal/f;
+    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/internal/g;->aKu: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;->aKx:Landroid/app/Activity;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/g;->aKt: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;->aKx:Landroid/app/Activity;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/g;->aKt: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;->aKy:Lcom/google/android/gms/nearby/messages/internal/f;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/g;->aKu: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 0902b49c10..fe4ee2c2e6 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 aAn:Lcom/google/android/gms/common/api/a$g;
+.field private static final aAj: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 aAo:Lcom/google/android/gms/common/api/a$a;
+.field private static final aAk: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 aJe:Lcom/google/android/gms/common/api/a;
+.field private static final aJa: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 aKd:I
+.field final aJZ: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;->aAn:Lcom/google/android/gms/common/api/a$g;
+    sput-object v0, Lcom/google/android/gms/nearby/messages/internal/h;->aAj: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;->aAo:Lcom/google/android/gms/common/api/a$a;
+    sput-object v0, Lcom/google/android/gms/nearby/messages/internal/h;->aAk: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;->aAo:Lcom/google/android/gms/common/api/a$a;
+    sget-object v1, Lcom/google/android/gms/nearby/messages/internal/h;->aAk:Lcom/google/android/gms/common/api/a$a;
 
-    sget-object v2, Lcom/google/android/gms/nearby/messages/internal/h;->aAn:Lcom/google/android/gms/common/api/a$g;
+    sget-object v2, Lcom/google/android/gms/nearby/messages/internal/h;->aAj: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;->aJe:Lcom/google/android/gms/common/api/a;
+    sput-object v0, Lcom/google/android/gms/nearby/messages/internal/h;->aJa: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;->aJe:Lcom/google/android/gms/common/api/a;
+    sget-object v0, Lcom/google/android/gms/nearby/messages/internal/h;->aJa:Lcom/google/android/gms/common/api/a;
 
-    sget-object v1, Lcom/google/android/gms/common/api/h$a;->afz:Lcom/google/android/gms/common/api/h$a;
+    sget-object v1, Lcom/google/android/gms/common/api/h$a;->afv: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;->aKd:I
+    iput p2, p0, Lcom/google/android/gms/nearby/messages/internal/h;->aJZ: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;->agZ:Lcom/google/android/gms/common/api/internal/h$a;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/h;->agV: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;->aKw:Lcom/google/android/gms/internal/nearby/bf;
+    iget-object p2, p1, Lcom/google/android/gms/nearby/messages/internal/f;->aKs:Lcom/google/android/gms/internal/nearby/bf;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/h;->agZ:Lcom/google/android/gms/common/api/internal/h$a;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/h;->agV: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;->aKw:Lcom/google/android/gms/internal/nearby/bf;
+    iget-object v2, p1, Lcom/google/android/gms/nearby/messages/internal/f;->aKs:Lcom/google/android/gms/internal/nearby/bf;
 
-    iget-object v3, p0, Lcom/google/android/gms/common/api/internal/h;->agZ:Lcom/google/android/gms/common/api/internal/h$a;
+    iget-object v3, p0, Lcom/google/android/gms/common/api/internal/h;->agV: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;->aKY:Z
+    iput-boolean v1, p2, Lcom/google/android/gms/nearby/messages/internal/zzcb;->aKU:Z
 
-    invoke-virtual {p1}, Lcom/google/android/gms/nearby/messages/internal/f;->mU()Landroid/os/IInterface;
+    invoke-virtual {p1}, Lcom/google/android/gms/nearby/messages/internal/f;->mS()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;->aKw:Lcom/google/android/gms/internal/nearby/bf;
+    iget-object p1, p1, Lcom/google/android/gms/nearby/messages/internal/f;->aKs:Lcom/google/android/gms/internal/nearby/bf;
 
-    iget-object p0, p0, Lcom/google/android/gms/common/api/internal/h;->agZ:Lcom/google/android/gms/common/api/internal/h$a;
+    iget-object p0, p0, Lcom/google/android/gms/common/api/internal/h;->agV: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;->mU()Landroid/os/IInterface;
+    invoke-virtual {p1}, Lcom/google/android/gms/nearby/messages/internal/f;->mS()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;->aLU:Lcom/google/android/gms/tasks/ac;
+    iget-object p1, v0, Lcom/google/android/gms/tasks/h;->aLQ: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;->aKw:Lcom/google/android/gms/internal/nearby/bf;
+    iget-object v0, p1, Lcom/google/android/gms/nearby/messages/internal/f;->aKs:Lcom/google/android/gms/internal/nearby/bf;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/h;->agZ:Lcom/google/android/gms/common/api/internal/h$a;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/h;->agV: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;->aKw:Lcom/google/android/gms/internal/nearby/bf;
+    iget-object v0, p1, Lcom/google/android/gms/nearby/messages/internal/f;->aKs:Lcom/google/android/gms/internal/nearby/bf;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/h;->agZ:Lcom/google/android/gms/common/api/internal/h$a;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/h;->agV: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;->aKw:Lcom/google/android/gms/internal/nearby/bf;
+    iget-object p2, p1, Lcom/google/android/gms/nearby/messages/internal/f;->aKs:Lcom/google/android/gms/internal/nearby/bf;
 
-    iget-object p0, p0, Lcom/google/android/gms/common/api/internal/h;->agZ:Lcom/google/android/gms/common/api/internal/h$a;
+    iget-object p0, p0, Lcom/google/android/gms/common/api/internal/h;->agV: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;->aKY:Z
+    iput-boolean p0, v0, Lcom/google/android/gms/nearby/messages/internal/zzcb;->aKU:Z
 
-    invoke-virtual {p1}, Lcom/google/android/gms/nearby/messages/internal/f;->mU()Landroid/os/IInterface;
+    invoke-virtual {p1}, Lcom/google/android/gms/nearby/messages/internal/f;->mS()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;->aKw:Lcom/google/android/gms/internal/nearby/bf;
+    iget-object p2, p1, Lcom/google/android/gms/nearby/messages/internal/f;->aKs:Lcom/google/android/gms/internal/nearby/bf;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/h;->agZ:Lcom/google/android/gms/common/api/internal/h$a;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/h;->agV: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;->aKw:Lcom/google/android/gms/internal/nearby/bf;
+    iget-object v1, p1, Lcom/google/android/gms/nearby/messages/internal/f;->aKs:Lcom/google/android/gms/internal/nearby/bf;
 
-    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/h;->agZ:Lcom/google/android/gms/common/api/internal/h$a;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/h;->agV: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;->mU()Landroid/os/IInterface;
+    invoke-virtual {p1}, Lcom/google/android/gms/nearby/messages/internal/f;->mS()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;->aKw:Lcom/google/android/gms/internal/nearby/bf;
+    iget-object p1, p1, Lcom/google/android/gms/nearby/messages/internal/f;->aKs:Lcom/google/android/gms/internal/nearby/bf;
 
-    iget-object p0, p0, Lcom/google/android/gms/common/api/internal/h;->agZ:Lcom/google/android/gms/common/api/internal/h$a;
+    iget-object p0, p0, Lcom/google/android/gms/common/api/internal/h;->agV: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;->aJM:Lcom/google/android/gms/nearby/messages/c;
+    iget-object v1, p2, Lcom/google/android/gms/nearby/messages/PublishOptions;->aJI: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;->aJL:Lcom/google/android/gms/nearby/messages/Strategy;
+    iget-object v0, p2, Lcom/google/android/gms/nearby/messages/SubscribeOptions;->aJH:Lcom/google/android/gms/nearby/messages/Strategy;
 
-    iget v0, v0, Lcom/google/android/gms/nearby/messages/Strategy;->alu:I
+    iget v0, v0, Lcom/google/android/gms/nearby/messages/Strategy;->alq: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;->aKa:Lcom/google/android/gms/nearby/messages/e;
+    iget-object v0, p2, Lcom/google/android/gms/nearby/messages/SubscribeOptions;->aJW: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 mh()Lcom/google/android/gms/common/internal/d$a;
+.method public final mf()Lcom/google/android/gms/common/internal/d$a;
     .locals 2
 
-    invoke-super {p0}, Lcom/google/android/gms/nearby/messages/MessagesClient;->mh()Lcom/google/android/gms/common/internal/d$a;
+    invoke-super {p0}, Lcom/google/android/gms/nearby/messages/MessagesClient;->mf()Lcom/google/android/gms/common/internal/d$a;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/nearby/messages/internal/h;->mg()Lcom/google/android/gms/common/api/a$d;
+    invoke-virtual {p0}, Lcom/google/android/gms/nearby/messages/internal/h;->me()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;->mg()Lcom/google/android/gms/common/api/a$d;
+    invoke-virtual {p0}, Lcom/google/android/gms/nearby/messages/internal/h;->me()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 99ed4c0658..979643569d 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 aKA:Lcom/google/android/gms/nearby/messages/Message;
+.field private final aKv:Lcom/google/android/gms/nearby/messages/internal/h;
 
-.field private final aKB:Lcom/google/android/gms/nearby/messages/internal/aa;
+.field private final aKw:Lcom/google/android/gms/nearby/messages/Message;
 
-.field private final aKC:Lcom/google/android/gms/nearby/messages/PublishOptions;
+.field private final aKx:Lcom/google/android/gms/nearby/messages/internal/aa;
 
-.field private final aKz:Lcom/google/android/gms/nearby/messages/internal/h;
+.field private final aKy:Lcom/google/android/gms/nearby/messages/PublishOptions;
 
 
 # direct methods
@@ -21,13 +21,13 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/i;->aKz:Lcom/google/android/gms/nearby/messages/internal/h;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/i;->aKv:Lcom/google/android/gms/nearby/messages/internal/h;
 
-    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/internal/i;->aKA:Lcom/google/android/gms/nearby/messages/Message;
+    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/internal/i;->aKw:Lcom/google/android/gms/nearby/messages/Message;
 
-    iput-object p3, p0, Lcom/google/android/gms/nearby/messages/internal/i;->aKB:Lcom/google/android/gms/nearby/messages/internal/aa;
+    iput-object p3, p0, Lcom/google/android/gms/nearby/messages/internal/i;->aKx:Lcom/google/android/gms/nearby/messages/internal/aa;
 
-    iput-object p4, p0, Lcom/google/android/gms/nearby/messages/internal/i;->aKC:Lcom/google/android/gms/nearby/messages/PublishOptions;
+    iput-object p4, p0, Lcom/google/android/gms/nearby/messages/internal/i;->aKy: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;->aKz:Lcom/google/android/gms/nearby/messages/internal/h;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/i;->aKv:Lcom/google/android/gms/nearby/messages/internal/h;
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/i;->aKA:Lcom/google/android/gms/nearby/messages/Message;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/i;->aKw:Lcom/google/android/gms/nearby/messages/Message;
 
-    iget-object v6, p0, Lcom/google/android/gms/nearby/messages/internal/i;->aKB:Lcom/google/android/gms/nearby/messages/internal/aa;
+    iget-object v6, p0, Lcom/google/android/gms/nearby/messages/internal/i;->aKx:Lcom/google/android/gms/nearby/messages/internal/aa;
 
-    iget-object v2, p0, Lcom/google/android/gms/nearby/messages/internal/i;->aKC:Lcom/google/android/gms/nearby/messages/PublishOptions;
+    iget-object v2, p0, Lcom/google/android/gms/nearby/messages/internal/i;->aKy: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;->aKd:I
+    iget v7, v0, Lcom/google/android/gms/nearby/messages/internal/h;->aJZ:I
 
     new-instance v0, Lcom/google/android/gms/nearby/messages/internal/zzbz;
 
-    iget-object v4, v2, Lcom/google/android/gms/nearby/messages/PublishOptions;->aJL:Lcom/google/android/gms/nearby/messages/Strategy;
+    iget-object v4, v2, Lcom/google/android/gms/nearby/messages/PublishOptions;->aJH: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;->mU()Landroid/os/IInterface;
+    invoke-virtual {p1}, Lcom/google/android/gms/nearby/messages/internal/f;->mS()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 5b8c3b3b6f..1a02ec2cc7 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 aKD:Lcom/google/android/gms/nearby/messages/Message;
+.field private final aKz: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;->aKD:Lcom/google/android/gms/nearby/messages/Message;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/j;->aKz: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;->aKD:Lcom/google/android/gms/nearby/messages/Message;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/j;->aKz: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 3eaae08187..da1f320caa 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 aKE:Lcom/google/android/gms/common/api/internal/h;
+.field private final aKA:Lcom/google/android/gms/common/api/internal/h;
 
-.field private final aKF:Lcom/google/android/gms/nearby/messages/internal/ac;
+.field private final aKB:Lcom/google/android/gms/nearby/messages/internal/ac;
 
-.field private final aKG:Lcom/google/android/gms/nearby/messages/SubscribeOptions;
+.field private final aKC:Lcom/google/android/gms/nearby/messages/SubscribeOptions;
 
-.field private final aKz:Lcom/google/android/gms/nearby/messages/internal/h;
+.field private final aKv: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;->aKz:Lcom/google/android/gms/nearby/messages/internal/h;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/k;->aKv:Lcom/google/android/gms/nearby/messages/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 p2, p0, Lcom/google/android/gms/nearby/messages/internal/k;->aKA:Lcom/google/android/gms/common/api/internal/h;
 
-    iput-object p3, p0, Lcom/google/android/gms/nearby/messages/internal/k;->aKF:Lcom/google/android/gms/nearby/messages/internal/ac;
+    iput-object p3, p0, Lcom/google/android/gms/nearby/messages/internal/k;->aKB:Lcom/google/android/gms/nearby/messages/internal/ac;
 
-    iput-object p4, p0, Lcom/google/android/gms/nearby/messages/internal/k;->aKG:Lcom/google/android/gms/nearby/messages/SubscribeOptions;
+    iput-object p4, p0, Lcom/google/android/gms/nearby/messages/internal/k;->aKC: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;->aKz:Lcom/google/android/gms/nearby/messages/internal/h;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/k;->aKv:Lcom/google/android/gms/nearby/messages/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 v1, p0, Lcom/google/android/gms/nearby/messages/internal/k;->aKA:Lcom/google/android/gms/common/api/internal/h;
 
-    iget-object v7, p0, Lcom/google/android/gms/nearby/messages/internal/k;->aKF:Lcom/google/android/gms/nearby/messages/internal/ac;
+    iget-object v7, p0, Lcom/google/android/gms/nearby/messages/internal/k;->aKB:Lcom/google/android/gms/nearby/messages/internal/ac;
 
-    iget-object v2, p0, Lcom/google/android/gms/nearby/messages/internal/k;->aKG:Lcom/google/android/gms/nearby/messages/SubscribeOptions;
+    iget-object v2, p0, Lcom/google/android/gms/nearby/messages/internal/k;->aKC:Lcom/google/android/gms/nearby/messages/SubscribeOptions;
 
-    iget v9, v0, Lcom/google/android/gms/nearby/messages/internal/h;->aKd:I
+    iget v9, v0, Lcom/google/android/gms/nearby/messages/internal/h;->aJZ:I
 
-    iget-object v0, p1, Lcom/google/android/gms/nearby/messages/internal/f;->aKw:Lcom/google/android/gms/internal/nearby/bf;
+    iget-object v0, p1, Lcom/google/android/gms/nearby/messages/internal/f;->aKs:Lcom/google/android/gms/internal/nearby/bf;
 
-    iget-object v3, v1, Lcom/google/android/gms/common/api/internal/h;->agZ:Lcom/google/android/gms/common/api/internal/h$a;
+    iget-object v3, v1, Lcom/google/android/gms/common/api/internal/h;->agV: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;->aKw:Lcom/google/android/gms/internal/nearby/bf;
+    iget-object v0, p1, Lcom/google/android/gms/nearby/messages/internal/f;->aKs:Lcom/google/android/gms/internal/nearby/bf;
 
-    iget-object v3, v1, Lcom/google/android/gms/common/api/internal/h;->agZ:Lcom/google/android/gms/common/api/internal/h$a;
+    iget-object v3, v1, Lcom/google/android/gms/common/api/internal/h;->agV: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;->aKw:Lcom/google/android/gms/internal/nearby/bf;
+    iget-object v3, p1, Lcom/google/android/gms/nearby/messages/internal/f;->aKs:Lcom/google/android/gms/internal/nearby/bf;
 
-    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/h;->agZ:Lcom/google/android/gms/common/api/internal/h$a;
+    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/h;->agV: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;->aJL:Lcom/google/android/gms/nearby/messages/Strategy;
+    iget-object v4, v2, Lcom/google/android/gms/nearby/messages/SubscribeOptions;->aJH: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;->aJZ:Lcom/google/android/gms/nearby/messages/MessageFilter;
+    iget-object v6, v2, Lcom/google/android/gms/nearby/messages/SubscribeOptions;->aJV:Lcom/google/android/gms/nearby/messages/MessageFilter;
 
-    iget-boolean v8, v2, Lcom/google/android/gms/nearby/messages/SubscribeOptions;->alC:Z
+    iget-boolean v8, v2, Lcom/google/android/gms/nearby/messages/SubscribeOptions;->aly: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;->mU()Landroid/os/IInterface;
+    invoke-virtual {p1}, Lcom/google/android/gms/nearby/messages/internal/f;->mS()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 6b32ae786a..061dcbacc2 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 aKH:Lcom/google/android/gms/common/api/internal/h;
+.field private final aKD: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;->aKH:Lcom/google/android/gms/common/api/internal/h;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/l;->aKD: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;->aKH:Lcom/google/android/gms/common/api/internal/h;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/l;->aKD: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 4d3e286030..bb14fc52b4 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 aKH:Lcom/google/android/gms/common/api/internal/h;
+.field private final aKD: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;->aKH:Lcom/google/android/gms/common/api/internal/h;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/m;->aKD: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;->aKH:Lcom/google/android/gms/common/api/internal/h;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/m;->aKD: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 2cb0491d08..953807cf21 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 aKH:Lcom/google/android/gms/common/api/internal/h;
+.field private final aKD: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;->aKH:Lcom/google/android/gms/common/api/internal/h;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/n;->aKD: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;->aKH:Lcom/google/android/gms/common/api/internal/h;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/n;->aKD: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 2a716b339b..b29f987b88 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 aKI:I
+.field private final aKE:I
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     const/4 v0, 0x1
 
-    iput v0, p0, Lcom/google/android/gms/nearby/messages/internal/o;->aKI:I
+    iput v0, p0, Lcom/google/android/gms/nearby/messages/internal/o;->aKE: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;->aKI:I
+    iget p2, p0, Lcom/google/android/gms/nearby/messages/internal/o;->aKE: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 61eca1627f..74e1bf8cd2 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 aKJ:Lcom/google/android/gms/common/api/internal/h;
+.field private final synthetic aKF:Lcom/google/android/gms/common/api/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/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;->aKK:Lcom/google/android/gms/nearby/messages/internal/h;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/q;->aKG:Lcom/google/android/gms/nearby/messages/internal/h;
 
-    iput-object p3, p0, Lcom/google/android/gms/nearby/messages/internal/q;->aKJ:Lcom/google/android/gms/common/api/internal/h;
+    iput-object p3, p0, Lcom/google/android/gms/nearby/messages/internal/q;->aKF: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;->aKK:Lcom/google/android/gms/nearby/messages/internal/h;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/q;->aKG:Lcom/google/android/gms/nearby/messages/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, p0, Lcom/google/android/gms/nearby/messages/internal/q;->aKF:Lcom/google/android/gms/common/api/internal/h;
 
-    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/h;->agZ:Lcom/google/android/gms/common/api/internal/h$a;
+    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/h;->agV: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 d89147bc2d..1709e59cf0 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 aKK:Lcom/google/android/gms/nearby/messages/internal/h;
+.field private final synthetic aKG:Lcom/google/android/gms/nearby/messages/internal/h;
 
-.field private final synthetic aKL:Lcom/google/android/gms/common/api/internal/h;
+.field private final synthetic aKH: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;->aKK:Lcom/google/android/gms/nearby/messages/internal/h;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/r;->aKG:Lcom/google/android/gms/nearby/messages/internal/h;
 
-    iput-object p3, p0, Lcom/google/android/gms/nearby/messages/internal/r;->aKL:Lcom/google/android/gms/common/api/internal/h;
+    iput-object p3, p0, Lcom/google/android/gms/nearby/messages/internal/r;->aKH: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;->aKK:Lcom/google/android/gms/nearby/messages/internal/h;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/r;->aKG:Lcom/google/android/gms/nearby/messages/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, p0, Lcom/google/android/gms/nearby/messages/internal/r;->aKH:Lcom/google/android/gms/common/api/internal/h;
 
-    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/h;->agZ:Lcom/google/android/gms/common/api/internal/h$a;
+    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/h;->agV: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 bde7dbce19..21e8a6d939 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 aKM:Lcom/google/android/gms/tasks/h;
+.field private final synthetic aKI: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;->aKM:Lcom/google/android/gms/tasks/h;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/s;->aKI: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;->aKM:Lcom/google/android/gms/tasks/h;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/s;->aKI: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;->aKM:Lcom/google/android/gms/tasks/h;
+    iget-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/s;->aKI: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 2a01f376a0..dd7fbf0949 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 aKN:Lcom/google/android/gms/tasks/h;
+.field private final synthetic aKJ: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;->aKN:Lcom/google/android/gms/tasks/h;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/t;->aKJ: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;->zg()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/tasks/Task;->ze()Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/t;->aKN:Lcom/google/android/gms/tasks/h;
+    iget-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/t;->aKJ: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;->aKN:Lcom/google/android/gms/tasks/h;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/t;->aKJ:Lcom/google/android/gms/tasks/h;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/tasks/Task;->zh()Ljava/lang/Exception;
+    invoke-virtual {p1}, Lcom/google/android/gms/tasks/Task;->zf()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 12aa7642b6..0ccf990110 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 aKK:Lcom/google/android/gms/nearby/messages/internal/h;
+.field private final synthetic aKG:Lcom/google/android/gms/nearby/messages/internal/h;
 
-.field private final synthetic aKO:Lcom/google/android/gms/nearby/messages/internal/z;
+.field private final synthetic aKK: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;->aKK:Lcom/google/android/gms/nearby/messages/internal/h;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/u;->aKG:Lcom/google/android/gms/nearby/messages/internal/h;
 
-    iput-object p3, p0, Lcom/google/android/gms/nearby/messages/internal/u;->aKO:Lcom/google/android/gms/nearby/messages/internal/z;
+    iput-object p3, p0, Lcom/google/android/gms/nearby/messages/internal/u;->aKK: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;->aKO:Lcom/google/android/gms/nearby/messages/internal/z;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/u;->aKK:Lcom/google/android/gms/nearby/messages/internal/z;
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/u;->aKK:Lcom/google/android/gms/nearby/messages/internal/h;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/u;->aKG: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 15089fd82b..dd6312db4a 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 aKK:Lcom/google/android/gms/nearby/messages/internal/h;
+.field private final synthetic aKG:Lcom/google/android/gms/nearby/messages/internal/h;
 
-.field private final synthetic aKP:Lcom/google/android/gms/nearby/messages/internal/z;
+.field private final synthetic aKL: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;->aKK:Lcom/google/android/gms/nearby/messages/internal/h;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/w;->aKG:Lcom/google/android/gms/nearby/messages/internal/h;
 
-    iput-object p3, p0, Lcom/google/android/gms/nearby/messages/internal/w;->aKP:Lcom/google/android/gms/nearby/messages/internal/z;
+    iput-object p3, p0, Lcom/google/android/gms/nearby/messages/internal/w;->aKL: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;->aKP:Lcom/google/android/gms/nearby/messages/internal/z;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/w;->aKL:Lcom/google/android/gms/nearby/messages/internal/z;
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/w;->aKK:Lcom/google/android/gms/nearby/messages/internal/h;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/w;->aKG: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 c9c1c21973..b03cfd8f67 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 aKK:Lcom/google/android/gms/nearby/messages/internal/h;
+.field private final synthetic aKG:Lcom/google/android/gms/nearby/messages/internal/h;
 
-.field private final synthetic aKQ:Lcom/google/android/gms/nearby/messages/internal/z;
+.field private final synthetic aKM: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;->aKK:Lcom/google/android/gms/nearby/messages/internal/h;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/x;->aKG:Lcom/google/android/gms/nearby/messages/internal/h;
 
-    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/internal/x;->aKQ:Lcom/google/android/gms/nearby/messages/internal/z;
+    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/internal/x;->aKM: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;->aKQ:Lcom/google/android/gms/nearby/messages/internal/z;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/x;->aKM:Lcom/google/android/gms/nearby/messages/internal/z;
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/x;->aKK:Lcom/google/android/gms/nearby/messages/internal/h;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/x;->aKG: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 e3c0a3e89b..c8e000d966 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 aKR:Lcom/google/android/gms/nearby/messages/internal/h;
+.field private final aKN:Lcom/google/android/gms/nearby/messages/internal/h;
 
-.field private final aKx:Landroid/app/Activity;
+.field private final aKt: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;->aKx:Landroid/app/Activity;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/y;->aKt:Landroid/app/Activity;
 
-    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/internal/y;->aKR:Lcom/google/android/gms/nearby/messages/internal/h;
+    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/internal/y;->aKN: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;->aKx:Landroid/app/Activity;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/y;->aKt: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;->aKx:Landroid/app/Activity;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/y;->aKt:Landroid/app/Activity;
 
     if-ne p1, v0, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/y;->aKR:Lcom/google/android/gms/nearby/messages/internal/h;
+    iget-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/y;->aKN: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 7416237d02..ea747311a2 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 aKu:I
+.field private final aKq:I
 
-.field private final aKv:I
+.field private final aKr:I
 
-.field private final aeM:I
+.field private final aeI: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;->aeM:I
+    iput p1, p0, Lcom/google/android/gms/nearby/messages/internal/zza;->aeI:I
 
-    iput p2, p0, Lcom/google/android/gms/nearby/messages/internal/zza;->aKu:I
+    iput p2, p0, Lcom/google/android/gms/nearby/messages/internal/zza;->aKq: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;->aKv:I
+    iput p3, p0, Lcom/google/android/gms/nearby/messages/internal/zza;->aKr: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;->aKu:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/zza;->aKq:I
 
-    invoke-interface {p1}, Lcom/google/android/gms/nearby/messages/BleSignal;->yX()I
+    invoke-interface {p1}, Lcom/google/android/gms/nearby/messages/BleSignal;->yV()I
 
     move-result v3
 
     if-ne v1, v3, :cond_2
 
-    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/zza;->aKv:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/zza;->aKr:I
 
-    invoke-interface {p1}, Lcom/google/android/gms/nearby/messages/BleSignal;->yY()I
+    invoke-interface {p1}, Lcom/google/android/gms/nearby/messages/BleSignal;->yW()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;->aKu:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/zza;->aKq: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;->aKv:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/zza;->aKr: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;->aKu:I
+    iget v0, p0, Lcom/google/android/gms/nearby/messages/internal/zza;->aKq:I
 
-    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/zza;->aKv:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/zza;->aKr: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;->aeM:I
+    iget v0, p0, Lcom/google/android/gms/nearby/messages/internal/zza;->aeI: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;->aKu:I
+    iget v0, p0, Lcom/google/android/gms/nearby/messages/internal/zza;->aKq: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;->aKv:I
+    iget v0, p0, Lcom/google/android/gms/nearby/messages/internal/zza;->aKr:I
 
     const/4 v1, 0x3
 
@@ -213,18 +213,18 @@
     return-void
 .end method
 
-.method public final yX()I
+.method public final yV()I
     .locals 1
 
-    iget v0, p0, Lcom/google/android/gms/nearby/messages/internal/zza;->aKu:I
+    iget v0, p0, Lcom/google/android/gms/nearby/messages/internal/zza;->aKq:I
 
     return v0
 .end method
 
-.method public final yY()I
+.method public final yW()I
     .locals 1
 
-    iget v0, p0, Lcom/google/android/gms/nearby/messages/internal/zza;->aKv:I
+    iget v0, p0, Lcom/google/android/gms/nearby/messages/internal/zza;->aKr: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 a948602588..eae77c2c9b 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 aJv:Ljava/lang/String;
+.field private final aJr:Ljava/lang/String;
 
-.field private final aeM:I
+.field private final aeI: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;->aeM:I
+    iput p1, p0, Lcom/google/android/gms/nearby/messages/internal/zzad;->aeI:I
 
-    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/internal/zzad;->aJv:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/internal/zzad;->aJr: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;->aJv:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzad;->aJr:Ljava/lang/String;
 
-    iget-object v3, p1, Lcom/google/android/gms/nearby/messages/internal/zzad;->aJv:Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/nearby/messages/internal/zzad;->aJr: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;->aJv:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzad;->aJr: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;->aJv:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/zzad;->aJr: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;->aJv:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/zzad;->aJr: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;->aeM:I
+    iget v0, p0, Lcom/google/android/gms/nearby/messages/internal/zzad;->aeI: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 abaa503293..f5a4ec32b4 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 aKp:Lcom/google/android/gms/nearby/messages/Message;
+.field private final aKl:Lcom/google/android/gms/nearby/messages/Message;
 
-.field private final aeM:I
+.field private final aeI: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;->aeM:I
+    iput p1, p0, Lcom/google/android/gms/nearby/messages/internal/zzaf;->aeI: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;->aKp:Lcom/google/android/gms/nearby/messages/Message;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/zzaf;->aKl: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;->aKp:Lcom/google/android/gms/nearby/messages/Message;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/zzaf;->aKl: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;
+    iget-object p1, p1, Lcom/google/android/gms/nearby/messages/internal/zzaf;->aKl: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;->aKp:Lcom/google/android/gms/nearby/messages/Message;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzaf;->aKl: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;->aKp:Lcom/google/android/gms/nearby/messages/Message;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/zzaf;->aKl: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;->aKp:Lcom/google/android/gms/nearby/messages/Message;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzaf;->aKl: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;->aeM:I
+    iget p2, p0, Lcom/google/android/gms/nearby/messages/internal/zzaf;->aeI: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 894ab17aab..7f3bb30c79 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 aJG:Ljava/lang/String;
+.field private final aJC:Ljava/lang/String;
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field private final aJH:Z
+.field private final aJD:Z
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field private final aJJ:Ljava/lang/String;
+.field private final aJF:Ljava/lang/String;
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field private final aKV:Lcom/google/android/gms/nearby/messages/internal/zzaf;
+.field private final aJZ:I
 
-.field private final aKW:Lcom/google/android/gms/nearby/messages/internal/ay;
+.field private final aKR:Lcom/google/android/gms/nearby/messages/internal/zzaf;
 
-.field private final aKd:I
+.field private final aKS:Lcom/google/android/gms/nearby/messages/internal/ay;
 
-.field private final aKf:Lcom/google/android/gms/nearby/messages/Strategy;
+.field private final aKb:Lcom/google/android/gms/nearby/messages/Strategy;
 
-.field private final aKg:Lcom/google/android/gms/nearby/messages/internal/at;
+.field private final aKc:Lcom/google/android/gms/nearby/messages/internal/at;
 
-.field private final aKl:Z
+.field private final aKh:Z
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field private final aKn:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
+.field private final aKj:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field private final aeM:I
+.field private final aeI: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;->aeM:I
+    iput p1, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aeI:I
 
-    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aKV:Lcom/google/android/gms/nearby/messages/internal/zzaf;
+    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aKR:Lcom/google/android/gms/nearby/messages/internal/zzaf;
 
-    iput-object p3, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aKf:Lcom/google/android/gms/nearby/messages/Strategy;
+    iput-object p3, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aKb: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;->aKg:Lcom/google/android/gms/nearby/messages/internal/at;
+    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aKc:Lcom/google/android/gms/nearby/messages/internal/at;
 
-    iput-object p5, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aJG:Ljava/lang/String;
+    iput-object p5, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aJC:Ljava/lang/String;
 
-    iput-object p6, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aJJ:Ljava/lang/String;
+    iput-object p6, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aJF:Ljava/lang/String;
 
-    iput-boolean p7, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aKl:Z
+    iput-boolean p7, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aKh: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;->aKW:Lcom/google/android/gms/nearby/messages/internal/ay;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aKS:Lcom/google/android/gms/nearby/messages/internal/ay;
 
-    iput-boolean p9, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aJH:Z
+    iput-boolean p9, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aJD: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;->aKn:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aKj:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
 
-    iput p11, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aKd:I
+    iput p11, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aJZ:I
 
     return-void
 .end method
@@ -202,25 +202,25 @@
 
     move-result v0
 
-    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aeM:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aeI: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;->aKV:Lcom/google/android/gms/nearby/messages/internal/zzaf;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aKR: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;->aKf:Lcom/google/android/gms/nearby/messages/Strategy;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aKb: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;->aKg:Lcom/google/android/gms/nearby/messages/internal/at;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aKc: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;->aJG:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aJC: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;->aJJ:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aJF: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;->aKl:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aKh: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;->aKW:Lcom/google/android/gms/nearby/messages/internal/ay;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aKS: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;->aJH:Z
+    iget-boolean v2, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aJD: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;->aKn:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
+    iget-object v2, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aKj: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;->aKd:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aJZ: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 165c14449e..095f4c12e0 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 aJG:Ljava/lang/String;
+.field private aJC:Ljava/lang/String;
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field private final aKX:Lcom/google/android/gms/nearby/messages/internal/bb;
+.field private final aKT:Lcom/google/android/gms/nearby/messages/internal/bb;
 
-.field public aKY:Z
+.field public aKU:Z
 
-.field private final aKg:Lcom/google/android/gms/nearby/messages/internal/at;
+.field private final aKc:Lcom/google/android/gms/nearby/messages/internal/at;
 
-.field private final aKn:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
+.field private final aKj:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field private final aeM:I
+.field private final aeI: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;->aeM:I
+    iput p1, p0, Lcom/google/android/gms/nearby/messages/internal/zzcb;->aeI: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;->aKg:Lcom/google/android/gms/nearby/messages/internal/at;
+    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/internal/zzcb;->aKc: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;->aKX:Lcom/google/android/gms/nearby/messages/internal/bb;
+    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/internal/zzcb;->aKT:Lcom/google/android/gms/nearby/messages/internal/bb;
 
-    iput-boolean p4, p0, Lcom/google/android/gms/nearby/messages/internal/zzcb;->aKY:Z
+    iput-boolean p4, p0, Lcom/google/android/gms/nearby/messages/internal/zzcb;->aKU:Z
 
-    iput-object p5, p0, Lcom/google/android/gms/nearby/messages/internal/zzcb;->aJG:Ljava/lang/String;
+    iput-object p5, p0, Lcom/google/android/gms/nearby/messages/internal/zzcb;->aJC: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;->aKn:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/zzcb;->aKj: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;->aeM:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzcb;->aeI: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;->aKg:Lcom/google/android/gms/nearby/messages/internal/at;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzcb;->aKc: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;->aKX:Lcom/google/android/gms/nearby/messages/internal/bb;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzcb;->aKT: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;->aKY:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzcb;->aKU: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;->aJG:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzcb;->aJC: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;->aKn:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzcb;->aKj: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 c326925934..ca9d45d204 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 aJG:Ljava/lang/String;
+.field private final aJC:Ljava/lang/String;
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field private final aJH:Z
+.field private final aJD:Z
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field private final aJJ:Ljava/lang/String;
+.field private final aJF:Ljava/lang/String;
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field private final aKV:Lcom/google/android/gms/nearby/messages/internal/zzaf;
+.field private final aKR:Lcom/google/android/gms/nearby/messages/internal/zzaf;
 
-.field private final aKg:Lcom/google/android/gms/nearby/messages/internal/at;
+.field private final aKc:Lcom/google/android/gms/nearby/messages/internal/at;
 
-.field private final aKn:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
+.field private final aKj:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field private final aeM:I
+.field private final aeI: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;->aeM:I
+    iput p1, p0, Lcom/google/android/gms/nearby/messages/internal/zzce;->aeI:I
 
-    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/internal/zzce;->aKV:Lcom/google/android/gms/nearby/messages/internal/zzaf;
+    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/internal/zzce;->aKR: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;->aKg:Lcom/google/android/gms/nearby/messages/internal/at;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/zzce;->aKc:Lcom/google/android/gms/nearby/messages/internal/at;
 
-    iput-object p4, p0, Lcom/google/android/gms/nearby/messages/internal/zzce;->aJG:Ljava/lang/String;
+    iput-object p4, p0, Lcom/google/android/gms/nearby/messages/internal/zzce;->aJC:Ljava/lang/String;
 
-    iput-object p5, p0, Lcom/google/android/gms/nearby/messages/internal/zzce;->aJJ:Ljava/lang/String;
+    iput-object p5, p0, Lcom/google/android/gms/nearby/messages/internal/zzce;->aJF:Ljava/lang/String;
 
-    iput-boolean p6, p0, Lcom/google/android/gms/nearby/messages/internal/zzce;->aJH:Z
+    iput-boolean p6, p0, Lcom/google/android/gms/nearby/messages/internal/zzce;->aJD: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;->aKn:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/zzce;->aKj: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;->aeM:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzce;->aeI: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;->aKV:Lcom/google/android/gms/nearby/messages/internal/zzaf;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzce;->aKR: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;->aKg:Lcom/google/android/gms/nearby/messages/internal/at;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzce;->aKc: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;->aJG:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzce;->aJC: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;->aJJ:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzce;->aJF: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;->aJH:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzce;->aJD: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;->aKn:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzce;->aKj: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 0a665ffb69..7c79992182 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 aJG:Ljava/lang/String;
+.field private final aJC:Ljava/lang/String;
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field private final aJH:Z
+.field private final aJD:Z
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field private final aJJ:Ljava/lang/String;
+.field private final aJF:Ljava/lang/String;
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field private final aKe:Lcom/google/android/gms/nearby/messages/internal/aq;
+.field private final aKa:Lcom/google/android/gms/nearby/messages/internal/aq;
 
-.field private final aKg:Lcom/google/android/gms/nearby/messages/internal/at;
+.field private final aKc:Lcom/google/android/gms/nearby/messages/internal/at;
 
-.field private final aKi:Landroid/app/PendingIntent;
+.field private final aKe:Landroid/app/PendingIntent;
 
-.field private final aKj:I
+.field private final aKf:I
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field private final aKn:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
+.field private final aKj:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field private final aeM:I
+.field private final aeI: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;->aeM:I
+    iput p1, p0, Lcom/google/android/gms/nearby/messages/internal/zzcg;->aeI: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;->aKe:Lcom/google/android/gms/nearby/messages/internal/aq;
+    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/internal/zzcg;->aKa: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;->aKg:Lcom/google/android/gms/nearby/messages/internal/at;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/zzcg;->aKc:Lcom/google/android/gms/nearby/messages/internal/at;
 
-    iput-object p4, p0, Lcom/google/android/gms/nearby/messages/internal/zzcg;->aKi:Landroid/app/PendingIntent;
+    iput-object p4, p0, Lcom/google/android/gms/nearby/messages/internal/zzcg;->aKe:Landroid/app/PendingIntent;
 
-    iput p5, p0, Lcom/google/android/gms/nearby/messages/internal/zzcg;->aKj:I
+    iput p5, p0, Lcom/google/android/gms/nearby/messages/internal/zzcg;->aKf:I
 
-    iput-object p6, p0, Lcom/google/android/gms/nearby/messages/internal/zzcg;->aJG:Ljava/lang/String;
+    iput-object p6, p0, Lcom/google/android/gms/nearby/messages/internal/zzcg;->aJC:Ljava/lang/String;
 
-    iput-object p7, p0, Lcom/google/android/gms/nearby/messages/internal/zzcg;->aJJ:Ljava/lang/String;
+    iput-object p7, p0, Lcom/google/android/gms/nearby/messages/internal/zzcg;->aJF:Ljava/lang/String;
 
-    iput-boolean p8, p0, Lcom/google/android/gms/nearby/messages/internal/zzcg;->aJH:Z
+    iput-boolean p8, p0, Lcom/google/android/gms/nearby/messages/internal/zzcg;->aJD: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;->aKn:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/zzcg;->aKj: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;->aeM:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzcg;->aeI: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;->aKe:Lcom/google/android/gms/nearby/messages/internal/aq;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzcg;->aKa: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;->aKg:Lcom/google/android/gms/nearby/messages/internal/at;
+    iget-object v2, p0, Lcom/google/android/gms/nearby/messages/internal/zzcg;->aKc: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;->aKi:Landroid/app/PendingIntent;
+    iget-object v2, p0, Lcom/google/android/gms/nearby/messages/internal/zzcg;->aKe: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;->aKj:I
+    iget v2, p0, Lcom/google/android/gms/nearby/messages/internal/zzcg;->aKf: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;->aJG:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/nearby/messages/internal/zzcg;->aJC: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;->aJJ:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/nearby/messages/internal/zzcg;->aJF: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;->aJH:Z
+    iget-boolean v2, p0, Lcom/google/android/gms/nearby/messages/internal/zzcg;->aJD: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;->aKn:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
+    iget-object v2, p0, Lcom/google/android/gms/nearby/messages/internal/zzcg;->aKj: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 9d0e4f1ab6..62c2968e2f 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 aKZ:I
+.field private final aKV:I
 
-.field private final aLa:D
+.field private final aKW:D
 
-.field private final aeM:I
+.field private final aeI: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;->aeM:I
+    iput p1, p0, Lcom/google/android/gms/nearby/messages/internal/zze;->aeI:I
 
-    iput p2, p0, Lcom/google/android/gms/nearby/messages/internal/zze;->aKZ:I
+    iput p2, p0, Lcom/google/android/gms/nearby/messages/internal/zze;->aKV:I
 
-    iput-wide p3, p0, Lcom/google/android/gms/nearby/messages/internal/zze;->aLa:D
+    iput-wide p3, p0, Lcom/google/android/gms/nearby/messages/internal/zze;->aKW: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;->aLa:D
+    iget-wide v0, p0, Lcom/google/android/gms/nearby/messages/internal/zze;->aKW: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;->yZ()D
+    invoke-interface {p1}, Lcom/google/android/gms/nearby/messages/Distance;->yX()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;->aLa:D
+    iget-wide v0, p0, Lcom/google/android/gms/nearby/messages/internal/zze;->aKW:D
 
-    invoke-interface {p1}, Lcom/google/android/gms/nearby/messages/Distance;->yZ()D
+    invoke-interface {p1}, Lcom/google/android/gms/nearby/messages/Distance;->yX()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;->aKZ:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/zze;->aKV:I
 
-    iget v3, p1, Lcom/google/android/gms/nearby/messages/internal/zze;->aKZ:I
+    iget v3, p1, Lcom/google/android/gms/nearby/messages/internal/zze;->aKV: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;->aKZ:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/zze;->aKV: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;->aLa:D
+    iget-wide v1, p0, Lcom/google/android/gms/nearby/messages/internal/zze;->aKW: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;->aLa:D
+    iget-wide v2, p0, Lcom/google/android/gms/nearby/messages/internal/zze;->aKW: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;->aKZ:I
+    iget v2, p0, Lcom/google/android/gms/nearby/messages/internal/zze;->aKV:I
 
     const/4 v3, 0x1
 
@@ -243,19 +243,19 @@
 
     move-result p2
 
-    iget v0, p0, Lcom/google/android/gms/nearby/messages/internal/zze;->aeM:I
+    iget v0, p0, Lcom/google/android/gms/nearby/messages/internal/zze;->aeI: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;->aKZ:I
+    iget v0, p0, Lcom/google/android/gms/nearby/messages/internal/zze;->aKV: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;->aLa:D
+    iget-wide v0, p0, Lcom/google/android/gms/nearby/messages/internal/zze;->aKW:D
 
     const/4 v2, 0x3
 
@@ -270,10 +270,10 @@
     return-void
 .end method
 
-.method public final yZ()D
+.method public final yX()D
     .locals 2
 
-    iget-wide v0, p0, Lcom/google/android/gms/nearby/messages/internal/zze;->aLa:D
+    iget-wide v0, p0, Lcom/google/android/gms/nearby/messages/internal/zze;->aKW: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 5dbae3574e..6461354f89 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 aKn:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
+.field private final aKj:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field private final aeM:I
+.field private final aeI:I
 
-.field private final ama:I
+.field private final alW: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;->aeM:I
+    iput p1, p0, Lcom/google/android/gms/nearby/messages/internal/zzj;->aeI:I
 
-    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/internal/zzj;->aKn:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
+    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/internal/zzj;->aKj:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
 
-    iput p3, p0, Lcom/google/android/gms/nearby/messages/internal/zzj;->ama:I
+    iput p3, p0, Lcom/google/android/gms/nearby/messages/internal/zzj;->alW:I
 
     return-void
 .end method
@@ -75,19 +75,19 @@
 
     move-result v0
 
-    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzj;->aeM:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzj;->aeI: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;->aKn:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzj;->aKj: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;->ama:I
+    iget p2, p0, Lcom/google/android/gms/nearby/messages/internal/zzj;->alW: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 677aec9754..046f8e9077 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 aLb:Ljava/lang/String;
+.field public final aKX:Ljava/lang/String;
 
-.field public final aLc:[B
+.field public final aKY:[B
 
-.field public final aLd:I
+.field public final aKZ: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;->aLb:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/safetynet/HarmfulAppsData;->aKX:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/google/android/gms/safetynet/HarmfulAppsData;->aLc:[B
+    iput-object p2, p0, Lcom/google/android/gms/safetynet/HarmfulAppsData;->aKY:[B
 
-    iput p3, p0, Lcom/google/android/gms/safetynet/HarmfulAppsData;->aLd:I
+    iput p3, p0, Lcom/google/android/gms/safetynet/HarmfulAppsData;->aKZ:I
 
     return-void
 .end method
@@ -60,19 +60,19 @@
 
     move-result p2
 
-    iget-object v0, p0, Lcom/google/android/gms/safetynet/HarmfulAppsData;->aLb:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/safetynet/HarmfulAppsData;->aKX: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;->aLc:[B
+    iget-object v0, p0, Lcom/google/android/gms/safetynet/HarmfulAppsData;->aKY:[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;->aLd:I
+    iget v0, p0, Lcom/google/android/gms/safetynet/HarmfulAppsData;->aKZ: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 99d15474eb..3bc56940ae 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 aLe:Lcom/google/android/gms/common/data/DataHolder;
+.field aLa:Lcom/google/android/gms/common/data/DataHolder;
 
-.field aLf:Landroid/os/ParcelFileDescriptor;
+.field aLb:Landroid/os/ParcelFileDescriptor;
 
-.field aLg:[B
+.field aLc:[B
 
-.field private aLh:[B
+.field private aLd:[B
 
-.field private aLi:Ljava/io/File;
+.field private aLe:Ljava/io/File;
 
-.field axw:J
+.field axs: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;->aLe:Lcom/google/android/gms/common/data/DataHolder;
+    iput-object p2, p0, Lcom/google/android/gms/safetynet/SafeBrowsingData;->aLa:Lcom/google/android/gms/common/data/DataHolder;
 
-    iput-object p3, p0, Lcom/google/android/gms/safetynet/SafeBrowsingData;->aLf:Landroid/os/ParcelFileDescriptor;
+    iput-object p3, p0, Lcom/google/android/gms/safetynet/SafeBrowsingData;->aLb:Landroid/os/ParcelFileDescriptor;
 
-    iput-wide p4, p0, Lcom/google/android/gms/safetynet/SafeBrowsingData;->axw:J
+    iput-wide p4, p0, Lcom/google/android/gms/safetynet/SafeBrowsingData;->axs:J
 
-    iput-object p6, p0, Lcom/google/android/gms/safetynet/SafeBrowsingData;->aLg:[B
+    iput-object p6, p0, Lcom/google/android/gms/safetynet/SafeBrowsingData;->aLc:[B
 
     return-void
 .end method
@@ -103,10 +103,10 @@
     return-void
 .end method
 
-.method private final zd()Ljava/io/FileOutputStream;
+.method private final zb()Ljava/io/FileOutputStream;
     .locals 5
 
-    iget-object v0, p0, Lcom/google/android/gms/safetynet/SafeBrowsingData;->aLi:Ljava/io/File;
+    iget-object v0, p0, Lcom/google/android/gms/safetynet/SafeBrowsingData;->aLe: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;->aLf:Landroid/os/ParcelFileDescriptor;
+    iput-object v3, p0, Lcom/google/android/gms/safetynet/SafeBrowsingData;->aLb: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;->aLf:Landroid/os/ParcelFileDescriptor;
+    iget-object v0, p0, Lcom/google/android/gms/safetynet/SafeBrowsingData;->aLb:Landroid/os/ParcelFileDescriptor;
 
     const/4 v1, 0x1
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/safetynet/SafeBrowsingData;->aLh:[B
+    iget-object v0, p0, Lcom/google/android/gms/safetynet/SafeBrowsingData;->aLd:[B
 
     if-eqz v0, :cond_0
 
-    invoke-direct {p0}, Lcom/google/android/gms/safetynet/SafeBrowsingData;->zd()Ljava/io/FileOutputStream;
+    invoke-direct {p0}, Lcom/google/android/gms/safetynet/SafeBrowsingData;->zb()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;->aLh:[B
+    iget-object v2, p0, Lcom/google/android/gms/safetynet/SafeBrowsingData;->aLd:[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;->aLh:[B
+    iget-object v2, p0, Lcom/google/android/gms/safetynet/SafeBrowsingData;->aLd:[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;->aLf:Landroid/os/ParcelFileDescriptor;
+    iput-object p1, p0, Lcom/google/android/gms/safetynet/SafeBrowsingData;->aLb: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 3086013047..ebc5a57aaf 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 uU()Ljava/lang/String;
+.method public final uS()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/m;->afE:Lcom/google/android/gms/common/api/n;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/m;->afA: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;->uU()Ljava/lang/String;
+    invoke-interface {v0}, Lcom/google/android/gms/safetynet/SafetyNetApi$a;->uS()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 18e75f3d1e..d939e3c061 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 uU()Ljava/lang/String;
+.method public abstract uS()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 6113bf0bac..7da2bdb5df 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;->aLj:Lcom/google/android/gms/common/api/a;
+    sget-object v0, Lcom/google/android/gms/safetynet/a;->aLf: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 61ae51835f..428def21c0 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 aAn:Lcom/google/android/gms/common/api/a$g;
+.field private static final aAj: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 aAo:Lcom/google/android/gms/common/api/a$a;
+.field private static final aAk: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 aLj:Lcom/google/android/gms/common/api/a;
+.field public static final aLf: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 aLk:Lcom/google/android/gms/safetynet/SafetyNetApi;
+.field public static final aLg:Lcom/google/android/gms/safetynet/SafetyNetApi;
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field private static final aLl:Lcom/google/android/gms/safetynet/i;
+.field private static final aLh: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;->aAn:Lcom/google/android/gms/common/api/a$g;
+    sput-object v0, Lcom/google/android/gms/safetynet/a;->aAj: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;->aAo:Lcom/google/android/gms/common/api/a$a;
+    sput-object v0, Lcom/google/android/gms/safetynet/a;->aAk: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;->aAo:Lcom/google/android/gms/common/api/a$a;
+    sget-object v1, Lcom/google/android/gms/safetynet/a;->aAk:Lcom/google/android/gms/common/api/a$a;
 
-    sget-object v2, Lcom/google/android/gms/safetynet/a;->aAn:Lcom/google/android/gms/common/api/a$g;
+    sget-object v2, Lcom/google/android/gms/safetynet/a;->aAj: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;->aLj:Lcom/google/android/gms/common/api/a;
+    sput-object v0, Lcom/google/android/gms/safetynet/a;->aLf: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;->aLk:Lcom/google/android/gms/safetynet/SafetyNetApi;
+    sput-object v0, Lcom/google/android/gms/safetynet/a;->aLg: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;->aLl:Lcom/google/android/gms/safetynet/i;
+    sput-object v0, Lcom/google/android/gms/safetynet/a;->aLh: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 e749234179..505144f8ac 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;->aLe:Lcom/google/android/gms/common/data/DataHolder;
+    iget-object v1, p0, Lcom/google/android/gms/safetynet/SafeBrowsingData;->aLa: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;->aLf:Landroid/os/ParcelFileDescriptor;
+    iget-object v1, p0, Lcom/google/android/gms/safetynet/SafeBrowsingData;->aLb: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;->axw:J
+    iget-wide v1, p0, Lcom/google/android/gms/safetynet/SafeBrowsingData;->axs: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;->aLg:[B
+    iget-object p0, p0, Lcom/google/android/gms/safetynet/SafeBrowsingData;->aLc:[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 97fdc732a3..f41f12bcfa 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 aLm:[Lcom/google/android/gms/safetynet/HarmfulAppsData;
+.field public final aLi:[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;->aLm:[Lcom/google/android/gms/safetynet/HarmfulAppsData;
+    iput-object p3, p0, Lcom/google/android/gms/safetynet/zzd;->aLi:[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;->aLm:[Lcom/google/android/gms/safetynet/HarmfulAppsData;
+    iget-object v1, p0, Lcom/google/android/gms/safetynet/zzd;->aLi:[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 63c26616b7..2a76578a90 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 afg:I
+.field private final afc:I
 
-.field private final atw:Z
+.field private final ats: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;->afg:I
+    iput p1, p0, Lcom/google/android/gms/safetynet/zzh;->afc:I
 
-    iput-boolean p2, p0, Lcom/google/android/gms/safetynet/zzh;->atw:Z
+    iput-boolean p2, p0, Lcom/google/android/gms/safetynet/zzh;->ats:Z
 
     return-void
 .end method
@@ -56,13 +56,13 @@
 
     move-result p2
 
-    iget v0, p0, Lcom/google/android/gms/safetynet/zzh;->afg:I
+    iget v0, p0, Lcom/google/android/gms/safetynet/zzh;->afc: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;->atw:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/safetynet/zzh;->ats: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 7575976cb6..8862828742 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 aLp:Lcom/google/android/gms/signin/a;
+.field public static final aLl:Lcom/google/android/gms/signin/a;
 
 
 # instance fields
-.field public final aLq:Z
+.field public final aLm:Z
+
+.field public final aLn:Z
+
+.field public final aLo:Ljava/lang/String;
+
+.field public final aLp:Z
+
+.field public final aLq:Ljava/lang/String;
 
 .field public final aLr:Z
 
-.field public final aLs:Ljava/lang/String;
+.field public final aLs:Ljava/lang/Long;
 
-.field public final aLt:Z
-
-.field public final aLu:Ljava/lang/String;
-
-.field public final aLv:Z
-
-.field public final aLw:Ljava/lang/Long;
-
-.field public final aLx:Ljava/lang/Long;
+.field public final aLt: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;->aLp:Lcom/google/android/gms/signin/a;
+    sput-object v0, Lcom/google/android/gms/signin/a;->aLl: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;->aLq:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/signin/a;->aLm:Z
 
-    iput-boolean v0, p0, Lcom/google/android/gms/signin/a;->aLr:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/signin/a;->aLn:Z
 
     const/4 v1, 0x0
 
-    iput-object v1, p0, Lcom/google/android/gms/signin/a;->aLs:Ljava/lang/String;
+    iput-object v1, p0, Lcom/google/android/gms/signin/a;->aLo:Ljava/lang/String;
 
-    iput-boolean v0, p0, Lcom/google/android/gms/signin/a;->aLt:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/signin/a;->aLp:Z
 
-    iput-boolean v0, p0, Lcom/google/android/gms/signin/a;->aLv:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/signin/a;->aLr:Z
 
-    iput-object v1, p0, Lcom/google/android/gms/signin/a;->aLu:Ljava/lang/String;
+    iput-object v1, p0, Lcom/google/android/gms/signin/a;->aLq:Ljava/lang/String;
 
-    iput-object v1, p0, Lcom/google/android/gms/signin/a;->aLw:Ljava/lang/Long;
+    iput-object v1, p0, Lcom/google/android/gms/signin/a;->aLs:Ljava/lang/Long;
 
-    iput-object v1, p0, Lcom/google/android/gms/signin/a;->aLx:Ljava/lang/Long;
+    iput-object v1, p0, Lcom/google/android/gms/signin/a;->aLt: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 3cdedf91d3..1126b899cc 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 aAn:Lcom/google/android/gms/common/api/a$g;
+.field private static final aAj: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 aLE:Lcom/google/android/gms/common/api/a$g;
+.field private static final aLA: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 public static final aLF:Lcom/google/android/gms/common/api/a$a;
+.field public static final aLB:Lcom/google/android/gms/common/api/a$a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/a$a<",
@@ -34,7 +34,7 @@
     .end annotation
 .end field
 
-.field private static final aLG:Lcom/google/android/gms/common/api/a$a;
+.field private static final aLC:Lcom/google/android/gms/common/api/a$a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/a$a<",
@@ -45,11 +45,11 @@
     .end annotation
 .end field
 
-.field private static final aLH:Lcom/google/android/gms/common/api/Scope;
+.field private static final aLD:Lcom/google/android/gms/common/api/Scope;
 
-.field private static final aLI:Lcom/google/android/gms/common/api/Scope;
+.field private static final aLE:Lcom/google/android/gms/common/api/Scope;
 
-.field private static final aLJ:Lcom/google/android/gms/common/api/a;
+.field private static final aLF:Lcom/google/android/gms/common/api/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/a<",
@@ -59,7 +59,7 @@
     .end annotation
 .end field
 
-.field public static final aLj:Lcom/google/android/gms/common/api/a;
+.field public static final aLf:Lcom/google/android/gms/common/api/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/a<",
@@ -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;->aAn:Lcom/google/android/gms/common/api/a$g;
+    sput-object v0, Lcom/google/android/gms/signin/b;->aAj: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;->aLE:Lcom/google/android/gms/common/api/a$g;
+    sput-object v0, Lcom/google/android/gms/signin/b;->aLA: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;->aLF:Lcom/google/android/gms/common/api/a$a;
+    sput-object v0, Lcom/google/android/gms/signin/b;->aLB: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;->aLG:Lcom/google/android/gms/common/api/a$a;
+    sput-object v0, Lcom/google/android/gms/signin/b;->aLC: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;->aLH:Lcom/google/android/gms/common/api/Scope;
+    sput-object v0, Lcom/google/android/gms/signin/b;->aLD: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;->aLI:Lcom/google/android/gms/common/api/Scope;
+    sput-object v0, Lcom/google/android/gms/signin/b;->aLE: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;->aLF:Lcom/google/android/gms/common/api/a$a;
+    sget-object v1, Lcom/google/android/gms/signin/b;->aLB:Lcom/google/android/gms/common/api/a$a;
 
-    sget-object v2, Lcom/google/android/gms/signin/b;->aAn:Lcom/google/android/gms/common/api/a$g;
+    sget-object v2, Lcom/google/android/gms/signin/b;->aAj: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;->aLj:Lcom/google/android/gms/common/api/a;
+    sput-object v0, Lcom/google/android/gms/signin/b;->aLf: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;->aLG:Lcom/google/android/gms/common/api/a$a;
+    sget-object v1, Lcom/google/android/gms/signin/b;->aLC:Lcom/google/android/gms/common/api/a$a;
 
-    sget-object v2, Lcom/google/android/gms/signin/b;->aLE:Lcom/google/android/gms/common/api/a$g;
+    sget-object v2, Lcom/google/android/gms/signin/b;->aLA: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;->aLJ:Lcom/google/android/gms/common/api/a;
+    sput-object v0, Lcom/google/android/gms/signin/b;->aLF: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 64cb9ee25c..e8da0f2f2e 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;->aLp:Lcom/google/android/gms/signin/a;
+    sget-object p4, Lcom/google/android/gms/signin/a;->aLl: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 c464435d65..bd034d4567 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 aLy:Z
+.field private final aLu:Z
 
-.field private final aLz:Landroid/os/Bundle;
+.field private final aLv:Landroid/os/Bundle;
 
-.field private final ahE:Lcom/google/android/gms/common/internal/d;
+.field private final ahA:Lcom/google/android/gms/common/internal/d;
 
-.field private ajJ:Ljava/lang/Integer;
+.field private ajF:Ljava/lang/Integer;
 
 
 # direct methods
@@ -48,15 +48,15 @@
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lcom/google/android/gms/signin/internal/a;->aLy:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/signin/internal/a;->aLu:Z
 
-    iput-object p3, p0, Lcom/google/android/gms/signin/internal/a;->ahE:Lcom/google/android/gms/common/internal/d;
+    iput-object p3, p0, Lcom/google/android/gms/signin/internal/a;->ahA:Lcom/google/android/gms/common/internal/d;
 
-    iput-object p4, p0, Lcom/google/android/gms/signin/internal/a;->aLz:Landroid/os/Bundle;
+    iput-object p4, p0, Lcom/google/android/gms/signin/internal/a;->aLv:Landroid/os/Bundle;
 
-    iget-object p1, p3, Lcom/google/android/gms/common/internal/d;->ajJ:Ljava/lang/Integer;
+    iget-object p1, p3, Lcom/google/android/gms/common/internal/d;->ajF:Ljava/lang/Integer;
 
-    iput-object p1, p0, Lcom/google/android/gms/signin/internal/a;->ajJ:Ljava/lang/Integer;
+    iput-object p1, p0, Lcom/google/android/gms/signin/internal/a;->ajF: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;->ajH:Lcom/google/android/gms/signin/a;
+    iget-object v0, p3, Lcom/google/android/gms/common/internal/d;->ajD:Lcom/google/android/gms/signin/a;
 
-    iget-object v1, p3, Lcom/google/android/gms/common/internal/d;->ajJ:Ljava/lang/Integer;
+    iget-object v1, p3, Lcom/google/android/gms/common/internal/d;->ajF: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;->ajz:Landroid/accounts/Account;
+    iget-object v2, p3, Lcom/google/android/gms/common/internal/d;->ajv: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;->aLq:Z
+    iget-boolean v1, v0, Lcom/google/android/gms/signin/a;->aLm: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;->aLr:Z
+    iget-boolean v1, v0, Lcom/google/android/gms/signin/a;->aLn: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;->aLs:Ljava/lang/String;
+    iget-object v1, v0, Lcom/google/android/gms/signin/a;->aLo: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;->aLt:Z
+    iget-boolean v1, v0, Lcom/google/android/gms/signin/a;->aLp: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;->aLu:Ljava/lang/String;
+    iget-object v1, v0, Lcom/google/android/gms/signin/a;->aLq: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;->aLv:Z
+    iget-boolean v1, v0, Lcom/google/android/gms/signin/a;->aLr: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;->aLw:Ljava/lang/Long;
+    iget-object v1, v0, Lcom/google/android/gms/signin/a;->aLs:Ljava/lang/Long;
 
     if-eqz v1, :cond_1
 
-    iget-object v1, v0, Lcom/google/android/gms/signin/a;->aLw:Ljava/lang/Long;
+    iget-object v1, v0, Lcom/google/android/gms/signin/a;->aLs: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;->aLx:Ljava/lang/Long;
+    iget-object v1, v0, Lcom/google/android/gms/signin/a;->aLt:Ljava/lang/Long;
 
     if-eqz v1, :cond_2
 
-    iget-object v0, v0, Lcom/google/android/gms/signin/a;->aLx:Ljava/lang/Long;
+    iget-object v0, v0, Lcom/google/android/gms/signin/a;->aLt: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;->ahE:Lcom/google/android/gms/common/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/signin/internal/a;->ahA:Lcom/google/android/gms/common/internal/d;
 
-    iget-object v1, v0, Lcom/google/android/gms/common/internal/d;->ajz:Landroid/accounts/Account;
+    iget-object v1, v0, Lcom/google/android/gms/common/internal/d;->ajv: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;->ajz:Landroid/accounts/Account;
+    iget-object v0, v0, Lcom/google/android/gms/common/internal/d;->ajv: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;->ajJ:Ljava/lang/Integer;
+    iget-object v3, p0, Lcom/google/android/gms/signin/internal/a;->ajF: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;->mU()Landroid/os/IInterface;
+    invoke-virtual {p0}, Lcom/google/android/gms/signin/internal/a;->mS()Landroid/os/IInterface;
 
     move-result-object v0
 
@@ -340,20 +340,28 @@
     return-void
 .end method
 
-.method public final lY()Z
+.method public final lW()Z
     .locals 1
 
-    iget-boolean v0, p0, Lcom/google/android/gms/signin/internal/a;->aLy:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/signin/internal/a;->aLu:Z
 
     return v0
 .end method
 
-.method public final mT()Landroid/os/Bundle;
+.method public final lZ()I
+    .locals 1
+
+    const v0, 0xbdfcb8
+
+    return v0
+.end method
+
+.method public final mR()Landroid/os/Bundle;
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/signin/internal/a;->ahE:Lcom/google/android/gms/common/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/signin/internal/a;->ahA:Lcom/google/android/gms/common/internal/d;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/internal/d;->ajF:Ljava/lang/String;
+    iget-object v0, v0, Lcom/google/android/gms/common/internal/d;->ajB:Ljava/lang/String;
 
     invoke-virtual {p0}, Lcom/google/android/gms/signin/internal/a;->getContext()Landroid/content/Context;
 
@@ -369,31 +377,23 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/signin/internal/a;->aLz:Landroid/os/Bundle;
+    iget-object v0, p0, Lcom/google/android/gms/signin/internal/a;->aLv:Landroid/os/Bundle;
 
-    iget-object v1, p0, Lcom/google/android/gms/signin/internal/a;->ahE:Lcom/google/android/gms/common/internal/d;
+    iget-object v1, p0, Lcom/google/android/gms/signin/internal/a;->ahA:Lcom/google/android/gms/common/internal/d;
 
-    iget-object v1, v1, Lcom/google/android/gms/common/internal/d;->ajF:Ljava/lang/String;
+    iget-object v1, v1, Lcom/google/android/gms/common/internal/d;->ajB: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;->aLz:Landroid/os/Bundle;
+    iget-object v0, p0, Lcom/google/android/gms/signin/internal/a;->aLv:Landroid/os/Bundle;
 
     return-object v0
 .end method
 
-.method public final mb()I
-    .locals 1
-
-    const v0, 0xbdfcb8
-
-    return v0
-.end method
-
-.method public final md()Ljava/lang/String;
+.method public final mb()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 me()Ljava/lang/String;
+.method public final mc()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 d07f31c7ea..209b947c40 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;->nP()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/b/a;->nN()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 4121f385d7..ed76e30fd3 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 aLA:I
+.field private aLw:I
 
-.field private aLB:Landroid/content/Intent;
+.field private aLx:Landroid/content/Intent;
 
-.field private final aiC:I
+.field private final aiy: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;->aiC:I
+    iput p1, p0, Lcom/google/android/gms/signin/internal/zaa;->aiy:I
 
-    iput p2, p0, Lcom/google/android/gms/signin/internal/zaa;->aLA:I
+    iput p2, p0, Lcom/google/android/gms/signin/internal/zaa;->aLw:I
 
-    iput-object p3, p0, Lcom/google/android/gms/signin/internal/zaa;->aLB:Landroid/content/Intent;
+    iput-object p3, p0, Lcom/google/android/gms/signin/internal/zaa;->aLx:Landroid/content/Intent;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final mo()Lcom/google/android/gms/common/api/Status;
+.method public final mm()Lcom/google/android/gms/common/api/Status;
     .locals 1
 
-    iget v0, p0, Lcom/google/android/gms/signin/internal/zaa;->aLA:I
+    iget v0, p0, Lcom/google/android/gms/signin/internal/zaa;->aLw:I
 
     if-nez v0, :cond_0
 
-    sget-object v0, Lcom/google/android/gms/common/api/Status;->afG:Lcom/google/android/gms/common/api/Status;
+    sget-object v0, Lcom/google/android/gms/common/api/Status;->afC:Lcom/google/android/gms/common/api/Status;
 
     return-object v0
 
     :cond_0
-    sget-object v0, Lcom/google/android/gms/common/api/Status;->afK: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
 .end method
@@ -104,19 +104,19 @@
 
     move-result v0
 
-    iget v1, p0, Lcom/google/android/gms/signin/internal/zaa;->aiC:I
+    iget v1, p0, Lcom/google/android/gms/signin/internal/zaa;->aiy: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;->aLA:I
+    iget v1, p0, Lcom/google/android/gms/signin/internal/zaa;->aLw: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;->aLB:Landroid/content/Intent;
+    iget-object v1, p0, Lcom/google/android/gms/signin/internal/zaa;->aLx: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 2d305347ed..602079eb15 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 aLC:Lcom/google/android/gms/common/internal/ResolveAccountRequest;
+.field private final aLy:Lcom/google/android/gms/common/internal/ResolveAccountRequest;
 
-.field private final aiC:I
+.field private final aiy: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;->aiC:I
+    iput p1, p0, Lcom/google/android/gms/signin/internal/zah;->aiy:I
 
-    iput-object p2, p0, Lcom/google/android/gms/signin/internal/zah;->aLC:Lcom/google/android/gms/common/internal/ResolveAccountRequest;
+    iput-object p2, p0, Lcom/google/android/gms/signin/internal/zah;->aLy: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;->aiC:I
+    iget v1, p0, Lcom/google/android/gms/signin/internal/zah;->aiy: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;->aLC:Lcom/google/android/gms/common/internal/ResolveAccountRequest;
+    iget-object v1, p0, Lcom/google/android/gms/signin/internal/zah;->aLy: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 35c4de77bc..72746e7c6a 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 aLD:Lcom/google/android/gms/common/internal/ResolveAccountResponse;
+.field public final aLz:Lcom/google/android/gms/common/internal/ResolveAccountResponse;
 
-.field private final aiC:I
+.field public final aih:Lcom/google/android/gms/common/ConnectionResult;
 
-.field public final ail:Lcom/google/android/gms/common/ConnectionResult;
+.field private final aiy:I
 
 
 # direct methods
@@ -56,11 +56,11 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/common/internal/safeparcel/AbstractSafeParcelable;-><init>()V
 
-    iput p1, p0, Lcom/google/android/gms/signin/internal/zaj;->aiC:I
+    iput p1, p0, Lcom/google/android/gms/signin/internal/zaj;->aiy:I
 
-    iput-object p2, p0, Lcom/google/android/gms/signin/internal/zaj;->ail:Lcom/google/android/gms/common/ConnectionResult;
+    iput-object p2, p0, Lcom/google/android/gms/signin/internal/zaj;->aih:Lcom/google/android/gms/common/ConnectionResult;
 
-    iput-object p3, p0, Lcom/google/android/gms/signin/internal/zaj;->aLD:Lcom/google/android/gms/common/internal/ResolveAccountResponse;
+    iput-object p3, p0, Lcom/google/android/gms/signin/internal/zaj;->aLz: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;->aiC:I
+    iget v1, p0, Lcom/google/android/gms/signin/internal/zaj;->aiy: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;->ail:Lcom/google/android/gms/common/ConnectionResult;
+    iget-object v1, p0, Lcom/google/android/gms/signin/internal/zaj;->aih: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;->aLD:Lcom/google/android/gms/common/internal/ResolveAccountResponse;
+    iget-object v1, p0, Lcom/google/android/gms/signin/internal/zaj;->aLz: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 435726c713..f7afd7cab3 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 aLR:Ljava/util/concurrent/ScheduledExecutorService;
+.field private static aLN:Ljava/util/concurrent/ScheduledExecutorService;
 
-.field private static volatile aLS:Lcom/google/android/gms/stats/a$a;
+.field private static volatile aLO:Lcom/google/android/gms/stats/a$a;
 
 
 # instance fields
-.field public final aLK:Landroid/os/PowerManager$WakeLock;
+.field public final aLG:Landroid/os/PowerManager$WakeLock;
 
-.field private aLL:Landroid/os/WorkSource;
+.field private aLH:Landroid/os/WorkSource;
 
-.field private final aLM:Landroid/content/Context;
+.field private final aLI:Landroid/content/Context;
 
-.field private final aLN:Ljava/util/Map;
+.field private final aLJ:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -35,7 +35,7 @@
     .end annotation
 .end field
 
-.field private final aLO:Ljava/util/Set;
+.field private final aLK:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -45,9 +45,9 @@
     .end annotation
 .end field
 
-.field private aLP:I
+.field private aLL:I
 
-.field private aLQ:Ljava/util/concurrent/atomic/AtomicInteger;
+.field private aLM: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;->aLS:Lcom/google/android/gms/stats/a$a;
+    sput-object v0, Lcom/google/android/gms/stats/a;->aLO: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;->aLN:Ljava/util/Map;
+    iput-object p5, p0, Lcom/google/android/gms/stats/a;->aLJ: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;->aLO:Ljava/util/Set;
+    iput-object p5, p0, Lcom/google/android/gms/stats/a;->aLK: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;->aLQ:Ljava/util/concurrent/atomic/AtomicInteger;
+    iput-object p5, p0, Lcom/google/android/gms/stats/a;->aLM: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;->aLM:Landroid/content/Context;
+    iput-object p5, p0, Lcom/google/android/gms/stats/a;->aLI: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;->aLK:Landroid/os/PowerManager$WakeLock;
+    iput-object p2, p0, Lcom/google/android/gms/stats/a;->aLG: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;->aLL:Landroid/os/WorkSource;
+    iput-object p1, p0, Lcom/google/android/gms/stats/a;->aLH:Landroid/os/WorkSource;
 
-    iget-object p1, p0, Lcom/google/android/gms/stats/a;->aLL:Landroid/os/WorkSource;
+    iget-object p1, p0, Lcom/google/android/gms/stats/a;->aLH:Landroid/os/WorkSource;
 
     if-eqz p1, :cond_4
 
-    iget-object p2, p0, Lcom/google/android/gms/stats/a;->aLM:Landroid/content/Context;
+    iget-object p2, p0, Lcom/google/android/gms/stats/a;->aLI: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;->aLL:Landroid/os/WorkSource;
+    iget-object p2, p0, Lcom/google/android/gms/stats/a;->aLH: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;->aLL:Landroid/os/WorkSource;
+    iput-object p1, p0, Lcom/google/android/gms/stats/a;->aLH:Landroid/os/WorkSource;
 
     :goto_2
-    iget-object p1, p0, Lcom/google/android/gms/stats/a;->aLL:Landroid/os/WorkSource;
+    iget-object p1, p0, Lcom/google/android/gms/stats/a;->aLH:Landroid/os/WorkSource;
 
     :try_start_0
-    iget-object p2, p0, Lcom/google/android/gms/stats/a;->aLK:Landroid/os/PowerManager$WakeLock;
+    iget-object p2, p0, Lcom/google/android/gms/stats/a;->aLG: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;->aLR:Ljava/util/concurrent/ScheduledExecutorService;
+    sget-object p1, Lcom/google/android/gms/stats/a;->aLN:Ljava/util/concurrent/ScheduledExecutorService;
 
     if-nez p1, :cond_5
 
-    invoke-static {}, Lcom/google/android/gms/common/b/a;->ni()Lcom/google/android/gms/common/b/a$a;
+    invoke-static {}, Lcom/google/android/gms/common/b/a;->ng()Lcom/google/android/gms/common/b/a$a;
 
     move-result-object p1
 
-    invoke-interface {p1}, Lcom/google/android/gms/common/b/a$a;->nj()Ljava/util/concurrent/ScheduledExecutorService;
+    invoke-interface {p1}, Lcom/google/android/gms/common/b/a$a;->nh()Ljava/util/concurrent/ScheduledExecutorService;
 
     move-result-object p1
 
-    sput-object p1, Lcom/google/android/gms/stats/a;->aLR:Ljava/util/concurrent/ScheduledExecutorService;
+    sput-object p1, Lcom/google/android/gms/stats/a;->aLN: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;->ze()V
+    invoke-direct {p0}, Lcom/google/android/gms/stats/a;->zc()V
 
     return-void
 .end method
 
-.method private final ze()V
+.method private final zc()V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/stats/a;->aLK:Landroid/os/PowerManager$WakeLock;
+    iget-object v0, p0, Lcom/google/android/gms/stats/a;->aLG: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;->aLK:Landroid/os/PowerManager$WakeLock;
+    iget-object v0, p0, Lcom/google/android/gms/stats/a;->aLG: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;->aLK:Landroid/os/PowerManager$WakeLock;
+    iget-object v0, p0, Lcom/google/android/gms/stats/a;->aLG:Landroid/os/PowerManager$WakeLock;
 
     invoke-virtual {v0}, Landroid/os/PowerManager$WakeLock;->isHeld()Z
 
@@ -404,7 +404,7 @@
     return-void
 .end method
 
-.method private final zf()Ljava/lang/String;
+.method private final zd()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;->aLK:Landroid/os/PowerManager$WakeLock;
+    iget-object v0, p0, Lcom/google/android/gms/stats/a;->aLG: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;->aLQ:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v0, p0, Lcom/google/android/gms/stats/a;->aLM:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicInteger;->incrementAndGet()I
 
-    invoke-direct {p0}, Lcom/google/android/gms/stats/a;->zf()Ljava/lang/String;
+    invoke-direct {p0}, Lcom/google/android/gms/stats/a;->zd()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;->aLN:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/stats/a;->aLJ: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;->aLP:I
+    iget v1, p0, Lcom/google/android/gms/stats/a;->aLL:I
 
     if-lez v1, :cond_1
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/stats/a;->aLK:Landroid/os/PowerManager$WakeLock;
+    iget-object v1, p0, Lcom/google/android/gms/stats/a;->aLG: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;->aLN:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/stats/a;->aLJ:Ljava/util/Map;
 
     invoke-interface {v1}, Ljava/util/Map;->clear()V
 
-    iput v2, p0, Lcom/google/android/gms/stats/a;->aLP:I
+    iput v2, p0, Lcom/google/android/gms/stats/a;->aLL: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;->aLN:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/stats/a;->aLJ: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;->aLN:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/stats/a;->aLJ: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;->aLP:I
+    iget v1, p0, Lcom/google/android/gms/stats/a;->aLL:I
 
     if-nez v1, :cond_5
 
     :cond_4
-    invoke-static {}, Lcom/google/android/gms/common/stats/d;->np()Lcom/google/android/gms/common/stats/d;
+    invoke-static {}, Lcom/google/android/gms/common/stats/d;->nn()Lcom/google/android/gms/common/stats/d;
 
-    iget-object v1, p0, Lcom/google/android/gms/stats/a;->aLM:Landroid/content/Context;
+    iget-object v1, p0, Lcom/google/android/gms/stats/a;->aLI:Landroid/content/Context;
 
-    iget-object v2, p0, Lcom/google/android/gms/stats/a;->aLK:Landroid/os/PowerManager$WakeLock;
+    iget-object v2, p0, Lcom/google/android/gms/stats/a;->aLG: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;->aLL:Landroid/os/WorkSource;
+    iget-object v8, p0, Lcom/google/android/gms/stats/a;->aLH: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;->aLP:I
+    iget v1, p0, Lcom/google/android/gms/stats/a;->aLL:I
 
     add-int/2addr v1, v11
 
-    iput v1, p0, Lcom/google/android/gms/stats/a;->aLP:I
+    iput v1, p0, Lcom/google/android/gms/stats/a;->aLL: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;->aLK:Landroid/os/PowerManager$WakeLock;
+    iget-object v0, p0, Lcom/google/android/gms/stats/a;->aLG: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;->aLR:Ljava/util/concurrent/ScheduledExecutorService;
+    sget-object v0, Lcom/google/android/gms/stats/a;->aLN: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;->aLQ:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v0, p0, Lcom/google/android/gms/stats/a;->aLM: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;->zf()Ljava/lang/String;
+    invoke-direct {p0}, Lcom/google/android/gms/stats/a;->zd()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;->aLN:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/stats/a;->aLJ: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;->aLN:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/stats/a;->aLJ: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;->aLP:I
+    iget v1, p0, Lcom/google/android/gms/stats/a;->aLL:I
 
     if-ne v1, v8, :cond_5
 
     :cond_4
-    invoke-static {}, Lcom/google/android/gms/common/stats/d;->np()Lcom/google/android/gms/common/stats/d;
+    invoke-static {}, Lcom/google/android/gms/common/stats/d;->nn()Lcom/google/android/gms/common/stats/d;
 
-    iget-object v2, p0, Lcom/google/android/gms/stats/a;->aLM:Landroid/content/Context;
+    iget-object v2, p0, Lcom/google/android/gms/stats/a;->aLI:Landroid/content/Context;
 
-    iget-object v1, p0, Lcom/google/android/gms/stats/a;->aLK:Landroid/os/PowerManager$WakeLock;
+    iget-object v1, p0, Lcom/google/android/gms/stats/a;->aLG: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;->aLL:Landroid/os/WorkSource;
+    iget-object v1, p0, Lcom/google/android/gms/stats/a;->aLH: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;->aLP:I
+    iget v1, p0, Lcom/google/android/gms/stats/a;->aLL:I
 
     sub-int/2addr v1, v8
 
-    iput v1, p0, Lcom/google/android/gms/stats/a;->aLP:I
+    iput v1, p0, Lcom/google/android/gms/stats/a;->aLL: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;->ze()V
+    invoke-direct {p0}, Lcom/google/android/gms/stats/a;->zc()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 9a3eb9b7c7..7ff843ca1e 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 aLT:Lcom/google/android/gms/stats/a;
+.field private final synthetic aLP: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;->aLT:Lcom/google/android/gms/stats/a;
+    iput-object p1, p0, Lcom/google/android/gms/stats/c;->aLP: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;->aLT:Lcom/google/android/gms/stats/a;
+    iget-object v0, p0, Lcom/google/android/gms/stats/c;->aLP: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 143fcefaad..e96692dc39 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 zg()Z
+.method public abstract ze()Z
 .end method
 
-.method public abstract zh()Ljava/lang/Exception;
+.method public abstract zf()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 4c346562c2..d56a25196d 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 aMo:Ljava/util/Queue;
+.field private aMk:Ljava/util/Queue;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Queue<",
@@ -24,7 +24,7 @@
     .end annotation
 .end field
 
-.field private aMp:Z
+.field private aMl: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;->aMo:Ljava/util/Queue;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/aa;->aMk: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;->aMo:Ljava/util/Queue;
+    iput-object v1, p0, Lcom/google/android/gms/tasks/aa;->aMk:Ljava/util/Queue;
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/tasks/aa;->aMo:Ljava/util/Queue;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/aa;->aMk: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;->aMo:Ljava/util/Queue;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/aa;->aMk:Ljava/util/Queue;
 
     if-eqz v1, :cond_2
 
-    iget-boolean v1, p0, Lcom/google/android/gms/tasks/aa;->aMp:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/tasks/aa;->aMl: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;->aMp:Z
+    iput-boolean v1, p0, Lcom/google/android/gms/tasks/aa;->aMl: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;->aMo:Ljava/util/Queue;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/aa;->aMk: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;->aMp:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/tasks/aa;->aMl: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 c21b6cacc8..15eece9cc6 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 aGg:Z
+.field private aGc:Z
 
-.field private final aMq:Lcom/google/android/gms/tasks/aa;
+.field private final aMm: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 aMr:Z
+.field private volatile aMn:Z
 
-.field private aMs:Ljava/lang/Object;
+.field private aMo:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TTResult;"
@@ -36,7 +36,7 @@
     .end annotation
 .end field
 
-.field private aMt:Ljava/lang/Exception;
+.field private aMp: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;->aMq:Lcom/google/android/gms/tasks/aa;
+    iput-object v0, p0, Lcom/google/android/gms/tasks/ac;->aMm:Lcom/google/android/gms/tasks/aa;
 
     return-void
 .end method
 
-.method private final pG()V
+.method private final pE()V
     .locals 2
 
-    iget-boolean v0, p0, Lcom/google/android/gms/tasks/ac;->aGg:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/tasks/ac;->aGc:Z
 
     const-string v1, "Task is not yet complete"
 
@@ -74,10 +74,10 @@
     return-void
 .end method
 
-.method private final rA()V
+.method private final ry()V
     .locals 2
 
-    iget-boolean v0, p0, Lcom/google/android/gms/tasks/ac;->aGg:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/tasks/ac;->aGc:Z
 
     xor-int/lit8 v0, v0, 0x1
 
@@ -88,7 +88,7 @@
     return-void
 .end method
 
-.method private final tA()V
+.method private final ty()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;->aGg:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/tasks/ac;->aGc: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;->aMq:Lcom/google/android/gms/tasks/aa;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/ac;->aMm: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 vq()V
+.method private final vo()V
     .locals 2
 
-    iget-boolean v0, p0, Lcom/google/android/gms/tasks/ac;->aMr:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/tasks/ac;->aMn:Z
 
     if-nez v0, :cond_0
 
@@ -159,7 +159,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/google/android/gms/tasks/i;->aLV:Ljava/util/concurrent/Executor;
+    sget-object v0, Lcom/google/android/gms/tasks/i;->aLR: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;->aLV:Ljava/util/concurrent/Executor;
+    sget-object v0, Lcom/google/android/gms/tasks/i;->aLR: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;->aLV:Ljava/util/concurrent/Executor;
+    sget-object v0, Lcom/google/android/gms/tasks/i;->aLR: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;->aLV:Ljava/util/concurrent/Executor;
+    sget-object v0, Lcom/google/android/gms/tasks/i;->aLR: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;->aMq:Lcom/google/android/gms/tasks/aa;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/ac;->aMm: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;->tA()V
+    invoke-direct {p0}, Lcom/google/android/gms/tasks/ac;->ty()V
 
     return-object v0
 .end method
@@ -276,7 +276,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/tasks/ac;->aMq:Lcom/google/android/gms/tasks/aa;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/ac;->aMm: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;->tA()V
+    invoke-direct {p0}, Lcom/google/android/gms/tasks/ac;->ty()V
 
     return-object p0
 .end method
@@ -302,7 +302,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/tasks/ac;->aMq:Lcom/google/android/gms/tasks/aa;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/ac;->aMm: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;->tA()V
+    invoke-direct {p0}, Lcom/google/android/gms/tasks/ac;->ty()V
 
     return-object p0
 .end method
@@ -328,7 +328,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/tasks/ac;->aMq:Lcom/google/android/gms/tasks/aa;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/ac;->aMm: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;->tA()V
+    invoke-direct {p0}, Lcom/google/android/gms/tasks/ac;->ty()V
 
     return-object p0
 .end method
@@ -354,7 +354,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/tasks/ac;->aMq:Lcom/google/android/gms/tasks/aa;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/ac;->aMm: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;->tA()V
+    invoke-direct {p0}, Lcom/google/android/gms/tasks/ac;->ty()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;->aMq:Lcom/google/android/gms/tasks/aa;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/ac;->aMm: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;->tA()V
+    invoke-direct {p0}, Lcom/google/android/gms/tasks/ac;->ty()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;->aMq:Lcom/google/android/gms/tasks/aa;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/ac;->aMm: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;->tA()V
+    invoke-direct {p0}, Lcom/google/android/gms/tasks/ac;->ty()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;->aGg:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/tasks/ac;->aGc: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;->aGg:Z
+    iput-boolean v1, p0, Lcom/google/android/gms/tasks/ac;->aGc:Z
 
-    iput-object p1, p0, Lcom/google/android/gms/tasks/ac;->aMs:Ljava/lang/Object;
+    iput-object p1, p0, Lcom/google/android/gms/tasks/ac;->aMo: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;->aMq:Lcom/google/android/gms/tasks/aa;
+    iget-object p1, p0, Lcom/google/android/gms/tasks/ac;->aMm: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;->rA()V
+    invoke-direct {p0}, Lcom/google/android/gms/tasks/ac;->ry()V
 
     const/4 v1, 0x1
 
-    iput-boolean v1, p0, Lcom/google/android/gms/tasks/ac;->aGg:Z
+    iput-boolean v1, p0, Lcom/google/android/gms/tasks/ac;->aGc:Z
 
-    iput-object p1, p0, Lcom/google/android/gms/tasks/ac;->aMs:Ljava/lang/Object;
+    iput-object p1, p0, Lcom/google/android/gms/tasks/ac;->aMo: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;->aMq:Lcom/google/android/gms/tasks/aa;
+    iget-object p1, p0, Lcom/google/android/gms/tasks/ac;->aMm: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;->rA()V
+    invoke-direct {p0}, Lcom/google/android/gms/tasks/ac;->ry()V
 
     const/4 v1, 0x1
 
-    iput-boolean v1, p0, Lcom/google/android/gms/tasks/ac;->aGg:Z
+    iput-boolean v1, p0, Lcom/google/android/gms/tasks/ac;->aGc:Z
 
-    iput-object p1, p0, Lcom/google/android/gms/tasks/ac;->aMt:Ljava/lang/Exception;
+    iput-object p1, p0, Lcom/google/android/gms/tasks/ac;->aMp: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;->aMq:Lcom/google/android/gms/tasks/aa;
+    iget-object p1, p0, Lcom/google/android/gms/tasks/ac;->aMm: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;->aGg:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/tasks/ac;->aGc: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;->aGg:Z
+    iput-boolean v1, p0, Lcom/google/android/gms/tasks/ac;->aGc:Z
 
-    iput-object p1, p0, Lcom/google/android/gms/tasks/ac;->aMt:Ljava/lang/Exception;
+    iput-object p1, p0, Lcom/google/android/gms/tasks/ac;->aMp: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;->aMq:Lcom/google/android/gms/tasks/aa;
+    iget-object p1, p0, Lcom/google/android/gms/tasks/ac;->aMm: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;->aMr:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/tasks/ac;->aMn: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;->aGg:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/tasks/ac;->aGc:Z
 
     monitor-exit v0
 
@@ -662,15 +662,15 @@
     monitor-enter v0
 
     :try_start_0
-    invoke-direct {p0}, Lcom/google/android/gms/tasks/ac;->pG()V
+    invoke-direct {p0}, Lcom/google/android/gms/tasks/ac;->pE()V
 
-    invoke-direct {p0}, Lcom/google/android/gms/tasks/ac;->vq()V
+    invoke-direct {p0}, Lcom/google/android/gms/tasks/ac;->vo()V
 
-    iget-object v1, p0, Lcom/google/android/gms/tasks/ac;->aMt:Ljava/lang/Exception;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/ac;->aMp:Ljava/lang/Exception;
 
     if-nez v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/tasks/ac;->aMs:Ljava/lang/Object;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/ac;->aMo: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;->aMt:Ljava/lang/Exception;
+    iget-object v2, p0, Lcom/google/android/gms/tasks/ac;->aMp: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 pH()Z
+.method public final pF()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;->aGg:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/tasks/ac;->aGc: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;->aGg:Z
+    iput-boolean v1, p0, Lcom/google/android/gms/tasks/ac;->aGc:Z
 
-    iput-boolean v1, p0, Lcom/google/android/gms/tasks/ac;->aMr:Z
+    iput-boolean v1, p0, Lcom/google/android/gms/tasks/ac;->aMn: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;->aMq:Lcom/google/android/gms/tasks/aa;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/ac;->aMm: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;->pG()V
+    invoke-direct {p0}, Lcom/google/android/gms/tasks/ac;->pE()V
 
-    invoke-direct {p0}, Lcom/google/android/gms/tasks/ac;->vq()V
+    invoke-direct {p0}, Lcom/google/android/gms/tasks/ac;->vo()V
 
-    iget-object v1, p0, Lcom/google/android/gms/tasks/ac;->aMt:Ljava/lang/Exception;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/ac;->aMp: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;->aMt:Ljava/lang/Exception;
+    iget-object p1, p0, Lcom/google/android/gms/tasks/ac;->aMp:Ljava/lang/Exception;
 
     if-nez p1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/gms/tasks/ac;->aMs:Ljava/lang/Object;
+    iget-object p1, p0, Lcom/google/android/gms/tasks/ac;->aMo: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;->aMt:Ljava/lang/Exception;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/ac;->aMp: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;->aMt:Ljava/lang/Exception;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/ac;->aMp: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 zg()Z
+.method public final ze()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;->aGg:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/tasks/ac;->aGc:Z
 
     if-eqz v1, :cond_0
 
-    iget-boolean v1, p0, Lcom/google/android/gms/tasks/ac;->aMr:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/tasks/ac;->aMn:Z
 
     if-nez v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/tasks/ac;->aMt:Ljava/lang/Exception;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/ac;->aMp:Ljava/lang/Exception;
 
     if-nez v1, :cond_0
 
@@ -858,7 +858,7 @@
     throw v1
 .end method
 
-.method public final zh()Ljava/lang/Exception;
+.method public final zf()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;->aMt:Ljava/lang/Exception;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/ac;->aMp: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 27279e3ff8..0d9688df01 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 aMu:Lcom/google/android/gms/tasks/ac;
+.field private final synthetic aMq: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;->aMu:Lcom/google/android/gms/tasks/ac;
+    iput-object p1, p0, Lcom/google/android/gms/tasks/ad;->aMq: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;->aMu:Lcom/google/android/gms/tasks/ac;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/ad;->aMq: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;->aMu:Lcom/google/android/gms/tasks/ac;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/ad;->aMq: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 aab4510675..637be2acdd 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 aLU:Lcom/google/android/gms/tasks/ac;
+.field public final aLQ: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;->aLU:Lcom/google/android/gms/tasks/ac;
+    iput-object v0, p0, Lcom/google/android/gms/tasks/h;->aLQ: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;->aLU:Lcom/google/android/gms/tasks/ac;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/h;->aLQ: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;->aLU:Lcom/google/android/gms/tasks/ac;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/h;->aLQ: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;->aLU:Lcom/google/android/gms/tasks/ac;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/h;->aLQ: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 fba6b941c5..d340e77d9b 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 aLV:Ljava/util/concurrent/Executor;
+.field public static final aLR:Ljava/util/concurrent/Executor;
 
-.field static final aLW:Ljava/util/concurrent/Executor;
+.field static final aLS: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;->aLV:Ljava/util/concurrent/Executor;
+    sput-object v0, Lcom/google/android/gms/tasks/i;->aLR: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;->aLW:Ljava/util/concurrent/Executor;
+    sput-object v0, Lcom/google/android/gms/tasks/i;->aLS: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 b5d3699c24..067a018fdb 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 aLX:Ljava/util/concurrent/CountDownLatch;
+.field public final aLT: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;->aLX:Ljava/util/concurrent/CountDownLatch;
+    iput-object v0, p0, Lcom/google/android/gms/tasks/j$a;->aLT: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;->aLX:Ljava/util/concurrent/CountDownLatch;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/j$a;->aLT: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;->aLX:Ljava/util/concurrent/CountDownLatch;
+    iget-object p1, p0, Lcom/google/android/gms/tasks/j$a;->aLT: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;->aLX:Ljava/util/concurrent/CountDownLatch;
+    iget-object p1, p0, Lcom/google/android/gms/tasks/j$a;->aLT: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 c0f0aaee98..3452e2dd84 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;->aLX:Ljava/util/concurrent/CountDownLatch;
+    iget-object v0, v0, Lcom/google/android/gms/tasks/j$a;->aLT: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;->aLW:Ljava/util/concurrent/Executor;
+    sget-object v0, Lcom/google/android/gms/tasks/i;->aLS: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;->aLW:Ljava/util/concurrent/Executor;
+    sget-object v0, Lcom/google/android/gms/tasks/i;->aLS: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;->aLW:Ljava/util/concurrent/Executor;
+    sget-object v0, Lcom/google/android/gms/tasks/i;->aLS: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;->zg()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/tasks/Task;->ze()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;->zh()Ljava/lang/Exception;
+    invoke-virtual {p0}, Lcom/google/android/gms/tasks/Task;->zf()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 603577fab6..503b2fa07a 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 aLY:Ljava/util/concurrent/Executor;
+.field private final aLU:Ljava/util/concurrent/Executor;
 
-.field final aLZ:Lcom/google/android/gms/tasks/a;
+.field final aLV: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 aMa:Lcom/google/android/gms/tasks/ac;
+.field final aLW: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;->aLY:Ljava/util/concurrent/Executor;
+    iput-object p1, p0, Lcom/google/android/gms/tasks/k;->aLU:Ljava/util/concurrent/Executor;
 
-    iput-object p2, p0, Lcom/google/android/gms/tasks/k;->aLZ:Lcom/google/android/gms/tasks/a;
+    iput-object p2, p0, Lcom/google/android/gms/tasks/k;->aLV:Lcom/google/android/gms/tasks/a;
 
-    iput-object p3, p0, Lcom/google/android/gms/tasks/k;->aMa:Lcom/google/android/gms/tasks/ac;
+    iput-object p3, p0, Lcom/google/android/gms/tasks/k;->aLW: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;->aLY:Ljava/util/concurrent/Executor;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/k;->aLU: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 88120213d0..1ae8c64a0b 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 aMb:Lcom/google/android/gms/tasks/Task;
+.field private final synthetic aLX:Lcom/google/android/gms/tasks/Task;
 
-.field private final synthetic aMc:Lcom/google/android/gms/tasks/k;
+.field private final synthetic aLY: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;->aMc:Lcom/google/android/gms/tasks/k;
+    iput-object p1, p0, Lcom/google/android/gms/tasks/l;->aLY:Lcom/google/android/gms/tasks/k;
 
-    iput-object p2, p0, Lcom/google/android/gms/tasks/l;->aMb:Lcom/google/android/gms/tasks/Task;
+    iput-object p2, p0, Lcom/google/android/gms/tasks/l;->aLX: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;->aMb:Lcom/google/android/gms/tasks/Task;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/l;->aLX: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;->aMc:Lcom/google/android/gms/tasks/k;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/l;->aLY:Lcom/google/android/gms/tasks/k;
 
-    iget-object v0, v0, Lcom/google/android/gms/tasks/k;->aMa:Lcom/google/android/gms/tasks/ac;
+    iget-object v0, v0, Lcom/google/android/gms/tasks/k;->aLW:Lcom/google/android/gms/tasks/ac;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/tasks/ac;->pH()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/tasks/ac;->pF()Z
 
     return-void
 
     :cond_0
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/tasks/l;->aMc:Lcom/google/android/gms/tasks/k;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/l;->aLY:Lcom/google/android/gms/tasks/k;
 
-    iget-object v0, v0, Lcom/google/android/gms/tasks/k;->aLZ:Lcom/google/android/gms/tasks/a;
+    iget-object v0, v0, Lcom/google/android/gms/tasks/k;->aLV:Lcom/google/android/gms/tasks/a;
 
-    iget-object v1, p0, Lcom/google/android/gms/tasks/l;->aMb:Lcom/google/android/gms/tasks/Task;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/l;->aLX: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;->aMc:Lcom/google/android/gms/tasks/k;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/l;->aLY:Lcom/google/android/gms/tasks/k;
 
-    iget-object v1, v1, Lcom/google/android/gms/tasks/k;->aMa:Lcom/google/android/gms/tasks/ac;
+    iget-object v1, v1, Lcom/google/android/gms/tasks/k;->aLW: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;->aMc:Lcom/google/android/gms/tasks/k;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/l;->aLY:Lcom/google/android/gms/tasks/k;
 
-    iget-object v1, v1, Lcom/google/android/gms/tasks/k;->aMa:Lcom/google/android/gms/tasks/ac;
+    iget-object v1, v1, Lcom/google/android/gms/tasks/k;->aLW: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;->aMc:Lcom/google/android/gms/tasks/k;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/l;->aLY:Lcom/google/android/gms/tasks/k;
 
-    iget-object v1, v1, Lcom/google/android/gms/tasks/k;->aMa:Lcom/google/android/gms/tasks/ac;
+    iget-object v1, v1, Lcom/google/android/gms/tasks/k;->aLW: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;->aMc:Lcom/google/android/gms/tasks/k;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/l;->aLY:Lcom/google/android/gms/tasks/k;
 
-    iget-object v1, v1, Lcom/google/android/gms/tasks/k;->aMa:Lcom/google/android/gms/tasks/ac;
+    iget-object v1, v1, Lcom/google/android/gms/tasks/k;->aLW: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 b824be3b15..0cd15845df 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 aLY:Ljava/util/concurrent/Executor;
+.field private final aLU:Ljava/util/concurrent/Executor;
 
-.field final aLZ:Lcom/google/android/gms/tasks/a;
+.field final aLV: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 aMa:Lcom/google/android/gms/tasks/ac;
+.field final aLW: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;->aLY:Ljava/util/concurrent/Executor;
+    iput-object p1, p0, Lcom/google/android/gms/tasks/m;->aLU:Ljava/util/concurrent/Executor;
 
-    iput-object p2, p0, Lcom/google/android/gms/tasks/m;->aLZ:Lcom/google/android/gms/tasks/a;
+    iput-object p2, p0, Lcom/google/android/gms/tasks/m;->aLV:Lcom/google/android/gms/tasks/a;
 
-    iput-object p3, p0, Lcom/google/android/gms/tasks/m;->aMa:Lcom/google/android/gms/tasks/ac;
+    iput-object p3, p0, Lcom/google/android/gms/tasks/m;->aLW: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;->aLY:Ljava/util/concurrent/Executor;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/m;->aLU: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;->aMa:Lcom/google/android/gms/tasks/ac;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/m;->aLW:Lcom/google/android/gms/tasks/ac;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/tasks/ac;->pH()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/tasks/ac;->pF()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;->aMa:Lcom/google/android/gms/tasks/ac;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/m;->aLW: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;->aMa:Lcom/google/android/gms/tasks/ac;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/m;->aLW: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 0888374064..9d9083c7e3 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 aMb:Lcom/google/android/gms/tasks/Task;
+.field private final synthetic aLX:Lcom/google/android/gms/tasks/Task;
 
-.field private final synthetic aMd:Lcom/google/android/gms/tasks/m;
+.field private final synthetic aLZ: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;->aMd:Lcom/google/android/gms/tasks/m;
+    iput-object p1, p0, Lcom/google/android/gms/tasks/n;->aLZ:Lcom/google/android/gms/tasks/m;
 
-    iput-object p2, p0, Lcom/google/android/gms/tasks/n;->aMb:Lcom/google/android/gms/tasks/Task;
+    iput-object p2, p0, Lcom/google/android/gms/tasks/n;->aLX: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;->aMd:Lcom/google/android/gms/tasks/m;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/n;->aLZ:Lcom/google/android/gms/tasks/m;
 
-    iget-object v0, v0, Lcom/google/android/gms/tasks/m;->aLZ:Lcom/google/android/gms/tasks/a;
+    iget-object v0, v0, Lcom/google/android/gms/tasks/m;->aLV:Lcom/google/android/gms/tasks/a;
 
-    iget-object v1, p0, Lcom/google/android/gms/tasks/n;->aMb:Lcom/google/android/gms/tasks/Task;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/n;->aLX: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;->aMd:Lcom/google/android/gms/tasks/m;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/n;->aLZ: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;->aLW:Ljava/util/concurrent/Executor;
+    sget-object v1, Lcom/google/android/gms/tasks/i;->aLS:Ljava/util/concurrent/Executor;
 
-    iget-object v2, p0, Lcom/google/android/gms/tasks/n;->aMd:Lcom/google/android/gms/tasks/m;
+    iget-object v2, p0, Lcom/google/android/gms/tasks/n;->aLZ: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;->aLW:Ljava/util/concurrent/Executor;
+    sget-object v1, Lcom/google/android/gms/tasks/i;->aLS:Ljava/util/concurrent/Executor;
 
-    iget-object v2, p0, Lcom/google/android/gms/tasks/n;->aMd:Lcom/google/android/gms/tasks/m;
+    iget-object v2, p0, Lcom/google/android/gms/tasks/n;->aLZ: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;->aLW:Ljava/util/concurrent/Executor;
+    sget-object v1, Lcom/google/android/gms/tasks/i;->aLS:Ljava/util/concurrent/Executor;
 
-    iget-object v2, p0, Lcom/google/android/gms/tasks/n;->aMd:Lcom/google/android/gms/tasks/m;
+    iget-object v2, p0, Lcom/google/android/gms/tasks/n;->aLZ: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;->aMd:Lcom/google/android/gms/tasks/m;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/n;->aLZ:Lcom/google/android/gms/tasks/m;
 
-    iget-object v1, v1, Lcom/google/android/gms/tasks/m;->aMa:Lcom/google/android/gms/tasks/ac;
+    iget-object v1, v1, Lcom/google/android/gms/tasks/m;->aLW: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;->aMd:Lcom/google/android/gms/tasks/m;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/n;->aLZ:Lcom/google/android/gms/tasks/m;
 
-    iget-object v1, v1, Lcom/google/android/gms/tasks/m;->aMa:Lcom/google/android/gms/tasks/ac;
+    iget-object v1, v1, Lcom/google/android/gms/tasks/m;->aLW: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;->aMd:Lcom/google/android/gms/tasks/m;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/n;->aLZ:Lcom/google/android/gms/tasks/m;
 
-    iget-object v1, v1, Lcom/google/android/gms/tasks/m;->aMa:Lcom/google/android/gms/tasks/ac;
+    iget-object v1, v1, Lcom/google/android/gms/tasks/m;->aLW: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 3d9639568b..533ad50868 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 aLY:Ljava/util/concurrent/Executor;
+.field private final aLU:Ljava/util/concurrent/Executor;
 
-.field aMe:Lcom/google/android/gms/tasks/b;
+.field aMa: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;->aLY:Ljava/util/concurrent/Executor;
+    iput-object p1, p0, Lcom/google/android/gms/tasks/o;->aLU:Ljava/util/concurrent/Executor;
 
-    iput-object p2, p0, Lcom/google/android/gms/tasks/o;->aMe:Lcom/google/android/gms/tasks/b;
+    iput-object p2, p0, Lcom/google/android/gms/tasks/o;->aMa: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;->aMe:Lcom/google/android/gms/tasks/b;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/o;->aMa: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;->aLY:Ljava/util/concurrent/Executor;
+    iget-object p1, p0, Lcom/google/android/gms/tasks/o;->aLU: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 4d9b102113..50bb615ace 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 aMf:Lcom/google/android/gms/tasks/o;
+.field private final synthetic aMb: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;->aMf:Lcom/google/android/gms/tasks/o;
+    iput-object p1, p0, Lcom/google/android/gms/tasks/p;->aMb: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;->aMf:Lcom/google/android/gms/tasks/o;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/p;->aMb: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;->aMf:Lcom/google/android/gms/tasks/o;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/p;->aMb:Lcom/google/android/gms/tasks/o;
 
-    iget-object v1, v1, Lcom/google/android/gms/tasks/o;->aMe:Lcom/google/android/gms/tasks/b;
+    iget-object v1, v1, Lcom/google/android/gms/tasks/o;->aMa:Lcom/google/android/gms/tasks/b;
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/tasks/p;->aMf:Lcom/google/android/gms/tasks/o;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/p;->aMb:Lcom/google/android/gms/tasks/o;
 
-    iget-object v1, v1, Lcom/google/android/gms/tasks/o;->aMe:Lcom/google/android/gms/tasks/b;
+    iget-object v1, v1, Lcom/google/android/gms/tasks/o;->aMa: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 6537a527b4..8337742cac 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 aLY:Ljava/util/concurrent/Executor;
+.field private final aLU:Ljava/util/concurrent/Executor;
 
-.field aMg:Lcom/google/android/gms/tasks/c;
+.field aMc: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;->aLY:Ljava/util/concurrent/Executor;
+    iput-object p1, p0, Lcom/google/android/gms/tasks/q;->aLU:Ljava/util/concurrent/Executor;
 
-    iput-object p2, p0, Lcom/google/android/gms/tasks/q;->aMg:Lcom/google/android/gms/tasks/c;
+    iput-object p2, p0, Lcom/google/android/gms/tasks/q;->aMc: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;->aMg:Lcom/google/android/gms/tasks/c;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/q;->aMc: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;->aLY:Ljava/util/concurrent/Executor;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/q;->aLU: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 8439f86827..cbbcabdaba 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 aMb:Lcom/google/android/gms/tasks/Task;
+.field private final synthetic aLX:Lcom/google/android/gms/tasks/Task;
 
-.field private final synthetic aMh:Lcom/google/android/gms/tasks/q;
+.field private final synthetic aMd: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;->aMh:Lcom/google/android/gms/tasks/q;
+    iput-object p1, p0, Lcom/google/android/gms/tasks/s;->aMd:Lcom/google/android/gms/tasks/q;
 
-    iput-object p2, p0, Lcom/google/android/gms/tasks/s;->aMb:Lcom/google/android/gms/tasks/Task;
+    iput-object p2, p0, Lcom/google/android/gms/tasks/s;->aLX: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;->aMh:Lcom/google/android/gms/tasks/q;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/s;->aMd: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;->aMh:Lcom/google/android/gms/tasks/q;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/s;->aMd:Lcom/google/android/gms/tasks/q;
 
-    iget-object v1, v1, Lcom/google/android/gms/tasks/q;->aMg:Lcom/google/android/gms/tasks/c;
+    iget-object v1, v1, Lcom/google/android/gms/tasks/q;->aMc:Lcom/google/android/gms/tasks/c;
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/tasks/s;->aMh:Lcom/google/android/gms/tasks/q;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/s;->aMd:Lcom/google/android/gms/tasks/q;
 
-    iget-object v1, v1, Lcom/google/android/gms/tasks/q;->aMg:Lcom/google/android/gms/tasks/c;
+    iget-object v1, v1, Lcom/google/android/gms/tasks/q;->aMc:Lcom/google/android/gms/tasks/c;
 
-    iget-object v2, p0, Lcom/google/android/gms/tasks/s;->aMb:Lcom/google/android/gms/tasks/Task;
+    iget-object v2, p0, Lcom/google/android/gms/tasks/s;->aLX: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 d2ed1ab37d..78023ac55e 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 aLY:Ljava/util/concurrent/Executor;
+.field private final aLU:Ljava/util/concurrent/Executor;
 
-.field aMi:Lcom/google/android/gms/tasks/d;
+.field aMe: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;->aLY:Ljava/util/concurrent/Executor;
+    iput-object p1, p0, Lcom/google/android/gms/tasks/t;->aLU:Ljava/util/concurrent/Executor;
 
-    iput-object p2, p0, Lcom/google/android/gms/tasks/t;->aMi:Lcom/google/android/gms/tasks/d;
+    iput-object p2, p0, Lcom/google/android/gms/tasks/t;->aMe: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;->zg()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/tasks/Task;->ze()Z
 
     move-result v0
 
@@ -74,7 +74,7 @@
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/tasks/t;->aMi:Lcom/google/android/gms/tasks/d;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/t;->aMe: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;->aLY:Ljava/util/concurrent/Executor;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/t;->aLU: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 86b7ad84e4..06c6232296 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 aMb:Lcom/google/android/gms/tasks/Task;
+.field private final synthetic aLX:Lcom/google/android/gms/tasks/Task;
 
-.field private final synthetic aMj:Lcom/google/android/gms/tasks/t;
+.field private final synthetic aMf: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;->aMj:Lcom/google/android/gms/tasks/t;
+    iput-object p1, p0, Lcom/google/android/gms/tasks/u;->aMf:Lcom/google/android/gms/tasks/t;
 
-    iput-object p2, p0, Lcom/google/android/gms/tasks/u;->aMb:Lcom/google/android/gms/tasks/Task;
+    iput-object p2, p0, Lcom/google/android/gms/tasks/u;->aLX: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;->aMj:Lcom/google/android/gms/tasks/t;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/u;->aMf: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;->aMj:Lcom/google/android/gms/tasks/t;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/u;->aMf:Lcom/google/android/gms/tasks/t;
 
-    iget-object v1, v1, Lcom/google/android/gms/tasks/t;->aMi:Lcom/google/android/gms/tasks/d;
+    iget-object v1, v1, Lcom/google/android/gms/tasks/t;->aMe:Lcom/google/android/gms/tasks/d;
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/tasks/u;->aMj:Lcom/google/android/gms/tasks/t;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/u;->aMf:Lcom/google/android/gms/tasks/t;
 
-    iget-object v1, v1, Lcom/google/android/gms/tasks/t;->aMi:Lcom/google/android/gms/tasks/d;
+    iget-object v1, v1, Lcom/google/android/gms/tasks/t;->aMe:Lcom/google/android/gms/tasks/d;
 
-    iget-object v2, p0, Lcom/google/android/gms/tasks/u;->aMb:Lcom/google/android/gms/tasks/Task;
+    iget-object v2, p0, Lcom/google/android/gms/tasks/u;->aLX:Lcom/google/android/gms/tasks/Task;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/tasks/Task;->zh()Ljava/lang/Exception;
+    invoke-virtual {v2}, Lcom/google/android/gms/tasks/Task;->zf()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 dbbeefcd89..aaf500e432 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 aLY:Ljava/util/concurrent/Executor;
+.field private final aLU:Ljava/util/concurrent/Executor;
 
-.field aMk:Lcom/google/android/gms/tasks/e;
+.field aMg: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;->aLY:Ljava/util/concurrent/Executor;
+    iput-object p1, p0, Lcom/google/android/gms/tasks/v;->aLU:Ljava/util/concurrent/Executor;
 
-    iput-object p2, p0, Lcom/google/android/gms/tasks/v;->aMk:Lcom/google/android/gms/tasks/e;
+    iput-object p2, p0, Lcom/google/android/gms/tasks/v;->aMg: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;->zg()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/tasks/Task;->ze()Z
 
     move-result v0
 
@@ -83,7 +83,7 @@
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/tasks/v;->aMk:Lcom/google/android/gms/tasks/e;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/v;->aMg: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;->aLY:Ljava/util/concurrent/Executor;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/v;->aLU: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 ebaf914c90..616745e913 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 aMb:Lcom/google/android/gms/tasks/Task;
+.field private final synthetic aLX:Lcom/google/android/gms/tasks/Task;
 
-.field private final synthetic aMl:Lcom/google/android/gms/tasks/v;
+.field private final synthetic aMh: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;->aMl:Lcom/google/android/gms/tasks/v;
+    iput-object p1, p0, Lcom/google/android/gms/tasks/w;->aMh:Lcom/google/android/gms/tasks/v;
 
-    iput-object p2, p0, Lcom/google/android/gms/tasks/w;->aMb:Lcom/google/android/gms/tasks/Task;
+    iput-object p2, p0, Lcom/google/android/gms/tasks/w;->aLX: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;->aMl:Lcom/google/android/gms/tasks/v;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/w;->aMh: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;->aMl:Lcom/google/android/gms/tasks/v;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/w;->aMh:Lcom/google/android/gms/tasks/v;
 
-    iget-object v1, v1, Lcom/google/android/gms/tasks/v;->aMk:Lcom/google/android/gms/tasks/e;
+    iget-object v1, v1, Lcom/google/android/gms/tasks/v;->aMg:Lcom/google/android/gms/tasks/e;
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/tasks/w;->aMl:Lcom/google/android/gms/tasks/v;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/w;->aMh:Lcom/google/android/gms/tasks/v;
 
-    iget-object v1, v1, Lcom/google/android/gms/tasks/v;->aMk:Lcom/google/android/gms/tasks/e;
+    iget-object v1, v1, Lcom/google/android/gms/tasks/v;->aMg:Lcom/google/android/gms/tasks/e;
 
-    iget-object v2, p0, Lcom/google/android/gms/tasks/w;->aMb:Lcom/google/android/gms/tasks/Task;
+    iget-object v2, p0, Lcom/google/android/gms/tasks/w;->aLX: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 e9b46cb0a0..8ac301b609 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 aLY:Ljava/util/concurrent/Executor;
+.field private final aLU:Ljava/util/concurrent/Executor;
 
-.field private final aMa:Lcom/google/android/gms/tasks/ac;
+.field private final aLW: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 aMm:Lcom/google/android/gms/tasks/g;
+.field final aMi: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;->aLY:Ljava/util/concurrent/Executor;
+    iput-object p1, p0, Lcom/google/android/gms/tasks/x;->aLU:Ljava/util/concurrent/Executor;
 
-    iput-object p2, p0, Lcom/google/android/gms/tasks/x;->aMm:Lcom/google/android/gms/tasks/g;
+    iput-object p2, p0, Lcom/google/android/gms/tasks/x;->aMi:Lcom/google/android/gms/tasks/g;
 
-    iput-object p3, p0, Lcom/google/android/gms/tasks/x;->aMa:Lcom/google/android/gms/tasks/ac;
+    iput-object p3, p0, Lcom/google/android/gms/tasks/x;->aLW: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;->aLY:Ljava/util/concurrent/Executor;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/x;->aLU: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;->aMa:Lcom/google/android/gms/tasks/ac;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/x;->aLW:Lcom/google/android/gms/tasks/ac;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/tasks/ac;->pH()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/tasks/ac;->pF()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;->aMa:Lcom/google/android/gms/tasks/ac;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/x;->aLW: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;->aMa:Lcom/google/android/gms/tasks/ac;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/x;->aLW: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 a09316f8b7..8c367863b8 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 aMb:Lcom/google/android/gms/tasks/Task;
+.field private final synthetic aLX:Lcom/google/android/gms/tasks/Task;
 
-.field private final synthetic aMn:Lcom/google/android/gms/tasks/x;
+.field private final synthetic aMj: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;->aMn:Lcom/google/android/gms/tasks/x;
+    iput-object p1, p0, Lcom/google/android/gms/tasks/y;->aMj:Lcom/google/android/gms/tasks/x;
 
-    iput-object p2, p0, Lcom/google/android/gms/tasks/y;->aMb:Lcom/google/android/gms/tasks/Task;
+    iput-object p2, p0, Lcom/google/android/gms/tasks/y;->aLX: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;->aMn:Lcom/google/android/gms/tasks/x;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/y;->aMj:Lcom/google/android/gms/tasks/x;
 
-    iget-object v0, v0, Lcom/google/android/gms/tasks/x;->aMm:Lcom/google/android/gms/tasks/g;
+    iget-object v0, v0, Lcom/google/android/gms/tasks/x;->aMi:Lcom/google/android/gms/tasks/g;
 
-    iget-object v1, p0, Lcom/google/android/gms/tasks/y;->aMb:Lcom/google/android/gms/tasks/Task;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/y;->aLX: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;->aMn:Lcom/google/android/gms/tasks/x;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/y;->aMj: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;->aLW:Ljava/util/concurrent/Executor;
+    sget-object v1, Lcom/google/android/gms/tasks/i;->aLS:Ljava/util/concurrent/Executor;
 
-    iget-object v2, p0, Lcom/google/android/gms/tasks/y;->aMn:Lcom/google/android/gms/tasks/x;
+    iget-object v2, p0, Lcom/google/android/gms/tasks/y;->aMj: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;->aLW:Ljava/util/concurrent/Executor;
+    sget-object v1, Lcom/google/android/gms/tasks/i;->aLS:Ljava/util/concurrent/Executor;
 
-    iget-object v2, p0, Lcom/google/android/gms/tasks/y;->aMn:Lcom/google/android/gms/tasks/x;
+    iget-object v2, p0, Lcom/google/android/gms/tasks/y;->aMj: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;->aLW:Ljava/util/concurrent/Executor;
+    sget-object v1, Lcom/google/android/gms/tasks/i;->aLS:Ljava/util/concurrent/Executor;
 
-    iget-object v2, p0, Lcom/google/android/gms/tasks/y;->aMn:Lcom/google/android/gms/tasks/x;
+    iget-object v2, p0, Lcom/google/android/gms/tasks/y;->aMj: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;->aMn:Lcom/google/android/gms/tasks/x;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/y;->aMj: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;->aMn:Lcom/google/android/gms/tasks/x;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/y;->aMj: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;->aMn:Lcom/google/android/gms/tasks/x;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/y;->aMj: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;->aMn:Lcom/google/android/gms/tasks/x;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/y;->aMj: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 bd7925d4f2..51819c5b5b 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,359 +569,359 @@
 
 .field public static final layout_scrollInterpolator:I = 0x7f040253
 
-.field public static final liftOnScroll:I = 0x7f040259
+.field public static final liftOnScroll:I = 0x7f040258
 
-.field public static final lineHeight:I = 0x7f04025a
+.field public static final lineHeight:I = 0x7f040259
 
-.field public static final lineSpacing:I = 0x7f04025b
+.field public static final lineSpacing:I = 0x7f04025a
 
-.field public static final listChoiceBackgroundIndicator:I = 0x7f04025c
+.field public static final listChoiceBackgroundIndicator:I = 0x7f04025b
 
-.field public static final listDividerAlertDialog:I = 0x7f04025d
+.field public static final listDividerAlertDialog:I = 0x7f04025c
 
-.field public static final listItemLayout:I = 0x7f04025e
+.field public static final listItemLayout:I = 0x7f04025d
 
-.field public static final listLayout:I = 0x7f04025f
+.field public static final listLayout:I = 0x7f04025e
 
-.field public static final listMenuViewStyle:I = 0x7f040260
+.field public static final listMenuViewStyle:I = 0x7f04025f
 
-.field public static final listPopupWindowStyle:I = 0x7f040261
+.field public static final listPopupWindowStyle:I = 0x7f040260
 
-.field public static final listPreferredItemHeight:I = 0x7f040262
+.field public static final listPreferredItemHeight:I = 0x7f040261
 
-.field public static final listPreferredItemHeightLarge:I = 0x7f040263
+.field public static final listPreferredItemHeightLarge:I = 0x7f040262
 
-.field public static final listPreferredItemHeightSmall:I = 0x7f040264
+.field public static final listPreferredItemHeightSmall:I = 0x7f040263
 
-.field public static final listPreferredItemPaddingLeft:I = 0x7f040265
+.field public static final listPreferredItemPaddingLeft:I = 0x7f040264
 
-.field public static final listPreferredItemPaddingRight:I = 0x7f040266
+.field public static final listPreferredItemPaddingRight:I = 0x7f040265
 
-.field public static final logo:I = 0x7f040267
+.field public static final logo:I = 0x7f040266
 
-.field public static final logoDescription:I = 0x7f040268
+.field public static final logoDescription:I = 0x7f040267
 
-.field public static final materialButtonStyle:I = 0x7f040278
+.field public static final materialButtonStyle:I = 0x7f040277
 
-.field public static final materialCardViewStyle:I = 0x7f040279
+.field public static final materialCardViewStyle:I = 0x7f040278
 
-.field public static final maxActionInlineWidth:I = 0x7f04027a
+.field public static final maxActionInlineWidth:I = 0x7f040279
 
-.field public static final maxButtonHeight:I = 0x7f04027b
+.field public static final maxButtonHeight:I = 0x7f04027a
 
-.field public static final maxImageSize:I = 0x7f04027c
+.field public static final maxImageSize:I = 0x7f04027b
 
-.field public static final measureWithLargestChild:I = 0x7f04027e
+.field public static final measureWithLargestChild:I = 0x7f04027d
 
-.field public static final menu:I = 0x7f04027f
+.field public static final menu:I = 0x7f04027e
 
-.field public static final multiChoiceItemLayout:I = 0x7f040280
+.field public static final multiChoiceItemLayout:I = 0x7f04027f
 
-.field public static final navigationContentDescription:I = 0x7f040281
+.field public static final navigationContentDescription:I = 0x7f040280
 
-.field public static final navigationIcon:I = 0x7f040282
+.field public static final navigationIcon:I = 0x7f040281
 
-.field public static final navigationMode:I = 0x7f040283
+.field public static final navigationMode:I = 0x7f040282
 
-.field public static final navigationViewStyle:I = 0x7f040284
+.field public static final navigationViewStyle:I = 0x7f040283
 
-.field public static final numericModifiers:I = 0x7f040287
+.field public static final numericModifiers:I = 0x7f040286
 
-.field public static final overlapAnchor:I = 0x7f040288
+.field public static final overlapAnchor:I = 0x7f040287
 
-.field public static final paddingBottomNoButtons:I = 0x7f04028c
+.field public static final paddingBottomNoButtons:I = 0x7f04028b
 
-.field public static final paddingEnd:I = 0x7f04028d
+.field public static final paddingEnd:I = 0x7f04028c
 
-.field public static final paddingStart:I = 0x7f04028e
+.field public static final paddingStart:I = 0x7f04028d
 
-.field public static final paddingTopNoTitle:I = 0x7f04028f
+.field public static final paddingTopNoTitle:I = 0x7f04028e
 
-.field public static final panelBackground:I = 0x7f040290
+.field public static final panelBackground:I = 0x7f04028f
 
-.field public static final panelMenuListTheme:I = 0x7f040291
+.field public static final panelMenuListTheme:I = 0x7f040290
 
-.field public static final panelMenuListWidth:I = 0x7f040292
+.field public static final panelMenuListWidth:I = 0x7f040291
 
-.field public static final passwordToggleContentDescription:I = 0x7f040293
+.field public static final passwordToggleContentDescription:I = 0x7f040292
 
-.field public static final passwordToggleDrawable:I = 0x7f040294
+.field public static final passwordToggleDrawable:I = 0x7f040293
 
-.field public static final passwordToggleEnabled:I = 0x7f040295
+.field public static final passwordToggleEnabled:I = 0x7f040294
 
-.field public static final passwordToggleTint:I = 0x7f040296
+.field public static final passwordToggleTint:I = 0x7f040295
 
-.field public static final passwordToggleTintMode:I = 0x7f040297
+.field public static final passwordToggleTintMode:I = 0x7f040296
 
-.field public static final popupMenuStyle:I = 0x7f04029a
+.field public static final popupMenuStyle:I = 0x7f040299
 
-.field public static final popupTheme:I = 0x7f04029b
+.field public static final popupTheme:I = 0x7f04029a
 
-.field public static final popupWindowStyle:I = 0x7f04029c
+.field public static final popupWindowStyle:I = 0x7f04029b
 
-.field public static final preserveIconSpacing:I = 0x7f04029d
+.field public static final preserveIconSpacing:I = 0x7f04029c
 
-.field public static final pressedTranslationZ:I = 0x7f04029f
+.field public static final pressedTranslationZ:I = 0x7f04029e
 
-.field public static final progressBarPadding:I = 0x7f0402c9
+.field public static final progressBarPadding:I = 0x7f0402c8
 
-.field public static final progressBarStyle:I = 0x7f0402ca
+.field public static final progressBarStyle:I = 0x7f0402c9
 
-.field public static final queryBackground:I = 0x7f0402cd
+.field public static final queryBackground:I = 0x7f0402cc
 
-.field public static final queryHint:I = 0x7f0402ce
+.field public static final queryHint:I = 0x7f0402cd
 
-.field public static final radioButtonStyle:I = 0x7f0402cf
+.field public static final radioButtonStyle:I = 0x7f0402ce
 
-.field public static final ratingBarStyle:I = 0x7f0402d2
+.field public static final ratingBarStyle:I = 0x7f0402d1
 
-.field public static final ratingBarStyleIndicator:I = 0x7f0402d3
+.field public static final ratingBarStyleIndicator:I = 0x7f0402d2
 
-.field public static final ratingBarStyleSmall:I = 0x7f0402d4
+.field public static final ratingBarStyleSmall:I = 0x7f0402d3
 
-.field public static final reverseLayout:I = 0x7f0402d7
+.field public static final reverseLayout:I = 0x7f0402d6
 
-.field public static final rippleColor:I = 0x7f0402d8
+.field public static final rippleColor:I = 0x7f0402d7
 
-.field public static final scrimAnimationDuration:I = 0x7f0402f6
+.field public static final scrimAnimationDuration:I = 0x7f0402f5
 
-.field public static final scrimBackground:I = 0x7f0402f7
+.field public static final scrimBackground:I = 0x7f0402f6
 
-.field public static final scrimVisibleHeightTrigger:I = 0x7f0402f8
+.field public static final scrimVisibleHeightTrigger:I = 0x7f0402f7
 
-.field public static final searchHintIcon:I = 0x7f0402f9
+.field public static final searchHintIcon:I = 0x7f0402f8
 
-.field public static final searchIcon:I = 0x7f0402fa
+.field public static final searchIcon:I = 0x7f0402f9
 
-.field public static final searchViewStyle:I = 0x7f0402fb
+.field public static final searchViewStyle:I = 0x7f0402fa
 
-.field public static final seekBarStyle:I = 0x7f0402fd
+.field public static final seekBarStyle:I = 0x7f0402fc
 
-.field public static final selectableItemBackground:I = 0x7f0402fe
+.field public static final selectableItemBackground:I = 0x7f0402fd
 
-.field public static final selectableItemBackgroundBorderless:I = 0x7f0402ff
+.field public static final selectableItemBackgroundBorderless:I = 0x7f0402fe
 
-.field public static final showAsAction:I = 0x7f040301
+.field public static final showAsAction:I = 0x7f040300
 
-.field public static final showDividers:I = 0x7f040305
+.field public static final showDividers:I = 0x7f040304
 
-.field public static final showMotionSpec:I = 0x7f040306
+.field public static final showMotionSpec:I = 0x7f040305
 
-.field public static final showText:I = 0x7f040307
+.field public static final showText:I = 0x7f040306
 
-.field public static final showTitle:I = 0x7f040308
+.field public static final showTitle:I = 0x7f040307
 
-.field public static final singleChoiceItemLayout:I = 0x7f040309
+.field public static final singleChoiceItemLayout:I = 0x7f040308
 
-.field public static final singleLine:I = 0x7f04030a
+.field public static final singleLine:I = 0x7f040309
 
-.field public static final singleSelection:I = 0x7f04030b
+.field public static final singleSelection:I = 0x7f04030a
 
-.field public static final snackbarButtonStyle:I = 0x7f04030c
+.field public static final snackbarButtonStyle:I = 0x7f04030b
 
-.field public static final snackbarStyle:I = 0x7f04030d
+.field public static final snackbarStyle:I = 0x7f04030c
 
-.field public static final spanCount:I = 0x7f04030e
+.field public static final spanCount:I = 0x7f04030d
 
-.field public static final spinBars:I = 0x7f04030f
+.field public static final spinBars:I = 0x7f04030e
 
-.field public static final spinnerDropDownItemStyle:I = 0x7f040310
+.field public static final spinnerDropDownItemStyle:I = 0x7f04030f
 
-.field public static final spinnerStyle:I = 0x7f040311
+.field public static final spinnerStyle:I = 0x7f040310
 
-.field public static final splitTrack:I = 0x7f040312
+.field public static final splitTrack:I = 0x7f040311
 
-.field public static final srcCompat:I = 0x7f040313
+.field public static final srcCompat:I = 0x7f040312
 
-.field public static final stackFromEnd:I = 0x7f040314
+.field public static final stackFromEnd:I = 0x7f040313
 
-.field public static final state_above_anchor:I = 0x7f040315
+.field public static final state_above_anchor:I = 0x7f040314
 
-.field public static final state_collapsed:I = 0x7f040316
+.field public static final state_collapsed:I = 0x7f040315
 
-.field public static final state_collapsible:I = 0x7f040317
+.field public static final state_collapsible:I = 0x7f040316
 
-.field public static final state_liftable:I = 0x7f040318
+.field public static final state_liftable:I = 0x7f040317
 
-.field public static final state_lifted:I = 0x7f040319
+.field public static final state_lifted:I = 0x7f040318
 
-.field public static final statusBarBackground:I = 0x7f04031a
+.field public static final statusBarBackground:I = 0x7f040319
 
-.field public static final statusBarScrim:I = 0x7f04031b
+.field public static final statusBarScrim:I = 0x7f04031a
 
-.field public static final strokeColor:I = 0x7f04031f
+.field public static final strokeColor:I = 0x7f04031e
 
-.field public static final strokeWidth:I = 0x7f040320
+.field public static final strokeWidth:I = 0x7f04031f
 
-.field public static final subMenuArrow:I = 0x7f040321
+.field public static final subMenuArrow:I = 0x7f040320
 
-.field public static final submitBackground:I = 0x7f040322
+.field public static final submitBackground:I = 0x7f040321
 
-.field public static final subtitle:I = 0x7f040323
+.field public static final subtitle:I = 0x7f040322
 
-.field public static final subtitleTextAppearance:I = 0x7f040324
+.field public static final subtitleTextAppearance:I = 0x7f040323
 
-.field public static final subtitleTextColor:I = 0x7f040325
+.field public static final subtitleTextColor:I = 0x7f040324
 
-.field public static final subtitleTextStyle:I = 0x7f040326
+.field public static final subtitleTextStyle:I = 0x7f040325
 
-.field public static final suggestionRowLayout:I = 0x7f040327
+.field public static final suggestionRowLayout:I = 0x7f040326
 
-.field public static final switchMinWidth:I = 0x7f040328
+.field public static final switchMinWidth:I = 0x7f040327
 
-.field public static final switchPadding:I = 0x7f040329
+.field public static final switchPadding:I = 0x7f040328
 
-.field public static final switchStyle:I = 0x7f04032a
+.field public static final switchStyle:I = 0x7f040329
 
-.field public static final switchTextAppearance:I = 0x7f04032b
+.field public static final switchTextAppearance:I = 0x7f04032a
 
-.field public static final tabBackground:I = 0x7f04032c
+.field public static final tabBackground:I = 0x7f04032b
 
-.field public static final tabContentStart:I = 0x7f04032d
+.field public static final tabContentStart:I = 0x7f04032c
 
-.field public static final tabGravity:I = 0x7f04032e
+.field public static final tabGravity:I = 0x7f04032d
 
-.field public static final tabIconTint:I = 0x7f04032f
+.field public static final tabIconTint:I = 0x7f04032e
 
-.field public static final tabIconTintMode:I = 0x7f040330
+.field public static final tabIconTintMode:I = 0x7f04032f
 
-.field public static final tabIndicator:I = 0x7f040331
+.field public static final tabIndicator:I = 0x7f040330
 
-.field public static final tabIndicatorAnimationDuration:I = 0x7f040332
+.field public static final tabIndicatorAnimationDuration:I = 0x7f040331
 
-.field public static final tabIndicatorColor:I = 0x7f040333
+.field public static final tabIndicatorColor:I = 0x7f040332
 
-.field public static final tabIndicatorFullWidth:I = 0x7f040334
+.field public static final tabIndicatorFullWidth:I = 0x7f040333
 
-.field public static final tabIndicatorGravity:I = 0x7f040335
+.field public static final tabIndicatorGravity:I = 0x7f040334
 
-.field public static final tabIndicatorHeight:I = 0x7f040336
+.field public static final tabIndicatorHeight:I = 0x7f040335
 
-.field public static final tabInlineLabel:I = 0x7f040337
+.field public static final tabInlineLabel:I = 0x7f040336
 
-.field public static final tabMaxWidth:I = 0x7f040338
+.field public static final tabMaxWidth:I = 0x7f040337
 
-.field public static final tabMinWidth:I = 0x7f040339
+.field public static final tabMinWidth:I = 0x7f040338
 
-.field public static final tabMode:I = 0x7f04033a
+.field public static final tabMode:I = 0x7f040339
 
-.field public static final tabPadding:I = 0x7f04033b
+.field public static final tabPadding:I = 0x7f04033a
 
-.field public static final tabPaddingBottom:I = 0x7f04033c
+.field public static final tabPaddingBottom:I = 0x7f04033b
 
-.field public static final tabPaddingEnd:I = 0x7f04033d
+.field public static final tabPaddingEnd:I = 0x7f04033c
 
-.field public static final tabPaddingStart:I = 0x7f04033e
+.field public static final tabPaddingStart:I = 0x7f04033d
 
-.field public static final tabPaddingTop:I = 0x7f04033f
+.field public static final tabPaddingTop:I = 0x7f04033e
 
-.field public static final tabRippleColor:I = 0x7f040340
+.field public static final tabRippleColor:I = 0x7f04033f
 
-.field public static final tabSelectedTextColor:I = 0x7f040341
+.field public static final tabSelectedTextColor:I = 0x7f040340
 
-.field public static final tabStyle:I = 0x7f040342
+.field public static final tabStyle:I = 0x7f040341
 
-.field public static final tabTextAppearance:I = 0x7f040343
+.field public static final tabTextAppearance:I = 0x7f040342
 
-.field public static final tabTextColor:I = 0x7f040344
+.field public static final tabTextColor:I = 0x7f040343
 
-.field public static final tabUnboundedRipple:I = 0x7f040345
+.field public static final tabUnboundedRipple:I = 0x7f040344
 
-.field public static final textAllCaps:I = 0x7f040349
+.field public static final textAllCaps:I = 0x7f040348
 
-.field public static final textAppearanceBody1:I = 0x7f04034a
+.field public static final textAppearanceBody1:I = 0x7f040349
 
-.field public static final textAppearanceBody2:I = 0x7f04034b
+.field public static final textAppearanceBody2:I = 0x7f04034a
 
-.field public static final textAppearanceButton:I = 0x7f04034c
+.field public static final textAppearanceButton:I = 0x7f04034b
 
-.field public static final textAppearanceCaption:I = 0x7f04034d
+.field public static final textAppearanceCaption:I = 0x7f04034c
 
-.field public static final textAppearanceHeadline1:I = 0x7f04034e
+.field public static final textAppearanceHeadline1:I = 0x7f04034d
 
-.field public static final textAppearanceHeadline2:I = 0x7f04034f
+.field public static final textAppearanceHeadline2:I = 0x7f04034e
 
-.field public static final textAppearanceHeadline3:I = 0x7f040350
+.field public static final textAppearanceHeadline3:I = 0x7f04034f
 
-.field public static final textAppearanceHeadline4:I = 0x7f040351
+.field public static final textAppearanceHeadline4:I = 0x7f040350
 
-.field public static final textAppearanceHeadline5:I = 0x7f040352
+.field public static final textAppearanceHeadline5:I = 0x7f040351
 
-.field public static final textAppearanceHeadline6:I = 0x7f040353
+.field public static final textAppearanceHeadline6:I = 0x7f040352
 
-.field public static final textAppearanceLargePopupMenu:I = 0x7f040354
+.field public static final textAppearanceLargePopupMenu:I = 0x7f040353
 
-.field public static final textAppearanceListItem:I = 0x7f040355
+.field public static final textAppearanceListItem:I = 0x7f040354
 
-.field public static final textAppearanceListItemSecondary:I = 0x7f040356
+.field public static final textAppearanceListItemSecondary:I = 0x7f040355
 
-.field public static final textAppearanceListItemSmall:I = 0x7f040357
+.field public static final textAppearanceListItemSmall:I = 0x7f040356
 
-.field public static final textAppearanceOverline:I = 0x7f040358
+.field public static final textAppearanceOverline:I = 0x7f040357
 
-.field public static final textAppearancePopupMenuHeader:I = 0x7f040359
+.field public static final textAppearancePopupMenuHeader:I = 0x7f040358
 
-.field public static final textAppearanceSearchResultSubtitle:I = 0x7f04035a
+.field public static final textAppearanceSearchResultSubtitle:I = 0x7f040359
 
-.field public static final textAppearanceSearchResultTitle:I = 0x7f04035b
+.field public static final textAppearanceSearchResultTitle:I = 0x7f04035a
 
-.field public static final textAppearanceSmallPopupMenu:I = 0x7f04035c
+.field public static final textAppearanceSmallPopupMenu:I = 0x7f04035b
 
-.field public static final textAppearanceSubtitle1:I = 0x7f04035d
+.field public static final textAppearanceSubtitle1:I = 0x7f04035c
 
-.field public static final textAppearanceSubtitle2:I = 0x7f04035e
+.field public static final textAppearanceSubtitle2:I = 0x7f04035d
 
-.field public static final textColorAlertDialogListItem:I = 0x7f04035f
+.field public static final textColorAlertDialogListItem:I = 0x7f04035e
 
-.field public static final textColorSearchUrl:I = 0x7f040360
+.field public static final textColorSearchUrl:I = 0x7f04035f
 
-.field public static final textEndPadding:I = 0x7f040361
+.field public static final textEndPadding:I = 0x7f040360
 
-.field public static final textInputStyle:I = 0x7f040362
+.field public static final textInputStyle:I = 0x7f040361
 
-.field public static final textStartPadding:I = 0x7f040363
+.field public static final textStartPadding:I = 0x7f040362
 
-.field public static final theme:I = 0x7f040365
+.field public static final theme:I = 0x7f040364
 
-.field public static final thickness:I = 0x7f0403b6
+.field public static final thickness:I = 0x7f0403b5
 
-.field public static final thumbTextPadding:I = 0x7f0403b7
+.field public static final thumbTextPadding:I = 0x7f0403b6
 
-.field public static final thumbTint:I = 0x7f0403b8
+.field public static final thumbTint:I = 0x7f0403b7
 
-.field public static final thumbTintMode:I = 0x7f0403b9
+.field public static final thumbTintMode:I = 0x7f0403b8
 
-.field public static final tickMark:I = 0x7f0403ba
+.field public static final tickMark:I = 0x7f0403b9
 
-.field public static final tickMarkTint:I = 0x7f0403bb
+.field public static final tickMarkTint:I = 0x7f0403ba
 
-.field public static final tickMarkTintMode:I = 0x7f0403bc
+.field public static final tickMarkTintMode:I = 0x7f0403bb
 
-.field public static final tint:I = 0x7f0403bd
+.field public static final tint:I = 0x7f0403bc
 
-.field public static final tintMode:I = 0x7f0403be
+.field public static final tintMode:I = 0x7f0403bd
 
-.field public static final title:I = 0x7f0403bf
+.field public static final title:I = 0x7f0403be
 
-.field public static final titleEnabled:I = 0x7f0403c0
+.field public static final titleEnabled:I = 0x7f0403bf
 
-.field public static final titleMargin:I = 0x7f0403c1
+.field public static final titleMargin:I = 0x7f0403c0
 
-.field public static final titleMarginBottom:I = 0x7f0403c2
+.field public static final titleMarginBottom:I = 0x7f0403c1
 
-.field public static final titleMarginEnd:I = 0x7f0403c3
+.field public static final titleMarginEnd:I = 0x7f0403c2
 
-.field public static final titleMarginStart:I = 0x7f0403c4
+.field public static final titleMarginStart:I = 0x7f0403c3
 
-.field public static final titleMarginTop:I = 0x7f0403c5
+.field public static final titleMarginTop:I = 0x7f0403c4
 
-.field public static final titleMargins:I = 0x7f0403c6
+.field public static final titleMargins:I = 0x7f0403c5
 
-.field public static final titleTextAppearance:I = 0x7f0403c7
+.field public static final titleTextAppearance:I = 0x7f0403c6
 
-.field public static final titleTextColor:I = 0x7f0403c8
+.field public static final titleTextColor:I = 0x7f0403c7
 
-.field public static final titleTextStyle:I = 0x7f0403c9
+.field public static final titleTextStyle:I = 0x7f0403c8
 
 .field public static final toolbarId:I = 0x7f0403ca
 
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 605f37b77e..27c6ff54f5 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 = 0x7f060035
+.field public static final bright_foreground_disabled_material_dark:I = 0x7f060034
 
-.field public static final bright_foreground_disabled_material_light:I = 0x7f060036
+.field public static final bright_foreground_disabled_material_light:I = 0x7f060035
 
-.field public static final bright_foreground_inverse_material_dark:I = 0x7f060037
+.field public static final bright_foreground_inverse_material_dark:I = 0x7f060036
 
-.field public static final bright_foreground_inverse_material_light:I = 0x7f060038
+.field public static final bright_foreground_inverse_material_light:I = 0x7f060037
 
-.field public static final bright_foreground_material_dark:I = 0x7f060039
+.field public static final bright_foreground_material_dark:I = 0x7f060038
 
-.field public static final bright_foreground_material_light:I = 0x7f06003a
+.field public static final bright_foreground_material_light:I = 0x7f060039
 
-.field public static final button_material_dark:I = 0x7f060040
+.field public static final button_material_dark:I = 0x7f06003f
 
-.field public static final button_material_light:I = 0x7f060041
+.field public static final button_material_light:I = 0x7f060040
 
-.field public static final cardview_dark_background:I = 0x7f060042
+.field public static final cardview_dark_background:I = 0x7f060041
 
-.field public static final cardview_light_background:I = 0x7f060043
+.field public static final cardview_light_background:I = 0x7f060042
 
-.field public static final cardview_shadow_end_color:I = 0x7f060044
+.field public static final cardview_shadow_end_color:I = 0x7f060043
 
-.field public static final cardview_shadow_start_color:I = 0x7f060045
+.field public static final cardview_shadow_start_color:I = 0x7f060044
 
-.field public static final design_bottom_navigation_shadow_color:I = 0x7f06005c
+.field public static final design_bottom_navigation_shadow_color:I = 0x7f06005b
 
-.field public static final design_default_color_primary:I = 0x7f06005d
+.field public static final design_default_color_primary:I = 0x7f06005c
 
-.field public static final design_default_color_primary_dark:I = 0x7f06005e
+.field public static final design_default_color_primary_dark:I = 0x7f06005d
 
-.field public static final design_error:I = 0x7f06005f
+.field public static final design_error:I = 0x7f06005e
 
-.field public static final design_fab_shadow_end_color:I = 0x7f060060
+.field public static final design_fab_shadow_end_color:I = 0x7f06005f
 
-.field public static final design_fab_shadow_mid_color:I = 0x7f060061
+.field public static final design_fab_shadow_mid_color:I = 0x7f060060
 
-.field public static final design_fab_shadow_start_color:I = 0x7f060062
+.field public static final design_fab_shadow_start_color:I = 0x7f060061
 
-.field public static final design_fab_stroke_end_inner_color:I = 0x7f060063
+.field public static final design_fab_stroke_end_inner_color:I = 0x7f060062
 
-.field public static final design_fab_stroke_end_outer_color:I = 0x7f060064
+.field public static final design_fab_stroke_end_outer_color:I = 0x7f060063
 
-.field public static final design_fab_stroke_top_inner_color:I = 0x7f060065
+.field public static final design_fab_stroke_top_inner_color:I = 0x7f060064
 
-.field public static final design_fab_stroke_top_outer_color:I = 0x7f060066
+.field public static final design_fab_stroke_top_outer_color:I = 0x7f060065
 
-.field public static final design_snackbar_background_color:I = 0x7f060067
+.field public static final design_snackbar_background_color:I = 0x7f060066
 
-.field public static final design_tint_password_toggle:I = 0x7f060068
+.field public static final design_tint_password_toggle:I = 0x7f060067
 
-.field public static final dim_foreground_disabled_material_dark:I = 0x7f060069
+.field public static final dim_foreground_disabled_material_dark:I = 0x7f060068
 
-.field public static final dim_foreground_disabled_material_light:I = 0x7f06006a
+.field public static final dim_foreground_disabled_material_light:I = 0x7f060069
 
-.field public static final dim_foreground_material_dark:I = 0x7f06006b
+.field public static final dim_foreground_material_dark:I = 0x7f06006a
 
-.field public static final dim_foreground_material_light:I = 0x7f06006c
+.field public static final dim_foreground_material_light:I = 0x7f06006b
 
-.field public static final error_color_material_dark:I = 0x7f06006d
+.field public static final error_color_material_dark:I = 0x7f06006c
 
-.field public static final error_color_material_light:I = 0x7f06006e
+.field public static final error_color_material_light:I = 0x7f06006d
 
-.field public static final foreground_material_dark:I = 0x7f060073
+.field public static final foreground_material_dark:I = 0x7f060072
 
-.field public static final foreground_material_light:I = 0x7f060074
+.field public static final foreground_material_light:I = 0x7f060073
 
-.field public static final highlighted_text_material_dark:I = 0x7f060083
+.field public static final highlighted_text_material_dark:I = 0x7f060082
 
-.field public static final highlighted_text_material_light:I = 0x7f060084
+.field public static final highlighted_text_material_light:I = 0x7f060083
 
-.field public static final material_blue_grey_800:I = 0x7f060092
+.field public static final material_blue_grey_800:I = 0x7f060091
 
-.field public static final material_blue_grey_900:I = 0x7f060093
+.field public static final material_blue_grey_900:I = 0x7f060092
 
-.field public static final material_blue_grey_950:I = 0x7f060094
+.field public static final material_blue_grey_950:I = 0x7f060093
 
-.field public static final material_deep_teal_200:I = 0x7f060095
+.field public static final material_deep_teal_200:I = 0x7f060094
 
-.field public static final material_deep_teal_500:I = 0x7f060096
+.field public static final material_deep_teal_500:I = 0x7f060095
 
-.field public static final material_grey_100:I = 0x7f060097
+.field public static final material_grey_100:I = 0x7f060096
 
-.field public static final material_grey_300:I = 0x7f060098
+.field public static final material_grey_300:I = 0x7f060097
 
-.field public static final material_grey_50:I = 0x7f060099
+.field public static final material_grey_50:I = 0x7f060098
 
-.field public static final material_grey_600:I = 0x7f06009a
+.field public static final material_grey_600:I = 0x7f060099
 
-.field public static final material_grey_800:I = 0x7f06009b
+.field public static final material_grey_800:I = 0x7f06009a
 
-.field public static final material_grey_850:I = 0x7f06009c
+.field public static final material_grey_850:I = 0x7f06009b
 
-.field public static final material_grey_900:I = 0x7f06009d
+.field public static final material_grey_900:I = 0x7f06009c
 
-.field public static final mtrl_bottom_nav_colored_item_tint:I = 0x7f06009e
+.field public static final mtrl_bottom_nav_colored_item_tint:I = 0x7f06009d
 
-.field public static final mtrl_bottom_nav_item_tint:I = 0x7f06009f
+.field public static final mtrl_bottom_nav_item_tint:I = 0x7f06009e
 
-.field public static final mtrl_btn_bg_color_disabled:I = 0x7f0600a0
+.field public static final mtrl_btn_bg_color_disabled:I = 0x7f06009f
 
-.field public static final mtrl_btn_bg_color_selector:I = 0x7f0600a1
+.field public static final mtrl_btn_bg_color_selector:I = 0x7f0600a0
 
-.field public static final mtrl_btn_ripple_color:I = 0x7f0600a2
+.field public static final mtrl_btn_ripple_color:I = 0x7f0600a1
 
-.field public static final mtrl_btn_stroke_color_selector:I = 0x7f0600a3
+.field public static final mtrl_btn_stroke_color_selector:I = 0x7f0600a2
 
-.field public static final mtrl_btn_text_btn_ripple_color:I = 0x7f0600a4
+.field public static final mtrl_btn_text_btn_ripple_color:I = 0x7f0600a3
 
-.field public static final mtrl_btn_text_color_disabled:I = 0x7f0600a5
+.field public static final mtrl_btn_text_color_disabled:I = 0x7f0600a4
 
-.field public static final mtrl_btn_text_color_selector:I = 0x7f0600a6
+.field public static final mtrl_btn_text_color_selector:I = 0x7f0600a5
 
-.field public static final mtrl_btn_transparent_bg_color:I = 0x7f0600a7
+.field public static final mtrl_btn_transparent_bg_color:I = 0x7f0600a6
 
-.field public static final mtrl_chip_background_color:I = 0x7f0600a8
+.field public static final mtrl_chip_background_color:I = 0x7f0600a7
 
-.field public static final mtrl_chip_close_icon_tint:I = 0x7f0600a9
+.field public static final mtrl_chip_close_icon_tint:I = 0x7f0600a8
 
-.field public static final mtrl_chip_ripple_color:I = 0x7f0600aa
+.field public static final mtrl_chip_ripple_color:I = 0x7f0600a9
 
-.field public static final mtrl_chip_text_color:I = 0x7f0600ab
+.field public static final mtrl_chip_text_color:I = 0x7f0600aa
 
-.field public static final mtrl_fab_ripple_color:I = 0x7f0600ac
+.field public static final mtrl_fab_ripple_color:I = 0x7f0600ab
 
-.field public static final mtrl_scrim_color:I = 0x7f0600ad
+.field public static final mtrl_scrim_color:I = 0x7f0600ac
 
-.field public static final mtrl_tabs_colored_ripple_color:I = 0x7f0600ae
+.field public static final mtrl_tabs_colored_ripple_color:I = 0x7f0600ad
 
-.field public static final mtrl_tabs_icon_color_selector:I = 0x7f0600af
+.field public static final mtrl_tabs_icon_color_selector:I = 0x7f0600ae
 
-.field public static final mtrl_tabs_icon_color_selector_colored:I = 0x7f0600b0
+.field public static final mtrl_tabs_icon_color_selector_colored:I = 0x7f0600af
 
-.field public static final mtrl_tabs_legacy_text_color_selector:I = 0x7f0600b1
+.field public static final mtrl_tabs_legacy_text_color_selector:I = 0x7f0600b0
 
-.field public static final mtrl_tabs_ripple_color:I = 0x7f0600b2
+.field public static final mtrl_tabs_ripple_color:I = 0x7f0600b1
 
-.field public static final mtrl_text_btn_text_color_selector:I = 0x7f0600b3
+.field public static final mtrl_text_btn_text_color_selector:I = 0x7f0600b2
 
-.field public static final mtrl_textinput_default_box_stroke_color:I = 0x7f0600b4
+.field public static final mtrl_textinput_default_box_stroke_color:I = 0x7f0600b3
 
-.field public static final mtrl_textinput_disabled_color:I = 0x7f0600b5
+.field public static final mtrl_textinput_disabled_color:I = 0x7f0600b4
 
-.field public static final mtrl_textinput_filled_box_default_background_color:I = 0x7f0600b6
+.field public static final mtrl_textinput_filled_box_default_background_color:I = 0x7f0600b5
 
-.field public static final mtrl_textinput_hovered_box_stroke_color:I = 0x7f0600b7
+.field public static final mtrl_textinput_hovered_box_stroke_color:I = 0x7f0600b6
 
-.field public static final notification_action_color_filter:I = 0x7f0600b8
+.field public static final notification_action_color_filter:I = 0x7f0600b7
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b9
+.field public static final notification_icon_bg_color:I = 0x7f0600b8
 
-.field public static final primary_dark_material_dark:I = 0x7f0600db
+.field public static final primary_dark_material_dark:I = 0x7f0600da
 
-.field public static final primary_dark_material_light:I = 0x7f0600dc
+.field public static final primary_dark_material_light:I = 0x7f0600db
 
-.field public static final primary_material_dark:I = 0x7f0600ec
+.field public static final primary_material_dark:I = 0x7f0600eb
 
-.field public static final primary_material_light:I = 0x7f0600ed
+.field public static final primary_material_light:I = 0x7f0600ec
 
-.field public static final primary_text_default_material_dark:I = 0x7f0600ee
+.field public static final primary_text_default_material_dark:I = 0x7f0600ed
 
-.field public static final primary_text_default_material_light:I = 0x7f0600ef
+.field public static final primary_text_default_material_light:I = 0x7f0600ee
 
-.field public static final primary_text_disabled_material_dark:I = 0x7f0600f0
+.field public static final primary_text_disabled_material_dark:I = 0x7f0600ef
 
-.field public static final primary_text_disabled_material_light:I = 0x7f0600f1
+.field public static final primary_text_disabled_material_light:I = 0x7f0600f0
 
-.field public static final ripple_material_dark:I = 0x7f0600fa
+.field public static final ripple_material_dark:I = 0x7f0600f9
 
-.field public static final ripple_material_light:I = 0x7f0600fb
+.field public static final ripple_material_light:I = 0x7f0600fa
 
-.field public static final secondary_text_default_material_dark:I = 0x7f0600fc
+.field public static final secondary_text_default_material_dark:I = 0x7f0600fb
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fd
+.field public static final secondary_text_default_material_light:I = 0x7f0600fc
 
-.field public static final secondary_text_disabled_material_dark:I = 0x7f0600fe
+.field public static final secondary_text_disabled_material_dark:I = 0x7f0600fd
 
-.field public static final secondary_text_disabled_material_light:I = 0x7f0600ff
+.field public static final secondary_text_disabled_material_light:I = 0x7f0600fe
 
-.field public static final switch_thumb_disabled_material_dark:I = 0x7f06012e
+.field public static final switch_thumb_disabled_material_dark:I = 0x7f06012d
 
-.field public static final switch_thumb_disabled_material_light:I = 0x7f06012f
+.field public static final switch_thumb_disabled_material_light:I = 0x7f06012e
 
-.field public static final switch_thumb_material_dark:I = 0x7f060130
+.field public static final switch_thumb_material_dark:I = 0x7f06012f
 
-.field public static final switch_thumb_material_light:I = 0x7f060131
+.field public static final switch_thumb_material_light:I = 0x7f060130
 
-.field public static final switch_thumb_normal_material_dark:I = 0x7f060132
+.field public static final switch_thumb_normal_material_dark:I = 0x7f060131
 
-.field public static final switch_thumb_normal_material_light:I = 0x7f060133
+.field public static final switch_thumb_normal_material_light:I = 0x7f060132
 
-.field public static final tooltip_background_dark:I = 0x7f060135
+.field public static final tooltip_background_dark:I = 0x7f060134
 
-.field public static final tooltip_background_light:I = 0x7f060136
+.field public static final tooltip_background_light:I = 0x7f060135
 
 
 # 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 a9a22b08eb..f5b1068e51 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 = 0x7f080017
+.field public static final abc_ab_share_pack_mtrl_alpha:I = 0x7f080016
 
-.field public static final abc_action_bar_item_background_material:I = 0x7f080018
+.field public static final abc_action_bar_item_background_material:I = 0x7f080017
 
-.field public static final abc_btn_borderless_material:I = 0x7f080019
+.field public static final abc_btn_borderless_material:I = 0x7f080018
 
-.field public static final abc_btn_check_material:I = 0x7f08001a
+.field public static final abc_btn_check_material:I = 0x7f080019
 
-.field public static final abc_btn_check_to_on_mtrl_000:I = 0x7f08001b
+.field public static final abc_btn_check_to_on_mtrl_000:I = 0x7f08001a
 
-.field public static final abc_btn_check_to_on_mtrl_015:I = 0x7f08001c
+.field public static final abc_btn_check_to_on_mtrl_015:I = 0x7f08001b
 
-.field public static final abc_btn_colored_material:I = 0x7f08001d
+.field public static final abc_btn_colored_material:I = 0x7f08001c
 
-.field public static final abc_btn_default_mtrl_shape:I = 0x7f08001e
+.field public static final abc_btn_default_mtrl_shape:I = 0x7f08001d
 
-.field public static final abc_btn_radio_material:I = 0x7f08001f
+.field public static final abc_btn_radio_material:I = 0x7f08001e
 
-.field public static final abc_btn_radio_to_on_mtrl_000:I = 0x7f080020
+.field public static final abc_btn_radio_to_on_mtrl_000:I = 0x7f08001f
 
-.field public static final abc_btn_radio_to_on_mtrl_015:I = 0x7f080021
+.field public static final abc_btn_radio_to_on_mtrl_015:I = 0x7f080020
 
-.field public static final abc_btn_switch_to_on_mtrl_00001:I = 0x7f080022
+.field public static final abc_btn_switch_to_on_mtrl_00001:I = 0x7f080021
 
-.field public static final abc_btn_switch_to_on_mtrl_00012:I = 0x7f080023
+.field public static final abc_btn_switch_to_on_mtrl_00012:I = 0x7f080022
 
-.field public static final abc_cab_background_internal_bg:I = 0x7f080024
+.field public static final abc_cab_background_internal_bg:I = 0x7f080023
 
-.field public static final abc_cab_background_top_material:I = 0x7f080025
+.field public static final abc_cab_background_top_material:I = 0x7f080024
 
-.field public static final abc_cab_background_top_mtrl_alpha:I = 0x7f080026
+.field public static final abc_cab_background_top_mtrl_alpha:I = 0x7f080025
 
-.field public static final abc_control_background_material:I = 0x7f080027
+.field public static final abc_control_background_material:I = 0x7f080026
 
-.field public static final abc_dialog_material_background:I = 0x7f080028
+.field public static final abc_dialog_material_background:I = 0x7f080027
 
-.field public static final abc_edit_text_material:I = 0x7f080029
+.field public static final abc_edit_text_material:I = 0x7f080028
 
-.field public static final abc_ic_ab_back_material:I = 0x7f08002a
+.field public static final abc_ic_ab_back_material:I = 0x7f080029
 
-.field public static final abc_ic_arrow_drop_right_black_24dp:I = 0x7f08002b
+.field public static final abc_ic_arrow_drop_right_black_24dp:I = 0x7f08002a
 
-.field public static final abc_ic_clear_material:I = 0x7f08002c
+.field public static final abc_ic_clear_material:I = 0x7f08002b
 
-.field public static final abc_ic_commit_search_api_mtrl_alpha:I = 0x7f08002d
+.field public static final abc_ic_commit_search_api_mtrl_alpha:I = 0x7f08002c
 
-.field public static final abc_ic_go_search_api_material:I = 0x7f08002e
+.field public static final abc_ic_go_search_api_material:I = 0x7f08002d
 
-.field public static final abc_ic_menu_copy_mtrl_am_alpha:I = 0x7f08002f
+.field public static final abc_ic_menu_copy_mtrl_am_alpha:I = 0x7f08002e
 
-.field public static final abc_ic_menu_cut_mtrl_alpha:I = 0x7f080030
+.field public static final abc_ic_menu_cut_mtrl_alpha:I = 0x7f08002f
 
-.field public static final abc_ic_menu_overflow_material:I = 0x7f080031
+.field public static final abc_ic_menu_overflow_material:I = 0x7f080030
 
-.field public static final abc_ic_menu_paste_mtrl_am_alpha:I = 0x7f080032
+.field public static final abc_ic_menu_paste_mtrl_am_alpha:I = 0x7f080031
 
-.field public static final abc_ic_menu_selectall_mtrl_alpha:I = 0x7f080033
+.field public static final abc_ic_menu_selectall_mtrl_alpha:I = 0x7f080032
 
-.field public static final abc_ic_menu_share_mtrl_alpha:I = 0x7f080034
+.field public static final abc_ic_menu_share_mtrl_alpha:I = 0x7f080033
 
-.field public static final abc_ic_search_api_material:I = 0x7f080035
+.field public static final abc_ic_search_api_material:I = 0x7f080034
 
-.field public static final abc_ic_star_black_16dp:I = 0x7f080036
+.field public static final abc_ic_star_black_16dp:I = 0x7f080035
 
-.field public static final abc_ic_star_black_36dp:I = 0x7f080037
+.field public static final abc_ic_star_black_36dp:I = 0x7f080036
 
-.field public static final abc_ic_star_black_48dp:I = 0x7f080038
+.field public static final abc_ic_star_black_48dp:I = 0x7f080037
 
-.field public static final abc_ic_star_half_black_16dp:I = 0x7f080039
+.field public static final abc_ic_star_half_black_16dp:I = 0x7f080038
 
-.field public static final abc_ic_star_half_black_36dp:I = 0x7f08003a
+.field public static final abc_ic_star_half_black_36dp:I = 0x7f080039
 
-.field public static final abc_ic_star_half_black_48dp:I = 0x7f08003b
+.field public static final abc_ic_star_half_black_48dp:I = 0x7f08003a
 
-.field public static final abc_ic_voice_search_api_material:I = 0x7f08003c
+.field public static final abc_ic_voice_search_api_material:I = 0x7f08003b
 
-.field public static final abc_item_background_holo_dark:I = 0x7f08003d
+.field public static final abc_item_background_holo_dark:I = 0x7f08003c
 
-.field public static final abc_item_background_holo_light:I = 0x7f08003e
+.field public static final abc_item_background_holo_light:I = 0x7f08003d
 
-.field public static final abc_list_divider_material:I = 0x7f08003f
+.field public static final abc_list_divider_material:I = 0x7f08003e
 
-.field public static final abc_list_divider_mtrl_alpha:I = 0x7f080040
+.field public static final abc_list_divider_mtrl_alpha:I = 0x7f08003f
 
-.field public static final abc_list_focused_holo:I = 0x7f080041
+.field public static final abc_list_focused_holo:I = 0x7f080040
 
-.field public static final abc_list_longpressed_holo:I = 0x7f080042
+.field public static final abc_list_longpressed_holo:I = 0x7f080041
 
-.field public static final abc_list_pressed_holo_dark:I = 0x7f080043
+.field public static final abc_list_pressed_holo_dark:I = 0x7f080042
 
-.field public static final abc_list_pressed_holo_light:I = 0x7f080044
+.field public static final abc_list_pressed_holo_light:I = 0x7f080043
 
-.field public static final abc_list_selector_background_transition_holo_dark:I = 0x7f080045
+.field public static final abc_list_selector_background_transition_holo_dark:I = 0x7f080044
 
-.field public static final abc_list_selector_background_transition_holo_light:I = 0x7f080046
+.field public static final abc_list_selector_background_transition_holo_light:I = 0x7f080045
 
-.field public static final abc_list_selector_disabled_holo_dark:I = 0x7f080047
+.field public static final abc_list_selector_disabled_holo_dark:I = 0x7f080046
 
-.field public static final abc_list_selector_disabled_holo_light:I = 0x7f080048
+.field public static final abc_list_selector_disabled_holo_light:I = 0x7f080047
 
-.field public static final abc_list_selector_holo_dark:I = 0x7f080049
+.field public static final abc_list_selector_holo_dark:I = 0x7f080048
 
-.field public static final abc_list_selector_holo_light:I = 0x7f08004a
+.field public static final abc_list_selector_holo_light:I = 0x7f080049
 
-.field public static final abc_menu_hardkey_panel_mtrl_mult:I = 0x7f08004b
+.field public static final abc_menu_hardkey_panel_mtrl_mult:I = 0x7f08004a
 
-.field public static final abc_popup_background_mtrl_mult:I = 0x7f08004c
+.field public static final abc_popup_background_mtrl_mult:I = 0x7f08004b
 
-.field public static final abc_ratingbar_indicator_material:I = 0x7f08004d
+.field public static final abc_ratingbar_indicator_material:I = 0x7f08004c
 
-.field public static final abc_ratingbar_material:I = 0x7f08004e
+.field public static final abc_ratingbar_material:I = 0x7f08004d
 
-.field public static final abc_ratingbar_small_material:I = 0x7f08004f
+.field public static final abc_ratingbar_small_material:I = 0x7f08004e
 
-.field public static final abc_scrubber_control_off_mtrl_alpha:I = 0x7f080050
+.field public static final abc_scrubber_control_off_mtrl_alpha:I = 0x7f08004f
 
-.field public static final abc_scrubber_control_to_pressed_mtrl_000:I = 0x7f080051
+.field public static final abc_scrubber_control_to_pressed_mtrl_000:I = 0x7f080050
 
-.field public static final abc_scrubber_control_to_pressed_mtrl_005:I = 0x7f080052
+.field public static final abc_scrubber_control_to_pressed_mtrl_005:I = 0x7f080051
 
-.field public static final abc_scrubber_primary_mtrl_alpha:I = 0x7f080053
+.field public static final abc_scrubber_primary_mtrl_alpha:I = 0x7f080052
 
-.field public static final abc_scrubber_track_mtrl_alpha:I = 0x7f080054
+.field public static final abc_scrubber_track_mtrl_alpha:I = 0x7f080053
 
-.field public static final abc_seekbar_thumb_material:I = 0x7f080055
+.field public static final abc_seekbar_thumb_material:I = 0x7f080054
 
-.field public static final abc_seekbar_tick_mark_material:I = 0x7f080056
+.field public static final abc_seekbar_tick_mark_material:I = 0x7f080055
 
-.field public static final abc_seekbar_track_material:I = 0x7f080057
+.field public static final abc_seekbar_track_material:I = 0x7f080056
 
-.field public static final abc_spinner_mtrl_am_alpha:I = 0x7f080058
+.field public static final abc_spinner_mtrl_am_alpha:I = 0x7f080057
 
-.field public static final abc_spinner_textfield_background_material:I = 0x7f080059
+.field public static final abc_spinner_textfield_background_material:I = 0x7f080058
 
-.field public static final abc_switch_thumb_material:I = 0x7f08005a
+.field public static final abc_switch_thumb_material:I = 0x7f080059
 
-.field public static final abc_switch_track_mtrl_alpha:I = 0x7f08005b
+.field public static final abc_switch_track_mtrl_alpha:I = 0x7f08005a
 
-.field public static final abc_tab_indicator_material:I = 0x7f08005c
+.field public static final abc_tab_indicator_material:I = 0x7f08005b
 
-.field public static final abc_tab_indicator_mtrl_alpha:I = 0x7f08005d
+.field public static final abc_tab_indicator_mtrl_alpha:I = 0x7f08005c
 
-.field public static final abc_text_cursor_material:I = 0x7f08005e
+.field public static final abc_text_cursor_material:I = 0x7f08005d
 
-.field public static final abc_text_select_handle_left_mtrl_dark:I = 0x7f08005f
+.field public static final abc_text_select_handle_left_mtrl_dark:I = 0x7f08005e
 
-.field public static final abc_text_select_handle_left_mtrl_light:I = 0x7f080060
+.field public static final abc_text_select_handle_left_mtrl_light:I = 0x7f08005f
 
-.field public static final abc_text_select_handle_middle_mtrl_dark:I = 0x7f080061
+.field public static final abc_text_select_handle_middle_mtrl_dark:I = 0x7f080060
 
-.field public static final abc_text_select_handle_middle_mtrl_light:I = 0x7f080062
+.field public static final abc_text_select_handle_middle_mtrl_light:I = 0x7f080061
 
-.field public static final abc_text_select_handle_right_mtrl_dark:I = 0x7f080063
+.field public static final abc_text_select_handle_right_mtrl_dark:I = 0x7f080062
 
-.field public static final abc_text_select_handle_right_mtrl_light:I = 0x7f080064
+.field public static final abc_text_select_handle_right_mtrl_light:I = 0x7f080063
 
-.field public static final abc_textfield_activated_mtrl_alpha:I = 0x7f080065
+.field public static final abc_textfield_activated_mtrl_alpha:I = 0x7f080064
 
-.field public static final abc_textfield_default_mtrl_alpha:I = 0x7f080066
+.field public static final abc_textfield_default_mtrl_alpha:I = 0x7f080065
 
-.field public static final abc_textfield_search_activated_mtrl_alpha:I = 0x7f080067
+.field public static final abc_textfield_search_activated_mtrl_alpha:I = 0x7f080066
 
-.field public static final abc_textfield_search_default_mtrl_alpha:I = 0x7f080068
+.field public static final abc_textfield_search_default_mtrl_alpha:I = 0x7f080067
 
-.field public static final abc_textfield_search_material:I = 0x7f080069
+.field public static final abc_textfield_search_material:I = 0x7f080068
 
-.field public static final abc_vector_test:I = 0x7f08006a
+.field public static final abc_vector_test:I = 0x7f080069
 
-.field public static final avd_hide_password:I = 0x7f08008a
+.field public static final avd_hide_password:I = 0x7f080089
 
-.field public static final avd_show_password:I = 0x7f08008b
+.field public static final avd_show_password:I = 0x7f08008a
 
-.field public static final design_bottom_navigation_item_background:I = 0x7f0800b5
+.field public static final design_bottom_navigation_item_background:I = 0x7f0800b4
 
-.field public static final design_fab_background:I = 0x7f0800b6
+.field public static final design_fab_background:I = 0x7f0800b5
 
-.field public static final design_ic_visibility:I = 0x7f0800b7
+.field public static final design_ic_visibility:I = 0x7f0800b6
 
-.field public static final design_ic_visibility_off:I = 0x7f0800b8
+.field public static final design_ic_visibility_off:I = 0x7f0800b7
 
-.field public static final design_password_eye:I = 0x7f0800b9
+.field public static final design_password_eye:I = 0x7f0800b8
 
-.field public static final design_snackbar_background:I = 0x7f0800ba
+.field public static final design_snackbar_background:I = 0x7f0800b9
 
-.field public static final ic_mtrl_chip_checked_black:I = 0x7f080308
+.field public static final ic_mtrl_chip_checked_black:I = 0x7f0802fc
 
-.field public static final ic_mtrl_chip_checked_circle:I = 0x7f080309
+.field public static final ic_mtrl_chip_checked_circle:I = 0x7f0802fd
 
-.field public static final ic_mtrl_chip_close_circle:I = 0x7f08030a
+.field public static final ic_mtrl_chip_close_circle:I = 0x7f0802fe
 
-.field public static final mtrl_snackbar_background:I = 0x7f08046f
+.field public static final mtrl_snackbar_background:I = 0x7f080460
 
-.field public static final mtrl_tabs_default_indicator:I = 0x7f080470
+.field public static final mtrl_tabs_default_indicator:I = 0x7f080461
 
-.field public static final navigation_empty_icon:I = 0x7f080471
+.field public static final navigation_empty_icon:I = 0x7f080462
 
-.field public static final notification_action_background:I = 0x7f080472
+.field public static final notification_action_background:I = 0x7f080463
 
-.field public static final notification_bg:I = 0x7f080473
+.field public static final notification_bg:I = 0x7f080464
 
-.field public static final notification_bg_low:I = 0x7f080474
+.field public static final notification_bg_low:I = 0x7f080465
 
-.field public static final notification_bg_low_normal:I = 0x7f080475
+.field public static final notification_bg_low_normal:I = 0x7f080466
 
-.field public static final notification_bg_low_pressed:I = 0x7f080476
+.field public static final notification_bg_low_pressed:I = 0x7f080467
 
-.field public static final notification_bg_normal:I = 0x7f080477
+.field public static final notification_bg_normal:I = 0x7f080468
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080478
+.field public static final notification_bg_normal_pressed:I = 0x7f080469
 
-.field public static final notification_icon_background:I = 0x7f080479
+.field public static final notification_icon_background:I = 0x7f08046a
 
-.field public static final notification_template_icon_bg:I = 0x7f08047a
+.field public static final notification_template_icon_bg:I = 0x7f08046b
 
-.field public static final notification_template_icon_low_bg:I = 0x7f08047b
+.field public static final notification_template_icon_low_bg:I = 0x7f08046c
 
-.field public static final notification_tile_bg:I = 0x7f08047c
+.field public static final notification_tile_bg:I = 0x7f08046d
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08047d
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08046e
 
-.field public static final tooltip_frame_dark:I = 0x7f080485
+.field public static final tooltip_frame_dark:I = 0x7f080476
 
-.field public static final tooltip_frame_light:I = 0x7f080486
+.field public static final tooltip_frame_light:I = 0x7f080477
 
 
 # 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 61c30d3444..4336e9ae94 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 = 0x7f0a0080
+.field public static final async:I = 0x7f0a007f
 
-.field public static final auto:I = 0x7f0a00b9
+.field public static final auto:I = 0x7f0a00b8
 
-.field public static final blocking:I = 0x7f0a00ce
+.field public static final blocking:I = 0x7f0a00cd
 
 .field public static final bottom:I = 0x7f0a0105
 
@@ -73,251 +73,251 @@
 
 .field public static final chronometer:I = 0x7f0a0215
 
-.field public static final container:I = 0x7f0a0233
+.field public static final container:I = 0x7f0a0232
 
-.field public static final content:I = 0x7f0a0234
+.field public static final content:I = 0x7f0a0233
 
-.field public static final contentPanel:I = 0x7f0a0235
+.field public static final contentPanel:I = 0x7f0a0234
 
-.field public static final coordinator:I = 0x7f0a023a
+.field public static final coordinator:I = 0x7f0a0239
 
-.field public static final custom:I = 0x7f0a0252
+.field public static final custom:I = 0x7f0a0251
 
-.field public static final customPanel:I = 0x7f0a0253
+.field public static final customPanel:I = 0x7f0a0252
 
-.field public static final decor_content_parent:I = 0x7f0a0257
+.field public static final decor_content_parent:I = 0x7f0a0256
 
-.field public static final default_activity_button:I = 0x7f0a0258
+.field public static final default_activity_button:I = 0x7f0a0257
 
-.field public static final design_bottom_sheet:I = 0x7f0a0259
+.field public static final design_bottom_sheet:I = 0x7f0a0258
 
-.field public static final design_menu_item_action_area:I = 0x7f0a025a
+.field public static final design_menu_item_action_area:I = 0x7f0a0259
 
-.field public static final design_menu_item_action_area_stub:I = 0x7f0a025b
+.field public static final design_menu_item_action_area_stub:I = 0x7f0a025a
 
-.field public static final design_menu_item_text:I = 0x7f0a025c
+.field public static final design_menu_item_text:I = 0x7f0a025b
 
-.field public static final design_navigation_view:I = 0x7f0a025d
+.field public static final design_navigation_view:I = 0x7f0a025c
 
-.field public static final edit_query:I = 0x7f0a02ae
+.field public static final edit_query:I = 0x7f0a02ad
 
-.field public static final end:I = 0x7f0a02c9
+.field public static final end:I = 0x7f0a02c8
 
-.field public static final expand_activities_button:I = 0x7f0a02ce
+.field public static final expand_activities_button:I = 0x7f0a02cd
 
-.field public static final expanded_menu:I = 0x7f0a02cf
+.field public static final expanded_menu:I = 0x7f0a02ce
 
-.field public static final fill:I = 0x7f0a02e4
+.field public static final fill:I = 0x7f0a02e3
 
-.field public static final filled:I = 0x7f0a02e7
+.field public static final filled:I = 0x7f0a02e6
 
-.field public static final fixed:I = 0x7f0a02ed
+.field public static final fixed:I = 0x7f0a02ec
 
-.field public static final forever:I = 0x7f0a02f2
+.field public static final forever:I = 0x7f0a02f1
 
-.field public static final ghost_view:I = 0x7f0a0316
+.field public static final ghost_view:I = 0x7f0a0315
 
-.field public static final group_divider:I = 0x7f0a032d
+.field public static final group_divider:I = 0x7f0a0328
 
-.field public static final home:I = 0x7f0a0394
+.field public static final home:I = 0x7f0a038f
 
-.field public static final icon:I = 0x7f0a0396
+.field public static final icon:I = 0x7f0a0391
 
-.field public static final icon_group:I = 0x7f0a0397
+.field public static final icon_group:I = 0x7f0a0392
 
-.field public static final image:I = 0x7f0a039a
+.field public static final image:I = 0x7f0a0395
 
-.field public static final info:I = 0x7f0a03ac
+.field public static final info:I = 0x7f0a03a7
 
-.field public static final italic:I = 0x7f0a03d9
+.field public static final italic:I = 0x7f0a03d4
 
-.field public static final item_touch_helper_previous_elevation:I = 0x7f0a040d
+.field public static final item_touch_helper_previous_elevation:I = 0x7f0a0408
 
-.field public static final labeled:I = 0x7f0a0414
+.field public static final labeled:I = 0x7f0a040f
 
-.field public static final largeLabel:I = 0x7f0a0415
+.field public static final largeLabel:I = 0x7f0a0410
 
-.field public static final left:I = 0x7f0a041b
+.field public static final left:I = 0x7f0a0416
 
-.field public static final line1:I = 0x7f0a041d
+.field public static final line1:I = 0x7f0a0418
 
-.field public static final line3:I = 0x7f0a041e
+.field public static final line3:I = 0x7f0a0419
 
-.field public static final listMode:I = 0x7f0a0420
+.field public static final listMode:I = 0x7f0a041b
 
-.field public static final list_item:I = 0x7f0a0421
+.field public static final list_item:I = 0x7f0a041c
 
-.field public static final masked:I = 0x7f0a043f
+.field public static final masked:I = 0x7f0a043a
 
-.field public static final message:I = 0x7f0a0485
+.field public static final message:I = 0x7f0a0478
 
-.field public static final mini:I = 0x7f0a048a
+.field public static final mini:I = 0x7f0a047d
 
-.field public static final mtrl_child_content_container:I = 0x7f0a048b
+.field public static final mtrl_child_content_container:I = 0x7f0a047e
 
-.field public static final mtrl_internal_children_alpha_tag:I = 0x7f0a048c
+.field public static final mtrl_internal_children_alpha_tag:I = 0x7f0a047f
 
-.field public static final multiply:I = 0x7f0a048d
+.field public static final multiply:I = 0x7f0a0480
 
-.field public static final navigation_header_container:I = 0x7f0a048f
+.field public static final navigation_header_container:I = 0x7f0a0482
 
-.field public static final none:I = 0x7f0a04a2
+.field public static final none:I = 0x7f0a0495
 
-.field public static final normal:I = 0x7f0a04a3
+.field public static final normal:I = 0x7f0a0496
 
-.field public static final notification_background:I = 0x7f0a04ad
+.field public static final notification_background:I = 0x7f0a04a0
 
-.field public static final notification_main_column:I = 0x7f0a04ae
+.field public static final notification_main_column:I = 0x7f0a04a1
 
-.field public static final notification_main_column_container:I = 0x7f0a04af
+.field public static final notification_main_column_container:I = 0x7f0a04a2
 
-.field public static final outline:I = 0x7f0a04d1
+.field public static final outline:I = 0x7f0a04c4
 
-.field public static final parallax:I = 0x7f0a04e0
+.field public static final parallax:I = 0x7f0a04d3
 
-.field public static final parentPanel:I = 0x7f0a04e2
+.field public static final parentPanel:I = 0x7f0a04d5
 
-.field public static final parent_matrix:I = 0x7f0a04e3
+.field public static final parent_matrix:I = 0x7f0a04d6
 
-.field public static final pin:I = 0x7f0a0520
+.field public static final pin:I = 0x7f0a0512
 
-.field public static final progress_circular:I = 0x7f0a055c
+.field public static final progress_circular:I = 0x7f0a054d
 
-.field public static final progress_horizontal:I = 0x7f0a055e
+.field public static final progress_horizontal:I = 0x7f0a054f
 
-.field public static final radio:I = 0x7f0a0569
+.field public static final radio:I = 0x7f0a055a
 
-.field public static final right:I = 0x7f0a058c
+.field public static final right:I = 0x7f0a0573
 
-.field public static final right_icon:I = 0x7f0a058d
+.field public static final right_icon:I = 0x7f0a0574
 
-.field public static final right_side:I = 0x7f0a058e
+.field public static final right_side:I = 0x7f0a0575
 
-.field public static final save_image_matrix:I = 0x7f0a05b8
+.field public static final save_image_matrix:I = 0x7f0a059f
 
-.field public static final save_non_transition_alpha:I = 0x7f0a05b9
+.field public static final save_non_transition_alpha:I = 0x7f0a05a0
 
-.field public static final save_scale_type:I = 0x7f0a05ba
+.field public static final save_scale_type:I = 0x7f0a05a1
 
-.field public static final screen:I = 0x7f0a05bc
+.field public static final screen:I = 0x7f0a05a3
 
-.field public static final scrollIndicatorDown:I = 0x7f0a05be
+.field public static final scrollIndicatorDown:I = 0x7f0a05a5
 
-.field public static final scrollIndicatorUp:I = 0x7f0a05bf
+.field public static final scrollIndicatorUp:I = 0x7f0a05a6
 
-.field public static final scrollView:I = 0x7f0a05c0
+.field public static final scrollView:I = 0x7f0a05a7
 
-.field public static final scrollable:I = 0x7f0a05c2
+.field public static final scrollable:I = 0x7f0a05a9
 
-.field public static final search_badge:I = 0x7f0a05c4
+.field public static final search_badge:I = 0x7f0a05ab
 
-.field public static final search_bar:I = 0x7f0a05c5
+.field public static final search_bar:I = 0x7f0a05ac
 
-.field public static final search_button:I = 0x7f0a05c6
+.field public static final search_button:I = 0x7f0a05ad
 
-.field public static final search_close_btn:I = 0x7f0a05c8
+.field public static final search_close_btn:I = 0x7f0a05af
 
-.field public static final search_edit_frame:I = 0x7f0a05c9
+.field public static final search_edit_frame:I = 0x7f0a05b0
 
-.field public static final search_go_btn:I = 0x7f0a05cc
+.field public static final search_go_btn:I = 0x7f0a05b3
 
-.field public static final search_mag_icon:I = 0x7f0a05ce
+.field public static final search_mag_icon:I = 0x7f0a05b5
 
-.field public static final search_plate:I = 0x7f0a05cf
+.field public static final search_plate:I = 0x7f0a05b6
 
-.field public static final search_src_text:I = 0x7f0a05d2
+.field public static final search_src_text:I = 0x7f0a05b9
 
-.field public static final search_voice_btn:I = 0x7f0a05de
+.field public static final search_voice_btn:I = 0x7f0a05c5
 
-.field public static final select_dialog_listview:I = 0x7f0a05df
+.field public static final select_dialog_listview:I = 0x7f0a05c6
 
-.field public static final selected:I = 0x7f0a05e0
+.field public static final selected:I = 0x7f0a05c7
 
-.field public static final shortcut:I = 0x7f0a0719
+.field public static final shortcut:I = 0x7f0a0700
 
-.field public static final smallLabel:I = 0x7f0a071d
+.field public static final smallLabel:I = 0x7f0a0704
 
-.field public static final snackbar_action:I = 0x7f0a071e
+.field public static final snackbar_action:I = 0x7f0a0705
 
-.field public static final snackbar_text:I = 0x7f0a071f
+.field public static final snackbar_text:I = 0x7f0a0706
 
-.field public static final spacer:I = 0x7f0a0725
+.field public static final spacer:I = 0x7f0a070c
 
-.field public static final split_action_bar:I = 0x7f0a072c
+.field public static final split_action_bar:I = 0x7f0a070d
 
-.field public static final src_atop:I = 0x7f0a072f
+.field public static final src_atop:I = 0x7f0a0710
 
-.field public static final src_in:I = 0x7f0a0730
+.field public static final src_in:I = 0x7f0a0711
 
-.field public static final src_over:I = 0x7f0a0731
+.field public static final src_over:I = 0x7f0a0712
 
-.field public static final start:I = 0x7f0a0734
+.field public static final start:I = 0x7f0a0715
 
-.field public static final stretch:I = 0x7f0a0754
+.field public static final stretch:I = 0x7f0a072c
 
-.field public static final submenuarrow:I = 0x7f0a0755
+.field public static final submenuarrow:I = 0x7f0a072d
 
-.field public static final submit_area:I = 0x7f0a0756
+.field public static final submit_area:I = 0x7f0a072e
 
-.field public static final tabMode:I = 0x7f0a0761
+.field public static final tabMode:I = 0x7f0a0739
 
-.field public static final tag_transition_group:I = 0x7f0a0767
+.field public static final tag_transition_group:I = 0x7f0a073f
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0768
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0740
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0769
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0741
 
-.field public static final text:I = 0x7f0a076f
+.field public static final text:I = 0x7f0a0747
 
-.field public static final text2:I = 0x7f0a0770
+.field public static final text2:I = 0x7f0a0748
 
-.field public static final textSpacerNoButtons:I = 0x7f0a0771
+.field public static final textSpacerNoButtons:I = 0x7f0a0749
 
-.field public static final textSpacerNoTitle:I = 0x7f0a0772
+.field public static final textSpacerNoTitle:I = 0x7f0a074a
 
-.field public static final text_input_password_toggle:I = 0x7f0a0775
+.field public static final text_input_password_toggle:I = 0x7f0a074d
 
-.field public static final textinput_counter:I = 0x7f0a0778
+.field public static final textinput_counter:I = 0x7f0a0750
 
-.field public static final textinput_error:I = 0x7f0a0779
+.field public static final textinput_error:I = 0x7f0a0751
 
-.field public static final textinput_helper_text:I = 0x7f0a077a
+.field public static final textinput_helper_text:I = 0x7f0a0752
 
-.field public static final time:I = 0x7f0a077d
+.field public static final time:I = 0x7f0a0755
 
-.field public static final title:I = 0x7f0a077e
+.field public static final title:I = 0x7f0a0756
 
-.field public static final titleDividerNoCustom:I = 0x7f0a077f
+.field public static final titleDividerNoCustom:I = 0x7f0a0757
 
-.field public static final title_template:I = 0x7f0a0780
+.field public static final title_template:I = 0x7f0a0758
 
-.field public static final top:I = 0x7f0a0785
+.field public static final top:I = 0x7f0a075d
 
-.field public static final topPanel:I = 0x7f0a0786
+.field public static final topPanel:I = 0x7f0a075e
 
-.field public static final touch_outside:I = 0x7f0a0788
+.field public static final touch_outside:I = 0x7f0a0760
 
-.field public static final transition_current_scene:I = 0x7f0a0789
+.field public static final transition_current_scene:I = 0x7f0a0761
 
-.field public static final transition_layout_save:I = 0x7f0a078a
+.field public static final transition_layout_save:I = 0x7f0a0762
 
-.field public static final transition_position:I = 0x7f0a078b
+.field public static final transition_position:I = 0x7f0a0763
 
-.field public static final transition_scene_layoutid_cache:I = 0x7f0a078c
+.field public static final transition_scene_layoutid_cache:I = 0x7f0a0764
 
-.field public static final transition_transform:I = 0x7f0a078d
+.field public static final transition_transform:I = 0x7f0a0765
 
-.field public static final uniform:I = 0x7f0a0799
+.field public static final uniform:I = 0x7f0a0771
 
-.field public static final unlabeled:I = 0x7f0a079a
+.field public static final unlabeled:I = 0x7f0a0772
 
-.field public static final up:I = 0x7f0a079c
+.field public static final up:I = 0x7f0a0774
 
-.field public static final view_offset_helper:I = 0x7f0a082e
+.field public static final view_offset_helper:I = 0x7f0a07f4
 
-.field public static final visible:I = 0x7f0a0831
+.field public static final visible:I = 0x7f0a07f7
 
-.field public static final wrap_content:I = 0x7f0a0881
+.field public static final wrap_content:I = 0x7f0a0846
 
 
 # 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 7ebf7c84b4..f5e1ee6adc 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
@@ -121,7 +121,7 @@
 
 .field public static final select_dialog_singlechoice_material:I = 0x7f0d005a
 
-.field public static final support_simple_spinner_dropdown_item:I = 0x7f0d0062
+.field public static final support_simple_spinner_dropdown_item:I = 0x7f0d0061
 
 
 # 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 8fb423dd27..28fc159bab 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 = 0x7f120365
+.field public static final bottom_sheet_behavior:I = 0x7f120340
 
-.field public static final character_counter_content_description:I = 0x7f1203f0
+.field public static final character_counter_content_description:I = 0x7f1203cb
 
-.field public static final character_counter_pattern:I = 0x7f1203f1
+.field public static final character_counter_pattern:I = 0x7f1203cc
 
-.field public static final fab_transformation_scrim_behavior:I = 0x7f1205d8
+.field public static final fab_transformation_scrim_behavior:I = 0x7f1205b3
 
-.field public static final fab_transformation_sheet_behavior:I = 0x7f1205d9
+.field public static final fab_transformation_sheet_behavior:I = 0x7f1205b4
 
-.field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f120968
+.field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f120932
 
-.field public static final mtrl_chip_close_icon_content_description:I = 0x7f120c0a
+.field public static final mtrl_chip_close_icon_content_description:I = 0x7f120bd3
 
-.field public static final password_toggle_content_description:I = 0x7f120d77
+.field public static final password_toggle_content_description:I = 0x7f120d3f
 
-.field public static final path_password_eye:I = 0x7f120d7a
+.field public static final path_password_eye:I = 0x7f120d42
 
-.field public static final path_password_eye_mask_strike_through:I = 0x7f120d7b
+.field public static final path_password_eye_mask_strike_through:I = 0x7f120d43
 
-.field public static final path_password_eye_mask_visible:I = 0x7f120d7c
+.field public static final path_password_eye_mask_visible:I = 0x7f120d44
 
-.field public static final path_password_strike_through:I = 0x7f120d7d
+.field public static final path_password_strike_through:I = 0x7f120d45
 
-.field public static final search_menu_title:I = 0x7f121098
+.field public static final search_menu_title:I = 0x7f12100c
 
-.field public static final status_bar_notification_info_overflow:I = 0x7f121165
+.field public static final status_bar_notification_info_overflow:I = 0x7f1210d9
 
 
 # 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 99249cca00..4abea4b49d 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, 0x7f040315
+    const v5, 0x7f040314
 
     aput v5, v2, v3
 
@@ -1920,15 +1920,15 @@
         0x7f0401d6
         0x7f0401f9
         0x7f040203
-        0x7f040267
-        0x7f040283
-        0x7f04029b
+        0x7f040266
+        0x7f040282
+        0x7f04029a
+        0x7f0402c8
         0x7f0402c9
-        0x7f0402ca
-        0x7f040323
-        0x7f040326
-        0x7f0403bf
-        0x7f0403c9
+        0x7f040322
+        0x7f040325
+        0x7f0403be
+        0x7f0403c8
     .end array-data
 
     :array_1
@@ -1937,8 +1937,8 @@
         0x7f04004c
         0x7f0400b3
         0x7f04015c
-        0x7f040326
-        0x7f0403c9
+        0x7f040325
+        0x7f0403c8
     .end array-data
 
     :array_2
@@ -1952,11 +1952,11 @@
         0x10100f2
         0x7f040079
         0x7f04007a
+        0x7f04025d
         0x7f04025e
-        0x7f04025f
-        0x7f040280
+        0x7f04027f
+        0x7f040307
         0x7f040308
-        0x7f040309
     .end array-data
 
     :array_4
@@ -1966,15 +1966,15 @@
         0x1010540
         0x7f04011a
         0x7f040121
-        0x7f040259
+        0x7f040258
     .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
-        0x7f040313
+        0x7f040312
+        0x7f0403bc
         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
-        0x7f04025a
-        0x7f040349
+        0x7f040259
+        0x7f040348
     .end array-data
 
     :array_b
@@ -2098,41 +2098,41 @@
         0x7f040119
         0x7f040168
         0x7f0401e1
+        0x7f04025b
         0x7f04025c
-        0x7f04025d
+        0x7f04025f
         0x7f040260
         0x7f040261
         0x7f040262
         0x7f040263
         0x7f040264
         0x7f040265
-        0x7f040266
+        0x7f04028f
         0x7f040290
         0x7f040291
-        0x7f040292
-        0x7f04029a
-        0x7f04029c
-        0x7f0402cf
+        0x7f040299
+        0x7f04029b
+        0x7f0402ce
+        0x7f0402d1
         0x7f0402d2
         0x7f0402d3
-        0x7f0402d4
-        0x7f0402fb
+        0x7f0402fa
+        0x7f0402fc
         0x7f0402fd
         0x7f0402fe
-        0x7f0402ff
+        0x7f04030f
         0x7f040310
-        0x7f040311
-        0x7f04032a
+        0x7f040329
+        0x7f040353
         0x7f040354
         0x7f040355
         0x7f040356
-        0x7f040357
+        0x7f040358
         0x7f040359
         0x7f04035a
         0x7f04035b
-        0x7f04035c
+        0x7f04035e
         0x7f04035f
-        0x7f040360
         0x7f0403cb
         0x7f0403cc
         0x7f0403cd
@@ -2171,7 +2171,7 @@
         0x7f040207
         0x7f040208
         0x7f04020b
-        0x7f04027f
+        0x7f04027e
     .end array-data
 
     :array_e
@@ -2231,10 +2231,10 @@
         0x7f040160
         0x7f0401d7
         0x7f0401db
-        0x7f0402d8
-        0x7f040306
-        0x7f040361
-        0x7f040363
+        0x7f0402d7
+        0x7f040305
+        0x7f040360
+        0x7f040362
     .end array-data
 
     :array_11
@@ -2243,8 +2243,8 @@
         0x7f0400a3
         0x7f0400a4
         0x7f0400a5
+        0x7f040309
         0x7f04030a
-        0x7f04030b
     .end array-data
 
     :array_12
@@ -2259,11 +2259,11 @@
         0x7f040126
         0x7f040127
         0x7f040128
-        0x7f0402f6
-        0x7f0402f8
-        0x7f04031b
+        0x7f0402f5
+        0x7f0402f7
+        0x7f04031a
+        0x7f0403be
         0x7f0403bf
-        0x7f0403c0
         0x7f0403ca
     .end array-data
 
@@ -2290,7 +2290,7 @@
     :array_16
     .array-data 4
         0x7f04020a
-        0x7f04031a
+        0x7f040319
     .end array-data
 
     :array_17
@@ -2318,8 +2318,8 @@
         0x7f0400b8
         0x7f040112
         0x7f040150
-        0x7f04030f
-        0x7f0403b6
+        0x7f04030e
+        0x7f0403b5
     .end array-data
 
     :array_1a
@@ -2332,10 +2332,10 @@
         0x7f04012e
         0x7f040160
         0x7f04016a
-        0x7f04027c
-        0x7f04029f
-        0x7f0402d8
-        0x7f040306
+        0x7f04027b
+        0x7f04029e
+        0x7f0402d7
+        0x7f040305
         0x7f0403e7
     .end array-data
 
@@ -2344,7 +2344,7 @@
         0x7f040139
         0x7f04013a
         0x7f040204
-        0x7f04025b
+        0x7f04025a
     .end array-data
 
     :array_1c
@@ -2387,8 +2387,8 @@
         0x1010128
         0x7f04010b
         0x7f040110
-        0x7f04027e
-        0x7f040305
+        0x7f04027d
+        0x7f040304
     .end array-data
 
     :array_20
@@ -2420,15 +2420,15 @@
         0x7f0401da
         0x7f0401dc
         0x7f0401dd
-        0x7f0402d8
+        0x7f0402d7
+        0x7f04031e
         0x7f04031f
-        0x7f040320
     .end array-data
 
     :array_23
     .array-data 4
+        0x7f04031e
         0x7f04031f
-        0x7f040320
     .end array-data
 
     :array_24
@@ -2445,12 +2445,13 @@
         0x7f0400c7
         0x7f040119
         0x7f040143
+        0x7f040277
         0x7f040278
-        0x7f040279
-        0x7f040284
-        0x7f0402f7
-        0x7f04030c
-        0x7f040342
+        0x7f040283
+        0x7f0402f6
+        0x7f04030b
+        0x7f040341
+        0x7f040349
         0x7f04034a
         0x7f04034b
         0x7f04034c
@@ -2460,11 +2461,10 @@
         0x7f040350
         0x7f040351
         0x7f040352
-        0x7f040353
-        0x7f040358
+        0x7f040357
+        0x7f04035c
         0x7f04035d
-        0x7f04035e
-        0x7f040362
+        0x7f040361
     .end array-data
 
     :array_25
@@ -2499,8 +2499,8 @@
         0x7f0400ce
         0x7f0401dc
         0x7f0401dd
-        0x7f040287
-        0x7f040301
+        0x7f040286
+        0x7f040300
         0x7f0403cf
     .end array-data
 
@@ -2513,8 +2513,8 @@
         0x101012f
         0x1010130
         0x1010131
-        0x7f04029d
-        0x7f040321
+        0x7f04029c
+        0x7f040320
     .end array-data
 
     :array_28
@@ -2530,20 +2530,20 @@
         0x7f040202
         0x7f040205
         0x7f040208
-        0x7f04027f
+        0x7f04027e
     .end array-data
 
     :array_29
     .array-data 4
         0x1010176
         0x10102c9
-        0x7f040288
+        0x7f040287
     .end array-data
 
     :array_2a
     .array-data 4
-        0x7f04028c
-        0x7f04028f
+        0x7f04028b
+        0x7f04028e
     .end array-data
 
     :array_2b
@@ -2556,9 +2556,9 @@
         0x7f040135
         0x7f040136
         0x7f04020e
-        0x7f0402d7
-        0x7f04030e
-        0x7f040314
+        0x7f0402d6
+        0x7f04030d
+        0x7f040313
     .end array-data
 
     :array_2c
@@ -2573,26 +2573,26 @@
         0x7f040155
         0x7f0401de
         0x7f04020d
+        0x7f0402cc
         0x7f0402cd
-        0x7f0402ce
+        0x7f0402f8
         0x7f0402f9
-        0x7f0402fa
-        0x7f040322
-        0x7f040327
+        0x7f040321
+        0x7f040326
         0x7f0403ef
     .end array-data
 
     :array_2d
     .array-data 4
+        0x7f04030b
         0x7f04030c
-        0x7f04030d
     .end array-data
 
     :array_2e
     .array-data 4
         0x101011f
         0x7f04011a
-        0x7f04027a
+        0x7f040279
     .end array-data
 
     :array_2f
@@ -2601,7 +2601,7 @@
         0x1010176
         0x101017b
         0x1010262
-        0x7f04029b
+        0x7f04029a
     .end array-data
 
     :array_30
@@ -2609,14 +2609,14 @@
         0x1010124
         0x1010125
         0x1010142
-        0x7f040307
-        0x7f040312
+        0x7f040306
+        0x7f040311
+        0x7f040327
         0x7f040328
-        0x7f040329
-        0x7f04032b
+        0x7f04032a
+        0x7f0403b6
         0x7f0403b7
         0x7f0403b8
-        0x7f0403b9
         0x7f0403d0
         0x7f0403d1
         0x7f0403d2
@@ -2631,6 +2631,7 @@
 
     :array_32
     .array-data 4
+        0x7f04032b
         0x7f04032c
         0x7f04032d
         0x7f04032e
@@ -2652,10 +2653,9 @@
         0x7f04033e
         0x7f04033f
         0x7f040340
-        0x7f040341
+        0x7f040342
         0x7f040343
         0x7f040344
-        0x7f040345
     .end array-data
 
     :array_33
@@ -2672,7 +2672,7 @@
         0x1010164
         0x10103ac
         0x7f040145
-        0x7f040349
+        0x7f040348
     .end array-data
 
     :array_34
@@ -2700,11 +2700,11 @@
         0x7f040164
         0x7f040166
         0x7f040167
+        0x7f040292
         0x7f040293
         0x7f040294
         0x7f040295
         0x7f040296
-        0x7f040297
     .end array-data
 
     :array_35
@@ -2727,16 +2727,17 @@
         0x7f0400d2
         0x7f0400d3
         0x7f0400d4
+        0x7f040266
         0x7f040267
-        0x7f040268
-        0x7f04027b
+        0x7f04027a
+        0x7f040280
         0x7f040281
-        0x7f040282
-        0x7f04029b
+        0x7f04029a
+        0x7f040322
         0x7f040323
         0x7f040324
-        0x7f040325
-        0x7f0403bf
+        0x7f0403be
+        0x7f0403c0
         0x7f0403c1
         0x7f0403c2
         0x7f0403c3
@@ -2744,16 +2745,15 @@
         0x7f0403c5
         0x7f0403c6
         0x7f0403c7
-        0x7f0403c8
     .end array-data
 
     :array_37
     .array-data 4
         0x1010000
         0x10100da
+        0x7f04028c
         0x7f04028d
-        0x7f04028e
-        0x7f040365
+        0x7f040364
     .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 6d65b65fd5..613ce22bf0 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 aMv:Lcom/google/android/material/appbar/AppBarLayout;
+.field final synthetic aMr: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;->aMv:Lcom/google/android/material/appbar/AppBarLayout;
+    iput-object p1, p0, Lcom/google/android/material/appbar/AppBarLayout$1;->aMr: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;->aMv:Lcom/google/android/material/appbar/AppBarLayout;
+    iget-object p1, p0, Lcom/google/android/material/appbar/AppBarLayout$1;->aMr: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 09bbed97b3..08b9c0f2f0 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 aMw:Landroidx/coordinatorlayout/widget/CoordinatorLayout;
+.field final synthetic aMs:Landroidx/coordinatorlayout/widget/CoordinatorLayout;
 
-.field final synthetic aMx:Lcom/google/android/material/appbar/AppBarLayout;
+.field final synthetic aMt:Lcom/google/android/material/appbar/AppBarLayout;
 
-.field final synthetic aMy:Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior;
+.field final synthetic aMu: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;->aMy:Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior;
+    iput-object p1, p0, Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior$1;->aMu:Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior;
 
-    iput-object p2, p0, Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior$1;->aMw:Landroidx/coordinatorlayout/widget/CoordinatorLayout;
+    iput-object p2, p0, Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior$1;->aMs:Landroidx/coordinatorlayout/widget/CoordinatorLayout;
 
-    iput-object p3, p0, Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior$1;->aMx:Lcom/google/android/material/appbar/AppBarLayout;
+    iput-object p3, p0, Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior$1;->aMt: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;->aMy:Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior;
+    iget-object v0, p0, Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior$1;->aMu:Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior;
 
-    iget-object v1, p0, Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior$1;->aMw:Landroidx/coordinatorlayout/widget/CoordinatorLayout;
+    iget-object v1, p0, Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior$1;->aMs:Landroidx/coordinatorlayout/widget/CoordinatorLayout;
 
-    iget-object v2, p0, Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior$1;->aMx:Lcom/google/android/material/appbar/AppBarLayout;
+    iget-object v2, p0, Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior$1;->aMt: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 6f1e740db1..b52f7298db 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 aMz:Lcom/google/android/material/appbar/CollapsingToolbarLayout;
+.field final synthetic aMv: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;->aMz:Lcom/google/android/material/appbar/CollapsingToolbarLayout;
+    iput-object p1, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout$1;->aMv: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;->aMz:Lcom/google/android/material/appbar/CollapsingToolbarLayout;
+    iget-object p1, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout$1;->aMv: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 4b4893c6f9..be539a2aaf 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 aMz:Lcom/google/android/material/appbar/CollapsingToolbarLayout;
+.field final synthetic aMv: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;->aMz:Lcom/google/android/material/appbar/CollapsingToolbarLayout;
+    iput-object p1, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout$2;->aMv: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;->aMz:Lcom/google/android/material/appbar/CollapsingToolbarLayout;
+    iget-object v0, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout$2;->aMv: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 05a5784f57..b7acce33ab 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 aMz:Lcom/google/android/material/appbar/CollapsingToolbarLayout;
+.field final synthetic aMv: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;->aMz:Lcom/google/android/material/appbar/CollapsingToolbarLayout;
+    iput-object p1, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout$a;->aMv: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;->aMz:Lcom/google/android/material/appbar/CollapsingToolbarLayout;
+    iget-object p1, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout$a;->aMv: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;->aMz:Lcom/google/android/material/appbar/CollapsingToolbarLayout;
+    iget-object p1, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout$a;->aMv: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;->aMz:Lcom/google/android/material/appbar/CollapsingToolbarLayout;
+    iget-object v1, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout$a;->aMv: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;->aMz:Lcom/google/android/material/appbar/CollapsingToolbarLayout;
+    iget-object v3, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout$a;->aMv: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;->aMz:Lcom/google/android/material/appbar/CollapsingToolbarLayout;
+    iget-object v6, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout$a;->aMv: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;->aMz:Lcom/google/android/material/appbar/CollapsingToolbarLayout;
+    iget-object v0, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout$a;->aMv: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;->aMz:Lcom/google/android/material/appbar/CollapsingToolbarLayout;
+    iget-object v0, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout$a;->aMv: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;->aMz:Lcom/google/android/material/appbar/CollapsingToolbarLayout;
+    iget-object v0, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout$a;->aMv: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;->aMz:Lcom/google/android/material/appbar/CollapsingToolbarLayout;
+    iget-object v0, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout$a;->aMv: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;->aMz:Lcom/google/android/material/appbar/CollapsingToolbarLayout;
+    iget-object v1, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout$a;->aMv: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;->aMz:Lcom/google/android/material/appbar/CollapsingToolbarLayout;
+    iget-object p1, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout$a;->aMv: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 f8abfd772d..58dd6d6a1b 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;->aMD:I
+    iget v0, v0, Lcom/google/android/material/appbar/d;->aMz:I
 
     sub-int/2addr v2, v0
 
@@ -1618,7 +1618,7 @@
 
     move-result-object p2
 
-    invoke-virtual {p2}, Lcom/google/android/material/appbar/d;->zi()V
+    invoke-virtual {p2}, Lcom/google/android/material/appbar/d;->zg()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 3051f8f73c..b6dd4df5d0 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 aMA:Landroidx/coordinatorlayout/widget/CoordinatorLayout;
+.field private final aMw:Landroidx/coordinatorlayout/widget/CoordinatorLayout;
 
-.field private final aMB:Landroid/view/View;
+.field private final aMx:Landroid/view/View;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TV;"
@@ -28,7 +28,7 @@
     .end annotation
 .end field
 
-.field final synthetic aMC:Lcom/google/android/material/appbar/a;
+.field final synthetic aMy: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;->aMC:Lcom/google/android/material/appbar/a;
+    iput-object p1, p0, Lcom/google/android/material/appbar/a$a;->aMy: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;->aMA:Landroidx/coordinatorlayout/widget/CoordinatorLayout;
+    iput-object p2, p0, Lcom/google/android/material/appbar/a$a;->aMw:Landroidx/coordinatorlayout/widget/CoordinatorLayout;
 
-    iput-object p3, p0, Lcom/google/android/material/appbar/a$a;->aMB:Landroid/view/View;
+    iput-object p3, p0, Lcom/google/android/material/appbar/a$a;->aMx: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;->aMB:Landroid/view/View;
+    iget-object v0, p0, Lcom/google/android/material/appbar/a$a;->aMx:Landroid/view/View;
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/material/appbar/a$a;->aMC:Lcom/google/android/material/appbar/a;
+    iget-object v0, p0, Lcom/google/android/material/appbar/a$a;->aMy: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;->aMC:Lcom/google/android/material/appbar/a;
+    iget-object v0, p0, Lcom/google/android/material/appbar/a$a;->aMy: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;->aMC:Lcom/google/android/material/appbar/a;
+    iget-object v0, p0, Lcom/google/android/material/appbar/a$a;->aMy:Lcom/google/android/material/appbar/a;
 
-    iget-object v1, p0, Lcom/google/android/material/appbar/a$a;->aMA:Landroidx/coordinatorlayout/widget/CoordinatorLayout;
+    iget-object v1, p0, Lcom/google/android/material/appbar/a$a;->aMw:Landroidx/coordinatorlayout/widget/CoordinatorLayout;
 
-    iget-object v2, p0, Lcom/google/android/material/appbar/a$a;->aMB:Landroid/view/View;
+    iget-object v2, p0, Lcom/google/android/material/appbar/a$a;->aMx: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;->aMB:Landroid/view/View;
+    iget-object v0, p0, Lcom/google/android/material/appbar/a$a;->aMx: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;->aMC:Lcom/google/android/material/appbar/a;
+    iget-object v0, p0, Lcom/google/android/material/appbar/a$a;->aMy:Lcom/google/android/material/appbar/a;
 
-    iget-object v1, p0, Lcom/google/android/material/appbar/a$a;->aMA:Landroidx/coordinatorlayout/widget/CoordinatorLayout;
+    iget-object v1, p0, Lcom/google/android/material/appbar/a$a;->aMw:Landroidx/coordinatorlayout/widget/CoordinatorLayout;
 
-    iget-object v2, p0, Lcom/google/android/material/appbar/a$a;->aMB:Landroid/view/View;
+    iget-object v2, p0, Lcom/google/android/material/appbar/a$a;->aMx: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 9611c96ddd..923c9d4a0c 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;->aMG:I
+    iget v0, v0, Lcom/google/android/material/appbar/d;->aMC:I
 
     return v0
 
@@ -78,7 +78,7 @@
 
     if-eqz v0, :cond_0
 
-    iget v0, v0, Lcom/google/android/material/appbar/d;->aMF:I
+    iget v0, v0, Lcom/google/android/material/appbar/d;->aMB: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;->zi()V
+    invoke-virtual {p1}, Lcom/google/android/material/appbar/d;->zg()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 6b62ea4bf0..ebb157bd19 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 aMD:I
+.field private aMA:I
 
-.field private aME:I
+.field aMB:I
 
-.field aMF:I
+.field aMC:I
 
-.field aMG:I
+.field aMz:I
 
 .field private final view:Landroid/view/View;
 
@@ -26,18 +26,18 @@
     return-void
 .end method
 
-.method private zj()V
+.method private zh()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;->aMF:I
+    iget v1, p0, Lcom/google/android/material/appbar/d;->aMB:I
 
     invoke-virtual {v0}, Landroid/view/View;->getTop()I
 
     move-result v2
 
-    iget v3, p0, Lcom/google/android/material/appbar/d;->aMD:I
+    iget v3, p0, Lcom/google/android/material/appbar/d;->aMz: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;->aMG:I
+    iget v1, p0, Lcom/google/android/material/appbar/d;->aMC:I
 
     invoke-virtual {v0}, Landroid/view/View;->getLeft()I
 
     move-result v2
 
-    iget v3, p0, Lcom/google/android/material/appbar/d;->aME:I
+    iget v3, p0, Lcom/google/android/material/appbar/d;->aMA: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;->aMG:I
+    iget v0, p0, Lcom/google/android/material/appbar/d;->aMC:I
 
     if-eq v0, p1, :cond_0
 
-    iput p1, p0, Lcom/google/android/material/appbar/d;->aMG:I
+    iput p1, p0, Lcom/google/android/material/appbar/d;->aMC:I
 
-    invoke-direct {p0}, Lcom/google/android/material/appbar/d;->zj()V
+    invoke-direct {p0}, Lcom/google/android/material/appbar/d;->zh()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;->aMF:I
+    iget v0, p0, Lcom/google/android/material/appbar/d;->aMB:I
 
     if-eq v0, p1, :cond_0
 
-    iput p1, p0, Lcom/google/android/material/appbar/d;->aMF:I
+    iput p1, p0, Lcom/google/android/material/appbar/d;->aMB:I
 
-    invoke-direct {p0}, Lcom/google/android/material/appbar/d;->zj()V
+    invoke-direct {p0}, Lcom/google/android/material/appbar/d;->zh()V
 
     const/4 p1, 0x1
 
@@ -108,7 +108,7 @@
     return p1
 .end method
 
-.method public final zi()V
+.method public final zg()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;->aMD:I
+    iput v0, p0, Lcom/google/android/material/appbar/d;->aMz: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;->aME:I
+    iput v0, p0, Lcom/google/android/material/appbar/d;->aMA:I
 
-    invoke-direct {p0}, Lcom/google/android/material/appbar/d;->zj()V
+    invoke-direct {p0}, Lcom/google/android/material/appbar/d;->zh()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 cefcce6193..cc69aed964 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 aMH:[I
+.field private static final aMD:[I
 
 
 # direct methods
@@ -21,7 +21,7 @@
 
     aput v2, v0, v1
 
-    sput-object v0, Lcom/google/android/material/appbar/e;->aMH:[I
+    sput-object v0, Lcom/google/android/material/appbar/e;->aMD:[I
 
     return-void
 .end method
@@ -135,7 +135,7 @@
 
     move-result-object v6
 
-    sget-object v2, Lcom/google/android/material/appbar/e;->aMH:[I
+    sget-object v2, Lcom/google/android/material/appbar/e;->aMD:[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 c43440dcbb..9aec87002f 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 aMI:Lcom/google/android/material/behavior/HideBottomViewOnScrollBehavior;
+.field final synthetic aME: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;->aMI:Lcom/google/android/material/behavior/HideBottomViewOnScrollBehavior;
+    iput-object p1, p0, Lcom/google/android/material/behavior/HideBottomViewOnScrollBehavior$1;->aME: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;->aMI:Lcom/google/android/material/behavior/HideBottomViewOnScrollBehavior;
+    iget-object p1, p0, Lcom/google/android/material/behavior/HideBottomViewOnScrollBehavior$1;->aME: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 4a533d36b1..a247ea7956 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 aMJ:I
+.field private aMF:I
 
-.field final synthetic aMK:Lcom/google/android/material/behavior/SwipeDismissBehavior;
+.field final synthetic aMG: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;->aMK:Lcom/google/android/material/behavior/SwipeDismissBehavior;
+    iput-object p1, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aMG: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;->aMK:Lcom/google/android/material/behavior/SwipeDismissBehavior;
+    iget-object v1, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aMG: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;->aMJ:I
+    iget p3, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aMF: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;->aMJ:I
+    iget p1, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aMF:I
 
     goto :goto_2
 
     :cond_1
-    iget p3, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aMJ:I
+    iget p3, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aMF: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;->aMK:Lcom/google/android/material/behavior/SwipeDismissBehavior;
+    iget-object v1, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aMG: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;->aMJ:I
+    iget p3, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aMF: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;->aMJ:I
+    iget p3, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aMF: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;->aMJ:I
+    iget p1, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aMF:I
 
     goto :goto_2
 
     :cond_4
-    iget p3, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aMJ:I
+    iget p3, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aMF: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;->aMJ:I
+    iget v0, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aMF: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;->aMJ:I
+    iput p2, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aMF: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;->aMK:Lcom/google/android/material/behavior/SwipeDismissBehavior;
+    iget-object v0, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aMG: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;->aMK:Lcom/google/android/material/behavior/SwipeDismissBehavior;
+    iget-object v0, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aMG: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;->aMJ:I
+    iget p3, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aMF: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;->aMK:Lcom/google/android/material/behavior/SwipeDismissBehavior;
+    iget-object p5, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aMG: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;->aMJ:I
+    iget p4, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aMF: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;->aMK:Lcom/google/android/material/behavior/SwipeDismissBehavior;
+    iget-object v0, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aMG: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;->aMK:Lcom/google/android/material/behavior/SwipeDismissBehavior;
+    iget-object v4, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aMG: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;->aMK:Lcom/google/android/material/behavior/SwipeDismissBehavior;
+    iget-object v4, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aMG: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;->aMK:Lcom/google/android/material/behavior/SwipeDismissBehavior;
+    iget-object v4, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aMG: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;->aMJ:I
+    iget v0, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aMF: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;->aMK:Lcom/google/android/material/behavior/SwipeDismissBehavior;
+    iget-object v3, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aMG: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;->aMJ:I
+    iget v0, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aMF: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;->aMJ:I
+    iget v0, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aMF:I
 
     :goto_4
-    iget-object p2, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aMK:Lcom/google/android/material/behavior/SwipeDismissBehavior;
+    iget-object p2, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aMG: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;->aMK:Lcom/google/android/material/behavior/SwipeDismissBehavior;
+    iget-object p3, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aMG: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;->aMK:Lcom/google/android/material/behavior/SwipeDismissBehavior;
+    iget-object p2, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aMG: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;->aMK:Lcom/google/android/material/behavior/SwipeDismissBehavior;
+    iget-object p2, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aMG: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;->aMK:Lcom/google/android/material/behavior/SwipeDismissBehavior;
+    iget-object p2, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aMG: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 10c0fe828f..8ee77c8e1d 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 aMK:Lcom/google/android/material/behavior/SwipeDismissBehavior;
+.field final synthetic aMG:Lcom/google/android/material/behavior/SwipeDismissBehavior;
 
-.field private final aML:Z
+.field private final aMH: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;->aMK:Lcom/google/android/material/behavior/SwipeDismissBehavior;
+    iput-object p1, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$a;->aMG: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;->aML:Z
+    iput-boolean p3, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$a;->aMH: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;->aMK:Lcom/google/android/material/behavior/SwipeDismissBehavior;
+    iget-object v0, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$a;->aMG: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;->aMK:Lcom/google/android/material/behavior/SwipeDismissBehavior;
+    iget-object v0, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$a;->aMG: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;->aML:Z
+    iget-boolean v0, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$a;->aMH:Z
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$a;->aMK:Lcom/google/android/material/behavior/SwipeDismissBehavior;
+    iget-object v0, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$a;->aMG: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;->aMK:Lcom/google/android/material/behavior/SwipeDismissBehavior;
+    iget-object v0, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$a;->aMG: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 21b0e58ccb..35002f5ddb 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 aMM:Lcom/google/android/material/bottomappbar/BottomAppBar;
+.field final synthetic aMI: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;->aMM:Lcom/google/android/material/bottomappbar/BottomAppBar;
+    iput-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$1;->aMI: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;->aMM:Lcom/google/android/material/bottomappbar/BottomAppBar;
+    iget-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$1;->aMI: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 3763cd16cf..551f5c1d99 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 aMM:Lcom/google/android/material/bottomappbar/BottomAppBar;
+.field final synthetic aMI: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;->aMM:Lcom/google/android/material/bottomappbar/BottomAppBar;
+    iput-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$2;->aMI: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;->aMM:Lcom/google/android/material/bottomappbar/BottomAppBar;
+    iget-object v0, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$2;->aMI: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;->aMM:Lcom/google/android/material/bottomappbar/BottomAppBar;
+    iget-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$2;->aMI: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 25b7252311..c28c8ada9d 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 aMM:Lcom/google/android/material/bottomappbar/BottomAppBar;
+.field final synthetic aMI: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;->aMM:Lcom/google/android/material/bottomappbar/BottomAppBar;
+    iput-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$3;->aMI: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;->aMM:Lcom/google/android/material/bottomappbar/BottomAppBar;
+    iget-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$3;->aMI: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 39d4871ab1..32261929eb 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 aMM:Lcom/google/android/material/bottomappbar/BottomAppBar;
+.field final synthetic aMI:Lcom/google/android/material/bottomappbar/BottomAppBar;
 
-.field final synthetic aMN:Landroidx/appcompat/widget/ActionMenuView;
+.field final synthetic aMJ:Landroidx/appcompat/widget/ActionMenuView;
 
-.field final synthetic aMO:I
+.field final synthetic aMK:I
 
-.field final synthetic aMP:Z
+.field final synthetic aML: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;->aMM:Lcom/google/android/material/bottomappbar/BottomAppBar;
+    iput-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$4;->aMI:Lcom/google/android/material/bottomappbar/BottomAppBar;
 
-    iput-object p2, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$4;->aMN:Landroidx/appcompat/widget/ActionMenuView;
+    iput-object p2, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$4;->aMJ:Landroidx/appcompat/widget/ActionMenuView;
 
-    iput p3, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$4;->aMO:I
+    iput p3, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$4;->aMK:I
 
-    iput-boolean p4, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$4;->aMP:Z
+    iput-boolean p4, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$4;->aML: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;->aMM:Lcom/google/android/material/bottomappbar/BottomAppBar;
+    iget-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$4;->aMI:Lcom/google/android/material/bottomappbar/BottomAppBar;
 
-    iget-object v0, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$4;->aMN:Landroidx/appcompat/widget/ActionMenuView;
+    iget-object v0, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$4;->aMJ:Landroidx/appcompat/widget/ActionMenuView;
 
-    iget v1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$4;->aMO:I
+    iget v1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$4;->aMK:I
 
-    iget-boolean v2, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$4;->aMP:Z
+    iget-boolean v2, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$4;->aML: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 9c70f0a1de..2cdd2caca1 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 aMM:Lcom/google/android/material/bottomappbar/BottomAppBar;
+.field final synthetic aMI: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;->aMM:Lcom/google/android/material/bottomappbar/BottomAppBar;
+    iput-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$5;->aMI: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;->aMM:Lcom/google/android/material/bottomappbar/BottomAppBar;
+    iget-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$5;->aMI: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 8a19664490..3710d46cf6 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 aMM:Lcom/google/android/material/bottomappbar/BottomAppBar;
+.field final synthetic aMI: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;->aMM:Lcom/google/android/material/bottomappbar/BottomAppBar;
+    iput-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$6;->aMI: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;->aMM:Lcom/google/android/material/bottomappbar/BottomAppBar;
+    iget-object v0, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$6;->aMI: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 25f02bc447..7e081ef3f1 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 aMM:Lcom/google/android/material/bottomappbar/BottomAppBar;
+.field final synthetic aMI: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;->aMM:Lcom/google/android/material/bottomappbar/BottomAppBar;
+    iput-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$7;->aMI: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;->aMM:Lcom/google/android/material/bottomappbar/BottomAppBar;
+    iget-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$7;->aMI: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;->aMM:Lcom/google/android/material/bottomappbar/BottomAppBar;
+    iget-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$7;->aMI: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;->aMM:Lcom/google/android/material/bottomappbar/BottomAppBar;
+    iget-object v1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$7;->aMI: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 7a38e1dba4..491af0494f 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 aMQ:Lcom/google/android/material/bottomnavigation/BottomNavigationMenuView;
+.field final synthetic aMM: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;->aMQ:Lcom/google/android/material/bottomnavigation/BottomNavigationMenuView;
+    iput-object p1, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationMenuView$1;->aMM: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;->aMQ:Lcom/google/android/material/bottomnavigation/BottomNavigationMenuView;
+    iget-object v0, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationMenuView$1;->aMM: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;->aMQ:Lcom/google/android/material/bottomnavigation/BottomNavigationMenuView;
+    iget-object v1, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationMenuView$1;->aMM: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 98c88b2f27..0276af83de 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 aMR:Lcom/google/android/material/bottomnavigation/BottomNavigationView;
+.field final synthetic aMN: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;->aMR:Lcom/google/android/material/bottomnavigation/BottomNavigationView;
+    iput-object p1, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationView$1;->aMN: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;->aMR:Lcom/google/android/material/bottomnavigation/BottomNavigationView;
+    iget-object p1, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationView$1;->aMN: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;->aMR:Lcom/google/android/material/bottomnavigation/BottomNavigationView;
+    iget-object v1, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationView$1;->aMN: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;->aMR:Lcom/google/android/material/bottomnavigation/BottomNavigationView;
+    iget-object p1, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationView$1;->aMN: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;->aMR:Lcom/google/android/material/bottomnavigation/BottomNavigationView;
+    iget-object p1, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationView$1;->aMN: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;->aMR:Lcom/google/android/material/bottomnavigation/BottomNavigationView;
+    iget-object p1, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationView$1;->aMN: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 dd701f3ebb..92e7811427 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 aMS:Landroid/os/Bundle;
+.field aMO:Landroid/os/Bundle;
 
 
 # direct methods
@@ -52,7 +52,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationView$SavedState;->aMS:Landroid/os/Bundle;
+    iput-object p1, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationView$SavedState;->aMO: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;->aMS:Landroid/os/Bundle;
+    iget-object p2, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationView$SavedState;->aMO: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 913893ae28..72dfe4a4bf 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;->aMS:Landroid/os/Bundle;
+    iget-object p1, p1, Lcom/google/android/material/bottomnavigation/BottomNavigationView$SavedState;->aMO: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;->aMS:Landroid/os/Bundle;
+    iput-object v0, v1, Lcom/google/android/material/bottomnavigation/BottomNavigationView$SavedState;->aMO: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;->aMS:Landroid/os/Bundle;
+    iget-object v2, v1, Lcom/google/android/material/bottomnavigation/BottomNavigationView$SavedState;->aMO: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 a3ef427658..9b5d033bd2 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 aMT:Landroid/view/View;
+.field final synthetic aMP:Landroid/view/View;
 
-.field final synthetic aMU:I
+.field final synthetic aMQ:I
 
-.field final synthetic aMV:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+.field final synthetic aMR: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;->aMV:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iput-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$1;->aMR:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 
-    iput-object p2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$1;->aMT:Landroid/view/View;
+    iput-object p2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$1;->aMP:Landroid/view/View;
 
-    iput p3, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$1;->aMU:I
+    iput p3, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$1;->aMQ: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;->aMV:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object v0, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$1;->aMR:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 
-    iget-object v1, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$1;->aMT:Landroid/view/View;
+    iget-object v1, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$1;->aMP:Landroid/view/View;
 
-    iget v2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$1;->aMU:I
+    iget v2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$1;->aMQ: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 1e620602a0..199e4d96e8 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 aMV:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+.field final synthetic aMR: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;->aMV:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iput-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMR: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;->aMV:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMR: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;->aMV:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p3, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMR: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;->aMV:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p3, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMR: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;->aMV:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p3, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMR: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;->aMV:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMR: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;->aMV:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMR: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;->aMV:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMR: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;->aMV:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMR: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;->aMV:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMR: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;->aMV:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMR: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;->aMV:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMR: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;->aMV:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p3, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMR: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;->aMV:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMR: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;->aMV:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object v5, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMR: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;->aMV:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object v5, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMR: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;->aMV:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object v6, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMR: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;->aMV:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMR: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;->aMV:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMR: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;->aMV:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p3, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMR: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;->aMV:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p3, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMR: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;->aMV:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object v0, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMR: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;->aMV:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMR: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;->aMV:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMR: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;->aMV:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p3, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMR: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;->aMV:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p3, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMR: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;->aMV:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMR: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;->aMV:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p3, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMR: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;->aMV:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object v0, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMR: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;->aMV:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMR: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;->aMV:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMR: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;->aMV:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMR: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;->aMV:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMR: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;->aMV:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p3, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMR: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;->aMV:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMR: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;->aMV:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object v0, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMR: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;->aMV:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object v0, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMR: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;->aMV:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object v0, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMR: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;->aMV:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object v0, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMR: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;->aMV:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMR: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;->aMV:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMR: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;->aMV:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMR: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 8faf7deb2c..365bdc5e62 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 aMV:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+.field final synthetic aMR:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 
-.field private final aMW:I
+.field private final aMS: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;->aMV:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iput-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$a;->aMR: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;->aMW:I
+    iput p3, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$a;->aMS: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;->aMV:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object v0, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$a;->aMR: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;->aMV:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object v0, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$a;->aMR: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;->aMV:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object v0, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$a;->aMR:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 
-    iget v1, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$a;->aMW:I
+    iget v1, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$a;->aMS: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 d79c52a149..4ba10358c5 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 aMX:Lcom/google/android/material/bottomsheet/BottomSheetDialog;
+.field final synthetic aMT: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;->aMX:Lcom/google/android/material/bottomsheet/BottomSheetDialog;
+    iput-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetDialog$1;->aMT: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;->aMX:Lcom/google/android/material/bottomsheet/BottomSheetDialog;
+    iget-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetDialog$1;->aMT: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;->aMX:Lcom/google/android/material/bottomsheet/BottomSheetDialog;
+    iget-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetDialog$1;->aMT: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;->aMX:Lcom/google/android/material/bottomsheet/BottomSheetDialog;
+    iget-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetDialog$1;->aMT: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;->aMX:Lcom/google/android/material/bottomsheet/BottomSheetDialog;
+    iget-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetDialog$1;->aMT: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 4353f1e21c..bba9968233 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 aMX:Lcom/google/android/material/bottomsheet/BottomSheetDialog;
+.field final synthetic aMT: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;->aMX:Lcom/google/android/material/bottomsheet/BottomSheetDialog;
+    iput-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetDialog$2;->aMT: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;->aMX:Lcom/google/android/material/bottomsheet/BottomSheetDialog;
+    iget-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetDialog$2;->aMT: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;->aMX:Lcom/google/android/material/bottomsheet/BottomSheetDialog;
+    iget-object v0, p0, Lcom/google/android/material/bottomsheet/BottomSheetDialog$2;->aMT: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;->aMX:Lcom/google/android/material/bottomsheet/BottomSheetDialog;
+    iget-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetDialog$2;->aMT: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 6bde2d23c2..9152737bcb 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 aMX:Lcom/google/android/material/bottomsheet/BottomSheetDialog;
+.field final synthetic aMT: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;->aMX:Lcom/google/android/material/bottomsheet/BottomSheetDialog;
+    iput-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetDialog$3;->aMT: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 31dbd02941..8ff22341d6 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 aMX:Lcom/google/android/material/bottomsheet/BottomSheetDialog;
+.field final synthetic aMT: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;->aMX:Lcom/google/android/material/bottomsheet/BottomSheetDialog;
+    iput-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetDialog$4;->aMT: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;->aMX:Lcom/google/android/material/bottomsheet/BottomSheetDialog;
+    iget-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetDialog$4;->aMT: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 42385c6d50..b7e74c183d 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;->aNa:I
+    iput v1, p2, Lcom/google/android/material/button/b;->aMW: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;->aNb:I
+    iput v1, p2, Lcom/google/android/material/button/b;->aMX: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;->aNc:I
+    iput v1, p2, Lcom/google/android/material/button/b;->aMY: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;->aNd:I
+    iput v1, p2, Lcom/google/android/material/button/b;->aMZ: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;->aMZ:Lcom/google/android/material/button/MaterialButton;
+    iget-object v1, p2, Lcom/google/android/material/button/b;->aMV: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;->aMZ:Lcom/google/android/material/button/MaterialButton;
+    iget-object v1, p2, Lcom/google/android/material/button/b;->aMV: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;->aNe:Landroid/content/res/ColorStateList;
+    iput-object v1, p2, Lcom/google/android/material/button/b;->aNa:Landroid/content/res/ColorStateList;
 
-    iget-object v1, p2, Lcom/google/android/material/button/b;->aMZ:Lcom/google/android/material/button/MaterialButton;
+    iget-object v1, p2, Lcom/google/android/material/button/b;->aMV: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;->aNf:Landroid/graphics/Paint;
+    iget-object v1, p2, Lcom/google/android/material/button/b;->aNb: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;->aNf:Landroid/graphics/Paint;
+    iget-object v1, p2, Lcom/google/android/material/button/b;->aNb: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;->aNf:Landroid/graphics/Paint;
+    iget-object v1, p2, Lcom/google/android/material/button/b;->aNb:Landroid/graphics/Paint;
 
-    iget-object v2, p2, Lcom/google/android/material/button/b;->aNe:Landroid/content/res/ColorStateList;
+    iget-object v2, p2, Lcom/google/android/material/button/b;->aNa:Landroid/content/res/ColorStateList;
 
     if-eqz v2, :cond_0
 
-    iget-object v2, p2, Lcom/google/android/material/button/b;->aNe:Landroid/content/res/ColorStateList;
+    iget-object v2, p2, Lcom/google/android/material/button/b;->aNa:Landroid/content/res/ColorStateList;
 
-    iget-object v3, p2, Lcom/google/android/material/button/b;->aMZ:Lcom/google/android/material/button/MaterialButton;
+    iget-object v3, p2, Lcom/google/android/material/button/b;->aMV: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;->aMZ:Lcom/google/android/material/button/MaterialButton;
+    iget-object v1, p2, Lcom/google/android/material/button/b;->aMV: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;->aMZ:Lcom/google/android/material/button/MaterialButton;
+    iget-object v2, p2, Lcom/google/android/material/button/b;->aMV: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;->aMZ:Lcom/google/android/material/button/MaterialButton;
+    iget-object v3, p2, Lcom/google/android/material/button/b;->aMV: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;->aMZ:Lcom/google/android/material/button/MaterialButton;
+    iget-object v4, p2, Lcom/google/android/material/button/b;->aMV: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;->aMZ:Lcom/google/android/material/button/MaterialButton;
+    iget-object v5, p2, Lcom/google/android/material/button/b;->aMV:Lcom/google/android/material/button/MaterialButton;
 
-    sget-boolean v7, Lcom/google/android/material/button/b;->aMY:Z
+    sget-boolean v7, Lcom/google/android/material/button/b;->aMU:Z
 
     if-eqz v7, :cond_1
 
-    invoke-virtual {p2}, Lcom/google/android/material/button/b;->zl()Landroid/graphics/drawable/Drawable;
+    invoke-virtual {p2}, Lcom/google/android/material/button/b;->zj()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;->aNg:Landroid/graphics/drawable/GradientDrawable;
+    iput-object v7, p2, Lcom/google/android/material/button/b;->aNc:Landroid/graphics/drawable/GradientDrawable;
 
-    iget-object v7, p2, Lcom/google/android/material/button/b;->aNg:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v7, p2, Lcom/google/android/material/button/b;->aNc: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;->aNg:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v7, p2, Lcom/google/android/material/button/b;->aNc: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;->aNg:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v7, p2, Lcom/google/android/material/button/b;->aNc: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;->aNh:Landroid/graphics/drawable/Drawable;
+    iput-object v7, p2, Lcom/google/android/material/button/b;->aNd:Landroid/graphics/drawable/Drawable;
 
-    iget-object v7, p2, Lcom/google/android/material/button/b;->aNh:Landroid/graphics/drawable/Drawable;
+    iget-object v7, p2, Lcom/google/android/material/button/b;->aNd: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;->aNh:Landroid/graphics/drawable/Drawable;
+    iget-object v7, p2, Lcom/google/android/material/button/b;->aNd: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;->aNi:Landroid/graphics/drawable/GradientDrawable;
+    iput-object v7, p2, Lcom/google/android/material/button/b;->aNe:Landroid/graphics/drawable/GradientDrawable;
 
-    iget-object v7, p2, Lcom/google/android/material/button/b;->aNi:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v7, p2, Lcom/google/android/material/button/b;->aNe: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;->aNi:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v7, p2, Lcom/google/android/material/button/b;->aNe: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;->aNi:Landroid/graphics/drawable/GradientDrawable;
+    iget-object p3, p2, Lcom/google/android/material/button/b;->aNe: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;->aNj:Landroid/graphics/drawable/Drawable;
+    iput-object p3, p2, Lcom/google/android/material/button/b;->aNf:Landroid/graphics/drawable/Drawable;
 
-    iget-object p3, p2, Lcom/google/android/material/button/b;->aNj:Landroid/graphics/drawable/Drawable;
+    iget-object p3, p2, Lcom/google/android/material/button/b;->aNf: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;->aNh:Landroid/graphics/drawable/Drawable;
+    iget-object v8, p2, Lcom/google/android/material/button/b;->aNd:Landroid/graphics/drawable/Drawable;
 
     aput-object v8, v7, v6
 
-    iget-object v6, p2, Lcom/google/android/material/button/b;->aNj:Landroid/graphics/drawable/Drawable;
+    iget-object v6, p2, Lcom/google/android/material/button/b;->aNf: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;->aMZ:Lcom/google/android/material/button/MaterialButton;
+    iget-object p3, p2, Lcom/google/android/material/button/b;->aMV:Lcom/google/android/material/button/MaterialButton;
 
-    iget v0, p2, Lcom/google/android/material/button/b;->aNa:I
+    iget v0, p2, Lcom/google/android/material/button/b;->aMW:I
 
     add-int/2addr v1, v0
 
-    iget v0, p2, Lcom/google/android/material/button/b;->aNc:I
+    iget v0, p2, Lcom/google/android/material/button/b;->aMY:I
 
     add-int/2addr v2, v0
 
-    iget v0, p2, Lcom/google/android/material/button/b;->aNb:I
+    iget v0, p2, Lcom/google/android/material/button/b;->aMX:I
 
     add-int/2addr v3, v0
 
-    iget p2, p2, Lcom/google/android/material/button/b;->aNd:I
+    iget p2, p2, Lcom/google/android/material/button/b;->aMZ: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;->aNn:Z
+    iget-boolean v0, v0, Lcom/google/android/material/button/b;->aNj: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;->aNe:Landroid/content/res/ColorStateList;
+    iget-object v0, v0, Lcom/google/android/material/button/b;->aNa: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;->aNe:Landroid/content/res/ColorStateList;
+    iget-object v1, v0, Lcom/google/android/material/button/b;->aNa: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;->eg:Landroid/graphics/Rect;
+    iget-object v1, v0, Lcom/google/android/material/button/b;->eh:Landroid/graphics/Rect;
 
-    iget-object v2, v0, Lcom/google/android/material/button/b;->aMZ:Lcom/google/android/material/button/MaterialButton;
+    iget-object v2, v0, Lcom/google/android/material/button/b;->aMV: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;->eg:Landroid/graphics/Rect;
+    iget-object v2, v0, Lcom/google/android/material/button/b;->eh: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;->aNa:I
+    iget v3, v0, Lcom/google/android/material/button/b;->aMW:I
 
     int-to-float v3, v3
 
     add-float/2addr v2, v3
 
-    iget-object v3, v0, Lcom/google/android/material/button/b;->eg:Landroid/graphics/Rect;
+    iget-object v3, v0, Lcom/google/android/material/button/b;->eh: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;->aNc:I
+    iget v5, v0, Lcom/google/android/material/button/b;->aMY:I
 
     int-to-float v5, v5
 
     add-float/2addr v3, v5
 
-    iget-object v5, v0, Lcom/google/android/material/button/b;->eg:Landroid/graphics/Rect;
+    iget-object v5, v0, Lcom/google/android/material/button/b;->eh: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;->aNb:I
+    iget v6, v0, Lcom/google/android/material/button/b;->aMX:I
 
     int-to-float v6, v6
 
     sub-float/2addr v5, v6
 
-    iget-object v6, v0, Lcom/google/android/material/button/b;->eg:Landroid/graphics/Rect;
+    iget-object v6, v0, Lcom/google/android/material/button/b;->eh: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;->aNd:I
+    iget v7, v0, Lcom/google/android/material/button/b;->aMZ: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;->aNf:Landroid/graphics/Paint;
+    iget-object v0, v0, Lcom/google/android/material/button/b;->aNb: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;->aNm:Landroid/graphics/drawable/GradientDrawable;
+    iget-object p2, p1, Lcom/google/android/material/button/b;->aNi:Landroid/graphics/drawable/GradientDrawable;
 
     if-eqz p2, :cond_0
 
-    iget-object p2, p1, Lcom/google/android/material/button/b;->aNm:Landroid/graphics/drawable/GradientDrawable;
+    iget-object p2, p1, Lcom/google/android/material/button/b;->aNi:Landroid/graphics/drawable/GradientDrawable;
 
-    iget p3, p1, Lcom/google/android/material/button/b;->aNa:I
+    iget p3, p1, Lcom/google/android/material/button/b;->aMW:I
 
-    iget v0, p1, Lcom/google/android/material/button/b;->aNc:I
+    iget v0, p1, Lcom/google/android/material/button/b;->aMY:I
 
-    iget v1, p1, Lcom/google/android/material/button/b;->aNb:I
+    iget v1, p1, Lcom/google/android/material/button/b;->aMX:I
 
     sub-int/2addr p4, v1
 
-    iget p1, p1, Lcom/google/android/material/button/b;->aNd:I
+    iget p1, p1, Lcom/google/android/material/button/b;->aMZ: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;->aMY:Z
+    sget-boolean v1, Lcom/google/android/material/button/b;->aMU:Z
 
     if-eqz v1, :cond_0
 
-    iget-object v1, v0, Lcom/google/android/material/button/b;->aNk:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v1, v0, Lcom/google/android/material/button/b;->aNg:Landroid/graphics/drawable/GradientDrawable;
 
     if-eqz v1, :cond_0
 
-    iget-object v0, v0, Lcom/google/android/material/button/b;->aNk: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
 
     return-void
 
     :cond_0
-    sget-boolean v1, Lcom/google/android/material/button/b;->aMY:Z
+    sget-boolean v1, Lcom/google/android/material/button/b;->aMU:Z
 
     if-nez v1, :cond_1
 
-    iget-object v1, v0, Lcom/google/android/material/button/b;->aNg:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v1, v0, Lcom/google/android/material/button/b;->aNc:Landroid/graphics/drawable/GradientDrawable;
 
     if-eqz v1, :cond_1
 
-    iget-object v0, v0, Lcom/google/android/material/button/b;->aNg:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v0, v0, Lcom/google/android/material/button/b;->aNc: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;->aNn:Z
+    iput-boolean v1, v0, Lcom/google/android/material/button/b;->aNj:Z
 
-    iget-object v1, v0, Lcom/google/android/material/button/b;->aMZ:Lcom/google/android/material/button/MaterialButton;
+    iget-object v1, v0, Lcom/google/android/material/button/b;->aMV: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;->aMZ:Lcom/google/android/material/button/MaterialButton;
+    iget-object v1, v0, Lcom/google/android/material/button/b;->aMV: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;->aMY:Z
+    sget-boolean v1, Lcom/google/android/material/button/b;->aMU:Z
 
     const v2, 0x3727c5ac    # 1.0E-5f
 
     if-eqz v1, :cond_3
 
-    iget-object v1, v0, Lcom/google/android/material/button/b;->aNk:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v1, v0, Lcom/google/android/material/button/b;->aNg:Landroid/graphics/drawable/GradientDrawable;
 
     if-eqz v1, :cond_3
 
-    iget-object v1, v0, Lcom/google/android/material/button/b;->aNl:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v1, v0, Lcom/google/android/material/button/b;->aNh:Landroid/graphics/drawable/GradientDrawable;
 
     if-eqz v1, :cond_3
 
-    iget-object v1, v0, Lcom/google/android/material/button/b;->aNm:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v1, v0, Lcom/google/android/material/button/b;->aNi: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;->aMY:Z
+    sget-boolean v1, Lcom/google/android/material/button/b;->aMU:Z
 
     const/4 v3, 0x0
 
@@ -1281,7 +1281,7 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, v0, Lcom/google/android/material/button/b;->aMZ:Lcom/google/android/material/button/MaterialButton;
+    iget-object v1, v0, Lcom/google/android/material/button/b;->aMV: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;->aMZ:Lcom/google/android/material/button/MaterialButton;
+    iget-object v1, v0, Lcom/google/android/material/button/b;->aMV: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;->aMY:Z
+    sget-boolean v1, Lcom/google/android/material/button/b;->aMU:Z
 
     if-eqz v1, :cond_1
 
-    iget-object v1, v0, Lcom/google/android/material/button/b;->aMZ:Lcom/google/android/material/button/MaterialButton;
+    iget-object v1, v0, Lcom/google/android/material/button/b;->aMV: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;->aMZ:Lcom/google/android/material/button/MaterialButton;
+    iget-object v1, v0, Lcom/google/android/material/button/b;->aMV: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;->aNk:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v1, v0, Lcom/google/android/material/button/b;->aNg: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;->aNl:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v1, v0, Lcom/google/android/material/button/b;->aNh: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;->aNm:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v0, v0, Lcom/google/android/material/button/b;->aNi: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;->aMY:Z
+    sget-boolean v1, Lcom/google/android/material/button/b;->aMU:Z
 
     if-nez v1, :cond_4
 
-    iget-object v1, v0, Lcom/google/android/material/button/b;->aNg:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v1, v0, Lcom/google/android/material/button/b;->aNc:Landroid/graphics/drawable/GradientDrawable;
 
     if-eqz v1, :cond_4
 
-    iget-object v1, v0, Lcom/google/android/material/button/b;->aNi:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v1, v0, Lcom/google/android/material/button/b;->aNe:Landroid/graphics/drawable/GradientDrawable;
 
     if-eqz v1, :cond_4
 
-    iget-object v1, v0, Lcom/google/android/material/button/b;->aNg:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v1, v0, Lcom/google/android/material/button/b;->aNc: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;->aNi:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v1, v0, Lcom/google/android/material/button/b;->aNe: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;->aMZ:Lcom/google/android/material/button/MaterialButton;
+    iget-object p1, v0, Lcom/google/android/material/button/b;->aMV: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;->aMY:Z
+    sget-boolean v1, Lcom/google/android/material/button/b;->aMU:Z
 
     if-eqz v1, :cond_0
 
-    iget-object v1, v0, Lcom/google/android/material/button/b;->aMZ:Lcom/google/android/material/button/MaterialButton;
+    iget-object v1, v0, Lcom/google/android/material/button/b;->aMV: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;->aMZ:Lcom/google/android/material/button/MaterialButton;
+    iget-object v0, v0, Lcom/google/android/material/button/b;->aMV: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;->aMY:Z
+    sget-boolean v1, Lcom/google/android/material/button/b;->aMU:Z
 
     if-nez v1, :cond_1
 
-    iget-object v1, v0, Lcom/google/android/material/button/b;->aNj:Landroid/graphics/drawable/Drawable;
+    iget-object v1, v0, Lcom/google/android/material/button/b;->aNf:Landroid/graphics/drawable/Drawable;
 
     if-eqz v1, :cond_1
 
-    iget-object v0, v0, Lcom/google/android/material/button/b;->aNj:Landroid/graphics/drawable/Drawable;
+    iget-object v0, v0, Lcom/google/android/material/button/b;->aNf: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;->aNe:Landroid/content/res/ColorStateList;
+    iget-object v1, v0, Lcom/google/android/material/button/b;->aNa:Landroid/content/res/ColorStateList;
 
     if-eq v1, p1, :cond_1
 
-    iput-object p1, v0, Lcom/google/android/material/button/b;->aNe:Landroid/content/res/ColorStateList;
+    iput-object p1, v0, Lcom/google/android/material/button/b;->aNa:Landroid/content/res/ColorStateList;
 
-    iget-object v1, v0, Lcom/google/android/material/button/b;->aNf:Landroid/graphics/Paint;
+    iget-object v1, v0, Lcom/google/android/material/button/b;->aNb:Landroid/graphics/Paint;
 
     const/4 v2, 0x0
 
     if-eqz p1, :cond_0
 
-    iget-object v3, v0, Lcom/google/android/material/button/b;->aMZ:Lcom/google/android/material/button/MaterialButton;
+    iget-object v3, v0, Lcom/google/android/material/button/b;->aMV: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;->zm()V
+    invoke-virtual {v0}, Lcom/google/android/material/button/b;->zk()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;->aNf:Landroid/graphics/Paint;
+    iget-object v1, v0, Lcom/google/android/material/button/b;->aNb: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;->zm()V
+    invoke-virtual {v0}, Lcom/google/android/material/button/b;->zk()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;->aMY:Z
+    sget-boolean p1, Lcom/google/android/material/button/b;->aMU:Z
 
     if-eqz p1, :cond_0
 
-    invoke-virtual {v0}, Lcom/google/android/material/button/b;->zk()V
+    invoke-virtual {v0}, Lcom/google/android/material/button/b;->zi()V
 
     return-void
 
     :cond_0
-    iget-object p1, v0, Lcom/google/android/material/button/b;->aNh:Landroid/graphics/drawable/Drawable;
+    iget-object p1, v0, Lcom/google/android/material/button/b;->aNd:Landroid/graphics/drawable/Drawable;
 
     if-eqz p1, :cond_1
 
-    iget-object p1, v0, Lcom/google/android/material/button/b;->aNh:Landroid/graphics/drawable/Drawable;
+    iget-object p1, v0, Lcom/google/android/material/button/b;->aNd: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;->aMY:Z
+    sget-boolean p1, Lcom/google/android/material/button/b;->aMU:Z
 
     if-eqz p1, :cond_0
 
-    invoke-virtual {v0}, Lcom/google/android/material/button/b;->zk()V
+    invoke-virtual {v0}, Lcom/google/android/material/button/b;->zi()V
 
     return-void
 
     :cond_0
-    iget-object p1, v0, Lcom/google/android/material/button/b;->aNh:Landroid/graphics/drawable/Drawable;
+    iget-object p1, v0, Lcom/google/android/material/button/b;->aNd: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;->aNh:Landroid/graphics/drawable/Drawable;
+    iget-object p1, v0, Lcom/google/android/material/button/b;->aNd: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 0575b1a229..300f62b191 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 aMY:Z
+.field static final aMU:Z
 
 
 # instance fields
-.field final aMZ:Lcom/google/android/material/button/MaterialButton;
+.field final aMV:Lcom/google/android/material/button/MaterialButton;
 
-.field aNa:I
+.field aMW:I
 
-.field aNb:I
+.field aMX:I
 
-.field aNc:I
+.field aMY:I
 
-.field aNd:I
+.field aMZ:I
 
-.field aNe:Landroid/content/res/ColorStateList;
+.field aNa:Landroid/content/res/ColorStateList;
 
-.field final aNf:Landroid/graphics/Paint;
+.field final aNb:Landroid/graphics/Paint;
+
+.field aNc:Landroid/graphics/drawable/GradientDrawable;
+
+.field aNd:Landroid/graphics/drawable/Drawable;
+
+.field aNe:Landroid/graphics/drawable/GradientDrawable;
+
+.field aNf:Landroid/graphics/drawable/Drawable;
 
 .field aNg:Landroid/graphics/drawable/GradientDrawable;
 
-.field aNh:Landroid/graphics/drawable/Drawable;
+.field aNh:Landroid/graphics/drawable/GradientDrawable;
 
 .field aNi:Landroid/graphics/drawable/GradientDrawable;
 
-.field aNj:Landroid/graphics/drawable/Drawable;
-
-.field aNk:Landroid/graphics/drawable/GradientDrawable;
-
-.field aNl:Landroid/graphics/drawable/GradientDrawable;
-
-.field aNm:Landroid/graphics/drawable/GradientDrawable;
-
-.field aNn:Z
+.field aNj:Z
 
 .field backgroundTint:Landroid/content/res/ColorStateList;
 
@@ -44,7 +44,7 @@
 
 .field cornerRadius:I
 
-.field final eg:Landroid/graphics/Rect;
+.field final eh: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;->aMY:Z
+    sput-boolean v0, Lcom/google/android/material/button/b;->aMU: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;->aNf:Landroid/graphics/Paint;
+    iput-object v0, p0, Lcom/google/android/material/button/b;->aNb: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;->eg:Landroid/graphics/Rect;
+    iput-object v0, p0, Lcom/google/android/material/button/b;->eh: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;->aNn:Z
+    iput-boolean v0, p0, Lcom/google/android/material/button/b;->aNj:Z
 
-    iput-object p1, p0, Lcom/google/android/material/button/b;->aMZ:Lcom/google/android/material/button/MaterialButton;
+    iput-object p1, p0, Lcom/google/android/material/button/b;->aMV: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;->aNa:I
+    iget v2, p0, Lcom/google/android/material/button/b;->aMW:I
 
-    iget v3, p0, Lcom/google/android/material/button/b;->aNc:I
+    iget v3, p0, Lcom/google/android/material/button/b;->aMY:I
 
-    iget v4, p0, Lcom/google/android/material/button/b;->aNb:I
+    iget v4, p0, Lcom/google/android/material/button/b;->aMX:I
 
-    iget v5, p0, Lcom/google/android/material/button/b;->aNd:I
+    iget v5, p0, Lcom/google/android/material/button/b;->aMZ:I
 
     move-object v0, v6
 
@@ -134,10 +134,10 @@
     return-object v6
 .end method
 
-.method final zk()V
+.method final zi()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/material/button/b;->aNk:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v0, p0, Lcom/google/android/material/button/b;->aNg: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;->aNk:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v1, p0, Lcom/google/android/material/button/b;->aNg: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 zl()Landroid/graphics/drawable/Drawable;
+.method final zj()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;->aNk:Landroid/graphics/drawable/GradientDrawable;
+    iput-object v0, p0, Lcom/google/android/material/button/b;->aNg:Landroid/graphics/drawable/GradientDrawable;
 
-    iget-object v0, p0, Lcom/google/android/material/button/b;->aNk:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v0, p0, Lcom/google/android/material/button/b;->aNg: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;->aNk:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v0, p0, Lcom/google/android/material/button/b;->aNg: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;->zk()V
+    invoke-virtual {p0}, Lcom/google/android/material/button/b;->zi()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;->aNl:Landroid/graphics/drawable/GradientDrawable;
+    iput-object v0, p0, Lcom/google/android/material/button/b;->aNh:Landroid/graphics/drawable/GradientDrawable;
 
-    iget-object v0, p0, Lcom/google/android/material/button/b;->aNl:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v0, p0, Lcom/google/android/material/button/b;->aNh: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;->aNl:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v0, p0, Lcom/google/android/material/button/b;->aNh: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;->aNl:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v0, p0, Lcom/google/android/material/button/b;->aNh: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;->aNe:Landroid/content/res/ColorStateList;
+    iget-object v5, p0, Lcom/google/android/material/button/b;->aNa: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;->aNk:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v5, p0, Lcom/google/android/material/button/b;->aNg:Landroid/graphics/drawable/GradientDrawable;
 
     aput-object v5, v4, v3
 
-    iget-object v3, p0, Lcom/google/android/material/button/b;->aNl:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v3, p0, Lcom/google/android/material/button/b;->aNh: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;->aNm:Landroid/graphics/drawable/GradientDrawable;
+    iput-object v3, p0, Lcom/google/android/material/button/b;->aNi:Landroid/graphics/drawable/GradientDrawable;
 
-    iget-object v3, p0, Lcom/google/android/material/button/b;->aNm:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v3, p0, Lcom/google/android/material/button/b;->aNi: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;->aNm:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v2, p0, Lcom/google/android/material/button/b;->aNi: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;->aNm:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v3, p0, Lcom/google/android/material/button/b;->aNi: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 zm()V
+.method final zk()V
     .locals 2
 
-    sget-boolean v0, Lcom/google/android/material/button/b;->aMY:Z
+    sget-boolean v0, Lcom/google/android/material/button/b;->aMU:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/button/b;->aNl:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v0, p0, Lcom/google/android/material/button/b;->aNh:Landroid/graphics/drawable/GradientDrawable;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/button/b;->aMZ:Lcom/google/android/material/button/MaterialButton;
+    iget-object v0, p0, Lcom/google/android/material/button/b;->aMV:Lcom/google/android/material/button/MaterialButton;
 
-    invoke-virtual {p0}, Lcom/google/android/material/button/b;->zl()Landroid/graphics/drawable/Drawable;
+    invoke-virtual {p0}, Lcom/google/android/material/button/b;->zj()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;->aMY:Z
+    sget-boolean v0, Lcom/google/android/material/button/b;->aMU:Z
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/material/button/b;->aMZ:Lcom/google/android/material/button/MaterialButton;
+    iget-object v0, p0, Lcom/google/android/material/button/b;->aMV: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 8c96115fe9..ef3bd5f1b1 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;->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 {p2}, Lcom/google/android/material/card/a;->zm()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;->zn()V
+    invoke-virtual {p1}, Lcom/google/android/material/card/a;->zl()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;->zn()V
+    invoke-virtual {v0}, Lcom/google/android/material/card/a;->zl()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;->zn()V
+    invoke-virtual {v0}, Lcom/google/android/material/card/a;->zl()V
 
-    invoke-virtual {v0}, Lcom/google/android/material/card/a;->zo()V
+    invoke-virtual {v0}, Lcom/google/android/material/card/a;->zm()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 b5570953ba..d12b84e8cc 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 aNo:Lcom/google/android/material/card/MaterialCardView;
+.field private final aNk: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;->aNo:Lcom/google/android/material/card/MaterialCardView;
+    iput-object p1, p0, Lcom/google/android/material/card/a;->aNk: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;->aNo:Lcom/google/android/material/card/MaterialCardView;
+    iget-object v1, p0, Lcom/google/android/material/card/a;->aNk: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 zn()V
+.method final zl()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/material/card/a;->aNo:Lcom/google/android/material/card/MaterialCardView;
+    iget-object v0, p0, Lcom/google/android/material/card/a;->aNk: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 zo()V
+.method final zm()V
     .locals 5
 
-    iget-object v0, p0, Lcom/google/android/material/card/a;->aNo:Lcom/google/android/material/card/MaterialCardView;
+    iget-object v0, p0, Lcom/google/android/material/card/a;->aNk: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;->aNo:Lcom/google/android/material/card/MaterialCardView;
+    iget-object v1, p0, Lcom/google/android/material/card/a;->aNk: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;->aNo:Lcom/google/android/material/card/MaterialCardView;
+    iget-object v2, p0, Lcom/google/android/material/card/a;->aNk: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;->aNo:Lcom/google/android/material/card/MaterialCardView;
+    iget-object v3, p0, Lcom/google/android/material/card/a;->aNk: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;->aNo:Lcom/google/android/material/card/MaterialCardView;
+    iget-object v4, p0, Lcom/google/android/material/card/a;->aNk: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 cff1c74f2f..eaa0bdbb5e 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 aNp:Lcom/google/android/material/chip/Chip;
+.field final synthetic aNl: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;->aNp:Lcom/google/android/material/chip/Chip;
+    iput-object p1, p0, Lcom/google/android/material/chip/Chip$1;->aNl: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;->aNp:Lcom/google/android/material/chip/Chip;
+    iget-object p1, p0, Lcom/google/android/material/chip/Chip$1;->aNl: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;->aNp:Lcom/google/android/material/chip/Chip;
+    iget-object p1, p0, Lcom/google/android/material/chip/Chip$1;->aNl: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;->aNp:Lcom/google/android/material/chip/Chip;
+    iget-object p1, p0, Lcom/google/android/material/chip/Chip$1;->aNl: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 69522c50c6..d12e536419 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 aNp:Lcom/google/android/material/chip/Chip;
+.field final synthetic aNl: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;->aNp:Lcom/google/android/material/chip/Chip;
+    iput-object p1, p0, Lcom/google/android/material/chip/Chip$2;->aNl: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;->aNp:Lcom/google/android/material/chip/Chip;
+    iget-object p1, p0, Lcom/google/android/material/chip/Chip$2;->aNl: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;->aNp:Lcom/google/android/material/chip/Chip;
+    iget-object p1, p0, Lcom/google/android/material/chip/Chip$2;->aNl: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 84d8d4ed2c..0e65a63f23 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 aNp:Lcom/google/android/material/chip/Chip;
+.field final synthetic aNl: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;->aNp:Lcom/google/android/material/chip/Chip;
+    iput-object p1, p0, Lcom/google/android/material/chip/Chip$a;->aNl: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;->aNp:Lcom/google/android/material/chip/Chip;
+    iget-object v0, p0, Lcom/google/android/material/chip/Chip$a;->aNl: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;->aNp:Lcom/google/android/material/chip/Chip;
+    iget-object v0, p0, Lcom/google/android/material/chip/Chip$a;->aNl: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;->aNp:Lcom/google/android/material/chip/Chip;
+    iget-object v0, p0, Lcom/google/android/material/chip/Chip$a;->aNl: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;->aNp:Lcom/google/android/material/chip/Chip;
+    iget-object p1, p0, Lcom/google/android/material/chip/Chip$a;->aNl: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;->aNp:Lcom/google/android/material/chip/Chip;
+    iget-object v0, p0, Lcom/google/android/material/chip/Chip$a;->aNl: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;->aNp:Lcom/google/android/material/chip/Chip;
+    iget-object v0, p0, Lcom/google/android/material/chip/Chip$a;->aNl: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;->aNp:Lcom/google/android/material/chip/Chip;
+    iget-object v0, p0, Lcom/google/android/material/chip/Chip$a;->aNl: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;->aNp:Lcom/google/android/material/chip/Chip;
+    iget-object p1, p0, Lcom/google/android/material/chip/Chip$a;->aNl: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;->aNp:Lcom/google/android/material/chip/Chip;
+    iget-object p1, p0, Lcom/google/android/material/chip/Chip$a;->aNl: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;->aNp:Lcom/google/android/material/chip/Chip;
+    iget-object p1, p0, Lcom/google/android/material/chip/Chip$a;->aNl: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;->aNp:Lcom/google/android/material/chip/Chip;
+    iget-object v1, p0, Lcom/google/android/material/chip/Chip$a;->aNl: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;->aNp:Lcom/google/android/material/chip/Chip;
+    iget-object p1, p0, Lcom/google/android/material/chip/Chip$a;->aNl: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;->aNp:Lcom/google/android/material/chip/Chip;
+    iget-object p1, p0, Lcom/google/android/material/chip/Chip$a;->aNl: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 ac88f9ce0a..1c2c2ab680 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 aNq:Lcom/google/android/material/chip/ChipDrawable;
+.field final synthetic aNm: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;->aNq:Lcom/google/android/material/chip/ChipDrawable;
+    iput-object p1, p0, Lcom/google/android/material/chip/ChipDrawable$1;->aNm: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;->aNq:Lcom/google/android/material/chip/ChipDrawable;
+    iget-object p1, p0, Lcom/google/android/material/chip/ChipDrawable$1;->aNm: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;->aNq:Lcom/google/android/material/chip/ChipDrawable;
+    iget-object p1, p0, Lcom/google/android/material/chip/ChipDrawable$1;->aNm: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;->aNq:Lcom/google/android/material/chip/ChipDrawable;
+    iget-object p1, p0, Lcom/google/android/material/chip/ChipDrawable$1;->aNm: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 fbbea8c5ec..d13168ad08 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 aNr:Lcom/google/android/material/chip/ChipGroup;
+.field final synthetic aNn: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;->aNr:Lcom/google/android/material/chip/ChipGroup;
+    iput-object p1, p0, Lcom/google/android/material/chip/ChipGroup$a;->aNn: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;->aNr:Lcom/google/android/material/chip/ChipGroup;
+    iget-object v0, p0, Lcom/google/android/material/chip/ChipGroup$a;->aNn: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;->aNr:Lcom/google/android/material/chip/ChipGroup;
+    iget-object p2, p0, Lcom/google/android/material/chip/ChipGroup$a;->aNn: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;->aNr:Lcom/google/android/material/chip/ChipGroup;
+    iget-object p2, p0, Lcom/google/android/material/chip/ChipGroup$a;->aNn: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;->aNr:Lcom/google/android/material/chip/ChipGroup;
+    iget-object p2, p0, Lcom/google/android/material/chip/ChipGroup$a;->aNn: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;->aNr:Lcom/google/android/material/chip/ChipGroup;
+    iget-object p2, p0, Lcom/google/android/material/chip/ChipGroup$a;->aNn: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;->aNr:Lcom/google/android/material/chip/ChipGroup;
+    iget-object p2, p0, Lcom/google/android/material/chip/ChipGroup$a;->aNn: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;->aNr:Lcom/google/android/material/chip/ChipGroup;
+    iget-object p2, p0, Lcom/google/android/material/chip/ChipGroup$a;->aNn: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;->aNr:Lcom/google/android/material/chip/ChipGroup;
+    iget-object p1, p0, Lcom/google/android/material/chip/ChipGroup$a;->aNn: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 deef5ccf91..0f408f41ec 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 aNr:Lcom/google/android/material/chip/ChipGroup;
+.field final synthetic aNn:Lcom/google/android/material/chip/ChipGroup;
 
-.field private aNs:Landroid/view/ViewGroup$OnHierarchyChangeListener;
+.field private aNo: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;->aNr:Lcom/google/android/material/chip/ChipGroup;
+    iput-object p1, p0, Lcom/google/android/material/chip/ChipGroup$b;->aNn: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;->aNs:Landroid/view/ViewGroup$OnHierarchyChangeListener;
+    iput-object p1, p0, Lcom/google/android/material/chip/ChipGroup$b;->aNo: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;->aNr:Lcom/google/android/material/chip/ChipGroup;
+    iget-object v0, p0, Lcom/google/android/material/chip/ChipGroup$b;->aNn: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;->aNr:Lcom/google/android/material/chip/ChipGroup;
+    iget-object v1, p0, Lcom/google/android/material/chip/ChipGroup$b;->aNn: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;->aNs:Landroid/view/ViewGroup$OnHierarchyChangeListener;
+    iget-object v0, p0, Lcom/google/android/material/chip/ChipGroup$b;->aNo: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;->aNr:Lcom/google/android/material/chip/ChipGroup;
+    iget-object v0, p0, Lcom/google/android/material/chip/ChipGroup$b;->aNn: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;->aNs:Landroid/view/ViewGroup$OnHierarchyChangeListener;
+    iget-object v0, p0, Lcom/google/android/material/chip/ChipGroup$b;->aNo: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 4b20df5ec6..79e08c6392 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 aNt:Lcom/google/android/material/circularreveal/CircularRevealWidget;
+.field final synthetic aNp: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;->aNt:Lcom/google/android/material/circularreveal/CircularRevealWidget;
+    iput-object p1, p0, Lcom/google/android/material/circularreveal/CircularRevealCompat$1;->aNp: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;->aNt:Lcom/google/android/material/circularreveal/CircularRevealWidget;
+    iget-object p1, p0, Lcom/google/android/material/circularreveal/CircularRevealCompat$1;->aNp: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;->aNt:Lcom/google/android/material/circularreveal/CircularRevealWidget;
+    iget-object p1, p0, Lcom/google/android/material/circularreveal/CircularRevealCompat$1;->aNp: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 8fd4978651..2a29a82693 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 aNu:Lcom/google/android/material/floatingactionbutton/FloatingActionButton$OnVisibilityChangedListener;
+.field final synthetic aNq:Lcom/google/android/material/floatingactionbutton/FloatingActionButton$OnVisibilityChangedListener;
 
-.field final synthetic aNv:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
+.field final synthetic aNr: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;->aNv:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
+    iput-object p1, p0, Lcom/google/android/material/floatingactionbutton/FloatingActionButton$1;->aNr:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
 
-    iput-object p2, p0, Lcom/google/android/material/floatingactionbutton/FloatingActionButton$1;->aNu:Lcom/google/android/material/floatingactionbutton/FloatingActionButton$OnVisibilityChangedListener;
+    iput-object p2, p0, Lcom/google/android/material/floatingactionbutton/FloatingActionButton$1;->aNq:Lcom/google/android/material/floatingactionbutton/FloatingActionButton$OnVisibilityChangedListener;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -38,24 +38,24 @@
 
 
 # virtual methods
-.method public final zp()V
+.method public final zn()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/FloatingActionButton$1;->aNu:Lcom/google/android/material/floatingactionbutton/FloatingActionButton$OnVisibilityChangedListener;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/FloatingActionButton$1;->aNq:Lcom/google/android/material/floatingactionbutton/FloatingActionButton$OnVisibilityChangedListener;
 
-    iget-object v1, p0, Lcom/google/android/material/floatingactionbutton/FloatingActionButton$1;->aNv:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
+    iget-object v1, p0, Lcom/google/android/material/floatingactionbutton/FloatingActionButton$1;->aNr: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 zq()V
+.method public final zo()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/FloatingActionButton$1;->aNu:Lcom/google/android/material/floatingactionbutton/FloatingActionButton$OnVisibilityChangedListener;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/FloatingActionButton$1;->aNq:Lcom/google/android/material/floatingactionbutton/FloatingActionButton$OnVisibilityChangedListener;
 
-    iget-object v1, p0, Lcom/google/android/material/floatingactionbutton/FloatingActionButton$1;->aNv:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
+    iget-object v1, p0, Lcom/google/android/material/floatingactionbutton/FloatingActionButton$1;->aNr: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 8566ddbdd3..3f219d279c 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 aNv:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
+.field final synthetic aNr: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;->aNv:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
+    iput-object p1, p0, Lcom/google/android/material/floatingactionbutton/FloatingActionButton$a;->aNr: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;->aNv:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/FloatingActionButton$a;->aNr: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;->aNv:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/FloatingActionButton$a;->aNr: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;->aNv:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/FloatingActionButton$a;->aNr: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;->aNv:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/FloatingActionButton$a;->aNr: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;->aNv:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/FloatingActionButton$a;->aNr: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;->aNv:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
+    iget-object v1, p0, Lcom/google/android/material/floatingactionbutton/FloatingActionButton$a;->aNr: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;->aNv:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
+    iget-object v1, p0, Lcom/google/android/material/floatingactionbutton/FloatingActionButton$a;->aNr: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;->aNv:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
+    iget-object v1, p0, Lcom/google/android/material/floatingactionbutton/FloatingActionButton$a;->aNr: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 720410739e..d8a44b81a7 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;->zr()V
+    invoke-virtual {p2}, Lcom/google/android/material/floatingactionbutton/a;->zp()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;->aNL:Ljava/util/ArrayList;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNH: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;->aNL:Ljava/util/ArrayList;
+    iput-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNH:Ljava/util/ArrayList;
 
     :cond_0
-    iget-object v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aNL:Ljava/util/ArrayList;
+    iget-object v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aNH: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;->aNK:Ljava/util/ArrayList;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNG: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;->aNK:Ljava/util/ArrayList;
+    iput-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNG:Ljava/util/ArrayList;
 
     :cond_0
-    iget-object v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aNK:Ljava/util/ArrayList;
+    iget-object v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aNG: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;->aNH:F
+    iget v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aND:F
 
     return v0
 .end method
@@ -740,7 +740,7 @@
 
     move-result-object v0
 
-    iget v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aNI:F
+    iget v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aNE:F
 
     return v0
 .end method
@@ -752,7 +752,7 @@
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aNG:Landroid/graphics/drawable/Drawable;
+    iget-object v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aNC: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;->aNy:Landroid/animation/Animator;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNu:Landroid/animation/Animator;
 
     if-eqz v1, :cond_0
 
-    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNy:Landroid/animation/Animator;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNu:Landroid/animation/Animator;
 
     invoke-virtual {v1}, Landroid/animation/Animator;->cancel()V
 
     :cond_0
-    invoke-virtual {v0}, Lcom/google/android/material/floatingactionbutton/a;->zz()Z
+    invoke-virtual {v0}, Lcom/google/android/material/floatingactionbutton/a;->zx()Z
 
     move-result v1
 
@@ -1008,11 +1008,11 @@
     goto :goto_0
 
     :cond_1
-    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNA:Lcom/google/android/material/animation/MotionSpec;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNw:Lcom/google/android/material/animation/MotionSpec;
 
     if-nez v1, :cond_2
 
-    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNN: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;->aNA:Lcom/google/android/material/animation/MotionSpec;
+    iput-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNw:Lcom/google/android/material/animation/MotionSpec;
 
     :cond_2
-    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNA:Lcom/google/android/material/animation/MotionSpec;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNw: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;->aNL:Ljava/util/ArrayList;
+    iget-object p1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNH:Ljava/util/ArrayList;
 
     if-eqz p1, :cond_3
 
-    iget-object p1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNL:Ljava/util/ArrayList;
+    iget-object p1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNH: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;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aNN: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;->zq()V
+    invoke-interface {p1}, Lcom/google/android/material/floatingactionbutton/a$d;->zo()V
 
     :cond_6
     return-void
@@ -1146,7 +1146,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/material/floatingactionbutton/a;->zs()V
+    invoke-virtual {v0}, Lcom/google/android/material/floatingactionbutton/a;->zq()V
 
     return-void
 .end method
@@ -1160,13 +1160,13 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/material/floatingactionbutton/a;->zv()Z
+    invoke-virtual {v0}, Lcom/google/android/material/floatingactionbutton/a;->zt()Z
 
     move-result v1
 
     if-eqz v1, :cond_1
 
-    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNU:Landroid/view/ViewTreeObserver$OnPreDrawListener;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNQ: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;->aNU:Landroid/view/ViewTreeObserver$OnPreDrawListener;
+    iput-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNQ:Landroid/view/ViewTreeObserver$OnPreDrawListener;
 
     :cond_0
-    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNN: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;->aNU:Landroid/view/ViewTreeObserver$OnPreDrawListener;
+    iget-object v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aNQ: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;->aNU:Landroid/view/ViewTreeObserver$OnPreDrawListener;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNQ:Landroid/view/ViewTreeObserver$OnPreDrawListener;
 
     if-eqz v1, :cond_0
 
-    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNN: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;->aNU:Landroid/view/ViewTreeObserver$OnPreDrawListener;
+    iget-object v2, v0, Lcom/google/android/material/floatingactionbutton/a;->aNQ: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;->aNU:Landroid/view/ViewTreeObserver$OnPreDrawListener;
+    iput-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNQ: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;->zu()V
+    invoke-virtual {v1}, Lcom/google/android/material/floatingactionbutton/a;->zs()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;->aNL:Ljava/util/ArrayList;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNH:Ljava/util/ArrayList;
 
     if-eqz v1, :cond_0
 
-    iget-object v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aNL:Ljava/util/ArrayList;
+    iget-object v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aNH: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;->aNK:Ljava/util/ArrayList;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNG:Ljava/util/ArrayList;
 
     if-eqz v1, :cond_0
 
-    iget-object v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aNK:Ljava/util/ArrayList;
+    iget-object v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aNG: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;->aND:Landroid/graphics/drawable/Drawable;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNz:Landroid/graphics/drawable/Drawable;
 
     if-eqz v1, :cond_0
 
-    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aND:Landroid/graphics/drawable/Drawable;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNz: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;->aNF:Lcom/google/android/material/internal/CircularBorderDrawable;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNB:Lcom/google/android/material/internal/CircularBorderDrawable;
 
     if-eqz v1, :cond_1
 
-    iget-object v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aNF:Lcom/google/android/material/internal/CircularBorderDrawable;
+    iget-object v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aNB: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;->aND:Landroid/graphics/drawable/Drawable;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNz:Landroid/graphics/drawable/Drawable;
 
     if-eqz v1, :cond_0
 
-    iget-object v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aND:Landroid/graphics/drawable/Drawable;
+    iget-object v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aNz: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;->zr()V
+    invoke-virtual {p1}, Lcom/google/android/material/floatingactionbutton/a;->zp()V
 
     return-void
 .end method
@@ -1845,7 +1845,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/material/floatingactionbutton/a;->zt()V
+    invoke-virtual {p1}, Lcom/google/android/material/floatingactionbutton/a;->zr()V
 
     :cond_0
     return-void
@@ -1888,16 +1888,16 @@
 
     if-nez v1, :cond_6
 
-    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNy:Landroid/animation/Animator;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNu:Landroid/animation/Animator;
 
     if-eqz v1, :cond_0
 
-    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNy:Landroid/animation/Animator;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNu:Landroid/animation/Animator;
 
     invoke-virtual {v1}, Landroid/animation/Animator;->cancel()V
 
     :cond_0
-    invoke-virtual {v0}, Lcom/google/android/material/floatingactionbutton/a;->zz()Z
+    invoke-virtual {v0}, Lcom/google/android/material/floatingactionbutton/a;->zx()Z
 
     move-result v1
 
@@ -1905,7 +1905,7 @@
 
     if-eqz v1, :cond_5
 
-    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNN: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;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNN: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;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNN: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;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNN: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;->aNz:Lcom/google/android/material/animation/MotionSpec;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNv:Lcom/google/android/material/animation/MotionSpec;
 
     if-nez v1, :cond_3
 
-    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNN: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;->aNz:Lcom/google/android/material/animation/MotionSpec;
+    iput-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNv:Lcom/google/android/material/animation/MotionSpec;
 
     :cond_3
-    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNz:Lcom/google/android/material/animation/MotionSpec;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNv: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;->aNK:Ljava/util/ArrayList;
+    iget-object p1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNG:Ljava/util/ArrayList;
 
     if-eqz p1, :cond_4
 
-    iget-object p1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNK:Ljava/util/ArrayList;
+    iget-object p1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNG: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;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNN: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;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object p2, v0, Lcom/google/android/material/floatingactionbutton/a;->aNN: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;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object p2, v0, Lcom/google/android/material/floatingactionbutton/a;->aNN: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;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object p2, v0, Lcom/google/android/material/floatingactionbutton/a;->aNN: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;->zp()V
+    invoke-interface {p1}, Lcom/google/android/material/floatingactionbutton/a$d;->zn()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 2776b99b31..f69f83d471 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 aNV:Z
+.field final synthetic aNR:Z
 
-.field final synthetic aNW:Lcom/google/android/material/floatingactionbutton/a$d;
+.field final synthetic aNS:Lcom/google/android/material/floatingactionbutton/a$d;
 
-.field final synthetic aNX:Lcom/google/android/material/floatingactionbutton/a;
+.field final synthetic aNT: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;->aNX:Lcom/google/android/material/floatingactionbutton/a;
+    iput-object p1, p0, Lcom/google/android/material/floatingactionbutton/a$1;->aNT:Lcom/google/android/material/floatingactionbutton/a;
 
-    iput-boolean p2, p0, Lcom/google/android/material/floatingactionbutton/a$1;->aNV:Z
+    iput-boolean p2, p0, Lcom/google/android/material/floatingactionbutton/a$1;->aNR:Z
 
-    iput-object p3, p0, Lcom/google/android/material/floatingactionbutton/a$1;->aNW:Lcom/google/android/material/floatingactionbutton/a$d;
+    iput-object p3, p0, Lcom/google/android/material/floatingactionbutton/a$1;->aNS: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;->aNX:Lcom/google/android/material/floatingactionbutton/a;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/a$1;->aNT:Lcom/google/android/material/floatingactionbutton/a;
 
     const/4 v0, 0x0
 
-    iput v0, p1, Lcom/google/android/material/floatingactionbutton/a;->aNx:I
+    iput v0, p1, Lcom/google/android/material/floatingactionbutton/a;->aNt:I
 
     const/4 v0, 0x0
 
-    iput-object v0, p1, Lcom/google/android/material/floatingactionbutton/a;->aNy:Landroid/animation/Animator;
+    iput-object v0, p1, Lcom/google/android/material/floatingactionbutton/a;->aNu: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;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object p1, p1, Lcom/google/android/material/floatingactionbutton/a;->aNN:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
-    iget-boolean v0, p0, Lcom/google/android/material/floatingactionbutton/a$1;->aNV:Z
+    iget-boolean v0, p0, Lcom/google/android/material/floatingactionbutton/a$1;->aNR: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;->aNV:Z
+    iget-boolean v1, p0, Lcom/google/android/material/floatingactionbutton/a$1;->aNR: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;->aNW:Lcom/google/android/material/floatingactionbutton/a$d;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/a$1;->aNS:Lcom/google/android/material/floatingactionbutton/a$d;
 
     if-eqz p1, :cond_1
 
-    invoke-interface {p1}, Lcom/google/android/material/floatingactionbutton/a$d;->zq()V
+    invoke-interface {p1}, Lcom/google/android/material/floatingactionbutton/a$d;->zo()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;->aNX:Lcom/google/android/material/floatingactionbutton/a;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a$1;->aNT:Lcom/google/android/material/floatingactionbutton/a;
 
-    iget-object v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aNN:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
-    iget-boolean v1, p0, Lcom/google/android/material/floatingactionbutton/a$1;->aNV:Z
+    iget-boolean v1, p0, Lcom/google/android/material/floatingactionbutton/a$1;->aNR: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;->aNX:Lcom/google/android/material/floatingactionbutton/a;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a$1;->aNT:Lcom/google/android/material/floatingactionbutton/a;
 
     const/4 v1, 0x1
 
-    iput v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNx:I
+    iput v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNt:I
 
-    iput-object p1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNy:Landroid/animation/Animator;
+    iput-object p1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNu: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 eecabc12b7..8437afd82c 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 aNV:Z
+.field final synthetic aNR:Z
 
-.field final synthetic aNW:Lcom/google/android/material/floatingactionbutton/a$d;
+.field final synthetic aNS:Lcom/google/android/material/floatingactionbutton/a$d;
 
-.field final synthetic aNX:Lcom/google/android/material/floatingactionbutton/a;
+.field final synthetic aNT: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;->aNX:Lcom/google/android/material/floatingactionbutton/a;
+    iput-object p1, p0, Lcom/google/android/material/floatingactionbutton/a$2;->aNT:Lcom/google/android/material/floatingactionbutton/a;
 
-    iput-boolean p2, p0, Lcom/google/android/material/floatingactionbutton/a$2;->aNV:Z
+    iput-boolean p2, p0, Lcom/google/android/material/floatingactionbutton/a$2;->aNR:Z
 
-    iput-object p3, p0, Lcom/google/android/material/floatingactionbutton/a$2;->aNW:Lcom/google/android/material/floatingactionbutton/a$d;
+    iput-object p3, p0, Lcom/google/android/material/floatingactionbutton/a$2;->aNS: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;->aNX:Lcom/google/android/material/floatingactionbutton/a;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/a$2;->aNT:Lcom/google/android/material/floatingactionbutton/a;
 
     const/4 v0, 0x0
 
-    iput v0, p1, Lcom/google/android/material/floatingactionbutton/a;->aNx:I
+    iput v0, p1, Lcom/google/android/material/floatingactionbutton/a;->aNt:I
 
     const/4 v0, 0x0
 
-    iput-object v0, p1, Lcom/google/android/material/floatingactionbutton/a;->aNy:Landroid/animation/Animator;
+    iput-object v0, p1, Lcom/google/android/material/floatingactionbutton/a;->aNu:Landroid/animation/Animator;
 
-    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/a$2;->aNW:Lcom/google/android/material/floatingactionbutton/a$d;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/a$2;->aNS:Lcom/google/android/material/floatingactionbutton/a$d;
 
     if-eqz p1, :cond_0
 
-    invoke-interface {p1}, Lcom/google/android/material/floatingactionbutton/a$d;->zp()V
+    invoke-interface {p1}, Lcom/google/android/material/floatingactionbutton/a$d;->zn()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;->aNX:Lcom/google/android/material/floatingactionbutton/a;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a$2;->aNT:Lcom/google/android/material/floatingactionbutton/a;
 
-    iget-object v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aNN:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
-    iget-boolean v1, p0, Lcom/google/android/material/floatingactionbutton/a$2;->aNV:Z
+    iget-boolean v1, p0, Lcom/google/android/material/floatingactionbutton/a$2;->aNR: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;->aNX:Lcom/google/android/material/floatingactionbutton/a;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a$2;->aNT:Lcom/google/android/material/floatingactionbutton/a;
 
     const/4 v1, 0x2
 
-    iput v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNx:I
+    iput v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNt:I
 
-    iput-object p1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNy:Landroid/animation/Animator;
+    iput-object p1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNu: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 5946cb9a73..a250666960 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 aNX:Lcom/google/android/material/floatingactionbutton/a;
+.field final synthetic aNT: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;->aNX:Lcom/google/android/material/floatingactionbutton/a;
+    iput-object p1, p0, Lcom/google/android/material/floatingactionbutton/a$3;->aNT: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;->aNX:Lcom/google/android/material/floatingactionbutton/a;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a$3;->aNT:Lcom/google/android/material/floatingactionbutton/a;
 
-    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNN: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;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNN: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;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNN: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;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNN: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;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNN: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;->aNC:Lcom/google/android/material/shadow/ShadowDrawableWrapper;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNy:Lcom/google/android/material/shadow/ShadowDrawableWrapper;
 
     if-eqz v1, :cond_2
 
-    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNC:Lcom/google/android/material/shadow/ShadowDrawableWrapper;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNy: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;->aNF:Lcom/google/android/material/internal/CircularBorderDrawable;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNB:Lcom/google/android/material/internal/CircularBorderDrawable;
 
     if-eqz v1, :cond_3
 
-    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNF:Lcom/google/android/material/internal/CircularBorderDrawable;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNB: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 2d88c1ea70..aaae0a7655 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 aNX:Lcom/google/android/material/floatingactionbutton/a;
+.field final synthetic aNT: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;->aNX:Lcom/google/android/material/floatingactionbutton/a;
+    iput-object p1, p0, Lcom/google/android/material/floatingactionbutton/a$a;->aNT:Lcom/google/android/material/floatingactionbutton/a;
 
     const/4 v0, 0x0
 
@@ -33,7 +33,7 @@
 
 
 # virtual methods
-.method protected final zA()F
+.method protected final zy()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 b40caefe83..b7c36555db 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 aNX:Lcom/google/android/material/floatingactionbutton/a;
+.field final synthetic aNT: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;->aNX:Lcom/google/android/material/floatingactionbutton/a;
+    iput-object p1, p0, Lcom/google/android/material/floatingactionbutton/a$b;->aNT:Lcom/google/android/material/floatingactionbutton/a;
 
     const/4 v0, 0x0
 
@@ -33,16 +33,16 @@
 
 
 # virtual methods
-.method protected final zA()F
+.method protected final zy()F
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a$b;->aNX:Lcom/google/android/material/floatingactionbutton/a;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a$b;->aNT: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;->aNX:Lcom/google/android/material/floatingactionbutton/a;
+    iget-object v1, p0, Lcom/google/android/material/floatingactionbutton/a$b;->aNT:Lcom/google/android/material/floatingactionbutton/a;
 
-    iget v1, v1, Lcom/google/android/material/floatingactionbutton/a;->aNH:F
+    iget v1, v1, Lcom/google/android/material/floatingactionbutton/a;->aND: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 b33116010c..0d5335478a 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 aNX:Lcom/google/android/material/floatingactionbutton/a;
+.field final synthetic aNT: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;->aNX:Lcom/google/android/material/floatingactionbutton/a;
+    iput-object p1, p0, Lcom/google/android/material/floatingactionbutton/a$c;->aNT:Lcom/google/android/material/floatingactionbutton/a;
 
     const/4 v0, 0x0
 
@@ -33,16 +33,16 @@
 
 
 # virtual methods
-.method protected final zA()F
+.method protected final zy()F
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a$c;->aNX:Lcom/google/android/material/floatingactionbutton/a;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a$c;->aNT: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;->aNX:Lcom/google/android/material/floatingactionbutton/a;
+    iget-object v1, p0, Lcom/google/android/material/floatingactionbutton/a$c;->aNT:Lcom/google/android/material/floatingactionbutton/a;
 
-    iget v1, v1, Lcom/google/android/material/floatingactionbutton/a;->aNI:F
+    iget v1, v1, Lcom/google/android/material/floatingactionbutton/a;->aNE: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 8d4796283f..ae17c50a81 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 zp()V
+.method public abstract zn()V
 .end method
 
-.method public abstract zq()V
+.method public abstract zo()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 7ee2e3f13d..18ea010799 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 aNX:Lcom/google/android/material/floatingactionbutton/a;
+.field final synthetic aNT: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;->aNX:Lcom/google/android/material/floatingactionbutton/a;
+    iput-object p1, p0, Lcom/google/android/material/floatingactionbutton/a$e;->aNT:Lcom/google/android/material/floatingactionbutton/a;
 
     const/4 v0, 0x0
 
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method protected final zA()F
+.method protected final zy()F
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a$e;->aNX:Lcom/google/android/material/floatingactionbutton/a;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a$e;->aNT: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 c2cce4e47d..b53e34da8f 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 aNX:Lcom/google/android/material/floatingactionbutton/a;
+.field final synthetic aNT:Lcom/google/android/material/floatingactionbutton/a;
 
-.field private aNY:Z
+.field private aNU:Z
 
-.field private aNZ:F
+.field private aNV:F
 
-.field private aOa:F
+.field private aNW: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;->aNX:Lcom/google/android/material/floatingactionbutton/a;
+    iput-object p1, p0, Lcom/google/android/material/floatingactionbutton/a$f;->aNT: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;->aNX:Lcom/google/android/material/floatingactionbutton/a;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/a$f;->aNT:Lcom/google/android/material/floatingactionbutton/a;
 
-    iget-object p1, p1, Lcom/google/android/material/floatingactionbutton/a;->aNC:Lcom/google/android/material/shadow/ShadowDrawableWrapper;
+    iget-object p1, p1, Lcom/google/android/material/floatingactionbutton/a;->aNy:Lcom/google/android/material/shadow/ShadowDrawableWrapper;
 
-    iget v0, p0, Lcom/google/android/material/floatingactionbutton/a$f;->aOa:F
+    iget v0, p0, Lcom/google/android/material/floatingactionbutton/a$f;->aNW: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;->aNY:Z
+    iput-boolean p1, p0, Lcom/google/android/material/floatingactionbutton/a$f;->aNU: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;->aNY:Z
+    iget-boolean v0, p0, Lcom/google/android/material/floatingactionbutton/a$f;->aNU:Z
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a$f;->aNX:Lcom/google/android/material/floatingactionbutton/a;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a$f;->aNT:Lcom/google/android/material/floatingactionbutton/a;
 
-    iget-object v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aNC:Lcom/google/android/material/shadow/ShadowDrawableWrapper;
+    iget-object v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aNy: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;->aNZ:F
+    iput v0, p0, Lcom/google/android/material/floatingactionbutton/a$f;->aNV:F
 
-    invoke-virtual {p0}, Lcom/google/android/material/floatingactionbutton/a$f;->zA()F
+    invoke-virtual {p0}, Lcom/google/android/material/floatingactionbutton/a$f;->zy()F
 
     move-result v0
 
-    iput v0, p0, Lcom/google/android/material/floatingactionbutton/a$f;->aOa:F
+    iput v0, p0, Lcom/google/android/material/floatingactionbutton/a$f;->aNW:F
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/google/android/material/floatingactionbutton/a$f;->aNY:Z
+    iput-boolean v0, p0, Lcom/google/android/material/floatingactionbutton/a$f;->aNU:Z
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a$f;->aNX:Lcom/google/android/material/floatingactionbutton/a;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a$f;->aNT:Lcom/google/android/material/floatingactionbutton/a;
 
-    iget-object v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aNC:Lcom/google/android/material/shadow/ShadowDrawableWrapper;
+    iget-object v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aNy:Lcom/google/android/material/shadow/ShadowDrawableWrapper;
 
-    iget v1, p0, Lcom/google/android/material/floatingactionbutton/a$f;->aNZ:F
+    iget v1, p0, Lcom/google/android/material/floatingactionbutton/a$f;->aNV:F
 
-    iget v2, p0, Lcom/google/android/material/floatingactionbutton/a$f;->aOa:F
+    iget v2, p0, Lcom/google/android/material/floatingactionbutton/a$f;->aNW:F
 
     sub-float/2addr v2, v1
 
@@ -117,5 +117,5 @@
     return-void
 .end method
 
-.method protected abstract zA()F
+.method protected abstract zy()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 f950ff661c..b278a5bb64 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,41 +19,33 @@
 # static fields
 .field static final EMPTY_STATE_SET:[I
 
+.field static final aNI:[I
+
+.field static final aNJ:[I
+
+.field static final aNK:[I
+
+.field static final aNL:[I
+
 .field static final aNM:[I
 
-.field static final aNN:[I
-
-.field static final aNO:[I
-
-.field static final aNP:[I
-
-.field static final aNQ:[I
-
-.field static final aNw:Landroid/animation/TimeInterpolator;
+.field static final aNs:Landroid/animation/TimeInterpolator;
 
 
 # instance fields
-.field aNA:Lcom/google/android/material/animation/MotionSpec;
+.field aNA:Landroid/graphics/drawable/Drawable;
 
-.field private final aNB:Lcom/google/android/material/internal/StateListAnimator;
+.field aNB:Lcom/google/android/material/internal/CircularBorderDrawable;
 
-.field aNC:Lcom/google/android/material/shadow/ShadowDrawableWrapper;
+.field aNC:Landroid/graphics/drawable/Drawable;
 
-.field aND:Landroid/graphics/drawable/Drawable;
+.field aND:F
 
-.field aNE:Landroid/graphics/drawable/Drawable;
+.field aNE:F
 
-.field aNF:Lcom/google/android/material/internal/CircularBorderDrawable;
+.field aNF:F
 
-.field aNG:Landroid/graphics/drawable/Drawable;
-
-.field aNH:F
-
-.field aNI:F
-
-.field aNJ:F
-
-.field aNK:Ljava/util/ArrayList;
+.field aNG:Ljava/util/ArrayList;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/ArrayList<",
@@ -63,7 +55,7 @@
     .end annotation
 .end field
 
-.field aNL:Ljava/util/ArrayList;
+.field aNH:Ljava/util/ArrayList;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/ArrayList<",
@@ -73,19 +65,27 @@
     .end annotation
 .end field
 
-.field final aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+.field final aNN:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
-.field final aNS:Lcom/google/android/material/shadow/ShadowViewDelegate;
+.field final aNO:Lcom/google/android/material/shadow/ShadowViewDelegate;
 
-.field private final aNT:Landroid/graphics/Matrix;
+.field private final aNP:Landroid/graphics/Matrix;
 
-.field aNU:Landroid/view/ViewTreeObserver$OnPreDrawListener;
+.field aNQ:Landroid/view/ViewTreeObserver$OnPreDrawListener;
 
-.field aNx:I
+.field aNt:I
 
-.field aNy:Landroid/animation/Animator;
+.field aNu:Landroid/animation/Animator;
 
-.field aNz:Lcom/google/android/material/animation/MotionSpec;
+.field aNv:Lcom/google/android/material/animation/MotionSpec;
+
+.field aNw:Lcom/google/android/material/animation/MotionSpec;
+
+.field private final aNx:Lcom/google/android/material/internal/StateListAnimator;
+
+.field aNy:Lcom/google/android/material/shadow/ShadowDrawableWrapper;
+
+.field aNz:Landroid/graphics/drawable/Drawable;
 
 .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;->aNw:Landroid/animation/TimeInterpolator;
+    sput-object v0, Lcom/google/android/material/floatingactionbutton/a;->aNs: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;->aNM:[I
+    sput-object v1, Lcom/google/android/material/floatingactionbutton/a;->aNI:[I
 
     const/4 v1, 0x3
 
@@ -126,19 +126,19 @@
 
     fill-array-data v1, :array_1
 
-    sput-object v1, Lcom/google/android/material/floatingactionbutton/a;->aNN:[I
+    sput-object v1, Lcom/google/android/material/floatingactionbutton/a;->aNJ:[I
 
     new-array v1, v0, [I
 
     fill-array-data v1, :array_2
 
-    sput-object v1, Lcom/google/android/material/floatingactionbutton/a;->aNO:[I
+    sput-object v1, Lcom/google/android/material/floatingactionbutton/a;->aNK:[I
 
     new-array v0, v0, [I
 
     fill-array-data v0, :array_3
 
-    sput-object v0, Lcom/google/android/material/floatingactionbutton/a;->aNP:[I
+    sput-object v0, Lcom/google/android/material/floatingactionbutton/a;->aNL:[I
 
     const/4 v0, 0x1
 
@@ -150,7 +150,7 @@
 
     aput v2, v0, v1
 
-    sput-object v0, Lcom/google/android/material/floatingactionbutton/a;->aNQ:[I
+    sput-object v0, Lcom/google/android/material/floatingactionbutton/a;->aNM:[I
 
     new-array v0, v1, [I
 
@@ -191,11 +191,11 @@
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aNx:I
+    iput v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aNt:I
 
     const/high16 v0, 0x3f800000    # 1.0f
 
-    iput v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aNJ:F
+    iput v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aNF: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;->aNT:Landroid/graphics/Matrix;
+    iput-object v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aNP:Landroid/graphics/Matrix;
 
-    iput-object p1, p0, Lcom/google/android/material/floatingactionbutton/a;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iput-object p1, p0, Lcom/google/android/material/floatingactionbutton/a;->aNN:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
-    iput-object p2, p0, Lcom/google/android/material/floatingactionbutton/a;->aNS:Lcom/google/android/material/shadow/ShadowViewDelegate;
+    iput-object p2, p0, Lcom/google/android/material/floatingactionbutton/a;->aNO: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;->aNB:Lcom/google/android/material/internal/StateListAnimator;
+    iput-object p1, p0, Lcom/google/android/material/floatingactionbutton/a;->aNx:Lcom/google/android/material/internal/StateListAnimator;
 
-    iget-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;->aNx:Lcom/google/android/material/internal/StateListAnimator;
 
-    sget-object p2, Lcom/google/android/material/floatingactionbutton/a;->aNM:[I
+    sget-object p2, Lcom/google/android/material/floatingactionbutton/a;->aNI:[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;->aNB:Lcom/google/android/material/internal/StateListAnimator;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/a;->aNx:Lcom/google/android/material/internal/StateListAnimator;
 
-    sget-object p2, Lcom/google/android/material/floatingactionbutton/a;->aNN:[I
+    sget-object p2, Lcom/google/android/material/floatingactionbutton/a;->aNJ:[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;->aNB:Lcom/google/android/material/internal/StateListAnimator;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/a;->aNx:Lcom/google/android/material/internal/StateListAnimator;
 
-    sget-object p2, Lcom/google/android/material/floatingactionbutton/a;->aNO:[I
+    sget-object p2, Lcom/google/android/material/floatingactionbutton/a;->aNK:[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;->aNB:Lcom/google/android/material/internal/StateListAnimator;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/a;->aNx:Lcom/google/android/material/internal/StateListAnimator;
 
-    sget-object p2, Lcom/google/android/material/floatingactionbutton/a;->aNP:[I
+    sget-object p2, Lcom/google/android/material/floatingactionbutton/a;->aNL:[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;->aNB:Lcom/google/android/material/internal/StateListAnimator;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/a;->aNx:Lcom/google/android/material/internal/StateListAnimator;
 
-    sget-object p2, Lcom/google/android/material/floatingactionbutton/a;->aNQ:[I
+    sget-object p2, Lcom/google/android/material/floatingactionbutton/a;->aNM:[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;->aNB:Lcom/google/android/material/internal/StateListAnimator;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/a;->aNx: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;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/a;->aNN: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;->aNw:Landroid/animation/TimeInterpolator;
+    sget-object v1, Lcom/google/android/material/floatingactionbutton/a;->aNs: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;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aNN: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;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v1, p0, Lcom/google/android/material/floatingactionbutton/a;->aNN: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;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object p2, p0, Lcom/google/android/material/floatingactionbutton/a;->aNN: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;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object p2, p0, Lcom/google/android/material/floatingactionbutton/a;->aNN: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;->aNT:Landroid/graphics/Matrix;
+    iget-object p2, p0, Lcom/google/android/material/floatingactionbutton/a;->aNP: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;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object p2, p0, Lcom/google/android/material/floatingactionbutton/a;->aNN: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;->aNT:Landroid/graphics/Matrix;
+    iget-object v3, p0, Lcom/google/android/material/floatingactionbutton/a;->aNP: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;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aNN: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;->zw()Lcom/google/android/material/internal/CircularBorderDrawable;
+    invoke-virtual {p0}, Lcom/google/android/material/floatingactionbutton/a;->zu()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;->zx()Landroid/graphics/drawable/GradientDrawable;
+    invoke-virtual {p0}, Lcom/google/android/material/floatingactionbutton/a;->zv()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;->aND:Landroid/graphics/drawable/Drawable;
+    iput-object v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aNz:Landroid/graphics/drawable/Drawable;
 
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aND:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aNz: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;->aND:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aNz: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;->zx()Landroid/graphics/drawable/GradientDrawable;
+    invoke-virtual {p0}, Lcom/google/android/material/floatingactionbutton/a;->zv()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;->aNE:Landroid/graphics/drawable/Drawable;
+    iput-object p2, p0, Lcom/google/android/material/floatingactionbutton/a;->aNA:Landroid/graphics/drawable/Drawable;
 
-    iget-object p2, p0, Lcom/google/android/material/floatingactionbutton/a;->aNE:Landroid/graphics/drawable/Drawable;
+    iget-object p2, p0, Lcom/google/android/material/floatingactionbutton/a;->aNA: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;->aNF:Lcom/google/android/material/internal/CircularBorderDrawable;
+    iput-object p1, p0, Lcom/google/android/material/floatingactionbutton/a;->aNB: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;->aNF:Lcom/google/android/material/internal/CircularBorderDrawable;
+    iget-object p4, p0, Lcom/google/android/material/floatingactionbutton/a;->aNB:Lcom/google/android/material/internal/CircularBorderDrawable;
 
     aput-object p4, p1, v0
 
-    iget-object p4, p0, Lcom/google/android/material/floatingactionbutton/a;->aND:Landroid/graphics/drawable/Drawable;
+    iget-object p4, p0, Lcom/google/android/material/floatingactionbutton/a;->aNz:Landroid/graphics/drawable/Drawable;
 
     aput-object p4, p1, p2
 
-    iget-object p2, p0, Lcom/google/android/material/floatingactionbutton/a;->aNE:Landroid/graphics/drawable/Drawable;
+    iget-object p2, p0, Lcom/google/android/material/floatingactionbutton/a;->aNA: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;->aNF:Lcom/google/android/material/internal/CircularBorderDrawable;
+    iput-object p1, p0, Lcom/google/android/material/floatingactionbutton/a;->aNB:Lcom/google/android/material/internal/CircularBorderDrawable;
 
     new-array p1, p3, [Landroid/graphics/drawable/Drawable;
 
-    iget-object p3, p0, Lcom/google/android/material/floatingactionbutton/a;->aND:Landroid/graphics/drawable/Drawable;
+    iget-object p3, p0, Lcom/google/android/material/floatingactionbutton/a;->aNz:Landroid/graphics/drawable/Drawable;
 
     aput-object p3, p1, v0
 
-    iget-object p3, p0, Lcom/google/android/material/floatingactionbutton/a;->aNE:Landroid/graphics/drawable/Drawable;
+    iget-object p3, p0, Lcom/google/android/material/floatingactionbutton/a;->aNA: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;->aNG:Landroid/graphics/drawable/Drawable;
+    iput-object p2, p0, Lcom/google/android/material/floatingactionbutton/a;->aNC:Landroid/graphics/drawable/Drawable;
 
     new-instance p1, Lcom/google/android/material/shadow/ShadowDrawableWrapper;
 
-    iget-object p2, p0, Lcom/google/android/material/floatingactionbutton/a;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object p2, p0, Lcom/google/android/material/floatingactionbutton/a;->aNN: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;->aNG:Landroid/graphics/drawable/Drawable;
+    iget-object v3, p0, Lcom/google/android/material/floatingactionbutton/a;->aNC:Landroid/graphics/drawable/Drawable;
 
-    iget-object p2, p0, Lcom/google/android/material/floatingactionbutton/a;->aNS:Lcom/google/android/material/shadow/ShadowViewDelegate;
+    iget-object p2, p0, Lcom/google/android/material/floatingactionbutton/a;->aNO: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;->aNI:F
+    iget p2, p0, Lcom/google/android/material/floatingactionbutton/a;->aNE: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;->aNC:Lcom/google/android/material/shadow/ShadowDrawableWrapper;
+    iput-object p1, p0, Lcom/google/android/material/floatingactionbutton/a;->aNy:Lcom/google/android/material/shadow/ShadowDrawableWrapper;
 
-    iget-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;->aNy: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;->aNS:Lcom/google/android/material/shadow/ShadowViewDelegate;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/a;->aNO:Lcom/google/android/material/shadow/ShadowViewDelegate;
 
-    iget-object p2, p0, Lcom/google/android/material/floatingactionbutton/a;->aNC:Lcom/google/android/material/shadow/ShadowDrawableWrapper;
+    iget-object p2, p0, Lcom/google/android/material/floatingactionbutton/a;->aNy: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;->aNC:Lcom/google/android/material/shadow/ShadowDrawableWrapper;
+    iget-object p2, p0, Lcom/google/android/material/floatingactionbutton/a;->aNy:Lcom/google/android/material/shadow/ShadowDrawableWrapper;
 
     if-eqz p2, :cond_0
 
-    iget p3, p0, Lcom/google/android/material/floatingactionbutton/a;->aNI:F
+    iget p3, p0, Lcom/google/android/material/floatingactionbutton/a;->aNE: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;->zu()V
+    invoke-virtual {p0}, Lcom/google/android/material/floatingactionbutton/a;->zs()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;->aNC:Lcom/google/android/material/shadow/ShadowDrawableWrapper;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aNy: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;->aNB:Lcom/google/android/material/internal/StateListAnimator;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aNx: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;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aNN: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;->aNx:I
+    iget v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aNt:I
 
     if-ne v0, v2, :cond_0
 
@@ -818,7 +818,7 @@
     return v1
 
     :cond_1
-    iget v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aNx:I
+    iget v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aNt: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;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aNN: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;->aNx:I
+    iget v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aNt:I
 
     const/4 v3, 0x2
 
@@ -857,7 +857,7 @@
     return v1
 
     :cond_1
-    iget v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aNx:I
+    iget v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aNt: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;->aNH:F
+    iget v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aND:F
 
     cmpl-float v0, v0, p1
 
     if-eqz v0, :cond_0
 
-    iput p1, p0, Lcom/google/android/material/floatingactionbutton/a;->aNH:F
+    iput p1, p0, Lcom/google/android/material/floatingactionbutton/a;->aND:F
 
     iget p1, p0, Lcom/google/android/material/floatingactionbutton/a;->elevation:F
 
-    iget v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aNH:F
+    iget v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aND:F
 
-    iget v1, p0, Lcom/google/android/material/floatingactionbutton/a;->aNI:F
+    iget v1, p0, Lcom/google/android/material/floatingactionbutton/a;->aNE: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;->aNH:F
+    iget v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aND:F
 
-    iget v1, p0, Lcom/google/android/material/floatingactionbutton/a;->aNI:F
+    iget v1, p0, Lcom/google/android/material/floatingactionbutton/a;->aNE: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;->aNE:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aNA: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;->aNI:F
+    iget v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aNE:F
 
     cmpl-float v0, v0, p1
 
     if-eqz v0, :cond_0
 
-    iput p1, p0, Lcom/google/android/material/floatingactionbutton/a;->aNI:F
+    iput p1, p0, Lcom/google/android/material/floatingactionbutton/a;->aNE:F
 
     iget p1, p0, Lcom/google/android/material/floatingactionbutton/a;->elevation:F
 
-    iget v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aNH:F
+    iget v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aND:F
 
-    iget v1, p0, Lcom/google/android/material/floatingactionbutton/a;->aNI:F
+    iget v1, p0, Lcom/google/android/material/floatingactionbutton/a;->aNE: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;->aNJ:F
+    iput p1, p0, Lcom/google/android/material/floatingactionbutton/a;->aNF:F
 
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aNT:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aNP: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;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/a;->aNN: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 zr()V
+.method final zp()V
     .locals 1
 
-    iget v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aNJ:F
+    iget v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aNF:F
 
     invoke-virtual {p0, v0}, Lcom/google/android/material/floatingactionbutton/a;->u(F)V
 
     return-void
 .end method
 
-.method zs()V
+.method zq()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aNB:Lcom/google/android/material/internal/StateListAnimator;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aNx:Lcom/google/android/material/internal/StateListAnimator;
 
     invoke-virtual {v0}, Lcom/google/android/material/internal/StateListAnimator;->jumpToCurrentState()V
 
     return-void
 .end method
 
-.method zt()V
+.method zr()V
     .locals 0
 
     return-void
 .end method
 
-.method final zu()V
+.method final zs()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;->aNS:Lcom/google/android/material/shadow/ShadowViewDelegate;
+    iget-object v1, p0, Lcom/google/android/material/floatingactionbutton/a;->aNO:Lcom/google/android/material/shadow/ShadowViewDelegate;
 
     iget v2, v0, Landroid/graphics/Rect;->left:I
 
@@ -1019,7 +1019,7 @@
     return-void
 .end method
 
-.method zv()Z
+.method zt()Z
     .locals 1
 
     const/4 v0, 0x1
@@ -1027,7 +1027,7 @@
     return v0
 .end method
 
-.method zw()Lcom/google/android/material/internal/CircularBorderDrawable;
+.method zu()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 zx()Landroid/graphics/drawable/GradientDrawable;
+.method final zv()Landroid/graphics/drawable/GradientDrawable;
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/material/floatingactionbutton/a;->zy()Landroid/graphics/drawable/GradientDrawable;
+    invoke-virtual {p0}, Lcom/google/android/material/floatingactionbutton/a;->zw()Landroid/graphics/drawable/GradientDrawable;
 
     move-result-object v0
 
@@ -1055,7 +1055,7 @@
     return-object v0
 .end method
 
-.method zy()Landroid/graphics/drawable/GradientDrawable;
+.method zw()Landroid/graphics/drawable/GradientDrawable;
     .locals 1
 
     new-instance v0, Landroid/graphics/drawable/GradientDrawable;
@@ -1065,10 +1065,10 @@
     return-object v0
 .end method
 
-.method final zz()Z
+.method final zx()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aNN: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;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aNN: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 b0adbe18cd..2fd8ad886f 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 aOb:Landroid/graphics/drawable/InsetDrawable;
+.field private aNX: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;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v1, p0, Lcom/google/android/material/floatingactionbutton/b;->aNN: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;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v1, p0, Lcom/google/android/material/floatingactionbutton/b;->aNN: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;->aNw:Landroid/animation/TimeInterpolator;
+    sget-object p1, Lcom/google/android/material/floatingactionbutton/b;->aNs: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;->zx()Landroid/graphics/drawable/GradientDrawable;
+    invoke-virtual {p0}, Lcom/google/android/material/floatingactionbutton/b;->zv()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;->aND:Landroid/graphics/drawable/Drawable;
+    iput-object v0, p0, Lcom/google/android/material/floatingactionbutton/b;->aNz:Landroid/graphics/drawable/Drawable;
 
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/b;->aND:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/b;->aNz: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;->aND:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/b;->aNz: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;->aNF:Lcom/google/android/material/internal/CircularBorderDrawable;
+    iput-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aNB: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;->aNF:Lcom/google/android/material/internal/CircularBorderDrawable;
+    iget-object v1, p0, Lcom/google/android/material/floatingactionbutton/b;->aNB: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;->aND:Landroid/graphics/drawable/Drawable;
+    iget-object v1, p0, Lcom/google/android/material/floatingactionbutton/b;->aNz: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;->aNF:Lcom/google/android/material/internal/CircularBorderDrawable;
+    iput-object p2, p0, Lcom/google/android/material/floatingactionbutton/b;->aNB:Lcom/google/android/material/internal/CircularBorderDrawable;
 
-    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aND:Landroid/graphics/drawable/Drawable;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aNz: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;->aNE:Landroid/graphics/drawable/Drawable;
+    iput-object p4, p0, Lcom/google/android/material/floatingactionbutton/b;->aNA:Landroid/graphics/drawable/Drawable;
 
-    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aNE:Landroid/graphics/drawable/Drawable;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aNA:Landroid/graphics/drawable/Drawable;
 
-    iput-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aNG:Landroid/graphics/drawable/Drawable;
+    iput-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aNC:Landroid/graphics/drawable/Drawable;
 
-    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aNS:Lcom/google/android/material/shadow/ShadowViewDelegate;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aNO:Lcom/google/android/material/shadow/ShadowViewDelegate;
 
-    iget-object p2, p0, Lcom/google/android/material/floatingactionbutton/b;->aNE:Landroid/graphics/drawable/Drawable;
+    iget-object p2, p0, Lcom/google/android/material/floatingactionbutton/b;->aNA: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;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aNN: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;->aNM:[I
+    sget-object v1, Lcom/google/android/material/floatingactionbutton/b;->aNI:[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;->aNN:[I
+    sget-object p3, Lcom/google/android/material/floatingactionbutton/b;->aNJ:[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;->aNO:[I
+    sget-object p3, Lcom/google/android/material/floatingactionbutton/b;->aNK:[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;->aNP:[I
+    sget-object p3, Lcom/google/android/material/floatingactionbutton/b;->aNL:[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;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v1, p0, Lcom/google/android/material/floatingactionbutton/b;->aNN: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;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aNN: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;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v7, p0, Lcom/google/android/material/floatingactionbutton/b;->aNN: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;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aNN: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;->aNw:Landroid/animation/TimeInterpolator;
+    sget-object p1, Lcom/google/android/material/floatingactionbutton/b;->aNs:Landroid/animation/TimeInterpolator;
 
     invoke-virtual {p2, p1}, Landroid/animation/AnimatorSet;->setInterpolator(Landroid/animation/TimeInterpolator;)V
 
-    sget-object p1, Lcom/google/android/material/floatingactionbutton/b;->aNQ:[I
+    sget-object p1, Lcom/google/android/material/floatingactionbutton/b;->aNM:[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;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aNN: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;->aNS:Lcom/google/android/material/shadow/ShadowViewDelegate;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aNO: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;->zu()V
+    invoke-virtual {p0}, Lcom/google/android/material/floatingactionbutton/b;->zs()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;->aNS:Lcom/google/android/material/shadow/ShadowViewDelegate;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/b;->aNO: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;->aNS:Lcom/google/android/material/shadow/ShadowViewDelegate;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/b;->aNO: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;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v2, p0, Lcom/google/android/material/floatingactionbutton/b;->aNN: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;->aNI:F
+    iget v3, p0, Lcom/google/android/material/floatingactionbutton/b;->aNE: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;->aNS:Lcom/google/android/material/shadow/ShadowViewDelegate;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/b;->aNO: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;->aNE:Landroid/graphics/drawable/Drawable;
+    iget-object v2, p0, Lcom/google/android/material/floatingactionbutton/b;->aNA: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;->aOb:Landroid/graphics/drawable/InsetDrawable;
+    iput-object v0, p0, Lcom/google/android/material/floatingactionbutton/b;->aNX:Landroid/graphics/drawable/InsetDrawable;
 
-    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aNS:Lcom/google/android/material/shadow/ShadowViewDelegate;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aNO:Lcom/google/android/material/shadow/ShadowViewDelegate;
 
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/b;->aOb:Landroid/graphics/drawable/InsetDrawable;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/b;->aNX: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;->aNS:Lcom/google/android/material/shadow/ShadowViewDelegate;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aNO:Lcom/google/android/material/shadow/ShadowViewDelegate;
 
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/b;->aNE:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/b;->aNA: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;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aNN: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;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aNN: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;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aNN: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;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aNN:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
-    iget v0, p0, Lcom/google/android/material/floatingactionbutton/b;->aNI:F
+    iget v0, p0, Lcom/google/android/material/floatingactionbutton/b;->aNE: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;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aNN: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;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aNN: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;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aNN: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;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aNN:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
-    iget v0, p0, Lcom/google/android/material/floatingactionbutton/b;->aNH:F
+    iget v0, p0, Lcom/google/android/material/floatingactionbutton/b;->aND: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;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aNN: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;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aNN: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;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/b;->aNN: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;->aNE:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/b;->aNA: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;->aNE:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/b;->aNA:Landroid/graphics/drawable/Drawable;
 
     check-cast v0, Landroid/graphics/drawable/RippleDrawable;
 
@@ -598,21 +598,21 @@
     return-void
 .end method
 
-.method final zs()V
+.method final zq()V
     .locals 0
 
     return-void
 .end method
 
-.method final zt()V
+.method final zr()V
     .locals 0
 
-    invoke-virtual {p0}, Lcom/google/android/material/floatingactionbutton/b;->zu()V
+    invoke-virtual {p0}, Lcom/google/android/material/floatingactionbutton/b;->zs()V
 
     return-void
 .end method
 
-.method final zv()Z
+.method final zt()Z
     .locals 1
 
     const/4 v0, 0x0
@@ -620,7 +620,7 @@
     return v0
 .end method
 
-.method final zw()Lcom/google/android/material/internal/CircularBorderDrawable;
+.method final zu()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 zy()Landroid/graphics/drawable/GradientDrawable;
+.method final zw()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 47a4747167..27df6cca4c 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 aOc:Lcom/google/android/material/internal/CheckableImageButton;
+.field final synthetic aNY: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;->aOc:Lcom/google/android/material/internal/CheckableImageButton;
+    iput-object p1, p0, Lcom/google/android/material/internal/CheckableImageButton$1;->aNY: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;->aOc:Lcom/google/android/material/internal/CheckableImageButton;
+    iget-object p1, p0, Lcom/google/android/material/internal/CheckableImageButton$1;->aNY: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;->aOc:Lcom/google/android/material/internal/CheckableImageButton;
+    iget-object p1, p0, Lcom/google/android/material/internal/CheckableImageButton$1;->aNY: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 71a60e7ace..ab0f197e7c 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 aOd:Lcom/google/android/material/internal/CircularBorderDrawable;
+.field final synthetic aNZ: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;->aOd:Lcom/google/android/material/internal/CircularBorderDrawable;
+    iput-object p1, p0, Lcom/google/android/material/internal/CircularBorderDrawable$a;->aNZ: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;->aOd:Lcom/google/android/material/internal/CircularBorderDrawable;
+    iget-object v0, p0, Lcom/google/android/material/internal/CircularBorderDrawable$a;->aNZ: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 6a81c38056..e6452cd30c 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 aOe:Lcom/google/android/material/internal/NavigationMenuItemView;
+.field final synthetic aOa: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;->aOe:Lcom/google/android/material/internal/NavigationMenuItemView;
+    iput-object p1, p0, Lcom/google/android/material/internal/NavigationMenuItemView$1;->aOa: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;->aOe:Lcom/google/android/material/internal/NavigationMenuItemView;
+    iget-object p1, p0, Lcom/google/android/material/internal/NavigationMenuItemView$1;->aOa: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 027ec93c43..f34daeb87c 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 aOf:Lcom/google/android/material/internal/NavigationMenuPresenter;
+.field final synthetic aOb: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;->aOf:Lcom/google/android/material/internal/NavigationMenuPresenter;
+    iput-object p1, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$1;->aOb: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;->aOf:Lcom/google/android/material/internal/NavigationMenuPresenter;
+    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$1;->aOb: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;->aOf:Lcom/google/android/material/internal/NavigationMenuPresenter;
+    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$1;->aOb: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;->aOf:Lcom/google/android/material/internal/NavigationMenuPresenter;
+    iget-object v1, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$1;->aOb: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;->aOf:Lcom/google/android/material/internal/NavigationMenuPresenter;
+    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$1;->aOb: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;->aOf:Lcom/google/android/material/internal/NavigationMenuPresenter;
+    iget-object p1, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$1;->aOb: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;->aOf:Lcom/google/android/material/internal/NavigationMenuPresenter;
+    iget-object p1, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$1;->aOb: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 ce10d03ddf..5d540f1741 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 aOf:Lcom/google/android/material/internal/NavigationMenuPresenter;
+.field final synthetic aOb:Lcom/google/android/material/internal/NavigationMenuPresenter;
 
-.field final aOg:Ljava/util/ArrayList;
+.field final aOc:Ljava/util/ArrayList;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/ArrayList<",
@@ -35,7 +35,7 @@
     .end annotation
 .end field
 
-.field aOh:Landroidx/appcompat/view/menu/MenuItemImpl;
+.field aOd: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;->aOf:Lcom/google/android/material/internal/NavigationMenuPresenter;
+    iput-object p1, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOb: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;->aOg:Ljava/util/ArrayList;
+    iput-object p1, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOc:Ljava/util/ArrayList;
 
-    invoke-virtual {p0}, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->zB()V
+    invoke-virtual {p0}, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->zz()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;->aOg:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOc: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;->aOg:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOc: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;->aOg:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOc: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;->aOi:Landroidx/appcompat/view/menu/MenuItemImpl;
+    iget-object p1, p1, Lcom/google/android/material/internal/NavigationMenuPresenter$f;->aOe: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;->aOg:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOc: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;->aOg:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOc: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;->aOi:Landroidx/appcompat/view/menu/MenuItemImpl;
+    iget-object p2, p2, Lcom/google/android/material/internal/NavigationMenuPresenter$f;->aOe: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;->aOf:Lcom/google/android/material/internal/NavigationMenuPresenter;
+    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOb: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;->aOf:Lcom/google/android/material/internal/NavigationMenuPresenter;
+    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOb: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;->aOf:Lcom/google/android/material/internal/NavigationMenuPresenter;
+    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOb: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;->aOf:Lcom/google/android/material/internal/NavigationMenuPresenter;
+    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOb: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;->aOf:Lcom/google/android/material/internal/NavigationMenuPresenter;
+    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOb: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;->aOf:Lcom/google/android/material/internal/NavigationMenuPresenter;
+    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOb: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;->aOf:Lcom/google/android/material/internal/NavigationMenuPresenter;
+    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOb: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;->aOg:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOc: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;->aOf:Lcom/google/android/material/internal/NavigationMenuPresenter;
+    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOb: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;->aOf:Lcom/google/android/material/internal/NavigationMenuPresenter;
+    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOb: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;->aOi:Landroidx/appcompat/view/menu/MenuItemImpl;
+    iget-object p2, p2, Lcom/google/android/material/internal/NavigationMenuPresenter$f;->aOe: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;->aOf:Lcom/google/android/material/internal/NavigationMenuPresenter;
+    iget-object p2, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOb: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;->aOf:Lcom/google/android/material/internal/NavigationMenuPresenter;
+    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOb: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;->aOf:Lcom/google/android/material/internal/NavigationMenuPresenter;
+    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOb: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;->aOf:Lcom/google/android/material/internal/NavigationMenuPresenter;
+    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOb: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;->aOf:Lcom/google/android/material/internal/NavigationMenuPresenter;
+    iget-object v1, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOb: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;->aOh:Landroidx/appcompat/view/menu/MenuItemImpl;
+    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOd: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;->aOh:Landroidx/appcompat/view/menu/MenuItemImpl;
+    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOd: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;->aOh:Landroidx/appcompat/view/menu/MenuItemImpl;
+    iput-object p1, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOd:Landroidx/appcompat/view/menu/MenuItemImpl;
 
     const/4 v0, 0x1
 
@@ -454,7 +454,97 @@
     return-void
 .end method
 
-.method final zB()V
+.method public final zA()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;->aOd:Landroidx/appcompat/view/menu/MenuItemImpl;
+
+    if-eqz v1, :cond_0
+
+    invoke-virtual {v1}, Landroidx/appcompat/view/menu/MenuItemImpl;->getItemId()I
+
+    move-result v1
+
+    const-string v2, "android:menu:checked"
+
+    invoke-virtual {v0, v2, v1}, Landroid/os/Bundle;->putInt(Ljava/lang/String;I)V
+
+    :cond_0
+    new-instance v1, Landroid/util/SparseArray;
+
+    invoke-direct {v1}, Landroid/util/SparseArray;-><init>()V
+
+    const/4 v2, 0x0
+
+    iget-object v3, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOc:Ljava/util/ArrayList;
+
+    invoke-virtual {v3}, Ljava/util/ArrayList;->size()I
+
+    move-result v3
+
+    :goto_0
+    if-ge v2, v3, :cond_3
+
+    iget-object v4, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOc:Ljava/util/ArrayList;
+
+    invoke-virtual {v4, v2}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
+
+    move-result-object v4
+
+    check-cast v4, Lcom/google/android/material/internal/NavigationMenuPresenter$d;
+
+    instance-of v5, v4, Lcom/google/android/material/internal/NavigationMenuPresenter$f;
+
+    if-eqz v5, :cond_2
+
+    check-cast v4, Lcom/google/android/material/internal/NavigationMenuPresenter$f;
+
+    iget-object v4, v4, Lcom/google/android/material/internal/NavigationMenuPresenter$f;->aOe:Landroidx/appcompat/view/menu/MenuItemImpl;
+
+    if-eqz v4, :cond_1
+
+    invoke-virtual {v4}, Landroidx/appcompat/view/menu/MenuItemImpl;->getActionView()Landroid/view/View;
+
+    move-result-object v5
+
+    goto :goto_1
+
+    :cond_1
+    const/4 v5, 0x0
+
+    :goto_1
+    if-eqz v5, :cond_2
+
+    new-instance v6, Lcom/google/android/material/internal/ParcelableSparseArray;
+
+    invoke-direct {v6}, Lcom/google/android/material/internal/ParcelableSparseArray;-><init>()V
+
+    invoke-virtual {v5, v6}, Landroid/view/View;->saveHierarchyState(Landroid/util/SparseArray;)V
+
+    invoke-virtual {v4}, Landroidx/appcompat/view/menu/MenuItemImpl;->getItemId()I
+
+    move-result v4
+
+    invoke-virtual {v1, v4, v6}, Landroid/util/SparseArray;->put(ILjava/lang/Object;)V
+
+    :cond_2
+    add-int/lit8 v2, v2, 0x1
+
+    goto :goto_0
+
+    :cond_3
+    const-string v2, "android:menu:action_views"
+
+    invoke-virtual {v0, v2, v1}, Landroid/os/Bundle;->putSparseParcelableArray(Ljava/lang/String;Landroid/util/SparseArray;)V
+
+    return-object v0
+.end method
+
+.method final zz()V
     .locals 16
 
     move-object/from16 v0, p0
@@ -470,11 +560,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;->aOg:Ljava/util/ArrayList;
+    iget-object v2, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOc:Ljava/util/ArrayList;
 
     invoke-virtual {v2}, Ljava/util/ArrayList;->clear()V
 
-    iget-object v2, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOg:Ljava/util/ArrayList;
+    iget-object v2, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOc:Ljava/util/ArrayList;
 
     new-instance v3, Lcom/google/android/material/internal/NavigationMenuPresenter$c;
 
@@ -484,7 +574,7 @@
 
     const/4 v2, -0x1
 
-    iget-object v3, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOf:Lcom/google/android/material/internal/NavigationMenuPresenter;
+    iget-object v3, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOb:Lcom/google/android/material/internal/NavigationMenuPresenter;
 
     iget-object v3, v3, Lcom/google/android/material/internal/NavigationMenuPresenter;->menu:Landroidx/appcompat/view/menu/MenuBuilder;
 
@@ -509,7 +599,7 @@
     :goto_0
     if-ge v2, v3, :cond_f
 
-    iget-object v8, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOf:Lcom/google/android/material/internal/NavigationMenuPresenter;
+    iget-object v8, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOb:Lcom/google/android/material/internal/NavigationMenuPresenter;
 
     iget-object v8, v8, Lcom/google/android/material/internal/NavigationMenuPresenter;->menu:Landroidx/appcompat/view/menu/MenuBuilder;
 
@@ -559,11 +649,11 @@
 
     if-eqz v2, :cond_3
 
-    iget-object v10, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOg:Ljava/util/ArrayList;
+    iget-object v10, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOc:Ljava/util/ArrayList;
 
     new-instance v11, Lcom/google/android/material/internal/NavigationMenuPresenter$e;
 
-    iget-object v12, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOf:Lcom/google/android/material/internal/NavigationMenuPresenter;
+    iget-object v12, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOb:Lcom/google/android/material/internal/NavigationMenuPresenter;
 
     iget v12, v12, Lcom/google/android/material/internal/NavigationMenuPresenter;->paddingSeparator:I
 
@@ -572,7 +662,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;->aOg:Ljava/util/ArrayList;
+    iget-object v10, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOc:Ljava/util/ArrayList;
 
     new-instance v11, Lcom/google/android/material/internal/NavigationMenuPresenter$f;
 
@@ -580,7 +670,7 @@
 
     invoke-virtual {v10, v11}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
-    iget-object v10, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOg:Ljava/util/ArrayList;
+    iget-object v10, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOc:Ljava/util/ArrayList;
 
     invoke-virtual {v10}, Ljava/util/ArrayList;->size()I
 
@@ -638,7 +728,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;->aOg:Ljava/util/ArrayList;
+    iget-object v15, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOc:Ljava/util/ArrayList;
 
     new-instance v1, Lcom/google/android/material/internal/NavigationMenuPresenter$f;
 
@@ -656,7 +746,7 @@
     :cond_8
     if-eqz v13, :cond_e
 
-    iget-object v1, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOg:Ljava/util/ArrayList;
+    iget-object v1, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOc:Ljava/util/ArrayList;
 
     invoke-virtual {v1}, Ljava/util/ArrayList;->size()I
 
@@ -673,7 +763,7 @@
 
     if-eq v1, v5, :cond_c
 
-    iget-object v5, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOg:Ljava/util/ArrayList;
+    iget-object v5, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOc:Ljava/util/ArrayList;
 
     invoke-virtual {v5}, Ljava/util/ArrayList;->size()I
 
@@ -697,15 +787,15 @@
 
     add-int/lit8 v7, v7, 0x1
 
-    iget-object v6, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOg:Ljava/util/ArrayList;
+    iget-object v6, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOc:Ljava/util/ArrayList;
 
     new-instance v9, Lcom/google/android/material/internal/NavigationMenuPresenter$e;
 
-    iget-object v10, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOf:Lcom/google/android/material/internal/NavigationMenuPresenter;
+    iget-object v10, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOb: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;->aOf:Lcom/google/android/material/internal/NavigationMenuPresenter;
+    iget-object v11, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOb:Lcom/google/android/material/internal/NavigationMenuPresenter;
 
     iget v11, v11, Lcom/google/android/material/internal/NavigationMenuPresenter;->paddingSeparator:I
 
@@ -727,7 +817,7 @@
 
     if-eqz v5, :cond_d
 
-    iget-object v5, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOg:Ljava/util/ArrayList;
+    iget-object v5, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOc:Ljava/util/ArrayList;
 
     invoke-virtual {v5}, Ljava/util/ArrayList;->size()I
 
@@ -745,7 +835,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;->aOg:Ljava/util/ArrayList;
+    iget-object v8, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOc:Ljava/util/ArrayList;
 
     invoke-virtual {v8, v5}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
@@ -764,93 +854,3 @@
 
     return-void
 .end method
-
-.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;->aOh:Landroidx/appcompat/view/menu/MenuItemImpl;
-
-    if-eqz v1, :cond_0
-
-    invoke-virtual {v1}, Landroidx/appcompat/view/menu/MenuItemImpl;->getItemId()I
-
-    move-result v1
-
-    const-string v2, "android:menu:checked"
-
-    invoke-virtual {v0, v2, v1}, Landroid/os/Bundle;->putInt(Ljava/lang/String;I)V
-
-    :cond_0
-    new-instance v1, Landroid/util/SparseArray;
-
-    invoke-direct {v1}, Landroid/util/SparseArray;-><init>()V
-
-    const/4 v2, 0x0
-
-    iget-object v3, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOg:Ljava/util/ArrayList;
-
-    invoke-virtual {v3}, Ljava/util/ArrayList;->size()I
-
-    move-result v3
-
-    :goto_0
-    if-ge v2, v3, :cond_3
-
-    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;
-
-    move-result-object v4
-
-    check-cast v4, Lcom/google/android/material/internal/NavigationMenuPresenter$d;
-
-    instance-of v5, v4, Lcom/google/android/material/internal/NavigationMenuPresenter$f;
-
-    if-eqz v5, :cond_2
-
-    check-cast v4, Lcom/google/android/material/internal/NavigationMenuPresenter$f;
-
-    iget-object v4, v4, Lcom/google/android/material/internal/NavigationMenuPresenter$f;->aOi:Landroidx/appcompat/view/menu/MenuItemImpl;
-
-    if-eqz v4, :cond_1
-
-    invoke-virtual {v4}, Landroidx/appcompat/view/menu/MenuItemImpl;->getActionView()Landroid/view/View;
-
-    move-result-object v5
-
-    goto :goto_1
-
-    :cond_1
-    const/4 v5, 0x0
-
-    :goto_1
-    if-eqz v5, :cond_2
-
-    new-instance v6, Lcom/google/android/material/internal/ParcelableSparseArray;
-
-    invoke-direct {v6}, Lcom/google/android/material/internal/ParcelableSparseArray;-><init>()V
-
-    invoke-virtual {v5, v6}, Landroid/view/View;->saveHierarchyState(Landroid/util/SparseArray;)V
-
-    invoke-virtual {v4}, Landroidx/appcompat/view/menu/MenuItemImpl;->getItemId()I
-
-    move-result v4
-
-    invoke-virtual {v1, v4, v6}, Landroid/util/SparseArray;->put(ILjava/lang/Object;)V
-
-    :cond_2
-    add-int/lit8 v2, v2, 0x1
-
-    goto :goto_0
-
-    :cond_3
-    const-string v2, "android:menu:action_views"
-
-    invoke-virtual {v0, v2, v1}, Landroid/os/Bundle;->putSparseParcelableArray(Ljava/lang/String;Landroid/util/SparseArray;)V
-
-    return-object v0
-.end method
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 c9b3f7049b..1656ec38b7 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 aOi:Landroidx/appcompat/view/menu/MenuItemImpl;
+.field final aOe: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;->aOi:Landroidx/appcompat/view/menu/MenuItemImpl;
+    iput-object p1, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$f;->aOe: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 c168a165c7..b9ad4bf8ca 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;->aOh:Landroidx/appcompat/view/menu/MenuItemImpl;
+    iget-object v0, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOd: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;->aOg:Ljava/util/ArrayList;
+    iget-object v4, v1, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOc: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;->aOg:Ljava/util/ArrayList;
+    iget-object v6, v1, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOc: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;->aOi:Landroidx/appcompat/view/menu/MenuItemImpl;
+    iget-object v6, v6, Lcom/google/android/material/internal/NavigationMenuPresenter$f;->aOe: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;->zB()V
+    invoke-virtual {v1}, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->zz()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;->aOg:Ljava/util/ArrayList;
+    iget-object v3, v1, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOc: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;->aOg:Ljava/util/ArrayList;
+    iget-object v4, v1, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOc: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;->aOi:Landroidx/appcompat/view/menu/MenuItemImpl;
+    iget-object v4, v4, Lcom/google/android/material/internal/NavigationMenuPresenter$f;->aOe: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;->zC()Landroid/os/Bundle;
+    invoke-virtual {v1}, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->zA()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;->zB()V
+    invoke-virtual {p1}, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->zz()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 c732f23381..3f08248d42 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 aOj:Lcom/google/android/material/internal/ScrimInsetsFrameLayout;
+.field final synthetic aOf: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;->aOj:Lcom/google/android/material/internal/ScrimInsetsFrameLayout;
+    iput-object p1, p0, Lcom/google/android/material/internal/ScrimInsetsFrameLayout$1;->aOf: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;->aOj:Lcom/google/android/material/internal/ScrimInsetsFrameLayout;
+    iget-object p1, p0, Lcom/google/android/material/internal/ScrimInsetsFrameLayout$1;->aOf: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;->aOj:Lcom/google/android/material/internal/ScrimInsetsFrameLayout;
+    iget-object p1, p0, Lcom/google/android/material/internal/ScrimInsetsFrameLayout$1;->aOf: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;->aOj:Lcom/google/android/material/internal/ScrimInsetsFrameLayout;
+    iget-object p1, p0, Lcom/google/android/material/internal/ScrimInsetsFrameLayout$1;->aOf: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;->aOj:Lcom/google/android/material/internal/ScrimInsetsFrameLayout;
+    iget-object p1, p0, Lcom/google/android/material/internal/ScrimInsetsFrameLayout$1;->aOf: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;->aOj:Lcom/google/android/material/internal/ScrimInsetsFrameLayout;
+    iget-object p1, p0, Lcom/google/android/material/internal/ScrimInsetsFrameLayout$1;->aOf: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;->aOj:Lcom/google/android/material/internal/ScrimInsetsFrameLayout;
+    iget-object v0, p0, Lcom/google/android/material/internal/ScrimInsetsFrameLayout$1;->aOf: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;->aOj:Lcom/google/android/material/internal/ScrimInsetsFrameLayout;
+    iget-object p1, p0, Lcom/google/android/material/internal/ScrimInsetsFrameLayout$1;->aOf: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 ebb234107d..aa6fe31ae8 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 aOk:Lcom/google/android/material/internal/StateListAnimator;
+.field final synthetic aOg: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;->aOk:Lcom/google/android/material/internal/StateListAnimator;
+    iput-object p1, p0, Lcom/google/android/material/internal/StateListAnimator$1;->aOg: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;->aOk:Lcom/google/android/material/internal/StateListAnimator;
+    iget-object v0, p0, Lcom/google/android/material/internal/StateListAnimator$1;->aOg: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;->aOk:Lcom/google/android/material/internal/StateListAnimator;
+    iget-object p1, p0, Lcom/google/android/material/internal/StateListAnimator$1;->aOg: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 0bbb2056a4..48f52199b4 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 aOl:[I
+.field final aOh:[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;->aOl:[I
+    iput-object p1, p0, Lcom/google/android/material/internal/StateListAnimator$a;->aOh:[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 9ac0111b3e..67c3cfa206 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;->aOl:[I
+    iget-object v3, v2, Lcom/google/android/material/internal/StateListAnimator$a;->aOh:[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 e93400f027..9803b8f30c 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 aOm:Landroid/widget/TextView;
+.field final synthetic aOi:Landroid/widget/TextView;
 
-.field final synthetic aOn:Lcom/google/android/material/internal/TextScale;
+.field final synthetic aOj: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;->aOn:Lcom/google/android/material/internal/TextScale;
+    iput-object p1, p0, Lcom/google/android/material/internal/TextScale$1;->aOj:Lcom/google/android/material/internal/TextScale;
 
-    iput-object p2, p0, Lcom/google/android/material/internal/TextScale$1;->aOm:Landroid/widget/TextView;
+    iput-object p2, p0, Lcom/google/android/material/internal/TextScale$1;->aOi: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;->aOm:Landroid/widget/TextView;
+    iget-object v0, p0, Lcom/google/android/material/internal/TextScale$1;->aOi:Landroid/widget/TextView;
 
     invoke-virtual {v0, p1}, Landroid/widget/TextView;->setScaleX(F)V
 
-    iget-object v0, p0, Lcom/google/android/material/internal/TextScale$1;->aOm:Landroid/widget/TextView;
+    iget-object v0, p0, Lcom/google/android/material/internal/TextScale$1;->aOi: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 ec5e4ae974..fe356eeaa7 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 aOo:Lcom/google/android/material/navigation/NavigationView;
+.field final synthetic aOk: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;->aOo:Lcom/google/android/material/navigation/NavigationView;
+    iput-object p1, p0, Lcom/google/android/material/navigation/NavigationView$1;->aOk: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;->aOo:Lcom/google/android/material/navigation/NavigationView;
+    iget-object p1, p0, Lcom/google/android/material/navigation/NavigationView$1;->aOk: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;->aOo:Lcom/google/android/material/navigation/NavigationView;
+    iget-object p1, p0, Lcom/google/android/material/navigation/NavigationView$1;->aOk: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 865a1bf948..21f052eb03 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 aOp:Landroid/text/TextPaint;
+.field final synthetic aOl:Landroid/text/TextPaint;
 
-.field final synthetic aOq:Landroidx/core/content/res/ResourcesCompat$FontCallback;
+.field final synthetic aOm:Landroidx/core/content/res/ResourcesCompat$FontCallback;
 
-.field final synthetic aOr:Lcom/google/android/material/resources/TextAppearance;
+.field final synthetic aOn: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;->aOr:Lcom/google/android/material/resources/TextAppearance;
+    iput-object p1, p0, Lcom/google/android/material/resources/TextAppearance$1;->aOn:Lcom/google/android/material/resources/TextAppearance;
 
-    iput-object p2, p0, Lcom/google/android/material/resources/TextAppearance$1;->aOp:Landroid/text/TextPaint;
+    iput-object p2, p0, Lcom/google/android/material/resources/TextAppearance$1;->aOl:Landroid/text/TextPaint;
 
-    iput-object p3, p0, Lcom/google/android/material/resources/TextAppearance$1;->aOq:Landroidx/core/content/res/ResourcesCompat$FontCallback;
+    iput-object p3, p0, Lcom/google/android/material/resources/TextAppearance$1;->aOm: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;->aOr:Lcom/google/android/material/resources/TextAppearance;
+    iget-object v0, p0, Lcom/google/android/material/resources/TextAppearance$1;->aOn: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;->aOr:Lcom/google/android/material/resources/TextAppearance;
+    iget-object v0, p0, Lcom/google/android/material/resources/TextAppearance$1;->aOn: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;->aOq:Landroidx/core/content/res/ResourcesCompat$FontCallback;
+    iget-object v0, p0, Lcom/google/android/material/resources/TextAppearance$1;->aOm: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;->aOr:Lcom/google/android/material/resources/TextAppearance;
+    iget-object v0, p0, Lcom/google/android/material/resources/TextAppearance$1;->aOn: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;->aOr:Lcom/google/android/material/resources/TextAppearance;
+    iget-object v0, p0, Lcom/google/android/material/resources/TextAppearance$1;->aOn:Lcom/google/android/material/resources/TextAppearance;
 
-    iget-object v1, p0, Lcom/google/android/material/resources/TextAppearance$1;->aOp:Landroid/text/TextPaint;
+    iget-object v1, p0, Lcom/google/android/material/resources/TextAppearance$1;->aOl: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;->aOr:Lcom/google/android/material/resources/TextAppearance;
+    iget-object v0, p0, Lcom/google/android/material/resources/TextAppearance$1;->aOn: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;->aOq:Landroidx/core/content/res/ResourcesCompat$FontCallback;
+    iget-object v0, p0, Lcom/google/android/material/resources/TextAppearance$1;->aOm: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 891183c0ac..2496cc9a68 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 aOs:Lcom/google/android/material/shape/InterpolateOnScrollPositionChangeHelper;
+.field final synthetic aOo: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;->aOs:Lcom/google/android/material/shape/InterpolateOnScrollPositionChangeHelper;
+    iput-object p1, p0, Lcom/google/android/material/shape/InterpolateOnScrollPositionChangeHelper$1;->aOo: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;->aOs:Lcom/google/android/material/shape/InterpolateOnScrollPositionChangeHelper;
+    iget-object v0, p0, Lcom/google/android/material/shape/InterpolateOnScrollPositionChangeHelper$1;->aOo: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 eb2fce7f2b..b42f9c92f9 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 aOu:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+.field final synthetic aOq: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;->aOu:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iput-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$10;->aOq: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;->aOu:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iget-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$10;->aOq: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;->aOu:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iget-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$10;->aOq: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 e15c38566b..0e5d8c3c17 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 aOu:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+.field final synthetic aOq:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
 
-.field private aOv:I
+.field private aOr:I
 
-.field final synthetic aOx:I
+.field final synthetic aOt: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;->aOu:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iput-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$11;->aOq:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
 
-    iput p2, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$11;->aOx:I
+    iput p2, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$11;->aOt:I
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iget p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$11;->aOx:I
+    iget p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$11;->aOt:I
 
-    iput p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$11;->aOv:I
+    iput p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$11;->aOr: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;->aOu:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iget-object v0, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$11;->aOq: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;->aOv:I
+    iget v1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$11;->aOr: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;->aOu:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iget-object v0, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$11;->aOq: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;->aOv:I
+    iput p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$11;->aOr: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 cc608b4395..165b388677 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 aOt:I
+.field final synthetic aOp:I
 
-.field final synthetic aOu:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+.field final synthetic aOq: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;->aOu:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iput-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$2;->aOq:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
 
-    iput p2, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$2;->aOt:I
+    iput p2, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$2;->aOp: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;->aOu:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iget-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$2;->aOq:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
 
-    iget v0, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$2;->aOt:I
+    iget v0, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$2;->aOp: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;->aOu:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iget-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$2;->aOq: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 3d1196d419..f632363a57 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 aOu:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+.field final synthetic aOq:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
 
-.field private aOv:I
+.field private aOr: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;->aOu:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iput-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$3;->aOq: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;->aOv:I
+    iput p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$3;->aOr: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;->aOu:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iget-object v0, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$3;->aOq: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;->aOv:I
+    iget v1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$3;->aOr: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;->aOu:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iget-object v0, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$3;->aOq: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;->aOv:I
+    iput p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$3;->aOr: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 df50e58e5f..7c86bf1182 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 aOu:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+.field final synthetic aOq: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;->aOu:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iput-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$4;->aOq: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 5aa9ec3ba9..9445843e9a 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 aOu:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+.field final synthetic aOq: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;->aOu:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iput-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$5;->aOq: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;->aOu:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iget-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$5;->aOq: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 1cde13cca1..c91110f5f5 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 aOu:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+.field final synthetic aOq: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;->aOu:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iput-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$6;->aOq: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;->aOu:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iget-object v1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$6;->aOq: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;->aOu:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iget-object v1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$6;->aOq: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 c2451bc43b..c8e625c917 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 aOu:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+.field final synthetic aOq: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;->aOu:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iput-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$7;->aOq: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;->aOu:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iget-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$7;->aOq: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;->zD()Lcom/google/android/material/snackbar/a;
+    invoke-static {}, Lcom/google/android/material/snackbar/a;->zB()Lcom/google/android/material/snackbar/a;
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$7;->aOu:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iget-object v0, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$7;->aOq: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;->zD()Lcom/google/android/material/snackbar/a;
+    invoke-static {}, Lcom/google/android/material/snackbar/a;->zB()Lcom/google/android/material/snackbar/a;
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$7;->aOu:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iget-object v0, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$7;->aOq: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 90188e0630..d25d7d1eaa 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 aOw:Lcom/google/android/material/snackbar/BaseTransientBottomBar$8;
+.field final synthetic aOs: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;->aOw:Lcom/google/android/material/snackbar/BaseTransientBottomBar$8;
+    iput-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$8$1;->aOs: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;->aOw:Lcom/google/android/material/snackbar/BaseTransientBottomBar$8;
+    iget-object v0, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$8$1;->aOs:Lcom/google/android/material/snackbar/BaseTransientBottomBar$8;
 
-    iget-object v0, v0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$8;->aOu:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iget-object v0, v0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$8;->aOq: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 ccfda858ed..86a41f4c4d 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 aOu:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+.field final synthetic aOq: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;->aOu:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iput-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$8;->aOq: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;->aOu:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iget-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$8;->aOq: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 cc72826ee6..5fc00642f6 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 aOu:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+.field final synthetic aOq: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;->aOu:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iput-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$9;->aOq: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;->aOu:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iget-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$9;->aOq: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;->aOu:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iget-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$9;->aOq: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;->aOu:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iget-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$9;->aOq: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;->aOu:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iget-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$9;->aOq: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 4e4e7bb2cb..a3afc89375 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;->zD()Lcom/google/android/material/snackbar/a;
+    invoke-static {}, Lcom/google/android/material/snackbar/a;->zB()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;->zD()Lcom/google/android/material/snackbar/a;
+    invoke-static {}, Lcom/google/android/material/snackbar/a;->zB()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 c398972b98..b7625c5f86 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 aOy:Lcom/google/android/material/snackbar/BaseTransientBottomBar$SnackbarBaseLayout;
+.field final synthetic aOu: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;->aOy:Lcom/google/android/material/snackbar/BaseTransientBottomBar$SnackbarBaseLayout;
+    iput-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$SnackbarBaseLayout$1;->aOu: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;->aOy:Lcom/google/android/material/snackbar/BaseTransientBottomBar$SnackbarBaseLayout;
+    iget-object v0, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$SnackbarBaseLayout$1;->aOu: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 da24b29c08..a67e8a5988 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;->zD()Lcom/google/android/material/snackbar/a;
+    invoke-static {}, Lcom/google/android/material/snackbar/a;->zB()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;->aOC:Lcom/google/android/material/snackbar/a$b;
+    iget-object v1, v0, Lcom/google/android/material/snackbar/a;->aOy: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;->aOD:Lcom/google/android/material/snackbar/a$b;
+    iget-object v1, v0, Lcom/google/android/material/snackbar/a;->aOz: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;->zD()Lcom/google/android/material/snackbar/a;
+    invoke-static {}, Lcom/google/android/material/snackbar/a;->zB()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;->zD()Lcom/google/android/material/snackbar/a;
+    invoke-static {}, Lcom/google/android/material/snackbar/a;->zB()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;->zD()Lcom/google/android/material/snackbar/a;
+    invoke-static {}, Lcom/google/android/material/snackbar/a;->zB()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;->aOC:Lcom/google/android/material/snackbar/a$b;
+    iput-object v1, v0, Lcom/google/android/material/snackbar/a;->aOy: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;
+    iget-object v1, v0, Lcom/google/android/material/snackbar/a;->aOz:Lcom/google/android/material/snackbar/a$b;
 
     if-eqz v1, :cond_0
 
-    invoke-virtual {v0}, Lcom/google/android/material/snackbar/a;->zE()V
+    invoke-virtual {v0}, Lcom/google/android/material/snackbar/a;->zC()V
 
     :cond_0
     monitor-exit v2
@@ -784,7 +784,7 @@
 .method onViewShown()V
     .locals 3
 
-    invoke-static {}, Lcom/google/android/material/snackbar/a;->zD()Lcom/google/android/material/snackbar/a;
+    invoke-static {}, Lcom/google/android/material/snackbar/a;->zB()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;->aOC:Lcom/google/android/material/snackbar/a$b;
+    iget-object v1, v0, Lcom/google/android/material/snackbar/a;->aOy: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;->zD()Lcom/google/android/material/snackbar/a;
+    invoke-static {}, Lcom/google/android/material/snackbar/a;->zB()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;->aOC:Lcom/google/android/material/snackbar/a$b;
+    iget-object v2, v0, Lcom/google/android/material/snackbar/a;->aOy: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;->aOC:Lcom/google/android/material/snackbar/a$b;
+    iget-object v2, v0, Lcom/google/android/material/snackbar/a;->aOy: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;->aOC:Lcom/google/android/material/snackbar/a$b;
+    iget-object v1, v0, Lcom/google/android/material/snackbar/a;->aOy: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;->aOD:Lcom/google/android/material/snackbar/a$b;
+    iget-object v2, v0, Lcom/google/android/material/snackbar/a;->aOz: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;->aOD:Lcom/google/android/material/snackbar/a$b;
+    iput-object v4, v0, Lcom/google/android/material/snackbar/a;->aOz:Lcom/google/android/material/snackbar/a$b;
 
     :goto_0
-    iget-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;->aOy:Lcom/google/android/material/snackbar/a$b;
 
     if-eqz v1, :cond_2
 
-    iget-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;->aOy: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;->aOC:Lcom/google/android/material/snackbar/a$b;
+    iput-object v1, v0, Lcom/google/android/material/snackbar/a;->aOy:Lcom/google/android/material/snackbar/a$b;
 
-    invoke-virtual {v0}, Lcom/google/android/material/snackbar/a;->zE()V
+    invoke-virtual {v0}, Lcom/google/android/material/snackbar/a;->zC()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 e06e0620ad..2128ea90c4 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 aOA:Lcom/google/android/material/snackbar/Snackbar;
+.field final synthetic aOv:Landroid/view/View$OnClickListener;
 
-.field final synthetic aOz:Landroid/view/View$OnClickListener;
+.field final synthetic aOw:Lcom/google/android/material/snackbar/Snackbar;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/material/snackbar/Snackbar;Landroid/view/View$OnClickListener;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/material/snackbar/Snackbar$1;->aOA:Lcom/google/android/material/snackbar/Snackbar;
+    iput-object p1, p0, Lcom/google/android/material/snackbar/Snackbar$1;->aOw:Lcom/google/android/material/snackbar/Snackbar;
 
-    iput-object p2, p0, Lcom/google/android/material/snackbar/Snackbar$1;->aOz:Landroid/view/View$OnClickListener;
+    iput-object p2, p0, Lcom/google/android/material/snackbar/Snackbar$1;->aOv: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;->aOz:Landroid/view/View$OnClickListener;
+    iget-object v0, p0, Lcom/google/android/material/snackbar/Snackbar$1;->aOv: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;->aOA:Lcom/google/android/material/snackbar/Snackbar;
+    iget-object p1, p0, Lcom/google/android/material/snackbar/Snackbar$1;->aOw: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 7ab9a4de9d..fbe9ab6c2b 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 aOE:Lcom/google/android/material/snackbar/a;
+.field final synthetic aOA: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;->aOE:Lcom/google/android/material/snackbar/a;
+    iput-object p1, p0, Lcom/google/android/material/snackbar/a$1;->aOA: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;->aOE:Lcom/google/android/material/snackbar/a;
+    iget-object v0, p0, Lcom/google/android/material/snackbar/a$1;->aOA: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;->aOC:Lcom/google/android/material/snackbar/a$b;
+    iget-object v2, v0, Lcom/google/android/material/snackbar/a;->aOy:Lcom/google/android/material/snackbar/a$b;
 
     if-eq v2, p1, :cond_1
 
-    iget-object v2, v0, Lcom/google/android/material/snackbar/a;->aOD:Lcom/google/android/material/snackbar/a$b;
+    iget-object v2, v0, Lcom/google/android/material/snackbar/a;->aOz: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 7a419f1628..ccc44e2466 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 aOF:Ljava/lang/ref/WeakReference;
+.field final aOB:Ljava/lang/ref/WeakReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/ref/WeakReference<",
@@ -25,9 +25,9 @@
     .end annotation
 .end field
 
-.field duration:I
+.field bP:Z
 
-.field paused:Z
+.field duration:I
 
 
 # direct methods
@@ -40,7 +40,7 @@
 
     invoke-direct {v0, p2}, Ljava/lang/ref/WeakReference;-><init>(Ljava/lang/Object;)V
 
-    iput-object v0, p0, Lcom/google/android/material/snackbar/a$b;->aOF:Ljava/lang/ref/WeakReference;
+    iput-object v0, p0, Lcom/google/android/material/snackbar/a$b;->aOB: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;->aOF:Ljava/lang/ref/WeakReference;
+    iget-object v0, p0, Lcom/google/android/material/snackbar/a$b;->aOB: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 fd75502680..fa505fb753 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 aOB:Lcom/google/android/material/snackbar/a;
+.field private static aOx:Lcom/google/android/material/snackbar/a;
 
 
 # instance fields
-.field aOC:Lcom/google/android/material/snackbar/a$b;
+.field aOy:Lcom/google/android/material/snackbar/a$b;
 
-.field aOD:Lcom/google/android/material/snackbar/a$b;
+.field aOz:Lcom/google/android/material/snackbar/a$b;
 
 .field final handler:Landroid/os/Handler;
 
@@ -55,10 +55,10 @@
     return-void
 .end method
 
-.method static zD()Lcom/google/android/material/snackbar/a;
+.method static zB()Lcom/google/android/material/snackbar/a;
     .locals 1
 
-    sget-object v0, Lcom/google/android/material/snackbar/a;->aOB:Lcom/google/android/material/snackbar/a;
+    sget-object v0, Lcom/google/android/material/snackbar/a;->aOx: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;->aOB:Lcom/google/android/material/snackbar/a;
+    sput-object v0, Lcom/google/android/material/snackbar/a;->aOx:Lcom/google/android/material/snackbar/a;
 
     :cond_0
-    sget-object v0, Lcom/google/android/material/snackbar/a;->aOB:Lcom/google/android/material/snackbar/a;
+    sget-object v0, Lcom/google/android/material/snackbar/a;->aOx: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;->aOC:Lcom/google/android/material/snackbar/a$b;
+    iget-object p1, p0, Lcom/google/android/material/snackbar/a;->aOy:Lcom/google/android/material/snackbar/a$b;
 
-    iget-boolean p1, p1, Lcom/google/android/material/snackbar/a$b;->paused:Z
+    iget-boolean p1, p1, Lcom/google/android/material/snackbar/a$b;->bP:Z
 
     if-nez p1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/material/snackbar/a;->aOC:Lcom/google/android/material/snackbar/a$b;
+    iget-object p1, p0, Lcom/google/android/material/snackbar/a;->aOy:Lcom/google/android/material/snackbar/a$b;
 
     const/4 v1, 0x1
 
-    iput-boolean v1, p1, Lcom/google/android/material/snackbar/a$b;->paused:Z
+    iput-boolean v1, p1, Lcom/google/android/material/snackbar/a$b;->bP: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;->aOC:Lcom/google/android/material/snackbar/a$b;
+    iget-object v1, p0, Lcom/google/android/material/snackbar/a;->aOy: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;->aOF:Ljava/lang/ref/WeakReference;
+    iget-object v0, p1, Lcom/google/android/material/snackbar/a$b;->aOB: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;->aOC:Lcom/google/android/material/snackbar/a$b;
+    iget-object p1, p0, Lcom/google/android/material/snackbar/a;->aOy:Lcom/google/android/material/snackbar/a$b;
 
-    iget-boolean p1, p1, Lcom/google/android/material/snackbar/a$b;->paused:Z
+    iget-boolean p1, p1, Lcom/google/android/material/snackbar/a$b;->bP:Z
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/material/snackbar/a;->aOC:Lcom/google/android/material/snackbar/a$b;
+    iget-object p1, p0, Lcom/google/android/material/snackbar/a;->aOy:Lcom/google/android/material/snackbar/a$b;
 
     const/4 v1, 0x0
 
-    iput-boolean v1, p1, Lcom/google/android/material/snackbar/a$b;->paused:Z
+    iput-boolean v1, p1, Lcom/google/android/material/snackbar/a$b;->bP:Z
 
-    iget-object p1, p0, Lcom/google/android/material/snackbar/a;->aOC:Lcom/google/android/material/snackbar/a$b;
+    iget-object p1, p0, Lcom/google/android/material/snackbar/a;->aOy: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;->aOC:Lcom/google/android/material/snackbar/a$b;
+    iget-object v0, p0, Lcom/google/android/material/snackbar/a;->aOy: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;->aOD:Lcom/google/android/material/snackbar/a$b;
+    iget-object v0, p0, Lcom/google/android/material/snackbar/a;->aOz:Lcom/google/android/material/snackbar/a$b;
 
     if-eqz v0, :cond_0
 
@@ -367,22 +367,22 @@
     return p1
 .end method
 
-.method final zE()V
+.method final zC()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/material/snackbar/a;->aOD:Lcom/google/android/material/snackbar/a$b;
+    iget-object v0, p0, Lcom/google/android/material/snackbar/a;->aOz:Lcom/google/android/material/snackbar/a$b;
 
     if-eqz v0, :cond_1
 
-    iput-object v0, p0, Lcom/google/android/material/snackbar/a;->aOC:Lcom/google/android/material/snackbar/a$b;
+    iput-object v0, p0, Lcom/google/android/material/snackbar/a;->aOy:Lcom/google/android/material/snackbar/a$b;
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/google/android/material/snackbar/a;->aOD:Lcom/google/android/material/snackbar/a$b;
+    iput-object v0, p0, Lcom/google/android/material/snackbar/a;->aOz: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, p0, Lcom/google/android/material/snackbar/a;->aOy:Lcom/google/android/material/snackbar/a$b;
 
-    iget-object v1, v1, Lcom/google/android/material/snackbar/a$b;->aOF:Ljava/lang/ref/WeakReference;
+    iget-object v1, v1, Lcom/google/android/material/snackbar/a$b;->aOB: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;->aOC:Lcom/google/android/material/snackbar/a$b;
+    iput-object v0, p0, Lcom/google/android/material/snackbar/a;->aOy: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 ec41909728..3f3706d37a 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 aOG:Lcom/google/android/material/tabs/TabLayout;
+.field final synthetic aOC: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;->aOG:Lcom/google/android/material/tabs/TabLayout;
+    iput-object p1, p0, Lcom/google/android/material/tabs/TabLayout$1;->aOC: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;->aOG:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$1;->aOC: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 b7e293e6a0..d52d218982 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 aOG:Lcom/google/android/material/tabs/TabLayout;
+.field final synthetic aOC:Lcom/google/android/material/tabs/TabLayout;
 
-.field aOH:Z
+.field aOD: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;->aOG:Lcom/google/android/material/tabs/TabLayout;
+    iput-object p1, p0, Lcom/google/android/material/tabs/TabLayout$a;->aOC: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;->aOG:Lcom/google/android/material/tabs/TabLayout;
+    iget-object p2, p0, Lcom/google/android/material/tabs/TabLayout$a;->aOC: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;->aOG:Lcom/google/android/material/tabs/TabLayout;
+    iget-object p1, p0, Lcom/google/android/material/tabs/TabLayout$a;->aOC:Lcom/google/android/material/tabs/TabLayout;
 
-    iget-boolean p2, p0, Lcom/google/android/material/tabs/TabLayout$a;->aOH:Z
+    iget-boolean p2, p0, Lcom/google/android/material/tabs/TabLayout$a;->aOD: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 07bae99df5..192613c381 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 aOG:Lcom/google/android/material/tabs/TabLayout;
+.field final synthetic aOC: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;->aOG:Lcom/google/android/material/tabs/TabLayout;
+    iput-object p1, p0, Lcom/google/android/material/tabs/TabLayout$b;->aOC: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;->aOG:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$b;->aOC: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;->aOG:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$b;->aOC: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 6174f29feb..d42c243a13 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 aOR:I
+.field final synthetic aON:I
 
-.field final synthetic aOS:I
+.field final synthetic aOO:I
 
-.field final synthetic aOT:I
+.field final synthetic aOP:I
 
-.field final synthetic aOU:I
+.field final synthetic aOQ:I
 
-.field final synthetic aOV:Lcom/google/android/material/tabs/TabLayout$c;
+.field final synthetic aOR: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;->aOV:Lcom/google/android/material/tabs/TabLayout$c;
+    iput-object p1, p0, Lcom/google/android/material/tabs/TabLayout$c$1;->aOR:Lcom/google/android/material/tabs/TabLayout$c;
 
-    iput p2, p0, Lcom/google/android/material/tabs/TabLayout$c$1;->aOR:I
+    iput p2, p0, Lcom/google/android/material/tabs/TabLayout$c$1;->aON:I
 
-    iput p3, p0, Lcom/google/android/material/tabs/TabLayout$c$1;->aOS:I
+    iput p3, p0, Lcom/google/android/material/tabs/TabLayout$c$1;->aOO:I
 
-    iput p4, p0, Lcom/google/android/material/tabs/TabLayout$c$1;->aOT:I
+    iput p4, p0, Lcom/google/android/material/tabs/TabLayout$c$1;->aOP:I
 
-    iput p5, p0, Lcom/google/android/material/tabs/TabLayout$c$1;->aOU:I
+    iput p5, p0, Lcom/google/android/material/tabs/TabLayout$c$1;->aOQ: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;->aOV:Lcom/google/android/material/tabs/TabLayout$c;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c$1;->aOR:Lcom/google/android/material/tabs/TabLayout$c;
 
-    iget v1, p0, Lcom/google/android/material/tabs/TabLayout$c$1;->aOR:I
+    iget v1, p0, Lcom/google/android/material/tabs/TabLayout$c$1;->aON:I
 
-    iget v2, p0, Lcom/google/android/material/tabs/TabLayout$c$1;->aOS:I
+    iget v2, p0, Lcom/google/android/material/tabs/TabLayout$c$1;->aOO: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;->aOT:I
+    iget v2, p0, Lcom/google/android/material/tabs/TabLayout$c$1;->aOP:I
 
-    iget v3, p0, Lcom/google/android/material/tabs/TabLayout$c$1;->aOU:I
+    iget v3, p0, Lcom/google/android/material/tabs/TabLayout$c$1;->aOQ: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 05b1294f2f..e46717ea70 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 aOV:Lcom/google/android/material/tabs/TabLayout$c;
+.field final synthetic aOR:Lcom/google/android/material/tabs/TabLayout$c;
 
-.field final synthetic aOW:I
+.field final synthetic aOS: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;->aOV:Lcom/google/android/material/tabs/TabLayout$c;
+    iput-object p1, p0, Lcom/google/android/material/tabs/TabLayout$c$2;->aOR:Lcom/google/android/material/tabs/TabLayout$c;
 
-    iput p2, p0, Lcom/google/android/material/tabs/TabLayout$c$2;->aOW:I
+    iput p2, p0, Lcom/google/android/material/tabs/TabLayout$c$2;->aOS: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;->aOV:Lcom/google/android/material/tabs/TabLayout$c;
+    iget-object p1, p0, Lcom/google/android/material/tabs/TabLayout$c$2;->aOR:Lcom/google/android/material/tabs/TabLayout$c;
 
-    iget v0, p0, Lcom/google/android/material/tabs/TabLayout$c$2;->aOW:I
+    iget v0, p0, Lcom/google/android/material/tabs/TabLayout$c$2;->aOS:I
 
-    iput v0, p1, Lcom/google/android/material/tabs/TabLayout$c;->aOL:I
+    iput v0, p1, Lcom/google/android/material/tabs/TabLayout$c;->aOH:I
 
     const/4 v0, 0x0
 
-    iput v0, p1, Lcom/google/android/material/tabs/TabLayout$c;->aOM:F
+    iput v0, p1, Lcom/google/android/material/tabs/TabLayout$c;->aOI: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 e4c43bed09..1decbb1219 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,45 +15,45 @@
 
 
 # instance fields
-.field final synthetic aOG:Lcom/google/android/material/tabs/TabLayout;
+.field final synthetic aOC:Lcom/google/android/material/tabs/TabLayout;
 
-.field private aOI:I
+.field private aOE:I
 
-.field private final aOJ:Landroid/graphics/Paint;
+.field private final aOF:Landroid/graphics/Paint;
 
-.field private final aOK:Landroid/graphics/drawable/GradientDrawable;
+.field private final aOG:Landroid/graphics/drawable/GradientDrawable;
 
-.field aOL:I
+.field aOH:I
 
-.field aOM:F
+.field aOI:F
 
-.field private aON:I
+.field private aOJ:I
 
-.field private aOO:I
+.field private aOK:I
 
-.field private aOP:I
+.field private aOL:I
 
-.field aOQ:Landroid/animation/ValueAnimator;
+.field aOM: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;->aOG:Lcom/google/android/material/tabs/TabLayout;
+    iput-object p1, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOC: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;->aOH:I
+
+    iput p1, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOJ:I
+
+    iput p1, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOK:I
+
     iput p1, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOL:I
 
-    iput p1, p0, Lcom/google/android/material/tabs/TabLayout$c;->aON:I
-
-    iput p1, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOO:I
-
-    iput p1, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOP:I
-
     const/4 p1, 0x0
 
     invoke-virtual {p0, p1}, Lcom/google/android/material/tabs/TabLayout$c;->setWillNotDraw(Z)V
@@ -62,13 +62,13 @@
 
     invoke-direct {p1}, Landroid/graphics/Paint;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOJ:Landroid/graphics/Paint;
+    iput-object p1, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOF: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;->aOK:Landroid/graphics/drawable/GradientDrawable;
+    iput-object p1, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOG: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;->zG()I
+    invoke-virtual {p1}, Lcom/google/android/material/tabs/TabLayout$d;->zE()I
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOG:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v1, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOC: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;->aOG:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOC: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;->aOO:I
+    iget v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOK:I
 
     if-ne p1, v0, :cond_0
 
-    iget v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOP:I
+    iget v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOL:I
 
     if-eq p2, v0, :cond_1
 
     :cond_0
-    iput p1, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOO:I
+    iput p1, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOK:I
 
-    iput p2, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOP:I
+    iput p2, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOL: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;->aOQ:Landroid/animation/ValueAnimator;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOM: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;->aOQ:Landroid/animation/ValueAnimator;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOM: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;->zF()V
+    invoke-virtual {p0}, Lcom/google/android/material/tabs/TabLayout$c;->zD()V
 
     return-void
 
@@ -187,7 +187,7 @@
 
     move-result v2
 
-    iget-object v3, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOG:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v3, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOC: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;->aOG:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v1, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOC: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;->aOG:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOC: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;->aOG:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOC: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;->aOO:I
+    iget v5, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOK:I
 
-    iget v7, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOP:I
+    iget v7, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOL: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;->aOQ:Landroid/animation/ValueAnimator;
+    iput-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOM: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;->aOJ:Landroid/graphics/Paint;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOF: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;->aOJ:Landroid/graphics/Paint;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOF: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;->aOI:I
+    iget v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOE:I
 
     if-eq v0, p1, :cond_0
 
-    iput p1, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOI:I
+    iput p1, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOE: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;->aOG:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOC: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;->aOG:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOC: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;->aOI:I
+    iget v2, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOE:I
 
     if-ltz v2, :cond_1
 
     move v0, v2
 
     :cond_1
-    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOG:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOC: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;->aOO:I
+    iget v2, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOK:I
 
     if-ltz v2, :cond_9
 
-    iget v3, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOP:I
+    iget v3, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOL:I
 
     if-le v3, v2, :cond_9
 
-    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOG:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOC: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;->aOG:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOC: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;->aOK:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOG: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;->aOO:I
+    iget v3, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOK:I
 
-    iget v4, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOP:I
+    iget v4, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOL: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;->aOJ:Landroid/graphics/Paint;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOF: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;->aOJ:Landroid/graphics/Paint;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOF: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;->aOJ:Landroid/graphics/Paint;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOF: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;->aOQ:Landroid/animation/ValueAnimator;
+    iget-object p1, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOM: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;->aOQ:Landroid/animation/ValueAnimator;
+    iget-object p1, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOM:Landroid/animation/ValueAnimator;
 
     invoke-virtual {p1}, Landroid/animation/ValueAnimator;->cancel()V
 
-    iget-object p1, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOQ:Landroid/animation/ValueAnimator;
+    iget-object p1, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOM: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;->aOL:I
+    iget p3, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOH:I
 
     const/high16 p4, 0x3f800000    # 1.0f
 
-    iget-object p5, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOQ:Landroid/animation/ValueAnimator;
+    iget-object p5, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOM: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;->zF()V
+    invoke-virtual {p0}, Lcom/google/android/material/tabs/TabLayout$c;->zD()V
 
     return-void
 .end method
@@ -568,7 +568,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOG:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOC: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;->aOG:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOC: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;->aOG:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v3, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOC: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;->aOG:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOC: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;->aON:I
+    iget v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOJ: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;->aON:I
+    iput p1, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOJ:I
 
     :cond_0
     return-void
 .end method
 
-.method final zF()V
+.method final zD()V
     .locals 7
 
-    iget v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOL:I
+    iget v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOH: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;->aOG:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v3, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOC: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;->aOG:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v1, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOC: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;->aOG:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOC: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;->aOG:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOC: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;->aOM:F
+    iget v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOI:F
 
     const/4 v3, 0x0
 
@@ -801,7 +801,7 @@
 
     if-lez v0, :cond_3
 
-    iget v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOL:I
+    iget v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOH: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;->aOL:I
+    iget v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOH: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;->aOG:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v5, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOC: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;->aOG:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v3, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOC: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;->aOG:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOC: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;->aOG:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOC: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;->aOM:F
+    iget v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOI: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 88a2f080e9..203d992cab 100644
--- a/com.discord/smali_classes2/com/google/android/material/tabs/TabLayout$d.smali
+++ b/com.discord/smali_classes2/com/google/android/material/tabs/TabLayout$d.smali
@@ -15,19 +15,19 @@
 
 
 # instance fields
-.field final synthetic aOG:Lcom/google/android/material/tabs/TabLayout;
+.field final synthetic aOC:Lcom/google/android/material/tabs/TabLayout;
 
-.field private aOX:Lcom/google/android/material/tabs/TabLayout$Tab;
+.field private aOT:Lcom/google/android/material/tabs/TabLayout$Tab;
 
-.field aOY:Landroid/widget/ImageView;
+.field aOU:Landroid/widget/ImageView;
 
-.field aOZ:Landroid/widget/TextView;
+.field aOV:Landroid/widget/TextView;
 
-.field aPa:Landroid/widget/ImageView;
+.field aOW:Landroid/widget/ImageView;
 
-.field private aPb:Landroid/graphics/drawable/Drawable;
+.field private aOX:Landroid/graphics/drawable/Drawable;
 
-.field private aPc:I
+.field private aOY: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;->aOG:Lcom/google/android/material/tabs/TabLayout;
+    iput-object p1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOC: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;->aPc:I
+    iput v0, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOY: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;->aPb:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOX: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;->aPb:Landroid/graphics/drawable/Drawable;
+    iget-object p0, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOX: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;->aOG:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOC: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;->aOG:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOC: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;->aPb:Landroid/graphics/drawable/Drawable;
+    iput-object p1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOX:Landroid/graphics/drawable/Drawable;
 
-    iget-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;->aOX: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;->aPb:Landroid/graphics/drawable/Drawable;
+    iget-object p1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOX: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;->aPb:Landroid/graphics/drawable/Drawable;
+    iput-object v1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOX: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;->aOG:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOC: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;->aOG:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v3, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOC: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;->aOG:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v4, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOC: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;->aOG:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v4, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOC: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;->aOG:Lcom/google/android/material/tabs/TabLayout;
+    iget-object p1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOC: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;->aOX:Lcom/google/android/material/tabs/TabLayout$Tab;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOT: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;->aOX:Lcom/google/android/material/tabs/TabLayout$Tab;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOT: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;->aOX:Lcom/google/android/material/tabs/TabLayout$Tab;
+    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOT: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;->aOG:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOC: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;->aOG:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v3, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOC: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;->aOX:Lcom/google/android/material/tabs/TabLayout$Tab;
+    iget-object p1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOT: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;->aOX:Lcom/google/android/material/tabs/TabLayout$Tab;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOT:Lcom/google/android/material/tabs/TabLayout$Tab;
 
     if-eq p1, v0, :cond_0
 
-    iput-object p1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOX:Lcom/google/android/material/tabs/TabLayout$Tab;
+    iput-object p1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOT: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;->aPb:Landroid/graphics/drawable/Drawable;
+    iget-object v1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOX: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;->aPb:Landroid/graphics/drawable/Drawable;
+    iget-object v1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOX: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;->aOG:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOC: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;->aOG:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOC: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;->aOG:Lcom/google/android/material/tabs/TabLayout;
+    iget-object p1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOC: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;->aOG:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOC: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;->aPc:I
+    iget v1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOY:I
 
-    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOY:Landroid/widget/ImageView;
+    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOU: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;->aOG:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOC: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;->aOG:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v5, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOC: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;->aOX:Lcom/google/android/material/tabs/TabLayout$Tab;
+    iget-object v1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOT: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;->aOX:Lcom/google/android/material/tabs/TabLayout$Tab;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOT: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;->aOY:Landroid/widget/ImageView;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOU: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;->aOX:Lcom/google/android/material/tabs/TabLayout$Tab;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOT: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;->aOY:Landroid/widget/ImageView;
+    iget-object v3, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOU: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;->aOY:Landroid/widget/ImageView;
+    iget-object v3, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOU: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;->aOZ:Landroid/widget/TextView;
+    iput-object v3, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOV:Landroid/widget/TextView;
 
-    iget-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;->aOV: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;->aPc:I
+    iput v3, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOY: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;->aPa:Landroid/widget/ImageView;
+    iput-object v2, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOW: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;->aOZ:Landroid/widget/TextView;
+    iput-object v1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOV:Landroid/widget/TextView;
 
-    iput-object v1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aPa:Landroid/widget/ImageView;
+    iput-object v1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOW: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;->aOY:Landroid/widget/ImageView;
+    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOU: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;->aOY:Landroid/widget/ImageView;
+    iput-object v2, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOU: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;->aOG:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOC: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;->aOG:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOC: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;->aOG:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOC: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;->aPc:I
+    iput v1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOY: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;->aOG:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOC: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;->aOG:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOC: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;->aOG:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOC: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;->aOY:Landroid/widget/ImageView;
+    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOU: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;->aOZ:Landroid/widget/TextView;
+    iget-object v1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOV:Landroid/widget/TextView;
 
     if-nez v1, :cond_e
 
-    iget-object v1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aPa:Landroid/widget/ImageView;
+    iget-object v1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOW:Landroid/widget/ImageView;
 
     if-eqz v1, :cond_f
 
     :cond_e
-    iget-object v1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOZ:Landroid/widget/TextView;
+    iget-object v1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOV:Landroid/widget/TextView;
 
-    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$d;->aPa:Landroid/widget/ImageView;
+    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOW: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 zG()I
+.method final zE()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;->aOY:Landroid/widget/ImageView;
+    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOU: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 74b1f785e7..0a098c5a37 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;->aOH:Z
+    iput-boolean p2, v0, Lcom/google/android/material/tabs/TabLayout$a;->aOD: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;->aOG:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v1, v0, Lcom/google/android/material/tabs/TabLayout$d;->aOC: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;->aOZ:Landroid/widget/TextView;
+    iget-object v1, v0, Lcom/google/android/material/tabs/TabLayout$d;->aOV:Landroid/widget/TextView;
 
     if-nez v1, :cond_1
 
-    iget-object v1, v0, Lcom/google/android/material/tabs/TabLayout$d;->aPa:Landroid/widget/ImageView;
+    iget-object v1, v0, Lcom/google/android/material/tabs/TabLayout$d;->aOW: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;->aOY:Landroid/widget/ImageView;
+    iget-object v2, v0, Lcom/google/android/material/tabs/TabLayout$d;->aOU: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;->aOZ:Landroid/widget/TextView;
+    iget-object v1, v0, Lcom/google/android/material/tabs/TabLayout$d;->aOV:Landroid/widget/TextView;
 
-    iget-object v2, v0, Lcom/google/android/material/tabs/TabLayout$d;->aPa:Landroid/widget/ImageView;
+    iget-object v2, v0, Lcom/google/android/material/tabs/TabLayout$d;->aOW: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;->aOQ:Landroid/animation/ValueAnimator;
+    iget-object v1, p4, Lcom/google/android/material/tabs/TabLayout$c;->aOM:Landroid/animation/ValueAnimator;
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p4, Lcom/google/android/material/tabs/TabLayout$c;->aOQ:Landroid/animation/ValueAnimator;
+    iget-object v1, p4, Lcom/google/android/material/tabs/TabLayout$c;->aOM: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;->aOQ:Landroid/animation/ValueAnimator;
+    iget-object v1, p4, Lcom/google/android/material/tabs/TabLayout$c;->aOM:Landroid/animation/ValueAnimator;
 
     invoke-virtual {v1}, Landroid/animation/ValueAnimator;->cancel()V
 
     :cond_1
-    iput p1, p4, Lcom/google/android/material/tabs/TabLayout$c;->aOL:I
+    iput p1, p4, Lcom/google/android/material/tabs/TabLayout$c;->aOH:I
 
-    iput p2, p4, Lcom/google/android/material/tabs/TabLayout$c;->aOM:F
+    iput p2, p4, Lcom/google/android/material/tabs/TabLayout$c;->aOI:F
 
-    invoke-virtual {p4}, Lcom/google/android/material/tabs/TabLayout$c;->zF()V
+    invoke-virtual {p4}, Lcom/google/android/material/tabs/TabLayout$c;->zD()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 c5bb377ff5..92f3e45108 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 aPA:Lcom/google/android/material/textfield/TextInputLayout;
+.field final synthetic aPw: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;->aPA:Lcom/google/android/material/textfield/TextInputLayout;
+    iput-object p1, p0, Lcom/google/android/material/textfield/TextInputLayout$1;->aPw: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;->aPA:Lcom/google/android/material/textfield/TextInputLayout;
+    iget-object v0, p0, Lcom/google/android/material/textfield/TextInputLayout$1;->aPw: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;->aPA:Lcom/google/android/material/textfield/TextInputLayout;
+    iget-object v0, p0, Lcom/google/android/material/textfield/TextInputLayout$1;->aPw: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;->aPA:Lcom/google/android/material/textfield/TextInputLayout;
+    iget-object v0, p0, Lcom/google/android/material/textfield/TextInputLayout$1;->aPw: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 ea1d704c66..300b2732bc 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 aPA:Lcom/google/android/material/textfield/TextInputLayout;
+.field final synthetic aPw: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;->aPA:Lcom/google/android/material/textfield/TextInputLayout;
+    iput-object p1, p0, Lcom/google/android/material/textfield/TextInputLayout$2;->aPw: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;->aPA:Lcom/google/android/material/textfield/TextInputLayout;
+    iget-object p1, p0, Lcom/google/android/material/textfield/TextInputLayout$2;->aPw: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 9e980e8acd..127af5175b 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 aPA:Lcom/google/android/material/textfield/TextInputLayout;
+.field final synthetic aPw: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;->aPA:Lcom/google/android/material/textfield/TextInputLayout;
+    iput-object p1, p0, Lcom/google/android/material/textfield/TextInputLayout$3;->aPw: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;->aPA:Lcom/google/android/material/textfield/TextInputLayout;
+    iget-object v0, p0, Lcom/google/android/material/textfield/TextInputLayout$3;->aPw: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 b2fd0590d9..bce94f01a5 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 aPB:Ljava/lang/CharSequence;
+.field aPx:Ljava/lang/CharSequence;
 
-.field aPC:Z
+.field aPy:Z
 
 
 # direct methods
@@ -58,7 +58,7 @@
 
     check-cast p2, Ljava/lang/CharSequence;
 
-    iput-object p2, p0, Lcom/google/android/material/textfield/TextInputLayout$SavedState;->aPB:Ljava/lang/CharSequence;
+    iput-object p2, p0, Lcom/google/android/material/textfield/TextInputLayout$SavedState;->aPx: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;->aPC:Z
+    iput-boolean p2, p0, Lcom/google/android/material/textfield/TextInputLayout$SavedState;->aPy: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;->aPB:Ljava/lang/CharSequence;
+    iget-object v1, p0, Lcom/google/android/material/textfield/TextInputLayout$SavedState;->aPx: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;->aPB:Ljava/lang/CharSequence;
+    iget-object v0, p0, Lcom/google/android/material/textfield/TextInputLayout$SavedState;->aPx: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;->aPC:Z
+    iget-boolean p2, p0, Lcom/google/android/material/textfield/TextInputLayout$SavedState;->aPy: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 722187b876..17dd1c2a81 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;->zH()Z
+    invoke-virtual {p1}, Lcom/google/android/material/textfield/a;->zF()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;->zK()V
+    invoke-virtual {p1}, Lcom/google/android/material/textfield/b;->zI()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;->zL()Z
+    invoke-virtual {v3}, Lcom/google/android/material/textfield/b;->zJ()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;->aPr:Landroid/widget/TextView;
+    iget-object v5, v4, Lcom/google/android/material/textfield/b;->aPn:Landroid/widget/TextView;
 
     if-eqz v5, :cond_4
 
-    iget-object v4, v4, Lcom/google/android/material/textfield/b;->aPr:Landroid/widget/TextView;
+    iget-object v4, v4, Lcom/google/android/material/textfield/b;->aPn: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;->zH()Z
+    invoke-virtual {v0}, Lcom/google/android/material/textfield/a;->zF()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;->aPq:Z
+    iget-boolean v0, v0, Lcom/google/android/material/textfield/b;->aPm: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;->aPp:Ljava/lang/CharSequence;
+    iget-object v0, v0, Lcom/google/android/material/textfield/b;->aPl: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;->zM()I
+    invoke-virtual {v0}, Lcom/google/android/material/textfield/b;->zK()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;->zM()I
+    invoke-virtual {v0}, Lcom/google/android/material/textfield/b;->zK()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;->aPt:Z
+    iget-boolean v0, v0, Lcom/google/android/material/textfield/b;->aPp: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;->aPs:Ljava/lang/CharSequence;
+    iget-object v0, v0, Lcom/google/android/material/textfield/b;->aPo: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;->aPu:Landroid/widget/TextView;
+    iget-object v1, v0, Lcom/google/android/material/textfield/b;->aPq:Landroid/widget/TextView;
 
     if-eqz v1, :cond_0
 
-    iget-object v0, v0, Lcom/google/android/material/textfield/b;->aPu:Landroid/widget/TextView;
+    iget-object v0, v0, Lcom/google/android/material/textfield/b;->aPq: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;->aPq:Z
+    iget-boolean v0, v0, Lcom/google/android/material/textfield/b;->aPm: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;->aPn:I
+    iget v1, v0, Lcom/google/android/material/textfield/b;->aPj:I
 
     const/4 v2, 0x2
 
     if-ne v1, v2, :cond_0
 
-    iget-object v1, v0, Lcom/google/android/material/textfield/b;->aPu:Landroid/widget/TextView;
+    iget-object v1, v0, Lcom/google/android/material/textfield/b;->aPq:Landroid/widget/TextView;
 
     if-eqz v1, :cond_0
 
-    iget-object v0, v0, Lcom/google/android/material/textfield/b;->aPs:Ljava/lang/CharSequence;
+    iget-object v0, v0, Lcom/google/android/material/textfield/b;->aPo: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;->aPt:Z
+    iget-boolean v0, v0, Lcom/google/android/material/textfield/b;->aPp: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;->aPB:Ljava/lang/CharSequence;
+    iget-object v0, p1, Lcom/google/android/material/textfield/TextInputLayout$SavedState;->aPx: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;->aPC:Z
+    iget-boolean p1, p1, Lcom/google/android/material/textfield/TextInputLayout$SavedState;->aPy: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;->zL()Z
+    invoke-virtual {v0}, Lcom/google/android/material/textfield/b;->zJ()Z
 
     move-result v0
 
@@ -3266,12 +3266,12 @@
 
     move-result-object v0
 
-    iput-object v0, v1, Lcom/google/android/material/textfield/TextInputLayout$SavedState;->aPB:Ljava/lang/CharSequence;
+    iput-object v0, v1, Lcom/google/android/material/textfield/TextInputLayout$SavedState;->aPx: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;->aPC:Z
+    iput-boolean v0, v1, Lcom/google/android/material/textfield/TextInputLayout$SavedState;->aPy: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;->aPq:Z
+    iget-boolean v0, v0, Lcom/google/android/material/textfield/b;->aPm: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;->zJ()V
+    invoke-virtual {v0}, Lcom/google/android/material/textfield/b;->zH()V
 
-    iput-object p1, v0, Lcom/google/android/material/textfield/b;->aPp:Ljava/lang/CharSequence;
+    iput-object p1, v0, Lcom/google/android/material/textfield/b;->aPl:Ljava/lang/CharSequence;
 
-    iget-object v2, v0, Lcom/google/android/material/textfield/b;->aPr:Landroid/widget/TextView;
+    iget-object v2, v0, Lcom/google/android/material/textfield/b;->aPn:Landroid/widget/TextView;
 
     invoke-virtual {v2, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    iget v2, v0, Lcom/google/android/material/textfield/b;->aPn:I
+    iget v2, v0, Lcom/google/android/material/textfield/b;->aPj:I
 
     if-eq v2, v1, :cond_2
 
-    iput v1, v0, Lcom/google/android/material/textfield/b;->aPo:I
+    iput v1, v0, Lcom/google/android/material/textfield/b;->aPk:I
 
     :cond_2
-    iget v1, v0, Lcom/google/android/material/textfield/b;->aPn:I
+    iget v1, v0, Lcom/google/android/material/textfield/b;->aPj:I
 
-    iget v2, v0, Lcom/google/android/material/textfield/b;->aPo:I
+    iget v2, v0, Lcom/google/android/material/textfield/b;->aPk:I
 
-    iget-object v3, v0, Lcom/google/android/material/textfield/b;->aPr:Landroid/widget/TextView;
+    iget-object v3, v0, Lcom/google/android/material/textfield/b;->aPn: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;->zI()V
+    invoke-virtual {p1}, Lcom/google/android/material/textfield/b;->zG()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;->aPq:Z
+    iget-boolean v1, v0, Lcom/google/android/material/textfield/b;->aPm:Z
 
     if-eq v1, p1, :cond_2
 
-    invoke-virtual {v0}, Lcom/google/android/material/textfield/b;->zJ()V
+    invoke-virtual {v0}, Lcom/google/android/material/textfield/b;->zH()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;->aPr:Landroid/widget/TextView;
+    iput-object v2, v0, Lcom/google/android/material/textfield/b;->aPn:Landroid/widget/TextView;
 
-    iget-object v2, v0, Lcom/google/android/material/textfield/b;->aPr:Landroid/widget/TextView;
+    iget-object v2, v0, Lcom/google/android/material/textfield/b;->aPn: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;->aPr:Landroid/widget/TextView;
+    iget-object v2, v0, Lcom/google/android/material/textfield/b;->aPn: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;->aPr:Landroid/widget/TextView;
+    iget-object v2, v0, Lcom/google/android/material/textfield/b;->aPn: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;->aPr:Landroid/widget/TextView;
+    iget-object v2, v0, Lcom/google/android/material/textfield/b;->aPn: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;->aPr:Landroid/widget/TextView;
+    iget-object v2, v0, Lcom/google/android/material/textfield/b;->aPn: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;->zI()V
+    invoke-virtual {v0}, Lcom/google/android/material/textfield/b;->zG()V
 
-    iget-object v2, v0, Lcom/google/android/material/textfield/b;->aPr:Landroid/widget/TextView;
+    iget-object v2, v0, Lcom/google/android/material/textfield/b;->aPn: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;->aPr:Landroid/widget/TextView;
+    iput-object v1, v0, Lcom/google/android/material/textfield/b;->aPn:Landroid/widget/TextView;
 
-    iget-object v1, v0, Lcom/google/android/material/textfield/b;->aPg:Lcom/google/android/material/textfield/TextInputLayout;
+    iget-object v1, v0, Lcom/google/android/material/textfield/b;->aPc: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;->aPg:Lcom/google/android/material/textfield/TextInputLayout;
+    iget-object v1, v0, Lcom/google/android/material/textfield/b;->aPc: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;->aPq:Z
+    iput-boolean p1, v0, Lcom/google/android/material/textfield/b;->aPm: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;->aPr:Landroid/widget/TextView;
+    iget-object v1, v0, Lcom/google/android/material/textfield/b;->aPn:Landroid/widget/TextView;
 
     if-eqz v1, :cond_0
 
-    iget-object v0, v0, Lcom/google/android/material/textfield/b;->aPr:Landroid/widget/TextView;
+    iget-object v0, v0, Lcom/google/android/material/textfield/b;->aPn: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;->zJ()V
+    invoke-virtual {v0}, Lcom/google/android/material/textfield/b;->zH()V
 
-    iput-object p1, v0, Lcom/google/android/material/textfield/b;->aPs:Ljava/lang/CharSequence;
+    iput-object p1, v0, Lcom/google/android/material/textfield/b;->aPo:Ljava/lang/CharSequence;
 
-    iget-object v1, v0, Lcom/google/android/material/textfield/b;->aPu:Landroid/widget/TextView;
+    iget-object v1, v0, Lcom/google/android/material/textfield/b;->aPq:Landroid/widget/TextView;
 
     invoke-virtual {v1, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    iget v1, v0, Lcom/google/android/material/textfield/b;->aPn:I
+    iget v1, v0, Lcom/google/android/material/textfield/b;->aPj:I
 
     const/4 v2, 0x2
 
     if-eq v1, v2, :cond_2
 
-    iput v2, v0, Lcom/google/android/material/textfield/b;->aPo:I
+    iput v2, v0, Lcom/google/android/material/textfield/b;->aPk:I
 
     :cond_2
-    iget v1, v0, Lcom/google/android/material/textfield/b;->aPn:I
+    iget v1, v0, Lcom/google/android/material/textfield/b;->aPj:I
 
-    iget v2, v0, Lcom/google/android/material/textfield/b;->aPo:I
+    iget v2, v0, Lcom/google/android/material/textfield/b;->aPk:I
 
-    iget-object v3, v0, Lcom/google/android/material/textfield/b;->aPu:Landroid/widget/TextView;
+    iget-object v3, v0, Lcom/google/android/material/textfield/b;->aPq: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;->aPu:Landroid/widget/TextView;
+    iget-object v1, v0, Lcom/google/android/material/textfield/b;->aPq:Landroid/widget/TextView;
 
     if-eqz v1, :cond_0
 
-    iget-object v0, v0, Lcom/google/android/material/textfield/b;->aPu:Landroid/widget/TextView;
+    iget-object v0, v0, Lcom/google/android/material/textfield/b;->aPq: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;->aPt:Z
+    iget-boolean v1, v0, Lcom/google/android/material/textfield/b;->aPp:Z
 
     if-eq v1, p1, :cond_3
 
-    invoke-virtual {v0}, Lcom/google/android/material/textfield/b;->zJ()V
+    invoke-virtual {v0}, Lcom/google/android/material/textfield/b;->zH()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;->aPu:Landroid/widget/TextView;
+    iput-object v2, v0, Lcom/google/android/material/textfield/b;->aPq:Landroid/widget/TextView;
 
-    iget-object v2, v0, Lcom/google/android/material/textfield/b;->aPu:Landroid/widget/TextView;
+    iget-object v2, v0, Lcom/google/android/material/textfield/b;->aPq: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;->aPu:Landroid/widget/TextView;
+    iget-object v2, v0, Lcom/google/android/material/textfield/b;->aPq: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;->aPu:Landroid/widget/TextView;
+    iget-object v2, v0, Lcom/google/android/material/textfield/b;->aPq: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;->aPu:Landroid/widget/TextView;
+    iget-object v2, v0, Lcom/google/android/material/textfield/b;->aPq: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;->aPu:Landroid/widget/TextView;
+    iget-object v2, v0, Lcom/google/android/material/textfield/b;->aPq: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;->zJ()V
+    invoke-virtual {v0}, Lcom/google/android/material/textfield/b;->zH()V
 
-    iget v2, v0, Lcom/google/android/material/textfield/b;->aPn:I
+    iget v2, v0, Lcom/google/android/material/textfield/b;->aPj:I
 
     const/4 v3, 0x2
 
@@ -4013,14 +4013,14 @@
 
     const/4 v2, 0x0
 
-    iput v2, v0, Lcom/google/android/material/textfield/b;->aPo:I
+    iput v2, v0, Lcom/google/android/material/textfield/b;->aPk:I
 
     :cond_2
-    iget v2, v0, Lcom/google/android/material/textfield/b;->aPn:I
+    iget v2, v0, Lcom/google/android/material/textfield/b;->aPj:I
 
-    iget v3, v0, Lcom/google/android/material/textfield/b;->aPo:I
+    iget v3, v0, Lcom/google/android/material/textfield/b;->aPk:I
 
-    iget-object v4, v0, Lcom/google/android/material/textfield/b;->aPu:Landroid/widget/TextView;
+    iget-object v4, v0, Lcom/google/android/material/textfield/b;->aPq: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;->aPu:Landroid/widget/TextView;
+    iget-object v2, v0, Lcom/google/android/material/textfield/b;->aPq: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;->aPu:Landroid/widget/TextView;
+    iput-object v5, v0, Lcom/google/android/material/textfield/b;->aPq:Landroid/widget/TextView;
 
-    iget-object v1, v0, Lcom/google/android/material/textfield/b;->aPg:Lcom/google/android/material/textfield/TextInputLayout;
+    iget-object v1, v0, Lcom/google/android/material/textfield/b;->aPc: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;->aPg:Lcom/google/android/material/textfield/TextInputLayout;
+    iget-object v1, v0, Lcom/google/android/material/textfield/b;->aPc: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;->aPt:Z
+    iput-boolean p1, v0, Lcom/google/android/material/textfield/b;->aPp: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;->aPr:Landroid/widget/TextView;
+    iget-object v1, v0, Lcom/google/android/material/textfield/b;->aPn: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;->aPu:Landroid/widget/TextView;
+    iget-object v0, v0, Lcom/google/android/material/textfield/b;->aPq: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;->zL()Z
+    invoke-virtual {v1}, Lcom/google/android/material/textfield/b;->zJ()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;->zM()I
+    invoke-virtual {v1}, Lcom/google/android/material/textfield/b;->zK()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;->zL()Z
+    invoke-virtual {v2}, Lcom/google/android/material/textfield/b;->zJ()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;->zM()I
+    invoke-virtual {v2}, Lcom/google/android/material/textfield/b;->zK()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 f0f148cb92..3336b863df 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 aPd:Landroid/graphics/Paint;
+.field private final aOZ:Landroid/graphics/Paint;
 
-.field private final aPe:Landroid/graphics/RectF;
+.field private final aPa:Landroid/graphics/RectF;
 
-.field private aPf:I
+.field private aPb: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;->aPd:Landroid/graphics/Paint;
+    iput-object v0, p0, Lcom/google/android/material/textfield/a;->aOZ:Landroid/graphics/Paint;
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/a;->aPd:Landroid/graphics/Paint;
+    iget-object v0, p0, Lcom/google/android/material/textfield/a;->aOZ: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;->aPd:Landroid/graphics/Paint;
+    iget-object v0, p0, Lcom/google/android/material/textfield/a;->aOZ: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;->aPd:Landroid/graphics/Paint;
+    iget-object v0, p0, Lcom/google/android/material/textfield/a;->aOZ: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;->aPe:Landroid/graphics/RectF;
+    iput-object v0, p0, Lcom/google/android/material/textfield/a;->aPa: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;->aPe:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/google/android/material/textfield/a;->aPa: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;->aPe:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/google/android/material/textfield/a;->aPa: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;->aPe:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/google/android/material/textfield/a;->aPa: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;->aPe:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/google/android/material/textfield/a;->aPa: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;->aPe:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/google/android/material/textfield/a;->aPa: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;->aPf:I
+    iput v0, p0, Lcom/google/android/material/textfield/a;->aPb:I
 
     goto :goto_0
 
@@ -187,14 +187,14 @@
 
     move-result v0
 
-    iput v0, p0, Lcom/google/android/material/textfield/a;->aPf:I
+    iput v0, p0, Lcom/google/android/material/textfield/a;->aPb: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;->aPe:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/google/android/material/textfield/a;->aPa:Landroid/graphics/RectF;
 
-    iget-object v1, p0, Lcom/google/android/material/textfield/a;->aPd:Landroid/graphics/Paint;
+    iget-object v1, p0, Lcom/google/android/material/textfield/a;->aOZ: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;->aPf:I
+    iget v0, p0, Lcom/google/android/material/textfield/a;->aPb:I
 
     invoke-virtual {p1, v0}, Landroid/graphics/Canvas;->restoreToCount(I)V
 
@@ -214,10 +214,10 @@
     return-void
 .end method
 
-.method final zH()Z
+.method final zF()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/a;->aPe:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/google/android/material/textfield/a;->aPa: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 6f6f8db4d8..52e534f73e 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 aPv:I
+.field final synthetic aPr:I
 
-.field final synthetic aPw:Landroid/widget/TextView;
+.field final synthetic aPs:Landroid/widget/TextView;
 
-.field final synthetic aPx:I
+.field final synthetic aPt:I
 
-.field final synthetic aPy:Landroid/widget/TextView;
+.field final synthetic aPu:Landroid/widget/TextView;
 
-.field final synthetic aPz:Lcom/google/android/material/textfield/b;
+.field final synthetic aPv: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;->aPz:Lcom/google/android/material/textfield/b;
+    iput-object p1, p0, Lcom/google/android/material/textfield/b$1;->aPv:Lcom/google/android/material/textfield/b;
 
-    iput p2, p0, Lcom/google/android/material/textfield/b$1;->aPv:I
+    iput p2, p0, Lcom/google/android/material/textfield/b$1;->aPr:I
 
-    iput-object p3, p0, Lcom/google/android/material/textfield/b$1;->aPw:Landroid/widget/TextView;
+    iput-object p3, p0, Lcom/google/android/material/textfield/b$1;->aPs:Landroid/widget/TextView;
 
-    iput p4, p0, Lcom/google/android/material/textfield/b$1;->aPx:I
+    iput p4, p0, Lcom/google/android/material/textfield/b$1;->aPt:I
 
-    iput-object p5, p0, Lcom/google/android/material/textfield/b$1;->aPy:Landroid/widget/TextView;
+    iput-object p5, p0, Lcom/google/android/material/textfield/b$1;->aPu: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;->aPz:Lcom/google/android/material/textfield/b;
+    iget-object p1, p0, Lcom/google/android/material/textfield/b$1;->aPv:Lcom/google/android/material/textfield/b;
 
-    iget v0, p0, Lcom/google/android/material/textfield/b$1;->aPv:I
+    iget v0, p0, Lcom/google/android/material/textfield/b$1;->aPr:I
 
-    iput v0, p1, Lcom/google/android/material/textfield/b;->aPn:I
+    iput v0, p1, Lcom/google/android/material/textfield/b;->aPj:I
 
     const/4 v0, 0x0
 
-    iput-object v0, p1, Lcom/google/android/material/textfield/b;->aPl:Landroid/animation/Animator;
+    iput-object v0, p1, Lcom/google/android/material/textfield/b;->aPh:Landroid/animation/Animator;
 
-    iget-object p1, p0, Lcom/google/android/material/textfield/b$1;->aPw:Landroid/widget/TextView;
+    iget-object p1, p0, Lcom/google/android/material/textfield/b$1;->aPs: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;->aPx:I
+    iget p1, p0, Lcom/google/android/material/textfield/b$1;->aPt:I
 
     const/4 v1, 0x1
 
     if-ne p1, v1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/material/textfield/b$1;->aPz:Lcom/google/android/material/textfield/b;
+    iget-object p1, p0, Lcom/google/android/material/textfield/b$1;->aPv:Lcom/google/android/material/textfield/b;
 
-    iget-object p1, p1, Lcom/google/android/material/textfield/b;->aPr:Landroid/widget/TextView;
+    iget-object p1, p1, Lcom/google/android/material/textfield/b;->aPn:Landroid/widget/TextView;
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/material/textfield/b$1;->aPz:Lcom/google/android/material/textfield/b;
+    iget-object p1, p0, Lcom/google/android/material/textfield/b$1;->aPv:Lcom/google/android/material/textfield/b;
 
-    iget-object p1, p1, Lcom/google/android/material/textfield/b;->aPr:Landroid/widget/TextView;
+    iget-object p1, p1, Lcom/google/android/material/textfield/b;->aPn: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;->aPy:Landroid/widget/TextView;
+    iget-object p1, p0, Lcom/google/android/material/textfield/b$1;->aPu: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 136abf81a2..8683652e63 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 aPg:Lcom/google/android/material/textfield/TextInputLayout;
+.field final aPc:Lcom/google/android/material/textfield/TextInputLayout;
 
-.field private aPh:Landroid/widget/LinearLayout;
+.field private aPd:Landroid/widget/LinearLayout;
 
-.field private aPi:I
+.field private aPe:I
 
-.field private aPj:Landroid/widget/FrameLayout;
+.field private aPf:Landroid/widget/FrameLayout;
 
-.field private aPk:I
+.field private aPg:I
 
-.field aPl:Landroid/animation/Animator;
+.field aPh:Landroid/animation/Animator;
 
-.field private final aPm:F
+.field private final aPi:F
 
-.field aPn:I
+.field aPj:I
 
-.field aPo:I
+.field aPk:I
 
-.field aPp:Ljava/lang/CharSequence;
+.field aPl:Ljava/lang/CharSequence;
 
-.field aPq:Z
+.field aPm:Z
 
-.field aPr:Landroid/widget/TextView;
+.field aPn:Landroid/widget/TextView;
 
-.field aPs:Ljava/lang/CharSequence;
+.field aPo:Ljava/lang/CharSequence;
 
-.field aPt:Z
+.field aPp:Z
 
-.field aPu:Landroid/widget/TextView;
+.field aPq: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;->aPg:Lcom/google/android/material/textfield/TextInputLayout;
+    iput-object p1, p0, Lcom/google/android/material/textfield/b;->aPc: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;->aPm:F
+    iput p1, p0, Lcom/google/android/material/textfield/b;->aPi: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;->aPn:I
+    iput p2, p0, Lcom/google/android/material/textfield/b;->aPj:I
 
     return-void
 .end method
@@ -136,7 +136,7 @@
 
     new-array v1, v1, [F
 
-    iget v2, p0, Lcom/google/android/material/textfield/b;->aPm:F
+    iget v2, p0, Lcom/google/android/material/textfield/b;->aPi:F
 
     neg-float v2, v2
 
@@ -318,12 +318,12 @@
     return-object p1
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/material/textfield/b;->aPu:Landroid/widget/TextView;
+    iget-object p1, p0, Lcom/google/android/material/textfield/b;->aPq:Landroid/widget/TextView;
 
     return-object p1
 
     :cond_1
-    iget-object p1, p0, Lcom/google/android/material/textfield/b;->aPr:Landroid/widget/TextView;
+    iget-object p1, p0, Lcom/google/android/material/textfield/b;->aPn: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;->aPl:Landroid/animation/Animator;
+    iput-object v7, p0, Lcom/google/android/material/textfield/b;->aPh: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;->aPt:Z
+    iget-boolean v2, p0, Lcom/google/android/material/textfield/b;->aPp:Z
 
-    iget-object v3, p0, Lcom/google/android/material/textfield/b;->aPu:Landroid/widget/TextView;
+    iget-object v3, p0, Lcom/google/android/material/textfield/b;->aPq: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;->aPq:Z
+    iget-boolean v2, p0, Lcom/google/android/material/textfield/b;->aPm:Z
 
-    iget-object v3, p0, Lcom/google/android/material/textfield/b;->aPr:Landroid/widget/TextView;
+    iget-object v3, p0, Lcom/google/android/material/textfield/b;->aPn: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;->aPg:Lcom/google/android/material/textfield/TextInputLayout;
+    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aPc: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;->aPg:Lcom/google/android/material/textfield/TextInputLayout;
+    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aPc: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;->aPg:Lcom/google/android/material/textfield/TextInputLayout;
+    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aPc: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;->aPh:Landroid/widget/LinearLayout;
+    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aPd:Landroid/widget/LinearLayout;
 
     const/4 v1, 0x0
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aPj:Landroid/widget/FrameLayout;
+    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aPf: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;->aPh:Landroid/widget/LinearLayout;
+    iput-object v0, p0, Lcom/google/android/material/textfield/b;->aPd:Landroid/widget/LinearLayout;
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aPh:Landroid/widget/LinearLayout;
+    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aPd:Landroid/widget/LinearLayout;
 
     invoke-virtual {v0, v1}, Landroid/widget/LinearLayout;->setOrientation(I)V
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aPg:Lcom/google/android/material/textfield/TextInputLayout;
+    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aPc:Lcom/google/android/material/textfield/TextInputLayout;
 
-    iget-object v2, p0, Lcom/google/android/material/textfield/b;->aPh:Landroid/widget/LinearLayout;
+    iget-object v2, p0, Lcom/google/android/material/textfield/b;->aPd: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;->aPj:Landroid/widget/FrameLayout;
+    iput-object v0, p0, Lcom/google/android/material/textfield/b;->aPf:Landroid/widget/FrameLayout;
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aPh:Landroid/widget/LinearLayout;
+    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aPd:Landroid/widget/LinearLayout;
 
-    iget-object v2, p0, Lcom/google/android/material/textfield/b;->aPj:Landroid/widget/FrameLayout;
+    iget-object v2, p0, Lcom/google/android/material/textfield/b;->aPf: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;->aPh:Landroid/widget/LinearLayout;
+    iget-object v3, p0, Lcom/google/android/material/textfield/b;->aPd: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;->aPg:Lcom/google/android/material/textfield/TextInputLayout;
+    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aPc: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;->zK()V
+    invoke-virtual {p0}, Lcom/google/android/material/textfield/b;->zI()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;->aPj:Landroid/widget/FrameLayout;
+    iget-object p2, p0, Lcom/google/android/material/textfield/b;->aPf:Landroid/widget/FrameLayout;
 
     invoke-virtual {p2, v1}, Landroid/widget/FrameLayout;->setVisibility(I)V
 
-    iget-object p2, p0, Lcom/google/android/material/textfield/b;->aPj:Landroid/widget/FrameLayout;
+    iget-object p2, p0, Lcom/google/android/material/textfield/b;->aPf:Landroid/widget/FrameLayout;
 
     invoke-virtual {p2, p1}, Landroid/widget/FrameLayout;->addView(Landroid/view/View;)V
 
-    iget p1, p0, Lcom/google/android/material/textfield/b;->aPk:I
+    iget p1, p0, Lcom/google/android/material/textfield/b;->aPg:I
 
     add-int/lit8 p1, p1, 0x1
 
-    iput p1, p0, Lcom/google/android/material/textfield/b;->aPk:I
+    iput p1, p0, Lcom/google/android/material/textfield/b;->aPg:I
 
     goto :goto_0
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aPh:Landroid/widget/LinearLayout;
+    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aPd: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;->aPh:Landroid/widget/LinearLayout;
+    iget-object p1, p0, Lcom/google/android/material/textfield/b;->aPd:Landroid/widget/LinearLayout;
 
     invoke-virtual {p1, v1}, Landroid/widget/LinearLayout;->setVisibility(I)V
 
-    iget p1, p0, Lcom/google/android/material/textfield/b;->aPi:I
+    iget p1, p0, Lcom/google/android/material/textfield/b;->aPe:I
 
     add-int/lit8 p1, p1, 0x1
 
-    iput p1, p0, Lcom/google/android/material/textfield/b;->aPi:I
+    iput p1, p0, Lcom/google/android/material/textfield/b;->aPe: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;->aPg:Lcom/google/android/material/textfield/TextInputLayout;
+    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aPc: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;->aPg:Lcom/google/android/material/textfield/TextInputLayout;
+    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aPc: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;->aPo:I
+    iget v0, p0, Lcom/google/android/material/textfield/b;->aPk:I
 
-    iget v1, p0, Lcom/google/android/material/textfield/b;->aPn:I
+    iget v1, p0, Lcom/google/android/material/textfield/b;->aPj: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;->aPh:Landroid/widget/LinearLayout;
+    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aPd: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;->aPj:Landroid/widget/FrameLayout;
+    iget-object p2, p0, Lcom/google/android/material/textfield/b;->aPf:Landroid/widget/FrameLayout;
 
     if-eqz p2, :cond_1
 
-    iget v0, p0, Lcom/google/android/material/textfield/b;->aPk:I
+    iget v0, p0, Lcom/google/android/material/textfield/b;->aPg:I
 
     add-int/lit8 v0, v0, -0x1
 
-    iput v0, p0, Lcom/google/android/material/textfield/b;->aPk:I
+    iput v0, p0, Lcom/google/android/material/textfield/b;->aPg:I
 
-    iget v0, p0, Lcom/google/android/material/textfield/b;->aPk:I
+    iget v0, p0, Lcom/google/android/material/textfield/b;->aPg: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;->aPj:Landroid/widget/FrameLayout;
+    iget-object p2, p0, Lcom/google/android/material/textfield/b;->aPf: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;->aPh:Landroid/widget/LinearLayout;
+    iget-object p2, p0, Lcom/google/android/material/textfield/b;->aPd: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;->aPi:I
+    iget p1, p0, Lcom/google/android/material/textfield/b;->aPe:I
 
     add-int/lit8 p1, p1, -0x1
 
-    iput p1, p0, Lcom/google/android/material/textfield/b;->aPi:I
+    iput p1, p0, Lcom/google/android/material/textfield/b;->aPe:I
 
-    iget-object p1, p0, Lcom/google/android/material/textfield/b;->aPh:Landroid/widget/LinearLayout;
+    iget-object p1, p0, Lcom/google/android/material/textfield/b;->aPd:Landroid/widget/LinearLayout;
 
-    iget p2, p0, Lcom/google/android/material/textfield/b;->aPi:I
+    iget p2, p0, Lcom/google/android/material/textfield/b;->aPe: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;->aPu:Landroid/widget/TextView;
+    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aPq: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;->aPr:Landroid/widget/TextView;
+    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aPn:Landroid/widget/TextView;
 
     if-eqz v0, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/material/textfield/b;->aPg:Lcom/google/android/material/textfield/TextInputLayout;
+    iget-object v1, p0, Lcom/google/android/material/textfield/b;->aPc: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 zI()V
+.method final zG()V
     .locals 4
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/google/android/material/textfield/b;->aPp:Ljava/lang/CharSequence;
+    iput-object v0, p0, Lcom/google/android/material/textfield/b;->aPl:Ljava/lang/CharSequence;
 
-    invoke-virtual {p0}, Lcom/google/android/material/textfield/b;->zJ()V
+    invoke-virtual {p0}, Lcom/google/android/material/textfield/b;->zH()V
 
-    iget v1, p0, Lcom/google/android/material/textfield/b;->aPn:I
+    iget v1, p0, Lcom/google/android/material/textfield/b;->aPj:I
 
     const/4 v2, 0x1
 
     if-ne v1, v2, :cond_1
 
-    iget-boolean v1, p0, Lcom/google/android/material/textfield/b;->aPt:Z
+    iget-boolean v1, p0, Lcom/google/android/material/textfield/b;->aPp:Z
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/material/textfield/b;->aPs:Ljava/lang/CharSequence;
+    iget-object v1, p0, Lcom/google/android/material/textfield/b;->aPo: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;->aPo:I
+    iput v1, p0, Lcom/google/android/material/textfield/b;->aPk:I
 
     goto :goto_0
 
     :cond_0
     const/4 v1, 0x0
 
-    iput v1, p0, Lcom/google/android/material/textfield/b;->aPo:I
+    iput v1, p0, Lcom/google/android/material/textfield/b;->aPk:I
 
     :cond_1
     :goto_0
-    iget v1, p0, Lcom/google/android/material/textfield/b;->aPn:I
+    iget v1, p0, Lcom/google/android/material/textfield/b;->aPj:I
 
-    iget v2, p0, Lcom/google/android/material/textfield/b;->aPo:I
+    iget v2, p0, Lcom/google/android/material/textfield/b;->aPk:I
 
-    iget-object v3, p0, Lcom/google/android/material/textfield/b;->aPr:Landroid/widget/TextView;
+    iget-object v3, p0, Lcom/google/android/material/textfield/b;->aPn: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 zJ()V
+.method final zH()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aPl:Landroid/animation/Animator;
+    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aPh:Landroid/animation/Animator;
 
     if-eqz v0, :cond_0
 
@@ -742,16 +742,16 @@
     return-void
 .end method
 
-.method final zK()V
+.method final zI()V
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aPh:Landroid/widget/LinearLayout;
+    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aPd:Landroid/widget/LinearLayout;
 
     const/4 v1, 0x0
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aPg:Lcom/google/android/material/textfield/TextInputLayout;
+    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aPc: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;->aPh:Landroid/widget/LinearLayout;
+    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aPd:Landroid/widget/LinearLayout;
 
-    iget-object v2, p0, Lcom/google/android/material/textfield/b;->aPg:Lcom/google/android/material/textfield/TextInputLayout;
+    iget-object v2, p0, Lcom/google/android/material/textfield/b;->aPc: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;->aPg:Lcom/google/android/material/textfield/TextInputLayout;
+    iget-object v3, p0, Lcom/google/android/material/textfield/b;->aPc: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 zL()Z
+.method final zJ()Z
     .locals 2
 
-    iget v0, p0, Lcom/google/android/material/textfield/b;->aPo:I
+    iget v0, p0, Lcom/google/android/material/textfield/b;->aPk:I
 
     const/4 v1, 0x1
 
     if-ne v0, v1, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aPr:Landroid/widget/TextView;
+    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aPn:Landroid/widget/TextView;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aPp:Ljava/lang/CharSequence;
+    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aPl:Ljava/lang/CharSequence;
 
     invoke-static {v0}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -826,10 +826,10 @@
     return v0
 .end method
 
-.method final zM()I
+.method final zK()I
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aPr:Landroid/widget/TextView;
+    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aPn: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 3e8ef5bd33..adc0628efe 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 aMT:Landroid/view/View;
+.field final synthetic aMP:Landroid/view/View;
 
-.field final synthetic aPD:I
+.field final synthetic aPA:Lcom/google/android/material/expandable/ExpandableWidget;
 
-.field final synthetic aPE:Lcom/google/android/material/expandable/ExpandableWidget;
+.field final synthetic aPB:Lcom/google/android/material/transformation/ExpandableBehavior;
 
-.field final synthetic aPF:Lcom/google/android/material/transformation/ExpandableBehavior;
+.field final synthetic aPz:I
 
 
 # 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;->aPF:Lcom/google/android/material/transformation/ExpandableBehavior;
+    iput-object p1, p0, Lcom/google/android/material/transformation/ExpandableBehavior$1;->aPB:Lcom/google/android/material/transformation/ExpandableBehavior;
 
-    iput-object p2, p0, Lcom/google/android/material/transformation/ExpandableBehavior$1;->aMT:Landroid/view/View;
+    iput-object p2, p0, Lcom/google/android/material/transformation/ExpandableBehavior$1;->aMP:Landroid/view/View;
 
-    iput p3, p0, Lcom/google/android/material/transformation/ExpandableBehavior$1;->aPD:I
+    iput p3, p0, Lcom/google/android/material/transformation/ExpandableBehavior$1;->aPz:I
 
-    iput-object p4, p0, Lcom/google/android/material/transformation/ExpandableBehavior$1;->aPE:Lcom/google/android/material/expandable/ExpandableWidget;
+    iput-object p4, p0, Lcom/google/android/material/transformation/ExpandableBehavior$1;->aPA: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;->aMT:Landroid/view/View;
+    iget-object v0, p0, Lcom/google/android/material/transformation/ExpandableBehavior$1;->aMP: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;->aPF:Lcom/google/android/material/transformation/ExpandableBehavior;
+    iget-object v0, p0, Lcom/google/android/material/transformation/ExpandableBehavior$1;->aPB: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;->aPD:I
+    iget v1, p0, Lcom/google/android/material/transformation/ExpandableBehavior$1;->aPz:I
 
     const/4 v2, 0x0
 
     if-ne v0, v1, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/transformation/ExpandableBehavior$1;->aPF:Lcom/google/android/material/transformation/ExpandableBehavior;
+    iget-object v0, p0, Lcom/google/android/material/transformation/ExpandableBehavior$1;->aPB:Lcom/google/android/material/transformation/ExpandableBehavior;
 
-    iget-object v1, p0, Lcom/google/android/material/transformation/ExpandableBehavior$1;->aPE:Lcom/google/android/material/expandable/ExpandableWidget;
+    iget-object v1, p0, Lcom/google/android/material/transformation/ExpandableBehavior$1;->aPA: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;->aMT:Landroid/view/View;
+    iget-object v4, p0, Lcom/google/android/material/transformation/ExpandableBehavior$1;->aMP: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 03bb18731f..a5d869c0b3 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 aPG:Lcom/google/android/material/transformation/ExpandableTransformationBehavior;
+.field final synthetic aPC: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;->aPG:Lcom/google/android/material/transformation/ExpandableTransformationBehavior;
+    iput-object p1, p0, Lcom/google/android/material/transformation/ExpandableTransformationBehavior$1;->aPC: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;->aPG:Lcom/google/android/material/transformation/ExpandableTransformationBehavior;
+    iget-object p1, p0, Lcom/google/android/material/transformation/ExpandableTransformationBehavior$1;->aPC: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 6e8b3342e6..d1bc1d0e0f 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 aMT:Landroid/view/View;
+.field final synthetic aMP:Landroid/view/View;
 
-.field final synthetic aPH:Z
+.field final synthetic aPD:Z
 
-.field final synthetic aPI:Landroid/view/View;
+.field final synthetic aPE:Landroid/view/View;
 
-.field final synthetic aPJ:Lcom/google/android/material/transformation/FabTransformationBehavior;
+.field final synthetic aPF: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;->aPJ:Lcom/google/android/material/transformation/FabTransformationBehavior;
+    iput-object p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$1;->aPF:Lcom/google/android/material/transformation/FabTransformationBehavior;
 
-    iput-boolean p2, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$1;->aPH:Z
+    iput-boolean p2, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$1;->aPD:Z
 
-    iput-object p3, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$1;->aMT:Landroid/view/View;
+    iput-object p3, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$1;->aMP:Landroid/view/View;
 
-    iput-object p4, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$1;->aPI:Landroid/view/View;
+    iput-object p4, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$1;->aPE: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;->aPH:Z
+    iget-boolean p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$1;->aPD:Z
 
     if-nez p1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$1;->aMT:Landroid/view/View;
+    iget-object p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$1;->aMP: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;->aPI:Landroid/view/View;
+    iget-object p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$1;->aPE: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;->aPI:Landroid/view/View;
+    iget-object p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$1;->aPE: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;->aPH:Z
+    iget-boolean p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$1;->aPD:Z
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$1;->aMT:Landroid/view/View;
+    iget-object p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$1;->aMP: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;->aPI:Landroid/view/View;
+    iget-object p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$1;->aPE: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;->aPI:Landroid/view/View;
+    iget-object p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$1;->aPE: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 24d57cf491..1dfd20b2f4 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 aMT:Landroid/view/View;
+.field final synthetic aMP:Landroid/view/View;
 
-.field final synthetic aPJ:Lcom/google/android/material/transformation/FabTransformationBehavior;
+.field final synthetic aPF: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;->aPJ:Lcom/google/android/material/transformation/FabTransformationBehavior;
+    iput-object p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$2;->aPF:Lcom/google/android/material/transformation/FabTransformationBehavior;
 
-    iput-object p2, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$2;->aMT:Landroid/view/View;
+    iput-object p2, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$2;->aMP: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;->aMT:Landroid/view/View;
+    iget-object p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$2;->aMP: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 6690ef7c13..23a2474db0 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 aPJ:Lcom/google/android/material/transformation/FabTransformationBehavior;
+.field final synthetic aPF:Lcom/google/android/material/transformation/FabTransformationBehavior;
 
-.field final synthetic aPK:Lcom/google/android/material/circularreveal/CircularRevealWidget;
+.field final synthetic aPG:Lcom/google/android/material/circularreveal/CircularRevealWidget;
 
-.field final synthetic aPL:Landroid/graphics/drawable/Drawable;
+.field final synthetic aPH: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;->aPJ:Lcom/google/android/material/transformation/FabTransformationBehavior;
+    iput-object p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$3;->aPF:Lcom/google/android/material/transformation/FabTransformationBehavior;
 
-    iput-object p2, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$3;->aPK:Lcom/google/android/material/circularreveal/CircularRevealWidget;
+    iput-object p2, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$3;->aPG:Lcom/google/android/material/circularreveal/CircularRevealWidget;
 
-    iput-object p3, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$3;->aPL:Landroid/graphics/drawable/Drawable;
+    iput-object p3, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$3;->aPH: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;->aPK:Lcom/google/android/material/circularreveal/CircularRevealWidget;
+    iget-object p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$3;->aPG: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;->aPK:Lcom/google/android/material/circularreveal/CircularRevealWidget;
+    iget-object p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$3;->aPG:Lcom/google/android/material/circularreveal/CircularRevealWidget;
 
-    iget-object v0, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$3;->aPL:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$3;->aPH: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 9eb1662b82..59fda8b7f8 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 aPJ:Lcom/google/android/material/transformation/FabTransformationBehavior;
+.field final synthetic aPF:Lcom/google/android/material/transformation/FabTransformationBehavior;
 
-.field final synthetic aPK:Lcom/google/android/material/circularreveal/CircularRevealWidget;
+.field final synthetic aPG: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;->aPJ:Lcom/google/android/material/transformation/FabTransformationBehavior;
+    iput-object p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$4;->aPF:Lcom/google/android/material/transformation/FabTransformationBehavior;
 
-    iput-object p2, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$4;->aPK:Lcom/google/android/material/circularreveal/CircularRevealWidget;
+    iput-object p2, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$4;->aPG: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;->aPK:Lcom/google/android/material/circularreveal/CircularRevealWidget;
+    iget-object p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$4;->aPG: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;->aPK:Lcom/google/android/material/circularreveal/CircularRevealWidget;
+    iget-object v0, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$4;->aPG: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 16058c58db..cac85996c8 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 aMT:Landroid/view/View;
+.field final synthetic aMP:Landroid/view/View;
 
-.field final synthetic aPH:Z
+.field final synthetic aPD:Z
 
-.field final synthetic aPM:Lcom/google/android/material/transformation/FabTransformationScrimBehavior;
+.field final synthetic aPI: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;->aPM:Lcom/google/android/material/transformation/FabTransformationScrimBehavior;
+    iput-object p1, p0, Lcom/google/android/material/transformation/FabTransformationScrimBehavior$1;->aPI:Lcom/google/android/material/transformation/FabTransformationScrimBehavior;
 
-    iput-boolean p2, p0, Lcom/google/android/material/transformation/FabTransformationScrimBehavior$1;->aPH:Z
+    iput-boolean p2, p0, Lcom/google/android/material/transformation/FabTransformationScrimBehavior$1;->aPD:Z
 
-    iput-object p3, p0, Lcom/google/android/material/transformation/FabTransformationScrimBehavior$1;->aMT:Landroid/view/View;
+    iput-object p3, p0, Lcom/google/android/material/transformation/FabTransformationScrimBehavior$1;->aMP: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;->aPH:Z
+    iget-boolean p1, p0, Lcom/google/android/material/transformation/FabTransformationScrimBehavior$1;->aPD:Z
 
     if-nez p1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/material/transformation/FabTransformationScrimBehavior$1;->aMT:Landroid/view/View;
+    iget-object p1, p0, Lcom/google/android/material/transformation/FabTransformationScrimBehavior$1;->aMP: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;->aPH:Z
+    iget-boolean p1, p0, Lcom/google/android/material/transformation/FabTransformationScrimBehavior$1;->aPD:Z
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/material/transformation/FabTransformationScrimBehavior$1;->aMT:Landroid/view/View;
+    iget-object p1, p0, Lcom/google/android/material/transformation/FabTransformationScrimBehavior$1;->aMP: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 aa4195718b..db24d810c8 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 aPZ:Ljava/util/concurrent/atomic/AtomicReference;
+.field private static aPV: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;->aPZ:Ljava/util/concurrent/atomic/AtomicReference;
+    sput-object v0, Lcom/google/firebase/FirebaseApp$a;->aPV: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;->aPZ:Ljava/util/concurrent/atomic/AtomicReference;
+    sget-object v0, Lcom/google/firebase/FirebaseApp$a;->aPV: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;->aPZ:Ljava/util/concurrent/atomic/AtomicReference;
+    sget-object v1, Lcom/google/firebase/FirebaseApp$a;->aPV: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;->mq()Lcom/google/android/gms/common/api/internal/b;
+    invoke-static {}, Lcom/google/android/gms/common/api/internal/b;->mo()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;->zR()Ljava/lang/Object;
+    invoke-static {}, Lcom/google/firebase/FirebaseApp;->zP()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;->aPP:Ljava/util/Map;
+    sget-object v2, Lcom/google/firebase/FirebaseApp;->aPL: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 b305e4f873..c9de488f2c 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 aQa:Landroid/os/Handler;
+.field private static final aPW: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;->aQa:Landroid/os/Handler;
+    sput-object v0, Lcom/google/firebase/FirebaseApp$b;->aPW: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;->aQa:Landroid/os/Handler;
+    sget-object v0, Lcom/google/firebase/FirebaseApp$b;->aPW: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 22ce8a0c19..cdf1aaeafe 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 aPZ:Ljava/util/concurrent/atomic/AtomicReference;
+.field private static aPV: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;->aPZ:Ljava/util/concurrent/atomic/AtomicReference;
+    sput-object v0, Lcom/google/firebase/FirebaseApp$c;->aPV: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;->aPZ:Ljava/util/concurrent/atomic/AtomicReference;
+    sget-object v0, Lcom/google/firebase/FirebaseApp$c;->aPV: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;->aPZ:Ljava/util/concurrent/atomic/AtomicReference;
+    sget-object v1, Lcom/google/firebase/FirebaseApp$c;->aPV: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;->zR()Ljava/lang/Object;
+    invoke-static {}, Lcom/google/firebase/FirebaseApp;->zP()Ljava/lang/Object;
 
     move-result-object p1
 
     monitor-enter p1
 
     :try_start_0
-    sget-object p2, Lcom/google/firebase/FirebaseApp;->aPP:Ljava/util/Map;
+    sget-object p2, Lcom/google/firebase/FirebaseApp;->aPL: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 842f383761..9db5f4e60d 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 aPN:Ljava/lang/Object;
+.field private static final aPJ:Ljava/lang/Object;
 
-.field private static final aPO:Ljava/util/concurrent/Executor;
+.field private static final aPK:Ljava/util/concurrent/Executor;
 
-.field static final aPP:Ljava/util/Map;
+.field static final aPL:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -31,15 +31,15 @@
 
 
 # instance fields
-.field private final aPQ:Lcom/google/firebase/c;
+.field private final aPM:Lcom/google/firebase/c;
 
-.field private final aPR:Lcom/google/firebase/components/i;
+.field private final aPN:Lcom/google/firebase/components/i;
 
-.field private final aPS:Ljava/util/concurrent/atomic/AtomicBoolean;
+.field private final aPO:Ljava/util/concurrent/atomic/AtomicBoolean;
 
-.field private final aPT:Ljava/util/concurrent/atomic/AtomicBoolean;
+.field private final aPP:Ljava/util/concurrent/atomic/AtomicBoolean;
 
-.field private final aPU:Lcom/google/firebase/components/s;
+.field private final aPQ: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 aPV:Ljava/util/List;
+.field private final aPR:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -59,7 +59,7 @@
     .end annotation
 .end field
 
-.field private final aPW:Ljava/util/List;
+.field private final aPS: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;->aPN:Ljava/lang/Object;
+    sput-object v0, Lcom/google/firebase/FirebaseApp;->aPJ: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;->aPO:Ljava/util/concurrent/Executor;
+    sput-object v0, Lcom/google/firebase/FirebaseApp;->aPK: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;->aPP:Ljava/util/Map;
+    sput-object v0, Lcom/google/firebase/FirebaseApp;->aPL: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;->aPS:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iput-object v0, p0, Lcom/google/firebase/FirebaseApp;->aPO: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;->aPT:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iput-object v0, p0, Lcom/google/firebase/FirebaseApp;->aPP: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;->aPV:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/firebase/FirebaseApp;->aPR: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;->aPW:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/firebase/FirebaseApp;->aPS: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;->aPQ:Lcom/google/firebase/c;
+    iput-object p2, p0, Lcom/google/firebase/FirebaseApp;->aPM: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;->aQy:Lcom/google/firebase/components/f$b;
+    iget-object v0, p2, Lcom/google/firebase/components/f;->aQu:Lcom/google/firebase/components/f$b;
 
-    iget-object p2, p2, Lcom/google/firebase/components/f;->aQx:Ljava/lang/Object;
+    iget-object p2, p2, Lcom/google/firebase/components/f;->aQt: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;->aPO:Ljava/util/concurrent/Executor;
+    sget-object v2, Lcom/google/firebase/FirebaseApp;->aPK:Ljava/util/concurrent/Executor;
 
     const/4 v3, 0x6
 
@@ -240,7 +240,7 @@
 
     aput-object p3, v3, v1
 
-    invoke-static {}, Lcom/google/firebase/d/b;->At()Lcom/google/firebase/components/b;
+    invoke-static {}, Lcom/google/firebase/d/b;->Ar()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;->aPR:Lcom/google/firebase/components/i;
+    iput-object v0, p0, Lcom/google/firebase/FirebaseApp;->aPN: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;->aPU:Lcom/google/firebase/components/s;
+    iput-object p2, p0, Lcom/google/firebase/FirebaseApp;->aPQ: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;->aPN:Ljava/lang/Object;
+    sget-object v0, Lcom/google/firebase/FirebaseApp;->aPJ:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/firebase/FirebaseApp;->aPP:Ljava/util/Map;
+    sget-object v1, Lcom/google/firebase/FirebaseApp;->aPL: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;->aPP:Ljava/util/Map;
+    sget-object p0, Lcom/google/firebase/FirebaseApp;->aPL: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;->zQ()V
+    invoke-direct {v1}, Lcom/google/firebase/FirebaseApp;->zO()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;->zN()Lcom/google/firebase/c;
+    invoke-virtual {p0}, Lcom/google/firebase/FirebaseApp;->zL()Lcom/google/firebase/c;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/firebase/c;->aQb:Ljava/lang/String;
+    iget-object v2, v2, Lcom/google/firebase/c;->aPX: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;->aPR:Lcom/google/firebase/components/i;
+    iget-object p0, p0, Lcom/google/firebase/FirebaseApp;->aPN: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;->zQ()V
+    invoke-direct {p0}, Lcom/google/firebase/FirebaseApp;->zO()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;->aPV:Ljava/util/List;
+    iget-object p0, p0, Lcom/google/firebase/FirebaseApp;->aPR: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;->aPN:Ljava/lang/Object;
+    sget-object v0, Lcom/google/firebase/FirebaseApp;->aPJ:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/firebase/FirebaseApp;->aPP:Ljava/util/Map;
+    sget-object v1, Lcom/google/firebase/FirebaseApp;->aPL: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;->aPS:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object p0, p0, Lcom/google/firebase/FirebaseApp;->aPO: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;->aPN:Ljava/lang/Object;
+    sget-object v0, Lcom/google/firebase/FirebaseApp;->aPJ:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/firebase/FirebaseApp;->aPP:Ljava/util/Map;
+    sget-object v1, Lcom/google/firebase/FirebaseApp;->aPL: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;->nx()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/common/util/m;->nv()Ljava/lang/String;
 
     move-result-object v3
 
@@ -601,10 +601,10 @@
     throw v1
 .end method
 
-.method private zO()V
+.method private zM()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/firebase/FirebaseApp;->aPT:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v0, p0, Lcom/google/firebase/FirebaseApp;->aPP: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 zQ()V
+.method private zO()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;->aPR:Lcom/google/firebase/components/i;
+    iget-object v0, p0, Lcom/google/firebase/FirebaseApp;->aPN:Lcom/google/firebase/components/i;
 
-    invoke-virtual {p0}, Lcom/google/firebase/FirebaseApp;->zP()Z
+    invoke-virtual {p0}, Lcom/google/firebase/FirebaseApp;->zN()Z
 
     move-result v1
 
@@ -650,10 +650,10 @@
     return-void
 .end method
 
-.method static synthetic zR()Ljava/lang/Object;
+.method static synthetic zP()Ljava/lang/Object;
     .locals 1
 
-    sget-object v0, Lcom/google/firebase/FirebaseApp;->aPN:Ljava/lang/Object;
+    sget-object v0, Lcom/google/firebase/FirebaseApp;->aPJ: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;->zO()V
+    invoke-direct {p0}, Lcom/google/firebase/FirebaseApp;->zM()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;->zO()V
+    invoke-direct {p0}, Lcom/google/firebase/FirebaseApp;->zM()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;->zO()V
+    invoke-direct {p0}, Lcom/google/firebase/FirebaseApp;->zM()V
 
-    iget-object v0, p0, Lcom/google/firebase/FirebaseApp;->aPU:Lcom/google/firebase/components/s;
+    iget-object v0, p0, Lcom/google/firebase/FirebaseApp;->aPQ: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;->aSw:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v0, v0, Lcom/google/firebase/c/a;->aSs: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;->aPQ:Lcom/google/firebase/c;
+    iget-object v1, p0, Lcom/google/firebase/FirebaseApp;->aPM:Lcom/google/firebase/c;
 
     const-string v2, "options"
 
@@ -783,9 +783,9 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/firebase/FirebaseApp;->zO()V
+    invoke-direct {p0}, Lcom/google/firebase/FirebaseApp;->zM()V
 
-    iget-object v0, p0, Lcom/google/firebase/FirebaseApp;->aPR:Lcom/google/firebase/components/i;
+    iget-object v0, p0, Lcom/google/firebase/FirebaseApp;->aPN: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 zN()Lcom/google/firebase/c;
+.method public final zL()Lcom/google/firebase/c;
     .locals 1
 
-    invoke-direct {p0}, Lcom/google/firebase/FirebaseApp;->zO()V
+    invoke-direct {p0}, Lcom/google/firebase/FirebaseApp;->zM()V
 
-    iget-object v0, p0, Lcom/google/firebase/FirebaseApp;->aPQ:Lcom/google/firebase/c;
+    iget-object v0, p0, Lcom/google/firebase/FirebaseApp;->aPM:Lcom/google/firebase/c;
 
     return-object v0
 .end method
 
-.method public final zP()Z
+.method public final zN()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 0f1c8b9921..df26c74715 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 aQh:Lcom/google/firebase/analytics/FirebaseAnalytics;
+.field private static volatile aQd:Lcom/google/firebase/analytics/FirebaseAnalytics;
 
 
 # instance fields
-.field public final aBK:Lcom/google/android/gms/measurement/internal/ey;
+.field public final aBG:Lcom/google/android/gms/measurement/internal/ey;
 
-.field public final aQi:Lcom/google/android/gms/internal/measurement/me;
+.field public final aQe:Lcom/google/android/gms/internal/measurement/me;
 
-.field private final asC:Ljava/lang/Object;
+.field private final asy:Ljava/lang/Object;
 
-.field public final axe:Z
+.field public final axa:Z
 
 
 # direct methods
@@ -27,19 +27,19 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->aBK:Lcom/google/android/gms/measurement/internal/ey;
+    iput-object v0, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->aBG:Lcom/google/android/gms/measurement/internal/ey;
 
-    iput-object p1, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->aQi:Lcom/google/android/gms/internal/measurement/me;
+    iput-object p1, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->aQe:Lcom/google/android/gms/internal/measurement/me;
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->axe:Z
+    iput-boolean p1, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->axa:Z
 
     new-instance p1, Ljava/lang/Object;
 
     invoke-direct {p1}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->asC:Ljava/lang/Object;
+    iput-object p1, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->asy: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;->aBK:Lcom/google/android/gms/measurement/internal/ey;
+    iput-object p1, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->aBG:Lcom/google/android/gms/measurement/internal/ey;
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->aQi:Lcom/google/android/gms/internal/measurement/me;
+    iput-object p1, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->aQe:Lcom/google/android/gms/internal/measurement/me;
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->axe:Z
+    iput-boolean p1, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->axa:Z
 
     new-instance p1, Ljava/lang/Object;
 
     invoke-direct {p1}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->asC:Ljava/lang/Object;
+    iput-object p1, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->asy: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;->aQh:Lcom/google/firebase/analytics/FirebaseAnalytics;
+    sget-object v0, Lcom/google/firebase/analytics/FirebaseAnalytics;->aQd: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;->aQh:Lcom/google/firebase/analytics/FirebaseAnalytics;
+    sget-object v1, Lcom/google/firebase/analytics/FirebaseAnalytics;->aQd: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;->aQh:Lcom/google/firebase/analytics/FirebaseAnalytics;
+    sput-object v1, Lcom/google/firebase/analytics/FirebaseAnalytics;->aQd: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;->aQh:Lcom/google/firebase/analytics/FirebaseAnalytics;
+    sput-object v1, Lcom/google/firebase/analytics/FirebaseAnalytics;->aQd: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;->aQh:Lcom/google/firebase/analytics/FirebaseAnalytics;
+    sget-object p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->aQd: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;->axe:Z
+    iget-boolean v0, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->axa:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->aQi:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->aQe: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;->aBK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->aBG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->ya()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;->Ae()Lcom/google/firebase/iid/FirebaseInstanceId;
+    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->Ac()Lcom/google/firebase/iid/FirebaseInstanceId;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/firebase/iid/FirebaseInstanceId;->xY()V
+    invoke-virtual {v0}, Lcom/google/firebase/iid/FirebaseInstanceId;->xW()V
 
-    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->qZ()Ljava/lang/String;
+    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->qX()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;->axe:Z
+    iget-boolean v0, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->axa:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->aQi:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->aQe: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;->pH()Z
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/jz;->pF()Z
 
     move-result v0
 
     if-nez v0, :cond_1
 
-    iget-object p1, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->aBK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p1, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->aBG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vv()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEz: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;->aBK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->aBG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yh()Lcom/google/android/gms/measurement/internal/hh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yf()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 f86f9ef06a..00e1771ef2 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 azS:Lcom/google/android/gms/internal/measurement/me;
+.field private final synthetic azO: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;->azS:Lcom/google/android/gms/internal/measurement/me;
+    iput-object p1, p0, Lcom/google/firebase/analytics/a;->azO: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;->azS:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, p0, Lcom/google/firebase/analytics/a;->azO: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;->azS:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, p0, Lcom/google/firebase/analytics/a;->azO: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;->azS:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, p0, Lcom/google/firebase/analytics/a;->azO: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;->azS:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, p0, Lcom/google/firebase/analytics/a;->azO: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;->azS:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v6, p0, Lcom/google/firebase/analytics/a;->azO: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;->azS:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, p0, Lcom/google/firebase/analytics/a;->azO: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;->azS:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, p0, Lcom/google/firebase/analytics/a;->azO: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;->azS:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, p0, Lcom/google/firebase/analytics/a;->azO: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;->azS:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v6, p0, Lcom/google/firebase/analytics/a;->azO: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;->azS:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, p0, Lcom/google/firebase/analytics/a;->azO: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;->azS:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, p0, Lcom/google/firebase/analytics/a;->azO: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 pO()Ljava/lang/String;
+.method public final pM()Ljava/lang/String;
     .locals 4
 
-    iget-object v0, p0, Lcom/google/firebase/analytics/a;->azS:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, p0, Lcom/google/firebase/analytics/a;->azO:Lcom/google/android/gms/internal/measurement/me;
 
     new-instance v1, Lcom/google/android/gms/internal/measurement/it;
 
@@ -383,22 +383,10 @@
     return-object v0
 .end method
 
-.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;
+.method public final qx()Ljava/lang/String;
     .locals 4
 
-    iget-object v0, p0, Lcom/google/firebase/analytics/a;->azS:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, p0, Lcom/google/firebase/analytics/a;->azO:Lcom/google/android/gms/internal/measurement/me;
 
     new-instance v1, Lcom/google/android/gms/internal/measurement/it;
 
@@ -419,10 +407,22 @@
     return-object v0
 .end method
 
-.method public final rD()Ljava/lang/String;
+.method public final qy()J
+    .locals 2
+
+    iget-object v0, p0, Lcom/google/firebase/analytics/a;->azO:Lcom/google/android/gms/internal/measurement/me;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/me;->qy()J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
+
+.method public final rB()Ljava/lang/String;
     .locals 4
 
-    iget-object v0, p0, Lcom/google/firebase/analytics/a;->azS:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, p0, Lcom/google/firebase/analytics/a;->azO: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 uf()Ljava/lang/String;
+.method public final ud()Ljava/lang/String;
     .locals 4
 
-    iget-object v0, p0, Lcom/google/firebase/analytics/a;->azS:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, p0, Lcom/google/firebase/analytics/a;->azO: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 79753ef4b1..771fb346e7 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 aQj:Lcom/google/firebase/analytics/connector/a;
+.field private static volatile aQf:Lcom/google/firebase/analytics/connector/a;
 
 
 # instance fields
-.field private final aQk:Lcom/google/android/gms/measurement/AppMeasurement;
+.field private final aQg:Lcom/google/android/gms/measurement/AppMeasurement;
 
-.field final aty:Ljava/util/Map;
+.field final atu: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;->aQk:Lcom/google/android/gms/measurement/AppMeasurement;
+    iput-object p1, p0, Lcom/google/firebase/analytics/connector/b;->aQg: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;->aty:Ljava/util/Map;
+    iput-object p1, p0, Lcom/google/firebase/analytics/connector/b;->atu: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;->aQj:Lcom/google/firebase/analytics/connector/a;
+    sget-object v0, Lcom/google/firebase/analytics/connector/b;->aQf: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;->aQj:Lcom/google/firebase/analytics/connector/a;
+    sget-object v1, Lcom/google/firebase/analytics/connector/b;->aQf: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;->zP()Z
+    invoke-virtual {p0}, Lcom/google/firebase/FirebaseApp;->zN()Z
 
     move-result v2
 
@@ -86,9 +86,9 @@
 
     const-class v2, Lcom/google/firebase/a;
 
-    sget-object v3, Lcom/google/firebase/analytics/connector/d;->aQq:Ljava/util/concurrent/Executor;
+    sget-object v3, Lcom/google/firebase/analytics/connector/d;->aQm:Ljava/util/concurrent/Executor;
 
-    sget-object v4, Lcom/google/firebase/analytics/connector/c;->aQp:Lcom/google/firebase/a/b;
+    sget-object v4, Lcom/google/firebase/analytics/connector/c;->aQl: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;->aQj:Lcom/google/firebase/analytics/connector/a;
+    sput-object p0, Lcom/google/firebase/analytics/connector/b;->aQf: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;->aQj:Lcom/google/firebase/analytics/connector/a;
+    sget-object p0, Lcom/google/firebase/analytics/connector/b;->aQf: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;->aQj:Lcom/google/firebase/analytics/connector/a;
+    sget-object v1, Lcom/google/firebase/analytics/connector/b;->aQf: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;->aQk:Lcom/google/android/gms/measurement/AppMeasurement;
+    iget-object v1, v1, Lcom/google/firebase/analytics/connector/b;->aQg:Lcom/google/android/gms/measurement/AppMeasurement;
 
-    iget-boolean v2, v1, Lcom/google/android/gms/measurement/AppMeasurement;->axe:Z
+    iget-boolean v2, v1, Lcom/google/android/gms/measurement/AppMeasurement;->axa:Z
 
     if-eqz v2, :cond_0
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/AppMeasurement;->aBL:Lcom/google/android/gms/measurement/internal/gy;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/AppMeasurement;->aBH: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;->aBK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/AppMeasurement;->aBG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->ya()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;->aQk:Lcom/google/android/gms/measurement/AppMeasurement;
+    iget-object v0, p0, Lcom/google/firebase/analytics/connector/b;->aQg: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;->aQk:Lcom/google/android/gms/measurement/AppMeasurement;
+    iget-object v0, p0, Lcom/google/firebase/analytics/connector/b;->aQg: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;->axe:Z
+    iget-boolean v1, v0, Lcom/google/android/gms/measurement/AppMeasurement;->axa:Z
 
     if-eqz v1, :cond_2
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/AppMeasurement;->aBL:Lcom/google/android/gms/measurement/internal/gy;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/AppMeasurement;->aBH: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;->aBK:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/AppMeasurement;->aBG:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->ya()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 d4fe95fb3c..3aae5e34d3 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 aQp:Lcom/google/firebase/a/b;
+.field static final aQl: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;->aQp:Lcom/google/firebase/a/b;
+    sput-object v0, Lcom/google/firebase/analytics/connector/c;->aQl: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 a7b1b5d249..799a4d7042 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 aQq:Ljava/util/concurrent/Executor;
+.field static final aQm: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;->aQq:Ljava/util/concurrent/Executor;
+    sput-object v0, Lcom/google/firebase/analytics/connector/d;->aQm: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 30ab0c9217..087baca01b 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;->aQl:Lcom/google/firebase/components/g;
+    sget-object v3, Lcom/google/firebase/analytics/connector/internal/a;->aQh: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;->zV()Lcom/google/firebase/components/b;
+    invoke-virtual {v0}, Lcom/google/firebase/components/b$a;->zT()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 32068ca9ee..befe3f2b05 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 aQl:Lcom/google/firebase/components/g;
+.field static final aQh: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;->aQl:Lcom/google/firebase/components/g;
+    sput-object v0, Lcom/google/firebase/analytics/connector/internal/a;->aQh: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 02dc4cac9c..a03a6efb8f 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 aQm:Ljava/util/Set;
+.field private static final aQi:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -14,7 +14,7 @@
     .end annotation
 .end field
 
-.field private static final aQn:Ljava/util/List;
+.field private static final aQj:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -24,7 +24,7 @@
     .end annotation
 .end field
 
-.field private static final aQo:Ljava/util/List;
+.field private static final aQk:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -34,7 +34,7 @@
     .end annotation
 .end field
 
-.field private static final aua:Ljava/util/List;
+.field private static final atW:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -44,7 +44,7 @@
     .end annotation
 .end field
 
-.field private static final awq:Ljava/util/List;
+.field private static final awY:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -54,7 +54,7 @@
     .end annotation
 .end field
 
-.field private static final axc:Ljava/util/List;
+.field private static final awm: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;->aQm:Ljava/util/Set;
+    sput-object v0, Lcom/google/firebase/analytics/connector/internal/b;->aQi: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;->axc:Ljava/util/List;
+    sput-object v0, Lcom/google/firebase/analytics/connector/internal/b;->awY: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;->awq:Ljava/util/List;
+    sput-object v0, Lcom/google/firebase/analytics/connector/internal/b;->awm: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;->aQn:Ljava/util/List;
+    sput-object v0, Lcom/google/firebase/analytics/connector/internal/b;->aQj:Ljava/util/List;
 
     new-array v0, v4, [[Ljava/lang/String;
 
-    sget-object v1, Lcom/google/android/gms/measurement/AppMeasurement$a;->aGL:[Ljava/lang/String;
+    sget-object v1, Lcom/google/android/gms/measurement/AppMeasurement$a;->aGH:[Ljava/lang/String;
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/google/android/gms/measurement/AppMeasurement$a;->aBV:[Ljava/lang/String;
+    sget-object v1, Lcom/google/android/gms/measurement/AppMeasurement$a;->aBR:[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;->aQo:Ljava/util/List;
+    sput-object v0, Lcom/google/firebase/analytics/connector/internal/b;->aQk: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;->aua:Ljava/util/List;
+    sput-object v0, Lcom/google/firebase/analytics/connector/internal/b;->atW: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;->aQo:Ljava/util/List;
+    sget-object p0, Lcom/google/firebase/analytics/connector/internal/b;->aQk: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;->aua:Ljava/util/List;
+    sget-object p0, Lcom/google/firebase/analytics/connector/internal/b;->atW: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;->axc:Ljava/util/List;
+    sget-object v0, Lcom/google/firebase/analytics/connector/internal/b;->awY: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;->aQn:Ljava/util/List;
+    sget-object p0, Lcom/google/firebase/analytics/connector/internal/b;->aQj: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;->awq:Ljava/util/List;
+    sget-object v0, Lcom/google/firebase/analytics/connector/internal/b;->awm: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;->aQn:Ljava/util/List;
+    sget-object p1, Lcom/google/firebase/analytics/connector/internal/b;->aQj: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 b21d982b38..76b6fba78d 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 aPX:Lcom/google/firebase/FirebaseApp;
+.field private final aPT:Lcom/google/firebase/FirebaseApp;
 
-.field private final aPY:Landroid/content/Context;
+.field private final aPU: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;->aPX:Lcom/google/firebase/FirebaseApp;
+    iput-object p1, p0, Lcom/google/firebase/b;->aPT:Lcom/google/firebase/FirebaseApp;
 
-    iput-object p2, p0, Lcom/google/firebase/b;->aPY:Landroid/content/Context;
+    iput-object p2, p0, Lcom/google/firebase/b;->aPU: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;->aPX:Lcom/google/firebase/FirebaseApp;
+    iget-object v0, p0, Lcom/google/firebase/b;->aPT:Lcom/google/firebase/FirebaseApp;
 
-    iget-object v1, p0, Lcom/google/firebase/b;->aPY:Landroid/content/Context;
+    iget-object v1, p0, Lcom/google/firebase/b;->aPU: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 0602225672..73a694e730 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 aQb:Ljava/lang/String;
+.field public final aPX:Ljava/lang/String;
+
+.field private final aPY:Ljava/lang/String;
+
+.field private final aPZ:Ljava/lang/String;
+
+.field public final aQa:Ljava/lang/String;
+
+.field private final aQb:Ljava/lang/String;
 
 .field private final aQc:Ljava/lang/String;
 
-.field private final aQd:Ljava/lang/String;
-
-.field public final aQe:Ljava/lang/String;
-
-.field private final aQf:Ljava/lang/String;
-
-.field private final aQg:Ljava/lang/String;
-
-.field private final qv:Ljava/lang/String;
+.field private final qw: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;->aQb:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/firebase/c;->aPX:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/google/firebase/c;->qv:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/firebase/c;->qw:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/google/firebase/c;->aQc:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/firebase/c;->aPY:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/google/firebase/c;->aQd:Ljava/lang/String;
+    iput-object p4, p0, Lcom/google/firebase/c;->aPZ:Ljava/lang/String;
 
-    iput-object p5, p0, Lcom/google/firebase/c;->aQe:Ljava/lang/String;
+    iput-object p5, p0, Lcom/google/firebase/c;->aQa:Ljava/lang/String;
 
-    iput-object p6, p0, Lcom/google/firebase/c;->aQf:Ljava/lang/String;
+    iput-object p6, p0, Lcom/google/firebase/c;->aQb:Ljava/lang/String;
 
-    iput-object p7, p0, Lcom/google/firebase/c;->aQg:Ljava/lang/String;
+    iput-object p7, p0, Lcom/google/firebase/c;->aQc:Ljava/lang/String;
 
     return-void
 .end method
@@ -137,6 +137,56 @@
     :cond_0
     check-cast p1, Lcom/google/firebase/c;
 
+    iget-object v0, p0, Lcom/google/firebase/c;->aPX:Ljava/lang/String;
+
+    iget-object v2, p1, Lcom/google/firebase/c;->aPX:Ljava/lang/String;
+
+    invoke-static {v0, v2}, Lcom/google/android/gms/common/internal/p;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_1
+
+    iget-object v0, p0, Lcom/google/firebase/c;->qw:Ljava/lang/String;
+
+    iget-object v2, p1, Lcom/google/firebase/c;->qw:Ljava/lang/String;
+
+    invoke-static {v0, v2}, Lcom/google/android/gms/common/internal/p;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_1
+
+    iget-object v0, p0, Lcom/google/firebase/c;->aPY:Ljava/lang/String;
+
+    iget-object v2, p1, Lcom/google/firebase/c;->aPY:Ljava/lang/String;
+
+    invoke-static {v0, v2}, Lcom/google/android/gms/common/internal/p;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_1
+
+    iget-object v0, p0, Lcom/google/firebase/c;->aPZ:Ljava/lang/String;
+
+    iget-object v2, p1, Lcom/google/firebase/c;->aPZ:Ljava/lang/String;
+
+    invoke-static {v0, v2}, Lcom/google/android/gms/common/internal/p;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_1
+
+    iget-object v0, p0, Lcom/google/firebase/c;->aQa:Ljava/lang/String;
+
+    iget-object v2, p1, Lcom/google/firebase/c;->aQa:Ljava/lang/String;
+
+    invoke-static {v0, v2}, Lcom/google/android/gms/common/internal/p;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_1
+
     iget-object v0, p0, Lcom/google/firebase/c;->aQb:Ljava/lang/String;
 
     iget-object v2, p1, Lcom/google/firebase/c;->aQb:Ljava/lang/String;
@@ -147,59 +197,9 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/firebase/c;->qv: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
-
-    move-result v0
-
-    if-eqz v0, :cond_1
-
     iget-object v0, p0, Lcom/google/firebase/c;->aQc: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
-
-    move-result v0
-
-    if-eqz v0, :cond_1
-
-    iget-object v0, p0, Lcom/google/firebase/c;->aQd: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
-
-    move-result v0
-
-    if-eqz v0, :cond_1
-
-    iget-object v0, p0, Lcom/google/firebase/c;->aQe: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
-
-    move-result v0
-
-    if-eqz v0, :cond_1
-
-    iget-object v0, p0, Lcom/google/firebase/c;->aQf: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
-
-    move-result v0
-
-    if-eqz v0, :cond_1
-
-    iget-object v0, p0, Lcom/google/firebase/c;->aQg:Ljava/lang/String;
-
-    iget-object p1, p1, Lcom/google/firebase/c;->aQg:Ljava/lang/String;
+    iget-object p1, p1, Lcom/google/firebase/c;->aQc: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;->aQb:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/firebase/c;->aPX:Ljava/lang/String;
 
     const/4 v2, 0x0
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/google/firebase/c;->qv:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/firebase/c;->qw:Ljava/lang/String;
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/google/firebase/c;->aQc:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/firebase/c;->aPY:Ljava/lang/String;
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/google/firebase/c;->aQd:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/firebase/c;->aPZ:Ljava/lang/String;
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/google/firebase/c;->aQe:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/firebase/c;->aQa:Ljava/lang/String;
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/google/firebase/c;->aQf:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/firebase/c;->aQb:Ljava/lang/String;
 
     const/4 v2, 0x5
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/google/firebase/c;->aQg:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/firebase/c;->aQc:Ljava/lang/String;
 
     const/4 v2, 0x6
 
@@ -278,7 +278,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/firebase/c;->aQb:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/firebase/c;->aPX:Ljava/lang/String;
 
     const-string v2, "applicationId"
 
@@ -286,7 +286,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/firebase/c;->qv:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/firebase/c;->qw:Ljava/lang/String;
 
     const-string v2, "apiKey"
 
@@ -294,7 +294,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/firebase/c;->aQc:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/firebase/c;->aPY:Ljava/lang/String;
 
     const-string v2, "databaseUrl"
 
@@ -302,7 +302,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/firebase/c;->aQe:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/firebase/c;->aQa:Ljava/lang/String;
 
     const-string v2, "gcmSenderId"
 
@@ -310,7 +310,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/firebase/c;->aQf:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/firebase/c;->aQb:Ljava/lang/String;
 
     const-string v2, "storageBucket"
 
@@ -318,7 +318,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/firebase/c;->aQg:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/firebase/c;->aQc: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 4b28e1eee6..254d64ece1 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 aSv:Lcom/google/firebase/a/c;
+.field private final aSr:Lcom/google/firebase/a/c;
 
-.field public final aSw:Ljava/util/concurrent/atomic/AtomicBoolean;
+.field public final aSs: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;->aSv:Lcom/google/firebase/a/c;
+    iput-object p3, p0, Lcom/google/firebase/c/a;->aSr:Lcom/google/firebase/a/c;
 
     new-instance p1, Ljava/util/concurrent/atomic/AtomicBoolean;
 
-    invoke-direct {p0}, Lcom/google/firebase/c/a;->An()Z
+    invoke-direct {p0}, Lcom/google/firebase/c/a;->Al()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;->aSw:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iput-object p1, p0, Lcom/google/firebase/c/a;->aSs:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     return-void
 .end method
 
-.method private An()Z
+.method private Al()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 55b86093d8..52f9ced60c 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 aQr:Ljava/util/Set;
+.field private final aQn:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -34,7 +34,7 @@
     .end annotation
 .end field
 
-.field private final aQs:Ljava/util/Set;
+.field private final aQo:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -44,9 +44,9 @@
     .end annotation
 .end field
 
-.field private aQt:I
+.field private aQp:I
 
-.field private aQu:Lcom/google/firebase/components/g;
+.field private aQq: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 aQv:Ljava/util/Set;
+.field private aQr: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;->aQr:Ljava/util/Set;
+    iput-object v0, p0, Lcom/google/firebase/components/b$a;->aQn: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;->aQs:Ljava/util/Set;
+    iput-object v0, p0, Lcom/google/firebase/components/b$a;->aQo:Ljava/util/Set;
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lcom/google/firebase/components/b$a;->aQt:I
+    iput v0, p0, Lcom/google/firebase/components/b$a;->aQp: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;->aQv:Ljava/util/Set;
+    iput-object v1, p0, Lcom/google/firebase/components/b$a;->aQr: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;->aQr:Ljava/util/Set;
+    iget-object v2, p0, Lcom/google/firebase/components/b$a;->aQn: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;->aQr:Ljava/util/Set;
+    iget-object p1, p0, Lcom/google/firebase/components/b$a;->aQn: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;->aQr:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/firebase/components/b$a;->aQn: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;->aQu:Lcom/google/firebase/components/g;
+    iput-object p1, p0, Lcom/google/firebase/components/b$a;->aQq: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;->aQK:Ljava/lang/Class;
+    iget-object v0, p1, Lcom/google/firebase/components/n;->aQG: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;->aQs:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/firebase/components/b$a;->aQo: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;->aQt:I
+    iget v0, p0, Lcom/google/firebase/components/b$a;->aQp: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;->aQt:I
+    iput p1, p0, Lcom/google/firebase/components/b$a;->aQp:I
 
     return-object p0
 .end method
 
-.method public final zV()Lcom/google/firebase/components/b;
+.method public final zT()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;->aQu:Lcom/google/firebase/components/g;
+    iget-object v0, p0, Lcom/google/firebase/components/b$a;->aQq: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;->aQr:Ljava/util/Set;
+    iget-object v1, p0, Lcom/google/firebase/components/b$a;->aQn: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;->aQs:Ljava/util/Set;
+    iget-object v1, p0, Lcom/google/firebase/components/b$a;->aQo:Ljava/util/Set;
 
     invoke-direct {v4, v1}, Ljava/util/HashSet;-><init>(Ljava/util/Collection;)V
 
-    iget v5, p0, Lcom/google/firebase/components/b$a;->aQt:I
+    iget v5, p0, Lcom/google/firebase/components/b$a;->aQp:I
 
     iget v6, p0, Lcom/google/firebase/components/b$a;->type:I
 
-    iget-object v7, p0, Lcom/google/firebase/components/b$a;->aQu:Lcom/google/firebase/components/g;
+    iget-object v7, p0, Lcom/google/firebase/components/b$a;->aQq:Lcom/google/firebase/components/g;
 
-    iget-object v8, p0, Lcom/google/firebase/components/b$a;->aQv:Ljava/util/Set;
+    iget-object v8, p0, Lcom/google/firebase/components/b$a;->aQr: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 cf2c0ccdd4..ed7868fbc7 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 aQr:Ljava/util/Set;
+.field final aQn:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -31,7 +31,7 @@
     .end annotation
 .end field
 
-.field final aQs:Ljava/util/Set;
+.field final aQo:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -41,9 +41,9 @@
     .end annotation
 .end field
 
-.field private final aQt:I
+.field private final aQp:I
 
-.field final aQu:Lcom/google/firebase/components/g;
+.field final aQq: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 aQv:Ljava/util/Set;
+.field final aQr: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;->aQr:Ljava/util/Set;
+    iput-object p1, p0, Lcom/google/firebase/components/b;->aQn: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;->aQs:Ljava/util/Set;
+    iput-object p1, p0, Lcom/google/firebase/components/b;->aQo:Ljava/util/Set;
 
-    iput p3, p0, Lcom/google/firebase/components/b;->aQt:I
+    iput p3, p0, Lcom/google/firebase/components/b;->aQp:I
 
     iput p4, p0, Lcom/google/firebase/components/b;->type:I
 
-    iput-object p5, p0, Lcom/google/firebase/components/b;->aQu:Lcom/google/firebase/components/g;
+    iput-object p5, p0, Lcom/google/firebase/components/b;->aQq: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;->aQv:Ljava/util/Set;
+    iput-object p1, p0, Lcom/google/firebase/components/b;->aQr:Ljava/util/Set;
 
     return-void
 .end method
@@ -205,7 +205,7 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lcom/google/firebase/components/b$a;->zV()Lcom/google/firebase/components/b;
+    invoke-virtual {p0}, Lcom/google/firebase/components/b$a;->zT()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;->zV()Lcom/google/firebase/components/b;
+    invoke-virtual {p0}, Lcom/google/firebase/components/b$a;->zT()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;->aQr:Ljava/util/Set;
+    iget-object v1, p0, Lcom/google/firebase/components/b;->aQn: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;->aQt:I
+    iget v1, p0, Lcom/google/firebase/components/b;->aQp: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;->aQs:Ljava/util/Set;
+    iget-object v1, p0, Lcom/google/firebase/components/b;->aQo: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 zS()Z
+.method public final zQ()Z
     .locals 2
 
-    iget v0, p0, Lcom/google/firebase/components/b;->aQt:I
+    iget v0, p0, Lcom/google/firebase/components/b;->aQp:I
 
     const/4 v1, 0x1
 
@@ -333,10 +333,10 @@
     return v0
 .end method
 
-.method public final zT()Z
+.method public final zR()Z
     .locals 2
 
-    iget v0, p0, Lcom/google/firebase/components/b;->aQt:I
+    iget v0, p0, Lcom/google/firebase/components/b;->aQp:I
 
     const/4 v1, 0x2
 
@@ -352,7 +352,7 @@
     return v0
 .end method
 
-.method public final zU()Z
+.method public final zS()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 2bd8cc6734..c69cfeaaef 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 aQw:Ljava/lang/Object;
+.field private final aQs: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;->aQw:Ljava/lang/Object;
+    iput-object p1, p0, Lcom/google/firebase/components/c;->aQs: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;->aQw:Ljava/lang/Object;
+    iget-object p1, p0, Lcom/google/firebase/components/c;->aQs: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 7eff789491..b429e4ace4 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 aQw:Ljava/lang/Object;
+.field private final aQs: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;->aQw:Ljava/lang/Object;
+    iput-object p1, p0, Lcom/google/firebase/components/d;->aQs: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;->aQw:Ljava/lang/Object;
+    iget-object p1, p0, Lcom/google/firebase/components/d;->aQs: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 4bd4e9074d..3fd67b763a 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 aQx:Ljava/lang/Object;
+.field public final aQt:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TT;"
@@ -30,7 +30,7 @@
     .end annotation
 .end field
 
-.field public final aQy:Lcom/google/firebase/components/f$b;
+.field public final aQu: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;->aQx:Ljava/lang/Object;
+    iput-object p1, p0, Lcom/google/firebase/components/f;->aQt:Ljava/lang/Object;
 
-    iput-object p2, p0, Lcom/google/firebase/components/f;->aQy:Lcom/google/firebase/components/f$b;
+    iput-object p2, p0, Lcom/google/firebase/components/f;->aQu: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 1e5e464fd5..18ee6bec93 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 aQz:Lcom/google/firebase/b/a;
+.field private static final aQv: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 aQA:Ljava/util/Map;
+.field private final aQw:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -29,7 +29,7 @@
     .end annotation
 .end field
 
-.field private final aQB:Ljava/util/Map;
+.field private final aQx:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -41,7 +41,7 @@
     .end annotation
 .end field
 
-.field private final aQC:Ljava/util/Map;
+.field private final aQy:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -54,18 +54,18 @@
     .end annotation
 .end field
 
-.field private final aQD:Lcom/google/firebase/components/q;
+.field private final aQz:Lcom/google/firebase/components/q;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/firebase/components/l;->zY()Lcom/google/firebase/b/a;
+    invoke-static {}, Lcom/google/firebase/components/l;->zW()Lcom/google/firebase/b/a;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/firebase/components/i;->aQz:Lcom/google/firebase/b/a;
+    sput-object v0, Lcom/google/firebase/components/i;->aQv: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;->aQA:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/firebase/components/i;->aQw: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;->aQB:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/firebase/components/i;->aQx: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;->aQC:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/firebase/components/i;->aQy: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;->aQD:Lcom/google/firebase/components/q;
+    iput-object v0, p0, Lcom/google/firebase/components/i;->aQz: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;->aQD:Lcom/google/firebase/components/q;
+    iget-object v0, p0, Lcom/google/firebase/components/i;->aQz: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;->aQA:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/firebase/components/i;->aQw: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;->zW()V
+    invoke-direct {p0}, Lcom/google/firebase/components/i;->zU()V
 
-    invoke-direct {p0}, Lcom/google/firebase/components/i;->zX()V
+    invoke-direct {p0}, Lcom/google/firebase/components/i;->zV()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;->aQu:Lcom/google/firebase/components/g;
+    iget-object v0, p1, Lcom/google/firebase/components/b;->aQq:Lcom/google/firebase/components/g;
 
     new-instance v1, Lcom/google/firebase/components/u;
 
@@ -265,10 +265,10 @@
     return-object p0
 .end method
 
-.method private zW()V
+.method private zU()V
     .locals 8
 
-    iget-object v0, p0, Lcom/google/firebase/components/i;->aQA:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/firebase/components/i;->aQw: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;->zU()Z
+    invoke-virtual {v2}, Lcom/google/firebase/components/b;->zS()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;->aQr:Ljava/util/Set;
+    iget-object v2, v2, Lcom/google/firebase/components/b;->aQn: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;->aQB:Ljava/util/Map;
+    iget-object v4, p0, Lcom/google/firebase/components/i;->aQx: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;->aQA:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/firebase/components/i;->aQw: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;->aQs:Ljava/util/Set;
+    iget-object v2, v1, Lcom/google/firebase/components/b;->aQo: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;->aQB:Ljava/util/Map;
+    iget-object v4, p0, Lcom/google/firebase/components/i;->aQx:Ljava/util/Map;
 
-    iget-object v7, v3, Lcom/google/firebase/components/n;->aQK:Ljava/lang/Class;
+    iget-object v7, v3, Lcom/google/firebase/components/n;->aQG: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;->aQK:Ljava/lang/Class;
+    iget-object v1, v3, Lcom/google/firebase/components/n;->aQG:Ljava/lang/Class;
 
     aput-object v1, v2, v6
 
@@ -435,14 +435,14 @@
     return-void
 .end method
 
-.method private zX()V
+.method private zV()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;->aQA:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/firebase/components/i;->aQw: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;->zU()Z
+    invoke-virtual {v3}, Lcom/google/firebase/components/b;->zS()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;->aQr:Ljava/util/Set;
+    iget-object v3, v3, Lcom/google/firebase/components/b;->aQn: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;->aQC:Ljava/util/Map;
+    iget-object v3, p0, Lcom/google/firebase/components/i;->aQy: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;->aQB:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/firebase/components/i;->aQx: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;->aQC:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/firebase/components/i;->aQy: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;->aQz:Lcom/google/firebase/b/a;
+    sget-object p1, Lcom/google/firebase/components/i;->aQv: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;->aQA:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/firebase/components/i;->aQw: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;->zS()Z
+    invoke-virtual {v2}, Lcom/google/firebase/components/b;->zQ()Z
 
     move-result v3
 
     if-nez v3, :cond_1
 
-    invoke-virtual {v2}, Lcom/google/firebase/components/b;->zT()Z
+    invoke-virtual {v2}, Lcom/google/firebase/components/b;->zR()Z
 
     move-result v2
 
@@ -710,9 +710,9 @@
     goto :goto_0
 
     :cond_2
-    iget-object p1, p0, Lcom/google/firebase/components/i;->aQD:Lcom/google/firebase/components/q;
+    iget-object p1, p0, Lcom/google/firebase/components/i;->aQz:Lcom/google/firebase/components/q;
 
-    invoke-virtual {p1}, Lcom/google/firebase/components/q;->Aa()V
+    invoke-virtual {p1}, Lcom/google/firebase/components/q;->zY()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 6dd3f333eb..33e425878f 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 aQE:Lcom/google/firebase/components/i;
+.field private final aQA:Lcom/google/firebase/components/i;
 
-.field private final aQF:Lcom/google/firebase/components/b;
+.field private final aQB: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;->aQE:Lcom/google/firebase/components/i;
+    iput-object p1, p0, Lcom/google/firebase/components/j;->aQA:Lcom/google/firebase/components/i;
 
-    iput-object p2, p0, Lcom/google/firebase/components/j;->aQF:Lcom/google/firebase/components/b;
+    iput-object p2, p0, Lcom/google/firebase/components/j;->aQB: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;->aQE:Lcom/google/firebase/components/i;
+    iget-object v0, p0, Lcom/google/firebase/components/j;->aQA:Lcom/google/firebase/components/i;
 
-    iget-object v1, p0, Lcom/google/firebase/components/j;->aQF:Lcom/google/firebase/components/b;
+    iget-object v1, p0, Lcom/google/firebase/components/j;->aQB: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 fe962b7350..7265f1e088 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 aQG:Ljava/util/Set;
+.field private final aQC: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;->aQG:Ljava/util/Set;
+    iput-object p1, p0, Lcom/google/firebase/components/k;->aQC: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;->aQG:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/firebase/components/k;->aQC: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 ddd2917a1f..5a5592d01e 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 aQH:Lcom/google/firebase/components/l;
+.field private static final aQD: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;->aQH:Lcom/google/firebase/components/l;
+    sput-object v0, Lcom/google/firebase/components/l;->aQD:Lcom/google/firebase/components/l;
 
     return-void
 .end method
@@ -31,10 +31,10 @@
     return-void
 .end method
 
-.method public static zY()Lcom/google/firebase/b/a;
+.method public static zW()Lcom/google/firebase/b/a;
     .locals 1
 
-    sget-object v0, Lcom/google/firebase/components/l;->aQH:Lcom/google/firebase/components/l;
+    sget-object v0, Lcom/google/firebase/components/l;->aQD: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 70c4448d92..4a0e9071c3 100644
--- a/com.discord/smali_classes2/com/google/firebase/components/m$a.smali
+++ b/com.discord/smali_classes2/com/google/firebase/components/m$a.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field final aQI:Lcom/google/firebase/components/b;
+.field final aQE:Lcom/google/firebase/components/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/firebase/components/b<",
@@ -24,7 +24,7 @@
     .end annotation
 .end field
 
-.field final aQJ:Ljava/util/Set;
+.field final aQF:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -34,7 +34,7 @@
     .end annotation
 .end field
 
-.field final aQs:Ljava/util/Set;
+.field final aQo:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -62,15 +62,15 @@
 
     invoke-direct {v0}, Ljava/util/HashSet;-><init>()V
 
-    iput-object v0, p0, Lcom/google/firebase/components/m$a;->aQs:Ljava/util/Set;
+    iput-object v0, p0, Lcom/google/firebase/components/m$a;->aQo: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;->aQJ:Ljava/util/Set;
+    iput-object v0, p0, Lcom/google/firebase/components/m$a;->aQF:Ljava/util/Set;
 
-    iput-object p1, p0, Lcom/google/firebase/components/m$a;->aQI:Lcom/google/firebase/components/b;
+    iput-object p1, p0, Lcom/google/firebase/components/m$a;->aQE: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;->aQJ:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/firebase/components/m$a;->aQF: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 d30bb20a41..d6e1d79de6 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 aQK:Ljava/lang/Class;
+.field private final aQG:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -24,7 +24,7 @@
     .end annotation
 .end field
 
-.field final aQL:Z
+.field final aQH: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;->aQK:Ljava/lang/Class;
+    iput-object p1, p0, Lcom/google/firebase/components/m$b;->aQG:Ljava/lang/Class;
 
-    iput-boolean p2, p0, Lcom/google/firebase/components/m$b;->aQL:Z
+    iput-boolean p2, p0, Lcom/google/firebase/components/m$b;->aQH: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;->aQK:Ljava/lang/Class;
+    iget-object v0, p1, Lcom/google/firebase/components/m$b;->aQG:Ljava/lang/Class;
 
-    iget-object v2, p0, Lcom/google/firebase/components/m$b;->aQK:Ljava/lang/Class;
+    iget-object v2, p0, Lcom/google/firebase/components/m$b;->aQG: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;->aQL:Z
+    iget-boolean p1, p1, Lcom/google/firebase/components/m$b;->aQH:Z
 
-    iget-boolean v0, p0, Lcom/google/firebase/components/m$b;->aQL:Z
+    iget-boolean v0, p0, Lcom/google/firebase/components/m$b;->aQH: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;->aQK:Ljava/lang/Class;
+    iget-object v0, p0, Lcom/google/firebase/components/m$b;->aQG: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;->aQL:Z
+    iget-boolean v1, p0, Lcom/google/firebase/components/m$b;->aQH: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 89e5f8f6d8..abb389f6ee 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;->aQr:Ljava/util/Set;
+    iget-object v5, v2, Lcom/google/firebase/components/b;->aQn: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;->zU()Z
+    invoke-virtual {v2}, Lcom/google/firebase/components/b;->zS()Z
 
     move-result v8
 
@@ -111,7 +111,7 @@
 
     if-nez v10, :cond_3
 
-    iget-boolean v7, v7, Lcom/google/firebase/components/m$b;->aQL:Z
+    iget-boolean v7, v7, Lcom/google/firebase/components/m$b;->aQH: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;->aQI:Lcom/google/firebase/components/b;
+    iget-object v5, v4, Lcom/google/firebase/components/m$a;->aQE:Lcom/google/firebase/components/b;
 
-    iget-object v5, v5, Lcom/google/firebase/components/b;->aQs:Ljava/util/Set;
+    iget-object v5, v5, Lcom/google/firebase/components/b;->aQo: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;->zZ()Z
+    invoke-virtual {v6}, Lcom/google/firebase/components/n;->zX()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;->aQK:Ljava/lang/Class;
+    iget-object v8, v6, Lcom/google/firebase/components/n;->aQG: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;->aQs:Ljava/util/Set;
+    iget-object v8, v4, Lcom/google/firebase/components/m$a;->aQo: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;->aQJ:Ljava/util/Set;
+    iget-object v7, v7, Lcom/google/firebase/components/m$a;->aQF: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;->aQs:Ljava/util/Set;
+    iget-object v4, v2, Lcom/google/firebase/components/m$a;->aQo: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;->aQJ:Ljava/util/Set;
+    iget-object v6, v5, Lcom/google/firebase/components/m$a;->aQF: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;->aQs:Ljava/util/Set;
+    iget-object v2, v1, Lcom/google/firebase/components/m$a;->aQo: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;->aQI:Lcom/google/firebase/components/b;
+    iget-object v1, v1, Lcom/google/firebase/components/m$a;->aQE: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 da09a52274..3ca2a41d26 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 aQK:Ljava/lang/Class;
+.field final aQG:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -13,7 +13,7 @@
     .end annotation
 .end field
 
-.field private final aQM:I
+.field private final aQI:I
 
 .field final type:I
 
@@ -39,13 +39,13 @@
 
     check-cast p1, Ljava/lang/Class;
 
-    iput-object p1, p0, Lcom/google/firebase/components/n;->aQK:Ljava/lang/Class;
+    iput-object p1, p0, Lcom/google/firebase/components/n;->aQG: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;->aQM:I
+    iput p1, p0, Lcom/google/firebase/components/n;->aQI: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;->aQK:Ljava/lang/Class;
+    iget-object v0, p0, Lcom/google/firebase/components/n;->aQG:Ljava/lang/Class;
 
-    iget-object v2, p1, Lcom/google/firebase/components/n;->aQK:Ljava/lang/Class;
+    iget-object v2, p1, Lcom/google/firebase/components/n;->aQG: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;->aQM:I
+    iget v0, p0, Lcom/google/firebase/components/n;->aQI:I
 
-    iget p1, p1, Lcom/google/firebase/components/n;->aQM:I
+    iget p1, p1, Lcom/google/firebase/components/n;->aQI: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;->aQK:Ljava/lang/Class;
+    iget-object v0, p0, Lcom/google/firebase/components/n;->aQG: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;->aQM:I
+    iget v1, p0, Lcom/google/firebase/components/n;->aQI: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;->aQK:Ljava/lang/Class;
+    iget-object v1, p0, Lcom/google/firebase/components/n;->aQG: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;->aQM:I
+    iget v1, p0, Lcom/google/firebase/components/n;->aQI:I
 
     if-nez v1, :cond_2
 
@@ -223,10 +223,10 @@
     return-object v0
 .end method
 
-.method public final zZ()Z
+.method public final zX()Z
     .locals 1
 
-    iget v0, p0, Lcom/google/firebase/components/n;->aQM:I
+    iget v0, p0, Lcom/google/firebase/components/n;->aQI: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 bc97eff549..74213f4667 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 aQN:Ljava/util/Map;
+.field private final aQJ:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -24,7 +24,7 @@
     .end annotation
 .end field
 
-.field private aQO:Ljava/util/Queue;
+.field private aQK:Ljava/util/Queue;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Queue<",
@@ -34,7 +34,7 @@
     .end annotation
 .end field
 
-.field private final aQP:Ljava/util/concurrent/Executor;
+.field private final aQL: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;->aQN:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/firebase/components/q;->aQJ: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;->aQO:Ljava/util/Queue;
+    iput-object v0, p0, Lcom/google/firebase/components/q;->aQK:Ljava/util/Queue;
 
-    iput-object p1, p0, Lcom/google/firebase/components/q;->aQP:Ljava/util/concurrent/Executor;
+    iput-object p1, p0, Lcom/google/firebase/components/q;->aQL: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;->aQO:Ljava/util/Queue;
+    iget-object v0, p0, Lcom/google/firebase/components/q;->aQK:Ljava/util/Queue;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/firebase/components/q;->aQO:Ljava/util/Queue;
+    iget-object v0, p0, Lcom/google/firebase/components/q;->aQK: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;->aQN:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/firebase/components/q;->aQJ:Ljava/util/Map;
 
     iget-object p1, p1, Lcom/google/firebase/a/a;->type:Ljava/lang/Class;
 
@@ -225,21 +225,107 @@
 
 
 # virtual methods
-.method final Aa()V
+.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;->aQL: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;->aQJ: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;->aQJ: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;->aQJ: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 zY()V
     .locals 2
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/firebase/components/q;->aQO:Ljava/util/Queue;
+    iget-object v0, p0, Lcom/google/firebase/components/q;->aQK:Ljava/util/Queue;
 
     const/4 v1, 0x0
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/firebase/components/q;->aQO:Ljava/util/Queue;
+    iget-object v0, p0, Lcom/google/firebase/components/q;->aQK:Ljava/util/Queue;
 
-    iput-object v1, p0, Lcom/google/firebase/components/q;->aQO:Ljava/util/Queue;
+    iput-object v1, p0, Lcom/google/firebase/components/q;->aQK:Ljava/util/Queue;
 
     goto :goto_0
 
@@ -293,89 +379,3 @@
     :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 6327dbfbad..9c07504832 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 aQQ:Ljava/util/Map$Entry;
+.field private final aQM:Ljava/util/Map$Entry;
 
-.field private final aQR:Lcom/google/firebase/a/a;
+.field private final aQN: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;->aQQ:Ljava/util/Map$Entry;
+    iput-object p1, p0, Lcom/google/firebase/components/r;->aQM:Ljava/util/Map$Entry;
 
-    iput-object p2, p0, Lcom/google/firebase/components/r;->aQR:Lcom/google/firebase/a/a;
+    iput-object p2, p0, Lcom/google/firebase/components/r;->aQN: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;->aQQ:Ljava/util/Map$Entry;
+    iget-object v0, p0, Lcom/google/firebase/components/r;->aQM:Ljava/util/Map$Entry;
 
-    iget-object v1, p0, Lcom/google/firebase/components/r;->aQR:Lcom/google/firebase/a/a;
+    iget-object v1, p0, Lcom/google/firebase/components/r;->aQN: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 4b6da6d9fa..e01e973b8b 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 aQS:Ljava/lang/Object;
+.field private static final aQO:Ljava/lang/Object;
 
 
 # instance fields
-.field private volatile aQT:Ljava/lang/Object;
+.field private volatile aQP:Ljava/lang/Object;
 
-.field private volatile aQU:Lcom/google/firebase/b/a;
+.field private volatile aQQ: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;->aQS:Ljava/lang/Object;
+    sput-object v0, Lcom/google/firebase/components/s;->aQO: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;->aQS:Ljava/lang/Object;
+    sget-object v0, Lcom/google/firebase/components/s;->aQO:Ljava/lang/Object;
 
-    iput-object v0, p0, Lcom/google/firebase/components/s;->aQT:Ljava/lang/Object;
+    iput-object v0, p0, Lcom/google/firebase/components/s;->aQP:Ljava/lang/Object;
 
-    iput-object p1, p0, Lcom/google/firebase/components/s;->aQU:Lcom/google/firebase/b/a;
+    iput-object p1, p0, Lcom/google/firebase/components/s;->aQQ:Lcom/google/firebase/b/a;
 
     return-void
 .end method
@@ -80,32 +80,32 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/firebase/components/s;->aQT:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/firebase/components/s;->aQP:Ljava/lang/Object;
 
-    sget-object v1, Lcom/google/firebase/components/s;->aQS:Ljava/lang/Object;
+    sget-object v1, Lcom/google/firebase/components/s;->aQO:Ljava/lang/Object;
 
     if-ne v0, v1, :cond_1
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/firebase/components/s;->aQT:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/firebase/components/s;->aQP:Ljava/lang/Object;
 
-    sget-object v1, Lcom/google/firebase/components/s;->aQS:Ljava/lang/Object;
+    sget-object v1, Lcom/google/firebase/components/s;->aQO:Ljava/lang/Object;
 
     if-ne v0, v1, :cond_0
 
-    iget-object v0, p0, Lcom/google/firebase/components/s;->aQU:Lcom/google/firebase/b/a;
+    iget-object v0, p0, Lcom/google/firebase/components/s;->aQQ: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;->aQT:Ljava/lang/Object;
+    iput-object v0, p0, Lcom/google/firebase/components/s;->aQP:Ljava/lang/Object;
 
     const/4 v1, 0x0
 
-    iput-object v1, p0, Lcom/google/firebase/components/s;->aQU:Lcom/google/firebase/b/a;
+    iput-object v1, p0, Lcom/google/firebase/components/s;->aQQ: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 47267cfc4d..2b41c6f977 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 aQZ:Ljava/util/Set;
+.field private final aQV:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -28,7 +28,7 @@
     .end annotation
 .end field
 
-.field private final aRb:Lcom/google/firebase/a/c;
+.field private final aQX: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;->aQZ:Ljava/util/Set;
+    iput-object p1, p0, Lcom/google/firebase/components/u$a;->aQV:Ljava/util/Set;
 
-    iput-object p2, p0, Lcom/google/firebase/components/u$a;->aRb:Lcom/google/firebase/a/c;
+    iput-object p2, p0, Lcom/google/firebase/components/u$a;->aQX: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 cc6ebf40a9..6a38e71a25 100644
--- a/com.discord/smali_classes2/com/google/firebase/components/u.smali
+++ b/com.discord/smali_classes2/com/google/firebase/components/u.smali
@@ -12,6 +12,46 @@
 
 
 # instance fields
+.field private final aQR:Ljava/util/Set;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/Set<",
+            "Ljava/lang/Class<",
+            "*>;>;"
+        }
+    .end annotation
+.end field
+
+.field private final aQS:Ljava/util/Set;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/Set<",
+            "Ljava/lang/Class<",
+            "*>;>;"
+        }
+    .end annotation
+.end field
+
+.field private final aQT:Ljava/util/Set;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/Set<",
+            "Ljava/lang/Class<",
+            "*>;>;"
+        }
+    .end annotation
+.end field
+
+.field private final aQU:Ljava/util/Set;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/Set<",
+            "Ljava/lang/Class<",
+            "*>;>;"
+        }
+    .end annotation
+.end field
+
 .field private final aQV:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -22,47 +62,7 @@
     .end annotation
 .end field
 
-.field private final aQW:Ljava/util/Set;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/Set<",
-            "Ljava/lang/Class<",
-            "*>;>;"
-        }
-    .end annotation
-.end field
-
-.field private final aQX:Ljava/util/Set;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/Set<",
-            "Ljava/lang/Class<",
-            "*>;>;"
-        }
-    .end annotation
-.end field
-
-.field private final aQY:Ljava/util/Set;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/Set<",
-            "Ljava/lang/Class<",
-            "*>;>;"
-        }
-    .end annotation
-.end field
-
-.field private final aQZ:Ljava/util/Set;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/Set<",
-            "Ljava/lang/Class<",
-            "*>;>;"
-        }
-    .end annotation
-.end field
-
-.field private final aRa:Lcom/google/firebase/components/e;
+.field private final aQW: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;->aQs:Ljava/util/Set;
+    iget-object v4, p1, Lcom/google/firebase/components/b;->aQo: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;->zZ()Z
+    invoke-virtual {v5}, Lcom/google/firebase/components/n;->zX()Z
 
     move-result v6
 
@@ -127,14 +127,14 @@
 
     if-eqz v6, :cond_0
 
-    iget-object v5, v5, Lcom/google/firebase/components/n;->aQK:Ljava/lang/Class;
+    iget-object v5, v5, Lcom/google/firebase/components/n;->aQG: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;->aQK:Ljava/lang/Class;
+    iget-object v5, v5, Lcom/google/firebase/components/n;->aQG: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;->aQK:Ljava/lang/Class;
+    iget-object v5, v5, Lcom/google/firebase/components/n;->aQG: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;->aQK:Ljava/lang/Class;
+    iget-object v5, v5, Lcom/google/firebase/components/n;->aQG: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;->aQv:Ljava/util/Set;
+    iget-object v4, p1, Lcom/google/firebase/components/b;->aQr: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;->aQV:Ljava/util/Set;
+    iput-object v0, p0, Lcom/google/firebase/components/u;->aQR: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;->aQW:Ljava/util/Set;
+    iput-object v0, p0, Lcom/google/firebase/components/u;->aQS: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;->aQX:Ljava/util/Set;
+    iput-object v0, p0, Lcom/google/firebase/components/u;->aQT: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;->aQY:Ljava/util/Set;
+    iput-object v0, p0, Lcom/google/firebase/components/u;->aQU:Ljava/util/Set;
 
-    iget-object p1, p1, Lcom/google/firebase/components/b;->aQv:Ljava/util/Set;
+    iget-object p1, p1, Lcom/google/firebase/components/b;->aQr:Ljava/util/Set;
 
-    iput-object p1, p0, Lcom/google/firebase/components/u;->aQZ:Ljava/util/Set;
+    iput-object p1, p0, Lcom/google/firebase/components/u;->aQV:Ljava/util/Set;
 
-    iput-object p2, p0, Lcom/google/firebase/components/u;->aRa:Lcom/google/firebase/components/e;
+    iput-object p2, p0, Lcom/google/firebase/components/u;->aQW:Lcom/google/firebase/components/e;
 
     return-void
 .end method
@@ -223,7 +223,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/firebase/components/u;->aQX:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/firebase/components/u;->aQT: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;->aRa:Lcom/google/firebase/components/e;
+    iget-object v0, p0, Lcom/google/firebase/components/u;->aQW: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;->aQW:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/firebase/components/u;->aQS: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;->aRa:Lcom/google/firebase/components/e;
+    iget-object v0, p0, Lcom/google/firebase/components/u;->aQW: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;->aQY:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/firebase/components/u;->aQU: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;->aRa:Lcom/google/firebase/components/e;
+    iget-object v0, p0, Lcom/google/firebase/components/u;->aQW: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;->aQV:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/firebase/components/u;->aQR: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;->aRa:Lcom/google/firebase/components/e;
+    iget-object v0, p0, Lcom/google/firebase/components/u;->aQW: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;->aQZ:Ljava/util/Set;
+    iget-object v1, p0, Lcom/google/firebase/components/u;->aQV: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 17ba729cf1..b6e6898b9a 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 aSH:Ljava/lang/String;
+.field private final aSD:Ljava/lang/String;
 
-.field private final aSI:Lcom/google/firebase/d/d;
+.field private final aSE:Lcom/google/firebase/d/d;
 
 
 # direct methods
@@ -32,14 +32,14 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/firebase/d/b;->aSH:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/firebase/d/b;->aSD:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/google/firebase/d/b;->aSI:Lcom/google/firebase/d/d;
+    iput-object p2, p0, Lcom/google/firebase/d/b;->aSE:Lcom/google/firebase/d/d;
 
     return-void
 .end method
 
-.method public static At()Lcom/google/firebase/components/b;
+.method public static Ar()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;->Au()Lcom/google/firebase/components/g;
+    invoke-static {}, Lcom/google/firebase/d/c;->As()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;->zV()Lcom/google/firebase/components/b;
+    invoke-virtual {v0}, Lcom/google/firebase/components/b$a;->zT()Lcom/google/firebase/components/b;
 
     move-result-object v0
 
@@ -94,7 +94,7 @@
 
     move-result-object p0
 
-    invoke-static {}, Lcom/google/firebase/d/d;->Aw()Lcom/google/firebase/d/d;
+    invoke-static {}, Lcom/google/firebase/d/d;->Au()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;->As()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/google/firebase/d/e;->Aq()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;->aSI:Lcom/google/firebase/d/d;
+    iget-object v0, p0, Lcom/google/firebase/d/b;->aSE:Lcom/google/firebase/d/d;
 
-    invoke-virtual {v0}, Lcom/google/firebase/d/d;->Av()Ljava/util/Set;
+    invoke-virtual {v0}, Lcom/google/firebase/d/d;->At()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;->aSH:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/firebase/d/b;->aSD: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;->aSH:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/firebase/d/b;->aSD: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;->aSI:Lcom/google/firebase/d/d;
+    iget-object v1, p0, Lcom/google/firebase/d/b;->aSE:Lcom/google/firebase/d/d;
 
-    invoke-virtual {v1}, Lcom/google/firebase/d/d;->Av()Ljava/util/Set;
+    invoke-virtual {v1}, Lcom/google/firebase/d/d;->At()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 d6ac9ae157..d61209fc8d 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 aSJ:Lcom/google/firebase/d/c;
+.field private static final aSF: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;->aSJ:Lcom/google/firebase/d/c;
+    sput-object v0, Lcom/google/firebase/d/c;->aSF:Lcom/google/firebase/d/c;
 
     return-void
 .end method
@@ -31,10 +31,10 @@
     return-void
 .end method
 
-.method public static Au()Lcom/google/firebase/components/g;
+.method public static As()Lcom/google/firebase/components/g;
     .locals 1
 
-    sget-object v0, Lcom/google/firebase/d/c;->aSJ:Lcom/google/firebase/d/c;
+    sget-object v0, Lcom/google/firebase/d/c;->aSF: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 f58dc3f1c9..8fafd7c54b 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 aSL:Lcom/google/firebase/d/d;
+.field private static volatile aSH:Lcom/google/firebase/d/d;
 
 
 # instance fields
-.field private final aSK:Ljava/util/Set;
+.field private final aSG: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;->aSK:Ljava/util/Set;
+    iput-object v0, p0, Lcom/google/firebase/d/d;->aSG:Ljava/util/Set;
 
     return-void
 .end method
 
-.method public static Aw()Lcom/google/firebase/d/d;
+.method public static Au()Lcom/google/firebase/d/d;
     .locals 2
 
-    sget-object v0, Lcom/google/firebase/d/d;->aSL:Lcom/google/firebase/d/d;
+    sget-object v0, Lcom/google/firebase/d/d;->aSH: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;->aSL:Lcom/google/firebase/d/d;
+    sget-object v0, Lcom/google/firebase/d/d;->aSH: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;->aSL:Lcom/google/firebase/d/d;
+    sput-object v0, Lcom/google/firebase/d/d;->aSH:Lcom/google/firebase/d/d;
 
     :cond_0
     monitor-exit v1
@@ -77,7 +77,7 @@
 
 
 # virtual methods
-.method final Av()Ljava/util/Set;
+.method final At()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;->aSK:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/firebase/d/d;->aSG:Ljava/util/Set;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/firebase/d/d;->aSK:Ljava/util/Set;
+    iget-object v1, p0, Lcom/google/firebase/d/d;->aSG: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 0630ab5ee5..2f952eed55 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 aRc:Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;
+.field public final aQY: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;->aRc:Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;
+    iput-object p1, p0, Lcom/google/firebase/dynamiclinks/PendingDynamicLinkData;->aQY:Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;
 
     return-void
 
     :cond_0
-    iget-wide v0, p1, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->axu:J
+    iget-wide v0, p1, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->axq:J
 
     const-wide/16 v2, 0x0
 
@@ -29,7 +29,7 @@
 
     if-nez v4, :cond_1
 
-    invoke-static {}, Lcom/google/android/gms/common/util/g;->nt()Lcom/google/android/gms/common/util/e;
+    invoke-static {}, Lcom/google/android/gms/common/util/g;->nr()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;->axu:J
+    iput-wide v0, p1, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->axq:J
 
     :cond_1
-    iput-object p1, p0, Lcom/google/firebase/dynamiclinks/PendingDynamicLinkData;->aRc:Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;
+    iput-object p1, p0, Lcom/google/firebase/dynamiclinks/PendingDynamicLinkData;->aQY: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 1c04339af5..f944d8f8aa 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 Ab()Lcom/google/firebase/dynamiclinks/a;
+.method public static declared-synchronized zZ()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 6125b5a7cb..0c8ef12919 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 aEv:Ljava/lang/String;
+.field public aEr:Ljava/lang/String;
 
-.field private aLP:I
+.field private aLL:I
 
-.field private aRd:Landroid/os/Bundle;
+.field private aQZ:Landroid/os/Bundle;
 
-.field private aRe:Landroid/net/Uri;
+.field private aRa:Landroid/net/Uri;
 
-.field public axu:J
+.field public axq:J
 
 .field private zzj:Ljava/lang/String;
 
@@ -48,33 +48,33 @@
 
     const-wide/16 v0, 0x0
 
-    iput-wide v0, p0, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->axu:J
+    iput-wide v0, p0, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->axq:J
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->aRd:Landroid/os/Bundle;
+    iput-object v0, p0, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->aQZ: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;->aEv:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->aEr:Ljava/lang/String;
 
-    iput p3, p0, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->aLP:I
+    iput p3, p0, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->aLL:I
 
-    iput-wide p4, p0, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->axu:J
+    iput-wide p4, p0, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->axq:J
 
-    iput-object p6, p0, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->aRd:Landroid/os/Bundle;
+    iput-object p6, p0, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->aQZ:Landroid/os/Bundle;
 
-    iput-object p7, p0, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->aRe:Landroid/net/Uri;
+    iput-object p7, p0, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->aRa:Landroid/net/Uri;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final Ac()Landroid/os/Bundle;
+.method public final Aa()Landroid/os/Bundle;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->aRd:Landroid/os/Bundle;
+    iget-object v0, p0, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->aQZ:Landroid/os/Bundle;
 
     if-nez v0, :cond_0
 
@@ -101,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;->aEv:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->aEr: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;->aLP:I
+    iget v1, p0, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->aLL: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;->axu:J
+    iget-wide v1, p0, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->axq: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;->Ac()Landroid/os/Bundle;
+    invoke-virtual {p0}, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->Aa()Landroid/os/Bundle;
 
     move-result-object v1
 
@@ -127,7 +127,7 @@
 
     invoke-static {p1, v2, v1}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILandroid/os/Bundle;)V
 
-    iget-object v1, p0, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->aRe:Landroid/net/Uri;
+    iget-object v1, p0, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->aRa:Landroid/net/Uri;
 
     const/4 v2, 0x6
 
diff --git a/com.discord/smali_classes2/com/google/firebase/dynamiclinks/internal/FirebaseDynamicLinkRegistrar.smali b/com.discord/smali_classes2/com/google/firebase/dynamiclinks/internal/FirebaseDynamicLinkRegistrar.smali
index c3a086e370..770327573d 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;->aRi:Lcom/google/firebase/components/g;
+    sget-object v1, Lcom/google/firebase/dynamiclinks/internal/f;->aRe: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;->zV()Lcom/google/firebase/components/b;
+    invoke-virtual {v0}, Lcom/google/firebase/components/b$a;->zT()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 2ac46e8cf9..f5465a197f 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 aAn:Lcom/google/android/gms/common/api/a$g;
+.field private static final aAj: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 aLj:Lcom/google/android/gms/common/api/a;
+.field private static final aLf: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 aRf:Lcom/google/android/gms/common/api/a$a;
+.field private static final aRb: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;->aAn:Lcom/google/android/gms/common/api/a$g;
+    sput-object v0, Lcom/google/firebase/dynamiclinks/internal/c;->aAj: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;->aRf:Lcom/google/android/gms/common/api/a$a;
+    sput-object v0, Lcom/google/firebase/dynamiclinks/internal/c;->aRb: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;->aRf:Lcom/google/android/gms/common/api/a$a;
+    sget-object v1, Lcom/google/firebase/dynamiclinks/internal/c;->aRb:Lcom/google/android/gms/common/api/a$a;
 
-    sget-object v2, Lcom/google/firebase/dynamiclinks/internal/c;->aAn:Lcom/google/android/gms/common/api/a$g;
+    sget-object v2, Lcom/google/firebase/dynamiclinks/internal/c;->aAj: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;->aLj:Lcom/google/android/gms/common/api/a;
+    sput-object v0, Lcom/google/firebase/dynamiclinks/internal/c;->aLf: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;->aLj:Lcom/google/android/gms/common/api/a;
+    sget-object v0, Lcom/google/firebase/dynamiclinks/internal/c;->aLf:Lcom/google/android/gms/common/api/a;
 
-    sget-object v1, Lcom/google/android/gms/common/api/h$a;->afz:Lcom/google/android/gms/common/api/h$a;
+    sget-object v1, Lcom/google/android/gms/common/api/h$a;->afv: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 67923c97dd..46e5920c3b 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 mb()I
+.method public final lZ()I
     .locals 1
 
     const v0, 0xbdfcb8
@@ -77,7 +77,7 @@
     return v0
 .end method
 
-.method public final md()Ljava/lang/String;
+.method public final mb()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 me()Ljava/lang/String;
+.method public final mc()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 18e62cee4b..a1e8f254b1 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 aRg:Lcom/google/android/gms/common/api/h;
+.field private final aRc: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 aRh:Lcom/google/firebase/analytics/connector/a;
+.field private final aRd: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;->aRg:Lcom/google/android/gms/common/api/h;
+    iput-object p1, p0, Lcom/google/firebase/dynamiclinks/internal/e;->aRc:Lcom/google/android/gms/common/api/h;
 
-    iput-object p2, p0, Lcom/google/firebase/dynamiclinks/internal/e;->aRh:Lcom/google/firebase/analytics/connector/a;
+    iput-object p2, p0, Lcom/google/firebase/dynamiclinks/internal/e;->aRd: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;->aRg:Lcom/google/android/gms/common/api/h;
+    iget-object v0, p0, Lcom/google/firebase/dynamiclinks/internal/e;->aRc: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;->aRh:Lcom/google/firebase/analytics/connector/a;
+    iget-object v2, p0, Lcom/google/firebase/dynamiclinks/internal/e;->aRd: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 107f8e7090..e0fe2d0101 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 aRi:Lcom/google/firebase/components/g;
+.field static final aRe: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;->aRi:Lcom/google/firebase/components/g;
+    sput-object v0, Lcom/google/firebase/dynamiclinks/internal/f;->aRe: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 e690c07d74..e0fa471cd8 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 Ad()V
+.method public final Ab()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 729e317cd5..e00d18528f 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 aRh:Lcom/google/firebase/analytics/connector/a;
+.field private final aRd:Lcom/google/firebase/analytics/connector/a;
 
-.field private final aRj:Lcom/google/android/gms/tasks/h;
+.field private final aRf: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;->aRh:Lcom/google/firebase/analytics/connector/a;
+    iput-object p1, p0, Lcom/google/firebase/dynamiclinks/internal/h;->aRd:Lcom/google/firebase/analytics/connector/a;
 
-    iput-object p2, p0, Lcom/google/firebase/dynamiclinks/internal/h;->aRj:Lcom/google/android/gms/tasks/h;
+    iput-object p2, p0, Lcom/google/firebase/dynamiclinks/internal/h;->aRf: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;->aRj:Lcom/google/android/gms/tasks/h;
+    iget-object v1, p0, Lcom/google/firebase/dynamiclinks/internal/h;->aRf:Lcom/google/android/gms/tasks/h;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/common/api/Status;->lQ()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/common/api/Status;->lO()Z
 
     move-result v2
 
@@ -80,7 +80,7 @@
     return-void
 
     :cond_2
-    invoke-virtual {p2}, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->Ac()Landroid/os/Bundle;
+    invoke-virtual {p2}, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->Aa()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;->aRh:Lcom/google/firebase/analytics/connector/a;
+    iget-object p2, p0, Lcom/google/firebase/dynamiclinks/internal/h;->aRd: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;->aRh:Lcom/google/firebase/analytics/connector/a;
+    iget-object v2, p0, Lcom/google/firebase/dynamiclinks/internal/h;->aRd: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 e2ec0c9a91..f2f435280e 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 Ad()V
+.method public abstract Ab()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 cd09bf8a1b..155e3a6b87 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 aRh:Lcom/google/firebase/analytics/connector/a;
+.field private final aRd: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;->aRh:Lcom/google/firebase/analytics/connector/a;
+    iput-object p1, p0, Lcom/google/firebase/dynamiclinks/internal/j;->aRd: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;->aRh:Lcom/google/firebase/analytics/connector/a;
+    iget-object v1, p0, Lcom/google/firebase/dynamiclinks/internal/j;->aRd: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;->mU()Landroid/os/IInterface;
+    invoke-virtual {p1}, Lcom/google/firebase/dynamiclinks/internal/d;->mS()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 ed76a77363..8008362d50 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;->Ad()V
+    invoke-virtual {p0}, Lcom/google/firebase/dynamiclinks/internal/l;->Ab()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 c3ffa0a702..86f176d424 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;->nQ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/d/b;->nO()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 2d2dfcb6d1..c967745d2e 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 aIx:Ljava/util/List;
+.field private final aIt:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -25,9 +25,9 @@
     .end annotation
 .end field
 
-.field private final aRk:Landroid/net/Uri;
+.field private final aRg:Landroid/net/Uri;
 
-.field private final aRl:Landroid/net/Uri;
+.field private final aRh: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;->aRk:Landroid/net/Uri;
+    iput-object p1, p0, Lcom/google/firebase/dynamiclinks/internal/zzo;->aRg:Landroid/net/Uri;
 
-    iput-object p2, p0, Lcom/google/firebase/dynamiclinks/internal/zzo;->aRl:Landroid/net/Uri;
+    iput-object p2, p0, Lcom/google/firebase/dynamiclinks/internal/zzo;->aRh:Landroid/net/Uri;
 
-    iput-object p3, p0, Lcom/google/firebase/dynamiclinks/internal/zzo;->aIx:Ljava/util/List;
+    iput-object p3, p0, Lcom/google/firebase/dynamiclinks/internal/zzo;->aIt:Ljava/util/List;
 
     return-void
 .end method
@@ -78,19 +78,19 @@
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/firebase/dynamiclinks/internal/zzo;->aRk:Landroid/net/Uri;
+    iget-object v1, p0, Lcom/google/firebase/dynamiclinks/internal/zzo;->aRg: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;->aRl:Landroid/net/Uri;
+    iget-object v1, p0, Lcom/google/firebase/dynamiclinks/internal/zzo;->aRh: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;->aIx:Ljava/util/List;
+    iget-object p2, p0, Lcom/google/firebase/dynamiclinks/internal/zzo;->aIt: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 6353338f6d..7b75c92430 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 aRm:Ljava/lang/String;
+.field private final aRi: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;->aRm:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/firebase/dynamiclinks/internal/zzr;->aRi:Ljava/lang/String;
 
     return-void
 .end method
@@ -52,7 +52,7 @@
 
     move-result p2
 
-    iget-object v0, p0, Lcom/google/firebase/dynamiclinks/internal/zzr;->aRm:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/firebase/dynamiclinks/internal/zzr;->aRi: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 7f80fccf68..130567968d 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 aRv:Lcom/google/firebase/a/d;
+.field private final aRr:Lcom/google/firebase/a/d;
 
-.field private aRw:Lcom/google/firebase/a/b;
+.field private aRs: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 aRx:Ljava/lang/Boolean;
+.field private aRt:Ljava/lang/Boolean;
 
-.field final synthetic aRy:Lcom/google/firebase/iid/FirebaseInstanceId;
+.field final synthetic aRu:Lcom/google/firebase/iid/FirebaseInstanceId;
 
-.field private atG:Z
+.field private atC:Z
 
-.field private axe:Z
+.field private axa: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;->aRy:Lcom/google/firebase/iid/FirebaseInstanceId;
+    iput-object p1, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->aRu:Lcom/google/firebase/iid/FirebaseInstanceId;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p2, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->aRv:Lcom/google/firebase/a/d;
+    iput-object p2, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->aRr:Lcom/google/firebase/a/d;
 
     return-void
 .end method
 
-.method private final declared-synchronized pG()V
+.method private final declared-synchronized pE()V
     .locals 3
 
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->axe:Z
+    iget-boolean v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->axa: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;->qg()Z
+    invoke-direct {p0}, Lcom/google/firebase/iid/FirebaseInstanceId$a;->qe()Z
 
     move-result v0
 
-    iput-boolean v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->atG:Z
+    iput-boolean v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->atC:Z
 
-    invoke-direct {p0}, Lcom/google/firebase/iid/FirebaseInstanceId$a;->vE()Ljava/lang/Boolean;
+    invoke-direct {p0}, Lcom/google/firebase/iid/FirebaseInstanceId$a;->vC()Ljava/lang/Boolean;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->aRx:Ljava/lang/Boolean;
+    iput-object v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->aRt:Ljava/lang/Boolean;
 
-    iget-object v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->aRx:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->aRt:Ljava/lang/Boolean;
 
     if-nez v0, :cond_1
 
-    iget-boolean v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->atG:Z
+    iget-boolean v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->atC: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;->aRw:Lcom/google/firebase/a/b;
+    iput-object v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->aRs:Lcom/google/firebase/a/b;
 
-    iget-object v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->aRv:Lcom/google/firebase/a/d;
+    iget-object v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->aRr:Lcom/google/firebase/a/d;
 
     const-class v1, Lcom/google/firebase/a;
 
-    iget-object v2, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->aRw:Lcom/google/firebase/a/b;
+    iget-object v2, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->aRs: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;->axe:Z
+    iput-boolean v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->axa:Z
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
@@ -120,7 +120,7 @@
     throw v0
 .end method
 
-.method private final qg()Z
+.method private final qe()Z
     .locals 4
 
     const/4 v0, 0x1
@@ -137,7 +137,7 @@
     :catch_0
     nop
 
-    iget-object v1, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->aRy:Lcom/google/firebase/iid/FirebaseInstanceId;
+    iget-object v1, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->aRu: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 vE()Ljava/lang/Boolean;
+.method private final vC()Ljava/lang/Boolean;
     .locals 6
 
     const-string v0, "firebase_messaging_auto_init_enabled"
 
-    iget-object v1, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->aRy:Lcom/google/firebase/iid/FirebaseInstanceId;
+    iget-object v1, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->aRu: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 pH()Z
+.method final declared-synchronized pF()Z
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    invoke-direct {p0}, Lcom/google/firebase/iid/FirebaseInstanceId$a;->pG()V
+    invoke-direct {p0}, Lcom/google/firebase/iid/FirebaseInstanceId$a;->pE()V
 
-    iget-object v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->aRx:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->aRt:Ljava/lang/Boolean;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->aRx:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->aRt: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;->atG:Z
+    iget-boolean v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->atC:Z
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->aRy:Lcom/google/firebase/iid/FirebaseInstanceId;
+    iget-object v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->aRu: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 dc464ef4a8..d1d5e60334 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 aRn:Lcom/google/firebase/iid/v;
+.field static aRj:Lcom/google/firebase/iid/v;
 
-.field private static aRo:Ljava/util/concurrent/ScheduledExecutorService;
+.field private static aRk:Ljava/util/concurrent/ScheduledExecutorService;
 
-.field private static final any:J
+.field private static final anu:J
 
 
 # instance fields
-.field final aLY:Ljava/util/concurrent/Executor;
+.field final aLU:Ljava/util/concurrent/Executor;
 
-.field public final aRp:Lcom/google/firebase/FirebaseApp;
+.field public final aRl:Lcom/google/firebase/FirebaseApp;
 
-.field final aRq:Lcom/google/firebase/iid/j;
+.field final aRm:Lcom/google/firebase/iid/j;
 
-.field final aRr:Lcom/google/firebase/iid/ap;
+.field final aRn:Lcom/google/firebase/iid/ap;
 
-.field final aRs:Lcom/google/firebase/iid/o;
+.field final aRo:Lcom/google/firebase/iid/o;
 
-.field private final aRt:Lcom/google/firebase/iid/z;
+.field private final aRp:Lcom/google/firebase/iid/z;
 
-.field final aRu:Lcom/google/firebase/iid/FirebaseInstanceId$a;
+.field final aRq: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;->any:J
+    sput-wide v0, Lcom/google/firebase/iid/FirebaseInstanceId;->anu: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;->Ah()Ljava/util/concurrent/Executor;
+    invoke-static {}, Lcom/google/firebase/iid/a;->Af()Ljava/util/concurrent/Executor;
 
     move-result-object v3
 
-    invoke-static {}, Lcom/google/firebase/iid/a;->Ah()Ljava/util/concurrent/Executor;
+    invoke-static {}, Lcom/google/firebase/iid/a;->Af()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;->aRn:Lcom/google/firebase/iid/v;
+    sget-object v1, Lcom/google/firebase/iid/FirebaseInstanceId;->aRj: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;->aRn:Lcom/google/firebase/iid/v;
+    sput-object v1, Lcom/google/firebase/iid/FirebaseInstanceId;->aRj: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;->aRp:Lcom/google/firebase/FirebaseApp;
+    iput-object p1, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aRl:Lcom/google/firebase/FirebaseApp;
 
-    iput-object p2, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aRq:Lcom/google/firebase/iid/j;
+    iput-object p2, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aRm: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;->aRr:Lcom/google/firebase/iid/ap;
+    iput-object v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aRn:Lcom/google/firebase/iid/ap;
 
-    iput-object p4, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aLY:Ljava/util/concurrent/Executor;
+    iput-object p4, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aLU:Ljava/util/concurrent/Executor;
 
     new-instance p1, Lcom/google/firebase/iid/z;
 
-    sget-object p2, Lcom/google/firebase/iid/FirebaseInstanceId;->aRn:Lcom/google/firebase/iid/v;
+    sget-object p2, Lcom/google/firebase/iid/FirebaseInstanceId;->aRj: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;->aRt:Lcom/google/firebase/iid/z;
+    iput-object p1, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aRp: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;->aRu:Lcom/google/firebase/iid/FirebaseInstanceId$a;
+    iput-object p1, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aRq: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;->aRs:Lcom/google/firebase/iid/o;
+    iput-object p1, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aRo:Lcom/google/firebase/iid/o;
 
     new-instance p1, Lcom/google/firebase/iid/al;
 
@@ -185,7 +185,7 @@
     throw p1
 .end method
 
-.method public static Ae()Lcom/google/firebase/iid/FirebaseInstanceId;
+.method public static Ac()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;->aRn:Lcom/google/firebase/iid/v;
+    sget-object v0, Lcom/google/firebase/iid/FirebaseInstanceId;->aRj: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;->aRp:Lcom/google/firebase/FirebaseApp;
+    iget-object p0, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aRl: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;->aRo:Ljava/util/concurrent/ScheduledExecutorService;
+    sget-object v1, Lcom/google/firebase/iid/FirebaseInstanceId;->aRk: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;->aRo:Ljava/util/concurrent/ScheduledExecutorService;
+    sput-object v1, Lcom/google/firebase/iid/FirebaseInstanceId;->aRk:Ljava/util/concurrent/ScheduledExecutorService;
 
     :cond_0
-    sget-object v1, Lcom/google/firebase/iid/FirebaseInstanceId;->aRo:Ljava/util/concurrent/ScheduledExecutorService;
+    sget-object v1, Lcom/google/firebase/iid/FirebaseInstanceId;->aRk: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;->xY()V
+    invoke-virtual {p0}, Lcom/google/firebase/iid/FirebaseInstanceId;->xW()V
 
     return-void
 .end method
@@ -327,10 +327,10 @@
     return-object p0
 .end method
 
-.method public static qZ()Ljava/lang/String;
+.method public static qX()Ljava/lang/String;
     .locals 2
 
-    sget-object v0, Lcom/google/firebase/iid/FirebaseInstanceId;->aRn:Lcom/google/firebase/iid/v;
+    sget-object v0, Lcom/google/firebase/iid/FirebaseInstanceId;->aRj: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;->atS:Ljava/lang/String;
+    iget-object v0, v0, Lcom/google/firebase/iid/aw;->atO:Ljava/lang/String;
 
     return-object v0
 .end method
 
-.method static qg()Z
+.method static qe()Z
     .locals 4
 
     const/4 v0, 0x3
@@ -382,7 +382,7 @@
     return v0
 .end method
 
-.method private final declared-synchronized yF()V
+.method private final declared-synchronized yD()V
     .locals 2
 
     monitor-enter p0
@@ -413,10 +413,10 @@
 
 
 # virtual methods
-.method final Af()Lcom/google/firebase/iid/u;
+.method final Ad()Lcom/google/firebase/iid/u;
     .locals 2
 
-    iget-object v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aRp:Lcom/google/firebase/FirebaseApp;
+    iget-object v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aRl: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;->any:J
+    sget-wide v3, Lcom/google/firebase/iid/FirebaseInstanceId;->anu: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;->aRt:Lcom/google/firebase/iid/z;
+    iget-object v4, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aRp: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;->aLY:Ljava/util/concurrent/Executor;
+    iget-object v1, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aLU: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;->aRq:Lcom/google/firebase/iid/j;
+    iget-object v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aRm:Lcom/google/firebase/iid/j;
 
-    invoke-virtual {v0}, Lcom/google/firebase/iid/j;->rD()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/firebase/iid/j;->rB()Ljava/lang/String;
 
     move-result-object v0
 
@@ -610,7 +610,7 @@
 
     if-eqz p1, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/firebase/iid/FirebaseInstanceId;->tA()V
+    invoke-virtual {p0}, Lcom/google/firebase/iid/FirebaseInstanceId;->ty()V
 
     :cond_0
     check-cast v0, Ljava/io/IOException;
@@ -634,39 +634,39 @@
     throw v0
 .end method
 
-.method final rn()V
+.method final rl()V
     .locals 2
 
-    sget-object v0, Lcom/google/firebase/iid/FirebaseInstanceId;->aRn:Lcom/google/firebase/iid/v;
+    sget-object v0, Lcom/google/firebase/iid/FirebaseInstanceId;->aRj: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;->yF()V
+    invoke-direct {p0}, Lcom/google/firebase/iid/FirebaseInstanceId;->yD()V
 
     return-void
 .end method
 
-.method final declared-synchronized tA()V
+.method final declared-synchronized ty()V
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    sget-object v0, Lcom/google/firebase/iid/FirebaseInstanceId;->aRn:Lcom/google/firebase/iid/v;
+    sget-object v0, Lcom/google/firebase/iid/FirebaseInstanceId;->aRj:Lcom/google/firebase/iid/v;
 
-    invoke-virtual {v0}, Lcom/google/firebase/iid/v;->pG()V
+    invoke-virtual {v0}, Lcom/google/firebase/iid/v;->pE()V
 
-    iget-object v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aRu:Lcom/google/firebase/iid/FirebaseInstanceId$a;
+    iget-object v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aRq:Lcom/google/firebase/iid/FirebaseInstanceId$a;
 
-    invoke-virtual {v0}, Lcom/google/firebase/iid/FirebaseInstanceId$a;->pH()Z
+    invoke-virtual {v0}, Lcom/google/firebase/iid/FirebaseInstanceId$a;->pF()Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    invoke-direct {p0}, Lcom/google/firebase/iid/FirebaseInstanceId;->yF()V
+    invoke-direct {p0}, Lcom/google/firebase/iid/FirebaseInstanceId;->yD()V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -683,10 +683,10 @@
     throw v0
 .end method
 
-.method public final xY()V
+.method public final xW()V
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/firebase/iid/FirebaseInstanceId;->Af()Lcom/google/firebase/iid/u;
+    invoke-virtual {p0}, Lcom/google/firebase/iid/FirebaseInstanceId;->Ad()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;->aRt:Lcom/google/firebase/iid/z;
+    iget-object v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aRp:Lcom/google/firebase/iid/z;
 
-    invoke-virtual {v0}, Lcom/google/firebase/iid/z;->pH()Z
+    invoke-virtual {v0}, Lcom/google/firebase/iid/z;->pF()Z
 
     move-result v0
 
     if-eqz v0, :cond_1
 
     :cond_0
-    invoke-direct {p0}, Lcom/google/firebase/iid/FirebaseInstanceId;->yF()V
+    invoke-direct {p0}, Lcom/google/firebase/iid/FirebaseInstanceId;->yD()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 d22238354b..1806caa47b 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 aRz:Lcom/google/firebase/iid/ad;
+.field private static aRv:Lcom/google/firebase/iid/ad;
 
 
 # direct methods
@@ -74,7 +74,7 @@
     return p0
 
     :cond_2
-    invoke-static {}, Lcom/google/firebase/iid/s;->Aj()Lcom/google/firebase/iid/s;
+    invoke-static {}, Lcom/google/firebase/iid/s;->Ah()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;->Ae()Lcom/google/firebase/iid/FirebaseInstanceId;
+    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->Ac()Lcom/google/firebase/iid/FirebaseInstanceId;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/firebase/iid/FirebaseInstanceId;->rn()V
+    invoke-virtual {p1}, Lcom/google/firebase/iid/FirebaseInstanceId;->rl()V
 
     goto :goto_1
 
     :cond_3
     :goto_0
-    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->Ae()Lcom/google/firebase/iid/FirebaseInstanceId;
+    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->Ac()Lcom/google/firebase/iid/FirebaseInstanceId;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/firebase/iid/FirebaseInstanceId;->tA()V
+    invoke-virtual {p1}, Lcom/google/firebase/iid/FirebaseInstanceId;->ty()V
 
     :cond_4
     :goto_1
@@ -351,7 +351,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/firebase/iid/FirebaseInstanceIdReceiver;->aRz:Lcom/google/firebase/iid/ad;
+    sget-object v1, Lcom/google/firebase/iid/FirebaseInstanceIdReceiver;->aRv: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;->aRz:Lcom/google/firebase/iid/ad;
+    sput-object v1, Lcom/google/firebase/iid/FirebaseInstanceIdReceiver;->aRv:Lcom/google/firebase/iid/ad;
 
     :cond_0
-    sget-object p0, Lcom/google/firebase/iid/FirebaseInstanceIdReceiver;->aRz:Lcom/google/firebase/iid/ad;
+    sget-object p0, Lcom/google/firebase/iid/FirebaseInstanceIdReceiver;->aRv: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 3bc63a993c..60d25d00cf 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 aRy:Lcom/google/firebase/iid/FirebaseInstanceId;
+.field private final aRu: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;->aRy:Lcom/google/firebase/iid/FirebaseInstanceId;
+    iput-object p1, p0, Lcom/google/firebase/iid/Registrar$a;->aRu: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 b9223adf61..ad12c5eebd 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;->aQl:Lcom/google/firebase/components/g;
+    sget-object v1, Lcom/google/firebase/iid/l;->aQh: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;->zV()Lcom/google/firebase/components/b;
+    invoke-virtual {v0}, Lcom/google/firebase/components/b$a;->zT()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;->aQl:Lcom/google/firebase/components/g;
+    sget-object v3, Lcom/google/firebase/iid/m;->aQh: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;->zV()Lcom/google/firebase/components/b;
+    invoke-virtual {v2}, Lcom/google/firebase/components/b$a;->zT()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 8b3b8f4439..8257f8cffe 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 aQq:Ljava/util/concurrent/Executor;
+.field private static final aQm:Ljava/util/concurrent/Executor;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    sget-object v0, Lcom/google/firebase/iid/ah;->aQq:Ljava/util/concurrent/Executor;
+    sget-object v0, Lcom/google/firebase/iid/ah;->aQm:Ljava/util/concurrent/Executor;
 
-    sput-object v0, Lcom/google/firebase/iid/a;->aQq:Ljava/util/concurrent/Executor;
+    sput-object v0, Lcom/google/firebase/iid/a;->aQm:Ljava/util/concurrent/Executor;
 
     return-void
 .end method
 
-.method static Ag()Ljava/util/concurrent/Executor;
+.method static Ae()Ljava/util/concurrent/Executor;
     .locals 1
 
-    sget-object v0, Lcom/google/firebase/iid/a;->aQq:Ljava/util/concurrent/Executor;
+    sget-object v0, Lcom/google/firebase/iid/a;->aQm:Ljava/util/concurrent/Executor;
 
     return-object v0
 .end method
 
-.method static Ah()Ljava/util/concurrent/Executor;
+.method static Af()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;->aSf:Ljava/util/concurrent/ThreadFactory;
+    sget-object v7, Lcom/google/firebase/iid/ai;->aSb: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 3e6475dddd..3476d249c1 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 aRX:Lcom/google/firebase/iid/ag;
+.field private final aRT: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;->aRX:Lcom/google/firebase/iid/ag;
+    iput-object p1, p0, Lcom/google/firebase/iid/aa;->aRT: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;->aRX:Lcom/google/firebase/iid/ag;
+    iget-object p1, p0, Lcom/google/firebase/iid/aa;->aRT: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 d10b9fad9b..ace80a0894 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 aRY:Lcom/google/firebase/iid/ae;
+.field final aRU: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;->aRY:Lcom/google/firebase/iid/ae;
+    iput-object p1, p0, Lcom/google/firebase/iid/ab;->aRU: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 d645c2ae6a..c5f0254d8d 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 Al()Ljava/security/KeyPair;
+.method public static Aj()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 22905543f7..497edf96c5 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/ad.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/ad.smali
@@ -7,13 +7,11 @@
 
 
 # instance fields
-.field private final aGM:Landroid/content/Context;
+.field private final aGI:Landroid/content/Context;
 
-.field private final aRZ:Landroid/content/Intent;
+.field private final aRV:Landroid/content/Intent;
 
-.field private final aRo:Ljava/util/concurrent/ScheduledExecutorService;
-
-.field private final aSa:Ljava/util/Queue;
+.field private final aRW:Ljava/util/Queue;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Queue<",
@@ -23,7 +21,9 @@
     .end annotation
 .end field
 
-.field private aSb:Lcom/google/firebase/iid/ab;
+.field private aRX:Lcom/google/firebase/iid/ab;
+
+.field private final aRk:Ljava/util/concurrent/ScheduledExecutorService;
 
 .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;->aSa:Ljava/util/Queue;
+    iput-object v0, p0, Lcom/google/firebase/iid/ad;->aRW:Ljava/util/Queue;
 
     const/4 v0, 0x0
 
@@ -68,13 +68,13 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/firebase/iid/ad;->aGM:Landroid/content/Context;
+    iput-object p1, p0, Lcom/google/firebase/iid/ad;->aGI: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;->aGM:Landroid/content/Context;
+    iget-object p2, p0, Lcom/google/firebase/iid/ad;->aGI: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;->aRZ:Landroid/content/Intent;
+    iput-object p1, p0, Lcom/google/firebase/iid/ad;->aRV:Landroid/content/Intent;
 
-    iput-object p3, p0, Lcom/google/firebase/iid/ad;->aRo:Ljava/util/concurrent/ScheduledExecutorService;
+    iput-object p3, p0, Lcom/google/firebase/iid/ad;->aRk:Ljava/util/concurrent/ScheduledExecutorService;
 
     return-void
 .end method
 
-.method private final pG()V
+.method private final pE()V
     .locals 1
 
     :goto_0
-    iget-object v0, p0, Lcom/google/firebase/iid/ad;->aSa:Ljava/util/Queue;
+    iget-object v0, p0, Lcom/google/firebase/iid/ad;->aRW: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;->aSa:Ljava/util/Queue;
+    iget-object v0, p0, Lcom/google/firebase/iid/ad;->aRW: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;->aSa:Ljava/util/Queue;
+    iget-object v0, p0, Lcom/google/firebase/iid/ad;->aRW: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;->aSb:Lcom/google/firebase/iid/ab;
+    iget-object v0, p0, Lcom/google/firebase/iid/ad;->aRX:Lcom/google/firebase/iid/ab;
 
     if-eqz v0, :cond_5
 
-    iget-object v0, p0, Lcom/google/firebase/iid/ad;->aSb:Lcom/google/firebase/iid/ab;
+    iget-object v0, p0, Lcom/google/firebase/iid/ad;->aRX: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;->aSa:Ljava/util/Queue;
+    iget-object v0, p0, Lcom/google/firebase/iid/ad;->aRW: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;->aSb:Lcom/google/firebase/iid/ab;
+    iget-object v2, p0, Lcom/google/firebase/iid/ad;->aRX: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;->aRY:Lcom/google/firebase/iid/ae;
+    iget-object v2, v2, Lcom/google/firebase/iid/ab;->aRU:Lcom/google/firebase/iid/ae;
 
-    iget-object v3, v0, Lcom/google/firebase/iid/ag;->aSc:Landroid/content/Intent;
+    iget-object v3, v0, Lcom/google/firebase/iid/ag;->aRY: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;->Ag()Ljava/util/concurrent/Executor;
+    invoke-static {}, Lcom/google/firebase/iid/a;->Ae()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;->nk()Lcom/google/android/gms/common/stats/a;
+    invoke-static {}, Lcom/google/android/gms/common/stats/a;->ni()Lcom/google/android/gms/common/stats/a;
 
-    iget-object v0, p0, Lcom/google/firebase/iid/ad;->aGM:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/firebase/iid/ad;->aGI:Landroid/content/Context;
 
-    iget-object v2, p0, Lcom/google/firebase/iid/ad;->aRZ:Landroid/content/Intent;
+    iget-object v2, p0, Lcom/google/firebase/iid/ad;->aRV: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;->pG()V
+    invoke-direct {p0}, Lcom/google/firebase/iid/ad;->pE()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;->aSa:Ljava/util/Queue;
+    iget-object v0, p0, Lcom/google/firebase/iid/ad;->aRW:Ljava/util/Queue;
 
     new-instance v1, Lcom/google/firebase/iid/ag;
 
-    iget-object v2, p0, Lcom/google/firebase/iid/ad;->aRo:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object v2, p0, Lcom/google/firebase/iid/ad;->aRk: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;->pG()V
+    invoke-direct {p0}, Lcom/google/firebase/iid/ad;->pE()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;->aSb:Lcom/google/firebase/iid/ab;
+    iput-object p2, p0, Lcom/google/firebase/iid/ad;->aRX: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 630a2ecdba..9454d56c27 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 aRX:Lcom/google/firebase/iid/ag;
+.field private final aRT:Lcom/google/firebase/iid/ag;
 
-.field private final aRZ:Landroid/content/Intent;
+.field private final aRV: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;->aRX:Lcom/google/firebase/iid/ag;
+    iput-object p1, p0, Lcom/google/firebase/iid/af;->aRT:Lcom/google/firebase/iid/ag;
 
-    iput-object p2, p0, Lcom/google/firebase/iid/af;->aRZ:Landroid/content/Intent;
+    iput-object p2, p0, Lcom/google/firebase/iid/af;->aRV: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;->aRX:Lcom/google/firebase/iid/ag;
+    iget-object v0, p0, Lcom/google/firebase/iid/af;->aRT:Lcom/google/firebase/iid/ag;
 
-    iget-object v1, p0, Lcom/google/firebase/iid/af;->aRZ:Landroid/content/Intent;
+    iget-object v1, p0, Lcom/google/firebase/iid/af;->aRV: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 ef31474f92..a72cde0530 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 aSc:Landroid/content/Intent;
+.field final aRY:Landroid/content/Intent;
 
-.field private final aSd:Landroid/content/BroadcastReceiver$PendingResult;
+.field private final aRZ:Landroid/content/BroadcastReceiver$PendingResult;
 
-.field private final aSe:Ljava/util/concurrent/ScheduledFuture;
+.field private final aSa:Ljava/util/concurrent/ScheduledFuture;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/ScheduledFuture<",
@@ -17,7 +17,7 @@
     .end annotation
 .end field
 
-.field private asH:Z
+.field private asD:Z
 
 
 # direct methods
@@ -28,11 +28,11 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/google/firebase/iid/ag;->asH:Z
+    iput-boolean v0, p0, Lcom/google/firebase/iid/ag;->asD:Z
 
-    iput-object p1, p0, Lcom/google/firebase/iid/ag;->aSc:Landroid/content/Intent;
+    iput-object p1, p0, Lcom/google/firebase/iid/ag;->aRY:Landroid/content/Intent;
 
-    iput-object p2, p0, Lcom/google/firebase/iid/ag;->aSd:Landroid/content/BroadcastReceiver$PendingResult;
+    iput-object p2, p0, Lcom/google/firebase/iid/ag;->aRZ: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;->aSe:Ljava/util/concurrent/ScheduledFuture;
+    iput-object p1, p0, Lcom/google/firebase/iid/ag;->aSa: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;->asH:Z
+    iget-boolean v0, p0, Lcom/google/firebase/iid/ag;->asD:Z
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/firebase/iid/ag;->aSd:Landroid/content/BroadcastReceiver$PendingResult;
+    iget-object v0, p0, Lcom/google/firebase/iid/ag;->aRZ:Landroid/content/BroadcastReceiver$PendingResult;
 
     invoke-virtual {v0}, Landroid/content/BroadcastReceiver$PendingResult;->finish()V
 
-    iget-object v0, p0, Lcom/google/firebase/iid/ag;->aSe:Ljava/util/concurrent/ScheduledFuture;
+    iget-object v0, p0, Lcom/google/firebase/iid/ag;->aSa: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;->asH:Z
+    iput-boolean v0, p0, Lcom/google/firebase/iid/ag;->asD: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 68c8ca4441..3175696e7c 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 aQq:Ljava/util/concurrent/Executor;
+.field static final aQm: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;->aQq:Ljava/util/concurrent/Executor;
+    sput-object v0, Lcom/google/firebase/iid/ah;->aQm: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 c95a6be2c1..a59f4428e5 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 aSf:Ljava/util/concurrent/ThreadFactory;
+.field static final aSb: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;->aSf:Ljava/util/concurrent/ThreadFactory;
+    sput-object v0, Lcom/google/firebase/iid/ai;->aSb: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 86956e7dd6..7d73e75afa 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 aRy:Lcom/google/firebase/iid/FirebaseInstanceId;
+.field private final aRu:Lcom/google/firebase/iid/FirebaseInstanceId;
 
-.field private final ane:Ljava/lang/String;
+.field private final ana:Ljava/lang/String;
 
-.field private final anq:Ljava/lang/String;
+.field private final anm: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;->aRy:Lcom/google/firebase/iid/FirebaseInstanceId;
+    iput-object p1, p0, Lcom/google/firebase/iid/ak;->aRu:Lcom/google/firebase/iid/FirebaseInstanceId;
 
-    iput-object p2, p0, Lcom/google/firebase/iid/ak;->ane:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/firebase/iid/ak;->ana:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/google/firebase/iid/ak;->anq:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/firebase/iid/ak;->anm: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;->aRy:Lcom/google/firebase/iid/FirebaseInstanceId;
+    iget-object p1, p0, Lcom/google/firebase/iid/ak;->aRu:Lcom/google/firebase/iid/FirebaseInstanceId;
 
-    iget-object v0, p0, Lcom/google/firebase/iid/ak;->ane:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/firebase/iid/ak;->ana:Ljava/lang/String;
 
-    iget-object v1, p0, Lcom/google/firebase/iid/ak;->anq:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/firebase/iid/ak;->anm:Ljava/lang/String;
 
-    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->qZ()Ljava/lang/String;
+    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->qX()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;->atS:Ljava/lang/String;
+    iget-object v0, v3, Lcom/google/firebase/iid/u;->atO: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;->aRs:Lcom/google/firebase/iid/o;
+    iget-object v3, p1, Lcom/google/firebase/iid/FirebaseInstanceId;->aRo: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 7d4cafb8f3..791d2c3bb4 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 aRy:Lcom/google/firebase/iid/FirebaseInstanceId;
+.field private final aRu: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;->aRy:Lcom/google/firebase/iid/FirebaseInstanceId;
+    iput-object p1, p0, Lcom/google/firebase/iid/al;->aRu: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;->aRy:Lcom/google/firebase/iid/FirebaseInstanceId;
+    iget-object v0, p0, Lcom/google/firebase/iid/al;->aRu:Lcom/google/firebase/iid/FirebaseInstanceId;
 
-    iget-object v1, v0, Lcom/google/firebase/iid/FirebaseInstanceId;->aRu:Lcom/google/firebase/iid/FirebaseInstanceId$a;
+    iget-object v1, v0, Lcom/google/firebase/iid/FirebaseInstanceId;->aRq:Lcom/google/firebase/iid/FirebaseInstanceId$a;
 
-    invoke-virtual {v1}, Lcom/google/firebase/iid/FirebaseInstanceId$a;->pH()Z
+    invoke-virtual {v1}, Lcom/google/firebase/iid/FirebaseInstanceId$a;->pF()Z
 
     move-result v1
 
     if-eqz v1, :cond_0
 
-    invoke-virtual {v0}, Lcom/google/firebase/iid/FirebaseInstanceId;->xY()V
+    invoke-virtual {v0}, Lcom/google/firebase/iid/FirebaseInstanceId;->xW()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 f4e28b47d8..ba91ef91e6 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 aRy:Lcom/google/firebase/iid/FirebaseInstanceId;
+.field private final aRu:Lcom/google/firebase/iid/FirebaseInstanceId;
 
-.field private final ane:Ljava/lang/String;
+.field private final ana:Ljava/lang/String;
 
-.field private final anq:Ljava/lang/String;
+.field private final anm: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;->aRy:Lcom/google/firebase/iid/FirebaseInstanceId;
+    iput-object p1, p0, Lcom/google/firebase/iid/am;->aRu:Lcom/google/firebase/iid/FirebaseInstanceId;
 
-    iput-object p2, p0, Lcom/google/firebase/iid/am;->ane:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/firebase/iid/am;->ana:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/google/firebase/iid/am;->anq:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/firebase/iid/am;->anm: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;->aRy:Lcom/google/firebase/iid/FirebaseInstanceId;
+    iget-object v0, p0, Lcom/google/firebase/iid/am;->aRu:Lcom/google/firebase/iid/FirebaseInstanceId;
 
-    iget-object v3, p0, Lcom/google/firebase/iid/am;->ane:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/firebase/iid/am;->ana:Ljava/lang/String;
 
-    iget-object v4, p0, Lcom/google/firebase/iid/am;->anq:Ljava/lang/String;
+    iget-object v4, p0, Lcom/google/firebase/iid/am;->anm: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;->aRn:Lcom/google/firebase/iid/v;
+    sget-object v1, Lcom/google/firebase/iid/FirebaseInstanceId;->aRj:Lcom/google/firebase/iid/v;
 
-    iget-object v0, v0, Lcom/google/firebase/iid/FirebaseInstanceId;->aRq:Lcom/google/firebase/iid/j;
+    iget-object v0, v0, Lcom/google/firebase/iid/FirebaseInstanceId;->aRm:Lcom/google/firebase/iid/j;
 
-    invoke-virtual {v0}, Lcom/google/firebase/iid/j;->rD()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/firebase/iid/j;->rB()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 a5c5b03d68..29b4f140a3 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 aRy:Lcom/google/firebase/iid/FirebaseInstanceId;
+.field private final aRu:Lcom/google/firebase/iid/FirebaseInstanceId;
 
-.field private final ane:Ljava/lang/String;
+.field private final ana:Ljava/lang/String;
 
-.field private final anq:Ljava/lang/String;
+.field private final anm: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;->aRy:Lcom/google/firebase/iid/FirebaseInstanceId;
+    iput-object p1, p0, Lcom/google/firebase/iid/an;->aRu:Lcom/google/firebase/iid/FirebaseInstanceId;
 
-    iput-object p2, p0, Lcom/google/firebase/iid/an;->ane:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/firebase/iid/an;->ana:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/google/firebase/iid/an;->anq:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/firebase/iid/an;->anm: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 Ai()Lcom/google/android/gms/tasks/Task;
+.method public final Ag()Lcom/google/android/gms/tasks/Task;
     .locals 7
 
-    iget-object v0, p0, Lcom/google/firebase/iid/an;->aRy:Lcom/google/firebase/iid/FirebaseInstanceId;
+    iget-object v0, p0, Lcom/google/firebase/iid/an;->aRu:Lcom/google/firebase/iid/FirebaseInstanceId;
 
-    iget-object v1, p0, Lcom/google/firebase/iid/an;->ane:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/firebase/iid/an;->ana:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/google/firebase/iid/an;->anq:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/firebase/iid/an;->anm: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;->aRr:Lcom/google/firebase/iid/ap;
+    iget-object v4, v0, Lcom/google/firebase/iid/FirebaseInstanceId;->aRn: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;->aLY:Ljava/util/concurrent/Executor;
+    iget-object v5, v0, Lcom/google/firebase/iid/FirebaseInstanceId;->aLU: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 ebb9251230..861d248bf3 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 aSh:Lcom/google/firebase/iid/FirebaseInstanceId$a;
+.field private final aSd: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;->aSh:Lcom/google/firebase/iid/FirebaseInstanceId$a;
+    iput-object p1, p0, Lcom/google/firebase/iid/ao;->aSd: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;->aSh:Lcom/google/firebase/iid/FirebaseInstanceId$a;
+    iget-object p1, p0, Lcom/google/firebase/iid/ao;->aSd:Lcom/google/firebase/iid/FirebaseInstanceId$a;
 
     monitor-enter p1
 
     :try_start_0
-    invoke-virtual {p1}, Lcom/google/firebase/iid/FirebaseInstanceId$a;->pH()Z
+    invoke-virtual {p1}, Lcom/google/firebase/iid/FirebaseInstanceId$a;->pF()Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p1, Lcom/google/firebase/iid/FirebaseInstanceId$a;->aRy:Lcom/google/firebase/iid/FirebaseInstanceId;
+    iget-object v0, p1, Lcom/google/firebase/iid/FirebaseInstanceId$a;->aRu: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 5981131f39..caf75b24d9 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 aLY:Ljava/util/concurrent/Executor;
+.field private final aLU:Ljava/util/concurrent/Executor;
 
-.field private final aSi:Lcom/google/firebase/FirebaseApp;
+.field private final aSe:Lcom/google/firebase/FirebaseApp;
 
-.field private final aSj:Lcom/google/firebase/iid/j;
+.field private final aSf:Lcom/google/firebase/iid/j;
 
-.field final aSk:Lcom/google/firebase/iid/p;
+.field final aSg:Lcom/google/firebase/iid/p;
 
-.field private final aSl:Lcom/google/firebase/d/g;
+.field private final aSh: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;->aSi:Lcom/google/firebase/FirebaseApp;
+    iput-object p1, p0, Lcom/google/firebase/iid/ap;->aSe:Lcom/google/firebase/FirebaseApp;
 
-    iput-object p2, p0, Lcom/google/firebase/iid/ap;->aSj:Lcom/google/firebase/iid/j;
+    iput-object p2, p0, Lcom/google/firebase/iid/ap;->aSf:Lcom/google/firebase/iid/j;
 
-    iput-object p4, p0, Lcom/google/firebase/iid/ap;->aSk:Lcom/google/firebase/iid/p;
+    iput-object p4, p0, Lcom/google/firebase/iid/ap;->aSg:Lcom/google/firebase/iid/p;
 
-    iput-object p3, p0, Lcom/google/firebase/iid/ap;->aLY:Ljava/util/concurrent/Executor;
+    iput-object p3, p0, Lcom/google/firebase/iid/ap;->aLU:Ljava/util/concurrent/Executor;
 
-    iput-object p5, p0, Lcom/google/firebase/iid/ap;->aSl:Lcom/google/firebase/d/g;
+    iput-object p5, p0, Lcom/google/firebase/iid/ap;->aSh:Lcom/google/firebase/d/g;
 
     return-void
 .end method
@@ -75,7 +75,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lcom/google/firebase/iid/a;->Ag()Ljava/util/concurrent/Executor;
+    invoke-static {}, Lcom/google/firebase/iid/a;->Ae()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;->aSi:Lcom/google/firebase/FirebaseApp;
+    iget-object p1, p0, Lcom/google/firebase/iid/ap;->aSe:Lcom/google/firebase/FirebaseApp;
 
-    invoke-virtual {p1}, Lcom/google/firebase/FirebaseApp;->zN()Lcom/google/firebase/c;
+    invoke-virtual {p1}, Lcom/google/firebase/FirebaseApp;->zL()Lcom/google/firebase/c;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/firebase/c;->aQb:Ljava/lang/String;
+    iget-object p1, p1, Lcom/google/firebase/c;->aPX: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;->aSj:Lcom/google/firebase/iid/j;
+    iget-object p1, p0, Lcom/google/firebase/iid/ap;->aSf:Lcom/google/firebase/iid/j;
 
-    invoke-virtual {p1}, Lcom/google/firebase/iid/j;->rm()I
+    invoke-virtual {p1}, Lcom/google/firebase/iid/j;->rk()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;->aSj:Lcom/google/firebase/iid/j;
+    iget-object p1, p0, Lcom/google/firebase/iid/ap;->aSf:Lcom/google/firebase/iid/j;
 
-    invoke-virtual {p1}, Lcom/google/firebase/iid/j;->rD()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/firebase/iid/j;->rB()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;->aSj:Lcom/google/firebase/iid/j;
+    iget-object p1, p0, Lcom/google/firebase/iid/ap;->aSf:Lcom/google/firebase/iid/j;
 
-    invoke-virtual {p1}, Lcom/google/firebase/iid/j;->qz()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/firebase/iid/j;->qx()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;->nc()Lcom/google/android/gms/common/internal/o;
+    invoke-static {}, Lcom/google/android/gms/common/internal/o;->na()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;->aSl:Lcom/google/firebase/d/g;
+    iget-object p1, p0, Lcom/google/firebase/iid/ap;->aSh: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;->aLY:Ljava/util/concurrent/Executor;
+    iget-object p2, p0, Lcom/google/firebase/iid/ap;->aLU: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;->aLU:Lcom/google/android/gms/tasks/ac;
+    iget-object p1, p1, Lcom/google/android/gms/tasks/h;->aLQ: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;->aLY:Ljava/util/concurrent/Executor;
+    iget-object v0, p0, Lcom/google/firebase/iid/ap;->aLU: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 406a3aa1ea..56c6cd781d 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 aSm:Lcom/google/firebase/iid/ap;
+.field private final aSi:Lcom/google/firebase/iid/ap;
 
-.field private final aSn:Landroid/os/Bundle;
+.field private final aSj:Landroid/os/Bundle;
 
-.field private final aSo:Lcom/google/android/gms/tasks/h;
+.field private final aSk: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;->aSm:Lcom/google/firebase/iid/ap;
+    iput-object p1, p0, Lcom/google/firebase/iid/ar;->aSi:Lcom/google/firebase/iid/ap;
 
-    iput-object p2, p0, Lcom/google/firebase/iid/ar;->aSn:Landroid/os/Bundle;
+    iput-object p2, p0, Lcom/google/firebase/iid/ar;->aSj:Landroid/os/Bundle;
 
-    iput-object p3, p0, Lcom/google/firebase/iid/ar;->aSo:Lcom/google/android/gms/tasks/h;
+    iput-object p3, p0, Lcom/google/firebase/iid/ar;->aSk: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;->aSm:Lcom/google/firebase/iid/ap;
+    iget-object v0, p0, Lcom/google/firebase/iid/ar;->aSi:Lcom/google/firebase/iid/ap;
 
-    iget-object v1, p0, Lcom/google/firebase/iid/ar;->aSn:Landroid/os/Bundle;
+    iget-object v1, p0, Lcom/google/firebase/iid/ar;->aSj:Landroid/os/Bundle;
 
-    iget-object v2, p0, Lcom/google/firebase/iid/ar;->aSo:Lcom/google/android/gms/tasks/h;
+    iget-object v2, p0, Lcom/google/firebase/iid/ar;->aSk:Lcom/google/android/gms/tasks/h;
 
     :try_start_0
-    iget-object v0, v0, Lcom/google/firebase/iid/ap;->aSk:Lcom/google/firebase/iid/p;
+    iget-object v0, v0, Lcom/google/firebase/iid/ap;->aSg: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 246c3a6de2..b2fa5ac355 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 aSm:Lcom/google/firebase/iid/ap;
+.field private final synthetic aSi: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;->aSm:Lcom/google/firebase/iid/ap;
+    iput-object p1, p0, Lcom/google/firebase/iid/at;->aSi: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 0a0bbb8bc6..45ba32ffb1 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;->atS:Ljava/lang/String;
+    iget-object v3, p2, Lcom/google/firebase/iid/aw;->atO: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;->anz:J
+    iget-wide v3, p2, Lcom/google/firebase/iid/aw;->anv: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;->atS:Ljava/lang/String;
+    iget-object v1, p2, Lcom/google/firebase/iid/aw;->atO: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;->anz:J
+    iget-wide v0, p2, Lcom/google/firebase/iid/aw;->anv: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;->Al()Ljava/security/KeyPair;
+    invoke-static {}, Lcom/google/firebase/iid/ac;->Aj()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 9826b9462e..f0ae748982 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 akg:Landroid/os/IBinder;
+.field private final akc: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;->akg:Landroid/os/IBinder;
+    iput-object p1, p0, Lcom/google/firebase/iid/av;->akc: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;->akg:Landroid/os/IBinder;
+    iget-object p1, p0, Lcom/google/firebase/iid/av;->akc: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;->akg:Landroid/os/IBinder;
+    iget-object v0, p0, Lcom/google/firebase/iid/av;->akc: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 67206f834e..ad61aaaebe 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 anz:J
+.field final anv:J
 
-.field final atS:Ljava/lang/String;
+.field final atO:Ljava/lang/String;
 
 
 # direct methods
@@ -21,9 +21,9 @@
 
     check-cast p1, Ljava/lang/String;
 
-    iput-object p1, p0, Lcom/google/firebase/iid/aw;->atS:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/firebase/iid/aw;->atO:Ljava/lang/String;
 
-    iput-wide p2, p0, Lcom/google/firebase/iid/aw;->anz:J
+    iput-wide p2, p0, Lcom/google/firebase/iid/aw;->anv: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;->anz:J
+    iget-wide v2, p0, Lcom/google/firebase/iid/aw;->anv:J
 
-    iget-wide v4, p1, Lcom/google/firebase/iid/aw;->anz:J
+    iget-wide v4, p1, Lcom/google/firebase/iid/aw;->anv:J
 
     cmp-long v0, v2, v4
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/firebase/iid/aw;->atS:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/firebase/iid/aw;->atO:Ljava/lang/String;
 
-    iget-object p1, p1, Lcom/google/firebase/iid/aw;->atS:Ljava/lang/String;
+    iget-object p1, p1, Lcom/google/firebase/iid/aw;->atO: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;->atS:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/firebase/iid/aw;->atO:Ljava/lang/String;
 
     const/4 v2, 0x0
 
     aput-object v1, v0, v2
 
-    iget-wide v1, p0, Lcom/google/firebase/iid/aw;->anz:J
+    iget-wide v1, p0, Lcom/google/firebase/iid/aw;->anv: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 5a23902a80..fc677ce970 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 ane:Ljava/lang/String;
+.field private final ana:Ljava/lang/String;
 
-.field private final atS:Ljava/lang/String;
+.field private final atO: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;->atS:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/firebase/iid/ay;->atO:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/google/firebase/iid/ay;->ane:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/firebase/iid/ay;->ana: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;->ane:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/firebase/iid/ay;->ana: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 88cdc4aabc..785656b5aa 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 aSp:Lcom/google/firebase/iid/az;
+.field private static aSl:Lcom/google/firebase/iid/az;
 
 
 # instance fields
-.field final aRo:Ljava/util/concurrent/ScheduledExecutorService;
+.field final aRk:Ljava/util/concurrent/ScheduledExecutorService;
 
-.field private aSq:Lcom/google/firebase/iid/ba;
+.field private aSm:Lcom/google/firebase/iid/ba;
 
-.field final atK:Landroid/content/Context;
+.field final atG: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;->aSq:Lcom/google/firebase/iid/ba;
+    iput-object v0, p0, Lcom/google/firebase/iid/az;->aSm: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;->aRo:Ljava/util/concurrent/ScheduledExecutorService;
+    iput-object p2, p0, Lcom/google/firebase/iid/az;->aRk: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;->atK:Landroid/content/Context;
+    iput-object p1, p0, Lcom/google/firebase/iid/az;->atG: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;->aSp:Lcom/google/firebase/iid/az;
+    sget-object v1, Lcom/google/firebase/iid/az;->aSl: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;->nR()Lcom/google/android/gms/internal/e/b;
+    invoke-static {}, Lcom/google/android/gms/internal/e/a;->nP()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;->aSp:Lcom/google/firebase/iid/az;
+    sput-object v1, Lcom/google/firebase/iid/az;->aSl:Lcom/google/firebase/iid/az;
 
     :cond_0
-    sget-object p0, Lcom/google/firebase/iid/az;->aSp:Lcom/google/firebase/iid/az;
+    sget-object p0, Lcom/google/firebase/iid/az;->aSl: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;->aSq:Lcom/google/firebase/iid/ba;
+    iget-object v0, p0, Lcom/google/firebase/iid/az;->aSm: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;->aSq:Lcom/google/firebase/iid/ba;
+    iput-object v0, p0, Lcom/google/firebase/iid/az;->aSm:Lcom/google/firebase/iid/ba;
 
-    iget-object v0, p0, Lcom/google/firebase/iid/az;->aSq:Lcom/google/firebase/iid/ba;
+    iget-object v0, p0, Lcom/google/firebase/iid/az;->aSm: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;->aRE:Lcom/google/android/gms/tasks/h;
+    iget-object p1, p1, Lcom/google/firebase/iid/i;->aRA:Lcom/google/android/gms/tasks/h;
 
-    iget-object p1, p1, Lcom/google/android/gms/tasks/h;->aLU:Lcom/google/android/gms/tasks/ac;
+    iget-object p1, p1, Lcom/google/android/gms/tasks/h;->aLQ: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 pJ()I
+.method public final declared-synchronized pH()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 c463b6111a..e8dbea580d 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 aRA:Lcom/google/firebase/iid/ba;
+.field private final aRw: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;->aRA:Lcom/google/firebase/iid/ba;
+    iput-object p1, p0, Lcom/google/firebase/iid/b;->aRw: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;->aRA:Lcom/google/firebase/iid/ba;
+    iget-object v0, p0, Lcom/google/firebase/iid/b;->aRw: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;->aSa:Ljava/util/Queue;
+    iget-object v1, v0, Lcom/google/firebase/iid/ba;->aRW: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;->pG()V
+    invoke-virtual {v0}, Lcom/google/firebase/iid/ba;->pE()V
 
     monitor-exit v0
 
     return-void
 
     :cond_1
-    iget-object v1, v0, Lcom/google/firebase/iid/ba;->aSa:Ljava/util/Queue;
+    iget-object v1, v0, Lcom/google/firebase/iid/ba;->aRW: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;->aSt:Landroid/util/SparseArray;
+    iget-object v3, v0, Lcom/google/firebase/iid/ba;->aSp: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;->aSu:Lcom/google/firebase/iid/az;
+    iget-object v3, v0, Lcom/google/firebase/iid/ba;->aSq:Lcom/google/firebase/iid/az;
 
-    iget-object v3, v3, Lcom/google/firebase/iid/az;->aRo:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object v3, v3, Lcom/google/firebase/iid/az;->aRk: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;->aSu:Lcom/google/firebase/iid/az;
+    iget-object v3, v0, Lcom/google/firebase/iid/ba;->aSq:Lcom/google/firebase/iid/az;
 
-    iget-object v3, v3, Lcom/google/firebase/iid/az;->atK:Landroid/content/Context;
+    iget-object v3, v3, Lcom/google/firebase/iid/az;->atG:Landroid/content/Context;
 
-    iget-object v4, v0, Lcom/google/firebase/iid/ba;->aSr:Landroid/os/Messenger;
+    iget-object v4, v0, Lcom/google/firebase/iid/ba;->aSn: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;->pH()Z
+    invoke-virtual {v1}, Lcom/google/firebase/iid/i;->pF()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;->asM:Landroid/os/Bundle;
+    iget-object v1, v1, Lcom/google/firebase/iid/i;->asI: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;->aSs:Lcom/google/firebase/iid/g;
+    iget-object v1, v0, Lcom/google/firebase/iid/ba;->aSo:Lcom/google/firebase/iid/g;
 
-    iget-object v3, v1, Lcom/google/firebase/iid/g;->aRC:Landroid/os/Messenger;
+    iget-object v3, v1, Lcom/google/firebase/iid/g;->aRy:Landroid/os/Messenger;
 
     if-eqz v3, :cond_3
 
-    iget-object v1, v1, Lcom/google/firebase/iid/g;->aRC:Landroid/os/Messenger;
+    iget-object v1, v1, Lcom/google/firebase/iid/g;->aRy: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;->aRD:Lcom/google/firebase/iid/zzf;
+    iget-object v3, v1, Lcom/google/firebase/iid/g;->aRz:Lcom/google/firebase/iid/zzf;
 
     if-eqz v3, :cond_4
 
-    iget-object v1, v1, Lcom/google/firebase/iid/g;->aRD:Lcom/google/firebase/iid/zzf;
+    iget-object v1, v1, Lcom/google/firebase/iid/g;->aRz: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 28b053fae7..7c96fe4021 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 aSa:Ljava/util/Queue;
+.field final aRW:Ljava/util/Queue;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Queue<",
@@ -17,11 +17,11 @@
     .end annotation
 .end field
 
-.field final aSr:Landroid/os/Messenger;
+.field final aSn:Landroid/os/Messenger;
 
-.field aSs:Lcom/google/firebase/iid/g;
+.field aSo:Lcom/google/firebase/iid/g;
 
-.field final aSt:Landroid/util/SparseArray;
+.field final aSp:Landroid/util/SparseArray;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Landroid/util/SparseArray<",
@@ -31,7 +31,7 @@
     .end annotation
 .end field
 
-.field final synthetic aSu:Lcom/google/firebase/iid/az;
+.field final synthetic aSq: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;->aSu:Lcom/google/firebase/iid/az;
+    iput-object p1, p0, Lcom/google/firebase/iid/ba;->aSq: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;->aSr:Landroid/os/Messenger;
+    iput-object p1, p0, Lcom/google/firebase/iid/ba;->aSn: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;->aSa:Ljava/util/Queue;
+    iput-object p1, p0, Lcom/google/firebase/iid/ba;->aRW: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;->aSt:Landroid/util/SparseArray;
+    iput-object p1, p0, Lcom/google/firebase/iid/ba;->aSp: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;->aSa:Ljava/util/Queue;
+    iget-object v0, p0, Lcom/google/firebase/iid/ba;->aRW: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;->aSa:Ljava/util/Queue;
+    iget-object v0, p0, Lcom/google/firebase/iid/ba;->aRW: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;->aSa:Ljava/util/Queue;
+    iget-object v0, p0, Lcom/google/firebase/iid/ba;->aRW: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;->nk()Lcom/google/android/gms/common/stats/a;
+    invoke-static {}, Lcom/google/android/gms/common/stats/a;->ni()Lcom/google/android/gms/common/stats/a;
 
-    iget-object v0, p0, Lcom/google/firebase/iid/ba;->aSu:Lcom/google/firebase/iid/az;
+    iget-object v0, p0, Lcom/google/firebase/iid/ba;->aSq:Lcom/google/firebase/iid/az;
 
-    iget-object v0, v0, Lcom/google/firebase/iid/az;->atK:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/firebase/iid/az;->atG: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;->aSu:Lcom/google/firebase/iid/az;
+    iget-object p1, p0, Lcom/google/firebase/iid/ba;->aSq:Lcom/google/firebase/iid/az;
 
-    iget-object p1, p1, Lcom/google/firebase/iid/az;->aRo:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object p1, p1, Lcom/google/firebase/iid/az;->aRk: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;->aSt:Landroid/util/SparseArray;
+    iget-object v0, p0, Lcom/google/firebase/iid/ba;->aSp: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;->aSt:Landroid/util/SparseArray;
+    iget-object v1, p0, Lcom/google/firebase/iid/ba;->aSp: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;->pG()V
+    invoke-virtual {p0}, Lcom/google/firebase/iid/ba;->pE()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;->nk()Lcom/google/android/gms/common/stats/a;
+    invoke-static {}, Lcom/google/android/gms/common/stats/a;->ni()Lcom/google/android/gms/common/stats/a;
 
-    iget-object v0, p0, Lcom/google/firebase/iid/ba;->aSu:Lcom/google/firebase/iid/az;
+    iget-object v0, p0, Lcom/google/firebase/iid/ba;->aSq:Lcom/google/firebase/iid/az;
 
-    iget-object v0, v0, Lcom/google/firebase/iid/az;->atK:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/firebase/iid/az;->atG: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;->aSa:Ljava/util/Queue;
+    iget-object p1, p0, Lcom/google/firebase/iid/ba;->aRW: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;->aSa:Ljava/util/Queue;
+    iget-object p1, p0, Lcom/google/firebase/iid/ba;->aRW: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;->aSt:Landroid/util/SparseArray;
+    iget-object p2, p0, Lcom/google/firebase/iid/ba;->aSp: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;->aSt:Landroid/util/SparseArray;
+    iget-object p2, p0, Lcom/google/firebase/iid/ba;->aSp: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;->aSt:Landroid/util/SparseArray;
+    iget-object p1, p0, Lcom/google/firebase/iid/ba;->aSp: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;->aSt:Landroid/util/SparseArray;
+    iget-object v1, p0, Lcom/google/firebase/iid/ba;->aSp: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;->aSt:Landroid/util/SparseArray;
+    iget-object v3, p0, Lcom/google/firebase/iid/ba;->aSp:Landroid/util/SparseArray;
 
     invoke-virtual {v3, v0}, Landroid/util/SparseArray;->remove(I)V
 
-    invoke-virtual {p0}, Lcom/google/firebase/iid/ba;->pG()V
+    invoke-virtual {p0}, Lcom/google/firebase/iid/ba;->pE()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;->aSu:Lcom/google/firebase/iid/az;
+    iget-object p1, p0, Lcom/google/firebase/iid/ba;->aSq:Lcom/google/firebase/iid/az;
 
-    iget-object p1, p1, Lcom/google/firebase/iid/az;->aRo:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object p1, p1, Lcom/google/firebase/iid/az;->aRk: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;->aSu:Lcom/google/firebase/iid/az;
+    iget-object p1, p0, Lcom/google/firebase/iid/ba;->aSq:Lcom/google/firebase/iid/az;
 
-    iget-object p1, p1, Lcom/google/firebase/iid/az;->aRo:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object p1, p1, Lcom/google/firebase/iid/az;->aRk:Ljava/util/concurrent/ScheduledExecutorService;
 
     new-instance v0, Lcom/google/firebase/iid/e;
 
@@ -765,7 +765,7 @@
     return-void
 .end method
 
-.method final declared-synchronized pG()V
+.method final declared-synchronized pE()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;->aSa:Ljava/util/Queue;
+    iget-object v0, p0, Lcom/google/firebase/iid/ba;->aRW: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;->aSt:Landroid/util/SparseArray;
+    iget-object v0, p0, Lcom/google/firebase/iid/ba;->aSp: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;->nk()Lcom/google/android/gms/common/stats/a;
+    invoke-static {}, Lcom/google/android/gms/common/stats/a;->ni()Lcom/google/android/gms/common/stats/a;
 
-    iget-object v0, p0, Lcom/google/firebase/iid/ba;->aSu:Lcom/google/firebase/iid/az;
+    iget-object v0, p0, Lcom/google/firebase/iid/ba;->aSq:Lcom/google/firebase/iid/az;
 
-    iget-object v0, v0, Lcom/google/firebase/iid/az;->atK:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/firebase/iid/az;->atG: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 rA()V
+.method final declared-synchronized ry()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;->aSu:Lcom/google/firebase/iid/az;
+    iget-object v0, p0, Lcom/google/firebase/iid/ba;->aSq:Lcom/google/firebase/iid/az;
 
-    iget-object v0, v0, Lcom/google/firebase/iid/az;->aRo:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object v0, v0, Lcom/google/firebase/iid/az;->aRk: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 c90f27bf09..3656144ebb 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 aRA:Lcom/google/firebase/iid/ba;
+.field private final aRw: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;->aRA:Lcom/google/firebase/iid/ba;
+    iput-object p1, p0, Lcom/google/firebase/iid/bb;->aRw: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;->aRA:Lcom/google/firebase/iid/ba;
+    iget-object v0, p0, Lcom/google/firebase/iid/bb;->aRw:Lcom/google/firebase/iid/ba;
 
-    invoke-virtual {v0}, Lcom/google/firebase/iid/ba;->rA()V
+    invoke-virtual {v0}, Lcom/google/firebase/iid/ba;->ry()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 1e5f504abe..631723dce1 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 aRA:Lcom/google/firebase/iid/ba;
+.field private final aRw: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;->aRA:Lcom/google/firebase/iid/ba;
+    iput-object p1, p0, Lcom/google/firebase/iid/bc;->aRw: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;->aRA:Lcom/google/firebase/iid/ba;
+    iget-object v0, p0, Lcom/google/firebase/iid/bc;->aRw: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 13fda6e546..84f049b445 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 aRA:Lcom/google/firebase/iid/ba;
+.field private final aRw:Lcom/google/firebase/iid/ba;
 
-.field private final anp:Landroid/os/IBinder;
+.field private final anl: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;->aRA:Lcom/google/firebase/iid/ba;
+    iput-object p1, p0, Lcom/google/firebase/iid/c;->aRw:Lcom/google/firebase/iid/ba;
 
-    iput-object p2, p0, Lcom/google/firebase/iid/c;->anp:Landroid/os/IBinder;
+    iput-object p2, p0, Lcom/google/firebase/iid/c;->anl: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;->aRA:Lcom/google/firebase/iid/ba;
+    iget-object v0, p0, Lcom/google/firebase/iid/c;->aRw:Lcom/google/firebase/iid/ba;
 
-    iget-object v1, p0, Lcom/google/firebase/iid/c;->anp:Landroid/os/IBinder;
+    iget-object v1, p0, Lcom/google/firebase/iid/c;->anl: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;->aSs:Lcom/google/firebase/iid/g;
+    iput-object v3, v0, Lcom/google/firebase/iid/ba;->aSo: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 901169ffaf..215c524222 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 aRA:Lcom/google/firebase/iid/ba;
+.field private final aRw:Lcom/google/firebase/iid/ba;
 
-.field private final aRB:Lcom/google/firebase/iid/i;
+.field private final aRx: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;->aRA:Lcom/google/firebase/iid/ba;
+    iput-object p1, p0, Lcom/google/firebase/iid/d;->aRw:Lcom/google/firebase/iid/ba;
 
-    iput-object p2, p0, Lcom/google/firebase/iid/d;->aRB:Lcom/google/firebase/iid/i;
+    iput-object p2, p0, Lcom/google/firebase/iid/d;->aRx: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;->aRA:Lcom/google/firebase/iid/ba;
+    iget-object v0, p0, Lcom/google/firebase/iid/d;->aRw:Lcom/google/firebase/iid/ba;
 
-    iget-object v1, p0, Lcom/google/firebase/iid/d;->aRB:Lcom/google/firebase/iid/i;
+    iget-object v1, p0, Lcom/google/firebase/iid/d;->aRx: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 bc3f2d9aeb..ea39390fee 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 aRA:Lcom/google/firebase/iid/ba;
+.field private final aRw: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;->aRA:Lcom/google/firebase/iid/ba;
+    iput-object p1, p0, Lcom/google/firebase/iid/e;->aRw: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;->aRA:Lcom/google/firebase/iid/ba;
+    iget-object v0, p0, Lcom/google/firebase/iid/e;->aRw: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 464565f124..7807c93cc6 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 pH()Z
+.method final pF()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 e957a81f87..4be44e4a70 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 aRC:Landroid/os/Messenger;
+.field final aRy:Landroid/os/Messenger;
 
-.field final aRD:Lcom/google/firebase/iid/zzf;
+.field final aRz: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;->aRC:Landroid/os/Messenger;
+    iput-object v0, p0, Lcom/google/firebase/iid/g;->aRy:Landroid/os/Messenger;
 
-    iput-object v2, p0, Lcom/google/firebase/iid/g;->aRD:Lcom/google/firebase/iid/zzf;
+    iput-object v2, p0, Lcom/google/firebase/iid/g;->aRz: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;->aRD:Lcom/google/firebase/iid/zzf;
+    iput-object v0, p0, Lcom/google/firebase/iid/g;->aRz:Lcom/google/firebase/iid/zzf;
 
-    iput-object v2, p0, Lcom/google/firebase/iid/g;->aRC:Landroid/os/Messenger;
+    iput-object v2, p0, Lcom/google/firebase/iid/g;->aRy: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 7054547dfb..3e74916901 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 aRE:Lcom/google/android/gms/tasks/h;
+.field final aRA: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 asM:Landroid/os/Bundle;
+.field final asI: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;->aRE:Lcom/google/android/gms/tasks/h;
+    iput-object v0, p0, Lcom/google/firebase/iid/i;->aRA: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;->asM:Landroid/os/Bundle;
+    iput-object p3, p0, Lcom/google/firebase/iid/i;->asI: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;->aRE:Lcom/google/android/gms/tasks/h;
+    iget-object v0, p0, Lcom/google/firebase/iid/i;->aRA: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;->aRE:Lcom/google/android/gms/tasks/h;
+    iget-object v0, p0, Lcom/google/firebase/iid/i;->aRA: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 pH()Z
+.method abstract pF()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;->pH()Z
+    invoke-virtual {p0}, Lcom/google/firebase/iid/i;->pF()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 db031bfb50..be60e143d3 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 aGM:Landroid/content/Context;
+.field private final aGI:Landroid/content/Context;
 
-.field private ane:Ljava/lang/String;
+.field private ana:Ljava/lang/String;
 
-.field private anq:Ljava/lang/String;
+.field private anm: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;->aGM:Landroid/content/Context;
+    iput-object p1, p0, Lcom/google/firebase/iid/j;->aGI: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;->zN()Lcom/google/firebase/c;
+    invoke-virtual {p0}, Lcom/google/firebase/FirebaseApp;->zL()Lcom/google/firebase/c;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/firebase/c;->aQe:Ljava/lang/String;
+    iget-object v0, v0, Lcom/google/firebase/c;->aQa:Ljava/lang/String;
 
     if-eqz v0, :cond_0
 
     return-object v0
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/firebase/FirebaseApp;->zN()Lcom/google/firebase/c;
+    invoke-virtual {p0}, Lcom/google/firebase/FirebaseApp;->zL()Lcom/google/firebase/c;
 
     move-result-object p0
 
-    iget-object p0, p0, Lcom/google/firebase/c;->aQb:Ljava/lang/String;
+    iget-object p0, p0, Lcom/google/firebase/c;->aPX: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;->aGM:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/firebase/iid/j;->aGI: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 tA()V
+.method private final declared-synchronized ty()V
     .locals 2
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/firebase/iid/j;->aGM:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/firebase/iid/j;->aGI: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;->ane:Ljava/lang/String;
+    iput-object v1, p0, Lcom/google/firebase/iid/j;->ana:Ljava/lang/String;
 
     iget-object v0, v0, Landroid/content/pm/PackageInfo;->versionName:Ljava/lang/String;
 
-    iput-object v0, p0, Lcom/google/firebase/iid/j;->anq:Ljava/lang/String;
+    iput-object v0, p0, Lcom/google/firebase/iid/j;->anm: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 pJ()I
+.method public final declared-synchronized pH()I
     .locals 5
 
     monitor-enter p0
@@ -275,7 +275,7 @@
 
     :cond_0
     :try_start_1
-    iget-object v0, p0, Lcom/google/firebase/iid/j;->aGM:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/firebase/iid/j;->aGI: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 qz()Ljava/lang/String;
+.method public final declared-synchronized qx()Ljava/lang/String;
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/firebase/iid/j;->anq:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/firebase/iid/j;->anm:Ljava/lang/String;
 
     if-nez v0, :cond_0
 
-    invoke-direct {p0}, Lcom/google/firebase/iid/j;->tA()V
+    invoke-direct {p0}, Lcom/google/firebase/iid/j;->ty()V
 
     :cond_0
-    iget-object v0, p0, Lcom/google/firebase/iid/j;->anq:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/firebase/iid/j;->anm: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 rD()Ljava/lang/String;
+.method public final declared-synchronized rB()Ljava/lang/String;
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/firebase/iid/j;->ane:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/firebase/iid/j;->ana:Ljava/lang/String;
 
     if-nez v0, :cond_0
 
-    invoke-direct {p0}, Lcom/google/firebase/iid/j;->tA()V
+    invoke-direct {p0}, Lcom/google/firebase/iid/j;->ty()V
 
     :cond_0
-    iget-object v0, p0, Lcom/google/firebase/iid/j;->ane:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/firebase/iid/j;->ana: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 rm()I
+.method public final declared-synchronized rk()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 ba00556923..78391a271c 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 pH()Z
+.method final pF()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 360dea6556..2c21403853 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 aQl:Lcom/google/firebase/components/g;
+.field static final aQh: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;->aQl:Lcom/google/firebase/components/g;
+    sput-object v0, Lcom/google/firebase/iid/l;->aQh: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 f1ff06b247..1fbf3b93dc 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 aQl:Lcom/google/firebase/components/g;
+.field static final aQh: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;->aQl:Lcom/google/firebase/components/g;
+    sput-object v0, Lcom/google/firebase/iid/m;->aQh: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 84734781c9..a44ef65ba8 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 aRF:Lcom/google/firebase/iid/o;
+.field private final aRB:Lcom/google/firebase/iid/o;
 
-.field private final aRG:Landroid/util/Pair;
+.field private final aRC: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;->aRF:Lcom/google/firebase/iid/o;
+    iput-object p1, p0, Lcom/google/firebase/iid/n;->aRB:Lcom/google/firebase/iid/o;
 
-    iput-object p2, p0, Lcom/google/firebase/iid/n;->aRG:Landroid/util/Pair;
+    iput-object p2, p0, Lcom/google/firebase/iid/n;->aRC: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;->aRF:Lcom/google/firebase/iid/o;
+    iget-object v0, p0, Lcom/google/firebase/iid/n;->aRB:Lcom/google/firebase/iid/o;
 
-    iget-object v1, p0, Lcom/google/firebase/iid/n;->aRG:Landroid/util/Pair;
+    iget-object v1, p0, Lcom/google/firebase/iid/n;->aRC: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 0e1c6db6cd..6e7e136df8 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 aBP:Ljava/util/Map;
+.field private final aBL:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -19,7 +19,7 @@
     .end annotation
 .end field
 
-.field private final aQq:Ljava/util/concurrent/Executor;
+.field private final aQm: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;->aBP:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/firebase/iid/o;->aBL:Ljava/util/Map;
 
-    iput-object p1, p0, Lcom/google/firebase/iid/o;->aQq:Ljava/util/concurrent/Executor;
+    iput-object p1, p0, Lcom/google/firebase/iid/o;->aQm: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;->aBP:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/firebase/iid/o;->aBL: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;->aBP:Ljava/util/Map;
+    iget-object p1, p0, Lcom/google/firebase/iid/o;->aBL: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;->Ai()Lcom/google/android/gms/tasks/Task;
+    invoke-interface {p3}, Lcom/google/firebase/iid/q;->Ag()Lcom/google/android/gms/tasks/Task;
 
     move-result-object p1
 
-    iget-object p2, p0, Lcom/google/firebase/iid/o;->aQq:Ljava/util/concurrent/Executor;
+    iget-object p2, p0, Lcom/google/firebase/iid/o;->aQm: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;->aBP:Ljava/util/Map;
+    iget-object p2, p0, Lcom/google/firebase/iid/o;->aBL: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 4c8af169f7..57cfa2b41c 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/p.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/p.smali
@@ -4,15 +4,15 @@
 
 
 # static fields
-.field private static aRH:Landroid/app/PendingIntent;
+.field private static aRD:Landroid/app/PendingIntent;
 
 .field private static zza:I
 
 
 # instance fields
-.field private final aFy:Landroid/content/Context;
+.field private final aFu:Landroid/content/Context;
 
-.field private final aRI:Landroidx/collection/SimpleArrayMap;
+.field private final aRE:Landroidx/collection/SimpleArrayMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Landroidx/collection/SimpleArrayMap<",
@@ -24,13 +24,13 @@
     .end annotation
 .end field
 
-.field private final aRJ:Lcom/google/firebase/iid/j;
+.field private final aRF:Lcom/google/firebase/iid/j;
 
-.field private aRK:Landroid/os/Messenger;
+.field private aRG:Landroid/os/Messenger;
 
-.field private aRL:Landroid/os/Messenger;
+.field private aRH:Landroid/os/Messenger;
 
-.field private aRM:Lcom/google/firebase/iid/zzf;
+.field private aRI:Lcom/google/firebase/iid/zzf;
 
 
 # direct methods
@@ -49,11 +49,11 @@
 
     invoke-direct {v0}, Landroidx/collection/SimpleArrayMap;-><init>()V
 
-    iput-object v0, p0, Lcom/google/firebase/iid/p;->aRI:Landroidx/collection/SimpleArrayMap;
+    iput-object v0, p0, Lcom/google/firebase/iid/p;->aRE:Landroidx/collection/SimpleArrayMap;
 
-    iput-object p1, p0, Lcom/google/firebase/iid/p;->aFy:Landroid/content/Context;
+    iput-object p1, p0, Lcom/google/firebase/iid/p;->aFu:Landroid/content/Context;
 
-    iput-object p2, p0, Lcom/google/firebase/iid/p;->aRJ:Lcom/google/firebase/iid/j;
+    iput-object p2, p0, Lcom/google/firebase/iid/p;->aRF: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;->aRK:Landroid/os/Messenger;
+    iput-object p1, p0, Lcom/google/firebase/iid/p;->aRG: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;->aRM:Lcom/google/firebase/iid/zzf;
+    iput-object v1, p0, Lcom/google/firebase/iid/p;->aRI: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;->aRL:Landroid/os/Messenger;
+    iput-object v0, p0, Lcom/google/firebase/iid/p;->aRH: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;->aRI:Landroidx/collection/SimpleArrayMap;
+    iget-object v4, p0, Lcom/google/firebase/iid/p;->aRE:Landroidx/collection/SimpleArrayMap;
 
     monitor-enter v4
 
@@ -399,7 +399,7 @@
 
     :goto_4
     :try_start_0
-    iget-object v1, p0, Lcom/google/firebase/iid/p;->aRI:Landroidx/collection/SimpleArrayMap;
+    iget-object v1, p0, Lcom/google/firebase/iid/p;->aRE: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;->aRI:Landroidx/collection/SimpleArrayMap;
+    iget-object v1, p0, Lcom/google/firebase/iid/p;->aRE: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;->aRH:Landroid/app/PendingIntent;
+    sget-object v1, Lcom/google/firebase/iid/p;->aRD:Landroid/app/PendingIntent;
 
     if-nez v1, :cond_0
 
@@ -554,12 +554,12 @@
 
     move-result-object p0
 
-    sput-object p0, Lcom/google/firebase/iid/p;->aRH:Landroid/app/PendingIntent;
+    sput-object p0, Lcom/google/firebase/iid/p;->aRD:Landroid/app/PendingIntent;
 
     :cond_0
     const-string p0, "app"
 
-    sget-object v1, Lcom/google/firebase/iid/p;->aRH:Landroid/app/PendingIntent;
+    sget-object v1, Lcom/google/firebase/iid/p;->aRD: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;->aRI:Landroidx/collection/SimpleArrayMap;
+    iget-object v0, p0, Lcom/google/firebase/iid/p;->aRE:Landroidx/collection/SimpleArrayMap;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/firebase/iid/p;->aRI:Landroidx/collection/SimpleArrayMap;
+    iget-object v1, p0, Lcom/google/firebase/iid/p;->aRE: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;->pO()Ljava/lang/String;
+    invoke-static {}, Lcom/google/firebase/iid/p;->pM()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;->aRI:Landroidx/collection/SimpleArrayMap;
+    iget-object v2, p0, Lcom/google/firebase/iid/p;->aRE:Landroidx/collection/SimpleArrayMap;
 
     monitor-enter v2
 
     :try_start_0
-    iget-object v3, p0, Lcom/google/firebase/iid/p;->aRI:Landroidx/collection/SimpleArrayMap;
+    iget-object v3, p0, Lcom/google/firebase/iid/p;->aRE: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;->aRJ:Lcom/google/firebase/iid/j;
+    iget-object v2, p0, Lcom/google/firebase/iid/p;->aRF:Lcom/google/firebase/iid/j;
 
-    invoke-virtual {v2}, Lcom/google/firebase/iid/j;->pJ()I
+    invoke-virtual {v2}, Lcom/google/firebase/iid/j;->pH()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;->aRJ:Lcom/google/firebase/iid/j;
+    iget-object v3, p0, Lcom/google/firebase/iid/p;->aRF:Lcom/google/firebase/iid/j;
 
-    invoke-virtual {v3}, Lcom/google/firebase/iid/j;->pJ()I
+    invoke-virtual {v3}, Lcom/google/firebase/iid/j;->pH()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;->aFy:Landroid/content/Context;
+    iget-object p1, p0, Lcom/google/firebase/iid/p;->aFu: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;->aRK:Landroid/os/Messenger;
+    iget-object v3, p0, Lcom/google/firebase/iid/p;->aRG: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;->aRL:Landroid/os/Messenger;
+    iget-object v3, p0, Lcom/google/firebase/iid/p;->aRH:Landroid/os/Messenger;
 
     if-nez v3, :cond_2
 
-    iget-object v3, p0, Lcom/google/firebase/iid/p;->aRM:Lcom/google/firebase/iid/zzf;
+    iget-object v3, p0, Lcom/google/firebase/iid/p;->aRI: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;->aRL:Landroid/os/Messenger;
+    iget-object v5, p0, Lcom/google/firebase/iid/p;->aRH:Landroid/os/Messenger;
 
     if-eqz v5, :cond_3
 
-    iget-object v5, p0, Lcom/google/firebase/iid/p;->aRL:Landroid/os/Messenger;
+    iget-object v5, p0, Lcom/google/firebase/iid/p;->aRH: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;->aRM:Lcom/google/firebase/iid/zzf;
+    iget-object v5, p0, Lcom/google/firebase/iid/p;->aRI: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;->aRJ:Lcom/google/firebase/iid/j;
+    iget-object p1, p0, Lcom/google/firebase/iid/p;->aRF:Lcom/google/firebase/iid/j;
 
-    invoke-virtual {p1}, Lcom/google/firebase/iid/j;->pJ()I
+    invoke-virtual {p1}, Lcom/google/firebase/iid/j;->pH()I
 
     move-result p1
 
     if-ne p1, v4, :cond_5
 
-    iget-object p1, p0, Lcom/google/firebase/iid/p;->aFy:Landroid/content/Context;
+    iget-object p1, p0, Lcom/google/firebase/iid/p;->aFu: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;->aFy:Landroid/content/Context;
+    iget-object p1, p0, Lcom/google/firebase/iid/p;->aFu: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;->aLU:Lcom/google/android/gms/tasks/ac;
+    iget-object p1, v1, Lcom/google/android/gms/tasks/h;->aLQ: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;->aRI:Landroidx/collection/SimpleArrayMap;
+    iget-object v1, p0, Lcom/google/firebase/iid/p;->aRE:Landroidx/collection/SimpleArrayMap;
 
     monitor-enter v1
 
     :try_start_3
-    iget-object v2, p0, Lcom/google/firebase/iid/p;->aRI:Landroidx/collection/SimpleArrayMap;
+    iget-object v2, p0, Lcom/google/firebase/iid/p;->aRE: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;->aRI:Landroidx/collection/SimpleArrayMap;
+    iget-object v1, p0, Lcom/google/firebase/iid/p;->aRE:Landroidx/collection/SimpleArrayMap;
 
     monitor-enter v1
 
     :try_start_5
-    iget-object v2, p0, Lcom/google/firebase/iid/p;->aRI:Landroidx/collection/SimpleArrayMap;
+    iget-object v2, p0, Lcom/google/firebase/iid/p;->aRE: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 pO()Ljava/lang/String;
+.method private static declared-synchronized pM()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;->aRJ:Lcom/google/firebase/iid/j;
+    iget-object v0, p0, Lcom/google/firebase/iid/p;->aRF:Lcom/google/firebase/iid/j;
 
-    invoke-virtual {v0}, Lcom/google/firebase/iid/j;->rm()I
+    invoke-virtual {v0}, Lcom/google/firebase/iid/j;->rk()I
 
     move-result v0
 
@@ -1085,7 +1085,7 @@
 
     if-lt v0, v1, :cond_3
 
-    iget-object v0, p0, Lcom/google/firebase/iid/p;->aFy:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/firebase/iid/p;->aFu: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;->pJ()I
+    invoke-virtual {v0}, Lcom/google/firebase/iid/az;->pH()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;->aLX:Ljava/util/concurrent/CountDownLatch;
+    iget-object v1, v1, Lcom/google/android/gms/tasks/j$a;->aLT: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 e5b8e85e28..933570baff 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 Ai()Lcom/google/android/gms/tasks/Task;
+.method public abstract Ag()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 b0bf137b3c..35a1154924 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 aRN:Lcom/google/firebase/iid/s;
+.field private static aRJ:Lcom/google/firebase/iid/s;
 
 
 # instance fields
-.field aCi:Ljava/lang/Boolean;
+.field aCe:Ljava/lang/Boolean;
 
-.field aIS:Ljava/lang/Boolean;
+.field aIO:Ljava/lang/Boolean;
 
-.field public final aRO:Ljava/util/Queue;
+.field public final aRK:Ljava/util/Queue;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Queue<",
@@ -22,7 +22,7 @@
     .end annotation
 .end field
 
-.field private ane:Ljava/lang/String;
+.field private ana:Ljava/lang/String;
 
 
 # direct methods
@@ -33,22 +33,22 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/google/firebase/iid/s;->ane:Ljava/lang/String;
+    iput-object v0, p0, Lcom/google/firebase/iid/s;->ana:Ljava/lang/String;
 
-    iput-object v0, p0, Lcom/google/firebase/iid/s;->aCi:Ljava/lang/Boolean;
+    iput-object v0, p0, Lcom/google/firebase/iid/s;->aCe:Ljava/lang/Boolean;
 
-    iput-object v0, p0, Lcom/google/firebase/iid/s;->aIS:Ljava/lang/Boolean;
+    iput-object v0, p0, Lcom/google/firebase/iid/s;->aIO: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;->aRO:Ljava/util/Queue;
+    iput-object v0, p0, Lcom/google/firebase/iid/s;->aRK:Ljava/util/Queue;
 
     return-void
 .end method
 
-.method public static declared-synchronized Aj()Lcom/google/firebase/iid/s;
+.method public static declared-synchronized Ah()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;->aRN:Lcom/google/firebase/iid/s;
+    sget-object v1, Lcom/google/firebase/iid/s;->aRJ: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;->aRN:Lcom/google/firebase/iid/s;
+    sput-object v1, Lcom/google/firebase/iid/s;->aRJ:Lcom/google/firebase/iid/s;
 
     :cond_0
-    sget-object v1, Lcom/google/firebase/iid/s;->aRN:Lcom/google/firebase/iid/s;
+    sget-object v1, Lcom/google/firebase/iid/s;->aRJ: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;->ane:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/firebase/iid/s;->ana:Ljava/lang/String;
 
     if-eqz v0, :cond_0
 
-    iget-object p1, p0, Lcom/google/firebase/iid/s;->ane:Ljava/lang/String;
+    iget-object p1, p0, Lcom/google/firebase/iid/s;->ana: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;->ane:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/firebase/iid/s;->ana: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;->ane:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/firebase/iid/s;->ana:Ljava/lang/String;
 
     :goto_1
-    iget-object p1, p0, Lcom/google/firebase/iid/s;->ane:Ljava/lang/String;
+    iget-object p1, p0, Lcom/google/firebase/iid/s;->ana: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;->aCi:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/firebase/iid/s;->aCe: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;->aCi:Ljava/lang/Boolean;
+    iput-object p1, p0, Lcom/google/firebase/iid/s;->aCe:Ljava/lang/Boolean;
 
     :cond_1
-    iget-object p1, p0, Lcom/google/firebase/iid/s;->aCi:Ljava/lang/Boolean;
+    iget-object p1, p0, Lcom/google/firebase/iid/s;->aCe: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;->aCi:Ljava/lang/Boolean;
+    iget-object p1, p0, Lcom/google/firebase/iid/s;->aCe: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;->aRO:Ljava/util/Queue;
+    iget-object v0, p0, Lcom/google/firebase/iid/s;->aRK: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 b793d55ea9..bb232b8e3c 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 aRP:Lcom/google/firebase/iid/p;
+.field private final synthetic aRL: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;->aRP:Lcom/google/firebase/iid/p;
+    iput-object p1, p0, Lcom/google/firebase/iid/t;->aRL: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;->aRP:Lcom/google/firebase/iid/p;
+    iget-object v0, p0, Lcom/google/firebase/iid/t;->aRL: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 7fa36efb12..bca3924f99 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 anz:J
+.field private static final anv:J
 
 
 # instance fields
-.field private final anq:Ljava/lang/String;
+.field private final anm:Ljava/lang/String;
 
-.field final atS:Ljava/lang/String;
+.field final atO:Ljava/lang/String;
 
 .field private final zzd:J
 
@@ -27,7 +27,7 @@
 
     move-result-wide v0
 
-    sput-wide v0, Lcom/google/firebase/iid/u;->anz:J
+    sput-wide v0, Lcom/google/firebase/iid/u;->anv: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;->atS:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/firebase/iid/u;->atO:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/google/firebase/iid/u;->anq:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/firebase/iid/u;->anm: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;->anz:J
+    sget-wide v4, Lcom/google/firebase/iid/u;->anv:J
 
     add-long/2addr v2, v4
 
@@ -233,7 +233,7 @@
 
     if-gtz v4, :cond_1
 
-    iget-object v0, p0, Lcom/google/firebase/iid/u;->anq:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/firebase/iid/u;->anm: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 d58858ef18..298db34a0e 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 aRQ:Landroid/content/SharedPreferences;
+.field private final aRM:Landroid/content/SharedPreferences;
 
-.field private final aRR:Lcom/google/firebase/iid/au;
+.field private final aRN:Lcom/google/firebase/iid/au;
 
-.field private final atK:Landroid/content/Context;
+.field private final atG: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;->atK:Landroid/content/Context;
+    iput-object p1, p0, Lcom/google/firebase/iid/v;->atG: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;->aRQ:Landroid/content/SharedPreferences;
+    iput-object p1, p0, Lcom/google/firebase/iid/v;->aRM:Landroid/content/SharedPreferences;
 
-    iput-object p2, p0, Lcom/google/firebase/iid/v;->aRR:Lcom/google/firebase/iid/au;
+    iput-object p2, p0, Lcom/google/firebase/iid/v;->aRN:Lcom/google/firebase/iid/au;
 
-    iget-object p1, p0, Lcom/google/firebase/iid/v;->atK:Landroid/content/Context;
+    iget-object p1, p0, Lcom/google/firebase/iid/v;->atG: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;->nO()Z
+    invoke-direct {p0}, Lcom/google/firebase/iid/v;->nM()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;->pG()V
+    invoke-virtual {p0}, Lcom/google/firebase/iid/v;->pE()V
 
-    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->Ae()Lcom/google/firebase/iid/FirebaseInstanceId;
+    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->Ac()Lcom/google/firebase/iid/FirebaseInstanceId;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/firebase/iid/FirebaseInstanceId;->tA()V
+    invoke-virtual {p1}, Lcom/google/firebase/iid/FirebaseInstanceId;->ty()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 nO()Z
+.method private final declared-synchronized nM()Z
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/firebase/iid/v;->aRQ:Landroid/content/SharedPreferences;
+    iget-object v0, p0, Lcom/google/firebase/iid/v;->aRM: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;->aRQ:Landroid/content/SharedPreferences;
+    iget-object p5, p0, Lcom/google/firebase/iid/v;->aRM: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;->aRQ:Landroid/content/SharedPreferences;
+    iget-object v0, p0, Lcom/google/firebase/iid/v;->aRM: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;->aRR:Lcom/google/firebase/iid/au;
+    iget-object v0, p0, Lcom/google/firebase/iid/v;->aRN:Lcom/google/firebase/iid/au;
 
-    iget-object v1, p0, Lcom/google/firebase/iid/v;->atK:Landroid/content/Context;
+    iget-object v1, p0, Lcom/google/firebase/iid/v;->atG: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;->Ae()Lcom/google/firebase/iid/FirebaseInstanceId;
+    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->Ac()Lcom/google/firebase/iid/FirebaseInstanceId;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/firebase/iid/FirebaseInstanceId;->tA()V
+    invoke-virtual {v0}, Lcom/google/firebase/iid/FirebaseInstanceId;->ty()V
 
-    iget-object v0, p0, Lcom/google/firebase/iid/v;->atK:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/firebase/iid/v;->atG: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;->aRQ:Landroid/content/SharedPreferences;
+    iget-object v0, p0, Lcom/google/firebase/iid/v;->aRM: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;->aRQ:Landroid/content/SharedPreferences;
+    iget-object v1, p0, Lcom/google/firebase/iid/v;->aRM: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;->aRQ:Landroid/content/SharedPreferences;
+    iget-object v0, p0, Lcom/google/firebase/iid/v;->aRM: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 pG()V
+.method public final declared-synchronized pE()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;->atK:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/firebase/iid/v;->atG: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;->aRQ:Landroid/content/SharedPreferences;
+    iget-object v0, p0, Lcom/google/firebase/iid/v;->aRM: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 pO()Ljava/lang/String;
+.method public final declared-synchronized pM()Ljava/lang/String;
     .locals 3
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/firebase/iid/v;->aRQ:Landroid/content/SharedPreferences;
+    iget-object v0, p0, Lcom/google/firebase/iid/v;->aRM: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 c372e06bea..c561b2b8ca 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 aLK:Landroid/os/PowerManager$WakeLock;
+.field private final aLG:Landroid/os/PowerManager$WakeLock;
 
-.field private final aRT:Lcom/google/firebase/iid/FirebaseInstanceId;
+.field private final aRP:Lcom/google/firebase/iid/FirebaseInstanceId;
 
-.field private final aRU:Lcom/google/firebase/iid/z;
+.field private final aRQ:Lcom/google/firebase/iid/z;
 
-.field private final any:J
+.field private final anu:J
 
 
 # direct methods
@@ -22,13 +22,13 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/firebase/iid/x;->aRT:Lcom/google/firebase/iid/FirebaseInstanceId;
+    iput-object p1, p0, Lcom/google/firebase/iid/x;->aRP:Lcom/google/firebase/iid/FirebaseInstanceId;
 
-    iput-object p2, p0, Lcom/google/firebase/iid/x;->aRU:Lcom/google/firebase/iid/z;
+    iput-object p2, p0, Lcom/google/firebase/iid/x;->aRQ:Lcom/google/firebase/iid/z;
 
-    iput-wide p3, p0, Lcom/google/firebase/iid/x;->any:J
+    iput-wide p3, p0, Lcom/google/firebase/iid/x;->anu:J
 
-    invoke-virtual {p0}, Lcom/google/firebase/iid/x;->Ak()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/firebase/iid/x;->Ai()Landroid/content/Context;
 
     move-result-object p1
 
@@ -48,9 +48,9 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/firebase/iid/x;->aLK:Landroid/os/PowerManager$WakeLock;
+    iput-object p1, p0, Lcom/google/firebase/iid/x;->aLG:Landroid/os/PowerManager$WakeLock;
 
-    iget-object p1, p0, Lcom/google/firebase/iid/x;->aLK:Landroid/os/PowerManager$WakeLock;
+    iget-object p1, p0, Lcom/google/firebase/iid/x;->aLG:Landroid/os/PowerManager$WakeLock;
 
     const/4 p2, 0x0
 
@@ -59,7 +59,7 @@
     return-void
 .end method
 
-.method private final nO()Z
+.method private final nM()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;->aRT:Lcom/google/firebase/iid/FirebaseInstanceId;
+    iget-object v1, p0, Lcom/google/firebase/iid/x;->aRP:Lcom/google/firebase/iid/FirebaseInstanceId;
 
-    invoke-virtual {v1}, Lcom/google/firebase/iid/FirebaseInstanceId;->Af()Lcom/google/firebase/iid/u;
+    invoke-virtual {v1}, Lcom/google/firebase/iid/FirebaseInstanceId;->Ad()Lcom/google/firebase/iid/u;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/google/firebase/iid/x;->aRT:Lcom/google/firebase/iid/FirebaseInstanceId;
+    iget-object v2, p0, Lcom/google/firebase/iid/x;->aRP: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;->aRT:Lcom/google/firebase/iid/FirebaseInstanceId;
+    iget-object v4, p0, Lcom/google/firebase/iid/x;->aRP:Lcom/google/firebase/iid/FirebaseInstanceId;
 
-    iget-object v5, v4, Lcom/google/firebase/iid/FirebaseInstanceId;->aRp:Lcom/google/firebase/FirebaseApp;
+    iget-object v5, v4, Lcom/google/firebase/iid/FirebaseInstanceId;->aRl: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;->atS:Ljava/lang/String;
+    iget-object v1, v1, Lcom/google/firebase/iid/u;->atO: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;->aRT:Lcom/google/firebase/iid/FirebaseInstanceId;
+    iget-object v6, p0, Lcom/google/firebase/iid/x;->aRP:Lcom/google/firebase/iid/FirebaseInstanceId;
 
-    iget-object v6, v6, Lcom/google/firebase/iid/FirebaseInstanceId;->aRp:Lcom/google/firebase/FirebaseApp;
+    iget-object v6, v6, Lcom/google/firebase/iid/FirebaseInstanceId;->aRl: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;->aRT:Lcom/google/firebase/iid/FirebaseInstanceId;
+    iget-object v5, p0, Lcom/google/firebase/iid/x;->aRP:Lcom/google/firebase/iid/FirebaseInstanceId;
 
-    iget-object v5, v5, Lcom/google/firebase/iid/FirebaseInstanceId;->aRp:Lcom/google/firebase/FirebaseApp;
+    iget-object v5, v5, Lcom/google/firebase/iid/FirebaseInstanceId;->aRl: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;->Ak()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/firebase/iid/x;->Ai()Landroid/content/Context;
 
     move-result-object v4
 
@@ -357,12 +357,12 @@
 
 
 # virtual methods
-.method final Ak()Landroid/content/Context;
+.method final Ai()Landroid/content/Context;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/firebase/iid/x;->aRT:Lcom/google/firebase/iid/FirebaseInstanceId;
+    iget-object v0, p0, Lcom/google/firebase/iid/x;->aRP:Lcom/google/firebase/iid/FirebaseInstanceId;
 
-    iget-object v0, v0, Lcom/google/firebase/iid/FirebaseInstanceId;->aRp:Lcom/google/firebase/FirebaseApp;
+    iget-object v0, v0, Lcom/google/firebase/iid/FirebaseInstanceId;->aRl: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;->Aj()Lcom/google/firebase/iid/s;
+    invoke-static {}, Lcom/google/firebase/iid/s;->Ah()Lcom/google/firebase/iid/s;
 
     move-result-object v1
 
-    invoke-virtual {p0}, Lcom/google/firebase/iid/x;->Ak()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/firebase/iid/x;->Ai()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;->aLK:Landroid/os/PowerManager$WakeLock;
+    iget-object v1, p0, Lcom/google/firebase/iid/x;->aLG: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;->aRT:Lcom/google/firebase/iid/FirebaseInstanceId;
+    iget-object v2, p0, Lcom/google/firebase/iid/x;->aRP: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;->aRT:Lcom/google/firebase/iid/FirebaseInstanceId;
+    iget-object v2, p0, Lcom/google/firebase/iid/x;->aRP:Lcom/google/firebase/iid/FirebaseInstanceId;
 
-    iget-object v2, v2, Lcom/google/firebase/iid/FirebaseInstanceId;->aRq:Lcom/google/firebase/iid/j;
+    iget-object v2, v2, Lcom/google/firebase/iid/FirebaseInstanceId;->aRm:Lcom/google/firebase/iid/j;
 
-    invoke-virtual {v2}, Lcom/google/firebase/iid/j;->pJ()I
+    invoke-virtual {v2}, Lcom/google/firebase/iid/j;->pH()I
 
     move-result v2
 
@@ -424,18 +424,18 @@
     :goto_0
     if-nez v2, :cond_3
 
-    iget-object v2, p0, Lcom/google/firebase/iid/x;->aRT:Lcom/google/firebase/iid/FirebaseInstanceId;
+    iget-object v2, p0, Lcom/google/firebase/iid/x;->aRP: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;->Aj()Lcom/google/firebase/iid/s;
+    invoke-static {}, Lcom/google/firebase/iid/s;->Ah()Lcom/google/firebase/iid/s;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/firebase/iid/x;->Ak()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/firebase/iid/x;->Ai()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;->aLK:Landroid/os/PowerManager$WakeLock;
+    iget-object v0, p0, Lcom/google/firebase/iid/x;->aLG: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;->Aj()Lcom/google/firebase/iid/s;
+    invoke-static {}, Lcom/google/firebase/iid/s;->Ah()Lcom/google/firebase/iid/s;
 
     move-result-object v2
 
-    invoke-virtual {p0}, Lcom/google/firebase/iid/x;->Ak()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/firebase/iid/x;->Ai()Landroid/content/Context;
 
     move-result-object v4
 
-    iget-object v5, v2, Lcom/google/firebase/iid/s;->aIS:Ljava/lang/Boolean;
+    iget-object v5, v2, Lcom/google/firebase/iid/s;->aIO: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;->aIS:Ljava/lang/Boolean;
+    iput-object v3, v2, Lcom/google/firebase/iid/s;->aIO:Ljava/lang/Boolean;
 
     :cond_5
-    iget-object v3, v2, Lcom/google/firebase/iid/s;->aCi:Ljava/lang/Boolean;
+    iget-object v3, v2, Lcom/google/firebase/iid/s;->aCe: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;->aIS:Ljava/lang/Boolean;
+    iget-object v2, v2, Lcom/google/firebase/iid/s;->aIO: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;->qg()Z
+    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->qe()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;->aRS:Lcom/google/firebase/iid/x;
+    iget-object v4, v2, Lcom/google/firebase/iid/w;->aRO:Lcom/google/firebase/iid/x;
 
-    invoke-virtual {v4}, Lcom/google/firebase/iid/x;->Ak()Landroid/content/Context;
+    invoke-virtual {v4}, Lcom/google/firebase/iid/x;->Ai()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;->Aj()Lcom/google/firebase/iid/s;
+    invoke-static {}, Lcom/google/firebase/iid/s;->Ah()Lcom/google/firebase/iid/s;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/firebase/iid/x;->Ak()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/firebase/iid/x;->Ai()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;->aLK:Landroid/os/PowerManager$WakeLock;
+    iget-object v0, p0, Lcom/google/firebase/iid/x;->aLG: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;->nO()Z
+    invoke-direct {p0}, Lcom/google/firebase/iid/x;->nM()Z
 
     move-result v2
 
     if-eqz v2, :cond_a
 
-    iget-object v2, p0, Lcom/google/firebase/iid/x;->aRU:Lcom/google/firebase/iid/z;
+    iget-object v2, p0, Lcom/google/firebase/iid/x;->aRQ:Lcom/google/firebase/iid/z;
 
-    iget-object v3, p0, Lcom/google/firebase/iid/x;->aRT:Lcom/google/firebase/iid/FirebaseInstanceId;
+    iget-object v3, p0, Lcom/google/firebase/iid/x;->aRP: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;->aRT:Lcom/google/firebase/iid/FirebaseInstanceId;
+    iget-object v2, p0, Lcom/google/firebase/iid/x;->aRP: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;->aRT:Lcom/google/firebase/iid/FirebaseInstanceId;
+    iget-object v2, p0, Lcom/google/firebase/iid/x;->aRP:Lcom/google/firebase/iid/FirebaseInstanceId;
 
-    iget-wide v3, p0, Lcom/google/firebase/iid/x;->any:J
+    iget-wide v3, p0, Lcom/google/firebase/iid/x;->anu: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;->Aj()Lcom/google/firebase/iid/s;
+    invoke-static {}, Lcom/google/firebase/iid/s;->Ah()Lcom/google/firebase/iid/s;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/firebase/iid/x;->Ak()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/firebase/iid/x;->Ai()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;->aLK:Landroid/os/PowerManager$WakeLock;
+    iget-object v0, p0, Lcom/google/firebase/iid/x;->aLG: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;->aRT:Lcom/google/firebase/iid/FirebaseInstanceId;
+    iget-object v0, p0, Lcom/google/firebase/iid/x;->aRP: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;->Aj()Lcom/google/firebase/iid/s;
+    invoke-static {}, Lcom/google/firebase/iid/s;->Ah()Lcom/google/firebase/iid/s;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/firebase/iid/x;->Ak()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/firebase/iid/x;->Ai()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;->aLK:Landroid/os/PowerManager$WakeLock;
+    iget-object v0, p0, Lcom/google/firebase/iid/x;->aLG: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;->Aj()Lcom/google/firebase/iid/s;
+    invoke-static {}, Lcom/google/firebase/iid/s;->Ah()Lcom/google/firebase/iid/s;
 
     move-result-object v1
 
-    invoke-virtual {p0}, Lcom/google/firebase/iid/x;->Ak()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/firebase/iid/x;->Ai()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;->aLK:Landroid/os/PowerManager$WakeLock;
+    iget-object v1, p0, Lcom/google/firebase/iid/x;->aLG: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;->Ak()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/firebase/iid/x;->Ai()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 d5ca9860c7..6f483d88c1 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 aRV:Lcom/google/android/gms/stats/a;
+.field private static aRR:Lcom/google/android/gms/stats/a;
 
-.field private static final any:J
+.field private static final anu:J
 
-.field private static final atN:Ljava/lang/Object;
+.field private static final atJ:Ljava/lang/Object;
 
 
 # direct methods
@@ -23,13 +23,13 @@
 
     move-result-wide v0
 
-    sput-wide v0, Lcom/google/firebase/iid/y;->any:J
+    sput-wide v0, Lcom/google/firebase/iid/y;->anu:J
 
     new-instance v0, Ljava/lang/Object;
 
     invoke-direct {v0}, Ljava/lang/Object;-><init>()V
 
-    sput-object v0, Lcom/google/firebase/iid/y;->atN:Ljava/lang/Object;
+    sput-object v0, Lcom/google/firebase/iid/y;->atJ: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;->atN:Ljava/lang/Object;
+    sget-object v0, Lcom/google/firebase/iid/y;->atJ:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/firebase/iid/y;->aRV:Lcom/google/android/gms/stats/a;
+    sget-object v1, Lcom/google/firebase/iid/y;->aRR: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;->aRV:Lcom/google/android/gms/stats/a;
+    sget-object p0, Lcom/google/firebase/iid/y;->aRR: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;->atN:Ljava/lang/Object;
+    sget-object v0, Lcom/google/firebase/iid/y;->atJ:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/firebase/iid/y;->aRV:Lcom/google/android/gms/stats/a;
+    sget-object v1, Lcom/google/firebase/iid/y;->aRR: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;->aRV:Lcom/google/android/gms/stats/a;
+    sput-object v1, Lcom/google/firebase/iid/y;->aRR: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;->aRV:Lcom/google/android/gms/stats/a;
+    sget-object p1, Lcom/google/firebase/iid/y;->aRR:Lcom/google/android/gms/stats/a;
 
-    sget-wide v1, Lcom/google/firebase/iid/y;->any:J
+    sget-wide v1, Lcom/google/firebase/iid/y;->anu: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 53ad05f26b..6e924e3baa 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 aBP:Ljava/util/Map;
+.field private final aBL:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -16,7 +16,7 @@
     .end annotation
 .end field
 
-.field private final aRW:Lcom/google/firebase/iid/v;
+.field private final aRS: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;->aBP:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/firebase/iid/z;->aBL:Ljava/util/Map;
 
-    iput-object p1, p0, Lcom/google/firebase/iid/z;->aRW:Lcom/google/firebase/iid/v;
+    iput-object p1, p0, Lcom/google/firebase/iid/z;->aRS: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;->Af()Lcom/google/firebase/iid/u;
+    invoke-virtual {p0}, Lcom/google/firebase/iid/FirebaseInstanceId;->Ad()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;->qZ()Ljava/lang/String;
+    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->qX()Ljava/lang/String;
 
     move-result-object v5
 
-    iget-object v7, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aRr:Lcom/google/firebase/iid/ap;
+    iget-object v7, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aRn:Lcom/google/firebase/iid/ap;
 
-    iget-object v4, v4, Lcom/google/firebase/iid/u;->atS:Ljava/lang/String;
+    iget-object v4, v4, Lcom/google/firebase/iid/u;->atO: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;->qg()Z
+    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->qe()Z
 
     move-result p0
 
@@ -239,7 +239,7 @@
     throw p0
 
     :cond_7
-    invoke-virtual {p0}, Lcom/google/firebase/iid/FirebaseInstanceId;->Af()Lcom/google/firebase/iid/u;
+    invoke-virtual {p0}, Lcom/google/firebase/iid/FirebaseInstanceId;->Ad()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;->qZ()Ljava/lang/String;
+    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->qX()Ljava/lang/String;
 
     move-result-object v5
 
-    iget-object v4, v4, Lcom/google/firebase/iid/u;->atS:Ljava/lang/String;
+    iget-object v4, v4, Lcom/google/firebase/iid/u;->atO:Ljava/lang/String;
 
-    iget-object v7, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aRr:Lcom/google/firebase/iid/ap;
+    iget-object v7, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aRn: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;->qg()Z
+    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->qe()Z
 
     move-result p0
 
@@ -436,16 +436,16 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/firebase/iid/z;->aRW:Lcom/google/firebase/iid/v;
+    iget-object v0, p0, Lcom/google/firebase/iid/z;->aRS: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;->aRW:Lcom/google/firebase/iid/v;
+    iget-object v1, p0, Lcom/google/firebase/iid/z;->aRS:Lcom/google/firebase/iid/v;
 
-    invoke-virtual {v1}, Lcom/google/firebase/iid/v;->pO()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/google/firebase/iid/v;->pM()Ljava/lang/String;
 
     move-result-object v1
 
@@ -513,7 +513,7 @@
 
     move-result-object p1
 
-    iget-object v1, p0, Lcom/google/firebase/iid/z;->aRW:Lcom/google/firebase/iid/v;
+    iget-object v1, p0, Lcom/google/firebase/iid/z;->aRS: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 rD()Ljava/lang/String;
+.method private final rB()Ljava/lang/String;
     .locals 3
 
-    iget-object v0, p0, Lcom/google/firebase/iid/z;->aRW:Lcom/google/firebase/iid/v;
+    iget-object v0, p0, Lcom/google/firebase/iid/z;->aRS:Lcom/google/firebase/iid/v;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/firebase/iid/z;->aRW:Lcom/google/firebase/iid/v;
+    iget-object v1, p0, Lcom/google/firebase/iid/z;->aRS:Lcom/google/firebase/iid/v;
 
-    invoke-virtual {v1}, Lcom/google/firebase/iid/v;->pO()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/google/firebase/iid/v;->pM()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;->rD()Ljava/lang/String;
+    invoke-direct {p0}, Lcom/google/firebase/iid/z;->rB()Ljava/lang/String;
 
     move-result-object v0
 
@@ -647,7 +647,7 @@
 
     if-nez v0, :cond_2
 
-    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->qg()Z
+    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->qe()Z
 
     move-result p1
 
@@ -683,7 +683,7 @@
     monitor-enter p0
 
     :try_start_1
-    iget-object v2, p0, Lcom/google/firebase/iid/z;->aBP:Ljava/util/Map;
+    iget-object v2, p0, Lcom/google/firebase/iid/z;->aBL: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 pH()Z
+.method final declared-synchronized pF()Z
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    invoke-direct {p0}, Lcom/google/firebase/iid/z;->rD()Ljava/lang/String;
+    invoke-direct {p0}, Lcom/google/firebase/iid/z;->rB()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 bcc8f107ee..8d53d0a96f 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;->qg()Z
+    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->qe()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 a694fc491f..404dcf031a 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 aRC:Landroid/os/Messenger;
+.field private aRy:Landroid/os/Messenger;
 
-.field private aSg:Lcom/google/firebase/iid/as;
+.field private aSc: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;->aRC:Landroid/os/Messenger;
+    iput-object v0, p0, Lcom/google/firebase/iid/zzf;->aRy: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;->aSg:Lcom/google/firebase/iid/as;
+    iput-object v0, p0, Lcom/google/firebase/iid/zzf;->aSc:Lcom/google/firebase/iid/as;
 
     return-void
 .end method
 
-.method private final Am()Landroid/os/IBinder;
+.method private final Ak()Landroid/os/IBinder;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/firebase/iid/zzf;->aRC:Landroid/os/Messenger;
+    iget-object v0, p0, Lcom/google/firebase/iid/zzf;->aRy: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;->aSg:Lcom/google/firebase/iid/as;
+    iget-object v0, p0, Lcom/google/firebase/iid/zzf;->aSc: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;->aRC:Landroid/os/Messenger;
+    iget-object v0, p0, Lcom/google/firebase/iid/zzf;->aRy: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;->aSg:Lcom/google/firebase/iid/as;
+    iget-object v0, p0, Lcom/google/firebase/iid/zzf;->aSc: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;->Am()Landroid/os/IBinder;
+    invoke-direct {p0}, Lcom/google/firebase/iid/zzf;->Ak()Landroid/os/IBinder;
 
     move-result-object v1
 
     check-cast p1, Lcom/google/firebase/iid/zzf;
 
-    invoke-direct {p1}, Lcom/google/firebase/iid/zzf;->Am()Landroid/os/IBinder;
+    invoke-direct {p1}, Lcom/google/firebase/iid/zzf;->Ak()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;->Am()Landroid/os/IBinder;
+    invoke-direct {p0}, Lcom/google/firebase/iid/zzf;->Ak()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;->aRC:Landroid/os/Messenger;
+    iget-object p2, p0, Lcom/google/firebase/iid/zzf;->aRy: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;->aSg:Lcom/google/firebase/iid/as;
+    iget-object p2, p0, Lcom/google/firebase/iid/zzf;->aSc: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 b3c5dd0e82..74c66bb28c 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;->Aj()Lcom/google/firebase/iid/s;
+    invoke-static {}, Lcom/google/firebase/iid/s;->Ah()Lcom/google/firebase/iid/s;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/firebase/iid/s;->aRO:Ljava/util/Queue;
+    iget-object p1, p1, Lcom/google/firebase/iid/s;->aRK: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;->pJ()I
+    invoke-virtual {v4}, Lcom/google/firebase/iid/az;->pH()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;->pH()Z
+    invoke-virtual {v5}, Lcom/google/firebase/messaging/g;->pF()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 5e6bddc214..208fc5f19b 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 aBP:Ljava/util/Map;
+.field public aBL:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -27,7 +27,7 @@
     .end annotation
 .end field
 
-.field public aCr:Landroid/os/Bundle;
+.field public aCn: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;->aCr:Landroid/os/Bundle;
+    iput-object p1, p0, Lcom/google/firebase/messaging/RemoteMessage;->aCn:Landroid/os/Bundle;
 
     return-void
 .end method
@@ -64,7 +64,7 @@
 
     move-result p2
 
-    iget-object v0, p0, Lcom/google/firebase/messaging/RemoteMessage;->aCr:Landroid/os/Bundle;
+    iget-object v0, p0, Lcom/google/firebase/messaging/RemoteMessage;->aCn: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 ba84d63873..55a4989573 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 aSx:Ljava/util/regex/Pattern;
+.field private static final aSt:Ljava/util/regex/Pattern;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/firebase/messaging/a;->aSx:Ljava/util/regex/Pattern;
+    sput-object v0, Lcom/google/firebase/messaging/a;->aSt: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 027151db51..8eeebe5aab 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 aSy:Landroidx/core/app/NotificationCompat$Builder;
+.field public final aSu:Landroidx/core/app/NotificationCompat$Builder;
 
-.field public final ane:Ljava/lang/String;
+.field public final ana: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;->aSy:Landroidx/core/app/NotificationCompat$Builder;
+    iput-object p1, p0, Lcom/google/firebase/messaging/d;->aSu:Landroidx/core/app/NotificationCompat$Builder;
 
-    iput-object p2, p0, Lcom/google/firebase/messaging/d;->ane:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/firebase/messaging/d;->ana: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 6b3de27d10..d5587419d1 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 aSz:Ljava/util/concurrent/atomic/AtomicInteger;
+.field private static final aSv: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;->aSz:Ljava/util/concurrent/atomic/AtomicInteger;
+    sput-object v0, Lcom/google/firebase/messaging/e;->aSv: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;->Ar()Landroid/os/Bundle;
+    invoke-virtual {p1}, Lcom/google/firebase/messaging/n;->Ap()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;->aSz:Ljava/util/concurrent/atomic/AtomicInteger;
+    sget-object v2, Lcom/google/firebase/messaging/e;->aSv: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;->Ac()Landroid/os/Bundle;
+    invoke-virtual {p1}, Lcom/google/firebase/messaging/n;->Aa()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;->Ac()Landroid/os/Bundle;
+    invoke-virtual {p1}, Lcom/google/firebase/messaging/n;->Aa()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;->Ap()[J
+    invoke-virtual {p1}, Lcom/google/firebase/messaging/n;->An()[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;->Aq()[I
+    invoke-virtual {p1}, Lcom/google/firebase/messaging/n;->Ao()[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;->aSz:Ljava/util/concurrent/atomic/AtomicInteger;
+    sget-object v0, Lcom/google/firebase/messaging/e;->aSv: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 2623f0a08b..728bdd8e09 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;->nR()Lcom/google/android/gms/internal/e/b;
+    invoke-static {}, Lcom/google/android/gms/internal/e/a;->nP()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;->aLU:Lcom/google/android/gms/tasks/ac;
+    iget-object p1, v0, Lcom/google/android/gms/tasks/h;->aLQ: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;->aQq:Ljava/util/concurrent/Executor;
+    sget-object p3, Lcom/google/firebase/messaging/k;->aQm: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 f9de9536d0..c85bb3eae6 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 aQq:Ljava/util/concurrent/Executor;
+.field private final aQm:Ljava/util/concurrent/Executor;
 
-.field private final aSA:Lcom/google/firebase/messaging/n;
+.field private final aSw:Lcom/google/firebase/messaging/n;
 
-.field private final atK:Landroid/content/Context;
+.field private final atG: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;->aQq:Ljava/util/concurrent/Executor;
+    iput-object p3, p0, Lcom/google/firebase/messaging/g;->aQm:Ljava/util/concurrent/Executor;
 
-    iput-object p1, p0, Lcom/google/firebase/messaging/g;->atK:Landroid/content/Context;
+    iput-object p1, p0, Lcom/google/firebase/messaging/g;->atG:Landroid/content/Context;
 
-    iput-object p2, p0, Lcom/google/firebase/messaging/g;->aSA:Lcom/google/firebase/messaging/n;
+    iput-object p2, p0, Lcom/google/firebase/messaging/g;->aSw:Lcom/google/firebase/messaging/n;
 
     return-void
 .end method
 
 
 # virtual methods
-.method final pH()Z
+.method final pF()Z
     .locals 10
 
-    iget-object v0, p0, Lcom/google/firebase/messaging/g;->aSA:Lcom/google/firebase/messaging/n;
+    iget-object v0, p0, Lcom/google/firebase/messaging/g;->aSw: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;->atK:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/firebase/messaging/g;->atG: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;->nw()Z
+    invoke-static {}, Lcom/google/android/gms/common/util/l;->nu()Z
 
     move-result v0
 
@@ -79,7 +79,7 @@
 
     move-result v0
 
-    iget-object v3, p0, Lcom/google/firebase/messaging/g;->atK:Landroid/content/Context;
+    iget-object v3, p0, Lcom/google/firebase/messaging/g;->atG:Landroid/content/Context;
 
     const-string v4, "activity"
 
@@ -135,7 +135,7 @@
     return v2
 
     :cond_4
-    iget-object v0, p0, Lcom/google/firebase/messaging/g;->aSA:Lcom/google/firebase/messaging/n;
+    iget-object v0, p0, Lcom/google/firebase/messaging/g;->aSw: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;->aQq:Ljava/util/concurrent/Executor;
+    iget-object v3, p0, Lcom/google/firebase/messaging/g;->aQm: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;->aSD:Lcom/google/android/gms/tasks/Task;
+    iput-object v5, v0, Lcom/google/firebase/messaging/m;->aSz:Lcom/google/android/gms/tasks/Task;
 
     :cond_5
-    iget-object v3, p0, Lcom/google/firebase/messaging/g;->atK:Landroid/content/Context;
+    iget-object v3, p0, Lcom/google/firebase/messaging/g;->atG:Landroid/content/Context;
 
-    iget-object v4, p0, Lcom/google/firebase/messaging/g;->aSA:Lcom/google/firebase/messaging/n;
+    iget-object v4, p0, Lcom/google/firebase/messaging/g;->aSw: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;->aSy:Landroidx/core/app/NotificationCompat$Builder;
+    iget-object v4, v3, Lcom/google/firebase/messaging/d;->aSu: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;->aSD:Lcom/google/android/gms/tasks/Task;
+    iget-object v6, v0, Lcom/google/firebase/messaging/m;->aSz: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;->atK:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/firebase/messaging/g;->atG: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;->ane:Ljava/lang/String;
+    iget-object v4, v3, Lcom/google/firebase/messaging/d;->ana:Ljava/lang/String;
 
-    iget-object v3, v3, Lcom/google/firebase/messaging/d;->aSy:Landroidx/core/app/NotificationCompat$Builder;
+    iget-object v3, v3, Lcom/google/firebase/messaging/d;->aSu: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 475140a9ce..5ae336821e 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 aRZ:Landroid/content/Intent;
+.field private final aRV:Landroid/content/Intent;
 
-.field private final aSB:Lcom/google/firebase/messaging/f;
+.field private final aSk:Lcom/google/android/gms/tasks/h;
 
-.field private final aSo:Lcom/google/android/gms/tasks/h;
+.field private final aSx:Lcom/google/firebase/messaging/f;
 
 
 # direct methods
@@ -20,11 +20,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/firebase/messaging/h;->aSB:Lcom/google/firebase/messaging/f;
+    iput-object p1, p0, Lcom/google/firebase/messaging/h;->aSx:Lcom/google/firebase/messaging/f;
 
-    iput-object p2, p0, Lcom/google/firebase/messaging/h;->aRZ:Landroid/content/Intent;
+    iput-object p2, p0, Lcom/google/firebase/messaging/h;->aRV:Landroid/content/Intent;
 
-    iput-object p3, p0, Lcom/google/firebase/messaging/h;->aSo:Lcom/google/android/gms/tasks/h;
+    iput-object p3, p0, Lcom/google/firebase/messaging/h;->aSk: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;->aSB:Lcom/google/firebase/messaging/f;
+    iget-object v0, p0, Lcom/google/firebase/messaging/h;->aSx:Lcom/google/firebase/messaging/f;
 
-    iget-object v1, p0, Lcom/google/firebase/messaging/h;->aRZ:Landroid/content/Intent;
+    iget-object v1, p0, Lcom/google/firebase/messaging/h;->aRV:Landroid/content/Intent;
 
-    iget-object v2, p0, Lcom/google/firebase/messaging/h;->aSo:Lcom/google/android/gms/tasks/h;
+    iget-object v2, p0, Lcom/google/firebase/messaging/h;->aSk: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 f52ec72f17..bd498852d5 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 aSB:Lcom/google/firebase/messaging/f;
+.field private final aSx: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;->aSB:Lcom/google/firebase/messaging/f;
+    iput-object p1, p0, Lcom/google/firebase/messaging/i;->aSx: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;->aSB:Lcom/google/firebase/messaging/f;
+    iget-object v0, p0, Lcom/google/firebase/messaging/i;->aSx: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 9dfaacefac..0985e6c423 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 aRZ:Landroid/content/Intent;
+.field private final aRV:Landroid/content/Intent;
 
-.field private final aSB:Lcom/google/firebase/messaging/f;
+.field private final aSx: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;->aSB:Lcom/google/firebase/messaging/f;
+    iput-object p1, p0, Lcom/google/firebase/messaging/j;->aSx:Lcom/google/firebase/messaging/f;
 
-    iput-object p2, p0, Lcom/google/firebase/messaging/j;->aRZ:Landroid/content/Intent;
+    iput-object p2, p0, Lcom/google/firebase/messaging/j;->aRV: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;->aSB:Lcom/google/firebase/messaging/f;
+    iget-object v0, p0, Lcom/google/firebase/messaging/j;->aSx:Lcom/google/firebase/messaging/f;
 
-    iget-object v1, p0, Lcom/google/firebase/messaging/j;->aRZ:Landroid/content/Intent;
+    iget-object v1, p0, Lcom/google/firebase/messaging/j;->aRV: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 999f388f35..3cf6ddd8a1 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 aQq:Ljava/util/concurrent/Executor;
+.field static final aQm: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;->aQq:Ljava/util/concurrent/Executor;
+    sput-object v0, Lcom/google/firebase/messaging/k;->aQm: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 90ac542fa1..65536d1fc9 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 aSC:Lcom/google/firebase/messaging/m;
+.field private final aSy: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;->aSC:Lcom/google/firebase/messaging/m;
+    iput-object p1, p0, Lcom/google/firebase/messaging/l;->aSy: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;->aSC:Lcom/google/firebase/messaging/m;
+    iget-object v0, p0, Lcom/google/firebase/messaging/l;->aSy:Lcom/google/firebase/messaging/m;
 
-    iget-object v1, v0, Lcom/google/firebase/messaging/m;->aEM:Ljava/net/URL;
+    iget-object v1, v0, Lcom/google/firebase/messaging/m;->aEI: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;->Ao()[B
+    invoke-virtual {v0}, Lcom/google/firebase/messaging/m;->Am()[B
 
     move-result-object v1
 
@@ -84,7 +84,7 @@
 
     if-eqz v3, :cond_0
 
-    iget-object v0, v0, Lcom/google/firebase/messaging/m;->aEM:Ljava/net/URL;
+    iget-object v0, v0, Lcom/google/firebase/messaging/m;->aEI: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;->aEM:Ljava/net/URL;
+    iget-object v0, v0, Lcom/google/firebase/messaging/m;->aEI: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 3498366ee6..40100a20e2 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,11 @@
 
 
 # instance fields
-.field final aEM:Ljava/net/URL;
+.field final aEI:Ljava/net/URL;
 
-.field aSD:Lcom/google/android/gms/tasks/Task;
+.field private volatile aSA:Ljava/io/InputStream;
+
+.field aSz:Lcom/google/android/gms/tasks/Task;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/tasks/Task<",
@@ -19,8 +21,6 @@
     .end annotation
 .end field
 
-.field private volatile aSE:Ljava/io/InputStream;
-
 
 # direct methods
 .method private constructor <init>(Ljava/net/URL;)V
@@ -28,7 +28,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/firebase/messaging/m;->aEM:Ljava/net/URL;
+    iput-object p1, p0, Lcom/google/firebase/messaging/m;->aEI:Ljava/net/URL;
 
     return-void
 .end method
@@ -96,7 +96,7 @@
 
 
 # virtual methods
-.method final Ao()[B
+.method final Am()[B
     .locals 7
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -104,7 +104,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/firebase/messaging/m;->aEM:Ljava/net/URL;
+    iget-object v0, p0, Lcom/google/firebase/messaging/m;->aEI: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;->aSE:Ljava/io/InputStream;
+    iput-object v0, p0, Lcom/google/firebase/messaging/m;->aSA: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;->aEM:Ljava/net/URL;
+    iget-object v4, p0, Lcom/google/firebase/messaging/m;->aEI: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;->aSE:Ljava/io/InputStream;
+    iget-object v0, p0, Lcom/google/firebase/messaging/m;->aSA: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 a5fb6e8a27..3c9b8ef896 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 aCr:Landroid/os/Bundle;
+.field private final aCn: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;->aCr:Landroid/os/Bundle;
+    iput-object v0, p0, Lcom/google/firebase/messaging/n;->aCn:Landroid/os/Bundle;
 
     return-void
 
@@ -497,16 +497,16 @@
 
 
 # virtual methods
-.method public final Ac()Landroid/os/Bundle;
+.method public final Aa()Landroid/os/Bundle;
     .locals 4
 
     new-instance v0, Landroid/os/Bundle;
 
-    iget-object v1, p0, Lcom/google/firebase/messaging/n;->aCr:Landroid/os/Bundle;
+    iget-object v1, p0, Lcom/google/firebase/messaging/n;->aCn: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;
+    iget-object v1, p0, Lcom/google/firebase/messaging/n;->aCn:Landroid/os/Bundle;
 
     invoke-virtual {v1}, Landroid/os/Bundle;->keySet()Ljava/util/Set;
 
@@ -568,7 +568,7 @@
     return-object v0
 .end method
 
-.method public final Ap()[J
+.method public final An()[J
     .locals 6
 
     const-string v0, "gcm.n.vibrate_timings"
@@ -671,7 +671,7 @@
     return-object v1
 .end method
 
-.method final Aq()[I
+.method final Ao()[I
     .locals 9
 
     const-string v0, ". Skipping setting LightSettings"
@@ -849,16 +849,16 @@
     return-object v4
 .end method
 
-.method public final Ar()Landroid/os/Bundle;
+.method public final Ap()Landroid/os/Bundle;
     .locals 4
 
     new-instance v0, Landroid/os/Bundle;
 
-    iget-object v1, p0, Lcom/google/firebase/messaging/n;->aCr:Landroid/os/Bundle;
+    iget-object v1, p0, Lcom/google/firebase/messaging/n;->aCn: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;
+    iget-object v1, p0, Lcom/google/firebase/messaging/n;->aCn:Landroid/os/Bundle;
 
     invoke-virtual {v1}, Landroid/os/Bundle;->keySet()Ljava/util/Set;
 
@@ -954,7 +954,7 @@
 .method public final bZ(Ljava/lang/String;)Ljava/lang/String;
     .locals 3
 
-    iget-object v0, p0, Lcom/google/firebase/messaging/n;->aCr:Landroid/os/Bundle;
+    iget-object v0, p0, Lcom/google/firebase/messaging/n;->aCn:Landroid/os/Bundle;
 
     invoke-virtual {v0, p1}, Landroid/os/Bundle;->containsKey(Ljava/lang/String;)Z
 
@@ -974,7 +974,7 @@
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/google/firebase/messaging/n;->aCr:Landroid/os/Bundle;
+    iget-object v2, p0, Lcom/google/firebase/messaging/n;->aCn:Landroid/os/Bundle;
 
     invoke-virtual {v2, v1}, Landroid/os/Bundle;->containsKey(Ljava/lang/String;)Z
 
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 d2aa2897ac..3fdc5f37b1 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 aTf:Lcom/google/gson/Gson;
+.field final synthetic aTb: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;->aTf:Lcom/google/gson/Gson;
+    iput-object p1, p0, Lcom/google/gson/Gson$1;->aTb: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 333c960d1f..67f2a449f2 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 aTf:Lcom/google/gson/Gson;
+.field final synthetic aTb: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;->aTf:Lcom/google/gson/Gson;
+    iput-object p1, p0, Lcom/google/gson/Gson$2;->aTb: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 732084985a..7804a3b29c 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 aTg:Lcom/google/gson/TypeAdapter;
+.field final synthetic aTc: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;->aTg:Lcom/google/gson/TypeAdapter;
+    iput-object p1, p0, Lcom/google/gson/Gson$4;->aTc: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;->aTg:Lcom/google/gson/TypeAdapter;
+    iget-object v0, p0, Lcom/google/gson/Gson$4;->aTc: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;->aTg:Lcom/google/gson/TypeAdapter;
+    iget-object v0, p0, Lcom/google/gson/Gson$4;->aTc: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 64964d2c0d..f6d67fc77a 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 aTg:Lcom/google/gson/TypeAdapter;
+.field final synthetic aTc: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;->aTg:Lcom/google/gson/TypeAdapter;
+    iput-object p1, p0, Lcom/google/gson/Gson$5;->aTc: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;->aTg:Lcom/google/gson/TypeAdapter;
+    iget-object v1, p0, Lcom/google/gson/Gson$5;->aTc: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;->aTg:Lcom/google/gson/TypeAdapter;
+    iget-object v2, p0, Lcom/google/gson/Gson$5;->aTc: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 f3377bc89b..9bc887dd92 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 aTh:Lcom/google/gson/TypeAdapter;
+.field aTd: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;->aTh:Lcom/google/gson/TypeAdapter;
+    iget-object v0, p0, Lcom/google/gson/Gson$a;->aTd:Lcom/google/gson/TypeAdapter;
 
     if-eqz v0, :cond_0
 
@@ -96,7 +96,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/gson/Gson$a;->aTh:Lcom/google/gson/TypeAdapter;
+    iget-object v0, p0, Lcom/google/gson/Gson$a;->aTd: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 4aced40b3e..4a22187be5 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 aSV:Lcom/google/gson/reflect/TypeToken;
+.field public static final aSR: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 aSW:Ljava/lang/ThreadLocal;
+.field public final aSS:Ljava/lang/ThreadLocal;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/ThreadLocal<",
@@ -36,7 +36,7 @@
     .end annotation
 .end field
 
-.field public final aSX:Ljava/util/Map;
+.field public final aST:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -48,7 +48,7 @@
     .end annotation
 .end field
 
-.field public final aSY:Ljava/util/List;
+.field public final aSU:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -58,17 +58,17 @@
     .end annotation
 .end field
 
-.field public final aSZ:Lcom/google/gson/internal/c;
+.field public final aSV:Lcom/google/gson/internal/c;
 
-.field public final aTa:Lcom/google/gson/internal/d;
+.field public final aSW:Lcom/google/gson/internal/d;
 
-.field public final aTb:Lcom/google/gson/e;
+.field public final aSX:Lcom/google/gson/e;
 
-.field public final aTc:Z
+.field public final aSY:Z
 
-.field public final aTd:Z
+.field public final aSZ:Z
 
-.field public final aTe:Lcom/google/gson/internal/a/d;
+.field public final aTa: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;->aSV:Lcom/google/gson/reflect/TypeToken;
+    sput-object v0, Lcom/google/gson/Gson;->aSR: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;->aTH:Lcom/google/gson/internal/d;
+    sget-object v1, Lcom/google/gson/internal/d;->aTD:Lcom/google/gson/internal/d;
 
-    sget-object v2, Lcom/google/gson/d;->aSP:Lcom/google/gson/d;
+    sget-object v2, Lcom/google/gson/d;->aSL:Lcom/google/gson/d;
 
     invoke-static {}, Ljava/util/Collections;->emptyMap()Ljava/util/Map;
 
     move-result-object v3
 
-    sget-object v11, Lcom/google/gson/q;->aTw:Lcom/google/gson/q;
+    sget-object v11, Lcom/google/gson/q;->aTs: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;->aSW:Ljava/lang/ThreadLocal;
+    iput-object p12, p0, Lcom/google/gson/Gson;->aSS: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;->aSX:Ljava/util/Map;
+    iput-object p12, p0, Lcom/google/gson/Gson;->aST: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;->aSZ:Lcom/google/gson/internal/c;
+    iput-object p12, p0, Lcom/google/gson/Gson;->aSV:Lcom/google/gson/internal/c;
 
-    iput-object p1, p0, Lcom/google/gson/Gson;->aTa:Lcom/google/gson/internal/d;
+    iput-object p1, p0, Lcom/google/gson/Gson;->aSW:Lcom/google/gson/internal/d;
 
-    iput-object p2, p0, Lcom/google/gson/Gson;->aTb:Lcom/google/gson/e;
+    iput-object p2, p0, Lcom/google/gson/Gson;->aSX:Lcom/google/gson/e;
 
     iput-boolean p4, p0, Lcom/google/gson/Gson;->serializeNulls:Z
 
-    iput-boolean p6, p0, Lcom/google/gson/Gson;->aTc:Z
+    iput-boolean p6, p0, Lcom/google/gson/Gson;->aSY:Z
 
     iput-boolean p7, p0, Lcom/google/gson/Gson;->htmlSafe:Z
 
-    iput-boolean p8, p0, Lcom/google/gson/Gson;->aTd:Z
+    iput-boolean p8, p0, Lcom/google/gson/Gson;->aSZ: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;->aVU:Lcom/google/gson/r;
+    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/h;->aUl:Lcom/google/gson/r;
+    sget-object p4, Lcom/google/gson/internal/a/h;->aUh:Lcom/google/gson/r;
 
     invoke-interface {p3, p4}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
@@ -208,15 +208,7 @@
 
     invoke-interface {p3, v0}, Ljava/util/List;->addAll(Ljava/util/Collection;)Z
 
-    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;->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;->aVc: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
 
@@ -224,15 +216,23 @@
 
     invoke-interface {p3, p4}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    sget-object p4, Lcom/google/gson/internal/a/n;->aVg:Lcom/google/gson/r;
+    sget-object p4, Lcom/google/gson/internal/a/n;->aUY:Lcom/google/gson/r;
 
     invoke-interface {p3, p4}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    sget-object p4, Lcom/google/gson/q;->aTw:Lcom/google/gson/q;
+    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;->aVc:Lcom/google/gson/r;
+
+    invoke-interface {p3, p4}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+
+    sget-object p4, Lcom/google/gson/q;->aTs:Lcom/google/gson/q;
 
     if-ne p11, p4, :cond_0
 
-    sget-object p4, Lcom/google/gson/internal/a/n;->aVp:Lcom/google/gson/TypeAdapter;
+    sget-object p4, Lcom/google/gson/internal/a/n;->aVl: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;->aVr:Lcom/google/gson/TypeAdapter;
+    sget-object p8, Lcom/google/gson/internal/a/n;->aVn: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;->aVq:Lcom/google/gson/TypeAdapter;
+    sget-object p8, Lcom/google/gson/internal/a/n;->aVm: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;
+    sget-object p6, Lcom/google/gson/internal/a/n;->aVp: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;
+    sget-object p6, Lcom/google/gson/internal/a/n;->aVg: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;->aVm:Lcom/google/gson/r;
+    sget-object p6, Lcom/google/gson/internal/a/n;->aVi:Lcom/google/gson/r;
 
     invoke-interface {p3, p6}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
@@ -340,11 +340,39 @@
 
     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;
+    sget-object p4, Lcom/google/gson/internal/a/n;->aVk: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;->aVv:Lcom/google/gson/r;
+    sget-object p4, Lcom/google/gson/internal/a/n;->aVr: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;->aVx: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;->aVz: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;->aVt: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;
+
+    move-result-object p4
+
+    invoke-interface {p3, p4}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+
+    const-class p4, Ljava/math/BigInteger;
+
+    sget-object p6, Lcom/google/gson/internal/a/n;->aVu: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;
+
+    move-result-object p4
 
     invoke-interface {p3, p4}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
@@ -356,85 +384,57 @@
 
     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;->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;
-
-    move-result-object p4
-
-    invoke-interface {p3, p4}, Ljava/util/List;->add(Ljava/lang/Object;)Z
-
-    const-class p4, Ljava/math/BigInteger;
-
-    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;
-
-    move-result-object p4
-
-    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;
-
-    invoke-interface {p3, p4}, Ljava/util/List;->add(Ljava/lang/Object;)Z
-
     sget-object p4, Lcom/google/gson/internal/a/n;->aVH: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;->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/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;->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/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;->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;
+    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
 
-    sget-object p4, Lcom/google/gson/internal/a/n;->aUX:Lcom/google/gson/r;
+    sget-object p4, Lcom/google/gson/internal/a/n;->aUV: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;->aUh: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;
+
+    invoke-interface {p3, p4}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+
+    sget-object p4, Lcom/google/gson/internal/a/k;->aUh: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;->aUh: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;->aVK: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;->aUh: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;
 
     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;->aSZ:Lcom/google/gson/internal/c;
+    iget-object p6, p0, Lcom/google/gson/Gson;->aSV: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;->aSZ:Lcom/google/gson/internal/c;
+    iget-object p6, p0, Lcom/google/gson/Gson;->aSV: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;->aSZ:Lcom/google/gson/internal/c;
+    iget-object p5, p0, Lcom/google/gson/Gson;->aSV: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;->aTe:Lcom/google/gson/internal/a/d;
+    iput-object p4, p0, Lcom/google/gson/Gson;->aTa:Lcom/google/gson/internal/a/d;
 
-    iget-object p4, p0, Lcom/google/gson/Gson;->aTe:Lcom/google/gson/internal/a/d;
+    iget-object p4, p0, Lcom/google/gson/Gson;->aTa: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;->aVV:Lcom/google/gson/r;
+    sget-object p4, Lcom/google/gson/internal/a/n;->aVR: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;->aSZ:Lcom/google/gson/internal/c;
+    iget-object p5, p0, Lcom/google/gson/Gson;->aSV:Lcom/google/gson/internal/c;
 
-    iget-object p6, p0, Lcom/google/gson/Gson;->aTe:Lcom/google/gson/internal/a/d;
+    iget-object p6, p0, Lcom/google/gson/Gson;->aTa: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;->aSY:Ljava/util/List;
+    iput-object p1, p0, Lcom/google/gson/Gson;->aSU:Ljava/util/List;
 
     return-void
 .end method
@@ -1081,7 +1081,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/gson/Gson;->aSY:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/gson/Gson;->aSU: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;->aTe:Lcom/google/gson/internal/a/d;
+    iget-object p1, p0, Lcom/google/gson/Gson;->aTa:Lcom/google/gson/internal/a/d;
 
     :cond_0
     const/4 v0, 0x0
 
-    iget-object v1, p0, Lcom/google/gson/Gson;->aSY:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/gson/Gson;->aSU: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;->aSX:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/gson/Gson;->aST:Ljava/util/Map;
 
     if-nez p1, :cond_0
 
-    sget-object v1, Lcom/google/gson/Gson;->aSV:Lcom/google/gson/reflect/TypeToken;
+    sget-object v1, Lcom/google/gson/Gson;->aSR: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;->aSW:Ljava/lang/ThreadLocal;
+    iget-object v0, p0, Lcom/google/gson/Gson;->aSS: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;->aSW:Ljava/lang/ThreadLocal;
+    iget-object v1, p0, Lcom/google/gson/Gson;->aSS: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;->aSY:Ljava/util/List;
+    iget-object v3, p0, Lcom/google/gson/Gson;->aSU: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;->aTh:Lcom/google/gson/TypeAdapter;
+    iget-object v3, v2, Lcom/google/gson/Gson$a;->aTd:Lcom/google/gson/TypeAdapter;
 
     if-nez v3, :cond_6
 
-    iput-object v4, v2, Lcom/google/gson/Gson$a;->aTh:Lcom/google/gson/TypeAdapter;
+    iput-object v4, v2, Lcom/google/gson/Gson$a;->aTd:Lcom/google/gson/TypeAdapter;
 
-    iget-object v2, p0, Lcom/google/gson/Gson;->aSX:Ljava/util/Map;
+    iget-object v2, p0, Lcom/google/gson/Gson;->aST: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;->aSW:Ljava/lang/ThreadLocal;
+    iget-object p1, p0, Lcom/google/gson/Gson;->aSS: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;->aSW:Ljava/lang/ThreadLocal;
+    iget-object p1, p0, Lcom/google/gson/Gson;->aSS: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;->aTc:Z
+    iget-boolean v0, p0, Lcom/google/gson/Gson;->aSY: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;->aTd:Z
+    iget-boolean p1, p0, Lcom/google/gson/Gson;->aSZ:Z
 
     if-eqz p1, :cond_1
 
@@ -1494,7 +1494,7 @@
 
     if-nez p1, :cond_0
 
-    sget-object p1, Lcom/google/gson/k;->aTt:Lcom/google/gson/k;
+    sget-object p1, Lcom/google/gson/k;->aTp: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;->aSY:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/gson/Gson;->aSU: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;->aSZ:Lcom/google/gson/internal/c;
+    iget-object v1, p0, Lcom/google/gson/Gson;->aSV: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 654645a7c0..231aafc8f7 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 AB()Ljava/lang/Number;
+.method public AA()Ljava/lang/String;
     .locals 2
 
     new-instance v0, Ljava/lang/UnsupportedOperationException;
@@ -32,7 +32,7 @@
     throw v0
 .end method
 
-.method public AC()Ljava/lang/String;
+.method public AB()D
     .locals 2
 
     new-instance v0, Ljava/lang/UnsupportedOperationException;
@@ -50,7 +50,7 @@
     throw v0
 .end method
 
-.method public AD()D
+.method public AC()J
     .locals 2
 
     new-instance v0, Ljava/lang/UnsupportedOperationException;
@@ -68,7 +68,7 @@
     throw v0
 .end method
 
-.method public AE()J
+.method public AD()I
     .locals 2
 
     new-instance v0, Ljava/lang/UnsupportedOperationException;
@@ -86,7 +86,7 @@
     throw v0
 .end method
 
-.method public AF()I
+.method public AE()Z
     .locals 2
 
     new-instance v0, Ljava/lang/UnsupportedOperationException;
@@ -104,25 +104,7 @@
     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;
+.method public final AG()Lcom/google/gson/m;
     .locals 3
 
     instance-of v0, p0, Lcom/google/gson/m;
@@ -153,6 +135,24 @@
     throw v0
 .end method
 
+.method public Az()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 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 5bb12dba11..dee8b86282 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 aTu:Lcom/google/gson/internal/LinkedTreeMap;
+.field public final aTq: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;->aTu:Lcom/google/gson/internal/LinkedTreeMap;
+    iput-object v0, p0, Lcom/google/gson/JsonObject;->aTq: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;->aTt:Lcom/google/gson/k;
+    sget-object p0, Lcom/google/gson/k;->aTp:Lcom/google/gson/k;
 
     return-object p0
 
@@ -55,10 +55,10 @@
 
     if-nez p2, :cond_0
 
-    sget-object p2, Lcom/google/gson/k;->aTt:Lcom/google/gson/k;
+    sget-object p2, Lcom/google/gson/k;->aTp:Lcom/google/gson/k;
 
     :cond_0
-    iget-object v0, p0, Lcom/google/gson/JsonObject;->aTu:Lcom/google/gson/internal/LinkedTreeMap;
+    iget-object v0, p0, Lcom/google/gson/JsonObject;->aTq: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;->aTu:Lcom/google/gson/internal/LinkedTreeMap;
+    iget-object p1, p1, Lcom/google/gson/JsonObject;->aTq:Lcom/google/gson/internal/LinkedTreeMap;
 
-    iget-object v0, p0, Lcom/google/gson/JsonObject;->aTu:Lcom/google/gson/internal/LinkedTreeMap;
+    iget-object v0, p0, Lcom/google/gson/JsonObject;->aTq: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;->aTu:Lcom/google/gson/internal/LinkedTreeMap;
+    iget-object v0, p0, Lcom/google/gson/JsonObject;->aTq: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 037130f932..eee9022094 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 aTz:Lcom/google/gson/TypeAdapter;
+.field final synthetic aTv: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;->aTz:Lcom/google/gson/TypeAdapter;
+    iput-object p1, p0, Lcom/google/gson/TypeAdapter$1;->aTv: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;->aTz:Lcom/google/gson/TypeAdapter;
+    iget-object v0, p0, Lcom/google/gson/TypeAdapter$1;->aTv: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;->aTz:Lcom/google/gson/TypeAdapter;
+    iget-object v0, p0, Lcom/google/gson/TypeAdapter$1;->aTv: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 406efdce71..44ecbe753d 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;->aUu:Ljava/util/List;
+    iget-object p1, v0, Lcom/google/gson/internal/a/f;->aUq: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;->aUw:Lcom/google/gson/JsonElement;
+    iget-object p1, v0, Lcom/google/gson/internal/a/f;->aUs: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;->aUu:Ljava/util/List;
+    iget-object v0, v0, Lcom/google/gson/internal/a/f;->aUq: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 e11b346634..cbdf5992a9 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 aSM:Ljava/lang/Class;
+.field private final aSI:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -25,9 +25,9 @@
     .end annotation
 .end field
 
-.field private final aSN:Ljava/text/DateFormat;
+.field private final aSJ:Ljava/text/DateFormat;
 
-.field private final aSO:Ljava/text/DateFormat;
+.field private final aSK:Ljava/text/DateFormat;
 
 
 # direct methods
@@ -163,11 +163,11 @@
 
     :cond_1
     :goto_0
-    iput-object p1, p0, Lcom/google/gson/a;->aSM:Ljava/lang/Class;
+    iput-object p1, p0, Lcom/google/gson/a;->aSI:Ljava/lang/Class;
 
-    iput-object p2, p0, Lcom/google/gson/a;->aSN:Ljava/text/DateFormat;
+    iput-object p2, p0, Lcom/google/gson/a;->aSJ:Ljava/text/DateFormat;
 
-    iput-object p3, p0, Lcom/google/gson/a;->aSO:Ljava/text/DateFormat;
+    iput-object p3, p0, Lcom/google/gson/a;->aSK: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;->aSO:Ljava/text/DateFormat;
+    iget-object v0, p0, Lcom/google/gson/a;->aSK:Ljava/text/DateFormat;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/gson/a;->aSO:Ljava/text/DateFormat;
+    iget-object v1, p0, Lcom/google/gson/a;->aSK: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;->aSN:Ljava/text/DateFormat;
+    iget-object v1, p0, Lcom/google/gson/a;->aSJ: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;->aSM:Ljava/lang/Class;
+    iget-object v0, p0, Lcom/google/gson/a;->aSI: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;->aSO:Ljava/text/DateFormat;
+    iget-object v1, p0, Lcom/google/gson/a;->aSK: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;->aSO:Ljava/text/DateFormat;
+    iget-object v0, p0, Lcom/google/gson/a;->aSK:Ljava/text/DateFormat;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/gson/a;->aSN:Ljava/text/DateFormat;
+    iget-object v1, p0, Lcom/google/gson/a;->aSJ: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 4534c6fef4..8be8d1c4a3 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 Ax()Z
+.method public abstract Av()Z
 .end method
 
-.method public abstract Ay()Z
+.method public abstract Aw()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 e4ffb3a280..fc08c80f7d 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 aSL:Lcom/google/gson/d;
+
+.field public static final enum aSM:Lcom/google/gson/d;
+
+.field public static final enum aSN:Lcom/google/gson/d;
+
+.field public static final enum aSO:Lcom/google/gson/d;
+
 .field public static final enum aSP:Lcom/google/gson/d;
 
-.field public static final enum aSQ:Lcom/google/gson/d;
-
-.field public static final enum aSR:Lcom/google/gson/d;
-
-.field public static final enum aSS:Lcom/google/gson/d;
-
-.field public static final enum aST:Lcom/google/gson/d;
-
-.field private static final synthetic aSU:[Lcom/google/gson/d;
+.field private static final synthetic aSQ:[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;->aSP:Lcom/google/gson/d;
+    sput-object v0, Lcom/google/gson/d;->aSL: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;->aSQ:Lcom/google/gson/d;
+    sput-object v0, Lcom/google/gson/d;->aSM: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;->aSR:Lcom/google/gson/d;
+    sput-object v0, Lcom/google/gson/d;->aSN: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;->aSS:Lcom/google/gson/d;
+    sput-object v0, Lcom/google/gson/d;->aSO: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;->aST:Lcom/google/gson/d;
+    sput-object v0, Lcom/google/gson/d;->aSP:Lcom/google/gson/d;
 
     const/4 v0, 0x5
 
     new-array v0, v0, [Lcom/google/gson/d;
 
-    sget-object v1, Lcom/google/gson/d;->aSP:Lcom/google/gson/d;
+    sget-object v1, Lcom/google/gson/d;->aSL:Lcom/google/gson/d;
 
     const/4 v2, 0x0
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/google/gson/d;->aSQ:Lcom/google/gson/d;
+    sget-object v1, Lcom/google/gson/d;->aSM:Lcom/google/gson/d;
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/google/gson/d;->aSR:Lcom/google/gson/d;
+    sget-object v1, Lcom/google/gson/d;->aSN:Lcom/google/gson/d;
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/google/gson/d;->aSS:Lcom/google/gson/d;
+    sget-object v1, Lcom/google/gson/d;->aSO:Lcom/google/gson/d;
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/google/gson/d;->aST:Lcom/google/gson/d;
+    sget-object v1, Lcom/google/gson/d;->aSP:Lcom/google/gson/d;
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lcom/google/gson/d;->aSU:[Lcom/google/gson/d;
+    sput-object v0, Lcom/google/gson/d;->aSQ:[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;->aSU:[Lcom/google/gson/d;
+    sget-object v0, Lcom/google/gson/d;->aSQ:[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 c73bd7c694..eddd125b0e 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 aSY:Ljava/util/List;
+.field public final aSU:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -14,17 +14,17 @@
     .end annotation
 .end field
 
-.field private aTa:Lcom/google/gson/internal/d;
+.field private aSW:Lcom/google/gson/internal/d;
 
-.field private aTc:Z
+.field private aSY:Z
 
-.field private aTd:Z
+.field private aSZ:Z
 
-.field private aTi:Lcom/google/gson/q;
+.field private aTe:Lcom/google/gson/q;
 
-.field public aTj:Lcom/google/gson/e;
+.field public aTf:Lcom/google/gson/e;
 
-.field private final aTk:Ljava/util/Map;
+.field private final aTg:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -35,7 +35,7 @@
     .end annotation
 .end field
 
-.field private final aTl:Ljava/util/List;
+.field private final aTh:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -45,17 +45,17 @@
     .end annotation
 .end field
 
-.field private aTm:Ljava/lang/String;
+.field private aTi:Ljava/lang/String;
 
-.field private aTn:I
+.field private aTj:I
 
-.field private aTo:I
+.field private aTk:I
 
-.field private aTp:Z
+.field private aTl:Z
 
-.field private aTq:Z
+.field private aTm:Z
 
-.field private aTr:Z
+.field private aTn: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;->aTH:Lcom/google/gson/internal/d;
+    sget-object v0, Lcom/google/gson/internal/d;->aTD:Lcom/google/gson/internal/d;
 
-    iput-object v0, p0, Lcom/google/gson/f;->aTa:Lcom/google/gson/internal/d;
+    iput-object v0, p0, Lcom/google/gson/f;->aSW:Lcom/google/gson/internal/d;
 
-    sget-object v0, Lcom/google/gson/q;->aTw:Lcom/google/gson/q;
+    sget-object v0, Lcom/google/gson/q;->aTs:Lcom/google/gson/q;
 
-    iput-object v0, p0, Lcom/google/gson/f;->aTi:Lcom/google/gson/q;
+    iput-object v0, p0, Lcom/google/gson/f;->aTe:Lcom/google/gson/q;
 
-    sget-object v0, Lcom/google/gson/d;->aSP:Lcom/google/gson/d;
+    sget-object v0, Lcom/google/gson/d;->aSL:Lcom/google/gson/d;
 
-    iput-object v0, p0, Lcom/google/gson/f;->aTj:Lcom/google/gson/e;
+    iput-object v0, p0, Lcom/google/gson/f;->aTf: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;->aTk:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/gson/f;->aTg: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;->aSY:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/gson/f;->aSU: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;->aTl:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/gson/f;->aTh:Ljava/util/List;
 
     const/4 v0, 0x0
 
@@ -104,21 +104,21 @@
 
     const/4 v1, 0x2
 
-    iput v1, p0, Lcom/google/gson/f;->aTn:I
+    iput v1, p0, Lcom/google/gson/f;->aTj:I
 
-    iput v1, p0, Lcom/google/gson/f;->aTo:I
+    iput v1, p0, Lcom/google/gson/f;->aTk:I
 
-    iput-boolean v0, p0, Lcom/google/gson/f;->aTp:Z
+    iput-boolean v0, p0, Lcom/google/gson/f;->aTl:Z
 
-    iput-boolean v0, p0, Lcom/google/gson/f;->aTq:Z
+    iput-boolean v0, p0, Lcom/google/gson/f;->aTm:Z
 
     const/4 v1, 0x1
 
-    iput-boolean v1, p0, Lcom/google/gson/f;->aTr:Z
+    iput-boolean v1, p0, Lcom/google/gson/f;->aTn:Z
 
-    iput-boolean v0, p0, Lcom/google/gson/f;->aTd:Z
+    iput-boolean v0, p0, Lcom/google/gson/f;->aSZ:Z
 
-    iput-boolean v0, p0, Lcom/google/gson/f;->aTc:Z
+    iput-boolean v0, p0, Lcom/google/gson/f;->aSY:Z
 
     iput-boolean v0, p0, Lcom/google/gson/f;->lenient:Z
 
@@ -234,18 +234,18 @@
 
 
 # virtual methods
-.method public final Az()Lcom/google/gson/Gson;
+.method public final Ax()Lcom/google/gson/Gson;
     .locals 14
 
     new-instance v12, Ljava/util/ArrayList;
 
-    iget-object v0, p0, Lcom/google/gson/f;->aSY:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/gson/f;->aSU:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/gson/f;->aTl:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/gson/f;->aTh: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;->aSY:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/gson/f;->aSU: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;->aTl:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/gson/f;->aTh: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;->aTm:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/gson/f;->aTi:Ljava/lang/String;
 
-    iget v1, p0, Lcom/google/gson/f;->aTn:I
+    iget v1, p0, Lcom/google/gson/f;->aTj:I
 
-    iget v2, p0, Lcom/google/gson/f;->aTo:I
+    iget v2, p0, Lcom/google/gson/f;->aTk: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;->aTa:Lcom/google/gson/internal/d;
+    iget-object v1, p0, Lcom/google/gson/f;->aSW:Lcom/google/gson/internal/d;
 
-    iget-object v2, p0, Lcom/google/gson/f;->aTj:Lcom/google/gson/e;
+    iget-object v2, p0, Lcom/google/gson/f;->aTf:Lcom/google/gson/e;
 
-    iget-object v3, p0, Lcom/google/gson/f;->aTk:Ljava/util/Map;
+    iget-object v3, p0, Lcom/google/gson/f;->aTg:Ljava/util/Map;
 
     iget-boolean v4, p0, Lcom/google/gson/f;->serializeNulls:Z
 
-    iget-boolean v5, p0, Lcom/google/gson/f;->aTp:Z
+    iget-boolean v5, p0, Lcom/google/gson/f;->aTl:Z
 
-    iget-boolean v6, p0, Lcom/google/gson/f;->aTc:Z
+    iget-boolean v6, p0, Lcom/google/gson/f;->aSY:Z
 
-    iget-boolean v7, p0, Lcom/google/gson/f;->aTr:Z
+    iget-boolean v7, p0, Lcom/google/gson/f;->aTn:Z
 
-    iget-boolean v8, p0, Lcom/google/gson/f;->aTd:Z
+    iget-boolean v8, p0, Lcom/google/gson/f;->aSZ:Z
 
     iget-boolean v9, p0, Lcom/google/gson/f;->lenient:Z
 
-    iget-boolean v10, p0, Lcom/google/gson/f;->aTq:Z
+    iget-boolean v10, p0, Lcom/google/gson/f;->aTm:Z
 
-    iget-object v11, p0, Lcom/google/gson/f;->aTi:Lcom/google/gson/q;
+    iget-object v11, p0, Lcom/google/gson/f;->aTe: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 4e2a530ca1..21a13c1fcc 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 AA()Ljava/lang/Object;
+.method public abstract Ay()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 05520f26d8..d457470437 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 aTs:Ljava/util/List;
+.field private final aTo: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;->aTs:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/gson/h;->aTo:Ljava/util/List;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final AB()Ljava/lang/Number;
+.method public final AA()Ljava/lang/String;
     .locals 2
 
-    iget-object v0, p0, Lcom/google/gson/h;->aTs:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/gson/h;->aTo: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;->aTs:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/gson/h;->aTo:Ljava/util/List;
 
     const/4 v1, 0x0
 
@@ -69,7 +69,7 @@
 
     check-cast v0, Lcom/google/gson/JsonElement;
 
-    invoke-virtual {v0}, Lcom/google/gson/JsonElement;->AB()Ljava/lang/Number;
+    invoke-virtual {v0}, Lcom/google/gson/JsonElement;->AA()Ljava/lang/String;
 
     move-result-object v0
 
@@ -83,10 +83,10 @@
     throw v0
 .end method
 
-.method public final AC()Ljava/lang/String;
+.method public final AB()D
     .locals 2
 
-    iget-object v0, p0, Lcom/google/gson/h;->aTs:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/gson/h;->aTo:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
@@ -96,7 +96,7 @@
 
     if-ne v0, v1, :cond_0
 
-    iget-object v0, p0, Lcom/google/gson/h;->aTs:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/gson/h;->aTo:Ljava/util/List;
 
     const/4 v1, 0x0
 
@@ -106,7 +106,155 @@
 
     check-cast v0, Lcom/google/gson/JsonElement;
 
-    invoke-virtual {v0}, Lcom/google/gson/JsonElement;->AC()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/gson/JsonElement;->AB()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 AC()J
+    .locals 2
+
+    iget-object v0, p0, Lcom/google/gson/h;->aTo: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;->aTo: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()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 AD()I
+    .locals 2
+
+    iget-object v0, p0, Lcom/google/gson/h;->aTo: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;->aTo: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()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 AE()Z
+    .locals 2
+
+    iget-object v0, p0, Lcom/google/gson/h;->aTo: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;->aTo: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()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 Az()Ljava/lang/Number;
+    .locals 2
+
+    iget-object v0, p0, Lcom/google/gson/h;->aTo: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;->aTo: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;->Az()Ljava/lang/Number;
 
     move-result-object v0
 
@@ -120,163 +268,15 @@
     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;->aTt:Lcom/google/gson/k;
+    sget-object p1, Lcom/google/gson/k;->aTp:Lcom/google/gson/k;
 
     :cond_0
-    iget-object v0, p0, Lcom/google/gson/h;->aTs:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/gson/h;->aTo: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;->aTs:Ljava/util/List;
+    iget-object p1, p1, Lcom/google/gson/h;->aTo:Ljava/util/List;
 
-    iget-object v0, p0, Lcom/google/gson/h;->aTs:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/gson/h;->aTo: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;->aTs:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/gson/h;->aTo: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;->aTs:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/gson/h;->aTo: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 96dde6aa48..c6da467978 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 AH()Ljava/lang/Object;
+.method public abstract AF()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 4709419cce..52632f386a 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 aTU:Lcom/google/gson/internal/LinkedTreeMap$a;
+.field final synthetic aTQ: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;->aTU:Lcom/google/gson/internal/LinkedTreeMap$a;
+    iput-object p1, p0, Lcom/google/gson/internal/LinkedTreeMap$a$1;->aTQ:Lcom/google/gson/internal/LinkedTreeMap$a;
 
-    iget-object p1, p1, Lcom/google/gson/internal/LinkedTreeMap$a;->aTT:Lcom/google/gson/internal/LinkedTreeMap;
+    iget-object p1, p1, Lcom/google/gson/internal/LinkedTreeMap$a;->aTP: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;->AR()Lcom/google/gson/internal/LinkedTreeMap$d;
+    invoke-virtual {p0}, Lcom/google/gson/internal/LinkedTreeMap$a$1;->AP()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 ec9b506b18..f8e0ba1654 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 aTT:Lcom/google/gson/internal/LinkedTreeMap;
+.field final synthetic aTP: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;->aTT:Lcom/google/gson/internal/LinkedTreeMap;
+    iput-object p1, p0, Lcom/google/gson/internal/LinkedTreeMap$a;->aTP: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;->aTT:Lcom/google/gson/internal/LinkedTreeMap;
+    iget-object v0, p0, Lcom/google/gson/internal/LinkedTreeMap$a;->aTP: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;->aTT:Lcom/google/gson/internal/LinkedTreeMap;
+    iget-object v0, p0, Lcom/google/gson/internal/LinkedTreeMap$a;->aTP: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;->aTT:Lcom/google/gson/internal/LinkedTreeMap;
+    iget-object v0, p0, Lcom/google/gson/internal/LinkedTreeMap$a;->aTP: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;->aTT:Lcom/google/gson/internal/LinkedTreeMap;
+    iget-object v0, p0, Lcom/google/gson/internal/LinkedTreeMap$a;->aTP: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;->aTT:Lcom/google/gson/internal/LinkedTreeMap;
+    iget-object v0, p0, Lcom/google/gson/internal/LinkedTreeMap$a;->aTP: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 0ed758e886..4da3ca5a8a 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 aTV:Lcom/google/gson/internal/LinkedTreeMap$b;
+.field final synthetic aTR: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;->aTV:Lcom/google/gson/internal/LinkedTreeMap$b;
+    iput-object p1, p0, Lcom/google/gson/internal/LinkedTreeMap$b$1;->aTR:Lcom/google/gson/internal/LinkedTreeMap$b;
 
-    iget-object p1, p1, Lcom/google/gson/internal/LinkedTreeMap$b;->aTT:Lcom/google/gson/internal/LinkedTreeMap;
+    iget-object p1, p1, Lcom/google/gson/internal/LinkedTreeMap$b;->aTP: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;->AR()Lcom/google/gson/internal/LinkedTreeMap$d;
+    invoke-virtual {p0}, Lcom/google/gson/internal/LinkedTreeMap$b$1;->AP()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 8f693df5e2..5d04f58a64 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 aTT:Lcom/google/gson/internal/LinkedTreeMap;
+.field final synthetic aTP: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;->aTT:Lcom/google/gson/internal/LinkedTreeMap;
+    iput-object p1, p0, Lcom/google/gson/internal/LinkedTreeMap$b;->aTP: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;->aTT:Lcom/google/gson/internal/LinkedTreeMap;
+    iget-object v0, p0, Lcom/google/gson/internal/LinkedTreeMap$b;->aTP: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;->aTT:Lcom/google/gson/internal/LinkedTreeMap;
+    iget-object v0, p0, Lcom/google/gson/internal/LinkedTreeMap$b;->aTP: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;->aTT:Lcom/google/gson/internal/LinkedTreeMap;
+    iget-object v0, p0, Lcom/google/gson/internal/LinkedTreeMap$b;->aTP: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;->aTT:Lcom/google/gson/internal/LinkedTreeMap;
+    iget-object v0, p0, Lcom/google/gson/internal/LinkedTreeMap$b;->aTP: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 31cb37f0e1..f70d5b091b 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 aTT:Lcom/google/gson/internal/LinkedTreeMap;
+.field final synthetic aTP:Lcom/google/gson/internal/LinkedTreeMap;
 
-.field aTW:Lcom/google/gson/internal/LinkedTreeMap$d;
+.field aTS: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 aTX:Lcom/google/gson/internal/LinkedTreeMap$d;
+.field aTT: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 aTY:I
+.field aTU:I
 
 
 # direct methods
 .method constructor <init>(Lcom/google/gson/internal/LinkedTreeMap;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aTT:Lcom/google/gson/internal/LinkedTreeMap;
+    iput-object p1, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aTP:Lcom/google/gson/internal/LinkedTreeMap;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iget-object p1, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aTT:Lcom/google/gson/internal/LinkedTreeMap;
+    iget-object p1, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aTP: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;->aTW:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object p1, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aTS:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iput-object p1, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aTW:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object p1, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aTS:Lcom/google/gson/internal/LinkedTreeMap$d;
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aTX:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object p1, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aTT:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iget-object p1, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aTT:Lcom/google/gson/internal/LinkedTreeMap;
+    iget-object p1, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aTP:Lcom/google/gson/internal/LinkedTreeMap;
 
     iget p1, p1, Lcom/google/gson/internal/LinkedTreeMap;->modCount:I
 
-    iput p1, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aTY:I
+    iput p1, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aTU:I
 
     return-void
 .end method
 
 
 # virtual methods
-.method final AR()Lcom/google/gson/internal/LinkedTreeMap$d;
+.method final AP()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;->aTW:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v0, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aTS:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iget-object v1, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aTT:Lcom/google/gson/internal/LinkedTreeMap;
+    iget-object v1, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aTP: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;->aTT:Lcom/google/gson/internal/LinkedTreeMap;
+    iget-object v1, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aTP:Lcom/google/gson/internal/LinkedTreeMap;
 
     iget v1, v1, Lcom/google/gson/internal/LinkedTreeMap;->modCount:I
 
-    iget v2, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aTY:I
+    iget v2, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aTU:I
 
     if-ne v1, v2, :cond_0
 
-    iget-object v1, v0, Lcom/google/gson/internal/LinkedTreeMap$d;->aTW:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v1, v0, Lcom/google/gson/internal/LinkedTreeMap$d;->aTS: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 v1, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aTS:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iput-object v0, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aTX:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object v0, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aTT: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;->aTW:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v0, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aTS:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iget-object v1, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aTT:Lcom/google/gson/internal/LinkedTreeMap;
+    iget-object v1, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aTP: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;->aTX:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v0, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aTT:Lcom/google/gson/internal/LinkedTreeMap$d;
 
     if-eqz v0, :cond_0
 
-    iget-object v1, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aTT:Lcom/google/gson/internal/LinkedTreeMap;
+    iget-object v1, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aTP: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;->aTX:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object v0, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aTT:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iget-object v0, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aTT:Lcom/google/gson/internal/LinkedTreeMap;
+    iget-object v0, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aTP:Lcom/google/gson/internal/LinkedTreeMap;
 
     iget v0, v0, Lcom/google/gson/internal/LinkedTreeMap;->modCount:I
 
-    iput v0, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aTY:I
+    iput v0, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aTU: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 d5216a923a..6a416513b3 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,6 +31,24 @@
 
 
 # instance fields
+.field aTS:Lcom/google/gson/internal/LinkedTreeMap$d;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/gson/internal/LinkedTreeMap$d<",
+            "TK;TV;>;"
+        }
+    .end annotation
+.end field
+
+.field aTV:Lcom/google/gson/internal/LinkedTreeMap$d;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/gson/internal/LinkedTreeMap$d<",
+            "TK;TV;>;"
+        }
+    .end annotation
+.end field
+
 .field aTW:Lcom/google/gson/internal/LinkedTreeMap$d;
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -40,7 +58,7 @@
     .end annotation
 .end field
 
-.field aTZ: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,25 +67,7 @@
     .end annotation
 .end field
 
-.field aUa:Lcom/google/gson/internal/LinkedTreeMap$d;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/gson/internal/LinkedTreeMap$d<",
-            "TK;TV;>;"
-        }
-    .end annotation
-.end field
-
-.field aUb:Lcom/google/gson/internal/LinkedTreeMap$d;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/gson/internal/LinkedTreeMap$d<",
-            "TK;TV;>;"
-        }
-    .end annotation
-.end field
-
-.field aUc:Lcom/google/gson/internal/LinkedTreeMap$d;
+.field aTY: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;->aUc:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object p0, p0, Lcom/google/gson/internal/LinkedTreeMap$d;->aTY:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iput-object p0, p0, Lcom/google/gson/internal/LinkedTreeMap$d;->aTW:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object p0, p0, Lcom/google/gson/internal/LinkedTreeMap$d;->aTS: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;->aTZ:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object p1, p0, Lcom/google/gson/internal/LinkedTreeMap$d;->aTV: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;->aTW:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object p3, p0, Lcom/google/gson/internal/LinkedTreeMap$d;->aTS: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 p4, p0, Lcom/google/gson/internal/LinkedTreeMap$d;->aTY: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, p4, Lcom/google/gson/internal/LinkedTreeMap$d;->aTS:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iput-object p0, p3, Lcom/google/gson/internal/LinkedTreeMap$d;->aUc:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object p0, p3, Lcom/google/gson/internal/LinkedTreeMap$d;->aTY: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 6c912f47d0..0a5c3f82f7 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 aTS:Ljava/util/Comparator;
+.field private static final aTO: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;->aTS:Ljava/util/Comparator;
+    sput-object v0, Lcom/google/gson/internal/LinkedTreeMap;->aTO: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;->aTS:Ljava/util/Comparator;
+    sget-object v0, Lcom/google/gson/internal/LinkedTreeMap;->aTO: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;->aTS:Ljava/util/Comparator;
+    sget-object p1, Lcom/google/gson/internal/LinkedTreeMap;->aTO: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;->aUa:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v0, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aTW: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 v1, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aTX: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 v2, v1, Lcom/google/gson/internal/LinkedTreeMap$d;->aTW:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iget-object v3, v1, Lcom/google/gson/internal/LinkedTreeMap$d;->aUb:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v3, v1, Lcom/google/gson/internal/LinkedTreeMap$d;->aTX:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iput-object v2, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aUb:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object v2, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aTX:Lcom/google/gson/internal/LinkedTreeMap$d;
 
     if-eqz v2, :cond_0
 
-    iput-object p1, v2, Lcom/google/gson/internal/LinkedTreeMap$d;->aTZ:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object p1, v2, Lcom/google/gson/internal/LinkedTreeMap$d;->aTV: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;->aUa:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object p1, v1, Lcom/google/gson/internal/LinkedTreeMap$d;->aTW:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iput-object v1, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aTZ:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object v1, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aTV: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;->aTZ:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v0, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aTV:Lcom/google/gson/internal/LinkedTreeMap$d;
 
     const/4 v1, 0x0
 
-    iput-object v1, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aTZ:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object v1, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aTV:Lcom/google/gson/internal/LinkedTreeMap$d;
 
     if-eqz p2, :cond_0
 
-    iput-object v0, p2, Lcom/google/gson/internal/LinkedTreeMap$d;->aTZ:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object v0, p2, Lcom/google/gson/internal/LinkedTreeMap$d;->aTV:Lcom/google/gson/internal/LinkedTreeMap$d;
 
     :cond_0
     if-eqz v0, :cond_2
 
-    iget-object v1, v0, Lcom/google/gson/internal/LinkedTreeMap$d;->aUa:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v1, v0, Lcom/google/gson/internal/LinkedTreeMap$d;->aTW:Lcom/google/gson/internal/LinkedTreeMap$d;
 
     if-ne v1, p1, :cond_1
 
-    iput-object p2, v0, Lcom/google/gson/internal/LinkedTreeMap$d;->aUa:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object p2, v0, Lcom/google/gson/internal/LinkedTreeMap$d;->aTW:Lcom/google/gson/internal/LinkedTreeMap$d;
 
     return-void
 
     :cond_1
-    iput-object p2, v0, Lcom/google/gson/internal/LinkedTreeMap$d;->aUb:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object p2, v0, Lcom/google/gson/internal/LinkedTreeMap$d;->aTX:Lcom/google/gson/internal/LinkedTreeMap$d;
 
     return-void
 
@@ -320,26 +320,26 @@
         }
     .end annotation
 
-    iget-object v0, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aUa:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v0, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aTW: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 v1, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aTX: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 v2, v0, Lcom/google/gson/internal/LinkedTreeMap$d;->aTW:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iget-object v3, v0, Lcom/google/gson/internal/LinkedTreeMap$d;->aUb:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v3, v0, Lcom/google/gson/internal/LinkedTreeMap$d;->aTX:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iput-object v3, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aUa:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object v3, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aTW:Lcom/google/gson/internal/LinkedTreeMap$d;
 
     if-eqz v3, :cond_0
 
-    iput-object p1, v3, Lcom/google/gson/internal/LinkedTreeMap$d;->aTZ:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object p1, v3, Lcom/google/gson/internal/LinkedTreeMap$d;->aTV: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;->aUb:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object p1, v0, Lcom/google/gson/internal/LinkedTreeMap$d;->aTX:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iput-object v0, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aTZ:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object v0, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aTV: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;->aUa:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v0, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aTW: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 v1, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aTX: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;->aUa:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v0, v1, Lcom/google/gson/internal/LinkedTreeMap$d;->aTW:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iget-object v3, v1, Lcom/google/gson/internal/LinkedTreeMap$d;->aUb:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v3, v1, Lcom/google/gson/internal/LinkedTreeMap$d;->aTX: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;->aUa:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v1, v0, Lcom/google/gson/internal/LinkedTreeMap$d;->aTW:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iget-object v3, v0, Lcom/google/gson/internal/LinkedTreeMap$d;->aUb:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v3, v0, Lcom/google/gson/internal/LinkedTreeMap$d;->aTX: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;->aTZ:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object p1, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aTV: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;->aTS:Ljava/util/Comparator;
+    sget-object v3, Lcom/google/gson/internal/LinkedTreeMap;->aTO: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;->aUa:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v5, v1, Lcom/google/gson/internal/LinkedTreeMap$d;->aTW:Lcom/google/gson/internal/LinkedTreeMap$d;
 
     goto :goto_2
 
     :cond_3
-    iget-object v5, v1, Lcom/google/gson/internal/LinkedTreeMap$d;->aUb:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v5, v1, Lcom/google/gson/internal/LinkedTreeMap$d;->aTX: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;->aTS:Ljava/util/Comparator;
+    sget-object v3, Lcom/google/gson/internal/LinkedTreeMap;->aTO: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;->aUc:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v3, p2, Lcom/google/gson/internal/LinkedTreeMap$d;->aTY: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;->aUc:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v3, p2, Lcom/google/gson/internal/LinkedTreeMap$d;->aTY: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;->aUa:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object v0, v1, Lcom/google/gson/internal/LinkedTreeMap$d;->aTW:Lcom/google/gson/internal/LinkedTreeMap$d;
 
     goto :goto_4
 
     :cond_a
-    iput-object v0, v1, Lcom/google/gson/internal/LinkedTreeMap$d;->aUb:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object v0, v1, Lcom/google/gson/internal/LinkedTreeMap$d;->aTX: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;->aUc:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object p2, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aTY:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iget-object v0, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aTW:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v0, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aTS:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iput-object v0, p2, Lcom/google/gson/internal/LinkedTreeMap$d;->aTW:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object v0, p2, Lcom/google/gson/internal/LinkedTreeMap$d;->aTS: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 p2, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aTS:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iget-object v0, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aUc:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v0, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aTY:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iput-object v0, p2, Lcom/google/gson/internal/LinkedTreeMap$d;->aUc:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object v0, p2, Lcom/google/gson/internal/LinkedTreeMap$d;->aTY:Lcom/google/gson/internal/LinkedTreeMap$d;
 
     :cond_0
-    iget-object p2, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aUa: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;->aUb:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v0, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aTX:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iget-object v1, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aTZ:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v1, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aTV: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;->aUb:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v0, p2, Lcom/google/gson/internal/LinkedTreeMap$d;->aTX: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;->aUb:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v0, p2, Lcom/google/gson/internal/LinkedTreeMap$d;->aTX: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;->aUa:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object p2, v0, Lcom/google/gson/internal/LinkedTreeMap$d;->aTW: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;->aUa:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object p2, v0, Lcom/google/gson/internal/LinkedTreeMap$d;->aTW: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;->aUa:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v0, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aTW: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;->aUa:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object v0, p2, Lcom/google/gson/internal/LinkedTreeMap$d;->aTW: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 p2, v0, Lcom/google/gson/internal/LinkedTreeMap$d;->aTV:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iput-object v3, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aUa:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object v3, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aTW: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;->aUb:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v0, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aTX: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;->aUb:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object v0, p2, Lcom/google/gson/internal/LinkedTreeMap$d;->aTX: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 p2, v0, Lcom/google/gson/internal/LinkedTreeMap$d;->aTV:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iput-object v3, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aUb:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object v3, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aTX: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;->aUa:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object v3, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aTW: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;->aUb:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object v3, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aTX: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;->aUc:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object v0, v0, Lcom/google/gson/internal/LinkedTreeMap$d;->aTY:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iput-object v0, v0, Lcom/google/gson/internal/LinkedTreeMap$d;->aTW:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object v0, v0, Lcom/google/gson/internal/LinkedTreeMap$d;->aTS: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 96ed4f27bf..26f469b026 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;->aUV:Ljava/lang/reflect/Type;
+    iget-object p2, p2, Lcom/google/gson/reflect/TypeToken;->aUR: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 0263ad3faa..a50dc5e7e8 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 aUl:Lcom/google/gson/r;
+.field public static final aUh:Lcom/google/gson/r;
 
 
 # instance fields
-.field private final aUm:Lcom/google/gson/TypeAdapter;
+.field private final aUi: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;->aUl:Lcom/google/gson/r;
+    sput-object v0, Lcom/google/gson/internal/a/a;->aUh: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;->aUm:Lcom/google/gson/TypeAdapter;
+    iput-object v0, p0, Lcom/google/gson/internal/a/a;->aUi: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;->aUm:Lcom/google/gson/TypeAdapter;
+    iget-object v1, p0, Lcom/google/gson/internal/a/a;->aUi: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;->aUm:Lcom/google/gson/TypeAdapter;
+    iget-object v3, p0, Lcom/google/gson/internal/a/a;->aUi: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 10fab533ae..94dff181d2 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 aWh:Ljava/util/TimeZone;
+.field private static final aWd:Ljava/util/TimeZone;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/gson/internal/a/a/a;->aWh:Ljava/util/TimeZone;
+    sput-object v0, Lcom/google/gson/internal/a/a/a;->aWd: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;->aWh:Ljava/util/TimeZone;
+    sget-object v10, Lcom/google/gson/internal/a/a/a;->aWd: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;->aWh:Ljava/util/TimeZone;
+    sget-object v10, Lcom/google/gson/internal/a/a/a;->aWd: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 e74fd31b7a..6d12db3ca4 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 aUn:Lcom/google/gson/TypeAdapter;
+.field private final aUj: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 aUo:Lcom/google/gson/internal/g;
+.field private final aUk: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;->aUn:Lcom/google/gson/TypeAdapter;
+    iput-object v0, p0, Lcom/google/gson/internal/a/b$a;->aUj:Lcom/google/gson/TypeAdapter;
 
-    iput-object p4, p0, Lcom/google/gson/internal/a/b$a;->aUo:Lcom/google/gson/internal/g;
+    iput-object p4, p0, Lcom/google/gson/internal/a/b$a;->aUk: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;->aUo:Lcom/google/gson/internal/g;
+    iget-object v0, p0, Lcom/google/gson/internal/a/b$a;->aUk:Lcom/google/gson/internal/g;
 
-    invoke-interface {v0}, Lcom/google/gson/internal/g;->AO()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/gson/internal/g;->AM()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;->aUn:Lcom/google/gson/TypeAdapter;
+    iget-object v1, p0, Lcom/google/gson/internal/a/b$a;->aUj: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;->aUn:Lcom/google/gson/TypeAdapter;
+    iget-object v1, p0, Lcom/google/gson/internal/a/b$a;->aUj: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 9b2ea42633..a2c6200897 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 aSZ:Lcom/google/gson/internal/c;
+.field private final aSV: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;->aSZ:Lcom/google/gson/internal/c;
+    iput-object p1, p0, Lcom/google/gson/internal/a/b;->aSV:Lcom/google/gson/internal/c;
 
     return-void
 .end method
@@ -46,9 +46,9 @@
         }
     .end annotation
 
-    iget-object v0, p2, Lcom/google/gson/reflect/TypeToken;->aUV:Ljava/lang/reflect/Type;
+    iget-object v0, p2, Lcom/google/gson/reflect/TypeToken;->aUR:Ljava/lang/reflect/Type;
 
-    iget-object v1, p2, Lcom/google/gson/reflect/TypeToken;->aWi:Ljava/lang/Class;
+    iget-object v1, p2, Lcom/google/gson/reflect/TypeToken;->aWe: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;->aSZ:Lcom/google/gson/internal/c;
+    iget-object v2, p0, Lcom/google/gson/internal/a/b;->aSV: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 b7423ed7ed..1ca0ce9fa5 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;->aWi:Ljava/lang/Class;
+    iget-object p1, p2, Lcom/google/gson/reflect/TypeToken;->aWe: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 8b9a8784ed..3e5d69804a 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 aUl:Lcom/google/gson/r;
+.field public static final aUh:Lcom/google/gson/r;
 
 
 # instance fields
-.field private final aSN:Ljava/text/DateFormat;
+.field private final aSJ:Ljava/text/DateFormat;
 
-.field private final aSO:Ljava/text/DateFormat;
+.field private final aSK: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;->aUl:Lcom/google/gson/r;
+    sput-object v0, Lcom/google/gson/internal/a/c;->aUh: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;->aSN:Ljava/text/DateFormat;
+    iput-object v0, p0, Lcom/google/gson/internal/a/c;->aSJ: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;->aSO:Ljava/text/DateFormat;
+    iput-object v0, p0, Lcom/google/gson/internal/a/c;->aSK: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;->aSN:Ljava/text/DateFormat;
+    iget-object v0, p0, Lcom/google/gson/internal/a/c;->aSJ: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;->aSO:Ljava/text/DateFormat;
+    iget-object v0, p0, Lcom/google/gson/internal/a/c;->aSK: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;->aSN:Ljava/text/DateFormat;
+    iget-object v0, p0, Lcom/google/gson/internal/a/c;->aSJ: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 26e922ea41..333e46da14 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 aSZ:Lcom/google/gson/internal/c;
+.field private final aSV: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;->aSZ:Lcom/google/gson/internal/c;
+    iput-object p1, p0, Lcom/google/gson/internal/a/d;->aSV: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;->AO()Ljava/lang/Object;
+    invoke-interface {p0}, Lcom/google/gson/internal/g;->AM()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;->AL()Z
+    invoke-interface {p3}, Lcom/google/gson/a/b;->AJ()Z
 
     move-result p1
 
@@ -201,7 +201,7 @@
         }
     .end annotation
 
-    iget-object v0, p2, Lcom/google/gson/reflect/TypeToken;->aWi:Ljava/lang/Class;
+    iget-object v0, p2, Lcom/google/gson/reflect/TypeToken;->aWe: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;->aSZ:Lcom/google/gson/internal/c;
+    iget-object v1, p0, Lcom/google/gson/internal/a/d;->aSV: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 f43146b708..4c401bf96d 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 aUp:Ljava/io/Reader;
+.field private static final aUl:Ljava/io/Reader;
 
-.field private static final aUq:Ljava/lang/Object;
+.field private static final aUm:Ljava/lang/Object;
 
 
 # instance fields
-.field private aUr:[Ljava/lang/Object;
+.field private aUn:[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;->aUp:Ljava/io/Reader;
+    sput-object v0, Lcom/google/gson/internal/a/e;->aUl: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;->aUq:Ljava/lang/Object;
+    sput-object v0, Lcom/google/gson/internal/a/e;->aUm: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;->aUp:Ljava/io/Reader;
+    sget-object v0, Lcom/google/gson/internal/a/e;->aUl: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;->aUr:[Ljava/lang/Object;
+    iput-object v1, p0, Lcom/google/gson/internal/a/e;->aUn:[Ljava/lang/Object;
 
     const/4 v1, 0x0
 
@@ -68,10 +68,10 @@
     return-void
 .end method
 
-.method private AU()Ljava/lang/Object;
+.method private AS()Ljava/lang/Object;
     .locals 4
 
-    iget-object v0, p0, Lcom/google/gson/internal/a/e;->aUr:[Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/gson/internal/a/e;->aUn:[Ljava/lang/Object;
 
     iget v1, p0, Lcom/google/gson/internal/a/e;->stackSize:I
 
@@ -114,10 +114,10 @@
 
 
 # virtual methods
-.method public final AT()Ljava/lang/Object;
+.method public final AR()Ljava/lang/Object;
     .locals 2
 
-    iget-object v0, p0, Lcom/google/gson/internal/a/e;->aUr:[Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/gson/internal/a/e;->aUn:[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;->aUr:[Ljava/lang/Object;
+    iget-object v1, p0, Lcom/google/gson/internal/a/e;->aUn:[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;->aUr:[Ljava/lang/Object;
+    iput-object v2, p0, Lcom/google/gson/internal/a/e;->aUn:[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;->aUr:[Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/gson/internal/a/e;->aUn:[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;->AT()Ljava/lang/Object;
+    invoke-virtual {p0}, Lcom/google/gson/internal/a/e;->AR()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;->AT()Ljava/lang/Object;
+    invoke-virtual {p0}, Lcom/google/gson/internal/a/e;->AR()Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Lcom/google/gson/JsonObject;
 
-    iget-object v0, v0, Lcom/google/gson/JsonObject;->aTu:Lcom/google/gson/internal/LinkedTreeMap;
+    iget-object v0, v0, Lcom/google/gson/JsonObject;->aTq: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;->aUq:Ljava/lang/Object;
+    sget-object v2, Lcom/google/gson/internal/a/e;->aUm:Ljava/lang/Object;
 
     const/4 v3, 0x0
 
     aput-object v2, v1, v3
 
-    iput-object v1, p0, Lcom/google/gson/internal/a/e;->aUr:[Ljava/lang/Object;
+    iput-object v1, p0, Lcom/google/gson/internal/a/e;->aUn:[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;->AU()Ljava/lang/Object;
+    invoke-direct {p0}, Lcom/google/gson/internal/a/e;->AS()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;->AS()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;->AU()Ljava/lang/Object;
+    invoke-direct {p0}, Lcom/google/gson/internal/a/e;->AS()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;->AS()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;->aUr:[Ljava/lang/Object;
+    iget-object v2, p0, Lcom/google/gson/internal/a/e;->aUn:[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;->AU()Ljava/lang/Object;
+    invoke-direct {p0}, Lcom/google/gson/internal/a/e;->AS()Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Lcom/google/gson/m;
 
-    invoke-virtual {v0}, Lcom/google/gson/m;->AG()Z
+    invoke-virtual {v0}, Lcom/google/gson/m;->AE()Z
 
     move-result v0
 
@@ -620,13 +620,13 @@
 
     :cond_1
     :goto_0
-    invoke-virtual {p0}, Lcom/google/gson/internal/a/e;->AT()Ljava/lang/Object;
+    invoke-virtual {p0}, Lcom/google/gson/internal/a/e;->AR()Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Lcom/google/gson/m;
 
-    invoke-virtual {v0}, Lcom/google/gson/m;->AD()D
+    invoke-virtual {v0}, Lcom/google/gson/m;->AB()D
 
     move-result-wide v0
 
@@ -669,7 +669,7 @@
 
     :cond_3
     :goto_1
-    invoke-direct {p0}, Lcom/google/gson/internal/a/e;->AU()Ljava/lang/Object;
+    invoke-direct {p0}, Lcom/google/gson/internal/a/e;->AS()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;->AT()Ljava/lang/Object;
+    invoke-virtual {p0}, Lcom/google/gson/internal/a/e;->AR()Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Lcom/google/gson/m;
 
-    invoke-virtual {v0}, Lcom/google/gson/m;->AF()I
+    invoke-virtual {v0}, Lcom/google/gson/m;->AD()I
 
     move-result v0
 
-    invoke-direct {p0}, Lcom/google/gson/internal/a/e;->AU()Ljava/lang/Object;
+    invoke-direct {p0}, Lcom/google/gson/internal/a/e;->AS()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;->AT()Ljava/lang/Object;
+    invoke-virtual {p0}, Lcom/google/gson/internal/a/e;->AR()Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Lcom/google/gson/m;
 
-    invoke-virtual {v0}, Lcom/google/gson/m;->AE()J
+    invoke-virtual {v0}, Lcom/google/gson/m;->AC()J
 
     move-result-wide v0
 
-    invoke-direct {p0}, Lcom/google/gson/internal/a/e;->AU()Ljava/lang/Object;
+    invoke-direct {p0}, Lcom/google/gson/internal/a/e;->AS()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;->AT()Ljava/lang/Object;
+    invoke-virtual {p0}, Lcom/google/gson/internal/a/e;->AR()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;->AU()Ljava/lang/Object;
+    invoke-direct {p0}, Lcom/google/gson/internal/a/e;->AS()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;->AU()Ljava/lang/Object;
+    invoke-direct {p0}, Lcom/google/gson/internal/a/e;->AS()Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Lcom/google/gson/m;
 
-    invoke-virtual {v0}, Lcom/google/gson/m;->AC()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/gson/m;->AA()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;->AT()Ljava/lang/Object;
+    invoke-virtual {p0}, Lcom/google/gson/internal/a/e;->AR()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;->aUr:[Ljava/lang/Object;
+    iget-object v1, p0, Lcom/google/gson/internal/a/e;->aUn:[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;->aUq:Ljava/lang/Object;
+    sget-object v1, Lcom/google/gson/internal/a/e;->aUm: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;->AU()Ljava/lang/Object;
+    invoke-direct {p0}, Lcom/google/gson/internal/a/e;->AS()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 8bbf2d7d81..7a385c8a42 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 aUs:Ljava/io/Writer;
+.field private static final aUo:Ljava/io/Writer;
 
-.field private static final aUt:Lcom/google/gson/m;
+.field private static final aUp:Lcom/google/gson/m;
 
 
 # instance fields
-.field public final aUu:Ljava/util/List;
+.field public final aUq:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -20,9 +20,9 @@
     .end annotation
 .end field
 
-.field private aUv:Ljava/lang/String;
+.field private aUr:Ljava/lang/String;
 
-.field public aUw:Lcom/google/gson/JsonElement;
+.field public aUs: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;->aUs:Ljava/io/Writer;
+    sput-object v0, Lcom/google/gson/internal/a/f;->aUo: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;->aUt:Lcom/google/gson/m;
+    sput-object v0, Lcom/google/gson/internal/a/f;->aUp: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;->aUs:Ljava/io/Writer;
+    sget-object v0, Lcom/google/gson/internal/a/f;->aUo: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;->aUu:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/gson/internal/a/f;->aUq:Ljava/util/List;
 
-    sget-object v0, Lcom/google/gson/k;->aTt:Lcom/google/gson/k;
+    sget-object v0, Lcom/google/gson/k;->aTp:Lcom/google/gson/k;
 
-    iput-object v0, p0, Lcom/google/gson/internal/a/f;->aUw:Lcom/google/gson/JsonElement;
+    iput-object v0, p0, Lcom/google/gson/internal/a/f;->aUs:Lcom/google/gson/JsonElement;
 
     return-void
 .end method
 
-.method private AV()Lcom/google/gson/JsonElement;
+.method private AT()Lcom/google/gson/JsonElement;
     .locals 2
 
-    iget-object v0, p0, Lcom/google/gson/internal/a/f;->aUu:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/gson/internal/a/f;->aUq: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;->aUv:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/gson/internal/a/f;->aUr: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;->AV()Lcom/google/gson/JsonElement;
+    invoke-direct {p0}, Lcom/google/gson/internal/a/f;->AT()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;->aUv:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/gson/internal/a/f;->aUr: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;->aUv:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/gson/internal/a/f;->aUr:Ljava/lang/String;
 
     return-void
 
     :cond_2
-    iget-object v0, p0, Lcom/google/gson/internal/a/f;->aUu:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/gson/internal/a/f;->aUq: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;->aUw:Lcom/google/gson/JsonElement;
+    iput-object p1, p0, Lcom/google/gson/internal/a/f;->aUs:Lcom/google/gson/JsonElement;
 
     return-void
 
     :cond_3
-    invoke-direct {p0}, Lcom/google/gson/internal/a/f;->AV()Lcom/google/gson/JsonElement;
+    invoke-direct {p0}, Lcom/google/gson/internal/a/f;->AT()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;->aUu:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/gson/internal/a/f;->aUq: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;->aUu:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/gson/internal/a/f;->aUq: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;->aUu:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/gson/internal/a/f;->aUq: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;->aUu:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/gson/internal/a/f;->aUq:Ljava/util/List;
 
-    sget-object v1, Lcom/google/gson/internal/a/f;->aUt:Lcom/google/gson/m;
+    sget-object v1, Lcom/google/gson/internal/a/f;->aUp: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;->aUu:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/gson/internal/a/f;->aUq: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;->aUv:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/gson/internal/a/f;->aUr:Ljava/lang/String;
 
     if-nez v0, :cond_1
 
-    invoke-direct {p0}, Lcom/google/gson/internal/a/f;->AV()Lcom/google/gson/JsonElement;
+    invoke-direct {p0}, Lcom/google/gson/internal/a/f;->AT()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;->aUu:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/gson/internal/a/f;->aUq: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;->aUu:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/gson/internal/a/f;->aUq: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;->aUv:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/gson/internal/a/f;->aUr:Ljava/lang/String;
 
     if-nez v0, :cond_1
 
-    invoke-direct {p0}, Lcom/google/gson/internal/a/f;->AV()Lcom/google/gson/JsonElement;
+    invoke-direct {p0}, Lcom/google/gson/internal/a/f;->AT()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;->aUu:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/gson/internal/a/f;->aUq: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;->aUu:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/gson/internal/a/f;->aUq: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;->aUv:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/gson/internal/a/f;->aUr:Ljava/lang/String;
 
     if-nez v0, :cond_1
 
-    invoke-direct {p0}, Lcom/google/gson/internal/a/f;->AV()Lcom/google/gson/JsonElement;
+    invoke-direct {p0}, Lcom/google/gson/internal/a/f;->AT()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;->aUv:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/gson/internal/a/f;->aUr:Ljava/lang/String;
 
     return-object p0
 
@@ -411,7 +411,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/google/gson/k;->aTt:Lcom/google/gson/k;
+    sget-object v0, Lcom/google/gson/k;->aTp: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 f00fa8d37b..bc498b1301 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 aUo:Lcom/google/gson/internal/g;
+.field private final aUk: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 aUx:Lcom/google/gson/TypeAdapter;
+.field private final aUt: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 aUy:Lcom/google/gson/TypeAdapter;
+.field private final aUu: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 aUz:Lcom/google/gson/internal/a/g;
+.field final synthetic aUv: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;->aUz:Lcom/google/gson/internal/a/g;
+    iput-object p1, p0, Lcom/google/gson/internal/a/g$a;->aUv: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;->aUx:Lcom/google/gson/TypeAdapter;
+    iput-object p1, p0, Lcom/google/gson/internal/a/g$a;->aUt: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;->aUy:Lcom/google/gson/TypeAdapter;
+    iput-object p1, p0, Lcom/google/gson/internal/a/g$a;->aUu:Lcom/google/gson/TypeAdapter;
 
-    iput-object p7, p0, Lcom/google/gson/internal/a/g$a;->aUo:Lcom/google/gson/internal/g;
+    iput-object p7, p0, Lcom/google/gson/internal/a/g$a;->aUk: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;->aUo:Lcom/google/gson/internal/g;
+    iget-object v1, p0, Lcom/google/gson/internal/a/g$a;->aUk:Lcom/google/gson/internal/g;
 
-    invoke-interface {v1}, Lcom/google/gson/internal/g;->AO()Ljava/lang/Object;
+    invoke-interface {v1}, Lcom/google/gson/internal/g;->AM()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;->aUx:Lcom/google/gson/TypeAdapter;
+    iget-object v0, p0, Lcom/google/gson/internal/a/g$a;->aUt: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;->aUy:Lcom/google/gson/TypeAdapter;
+    iget-object v2, p0, Lcom/google/gson/internal/a/g$a;->aUu: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;->aUx:Lcom/google/gson/TypeAdapter;
+    iget-object v0, p0, Lcom/google/gson/internal/a/g$a;->aUt: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;->aUy:Lcom/google/gson/TypeAdapter;
+    iget-object v2, p0, Lcom/google/gson/internal/a/g$a;->aUu: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;->aUz:Lcom/google/gson/internal/a/g;
+    iget-object v0, p0, Lcom/google/gson/internal/a/g$a;->aUv:Lcom/google/gson/internal/a/g;
 
-    iget-boolean v0, v0, Lcom/google/gson/internal/a/g;->aTp:Z
+    iget-boolean v0, v0, Lcom/google/gson/internal/a/g;->aTl: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;->aUy:Lcom/google/gson/TypeAdapter;
+    iget-object v1, p0, Lcom/google/gson/internal/a/g$a;->aUu: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;->aUx:Lcom/google/gson/TypeAdapter;
+    iget-object v5, p0, Lcom/google/gson/internal/a/g$a;->aUt: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;->aUy:Lcom/google/gson/TypeAdapter;
+    iget-object v3, p0, Lcom/google/gson/internal/a/g$a;->aUu: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;->AI()Lcom/google/gson/m;
+    invoke-virtual {v3}, Lcom/google/gson/JsonElement;->AG()Lcom/google/gson/m;
 
     move-result-object v3
 
@@ -475,7 +475,7 @@
 
     if-eqz v4, :cond_8
 
-    invoke-virtual {v3}, Lcom/google/gson/m;->AB()Ljava/lang/Number;
+    invoke-virtual {v3}, Lcom/google/gson/m;->Az()Ljava/lang/Number;
 
     move-result-object v3
 
@@ -492,7 +492,7 @@
 
     if-eqz v4, :cond_9
 
-    invoke-virtual {v3}, Lcom/google/gson/m;->AG()Z
+    invoke-virtual {v3}, Lcom/google/gson/m;->AE()Z
 
     move-result v3
 
@@ -509,7 +509,7 @@
 
     if-eqz v4, :cond_a
 
-    invoke-virtual {v3}, Lcom/google/gson/m;->AC()Ljava/lang/String;
+    invoke-virtual {v3}, Lcom/google/gson/m;->AA()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;->aUy:Lcom/google/gson/TypeAdapter;
+    iget-object v3, p0, Lcom/google/gson/internal/a/g$a;->aUu: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 8f1b9b0f5d..d9eedf5427 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 aSZ:Lcom/google/gson/internal/c;
+.field private final aSV:Lcom/google/gson/internal/c;
 
-.field final aTp:Z
+.field final aTl: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;->aSZ:Lcom/google/gson/internal/c;
+    iput-object p1, p0, Lcom/google/gson/internal/a/g;->aSV:Lcom/google/gson/internal/c;
 
-    iput-boolean p2, p0, Lcom/google/gson/internal/a/g;->aTp:Z
+    iput-boolean p2, p0, Lcom/google/gson/internal/a/g;->aTl:Z
 
     return-void
 .end method
@@ -50,9 +50,9 @@
         }
     .end annotation
 
-    iget-object v0, p2, Lcom/google/gson/reflect/TypeToken;->aUV:Ljava/lang/reflect/Type;
+    iget-object v0, p2, Lcom/google/gson/reflect/TypeToken;->aUR:Ljava/lang/reflect/Type;
 
-    iget-object v1, p2, Lcom/google/gson/reflect/TypeToken;->aWi:Ljava/lang/Class;
+    iget-object v1, p2, Lcom/google/gson/reflect/TypeToken;->aWe: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;->aVb:Lcom/google/gson/TypeAdapter;
+    sget-object v2, Lcom/google/gson/internal/a/n;->aUX: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;->aSZ:Lcom/google/gson/internal/c;
+    iget-object v3, p0, Lcom/google/gson/internal/a/g;->aSV: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 df2a479fd7..e53e8ad9a7 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;->aWi:Ljava/lang/Class;
+    iget-object p2, p2, Lcom/google/gson/reflect/TypeToken;->aWe: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 e179698387..c0b12414dd 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 aUl:Lcom/google/gson/r;
+.field public static final aUh: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;->aUl:Lcom/google/gson/r;
+    sput-object v0, Lcom/google/gson/internal/a/h;->aUh: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 20f740486e..80b18085bb 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 aUA:Ljava/lang/reflect/Field;
+.field final synthetic aUA:Lcom/google/gson/reflect/TypeToken;
 
 .field final synthetic aUB:Z
 
-.field final synthetic aUC:Lcom/google/gson/TypeAdapter;
+.field final synthetic aUC:Lcom/google/gson/internal/a/i;
 
-.field final synthetic aUD:Lcom/google/gson/Gson;
+.field final synthetic aUw:Ljava/lang/reflect/Field;
 
-.field final synthetic aUE:Lcom/google/gson/reflect/TypeToken;
+.field final synthetic aUx:Z
 
-.field final synthetic aUF:Z
+.field final synthetic aUy:Lcom/google/gson/TypeAdapter;
 
-.field final synthetic aUG:Lcom/google/gson/internal/a/i;
+.field final synthetic aUz:Lcom/google/gson/Gson;
 
 
 # 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;->aUG:Lcom/google/gson/internal/a/i;
+    iput-object p1, p0, Lcom/google/gson/internal/a/i$1;->aUC:Lcom/google/gson/internal/a/i;
 
-    iput-object p5, p0, Lcom/google/gson/internal/a/i$1;->aUA:Ljava/lang/reflect/Field;
+    iput-object p5, p0, Lcom/google/gson/internal/a/i$1;->aUw:Ljava/lang/reflect/Field;
 
-    iput-boolean p6, p0, Lcom/google/gson/internal/a/i$1;->aUB:Z
+    iput-boolean p6, p0, Lcom/google/gson/internal/a/i$1;->aUx:Z
 
-    iput-object p7, p0, Lcom/google/gson/internal/a/i$1;->aUC:Lcom/google/gson/TypeAdapter;
+    iput-object p7, p0, Lcom/google/gson/internal/a/i$1;->aUy:Lcom/google/gson/TypeAdapter;
 
-    iput-object p8, p0, Lcom/google/gson/internal/a/i$1;->aUD:Lcom/google/gson/Gson;
+    iput-object p8, p0, Lcom/google/gson/internal/a/i$1;->aUz:Lcom/google/gson/Gson;
 
-    iput-object p9, p0, Lcom/google/gson/internal/a/i$1;->aUE:Lcom/google/gson/reflect/TypeToken;
+    iput-object p9, p0, Lcom/google/gson/internal/a/i$1;->aUA:Lcom/google/gson/reflect/TypeToken;
 
-    iput-boolean p10, p0, Lcom/google/gson/internal/a/i$1;->aUF:Z
+    iput-boolean p10, p0, Lcom/google/gson/internal/a/i$1;->aUB: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;->aUC:Lcom/google/gson/TypeAdapter;
+    iget-object v0, p0, Lcom/google/gson/internal/a/i$1;->aUy: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;->aUF:Z
+    iget-boolean v0, p0, Lcom/google/gson/internal/a/i$1;->aUB:Z
 
     if-nez v0, :cond_1
 
     :cond_0
-    iget-object v0, p0, Lcom/google/gson/internal/a/i$1;->aUA:Ljava/lang/reflect/Field;
+    iget-object v0, p0, Lcom/google/gson/internal/a/i$1;->aUw: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;->aUI:Z
+    iget-boolean v0, p0, Lcom/google/gson/internal/a/i$1;->aUE:Z
 
     const/4 v1, 0x0
 
@@ -103,7 +103,7 @@
     return v1
 
     :cond_0
-    iget-object v0, p0, Lcom/google/gson/internal/a/i$1;->aUA:Ljava/lang/reflect/Field;
+    iget-object v0, p0, Lcom/google/gson/internal/a/i$1;->aUw: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;->aUA:Ljava/lang/reflect/Field;
+    iget-object v0, p0, Lcom/google/gson/internal/a/i$1;->aUw: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;->aUB:Z
+    iget-boolean v0, p0, Lcom/google/gson/internal/a/i$1;->aUx:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/gson/internal/a/i$1;->aUC:Lcom/google/gson/TypeAdapter;
+    iget-object v0, p0, Lcom/google/gson/internal/a/i$1;->aUy: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;->aUD:Lcom/google/gson/Gson;
+    iget-object v1, p0, Lcom/google/gson/internal/a/i$1;->aUz:Lcom/google/gson/Gson;
 
-    iget-object v2, p0, Lcom/google/gson/internal/a/i$1;->aUC:Lcom/google/gson/TypeAdapter;
+    iget-object v2, p0, Lcom/google/gson/internal/a/i$1;->aUy:Lcom/google/gson/TypeAdapter;
 
-    iget-object v3, p0, Lcom/google/gson/internal/a/i$1;->aUE:Lcom/google/gson/reflect/TypeToken;
+    iget-object v3, p0, Lcom/google/gson/internal/a/i$1;->aUA:Lcom/google/gson/reflect/TypeToken;
 
-    iget-object v3, v3, Lcom/google/gson/reflect/TypeToken;->aUV:Ljava/lang/reflect/Type;
+    iget-object v3, v3, Lcom/google/gson/reflect/TypeToken;->aUR: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 74f3961ecd..ee73a481a4 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,7 +25,7 @@
 
 
 # instance fields
-.field private final aUH:Ljava/util/Map;
+.field private final aUD:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -36,7 +36,7 @@
     .end annotation
 .end field
 
-.field private final aUo:Lcom/google/gson/internal/g;
+.field private final aUk:Lcom/google/gson/internal/g;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/internal/g<",
@@ -63,9 +63,9 @@
 
     invoke-direct {p0}, Lcom/google/gson/TypeAdapter;-><init>()V
 
-    iput-object p1, p0, Lcom/google/gson/internal/a/i$a;->aUo:Lcom/google/gson/internal/g;
+    iput-object p1, p0, Lcom/google/gson/internal/a/i$a;->aUk:Lcom/google/gson/internal/g;
 
-    iput-object p2, p0, Lcom/google/gson/internal/a/i$a;->aUH:Ljava/util/Map;
+    iput-object p2, p0, Lcom/google/gson/internal/a/i$a;->aUD: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;->aUo:Lcom/google/gson/internal/g;
+    iget-object v0, p0, Lcom/google/gson/internal/a/i$a;->aUk:Lcom/google/gson/internal/g;
 
-    invoke-interface {v0}, Lcom/google/gson/internal/g;->AO()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/gson/internal/g;->AM()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;->aUH:Ljava/util/Map;
+    iget-object v2, p0, Lcom/google/gson/internal/a/i$a;->aUD: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;->aUJ:Z
+    iget-boolean v2, v1, Lcom/google/gson/internal/a/i$b;->aUF: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;->aUH:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/gson/internal/a/i$a;->aUD: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 5c39a0236f..331c45435a 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 aUI:Z
+.field final aUE:Z
 
-.field final aUJ:Z
+.field final aUF: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;->aUI:Z
+    iput-boolean p2, p0, Lcom/google/gson/internal/a/i$b;->aUE:Z
 
-    iput-boolean p3, p0, Lcom/google/gson/internal/a/i$b;->aUJ:Z
+    iput-boolean p3, p0, Lcom/google/gson/internal/a/i$b;->aUF: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 aa3a602ce2..01f2f96639 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 aSZ:Lcom/google/gson/internal/c;
+.field private final aSV:Lcom/google/gson/internal/c;
 
-.field private final aTa:Lcom/google/gson/internal/d;
+.field private final aSW:Lcom/google/gson/internal/d;
 
-.field private final aTe:Lcom/google/gson/internal/a/d;
+.field private final aTa:Lcom/google/gson/internal/a/d;
 
-.field private final aTj:Lcom/google/gson/e;
+.field private final aTf: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;->aSZ:Lcom/google/gson/internal/c;
+    iput-object p1, p0, Lcom/google/gson/internal/a/i;->aSV:Lcom/google/gson/internal/c;
 
-    iput-object p2, p0, Lcom/google/gson/internal/a/i;->aTj:Lcom/google/gson/e;
+    iput-object p2, p0, Lcom/google/gson/internal/a/i;->aTf:Lcom/google/gson/e;
 
-    iput-object p3, p0, Lcom/google/gson/internal/a/i;->aTa:Lcom/google/gson/internal/d;
+    iput-object p3, p0, Lcom/google/gson/internal/a/i;->aSW:Lcom/google/gson/internal/d;
 
-    iput-object p4, p0, Lcom/google/gson/internal/a/i;->aTe:Lcom/google/gson/internal/a/d;
+    iput-object p4, p0, Lcom/google/gson/internal/a/i;->aTa: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;->aUV:Ljava/lang/reflect/Type;
+    iget-object v14, v0, Lcom/google/gson/reflect/TypeToken;->aUR: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;->aUV:Ljava/lang/reflect/Type;
+    iget-object v1, v10, Lcom/google/gson/reflect/TypeToken;->aUR: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;->aWi:Ljava/lang/Class;
+    iget-object v4, v9, Lcom/google/gson/reflect/TypeToken;->aWe: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;->aSZ:Lcom/google/gson/internal/c;
+    iget-object v7, v11, Lcom/google/gson/internal/a/i;->aSV: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;->aUV:Ljava/lang/reflect/Type;
+    iget-object v0, v0, Lcom/google/gson/reflect/TypeToken;->aUR: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;->aWi:Ljava/lang/Class;
+    iget-object v15, v10, Lcom/google/gson/reflect/TypeToken;->aWe: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;->aTa:Lcom/google/gson/internal/d;
+    iget-object v0, p0, Lcom/google/gson/internal/a/i;->aSW: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;->aTJ:I
+    iget v1, v0, Lcom/google/gson/internal/d;->aTF: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;->aTI:D
+    iget-wide v4, v0, Lcom/google/gson/internal/d;->aTE: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;->aTL:Z
+    iget-boolean v1, v0, Lcom/google/gson/internal/d;->aTH:Z
 
     if-eqz v1, :cond_5
 
@@ -512,7 +512,7 @@
 
     if-eqz p2, :cond_4
 
-    invoke-interface {v1}, Lcom/google/gson/a/a;->AJ()Z
+    invoke-interface {v1}, Lcom/google/gson/a/a;->AH()Z
 
     move-result v1
 
@@ -521,7 +521,7 @@
     goto :goto_1
 
     :cond_4
-    invoke-interface {v1}, Lcom/google/gson/a/a;->AK()Z
+    invoke-interface {v1}, Lcom/google/gson/a/a;->AI()Z
 
     move-result v1
 
@@ -531,7 +531,7 @@
     goto :goto_0
 
     :cond_5
-    iget-boolean v1, v0, Lcom/google/gson/internal/d;->aTK:Z
+    iget-boolean v1, v0, Lcom/google/gson/internal/d;->aTG: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;->aTM:Ljava/util/List;
+    iget-object p2, v0, Lcom/google/gson/internal/d;->aTI:Ljava/util/List;
 
     goto :goto_2
 
     :cond_8
-    iget-object p2, v0, Lcom/google/gson/internal/d;->aTN:Ljava/util/List;
+    iget-object p2, v0, Lcom/google/gson/internal/d;->aTJ: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;->Ax()Z
+    invoke-interface {p2}, Lcom/google/gson/b;->Av()Z
 
     move-result p2
 
@@ -641,7 +641,7 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/gson/internal/a/i;->aTj:Lcom/google/gson/e;
+    iget-object v0, p0, Lcom/google/gson/internal/a/i;->aTf: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;->AM()[Ljava/lang/String;
+    invoke-interface {v0}, Lcom/google/gson/a/c;->AK()[Ljava/lang/String;
 
     move-result-object v0
 
@@ -719,7 +719,7 @@
         }
     .end annotation
 
-    iget-object v0, p2, Lcom/google/gson/reflect/TypeToken;->aWi:Ljava/lang/Class;
+    iget-object v0, p2, Lcom/google/gson/reflect/TypeToken;->aWe: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;->aSZ:Lcom/google/gson/internal/c;
+    iget-object v1, p0, Lcom/google/gson/internal/a/i;->aSV: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 ffa5ebf78b..3bce89d80c 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;->aWi:Ljava/lang/Class;
+    iget-object p1, p2, Lcom/google/gson/reflect/TypeToken;->aWe: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 60d94a733f..b9ed8c00b5 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 aUl:Lcom/google/gson/r;
+.field public static final aUh:Lcom/google/gson/r;
 
 
 # instance fields
-.field private final aUK:Ljava/text/DateFormat;
+.field private final aUG: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;->aUl:Lcom/google/gson/r;
+    sput-object v0, Lcom/google/gson/internal/a/j;->aUh: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;->aUK:Ljava/text/DateFormat;
+    iput-object v0, p0, Lcom/google/gson/internal/a/j;->aUG: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;->aUK:Ljava/text/DateFormat;
+    iget-object v0, p0, Lcom/google/gson/internal/a/j;->aUG: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;->aUK:Ljava/text/DateFormat;
+    iget-object v0, p0, Lcom/google/gson/internal/a/j;->aUG: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 7ddf90c679..2b0aeb0d91 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;->aWi:Ljava/lang/Class;
+    iget-object p1, p2, Lcom/google/gson/reflect/TypeToken;->aWe: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 06fff93224..e5db79a8d2 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 aUl:Lcom/google/gson/r;
+.field public static final aUh:Lcom/google/gson/r;
 
 
 # instance fields
-.field private final aUK:Ljava/text/DateFormat;
+.field private final aUG: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;->aUl:Lcom/google/gson/r;
+    sput-object v0, Lcom/google/gson/internal/a/k;->aUh: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;->aUK:Ljava/text/DateFormat;
+    iput-object v0, p0, Lcom/google/gson/internal/a/k;->aUG: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;->aUK:Ljava/text/DateFormat;
+    iget-object v0, p0, Lcom/google/gson/internal/a/k;->aUG: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;->aUK:Ljava/text/DateFormat;
+    iget-object v0, p0, Lcom/google/gson/internal/a/k;->aUG: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 4d754ac7ef..e2cc3e1328 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 aUQ:Lcom/google/gson/internal/a/l;
+.field final synthetic aUM: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;->aUQ:Lcom/google/gson/internal/a/l;
+    iput-object p1, p0, Lcom/google/gson/internal/a/l$a;->aUM: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 eb7ce84a27..99864c3690 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 aUL:Lcom/google/gson/o;
+.field private final aUH: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 aUM:Lcom/google/gson/i;
+.field private final aUI: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 aUR: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<",
@@ -45,9 +45,9 @@
     .end annotation
 .end field
 
-.field private final aUS:Z
+.field private final aUO:Z
 
-.field private final aUT:Ljava/lang/Class;
+.field private final aUP: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;->aUL:Lcom/google/gson/o;
+    iput-object v0, p0, Lcom/google/gson/internal/a/l$b;->aUH: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;->aUM:Lcom/google/gson/i;
+    iput-object p1, p0, Lcom/google/gson/internal/a/l$b;->aUI:Lcom/google/gson/i;
 
-    iget-object p1, p0, Lcom/google/gson/internal/a/l$b;->aUL:Lcom/google/gson/o;
+    iget-object p1, p0, Lcom/google/gson/internal/a/l$b;->aUH:Lcom/google/gson/o;
 
     if-nez p1, :cond_3
 
-    iget-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;->aUI: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;->aUR:Lcom/google/gson/reflect/TypeToken;
+    iput-object p2, p0, Lcom/google/gson/internal/a/l$b;->aUN:Lcom/google/gson/reflect/TypeToken;
 
-    iput-boolean p3, p0, Lcom/google/gson/internal/a/l$b;->aUS:Z
+    iput-boolean p3, p0, Lcom/google/gson/internal/a/l$b;->aUO:Z
 
-    iput-object v1, p0, Lcom/google/gson/internal/a/l$b;->aUT:Ljava/lang/Class;
+    iput-object v1, p0, Lcom/google/gson/internal/a/l$b;->aUP:Ljava/lang/Class;
 
     return-void
 .end method
@@ -151,7 +151,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/gson/internal/a/l$b;->aUR:Lcom/google/gson/reflect/TypeToken;
+    iget-object v0, p0, Lcom/google/gson/internal/a/l$b;->aUN: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;->aUS:Z
+    iget-boolean v0, p0, Lcom/google/gson/internal/a/l$b;->aUO:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/gson/internal/a/l$b;->aUR:Lcom/google/gson/reflect/TypeToken;
+    iget-object v0, p0, Lcom/google/gson/internal/a/l$b;->aUN:Lcom/google/gson/reflect/TypeToken;
 
-    iget-object v0, v0, Lcom/google/gson/reflect/TypeToken;->aUV:Ljava/lang/reflect/Type;
+    iget-object v0, v0, Lcom/google/gson/reflect/TypeToken;->aUR:Ljava/lang/reflect/Type;
 
-    iget-object v1, p2, Lcom/google/gson/reflect/TypeToken;->aWi:Ljava/lang/Class;
+    iget-object v1, p2, Lcom/google/gson/reflect/TypeToken;->aWe: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;->aUT:Ljava/lang/Class;
+    iget-object v0, p0, Lcom/google/gson/internal/a/l$b;->aUP:Ljava/lang/Class;
 
-    iget-object v1, p2, Lcom/google/gson/reflect/TypeToken;->aWi:Ljava/lang/Class;
+    iget-object v1, p2, Lcom/google/gson/reflect/TypeToken;->aWe: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;->aUL:Lcom/google/gson/o;
+    iget-object v2, p0, Lcom/google/gson/internal/a/l$b;->aUH:Lcom/google/gson/o;
 
-    iget-object v3, p0, Lcom/google/gson/internal/a/l$b;->aUM:Lcom/google/gson/i;
+    iget-object v3, p0, Lcom/google/gson/internal/a/l$b;->aUI: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 9b4dd34386..d3a9400719 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 aTh:Lcom/google/gson/TypeAdapter;
+.field private aTd: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 aUL:Lcom/google/gson/o;
+.field private final aUH: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 aUM:Lcom/google/gson/i;
+.field private final aUI: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 aUN:Lcom/google/gson/reflect/TypeToken;
+.field private final aUJ: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 aUO:Lcom/google/gson/r;
+.field private final aUK:Lcom/google/gson/r;
 
-.field private final aUP:Lcom/google/gson/internal/a/l$a;
+.field private final aUL: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;->aUP:Lcom/google/gson/internal/a/l$a;
+    iput-object v0, p0, Lcom/google/gson/internal/a/l;->aUL:Lcom/google/gson/internal/a/l$a;
 
-    iput-object p1, p0, Lcom/google/gson/internal/a/l;->aUL:Lcom/google/gson/o;
+    iput-object p1, p0, Lcom/google/gson/internal/a/l;->aUH:Lcom/google/gson/o;
 
-    iput-object p2, p0, Lcom/google/gson/internal/a/l;->aUM:Lcom/google/gson/i;
+    iput-object p2, p0, Lcom/google/gson/internal/a/l;->aUI: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;->aUN:Lcom/google/gson/reflect/TypeToken;
+    iput-object p4, p0, Lcom/google/gson/internal/a/l;->aUJ:Lcom/google/gson/reflect/TypeToken;
 
-    iput-object p5, p0, Lcom/google/gson/internal/a/l;->aUO:Lcom/google/gson/r;
+    iput-object p5, p0, Lcom/google/gson/internal/a/l;->aUK:Lcom/google/gson/r;
 
     return-void
 .end method
 
-.method private AQ()Lcom/google/gson/TypeAdapter;
+.method private AO()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;->aTh:Lcom/google/gson/TypeAdapter;
+    iget-object v0, p0, Lcom/google/gson/internal/a/l;->aTd: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;->aUO:Lcom/google/gson/r;
+    iget-object v1, p0, Lcom/google/gson/internal/a/l;->aUK:Lcom/google/gson/r;
 
-    iget-object v2, p0, Lcom/google/gson/internal/a/l;->aUN:Lcom/google/gson/reflect/TypeToken;
+    iget-object v2, p0, Lcom/google/gson/internal/a/l;->aUJ: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;->aTh:Lcom/google/gson/TypeAdapter;
+    iput-object v0, p0, Lcom/google/gson/internal/a/l;->aTd:Lcom/google/gson/TypeAdapter;
 
     return-object v0
 .end method
@@ -159,9 +159,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/gson/reflect/TypeToken;->aUV:Ljava/lang/reflect/Type;
+    iget-object v0, p0, Lcom/google/gson/reflect/TypeToken;->aUR:Ljava/lang/reflect/Type;
 
-    iget-object v1, p0, Lcom/google/gson/reflect/TypeToken;->aWi:Ljava/lang/Class;
+    iget-object v1, p0, Lcom/google/gson/reflect/TypeToken;->aWe: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;->aUM:Lcom/google/gson/i;
+    iget-object v0, p0, Lcom/google/gson/internal/a/l;->aUI:Lcom/google/gson/i;
 
     if-nez v0, :cond_0
 
-    invoke-direct {p0}, Lcom/google/gson/internal/a/l;->AQ()Lcom/google/gson/TypeAdapter;
+    invoke-direct {p0}, Lcom/google/gson/internal/a/l;->AO()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;->aUM:Lcom/google/gson/i;
+    iget-object p1, p0, Lcom/google/gson/internal/a/l;->aUI:Lcom/google/gson/i;
 
-    invoke-interface {p1}, Lcom/google/gson/i;->AH()Ljava/lang/Object;
+    invoke-interface {p1}, Lcom/google/gson/i;->AF()Ljava/lang/Object;
 
     move-result-object p1
 
@@ -251,11 +251,11 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/gson/internal/a/l;->aUL:Lcom/google/gson/o;
+    iget-object v0, p0, Lcom/google/gson/internal/a/l;->aUH:Lcom/google/gson/o;
 
     if-nez v0, :cond_0
 
-    invoke-direct {p0}, Lcom/google/gson/internal/a/l;->AQ()Lcom/google/gson/TypeAdapter;
+    invoke-direct {p0}, Lcom/google/gson/internal/a/l;->AO()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;->aUN:Lcom/google/gson/reflect/TypeToken;
+    iget-object v1, p0, Lcom/google/gson/internal/a/l;->aUJ:Lcom/google/gson/reflect/TypeToken;
 
-    iget-object v1, v1, Lcom/google/gson/reflect/TypeToken;->aUV:Ljava/lang/reflect/Type;
+    iget-object v1, v1, Lcom/google/gson/reflect/TypeToken;->aUR:Ljava/lang/reflect/Type;
 
-    iget-object v2, p0, Lcom/google/gson/internal/a/l;->aUP:Lcom/google/gson/internal/a/l$a;
+    iget-object v2, p0, Lcom/google/gson/internal/a/l;->aUL: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 08465d94ff..34746110a2 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 aTh:Lcom/google/gson/TypeAdapter;
+.field private final aTd: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 aUU:Lcom/google/gson/Gson;
+.field private final aUQ:Lcom/google/gson/Gson;
 
-.field private final aUV:Ljava/lang/reflect/Type;
+.field private final aUR: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;->aUU:Lcom/google/gson/Gson;
+    iput-object p1, p0, Lcom/google/gson/internal/a/m;->aUQ:Lcom/google/gson/Gson;
 
-    iput-object p2, p0, Lcom/google/gson/internal/a/m;->aTh:Lcom/google/gson/TypeAdapter;
+    iput-object p2, p0, Lcom/google/gson/internal/a/m;->aTd:Lcom/google/gson/TypeAdapter;
 
-    iput-object p3, p0, Lcom/google/gson/internal/a/m;->aUV:Ljava/lang/reflect/Type;
+    iput-object p3, p0, Lcom/google/gson/internal/a/m;->aUR:Ljava/lang/reflect/Type;
 
     return-void
 .end method
@@ -73,7 +73,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/gson/internal/a/m;->aTh:Lcom/google/gson/TypeAdapter;
+    iget-object v0, p0, Lcom/google/gson/internal/a/m;->aTd: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;->aTh:Lcom/google/gson/TypeAdapter;
+    iget-object v0, p0, Lcom/google/gson/internal/a/m;->aTd:Lcom/google/gson/TypeAdapter;
 
-    iget-object v1, p0, Lcom/google/gson/internal/a/m;->aUV:Ljava/lang/reflect/Type;
+    iget-object v1, p0, Lcom/google/gson/internal/a/m;->aUR: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;->aUV:Ljava/lang/reflect/Type;
+    iget-object v2, p0, Lcom/google/gson/internal/a/m;->aUR:Ljava/lang/reflect/Type;
 
     if-eq v1, v2, :cond_2
 
-    iget-object v0, p0, Lcom/google/gson/internal/a/m;->aUU:Lcom/google/gson/Gson;
+    iget-object v0, p0, Lcom/google/gson/internal/a/m;->aUQ: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;->aTh:Lcom/google/gson/TypeAdapter;
+    iget-object v1, p0, Lcom/google/gson/internal/a/m;->aTd: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 a5e70c6ae7..0b6586624d 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 aVW:Lcom/google/gson/TypeAdapter;
+.field final synthetic aVS:Lcom/google/gson/TypeAdapter;
 
-.field final synthetic aVX:Lcom/google/gson/internal/a/n$19;
+.field final synthetic aVT: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;->aVX:Lcom/google/gson/internal/a/n$19;
+    iput-object p1, p0, Lcom/google/gson/internal/a/n$19$1;->aVT:Lcom/google/gson/internal/a/n$19;
 
-    iput-object p2, p0, Lcom/google/gson/internal/a/n$19$1;->aVW:Lcom/google/gson/TypeAdapter;
+    iput-object p2, p0, Lcom/google/gson/internal/a/n$19$1;->aVS: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;->aVW:Lcom/google/gson/TypeAdapter;
+    iget-object v0, p0, Lcom/google/gson/internal/a/n$19$1;->aVS: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;->aVW:Lcom/google/gson/TypeAdapter;
+    iget-object v0, p0, Lcom/google/gson/internal/a/n$19$1;->aVS: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 53362c5355..b967a76ce8 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;->aWi:Ljava/lang/Class;
+    iget-object p2, p2, Lcom/google/gson/reflect/TypeToken;->aWe: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 a8624fee36..e87384d52e 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;->AI()Lcom/google/gson/m;
+    invoke-virtual {p2}, Lcom/google/gson/JsonElement;->AG()Lcom/google/gson/m;
 
     move-result-object p2
 
@@ -62,7 +62,7 @@
 
     if-eqz v0, :cond_1
 
-    invoke-virtual {p2}, Lcom/google/gson/m;->AB()Ljava/lang/Number;
+    invoke-virtual {p2}, Lcom/google/gson/m;->Az()Ljava/lang/Number;
 
     move-result-object p2
 
@@ -77,7 +77,7 @@
 
     if-eqz v0, :cond_2
 
-    invoke-virtual {p2}, Lcom/google/gson/m;->AG()Z
+    invoke-virtual {p2}, Lcom/google/gson/m;->AE()Z
 
     move-result p2
 
@@ -86,7 +86,7 @@
     return-void
 
     :cond_2
-    invoke-virtual {p2}, Lcom/google/gson/m;->AC()Ljava/lang/String;
+    invoke-virtual {p2}, Lcom/google/gson/m;->AA()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;->aTu:Lcom/google/gson/internal/LinkedTreeMap;
+    iget-object p2, p2, Lcom/google/gson/JsonObject;->aTq: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;->aTt:Lcom/google/gson/k;
+    sget-object p1, Lcom/google/gson/k;->aTp: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 6f4ab1c59c..caf10249b2 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;->aWi:Ljava/lang/Class;
+    iget-object p1, p2, Lcom/google/gson/reflect/TypeToken;->aWe: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 f9eb0311d0..90be000c0f 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 aUC:Lcom/google/gson/TypeAdapter;
+.field final synthetic aUy: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;->aUC:Lcom/google/gson/TypeAdapter;
+    iput-object p2, p0, Lcom/google/gson/internal/a/n$25;->aUy: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;->aWi:Ljava/lang/Class;
+    iget-object p1, p2, Lcom/google/gson/reflect/TypeToken;->aWe: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;->aUC:Lcom/google/gson/TypeAdapter;
+    iget-object p1, p0, Lcom/google/gson/internal/a/n$25;->aUy: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;->aUC:Lcom/google/gson/TypeAdapter;
+    iget-object v1, p0, Lcom/google/gson/internal/a/n$25;->aUy: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 1129540aea..c3d40bfd8c 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 aUC:Lcom/google/gson/TypeAdapter;
+.field final synthetic aUy:Lcom/google/gson/TypeAdapter;
 
-.field final synthetic aVY:Ljava/lang/Class;
+.field final synthetic aVU:Ljava/lang/Class;
 
-.field final synthetic aVZ:Ljava/lang/Class;
+.field final synthetic aVV: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;->aVY:Ljava/lang/Class;
+    iput-object p1, p0, Lcom/google/gson/internal/a/n$26;->aVU:Ljava/lang/Class;
 
-    iput-object p2, p0, Lcom/google/gson/internal/a/n$26;->aVZ:Ljava/lang/Class;
+    iput-object p2, p0, Lcom/google/gson/internal/a/n$26;->aVV:Ljava/lang/Class;
 
-    iput-object p3, p0, Lcom/google/gson/internal/a/n$26;->aUC:Lcom/google/gson/TypeAdapter;
+    iput-object p3, p0, Lcom/google/gson/internal/a/n$26;->aUy: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;->aWi:Ljava/lang/Class;
+    iget-object p1, p2, Lcom/google/gson/reflect/TypeToken;->aWe:Ljava/lang/Class;
 
-    iget-object p2, p0, Lcom/google/gson/internal/a/n$26;->aVY:Ljava/lang/Class;
+    iget-object p2, p0, Lcom/google/gson/internal/a/n$26;->aVU:Ljava/lang/Class;
 
     if-eq p1, p2, :cond_1
 
-    iget-object p2, p0, Lcom/google/gson/internal/a/n$26;->aVZ:Ljava/lang/Class;
+    iget-object p2, p0, Lcom/google/gson/internal/a/n$26;->aVV: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;->aUC:Lcom/google/gson/TypeAdapter;
+    iget-object p1, p0, Lcom/google/gson/internal/a/n$26;->aUy: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;->aVZ:Ljava/lang/Class;
+    iget-object v1, p0, Lcom/google/gson/internal/a/n$26;->aVV: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;->aVY:Ljava/lang/Class;
+    iget-object v1, p0, Lcom/google/gson/internal/a/n$26;->aVU: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;->aUC:Lcom/google/gson/TypeAdapter;
+    iget-object v1, p0, Lcom/google/gson/internal/a/n$26;->aUy: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 e7a27642e5..8072255349 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 aUC:Lcom/google/gson/TypeAdapter;
+.field final synthetic aUy:Lcom/google/gson/TypeAdapter;
 
-.field final synthetic aWa:Ljava/lang/Class;
+.field final synthetic aVW:Ljava/lang/Class;
 
-.field final synthetic aWb:Ljava/lang/Class;
+.field final synthetic aVX: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;->aWa:Ljava/lang/Class;
+    iput-object p1, p0, Lcom/google/gson/internal/a/n$27;->aVW:Ljava/lang/Class;
 
-    iput-object p2, p0, Lcom/google/gson/internal/a/n$27;->aWb:Ljava/lang/Class;
+    iput-object p2, p0, Lcom/google/gson/internal/a/n$27;->aVX:Ljava/lang/Class;
 
-    iput-object p3, p0, Lcom/google/gson/internal/a/n$27;->aUC:Lcom/google/gson/TypeAdapter;
+    iput-object p3, p0, Lcom/google/gson/internal/a/n$27;->aUy: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;->aWi:Ljava/lang/Class;
+    iget-object p1, p2, Lcom/google/gson/reflect/TypeToken;->aWe:Ljava/lang/Class;
 
-    iget-object p2, p0, Lcom/google/gson/internal/a/n$27;->aWa:Ljava/lang/Class;
+    iget-object p2, p0, Lcom/google/gson/internal/a/n$27;->aVW:Ljava/lang/Class;
 
     if-eq p1, p2, :cond_1
 
-    iget-object p2, p0, Lcom/google/gson/internal/a/n$27;->aWb:Ljava/lang/Class;
+    iget-object p2, p0, Lcom/google/gson/internal/a/n$27;->aVX: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;->aUC:Lcom/google/gson/TypeAdapter;
+    iget-object p1, p0, Lcom/google/gson/internal/a/n$27;->aUy: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;->aWa:Ljava/lang/Class;
+    iget-object v1, p0, Lcom/google/gson/internal/a/n$27;->aVW: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;->aWb:Ljava/lang/Class;
+    iget-object v1, p0, Lcom/google/gson/internal/a/n$27;->aVX: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;->aUC:Lcom/google/gson/TypeAdapter;
+    iget-object v1, p0, Lcom/google/gson/internal/a/n$27;->aUy: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 a1653cdb7c..3abe3f9764 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 aWd:Ljava/lang/Class;
+.field final synthetic aVZ:Ljava/lang/Class;
 
-.field final synthetic aWe:Lcom/google/gson/internal/a/n$28;
+.field final synthetic aWa: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;->aWe:Lcom/google/gson/internal/a/n$28;
+    iput-object p1, p0, Lcom/google/gson/internal/a/n$28$1;->aWa:Lcom/google/gson/internal/a/n$28;
 
-    iput-object p2, p0, Lcom/google/gson/internal/a/n$28$1;->aWd:Ljava/lang/Class;
+    iput-object p2, p0, Lcom/google/gson/internal/a/n$28$1;->aVZ: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;->aWe:Lcom/google/gson/internal/a/n$28;
+    iget-object v0, p0, Lcom/google/gson/internal/a/n$28$1;->aWa:Lcom/google/gson/internal/a/n$28;
 
-    iget-object v0, v0, Lcom/google/gson/internal/a/n$28;->aUC:Lcom/google/gson/TypeAdapter;
+    iget-object v0, v0, Lcom/google/gson/internal/a/n$28;->aUy: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;->aWd:Ljava/lang/Class;
+    iget-object v0, p0, Lcom/google/gson/internal/a/n$28$1;->aVZ: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;->aWd:Ljava/lang/Class;
+    iget-object v2, p0, Lcom/google/gson/internal/a/n$28$1;->aVZ: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;->aWe:Lcom/google/gson/internal/a/n$28;
+    iget-object v0, p0, Lcom/google/gson/internal/a/n$28$1;->aWa:Lcom/google/gson/internal/a/n$28;
 
-    iget-object v0, v0, Lcom/google/gson/internal/a/n$28;->aUC:Lcom/google/gson/TypeAdapter;
+    iget-object v0, v0, Lcom/google/gson/internal/a/n$28;->aUy: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 9e7ba9616f..17e3fa9991 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 aUC:Lcom/google/gson/TypeAdapter;
+.field final synthetic aUy:Lcom/google/gson/TypeAdapter;
 
-.field final synthetic aWc:Ljava/lang/Class;
+.field final synthetic aVY: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;->aWc:Ljava/lang/Class;
+    iput-object p1, p0, Lcom/google/gson/internal/a/n$28;->aVY:Ljava/lang/Class;
 
-    iput-object p2, p0, Lcom/google/gson/internal/a/n$28;->aUC:Lcom/google/gson/TypeAdapter;
+    iput-object p2, p0, Lcom/google/gson/internal/a/n$28;->aUy: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;->aWi:Ljava/lang/Class;
+    iget-object p1, p2, Lcom/google/gson/reflect/TypeToken;->aWe:Ljava/lang/Class;
 
-    iget-object p2, p0, Lcom/google/gson/internal/a/n$28;->aWc:Ljava/lang/Class;
+    iget-object p2, p0, Lcom/google/gson/internal/a/n$28;->aVY: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;->aWc:Ljava/lang/Class;
+    iget-object v1, p0, Lcom/google/gson/internal/a/n$28;->aVY: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;->aUC:Lcom/google/gson/TypeAdapter;
+    iget-object v1, p0, Lcom/google/gson/internal/a/n$28;->aUy: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 ad04df2413..ae6130739c 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 aWf:Ljava/util/Map;
+.field private final aWb:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -35,7 +35,7 @@
     .end annotation
 .end field
 
-.field private final aWg:Ljava/util/Map;
+.field private final aWc: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;->aWf:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/gson/internal/a/n$a;->aWb: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;->aWg:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/gson/internal/a/n$a;->aWc: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;->AM()[Ljava/lang/String;
+    invoke-interface {v6}, Lcom/google/gson/a/c;->AK()[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;->aWf:Ljava/util/Map;
+    iget-object v10, p0, Lcom/google/gson/internal/a/n$a;->aWb: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;->aWf:Ljava/util/Map;
+    iget-object v6, p0, Lcom/google/gson/internal/a/n$a;->aWb: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;->aWg:Ljava/util/Map;
+    iget-object v6, p0, Lcom/google/gson/internal/a/n$a;->aWc: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;->aWf:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/gson/internal/a/n$a;->aWb: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;->aWg:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/gson/internal/a/n$a;->aWc: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 a19cfbbace..ca17a092c2 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,7 +12,7 @@
 
 
 # static fields
-.field public static final aUW:Lcom/google/gson/TypeAdapter;
+.field public static final aUS:Lcom/google/gson/TypeAdapter;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/TypeAdapter<",
@@ -22,9 +22,9 @@
     .end annotation
 .end field
 
-.field public static final aUX:Lcom/google/gson/r;
+.field public static final aUT:Lcom/google/gson/r;
 
-.field public static final aUY:Lcom/google/gson/TypeAdapter;
+.field public static final aUU:Lcom/google/gson/TypeAdapter;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/TypeAdapter<",
@@ -34,13 +34,45 @@
     .end annotation
 .end field
 
-.field public static final aUZ:Lcom/google/gson/r;
+.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/Boolean;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public static final aUX: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 aUY:Lcom/google/gson/r;
+
+.field public static final aUZ: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 aVA:Lcom/google/gson/TypeAdapter;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/TypeAdapter<",
-            "Ljava/lang/StringBuilder;",
+            "Ljava/net/URL;",
             ">;"
         }
     .end annotation
@@ -52,7 +84,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/TypeAdapter<",
-            "Ljava/lang/StringBuffer;",
+            "Ljava/net/URI;",
             ">;"
         }
     .end annotation
@@ -64,7 +96,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/TypeAdapter<",
-            "Ljava/net/URL;",
+            "Ljava/net/InetAddress;",
             ">;"
         }
     .end annotation
@@ -76,7 +108,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/TypeAdapter<",
-            "Ljava/net/URI;",
+            "Ljava/util/UUID;",
             ">;"
         }
     .end annotation
@@ -88,7 +120,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/TypeAdapter<",
-            "Ljava/net/InetAddress;",
+            "Ljava/util/Currency;",
             ">;"
         }
     .end annotation
@@ -96,33 +128,9 @@
 
 .field public static final aVJ:Lcom/google/gson/r;
 
-.field public static final aVK:Lcom/google/gson/TypeAdapter;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/gson/TypeAdapter<",
-            "Ljava/util/UUID;",
-            ">;"
-        }
-    .end annotation
-.end field
+.field public static final aVK:Lcom/google/gson/r;
 
-.field public static final aVL: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;
+.field public static final aVL:Lcom/google/gson/TypeAdapter;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/TypeAdapter<",
@@ -132,9 +140,9 @@
     .end annotation
 .end field
 
-.field public static final aVQ:Lcom/google/gson/r;
+.field public static final aVM:Lcom/google/gson/r;
 
-.field public static final aVR:Lcom/google/gson/TypeAdapter;
+.field public static final aVN:Lcom/google/gson/TypeAdapter;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/TypeAdapter<",
@@ -144,9 +152,9 @@
     .end annotation
 .end field
 
-.field public static final aVS:Lcom/google/gson/r;
+.field public static final aVO:Lcom/google/gson/r;
 
-.field public static final aVT:Lcom/google/gson/TypeAdapter;
+.field public static final aVP:Lcom/google/gson/TypeAdapter;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/TypeAdapter<",
@@ -156,25 +164,17 @@
     .end annotation
 .end field
 
-.field public static final aVU:Lcom/google/gson/r;
+.field public static final aVQ:Lcom/google/gson/r;
 
-.field public static final aVV:Lcom/google/gson/r;
+.field public static final aVR:Lcom/google/gson/r;
 
-.field public static final aVa: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 aVa:Lcom/google/gson/r;
 
 .field public static final aVb:Lcom/google/gson/TypeAdapter;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/TypeAdapter<",
-            "Ljava/lang/Boolean;",
+            "Ljava/lang/Number;",
             ">;"
         }
     .end annotation
@@ -198,7 +198,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/TypeAdapter<",
-            "Ljava/lang/Number;",
+            "Ljava/util/concurrent/atomic/AtomicInteger;",
             ">;"
         }
     .end annotation
@@ -210,7 +210,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/TypeAdapter<",
-            "Ljava/lang/Number;",
+            "Ljava/util/concurrent/atomic/AtomicBoolean;",
             ">;"
         }
     .end annotation
@@ -222,7 +222,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/TypeAdapter<",
-            "Ljava/util/concurrent/atomic/AtomicInteger;",
+            "Ljava/util/concurrent/atomic/AtomicIntegerArray;",
             ">;"
         }
     .end annotation
@@ -234,27 +234,33 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/TypeAdapter<",
-            "Ljava/util/concurrent/atomic/AtomicBoolean;",
+            "Ljava/lang/Number;",
             ">;"
         }
     .end annotation
 .end field
 
-.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/lang/Number;",
+            ">;"
+        }
+    .end annotation
+.end field
 
 .field public static final aVn:Lcom/google/gson/TypeAdapter;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/TypeAdapter<",
-            "Ljava/util/concurrent/atomic/AtomicIntegerArray;",
+            "Ljava/lang/Number;",
             ">;"
         }
     .end annotation
 .end field
 
-.field public static final aVo:Lcom/google/gson/r;
-
-.field public static final aVp:Lcom/google/gson/TypeAdapter;
+.field public static final aVo:Lcom/google/gson/TypeAdapter;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/TypeAdapter<",
@@ -264,43 +270,45 @@
     .end annotation
 .end field
 
+.field public static final aVp:Lcom/google/gson/r;
+
 .field public static final aVq:Lcom/google/gson/TypeAdapter;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/TypeAdapter<",
-            "Ljava/lang/Number;",
+            "Ljava/lang/Character;",
             ">;"
         }
     .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 aVr:Lcom/google/gson/r;
 
 .field public static final aVs:Lcom/google/gson/TypeAdapter;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/TypeAdapter<",
-            "Ljava/lang/Number;",
+            "Ljava/lang/String;",
             ">;"
         }
     .end annotation
 .end field
 
-.field public static final aVt:Lcom/google/gson/r;
+.field public static final aVt:Lcom/google/gson/TypeAdapter;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/gson/TypeAdapter<",
+            "Ljava/math/BigDecimal;",
+            ">;"
+        }
+    .end annotation
+.end field
 
 .field public static final aVu:Lcom/google/gson/TypeAdapter;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/TypeAdapter<",
-            "Ljava/lang/Character;",
+            "Ljava/math/BigInteger;",
             ">;"
         }
     .end annotation
@@ -312,27 +320,19 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/TypeAdapter<",
-            "Ljava/lang/String;",
+            "Ljava/lang/StringBuilder;",
             ">;"
         }
     .end annotation
 .end field
 
-.field public static final aVx:Lcom/google/gson/TypeAdapter;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/gson/TypeAdapter<",
-            "Ljava/math/BigDecimal;",
-            ">;"
-        }
-    .end annotation
-.end field
+.field public static final aVx:Lcom/google/gson/r;
 
 .field public static final aVy:Lcom/google/gson/TypeAdapter;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/TypeAdapter<",
-            "Ljava/math/BigInteger;",
+            "Ljava/lang/StringBuffer;",
             ">;"
         }
     .end annotation
@@ -353,17 +353,17 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/gson/internal/a/n;->aUW:Lcom/google/gson/TypeAdapter;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aUS:Lcom/google/gson/TypeAdapter;
 
     const-class v0, Ljava/lang/Class;
 
-    sget-object v1, Lcom/google/gson/internal/a/n;->aUW:Lcom/google/gson/TypeAdapter;
+    sget-object v1, Lcom/google/gson/internal/a/n;->aUS: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;->aUX:Lcom/google/gson/r;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aUT:Lcom/google/gson/r;
 
     new-instance v0, Lcom/google/gson/internal/a/n$12;
 
@@ -373,35 +373,71 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/gson/internal/a/n;->aUY:Lcom/google/gson/TypeAdapter;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aUU:Lcom/google/gson/TypeAdapter;
 
     const-class v0, Ljava/util/BitSet;
 
-    sget-object v1, Lcom/google/gson/internal/a/n;->aUY:Lcom/google/gson/TypeAdapter;
+    sget-object v1, Lcom/google/gson/internal/a/n;->aUU: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;->aUZ:Lcom/google/gson/r;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aUV: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;->aVa:Lcom/google/gson/TypeAdapter;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aUW: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;->aVb:Lcom/google/gson/TypeAdapter;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aUX: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;->aVa:Lcom/google/gson/TypeAdapter;
+    sget-object v2, Lcom/google/gson/internal/a/n;->aUW: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;->aUY: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;->aUZ: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;->aUZ: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;->aVa: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;->aVb: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;->aVb: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;
 
@@ -409,15 +445,15 @@
 
     sput-object v0, Lcom/google/gson/internal/a/n;->aVc:Lcom/google/gson/r;
 
-    new-instance v0, Lcom/google/gson/internal/a/n$31;
+    new-instance v0, Lcom/google/gson/internal/a/n$33;
 
-    invoke-direct {v0}, Lcom/google/gson/internal/a/n$31;-><init>()V
+    invoke-direct {v0}, Lcom/google/gson/internal/a/n$33;-><init>()V
 
     sput-object v0, Lcom/google/gson/internal/a/n;->aVd:Lcom/google/gson/TypeAdapter;
 
-    sget-object v0, Ljava/lang/Byte;->TYPE:Ljava/lang/Class;
+    sget-object v0, Ljava/lang/Integer;->TYPE:Ljava/lang/Class;
 
-    const-class v1, Ljava/lang/Byte;
+    const-class v1, Ljava/lang/Integer;
 
     sget-object v2, Lcom/google/gson/internal/a/n;->aVd:Lcom/google/gson/TypeAdapter;
 
@@ -427,42 +463,6 @@
 
     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;->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;->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;->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;->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;->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;->aVi:Lcom/google/gson/r;
-
     new-instance v0, Lcom/google/gson/internal/a/n$34;
 
     invoke-direct {v0}, Lcom/google/gson/internal/a/n$34;-><init>()V
@@ -471,17 +471,17 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/gson/internal/a/n;->aVj:Lcom/google/gson/TypeAdapter;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aVf:Lcom/google/gson/TypeAdapter;
 
     const-class v0, Ljava/util/concurrent/atomic/AtomicInteger;
 
-    sget-object v1, Lcom/google/gson/internal/a/n;->aVj:Lcom/google/gson/TypeAdapter;
+    sget-object v1, Lcom/google/gson/internal/a/n;->aVf: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;->aVk: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$35;
 
@@ -491,17 +491,17 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/gson/internal/a/n;->aVl:Lcom/google/gson/TypeAdapter;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aVh:Lcom/google/gson/TypeAdapter;
 
     const-class v0, Ljava/util/concurrent/atomic/AtomicBoolean;
 
-    sget-object v1, Lcom/google/gson/internal/a/n;->aVl:Lcom/google/gson/TypeAdapter;
+    sget-object v1, Lcom/google/gson/internal/a/n;->aVh: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;->aVm: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$2;
 
@@ -511,89 +511,105 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/gson/internal/a/n;->aVn:Lcom/google/gson/TypeAdapter;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aVj:Lcom/google/gson/TypeAdapter;
 
     const-class v0, Ljava/util/concurrent/atomic/AtomicIntegerArray;
 
-    sget-object v1, Lcom/google/gson/internal/a/n;->aVn:Lcom/google/gson/TypeAdapter;
+    sget-object v1, Lcom/google/gson/internal/a/n;->aVj: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;->aVo:Lcom/google/gson/r;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aVk: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;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aVl: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;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aVm: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;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aVn: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;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aVo:Lcom/google/gson/TypeAdapter;
 
     const-class v0, Ljava/lang/Number;
 
+    sget-object v1, Lcom/google/gson/internal/a/n;->aVo: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;->aVp: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;->aVq: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;->aVq: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;->aVr: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;->aVs: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;->aVt: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;->aVu:Lcom/google/gson/TypeAdapter;
+
+    const-class v0, Ljava/lang/String;
+
     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;
+    new-instance v0, Lcom/google/gson/internal/a/n$11;
 
-    invoke-direct {v0}, Lcom/google/gson/internal/a/n$8;-><init>()V
+    invoke-direct {v0}, Lcom/google/gson/internal/a/n$11;-><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;
+    const-class v0, Ljava/lang/StringBuilder;
 
     sget-object v1, Lcom/google/gson/internal/a/n;->aVw:Lcom/google/gson/TypeAdapter;
 
@@ -601,15 +617,31 @@
 
     move-result-object v0
 
+    sput-object v0, Lcom/google/gson/internal/a/n;->aVx: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;->aVy:Lcom/google/gson/TypeAdapter;
+
+    const-class v0, Ljava/lang/StringBuffer;
+
+    sget-object v1, Lcom/google/gson/internal/a/n;->aVy: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;
+    new-instance v0, Lcom/google/gson/internal/a/n$14;
 
-    invoke-direct {v0}, Lcom/google/gson/internal/a/n$11;-><init>()V
+    invoke-direct {v0}, Lcom/google/gson/internal/a/n$14;-><init>()V
 
     sput-object v0, Lcom/google/gson/internal/a/n;->aVA:Lcom/google/gson/TypeAdapter;
 
-    const-class v0, Ljava/lang/StringBuilder;
+    const-class v0, Ljava/net/URL;
 
     sget-object v1, Lcom/google/gson/internal/a/n;->aVA:Lcom/google/gson/TypeAdapter;
 
@@ -619,13 +651,13 @@
 
     sput-object v0, Lcom/google/gson/internal/a/n;->aVB:Lcom/google/gson/r;
 
-    new-instance v0, Lcom/google/gson/internal/a/n$13;
+    new-instance v0, Lcom/google/gson/internal/a/n$15;
 
-    invoke-direct {v0}, Lcom/google/gson/internal/a/n$13;-><init>()V
+    invoke-direct {v0}, Lcom/google/gson/internal/a/n$15;-><init>()V
 
     sput-object v0, Lcom/google/gson/internal/a/n;->aVC:Lcom/google/gson/TypeAdapter;
 
-    const-class v0, Ljava/lang/StringBuffer;
+    const-class v0, Ljava/net/URI;
 
     sget-object v1, Lcom/google/gson/internal/a/n;->aVC:Lcom/google/gson/TypeAdapter;
 
@@ -635,29 +667,29 @@
 
     sput-object v0, Lcom/google/gson/internal/a/n;->aVD:Lcom/google/gson/r;
 
-    new-instance v0, Lcom/google/gson/internal/a/n$14;
+    new-instance v0, Lcom/google/gson/internal/a/n$16;
 
-    invoke-direct {v0}, Lcom/google/gson/internal/a/n$14;-><init>()V
+    invoke-direct {v0}, Lcom/google/gson/internal/a/n$16;-><init>()V
 
     sput-object v0, Lcom/google/gson/internal/a/n;->aVE:Lcom/google/gson/TypeAdapter;
 
-    const-class v0, Ljava/net/URL;
+    const-class v0, Ljava/net/InetAddress;
 
     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;
+    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;->aVF:Lcom/google/gson/r;
 
-    new-instance v0, Lcom/google/gson/internal/a/n$15;
+    new-instance v0, Lcom/google/gson/internal/a/n$17;
 
-    invoke-direct {v0}, Lcom/google/gson/internal/a/n$15;-><init>()V
+    invoke-direct {v0}, Lcom/google/gson/internal/a/n$17;-><init>()V
 
     sput-object v0, Lcom/google/gson/internal/a/n;->aVG:Lcom/google/gson/TypeAdapter;
 
-    const-class v0, Ljava/net/URI;
+    const-class v0, Ljava/util/UUID;
 
     sget-object v1, Lcom/google/gson/internal/a/n;->aVG:Lcom/google/gson/TypeAdapter;
 
@@ -667,38 +699,6 @@
 
     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;->aVI:Lcom/google/gson/TypeAdapter;
-
-    const-class v0, Ljava/net/InetAddress;
-
-    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;->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;->aVK:Lcom/google/gson/TypeAdapter;
-
-    const-class v0, Ljava/util/UUID;
-
-    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;->aVL:Lcom/google/gson/r;
-
     new-instance v0, Lcom/google/gson/internal/a/n$18;
 
     invoke-direct {v0}, Lcom/google/gson/internal/a/n$18;-><init>()V
@@ -707,79 +707,79 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/gson/internal/a/n;->aVM:Lcom/google/gson/TypeAdapter;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aVI:Lcom/google/gson/TypeAdapter;
 
     const-class v0, Ljava/util/Currency;
 
-    sget-object v1, Lcom/google/gson/internal/a/n;->aVM: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;->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;->aVN: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$19;
 
     invoke-direct {v0}, Lcom/google/gson/internal/a/n$19;-><init>()V
 
-    sput-object v0, Lcom/google/gson/internal/a/n;->aVO:Lcom/google/gson/r;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aVK: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;->aVP:Lcom/google/gson/TypeAdapter;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aVL: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;->aVP:Lcom/google/gson/TypeAdapter;
+    sget-object v2, Lcom/google/gson/internal/a/n;->aVL: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;->aVQ:Lcom/google/gson/r;
+    sput-object v3, Lcom/google/gson/internal/a/n;->aVM: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;->aVR:Lcom/google/gson/TypeAdapter;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aVN:Lcom/google/gson/TypeAdapter;
 
     const-class v0, Ljava/util/Locale;
 
-    sget-object v1, Lcom/google/gson/internal/a/n;->aVR:Lcom/google/gson/TypeAdapter;
+    sget-object v1, Lcom/google/gson/internal/a/n;->aVN: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;->aVO: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;->aVT:Lcom/google/gson/TypeAdapter;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aVP:Lcom/google/gson/TypeAdapter;
 
     const-class v0, Lcom/google/gson/JsonElement;
 
-    sget-object v1, Lcom/google/gson/internal/a/n;->aVT:Lcom/google/gson/TypeAdapter;
+    sget-object v1, Lcom/google/gson/internal/a/n;->aVP: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;->aVU:Lcom/google/gson/r;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aVQ: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;->aVV:Lcom/google/gson/r;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aVR: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 c1e6d44477..52276f5f14 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;->aTA:[Ljava/lang/reflect/Type;
+    sget-object v0, Lcom/google/gson/internal/b;->aTw:[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 24f6b8f5a4..0f9036d192 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 aTA:[Ljava/lang/reflect/Type;
+.field static final aTw:[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;->aTA:[Ljava/lang/reflect/Type;
+    sput-object v0, Lcom/google/gson/internal/b;->aTw:[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;->aTA:[Ljava/lang/reflect/Type;
+    sget-object p2, Lcom/google/gson/internal/b;->aTw:[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 4925039dcf..ef44dd022d 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 aTB:Lcom/google/gson/g;
+.field final synthetic aTx:Lcom/google/gson/g;
 
-.field final synthetic aTC:Ljava/lang/reflect/Type;
+.field final synthetic aTy:Ljava/lang/reflect/Type;
 
-.field final synthetic aTD:Lcom/google/gson/internal/c;
+.field final synthetic aTz: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;->aTD:Lcom/google/gson/internal/c;
+    iput-object p1, p0, Lcom/google/gson/internal/c$1;->aTz:Lcom/google/gson/internal/c;
 
-    iput-object p2, p0, Lcom/google/gson/internal/c$1;->aTB:Lcom/google/gson/g;
+    iput-object p2, p0, Lcom/google/gson/internal/c$1;->aTx:Lcom/google/gson/g;
 
-    iput-object p3, p0, Lcom/google/gson/internal/c$1;->aTC:Ljava/lang/reflect/Type;
+    iput-object p3, p0, Lcom/google/gson/internal/c$1;->aTy:Ljava/lang/reflect/Type;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -50,7 +50,7 @@
 
 
 # virtual methods
-.method public final AO()Ljava/lang/Object;
+.method public final AM()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;->aTB:Lcom/google/gson/g;
+    iget-object v0, p0, Lcom/google/gson/internal/c$1;->aTx:Lcom/google/gson/g;
 
-    invoke-interface {v0}, Lcom/google/gson/g;->AA()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/gson/g;->Ay()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 5a54900410..4e77423a67 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 aTC:Ljava/lang/reflect/Type;
+.field final synthetic aTy:Ljava/lang/reflect/Type;
 
-.field final synthetic aTD:Lcom/google/gson/internal/c;
+.field final synthetic aTz: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;->aTD:Lcom/google/gson/internal/c;
+    iput-object p1, p0, Lcom/google/gson/internal/c$10;->aTz:Lcom/google/gson/internal/c;
 
-    iput-object p2, p0, Lcom/google/gson/internal/c$10;->aTC:Ljava/lang/reflect/Type;
+    iput-object p2, p0, Lcom/google/gson/internal/c$10;->aTy:Ljava/lang/reflect/Type;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -46,7 +46,7 @@
 
 
 # virtual methods
-.method public final AO()Ljava/lang/Object;
+.method public final AM()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;->aTC:Ljava/lang/reflect/Type;
+    iget-object v0, p0, Lcom/google/gson/internal/c$10;->aTy: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;->aTC:Ljava/lang/reflect/Type;
+    iget-object v2, p0, Lcom/google/gson/internal/c$10;->aTy: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;->aTC:Ljava/lang/reflect/Type;
+    iget-object v2, p0, Lcom/google/gson/internal/c$10;->aTy: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 8b3bd56aac..68491a4e93 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 aTD:Lcom/google/gson/internal/c;
+.field final synthetic aTz: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;->aTD:Lcom/google/gson/internal/c;
+    iput-object p1, p0, Lcom/google/gson/internal/c$11;->aTz:Lcom/google/gson/internal/c;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -42,7 +42,7 @@
 
 
 # virtual methods
-.method public final AO()Ljava/lang/Object;
+.method public final AM()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 b9f2f29daf..e3e98db317 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 aTD:Lcom/google/gson/internal/c;
+.field final synthetic aTz: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;->aTD:Lcom/google/gson/internal/c;
+    iput-object p1, p0, Lcom/google/gson/internal/c$12;->aTz:Lcom/google/gson/internal/c;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -42,7 +42,7 @@
 
 
 # virtual methods
-.method public final AO()Ljava/lang/Object;
+.method public final AM()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 1cb6b2e6e9..fdc05229ea 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 aTD:Lcom/google/gson/internal/c;
+.field final synthetic aTz: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;->aTD:Lcom/google/gson/internal/c;
+    iput-object p1, p0, Lcom/google/gson/internal/c$13;->aTz:Lcom/google/gson/internal/c;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -42,7 +42,7 @@
 
 
 # virtual methods
-.method public final AO()Ljava/lang/Object;
+.method public final AM()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 f3bfdf7d87..6020f97e03 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 aTD:Lcom/google/gson/internal/c;
+.field final synthetic aTz: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;->aTD:Lcom/google/gson/internal/c;
+    iput-object p1, p0, Lcom/google/gson/internal/c$14;->aTz:Lcom/google/gson/internal/c;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -42,7 +42,7 @@
 
 
 # virtual methods
-.method public final AO()Ljava/lang/Object;
+.method public final AM()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 4c233dbe26..e54b4caa51 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 aTD:Lcom/google/gson/internal/c;
+.field final synthetic aTz: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;->aTD:Lcom/google/gson/internal/c;
+    iput-object p1, p0, Lcom/google/gson/internal/c$2;->aTz:Lcom/google/gson/internal/c;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -42,7 +42,7 @@
 
 
 # virtual methods
-.method public final AO()Ljava/lang/Object;
+.method public final AM()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 35bc569657..7c1d60bbec 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 aTD:Lcom/google/gson/internal/c;
+.field final synthetic aTz: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;->aTD:Lcom/google/gson/internal/c;
+    iput-object p1, p0, Lcom/google/gson/internal/c$3;->aTz:Lcom/google/gson/internal/c;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -42,7 +42,7 @@
 
 
 # virtual methods
-.method public final AO()Ljava/lang/Object;
+.method public final AM()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 33b27b8539..712dea7159 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 aTD:Lcom/google/gson/internal/c;
+.field final synthetic aTz: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;->aTD:Lcom/google/gson/internal/c;
+    iput-object p1, p0, Lcom/google/gson/internal/c$4;->aTz:Lcom/google/gson/internal/c;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -42,7 +42,7 @@
 
 
 # virtual methods
-.method public final AO()Ljava/lang/Object;
+.method public final AM()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 c783972e00..d508cb29f4 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 aTD:Lcom/google/gson/internal/c;
+.field final synthetic aTz: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;->aTD:Lcom/google/gson/internal/c;
+    iput-object p1, p0, Lcom/google/gson/internal/c$5;->aTz:Lcom/google/gson/internal/c;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -42,7 +42,7 @@
 
 
 # virtual methods
-.method public final AO()Ljava/lang/Object;
+.method public final AM()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 c14e977c25..4fcf22f63d 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 aTC:Ljava/lang/reflect/Type;
+.field private final aTA:Lcom/google/gson/internal/j;
 
-.field final synthetic aTD:Lcom/google/gson/internal/c;
+.field final synthetic aTB:Ljava/lang/Class;
 
-.field private final aTE:Lcom/google/gson/internal/j;
+.field final synthetic aTy:Ljava/lang/reflect/Type;
 
-.field final synthetic aTF:Ljava/lang/Class;
+.field final synthetic aTz:Lcom/google/gson/internal/c;
 
 
 # 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;->aTD:Lcom/google/gson/internal/c;
+    iput-object p1, p0, Lcom/google/gson/internal/c$6;->aTz:Lcom/google/gson/internal/c;
 
-    iput-object p2, p0, Lcom/google/gson/internal/c$6;->aTF:Ljava/lang/Class;
+    iput-object p2, p0, Lcom/google/gson/internal/c$6;->aTB:Ljava/lang/Class;
 
-    iput-object p3, p0, Lcom/google/gson/internal/c$6;->aTC:Ljava/lang/reflect/Type;
+    iput-object p3, p0, Lcom/google/gson/internal/c$6;->aTy:Ljava/lang/reflect/Type;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    invoke-static {}, Lcom/google/gson/internal/j;->AS()Lcom/google/gson/internal/j;
+    invoke-static {}, Lcom/google/gson/internal/j;->AQ()Lcom/google/gson/internal/j;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/gson/internal/c$6;->aTE:Lcom/google/gson/internal/j;
+    iput-object p1, p0, Lcom/google/gson/internal/c$6;->aTA:Lcom/google/gson/internal/j;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final AO()Ljava/lang/Object;
+.method public final AM()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;->aTE:Lcom/google/gson/internal/j;
+    iget-object v0, p0, Lcom/google/gson/internal/c$6;->aTA:Lcom/google/gson/internal/j;
 
-    iget-object v1, p0, Lcom/google/gson/internal/c$6;->aTF:Ljava/lang/Class;
+    iget-object v1, p0, Lcom/google/gson/internal/c$6;->aTB: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;->aTC:Ljava/lang/reflect/Type;
+    iget-object v3, p0, Lcom/google/gson/internal/c$6;->aTy: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 8429a76307..1a7eb343f8 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 aTC:Ljava/lang/reflect/Type;
+.field final synthetic aTC:Lcom/google/gson/g;
 
-.field final synthetic aTD:Lcom/google/gson/internal/c;
+.field final synthetic aTy:Ljava/lang/reflect/Type;
 
-.field final synthetic aTG:Lcom/google/gson/g;
+.field final synthetic aTz: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$7;->aTD:Lcom/google/gson/internal/c;
+    iput-object p1, p0, Lcom/google/gson/internal/c$7;->aTz:Lcom/google/gson/internal/c;
 
-    iput-object p2, p0, Lcom/google/gson/internal/c$7;->aTG:Lcom/google/gson/g;
+    iput-object p2, p0, Lcom/google/gson/internal/c$7;->aTC:Lcom/google/gson/g;
 
-    iput-object p3, p0, Lcom/google/gson/internal/c$7;->aTC:Ljava/lang/reflect/Type;
+    iput-object p3, p0, Lcom/google/gson/internal/c$7;->aTy:Ljava/lang/reflect/Type;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -50,7 +50,7 @@
 
 
 # virtual methods
-.method public final AO()Ljava/lang/Object;
+.method public final AM()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;->aTG:Lcom/google/gson/g;
+    iget-object v0, p0, Lcom/google/gson/internal/c$7;->aTC:Lcom/google/gson/g;
 
-    invoke-interface {v0}, Lcom/google/gson/g;->AA()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/gson/g;->Ay()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 e650b0f99d..8148340193 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 aTD:Lcom/google/gson/internal/c;
+.field final synthetic aTz: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;->aTD:Lcom/google/gson/internal/c;
+    iput-object p1, p0, Lcom/google/gson/internal/c$8;->aTz: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 AO()Ljava/lang/Object;
+.method public final AM()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 69753a7bec..dfdb35a271 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 aTD:Lcom/google/gson/internal/c;
+.field final synthetic aTz: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;->aTD:Lcom/google/gson/internal/c;
+    iput-object p1, p0, Lcom/google/gson/internal/c$9;->aTz:Lcom/google/gson/internal/c;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -42,7 +42,7 @@
 
 
 # virtual methods
-.method public final AO()Ljava/lang/Object;
+.method public final AM()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 f69ed97c6f..80327166dc 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 aTk:Ljava/util/Map;
+.field private final aTg: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;->aTk:Ljava/util/Map;
+    iput-object p1, p0, Lcom/google/gson/internal/c;->aTg:Ljava/util/Map;
 
     return-void
 .end method
@@ -100,11 +100,11 @@
         }
     .end annotation
 
-    iget-object v0, p1, Lcom/google/gson/reflect/TypeToken;->aUV:Ljava/lang/reflect/Type;
+    iget-object v0, p1, Lcom/google/gson/reflect/TypeToken;->aUR:Ljava/lang/reflect/Type;
 
-    iget-object p1, p1, Lcom/google/gson/reflect/TypeToken;->aWi:Ljava/lang/Class;
+    iget-object p1, p1, Lcom/google/gson/reflect/TypeToken;->aWe:Ljava/lang/Class;
 
-    iget-object v1, p0, Lcom/google/gson/internal/c;->aTk:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/gson/internal/c;->aTg: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;->aTk:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/gson/internal/c;->aTg: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;->aWi:Ljava/lang/Class;
+    iget-object v2, v2, Lcom/google/gson/reflect/TypeToken;->aWe: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;->aTk:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/gson/internal/c;->aTg: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 97d9a8fd4c..f1d5a373c3 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,15 +22,15 @@
 
 
 # instance fields
-.field final synthetic aTO:Z
+.field final synthetic aTK:Z
 
-.field final synthetic aTP:Z
+.field final synthetic aTL:Z
 
-.field final synthetic aTQ:Lcom/google/gson/Gson;
+.field final synthetic aTM:Lcom/google/gson/Gson;
 
-.field final synthetic aTR:Lcom/google/gson/internal/d;
+.field final synthetic aTN:Lcom/google/gson/internal/d;
 
-.field private aTh:Lcom/google/gson/TypeAdapter;
+.field private aTd:Lcom/google/gson/TypeAdapter;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/TypeAdapter<",
@@ -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;->aTR:Lcom/google/gson/internal/d;
+    iput-object p1, p0, Lcom/google/gson/internal/d$1;->aTN:Lcom/google/gson/internal/d;
 
-    iput-boolean p2, p0, Lcom/google/gson/internal/d$1;->aTO:Z
+    iput-boolean p2, p0, Lcom/google/gson/internal/d$1;->aTK:Z
 
-    iput-boolean p3, p0, Lcom/google/gson/internal/d$1;->aTP:Z
+    iput-boolean p3, p0, Lcom/google/gson/internal/d$1;->aTL:Z
 
-    iput-object p4, p0, Lcom/google/gson/internal/d$1;->aTQ:Lcom/google/gson/Gson;
+    iput-object p4, p0, Lcom/google/gson/internal/d$1;->aTM: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 AQ()Lcom/google/gson/TypeAdapter;
+.method private AO()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;->aTh:Lcom/google/gson/TypeAdapter;
+    iget-object v0, p0, Lcom/google/gson/internal/d$1;->aTd:Lcom/google/gson/TypeAdapter;
 
     if-eqz v0, :cond_0
 
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/gson/internal/d$1;->aTQ:Lcom/google/gson/Gson;
+    iget-object v0, p0, Lcom/google/gson/internal/d$1;->aTM:Lcom/google/gson/Gson;
 
-    iget-object v1, p0, Lcom/google/gson/internal/d$1;->aTR:Lcom/google/gson/internal/d;
+    iget-object v1, p0, Lcom/google/gson/internal/d$1;->aTN: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;->aTh:Lcom/google/gson/TypeAdapter;
+    iput-object v0, p0, Lcom/google/gson/internal/d$1;->aTd: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;->aTO:Z
+    iget-boolean v0, p0, Lcom/google/gson/internal/d$1;->aTK:Z
 
     if-eqz v0, :cond_0
 
@@ -122,7 +122,7 @@
     return-object p1
 
     :cond_0
-    invoke-direct {p0}, Lcom/google/gson/internal/d$1;->AQ()Lcom/google/gson/TypeAdapter;
+    invoke-direct {p0}, Lcom/google/gson/internal/d$1;->AO()Lcom/google/gson/TypeAdapter;
 
     move-result-object v0
 
@@ -149,7 +149,7 @@
         }
     .end annotation
 
-    iget-boolean v0, p0, Lcom/google/gson/internal/d$1;->aTP:Z
+    iget-boolean v0, p0, Lcom/google/gson/internal/d$1;->aTL:Z
 
     if-eqz v0, :cond_0
 
@@ -158,7 +158,7 @@
     return-void
 
     :cond_0
-    invoke-direct {p0}, Lcom/google/gson/internal/d$1;->AQ()Lcom/google/gson/TypeAdapter;
+    invoke-direct {p0}, Lcom/google/gson/internal/d$1;->AO()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 3b5dc8b7e1..71c3358f5d 100644
--- a/com.discord/smali_classes2/com/google/gson/internal/d.smali
+++ b/com.discord/smali_classes2/com/google/gson/internal/d.smali
@@ -8,19 +8,19 @@
 
 
 # static fields
-.field public static final aTH:Lcom/google/gson/internal/d;
+.field public static final aTD:Lcom/google/gson/internal/d;
 
 
 # instance fields
-.field public aTI:D
+.field public aTE:D
 
-.field public aTJ:I
+.field public aTF:I
 
-.field public aTK:Z
+.field public aTG:Z
 
-.field public aTL:Z
+.field public aTH:Z
 
-.field public aTM:Ljava/util/List;
+.field public aTI:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -30,7 +30,7 @@
     .end annotation
 .end field
 
-.field public aTN:Ljava/util/List;
+.field public aTJ:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -49,7 +49,7 @@
 
     invoke-direct {v0}, Lcom/google/gson/internal/d;-><init>()V
 
-    sput-object v0, Lcom/google/gson/internal/d;->aTH:Lcom/google/gson/internal/d;
+    sput-object v0, Lcom/google/gson/internal/d;->aTD: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;->aTI:D
+    iput-wide v0, p0, Lcom/google/gson/internal/d;->aTE:D
 
     const/16 v0, 0x88
 
-    iput v0, p0, Lcom/google/gson/internal/d;->aTJ:I
+    iput v0, p0, Lcom/google/gson/internal/d;->aTF:I
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/google/gson/internal/d;->aTK:Z
+    iput-boolean v0, p0, Lcom/google/gson/internal/d;->aTG:Z
 
     invoke-static {}, Ljava/util/Collections;->emptyList()Ljava/util/List;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/gson/internal/d;->aTM:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/gson/internal/d;->aTI: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;->aTN:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/gson/internal/d;->aTJ:Ljava/util/List;
 
     return-void
 .end method
 
-.method private AP()Lcom/google/gson/internal/d;
+.method private AN()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;->AN()D
+    invoke-interface {p1}, Lcom/google/gson/a/d;->AL()D
 
     move-result-wide v0
 
-    iget-wide v2, p0, Lcom/google/gson/internal/d;->aTI:D
+    iget-wide v2, p0, Lcom/google/gson/internal/d;->aTE:D
 
     cmpl-double p1, v0, v2
 
@@ -241,11 +241,11 @@
 
     if-eqz p1, :cond_0
 
-    invoke-interface {p1}, Lcom/google/gson/a/e;->AN()D
+    invoke-interface {p1}, Lcom/google/gson/a/e;->AL()D
 
     move-result-wide v0
 
-    iget-wide v2, p0, Lcom/google/gson/internal/d;->aTI:D
+    iget-wide v2, p0, Lcom/google/gson/internal/d;->aTE:D
 
     cmpg-double p1, v0, v2
 
@@ -298,7 +298,7 @@
         }
     .end annotation
 
-    iget-wide v0, p0, Lcom/google/gson/internal/d;->aTI:D
+    iget-wide v0, p0, Lcom/google/gson/internal/d;->aTE:D
 
     const/4 v2, 0x1
 
@@ -333,7 +333,7 @@
     return v2
 
     :cond_0
-    iget-boolean v0, p0, Lcom/google/gson/internal/d;->aTK:Z
+    iget-boolean v0, p0, Lcom/google/gson/internal/d;->aTG: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;->aTM:Ljava/util/List;
+    iget-object p1, p0, Lcom/google/gson/internal/d;->aTI:Ljava/util/List;
 
     goto :goto_0
 
     :cond_3
-    iget-object p1, p0, Lcom/google/gson/internal/d;->aTN:Ljava/util/List;
+    iget-object p1, p0, Lcom/google/gson/internal/d;->aTJ: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;->Ay()Z
+    invoke-interface {p2}, Lcom/google/gson/b;->Aw()Z
 
     move-result p2
 
@@ -404,7 +404,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/gson/internal/d;->AP()Lcom/google/gson/internal/d;
+    invoke-direct {p0}, Lcom/google/gson/internal/d;->AN()Lcom/google/gson/internal/d;
 
     move-result-object v0
 
@@ -426,7 +426,7 @@
         }
     .end annotation
 
-    iget-object v0, p2, Lcom/google/gson/reflect/TypeToken;->aWi:Ljava/lang/Class;
+    iget-object v0, p2, Lcom/google/gson/reflect/TypeToken;->aWe: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 a6dafcc0c7..b039eae29b 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 AO()Ljava/lang/Object;
+.method public abstract AM()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 7c2bba9cc5..f1c14e7ba9 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 aUd:Ljava/util/Map;
+.field private static final aTZ:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -16,7 +16,7 @@
     .end annotation
 .end field
 
-.field private static final aUe:Ljava/util/Map;
+.field private static final aUa: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;->aUd:Ljava/util/Map;
+    sput-object v0, Lcom/google/gson/internal/h;->aTZ: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;->aUe:Ljava/util/Map;
+    sput-object v0, Lcom/google/gson/internal/h;->aUa:Ljava/util/Map;
 
     return-void
 .end method
@@ -126,7 +126,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/google/gson/internal/h;->aUd:Ljava/util/Map;
+    sget-object v0, Lcom/google/gson/internal/h;->aTZ: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;->aUd:Ljava/util/Map;
+    sget-object v0, Lcom/google/gson/internal/h;->aTZ: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 c9dbdd30fb..9eba5f4890 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 aUf:Ljava/lang/Appendable;
+.field private final aUb:Ljava/lang/Appendable;
 
-.field private final aUg:Lcom/google/gson/internal/i$a$a;
+.field private final aUc: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;->aUg:Lcom/google/gson/internal/i$a$a;
+    iput-object v0, p0, Lcom/google/gson/internal/i$a;->aUc:Lcom/google/gson/internal/i$a$a;
 
-    iput-object p1, p0, Lcom/google/gson/internal/i$a;->aUf:Ljava/lang/Appendable;
+    iput-object p1, p0, Lcom/google/gson/internal/i$a;->aUb:Ljava/lang/Appendable;
 
     return-void
 .end method
@@ -65,7 +65,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/gson/internal/i$a;->aUf:Ljava/lang/Appendable;
+    iget-object v0, p0, Lcom/google/gson/internal/i$a;->aUb:Ljava/lang/Appendable;
 
     int-to-char p1, p1
 
@@ -82,11 +82,11 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/gson/internal/i$a;->aUg:Lcom/google/gson/internal/i$a$a;
+    iget-object v0, p0, Lcom/google/gson/internal/i$a;->aUc: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;->aUf:Ljava/lang/Appendable;
+    iget-object p1, p0, Lcom/google/gson/internal/i$a;->aUb: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 eb4b1ea7e9..d74cbed7e1 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;->aVT:Lcom/google/gson/TypeAdapter;
+    sget-object v1, Lcom/google/gson/internal/a/n;->aVP: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;->aTt:Lcom/google/gson/k;
+    sget-object p0, Lcom/google/gson/k;->aTp:Lcom/google/gson/k;
 
     return-object p0
 
@@ -125,7 +125,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/google/gson/internal/a/n;->aVT:Lcom/google/gson/TypeAdapter;
+    sget-object v0, Lcom/google/gson/internal/a/n;->aVP: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 da41979320..f9a0ef20bb 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;->AS()Lcom/google/gson/internal/j;
+    value = Lcom/google/gson/internal/j;->AQ()Lcom/google/gson/internal/j;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -15,18 +15,18 @@
 
 
 # instance fields
-.field final synthetic aUh:Ljava/lang/reflect/Method;
+.field final synthetic aUd:Ljava/lang/reflect/Method;
 
-.field final synthetic aUi:Ljava/lang/Object;
+.field final synthetic aUe: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;->aUh:Ljava/lang/reflect/Method;
+    iput-object p1, p0, Lcom/google/gson/internal/j$1;->aUd:Ljava/lang/reflect/Method;
 
-    iput-object p2, p0, Lcom/google/gson/internal/j$1;->aUi:Ljava/lang/Object;
+    iput-object p2, p0, Lcom/google/gson/internal/j$1;->aUe: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;->aUh:Ljava/lang/reflect/Method;
+    iget-object v0, p0, Lcom/google/gson/internal/j$1;->aUd:Ljava/lang/reflect/Method;
 
-    iget-object v1, p0, Lcom/google/gson/internal/j$1;->aUi:Ljava/lang/Object;
+    iget-object v1, p0, Lcom/google/gson/internal/j$1;->aUe: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 d89ebec8fa..e22a518b01 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;->AS()Lcom/google/gson/internal/j;
+    value = Lcom/google/gson/internal/j;->AQ()Lcom/google/gson/internal/j;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -15,18 +15,18 @@
 
 
 # instance fields
-.field final synthetic aUj:Ljava/lang/reflect/Method;
+.field final synthetic aUf:Ljava/lang/reflect/Method;
 
-.field final synthetic aUk:I
+.field final synthetic aUg:I
 
 
 # direct methods
 .method constructor <init>(Ljava/lang/reflect/Method;I)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/gson/internal/j$2;->aUj:Ljava/lang/reflect/Method;
+    iput-object p1, p0, Lcom/google/gson/internal/j$2;->aUf:Ljava/lang/reflect/Method;
 
-    iput p2, p0, Lcom/google/gson/internal/j$2;->aUk:I
+    iput p2, p0, Lcom/google/gson/internal/j$2;->aUg: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;->aUj:Ljava/lang/reflect/Method;
+    iget-object v0, p0, Lcom/google/gson/internal/j$2;->aUf: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;->aUk:I
+    iget p1, p0, Lcom/google/gson/internal/j$2;->aUg: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 0ecfed8adb..3fe709a5f3 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;->AS()Lcom/google/gson/internal/j;
+    value = Lcom/google/gson/internal/j;->AQ()Lcom/google/gson/internal/j;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -15,14 +15,14 @@
 
 
 # instance fields
-.field final synthetic aUj:Ljava/lang/reflect/Method;
+.field final synthetic aUf: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;->aUj:Ljava/lang/reflect/Method;
+    iput-object p1, p0, Lcom/google/gson/internal/j$3;->aUf: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;->aUj:Ljava/lang/reflect/Method;
+    iget-object v0, p0, Lcom/google/gson/internal/j$3;->aUf: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 7a9593906f..106d9a25bf 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;->AS()Lcom/google/gson/internal/j;
+    value = Lcom/google/gson/internal/j;->AQ()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 5d383aaa2f..62cc532523 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 AS()Lcom/google/gson/internal/j;
+.method public static AQ()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 01fa01f0ba..83821baf65 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 aTt:Lcom/google/gson/k;
+.field public static final aTp: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;->aTt:Lcom/google/gson/k;
+    sput-object v0, Lcom/google/gson/k;->aTp: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 f56af817a1..bd15311ff8 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 aTv:[Ljava/lang/Class;
+.field private static final aTr:[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;->aTv:[Ljava/lang/Class;
+    sput-object v0, Lcom/google/gson/m;->aTr:[Ljava/lang/Class;
 
     return-void
 .end method
@@ -232,7 +232,7 @@
 
     move-result-object p0
 
-    sget-object v0, Lcom/google/gson/m;->aTv:[Ljava/lang/Class;
+    sget-object v0, Lcom/google/gson/m;->aTr:[Ljava/lang/Class;
 
     array-length v2, v0
 
@@ -315,30 +315,7 @@
 
 
 # virtual methods
-.method public final AB()Ljava/lang/Number;
-    .locals 2
-
-    iget-object v0, p0, Lcom/google/gson/m;->value:Ljava/lang/Object;
-
-    instance-of v1, v0, Ljava/lang/String;
-
-    if-eqz v1, :cond_0
-
-    new-instance v1, Lcom/google/gson/internal/f;
-
-    check-cast v0, Ljava/lang/String;
-
-    invoke-direct {v1, v0}, Lcom/google/gson/internal/f;-><init>(Ljava/lang/String;)V
-
-    return-object v1
-
-    :cond_0
-    check-cast v0, Ljava/lang/Number;
-
-    return-object v0
-.end method
-
-.method public final AC()Ljava/lang/String;
+.method public final AA()Ljava/lang/String;
     .locals 2
 
     iget-object v0, p0, Lcom/google/gson/m;->value:Ljava/lang/Object;
@@ -347,7 +324,7 @@
 
     if-eqz v1, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/gson/m;->AB()Ljava/lang/Number;
+    invoke-virtual {p0}, Lcom/google/gson/m;->Az()Ljava/lang/Number;
 
     move-result-object v0
 
@@ -376,7 +353,7 @@
     return-object v0
 .end method
 
-.method public final AD()D
+.method public final AB()D
     .locals 2
 
     iget-object v0, p0, Lcom/google/gson/m;->value:Ljava/lang/Object;
@@ -385,7 +362,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/gson/m;->AB()Ljava/lang/Number;
+    invoke-virtual {p0}, Lcom/google/gson/m;->Az()Ljava/lang/Number;
 
     move-result-object v0
 
@@ -396,7 +373,7 @@
     return-wide v0
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/gson/m;->AC()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/google/gson/m;->AA()Ljava/lang/String;
 
     move-result-object v0
 
@@ -407,7 +384,7 @@
     return-wide v0
 .end method
 
-.method public final AE()J
+.method public final AC()J
     .locals 2
 
     iget-object v0, p0, Lcom/google/gson/m;->value:Ljava/lang/Object;
@@ -416,7 +393,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/gson/m;->AB()Ljava/lang/Number;
+    invoke-virtual {p0}, Lcom/google/gson/m;->Az()Ljava/lang/Number;
 
     move-result-object v0
 
@@ -427,7 +404,7 @@
     return-wide v0
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/gson/m;->AC()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/google/gson/m;->AA()Ljava/lang/String;
 
     move-result-object v0
 
@@ -438,7 +415,7 @@
     return-wide v0
 .end method
 
-.method public final AF()I
+.method public final AD()I
     .locals 1
 
     iget-object v0, p0, Lcom/google/gson/m;->value:Ljava/lang/Object;
@@ -447,7 +424,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/gson/m;->AB()Ljava/lang/Number;
+    invoke-virtual {p0}, Lcom/google/gson/m;->Az()Ljava/lang/Number;
 
     move-result-object v0
 
@@ -458,7 +435,7 @@
     return v0
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/gson/m;->AC()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/google/gson/m;->AA()Ljava/lang/String;
 
     move-result-object v0
 
@@ -469,7 +446,7 @@
     return v0
 .end method
 
-.method public final AG()Z
+.method public final AE()Z
     .locals 2
 
     iget-object v0, p0, Lcom/google/gson/m;->value:Ljava/lang/Object;
@@ -487,7 +464,7 @@
     return v0
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/gson/m;->AC()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/google/gson/m;->AA()Ljava/lang/String;
 
     move-result-object v0
 
@@ -498,6 +475,29 @@
     return v0
 .end method
 
+.method public final Az()Ljava/lang/Number;
+    .locals 2
+
+    iget-object v0, p0, Lcom/google/gson/m;->value:Ljava/lang/Object;
+
+    instance-of v1, v0, Ljava/lang/String;
+
+    if-eqz v1, :cond_0
+
+    new-instance v1, Lcom/google/gson/internal/f;
+
+    check-cast v0, Ljava/lang/String;
+
+    invoke-direct {v1, v0}, Lcom/google/gson/internal/f;-><init>(Ljava/lang/String;)V
+
+    return-object v1
+
+    :cond_0
+    check-cast v0, Ljava/lang/Number;
+
+    return-object 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;->AB()Ljava/lang/Number;
+    invoke-virtual {p0}, Lcom/google/gson/m;->Az()Ljava/lang/Number;
 
     move-result-object v2
 
@@ -561,7 +561,7 @@
 
     move-result-wide v2
 
-    invoke-virtual {p1}, Lcom/google/gson/m;->AB()Ljava/lang/Number;
+    invoke-virtual {p1}, Lcom/google/gson/m;->Az()Ljava/lang/Number;
 
     move-result-object p1
 
@@ -591,7 +591,7 @@
 
     if-eqz v2, :cond_8
 
-    invoke-virtual {p0}, Lcom/google/gson/m;->AB()Ljava/lang/Number;
+    invoke-virtual {p0}, Lcom/google/gson/m;->Az()Ljava/lang/Number;
 
     move-result-object v2
 
@@ -599,7 +599,7 @@
 
     move-result-wide v2
 
-    invoke-virtual {p1}, Lcom/google/gson/m;->AB()Ljava/lang/Number;
+    invoke-virtual {p1}, Lcom/google/gson/m;->Az()Ljava/lang/Number;
 
     move-result-object p1
 
@@ -668,7 +668,7 @@
 
     if-eqz v0, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/gson/m;->AB()Ljava/lang/Number;
+    invoke-virtual {p0}, Lcom/google/gson/m;->Az()Ljava/lang/Number;
 
     move-result-object v0
 
@@ -692,7 +692,7 @@
 
     if-eqz v2, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/gson/m;->AB()Ljava/lang/Number;
+    invoke-virtual {p0}, Lcom/google/gson/m;->Az()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 e085d04a11..8d0c324b55 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 aTw:Lcom/google/gson/q;
+.field public static final enum aTs:Lcom/google/gson/q;
 
-.field public static final enum aTx:Lcom/google/gson/q;
+.field public static final enum aTt:Lcom/google/gson/q;
 
-.field private static final synthetic aTy:[Lcom/google/gson/q;
+.field private static final synthetic aTu:[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;->aTw:Lcom/google/gson/q;
+    sput-object v0, Lcom/google/gson/q;->aTs: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;->aTx:Lcom/google/gson/q;
+    sput-object v0, Lcom/google/gson/q;->aTt:Lcom/google/gson/q;
 
     const/4 v0, 0x2
 
     new-array v0, v0, [Lcom/google/gson/q;
 
-    sget-object v1, Lcom/google/gson/q;->aTw:Lcom/google/gson/q;
+    sget-object v1, Lcom/google/gson/q;->aTs:Lcom/google/gson/q;
 
     const/4 v2, 0x0
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/google/gson/q;->aTx:Lcom/google/gson/q;
+    sget-object v1, Lcom/google/gson/q;->aTt:Lcom/google/gson/q;
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lcom/google/gson/q;->aTy:[Lcom/google/gson/q;
+    sput-object v0, Lcom/google/gson/q;->aTu:[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;->aTy:[Lcom/google/gson/q;
+    sget-object v0, Lcom/google/gson/q;->aTu:[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 4971b2c041..e659ae09ef 100644
--- a/com.discord/smali_classes2/com/google/gson/reflect/TypeToken.smali
+++ b/com.discord/smali_classes2/com/google/gson/reflect/TypeToken.smali
@@ -15,11 +15,11 @@
 
 
 # instance fields
-.field public final aUV:Ljava/lang/reflect/Type;
+.field public final aUR:Ljava/lang/reflect/Type;
 
 .field final aW:I
 
-.field public final aWi:Ljava/lang/Class;
+.field public final aWe:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -61,17 +61,17 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/gson/reflect/TypeToken;->aUV:Ljava/lang/reflect/Type;
+    iput-object v0, p0, Lcom/google/gson/reflect/TypeToken;->aUR:Ljava/lang/reflect/Type;
 
-    iget-object v0, p0, Lcom/google/gson/reflect/TypeToken;->aUV:Ljava/lang/reflect/Type;
+    iget-object v0, p0, Lcom/google/gson/reflect/TypeToken;->aUR: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;->aWi:Ljava/lang/Class;
+    iput-object v0, p0, Lcom/google/gson/reflect/TypeToken;->aWe:Ljava/lang/Class;
 
-    iget-object v0, p0, Lcom/google/gson/reflect/TypeToken;->aUV:Ljava/lang/reflect/Type;
+    iget-object v0, p0, Lcom/google/gson/reflect/TypeToken;->aUR: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;->aUV:Ljava/lang/reflect/Type;
+    iput-object p1, p0, Lcom/google/gson/reflect/TypeToken;->aUR:Ljava/lang/reflect/Type;
 
-    iget-object p1, p0, Lcom/google/gson/reflect/TypeToken;->aUV:Ljava/lang/reflect/Type;
+    iget-object p1, p0, Lcom/google/gson/reflect/TypeToken;->aUR: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;->aWi:Ljava/lang/Class;
+    iput-object p1, p0, Lcom/google/gson/reflect/TypeToken;->aWe:Ljava/lang/Class;
 
-    iget-object p1, p0, Lcom/google/gson/reflect/TypeToken;->aUV:Ljava/lang/reflect/Type;
+    iget-object p1, p0, Lcom/google/gson/reflect/TypeToken;->aUR: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;->aUV:Ljava/lang/reflect/Type;
+    iget-object v0, p0, Lcom/google/gson/reflect/TypeToken;->aUR:Ljava/lang/reflect/Type;
 
     check-cast p1, Lcom/google/gson/reflect/TypeToken;
 
-    iget-object p1, p1, Lcom/google/gson/reflect/TypeToken;->aUV:Ljava/lang/reflect/Type;
+    iget-object p1, p1, Lcom/google/gson/reflect/TypeToken;->aUR: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;->aUV:Ljava/lang/reflect/Type;
+    iget-object v0, p0, Lcom/google/gson/reflect/TypeToken;->aUR: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 ec2a60c926..bd77b659d7 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;->AT()Ljava/lang/Object;
+    invoke-virtual {p1}, Lcom/google/gson/internal/a/e;->AR()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 424e3b4649..fc24e197e6 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 aWj:Ljava/lang/Object;
+.field private static final aWf:Ljava/lang/Object;
 
 
 # instance fields
-.field private aWk:Ljava/nio/ByteBuffer;
+.field private aWg:Ljava/nio/ByteBuffer;
 
 
 # direct methods
@@ -32,7 +32,7 @@
 
     invoke-direct {v0}, Ljava/lang/Object;-><init>()V
 
-    sput-object v0, Lcom/jpegkit/Jpeg;->aWj:Ljava/lang/Object;
+    sput-object v0, Lcom/jpegkit/Jpeg;->aWf: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;->aWj:Ljava/lang/Object;
+    sget-object v0, Lcom/jpegkit/Jpeg;->aWf:Ljava/lang/Object;
 
     monitor-enter v0
 
@@ -69,7 +69,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/jpegkit/Jpeg;->aWk:Ljava/nio/ByteBuffer;
+    iput-object p1, p0, Lcom/jpegkit/Jpeg;->aWg:Ljava/nio/ByteBuffer;
 
     monitor-exit v0
 
@@ -117,15 +117,15 @@
 
 
 # virtual methods
-.method public final AW()[B
+.method public final AU()[B
     .locals 2
 
-    sget-object v0, Lcom/jpegkit/Jpeg;->aWj:Ljava/lang/Object;
+    sget-object v0, Lcom/jpegkit/Jpeg;->aWf:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/jpegkit/Jpeg;->aWk:Ljava/nio/ByteBuffer;
+    iget-object v1, p0, Lcom/jpegkit/Jpeg;->aWg: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;->aWj:Ljava/lang/Object;
+    sget-object v0, Lcom/jpegkit/Jpeg;->aWf:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/jpegkit/Jpeg;->aWk:Ljava/nio/ByteBuffer;
+    iget-object v1, p0, Lcom/jpegkit/Jpeg;->aWg: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;->aWj:Ljava/lang/Object;
+    sget-object v0, Lcom/jpegkit/Jpeg;->aWf:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/jpegkit/Jpeg;->aWk:Ljava/nio/ByteBuffer;
+    iget-object v1, p0, Lcom/jpegkit/Jpeg;->aWg: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;->AW()[B
+    invoke-virtual {p0}, Lcom/jpegkit/Jpeg;->AU()[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 61b22f0d11..58e436a7a0 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 AX()Lcom/lytefast/flexinput/utils/SelectionAggregator;
+.method public abstract AV()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 bcf31db9a0..9ce1259ea1 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/R$b.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/R$b.smali
@@ -729,407 +729,407 @@
 
 .field public static final layout_scrollInterpolator:I = 0x7f040253
 
-.field public static final liftOnScroll:I = 0x7f040259
+.field public static final liftOnScroll:I = 0x7f040258
 
-.field public static final lineHeight:I = 0x7f04025a
+.field public static final lineHeight:I = 0x7f040259
 
-.field public static final lineSpacing:I = 0x7f04025b
+.field public static final lineSpacing:I = 0x7f04025a
 
-.field public static final listChoiceBackgroundIndicator:I = 0x7f04025c
+.field public static final listChoiceBackgroundIndicator:I = 0x7f04025b
 
-.field public static final listDividerAlertDialog:I = 0x7f04025d
+.field public static final listDividerAlertDialog:I = 0x7f04025c
 
-.field public static final listItemLayout:I = 0x7f04025e
+.field public static final listItemLayout:I = 0x7f04025d
 
-.field public static final listLayout:I = 0x7f04025f
+.field public static final listLayout:I = 0x7f04025e
 
-.field public static final listMenuViewStyle:I = 0x7f040260
+.field public static final listMenuViewStyle:I = 0x7f04025f
 
-.field public static final listPopupWindowStyle:I = 0x7f040261
+.field public static final listPopupWindowStyle:I = 0x7f040260
 
-.field public static final listPreferredItemHeight:I = 0x7f040262
+.field public static final listPreferredItemHeight:I = 0x7f040261
 
-.field public static final listPreferredItemHeightLarge:I = 0x7f040263
+.field public static final listPreferredItemHeightLarge:I = 0x7f040262
 
-.field public static final listPreferredItemHeightSmall:I = 0x7f040264
+.field public static final listPreferredItemHeightSmall:I = 0x7f040263
 
-.field public static final listPreferredItemPaddingLeft:I = 0x7f040265
+.field public static final listPreferredItemPaddingLeft:I = 0x7f040264
 
-.field public static final listPreferredItemPaddingRight:I = 0x7f040266
+.field public static final listPreferredItemPaddingRight:I = 0x7f040265
 
-.field public static final logo:I = 0x7f040267
+.field public static final logo:I = 0x7f040266
 
-.field public static final logoDescription:I = 0x7f040268
+.field public static final logoDescription:I = 0x7f040267
 
-.field public static final materialButtonStyle:I = 0x7f040278
+.field public static final materialButtonStyle:I = 0x7f040277
 
-.field public static final materialCardViewStyle:I = 0x7f040279
+.field public static final materialCardViewStyle:I = 0x7f040278
 
-.field public static final maxActionInlineWidth:I = 0x7f04027a
+.field public static final maxActionInlineWidth:I = 0x7f040279
 
-.field public static final maxButtonHeight:I = 0x7f04027b
+.field public static final maxButtonHeight:I = 0x7f04027a
 
-.field public static final maxImageSize:I = 0x7f04027c
+.field public static final maxImageSize:I = 0x7f04027b
 
-.field public static final measureWithLargestChild:I = 0x7f04027e
+.field public static final measureWithLargestChild:I = 0x7f04027d
 
-.field public static final menu:I = 0x7f04027f
+.field public static final menu:I = 0x7f04027e
 
-.field public static final multiChoiceItemLayout:I = 0x7f040280
+.field public static final multiChoiceItemLayout:I = 0x7f04027f
 
-.field public static final navigationContentDescription:I = 0x7f040281
+.field public static final navigationContentDescription:I = 0x7f040280
 
-.field public static final navigationIcon:I = 0x7f040282
+.field public static final navigationIcon:I = 0x7f040281
 
-.field public static final navigationMode:I = 0x7f040283
+.field public static final navigationMode:I = 0x7f040282
 
-.field public static final navigationViewStyle:I = 0x7f040284
+.field public static final navigationViewStyle:I = 0x7f040283
 
-.field public static final numericModifiers:I = 0x7f040287
+.field public static final numericModifiers:I = 0x7f040286
 
-.field public static final overlapAnchor:I = 0x7f040288
+.field public static final overlapAnchor:I = 0x7f040287
 
-.field public static final overlayImage:I = 0x7f040289
+.field public static final overlayImage:I = 0x7f040288
 
-.field public static final paddingBottomNoButtons:I = 0x7f04028c
+.field public static final paddingBottomNoButtons:I = 0x7f04028b
 
-.field public static final paddingEnd:I = 0x7f04028d
+.field public static final paddingEnd:I = 0x7f04028c
 
-.field public static final paddingStart:I = 0x7f04028e
+.field public static final paddingStart:I = 0x7f04028d
 
-.field public static final paddingTopNoTitle:I = 0x7f04028f
+.field public static final paddingTopNoTitle:I = 0x7f04028e
 
-.field public static final panelBackground:I = 0x7f040290
+.field public static final panelBackground:I = 0x7f04028f
 
-.field public static final panelMenuListTheme:I = 0x7f040291
+.field public static final panelMenuListTheme:I = 0x7f040290
 
-.field public static final panelMenuListWidth:I = 0x7f040292
+.field public static final panelMenuListWidth:I = 0x7f040291
 
-.field public static final passwordToggleContentDescription:I = 0x7f040293
+.field public static final passwordToggleContentDescription:I = 0x7f040292
 
-.field public static final passwordToggleDrawable:I = 0x7f040294
+.field public static final passwordToggleDrawable:I = 0x7f040293
 
-.field public static final passwordToggleEnabled:I = 0x7f040295
+.field public static final passwordToggleEnabled:I = 0x7f040294
 
-.field public static final passwordToggleTint:I = 0x7f040296
+.field public static final passwordToggleTint:I = 0x7f040295
 
-.field public static final passwordToggleTintMode:I = 0x7f040297
+.field public static final passwordToggleTintMode:I = 0x7f040296
 
-.field public static final placeholderImage:I = 0x7f040298
+.field public static final placeholderImage:I = 0x7f040297
 
-.field public static final placeholderImageScaleType:I = 0x7f040299
+.field public static final placeholderImageScaleType:I = 0x7f040298
 
-.field public static final popupMenuStyle:I = 0x7f04029a
+.field public static final popupMenuStyle:I = 0x7f040299
 
-.field public static final popupTheme:I = 0x7f04029b
+.field public static final popupTheme:I = 0x7f04029a
 
-.field public static final popupWindowStyle:I = 0x7f04029c
+.field public static final popupWindowStyle:I = 0x7f04029b
 
-.field public static final preserveIconSpacing:I = 0x7f04029d
+.field public static final preserveIconSpacing:I = 0x7f04029c
 
-.field public static final pressedStateOverlayImage:I = 0x7f04029e
+.field public static final pressedStateOverlayImage:I = 0x7f04029d
 
-.field public static final pressedTranslationZ:I = 0x7f04029f
+.field public static final pressedTranslationZ:I = 0x7f04029e
 
-.field public static final previewBackground:I = 0x7f0402a0
+.field public static final previewBackground:I = 0x7f04029f
 
-.field public static final progressBarAutoRotateInterval:I = 0x7f0402c6
+.field public static final progressBarAutoRotateInterval:I = 0x7f0402c5
 
-.field public static final progressBarImage:I = 0x7f0402c7
+.field public static final progressBarImage:I = 0x7f0402c6
 
-.field public static final progressBarImageScaleType:I = 0x7f0402c8
+.field public static final progressBarImageScaleType:I = 0x7f0402c7
 
-.field public static final progressBarPadding:I = 0x7f0402c9
+.field public static final progressBarPadding:I = 0x7f0402c8
 
-.field public static final progressBarStyle:I = 0x7f0402ca
+.field public static final progressBarStyle:I = 0x7f0402c9
 
-.field public static final queryBackground:I = 0x7f0402cd
+.field public static final queryBackground:I = 0x7f0402cc
 
-.field public static final queryHint:I = 0x7f0402ce
+.field public static final queryHint:I = 0x7f0402cd
 
-.field public static final radioButtonStyle:I = 0x7f0402cf
+.field public static final radioButtonStyle:I = 0x7f0402ce
 
-.field public static final ratingBarStyle:I = 0x7f0402d2
+.field public static final ratingBarStyle:I = 0x7f0402d1
 
-.field public static final ratingBarStyleIndicator:I = 0x7f0402d3
+.field public static final ratingBarStyleIndicator:I = 0x7f0402d2
 
-.field public static final ratingBarStyleSmall:I = 0x7f0402d4
+.field public static final ratingBarStyleSmall:I = 0x7f0402d3
 
-.field public static final retryImage:I = 0x7f0402d5
+.field public static final retryImage:I = 0x7f0402d4
 
-.field public static final retryImageScaleType:I = 0x7f0402d6
+.field public static final retryImageScaleType:I = 0x7f0402d5
 
-.field public static final reverseLayout:I = 0x7f0402d7
+.field public static final reverseLayout:I = 0x7f0402d6
 
-.field public static final rippleColor:I = 0x7f0402d8
+.field public static final rippleColor:I = 0x7f0402d7
 
-.field public static final roundAsCircle:I = 0x7f0402d9
+.field public static final roundAsCircle:I = 0x7f0402d8
 
-.field public static final roundBottomEnd:I = 0x7f0402da
+.field public static final roundBottomEnd:I = 0x7f0402d9
 
-.field public static final roundBottomLeft:I = 0x7f0402db
+.field public static final roundBottomLeft:I = 0x7f0402da
 
-.field public static final roundBottomRight:I = 0x7f0402dc
+.field public static final roundBottomRight:I = 0x7f0402db
 
-.field public static final roundBottomStart:I = 0x7f0402dd
+.field public static final roundBottomStart:I = 0x7f0402dc
 
-.field public static final roundTopEnd:I = 0x7f0402de
+.field public static final roundTopEnd:I = 0x7f0402dd
 
-.field public static final roundTopLeft:I = 0x7f0402df
+.field public static final roundTopLeft:I = 0x7f0402de
 
-.field public static final roundTopRight:I = 0x7f0402e0
+.field public static final roundTopRight:I = 0x7f0402df
 
-.field public static final roundTopStart:I = 0x7f0402e1
+.field public static final roundTopStart:I = 0x7f0402e0
 
-.field public static final roundWithOverlayColor:I = 0x7f0402e2
+.field public static final roundWithOverlayColor:I = 0x7f0402e1
 
-.field public static final roundedCornerRadius:I = 0x7f0402e3
+.field public static final roundedCornerRadius:I = 0x7f0402e2
 
-.field public static final roundingBorderColor:I = 0x7f0402e4
+.field public static final roundingBorderColor:I = 0x7f0402e3
 
-.field public static final roundingBorderPadding:I = 0x7f0402e5
+.field public static final roundingBorderPadding:I = 0x7f0402e4
 
-.field public static final roundingBorderWidth:I = 0x7f0402e6
+.field public static final roundingBorderWidth:I = 0x7f0402e5
 
-.field public static final scrimAnimationDuration:I = 0x7f0402f6
+.field public static final scrimAnimationDuration:I = 0x7f0402f5
 
-.field public static final scrimBackground:I = 0x7f0402f7
+.field public static final scrimBackground:I = 0x7f0402f6
 
-.field public static final scrimVisibleHeightTrigger:I = 0x7f0402f8
+.field public static final scrimVisibleHeightTrigger:I = 0x7f0402f7
 
-.field public static final searchHintIcon:I = 0x7f0402f9
+.field public static final searchHintIcon:I = 0x7f0402f8
 
-.field public static final searchIcon:I = 0x7f0402fa
+.field public static final searchIcon:I = 0x7f0402f9
 
-.field public static final searchViewStyle:I = 0x7f0402fb
+.field public static final searchViewStyle:I = 0x7f0402fa
 
-.field public static final seekBarStyle:I = 0x7f0402fd
+.field public static final seekBarStyle:I = 0x7f0402fc
 
-.field public static final selectableItemBackground:I = 0x7f0402fe
+.field public static final selectableItemBackground:I = 0x7f0402fd
 
-.field public static final selectableItemBackgroundBorderless:I = 0x7f0402ff
+.field public static final selectableItemBackgroundBorderless:I = 0x7f0402fe
 
-.field public static final showAsAction:I = 0x7f040301
+.field public static final showAsAction:I = 0x7f040300
 
-.field public static final showDividers:I = 0x7f040305
+.field public static final showDividers:I = 0x7f040304
 
-.field public static final showMotionSpec:I = 0x7f040306
+.field public static final showMotionSpec:I = 0x7f040305
 
-.field public static final showText:I = 0x7f040307
+.field public static final showText:I = 0x7f040306
 
-.field public static final showTitle:I = 0x7f040308
+.field public static final showTitle:I = 0x7f040307
 
-.field public static final singleChoiceItemLayout:I = 0x7f040309
+.field public static final singleChoiceItemLayout:I = 0x7f040308
 
-.field public static final singleLine:I = 0x7f04030a
+.field public static final singleLine:I = 0x7f040309
 
-.field public static final singleSelection:I = 0x7f04030b
+.field public static final singleSelection:I = 0x7f04030a
 
-.field public static final snackbarButtonStyle:I = 0x7f04030c
+.field public static final snackbarButtonStyle:I = 0x7f04030b
 
-.field public static final snackbarStyle:I = 0x7f04030d
+.field public static final snackbarStyle:I = 0x7f04030c
 
-.field public static final spanCount:I = 0x7f04030e
+.field public static final spanCount:I = 0x7f04030d
 
-.field public static final spinBars:I = 0x7f04030f
+.field public static final spinBars:I = 0x7f04030e
 
-.field public static final spinnerDropDownItemStyle:I = 0x7f040310
+.field public static final spinnerDropDownItemStyle:I = 0x7f04030f
 
-.field public static final spinnerStyle:I = 0x7f040311
+.field public static final spinnerStyle:I = 0x7f040310
 
-.field public static final splitTrack:I = 0x7f040312
+.field public static final splitTrack:I = 0x7f040311
 
-.field public static final srcCompat:I = 0x7f040313
+.field public static final srcCompat:I = 0x7f040312
 
-.field public static final stackFromEnd:I = 0x7f040314
+.field public static final stackFromEnd:I = 0x7f040313
 
-.field public static final state_above_anchor:I = 0x7f040315
+.field public static final state_above_anchor:I = 0x7f040314
 
-.field public static final state_collapsed:I = 0x7f040316
+.field public static final state_collapsed:I = 0x7f040315
 
-.field public static final state_collapsible:I = 0x7f040317
+.field public static final state_collapsible:I = 0x7f040316
 
-.field public static final state_liftable:I = 0x7f040318
+.field public static final state_liftable:I = 0x7f040317
 
-.field public static final state_lifted:I = 0x7f040319
+.field public static final state_lifted:I = 0x7f040318
 
-.field public static final statusBarBackground:I = 0x7f04031a
+.field public static final statusBarBackground:I = 0x7f040319
 
-.field public static final statusBarScrim:I = 0x7f04031b
+.field public static final statusBarScrim:I = 0x7f04031a
 
-.field public static final strokeColor:I = 0x7f04031f
+.field public static final strokeColor:I = 0x7f04031e
 
-.field public static final strokeWidth:I = 0x7f040320
+.field public static final strokeWidth:I = 0x7f04031f
 
-.field public static final subMenuArrow:I = 0x7f040321
+.field public static final subMenuArrow:I = 0x7f040320
 
-.field public static final submitBackground:I = 0x7f040322
+.field public static final submitBackground:I = 0x7f040321
 
-.field public static final subtitle:I = 0x7f040323
+.field public static final subtitle:I = 0x7f040322
 
-.field public static final subtitleTextAppearance:I = 0x7f040324
+.field public static final subtitleTextAppearance:I = 0x7f040323
 
-.field public static final subtitleTextColor:I = 0x7f040325
+.field public static final subtitleTextColor:I = 0x7f040324
 
-.field public static final subtitleTextStyle:I = 0x7f040326
+.field public static final subtitleTextStyle:I = 0x7f040325
 
-.field public static final suggestionRowLayout:I = 0x7f040327
+.field public static final suggestionRowLayout:I = 0x7f040326
 
-.field public static final switchMinWidth:I = 0x7f040328
+.field public static final switchMinWidth:I = 0x7f040327
 
-.field public static final switchPadding:I = 0x7f040329
+.field public static final switchPadding:I = 0x7f040328
 
-.field public static final switchStyle:I = 0x7f04032a
+.field public static final switchStyle:I = 0x7f040329
 
-.field public static final switchTextAppearance:I = 0x7f04032b
+.field public static final switchTextAppearance:I = 0x7f04032a
 
-.field public static final tabBackground:I = 0x7f04032c
+.field public static final tabBackground:I = 0x7f04032b
 
-.field public static final tabContentStart:I = 0x7f04032d
+.field public static final tabContentStart:I = 0x7f04032c
 
-.field public static final tabGravity:I = 0x7f04032e
+.field public static final tabGravity:I = 0x7f04032d
 
-.field public static final tabIconTint:I = 0x7f04032f
+.field public static final tabIconTint:I = 0x7f04032e
 
-.field public static final tabIconTintMode:I = 0x7f040330
+.field public static final tabIconTintMode:I = 0x7f04032f
 
-.field public static final tabIndicator:I = 0x7f040331
+.field public static final tabIndicator:I = 0x7f040330
 
-.field public static final tabIndicatorAnimationDuration:I = 0x7f040332
+.field public static final tabIndicatorAnimationDuration:I = 0x7f040331
 
-.field public static final tabIndicatorColor:I = 0x7f040333
+.field public static final tabIndicatorColor:I = 0x7f040332
 
-.field public static final tabIndicatorFullWidth:I = 0x7f040334
+.field public static final tabIndicatorFullWidth:I = 0x7f040333
 
-.field public static final tabIndicatorGravity:I = 0x7f040335
+.field public static final tabIndicatorGravity:I = 0x7f040334
 
-.field public static final tabIndicatorHeight:I = 0x7f040336
+.field public static final tabIndicatorHeight:I = 0x7f040335
 
-.field public static final tabInlineLabel:I = 0x7f040337
+.field public static final tabInlineLabel:I = 0x7f040336
 
-.field public static final tabMaxWidth:I = 0x7f040338
+.field public static final tabMaxWidth:I = 0x7f040337
 
-.field public static final tabMinWidth:I = 0x7f040339
+.field public static final tabMinWidth:I = 0x7f040338
 
-.field public static final tabMode:I = 0x7f04033a
+.field public static final tabMode:I = 0x7f040339
 
-.field public static final tabPadding:I = 0x7f04033b
+.field public static final tabPadding:I = 0x7f04033a
 
-.field public static final tabPaddingBottom:I = 0x7f04033c
+.field public static final tabPaddingBottom:I = 0x7f04033b
 
-.field public static final tabPaddingEnd:I = 0x7f04033d
+.field public static final tabPaddingEnd:I = 0x7f04033c
 
-.field public static final tabPaddingStart:I = 0x7f04033e
+.field public static final tabPaddingStart:I = 0x7f04033d
 
-.field public static final tabPaddingTop:I = 0x7f04033f
+.field public static final tabPaddingTop:I = 0x7f04033e
 
-.field public static final tabRippleColor:I = 0x7f040340
+.field public static final tabRippleColor:I = 0x7f04033f
 
-.field public static final tabSelectedTextColor:I = 0x7f040341
+.field public static final tabSelectedTextColor:I = 0x7f040340
 
-.field public static final tabStyle:I = 0x7f040342
+.field public static final tabStyle:I = 0x7f040341
 
-.field public static final tabTextAppearance:I = 0x7f040343
+.field public static final tabTextAppearance:I = 0x7f040342
 
-.field public static final tabTextColor:I = 0x7f040344
+.field public static final tabTextColor:I = 0x7f040343
 
-.field public static final tabUnboundedRipple:I = 0x7f040345
+.field public static final tabUnboundedRipple:I = 0x7f040344
 
-.field public static final textAllCaps:I = 0x7f040349
+.field public static final textAllCaps:I = 0x7f040348
 
-.field public static final textAppearanceBody1:I = 0x7f04034a
+.field public static final textAppearanceBody1:I = 0x7f040349
 
-.field public static final textAppearanceBody2:I = 0x7f04034b
+.field public static final textAppearanceBody2:I = 0x7f04034a
 
-.field public static final textAppearanceButton:I = 0x7f04034c
+.field public static final textAppearanceButton:I = 0x7f04034b
 
-.field public static final textAppearanceCaption:I = 0x7f04034d
+.field public static final textAppearanceCaption:I = 0x7f04034c
 
-.field public static final textAppearanceHeadline1:I = 0x7f04034e
+.field public static final textAppearanceHeadline1:I = 0x7f04034d
 
-.field public static final textAppearanceHeadline2:I = 0x7f04034f
+.field public static final textAppearanceHeadline2:I = 0x7f04034e
 
-.field public static final textAppearanceHeadline3:I = 0x7f040350
+.field public static final textAppearanceHeadline3:I = 0x7f04034f
 
-.field public static final textAppearanceHeadline4:I = 0x7f040351
+.field public static final textAppearanceHeadline4:I = 0x7f040350
 
-.field public static final textAppearanceHeadline5:I = 0x7f040352
+.field public static final textAppearanceHeadline5:I = 0x7f040351
 
-.field public static final textAppearanceHeadline6:I = 0x7f040353
+.field public static final textAppearanceHeadline6:I = 0x7f040352
 
-.field public static final textAppearanceLargePopupMenu:I = 0x7f040354
+.field public static final textAppearanceLargePopupMenu:I = 0x7f040353
 
-.field public static final textAppearanceListItem:I = 0x7f040355
+.field public static final textAppearanceListItem:I = 0x7f040354
 
-.field public static final textAppearanceListItemSecondary:I = 0x7f040356
+.field public static final textAppearanceListItemSecondary:I = 0x7f040355
 
-.field public static final textAppearanceListItemSmall:I = 0x7f040357
+.field public static final textAppearanceListItemSmall:I = 0x7f040356
 
-.field public static final textAppearanceOverline:I = 0x7f040358
+.field public static final textAppearanceOverline:I = 0x7f040357
 
-.field public static final textAppearancePopupMenuHeader:I = 0x7f040359
+.field public static final textAppearancePopupMenuHeader:I = 0x7f040358
 
-.field public static final textAppearanceSearchResultSubtitle:I = 0x7f04035a
+.field public static final textAppearanceSearchResultSubtitle:I = 0x7f040359
 
-.field public static final textAppearanceSearchResultTitle:I = 0x7f04035b
+.field public static final textAppearanceSearchResultTitle:I = 0x7f04035a
 
-.field public static final textAppearanceSmallPopupMenu:I = 0x7f04035c
+.field public static final textAppearanceSmallPopupMenu:I = 0x7f04035b
 
-.field public static final textAppearanceSubtitle1:I = 0x7f04035d
+.field public static final textAppearanceSubtitle1:I = 0x7f04035c
 
-.field public static final textAppearanceSubtitle2:I = 0x7f04035e
+.field public static final textAppearanceSubtitle2:I = 0x7f04035d
 
-.field public static final textColorAlertDialogListItem:I = 0x7f04035f
+.field public static final textColorAlertDialogListItem:I = 0x7f04035e
 
-.field public static final textColorSearchUrl:I = 0x7f040360
+.field public static final textColorSearchUrl:I = 0x7f04035f
 
-.field public static final textEndPadding:I = 0x7f040361
+.field public static final textEndPadding:I = 0x7f040360
 
-.field public static final textInputStyle:I = 0x7f040362
+.field public static final textInputStyle:I = 0x7f040361
 
-.field public static final textStartPadding:I = 0x7f040363
+.field public static final textStartPadding:I = 0x7f040362
 
-.field public static final theme:I = 0x7f040365
+.field public static final theme:I = 0x7f040364
 
-.field public static final thickness:I = 0x7f0403b6
+.field public static final thickness:I = 0x7f0403b5
 
-.field public static final thumbTextPadding:I = 0x7f0403b7
+.field public static final thumbTextPadding:I = 0x7f0403b6
 
-.field public static final thumbTint:I = 0x7f0403b8
+.field public static final thumbTint:I = 0x7f0403b7
 
-.field public static final thumbTintMode:I = 0x7f0403b9
+.field public static final thumbTintMode:I = 0x7f0403b8
 
-.field public static final tickMark:I = 0x7f0403ba
+.field public static final tickMark:I = 0x7f0403b9
 
-.field public static final tickMarkTint:I = 0x7f0403bb
+.field public static final tickMarkTint:I = 0x7f0403ba
 
-.field public static final tickMarkTintMode:I = 0x7f0403bc
+.field public static final tickMarkTintMode:I = 0x7f0403bb
 
-.field public static final tint:I = 0x7f0403bd
+.field public static final tint:I = 0x7f0403bc
 
-.field public static final tintMode:I = 0x7f0403be
+.field public static final tintMode:I = 0x7f0403bd
 
-.field public static final title:I = 0x7f0403bf
+.field public static final title:I = 0x7f0403be
 
-.field public static final titleEnabled:I = 0x7f0403c0
+.field public static final titleEnabled:I = 0x7f0403bf
 
-.field public static final titleMargin:I = 0x7f0403c1
+.field public static final titleMargin:I = 0x7f0403c0
 
-.field public static final titleMarginBottom:I = 0x7f0403c2
+.field public static final titleMarginBottom:I = 0x7f0403c1
 
-.field public static final titleMarginEnd:I = 0x7f0403c3
+.field public static final titleMarginEnd:I = 0x7f0403c2
 
-.field public static final titleMarginStart:I = 0x7f0403c4
+.field public static final titleMarginStart:I = 0x7f0403c3
 
-.field public static final titleMarginTop:I = 0x7f0403c5
+.field public static final titleMarginTop:I = 0x7f0403c4
 
-.field public static final titleMargins:I = 0x7f0403c6
+.field public static final titleMargins:I = 0x7f0403c5
 
-.field public static final titleTextAppearance:I = 0x7f0403c7
+.field public static final titleTextAppearance:I = 0x7f0403c6
 
-.field public static final titleTextColor:I = 0x7f0403c8
+.field public static final titleTextColor:I = 0x7f0403c7
 
-.field public static final titleTextStyle:I = 0x7f0403c9
+.field public static final titleTextStyle:I = 0x7f0403c8
 
 .field public static final toolbarId:I = 0x7f0403ca
 
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 fa8f5d191a..ebc45bdf00 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 = 0x7f060035
+.field public static final bright_foreground_disabled_material_dark:I = 0x7f060034
 
-.field public static final bright_foreground_disabled_material_light:I = 0x7f060036
+.field public static final bright_foreground_disabled_material_light:I = 0x7f060035
 
-.field public static final bright_foreground_inverse_material_dark:I = 0x7f060037
+.field public static final bright_foreground_inverse_material_dark:I = 0x7f060036
 
-.field public static final bright_foreground_inverse_material_light:I = 0x7f060038
+.field public static final bright_foreground_inverse_material_light:I = 0x7f060037
 
-.field public static final bright_foreground_material_dark:I = 0x7f060039
+.field public static final bright_foreground_material_dark:I = 0x7f060038
 
-.field public static final bright_foreground_material_light:I = 0x7f06003a
+.field public static final bright_foreground_material_light:I = 0x7f060039
 
-.field public static final button_color_selector:I = 0x7f06003f
+.field public static final button_color_selector:I = 0x7f06003e
 
-.field public static final button_material_dark:I = 0x7f060040
+.field public static final button_material_dark:I = 0x7f06003f
 
-.field public static final button_material_light:I = 0x7f060041
+.field public static final button_material_light:I = 0x7f060040
 
-.field public static final cardview_dark_background:I = 0x7f060042
+.field public static final cardview_dark_background:I = 0x7f060041
 
-.field public static final cardview_light_background:I = 0x7f060043
+.field public static final cardview_light_background:I = 0x7f060042
 
-.field public static final cardview_shadow_end_color:I = 0x7f060044
+.field public static final cardview_shadow_end_color:I = 0x7f060043
 
-.field public static final cardview_shadow_start_color:I = 0x7f060045
+.field public static final cardview_shadow_start_color:I = 0x7f060044
 
-.field public static final colorPrimary:I = 0x7f06004b
+.field public static final colorPrimary:I = 0x7f06004a
 
-.field public static final colorPrimaryDark:I = 0x7f06004c
+.field public static final colorPrimaryDark:I = 0x7f06004b
 
-.field public static final design_bottom_navigation_shadow_color:I = 0x7f06005c
+.field public static final design_bottom_navigation_shadow_color:I = 0x7f06005b
 
-.field public static final design_default_color_primary:I = 0x7f06005d
+.field public static final design_default_color_primary:I = 0x7f06005c
 
-.field public static final design_default_color_primary_dark:I = 0x7f06005e
+.field public static final design_default_color_primary_dark:I = 0x7f06005d
 
-.field public static final design_error:I = 0x7f06005f
+.field public static final design_error:I = 0x7f06005e
 
-.field public static final design_fab_shadow_end_color:I = 0x7f060060
+.field public static final design_fab_shadow_end_color:I = 0x7f06005f
 
-.field public static final design_fab_shadow_mid_color:I = 0x7f060061
+.field public static final design_fab_shadow_mid_color:I = 0x7f060060
 
-.field public static final design_fab_shadow_start_color:I = 0x7f060062
+.field public static final design_fab_shadow_start_color:I = 0x7f060061
 
-.field public static final design_fab_stroke_end_inner_color:I = 0x7f060063
+.field public static final design_fab_stroke_end_inner_color:I = 0x7f060062
 
-.field public static final design_fab_stroke_end_outer_color:I = 0x7f060064
+.field public static final design_fab_stroke_end_outer_color:I = 0x7f060063
 
-.field public static final design_fab_stroke_top_inner_color:I = 0x7f060065
+.field public static final design_fab_stroke_top_inner_color:I = 0x7f060064
 
-.field public static final design_fab_stroke_top_outer_color:I = 0x7f060066
+.field public static final design_fab_stroke_top_outer_color:I = 0x7f060065
 
-.field public static final design_snackbar_background_color:I = 0x7f060067
+.field public static final design_snackbar_background_color:I = 0x7f060066
 
-.field public static final design_tint_password_toggle:I = 0x7f060068
+.field public static final design_tint_password_toggle:I = 0x7f060067
 
-.field public static final dim_foreground_disabled_material_dark:I = 0x7f060069
+.field public static final dim_foreground_disabled_material_dark:I = 0x7f060068
 
-.field public static final dim_foreground_disabled_material_light:I = 0x7f06006a
+.field public static final dim_foreground_disabled_material_light:I = 0x7f060069
 
-.field public static final dim_foreground_material_dark:I = 0x7f06006b
+.field public static final dim_foreground_material_dark:I = 0x7f06006a
 
-.field public static final dim_foreground_material_light:I = 0x7f06006c
+.field public static final dim_foreground_material_light:I = 0x7f06006b
 
-.field public static final error_color_material_dark:I = 0x7f06006d
+.field public static final error_color_material_dark:I = 0x7f06006c
 
-.field public static final error_color_material_light:I = 0x7f06006e
+.field public static final error_color_material_light:I = 0x7f06006d
 
-.field public static final flexInputIconColor:I = 0x7f060070
+.field public static final flexInputIconColor:I = 0x7f06006f
 
-.field public static final flexInputIconColorActivated:I = 0x7f060071
+.field public static final flexInputIconColorActivated:I = 0x7f060070
 
-.field public static final flexInputIconColorDisabled:I = 0x7f060072
+.field public static final flexInputIconColorDisabled:I = 0x7f060071
 
-.field public static final foreground_material_dark:I = 0x7f060073
+.field public static final foreground_material_dark:I = 0x7f060072
 
-.field public static final foreground_material_light:I = 0x7f060074
+.field public static final foreground_material_light:I = 0x7f060073
 
-.field public static final highlighted_text_material_dark:I = 0x7f060083
+.field public static final highlighted_text_material_dark:I = 0x7f060082
 
-.field public static final highlighted_text_material_light:I = 0x7f060084
+.field public static final highlighted_text_material_light:I = 0x7f060083
 
-.field public static final material_blue_grey_800:I = 0x7f060092
+.field public static final material_blue_grey_800:I = 0x7f060091
 
-.field public static final material_blue_grey_900:I = 0x7f060093
+.field public static final material_blue_grey_900:I = 0x7f060092
 
-.field public static final material_blue_grey_950:I = 0x7f060094
+.field public static final material_blue_grey_950:I = 0x7f060093
 
-.field public static final material_deep_teal_200:I = 0x7f060095
+.field public static final material_deep_teal_200:I = 0x7f060094
 
-.field public static final material_deep_teal_500:I = 0x7f060096
+.field public static final material_deep_teal_500:I = 0x7f060095
 
-.field public static final material_grey_100:I = 0x7f060097
+.field public static final material_grey_100:I = 0x7f060096
 
-.field public static final material_grey_300:I = 0x7f060098
+.field public static final material_grey_300:I = 0x7f060097
 
-.field public static final material_grey_50:I = 0x7f060099
+.field public static final material_grey_50:I = 0x7f060098
 
-.field public static final material_grey_600:I = 0x7f06009a
+.field public static final material_grey_600:I = 0x7f060099
 
-.field public static final material_grey_800:I = 0x7f06009b
+.field public static final material_grey_800:I = 0x7f06009a
 
-.field public static final material_grey_850:I = 0x7f06009c
+.field public static final material_grey_850:I = 0x7f06009b
 
-.field public static final material_grey_900:I = 0x7f06009d
+.field public static final material_grey_900:I = 0x7f06009c
 
-.field public static final mtrl_bottom_nav_colored_item_tint:I = 0x7f06009e
+.field public static final mtrl_bottom_nav_colored_item_tint:I = 0x7f06009d
 
-.field public static final mtrl_bottom_nav_item_tint:I = 0x7f06009f
+.field public static final mtrl_bottom_nav_item_tint:I = 0x7f06009e
 
-.field public static final mtrl_btn_bg_color_disabled:I = 0x7f0600a0
+.field public static final mtrl_btn_bg_color_disabled:I = 0x7f06009f
 
-.field public static final mtrl_btn_bg_color_selector:I = 0x7f0600a1
+.field public static final mtrl_btn_bg_color_selector:I = 0x7f0600a0
 
-.field public static final mtrl_btn_ripple_color:I = 0x7f0600a2
+.field public static final mtrl_btn_ripple_color:I = 0x7f0600a1
 
-.field public static final mtrl_btn_stroke_color_selector:I = 0x7f0600a3
+.field public static final mtrl_btn_stroke_color_selector:I = 0x7f0600a2
 
-.field public static final mtrl_btn_text_btn_ripple_color:I = 0x7f0600a4
+.field public static final mtrl_btn_text_btn_ripple_color:I = 0x7f0600a3
 
-.field public static final mtrl_btn_text_color_disabled:I = 0x7f0600a5
+.field public static final mtrl_btn_text_color_disabled:I = 0x7f0600a4
 
-.field public static final mtrl_btn_text_color_selector:I = 0x7f0600a6
+.field public static final mtrl_btn_text_color_selector:I = 0x7f0600a5
 
-.field public static final mtrl_btn_transparent_bg_color:I = 0x7f0600a7
+.field public static final mtrl_btn_transparent_bg_color:I = 0x7f0600a6
 
-.field public static final mtrl_chip_background_color:I = 0x7f0600a8
+.field public static final mtrl_chip_background_color:I = 0x7f0600a7
 
-.field public static final mtrl_chip_close_icon_tint:I = 0x7f0600a9
+.field public static final mtrl_chip_close_icon_tint:I = 0x7f0600a8
 
-.field public static final mtrl_chip_ripple_color:I = 0x7f0600aa
+.field public static final mtrl_chip_ripple_color:I = 0x7f0600a9
 
-.field public static final mtrl_chip_text_color:I = 0x7f0600ab
+.field public static final mtrl_chip_text_color:I = 0x7f0600aa
 
-.field public static final mtrl_fab_ripple_color:I = 0x7f0600ac
+.field public static final mtrl_fab_ripple_color:I = 0x7f0600ab
 
-.field public static final mtrl_scrim_color:I = 0x7f0600ad
+.field public static final mtrl_scrim_color:I = 0x7f0600ac
 
-.field public static final mtrl_tabs_colored_ripple_color:I = 0x7f0600ae
+.field public static final mtrl_tabs_colored_ripple_color:I = 0x7f0600ad
 
-.field public static final mtrl_tabs_icon_color_selector:I = 0x7f0600af
+.field public static final mtrl_tabs_icon_color_selector:I = 0x7f0600ae
 
-.field public static final mtrl_tabs_icon_color_selector_colored:I = 0x7f0600b0
+.field public static final mtrl_tabs_icon_color_selector_colored:I = 0x7f0600af
 
-.field public static final mtrl_tabs_legacy_text_color_selector:I = 0x7f0600b1
+.field public static final mtrl_tabs_legacy_text_color_selector:I = 0x7f0600b0
 
-.field public static final mtrl_tabs_ripple_color:I = 0x7f0600b2
+.field public static final mtrl_tabs_ripple_color:I = 0x7f0600b1
 
-.field public static final mtrl_text_btn_text_color_selector:I = 0x7f0600b3
+.field public static final mtrl_text_btn_text_color_selector:I = 0x7f0600b2
 
-.field public static final mtrl_textinput_default_box_stroke_color:I = 0x7f0600b4
+.field public static final mtrl_textinput_default_box_stroke_color:I = 0x7f0600b3
 
-.field public static final mtrl_textinput_disabled_color:I = 0x7f0600b5
+.field public static final mtrl_textinput_disabled_color:I = 0x7f0600b4
 
-.field public static final mtrl_textinput_filled_box_default_background_color:I = 0x7f0600b6
+.field public static final mtrl_textinput_filled_box_default_background_color:I = 0x7f0600b5
 
-.field public static final mtrl_textinput_hovered_box_stroke_color:I = 0x7f0600b7
+.field public static final mtrl_textinput_hovered_box_stroke_color:I = 0x7f0600b6
 
-.field public static final notification_action_color_filter:I = 0x7f0600b8
+.field public static final notification_action_color_filter:I = 0x7f0600b7
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b9
+.field public static final notification_icon_bg_color:I = 0x7f0600b8
 
-.field public static final primary_dark_material_dark:I = 0x7f0600db
+.field public static final primary_dark_material_dark:I = 0x7f0600da
 
-.field public static final primary_dark_material_light:I = 0x7f0600dc
+.field public static final primary_dark_material_light:I = 0x7f0600db
 
-.field public static final primary_material_dark:I = 0x7f0600ec
+.field public static final primary_material_dark:I = 0x7f0600eb
 
-.field public static final primary_material_light:I = 0x7f0600ed
+.field public static final primary_material_light:I = 0x7f0600ec
 
-.field public static final primary_text_default_material_dark:I = 0x7f0600ee
+.field public static final primary_text_default_material_dark:I = 0x7f0600ed
 
-.field public static final primary_text_default_material_light:I = 0x7f0600ef
+.field public static final primary_text_default_material_light:I = 0x7f0600ee
 
-.field public static final primary_text_disabled_material_dark:I = 0x7f0600f0
+.field public static final primary_text_disabled_material_dark:I = 0x7f0600ef
 
-.field public static final primary_text_disabled_material_light:I = 0x7f0600f1
+.field public static final primary_text_disabled_material_light:I = 0x7f0600f0
 
-.field public static final ripple_material_dark:I = 0x7f0600fa
+.field public static final ripple_material_dark:I = 0x7f0600f9
 
-.field public static final ripple_material_light:I = 0x7f0600fb
+.field public static final ripple_material_light:I = 0x7f0600fa
 
-.field public static final secondary_text_default_material_dark:I = 0x7f0600fc
+.field public static final secondary_text_default_material_dark:I = 0x7f0600fb
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fd
+.field public static final secondary_text_default_material_light:I = 0x7f0600fc
 
-.field public static final secondary_text_disabled_material_dark:I = 0x7f0600fe
+.field public static final secondary_text_disabled_material_dark:I = 0x7f0600fd
 
-.field public static final secondary_text_disabled_material_light:I = 0x7f0600ff
+.field public static final secondary_text_disabled_material_light:I = 0x7f0600fe
 
-.field public static final switch_thumb_disabled_material_dark:I = 0x7f06012e
+.field public static final switch_thumb_disabled_material_dark:I = 0x7f06012d
 
-.field public static final switch_thumb_disabled_material_light:I = 0x7f06012f
+.field public static final switch_thumb_disabled_material_light:I = 0x7f06012e
 
-.field public static final switch_thumb_material_dark:I = 0x7f060130
+.field public static final switch_thumb_material_dark:I = 0x7f06012f
 
-.field public static final switch_thumb_material_light:I = 0x7f060131
+.field public static final switch_thumb_material_light:I = 0x7f060130
 
-.field public static final switch_thumb_normal_material_dark:I = 0x7f060132
+.field public static final switch_thumb_normal_material_dark:I = 0x7f060131
 
-.field public static final switch_thumb_normal_material_light:I = 0x7f060133
+.field public static final switch_thumb_normal_material_light:I = 0x7f060132
 
-.field public static final tab_color_selector:I = 0x7f060134
+.field public static final tab_color_selector:I = 0x7f060133
 
-.field public static final tooltip_background_dark:I = 0x7f060135
+.field public static final tooltip_background_dark:I = 0x7f060134
 
-.field public static final tooltip_background_light:I = 0x7f060136
+.field public static final tooltip_background_light:I = 0x7f060135
 
 
 # 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 f7c014379c..db8996d006 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 = 0x7f080017
+.field public static final abc_ab_share_pack_mtrl_alpha:I = 0x7f080016
 
-.field public static final abc_action_bar_item_background_material:I = 0x7f080018
+.field public static final abc_action_bar_item_background_material:I = 0x7f080017
 
-.field public static final abc_btn_borderless_material:I = 0x7f080019
+.field public static final abc_btn_borderless_material:I = 0x7f080018
 
-.field public static final abc_btn_check_material:I = 0x7f08001a
+.field public static final abc_btn_check_material:I = 0x7f080019
 
-.field public static final abc_btn_check_to_on_mtrl_000:I = 0x7f08001b
+.field public static final abc_btn_check_to_on_mtrl_000:I = 0x7f08001a
 
-.field public static final abc_btn_check_to_on_mtrl_015:I = 0x7f08001c
+.field public static final abc_btn_check_to_on_mtrl_015:I = 0x7f08001b
 
-.field public static final abc_btn_colored_material:I = 0x7f08001d
+.field public static final abc_btn_colored_material:I = 0x7f08001c
 
-.field public static final abc_btn_default_mtrl_shape:I = 0x7f08001e
+.field public static final abc_btn_default_mtrl_shape:I = 0x7f08001d
 
-.field public static final abc_btn_radio_material:I = 0x7f08001f
+.field public static final abc_btn_radio_material:I = 0x7f08001e
 
-.field public static final abc_btn_radio_to_on_mtrl_000:I = 0x7f080020
+.field public static final abc_btn_radio_to_on_mtrl_000:I = 0x7f08001f
 
-.field public static final abc_btn_radio_to_on_mtrl_015:I = 0x7f080021
+.field public static final abc_btn_radio_to_on_mtrl_015:I = 0x7f080020
 
-.field public static final abc_btn_switch_to_on_mtrl_00001:I = 0x7f080022
+.field public static final abc_btn_switch_to_on_mtrl_00001:I = 0x7f080021
 
-.field public static final abc_btn_switch_to_on_mtrl_00012:I = 0x7f080023
+.field public static final abc_btn_switch_to_on_mtrl_00012:I = 0x7f080022
 
-.field public static final abc_cab_background_internal_bg:I = 0x7f080024
+.field public static final abc_cab_background_internal_bg:I = 0x7f080023
 
-.field public static final abc_cab_background_top_material:I = 0x7f080025
+.field public static final abc_cab_background_top_material:I = 0x7f080024
 
-.field public static final abc_cab_background_top_mtrl_alpha:I = 0x7f080026
+.field public static final abc_cab_background_top_mtrl_alpha:I = 0x7f080025
 
-.field public static final abc_control_background_material:I = 0x7f080027
+.field public static final abc_control_background_material:I = 0x7f080026
 
-.field public static final abc_dialog_material_background:I = 0x7f080028
+.field public static final abc_dialog_material_background:I = 0x7f080027
 
-.field public static final abc_edit_text_material:I = 0x7f080029
+.field public static final abc_edit_text_material:I = 0x7f080028
 
-.field public static final abc_ic_ab_back_material:I = 0x7f08002a
+.field public static final abc_ic_ab_back_material:I = 0x7f080029
 
-.field public static final abc_ic_arrow_drop_right_black_24dp:I = 0x7f08002b
+.field public static final abc_ic_arrow_drop_right_black_24dp:I = 0x7f08002a
 
-.field public static final abc_ic_clear_material:I = 0x7f08002c
+.field public static final abc_ic_clear_material:I = 0x7f08002b
 
-.field public static final abc_ic_commit_search_api_mtrl_alpha:I = 0x7f08002d
+.field public static final abc_ic_commit_search_api_mtrl_alpha:I = 0x7f08002c
 
-.field public static final abc_ic_go_search_api_material:I = 0x7f08002e
+.field public static final abc_ic_go_search_api_material:I = 0x7f08002d
 
-.field public static final abc_ic_menu_copy_mtrl_am_alpha:I = 0x7f08002f
+.field public static final abc_ic_menu_copy_mtrl_am_alpha:I = 0x7f08002e
 
-.field public static final abc_ic_menu_cut_mtrl_alpha:I = 0x7f080030
+.field public static final abc_ic_menu_cut_mtrl_alpha:I = 0x7f08002f
 
-.field public static final abc_ic_menu_overflow_material:I = 0x7f080031
+.field public static final abc_ic_menu_overflow_material:I = 0x7f080030
 
-.field public static final abc_ic_menu_paste_mtrl_am_alpha:I = 0x7f080032
+.field public static final abc_ic_menu_paste_mtrl_am_alpha:I = 0x7f080031
 
-.field public static final abc_ic_menu_selectall_mtrl_alpha:I = 0x7f080033
+.field public static final abc_ic_menu_selectall_mtrl_alpha:I = 0x7f080032
 
-.field public static final abc_ic_menu_share_mtrl_alpha:I = 0x7f080034
+.field public static final abc_ic_menu_share_mtrl_alpha:I = 0x7f080033
 
-.field public static final abc_ic_search_api_material:I = 0x7f080035
+.field public static final abc_ic_search_api_material:I = 0x7f080034
 
-.field public static final abc_ic_star_black_16dp:I = 0x7f080036
+.field public static final abc_ic_star_black_16dp:I = 0x7f080035
 
-.field public static final abc_ic_star_black_36dp:I = 0x7f080037
+.field public static final abc_ic_star_black_36dp:I = 0x7f080036
 
-.field public static final abc_ic_star_black_48dp:I = 0x7f080038
+.field public static final abc_ic_star_black_48dp:I = 0x7f080037
 
-.field public static final abc_ic_star_half_black_16dp:I = 0x7f080039
+.field public static final abc_ic_star_half_black_16dp:I = 0x7f080038
 
-.field public static final abc_ic_star_half_black_36dp:I = 0x7f08003a
+.field public static final abc_ic_star_half_black_36dp:I = 0x7f080039
 
-.field public static final abc_ic_star_half_black_48dp:I = 0x7f08003b
+.field public static final abc_ic_star_half_black_48dp:I = 0x7f08003a
 
-.field public static final abc_ic_voice_search_api_material:I = 0x7f08003c
+.field public static final abc_ic_voice_search_api_material:I = 0x7f08003b
 
-.field public static final abc_item_background_holo_dark:I = 0x7f08003d
+.field public static final abc_item_background_holo_dark:I = 0x7f08003c
 
-.field public static final abc_item_background_holo_light:I = 0x7f08003e
+.field public static final abc_item_background_holo_light:I = 0x7f08003d
 
-.field public static final abc_list_divider_material:I = 0x7f08003f
+.field public static final abc_list_divider_material:I = 0x7f08003e
 
-.field public static final abc_list_divider_mtrl_alpha:I = 0x7f080040
+.field public static final abc_list_divider_mtrl_alpha:I = 0x7f08003f
 
-.field public static final abc_list_focused_holo:I = 0x7f080041
+.field public static final abc_list_focused_holo:I = 0x7f080040
 
-.field public static final abc_list_longpressed_holo:I = 0x7f080042
+.field public static final abc_list_longpressed_holo:I = 0x7f080041
 
-.field public static final abc_list_pressed_holo_dark:I = 0x7f080043
+.field public static final abc_list_pressed_holo_dark:I = 0x7f080042
 
-.field public static final abc_list_pressed_holo_light:I = 0x7f080044
+.field public static final abc_list_pressed_holo_light:I = 0x7f080043
 
-.field public static final abc_list_selector_background_transition_holo_dark:I = 0x7f080045
+.field public static final abc_list_selector_background_transition_holo_dark:I = 0x7f080044
 
-.field public static final abc_list_selector_background_transition_holo_light:I = 0x7f080046
+.field public static final abc_list_selector_background_transition_holo_light:I = 0x7f080045
 
-.field public static final abc_list_selector_disabled_holo_dark:I = 0x7f080047
+.field public static final abc_list_selector_disabled_holo_dark:I = 0x7f080046
 
-.field public static final abc_list_selector_disabled_holo_light:I = 0x7f080048
+.field public static final abc_list_selector_disabled_holo_light:I = 0x7f080047
 
-.field public static final abc_list_selector_holo_dark:I = 0x7f080049
+.field public static final abc_list_selector_holo_dark:I = 0x7f080048
 
-.field public static final abc_list_selector_holo_light:I = 0x7f08004a
+.field public static final abc_list_selector_holo_light:I = 0x7f080049
 
-.field public static final abc_menu_hardkey_panel_mtrl_mult:I = 0x7f08004b
+.field public static final abc_menu_hardkey_panel_mtrl_mult:I = 0x7f08004a
 
-.field public static final abc_popup_background_mtrl_mult:I = 0x7f08004c
+.field public static final abc_popup_background_mtrl_mult:I = 0x7f08004b
 
-.field public static final abc_ratingbar_indicator_material:I = 0x7f08004d
+.field public static final abc_ratingbar_indicator_material:I = 0x7f08004c
 
-.field public static final abc_ratingbar_material:I = 0x7f08004e
+.field public static final abc_ratingbar_material:I = 0x7f08004d
 
-.field public static final abc_ratingbar_small_material:I = 0x7f08004f
+.field public static final abc_ratingbar_small_material:I = 0x7f08004e
 
-.field public static final abc_scrubber_control_off_mtrl_alpha:I = 0x7f080050
+.field public static final abc_scrubber_control_off_mtrl_alpha:I = 0x7f08004f
 
-.field public static final abc_scrubber_control_to_pressed_mtrl_000:I = 0x7f080051
+.field public static final abc_scrubber_control_to_pressed_mtrl_000:I = 0x7f080050
 
-.field public static final abc_scrubber_control_to_pressed_mtrl_005:I = 0x7f080052
+.field public static final abc_scrubber_control_to_pressed_mtrl_005:I = 0x7f080051
 
-.field public static final abc_scrubber_primary_mtrl_alpha:I = 0x7f080053
+.field public static final abc_scrubber_primary_mtrl_alpha:I = 0x7f080052
 
-.field public static final abc_scrubber_track_mtrl_alpha:I = 0x7f080054
+.field public static final abc_scrubber_track_mtrl_alpha:I = 0x7f080053
 
-.field public static final abc_seekbar_thumb_material:I = 0x7f080055
+.field public static final abc_seekbar_thumb_material:I = 0x7f080054
 
-.field public static final abc_seekbar_tick_mark_material:I = 0x7f080056
+.field public static final abc_seekbar_tick_mark_material:I = 0x7f080055
 
-.field public static final abc_seekbar_track_material:I = 0x7f080057
+.field public static final abc_seekbar_track_material:I = 0x7f080056
 
-.field public static final abc_spinner_mtrl_am_alpha:I = 0x7f080058
+.field public static final abc_spinner_mtrl_am_alpha:I = 0x7f080057
 
-.field public static final abc_spinner_textfield_background_material:I = 0x7f080059
+.field public static final abc_spinner_textfield_background_material:I = 0x7f080058
 
-.field public static final abc_switch_thumb_material:I = 0x7f08005a
+.field public static final abc_switch_thumb_material:I = 0x7f080059
 
-.field public static final abc_switch_track_mtrl_alpha:I = 0x7f08005b
+.field public static final abc_switch_track_mtrl_alpha:I = 0x7f08005a
 
-.field public static final abc_tab_indicator_material:I = 0x7f08005c
+.field public static final abc_tab_indicator_material:I = 0x7f08005b
 
-.field public static final abc_tab_indicator_mtrl_alpha:I = 0x7f08005d
+.field public static final abc_tab_indicator_mtrl_alpha:I = 0x7f08005c
 
-.field public static final abc_text_cursor_material:I = 0x7f08005e
+.field public static final abc_text_cursor_material:I = 0x7f08005d
 
-.field public static final abc_text_select_handle_left_mtrl_dark:I = 0x7f08005f
+.field public static final abc_text_select_handle_left_mtrl_dark:I = 0x7f08005e
 
-.field public static final abc_text_select_handle_left_mtrl_light:I = 0x7f080060
+.field public static final abc_text_select_handle_left_mtrl_light:I = 0x7f08005f
 
-.field public static final abc_text_select_handle_middle_mtrl_dark:I = 0x7f080061
+.field public static final abc_text_select_handle_middle_mtrl_dark:I = 0x7f080060
 
-.field public static final abc_text_select_handle_middle_mtrl_light:I = 0x7f080062
+.field public static final abc_text_select_handle_middle_mtrl_light:I = 0x7f080061
 
-.field public static final abc_text_select_handle_right_mtrl_dark:I = 0x7f080063
+.field public static final abc_text_select_handle_right_mtrl_dark:I = 0x7f080062
 
-.field public static final abc_text_select_handle_right_mtrl_light:I = 0x7f080064
+.field public static final abc_text_select_handle_right_mtrl_light:I = 0x7f080063
 
-.field public static final abc_textfield_activated_mtrl_alpha:I = 0x7f080065
+.field public static final abc_textfield_activated_mtrl_alpha:I = 0x7f080064
 
-.field public static final abc_textfield_default_mtrl_alpha:I = 0x7f080066
+.field public static final abc_textfield_default_mtrl_alpha:I = 0x7f080065
 
-.field public static final abc_textfield_search_activated_mtrl_alpha:I = 0x7f080067
+.field public static final abc_textfield_search_activated_mtrl_alpha:I = 0x7f080066
 
-.field public static final abc_textfield_search_default_mtrl_alpha:I = 0x7f080068
+.field public static final abc_textfield_search_default_mtrl_alpha:I = 0x7f080067
 
-.field public static final abc_textfield_search_material:I = 0x7f080069
+.field public static final abc_textfield_search_material:I = 0x7f080068
 
-.field public static final abc_vector_test:I = 0x7f08006a
+.field public static final abc_vector_test:I = 0x7f080069
 
-.field public static final avd_hide_password:I = 0x7f08008a
+.field public static final avd_hide_password:I = 0x7f080089
 
-.field public static final avd_show_password:I = 0x7f08008b
+.field public static final avd_show_password:I = 0x7f08008a
 
-.field public static final design_bottom_navigation_item_background:I = 0x7f0800b5
+.field public static final design_bottom_navigation_item_background:I = 0x7f0800b4
 
-.field public static final design_fab_background:I = 0x7f0800b6
+.field public static final design_fab_background:I = 0x7f0800b5
 
-.field public static final design_ic_visibility:I = 0x7f0800b7
+.field public static final design_ic_visibility:I = 0x7f0800b6
 
-.field public static final design_ic_visibility_off:I = 0x7f0800b8
+.field public static final design_ic_visibility_off:I = 0x7f0800b7
 
-.field public static final design_password_eye:I = 0x7f0800b9
+.field public static final design_password_eye:I = 0x7f0800b8
 
-.field public static final design_snackbar_background:I = 0x7f0800ba
+.field public static final design_snackbar_background:I = 0x7f0800b9
 
-.field public static final file_item_selection_indicator_btn:I = 0x7f0801ba
+.field public static final file_item_selection_indicator_btn:I = 0x7f0801af
 
-.field public static final ic_add_24dp:I = 0x7f0801d6
+.field public static final ic_add_24dp:I = 0x7f0801cb
 
-.field public static final ic_add_a_photo_24dp:I = 0x7f0801d7
+.field public static final ic_add_a_photo_24dp:I = 0x7f0801cc
 
-.field public static final ic_arrow_back_24dp:I = 0x7f0801e3
+.field public static final ic_arrow_back_24dp:I = 0x7f0801d8
 
-.field public static final ic_attach_file_24dp:I = 0x7f0801ea
+.field public static final ic_attach_file_24dp:I = 0x7f0801df
 
-.field public static final ic_audio_24dp:I = 0x7f0801ed
+.field public static final ic_audio_24dp:I = 0x7f0801e2
 
-.field public static final ic_camera_front_white_24dp:I = 0x7f08021e
+.field public static final ic_camera_front_white_24dp:I = 0x7f080213
 
-.field public static final ic_camera_rear_white_24dp:I = 0x7f08021f
+.field public static final ic_camera_rear_white_24dp:I = 0x7f080214
 
-.field public static final ic_check_circle_24dp:I = 0x7f080237
+.field public static final ic_check_circle_24dp:I = 0x7f08022c
 
-.field public static final ic_clear_24dp:I = 0x7f080243
+.field public static final ic_clear_24dp:I = 0x7f080237
 
-.field public static final ic_done_activated_24dp:I = 0x7f08025c
+.field public static final ic_done_activated_24dp:I = 0x7f080250
 
-.field public static final ic_file_24dp:I = 0x7f080282
+.field public static final ic_file_24dp:I = 0x7f080276
 
-.field public static final ic_file_upload_24dp:I = 0x7f080291
+.field public static final ic_file_upload_24dp:I = 0x7f080285
 
-.field public static final ic_flash_auto_24dp:I = 0x7f080296
+.field public static final ic_flash_auto_24dp:I = 0x7f08028a
 
-.field public static final ic_flash_off_24dp:I = 0x7f080297
+.field public static final ic_flash_off_24dp:I = 0x7f08028b
 
-.field public static final ic_flash_on_24dp:I = 0x7f080298
+.field public static final ic_flash_on_24dp:I = 0x7f08028c
 
-.field public static final ic_gif_24dp:I = 0x7f0802a0
+.field public static final ic_gif_24dp:I = 0x7f080294
 
-.field public static final ic_image_24dp:I = 0x7f0802d2
+.field public static final ic_image_24dp:I = 0x7f0802c6
 
-.field public static final ic_insert_emoticon_24dp:I = 0x7f0802db
+.field public static final ic_insert_emoticon_24dp:I = 0x7f0802cf
 
-.field public static final ic_keyboard_24dp:I = 0x7f0802e1
+.field public static final ic_keyboard_24dp:I = 0x7f0802d5
 
-.field public static final ic_launch_24dp:I = 0x7f0802e2
+.field public static final ic_launch_24dp:I = 0x7f0802d6
 
-.field public static final ic_movie_24dp:I = 0x7f080307
+.field public static final ic_movie_24dp:I = 0x7f0802fb
 
-.field public static final ic_mtrl_chip_checked_black:I = 0x7f080308
+.field public static final ic_mtrl_chip_checked_black:I = 0x7f0802fc
 
-.field public static final ic_mtrl_chip_checked_circle:I = 0x7f080309
+.field public static final ic_mtrl_chip_checked_circle:I = 0x7f0802fd
 
-.field public static final ic_mtrl_chip_close_circle:I = 0x7f08030a
+.field public static final ic_mtrl_chip_close_circle:I = 0x7f0802fe
 
-.field public static final ic_send_24dp:I = 0x7f080372
+.field public static final ic_send_24dp:I = 0x7f080366
 
-.field public static final ic_take_photo:I = 0x7f080394
+.field public static final ic_take_photo:I = 0x7f080386
 
-.field public static final mtrl_snackbar_background:I = 0x7f08046f
+.field public static final mtrl_snackbar_background:I = 0x7f080460
 
-.field public static final mtrl_tabs_default_indicator:I = 0x7f080470
+.field public static final mtrl_tabs_default_indicator:I = 0x7f080461
 
-.field public static final navigation_empty_icon:I = 0x7f080471
+.field public static final navigation_empty_icon:I = 0x7f080462
 
-.field public static final notification_action_background:I = 0x7f080472
+.field public static final notification_action_background:I = 0x7f080463
 
-.field public static final notification_bg:I = 0x7f080473
+.field public static final notification_bg:I = 0x7f080464
 
-.field public static final notification_bg_low:I = 0x7f080474
+.field public static final notification_bg_low:I = 0x7f080465
 
-.field public static final notification_bg_low_normal:I = 0x7f080475
+.field public static final notification_bg_low_normal:I = 0x7f080466
 
-.field public static final notification_bg_low_pressed:I = 0x7f080476
+.field public static final notification_bg_low_pressed:I = 0x7f080467
 
-.field public static final notification_bg_normal:I = 0x7f080477
+.field public static final notification_bg_normal:I = 0x7f080468
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080478
+.field public static final notification_bg_normal_pressed:I = 0x7f080469
 
-.field public static final notification_icon_background:I = 0x7f080479
+.field public static final notification_icon_background:I = 0x7f08046a
 
-.field public static final notification_template_icon_bg:I = 0x7f08047a
+.field public static final notification_template_icon_bg:I = 0x7f08046b
 
-.field public static final notification_template_icon_low_bg:I = 0x7f08047b
+.field public static final notification_template_icon_low_bg:I = 0x7f08046c
 
-.field public static final notification_tile_bg:I = 0x7f08047c
+.field public static final notification_tile_bg:I = 0x7f08046d
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08047d
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08046e
 
-.field public static final tooltip_frame_dark:I = 0x7f080485
+.field public static final tooltip_frame_dark:I = 0x7f080476
 
-.field public static final tooltip_frame_light:I = 0x7f080486
+.field public static final tooltip_frame_light:I = 0x7f080477
 
 
 # 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 0eecc4911c..435b6a745f 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 = 0x7f0a0080
+.field public static final async:I = 0x7f0a007f
 
-.field public static final attachment_clear_btn:I = 0x7f0a0081
+.field public static final attachment_clear_btn:I = 0x7f0a0080
 
-.field public static final attachment_preview_container:I = 0x7f0a0082
+.field public static final attachment_preview_container:I = 0x7f0a0081
 
-.field public static final attachment_preview_list:I = 0x7f0a0083
+.field public static final attachment_preview_list:I = 0x7f0a0082
 
-.field public static final auto:I = 0x7f0a00b9
+.field public static final auto:I = 0x7f0a00b8
 
-.field public static final back:I = 0x7f0a00bb
+.field public static final back:I = 0x7f0a00ba
 
-.field public static final blocking:I = 0x7f0a00ce
+.field public static final blocking:I = 0x7f0a00cd
 
 .field public static final bottom:I = 0x7f0a0105
 
@@ -165,347 +165,347 @@
 
 .field public static final chronometer:I = 0x7f0a0215
 
-.field public static final container:I = 0x7f0a0233
+.field public static final container:I = 0x7f0a0232
 
-.field public static final content:I = 0x7f0a0234
+.field public static final content:I = 0x7f0a0233
 
-.field public static final contentPanel:I = 0x7f0a0235
+.field public static final contentPanel:I = 0x7f0a0234
 
-.field public static final content_iv:I = 0x7f0a0236
+.field public static final content_iv:I = 0x7f0a0235
 
-.field public static final content_pager:I = 0x7f0a0237
+.field public static final content_pager:I = 0x7f0a0236
 
-.field public static final content_tabs:I = 0x7f0a0238
+.field public static final content_tabs:I = 0x7f0a0237
 
-.field public static final continuous:I = 0x7f0a0239
+.field public static final continuous:I = 0x7f0a0238
 
-.field public static final coordinator:I = 0x7f0a023a
+.field public static final coordinator:I = 0x7f0a0239
 
-.field public static final custom:I = 0x7f0a0252
+.field public static final custom:I = 0x7f0a0251
 
-.field public static final customPanel:I = 0x7f0a0253
+.field public static final customPanel:I = 0x7f0a0252
 
-.field public static final decor_content_parent:I = 0x7f0a0257
+.field public static final decor_content_parent:I = 0x7f0a0256
 
-.field public static final default_activity_button:I = 0x7f0a0258
+.field public static final default_activity_button:I = 0x7f0a0257
 
-.field public static final design_bottom_sheet:I = 0x7f0a0259
+.field public static final design_bottom_sheet:I = 0x7f0a0258
 
-.field public static final design_menu_item_action_area:I = 0x7f0a025a
+.field public static final design_menu_item_action_area:I = 0x7f0a0259
 
-.field public static final design_menu_item_action_area_stub:I = 0x7f0a025b
+.field public static final design_menu_item_action_area_stub:I = 0x7f0a025a
 
-.field public static final design_menu_item_text:I = 0x7f0a025c
+.field public static final design_menu_item_text:I = 0x7f0a025b
 
-.field public static final design_navigation_view:I = 0x7f0a025d
+.field public static final design_navigation_view:I = 0x7f0a025c
 
-.field public static final dialog_button:I = 0x7f0a025e
+.field public static final dialog_button:I = 0x7f0a025d
 
-.field public static final edit_query:I = 0x7f0a02ae
+.field public static final edit_query:I = 0x7f0a02ad
 
-.field public static final emoji_btn:I = 0x7f0a02b4
+.field public static final emoji_btn:I = 0x7f0a02b3
 
-.field public static final emoji_container:I = 0x7f0a02b5
+.field public static final emoji_container:I = 0x7f0a02b4
 
-.field public static final end:I = 0x7f0a02c9
+.field public static final end:I = 0x7f0a02c8
 
-.field public static final expand_activities_button:I = 0x7f0a02ce
+.field public static final expand_activities_button:I = 0x7f0a02cd
 
-.field public static final expanded_menu:I = 0x7f0a02cf
+.field public static final expanded_menu:I = 0x7f0a02ce
 
-.field public static final file_name_tv:I = 0x7f0a02e2
+.field public static final file_name_tv:I = 0x7f0a02e1
 
-.field public static final file_subtitle_tv:I = 0x7f0a02e3
+.field public static final file_subtitle_tv:I = 0x7f0a02e2
 
-.field public static final fill:I = 0x7f0a02e4
+.field public static final fill:I = 0x7f0a02e3
 
-.field public static final filled:I = 0x7f0a02e7
+.field public static final filled:I = 0x7f0a02e6
 
-.field public static final fitBottomStart:I = 0x7f0a02e8
+.field public static final fitBottomStart:I = 0x7f0a02e7
 
-.field public static final fitCenter:I = 0x7f0a02e9
+.field public static final fitCenter:I = 0x7f0a02e8
 
-.field public static final fitEnd:I = 0x7f0a02ea
+.field public static final fitEnd:I = 0x7f0a02e9
 
-.field public static final fitStart:I = 0x7f0a02eb
+.field public static final fitStart:I = 0x7f0a02ea
 
-.field public static final fitXY:I = 0x7f0a02ec
+.field public static final fitXY:I = 0x7f0a02eb
 
-.field public static final fixed:I = 0x7f0a02ed
+.field public static final fixed:I = 0x7f0a02ec
 
-.field public static final focusCrop:I = 0x7f0a02f0
+.field public static final focusCrop:I = 0x7f0a02ef
 
-.field public static final forever:I = 0x7f0a02f2
+.field public static final forever:I = 0x7f0a02f1
 
-.field public static final front:I = 0x7f0a0315
+.field public static final front:I = 0x7f0a0314
 
-.field public static final ghost_view:I = 0x7f0a0316
+.field public static final ghost_view:I = 0x7f0a0315
 
-.field public static final gone:I = 0x7f0a032c
+.field public static final gone:I = 0x7f0a0327
 
-.field public static final group_divider:I = 0x7f0a032d
+.field public static final group_divider:I = 0x7f0a0328
 
-.field public static final home:I = 0x7f0a0394
+.field public static final home:I = 0x7f0a038f
 
-.field public static final icon:I = 0x7f0a0396
+.field public static final icon:I = 0x7f0a0391
 
-.field public static final icon_group:I = 0x7f0a0397
+.field public static final icon_group:I = 0x7f0a0392
 
-.field public static final image:I = 0x7f0a039a
+.field public static final image:I = 0x7f0a0395
 
-.field public static final info:I = 0x7f0a03ac
+.field public static final info:I = 0x7f0a03a7
 
-.field public static final invisible:I = 0x7f0a03ba
+.field public static final invisible:I = 0x7f0a03b5
 
-.field public static final italic:I = 0x7f0a03d9
+.field public static final italic:I = 0x7f0a03d4
 
-.field public static final item_check_indicator:I = 0x7f0a03db
+.field public static final item_check_indicator:I = 0x7f0a03d6
 
-.field public static final item_touch_helper_previous_elevation:I = 0x7f0a040d
+.field public static final item_touch_helper_previous_elevation:I = 0x7f0a0408
 
-.field public static final labeled:I = 0x7f0a0414
+.field public static final labeled:I = 0x7f0a040f
 
-.field public static final largeLabel:I = 0x7f0a0415
+.field public static final largeLabel:I = 0x7f0a0410
 
-.field public static final launch_btn:I = 0x7f0a0416
+.field public static final launch_btn:I = 0x7f0a0411
 
-.field public static final launch_camera_btn:I = 0x7f0a0417
+.field public static final launch_camera_btn:I = 0x7f0a0412
 
-.field public static final left:I = 0x7f0a041b
+.field public static final left:I = 0x7f0a0416
 
-.field public static final line1:I = 0x7f0a041d
+.field public static final line1:I = 0x7f0a0418
 
-.field public static final line3:I = 0x7f0a041e
+.field public static final line3:I = 0x7f0a0419
 
-.field public static final list:I = 0x7f0a041f
+.field public static final list:I = 0x7f0a041a
 
-.field public static final listMode:I = 0x7f0a0420
+.field public static final listMode:I = 0x7f0a041b
 
-.field public static final list_item:I = 0x7f0a0421
+.field public static final list_item:I = 0x7f0a041c
 
-.field public static final main_input_container:I = 0x7f0a0427
+.field public static final main_input_container:I = 0x7f0a0422
 
-.field public static final masked:I = 0x7f0a043f
+.field public static final masked:I = 0x7f0a043a
 
-.field public static final message:I = 0x7f0a0485
+.field public static final message:I = 0x7f0a0478
 
-.field public static final mini:I = 0x7f0a048a
+.field public static final mini:I = 0x7f0a047d
 
-.field public static final mtrl_child_content_container:I = 0x7f0a048b
+.field public static final mtrl_child_content_container:I = 0x7f0a047e
 
-.field public static final mtrl_internal_children_alpha_tag:I = 0x7f0a048c
+.field public static final mtrl_internal_children_alpha_tag:I = 0x7f0a047f
 
-.field public static final multiply:I = 0x7f0a048d
+.field public static final multiply:I = 0x7f0a0480
 
-.field public static final navigation_header_container:I = 0x7f0a048f
+.field public static final navigation_header_container:I = 0x7f0a0482
 
-.field public static final none:I = 0x7f0a04a2
+.field public static final none:I = 0x7f0a0495
 
-.field public static final normal:I = 0x7f0a04a3
+.field public static final normal:I = 0x7f0a0496
 
-.field public static final notification_background:I = 0x7f0a04ad
+.field public static final notification_background:I = 0x7f0a04a0
 
-.field public static final notification_main_column:I = 0x7f0a04ae
+.field public static final notification_main_column:I = 0x7f0a04a1
 
-.field public static final notification_main_column_container:I = 0x7f0a04af
+.field public static final notification_main_column_container:I = 0x7f0a04a2
 
-.field public static final off:I = 0x7f0a04ce
+.field public static final off:I = 0x7f0a04c1
 
-.field public static final on:I = 0x7f0a04d0
+.field public static final on:I = 0x7f0a04c3
 
-.field public static final outline:I = 0x7f0a04d1
+.field public static final outline:I = 0x7f0a04c4
 
-.field public static final packed:I = 0x7f0a04de
+.field public static final packed:I = 0x7f0a04d1
 
-.field public static final page_tabs:I = 0x7f0a04df
+.field public static final page_tabs:I = 0x7f0a04d2
 
-.field public static final parallax:I = 0x7f0a04e0
+.field public static final parallax:I = 0x7f0a04d3
 
-.field public static final parent:I = 0x7f0a04e1
+.field public static final parent:I = 0x7f0a04d4
 
-.field public static final parentPanel:I = 0x7f0a04e2
+.field public static final parentPanel:I = 0x7f0a04d5
 
-.field public static final parent_matrix:I = 0x7f0a04e3
+.field public static final parent_matrix:I = 0x7f0a04d6
 
-.field public static final percent:I = 0x7f0a0515
+.field public static final percent:I = 0x7f0a0507
 
-.field public static final permissions_container:I = 0x7f0a051e
+.field public static final permissions_container:I = 0x7f0a0510
 
-.field public static final permissions_req_btn:I = 0x7f0a051f
+.field public static final permissions_req_btn:I = 0x7f0a0511
 
-.field public static final pin:I = 0x7f0a0520
+.field public static final pin:I = 0x7f0a0512
 
-.field public static final progress_circular:I = 0x7f0a055c
+.field public static final progress_circular:I = 0x7f0a054d
 
-.field public static final progress_horizontal:I = 0x7f0a055e
+.field public static final progress_horizontal:I = 0x7f0a054f
 
-.field public static final radio:I = 0x7f0a0569
+.field public static final radio:I = 0x7f0a055a
 
-.field public static final right:I = 0x7f0a058c
+.field public static final right:I = 0x7f0a0573
 
-.field public static final right_icon:I = 0x7f0a058d
+.field public static final right_icon:I = 0x7f0a0574
 
-.field public static final right_side:I = 0x7f0a058e
+.field public static final right_side:I = 0x7f0a0575
 
-.field public static final save_image_matrix:I = 0x7f0a05b8
+.field public static final save_image_matrix:I = 0x7f0a059f
 
-.field public static final save_non_transition_alpha:I = 0x7f0a05b9
+.field public static final save_non_transition_alpha:I = 0x7f0a05a0
 
-.field public static final save_scale_type:I = 0x7f0a05ba
+.field public static final save_scale_type:I = 0x7f0a05a1
 
-.field public static final screen:I = 0x7f0a05bc
+.field public static final screen:I = 0x7f0a05a3
 
-.field public static final scrollIndicatorDown:I = 0x7f0a05be
+.field public static final scrollIndicatorDown:I = 0x7f0a05a5
 
-.field public static final scrollIndicatorUp:I = 0x7f0a05bf
+.field public static final scrollIndicatorUp:I = 0x7f0a05a6
 
-.field public static final scrollView:I = 0x7f0a05c0
+.field public static final scrollView:I = 0x7f0a05a7
 
-.field public static final scrollable:I = 0x7f0a05c2
+.field public static final scrollable:I = 0x7f0a05a9
 
-.field public static final search_badge:I = 0x7f0a05c4
+.field public static final search_badge:I = 0x7f0a05ab
 
-.field public static final search_bar:I = 0x7f0a05c5
+.field public static final search_bar:I = 0x7f0a05ac
 
-.field public static final search_button:I = 0x7f0a05c6
+.field public static final search_button:I = 0x7f0a05ad
 
-.field public static final search_close_btn:I = 0x7f0a05c8
+.field public static final search_close_btn:I = 0x7f0a05af
 
-.field public static final search_edit_frame:I = 0x7f0a05c9
+.field public static final search_edit_frame:I = 0x7f0a05b0
 
-.field public static final search_go_btn:I = 0x7f0a05cc
+.field public static final search_go_btn:I = 0x7f0a05b3
 
-.field public static final search_mag_icon:I = 0x7f0a05ce
+.field public static final search_mag_icon:I = 0x7f0a05b5
 
-.field public static final search_plate:I = 0x7f0a05cf
+.field public static final search_plate:I = 0x7f0a05b6
 
-.field public static final search_src_text:I = 0x7f0a05d2
+.field public static final search_src_text:I = 0x7f0a05b9
 
-.field public static final search_voice_btn:I = 0x7f0a05de
+.field public static final search_voice_btn:I = 0x7f0a05c5
 
-.field public static final select_dialog_listview:I = 0x7f0a05df
+.field public static final select_dialog_listview:I = 0x7f0a05c6
 
-.field public static final selected:I = 0x7f0a05e0
+.field public static final selected:I = 0x7f0a05c7
 
-.field public static final selection_indicator:I = 0x7f0a05e2
+.field public static final selection_indicator:I = 0x7f0a05c9
 
-.field public static final send_btn:I = 0x7f0a05e3
+.field public static final send_btn:I = 0x7f0a05ca
 
-.field public static final shortcut:I = 0x7f0a0719
+.field public static final shortcut:I = 0x7f0a0700
 
-.field public static final smallLabel:I = 0x7f0a071d
+.field public static final smallLabel:I = 0x7f0a0704
 
-.field public static final snackbar_action:I = 0x7f0a071e
+.field public static final snackbar_action:I = 0x7f0a0705
 
-.field public static final snackbar_text:I = 0x7f0a071f
+.field public static final snackbar_text:I = 0x7f0a0706
 
-.field public static final spacer:I = 0x7f0a0725
+.field public static final spacer:I = 0x7f0a070c
 
-.field public static final split_action_bar:I = 0x7f0a072c
+.field public static final split_action_bar:I = 0x7f0a070d
 
-.field public static final spread:I = 0x7f0a072d
+.field public static final spread:I = 0x7f0a070e
 
-.field public static final spread_inside:I = 0x7f0a072e
+.field public static final spread_inside:I = 0x7f0a070f
 
-.field public static final src_atop:I = 0x7f0a072f
+.field public static final src_atop:I = 0x7f0a0710
 
-.field public static final src_in:I = 0x7f0a0730
+.field public static final src_in:I = 0x7f0a0711
 
-.field public static final src_over:I = 0x7f0a0731
+.field public static final src_over:I = 0x7f0a0712
 
-.field public static final start:I = 0x7f0a0734
+.field public static final start:I = 0x7f0a0715
 
-.field public static final stretch:I = 0x7f0a0754
+.field public static final stretch:I = 0x7f0a072c
 
-.field public static final submenuarrow:I = 0x7f0a0755
+.field public static final submenuarrow:I = 0x7f0a072d
 
-.field public static final submit_area:I = 0x7f0a0756
+.field public static final submit_area:I = 0x7f0a072e
 
-.field public static final swipeRefreshLayout:I = 0x7f0a075f
+.field public static final swipeRefreshLayout:I = 0x7f0a0737
 
-.field public static final tabMode:I = 0x7f0a0761
+.field public static final tabMode:I = 0x7f0a0739
 
-.field public static final tag_accessibility_actions:I = 0x7f0a0762
+.field public static final tag_accessibility_actions:I = 0x7f0a073a
 
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0763
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a073b
 
-.field public static final tag_accessibility_heading:I = 0x7f0a0764
+.field public static final tag_accessibility_heading:I = 0x7f0a073c
 
-.field public static final tag_accessibility_pane_title:I = 0x7f0a0765
+.field public static final tag_accessibility_pane_title:I = 0x7f0a073d
 
-.field public static final tag_screen_reader_focusable:I = 0x7f0a0766
+.field public static final tag_screen_reader_focusable:I = 0x7f0a073e
 
-.field public static final tag_transition_group:I = 0x7f0a0767
+.field public static final tag_transition_group:I = 0x7f0a073f
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0768
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0740
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0769
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0741
 
-.field public static final take_photo_btn:I = 0x7f0a076a
+.field public static final take_photo_btn:I = 0x7f0a0742
 
-.field public static final text:I = 0x7f0a076f
+.field public static final text:I = 0x7f0a0747
 
-.field public static final text2:I = 0x7f0a0770
+.field public static final text2:I = 0x7f0a0748
 
-.field public static final textSpacerNoButtons:I = 0x7f0a0771
+.field public static final textSpacerNoButtons:I = 0x7f0a0749
 
-.field public static final textSpacerNoTitle:I = 0x7f0a0772
+.field public static final textSpacerNoTitle:I = 0x7f0a074a
 
-.field public static final text_input:I = 0x7f0a0774
+.field public static final text_input:I = 0x7f0a074c
 
-.field public static final text_input_password_toggle:I = 0x7f0a0775
+.field public static final text_input_password_toggle:I = 0x7f0a074d
 
-.field public static final textinput_counter:I = 0x7f0a0778
+.field public static final textinput_counter:I = 0x7f0a0750
 
-.field public static final textinput_error:I = 0x7f0a0779
+.field public static final textinput_error:I = 0x7f0a0751
 
-.field public static final textinput_helper_text:I = 0x7f0a077a
+.field public static final textinput_helper_text:I = 0x7f0a0752
 
-.field public static final thumb_iv:I = 0x7f0a077b
+.field public static final thumb_iv:I = 0x7f0a0753
 
-.field public static final time:I = 0x7f0a077d
+.field public static final time:I = 0x7f0a0755
 
-.field public static final title:I = 0x7f0a077e
+.field public static final title:I = 0x7f0a0756
 
-.field public static final titleDividerNoCustom:I = 0x7f0a077f
+.field public static final titleDividerNoCustom:I = 0x7f0a0757
 
-.field public static final title_template:I = 0x7f0a0780
+.field public static final title_template:I = 0x7f0a0758
 
-.field public static final top:I = 0x7f0a0785
+.field public static final top:I = 0x7f0a075d
 
-.field public static final topPanel:I = 0x7f0a0786
+.field public static final topPanel:I = 0x7f0a075e
 
-.field public static final torch:I = 0x7f0a0787
+.field public static final torch:I = 0x7f0a075f
 
-.field public static final touch_outside:I = 0x7f0a0788
+.field public static final touch_outside:I = 0x7f0a0760
 
-.field public static final transition_current_scene:I = 0x7f0a0789
+.field public static final transition_current_scene:I = 0x7f0a0761
 
-.field public static final transition_layout_save:I = 0x7f0a078a
+.field public static final transition_layout_save:I = 0x7f0a0762
 
-.field public static final transition_position:I = 0x7f0a078b
+.field public static final transition_position:I = 0x7f0a0763
 
-.field public static final transition_scene_layoutid_cache:I = 0x7f0a078c
+.field public static final transition_scene_layoutid_cache:I = 0x7f0a0764
 
-.field public static final transition_transform:I = 0x7f0a078d
+.field public static final transition_transform:I = 0x7f0a0765
 
-.field public static final type_iv:I = 0x7f0a0791
+.field public static final type_iv:I = 0x7f0a0769
 
-.field public static final uniform:I = 0x7f0a0799
+.field public static final uniform:I = 0x7f0a0771
 
-.field public static final unlabeled:I = 0x7f0a079a
+.field public static final unlabeled:I = 0x7f0a0772
 
-.field public static final up:I = 0x7f0a079c
+.field public static final up:I = 0x7f0a0774
 
-.field public static final view_offset_helper:I = 0x7f0a082e
+.field public static final view_offset_helper:I = 0x7f0a07f4
 
-.field public static final view_pager:I = 0x7f0a0830
+.field public static final view_pager:I = 0x7f0a07f6
 
-.field public static final visible:I = 0x7f0a0831
+.field public static final visible:I = 0x7f0a07f7
 
-.field public static final wrap:I = 0x7f0a0880
+.field public static final wrap:I = 0x7f0a0845
 
-.field public static final wrap_content:I = 0x7f0a0881
+.field public static final wrap_content:I = 0x7f0a0846
 
 
 # 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 87c192b3ac..20924824bd 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/R$f.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/R$f.smali
@@ -135,17 +135,17 @@
 
 .field public static final select_dialog_singlechoice_material:I = 0x7f0d005a
 
-.field public static final support_simple_spinner_dropdown_item:I = 0x7f0d0062
+.field public static final support_simple_spinner_dropdown_item:I = 0x7f0d0061
 
-.field public static final view_attachment_preview_item:I = 0x7f0d0075
+.field public static final view_attachment_preview_item:I = 0x7f0d0074
 
-.field public static final view_camera_permissions:I = 0x7f0d007a
+.field public static final view_camera_permissions:I = 0x7f0d0079
 
-.field public static final view_emoji_item:I = 0x7f0d0087
+.field public static final view_emoji_item:I = 0x7f0d0086
 
-.field public static final view_file_item:I = 0x7f0d0088
+.field public static final view_file_item:I = 0x7f0d0087
 
-.field public static final view_grid_image:I = 0x7f0d008d
+.field public static final view_grid_image:I = 0x7f0d008b
 
 
 # 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 a7b4eda963..e90aa82156 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 = 0x7f120270
+.field public static final attachment_camera:I = 0x7f12026e
 
-.field public static final attachment_files:I = 0x7f120273
+.field public static final attachment_files:I = 0x7f120271
 
-.field public static final attachment_photos:I = 0x7f120275
+.field public static final attachment_photos:I = 0x7f120273
 
-.field public static final attachments_keyboard:I = 0x7f120277
+.field public static final attachments_keyboard:I = 0x7f120275
 
-.field public static final bottom_sheet_behavior:I = 0x7f120365
+.field public static final bottom_sheet_behavior:I = 0x7f120340
 
-.field public static final camera_intent_result_error:I = 0x7f120394
+.field public static final camera_intent_result_error:I = 0x7f12036f
 
-.field public static final camera_permission_denied_msg:I = 0x7f12039a
+.field public static final camera_permission_denied_msg:I = 0x7f120375
 
-.field public static final camera_switched:I = 0x7f12039d
+.field public static final camera_switched:I = 0x7f120378
 
-.field public static final camera_unknown_error:I = 0x7f12039f
+.field public static final camera_unknown_error:I = 0x7f12037a
 
-.field public static final character_counter_content_description:I = 0x7f1203f0
+.field public static final character_counter_content_description:I = 0x7f1203cb
 
-.field public static final character_counter_pattern:I = 0x7f1203f1
+.field public static final character_counter_pattern:I = 0x7f1203cc
 
-.field public static final choose_an_application:I = 0x7f1203fd
+.field public static final choose_an_application:I = 0x7f1203d8
 
-.field public static final clear_attachments:I = 0x7f120405
+.field public static final clear_attachments:I = 0x7f1203e0
 
-.field public static final emoji_keyboard_toggle:I = 0x7f1205a9
+.field public static final emoji_keyboard_toggle:I = 0x7f120584
 
-.field public static final fab_transformation_scrim_behavior:I = 0x7f1205d8
+.field public static final fab_transformation_scrim_behavior:I = 0x7f1205b3
 
-.field public static final fab_transformation_sheet_behavior:I = 0x7f1205d9
+.field public static final fab_transformation_sheet_behavior:I = 0x7f1205b4
 
-.field public static final files_permission_reason_msg:I = 0x7f1205e5
+.field public static final files_permission_reason_msg:I = 0x7f1205c0
 
-.field public static final flash_auto:I = 0x7f1205ea
+.field public static final flash_auto:I = 0x7f1205c5
 
-.field public static final flash_off:I = 0x7f1205eb
+.field public static final flash_off:I = 0x7f1205c6
 
-.field public static final flash_on:I = 0x7f1205ec
+.field public static final flash_on:I = 0x7f1205c7
 
-.field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f120968
+.field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f120932
 
-.field public static final mtrl_chip_close_icon_content_description:I = 0x7f120c0a
+.field public static final mtrl_chip_close_icon_content_description:I = 0x7f120bd3
 
-.field public static final password_toggle_content_description:I = 0x7f120d77
+.field public static final password_toggle_content_description:I = 0x7f120d3f
 
-.field public static final path_password_eye:I = 0x7f120d7a
+.field public static final path_password_eye:I = 0x7f120d42
 
-.field public static final path_password_eye_mask_strike_through:I = 0x7f120d7b
+.field public static final path_password_eye_mask_strike_through:I = 0x7f120d43
 
-.field public static final path_password_eye_mask_visible:I = 0x7f120d7c
+.field public static final path_password_eye_mask_visible:I = 0x7f120d44
 
-.field public static final path_password_strike_through:I = 0x7f120d7d
+.field public static final path_password_strike_through:I = 0x7f120d45
 
-.field public static final request_permission_msg:I = 0x7f120fca
+.field public static final request_permission_msg:I = 0x7f120f3e
 
-.field public static final search_menu_title:I = 0x7f121098
+.field public static final search_menu_title:I = 0x7f12100c
 
-.field public static final selection_shrink_scale:I = 0x7f1210b2
+.field public static final selection_shrink_scale:I = 0x7f121026
 
-.field public static final send_contents:I = 0x7f1210bd
+.field public static final send_contents:I = 0x7f121031
 
-.field public static final status_bar_notification_info_overflow:I = 0x7f121165
+.field public static final status_bar_notification_info_overflow:I = 0x7f1210d9
 
-.field public static final storage_permission_denied_msg:I = 0x7f121176
+.field public static final storage_permission_denied_msg:I = 0x7f1210ea
 
 
 # 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 1e75040b78..2714216b70 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, 0x7f040315
+    const v6, 0x7f040314
 
     aput v6, v5, v3
 
@@ -2554,15 +2554,15 @@
         0x7f0401d6
         0x7f0401f9
         0x7f040203
-        0x7f040267
-        0x7f040283
-        0x7f04029b
+        0x7f040266
+        0x7f040282
+        0x7f04029a
+        0x7f0402c8
         0x7f0402c9
-        0x7f0402ca
-        0x7f040323
-        0x7f040326
-        0x7f0403bf
-        0x7f0403c9
+        0x7f040322
+        0x7f040325
+        0x7f0403be
+        0x7f0403c8
     .end array-data
 
     :array_1
@@ -2571,8 +2571,8 @@
         0x7f04004c
         0x7f0400b3
         0x7f04015c
-        0x7f040326
-        0x7f0403c9
+        0x7f040325
+        0x7f0403c8
     .end array-data
 
     :array_2
@@ -2586,11 +2586,11 @@
         0x10100f2
         0x7f040079
         0x7f04007a
+        0x7f04025d
         0x7f04025e
-        0x7f04025f
-        0x7f040280
+        0x7f04027f
+        0x7f040307
         0x7f040308
-        0x7f040309
     .end array-data
 
     :array_4
@@ -2624,15 +2624,15 @@
         0x1010540
         0x7f04011a
         0x7f040121
-        0x7f040259
+        0x7f040258
     .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
-        0x7f040313
+        0x7f040312
+        0x7f0403bc
         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
-        0x7f04025a
-        0x7f040349
+        0x7f040259
+        0x7f040348
     .end array-data
 
     :array_e
@@ -2756,41 +2756,41 @@
         0x7f040119
         0x7f040168
         0x7f0401e1
+        0x7f04025b
         0x7f04025c
-        0x7f04025d
+        0x7f04025f
         0x7f040260
         0x7f040261
         0x7f040262
         0x7f040263
         0x7f040264
         0x7f040265
-        0x7f040266
+        0x7f04028f
         0x7f040290
         0x7f040291
-        0x7f040292
-        0x7f04029a
-        0x7f04029c
-        0x7f0402cf
+        0x7f040299
+        0x7f04029b
+        0x7f0402ce
+        0x7f0402d1
         0x7f0402d2
         0x7f0402d3
-        0x7f0402d4
-        0x7f0402fb
+        0x7f0402fa
+        0x7f0402fc
         0x7f0402fd
         0x7f0402fe
-        0x7f0402ff
+        0x7f04030f
         0x7f040310
-        0x7f040311
-        0x7f04032a
+        0x7f040329
+        0x7f040353
         0x7f040354
         0x7f040355
         0x7f040356
-        0x7f040357
+        0x7f040358
         0x7f040359
         0x7f04035a
         0x7f04035b
-        0x7f04035c
+        0x7f04035e
         0x7f04035f
-        0x7f040360
         0x7f0403cb
         0x7f0403cc
         0x7f0403cd
@@ -2829,7 +2829,7 @@
         0x7f040207
         0x7f040208
         0x7f04020b
-        0x7f04027f
+        0x7f04027e
     .end array-data
 
     :array_11
@@ -2902,10 +2902,10 @@
         0x7f040160
         0x7f0401d7
         0x7f0401db
-        0x7f0402d8
-        0x7f040306
-        0x7f040361
-        0x7f040363
+        0x7f0402d7
+        0x7f040305
+        0x7f040360
+        0x7f040362
     .end array-data
 
     :array_15
@@ -2914,8 +2914,8 @@
         0x7f0400a3
         0x7f0400a4
         0x7f0400a5
+        0x7f040309
         0x7f04030a
-        0x7f04030b
     .end array-data
 
     :array_16
@@ -2930,11 +2930,11 @@
         0x7f040126
         0x7f040127
         0x7f040128
-        0x7f0402f6
-        0x7f0402f8
-        0x7f04031b
+        0x7f0402f5
+        0x7f0402f7
+        0x7f04031a
+        0x7f0403be
         0x7f0403bf
-        0x7f0403c0
         0x7f0403ca
     .end array-data
 
@@ -3115,7 +3115,7 @@
     :array_1d
     .array-data 4
         0x7f04020a
-        0x7f04031a
+        0x7f040319
     .end array-data
 
     :array_1e
@@ -3143,15 +3143,15 @@
         0x7f0400b8
         0x7f040112
         0x7f040150
-        0x7f04030f
-        0x7f0403b6
+        0x7f04030e
+        0x7f0403b5
     .end array-data
 
     :array_21
     .array-data 4
         0x7f040163
         0x7f040165
-        0x7f0402a0
+        0x7f04029f
     .end array-data
 
     :array_22
@@ -3164,10 +3164,10 @@
         0x7f04012e
         0x7f040160
         0x7f04016a
-        0x7f04027c
-        0x7f04029f
-        0x7f0402d8
-        0x7f040306
+        0x7f04027b
+        0x7f04029e
+        0x7f0402d7
+        0x7f040305
         0x7f0403e7
     .end array-data
 
@@ -3176,7 +3176,7 @@
         0x7f040139
         0x7f04013a
         0x7f040204
-        0x7f04025b
+        0x7f04025a
     .end array-data
 
     :array_24
@@ -3217,15 +3217,16 @@
         0x7f04012f
         0x7f040130
         0x7f040131
-        0x7f040289
+        0x7f040288
+        0x7f040297
         0x7f040298
-        0x7f040299
-        0x7f04029e
+        0x7f04029d
+        0x7f0402c5
         0x7f0402c6
         0x7f0402c7
-        0x7f0402c8
+        0x7f0402d4
         0x7f0402d5
-        0x7f0402d6
+        0x7f0402d8
         0x7f0402d9
         0x7f0402da
         0x7f0402db
@@ -3239,7 +3240,6 @@
         0x7f0402e3
         0x7f0402e4
         0x7f0402e5
-        0x7f0402e6
         0x7f0403ed
     .end array-data
 
@@ -3274,8 +3274,8 @@
         0x1010128
         0x7f04010b
         0x7f040110
-        0x7f04027e
-        0x7f040305
+        0x7f04027d
+        0x7f040304
     .end array-data
 
     :array_2b
@@ -3307,15 +3307,15 @@
         0x7f0401da
         0x7f0401dc
         0x7f0401dd
-        0x7f0402d8
+        0x7f0402d7
+        0x7f04031e
         0x7f04031f
-        0x7f040320
     .end array-data
 
     :array_2e
     .array-data 4
+        0x7f04031e
         0x7f04031f
-        0x7f040320
     .end array-data
 
     :array_2f
@@ -3332,12 +3332,13 @@
         0x7f0400c7
         0x7f040119
         0x7f040143
+        0x7f040277
         0x7f040278
-        0x7f040279
-        0x7f040284
-        0x7f0402f7
-        0x7f04030c
-        0x7f040342
+        0x7f040283
+        0x7f0402f6
+        0x7f04030b
+        0x7f040341
+        0x7f040349
         0x7f04034a
         0x7f04034b
         0x7f04034c
@@ -3347,11 +3348,10 @@
         0x7f040350
         0x7f040351
         0x7f040352
-        0x7f040353
-        0x7f040358
+        0x7f040357
+        0x7f04035c
         0x7f04035d
-        0x7f04035e
-        0x7f040362
+        0x7f040361
     .end array-data
 
     :array_30
@@ -3386,8 +3386,8 @@
         0x7f0400ce
         0x7f0401dc
         0x7f0401dd
-        0x7f040287
-        0x7f040301
+        0x7f040286
+        0x7f040300
         0x7f0403cf
     .end array-data
 
@@ -3400,8 +3400,8 @@
         0x101012f
         0x1010130
         0x1010131
-        0x7f04029d
-        0x7f040321
+        0x7f04029c
+        0x7f040320
     .end array-data
 
     :array_33
@@ -3417,20 +3417,20 @@
         0x7f040202
         0x7f040205
         0x7f040208
-        0x7f04027f
+        0x7f04027e
     .end array-data
 
     :array_34
     .array-data 4
         0x1010176
         0x10102c9
-        0x7f040288
+        0x7f040287
     .end array-data
 
     :array_35
     .array-data 4
-        0x7f04028c
-        0x7f04028f
+        0x7f04028b
+        0x7f04028e
     .end array-data
 
     :array_36
@@ -3443,9 +3443,9 @@
         0x7f040135
         0x7f040136
         0x7f04020e
-        0x7f0402d7
-        0x7f04030e
-        0x7f040314
+        0x7f0402d6
+        0x7f04030d
+        0x7f040313
     .end array-data
 
     :array_37
@@ -3460,12 +3460,12 @@
         0x7f040155
         0x7f0401de
         0x7f04020d
+        0x7f0402cc
         0x7f0402cd
-        0x7f0402ce
+        0x7f0402f8
         0x7f0402f9
-        0x7f0402fa
-        0x7f040322
-        0x7f040327
+        0x7f040321
+        0x7f040326
         0x7f0403ef
     .end array-data
 
@@ -3478,15 +3478,16 @@
         0x7f04012f
         0x7f040130
         0x7f040131
-        0x7f040289
+        0x7f040288
+        0x7f040297
         0x7f040298
-        0x7f040299
-        0x7f04029e
+        0x7f04029d
+        0x7f0402c5
         0x7f0402c6
         0x7f0402c7
-        0x7f0402c8
+        0x7f0402d4
         0x7f0402d5
-        0x7f0402d6
+        0x7f0402d8
         0x7f0402d9
         0x7f0402da
         0x7f0402db
@@ -3500,21 +3501,20 @@
         0x7f0402e3
         0x7f0402e4
         0x7f0402e5
-        0x7f0402e6
         0x7f0403ed
     .end array-data
 
     :array_39
     .array-data 4
+        0x7f04030b
         0x7f04030c
-        0x7f04030d
     .end array-data
 
     :array_3a
     .array-data 4
         0x101011f
         0x7f04011a
-        0x7f04027a
+        0x7f040279
     .end array-data
 
     :array_3b
@@ -3523,7 +3523,7 @@
         0x1010176
         0x101017b
         0x1010262
-        0x7f04029b
+        0x7f04029a
     .end array-data
 
     :array_3c
@@ -3541,14 +3541,14 @@
         0x1010124
         0x1010125
         0x1010142
-        0x7f040307
-        0x7f040312
+        0x7f040306
+        0x7f040311
+        0x7f040327
         0x7f040328
-        0x7f040329
-        0x7f04032b
+        0x7f04032a
+        0x7f0403b6
         0x7f0403b7
         0x7f0403b8
-        0x7f0403b9
         0x7f0403d0
         0x7f0403d1
         0x7f0403d2
@@ -3563,6 +3563,7 @@
 
     :array_3f
     .array-data 4
+        0x7f04032b
         0x7f04032c
         0x7f04032d
         0x7f04032e
@@ -3584,10 +3585,9 @@
         0x7f04033e
         0x7f04033f
         0x7f040340
-        0x7f040341
+        0x7f040342
         0x7f040343
         0x7f040344
-        0x7f040345
     .end array-data
 
     :array_40
@@ -3604,7 +3604,7 @@
         0x1010164
         0x10103ac
         0x7f040145
-        0x7f040349
+        0x7f040348
     .end array-data
 
     :array_41
@@ -3632,11 +3632,11 @@
         0x7f040164
         0x7f040166
         0x7f040167
+        0x7f040292
         0x7f040293
         0x7f040294
         0x7f040295
         0x7f040296
-        0x7f040297
     .end array-data
 
     :array_42
@@ -3659,16 +3659,17 @@
         0x7f0400d2
         0x7f0400d3
         0x7f0400d4
+        0x7f040266
         0x7f040267
-        0x7f040268
-        0x7f04027b
+        0x7f04027a
+        0x7f040280
         0x7f040281
-        0x7f040282
-        0x7f04029b
+        0x7f04029a
+        0x7f040322
         0x7f040323
         0x7f040324
-        0x7f040325
-        0x7f0403bf
+        0x7f0403be
+        0x7f0403c0
         0x7f0403c1
         0x7f0403c2
         0x7f0403c3
@@ -3676,16 +3677,15 @@
         0x7f0403c5
         0x7f0403c6
         0x7f0403c7
-        0x7f0403c8
     .end array-data
 
     :array_44
     .array-data 4
         0x1010000
         0x10100da
+        0x7f04028c
         0x7f04028d
-        0x7f04028e
-        0x7f040365
+        0x7f040364
     .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 786587127d..111829025b 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 aWp:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter$a;
+.field final synthetic aWl:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter$a;
 
-.field final synthetic aWq:Lcom/lytefast/flexinput/model/Attachment;
+.field final synthetic aWm: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;->aWp:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter$a;
+    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter$a$a;->aWl:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter$a;
 
-    iput-object p2, p0, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter$a$a;->aWq:Lcom/lytefast/flexinput/model/Attachment;
+    iput-object p2, p0, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter$a$a;->aWm: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;->aWp:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter$a;
+    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter$a$a;->aWl:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter$a;
 
-    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$a;->aWk:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
 
-    iget-object p1, p1, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;->aWn:Lcom/lytefast/flexinput/utils/SelectionAggregator;
+    iget-object p1, p1, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;->aWj:Lcom/lytefast/flexinput/utils/SelectionAggregator;
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter$a$a;->aWq:Lcom/lytefast/flexinput/model/Attachment;
+    iget-object v0, p0, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter$a$a;->aWm: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 481d1656b4..7bbaeee5a2 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 aWo:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
+.field final synthetic aWk: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;->aWo:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
+    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter$a;->aWk: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 3096eb2353..0b9b8876dd 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 aWn:Lcom/lytefast/flexinput/utils/SelectionAggregator;
+.field public final aWj: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;->aWn:Lcom/lytefast/flexinput/utils/SelectionAggregator;
+    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;->aWj: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;->aWn:Lcom/lytefast/flexinput/utils/SelectionAggregator;
+    iget-object v1, p0, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;->aWj: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;->aWn:Lcom/lytefast/flexinput/utils/SelectionAggregator;
+    iget-object v0, p0, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;->aWj: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;->aWn:Lcom/lytefast/flexinput/utils/SelectionAggregator;
+    iget-object v0, p0, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;->aWj: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;->aWo:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
+    iget-object v2, p1, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter$a;->aWk: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;->iA()Lcom/facebook/imagepipeline/a/f;
+    invoke-static {}, Lcom/facebook/imagepipeline/a/f;->iy()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;->gQ()Lcom/facebook/drawee/backends/pipeline/e;
+    invoke-static {}, Lcom/facebook/drawee/backends/pipeline/c;->gO()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;->kH()Lcom/facebook/imagepipeline/request/b;
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->kF()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;->hr()Lcom/facebook/drawee/controller/AbstractDraweeController;
+    invoke-virtual {v0}, Lcom/facebook/drawee/backends/pipeline/e;->hp()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 b25ff18961..10c6af4d00 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 aWr:Landroid/view/View;
+.field final aWn:Landroid/view/View;
 
-.field final synthetic aWs:Lcom/lytefast/flexinput/adapters/EmptyListAdapter;
+.field final synthetic aWo: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;->aWs:Lcom/lytefast/flexinput/adapters/EmptyListAdapter;
+    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/EmptyListAdapter$ViewHolder;->aWo: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;->aWr:Landroid/view/View;
+    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/EmptyListAdapter$ViewHolder;->aWn: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 145d5ba661..d35b1cb044 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;->aWr:Landroid/view/View;
+    iget-object p1, p1, Lcom/lytefast/flexinput/adapters/EmptyListAdapter$ViewHolder;->aWn: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 815fe4aca6..62a3b655f0 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 aWu:Lcom/lytefast/flexinput/adapters/FileListAdapter$a;
+.field final synthetic aWq: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;->aWu:Lcom/lytefast/flexinput/adapters/FileListAdapter$a;
+    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$a$b;->aWq: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 121d3e55d6..be2a200631 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 aWv:Lcom/lytefast/flexinput/adapters/FileListAdapter$a$c;
+.field public static final aWr: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;->aWv:Lcom/lytefast/flexinput/adapters/FileListAdapter$a$c;
+    sput-object v0, Lcom/lytefast/flexinput/adapters/FileListAdapter$a$c;->aWr: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 86468baf8b..f86710bbf3 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;->aWv:Lcom/lytefast/flexinput/adapters/FileListAdapter$a$c;
+    sget-object v0, Lcom/lytefast/flexinput/adapters/FileListAdapter$a$c;->aWr: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 b941ee6d4e..a2eb5d39b9 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 aWE:Lcom/lytefast/flexinput/adapters/FileListAdapter$b;
+.field final synthetic aWA: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;->aWE:Lcom/lytefast/flexinput/adapters/FileListAdapter$b;
+    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b$1;->aWA: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;->aWE:Lcom/lytefast/flexinput/adapters/FileListAdapter$b;
+    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b$1;->aWA:Lcom/lytefast/flexinput/adapters/FileListAdapter$b;
 
-    iget-object v0, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWD:Lcom/lytefast/flexinput/adapters/FileListAdapter;
+    iget-object v0, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWz: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;->aWE:Lcom/lytefast/flexinput/adapters/FileListAdapter$b;
+    iget-object v1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b$1;->aWA: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;->aWE:Lcom/lytefast/flexinput/adapters/FileListAdapter$b;
+    iget-object v2, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b$1;->aWA: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 9283ea779e..edbc6adb98 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 b915d9d212..3d12d7f6de 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,11 +15,19 @@
 
 
 # instance fields
-.field aWA:Landroid/widget/TextView;
+.field private final aWs:Landroid/animation/AnimatorSet;
 
-.field aWB:Landroid/widget/TextView;
+.field private final aWt:Landroid/animation/AnimatorSet;
 
-.field aWC:Lcom/lytefast/flexinput/model/Attachment;
+.field aWu:Lcom/facebook/drawee/view/SimpleDraweeView;
+
+.field aWv:Landroid/widget/ImageView;
+
+.field aWw:Landroid/widget/TextView;
+
+.field aWx:Landroid/widget/TextView;
+
+.field aWy:Lcom/lytefast/flexinput/model/Attachment;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/lytefast/flexinput/model/Attachment<",
@@ -30,15 +38,7 @@
     .end annotation
 .end field
 
-.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;
+.field final synthetic aWz:Lcom/lytefast/flexinput/adapters/FileListAdapter;
 
 
 # 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;->aWD:Lcom/lytefast/flexinput/adapters/FileListAdapter;
+    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWz: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;->aWy:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWu: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;->aWz:Landroid/widget/ImageView;
+    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWv: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;->aWA:Landroid/widget/TextView;
+    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWw: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;->aWB:Landroid/widget/TextView;
+    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWx: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;->aWw:Landroid/animation/AnimatorSet;
+    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWs:Landroid/animation/AnimatorSet;
 
-    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWw:Landroid/animation/AnimatorSet;
+    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWs:Landroid/animation/AnimatorSet;
 
-    iget-object v1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWy:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object v1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWu: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;->aWx:Landroid/animation/AnimatorSet;
+    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWt:Landroid/animation/AnimatorSet;
 
-    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWx:Landroid/animation/AnimatorSet;
+    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWt:Landroid/animation/AnimatorSet;
 
-    iget-object p2, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWy:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object p2, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWu: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;->aWC:Lcom/lytefast/flexinput/model/Attachment;
+    iget-object p0, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWy: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;->aWy:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWu: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;->aWw:Landroid/animation/AnimatorSet;
+    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWs: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;->aWy:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWu: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;->aWx:Landroid/animation/AnimatorSet;
+    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWt: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;->aWD:Lcom/lytefast/flexinput/adapters/FileListAdapter;
+    iget-object v0, v1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWz: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;->aWD:Lcom/lytefast/flexinput/adapters/FileListAdapter;
+    iget-object v3, v1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWz: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;->aWD:Lcom/lytefast/flexinput/adapters/FileListAdapter;
+    iget-object v3, v1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWz: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;->aWy:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object v4, v1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWu:Lcom/facebook/drawee/view/SimpleDraweeView;
 
-    invoke-static {}, Lcom/facebook/drawee/backends/pipeline/c;->gQ()Lcom/facebook/drawee/backends/pipeline/e;
+    invoke-static {}, Lcom/facebook/drawee/backends/pipeline/c;->gO()Lcom/facebook/drawee/backends/pipeline/e;
 
     move-result-object v6
 
-    iget-object v7, v1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWy:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object v7, v1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWu: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;->hp()Lcom/facebook/drawee/controller/a;
+    invoke-virtual {v0}, Lcom/facebook/drawee/backends/pipeline/e;->hn()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;->hr()Lcom/facebook/drawee/controller/AbstractDraweeController;
+    invoke-virtual {v0}, Lcom/facebook/drawee/backends/pipeline/e;->hp()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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 ee2516442b..990360f5c2 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 aWt:Ljava/util/List;
+.field private aWp: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;->aWt:Ljava/util/List;
+    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter;->aWp: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;->aWt:Ljava/util/List;
+    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter;->aWp: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;->aWt:Ljava/util/List;
+    iget-object v0, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter;->aWp: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;->aWt:Ljava/util/List;
+    iget-object v0, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter;->aWp: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;->aWC:Lcom/lytefast/flexinput/model/Attachment;
+    iput-object p2, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWy:Lcom/lytefast/flexinput/model/Attachment;
 
-    iget-object v0, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWD:Lcom/lytefast/flexinput/adapters/FileListAdapter;
+    iget-object v0, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWz: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;->aWA:Landroid/widget/TextView;
+    iget-object v2, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWw: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;->aWB:Landroid/widget/TextView;
+    iget-object v2, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWx: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;->aWA:Landroid/widget/TextView;
+    iget-object v2, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWw: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;->aWB:Landroid/widget/TextView;
+    iget-object v2, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWx: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;->aWy:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object v2, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWu:Lcom/facebook/drawee/view/SimpleDraweeView;
 
-    iget-object v3, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWy:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object v3, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWu: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;->aWz:Landroid/widget/ImageView;
+    iget-object v2, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWv: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;->aWy:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object v2, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWu: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;->aWy:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object v5, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWu: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;->aWz:Landroid/widget/ImageView;
+    iget-object v0, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWv: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;->aWz:Landroid/widget/ImageView;
+    iget-object v0, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWv: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;->aWz:Landroid/widget/ImageView;
+    iget-object v0, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWv: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;->aWz:Landroid/widget/ImageView;
+    iget-object v0, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWv: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;->aWz:Landroid/widget/ImageView;
+    iget-object v0, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWv: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;->aWz:Landroid/widget/ImageView;
+    iget-object v0, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWv: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 f8a1c5be9c..ce71435e9b 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;->bgy:Lkotlin/Unit;
+    sget-object p2, Lkotlin/Unit;->bgt: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;->aXZ:Lcom/lytefast/flexinput/utils/d;
+    sget-object v3, Lcom/lytefast/flexinput/utils/d;->aXV: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;->aWV:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
+    iget-object v3, v3, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWR: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;->aWV:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
+    iget-object v5, v5, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWR:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
 
-    iget v5, v5, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->aWJ:I
+    iget v5, v5, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->aWF: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;->aWV:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
+    iget-object v6, v6, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWR:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
 
-    iget v6, v6, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->aWK:I
+    iget v6, v6, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->aWG: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;->AZ()Landroid/graphics/drawable/Drawable;
+    invoke-static {}, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->AX()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;->aWM:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$a;
+    sget-object v0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->aWI: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;->aWM:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$a;
+    sget-object v2, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->aWI: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;->Os:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sget-object v2, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Oo: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;->hz()V
+    invoke-virtual {p1}, Lcom/facebook/drawee/drawable/f;->hx()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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     return-object p1
 
     :cond_4
     :goto_1
-    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 ba399242f1..68c9c27cda 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 f47db917a5..4896dff598 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 aWN:Lcom/facebook/drawee/view/SimpleDraweeView;
+.field final aWJ:Lcom/facebook/drawee/view/SimpleDraweeView;
 
-.field private final aWO:Lcom/facebook/drawee/view/SimpleDraweeView;
+.field private final aWK:Lcom/facebook/drawee/view/SimpleDraweeView;
 
-.field aWP:Lcom/lytefast/flexinput/model/Photo;
+.field aWL:Lcom/lytefast/flexinput/model/Photo;
 
-.field aWQ:Lkotlinx/coroutines/Job;
+.field aWM:Lkotlinx/coroutines/Job;
 
-.field private aWR:Landroid/graphics/Bitmap;
+.field private aWN:Landroid/graphics/Bitmap;
 
-.field private aWS:Landroid/graphics/drawable/BitmapDrawable;
+.field private aWO:Landroid/graphics/drawable/BitmapDrawable;
 
-.field private aWT:Lcom/facebook/drawee/drawable/f;
+.field private aWP:Lcom/facebook/drawee/drawable/f;
 
-.field aWU:Landroid/os/CancellationSignal;
+.field aWQ:Landroid/os/CancellationSignal;
 
-.field final synthetic aWV:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
+.field final synthetic aWR:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
 
-.field private final aWw:Landroid/animation/AnimatorSet;
+.field private final aWs:Landroid/animation/AnimatorSet;
 
-.field private final aWx:Landroid/animation/AnimatorSet;
+.field private final aWt: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;->aWV:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
+    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWR: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;->aWN:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWJ: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;->aWO:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWK: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;->aWN:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWJ: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;->aWw:Landroid/animation/AnimatorSet;
+    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWs:Landroid/animation/AnimatorSet;
 
-    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWw:Landroid/animation/AnimatorSet;
+    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWs:Landroid/animation/AnimatorSet;
 
-    iget-object v1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWN:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object v1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWJ: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;->aWx:Landroid/animation/AnimatorSet;
+    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWt:Landroid/animation/AnimatorSet;
 
-    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWx:Landroid/animation/AnimatorSet;
+    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWt:Landroid/animation/AnimatorSet;
 
-    iget-object p2, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWN:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object p2, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWJ: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;->aWR:Landroid/graphics/Bitmap;
+    iget-object p0, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWN: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;->aWR:Landroid/graphics/Bitmap;
+    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWN: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;->aWS:Landroid/graphics/drawable/BitmapDrawable;
+    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWO: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;->aWT:Lcom/facebook/drawee/drawable/f;
+    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWP: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;->aWU:Landroid/os/CancellationSignal;
+    iget-object p0, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWQ: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;->aWS:Landroid/graphics/drawable/BitmapDrawable;
+    iget-object p0, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWO: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;->aWN:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object p0, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWJ: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;->aXR:Lcom/lytefast/flexinput/utils/a;
+    sget-object v0, Lcom/lytefast/flexinput/utils/a;->aXN:Lcom/lytefast/flexinput/utils/a;
 
-    invoke-static {}, Lcom/lytefast/flexinput/utils/a;->Bm()Z
+    invoke-static {}, Lcom/lytefast/flexinput/utils/a;->Bk()Z
 
     move-result v0
 
     if-eqz v0, :cond_7
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWQ:Lkotlinx/coroutines/Job;
+    iget-object v0, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWM: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;->aWU:Landroid/os/CancellationSignal;
+    iget-object v0, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWQ: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;->aWS:Landroid/graphics/drawable/BitmapDrawable;
+    iget-object v0, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWO: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;->aWS:Landroid/graphics/drawable/BitmapDrawable;
+    iput-object v0, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWO:Landroid/graphics/drawable/BitmapDrawable;
 
-    iget-object v1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWR:Landroid/graphics/Bitmap;
+    iget-object v1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWN: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;->aWR:Landroid/graphics/Bitmap;
+    iput-object v0, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWN:Landroid/graphics/Bitmap;
 
-    iget-object v1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWT:Lcom/facebook/drawee/drawable/f;
+    iget-object v1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWP: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;->aWT:Lcom/facebook/drawee/drawable/f;
+    iput-object v0, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWP: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;->aWO:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWK: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;->aWN:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWJ: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;->aWw:Landroid/animation/AnimatorSet;
+    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWs: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;->aWO:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWK: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;->aWN:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWJ: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;->aWx:Landroid/animation/AnimatorSet;
+    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWt: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;->aWV:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
+    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWR: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;->aWP:Lcom/lytefast/flexinput/model/Photo;
+    iget-object v0, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWL: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 040e8ea739..87e3e5e060 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;->AY()V
+    value = Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->AW()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field final synthetic aWV:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
+.field final synthetic aWR:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
 
 
 # direct methods
@@ -27,7 +27,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$c;->aWV:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
+    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$c;->aWR: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;->aWV:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
+    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$c;->aWR: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;->aWV:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
+    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$c;->aWR: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 703d6203e7..5b97fdf230 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 aWL:Landroid/graphics/drawable/Drawable;
+.field private static aWH:Landroid/graphics/drawable/Drawable;
 
-.field public static final aWM:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$a;
+.field public static final aWI:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$a;
 
 
 # instance fields
-.field private aWF:Landroid/database/Cursor;
+.field private aWB:Landroid/database/Cursor;
 
-.field private aWG:I
+.field private aWC:I
 
-.field private aWH:I
+.field private aWD:I
 
-.field private aWI:I
+.field private aWE:I
 
-.field final aWJ:I
+.field final aWF:I
 
-.field final aWK:I
+.field final aWG: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;->aWM:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$a;
+    sput-object v0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->aWI: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;->aWJ:I
+    iput p3, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->aWF:I
 
-    iput p4, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->aWK:I
+    iput p4, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->aWG:I
 
     move-object p1, p0
 
@@ -114,10 +114,10 @@
     return-void
 .end method
 
-.method public static final synthetic AZ()Landroid/graphics/drawable/Drawable;
+.method public static final synthetic AX()Landroid/graphics/drawable/Drawable;
     .locals 1
 
-    sget-object v0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->aWL:Landroid/graphics/drawable/Drawable;
+    sget-object v0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->aWH: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;->aWG:I
+    iput p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->aWC: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;->aWF:Landroid/database/Cursor;
+    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->aWB: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;->aWH:I
+    iput p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->aWD: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;->aWI:I
+    iput p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->aWE: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;->aWF:Landroid/database/Cursor;
+    iget-object v0, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->aWB: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;->aWG:I
+    iget p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->aWC: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;->aWI:I
+    iget v1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->aWE: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;->aWH:I
+    iget v1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->aWD:I
 
     invoke-interface {v0, v1}, Landroid/database/Cursor;->getString(I)Ljava/lang/String;
 
@@ -242,7 +242,7 @@
 
 
 # virtual methods
-.method public final AY()V
+.method public final AW()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;->aWF:Landroid/database/Cursor;
+    iget-object v0, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->aWB: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;->aWL:Landroid/graphics/drawable/Drawable;
+    sput-object v0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->aWH:Landroid/graphics/drawable/Drawable;
 
-    invoke-virtual {p0}, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->AY()V
+    invoke-virtual {p0}, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->AW()V
 
     return-void
 .end method
@@ -377,11 +377,11 @@
 
     move-result-object p2
 
-    iput-object p2, p1, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWP:Lcom/lytefast/flexinput/model/Photo;
+    iput-object p2, p1, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWL:Lcom/lytefast/flexinput/model/Photo;
 
-    sget-object v0, Lcom/lytefast/flexinput/utils/a;->aXR:Lcom/lytefast/flexinput/utils/a;
+    sget-object v0, Lcom/lytefast/flexinput/utils/a;->aXN:Lcom/lytefast/flexinput/utils/a;
 
-    invoke-static {}, Lcom/lytefast/flexinput/utils/a;->Bm()Z
+    invoke-static {}, Lcom/lytefast/flexinput/utils/a;->Bk()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;->aWN:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object v0, p1, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWJ: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;->aWL:Landroid/graphics/drawable/Drawable;
+    sget-object v2, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->aWH:Landroid/graphics/drawable/Drawable;
 
-    sget-object v3, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Oq:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sget-object v3, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Om: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;->aWU:Landroid/os/CancellationSignal;
+    iput-object v0, p1, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWQ:Landroid/os/CancellationSignal;
 
-    sget-object v0, Lkotlinx/coroutines/bb;->bkx:Lkotlinx/coroutines/bb;
+    sget-object v0, Lkotlinx/coroutines/bb;->bks:Lkotlinx/coroutines/bb;
 
     check-cast v0, Lkotlinx/coroutines/CoroutineScope;
 
-    invoke-static {}, Lkotlinx/coroutines/as;->DG()Lkotlinx/coroutines/bq;
+    invoke-static {}, Lkotlinx/coroutines/as;->DE()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;->aWQ:Lkotlinx/coroutines/Job;
+    iput-object p2, p1, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWM:Lkotlinx/coroutines/Job;
 
     return-void
 
     :cond_0
     if-eqz p2, :cond_1
 
-    iget-object v0, p1, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWV:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
+    iget-object v0, p1, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWR: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;->aWV:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
+    iget-object v0, p1, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWR: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;->aWN:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object p2, p1, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWJ:Lcom/facebook/drawee/view/SimpleDraweeView;
 
-    iget-object p1, p1, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWN:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object p1, p1, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWJ: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;->aWF:Landroid/database/Cursor;
+    iget-object v0, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->aWB: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 bf5932fa00..66dc201040 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 aWm:Lcom/lytefast/flexinput/adapters/a$a;
+.field public static final aWi:Lcom/lytefast/flexinput/adapters/a$a;
 
 
 # instance fields
-.field public final aWl:[Lcom/lytefast/flexinput/adapters/a$b;
+.field public final aWh:[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;->aWm:Lcom/lytefast/flexinput/adapters/a$a;
+    sput-object v0, Lcom/lytefast/flexinput/adapters/a;->aWi: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;->aWl:[Lcom/lytefast/flexinput/adapters/a$b;
+    iput-object p2, p0, Lcom/lytefast/flexinput/adapters/a;->aWh:[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;->aWl:[Lcom/lytefast/flexinput/adapters/a$b;
+    iget-object v0, p0, Lcom/lytefast/flexinput/adapters/a;->aWh:[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;->aWl:[Lcom/lytefast/flexinput/adapters/a$b;
+    iget-object v0, p0, Lcom/lytefast/flexinput/adapters/a;->aWh:[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 965f1bb125..1ae87bd818 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 aXg:Lcom/lytefast/flexinput/fragment/CameraFragment$a;
+.field public static final aXc: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;->aXg:Lcom/lytefast/flexinput/fragment/CameraFragment$a;
+    sput-object v0, Lcom/lytefast/flexinput/fragment/CameraFragment$a;->aXc: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 57dab1a534..5a6af20ae6 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 aXh:Lcom/lytefast/flexinput/fragment/CameraFragment$d;
+.field public static final aXd: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;->aXh:Lcom/lytefast/flexinput/fragment/CameraFragment$d;
+    sput-object v0, Lcom/lytefast/flexinput/fragment/CameraFragment$d;->aXd: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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 7dc73a1721..d20e4a7262 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 aXl:Ljava/io/File;
+.field final synthetic aXh:Ljava/io/File;
 
-.field final synthetic aXm:Lcom/lytefast/flexinput/fragment/CameraFragment$e$1;
+.field final synthetic aXi: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;->aXl:Ljava/io/File;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/CameraFragment$e$1$a;->aXh:Ljava/io/File;
 
-    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/CameraFragment$e$1$a;->aXm:Lcom/lytefast/flexinput/fragment/CameraFragment$e$1;
+    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/CameraFragment$e$1$a;->aXi: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;->aXm:Lcom/lytefast/flexinput/fragment/CameraFragment$e$1;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/CameraFragment$e$1$a;->aXi:Lcom/lytefast/flexinput/fragment/CameraFragment$e$1;
 
-    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$1;->aXe: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;->aXl:Ljava/io/File;
+    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/CameraFragment$e$1$a;->aXh: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 16e32b7400..4e3386326a 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 aXi:Lcom/lytefast/flexinput/fragment/CameraFragment$e;
+.field final synthetic aXe:Lcom/lytefast/flexinput/fragment/CameraFragment$e;
 
-.field final synthetic aXj:[B
+.field final synthetic aXf:[B
 
-.field final synthetic aXk:Lcom/camerakit/CameraKitView;
+.field final synthetic aXg: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;->aXi:Lcom/lytefast/flexinput/fragment/CameraFragment$e;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/CameraFragment$e$1;->aXe:Lcom/lytefast/flexinput/fragment/CameraFragment$e;
 
-    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/CameraFragment$e$1;->aXj:[B
+    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/CameraFragment$e$1;->aXf:[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;->aXk:Lcom/camerakit/CameraKitView;
+    iput-object p4, p0, Lcom/lytefast/flexinput/fragment/CameraFragment$e$1;->aXg: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;->aXi:Lcom/lytefast/flexinput/fragment/CameraFragment$e;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/CameraFragment$e$1;->aXe: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;->Bl()Ljava/io/File;
+    invoke-interface {v0}, Lcom/lytefast/flexinput/managers/FileManager;->Bj()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;->aXj:[B
+    iget-object v3, p0, Lcom/lytefast/flexinput/fragment/CameraFragment$e$1;->aXf:[B
 
     invoke-virtual {v2, v3}, Ljava/io/FileOutputStream;->write([B)V
 
-    sget-object v2, Lkotlin/Unit;->bgy:Lkotlin/Unit;
+    sget-object v2, Lkotlin/Unit;->bgt: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;->aXk:Lcom/camerakit/CameraKitView;
+    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/CameraFragment$e$1;->aXg: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 37f9ae3317..a3bc92c680 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;->Bd()V
+    value = Lcom/lytefast/flexinput/fragment/CameraFragment$j;->Bb()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic aXn:Lcom/lytefast/flexinput/fragment/CameraFragment$j;
+.field final synthetic aXj: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;->aXn:Lcom/lytefast/flexinput/fragment/CameraFragment$j;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/CameraFragment$j$a;->aXj: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;->aXn:Lcom/lytefast/flexinput/fragment/CameraFragment$j;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/CameraFragment$j$a;->aXj: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;->aXn:Lcom/lytefast/flexinput/fragment/CameraFragment$j;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/CameraFragment$j$a;->aXj: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 b106760c50..f769132df4 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 Bd()V
+.method public final Bb()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 Be()V
+.method public final Bc()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 eeb7f4b3f0..05be4c95f9 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;->aXh:Lcom/lytefast/flexinput/fragment/CameraFragment$d;
+    sget-object v0, Lcom/lytefast/flexinput/fragment/CameraFragment$d;->aXd: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;->aXg:Lcom/lytefast/flexinput/fragment/CameraFragment$a;
+    sget-object v0, Lcom/lytefast/flexinput/fragment/CameraFragment$a;->aXc: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;->Bl()Ljava/io/File;
+    invoke-interface {v1}, Lcom/lytefast/flexinput/managers/FileManager;->Bj()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 df29a8c8ad..89e8078e05 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 aXo:Lcom/lytefast/flexinput/fragment/FilesFragment;
+.field final synthetic aXk: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;->aXo:Lcom/lytefast/flexinput/fragment/FilesFragment;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FilesFragment$a;->aXk: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;->aXo:Lcom/lytefast/flexinput/fragment/FilesFragment;
+    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/FilesFragment$a;->aXk: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 da02b1abef..9dad0ed7fb 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;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 1f3a44b83b..e7d00c8835 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 aXo:Lcom/lytefast/flexinput/fragment/FilesFragment;
+.field final synthetic aXk:Lcom/lytefast/flexinput/fragment/FilesFragment;
 
 
 # direct methods
@@ -30,7 +30,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FilesFragment$c;->aXo:Lcom/lytefast/flexinput/fragment/FilesFragment;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FilesFragment$c;->aXk:Lcom/lytefast/flexinput/fragment/FilesFragment;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -39,10 +39,10 @@
 
 
 # virtual methods
-.method public final Bd()V
+.method public final Bb()V
     .locals 4
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FilesFragment$c;->aXo:Lcom/lytefast/flexinput/fragment/FilesFragment;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FilesFragment$c;->aXk: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;->aXo:Lcom/lytefast/flexinput/fragment/FilesFragment;
+    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FilesFragment$c;->aXk: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;->aXo:Lcom/lytefast/flexinput/fragment/FilesFragment;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FilesFragment$c;->aXk: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;->aXo:Lcom/lytefast/flexinput/fragment/FilesFragment;
+    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FilesFragment$c;->aXk: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;->aXo:Lcom/lytefast/flexinput/fragment/FilesFragment;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FilesFragment$c;->aXk: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 Be()V
+.method public final Bc()V
     .locals 3
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FilesFragment$c;->aXo:Lcom/lytefast/flexinput/fragment/FilesFragment;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FilesFragment$c;->aXk: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 092a86fd6d..9ca66a320f 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;->AX()Lcom/lytefast/flexinput/utils/SelectionAggregator;
+    invoke-interface {p3}, Lcom/lytefast/flexinput/FlexInputCoordinator;->AV()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 2eb5c0a1a9..76c02f751b 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 aXD:Landroid/util/AttributeSet;
+.field final synthetic aXA:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
-.field final synthetic aXE:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+.field final synthetic aXz:Landroid/util/AttributeSet;
 
 .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;->aXE:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$1;->aXA: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;->aXD:Landroid/util/AttributeSet;
+    iput-object p3, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$1;->aXz: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;->aXD:Landroid/util/AttributeSet;
+    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$1;->aXz: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;->aXE:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$1;->aXA: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 b241a2d37e..ac30f56e76 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 aXE:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+.field final synthetic aXA: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;->aXE:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$10;->aXA: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;->aXE:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$10;->aXA:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
-    invoke-virtual {p1}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Bg()V
+    invoke-virtual {p1}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Be()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 3000000e38..cba8371b93 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 aXE:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+.field final synthetic aXA: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;->aXE:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$11;->aXA: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;->aXE:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$11;->aXA:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
-    invoke-virtual {p1}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Bi()Z
+    invoke-virtual {p1}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Bg()Z
 
-    iget-object v0, p1, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXz:Lcom/lytefast/flexinput/managers/a;
+    iget-object v0, p1, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXv: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 9d801237cc..793b6db5ee 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 aXE:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+.field final synthetic aXA: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;->aXE:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$12;->aXA: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;->aXE:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$12;->aXA: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 b11c8510ef..4f9ff06247 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 aXE:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+.field final synthetic aXA: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;->aXE:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$13;->aXA: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;->aXE:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$13;->aXA: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 a2871808bb..fcf3eac5ac 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 aXE:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+.field final synthetic aXA: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;->aXE:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$14;->aXA: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;->aXE:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$14;->aXA: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;->Bi()Z
+    invoke-virtual {p1}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Bg()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 a4290560c2..536a47a886 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 aXE:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+.field final synthetic aXA: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;->aXE:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$2;->aXA: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;->aXE:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$2;->aXA: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 b1012de79d..7b2f5cd497 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 aXE:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+.field final synthetic aXA:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
-.field final synthetic aXF:Landroidx/appcompat/widget/AppCompatEditText;
+.field final synthetic aXB: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;->aXE:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->aXA:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
-    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->aXF:Landroidx/appcompat/widget/AppCompatEditText;
+    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->aXB: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;->aXE:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->aXA: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;->Bj()Ljava/lang/String;
+    invoke-static {}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Bh()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;->aXF:Landroidx/appcompat/widget/AppCompatEditText;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->aXB: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;->aXE:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->aXA: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;->aXF:Landroidx/appcompat/widget/AppCompatEditText;
+    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->aXB:Landroidx/appcompat/widget/AppCompatEditText;
 
     invoke-virtual {v1, v0}, Landroidx/appcompat/widget/AppCompatEditText;->setText(Ljava/lang/CharSequence;)V
 
-    invoke-static {}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Bj()Ljava/lang/String;
+    invoke-static {}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Bh()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;->aXE:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->aXA: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;->aXE:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->aXA: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;->aXE:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->aXA: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;->aXE:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object v2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->aXA: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;->aXE:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->aXA: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;->aXF:Landroidx/appcompat/widget/AppCompatEditText;
+    iget-object v2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->aXB: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;->aXE:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->aXA:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
-    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->aXF:Landroidx/appcompat/widget/AppCompatEditText;
+    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->aXB: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;->aXF:Landroidx/appcompat/widget/AppCompatEditText;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->aXB: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;->aXF:Landroidx/appcompat/widget/AppCompatEditText;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->aXB: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;->aXF:Landroidx/appcompat/widget/AppCompatEditText;
+    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->aXB: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;->aXF:Landroidx/appcompat/widget/AppCompatEditText;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->aXB:Landroidx/appcompat/widget/AppCompatEditText;
 
     invoke-virtual {v0}, Landroidx/appcompat/widget/AppCompatEditText;->requestLayout()V
 
-    invoke-static {}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Bj()Ljava/lang/String;
+    invoke-static {}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Bh()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;->aXE:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->aXA:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
-    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->aXF:Landroidx/appcompat/widget/AppCompatEditText;
+    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->aXB: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;->aXE:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->aXA:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
-    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->aXF:Landroidx/appcompat/widget/AppCompatEditText;
+    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->aXB: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 443918ac3e..c5fa625cf9 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 aXE:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+.field final synthetic aXA: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;->aXE:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$4;->aXA: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;->aXE:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$4;->aXA: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;->aXE:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$4;->aXA: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 adfce02eb2..9df19f0711 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 aXE:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+.field final synthetic aXA:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
-.field final synthetic aXG:Lcom/lytefast/flexinput/fragment/a;
+.field final synthetic aXC: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;->aXE:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$5;->aXA:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
-    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$5;->aXG:Lcom/lytefast/flexinput/fragment/a;
+    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$5;->aXC: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;->aXG:Lcom/lytefast/flexinput/fragment/a;
+    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$5;->aXC: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;->aXG:Lcom/lytefast/flexinput/fragment/a;
+    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$5;->aXC: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;->aXG:Lcom/lytefast/flexinput/fragment/a;
+    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$5;->aXC: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;->aXE:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$5;->aXA: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;->aXE:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$5;->aXA: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;->aXE:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$5;->aXA:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
-    iget-object v0, p1, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXu:Landroidx/appcompat/widget/AppCompatEditText;
+    iget-object v0, p1, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXq:Landroidx/appcompat/widget/AppCompatEditText;
 
     invoke-virtual {v0}, Landroidx/appcompat/widget/AppCompatEditText;->requestFocus()Z
 
-    iget-object v0, p1, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXs:Landroid/view/View;
+    iget-object v0, p1, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXo: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;->aXu:Landroidx/appcompat/widget/AppCompatEditText;
+    iget-object v0, p1, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXq: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;->aXE:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$5;->aXA: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 b32a7ac9a4..739ade4b46 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 aXE:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+.field final synthetic aXA:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
-.field final synthetic aXH:Landroidx/fragment/app/DialogFragment;
+.field final synthetic aXD: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;->aXE:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$6;->aXA:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
-    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$6;->aXH:Landroidx/fragment/app/DialogFragment;
+    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$6;->aXD: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;->aXH:Landroidx/fragment/app/DialogFragment;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$6;->aXD: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;->aXH:Landroidx/fragment/app/DialogFragment;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$6;->aXD: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;->aXH:Landroidx/fragment/app/DialogFragment;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$6;->aXD: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;->aXH:Landroidx/fragment/app/DialogFragment;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$6;->aXD: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;->Bj()Ljava/lang/String;
+    invoke-static {}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Bh()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 51dcd281a0..f990cd00f9 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;->Bk()V
+    value = Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;->Bi()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic aXI:Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;
+.field final synthetic aXE: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;->aXI:Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$7$1;->aXE: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;->aXI:Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$7$1;->aXE:Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;
 
-    iget-object v0, v0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;->aXE:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object v0, v0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;->aXA: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;->aXI:Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$7$1;->aXE:Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;
 
-    iget-object v0, v0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;->aXE:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object v0, v0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;->aXA:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
-    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$7$1;->aXI:Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;
+    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$7$1;->aXE:Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;
 
-    iget-object v1, v1, Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;->aXE:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object v1, v1, Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;->aXA: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;->aXI:Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$7$1;->aXE:Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;
 
-    iget-object v0, v0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;->aXE:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object v0, v0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;->aXA: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;->aXI:Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$7$1;->aXE:Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;
 
-    iget-object v0, v0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;->aXE:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object v0, v0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;->aXA: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 c6d95253da..5704bb5e67 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 aXE:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+.field final synthetic aXA: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;->aXE:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;->aXA:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     return-void
 .end method
 
-.method private Bk()V
+.method private Bi()V
     .locals 2
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;->aXE:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;->aXA: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;->Bk()V
+    invoke-direct {p0}, Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;->Bi()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;->Bk()V
+    invoke-direct {p0}, Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;->Bi()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 82ba02f972..1a04af69e1 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 aXE:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+.field final synthetic aXA: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;->aXE:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$8;->aXA: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;->aXE:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$8;->aXA:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
-    invoke-virtual {p1}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Bh()V
+    invoke-virtual {p1}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Bf()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 65c5750a7c..9bebf08a45 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 aXE:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+.field final synthetic aXA: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;->aXE:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$9;->aXA: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;->aXE:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$9;->aXA:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
-    iget-object v0, p1, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXs:Landroid/view/View;
+    iget-object v0, p1, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXo: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;->Bi()Z
+    invoke-virtual {p1}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Bg()Z
 
-    iget-object v0, p1, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXz:Lcom/lytefast/flexinput/managers/a;
+    iget-object v0, p1, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXv:Lcom/lytefast/flexinput/managers/a;
 
-    iget-object p1, p1, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXu:Landroidx/appcompat/widget/AppCompatEditText;
+    iget-object p1, p1, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXq: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;->aXs:Landroid/view/View;
+    iget-object v0, p1, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXo: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;->aXz:Lcom/lytefast/flexinput/managers/a;
+    iget-object v0, p1, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXv:Lcom/lytefast/flexinput/managers/a;
 
     invoke-interface {v0}, Lcom/lytefast/flexinput/managers/a;->requestHide()V
 
-    iget-object v0, p1, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXv:Landroidx/appcompat/widget/AppCompatImageButton;
+    iget-object v0, p1, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXr: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 87652d24c2..5089707f21 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment.smali
@@ -22,13 +22,35 @@
 
 
 # instance fields
-.field protected aWl:[Lcom/lytefast/flexinput/adapters/a$b;
+.field protected aWh:[Lcom/lytefast/flexinput/adapters/a$b;
 
-.field public aXA:Lcom/lytefast/flexinput/InputListener;
+.field private aXl:Landroid/view/View;
 
-.field protected aXB:Lcom/lytefast/flexinput/managers/FileManager;
+.field private aXm:Landroid/view/View;
 
-.field protected aXC:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
+.field public aXn:Landroid/widget/LinearLayout;
+
+.field aXo:Landroid/view/View;
+
+.field private aXp:Landroidx/recyclerview/widget/RecyclerView;
+
+.field public aXq:Landroidx/appcompat/widget/AppCompatEditText;
+
+.field public aXr:Landroidx/appcompat/widget/AppCompatImageButton;
+
+.field private aXs:Landroidx/appcompat/widget/AppCompatImageButton;
+
+.field private aXt:Landroid/view/View;
+
+.field private aXu:Ljava/lang/Runnable;
+
+.field public aXv:Lcom/lytefast/flexinput/managers/a;
+
+.field public aXw:Lcom/lytefast/flexinput/InputListener;
+
+.field protected aXx:Lcom/lytefast/flexinput/managers/FileManager;
+
+.field protected aXy:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter<",
@@ -39,28 +61,6 @@
     .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 Bj()Ljava/lang/String;
+.method static synthetic Bh()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;->aXu:Landroidx/appcompat/widget/AppCompatEditText;
+    iget-object p0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXq: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;->aXu:Landroidx/appcompat/widget/AppCompatEditText;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXq: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;->aXu:Landroidx/appcompat/widget/AppCompatEditText;
+    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXq: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;->aXu:Landroidx/appcompat/widget/AppCompatEditText;
+    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXq: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;->aXp:Landroid/view/View;
+    iget-object p0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXl: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;->aXp:Landroid/view/View;
+    iget-object p0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXl: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;->aXp:Landroid/view/View;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXl:Landroid/view/View;
 
-    iget-object p0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXC:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
+    iget-object p0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXy: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;->aXr:Landroid/widget/LinearLayout;
+    iget-object p0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXn: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;->aXz:Lcom/lytefast/flexinput/managers/a;
+    iget-object p0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXv:Lcom/lytefast/flexinput/managers/a;
 
     return-object p0
 .end method
 
 
 # virtual methods
-.method public final AX()Lcom/lytefast/flexinput/utils/SelectionAggregator;
+.method public final AV()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;->aXC:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXy:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
 
-    iget-object v0, v0, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;->aWn:Lcom/lytefast/flexinput/utils/SelectionAggregator;
+    iget-object v0, v0, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;->aWj:Lcom/lytefast/flexinput/utils/SelectionAggregator;
 
     return-object v0
 .end method
 
-.method public final Bf()[Lcom/lytefast/flexinput/adapters/a$b;
+.method public final Bd()[Lcom/lytefast/flexinput/adapters/a$b;
     .locals 5
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aWl:[Lcom/lytefast/flexinput/adapters/a$b;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aWh:[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;->aWm:Lcom/lytefast/flexinput/adapters/a$a;
+    sget-object v0, Lcom/lytefast/flexinput/adapters/a;->aWi:Lcom/lytefast/flexinput/adapters/a$a;
 
     const/4 v0, 0x3
 
@@ -363,20 +363,20 @@
     return-object v0
 .end method
 
-.method public final Bg()V
+.method public final Be()V
     .locals 3
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXA:Lcom/lytefast/flexinput/InputListener;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXw:Lcom/lytefast/flexinput/InputListener;
 
-    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXu:Landroidx/appcompat/widget/AppCompatEditText;
+    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXq: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;->aXC:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
+    iget-object v2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXy:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
 
-    iget-object v2, v2, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;->aWn:Lcom/lytefast/flexinput/utils/SelectionAggregator;
+    iget-object v2, v2, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;->aWj: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;->aXu:Landroidx/appcompat/widget/AppCompatEditText;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXq: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;->Bh()V
+    invoke-virtual {p0}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Bf()V
 
     :cond_0
     return-void
 .end method
 
-.method public final Bh()V
+.method public final Bf()V
     .locals 2
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXC:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXy:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
 
     invoke-virtual {v0}, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;->clear()V
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXp:Landroid/view/View;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXl: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;->aXu:Landroidx/appcompat/widget/AppCompatEditText;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXq: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 Bi()Z
+.method public final Bg()Z
     .locals 3
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXs:Landroid/view/View;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXo: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;->aXs:Landroid/view/View;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXo: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;->aXv:Landroidx/appcompat/widget/AppCompatImageButton;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXr: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;->aWn:Lcom/lytefast/flexinput/utils/SelectionAggregator;
+    iget-object v0, p1, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;->aWj:Lcom/lytefast/flexinput/utils/SelectionAggregator;
 
-    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXC:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
+    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXy:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
 
-    iget-object v1, v1, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;->aWn:Lcom/lytefast/flexinput/utils/SelectionAggregator;
+    iget-object v1, v1, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;->aWj: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;->aXC:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXy:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
 
-    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXt:Landroidx/recyclerview/widget/RecyclerView;
+    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXp:Landroidx/recyclerview/widget/RecyclerView;
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXC:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXy: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;->aXB:Lcom/lytefast/flexinput/managers/FileManager;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXx: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;->aWl:[Lcom/lytefast/flexinput/adapters/a$b;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aWh:[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;->aXw:Landroidx/appcompat/widget/AppCompatImageButton;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXs: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;->aXC:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
+    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXy: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;->aXC:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
+    iget-object v3, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXy:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
 
-    iget-object v3, v3, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;->aWn:Lcom/lytefast/flexinput/utils/SelectionAggregator;
+    iget-object v3, v3, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;->aWj: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;->aXt:Landroidx/recyclerview/widget/RecyclerView;
+    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXp: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;->aXB:Lcom/lytefast/flexinput/managers/FileManager;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXx: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;->aXp:Landroid/view/View;
+    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXl: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;->aXq:Landroid/view/View;
+    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXm:Landroid/view/View;
 
-    iget-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXq:Landroid/view/View;
+    iget-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXm: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;->aXr:Landroid/widget/LinearLayout;
+    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXn: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;->aXs:Landroid/view/View;
+    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXo: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;->aXt:Landroidx/recyclerview/widget/RecyclerView;
+    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXp: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;->aXu:Landroidx/appcompat/widget/AppCompatEditText;
+    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXq:Landroidx/appcompat/widget/AppCompatEditText;
 
-    iget-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXu:Landroidx/appcompat/widget/AppCompatEditText;
+    iget-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXq: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;->aXv:Landroidx/appcompat/widget/AppCompatImageButton;
+    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXr:Landroidx/appcompat/widget/AppCompatImageButton;
 
-    iget-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXv:Landroidx/appcompat/widget/AppCompatImageButton;
+    iget-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXr: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;->aXw:Landroidx/appcompat/widget/AppCompatImageButton;
+    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXs:Landroidx/appcompat/widget/AppCompatImageButton;
 
-    iget-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXw:Landroidx/appcompat/widget/AppCompatImageButton;
+    iget-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXs: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;->aXx:Landroid/view/View;
+    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXt:Landroid/view/View;
 
-    iget-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXx:Landroid/view/View;
+    iget-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXt: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;->aXq:Landroid/view/View;
+    iget-object p3, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXm:Landroid/view/View;
 
     aput-object p3, p2, v0
 
-    iget-object p3, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXx:Landroid/view/View;
+    iget-object p3, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXt:Landroid/view/View;
 
     const/4 v1, 0x1
 
     aput-object p3, p2, v1
 
-    iget-object p3, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXv:Landroidx/appcompat/widget/AppCompatImageButton;
+    iget-object p3, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXr:Landroidx/appcompat/widget/AppCompatImageButton;
 
     const/4 v1, 0x2
 
     aput-object p3, p2, v1
 
-    iget-object p3, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXw:Landroidx/appcompat/widget/AppCompatImageButton;
+    iget-object p3, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXs: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;->aXv:Landroidx/appcompat/widget/AppCompatImageButton;
+    iget-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXr: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;->aXy:Ljava/lang/Runnable;
+    iget-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXu:Ljava/lang/Runnable;
 
     invoke-interface {p2}, Ljava/lang/Runnable;->run()V
 
     const/4 p2, 0x0
 
-    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXy:Ljava/lang/Runnable;
+    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXu: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;->aXy:Ljava/lang/Runnable;
+    iput-object p3, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXu: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;->aWn:Lcom/lytefast/flexinput/utils/SelectionAggregator;
+    iget-object p1, p2, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;->aWj: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;->aXC:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
+    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXy: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;->Bi()Z
+    invoke-virtual {p0}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Bg()Z
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXz:Lcom/lytefast/flexinput/managers/a;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXv: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;->aXC:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXy:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
 
-    iget-object v0, v0, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;->aWn:Lcom/lytefast/flexinput/utils/SelectionAggregator;
+    iget-object v0, v0, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;->aWj: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;->aXu:Landroidx/appcompat/widget/AppCompatEditText;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXq: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;->aXC:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXy:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
 
-    iget-object v0, v0, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;->aWn:Lcom/lytefast/flexinput/utils/SelectionAggregator;
+    iget-object v0, v0, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;->aWj: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;->aXu:Landroidx/appcompat/widget/AppCompatEditText;
+    iget-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXq: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;->aXu:Landroidx/appcompat/widget/AppCompatEditText;
+    iget-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXq: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 07ae1308aa..a89e7e20a7 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 Bd()V
+.method public abstract Bb()V
 .end method
 
-.method public abstract Be()V
+.method public abstract Bc()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 7207eb105d..4d603565f7 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;->Bd()V
+    invoke-interface {p1}, Lcom/lytefast/flexinput/fragment/PermissionsFragment$PermissionsResultCallback;->Bb()V
 
     goto :goto_0
 
     :cond_1
-    invoke-interface {p1}, Lcom/lytefast/flexinput/fragment/PermissionsFragment$PermissionsResultCallback;->Be()V
+    invoke-interface {p1}, Lcom/lytefast/flexinput/fragment/PermissionsFragment$PermissionsResultCallback;->Bc()V
 
     :cond_2
     :goto_0
@@ -254,7 +254,7 @@
     return p1
 
     :cond_0
-    invoke-interface {p1}, Lcom/lytefast/flexinput/fragment/PermissionsFragment$PermissionsResultCallback;->Bd()V
+    invoke-interface {p1}, Lcom/lytefast/flexinput/fragment/PermissionsFragment$PermissionsResultCallback;->Bb()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 f338408777..ada79e297c 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 aXJ:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
+.field final synthetic aXF:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
 
-.field final synthetic aXK:Lcom/lytefast/flexinput/fragment/PhotosFragment;
+.field final synthetic aXG: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;->aXJ:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$a;->aXF:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
 
-    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$a;->aXK:Lcom/lytefast/flexinput/fragment/PhotosFragment;
+    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$a;->aXG: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;->aXK:Lcom/lytefast/flexinput/fragment/PhotosFragment;
+    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$a;->aXG:Lcom/lytefast/flexinput/fragment/PhotosFragment;
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$a;->aXJ:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$a;->aXF: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 994eb2ddaf..35d5dc5ea7 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 aXJ:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
+.field final synthetic aXF:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
 
-.field final synthetic aXK:Lcom/lytefast/flexinput/fragment/PhotosFragment;
+.field final synthetic aXG: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;->aXJ:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$b;->aXF:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
 
-    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$b;->aXK:Lcom/lytefast/flexinput/fragment/PhotosFragment;
+    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$b;->aXG: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;->aXK:Lcom/lytefast/flexinput/fragment/PhotosFragment;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$b;->aXG: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;->aXJ:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$b;->aXF:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
 
-    invoke-virtual {v0}, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->AY()V
+    invoke-virtual {v0}, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->AW()V
 
     :cond_0
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$b;->aXK:Lcom/lytefast/flexinput/fragment/PhotosFragment;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$b;->aXG: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 6fc7916606..fe752bd591 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 aXJ:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
+.field final synthetic aXF:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
 
-.field final synthetic aXK:Lcom/lytefast/flexinput/fragment/PhotosFragment;
+.field final synthetic aXG:Lcom/lytefast/flexinput/fragment/PhotosFragment;
 
 
 # direct methods
@@ -34,9 +34,9 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$c;->aXK:Lcom/lytefast/flexinput/fragment/PhotosFragment;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$c;->aXG:Lcom/lytefast/flexinput/fragment/PhotosFragment;
 
-    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$c;->aXJ:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
+    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$c;->aXF:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -45,10 +45,10 @@
 
 
 # virtual methods
-.method public final Bd()V
+.method public final Bb()V
     .locals 4
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$c;->aXK:Lcom/lytefast/flexinput/fragment/PhotosFragment;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$c;->aXG: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;->aXK:Lcom/lytefast/flexinput/fragment/PhotosFragment;
+    iget-object v2, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$c;->aXG: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;->aXK:Lcom/lytefast/flexinput/fragment/PhotosFragment;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$c;->aXG: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;->aXJ:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
+    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$c;->aXF: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;->aXK:Lcom/lytefast/flexinput/fragment/PhotosFragment;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$c;->aXG: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 Be()V
+.method public final Bc()V
     .locals 3
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$c;->aXK:Lcom/lytefast/flexinput/fragment/PhotosFragment;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$c;->aXG: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 ca91a06a59..00c767b143 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;->AX()Lcom/lytefast/flexinput/utils/SelectionAggregator;
+    invoke-interface {p3}, Lcom/lytefast/flexinput/FlexInputCoordinator;->AV()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 3eeaf26b98..5147ba6b54 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;->Bc()V
+    value = Lcom/lytefast/flexinput/fragment/a;->Ba()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,7 +18,7 @@
 
 
 # instance fields
-.field final synthetic aXe:Lcom/lytefast/flexinput/fragment/a;
+.field final synthetic aXa:Lcom/lytefast/flexinput/fragment/a;
 
 
 # direct methods
@@ -30,7 +30,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/a$b;->aXe:Lcom/lytefast/flexinput/fragment/a;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/a$b;->aXa: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;->aXe:Lcom/lytefast/flexinput/fragment/a;
+    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/a$b;->aXa: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 29ccaae9ab..bebe3a7c8b 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 aXe:Lcom/lytefast/flexinput/fragment/a;
+.field final synthetic aXa:Lcom/lytefast/flexinput/fragment/a;
 
 
 # direct methods
@@ -39,7 +39,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/a$c;->aXe:Lcom/lytefast/flexinput/fragment/a;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/a$c;->aXa: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;->aXe:Lcom/lytefast/flexinput/fragment/a;
+    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/a$c;->aXa: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;->aXe:Lcom/lytefast/flexinput/fragment/a;
+    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/a$c;->aXa: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 3d1581be93..86517aa571 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 aXe:Lcom/lytefast/flexinput/fragment/a;
+.field final synthetic aXa:Lcom/lytefast/flexinput/fragment/a;
 
 
 # direct methods
@@ -29,7 +29,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/a$d;->aXe:Lcom/lytefast/flexinput/fragment/a;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/a$d;->aXa: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 8519afe153..ecf66177c2 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 aXe:Lcom/lytefast/flexinput/fragment/a;
+.field final synthetic aXa: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;->aXe:Lcom/lytefast/flexinput/fragment/a;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/a$e;->aXa: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;->aXe:Lcom/lytefast/flexinput/fragment/a;
+    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/a$e;->aXa: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;->Bc()V
+    invoke-virtual {p1}, Lcom/lytefast/flexinput/fragment/a;->Ba()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 2419b8037d..acbe9c5923 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 aXe:Lcom/lytefast/flexinput/fragment/a;
+.field final synthetic aXa: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;->aXe:Lcom/lytefast/flexinput/fragment/a;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/a$f;->aXa: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;->aXe:Lcom/lytefast/flexinput/fragment/a;
+    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/a$f;->aXa: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;->Ba()Ljava/util/List;
+    invoke-virtual {p1}, Lcom/lytefast/flexinput/fragment/a;->AY()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;->aXb:I
+    sget v1, Lcom/lytefast/flexinput/fragment/a;->aWX: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 891a24c03c..ccf3687f30 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 aXe:Lcom/lytefast/flexinput/fragment/a;
+.field final synthetic aXa:Lcom/lytefast/flexinput/fragment/a;
 
-.field final synthetic aXf:Landroidx/fragment/app/Fragment;
+.field final synthetic aXb: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;->aXe:Lcom/lytefast/flexinput/fragment/a;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/a$g;->aXa:Lcom/lytefast/flexinput/fragment/a;
 
-    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/a$g;->aXf:Landroidx/fragment/app/Fragment;
+    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/a$g;->aXb: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;->aXe:Lcom/lytefast/flexinput/fragment/a;
+    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/a$g;->aXa:Lcom/lytefast/flexinput/fragment/a;
 
-    invoke-virtual {p1}, Lcom/lytefast/flexinput/fragment/a;->Bc()V
+    invoke-virtual {p1}, Lcom/lytefast/flexinput/fragment/a;->Ba()V
 
-    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/a$g;->aXf:Landroidx/fragment/app/Fragment;
+    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/a$g;->aXb:Landroidx/fragment/app/Fragment;
 
     check-cast p1, Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
-    invoke-virtual {p1}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Bg()V
+    invoke-virtual {p1}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Be()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 f9f25d9cdb..476809ef6f 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 aXe:Lcom/lytefast/flexinput/fragment/a;
+.field final synthetic aXa: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;->aXe:Lcom/lytefast/flexinput/fragment/a;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/a$h;->aXa: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;->aXe:Lcom/lytefast/flexinput/fragment/a;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/a$h;->aXa: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 41f3d5077a..467a04ee19 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 aXe:Lcom/lytefast/flexinput/fragment/a;
+.field final synthetic aXa:Lcom/lytefast/flexinput/fragment/a;
 
 
 # direct methods
@@ -30,7 +30,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/a$i;->aXe:Lcom/lytefast/flexinput/fragment/a;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/a$i;->aXa: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;->aXe:Lcom/lytefast/flexinput/fragment/a;
+    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/a$i;->aXa:Lcom/lytefast/flexinput/fragment/a;
 
-    invoke-virtual {p1}, Lcom/lytefast/flexinput/fragment/a;->Bc()V
+    invoke-virtual {p1}, Lcom/lytefast/flexinput/fragment/a;->Ba()V
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/a$i;->aXe:Lcom/lytefast/flexinput/fragment/a;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/a$i;->aXa: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 a27d366afd..0519cf2df3 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 aXe:Lcom/lytefast/flexinput/fragment/a;
+.field final synthetic aXa:Lcom/lytefast/flexinput/fragment/a;
 
 
 # direct methods
@@ -30,7 +30,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/a$j;->aXe:Lcom/lytefast/flexinput/fragment/a;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/a$j;->aXa: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;->aXe:Lcom/lytefast/flexinput/fragment/a;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/a$j;->aXa: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 d6031e6e2f..aa33a1b9bf 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 aXe:Lcom/lytefast/flexinput/fragment/a;
+.field final synthetic aXa: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;->aXe:Lcom/lytefast/flexinput/fragment/a;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/a$k;->aXa: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;->aXe:Lcom/lytefast/flexinput/fragment/a;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/a$k;->aXa: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;->aXe:Lcom/lytefast/flexinput/fragment/a;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/a$k;->aXa: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;->aXe:Lcom/lytefast/flexinput/fragment/a;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/a$k;->aXa: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 a1ea5ab037..a00d46e1a3 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/a.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/a.smali
@@ -13,24 +13,26 @@
 
 # static fields
 # The value of this static final field might be set in the static constructor
-.field static final aXb:I = 0x1750
+.field static final aWX:I = 0x1750
 
 # The value of this static final field might be set in the static constructor
-.field private static final aXc:Ljava/lang/String; = "com.google.android.apps.docs"
+.field private static final aWY:Ljava/lang/String; = "com.google.android.apps.docs"
 
-.field public static final aXd:Lcom/lytefast/flexinput/fragment/a$a;
+.field public static final aWZ:Lcom/lytefast/flexinput/fragment/a$a;
 
 
 # instance fields
-.field private aWW:Landroidx/viewpager/widget/ViewPager;
+.field private aWS:Landroidx/viewpager/widget/ViewPager;
 
-.field private aWX:Lcom/google/android/material/tabs/TabLayout;
+.field private aWT:Lcom/google/android/material/tabs/TabLayout;
 
-.field private aWY:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
+.field private aWU:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
 
-.field private aWZ:Landroid/widget/ImageView;
+.field private aWV:Landroid/widget/ImageView;
 
-.field private aWn:Lcom/lytefast/flexinput/utils/SelectionAggregator;
+.field private final aWW:Lcom/lytefast/flexinput/fragment/a$c;
+
+.field private aWj:Lcom/lytefast/flexinput/utils/SelectionAggregator;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/lytefast/flexinput/utils/SelectionAggregator<",
@@ -41,8 +43,6 @@
     .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;->aXd:Lcom/lytefast/flexinput/fragment/a$a;
+    sput-object v0, Lcom/lytefast/flexinput/fragment/a;->aWZ:Lcom/lytefast/flexinput/fragment/a$a;
 
     const/16 v0, 0x1750
 
-    sput v0, Lcom/lytefast/flexinput/fragment/a;->aXb:I
+    sput v0, Lcom/lytefast/flexinput/fragment/a;->aWX:I
 
     const-string v0, "com.google.android.apps.docs"
 
-    sput-object v0, Lcom/lytefast/flexinput/fragment/a;->aXc:Ljava/lang/String;
+    sput-object v0, Lcom/lytefast/flexinput/fragment/a;->aWY: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;->aXa:Lcom/lytefast/flexinput/fragment/a$c;
+    iput-object v0, p0, Lcom/lytefast/flexinput/fragment/a;->aWW:Lcom/lytefast/flexinput/fragment/a$c;
 
     return-void
 .end method
 
-.method private final Bb()Landroid/content/Intent;
+.method private final AZ()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;->aXc:Ljava/lang/String;
+    sget-object v7, Lcom/lytefast/flexinput/fragment/a;->aWY: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;->aWY:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/a;->aWU: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;->aWW:Landroidx/viewpager/widget/ViewPager;
+    iget-object p0, p0, Lcom/lytefast/flexinput/fragment/a;->aWS: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;->aWX:Lcom/google/android/material/tabs/TabLayout;
+    iget-object p0, p0, Lcom/lytefast/flexinput/fragment/a;->aWT: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;->aWn:Lcom/lytefast/flexinput/utils/SelectionAggregator;
+    iget-object p0, p0, Lcom/lytefast/flexinput/fragment/a;->aWj: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;->aWY:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
+    iget-object p0, p0, Lcom/lytefast/flexinput/fragment/a;->aWU:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
 
     return-object p0
 .end method
 
 
 # virtual methods
-.method Ba()Ljava/util/List;
+.method AY()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;->aXc:Ljava/lang/String;
+    sget-object v4, Lcom/lytefast/flexinput/fragment/a;->aWY: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;->Bb()Landroid/content/Intent;
+    invoke-direct {p0}, Lcom/lytefast/flexinput/fragment/a;->AZ()Landroid/content/Intent;
 
     move-result-object v0
 
@@ -499,7 +499,7 @@
     return-object v0
 .end method
 
-.method public final Bc()V
+.method public final Ba()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;->aWY:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/a;->aWU: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;->aWX:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/a;->aWT: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;->aWW:Landroidx/viewpager/widget/ViewPager;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/a;->aWS: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;->aWZ:Landroid/widget/ImageView;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/a;->aWV: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;->aXb:I
+    sget v0, Lcom/lytefast/flexinput/fragment/a;->aWX: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;->aWW:Landroidx/viewpager/widget/ViewPager;
+    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/a;->aWS: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;->aWX:Lcom/google/android/material/tabs/TabLayout;
+    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/a;->aWT: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;->aWY:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
+    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/a;->aWU: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;->aWZ:Landroid/widget/ImageView;
+    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/a;->aWV:Landroid/widget/ImageView;
 
-    iget-object p2, p0, Lcom/lytefast/flexinput/fragment/a;->aWZ:Landroid/widget/ImageView;
+    iget-object p2, p0, Lcom/lytefast/flexinput/fragment/a;->aWV: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;->Bf()[Lcom/lytefast/flexinput/adapters/a$b;
+    invoke-virtual {v2}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Bd()[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;->aWX:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v3, p0, Lcom/lytefast/flexinput/fragment/a;->aWT: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;->aWl:[Lcom/lytefast/flexinput/adapters/a$b;
+    iget-object v4, p3, Lcom/lytefast/flexinput/adapters/a;->aWh:[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;->aWW:Landroidx/viewpager/widget/ViewPager;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/a;->aWS: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;->aWX:Lcom/google/android/material/tabs/TabLayout;
+    iget-object p3, p0, Lcom/lytefast/flexinput/fragment/a;->aWT: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;->aWW:Landroidx/viewpager/widget/ViewPager;
+    iget-object p3, p0, Lcom/lytefast/flexinput/fragment/a;->aWS: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;->aWX:Lcom/google/android/material/tabs/TabLayout;
+    iget-object p3, p0, Lcom/lytefast/flexinput/fragment/a;->aWT: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;->aWY:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
+    iget-object p3, p0, Lcom/lytefast/flexinput/fragment/a;->aWU: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;->AX()Lcom/lytefast/flexinput/utils/SelectionAggregator;
+    invoke-virtual {v2}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->AV()Lcom/lytefast/flexinput/utils/SelectionAggregator;
 
     move-result-object p2
 
-    iget-object p3, p0, Lcom/lytefast/flexinput/fragment/a;->aXa:Lcom/lytefast/flexinput/fragment/a$c;
+    iget-object p3, p0, Lcom/lytefast/flexinput/fragment/a;->aWW: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;->aWn:Lcom/lytefast/flexinput/utils/SelectionAggregator;
+    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/a;->aWj: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;->aWn:Lcom/lytefast/flexinput/utils/SelectionAggregator;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/a;->aWj:Lcom/lytefast/flexinput/utils/SelectionAggregator;
 
     if-eqz v0, :cond_0
 
-    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/a;->aXa:Lcom/lytefast/flexinput/fragment/a$c;
+    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/a;->aWW: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;->aWY:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/a;->aWU: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;->aWX:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/a;->aWT: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;->aWW:Landroidx/viewpager/widget/ViewPager;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/a;->aWS: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;->aWZ:Landroid/widget/ImageView;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/a;->aWV: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 20276af425..7ea60eb59b 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 Bl()Ljava/io/File;
+.method public abstract Bj()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 492054ef93..c6cb5ea0e7 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 aXO:Lcom/lytefast/flexinput/managers/b$a;
+.field public static final aXK:Lcom/lytefast/flexinput/managers/b$a;
 
 
 # instance fields
-.field private final aXL:Ljava/lang/String;
+.field private final aXH:Ljava/lang/String;
 
-.field private final aXM:Ljava/lang/String;
+.field private final aXI:Ljava/lang/String;
 
-.field private final aXN:Ljava/lang/String;
+.field private final aXJ: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;->aXO:Lcom/lytefast/flexinput/managers/b$a;
+    sput-object v0, Lcom/lytefast/flexinput/managers/b;->aXK: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;->aXL:Ljava/lang/String;
+    iput-object p1, p0, Lcom/lytefast/flexinput/managers/b;->aXH:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/lytefast/flexinput/managers/b;->aXM:Ljava/lang/String;
+    iput-object p2, p0, Lcom/lytefast/flexinput/managers/b;->aXI:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/lytefast/flexinput/managers/b;->aXN:Ljava/lang/String;
+    iput-object p3, p0, Lcom/lytefast/flexinput/managers/b;->aXJ:Ljava/lang/String;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final Bl()Ljava/io/File;
+.method public final Bj()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;->aXN:Ljava/lang/String;
+    iget-object v2, p0, Lcom/lytefast/flexinput/managers/b;->aXJ: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;->aXM:Ljava/lang/String;
+    iget-object v4, p0, Lcom/lytefast/flexinput/managers/b;->aXI: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;->aXL:Ljava/lang/String;
+    iget-object v0, p0, Lcom/lytefast/flexinput/managers/b;->aXH: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 c60746f117..899ab9e5cc 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 aXQ:Lcom/lytefast/flexinput/model/Photo;
+.field final synthetic aXM: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;->aXQ:Lcom/lytefast/flexinput/model/Photo;
+    iput-object p1, p0, Lcom/lytefast/flexinput/model/Photo$c;->aXM: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;->aXQ:Lcom/lytefast/flexinput/model/Photo;
+    iget-object v1, p0, Lcom/lytefast/flexinput/model/Photo$c;->aXM: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;->aXQ:Lcom/lytefast/flexinput/model/Photo;
+    iget-object v2, p0, Lcom/lytefast/flexinput/model/Photo$c;->aXM: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 86233821d9..1b378c1979 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 aXP:Lcom/lytefast/flexinput/model/Photo$a;
+.field public static final aXL: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;->aXP:Lcom/lytefast/flexinput/model/Photo$a;
+    sput-object v0, Lcom/lytefast/flexinput/model/Photo;->aXL: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 5bb5b53783..9b8658451b 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 aXT:Lcom/lytefast/flexinput/utils/SelectionAggregator;
+.field final synthetic aXP:Lcom/lytefast/flexinput/utils/SelectionAggregator;
 
-.field final synthetic aXU:Lcom/lytefast/flexinput/utils/SelectionCoordinator;
+.field final synthetic aXQ:Lcom/lytefast/flexinput/utils/SelectionCoordinator;
 
 
 # direct methods
@@ -42,9 +42,9 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/utils/SelectionAggregator$a;->aXT:Lcom/lytefast/flexinput/utils/SelectionAggregator;
+    iput-object p1, p0, Lcom/lytefast/flexinput/utils/SelectionAggregator$a;->aXP:Lcom/lytefast/flexinput/utils/SelectionAggregator;
 
-    iput-object p2, p0, Lcom/lytefast/flexinput/utils/SelectionAggregator$a;->aXU:Lcom/lytefast/flexinput/utils/SelectionCoordinator;
+    iput-object p2, p0, Lcom/lytefast/flexinput/utils/SelectionAggregator$a;->aXQ: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;->aXT:Lcom/lytefast/flexinput/utils/SelectionAggregator;
+    iget-object v0, p0, Lcom/lytefast/flexinput/utils/SelectionAggregator$a;->aXP: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;->aXT:Lcom/lytefast/flexinput/utils/SelectionAggregator;
+    iget-object v0, p0, Lcom/lytefast/flexinput/utils/SelectionAggregator$a;->aXP: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;->aXT:Lcom/lytefast/flexinput/utils/SelectionAggregator;
+    iget-object v0, p0, Lcom/lytefast/flexinput/utils/SelectionAggregator$a;->aXP: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;->aXU:Lcom/lytefast/flexinput/utils/SelectionCoordinator;
+    iget-object v1, p0, Lcom/lytefast/flexinput/utils/SelectionAggregator$a;->aXQ: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 ecdc036e31..173e206441 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;->aXW:Landroidx/collection/ArrayMap;
+    iget-object v3, v1, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->aXS: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;->aXW:Landroidx/collection/ArrayMap;
+    iget-object v3, v1, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->aXS:Landroidx/collection/ArrayMap;
 
     invoke-virtual {v3}, Landroidx/collection/ArrayMap;->clear()V
 
-    iget-object v1, v1, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->aXV:Landroidx/recyclerview/widget/RecyclerView$Adapter;
+    iget-object v1, v1, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->aXR: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;->aXV:Landroidx/recyclerview/widget/RecyclerView$Adapter;
+    iget-object v1, p1, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->aXR: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;->aXW:Landroidx/collection/ArrayMap;
+    iget-object v2, p1, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->aXS: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 8fe69765ad..30ec45eb4e 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 aXY:Ljava/lang/Object;
+.field private final aXU: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;->aXY:Ljava/lang/Object;
+    iput-object p1, p0, Lcom/lytefast/flexinput/utils/SelectionCoordinator$b;->aXU: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;->aXY:Ljava/lang/Object;
+    iget-object v1, p0, Lcom/lytefast/flexinput/utils/SelectionCoordinator$b;->aXU:Ljava/lang/Object;
 
-    iget-object v3, p1, Lcom/lytefast/flexinput/utils/SelectionCoordinator$b;->aXY:Ljava/lang/Object;
+    iget-object v3, p1, Lcom/lytefast/flexinput/utils/SelectionCoordinator$b;->aXU: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;->aXY:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/lytefast/flexinput/utils/SelectionCoordinator$b;->aXU: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;->aXY:Ljava/lang/Object;
+    iget-object v1, p0, Lcom/lytefast/flexinput/utils/SelectionCoordinator$b;->aXU: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 b06f162b5a..94eefd66e0 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 aXV:Landroidx/recyclerview/widget/RecyclerView$Adapter;
+.field aXR: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 aXW:Landroidx/collection/ArrayMap;
+.field final aXS:Landroidx/collection/ArrayMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Landroidx/collection/ArrayMap<",
@@ -43,7 +43,7 @@
     .end annotation
 .end field
 
-.field public aXX:Lcom/lytefast/flexinput/utils/SelectionCoordinator$ItemSelectionListener;
+.field public aXT: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;->aXW:Landroidx/collection/ArrayMap;
+    iput-object p1, p0, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->aXS:Landroidx/collection/ArrayMap;
 
-    iput-object p2, p0, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->aXX:Lcom/lytefast/flexinput/utils/SelectionCoordinator$ItemSelectionListener;
+    iput-object p2, p0, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->aXT: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;->aXV:Landroidx/recyclerview/widget/RecyclerView$Adapter;
+    iput-object p1, p0, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->aXR: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;->aXX:Lcom/lytefast/flexinput/utils/SelectionCoordinator$ItemSelectionListener;
+    iput-object p1, p0, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->aXT: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;->aXW:Landroidx/collection/ArrayMap;
+    iget-object v0, p0, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->aXS: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;->aXV:Landroidx/recyclerview/widget/RecyclerView$Adapter;
+    iget-object v2, p0, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->aXR: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;->aXX:Lcom/lytefast/flexinput/utils/SelectionCoordinator$ItemSelectionListener;
+    iget-object v0, p0, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->aXT: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;->aXX:Lcom/lytefast/flexinput/utils/SelectionCoordinator$ItemSelectionListener;
+    iget-object v0, p0, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->aXT: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;->aXW:Landroidx/collection/ArrayMap;
+    iget-object v0, p0, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->aXS: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;->aXW:Landroidx/collection/ArrayMap;
+    iget-object v0, p0, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->aXS:Landroidx/collection/ArrayMap;
 
     check-cast v0, Ljava/util/Map;
 
@@ -313,7 +313,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->aXW:Landroidx/collection/ArrayMap;
+    iget-object v0, p0, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->aXS: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;->aXV:Landroidx/recyclerview/widget/RecyclerView$Adapter;
+    iget-object v0, p0, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->aXR: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;->aXX:Lcom/lytefast/flexinput/utils/SelectionCoordinator$ItemSelectionListener;
+    iget-object p2, p0, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->aXT: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 ba860f19db..51a583e2e0 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 aXR:Lcom/lytefast/flexinput/utils/a;
+.field public static final aXN: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;->aXR:Lcom/lytefast/flexinput/utils/a;
+    sput-object v0, Lcom/lytefast/flexinput/utils/a;->aXN:Lcom/lytefast/flexinput/utils/a;
 
     return-void
 .end method
@@ -28,7 +28,7 @@
     return-void
 .end method
 
-.method public static Bm()Z
+.method public static Bk()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 1eed87d8ff..d47c7c699d 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 aXS:Lcom/lytefast/flexinput/utils/b;
+.field public static final aXO: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;->aXS:Lcom/lytefast/flexinput/utils/b;
+    sput-object v0, Lcom/lytefast/flexinput/utils/b;->aXO:Lcom/lytefast/flexinput/utils/b;
 
     return-void
 .end method
@@ -136,7 +136,7 @@
 
     :cond_3
     :try_start_1
-    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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 5bdde0162a..a81a8f1713 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;->bgy:Lkotlin/Unit;
+    sget-object p2, Lkotlin/Unit;->bgt: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 92255c4e5b..1a08931688 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 aXZ:Lcom/lytefast/flexinput/utils/d;
+.field public static final aXV: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;->aXZ:Lcom/lytefast/flexinput/utils/d;
+    sput-object v0, Lcom/lytefast/flexinput/utils/d;->aXV:Lcom/lytefast/flexinput/utils/d;
 
     return-void
 .end method
@@ -45,7 +45,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lkotlinx/coroutines/as;->DH()Lkotlinx/coroutines/ab;
+    invoke-static {}, Lkotlinx/coroutines/as;->DF()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 a4b51ae872..170e668b20 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 aYa:Lcom/lytefast/flexinput/widget/FlexEditText;
+.field final synthetic aXW:Lcom/lytefast/flexinput/widget/FlexEditText;
 
-.field final synthetic aYb:Landroid/view/inputmethod/EditorInfo;
+.field final synthetic aXX: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;->aYa:Lcom/lytefast/flexinput/widget/FlexEditText;
+    iput-object p1, p0, Lcom/lytefast/flexinput/widget/FlexEditText$a;->aXW:Lcom/lytefast/flexinput/widget/FlexEditText;
 
-    iput-object p2, p0, Lcom/lytefast/flexinput/widget/FlexEditText$a;->aYb:Landroid/view/inputmethod/EditorInfo;
+    iput-object p2, p0, Lcom/lytefast/flexinput/widget/FlexEditText$a;->aXX: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;->aYa:Lcom/lytefast/flexinput/widget/FlexEditText;
+    iget-object p2, p0, Lcom/lytefast/flexinput/widget/FlexEditText$a;->aXW: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 38f9c9c702..c700cab18c 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;->aYg:Landroid/os/Bundle;
+    iget-object v1, p5, Lcom/yalantis/ucrop/a$a;->aYc: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;->aYg:Landroid/os/Bundle;
+    iget-object v2, p5, Lcom/yalantis/ucrop/a$a;->aYc: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;->aYf:Landroid/os/Bundle;
+    iget-object p1, v2, Lcom/yalantis/ucrop/a;->aYb:Landroid/os/Bundle;
 
-    iget-object p5, p5, Lcom/yalantis/ucrop/a$a;->aYg:Landroid/os/Bundle;
+    iget-object p5, p5, Lcom/yalantis/ucrop/a$a;->aYc: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;->aYf:Landroid/os/Bundle;
+    iget-object p3, v2, Lcom/yalantis/ucrop/a;->aYb: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;->aYf:Landroid/os/Bundle;
+    iget-object p2, v2, Lcom/yalantis/ucrop/a;->aYb: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;->aYe:Landroid/content/Intent;
+    iget-object p1, v2, Lcom/yalantis/ucrop/a;->aYa: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;->aYe:Landroid/content/Intent;
+    iget-object p1, v2, Lcom/yalantis/ucrop/a;->aYa:Landroid/content/Intent;
 
-    iget-object p2, v2, Lcom/yalantis/ucrop/a;->aYf:Landroid/os/Bundle;
+    iget-object p2, v2, Lcom/yalantis/ucrop/a;->aYb: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;->aYe:Landroid/content/Intent;
+    iget-object p1, v2, Lcom/yalantis/ucrop/a;->aYa: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 c41f887f7c..483cb9a206 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,207 +315,207 @@
 
 .field public static final layout_keyline:I = 0x7f04024b
 
-.field public static final lineHeight:I = 0x7f04025a
+.field public static final lineHeight:I = 0x7f040259
 
-.field public static final listChoiceBackgroundIndicator:I = 0x7f04025c
+.field public static final listChoiceBackgroundIndicator:I = 0x7f04025b
 
-.field public static final listDividerAlertDialog:I = 0x7f04025d
+.field public static final listDividerAlertDialog:I = 0x7f04025c
 
-.field public static final listItemLayout:I = 0x7f04025e
+.field public static final listItemLayout:I = 0x7f04025d
 
-.field public static final listLayout:I = 0x7f04025f
+.field public static final listLayout:I = 0x7f04025e
 
-.field public static final listMenuViewStyle:I = 0x7f040260
+.field public static final listMenuViewStyle:I = 0x7f04025f
 
-.field public static final listPopupWindowStyle:I = 0x7f040261
+.field public static final listPopupWindowStyle:I = 0x7f040260
 
-.field public static final listPreferredItemHeight:I = 0x7f040262
+.field public static final listPreferredItemHeight:I = 0x7f040261
 
-.field public static final listPreferredItemHeightLarge:I = 0x7f040263
+.field public static final listPreferredItemHeightLarge:I = 0x7f040262
 
-.field public static final listPreferredItemHeightSmall:I = 0x7f040264
+.field public static final listPreferredItemHeightSmall:I = 0x7f040263
 
-.field public static final listPreferredItemPaddingLeft:I = 0x7f040265
+.field public static final listPreferredItemPaddingLeft:I = 0x7f040264
 
-.field public static final listPreferredItemPaddingRight:I = 0x7f040266
+.field public static final listPreferredItemPaddingRight:I = 0x7f040265
 
-.field public static final logo:I = 0x7f040267
+.field public static final logo:I = 0x7f040266
 
-.field public static final logoDescription:I = 0x7f040268
+.field public static final logoDescription:I = 0x7f040267
 
-.field public static final maxButtonHeight:I = 0x7f04027b
+.field public static final maxButtonHeight:I = 0x7f04027a
 
-.field public static final measureWithLargestChild:I = 0x7f04027e
+.field public static final measureWithLargestChild:I = 0x7f04027d
 
-.field public static final multiChoiceItemLayout:I = 0x7f040280
+.field public static final multiChoiceItemLayout:I = 0x7f04027f
 
-.field public static final navigationContentDescription:I = 0x7f040281
+.field public static final navigationContentDescription:I = 0x7f040280
 
-.field public static final navigationIcon:I = 0x7f040282
+.field public static final navigationIcon:I = 0x7f040281
 
-.field public static final navigationMode:I = 0x7f040283
+.field public static final navigationMode:I = 0x7f040282
 
-.field public static final numericModifiers:I = 0x7f040287
+.field public static final numericModifiers:I = 0x7f040286
 
-.field public static final overlapAnchor:I = 0x7f040288
+.field public static final overlapAnchor:I = 0x7f040287
 
-.field public static final paddingBottomNoButtons:I = 0x7f04028c
+.field public static final paddingBottomNoButtons:I = 0x7f04028b
 
-.field public static final paddingEnd:I = 0x7f04028d
+.field public static final paddingEnd:I = 0x7f04028c
 
-.field public static final paddingStart:I = 0x7f04028e
+.field public static final paddingStart:I = 0x7f04028d
 
-.field public static final paddingTopNoTitle:I = 0x7f04028f
+.field public static final paddingTopNoTitle:I = 0x7f04028e
 
-.field public static final panelBackground:I = 0x7f040290
+.field public static final panelBackground:I = 0x7f04028f
 
-.field public static final panelMenuListTheme:I = 0x7f040291
+.field public static final panelMenuListTheme:I = 0x7f040290
 
-.field public static final panelMenuListWidth:I = 0x7f040292
+.field public static final panelMenuListWidth:I = 0x7f040291
 
-.field public static final popupMenuStyle:I = 0x7f04029a
+.field public static final popupMenuStyle:I = 0x7f040299
 
-.field public static final popupTheme:I = 0x7f04029b
+.field public static final popupTheme:I = 0x7f04029a
 
-.field public static final popupWindowStyle:I = 0x7f04029c
+.field public static final popupWindowStyle:I = 0x7f04029b
 
-.field public static final preserveIconSpacing:I = 0x7f04029d
+.field public static final preserveIconSpacing:I = 0x7f04029c
 
-.field public static final progressBarPadding:I = 0x7f0402c9
+.field public static final progressBarPadding:I = 0x7f0402c8
 
-.field public static final progressBarStyle:I = 0x7f0402ca
+.field public static final progressBarStyle:I = 0x7f0402c9
 
-.field public static final queryBackground:I = 0x7f0402cd
+.field public static final queryBackground:I = 0x7f0402cc
 
-.field public static final queryHint:I = 0x7f0402ce
+.field public static final queryHint:I = 0x7f0402cd
 
-.field public static final radioButtonStyle:I = 0x7f0402cf
+.field public static final radioButtonStyle:I = 0x7f0402ce
 
-.field public static final ratingBarStyle:I = 0x7f0402d2
+.field public static final ratingBarStyle:I = 0x7f0402d1
 
-.field public static final ratingBarStyleIndicator:I = 0x7f0402d3
+.field public static final ratingBarStyleIndicator:I = 0x7f0402d2
 
-.field public static final ratingBarStyleSmall:I = 0x7f0402d4
+.field public static final ratingBarStyleSmall:I = 0x7f0402d3
 
-.field public static final searchHintIcon:I = 0x7f0402f9
+.field public static final searchHintIcon:I = 0x7f0402f8
 
-.field public static final searchIcon:I = 0x7f0402fa
+.field public static final searchIcon:I = 0x7f0402f9
 
-.field public static final searchViewStyle:I = 0x7f0402fb
+.field public static final searchViewStyle:I = 0x7f0402fa
 
-.field public static final seekBarStyle:I = 0x7f0402fd
+.field public static final seekBarStyle:I = 0x7f0402fc
 
-.field public static final selectableItemBackground:I = 0x7f0402fe
+.field public static final selectableItemBackground:I = 0x7f0402fd
 
-.field public static final selectableItemBackgroundBorderless:I = 0x7f0402ff
+.field public static final selectableItemBackgroundBorderless:I = 0x7f0402fe
 
-.field public static final showAsAction:I = 0x7f040301
+.field public static final showAsAction:I = 0x7f040300
 
-.field public static final showDividers:I = 0x7f040305
+.field public static final showDividers:I = 0x7f040304
 
-.field public static final showText:I = 0x7f040307
+.field public static final showText:I = 0x7f040306
 
-.field public static final showTitle:I = 0x7f040308
+.field public static final showTitle:I = 0x7f040307
 
-.field public static final singleChoiceItemLayout:I = 0x7f040309
+.field public static final singleChoiceItemLayout:I = 0x7f040308
 
-.field public static final spinBars:I = 0x7f04030f
+.field public static final spinBars:I = 0x7f04030e
 
-.field public static final spinnerDropDownItemStyle:I = 0x7f040310
+.field public static final spinnerDropDownItemStyle:I = 0x7f04030f
 
-.field public static final spinnerStyle:I = 0x7f040311
+.field public static final spinnerStyle:I = 0x7f040310
 
-.field public static final splitTrack:I = 0x7f040312
+.field public static final splitTrack:I = 0x7f040311
 
-.field public static final srcCompat:I = 0x7f040313
+.field public static final srcCompat:I = 0x7f040312
 
-.field public static final state_above_anchor:I = 0x7f040315
+.field public static final state_above_anchor:I = 0x7f040314
 
-.field public static final statusBarBackground:I = 0x7f04031a
+.field public static final statusBarBackground:I = 0x7f040319
 
-.field public static final subMenuArrow:I = 0x7f040321
+.field public static final subMenuArrow:I = 0x7f040320
 
-.field public static final submitBackground:I = 0x7f040322
+.field public static final submitBackground:I = 0x7f040321
 
-.field public static final subtitle:I = 0x7f040323
+.field public static final subtitle:I = 0x7f040322
 
-.field public static final subtitleTextAppearance:I = 0x7f040324
+.field public static final subtitleTextAppearance:I = 0x7f040323
 
-.field public static final subtitleTextColor:I = 0x7f040325
+.field public static final subtitleTextColor:I = 0x7f040324
 
-.field public static final subtitleTextStyle:I = 0x7f040326
+.field public static final subtitleTextStyle:I = 0x7f040325
 
-.field public static final suggestionRowLayout:I = 0x7f040327
+.field public static final suggestionRowLayout:I = 0x7f040326
 
-.field public static final switchMinWidth:I = 0x7f040328
+.field public static final switchMinWidth:I = 0x7f040327
 
-.field public static final switchPadding:I = 0x7f040329
+.field public static final switchPadding:I = 0x7f040328
 
-.field public static final switchStyle:I = 0x7f04032a
+.field public static final switchStyle:I = 0x7f040329
 
-.field public static final switchTextAppearance:I = 0x7f04032b
+.field public static final switchTextAppearance:I = 0x7f04032a
 
-.field public static final textAllCaps:I = 0x7f040349
+.field public static final textAllCaps:I = 0x7f040348
 
-.field public static final textAppearanceLargePopupMenu:I = 0x7f040354
+.field public static final textAppearanceLargePopupMenu:I = 0x7f040353
 
-.field public static final textAppearanceListItem:I = 0x7f040355
+.field public static final textAppearanceListItem:I = 0x7f040354
 
-.field public static final textAppearanceListItemSecondary:I = 0x7f040356
+.field public static final textAppearanceListItemSecondary:I = 0x7f040355
 
-.field public static final textAppearanceListItemSmall:I = 0x7f040357
+.field public static final textAppearanceListItemSmall:I = 0x7f040356
 
-.field public static final textAppearancePopupMenuHeader:I = 0x7f040359
+.field public static final textAppearancePopupMenuHeader:I = 0x7f040358
 
-.field public static final textAppearanceSearchResultSubtitle:I = 0x7f04035a
+.field public static final textAppearanceSearchResultSubtitle:I = 0x7f040359
 
-.field public static final textAppearanceSearchResultTitle:I = 0x7f04035b
+.field public static final textAppearanceSearchResultTitle:I = 0x7f04035a
 
-.field public static final textAppearanceSmallPopupMenu:I = 0x7f04035c
+.field public static final textAppearanceSmallPopupMenu:I = 0x7f04035b
 
-.field public static final textColorAlertDialogListItem:I = 0x7f04035f
+.field public static final textColorAlertDialogListItem:I = 0x7f04035e
 
-.field public static final textColorSearchUrl:I = 0x7f040360
+.field public static final textColorSearchUrl:I = 0x7f04035f
 
-.field public static final theme:I = 0x7f040365
+.field public static final theme:I = 0x7f040364
 
-.field public static final thickness:I = 0x7f0403b6
+.field public static final thickness:I = 0x7f0403b5
 
-.field public static final thumbTextPadding:I = 0x7f0403b7
+.field public static final thumbTextPadding:I = 0x7f0403b6
 
-.field public static final thumbTint:I = 0x7f0403b8
+.field public static final thumbTint:I = 0x7f0403b7
 
-.field public static final thumbTintMode:I = 0x7f0403b9
+.field public static final thumbTintMode:I = 0x7f0403b8
 
-.field public static final tickMark:I = 0x7f0403ba
+.field public static final tickMark:I = 0x7f0403b9
 
-.field public static final tickMarkTint:I = 0x7f0403bb
+.field public static final tickMarkTint:I = 0x7f0403ba
 
-.field public static final tickMarkTintMode:I = 0x7f0403bc
+.field public static final tickMarkTintMode:I = 0x7f0403bb
 
-.field public static final tint:I = 0x7f0403bd
+.field public static final tint:I = 0x7f0403bc
 
-.field public static final tintMode:I = 0x7f0403be
+.field public static final tintMode:I = 0x7f0403bd
 
-.field public static final title:I = 0x7f0403bf
+.field public static final title:I = 0x7f0403be
 
-.field public static final titleMargin:I = 0x7f0403c1
+.field public static final titleMargin:I = 0x7f0403c0
 
-.field public static final titleMarginBottom:I = 0x7f0403c2
+.field public static final titleMarginBottom:I = 0x7f0403c1
 
-.field public static final titleMarginEnd:I = 0x7f0403c3
+.field public static final titleMarginEnd:I = 0x7f0403c2
 
-.field public static final titleMarginStart:I = 0x7f0403c4
+.field public static final titleMarginStart:I = 0x7f0403c3
 
-.field public static final titleMarginTop:I = 0x7f0403c5
+.field public static final titleMarginTop:I = 0x7f0403c4
 
-.field public static final titleMargins:I = 0x7f0403c6
+.field public static final titleMargins:I = 0x7f0403c5
 
-.field public static final titleTextAppearance:I = 0x7f0403c7
+.field public static final titleTextAppearance:I = 0x7f0403c6
 
-.field public static final titleTextColor:I = 0x7f0403c8
+.field public static final titleTextColor:I = 0x7f0403c7
 
-.field public static final titleTextStyle:I = 0x7f0403c9
+.field public static final titleTextStyle:I = 0x7f0403c8
 
 .field public static final toolbarNavigationButtonStyle:I = 0x7f0403cb
 
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 c6fd4f53c8..d514a8a01d 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 = 0x7f060035
+.field public static final bright_foreground_disabled_material_dark:I = 0x7f060034
 
-.field public static final bright_foreground_disabled_material_light:I = 0x7f060036
+.field public static final bright_foreground_disabled_material_light:I = 0x7f060035
 
-.field public static final bright_foreground_inverse_material_dark:I = 0x7f060037
+.field public static final bright_foreground_inverse_material_dark:I = 0x7f060036
 
-.field public static final bright_foreground_inverse_material_light:I = 0x7f060038
+.field public static final bright_foreground_inverse_material_light:I = 0x7f060037
 
-.field public static final bright_foreground_material_dark:I = 0x7f060039
+.field public static final bright_foreground_material_dark:I = 0x7f060038
 
-.field public static final bright_foreground_material_light:I = 0x7f06003a
+.field public static final bright_foreground_material_light:I = 0x7f060039
 
-.field public static final button_material_dark:I = 0x7f060040
+.field public static final button_material_dark:I = 0x7f06003f
 
-.field public static final button_material_light:I = 0x7f060041
+.field public static final button_material_light:I = 0x7f060040
 
-.field public static final dim_foreground_disabled_material_dark:I = 0x7f060069
+.field public static final dim_foreground_disabled_material_dark:I = 0x7f060068
 
-.field public static final dim_foreground_disabled_material_light:I = 0x7f06006a
+.field public static final dim_foreground_disabled_material_light:I = 0x7f060069
 
-.field public static final dim_foreground_material_dark:I = 0x7f06006b
+.field public static final dim_foreground_material_dark:I = 0x7f06006a
 
-.field public static final dim_foreground_material_light:I = 0x7f06006c
+.field public static final dim_foreground_material_light:I = 0x7f06006b
 
-.field public static final error_color_material_dark:I = 0x7f06006d
+.field public static final error_color_material_dark:I = 0x7f06006c
 
-.field public static final error_color_material_light:I = 0x7f06006e
+.field public static final error_color_material_light:I = 0x7f06006d
 
-.field public static final foreground_material_dark:I = 0x7f060073
+.field public static final foreground_material_dark:I = 0x7f060072
 
-.field public static final foreground_material_light:I = 0x7f060074
+.field public static final foreground_material_light:I = 0x7f060073
 
-.field public static final highlighted_text_material_dark:I = 0x7f060083
+.field public static final highlighted_text_material_dark:I = 0x7f060082
 
-.field public static final highlighted_text_material_light:I = 0x7f060084
+.field public static final highlighted_text_material_light:I = 0x7f060083
 
-.field public static final material_blue_grey_800:I = 0x7f060092
+.field public static final material_blue_grey_800:I = 0x7f060091
 
-.field public static final material_blue_grey_900:I = 0x7f060093
+.field public static final material_blue_grey_900:I = 0x7f060092
 
-.field public static final material_blue_grey_950:I = 0x7f060094
+.field public static final material_blue_grey_950:I = 0x7f060093
 
-.field public static final material_deep_teal_200:I = 0x7f060095
+.field public static final material_deep_teal_200:I = 0x7f060094
 
-.field public static final material_deep_teal_500:I = 0x7f060096
+.field public static final material_deep_teal_500:I = 0x7f060095
 
-.field public static final material_grey_100:I = 0x7f060097
+.field public static final material_grey_100:I = 0x7f060096
 
-.field public static final material_grey_300:I = 0x7f060098
+.field public static final material_grey_300:I = 0x7f060097
 
-.field public static final material_grey_50:I = 0x7f060099
+.field public static final material_grey_50:I = 0x7f060098
 
-.field public static final material_grey_600:I = 0x7f06009a
+.field public static final material_grey_600:I = 0x7f060099
 
-.field public static final material_grey_800:I = 0x7f06009b
+.field public static final material_grey_800:I = 0x7f06009a
 
-.field public static final material_grey_850:I = 0x7f06009c
+.field public static final material_grey_850:I = 0x7f06009b
 
-.field public static final material_grey_900:I = 0x7f06009d
+.field public static final material_grey_900:I = 0x7f06009c
 
-.field public static final notification_action_color_filter:I = 0x7f0600b8
+.field public static final notification_action_color_filter:I = 0x7f0600b7
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b9
+.field public static final notification_icon_bg_color:I = 0x7f0600b8
 
-.field public static final primary_dark_material_dark:I = 0x7f0600db
+.field public static final primary_dark_material_dark:I = 0x7f0600da
 
-.field public static final primary_dark_material_light:I = 0x7f0600dc
+.field public static final primary_dark_material_light:I = 0x7f0600db
 
-.field public static final primary_material_dark:I = 0x7f0600ec
+.field public static final primary_material_dark:I = 0x7f0600eb
 
-.field public static final primary_material_light:I = 0x7f0600ed
+.field public static final primary_material_light:I = 0x7f0600ec
 
-.field public static final primary_text_default_material_dark:I = 0x7f0600ee
+.field public static final primary_text_default_material_dark:I = 0x7f0600ed
 
-.field public static final primary_text_default_material_light:I = 0x7f0600ef
+.field public static final primary_text_default_material_light:I = 0x7f0600ee
 
-.field public static final primary_text_disabled_material_dark:I = 0x7f0600f0
+.field public static final primary_text_disabled_material_dark:I = 0x7f0600ef
 
-.field public static final primary_text_disabled_material_light:I = 0x7f0600f1
+.field public static final primary_text_disabled_material_light:I = 0x7f0600f0
 
-.field public static final ripple_material_dark:I = 0x7f0600fa
+.field public static final ripple_material_dark:I = 0x7f0600f9
 
-.field public static final ripple_material_light:I = 0x7f0600fb
+.field public static final ripple_material_light:I = 0x7f0600fa
 
-.field public static final secondary_text_default_material_dark:I = 0x7f0600fc
+.field public static final secondary_text_default_material_dark:I = 0x7f0600fb
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fd
+.field public static final secondary_text_default_material_light:I = 0x7f0600fc
 
-.field public static final secondary_text_disabled_material_dark:I = 0x7f0600fe
+.field public static final secondary_text_disabled_material_dark:I = 0x7f0600fd
 
-.field public static final secondary_text_disabled_material_light:I = 0x7f0600ff
+.field public static final secondary_text_disabled_material_light:I = 0x7f0600fe
 
-.field public static final switch_thumb_disabled_material_dark:I = 0x7f06012e
+.field public static final switch_thumb_disabled_material_dark:I = 0x7f06012d
 
-.field public static final switch_thumb_disabled_material_light:I = 0x7f06012f
+.field public static final switch_thumb_disabled_material_light:I = 0x7f06012e
 
-.field public static final switch_thumb_material_dark:I = 0x7f060130
+.field public static final switch_thumb_material_dark:I = 0x7f06012f
 
-.field public static final switch_thumb_material_light:I = 0x7f060131
+.field public static final switch_thumb_material_light:I = 0x7f060130
 
-.field public static final switch_thumb_normal_material_dark:I = 0x7f060132
+.field public static final switch_thumb_normal_material_dark:I = 0x7f060131
 
-.field public static final switch_thumb_normal_material_light:I = 0x7f060133
+.field public static final switch_thumb_normal_material_light:I = 0x7f060132
 
-.field public static final tooltip_background_dark:I = 0x7f060135
+.field public static final tooltip_background_dark:I = 0x7f060134
 
-.field public static final tooltip_background_light:I = 0x7f060136
+.field public static final tooltip_background_light:I = 0x7f060135
 
-.field public static final ucrop_color_crop_background:I = 0x7f06013a
+.field public static final ucrop_color_crop_background:I = 0x7f060139
 
-.field public static final ucrop_color_default_crop_frame:I = 0x7f06013b
+.field public static final ucrop_color_default_crop_frame:I = 0x7f06013a
 
-.field public static final ucrop_color_default_crop_grid:I = 0x7f06013c
+.field public static final ucrop_color_default_crop_grid:I = 0x7f06013b
 
-.field public static final ucrop_color_default_dimmed:I = 0x7f06013d
+.field public static final ucrop_color_default_dimmed:I = 0x7f06013c
 
-.field public static final ucrop_color_default_logo:I = 0x7f06013e
+.field public static final ucrop_color_default_logo:I = 0x7f06013d
 
-.field public static final ucrop_color_progress_wheel_line:I = 0x7f06013f
+.field public static final ucrop_color_progress_wheel_line:I = 0x7f06013e
 
-.field public static final ucrop_color_statusbar:I = 0x7f060140
+.field public static final ucrop_color_statusbar:I = 0x7f06013f
 
-.field public static final ucrop_color_toolbar:I = 0x7f060141
+.field public static final ucrop_color_toolbar:I = 0x7f060140
 
-.field public static final ucrop_color_toolbar_widget:I = 0x7f060142
+.field public static final ucrop_color_toolbar_widget:I = 0x7f060141
 
-.field public static final ucrop_color_widget:I = 0x7f060143
+.field public static final ucrop_color_widget:I = 0x7f060142
 
-.field public static final ucrop_color_widget_active:I = 0x7f060144
+.field public static final ucrop_color_widget_active:I = 0x7f060143
 
-.field public static final ucrop_color_widget_background:I = 0x7f060145
+.field public static final ucrop_color_widget_background:I = 0x7f060144
 
-.field public static final ucrop_color_widget_text:I = 0x7f060146
+.field public static final ucrop_color_widget_text:I = 0x7f060145
 
-.field public static final ucrop_scale_text_view_selector:I = 0x7f060147
+.field public static final ucrop_scale_text_view_selector:I = 0x7f060146
 
 
 # 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 b1ab5b4243..2cd405dac0 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 = 0x7f080017
+.field public static final abc_ab_share_pack_mtrl_alpha:I = 0x7f080016
 
-.field public static final abc_action_bar_item_background_material:I = 0x7f080018
+.field public static final abc_action_bar_item_background_material:I = 0x7f080017
 
-.field public static final abc_btn_borderless_material:I = 0x7f080019
+.field public static final abc_btn_borderless_material:I = 0x7f080018
 
-.field public static final abc_btn_check_material:I = 0x7f08001a
+.field public static final abc_btn_check_material:I = 0x7f080019
 
-.field public static final abc_btn_check_to_on_mtrl_000:I = 0x7f08001b
+.field public static final abc_btn_check_to_on_mtrl_000:I = 0x7f08001a
 
-.field public static final abc_btn_check_to_on_mtrl_015:I = 0x7f08001c
+.field public static final abc_btn_check_to_on_mtrl_015:I = 0x7f08001b
 
-.field public static final abc_btn_colored_material:I = 0x7f08001d
+.field public static final abc_btn_colored_material:I = 0x7f08001c
 
-.field public static final abc_btn_default_mtrl_shape:I = 0x7f08001e
+.field public static final abc_btn_default_mtrl_shape:I = 0x7f08001d
 
-.field public static final abc_btn_radio_material:I = 0x7f08001f
+.field public static final abc_btn_radio_material:I = 0x7f08001e
 
-.field public static final abc_btn_radio_to_on_mtrl_000:I = 0x7f080020
+.field public static final abc_btn_radio_to_on_mtrl_000:I = 0x7f08001f
 
-.field public static final abc_btn_radio_to_on_mtrl_015:I = 0x7f080021
+.field public static final abc_btn_radio_to_on_mtrl_015:I = 0x7f080020
 
-.field public static final abc_btn_switch_to_on_mtrl_00001:I = 0x7f080022
+.field public static final abc_btn_switch_to_on_mtrl_00001:I = 0x7f080021
 
-.field public static final abc_btn_switch_to_on_mtrl_00012:I = 0x7f080023
+.field public static final abc_btn_switch_to_on_mtrl_00012:I = 0x7f080022
 
-.field public static final abc_cab_background_internal_bg:I = 0x7f080024
+.field public static final abc_cab_background_internal_bg:I = 0x7f080023
 
-.field public static final abc_cab_background_top_material:I = 0x7f080025
+.field public static final abc_cab_background_top_material:I = 0x7f080024
 
-.field public static final abc_cab_background_top_mtrl_alpha:I = 0x7f080026
+.field public static final abc_cab_background_top_mtrl_alpha:I = 0x7f080025
 
-.field public static final abc_control_background_material:I = 0x7f080027
+.field public static final abc_control_background_material:I = 0x7f080026
 
-.field public static final abc_dialog_material_background:I = 0x7f080028
+.field public static final abc_dialog_material_background:I = 0x7f080027
 
-.field public static final abc_edit_text_material:I = 0x7f080029
+.field public static final abc_edit_text_material:I = 0x7f080028
 
-.field public static final abc_ic_ab_back_material:I = 0x7f08002a
+.field public static final abc_ic_ab_back_material:I = 0x7f080029
 
-.field public static final abc_ic_arrow_drop_right_black_24dp:I = 0x7f08002b
+.field public static final abc_ic_arrow_drop_right_black_24dp:I = 0x7f08002a
 
-.field public static final abc_ic_clear_material:I = 0x7f08002c
+.field public static final abc_ic_clear_material:I = 0x7f08002b
 
-.field public static final abc_ic_commit_search_api_mtrl_alpha:I = 0x7f08002d
+.field public static final abc_ic_commit_search_api_mtrl_alpha:I = 0x7f08002c
 
-.field public static final abc_ic_go_search_api_material:I = 0x7f08002e
+.field public static final abc_ic_go_search_api_material:I = 0x7f08002d
 
-.field public static final abc_ic_menu_copy_mtrl_am_alpha:I = 0x7f08002f
+.field public static final abc_ic_menu_copy_mtrl_am_alpha:I = 0x7f08002e
 
-.field public static final abc_ic_menu_cut_mtrl_alpha:I = 0x7f080030
+.field public static final abc_ic_menu_cut_mtrl_alpha:I = 0x7f08002f
 
-.field public static final abc_ic_menu_overflow_material:I = 0x7f080031
+.field public static final abc_ic_menu_overflow_material:I = 0x7f080030
 
-.field public static final abc_ic_menu_paste_mtrl_am_alpha:I = 0x7f080032
+.field public static final abc_ic_menu_paste_mtrl_am_alpha:I = 0x7f080031
 
-.field public static final abc_ic_menu_selectall_mtrl_alpha:I = 0x7f080033
+.field public static final abc_ic_menu_selectall_mtrl_alpha:I = 0x7f080032
 
-.field public static final abc_ic_menu_share_mtrl_alpha:I = 0x7f080034
+.field public static final abc_ic_menu_share_mtrl_alpha:I = 0x7f080033
 
-.field public static final abc_ic_search_api_material:I = 0x7f080035
+.field public static final abc_ic_search_api_material:I = 0x7f080034
 
-.field public static final abc_ic_star_black_16dp:I = 0x7f080036
+.field public static final abc_ic_star_black_16dp:I = 0x7f080035
 
-.field public static final abc_ic_star_black_36dp:I = 0x7f080037
+.field public static final abc_ic_star_black_36dp:I = 0x7f080036
 
-.field public static final abc_ic_star_black_48dp:I = 0x7f080038
+.field public static final abc_ic_star_black_48dp:I = 0x7f080037
 
-.field public static final abc_ic_star_half_black_16dp:I = 0x7f080039
+.field public static final abc_ic_star_half_black_16dp:I = 0x7f080038
 
-.field public static final abc_ic_star_half_black_36dp:I = 0x7f08003a
+.field public static final abc_ic_star_half_black_36dp:I = 0x7f080039
 
-.field public static final abc_ic_star_half_black_48dp:I = 0x7f08003b
+.field public static final abc_ic_star_half_black_48dp:I = 0x7f08003a
 
-.field public static final abc_ic_voice_search_api_material:I = 0x7f08003c
+.field public static final abc_ic_voice_search_api_material:I = 0x7f08003b
 
-.field public static final abc_item_background_holo_dark:I = 0x7f08003d
+.field public static final abc_item_background_holo_dark:I = 0x7f08003c
 
-.field public static final abc_item_background_holo_light:I = 0x7f08003e
+.field public static final abc_item_background_holo_light:I = 0x7f08003d
 
-.field public static final abc_list_divider_material:I = 0x7f08003f
+.field public static final abc_list_divider_material:I = 0x7f08003e
 
-.field public static final abc_list_divider_mtrl_alpha:I = 0x7f080040
+.field public static final abc_list_divider_mtrl_alpha:I = 0x7f08003f
 
-.field public static final abc_list_focused_holo:I = 0x7f080041
+.field public static final abc_list_focused_holo:I = 0x7f080040
 
-.field public static final abc_list_longpressed_holo:I = 0x7f080042
+.field public static final abc_list_longpressed_holo:I = 0x7f080041
 
-.field public static final abc_list_pressed_holo_dark:I = 0x7f080043
+.field public static final abc_list_pressed_holo_dark:I = 0x7f080042
 
-.field public static final abc_list_pressed_holo_light:I = 0x7f080044
+.field public static final abc_list_pressed_holo_light:I = 0x7f080043
 
-.field public static final abc_list_selector_background_transition_holo_dark:I = 0x7f080045
+.field public static final abc_list_selector_background_transition_holo_dark:I = 0x7f080044
 
-.field public static final abc_list_selector_background_transition_holo_light:I = 0x7f080046
+.field public static final abc_list_selector_background_transition_holo_light:I = 0x7f080045
 
-.field public static final abc_list_selector_disabled_holo_dark:I = 0x7f080047
+.field public static final abc_list_selector_disabled_holo_dark:I = 0x7f080046
 
-.field public static final abc_list_selector_disabled_holo_light:I = 0x7f080048
+.field public static final abc_list_selector_disabled_holo_light:I = 0x7f080047
 
-.field public static final abc_list_selector_holo_dark:I = 0x7f080049
+.field public static final abc_list_selector_holo_dark:I = 0x7f080048
 
-.field public static final abc_list_selector_holo_light:I = 0x7f08004a
+.field public static final abc_list_selector_holo_light:I = 0x7f080049
 
-.field public static final abc_menu_hardkey_panel_mtrl_mult:I = 0x7f08004b
+.field public static final abc_menu_hardkey_panel_mtrl_mult:I = 0x7f08004a
 
-.field public static final abc_popup_background_mtrl_mult:I = 0x7f08004c
+.field public static final abc_popup_background_mtrl_mult:I = 0x7f08004b
 
-.field public static final abc_ratingbar_indicator_material:I = 0x7f08004d
+.field public static final abc_ratingbar_indicator_material:I = 0x7f08004c
 
-.field public static final abc_ratingbar_material:I = 0x7f08004e
+.field public static final abc_ratingbar_material:I = 0x7f08004d
 
-.field public static final abc_ratingbar_small_material:I = 0x7f08004f
+.field public static final abc_ratingbar_small_material:I = 0x7f08004e
 
-.field public static final abc_scrubber_control_off_mtrl_alpha:I = 0x7f080050
+.field public static final abc_scrubber_control_off_mtrl_alpha:I = 0x7f08004f
 
-.field public static final abc_scrubber_control_to_pressed_mtrl_000:I = 0x7f080051
+.field public static final abc_scrubber_control_to_pressed_mtrl_000:I = 0x7f080050
 
-.field public static final abc_scrubber_control_to_pressed_mtrl_005:I = 0x7f080052
+.field public static final abc_scrubber_control_to_pressed_mtrl_005:I = 0x7f080051
 
-.field public static final abc_scrubber_primary_mtrl_alpha:I = 0x7f080053
+.field public static final abc_scrubber_primary_mtrl_alpha:I = 0x7f080052
 
-.field public static final abc_scrubber_track_mtrl_alpha:I = 0x7f080054
+.field public static final abc_scrubber_track_mtrl_alpha:I = 0x7f080053
 
-.field public static final abc_seekbar_thumb_material:I = 0x7f080055
+.field public static final abc_seekbar_thumb_material:I = 0x7f080054
 
-.field public static final abc_seekbar_tick_mark_material:I = 0x7f080056
+.field public static final abc_seekbar_tick_mark_material:I = 0x7f080055
 
-.field public static final abc_seekbar_track_material:I = 0x7f080057
+.field public static final abc_seekbar_track_material:I = 0x7f080056
 
-.field public static final abc_spinner_mtrl_am_alpha:I = 0x7f080058
+.field public static final abc_spinner_mtrl_am_alpha:I = 0x7f080057
 
-.field public static final abc_spinner_textfield_background_material:I = 0x7f080059
+.field public static final abc_spinner_textfield_background_material:I = 0x7f080058
 
-.field public static final abc_switch_thumb_material:I = 0x7f08005a
+.field public static final abc_switch_thumb_material:I = 0x7f080059
 
-.field public static final abc_switch_track_mtrl_alpha:I = 0x7f08005b
+.field public static final abc_switch_track_mtrl_alpha:I = 0x7f08005a
 
-.field public static final abc_tab_indicator_material:I = 0x7f08005c
+.field public static final abc_tab_indicator_material:I = 0x7f08005b
 
-.field public static final abc_tab_indicator_mtrl_alpha:I = 0x7f08005d
+.field public static final abc_tab_indicator_mtrl_alpha:I = 0x7f08005c
 
-.field public static final abc_text_cursor_material:I = 0x7f08005e
+.field public static final abc_text_cursor_material:I = 0x7f08005d
 
-.field public static final abc_text_select_handle_left_mtrl_dark:I = 0x7f08005f
+.field public static final abc_text_select_handle_left_mtrl_dark:I = 0x7f08005e
 
-.field public static final abc_text_select_handle_left_mtrl_light:I = 0x7f080060
+.field public static final abc_text_select_handle_left_mtrl_light:I = 0x7f08005f
 
-.field public static final abc_text_select_handle_middle_mtrl_dark:I = 0x7f080061
+.field public static final abc_text_select_handle_middle_mtrl_dark:I = 0x7f080060
 
-.field public static final abc_text_select_handle_middle_mtrl_light:I = 0x7f080062
+.field public static final abc_text_select_handle_middle_mtrl_light:I = 0x7f080061
 
-.field public static final abc_text_select_handle_right_mtrl_dark:I = 0x7f080063
+.field public static final abc_text_select_handle_right_mtrl_dark:I = 0x7f080062
 
-.field public static final abc_text_select_handle_right_mtrl_light:I = 0x7f080064
+.field public static final abc_text_select_handle_right_mtrl_light:I = 0x7f080063
 
-.field public static final abc_textfield_activated_mtrl_alpha:I = 0x7f080065
+.field public static final abc_textfield_activated_mtrl_alpha:I = 0x7f080064
 
-.field public static final abc_textfield_default_mtrl_alpha:I = 0x7f080066
+.field public static final abc_textfield_default_mtrl_alpha:I = 0x7f080065
 
-.field public static final abc_textfield_search_activated_mtrl_alpha:I = 0x7f080067
+.field public static final abc_textfield_search_activated_mtrl_alpha:I = 0x7f080066
 
-.field public static final abc_textfield_search_default_mtrl_alpha:I = 0x7f080068
+.field public static final abc_textfield_search_default_mtrl_alpha:I = 0x7f080067
 
-.field public static final abc_textfield_search_material:I = 0x7f080069
+.field public static final abc_textfield_search_material:I = 0x7f080068
 
-.field public static final abc_vector_test:I = 0x7f08006a
+.field public static final abc_vector_test:I = 0x7f080069
 
-.field public static final notification_action_background:I = 0x7f080472
+.field public static final notification_action_background:I = 0x7f080463
 
-.field public static final notification_bg:I = 0x7f080473
+.field public static final notification_bg:I = 0x7f080464
 
-.field public static final notification_bg_low:I = 0x7f080474
+.field public static final notification_bg_low:I = 0x7f080465
 
-.field public static final notification_bg_low_normal:I = 0x7f080475
+.field public static final notification_bg_low_normal:I = 0x7f080466
 
-.field public static final notification_bg_low_pressed:I = 0x7f080476
+.field public static final notification_bg_low_pressed:I = 0x7f080467
 
-.field public static final notification_bg_normal:I = 0x7f080477
+.field public static final notification_bg_normal:I = 0x7f080468
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080478
+.field public static final notification_bg_normal_pressed:I = 0x7f080469
 
-.field public static final notification_icon_background:I = 0x7f080479
+.field public static final notification_icon_background:I = 0x7f08046a
 
-.field public static final notification_template_icon_bg:I = 0x7f08047a
+.field public static final notification_template_icon_bg:I = 0x7f08046b
 
-.field public static final notification_template_icon_low_bg:I = 0x7f08047b
+.field public static final notification_template_icon_low_bg:I = 0x7f08046c
 
-.field public static final notification_tile_bg:I = 0x7f08047c
+.field public static final notification_tile_bg:I = 0x7f08046d
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08047d
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08046e
 
-.field public static final tooltip_frame_dark:I = 0x7f080485
+.field public static final tooltip_frame_dark:I = 0x7f080476
 
-.field public static final tooltip_frame_light:I = 0x7f080486
+.field public static final tooltip_frame_light:I = 0x7f080477
 
-.field public static final ucrop_ic_angle:I = 0x7f080488
+.field public static final ucrop_ic_angle:I = 0x7f080479
 
-.field public static final ucrop_ic_crop:I = 0x7f080489
+.field public static final ucrop_ic_crop:I = 0x7f08047a
 
-.field public static final ucrop_ic_cross:I = 0x7f08048a
+.field public static final ucrop_ic_cross:I = 0x7f08047b
 
-.field public static final ucrop_ic_done:I = 0x7f08048b
+.field public static final ucrop_ic_done:I = 0x7f08047c
 
-.field public static final ucrop_ic_next:I = 0x7f08048c
+.field public static final ucrop_ic_next:I = 0x7f08047d
 
-.field public static final ucrop_ic_reset:I = 0x7f08048d
+.field public static final ucrop_ic_reset:I = 0x7f08047e
 
-.field public static final ucrop_ic_rotate:I = 0x7f08048e
+.field public static final ucrop_ic_rotate:I = 0x7f08047f
 
-.field public static final ucrop_ic_scale:I = 0x7f08048f
+.field public static final ucrop_ic_scale:I = 0x7f080480
 
-.field public static final ucrop_shadow_upside:I = 0x7f080490
+.field public static final ucrop_shadow_upside:I = 0x7f080481
 
-.field public static final ucrop_vector_ic_crop:I = 0x7f080491
+.field public static final ucrop_vector_ic_crop:I = 0x7f080482
 
-.field public static final ucrop_vector_loader:I = 0x7f080492
+.field public static final ucrop_vector_loader:I = 0x7f080483
 
-.field public static final ucrop_vector_loader_animated:I = 0x7f080493
+.field public static final ucrop_vector_loader_animated:I = 0x7f080484
 
 
 # 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 fdc478ef9f..6de9dc06a4 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 = 0x7f0a0080
+.field public static final async:I = 0x7f0a007f
 
-.field public static final blocking:I = 0x7f0a00ce
+.field public static final blocking:I = 0x7f0a00cd
 
 .field public static final bottom:I = 0x7f0a0105
 
@@ -69,215 +69,215 @@
 
 .field public static final chronometer:I = 0x7f0a0215
 
-.field public static final content:I = 0x7f0a0234
+.field public static final content:I = 0x7f0a0233
 
-.field public static final contentPanel:I = 0x7f0a0235
+.field public static final contentPanel:I = 0x7f0a0234
 
-.field public static final custom:I = 0x7f0a0252
+.field public static final custom:I = 0x7f0a0251
 
-.field public static final customPanel:I = 0x7f0a0253
+.field public static final customPanel:I = 0x7f0a0252
 
-.field public static final decor_content_parent:I = 0x7f0a0257
+.field public static final decor_content_parent:I = 0x7f0a0256
 
-.field public static final default_activity_button:I = 0x7f0a0258
+.field public static final default_activity_button:I = 0x7f0a0257
 
-.field public static final edit_query:I = 0x7f0a02ae
+.field public static final edit_query:I = 0x7f0a02ad
 
-.field public static final end:I = 0x7f0a02c9
+.field public static final end:I = 0x7f0a02c8
 
-.field public static final expand_activities_button:I = 0x7f0a02ce
+.field public static final expand_activities_button:I = 0x7f0a02cd
 
-.field public static final expanded_menu:I = 0x7f0a02cf
+.field public static final expanded_menu:I = 0x7f0a02ce
 
-.field public static final forever:I = 0x7f0a02f2
+.field public static final forever:I = 0x7f0a02f1
 
-.field public static final group_divider:I = 0x7f0a032d
+.field public static final group_divider:I = 0x7f0a0328
 
-.field public static final home:I = 0x7f0a0394
+.field public static final home:I = 0x7f0a038f
 
-.field public static final icon:I = 0x7f0a0396
+.field public static final icon:I = 0x7f0a0391
 
-.field public static final icon_group:I = 0x7f0a0397
+.field public static final icon_group:I = 0x7f0a0392
 
-.field public static final image:I = 0x7f0a039a
+.field public static final image:I = 0x7f0a0395
 
-.field public static final image_view_crop:I = 0x7f0a039c
+.field public static final image_view_crop:I = 0x7f0a0397
 
-.field public static final image_view_logo:I = 0x7f0a039d
+.field public static final image_view_logo:I = 0x7f0a0398
 
-.field public static final image_view_state_aspect_ratio:I = 0x7f0a039e
+.field public static final image_view_state_aspect_ratio:I = 0x7f0a0399
 
-.field public static final image_view_state_rotate:I = 0x7f0a039f
+.field public static final image_view_state_rotate:I = 0x7f0a039a
 
-.field public static final image_view_state_scale:I = 0x7f0a03a0
+.field public static final image_view_state_scale:I = 0x7f0a039b
 
-.field public static final info:I = 0x7f0a03ac
+.field public static final info:I = 0x7f0a03a7
 
-.field public static final italic:I = 0x7f0a03d9
+.field public static final italic:I = 0x7f0a03d4
 
-.field public static final layout_aspect_ratio:I = 0x7f0a0418
+.field public static final layout_aspect_ratio:I = 0x7f0a0413
 
-.field public static final layout_rotate_wheel:I = 0x7f0a0419
+.field public static final layout_rotate_wheel:I = 0x7f0a0414
 
-.field public static final layout_scale_wheel:I = 0x7f0a041a
+.field public static final layout_scale_wheel:I = 0x7f0a0415
 
-.field public static final left:I = 0x7f0a041b
+.field public static final left:I = 0x7f0a0416
 
-.field public static final line1:I = 0x7f0a041d
+.field public static final line1:I = 0x7f0a0418
 
-.field public static final line3:I = 0x7f0a041e
+.field public static final line3:I = 0x7f0a0419
 
-.field public static final listMode:I = 0x7f0a0420
+.field public static final listMode:I = 0x7f0a041b
 
-.field public static final list_item:I = 0x7f0a0421
+.field public static final list_item:I = 0x7f0a041c
 
-.field public static final menu_crop:I = 0x7f0a045e
+.field public static final menu_crop:I = 0x7f0a0459
 
-.field public static final menu_loader:I = 0x7f0a046a
+.field public static final menu_loader:I = 0x7f0a0465
 
-.field public static final message:I = 0x7f0a0485
+.field public static final message:I = 0x7f0a0478
 
-.field public static final multiply:I = 0x7f0a048d
+.field public static final multiply:I = 0x7f0a0480
 
-.field public static final none:I = 0x7f0a04a2
+.field public static final none:I = 0x7f0a0495
 
-.field public static final normal:I = 0x7f0a04a3
+.field public static final normal:I = 0x7f0a0496
 
-.field public static final notification_background:I = 0x7f0a04ad
+.field public static final notification_background:I = 0x7f0a04a0
 
-.field public static final notification_main_column:I = 0x7f0a04ae
+.field public static final notification_main_column:I = 0x7f0a04a1
 
-.field public static final notification_main_column_container:I = 0x7f0a04af
+.field public static final notification_main_column_container:I = 0x7f0a04a2
 
-.field public static final parentPanel:I = 0x7f0a04e2
+.field public static final parentPanel:I = 0x7f0a04d5
 
-.field public static final progress_circular:I = 0x7f0a055c
+.field public static final progress_circular:I = 0x7f0a054d
 
-.field public static final progress_horizontal:I = 0x7f0a055e
+.field public static final progress_horizontal:I = 0x7f0a054f
 
-.field public static final radio:I = 0x7f0a0569
+.field public static final radio:I = 0x7f0a055a
 
-.field public static final right:I = 0x7f0a058c
+.field public static final right:I = 0x7f0a0573
 
-.field public static final right_icon:I = 0x7f0a058d
+.field public static final right_icon:I = 0x7f0a0574
 
-.field public static final right_side:I = 0x7f0a058e
+.field public static final right_side:I = 0x7f0a0575
 
-.field public static final rotate_scroll_wheel:I = 0x7f0a05b5
+.field public static final rotate_scroll_wheel:I = 0x7f0a059c
 
-.field public static final scale_scroll_wheel:I = 0x7f0a05bb
+.field public static final scale_scroll_wheel:I = 0x7f0a05a2
 
-.field public static final screen:I = 0x7f0a05bc
+.field public static final screen:I = 0x7f0a05a3
 
-.field public static final scrollIndicatorDown:I = 0x7f0a05be
+.field public static final scrollIndicatorDown:I = 0x7f0a05a5
 
-.field public static final scrollIndicatorUp:I = 0x7f0a05bf
+.field public static final scrollIndicatorUp:I = 0x7f0a05a6
 
-.field public static final scrollView:I = 0x7f0a05c0
+.field public static final scrollView:I = 0x7f0a05a7
 
-.field public static final search_badge:I = 0x7f0a05c4
+.field public static final search_badge:I = 0x7f0a05ab
 
-.field public static final search_bar:I = 0x7f0a05c5
+.field public static final search_bar:I = 0x7f0a05ac
 
-.field public static final search_button:I = 0x7f0a05c6
+.field public static final search_button:I = 0x7f0a05ad
 
-.field public static final search_close_btn:I = 0x7f0a05c8
+.field public static final search_close_btn:I = 0x7f0a05af
 
-.field public static final search_edit_frame:I = 0x7f0a05c9
+.field public static final search_edit_frame:I = 0x7f0a05b0
 
-.field public static final search_go_btn:I = 0x7f0a05cc
+.field public static final search_go_btn:I = 0x7f0a05b3
 
-.field public static final search_mag_icon:I = 0x7f0a05ce
+.field public static final search_mag_icon:I = 0x7f0a05b5
 
-.field public static final search_plate:I = 0x7f0a05cf
+.field public static final search_plate:I = 0x7f0a05b6
 
-.field public static final search_src_text:I = 0x7f0a05d2
+.field public static final search_src_text:I = 0x7f0a05b9
 
-.field public static final search_voice_btn:I = 0x7f0a05de
+.field public static final search_voice_btn:I = 0x7f0a05c5
 
-.field public static final select_dialog_listview:I = 0x7f0a05df
+.field public static final select_dialog_listview:I = 0x7f0a05c6
 
-.field public static final shortcut:I = 0x7f0a0719
+.field public static final shortcut:I = 0x7f0a0700
 
-.field public static final spacer:I = 0x7f0a0725
+.field public static final spacer:I = 0x7f0a070c
 
-.field public static final split_action_bar:I = 0x7f0a072c
+.field public static final split_action_bar:I = 0x7f0a070d
 
-.field public static final src_atop:I = 0x7f0a072f
+.field public static final src_atop:I = 0x7f0a0710
 
-.field public static final src_in:I = 0x7f0a0730
+.field public static final src_in:I = 0x7f0a0711
 
-.field public static final src_over:I = 0x7f0a0731
+.field public static final src_over:I = 0x7f0a0712
 
-.field public static final start:I = 0x7f0a0734
+.field public static final start:I = 0x7f0a0715
 
-.field public static final state_aspect_ratio:I = 0x7f0a0735
+.field public static final state_aspect_ratio:I = 0x7f0a0716
 
-.field public static final state_rotate:I = 0x7f0a0736
+.field public static final state_rotate:I = 0x7f0a0717
 
-.field public static final state_scale:I = 0x7f0a0737
+.field public static final state_scale:I = 0x7f0a0718
 
-.field public static final submenuarrow:I = 0x7f0a0755
+.field public static final submenuarrow:I = 0x7f0a072d
 
-.field public static final submit_area:I = 0x7f0a0756
+.field public static final submit_area:I = 0x7f0a072e
 
-.field public static final tabMode:I = 0x7f0a0761
+.field public static final tabMode:I = 0x7f0a0739
 
-.field public static final tag_transition_group:I = 0x7f0a0767
+.field public static final tag_transition_group:I = 0x7f0a073f
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0768
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0740
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0769
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0741
 
-.field public static final text:I = 0x7f0a076f
+.field public static final text:I = 0x7f0a0747
 
-.field public static final text2:I = 0x7f0a0770
+.field public static final text2:I = 0x7f0a0748
 
-.field public static final textSpacerNoButtons:I = 0x7f0a0771
+.field public static final textSpacerNoButtons:I = 0x7f0a0749
 
-.field public static final textSpacerNoTitle:I = 0x7f0a0772
+.field public static final textSpacerNoTitle:I = 0x7f0a074a
 
-.field public static final text_view_rotate:I = 0x7f0a0776
+.field public static final text_view_rotate:I = 0x7f0a074e
 
-.field public static final text_view_scale:I = 0x7f0a0777
+.field public static final text_view_scale:I = 0x7f0a074f
 
-.field public static final time:I = 0x7f0a077d
+.field public static final time:I = 0x7f0a0755
 
-.field public static final title:I = 0x7f0a077e
+.field public static final title:I = 0x7f0a0756
 
-.field public static final titleDividerNoCustom:I = 0x7f0a077f
+.field public static final titleDividerNoCustom:I = 0x7f0a0757
 
-.field public static final title_template:I = 0x7f0a0780
+.field public static final title_template:I = 0x7f0a0758
 
-.field public static final toolbar:I = 0x7f0a0781
+.field public static final toolbar:I = 0x7f0a0759
 
-.field public static final toolbar_title:I = 0x7f0a0783
+.field public static final toolbar_title:I = 0x7f0a075b
 
-.field public static final top:I = 0x7f0a0785
+.field public static final top:I = 0x7f0a075d
 
-.field public static final topPanel:I = 0x7f0a0786
+.field public static final topPanel:I = 0x7f0a075e
 
-.field public static final ucrop:I = 0x7f0a0792
+.field public static final ucrop:I = 0x7f0a076a
 
-.field public static final ucrop_frame:I = 0x7f0a0793
+.field public static final ucrop_frame:I = 0x7f0a076b
 
-.field public static final ucrop_photobox:I = 0x7f0a0794
+.field public static final ucrop_photobox:I = 0x7f0a076c
 
-.field public static final uniform:I = 0x7f0a0799
+.field public static final uniform:I = 0x7f0a0771
 
-.field public static final up:I = 0x7f0a079c
+.field public static final up:I = 0x7f0a0774
 
-.field public static final view_overlay:I = 0x7f0a082f
+.field public static final view_overlay:I = 0x7f0a07f5
 
-.field public static final wrap_content:I = 0x7f0a0881
+.field public static final wrap_content:I = 0x7f0a0846
 
-.field public static final wrapper_controls:I = 0x7f0a0883
+.field public static final wrapper_controls:I = 0x7f0a0848
 
-.field public static final wrapper_reset_rotate:I = 0x7f0a0884
+.field public static final wrapper_reset_rotate:I = 0x7f0a0849
 
-.field public static final wrapper_rotate_by_angle:I = 0x7f0a0885
+.field public static final wrapper_rotate_by_angle:I = 0x7f0a084a
 
-.field public static final wrapper_states:I = 0x7f0a0886
+.field public static final wrapper_states:I = 0x7f0a084b
 
 
 # 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 c4de6db695..f5a45bc42a 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
@@ -89,21 +89,21 @@
 
 .field public static final select_dialog_singlechoice_material:I = 0x7f0d005a
 
-.field public static final support_simple_spinner_dropdown_item:I = 0x7f0d0062
+.field public static final support_simple_spinner_dropdown_item:I = 0x7f0d0061
 
-.field public static final ucrop_activity_photobox:I = 0x7f0d0064
+.field public static final ucrop_activity_photobox:I = 0x7f0d0063
 
-.field public static final ucrop_aspect_ratio:I = 0x7f0d0065
+.field public static final ucrop_aspect_ratio:I = 0x7f0d0064
 
-.field public static final ucrop_controls:I = 0x7f0d0066
+.field public static final ucrop_controls:I = 0x7f0d0065
 
-.field public static final ucrop_fragment_photobox:I = 0x7f0d0067
+.field public static final ucrop_fragment_photobox:I = 0x7f0d0066
 
-.field public static final ucrop_layout_rotate_wheel:I = 0x7f0d0068
+.field public static final ucrop_layout_rotate_wheel:I = 0x7f0d0067
 
-.field public static final ucrop_layout_scale_wheel:I = 0x7f0d0069
+.field public static final ucrop_layout_scale_wheel:I = 0x7f0d0068
 
-.field public static final ucrop_view:I = 0x7f0d006a
+.field public static final ucrop_view:I = 0x7f0d0069
 
 
 # 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 ca890ed89b..b8b5dccc68 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 = 0x7f0e0021
+.field public static final ucrop_menu_activity:I = 0x7f0e001b
 
 
 # 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 8c4f259a61..a07ed52217 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 = 0x7f121098
+.field public static final search_menu_title:I = 0x7f12100c
 
-.field public static final status_bar_notification_info_overflow:I = 0x7f121165
+.field public static final status_bar_notification_info_overflow:I = 0x7f1210d9
 
-.field public static final ucrop_error_input_data_is_absent:I = 0x7f12129c
+.field public static final ucrop_error_input_data_is_absent:I = 0x7f12120f
 
-.field public static final ucrop_label_edit_photo:I = 0x7f12129d
+.field public static final ucrop_label_edit_photo:I = 0x7f121210
 
-.field public static final ucrop_label_original:I = 0x7f12129e
+.field public static final ucrop_label_original:I = 0x7f121211
 
-.field public static final ucrop_menu_crop:I = 0x7f12129f
+.field public static final ucrop_menu_crop:I = 0x7f121212
 
-.field public static final ucrop_mutate_exception_hint:I = 0x7f1212a0
+.field public static final ucrop_mutate_exception_hint:I = 0x7f121213
 
 
 # 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 7cf5b6cd10..6b70cc9ec6 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, 0x7f040315
+    const v6, 0x7f040314
 
     aput v6, v5, v3
 
@@ -1320,15 +1320,15 @@
         0x7f0401d6
         0x7f0401f9
         0x7f040203
-        0x7f040267
-        0x7f040283
-        0x7f04029b
+        0x7f040266
+        0x7f040282
+        0x7f04029a
+        0x7f0402c8
         0x7f0402c9
-        0x7f0402ca
-        0x7f040323
-        0x7f040326
-        0x7f0403bf
-        0x7f0403c9
+        0x7f040322
+        0x7f040325
+        0x7f0403be
+        0x7f0403c8
     .end array-data
 
     :array_1
@@ -1337,8 +1337,8 @@
         0x7f04004c
         0x7f0400b3
         0x7f04015c
-        0x7f040326
-        0x7f0403c9
+        0x7f040325
+        0x7f0403c8
     .end array-data
 
     :array_2
@@ -1352,11 +1352,11 @@
         0x10100f2
         0x7f040079
         0x7f04007a
+        0x7f04025d
         0x7f04025e
-        0x7f04025f
-        0x7f040280
+        0x7f04027f
+        0x7f040307
         0x7f040308
-        0x7f040309
     .end array-data
 
     :array_4
@@ -1386,17 +1386,17 @@
     :array_7
     .array-data 4
         0x1010119
-        0x7f040313
+        0x7f040312
+        0x7f0403bc
         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
-        0x7f04025a
-        0x7f040349
+        0x7f040259
+        0x7f040348
     .end array-data
 
     :array_b
@@ -1498,41 +1498,41 @@
         0x7f040119
         0x7f040168
         0x7f0401e1
+        0x7f04025b
         0x7f04025c
-        0x7f04025d
+        0x7f04025f
         0x7f040260
         0x7f040261
         0x7f040262
         0x7f040263
         0x7f040264
         0x7f040265
-        0x7f040266
+        0x7f04028f
         0x7f040290
         0x7f040291
-        0x7f040292
-        0x7f04029a
-        0x7f04029c
-        0x7f0402cf
+        0x7f040299
+        0x7f04029b
+        0x7f0402ce
+        0x7f0402d1
         0x7f0402d2
         0x7f0402d3
-        0x7f0402d4
-        0x7f0402fb
+        0x7f0402fa
+        0x7f0402fc
         0x7f0402fd
         0x7f0402fe
-        0x7f0402ff
+        0x7f04030f
         0x7f040310
-        0x7f040311
-        0x7f04032a
+        0x7f040329
+        0x7f040353
         0x7f040354
         0x7f040355
         0x7f040356
-        0x7f040357
+        0x7f040358
         0x7f040359
         0x7f04035a
         0x7f04035b
-        0x7f04035c
+        0x7f04035e
         0x7f04035f
-        0x7f040360
         0x7f0403cb
         0x7f0403cc
         0x7f0403cd
@@ -1567,7 +1567,7 @@
     :array_e
     .array-data 4
         0x7f04020a
-        0x7f04031a
+        0x7f040319
     .end array-data
 
     :array_f
@@ -1589,8 +1589,8 @@
         0x7f0400b8
         0x7f040112
         0x7f040150
-        0x7f04030f
-        0x7f0403b6
+        0x7f04030e
+        0x7f0403b5
     .end array-data
 
     :array_11
@@ -1648,8 +1648,8 @@
         0x1010128
         0x7f04010b
         0x7f040110
-        0x7f04027e
-        0x7f040305
+        0x7f04027d
+        0x7f040304
     .end array-data
 
     :array_16
@@ -1698,8 +1698,8 @@
         0x7f0400ce
         0x7f0401dc
         0x7f0401dd
-        0x7f040287
-        0x7f040301
+        0x7f040286
+        0x7f040300
         0x7f0403cf
     .end array-data
 
@@ -1712,21 +1712,21 @@
         0x101012f
         0x1010130
         0x1010131
-        0x7f04029d
-        0x7f040321
+        0x7f04029c
+        0x7f040320
     .end array-data
 
     :array_1b
     .array-data 4
         0x1010176
         0x10102c9
-        0x7f040288
+        0x7f040287
     .end array-data
 
     :array_1c
     .array-data 4
-        0x7f04028c
-        0x7f04028f
+        0x7f04028b
+        0x7f04028e
     .end array-data
 
     :array_1d
@@ -1741,12 +1741,12 @@
         0x7f040155
         0x7f0401de
         0x7f04020d
+        0x7f0402cc
         0x7f0402cd
-        0x7f0402ce
+        0x7f0402f8
         0x7f0402f9
-        0x7f0402fa
-        0x7f040322
-        0x7f040327
+        0x7f040321
+        0x7f040326
         0x7f0403ef
     .end array-data
 
@@ -1756,7 +1756,7 @@
         0x1010176
         0x101017b
         0x1010262
-        0x7f04029b
+        0x7f04029a
     .end array-data
 
     :array_1f
@@ -1774,14 +1774,14 @@
         0x1010124
         0x1010125
         0x1010142
-        0x7f040307
-        0x7f040312
+        0x7f040306
+        0x7f040311
+        0x7f040327
         0x7f040328
-        0x7f040329
-        0x7f04032b
+        0x7f04032a
+        0x7f0403b6
         0x7f0403b7
         0x7f0403b8
-        0x7f0403b9
         0x7f0403d0
         0x7f0403d1
         0x7f0403d2
@@ -1801,7 +1801,7 @@
         0x1010164
         0x10103ac
         0x7f040145
-        0x7f040349
+        0x7f040348
     .end array-data
 
     :array_22
@@ -1817,16 +1817,17 @@
         0x7f0400d2
         0x7f0400d3
         0x7f0400d4
+        0x7f040266
         0x7f040267
-        0x7f040268
-        0x7f04027b
+        0x7f04027a
+        0x7f040280
         0x7f040281
-        0x7f040282
-        0x7f04029b
+        0x7f04029a
+        0x7f040322
         0x7f040323
         0x7f040324
-        0x7f040325
-        0x7f0403bf
+        0x7f0403be
+        0x7f0403c0
         0x7f0403c1
         0x7f0403c2
         0x7f0403c3
@@ -1834,16 +1835,15 @@
         0x7f0403c5
         0x7f0403c6
         0x7f0403c7
-        0x7f0403c8
     .end array-data
 
     :array_23
     .array-data 4
         0x1010000
         0x10100da
+        0x7f04028c
         0x7f04028d
-        0x7f04028e
-        0x7f040365
+        0x7f040364
     .end array-data
 
     :array_24
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 314649b5a6..7eee1f93cf 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 = 0x7f0402e7
+.field public static final sb_barBackgroundColor:I = 0x7f0402e6
 
-.field public static final sb_barColor:I = 0x7f0402e8
+.field public static final sb_barColor:I = 0x7f0402e7
 
-.field public static final sb_barControlColor:I = 0x7f0402e9
+.field public static final sb_barControlColor:I = 0x7f0402e8
 
-.field public static final sb_barControlRadius:I = 0x7f0402ea
+.field public static final sb_barControlRadius:I = 0x7f0402e9
 
-.field public static final sb_barControlShadowColor:I = 0x7f0402eb
+.field public static final sb_barControlShadowColor:I = 0x7f0402ea
 
-.field public static final sb_barControlShadowRadius:I = 0x7f0402ec
+.field public static final sb_barControlShadowRadius:I = 0x7f0402eb
 
-.field public static final sb_barHeight:I = 0x7f0402ed
+.field public static final sb_barHeight:I = 0x7f0402ec
 
-.field public static final sb_barInterval:I = 0x7f0402ee
+.field public static final sb_barInterval:I = 0x7f0402ed
 
-.field public static final sb_barOverlayColor:I = 0x7f0402ef
+.field public static final sb_barOverlayColor:I = 0x7f0402ee
 
-.field public static final sb_barOverlayValue:I = 0x7f0402f0
+.field public static final sb_barOverlayValue:I = 0x7f0402ef
 
-.field public static final sb_barTouchEnabled:I = 0x7f0402f1
+.field public static final sb_barTouchEnabled:I = 0x7f0402f0
 
-.field public static final sb_barValue:I = 0x7f0402f2
+.field public static final sb_barValue:I = 0x7f0402f1
 
-.field public static final sb_barValueMax:I = 0x7f0402f3
+.field public static final sb_barValueMax:I = 0x7f0402f2
 
-.field public static final sb_barValueMin:I = 0x7f0402f4
+.field public static final sb_barValueMin:I = 0x7f0402f3
 
 
 # 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 a0940b3394..f8b1532548 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,6 +62,7 @@
 
     :array_0
     .array-data 4
+        0x7f0402e6
         0x7f0402e7
         0x7f0402e8
         0x7f0402e9
@@ -75,7 +76,6 @@
         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 96e48ab7b5..0f08786813 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 = 0x7f060035
+.field public static final bright_foreground_disabled_material_dark:I = 0x7f060034
 
-.field public static final bright_foreground_disabled_material_light:I = 0x7f060036
+.field public static final bright_foreground_disabled_material_light:I = 0x7f060035
 
-.field public static final bright_foreground_inverse_material_dark:I = 0x7f060037
+.field public static final bright_foreground_inverse_material_dark:I = 0x7f060036
 
-.field public static final bright_foreground_inverse_material_light:I = 0x7f060038
+.field public static final bright_foreground_inverse_material_light:I = 0x7f060037
 
-.field public static final bright_foreground_material_dark:I = 0x7f060039
+.field public static final bright_foreground_material_dark:I = 0x7f060038
 
-.field public static final bright_foreground_material_light:I = 0x7f06003a
+.field public static final bright_foreground_material_light:I = 0x7f060039
 
-.field public static final button_material_dark:I = 0x7f060040
+.field public static final button_material_dark:I = 0x7f06003f
 
-.field public static final button_material_light:I = 0x7f060041
+.field public static final button_material_light:I = 0x7f060040
 
-.field public static final dim_foreground_disabled_material_dark:I = 0x7f060069
+.field public static final dim_foreground_disabled_material_dark:I = 0x7f060068
 
-.field public static final dim_foreground_disabled_material_light:I = 0x7f06006a
+.field public static final dim_foreground_disabled_material_light:I = 0x7f060069
 
-.field public static final dim_foreground_material_dark:I = 0x7f06006b
+.field public static final dim_foreground_material_dark:I = 0x7f06006a
 
-.field public static final dim_foreground_material_light:I = 0x7f06006c
+.field public static final dim_foreground_material_light:I = 0x7f06006b
 
-.field public static final foreground_material_dark:I = 0x7f060073
+.field public static final foreground_material_dark:I = 0x7f060072
 
-.field public static final foreground_material_light:I = 0x7f060074
+.field public static final foreground_material_light:I = 0x7f060073
 
-.field public static final highlighted_text_material_dark:I = 0x7f060083
+.field public static final highlighted_text_material_dark:I = 0x7f060082
 
-.field public static final highlighted_text_material_light:I = 0x7f060084
+.field public static final highlighted_text_material_light:I = 0x7f060083
 
-.field public static final material_blue_grey_800:I = 0x7f060092
+.field public static final material_blue_grey_800:I = 0x7f060091
 
-.field public static final material_blue_grey_900:I = 0x7f060093
+.field public static final material_blue_grey_900:I = 0x7f060092
 
-.field public static final material_blue_grey_950:I = 0x7f060094
+.field public static final material_blue_grey_950:I = 0x7f060093
 
-.field public static final material_deep_teal_200:I = 0x7f060095
+.field public static final material_deep_teal_200:I = 0x7f060094
 
-.field public static final material_deep_teal_500:I = 0x7f060096
+.field public static final material_deep_teal_500:I = 0x7f060095
 
-.field public static final material_grey_100:I = 0x7f060097
+.field public static final material_grey_100:I = 0x7f060096
 
-.field public static final material_grey_300:I = 0x7f060098
+.field public static final material_grey_300:I = 0x7f060097
 
-.field public static final material_grey_50:I = 0x7f060099
+.field public static final material_grey_50:I = 0x7f060098
 
-.field public static final material_grey_600:I = 0x7f06009a
+.field public static final material_grey_600:I = 0x7f060099
 
-.field public static final material_grey_800:I = 0x7f06009b
+.field public static final material_grey_800:I = 0x7f06009a
 
-.field public static final material_grey_850:I = 0x7f06009c
+.field public static final material_grey_850:I = 0x7f06009b
 
-.field public static final material_grey_900:I = 0x7f06009d
+.field public static final material_grey_900:I = 0x7f06009c
 
-.field public static final notification_action_color_filter:I = 0x7f0600b8
+.field public static final notification_action_color_filter:I = 0x7f0600b7
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b9
+.field public static final notification_icon_bg_color:I = 0x7f0600b8
 
-.field public static final primary_dark_material_dark:I = 0x7f0600db
+.field public static final primary_dark_material_dark:I = 0x7f0600da
 
-.field public static final primary_dark_material_light:I = 0x7f0600dc
+.field public static final primary_dark_material_light:I = 0x7f0600db
 
-.field public static final primary_material_dark:I = 0x7f0600ec
+.field public static final primary_material_dark:I = 0x7f0600eb
 
-.field public static final primary_material_light:I = 0x7f0600ed
+.field public static final primary_material_light:I = 0x7f0600ec
 
-.field public static final primary_text_default_material_dark:I = 0x7f0600ee
+.field public static final primary_text_default_material_dark:I = 0x7f0600ed
 
-.field public static final primary_text_default_material_light:I = 0x7f0600ef
+.field public static final primary_text_default_material_light:I = 0x7f0600ee
 
-.field public static final primary_text_disabled_material_dark:I = 0x7f0600f0
+.field public static final primary_text_disabled_material_dark:I = 0x7f0600ef
 
-.field public static final primary_text_disabled_material_light:I = 0x7f0600f1
+.field public static final primary_text_disabled_material_light:I = 0x7f0600f0
 
-.field public static final ripple_material_dark:I = 0x7f0600fa
+.field public static final ripple_material_dark:I = 0x7f0600f9
 
-.field public static final ripple_material_light:I = 0x7f0600fb
+.field public static final ripple_material_light:I = 0x7f0600fa
 
-.field public static final secondary_text_default_material_dark:I = 0x7f0600fc
+.field public static final secondary_text_default_material_dark:I = 0x7f0600fb
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fd
+.field public static final secondary_text_default_material_light:I = 0x7f0600fc
 
-.field public static final secondary_text_disabled_material_dark:I = 0x7f0600fe
+.field public static final secondary_text_disabled_material_dark:I = 0x7f0600fd
 
-.field public static final secondary_text_disabled_material_light:I = 0x7f0600ff
+.field public static final secondary_text_disabled_material_light:I = 0x7f0600fe
 
-.field public static final switch_thumb_disabled_material_dark:I = 0x7f06012e
+.field public static final switch_thumb_disabled_material_dark:I = 0x7f06012d
 
-.field public static final switch_thumb_disabled_material_light:I = 0x7f06012f
+.field public static final switch_thumb_disabled_material_light:I = 0x7f06012e
 
-.field public static final switch_thumb_material_dark:I = 0x7f060130
+.field public static final switch_thumb_material_dark:I = 0x7f06012f
 
-.field public static final switch_thumb_material_light:I = 0x7f060131
+.field public static final switch_thumb_material_light:I = 0x7f060130
 
-.field public static final switch_thumb_normal_material_dark:I = 0x7f060132
+.field public static final switch_thumb_normal_material_dark:I = 0x7f060131
 
-.field public static final switch_thumb_normal_material_light:I = 0x7f060133
+.field public static final switch_thumb_normal_material_light:I = 0x7f060132
 
-.field public static final tooltip_background_dark:I = 0x7f060135
+.field public static final tooltip_background_dark:I = 0x7f060134
 
-.field public static final tooltip_background_light:I = 0x7f060136
+.field public static final tooltip_background_light:I = 0x7f060135
 
-.field public static final ucrop_color_crop_background:I = 0x7f06013a
+.field public static final ucrop_color_crop_background:I = 0x7f060139
 
-.field public static final ucrop_color_default_crop_frame:I = 0x7f06013b
+.field public static final ucrop_color_default_crop_frame:I = 0x7f06013a
 
-.field public static final ucrop_color_default_crop_grid:I = 0x7f06013c
+.field public static final ucrop_color_default_crop_grid:I = 0x7f06013b
 
-.field public static final ucrop_color_default_dimmed:I = 0x7f06013d
+.field public static final ucrop_color_default_dimmed:I = 0x7f06013c
 
-.field public static final ucrop_color_default_logo:I = 0x7f06013e
+.field public static final ucrop_color_default_logo:I = 0x7f06013d
 
-.field public static final ucrop_color_progress_wheel_line:I = 0x7f06013f
+.field public static final ucrop_color_progress_wheel_line:I = 0x7f06013e
 
-.field public static final ucrop_color_statusbar:I = 0x7f060140
+.field public static final ucrop_color_statusbar:I = 0x7f06013f
 
-.field public static final ucrop_color_toolbar:I = 0x7f060141
+.field public static final ucrop_color_toolbar:I = 0x7f060140
 
-.field public static final ucrop_color_toolbar_widget:I = 0x7f060142
+.field public static final ucrop_color_toolbar_widget:I = 0x7f060141
 
-.field public static final ucrop_color_widget:I = 0x7f060143
+.field public static final ucrop_color_widget:I = 0x7f060142
 
-.field public static final ucrop_color_widget_active:I = 0x7f060144
+.field public static final ucrop_color_widget_active:I = 0x7f060143
 
-.field public static final ucrop_color_widget_background:I = 0x7f060145
+.field public static final ucrop_color_widget_background:I = 0x7f060144
 
-.field public static final ucrop_color_widget_text:I = 0x7f060146
+.field public static final ucrop_color_widget_text:I = 0x7f060145
 
-.field public static final ucrop_scale_text_view_selector:I = 0x7f060147
+.field public static final ucrop_scale_text_view_selector:I = 0x7f060146
 
 
 # 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 6832e63790..d717f165f9 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 = 0x7f080017
+.field public static final abc_ab_share_pack_mtrl_alpha:I = 0x7f080016
 
-.field public static final abc_action_bar_item_background_material:I = 0x7f080018
+.field public static final abc_action_bar_item_background_material:I = 0x7f080017
 
-.field public static final abc_btn_borderless_material:I = 0x7f080019
+.field public static final abc_btn_borderless_material:I = 0x7f080018
 
-.field public static final abc_btn_check_material:I = 0x7f08001a
+.field public static final abc_btn_check_material:I = 0x7f080019
 
-.field public static final abc_btn_check_to_on_mtrl_000:I = 0x7f08001b
+.field public static final abc_btn_check_to_on_mtrl_000:I = 0x7f08001a
 
-.field public static final abc_btn_check_to_on_mtrl_015:I = 0x7f08001c
+.field public static final abc_btn_check_to_on_mtrl_015:I = 0x7f08001b
 
-.field public static final abc_btn_colored_material:I = 0x7f08001d
+.field public static final abc_btn_colored_material:I = 0x7f08001c
 
-.field public static final abc_btn_default_mtrl_shape:I = 0x7f08001e
+.field public static final abc_btn_default_mtrl_shape:I = 0x7f08001d
 
-.field public static final abc_btn_radio_material:I = 0x7f08001f
+.field public static final abc_btn_radio_material:I = 0x7f08001e
 
-.field public static final abc_btn_radio_to_on_mtrl_000:I = 0x7f080020
+.field public static final abc_btn_radio_to_on_mtrl_000:I = 0x7f08001f
 
-.field public static final abc_btn_radio_to_on_mtrl_015:I = 0x7f080021
+.field public static final abc_btn_radio_to_on_mtrl_015:I = 0x7f080020
 
-.field public static final abc_btn_switch_to_on_mtrl_00001:I = 0x7f080022
+.field public static final abc_btn_switch_to_on_mtrl_00001:I = 0x7f080021
 
-.field public static final abc_btn_switch_to_on_mtrl_00012:I = 0x7f080023
+.field public static final abc_btn_switch_to_on_mtrl_00012:I = 0x7f080022
 
-.field public static final abc_cab_background_internal_bg:I = 0x7f080024
+.field public static final abc_cab_background_internal_bg:I = 0x7f080023
 
-.field public static final abc_cab_background_top_material:I = 0x7f080025
+.field public static final abc_cab_background_top_material:I = 0x7f080024
 
-.field public static final abc_cab_background_top_mtrl_alpha:I = 0x7f080026
+.field public static final abc_cab_background_top_mtrl_alpha:I = 0x7f080025
 
-.field public static final abc_control_background_material:I = 0x7f080027
+.field public static final abc_control_background_material:I = 0x7f080026
 
-.field public static final abc_dialog_material_background:I = 0x7f080028
+.field public static final abc_dialog_material_background:I = 0x7f080027
 
-.field public static final abc_edit_text_material:I = 0x7f080029
+.field public static final abc_edit_text_material:I = 0x7f080028
 
-.field public static final abc_ic_ab_back_material:I = 0x7f08002a
+.field public static final abc_ic_ab_back_material:I = 0x7f080029
 
-.field public static final abc_ic_arrow_drop_right_black_24dp:I = 0x7f08002b
+.field public static final abc_ic_arrow_drop_right_black_24dp:I = 0x7f08002a
 
-.field public static final abc_ic_clear_material:I = 0x7f08002c
+.field public static final abc_ic_clear_material:I = 0x7f08002b
 
-.field public static final abc_ic_commit_search_api_mtrl_alpha:I = 0x7f08002d
+.field public static final abc_ic_commit_search_api_mtrl_alpha:I = 0x7f08002c
 
-.field public static final abc_ic_go_search_api_material:I = 0x7f08002e
+.field public static final abc_ic_go_search_api_material:I = 0x7f08002d
 
-.field public static final abc_ic_menu_copy_mtrl_am_alpha:I = 0x7f08002f
+.field public static final abc_ic_menu_copy_mtrl_am_alpha:I = 0x7f08002e
 
-.field public static final abc_ic_menu_cut_mtrl_alpha:I = 0x7f080030
+.field public static final abc_ic_menu_cut_mtrl_alpha:I = 0x7f08002f
 
-.field public static final abc_ic_menu_overflow_material:I = 0x7f080031
+.field public static final abc_ic_menu_overflow_material:I = 0x7f080030
 
-.field public static final abc_ic_menu_paste_mtrl_am_alpha:I = 0x7f080032
+.field public static final abc_ic_menu_paste_mtrl_am_alpha:I = 0x7f080031
 
-.field public static final abc_ic_menu_selectall_mtrl_alpha:I = 0x7f080033
+.field public static final abc_ic_menu_selectall_mtrl_alpha:I = 0x7f080032
 
-.field public static final abc_ic_menu_share_mtrl_alpha:I = 0x7f080034
+.field public static final abc_ic_menu_share_mtrl_alpha:I = 0x7f080033
 
-.field public static final abc_ic_search_api_material:I = 0x7f080035
+.field public static final abc_ic_search_api_material:I = 0x7f080034
 
-.field public static final abc_ic_star_black_16dp:I = 0x7f080036
+.field public static final abc_ic_star_black_16dp:I = 0x7f080035
 
-.field public static final abc_ic_star_black_36dp:I = 0x7f080037
+.field public static final abc_ic_star_black_36dp:I = 0x7f080036
 
-.field public static final abc_ic_star_black_48dp:I = 0x7f080038
+.field public static final abc_ic_star_black_48dp:I = 0x7f080037
 
-.field public static final abc_ic_star_half_black_16dp:I = 0x7f080039
+.field public static final abc_ic_star_half_black_16dp:I = 0x7f080038
 
-.field public static final abc_ic_star_half_black_36dp:I = 0x7f08003a
+.field public static final abc_ic_star_half_black_36dp:I = 0x7f080039
 
-.field public static final abc_ic_star_half_black_48dp:I = 0x7f08003b
+.field public static final abc_ic_star_half_black_48dp:I = 0x7f08003a
 
-.field public static final abc_ic_voice_search_api_material:I = 0x7f08003c
+.field public static final abc_ic_voice_search_api_material:I = 0x7f08003b
 
-.field public static final abc_item_background_holo_dark:I = 0x7f08003d
+.field public static final abc_item_background_holo_dark:I = 0x7f08003c
 
-.field public static final abc_item_background_holo_light:I = 0x7f08003e
+.field public static final abc_item_background_holo_light:I = 0x7f08003d
 
-.field public static final abc_list_divider_mtrl_alpha:I = 0x7f080040
+.field public static final abc_list_divider_mtrl_alpha:I = 0x7f08003f
 
-.field public static final abc_list_focused_holo:I = 0x7f080041
+.field public static final abc_list_focused_holo:I = 0x7f080040
 
-.field public static final abc_list_longpressed_holo:I = 0x7f080042
+.field public static final abc_list_longpressed_holo:I = 0x7f080041
 
-.field public static final abc_list_pressed_holo_dark:I = 0x7f080043
+.field public static final abc_list_pressed_holo_dark:I = 0x7f080042
 
-.field public static final abc_list_pressed_holo_light:I = 0x7f080044
+.field public static final abc_list_pressed_holo_light:I = 0x7f080043
 
-.field public static final abc_list_selector_background_transition_holo_dark:I = 0x7f080045
+.field public static final abc_list_selector_background_transition_holo_dark:I = 0x7f080044
 
-.field public static final abc_list_selector_background_transition_holo_light:I = 0x7f080046
+.field public static final abc_list_selector_background_transition_holo_light:I = 0x7f080045
 
-.field public static final abc_list_selector_disabled_holo_dark:I = 0x7f080047
+.field public static final abc_list_selector_disabled_holo_dark:I = 0x7f080046
 
-.field public static final abc_list_selector_disabled_holo_light:I = 0x7f080048
+.field public static final abc_list_selector_disabled_holo_light:I = 0x7f080047
 
-.field public static final abc_list_selector_holo_dark:I = 0x7f080049
+.field public static final abc_list_selector_holo_dark:I = 0x7f080048
 
-.field public static final abc_list_selector_holo_light:I = 0x7f08004a
+.field public static final abc_list_selector_holo_light:I = 0x7f080049
 
-.field public static final abc_menu_hardkey_panel_mtrl_mult:I = 0x7f08004b
+.field public static final abc_menu_hardkey_panel_mtrl_mult:I = 0x7f08004a
 
-.field public static final abc_popup_background_mtrl_mult:I = 0x7f08004c
+.field public static final abc_popup_background_mtrl_mult:I = 0x7f08004b
 
-.field public static final abc_ratingbar_indicator_material:I = 0x7f08004d
+.field public static final abc_ratingbar_indicator_material:I = 0x7f08004c
 
-.field public static final abc_ratingbar_material:I = 0x7f08004e
+.field public static final abc_ratingbar_material:I = 0x7f08004d
 
-.field public static final abc_ratingbar_small_material:I = 0x7f08004f
+.field public static final abc_ratingbar_small_material:I = 0x7f08004e
 
-.field public static final abc_scrubber_control_off_mtrl_alpha:I = 0x7f080050
+.field public static final abc_scrubber_control_off_mtrl_alpha:I = 0x7f08004f
 
-.field public static final abc_scrubber_control_to_pressed_mtrl_000:I = 0x7f080051
+.field public static final abc_scrubber_control_to_pressed_mtrl_000:I = 0x7f080050
 
-.field public static final abc_scrubber_control_to_pressed_mtrl_005:I = 0x7f080052
+.field public static final abc_scrubber_control_to_pressed_mtrl_005:I = 0x7f080051
 
-.field public static final abc_scrubber_primary_mtrl_alpha:I = 0x7f080053
+.field public static final abc_scrubber_primary_mtrl_alpha:I = 0x7f080052
 
-.field public static final abc_scrubber_track_mtrl_alpha:I = 0x7f080054
+.field public static final abc_scrubber_track_mtrl_alpha:I = 0x7f080053
 
-.field public static final abc_seekbar_thumb_material:I = 0x7f080055
+.field public static final abc_seekbar_thumb_material:I = 0x7f080054
 
-.field public static final abc_seekbar_tick_mark_material:I = 0x7f080056
+.field public static final abc_seekbar_tick_mark_material:I = 0x7f080055
 
-.field public static final abc_seekbar_track_material:I = 0x7f080057
+.field public static final abc_seekbar_track_material:I = 0x7f080056
 
-.field public static final abc_spinner_mtrl_am_alpha:I = 0x7f080058
+.field public static final abc_spinner_mtrl_am_alpha:I = 0x7f080057
 
-.field public static final abc_spinner_textfield_background_material:I = 0x7f080059
+.field public static final abc_spinner_textfield_background_material:I = 0x7f080058
 
-.field public static final abc_switch_thumb_material:I = 0x7f08005a
+.field public static final abc_switch_thumb_material:I = 0x7f080059
 
-.field public static final abc_switch_track_mtrl_alpha:I = 0x7f08005b
+.field public static final abc_switch_track_mtrl_alpha:I = 0x7f08005a
 
-.field public static final abc_tab_indicator_material:I = 0x7f08005c
+.field public static final abc_tab_indicator_material:I = 0x7f08005b
 
-.field public static final abc_tab_indicator_mtrl_alpha:I = 0x7f08005d
+.field public static final abc_tab_indicator_mtrl_alpha:I = 0x7f08005c
 
-.field public static final abc_text_cursor_material:I = 0x7f08005e
+.field public static final abc_text_cursor_material:I = 0x7f08005d
 
-.field public static final abc_text_select_handle_left_mtrl_dark:I = 0x7f08005f
+.field public static final abc_text_select_handle_left_mtrl_dark:I = 0x7f08005e
 
-.field public static final abc_text_select_handle_left_mtrl_light:I = 0x7f080060
+.field public static final abc_text_select_handle_left_mtrl_light:I = 0x7f08005f
 
-.field public static final abc_text_select_handle_middle_mtrl_dark:I = 0x7f080061
+.field public static final abc_text_select_handle_middle_mtrl_dark:I = 0x7f080060
 
-.field public static final abc_text_select_handle_middle_mtrl_light:I = 0x7f080062
+.field public static final abc_text_select_handle_middle_mtrl_light:I = 0x7f080061
 
-.field public static final abc_text_select_handle_right_mtrl_dark:I = 0x7f080063
+.field public static final abc_text_select_handle_right_mtrl_dark:I = 0x7f080062
 
-.field public static final abc_text_select_handle_right_mtrl_light:I = 0x7f080064
+.field public static final abc_text_select_handle_right_mtrl_light:I = 0x7f080063
 
-.field public static final abc_textfield_activated_mtrl_alpha:I = 0x7f080065
+.field public static final abc_textfield_activated_mtrl_alpha:I = 0x7f080064
 
-.field public static final abc_textfield_default_mtrl_alpha:I = 0x7f080066
+.field public static final abc_textfield_default_mtrl_alpha:I = 0x7f080065
 
-.field public static final abc_textfield_search_activated_mtrl_alpha:I = 0x7f080067
+.field public static final abc_textfield_search_activated_mtrl_alpha:I = 0x7f080066
 
-.field public static final abc_textfield_search_default_mtrl_alpha:I = 0x7f080068
+.field public static final abc_textfield_search_default_mtrl_alpha:I = 0x7f080067
 
-.field public static final abc_textfield_search_material:I = 0x7f080069
+.field public static final abc_textfield_search_material:I = 0x7f080068
 
-.field public static final abc_vector_test:I = 0x7f08006a
+.field public static final abc_vector_test:I = 0x7f080069
 
-.field public static final notification_action_background:I = 0x7f080472
+.field public static final notification_action_background:I = 0x7f080463
 
-.field public static final notification_bg:I = 0x7f080473
+.field public static final notification_bg:I = 0x7f080464
 
-.field public static final notification_bg_low:I = 0x7f080474
+.field public static final notification_bg_low:I = 0x7f080465
 
-.field public static final notification_bg_low_normal:I = 0x7f080475
+.field public static final notification_bg_low_normal:I = 0x7f080466
 
-.field public static final notification_bg_low_pressed:I = 0x7f080476
+.field public static final notification_bg_low_pressed:I = 0x7f080467
 
-.field public static final notification_bg_normal:I = 0x7f080477
+.field public static final notification_bg_normal:I = 0x7f080468
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080478
+.field public static final notification_bg_normal_pressed:I = 0x7f080469
 
-.field public static final notification_icon_background:I = 0x7f080479
+.field public static final notification_icon_background:I = 0x7f08046a
 
-.field public static final notification_template_icon_bg:I = 0x7f08047a
+.field public static final notification_template_icon_bg:I = 0x7f08046b
 
-.field public static final notification_template_icon_low_bg:I = 0x7f08047b
+.field public static final notification_template_icon_low_bg:I = 0x7f08046c
 
-.field public static final notification_tile_bg:I = 0x7f08047c
+.field public static final notification_tile_bg:I = 0x7f08046d
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08047d
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08046e
 
-.field public static final tooltip_frame_dark:I = 0x7f080485
+.field public static final tooltip_frame_dark:I = 0x7f080476
 
-.field public static final tooltip_frame_light:I = 0x7f080486
+.field public static final tooltip_frame_light:I = 0x7f080477
 
-.field public static final ucrop_ic_angle:I = 0x7f080488
+.field public static final ucrop_ic_angle:I = 0x7f080479
 
-.field public static final ucrop_ic_crop:I = 0x7f080489
+.field public static final ucrop_ic_crop:I = 0x7f08047a
 
-.field public static final ucrop_ic_cross:I = 0x7f08048a
+.field public static final ucrop_ic_cross:I = 0x7f08047b
 
-.field public static final ucrop_ic_done:I = 0x7f08048b
+.field public static final ucrop_ic_done:I = 0x7f08047c
 
-.field public static final ucrop_ic_next:I = 0x7f08048c
+.field public static final ucrop_ic_next:I = 0x7f08047d
 
-.field public static final ucrop_ic_reset:I = 0x7f08048d
+.field public static final ucrop_ic_reset:I = 0x7f08047e
 
-.field public static final ucrop_ic_rotate:I = 0x7f08048e
+.field public static final ucrop_ic_rotate:I = 0x7f08047f
 
-.field public static final ucrop_ic_scale:I = 0x7f08048f
+.field public static final ucrop_ic_scale:I = 0x7f080480
 
-.field public static final ucrop_shadow_upside:I = 0x7f080490
+.field public static final ucrop_shadow_upside:I = 0x7f080481
 
-.field public static final ucrop_vector_ic_crop:I = 0x7f080491
+.field public static final ucrop_vector_ic_crop:I = 0x7f080482
 
-.field public static final ucrop_vector_loader:I = 0x7f080492
+.field public static final ucrop_vector_loader:I = 0x7f080483
 
-.field public static final ucrop_vector_loader_animated:I = 0x7f080493
+.field public static final ucrop_vector_loader_animated:I = 0x7f080484
 
 
 # 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 e6da8e3944..f34c9cfc57 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 = 0x7f0a0080
+.field public static final async:I = 0x7f0a007f
 
-.field public static final blocking:I = 0x7f0a00ce
+.field public static final blocking:I = 0x7f0a00cd
 
 .field public static final bottom:I = 0x7f0a0105
 
@@ -69,207 +69,207 @@
 
 .field public static final chronometer:I = 0x7f0a0215
 
-.field public static final contentPanel:I = 0x7f0a0235
+.field public static final contentPanel:I = 0x7f0a0234
 
-.field public static final custom:I = 0x7f0a0252
+.field public static final custom:I = 0x7f0a0251
 
-.field public static final customPanel:I = 0x7f0a0253
+.field public static final customPanel:I = 0x7f0a0252
 
-.field public static final decor_content_parent:I = 0x7f0a0257
+.field public static final decor_content_parent:I = 0x7f0a0256
 
-.field public static final default_activity_button:I = 0x7f0a0258
+.field public static final default_activity_button:I = 0x7f0a0257
 
-.field public static final edit_query:I = 0x7f0a02ae
+.field public static final edit_query:I = 0x7f0a02ad
 
-.field public static final end:I = 0x7f0a02c9
+.field public static final end:I = 0x7f0a02c8
 
-.field public static final expand_activities_button:I = 0x7f0a02ce
+.field public static final expand_activities_button:I = 0x7f0a02cd
 
-.field public static final expanded_menu:I = 0x7f0a02cf
+.field public static final expanded_menu:I = 0x7f0a02ce
 
-.field public static final forever:I = 0x7f0a02f2
+.field public static final forever:I = 0x7f0a02f1
 
-.field public static final home:I = 0x7f0a0394
+.field public static final home:I = 0x7f0a038f
 
-.field public static final icon:I = 0x7f0a0396
+.field public static final icon:I = 0x7f0a0391
 
-.field public static final icon_group:I = 0x7f0a0397
+.field public static final icon_group:I = 0x7f0a0392
 
-.field public static final image:I = 0x7f0a039a
+.field public static final image:I = 0x7f0a0395
 
-.field public static final image_view_crop:I = 0x7f0a039c
+.field public static final image_view_crop:I = 0x7f0a0397
 
-.field public static final image_view_logo:I = 0x7f0a039d
+.field public static final image_view_logo:I = 0x7f0a0398
 
-.field public static final image_view_state_aspect_ratio:I = 0x7f0a039e
+.field public static final image_view_state_aspect_ratio:I = 0x7f0a0399
 
-.field public static final image_view_state_rotate:I = 0x7f0a039f
+.field public static final image_view_state_rotate:I = 0x7f0a039a
 
-.field public static final image_view_state_scale:I = 0x7f0a03a0
+.field public static final image_view_state_scale:I = 0x7f0a039b
 
-.field public static final info:I = 0x7f0a03ac
+.field public static final info:I = 0x7f0a03a7
 
-.field public static final italic:I = 0x7f0a03d9
+.field public static final italic:I = 0x7f0a03d4
 
-.field public static final layout_aspect_ratio:I = 0x7f0a0418
+.field public static final layout_aspect_ratio:I = 0x7f0a0413
 
-.field public static final layout_rotate_wheel:I = 0x7f0a0419
+.field public static final layout_rotate_wheel:I = 0x7f0a0414
 
-.field public static final layout_scale_wheel:I = 0x7f0a041a
+.field public static final layout_scale_wheel:I = 0x7f0a0415
 
-.field public static final left:I = 0x7f0a041b
+.field public static final left:I = 0x7f0a0416
 
-.field public static final line1:I = 0x7f0a041d
+.field public static final line1:I = 0x7f0a0418
 
-.field public static final line3:I = 0x7f0a041e
+.field public static final line3:I = 0x7f0a0419
 
-.field public static final listMode:I = 0x7f0a0420
+.field public static final listMode:I = 0x7f0a041b
 
-.field public static final list_item:I = 0x7f0a0421
+.field public static final list_item:I = 0x7f0a041c
 
-.field public static final menu_crop:I = 0x7f0a045e
+.field public static final menu_crop:I = 0x7f0a0459
 
-.field public static final menu_loader:I = 0x7f0a046a
+.field public static final menu_loader:I = 0x7f0a0465
 
-.field public static final message:I = 0x7f0a0485
+.field public static final message:I = 0x7f0a0478
 
-.field public static final multiply:I = 0x7f0a048d
+.field public static final multiply:I = 0x7f0a0480
 
-.field public static final none:I = 0x7f0a04a2
+.field public static final none:I = 0x7f0a0495
 
-.field public static final normal:I = 0x7f0a04a3
+.field public static final normal:I = 0x7f0a0496
 
-.field public static final notification_background:I = 0x7f0a04ad
+.field public static final notification_background:I = 0x7f0a04a0
 
-.field public static final notification_main_column:I = 0x7f0a04ae
+.field public static final notification_main_column:I = 0x7f0a04a1
 
-.field public static final notification_main_column_container:I = 0x7f0a04af
+.field public static final notification_main_column_container:I = 0x7f0a04a2
 
-.field public static final parentPanel:I = 0x7f0a04e2
+.field public static final parentPanel:I = 0x7f0a04d5
 
-.field public static final progress_circular:I = 0x7f0a055c
+.field public static final progress_circular:I = 0x7f0a054d
 
-.field public static final progress_horizontal:I = 0x7f0a055e
+.field public static final progress_horizontal:I = 0x7f0a054f
 
-.field public static final radio:I = 0x7f0a0569
+.field public static final radio:I = 0x7f0a055a
 
-.field public static final right:I = 0x7f0a058c
+.field public static final right:I = 0x7f0a0573
 
-.field public static final right_icon:I = 0x7f0a058d
+.field public static final right_icon:I = 0x7f0a0574
 
-.field public static final right_side:I = 0x7f0a058e
+.field public static final right_side:I = 0x7f0a0575
 
-.field public static final rotate_scroll_wheel:I = 0x7f0a05b5
+.field public static final rotate_scroll_wheel:I = 0x7f0a059c
 
-.field public static final scale_scroll_wheel:I = 0x7f0a05bb
+.field public static final scale_scroll_wheel:I = 0x7f0a05a2
 
-.field public static final screen:I = 0x7f0a05bc
+.field public static final screen:I = 0x7f0a05a3
 
-.field public static final scrollIndicatorDown:I = 0x7f0a05be
+.field public static final scrollIndicatorDown:I = 0x7f0a05a5
 
-.field public static final scrollIndicatorUp:I = 0x7f0a05bf
+.field public static final scrollIndicatorUp:I = 0x7f0a05a6
 
-.field public static final scrollView:I = 0x7f0a05c0
+.field public static final scrollView:I = 0x7f0a05a7
 
-.field public static final search_badge:I = 0x7f0a05c4
+.field public static final search_badge:I = 0x7f0a05ab
 
-.field public static final search_bar:I = 0x7f0a05c5
+.field public static final search_bar:I = 0x7f0a05ac
 
-.field public static final search_button:I = 0x7f0a05c6
+.field public static final search_button:I = 0x7f0a05ad
 
-.field public static final search_close_btn:I = 0x7f0a05c8
+.field public static final search_close_btn:I = 0x7f0a05af
 
-.field public static final search_edit_frame:I = 0x7f0a05c9
+.field public static final search_edit_frame:I = 0x7f0a05b0
 
-.field public static final search_go_btn:I = 0x7f0a05cc
+.field public static final search_go_btn:I = 0x7f0a05b3
 
-.field public static final search_mag_icon:I = 0x7f0a05ce
+.field public static final search_mag_icon:I = 0x7f0a05b5
 
-.field public static final search_plate:I = 0x7f0a05cf
+.field public static final search_plate:I = 0x7f0a05b6
 
-.field public static final search_src_text:I = 0x7f0a05d2
+.field public static final search_src_text:I = 0x7f0a05b9
 
-.field public static final search_voice_btn:I = 0x7f0a05de
+.field public static final search_voice_btn:I = 0x7f0a05c5
 
-.field public static final select_dialog_listview:I = 0x7f0a05df
+.field public static final select_dialog_listview:I = 0x7f0a05c6
 
-.field public static final shortcut:I = 0x7f0a0719
+.field public static final shortcut:I = 0x7f0a0700
 
-.field public static final spacer:I = 0x7f0a0725
+.field public static final spacer:I = 0x7f0a070c
 
-.field public static final split_action_bar:I = 0x7f0a072c
+.field public static final split_action_bar:I = 0x7f0a070d
 
-.field public static final src_atop:I = 0x7f0a072f
+.field public static final src_atop:I = 0x7f0a0710
 
-.field public static final src_in:I = 0x7f0a0730
+.field public static final src_in:I = 0x7f0a0711
 
-.field public static final src_over:I = 0x7f0a0731
+.field public static final src_over:I = 0x7f0a0712
 
-.field public static final start:I = 0x7f0a0734
+.field public static final start:I = 0x7f0a0715
 
-.field public static final state_aspect_ratio:I = 0x7f0a0735
+.field public static final state_aspect_ratio:I = 0x7f0a0716
 
-.field public static final state_rotate:I = 0x7f0a0736
+.field public static final state_rotate:I = 0x7f0a0717
 
-.field public static final state_scale:I = 0x7f0a0737
+.field public static final state_scale:I = 0x7f0a0718
 
-.field public static final submenuarrow:I = 0x7f0a0755
+.field public static final submenuarrow:I = 0x7f0a072d
 
-.field public static final submit_area:I = 0x7f0a0756
+.field public static final submit_area:I = 0x7f0a072e
 
-.field public static final tabMode:I = 0x7f0a0761
+.field public static final tabMode:I = 0x7f0a0739
 
-.field public static final tag_transition_group:I = 0x7f0a0767
+.field public static final tag_transition_group:I = 0x7f0a073f
 
-.field public static final text:I = 0x7f0a076f
+.field public static final text:I = 0x7f0a0747
 
-.field public static final text2:I = 0x7f0a0770
+.field public static final text2:I = 0x7f0a0748
 
-.field public static final textSpacerNoButtons:I = 0x7f0a0771
+.field public static final textSpacerNoButtons:I = 0x7f0a0749
 
-.field public static final textSpacerNoTitle:I = 0x7f0a0772
+.field public static final textSpacerNoTitle:I = 0x7f0a074a
 
-.field public static final text_view_rotate:I = 0x7f0a0776
+.field public static final text_view_rotate:I = 0x7f0a074e
 
-.field public static final text_view_scale:I = 0x7f0a0777
+.field public static final text_view_scale:I = 0x7f0a074f
 
-.field public static final time:I = 0x7f0a077d
+.field public static final time:I = 0x7f0a0755
 
-.field public static final title:I = 0x7f0a077e
+.field public static final title:I = 0x7f0a0756
 
-.field public static final titleDividerNoCustom:I = 0x7f0a077f
+.field public static final titleDividerNoCustom:I = 0x7f0a0757
 
-.field public static final title_template:I = 0x7f0a0780
+.field public static final title_template:I = 0x7f0a0758
 
-.field public static final toolbar:I = 0x7f0a0781
+.field public static final toolbar:I = 0x7f0a0759
 
-.field public static final toolbar_title:I = 0x7f0a0783
+.field public static final toolbar_title:I = 0x7f0a075b
 
-.field public static final top:I = 0x7f0a0785
+.field public static final top:I = 0x7f0a075d
 
-.field public static final topPanel:I = 0x7f0a0786
+.field public static final topPanel:I = 0x7f0a075e
 
-.field public static final ucrop:I = 0x7f0a0792
+.field public static final ucrop:I = 0x7f0a076a
 
-.field public static final ucrop_frame:I = 0x7f0a0793
+.field public static final ucrop_frame:I = 0x7f0a076b
 
-.field public static final ucrop_photobox:I = 0x7f0a0794
+.field public static final ucrop_photobox:I = 0x7f0a076c
 
-.field public static final uniform:I = 0x7f0a0799
+.field public static final uniform:I = 0x7f0a0771
 
-.field public static final up:I = 0x7f0a079c
+.field public static final up:I = 0x7f0a0774
 
-.field public static final view_overlay:I = 0x7f0a082f
+.field public static final view_overlay:I = 0x7f0a07f5
 
-.field public static final wrap_content:I = 0x7f0a0881
+.field public static final wrap_content:I = 0x7f0a0846
 
-.field public static final wrapper_controls:I = 0x7f0a0883
+.field public static final wrapper_controls:I = 0x7f0a0848
 
-.field public static final wrapper_reset_rotate:I = 0x7f0a0884
+.field public static final wrapper_reset_rotate:I = 0x7f0a0849
 
-.field public static final wrapper_rotate_by_angle:I = 0x7f0a0885
+.field public static final wrapper_rotate_by_angle:I = 0x7f0a084a
 
-.field public static final wrapper_states:I = 0x7f0a0886
+.field public static final wrapper_states:I = 0x7f0a084b
 
 
 # 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 34725afd41..ab4c66949f 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/R$e.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/R$e.smali
@@ -87,21 +87,21 @@
 
 .field public static final select_dialog_singlechoice_material:I = 0x7f0d005a
 
-.field public static final support_simple_spinner_dropdown_item:I = 0x7f0d0062
+.field public static final support_simple_spinner_dropdown_item:I = 0x7f0d0061
 
-.field public static final ucrop_activity_photobox:I = 0x7f0d0064
+.field public static final ucrop_activity_photobox:I = 0x7f0d0063
 
-.field public static final ucrop_aspect_ratio:I = 0x7f0d0065
+.field public static final ucrop_aspect_ratio:I = 0x7f0d0064
 
-.field public static final ucrop_controls:I = 0x7f0d0066
+.field public static final ucrop_controls:I = 0x7f0d0065
 
-.field public static final ucrop_fragment_photobox:I = 0x7f0d0067
+.field public static final ucrop_fragment_photobox:I = 0x7f0d0066
 
-.field public static final ucrop_layout_rotate_wheel:I = 0x7f0d0068
+.field public static final ucrop_layout_rotate_wheel:I = 0x7f0d0067
 
-.field public static final ucrop_layout_scale_wheel:I = 0x7f0d0069
+.field public static final ucrop_layout_scale_wheel:I = 0x7f0d0068
 
-.field public static final ucrop_view:I = 0x7f0d006a
+.field public static final ucrop_view:I = 0x7f0d0069
 
 
 # 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 5ed88c5389..da2eb71c42 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 = 0x7f0e0021
+.field public static final ucrop_menu_activity:I = 0x7f0e001b
 
 
 # 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 e8ef4de2ff..8b773beaf4 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 = 0x7f121098
+.field public static final search_menu_title:I = 0x7f12100c
 
-.field public static final status_bar_notification_info_overflow:I = 0x7f121165
+.field public static final status_bar_notification_info_overflow:I = 0x7f1210d9
 
-.field public static final ucrop_error_input_data_is_absent:I = 0x7f12129c
+.field public static final ucrop_error_input_data_is_absent:I = 0x7f12120f
 
-.field public static final ucrop_label_edit_photo:I = 0x7f12129d
+.field public static final ucrop_label_edit_photo:I = 0x7f121210
 
-.field public static final ucrop_label_original:I = 0x7f12129e
+.field public static final ucrop_label_original:I = 0x7f121211
 
-.field public static final ucrop_menu_crop:I = 0x7f12129f
+.field public static final ucrop_menu_crop:I = 0x7f121212
 
-.field public static final ucrop_mutate_exception_hint:I = 0x7f1212a0
+.field public static final ucrop_mutate_exception_hint:I = 0x7f121213
 
 
 # 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 c7123240a9..2a9dd8e6a3 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, 0x7f040315
+    const v2, 0x7f040314
 
     aput v2, v1, v3
 
@@ -1190,15 +1190,15 @@
         0x7f0401d6
         0x7f0401f9
         0x7f040203
-        0x7f040267
-        0x7f040283
-        0x7f04029b
+        0x7f040266
+        0x7f040282
+        0x7f04029a
+        0x7f0402c8
         0x7f0402c9
-        0x7f0402ca
-        0x7f040323
-        0x7f040326
-        0x7f0403bf
-        0x7f0403c9
+        0x7f040322
+        0x7f040325
+        0x7f0403be
+        0x7f0403c8
     .end array-data
 
     :array_1
@@ -1207,8 +1207,8 @@
         0x7f04004c
         0x7f0400b3
         0x7f04015c
-        0x7f040326
-        0x7f0403c9
+        0x7f040325
+        0x7f0403c8
     .end array-data
 
     :array_2
@@ -1222,27 +1222,27 @@
         0x10100f2
         0x7f040079
         0x7f04007a
+        0x7f04025d
         0x7f04025e
-        0x7f04025f
-        0x7f040280
+        0x7f04027f
+        0x7f040307
         0x7f040308
-        0x7f040309
     .end array-data
 
     :array_4
     .array-data 4
         0x1010119
-        0x7f040313
+        0x7f040312
+        0x7f0403bc
         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
-        0x7f04025a
-        0x7f040349
+        0x7f040259
+        0x7f040348
     .end array-data
 
     :array_8
@@ -1344,41 +1344,41 @@
         0x7f040119
         0x7f040168
         0x7f0401e1
+        0x7f04025b
         0x7f04025c
-        0x7f04025d
+        0x7f04025f
         0x7f040260
         0x7f040261
         0x7f040262
         0x7f040263
         0x7f040264
         0x7f040265
-        0x7f040266
+        0x7f04028f
         0x7f040290
         0x7f040291
-        0x7f040292
-        0x7f04029a
-        0x7f04029c
-        0x7f0402cf
+        0x7f040299
+        0x7f04029b
+        0x7f0402ce
+        0x7f0402d1
         0x7f0402d2
         0x7f0402d3
-        0x7f0402d4
-        0x7f0402fb
+        0x7f0402fa
+        0x7f0402fc
         0x7f0402fd
         0x7f0402fe
-        0x7f0402ff
+        0x7f04030f
         0x7f040310
-        0x7f040311
-        0x7f04032a
+        0x7f040329
+        0x7f040353
         0x7f040354
         0x7f040355
         0x7f040356
-        0x7f040357
+        0x7f040358
         0x7f040359
         0x7f04035a
         0x7f04035b
-        0x7f04035c
+        0x7f04035e
         0x7f04035f
-        0x7f040360
         0x7f0403cb
         0x7f0403cc
         0x7f0403cd
@@ -1413,7 +1413,7 @@
     :array_b
     .array-data 4
         0x7f04020a
-        0x7f04031a
+        0x7f040319
     .end array-data
 
     :array_c
@@ -1435,8 +1435,8 @@
         0x7f0400b8
         0x7f040112
         0x7f040150
-        0x7f04030f
-        0x7f0403b6
+        0x7f04030e
+        0x7f0403b5
     .end array-data
 
     :array_e
@@ -1472,8 +1472,8 @@
         0x1010128
         0x7f04010b
         0x7f040110
-        0x7f04027e
-        0x7f040305
+        0x7f04027d
+        0x7f040304
     .end array-data
 
     :array_11
@@ -1522,8 +1522,8 @@
         0x7f0400ce
         0x7f0401dc
         0x7f0401dd
-        0x7f040287
-        0x7f040301
+        0x7f040286
+        0x7f040300
         0x7f0403cf
     .end array-data
 
@@ -1536,21 +1536,21 @@
         0x101012f
         0x1010130
         0x1010131
-        0x7f04029d
-        0x7f040321
+        0x7f04029c
+        0x7f040320
     .end array-data
 
     :array_16
     .array-data 4
         0x1010176
         0x10102c9
-        0x7f040288
+        0x7f040287
     .end array-data
 
     :array_17
     .array-data 4
-        0x7f04028c
-        0x7f04028f
+        0x7f04028b
+        0x7f04028e
     .end array-data
 
     :array_18
@@ -1565,12 +1565,12 @@
         0x7f040155
         0x7f0401de
         0x7f04020d
+        0x7f0402cc
         0x7f0402cd
-        0x7f0402ce
+        0x7f0402f8
         0x7f0402f9
-        0x7f0402fa
-        0x7f040322
-        0x7f040327
+        0x7f040321
+        0x7f040326
         0x7f0403ef
     .end array-data
 
@@ -1580,7 +1580,7 @@
         0x1010176
         0x101017b
         0x1010262
-        0x7f04029b
+        0x7f04029a
     .end array-data
 
     :array_1a
@@ -1588,14 +1588,14 @@
         0x1010124
         0x1010125
         0x1010142
-        0x7f040307
-        0x7f040312
+        0x7f040306
+        0x7f040311
+        0x7f040327
         0x7f040328
-        0x7f040329
-        0x7f04032b
+        0x7f04032a
+        0x7f0403b6
         0x7f0403b7
         0x7f0403b8
-        0x7f0403b9
         0x7f0403d0
         0x7f0403d1
         0x7f0403d2
@@ -1615,7 +1615,7 @@
         0x1010164
         0x10103ac
         0x7f040145
-        0x7f040349
+        0x7f040348
     .end array-data
 
     :array_1c
@@ -1631,16 +1631,17 @@
         0x7f0400d2
         0x7f0400d3
         0x7f0400d4
+        0x7f040266
         0x7f040267
-        0x7f040268
-        0x7f04027b
+        0x7f04027a
+        0x7f040280
         0x7f040281
-        0x7f040282
-        0x7f04029b
+        0x7f04029a
+        0x7f040322
         0x7f040323
         0x7f040324
-        0x7f040325
-        0x7f0403bf
+        0x7f0403be
+        0x7f0403c0
         0x7f0403c1
         0x7f0403c2
         0x7f0403c3
@@ -1648,16 +1649,15 @@
         0x7f0403c5
         0x7f0403c6
         0x7f0403c7
-        0x7f0403c8
     .end array-data
 
     :array_1d
     .array-data 4
         0x1010000
         0x10100da
+        0x7f04028c
         0x7f04028d
-        0x7f04028e
-        0x7f040365
+        0x7f040364
     .end array-data
 
     :array_1e
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 f1c2ec0dcb..bc09bc0777 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 aYL:Lcom/yalantis/ucrop/UCropActivity;
+.field final synthetic aYH: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;->aYL:Lcom/yalantis/ucrop/UCropActivity;
+    iput-object p1, p0, Lcom/yalantis/ucrop/UCropActivity$1;->aYH:Lcom/yalantis/ucrop/UCropActivity;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -34,10 +34,10 @@
 
 
 # virtual methods
-.method public final Bp()V
+.method public final Bn()V
     .locals 3
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$1;->aYL:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$1;->aYH: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;->aYL:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$1;->aYH: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;->aYL:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$1;->aYH: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;->aYL:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$1;->aYH: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;->aYL:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$1;->aYH: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;->aYL:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object p1, p0, Lcom/yalantis/ucrop/UCropActivity$1;->aYH: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;->aYL:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$1;->aYH: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;->aYL:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$1;->aYH: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 bf7a6800f4..8ed29ec9e0 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 aYL:Lcom/yalantis/ucrop/UCropActivity;
+.field final synthetic aYH: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;->aYL:Lcom/yalantis/ucrop/UCropActivity;
+    iput-object p1, p0, Lcom/yalantis/ucrop/UCropActivity$2;->aYH: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;->aYL:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$2;->aYH: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;->mU:F
+    iget v3, v1, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->mV:F
 
     const/4 v4, 0x0
 
@@ -69,31 +69,31 @@
 
     if-eqz v3, :cond_0
 
-    iget v3, v1, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->aYN:F
+    iget v3, v1, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->aYJ:F
 
-    iget v4, v1, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->aYO:F
+    iget v4, v1, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->aYK:F
 
-    iput v4, v1, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->aYN:F
+    iput v4, v1, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->aYJ:F
 
-    iput v3, v1, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->aYO:F
+    iput v3, v1, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->aYK:F
 
-    iget v3, v1, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->aYN:F
+    iget v3, v1, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->aYJ:F
 
-    iget v4, v1, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->aYO:F
+    iget v4, v1, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->aYK:F
 
     div-float/2addr v3, v4
 
-    iput v3, v1, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->mU:F
+    iput v3, v1, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->mV:F
 
     :cond_0
-    invoke-virtual {v1}, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->BC()V
+    invoke-virtual {v1}, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->BA()V
 
     :cond_1
-    iget v1, v1, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->mU:F
+    iget v1, v1, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->mV:F
 
     invoke-virtual {v0, v1}, Lcom/yalantis/ucrop/view/GestureCropImageView;->setTargetAspectRatio(F)V
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$2;->aYL:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$2;->aYH: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;->aYL:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$2;->aYH: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 f55a1c54e5..263fd0ddaa 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 aYL:Lcom/yalantis/ucrop/UCropActivity;
+.field final synthetic aYH: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;->aYL:Lcom/yalantis/ucrop/UCropActivity;
+    iput-object p1, p0, Lcom/yalantis/ucrop/UCropActivity$3;->aYH: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;->aYL:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$3;->aYH: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 Bq()V
+.method public final Bo()V
     .locals 2
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$3;->aYL:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$3;->aYH: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 Br()V
+.method public final Bp()V
     .locals 1
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$3;->aYL:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$3;->aYH: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;->By()V
+    invoke-virtual {v0}, Lcom/yalantis/ucrop/view/GestureCropImageView;->Bw()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 1246360c92..393c4e7ab0 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 aYL:Lcom/yalantis/ucrop/UCropActivity;
+.field final synthetic aYH: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;->aYL:Lcom/yalantis/ucrop/UCropActivity;
+    iput-object p1, p0, Lcom/yalantis/ucrop/UCropActivity$4;->aYH: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;->aYL:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object p1, p0, Lcom/yalantis/ucrop/UCropActivity$4;->aYH: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 5b8a920a52..3cd4cdb4f9 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 aYL:Lcom/yalantis/ucrop/UCropActivity;
+.field final synthetic aYH: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;->aYL:Lcom/yalantis/ucrop/UCropActivity;
+    iput-object p1, p0, Lcom/yalantis/ucrop/UCropActivity$5;->aYH: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;->aYL:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object p1, p0, Lcom/yalantis/ucrop/UCropActivity$5;->aYH: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 2ce8de3943..14fd3c3710 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 aYL:Lcom/yalantis/ucrop/UCropActivity;
+.field final synthetic aYH: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;->aYL:Lcom/yalantis/ucrop/UCropActivity;
+    iput-object p1, p0, Lcom/yalantis/ucrop/UCropActivity$6;->aYH: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;->aYL:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object v1, p0, Lcom/yalantis/ucrop/UCropActivity$6;->aYH: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;->aYL:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object v2, p0, Lcom/yalantis/ucrop/UCropActivity$6;->aYH: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;->aYL:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object v3, p0, Lcom/yalantis/ucrop/UCropActivity$6;->aYH: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;->aYL:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object v4, p0, Lcom/yalantis/ucrop/UCropActivity$6;->aYH: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;->aYW:Landroid/graphics/RectF;
+    iget-object p1, v1, Lcom/yalantis/ucrop/view/a;->aYS:Landroid/graphics/RectF;
 
     invoke-virtual {p1}, Landroid/graphics/RectF;->centerX()F
 
     move-result p1
 
-    iget-object v0, v1, Lcom/yalantis/ucrop/view/a;->aYW:Landroid/graphics/RectF;
+    iget-object v0, v1, Lcom/yalantis/ucrop/view/a;->aYS: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;->aYL:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object v1, p0, Lcom/yalantis/ucrop/UCropActivity$6;->aYH: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;->aYL:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object v2, p0, Lcom/yalantis/ucrop/UCropActivity$6;->aYH: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;->aYL:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object v3, p0, Lcom/yalantis/ucrop/UCropActivity$6;->aYH: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;->aYL:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object v4, p0, Lcom/yalantis/ucrop/UCropActivity$6;->aYH: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;->aYW:Landroid/graphics/RectF;
+    iget-object p1, v1, Lcom/yalantis/ucrop/view/a;->aYS:Landroid/graphics/RectF;
 
     invoke-virtual {p1}, Landroid/graphics/RectF;->centerX()F
 
     move-result p1
 
-    iget-object v0, v1, Lcom/yalantis/ucrop/view/a;->aYW:Landroid/graphics/RectF;
+    iget-object v0, v1, Lcom/yalantis/ucrop/view/a;->aYS:Landroid/graphics/RectF;
 
     invoke-virtual {v0}, Landroid/graphics/RectF;->centerY()F
 
@@ -182,10 +182,10 @@
     return-void
 .end method
 
-.method public final Bq()V
+.method public final Bo()V
     .locals 2
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$6;->aYL:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$6;->aYH: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 Br()V
+.method public final Bp()V
     .locals 1
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$6;->aYL:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$6;->aYH: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;->By()V
+    invoke-virtual {v0}, Lcom/yalantis/ucrop/view/GestureCropImageView;->Bw()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 defc738a5c..3a4acfb5ca 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 aYL:Lcom/yalantis/ucrop/UCropActivity;
+.field final synthetic aYH: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;->aYL:Lcom/yalantis/ucrop/UCropActivity;
+    iput-object p1, p0, Lcom/yalantis/ucrop/UCropActivity$7;->aYH: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;->aYL:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$7;->aYH: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 7f3ce64cfa..e8cea8269a 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 aYL:Lcom/yalantis/ucrop/UCropActivity;
+.field final synthetic aYH: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;->aYL:Lcom/yalantis/ucrop/UCropActivity;
+    iput-object p1, p0, Lcom/yalantis/ucrop/UCropActivity$8;->aYH: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;->aYL:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$8;->aYH: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;->aYL:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object p1, p0, Lcom/yalantis/ucrop/UCropActivity$8;->aYH: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;->aYL:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$8;->aYH: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;->aYL:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object p1, p0, Lcom/yalantis/ucrop/UCropActivity$8;->aYH: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 179042269a..955dc63147 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/UCropActivity.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/UCropActivity.smali
@@ -4,41 +4,33 @@
 
 
 # static fields
-.field public static final aYh:Landroid/graphics/Bitmap$CompressFormat;
+.field public static final aYd:Landroid/graphics/Bitmap$CompressFormat;
 
 
 # instance fields
-.field private aYA:Landroid/view/ViewGroup;
+.field private aYA:Landroid/widget/TextView;
 
-.field private aYB:Landroid/view/ViewGroup;
+.field private aYB:Landroid/view/View;
 
-.field private aYC:Ljava/util/List;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/List<",
-            "Landroid/view/ViewGroup;",
-            ">;"
-        }
-    .end annotation
-.end field
+.field private aYC:Landroid/graphics/Bitmap$CompressFormat;
 
-.field private aYD:Landroid/widget/TextView;
+.field private aYD:I
 
-.field private aYE:Landroid/widget/TextView;
+.field private aYE:[I
 
-.field private aYF:Landroid/view/View;
+.field private aYF:Lcom/yalantis/ucrop/view/b$a;
 
-.field private aYG:Landroid/graphics/Bitmap$CompressFormat;
+.field private final aYG:Landroid/view/View$OnClickListener;
 
-.field private aYH:I
+.field private aYe:Ljava/lang/String;
 
-.field private aYI:[I
+.field private aYf:I
 
-.field private aYJ:Lcom/yalantis/ucrop/view/b$a;
+.field private aYg:I
 
-.field private final aYK:Landroid/view/View$OnClickListener;
+.field private aYh:I
 
-.field private aYi:Ljava/lang/String;
+.field private aYi:I
 
 .field private aYj:I
 
@@ -48,31 +40,39 @@
 
 .field private aYm:I
 
-.field private aYn:I
+.field private aYn:Z
 
-.field private aYo:I
+.field private aYo:Z
 
-.field private aYp:I
+.field private aYp:Lcom/yalantis/ucrop/view/UCropView;
 
-.field private aYq:I
+.field private aYq:Lcom/yalantis/ucrop/view/GestureCropImageView;
 
-.field private aYr:Z
+.field private aYr:Lcom/yalantis/ucrop/view/OverlayView;
 
-.field private aYs:Z
+.field private aYs:Landroid/view/ViewGroup;
 
-.field private aYt:Lcom/yalantis/ucrop/view/UCropView;
+.field private aYt:Landroid/view/ViewGroup;
 
-.field private aYu:Lcom/yalantis/ucrop/view/GestureCropImageView;
+.field private aYu:Landroid/view/ViewGroup;
 
-.field private aYv:Lcom/yalantis/ucrop/view/OverlayView;
+.field private aYv:Landroid/view/ViewGroup;
 
 .field private aYw:Landroid/view/ViewGroup;
 
 .field private aYx:Landroid/view/ViewGroup;
 
-.field private aYy:Landroid/view/ViewGroup;
+.field private aYy:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "Landroid/view/ViewGroup;",
+            ">;"
+        }
+    .end annotation
+.end field
 
-.field private aYz:Landroid/view/ViewGroup;
+.field private aYz:Landroid/widget/TextView;
 
 
 # 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;->aYh:Landroid/graphics/Bitmap$CompressFormat;
+    sput-object v0, Lcom/yalantis/ucrop/UCropActivity;->aYd:Landroid/graphics/Bitmap$CompressFormat;
 
     return-void
 .end method
@@ -93,21 +93,21 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYs:Z
+    iput-boolean v0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYo:Z
 
     new-instance v0, Ljava/util/ArrayList;
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYC:Ljava/util/List;
+    iput-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYy:Ljava/util/List;
 
-    sget-object v0, Lcom/yalantis/ucrop/UCropActivity;->aYh:Landroid/graphics/Bitmap$CompressFormat;
+    sget-object v0, Lcom/yalantis/ucrop/UCropActivity;->aYd:Landroid/graphics/Bitmap$CompressFormat;
 
-    iput-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYG:Landroid/graphics/Bitmap$CompressFormat;
+    iput-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYC:Landroid/graphics/Bitmap$CompressFormat;
 
     const/16 v0, 0x5a
 
-    iput v0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYH:I
+    iput v0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYD:I
 
     const/4 v0, 0x3
 
@@ -115,19 +115,19 @@
 
     fill-array-data v0, :array_0
 
-    iput-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYI:[I
+    iput-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYE:[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;->aYJ:Lcom/yalantis/ucrop/view/b$a;
+    iput-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYF: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;->aYK:Landroid/view/View$OnClickListener;
+    iput-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYG: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;->aYt:Lcom/yalantis/ucrop/view/UCropView;
+    iget-object p0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYp: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;->aYD:Landroid/widget/TextView;
+    iget-object p0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYz: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;->aYF:Landroid/view/View;
+    iget-object p0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYB: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;->aYE:Landroid/widget/TextView;
+    iget-object p0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYA:Landroid/widget/TextView;
 
     if-eqz p0, :cond_0
 
@@ -244,7 +244,7 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYs:Z
+    iput-boolean v0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYo:Z
 
     return v0
 .end method
@@ -252,14 +252,14 @@
 .method private cJ(I)V
     .locals 5
 
-    iget-boolean v0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYr:Z
+    iget-boolean v0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYn:Z
 
     if-nez v0, :cond_0
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYw:Landroid/view/ViewGroup;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYs: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;->aYx:Landroid/view/ViewGroup;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYt: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;->aYy:Landroid/view/ViewGroup;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYu: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;->aYz:Landroid/view/ViewGroup;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYv: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;->aYA:Landroid/view/ViewGroup;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYw: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;->aYB:Landroid/view/ViewGroup;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYx: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;->aYu:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYq:Lcom/yalantis/ucrop/view/GestureCropImageView;
 
-    iget-object v1, p0, Lcom/yalantis/ucrop/UCropActivity;->aYI:[I
+    iget-object v1, p0, Lcom/yalantis/ucrop/UCropActivity;->aYE:[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;->aYu:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYq:Lcom/yalantis/ucrop/view/GestureCropImageView;
 
-    iget-object v1, p0, Lcom/yalantis/ucrop/UCropActivity;->aYI:[I
+    iget-object v1, p0, Lcom/yalantis/ucrop/UCropActivity;->aYE:[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;->aYu:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object p0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYq: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;->aYC:Ljava/util/List;
+    iget-object p0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYy: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;->aYu:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYq: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;->aYu:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object p0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYq: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;->aYu:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYq: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;->aYu:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object p0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYq:Lcom/yalantis/ucrop/view/GestureCropImageView;
 
     const/4 v0, 0x1
 
@@ -544,7 +544,7 @@
 
     move-result v2
 
-    iput v2, v1, Lcom/yalantis/ucrop/UCropActivity;->aYk:I
+    iput v2, v1, Lcom/yalantis/ucrop/UCropActivity;->aYg: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;->aYj:I
+    iput v2, v1, Lcom/yalantis/ucrop/UCropActivity;->aYf: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;->aYl:I
+    iput v2, v1, Lcom/yalantis/ucrop/UCropActivity;->aYh: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;->aYm:I
+    iput v2, v1, Lcom/yalantis/ucrop/UCropActivity;->aYi: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;->aYo:I
+    iput v2, v1, Lcom/yalantis/ucrop/UCropActivity;->aYk: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;->aYp:I
+    iput v2, v1, Lcom/yalantis/ucrop/UCropActivity;->aYl:I
 
     const-string v2, "com.yalantis.ucrop.UcropToolbarTitleText"
 
@@ -614,9 +614,9 @@
 
     move-result-object v2
 
-    iput-object v2, v1, Lcom/yalantis/ucrop/UCropActivity;->aYi:Ljava/lang/String;
+    iput-object v2, v1, Lcom/yalantis/ucrop/UCropActivity;->aYe:Ljava/lang/String;
 
-    iget-object v2, v1, Lcom/yalantis/ucrop/UCropActivity;->aYi:Ljava/lang/String;
+    iget-object v2, v1, Lcom/yalantis/ucrop/UCropActivity;->aYe: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;->aYi:Ljava/lang/String;
+    iput-object v2, v1, Lcom/yalantis/ucrop/UCropActivity;->aYe: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;->aYq:I
+    iput v2, v1, Lcom/yalantis/ucrop/UCropActivity;->aYm:I
 
     const/4 v2, 0x0
 
@@ -662,7 +662,7 @@
 
     xor-int/2addr v3, v4
 
-    iput-boolean v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYr:Z
+    iput-boolean v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYn: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;->aYn:I
+    iput v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYj:I
 
-    iget v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYk:I
+    iget v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYg: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;->aYj:I
+    iget v5, v1, Lcom/yalantis/ucrop/UCropActivity;->aYf:I
 
     invoke-virtual {v3, v5}, Landroidx/appcompat/widget/Toolbar;->setBackgroundColor(I)V
 
-    iget v5, v1, Lcom/yalantis/ucrop/UCropActivity;->aYm:I
+    iget v5, v1, Lcom/yalantis/ucrop/UCropActivity;->aYi: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;->aYm:I
+    iget v6, v1, Lcom/yalantis/ucrop/UCropActivity;->aYi:I
 
     invoke-virtual {v5, v6}, Landroid/widget/TextView;->setTextColor(I)V
 
-    iget-object v6, v1, Lcom/yalantis/ucrop/UCropActivity;->aYi:Ljava/lang/String;
+    iget-object v6, v1, Lcom/yalantis/ucrop/UCropActivity;->aYe:Ljava/lang/String;
 
     invoke-virtual {v5, v6}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    iget v5, v1, Lcom/yalantis/ucrop/UCropActivity;->aYo:I
+    iget v5, v1, Lcom/yalantis/ucrop/UCropActivity;->aYk: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;->aYm:I
+    iget v6, v1, Lcom/yalantis/ucrop/UCropActivity;->aYi: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;->aYt:Lcom/yalantis/ucrop/view/UCropView;
+    iput-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYp:Lcom/yalantis/ucrop/view/UCropView;
 
-    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYt:Lcom/yalantis/ucrop/view/UCropView;
+    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYp: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;->aYu:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iput-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYq:Lcom/yalantis/ucrop/view/GestureCropImageView;
 
-    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYt:Lcom/yalantis/ucrop/view/UCropView;
+    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYp: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;->aYv:Lcom/yalantis/ucrop/view/OverlayView;
+    iput-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYr:Lcom/yalantis/ucrop/view/OverlayView;
 
-    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYu:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYq:Lcom/yalantis/ucrop/view/GestureCropImageView;
 
-    iget-object v5, v1, Lcom/yalantis/ucrop/UCropActivity;->aYJ:Lcom/yalantis/ucrop/view/b$a;
+    iget-object v5, v1, Lcom/yalantis/ucrop/UCropActivity;->aYF: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;->aYq:I
+    iget v5, v1, Lcom/yalantis/ucrop/UCropActivity;->aYm: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;->aYn:I
+    iget v5, v1, Lcom/yalantis/ucrop/UCropActivity;->aYj:I
 
     invoke-virtual {v3, v5}, Landroid/view/View;->setBackgroundColor(I)V
 
-    iget-boolean v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYr:Z
+    iget-boolean v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYn: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;->aYw:Landroid/view/ViewGroup;
+    iput-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYs:Landroid/view/ViewGroup;
 
-    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYw:Landroid/view/ViewGroup;
+    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYs:Landroid/view/ViewGroup;
 
-    iget-object v11, v1, Lcom/yalantis/ucrop/UCropActivity;->aYK:Landroid/view/View$OnClickListener;
+    iget-object v11, v1, Lcom/yalantis/ucrop/UCropActivity;->aYG: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;->aYx:Landroid/view/ViewGroup;
+    iput-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYt:Landroid/view/ViewGroup;
 
-    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYx:Landroid/view/ViewGroup;
+    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYt:Landroid/view/ViewGroup;
 
-    iget-object v11, v1, Lcom/yalantis/ucrop/UCropActivity;->aYK:Landroid/view/View$OnClickListener;
+    iget-object v11, v1, Lcom/yalantis/ucrop/UCropActivity;->aYG: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;->aYy:Landroid/view/ViewGroup;
+    iput-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYu:Landroid/view/ViewGroup;
 
-    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYy:Landroid/view/ViewGroup;
+    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYu:Landroid/view/ViewGroup;
 
-    iget-object v11, v1, Lcom/yalantis/ucrop/UCropActivity;->aYK:Landroid/view/View$OnClickListener;
+    iget-object v11, v1, Lcom/yalantis/ucrop/UCropActivity;->aYG: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;->aYz:Landroid/view/ViewGroup;
+    iput-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYv: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;->aYA:Landroid/view/ViewGroup;
+    iput-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYw: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;->aYB:Landroid/view/ViewGroup;
+    iput-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYx: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;->aYl:I
+    iget v9, v1, Lcom/yalantis/ucrop/UCropActivity;->aYh: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;->aYC:Ljava/util/List;
+    iget-object v9, v1, Lcom/yalantis/ucrop/UCropActivity;->aYy: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;->aYC:Ljava/util/List;
+    iget-object v7, v1, Lcom/yalantis/ucrop/UCropActivity;->aYy: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;->aYC:Ljava/util/List;
+    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYy: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;->aYD:Landroid/widget/TextView;
+    iput-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYz: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;->aYl:I
+    iget v7, v1, Lcom/yalantis/ucrop/UCropActivity;->aYh: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;->aYE:Landroid/widget/TextView;
+    iput-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYA: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;->aYl:I
+    iget v7, v1, Lcom/yalantis/ucrop/UCropActivity;->aYh: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;->aYl:I
+    iget v13, v1, Lcom/yalantis/ucrop/UCropActivity;->aYh: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;->aYl:I
+    iget v12, v1, Lcom/yalantis/ucrop/UCropActivity;->aYh: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;->aYl:I
+    iget v11, v1, Lcom/yalantis/ucrop/UCropActivity;->aYh: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;->aYh:Landroid/graphics/Bitmap$CompressFormat;
+    sget-object v16, Lcom/yalantis/ucrop/UCropActivity;->aYd:Landroid/graphics/Bitmap$CompressFormat;
 
     :cond_9
     move-object/from16 v3, v16
 
-    iput-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYG:Landroid/graphics/Bitmap$CompressFormat;
+    iput-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYC:Landroid/graphics/Bitmap$CompressFormat;
 
     const/16 v3, 0x5a
 
@@ -1324,7 +1324,7 @@
 
     move-result v3
 
-    iput v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYH:I
+    iput v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYD: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;->aYI:[I
+    iput-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYE:[I
 
     :cond_a
-    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYu:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYq: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;->aYu:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYq: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;->aYu:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYq: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;->aYv:Lcom/yalantis/ucrop/view/OverlayView;
+    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYr: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;->aYv:Lcom/yalantis/ucrop/view/OverlayView;
+    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYr: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;->aYv:Lcom/yalantis/ucrop/view/OverlayView;
+    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYr: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;->aYv:Lcom/yalantis/ucrop/view/OverlayView;
+    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYr: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;->aYv:Lcom/yalantis/ucrop/view/OverlayView;
+    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYr: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;->aYv:Lcom/yalantis/ucrop/view/OverlayView;
+    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYr: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;->aYv:Lcom/yalantis/ucrop/view/OverlayView;
+    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYr: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;->aYv:Lcom/yalantis/ucrop/view/OverlayView;
+    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYr: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;->aYv:Lcom/yalantis/ucrop/view/OverlayView;
+    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYr: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;->aYv:Lcom/yalantis/ucrop/view/OverlayView;
+    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYr: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;->aYv:Lcom/yalantis/ucrop/view/OverlayView;
+    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYr: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;->aYw:Landroid/view/ViewGroup;
+    iget-object v5, v1, Lcom/yalantis/ucrop/UCropActivity;->aYs: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;->aYu:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object v5, v1, Lcom/yalantis/ucrop/UCropActivity;->aYq: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;->aYu:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYq: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;->aYN:F
+    iget v8, v8, Lcom/yalantis/ucrop/model/AspectRatio;->aYJ: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;->aYO:F
+    iget v5, v5, Lcom/yalantis/ucrop/model/AspectRatio;->aYK:F
 
     div-float/2addr v8, v5
 
@@ -1618,7 +1618,7 @@
     goto :goto_4
 
     :cond_d
-    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYu:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYq: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;->aYu:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object v5, v1, Lcom/yalantis/ucrop/UCropActivity;->aYq: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;->aYu:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYq: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;->aYu:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object v0, v1, Lcom/yalantis/ucrop/UCropActivity;->aYq: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;->aYr:Z
+    iget-boolean v0, v1, Lcom/yalantis/ucrop/UCropActivity;->aYn:Z
 
     if-eqz v0, :cond_11
 
-    iget-object v0, v1, Lcom/yalantis/ucrop/UCropActivity;->aYw:Landroid/view/ViewGroup;
+    iget-object v0, v1, Lcom/yalantis/ucrop/UCropActivity;->aYs: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;->aYF:Landroid/view/View;
+    iget-object v0, v1, Lcom/yalantis/ucrop/UCropActivity;->aYB: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;->aYF:Landroid/view/View;
+    iput-object v0, v1, Lcom/yalantis/ucrop/UCropActivity;->aYB: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;->aYF:Landroid/view/View;
+    iget-object v2, v1, Lcom/yalantis/ucrop/UCropActivity;->aYB:Landroid/view/View;
 
     invoke-virtual {v2, v0}, Landroid/view/View;->setLayoutParams(Landroid/view/ViewGroup$LayoutParams;)V
 
-    iget-object v0, v1, Lcom/yalantis/ucrop/UCropActivity;->aYF:Landroid/view/View;
+    iget-object v0, v1, Lcom/yalantis/ucrop/UCropActivity;->aYB: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;->aYF:Landroid/view/View;
+    iget-object v2, v1, Lcom/yalantis/ucrop/UCropActivity;->aYB: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;->aYm:I
+    iget v3, p0, Lcom/yalantis/ucrop/UCropActivity;->aYi: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;->aYp:I
+    iget v0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYl: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;->aYm:I
+    iget v1, p0, Lcom/yalantis/ucrop/UCropActivity;->aYi: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;->aYF:Landroid/view/View;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYB: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;->aYs:Z
+    iput-boolean v1, p0, Lcom/yalantis/ucrop/UCropActivity;->aYo:Z
 
     invoke-virtual {p0}, Lcom/yalantis/ucrop/UCropActivity;->supportInvalidateOptionsMenu()V
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYu:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYq:Lcom/yalantis/ucrop/view/GestureCropImageView;
 
-    iget-object v1, p0, Lcom/yalantis/ucrop/UCropActivity;->aYG:Landroid/graphics/Bitmap$CompressFormat;
+    iget-object v1, p0, Lcom/yalantis/ucrop/UCropActivity;->aYC:Landroid/graphics/Bitmap$CompressFormat;
 
-    iget v2, p0, Lcom/yalantis/ucrop/UCropActivity;->aYH:I
+    iget v2, p0, Lcom/yalantis/ucrop/UCropActivity;->aYD: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;->aYs:Z
+    iget-boolean v1, p0, Lcom/yalantis/ucrop/UCropActivity;->aYo:Z
 
     xor-int/lit8 v1, v1, 0x1
 
@@ -1970,7 +1970,7 @@
 
     move-result-object v0
 
-    iget-boolean v1, p0, Lcom/yalantis/ucrop/UCropActivity;->aYs:Z
+    iget-boolean v1, p0, Lcom/yalantis/ucrop/UCropActivity;->aYo: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;->aYu:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYq:Lcom/yalantis/ucrop/view/GestureCropImageView;
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v0}, Lcom/yalantis/ucrop/view/GestureCropImageView;->By()V
+    invoke-virtual {v0}, Lcom/yalantis/ucrop/view/GestureCropImageView;->Bw()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 789767f720..c3b9fd1f70 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 aYg:Landroid/os/Bundle;
+.field public final aYc: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;->aYg:Landroid/os/Bundle;
+    iput-object v0, p0, Lcom/yalantis/ucrop/a$a;->aYc: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 5e8e5e3ff2..e4606046d9 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 aYe:Landroid/content/Intent;
+.field public aYa:Landroid/content/Intent;
 
-.field public aYf:Landroid/os/Bundle;
+.field public aYb: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;->aYe:Landroid/content/Intent;
+    iput-object v0, p0, Lcom/yalantis/ucrop/a;->aYa: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;->aYf:Landroid/os/Bundle;
+    iput-object v0, p0, Lcom/yalantis/ucrop/a;->aYb:Landroid/os/Bundle;
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/a;->aYf:Landroid/os/Bundle;
+    iget-object v0, p0, Lcom/yalantis/ucrop/a;->aYb: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;->aYf:Landroid/os/Bundle;
+    iget-object p1, p0, Lcom/yalantis/ucrop/a;->aYb: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 a9101ac1a6..9a84155597 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/b/a.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/b/a.smali
@@ -16,29 +16,29 @@
 
 
 # instance fields
-.field private final aYG:Landroid/graphics/Bitmap$CompressFormat;
+.field private final aYC:Landroid/graphics/Bitmap$CompressFormat;
 
-.field private final aYH:I
+.field private final aYD:I
 
-.field private final aYP:I
+.field private final aYL:I
 
-.field private final aYQ:I
+.field private final aYM:I
 
-.field private final aYR:Ljava/lang/String;
+.field private final aYN:Ljava/lang/String;
 
-.field private final aYS:Ljava/lang/String;
+.field private final aYO:Ljava/lang/String;
 
-.field private final aYT:Lcom/yalantis/ucrop/model/b;
+.field private final aYP:Lcom/yalantis/ucrop/model/b;
 
-.field private final aYW:Landroid/graphics/RectF;
+.field private final aYS:Landroid/graphics/RectF;
 
-.field private final aYX:Landroid/graphics/RectF;
+.field private final aYT:Landroid/graphics/RectF;
 
-.field private aYY:F
+.field private aYU:F
 
-.field private aYZ:F
+.field private aYV:F
 
-.field private final aZa:Ljava/lang/ref/WeakReference;
+.field private final aYW:Ljava/lang/ref/WeakReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/ref/WeakReference<",
@@ -48,17 +48,17 @@
     .end annotation
 .end field
 
-.field private aZb:Landroid/graphics/Bitmap;
+.field private aYX:Landroid/graphics/Bitmap;
 
-.field private final aZc:Lcom/yalantis/ucrop/a/a;
+.field private final aYY:Lcom/yalantis/ucrop/a/a;
 
-.field private aZd:I
+.field private aYZ:I
 
-.field private aZe:I
+.field private aZa:I
 
-.field private aZf:I
+.field private aZb:I
 
-.field private aZg:I
+.field private aZc: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;->aZa:Ljava/lang/ref/WeakReference;
+    iput-object v0, p0, Lcom/yalantis/ucrop/b/a;->aYW:Ljava/lang/ref/WeakReference;
 
-    iput-object p2, p0, Lcom/yalantis/ucrop/b/a;->aZb:Landroid/graphics/Bitmap;
+    iput-object p2, p0, Lcom/yalantis/ucrop/b/a;->aYX:Landroid/graphics/Bitmap;
 
-    iget-object p1, p3, Lcom/yalantis/ucrop/model/c;->aYW:Landroid/graphics/RectF;
+    iget-object p1, p3, Lcom/yalantis/ucrop/model/c;->aYS:Landroid/graphics/RectF;
 
-    iput-object p1, p0, Lcom/yalantis/ucrop/b/a;->aYW:Landroid/graphics/RectF;
+    iput-object p1, p0, Lcom/yalantis/ucrop/b/a;->aYS:Landroid/graphics/RectF;
 
-    iget-object p1, p3, Lcom/yalantis/ucrop/model/c;->aYX:Landroid/graphics/RectF;
+    iget-object p1, p3, Lcom/yalantis/ucrop/model/c;->aYT:Landroid/graphics/RectF;
 
-    iput-object p1, p0, Lcom/yalantis/ucrop/b/a;->aYX:Landroid/graphics/RectF;
+    iput-object p1, p0, Lcom/yalantis/ucrop/b/a;->aYT:Landroid/graphics/RectF;
 
-    iget p1, p3, Lcom/yalantis/ucrop/model/c;->aYY:F
+    iget p1, p3, Lcom/yalantis/ucrop/model/c;->aYU:F
 
-    iput p1, p0, Lcom/yalantis/ucrop/b/a;->aYY:F
+    iput p1, p0, Lcom/yalantis/ucrop/b/a;->aYU:F
 
-    iget p1, p3, Lcom/yalantis/ucrop/model/c;->aYZ:F
+    iget p1, p3, Lcom/yalantis/ucrop/model/c;->aYV:F
 
-    iput p1, p0, Lcom/yalantis/ucrop/b/a;->aYZ:F
+    iput p1, p0, Lcom/yalantis/ucrop/b/a;->aYV:F
 
-    iget p1, p4, Lcom/yalantis/ucrop/model/a;->aYP:I
+    iget p1, p4, Lcom/yalantis/ucrop/model/a;->aYL:I
 
-    iput p1, p0, Lcom/yalantis/ucrop/b/a;->aYP:I
+    iput p1, p0, Lcom/yalantis/ucrop/b/a;->aYL:I
 
-    iget p1, p4, Lcom/yalantis/ucrop/model/a;->aYQ:I
+    iget p1, p4, Lcom/yalantis/ucrop/model/a;->aYM:I
 
-    iput p1, p0, Lcom/yalantis/ucrop/b/a;->aYQ:I
+    iput p1, p0, Lcom/yalantis/ucrop/b/a;->aYM:I
 
-    iget-object p1, p4, Lcom/yalantis/ucrop/model/a;->aYG:Landroid/graphics/Bitmap$CompressFormat;
+    iget-object p1, p4, Lcom/yalantis/ucrop/model/a;->aYC:Landroid/graphics/Bitmap$CompressFormat;
 
-    iput-object p1, p0, Lcom/yalantis/ucrop/b/a;->aYG:Landroid/graphics/Bitmap$CompressFormat;
+    iput-object p1, p0, Lcom/yalantis/ucrop/b/a;->aYC:Landroid/graphics/Bitmap$CompressFormat;
 
-    iget p1, p4, Lcom/yalantis/ucrop/model/a;->aYH:I
+    iget p1, p4, Lcom/yalantis/ucrop/model/a;->aYD:I
 
-    iput p1, p0, Lcom/yalantis/ucrop/b/a;->aYH:I
+    iput p1, p0, Lcom/yalantis/ucrop/b/a;->aYD:I
 
-    iget-object p1, p4, Lcom/yalantis/ucrop/model/a;->aYR:Ljava/lang/String;
+    iget-object p1, p4, Lcom/yalantis/ucrop/model/a;->aYN:Ljava/lang/String;
 
-    iput-object p1, p0, Lcom/yalantis/ucrop/b/a;->aYR:Ljava/lang/String;
+    iput-object p1, p0, Lcom/yalantis/ucrop/b/a;->aYN:Ljava/lang/String;
 
-    iget-object p1, p4, Lcom/yalantis/ucrop/model/a;->aYS:Ljava/lang/String;
+    iget-object p1, p4, Lcom/yalantis/ucrop/model/a;->aYO:Ljava/lang/String;
 
-    iput-object p1, p0, Lcom/yalantis/ucrop/b/a;->aYS:Ljava/lang/String;
+    iput-object p1, p0, Lcom/yalantis/ucrop/b/a;->aYO:Ljava/lang/String;
 
-    iget-object p1, p4, Lcom/yalantis/ucrop/model/a;->aYT:Lcom/yalantis/ucrop/model/b;
+    iget-object p1, p4, Lcom/yalantis/ucrop/model/a;->aYP:Lcom/yalantis/ucrop/model/b;
 
-    iput-object p1, p0, Lcom/yalantis/ucrop/b/a;->aYT:Lcom/yalantis/ucrop/model/b;
+    iput-object p1, p0, Lcom/yalantis/ucrop/b/a;->aYP:Lcom/yalantis/ucrop/model/b;
 
-    iput-object p5, p0, Lcom/yalantis/ucrop/b/a;->aZc:Lcom/yalantis/ucrop/a/a;
+    iput-object p5, p0, Lcom/yalantis/ucrop/b/a;->aYY:Lcom/yalantis/ucrop/a/a;
 
     return-void
 .end method
 
-.method private varargs Bs()Ljava/lang/Throwable;
+.method private varargs Bq()Ljava/lang/Throwable;
     .locals 12
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/b/a;->aZb:Landroid/graphics/Bitmap;
+    iget-object v0, p0, Lcom/yalantis/ucrop/b/a;->aYX: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;->aYX:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/yalantis/ucrop/b/a;->aYT: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;->aYP:I
+    iget v0, p0, Lcom/yalantis/ucrop/b/a;->aYL:I
 
     const/4 v1, 0x0
 
     if-lez v0, :cond_5
 
-    iget v0, p0, Lcom/yalantis/ucrop/b/a;->aYQ:I
+    iget v0, p0, Lcom/yalantis/ucrop/b/a;->aYM:I
 
     if-lez v0, :cond_5
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/b/a;->aYW:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/yalantis/ucrop/b/a;->aYS:Landroid/graphics/RectF;
 
     invoke-virtual {v0}, Landroid/graphics/RectF;->width()F
 
     move-result v0
 
-    iget v2, p0, Lcom/yalantis/ucrop/b/a;->aYY:F
+    iget v2, p0, Lcom/yalantis/ucrop/b/a;->aYU:F
 
     div-float/2addr v0, v2
 
-    iget-object v2, p0, Lcom/yalantis/ucrop/b/a;->aYW:Landroid/graphics/RectF;
+    iget-object v2, p0, Lcom/yalantis/ucrop/b/a;->aYS:Landroid/graphics/RectF;
 
     invoke-virtual {v2}, Landroid/graphics/RectF;->height()F
 
     move-result v2
 
-    iget v3, p0, Lcom/yalantis/ucrop/b/a;->aYY:F
+    iget v3, p0, Lcom/yalantis/ucrop/b/a;->aYU:F
 
     div-float/2addr v2, v3
 
-    iget v3, p0, Lcom/yalantis/ucrop/b/a;->aYP:I
+    iget v3, p0, Lcom/yalantis/ucrop/b/a;->aYL:I
 
     int-to-float v3, v3
 
@@ -211,7 +211,7 @@
 
     if-gtz v3, :cond_3
 
-    iget v3, p0, Lcom/yalantis/ucrop/b/a;->aYQ:I
+    iget v3, p0, Lcom/yalantis/ucrop/b/a;->aYM: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;->aYP:I
+    iget v3, p0, Lcom/yalantis/ucrop/b/a;->aYL:I
 
     int-to-float v3, v3
 
     div-float/2addr v3, v0
 
-    iget v0, p0, Lcom/yalantis/ucrop/b/a;->aYQ:I
+    iget v0, p0, Lcom/yalantis/ucrop/b/a;->aYM:I
 
     int-to-float v0, v0
 
@@ -236,9 +236,9 @@
 
     move-result v0
 
-    iget-object v2, p0, Lcom/yalantis/ucrop/b/a;->aZb:Landroid/graphics/Bitmap;
+    iget-object v2, p0, Lcom/yalantis/ucrop/b/a;->aYX:Landroid/graphics/Bitmap;
 
-    iget-object v3, p0, Lcom/yalantis/ucrop/b/a;->aZb:Landroid/graphics/Bitmap;
+    iget-object v3, p0, Lcom/yalantis/ucrop/b/a;->aYX: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;->aZb:Landroid/graphics/Bitmap;
+    iget-object v4, p0, Lcom/yalantis/ucrop/b/a;->aYX: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;->aZb:Landroid/graphics/Bitmap;
+    iget-object v3, p0, Lcom/yalantis/ucrop/b/a;->aYX:Landroid/graphics/Bitmap;
 
     if-eq v3, v2, :cond_4
 
-    iget-object v3, p0, Lcom/yalantis/ucrop/b/a;->aZb:Landroid/graphics/Bitmap;
+    iget-object v3, p0, Lcom/yalantis/ucrop/b/a;->aYX:Landroid/graphics/Bitmap;
 
     invoke-virtual {v3}, Landroid/graphics/Bitmap;->recycle()V
 
     :cond_4
-    iput-object v2, p0, Lcom/yalantis/ucrop/b/a;->aZb:Landroid/graphics/Bitmap;
+    iput-object v2, p0, Lcom/yalantis/ucrop/b/a;->aYX:Landroid/graphics/Bitmap;
 
-    iget v2, p0, Lcom/yalantis/ucrop/b/a;->aYY:F
+    iget v2, p0, Lcom/yalantis/ucrop/b/a;->aYU:F
 
     div-float/2addr v2, v0
 
-    iput v2, p0, Lcom/yalantis/ucrop/b/a;->aYY:F
+    iput v2, p0, Lcom/yalantis/ucrop/b/a;->aYU:F
 
     :cond_5
-    iget v0, p0, Lcom/yalantis/ucrop/b/a;->aYZ:F
+    iget v0, p0, Lcom/yalantis/ucrop/b/a;->aYV: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;->aYZ:F
+    iget v0, p0, Lcom/yalantis/ucrop/b/a;->aYV:F
 
-    iget-object v2, p0, Lcom/yalantis/ucrop/b/a;->aZb:Landroid/graphics/Bitmap;
+    iget-object v2, p0, Lcom/yalantis/ucrop/b/a;->aYX: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;->aZb:Landroid/graphics/Bitmap;
+    iget-object v3, p0, Lcom/yalantis/ucrop/b/a;->aYX: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;->aZb:Landroid/graphics/Bitmap;
+    iget-object v2, p0, Lcom/yalantis/ucrop/b/a;->aYX:Landroid/graphics/Bitmap;
 
     const/4 v3, 0x0
 
     const/4 v4, 0x0
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/b/a;->aZb:Landroid/graphics/Bitmap;
+    iget-object v0, p0, Lcom/yalantis/ucrop/b/a;->aYX:Landroid/graphics/Bitmap;
 
     invoke-virtual {v0}, Landroid/graphics/Bitmap;->getWidth()I
 
     move-result v5
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/b/a;->aZb:Landroid/graphics/Bitmap;
+    iget-object v0, p0, Lcom/yalantis/ucrop/b/a;->aYX: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;->aZb:Landroid/graphics/Bitmap;
+    iget-object v2, p0, Lcom/yalantis/ucrop/b/a;->aYX:Landroid/graphics/Bitmap;
 
     if-eq v2, v0, :cond_6
 
-    iget-object v2, p0, Lcom/yalantis/ucrop/b/a;->aZb:Landroid/graphics/Bitmap;
+    iget-object v2, p0, Lcom/yalantis/ucrop/b/a;->aYX:Landroid/graphics/Bitmap;
 
     invoke-virtual {v2}, Landroid/graphics/Bitmap;->recycle()V
 
     :cond_6
-    iput-object v0, p0, Lcom/yalantis/ucrop/b/a;->aZb:Landroid/graphics/Bitmap;
+    iput-object v0, p0, Lcom/yalantis/ucrop/b/a;->aYX:Landroid/graphics/Bitmap;
 
     :cond_7
-    iget-object v0, p0, Lcom/yalantis/ucrop/b/a;->aYW:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/yalantis/ucrop/b/a;->aYS:Landroid/graphics/RectF;
 
     iget v0, v0, Landroid/graphics/RectF;->left:F
 
-    iget-object v2, p0, Lcom/yalantis/ucrop/b/a;->aYX:Landroid/graphics/RectF;
+    iget-object v2, p0, Lcom/yalantis/ucrop/b/a;->aYT:Landroid/graphics/RectF;
 
     iget v2, v2, Landroid/graphics/RectF;->left:F
 
     sub-float/2addr v0, v2
 
-    iget v2, p0, Lcom/yalantis/ucrop/b/a;->aYY:F
+    iget v2, p0, Lcom/yalantis/ucrop/b/a;->aYU:F
 
     div-float/2addr v0, v2
 
@@ -378,19 +378,19 @@
 
     move-result v0
 
-    iput v0, p0, Lcom/yalantis/ucrop/b/a;->aZf:I
+    iput v0, p0, Lcom/yalantis/ucrop/b/a;->aZb:I
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/b/a;->aYW:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/yalantis/ucrop/b/a;->aYS:Landroid/graphics/RectF;
 
     iget v0, v0, Landroid/graphics/RectF;->top:F
 
-    iget-object v2, p0, Lcom/yalantis/ucrop/b/a;->aYX:Landroid/graphics/RectF;
+    iget-object v2, p0, Lcom/yalantis/ucrop/b/a;->aYT:Landroid/graphics/RectF;
 
     iget v2, v2, Landroid/graphics/RectF;->top:F
 
     sub-float/2addr v0, v2
 
-    iget v2, p0, Lcom/yalantis/ucrop/b/a;->aYY:F
+    iget v2, p0, Lcom/yalantis/ucrop/b/a;->aYU:F
 
     div-float/2addr v0, v2
 
@@ -398,15 +398,15 @@
 
     move-result v0
 
-    iput v0, p0, Lcom/yalantis/ucrop/b/a;->aZg:I
+    iput v0, p0, Lcom/yalantis/ucrop/b/a;->aZc:I
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/b/a;->aYW:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/yalantis/ucrop/b/a;->aYS:Landroid/graphics/RectF;
 
     invoke-virtual {v0}, Landroid/graphics/RectF;->width()F
 
     move-result v0
 
-    iget v2, p0, Lcom/yalantis/ucrop/b/a;->aYY:F
+    iget v2, p0, Lcom/yalantis/ucrop/b/a;->aYU:F
 
     div-float/2addr v0, v2
 
@@ -414,15 +414,15 @@
 
     move-result v0
 
-    iput v0, p0, Lcom/yalantis/ucrop/b/a;->aZd:I
+    iput v0, p0, Lcom/yalantis/ucrop/b/a;->aYZ:I
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/b/a;->aYW:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/yalantis/ucrop/b/a;->aYS:Landroid/graphics/RectF;
 
     invoke-virtual {v0}, Landroid/graphics/RectF;->height()F
 
     move-result v0
 
-    iget v2, p0, Lcom/yalantis/ucrop/b/a;->aYY:F
+    iget v2, p0, Lcom/yalantis/ucrop/b/a;->aYU:F
 
     div-float/2addr v0, v2
 
@@ -430,11 +430,11 @@
 
     move-result v0
 
-    iput v0, p0, Lcom/yalantis/ucrop/b/a;->aZe:I
+    iput v0, p0, Lcom/yalantis/ucrop/b/a;->aZa:I
 
-    iget v0, p0, Lcom/yalantis/ucrop/b/a;->aZd:I
+    iget v0, p0, Lcom/yalantis/ucrop/b/a;->aYZ:I
 
-    iget v2, p0, Lcom/yalantis/ucrop/b/a;->aZe:I
+    iget v2, p0, Lcom/yalantis/ucrop/b/a;->aZa: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;->aYP:I
+    iget v3, p0, Lcom/yalantis/ucrop/b/a;->aYL:I
 
     if-lez v3, :cond_8
 
-    iget v3, p0, Lcom/yalantis/ucrop/b/a;->aYQ:I
+    iget v3, p0, Lcom/yalantis/ucrop/b/a;->aYM:I
 
     if-gtz v3, :cond_9
 
     :cond_8
-    iget-object v3, p0, Lcom/yalantis/ucrop/b/a;->aYW:Landroid/graphics/RectF;
+    iget-object v3, p0, Lcom/yalantis/ucrop/b/a;->aYS:Landroid/graphics/RectF;
 
     iget v3, v3, Landroid/graphics/RectF;->left:F
 
-    iget-object v4, p0, Lcom/yalantis/ucrop/b/a;->aYX:Landroid/graphics/RectF;
+    iget-object v4, p0, Lcom/yalantis/ucrop/b/a;->aYT: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;->aYW:Landroid/graphics/RectF;
+    iget-object v3, p0, Lcom/yalantis/ucrop/b/a;->aYS:Landroid/graphics/RectF;
 
     iget v3, v3, Landroid/graphics/RectF;->top:F
 
-    iget-object v4, p0, Lcom/yalantis/ucrop/b/a;->aYX:Landroid/graphics/RectF;
+    iget-object v4, p0, Lcom/yalantis/ucrop/b/a;->aYT: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;->aYW:Landroid/graphics/RectF;
+    iget-object v3, p0, Lcom/yalantis/ucrop/b/a;->aYS:Landroid/graphics/RectF;
 
     iget v3, v3, Landroid/graphics/RectF;->bottom:F
 
-    iget-object v4, p0, Lcom/yalantis/ucrop/b/a;->aYX:Landroid/graphics/RectF;
+    iget-object v4, p0, Lcom/yalantis/ucrop/b/a;->aYT: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;->aYW:Landroid/graphics/RectF;
+    iget-object v3, p0, Lcom/yalantis/ucrop/b/a;->aYS:Landroid/graphics/RectF;
 
     iget v3, v3, Landroid/graphics/RectF;->right:F
 
-    iget-object v4, p0, Lcom/yalantis/ucrop/b/a;->aYX:Landroid/graphics/RectF;
+    iget-object v4, p0, Lcom/yalantis/ucrop/b/a;->aYT: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;->aYR:Ljava/lang/String;
+    iget-object v2, p0, Lcom/yalantis/ucrop/b/a;->aYN:Ljava/lang/String;
 
     invoke-direct {v1, v2}, Landroid/media/ExifInterface;-><init>(Ljava/lang/String;)V
 
-    iget-object v2, p0, Lcom/yalantis/ucrop/b/a;->aZb:Landroid/graphics/Bitmap;
+    iget-object v2, p0, Lcom/yalantis/ucrop/b/a;->aYX:Landroid/graphics/Bitmap;
 
-    iget v3, p0, Lcom/yalantis/ucrop/b/a;->aZf:I
+    iget v3, p0, Lcom/yalantis/ucrop/b/a;->aZb:I
 
-    iget v4, p0, Lcom/yalantis/ucrop/b/a;->aZg:I
+    iget v4, p0, Lcom/yalantis/ucrop/b/a;->aZc:I
 
-    iget v5, p0, Lcom/yalantis/ucrop/b/a;->aZd:I
+    iget v5, p0, Lcom/yalantis/ucrop/b/a;->aYZ:I
 
-    iget v6, p0, Lcom/yalantis/ucrop/b/a;->aZe:I
+    iget v6, p0, Lcom/yalantis/ucrop/b/a;->aZa: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;->aZa:Ljava/lang/ref/WeakReference;
+    iget-object v3, p0, Lcom/yalantis/ucrop/b/a;->aYW: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;->aYS:Ljava/lang/String;
+    iget-object v5, p0, Lcom/yalantis/ucrop/b/a;->aYO: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;->aYG:Landroid/graphics/Bitmap$CompressFormat;
+    iget-object v4, p0, Lcom/yalantis/ucrop/b/a;->aYC:Landroid/graphics/Bitmap$CompressFormat;
 
-    iget v5, p0, Lcom/yalantis/ucrop/b/a;->aYH:I
+    iget v5, p0, Lcom/yalantis/ucrop/b/a;->aYD: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;->aYG:Landroid/graphics/Bitmap$CompressFormat;
+    iget-object v2, p0, Lcom/yalantis/ucrop/b/a;->aYC: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;->aZd:I
+    iget v2, p0, Lcom/yalantis/ucrop/b/a;->aYZ:I
 
-    iget v3, p0, Lcom/yalantis/ucrop/b/a;->aZe:I
+    iget v3, p0, Lcom/yalantis/ucrop/b/a;->aZa:I
 
-    iget-object v4, p0, Lcom/yalantis/ucrop/b/a;->aYS:Ljava/lang/String;
+    iget-object v4, p0, Lcom/yalantis/ucrop/b/a;->aYO: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;->aYR:Ljava/lang/String;
+    iget-object v1, p0, Lcom/yalantis/ucrop/b/a;->aYN:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/yalantis/ucrop/b/a;->aYS:Ljava/lang/String;
+    iget-object v2, p0, Lcom/yalantis/ucrop/b/a;->aYO: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;->aZb:Landroid/graphics/Bitmap;
+    iput-object v0, p0, Lcom/yalantis/ucrop/b/a;->aYX: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;->Bs()Ljava/lang/Throwable;
+    invoke-direct {p0}, Lcom/yalantis/ucrop/b/a;->Bq()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;->aZc:Lcom/yalantis/ucrop/a/a;
+    iget-object v0, p0, Lcom/yalantis/ucrop/b/a;->aYY: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;->aYS:Ljava/lang/String;
+    iget-object v0, p0, Lcom/yalantis/ucrop/b/a;->aYO: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;->aZc:Lcom/yalantis/ucrop/a/a;
+    iget-object v1, p0, Lcom/yalantis/ucrop/b/a;->aYY:Lcom/yalantis/ucrop/a/a;
 
-    iget v3, p0, Lcom/yalantis/ucrop/b/a;->aZf:I
+    iget v3, p0, Lcom/yalantis/ucrop/b/a;->aZb:I
 
-    iget v4, p0, Lcom/yalantis/ucrop/b/a;->aZg:I
+    iget v4, p0, Lcom/yalantis/ucrop/b/a;->aZc:I
 
-    iget v5, p0, Lcom/yalantis/ucrop/b/a;->aZd:I
+    iget v5, p0, Lcom/yalantis/ucrop/b/a;->aYZ:I
 
-    iget v6, p0, Lcom/yalantis/ucrop/b/a;->aZe:I
+    iget v6, p0, Lcom/yalantis/ucrop/b/a;->aZa: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 939de6ceef..f6618d4764 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 aYT:Lcom/yalantis/ucrop/model/b;
+.field aYP:Lcom/yalantis/ucrop/model/b;
 
-.field aZm:Landroid/graphics/Bitmap;
+.field aZi:Landroid/graphics/Bitmap;
 
-.field aZn:Ljava/lang/Exception;
+.field aZj: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;->aZm:Landroid/graphics/Bitmap;
+    iput-object p1, p0, Lcom/yalantis/ucrop/b/b$a;->aZi:Landroid/graphics/Bitmap;
 
-    iput-object p2, p0, Lcom/yalantis/ucrop/b/b$a;->aYT:Lcom/yalantis/ucrop/model/b;
+    iput-object p2, p0, Lcom/yalantis/ucrop/b/b$a;->aYP: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;->aZn:Ljava/lang/Exception;
+    iput-object p1, p0, Lcom/yalantis/ucrop/b/b$a;->aZj: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 e3718a2524..601ff928be 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 aZh:Landroid/net/Uri;
+.field private aZd:Landroid/net/Uri;
 
-.field private aZi:Landroid/net/Uri;
+.field private aZe:Landroid/net/Uri;
 
-.field private final aZj:I
+.field private final aZf:I
 
-.field private final aZk:I
+.field private final aZg:I
 
-.field private final aZl:Lcom/yalantis/ucrop/a/b;
+.field private final aZh: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;->aZh:Landroid/net/Uri;
+    iput-object p2, p0, Lcom/yalantis/ucrop/b/b;->aZd:Landroid/net/Uri;
 
-    iput-object p3, p0, Lcom/yalantis/ucrop/b/b;->aZi:Landroid/net/Uri;
+    iput-object p3, p0, Lcom/yalantis/ucrop/b/b;->aZe:Landroid/net/Uri;
 
-    iput p4, p0, Lcom/yalantis/ucrop/b/b;->aZj:I
+    iput p4, p0, Lcom/yalantis/ucrop/b/b;->aZf:I
 
-    iput p5, p0, Lcom/yalantis/ucrop/b/b;->aZk:I
+    iput p5, p0, Lcom/yalantis/ucrop/b/b;->aZg:I
 
-    iput-object p6, p0, Lcom/yalantis/ucrop/b/b;->aZl:Lcom/yalantis/ucrop/a/b;
+    iput-object p6, p0, Lcom/yalantis/ucrop/b/b;->aZh:Lcom/yalantis/ucrop/a/b;
 
     return-void
 .end method
 
-.method private varargs Bt()Lcom/yalantis/ucrop/b/b$a;
+.method private varargs Br()Lcom/yalantis/ucrop/b/b$a;
     .locals 14
 
     const-string v0, "BitmapWorkerTask"
 
-    iget-object v1, p0, Lcom/yalantis/ucrop/b/b;->aZh:Landroid/net/Uri;
+    iget-object v1, p0, Lcom/yalantis/ucrop/b/b;->aZd: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;->aZh:Landroid/net/Uri;
+    iget-object v2, p0, Lcom/yalantis/ucrop/b/b;->aZd: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;->aZh:Landroid/net/Uri;
+    iput-object v1, p0, Lcom/yalantis/ucrop/b/b;->aZd: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;->aZh:Landroid/net/Uri;
+    iget-object v1, p0, Lcom/yalantis/ucrop/b/b;->aZd:Landroid/net/Uri;
 
-    iget-object v2, p0, Lcom/yalantis/ucrop/b/b;->aZi:Landroid/net/Uri;
+    iget-object v2, p0, Lcom/yalantis/ucrop/b/b;->aZe: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;->aZh:Landroid/net/Uri;
+    iget-object v1, p0, Lcom/yalantis/ucrop/b/b;->aZd:Landroid/net/Uri;
 
-    iget-object v2, p0, Lcom/yalantis/ucrop/b/b;->aZi:Landroid/net/Uri;
+    iget-object v2, p0, Lcom/yalantis/ucrop/b/b;->aZe:Landroid/net/Uri;
 
     const-string v5, "downloadFile"
 
@@ -286,7 +286,7 @@
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lokhttp3/w$a;->FN()Lokhttp3/w;
+    invoke-virtual {v1}, Lokhttp3/w$a;->FL()Lokhttp3/w;
 
     move-result-object v1
 
@@ -294,16 +294,16 @@
 
     move-result-object v1
 
-    invoke-interface {v1}, Lokhttp3/e;->Fd()Lokhttp3/Response;
+    invoke-interface {v1}, Lokhttp3/e;->Fb()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;->bsD:Lokhttp3/x;
+    iget-object v6, v1, Lokhttp3/Response;->bsy:Lokhttp3/x;
 
-    invoke-virtual {v6}, Lokhttp3/x;->FQ()Lokio/d;
+    invoke-virtual {v6}, Lokhttp3/x;->FO()Lokio/d;
 
     move-result-object v6
     :try_end_5
@@ -340,18 +340,18 @@
 
     if-eqz v1, :cond_7
 
-    iget-object v1, v1, Lokhttp3/Response;->bsD:Lokhttp3/x;
+    iget-object v1, v1, Lokhttp3/Response;->bsy:Lokhttp3/x;
 
     invoke-static {v1}, Lcom/yalantis/ucrop/c/a;->f(Ljava/io/Closeable;)V
 
     :cond_7
-    iget-object v1, v5, Lokhttp3/t;->brL:Lokhttp3/n;
+    iget-object v1, v5, Lokhttp3/t;->brG:Lokhttp3/n;
 
     invoke-virtual {v1}, Lokhttp3/n;->cancelAll()V
 
-    iget-object v1, p0, Lcom/yalantis/ucrop/b/b;->aZi:Landroid/net/Uri;
+    iget-object v1, p0, Lcom/yalantis/ucrop/b/b;->aZe:Landroid/net/Uri;
 
-    iput-object v1, p0, Lcom/yalantis/ucrop/b/b;->aZh:Landroid/net/Uri;
+    iput-object v1, p0, Lcom/yalantis/ucrop/b/b;->aZd: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;->aZh:Landroid/net/Uri;
+    iget-object v2, p0, Lcom/yalantis/ucrop/b/b;->aZd: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;->aZj:I
+    iget v8, p0, Lcom/yalantis/ucrop/b/b;->aZf:I
 
-    iget v10, p0, Lcom/yalantis/ucrop/b/b;->aZk:I
+    iget v10, p0, Lcom/yalantis/ucrop/b/b;->aZg: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;->aZh:Landroid/net/Uri;
+    iget-object v4, p0, Lcom/yalantis/ucrop/b/b;->aZd: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;->aZh:Landroid/net/Uri;
+    iget-object v1, p0, Lcom/yalantis/ucrop/b/b;->aZd: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;->aZh:Landroid/net/Uri;
+    iget-object v4, p0, Lcom/yalantis/ucrop/b/b;->aZd: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;->aZh:Landroid/net/Uri;
+    iget-object v4, p0, Lcom/yalantis/ucrop/b/b;->aZd: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;->bsD:Lokhttp3/x;
+    iget-object v1, v1, Lokhttp3/Response;->bsy:Lokhttp3/x;
 
     invoke-static {v1}, Lcom/yalantis/ucrop/c/a;->f(Ljava/io/Closeable;)V
 
     :cond_13
-    iget-object v1, v5, Lokhttp3/t;->brL:Lokhttp3/n;
+    iget-object v1, v5, Lokhttp3/t;->brG:Lokhttp3/n;
 
     invoke-virtual {v1}, Lokhttp3/n;->cancelAll()V
 
-    iget-object v1, p0, Lcom/yalantis/ucrop/b/b;->aZi:Landroid/net/Uri;
+    iget-object v1, p0, Lcom/yalantis/ucrop/b/b;->aZe:Landroid/net/Uri;
 
-    iput-object v1, p0, Lcom/yalantis/ucrop/b/b;->aZh:Landroid/net/Uri;
+    iput-object v1, p0, Lcom/yalantis/ucrop/b/b;->aZd: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;->aZi:Landroid/net/Uri;
+    iget-object p1, p0, Lcom/yalantis/ucrop/b/b;->aZe:Landroid/net/Uri;
 
-    iput-object p1, p0, Lcom/yalantis/ucrop/b/b;->aZh:Landroid/net/Uri;
+    iput-object p1, p0, Lcom/yalantis/ucrop/b/b;->aZd: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;->aZi:Landroid/net/Uri;
+    iget-object p1, p0, Lcom/yalantis/ucrop/b/b;->aZe:Landroid/net/Uri;
 
-    iput-object p1, p0, Lcom/yalantis/ucrop/b/b;->aZh:Landroid/net/Uri;
+    iput-object p1, p0, Lcom/yalantis/ucrop/b/b;->aZd: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;->Bt()Lcom/yalantis/ucrop/b/b$a;
+    invoke-direct {p0}, Lcom/yalantis/ucrop/b/b;->Br()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;->aZn:Ljava/lang/Exception;
+    iget-object v0, p1, Lcom/yalantis/ucrop/b/b$a;->aZj:Ljava/lang/Exception;
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/b/b;->aZl:Lcom/yalantis/ucrop/a/b;
+    iget-object v0, p0, Lcom/yalantis/ucrop/b/b;->aZh:Lcom/yalantis/ucrop/a/b;
 
-    iget-object v1, p1, Lcom/yalantis/ucrop/b/b$a;->aZm:Landroid/graphics/Bitmap;
+    iget-object v1, p1, Lcom/yalantis/ucrop/b/b$a;->aZi:Landroid/graphics/Bitmap;
 
-    iget-object p1, p1, Lcom/yalantis/ucrop/b/b$a;->aYT:Lcom/yalantis/ucrop/model/b;
+    iget-object p1, p1, Lcom/yalantis/ucrop/b/b$a;->aYP:Lcom/yalantis/ucrop/model/b;
 
-    iget-object v2, p0, Lcom/yalantis/ucrop/b/b;->aZh:Landroid/net/Uri;
+    iget-object v2, p0, Lcom/yalantis/ucrop/b/b;->aZd: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;->aZi:Landroid/net/Uri;
+    iget-object v3, p0, Lcom/yalantis/ucrop/b/b;->aZe: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;->aZl:Lcom/yalantis/ucrop/a/b;
+    iget-object v0, p0, Lcom/yalantis/ucrop/b/b;->aZh:Lcom/yalantis/ucrop/a/b;
 
-    iget-object p1, p1, Lcom/yalantis/ucrop/b/b$a;->aZn:Ljava/lang/Exception;
+    iget-object p1, p1, Lcom/yalantis/ucrop/b/b$a;->aZj: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 06b1ac865e..0e4a92e1ee 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;->aZq:Lcom/yalantis/ucrop/c/f$b;
+    iget-object v2, v1, Lcom/yalantis/ucrop/c/f;->aZm:Lcom/yalantis/ucrop/c/f$b;
 
-    invoke-interface {v2}, Lcom/yalantis/ucrop/c/f$b;->Bw()I
+    invoke-interface {v2}, Lcom/yalantis/ucrop/c/f$b;->Bu()I
 
     move-result v2
 
@@ -160,7 +160,7 @@
     goto :goto_1
 
     :cond_2
-    invoke-virtual {v1}, Lcom/yalantis/ucrop/c/f;->Bv()I
+    invoke-virtual {v1}, Lcom/yalantis/ucrop/c/f;->Bt()I
 
     move-result v2
 
@@ -181,7 +181,7 @@
     :cond_3
     new-array v3, v2, [B
 
-    iget-object v1, v1, Lcom/yalantis/ucrop/c/f;->aZq:Lcom/yalantis/ucrop/c/f$b;
+    iget-object v1, v1, Lcom/yalantis/ucrop/c/f;->aZm: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 ee8e7e57b2..cd656ebda0 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 Bu()I
+.method public static Bs()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 f5718be225..f03428f058 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 Bw()I
+.method public abstract Bu()I
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -23,7 +23,7 @@
     .end annotation
 .end method
 
-.method public abstract Bx()S
+.method public abstract Bv()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 f90efd0bb3..6f4a935a54 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 aZr:Ljava/io/InputStream;
+.field private final aZn: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;->aZr:Ljava/io/InputStream;
+    iput-object p1, p0, Lcom/yalantis/ucrop/c/f$c;->aZn:Ljava/io/InputStream;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final Bw()I
+.method public final Bu()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;->aZr:Ljava/io/InputStream;
+    iget-object v0, p0, Lcom/yalantis/ucrop/c/f$c;->aZn: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;->aZr:Ljava/io/InputStream;
+    iget-object v1, p0, Lcom/yalantis/ucrop/c/f$c;->aZn:Ljava/io/InputStream;
 
     invoke-virtual {v1}, Ljava/io/InputStream;->read()I
 
@@ -67,7 +67,7 @@
     return v0
 .end method
 
-.method public final Bx()S
+.method public final Bv()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;->aZr:Ljava/io/InputStream;
+    iget-object v0, p0, Lcom/yalantis/ucrop/c/f$c;->aZn: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;->aZr:Ljava/io/InputStream;
+    iget-object v1, p0, Lcom/yalantis/ucrop/c/f$c;->aZn: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;->aZr:Ljava/io/InputStream;
+    iget-object v4, p0, Lcom/yalantis/ucrop/c/f$c;->aZn: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;->aZr:Ljava/io/InputStream;
+    iget-object v4, p0, Lcom/yalantis/ucrop/c/f$c;->aZn: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 b2f586ad8b..4d34ef3def 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 aZo:[B
+.field private static final aZk:[B
 
-.field private static final aZp:[I
+.field private static final aZl:[I
 
 
 # instance fields
-.field final aZq:Lcom/yalantis/ucrop/c/f$b;
+.field final aZm:Lcom/yalantis/ucrop/c/f$b;
 
 
 # direct methods
@@ -39,7 +39,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/yalantis/ucrop/c/f;->aZo:[B
+    sput-object v0, Lcom/yalantis/ucrop/c/f;->aZk:[B
 
     const/16 v0, 0xd
 
@@ -47,7 +47,7 @@
 
     fill-array-data v0, :array_0
 
-    sput-object v0, Lcom/yalantis/ucrop/c/f;->aZp:[I
+    sput-object v0, Lcom/yalantis/ucrop/c/f;->aZl:[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;->aZq:Lcom/yalantis/ucrop/c/f$b;
+    iput-object v0, p0, Lcom/yalantis/ucrop/c/f;->aZm: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;->aZp:[I
+    sget-object v9, Lcom/yalantis/ucrop/c/f;->aZl:[I
 
     aget v9, v9, v7
 
@@ -633,7 +633,7 @@
 .method static k([BI)Z
     .locals 4
 
-    sget-object v0, Lcom/yalantis/ucrop/c/f;->aZo:[B
+    sget-object v0, Lcom/yalantis/ucrop/c/f;->aZk:[B
 
     array-length v0, v0
 
@@ -654,7 +654,7 @@
     const/4 v0, 0x0
 
     :goto_1
-    sget-object v2, Lcom/yalantis/ucrop/c/f;->aZo:[B
+    sget-object v2, Lcom/yalantis/ucrop/c/f;->aZk:[B
 
     array-length v3, v2
 
@@ -682,7 +682,7 @@
 
 
 # virtual methods
-.method final Bv()I
+.method final Bt()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;->aZq:Lcom/yalantis/ucrop/c/f$b;
+    iget-object v0, p0, Lcom/yalantis/ucrop/c/f;->aZm:Lcom/yalantis/ucrop/c/f$b;
 
-    invoke-interface {v0}, Lcom/yalantis/ucrop/c/f$b;->Bx()S
+    invoke-interface {v0}, Lcom/yalantis/ucrop/c/f$b;->Bv()S
 
     move-result v0
 
@@ -729,9 +729,9 @@
     return v3
 
     :cond_2
-    iget-object v0, p0, Lcom/yalantis/ucrop/c/f;->aZq:Lcom/yalantis/ucrop/c/f$b;
+    iget-object v0, p0, Lcom/yalantis/ucrop/c/f;->aZm:Lcom/yalantis/ucrop/c/f$b;
 
-    invoke-interface {v0}, Lcom/yalantis/ucrop/c/f$b;->Bx()S
+    invoke-interface {v0}, Lcom/yalantis/ucrop/c/f$b;->Bv()S
 
     move-result v0
 
@@ -760,9 +760,9 @@
     return v3
 
     :cond_5
-    iget-object v1, p0, Lcom/yalantis/ucrop/c/f;->aZq:Lcom/yalantis/ucrop/c/f$b;
+    iget-object v1, p0, Lcom/yalantis/ucrop/c/f;->aZm:Lcom/yalantis/ucrop/c/f$b;
 
-    invoke-interface {v1}, Lcom/yalantis/ucrop/c/f$b;->Bw()I
+    invoke-interface {v1}, Lcom/yalantis/ucrop/c/f$b;->Bu()I
 
     move-result v1
 
@@ -772,7 +772,7 @@
 
     if-eq v0, v5, :cond_7
 
-    iget-object v5, p0, Lcom/yalantis/ucrop/c/f;->aZq:Lcom/yalantis/ucrop/c/f$b;
+    iget-object v5, p0, Lcom/yalantis/ucrop/c/f;->aZm: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 e79c639e61..547292c50b 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 aZA:Lcom/yalantis/ucrop/c/h$a;
+.field public aZo:F
 
-.field public aZs:F
+.field public aZp:F
 
-.field public aZt:F
+.field public aZq:F
+
+.field public aZr:F
+
+.field public aZs:I
+
+.field public aZt:I
 
 .field public aZu:F
 
-.field public aZv:F
+.field public aZv:Z
 
-.field public aZw:I
-
-.field public aZx:I
-
-.field public aZy:F
-
-.field public aZz:Z
+.field public aZw:Lcom/yalantis/ucrop/c/h$a;
 
 
 # direct methods
@@ -38,13 +38,13 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/yalantis/ucrop/c/h;->aZA:Lcom/yalantis/ucrop/c/h$a;
+    iput-object p1, p0, Lcom/yalantis/ucrop/c/h;->aZw:Lcom/yalantis/ucrop/c/h$a;
 
     const/4 p1, -0x1
 
-    iput p1, p0, Lcom/yalantis/ucrop/c/h;->aZw:I
+    iput p1, p0, Lcom/yalantis/ucrop/c/h;->aZs:I
 
-    iput p1, p0, Lcom/yalantis/ucrop/c/h;->aZx:I
+    iput p1, p0, Lcom/yalantis/ucrop/c/h;->aZt: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 2cbf0e5841..e5f66138a4 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 aZB:I
+.field private aZx:I
 
 
 # direct methods
@@ -13,7 +13,7 @@
 
     invoke-direct {p0}, Landroid/graphics/drawable/StateListDrawable;-><init>()V
 
-    iput p2, p0, Lcom/yalantis/ucrop/c/i;->aZB:I
+    iput p2, p0, Lcom/yalantis/ucrop/c/i;->aZx:I
 
     const/4 p2, 0x1
 
@@ -72,7 +72,7 @@
     :cond_1
     if-eqz v2, :cond_2
 
-    iget v0, p0, Lcom/yalantis/ucrop/c/i;->aZB:I
+    iget v0, p0, Lcom/yalantis/ucrop/c/i;->aZx: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 e6c4481b09..6d11d72eac 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 aYM:Ljava/lang/String;
+.field public final aYI:Ljava/lang/String;
 
-.field public final aYN:F
+.field public final aYJ:F
 
-.field public final aYO:F
+.field public final aYK:F
 
 
 # direct methods
@@ -48,19 +48,19 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/yalantis/ucrop/model/AspectRatio;->aYM:Ljava/lang/String;
+    iput-object v0, p0, Lcom/yalantis/ucrop/model/AspectRatio;->aYI:Ljava/lang/String;
 
     invoke-virtual {p1}, Landroid/os/Parcel;->readFloat()F
 
     move-result v0
 
-    iput v0, p0, Lcom/yalantis/ucrop/model/AspectRatio;->aYN:F
+    iput v0, p0, Lcom/yalantis/ucrop/model/AspectRatio;->aYJ:F
 
     invoke-virtual {p1}, Landroid/os/Parcel;->readFloat()F
 
     move-result p1
 
-    iput p1, p0, Lcom/yalantis/ucrop/model/AspectRatio;->aYO:F
+    iput p1, p0, Lcom/yalantis/ucrop/model/AspectRatio;->aYK: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;->aYM:Ljava/lang/String;
+    iput-object p1, p0, Lcom/yalantis/ucrop/model/AspectRatio;->aYI:Ljava/lang/String;
 
-    iput p2, p0, Lcom/yalantis/ucrop/model/AspectRatio;->aYN:F
+    iput p2, p0, Lcom/yalantis/ucrop/model/AspectRatio;->aYJ:F
 
-    iput p3, p0, Lcom/yalantis/ucrop/model/AspectRatio;->aYO:F
+    iput p3, p0, Lcom/yalantis/ucrop/model/AspectRatio;->aYK: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;->aYM:Ljava/lang/String;
+    iget-object p2, p0, Lcom/yalantis/ucrop/model/AspectRatio;->aYI:Ljava/lang/String;
 
     invoke-virtual {p1, p2}, Landroid/os/Parcel;->writeString(Ljava/lang/String;)V
 
-    iget p2, p0, Lcom/yalantis/ucrop/model/AspectRatio;->aYN:F
+    iget p2, p0, Lcom/yalantis/ucrop/model/AspectRatio;->aYJ:F
 
     invoke-virtual {p1, p2}, Landroid/os/Parcel;->writeFloat(F)V
 
-    iget p2, p0, Lcom/yalantis/ucrop/model/AspectRatio;->aYO:F
+    iget p2, p0, Lcom/yalantis/ucrop/model/AspectRatio;->aYK: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 d19b090976..e0371168f5 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:Landroid/graphics/Bitmap$CompressFormat;
+.field public aYC:Landroid/graphics/Bitmap$CompressFormat;
 
-.field public aYH:I
+.field public aYD:I
 
-.field public aYP:I
+.field public aYL:I
 
-.field public aYQ:I
+.field public aYM:I
 
-.field public aYR:Ljava/lang/String;
+.field public aYN:Ljava/lang/String;
 
-.field public aYS:Ljava/lang/String;
+.field public aYO:Ljava/lang/String;
 
-.field public aYT:Lcom/yalantis/ucrop/model/b;
+.field public aYP: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;->aYP:I
+    iput p1, p0, Lcom/yalantis/ucrop/model/a;->aYL:I
 
-    iput p2, p0, Lcom/yalantis/ucrop/model/a;->aYQ:I
+    iput p2, p0, Lcom/yalantis/ucrop/model/a;->aYM:I
 
-    iput-object p3, p0, Lcom/yalantis/ucrop/model/a;->aYG:Landroid/graphics/Bitmap$CompressFormat;
+    iput-object p3, p0, Lcom/yalantis/ucrop/model/a;->aYC:Landroid/graphics/Bitmap$CompressFormat;
 
-    iput p4, p0, Lcom/yalantis/ucrop/model/a;->aYH:I
+    iput p4, p0, Lcom/yalantis/ucrop/model/a;->aYD:I
 
-    iput-object p5, p0, Lcom/yalantis/ucrop/model/a;->aYR:Ljava/lang/String;
+    iput-object p5, p0, Lcom/yalantis/ucrop/model/a;->aYN:Ljava/lang/String;
 
-    iput-object p6, p0, Lcom/yalantis/ucrop/model/a;->aYS:Ljava/lang/String;
+    iput-object p6, p0, Lcom/yalantis/ucrop/model/a;->aYO:Ljava/lang/String;
 
-    iput-object p7, p0, Lcom/yalantis/ucrop/model/a;->aYT:Lcom/yalantis/ucrop/model/b;
+    iput-object p7, p0, Lcom/yalantis/ucrop/model/a;->aYP: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 90e1122381..d82d4107b2 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 Nw:I
+.field private Ns:I
 
-.field private aYU:I
+.field private aYQ:I
 
-.field private aYV:I
+.field private aYR:I
 
 
 # direct methods
@@ -17,11 +17,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput p1, p0, Lcom/yalantis/ucrop/model/b;->Nw:I
+    iput p1, p0, Lcom/yalantis/ucrop/model/b;->Ns:I
 
-    iput p2, p0, Lcom/yalantis/ucrop/model/b;->aYU:I
+    iput p2, p0, Lcom/yalantis/ucrop/model/b;->aYQ:I
 
-    iput p3, p0, Lcom/yalantis/ucrop/model/b;->aYV:I
+    iput p3, p0, Lcom/yalantis/ucrop/model/b;->aYR: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;->Nw:I
+    iget v2, p0, Lcom/yalantis/ucrop/model/b;->Ns:I
 
-    iget v3, p1, Lcom/yalantis/ucrop/model/b;->Nw:I
+    iget v3, p1, Lcom/yalantis/ucrop/model/b;->Ns:I
 
     if-eq v2, v3, :cond_2
 
     return v1
 
     :cond_2
-    iget v2, p0, Lcom/yalantis/ucrop/model/b;->aYU:I
+    iget v2, p0, Lcom/yalantis/ucrop/model/b;->aYQ:I
 
-    iget v3, p1, Lcom/yalantis/ucrop/model/b;->aYU:I
+    iget v3, p1, Lcom/yalantis/ucrop/model/b;->aYQ:I
 
     if-eq v2, v3, :cond_3
 
     return v1
 
     :cond_3
-    iget v2, p0, Lcom/yalantis/ucrop/model/b;->aYV:I
+    iget v2, p0, Lcom/yalantis/ucrop/model/b;->aYR:I
 
-    iget p1, p1, Lcom/yalantis/ucrop/model/b;->aYV:I
+    iget p1, p1, Lcom/yalantis/ucrop/model/b;->aYR: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;->Nw:I
+    iget v0, p0, Lcom/yalantis/ucrop/model/b;->Ns:I
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget v1, p0, Lcom/yalantis/ucrop/model/b;->aYU:I
+    iget v1, p0, Lcom/yalantis/ucrop/model/b;->aYQ:I
 
     add-int/2addr v0, v1
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget v1, p0, Lcom/yalantis/ucrop/model/b;->aYV:I
+    iget v1, p0, Lcom/yalantis/ucrop/model/b;->aYR: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 315f7ce7aa..d706744a06 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 aYW:Landroid/graphics/RectF;
+.field public aYS:Landroid/graphics/RectF;
 
-.field public aYX:Landroid/graphics/RectF;
+.field public aYT:Landroid/graphics/RectF;
 
-.field public aYY:F
+.field public aYU:F
 
-.field public aYZ:F
+.field public aYV:F
 
 
 # direct methods
@@ -19,13 +19,13 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/yalantis/ucrop/model/c;->aYW:Landroid/graphics/RectF;
+    iput-object p1, p0, Lcom/yalantis/ucrop/model/c;->aYS:Landroid/graphics/RectF;
 
-    iput-object p2, p0, Lcom/yalantis/ucrop/model/c;->aYX:Landroid/graphics/RectF;
+    iput-object p2, p0, Lcom/yalantis/ucrop/model/c;->aYT:Landroid/graphics/RectF;
 
-    iput p3, p0, Lcom/yalantis/ucrop/model/c;->aYY:F
+    iput p3, p0, Lcom/yalantis/ucrop/model/c;->aYU:F
 
-    iput p4, p0, Lcom/yalantis/ucrop/model/c;->aYZ:F
+    iput p4, p0, Lcom/yalantis/ucrop/model/c;->aYV: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 26e70d8f32..a815d2befe 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 bab:Lcom/yalantis/ucrop/view/GestureCropImageView;
+.field final synthetic aZX: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;->bab:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iput-object p1, p0, Lcom/yalantis/ucrop/view/GestureCropImageView$a;->aZX: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;->bab:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object v8, p0, Lcom/yalantis/ucrop/view/GestureCropImageView$a;->aZX: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;->aZG:Ljava/lang/Runnable;
+    iput-object v9, v8, Lcom/yalantis/ucrop/view/a;->aZC: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;->bab:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object p1, p0, Lcom/yalantis/ucrop/view/GestureCropImageView$a;->aZX: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 fe8613f3f5..355e08486b 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 bab:Lcom/yalantis/ucrop/view/GestureCropImageView;
+.field final synthetic aZX: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;->bab:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iput-object p1, p0, Lcom/yalantis/ucrop/view/GestureCropImageView$b;->aZX: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;->bab:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/GestureCropImageView$b;->aZX:Lcom/yalantis/ucrop/view/GestureCropImageView;
 
-    iget p1, p1, Lcom/yalantis/ucrop/c/h;->aZy:F
+    iget p1, p1, Lcom/yalantis/ucrop/c/h;->aZu:F
 
-    iget-object v1, p0, Lcom/yalantis/ucrop/view/GestureCropImageView$b;->bab:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object v1, p0, Lcom/yalantis/ucrop/view/GestureCropImageView$b;->aZX: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;->bab:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object v2, p0, Lcom/yalantis/ucrop/view/GestureCropImageView$b;->aZX: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 2604d3fcee..2568aa2473 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 bab:Lcom/yalantis/ucrop/view/GestureCropImageView;
+.field final synthetic aZX: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;->bab:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iput-object p1, p0, Lcom/yalantis/ucrop/view/GestureCropImageView$c;->aZX: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;->bab:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/GestureCropImageView$c;->aZX: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;->bab:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object v1, p0, Lcom/yalantis/ucrop/view/GestureCropImageView$c;->aZX: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;->bab:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object v2, p0, Lcom/yalantis/ucrop/view/GestureCropImageView$c;->aZX: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 c7e780fb52..ec2567dce3 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 aZV:Landroid/view/ScaleGestureDetector;
+.field private aZR:Landroid/view/ScaleGestureDetector;
 
-.field private aZW:Lcom/yalantis/ucrop/c/h;
+.field private aZS:Lcom/yalantis/ucrop/c/h;
 
-.field private aZX:F
+.field private aZT:F
 
-.field private aZY:F
+.field private aZU:F
 
-.field private aZZ:Z
+.field private aZV:Z
 
-.field private abe:Z
+.field private aZW:I
 
-.field private baa:I
+.field private aba:Z
 
-.field private oj:Landroid/view/GestureDetector;
+.field private ok:Landroid/view/GestureDetector;
 
 
 # direct methods
@@ -39,13 +39,13 @@
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->aZZ:Z
+    iput-boolean p1, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->aZV:Z
 
-    iput-boolean p1, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->abe:Z
+    iput-boolean p1, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->aba:Z
 
     const/4 p1, 0x5
 
-    iput p1, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->baa:I
+    iput p1, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->aZW:I
 
     return-void
 .end method
@@ -67,13 +67,13 @@
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->aZZ:Z
+    iput-boolean p1, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->aZV:Z
 
-    iput-boolean p1, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->abe:Z
+    iput-boolean p1, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->aba:Z
 
     const/4 p1, 0x5
 
-    iput p1, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->baa:I
+    iput p1, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->aZW: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;->aZX:F
+    iget p0, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->aZT: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;->aZY:F
+    iget p0, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->aZU:F
 
     return p0
 .end method
@@ -99,7 +99,7 @@
 .method public getDoubleTapScaleSteps()I
     .locals 1
 
-    iget v0, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->baa:I
+    iget v0, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->aZW:I
 
     return v0
 .end method
@@ -123,7 +123,7 @@
 
     float-to-double v1, v1
 
-    iget v3, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->baa:I
+    iget v3, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->aZW: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;->oj:Landroid/view/GestureDetector;
+    iput-object v0, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->ok: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;->aZV:Landroid/view/ScaleGestureDetector;
+    iput-object v0, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->aZR: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;->aZW:Lcom/yalantis/ucrop/c/h;
+    iput-object v0, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->aZS: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;->By()V
+    invoke-virtual {p0}, Lcom/yalantis/ucrop/view/GestureCropImageView;->Bw()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;->aZX:F
+    iput v0, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->aZT: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;->aZY:F
+    iput v0, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->aZU:F
 
     :cond_1
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->oj:Landroid/view/GestureDetector;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->ok:Landroid/view/GestureDetector;
 
     invoke-virtual {v0, p1}, Landroid/view/GestureDetector;->onTouchEvent(Landroid/view/MotionEvent;)Z
 
-    iget-boolean v0, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->abe:Z
+    iget-boolean v0, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->aba:Z
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->aZV:Landroid/view/ScaleGestureDetector;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->aZR: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;->aZZ:Z
+    iget-boolean v0, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->aZV:Z
 
     if-eqz v0, :cond_c
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->aZW:Lcom/yalantis/ucrop/c/h;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->aZS: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;->aZx:I
+    iput v5, v0, Lcom/yalantis/ucrop/c/h;->aZt:I
 
     goto/16 :goto_1
 
@@ -306,13 +306,13 @@
 
     move-result v1
 
-    iput v1, v0, Lcom/yalantis/ucrop/c/h;->aZs:F
+    iput v1, v0, Lcom/yalantis/ucrop/c/h;->aZo:F
 
     invoke-virtual {p1}, Landroid/view/MotionEvent;->getY()F
 
     move-result v1
 
-    iput v1, v0, Lcom/yalantis/ucrop/c/h;->aZt:F
+    iput v1, v0, Lcom/yalantis/ucrop/c/h;->aZp:F
 
     invoke-virtual {p1}, Landroid/view/MotionEvent;->getActionIndex()I
 
@@ -326,20 +326,20 @@
 
     move-result v1
 
-    iput v1, v0, Lcom/yalantis/ucrop/c/h;->aZx:I
+    iput v1, v0, Lcom/yalantis/ucrop/c/h;->aZt:I
 
-    iput v4, v0, Lcom/yalantis/ucrop/c/h;->aZy:F
+    iput v4, v0, Lcom/yalantis/ucrop/c/h;->aZu:F
 
-    iput-boolean v2, v0, Lcom/yalantis/ucrop/c/h;->aZz:Z
+    iput-boolean v2, v0, Lcom/yalantis/ucrop/c/h;->aZv:Z
 
     goto/16 :goto_1
 
     :cond_5
-    iget v3, v0, Lcom/yalantis/ucrop/c/h;->aZw:I
+    iget v3, v0, Lcom/yalantis/ucrop/c/h;->aZs:I
 
     if-eq v3, v5, :cond_c
 
-    iget v3, v0, Lcom/yalantis/ucrop/c/h;->aZx:I
+    iget v3, v0, Lcom/yalantis/ucrop/c/h;->aZt:I
 
     if-eq v3, v5, :cond_c
 
@@ -347,52 +347,52 @@
 
     move-result v3
 
-    iget v5, v0, Lcom/yalantis/ucrop/c/h;->aZx:I
+    iget v5, v0, Lcom/yalantis/ucrop/c/h;->aZt:I
 
     if-le v3, v5, :cond_c
 
-    iget v3, v0, Lcom/yalantis/ucrop/c/h;->aZw:I
+    iget v3, v0, Lcom/yalantis/ucrop/c/h;->aZs:I
 
     invoke-virtual {p1, v3}, Landroid/view/MotionEvent;->getX(I)F
 
     move-result v3
 
-    iget v5, v0, Lcom/yalantis/ucrop/c/h;->aZw:I
+    iget v5, v0, Lcom/yalantis/ucrop/c/h;->aZs:I
 
     invoke-virtual {p1, v5}, Landroid/view/MotionEvent;->getY(I)F
 
     move-result v5
 
-    iget v6, v0, Lcom/yalantis/ucrop/c/h;->aZx:I
+    iget v6, v0, Lcom/yalantis/ucrop/c/h;->aZt:I
 
     invoke-virtual {p1, v6}, Landroid/view/MotionEvent;->getX(I)F
 
     move-result v6
 
-    iget v7, v0, Lcom/yalantis/ucrop/c/h;->aZx:I
+    iget v7, v0, Lcom/yalantis/ucrop/c/h;->aZt:I
 
     invoke-virtual {p1, v7}, Landroid/view/MotionEvent;->getY(I)F
 
     move-result v7
 
-    iget-boolean v8, v0, Lcom/yalantis/ucrop/c/h;->aZz:Z
+    iget-boolean v8, v0, Lcom/yalantis/ucrop/c/h;->aZv:Z
 
     if-eqz v8, :cond_6
 
-    iput v4, v0, Lcom/yalantis/ucrop/c/h;->aZy:F
+    iput v4, v0, Lcom/yalantis/ucrop/c/h;->aZu:F
 
-    iput-boolean v1, v0, Lcom/yalantis/ucrop/c/h;->aZz:Z
+    iput-boolean v1, v0, Lcom/yalantis/ucrop/c/h;->aZv:Z
 
     goto :goto_0
 
     :cond_6
-    iget v1, v0, Lcom/yalantis/ucrop/c/h;->aZs:F
+    iget v1, v0, Lcom/yalantis/ucrop/c/h;->aZo:F
 
-    iget v4, v0, Lcom/yalantis/ucrop/c/h;->aZt:F
+    iget v4, v0, Lcom/yalantis/ucrop/c/h;->aZp:F
 
-    iget v8, v0, Lcom/yalantis/ucrop/c/h;->aZu:F
+    iget v8, v0, Lcom/yalantis/ucrop/c/h;->aZq:F
 
-    iget v9, v0, Lcom/yalantis/ucrop/c/h;->aZv:F
+    iget v9, v0, Lcom/yalantis/ucrop/c/h;->aZr:F
 
     sub-float/2addr v4, v9
 
@@ -446,9 +446,9 @@
 
     sub-float/2addr v4, v1
 
-    iput v4, v0, Lcom/yalantis/ucrop/c/h;->aZy:F
+    iput v4, v0, Lcom/yalantis/ucrop/c/h;->aZu:F
 
-    iget v1, v0, Lcom/yalantis/ucrop/c/h;->aZy:F
+    iget v1, v0, Lcom/yalantis/ucrop/c/h;->aZu:F
 
     const/high16 v4, -0x3ccc0000    # -180.0f
 
@@ -456,16 +456,16 @@
 
     if-gez v1, :cond_7
 
-    iget v1, v0, Lcom/yalantis/ucrop/c/h;->aZy:F
+    iget v1, v0, Lcom/yalantis/ucrop/c/h;->aZu:F
 
     add-float/2addr v1, v8
 
-    iput v1, v0, Lcom/yalantis/ucrop/c/h;->aZy:F
+    iput v1, v0, Lcom/yalantis/ucrop/c/h;->aZu:F
 
     goto :goto_0
 
     :cond_7
-    iget v1, v0, Lcom/yalantis/ucrop/c/h;->aZy:F
+    iget v1, v0, Lcom/yalantis/ucrop/c/h;->aZu:F
 
     const/high16 v4, 0x43340000    # 180.0f
 
@@ -473,35 +473,35 @@
 
     if-lez v1, :cond_8
 
-    iget v1, v0, Lcom/yalantis/ucrop/c/h;->aZy:F
+    iget v1, v0, Lcom/yalantis/ucrop/c/h;->aZu:F
 
     sub-float/2addr v1, v8
 
-    iput v1, v0, Lcom/yalantis/ucrop/c/h;->aZy:F
+    iput v1, v0, Lcom/yalantis/ucrop/c/h;->aZu:F
 
     :cond_8
     :goto_0
-    iget-object v1, v0, Lcom/yalantis/ucrop/c/h;->aZA:Lcom/yalantis/ucrop/c/h$a;
+    iget-object v1, v0, Lcom/yalantis/ucrop/c/h;->aZw:Lcom/yalantis/ucrop/c/h$a;
 
     if-eqz v1, :cond_9
 
-    iget-object v1, v0, Lcom/yalantis/ucrop/c/h;->aZA:Lcom/yalantis/ucrop/c/h$a;
+    iget-object v1, v0, Lcom/yalantis/ucrop/c/h;->aZw: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;->aZs:F
+    iput v6, v0, Lcom/yalantis/ucrop/c/h;->aZo:F
 
-    iput v7, v0, Lcom/yalantis/ucrop/c/h;->aZt:F
+    iput v7, v0, Lcom/yalantis/ucrop/c/h;->aZp:F
 
-    iput v3, v0, Lcom/yalantis/ucrop/c/h;->aZu:F
+    iput v3, v0, Lcom/yalantis/ucrop/c/h;->aZq:F
 
-    iput v5, v0, Lcom/yalantis/ucrop/c/h;->aZv:F
+    iput v5, v0, Lcom/yalantis/ucrop/c/h;->aZr:F
 
     goto :goto_1
 
     :cond_a
-    iput v5, v0, Lcom/yalantis/ucrop/c/h;->aZw:I
+    iput v5, v0, Lcom/yalantis/ucrop/c/h;->aZs:I
 
     goto :goto_1
 
@@ -510,13 +510,13 @@
 
     move-result v3
 
-    iput v3, v0, Lcom/yalantis/ucrop/c/h;->aZu:F
+    iput v3, v0, Lcom/yalantis/ucrop/c/h;->aZq:F
 
     invoke-virtual {p1}, Landroid/view/MotionEvent;->getY()F
 
     move-result v3
 
-    iput v3, v0, Lcom/yalantis/ucrop/c/h;->aZv:F
+    iput v3, v0, Lcom/yalantis/ucrop/c/h;->aZr: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;->aZw:I
+    iput v1, v0, Lcom/yalantis/ucrop/c/h;->aZs:I
 
-    iput v4, v0, Lcom/yalantis/ucrop/c/h;->aZy:F
+    iput v4, v0, Lcom/yalantis/ucrop/c/h;->aZu:F
 
-    iput-boolean v2, v0, Lcom/yalantis/ucrop/c/h;->aZz:Z
+    iput-boolean v2, v0, Lcom/yalantis/ucrop/c/h;->aZv:Z
 
     :cond_c
     :goto_1
@@ -551,7 +551,7 @@
 .method public setDoubleTapScaleSteps(I)V
     .locals 0
 
-    iput p1, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->baa:I
+    iput p1, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->aZW: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;->aZZ:Z
+    iput-boolean p1, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->aZV: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;->abe:Z
+    iput-boolean p1, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->aba: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 b25826f31c..e0b9c37660 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 NI:Landroid/graphics/RectF;
+.field private final NE:Landroid/graphics/RectF;
 
-.field private aZC:F
+.field private final aZY:Landroid/graphics/RectF;
 
-.field private baA:Lcom/yalantis/ucrop/a/d;
+.field protected aZZ:I
 
-.field private baB:Z
+.field private aZy:F
 
-.field private final bac:Landroid/graphics/RectF;
+.field protected baa:I
 
-.field protected bad:I
+.field protected bab:[F
 
-.field protected bae:I
+.field protected bac:[F
 
-.field protected baf:[F
+.field bad:I
 
-.field protected bag:[F
+.field bae:I
 
-.field bah:I
+.field private baf:[F
 
-.field bai:I
+.field bag:Z
 
-.field private baj:[F
+.field bah:Z
 
-.field bak:Z
+.field bai:Z
 
-.field bal:Z
+.field baj:I
 
-.field bam:Z
+.field private bak:Landroid/graphics/Path;
 
-.field ban:I
+.field bal:Landroid/graphics/Paint;
 
-.field private bao:Landroid/graphics/Path;
+.field bam:Landroid/graphics/Paint;
 
-.field bap:Landroid/graphics/Paint;
+.field ban:Landroid/graphics/Paint;
 
-.field baq:Landroid/graphics/Paint;
+.field bao:Landroid/graphics/Paint;
 
-.field bar:Landroid/graphics/Paint;
+.field private bap:I
 
-.field bas:Landroid/graphics/Paint;
+.field private baq:F
+
+.field private bar:F
+
+.field private bas:I
 
 .field private bat:I
 
-.field private bau:F
+.field private bau:I
 
-.field private bav:F
+.field private bav:I
 
-.field private baw:I
+.field private baw:Lcom/yalantis/ucrop/a/d;
 
-.field private bax:I
-
-.field private bay:I
-
-.field private baz:I
+.field private bax:Z
 
 
 # direct methods
@@ -91,23 +91,23 @@
 
     invoke-direct {p1}, Landroid/graphics/RectF;-><init>()V
 
-    iput-object p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bac:Landroid/graphics/RectF;
+    iput-object p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->aZY: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;->NI:Landroid/graphics/RectF;
+    iput-object p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->NE:Landroid/graphics/RectF;
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->baj:[F
+    iput-object p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->baf:[F
 
     new-instance p2, Landroid/graphics/Path;
 
     invoke-direct {p2}, Landroid/graphics/Path;-><init>()V
 
-    iput-object p2, p0, Lcom/yalantis/ucrop/view/OverlayView;->bao:Landroid/graphics/Path;
+    iput-object p2, p0, Lcom/yalantis/ucrop/view/OverlayView;->bak: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;->bap:Landroid/graphics/Paint;
+    iput-object p2, p0, Lcom/yalantis/ucrop/view/OverlayView;->bal: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;->baq:Landroid/graphics/Paint;
+    iput-object p2, p0, Lcom/yalantis/ucrop/view/OverlayView;->bam: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;->bar:Landroid/graphics/Paint;
+    iput-object p2, p0, Lcom/yalantis/ucrop/view/OverlayView;->ban: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;->bas:Landroid/graphics/Paint;
+    iput-object p2, p0, Lcom/yalantis/ucrop/view/OverlayView;->bao:Landroid/graphics/Paint;
 
     const/4 p2, 0x0
 
-    iput p2, p0, Lcom/yalantis/ucrop/view/OverlayView;->bat:I
+    iput p2, p0, Lcom/yalantis/ucrop/view/OverlayView;->bap:I
 
     const/high16 p2, -0x40800000    # -1.0f
 
-    iput p2, p0, Lcom/yalantis/ucrop/view/OverlayView;->bau:F
+    iput p2, p0, Lcom/yalantis/ucrop/view/OverlayView;->baq:F
 
-    iput p2, p0, Lcom/yalantis/ucrop/view/OverlayView;->bav:F
+    iput p2, p0, Lcom/yalantis/ucrop/view/OverlayView;->bar:F
 
     const/4 p2, -0x1
 
-    iput p2, p0, Lcom/yalantis/ucrop/view/OverlayView;->baw:I
+    iput p2, p0, Lcom/yalantis/ucrop/view/OverlayView;->bas: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;->bax:I
+    iput p2, p0, Lcom/yalantis/ucrop/view/OverlayView;->bat: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;->bay:I
+    iput p2, p0, Lcom/yalantis/ucrop/view/OverlayView;->bau: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;->baz:I
+    iput p2, p0, Lcom/yalantis/ucrop/view/OverlayView;->bav:I
 
     sget p2, Landroid/os/Build$VERSION;->SDK_INT:I
 
@@ -197,54 +197,54 @@
     return-void
 .end method
 
-.method private BB()V
+.method private Bz()V
     .locals 5
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bac:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->aZY: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;->baf:[F
+    iput-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bab:[F
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bac:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->aZY: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;->bag:[F
+    iput-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bac:[F
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->baj:[F
+    iput-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->baf:[F
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bao:Landroid/graphics/Path;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bak:Landroid/graphics/Path;
 
     invoke-virtual {v0}, Landroid/graphics/Path;->reset()V
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bao:Landroid/graphics/Path;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bak:Landroid/graphics/Path;
 
-    iget-object v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bac:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->aZY:Landroid/graphics/RectF;
 
     invoke-virtual {v1}, Landroid/graphics/RectF;->centerX()F
 
     move-result v1
 
-    iget-object v2, p0, Lcom/yalantis/ucrop/view/OverlayView;->bac:Landroid/graphics/RectF;
+    iget-object v2, p0, Lcom/yalantis/ucrop/view/OverlayView;->aZY:Landroid/graphics/RectF;
 
     invoke-virtual {v2}, Landroid/graphics/RectF;->centerY()F
 
     move-result v2
 
-    iget-object v3, p0, Lcom/yalantis/ucrop/view/OverlayView;->bac:Landroid/graphics/RectF;
+    iget-object v3, p0, Lcom/yalantis/ucrop/view/OverlayView;->aZY:Landroid/graphics/RectF;
 
     invoke-virtual {v3}, Landroid/graphics/RectF;->width()F
 
     move-result v3
 
-    iget-object v4, p0, Lcom/yalantis/ucrop/view/OverlayView;->bac:Landroid/graphics/RectF;
+    iget-object v4, p0, Lcom/yalantis/ucrop/view/OverlayView;->aZY: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;->bac:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->aZY: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;->bat:I
+    iget v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bap: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;->baA:Lcom/yalantis/ucrop/a/d;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->baw: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;->bam:Z
+    iget-boolean v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bai:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bao:Landroid/graphics/Path;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bak: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;->bac:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->aZY: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;->ban:I
+    iget v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->baj: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;->bam:Z
+    iget-boolean v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bai:Z
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bac:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->aZY:Landroid/graphics/RectF;
 
     invoke-virtual {v0}, Landroid/graphics/RectF;->centerX()F
 
     move-result v0
 
-    iget-object v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bac:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->aZY:Landroid/graphics/RectF;
 
     invoke-virtual {v1}, Landroid/graphics/RectF;->centerY()F
 
     move-result v1
 
-    iget-object v2, p0, Lcom/yalantis/ucrop/view/OverlayView;->bac:Landroid/graphics/RectF;
+    iget-object v2, p0, Lcom/yalantis/ucrop/view/OverlayView;->aZY:Landroid/graphics/RectF;
 
     invoke-virtual {v2}, Landroid/graphics/RectF;->width()F
 
     move-result v2
 
-    iget-object v3, p0, Lcom/yalantis/ucrop/view/OverlayView;->bac:Landroid/graphics/RectF;
+    iget-object v3, p0, Lcom/yalantis/ucrop/view/OverlayView;->aZY: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;->bap:Landroid/graphics/Paint;
+    iget-object v3, p0, Lcom/yalantis/ucrop/view/OverlayView;->bal: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;->bal:Z
+    iget-boolean v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bah:Z
 
     if-eqz v0, :cond_4
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->baj:[F
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->baf:[F
 
     if-nez v0, :cond_3
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bac:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->aZY: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;->bah:I
+    iget v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bad:I
 
     mul-int/lit8 v0, v0, 0x4
 
-    iget v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bai:I
+    iget v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bae: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;->baj:[F
+    iput-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->baf:[F
 
     const/4 v0, 0x0
 
@@ -402,27 +402,27 @@
     const/4 v2, 0x0
 
     :goto_1
-    iget v3, p0, Lcom/yalantis/ucrop/view/OverlayView;->bah:I
+    iget v3, p0, Lcom/yalantis/ucrop/view/OverlayView;->bad:I
 
     const/high16 v4, 0x3f800000    # 1.0f
 
     if-ge v1, v3, :cond_2
 
-    iget-object v3, p0, Lcom/yalantis/ucrop/view/OverlayView;->baj:[F
+    iget-object v3, p0, Lcom/yalantis/ucrop/view/OverlayView;->baf:[F
 
     add-int/lit8 v5, v2, 0x1
 
-    iget-object v6, p0, Lcom/yalantis/ucrop/view/OverlayView;->bac:Landroid/graphics/RectF;
+    iget-object v6, p0, Lcom/yalantis/ucrop/view/OverlayView;->aZY:Landroid/graphics/RectF;
 
     iget v6, v6, Landroid/graphics/RectF;->left:F
 
     aput v6, v3, v2
 
-    iget-object v2, p0, Lcom/yalantis/ucrop/view/OverlayView;->baj:[F
+    iget-object v2, p0, Lcom/yalantis/ucrop/view/OverlayView;->baf:[F
 
     add-int/lit8 v3, v5, 0x1
 
-    iget-object v6, p0, Lcom/yalantis/ucrop/view/OverlayView;->bac:Landroid/graphics/RectF;
+    iget-object v6, p0, Lcom/yalantis/ucrop/view/OverlayView;->aZY: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;->bah:I
+    iget v4, p0, Lcom/yalantis/ucrop/view/OverlayView;->bad: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;->bac:Landroid/graphics/RectF;
+    iget-object v4, p0, Lcom/yalantis/ucrop/view/OverlayView;->aZY: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;->baj:[F
+    iget-object v2, p0, Lcom/yalantis/ucrop/view/OverlayView;->baf:[F
 
     add-int/lit8 v4, v3, 0x1
 
-    iget-object v5, p0, Lcom/yalantis/ucrop/view/OverlayView;->bac:Landroid/graphics/RectF;
+    iget-object v5, p0, Lcom/yalantis/ucrop/view/OverlayView;->aZY:Landroid/graphics/RectF;
 
     iget v5, v5, Landroid/graphics/RectF;->right:F
 
     aput v5, v2, v3
 
-    iget-object v2, p0, Lcom/yalantis/ucrop/view/OverlayView;->baj:[F
+    iget-object v2, p0, Lcom/yalantis/ucrop/view/OverlayView;->baf:[F
 
     add-int/lit8 v3, v4, 0x1
 
-    iget-object v5, p0, Lcom/yalantis/ucrop/view/OverlayView;->bac:Landroid/graphics/RectF;
+    iget-object v5, p0, Lcom/yalantis/ucrop/view/OverlayView;->aZY:Landroid/graphics/RectF;
 
     invoke-virtual {v5}, Landroid/graphics/RectF;->height()F
 
     move-result v5
 
-    iget v6, p0, Lcom/yalantis/ucrop/view/OverlayView;->bah:I
+    iget v6, p0, Lcom/yalantis/ucrop/view/OverlayView;->bad: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;->bac:Landroid/graphics/RectF;
+    iget-object v6, p0, Lcom/yalantis/ucrop/view/OverlayView;->aZY: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;->bai:I
+    iget v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bae:I
 
     if-ge v0, v1, :cond_3
 
-    iget-object v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->baj:[F
+    iget-object v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->baf:[F
 
     add-int/lit8 v3, v2, 0x1
 
-    iget-object v5, p0, Lcom/yalantis/ucrop/view/OverlayView;->bac:Landroid/graphics/RectF;
+    iget-object v5, p0, Lcom/yalantis/ucrop/view/OverlayView;->aZY: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;->bai:I
+    iget v7, p0, Lcom/yalantis/ucrop/view/OverlayView;->bae: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;->bac:Landroid/graphics/RectF;
+    iget-object v7, p0, Lcom/yalantis/ucrop/view/OverlayView;->aZY: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;->baj:[F
+    iget-object v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->baf:[F
 
     add-int/lit8 v2, v3, 0x1
 
-    iget-object v5, p0, Lcom/yalantis/ucrop/view/OverlayView;->bac:Landroid/graphics/RectF;
+    iget-object v5, p0, Lcom/yalantis/ucrop/view/OverlayView;->aZY:Landroid/graphics/RectF;
 
     iget v5, v5, Landroid/graphics/RectF;->top:F
 
     aput v5, v1, v3
 
-    iget-object v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->baj:[F
+    iget-object v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->baf:[F
 
     add-int/lit8 v3, v2, 0x1
 
-    iget-object v5, p0, Lcom/yalantis/ucrop/view/OverlayView;->bac:Landroid/graphics/RectF;
+    iget-object v5, p0, Lcom/yalantis/ucrop/view/OverlayView;->aZY:Landroid/graphics/RectF;
 
     invoke-virtual {v5}, Landroid/graphics/RectF;->width()F
 
     move-result v5
 
-    iget v7, p0, Lcom/yalantis/ucrop/view/OverlayView;->bai:I
+    iget v7, p0, Lcom/yalantis/ucrop/view/OverlayView;->bae: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;->bac:Landroid/graphics/RectF;
+    iget-object v6, p0, Lcom/yalantis/ucrop/view/OverlayView;->aZY: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;->baj:[F
+    iget-object v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->baf:[F
 
     add-int/lit8 v2, v3, 0x1
 
-    iget-object v5, p0, Lcom/yalantis/ucrop/view/OverlayView;->bac:Landroid/graphics/RectF;
+    iget-object v5, p0, Lcom/yalantis/ucrop/view/OverlayView;->aZY: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;->baj:[F
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->baf:[F
 
     if-eqz v0, :cond_4
 
-    iget-object v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->baq:Landroid/graphics/Paint;
+    iget-object v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bam: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;->bak:Z
+    iget-boolean v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bag:Z
 
     if-eqz v0, :cond_5
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bac:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->aZY:Landroid/graphics/RectF;
 
-    iget-object v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bar:Landroid/graphics/Paint;
+    iget-object v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->ban: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;->bat:I
+    iget v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bap:I
 
     if-eqz v0, :cond_6
 
     invoke-virtual {p1}, Landroid/graphics/Canvas;->save()I
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->NI:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->NE:Landroid/graphics/RectF;
 
-    iget-object v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bac:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->aZY:Landroid/graphics/RectF;
 
     invoke-virtual {v0, v1}, Landroid/graphics/RectF;->set(Landroid/graphics/RectF;)V
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->NI:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->NE:Landroid/graphics/RectF;
 
-    iget v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->baz:I
+    iget v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bav: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;->NI:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->NE: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;->NI:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->NE:Landroid/graphics/RectF;
 
-    iget-object v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bac:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->aZY:Landroid/graphics/RectF;
 
     invoke-virtual {v0, v1}, Landroid/graphics/RectF;->set(Landroid/graphics/RectF;)V
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->NI:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->NE:Landroid/graphics/RectF;
 
-    iget v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->baz:I
+    iget v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bav: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;->NI:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->NE: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;->bac:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->aZY:Landroid/graphics/RectF;
 
-    iget-object v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bas:Landroid/graphics/Paint;
+    iget-object v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bao: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;->bad:I
+    iput p3, p0, Lcom/yalantis/ucrop/view/OverlayView;->aZZ:I
 
     sub-int/2addr p4, p2
 
-    iput p4, p0, Lcom/yalantis/ucrop/view/OverlayView;->bae:I
+    iput p4, p0, Lcom/yalantis/ucrop/view/OverlayView;->baa:I
 
-    iget-boolean p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->baB:Z
+    iget-boolean p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bax:Z
 
     if-eqz p1, :cond_0
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->baB:Z
+    iput-boolean p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bax:Z
 
-    iget p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->aZC:F
+    iget p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->aZy: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;->bac:Landroid/graphics/RectF;
+    iget-object v1, v0, Lcom/yalantis/ucrop/view/OverlayView;->aZY: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;->bat:I
+    iget v1, v0, Lcom/yalantis/ucrop/view/OverlayView;->bap:I
 
     if-nez v1, :cond_0
 
@@ -770,7 +770,7 @@
 
     if-nez v4, :cond_7
 
-    iget v4, v0, Lcom/yalantis/ucrop/view/OverlayView;->bax:I
+    iget v4, v0, Lcom/yalantis/ucrop/view/OverlayView;->bat: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;->baf:[F
+    iget-object v12, v0, Lcom/yalantis/ucrop/view/OverlayView;->bab:[F
 
     aget v12, v12, v4
 
@@ -797,7 +797,7 @@
 
     move-result-wide v12
 
-    iget-object v2, v0, Lcom/yalantis/ucrop/view/OverlayView;->baf:[F
+    iget-object v2, v0, Lcom/yalantis/ucrop/view/OverlayView;->bab:[F
 
     add-int/lit8 v17, v4, 0x1
 
@@ -831,13 +831,13 @@
     goto :goto_0
 
     :cond_2
-    iget v2, v0, Lcom/yalantis/ucrop/view/OverlayView;->bat:I
+    iget v2, v0, Lcom/yalantis/ucrop/view/OverlayView;->bap:I
 
     if-ne v2, v8, :cond_3
 
     if-gez v11, :cond_3
 
-    iget-object v2, v0, Lcom/yalantis/ucrop/view/OverlayView;->bac:Landroid/graphics/RectF;
+    iget-object v2, v0, Lcom/yalantis/ucrop/view/OverlayView;->aZY: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;->baw:I
+    iput v11, v0, Lcom/yalantis/ucrop/view/OverlayView;->bas:I
 
-    iget v2, v0, Lcom/yalantis/ucrop/view/OverlayView;->baw:I
+    iget v2, v0, Lcom/yalantis/ucrop/view/OverlayView;->bas: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;->bau:F
+    iput v2, v0, Lcom/yalantis/ucrop/view/OverlayView;->baq:F
 
-    iput v2, v0, Lcom/yalantis/ucrop/view/OverlayView;->bav:F
+    iput v2, v0, Lcom/yalantis/ucrop/view/OverlayView;->bar:F
 
     goto :goto_2
 
     :cond_5
-    iget v2, v0, Lcom/yalantis/ucrop/view/OverlayView;->bau:F
+    iget v2, v0, Lcom/yalantis/ucrop/view/OverlayView;->baq:F
 
     const/4 v4, 0x0
 
@@ -881,9 +881,9 @@
 
     if-gez v2, :cond_6
 
-    iput v1, v0, Lcom/yalantis/ucrop/view/OverlayView;->bau:F
+    iput v1, v0, Lcom/yalantis/ucrop/view/OverlayView;->baq:F
 
-    iput v3, v0, Lcom/yalantis/ucrop/view/OverlayView;->bav:F
+    iput v3, v0, Lcom/yalantis/ucrop/view/OverlayView;->bar:F
 
     :cond_6
     :goto_2
@@ -906,7 +906,7 @@
 
     if-ne v2, v8, :cond_15
 
-    iget v2, v0, Lcom/yalantis/ucrop/view/OverlayView;->baw:I
+    iget v2, v0, Lcom/yalantis/ucrop/view/OverlayView;->bas:I
 
     if-eq v2, v7, :cond_15
 
@@ -962,13 +962,13 @@
 
     move-result v2
 
-    iget-object v3, v0, Lcom/yalantis/ucrop/view/OverlayView;->NI:Landroid/graphics/RectF;
+    iget-object v3, v0, Lcom/yalantis/ucrop/view/OverlayView;->NE:Landroid/graphics/RectF;
 
-    iget-object v5, v0, Lcom/yalantis/ucrop/view/OverlayView;->bac:Landroid/graphics/RectF;
+    iget-object v5, v0, Lcom/yalantis/ucrop/view/OverlayView;->aZY:Landroid/graphics/RectF;
 
     invoke-virtual {v3, v5}, Landroid/graphics/RectF;->set(Landroid/graphics/RectF;)V
 
-    iget v3, v0, Lcom/yalantis/ucrop/view/OverlayView;->baw:I
+    iget v3, v0, Lcom/yalantis/ucrop/view/OverlayView;->bas: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;->NI:Landroid/graphics/RectF;
+    iget-object v3, v0, Lcom/yalantis/ucrop/view/OverlayView;->NE:Landroid/graphics/RectF;
 
-    iget v4, v0, Lcom/yalantis/ucrop/view/OverlayView;->bau:F
+    iget v4, v0, Lcom/yalantis/ucrop/view/OverlayView;->baq:F
 
     sub-float v4, v1, v4
 
-    iget v5, v0, Lcom/yalantis/ucrop/view/OverlayView;->bav:F
+    iget v5, v0, Lcom/yalantis/ucrop/view/OverlayView;->bar: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;->NI:Landroid/graphics/RectF;
+    iget-object v3, v0, Lcom/yalantis/ucrop/view/OverlayView;->NE: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;->NI:Landroid/graphics/RectF;
+    iget-object v3, v0, Lcom/yalantis/ucrop/view/OverlayView;->NE: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;->NI:Landroid/graphics/RectF;
+    iget-object v3, v0, Lcom/yalantis/ucrop/view/OverlayView;->NE: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;->NI:Landroid/graphics/RectF;
+    iget-object v3, v0, Lcom/yalantis/ucrop/view/OverlayView;->NE: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;->bac:Landroid/graphics/RectF;
+    iget-object v3, v0, Lcom/yalantis/ucrop/view/OverlayView;->aZY:Landroid/graphics/RectF;
 
-    iget-object v4, v0, Lcom/yalantis/ucrop/view/OverlayView;->NI:Landroid/graphics/RectF;
+    iget-object v4, v0, Lcom/yalantis/ucrop/view/OverlayView;->NE: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;->BB()V
+    invoke-direct/range {p0 .. p0}, Lcom/yalantis/ucrop/view/OverlayView;->Bz()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;->NI:Landroid/graphics/RectF;
+    iget-object v3, v0, Lcom/yalantis/ucrop/view/OverlayView;->NE:Landroid/graphics/RectF;
 
-    iget-object v4, v0, Lcom/yalantis/ucrop/view/OverlayView;->bac:Landroid/graphics/RectF;
+    iget-object v4, v0, Lcom/yalantis/ucrop/view/OverlayView;->aZY:Landroid/graphics/RectF;
 
     iget v4, v4, Landroid/graphics/RectF;->top:F
 
-    iget-object v5, v0, Lcom/yalantis/ucrop/view/OverlayView;->bac:Landroid/graphics/RectF;
+    iget-object v5, v0, Lcom/yalantis/ucrop/view/OverlayView;->aZY: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;->NI:Landroid/graphics/RectF;
+    iget-object v3, v0, Lcom/yalantis/ucrop/view/OverlayView;->NE:Landroid/graphics/RectF;
 
-    iget-object v4, v0, Lcom/yalantis/ucrop/view/OverlayView;->bac:Landroid/graphics/RectF;
+    iget-object v4, v0, Lcom/yalantis/ucrop/view/OverlayView;->aZY:Landroid/graphics/RectF;
 
     iget v4, v4, Landroid/graphics/RectF;->left:F
 
-    iget-object v5, v0, Lcom/yalantis/ucrop/view/OverlayView;->bac:Landroid/graphics/RectF;
+    iget-object v5, v0, Lcom/yalantis/ucrop/view/OverlayView;->aZY: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;->NI:Landroid/graphics/RectF;
+    iget-object v3, v0, Lcom/yalantis/ucrop/view/OverlayView;->NE:Landroid/graphics/RectF;
 
-    iget-object v4, v0, Lcom/yalantis/ucrop/view/OverlayView;->bac:Landroid/graphics/RectF;
+    iget-object v4, v0, Lcom/yalantis/ucrop/view/OverlayView;->aZY:Landroid/graphics/RectF;
 
     iget v4, v4, Landroid/graphics/RectF;->left:F
 
-    iget-object v5, v0, Lcom/yalantis/ucrop/view/OverlayView;->bac:Landroid/graphics/RectF;
+    iget-object v5, v0, Lcom/yalantis/ucrop/view/OverlayView;->aZY: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;->NI:Landroid/graphics/RectF;
+    iget-object v3, v0, Lcom/yalantis/ucrop/view/OverlayView;->NE:Landroid/graphics/RectF;
 
-    iget-object v4, v0, Lcom/yalantis/ucrop/view/OverlayView;->bac:Landroid/graphics/RectF;
+    iget-object v4, v0, Lcom/yalantis/ucrop/view/OverlayView;->aZY:Landroid/graphics/RectF;
 
     iget v4, v4, Landroid/graphics/RectF;->right:F
 
-    iget-object v5, v0, Lcom/yalantis/ucrop/view/OverlayView;->bac:Landroid/graphics/RectF;
+    iget-object v5, v0, Lcom/yalantis/ucrop/view/OverlayView;->aZY: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;->NI:Landroid/graphics/RectF;
+    iget-object v3, v0, Lcom/yalantis/ucrop/view/OverlayView;->NE:Landroid/graphics/RectF;
 
     invoke-virtual {v3}, Landroid/graphics/RectF;->height()F
 
     move-result v3
 
-    iget v4, v0, Lcom/yalantis/ucrop/view/OverlayView;->bay:I
+    iget v4, v0, Lcom/yalantis/ucrop/view/OverlayView;->bau: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;->NI:Landroid/graphics/RectF;
+    iget-object v4, v0, Lcom/yalantis/ucrop/view/OverlayView;->NE:Landroid/graphics/RectF;
 
     invoke-virtual {v4}, Landroid/graphics/RectF;->width()F
 
     move-result v4
 
-    iget v5, v0, Lcom/yalantis/ucrop/view/OverlayView;->bay:I
+    iget v5, v0, Lcom/yalantis/ucrop/view/OverlayView;->bau: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;->bac:Landroid/graphics/RectF;
+    iget-object v4, v0, Lcom/yalantis/ucrop/view/OverlayView;->aZY:Landroid/graphics/RectF;
 
     if-eqz v16, :cond_f
 
-    iget-object v5, v0, Lcom/yalantis/ucrop/view/OverlayView;->NI:Landroid/graphics/RectF;
+    iget-object v5, v0, Lcom/yalantis/ucrop/view/OverlayView;->NE: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;->NI:Landroid/graphics/RectF;
+    iget-object v6, v0, Lcom/yalantis/ucrop/view/OverlayView;->NE:Landroid/graphics/RectF;
 
     goto :goto_7
 
     :cond_10
-    iget-object v6, v0, Lcom/yalantis/ucrop/view/OverlayView;->bac:Landroid/graphics/RectF;
+    iget-object v6, v0, Lcom/yalantis/ucrop/view/OverlayView;->aZY: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;->NI:Landroid/graphics/RectF;
+    iget-object v7, v0, Lcom/yalantis/ucrop/view/OverlayView;->NE:Landroid/graphics/RectF;
 
     goto :goto_8
 
     :cond_11
-    iget-object v7, v0, Lcom/yalantis/ucrop/view/OverlayView;->bac:Landroid/graphics/RectF;
+    iget-object v7, v0, Lcom/yalantis/ucrop/view/OverlayView;->aZY: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;->NI:Landroid/graphics/RectF;
+    iget-object v9, v0, Lcom/yalantis/ucrop/view/OverlayView;->NE:Landroid/graphics/RectF;
 
     goto :goto_9
 
     :cond_12
-    iget-object v9, v0, Lcom/yalantis/ucrop/view/OverlayView;->bac:Landroid/graphics/RectF;
+    iget-object v9, v0, Lcom/yalantis/ucrop/view/OverlayView;->aZY: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;->BB()V
+    invoke-direct/range {p0 .. p0}, Lcom/yalantis/ucrop/view/OverlayView;->Bz()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;->bau:F
+    iput v1, v0, Lcom/yalantis/ucrop/view/OverlayView;->baq:F
 
-    iput v2, v0, Lcom/yalantis/ucrop/view/OverlayView;->bav:F
+    iput v2, v0, Lcom/yalantis/ucrop/view/OverlayView;->bar:F
 
     return v8
 
@@ -1250,17 +1250,17 @@
 
     const/high16 v1, -0x40800000    # -1.0f
 
-    iput v1, v0, Lcom/yalantis/ucrop/view/OverlayView;->bau:F
+    iput v1, v0, Lcom/yalantis/ucrop/view/OverlayView;->baq:F
 
-    iput v1, v0, Lcom/yalantis/ucrop/view/OverlayView;->bav:F
+    iput v1, v0, Lcom/yalantis/ucrop/view/OverlayView;->bar:F
 
-    iput v7, v0, Lcom/yalantis/ucrop/view/OverlayView;->baw:I
+    iput v7, v0, Lcom/yalantis/ucrop/view/OverlayView;->bas:I
 
-    iget-object v1, v0, Lcom/yalantis/ucrop/view/OverlayView;->baA:Lcom/yalantis/ucrop/a/d;
+    iget-object v1, v0, Lcom/yalantis/ucrop/view/OverlayView;->baw:Lcom/yalantis/ucrop/a/d;
 
     if-eqz v1, :cond_16
 
-    iget-object v2, v0, Lcom/yalantis/ucrop/view/OverlayView;->bac:Landroid/graphics/RectF;
+    iget-object v2, v0, Lcom/yalantis/ucrop/view/OverlayView;->aZY: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;->bam:Z
+    iput-boolean p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bai: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;->bar:Landroid/graphics/Paint;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->ban: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;->bar:Landroid/graphics/Paint;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->ban: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;->baq:Landroid/graphics/Paint;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bam: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;->bai:I
+    iput p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bae:I
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->baj:[F
+    iput-object p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->baf:[F
 
     return-void
 .end method
@@ -1331,11 +1331,11 @@
 .method public setCropGridRowCount(I)V
     .locals 0
 
-    iput p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bah:I
+    iput p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bad:I
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->baj:[F
+    iput-object p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->baf:[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;->baq:Landroid/graphics/Paint;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bam: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;->ban:I
+    iput p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->baj:I
 
     return-void
 .end method
@@ -1365,7 +1365,7 @@
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 
-    iput p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bat:I
+    iput p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bap:I
 
     return-void
 .end method
@@ -1373,7 +1373,7 @@
 .method public setFreestyleCropMode(I)V
     .locals 0
 
-    iput p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bat:I
+    iput p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bap: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;->baA:Lcom/yalantis/ucrop/a/d;
+    iput-object p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->baw: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;->bak:Z
+    iput-boolean p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bag: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;->bal:Z
+    iput-boolean p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bah:Z
 
     return-void
 .end method
@@ -1407,21 +1407,21 @@
 .method public setTargetAspectRatio(F)V
     .locals 6
 
-    iput p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->aZC:F
+    iput p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->aZy:F
 
-    iget p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bad:I
+    iget p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->aZZ:I
 
     if-lez p1, :cond_2
 
     int-to-float v0, p1
 
-    iget v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->aZC:F
+    iget v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->aZy:F
 
     div-float/2addr v0, v1
 
     float-to-int v0, v0
 
-    iget v2, p0, Lcom/yalantis/ucrop/view/OverlayView;->bae:I
+    iget v2, p0, Lcom/yalantis/ucrop/view/OverlayView;->baa: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;->bac:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->aZY: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;->bae:I
+    iget v4, p0, Lcom/yalantis/ucrop/view/OverlayView;->baa: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;->bac:Landroid/graphics/RectF;
+    iget-object p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->aZY: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;->bad:I
+    iget v5, p0, Lcom/yalantis/ucrop/view/OverlayView;->aZZ: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;->baA:Lcom/yalantis/ucrop/a/d;
+    iget-object p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->baw:Lcom/yalantis/ucrop/a/d;
 
     if-eqz p1, :cond_1
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bac:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->aZY: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;->BB()V
+    invoke-direct {p0}, Lcom/yalantis/ucrop/view/OverlayView;->Bz()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;->baB:Z
+    iput-boolean p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bax: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 e5ed3205ac..4495b712bd 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 baM:Lcom/yalantis/ucrop/view/UCropView;
+.field final synthetic baI: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;->baM:Lcom/yalantis/ucrop/view/UCropView;
+    iput-object p1, p0, Lcom/yalantis/ucrop/view/UCropView$1;->baI: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;->baM:Lcom/yalantis/ucrop/view/UCropView;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/UCropView$1;->baI: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 fb81d4f250..03dc67686c 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 baM:Lcom/yalantis/ucrop/view/UCropView;
+.field final synthetic baI: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;->baM:Lcom/yalantis/ucrop/view/UCropView;
+    iput-object p1, p0, Lcom/yalantis/ucrop/view/UCropView$2;->baI: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;->baM:Lcom/yalantis/ucrop/view/UCropView;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/UCropView$2;->baI: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 585855c456..9f6be64244 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 aYu:Lcom/yalantis/ucrop/view/GestureCropImageView;
+.field private aYq:Lcom/yalantis/ucrop/view/GestureCropImageView;
 
-.field private final baL:Lcom/yalantis/ucrop/view/OverlayView;
+.field private final baH: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;->aYu:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iput-object p3, p0, Lcom/yalantis/ucrop/view/UCropView;->aYq: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;->baL:Lcom/yalantis/ucrop/view/OverlayView;
+    iput-object p3, p0, Lcom/yalantis/ucrop/view/UCropView;->baH: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;->baL:Lcom/yalantis/ucrop/view/OverlayView;
+    iget-object p2, p0, Lcom/yalantis/ucrop/view/UCropView;->baH: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;->bam:Z
+    iput-boolean p3, p2, Lcom/yalantis/ucrop/view/OverlayView;->bai: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;->ban:I
+    iput p3, p2, Lcom/yalantis/ucrop/view/OverlayView;->baj:I
 
-    iget-object p3, p2, Lcom/yalantis/ucrop/view/OverlayView;->bap:Landroid/graphics/Paint;
+    iget-object p3, p2, Lcom/yalantis/ucrop/view/OverlayView;->bal:Landroid/graphics/Paint;
 
-    iget v0, p2, Lcom/yalantis/ucrop/view/OverlayView;->ban:I
+    iget v0, p2, Lcom/yalantis/ucrop/view/OverlayView;->baj:I
 
     invoke-virtual {p3, v0}, Landroid/graphics/Paint;->setColor(I)V
 
-    iget-object p3, p2, Lcom/yalantis/ucrop/view/OverlayView;->bap:Landroid/graphics/Paint;
+    iget-object p3, p2, Lcom/yalantis/ucrop/view/OverlayView;->bal: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;->bap:Landroid/graphics/Paint;
+    iget-object p3, p2, Lcom/yalantis/ucrop/view/OverlayView;->bal: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;->bar:Landroid/graphics/Paint;
+    iget-object v2, p2, Lcom/yalantis/ucrop/view/OverlayView;->ban: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;->bar:Landroid/graphics/Paint;
+    iget-object v2, p2, Lcom/yalantis/ucrop/view/OverlayView;->ban:Landroid/graphics/Paint;
 
     invoke-virtual {v2, v0}, Landroid/graphics/Paint;->setColor(I)V
 
-    iget-object v2, p2, Lcom/yalantis/ucrop/view/OverlayView;->bar:Landroid/graphics/Paint;
+    iget-object v2, p2, Lcom/yalantis/ucrop/view/OverlayView;->ban: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;->bas:Landroid/graphics/Paint;
+    iget-object v2, p2, Lcom/yalantis/ucrop/view/OverlayView;->bao: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;->bas:Landroid/graphics/Paint;
+    iget-object p3, p2, Lcom/yalantis/ucrop/view/OverlayView;->bao:Landroid/graphics/Paint;
 
     invoke-virtual {p3, v0}, Landroid/graphics/Paint;->setColor(I)V
 
-    iget-object p3, p2, Lcom/yalantis/ucrop/view/OverlayView;->bas:Landroid/graphics/Paint;
+    iget-object p3, p2, Lcom/yalantis/ucrop/view/OverlayView;->bao: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;->bak:Z
+    iput-boolean p3, p2, Lcom/yalantis/ucrop/view/OverlayView;->bag: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;->baq:Landroid/graphics/Paint;
+    iget-object v2, p2, Lcom/yalantis/ucrop/view/OverlayView;->bam: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;->baq:Landroid/graphics/Paint;
+    iget-object p3, p2, Lcom/yalantis/ucrop/view/OverlayView;->bam: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;->bah:I
+    iput p3, p2, Lcom/yalantis/ucrop/view/OverlayView;->bad: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;->bai:I
+    iput p3, p2, Lcom/yalantis/ucrop/view/OverlayView;->bae: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;->bal:Z
+    iput-boolean p3, p2, Lcom/yalantis/ucrop/view/OverlayView;->bah:Z
 
-    iget-object p2, p0, Lcom/yalantis/ucrop/view/UCropView;->aYu:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object p2, p0, Lcom/yalantis/ucrop/view/UCropView;->aYq: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;->aZC:F
+    iput p3, p2, Lcom/yalantis/ucrop/view/a;->aZy:F
 
     goto :goto_1
 
     :cond_1
     :goto_0
-    iput v0, p2, Lcom/yalantis/ucrop/view/a;->aZC:F
+    iput v0, p2, Lcom/yalantis/ucrop/view/a;->aZy:F
 
     :goto_1
     invoke-virtual {p1}, Landroid/content/res/TypedArray;->recycle()V
 
-    iget-object p1, p0, Lcom/yalantis/ucrop/view/UCropView;->aYu:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object p1, p0, Lcom/yalantis/ucrop/view/UCropView;->aYq: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;->baL:Lcom/yalantis/ucrop/view/OverlayView;
+    iget-object p1, p0, Lcom/yalantis/ucrop/view/UCropView;->baH: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;->baL:Lcom/yalantis/ucrop/view/OverlayView;
+    iget-object p0, p0, Lcom/yalantis/ucrop/view/UCropView;->baH: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;->aYu:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object p0, p0, Lcom/yalantis/ucrop/view/UCropView;->aYq: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;->aYu:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/UCropView;->aYq: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;->baL:Lcom/yalantis/ucrop/view/OverlayView;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/UCropView;->baH: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 6d1b50367a..32cbcd3567 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 aZK:Ljava/lang/ref/WeakReference;
+.field private final aZG: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 aZL:J
+.field private final aZH:J
+
+.field private final aZI:F
+
+.field private final aZJ:F
+
+.field private final aZK:F
+
+.field private final aZL:F
 
 .field private final aZM:F
 
 .field private final aZN:F
 
-.field private final aZO:F
-
-.field private final aZP:F
-
-.field private final aZQ:F
-
-.field private final aZR:F
-
-.field private final aZS:Z
+.field private final aZO: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;->aZK:Ljava/lang/ref/WeakReference;
+    iput-object v0, p0, Lcom/yalantis/ucrop/view/a$a;->aZG:Ljava/lang/ref/WeakReference;
 
-    iput-wide p2, p0, Lcom/yalantis/ucrop/view/a$a;->aZL:J
+    iput-wide p2, p0, Lcom/yalantis/ucrop/view/a$a;->aZH: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;->aZM:F
+    iput p4, p0, Lcom/yalantis/ucrop/view/a$a;->aZI:F
 
-    iput p5, p0, Lcom/yalantis/ucrop/view/a$a;->aZN:F
+    iput p5, p0, Lcom/yalantis/ucrop/view/a$a;->aZJ:F
 
-    iput p6, p0, Lcom/yalantis/ucrop/view/a$a;->aZO:F
+    iput p6, p0, Lcom/yalantis/ucrop/view/a$a;->aZK:F
 
-    iput p7, p0, Lcom/yalantis/ucrop/view/a$a;->aZP:F
+    iput p7, p0, Lcom/yalantis/ucrop/view/a$a;->aZL:F
 
-    iput p8, p0, Lcom/yalantis/ucrop/view/a$a;->aZQ:F
+    iput p8, p0, Lcom/yalantis/ucrop/view/a$a;->aZM:F
 
-    iput p9, p0, Lcom/yalantis/ucrop/view/a$a;->aZR:F
+    iput p9, p0, Lcom/yalantis/ucrop/view/a$a;->aZN:F
 
-    iput-boolean p10, p0, Lcom/yalantis/ucrop/view/a$a;->aZS:Z
+    iput-boolean p10, p0, Lcom/yalantis/ucrop/view/a$a;->aZO: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;->aZK:Ljava/lang/ref/WeakReference;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/a$a;->aZG: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;->aZL:J
+    iget-wide v3, p0, Lcom/yalantis/ucrop/view/a$a;->aZH: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;->aZO:F
+    iget v2, p0, Lcom/yalantis/ucrop/view/a$a;->aZK:F
 
-    iget-wide v3, p0, Lcom/yalantis/ucrop/view/a$a;->aZL:J
+    iget-wide v3, p0, Lcom/yalantis/ucrop/view/a$a;->aZH:J
 
     long-to-float v3, v3
 
@@ -128,9 +128,9 @@
 
     move-result v2
 
-    iget v3, p0, Lcom/yalantis/ucrop/view/a$a;->aZP:F
+    iget v3, p0, Lcom/yalantis/ucrop/view/a$a;->aZL:F
 
-    iget-wide v4, p0, Lcom/yalantis/ucrop/view/a$a;->aZL:J
+    iget-wide v4, p0, Lcom/yalantis/ucrop/view/a$a;->aZH:J
 
     long-to-float v4, v4
 
@@ -138,9 +138,9 @@
 
     move-result v3
 
-    iget v4, p0, Lcom/yalantis/ucrop/view/a$a;->aZR:F
+    iget v4, p0, Lcom/yalantis/ucrop/view/a$a;->aZN:F
 
-    iget-wide v5, p0, Lcom/yalantis/ucrop/view/a$a;->aZL:J
+    iget-wide v5, p0, Lcom/yalantis/ucrop/view/a$a;->aZH:J
 
     long-to-float v5, v5
 
@@ -148,7 +148,7 @@
 
     move-result v4
 
-    iget-wide v5, p0, Lcom/yalantis/ucrop/view/a$a;->aZL:J
+    iget-wide v5, p0, Lcom/yalantis/ucrop/view/a$a;->aZH:J
 
     long-to-float v5, v5
 
@@ -156,25 +156,25 @@
 
     if-gez v1, :cond_2
 
-    iget-object v1, v0, Lcom/yalantis/ucrop/view/a;->baD:[F
+    iget-object v1, v0, Lcom/yalantis/ucrop/view/a;->baz:[F
 
     const/4 v5, 0x0
 
     aget v1, v1, v5
 
-    iget v5, p0, Lcom/yalantis/ucrop/view/a$a;->aZM:F
+    iget v5, p0, Lcom/yalantis/ucrop/view/a$a;->aZI:F
 
     sub-float/2addr v1, v5
 
     sub-float/2addr v2, v1
 
-    iget-object v1, v0, Lcom/yalantis/ucrop/view/a;->baD:[F
+    iget-object v1, v0, Lcom/yalantis/ucrop/view/a;->baz:[F
 
     const/4 v5, 0x1
 
     aget v1, v1, v5
 
-    iget v5, p0, Lcom/yalantis/ucrop/view/a$a;->aZN:F
+    iget v5, p0, Lcom/yalantis/ucrop/view/a$a;->aZJ: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;->aZS:Z
+    iget-boolean v1, p0, Lcom/yalantis/ucrop/view/a$a;->aZO:Z
 
     if-nez v1, :cond_1
 
-    iget v1, p0, Lcom/yalantis/ucrop/view/a$a;->aZQ:F
+    iget v1, p0, Lcom/yalantis/ucrop/view/a$a;->aZM: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;->BA()Z
+    invoke-virtual {v0}, Lcom/yalantis/ucrop/view/a;->By()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 16b648068b..9c7aba9048 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 aZK:Ljava/lang/ref/WeakReference;
+.field private final aZG:Ljava/lang/ref/WeakReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/ref/WeakReference<",
@@ -28,16 +28,16 @@
     .end annotation
 .end field
 
-.field private final aZL:J
+.field private final aZH:J
+
+.field private final aZM:F
+
+.field private final aZN:F
+
+.field private final aZP:F
 
 .field private final aZQ:F
 
-.field private final aZR:F
-
-.field private final aZT: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;->aZK:Ljava/lang/ref/WeakReference;
+    iput-object p2, p0, Lcom/yalantis/ucrop/view/a$b;->aZG: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;->aZL:J
+    iput-wide p1, p0, Lcom/yalantis/ucrop/view/a$b;->aZH:J
 
-    iput p4, p0, Lcom/yalantis/ucrop/view/a$b;->aZQ:F
+    iput p4, p0, Lcom/yalantis/ucrop/view/a$b;->aZM:F
 
-    iput p5, p0, Lcom/yalantis/ucrop/view/a$b;->aZR:F
+    iput p5, p0, Lcom/yalantis/ucrop/view/a$b;->aZN:F
 
-    iput p6, p0, Lcom/yalantis/ucrop/view/a$b;->aZT:F
+    iput p6, p0, Lcom/yalantis/ucrop/view/a$b;->aZP:F
 
-    iput p7, p0, Lcom/yalantis/ucrop/view/a$b;->aZU:F
+    iput p7, p0, Lcom/yalantis/ucrop/view/a$b;->aZQ: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;->aZK:Ljava/lang/ref/WeakReference;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/a$b;->aZG: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;->aZL:J
+    iget-wide v3, p0, Lcom/yalantis/ucrop/view/a$b;->aZH: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;->aZR:F
+    iget v2, p0, Lcom/yalantis/ucrop/view/a$b;->aZN:F
 
-    iget-wide v3, p0, Lcom/yalantis/ucrop/view/a$b;->aZL:J
+    iget-wide v3, p0, Lcom/yalantis/ucrop/view/a$b;->aZH:J
 
     long-to-float v3, v3
 
@@ -118,7 +118,7 @@
 
     move-result v2
 
-    iget-wide v3, p0, Lcom/yalantis/ucrop/view/a$b;->aZL:J
+    iget-wide v3, p0, Lcom/yalantis/ucrop/view/a$b;->aZH:J
 
     long-to-float v3, v3
 
@@ -126,13 +126,13 @@
 
     if-gez v1, :cond_1
 
-    iget v1, p0, Lcom/yalantis/ucrop/view/a$b;->aZQ:F
+    iget v1, p0, Lcom/yalantis/ucrop/view/a$b;->aZM:F
 
     add-float/2addr v1, v2
 
-    iget v2, p0, Lcom/yalantis/ucrop/view/a$b;->aZT:F
+    iget v2, p0, Lcom/yalantis/ucrop/view/a$b;->aZP:F
 
-    iget v3, p0, Lcom/yalantis/ucrop/view/a$b;->aZU:F
+    iget v3, p0, Lcom/yalantis/ucrop/view/a$b;->aZQ: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 f8bcecdfc5..25c1102b0c 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 aYP:I
+.field private aYL:I
 
-.field private aYQ:I
+.field private aYM:I
 
-.field public final aYW:Landroid/graphics/RectF;
+.field public final aYS:Landroid/graphics/RectF;
 
-.field aZC:F
+.field private aZA:Lcom/yalantis/ucrop/a/c;
+
+.field private aZB:Ljava/lang/Runnable;
+
+.field aZC:Ljava/lang/Runnable;
 
 .field private aZD:F
 
-.field private aZE:Lcom/yalantis/ucrop/a/c;
+.field private aZE:F
 
-.field private aZF:Ljava/lang/Runnable;
+.field private aZF:J
 
-.field aZG:Ljava/lang/Runnable;
+.field aZy:F
 
-.field private aZH:F
-
-.field private aZI:F
-
-.field private aZJ:J
+.field private aZz:F
 
 .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;->aYW:Landroid/graphics/RectF;
+    iput-object p1, p0, Lcom/yalantis/ucrop/view/a;->aYS: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;->aZD:F
+    iput p1, p0, Lcom/yalantis/ucrop/view/a;->aZz:F
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/yalantis/ucrop/view/a;->aZG:Ljava/lang/Runnable;
+    iput-object p1, p0, Lcom/yalantis/ucrop/view/a;->aZC:Ljava/lang/Runnable;
 
     const/4 p1, 0x0
 
-    iput p1, p0, Lcom/yalantis/ucrop/view/a;->aYP:I
+    iput p1, p0, Lcom/yalantis/ucrop/view/a;->aYL:I
 
-    iput p1, p0, Lcom/yalantis/ucrop/view/a;->aYQ:I
+    iput p1, p0, Lcom/yalantis/ucrop/view/a;->aYM:I
 
     const-wide/16 p1, 0x1f4
 
-    iput-wide p1, p0, Lcom/yalantis/ucrop/view/a;->aZJ:J
+    iput-wide p1, p0, Lcom/yalantis/ucrop/view/a;->aZF: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;->aYW:Landroid/graphics/RectF;
+    iget-object p0, p0, Lcom/yalantis/ucrop/view/a;->aYS: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;->aYW:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->aYS: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;->aYW:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->aYS: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;->aYW:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/yalantis/ucrop/view/a;->aYS: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;->aYW:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/yalantis/ucrop/view/a;->aYS: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;->aYW:Landroid/graphics/RectF;
+    iget-object p2, p0, Lcom/yalantis/ucrop/view/a;->aYS:Landroid/graphics/RectF;
 
     invoke-virtual {p2}, Landroid/graphics/RectF;->height()F
 
@@ -204,51 +204,39 @@
 
     move-result p1
 
-    iput p1, p0, Lcom/yalantis/ucrop/view/a;->aZI:F
+    iput p1, p0, Lcom/yalantis/ucrop/view/a;->aZE:F
 
-    iget p1, p0, Lcom/yalantis/ucrop/view/a;->aZI:F
+    iget p1, p0, Lcom/yalantis/ucrop/view/a;->aZE:F
 
-    iget p2, p0, Lcom/yalantis/ucrop/view/a;->aZD:F
+    iget p2, p0, Lcom/yalantis/ucrop/view/a;->aZz:F
 
     mul-float p1, p1, p2
 
-    iput p1, p0, Lcom/yalantis/ucrop/view/a;->aZH:F
+    iput p1, p0, Lcom/yalantis/ucrop/view/a;->aZD:F
 
     return-void
 .end method
 
 
 # virtual methods
-.method protected final BA()Z
+.method public final Bw()V
     .locals 1
 
-    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;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->aZB: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;->aZG:Ljava/lang/Runnable;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->aZC:Ljava/lang/Runnable;
 
     invoke-virtual {p0, v0}, Lcom/yalantis/ucrop/view/a;->removeCallbacks(Ljava/lang/Runnable;)Z
 
     return-void
 .end method
 
-.method protected final Bz()V
+.method protected final Bx()V
     .locals 8
 
-    invoke-super {p0}, Lcom/yalantis/ucrop/view/b;->Bz()V
+    invoke-super {p0}, Lcom/yalantis/ucrop/view/b;->Bx()V
 
     invoke-virtual {p0}, Lcom/yalantis/ucrop/view/a;->getDrawable()Landroid/graphics/drawable/Drawable;
 
@@ -271,7 +259,7 @@
 
     int-to-float v0, v0
 
-    iget v2, p0, Lcom/yalantis/ucrop/view/a;->aZC:F
+    iget v2, p0, Lcom/yalantis/ucrop/view/a;->aZy:F
 
     const/4 v3, 0x0
 
@@ -281,40 +269,40 @@
 
     div-float v2, v1, v0
 
-    iput v2, p0, Lcom/yalantis/ucrop/view/a;->aZC:F
+    iput v2, p0, Lcom/yalantis/ucrop/view/a;->aZy:F
 
     :cond_1
-    iget v2, p0, Lcom/yalantis/ucrop/view/a;->bad:I
+    iget v2, p0, Lcom/yalantis/ucrop/view/a;->aZZ:I
 
     int-to-float v2, v2
 
-    iget v4, p0, Lcom/yalantis/ucrop/view/a;->aZC:F
+    iget v4, p0, Lcom/yalantis/ucrop/view/a;->aZy:F
 
     div-float/2addr v2, v4
 
     float-to-int v2, v2
 
-    iget v4, p0, Lcom/yalantis/ucrop/view/a;->bae:I
+    iget v4, p0, Lcom/yalantis/ucrop/view/a;->baa:I
 
     if-le v2, v4, :cond_2
 
-    iget v2, p0, Lcom/yalantis/ucrop/view/a;->bae:I
+    iget v2, p0, Lcom/yalantis/ucrop/view/a;->baa:I
 
     int-to-float v2, v2
 
-    iget v4, p0, Lcom/yalantis/ucrop/view/a;->aZC:F
+    iget v4, p0, Lcom/yalantis/ucrop/view/a;->aZy:F
 
     mul-float v2, v2, v4
 
     float-to-int v2, v2
 
-    iget v4, p0, Lcom/yalantis/ucrop/view/a;->bad:I
+    iget v4, p0, Lcom/yalantis/ucrop/view/a;->aZZ:I
 
     sub-int/2addr v4, v2
 
     div-int/lit8 v4, v4, 0x2
 
-    iget-object v5, p0, Lcom/yalantis/ucrop/view/a;->aYW:Landroid/graphics/RectF;
+    iget-object v5, p0, Lcom/yalantis/ucrop/view/a;->aYS:Landroid/graphics/RectF;
 
     int-to-float v6, v4
 
@@ -322,7 +310,7 @@
 
     int-to-float v2, v2
 
-    iget v4, p0, Lcom/yalantis/ucrop/view/a;->bae:I
+    iget v4, p0, Lcom/yalantis/ucrop/view/a;->baa:I
 
     int-to-float v4, v4
 
@@ -331,17 +319,17 @@
     goto :goto_0
 
     :cond_2
-    iget v4, p0, Lcom/yalantis/ucrop/view/a;->bae:I
+    iget v4, p0, Lcom/yalantis/ucrop/view/a;->baa:I
 
     sub-int/2addr v4, v2
 
     div-int/lit8 v4, v4, 0x2
 
-    iget-object v5, p0, Lcom/yalantis/ucrop/view/a;->aYW:Landroid/graphics/RectF;
+    iget-object v5, p0, Lcom/yalantis/ucrop/view/a;->aYS:Landroid/graphics/RectF;
 
     int-to-float v6, v4
 
-    iget v7, p0, Lcom/yalantis/ucrop/view/a;->bad:I
+    iget v7, p0, Lcom/yalantis/ucrop/view/a;->aZZ:I
 
     int-to-float v7, v7
 
@@ -354,19 +342,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;->aYW:Landroid/graphics/RectF;
+    iget-object v2, p0, Lcom/yalantis/ucrop/view/a;->aYS:Landroid/graphics/RectF;
 
     invoke-virtual {v2}, Landroid/graphics/RectF;->width()F
 
     move-result v2
 
-    iget-object v3, p0, Lcom/yalantis/ucrop/view/a;->aYW:Landroid/graphics/RectF;
+    iget-object v3, p0, Lcom/yalantis/ucrop/view/a;->aYS:Landroid/graphics/RectF;
 
     invoke-virtual {v3}, Landroid/graphics/RectF;->height()F
 
     move-result v3
 
-    iget-object v4, p0, Lcom/yalantis/ucrop/view/a;->aYW:Landroid/graphics/RectF;
+    iget-object v4, p0, Lcom/yalantis/ucrop/view/a;->aYS:Landroid/graphics/RectF;
 
     invoke-virtual {v4}, Landroid/graphics/RectF;->width()F
 
@@ -374,7 +362,7 @@
 
     div-float/2addr v4, v1
 
-    iget-object v5, p0, Lcom/yalantis/ucrop/view/a;->aYW:Landroid/graphics/RectF;
+    iget-object v5, p0, Lcom/yalantis/ucrop/view/a;->aYS:Landroid/graphics/RectF;
 
     invoke-virtual {v5}, Landroid/graphics/RectF;->height()F
 
@@ -394,7 +382,7 @@
 
     div-float/2addr v2, v1
 
-    iget-object v5, p0, Lcom/yalantis/ucrop/view/a;->aYW:Landroid/graphics/RectF;
+    iget-object v5, p0, Lcom/yalantis/ucrop/view/a;->aYS:Landroid/graphics/RectF;
 
     iget v5, v5, Landroid/graphics/RectF;->left:F
 
@@ -406,42 +394,42 @@
 
     div-float/2addr v3, v1
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->aYW:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->aYS: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;->baE:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->baA:Landroid/graphics/Matrix;
 
     invoke-virtual {v0}, Landroid/graphics/Matrix;->reset()V
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->baE:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->baA:Landroid/graphics/Matrix;
 
     invoke-virtual {v0, v4, v4}, Landroid/graphics/Matrix;->postScale(FF)Z
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->baE:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->baA:Landroid/graphics/Matrix;
 
     invoke-virtual {v0, v2, v3}, Landroid/graphics/Matrix;->postTranslate(FF)Z
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->baE:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->baA: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;->aZE:Lcom/yalantis/ucrop/a/c;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->aZA:Lcom/yalantis/ucrop/a/c;
 
     if-eqz v0, :cond_3
 
-    iget v1, p0, Lcom/yalantis/ucrop/view/a;->aZC:F
+    iget v1, p0, Lcom/yalantis/ucrop/view/a;->aZy:F
 
     invoke-interface {v0, v1}, Lcom/yalantis/ucrop/a/c;->B(F)V
 
     :cond_3
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->baF:Lcom/yalantis/ucrop/view/b$a;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->baB:Lcom/yalantis/ucrop/view/b$a;
 
     if-eqz v0, :cond_4
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->baF:Lcom/yalantis/ucrop/view/b$a;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->baB:Lcom/yalantis/ucrop/view/b$a;
 
     invoke-virtual {p0}, Lcom/yalantis/ucrop/view/a;->getCurrentScale()F
 
@@ -449,7 +437,7 @@
 
     invoke-interface {v0, v1}, Lcom/yalantis/ucrop/view/b$a;->w(F)V
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->baF:Lcom/yalantis/ucrop/view/b$a;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->baB:Lcom/yalantis/ucrop/view/b$a;
 
     invoke-virtual {p0}, Lcom/yalantis/ucrop/view/a;->getCurrentAngle()F
 
@@ -461,16 +449,28 @@
     return-void
 .end method
 
+.method protected final By()Z
+    .locals 1
+
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->bay:[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;->aYW:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->aYS:Landroid/graphics/RectF;
 
     invoke-virtual {v0}, Landroid/graphics/RectF;->centerX()F
 
     move-result v0
 
-    iget-object v1, p0, Lcom/yalantis/ucrop/view/a;->aYW:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/yalantis/ucrop/view/a;->aYS: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;->By()V
+    invoke-virtual {p0}, Lcom/yalantis/ucrop/view/a;->Bw()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;->aYW:Landroid/graphics/RectF;
+    iget-object v2, v0, Lcom/yalantis/ucrop/view/a;->aYS:Landroid/graphics/RectF;
 
-    iget-object v3, v0, Lcom/yalantis/ucrop/view/a;->baC:[F
+    iget-object v3, v0, Lcom/yalantis/ucrop/view/a;->bay:[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;->aYP:I
+    iget v8, v0, Lcom/yalantis/ucrop/view/a;->aYL:I
 
-    iget v9, v0, Lcom/yalantis/ucrop/view/a;->aYQ:I
+    iget v9, v0, Lcom/yalantis/ucrop/view/a;->aYM: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;->aZE:Lcom/yalantis/ucrop/a/c;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->aZA: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;->aZH:F
+    iget v0, p0, Lcom/yalantis/ucrop/view/a;->aZD:F
 
     return v0
 .end method
@@ -655,7 +655,7 @@
 .method public getMinScale()F
     .locals 1
 
-    iget v0, p0, Lcom/yalantis/ucrop/view/a;->aZI:F
+    iget v0, p0, Lcom/yalantis/ucrop/view/a;->aZE:F
 
     return v0
 .end method
@@ -663,7 +663,7 @@
 .method public getTargetAspectRatio()F
     .locals 1
 
-    iget v0, p0, Lcom/yalantis/ucrop/view/a;->aZC:F
+    iget v0, p0, Lcom/yalantis/ucrop/view/a;->aZy: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;->aZE:Lcom/yalantis/ucrop/a/c;
+    iput-object p1, p0, Lcom/yalantis/ucrop/view/a;->aZA: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;->aZC:F
+    iput v0, p0, Lcom/yalantis/ucrop/view/a;->aZy:F
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->aYW:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->aYS: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;->baJ:Z
+    iget-boolean v0, v11, Lcom/yalantis/ucrop/view/a;->baF:Z
 
     if-eqz v0, :cond_6
 
-    invoke-virtual/range {p0 .. p0}, Lcom/yalantis/ucrop/view/a;->BA()Z
+    invoke-virtual/range {p0 .. p0}, Lcom/yalantis/ucrop/view/a;->By()Z
 
     move-result v0
 
     if-nez v0, :cond_6
 
-    iget-object v0, v11, Lcom/yalantis/ucrop/view/a;->baD:[F
+    iget-object v0, v11, Lcom/yalantis/ucrop/view/a;->baz:[F
 
     const/4 v1, 0x0
 
     aget v4, v0, v1
 
-    iget-object v0, v11, Lcom/yalantis/ucrop/view/a;->baD:[F
+    iget-object v0, v11, Lcom/yalantis/ucrop/view/a;->baz:[F
 
     const/4 v2, 0x1
 
@@ -794,7 +794,7 @@
 
     move-result v8
 
-    iget-object v0, v11, Lcom/yalantis/ucrop/view/a;->aYW:Landroid/graphics/RectF;
+    iget-object v0, v11, Lcom/yalantis/ucrop/view/a;->aYS: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;->aYW:Landroid/graphics/RectF;
+    iget-object v3, v11, Lcom/yalantis/ucrop/view/a;->aYS: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;->baC:[F
+    iget-object v6, v11, Lcom/yalantis/ucrop/view/a;->bay:[F
 
-    iget-object v7, v11, Lcom/yalantis/ucrop/view/a;->baC:[F
+    iget-object v7, v11, Lcom/yalantis/ucrop/view/a;->bay:[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;->baC:[F
+    iget-object v0, v11, Lcom/yalantis/ucrop/view/a;->bay:[F
 
-    iget-object v3, v11, Lcom/yalantis/ucrop/view/a;->baC:[F
+    iget-object v3, v11, Lcom/yalantis/ucrop/view/a;->bay:[F
 
     array-length v3, v3
 
@@ -868,7 +868,7 @@
 
     move-result-object v0
 
-    iget-object v3, v11, Lcom/yalantis/ucrop/view/a;->aYW:Landroid/graphics/RectF;
+    iget-object v3, v11, Lcom/yalantis/ucrop/view/a;->aYS: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;->aYW:Landroid/graphics/RectF;
+    iget-object v12, v11, Lcom/yalantis/ucrop/view/a;->aYS: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;->baC:[F
+    iget-object v12, v11, Lcom/yalantis/ucrop/view/a;->bay:[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;->aZJ:J
+    iget-wide v2, v11, Lcom/yalantis/ucrop/view/a;->aZF: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;->aZF:Ljava/lang/Runnable;
+    iput-object v12, v11, Lcom/yalantis/ucrop/view/a;->aZB: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;->aYW:Landroid/graphics/RectF;
+    iget-object v0, v11, Lcom/yalantis/ucrop/view/a;->aYS:Landroid/graphics/RectF;
 
     invoke-virtual {v0}, Landroid/graphics/RectF;->centerX()F
 
     move-result v0
 
-    iget-object v1, v11, Lcom/yalantis/ucrop/view/a;->aYW:Landroid/graphics/RectF;
+    iget-object v1, v11, Lcom/yalantis/ucrop/view/a;->aYS: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;->aZJ:J
+    iput-wide p1, p0, Lcom/yalantis/ucrop/view/a;->aZF:J
 
     return-void
 
@@ -1225,7 +1225,7 @@
 .method public setMaxResultImageSizeX(I)V
     .locals 0
 
-    iput p1, p0, Lcom/yalantis/ucrop/view/a;->aYP:I
+    iput p1, p0, Lcom/yalantis/ucrop/view/a;->aYL:I
 
     return-void
 .end method
@@ -1233,7 +1233,7 @@
 .method public setMaxResultImageSizeY(I)V
     .locals 0
 
-    iput p1, p0, Lcom/yalantis/ucrop/view/a;->aYQ:I
+    iput p1, p0, Lcom/yalantis/ucrop/view/a;->aYM:I
 
     return-void
 .end method
@@ -1241,7 +1241,7 @@
 .method public setMaxScaleMultiplier(F)V
     .locals 0
 
-    iput p1, p0, Lcom/yalantis/ucrop/view/a;->aZD:F
+    iput p1, p0, Lcom/yalantis/ucrop/view/a;->aZz:F
 
     return-void
 .end method
@@ -1255,7 +1255,7 @@
 
     if-nez v0, :cond_0
 
-    iput p1, p0, Lcom/yalantis/ucrop/view/a;->aZC:F
+    iput p1, p0, Lcom/yalantis/ucrop/view/a;->aZy:F
 
     return-void
 
@@ -1280,19 +1280,19 @@
 
     div-float/2addr p1, v0
 
-    iput p1, p0, Lcom/yalantis/ucrop/view/a;->aZC:F
+    iput p1, p0, Lcom/yalantis/ucrop/view/a;->aZy:F
 
     goto :goto_0
 
     :cond_1
-    iput p1, p0, Lcom/yalantis/ucrop/view/a;->aZC:F
+    iput p1, p0, Lcom/yalantis/ucrop/view/a;->aZy:F
 
     :goto_0
-    iget-object p1, p0, Lcom/yalantis/ucrop/view/a;->aZE:Lcom/yalantis/ucrop/a/c;
+    iget-object p1, p0, Lcom/yalantis/ucrop/view/a;->aZA:Lcom/yalantis/ucrop/a/c;
 
     if-eqz p1, :cond_2
 
-    iget v0, p0, Lcom/yalantis/ucrop/view/a;->aZC:F
+    iget v0, p0, Lcom/yalantis/ucrop/view/a;->aZy: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 369de74015..43a2d23399 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 baK:Lcom/yalantis/ucrop/view/b;
+.field final synthetic baG: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;->baK:Lcom/yalantis/ucrop/view/b;
+    iput-object p1, p0, Lcom/yalantis/ucrop/view/b$1;->baG: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;->baK:Lcom/yalantis/ucrop/view/b;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/b$1;->baG: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;->baK:Lcom/yalantis/ucrop/view/b;
+    iget-object p3, p0, Lcom/yalantis/ucrop/view/b$1;->baG: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;->baK:Lcom/yalantis/ucrop/view/b;
+    iget-object p3, p0, Lcom/yalantis/ucrop/view/b$1;->baG: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;->baK:Lcom/yalantis/ucrop/view/b;
+    iget-object p2, p0, Lcom/yalantis/ucrop/view/b$1;->baG:Lcom/yalantis/ucrop/view/b;
 
     const/4 p3, 0x1
 
-    iput-boolean p3, p2, Lcom/yalantis/ucrop/view/b;->baI:Z
+    iput-boolean p3, p2, Lcom/yalantis/ucrop/view/b;->baE: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;->baK:Lcom/yalantis/ucrop/view/b;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/b$1;->baG:Lcom/yalantis/ucrop/view/b;
 
-    iget-object v0, v0, Lcom/yalantis/ucrop/view/b;->baF:Lcom/yalantis/ucrop/view/b$a;
+    iget-object v0, v0, Lcom/yalantis/ucrop/view/b;->baB:Lcom/yalantis/ucrop/view/b$a;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/b$1;->baK:Lcom/yalantis/ucrop/view/b;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/b$1;->baG:Lcom/yalantis/ucrop/view/b;
 
-    iget-object v0, v0, Lcom/yalantis/ucrop/view/b;->baF:Lcom/yalantis/ucrop/view/b$a;
+    iget-object v0, v0, Lcom/yalantis/ucrop/view/b;->baB: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 2ea17d5c9f..79457bb2a9 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 Bp()V
+.method public abstract Bn()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 149db4410f..d333473ccd 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 UZ:I
+.field private UV:I
 
-.field private aYR:Ljava/lang/String;
+.field private aYN:Ljava/lang/String;
 
-.field private aYS:Ljava/lang/String;
+.field private aYO:Ljava/lang/String;
 
-.field private aYT:Lcom/yalantis/ucrop/model/b;
+.field private aYP:Lcom/yalantis/ucrop/model/b;
 
-.field protected final baC:[F
+.field protected aZZ:I
 
-.field protected final baD:[F
+.field protected baA:Landroid/graphics/Matrix;
 
-.field protected baE:Landroid/graphics/Matrix;
+.field protected baB:Lcom/yalantis/ucrop/view/b$a;
 
-.field protected baF:Lcom/yalantis/ucrop/view/b$a;
+.field private baC:[F
 
-.field private baG:[F
+.field private baD:[F
 
-.field private baH:[F
+.field protected baE:Z
 
-.field protected baI:Z
+.field protected baF:Z
 
-.field protected baJ:Z
+.field protected baa:I
 
-.field protected bad:I
+.field protected final bay:[F
 
-.field protected bae:I
+.field protected final baz:[F
 
 .field private final mMatrixValues:[F
 
@@ -73,13 +73,13 @@
 
     new-array p1, p1, [F
 
-    iput-object p1, p0, Lcom/yalantis/ucrop/view/b;->baC:[F
+    iput-object p1, p0, Lcom/yalantis/ucrop/view/b;->bay:[F
 
     const/4 p1, 0x2
 
     new-array p1, p1, [F
 
-    iput-object p1, p0, Lcom/yalantis/ucrop/view/b;->baD:[F
+    iput-object p1, p0, Lcom/yalantis/ucrop/view/b;->baz:[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;->baE:Landroid/graphics/Matrix;
+    iput-object p1, p0, Lcom/yalantis/ucrop/view/b;->baA:Landroid/graphics/Matrix;
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lcom/yalantis/ucrop/view/b;->baI:Z
+    iput-boolean p1, p0, Lcom/yalantis/ucrop/view/b;->baE:Z
 
-    iput-boolean p1, p0, Lcom/yalantis/ucrop/view/b;->baJ:Z
+    iput-boolean p1, p0, Lcom/yalantis/ucrop/view/b;->baF:Z
 
-    iput p1, p0, Lcom/yalantis/ucrop/view/b;->UZ:I
+    iput p1, p0, Lcom/yalantis/ucrop/view/b;->UV: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;->aYT:Lcom/yalantis/ucrop/model/b;
+    iput-object p1, p0, Lcom/yalantis/ucrop/view/b;->aYP: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;->aYR:Ljava/lang/String;
+    iput-object p1, p0, Lcom/yalantis/ucrop/view/b;->aYN: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;->aYS:Ljava/lang/String;
+    iput-object p1, p0, Lcom/yalantis/ucrop/view/b;->aYO:Ljava/lang/String;
 
     return-object p1
 .end method
@@ -220,7 +220,7 @@
 
 
 # virtual methods
-.method protected Bz()V
+.method protected Bx()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;->baG:[F
+    iput-object v0, p0, Lcom/yalantis/ucrop/view/b;->baC:[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;->baH:[F
+    iput-object v0, p0, Lcom/yalantis/ucrop/view/b;->baD:[F
 
-    iput-boolean v4, p0, Lcom/yalantis/ucrop/view/b;->baJ:Z
+    iput-boolean v4, p0, Lcom/yalantis/ucrop/view/b;->baF:Z
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/b;->baF:Lcom/yalantis/ucrop/view/b$a;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/b;->baB:Lcom/yalantis/ucrop/view/b$a;
 
     if-eqz v0, :cond_1
 
-    invoke-interface {v0}, Lcom/yalantis/ucrop/view/b$a;->Bp()V
+    invoke-interface {v0}, Lcom/yalantis/ucrop/view/b$a;->Bn()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;->baE:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/b;->baA:Landroid/graphics/Matrix;
 
     invoke-virtual {v0, p1, p2}, Landroid/graphics/Matrix;->postTranslate(FF)Z
 
-    iget-object p1, p0, Lcom/yalantis/ucrop/view/b;->baE:Landroid/graphics/Matrix;
+    iget-object p1, p0, Lcom/yalantis/ucrop/view/b;->baA: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;->baE:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/b;->baA: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;->baE:Landroid/graphics/Matrix;
+    iget-object p1, p0, Lcom/yalantis/ucrop/view/b;->baA: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;->baF:Lcom/yalantis/ucrop/view/b$a;
+    iget-object p1, p0, Lcom/yalantis/ucrop/view/b;->baB:Lcom/yalantis/ucrop/view/b$a;
 
     if-eqz p1, :cond_0
 
-    iget-object p2, p0, Lcom/yalantis/ucrop/view/b;->baE:Landroid/graphics/Matrix;
+    iget-object p2, p0, Lcom/yalantis/ucrop/view/b;->baA: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;->baE:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/b;->baA: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;->baE:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/b;->baA: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;->aYT:Lcom/yalantis/ucrop/model/b;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/b;->aYP: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;->aYR:Ljava/lang/String;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/b;->aYN: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;->aYS:Ljava/lang/String;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/b;->aYO: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;->UZ:I
+    iget v0, p0, Lcom/yalantis/ucrop/view/b;->UV:I
 
     if-gtz v0, :cond_3
 
@@ -496,7 +496,7 @@
     move-result v0
 
     :cond_1
-    invoke-static {}, Lcom/yalantis/ucrop/c/c;->Bu()I
+    invoke-static {}, Lcom/yalantis/ucrop/c/c;->Bs()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;->UZ:I
+    iput v0, p0, Lcom/yalantis/ucrop/view/b;->UV:I
 
     :cond_3
-    iget v0, p0, Lcom/yalantis/ucrop/view/b;->UZ:I
+    iget v0, p0, Lcom/yalantis/ucrop/view/b;->UV:I
 
     return v0
 .end method
@@ -575,19 +575,19 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/b;->baE:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/b;->baA:Landroid/graphics/Matrix;
 
     invoke-virtual {v0, p1, p2, p3}, Landroid/graphics/Matrix;->postRotate(FFF)Z
 
-    iget-object p1, p0, Lcom/yalantis/ucrop/view/b;->baE:Landroid/graphics/Matrix;
+    iget-object p1, p0, Lcom/yalantis/ucrop/view/b;->baA: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;->baF:Lcom/yalantis/ucrop/view/b$a;
+    iget-object p1, p0, Lcom/yalantis/ucrop/view/b;->baB:Lcom/yalantis/ucrop/view/b$a;
 
     if-eqz p1, :cond_0
 
-    iget-object p2, p0, Lcom/yalantis/ucrop/view/b;->baE:Landroid/graphics/Matrix;
+    iget-object p2, p0, Lcom/yalantis/ucrop/view/b;->baA: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;->baI:Z
+    iget-boolean p1, p0, Lcom/yalantis/ucrop/view/b;->baE:Z
 
     if-eqz p1, :cond_1
 
-    iget-boolean p1, p0, Lcom/yalantis/ucrop/view/b;->baJ:Z
+    iget-boolean p1, p0, Lcom/yalantis/ucrop/view/b;->baF:Z
 
     if-nez p1, :cond_1
 
@@ -655,13 +655,13 @@
 
     sub-int/2addr p3, p1
 
-    iput p3, p0, Lcom/yalantis/ucrop/view/b;->bad:I
+    iput p3, p0, Lcom/yalantis/ucrop/view/b;->aZZ:I
 
     sub-int/2addr p4, p2
 
-    iput p4, p0, Lcom/yalantis/ucrop/view/b;->bae:I
+    iput p4, p0, Lcom/yalantis/ucrop/view/b;->baa:I
 
-    invoke-virtual {p0}, Lcom/yalantis/ucrop/view/b;->Bz()V
+    invoke-virtual {p0}, Lcom/yalantis/ucrop/view/b;->Bx()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;->baE:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/b;->baA:Landroid/graphics/Matrix;
 
     invoke-virtual {v0, p1}, Landroid/graphics/Matrix;->set(Landroid/graphics/Matrix;)V
 
-    iget-object p1, p0, Lcom/yalantis/ucrop/view/b;->baE:Landroid/graphics/Matrix;
+    iget-object p1, p0, Lcom/yalantis/ucrop/view/b;->baA:Landroid/graphics/Matrix;
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/b;->baC:[F
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/b;->bay:[F
 
-    iget-object v1, p0, Lcom/yalantis/ucrop/view/b;->baG:[F
+    iget-object v1, p0, Lcom/yalantis/ucrop/view/b;->baC:[F
 
     invoke-virtual {p1, v0, v1}, Landroid/graphics/Matrix;->mapPoints([F[F)V
 
-    iget-object p1, p0, Lcom/yalantis/ucrop/view/b;->baE:Landroid/graphics/Matrix;
+    iget-object p1, p0, Lcom/yalantis/ucrop/view/b;->baA:Landroid/graphics/Matrix;
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/b;->baD:[F
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/b;->baz:[F
 
-    iget-object v1, p0, Lcom/yalantis/ucrop/view/b;->baH:[F
+    iget-object v1, p0, Lcom/yalantis/ucrop/view/b;->baD:[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;->UZ:I
+    iput p1, p0, Lcom/yalantis/ucrop/view/b;->UV: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;->baF:Lcom/yalantis/ucrop/view/b$a;
+    iput-object p1, p0, Lcom/yalantis/ucrop/view/b;->baB: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 0b3af39ec4..fb75a684bd 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 aYM:Ljava/lang/String;
+.field private aYI:Ljava/lang/String;
 
-.field public aYN:F
+.field public aYJ:F
 
-.field public aYO:F
+.field public aYK:F
 
-.field private final baN:Landroid/graphics/Rect;
+.field private final baJ:Landroid/graphics/Rect;
 
-.field private baO:Landroid/graphics/Paint;
+.field private baK:Landroid/graphics/Paint;
 
-.field private baP:I
+.field private baL:I
 
-.field public mU:F
+.field public mV: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;->baN:Landroid/graphics/Rect;
+    iput-object p3, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->baJ: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;->baN:Landroid/graphics/Rect;
+    iput-object p3, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->baJ: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;->aYM:Ljava/lang/String;
+    iput-object v1, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->aYI: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;->aYN:F
+    iput v1, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->aYJ: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;->aYO:F
+    iput v1, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->aYK:F
 
-    iget v1, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->aYN:F
+    iget v1, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->aYJ:F
 
     cmpl-float v3, v1, v2
 
     if-eqz v3, :cond_1
 
-    iget v3, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->aYO:F
+    iget v3, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->aYK: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;->mU:F
+    iput v1, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->mV:F
 
     goto :goto_1
 
     :cond_1
     :goto_0
-    iput v2, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->mU:F
+    iput v2, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->mV: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;->baP:I
+    iput v1, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->baL: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;->baO:Landroid/graphics/Paint;
+    iput-object v1, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->baK:Landroid/graphics/Paint;
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->baO:Landroid/graphics/Paint;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->baK: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;->BC()V
+    invoke-virtual {p0}, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->BA()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;->baO:Landroid/graphics/Paint;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->baK:Landroid/graphics/Paint;
 
     if-eqz v0, :cond_0
 
@@ -249,10 +249,10 @@
 
 
 # virtual methods
-.method public final BC()V
+.method public final BA()V
     .locals 4
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->aYM:Ljava/lang/String;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->aYI: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;->aYM:Ljava/lang/String;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->aYI: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;->aYN:F
+    iget v3, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->aYJ:F
 
     float-to-int v3, v3
 
@@ -287,7 +287,7 @@
 
     const/4 v2, 0x1
 
-    iget v3, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->aYO:F
+    iget v3, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->aYK: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;->baN:Landroid/graphics/Rect;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->baJ: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;->baN:Landroid/graphics/Rect;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->baJ:Landroid/graphics/Rect;
 
     iget v0, v0, Landroid/graphics/Rect;->right:I
 
-    iget-object v1, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->baN:Landroid/graphics/Rect;
+    iget-object v1, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->baJ: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;->baN:Landroid/graphics/Rect;
+    iget-object v1, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->baJ:Landroid/graphics/Rect;
 
     iget v1, v1, Landroid/graphics/Rect;->bottom:I
 
-    iget v2, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->baP:I
+    iget v2, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->baL: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;->baO:Landroid/graphics/Paint;
+    iget-object v3, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->baK: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;->aYM:Ljava/lang/String;
+    iget-object v0, p1, Lcom/yalantis/ucrop/model/AspectRatio;->aYI:Ljava/lang/String;
 
-    iput-object v0, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->aYM:Ljava/lang/String;
+    iput-object v0, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->aYI:Ljava/lang/String;
 
-    iget v0, p1, Lcom/yalantis/ucrop/model/AspectRatio;->aYN:F
+    iget v0, p1, Lcom/yalantis/ucrop/model/AspectRatio;->aYJ:F
 
-    iput v0, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->aYN:F
+    iput v0, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->aYJ:F
 
-    iget p1, p1, Lcom/yalantis/ucrop/model/AspectRatio;->aYO:F
+    iget p1, p1, Lcom/yalantis/ucrop/model/AspectRatio;->aYK:F
 
-    iput p1, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->aYO:F
+    iput p1, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->aYK:F
 
-    iget p1, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->aYN:F
+    iget p1, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->aYJ:F
 
     const/4 v0, 0x0
 
@@ -394,7 +394,7 @@
 
     if-eqz v1, :cond_1
 
-    iget v1, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->aYO:F
+    iget v1, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->aYK: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;->mU:F
+    iput p1, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->mV:F
 
     goto :goto_1
 
     :cond_1
     :goto_0
-    iput v0, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->mU:F
+    iput v0, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->mV:F
 
     :goto_1
-    invoke-virtual {p0}, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->BC()V
+    invoke-virtual {p0}, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->BA()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 3d9ba400a2..9f84c6fc29 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 Bq()V
+.method public abstract Bo()V
 .end method
 
-.method public abstract Br()V
+.method public abstract Bp()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 4a9561f34e..bdd89304f8 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,26 +12,26 @@
 
 
 # instance fields
-.field private final baN:Landroid/graphics/Rect;
+.field private final baJ:Landroid/graphics/Rect;
 
-.field private baQ:Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView$a;
+.field private baM:Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView$a;
 
-.field private baR:F
+.field private baN:F
 
-.field private baS:Landroid/graphics/Paint;
+.field private baO:Landroid/graphics/Paint;
 
-.field private baT:I
+.field private baP:I
+
+.field private baQ:I
+
+.field private baR:I
+
+.field private baS:Z
+
+.field private baT:F
 
 .field private baU:I
 
-.field private baV:I
-
-.field private baW:Z
-
-.field private baX:F
-
-.field private baY:I
-
 
 # direct methods
 .method public constructor <init>(Landroid/content/Context;)V
@@ -63,7 +63,7 @@
 
     invoke-direct {p1}, Landroid/graphics/Rect;-><init>()V
 
-    iput-object p1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baN:Landroid/graphics/Rect;
+    iput-object p1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baJ: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;->baY: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;
 
@@ -91,7 +91,7 @@
 
     move-result p1
 
-    iput p1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baT:I
+    iput p1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baP: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;->baU:I
+    iput p1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baQ: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;->baV:I
+    iput p1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baR: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;->baS:Landroid/graphics/Paint;
+    iput-object p1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baO:Landroid/graphics/Paint;
 
-    iget-object p1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baS:Landroid/graphics/Paint;
+    iget-object p1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baO: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;->baS:Landroid/graphics/Paint;
+    iget-object p1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baO:Landroid/graphics/Paint;
 
-    iget p2, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baT:I
+    iget p2, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baP: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;->baN:Landroid/graphics/Rect;
+    iput-object p1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baJ: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;->baN:Landroid/graphics/Rect;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baJ: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;->baN:Landroid/graphics/Rect;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baJ:Landroid/graphics/Rect;
 
     invoke-virtual {v0}, Landroid/graphics/Rect;->width()I
 
     move-result v0
 
-    iget v1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baT:I
+    iget v1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baP:I
 
-    iget v2, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baV:I
+    iget v2, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baR:I
 
     add-int v3, v1, v2
 
     div-int/2addr v0, v3
 
-    iget v3, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baX:F
+    iget v3, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baT: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;->baS:Landroid/graphics/Paint;
+    iget-object v1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baO: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;->baS:Landroid/graphics/Paint;
+    iget-object v5, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baO: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;->baS:Landroid/graphics/Paint;
+    iget-object v5, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baO: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;->baS:Landroid/graphics/Paint;
+    iget-object v2, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baO: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;->baN:Landroid/graphics/Rect;
+    iget-object v4, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baJ: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;->baT:I
+    iget v5, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baP:I
 
-    iget v6, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baV:I
+    iget v6, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baR: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;->baN:Landroid/graphics/Rect;
+    iget-object v4, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baJ: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;->baU:I
+    iget v5, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baQ: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;->baN:Landroid/graphics/Rect;
+    iget-object v4, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baJ: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;->baT:I
+    iget v4, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baP:I
 
-    iget v5, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baV:I
+    iget v5, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baR: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;->baN:Landroid/graphics/Rect;
+    iget-object v2, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baJ: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;->baU:I
+    iget v4, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baQ: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;->baS:Landroid/graphics/Paint;
+    iget-object v11, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baO: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;->baS:Landroid/graphics/Paint;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baO:Landroid/graphics/Paint;
 
-    iget v1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baY:I
+    iget v1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baU:I
 
     invoke-virtual {v0, v1}, Landroid/graphics/Paint;->setColor(I)V
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baN:Landroid/graphics/Rect;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baJ: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;->baN:Landroid/graphics/Rect;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baJ: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;->baU:I
+    iget v1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baQ: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;->baN:Landroid/graphics/Rect;
+    iget-object v1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baJ: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;->baN:Landroid/graphics/Rect;
+    iget-object v1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baJ: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;->baU:I
+    iget v5, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baQ: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;->baS:Landroid/graphics/Paint;
+    iget-object v6, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baO:Landroid/graphics/Paint;
 
     move-object v1, p1
 
@@ -449,7 +449,7 @@
 
     move-result v0
 
-    iget v2, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baR:F
+    iget v2, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baN: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;->baW:Z
+    iget-boolean v2, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baS:Z
 
     if-nez v2, :cond_1
 
-    iput-boolean v1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baW:Z
+    iput-boolean v1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baS:Z
 
-    iget-object v2, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baQ:Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView$a;
+    iget-object v2, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baM:Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView$a;
 
     if-eqz v2, :cond_1
 
-    invoke-interface {v2}, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView$a;->Br()V
+    invoke-interface {v2}, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView$a;->Bp()V
 
     :cond_1
-    iget v2, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baX:F
+    iget v2, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baT:F
 
     sub-float/2addr v2, v0
 
-    iput v2, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baX:F
+    iput v2, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baT: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;->baR:F
+    iput p1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baN:F
 
-    iget-object p1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baQ:Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView$a;
+    iget-object p1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baM: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;->baQ:Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView$a;
+    iget-object p1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baM: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;->baW:Z
+    iput-boolean v0, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baS:Z
 
-    invoke-interface {p1}, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView$a;->Bq()V
+    invoke-interface {p1}, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView$a;->Bo()V
 
     goto :goto_0
 
@@ -514,7 +514,7 @@
 
     move-result p1
 
-    iput p1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baR:F
+    iput p1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baN: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;->baY:I
+    iput p1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baU: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;->baQ:Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView$a;
+    iput-object p1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baM: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 18bd153d1b..323d28cc2e 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 bbc:Lio/fabric/sdk/android/a$b;
+.field final synthetic baY:Lio/fabric/sdk/android/a$b;
 
-.field final synthetic bbd:Lio/fabric/sdk/android/a$a;
+.field final synthetic baZ: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;->bbd:Lio/fabric/sdk/android/a$a;
+    iput-object p1, p0, Lio/fabric/sdk/android/a$a$1;->baZ:Lio/fabric/sdk/android/a$a;
 
-    iput-object p2, p0, Lio/fabric/sdk/android/a$a$1;->bbc:Lio/fabric/sdk/android/a$b;
+    iput-object p2, p0, Lio/fabric/sdk/android/a$a$1;->baY: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;->bbc:Lio/fabric/sdk/android/a$b;
+    iget-object p2, p0, Lio/fabric/sdk/android/a$a$1;->baY: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;->bbc:Lio/fabric/sdk/android/a$b;
+    iget-object v0, p0, Lio/fabric/sdk/android/a$a$1;->baY: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;->bbc:Lio/fabric/sdk/android/a$b;
+    iget-object v0, p0, Lio/fabric/sdk/android/a$a$1;->baY: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;->bbc:Lio/fabric/sdk/android/a$b;
+    iget-object v0, p0, Lio/fabric/sdk/android/a$a$1;->baY: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;->bbc:Lio/fabric/sdk/android/a$b;
+    iget-object v0, p0, Lio/fabric/sdk/android/a$a$1;->baY: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 fe10c098fa..f700261352 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 baZ:Landroid/app/Application;
+.field private final baV:Landroid/app/Application;
 
-.field private final bbb:Ljava/util/Set;
+.field private final baX: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;->bbb:Ljava/util/Set;
+    iput-object v0, p0, Lio/fabric/sdk/android/a$a;->baX:Ljava/util/Set;
 
-    iput-object p1, p0, Lio/fabric/sdk/android/a$a;->baZ:Landroid/app/Application;
+    iput-object p1, p0, Lio/fabric/sdk/android/a$a;->baV: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;->baZ:Landroid/app/Application;
+    iget-object v0, p0, Lio/fabric/sdk/android/a$a;->baV: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;->baZ:Landroid/app/Application;
+    iget-object p1, p0, Lio/fabric/sdk/android/a$a;->baV: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;->bbb:Ljava/util/Set;
+    iget-object p1, p0, Lio/fabric/sdk/android/a$a;->baX: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;->bbb:Ljava/util/Set;
+    iget-object v0, p0, Lio/fabric/sdk/android/a$a;->baX: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;->baZ:Landroid/app/Application;
+    iget-object v2, p0, Lio/fabric/sdk/android/a$a;->baV: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 d183bd660a..a5103d3656 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 baZ:Landroid/app/Application;
+.field private final baV:Landroid/app/Application;
 
-.field private bba:Lio/fabric/sdk/android/a$a;
+.field private baW: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;->baZ:Landroid/app/Application;
+    iput-object p1, p0, Lio/fabric/sdk/android/a;->baV: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;->baZ:Landroid/app/Application;
+    iget-object v0, p0, Lio/fabric/sdk/android/a;->baV: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;->bba:Lio/fabric/sdk/android/a$a;
+    iput-object p1, p0, Lio/fabric/sdk/android/a;->baW:Lio/fabric/sdk/android/a$a;
 
     :cond_0
     return-void
@@ -52,10 +52,10 @@
 
 
 # virtual methods
-.method public final BD()V
+.method public final BB()V
     .locals 1
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a;->bba:Lio/fabric/sdk/android/a$a;
+    iget-object v0, p0, Lio/fabric/sdk/android/a;->baW: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;->bba:Lio/fabric/sdk/android/a$a;
+    iget-object v0, p0, Lio/fabric/sdk/android/a;->baW: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 30f184c14c..ae527f1625 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 bbK:Lio/fabric/sdk/android/a/a/c;
+.field private final bbG: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;->bbK:Lio/fabric/sdk/android/a/a/c;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/a/a;->bbG:Lio/fabric/sdk/android/a/a/c;
 
     return-void
 .end method
 
 
 # virtual methods
-.method protected abstract BP()Ljava/lang/Object;
+.method protected abstract BN()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;->BP()Ljava/lang/Object;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/a/a;->BN()Ljava/lang/Object;
 
     move-result-object v0
 
     if-nez v0, :cond_2
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/a/a;->bbK:Lio/fabric/sdk/android/a/a/c;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/a/a;->bbG:Lio/fabric/sdk/android/a/a/c;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/a/a;->bbK:Lio/fabric/sdk/android/a/a/c;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/a/a;->bbG: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 5ad01af4f2..1b10160cc9 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 BP()Ljava/lang/Object;
+.method protected final BN()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 78dfd9b945..eae0097df6 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 bbL:Ljava/util/regex/Pattern;
+.field private static final bbH:Ljava/util/regex/Pattern;
 
 
 # instance fields
-.field private final bbM:I
+.field private final bbI:I
 
-.field private final bbN:Ljava/lang/String;
+.field private final bbJ:Ljava/lang/String;
 
-.field private final pA:Lio/fabric/sdk/android/a/e/e;
+.field private final pB:Lio/fabric/sdk/android/a/e/e;
 
-.field protected final px:Lio/fabric/sdk/android/i;
+.field protected final py: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;->bbL:Ljava/util/regex/Pattern;
+    sput-object v0, Lio/fabric/sdk/android/a/b/a;->bbH: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;->px:Lio/fabric/sdk/android/i;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/b/a;->py:Lio/fabric/sdk/android/i;
 
-    iput-object p2, p0, Lio/fabric/sdk/android/a/b/a;->bbN:Ljava/lang/String;
+    iput-object p2, p0, Lio/fabric/sdk/android/a/b/a;->bbJ:Ljava/lang/String;
 
-    iget-object p1, p0, Lio/fabric/sdk/android/a/b/a;->bbN:Ljava/lang/String;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/b/a;->bbJ: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;->bbL:Ljava/util/regex/Pattern;
+    sget-object p1, Lio/fabric/sdk/android/a/b/a;->bbH: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;->bbN:Ljava/lang/String;
+    iget-object p2, p0, Lio/fabric/sdk/android/a/b/a;->bbJ: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;->pA:Lio/fabric/sdk/android/a/e/e;
+    iput-object p4, p0, Lio/fabric/sdk/android/a/b/a;->pB:Lio/fabric/sdk/android/a/e/e;
 
-    iput p5, p0, Lio/fabric/sdk/android/a/b/a;->bbM:I
+    iput p5, p0, Lio/fabric/sdk/android/a/b/a;->bbI:I
 
     return-void
 
@@ -99,7 +99,7 @@
 
 
 # virtual methods
-.method protected final BQ()Lio/fabric/sdk/android/a/e/d;
+.method protected final BO()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;->pA:Lio/fabric/sdk/android/a/e/e;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/a;->pB:Lio/fabric/sdk/android/a/e/e;
 
-    iget v1, p0, Lio/fabric/sdk/android/a/b/a;->bbM:I
+    iget v1, p0, Lio/fabric/sdk/android/a/b/a;->bbI: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;->CK()Lio/fabric/sdk/android/a/e/d;
+    invoke-virtual {p1}, Lio/fabric/sdk/android/a/e/d;->CI()Lio/fabric/sdk/android/a/e/d;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lio/fabric/sdk/android/a/e/d;->CJ()Lio/fabric/sdk/android/a/e/d;
+    invoke-virtual {p1}, Lio/fabric/sdk/android/a/e/d;->CH()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;->px:Lio/fabric/sdk/android/i;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/b/a;->py: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 b143f4ea54..54f9e337ec 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 bbO:Ljava/lang/String;
+.field public final bbK:Ljava/lang/String;
 
-.field public final bbP:Z
+.field public final bbL: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;->bbO:Ljava/lang/String;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/b/b;->bbK:Ljava/lang/String;
 
-    iput-boolean p2, p0, Lio/fabric/sdk/android/a/b/b;->bbP:Z
+    iput-boolean p2, p0, Lio/fabric/sdk/android/a/b/b;->bbL: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;->bbP:Z
+    iget-boolean v2, p0, Lio/fabric/sdk/android/a/b/b;->bbL:Z
 
-    iget-boolean v3, p1, Lio/fabric/sdk/android/a/b/b;->bbP:Z
+    iget-boolean v3, p1, Lio/fabric/sdk/android/a/b/b;->bbL:Z
 
     if-eq v2, v3, :cond_2
 
     return v1
 
     :cond_2
-    iget-object v2, p0, Lio/fabric/sdk/android/a/b/b;->bbO:Ljava/lang/String;
+    iget-object v2, p0, Lio/fabric/sdk/android/a/b/b;->bbK:Ljava/lang/String;
 
-    iget-object p1, p1, Lio/fabric/sdk/android/a/b/b;->bbO:Ljava/lang/String;
+    iget-object p1, p1, Lio/fabric/sdk/android/a/b/b;->bbK: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;->bbO:Ljava/lang/String;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/b;->bbK: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;->bbP:Z
+    iget-boolean v1, p0, Lio/fabric/sdk/android/a/b/b;->bbL: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 7955013c7f..ad29ca2780 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 bbQ:Lio/fabric/sdk/android/a/b/b;
+.field final synthetic bbM:Lio/fabric/sdk/android/a/b/b;
 
-.field final synthetic bbR:Lio/fabric/sdk/android/a/b/c;
+.field final synthetic bbN: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;->bbR:Lio/fabric/sdk/android/a/b/c;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/b/c$1;->bbN:Lio/fabric/sdk/android/a/b/c;
 
-    iput-object p2, p0, Lio/fabric/sdk/android/a/b/c$1;->bbQ:Lio/fabric/sdk/android/a/b/b;
+    iput-object p2, p0, Lio/fabric/sdk/android/a/b/c$1;->bbM: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;->bbR:Lio/fabric/sdk/android/a/b/c;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/c$1;->bbN:Lio/fabric/sdk/android/a/b/c;
 
-    invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/c;->BT()Lio/fabric/sdk/android/a/b/b;
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/c;->BR()Lio/fabric/sdk/android/a/b/b;
 
     move-result-object v0
 
-    iget-object v1, p0, Lio/fabric/sdk/android/a/b/c$1;->bbQ:Lio/fabric/sdk/android/a/b/b;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/b/c$1;->bbM: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->bbR:Lio/fabric/sdk/android/a/b/c;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/b/c$1;->bbN: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 3017a7e815..e3d4b1ecf5 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 tE:Lio/fabric/sdk/android/a/f/c;
+.field final tF: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;->tE:Lio/fabric/sdk/android/a/f/c;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/b/c;->tF:Lio/fabric/sdk/android/a/f/c;
 
     return-void
 .end method
 
-.method private BR()Lio/fabric/sdk/android/a/b/f;
+.method private BP()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 BS()Lio/fabric/sdk/android/a/b/f;
+.method private BQ()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;->bbO:Ljava/lang/String;
+    iget-object p0, p0, Lio/fabric/sdk/android/a/b/b;->bbK:Ljava/lang/String;
 
     invoke-static {p0}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -81,14 +81,14 @@
 
 
 # virtual methods
-.method final BT()Lio/fabric/sdk/android/a/b/b;
+.method final BR()Lio/fabric/sdk/android/a/b/b;
     .locals 4
 
-    invoke-direct {p0}, Lio/fabric/sdk/android/a/b/c;->BR()Lio/fabric/sdk/android/a/b/f;
+    invoke-direct {p0}, Lio/fabric/sdk/android/a/b/c;->BP()Lio/fabric/sdk/android/a/b/f;
 
     move-result-object v0
 
-    invoke-interface {v0}, Lio/fabric/sdk/android/a/b/f;->BU()Lio/fabric/sdk/android/a/b/b;
+    invoke-interface {v0}, Lio/fabric/sdk/android/a/b/f;->BS()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;->BS()Lio/fabric/sdk/android/a/b/f;
+    invoke-direct {p0}, Lio/fabric/sdk/android/a/b/c;->BQ()Lio/fabric/sdk/android/a/b/f;
 
     move-result-object v0
 
-    invoke-interface {v0}, Lio/fabric/sdk/android/a/b/f;->BU()Lio/fabric/sdk/android/a/b/b;
+    invoke-interface {v0}, Lio/fabric/sdk/android/a/b/f;->BS()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->tE:Lio/fabric/sdk/android/a/f/c;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/c;->tF:Lio/fabric/sdk/android/a/f/c;
 
-    invoke-interface {v0}, Lio/fabric/sdk/android/a/f/c;->CQ()Landroid/content/SharedPreferences$Editor;
+    invoke-interface {v0}, Lio/fabric/sdk/android/a/f/c;->CO()Landroid/content/SharedPreferences$Editor;
 
     move-result-object v3
 
-    iget-object v4, p1, Lio/fabric/sdk/android/a/b/b;->bbO:Ljava/lang/String;
+    iget-object v4, p1, Lio/fabric/sdk/android/a/b/b;->bbK: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;->bbP:Z
+    iget-boolean p1, p1, Lio/fabric/sdk/android/a/b/b;->bbL: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;->tE:Lio/fabric/sdk/android/a/f/c;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/b/c;->tF:Lio/fabric/sdk/android/a/f/c;
 
-    invoke-interface {p1}, Lio/fabric/sdk/android/a/f/c;->CQ()Landroid/content/SharedPreferences$Editor;
+    invoke-interface {p1}, Lio/fabric/sdk/android/a/f/c;->CO()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 2459961d61..c685d91663 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 BV()Ljava/lang/String;
+.method private BT()Ljava/lang/String;
     .locals 4
 
     :try_start_0
@@ -62,7 +62,7 @@
     return-object v0
 
     :catch_0
-    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -227,7 +227,7 @@
     return v0
 
     :catch_0
-    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -242,7 +242,7 @@
 
 
 # virtual methods
-.method public final BU()Lio/fabric/sdk/android/a/b/b;
+.method public final BS()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;->BV()Ljava/lang/String;
+    invoke-direct {p0}, Lio/fabric/sdk/android/a/b/d;->BT()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 4f8b34ffe4..c47509227d 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 bbS:Z
+.field private bbO:Z
 
-.field private final bbT:Ljava/util/concurrent/LinkedBlockingQueue;
+.field private final bbP: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;->bbS:Z
+    iput-boolean v0, p0, Lio/fabric/sdk/android/a/b/e$a;->bbO: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;->bbT:Ljava/util/concurrent/LinkedBlockingQueue;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/b/e$a;->bbP: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;->bbS:Z
+    iget-boolean v0, p0, Lio/fabric/sdk/android/a/b/e$a;->bbO:Z
 
     if-eqz v0, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->bbS:Z
+    iput-boolean v0, p0, Lio/fabric/sdk/android/a/b/e$a;->bbO:Z
 
     :try_start_0
-    iget-object v0, p0, Lio/fabric/sdk/android/a/b/e$a;->bbT:Ljava/util/concurrent/LinkedBlockingQueue;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/e$a;->bbP: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;->bbT:Ljava/util/concurrent/LinkedBlockingQueue;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/b/e$a;->bbP: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;->bbT:Ljava/util/concurrent/LinkedBlockingQueue;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/b/e$a;->bbP: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 37b59ab24a..f92217ab64 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 bbU:Landroid/os/IBinder;
+.field private final bbQ: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;->bbU:Landroid/os/IBinder;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/b/e$b;->bbQ: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;->bbU:Landroid/os/IBinder;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/e$b;->bbQ: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;->bbU:Landroid/os/IBinder;
+    iget-object v2, p0, Lio/fabric/sdk/android/a/b/e$b;->bbQ:Landroid/os/IBinder;
 
     const/4 v3, 0x1
 
@@ -93,7 +93,7 @@
 
     :catch_0
     :try_start_1
-    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->bbU:Landroid/os/IBinder;
+    iget-object v4, p0, Lio/fabric/sdk/android/a/b/e$b;->bbQ:Landroid/os/IBinder;
 
     const/4 v5, 0x2
 
@@ -177,7 +177,7 @@
 
     :catch_0
     :try_start_1
-    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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 1577e1dc73..188e435531 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 BU()Lio/fabric/sdk/android/a/b/b;
+.method public final BS()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()Lio/fabric/sdk/android/l;
 
     move-result-object v5
 
@@ -176,7 +176,7 @@
     throw v2
 
     :cond_1
-    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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 7f316ab2b7..107b503077 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 BU()Lio/fabric/sdk/android/a/b/b;
+.method public abstract BS()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 a4d82beb95..061e61daa7 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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BF()Z
+    invoke-static {}, Lio/fabric/sdk/android/c;->BD()Z
 
     move-result v1
 
@@ -270,7 +270,7 @@
 
     if-nez p1, :cond_3
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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 d2c67fb494..e3a1cd77b1 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,6 +23,14 @@
 
 
 # static fields
+.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 public static final enum bca:Lio/fabric/sdk/android/a/b/i$a;
@@ -35,15 +43,7 @@
 
 .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;
+.field private static final bcf: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 bck:[Lio/fabric/sdk/android/a/b/i$a;
+.field private static final synthetic bcg:[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;->bbZ:Lio/fabric/sdk/android/a/b/i$a;
+    sput-object v0, Lio/fabric/sdk/android/a/b/i$a;->bbV: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;->bca:Lio/fabric/sdk/android/a/b/i$a;
+    sput-object v0, Lio/fabric/sdk/android/a/b/i$a;->bbW: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;->bcb:Lio/fabric/sdk/android/a/b/i$a;
+    sput-object v0, Lio/fabric/sdk/android/a/b/i$a;->bbX: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;->bcc:Lio/fabric/sdk/android/a/b/i$a;
+    sput-object v0, Lio/fabric/sdk/android/a/b/i$a;->bbY: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;->bcd: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;
 
@@ -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;->bce: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;
 
@@ -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;->bcf: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;
 
@@ -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;->bcg: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;
 
@@ -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;->bch: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;
 
@@ -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;->bci: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;
 
     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;->bbZ:Lio/fabric/sdk/android/a/b/i$a;
+    sget-object v11, Lio/fabric/sdk/android/a/b/i$a;->bbV:Lio/fabric/sdk/android/a/b/i$a;
 
     aput-object v11, v0, v1
 
-    sget-object v1, Lio/fabric/sdk/android/a/b/i$a;->bca:Lio/fabric/sdk/android/a/b/i$a;
+    sget-object v1, Lio/fabric/sdk/android/a/b/i$a;->bbW:Lio/fabric/sdk/android/a/b/i$a;
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lio/fabric/sdk/android/a/b/i$a;->bcb:Lio/fabric/sdk/android/a/b/i$a;
+    sget-object v1, Lio/fabric/sdk/android/a/b/i$a;->bbX:Lio/fabric/sdk/android/a/b/i$a;
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lio/fabric/sdk/android/a/b/i$a;->bcc:Lio/fabric/sdk/android/a/b/i$a;
+    sget-object v1, Lio/fabric/sdk/android/a/b/i$a;->bbY:Lio/fabric/sdk/android/a/b/i$a;
 
     aput-object v1, v0, v4
 
-    sget-object v1, Lio/fabric/sdk/android/a/b/i$a;->bcd: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;
 
     aput-object v1, v0, v5
 
-    sget-object v1, Lio/fabric/sdk/android/a/b/i$a;->bce: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, v6
 
-    sget-object v1, Lio/fabric/sdk/android/a/b/i$a;->bcf: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, v7
 
-    sget-object v1, Lio/fabric/sdk/android/a/b/i$a;->bcg: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, v8
 
-    sget-object v1, Lio/fabric/sdk/android/a/b/i$a;->bch: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, v9
 
-    sget-object v1, Lio/fabric/sdk/android/a/b/i$a;->bci: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, v10
 
-    sput-object v0, Lio/fabric/sdk/android/a/b/i$a;->bck:[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, Ljava/util/HashMap;
 
     invoke-direct {v0, v5}, Ljava/util/HashMap;-><init>(I)V
 
-    sput-object v0, Lio/fabric/sdk/android/a/b/i$a;->bcj:Ljava/util/Map;
+    sput-object v0, Lio/fabric/sdk/android/a/b/i$a;->bcf:Ljava/util/Map;
 
-    sget-object v1, Lio/fabric/sdk/android/a/b/i$a;->bcf: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;
 
     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;->bcj:Ljava/util/Map;
+    sget-object v0, Lio/fabric/sdk/android/a/b/i$a;->bcf:Ljava/util/Map;
 
-    sget-object v1, Lio/fabric/sdk/android/a/b/i$a;->bce: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;
 
     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;->bcj:Ljava/util/Map;
+    sget-object v0, Lio/fabric/sdk/android/a/b/i$a;->bcf:Ljava/util/Map;
 
-    sget-object v1, Lio/fabric/sdk/android/a/b/i$a;->bci: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, "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;->bcj:Ljava/util/Map;
+    sget-object v0, Lio/fabric/sdk/android/a/b/i$a;->bcf: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;->bbV:Lio/fabric/sdk/android/a/b/i$a;
 
     const-string v2, "x86"
 
@@ -259,7 +259,7 @@
     return-void
 .end method
 
-.method static BY()Lio/fabric/sdk/android/a/b/i$a;
+.method static BW()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->bcg:Lio/fabric/sdk/android/a/b/i$a;
+    sget-object v0, Lio/fabric/sdk/android/a/b/i$a;->bcc: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;->bcj:Ljava/util/Map;
+    sget-object v1, Lio/fabric/sdk/android/a/b/i$a;->bcf: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;->bcg:Lio/fabric/sdk/android/a/b/i$a;
+    sget-object v0, Lio/fabric/sdk/android/a/b/i$a;->bcc: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;->bck:[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;
 
     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 8ce6d95f8b..e50a4fd46a 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 bbV:Ljava/lang/Boolean;
+.field private static bbR:Ljava/lang/Boolean;
 
-.field private static final bbW:[C
+.field private static final bbS:[C
 
-.field private static bbX:J
+.field private static bbT:J
 
-.field public static final bbY:Ljava/util/Comparator;
+.field public static final bbU: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;->bbW:[C
+    sput-object v0, Lio/fabric/sdk/android/a/b/i;->bbS:[C
 
     const-wide/16 v0, -0x1
 
-    sput-wide v0, Lio/fabric/sdk/android/a/b/i;->bbX:J
+    sput-wide v0, Lio/fabric/sdk/android/a/b/i;->bbT: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;->bbY:Ljava/util/Comparator;
+    sput-object v0, Lio/fabric/sdk/android/a/b/i;->bbU:Ljava/util/Comparator;
 
     return-void
 
@@ -76,10 +76,10 @@
     .end array-data
 .end method
 
-.method public static BW()I
+.method public static BU()I
     .locals 1
 
-    invoke-static {}, Lio/fabric/sdk/android/a/b/i$a;->BY()Lio/fabric/sdk/android/a/b/i$a;
+    invoke-static {}, Lio/fabric/sdk/android/a/b/i$a;->BW()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 BX()J
+.method public static declared-synchronized BV()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;->bbX:J
+    sget-wide v1, Lio/fabric/sdk/android/a/b/i;->bbT:J
 
     const-wide/16 v3, -0x1
 
@@ -192,7 +192,7 @@
     goto :goto_0
 
     :cond_2
-    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->bbX:J
+    sput-wide v1, Lio/fabric/sdk/android/a/b/i;->bbT:J
 
     :cond_4
-    sget-wide v1, Lio/fabric/sdk/android/a/b/i;->bbX:J
+    sget-wide v1, Lio/fabric/sdk/android/a/b/i;->bbT: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->bbV:Ljava/lang/Boolean;
+    sget-object v0, Lio/fabric/sdk/android/a/b/i;->bbR: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;->bbV:Ljava/lang/Boolean;
+    sput-object p0, Lio/fabric/sdk/android/a/b/i;->bbR:Ljava/lang/Boolean;
 
     :cond_0
-    sget-object p0, Lio/fabric/sdk/android/a/b/i;->bbV:Ljava/lang/Boolean;
+    sget-object p0, Lio/fabric/sdk/android/a/b/i;->bbR: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()Lio/fabric/sdk/android/l;
 
     move-result-object v3
 
@@ -971,7 +971,7 @@
 
     move-result-object p0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -1019,7 +1019,7 @@
 
     move-result-object p0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->bbW:[C
+    sget-object v4, Lio/fabric/sdk/android/a/b/i;->bbS:[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 cabc238ca8..d506a8d3c6 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 bcl:Ljava/lang/String;
+.field public final bch: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;->bcl:Ljava/lang/String;
+    iput-object p2, p0, Lio/fabric/sdk/android/a/b/j;->bch: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 ee6a408622..2539ee3c89 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 BZ()J
+.method public abstract BX()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 55da238283..6aaa3b1f44 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 bcm:Lio/fabric/sdk/android/a/b/l;
+.field private static bci:Lio/fabric/sdk/android/a/b/l;
 
-.field private static bcn:Ljava/lang/Object;
+.field private static bcj:Ljava/lang/Object;
 
 
 # instance fields
-.field private volatile bco:Z
+.field private volatile bck:Z
 
-.field public volatile bcp:Z
+.field public volatile bcl:Z
 
-.field private final bcq:Lio/fabric/sdk/android/a/b/p;
+.field private final bcm:Lio/fabric/sdk/android/a/b/p;
 
-.field private bcr:Z
+.field private bcn: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;->bcn:Ljava/lang/Object;
+    sput-object v0, Lio/fabric/sdk/android/a/b/l;->bcj: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;->bcr:Z
+    iput-boolean v0, p0, Lio/fabric/sdk/android/a/b/l;->bcn: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;->bcq:Lio/fabric/sdk/android/a/b/p;
+    iput-object v1, p0, Lio/fabric/sdk/android/a/b/l;->bcm: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->bcp:Z
+    iput-boolean v1, p0, Lio/fabric/sdk/android/a/b/l;->bcl:Z
 
-    iput-boolean v2, p0, Lio/fabric/sdk/android/a/b/l;->bco:Z
+    iput-boolean v2, p0, Lio/fabric/sdk/android/a/b/l;->bck: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;->bcr:Z
+    iput-boolean v0, p0, Lio/fabric/sdk/android/a/b/l;->bcn: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;->bcn:Ljava/lang/Object;
+    sget-object v0, Lio/fabric/sdk/android/a/b/l;->bcj:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lio/fabric/sdk/android/a/b/l;->bcm:Lio/fabric/sdk/android/a/b/l;
+    sget-object v1, Lio/fabric/sdk/android/a/b/l;->bci: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;->bcm:Lio/fabric/sdk/android/a/b/l;
+    sput-object v1, Lio/fabric/sdk/android/a/b/l;->bci:Lio/fabric/sdk/android/a/b/l;
 
     :cond_0
-    sget-object p0, Lio/fabric/sdk/android/a/b/l;->bcm:Lio/fabric/sdk/android/a/b/l;
+    sget-object p0, Lio/fabric/sdk/android/a/b/l;->bci:Lio/fabric/sdk/android/a/b/l;
 
     monitor-exit v0
 
@@ -213,23 +213,23 @@
 
 
 # virtual methods
-.method public final Ca()Z
+.method public final BY()Z
     .locals 1
 
-    iget-boolean v0, p0, Lio/fabric/sdk/android/a/b/l;->bcr:Z
+    iget-boolean v0, p0, Lio/fabric/sdk/android/a/b/l;->bcn:Z
 
     if-eqz v0, :cond_0
 
-    iget-boolean v0, p0, Lio/fabric/sdk/android/a/b/l;->bco:Z
+    iget-boolean v0, p0, Lio/fabric/sdk/android/a/b/l;->bck:Z
 
     if-eqz v0, :cond_0
 
-    iget-boolean v0, p0, Lio/fabric/sdk/android/a/b/l;->bcp:Z
+    iget-boolean v0, p0, Lio/fabric/sdk/android/a/b/l;->bcl:Z
 
     return v0
 
     :cond_0
-    iget-object v0, p0, Lio/fabric/sdk/android/a/b/l;->bcq:Lio/fabric/sdk/android/a/b/p;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/l;->bcm: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 1fd1c5ff14..88d14de1d5 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 bcs:Lio/fabric/sdk/android/a/b/m;
+.field public static final enum bco: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 bcp: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 bcq:Lio/fabric/sdk/android/a/b/m;
 
-.field public static final enum bcv:Lio/fabric/sdk/android/a/b/m;
+.field public static final enum bcr:Lio/fabric/sdk/android/a/b/m;
 
-.field private static final synthetic bcw:[Lio/fabric/sdk/android/a/b/m;
+.field private static final synthetic bcs:[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;->bcs:Lio/fabric/sdk/android/a/b/m;
+    sput-object v0, Lio/fabric/sdk/android/a/b/m;->bco: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;->bct:Lio/fabric/sdk/android/a/b/m;
+    sput-object v0, Lio/fabric/sdk/android/a/b/m;->bcp: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;->bcu:Lio/fabric/sdk/android/a/b/m;
+    sput-object v0, Lio/fabric/sdk/android/a/b/m;->bcq: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;->bcv:Lio/fabric/sdk/android/a/b/m;
+    sput-object v0, Lio/fabric/sdk/android/a/b/m;->bcr: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;->bcs:Lio/fabric/sdk/android/a/b/m;
+    sget-object v5, Lio/fabric/sdk/android/a/b/m;->bco:Lio/fabric/sdk/android/a/b/m;
 
     aput-object v5, v0, v1
 
-    sget-object v1, Lio/fabric/sdk/android/a/b/m;->bct:Lio/fabric/sdk/android/a/b/m;
+    sget-object v1, Lio/fabric/sdk/android/a/b/m;->bcp:Lio/fabric/sdk/android/a/b/m;
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lio/fabric/sdk/android/a/b/m;->bcu:Lio/fabric/sdk/android/a/b/m;
+    sget-object v1, Lio/fabric/sdk/android/a/b/m;->bcq:Lio/fabric/sdk/android/a/b/m;
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lio/fabric/sdk/android/a/b/m;->bcv:Lio/fabric/sdk/android/a/b/m;
+    sget-object v1, Lio/fabric/sdk/android/a/b/m;->bcr:Lio/fabric/sdk/android/a/b/m;
 
     aput-object v1, v0, v4
 
-    sput-object v0, Lio/fabric/sdk/android/a/b/m;->bcw:[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;
 
     return-void
 .end method
@@ -124,19 +124,19 @@
 
     if-eqz v0, :cond_0
 
-    sget-object p0, Lio/fabric/sdk/android/a/b/m;->bcu:Lio/fabric/sdk/android/a/b/m;
+    sget-object p0, Lio/fabric/sdk/android/a/b/m;->bcq: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;->bcv:Lio/fabric/sdk/android/a/b/m;
+    sget-object p0, Lio/fabric/sdk/android/a/b/m;->bcr:Lio/fabric/sdk/android/a/b/m;
 
     return-object p0
 
     :cond_1
-    sget-object p0, Lio/fabric/sdk/android/a/b/m;->bcs:Lio/fabric/sdk/android/a/b/m;
+    sget-object p0, Lio/fabric/sdk/android/a/b/m;->bco: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;->bcw:[Lio/fabric/sdk/android/a/b/m;
+    sget-object v0, Lio/fabric/sdk/android/a/b/m;->bcs:[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 0a41978fda..b2f9d48a8e 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 bcz:Lio/fabric/sdk/android/a/b/o$1;
+.field final synthetic bcv:Lio/fabric/sdk/android/a/b/o$1;
 
-.field final synthetic ry:Ljava/lang/Runnable;
+.field final synthetic rz: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;->bcz:Lio/fabric/sdk/android/a/b/o$1;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/b/o$1$1;->bcv:Lio/fabric/sdk/android/a/b/o$1;
 
-    iput-object p2, p0, Lio/fabric/sdk/android/a/b/o$1$1;->ry:Ljava/lang/Runnable;
+    iput-object p2, p0, Lio/fabric/sdk/android/a/b/o$1$1;->rz: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;->ry:Ljava/lang/Runnable;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/o$1$1;->rz: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 a6c074eede..07b99bd3aa 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 bcx:Ljava/lang/String;
+.field final synthetic bct:Ljava/lang/String;
 
-.field final synthetic bcy:Ljava/util/concurrent/atomic/AtomicLong;
+.field final synthetic bcu: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;->bcx:Ljava/lang/String;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/b/o$1;->bct:Ljava/lang/String;
 
-    iput-object p2, p0, Lio/fabric/sdk/android/a/b/o$1;->bcy:Ljava/util/concurrent/atomic/AtomicLong;
+    iput-object p2, p0, Lio/fabric/sdk/android/a/b/o$1;->bcu: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;->bcx:Ljava/lang/String;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/b/o$1;->bct: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;->bcy:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/b/o$1;->bcu: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 0468f61411..25f422450c 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 bcA:Ljava/lang/String;
+.field final synthetic bcw:Ljava/lang/String;
 
-.field final synthetic bcB:Ljava/util/concurrent/ExecutorService;
+.field final synthetic bcx:Ljava/util/concurrent/ExecutorService;
 
-.field final synthetic bcC:J
+.field final synthetic bcy:J
 
-.field final synthetic bcD:Ljava/util/concurrent/TimeUnit;
+.field final synthetic bcz: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;->bcA:Ljava/lang/String;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/b/o$2;->bcw:Ljava/lang/String;
 
-    iput-object p2, p0, Lio/fabric/sdk/android/a/b/o$2;->bcB:Ljava/util/concurrent/ExecutorService;
+    iput-object p2, p0, Lio/fabric/sdk/android/a/b/o$2;->bcx:Ljava/util/concurrent/ExecutorService;
 
     const-wide/16 p1, 0x2
 
-    iput-wide p1, p0, Lio/fabric/sdk/android/a/b/o$2;->bcC:J
+    iput-wide p1, p0, Lio/fabric/sdk/android/a/b/o$2;->bcy:J
 
-    iput-object p5, p0, Lio/fabric/sdk/android/a/b/o$2;->bcD:Ljava/util/concurrent/TimeUnit;
+    iput-object p5, p0, Lio/fabric/sdk/android/a/b/o$2;->bcz: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->bcA:Ljava/lang/String;
+    iget-object v3, p0, Lio/fabric/sdk/android/a/b/o$2;->bcw: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;->bcB:Ljava/util/concurrent/ExecutorService;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/b/o$2;->bcx: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;->bcB:Ljava/util/concurrent/ExecutorService;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/b/o$2;->bcx:Ljava/util/concurrent/ExecutorService;
 
-    iget-wide v2, p0, Lio/fabric/sdk/android/a/b/o$2;->bcC:J
+    iget-wide v2, p0, Lio/fabric/sdk/android/a/b/o$2;->bcy:J
 
-    iget-object v4, p0, Lio/fabric/sdk/android/a/b/o$2;->bcD:Ljava/util/concurrent/TimeUnit;
+    iget-object v4, p0, Lio/fabric/sdk/android/a/b/o$2;->bcz: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->bcA:Ljava/lang/String;
+    iget-object v3, p0, Lio/fabric/sdk/android/a/b/o$2;->bcw: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;->bcB:Ljava/util/concurrent/ExecutorService;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/b/o$2;->bcx: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->bcA:Ljava/lang/String;
+    iget-object v5, p0, Lio/fabric/sdk/android/a/b/o$2;->bcw: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;->bcB:Ljava/util/concurrent/ExecutorService;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/o$2;->bcx: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 d50ddd2c85..0352738da2 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 bcE:Ljava/lang/reflect/Method;
+.field private final bcA:Ljava/lang/reflect/Method;
 
-.field private final bcF:Ljava/lang/Object;
+.field private final bcB: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;->bcF:Ljava/lang/Object;
+    iput-object p2, p0, Lio/fabric/sdk/android/a/b/q;->bcB: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;->bcE:Ljava/lang/reflect/Method;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/b/q;->bcA:Ljava/lang/reflect/Method;
 
     return-void
 .end method
@@ -85,7 +85,7 @@
     :catch_0
     move-exception p0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->bcE:Ljava/lang/reflect/Method;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/b/q;->bcA:Ljava/lang/reflect/Method;
 
-    iget-object v2, p0, Lio/fabric/sdk/android/a/b/q;->bcF:Ljava/lang/Object;
+    iget-object v2, p0, Lio/fabric/sdk/android/a/b/q;->bcB: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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 eb1c96652c..f8fb8ee470 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 bcM: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 bcO:Lio/fabric/sdk/android/a/b/s$a;
+
+.field public static final enum bcP: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 bcR: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 bcT: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 bcV: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 bcX:[Lio/fabric/sdk/android/a/b/s$a;
+.field private static final synthetic bcT:[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;->bcQ:Lio/fabric/sdk/android/a/b/s$a;
+    sput-object v0, Lio/fabric/sdk/android/a/b/s$a;->bcM: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;->bcR:Lio/fabric/sdk/android/a/b/s$a;
+    sput-object v0, Lio/fabric/sdk/android/a/b/s$a;->bcN: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;->bcS:Lio/fabric/sdk/android/a/b/s$a;
+    sput-object v0, Lio/fabric/sdk/android/a/b/s$a;->bcO: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;->bcT:Lio/fabric/sdk/android/a/b/s$a;
+    sput-object v0, Lio/fabric/sdk/android/a/b/s$a;->bcP: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;->bcU: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;
 
@@ -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;->bcV: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;
 
@@ -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;->bcW: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;
 
     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;->bcQ:Lio/fabric/sdk/android/a/b/s$a;
+    sget-object v8, Lio/fabric/sdk/android/a/b/s$a;->bcM:Lio/fabric/sdk/android/a/b/s$a;
 
     aput-object v8, v0, v1
 
-    sget-object v1, Lio/fabric/sdk/android/a/b/s$a;->bcR:Lio/fabric/sdk/android/a/b/s$a;
+    sget-object v1, Lio/fabric/sdk/android/a/b/s$a;->bcN:Lio/fabric/sdk/android/a/b/s$a;
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lio/fabric/sdk/android/a/b/s$a;->bcS:Lio/fabric/sdk/android/a/b/s$a;
+    sget-object v1, Lio/fabric/sdk/android/a/b/s$a;->bcO:Lio/fabric/sdk/android/a/b/s$a;
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lio/fabric/sdk/android/a/b/s$a;->bcT:Lio/fabric/sdk/android/a/b/s$a;
+    sget-object v1, Lio/fabric/sdk/android/a/b/s$a;->bcP:Lio/fabric/sdk/android/a/b/s$a;
 
     aput-object v1, v0, v4
 
-    sget-object v1, Lio/fabric/sdk/android/a/b/s$a;->bcU:Lio/fabric/sdk/android/a/b/s$a;
+    sget-object v1, Lio/fabric/sdk/android/a/b/s$a;->bcQ:Lio/fabric/sdk/android/a/b/s$a;
 
     aput-object v1, v0, v5
 
-    sget-object v1, Lio/fabric/sdk/android/a/b/s$a;->bcV: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, v6
 
-    sget-object v1, Lio/fabric/sdk/android/a/b/s$a;->bcW: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, v7
 
-    sput-object v0, Lio/fabric/sdk/android/a/b/s$a;->bcX:[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;
 
     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;->bcX:[Lio/fabric/sdk/android/a/b/s$a;
+    sget-object v0, Lio/fabric/sdk/android/a/b/s$a;->bcT:[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 e48755f542..112e508e13 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 bcG:Ljava/util/regex/Pattern;
+.field private static final bcC:Ljava/util/regex/Pattern;
 
-.field private static final bcH:Ljava/lang/String;
+.field private static final bcD:Ljava/lang/String;
 
 
 # instance fields
-.field private final bbu:Ljava/lang/String;
+.field private final bbq:Ljava/lang/String;
 
-.field public final bbv:Ljava/lang/String;
+.field public final bbr:Ljava/lang/String;
 
-.field private final bcI:Ljava/util/concurrent/locks/ReentrantLock;
+.field private final bcE:Ljava/util/concurrent/locks/ReentrantLock;
 
-.field private final bcJ:Lio/fabric/sdk/android/a/b/t;
+.field private final bcF:Lio/fabric/sdk/android/a/b/t;
 
-.field public final bcK:Z
+.field public final bcG:Z
 
-.field public final bcL:Z
+.field public final bcH:Z
 
-.field bcM:Lio/fabric/sdk/android/a/b/c;
+.field bcI:Lio/fabric/sdk/android/a/b/c;
 
-.field bcN:Lio/fabric/sdk/android/a/b/b;
+.field bcJ:Lio/fabric/sdk/android/a/b/b;
 
-.field bcO:Z
+.field bcK:Z
 
-.field bcP:Lio/fabric/sdk/android/a/b/r;
+.field bcL:Lio/fabric/sdk/android/a/b/r;
 
-.field public final le:Landroid/content/Context;
+.field public final lf:Landroid/content/Context;
 
-.field private final pn:Ljava/util/Collection;
+.field private final po: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;->bcG:Ljava/util/regex/Pattern;
+    sput-object v0, Lio/fabric/sdk/android/a/b/s;->bcC: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;->bcH:Ljava/lang/String;
+    sput-object v0, Lio/fabric/sdk/android/a/b/s;->bcD: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;->bcI:Ljava/util/concurrent/locks/ReentrantLock;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/b/s;->bcE: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;->le:Landroid/content/Context;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/b/s;->lf:Landroid/content/Context;
 
-    iput-object p2, p0, Lio/fabric/sdk/android/a/b/s;->bbv:Ljava/lang/String;
+    iput-object p2, p0, Lio/fabric/sdk/android/a/b/s;->bbr:Ljava/lang/String;
 
-    iput-object p3, p0, Lio/fabric/sdk/android/a/b/s;->bbu:Ljava/lang/String;
+    iput-object p3, p0, Lio/fabric/sdk/android/a/b/s;->bbq:Ljava/lang/String;
 
-    iput-object p4, p0, Lio/fabric/sdk/android/a/b/s;->pn:Ljava/util/Collection;
+    iput-object p4, p0, Lio/fabric/sdk/android/a/b/s;->po: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;->bcJ:Lio/fabric/sdk/android/a/b/t;
+    iput-object p2, p0, Lio/fabric/sdk/android/a/b/s;->bcF: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;->bcM:Lio/fabric/sdk/android/a/b/c;
+    iput-object p2, p0, Lio/fabric/sdk/android/a/b/s;->bcI: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;->bcP:Lio/fabric/sdk/android/a/b/r;
+    iput-object p2, p0, Lio/fabric/sdk/android/a/b/s;->bcL: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;->bcK:Z
+    iput-boolean p3, p0, Lio/fabric/sdk/android/a/b/s;->bcG:Z
 
-    iget-boolean p3, p0, Lio/fabric/sdk/android/a/b/s;->bcK:Z
+    iget-boolean p3, p0, Lio/fabric/sdk/android/a/b/s;->bcG:Z
 
     const-string p4, "Fabric"
 
     if-nez p3, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->bcL:Z
+    iput-boolean p2, p0, Lio/fabric/sdk/android/a/b/s;->bcH:Z
 
-    iget-boolean p2, p0, Lio/fabric/sdk/android/a/b/s;->bcL:Z
+    iget-boolean p2, p0, Lio/fabric/sdk/android/a/b/s;->bcH:Z
 
     if-nez p2, :cond_1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()Lio/fabric/sdk/android/l;
 
     move-result-object p2
 
@@ -232,7 +232,7 @@
     throw p1
 .end method
 
-.method public static Cc()Ljava/lang/String;
+.method public static Ca()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;->bcI:Ljava/util/concurrent/locks/ReentrantLock;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/b/s;->bcE: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;->bcG:Ljava/util/regex/Pattern;
+    sget-object v1, Lio/fabric/sdk/android/a/b/s;->bcC: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;->bcI:Ljava/util/concurrent/locks/ReentrantLock;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/b/s;->bcE: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;->bcI:Ljava/util/concurrent/locks/ReentrantLock;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/s;->bcE: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;->BU()Lio/fabric/sdk/android/a/b/b;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/b/s;->BS()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;->bbO:Ljava/lang/String;
+    iget-object v0, v0, Lio/fabric/sdk/android/a/b/b;->bbK: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;->bcI:Ljava/util/concurrent/locks/ReentrantLock;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/b/s;->bcE: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;->bcI:Ljava/util/concurrent/locks/ReentrantLock;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/b/s;->bcE: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;->bcI:Ljava/util/concurrent/locks/ReentrantLock;
+    iget-object p2, p0, Lio/fabric/sdk/android/a/b/s;->bcE: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;->bcH:Ljava/lang/String;
+    sget-object v0, Lio/fabric/sdk/android/a/b/s;->bcD:Ljava/lang/String;
 
     const-string v1, ""
 
@@ -511,21 +511,21 @@
 
 
 # virtual methods
-.method public declared-synchronized BU()Lio/fabric/sdk/android/a/b/b;
+.method public declared-synchronized BS()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;->bcO:Z
+    iget-boolean v0, p0, Lio/fabric/sdk/android/a/b/s;->bcK:Z
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/b/s;->bcM:Lio/fabric/sdk/android/a/b/c;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/s;->bcI:Lio/fabric/sdk/android/a/b/c;
 
-    iget-object v1, v0, Lio/fabric/sdk/android/a/b/c;->tE:Lio/fabric/sdk/android/a/f/c;
+    iget-object v1, v0, Lio/fabric/sdk/android/a/b/c;->tF:Lio/fabric/sdk/android/a/f/c;
 
-    invoke-interface {v1}, Lio/fabric/sdk/android/a/f/c;->CP()Landroid/content/SharedPreferences;
+    invoke-interface {v1}, Lio/fabric/sdk/android/a/f/c;->CN()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;->tE:Lio/fabric/sdk/android/a/f/c;
+    iget-object v2, v0, Lio/fabric/sdk/android/a/b/c;->tF:Lio/fabric/sdk/android/a/f/c;
 
-    invoke-interface {v2}, Lio/fabric/sdk/android/a/f/c;->CP()Landroid/content/SharedPreferences;
+    invoke-interface {v2}, Lio/fabric/sdk/android/a/f/c;->CN()Landroid/content/SharedPreferences;
 
     move-result-object v2
 
@@ -561,7 +561,7 @@
 
     if-eqz v1, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BT()Lio/fabric/sdk/android/a/b/b;
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/c;->BR()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;->bcN:Lio/fabric/sdk/android/a/b/b;
+    iput-object v3, p0, Lio/fabric/sdk/android/a/b/s;->bcJ:Lio/fabric/sdk/android/a/b/b;
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lio/fabric/sdk/android/a/b/s;->bcO:Z
+    iput-boolean v0, p0, Lio/fabric/sdk/android/a/b/s;->bcK:Z
 
     :cond_1
-    iget-object v0, p0, Lio/fabric/sdk/android/a/b/s;->bcN:Lio/fabric/sdk/android/a/b/b;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/s;->bcJ: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 Cb()Ljava/lang/String;
+.method public final BZ()Ljava/lang/String;
     .locals 3
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/b/s;->bbu:Ljava/lang/String;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/s;->bbq:Ljava/lang/String;
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/b/s;->le:Landroid/content/Context;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/s;->lf: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 Cd()Ljava/lang/String;
+.method public final Cb()Ljava/lang/String;
     .locals 2
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/b/s;->bcJ:Lio/fabric/sdk/android/a/b/t;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/s;->bcF:Lio/fabric/sdk/android/a/b/t;
 
-    iget-object v1, p0, Lio/fabric/sdk/android/a/b/s;->le:Landroid/content/Context;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/b/s;->lf: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;->pn:Ljava/util/Collection;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/b/s;->po: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 1fb043e049..c59e5221d1 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 bda:Lio/fabric/sdk/android/a/b/t;
+.field final synthetic bcW: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;->bda:Lio/fabric/sdk/android/a/b/t;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/b/t$1;->bcW: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 0415b151b0..eaeda705a5 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 bcY:Lio/fabric/sdk/android/a/a/d;
+.field private final bcU: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 bcZ:Lio/fabric/sdk/android/a/a/b;
+.field private final bcV: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;->bcY:Lio/fabric/sdk/android/a/a/d;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/b/t;->bcU: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;->bcZ:Lio/fabric/sdk/android/a/a/b;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/b/t;->bcV: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;->bcZ:Lio/fabric/sdk/android/a/a/b;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/b/t;->bcV:Lio/fabric/sdk/android/a/a/b;
 
-    iget-object v2, p0, Lio/fabric/sdk/android/a/b/t;->bcY:Lio/fabric/sdk/android/a/a/d;
+    iget-object v2, p0, Lio/fabric/sdk/android/a/b/t;->bcU: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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 0f6fb3d8d4..b1ed4cadad 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 bdh:Z
+.field bdd:Z
 
-.field final synthetic bdi:Ljava/lang/StringBuilder;
+.field final synthetic bde:Ljava/lang/StringBuilder;
 
-.field final synthetic bdj:Lio/fabric/sdk/android/a/b/u;
+.field final synthetic bdf: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;->bdj:Lio/fabric/sdk/android/a/b/u;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/b/u$1;->bdf:Lio/fabric/sdk/android/a/b/u;
 
-    iput-object p2, p0, Lio/fabric/sdk/android/a/b/u$1;->bdi:Ljava/lang/StringBuilder;
+    iput-object p2, p0, Lio/fabric/sdk/android/a/b/u$1;->bde: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;->bdh:Z
+    iput-boolean p1, p0, Lio/fabric/sdk/android/a/b/u$1;->bdd:Z
 
     return-void
 .end method
@@ -52,25 +52,25 @@
         }
     .end annotation
 
-    iget-boolean p1, p0, Lio/fabric/sdk/android/a/b/u$1;->bdh:Z
+    iget-boolean p1, p0, Lio/fabric/sdk/android/a/b/u$1;->bdd:Z
 
     if-eqz p1, :cond_0
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lio/fabric/sdk/android/a/b/u$1;->bdh:Z
+    iput-boolean p1, p0, Lio/fabric/sdk/android/a/b/u$1;->bdd:Z
 
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u$1;->bdi:Ljava/lang/StringBuilder;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u$1;->bde: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;->bdi:Ljava/lang/StringBuilder;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u$1;->bde: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 fd82f2611b..19f631ba5f 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 bdk:Lio/fabric/sdk/android/a/b/u$a;
+.field static final bdg: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;->bdk:Lio/fabric/sdk/android/a/b/u$a;
+    sput-object v0, Lio/fabric/sdk/android/a/b/u$a;->bdg: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 1e9e4ed550..825d6583c9 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 bdj:Lio/fabric/sdk/android/a/b/u;
-
-.field private bdl:I
+.field final synthetic bdf:Lio/fabric/sdk/android/a/b/u;
 
 .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;->bdj:Lio/fabric/sdk/android/a/b/u;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/b/u$b;->bdf: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;->bdl:I
+    iput p1, p0, Lio/fabric/sdk/android/a/b/u$b;->remaining:I
 
     return-void
 .end method
@@ -65,7 +65,7 @@
         }
     .end annotation
 
-    iget v0, p0, Lio/fabric/sdk/android/a/b/u$b;->bdl:I
+    iget v0, p0, Lio/fabric/sdk/android/a/b/u$b;->remaining: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;->bdj:Lio/fabric/sdk/android/a/b/u;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u$b;->bdf: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;->bdj:Lio/fabric/sdk/android/a/b/u;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u$b;->bdf: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;->bdj:Lio/fabric/sdk/android/a/b/u;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/b/u$b;->bdf: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;->bdl:I
+    iget v1, p0, Lio/fabric/sdk/android/a/b/u$b;->remaining:I
 
     add-int/lit8 v1, v1, -0x1
 
-    iput v1, p0, Lio/fabric/sdk/android/a/b/u$b;->bdl:I
+    iput v1, p0, Lio/fabric/sdk/android/a/b/u$b;->remaining: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;->bdl:I
+    iget v0, p0, Lio/fabric/sdk/android/a/b/u$b;->remaining: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;->bdj:Lio/fabric/sdk/android/a/b/u;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u$b;->bdf: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;->bdj:Lio/fabric/sdk/android/a/b/u;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u$b;->bdf: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;->bdl:I
+    iget p1, p0, Lio/fabric/sdk/android/a/b/u$b;->remaining:I
 
     sub-int/2addr p1, p3
 
-    iput p1, p0, Lio/fabric/sdk/android/a/b/u$b;->bdl:I
+    iput p1, p0, Lio/fabric/sdk/android/a/b/u$b;->remaining: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 9c0528880c..8e6ac77a6a 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 bdb:Ljava/util/logging/Logger;
+.field private static final bcX:Ljava/util/logging/Logger;
 
 
 # instance fields
-.field private final bdc:Ljava/io/RandomAccessFile;
+.field private final bcY:Ljava/io/RandomAccessFile;
 
-.field bdd:I
+.field bcZ:I
 
-.field private bde:I
+.field private bda:I
 
-.field private bdf:Lio/fabric/sdk/android/a/b/u$a;
+.field private bdb:Lio/fabric/sdk/android/a/b/u$a;
 
-.field private bdg:Lio/fabric/sdk/android/a/b/u$a;
+.field private bdc: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;->bdb:Ljava/util/logging/Logger;
+    sput-object v0, Lio/fabric/sdk/android/a/b/u;->bcX: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;->bdc:Ljava/io/RandomAccessFile;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bcY:Ljava/io/RandomAccessFile;
 
-    iget-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;->bcY: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;->bdc:Ljava/io/RandomAccessFile;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bcY: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;->bdd:I
+    iput p1, p0, Lio/fabric/sdk/android/a/b/u;->bcZ:I
 
-    iget p1, p0, Lio/fabric/sdk/android/a/b/u;->bdd:I
+    iget p1, p0, Lio/fabric/sdk/android/a/b/u;->bcZ:I
 
     int-to-long v0, p1
 
-    iget-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;->bcY: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;->bde:I
+    iput p1, p0, Lio/fabric/sdk/android/a/b/u;->bda: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;->bdf:Lio/fabric/sdk/android/a/b/u$a;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bdb: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;->bdg:Lio/fabric/sdk/android/a/b/u$a;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bdc: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;->bdd:I
+    iget v1, p0, Lio/fabric/sdk/android/a/b/u;->bcZ: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;->bdc:Ljava/io/RandomAccessFile;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/b/u;->bcY: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;->bdc:Ljava/io/RandomAccessFile;
+    iget-object p0, p0, Lio/fabric/sdk/android/a/b/u;->bcY: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;->bdc:Ljava/io/RandomAccessFile;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bcY: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;->bdc:Ljava/io/RandomAccessFile;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bcY: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;->bdk:Lio/fabric/sdk/android/a/b/u$a;
+    sget-object p1, Lio/fabric/sdk/android/a/b/u$a;->bdg:Lio/fabric/sdk/android/a/b/u$a;
 
     return-object p1
 
     :cond_0
-    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bdc:Ljava/io/RandomAccessFile;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bcY: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;->bdc:Ljava/io/RandomAccessFile;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/b/u;->bcY: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;->bdd:I
+    iget v0, p0, Lio/fabric/sdk/android/a/b/u;->bcZ: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;->bdd:I
+    iget v0, p0, Lio/fabric/sdk/android/a/b/u;->bcZ:I
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/b/u;->Ce()I
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/b/u;->Cc()I
 
     move-result v1
 
@@ -456,7 +456,7 @@
     return-void
 
     :cond_0
-    iget v1, p0, Lio/fabric/sdk/android/a/b/u;->bdd:I
+    iget v1, p0, Lio/fabric/sdk/android/a/b/u;->bcZ: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;->bdg:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bdc: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;->bdg:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bdc: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;->bdf:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bdb: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;->bdc:Ljava/io/RandomAccessFile;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bcY: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;->bdd:I
+    iget v0, p0, Lio/fabric/sdk/android/a/b/u;->bcZ: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;->bdg:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bdc: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;->bdf:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bdb: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;->bdd:I
+    iget p1, p0, Lio/fabric/sdk/android/a/b/u;->bcZ:I
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bdg:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bdc: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;->bde:I
+    iget v0, p0, Lio/fabric/sdk/android/a/b/u;->bda:I
 
-    iget-object v2, p0, Lio/fabric/sdk/android/a/b/u;->bdf:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object v2, p0, Lio/fabric/sdk/android/a/b/u;->bdb: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;->bdg:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object v2, p0, Lio/fabric/sdk/android/a/b/u;->bdc: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;->bdg:Lio/fabric/sdk/android/a/b/u$a;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bdc:Lio/fabric/sdk/android/a/b/u$a;
 
     goto :goto_1
 
     :cond_4
-    iget p1, p0, Lio/fabric/sdk/android/a/b/u;->bde:I
+    iget p1, p0, Lio/fabric/sdk/android/a/b/u;->bda:I
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bdf:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bdb: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;->bdg:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object v2, p0, Lio/fabric/sdk/android/a/b/u;->bdc: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;->bdd:I
+    iput v1, p0, Lio/fabric/sdk/android/a/b/u;->bcZ:I
 
     return-void
 .end method
@@ -599,13 +599,13 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bdc:Ljava/io/RandomAccessFile;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bcY: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;->bdc:Ljava/io/RandomAccessFile;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bcY: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;->bde:I
+    iput v0, p0, Lio/fabric/sdk/android/a/b/u;->bda:I
 
-    sget-object v0, Lio/fabric/sdk/android/a/b/u$a;->bdk:Lio/fabric/sdk/android/a/b/u$a;
+    sget-object v0, Lio/fabric/sdk/android/a/b/u$a;->bdg: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;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/b/u;->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;
+    sget-object v0, Lio/fabric/sdk/android/a/b/u$a;->bdg: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;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bdc:Lio/fabric/sdk/android/a/b/u$a;
 
-    iget v0, p0, Lio/fabric/sdk/android/a/b/u;->bdd:I
+    iget v0, p0, Lio/fabric/sdk/android/a/b/u;->bcZ: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;->bdd:I
+    iput v1, p0, Lio/fabric/sdk/android/a/b/u;->bcZ: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;->bdd:I
+    iget v0, p0, Lio/fabric/sdk/android/a/b/u;->bcZ:I
 
     const/4 v1, 0x0
 
     if-gt p3, v0, :cond_0
 
-    iget-object p3, p0, Lio/fabric/sdk/android/a/b/u;->bdc:Ljava/io/RandomAccessFile;
+    iget-object p3, p0, Lio/fabric/sdk/android/a/b/u;->bcY: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;->bdc:Ljava/io/RandomAccessFile;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bcY: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;->bdc:Ljava/io/RandomAccessFile;
+    iget-object p3, p0, Lio/fabric/sdk/android/a/b/u;->bcY: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;->bdc:Ljava/io/RandomAccessFile;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bcY: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;->bdc:Ljava/io/RandomAccessFile;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bcY: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;->bdc:Ljava/io/RandomAccessFile;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bcY: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;->bdd:I
+    iget v1, p0, Lio/fabric/sdk/android/a/b/u;->bcZ:I
 
     if-gt v0, v1, :cond_0
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bdc:Ljava/io/RandomAccessFile;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bcY: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;->bdc:Ljava/io/RandomAccessFile;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bcY: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;->bdc:Ljava/io/RandomAccessFile;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bcY: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;->bdc:Ljava/io/RandomAccessFile;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bcY: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;->bdc:Ljava/io/RandomAccessFile;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bcY: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;->bdc:Ljava/io/RandomAccessFile;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bcY:Ljava/io/RandomAccessFile;
 
     add-int/2addr p3, v1
 
@@ -917,10 +917,10 @@
 
 
 # virtual methods
-.method public final Ce()I
+.method public final Cc()I
     .locals 3
 
-    iget v0, p0, Lio/fabric/sdk/android/a/b/u;->bde:I
+    iget v0, p0, Lio/fabric/sdk/android/a/b/u;->bda:I
 
     const/16 v1, 0x10
 
@@ -929,21 +929,21 @@
     return v1
 
     :cond_0
-    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bdg:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bdc: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;->bdf:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object v2, p0, Lio/fabric/sdk/android/a/b/u;->bdb: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;->bdg:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bdc: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;->bdf:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object v2, p0, Lio/fabric/sdk/android/a/b/u;->bdb: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;->bdg:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object v2, p0, Lio/fabric/sdk/android/a/b/u;->bdc: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;->bdg:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bdc: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;->bdg:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/b/u;->bdc: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;->bdd:I
+    iget v1, p0, Lio/fabric/sdk/android/a/b/u;->bcZ:I
 
     add-int/2addr v0, v1
 
-    iget-object v1, p0, Lio/fabric/sdk/android/a/b/u;->bdf:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/b/u;->bdb: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;->bdf:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bdb: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;->bde:I
+    iget v3, p0, Lio/fabric/sdk/android/a/b/u;->bda: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;->bdc:Ljava/io/RandomAccessFile;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bcY: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;->bde:I
+    iget v0, p0, Lio/fabric/sdk/android/a/b/u;->bda: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;->bdg:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object v3, p0, Lio/fabric/sdk/android/a/b/u;->bdc: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;->bdg:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object v4, p0, Lio/fabric/sdk/android/a/b/u;->bdc: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;->bdf:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bdb: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;->bdd:I
+    iget p2, p0, Lio/fabric/sdk/android/a/b/u;->bcZ:I
 
-    iget v1, p0, Lio/fabric/sdk/android/a/b/u;->bde:I
+    iget v1, p0, Lio/fabric/sdk/android/a/b/u;->bda: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;->bdg:Lio/fabric/sdk/android/a/b/u$a;
+    iput-object v4, p0, Lio/fabric/sdk/android/a/b/u;->bdc:Lio/fabric/sdk/android/a/b/u$a;
 
-    iget p1, p0, Lio/fabric/sdk/android/a/b/u;->bde:I
+    iget p1, p0, Lio/fabric/sdk/android/a/b/u;->bda:I
 
     add-int/lit8 p1, p1, 0x1
 
-    iput p1, p0, Lio/fabric/sdk/android/a/b/u;->bde:I
+    iput p1, p0, Lio/fabric/sdk/android/a/b/u;->bda:I
 
     if-eqz v0, :cond_2
 
-    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bdg:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bdc: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;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bdb: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;->bde:I
+    iget v0, p0, Lio/fabric/sdk/android/a/b/u;->bda: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;->bdf:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bdb: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;->bdf:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object v3, p0, Lio/fabric/sdk/android/a/b/u;->bdb: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;->bdd:I
+    iget v3, p0, Lio/fabric/sdk/android/a/b/u;->bcZ:I
 
-    iget v4, p0, Lio/fabric/sdk/android/a/b/u;->bde:I
+    iget v4, p0, Lio/fabric/sdk/android/a/b/u;->bda:I
 
     sub-int/2addr v4, v1
 
-    iget-object v5, p0, Lio/fabric/sdk/android/a/b/u;->bdg:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object v5, p0, Lio/fabric/sdk/android/a/b/u;->bdc: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;->bde:I
+    iget v3, p0, Lio/fabric/sdk/android/a/b/u;->bda:I
 
     sub-int/2addr v3, v1
 
-    iput v3, p0, Lio/fabric/sdk/android/a/b/u;->bde:I
+    iput v3, p0, Lio/fabric/sdk/android/a/b/u;->bda: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;->bdf:Lio/fabric/sdk/android/a/b/u$a;
+    iput-object v1, p0, Lio/fabric/sdk/android/a/b/u;->bdb: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;->bdd:I
+    iget v1, p0, Lio/fabric/sdk/android/a/b/u;->bcZ: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;->bde:I
+    iget v1, p0, Lio/fabric/sdk/android/a/b/u;->bda: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;->bdf:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/b/u;->bdb: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;->bdg:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/b/u;->bdc: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;->bdb:Ljava/util/logging/Logger;
+    sget-object v2, Lio/fabric/sdk/android/a/b/u;->bcX: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 e728d1879b..058a4075ca 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 BZ()J
+.method public final BX()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 9e043bfd85..cf92dac691 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 pV:Ljava/lang/String;
+.field private final pW:Ljava/lang/String;
 
-.field private final sU:Z
+.field private final sV: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;->pV:Ljava/lang/String;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/b/x;->pW: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;->sU:Z
+    iput-boolean p1, p0, Lio/fabric/sdk/android/a/b/x;->sV:Z
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final declared-synchronized Cf()V
+.method public final declared-synchronized Cd()V
     .locals 2
 
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lio/fabric/sdk/android/a/b/x;->sU:Z
+    iget-boolean v0, p0, Lio/fabric/sdk/android/a/b/x;->sV: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 Cg()V
+.method public final declared-synchronized Ce()V
     .locals 5
 
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lio/fabric/sdk/android/a/b/x;->sU:Z
+    iget-boolean v0, p0, Lio/fabric/sdk/android/a/b/x;->sV: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;->pV:Ljava/lang/String;
+    iget-object v2, p0, Lio/fabric/sdk/android/a/b/x;->pW: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 3287debcc0..632c479b4c 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 bdv:Ljava/util/concurrent/atomic/AtomicInteger;
+.field private final bdq: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;->bdv:Ljava/util/concurrent/atomic/AtomicInteger;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/c/a$1;->bdq: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;->bdv:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v2, p0, Lio/fabric/sdk/android/a/c/a$1;->bdq: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 292b74a0a9..00301f3731 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 bdw:Lio/fabric/sdk/android/a/c/a;
+.field final synthetic bdr: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;->bdw:Lio/fabric/sdk/android/a/c/a;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/c/a$2;->bdr: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;->bdw:Lio/fabric/sdk/android/a/c/a;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/c/a$2;->bdr: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;->bdw:Lio/fabric/sdk/android/a/c/a;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/c/a$2;->bdr:Lio/fabric/sdk/android/a/c/a;
 
-    invoke-virtual {v0}, Lio/fabric/sdk/android/a/c/a;->BL()Ljava/lang/Object;
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/c/a;->BJ()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 381b33d3c4..4b5c360e0d 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 bdw:Lio/fabric/sdk/android/a/c/a;
+.field final synthetic bdr: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;->bdw:Lio/fabric/sdk/android/a/c/a;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/c/a$3;->bdr: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;->bdw:Lio/fabric/sdk/android/a/c/a;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/c/a$3;->bdr: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;->bdw:Lio/fabric/sdk/android/a/c/a;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/c/a$3;->bdr: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 387b002033..1c9db4d18b 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 bdx:[I
+.field static final synthetic bds:[I
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 3
 
-    invoke-static {}, Lio/fabric/sdk/android/a/c/a$d;->Cj()[I
+    invoke-static {}, Lio/fabric/sdk/android/a/c/a$d;->Ch()[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;->bdx:[I
+    sput-object v0, Lio/fabric/sdk/android/a/c/a$4;->bds:[I
 
     const/4 v0, 0x1
 
     :try_start_0
-    sget-object v1, Lio/fabric/sdk/android/a/c/a$4;->bdx:[I
+    sget-object v1, Lio/fabric/sdk/android/a/c/a$4;->bds:[I
 
-    sget v2, Lio/fabric/sdk/android/a/c/a$d;->bdF:I
+    sget v2, Lio/fabric/sdk/android/a/c/a$d;->bdA: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;->bdx:[I
+    sget-object v1, Lio/fabric/sdk/android/a/c/a$4;->bds:[I
 
-    sget v2, Lio/fabric/sdk/android/a/c/a$d;->bdG:I
+    sget v2, Lio/fabric/sdk/android/a/c/a$d;->bdB: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 4e4b1a02d9..db53ba59cd 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 bdy:Lio/fabric/sdk/android/a/c/a;
+.field final bdt:Lio/fabric/sdk/android/a/c/a;
 
-.field final bdz:[Ljava/lang/Object;
+.field final bdu:[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;->bdy:Lio/fabric/sdk/android/a/c/a;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/c/a$a;->bdt:Lio/fabric/sdk/android/a/c/a;
 
-    iput-object p2, p0, Lio/fabric/sdk/android/a/c/a$a;->bdz:[Ljava/lang/Object;
+    iput-object p2, p0, Lio/fabric/sdk/android/a/c/a$a;->bdu:[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 2930cb0b11..ba3dc3a439 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;->bdy:Lio/fabric/sdk/android/a/c/a;
+    iget-object p1, v0, Lio/fabric/sdk/android/a/c/a$a;->bdt:Lio/fabric/sdk/android/a/c/a;
 
-    iget-object v0, v0, Lio/fabric/sdk/android/a/c/a$a;->bdz:[Ljava/lang/Object;
+    iget-object v0, v0, Lio/fabric/sdk/android/a/c/a$a;->bdu:[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 3cc4a37399..17b3065848 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 bdC:Ljava/lang/Runnable;
+.field final synthetic bdx:Ljava/lang/Runnable;
 
-.field final synthetic bdD:Lio/fabric/sdk/android/a/c/a$c;
+.field final synthetic bdy: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;->bdD:Lio/fabric/sdk/android/a/c/a$c;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/c/a$c$1;->bdy:Lio/fabric/sdk/android/a/c/a$c;
 
-    iput-object p2, p0, Lio/fabric/sdk/android/a/c/a$c$1;->bdC:Ljava/lang/Runnable;
+    iput-object p2, p0, Lio/fabric/sdk/android/a/c/a$c$1;->bdx: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;->bdC:Ljava/lang/Runnable;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/c/a$c$1;->bdx: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;->bdD:Lio/fabric/sdk/android/a/c/a$c;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/c/a$c$1;->bdy: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;->bdD:Lio/fabric/sdk/android/a/c/a$c;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/c/a$c$1;->bdy: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 c6e8073b87..e3b240bcaa 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 bdA:Ljava/util/LinkedList;
+.field final bdv:Ljava/util/LinkedList;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/LinkedList<",
@@ -28,7 +28,7 @@
     .end annotation
 .end field
 
-.field bdB:Ljava/lang/Runnable;
+.field bdw: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;->bdA:Ljava/util/LinkedList;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/c/a$c;->bdv: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;->bdA:Ljava/util/LinkedList;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/c/a$c;->bdv: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;->bdB:Ljava/lang/Runnable;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/c/a$c;->bdw: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;->bdA:Ljava/util/LinkedList;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/c/a$c;->bdv: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;->bdB:Ljava/lang/Runnable;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/c/a$c;->bdw: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;->bdB:Ljava/lang/Runnable;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/c/a$c;->bdw: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 d45841c14f..ad65383ba4 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 bdE:I = 0x1
+.field public static final bdA:I = 0x2
 
-.field public static final bdF:I = 0x2
+.field public static final bdB:I = 0x3
 
-.field public static final bdG:I = 0x3
+.field private static final synthetic bdC:[I
 
-.field private static final synthetic bdH:[I
+.field public static final bdz:I = 0x1
 
 
 # direct methods
@@ -40,33 +40,33 @@
 
     new-array v0, v0, [I
 
-    sget v1, Lio/fabric/sdk/android/a/c/a$d;->bdE:I
+    sget v1, Lio/fabric/sdk/android/a/c/a$d;->bdz:I
 
     const/4 v2, 0x0
 
     aput v1, v0, v2
 
-    sget v1, Lio/fabric/sdk/android/a/c/a$d;->bdF:I
+    sget v1, Lio/fabric/sdk/android/a/c/a$d;->bdA:I
 
     const/4 v2, 0x1
 
     aput v1, v0, v2
 
-    sget v1, Lio/fabric/sdk/android/a/c/a$d;->bdG:I
+    sget v1, Lio/fabric/sdk/android/a/c/a$d;->bdB:I
 
     const/4 v2, 0x2
 
     aput v1, v0, v2
 
-    sput-object v0, Lio/fabric/sdk/android/a/c/a$d;->bdH:[I
+    sput-object v0, Lio/fabric/sdk/android/a/c/a$d;->bdC:[I
 
     return-void
 .end method
 
-.method public static Cj()[I
+.method public static Ch()[I
     .locals 1
 
-    sget-object v0, Lio/fabric/sdk/android/a/c/a$d;->bdH:[I
+    sget-object v0, Lio/fabric/sdk/android/a/c/a$d;->bdC:[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 95002d3693..9a24d829a4 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 bdI:[Ljava/lang/Object;
+.field bdD:[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 579f89dbe1..078a6084ec 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 aQP:Ljava/util/concurrent/Executor;
+.field private static volatile aQL:Ljava/util/concurrent/Executor;
 
-.field private static final bdm:Ljava/util/concurrent/ThreadFactory;
+.field private static final bdh:Ljava/util/concurrent/ThreadFactory;
 
-.field private static final bdn:Ljava/util/concurrent/BlockingQueue;
+.field private static final bdi: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 bdo:Ljava/util/concurrent/Executor;
+.field public static final bdj:Ljava/util/concurrent/Executor;
 
-.field private static final bdp:Lio/fabric/sdk/android/a/c/a$b;
+.field private static final bdk:Lio/fabric/sdk/android/a/c/a$b;
 
 .field private static final k:I
 
 
 # instance fields
-.field private final bdq:Lio/fabric/sdk/android/a/c/a$e;
+.field private final bdl: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 bdr:Ljava/util/concurrent/FutureTask;
+.field private final bdm: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 bds:I
+.field private volatile bdn:I
 
-.field private final bdt:Ljava/util/concurrent/atomic/AtomicBoolean;
+.field private final bdo:Ljava/util/concurrent/atomic/AtomicBoolean;
 
-.field private final bdu:Ljava/util/concurrent/atomic/AtomicBoolean;
+.field private final bdp: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;->bdm:Ljava/util/concurrent/ThreadFactory;
+    sput-object v0, Lio/fabric/sdk/android/a/c/a;->bdh: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;->bdn:Ljava/util/concurrent/BlockingQueue;
+    sput-object v0, Lio/fabric/sdk/android/a/c/a;->bdi: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;->bdn:Ljava/util/concurrent/BlockingQueue;
+    sget-object v8, Lio/fabric/sdk/android/a/c/a;->bdi:Ljava/util/concurrent/BlockingQueue;
 
-    sget-object v9, Lio/fabric/sdk/android/a/c/a;->bdm:Ljava/util/concurrent/ThreadFactory;
+    sget-object v9, Lio/fabric/sdk/android/a/c/a;->bdh: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;->bdo:Ljava/util/concurrent/Executor;
+    sput-object v0, Lio/fabric/sdk/android/a/c/a;->bdj: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;->bdp:Lio/fabric/sdk/android/a/c/a$b;
+    sput-object v0, Lio/fabric/sdk/android/a/c/a;->bdk:Lio/fabric/sdk/android/a/c/a$b;
 
-    sget-object v0, Lio/fabric/sdk/android/a/c/a;->bdo:Ljava/util/concurrent/Executor;
+    sget-object v0, Lio/fabric/sdk/android/a/c/a;->bdj:Ljava/util/concurrent/Executor;
 
-    sput-object v0, Lio/fabric/sdk/android/a/c/a;->aQP:Ljava/util/concurrent/Executor;
+    sput-object v0, Lio/fabric/sdk/android/a/c/a;->aQL: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;->bdE:I
+    sget v0, Lio/fabric/sdk/android/a/c/a$d;->bdz:I
 
-    iput v0, p0, Lio/fabric/sdk/android/a/c/a;->bds:I
+    iput v0, p0, Lio/fabric/sdk/android/a/c/a;->bdn: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;->bdt:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/c/a;->bdo: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;->bdu:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/c/a;->bdp: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;->bdq:Lio/fabric/sdk/android/a/c/a$e;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/c/a;->bdl: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;->bdq:Lio/fabric/sdk/android/a/c/a$e;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/c/a;->bdl: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;->bdr:Ljava/util/concurrent/FutureTask;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/c/a;->bdm: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;->bdu:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object p0, p0, Lio/fabric/sdk/android/a/c/a;->bdp: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;->bdu:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/c/a;->bdp: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;->bdt:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/c/a;->bdo: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;->BK()V
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/a;->BI()V
 
     goto :goto_0
 
     :cond_0
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/a;->BJ()V
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/a;->BH()V
 
     :goto_0
-    sget p1, Lio/fabric/sdk/android/a/c/a$d;->bdG:I
+    sget p1, Lio/fabric/sdk/android/a/c/a$d;->bdB:I
 
-    iput p1, p0, Lio/fabric/sdk/android/a/c/a;->bds:I
+    iput p1, p0, Lio/fabric/sdk/android/a/c/a;->bdn:I
 
     return-void
 .end method
@@ -270,7 +270,7 @@
         }
     .end annotation
 
-    sget-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;->bdk: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 BJ()V
+.method protected BH()V
     .locals 0
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -306,7 +306,7 @@
     return-void
 .end method
 
-.method protected BK()V
+.method protected BI()V
     .locals 0
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -317,7 +317,7 @@
     return-void
 .end method
 
-.method protected varargs abstract BL()Ljava/lang/Object;
+.method protected varargs abstract BJ()Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()TResult;"
@@ -325,24 +325,24 @@
     .end annotation
 .end method
 
-.method public final Ch()I
+.method public final Cf()I
     .locals 1
 
-    iget v0, p0, Lio/fabric/sdk/android/a/c/a;->bds:I
+    iget v0, p0, Lio/fabric/sdk/android/a/c/a;->bdn:I
 
     return v0
 .end method
 
-.method public final Ci()Z
+.method public final Cg()Z
     .locals 2
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/c/a;->bdt:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/c/a;->bdo: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;->bdr:Ljava/util/concurrent/FutureTask;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/c/a;->bdm: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;->bds:I
+    iget v0, p0, Lio/fabric/sdk/android/a/c/a;->bdn:I
 
-    sget v1, Lio/fabric/sdk/android/a/c/a$d;->bdE:I
+    sget v1, Lio/fabric/sdk/android/a/c/a$d;->bdz:I
 
     if-eq v0, v1, :cond_2
 
-    sget-object v0, Lio/fabric/sdk/android/a/c/a$4;->bdx:[I
+    sget-object v0, Lio/fabric/sdk/android/a/c/a$4;->bds:[I
 
-    iget v1, p0, Lio/fabric/sdk/android/a/c/a;->bds:I
+    iget v1, p0, Lio/fabric/sdk/android/a/c/a;->bdn:I
 
     const/4 v2, 0x1
 
@@ -407,17 +407,17 @@
 
     :cond_2
     :goto_0
-    sget v0, Lio/fabric/sdk/android/a/c/a$d;->bdF:I
+    sget v0, Lio/fabric/sdk/android/a/c/a$d;->bdA:I
 
-    iput v0, p0, Lio/fabric/sdk/android/a/c/a;->bds:I
+    iput v0, p0, Lio/fabric/sdk/android/a/c/a;->bdn:I
 
     invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/a;->onPreExecute()V
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/c/a;->bdq:Lio/fabric/sdk/android/a/c/a$e;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/c/a;->bdl:Lio/fabric/sdk/android/a/c/a$e;
 
-    iput-object p2, v0, Lio/fabric/sdk/android/a/c/a$e;->bdI:[Ljava/lang/Object;
+    iput-object p2, v0, Lio/fabric/sdk/android/a/c/a$e;->bdD:[Ljava/lang/Object;
 
-    iget-object p2, p0, Lio/fabric/sdk/android/a/c/a;->bdr:Ljava/util/concurrent/FutureTask;
+    iget-object p2, p0, Lio/fabric/sdk/android/a/c/a;->bdm: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;->bdt:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/c/a;->bdo: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 786de85d70..fde435c38e 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 bdW:I
+.field private final bdR: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;->bdW:I
+    iput p1, p0, Lio/fabric/sdk/android/a/c/a/b;->bdR: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 bdecbb989e..329910f398 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 bdX:J
+.field private final bdS:J
 
-.field private final bdY:I
+.field private final bdT:I
 
 
 # direct methods
@@ -20,11 +20,11 @@
 
     const-wide/16 v0, 0x3e8
 
-    iput-wide v0, p0, Lio/fabric/sdk/android/a/c/a/c;->bdX:J
+    iput-wide v0, p0, Lio/fabric/sdk/android/a/c/a/c;->bdS:J
 
     const/16 v0, 0x8
 
-    iput v0, p0, Lio/fabric/sdk/android/a/c/a/c;->bdY:I
+    iput v0, p0, Lio/fabric/sdk/android/a/c/a/c;->bdT: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;->bdX:J
+    iget-wide v0, p0, Lio/fabric/sdk/android/a/c/a/c;->bdS:J
 
     long-to-double v0, v0
 
-    iget v2, p0, Lio/fabric/sdk/android/a/c/a/c;->bdY:I
+    iget v2, p0, Lio/fabric/sdk/android/a/c/a/c;->bdT: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 662783058b..41184e4569 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 bdZ:Lio/fabric/sdk/android/a/c/a/d;
+.field public final bdU:Lio/fabric/sdk/android/a/c/a/d;
 
-.field public final qn:Lio/fabric/sdk/android/a/c/a/a;
+.field public final qo: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;->qn:Lio/fabric/sdk/android/a/c/a/a;
+    iput-object p2, p0, Lio/fabric/sdk/android/a/c/a/e;->qo:Lio/fabric/sdk/android/a/c/a/a;
 
-    iput-object p3, p0, Lio/fabric/sdk/android/a/c/a/e;->bdZ:Lio/fabric/sdk/android/a/c/a/d;
+    iput-object p3, p0, Lio/fabric/sdk/android/a/c/a/e;->bdU: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 e2bcaa15d6..cc9cac7256 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 Ck()Ljava/util/Collection;
+.method public abstract Ci()Ljava/util/Collection;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
@@ -25,7 +25,7 @@
     .end annotation
 .end method
 
-.method public abstract Cl()Z
+.method public abstract Cj()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 5e823aaaf5..80ad662d43 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 Cm()Lio/fabric/sdk/android/a/c/b;
+.method private Ck()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 Cn()Lio/fabric/sdk/android/a/c/b;
+.method private Cl()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;->Cl()Z
+    invoke-interface {v0}, Lio/fabric/sdk/android/a/c/b;->Cj()Z
 
     move-result v1
 
@@ -305,7 +305,7 @@
 
 
 # virtual methods
-.method public final Co()V
+.method public final Cm()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;->Cl()Z
+    invoke-interface {v1}, Lio/fabric/sdk/android/a/c/b;->Cj()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;->Cm()Lio/fabric/sdk/android/a/c/b;
+    invoke-direct {p0}, Lio/fabric/sdk/android/a/c/c;->Ck()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;->Cn()Lio/fabric/sdk/android/a/c/b;
+    invoke-direct {p0}, Lio/fabric/sdk/android/a/c/c;->Cl()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 c96027b2a2..7a5788485a 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 bdJ:I = 0x1
+.field public static final bdE:I = 0x1
 
-.field public static final bdK:I = 0x2
+.field public static final bdF:I = 0x2
 
-.field public static final bdL:I = 0x3
+.field public static final bdG:I = 0x3
 
-.field public static final bdM:I = 0x4
+.field public static final bdH:I = 0x4
 
-.field private static final synthetic bdN:[I
+.field private static final synthetic bdI:[I
 
 
 # direct methods
@@ -33,31 +33,31 @@
 
     new-array v0, v0, [I
 
-    sget v1, Lio/fabric/sdk/android/a/c/e;->bdJ:I
+    sget v1, Lio/fabric/sdk/android/a/c/e;->bdE:I
 
     const/4 v2, 0x0
 
     aput v1, v0, v2
 
-    sget v1, Lio/fabric/sdk/android/a/c/e;->bdK:I
+    sget v1, Lio/fabric/sdk/android/a/c/e;->bdF:I
 
     const/4 v2, 0x1
 
     aput v1, v0, v2
 
-    sget v1, Lio/fabric/sdk/android/a/c/e;->bdL:I
+    sget v1, Lio/fabric/sdk/android/a/c/e;->bdG:I
 
     const/4 v2, 0x2
 
     aput v1, v0, v2
 
-    sget v1, Lio/fabric/sdk/android/a/c/e;->bdM:I
+    sget v1, Lio/fabric/sdk/android/a/c/e;->bdH:I
 
     const/4 v2, 0x3
 
     aput v1, v0, v2
 
-    sput-object v0, Lio/fabric/sdk/android/a/c/e;->bdN:[I
+    sput-object v0, Lio/fabric/sdk/android/a/c/e;->bdI:[I
 
     return-void
 .end method
@@ -87,7 +87,7 @@
     goto :goto_0
 
     :cond_0
-    sget p1, Lio/fabric/sdk/android/a/c/e;->bdK:I
+    sget p1, Lio/fabric/sdk/android/a/c/e;->bdF: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 254dbdfea3..b3e75c02d9 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 bdQ:Lio/fabric/sdk/android/a/c/f$a;
+.field final synthetic bdL: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;->bdQ:Lio/fabric/sdk/android/a/c/f$a;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/c/f$a$1;->bdL:Lio/fabric/sdk/android/a/c/f$a;
 
     const/4 p1, 0x0
 
@@ -40,7 +40,7 @@
 
 
 # virtual methods
-.method public final Cp()Lio/fabric/sdk/android/a/c/b;
+.method public final Cn()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;->bdQ:Lio/fabric/sdk/android/a/c/f$a;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/c/f$a$1;->bdL: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 7670a5bf5e..91ff0d05a3 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 bdP:Lio/fabric/sdk/android/a/c/f;
+.field private final bdK: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;->bdP:Lio/fabric/sdk/android/a/c/f;
+    iput-object p2, p0, Lio/fabric/sdk/android/a/c/f$a;->bdK: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;->bdP:Lio/fabric/sdk/android/a/c/f;
+    iget-object p0, p0, Lio/fabric/sdk/android/a/c/f$a;->bdK: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 21996a3188..ab396a06d9 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 bdO:Lio/fabric/sdk/android/a/c/j;
+.field private final bdJ: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;->bdO:Lio/fabric/sdk/android/a/c/j;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/c/f;->bdJ:Lio/fabric/sdk/android/a/c/j;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final Ck()Ljava/util/Collection;
+.method public final Ci()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;->bdO:Lio/fabric/sdk/android/a/c/j;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/c/f;->bdJ: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;->Ck()Ljava/util/Collection;
+    invoke-interface {v0}, Lio/fabric/sdk/android/a/c/b;->Ci()Ljava/util/Collection;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final Cl()Z
+.method public final Cj()Z
     .locals 1
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/c/f;->bdO:Lio/fabric/sdk/android/a/c/j;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/c/f;->bdJ: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;->Cl()Z
+    invoke-interface {v0}, Lio/fabric/sdk/android/a/c/b;->Cj()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;->bdO:Lio/fabric/sdk/android/a/c/j;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/c/f;->bdJ: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;->Ch()I
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/f;->Cf()I
 
     move-result v0
 
-    sget v1, Lio/fabric/sdk/android/a/c/a$d;->bdE:I
+    sget v1, Lio/fabric/sdk/android/a/c/a$d;->bdz:I
 
     if-ne v0, v1, :cond_0
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/c/f;->bdO:Lio/fabric/sdk/android/a/c/j;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/c/f;->bdJ: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;->bdO:Lio/fabric/sdk/android/a/c/j;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/c/f;->bdJ: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;->bdO:Lio/fabric/sdk/android/a/c/j;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/c/f;->bdJ: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;->bdO:Lio/fabric/sdk/android/a/c/j;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/c/f;->bdJ: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 120902dda5..f9ee24eba9 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 bdR:Ljava/lang/Object;
+.field final bdM:Ljava/lang/Object;
 
 
 # direct methods
@@ -46,7 +46,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lio/fabric/sdk/android/a/c/h;->bdR:Ljava/lang/Object;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/c/h;->bdM: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;->bdR:Ljava/lang/Object;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/c/h;->bdM:Ljava/lang/Object;
 
     return-void
 .end method
@@ -109,7 +109,7 @@
 
 
 # virtual methods
-.method public final Ck()Ljava/util/Collection;
+.method public final Ci()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;->Cp()Lio/fabric/sdk/android/a/c/b;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/h;->Cn()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;->Ck()Ljava/util/Collection;
+    invoke-interface {v0}, Lio/fabric/sdk/android/a/c/b;->Ci()Ljava/util/Collection;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final Cl()Z
+.method public final Cj()Z
     .locals 1
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/h;->Cp()Lio/fabric/sdk/android/a/c/b;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/h;->Cn()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;->Cl()Z
+    invoke-interface {v0}, Lio/fabric/sdk/android/a/c/b;->Cj()Z
 
     move-result v0
 
     return v0
 .end method
 
-.method public Cp()Lio/fabric/sdk/android/a/c/b;
+.method public Cn()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;->bdR:Ljava/lang/Object;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/c/h;->bdM: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;->Cp()Lio/fabric/sdk/android/a/c/b;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/h;->Cn()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;->Cp()Lio/fabric/sdk/android/a/c/b;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/h;->Cn()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;->Cp()Lio/fabric/sdk/android/a/c/b;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/h;->Cn()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;->Cp()Lio/fabric/sdk/android/a/c/b;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/h;->Cn()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;->Cp()Lio/fabric/sdk/android/a/c/b;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/h;->Cn()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;->Cp()Lio/fabric/sdk/android/a/c/b;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/h;->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/j.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/c/j.smali
index 4a5453f975..a34720a2ca 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 bdS:Ljava/util/List;
+.field private final bdN:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -32,9 +32,9 @@
     .end annotation
 .end field
 
-.field private final bdT:Ljava/util/concurrent/atomic/AtomicBoolean;
+.field private final bdO:Ljava/util/concurrent/atomic/AtomicBoolean;
 
-.field private final bdU:Ljava/util/concurrent/atomic/AtomicReference;
+.field private final bdP: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;->bdS:Ljava/util/List;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/c/j;->bdN: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;->bdT:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/c/j;->bdO: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;->bdU:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/c/j;->bdP:Ljava/util/concurrent/atomic/AtomicReference;
 
     return-void
 .end method
@@ -111,7 +111,7 @@
 
 
 # virtual methods
-.method public final declared-synchronized Ck()Ljava/util/Collection;
+.method public final declared-synchronized Ci()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;->bdS:Ljava/util/List;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/c/j;->bdN: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 Cl()Z
+.method public final Cj()Z
     .locals 2
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/j;->Ck()Ljava/util/Collection;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/j;->Ci()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;->bdT:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/c/j;->bdO: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;->bdS:Ljava/util/List;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/c/j;->bdN: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;->bdK:I
+    sget v0, Lio/fabric/sdk/android/a/c/e;->bdF: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;->bdT:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/c/j;->bdO: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;->bdU:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/c/j;->bdP: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 433b4ed66e..083a726605 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 bdV:I
+.field private final bdQ:I
 
 
 # direct methods
@@ -29,7 +29,7 @@
 
     const/16 v0, 0xa
 
-    iput v0, p0, Lio/fabric/sdk/android/a/c/k$a;->bdV:I
+    iput v0, p0, Lio/fabric/sdk/android/a/c/k$a;->bdQ: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;->bdV:I
+    iget p1, p0, Lio/fabric/sdk/android/a/c/k$a;->bdQ: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 afa0c025ed..b20a4928c9 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 Cq()Lio/fabric/sdk/android/a/c/k;
+.method public static Co()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;->Co()V
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/c/c;->Cm()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 b59f02b9e6..cfc04fff04 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;->Cu()V
+    value = Lio/fabric/sdk/android/a/d/b;->Cs()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -27,14 +27,14 @@
 
 
 # instance fields
-.field final synthetic beg:Lio/fabric/sdk/android/a/d/b;
+.field final synthetic beb: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;->beg:Lio/fabric/sdk/android/a/d/b;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/d/b$1;->beb: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 dfeed20d99..3e358d4bf7 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 ue:Ljava/io/File;
+.field final uf: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;->ue:Ljava/io/File;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/d/b$a;->uf: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 9c8efdd59d..d7ba81fa9c 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 bea:Lio/fabric/sdk/android/a/d/a;
+.field protected final bdV: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 beb:Lio/fabric/sdk/android/a/b/k;
+.field protected final bdW:Lio/fabric/sdk/android/a/b/k;
 
-.field protected final bec:Lio/fabric/sdk/android/a/d/c;
+.field protected final bdX:Lio/fabric/sdk/android/a/d/c;
 
-.field private final bed:I
+.field private final bdY:I
 
-.field protected volatile bee:J
+.field protected volatile bdZ:J
 
-.field protected final bef:Ljava/util/List;
+.field protected final bea: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;->bef:Ljava/util/List;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/d/b;->bea: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;->bea:Lio/fabric/sdk/android/a/d/a;
+    iput-object p2, p0, Lio/fabric/sdk/android/a/d/b;->bdV:Lio/fabric/sdk/android/a/d/a;
 
-    iput-object p4, p0, Lio/fabric/sdk/android/a/d/b;->bec:Lio/fabric/sdk/android/a/d/c;
+    iput-object p4, p0, Lio/fabric/sdk/android/a/d/b;->bdX:Lio/fabric/sdk/android/a/d/c;
 
-    iput-object p3, p0, Lio/fabric/sdk/android/a/d/b;->beb:Lio/fabric/sdk/android/a/b/k;
+    iput-object p3, p0, Lio/fabric/sdk/android/a/d/b;->bdW: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;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/d/b;->bdW:Lio/fabric/sdk/android/a/b/k;
 
-    invoke-interface {p1}, Lio/fabric/sdk/android/a/b/k;->BZ()J
+    invoke-interface {p1}, Lio/fabric/sdk/android/a/b/k;->BX()J
 
     move-result-wide p1
 
-    iput-wide p1, p0, Lio/fabric/sdk/android/a/d/b;->bee:J
+    iput-wide p1, p0, Lio/fabric/sdk/android/a/d/b;->bdZ:J
 
     const/16 p1, 0x64
 
-    iput p1, p0, Lio/fabric/sdk/android/a/d/b;->bed:I
+    iput p1, p0, Lio/fabric/sdk/android/a/d/b;->bdY:I
 
     return-void
 .end method
 
-.method private Cr()V
+.method private Cp()V
     .locals 3
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/d/b;->bef:Ljava/util/List;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/d/b;->bea:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->iterator()Ljava/util/Iterator;
 
@@ -192,7 +192,7 @@
 
 
 # virtual methods
-.method public final Cs()Ljava/util/List;
+.method public final Cq()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;->bec:Lio/fabric/sdk/android/a/d/c;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/d/b;->bdX:Lio/fabric/sdk/android/a/d/c;
 
-    invoke-interface {v0}, Lio/fabric/sdk/android/a/d/c;->Cx()Ljava/util/List;
+    invoke-interface {v0}, Lio/fabric/sdk/android/a/d/c;->Cv()Ljava/util/List;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final Ct()V
+.method public final Cr()V
     .locals 2
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/d/b;->bec:Lio/fabric/sdk/android/a/d/c;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/d/b;->bdX:Lio/fabric/sdk/android/a/d/c;
 
-    invoke-interface {v0}, Lio/fabric/sdk/android/a/d/c;->Cy()Ljava/util/List;
+    invoke-interface {v0}, Lio/fabric/sdk/android/a/d/c;->Cw()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;->bec:Lio/fabric/sdk/android/a/d/c;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/d/b;->bdX:Lio/fabric/sdk/android/a/d/c;
 
-    invoke-interface {v0}, Lio/fabric/sdk/android/a/d/c;->Cz()V
+    invoke-interface {v0}, Lio/fabric/sdk/android/a/d/c;->Cx()V
 
     return-void
 .end method
 
-.method public final Cu()V
+.method public final Cs()V
     .locals 8
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/d/b;->bec:Lio/fabric/sdk/android/a/d/c;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/d/b;->bdX:Lio/fabric/sdk/android/a/d/c;
 
-    invoke-interface {v0}, Lio/fabric/sdk/android/a/d/c;->Cy()Ljava/util/List;
+    invoke-interface {v0}, Lio/fabric/sdk/android/a/d/c;->Cw()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;->ue:Ljava/io/File;
+    iget-object v3, v3, Lio/fabric/sdk/android/a/d/b$a;->uf: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;->bec:Lio/fabric/sdk/android/a/d/c;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/d/b;->bdX: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;->bec:Lio/fabric/sdk/android/a/d/c;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/d/b;->bdX: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;->bef:Ljava/util/List;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/d/b;->bea: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;->bea:Lio/fabric/sdk/android/a/d/a;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/d/b;->bdV: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;->bec:Lio/fabric/sdk/android/a/d/c;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/d/b;->bdX: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;->bec:Lio/fabric/sdk/android/a/d/c;
+    iget-object v4, p0, Lio/fabric/sdk/android/a/d/b;->bdX:Lio/fabric/sdk/android/a/d/c;
 
-    invoke-interface {v4}, Lio/fabric/sdk/android/a/d/c;->Cv()I
+    invoke-interface {v4}, Lio/fabric/sdk/android/a/d/c;->Ct()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;->bec:Lio/fabric/sdk/android/a/d/c;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/d/b;->bdX: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;->bec:Lio/fabric/sdk/android/a/d/c;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/d/b;->bdX:Lio/fabric/sdk/android/a/d/c;
 
-    invoke-interface {v0}, Lio/fabric/sdk/android/a/d/c;->Cw()Z
+    invoke-interface {v0}, Lio/fabric/sdk/android/a/d/c;->Cu()Z
 
     move-result v0
 
@@ -532,7 +532,7 @@
 
     move-result-object v0
 
-    iget-object v3, p0, Lio/fabric/sdk/android/a/d/b;->bec:Lio/fabric/sdk/android/a/d/c;
+    iget-object v3, p0, Lio/fabric/sdk/android/a/d/b;->bdX: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;->beb:Lio/fabric/sdk/android/a/b/k;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/d/b;->bdW:Lio/fabric/sdk/android/a/b/k;
 
-    invoke-interface {v0}, Lio/fabric/sdk/android/a/b/k;->BZ()J
+    invoke-interface {v0}, Lio/fabric/sdk/android/a/b/k;->BX()J
 
     move-result-wide v2
 
-    iput-wide v2, p0, Lio/fabric/sdk/android/a/d/b;->bee:J
+    iput-wide v2, p0, Lio/fabric/sdk/android/a/d/b;->bdZ:J
 
     goto :goto_0
 
@@ -566,7 +566,7 @@
     const/4 v1, 0x0
 
     :goto_0
-    invoke-direct {p0}, Lio/fabric/sdk/android/a/d/b;->Cr()V
+    invoke-direct {p0}, Lio/fabric/sdk/android/a/d/b;->Cp()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;->bed:I
+    iget v0, p0, Lio/fabric/sdk/android/a/d/b;->bdY: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 b653223e9c..2d5f62e52c 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 Cv()I
+.method public abstract Ct()I
 .end method
 
-.method public abstract Cw()Z
+.method public abstract Cu()Z
 .end method
 
-.method public abstract Cx()Ljava/util/List;
+.method public abstract Cv()Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
@@ -21,7 +21,7 @@
     .end annotation
 .end method
 
-.method public abstract Cy()Ljava/util/List;
+.method public abstract Cw()Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
@@ -32,7 +32,7 @@
     .end annotation
 .end method
 
-.method public abstract Cz()V
+.method public abstract Cx()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 4519ab9ed6..893624fad4 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 beh:Ljava/io/File;
+.field private final bec:Ljava/io/File;
 
-.field private final bei:Ljava/lang/String;
+.field private final bed:Ljava/lang/String;
 
-.field private bej:Lio/fabric/sdk/android/a/b/u;
+.field private bee:Lio/fabric/sdk/android/a/b/u;
 
-.field private bek:Ljava/io/File;
+.field private bef:Ljava/io/File;
 
 .field private final context:Landroid/content/Context;
 
-.field private final tJ:Ljava/io/File;
+.field private final tK: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;->beh:Ljava/io/File;
+    iput-object p2, p0, Lio/fabric/sdk/android/a/d/h;->bec:Ljava/io/File;
 
-    iput-object p4, p0, Lio/fabric/sdk/android/a/d/h;->bei:Ljava/lang/String;
+    iput-object p4, p0, Lio/fabric/sdk/android/a/d/h;->bed:Ljava/lang/String;
 
     new-instance p1, Ljava/io/File;
 
-    iget-object p2, p0, Lio/fabric/sdk/android/a/d/h;->beh:Ljava/io/File;
+    iget-object p2, p0, Lio/fabric/sdk/android/a/d/h;->bec: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;->tJ:Ljava/io/File;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/d/h;->tK:Ljava/io/File;
 
     new-instance p1, Lio/fabric/sdk/android/a/b/u;
 
-    iget-object p2, p0, Lio/fabric/sdk/android/a/d/h;->tJ:Ljava/io/File;
+    iget-object p2, p0, Lio/fabric/sdk/android/a/d/h;->tK: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;->bej:Lio/fabric/sdk/android/a/b/u;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/d/h;->bee:Lio/fabric/sdk/android/a/b/u;
 
     new-instance p1, Ljava/io/File;
 
-    iget-object p2, p0, Lio/fabric/sdk/android/a/d/h;->beh:Ljava/io/File;
+    iget-object p2, p0, Lio/fabric/sdk/android/a/d/h;->bec:Ljava/io/File;
 
-    iget-object p3, p0, Lio/fabric/sdk/android/a/d/h;->bei:Ljava/lang/String;
+    iget-object p3, p0, Lio/fabric/sdk/android/a/d/h;->bed: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;->bek:Ljava/io/File;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/d/h;->bef:Ljava/io/File;
 
-    iget-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;->bef: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;->bek:Ljava/io/File;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/d/h;->bef:Ljava/io/File;
 
     invoke-virtual {p1}, Ljava/io/File;->mkdirs()Z
 
@@ -96,22 +96,22 @@
     return-object v0
 .end method
 
-.method public final Cv()I
+.method public final Ct()I
     .locals 1
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/d/h;->bej:Lio/fabric/sdk/android/a/b/u;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/d/h;->bee:Lio/fabric/sdk/android/a/b/u;
 
-    invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/u;->Ce()I
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/u;->Cc()I
 
     move-result v0
 
     return v0
 .end method
 
-.method public final Cw()Z
+.method public final Cu()Z
     .locals 1
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/d/h;->bej:Lio/fabric/sdk/android/a/b/u;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/d/h;->bee: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 Cx()Ljava/util/List;
+.method public final Cv()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;->bek:Ljava/io/File;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/d/h;->bef: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 Cy()Ljava/util/List;
+.method public final Cw()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;->bek:Ljava/io/File;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/d/h;->bef: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 Cz()V
+.method public final Cx()V
     .locals 1
 
     :try_start_0
-    iget-object v0, p0, Lio/fabric/sdk/android/a/d/h;->bej:Lio/fabric/sdk/android/a/b/u;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/d/h;->bee: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;->tJ:Ljava/io/File;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/d/h;->tK: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;->bej:Lio/fabric/sdk/android/a/b/u;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/d/h;->bee:Lio/fabric/sdk/android/a/b/u;
 
-    invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/u;->Ce()I
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/u;->Cc()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;->bej:Lio/fabric/sdk/android/a/b/u;
+    iget-object v2, p0, Lio/fabric/sdk/android/a/d/h;->bee: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;->tJ:Ljava/io/File;
+    iget-object v2, p0, Lio/fabric/sdk/android/a/d/h;->tK:Ljava/io/File;
 
     new-instance v3, Ljava/io/File;
 
-    iget-object v4, p0, Lio/fabric/sdk/android/a/d/h;->bek:Ljava/io/File;
+    iget-object v4, p0, Lio/fabric/sdk/android/a/d/h;->bef: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;->tJ:Ljava/io/File;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/d/h;->tK: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;->bej:Lio/fabric/sdk/android/a/b/u;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/d/h;->bee: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;->bej:Lio/fabric/sdk/android/a/b/u;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/d/h;->bee: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 4ad8686069..78f37fdf53 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 bel:Lio/fabric/sdk/android/a/d/e;
+.field private final beg: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;->bel:Lio/fabric/sdk/android/a/d/e;
+    iput-object p2, p0, Lio/fabric/sdk/android/a/d/i;->beg: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;->bel:Lio/fabric/sdk/android/a/d/e;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/d/i;->beg: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;->bel:Lio/fabric/sdk/android/a/d/e;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/d/i;->beg: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 3cfe465e74..74bf29478b 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 beo:[I
+.field static final synthetic bej:[I
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 4
 
-    invoke-static {}, Lio/fabric/sdk/android/a/e/c;->CD()[I
+    invoke-static {}, Lio/fabric/sdk/android/a/e/c;->CB()[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;->beo:[I
+    sput-object v0, Lio/fabric/sdk/android/a/e/b$1;->bej:[I
 
     const/4 v0, 0x1
 
     :try_start_0
-    sget-object v1, Lio/fabric/sdk/android/a/e/b$1;->beo:[I
+    sget-object v1, Lio/fabric/sdk/android/a/e/b$1;->bej:[I
 
-    sget v2, Lio/fabric/sdk/android/a/e/c;->bep:I
+    sget v2, Lio/fabric/sdk/android/a/e/c;->bek: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;->beo:[I
+    sget-object v1, Lio/fabric/sdk/android/a/e/b$1;->bej:[I
 
-    sget v2, Lio/fabric/sdk/android/a/e/c;->beq:I
+    sget v2, Lio/fabric/sdk/android/a/e/c;->bel: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;->beo:[I
+    sget-object v1, Lio/fabric/sdk/android/a/e/b$1;->bej:[I
 
-    sget v2, Lio/fabric/sdk/android/a/e/c;->ber:I
+    sget v2, Lio/fabric/sdk/android/a/e/c;->bem: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;->beo:[I
+    sget-object v1, Lio/fabric/sdk/android/a/e/b$1;->bej:[I
 
-    sget v2, Lio/fabric/sdk/android/a/e/c;->bes:I
+    sget v2, Lio/fabric/sdk/android/a/e/c;->ben: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 5287cb308c..fca61cbf92 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 bbn:Lio/fabric/sdk/android/l;
+.field private final bbj:Lio/fabric/sdk/android/l;
 
-.field private bem:Lio/fabric/sdk/android/a/e/f;
+.field private beh:Lio/fabric/sdk/android/a/e/f;
 
-.field private ben:Z
+.field private bei:Z
 
 .field private sslSocketFactory:Ljavax/net/ssl/SSLSocketFactory;
 
@@ -36,77 +36,12 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lio/fabric/sdk/android/a/e/b;->bbn:Lio/fabric/sdk/android/l;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/e/b;->bbj:Lio/fabric/sdk/android/l;
 
     return-void
 .end method
 
-.method private declared-synchronized CA()V
-    .locals 1
-
-    monitor-enter p0
-
-    const/4 v0, 0x0
-
-    :try_start_0
-    iput-boolean v0, p0, Lio/fabric/sdk/android/a/e/b;->ben:Z
-
-    const/4 v0, 0x0
-
-    iput-object v0, p0, Lio/fabric/sdk/android/a/e/b;->sslSocketFactory:Ljavax/net/ssl/SSLSocketFactory;
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    monitor-exit p0
-
-    return-void
-
-    :catchall_0
-    move-exception v0
-
-    monitor-exit p0
-
-    throw v0
-.end method
-
-.method private declared-synchronized CB()Ljavax/net/ssl/SSLSocketFactory;
-    .locals 1
-
-    monitor-enter p0
-
-    :try_start_0
-    iget-object v0, p0, Lio/fabric/sdk/android/a/e/b;->sslSocketFactory:Ljavax/net/ssl/SSLSocketFactory;
-
-    if-nez v0, :cond_0
-
-    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;->CC()Ljavax/net/ssl/SSLSocketFactory;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lio/fabric/sdk/android/a/e/b;->sslSocketFactory:Ljavax/net/ssl/SSLSocketFactory;
-
-    :cond_0
-    iget-object v0, p0, Lio/fabric/sdk/android/a/e/b;->sslSocketFactory:Ljavax/net/ssl/SSLSocketFactory;
-    :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 CC()Ljavax/net/ssl/SSLSocketFactory;
+.method private declared-synchronized CA()Ljavax/net/ssl/SSLSocketFactory;
     .locals 7
 
     monitor-enter p0
@@ -114,14 +49,14 @@
     const/4 v0, 0x1
 
     :try_start_0
-    iput-boolean v0, p0, Lio/fabric/sdk/android/a/e/b;->ben:Z
+    iput-boolean v0, p0, Lio/fabric/sdk/android/a/e/b;->bei: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;->bem:Lio/fabric/sdk/android/a/e/f;
+    iget-object v2, p0, Lio/fabric/sdk/android/a/e/b;->beh:Lio/fabric/sdk/android/a/e/f;
 
     const-string v3, "TLS"
 
@@ -157,7 +92,7 @@
 
     move-result-object v0
 
-    iget-object v2, p0, Lio/fabric/sdk/android/a/e/b;->bbn:Lio/fabric/sdk/android/l;
+    iget-object v2, p0, Lio/fabric/sdk/android/a/e/b;->bbj:Lio/fabric/sdk/android/l;
 
     const-string v3, "Fabric"
 
@@ -176,7 +111,7 @@
     move-exception v0
 
     :try_start_2
-    iget-object v2, p0, Lio/fabric/sdk/android/a/e/b;->bbn:Lio/fabric/sdk/android/l;
+    iget-object v2, p0, Lio/fabric/sdk/android/a/e/b;->bbj:Lio/fabric/sdk/android/l;
 
     const-string v3, "Fabric"
 
@@ -198,6 +133,71 @@
     throw v0
 .end method
 
+.method private declared-synchronized Cy()V
+    .locals 1
+
+    monitor-enter p0
+
+    const/4 v0, 0x0
+
+    :try_start_0
+    iput-boolean v0, p0, Lio/fabric/sdk/android/a/e/b;->bei:Z
+
+    const/4 v0, 0x0
+
+    iput-object v0, p0, Lio/fabric/sdk/android/a/e/b;->sslSocketFactory:Ljavax/net/ssl/SSLSocketFactory;
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    monitor-exit p0
+
+    return-void
+
+    :catchall_0
+    move-exception v0
+
+    monitor-exit p0
+
+    throw v0
+.end method
+
+.method private declared-synchronized Cz()Ljavax/net/ssl/SSLSocketFactory;
+    .locals 1
+
+    monitor-enter p0
+
+    :try_start_0
+    iget-object v0, p0, Lio/fabric/sdk/android/a/e/b;->sslSocketFactory:Ljavax/net/ssl/SSLSocketFactory;
+
+    if-nez v0, :cond_0
+
+    iget-boolean v0, p0, Lio/fabric/sdk/android/a/e/b;->bei:Z
+
+    if-nez v0, :cond_0
+
+    invoke-direct {p0}, Lio/fabric/sdk/android/a/e/b;->CA()Ljavax/net/ssl/SSLSocketFactory;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lio/fabric/sdk/android/a/e/b;->sslSocketFactory:Ljavax/net/ssl/SSLSocketFactory;
+
+    :cond_0
+    iget-object v0, p0, Lio/fabric/sdk/android/a/e/b;->sslSocketFactory:Ljavax/net/ssl/SSLSocketFactory;
+    :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
+
 
 # virtual methods
 .method public final a(ILjava/lang/String;Ljava/util/Map;)Lio/fabric/sdk/android/a/e/d;
@@ -214,7 +214,7 @@
         }
     .end annotation
 
-    sget-object v0, Lio/fabric/sdk/android/a/e/b$1;->beo:[I
+    sget-object v0, Lio/fabric/sdk/android/a/e/b$1;->bej:[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;->bem:Lio/fabric/sdk/android/a/e/f;
+    iget-object p2, p0, Lio/fabric/sdk/android/a/e/b;->beh:Lio/fabric/sdk/android/a/e/f;
 
     if-eqz p2, :cond_5
 
-    invoke-direct {p0}, Lio/fabric/sdk/android/a/e/b;->CB()Ljavax/net/ssl/SSLSocketFactory;
+    invoke-direct {p0}, Lio/fabric/sdk/android/a/e/b;->Cz()Ljavax/net/ssl/SSLSocketFactory;
 
     move-result-object p2
 
     if-eqz p2, :cond_5
 
-    invoke-virtual {p1}, Lio/fabric/sdk/android/a/e/d;->CF()Ljava/net/HttpURLConnection;
+    invoke-virtual {p1}, Lio/fabric/sdk/android/a/e/d;->CD()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;->bem:Lio/fabric/sdk/android/a/e/f;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/e/b;->beh:Lio/fabric/sdk/android/a/e/f;
 
     if-eq v0, p1, :cond_0
 
-    iput-object p1, p0, Lio/fabric/sdk/android/a/e/b;->bem:Lio/fabric/sdk/android/a/e/f;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/e/b;->beh:Lio/fabric/sdk/android/a/e/f;
 
-    invoke-direct {p0}, Lio/fabric/sdk/android/a/e/b;->CA()V
+    invoke-direct {p0}, Lio/fabric/sdk/android/a/e/b;->Cy()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 9d3e431e21..540062a524 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 bep:I = 0x1
+.field public static final bek:I = 0x1
 
-.field public static final beq:I = 0x2
+.field public static final bel:I = 0x2
 
-.field public static final ber:I = 0x3
+.field public static final bem:I = 0x3
 
-.field public static final bes:I = 0x4
+.field public static final ben:I = 0x4
 
-.field private static final synthetic bet:[I
+.field private static final synthetic beo:[I
 
 
 # direct methods
@@ -33,39 +33,39 @@
 
     new-array v0, v0, [I
 
-    sget v1, Lio/fabric/sdk/android/a/e/c;->bep:I
+    sget v1, Lio/fabric/sdk/android/a/e/c;->bek:I
 
     const/4 v2, 0x0
 
     aput v1, v0, v2
 
-    sget v1, Lio/fabric/sdk/android/a/e/c;->beq:I
+    sget v1, Lio/fabric/sdk/android/a/e/c;->bel:I
 
     const/4 v2, 0x1
 
     aput v1, v0, v2
 
-    sget v1, Lio/fabric/sdk/android/a/e/c;->ber:I
+    sget v1, Lio/fabric/sdk/android/a/e/c;->bem:I
 
     const/4 v2, 0x2
 
     aput v1, v0, v2
 
-    sget v1, Lio/fabric/sdk/android/a/e/c;->bes:I
+    sget v1, Lio/fabric/sdk/android/a/e/c;->ben:I
 
     const/4 v2, 0x3
 
     aput v1, v0, v2
 
-    sput-object v0, Lio/fabric/sdk/android/a/e/c;->bet:[I
+    sput-object v0, Lio/fabric/sdk/android/a/e/c;->beo:[I
 
     return-void
 .end method
 
-.method public static CD()[I
+.method public static CB()[I
     .locals 1
 
-    sget-object v0, Lio/fabric/sdk/android/a/e/c;->bet:[I
+    sget-object v0, Lio/fabric/sdk/android/a/e/c;->beo:[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 a4f1a0ebf2..f8aa505c51 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 beF:Ljava/io/InputStream;
+.field final synthetic beA:Ljava/io/InputStream;
 
-.field final synthetic beG:Ljava/io/OutputStream;
+.field final synthetic beB:Ljava/io/OutputStream;
 
-.field final synthetic beH:Lio/fabric/sdk/android/a/e/d;
+.field final synthetic beC: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;->beH:Lio/fabric/sdk/android/a/e/d;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/e/d$1;->beC:Lio/fabric/sdk/android/a/e/d;
 
-    iput-object p4, p0, Lio/fabric/sdk/android/a/e/d$1;->beF:Ljava/io/InputStream;
+    iput-object p4, p0, Lio/fabric/sdk/android/a/e/d$1;->beA:Ljava/io/InputStream;
 
-    iput-object p5, p0, Lio/fabric/sdk/android/a/e/d$1;->beG:Ljava/io/OutputStream;
+    iput-object p5, p0, Lio/fabric/sdk/android/a/e/d$1;->beB: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;->beH:Lio/fabric/sdk/android/a/e/d;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d$1;->beC: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;->beF:Ljava/io/InputStream;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/e/d$1;->beA: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;->beG:Ljava/io/OutputStream;
+    iget-object v2, p0, Lio/fabric/sdk/android/a/e/d$1;->beB: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;->beH:Lio/fabric/sdk/android/a/e/d;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d$1;->beC: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 ab13352683..0eedd4fa0e 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 beB:Z
+.field private final beD:Ljava/io/Closeable;
 
-.field private final beI:Ljava/io/Closeable;
+.field private final bew:Z
 
 
 # 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;->beI:Ljava/io/Closeable;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/e/d$a;->beD:Ljava/io/Closeable;
 
-    iput-boolean p2, p0, Lio/fabric/sdk/android/a/e/d$a;->beB:Z
+    iput-boolean p2, p0, Lio/fabric/sdk/android/a/e/d$a;->bew:Z
 
     return-void
 .end method
@@ -53,7 +53,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d$a;->beI:Ljava/io/Closeable;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d$a;->beD: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;->beB:Z
+    iget-boolean v0, p0, Lio/fabric/sdk/android/a/e/d$a;->bew:Z
 
     if-eqz v0, :cond_1
 
     :try_start_0
-    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d$a;->beI:Ljava/io/Closeable;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d$a;->beD: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;->beI:Ljava/io/Closeable;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d$a;->beD: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 8ba67641fd..7760d0e6ae 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 beJ:Lio/fabric/sdk/android/a/e/d$b;
+.field public static final beE: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;->beJ:Lio/fabric/sdk/android/a/e/d$b;
+    sput-object v0, Lio/fabric/sdk/android/a/e/d$b;->beE: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 31d3a2ae29..d24d51facb 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 beK:Ljava/nio/charset/CharsetEncoder;
+.field private final beF: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;->beK:Ljava/nio/charset/CharsetEncoder;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/e/d$e;->beF: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;->beK:Ljava/nio/charset/CharsetEncoder;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d$e;->beF: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 fe04f412f9..7178f21341 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 beu:[Ljava/lang/String;
+.field private static final bep:[Ljava/lang/String;
 
-.field private static bev:Lio/fabric/sdk/android/a/e/d$b;
+.field private static beq:Lio/fabric/sdk/android/a/e/d$b;
 
 
 # instance fields
-.field private beA:Z
+.field private ber:Ljava/net/HttpURLConnection;
 
-.field private beB:Z
+.field public final bes:Ljava/net/URL;
 
-.field private beC:Z
+.field private final bet:Ljava/lang/String;
 
-.field private beD:Ljava/lang/String;
+.field private beu:Lio/fabric/sdk/android/a/e/d$e;
 
-.field private beE:I
+.field private bev:Z
 
-.field private bew:Ljava/net/HttpURLConnection;
+.field private bew:Z
 
-.field public final bex:Ljava/net/URL;
+.field private bex:Z
 
-.field private final bey:Ljava/lang/String;
+.field private bey:Ljava/lang/String;
 
-.field private bez:Lio/fabric/sdk/android/a/e/d$e;
+.field private bez:I
 
 .field private bufferSize:I
 
@@ -51,11 +51,11 @@
 
     new-array v0, v0, [Ljava/lang/String;
 
-    sput-object v0, Lio/fabric/sdk/android/a/e/d;->beu:[Ljava/lang/String;
+    sput-object v0, Lio/fabric/sdk/android/a/e/d;->bep:[Ljava/lang/String;
 
-    sget-object v0, Lio/fabric/sdk/android/a/e/d$b;->beJ:Lio/fabric/sdk/android/a/e/d$b;
+    sget-object v0, Lio/fabric/sdk/android/a/e/d$b;->beE: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;
+    sput-object v0, Lio/fabric/sdk/android/a/e/d;->beq: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;->bew:Ljava/net/HttpURLConnection;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/e/d;->ber:Ljava/net/HttpURLConnection;
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lio/fabric/sdk/android/a/e/d;->beB:Z
+    iput-boolean v0, p0, Lio/fabric/sdk/android/a/e/d;->bew:Z
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lio/fabric/sdk/android/a/e/d;->beC:Z
+    iput-boolean v0, p0, Lio/fabric/sdk/android/a/e/d;->bex: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;->bex:Ljava/net/URL;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/e/d;->bes: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;->bey:Ljava/lang/String;
+    iput-object p2, p0, Lio/fabric/sdk/android/a/e/d;->bet:Ljava/lang/String;
 
     return-void
 
@@ -113,17 +113,17 @@
     throw p2
 .end method
 
-.method private CE()Ljava/net/HttpURLConnection;
+.method private CC()Ljava/net/HttpURLConnection;
     .locals 7
 
     :try_start_0
-    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d;->beD:Ljava/lang/String;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d;->bey:Ljava/lang/String;
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lio/fabric/sdk/android/a/e/d;->bev:Lio/fabric/sdk/android/a/e/d$b;
+    sget-object v0, Lio/fabric/sdk/android/a/e/d;->beq:Lio/fabric/sdk/android/a/e/d$b;
 
-    iget-object v1, p0, Lio/fabric/sdk/android/a/e/d;->bex:Ljava/net/URL;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/e/d;->bes: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;->beD:Ljava/lang/String;
+    iget-object v5, p0, Lio/fabric/sdk/android/a/e/d;->bey:Ljava/lang/String;
 
-    iget v6, p0, Lio/fabric/sdk/android/a/e/d;->beE:I
+    iget v6, p0, Lio/fabric/sdk/android/a/e/d;->bez: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;->bev:Lio/fabric/sdk/android/a/e/d$b;
+    sget-object v0, Lio/fabric/sdk/android/a/e/d;->beq:Lio/fabric/sdk/android/a/e/d$b;
 
-    iget-object v1, p0, Lio/fabric/sdk/android/a/e/d;->bex:Ljava/net/URL;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/e/d;->bes: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;->bey:Ljava/lang/String;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/e/d;->bet: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 CI()Ljava/io/InputStream;
+.method private CG()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;->CG()I
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->CE()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;->CF()Ljava/net/HttpURLConnection;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->CD()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;->CF()Ljava/net/HttpURLConnection;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->CD()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;->CF()Ljava/net/HttpURLConnection;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->CD()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;->beC:Z
+    iget-boolean v1, p0, Lio/fabric/sdk/android/a/e/d;->bex:Z
 
     if-eqz v1, :cond_3
 
@@ -290,7 +290,7 @@
     return-object v0
 .end method
 
-.method private CL()Lio/fabric/sdk/android/a/e/d;
+.method private CJ()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;->bez:Lio/fabric/sdk/android/a/e/d$e;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d;->beu: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;->beA:Z
+    iget-boolean v1, p0, Lio/fabric/sdk/android/a/e/d;->bev: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;->beB:Z
+    iget-boolean v0, p0, Lio/fabric/sdk/android/a/e/d;->bew:Z
 
     if-eqz v0, :cond_2
 
     :try_start_0
-    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d;->bez:Lio/fabric/sdk/android/a/e/d$e;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d;->beu: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;->bez:Lio/fabric/sdk/android/a/e/d$e;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d;->beu: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;->bez:Lio/fabric/sdk/android/a/e/d$e;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/e/d;->beu:Lio/fabric/sdk/android/a/e/d$e;
 
     return-object p0
 .end method
 
-.method private CM()Lio/fabric/sdk/android/a/e/d;
+.method private CK()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;->CL()Lio/fabric/sdk/android/a/e/d;
+    invoke-direct {p0}, Lio/fabric/sdk/android/a/e/d;->CJ()Lio/fabric/sdk/android/a/e/d;
 
     move-result-object v0
     :try_end_0
@@ -368,7 +368,7 @@
     throw v1
 .end method
 
-.method private CN()Lio/fabric/sdk/android/a/e/d;
+.method private CL()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;->bez:Lio/fabric/sdk/android/a/e/d$e;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d;->beu: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;->CF()Ljava/net/HttpURLConnection;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->CD()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;->CF()Ljava/net/HttpURLConnection;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->CD()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;->CF()Ljava/net/HttpURLConnection;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->CD()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;->bez:Lio/fabric/sdk/android/a/e/d$e;
+    iput-object v1, p0, Lio/fabric/sdk/android/a/e/d;->beu:Lio/fabric/sdk/android/a/e/d$e;
 
     return-object p0
 .end method
 
-.method private CO()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 = {
@@ -434,13 +434,13 @@
         }
     .end annotation
 
-    iget-boolean v0, p0, Lio/fabric/sdk/android/a/e/d;->beA:Z
+    iget-boolean v0, p0, Lio/fabric/sdk/android/a/e/d;->bev:Z
 
     if-nez v0, :cond_0
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lio/fabric/sdk/android/a/e/d;->beA:Z
+    iput-boolean v0, p0, Lio/fabric/sdk/android/a/e/d;->bev: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;->CN()Lio/fabric/sdk/android/a/e/d;
+    invoke-direct {v0}, Lio/fabric/sdk/android/a/e/d;->CL()Lio/fabric/sdk/android/a/e/d;
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d;->bez:Lio/fabric/sdk/android/a/e/d$e;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d;->beu: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;->bez:Lio/fabric/sdk/android/a/e/d$e;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d;->beu: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;->beB:Z
+    iget-boolean v3, p0, Lio/fabric/sdk/android/a/e/d;->bew:Z
 
     move-object v0, v6
 
@@ -1119,9 +1119,9 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lio/fabric/sdk/android/a/e/d;->CM()Lio/fabric/sdk/android/a/e/d;
+    invoke-direct {p0}, Lio/fabric/sdk/android/a/e/d;->CK()Lio/fabric/sdk/android/a/e/d;
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->CF()Ljava/net/HttpURLConnection;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->CD()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;->CI()Ljava/io/InputStream;
+    invoke-direct {p0}, Lio/fabric/sdk/android/a/e/d;->CG()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;->CN()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;
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d;->bez:Lio/fabric/sdk/android/a/e/d$e;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d;->beu: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 CF()Ljava/net/HttpURLConnection;
+.method public final CD()Ljava/net/HttpURLConnection;
     .locals 1
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d;->bew:Ljava/net/HttpURLConnection;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d;->ber:Ljava/net/HttpURLConnection;
 
     if-nez v0, :cond_0
 
-    invoke-direct {p0}, Lio/fabric/sdk/android/a/e/d;->CE()Ljava/net/HttpURLConnection;
+    invoke-direct {p0}, Lio/fabric/sdk/android/a/e/d;->CC()Ljava/net/HttpURLConnection;
 
     move-result-object v0
 
-    iput-object v0, p0, Lio/fabric/sdk/android/a/e/d;->bew:Ljava/net/HttpURLConnection;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/e/d;->ber:Ljava/net/HttpURLConnection;
 
     :cond_0
-    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d;->bew:Ljava/net/HttpURLConnection;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d;->ber:Ljava/net/HttpURLConnection;
 
     return-object v0
 .end method
 
-.method public final CG()I
+.method public final CE()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;->CL()Lio/fabric/sdk/android/a/e/d;
+    invoke-direct {p0}, Lio/fabric/sdk/android/a/e/d;->CJ()Lio/fabric/sdk/android/a/e/d;
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->CF()Ljava/net/HttpURLConnection;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->CD()Ljava/net/HttpURLConnection;
 
     move-result-object v0
 
@@ -1351,7 +1351,7 @@
     throw v1
 .end method
 
-.method public final CH()Ljava/lang/String;
+.method public final CF()Ljava/lang/String;
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -1378,10 +1378,10 @@
     return-object v0
 .end method
 
-.method public final CJ()Lio/fabric/sdk/android/a/e/d;
+.method public final CH()Lio/fabric/sdk/android/a/e/d;
     .locals 2
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->CF()Ljava/net/HttpURLConnection;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->CD()Ljava/net/HttpURLConnection;
 
     move-result-object v0
 
@@ -1392,10 +1392,10 @@
     return-object p0
 .end method
 
-.method public final CK()Lio/fabric/sdk/android/a/e/d;
+.method public final CI()Lio/fabric/sdk/android/a/e/d;
     .locals 2
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->CF()Ljava/net/HttpURLConnection;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->CD()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;->CO()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-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;->bez:Lio/fabric/sdk/android/a/e/d$e;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/e/d;->beu: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;->CF()Ljava/net/HttpURLConnection;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->CD()Ljava/net/HttpURLConnection;
 
     move-result-object v0
 
@@ -1569,9 +1569,9 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lio/fabric/sdk/android/a/e/d;->CM()Lio/fabric/sdk/android/a/e/d;
+    invoke-direct {p0}, Lio/fabric/sdk/android/a/e/d;->CK()Lio/fabric/sdk/android/a/e/d;
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->CF()Ljava/net/HttpURLConnection;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->CD()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;->CO()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;
 
     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;->bez:Lio/fabric/sdk/android/a/e/d$e;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/e/d;->beu: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;->CF()Ljava/net/HttpURLConnection;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->CD()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;->CF()Ljava/net/HttpURLConnection;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->CD()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 8ae8202cc4..48827b8bb9 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 beL:[Ljava/security/cert/X509Certificate;
+.field private static final beG:[Ljava/security/cert/X509Certificate;
 
 
 # instance fields
-.field private final beM:[Ljavax/net/ssl/TrustManager;
+.field private final beH:[Ljavax/net/ssl/TrustManager;
 
-.field private final beN:Lio/fabric/sdk/android/a/e/h;
+.field private final beI:Lio/fabric/sdk/android/a/e/h;
 
-.field private final beO:J
+.field private final beJ:J
 
-.field private final beP:Ljava/util/List;
+.field private final beK:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -26,7 +26,7 @@
     .end annotation
 .end field
 
-.field private final beQ:Ljava/util/Set;
+.field private final beL: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;->beL:[Ljava/security/cert/X509Certificate;
+    sput-object v0, Lio/fabric/sdk/android/a/e/g;->beG:[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;->beP:Ljava/util/List;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/e/g;->beK: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;->beQ:Ljava/util/Set;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/e/g;->beL: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;->beM:[Ljavax/net/ssl/TrustManager;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/e/g;->beH:[Ljavax/net/ssl/TrustManager;
 
-    iput-object p1, p0, Lio/fabric/sdk/android/a/e/g;->beN:Lio/fabric/sdk/android/a/e/h;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/e/g;->beI:Lio/fabric/sdk/android/a/e/h;
 
     const-wide/16 v0, -0x1
 
-    iput-wide v0, p0, Lio/fabric/sdk/android/a/e/g;->beO:J
+    iput-wide v0, p0, Lio/fabric/sdk/android/a/e/g;->beJ: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;->beP:Ljava/util/List;
+    iget-object v2, p0, Lio/fabric/sdk/android/a/e/g;->beK: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;->beP:Ljava/util/List;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/e/g;->beK: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;->beR:Ljava/security/KeyStore;
+    iget-object p0, p0, Lio/fabric/sdk/android/a/e/h;->beM: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;->beQ:Ljava/util/Set;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/e/g;->beL: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;->beM:[Ljavax/net/ssl/TrustManager;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/e/g;->beH:[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;->beO:J
+    iget-wide v2, p0, Lio/fabric/sdk/android/a/e/g;->beJ: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;->beO:J
+    iget-wide v4, p0, Lio/fabric/sdk/android/a/e/g;->beJ:J
 
     sub-long/2addr v2, v4
 
@@ -371,7 +371,7 @@
 
     if-lez p2, :cond_2
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->beO:J
+    iget-wide v4, p0, Lio/fabric/sdk/android/a/e/g;->beJ: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;->beN:Lio/fabric/sdk/android/a/e/h;
+    iget-object p2, p0, Lio/fabric/sdk/android/a/e/g;->beI: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;->beQ:Ljava/util/Set;
+    iget-object p2, p0, Lio/fabric/sdk/android/a/e/g;->beL: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;->beL:[Ljava/security/cert/X509Certificate;
+    sget-object v0, Lio/fabric/sdk/android/a/e/g;->beG:[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 ea9241e83c..9606ecefa4 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 beR:Ljava/security/KeyStore;
+.field final beM:Ljava/security/KeyStore;
 
-.field private final beS:Ljava/util/HashMap;
+.field private final beN: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;->beS:Ljava/util/HashMap;
+    iput-object p2, p0, Lio/fabric/sdk/android/a/e/h;->beN:Ljava/util/HashMap;
 
-    iput-object p1, p0, Lio/fabric/sdk/android/a/e/h;->beR:Ljava/security/KeyStore;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/e/h;->beM: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;->beS:Ljava/util/HashMap;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/e/h;->beN: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;->beS:Ljava/util/HashMap;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/e/h;->beN: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 7ca3177859..705f4b8550 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 beT:Ljava/lang/String;
+.field private final beO:Ljava/lang/String;
 
-.field private final beU:Ljava/lang/String;
+.field private final beP: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;->beT:Ljava/lang/String;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/f/b;->beO: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;->beU:Ljava/lang/String;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/f/b;->beP:Ljava/lang/String;
 
     return-void
 
@@ -96,7 +96,7 @@
     goto :goto_0
 
     :cond_0
-    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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 87b02f8286..096de253fd 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 CP()Landroid/content/SharedPreferences;
+.method public abstract CN()Landroid/content/SharedPreferences;
 .end method
 
-.method public abstract CQ()Landroid/content/SharedPreferences$Editor;
+.method public abstract CO()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 ca2f10c8ad..c765f678f3 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 beV:Ljava/lang/String;
+.field private final beQ: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;->beV:Ljava/lang/String;
+    iput-object p2, p0, Lio/fabric/sdk/android/a/f/d;->beQ: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;->beV:Ljava/lang/String;
+    iget-object p2, p0, Lio/fabric/sdk/android/a/f/d;->beQ:Ljava/lang/String;
 
     const/4 v0, 0x0
 
@@ -72,7 +72,7 @@
 
 
 # virtual methods
-.method public final CP()Landroid/content/SharedPreferences;
+.method public final CN()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 CQ()Landroid/content/SharedPreferences$Editor;
+.method public final CO()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 cb675f7609..60943f36af 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;->bfe:Ljava/lang/String;
+    iget-object v1, p2, Lio/fabric/sdk/android/a/g/d;->beZ: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;->bff:Ljava/lang/String;
+    iget-object v1, p2, Lio/fabric/sdk/android/a/g/d;->bfa: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;->bfg:Ljava/lang/String;
+    iget-object v1, p2, Lio/fabric/sdk/android/a/g/d;->bfb: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;->bfi:I
+    iget v1, p2, Lio/fabric/sdk/android/a/g/d;->bfd: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;->bfj:Ljava/lang/String;
+    iget-object v1, p2, Lio/fabric/sdk/android/a/g/d;->bfe: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;->bfk:Ljava/lang/String;
+    iget-object v1, p2, Lio/fabric/sdk/android/a/g/d;->bff: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;->bfh:Ljava/lang/String;
+    iget-object v1, p2, Lio/fabric/sdk/android/a/g/d;->bfc: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;->bfh:Ljava/lang/String;
+    iget-object v1, p2, Lio/fabric/sdk/android/a/g/d;->bfc: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;->bfl:Lio/fabric/sdk/android/a/g/n;
+    iget-object v1, p2, Lio/fabric/sdk/android/a/g/d;->bfg: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;->px:Lio/fabric/sdk/android/i;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/g/a;->py: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;->bfl:Lio/fabric/sdk/android/a/g/n;
+    iget-object v3, p2, Lio/fabric/sdk/android/a/g/d;->bfg:Lio/fabric/sdk/android/a/g/n;
 
-    iget v3, v3, Lio/fabric/sdk/android/a/g/n;->bfE:I
+    iget v3, v3, Lio/fabric/sdk/android/a/g/n;->bfz: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;->bfl:Lio/fabric/sdk/android/a/g/n;
+    iget-object v4, p2, Lio/fabric/sdk/android/a/g/d;->bfg:Lio/fabric/sdk/android/a/g/n;
 
-    iget-object v4, v4, Lio/fabric/sdk/android/a/g/n;->acv:Ljava/lang/String;
+    iget-object v4, v4, Lio/fabric/sdk/android/a/g/n;->acr: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;->bfl:Lio/fabric/sdk/android/a/g/n;
+    iget-object v5, p2, Lio/fabric/sdk/android/a/g/d;->bfg: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;->bfl:Lio/fabric/sdk/android/a/g/n;
+    iget-object v5, p2, Lio/fabric/sdk/android/a/g/d;->bfg: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->bfl:Lio/fabric/sdk/android/a/g/n;
+    iget-object v7, p2, Lio/fabric/sdk/android/a/g/d;->bfg:Lio/fabric/sdk/android/a/g/n;
 
-    iget v7, v7, Lio/fabric/sdk/android/a/g/n;->bfE:I
+    iget v7, v7, Lio/fabric/sdk/android/a/g/n;->bfz: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;->bfm:Ljava/util/Collection;
+    iget-object v0, p2, Lio/fabric/sdk/android/a/g/d;->bfh:Ljava/util/Collection;
 
     if-eqz v0, :cond_2
 
-    iget-object p2, p2, Lio/fabric/sdk/android/a/g/d;->bfm:Ljava/util/Collection;
+    iget-object p2, p2, Lio/fabric/sdk/android/a/g/d;->bfh: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;->ts:Ljava/lang/String;
+    iget-object v5, v0, Lio/fabric/sdk/android/k;->tt:Ljava/lang/String;
 
     const/4 v6, 0x0
 
@@ -271,7 +271,7 @@
 
     move-result-object v1
 
-    iget-object v4, v0, Lio/fabric/sdk/android/k;->aSG:Ljava/lang/String;
+    iget-object v4, v0, Lio/fabric/sdk/android/k;->aSC: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;->ts:Ljava/lang/String;
+    iget-object v4, v0, Lio/fabric/sdk/android/k;->tt: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;->bbD:Ljava/lang/String;
+    iget-object v0, v0, Lio/fabric/sdk/android/k;->bbz: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;->BQ()Lio/fabric/sdk/android/a/e/d;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/g/a;->BO()Lio/fabric/sdk/android/a/e/d;
 
     move-result-object v0
 
-    iget-object v1, p1, Lio/fabric/sdk/android/a/g/d;->qv:Ljava/lang/String;
+    iget-object v1, p1, Lio/fabric/sdk/android/a/g/d;->qw: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;->px:Lio/fabric/sdk/android/i;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/g/a;->py: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->bfl:Lio/fabric/sdk/android/a/g/n;
+    iget-object v1, p1, Lio/fabric/sdk/android/a/g/d;->bfg:Lio/fabric/sdk/android/a/g/n;
 
     if-eqz v1, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->bfl:Lio/fabric/sdk/android/a/g/n;
+    iget-object v4, p1, Lio/fabric/sdk/android/a/g/d;->bfg:Lio/fabric/sdk/android/a/g/n;
 
-    iget-object v4, v4, Lio/fabric/sdk/android/a/g/n;->acv:Ljava/lang/String;
+    iget-object v4, v4, Lio/fabric/sdk/android/a/g/n;->acr: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->bfl:Lio/fabric/sdk/android/a/g/n;
+    iget-object v4, p1, Lio/fabric/sdk/android/a/g/d;->bfg: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;->bfl:Lio/fabric/sdk/android/a/g/n;
+    iget-object p1, p1, Lio/fabric/sdk/android/a/g/d;->bfg: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;->CG()I
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/e/d;->CE()I
 
     move-result p1
 
-    invoke-virtual {v0}, Lio/fabric/sdk/android/a/e/d;->CF()Ljava/net/HttpURLConnection;
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/e/d;->CD()Ljava/net/HttpURLConnection;
 
     move-result-object v1
 
@@ -451,7 +451,7 @@
     const-string v1, "Update"
 
     :goto_0
-    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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 eec5460481..dc11bfc5f9 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 beW:Ljava/lang/String;
+.field public final beR:Ljava/lang/String;
 
-.field public final beX:I
+.field public final beS:I
 
-.field public final beY:I
+.field public final beT:I
 
-.field public final beZ:I
+.field public final beU:I
 
-.field public final bfa:I
+.field public final beV:I
 
-.field public final bfb:Z
+.field public final beW:Z
 
-.field public final bfc:Z
+.field public final beX:Z
 
-.field public final bfd:Z
+.field public final beY:Z
 
-.field public final pR:Z
+.field public final pS:Z
 
-.field public final qh:Z
+.field public final qi:Z
 
-.field public final qs:I
+.field public final qt: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;->beW:Ljava/lang/String;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/g/b;->beR:Ljava/lang/String;
 
-    iput p2, p0, Lio/fabric/sdk/android/a/g/b;->beX:I
+    iput p2, p0, Lio/fabric/sdk/android/a/g/b;->beS:I
 
-    iput p3, p0, Lio/fabric/sdk/android/a/g/b;->beY:I
+    iput p3, p0, Lio/fabric/sdk/android/a/g/b;->beT:I
 
-    iput p4, p0, Lio/fabric/sdk/android/a/g/b;->beZ:I
+    iput p4, p0, Lio/fabric/sdk/android/a/g/b;->beU:I
 
-    iput p5, p0, Lio/fabric/sdk/android/a/g/b;->bfa:I
+    iput p5, p0, Lio/fabric/sdk/android/a/g/b;->beV:I
 
-    iput-boolean p6, p0, Lio/fabric/sdk/android/a/g/b;->bfb:Z
+    iput-boolean p6, p0, Lio/fabric/sdk/android/a/g/b;->beW:Z
 
-    iput-boolean p7, p0, Lio/fabric/sdk/android/a/g/b;->qh:Z
+    iput-boolean p7, p0, Lio/fabric/sdk/android/a/g/b;->qi:Z
 
-    iput-boolean p8, p0, Lio/fabric/sdk/android/a/g/b;->bfc:Z
+    iput-boolean p8, p0, Lio/fabric/sdk/android/a/g/b;->beX:Z
 
-    iput-boolean p9, p0, Lio/fabric/sdk/android/a/g/b;->bfd:Z
+    iput-boolean p9, p0, Lio/fabric/sdk/android/a/g/b;->beY:Z
 
-    iput p10, p0, Lio/fabric/sdk/android/a/g/b;->qs:I
+    iput p10, p0, Lio/fabric/sdk/android/a/g/b;->qt:I
 
-    iput-boolean p11, p0, Lio/fabric/sdk/android/a/g/b;->pR:Z
+    iput-boolean p11, p0, Lio/fabric/sdk/android/a/g/b;->pS: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 9ae7484a56..0cd485c7f5 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 acv:Ljava/lang/String;
+.field public final acr: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;->acv:Ljava/lang/String;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/g/c;->acr: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 eeca3e6a8e..52fdde0b67 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 beZ:Ljava/lang/String;
+
+.field public final bfa:Ljava/lang/String;
+
+.field public final bfb:Ljava/lang/String;
+
+.field public final bfc:Ljava/lang/String;
+
+.field public final bfd:I
+
 .field public final bfe:Ljava/lang/String;
 
 .field public final bff:Ljava/lang/String;
 
-.field public final bfg:Ljava/lang/String;
+.field public final bfg:Lio/fabric/sdk/android/a/g/n;
 
-.field public final bfh:Ljava/lang/String;
-
-.field public final bfi:I
-
-.field public final bfj:Ljava/lang/String;
-
-.field public final bfk:Ljava/lang/String;
-
-.field public final bfl:Lio/fabric/sdk/android/a/g/n;
-
-.field public final bfm:Ljava/util/Collection;
+.field public final bfh: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 qv:Ljava/lang/String;
+.field public final qw: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;->qv:Ljava/lang/String;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/g/d;->qw:Ljava/lang/String;
 
-    iput-object p2, p0, Lio/fabric/sdk/android/a/g/d;->bfe:Ljava/lang/String;
+    iput-object p2, p0, Lio/fabric/sdk/android/a/g/d;->beZ:Ljava/lang/String;
 
-    iput-object p3, p0, Lio/fabric/sdk/android/a/g/d;->bff:Ljava/lang/String;
+    iput-object p3, p0, Lio/fabric/sdk/android/a/g/d;->bfa:Ljava/lang/String;
 
-    iput-object p4, p0, Lio/fabric/sdk/android/a/g/d;->bfg:Ljava/lang/String;
+    iput-object p4, p0, Lio/fabric/sdk/android/a/g/d;->bfb:Ljava/lang/String;
 
-    iput-object p5, p0, Lio/fabric/sdk/android/a/g/d;->bfh:Ljava/lang/String;
+    iput-object p5, p0, Lio/fabric/sdk/android/a/g/d;->bfc: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;->bfi:I
+    iput p7, p0, Lio/fabric/sdk/android/a/g/d;->bfd:I
 
-    iput-object p8, p0, Lio/fabric/sdk/android/a/g/d;->bfj:Ljava/lang/String;
+    iput-object p8, p0, Lio/fabric/sdk/android/a/g/d;->bfe:Ljava/lang/String;
 
-    iput-object p9, p0, Lio/fabric/sdk/android/a/g/d;->bfk:Ljava/lang/String;
+    iput-object p9, p0, Lio/fabric/sdk/android/a/g/d;->bff:Ljava/lang/String;
 
-    iput-object p10, p0, Lio/fabric/sdk/android/a/g/d;->bfl:Lio/fabric/sdk/android/a/g/n;
+    iput-object p10, p0, Lio/fabric/sdk/android/a/g/d;->bfg:Lio/fabric/sdk/android/a/g/n;
 
-    iput-object p11, p0, Lio/fabric/sdk/android/a/g/d;->bfm:Ljava/util/Collection;
+    iput-object p11, p0, Lio/fabric/sdk/android/a/g/d;->bfh: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 6babe6bab2..d699340d99 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 bfn:Ljava/lang/String;
+.field public final bfi:Ljava/lang/String;
 
-.field public final bfo:Ljava/lang/String;
+.field public final bfj:Ljava/lang/String;
 
-.field public final bfp:Z
+.field public final bfk:Z
 
-.field public final bfq:Lio/fabric/sdk/android/a/g/c;
+.field public final bfl:Lio/fabric/sdk/android/a/g/c;
 
 .field public final status:Ljava/lang/String;
 
-.field public final ts:Ljava/lang/String;
+.field public final tt: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;->ts:Ljava/lang/String;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/g/e;->tt: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;->bfn:Ljava/lang/String;
+    iput-object p4, p0, Lio/fabric/sdk/android/a/g/e;->bfi:Ljava/lang/String;
 
-    iput-object p5, p0, Lio/fabric/sdk/android/a/g/e;->bfo:Ljava/lang/String;
+    iput-object p5, p0, Lio/fabric/sdk/android/a/g/e;->bfj:Ljava/lang/String;
 
-    iput-boolean p6, p0, Lio/fabric/sdk/android/a/g/e;->bfp:Z
+    iput-boolean p6, p0, Lio/fabric/sdk/android/a/g/e;->bfk:Z
 
-    iput-object p7, p0, Lio/fabric/sdk/android/a/g/e;->bfq:Lio/fabric/sdk/android/a/g/c;
+    iput-object p7, p0, Lio/fabric/sdk/android/a/g/e;->bfl: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 803c0e871a..93225c2739 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 bfr:Ljava/lang/String;
+.field public final bfm:Ljava/lang/String;
 
-.field public final bft:I
+.field public final bfn: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;->bfr:Ljava/lang/String;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/g/f;->bfm:Ljava/lang/String;
 
-    iput p2, p0, Lio/fabric/sdk/android/a/g/f;->bft:I
+    iput p2, p0, Lio/fabric/sdk/android/a/g/f;->bfn: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 68b9a17ab9..2f5598862e 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 CR()Lorg/json/JSONObject;
+.method public abstract CP()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 c8a9140591..84e27732fa 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;->beq:I
+    sget v5, Lio/fabric/sdk/android/a/e/c;->bel: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 ee14c0a994..15cc8ec9be 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 px:Lio/fabric/sdk/android/i;
+.field private final py: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;->px:Lio/fabric/sdk/android/i;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/g/i;->py:Lio/fabric/sdk/android/i;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final CR()Lorg/json/JSONObject;
+.method public final CP()Lorg/json/JSONObject;
     .locals 7
 
     const-string v0, "Error while closing settings cache file."
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->px:Lio/fabric/sdk/android/i;
+    iget-object v5, p0, Lio/fabric/sdk/android/a/g/i;->py: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->px:Lio/fabric/sdk/android/i;
+    iget-object v4, p0, Lio/fabric/sdk/android/a/g/i;->py: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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 41b5b68ee1..3e3de2c542 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 beb:Lio/fabric/sdk/android/a/b/k;
+.field private final bdW:Lio/fabric/sdk/android/a/b/k;
 
-.field private final bfu:Lio/fabric/sdk/android/a/g/w;
+.field private final bfo:Lio/fabric/sdk/android/a/g/w;
 
-.field private final bfv:Lio/fabric/sdk/android/a/g/v;
+.field private final bfp:Lio/fabric/sdk/android/a/g/v;
 
-.field private final bfw:Lio/fabric/sdk/android/a/g/g;
+.field private final bfq:Lio/fabric/sdk/android/a/g/g;
 
-.field private final bfx:Lio/fabric/sdk/android/a/g/x;
+.field private final bfr:Lio/fabric/sdk/android/a/g/x;
 
-.field private final bfy:Lio/fabric/sdk/android/a/b/l;
+.field private final bft:Lio/fabric/sdk/android/a/b/l;
 
-.field private final px:Lio/fabric/sdk/android/i;
+.field private final py:Lio/fabric/sdk/android/i;
 
-.field private final tE:Lio/fabric/sdk/android/a/f/c;
+.field private final tF: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;->px:Lio/fabric/sdk/android/i;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/g/j;->py:Lio/fabric/sdk/android/i;
 
-    iput-object p2, p0, Lio/fabric/sdk/android/a/g/j;->bfu:Lio/fabric/sdk/android/a/g/w;
+    iput-object p2, p0, Lio/fabric/sdk/android/a/g/j;->bfo:Lio/fabric/sdk/android/a/g/w;
 
-    iput-object p3, p0, Lio/fabric/sdk/android/a/g/j;->beb:Lio/fabric/sdk/android/a/b/k;
+    iput-object p3, p0, Lio/fabric/sdk/android/a/g/j;->bdW:Lio/fabric/sdk/android/a/b/k;
 
-    iput-object p4, p0, Lio/fabric/sdk/android/a/g/j;->bfv:Lio/fabric/sdk/android/a/g/v;
+    iput-object p4, p0, Lio/fabric/sdk/android/a/g/j;->bfp:Lio/fabric/sdk/android/a/g/v;
 
-    iput-object p5, p0, Lio/fabric/sdk/android/a/g/j;->bfw:Lio/fabric/sdk/android/a/g/g;
+    iput-object p5, p0, Lio/fabric/sdk/android/a/g/j;->bfq:Lio/fabric/sdk/android/a/g/g;
 
-    iput-object p6, p0, Lio/fabric/sdk/android/a/g/j;->bfx:Lio/fabric/sdk/android/a/g/x;
+    iput-object p6, p0, Lio/fabric/sdk/android/a/g/j;->bfr:Lio/fabric/sdk/android/a/g/x;
 
-    iput-object p7, p0, Lio/fabric/sdk/android/a/g/j;->bfy:Lio/fabric/sdk/android/a/b/l;
+    iput-object p7, p0, Lio/fabric/sdk/android/a/g/j;->bft: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;->px:Lio/fabric/sdk/android/i;
+    iget-object p2, p0, Lio/fabric/sdk/android/a/g/j;->py: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;->tE:Lio/fabric/sdk/android/a/f/c;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/g/j;->tF:Lio/fabric/sdk/android/a/f/c;
 
     return-void
 .end method
 
-.method private CT()Ljava/lang/String;
+.method private CR()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;->px:Lio/fabric/sdk/android/i;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/g/j;->py: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;->bfW:Lio/fabric/sdk/android/a/g/r;
+    sget-object v2, Lio/fabric/sdk/android/a/g/r;->bfR: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;->bfw:Lio/fabric/sdk/android/a/g/g;
+    iget-object v2, p0, Lio/fabric/sdk/android/a/g/j;->bfq:Lio/fabric/sdk/android/a/g/g;
 
-    invoke-interface {v2}, Lio/fabric/sdk/android/a/g/g;->CR()Lorg/json/JSONObject;
+    invoke-interface {v2}, Lio/fabric/sdk/android/a/g/g;->CP()Lorg/json/JSONObject;
 
     move-result-object v2
 
     if-eqz v2, :cond_3
 
-    iget-object v3, p0, Lio/fabric/sdk/android/a/g/j;->bfv:Lio/fabric/sdk/android/a/g/v;
+    iget-object v3, p0, Lio/fabric/sdk/android/a/g/j;->bfp:Lio/fabric/sdk/android/a/g/v;
 
-    iget-object v4, p0, Lio/fabric/sdk/android/a/g/j;->beb:Lio/fabric/sdk/android/a/b/k;
+    iget-object v4, p0, Lio/fabric/sdk/android/a/g/j;->bdW: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;->beb:Lio/fabric/sdk/android/a/b/k;
+    iget-object v2, p0, Lio/fabric/sdk/android/a/g/j;->bdW:Lio/fabric/sdk/android/a/b/k;
 
-    invoke-interface {v2}, Lio/fabric/sdk/android/a/b/k;->BZ()J
+    invoke-interface {v2}, Lio/fabric/sdk/android/a/b/k;->BX()J
 
     move-result-wide v4
 
-    sget-object v2, Lio/fabric/sdk/android/a/g/r;->bfX:Lio/fabric/sdk/android/a/g/r;
+    sget-object v2, Lio/fabric/sdk/android/a/g/r;->bfS: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;->bgd:J
+    iget-wide v6, v3, Lio/fabric/sdk/android/a/g/t;->bfY:J
 
     cmp-long p1, v6, v4
 
@@ -150,7 +150,7 @@
     goto :goto_1
 
     :cond_1
-    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()Lio/fabric/sdk/android/l;
 
     move-result-object v2
 
@@ -225,7 +225,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -254,10 +254,10 @@
 
 
 # virtual methods
-.method public final CS()Lio/fabric/sdk/android/a/g/t;
+.method public final CQ()Lio/fabric/sdk/android/a/g/t;
     .locals 1
 
-    sget-object v0, Lio/fabric/sdk/android/a/g/r;->bfV:Lio/fabric/sdk/android/a/g/r;
+    sget-object v0, Lio/fabric/sdk/android/a/g/r;->bfQ: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;->bfy:Lio/fabric/sdk/android/a/b/l;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/g/j;->bft:Lio/fabric/sdk/android/a/b/l;
 
-    invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/l;->Ca()Z
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/l;->BY()Z
 
     move-result v0
 
@@ -281,7 +281,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BF()Z
+    invoke-static {}, Lio/fabric/sdk/android/c;->BD()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;->tE:Lio/fabric/sdk/android/a/f/c;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/g/j;->tF:Lio/fabric/sdk/android/a/f/c;
 
-    invoke-interface {v0}, Lio/fabric/sdk/android/a/f/c;->CP()Landroid/content/SharedPreferences;
+    invoke-interface {v0}, Lio/fabric/sdk/android/a/f/c;->CN()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;->CT()Ljava/lang/String;
+    invoke-direct {p0}, Lio/fabric/sdk/android/a/g/j;->CR()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;->bfx:Lio/fabric/sdk/android/a/g/x;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/g/j;->bfr:Lio/fabric/sdk/android/a/g/x;
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/g/j;->bfu:Lio/fabric/sdk/android/a/g/w;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/g/j;->bfo: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;->bfv:Lio/fabric/sdk/android/a/g/v;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/g/j;->bfp:Lio/fabric/sdk/android/a/g/v;
 
-    iget-object v4, p0, Lio/fabric/sdk/android/a/g/j;->beb:Lio/fabric/sdk/android/a/b/k;
+    iget-object v4, p0, Lio/fabric/sdk/android/a/g/j;->bdW: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;->bfw:Lio/fabric/sdk/android/a/g/g;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/g/j;->bfq:Lio/fabric/sdk/android/a/g/g;
 
-    iget-wide v4, v2, Lio/fabric/sdk/android/a/g/t;->bgd:J
+    iget-wide v4, v2, Lio/fabric/sdk/android/a/g/t;->bfY: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;->CT()Ljava/lang/String;
+    invoke-direct {p0}, Lio/fabric/sdk/android/a/g/j;->CR()Ljava/lang/String;
 
     move-result-object p1
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/g/j;->tE:Lio/fabric/sdk/android/a/f/c;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/g/j;->tF:Lio/fabric/sdk/android/a/f/c;
 
-    invoke-interface {v0}, Lio/fabric/sdk/android/a/f/c;->CQ()Landroid/content/SharedPreferences$Editor;
+    invoke-interface {v0}, Lio/fabric/sdk/android/a/f/c;->CO()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;->tE:Lio/fabric/sdk/android/a/f/c;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/g/j;->tF: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;->bfX:Lio/fabric/sdk/android/a/g/r;
+    sget-object p1, Lio/fabric/sdk/android/a/g/r;->bfS: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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 5da092c4c7..46ccc6d435 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;->bgg:Ljava/lang/String;
+    sget-object v4, Lio/fabric/sdk/android/a/g/u;->bgb: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;->BZ()J
+    invoke-interface/range {p1 .. p1}, Lio/fabric/sdk/android/a/b/k;->BX()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 8ad02bc7f6..1ea2d67743 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;->bep:I
+    sget v5, Lio/fabric/sdk/android/a/e/c;->bek:I
 
     move-object v0, p0
 
@@ -61,7 +61,7 @@
     :catch_0
     move-exception v0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->bfg:Ljava/lang/String;
+    iget-object v6, p1, Lio/fabric/sdk/android/a/g/w;->bfb: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;->bff:Ljava/lang/String;
+    iget-object v6, p1, Lio/fabric/sdk/android/a/g/w;->bfa: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;->bfi:I
+    iget v6, p1, Lio/fabric/sdk/android/a/g/w;->bfd: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;->bgk:Ljava/lang/String;
+    iget-object v5, p1, Lio/fabric/sdk/android/a/g/w;->bgf:Ljava/lang/String;
 
     if-eqz v5, :cond_0
 
     const-string v5, "icon_hash"
 
-    iget-object v6, p1, Lio/fabric/sdk/android/a/g/w;->bgk:Ljava/lang/String;
+    iget-object v6, p1, Lio/fabric/sdk/android/a/g/w;->bgf: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;->bgj:Ljava/lang/String;
+    iget-object v5, p1, Lio/fabric/sdk/android/a/g/w;->bge: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;->qv:Ljava/lang/String;
+    iget-object v7, p1, Lio/fabric/sdk/android/a/g/w;->qw: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;->px:Lio/fabric/sdk/android/i;
+    iget-object v7, p0, Lio/fabric/sdk/android/a/g/l;->py: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;->qX:Ljava/lang/String;
+    iget-object v7, p1, Lio/fabric/sdk/android/a/g/w;->qY: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;->bgh:Ljava/lang/String;
+    iget-object v7, p1, Lio/fabric/sdk/android/a/g/w;->bgc: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;->bgi:Ljava/lang/String;
+    iget-object v7, p1, Lio/fabric/sdk/android/a/g/w;->bgd: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;->qT:Ljava/lang/String;
+    iget-object p1, p1, Lio/fabric/sdk/android/a/g/w;->qU: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->CG()I
+    invoke-virtual {v5}, Lio/fabric/sdk/android/a/e/d;->CE()I
 
     move-result p1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->CH()Ljava/lang/String;
+    invoke-virtual {v5}, Lio/fabric/sdk/android/a/e/d;->CF()Ljava/lang/String;
 
     move-result-object p1
 
@@ -331,7 +331,7 @@
     goto :goto_2
 
     :cond_4
-    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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 8df6c677cc..8773ec16c5 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 bfA:Z
+.field public final bfu:Z
 
-.field public final bfB:Z
+.field public final bfv:Z
 
-.field public final bfC:Z
+.field public final bfw:Z
 
-.field public final bfD:Z
+.field public final bfx:Z
 
-.field public final bfz:Z
+.field public final bfy: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;->bfz:Z
+    iput-boolean p1, p0, Lio/fabric/sdk/android/a/g/m;->bfu:Z
 
-    iput-boolean p2, p0, Lio/fabric/sdk/android/a/g/m;->bfA:Z
+    iput-boolean p2, p0, Lio/fabric/sdk/android/a/g/m;->bfv:Z
 
-    iput-boolean p3, p0, Lio/fabric/sdk/android/a/g/m;->bfB:Z
+    iput-boolean p3, p0, Lio/fabric/sdk/android/a/g/m;->bfw:Z
 
-    iput-boolean p4, p0, Lio/fabric/sdk/android/a/g/m;->bfC:Z
+    iput-boolean p4, p0, Lio/fabric/sdk/android/a/g/m;->bfx:Z
 
-    iput-boolean p5, p0, Lio/fabric/sdk/android/a/g/m;->bfD:Z
+    iput-boolean p5, p0, Lio/fabric/sdk/android/a/g/m;->bfy: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 c3fdbd5b03..24a86090ac 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 acv:Ljava/lang/String;
+.field public final acr:Ljava/lang/String;
 
-.field public final bfE:I
+.field public final bfz: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;->acv:Ljava/lang/String;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/g/n;->acr:Ljava/lang/String;
 
-    iput p2, p0, Lio/fabric/sdk/android/a/g/n;->bfE:I
+    iput p2, p0, Lio/fabric/sdk/android/a/g/n;->bfz: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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 f3bc4f5d1f..37266acbdd 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 bfF:Ljava/lang/String;
+.field public final bfA:Ljava/lang/String;
 
-.field public final bfG:Z
+.field public final bfB:Z
 
-.field public final bfH:Ljava/lang/String;
+.field public final bfC:Ljava/lang/String;
 
-.field public final bfI:Z
+.field public final bfD:Z
 
-.field public final bfJ:Ljava/lang/String;
+.field public final bfE: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;->bfF:Ljava/lang/String;
+    iput-object p3, p0, Lio/fabric/sdk/android/a/g/o;->bfA:Ljava/lang/String;
 
-    iput-boolean p4, p0, Lio/fabric/sdk/android/a/g/o;->bfG:Z
+    iput-boolean p4, p0, Lio/fabric/sdk/android/a/g/o;->bfB:Z
 
-    iput-object p5, p0, Lio/fabric/sdk/android/a/g/o;->bfH:Ljava/lang/String;
+    iput-object p5, p0, Lio/fabric/sdk/android/a/g/o;->bfC:Ljava/lang/String;
 
-    iput-boolean p6, p0, Lio/fabric/sdk/android/a/g/o;->bfI:Z
+    iput-boolean p6, p0, Lio/fabric/sdk/android/a/g/o;->bfD:Z
 
-    iput-object p7, p0, Lio/fabric/sdk/android/a/g/o;->bfJ:Ljava/lang/String;
+    iput-object p7, p0, Lio/fabric/sdk/android/a/g/o;->bfE: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 dd64fcdbbe..d7845ca11d 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,20 +4,20 @@
 
 
 # instance fields
-.field public final bfK:I
+.field public final bfF:I
+
+.field public final bfG:I
+
+.field public final bfH:I
+
+.field public final bfI:I
+
+.field public final bfJ:I
+
+.field public final bfK:Z
 
 .field public final bfL:I
 
-.field public final bfM:I
-
-.field public final bfN:I
-
-.field public final bfO:I
-
-.field public final bfP:Z
-
-.field public final bfQ:I
-
 
 # direct methods
 .method public constructor <init>(IIIIIZI)V
@@ -25,19 +25,19 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput p1, p0, Lio/fabric/sdk/android/a/g/p;->bfK:I
+    iput p1, p0, Lio/fabric/sdk/android/a/g/p;->bfF:I
 
-    iput p2, p0, Lio/fabric/sdk/android/a/g/p;->bfL:I
+    iput p2, p0, Lio/fabric/sdk/android/a/g/p;->bfG:I
 
-    iput p3, p0, Lio/fabric/sdk/android/a/g/p;->bfM:I
+    iput p3, p0, Lio/fabric/sdk/android/a/g/p;->bfH:I
 
-    iput p4, p0, Lio/fabric/sdk/android/a/g/p;->bfN:I
+    iput p4, p0, Lio/fabric/sdk/android/a/g/p;->bfI:I
 
-    iput p5, p0, Lio/fabric/sdk/android/a/g/p;->bfO:I
+    iput p5, p0, Lio/fabric/sdk/android/a/g/p;->bfJ:I
 
-    iput-boolean p6, p0, Lio/fabric/sdk/android/a/g/p;->bfP:Z
+    iput-boolean p6, p0, Lio/fabric/sdk/android/a/g/p;->bfK:Z
 
-    iput p7, p0, Lio/fabric/sdk/android/a/g/p;->bfQ:I
+    iput p7, p0, Lio/fabric/sdk/android/a/g/p;->bfL: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 ea387ff088..638b8e01a8 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 bfU:Lio/fabric/sdk/android/a/g/q;
+.field private static final bfP: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;->bfU:Lio/fabric/sdk/android/a/g/q;
+    sput-object v0, Lio/fabric/sdk/android/a/g/q$a;->bfP:Lio/fabric/sdk/android/a/g/q;
 
     return-void
 .end method
 
-.method public static synthetic CX()Lio/fabric/sdk/android/a/g/q;
+.method public static synthetic CV()Lio/fabric/sdk/android/a/g/q;
     .locals 1
 
-    sget-object v0, Lio/fabric/sdk/android/a/g/q$a;->bfU:Lio/fabric/sdk/android/a/g/q;
+    sget-object v0, Lio/fabric/sdk/android/a/g/q$a;->bfP: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 cd3c268768..cad6bb8352 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 bfR:Ljava/util/concurrent/atomic/AtomicReference;
+.field private final bfM: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 bfS:Ljava/util/concurrent/CountDownLatch;
+.field private final bfN:Ljava/util/concurrent/CountDownLatch;
 
-.field private bfT:Lio/fabric/sdk/android/a/g/s;
+.field private bfO: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;->bfR:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/g/q;->bfM: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;->bfS:Ljava/util/concurrent/CountDownLatch;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/g/q;->bfN: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;->bfR:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/g/q;->bfM: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;->bfS:Ljava/util/concurrent/CountDownLatch;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/g/q;->bfN:Ljava/util/concurrent/CountDownLatch;
 
     invoke-virtual {p1}, Ljava/util/concurrent/CountDownLatch;->countDown()V
 
@@ -80,15 +80,15 @@
 
 
 # virtual methods
-.method public final CU()Lio/fabric/sdk/android/a/g/t;
+.method public final CS()Lio/fabric/sdk/android/a/g/t;
     .locals 3
 
     :try_start_0
-    iget-object v0, p0, Lio/fabric/sdk/android/a/g/q;->bfS:Ljava/util/concurrent/CountDownLatch;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/g/q;->bfN:Ljava/util/concurrent/CountDownLatch;
 
     invoke-virtual {v0}, Ljava/util/concurrent/CountDownLatch;->await()V
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/g/q;->bfR:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/g/q;->bfM: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -116,15 +116,15 @@
     return-object v0
 .end method
 
-.method public final declared-synchronized CV()Z
+.method public final declared-synchronized CT()Z
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lio/fabric/sdk/android/a/g/q;->bfT:Lio/fabric/sdk/android/a/g/s;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/g/q;->bfO:Lio/fabric/sdk/android/a/g/s;
 
-    invoke-interface {v0}, Lio/fabric/sdk/android/a/g/s;->CS()Lio/fabric/sdk/android/a/g/t;
+    invoke-interface {v0}, Lio/fabric/sdk/android/a/g/s;->CQ()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 CW()Z
+.method public final declared-synchronized CU()Z
     .locals 5
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lio/fabric/sdk/android/a/g/q;->bfT:Lio/fabric/sdk/android/a/g/s;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/g/q;->bfO:Lio/fabric/sdk/android/a/g/s;
 
-    sget-object v1, Lio/fabric/sdk/android/a/g/r;->bfW:Lio/fabric/sdk/android/a/g/r;
+    sget-object v1, Lio/fabric/sdk/android/a/g/r;->bfR: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->bfT:Lio/fabric/sdk/android/a/g/s;
+    iget-object v2, v1, Lio/fabric/sdk/android/a/g/q;->bfO: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;->bbv:Ljava/lang/String;
+    iget-object v4, v3, Lio/fabric/sdk/android/a/b/s;->bbr: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;->Cd()Ljava/lang/String;
+    invoke-virtual/range {p2 .. p2}, Lio/fabric/sdk/android/a/b/s;->Cb()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;->Cc()Ljava/lang/String;
+    invoke-static {}, Lio/fabric/sdk/android/a/b/s;->Ca()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;->Cb()Ljava/lang/String;
+    invoke-virtual/range {p2 .. p2}, Lio/fabric/sdk/android/a/b/s;->BZ()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;->bfT:Lio/fabric/sdk/android/a/g/s;
+    iput-object v11, v1, Lio/fabric/sdk/android/a/g/q;->bfO: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 d0059a0d69..a78d98f504 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 bfV:Lio/fabric/sdk/android/a/g/r;
+.field public static final enum bfQ: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 bfR:Lio/fabric/sdk/android/a/g/r;
 
-.field public static final enum bfX:Lio/fabric/sdk/android/a/g/r;
+.field public static final enum bfS:Lio/fabric/sdk/android/a/g/r;
 
-.field private static final synthetic bfY:[Lio/fabric/sdk/android/a/g/r;
+.field private static final synthetic bfT:[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;->bfV:Lio/fabric/sdk/android/a/g/r;
+    sput-object v0, Lio/fabric/sdk/android/a/g/r;->bfQ: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;->bfW:Lio/fabric/sdk/android/a/g/r;
+    sput-object v0, Lio/fabric/sdk/android/a/g/r;->bfR: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;->bfX:Lio/fabric/sdk/android/a/g/r;
+    sput-object v0, Lio/fabric/sdk/android/a/g/r;->bfS: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;->bfV:Lio/fabric/sdk/android/a/g/r;
+    sget-object v4, Lio/fabric/sdk/android/a/g/r;->bfQ:Lio/fabric/sdk/android/a/g/r;
 
     aput-object v4, v0, v1
 
-    sget-object v1, Lio/fabric/sdk/android/a/g/r;->bfW:Lio/fabric/sdk/android/a/g/r;
+    sget-object v1, Lio/fabric/sdk/android/a/g/r;->bfR:Lio/fabric/sdk/android/a/g/r;
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lio/fabric/sdk/android/a/g/r;->bfX:Lio/fabric/sdk/android/a/g/r;
+    sget-object v1, Lio/fabric/sdk/android/a/g/r;->bfS:Lio/fabric/sdk/android/a/g/r;
 
     aput-object v1, v0, v3
 
-    sput-object v0, Lio/fabric/sdk/android/a/g/r;->bfY:[Lio/fabric/sdk/android/a/g/r;
+    sput-object v0, Lio/fabric/sdk/android/a/g/r;->bfT:[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;->bfY:[Lio/fabric/sdk/android/a/g/r;
+    sget-object v0, Lio/fabric/sdk/android/a/g/r;->bfT:[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 3cccad7111..946e8fda47 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 CS()Lio/fabric/sdk/android/a/g/t;
+.method public abstract CQ()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 0dd1df4efc..9c19517198 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 bfZ:Lio/fabric/sdk/android/a/g/e;
+.field public final bfU:Lio/fabric/sdk/android/a/g/e;
 
-.field public final bga:Lio/fabric/sdk/android/a/g/p;
+.field public final bfV:Lio/fabric/sdk/android/a/g/p;
 
-.field public final bgb:Lio/fabric/sdk/android/a/g/m;
+.field public final bfW:Lio/fabric/sdk/android/a/g/m;
 
-.field public final bgc:Lio/fabric/sdk/android/a/g/f;
+.field public final bfX:Lio/fabric/sdk/android/a/g/f;
 
-.field public final bgd:J
+.field public final bfY:J
 
-.field public final bge:I
+.field public final bfZ:I
 
-.field public final bgf:I
+.field public final bga:I
 
-.field public final qu:Lio/fabric/sdk/android/a/g/b;
+.field public final qv:Lio/fabric/sdk/android/a/g/b;
 
-.field public final sG:Lio/fabric/sdk/android/a/g/o;
+.field public final sH: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;->bgd:J
+    iput-wide p1, p0, Lio/fabric/sdk/android/a/g/t;->bfY:J
 
-    iput-object p3, p0, Lio/fabric/sdk/android/a/g/t;->bfZ:Lio/fabric/sdk/android/a/g/e;
+    iput-object p3, p0, Lio/fabric/sdk/android/a/g/t;->bfU:Lio/fabric/sdk/android/a/g/e;
 
-    iput-object p4, p0, Lio/fabric/sdk/android/a/g/t;->bga:Lio/fabric/sdk/android/a/g/p;
+    iput-object p4, p0, Lio/fabric/sdk/android/a/g/t;->bfV:Lio/fabric/sdk/android/a/g/p;
 
-    iput-object p5, p0, Lio/fabric/sdk/android/a/g/t;->sG:Lio/fabric/sdk/android/a/g/o;
+    iput-object p5, p0, Lio/fabric/sdk/android/a/g/t;->sH:Lio/fabric/sdk/android/a/g/o;
 
-    iput-object p6, p0, Lio/fabric/sdk/android/a/g/t;->bgb:Lio/fabric/sdk/android/a/g/m;
+    iput-object p6, p0, Lio/fabric/sdk/android/a/g/t;->bfW:Lio/fabric/sdk/android/a/g/m;
 
-    iput p9, p0, Lio/fabric/sdk/android/a/g/t;->bge:I
+    iput p9, p0, Lio/fabric/sdk/android/a/g/t;->bfZ:I
 
-    iput p10, p0, Lio/fabric/sdk/android/a/g/t;->bgf:I
+    iput p10, p0, Lio/fabric/sdk/android/a/g/t;->bga:I
 
-    iput-object p7, p0, Lio/fabric/sdk/android/a/g/t;->qu:Lio/fabric/sdk/android/a/g/b;
+    iput-object p7, p0, Lio/fabric/sdk/android/a/g/t;->qv:Lio/fabric/sdk/android/a/g/b;
 
-    iput-object p8, p0, Lio/fabric/sdk/android/a/g/t;->bgc:Lio/fabric/sdk/android/a/g/f;
+    iput-object p8, p0, Lio/fabric/sdk/android/a/g/t;->bfX: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 fc1debaeff..24526407e0 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 bgg:Ljava/lang/String;
+.field public static final bgb: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 cbb4c85df8..a9be09ffd2 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 bff:Ljava/lang/String;
+.field public final bfa:Ljava/lang/String;
 
-.field public final bfg:Ljava/lang/String;
+.field public final bfb:Ljava/lang/String;
 
-.field public final bfi:I
+.field public final bfd:I
 
-.field public final bgh:Ljava/lang/String;
+.field public final bgc:Ljava/lang/String;
 
-.field public final bgi:Ljava/lang/String;
+.field public final bgd:Ljava/lang/String;
 
-.field public final bgj:Ljava/lang/String;
+.field public final bge:Ljava/lang/String;
 
-.field public final bgk:Ljava/lang/String;
+.field public final bgf:Ljava/lang/String;
 
-.field public final qT:Ljava/lang/String;
+.field public final qU:Ljava/lang/String;
 
-.field public final qX:Ljava/lang/String;
+.field public final qY:Ljava/lang/String;
 
-.field public final qv:Ljava/lang/String;
+.field public final qw: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;->qv:Ljava/lang/String;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/g/w;->qw:Ljava/lang/String;
 
-    iput-object p2, p0, Lio/fabric/sdk/android/a/g/w;->qX:Ljava/lang/String;
+    iput-object p2, p0, Lio/fabric/sdk/android/a/g/w;->qY:Ljava/lang/String;
 
-    iput-object p3, p0, Lio/fabric/sdk/android/a/g/w;->bgh:Ljava/lang/String;
+    iput-object p3, p0, Lio/fabric/sdk/android/a/g/w;->bgc:Ljava/lang/String;
 
-    iput-object p4, p0, Lio/fabric/sdk/android/a/g/w;->bgi:Ljava/lang/String;
+    iput-object p4, p0, Lio/fabric/sdk/android/a/g/w;->bgd:Ljava/lang/String;
 
-    iput-object p5, p0, Lio/fabric/sdk/android/a/g/w;->qT:Ljava/lang/String;
+    iput-object p5, p0, Lio/fabric/sdk/android/a/g/w;->qU:Ljava/lang/String;
 
-    iput-object p6, p0, Lio/fabric/sdk/android/a/g/w;->bgj:Ljava/lang/String;
+    iput-object p6, p0, Lio/fabric/sdk/android/a/g/w;->bge:Ljava/lang/String;
 
-    iput-object p7, p0, Lio/fabric/sdk/android/a/g/w;->bff:Ljava/lang/String;
+    iput-object p7, p0, Lio/fabric/sdk/android/a/g/w;->bfa:Ljava/lang/String;
 
-    iput-object p8, p0, Lio/fabric/sdk/android/a/g/w;->bfg:Ljava/lang/String;
+    iput-object p8, p0, Lio/fabric/sdk/android/a/g/w;->bfb:Ljava/lang/String;
 
-    iput p9, p0, Lio/fabric/sdk/android/a/g/w;->bfi:I
+    iput p9, p0, Lio/fabric/sdk/android/a/g/w;->bfd:I
 
-    iput-object p10, p0, Lio/fabric/sdk/android/a/g/w;->bgk:Ljava/lang/String;
+    iput-object p10, p0, Lio/fabric/sdk/android/a/g/w;->bgf: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 3ad561c99d..e54bccdb66 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;->ber:I
+    sget v5, Lio/fabric/sdk/android/a/e/c;->bem: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 335f3089f4..e88539538d 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 bbe:I
+.field private bba:I
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     const/4 v0, 0x3
 
-    iput v0, p0, Lio/fabric/sdk/android/b;->bbe:I
+    iput v0, p0, Lio/fabric/sdk/android/b;->bba:I
 
     return-void
 .end method
@@ -30,7 +30,7 @@
 
     const/4 p1, 0x4
 
-    iput p1, p0, Lio/fabric/sdk/android/b;->bbe:I
+    iput p1, p0, Lio/fabric/sdk/android/b;->bba: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;->bbe:I
+    iget v0, p0, Lio/fabric/sdk/android/b;->bba: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 9a098ac660..0cee70ee94 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 bbp:Lio/fabric/sdk/android/c;
+.field final synthetic bbl: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;->bbp:Lio/fabric/sdk/android/c;
+    iput-object p1, p0, Lio/fabric/sdk/android/c$1;->bbl: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;->bbp:Lio/fabric/sdk/android/c;
+    iget-object v0, p0, Lio/fabric/sdk/android/c$1;->bbl: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;->bbp:Lio/fabric/sdk/android/c;
+    iget-object v0, p0, Lio/fabric/sdk/android/c$1;->bbl: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;->bbp:Lio/fabric/sdk/android/c;
+    iget-object v0, p0, Lio/fabric/sdk/android/c$1;->bbl: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 8d34d1bda2..77bc6ca8d2 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 bbp:Lio/fabric/sdk/android/c;
+.field final synthetic bbl:Lio/fabric/sdk/android/c;
 
-.field final bbq:Ljava/util/concurrent/CountDownLatch;
+.field final bbm:Ljava/util/concurrent/CountDownLatch;
 
-.field final synthetic bbr:I
+.field final synthetic bbn: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;->bbp:Lio/fabric/sdk/android/c;
+    iput-object p1, p0, Lio/fabric/sdk/android/c$2;->bbl:Lio/fabric/sdk/android/c;
 
-    iput p2, p0, Lio/fabric/sdk/android/c$2;->bbr:I
+    iput p2, p0, Lio/fabric/sdk/android/c$2;->bbn: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;->bbr:I
+    iget p2, p0, Lio/fabric/sdk/android/c$2;->bbn:I
 
     invoke-direct {p1, p2}, Ljava/util/concurrent/CountDownLatch;-><init>(I)V
 
-    iput-object p1, p0, Lio/fabric/sdk/android/c$2;->bbq:Ljava/util/concurrent/CountDownLatch;
+    iput-object p1, p0, Lio/fabric/sdk/android/c$2;->bbm:Ljava/util/concurrent/CountDownLatch;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final BG()V
+.method public final BE()V
     .locals 5
 
-    iget-object v0, p0, Lio/fabric/sdk/android/c$2;->bbq:Ljava/util/concurrent/CountDownLatch;
+    iget-object v0, p0, Lio/fabric/sdk/android/c$2;->bbm:Ljava/util/concurrent/CountDownLatch;
 
     invoke-virtual {v0}, Ljava/util/concurrent/CountDownLatch;->countDown()V
 
-    iget-object v0, p0, Lio/fabric/sdk/android/c$2;->bbq:Ljava/util/concurrent/CountDownLatch;
+    iget-object v0, p0, Lio/fabric/sdk/android/c$2;->bbm: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;->bbp:Lio/fabric/sdk/android/c;
+    iget-object v0, p0, Lio/fabric/sdk/android/c$2;->bbl: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;->bbp:Lio/fabric/sdk/android/c;
+    iget-object v0, p0, Lio/fabric/sdk/android/c$2;->bbl: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;->BG()V
+    invoke-interface {v0}, Lio/fabric/sdk/android/f;->BE()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;->bbp:Lio/fabric/sdk/android/c;
+    iget-object v0, p0, Lio/fabric/sdk/android/c$2;->bbl: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 58fe24483a..3392199563 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 bbi:Lio/fabric/sdk/android/f;
+.field bbe: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 bbn:Lio/fabric/sdk/android/l;
+.field bbj:Lio/fabric/sdk/android/l;
 
-.field bbo:Z
+.field bbk:Z
 
-.field bbs:[Lio/fabric/sdk/android/i;
+.field bbo:[Lio/fabric/sdk/android/i;
 
-.field bbt:Lio/fabric/sdk/android/a/c/k;
+.field bbp:Lio/fabric/sdk/android/a/c/k;
 
-.field bbu:Ljava/lang/String;
+.field bbq:Ljava/lang/String;
 
-.field bbv:Ljava/lang/String;
+.field bbr: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 185477742d..8e59b871f3 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 bbf:Lio/fabric/sdk/android/c;
+.field static volatile bbb:Lio/fabric/sdk/android/c;
 
-.field static final bbg:Lio/fabric/sdk/android/l;
+.field static final bbc:Lio/fabric/sdk/android/l;
 
 
 # instance fields
-.field private final bbh:Ljava/util/Map;
+.field private final bbd:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -32,7 +32,7 @@
     .end annotation
 .end field
 
-.field private final bbi:Lio/fabric/sdk/android/f;
+.field private final bbe: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 bbj:Lio/fabric/sdk/android/f;
+.field private final bbf: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 bbk:Lio/fabric/sdk/android/a;
+.field private bbg:Lio/fabric/sdk/android/a;
 
-.field public bbl:Ljava/lang/ref/WeakReference;
+.field public bbh:Ljava/lang/ref/WeakReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/ref/WeakReference<",
@@ -63,11 +63,11 @@
     .end annotation
 .end field
 
-.field private bbm:Ljava/util/concurrent/atomic/AtomicBoolean;
+.field private bbi:Ljava/util/concurrent/atomic/AtomicBoolean;
 
-.field final bbn:Lio/fabric/sdk/android/l;
+.field final bbj:Lio/fabric/sdk/android/l;
 
-.field final bbo:Z
+.field final bbk:Z
 
 .field private final context:Landroid/content/Context;
 
@@ -75,7 +75,7 @@
 
 .field private final mainHandler:Landroid/os/Handler;
 
-.field private final ra:Lio/fabric/sdk/android/a/b/s;
+.field private final rb: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;->bbg:Lio/fabric/sdk/android/l;
+    sput-object v0, Lio/fabric/sdk/android/c;->bbc: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;->bbh:Ljava/util/Map;
+    iput-object p2, p0, Lio/fabric/sdk/android/c;->bbd: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;->bbn:Lio/fabric/sdk/android/l;
+    iput-object p5, p0, Lio/fabric/sdk/android/c;->bbj:Lio/fabric/sdk/android/l;
 
-    iput-boolean p6, p0, Lio/fabric/sdk/android/c;->bbo:Z
+    iput-boolean p6, p0, Lio/fabric/sdk/android/c;->bbk:Z
 
-    iput-object p7, p0, Lio/fabric/sdk/android/c;->bbi:Lio/fabric/sdk/android/f;
+    iput-object p7, p0, Lio/fabric/sdk/android/c;->bbe: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;->bbm:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iput-object p1, p0, Lio/fabric/sdk/android/c;->bbi: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;->bbj:Lio/fabric/sdk/android/f;
+    iput-object p2, p0, Lio/fabric/sdk/android/c;->bbf:Lio/fabric/sdk/android/f;
 
-    iput-object p8, p0, Lio/fabric/sdk/android/c;->ra:Lio/fabric/sdk/android/a/b/s;
+    iput-object p8, p0, Lio/fabric/sdk/android/c;->rb: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 BE()Lio/fabric/sdk/android/l;
+.method public static BC()Lio/fabric/sdk/android/l;
     .locals 1
 
-    sget-object v0, Lio/fabric/sdk/android/c;->bbf:Lio/fabric/sdk/android/c;
+    sget-object v0, Lio/fabric/sdk/android/c;->bbb:Lio/fabric/sdk/android/c;
 
     if-nez v0, :cond_0
 
-    sget-object v0, Lio/fabric/sdk/android/c;->bbg:Lio/fabric/sdk/android/l;
+    sget-object v0, Lio/fabric/sdk/android/c;->bbc:Lio/fabric/sdk/android/l;
 
     return-object v0
 
     :cond_0
-    sget-object v0, Lio/fabric/sdk/android/c;->bbf:Lio/fabric/sdk/android/c;
+    sget-object v0, Lio/fabric/sdk/android/c;->bbb:Lio/fabric/sdk/android/c;
 
-    iget-object v0, v0, Lio/fabric/sdk/android/c;->bbn:Lio/fabric/sdk/android/l;
+    iget-object v0, v0, Lio/fabric/sdk/android/c;->bbj:Lio/fabric/sdk/android/l;
 
     return-object v0
 .end method
 
-.method public static BF()Z
+.method public static BD()Z
     .locals 1
 
-    sget-object v0, Lio/fabric/sdk/android/c;->bbf:Lio/fabric/sdk/android/c;
+    sget-object v0, Lio/fabric/sdk/android/c;->bbb: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;->bbf:Lio/fabric/sdk/android/c;
+    sget-object v0, Lio/fabric/sdk/android/c;->bbb:Lio/fabric/sdk/android/c;
 
-    iget-boolean v0, v0, Lio/fabric/sdk/android/c;->bbo:Z
+    iget-boolean v0, v0, Lio/fabric/sdk/android/c;->bbk:Z
 
     return v0
 .end method
@@ -208,13 +208,13 @@
         }
     .end annotation
 
-    sget-object v0, Lio/fabric/sdk/android/c;->bbf:Lio/fabric/sdk/android/c;
+    sget-object v0, Lio/fabric/sdk/android/c;->bbb:Lio/fabric/sdk/android/c;
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lio/fabric/sdk/android/c;->bbf:Lio/fabric/sdk/android/c;
+    sget-object v0, Lio/fabric/sdk/android/c;->bbb:Lio/fabric/sdk/android/c;
 
-    iget-object v0, v0, Lio/fabric/sdk/android/c;->bbh:Ljava/util/Map;
+    iget-object v0, v0, Lio/fabric/sdk/android/c;->bbd: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;->bbf:Lio/fabric/sdk/android/c;
+    sget-object v0, Lio/fabric/sdk/android/c;->bbb: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;->bbf:Lio/fabric/sdk/android/c;
+    sget-object v1, Lio/fabric/sdk/android/c;->bbb: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;->bbs:[Lio/fabric/sdk/android/i;
+    iget-object p0, v1, Lio/fabric/sdk/android/c$a;->bbo:[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;->Ca()Z
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/b/l;->BY()Z
 
     move-result p0
 
@@ -341,7 +341,7 @@
 
     if-nez v5, :cond_4
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->bbs:[Lio/fabric/sdk/android/i;
+    iput-object p1, v1, Lio/fabric/sdk/android/c$a;->bbo:[Lio/fabric/sdk/android/i;
 
-    iget-object p0, v1, Lio/fabric/sdk/android/c$a;->bbt:Lio/fabric/sdk/android/a/c/k;
+    iget-object p0, v1, Lio/fabric/sdk/android/c$a;->bbp:Lio/fabric/sdk/android/a/c/k;
 
     if-nez p0, :cond_7
 
-    invoke-static {}, Lio/fabric/sdk/android/a/c/k;->Cq()Lio/fabric/sdk/android/a/c/k;
+    invoke-static {}, Lio/fabric/sdk/android/a/c/k;->Co()Lio/fabric/sdk/android/a/c/k;
 
     move-result-object p0
 
-    iput-object p0, v1, Lio/fabric/sdk/android/c$a;->bbt:Lio/fabric/sdk/android/a/c/k;
+    iput-object p0, v1, Lio/fabric/sdk/android/c$a;->bbp: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;->bbn:Lio/fabric/sdk/android/l;
+    iget-object p0, v1, Lio/fabric/sdk/android/c$a;->bbj:Lio/fabric/sdk/android/l;
 
     if-nez p0, :cond_a
 
-    iget-boolean p0, v1, Lio/fabric/sdk/android/c$a;->bbo:Z
+    iget-boolean p0, v1, Lio/fabric/sdk/android/c$a;->bbk: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;->bbn:Lio/fabric/sdk/android/l;
+    iput-object p0, v1, Lio/fabric/sdk/android/c$a;->bbj: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;->bbn:Lio/fabric/sdk/android/l;
+    iput-object p0, v1, Lio/fabric/sdk/android/c$a;->bbj:Lio/fabric/sdk/android/l;
 
     :cond_a
     :goto_3
-    iget-object p0, v1, Lio/fabric/sdk/android/c$a;->bbv:Ljava/lang/String;
+    iget-object p0, v1, Lio/fabric/sdk/android/c$a;->bbr: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;->bbv:Ljava/lang/String;
+    iput-object p0, v1, Lio/fabric/sdk/android/c$a;->bbr:Ljava/lang/String;
 
     :cond_b
-    iget-object p0, v1, Lio/fabric/sdk/android/c$a;->bbi:Lio/fabric/sdk/android/f;
+    iget-object p0, v1, Lio/fabric/sdk/android/c$a;->bbe:Lio/fabric/sdk/android/f;
 
     if-nez p0, :cond_c
 
-    sget-object p0, Lio/fabric/sdk/android/f;->bbz:Lio/fabric/sdk/android/f;
+    sget-object p0, Lio/fabric/sdk/android/f;->bbv:Lio/fabric/sdk/android/f;
 
-    iput-object p0, v1, Lio/fabric/sdk/android/c$a;->bbi:Lio/fabric/sdk/android/f;
+    iput-object p0, v1, Lio/fabric/sdk/android/c$a;->bbe:Lio/fabric/sdk/android/f;
 
     :cond_c
-    iget-object p0, v1, Lio/fabric/sdk/android/c$a;->bbs:[Lio/fabric/sdk/android/i;
+    iget-object p0, v1, Lio/fabric/sdk/android/c$a;->bbo:[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;->bbs:[Lio/fabric/sdk/android/i;
+    iget-object p0, v1, Lio/fabric/sdk/android/c$a;->bbo:[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;->bbv:Ljava/lang/String;
+    iget-object p0, v1, Lio/fabric/sdk/android/c$a;->bbr:Ljava/lang/String;
 
-    iget-object p1, v1, Lio/fabric/sdk/android/c$a;->bbu:Ljava/lang/String;
+    iget-object p1, v1, Lio/fabric/sdk/android/c$a;->bbq: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;->bbt:Lio/fabric/sdk/android/a/c/k;
+    iget-object v6, v1, Lio/fabric/sdk/android/c$a;->bbp: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;->bbn:Lio/fabric/sdk/android/l;
+    iget-object v8, v1, Lio/fabric/sdk/android/c$a;->bbj:Lio/fabric/sdk/android/l;
 
-    iget-boolean v9, v1, Lio/fabric/sdk/android/c$a;->bbo:Z
+    iget-boolean v9, v1, Lio/fabric/sdk/android/c$a;->bbk:Z
 
-    iget-object v10, v1, Lio/fabric/sdk/android/c$a;->bbi:Lio/fabric/sdk/android/f;
+    iget-object v10, v1, Lio/fabric/sdk/android/c$a;->bbe: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;->bbf:Lio/fabric/sdk/android/c;
+    sput-object p0, Lio/fabric/sdk/android/c;->bbb: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;->bbk:Lio/fabric/sdk/android/a;
+    iput-object p1, p0, Lio/fabric/sdk/android/c;->bbg:Lio/fabric/sdk/android/a;
 
-    iget-object p1, p0, Lio/fabric/sdk/android/c;->bbk:Lio/fabric/sdk/android/a;
+    iget-object p1, p0, Lio/fabric/sdk/android/c;->bbg: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;->bbf:Lio/fabric/sdk/android/c;
+    sget-object p0, Lio/fabric/sdk/android/c;->bbb: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;->bbm:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object p0, p0, Lio/fabric/sdk/android/c;->bbi: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;->bbC:Lio/fabric/sdk/android/a/c/d;
+    iget-object v0, p1, Lio/fabric/sdk/android/i;->bby: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;->bbB:Lio/fabric/sdk/android/h;
+    iget-object v6, p1, Lio/fabric/sdk/android/i;->bbx:Lio/fabric/sdk/android/h;
 
-    iget-object v5, v5, Lio/fabric/sdk/android/i;->bbB:Lio/fabric/sdk/android/h;
+    iget-object v5, v5, Lio/fabric/sdk/android/i;->bbx: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;->bbB:Lio/fabric/sdk/android/h;
+    iget-object v4, p1, Lio/fabric/sdk/android/i;->bbx: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;->bbB:Lio/fabric/sdk/android/h;
+    iget-object v3, v3, Lio/fabric/sdk/android/i;->bbx: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;->bbh:Ljava/util/Map;
+    iget-object v1, p0, Lio/fabric/sdk/android/c;->bbd: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;->bbz:Lio/fabric/sdk/android/f;
+    sget-object v1, Lio/fabric/sdk/android/f;->bbv:Lio/fabric/sdk/android/f;
 
-    iget-object v3, p0, Lio/fabric/sdk/android/c;->ra:Lio/fabric/sdk/android/a/b/s;
+    iget-object v3, p0, Lio/fabric/sdk/android/c;->rb: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;->bbj:Lio/fabric/sdk/android/f;
+    iget-object v4, p0, Lio/fabric/sdk/android/c;->bbf:Lio/fabric/sdk/android/f;
 
-    iget-object v5, p0, Lio/fabric/sdk/android/c;->ra:Lio/fabric/sdk/android/a/b/s;
+    iget-object v5, p0, Lio/fabric/sdk/android/c;->rb: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->bbB:Lio/fabric/sdk/android/h;
+    iget-object v4, v1, Lio/fabric/sdk/android/i;->bbx:Lio/fabric/sdk/android/h;
 
-    iget-object v5, v2, Lio/fabric/sdk/android/m;->bbB:Lio/fabric/sdk/android/h;
+    iget-object v5, v2, Lio/fabric/sdk/android/m;->bbx: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;->bbh:Ljava/util/Map;
+    iget-object v4, p0, Lio/fabric/sdk/android/c;->bbd: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->bbi:Lio/fabric/sdk/android/f;
+    iget-object p0, p0, Lio/fabric/sdk/android/c;->bbe: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;->bbl:Ljava/lang/ref/WeakReference;
+    iput-object v0, p0, Lio/fabric/sdk/android/c;->bbh: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 f8aab24692..6bd0cfde28 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 bbw:Ljava/lang/String;
+.field private final bbs:Ljava/lang/String;
 
-.field private final bbx:Ljava/lang/String;
+.field private final bbt: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;->bbx:Ljava/lang/String;
+    iput-object p2, p0, Lio/fabric/sdk/android/d;->bbt:Ljava/lang/String;
 
-    iput-object p3, p0, Lio/fabric/sdk/android/d;->bbw:Ljava/lang/String;
+    iput-object p3, p0, Lio/fabric/sdk/android/d;->bbs:Ljava/lang/String;
 
     return-void
 .end method
@@ -33,7 +33,7 @@
 
     move-result-object v1
 
-    iget-object v2, p0, Lio/fabric/sdk/android/d;->bbw:Ljava/lang/String;
+    iget-object v2, p0, Lio/fabric/sdk/android/d;->bbs: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;->bbw:Ljava/lang/String;
+    iget-object v2, p0, Lio/fabric/sdk/android/d;->bbs: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;->bbw:Ljava/lang/String;
+    iget-object v2, p0, Lio/fabric/sdk/android/d;->bbs: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;->bbw:Ljava/lang/String;
+    iget-object v1, p0, Lio/fabric/sdk/android/d;->bbs: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;->bbw:Ljava/lang/String;
+    iget-object v2, p0, Lio/fabric/sdk/android/d;->bbs: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;->bbx:Ljava/lang/String;
+    iget-object v1, p0, Lio/fabric/sdk/android/d;->bbt: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 09fae52665..cb60998d0e 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 bby:Ljava/lang/String;
+.field final bbu: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;->bby:Ljava/lang/String;
+    iput-object p1, p0, Lio/fabric/sdk/android/e;->bbu:Ljava/lang/String;
 
     return-void
 .end method
 
-.method private static BH()Ljava/util/Map;
+.method private static BF()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;->ts:Ljava/lang/String;
+    iget-object v2, v1, Lio/fabric/sdk/android/k;->tt: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -85,7 +85,7 @@
     return-object v0
 .end method
 
-.method private BI()Ljava/util/Map;
+.method private BG()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;->bby:Ljava/lang/String;
+    iget-object v2, p0, Lio/fabric/sdk/android/e;->bbu: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;->ts:Ljava/lang/String;
+    iget-object v4, v3, Lio/fabric/sdk/android/k;->tt: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->ts:Ljava/lang/String;
+    iget-object v7, v3, Lio/fabric/sdk/android/k;->tt:Ljava/lang/String;
 
     aput-object v7, v5, v6
 
     const/4 v6, 0x1
 
-    iget-object v3, v3, Lio/fabric/sdk/android/k;->aSG:Ljava/lang/String;
+    iget-object v3, v3, Lio/fabric/sdk/android/k;->aSC:Ljava/lang/String;
 
     aput-object v3, v5, v6
 
@@ -319,7 +319,7 @@
 
     :goto_0
     :try_start_3
-    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()Lio/fabric/sdk/android/l;
 
     move-result-object v2
 
@@ -373,19 +373,19 @@
 
     move-result-wide v1
 
-    invoke-static {}, Lio/fabric/sdk/android/e;->BH()Ljava/util/Map;
+    invoke-static {}, Lio/fabric/sdk/android/e;->BF()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;->BI()Ljava/util/Map;
+    invoke-direct {p0}, Lio/fabric/sdk/android/e;->BG()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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 9245654220..94524f9bb8 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 BG()V
+.method public final BE()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 2bccee2949..20e372c5d4 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 bbz:Lio/fabric/sdk/android/f;
+.field public static final bbv: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;->bbz:Lio/fabric/sdk/android/f;
+    sput-object v0, Lio/fabric/sdk/android/f;->bbv:Lio/fabric/sdk/android/f;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public abstract BG()V
+.method public abstract BE()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 4402ab26ec..3afb7225b2 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 px:Lio/fabric/sdk/android/i;
+.field final py: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;->px:Lio/fabric/sdk/android/i;
+    iput-object p1, p0, Lio/fabric/sdk/android/h;->py: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;->px:Lio/fabric/sdk/android/i;
+    iget-object v2, p0, Lio/fabric/sdk/android/h;->py: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;->Cf()V
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/x;->Cd()V
 
     return-object v0
 .end method
 
 
 # virtual methods
-.method public final BJ()V
+.method public final BH()V
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -92,16 +92,16 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lio/fabric/sdk/android/h;->px:Lio/fabric/sdk/android/i;
+    iget-object v0, p0, Lio/fabric/sdk/android/h;->py:Lio/fabric/sdk/android/i;
 
-    iget-object v0, v0, Lio/fabric/sdk/android/i;->bbi:Lio/fabric/sdk/android/f;
+    iget-object v0, v0, Lio/fabric/sdk/android/i;->bbe:Lio/fabric/sdk/android/f;
 
-    invoke-interface {v0}, Lio/fabric/sdk/android/f;->BG()V
+    invoke-interface {v0}, Lio/fabric/sdk/android/f;->BE()V
 
     return-void
 .end method
 
-.method public final BK()V
+.method public final BI()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;->px:Lio/fabric/sdk/android/i;
+    iget-object v1, p0, Lio/fabric/sdk/android/h;->py: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;->px:Lio/fabric/sdk/android/i;
+    iget-object v0, p0, Lio/fabric/sdk/android/h;->py:Lio/fabric/sdk/android/i;
 
-    iget-object v0, v0, Lio/fabric/sdk/android/i;->bbi:Lio/fabric/sdk/android/f;
+    iget-object v0, v0, Lio/fabric/sdk/android/i;->bbe: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 BL()Ljava/lang/Object;
+.method public final synthetic BJ()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;->px:Lio/fabric/sdk/android/i;
+    iget-object v1, p0, Lio/fabric/sdk/android/h;->py: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;->Cg()V
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/x;->Ce()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;->bdL:I
+    sget v0, Lio/fabric/sdk/android/a/c/e;->bdG: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;->px:Lio/fabric/sdk/android/i;
+    iget-object v1, p0, Lio/fabric/sdk/android/h;->py: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;->Cg()V
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/x;->Ce()V
 
     if-nez v1, :cond_0
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/h;->Ci()Z
+    invoke-virtual {p0}, Lio/fabric/sdk/android/h;->Cg()Z
 
     :cond_0
     return-void
@@ -222,7 +222,7 @@
     move-exception v1
 
     :try_start_1
-    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->Cg()V
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/x;->Ce()V
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/h;->Ci()Z
+    invoke-virtual {p0}, Lio/fabric/sdk/android/h;->Cg()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;->Cg()V
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/x;->Ce()V
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/h;->Ci()Z
+    invoke-virtual {p0}, Lio/fabric/sdk/android/h;->Cg()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 dccfc70ba3..9a6e60a05e 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/i.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/i.smali
@@ -21,20 +21,7 @@
 
 
 # instance fields
-.field public bbA:Lio/fabric/sdk/android/c;
-
-.field public bbB:Lio/fabric/sdk/android/h;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lio/fabric/sdk/android/h<",
-            "TResult;>;"
-        }
-    .end annotation
-.end field
-
-.field final bbC:Lio/fabric/sdk/android/a/c/d;
-
-.field bbi:Lio/fabric/sdk/android/f;
+.field bbe:Lio/fabric/sdk/android/f;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lio/fabric/sdk/android/f<",
@@ -43,9 +30,22 @@
     .end annotation
 .end field
 
+.field public bbw:Lio/fabric/sdk/android/c;
+
+.field public bbx:Lio/fabric/sdk/android/h;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lio/fabric/sdk/android/h<",
+            "TResult;>;"
+        }
+    .end annotation
+.end field
+
+.field final bby:Lio/fabric/sdk/android/a/c/d;
+
 .field public context:Landroid/content/Context;
 
-.field public ra:Lio/fabric/sdk/android/a/b/s;
+.field public rb: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;->bbB:Lio/fabric/sdk/android/h;
+    iput-object v0, p0, Lio/fabric/sdk/android/i;->bbx: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;->bbC:Lio/fabric/sdk/android/a/c/d;
+    iput-object v0, p0, Lio/fabric/sdk/android/i;->bby:Lio/fabric/sdk/android/a/c/d;
 
     return-void
 .end method
 
-.method private BM()Z
+.method private BK()Z
     .locals 1
 
-    iget-object v0, p0, Lio/fabric/sdk/android/i;->bbC:Lio/fabric/sdk/android/a/c/d;
+    iget-object v0, p0, Lio/fabric/sdk/android/i;->bby: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;->BM()Z
+    invoke-direct {p0}, Lio/fabric/sdk/android/i;->BK()Z
 
     move-result v0
 
@@ -105,7 +105,7 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lio/fabric/sdk/android/i;->bbC:Lio/fabric/sdk/android/a/c/d;
+    iget-object v0, p0, Lio/fabric/sdk/android/i;->bby: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;->bbA:Lio/fabric/sdk/android/c;
+    iput-object p2, p0, Lio/fabric/sdk/android/i;->bbw: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;->bbi:Lio/fabric/sdk/android/f;
+    iput-object p3, p0, Lio/fabric/sdk/android/i;->bbe:Lio/fabric/sdk/android/f;
 
-    iput-object p4, p0, Lio/fabric/sdk/android/i;->ra:Lio/fabric/sdk/android/a/b/s;
+    iput-object p4, p0, Lio/fabric/sdk/android/i;->rb: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;->BM()Z
+    invoke-direct {p0}, Lio/fabric/sdk/android/i;->BK()Z
 
     move-result v0
 
     if-eqz v0, :cond_2
 
-    invoke-direct {p1}, Lio/fabric/sdk/android/i;->BM()Z
+    invoke-direct {p1}, Lio/fabric/sdk/android/i;->BK()Z
 
     move-result v0
 
@@ -243,13 +243,13 @@
     return v1
 
     :cond_2
-    invoke-direct {p0}, Lio/fabric/sdk/android/i;->BM()Z
+    invoke-direct {p0}, Lio/fabric/sdk/android/i;->BK()Z
 
     move-result v0
 
     if-nez v0, :cond_3
 
-    invoke-direct {p1}, Lio/fabric/sdk/android/i;->BM()Z
+    invoke-direct {p1}, Lio/fabric/sdk/android/i;->BK()Z
 
     move-result p1
 
@@ -295,9 +295,9 @@
 .method final initialize()V
     .locals 5
 
-    iget-object v0, p0, Lio/fabric/sdk/android/i;->bbB:Lio/fabric/sdk/android/h;
+    iget-object v0, p0, Lio/fabric/sdk/android/i;->bbx:Lio/fabric/sdk/android/h;
 
-    iget-object v1, p0, Lio/fabric/sdk/android/i;->bbA:Lio/fabric/sdk/android/c;
+    iget-object v1, p0, Lio/fabric/sdk/android/i;->bbw: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 e4ab52e227..d8b2e6a73f 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 aSG:Ljava/lang/String;
+.field public final aSC:Ljava/lang/String;
 
-.field public final bbD:Ljava/lang/String;
+.field public final bbz:Ljava/lang/String;
 
-.field public final ts:Ljava/lang/String;
+.field public final tt: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;->ts:Ljava/lang/String;
+    iput-object p1, p0, Lio/fabric/sdk/android/k;->tt:Ljava/lang/String;
 
-    iput-object p2, p0, Lio/fabric/sdk/android/k;->aSG:Ljava/lang/String;
+    iput-object p2, p0, Lio/fabric/sdk/android/k;->aSC:Ljava/lang/String;
 
-    iput-object p3, p0, Lio/fabric/sdk/android/k;->bbD:Ljava/lang/String;
+    iput-object p3, p0, Lio/fabric/sdk/android/k;->bbz: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 be1d97e6e4..a6e77ba099 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/m.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/m.smali
@@ -14,15 +14,15 @@
 
 
 # instance fields
-.field private bbE:Landroid/content/pm/PackageManager;
+.field private bbA:Landroid/content/pm/PackageManager;
 
-.field private bbF:Landroid/content/pm/PackageInfo;
+.field private bbB:Landroid/content/pm/PackageInfo;
 
-.field private bbG:Ljava/lang/String;
+.field private bbC:Ljava/lang/String;
 
-.field private bbH:Ljava/lang/String;
+.field private bbD:Ljava/lang/String;
 
-.field private final bbI:Ljava/util/concurrent/Future;
+.field private final bbE:Ljava/util/concurrent/Future;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/Future<",
@@ -34,7 +34,7 @@
     .end annotation
 .end field
 
-.field private final bbJ:Ljava/util/Collection;
+.field private final bbF:Ljava/util/Collection;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Collection<",
@@ -44,16 +44,16 @@
     .end annotation
 .end field
 
-.field private final pA:Lio/fabric/sdk/android/a/e/e;
+.field private final pB: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;->pA:Lio/fabric/sdk/android/a/e/e;
+    iput-object v0, p0, Lio/fabric/sdk/android/m;->pB:Lio/fabric/sdk/android/a/e/e;
 
-    iput-object p1, p0, Lio/fabric/sdk/android/m;->bbI:Ljava/util/concurrent/Future;
+    iput-object p1, p0, Lio/fabric/sdk/android/m;->bbE:Ljava/util/concurrent/Future;
 
-    iput-object p2, p0, Lio/fabric/sdk/android/m;->bbJ:Ljava/util/Collection;
+    iput-object p2, p0, Lio/fabric/sdk/android/m;->bbF:Ljava/util/Collection;
 
     return-void
 .end method
 
-.method private BN()Lio/fabric/sdk/android/a/g/t;
+.method private BL()Lio/fabric/sdk/android/a/g/t;
     .locals 8
 
     :try_start_0
-    invoke-static {}, Lio/fabric/sdk/android/a/g/q$a;->CX()Lio/fabric/sdk/android/a/g/q;
+    invoke-static {}, Lio/fabric/sdk/android/a/g/q$a;->CV()Lio/fabric/sdk/android/a/g/q;
 
     move-result-object v0
 
-    iget-object v2, p0, Lio/fabric/sdk/android/m;->ra:Lio/fabric/sdk/android/a/b/s;
+    iget-object v2, p0, Lio/fabric/sdk/android/m;->rb:Lio/fabric/sdk/android/a/b/s;
 
-    iget-object v3, p0, Lio/fabric/sdk/android/m;->pA:Lio/fabric/sdk/android/a/e/e;
+    iget-object v3, p0, Lio/fabric/sdk/android/m;->pB:Lio/fabric/sdk/android/a/e/e;
 
-    iget-object v4, p0, Lio/fabric/sdk/android/m;->rb:Ljava/lang/String;
+    iget-object v4, p0, Lio/fabric/sdk/android/m;->rc:Ljava/lang/String;
 
-    iget-object v5, p0, Lio/fabric/sdk/android/m;->rc:Ljava/lang/String;
+    iget-object v5, p0, Lio/fabric/sdk/android/m;->rd:Ljava/lang/String;
 
-    invoke-direct {p0}, Lio/fabric/sdk/android/m;->BO()Ljava/lang/String;
+    invoke-direct {p0}, Lio/fabric/sdk/android/m;->BM()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;->CV()Z
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/g/q;->CT()Z
 
-    invoke-static {}, Lio/fabric/sdk/android/a/g/q$a;->CX()Lio/fabric/sdk/android/a/g/q;
+    invoke-static {}, Lio/fabric/sdk/android/a/g/q$a;->CV()Lio/fabric/sdk/android/a/g/q;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lio/fabric/sdk/android/a/g/q;->CU()Lio/fabric/sdk/android/a/g/t;
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/g/q;->CS()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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -151,7 +151,7 @@
     return-object v0
 .end method
 
-.method private BO()Ljava/lang/String;
+.method private BM()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;->rd:Ljava/lang/String;
+    iget-object v1, v0, Lio/fabric/sdk/android/m;->re: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;->ra:Lio/fabric/sdk/android/a/b/s;
+    iget-object v1, v0, Lio/fabric/sdk/android/i;->rb:Lio/fabric/sdk/android/a/b/s;
 
-    iget-object v5, v1, Lio/fabric/sdk/android/a/b/s;->bbv:Ljava/lang/String;
+    iget-object v5, v1, Lio/fabric/sdk/android/a/b/s;->bbr:Ljava/lang/String;
 
     new-instance v1, Lio/fabric/sdk/android/a/g/d;
 
-    iget-object v6, v0, Lio/fabric/sdk/android/m;->rc:Ljava/lang/String;
+    iget-object v6, v0, Lio/fabric/sdk/android/m;->rd:Ljava/lang/String;
 
-    iget-object v7, v0, Lio/fabric/sdk/android/m;->rb:Ljava/lang/String;
+    iget-object v7, v0, Lio/fabric/sdk/android/m;->rc:Ljava/lang/String;
 
-    iget-object v9, v0, Lio/fabric/sdk/android/m;->bbG:Ljava/lang/String;
+    iget-object v9, v0, Lio/fabric/sdk/android/m;->bbC:Ljava/lang/String;
 
-    iget-object v11, v0, Lio/fabric/sdk/android/m;->bbH:Ljava/lang/String;
+    iget-object v11, v0, Lio/fabric/sdk/android/m;->bbD:Ljava/lang/String;
 
     const-string v12, "0"
 
@@ -325,7 +325,7 @@
 
     move-result-object v1
 
-    invoke-direct {p0}, Lio/fabric/sdk/android/m;->BN()Lio/fabric/sdk/android/a/g/t;
+    invoke-direct {p0}, Lio/fabric/sdk/android/m;->BL()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;->bbI:Ljava/util/concurrent/Future;
+    iget-object v4, p0, Lio/fabric/sdk/android/m;->bbE:Ljava/util/concurrent/Future;
 
     if-eqz v4, :cond_0
 
-    iget-object v4, p0, Lio/fabric/sdk/android/m;->bbI:Ljava/util/concurrent/Future;
+    iget-object v4, p0, Lio/fabric/sdk/android/m;->bbE: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;->bbJ:Ljava/util/Collection;
+    iget-object v5, p0, Lio/fabric/sdk/android/m;->bbF: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;->bfZ:Lio/fabric/sdk/android/a/g/e;
+    iget-object v2, v2, Lio/fabric/sdk/android/a/g/t;->bfU: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;->BO()Ljava/lang/String;
+    invoke-direct {p0}, Lio/fabric/sdk/android/m;->BM()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;->pA:Lio/fabric/sdk/android/a/e/e;
+    iget-object v6, p0, Lio/fabric/sdk/android/m;->pB: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;->CX()Lio/fabric/sdk/android/a/g/q;
+    invoke-static {}, Lio/fabric/sdk/android/a/g/q$a;->CV()Lio/fabric/sdk/android/a/g/q;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lio/fabric/sdk/android/a/g/q;->CW()Z
+    invoke-virtual {v1}, Lio/fabric/sdk/android/a/g/q;->CU()Z
 
     move-result v0
 
     goto :goto_1
 
     :cond_1
-    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->CX()Lio/fabric/sdk/android/a/g/q;
+    invoke-static {}, Lio/fabric/sdk/android/a/g/q$a;->CV()Lio/fabric/sdk/android/a/g/q;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lio/fabric/sdk/android/a/g/q;->CW()Z
+    invoke-virtual {v1}, Lio/fabric/sdk/android/a/g/q;->CU()Z
 
     move-result v0
 
@@ -454,11 +454,11 @@
     goto :goto_2
 
     :cond_3
-    iget-boolean v6, v2, Lio/fabric/sdk/android/a/g/e;->bfp:Z
+    iget-boolean v6, v2, Lio/fabric/sdk/android/a/g/e;->bfk:Z
 
     if-eqz v6, :cond_4
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->BO()Ljava/lang/String;
+    invoke-direct {p0}, Lio/fabric/sdk/android/m;->BM()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;->pA:Lio/fabric/sdk/android/a/e/e;
+    iget-object v7, p0, Lio/fabric/sdk/android/m;->pB: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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;->ra:Lio/fabric/sdk/android/a/b/s;
+    iget-object v1, p0, Lio/fabric/sdk/android/i;->rb:Lio/fabric/sdk/android/a/b/s;
 
-    invoke-virtual {v1}, Lio/fabric/sdk/android/a/b/s;->Cd()Ljava/lang/String;
+    invoke-virtual {v1}, Lio/fabric/sdk/android/a/b/s;->Cb()Ljava/lang/String;
 
     move-result-object v1
 
-    iput-object v1, p0, Lio/fabric/sdk/android/m;->rd:Ljava/lang/String;
+    iput-object v1, p0, Lio/fabric/sdk/android/m;->re: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;->bbE:Landroid/content/pm/PackageManager;
+    iput-object v1, p0, Lio/fabric/sdk/android/m;->bbA: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;->bbE:Landroid/content/pm/PackageManager;
+    iget-object v1, p0, Lio/fabric/sdk/android/m;->bbA: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;->bbF:Landroid/content/pm/PackageInfo;
+    iput-object v1, p0, Lio/fabric/sdk/android/m;->bbB:Landroid/content/pm/PackageInfo;
 
-    iget-object v1, p0, Lio/fabric/sdk/android/m;->bbF:Landroid/content/pm/PackageInfo;
+    iget-object v1, p0, Lio/fabric/sdk/android/m;->bbB: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;->rb: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;->bbF:Landroid/content/pm/PackageInfo;
+    iget-object v1, p0, Lio/fabric/sdk/android/m;->bbB: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;->bbF:Landroid/content/pm/PackageInfo;
+    iget-object v1, p0, Lio/fabric/sdk/android/m;->bbB: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;->rc:Ljava/lang/String;
+    iput-object v1, p0, Lio/fabric/sdk/android/m;->rd:Ljava/lang/String;
 
-    iget-object v1, p0, Lio/fabric/sdk/android/m;->bbE:Landroid/content/pm/PackageManager;
+    iget-object v1, p0, Lio/fabric/sdk/android/m;->bbA: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;->bbG:Ljava/lang/String;
+    iput-object v1, p0, Lio/fabric/sdk/android/m;->bbC: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;->bbH:Ljava/lang/String;
+    iput-object v1, p0, Lio/fabric/sdk/android/m;->bbD: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;->BE()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BC()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 85b728ff97..4433076706 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 bgl:I = 0x19
+.field private static bgg:I = 0x19
 
-.field private static bgm:I = 0x1
+.field private static bgh:I = 0x1
 
 
 # instance fields
-.field private bgn:I
+.field private bgi:I
 
-.field private bgo:I
+.field private bgj: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;->bgm:I
+    sget v0, Ljp/wasabeef/fresco/a/a;->bgh:I
 
     const/16 v1, 0xa
 
@@ -49,9 +49,9 @@
 
     const/16 p1, 0xa
 
-    iput p1, p0, Ljp/wasabeef/fresco/a/a;->bgn:I
+    iput p1, p0, Ljp/wasabeef/fresco/a/a;->bgi:I
 
-    iput p3, p0, Ljp/wasabeef/fresco/a/a;->bgo:I
+    iput p3, p0, Ljp/wasabeef/fresco/a/a;->bgj: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;->bgn:I
+    iget v2, p0, Ljp/wasabeef/fresco/a/a;->bgi: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;->bgo:I
+    iget v2, p0, Ljp/wasabeef/fresco/a/a;->bgj: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;->bgo:I
+    iget v2, p0, Ljp/wasabeef/fresco/a/a;->bgj: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;->bgo:I
+    iget v2, p0, Ljp/wasabeef/fresco/a/a;->bgj: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;->bgn:I
+    iget v1, p0, Ljp/wasabeef/fresco/a/a;->bgi: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;->bgn:I
+    iget p2, p0, Ljp/wasabeef/fresco/a/a;->bgi: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 4ce3a42f40..fa22621f59 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 bgq:Ljava/util/List;
+.field public bgl: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;->bgq:Ljava/util/List;
+    iput-object v0, p0, Ljp/wasabeef/fresco/a/c$a;->bgl: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;->bgq:Ljava/util/List;
+    iget-object v0, p0, Ljp/wasabeef/fresco/a/c$a;->bgl: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 2c823f4a28..eb57ef343e 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 bgp:Ljava/util/List;
+.field private bgk: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;->bgp:Ljava/util/List;
+    iput-object p1, p0, Ljp/wasabeef/fresco/a/c;->bgk: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;->bgp:Ljava/util/List;
+    iget-object p2, p0, Ljp/wasabeef/fresco/a/c;->bgk: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 b35845d99d..2cbca8032f 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 bgP:Lkotlin/a/aa;
+.field public static final bgK: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;->bgP:Lkotlin/a/aa;
+    sput-object v0, Lkotlin/a/aa;->bgK: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;->bgP:Lkotlin/a/aa;
+    sget-object v0, Lkotlin/a/aa;->bgK: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;->bgM:Lkotlin/a/x;
+    sget-object v0, Lkotlin/a/x;->bgH: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 118968358f..d1756434ed 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;->bgO:Lkotlin/a/z;
+    sget-object v0, Lkotlin/a/z;->bgJ: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 315e8f3cd2..dd3489748c 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 bgQ:Ljava/util/List;
+.field private final bgL: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;->bgQ:Ljava/util/List;
+    iput-object p1, p0, Lkotlin/a/ai;->bgL:Ljava/util/List;
 
     return-void
 .end method
@@ -58,7 +58,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lkotlin/a/ai;->bgQ:Ljava/util/List;
+    iget-object v0, p0, Lkotlin/a/ai;->bgL: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;->bgQ:Ljava/util/List;
+    iget-object v0, p0, Lkotlin/a/ai;->bgL:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->clear()V
 
@@ -87,7 +87,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lkotlin/a/ai;->bgQ:Ljava/util/List;
+    iget-object v0, p0, Lkotlin/a/ai;->bgL: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;->bgQ:Ljava/util/List;
+    iget-object v0, p0, Lkotlin/a/ai;->bgL:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
@@ -120,7 +120,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lkotlin/a/ai;->bgQ:Ljava/util/List;
+    iget-object v0, p0, Lkotlin/a/ai;->bgL: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;->bgQ:Ljava/util/List;
+    iget-object v0, p0, Lkotlin/a/ai;->bgL: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 3efb0febc0..a4ee677b42 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 bgQ:Ljava/util/List;
+.field private final bgL: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;->bgQ:Ljava/util/List;
+    iput-object p1, p0, Lkotlin/a/aj;->bgL:Ljava/util/List;
 
     return-void
 .end method
@@ -58,7 +58,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lkotlin/a/aj;->bgQ:Ljava/util/List;
+    iget-object v0, p0, Lkotlin/a/aj;->bgL: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;->bgQ:Ljava/util/List;
+    iget-object v0, p0, Lkotlin/a/aj;->bgL: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 761e4ef9d1..377952b75a 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;->bgP:Lkotlin/a/aa;
+    sget-object v0, Lkotlin/a/aa;->bgK: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 42c5eb9446..84cade5537 100644
--- a/com.discord/smali_classes2/kotlin/a/an.smali
+++ b/com.discord/smali_classes2/kotlin/a/an.smali
@@ -104,81 +104,6 @@
     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 e64baaacf3..c306e8140b 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 bgR:I
+.field public static final bgM:I
 
-.field public static final bgS:I
+.field public static final bgN:I
 
-.field public static final bgT:I
+.field public static final bgO:I
 
-.field public static final bgU:I
+.field public static final bgP:I
 
-.field private static final synthetic bgV:[I
+.field private static final synthetic bgQ:[I
 
 
 # direct methods
@@ -37,19 +37,19 @@
 
     const/4 v2, 0x1
 
-    sput v2, Lkotlin/a/ap;->bgR:I
+    sput v2, Lkotlin/a/ap;->bgM:I
 
     const/4 v2, 0x2
 
-    sput v2, Lkotlin/a/ap;->bgS:I
+    sput v2, Lkotlin/a/ap;->bgN:I
 
     const/4 v2, 0x3
 
-    sput v2, Lkotlin/a/ap;->bgT:I
+    sput v2, Lkotlin/a/ap;->bgO:I
 
-    sput v0, Lkotlin/a/ap;->bgU:I
+    sput v0, Lkotlin/a/ap;->bgP:I
 
-    sput-object v1, Lkotlin/a/ap;->bgV:[I
+    sput-object v1, Lkotlin/a/ap;->bgQ:[I
 
     return-void
 
@@ -65,7 +65,7 @@
 .method public static values$27e17860()[I
     .locals 1
 
-    sget-object v0, Lkotlin/a/ap;->bgV:[I
+    sget-object v0, Lkotlin/a/ap;->bgQ:[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 0b9817788a..2013a0afb9 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 bgB:I
+.field private bgw:I
 
-.field private bgC:Ljava/lang/Object;
+.field private bgx: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;->bgS:I
+    sget v0, Lkotlin/a/ap;->bgN:I
 
-    iput v0, p0, Lkotlin/a/b;->bgB:I
+    iput v0, p0, Lkotlin/a/b;->bgw:I
 
     return-void
 .end method
@@ -56,11 +56,11 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lkotlin/a/b;->bgC:Ljava/lang/Object;
+    iput-object p1, p0, Lkotlin/a/b;->bgx:Ljava/lang/Object;
 
-    sget p1, Lkotlin/a/ap;->bgR:I
+    sget p1, Lkotlin/a/ap;->bgM:I
 
-    iput p1, p0, Lkotlin/a/b;->bgB:I
+    iput p1, p0, Lkotlin/a/b;->bgw:I
 
     return-void
 .end method
@@ -71,9 +71,9 @@
 .method protected final done()V
     .locals 1
 
-    sget v0, Lkotlin/a/ap;->bgT:I
+    sget v0, Lkotlin/a/ap;->bgO:I
 
-    iput v0, p0, Lkotlin/a/b;->bgB:I
+    iput v0, p0, Lkotlin/a/b;->bgw:I
 
     return-void
 .end method
@@ -81,9 +81,9 @@
 .method public hasNext()Z
     .locals 4
 
-    iget v0, p0, Lkotlin/a/b;->bgB:I
+    iget v0, p0, Lkotlin/a/b;->bgw:I
 
-    sget v1, Lkotlin/a/ap;->bgU:I
+    sget v1, Lkotlin/a/ap;->bgP:I
 
     const/4 v2, 0x0
 
@@ -101,7 +101,7 @@
     :goto_0
     if-eqz v0, :cond_4
 
-    iget v0, p0, Lkotlin/a/b;->bgB:I
+    iget v0, p0, Lkotlin/a/b;->bgw: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;->bgU:I
+    sget v0, Lkotlin/a/ap;->bgP:I
 
-    iput v0, p0, Lkotlin/a/b;->bgB:I
+    iput v0, p0, Lkotlin/a/b;->bgw:I
 
     invoke-virtual {p0}, Lkotlin/a/b;->computeNext()V
 
-    iget v0, p0, Lkotlin/a/b;->bgB:I
+    iget v0, p0, Lkotlin/a/b;->bgw:I
 
-    sget v1, Lkotlin/a/ap;->bgR:I
+    sget v1, Lkotlin/a/ap;->bgM:I
 
     if-ne v0, v1, :cond_1
 
@@ -168,11 +168,11 @@
 
     if-eqz v0, :cond_0
 
-    sget v0, Lkotlin/a/ap;->bgS:I
+    sget v0, Lkotlin/a/ap;->bgN:I
 
-    iput v0, p0, Lkotlin/a/b;->bgB:I
+    iput v0, p0, Lkotlin/a/b;->bgw:I
 
-    iget-object v0, p0, Lkotlin/a/b;->bgC:Ljava/lang/Object;
+    iget-object v0, p0, Lkotlin/a/b;->bgx: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 be4d25bd97..9d5e74ea9d 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;->bgT:I
+    sget v1, Lkotlin/a/ap;->bgO:I
 
     const/4 v2, 0x1
 
@@ -30,7 +30,7 @@
 
     sget-object v0, Lkotlin/a/c;->$EnumSwitchMapping$0:[I
 
-    sget v1, Lkotlin/a/ap;->bgR:I
+    sget v1, Lkotlin/a/ap;->bgM: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 738a5dffa8..bde0010d7b 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 bgE:Lkotlin/a/d;
+.field final synthetic bgz:Lkotlin/a/d;
 
 .field private index:I
 
@@ -42,7 +42,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lkotlin/a/d$b;->bgE:Lkotlin/a/d;
+    iput-object p1, p0, Lkotlin/a/d$b;->bgz: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;->bgE:Lkotlin/a/d;
+    iget-object v1, p0, Lkotlin/a/d$b;->bgz: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;->bgE:Lkotlin/a/d;
+    iget-object v0, p0, Lkotlin/a/d$b;->bgz: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 e303864169..e9453c1edf 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 bgE:Lkotlin/a/d;
+.field final synthetic bgz:Lkotlin/a/d;
 
 
 # direct methods
@@ -41,11 +41,11 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lkotlin/a/d$c;->bgE:Lkotlin/a/d;
+    iput-object p1, p0, Lkotlin/a/d$c;->bgz:Lkotlin/a/d;
 
     invoke-direct {p0, p1}, Lkotlin/a/d$b;-><init>(Lkotlin/a/d;)V
 
-    sget-object v0, Lkotlin/a/d;->bgD:Lkotlin/a/d$a;
+    sget-object v0, Lkotlin/a/d;->bgy: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;->bgE:Lkotlin/a/d;
+    iget-object v0, p0, Lkotlin/a/d$c;->bgz: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 f7ece10389..3594f89a83 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 bgF:I
+.field private bgA:I
 
-.field private final bgG:Lkotlin/a/d;
+.field private final bgB:Lkotlin/a/d;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/a/d<",
@@ -40,7 +40,7 @@
     .end annotation
 .end field
 
-.field private final bgH:I
+.field private final bgC:I
 
 
 # direct methods
@@ -60,15 +60,15 @@
 
     invoke-direct {p0}, Lkotlin/a/d;-><init>()V
 
-    iput-object p1, p0, Lkotlin/a/d$d;->bgG:Lkotlin/a/d;
+    iput-object p1, p0, Lkotlin/a/d$d;->bgB:Lkotlin/a/d;
 
-    iput p2, p0, Lkotlin/a/d$d;->bgH:I
+    iput p2, p0, Lkotlin/a/d$d;->bgC:I
 
-    sget-object p1, Lkotlin/a/d;->bgD:Lkotlin/a/d$a;
+    sget-object p1, Lkotlin/a/d;->bgy:Lkotlin/a/d$a;
 
-    iget p2, p0, Lkotlin/a/d$d;->bgH:I
+    iget p2, p0, Lkotlin/a/d$d;->bgC:I
 
-    iget-object v0, p0, Lkotlin/a/d$d;->bgG:Lkotlin/a/d;
+    iget-object v0, p0, Lkotlin/a/d$d;->bgB: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;->bgH:I
+    iget p1, p0, Lkotlin/a/d$d;->bgC:I
 
     sub-int/2addr p3, p1
 
-    iput p3, p0, Lkotlin/a/d$d;->bgF:I
+    iput p3, p0, Lkotlin/a/d$d;->bgA:I
 
     return-void
 .end method
@@ -95,15 +95,15 @@
         }
     .end annotation
 
-    sget-object v0, Lkotlin/a/d;->bgD:Lkotlin/a/d$a;
+    sget-object v0, Lkotlin/a/d;->bgy:Lkotlin/a/d$a;
 
-    iget v1, p0, Lkotlin/a/d$d;->bgF:I
+    iget v1, p0, Lkotlin/a/d$d;->bgA:I
 
     invoke-virtual {v0, p1, v1}, Lkotlin/a/d$a;->checkElementIndex$kotlin_stdlib(II)V
 
-    iget-object v0, p0, Lkotlin/a/d$d;->bgG:Lkotlin/a/d;
+    iget-object v0, p0, Lkotlin/a/d$d;->bgB:Lkotlin/a/d;
 
-    iget v1, p0, Lkotlin/a/d$d;->bgH:I
+    iget v1, p0, Lkotlin/a/d$d;->bgC:I
 
     add-int/2addr v1, p1
 
@@ -117,7 +117,7 @@
 .method public final getSize()I
     .locals 1
 
-    iget v0, p0, Lkotlin/a/d$d;->bgF:I
+    iget v0, p0, Lkotlin/a/d$d;->bgA: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 11c99b6349..f7c1a39536 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 bgD:Lkotlin/a/d$a;
+.field public static final bgy: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;->bgD:Lkotlin/a/d$a;
+    sput-object v0, Lkotlin/a/d;->bgy:Lkotlin/a/d$a;
 
     return-void
 .end method
@@ -119,7 +119,7 @@
     return p1
 
     :cond_1
-    sget-object v0, Lkotlin/a/d;->bgD:Lkotlin/a/d$a;
+    sget-object v0, Lkotlin/a/d;->bgy:Lkotlin/a/d$a;
 
     move-object v1, p0
 
@@ -145,7 +145,7 @@
 .method public hashCode()I
     .locals 2
 
-    sget-object v0, Lkotlin/a/d;->bgD:Lkotlin/a/d$a;
+    sget-object v0, Lkotlin/a/d;->bgy: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 94c8e6f684..f79de77aaa 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 bgI:[Ljava/lang/Object;
+.field private final bgD:[Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "[TT;"
@@ -30,7 +30,7 @@
     .end annotation
 .end field
 
-.field private final bgJ:Z
+.field private final bgE:Z
 
 
 # direct methods
@@ -48,9 +48,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lkotlin/a/f;->bgI:[Ljava/lang/Object;
+    iput-object p1, p0, Lkotlin/a/f;->bgD:[Ljava/lang/Object;
 
-    iput-boolean p2, p0, Lkotlin/a/f;->bgJ:Z
+    iput-boolean p2, p0, Lkotlin/a/f;->bgE: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;->bgI:[Ljava/lang/Object;
+    iget-object v0, p0, Lkotlin/a/f;->bgD:[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;->bgI:[Ljava/lang/Object;
+    iget-object v0, p0, Lkotlin/a/f;->bgD:[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;->bgI:[Ljava/lang/Object;
+    iget-object v0, p0, Lkotlin/a/f;->bgD:[Ljava/lang/Object;
 
     array-length v0, v0
 
@@ -215,7 +215,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lkotlin/a/f;->bgI:[Ljava/lang/Object;
+    iget-object v0, p0, Lkotlin/a/f;->bgD:[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;->bgI:[Ljava/lang/Object;
+    iget-object v0, p0, Lkotlin/a/f;->bgD:[Ljava/lang/Object;
 
-    iget-boolean v1, p0, Lkotlin/a/f;->bgJ:Z
+    iget-boolean v1, p0, Lkotlin/a/f;->bgE: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 417d4c2088..7a1f03ade2 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 bgK:[Ljava/lang/Object;
+.field final synthetic bgF:[Ljava/lang/Object;
 
 
 # direct methods
 .method public constructor <init>([Ljava/lang/Object;)V
     .locals 0
 
-    iput-object p1, p0, Lkotlin/a/k$a;->bgK:[Ljava/lang/Object;
+    iput-object p1, p0, Lkotlin/a/k$a;->bgF:[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;->bgK:[Ljava/lang/Object;
+    iget-object v0, p0, Lkotlin/a/k$a;->bgF:[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 c124870c1a..b6eabc8372 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 bgL:Ljava/lang/Iterable;
+.field final synthetic bgG:Ljava/lang/Iterable;
 
 
 # direct methods
 .method public constructor <init>(Ljava/lang/Iterable;)V
     .locals 0
 
-    iput-object p1, p0, Lkotlin/a/w$a;->bgL:Ljava/lang/Iterable;
+    iput-object p1, p0, Lkotlin/a/w$a;->bgG: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;->bgL:Ljava/lang/Iterable;
+    iget-object v0, p0, Lkotlin/a/w$a;->bgG: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 4783718118..7a16bf60c6 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 bgM:Lkotlin/a/x;
+.field public static final bgH:Lkotlin/a/x;
 
 
 # direct methods
@@ -19,7 +19,7 @@
 
     invoke-direct {v0}, Lkotlin/a/x;-><init>()V
 
-    sput-object v0, Lkotlin/a/x;->bgM:Lkotlin/a/x;
+    sput-object v0, Lkotlin/a/x;->bgH: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 11c64e3684..32b981833b 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 bgN:Lkotlin/a/y;
+.field public static final bgI: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;->bgN:Lkotlin/a/y;
+    sput-object v0, Lkotlin/a/y;->bgI: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;->bgN:Lkotlin/a/y;
+    sget-object v0, Lkotlin/a/y;->bgI: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;->bgM:Lkotlin/a/x;
+    sget-object v0, Lkotlin/a/x;->bgH: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;->bgM:Lkotlin/a/x;
+    sget-object v0, Lkotlin/a/x;->bgH:Lkotlin/a/x;
 
     check-cast v0, Ljava/util/ListIterator;
 
@@ -331,7 +331,7 @@
 
     if-nez p1, :cond_0
 
-    sget-object p1, Lkotlin/a/x;->bgM:Lkotlin/a/x;
+    sget-object p1, Lkotlin/a/x;->bgH: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 0837e4e533..b141e1409f 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 bgO:Lkotlin/a/z;
+.field public static final bgJ: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;->bgO:Lkotlin/a/z;
+    sput-object v0, Lkotlin/a/z;->bgJ: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;->bgO:Lkotlin/a/z;
+    sget-object v0, Lkotlin/a/z;->bgJ:Lkotlin/a/z;
 
     return-object v0
 .end method
@@ -170,7 +170,7 @@
         }
     .end annotation
 
-    sget-object v0, Lkotlin/a/aa;->bgP:Lkotlin/a/aa;
+    sget-object v0, Lkotlin/a/aa;->bgK:Lkotlin/a/aa;
 
     check-cast v0, Ljava/util/Set;
 
@@ -188,7 +188,7 @@
         }
     .end annotation
 
-    sget-object v0, Lkotlin/a/aa;->bgP:Lkotlin/a/aa;
+    sget-object v0, Lkotlin/a/aa;->bgK: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;->bgN:Lkotlin/a/y;
+    sget-object v0, Lkotlin/a/y;->bgI: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 72555c4c12..f3569e409f 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;->bhu:Lkotlin/c/a;
+    sget-object v0, Lkotlin/c/b;->bhp: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 37ff26a3c2..1186b333a9 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 bgW:[Lkotlin/jvm/functions/Function1;
+.field final synthetic bgR:[Lkotlin/jvm/functions/Function1;
 
 
 # direct methods
 .method constructor <init>([Lkotlin/jvm/functions/Function1;)V
     .locals 0
 
-    iput-object p1, p0, Lkotlin/b/b$a;->bgW:[Lkotlin/jvm/functions/Function1;
+    iput-object p1, p0, Lkotlin/b/b$a;->bgR:[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;->bgW:[Lkotlin/jvm/functions/Function1;
+    iget-object v0, p0, Lkotlin/b/b$a;->bgR:[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 aa268a9d20..19725ed44a 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 bgX:Ljava/util/Comparator;
+.field final synthetic bgS: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;->bgX:Ljava/util/Comparator;
+    iput-object p1, p0, Lkotlin/b/b$b;->bgS: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;->bgX:Ljava/util/Comparator;
+    iget-object v0, p0, Lkotlin/b/b$b;->bgS: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 f1d4902ff7..68bd911a41 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 bhs:Ljava/lang/reflect/Method;
+.field public static final bhn:Ljava/lang/reflect/Method;
 
-.field public static final bht:Lkotlin/c/a$a;
+.field public static final bho: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;->bht:Lkotlin/c/a$a;
+    sput-object v0, Lkotlin/c/a$a;->bho: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;->bhs:Ljava/lang/reflect/Method;
+    sput-object v5, Lkotlin/c/a$a;->bhn: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 1fdb9d6daf..8ce80e1640 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;->bhs:Ljava/lang/reflect/Method;
+    sget-object v0, Lkotlin/c/a$a;->bhn: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 1eb4d2c1c9..77a783cdda 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 bhu:Lkotlin/c/a;
+.field public static final bhp:Lkotlin/c/a;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 11
 
-    invoke-static {}, Lkotlin/c/b;->CY()I
+    invoke-static {}, Lkotlin/c/b;->CW()I
 
     move-result v0
 
@@ -382,12 +382,12 @@
     invoke-direct {v6}, Lkotlin/c/a;-><init>()V
 
     :goto_4
-    sput-object v6, Lkotlin/c/b;->bhu:Lkotlin/c/a;
+    sput-object v6, Lkotlin/c/b;->bhp:Lkotlin/c/a;
 
     return-void
 .end method
 
-.method private static final CY()I
+.method private static final CW()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 347f23e82f..c5f8e9eb00 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 bhc:Lkotlin/coroutines/CoroutineContext$a$a;
+.field public static final bgX: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;->bhc:Lkotlin/coroutines/CoroutineContext$a$a;
+    sput-object v0, Lkotlin/coroutines/CoroutineContext$a$a;->bgX:Lkotlin/coroutines/CoroutineContext$a$a;
 
     return-void
 .end method
@@ -90,7 +90,7 @@
 
     move-result-object p1
 
-    sget-object v0, Lkotlin/coroutines/e;->bhd:Lkotlin/coroutines/e;
+    sget-object v0, Lkotlin/coroutines/e;->bgY:Lkotlin/coroutines/e;
 
     if-ne p1, v0, :cond_0
 
@@ -99,7 +99,7 @@
     goto :goto_0
 
     :cond_0
-    sget-object v0, Lkotlin/coroutines/c;->bha:Lkotlin/coroutines/c$b;
+    sget-object v0, Lkotlin/coroutines/c;->bgV: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;->bha:Lkotlin/coroutines/c$b;
+    sget-object v1, Lkotlin/coroutines/c;->bgV: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;->bhd:Lkotlin/coroutines/e;
+    sget-object v1, Lkotlin/coroutines/e;->bgY: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 9706b139d7..b1e4969d60 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;->bhd:Lkotlin/coroutines/e;
+    sget-object v0, Lkotlin/coroutines/e;->bgY:Lkotlin/coroutines/e;
 
     if-ne p1, v0, :cond_0
 
     return-object p0
 
     :cond_0
-    sget-object v0, Lkotlin/coroutines/CoroutineContext$a$a;->bhc:Lkotlin/coroutines/CoroutineContext$a$a;
+    sget-object v0, Lkotlin/coroutines/CoroutineContext$a$a;->bgX: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 d25068023d..bc9c5132e7 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;->bhd:Lkotlin/coroutines/e;
+    sget-object p0, Lkotlin/coroutines/e;->bgY: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 575147f25d..ae77096c6d 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 bhh:Lkotlin/coroutines/a/a;
+.field public static final enum bhc:Lkotlin/coroutines/a/a;
 
-.field public static final enum bhi:Lkotlin/coroutines/a/a;
+.field public static final enum bhd:Lkotlin/coroutines/a/a;
 
-.field public static final enum bhj:Lkotlin/coroutines/a/a;
+.field public static final enum bhe:Lkotlin/coroutines/a/a;
 
-.field private static final synthetic bhk:[Lkotlin/coroutines/a/a;
+.field private static final synthetic bhf:[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;->bhh:Lkotlin/coroutines/a/a;
+    sput-object v1, Lkotlin/coroutines/a/a;->bhc: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;->bhi:Lkotlin/coroutines/a/a;
+    sput-object v1, Lkotlin/coroutines/a/a;->bhd: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;->bhj:Lkotlin/coroutines/a/a;
+    sput-object v1, Lkotlin/coroutines/a/a;->bhe:Lkotlin/coroutines/a/a;
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lkotlin/coroutines/a/a;->bhk:[Lkotlin/coroutines/a/a;
+    sput-object v0, Lkotlin/coroutines/a/a;->bhf:[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;->bhk:[Lkotlin/coroutines/a/a;
+    sget-object v0, Lkotlin/coroutines/a/a;->bhf:[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 82db84936b..3e97e33ae8 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;->bhd:Lkotlin/coroutines/e;
+    sget-object p2, Lkotlin/coroutines/e;->bgY: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 16608701e8..093fc946d5 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;->bhh:Lkotlin/coroutines/a/a;
+    sget-object v0, Lkotlin/coroutines/a/a;->bhc: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 58325d419c..236e8e7ff9 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 bgY:Lkotlin/coroutines/b$a$a;
+.field public static final bgT: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;->bgY:Lkotlin/coroutines/b$a$a;
+    sput-object v0, Lkotlin/coroutines/b$a;->bgT: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;->bhd:Lkotlin/coroutines/e;
+    sget-object v1, Lkotlin/coroutines/e;->bgY: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 206d4bc62b..66a5af8c19 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 bgZ:Lkotlin/coroutines/b$b;
+.field public static final bgU: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;->bgZ:Lkotlin/coroutines/b$b;
+    sput-object v0, Lkotlin/coroutines/b$b;->bgU: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 ccd300467d..9fc00302e5 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 d8ba48b077..a493d15abf 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;->bgy:Lkotlin/Unit;
+    sget-object v4, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     new-instance v5, Lkotlin/coroutines/b$c;
 
@@ -385,7 +385,7 @@
     return-object p1
 
     :cond_1
-    sget-object v0, Lkotlin/coroutines/e;->bhd:Lkotlin/coroutines/e;
+    sget-object v0, Lkotlin/coroutines/e;->bgY: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;->bgZ:Lkotlin/coroutines/b$b;
+    sget-object v1, Lkotlin/coroutines/b$b;->bgU: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 c5c38841a6..25d8ddb8f3 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;->bha:Lkotlin/coroutines/c$b;
+    sget-object v0, Lkotlin/coroutines/c;->bgV: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;->bha:Lkotlin/coroutines/c$b;
+    sget-object v0, Lkotlin/coroutines/c;->bgV:Lkotlin/coroutines/c$b;
 
     if-ne p1, v0, :cond_0
 
-    sget-object p0, Lkotlin/coroutines/e;->bhd:Lkotlin/coroutines/e;
+    sget-object p0, Lkotlin/coroutines/e;->bgY: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 38edc50fa3..9759859781 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 bhb:Lkotlin/coroutines/c$b;
+.field static final synthetic bgW: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;->bhb:Lkotlin/coroutines/c$b;
+    sput-object v0, Lkotlin/coroutines/c$b;->bgW: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 a5a81b81e2..c952d5276e 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 bha:Lkotlin/coroutines/c$b;
+.field public static final bgV:Lkotlin/coroutines/c$b;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    sget-object v0, Lkotlin/coroutines/c$b;->bhb:Lkotlin/coroutines/c$b;
+    sget-object v0, Lkotlin/coroutines/c$b;->bgW:Lkotlin/coroutines/c$b;
 
-    sput-object v0, Lkotlin/coroutines/c;->bha:Lkotlin/coroutines/c$b;
+    sput-object v0, Lkotlin/coroutines/c;->bgV: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 dc216a3a10..94ed241d00 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
-    sget-object p2, Lkotlin/m;->bgv:Lkotlin/m$a;
+    sget-object p2, Lkotlin/m;->bgq: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 42e359b299..2df0a2a274 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 bhd:Lkotlin/coroutines/e;
+.field public static final bgY: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;->bhd:Lkotlin/coroutines/e;
+    sput-object v0, Lkotlin/coroutines/e;->bgY: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;->bhd:Lkotlin/coroutines/e;
+    sget-object v0, Lkotlin/coroutines/e;->bgY: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 59a5cf3aaa..3bbbc4dcd3 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 bhf:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+.field private static final bha: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 bhg:Lkotlin/coroutines/f$a;
+.field public static final bhb:Lkotlin/coroutines/f$a;
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
 
 # instance fields
-.field private final bhe:Lkotlin/coroutines/Continuation;
+.field private final bgZ: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;->bhg:Lkotlin/coroutines/f$a;
+    sput-object v0, Lkotlin/coroutines/f;->bhb:Lkotlin/coroutines/f$a;
 
     const-class v0, Lkotlin/coroutines/f;
 
@@ -81,7 +81,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lkotlin/coroutines/f;->bhf:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sput-object v0, Lkotlin/coroutines/f;->bha: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;->bhi:Lkotlin/coroutines/a/a;
+    sget-object v0, Lkotlin/coroutines/a/a;->bhd: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;->bhe:Lkotlin/coroutines/Continuation;
+    iput-object p1, p0, Lkotlin/coroutines/f;->bgZ: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;->bhe:Lkotlin/coroutines/Continuation;
+    iget-object v0, p0, Lkotlin/coroutines/f;->bgZ: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;->bhe:Lkotlin/coroutines/Continuation;
+    iget-object v0, p0, Lkotlin/coroutines/f;->bgZ: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;->bhi:Lkotlin/coroutines/a/a;
+    sget-object v1, Lkotlin/coroutines/a/a;->bhd:Lkotlin/coroutines/a/a;
 
     if-ne v0, v1, :cond_1
 
-    sget-object v0, Lkotlin/coroutines/f;->bhf:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v0, Lkotlin/coroutines/f;->bha:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
-    sget-object v1, Lkotlin/coroutines/a/a;->bhi:Lkotlin/coroutines/a/a;
+    sget-object v1, Lkotlin/coroutines/a/a;->bhd: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;->bhj:Lkotlin/coroutines/a/a;
+    sget-object v1, Lkotlin/coroutines/a/a;->bhe: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;->bhi:Lkotlin/coroutines/a/a;
+    sget-object v1, Lkotlin/coroutines/a/a;->bhd:Lkotlin/coroutines/a/a;
 
     if-ne v0, v1, :cond_1
 
-    sget-object v0, Lkotlin/coroutines/f;->bhf:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v0, Lkotlin/coroutines/f;->bha:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
-    sget-object v1, Lkotlin/coroutines/a/a;->bhi:Lkotlin/coroutines/a/a;
+    sget-object v1, Lkotlin/coroutines/a/a;->bhd: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;->bhf:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v0, Lkotlin/coroutines/f;->bha: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;->bhj:Lkotlin/coroutines/a/a;
+    sget-object v2, Lkotlin/coroutines/a/a;->bhe: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;->bhe:Lkotlin/coroutines/Continuation;
+    iget-object v0, p0, Lkotlin/coroutines/f;->bgZ: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;->bhe:Lkotlin/coroutines/Continuation;
+    iget-object v1, p0, Lkotlin/coroutines/f;->bgZ: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 9d4fce5de9..34e2daa25f 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;->bgv:Lkotlin/m$a;
+    sget-object v2, Lkotlin/m;->bgq: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;->bgv:Lkotlin/m$a;
+    sget-object v2, Lkotlin/m;->bgq: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 42edaa0add..bfbe9f0ff9 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 bhl:Lkotlin/coroutines/jvm/internal/b;
+.field public static final bhg: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;->bhl:Lkotlin/coroutines/jvm/internal/b;
+    sput-object v0, Lkotlin/coroutines/jvm/internal/b;->bhg: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 82515c4c08..082e4c9da3 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;->bha:Lkotlin/coroutines/c$b;
+    sget-object v1, Lkotlin/coroutines/c;->bgV: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;->bha:Lkotlin/coroutines/c$b;
+    sget-object v2, Lkotlin/coroutines/c;->bgV: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;->bhl:Lkotlin/coroutines/jvm/internal/b;
+    sget-object v0, Lkotlin/coroutines/jvm/internal/b;->bhg: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 b6c728ac0a..b5b789cec2 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;->bho:Lkotlin/coroutines/jvm/internal/g;
+    sget-object v2, Lkotlin/coroutines/jvm/internal/g;->bhj: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 6980ed9e28..e2383e94ff 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 bhp:Ljava/lang/reflect/Method;
+.field public final bhk:Ljava/lang/reflect/Method;
 
-.field public final bhq:Ljava/lang/reflect/Method;
+.field public final bhl:Ljava/lang/reflect/Method;
 
-.field public final bhr:Ljava/lang/reflect/Method;
+.field public final bhm: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;->bhp:Ljava/lang/reflect/Method;
+    iput-object p1, p0, Lkotlin/coroutines/jvm/internal/g$a;->bhk:Ljava/lang/reflect/Method;
 
-    iput-object p2, p0, Lkotlin/coroutines/jvm/internal/g$a;->bhq:Ljava/lang/reflect/Method;
+    iput-object p2, p0, Lkotlin/coroutines/jvm/internal/g$a;->bhl:Ljava/lang/reflect/Method;
 
-    iput-object p3, p0, Lkotlin/coroutines/jvm/internal/g$a;->bhr:Ljava/lang/reflect/Method;
+    iput-object p3, p0, Lkotlin/coroutines/jvm/internal/g$a;->bhm: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 79175ab640..7c5a407423 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 bhm:Lkotlin/coroutines/jvm/internal/g$a;
+.field private static final bhh:Lkotlin/coroutines/jvm/internal/g$a;
 
-.field public static bhn:Lkotlin/coroutines/jvm/internal/g$a;
+.field public static bhi:Lkotlin/coroutines/jvm/internal/g$a;
 
-.field public static final bho:Lkotlin/coroutines/jvm/internal/g;
+.field public static final bhj: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;->bho:Lkotlin/coroutines/jvm/internal/g;
+    sput-object v0, Lkotlin/coroutines/jvm/internal/g;->bhj: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;->bhm:Lkotlin/coroutines/jvm/internal/g$a;
+    sput-object v0, Lkotlin/coroutines/jvm/internal/g;->bhh: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;->bhn:Lkotlin/coroutines/jvm/internal/g$a;
+    sput-object v2, Lkotlin/coroutines/jvm/internal/g;->bhi: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;->bhm:Lkotlin/coroutines/jvm/internal/g$a;
+    sget-object p0, Lkotlin/coroutines/jvm/internal/g;->bhh:Lkotlin/coroutines/jvm/internal/g$a;
 
-    sput-object p0, Lkotlin/coroutines/jvm/internal/g;->bhn:Lkotlin/coroutines/jvm/internal/g$a;
+    sput-object p0, Lkotlin/coroutines/jvm/internal/g;->bhi: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;->bhn:Lkotlin/coroutines/jvm/internal/g$a;
+    sget-object v0, Lkotlin/coroutines/jvm/internal/g;->bhi: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;->bhm:Lkotlin/coroutines/jvm/internal/g$a;
+    sget-object v1, Lkotlin/coroutines/jvm/internal/g;->bhh: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;->bhp:Ljava/lang/reflect/Method;
+    iget-object v1, v0, Lkotlin/coroutines/jvm/internal/g$a;->bhk: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;->bhq:Ljava/lang/reflect/Method;
+    iget-object v1, v0, Lkotlin/coroutines/jvm/internal/g$a;->bhl: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;->bhr:Ljava/lang/reflect/Method;
+    iget-object v0, v0, Lkotlin/coroutines/jvm/internal/g$a;->bhm: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 c9d80ffa2d..27af877974 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;->bhd:Lkotlin/coroutines/e;
+    sget-object v0, Lkotlin/coroutines/e;->bgY: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;->bhd:Lkotlin/coroutines/e;
+    sget-object v0, Lkotlin/coroutines/e;->bgY: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 a549d353ba..6975ad8383 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 bhQ:Lkotlin/f/b$a;
+.field private final bhL: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;->bhQ:Lkotlin/f/b$a;
+    iput-object v0, p0, Lkotlin/f/b;->bhL: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;->bhQ:Lkotlin/f/b$a;
+    iget-object v0, p0, Lkotlin/f/b;->bhL: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 09cab924ea..2113d36b43 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 bhU:Lkotlin/f/c$a;
+.field public static final bhP: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;->bhU:Lkotlin/f/c$a;
+    sput-object v0, Lkotlin/f/c$a;->bhP: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;->bhT:Lkotlin/f/c$b;
+    sget-object v0, Lkotlin/f/c;->bhO: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 77b931b858..b6dc8d8df3 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 bhR:Lkotlin/f/c;
+.field private static final bhM:Lkotlin/f/c;
 
-.field public static final bhS:Lkotlin/f/c$a;
+.field public static final bhN:Lkotlin/f/c$a;
 
-.field public static final bhT:Lkotlin/f/c$b;
+.field public static final bhO: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;->bhT:Lkotlin/f/c$b;
+    sput-object v0, Lkotlin/f/c;->bhO:Lkotlin/f/c$b;
 
-    sget-object v0, Lkotlin/c/b;->bhu:Lkotlin/c/a;
+    sget-object v0, Lkotlin/c/b;->bhp:Lkotlin/c/a;
 
     invoke-virtual {v0}, Lkotlin/c/a;->defaultPlatformRandom()Lkotlin/f/c;
 
     move-result-object v0
 
-    sput-object v0, Lkotlin/f/c;->bhR:Lkotlin/f/c;
+    sput-object v0, Lkotlin/f/c;->bhM:Lkotlin/f/c;
 
-    sget-object v0, Lkotlin/f/c$a;->bhU:Lkotlin/f/c$a;
+    sget-object v0, Lkotlin/f/c$a;->bhP:Lkotlin/f/c$a;
 
-    sput-object v0, Lkotlin/f/c;->bhS:Lkotlin/f/c$a;
+    sput-object v0, Lkotlin/f/c;->bhN: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;->bhR:Lkotlin/f/c;
+    sget-object v0, Lkotlin/f/c;->bhM: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 37b9e631cf..3956594c36 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 bhV:I
+.field private bhQ:I
 
-.field private bhW:I
+.field private bhR:I
 
-.field private bhX:I
+.field private bhS:I
 
 .field private v:I
 
@@ -53,13 +53,13 @@
 
     iput p2, p0, Lkotlin/f/e;->y:I
 
-    iput p3, p0, Lkotlin/f/e;->bhV:I
+    iput p3, p0, Lkotlin/f/e;->bhQ:I
 
-    iput p4, p0, Lkotlin/f/e;->bhW:I
+    iput p4, p0, Lkotlin/f/e;->bhR:I
 
     iput p5, p0, Lkotlin/f/e;->v:I
 
-    iput p6, p0, Lkotlin/f/e;->bhX:I
+    iput p6, p0, Lkotlin/f/e;->bhS:I
 
     iget p1, p0, Lkotlin/f/e;->x:I
 
@@ -67,11 +67,11 @@
 
     or-int/2addr p1, p2
 
-    iget p2, p0, Lkotlin/f/e;->bhV:I
+    iget p2, p0, Lkotlin/f/e;->bhQ:I
 
     or-int/2addr p1, p2
 
-    iget p2, p0, Lkotlin/f/e;->bhW:I
+    iget p2, p0, Lkotlin/f/e;->bhR:I
 
     or-int/2addr p1, p2
 
@@ -158,17 +158,17 @@
 
     iput v1, p0, Lkotlin/f/e;->x:I
 
-    iget v1, p0, Lkotlin/f/e;->bhV:I
+    iget v1, p0, Lkotlin/f/e;->bhQ:I
 
     iput v1, p0, Lkotlin/f/e;->y:I
 
-    iget v1, p0, Lkotlin/f/e;->bhW:I
+    iget v1, p0, Lkotlin/f/e;->bhR:I
 
-    iput v1, p0, Lkotlin/f/e;->bhV:I
+    iput v1, p0, Lkotlin/f/e;->bhQ:I
 
     iget v1, p0, Lkotlin/f/e;->v:I
 
-    iput v1, p0, Lkotlin/f/e;->bhW:I
+    iput v1, p0, Lkotlin/f/e;->bhR: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;->bhX:I
+    iget v1, p0, Lkotlin/f/e;->bhS:I
 
     const v2, 0x587c5
 
     add-int/2addr v1, v2
 
-    iput v1, p0, Lkotlin/f/e;->bhX:I
+    iput v1, p0, Lkotlin/f/e;->bhS:I
 
-    iget v1, p0, Lkotlin/f/e;->bhX:I
+    iget v1, p0, Lkotlin/f/e;->bhS: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 5f8995e032..1945babe31 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;->bgr:Lkotlin/j;
+    sget-object v1, Lkotlin/j;->bgm: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;->bgs:Lkotlin/j;
+    sget-object v1, Lkotlin/j;->bgn: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;->bgt:Lkotlin/j;
+    sget-object v1, Lkotlin/j;->bgo: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 adbff32006..0567718835 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 bgr:Lkotlin/j;
+.field public static final enum bgm:Lkotlin/j;
 
-.field public static final enum bgs:Lkotlin/j;
+.field public static final enum bgn:Lkotlin/j;
 
-.field public static final enum bgt:Lkotlin/j;
+.field public static final enum bgo:Lkotlin/j;
 
-.field private static final synthetic bgu:[Lkotlin/j;
+.field private static final synthetic bgp:[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;->bgr:Lkotlin/j;
+    sput-object v1, Lkotlin/j;->bgm: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;->bgs:Lkotlin/j;
+    sput-object v1, Lkotlin/j;->bgn: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;->bgt:Lkotlin/j;
+    sput-object v1, Lkotlin/j;->bgo:Lkotlin/j;
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lkotlin/j;->bgu:[Lkotlin/j;
+    sput-object v0, Lkotlin/j;->bgp:[Lkotlin/j;
 
     return-void
 .end method
@@ -102,7 +102,7 @@
 .method public static values()[Lkotlin/j;
     .locals 1
 
-    sget-object v0, Lkotlin/j;->bgu:[Lkotlin/j;
+    sget-object v0, Lkotlin/j;->bgp:[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
deleted file mode 100644
index be3a8a1c71..0000000000
--- a/com.discord/smali_classes2/kotlin/jvm/internal/Ref$BooleanRef.smali
+++ /dev/null
@@ -1,45 +0,0 @@
-.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 670a17c66c..189ec7329f 100644
--- a/com.discord/smali_classes2/kotlin/jvm/internal/Ref.smali
+++ b/com.discord/smali_classes2/kotlin/jvm/internal/Ref.smali
@@ -6,7 +6,6 @@
 # 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 39e8557f32..8ebb6ae517 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 bhN:Ljava/util/ArrayList;
+.field private final bhI: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;->bhN:Ljava/util/ArrayList;
+    iput-object v0, p0, Lkotlin/jvm/internal/aa;->bhI: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;->bhN:Ljava/util/ArrayList;
+    iget-object v0, p0, Lkotlin/jvm/internal/aa;->bhI: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;->bhN:Ljava/util/ArrayList;
+    iget-object v0, p0, Lkotlin/jvm/internal/aa;->bhI: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;->bhN:Ljava/util/ArrayList;
+    iget-object v0, p0, Lkotlin/jvm/internal/aa;->bhI: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;->bhN:Ljava/util/ArrayList;
+    iget-object v0, p0, Lkotlin/jvm/internal/aa;->bhI: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;->bhN:Ljava/util/ArrayList;
+    iget-object v1, p0, Lkotlin/jvm/internal/aa;->bhI: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;->bhN:Ljava/util/ArrayList;
+    iget-object v0, p0, Lkotlin/jvm/internal/aa;->bhI: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;->bhN:Ljava/util/ArrayList;
+    iget-object v0, p0, Lkotlin/jvm/internal/aa;->bhI: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;->bhN:Ljava/util/ArrayList;
+    iget-object v0, p0, Lkotlin/jvm/internal/aa;->bhI: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 e6dab49678..38258a8e42 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 bhv:Lkotlin/jvm/internal/c$a;
+.field private static final bhq: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;->bhv:Lkotlin/jvm/internal/c$a;
+    sput-object v0, Lkotlin/jvm/internal/c$a;->bhq:Lkotlin/jvm/internal/c$a;
 
     return-void
 .end method
@@ -42,10 +42,10 @@
     return-void
 .end method
 
-.method static synthetic CZ()Lkotlin/jvm/internal/c$a;
+.method static synthetic CX()Lkotlin/jvm/internal/c$a;
     .locals 1
 
-    sget-object v0, Lkotlin/jvm/internal/c$a;->bhv:Lkotlin/jvm/internal/c$a;
+    sget-object v0, Lkotlin/jvm/internal/c$a;->bhq:Lkotlin/jvm/internal/c$a;
 
     return-object v0
 .end method
@@ -58,7 +58,7 @@
         }
     .end annotation
 
-    sget-object v0, Lkotlin/jvm/internal/c$a;->bhv:Lkotlin/jvm/internal/c$a;
+    sget-object v0, Lkotlin/jvm/internal/c$a;->bhq: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 f4c4cc91c4..07f3aac7ae 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 bhw:Ljava/lang/Class;
+.field private final bhr: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;->bhw:Ljava/lang/Class;
+    iput-object p1, p0, Lkotlin/jvm/internal/e;->bhr:Ljava/lang/Class;
 
     return-void
 .end method
@@ -117,7 +117,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lkotlin/jvm/internal/e;->bhw:Ljava/lang/Class;
+    iget-object v0, p0, Lkotlin/jvm/internal/e;->bhr: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 9da21a61e8..df7257134b 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 bhx:[Ljava/lang/Object;
+.field private static final bhs:[Ljava/lang/Object;
 
 
 # direct methods
@@ -15,7 +15,7 @@
 
     new-array v0, v0, [Ljava/lang/Object;
 
-    sput-object v0, Lkotlin/jvm/internal/f;->bhx:[Ljava/lang/Object;
+    sput-object v0, Lkotlin/jvm/internal/f;->bhs:[Ljava/lang/Object;
 
     return-void
 .end method
@@ -41,7 +41,7 @@
 
     if-nez v0, :cond_0
 
-    sget-object p0, Lkotlin/jvm/internal/f;->bhx:[Ljava/lang/Object;
+    sget-object p0, Lkotlin/jvm/internal/f;->bhs:[Ljava/lang/Object;
 
     return-object p0
 
@@ -56,7 +56,7 @@
 
     if-nez v1, :cond_1
 
-    sget-object p0, Lkotlin/jvm/internal/f;->bhx:[Ljava/lang/Object;
+    sget-object p0, Lkotlin/jvm/internal/f;->bhs:[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 56f7312638..6efb6cf57c 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 bhA:D = Infinity
+.field private static final bht:D = 4.9E-324
 
 # The value of this static final field might be set in the static constructor
-.field private static final bhB:D = -Infinity
+.field private static final bhu:D = 1.7976931348623157E308
 
 # The value of this static final field might be set in the static constructor
-.field private static final bhC:D = NaN
-
-.field public static final bhD:Lkotlin/jvm/internal/g;
+.field private static final bhv:D = Infinity
 
 # The value of this static final field might be set in the static constructor
-.field private static final bhy:D = 4.9E-324
+.field private static final bhw:D = -Infinity
 
 # The value of this static final field might be set in the static constructor
-.field private static final bhz:D = 1.7976931348623157E308
+.field private static final bhx:D = NaN
+
+.field public static final bhy:Lkotlin/jvm/internal/g;
 
 
 # direct methods
@@ -30,27 +30,27 @@
 
     invoke-direct {v0}, Lkotlin/jvm/internal/g;-><init>()V
 
-    sput-object v0, Lkotlin/jvm/internal/g;->bhD:Lkotlin/jvm/internal/g;
+    sput-object v0, Lkotlin/jvm/internal/g;->bhy:Lkotlin/jvm/internal/g;
 
     const-wide/16 v0, 0x1
 
-    sput-wide v0, Lkotlin/jvm/internal/g;->bhy:D
+    sput-wide v0, Lkotlin/jvm/internal/g;->bht:D
 
     const-wide v0, 0x7fefffffffffffffL    # Double.MAX_VALUE
 
-    sput-wide v0, Lkotlin/jvm/internal/g;->bhz:D
+    sput-wide v0, Lkotlin/jvm/internal/g;->bhu:D
 
     const-wide/high16 v0, 0x7ff0000000000000L    # Double.POSITIVE_INFINITY
 
-    sput-wide v0, Lkotlin/jvm/internal/g;->bhA:D
+    sput-wide v0, Lkotlin/jvm/internal/g;->bhv:D
 
     const-wide/high16 v0, -0x10000000000000L    # Double.NEGATIVE_INFINITY
 
-    sput-wide v0, Lkotlin/jvm/internal/g;->bhB:D
+    sput-wide v0, Lkotlin/jvm/internal/g;->bhw:D
 
     const-wide/high16 v0, 0x7ff8000000000000L    # Double.NaN
 
-    sput-wide v0, Lkotlin/jvm/internal/g;->bhC:D
+    sput-wide v0, Lkotlin/jvm/internal/g;->bhx:D
 
     return-void
 .end method
@@ -68,7 +68,7 @@
 .method public final getNaN()D
     .locals 2
 
-    sget-wide v0, Lkotlin/jvm/internal/g;->bhC:D
+    sget-wide v0, Lkotlin/jvm/internal/g;->bhx: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 a4b82060d1..be133bd4d7 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 bhE:F = 1.4E-45f
+.field private static final bhA:F = 3.4028235E38f
 
 # The value of this static final field might be set in the static constructor
-.field private static final bhF:F = 3.4028235E38f
+.field private static final bhB:F = Infinityf
 
 # The value of this static final field might be set in the static constructor
-.field private static final bhG:F = Infinityf
+.field private static final bhC:F = -Infinityf
 
 # The value of this static final field might be set in the static constructor
-.field private static final bhH:F = -Infinityf
+.field private static final bhD:F = NaNf
+
+.field public static final bhE:Lkotlin/jvm/internal/h;
 
 # The value of this static final field might be set in the static constructor
-.field private static final bhI:F = NaNf
-
-.field public static final bhJ:Lkotlin/jvm/internal/h;
+.field private static final bhz:F = 1.4E-45f
 
 
 # direct methods
@@ -30,27 +30,27 @@
 
     invoke-direct {v0}, Lkotlin/jvm/internal/h;-><init>()V
 
-    sput-object v0, Lkotlin/jvm/internal/h;->bhJ:Lkotlin/jvm/internal/h;
+    sput-object v0, Lkotlin/jvm/internal/h;->bhE:Lkotlin/jvm/internal/h;
 
     const/4 v0, 0x1
 
-    sput v0, Lkotlin/jvm/internal/h;->bhE:F
+    sput v0, Lkotlin/jvm/internal/h;->bhz:F
 
     const v0, 0x7f7fffff    # Float.MAX_VALUE
 
-    sput v0, Lkotlin/jvm/internal/h;->bhF:F
+    sput v0, Lkotlin/jvm/internal/h;->bhA:F
 
     const/high16 v0, 0x7f800000    # Float.POSITIVE_INFINITY
 
-    sput v0, Lkotlin/jvm/internal/h;->bhG:F
+    sput v0, Lkotlin/jvm/internal/h;->bhB:F
 
     const/high16 v0, -0x800000    # Float.NEGATIVE_INFINITY
 
-    sput v0, Lkotlin/jvm/internal/h;->bhH:F
+    sput v0, Lkotlin/jvm/internal/h;->bhC:F
 
     const/high16 v0, 0x7fc00000    # Float.NaN
 
-    sput v0, Lkotlin/jvm/internal/h;->bhI:F
+    sput v0, Lkotlin/jvm/internal/h;->bhD:F
 
     return-void
 .end method
@@ -68,7 +68,7 @@
 .method public final getMAX_VALUE()F
     .locals 1
 
-    sget v0, Lkotlin/jvm/internal/h;->bhF:F
+    sget v0, Lkotlin/jvm/internal/h;->bhA: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 9c0255f51b..d98c470f5a 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 bhK:Ljava/lang/String;
+.field private final bhF:Ljava/lang/String;
 
-.field private final bhw:Ljava/lang/Class;
+.field private final bhr: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;->bhw:Ljava/lang/Class;
+    iput-object p1, p0, Lkotlin/jvm/internal/s;->bhr:Ljava/lang/Class;
 
-    iput-object p2, p0, Lkotlin/jvm/internal/s;->bhK:Ljava/lang/String;
+    iput-object p2, p0, Lkotlin/jvm/internal/s;->bhF:Ljava/lang/String;
 
     return-void
 .end method
@@ -94,7 +94,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lkotlin/jvm/internal/s;->bhw:Ljava/lang/Class;
+    iget-object v0, p0, Lkotlin/jvm/internal/s;->bhr: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 261bac8ac3..45182f96fe 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 bhL:Lkotlin/jvm/internal/z;
+.field private static final bhG:Lkotlin/jvm/internal/z;
 
-.field private static final bhM:[Lkotlin/reflect/b;
+.field private static final bhH:[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;->bhL:Lkotlin/jvm/internal/z;
+    sput-object v0, Lkotlin/jvm/internal/y;->bhG:Lkotlin/jvm/internal/z;
 
     const/4 v0, 0x0
 
     new-array v0, v0, [Lkotlin/reflect/b;
 
-    sput-object v0, Lkotlin/jvm/internal/y;->bhM:[Lkotlin/reflect/b;
+    sput-object v0, Lkotlin/jvm/internal/y;->bhH:[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;->bhL:Lkotlin/jvm/internal/z;
+    sget-object v0, Lkotlin/jvm/internal/y;->bhG: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;->bhL:Lkotlin/jvm/internal/z;
+    sget-object v0, Lkotlin/jvm/internal/y;->bhG: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;->bhL:Lkotlin/jvm/internal/z;
+    sget-object v0, Lkotlin/jvm/internal/y;->bhG: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;->bhL:Lkotlin/jvm/internal/z;
+    sget-object v0, Lkotlin/jvm/internal/y;->bhG: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;->bhL:Lkotlin/jvm/internal/z;
+    sget-object v0, Lkotlin/jvm/internal/y;->bhG: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;->bhL:Lkotlin/jvm/internal/z;
+    sget-object v0, Lkotlin/jvm/internal/y;->bhG: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;->bhL:Lkotlin/jvm/internal/z;
+    sget-object v0, Lkotlin/jvm/internal/y;->bhG: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;->bhL:Lkotlin/jvm/internal/z;
+    sget-object v0, Lkotlin/jvm/internal/y;->bhG: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;->bhL:Lkotlin/jvm/internal/z;
+    sget-object v0, Lkotlin/jvm/internal/y;->bhG: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 87a3e7c7ab..a9e2877a09 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 bgv:Lkotlin/m$a;
+.field public static final bgq: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;->bgv:Lkotlin/m$a;
+    sput-object v0, Lkotlin/m;->bgq: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 0cbb4bac20..3351eb7896 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 bgw:Lkotlin/o$a;
+.field public static final bgr: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;->bgw:Lkotlin/o$a;
+    sput-object v0, Lkotlin/o;->bgr: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;->bgx:Lkotlin/s;
+    sget-object p1, Lkotlin/s;->bgs:Lkotlin/s;
 
     iput-object p1, p0, Lkotlin/o;->_value:Ljava/lang/Object;
 
-    sget-object p1, Lkotlin/s;->bgx:Lkotlin/s;
+    sget-object p1, Lkotlin/s;->bgs: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;->bgx:Lkotlin/s;
+    sget-object v1, Lkotlin/s;->bgs: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;->bgx:Lkotlin/s;
+    sget-object v2, Lkotlin/s;->bgs: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;->bgx:Lkotlin/s;
+    sget-object v1, Lkotlin/s;->bgs: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 e845fa38fa..9408c2033d 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;->bgx:Lkotlin/s;
+    sget-object p1, Lkotlin/s;->bgs: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;->bgx:Lkotlin/s;
+    sget-object v1, Lkotlin/s;->bgs: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;->bgx:Lkotlin/s;
+    sget-object v2, Lkotlin/s;->bgs: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;->bgx:Lkotlin/s;
+    sget-object v1, Lkotlin/s;->bgs: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 5f79254c25..9226a6b3d5 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 bhP:Lkotlin/properties/a;
+.field public static final bhK:Lkotlin/properties/a;
 
 
 # direct methods
@@ -15,7 +15,7 @@
 
     invoke-direct {v0}, Lkotlin/properties/a;-><init>()V
 
-    sput-object v0, Lkotlin/properties/a;->bhP:Lkotlin/properties/a;
+    sput-object v0, Lkotlin/properties/a;->bhK: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 55620e4e08..f9a12bc24e 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 big:Lkotlin/reflect/KVisibility;
+.field public static final enum bib:Lkotlin/reflect/KVisibility;
 
-.field public static final enum bih:Lkotlin/reflect/KVisibility;
+.field public static final enum bic:Lkotlin/reflect/KVisibility;
 
-.field public static final enum bii:Lkotlin/reflect/KVisibility;
+.field public static final enum bid:Lkotlin/reflect/KVisibility;
 
-.field public static final enum bij:Lkotlin/reflect/KVisibility;
+.field public static final enum bie:Lkotlin/reflect/KVisibility;
 
-.field private static final synthetic bik:[Lkotlin/reflect/KVisibility;
+.field private static final synthetic bif:[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;->big:Lkotlin/reflect/KVisibility;
+    sput-object v1, Lkotlin/reflect/KVisibility;->bib: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;->bih:Lkotlin/reflect/KVisibility;
+    sput-object v1, Lkotlin/reflect/KVisibility;->bic: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;->bii:Lkotlin/reflect/KVisibility;
+    sput-object v1, Lkotlin/reflect/KVisibility;->bid: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;->bij:Lkotlin/reflect/KVisibility;
+    sput-object v1, Lkotlin/reflect/KVisibility;->bie:Lkotlin/reflect/KVisibility;
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lkotlin/reflect/KVisibility;->bik:[Lkotlin/reflect/KVisibility;
+    sput-object v0, Lkotlin/reflect/KVisibility;->bif:[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;->bik:[Lkotlin/reflect/KVisibility;
+    sget-object v0, Lkotlin/reflect/KVisibility;->bif:[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 2c8e240b9c..828b6f6dae 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 bgx:Lkotlin/s;
+.field public static final bgs:Lkotlin/s;
 
 
 # direct methods
@@ -15,7 +15,7 @@
 
     invoke-direct {v0}, Lkotlin/s;-><init>()V
 
-    sput-object v0, Lkotlin/s;->bgx:Lkotlin/s;
+    sput-object v0, Lkotlin/s;->bgs: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 4f06da07d5..1a9cd96d1a 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 bil:Ljava/util/HashSet;
+.field private final big:Ljava/util/HashSet;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/HashSet<",
@@ -27,7 +27,7 @@
     .end annotation
 .end field
 
-.field private final bim:Ljava/util/Iterator;
+.field private final bih:Ljava/util/Iterator;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Iterator<",
@@ -36,7 +36,7 @@
     .end annotation
 .end field
 
-.field private final bin:Lkotlin/jvm/functions/Function1;
+.field private final bii: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;->bim:Ljava/util/Iterator;
+    iput-object p1, p0, Lkotlin/sequences/a;->bih:Ljava/util/Iterator;
 
-    iput-object p2, p0, Lkotlin/sequences/a;->bin:Lkotlin/jvm/functions/Function1;
+    iput-object p2, p0, Lkotlin/sequences/a;->bii: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;->bil:Ljava/util/HashSet;
+    iput-object p1, p0, Lkotlin/sequences/a;->big:Ljava/util/HashSet;
 
     return-void
 .end method
@@ -88,7 +88,7 @@
     .locals 3
 
     :cond_0
-    iget-object v0, p0, Lkotlin/sequences/a;->bim:Ljava/util/Iterator;
+    iget-object v0, p0, Lkotlin/sequences/a;->bih: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;->bim:Ljava/util/Iterator;
+    iget-object v0, p0, Lkotlin/sequences/a;->bih:Ljava/util/Iterator;
 
     invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
     move-result-object v0
 
-    iget-object v1, p0, Lkotlin/sequences/a;->bin:Lkotlin/jvm/functions/Function1;
+    iget-object v1, p0, Lkotlin/sequences/a;->bii: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;->bil:Ljava/util/HashSet;
+    iget-object v2, p0, Lkotlin/sequences/a;->big: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 7337e5d92f..aecd25bb0d 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 bin:Lkotlin/jvm/functions/Function1;
+.field private final bii: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 bio:Lkotlin/sequences/Sequence;
+.field private final bij: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;->bio:Lkotlin/sequences/Sequence;
+    iput-object p1, p0, Lkotlin/sequences/b;->bij:Lkotlin/sequences/Sequence;
 
-    iput-object p2, p0, Lkotlin/sequences/b;->bin:Lkotlin/jvm/functions/Function1;
+    iput-object p2, p0, Lkotlin/sequences/b;->bii: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;->bio:Lkotlin/sequences/Sequence;
+    iget-object v1, p0, Lkotlin/sequences/b;->bij:Lkotlin/sequences/Sequence;
 
     invoke-interface {v1}, Lkotlin/sequences/Sequence;->iterator()Ljava/util/Iterator;
 
     move-result-object v1
 
-    iget-object v2, p0, Lkotlin/sequences/b;->bin:Lkotlin/jvm/functions/Function1;
+    iget-object v2, p0, Lkotlin/sequences/b;->bii: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 3c13dca106..cb2edad340 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 acH:Ljava/util/Iterator;
+.field private final acD:Ljava/util/Iterator;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Iterator<",
@@ -37,7 +37,7 @@
     .end annotation
 .end field
 
-.field final synthetic biq:Lkotlin/sequences/c;
+.field final synthetic bil:Lkotlin/sequences/c;
 
 .field private left:I
 
@@ -51,7 +51,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lkotlin/sequences/c$a;->biq:Lkotlin/sequences/c;
+    iput-object p1, p0, Lkotlin/sequences/c$a;->bil: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;->acH:Ljava/util/Iterator;
+    iput-object v0, p0, Lkotlin/sequences/c$a;->acD: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 Da()V
+.method private final CY()V
     .locals 1
 
     :goto_0
@@ -82,7 +82,7 @@
 
     if-lez v0, :cond_0
 
-    iget-object v0, p0, Lkotlin/sequences/c$a;->acH:Ljava/util/Iterator;
+    iget-object v0, p0, Lkotlin/sequences/c$a;->acD: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;->acH:Ljava/util/Iterator;
+    iget-object v0, p0, Lkotlin/sequences/c$a;->acD: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;->Da()V
+    invoke-direct {p0}, Lkotlin/sequences/c$a;->CY()V
 
-    iget-object v0, p0, Lkotlin/sequences/c$a;->acH:Ljava/util/Iterator;
+    iget-object v0, p0, Lkotlin/sequences/c$a;->acD:Ljava/util/Iterator;
 
     invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
 
@@ -130,9 +130,9 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lkotlin/sequences/c$a;->Da()V
+    invoke-direct {p0}, Lkotlin/sequences/c$a;->CY()V
 
-    iget-object v0, p0, Lkotlin/sequences/c$a;->acH:Ljava/util/Iterator;
+    iget-object v0, p0, Lkotlin/sequences/c$a;->acD: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 eee2c1aef7..2125445a08 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 bip:Lkotlin/sequences/Sequence;
+.field private final bik: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;->bip:Lkotlin/sequences/Sequence;
+    iput-object p1, p0, Lkotlin/sequences/c;->bik: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;->bip:Lkotlin/sequences/Sequence;
+    iget-object p0, p0, Lkotlin/sequences/c;->bik: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;->bip:Lkotlin/sequences/Sequence;
+    iget-object v1, p0, Lkotlin/sequences/c;->bik: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;->bip:Lkotlin/sequences/Sequence;
+    iget-object v2, p0, Lkotlin/sequences/c;->bik: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 4882cba272..a836d45b65 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 bir:Lkotlin/sequences/e;
+.field public static final bim:Lkotlin/sequences/e;
 
 
 # direct methods
@@ -19,7 +19,7 @@
 
     invoke-direct {v0}, Lkotlin/sequences/e;-><init>()V
 
-    sput-object v0, Lkotlin/sequences/e;->bir:Lkotlin/sequences/e;
+    sput-object v0, Lkotlin/sequences/e;->bim: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;->bir:Lkotlin/sequences/e;
+    sget-object p1, Lkotlin/sequences/e;->bim: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;->bgM:Lkotlin/a/x;
+    sget-object v0, Lkotlin/a/x;->bgH: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;->bir:Lkotlin/sequences/e;
+    sget-object p1, Lkotlin/sequences/e;->bim: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 b52978a896..1ee0cf3140 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 acH:Ljava/util/Iterator;
+.field private final acD:Ljava/util/Iterator;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Iterator<",
@@ -37,9 +37,9 @@
     .end annotation
 .end field
 
-.field private biu:I
+.field private bip:I
 
-.field private biv:Ljava/lang/Object;
+.field private biq:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TT;"
@@ -47,7 +47,7 @@
     .end annotation
 .end field
 
-.field final synthetic biw:Lkotlin/sequences/f;
+.field final synthetic bir:Lkotlin/sequences/f;
 
 
 # direct methods
@@ -59,7 +59,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lkotlin/sequences/f$a;->biw:Lkotlin/sequences/f;
+    iput-object p1, p0, Lkotlin/sequences/f$a;->bir: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;->acH:Ljava/util/Iterator;
+    iput-object p1, p0, Lkotlin/sequences/f$a;->acD:Ljava/util/Iterator;
 
     const/4 p1, -0x1
 
-    iput p1, p0, Lkotlin/sequences/f$a;->biu:I
+    iput p1, p0, Lkotlin/sequences/f$a;->bip:I
 
     return-void
 .end method
 
-.method private final Db()V
+.method private final CZ()V
     .locals 3
 
     :cond_0
-    iget-object v0, p0, Lkotlin/sequences/f$a;->acH:Ljava/util/Iterator;
+    iget-object v0, p0, Lkotlin/sequences/f$a;->acD: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;->acH:Ljava/util/Iterator;
+    iget-object v0, p0, Lkotlin/sequences/f$a;->acD: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;->biw:Lkotlin/sequences/f;
+    iget-object v1, p0, Lkotlin/sequences/f$a;->bir: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;->biw:Lkotlin/sequences/f;
+    iget-object v2, p0, Lkotlin/sequences/f$a;->bir: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;->biv:Ljava/lang/Object;
+    iput-object v0, p0, Lkotlin/sequences/f$a;->biq:Ljava/lang/Object;
 
     const/4 v0, 0x1
 
-    iput v0, p0, Lkotlin/sequences/f$a;->biu:I
+    iput v0, p0, Lkotlin/sequences/f$a;->bip:I
 
     return-void
 
     :cond_1
     const/4 v0, 0x0
 
-    iput v0, p0, Lkotlin/sequences/f$a;->biu:I
+    iput v0, p0, Lkotlin/sequences/f$a;->bip:I
 
     return-void
 .end method
@@ -143,16 +143,16 @@
 .method public final hasNext()Z
     .locals 2
 
-    iget v0, p0, Lkotlin/sequences/f$a;->biu:I
+    iget v0, p0, Lkotlin/sequences/f$a;->bip:I
 
     const/4 v1, -0x1
 
     if-ne v0, v1, :cond_0
 
-    invoke-direct {p0}, Lkotlin/sequences/f$a;->Db()V
+    invoke-direct {p0}, Lkotlin/sequences/f$a;->CZ()V
 
     :cond_0
-    iget v0, p0, Lkotlin/sequences/f$a;->biu:I
+    iget v0, p0, Lkotlin/sequences/f$a;->bip:I
 
     const/4 v1, 0x1
 
@@ -174,26 +174,26 @@
         }
     .end annotation
 
-    iget v0, p0, Lkotlin/sequences/f$a;->biu:I
+    iget v0, p0, Lkotlin/sequences/f$a;->bip:I
 
     const/4 v1, -0x1
 
     if-ne v0, v1, :cond_0
 
-    invoke-direct {p0}, Lkotlin/sequences/f$a;->Db()V
+    invoke-direct {p0}, Lkotlin/sequences/f$a;->CZ()V
 
     :cond_0
-    iget v0, p0, Lkotlin/sequences/f$a;->biu:I
+    iget v0, p0, Lkotlin/sequences/f$a;->bip:I
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lkotlin/sequences/f$a;->biv:Ljava/lang/Object;
+    iget-object v0, p0, Lkotlin/sequences/f$a;->biq:Ljava/lang/Object;
 
     const/4 v2, 0x0
 
-    iput-object v2, p0, Lkotlin/sequences/f$a;->biv:Ljava/lang/Object;
+    iput-object v2, p0, Lkotlin/sequences/f$a;->biq:Ljava/lang/Object;
 
-    iput v1, p0, Lkotlin/sequences/f$a;->biu:I
+    iput v1, p0, Lkotlin/sequences/f$a;->bip: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 699177f761..8fec3fe5e7 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 bip:Lkotlin/sequences/Sequence;
+.field private final bik:Lkotlin/sequences/Sequence;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/sequences/Sequence<",
@@ -29,9 +29,9 @@
     .end annotation
 .end field
 
-.field private final bis:Z
+.field private final bin:Z
 
-.field private final bit:Lkotlin/jvm/functions/Function1;
+.field private final bio: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;->bip:Lkotlin/sequences/Sequence;
+    iput-object p1, p0, Lkotlin/sequences/f;->bik:Lkotlin/sequences/Sequence;
 
-    iput-boolean p2, p0, Lkotlin/sequences/f;->bis:Z
+    iput-boolean p2, p0, Lkotlin/sequences/f;->bin:Z
 
-    iput-object p3, p0, Lkotlin/sequences/f;->bit:Lkotlin/jvm/functions/Function1;
+    iput-object p3, p0, Lkotlin/sequences/f;->bio: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;->bit:Lkotlin/jvm/functions/Function1;
+    iget-object p0, p0, Lkotlin/sequences/f;->bio: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;->bis:Z
+    iget-boolean p0, p0, Lkotlin/sequences/f;->bin: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;->bip:Lkotlin/sequences/Sequence;
+    iget-object p0, p0, Lkotlin/sequences/f;->bik: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 eb3c76edad..3c9388e03e 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 acH:Ljava/util/Iterator;
+.field private final acD:Ljava/util/Iterator;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Iterator<",
@@ -37,9 +37,7 @@
     .end annotation
 .end field
 
-.field final synthetic biA:Lkotlin/sequences/g;
-
-.field private biz:Ljava/util/Iterator;
+.field private biu:Ljava/util/Iterator;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Iterator<",
@@ -48,6 +46,8 @@
     .end annotation
 .end field
 
+.field final synthetic biv: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;->biA:Lkotlin/sequences/g;
+    iput-object p1, p0, Lkotlin/sequences/g$a;->biv: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;->acH:Ljava/util/Iterator;
+    iput-object p1, p0, Lkotlin/sequences/g$a;->acD:Ljava/util/Iterator;
 
     return-void
 .end method
 
-.method private final Dc()Z
+.method private final Da()Z
     .locals 4
 
-    iget-object v0, p0, Lkotlin/sequences/g$a;->biz:Ljava/util/Iterator;
+    iget-object v0, p0, Lkotlin/sequences/g$a;->biu:Ljava/util/Iterator;
 
     if-eqz v0, :cond_0
 
@@ -90,16 +90,16 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lkotlin/sequences/g$a;->biz:Ljava/util/Iterator;
+    iput-object v0, p0, Lkotlin/sequences/g$a;->biu:Ljava/util/Iterator;
 
     :cond_0
-    iget-object v0, p0, Lkotlin/sequences/g$a;->biz:Ljava/util/Iterator;
+    iget-object v0, p0, Lkotlin/sequences/g$a;->biu:Ljava/util/Iterator;
 
     const/4 v1, 0x1
 
     if-nez v0, :cond_2
 
-    iget-object v0, p0, Lkotlin/sequences/g$a;->acH:Ljava/util/Iterator;
+    iget-object v0, p0, Lkotlin/sequences/g$a;->acD: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;->acH:Ljava/util/Iterator;
+    iget-object v0, p0, Lkotlin/sequences/g$a;->acD: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;->biA:Lkotlin/sequences/g;
+    iget-object v2, p0, Lkotlin/sequences/g$a;->biv: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;->biA:Lkotlin/sequences/g;
+    iget-object v3, p0, Lkotlin/sequences/g$a;->biv: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;->biz:Ljava/util/Iterator;
+    iput-object v0, p0, Lkotlin/sequences/g$a;->biu: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;->Dc()Z
+    invoke-direct {p0}, Lkotlin/sequences/g$a;->Da()Z
 
     move-result v0
 
@@ -172,13 +172,13 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lkotlin/sequences/g$a;->Dc()Z
+    invoke-direct {p0}, Lkotlin/sequences/g$a;->Da()Z
 
     move-result v0
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lkotlin/sequences/g$a;->biz:Ljava/util/Iterator;
+    iget-object v0, p0, Lkotlin/sequences/g$a;->biu: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 da02f9c93d..07c29f80c5 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 bip:Lkotlin/sequences/Sequence;
+.field private final bik:Lkotlin/sequences/Sequence;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/sequences/Sequence<",
@@ -33,7 +33,7 @@
     .end annotation
 .end field
 
-.field private final bix:Lkotlin/jvm/functions/Function1;
+.field private final bis: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 biy:Lkotlin/jvm/functions/Function1;
+.field private final bit: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;->bip:Lkotlin/sequences/Sequence;
+    iput-object p1, p0, Lkotlin/sequences/g;->bik:Lkotlin/sequences/Sequence;
 
-    iput-object p2, p0, Lkotlin/sequences/g;->bix:Lkotlin/jvm/functions/Function1;
+    iput-object p2, p0, Lkotlin/sequences/g;->bis:Lkotlin/jvm/functions/Function1;
 
-    iput-object p3, p0, Lkotlin/sequences/g;->biy:Lkotlin/jvm/functions/Function1;
+    iput-object p3, p0, Lkotlin/sequences/g;->bit: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;->biy:Lkotlin/jvm/functions/Function1;
+    iget-object p0, p0, Lkotlin/sequences/g;->bit: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;->bip:Lkotlin/sequences/Sequence;
+    iget-object p0, p0, Lkotlin/sequences/g;->bik: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;->bix:Lkotlin/jvm/functions/Function1;
+    iget-object p0, p0, Lkotlin/sequences/g;->bis: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 f128e712e9..f4a2b4a58e 100644
--- a/com.discord/smali_classes2/kotlin/sequences/h$a.smali
+++ b/com.discord/smali_classes2/kotlin/sequences/h$a.smali
@@ -28,11 +28,9 @@
 
 
 # instance fields
-.field final synthetic biD:Lkotlin/sequences/h;
+.field private bip:I
 
-.field private biu:I
-
-.field private biv:Ljava/lang/Object;
+.field private biq:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TT;"
@@ -40,6 +38,8 @@
     .end annotation
 .end field
 
+.field final synthetic biy: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;->biD:Lkotlin/sequences/h;
+    iput-object p1, p0, Lkotlin/sequences/h$a;->biy:Lkotlin/sequences/h;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     const/4 p1, -0x2
 
-    iput p1, p0, Lkotlin/sequences/h$a;->biu:I
+    iput p1, p0, Lkotlin/sequences/h$a;->bip:I
 
     return-void
 .end method
 
-.method private final Db()V
+.method private final CZ()V
     .locals 2
 
-    iget v0, p0, Lkotlin/sequences/h$a;->biu:I
+    iget v0, p0, Lkotlin/sequences/h$a;->bip:I
 
     const/4 v1, -0x2
 
     if-ne v0, v1, :cond_0
 
-    iget-object v0, p0, Lkotlin/sequences/h$a;->biD:Lkotlin/sequences/h;
+    iget-object v0, p0, Lkotlin/sequences/h$a;->biy: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;->biD:Lkotlin/sequences/h;
+    iget-object v0, p0, Lkotlin/sequences/h$a;->biy: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;->biv:Ljava/lang/Object;
+    iget-object v1, p0, Lkotlin/sequences/h$a;->biq: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;->biv:Ljava/lang/Object;
+    iput-object v0, p0, Lkotlin/sequences/h$a;->biq:Ljava/lang/Object;
 
-    iget-object v0, p0, Lkotlin/sequences/h$a;->biv:Ljava/lang/Object;
+    iget-object v0, p0, Lkotlin/sequences/h$a;->biq: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;->biu:I
+    iput v0, p0, Lkotlin/sequences/h$a;->bip:I
 
     return-void
 .end method
@@ -125,14 +125,14 @@
 .method public final hasNext()Z
     .locals 2
 
-    iget v0, p0, Lkotlin/sequences/h$a;->biu:I
+    iget v0, p0, Lkotlin/sequences/h$a;->bip:I
 
     if-gez v0, :cond_0
 
-    invoke-direct {p0}, Lkotlin/sequences/h$a;->Db()V
+    invoke-direct {p0}, Lkotlin/sequences/h$a;->CZ()V
 
     :cond_0
-    iget v0, p0, Lkotlin/sequences/h$a;->biu:I
+    iget v0, p0, Lkotlin/sequences/h$a;->bip:I
 
     const/4 v1, 0x1
 
@@ -154,24 +154,24 @@
         }
     .end annotation
 
-    iget v0, p0, Lkotlin/sequences/h$a;->biu:I
+    iget v0, p0, Lkotlin/sequences/h$a;->bip:I
 
     if-gez v0, :cond_0
 
-    invoke-direct {p0}, Lkotlin/sequences/h$a;->Db()V
+    invoke-direct {p0}, Lkotlin/sequences/h$a;->CZ()V
 
     :cond_0
-    iget v0, p0, Lkotlin/sequences/h$a;->biu:I
+    iget v0, p0, Lkotlin/sequences/h$a;->bip:I
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lkotlin/sequences/h$a;->biv:Ljava/lang/Object;
+    iget-object v0, p0, Lkotlin/sequences/h$a;->biq:Ljava/lang/Object;
 
     if-eqz v0, :cond_1
 
     const/4 v1, -0x1
 
-    iput v1, p0, Lkotlin/sequences/h$a;->biu:I
+    iput v1, p0, Lkotlin/sequences/h$a;->bip: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 89661e86d9..4f4f97ad1b 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 biB:Lkotlin/jvm/functions/Function0;
+.field private final biw: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 biC:Lkotlin/jvm/functions/Function1;
+.field private final bix: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;->biB:Lkotlin/jvm/functions/Function0;
+    iput-object p1, p0, Lkotlin/sequences/h;->biw:Lkotlin/jvm/functions/Function0;
 
-    iput-object p2, p0, Lkotlin/sequences/h;->biC:Lkotlin/jvm/functions/Function1;
+    iput-object p2, p0, Lkotlin/sequences/h;->bix: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;->biB:Lkotlin/jvm/functions/Function0;
+    iget-object p0, p0, Lkotlin/sequences/h;->biw: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;->biC:Lkotlin/jvm/functions/Function1;
+    iget-object p0, p0, Lkotlin/sequences/h;->bix: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 9b8dd4e0c1..8b6ab095ac 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 biE:Lkotlin/sequences/l$a;
+.field public static final biz: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;->biE:Lkotlin/sequences/l$a;
+    sput-object v0, Lkotlin/sequences/l$a;->biz: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 84bdbed204..d38d0aa0d4 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 biF:Lkotlin/sequences/l$b;
+.field public static final biA: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;->biF:Lkotlin/sequences/l$b;
+    sput-object v0, Lkotlin/sequences/l$b;->biA: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 badf6210a1..ecd089c8dc 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 biG:Lkotlin/sequences/l$c;
+.field public static final biB: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;->biG:Lkotlin/sequences/l$c;
+    sput-object v0, Lkotlin/sequences/l$c;->biB: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 3189a7d6a8..47f099b3d3 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 biH:Lkotlin/sequences/Sequence;
+.field final synthetic biC:Lkotlin/sequences/Sequence;
 
 
 # direct methods
 .method public constructor <init>(Lkotlin/sequences/Sequence;)V
     .locals 0
 
-    iput-object p1, p0, Lkotlin/sequences/n$a;->biH:Lkotlin/sequences/Sequence;
+    iput-object p1, p0, Lkotlin/sequences/n$a;->biC: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;->biH:Lkotlin/sequences/Sequence;
+    iget-object v0, p0, Lkotlin/sequences/n$a;->biC: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 d30d4cb23c..5d9b2cc96a 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 biI:Lkotlin/sequences/n$b;
+.field public static final biD: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;->biI:Lkotlin/sequences/n$b;
+    sput-object v0, Lkotlin/sequences/n$b;->biD: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 9dd4136ff0..c3f486660f 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 biJ:Lkotlin/sequences/n$c;
+.field public static final biE: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;->biJ:Lkotlin/sequences/n$c;
+    sput-object v0, Lkotlin/sequences/n$c;->biE: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 2580230d80..5200186fb3 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 biK:Lkotlin/sequences/Sequence;
+.field final synthetic biF:Lkotlin/sequences/Sequence;
 
 
 # direct methods
@@ -40,7 +40,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lkotlin/sequences/n$d;->biK:Lkotlin/sequences/Sequence;
+    iput-object p1, p0, Lkotlin/sequences/n$d;->biF: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;->biK:Lkotlin/sequences/Sequence;
+    iget-object v0, p0, Lkotlin/sequences/n$d;->biF: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 f61c9a8c49..a021e8b538 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 biL:Lkotlin/sequences/Sequence;
+.field final synthetic biG:Lkotlin/sequences/Sequence;
 
 
 # direct methods
@@ -44,7 +44,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lkotlin/sequences/n$e;->biL:Lkotlin/sequences/Sequence;
+    iput-object p1, p0, Lkotlin/sequences/n$e;->biG: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;->biL:Lkotlin/sequences/Sequence;
+    iget-object v0, p0, Lkotlin/sequences/n$e;->biG: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 4882214c06..94ebb82df2 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 acH:Ljava/util/Iterator;
+.field private final acD:Ljava/util/Iterator;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Iterator<",
@@ -37,7 +37,7 @@
     .end annotation
 .end field
 
-.field final synthetic biM:Lkotlin/sequences/o;
+.field final synthetic biH:Lkotlin/sequences/o;
 
 .field private position:I
 
@@ -51,7 +51,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lkotlin/sequences/o$a;->biM:Lkotlin/sequences/o;
+    iput-object p1, p0, Lkotlin/sequences/o$a;->biH: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;->acH:Ljava/util/Iterator;
+    iput-object p1, p0, Lkotlin/sequences/o$a;->acD:Ljava/util/Iterator;
 
     return-void
 .end method
 
-.method private final Da()V
+.method private final CY()V
     .locals 2
 
     :goto_0
     iget v0, p0, Lkotlin/sequences/o$a;->position:I
 
-    iget-object v1, p0, Lkotlin/sequences/o$a;->biM:Lkotlin/sequences/o;
+    iget-object v1, p0, Lkotlin/sequences/o$a;->biH: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;->acH:Ljava/util/Iterator;
+    iget-object v0, p0, Lkotlin/sequences/o$a;->acD: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;->acH:Ljava/util/Iterator;
+    iget-object v0, p0, Lkotlin/sequences/o$a;->acD: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;->Da()V
+    invoke-direct {p0}, Lkotlin/sequences/o$a;->CY()V
 
     iget v0, p0, Lkotlin/sequences/o$a;->position:I
 
-    iget-object v1, p0, Lkotlin/sequences/o$a;->biM:Lkotlin/sequences/o;
+    iget-object v1, p0, Lkotlin/sequences/o$a;->biH: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;->acH:Ljava/util/Iterator;
+    iget-object v0, p0, Lkotlin/sequences/o$a;->acD:Ljava/util/Iterator;
 
     invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
 
@@ -149,11 +149,11 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lkotlin/sequences/o$a;->Da()V
+    invoke-direct {p0}, Lkotlin/sequences/o$a;->CY()V
 
     iget v0, p0, Lkotlin/sequences/o$a;->position:I
 
-    iget-object v1, p0, Lkotlin/sequences/o$a;->biM:Lkotlin/sequences/o;
+    iget-object v1, p0, Lkotlin/sequences/o$a;->biH: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;->acH:Ljava/util/Iterator;
+    iget-object v0, p0, Lkotlin/sequences/o$a;->acD: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 95e58edf2f..c161c7454d 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 Bo:I
+.field private final Br:I
 
-.field private final bip:Lkotlin/sequences/Sequence;
+.field private final bik: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;->bip:Lkotlin/sequences/Sequence;
+    iput-object p1, p0, Lkotlin/sequences/o;->bik:Lkotlin/sequences/Sequence;
 
     iput p2, p0, Lkotlin/sequences/o;->startIndex:I
 
-    iput p3, p0, Lkotlin/sequences/o;->Bo:I
+    iput p3, p0, Lkotlin/sequences/o;->Br: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;->Bo:I
+    iget p1, p0, Lkotlin/sequences/o;->Br:I
 
     if-ltz p1, :cond_1
 
@@ -92,7 +92,7 @@
     :goto_1
     if-eqz p1, :cond_4
 
-    iget p1, p0, Lkotlin/sequences/o;->Bo:I
+    iget p1, p0, Lkotlin/sequences/o;->Br: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;->Bo:I
+    iget p2, p0, Lkotlin/sequences/o;->Br: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;->Bo:I
+    iget p2, p0, Lkotlin/sequences/o;->Br: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;->Bo:I
+    iget p0, p0, Lkotlin/sequences/o;->Br: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;->bip:Lkotlin/sequences/Sequence;
+    iget-object p0, p0, Lkotlin/sequences/o;->bik: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;->Bo:I
+    iget v0, p0, Lkotlin/sequences/o;->Br: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;->bip:Lkotlin/sequences/Sequence;
+    iget-object v1, p0, Lkotlin/sequences/o;->bik:Lkotlin/sequences/Sequence;
 
     iget v2, p0, Lkotlin/sequences/o;->startIndex:I
 
     add-int/2addr v2, p1
 
-    iget p1, p0, Lkotlin/sequences/o;->Bo:I
+    iget p1, p0, Lkotlin/sequences/o;->Br: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;->bip:Lkotlin/sequences/Sequence;
+    iget-object v1, p0, Lkotlin/sequences/o;->bik: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 0df02d80c4..319eb4a714 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 acH:Ljava/util/Iterator;
+.field private final acD:Ljava/util/Iterator;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Iterator<",
@@ -37,7 +37,7 @@
     .end annotation
 .end field
 
-.field final synthetic biN:Lkotlin/sequences/p;
+.field final synthetic biI:Lkotlin/sequences/p;
 
 .field private left:I
 
@@ -51,7 +51,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lkotlin/sequences/p$a;->biN:Lkotlin/sequences/p;
+    iput-object p1, p0, Lkotlin/sequences/p$a;->biI: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;->acH:Ljava/util/Iterator;
+    iput-object p1, p0, Lkotlin/sequences/p$a;->acD:Ljava/util/Iterator;
 
     return-void
 .end method
@@ -83,7 +83,7 @@
 
     if-lez v0, :cond_0
 
-    iget-object v0, p0, Lkotlin/sequences/p$a;->acH:Ljava/util/Iterator;
+    iget-object v0, p0, Lkotlin/sequences/p$a;->acD: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;->acH:Ljava/util/Iterator;
+    iget-object v0, p0, Lkotlin/sequences/p$a;->acD: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 f7fd5fc198..9a16f6de0c 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 bip:Lkotlin/sequences/Sequence;
+.field private final bik: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;->bip:Lkotlin/sequences/Sequence;
+    iput-object p1, p0, Lkotlin/sequences/p;->bik: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;->bip:Lkotlin/sequences/Sequence;
+    iget-object p0, p0, Lkotlin/sequences/p;->bik: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;->bip:Lkotlin/sequences/Sequence;
+    iget-object v2, p0, Lkotlin/sequences/p;->bik: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;->bip:Lkotlin/sequences/Sequence;
+    iget-object v1, p0, Lkotlin/sequences/p;->bik: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 840b896f69..82e0ab55d9 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 acH:Ljava/util/Iterator;
+.field private final acD:Ljava/util/Iterator;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Iterator<",
@@ -37,7 +37,7 @@
     .end annotation
 .end field
 
-.field final synthetic biO:Lkotlin/sequences/q;
+.field final synthetic biJ:Lkotlin/sequences/q;
 
 
 # direct methods
@@ -49,7 +49,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lkotlin/sequences/q$a;->biO:Lkotlin/sequences/q;
+    iput-object p1, p0, Lkotlin/sequences/q$a;->biJ: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;->acH:Ljava/util/Iterator;
+    iput-object p1, p0, Lkotlin/sequences/q$a;->acD: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;->acH:Ljava/util/Iterator;
+    iget-object v0, p0, Lkotlin/sequences/q$a;->acD: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;->biO:Lkotlin/sequences/q;
+    iget-object v0, p0, Lkotlin/sequences/q$a;->biJ: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;->acH:Ljava/util/Iterator;
+    iget-object v1, p0, Lkotlin/sequences/q$a;->acD: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 b4edb9cc3a..b20e98844b 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 bip:Lkotlin/sequences/Sequence;
+.field private final bik:Lkotlin/sequences/Sequence;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/sequences/Sequence<",
@@ -31,7 +31,7 @@
     .end annotation
 .end field
 
-.field private final bix:Lkotlin/jvm/functions/Function1;
+.field private final bis: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;->bip:Lkotlin/sequences/Sequence;
+    iput-object p1, p0, Lkotlin/sequences/q;->bik:Lkotlin/sequences/Sequence;
 
-    iput-object p2, p0, Lkotlin/sequences/q;->bix:Lkotlin/jvm/functions/Function1;
+    iput-object p2, p0, Lkotlin/sequences/q;->bis: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;->bip:Lkotlin/sequences/Sequence;
+    iget-object p0, p0, Lkotlin/sequences/q;->bik: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;->bix:Lkotlin/jvm/functions/Function1;
+    iget-object p0, p0, Lkotlin/sequences/q;->bis: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;->bip:Lkotlin/sequences/Sequence;
+    iget-object v1, p0, Lkotlin/sequences/q;->bik:Lkotlin/sequences/Sequence;
 
-    iget-object v2, p0, Lkotlin/sequences/q;->bix:Lkotlin/jvm/functions/Function1;
+    iget-object v2, p0, Lkotlin/sequences/q;->bis: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 c2222696d8..186fd9c028 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 bjf:Lkotlin/text/Regex$b$a;
+.field public static final bja: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;->bjf:Lkotlin/text/Regex$b$a;
+    sput-object v0, Lkotlin/text/Regex$b;->bja: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 8a5ee8c53d..bbf8b9e410 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 bjg:Lkotlin/text/Regex$d;
+.field public static final bjb: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;->bjg:Lkotlin/text/Regex$d;
+    sput-object v0, Lkotlin/text/Regex$d;->bjb: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 90c1fdce88..feec7c8a59 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 bje:Lkotlin/text/Regex$a;
+.field public static final biZ: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;->bje:Lkotlin/text/Regex$a;
+    sput-object v0, Lkotlin/text/Regex;->biZ: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;->bje:Lkotlin/text/Regex$a;
+    sget-object v0, Lkotlin/text/Regex;->biZ: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;->bjg:Lkotlin/text/Regex$d;
+    sget-object p1, Lkotlin/text/Regex$d;->bjb: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 633442c234..2a5bd9c6bd 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 biP:Ljava/nio/charset/Charset;
+.field public static final biK:Ljava/nio/charset/Charset;
 
-.field public static final biQ:Ljava/nio/charset/Charset;
+.field public static final biL:Ljava/nio/charset/Charset;
 
-.field public static final biR:Ljava/nio/charset/Charset;
+.field public static final biM:Ljava/nio/charset/Charset;
 
-.field public static final biS:Ljava/nio/charset/Charset;
+.field public static final biN:Ljava/nio/charset/Charset;
 
-.field public static final biT:Lkotlin/text/d;
+.field public static final biO:Lkotlin/text/d;
 
-.field public static final tw:Ljava/nio/charset/Charset;
+.field public static final tx:Ljava/nio/charset/Charset;
 
 
 # direct methods
@@ -27,7 +27,7 @@
 
     invoke-direct {v0}, Lkotlin/text/d;-><init>()V
 
-    sput-object v0, Lkotlin/text/d;->biT:Lkotlin/text/d;
+    sput-object v0, Lkotlin/text/d;->biO: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;->tw:Ljava/nio/charset/Charset;
+    sput-object v0, Lkotlin/text/d;->tx: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;->biP:Ljava/nio/charset/Charset;
+    sput-object v0, Lkotlin/text/d;->biK: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;->biQ:Ljava/nio/charset/Charset;
+    sput-object v0, Lkotlin/text/d;->biL: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;->biR:Ljava/nio/charset/Charset;
+    sput-object v0, Lkotlin/text/d;->biM: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;->biS:Ljava/nio/charset/Charset;
+    sput-object v0, Lkotlin/text/d;->biN: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 b5f534d71a..23dc289e3c 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 biW:I
+.field private biR:I
 
-.field private biX:I
+.field private biS:I
 
-.field private biY:Lkotlin/ranges/IntRange;
+.field private biT:Lkotlin/ranges/IntRange;
 
-.field private biZ:I
+.field private biU:I
 
-.field private biu:I
+.field final synthetic biV:Lkotlin/text/e;
 
-.field final synthetic bja:Lkotlin/text/e;
+.field private bip:I
 
 
 # direct methods
@@ -51,13 +51,13 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lkotlin/text/e$a;->bja:Lkotlin/text/e;
+    iput-object p1, p0, Lkotlin/text/e$a;->biV:Lkotlin/text/e;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     const/4 v0, -0x1
 
-    iput v0, p0, Lkotlin/text/e$a;->biu:I
+    iput v0, p0, Lkotlin/text/e$a;->bip: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;->biW:I
+    iput p1, p0, Lkotlin/text/e$a;->biR:I
 
-    iget p1, p0, Lkotlin/text/e$a;->biW:I
+    iget p1, p0, Lkotlin/text/e$a;->biR:I
 
-    iput p1, p0, Lkotlin/text/e$a;->biX:I
+    iput p1, p0, Lkotlin/text/e$a;->biS:I
 
     return-void
 .end method
 
-.method private final Db()V
+.method private final CZ()V
     .locals 6
 
-    iget v0, p0, Lkotlin/text/e$a;->biX:I
+    iget v0, p0, Lkotlin/text/e$a;->biS:I
 
     const/4 v1, 0x0
 
     if-gez v0, :cond_0
 
-    iput v1, p0, Lkotlin/text/e$a;->biu:I
+    iput v1, p0, Lkotlin/text/e$a;->bip:I
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lkotlin/text/e$a;->biY:Lkotlin/ranges/IntRange;
+    iput-object v0, p0, Lkotlin/text/e$a;->biT:Lkotlin/ranges/IntRange;
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Lkotlin/text/e$a;->bja:Lkotlin/text/e;
+    iget-object v0, p0, Lkotlin/text/e$a;->biV: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;->biZ:I
+    iget v0, p0, Lkotlin/text/e$a;->biU:I
 
     add-int/2addr v0, v3
 
-    iput v0, p0, Lkotlin/text/e$a;->biZ:I
+    iput v0, p0, Lkotlin/text/e$a;->biU:I
 
-    iget v0, p0, Lkotlin/text/e$a;->biZ:I
+    iget v0, p0, Lkotlin/text/e$a;->biU:I
 
-    iget-object v4, p0, Lkotlin/text/e$a;->bja:Lkotlin/text/e;
+    iget-object v4, p0, Lkotlin/text/e$a;->biV: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;->biX:I
+    iget v0, p0, Lkotlin/text/e$a;->biS:I
 
-    iget-object v4, p0, Lkotlin/text/e$a;->bja:Lkotlin/text/e;
+    iget-object v4, p0, Lkotlin/text/e$a;->biV: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;->biW:I
+    iget v0, p0, Lkotlin/text/e$a;->biR:I
 
     new-instance v1, Lkotlin/ranges/IntRange;
 
-    iget-object v4, p0, Lkotlin/text/e$a;->bja:Lkotlin/text/e;
+    iget-object v4, p0, Lkotlin/text/e$a;->biV: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;->biY:Lkotlin/ranges/IntRange;
+    iput-object v1, p0, Lkotlin/text/e$a;->biT:Lkotlin/ranges/IntRange;
 
-    iput v2, p0, Lkotlin/text/e$a;->biX:I
+    iput v2, p0, Lkotlin/text/e$a;->biS:I
 
     goto :goto_0
 
     :cond_3
-    iget-object v0, p0, Lkotlin/text/e$a;->bja:Lkotlin/text/e;
+    iget-object v0, p0, Lkotlin/text/e$a;->biV: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;->bja:Lkotlin/text/e;
+    iget-object v4, p0, Lkotlin/text/e$a;->biV: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;->biX:I
+    iget v5, p0, Lkotlin/text/e$a;->biS: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;->biW:I
+    iget v0, p0, Lkotlin/text/e$a;->biR:I
 
     new-instance v1, Lkotlin/ranges/IntRange;
 
-    iget-object v4, p0, Lkotlin/text/e$a;->bja:Lkotlin/text/e;
+    iget-object v4, p0, Lkotlin/text/e$a;->biV: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;->biY:Lkotlin/ranges/IntRange;
+    iput-object v1, p0, Lkotlin/text/e$a;->biT:Lkotlin/ranges/IntRange;
 
-    iput v2, p0, Lkotlin/text/e$a;->biX:I
+    iput v2, p0, Lkotlin/text/e$a;->biS:I
 
     goto :goto_0
 
@@ -240,19 +240,19 @@
 
     move-result v0
 
-    iget v4, p0, Lkotlin/text/e$a;->biW:I
+    iget v4, p0, Lkotlin/text/e$a;->biR: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;->biY:Lkotlin/ranges/IntRange;
+    iput-object v4, p0, Lkotlin/text/e$a;->biT:Lkotlin/ranges/IntRange;
 
     add-int/2addr v2, v0
 
-    iput v2, p0, Lkotlin/text/e$a;->biW:I
+    iput v2, p0, Lkotlin/text/e$a;->biR:I
 
-    iget v2, p0, Lkotlin/text/e$a;->biW:I
+    iget v2, p0, Lkotlin/text/e$a;->biR:I
 
     if-nez v0, :cond_5
 
@@ -261,10 +261,10 @@
     :cond_5
     add-int/2addr v2, v1
 
-    iput v2, p0, Lkotlin/text/e$a;->biX:I
+    iput v2, p0, Lkotlin/text/e$a;->biS:I
 
     :goto_0
-    iput v3, p0, Lkotlin/text/e$a;->biu:I
+    iput v3, p0, Lkotlin/text/e$a;->bip:I
 
     return-void
 .end method
@@ -274,16 +274,16 @@
 .method public final hasNext()Z
     .locals 2
 
-    iget v0, p0, Lkotlin/text/e$a;->biu:I
+    iget v0, p0, Lkotlin/text/e$a;->bip:I
 
     const/4 v1, -0x1
 
     if-ne v0, v1, :cond_0
 
-    invoke-direct {p0}, Lkotlin/text/e$a;->Db()V
+    invoke-direct {p0}, Lkotlin/text/e$a;->CZ()V
 
     :cond_0
-    iget v0, p0, Lkotlin/text/e$a;->biu:I
+    iget v0, p0, Lkotlin/text/e$a;->bip: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;->biu:I
+    iget v0, p0, Lkotlin/text/e$a;->bip:I
 
     const/4 v1, -0x1
 
     if-ne v0, v1, :cond_0
 
-    invoke-direct {p0}, Lkotlin/text/e$a;->Db()V
+    invoke-direct {p0}, Lkotlin/text/e$a;->CZ()V
 
     :cond_0
-    iget v0, p0, Lkotlin/text/e$a;->biu:I
+    iget v0, p0, Lkotlin/text/e$a;->bip:I
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lkotlin/text/e$a;->biY:Lkotlin/ranges/IntRange;
+    iget-object v0, p0, Lkotlin/text/e$a;->biT:Lkotlin/ranges/IntRange;
 
     if-eqz v0, :cond_1
 
     const/4 v2, 0x0
 
-    iput-object v2, p0, Lkotlin/text/e$a;->biY:Lkotlin/ranges/IntRange;
+    iput-object v2, p0, Lkotlin/text/e$a;->biT:Lkotlin/ranges/IntRange;
 
-    iput v1, p0, Lkotlin/text/e$a;->biu:I
+    iput v1, p0, Lkotlin/text/e$a;->bip: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 600d921a44..616ddd5786 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 bjd:Lkotlin/text/i;
+.field final synthetic biY:Lkotlin/text/i;
 
 
 # direct methods
@@ -35,7 +35,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lkotlin/text/i$a;->bjd:Lkotlin/text/i;
+    iput-object p1, p0, Lkotlin/text/i$a;->biY: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;->bjd:Lkotlin/text/i;
+    iget-object v0, p0, Lkotlin/text/i$a;->biY: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;->bjd:Lkotlin/text/i;
+    iget-object v0, p0, Lkotlin/text/i$a;->biY: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 bdb14df339..16a99362c6 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 bjd:Lkotlin/text/i;
+.field final synthetic biY:Lkotlin/text/i;
 
 
 # direct methods
@@ -39,7 +39,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lkotlin/text/i$b;->bjd:Lkotlin/text/i;
+    iput-object p1, p0, Lkotlin/text/i$b;->biY: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;->bjd:Lkotlin/text/i;
+    iget-object v0, p0, Lkotlin/text/i$b;->biY: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;->bjd:Lkotlin/text/i;
+    iget-object v2, p0, Lkotlin/text/i$b;->biY: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;->bjd:Lkotlin/text/i;
+    iget-object v0, p0, Lkotlin/text/i$b;->biY: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 21b640e9b8..8da69f371f 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 biU:Ljava/lang/CharSequence;
+.field private final biP:Ljava/lang/CharSequence;
 
-.field private final bjb:Lkotlin/text/g;
+.field private final biW:Lkotlin/text/g;
 
-.field private bjc:Ljava/util/List;
+.field private biX: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;->biU:Ljava/lang/CharSequence;
+    iput-object p2, p0, Lkotlin/text/i;->biP: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;->bjb:Lkotlin/text/g;
+    iput-object p1, p0, Lkotlin/text/i;->biW:Lkotlin/text/g;
 
     return-void
 .end method
@@ -76,7 +76,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lkotlin/text/i;->bjc:Ljava/util/List;
+    iget-object v0, p0, Lkotlin/text/i;->biX: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;->bjc:Ljava/util/List;
+    iput-object v0, p0, Lkotlin/text/i;->biX:Ljava/util/List;
 
     :cond_0
-    iget-object v0, p0, Lkotlin/text/i;->bjc:Ljava/util/List;
+    iget-object v0, p0, Lkotlin/text/i;->biX: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;->biU:Ljava/lang/CharSequence;
+    iget-object v1, p0, Lkotlin/text/i;->biP: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;->biU:Ljava/lang/CharSequence;
+    iget-object v2, p0, Lkotlin/text/i;->biP: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;->biU:Ljava/lang/CharSequence;
+    iget-object v2, p0, Lkotlin/text/i;->biP: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 ba5a3f4567..61880531dc 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 bjc:Lkotlin/text/k;
+
+.field public static final enum bjd:Lkotlin/text/k;
+
+.field public static final enum bje:Lkotlin/text/k;
+
+.field public static final enum bjf:Lkotlin/text/k;
+
+.field public static final enum bjg:Lkotlin/text/k;
+
 .field public static final enum bjh:Lkotlin/text/k;
 
 .field public static final enum bji:Lkotlin/text/k;
 
-.field public static final enum bjj:Lkotlin/text/k;
-
-.field public static final enum bjk:Lkotlin/text/k;
-
-.field public static final enum bjl:Lkotlin/text/k;
-
-.field public static final enum bjm:Lkotlin/text/k;
-
-.field public static final enum bjn:Lkotlin/text/k;
-
-.field private static final synthetic bjo:[Lkotlin/text/k;
+.field private static final synthetic bjj:[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;->bjh:Lkotlin/text/k;
+    sput-object v1, Lkotlin/text/k;->bjc: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;->bji:Lkotlin/text/k;
+    sput-object v1, Lkotlin/text/k;->bjd: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;->bjj:Lkotlin/text/k;
+    sput-object v1, Lkotlin/text/k;->bje: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;->bjk:Lkotlin/text/k;
+    sput-object v1, Lkotlin/text/k;->bjf: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;->bjl:Lkotlin/text/k;
+    sput-object v1, Lkotlin/text/k;->bjg: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;->bjm:Lkotlin/text/k;
+    sput-object v1, Lkotlin/text/k;->bjh: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;->bjn:Lkotlin/text/k;
+    sput-object v1, Lkotlin/text/k;->bji:Lkotlin/text/k;
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lkotlin/text/k;->bjo:[Lkotlin/text/k;
+    sput-object v0, Lkotlin/text/k;->bjj:[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;->bjo:[Lkotlin/text/k;
+    sget-object v0, Lkotlin/text/k;->bjj:[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 3d65aaac08..d5944858c9 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;->bgx:Lkotlin/s;
+    sget-object p1, Lkotlin/s;->bgs: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;->bgx:Lkotlin/s;
+    sget-object v1, Lkotlin/s;->bgs: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;->bgx:Lkotlin/s;
+    sget-object v1, Lkotlin/s;->bgs: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 945255c4a7..b1b250c8e1 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 bgA:Lkotlin/v;
+.field public static final bgu:Z
 
-.field public static final bgz:Z
+.field public static final bgv:Lkotlin/v;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lkotlin/v;-><init>()V
 
-    sput-object v0, Lkotlin/v;->bgA:Lkotlin/v;
+    sput-object v0, Lkotlin/v;->bgv:Lkotlin/v;
 
     invoke-virtual {v0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
@@ -27,7 +27,7 @@
 
     move-result v0
 
-    sput-boolean v0, Lkotlin/v;->bgz:Z
+    sput-boolean v0, Lkotlin/v;->bgu: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 283c2731dd..d570afcb99 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 bjL:Lkotlinx/coroutines/CoroutineExceptionHandler$a;
+.field static final synthetic bjG: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;->bjL:Lkotlinx/coroutines/CoroutineExceptionHandler$a;
+    sput-object v0, Lkotlinx/coroutines/CoroutineExceptionHandler$a;->bjG: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 061919eb39..5abdaf3a75 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 bjK:Lkotlinx/coroutines/CoroutineExceptionHandler$a;
+.field public static final bjF:Lkotlinx/coroutines/CoroutineExceptionHandler$a;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    sget-object v0, Lkotlinx/coroutines/CoroutineExceptionHandler$a;->bjL:Lkotlinx/coroutines/CoroutineExceptionHandler$a;
+    sget-object v0, Lkotlinx/coroutines/CoroutineExceptionHandler$a;->bjG:Lkotlinx/coroutines/CoroutineExceptionHandler$a;
 
-    sput-object v0, Lkotlinx/coroutines/CoroutineExceptionHandler;->bjK:Lkotlinx/coroutines/CoroutineExceptionHandler$a;
+    sput-object v0, Lkotlinx/coroutines/CoroutineExceptionHandler;->bjF: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 93c8f9c184..8881b18fa2 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 Dd()Lkotlin/coroutines/CoroutineContext;
+.method public abstract Db()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 d12c491421..c8f3c0ccbc 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 bkD:Lkotlinx/coroutines/Job$b;
+.field static final synthetic bky: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;->bkD:Lkotlinx/coroutines/Job$b;
+    sput-object v0, Lkotlinx/coroutines/Job$b;->bky:Lkotlinx/coroutines/Job$b;
 
-    sget-object v0, Lkotlinx/coroutines/CoroutineExceptionHandler;->bjK:Lkotlinx/coroutines/CoroutineExceptionHandler$a;
+    sget-object v0, Lkotlinx/coroutines/CoroutineExceptionHandler;->bjF: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 0efc7d5905..8a9c5f539f 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 bkC:Lkotlinx/coroutines/Job$b;
+.field public static final bkx:Lkotlinx/coroutines/Job$b;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    sget-object v0, Lkotlinx/coroutines/Job$b;->bkD:Lkotlinx/coroutines/Job$b;
+    sget-object v0, Lkotlinx/coroutines/Job$b;->bky:Lkotlinx/coroutines/Job$b;
 
-    sput-object v0, Lkotlinx/coroutines/Job;->bkC:Lkotlinx/coroutines/Job$b;
+    sput-object v0, Lkotlinx/coroutines/Job;->bkx:Lkotlinx/coroutines/Job$b;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public abstract DV()Ljava/util/concurrent/CancellationException;
+.method public abstract DT()Ljava/util/concurrent/CancellationException;
 .end method
 
-.method public abstract DW()Z
+.method public abstract DU()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 a683481ca5..6207e3681e 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 bjq:Lkotlin/coroutines/CoroutineContext;
+.field private final bjl:Lkotlin/coroutines/CoroutineContext;
 
-.field protected final bjr:Lkotlin/coroutines/CoroutineContext;
+.field protected final bjm: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;->bjr:Lkotlin/coroutines/CoroutineContext;
+    iput-object p1, p0, Lkotlinx/coroutines/a;->bjm:Lkotlin/coroutines/CoroutineContext;
 
-    iget-object p1, p0, Lkotlinx/coroutines/a;->bjr:Lkotlin/coroutines/CoroutineContext;
+    iget-object p1, p0, Lkotlinx/coroutines/a;->bjm:Lkotlin/coroutines/CoroutineContext;
 
     move-object p2, p0
 
@@ -51,27 +51,27 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lkotlinx/coroutines/a;->bjq:Lkotlin/coroutines/CoroutineContext;
+    iput-object p1, p0, Lkotlinx/coroutines/a;->bjl:Lkotlin/coroutines/CoroutineContext;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final Dd()Lkotlin/coroutines/CoroutineContext;
+.method public final Db()Lkotlin/coroutines/CoroutineContext;
     .locals 1
 
-    iget-object v0, p0, Lkotlinx/coroutines/a;->bjq:Lkotlin/coroutines/CoroutineContext;
+    iget-object v0, p0, Lkotlinx/coroutines/a;->bjl:Lkotlin/coroutines/CoroutineContext;
 
     return-object v0
 .end method
 
-.method public final De()V
+.method public final Dc()V
     .locals 2
 
-    iget-object v0, p0, Lkotlinx/coroutines/a;->bjr:Lkotlin/coroutines/CoroutineContext;
+    iget-object v0, p0, Lkotlinx/coroutines/a;->bjm:Lkotlin/coroutines/CoroutineContext;
 
-    sget-object v1, Lkotlinx/coroutines/Job;->bkC:Lkotlinx/coroutines/Job$b;
+    sget-object v1, Lkotlinx/coroutines/Job;->bkx:Lkotlinx/coroutines/Job$b;
 
     check-cast v1, Lkotlin/coroutines/CoroutineContext$c;
 
@@ -86,7 +86,7 @@
     return-void
 .end method
 
-.method public final Df()V
+.method public final Dd()V
     .locals 0
 
     invoke-virtual {p0}, Lkotlinx/coroutines/a;->onStart()V
@@ -94,7 +94,7 @@
     return-void
 .end method
 
-.method public Dg()I
+.method public De()I
     .locals 1
 
     const/4 v0, 0x0
@@ -102,10 +102,10 @@
     return v0
 .end method
 
-.method public final Dh()Ljava/lang/String;
+.method public final Df()Ljava/lang/String;
     .locals 3
 
-    iget-object v0, p0, Lkotlinx/coroutines/a;->bjq:Lkotlin/coroutines/CoroutineContext;
+    iget-object v0, p0, Lkotlinx/coroutines/a;->bjl: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;->Dh()Ljava/lang/String;
+    invoke-super {p0}, Lkotlinx/coroutines/bn;->Df()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;->Dh()Ljava/lang/String;
+    invoke-super {p0}, Lkotlinx/coroutines/bn;->Df()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;->De()V
+    invoke-virtual {p0}, Lkotlinx/coroutines/a;->Dc()V
 
     move-object v1, p0
 
@@ -264,7 +264,7 @@
 
     if-eq p2, p3, :cond_2
 
-    sget-object p3, Lkotlin/m;->bgv:Lkotlin/m$a;
+    sget-object p3, Lkotlin/m;->bgq: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;->bgv:Lkotlin/m$a;
+    sget-object p3, Lkotlin/m;->bgq: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;->bjq:Lkotlin/coroutines/CoroutineContext;
+    iget-object v0, p0, Lkotlinx/coroutines/a;->bjl: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;->bjq:Lkotlin/coroutines/CoroutineContext;
+    iget-object v0, p0, Lkotlinx/coroutines/a;->bjl: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;->Dg()I
+    invoke-virtual {p0}, Lkotlinx/coroutines/a;->De()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 d699d68a4d..b7f25c3e12 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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;->bgv:Lkotlin/m$a;
+    sget-object p1, Lkotlin/m;->bgq: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 63dce22845..d0d86ed5d5 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;->De()V
+    invoke-virtual {p0}, Lkotlinx/coroutines/a;->Dc()V
 
     :try_start_0
     move-object v0, p0
@@ -80,7 +80,7 @@
 
     if-eqz p1, :cond_2
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/a;->DZ()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/a;->DX()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;->blK:Lkotlin/coroutines/Continuation;
+    iget-object p0, p0, Lkotlinx/coroutines/internal/t;->blF: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 16a65e08de..3231a1c01f 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 bjI:Ljava/util/concurrent/atomic/AtomicLong;
+.field private static final bjD:Ljava/util/concurrent/atomic/AtomicLong;
 
-.field private static final bjJ:Z
+.field private static final bjE:Z
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicLong;-><init>()V
 
-    sput-object v0, Lkotlinx/coroutines/aa;->bjI:Ljava/util/concurrent/atomic/AtomicLong;
+    sput-object v0, Lkotlinx/coroutines/aa;->bjD: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;->bjJ:Z
+    sput-boolean v0, Lkotlinx/coroutines/aa;->bjE:Z
 
     return-void
 
@@ -114,14 +114,14 @@
     throw v1
 .end method
 
-.method public static final Dy()Lkotlinx/coroutines/ab;
+.method public static final Dw()Lkotlinx/coroutines/ab;
     .locals 1
 
-    sget-boolean v0, Lkotlinx/coroutines/aa;->bjJ:Z
+    sget-boolean v0, Lkotlinx/coroutines/aa;->bjE:Z
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lkotlinx/coroutines/b/c;->bmD:Lkotlinx/coroutines/b/c;
+    sget-object v0, Lkotlinx/coroutines/b/c;->bmy: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;->bjD:Lkotlinx/coroutines/r;
+    sget-object v0, Lkotlinx/coroutines/r;->bjy:Lkotlinx/coroutines/r;
 
     goto :goto_0
 .end method
@@ -150,7 +150,7 @@
     return-object v1
 
     :cond_0
-    sget-object v0, Lkotlinx/coroutines/ae;->bjN:Lkotlinx/coroutines/ae$a;
+    sget-object v0, Lkotlinx/coroutines/ae;->bjI: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;->bjO:Lkotlinx/coroutines/af$a;
+    sget-object v1, Lkotlinx/coroutines/af;->bjJ: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;->Dd()Lkotlin/coroutines/CoroutineContext;
+    invoke-interface {p0}, Lkotlinx/coroutines/CoroutineScope;->Db()Lkotlin/coroutines/CoroutineContext;
 
     move-result-object p0
 
@@ -231,7 +231,7 @@
 
     new-instance p1, Lkotlinx/coroutines/ae;
 
-    sget-object v0, Lkotlinx/coroutines/aa;->bjI:Ljava/util/concurrent/atomic/AtomicLong;
+    sget-object v0, Lkotlinx/coroutines/aa;->bjD: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;->DF()Lkotlinx/coroutines/ab;
+    invoke-static {}, Lkotlinx/coroutines/as;->DD()Lkotlinx/coroutines/ab;
 
     move-result-object v0
 
     if-eq p0, v0, :cond_1
 
-    sget-object v0, Lkotlin/coroutines/c;->bha:Lkotlin/coroutines/c$b;
+    sget-object v0, Lkotlin/coroutines/c;->bgV: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;->DF()Lkotlinx/coroutines/ab;
+    invoke-static {}, Lkotlinx/coroutines/as;->DD()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 8282c31445..ebddf362ae 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;->bha:Lkotlin/coroutines/c$b;
+    sget-object v0, Lkotlin/coroutines/c;->bgV: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 f774d836b3..d53e5dbeb1 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 bjM:Ljava/util/List;
+.field private static final bjH: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;->bjM:Ljava/util/List;
+    sput-object v0, Lkotlinx/coroutines/ac;->bjH: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;->bjM:Ljava/util/List;
+    sget-object v0, Lkotlinx/coroutines/ac;->bjH: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 da7de600a3..1552973052 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;->bjK:Lkotlinx/coroutines/CoroutineExceptionHandler$a;
+    sget-object v0, Lkotlinx/coroutines/CoroutineExceptionHandler;->bjF: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 31b9460351..273515f1f7 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 bjN:Lkotlinx/coroutines/ae$a;
+.field public static final bjI: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;->bjN:Lkotlinx/coroutines/ae$a;
+    sput-object v0, Lkotlinx/coroutines/ae;->bjI: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;->bjN:Lkotlinx/coroutines/ae$a;
+    sget-object v0, Lkotlinx/coroutines/ae;->bjI: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;->bjO:Lkotlinx/coroutines/af$a;
+    sget-object v0, Lkotlinx/coroutines/af;->bjJ: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 d945c1b759..ee3f50965d 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 bjO:Lkotlinx/coroutines/af$a;
+.field public static final bjJ: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;->bjO:Lkotlinx/coroutines/af$a;
+    sput-object v0, Lkotlinx/coroutines/af;->bjJ: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 791daba0e3..6cee550a8a 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 bjP:Lkotlinx/coroutines/ag;
+.field public static final enum bjK:Lkotlinx/coroutines/ag;
 
-.field public static final enum bjQ:Lkotlinx/coroutines/ag;
+.field public static final enum bjL:Lkotlinx/coroutines/ag;
 
-.field public static final enum bjR:Lkotlinx/coroutines/ag;
+.field public static final enum bjM:Lkotlinx/coroutines/ag;
 
-.field public static final enum bjS:Lkotlinx/coroutines/ag;
+.field public static final enum bjN:Lkotlinx/coroutines/ag;
 
-.field private static final synthetic bjT:[Lkotlinx/coroutines/ag;
+.field private static final synthetic bjO:[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;->bjP:Lkotlinx/coroutines/ag;
+    sput-object v1, Lkotlinx/coroutines/ag;->bjK: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;->bjQ:Lkotlinx/coroutines/ag;
+    sput-object v1, Lkotlinx/coroutines/ag;->bjL: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;->bjR:Lkotlinx/coroutines/ag;
+    sput-object v1, Lkotlinx/coroutines/ag;->bjM: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;->bjS:Lkotlinx/coroutines/ag;
+    sput-object v1, Lkotlinx/coroutines/ag;->bjN:Lkotlinx/coroutines/ag;
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lkotlinx/coroutines/ag;->bjT:[Lkotlinx/coroutines/ag;
+    sput-object v0, Lkotlinx/coroutines/ag;->bjO:[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;->bjT:[Lkotlinx/coroutines/ag;
+    sget-object v0, Lkotlinx/coroutines/ag;->bjO:[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 108425d7df..7cbdea64fb 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;->bjP:Lkotlinx/coroutines/ag;
+    sget-object v1, Lkotlinx/coroutines/ag;->bjK: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;->bjR:Lkotlinx/coroutines/ag;
+    sget-object v1, Lkotlinx/coroutines/ag;->bjM: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;->bjS:Lkotlinx/coroutines/ag;
+    sget-object v1, Lkotlinx/coroutines/ag;->bjN: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;->bjQ:Lkotlinx/coroutines/ag;
+    sget-object v1, Lkotlinx/coroutines/ag;->bjL: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;->bjP:Lkotlinx/coroutines/ag;
+    sget-object v1, Lkotlinx/coroutines/ag;->bjK: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;->bjR:Lkotlinx/coroutines/ag;
+    sget-object v1, Lkotlinx/coroutines/ag;->bjM: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;->bjS:Lkotlinx/coroutines/ag;
+    sget-object v1, Lkotlinx/coroutines/ag;->bjN: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;->bjQ:Lkotlinx/coroutines/ag;
+    sget-object v1, Lkotlinx/coroutines/ag;->bjL: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 66f60fd50a..a040d0be9e 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 bjU:Z
+.field public static final bjP:Z
 
 
 # direct methods
@@ -115,7 +115,7 @@
     const/4 v1, 0x1
 
     :cond_4
-    sput-boolean v1, Lkotlinx/coroutines/aj;->bjU:Z
+    sput-boolean v1, Lkotlinx/coroutines/aj;->bjP:Z
 
     return-void
 
@@ -178,7 +178,7 @@
     const/16 v0, 0x40
 
     :try_start_0
-    sget-object v1, Lkotlin/m;->bgv:Lkotlin/m$a;
+    sget-object v1, Lkotlin/m;->bgq:Lkotlin/m$a;
 
     new-instance v1, Ljava/lang/StringBuilder;
 
@@ -209,7 +209,7 @@
     :catchall_0
     move-exception v1
 
-    sget-object v2, Lkotlin/m;->bgv:Lkotlin/m$a;
+    sget-object v2, Lkotlin/m;->bgq: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 dc188d9a66..c925a84cb5 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 bjV:J
+.field private static final bjQ:J
 
-.field public static final bjW:Lkotlinx/coroutines/ak;
+.field public static final bjR: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;->bjW:Lkotlinx/coroutines/ak;
+    sput-object v0, Lkotlinx/coroutines/ak;->bjR: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;->bjV:J
+    sput-wide v0, Lkotlinx/coroutines/ak;->bjQ:J
 
     return-void
 .end method
@@ -74,7 +74,80 @@
     return-void
 .end method
 
-.method private final declared-synchronized DA()Ljava/lang/Thread;
+.method private final declared-synchronized DA()V
+    .locals 1
+
+    monitor-enter p0
+
+    :try_start_0
+    invoke-static {}, Lkotlinx/coroutines/ak;->Dx()Z
+
+    move-result v0
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    if-nez v0, :cond_0
+
+    monitor-exit p0
+
+    return-void
+
+    :cond_0
+    const/4 v0, 0x3
+
+    :try_start_1
+    sput v0, Lkotlinx/coroutines/ak;->debugStatus:I
+
+    invoke-virtual {p0}, Lkotlinx/coroutines/ak;->DM()V
+
+    move-object v0, p0
+
+    check-cast v0, Ljava/lang/Object;
+
+    invoke-virtual {v0}, Ljava/lang/Object;->notifyAll()V
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    monitor-exit p0
+
+    return-void
+
+    :catchall_0
+    move-exception v0
+
+    monitor-exit p0
+
+    throw v0
+.end method
+
+.method private static Dx()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 Dy()Ljava/lang/Thread;
     .locals 3
 
     monitor-enter p0
@@ -117,13 +190,13 @@
     throw v0
 .end method
 
-.method private final declared-synchronized DB()Z
+.method private final declared-synchronized Dz()Z
     .locals 2
 
     monitor-enter p0
 
     :try_start_0
-    invoke-static {}, Lkotlinx/coroutines/ak;->Dz()Z
+    invoke-static {}, Lkotlinx/coroutines/ak;->Dx()Z
 
     move-result v0
     :try_end_0
@@ -163,89 +236,16 @@
     throw v0
 .end method
 
-.method private final declared-synchronized DC()V
-    .locals 1
-
-    monitor-enter p0
-
-    :try_start_0
-    invoke-static {}, Lkotlinx/coroutines/ak;->Dz()Z
-
-    move-result v0
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    if-nez v0, :cond_0
-
-    monitor-exit p0
-
-    return-void
-
-    :cond_0
-    const/4 v0, 0x3
-
-    :try_start_1
-    sput v0, Lkotlinx/coroutines/ak;->debugStatus:I
-
-    invoke-virtual {p0}, Lkotlinx/coroutines/ak;->DO()V
-
-    move-object v0, p0
-
-    check-cast v0, Ljava/lang/Object;
-
-    invoke-virtual {v0}, Ljava/lang/Object;->notifyAll()V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    monitor-exit p0
-
-    return-void
-
-    :catchall_0
-    move-exception v0
-
-    monitor-exit p0
-
-    throw v0
-.end method
-
-.method 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 Dk()Ljava/lang/Thread;
+.method protected final Di()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;->DA()Ljava/lang/Thread;
+    invoke-direct {p0}, Lkotlinx/coroutines/ak;->Dy()Ljava/lang/Thread;
 
     move-result-object v0
 
@@ -256,7 +256,7 @@
 .method public final run()V
     .locals 12
 
-    sget-object v0, Lkotlinx/coroutines/ca;->bkT:Lkotlinx/coroutines/ca;
+    sget-object v0, Lkotlinx/coroutines/ca;->bkO: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;->El()Lkotlinx/coroutines/cc;
+    invoke-static {}, Lkotlinx/coroutines/cd;->Ej()Lkotlinx/coroutines/cc;
 
     const/4 v0, 0x0
 
     :try_start_0
-    invoke-direct {p0}, Lkotlinx/coroutines/ak;->DB()Z
+    invoke-direct {p0}, Lkotlinx/coroutines/ak;->Dz()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;->DC()V
+    invoke-direct {p0}, Lkotlinx/coroutines/ak;->DA()V
 
-    invoke-static {}, Lkotlinx/coroutines/cd;->El()Lkotlinx/coroutines/cc;
+    invoke-static {}, Lkotlinx/coroutines/cd;->Ej()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;->Dk()Ljava/lang/Thread;
+    invoke-virtual {p0}, Lkotlinx/coroutines/ak;->Di()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;->DJ()J
+    invoke-virtual {p0}, Lkotlinx/coroutines/ak;->DH()J
 
     move-result-wide v5
 
@@ -318,11 +318,11 @@
 
     if-nez v9, :cond_6
 
-    invoke-static {}, Lkotlinx/coroutines/cd;->El()Lkotlinx/coroutines/cc;
+    invoke-static {}, Lkotlinx/coroutines/cd;->Ej()Lkotlinx/coroutines/cc;
 
     move-result-object v9
 
-    invoke-interface {v9}, Lkotlinx/coroutines/cc;->ns()J
+    invoke-interface {v9}, Lkotlinx/coroutines/cc;->nq()J
 
     move-result-wide v9
 
@@ -330,7 +330,7 @@
 
     if-nez v11, :cond_3
 
-    sget-wide v3, Lkotlinx/coroutines/ak;->bjV:J
+    sget-wide v3, Lkotlinx/coroutines/ak;->bjQ: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;->DC()V
+    invoke-direct {p0}, Lkotlinx/coroutines/ak;->DA()V
 
-    invoke-static {}, Lkotlinx/coroutines/cd;->El()Lkotlinx/coroutines/cc;
+    invoke-static {}, Lkotlinx/coroutines/cd;->Ej()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;->Dk()Ljava/lang/Thread;
+    invoke-virtual {p0}, Lkotlinx/coroutines/ak;->Di()Ljava/lang/Thread;
 
     :cond_4
     return-void
@@ -369,7 +369,7 @@
     goto :goto_1
 
     :cond_6
-    sget-wide v9, Lkotlinx/coroutines/ak;->bjV:J
+    sget-wide v9, Lkotlinx/coroutines/ak;->bjQ: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;->Dz()Z
+    invoke-static {}, Lkotlinx/coroutines/ak;->Dx()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;->DC()V
+    invoke-direct {p0}, Lkotlinx/coroutines/ak;->DA()V
 
-    invoke-static {}, Lkotlinx/coroutines/cd;->El()Lkotlinx/coroutines/cc;
+    invoke-static {}, Lkotlinx/coroutines/cd;->Ej()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;->Dk()Ljava/lang/Thread;
+    invoke-virtual {p0}, Lkotlinx/coroutines/ak;->Di()Ljava/lang/Thread;
 
     :cond_8
     return-void
 
     :cond_9
     :try_start_3
-    invoke-static {}, Lkotlinx/coroutines/cd;->El()Lkotlinx/coroutines/cc;
+    invoke-static {}, Lkotlinx/coroutines/cd;->Ej()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;->DC()V
+    invoke-direct {p0}, Lkotlinx/coroutines/ak;->DA()V
 
-    invoke-static {}, Lkotlinx/coroutines/cd;->El()Lkotlinx/coroutines/cc;
+    invoke-static {}, Lkotlinx/coroutines/cd;->Ej()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;->Dk()Ljava/lang/Thread;
+    invoke-virtual {p0}, Lkotlinx/coroutines/ak;->Di()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 53039e0577..b4cd05d63e 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 bjX:Lkotlinx/coroutines/an;
+.field private static final bjS:Lkotlinx/coroutines/an;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    sget-object v0, Lkotlinx/coroutines/ak;->bjW:Lkotlinx/coroutines/ak;
+    sget-object v0, Lkotlinx/coroutines/ak;->bjR:Lkotlinx/coroutines/ak;
 
     check-cast v0, Lkotlinx/coroutines/an;
 
-    sput-object v0, Lkotlinx/coroutines/al;->bjX:Lkotlinx/coroutines/an;
+    sput-object v0, Lkotlinx/coroutines/al;->bjS:Lkotlinx/coroutines/an;
 
     return-void
 .end method
 
-.method public static final DD()Lkotlinx/coroutines/an;
+.method public static final DB()Lkotlinx/coroutines/an;
     .locals 1
 
-    sget-object v0, Lkotlinx/coroutines/al;->bjX:Lkotlinx/coroutines/an;
+    sget-object v0, Lkotlinx/coroutines/al;->bjS: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 780d60ad56..1d2a075022 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 bjY:Lkotlinx/coroutines/am;
+.field public static final bjT:Lkotlinx/coroutines/am;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lkotlinx/coroutines/am;-><init>()V
 
-    sput-object v0, Lkotlinx/coroutines/am;->bjY:Lkotlinx/coroutines/am;
+    sput-object v0, Lkotlinx/coroutines/am;->bjT:Lkotlinx/coroutines/am;
 
     return-void
 .end method
@@ -67,7 +67,7 @@
     return-object p1
 .end method
 
-.method public final ns()J
+.method public final nq()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 3b1ec84bcd..a6265f29b4 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;->bjK:Lkotlinx/coroutines/CoroutineExceptionHandler$a;
+    sget-object v0, Lkotlinx/coroutines/CoroutineExceptionHandler;->bjF: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 e6027fdd09..ef8ba9fa78 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 blb:Lkotlinx/coroutines/k;
+.field final synthetic bkW: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;->blb:Lkotlinx/coroutines/k;
+    iput-object p2, p0, Lkotlinx/coroutines/android/a$a;->bkW: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;->blb:Lkotlinx/coroutines/k;
+    iget-object v0, p0, Lkotlinx/coroutines/android/a$a;->bkW:Lkotlinx/coroutines/k;
 
     iget-object v1, p0, Lkotlinx/coroutines/android/a$a;->this$0:Lkotlinx/coroutines/android/a;
 
-    sget-object v2, Lkotlin/Unit;->bgy:Lkotlin/Unit;
+    sget-object v2, Lkotlin/Unit;->bgt: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 8159b21dc7..99fccb153b 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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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 deff13ab91..828ca03ad8 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 bkZ:Lkotlinx/coroutines/android/a;
+.field private final bkU:Lkotlinx/coroutines/android/a;
 
-.field private final bla:Z
+.field private final bkV: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;->bla:Z
+    iput-boolean p3, p0, Lkotlinx/coroutines/android/a;->bkV:Z
 
-    iget-boolean p1, p0, Lkotlinx/coroutines/android/a;->bla:Z
+    iget-boolean p1, p0, Lkotlinx/coroutines/android/a;->bkV: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;->bkZ:Lkotlinx/coroutines/android/a;
+    iput-object p1, p0, Lkotlinx/coroutines/android/a;->bkU: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;->bla:Z
+    iget-boolean p1, p0, Lkotlinx/coroutines/android/a;->bkV:Z
 
     const/4 v0, 0x1
 
@@ -240,7 +240,7 @@
 
     if-eqz v0, :cond_1
 
-    iget-boolean v1, p0, Lkotlinx/coroutines/android/a;->bla:Z
+    iget-boolean v1, p0, Lkotlinx/coroutines/android/a;->bkV: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 15c5dfa333..e364638dae 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 blc:Lkotlinx/coroutines/android/b;
+.field public static final bkX:Lkotlinx/coroutines/android/b;
 
 
 # direct methods
@@ -12,7 +12,7 @@
     .locals 3
 
     :try_start_0
-    sget-object v0, Lkotlin/m;->bgv:Lkotlin/m$a;
+    sget-object v0, Lkotlin/m;->bgq:Lkotlin/m$a;
 
     new-instance v0, Lkotlinx/coroutines/android/a;
 
@@ -43,7 +43,7 @@
     :catchall_0
     move-exception v0
 
-    sget-object v1, Lkotlin/m;->bgv:Lkotlin/m$a;
+    sget-object v1, Lkotlin/m;->bgq: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;->blc:Lkotlinx/coroutines/android/b;
+    sput-object v0, Lkotlinx/coroutines/android/c;->bkX: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 19a7e1cead..084a07a041 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 bjZ:Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;
+.field private final bjU:Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;
 
-.field public final bka:Ljava/lang/Object;
+.field public final bjV:Ljava/lang/Object;
 
-.field public final bkb:Lkotlinx/coroutines/ab;
+.field public final bjW:Lkotlinx/coroutines/ab;
 
-.field public final bkc:Lkotlin/coroutines/Continuation;
+.field public final bjX: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;->bkb:Lkotlinx/coroutines/ab;
+    iput-object p1, p0, Lkotlinx/coroutines/ao;->bjW:Lkotlinx/coroutines/ab;
 
-    iput-object p2, p0, Lkotlinx/coroutines/ao;->bkc:Lkotlin/coroutines/Continuation;
+    iput-object p2, p0, Lkotlinx/coroutines/ao;->bjX:Lkotlin/coroutines/Continuation;
 
-    invoke-static {}, Lkotlinx/coroutines/aq;->DE()Lkotlinx/coroutines/internal/v;
+    invoke-static {}, Lkotlinx/coroutines/aq;->DC()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;->bkc:Lkotlin/coroutines/Continuation;
+    iget-object p1, p0, Lkotlinx/coroutines/ao;->bjX: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;->bjZ:Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;
+    iput-object p1, p0, Lkotlinx/coroutines/ao;->bjU: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;->bka:Ljava/lang/Object;
+    iput-object p1, p0, Lkotlinx/coroutines/ao;->bjV:Ljava/lang/Object;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final Dm()Ljava/lang/Object;
+.method public final Dk()Ljava/lang/Object;
     .locals 2
 
     iget-object v0, p0, Lkotlinx/coroutines/ao;->_state:Ljava/lang/Object;
 
-    invoke-static {}, Lkotlinx/coroutines/aq;->DE()Lkotlinx/coroutines/internal/v;
+    invoke-static {}, Lkotlinx/coroutines/aq;->DC()Lkotlinx/coroutines/internal/v;
 
     move-result-object v1
 
@@ -124,7 +124,7 @@
     :goto_0
     if-eqz v1, :cond_1
 
-    invoke-static {}, Lkotlinx/coroutines/aq;->DE()Lkotlinx/coroutines/internal/v;
+    invoke-static {}, Lkotlinx/coroutines/aq;->DC()Lkotlinx/coroutines/internal/v;
 
     move-result-object v1
 
@@ -148,7 +148,7 @@
     throw v0
 .end method
 
-.method public final Dq()Lkotlin/coroutines/Continuation;
+.method public final Do()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;->bjZ:Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;
+    iget-object v0, p0, Lkotlinx/coroutines/ao;->bjU: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;->bkc:Lkotlin/coroutines/Continuation;
+    iget-object v0, p0, Lkotlinx/coroutines/ao;->bjX: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;->bkc:Lkotlin/coroutines/Continuation;
+    iget-object v0, p0, Lkotlinx/coroutines/ao;->bjX: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;->bkb:Lkotlinx/coroutines/ab;
+    iget-object v2, p0, Lkotlinx/coroutines/ao;->bjW: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;->bke:I
+    iput v3, p0, Lkotlinx/coroutines/ao;->bjZ:I
 
-    iget-object p1, p0, Lkotlinx/coroutines/ao;->bkb:Lkotlinx/coroutines/ab;
+    iget-object p1, p0, Lkotlinx/coroutines/ao;->bjW:Lkotlinx/coroutines/ab;
 
     move-object v1, p0
 
@@ -231,13 +231,13 @@
     return-void
 
     :cond_0
-    sget-object v0, Lkotlinx/coroutines/ca;->bkT:Lkotlinx/coroutines/ca;
+    sget-object v0, Lkotlinx/coroutines/ca;->bkO:Lkotlinx/coroutines/ca;
 
-    invoke-static {}, Lkotlinx/coroutines/ca;->Ei()Lkotlinx/coroutines/aw;
+    invoke-static {}, Lkotlinx/coroutines/ca;->Eg()Lkotlinx/coroutines/aw;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lkotlinx/coroutines/aw;->DM()Z
+    invoke-virtual {v0}, Lkotlinx/coroutines/aw;->DK()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;->bke:I
+    iput v3, p0, Lkotlinx/coroutines/ao;->bjZ:I
 
     move-object p1, p0
 
@@ -269,7 +269,7 @@
 
     move-result-object v3
 
-    iget-object v4, p0, Lkotlinx/coroutines/ao;->bka:Ljava/lang/Object;
+    iget-object v4, p0, Lkotlinx/coroutines/ao;->bjV: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;->bkc:Lkotlin/coroutines/Continuation;
+    iget-object v5, p0, Lkotlinx/coroutines/ao;->bjX:Lkotlin/coroutines/Continuation;
 
     invoke-interface {v5, p1}, Lkotlin/coroutines/Continuation;->resumeWith(Ljava/lang/Object;)V
 
-    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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;->DL()Z
+    invoke-virtual {v0}, Lkotlinx/coroutines/aw;->DJ()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;->bkb:Lkotlinx/coroutines/ab;
+    iget-object v1, p0, Lkotlinx/coroutines/ao;->bjW: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;->bkc:Lkotlin/coroutines/Continuation;
+    iget-object v1, p0, Lkotlinx/coroutines/ao;->bjX: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 c140d6320a..198c8f16f0 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 bjw:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+.field static final bjr:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
 
 # instance fields
@@ -35,7 +35,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lkotlinx/coroutines/ap;->bjw:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sput-object v0, Lkotlinx/coroutines/ap;->bjr:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
     return-void
 .end method
@@ -70,7 +70,7 @@
 
 
 # virtual methods
-.method public final Dg()I
+.method public final De()I
     .locals 1
 
     const/4 v0, 0x0
@@ -110,7 +110,7 @@
     throw p1
 
     :cond_2
-    sget-object v0, Lkotlinx/coroutines/ap;->bjw:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/ap;->bjr: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 c08dc2d13e..1e79b3428c 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 bkd:Lkotlinx/coroutines/internal/v;
+.field private static final bjY: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;->bkd:Lkotlinx/coroutines/internal/v;
+    sput-object v0, Lkotlinx/coroutines/aq;->bjY:Lkotlinx/coroutines/internal/v;
 
     return-void
 .end method
 
-.method public static final synthetic DE()Lkotlinx/coroutines/internal/v;
+.method public static final synthetic DC()Lkotlinx/coroutines/internal/v;
     .locals 1
 
-    sget-object v0, Lkotlinx/coroutines/aq;->bkd:Lkotlinx/coroutines/internal/v;
+    sget-object v0, Lkotlinx/coroutines/aq;->bjY: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;->bkb:Lkotlinx/coroutines/ab;
+    iget-object v0, p0, Lkotlinx/coroutines/ao;->bjW: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;->bke:I
+    iput v1, p0, Lkotlinx/coroutines/ao;->bjZ:I
 
-    iget-object p1, p0, Lkotlinx/coroutines/ao;->bkb:Lkotlinx/coroutines/ab;
+    iget-object p1, p0, Lkotlinx/coroutines/ao;->bjW: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;->bkT:Lkotlinx/coroutines/ca;
+    sget-object v0, Lkotlinx/coroutines/ca;->bkO:Lkotlinx/coroutines/ca;
 
-    invoke-static {}, Lkotlinx/coroutines/ca;->Ei()Lkotlinx/coroutines/aw;
+    invoke-static {}, Lkotlinx/coroutines/ca;->Eg()Lkotlinx/coroutines/aw;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lkotlinx/coroutines/aw;->DM()Z
+    invoke-virtual {v0}, Lkotlinx/coroutines/aw;->DK()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;->bke:I
+    iput v1, p0, Lkotlinx/coroutines/ao;->bjZ:I
 
     check-cast p0, Lkotlinx/coroutines/ar;
 
@@ -117,7 +117,7 @@
 
     move-result-object v3
 
-    sget-object v4, Lkotlinx/coroutines/Job;->bkC:Lkotlinx/coroutines/Job$b;
+    sget-object v4, Lkotlinx/coroutines/Job;->bkx: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;->DV()Ljava/util/concurrent/CancellationException;
+    invoke-interface {v3}, Lkotlinx/coroutines/Job;->DT()Ljava/util/concurrent/CancellationException;
 
     move-result-object v3
 
     check-cast v3, Ljava/lang/Throwable;
 
-    sget-object v4, Lkotlin/m;->bgv:Lkotlin/m$a;
+    sget-object v4, Lkotlin/m;->bgq: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;->bka:Ljava/lang/Object;
+    iget-object v4, p0, Lkotlinx/coroutines/ao;->bjV: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;->bkc:Lkotlin/coroutines/Continuation;
+    iget-object p0, p0, Lkotlinx/coroutines/ao;->bjX:Lkotlin/coroutines/Continuation;
 
-    sget-object v5, Lkotlin/m;->bgv:Lkotlin/m$a;
+    sget-object v5, Lkotlin/m;->bgq: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;->bgy:Lkotlin/Unit;
+    sget-object p0, Lkotlin/Unit;->bgt: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;->DL()Z
+    invoke-virtual {v0}, Lkotlinx/coroutines/aw;->DJ()Z
 
     move-result p0
     :try_end_2
@@ -238,7 +238,7 @@
     throw p0
 
     :cond_4
-    sget-object v0, Lkotlin/m;->bgv:Lkotlin/m$a;
+    sget-object v0, Lkotlin/m;->bgq: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;->bkc:Lkotlin/coroutines/Continuation;
+    iget-object v0, p0, Lkotlinx/coroutines/ao;->bjX: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;->bkb:Lkotlinx/coroutines/ab;
+    iget-object v2, p0, Lkotlinx/coroutines/ao;->bjW: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;->bke:I
+    iput v3, p0, Lkotlinx/coroutines/ao;->bjZ:I
 
-    iget-object p1, p0, Lkotlinx/coroutines/ao;->bkb:Lkotlinx/coroutines/ab;
+    iget-object p1, p0, Lkotlinx/coroutines/ao;->bjW:Lkotlinx/coroutines/ab;
 
     check-cast p0, Ljava/lang/Runnable;
 
@@ -314,13 +314,13 @@
     return-void
 
     :cond_0
-    sget-object v0, Lkotlinx/coroutines/ca;->bkT:Lkotlinx/coroutines/ca;
+    sget-object v0, Lkotlinx/coroutines/ca;->bkO:Lkotlinx/coroutines/ca;
 
-    invoke-static {}, Lkotlinx/coroutines/ca;->Ei()Lkotlinx/coroutines/aw;
+    invoke-static {}, Lkotlinx/coroutines/ca;->Eg()Lkotlinx/coroutines/aw;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lkotlinx/coroutines/aw;->DM()Z
+    invoke-virtual {v0}, Lkotlinx/coroutines/aw;->DK()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;->bke:I
+    iput v3, p0, Lkotlinx/coroutines/ao;->bjZ:I
 
     check-cast p0, Lkotlinx/coroutines/ar;
 
@@ -348,7 +348,7 @@
 
     move-result-object v2
 
-    sget-object v4, Lkotlinx/coroutines/Job;->bkC:Lkotlinx/coroutines/Job$b;
+    sget-object v4, Lkotlinx/coroutines/Job;->bkx: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;->DV()Ljava/util/concurrent/CancellationException;
+    invoke-interface {v2}, Lkotlinx/coroutines/Job;->DT()Ljava/util/concurrent/CancellationException;
 
     move-result-object v2
 
     check-cast v2, Ljava/lang/Throwable;
 
-    sget-object v4, Lkotlin/m;->bgv:Lkotlin/m$a;
+    sget-object v4, Lkotlin/m;->bgq: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;->bka:Ljava/lang/Object;
+    iget-object v4, p0, Lkotlinx/coroutines/ao;->bjV: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;->bkc:Lkotlin/coroutines/Continuation;
+    iget-object p0, p0, Lkotlinx/coroutines/ao;->bjX:Lkotlin/coroutines/Continuation;
 
-    sget-object v5, Lkotlin/m;->bgv:Lkotlin/m$a;
+    sget-object v5, Lkotlin/m;->bgq: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;->bgy:Lkotlin/Unit;
+    sget-object p0, Lkotlin/Unit;->bgt: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;->DL()Z
+    invoke-virtual {v0}, Lkotlinx/coroutines/aw;->DJ()Z
 
     move-result p0
     :try_end_2
@@ -477,7 +477,7 @@
     throw p0
 
     :cond_4
-    sget-object v0, Lkotlin/m;->bgv:Lkotlin/m$a;
+    sget-object v0, Lkotlin/m;->bgq: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;->Dq()Lkotlin/coroutines/Continuation;
+    invoke-virtual {p0}, Lkotlinx/coroutines/ar;->Do()Lkotlin/coroutines/Continuation;
 
     move-result-object v0
 
@@ -544,7 +544,7 @@
 
     move-result v2
 
-    iget v3, p0, Lkotlinx/coroutines/ar;->bke:I
+    iget v3, p0, Lkotlinx/coroutines/ar;->bjZ: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;->bkb:Lkotlinx/coroutines/ab;
+    iget-object p1, p1, Lkotlinx/coroutines/ao;->bjW: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;->bkT:Lkotlinx/coroutines/ca;
+    sget-object p1, Lkotlinx/coroutines/ca;->bkO:Lkotlinx/coroutines/ca;
 
-    invoke-static {}, Lkotlinx/coroutines/ca;->Ei()Lkotlinx/coroutines/aw;
+    invoke-static {}, Lkotlinx/coroutines/ca;->Eg()Lkotlinx/coroutines/aw;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lkotlinx/coroutines/aw;->DM()Z
+    invoke-virtual {p1}, Lkotlinx/coroutines/aw;->DK()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;->Dq()Lkotlin/coroutines/Continuation;
+    invoke-virtual {p0}, Lkotlinx/coroutines/ar;->Do()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;->DL()Z
+    invoke-virtual {p1}, Lkotlinx/coroutines/aw;->DJ()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;->Dm()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/ar;->Dk()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -711,9 +711,9 @@
 
     check-cast p0, Lkotlinx/coroutines/ao;
 
-    iget-object p0, p0, Lkotlinx/coroutines/ao;->bkc:Lkotlin/coroutines/Continuation;
+    iget-object p0, p0, Lkotlinx/coroutines/ao;->bjX:Lkotlin/coroutines/Continuation;
 
-    sget-object v0, Lkotlin/m;->bgv:Lkotlin/m$a;
+    sget-object v0, Lkotlin/m;->bgq: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;->bgv:Lkotlin/m$a;
+    sget-object v0, Lkotlin/m;->bgq: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;->bkc:Lkotlin/coroutines/Continuation;
+    iget-object p0, p0, Lkotlinx/coroutines/ao;->bjX:Lkotlin/coroutines/Continuation;
 
-    sget-object v0, Lkotlin/m;->bgv:Lkotlin/m$a;
+    sget-object v0, Lkotlin/m;->bgq: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;->bgv:Lkotlin/m$a;
+    sget-object v0, Lkotlin/m;->bgq: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 e14d1d6525..1fe6e93ca3 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 bke:I
+.field public bjZ:I
 
 
 # direct methods
@@ -24,7 +24,7 @@
 
     invoke-direct {p0}, Lkotlinx/coroutines/b/i;-><init>()V
 
-    iput p1, p0, Lkotlinx/coroutines/ar;->bke:I
+    iput p1, p0, Lkotlinx/coroutines/ar;->bjZ:I
 
     return-void
 .end method
@@ -55,10 +55,10 @@
 
 
 # virtual methods
-.method public abstract Dm()Ljava/lang/Object;
+.method public abstract Dk()Ljava/lang/Object;
 .end method
 
-.method public abstract Dq()Lkotlin/coroutines/Continuation;
+.method public abstract Do()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;->Dq()Lkotlin/coroutines/Continuation;
+    invoke-virtual {p0}, Lkotlinx/coroutines/ar;->Do()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;->bmN:Lkotlinx/coroutines/b/j;
+    iget-object v0, p0, Lkotlinx/coroutines/ar;->bmI:Lkotlinx/coroutines/b/j;
 
     :try_start_0
-    invoke-virtual {p0}, Lkotlinx/coroutines/ar;->Dq()Lkotlin/coroutines/Continuation;
+    invoke-virtual {p0}, Lkotlinx/coroutines/ar;->Do()Lkotlin/coroutines/Continuation;
 
     move-result-object v1
 
@@ -169,13 +169,13 @@
 
     check-cast v1, Lkotlinx/coroutines/ao;
 
-    iget-object v2, v1, Lkotlinx/coroutines/ao;->bkc:Lkotlin/coroutines/Continuation;
+    iget-object v2, v1, Lkotlinx/coroutines/ao;->bjX:Lkotlin/coroutines/Continuation;
 
     invoke-interface {v2}, Lkotlin/coroutines/Continuation;->getContext()Lkotlin/coroutines/CoroutineContext;
 
     move-result-object v3
 
-    iget v4, p0, Lkotlinx/coroutines/ar;->bke:I
+    iget v4, p0, Lkotlinx/coroutines/ar;->bjZ: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;->bkC:Lkotlinx/coroutines/Job$b;
+    sget-object v4, Lkotlinx/coroutines/Job;->bkx: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;->Dm()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/ar;->Dk()Ljava/lang/Object;
 
     move-result-object v6
 
-    iget-object v1, v1, Lkotlinx/coroutines/ao;->bka:Ljava/lang/Object;
+    iget-object v1, v1, Lkotlinx/coroutines/ao;->bjV: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;->DV()Ljava/util/concurrent/CancellationException;
+    invoke-interface {v4}, Lkotlinx/coroutines/Job;->DT()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;->bgv:Lkotlin/m$a;
+    sget-object v6, Lkotlin/m;->bgq:Lkotlin/m$a;
 
     check-cast v4, Ljava/lang/Throwable;
 
@@ -259,7 +259,7 @@
 
     if-eqz v4, :cond_2
 
-    sget-object v6, Lkotlin/m;->bgv:Lkotlin/m$a;
+    sget-object v6, Lkotlin/m;->bgq: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;->bgv:Lkotlin/m$a;
+    sget-object v6, Lkotlin/m;->bgq: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;->bgy:Lkotlin/Unit;
+    sget-object v2, Lkotlin/Unit;->bgt: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;->bgv:Lkotlin/m$a;
+    sget-object v1, Lkotlin/m;->bgq:Lkotlin/m$a;
 
-    invoke-interface {v0}, Lkotlinx/coroutines/b/j;->EX()V
+    invoke-interface {v0}, Lkotlinx/coroutines/b/j;->EV()V
 
-    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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;->bgv:Lkotlin/m$a;
+    sget-object v1, Lkotlin/m;->bgq: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;->bgv:Lkotlin/m$a;
+    sget-object v2, Lkotlin/m;->bgq:Lkotlin/m$a;
 
-    invoke-interface {v0}, Lkotlinx/coroutines/b/j;->EX()V
+    invoke-interface {v0}, Lkotlinx/coroutines/b/j;->EV()V
 
-    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgt: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;->bgv:Lkotlin/m$a;
+    sget-object v2, Lkotlin/m;->bgq: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 a47122411c..3e3eb43bf5 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 bkf:Lkotlinx/coroutines/ab;
+.field private static final bka:Lkotlinx/coroutines/ab;
 
-.field private static final bkg:Lkotlinx/coroutines/ab;
+.field private static final bkb:Lkotlinx/coroutines/ab;
 
-.field private static final bkh:Lkotlinx/coroutines/ab;
+.field private static final bkc:Lkotlinx/coroutines/ab;
 
-.field public static final bki:Lkotlinx/coroutines/as;
+.field public static final bkd:Lkotlinx/coroutines/as;
 
 
 # direct methods
@@ -21,27 +21,27 @@
 
     invoke-direct {v0}, Lkotlinx/coroutines/as;-><init>()V
 
-    sput-object v0, Lkotlinx/coroutines/as;->bki:Lkotlinx/coroutines/as;
+    sput-object v0, Lkotlinx/coroutines/as;->bkd:Lkotlinx/coroutines/as;
 
-    invoke-static {}, Lkotlinx/coroutines/aa;->Dy()Lkotlinx/coroutines/ab;
+    invoke-static {}, Lkotlinx/coroutines/aa;->Dw()Lkotlinx/coroutines/ab;
 
     move-result-object v0
 
-    sput-object v0, Lkotlinx/coroutines/as;->bkf:Lkotlinx/coroutines/ab;
+    sput-object v0, Lkotlinx/coroutines/as;->bka:Lkotlinx/coroutines/ab;
 
-    sget-object v0, Lkotlinx/coroutines/ce;->bkY:Lkotlinx/coroutines/ce;
+    sget-object v0, Lkotlinx/coroutines/ce;->bkT:Lkotlinx/coroutines/ce;
 
     check-cast v0, Lkotlinx/coroutines/ab;
 
-    sput-object v0, Lkotlinx/coroutines/as;->bkg:Lkotlinx/coroutines/ab;
+    sput-object v0, Lkotlinx/coroutines/as;->bkb:Lkotlinx/coroutines/ab;
 
-    sget-object v0, Lkotlinx/coroutines/b/c;->bmD:Lkotlinx/coroutines/b/c;
+    sget-object v0, Lkotlinx/coroutines/b/c;->bmy:Lkotlinx/coroutines/b/c;
 
-    invoke-static {}, Lkotlinx/coroutines/b/c;->DH()Lkotlinx/coroutines/ab;
+    invoke-static {}, Lkotlinx/coroutines/b/c;->DF()Lkotlinx/coroutines/ab;
 
     move-result-object v0
 
-    sput-object v0, Lkotlinx/coroutines/as;->bkh:Lkotlinx/coroutines/ab;
+    sput-object v0, Lkotlinx/coroutines/as;->bkc:Lkotlinx/coroutines/ab;
 
     return-void
 .end method
@@ -54,26 +54,26 @@
     return-void
 .end method
 
+.method public static final DD()Lkotlinx/coroutines/ab;
+    .locals 1
+
+    sget-object v0, Lkotlinx/coroutines/as;->bka:Lkotlinx/coroutines/ab;
+
+    return-object v0
+.end method
+
+.method public static final DE()Lkotlinx/coroutines/bq;
+    .locals 1
+
+    sget-object v0, Lkotlinx/coroutines/internal/n;->blB:Lkotlinx/coroutines/bq;
+
+    return-object v0
+.end method
+
 .method public static final DF()Lkotlinx/coroutines/ab;
     .locals 1
 
-    sget-object v0, Lkotlinx/coroutines/as;->bkf:Lkotlinx/coroutines/ab;
-
-    return-object v0
-.end method
-
-.method public static final DG()Lkotlinx/coroutines/bq;
-    .locals 1
-
-    sget-object v0, Lkotlinx/coroutines/internal/n;->blG:Lkotlinx/coroutines/bq;
-
-    return-object v0
-.end method
-
-.method public static final DH()Lkotlinx/coroutines/ab;
-    .locals 1
-
-    sget-object v0, Lkotlinx/coroutines/as;->bkh:Lkotlinx/coroutines/ab;
+    sget-object v0, Lkotlinx/coroutines/as;->bkc: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 6403653501..c75c20e39d 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 bkj:Lkotlinx/coroutines/at;
+.field private final bke:Lkotlinx/coroutines/at;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {p0}, Lkotlinx/coroutines/i;-><init>()V
 
-    iput-object p1, p0, Lkotlinx/coroutines/au;->bkj:Lkotlinx/coroutines/at;
+    iput-object p1, p0, Lkotlinx/coroutines/au;->bke: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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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;->bkj:Lkotlinx/coroutines/at;
+    iget-object p1, p0, Lkotlinx/coroutines/au;->bke: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;->bkj:Lkotlinx/coroutines/at;
+    iget-object v1, p0, Lkotlinx/coroutines/au;->bke: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 18ddb624b2..b51b0f98e7 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 bkk:Z
+.field final bkf:Z
 
 
 # direct methods
@@ -16,14 +16,14 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-boolean p1, p0, Lkotlinx/coroutines/av;->bkk:Z
+    iput-boolean p1, p0, Lkotlinx/coroutines/av;->bkf:Z
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final DI()Lkotlinx/coroutines/br;
+.method public final DG()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;->bkk:Z
+    iget-boolean v0, p0, Lkotlinx/coroutines/av;->bkf: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;->bkk:Z
+    iget-boolean v1, p0, Lkotlinx/coroutines/av;->bkf: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 ebe9334c9c..3fe8d40a20 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 bkl:J
+.field private bkg:J
 
-.field private bkm:Z
+.field private bkh:Z
 
-.field private bkn:Lkotlinx/coroutines/internal/b;
+.field private bki:Lkotlinx/coroutines/internal/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlinx/coroutines/internal/b<",
@@ -65,10 +65,10 @@
 
 
 # virtual methods
-.method public DJ()J
+.method public DH()J
     .locals 2
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/aw;->DL()Z
+    invoke-virtual {p0}, Lkotlinx/coroutines/aw;->DJ()Z
 
     move-result v0
 
@@ -79,17 +79,17 @@
     return-wide v0
 
     :cond_0
-    invoke-virtual {p0}, Lkotlinx/coroutines/aw;->DK()J
+    invoke-virtual {p0}, Lkotlinx/coroutines/aw;->DI()J
 
     move-result-wide v0
 
     return-wide v0
 .end method
 
-.method protected DK()J
+.method protected DI()J
     .locals 3
 
-    iget-object v0, p0, Lkotlinx/coroutines/aw;->bkn:Lkotlinx/coroutines/internal/b;
+    iget-object v0, p0, Lkotlinx/coroutines/aw;->bki:Lkotlinx/coroutines/internal/b;
 
     const-wide v1, 0x7fffffffffffffffL
 
@@ -112,10 +112,10 @@
     return-wide v0
 .end method
 
-.method public final DL()Z
+.method public final DJ()Z
     .locals 2
 
-    iget-object v0, p0, Lkotlinx/coroutines/aw;->bkn:Lkotlinx/coroutines/internal/b;
+    iget-object v0, p0, Lkotlinx/coroutines/aw;->bki:Lkotlinx/coroutines/internal/b;
 
     const/4 v1, 0x0
 
@@ -124,7 +124,7 @@
     return v1
 
     :cond_0
-    invoke-virtual {v0}, Lkotlinx/coroutines/internal/b;->Em()Ljava/lang/Object;
+    invoke-virtual {v0}, Lkotlinx/coroutines/internal/b;->Ek()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -142,10 +142,10 @@
     return v0
 .end method
 
-.method public final DM()Z
+.method public final DK()Z
     .locals 6
 
-    iget-wide v0, p0, Lkotlinx/coroutines/aw;->bkl:J
+    iget-wide v0, p0, Lkotlinx/coroutines/aw;->bkg:J
 
     const/4 v2, 0x1
 
@@ -165,10 +165,10 @@
     return v0
 .end method
 
-.method public final DN()Z
+.method public final DL()Z
     .locals 1
 
-    iget-object v0, p0, Lkotlinx/coroutines/aw;->bkn:Lkotlinx/coroutines/internal/b;
+    iget-object v0, p0, Lkotlinx/coroutines/aw;->bki: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;->bkl:J
+    iget-wide v0, p0, Lkotlinx/coroutines/aw;->bkg: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;->bkl:J
+    iput-wide v0, p0, Lkotlinx/coroutines/aw;->bkg:J
 
     if-nez p1, :cond_0
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lkotlinx/coroutines/aw;->bkm:Z
+    iput-boolean p1, p0, Lkotlinx/coroutines/aw;->bkh:Z
 
     :cond_0
     return-void
@@ -210,7 +210,7 @@
 .method public final W(Z)V
     .locals 4
 
-    iget-wide v0, p0, Lkotlinx/coroutines/aw;->bkl:J
+    iget-wide v0, p0, Lkotlinx/coroutines/aw;->bkg: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;->bkl:J
+    iput-wide v0, p0, Lkotlinx/coroutines/aw;->bkg:J
 
-    iget-wide v0, p0, Lkotlinx/coroutines/aw;->bkl:J
+    iget-wide v0, p0, Lkotlinx/coroutines/aw;->bkg:J
 
     const-wide/16 v2, 0x0
 
@@ -245,7 +245,7 @@
     :goto_0
     if-eqz p1, :cond_3
 
-    iget-boolean p1, p0, Lkotlinx/coroutines/aw;->bkm:Z
+    iget-boolean p1, p0, Lkotlinx/coroutines/aw;->bkh: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;->bkn:Lkotlinx/coroutines/internal/b;
+    iget-object v0, p0, Lkotlinx/coroutines/aw;->bki: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;->bkn:Lkotlinx/coroutines/internal/b;
+    iput-object v0, p0, Lkotlinx/coroutines/aw;->bki: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;->DN()Z
+    invoke-virtual {p0}, Lkotlinx/coroutines/aw;->DL()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 eeeb7046e0..02c475f564 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 bkq:Lkotlinx/coroutines/k;
+.field private final bkl:Lkotlinx/coroutines/k;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlinx/coroutines/k<",
@@ -25,7 +25,7 @@
     .end annotation
 .end field
 
-.field final synthetic bkr:Lkotlinx/coroutines/ax;
+.field final synthetic bkm: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;->bkr:Lkotlinx/coroutines/ax;
+    iput-object p1, p0, Lkotlinx/coroutines/ax$a;->bkm:Lkotlinx/coroutines/ax;
 
     invoke-direct {p0, p2, p3}, Lkotlinx/coroutines/ax$b;-><init>(J)V
 
-    iput-object p4, p0, Lkotlinx/coroutines/ax$a;->bkq:Lkotlinx/coroutines/k;
+    iput-object p4, p0, Lkotlinx/coroutines/ax$a;->bkl:Lkotlinx/coroutines/k;
 
-    iget-object p1, p0, Lkotlinx/coroutines/ax$a;->bkq:Lkotlinx/coroutines/k;
+    iget-object p1, p0, Lkotlinx/coroutines/ax$a;->bkl: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;->bkq:Lkotlinx/coroutines/k;
+    iget-object v0, p0, Lkotlinx/coroutines/ax$a;->bkl:Lkotlinx/coroutines/k;
 
-    iget-object v1, p0, Lkotlinx/coroutines/ax$a;->bkr:Lkotlinx/coroutines/ax;
+    iget-object v1, p0, Lkotlinx/coroutines/ax$a;->bkm:Lkotlinx/coroutines/ax;
 
-    sget-object v2, Lkotlin/Unit;->bgy:Lkotlin/Unit;
+    sget-object v2, Lkotlin/Unit;->bgt: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 14651b0fab..927250877f 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 bks:Ljava/lang/Object;
+.field private bkn:Ljava/lang/Object;
 
-.field public final bkt:J
+.field public final bko:J
 
 .field private index:I
 
@@ -50,11 +50,11 @@
 
     iput v0, p0, Lkotlinx/coroutines/ax$b;->index:I
 
-    invoke-static {}, Lkotlinx/coroutines/cd;->El()Lkotlinx/coroutines/cc;
+    invoke-static {}, Lkotlinx/coroutines/cd;->Ej()Lkotlinx/coroutines/cc;
 
     move-result-object v0
 
-    invoke-interface {v0}, Lkotlinx/coroutines/cc;->ns()J
+    invoke-interface {v0}, Lkotlinx/coroutines/cc;->nq()J
 
     move-result-wide v0
 
@@ -64,14 +64,14 @@
 
     add-long/2addr v0, p1
 
-    iput-wide v0, p0, Lkotlinx/coroutines/ax$b;->bkt:J
+    iput-wide v0, p0, Lkotlinx/coroutines/ax$b;->bko:J
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final DQ()Lkotlinx/coroutines/internal/aa;
+.method public final DO()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;->bks:Ljava/lang/Object;
+    iget-object v0, p0, Lkotlinx/coroutines/ax$b;->bkn: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;->bks:Ljava/lang/Object;
+    iget-object v0, p0, Lkotlinx/coroutines/ax$b;->bkn:Ljava/lang/Object;
 
-    invoke-static {}, Lkotlinx/coroutines/ay;->DS()Lkotlinx/coroutines/internal/v;
+    invoke-static {}, Lkotlinx/coroutines/ay;->DQ()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;->DQ()Lkotlinx/coroutines/internal/aa;
+    invoke-interface {v0}, Lkotlinx/coroutines/internal/ab;->DO()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;->blW:[Lkotlinx/coroutines/internal/ab;
+    iget-object p2, p1, Lkotlinx/coroutines/internal/aa;->blR:[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;->blW:[Lkotlinx/coroutines/internal/ab;
+    iput-object p2, p1, Lkotlinx/coroutines/internal/aa;->blR:[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;->blW:[Lkotlinx/coroutines/internal/ab;
+    iput-object v2, p1, Lkotlinx/coroutines/internal/aa;->blR:[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;->bks:Ljava/lang/Object;
+    iget-object v0, p0, Lkotlinx/coroutines/ax$b;->bkn:Ljava/lang/Object;
 
-    invoke-static {}, Lkotlinx/coroutines/ay;->DS()Lkotlinx/coroutines/internal/v;
+    invoke-static {}, Lkotlinx/coroutines/ay;->DQ()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;->bks:Ljava/lang/Object;
+    iput-object p1, p0, Lkotlinx/coroutines/ax$b;->bkn: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;->bkt:J
+    iget-wide v0, p0, Lkotlinx/coroutines/ax$b;->bko:J
 
-    iget-wide v2, p1, Lkotlinx/coroutines/ax$b;->bkt:J
+    iget-wide v2, p1, Lkotlinx/coroutines/ax$b;->bko:J
 
     sub-long/2addr v0, v2
 
@@ -390,9 +390,9 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lkotlinx/coroutines/ax$b;->bks:Ljava/lang/Object;
+    iget-object v0, p0, Lkotlinx/coroutines/ax$b;->bkn:Ljava/lang/Object;
 
-    invoke-static {}, Lkotlinx/coroutines/ay;->DS()Lkotlinx/coroutines/internal/v;
+    invoke-static {}, Lkotlinx/coroutines/ay;->DQ()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;->DS()Lkotlinx/coroutines/internal/v;
+    invoke-static {}, Lkotlinx/coroutines/ay;->DQ()Lkotlinx/coroutines/internal/v;
 
     move-result-object v0
 
-    iput-object v0, p0, Lkotlinx/coroutines/ax$b;->bks:Ljava/lang/Object;
+    iput-object v0, p0, Lkotlinx/coroutines/ax$b;->bkn: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;->bkt:J
+    iget-wide v1, p0, Lkotlinx/coroutines/ax$b;->bko: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 83b1f72648..2b3aa8a51a 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 bko:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+.field private static final bkj:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
-.field private static final bkp:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+.field private static final bkk:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
 
 # instance fields
@@ -43,7 +43,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lkotlinx/coroutines/ax;->bko:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sput-object v1, Lkotlinx/coroutines/ax;->bkj: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;->bkp:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sput-object v0, Lkotlinx/coroutines/ax;->bkk:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     return-void
 .end method
@@ -72,7 +72,7 @@
     return-void
 .end method
 
-.method private final DP()V
+.method private final DN()V
     .locals 2
 
     :goto_0
@@ -82,7 +82,7 @@
 
     if-eqz v0, :cond_1
 
-    invoke-virtual {v0}, Lkotlinx/coroutines/internal/aa;->ED()Lkotlinx/coroutines/internal/ab;
+    invoke-virtual {v0}, Lkotlinx/coroutines/internal/aa;->EB()Lkotlinx/coroutines/internal/ab;
 
     move-result-object v0
 
@@ -93,7 +93,7 @@
     goto :goto_1
 
     :cond_0
-    sget-object v1, Lkotlinx/coroutines/ak;->bjW:Lkotlinx/coroutines/ak;
+    sget-object v1, Lkotlinx/coroutines/ak;->bjR: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;->EC()Lkotlinx/coroutines/internal/ab;
+    invoke-virtual {v0}, Lkotlinx/coroutines/internal/aa;->EA()Lkotlinx/coroutines/internal/ab;
 
     move-result-object v0
 
@@ -167,7 +167,7 @@
 
     check-cast v0, Lkotlinx/coroutines/ax;
 
-    sget-object v1, Lkotlinx/coroutines/ax;->bkp:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v1, Lkotlinx/coroutines/ax;->bkk:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     const/4 v2, 0x0
 
@@ -214,7 +214,7 @@
 
     if-nez v0, :cond_2
 
-    sget-object v0, Lkotlinx/coroutines/ax;->bko:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/ax;->bkj:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     const/4 v2, 0x0
 
@@ -255,9 +255,9 @@
     return v2
 
     :cond_4
-    sget-object v1, Lkotlinx/coroutines/ax;->bko:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v1, Lkotlinx/coroutines/ax;->bkj:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
-    invoke-virtual {v3}, Lkotlinx/coroutines/internal/m;->Ex()Lkotlinx/coroutines/internal/m;
+    invoke-virtual {v3}, Lkotlinx/coroutines/internal/m;->Ev()Lkotlinx/coroutines/internal/m;
 
     move-result-object v2
 
@@ -278,7 +278,7 @@
     throw p1
 
     :cond_7
-    invoke-static {}, Lkotlinx/coroutines/ay;->DT()Lkotlinx/coroutines/internal/v;
+    invoke-static {}, Lkotlinx/coroutines/ay;->DR()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;->bko:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v3, Lkotlinx/coroutines/ax;->bkj: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;->Dk()Ljava/lang/Thread;
+    invoke-virtual {p0}, Lkotlinx/coroutines/ax;->Di()Ljava/lang/Thread;
 
     move-result-object v0
 
@@ -342,7 +342,7 @@
 
     if-eq v1, v0, :cond_0
 
-    invoke-static {}, Lkotlinx/coroutines/cd;->El()Lkotlinx/coroutines/cc;
+    invoke-static {}, Lkotlinx/coroutines/cd;->Ej()Lkotlinx/coroutines/cc;
 
     move-result-object v1
 
@@ -354,16 +354,16 @@
 
 
 # virtual methods
-.method public final DJ()J
+.method public final DH()J
     .locals 15
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/ax;->DL()Z
+    invoke-virtual {p0}, Lkotlinx/coroutines/ax;->DJ()Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/ax;->DK()J
+    invoke-virtual {p0}, Lkotlinx/coroutines/ax;->DI()J
 
     move-result-wide v0
 
@@ -388,11 +388,11 @@
 
     if-nez v5, :cond_5
 
-    invoke-static {}, Lkotlinx/coroutines/cd;->El()Lkotlinx/coroutines/cc;
+    invoke-static {}, Lkotlinx/coroutines/cd;->Ej()Lkotlinx/coroutines/cc;
 
     move-result-object v5
 
-    invoke-interface {v5}, Lkotlinx/coroutines/cc;->ns()J
+    invoke-interface {v5}, Lkotlinx/coroutines/cc;->nq()J
 
     move-result-wide v5
 
@@ -400,7 +400,7 @@
     monitor-enter v0
 
     :try_start_0
-    invoke-virtual {v0}, Lkotlinx/coroutines/internal/aa;->EE()Lkotlinx/coroutines/internal/ab;
+    invoke-virtual {v0}, Lkotlinx/coroutines/internal/aa;->EC()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;->bkt:J
+    iget-wide v8, v7, Lkotlinx/coroutines/ax$b;->bko:J
 
     sub-long v8, v5, v8
 
@@ -508,7 +508,7 @@
 
     if-eqz v10, :cond_8
 
-    sget-object v6, Lkotlinx/coroutines/internal/m;->blE:Lkotlinx/coroutines/internal/v;
+    sget-object v6, Lkotlinx/coroutines/internal/m;->blz:Lkotlinx/coroutines/internal/v;
 
     goto/16 :goto_8
 
@@ -589,9 +589,9 @@
 
     and-int v14, v6, v7
 
-    sget-object v6, Lkotlinx/coroutines/internal/m;->blB:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+    sget-object v6, Lkotlinx/coroutines/internal/m;->blw:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
 
-    sget-object v7, Lkotlinx/coroutines/internal/m;->blF:Lkotlinx/coroutines/internal/m$a;
+    sget-object v7, Lkotlinx/coroutines/internal/m;->blA: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;->blE:Lkotlinx/coroutines/internal/v;
+    sget-object v7, Lkotlinx/coroutines/internal/m;->blz: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;->bko:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v6, Lkotlinx/coroutines/ax;->bkj:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
-    invoke-virtual {v5}, Lkotlinx/coroutines/internal/m;->Ex()Lkotlinx/coroutines/internal/m;
+    invoke-virtual {v5}, Lkotlinx/coroutines/internal/m;->Ev()Lkotlinx/coroutines/internal/m;
 
     move-result-object v5
 
@@ -672,7 +672,7 @@
     throw v0
 
     :cond_10
-    invoke-static {}, Lkotlinx/coroutines/ay;->DT()Lkotlinx/coroutines/internal/v;
+    invoke-static {}, Lkotlinx/coroutines/ay;->DR()Lkotlinx/coroutines/internal/v;
 
     move-result-object v5
 
@@ -681,7 +681,7 @@
     goto :goto_9
 
     :cond_11
-    sget-object v5, Lkotlinx/coroutines/ax;->bko:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v5, Lkotlinx/coroutines/ax;->bkj: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;->DK()J
+    invoke-virtual {p0}, Lkotlinx/coroutines/ax;->DI()J
 
     move-result-wide v0
 
@@ -723,10 +723,10 @@
     goto :goto_a
 .end method
 
-.method protected final DK()J
+.method protected final DI()J
     .locals 6
 
-    invoke-super {p0}, Lkotlinx/coroutines/aw;->DK()J
+    invoke-super {p0}, Lkotlinx/coroutines/aw;->DI()J
 
     move-result-wide v0
 
@@ -760,7 +760,7 @@
     return-wide v2
 
     :cond_1
-    invoke-static {}, Lkotlinx/coroutines/ay;->DT()Lkotlinx/coroutines/internal/v;
+    invoke-static {}, Lkotlinx/coroutines/ay;->DR()Lkotlinx/coroutines/internal/v;
 
     move-result-object v1
 
@@ -781,7 +781,7 @@
     return-wide v4
 
     :cond_4
-    invoke-virtual {v0}, Lkotlinx/coroutines/internal/aa;->EC()Lkotlinx/coroutines/internal/ab;
+    invoke-virtual {v0}, Lkotlinx/coroutines/internal/aa;->EA()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;->bkt:J
+    iget-wide v0, v0, Lkotlinx/coroutines/ax$b;->bko:J
 
-    invoke-static {}, Lkotlinx/coroutines/cd;->El()Lkotlinx/coroutines/cc;
+    invoke-static {}, Lkotlinx/coroutines/cd;->Ej()Lkotlinx/coroutines/cc;
 
     move-result-object v4
 
-    invoke-interface {v4}, Lkotlinx/coroutines/cc;->ns()J
+    invoke-interface {v4}, Lkotlinx/coroutines/cc;->nq()J
 
     move-result-wide v4
 
@@ -811,7 +811,7 @@
     return-wide v0
 .end method
 
-.method protected final DO()V
+.method protected final DM()V
     .locals 1
 
     const/4 v0, 0x0
@@ -823,7 +823,7 @@
     return-void
 .end method
 
-.method protected abstract Dk()Ljava/lang/Thread;
+.method protected abstract Di()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;->bjW:Lkotlinx/coroutines/ak;
+    sget-object v0, Lkotlinx/coroutines/ak;->bjR:Lkotlinx/coroutines/ak;
 
     goto :goto_0
 
@@ -931,7 +931,7 @@
 .method protected final isEmpty()Z
     .locals 4
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/ax;->DN()Z
+    invoke-virtual {p0}, Lkotlinx/coroutines/ax;->DL()Z
 
     move-result v0
 
@@ -979,7 +979,7 @@
     return v0
 
     :cond_3
-    invoke-static {}, Lkotlinx/coroutines/ay;->DT()Lkotlinx/coroutines/internal/v;
+    invoke-static {}, Lkotlinx/coroutines/ay;->DR()Lkotlinx/coroutines/internal/v;
 
     move-result-object v3
 
@@ -1012,7 +1012,7 @@
     return-void
 
     :cond_0
-    sget-object v0, Lkotlinx/coroutines/ak;->bjW:Lkotlinx/coroutines/ak;
+    sget-object v0, Lkotlinx/coroutines/ak;->bjR: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;->bkT:Lkotlinx/coroutines/ca;
+    sget-object v0, Lkotlinx/coroutines/ca;->bkO:Lkotlinx/coroutines/ca;
 
-    invoke-static {}, Lkotlinx/coroutines/ca;->Ek()V
+    invoke-static {}, Lkotlinx/coroutines/ca;->Ei()V
 
     const/4 v0, 0x1
 
@@ -1030,7 +1030,7 @@
 
     iget-boolean v1, p0, Lkotlinx/coroutines/ax;->isCompleted:Z
 
-    sget-boolean v2, Lkotlin/v;->bgz:Z
+    sget-boolean v2, Lkotlin/v;->bgu:Z
 
     if-eqz v2, :cond_1
 
@@ -1055,11 +1055,11 @@
 
     if-nez v1, :cond_2
 
-    sget-object v1, Lkotlinx/coroutines/ax;->bko:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v1, Lkotlinx/coroutines/ax;->bkj:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     const/4 v2, 0x0
 
-    invoke-static {}, Lkotlinx/coroutines/ay;->DT()Lkotlinx/coroutines/internal/v;
+    invoke-static {}, Lkotlinx/coroutines/ay;->DR()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;->gG()Z
+    invoke-virtual {v1}, Lkotlinx/coroutines/internal/m;->gE()Z
 
     goto :goto_1
 
     :cond_3
-    invoke-static {}, Lkotlinx/coroutines/ay;->DT()Lkotlinx/coroutines/internal/v;
+    invoke-static {}, Lkotlinx/coroutines/ay;->DR()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;->bko:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v3, Lkotlinx/coroutines/ax;->bkj: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;->DJ()J
+    invoke-virtual {p0}, Lkotlinx/coroutines/ax;->DH()J
 
     move-result-wide v0
 
@@ -1134,7 +1134,7 @@
 
     if-lez v4, :cond_5
 
-    invoke-direct {p0}, Lkotlinx/coroutines/ax;->DP()V
+    invoke-direct {p0}, Lkotlinx/coroutines/ax;->DN()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 2727551ed3..bb7c703eb8 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 bku:Lkotlinx/coroutines/internal/v;
+.field private static final bkp:Lkotlinx/coroutines/internal/v;
 
-.field private static final bkv:Lkotlinx/coroutines/internal/v;
+.field private static final bkq: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;->bku:Lkotlinx/coroutines/internal/v;
+    sput-object v0, Lkotlinx/coroutines/ay;->bkp: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;->bkv:Lkotlinx/coroutines/internal/v;
+    sput-object v0, Lkotlinx/coroutines/ay;->bkq:Lkotlinx/coroutines/internal/v;
 
     return-void
 .end method
 
-.method public static final DR()Lkotlinx/coroutines/aw;
+.method public static final DP()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 DS()Lkotlinx/coroutines/internal/v;
+.method public static final synthetic DQ()Lkotlinx/coroutines/internal/v;
     .locals 1
 
-    sget-object v0, Lkotlinx/coroutines/ay;->bku:Lkotlinx/coroutines/internal/v;
+    sget-object v0, Lkotlinx/coroutines/ay;->bkp:Lkotlinx/coroutines/internal/v;
 
     return-object v0
 .end method
 
-.method public static final synthetic DT()Lkotlinx/coroutines/internal/v;
+.method public static final synthetic DR()Lkotlinx/coroutines/internal/v;
     .locals 1
 
-    sget-object v0, Lkotlinx/coroutines/ay;->bkv:Lkotlinx/coroutines/internal/v;
+    sget-object v0, Lkotlinx/coroutines/ay;->bkq: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 bde819949c..5b0b66cca9 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 bjs:Lkotlinx/coroutines/b;
+.field public static final bjn:Lkotlinx/coroutines/b;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lkotlinx/coroutines/b;-><init>()V
 
-    sput-object v0, Lkotlinx/coroutines/b;->bjs:Lkotlinx/coroutines/b;
+    sput-object v0, Lkotlinx/coroutines/b;->bjn: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 8cda2d1e92..e3c7836db5 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 bmq:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+.field private static final bml:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
 
 # instance fields
-.field final bmp:Lkotlinx/coroutines/b/o;
+.field final bmk:Lkotlinx/coroutines/b/o;
 
-.field private bmr:J
+.field private bmm:J
 
-.field private bms:J
+.field private bmn:J
 
-.field private bmt:I
+.field private bmo:I
 
-.field private bmu:I
+.field private bmp:I
 
-.field private bmv:I
+.field private bmq:I
 
-.field final synthetic bmw:Lkotlinx/coroutines/b/a;
+.field final synthetic bmr:Lkotlinx/coroutines/b/a;
 
 .field volatile indexInArray:I
 
@@ -56,7 +56,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lkotlinx/coroutines/b/a$b;->bmq:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sput-object v0, Lkotlinx/coroutines/b/a$b;->bml:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
     return-void
 .end method
@@ -69,7 +69,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lkotlinx/coroutines/b/a$b;->bmw:Lkotlinx/coroutines/b/a;
+    iput-object p1, p0, Lkotlinx/coroutines/b/a$b;->bmr: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;->bmp:Lkotlinx/coroutines/b/o;
+    iput-object v0, p0, Lkotlinx/coroutines/b/a$b;->bmk:Lkotlinx/coroutines/b/o;
 
-    sget-object v0, Lkotlinx/coroutines/b/a$c;->bmA:Lkotlinx/coroutines/b/a$c;
+    sget-object v0, Lkotlinx/coroutines/b/a$c;->bmv: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;->EO()Lkotlinx/coroutines/internal/v;
+    invoke-static {}, Lkotlinx/coroutines/b/a;->EM()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;->EN()I
+    invoke-static {}, Lkotlinx/coroutines/b/a;->EL()I
 
     move-result v0
 
-    iput v0, p0, Lkotlinx/coroutines/b/a$b;->bmt:I
+    iput v0, p0, Lkotlinx/coroutines/b/a$b;->bmo: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;->bmu:I
+    iput p1, p0, Lkotlinx/coroutines/b/a$b;->bmp:I
 
     return-void
 .end method
@@ -131,16 +131,16 @@
     return-void
 .end method
 
-.method private final ES()Z
+.method private final EQ()Z
     .locals 3
 
-    iget-object v0, p0, Lkotlinx/coroutines/b/a$b;->bmw:Lkotlinx/coroutines/b/a;
+    iget-object v0, p0, Lkotlinx/coroutines/b/a$b;->bmr: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;->bmQ:Lkotlinx/coroutines/b/l;
+    sget-object v1, Lkotlinx/coroutines/b/l;->bmL: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;->bmp:Lkotlinx/coroutines/b/o;
+    iget-object v1, p0, Lkotlinx/coroutines/b/a$b;->bmk:Lkotlinx/coroutines/b/o;
 
-    iget-object v2, p0, Lkotlinx/coroutines/b/a$b;->bmw:Lkotlinx/coroutines/b/a;
+    iget-object v2, p0, Lkotlinx/coroutines/b/a$b;->bmr: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 EV()Lkotlinx/coroutines/b/i;
+.method private final ET()Lkotlinx/coroutines/b/i;
     .locals 3
 
-    iget-object v0, p0, Lkotlinx/coroutines/b/a$b;->bmw:Lkotlinx/coroutines/b/a;
+    iget-object v0, p0, Lkotlinx/coroutines/b/a$b;->bmr: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;->bmw:Lkotlinx/coroutines/b/a;
+    iget-object v1, p0, Lkotlinx/coroutines/b/a$b;->bmr: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;->bmP:Lkotlinx/coroutines/b/l;
+    sget-object v2, Lkotlinx/coroutines/b/l;->bmK: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;->bmp:Lkotlinx/coroutines/b/o;
+    iget-object v1, p0, Lkotlinx/coroutines/b/a$b;->bmk:Lkotlinx/coroutines/b/o;
 
-    invoke-virtual {v1}, Lkotlinx/coroutines/b/o;->Fb()Lkotlinx/coroutines/b/i;
+    invoke-virtual {v1}, Lkotlinx/coroutines/b/o;->EZ()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;->bmw:Lkotlinx/coroutines/b/a;
+    iget-object v0, p0, Lkotlinx/coroutines/b/a$b;->bmr: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;->Em()Ljava/lang/Object;
+    invoke-virtual {v0}, Lkotlinx/coroutines/b/e;->Ek()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -242,17 +242,17 @@
     return-object v0
 
     :cond_3
-    invoke-direct {p0}, Lkotlinx/coroutines/b/a$b;->EW()Lkotlinx/coroutines/b/i;
+    invoke-direct {p0}, Lkotlinx/coroutines/b/a$b;->EU()Lkotlinx/coroutines/b/i;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method private final EW()Lkotlinx/coroutines/b/i;
+.method private final EU()Lkotlinx/coroutines/b/i;
     .locals 4
 
-    iget-object v0, p0, Lkotlinx/coroutines/b/a$b;->bmw:Lkotlinx/coroutines/b/a;
+    iget-object v0, p0, Lkotlinx/coroutines/b/a$b;->bmr: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;->bmv:I
+    iget v2, p0, Lkotlinx/coroutines/b/a$b;->bmq:I
 
     if-nez v2, :cond_1
 
@@ -285,9 +285,9 @@
     const/4 v2, 0x1
 
     :cond_2
-    iput v2, p0, Lkotlinx/coroutines/b/a$b;->bmv:I
+    iput v2, p0, Lkotlinx/coroutines/b/a$b;->bmq:I
 
-    iget-object v0, p0, Lkotlinx/coroutines/b/a$b;->bmw:Lkotlinx/coroutines/b/a;
+    iget-object v0, p0, Lkotlinx/coroutines/b/a$b;->bmr: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;->bmp:Lkotlinx/coroutines/b/o;
+    iget-object v2, p0, Lkotlinx/coroutines/b/a$b;->bmk:Lkotlinx/coroutines/b/o;
 
-    iget-object v0, v0, Lkotlinx/coroutines/b/a$b;->bmp:Lkotlinx/coroutines/b/o;
+    iget-object v0, v0, Lkotlinx/coroutines/b/a$b;->bmk:Lkotlinx/coroutines/b/o;
 
-    iget-object v3, p0, Lkotlinx/coroutines/b/a$b;->bmw:Lkotlinx/coroutines/b/a;
+    iget-object v3, p0, Lkotlinx/coroutines/b/a$b;->bmr: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;->bmp:Lkotlinx/coroutines/b/o;
+    iget-object v0, p0, Lkotlinx/coroutines/b/a$b;->bmk:Lkotlinx/coroutines/b/o;
 
-    invoke-virtual {v0}, Lkotlinx/coroutines/b/o;->Fb()Lkotlinx/coroutines/b/i;
+    invoke-virtual {v0}, Lkotlinx/coroutines/b/o;->EZ()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;->bmw:Lkotlinx/coroutines/b/a;
+    iget-object v0, p0, Lkotlinx/coroutines/b/a$b;->bmr: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;->ES()Z
+    invoke-direct {p0}, Lkotlinx/coroutines/b/a$b;->EQ()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;->bmw:Lkotlinx/coroutines/b/a;
+    iget-object v1, p0, Lkotlinx/coroutines/b/a$b;->bmr: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;->bmu:I
+    iget v0, p0, Lkotlinx/coroutines/b/a$b;->bmp:I
 
     shl-int/lit8 v1, v0, 0xd
 
     xor-int/2addr v0, v1
 
-    iput v0, p0, Lkotlinx/coroutines/b/a$b;->bmu:I
+    iput v0, p0, Lkotlinx/coroutines/b/a$b;->bmp:I
 
-    iget v0, p0, Lkotlinx/coroutines/b/a$b;->bmu:I
+    iget v0, p0, Lkotlinx/coroutines/b/a$b;->bmp:I
 
     shr-int/lit8 v1, v0, 0x11
 
     xor-int/2addr v0, v1
 
-    iput v0, p0, Lkotlinx/coroutines/b/a$b;->bmu:I
+    iput v0, p0, Lkotlinx/coroutines/b/a$b;->bmp:I
 
-    iget v0, p0, Lkotlinx/coroutines/b/a$b;->bmu:I
+    iget v0, p0, Lkotlinx/coroutines/b/a$b;->bmp:I
 
     shl-int/lit8 v1, v0, 0x5
 
     xor-int/2addr v0, v1
 
-    iput v0, p0, Lkotlinx/coroutines/b/a$b;->bmu:I
+    iput v0, p0, Lkotlinx/coroutines/b/a$b;->bmp:I
 
     add-int/lit8 v0, p1, -0x1
 
@@ -433,14 +433,14 @@
 
     if-nez v1, :cond_0
 
-    iget p1, p0, Lkotlinx/coroutines/b/a$b;->bmu:I
+    iget p1, p0, Lkotlinx/coroutines/b/a$b;->bmp:I
 
     and-int/2addr p1, v0
 
     return p1
 
     :cond_0
-    iget v0, p0, Lkotlinx/coroutines/b/a$b;->bmu:I
+    iget v0, p0, Lkotlinx/coroutines/b/a$b;->bmp:I
 
     const v1, 0x7fffffff
 
@@ -453,12 +453,12 @@
 
 
 # virtual methods
-.method public final EP()Z
+.method public final EN()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;->bmz:Lkotlinx/coroutines/b/a$c;
+    sget-object v1, Lkotlinx/coroutines/b/a$c;->bmu:Lkotlinx/coroutines/b/a$c;
 
     if-ne v0, v1, :cond_0
 
@@ -472,7 +472,7 @@
     return v0
 .end method
 
-.method public final EQ()Z
+.method public final EO()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;->bmq:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/b/a$b;->bml: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 ER()Z
+.method public final EP()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;->bmx:Lkotlinx/coroutines/b/a$c;
+    sget-object v1, Lkotlinx/coroutines/b/a$c;->bms: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;->bmw:Lkotlinx/coroutines/b/a;
+    iget-object v0, p0, Lkotlinx/coroutines/b/a$b;->bmr: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;->bmx:Lkotlinx/coroutines/b/a$c;
+    sget-object v0, Lkotlinx/coroutines/b/a$c;->bms: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 ET()V
+.method public final ER()V
     .locals 1
 
-    invoke-static {}, Lkotlinx/coroutines/b/a;->EN()I
+    invoke-static {}, Lkotlinx/coroutines/b/a;->EL()I
 
     move-result v0
 
-    iput v0, p0, Lkotlinx/coroutines/b/a$b;->bmt:I
+    iput v0, p0, Lkotlinx/coroutines/b/a$b;->bmo:I
 
     const/4 v0, 0x0
 
@@ -581,37 +581,37 @@
     return-void
 .end method
 
-.method public final EU()Lkotlinx/coroutines/b/i;
+.method public final ES()Lkotlinx/coroutines/b/i;
     .locals 2
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/b/a$b;->ER()Z
+    invoke-virtual {p0}, Lkotlinx/coroutines/b/a$b;->EP()Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    invoke-direct {p0}, Lkotlinx/coroutines/b/a$b;->EV()Lkotlinx/coroutines/b/i;
+    invoke-direct {p0}, Lkotlinx/coroutines/b/a$b;->ET()Lkotlinx/coroutines/b/i;
 
     move-result-object v0
 
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Lkotlinx/coroutines/b/a$b;->bmp:Lkotlinx/coroutines/b/o;
+    iget-object v0, p0, Lkotlinx/coroutines/b/a$b;->bmk:Lkotlinx/coroutines/b/o;
 
-    invoke-virtual {v0}, Lkotlinx/coroutines/b/o;->Fb()Lkotlinx/coroutines/b/i;
+    invoke-virtual {v0}, Lkotlinx/coroutines/b/o;->EZ()Lkotlinx/coroutines/b/i;
 
     move-result-object v0
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lkotlinx/coroutines/b/a$b;->bmw:Lkotlinx/coroutines/b/a;
+    iget-object v0, p0, Lkotlinx/coroutines/b/a$b;->bmr: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;->bmQ:Lkotlinx/coroutines/b/l;
+    sget-object v1, Lkotlinx/coroutines/b/l;->bmL: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;->bmx:Lkotlinx/coroutines/b/a$c;
+    sget-object v1, Lkotlinx/coroutines/b/a$c;->bms: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;->bmw:Lkotlinx/coroutines/b/a;
+    iget-object v2, p0, Lkotlinx/coroutines/b/a$b;->bmr: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;->bmw:Lkotlinx/coroutines/b/a;
+    iget-object v3, p0, Lkotlinx/coroutines/b/a$b;->bmr: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;->bmB:Lkotlinx/coroutines/b/a$c;
+    sget-object v4, Lkotlinx/coroutines/b/a$c;->bmw:Lkotlinx/coroutines/b/a$c;
 
     if-eq v3, v4, :cond_17
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/b/a$b;->EU()Lkotlinx/coroutines/b/i;
+    invoke-virtual {p0}, Lkotlinx/coroutines/b/a$b;->ES()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;->bmx:Lkotlinx/coroutines/b/a$c;
+    sget-object v3, Lkotlinx/coroutines/b/a$c;->bms: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;->EK()I
+    invoke-static {}, Lkotlinx/coroutines/b/a;->EI()I
 
     move-result v3
 
@@ -712,7 +712,7 @@
 
     iput v3, p0, Lkotlinx/coroutines/b/a$b;->spins:I
 
-    invoke-static {}, Lkotlinx/coroutines/b/a;->EL()I
+    invoke-static {}, Lkotlinx/coroutines/b/a;->EJ()I
 
     move-result v3
 
@@ -723,21 +723,21 @@
     goto/16 :goto_1
 
     :cond_1
-    iget v2, p0, Lkotlinx/coroutines/b/a$b;->bmt:I
+    iget v2, p0, Lkotlinx/coroutines/b/a$b;->bmo:I
 
-    invoke-static {}, Lkotlinx/coroutines/b/a;->EM()I
+    invoke-static {}, Lkotlinx/coroutines/b/a;->EK()I
 
     move-result v3
 
     if-ge v2, v3, :cond_2
 
-    iget v2, p0, Lkotlinx/coroutines/b/a$b;->bmt:I
+    iget v2, p0, Lkotlinx/coroutines/b/a$b;->bmo:I
 
     mul-int/lit8 v2, v2, 0x3
 
     ushr-int/2addr v2, v0
 
-    invoke-static {}, Lkotlinx/coroutines/b/a;->EM()I
+    invoke-static {}, Lkotlinx/coroutines/b/a;->EK()I
 
     move-result v3
 
@@ -745,14 +745,14 @@
 
     move-result v2
 
-    iput v2, p0, Lkotlinx/coroutines/b/a$b;->bmt:I
+    iput v2, p0, Lkotlinx/coroutines/b/a$b;->bmo:I
 
     :cond_2
-    sget-object v2, Lkotlinx/coroutines/b/a$c;->bmz:Lkotlinx/coroutines/b/a$c;
+    sget-object v2, Lkotlinx/coroutines/b/a$c;->bmu: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;->bmt:I
+    iget v2, p0, Lkotlinx/coroutines/b/a$b;->bmo:I
 
     int-to-long v2, v2
 
@@ -761,11 +761,11 @@
     goto/16 :goto_1
 
     :cond_3
-    sget-object v2, Lkotlinx/coroutines/b/a$c;->bmz:Lkotlinx/coroutines/b/a$c;
+    sget-object v2, Lkotlinx/coroutines/b/a$c;->bmu: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;->ES()Z
+    invoke-direct {p0}, Lkotlinx/coroutines/b/a$b;->EQ()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;->bmr:J
+    iget-wide v2, p0, Lkotlinx/coroutines/b/a$b;->bmm:J
 
     cmp-long v6, v2, v4
 
@@ -783,7 +783,7 @@
 
     move-result-wide v2
 
-    iget-object v6, p0, Lkotlinx/coroutines/b/a$b;->bmw:Lkotlinx/coroutines/b/a;
+    iget-object v6, p0, Lkotlinx/coroutines/b/a$b;->bmr: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;->bmr:J
+    iput-wide v2, p0, Lkotlinx/coroutines/b/a$b;->bmm:J
 
     :cond_4
-    iget-object v2, p0, Lkotlinx/coroutines/b/a$b;->bmw:Lkotlinx/coroutines/b/a;
+    iget-object v2, p0, Lkotlinx/coroutines/b/a$b;->bmr: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;->bmr:J
+    iget-wide v6, p0, Lkotlinx/coroutines/b/a$b;->bmm:J
 
     sub-long/2addr v2, v6
 
@@ -818,9 +818,9 @@
 
     if-ltz v6, :cond_b
 
-    iput-wide v4, p0, Lkotlinx/coroutines/b/a$b;->bmr:J
+    iput-wide v4, p0, Lkotlinx/coroutines/b/a$b;->bmm:J
 
-    iget-object v2, p0, Lkotlinx/coroutines/b/a$b;->bmw:Lkotlinx/coroutines/b/a;
+    iget-object v2, p0, Lkotlinx/coroutines/b/a$b;->bmr: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;->bmw:Lkotlinx/coroutines/b/a;
+    iget-object v3, p0, Lkotlinx/coroutines/b/a$b;->bmr: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;->bmw:Lkotlinx/coroutines/b/a;
+    iget-object v3, p0, Lkotlinx/coroutines/b/a$b;->bmr: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;->bmw:Lkotlinx/coroutines/b/a;
+    iget-object v4, p0, Lkotlinx/coroutines/b/a$b;->bmr: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;->ES()Z
+    invoke-direct {p0}, Lkotlinx/coroutines/b/a$b;->EQ()Z
 
     move-result v3
     :try_end_2
@@ -881,7 +881,7 @@
 
     :cond_7
     :try_start_3
-    sget-object v3, Lkotlinx/coroutines/b/a$b;->bmq:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sget-object v3, Lkotlinx/coroutines/b/a$b;->bml: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;->bmw:Lkotlinx/coroutines/b/a;
+    iget-object v4, p0, Lkotlinx/coroutines/b/a$b;->bmr: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;->bmw:Lkotlinx/coroutines/b/a;
+    iget-object v4, p0, Lkotlinx/coroutines/b/a$b;->bmr:Lkotlinx/coroutines/b/a;
 
-    sget-object v5, Lkotlinx/coroutines/b/a;->bmd:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+    sget-object v5, Lkotlinx/coroutines/b/a;->blY: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;->bmw:Lkotlinx/coroutines/b/a;
+    iget-object v4, p0, Lkotlinx/coroutines/b/a$b;->bmr: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;->bmw:Lkotlinx/coroutines/b/a;
+    iget-object v6, p0, Lkotlinx/coroutines/b/a$b;->bmr: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;->bmw:Lkotlinx/coroutines/b/a;
+    iget-object v6, p0, Lkotlinx/coroutines/b/a$b;->bmr: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;->bmw:Lkotlinx/coroutines/b/a;
+    iget-object v3, p0, Lkotlinx/coroutines/b/a$b;->bmr: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;->bgy:Lkotlin/Unit;
+    sget-object v3, Lkotlin/Unit;->bgt: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;->bmB:Lkotlinx/coroutines/b/a$c;
+    sget-object v2, Lkotlinx/coroutines/b/a$c;->bmw: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;->EZ()Lkotlinx/coroutines/b/l;
+    invoke-virtual {v3}, Lkotlinx/coroutines/b/i;->EX()Lkotlinx/coroutines/b/l;
 
     move-result-object v6
 
     if-eqz v2, :cond_11
 
-    iput-wide v4, p0, Lkotlinx/coroutines/b/a$b;->bmr:J
+    iput-wide v4, p0, Lkotlinx/coroutines/b/a$b;->bmm:J
 
-    iput v1, p0, Lkotlinx/coroutines/b/a$b;->bmv:I
+    iput v1, p0, Lkotlinx/coroutines/b/a$b;->bmq:I
 
     iget-object v2, p0, Lkotlinx/coroutines/b/a$b;->state:Lkotlinx/coroutines/b/a$c;
 
-    sget-object v4, Lkotlinx/coroutines/b/a$c;->bmz:Lkotlinx/coroutines/b/a$c;
+    sget-object v4, Lkotlinx/coroutines/b/a$c;->bmu:Lkotlinx/coroutines/b/a$c;
 
     if-ne v2, v4, :cond_10
 
-    sget-object v2, Lkotlinx/coroutines/b/l;->bmQ:Lkotlinx/coroutines/b/l;
+    sget-object v2, Lkotlinx/coroutines/b/l;->bmL: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;->bgz:Z
+    sget-boolean v4, Lkotlin/v;->bgu:Z
 
     if-eqz v4, :cond_f
 
@@ -1034,15 +1034,15 @@
 
     :cond_f
     :goto_3
-    sget-object v2, Lkotlinx/coroutines/b/a$c;->bmy:Lkotlinx/coroutines/b/a$c;
+    sget-object v2, Lkotlinx/coroutines/b/a$c;->bmt: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;->EN()I
+    invoke-static {}, Lkotlinx/coroutines/b/a;->EL()I
 
     move-result v2
 
-    iput v2, p0, Lkotlinx/coroutines/b/a$b;->bmt:I
+    iput v2, p0, Lkotlinx/coroutines/b/a$b;->bmo: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;->bmM:J
+    iget-wide v4, v3, Lkotlinx/coroutines/b/i;->bmH:J
 
-    sget-object v7, Lkotlinx/coroutines/b/l;->bmP:Lkotlinx/coroutines/b/l;
+    sget-object v7, Lkotlinx/coroutines/b/l;->bmK:Lkotlinx/coroutines/b/l;
 
     if-eq v6, v7, :cond_12
 
-    iget-object v4, p0, Lkotlinx/coroutines/b/a$b;->bmw:Lkotlinx/coroutines/b/a;
+    iget-object v4, p0, Lkotlinx/coroutines/b/a$b;->bmr:Lkotlinx/coroutines/b/a;
 
-    sget-object v5, Lkotlinx/coroutines/b/a;->bmd:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+    sget-object v5, Lkotlinx/coroutines/b/a;->blY: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;->bmy:Lkotlinx/coroutines/b/a$c;
+    sget-object v4, Lkotlinx/coroutines/b/a$c;->bmt: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;->bmw:Lkotlinx/coroutines/b/a;
+    iget-object v4, p0, Lkotlinx/coroutines/b/a$b;->bmr: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;->bmw:Lkotlinx/coroutines/b/a;
+    iget-object v7, p0, Lkotlinx/coroutines/b/a$b;->bmr: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;->bmW:Lkotlinx/coroutines/b/n;
+    sget-object v7, Lkotlinx/coroutines/b/m;->bmR:Lkotlinx/coroutines/b/n;
 
-    invoke-virtual {v7}, Lkotlinx/coroutines/b/n;->ns()J
+    invoke-virtual {v7}, Lkotlinx/coroutines/b/n;->nq()J
 
     move-result-wide v7
 
     sub-long v4, v7, v4
 
-    sget-wide v9, Lkotlinx/coroutines/b/m;->bmS:J
+    sget-wide v9, Lkotlinx/coroutines/b/m;->bmN:J
 
     cmp-long v11, v4, v9
 
     if-ltz v11, :cond_13
 
-    iget-wide v4, p0, Lkotlinx/coroutines/b/a$b;->bms:J
+    iget-wide v4, p0, Lkotlinx/coroutines/b/a$b;->bmn:J
 
     sub-long v4, v7, v4
 
-    sget-wide v9, Lkotlinx/coroutines/b/m;->bmS:J
+    sget-wide v9, Lkotlinx/coroutines/b/m;->bmN:J
 
     const-wide/16 v11, 0x5
 
@@ -1119,9 +1119,9 @@
 
     if-ltz v11, :cond_13
 
-    iput-wide v7, p0, Lkotlinx/coroutines/b/a$b;->bms:J
+    iput-wide v7, p0, Lkotlinx/coroutines/b/a$b;->bmn:J
 
-    iget-object v4, p0, Lkotlinx/coroutines/b/a$b;->bmw:Lkotlinx/coroutines/b/a;
+    iget-object v4, p0, Lkotlinx/coroutines/b/a$b;->bmr: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;->bmP:Lkotlinx/coroutines/b/l;
+    sget-object v3, Lkotlinx/coroutines/b/l;->bmK:Lkotlinx/coroutines/b/l;
 
     if-eq v6, v3, :cond_0
 
-    iget-object v3, p0, Lkotlinx/coroutines/b/a$b;->bmw:Lkotlinx/coroutines/b/a;
+    iget-object v3, p0, Lkotlinx/coroutines/b/a$b;->bmr:Lkotlinx/coroutines/b/a;
 
-    sget-object v4, Lkotlinx/coroutines/b/a;->bmd:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+    sget-object v4, Lkotlinx/coroutines/b/a;->blY: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;->bmB:Lkotlinx/coroutines/b/a$c;
+    sget-object v4, Lkotlinx/coroutines/b/a$c;->bmw:Lkotlinx/coroutines/b/a$c;
 
     if-eq v3, v4, :cond_0
 
-    sget-object v4, Lkotlinx/coroutines/b/a$c;->bmy:Lkotlinx/coroutines/b/a$c;
+    sget-object v4, Lkotlinx/coroutines/b/a$c;->bmt: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;->bgz:Z
+    sget-boolean v5, Lkotlin/v;->bgu:Z
 
     if-eqz v5, :cond_16
 
@@ -1188,14 +1188,14 @@
 
     :cond_16
     :goto_6
-    sget-object v3, Lkotlinx/coroutines/b/a$c;->bmA:Lkotlinx/coroutines/b/a$c;
+    sget-object v3, Lkotlinx/coroutines/b/a$c;->bmv: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;->bmB:Lkotlinx/coroutines/b/a$c;
+    sget-object v0, Lkotlinx/coroutines/b/a$c;->bmw: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 383dc527b2..617eb4b469 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 bmA:Lkotlinx/coroutines/b/a$c;
+.field public static final enum bms:Lkotlinx/coroutines/b/a$c;
 
-.field public static final enum bmB:Lkotlinx/coroutines/b/a$c;
+.field public static final enum bmt:Lkotlinx/coroutines/b/a$c;
 
-.field private static final synthetic bmC:[Lkotlinx/coroutines/b/a$c;
+.field public static final enum bmu:Lkotlinx/coroutines/b/a$c;
 
-.field public static final enum bmx:Lkotlinx/coroutines/b/a$c;
+.field public static final enum bmv:Lkotlinx/coroutines/b/a$c;
 
-.field public static final enum bmy:Lkotlinx/coroutines/b/a$c;
+.field public static final enum bmw:Lkotlinx/coroutines/b/a$c;
 
-.field public static final enum bmz:Lkotlinx/coroutines/b/a$c;
+.field private static final synthetic bmx:[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;->bmx:Lkotlinx/coroutines/b/a$c;
+    sput-object v1, Lkotlinx/coroutines/b/a$c;->bms: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;->bmy:Lkotlinx/coroutines/b/a$c;
+    sput-object v1, Lkotlinx/coroutines/b/a$c;->bmt: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;->bmz:Lkotlinx/coroutines/b/a$c;
+    sput-object v1, Lkotlinx/coroutines/b/a$c;->bmu: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;->bmA:Lkotlinx/coroutines/b/a$c;
+    sput-object v1, Lkotlinx/coroutines/b/a$c;->bmv: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;->bmB:Lkotlinx/coroutines/b/a$c;
+    sput-object v1, Lkotlinx/coroutines/b/a$c;->bmw:Lkotlinx/coroutines/b/a$c;
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lkotlinx/coroutines/b/a$c;->bmC:[Lkotlinx/coroutines/b/a$c;
+    sput-object v0, Lkotlinx/coroutines/b/a$c;->bmx:[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;->bmC:[Lkotlinx/coroutines/b/a$c;
+    sget-object v0, Lkotlinx/coroutines/b/a$c;->bmx:[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 293d2c7f2d..b36bef6b91 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 bmb:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+.field private static final blW:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
 
-.field static final bmd:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+.field static final blY:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
 
-.field private static final bme:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+.field private static final blZ:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
-.field private static final bmj:I
+.field private static final bme:I
 
-.field private static final bmk:I
+.field private static final bmf:I
 
-.field private static final bml:I
+.field private static final bmg:I
 
-.field private static final bmm:I
+.field private static final bmh:I
 
-.field private static final bmn:Lkotlinx/coroutines/internal/v;
+.field private static final bmi:Lkotlinx/coroutines/internal/v;
 
-.field public static final bmo:Lkotlinx/coroutines/b/a$a;
+.field public static final bmj:Lkotlinx/coroutines/b/a$a;
 
 
 # instance fields
 .field private volatile _isTerminated:I
 
-.field private final blZ:Lkotlinx/coroutines/b/e;
+.field private final blU:Lkotlinx/coroutines/b/e;
 
-.field private final bma:Ljava/util/concurrent/Semaphore;
+.field private final blV:Ljava/util/concurrent/Semaphore;
 
-.field private final bmc:[Lkotlinx/coroutines/b/a$b;
+.field private final blX:[Lkotlinx/coroutines/b/a$b;
 
-.field private final bmf:I
+.field private final bma:I
 
-.field private final bmg:I
+.field private final bmb:I
 
-.field private final bmh:J
+.field private final bmc:J
 
-.field private final bmi:Ljava/lang/String;
+.field private final bmd: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;->bmo:Lkotlinx/coroutines/b/a$a;
+    sput-object v1, Lkotlinx/coroutines/b/a;->bmj:Lkotlinx/coroutines/b/a$a;
 
     const/16 v1, 0x8
 
@@ -87,7 +87,7 @@
 
     move-result v3
 
-    sput v3, Lkotlinx/coroutines/b/a;->bmj:I
+    sput v3, Lkotlinx/coroutines/b/a;->bme:I
 
     const-string v4, "kotlinx.coroutines.scheduler.yields"
 
@@ -97,7 +97,7 @@
 
     add-int/2addr v3, v1
 
-    sput v3, Lkotlinx/coroutines/b/a;->bmk:I
+    sput v3, Lkotlinx/coroutines/b/a;->bmf: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;->bml:I
+    sput v2, Lkotlinx/coroutines/b/a;->bmg:I
 
-    sget-wide v1, Lkotlinx/coroutines/b/m;->bmS:J
+    sget-wide v1, Lkotlinx/coroutines/b/m;->bmN:J
 
     const-wide/16 v3, 0x4
 
@@ -123,7 +123,7 @@
 
     move-result-wide v1
 
-    sget v3, Lkotlinx/coroutines/b/a;->bml:I
+    sget v3, Lkotlinx/coroutines/b/a;->bmg:I
 
     int-to-long v3, v3
 
@@ -133,7 +133,7 @@
 
     long-to-int v2, v1
 
-    sput v2, Lkotlinx/coroutines/b/a;->bmm:I
+    sput v2, Lkotlinx/coroutines/b/a;->bmh: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;->bmn:Lkotlinx/coroutines/internal/v;
+    sput-object v1, Lkotlinx/coroutines/b/a;->bmi:Lkotlinx/coroutines/internal/v;
 
     const-string v1, "parkedWorkersStack"
 
@@ -149,7 +149,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lkotlinx/coroutines/b/a;->bmb:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+    sput-object v1, Lkotlinx/coroutines/b/a;->blW:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
 
     const-string v1, "controlState"
 
@@ -157,7 +157,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lkotlinx/coroutines/b/a;->bmd:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+    sput-object v1, Lkotlinx/coroutines/b/a;->blY:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
 
     const-string v1, "_isTerminated"
 
@@ -165,7 +165,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lkotlinx/coroutines/b/a;->bme:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sput-object v0, Lkotlinx/coroutines/b/a;->blZ: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;->bmf:I
+    iput p1, p0, Lkotlinx/coroutines/b/a;->bma:I
 
-    iput p2, p0, Lkotlinx/coroutines/b/a;->bmg:I
+    iput p2, p0, Lkotlinx/coroutines/b/a;->bmb:I
 
-    iput-wide p3, p0, Lkotlinx/coroutines/b/a;->bmh:J
+    iput-wide p3, p0, Lkotlinx/coroutines/b/a;->bmc:J
 
-    iput-object p5, p0, Lkotlinx/coroutines/b/a;->bmi:Ljava/lang/String;
+    iput-object p5, p0, Lkotlinx/coroutines/b/a;->bmd:Ljava/lang/String;
 
-    iget p1, p0, Lkotlinx/coroutines/b/a;->bmf:I
+    iget p1, p0, Lkotlinx/coroutines/b/a;->bma:I
 
     const/4 p2, 0x1
 
@@ -205,9 +205,9 @@
     :goto_0
     if-eqz p1, :cond_7
 
-    iget p1, p0, Lkotlinx/coroutines/b/a;->bmg:I
+    iget p1, p0, Lkotlinx/coroutines/b/a;->bmb:I
 
-    iget p4, p0, Lkotlinx/coroutines/b/a;->bmf:I
+    iget p4, p0, Lkotlinx/coroutines/b/a;->bma:I
 
     if-lt p1, p4, :cond_1
 
@@ -223,7 +223,7 @@
 
     if-eqz p1, :cond_6
 
-    iget p1, p0, Lkotlinx/coroutines/b/a;->bmg:I
+    iget p1, p0, Lkotlinx/coroutines/b/a;->bmb:I
 
     const p5, 0x1ffffe
 
@@ -239,7 +239,7 @@
     :goto_2
     if-eqz p1, :cond_5
 
-    iget-wide p4, p0, Lkotlinx/coroutines/b/a;->bmh:J
+    iget-wide p4, p0, Lkotlinx/coroutines/b/a;->bmc: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;->blZ:Lkotlinx/coroutines/b/e;
+    iput-object p1, p0, Lkotlinx/coroutines/b/a;->blU:Lkotlinx/coroutines/b/e;
 
     new-instance p1, Ljava/util/concurrent/Semaphore;
 
-    iget p4, p0, Lkotlinx/coroutines/b/a;->bmf:I
+    iget p4, p0, Lkotlinx/coroutines/b/a;->bma:I
 
     invoke-direct {p1, p4, p3}, Ljava/util/concurrent/Semaphore;-><init>(IZ)V
 
-    iput-object p1, p0, Lkotlinx/coroutines/b/a;->bma:Ljava/util/concurrent/Semaphore;
+    iput-object p1, p0, Lkotlinx/coroutines/b/a;->blV:Ljava/util/concurrent/Semaphore;
 
     iput-wide v0, p0, Lkotlinx/coroutines/b/a;->parkedWorkersStack:J
 
-    iget p1, p0, Lkotlinx/coroutines/b/a;->bmg:I
+    iget p1, p0, Lkotlinx/coroutines/b/a;->bmb:I
 
     add-int/2addr p1, p2
 
     new-array p1, p1, [Lkotlinx/coroutines/b/a$b;
 
-    iput-object p1, p0, Lkotlinx/coroutines/b/a;->bmc:[Lkotlinx/coroutines/b/a$b;
+    iput-object p1, p0, Lkotlinx/coroutines/b/a;->blX:[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;->bmh:J
+    iget-wide p2, p0, Lkotlinx/coroutines/b/a;->bmc: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;->bmg:I
+    iget p2, p0, Lkotlinx/coroutines/b/a;->bmb: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;->bmg:I
+    iget p2, p0, Lkotlinx/coroutines/b/a;->bmb: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;->bmf:I
+    iget p2, p0, Lkotlinx/coroutines/b/a;->bma: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;->bmf:I
+    iget p2, p0, Lkotlinx/coroutines/b/a;->bma:I
 
     invoke-virtual {p1, p2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
@@ -418,7 +418,7 @@
     throw p2
 .end method
 
-.method private final EF()Lkotlinx/coroutines/b/a$b;
+.method private final ED()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;->bmc:[Lkotlinx/coroutines/b/a$b;
+    iget-object v0, p0, Lkotlinx/coroutines/b/a;->blX:[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;->bmb:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+    sget-object v5, Lkotlinx/coroutines/b/a;->blW: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;->bmn:Lkotlinx/coroutines/internal/v;
+    sget-object v0, Lkotlinx/coroutines/b/a;->bmi: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 EG()V
+.method private final EE()V
     .locals 6
 
-    iget-object v0, p0, Lkotlinx/coroutines/b/a;->bma:Ljava/util/concurrent/Semaphore;
+    iget-object v0, p0, Lkotlinx/coroutines/b/a;->blV: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;->EH()Z
+    invoke-direct {p0}, Lkotlinx/coroutines/b/a;->EF()Z
 
     return-void
 
     :cond_0
-    invoke-direct {p0}, Lkotlinx/coroutines/b/a;->EH()Z
+    invoke-direct {p0}, Lkotlinx/coroutines/b/a;->EF()Z
 
     move-result v0
 
@@ -525,11 +525,11 @@
 
     sub-int/2addr v3, v1
 
-    iget v0, p0, Lkotlinx/coroutines/b/a;->bmf:I
+    iget v0, p0, Lkotlinx/coroutines/b/a;->bma:I
 
     if-ge v3, v0, :cond_3
 
-    invoke-direct {p0}, Lkotlinx/coroutines/b/a;->EI()I
+    invoke-direct {p0}, Lkotlinx/coroutines/b/a;->EG()I
 
     move-result v0
 
@@ -537,11 +537,11 @@
 
     if-ne v0, v1, :cond_2
 
-    iget v2, p0, Lkotlinx/coroutines/b/a;->bmf:I
+    iget v2, p0, Lkotlinx/coroutines/b/a;->bma:I
 
     if-le v2, v1, :cond_2
 
-    invoke-direct {p0}, Lkotlinx/coroutines/b/a;->EI()I
+    invoke-direct {p0}, Lkotlinx/coroutines/b/a;->EG()I
 
     :cond_2
     if-lez v0, :cond_3
@@ -549,16 +549,16 @@
     return-void
 
     :cond_3
-    invoke-direct {p0}, Lkotlinx/coroutines/b/a;->EH()Z
+    invoke-direct {p0}, Lkotlinx/coroutines/b/a;->EF()Z
 
     return-void
 .end method
 
-.method private final EH()Z
+.method private final EF()Z
     .locals 3
 
     :cond_0
-    invoke-direct {p0}, Lkotlinx/coroutines/b/a;->EF()Lkotlinx/coroutines/b/a$b;
+    invoke-direct {p0}, Lkotlinx/coroutines/b/a;->ED()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;->ET()V
+    invoke-virtual {v0}, Lkotlinx/coroutines/b/a$b;->ER()V
 
-    invoke-virtual {v0}, Lkotlinx/coroutines/b/a$b;->EP()Z
+    invoke-virtual {v0}, Lkotlinx/coroutines/b/a$b;->EN()Z
 
     move-result v1
 
@@ -583,7 +583,7 @@
 
     if-eqz v1, :cond_0
 
-    invoke-virtual {v0}, Lkotlinx/coroutines/b/a$b;->EQ()Z
+    invoke-virtual {v0}, Lkotlinx/coroutines/b/a$b;->EO()Z
 
     move-result v0
 
@@ -594,10 +594,10 @@
     return v0
 .end method
 
-.method private final EI()I
+.method private final EG()I
     .locals 10
 
-    iget-object v0, p0, Lkotlinx/coroutines/b/a;->bmc:[Lkotlinx/coroutines/b/a$b;
+    iget-object v0, p0, Lkotlinx/coroutines/b/a;->blX:[Lkotlinx/coroutines/b/a$b;
 
     monitor-enter v0
 
@@ -638,7 +638,7 @@
 
     sub-int v1, v6, v2
 
-    iget v2, p0, Lkotlinx/coroutines/b/a;->bmf:I
+    iget v2, p0, Lkotlinx/coroutines/b/a;->bma: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;->bmg:I
+    iget v2, p0, Lkotlinx/coroutines/b/a;->bmb:I
 
     if-ge v6, v2, :cond_7
 
-    iget-object v2, p0, Lkotlinx/coroutines/b/a;->bma:Ljava/util/concurrent/Semaphore;
+    iget-object v2, p0, Lkotlinx/coroutines/b/a;->blV: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;->bmc:[Lkotlinx/coroutines/b/a$b;
+    iget-object v7, p0, Lkotlinx/coroutines/b/a;->blX:[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;->bmd:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+    sget-object v8, Lkotlinx/coroutines/b/a;->blY: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;->bmc:[Lkotlinx/coroutines/b/a$b;
+    iget-object v3, p0, Lkotlinx/coroutines/b/a;->blX:[Lkotlinx/coroutines/b/a$b;
 
     aput-object v7, v3, v2
     :try_end_2
@@ -777,7 +777,7 @@
     throw v1
 .end method
 
-.method private final EJ()Lkotlinx/coroutines/b/a$b;
+.method private final EH()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;->bmw:Lkotlinx/coroutines/b/a;
+    iget-object v1, v0, Lkotlinx/coroutines/b/a$b;->bmr:Lkotlinx/coroutines/b/a;
 
     move-object v3, p0
 
@@ -815,10 +815,26 @@
     return-object v2
 .end method
 
+.method public static final synthetic EI()I
+    .locals 1
+
+    sget v0, Lkotlinx/coroutines/b/a;->bmf:I
+
+    return v0
+.end method
+
+.method public static final synthetic EJ()I
+    .locals 1
+
+    sget v0, Lkotlinx/coroutines/b/a;->bme:I
+
+    return v0
+.end method
+
 .method public static final synthetic EK()I
     .locals 1
 
-    sget v0, Lkotlinx/coroutines/b/a;->bmk:I
+    sget v0, Lkotlinx/coroutines/b/a;->bmg:I
 
     return v0
 .end method
@@ -826,31 +842,15 @@
 .method public static final synthetic EL()I
     .locals 1
 
-    sget v0, Lkotlinx/coroutines/b/a;->bmj:I
+    sget v0, Lkotlinx/coroutines/b/a;->bmh:I
 
     return v0
 .end method
 
-.method public static final synthetic EM()I
+.method public static final synthetic EM()Lkotlinx/coroutines/internal/v;
     .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;
+    sget-object v0, Lkotlinx/coroutines/b/a;->bmi: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;->bmn:Lkotlinx/coroutines/internal/v;
+    sget-object v0, Lkotlinx/coroutines/b/a;->bmi: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;->bmi:Ljava/lang/String;
+    iget-object p0, p0, Lkotlinx/coroutines/b/a;->bmd: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;->bmW:Lkotlinx/coroutines/b/n;
+    sget-object v0, Lkotlinx/coroutines/b/m;->bmR:Lkotlinx/coroutines/b/n;
 
-    invoke-virtual {v0}, Lkotlinx/coroutines/b/n;->ns()J
+    invoke-virtual {v0}, Lkotlinx/coroutines/b/n;->nq()J
 
     move-result-wide v0
 
@@ -922,9 +922,9 @@
 
     check-cast p0, Lkotlinx/coroutines/b/i;
 
-    iput-wide v0, p0, Lkotlinx/coroutines/b/i;->bmM:J
+    iput-wide v0, p0, Lkotlinx/coroutines/b/i;->bmH:J
 
-    iput-object p1, p0, Lkotlinx/coroutines/b/i;->bmN:Lkotlinx/coroutines/b/j;
+    iput-object p1, p0, Lkotlinx/coroutines/b/i;->bmI: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;->bmL:Lkotlinx/coroutines/b/h;
+    sget-object v0, Lkotlinx/coroutines/b/h;->bmG: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;->bmn:Lkotlinx/coroutines/internal/v;
+    sget-object v1, Lkotlinx/coroutines/b/a;->bmi: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;->bgz:Z
+    sget-boolean v7, Lkotlin/v;->bgu:Z
 
     if-eqz v7, :cond_3
 
@@ -1011,13 +1011,13 @@
 
     :cond_3
     :goto_1
-    iget-object v6, p0, Lkotlinx/coroutines/b/a;->bmc:[Lkotlinx/coroutines/b/a$b;
+    iget-object v6, p0, Lkotlinx/coroutines/b/a;->blX:[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;->bmb:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+    sget-object v1, Lkotlinx/coroutines/b/a;->blW: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;->bmb:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+    sget-object v1, Lkotlinx/coroutines/b/a;->blW: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;->El()Lkotlinx/coroutines/cc;
+    invoke-static {}, Lkotlinx/coroutines/cd;->Ej()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;->El()Lkotlinx/coroutines/cc;
+    invoke-static {}, Lkotlinx/coroutines/cd;->Ej()Lkotlinx/coroutines/cc;
 
     return-void
 
     :catchall_1
     move-exception p0
 
-    invoke-static {}, Lkotlinx/coroutines/cd;->El()Lkotlinx/coroutines/cc;
+    invoke-static {}, Lkotlinx/coroutines/cd;->Ej()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;->bma:Ljava/util/concurrent/Semaphore;
+    iget-object p0, p0, Lkotlinx/coroutines/b/a;->blV: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;->EG()V
+    invoke-direct {p0}, Lkotlinx/coroutines/b/a;->EE()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;->bmh:J
+    iget-wide v0, p0, Lkotlinx/coroutines/b/a;->bmc: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;->bmc:[Lkotlinx/coroutines/b/a$b;
+    iget-object p0, p0, Lkotlinx/coroutines/b/a;->blX:[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;->bmf:I
+    iget p0, p0, Lkotlinx/coroutines/b/a;->bma: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;->blZ:Lkotlinx/coroutines/b/e;
+    iget-object p0, p0, Lkotlinx/coroutines/b/a;->blU: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;->El()Lkotlinx/coroutines/cc;
+    invoke-static {}, Lkotlinx/coroutines/cd;->Ej()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;->EJ()Lkotlinx/coroutines/b/a$b;
+    invoke-direct {p0}, Lkotlinx/coroutines/b/a;->EH()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;->bmB:Lkotlinx/coroutines/b/a$c;
+    sget-object v4, Lkotlinx/coroutines/b/a$c;->bmw:Lkotlinx/coroutines/b/a$c;
 
     if-ne v3, v4, :cond_1
 
     goto :goto_0
 
     :cond_1
-    invoke-virtual {p1}, Lkotlinx/coroutines/b/i;->EZ()Lkotlinx/coroutines/b/l;
+    invoke-virtual {p1}, Lkotlinx/coroutines/b/i;->EX()Lkotlinx/coroutines/b/l;
 
     move-result-object v3
 
-    sget-object v4, Lkotlinx/coroutines/b/l;->bmP:Lkotlinx/coroutines/b/l;
+    sget-object v4, Lkotlinx/coroutines/b/l;->bmK: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;->bmy:Lkotlinx/coroutines/b/a$c;
+    sget-object v4, Lkotlinx/coroutines/b/a$c;->bmt: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;->ER()Z
+    invoke-virtual {p2}, Lkotlinx/coroutines/b/a$b;->EP()Z
 
     move-result v3
 
@@ -1339,9 +1339,9 @@
     :goto_2
     if-eqz p3, :cond_5
 
-    iget-object p3, p2, Lkotlinx/coroutines/b/a$b;->bmp:Lkotlinx/coroutines/b/o;
+    iget-object p3, p2, Lkotlinx/coroutines/b/a$b;->bmk:Lkotlinx/coroutines/b/o;
 
-    iget-object v4, p0, Lkotlinx/coroutines/b/a;->blZ:Lkotlinx/coroutines/b/e;
+    iget-object v4, p0, Lkotlinx/coroutines/b/a;->blU: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;->bmp:Lkotlinx/coroutines/b/o;
+    iget-object p3, p2, Lkotlinx/coroutines/b/a$b;->bmk:Lkotlinx/coroutines/b/o;
 
-    iget-object v4, p0, Lkotlinx/coroutines/b/a;->blZ:Lkotlinx/coroutines/b/e;
+    iget-object v4, p0, Lkotlinx/coroutines/b/a;->blU: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;->bmp:Lkotlinx/coroutines/b/o;
+    iget-object p2, p2, Lkotlinx/coroutines/b/a$b;->bmk:Lkotlinx/coroutines/b/o;
 
-    invoke-virtual {p2}, Lkotlinx/coroutines/b/o;->Fa()I
+    invoke-virtual {p2}, Lkotlinx/coroutines/b/o;->EY()I
 
     move-result p2
 
-    sget p3, Lkotlinx/coroutines/b/m;->bmT:I
+    sget p3, Lkotlinx/coroutines/b/m;->bmO:I
 
     if-gt p2, p3, :cond_6
 
@@ -1379,12 +1379,12 @@
 
     if-eq v1, v2, :cond_7
 
-    invoke-direct {p0}, Lkotlinx/coroutines/b/a;->EG()V
+    invoke-direct {p0}, Lkotlinx/coroutines/b/a;->EE()V
 
     return-void
 
     :cond_7
-    iget-object p2, p0, Lkotlinx/coroutines/b/a;->blZ:Lkotlinx/coroutines/b/e;
+    iget-object p2, p0, Lkotlinx/coroutines/b/a;->blU: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;->EG()V
+    invoke-direct {p0}, Lkotlinx/coroutines/b/a;->EE()V
 
     return-void
 
@@ -1403,7 +1403,7 @@
 
     invoke-direct {p2}, Ljava/lang/StringBuilder;-><init>()V
 
-    iget-object p3, p0, Lkotlinx/coroutines/b/a;->bmi:Ljava/lang/String;
+    iget-object p3, p0, Lkotlinx/coroutines/b/a;->bmd: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;->bme:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/b/a;->blZ: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;->EJ()Lkotlinx/coroutines/b/a$b;
+    invoke-direct {p0}, Lkotlinx/coroutines/b/a;->EH()Lkotlinx/coroutines/b/a$b;
 
     move-result-object v0
 
-    iget-object v3, p0, Lkotlinx/coroutines/b/a;->bmc:[Lkotlinx/coroutines/b/a$b;
+    iget-object v3, p0, Lkotlinx/coroutines/b/a;->blX:[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;->bmc:[Lkotlinx/coroutines/b/a$b;
+    iget-object v4, p0, Lkotlinx/coroutines/b/a;->blX:[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;->bmB:Lkotlinx/coroutines/b/a$c;
+    sget-object v7, Lkotlinx/coroutines/b/a$c;->bmw: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;->bmp:Lkotlinx/coroutines/b/o;
+    iget-object v4, v4, Lkotlinx/coroutines/b/a$b;->bmk:Lkotlinx/coroutines/b/o;
 
-    iget-object v6, p0, Lkotlinx/coroutines/b/a;->blZ:Lkotlinx/coroutines/b/e;
+    iget-object v6, p0, Lkotlinx/coroutines/b/a;->blU: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;->blZ:Lkotlinx/coroutines/b/e;
+    iget-object v3, p0, Lkotlinx/coroutines/b/a;->blU: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;->EU()Lkotlinx/coroutines/b/i;
+    invoke-virtual {v0}, Lkotlinx/coroutines/b/a$b;->ES()Lkotlinx/coroutines/b/i;
 
     move-result-object v3
 
     if-nez v3, :cond_7
 
     :cond_6
-    iget-object v3, p0, Lkotlinx/coroutines/b/a;->blZ:Lkotlinx/coroutines/b/e;
+    iget-object v3, p0, Lkotlinx/coroutines/b/a;->blU:Lkotlinx/coroutines/b/e;
 
-    invoke-virtual {v3}, Lkotlinx/coroutines/b/e;->Em()Ljava/lang/Object;
+    invoke-virtual {v3}, Lkotlinx/coroutines/b/e;->Ek()Ljava/lang/Object;
 
     move-result-object v3
 
@@ -1580,25 +1580,25 @@
 
     if-eqz v0, :cond_8
 
-    sget-object v3, Lkotlinx/coroutines/b/a$c;->bmB:Lkotlinx/coroutines/b/a$c;
+    sget-object v3, Lkotlinx/coroutines/b/a$c;->bmw: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;->bma:Ljava/util/concurrent/Semaphore;
+    iget-object v0, p0, Lkotlinx/coroutines/b/a;->blV:Ljava/util/concurrent/Semaphore;
 
     invoke-virtual {v0}, Ljava/util/concurrent/Semaphore;->availablePermits()I
 
     move-result v0
 
-    iget v3, p0, Lkotlinx/coroutines/b/a;->bmf:I
+    iget v3, p0, Lkotlinx/coroutines/b/a;->bma:I
 
     if-ne v0, v3, :cond_9
 
     const/4 v1, 0x1
 
     :cond_9
-    sget-boolean v0, Lkotlin/v;->bgz:Z
+    sget-boolean v0, Lkotlin/v;->bgu: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;->bmc:[Lkotlinx/coroutines/b/a$b;
+    iget-object v1, p0, Lkotlinx/coroutines/b/a;->blX:[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;->bmp:Lkotlinx/coroutines/b/o;
+    iget-object v11, v10, Lkotlinx/coroutines/b/a$b;->bmk: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;->Fa()I
+    invoke-virtual {v11}, Lkotlinx/coroutines/b/o;->EY()I
 
     move-result v11
 
@@ -1843,7 +1843,7 @@
 
     invoke-direct {v4}, Ljava/lang/StringBuilder;-><init>()V
 
-    iget-object v10, p0, Lkotlinx/coroutines/b/a;->bmi:Ljava/lang/String;
+    iget-object v10, p0, Lkotlinx/coroutines/b/a;->bmd: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;->bmf:I
+    iget v10, p0, Lkotlinx/coroutines/b/a;->bma: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;->bmg:I
+    iget v10, p0, Lkotlinx/coroutines/b/a;->bmb: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;->blZ:Lkotlinx/coroutines/b/e;
+    iget-object v0, p0, Lkotlinx/coroutines/b/a;->blU: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 908e9a3acb..cb69af58b3 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;->bmz:Lkotlinx/coroutines/b/a$c;
+    sget-object v1, Lkotlinx/coroutines/b/a$c;->bmu: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;->bmy:Lkotlinx/coroutines/b/a$c;
+    sget-object v1, Lkotlinx/coroutines/b/a$c;->bmt: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;->bmx:Lkotlinx/coroutines/b/a$c;
+    sget-object v1, Lkotlinx/coroutines/b/a$c;->bms: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;->bmA:Lkotlinx/coroutines/b/a$c;
+    sget-object v1, Lkotlinx/coroutines/b/a$c;->bmv: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;->bmB:Lkotlinx/coroutines/b/a$c;
+    sget-object v1, Lkotlinx/coroutines/b/a$c;->bmw: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 9d769759d1..60db748a69 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 bkh:Lkotlinx/coroutines/ab;
+.field private static final bkc:Lkotlinx/coroutines/ab;
 
-.field public static final bmD:Lkotlinx/coroutines/b/c;
+.field public static final bmy: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;->bmD:Lkotlinx/coroutines/b/c;
+    sput-object v0, Lkotlinx/coroutines/b/c;->bmy:Lkotlinx/coroutines/b/c;
 
-    invoke-static {}, Lkotlinx/coroutines/internal/x;->EB()I
+    invoke-static {}, Lkotlinx/coroutines/internal/x;->Ez()I
 
     move-result v1
 
@@ -48,13 +48,13 @@
 
     new-instance v2, Lkotlinx/coroutines/b/f;
 
-    sget-object v3, Lkotlinx/coroutines/b/l;->bmQ:Lkotlinx/coroutines/b/l;
+    sget-object v3, Lkotlinx/coroutines/b/l;->bmL: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;->bkh:Lkotlinx/coroutines/ab;
+    sput-object v2, Lkotlinx/coroutines/b/c;->bkc:Lkotlinx/coroutines/ab;
 
     return-void
 
@@ -90,10 +90,10 @@
     return-void
 .end method
 
-.method public static DH()Lkotlinx/coroutines/ab;
+.method public static DF()Lkotlinx/coroutines/ab;
     .locals 1
 
-    sget-object v0, Lkotlinx/coroutines/b/c;->bkh:Lkotlinx/coroutines/ab;
+    sget-object v0, Lkotlinx/coroutines/b/c;->bkc: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 fa362dd8f8..ac6bbf649e 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 bmE:Lkotlinx/coroutines/b/a;
+.field private final bma:I
 
-.field private final bmf:I
+.field private final bmb:I
 
-.field private final bmg:I
+.field private final bmc:J
 
-.field private final bmh:J
+.field private final bmd:Ljava/lang/String;
 
-.field private final bmi:Ljava/lang/String;
+.field private bmz:Lkotlinx/coroutines/b/a;
 
 
 # direct methods
@@ -39,29 +39,29 @@
 
     invoke-direct {p0}, Lkotlinx/coroutines/az;-><init>()V
 
-    iput p1, p0, Lkotlinx/coroutines/b/d;->bmf:I
+    iput p1, p0, Lkotlinx/coroutines/b/d;->bma:I
 
-    iput p2, p0, Lkotlinx/coroutines/b/d;->bmg:I
+    iput p2, p0, Lkotlinx/coroutines/b/d;->bmb:I
 
-    iput-wide p3, p0, Lkotlinx/coroutines/b/d;->bmh:J
+    iput-wide p3, p0, Lkotlinx/coroutines/b/d;->bmc:J
 
-    iput-object p5, p0, Lkotlinx/coroutines/b/d;->bmi:Ljava/lang/String;
+    iput-object p5, p0, Lkotlinx/coroutines/b/d;->bmd:Ljava/lang/String;
 
     new-instance p1, Lkotlinx/coroutines/b/a;
 
-    iget v2, p0, Lkotlinx/coroutines/b/d;->bmf:I
+    iget v2, p0, Lkotlinx/coroutines/b/d;->bma:I
 
-    iget v3, p0, Lkotlinx/coroutines/b/d;->bmg:I
+    iget v3, p0, Lkotlinx/coroutines/b/d;->bmb:I
 
-    iget-wide v4, p0, Lkotlinx/coroutines/b/d;->bmh:J
+    iget-wide v4, p0, Lkotlinx/coroutines/b/d;->bmc:J
 
-    iget-object v6, p0, Lkotlinx/coroutines/b/d;->bmi:Ljava/lang/String;
+    iget-object v6, p0, Lkotlinx/coroutines/b/d;->bmd: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;->bmE:Lkotlinx/coroutines/b/a;
+    iput-object p1, p0, Lkotlinx/coroutines/b/d;->bmz: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;->bmV:J
+    sget-wide v4, Lkotlinx/coroutines/b/m;->bmQ: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;->bmE:Lkotlinx/coroutines/b/a;
+    iget-object v0, p0, Lkotlinx/coroutines/b/d;->bmz: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;->bjW:Lkotlinx/coroutines/ak;
+    sget-object v0, Lkotlinx/coroutines/ak;->bjR: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;->bmE:Lkotlinx/coroutines/b/a;
+    iget-object v0, p0, Lkotlinx/coroutines/b/d;->bmz: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;->bjW:Lkotlinx/coroutines/ak;
+    sget-object p3, Lkotlinx/coroutines/ak;->bjR: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;->bmE:Lkotlinx/coroutines/b/a;
+    iget-object v0, p0, Lkotlinx/coroutines/b/d;->bmz: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;->bmE:Lkotlinx/coroutines/b/a;
+    iget-object v0, p0, Lkotlinx/coroutines/b/d;->bmz: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;->bmE:Lkotlinx/coroutines/b/a;
+    iget-object v1, p0, Lkotlinx/coroutines/b/d;->bmz: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 0f1df4b859..a88b5607ea 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;->blE:Lkotlinx/coroutines/internal/v;
+    sget-object v7, Lkotlinx/coroutines/internal/m;->blz:Lkotlinx/coroutines/internal/v;
 
     goto/16 :goto_2
 
     :cond_1
-    sget-object v1, Lkotlinx/coroutines/internal/m;->blF:Lkotlinx/coroutines/internal/m$a;
+    sget-object v1, Lkotlinx/coroutines/internal/m;->blA: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;->EZ()Lkotlinx/coroutines/b/l;
+    invoke-virtual {v1}, Lkotlinx/coroutines/b/i;->EX()Lkotlinx/coroutines/b/l;
 
     move-result-object v1
 
@@ -151,9 +151,9 @@
 
     and-int v10, v1, v2
 
-    sget-object v1, Lkotlinx/coroutines/internal/m;->blB:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+    sget-object v1, Lkotlinx/coroutines/internal/m;->blw:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
 
-    sget-object v2, Lkotlinx/coroutines/internal/m;->blF:Lkotlinx/coroutines/internal/m$a;
+    sget-object v2, Lkotlinx/coroutines/internal/m;->blA: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;->blE:Lkotlinx/coroutines/internal/v;
+    sget-object v1, Lkotlinx/coroutines/internal/m;->blz: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;->blA:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v1, Lkotlinx/coroutines/internal/l;->blv:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
-    invoke-virtual {v0}, Lkotlinx/coroutines/internal/m;->Ex()Lkotlinx/coroutines/internal/m;
+    invoke-virtual {v0}, Lkotlinx/coroutines/internal/m;->Ev()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 7adeb0242d..cba2c8e58c 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 bmG:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+.field private static final bmB:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
 
 # instance fields
-.field private final bmF:Ljava/util/concurrent/ConcurrentLinkedQueue;
+.field private final bmA: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 bmH:Lkotlinx/coroutines/b/d;
+.field private final bmC:Lkotlinx/coroutines/b/d;
 
-.field private final bmI:I
+.field private final bmD:I
 
-.field private final bmJ:Lkotlinx/coroutines/b/l;
+.field private final bmE:Lkotlinx/coroutines/b/l;
 
 .field private volatile inFlightTasks:I
 
@@ -43,7 +43,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lkotlinx/coroutines/b/f;->bmG:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sput-object v0, Lkotlinx/coroutines/b/f;->bmB: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;->bmH:Lkotlinx/coroutines/b/d;
+    iput-object p1, p0, Lkotlinx/coroutines/b/f;->bmC:Lkotlinx/coroutines/b/d;
 
-    iput p2, p0, Lkotlinx/coroutines/b/f;->bmI:I
+    iput p2, p0, Lkotlinx/coroutines/b/f;->bmD:I
 
-    iput-object p3, p0, Lkotlinx/coroutines/b/f;->bmJ:Lkotlinx/coroutines/b/l;
+    iput-object p3, p0, Lkotlinx/coroutines/b/f;->bmE: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;->bmF:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iput-object p1, p0, Lkotlinx/coroutines/b/f;->bmA:Ljava/util/concurrent/ConcurrentLinkedQueue;
 
     const/4 p1, 0x0
 
@@ -84,17 +84,17 @@
     .locals 2
 
     :cond_0
-    sget-object v0, Lkotlinx/coroutines/b/f;->bmG:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/b/f;->bmB: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;->bmI:I
+    iget v1, p0, Lkotlinx/coroutines/b/f;->bmD:I
 
     if-gt v0, v1, :cond_1
 
-    iget-object v0, p0, Lkotlinx/coroutines/b/f;->bmH:Lkotlinx/coroutines/b/d;
+    iget-object v0, p0, Lkotlinx/coroutines/b/f;->bmC:Lkotlinx/coroutines/b/d;
 
     move-object v1, p0
 
@@ -105,24 +105,24 @@
     return-void
 
     :cond_1
-    iget-object v0, p0, Lkotlinx/coroutines/b/f;->bmF:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v0, p0, Lkotlinx/coroutines/b/f;->bmA:Ljava/util/concurrent/ConcurrentLinkedQueue;
 
     invoke-virtual {v0, p1}, Ljava/util/concurrent/ConcurrentLinkedQueue;->add(Ljava/lang/Object;)Z
 
-    sget-object p1, Lkotlinx/coroutines/b/f;->bmG:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sget-object p1, Lkotlinx/coroutines/b/f;->bmB: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;->bmI:I
+    iget v0, p0, Lkotlinx/coroutines/b/f;->bmD:I
 
     if-lt p1, v0, :cond_2
 
     return-void
 
     :cond_2
-    iget-object p1, p0, Lkotlinx/coroutines/b/f;->bmF:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object p1, p0, Lkotlinx/coroutines/b/f;->bmA:Ljava/util/concurrent/ConcurrentLinkedQueue;
 
     invoke-virtual {p1}, Ljava/util/concurrent/ConcurrentLinkedQueue;->poll()Ljava/lang/Object;
 
@@ -137,10 +137,10 @@
 
 
 # virtual methods
-.method public final EX()V
+.method public final EV()V
     .locals 4
 
-    iget-object v0, p0, Lkotlinx/coroutines/b/f;->bmF:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v0, p0, Lkotlinx/coroutines/b/f;->bmA: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;->bmH:Lkotlinx/coroutines/b/d;
+    iget-object v2, p0, Lkotlinx/coroutines/b/f;->bmC:Lkotlinx/coroutines/b/d;
 
     move-object v3, p0
 
@@ -163,11 +163,11 @@
     return-void
 
     :cond_0
-    sget-object v0, Lkotlinx/coroutines/b/f;->bmG:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/b/f;->bmB: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;->bmF:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v0, p0, Lkotlinx/coroutines/b/f;->bmA: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 EY()Lkotlinx/coroutines/b/l;
+.method public final EW()Lkotlinx/coroutines/b/l;
     .locals 1
 
-    iget-object v0, p0, Lkotlinx/coroutines/b/f;->bmJ:Lkotlinx/coroutines/b/l;
+    iget-object v0, p0, Lkotlinx/coroutines/b/f;->bmE: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;->bmH:Lkotlinx/coroutines/b/d;
+    iget-object v1, p0, Lkotlinx/coroutines/b/f;->bmC: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 d69a875b76..112f7473f2 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 bmK:Lkotlinx/coroutines/b/g;
+.field public static final bmF: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;->bmK:Lkotlinx/coroutines/b/g;
+    sput-object v0, Lkotlinx/coroutines/b/g;->bmF:Lkotlinx/coroutines/b/g;
 
     return-void
 .end method
@@ -30,7 +30,7 @@
 
 
 # virtual methods
-.method public final ns()J
+.method public final nq()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 54762dde24..155c6d5b2a 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/b/h.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/b/h.smali
@@ -7,9 +7,9 @@
 
 
 # static fields
-.field private static final bmJ:Lkotlinx/coroutines/b/l;
+.field private static final bmE:Lkotlinx/coroutines/b/l;
 
-.field public static final bmL:Lkotlinx/coroutines/b/h;
+.field public static final bmG: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;->bmL:Lkotlinx/coroutines/b/h;
+    sput-object v0, Lkotlinx/coroutines/b/h;->bmG:Lkotlinx/coroutines/b/h;
 
-    sget-object v0, Lkotlinx/coroutines/b/l;->bmP:Lkotlinx/coroutines/b/l;
+    sget-object v0, Lkotlinx/coroutines/b/l;->bmK:Lkotlinx/coroutines/b/l;
 
-    sput-object v0, Lkotlinx/coroutines/b/h;->bmJ:Lkotlinx/coroutines/b/l;
+    sput-object v0, Lkotlinx/coroutines/b/h;->bmE:Lkotlinx/coroutines/b/l;
 
     return-void
 .end method
@@ -39,16 +39,16 @@
 
 
 # virtual methods
-.method public final EX()V
+.method public final EV()V
     .locals 0
 
     return-void
 .end method
 
-.method public final EY()Lkotlinx/coroutines/b/l;
+.method public final EW()Lkotlinx/coroutines/b/l;
     .locals 1
 
-    sget-object v0, Lkotlinx/coroutines/b/h;->bmJ:Lkotlinx/coroutines/b/l;
+    sget-object v0, Lkotlinx/coroutines/b/h;->bmE: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 6fc2b08a1c..becaf1004f 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 bmM:J
+.field public bmH:J
 
-.field public bmN:Lkotlinx/coroutines/b/j;
+.field public bmI:Lkotlinx/coroutines/b/j;
 
 
 # direct methods
 .method public constructor <init>()V
     .locals 3
 
-    sget-object v0, Lkotlinx/coroutines/b/h;->bmL:Lkotlinx/coroutines/b/h;
+    sget-object v0, Lkotlinx/coroutines/b/h;->bmG: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;->bmM:J
+    iput-wide p1, p0, Lkotlinx/coroutines/b/i;->bmH:J
 
-    iput-object p3, p0, Lkotlinx/coroutines/b/i;->bmN:Lkotlinx/coroutines/b/j;
+    iput-object p3, p0, Lkotlinx/coroutines/b/i;->bmI:Lkotlinx/coroutines/b/j;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final EZ()Lkotlinx/coroutines/b/l;
+.method public final EX()Lkotlinx/coroutines/b/l;
     .locals 1
 
-    iget-object v0, p0, Lkotlinx/coroutines/b/i;->bmN:Lkotlinx/coroutines/b/j;
+    iget-object v0, p0, Lkotlinx/coroutines/b/i;->bmI:Lkotlinx/coroutines/b/j;
 
-    invoke-interface {v0}, Lkotlinx/coroutines/b/j;->EY()Lkotlinx/coroutines/b/l;
+    invoke-interface {v0}, Lkotlinx/coroutines/b/j;->EW()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 17e0e3dcc2..3e2d2ff7d4 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 EX()V
+.method public abstract EV()V
 .end method
 
-.method public abstract EY()Lkotlinx/coroutines/b/l;
+.method public abstract EW()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 51106d4ff1..d2cb13d464 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 bmO:Ljava/lang/Runnable;
+.field public final bmJ: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;->bmO:Ljava/lang/Runnable;
+    iput-object p1, p0, Lkotlinx/coroutines/b/k;->bmJ:Ljava/lang/Runnable;
 
     return-void
 .end method
@@ -32,24 +32,24 @@
     .locals 2
 
     :try_start_0
-    iget-object v0, p0, Lkotlinx/coroutines/b/k;->bmO:Ljava/lang/Runnable;
+    iget-object v0, p0, Lkotlinx/coroutines/b/k;->bmJ: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;->bmN:Lkotlinx/coroutines/b/j;
+    iget-object v0, p0, Lkotlinx/coroutines/b/k;->bmI:Lkotlinx/coroutines/b/j;
 
-    invoke-interface {v0}, Lkotlinx/coroutines/b/j;->EX()V
+    invoke-interface {v0}, Lkotlinx/coroutines/b/j;->EV()V
 
     return-void
 
     :catchall_0
     move-exception v0
 
-    iget-object v1, p0, Lkotlinx/coroutines/b/k;->bmN:Lkotlinx/coroutines/b/j;
+    iget-object v1, p0, Lkotlinx/coroutines/b/k;->bmI:Lkotlinx/coroutines/b/j;
 
-    invoke-interface {v1}, Lkotlinx/coroutines/b/j;->EX()V
+    invoke-interface {v1}, Lkotlinx/coroutines/b/j;->EV()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;->bmO:Ljava/lang/Runnable;
+    iget-object v1, p0, Lkotlinx/coroutines/b/k;->bmJ: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;->bmO:Ljava/lang/Runnable;
+    iget-object v1, p0, Lkotlinx/coroutines/b/k;->bmJ: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;->bmM:J
+    iget-wide v2, p0, Lkotlinx/coroutines/b/k;->bmH: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;->bmN:Lkotlinx/coroutines/b/j;
+    iget-object v1, p0, Lkotlinx/coroutines/b/k;->bmI: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 304994751b..10463bc495 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 bmP:Lkotlinx/coroutines/b/l;
+.field public static final enum bmK:Lkotlinx/coroutines/b/l;
 
-.field public static final enum bmQ:Lkotlinx/coroutines/b/l;
+.field public static final enum bmL:Lkotlinx/coroutines/b/l;
 
-.field private static final synthetic bmR:[Lkotlinx/coroutines/b/l;
+.field private static final synthetic bmM:[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;->bmP:Lkotlinx/coroutines/b/l;
+    sput-object v1, Lkotlinx/coroutines/b/l;->bmK: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;->bmQ:Lkotlinx/coroutines/b/l;
+    sput-object v1, Lkotlinx/coroutines/b/l;->bmL:Lkotlinx/coroutines/b/l;
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lkotlinx/coroutines/b/l;->bmR:[Lkotlinx/coroutines/b/l;
+    sput-object v0, Lkotlinx/coroutines/b/l;->bmM:[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;->bmR:[Lkotlinx/coroutines/b/l;
+    sget-object v0, Lkotlinx/coroutines/b/l;->bmM:[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 0f0613ea87..b3889b0032 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 bmS:J
+.field public static final bmN:J
 
-.field public static final bmT:I
+.field public static final bmO:I
 
-.field public static final bmU:I
+.field public static final bmP:I
 
-.field public static final bmV:J
+.field public static final bmQ:J
 
-.field public static bmW:Lkotlinx/coroutines/b/n;
+.field public static bmR: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;->bmS:J
+    sput-wide v0, Lkotlinx/coroutines/b/m;->bmN:J
 
     const/4 v0, 0x4
 
@@ -47,7 +47,7 @@
 
     move-result v3
 
-    sput v3, Lkotlinx/coroutines/b/m;->bmT:I
+    sput v3, Lkotlinx/coroutines/b/m;->bmO:I
 
     const-string v3, "kotlinx.coroutines.scheduler.blocking.parallelism"
 
@@ -59,9 +59,9 @@
 
     move-result v3
 
-    sput v3, Lkotlinx/coroutines/b/m;->bmU:I
+    sput v3, Lkotlinx/coroutines/b/m;->bmP:I
 
-    invoke-static {}, Lkotlinx/coroutines/internal/x;->EB()I
+    invoke-static {}, Lkotlinx/coroutines/internal/x;->Ez()I
 
     move-result v3
 
@@ -83,7 +83,7 @@
 
     sput v3, Lkotlinx/coroutines/b/m;->CORE_POOL_SIZE:I
 
-    invoke-static {}, Lkotlinx/coroutines/internal/x;->EB()I
+    invoke-static {}, Lkotlinx/coroutines/internal/x;->Ez()I
 
     move-result v3
 
@@ -119,13 +119,13 @@
 
     move-result-wide v0
 
-    sput-wide v0, Lkotlinx/coroutines/b/m;->bmV:J
+    sput-wide v0, Lkotlinx/coroutines/b/m;->bmQ:J
 
-    sget-object v0, Lkotlinx/coroutines/b/g;->bmK:Lkotlinx/coroutines/b/g;
+    sget-object v0, Lkotlinx/coroutines/b/g;->bmF:Lkotlinx/coroutines/b/g;
 
     check-cast v0, Lkotlinx/coroutines/b/n;
 
-    sput-object v0, Lkotlinx/coroutines/b/m;->bmW:Lkotlinx/coroutines/b/n;
+    sput-object v0, Lkotlinx/coroutines/b/m;->bmR: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 5a9347f332..14410d90fb 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 ns()J
+.method public abstract nq()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 f08174e508..4c1d1a9766 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 bmY:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+.field private static final bmT:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
-.field static final bmZ:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+.field static final bmU:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
-.field static final bna:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+.field static final bmV:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
 
 # instance fields
-.field private final bmX:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+.field private final bmS: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;->bmY:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sput-object v1, Lkotlinx/coroutines/b/o;->bmT:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     const-string v1, "producerIndex"
 
@@ -51,7 +51,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lkotlinx/coroutines/b/o;->bmZ:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sput-object v1, Lkotlinx/coroutines/b/o;->bmU:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
     const-string v1, "consumerIndex"
 
@@ -59,7 +59,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lkotlinx/coroutines/b/o;->bna:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sput-object v0, Lkotlinx/coroutines/b/o;->bmV: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;->bmX:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iput-object v0, p0, Lkotlinx/coroutines/b/o;->bmS: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;->Fa()I
+    invoke-virtual {p0}, Lkotlinx/coroutines/b/o;->EY()I
 
     move-result v0
 
@@ -126,7 +126,7 @@
     :cond_1
     and-int/lit8 v3, v2, 0x7f
 
-    iget-object v5, p0, Lkotlinx/coroutines/b/o;->bmX:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v5, p0, Lkotlinx/coroutines/b/o;->bmS: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;->bna:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sget-object v5, Lkotlinx/coroutines/b/o;->bmV: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;->bmX:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v2, p0, Lkotlinx/coroutines/b/o;->bmS: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;->bmM:J
+    iget-wide v2, v0, Lkotlinx/coroutines/b/i;->bmH:J
 
     sub-long/2addr p1, v2
 
-    sget-wide v2, Lkotlinx/coroutines/b/m;->bmS:J
+    sget-wide v2, Lkotlinx/coroutines/b/m;->bmN:J
 
     cmp-long v4, p1, v2
 
@@ -226,7 +226,7 @@
     return v1
 
     :cond_1
-    sget-object p1, Lkotlinx/coroutines/b/o;->bmY:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object p1, Lkotlinx/coroutines/b/o;->bmT: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;->Fa()I
+    invoke-virtual {p0}, Lkotlinx/coroutines/b/o;->EY()I
 
     move-result v0
 
@@ -266,7 +266,7 @@
 
     and-int/2addr v0, v2
 
-    iget-object v2, p0, Lkotlinx/coroutines/b/o;->bmX:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v2, p0, Lkotlinx/coroutines/b/o;->bmS: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;->bmX:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v1, p0, Lkotlinx/coroutines/b/o;->bmS: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;->bmZ:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sget-object p1, Lkotlinx/coroutines/b/o;->bmU: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 Fa()I
+.method public final EY()I
     .locals 2
 
     iget v0, p0, Lkotlinx/coroutines/b/o;->producerIndex:I
@@ -304,10 +304,10 @@
     return v0
 .end method
 
-.method public final Fb()Lkotlinx/coroutines/b/i;
+.method public final EZ()Lkotlinx/coroutines/b/i;
     .locals 5
 
-    sget-object v0, Lkotlinx/coroutines/b/o;->bmY:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/b/o;->bmT: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;->bmX:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v3, p0, Lkotlinx/coroutines/b/o;->bmS: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;->bna:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sget-object v3, Lkotlinx/coroutines/b/o;->bmV: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;->bmX:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v0, p0, Lkotlinx/coroutines/b/o;->bmS: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;->bmY:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/b/o;->bmT: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;->bmW:Lkotlinx/coroutines/b/n;
+    sget-object v3, Lkotlinx/coroutines/b/m;->bmR:Lkotlinx/coroutines/b/n;
 
-    invoke-virtual {v3}, Lkotlinx/coroutines/b/n;->ns()J
+    invoke-virtual {v3}, Lkotlinx/coroutines/b/n;->nq()J
 
     move-result-wide v3
 
-    invoke-virtual/range {p1 .. p1}, Lkotlinx/coroutines/b/o;->Fa()I
+    invoke-virtual/range {p1 .. p1}, Lkotlinx/coroutines/b/o;->EY()I
 
     move-result v5
 
@@ -468,7 +468,7 @@
     :cond_2
     and-int/lit8 v11, v10, 0x7f
 
-    iget-object v13, v1, Lkotlinx/coroutines/b/o;->bmX:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v13, v1, Lkotlinx/coroutines/b/o;->bmS: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;->bmM:J
+    iget-wide v13, v13, Lkotlinx/coroutines/b/i;->bmH:J
 
     sub-long v13, v3, v13
 
-    sget-wide v15, Lkotlinx/coroutines/b/m;->bmS:J
+    sget-wide v15, Lkotlinx/coroutines/b/m;->bmN:J
 
     cmp-long v17, v13, v15
 
     if-gez v17, :cond_5
 
-    invoke-virtual/range {p1 .. p1}, Lkotlinx/coroutines/b/o;->Fa()I
+    invoke-virtual/range {p1 .. p1}, Lkotlinx/coroutines/b/o;->EY()I
 
     move-result v13
 
-    sget v14, Lkotlinx/coroutines/b/m;->bmT:I
+    sget v14, Lkotlinx/coroutines/b/m;->bmO:I
 
     if-le v13, v14, :cond_4
 
@@ -516,7 +516,7 @@
     goto :goto_4
 
     :cond_6
-    sget-object v13, Lkotlinx/coroutines/b/o;->bna:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sget-object v13, Lkotlinx/coroutines/b/o;->bmV: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;->bmX:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v10, v1, Lkotlinx/coroutines/b/o;->bmS: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;->bmY:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/b/o;->bmT: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;->bmX:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v3, p0, Lkotlinx/coroutines/b/o;->bmS: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;->bna:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sget-object v3, Lkotlinx/coroutines/b/o;->bmV: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;->bmX:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v0, p0, Lkotlinx/coroutines/b/o;->bmS: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 1336950087..70ad5226f3 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 bkw:Z
+.field private bkr:Z
 
 
 # direct methods
@@ -66,7 +66,7 @@
 
 
 # virtual methods
-.method public final DU()V
+.method public final DS()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;->bkw:Z
+    iput-boolean v0, p0, Lkotlinx/coroutines/ba;->bkr: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;->bkw:Z
+    iget-boolean v0, p0, Lkotlinx/coroutines/ba;->bkr:Z
 
     if-eqz v0, :cond_0
 
@@ -147,7 +147,7 @@
     return-void
 
     :cond_1
-    sget-object v0, Lkotlinx/coroutines/ak;->bjW:Lkotlinx/coroutines/ak;
+    sget-object v0, Lkotlinx/coroutines/ak;->bjR: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;->El()Lkotlinx/coroutines/cc;
+    invoke-static {}, Lkotlinx/coroutines/cd;->Ej()Lkotlinx/coroutines/cc;
 
     move-result-object v0
 
@@ -185,9 +185,9 @@
     return-void
 
     :catch_0
-    invoke-static {}, Lkotlinx/coroutines/cd;->El()Lkotlinx/coroutines/cc;
+    invoke-static {}, Lkotlinx/coroutines/cd;->Ej()Lkotlinx/coroutines/cc;
 
-    sget-object p1, Lkotlinx/coroutines/ak;->bjW:Lkotlinx/coroutines/ak;
+    sget-object p1, Lkotlinx/coroutines/ak;->bjR: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 0bc8a69a90..ef738b9f83 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 bkx:Lkotlinx/coroutines/bb;
+.field public static final bks:Lkotlinx/coroutines/bb;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lkotlinx/coroutines/bb;-><init>()V
 
-    sput-object v0, Lkotlinx/coroutines/bb;->bkx:Lkotlinx/coroutines/bb;
+    sput-object v0, Lkotlinx/coroutines/bb;->bks:Lkotlinx/coroutines/bb;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final Dd()Lkotlin/coroutines/CoroutineContext;
+.method public final Db()Lkotlin/coroutines/CoroutineContext;
     .locals 1
 
-    sget-object v0, Lkotlin/coroutines/e;->bhd:Lkotlin/coroutines/e;
+    sget-object v0, Lkotlin/coroutines/e;->bgY: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 06aa01dc60..fe43f885f9 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 bky:Lkotlinx/coroutines/br;
+.field final bkt:Lkotlinx/coroutines/br;
 
 
 # direct methods
@@ -20,17 +20,17 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lkotlinx/coroutines/bc;->bky:Lkotlinx/coroutines/br;
+    iput-object p1, p0, Lkotlinx/coroutines/bc;->bkt:Lkotlinx/coroutines/br;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final DI()Lkotlinx/coroutines/br;
+.method public final DG()Lkotlinx/coroutines/br;
     .locals 1
 
-    iget-object v0, p0, Lkotlinx/coroutines/bc;->bky:Lkotlinx/coroutines/br;
+    iget-object v0, p0, Lkotlinx/coroutines/bc;->bkt: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;->bky:Lkotlinx/coroutines/br;
+    iget-object v0, p0, Lkotlinx/coroutines/bc;->bkt: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 59a93db075..4b2b6ca856 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 DI()Lkotlinx/coroutines/br;
+.method public abstract DG()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 3436b3cea8..cab9e526e8 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 bkz:Lkotlinx/coroutines/bd;
+.field public final bku:Lkotlinx/coroutines/bd;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lkotlinx/coroutines/be;->bkz:Lkotlinx/coroutines/bd;
+    iput-object p1, p0, Lkotlinx/coroutines/be;->bku: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 2a64086685..29cfb0abd3 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 bkA:Lkotlin/jvm/functions/Function1;
+.field private final bkv: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;->bkA:Lkotlin/jvm/functions/Function1;
+    iput-object p1, p0, Lkotlinx/coroutines/bf;->bkv: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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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;->bkA:Lkotlin/jvm/functions/Function1;
+    iget-object v0, p0, Lkotlinx/coroutines/bf;->bkv: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;->bkA:Lkotlin/jvm/functions/Function1;
+    iget-object v1, p0, Lkotlinx/coroutines/bf;->bkv: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 2df570fb04..9740798f84 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 bkB:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+.field private static final bkw:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
 
 # instance fields
 .field private volatile _invoked:I
 
-.field private final bkA:Lkotlin/jvm/functions/Function1;
+.field private final bkv: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;->bkB:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sput-object v0, Lkotlinx/coroutines/bg;->bkw: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;->bkA:Lkotlin/jvm/functions/Function1;
+    iput-object p2, p0, Lkotlinx/coroutines/bg;->bkv: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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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;->bkB:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/bg;->bkw: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;->bkA:Lkotlin/jvm/functions/Function1;
+    iget-object v0, p0, Lkotlinx/coroutines/bg;->bkv: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 5e48f1ca2e..8e0ecbb2c8 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 bkA:Lkotlin/jvm/functions/Function1;
+.field private final bkv: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;->bkA:Lkotlin/jvm/functions/Function1;
+    iput-object p2, p0, Lkotlinx/coroutines/bh;->bkv: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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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;->bkA:Lkotlin/jvm/functions/Function1;
+    iget-object v0, p0, Lkotlinx/coroutines/bh;->bkv: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 dc4c788352..a33a50fde4 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 Dx()Ljava/lang/Throwable;
+.method public final synthetic Dv()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 f918e1066e..f385ddf53e 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 DX()Z
+.method public final DV()Z
     .locals 1
 
     const/4 v0, 0x1
@@ -29,7 +29,7 @@
     return v0
 .end method
 
-.method protected final DY()Z
+.method protected final DW()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 030188aa13..9018789f00 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 DI()Lkotlinx/coroutines/br;
+.method public final DG()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;->DZ()Ljava/lang/Object;
+    invoke-virtual {v0}, Lkotlinx/coroutines/bn;->DX()Ljava/lang/Object;
 
     move-result-object v1
 
@@ -84,9 +84,9 @@
 
     if-ne v1, p0, :cond_1
 
-    sget-object v2, Lkotlinx/coroutines/bn;->bjx:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v2, Lkotlinx/coroutines/bn;->bjs:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
-    invoke-static {}, Lkotlinx/coroutines/bo;->Eg()Lkotlinx/coroutines/av;
+    invoke-static {}, Lkotlinx/coroutines/bo;->Ee()Lkotlinx/coroutines/av;
 
     move-result-object v3
 
@@ -106,13 +106,13 @@
 
     check-cast v1, Lkotlinx/coroutines/bd;
 
-    invoke-interface {v1}, Lkotlinx/coroutines/bd;->DI()Lkotlinx/coroutines/br;
+    invoke-interface {v1}, Lkotlinx/coroutines/bd;->DG()Lkotlinx/coroutines/br;
 
     move-result-object v0
 
     if-eqz v0, :cond_3
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/bm;->Ep()Z
+    invoke-virtual {p0}, Lkotlinx/coroutines/bm;->En()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 d816ff1fa0..5f86d1191d 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 bkE:Lkotlinx/coroutines/bn;
+.field private final bkA:Lkotlinx/coroutines/bn$b;
 
-.field private final bkF:Lkotlinx/coroutines/bn$b;
+.field private final bkB:Lkotlinx/coroutines/p;
 
-.field private final bkG:Lkotlinx/coroutines/p;
+.field private final bkC:Ljava/lang/Object;
 
-.field private final bkH:Ljava/lang/Object;
+.field private final bkz:Lkotlinx/coroutines/bn;
 
 
 # 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;->bjA:Lkotlinx/coroutines/q;
+    iget-object v0, p3, Lkotlinx/coroutines/p;->bjv: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;->bkE:Lkotlinx/coroutines/bn;
+    iput-object p1, p0, Lkotlinx/coroutines/bn$a;->bkz:Lkotlinx/coroutines/bn;
 
-    iput-object p2, p0, Lkotlinx/coroutines/bn$a;->bkF:Lkotlinx/coroutines/bn$b;
+    iput-object p2, p0, Lkotlinx/coroutines/bn$a;->bkA:Lkotlinx/coroutines/bn$b;
 
-    iput-object p3, p0, Lkotlinx/coroutines/bn$a;->bkG:Lkotlinx/coroutines/p;
+    iput-object p3, p0, Lkotlinx/coroutines/bn$a;->bkB:Lkotlinx/coroutines/p;
 
-    iput-object p4, p0, Lkotlinx/coroutines/bn$a;->bkH:Ljava/lang/Object;
+    iput-object p4, p0, Lkotlinx/coroutines/bn$a;->bkC: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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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;->bkE:Lkotlinx/coroutines/bn;
+    iget-object p1, p0, Lkotlinx/coroutines/bn$a;->bkz:Lkotlinx/coroutines/bn;
 
-    iget-object v0, p0, Lkotlinx/coroutines/bn$a;->bkF:Lkotlinx/coroutines/bn$b;
+    iget-object v0, p0, Lkotlinx/coroutines/bn$a;->bkA:Lkotlinx/coroutines/bn$b;
 
-    iget-object v1, p0, Lkotlinx/coroutines/bn$a;->bkG:Lkotlinx/coroutines/p;
+    iget-object v1, p0, Lkotlinx/coroutines/bn$a;->bkB:Lkotlinx/coroutines/p;
 
-    iget-object v2, p0, Lkotlinx/coroutines/bn$a;->bkH:Ljava/lang/Object;
+    iget-object v2, p0, Lkotlinx/coroutines/bn$a;->bkC: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;->bkG:Lkotlinx/coroutines/p;
+    iget-object v1, p0, Lkotlinx/coroutines/bn$a;->bkB: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;->bkH:Ljava/lang/Object;
+    iget-object v1, p0, Lkotlinx/coroutines/bn$a;->bkC: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 259eb24c24..f0ee178111 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 bky:Lkotlinx/coroutines/br;
+.field final bkt: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;->bky:Lkotlinx/coroutines/br;
+    iput-object p1, p0, Lkotlinx/coroutines/bn$b;->bkt:Lkotlinx/coroutines/br;
 
     const/4 p1, 0x0
 
@@ -48,7 +48,7 @@
     return-void
 .end method
 
-.method static Ee()Ljava/util/ArrayList;
+.method static Ec()Ljava/util/ArrayList;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -70,20 +70,20 @@
 
 
 # virtual methods
-.method public final DI()Lkotlinx/coroutines/br;
+.method public final DG()Lkotlinx/coroutines/br;
     .locals 1
 
-    iget-object v0, p0, Lkotlinx/coroutines/bn$b;->bky:Lkotlinx/coroutines/br;
+    iget-object v0, p0, Lkotlinx/coroutines/bn$b;->bkt:Lkotlinx/coroutines/br;
 
     return-object v0
 .end method
 
-.method public final Ec()Z
+.method public final Ea()Z
     .locals 2
 
     iget-object v0, p0, Lkotlinx/coroutines/bn$b;->_exceptionsHolder:Ljava/lang/Object;
 
-    invoke-static {}, Lkotlinx/coroutines/bo;->Ef()Lkotlinx/coroutines/internal/v;
+    invoke-static {}, Lkotlinx/coroutines/bo;->Ed()Lkotlinx/coroutines/internal/v;
 
     move-result-object v1
 
@@ -99,7 +99,7 @@
     return v0
 .end method
 
-.method public final Ed()Z
+.method public final Eb()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;->Ed()Z
+    invoke-virtual {p0}, Lkotlinx/coroutines/bn$b;->Eb()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;->bky:Lkotlinx/coroutines/br;
+    iget-object v1, p0, Lkotlinx/coroutines/bn$b;->bkt: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;->Ee()Ljava/util/ArrayList;
+    invoke-static {}, Lkotlinx/coroutines/bn$b;->Ec()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 b6504e0ec0..5d114eb8e5 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 bkI:Lkotlinx/coroutines/internal/k;
+.field final synthetic bkD:Lkotlinx/coroutines/internal/k;
 
-.field final synthetic bkJ:Lkotlinx/coroutines/bn;
+.field final synthetic bkE:Lkotlinx/coroutines/bn;
 
-.field final synthetic bkK:Ljava/lang/Object;
+.field final synthetic bkF: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;->bkI:Lkotlinx/coroutines/internal/k;
+    iput-object p1, p0, Lkotlinx/coroutines/bn$c;->bkD:Lkotlinx/coroutines/internal/k;
 
-    iput-object p3, p0, Lkotlinx/coroutines/bn$c;->bkJ:Lkotlinx/coroutines/bn;
+    iput-object p3, p0, Lkotlinx/coroutines/bn$c;->bkE:Lkotlinx/coroutines/bn;
 
-    iput-object p4, p0, Lkotlinx/coroutines/bn$c;->bkK:Ljava/lang/Object;
+    iput-object p4, p0, Lkotlinx/coroutines/bn$c;->bkF: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;->bkJ:Lkotlinx/coroutines/bn;
+    iget-object p1, p0, Lkotlinx/coroutines/bn$c;->bkE:Lkotlinx/coroutines/bn;
 
-    invoke-virtual {p1}, Lkotlinx/coroutines/bn;->DZ()Ljava/lang/Object;
+    invoke-virtual {p1}, Lkotlinx/coroutines/bn;->DX()Ljava/lang/Object;
 
     move-result-object p1
 
-    iget-object v0, p0, Lkotlinx/coroutines/bn$c;->bkK:Ljava/lang/Object;
+    iget-object v0, p0, Lkotlinx/coroutines/bn$c;->bkF:Ljava/lang/Object;
 
     if-ne p1, v0, :cond_0
 
@@ -73,7 +73,7 @@
     return-object p1
 
     :cond_1
-    invoke-static {}, Lkotlinx/coroutines/internal/j;->Eq()Ljava/lang/Object;
+    invoke-static {}, Lkotlinx/coroutines/internal/j;->Eo()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 f17496e391..64e46a1a35 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 bjx:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+.field static final bjs:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
 
 # instance fields
@@ -41,7 +41,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lkotlinx/coroutines/bn;->bjx:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sput-object v0, Lkotlinx/coroutines/bn;->bjs:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     return-void
 .end method
@@ -53,14 +53,14 @@
 
     if-eqz p1, :cond_0
 
-    invoke-static {}, Lkotlinx/coroutines/bo;->Eg()Lkotlinx/coroutines/av;
+    invoke-static {}, Lkotlinx/coroutines/bo;->Ee()Lkotlinx/coroutines/av;
 
     move-result-object p1
 
     goto :goto_0
 
     :cond_0
-    invoke-static {}, Lkotlinx/coroutines/bo;->Eh()Lkotlinx/coroutines/av;
+    invoke-static {}, Lkotlinx/coroutines/bo;->Ef()Lkotlinx/coroutines/av;
 
     move-result-object p1
 
@@ -70,7 +70,7 @@
     return-void
 .end method
 
-.method private final Ea()Lkotlinx/coroutines/bi;
+.method private final DY()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;->Ed()Z
+    invoke-virtual {p1}, Lkotlinx/coroutines/bn$b;->Eb()Z
 
     move-result p1
 
     if-eqz p1, :cond_0
 
-    invoke-direct {p0}, Lkotlinx/coroutines/bn;->Ea()Lkotlinx/coroutines/bi;
+    invoke-direct {p0}, Lkotlinx/coroutines/bn;->DY()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;->DI()Lkotlinx/coroutines/br;
+    invoke-interface {p1}, Lkotlinx/coroutines/bd;->DG()Lkotlinx/coroutines/br;
 
     move-result-object v0
 
@@ -401,7 +401,7 @@
     .locals 1
 
     :goto_0
-    invoke-virtual {p0}, Lkotlinx/coroutines/internal/k;->Es()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/internal/k;->Eq()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -409,7 +409,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/internal/k;->Eu()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/internal/k;->Es()Ljava/lang/Object;
 
     move-result-object p0
 
@@ -420,7 +420,7 @@
     goto :goto_0
 
     :cond_0
-    invoke-virtual {p0}, Lkotlinx/coroutines/internal/k;->Es()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/internal/k;->Eq()Ljava/lang/Object;
 
     move-result-object p0
 
@@ -428,7 +428,7 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/internal/k;->Es()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/internal/k;->Eq()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;->Es()Ljava/lang/Object;
+    invoke-virtual {p1}, Lkotlinx/coroutines/internal/k;->Eq()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -560,7 +560,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lkotlinx/coroutines/bn;->bjx:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v1, Lkotlinx/coroutines/bn;->bjs: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;->DZ()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/bn;->DX()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;->Es()Ljava/lang/Object;
+    invoke-virtual {p1}, Lkotlinx/coroutines/internal/i;->Eq()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -705,11 +705,11 @@
 
     check-cast v1, Ljava/lang/Throwable;
 
-    sget-object v2, Lkotlin/Unit;->bgy:Lkotlin/Unit;
+    sget-object v2, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     :cond_1
     :goto_1
-    invoke-virtual {v0}, Lkotlinx/coroutines/internal/k;->Et()Lkotlinx/coroutines/internal/k;
+    invoke-virtual {v0}, Lkotlinx/coroutines/internal/k;->Er()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;->Eu()Ljava/lang/Object;
+    invoke-virtual {p2}, Lkotlinx/coroutines/internal/k;->Es()Ljava/lang/Object;
 
     move-result-object p1
 
@@ -845,7 +845,7 @@
 
     if-eqz v0, :cond_3
 
-    sget-object v0, Lkotlinx/coroutines/bn;->bjx:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/bn;->bjs: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;->DZ()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/bn;->DX()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;->Ec()Z
+    invoke-virtual {p1}, Lkotlinx/coroutines/bn$b;->Ea()Z
 
     move-result v0
 
@@ -952,13 +952,13 @@
     monitor-enter p1
 
     :try_start_0
-    invoke-virtual {p1}, Lkotlinx/coroutines/bn$b;->Ed()Z
+    invoke-virtual {p1}, Lkotlinx/coroutines/bn$b;->Eb()Z
 
     iget-object v0, p1, Lkotlinx/coroutines/bn$b;->_exceptionsHolder:Ljava/lang/Object;
 
     if-nez v0, :cond_3
 
-    invoke-static {}, Lkotlinx/coroutines/bn$b;->Ee()Ljava/util/ArrayList;
+    invoke-static {}, Lkotlinx/coroutines/bn$b;->Ec()Ljava/util/ArrayList;
 
     move-result-object v0
 
@@ -969,7 +969,7 @@
 
     if-eqz v4, :cond_4
 
-    invoke-static {}, Lkotlinx/coroutines/bn$b;->Ee()Ljava/util/ArrayList;
+    invoke-static {}, Lkotlinx/coroutines/bn$b;->Ec()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;->Ef()Lkotlinx/coroutines/internal/v;
+    invoke-static {}, Lkotlinx/coroutines/bo;->Ed()Lkotlinx/coroutines/internal/v;
 
     move-result-object v4
 
@@ -1071,7 +1071,7 @@
 
     check-cast v0, Lkotlinx/coroutines/t;
 
-    invoke-virtual {v0}, Lkotlinx/coroutines/t;->Dw()Z
+    invoke-virtual {v0}, Lkotlinx/coroutines/t;->Du()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;->bjx:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/bn;->bjs: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;->bjA:Lkotlinx/coroutines/q;
+    iget-object v0, p2, Lkotlinx/coroutines/p;->bjv:Lkotlinx/coroutines/q;
 
     new-instance v1, Lkotlinx/coroutines/bn$a;
 
@@ -1255,7 +1255,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lkotlinx/coroutines/bs;->bkP:Lkotlinx/coroutines/bs;
+    sget-object v1, Lkotlinx/coroutines/bs;->bkK: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;->DX()Z
+    invoke-virtual {p0}, Lkotlinx/coroutines/bn;->DV()Z
 
     move-result v0
 
@@ -1304,7 +1304,7 @@
     .locals 4
 
     :goto_0
-    invoke-virtual {p0}, Lkotlinx/coroutines/bn;->DZ()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/bn;->DX()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -1402,7 +1402,7 @@
     return-object p1
 
     :cond_1
-    invoke-direct {p0}, Lkotlinx/coroutines/bn;->Ea()Lkotlinx/coroutines/bi;
+    invoke-direct {p0}, Lkotlinx/coroutines/bn;->DY()Lkotlinx/coroutines/bi;
 
     move-result-object p1
 
@@ -1415,7 +1415,7 @@
 
     check-cast p1, Lkotlinx/coroutines/bu;
 
-    invoke-interface {p1}, Lkotlinx/coroutines/bu;->Eb()Ljava/lang/Throwable;
+    invoke-interface {p1}, Lkotlinx/coroutines/bu;->DZ()Ljava/lang/Throwable;
 
     move-result-object p1
 
@@ -1440,7 +1440,7 @@
 
     :cond_0
     :goto_0
-    invoke-virtual {p0}, Lkotlinx/coroutines/bn;->DZ()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/bn;->DX()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;->Ec()Z
+    invoke-virtual {v3}, Lkotlinx/coroutines/bn$b;->Ea()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;->Ed()Z
+    invoke-virtual {v3}, Lkotlinx/coroutines/bn$b;->Eb()Z
 
     move-result v3
 
@@ -1524,7 +1524,7 @@
 
     check-cast v2, Lkotlinx/coroutines/bn$b;
 
-    iget-object v0, v2, Lkotlinx/coroutines/bn$b;->bky:Lkotlinx/coroutines/br;
+    iget-object v0, v2, Lkotlinx/coroutines/bn$b;->bkt: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;->bjx:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v7, Lkotlinx/coroutines/bn;->bjs: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;->bkP:Lkotlinx/coroutines/bs;
+    sget-object v0, Lkotlinx/coroutines/bs;->bkK:Lkotlinx/coroutines/bs;
 
     check-cast v0, Lkotlinx/coroutines/o;
 
@@ -1845,7 +1845,7 @@
     goto :goto_1
 
     :cond_3
-    invoke-interface {p1}, Lkotlinx/coroutines/bd;->DI()Lkotlinx/coroutines/br;
+    invoke-interface {p1}, Lkotlinx/coroutines/bd;->DG()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;->Es()Ljava/lang/Object;
+    invoke-virtual {p1}, Lkotlinx/coroutines/internal/i;->Eq()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -1941,11 +1941,11 @@
 
     check-cast v1, Ljava/lang/Throwable;
 
-    sget-object v2, Lkotlin/Unit;->bgy:Lkotlin/Unit;
+    sget-object v2, Lkotlin/Unit;->bgt:Lkotlin/Unit;
 
     :cond_1
     :goto_1
-    invoke-virtual {v0}, Lkotlinx/coroutines/internal/k;->Et()Lkotlinx/coroutines/internal/k;
+    invoke-virtual {v0}, Lkotlinx/coroutines/internal/k;->Er()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;->Ed()Z
+    invoke-virtual {p0}, Lkotlinx/coroutines/bn$b;->Eb()Z
 
     move-result v0
 
@@ -2145,7 +2145,7 @@
 
     if-eq v5, p1, :cond_8
 
-    sget-object v1, Lkotlinx/coroutines/bn;->bjx:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v1, Lkotlinx/coroutines/bn;->bjs: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;->Ec()Z
+    invoke-virtual {v5}, Lkotlinx/coroutines/bn$b;->Ea()Z
 
     move-result p1
 
@@ -2169,7 +2169,7 @@
 
     if-eqz p1, :cond_11
 
-    invoke-virtual {v5}, Lkotlinx/coroutines/bn$b;->Ed()Z
+    invoke-virtual {v5}, Lkotlinx/coroutines/bn$b;->Eb()Z
 
     move-result p1
 
@@ -2206,7 +2206,7 @@
     move-object v1, v6
 
     :goto_2
-    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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;->DI()Lkotlinx/coroutines/br;
+    invoke-interface {v0}, Lkotlinx/coroutines/bd;->DG()Lkotlinx/coroutines/br;
 
     move-result-object p1
 
@@ -2307,7 +2307,7 @@
     return v1
 
     :cond_0
-    invoke-virtual {p0}, Lkotlinx/coroutines/bn;->Di()Z
+    invoke-virtual {p0}, Lkotlinx/coroutines/bn;->Dg()Z
 
     move-result v0
 
@@ -2336,10 +2336,10 @@
 
 
 # virtual methods
-.method public final DV()Ljava/util/concurrent/CancellationException;
+.method public final DT()Ljava/util/concurrent/CancellationException;
     .locals 4
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/bn;->DZ()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/bn;->DX()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -2477,11 +2477,11 @@
     throw v1
 .end method
 
-.method public final DW()Z
+.method public final DU()Z
     .locals 6
 
     :goto_0
-    invoke-virtual {p0}, Lkotlinx/coroutines/bn;->DZ()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/bn;->DX()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -2499,13 +2499,13 @@
 
     check-cast v1, Lkotlinx/coroutines/av;
 
-    iget-boolean v1, v1, Lkotlinx/coroutines/av;->bkk:Z
+    iget-boolean v1, v1, Lkotlinx/coroutines/av;->bkf:Z
 
     if-nez v1, :cond_3
 
-    sget-object v1, Lkotlinx/coroutines/bn;->bjx:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v1, Lkotlinx/coroutines/bn;->bjs:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
-    invoke-static {}, Lkotlinx/coroutines/bo;->Eg()Lkotlinx/coroutines/av;
+    invoke-static {}, Lkotlinx/coroutines/bo;->Ee()Lkotlinx/coroutines/av;
 
     move-result-object v5
 
@@ -2518,7 +2518,7 @@
     goto :goto_2
 
     :cond_0
-    invoke-virtual {p0}, Lkotlinx/coroutines/bn;->Df()V
+    invoke-virtual {p0}, Lkotlinx/coroutines/bn;->Dd()V
 
     goto :goto_1
 
@@ -2527,13 +2527,13 @@
 
     if-eqz v1, :cond_3
 
-    sget-object v1, Lkotlinx/coroutines/bn;->bjx:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v1, Lkotlinx/coroutines/bn;->bjs:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     move-object v5, v0
 
     check-cast v5, Lkotlinx/coroutines/bc;
 
-    iget-object v5, v5, Lkotlinx/coroutines/bc;->bky:Lkotlinx/coroutines/br;
+    iget-object v5, v5, Lkotlinx/coroutines/bc;->bkt: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;->Df()V
+    invoke-virtual {p0}, Lkotlinx/coroutines/bn;->Dd()V
 
     :goto_1
     const/4 v2, 0x1
@@ -2568,7 +2568,7 @@
     return v3
 .end method
 
-.method public DX()Z
+.method public DV()Z
     .locals 1
 
     const/4 v0, 0x0
@@ -2576,7 +2576,7 @@
     return v0
 .end method
 
-.method protected DY()Z
+.method protected DW()Z
     .locals 1
 
     const/4 v0, 0x1
@@ -2584,7 +2584,7 @@
     return v0
 .end method
 
-.method public final DZ()Ljava/lang/Object;
+.method public final DX()Ljava/lang/Object;
     .locals 2
 
     :goto_0
@@ -2604,34 +2604,10 @@
     goto :goto_0
 .end method
 
-.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;
+.method public final DZ()Ljava/lang/Throwable;
     .locals 5
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/bn;->DZ()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/bn;->DX()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -2670,7 +2646,7 @@
     :goto_0
     if-eqz v1, :cond_3
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/bn;->DY()Z
+    invoke-virtual {p0}, Lkotlinx/coroutines/bn;->DW()Z
 
     move-result v2
 
@@ -2739,6 +2715,30 @@
     throw v1
 .end method
 
+.method public Dd()V
+    .locals 0
+
+    return-void
+.end method
+
+.method public Df()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 Dg()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;->DZ()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/bn;->DX()Ljava/lang/Object;
 
     move-result-object v2
 
@@ -2775,7 +2775,7 @@
 
     check-cast v3, Lkotlinx/coroutines/av;
 
-    iget-boolean v4, v3, Lkotlinx/coroutines/av;->bkk:Z
+    iget-boolean v4, v3, Lkotlinx/coroutines/av;->bkf:Z
 
     if-eqz v4, :cond_2
 
@@ -2786,7 +2786,7 @@
     move-result-object v1
 
     :cond_1
-    sget-object v3, Lkotlinx/coroutines/bn;->bjx:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v3, Lkotlinx/coroutines/bn;->bjs: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;->bkk:Z
+    iget-boolean v4, v3, Lkotlinx/coroutines/av;->bkf:Z
 
     if-eqz v4, :cond_3
 
@@ -2821,7 +2821,7 @@
     check-cast v2, Lkotlinx/coroutines/bd;
 
     :goto_1
-    sget-object v4, Lkotlinx/coroutines/bn;->bjx:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v4, Lkotlinx/coroutines/bn;->bjs: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;->DI()Lkotlinx/coroutines/br;
+    invoke-interface {v3}, Lkotlinx/coroutines/bd;->DG()Lkotlinx/coroutines/br;
 
     move-result-object v3
 
@@ -2860,7 +2860,7 @@
     throw p1
 
     :cond_6
-    sget-object v4, Lkotlinx/coroutines/bs;->bkP:Lkotlinx/coroutines/bs;
+    sget-object v4, Lkotlinx/coroutines/bs;->bkK: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;->bgy:Lkotlin/Unit;
+    sget-object v6, Lkotlin/Unit;->bgt: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;->bkP:Lkotlinx/coroutines/bs;
+    sget-object p1, Lkotlinx/coroutines/bs;->bkK:Lkotlinx/coroutines/bs;
 
     check-cast p1, Lkotlinx/coroutines/at;
 
@@ -3093,7 +3093,7 @@
 
     if-nez p1, :cond_1
 
-    sget-object p1, Lkotlinx/coroutines/bs;->bkP:Lkotlinx/coroutines/bs;
+    sget-object p1, Lkotlinx/coroutines/bs;->bkK:Lkotlinx/coroutines/bs;
 
     check-cast p1, Lkotlinx/coroutines/o;
 
@@ -3102,7 +3102,7 @@
     return-void
 
     :cond_1
-    invoke-interface {p1}, Lkotlinx/coroutines/Job;->DW()Z
+    invoke-interface {p1}, Lkotlinx/coroutines/Job;->DU()Z
 
     move-object v0, p0
 
@@ -3122,7 +3122,7 @@
 
     invoke-interface {p1}, Lkotlinx/coroutines/o;->dispose()V
 
-    sget-object p1, Lkotlinx/coroutines/bs;->bkP:Lkotlinx/coroutines/bs;
+    sget-object p1, Lkotlinx/coroutines/bs;->bkK:Lkotlinx/coroutines/bs;
 
     check-cast p1, Lkotlinx/coroutines/o;
 
@@ -3227,7 +3227,7 @@
         }
     .end annotation
 
-    sget-object v0, Lkotlinx/coroutines/Job;->bkC:Lkotlinx/coroutines/Job$b;
+    sget-object v0, Lkotlinx/coroutines/Job;->bkx: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;->DZ()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/bn;->DX()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -3301,7 +3301,7 @@
 .method public final k()Z
     .locals 1
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/bn;->DZ()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/bn;->DX()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -3323,7 +3323,7 @@
     .locals 3
 
     :goto_0
-    invoke-virtual {p0}, Lkotlinx/coroutines/bn;->DZ()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/bn;->DX()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -3491,7 +3491,7 @@
 
     if-eqz p1, :cond_0
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/bn;->DY()Z
+    invoke-virtual {p0}, Lkotlinx/coroutines/bn;->DW()Z
 
     move-result p1
 
@@ -3540,7 +3540,7 @@
 
     invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/bn;->Dh()Ljava/lang/String;
+    invoke-virtual {p0}, Lkotlinx/coroutines/bn;->Df()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;->DZ()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/bn;->DX()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 29f5a6de84..3d38b12649 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 bkL:Lkotlinx/coroutines/internal/v;
+.field private static final bkG:Lkotlinx/coroutines/internal/v;
 
-.field private static final bkM:Lkotlinx/coroutines/av;
+.field private static final bkH:Lkotlinx/coroutines/av;
 
-.field private static final bkN:Lkotlinx/coroutines/av;
+.field private static final bkI: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;->bkL:Lkotlinx/coroutines/internal/v;
+    sput-object v0, Lkotlinx/coroutines/bo;->bkG: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;->bkM:Lkotlinx/coroutines/av;
+    sput-object v0, Lkotlinx/coroutines/bo;->bkH: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;->bkN:Lkotlinx/coroutines/av;
+    sput-object v0, Lkotlinx/coroutines/bo;->bkI:Lkotlinx/coroutines/av;
 
     return-void
 .end method
 
-.method public static final synthetic Ef()Lkotlinx/coroutines/internal/v;
+.method public static final synthetic Ed()Lkotlinx/coroutines/internal/v;
     .locals 1
 
-    sget-object v0, Lkotlinx/coroutines/bo;->bkL:Lkotlinx/coroutines/internal/v;
+    sget-object v0, Lkotlinx/coroutines/bo;->bkG:Lkotlinx/coroutines/internal/v;
 
     return-object v0
 .end method
 
-.method public static final synthetic Eg()Lkotlinx/coroutines/av;
+.method public static final synthetic Ee()Lkotlinx/coroutines/av;
     .locals 1
 
-    sget-object v0, Lkotlinx/coroutines/bo;->bkN:Lkotlinx/coroutines/av;
+    sget-object v0, Lkotlinx/coroutines/bo;->bkI:Lkotlinx/coroutines/av;
 
     return-object v0
 .end method
 
-.method public static final synthetic Eh()Lkotlinx/coroutines/av;
+.method public static final synthetic Ef()Lkotlinx/coroutines/av;
     .locals 1
 
-    sget-object v0, Lkotlinx/coroutines/bo;->bkM:Lkotlinx/coroutines/av;
+    sget-object v0, Lkotlinx/coroutines/bo;->bkH:Lkotlinx/coroutines/av;
 
     return-object v0
 .end method
@@ -85,7 +85,7 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, v0, Lkotlinx/coroutines/be;->bkz:Lkotlinx/coroutines/bd;
+    iget-object v0, v0, Lkotlinx/coroutines/be;->bku: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 8f2e4ac9c3..c053f7c2bc 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 bkO:Lkotlin/jvm/functions/Function2;
+.field private bkJ: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;->bkO:Lkotlin/jvm/functions/Function2;
+    iput-object p2, p0, Lkotlinx/coroutines/bp;->bkJ: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;->bkO:Lkotlin/jvm/functions/Function2;
+    iget-object v0, p0, Lkotlinx/coroutines/bp;->bkJ:Lkotlin/jvm/functions/Function2;
 
     if-eqz v0, :cond_0
 
     const/4 v1, 0x0
 
-    iput-object v1, p0, Lkotlinx/coroutines/bp;->bkO:Lkotlin/jvm/functions/Function2;
+    iput-object v1, p0, Lkotlinx/coroutines/bp;->bkJ: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 c812a2136f..db0b0bdad0 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 DI()Lkotlinx/coroutines/br;
+.method public final DG()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;->Es()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/internal/i;->Eq()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;->Et()Lkotlinx/coroutines/internal/k;
+    invoke-virtual {p1}, Lkotlinx/coroutines/internal/k;->Er()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 6c028508c1..4b4b626937 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 bkP:Lkotlinx/coroutines/bs;
+.field public static final bkK:Lkotlinx/coroutines/bs;
 
 
 # direct methods
@@ -19,7 +19,7 @@
 
     invoke-direct {v0}, Lkotlinx/coroutines/bs;-><init>()V
 
-    sput-object v0, Lkotlinx/coroutines/bs;->bkP:Lkotlinx/coroutines/bs;
+    sput-object v0, Lkotlinx/coroutines/bs;->bkK: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 79250ab498..b56331b349 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 Eb()Ljava/lang/Throwable;
+.method public abstract DZ()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 20318074ca..66dd370af6 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 bkQ:Lkotlinx/coroutines/cb;
+.field public final bkL: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;->bkQ:Lkotlinx/coroutines/cb;
+    iput-object p1, p0, Lkotlinx/coroutines/bv;->bkL: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 59b66a4412..378b632a41 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;->bka:Ljava/lang/Object;
+    iget-object v0, p0, Lkotlinx/coroutines/ao;->bjV: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;->bkc:Lkotlin/coroutines/Continuation;
+    iget-object p0, p0, Lkotlinx/coroutines/ao;->bjX:Lkotlin/coroutines/Continuation;
 
-    sget-object v1, Lkotlin/m;->bgv:Lkotlin/m$a;
+    sget-object v1, Lkotlin/m;->bgq: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;->bgy:Lkotlin/Unit;
+    sget-object p0, Lkotlin/Unit;->bgt: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;->bgv:Lkotlin/m$a;
+    sget-object p2, Lkotlin/m;->bgq: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;->bka:Ljava/lang/Object;
+    iget-object v0, p0, Lkotlinx/coroutines/ao;->bjV: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;->bkc:Lkotlin/coroutines/Continuation;
+    iget-object p0, p0, Lkotlinx/coroutines/ao;->bjX:Lkotlin/coroutines/Continuation;
 
-    sget-object v1, Lkotlin/m;->bgv:Lkotlin/m$a;
+    sget-object v1, Lkotlin/m;->bgq: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;->bgy:Lkotlin/Unit;
+    sget-object p0, Lkotlin/Unit;->bgt: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;->bgv:Lkotlin/m$a;
+    sget-object p2, Lkotlin/m;->bgq: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 0ad43c36fb..7869f2aa6f 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/bx.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/bx.smali
@@ -7,7 +7,9 @@
 
 
 # instance fields
-.field private final bkR:Lkotlinx/coroutines/k;
+.field private final bjW:Lkotlinx/coroutines/ab;
+
+.field private final bkM:Lkotlinx/coroutines/k;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlinx/coroutines/k<",
@@ -17,8 +19,6 @@
     .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;->bkb:Lkotlinx/coroutines/ab;
+    iput-object p1, p0, Lkotlinx/coroutines/bx;->bjW:Lkotlinx/coroutines/ab;
 
-    iput-object p2, p0, Lkotlinx/coroutines/bx;->bkR:Lkotlinx/coroutines/k;
+    iput-object p2, p0, Lkotlinx/coroutines/bx;->bkM: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;->bkR:Lkotlinx/coroutines/k;
+    iget-object v0, p0, Lkotlinx/coroutines/bx;->bkM:Lkotlinx/coroutines/k;
 
-    iget-object v1, p0, Lkotlinx/coroutines/bx;->bkb:Lkotlinx/coroutines/ab;
+    iget-object v1, p0, Lkotlinx/coroutines/bx;->bjW:Lkotlinx/coroutines/ab;
 
-    sget-object v2, Lkotlin/Unit;->bgy:Lkotlin/Unit;
+    sget-object v2, Lkotlin/Unit;->bgt: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 1731885dc1..cce1e3bb7d 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 bjt:Ljava/lang/Thread;
+.field private final bjo:Ljava/lang/Thread;
 
-.field private final bju:Lkotlinx/coroutines/aw;
+.field private final bjp: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;->bjt:Ljava/lang/Thread;
+    iput-object p2, p0, Lkotlinx/coroutines/c;->bjo:Ljava/lang/Thread;
 
-    iput-object p3, p0, Lkotlinx/coroutines/c;->bju:Lkotlinx/coroutines/aw;
+    iput-object p3, p0, Lkotlinx/coroutines/c;->bjp:Lkotlinx/coroutines/aw;
 
     return-void
 .end method
 
 
 # virtual methods
-.method protected final Di()Z
+.method protected final Dg()Z
     .locals 1
 
     const/4 v0, 0x0
@@ -54,7 +54,7 @@
     return v0
 .end method
 
-.method public final Dj()Ljava/lang/Object;
+.method public final Dh()Ljava/lang/Object;
     .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -62,10 +62,10 @@
         }
     .end annotation
 
-    invoke-static {}, Lkotlinx/coroutines/cd;->El()Lkotlinx/coroutines/cc;
+    invoke-static {}, Lkotlinx/coroutines/cd;->Ej()Lkotlinx/coroutines/cc;
 
     :try_start_0
-    iget-object v0, p0, Lkotlinx/coroutines/c;->bju:Lkotlinx/coroutines/aw;
+    iget-object v0, p0, Lkotlinx/coroutines/c;->bjp:Lkotlinx/coroutines/aw;
 
     if-eqz v0, :cond_0
 
@@ -82,11 +82,11 @@
 
     if-nez v0, :cond_6
 
-    iget-object v0, p0, Lkotlinx/coroutines/c;->bju:Lkotlinx/coroutines/aw;
+    iget-object v0, p0, Lkotlinx/coroutines/c;->bjp:Lkotlinx/coroutines/aw;
 
     if-eqz v0, :cond_1
 
-    invoke-virtual {v0}, Lkotlinx/coroutines/aw;->DJ()J
+    invoke-virtual {v0}, Lkotlinx/coroutines/aw;->DH()J
 
     move-result-wide v0
 
@@ -102,7 +102,7 @@
 
     if-nez v2, :cond_2
 
-    invoke-static {}, Lkotlinx/coroutines/cd;->El()Lkotlinx/coroutines/cc;
+    invoke-static {}, Lkotlinx/coroutines/cd;->Ej()Lkotlinx/coroutines/cc;
 
     move-result-object v2
 
@@ -114,7 +114,7 @@
 
     :cond_2
     :try_start_2
-    iget-object v0, p0, Lkotlinx/coroutines/c;->bju:Lkotlinx/coroutines/aw;
+    iget-object v0, p0, Lkotlinx/coroutines/c;->bjp: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;->El()Lkotlinx/coroutines/cc;
+    invoke-static {}, Lkotlinx/coroutines/cd;->Ej()Lkotlinx/coroutines/cc;
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/c;->DZ()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/c;->DX()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -178,7 +178,7 @@
     move-exception v0
 
     :try_start_4
-    iget-object v1, p0, Lkotlinx/coroutines/c;->bju:Lkotlinx/coroutines/aw;
+    iget-object v1, p0, Lkotlinx/coroutines/c;->bjp:Lkotlinx/coroutines/aw;
 
     if-eqz v1, :cond_7
 
@@ -192,7 +192,7 @@
     :catchall_1
     move-exception v0
 
-    invoke-static {}, Lkotlinx/coroutines/cd;->El()Lkotlinx/coroutines/cc;
+    invoke-static {}, Lkotlinx/coroutines/cd;->Ej()Lkotlinx/coroutines/cc;
 
     goto :goto_4
 
@@ -210,7 +210,7 @@
 
     move-result-object p1
 
-    iget-object p2, p0, Lkotlinx/coroutines/c;->bjt:Ljava/lang/Thread;
+    iget-object p2, p0, Lkotlinx/coroutines/c;->bjo: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;->bjt:Ljava/lang/Thread;
+    iget-object p1, p0, Lkotlinx/coroutines/c;->bjo: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 7d87a048a2..459b531342 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 bkS:Ljava/lang/ThreadLocal;
+.field private static final bkN:Ljava/lang/ThreadLocal;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/ThreadLocal<",
@@ -14,7 +14,7 @@
     .end annotation
 .end field
 
-.field public static final bkT:Lkotlinx/coroutines/ca;
+.field public static final bkO:Lkotlinx/coroutines/ca;
 
 
 # direct methods
@@ -25,13 +25,13 @@
 
     invoke-direct {v0}, Lkotlinx/coroutines/ca;-><init>()V
 
-    sput-object v0, Lkotlinx/coroutines/ca;->bkT:Lkotlinx/coroutines/ca;
+    sput-object v0, Lkotlinx/coroutines/ca;->bkO:Lkotlinx/coroutines/ca;
 
     new-instance v0, Ljava/lang/ThreadLocal;
 
     invoke-direct {v0}, Ljava/lang/ThreadLocal;-><init>()V
 
-    sput-object v0, Lkotlinx/coroutines/ca;->bkS:Ljava/lang/ThreadLocal;
+    sput-object v0, Lkotlinx/coroutines/ca;->bkN:Ljava/lang/ThreadLocal;
 
     return-void
 .end method
@@ -44,10 +44,10 @@
     return-void
 .end method
 
-.method public static Ei()Lkotlinx/coroutines/aw;
+.method public static Eg()Lkotlinx/coroutines/aw;
     .locals 2
 
-    sget-object v0, Lkotlinx/coroutines/ca;->bkS:Ljava/lang/ThreadLocal;
+    sget-object v0, Lkotlinx/coroutines/ca;->bkN: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;->DR()Lkotlinx/coroutines/aw;
+    invoke-static {}, Lkotlinx/coroutines/ay;->DP()Lkotlinx/coroutines/aw;
 
     move-result-object v0
 
-    sget-object v1, Lkotlinx/coroutines/ca;->bkS:Ljava/lang/ThreadLocal;
+    sget-object v1, Lkotlinx/coroutines/ca;->bkN: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 Ej()Lkotlinx/coroutines/aw;
+.method public static Eh()Lkotlinx/coroutines/aw;
     .locals 1
 
-    sget-object v0, Lkotlinx/coroutines/ca;->bkS:Ljava/lang/ThreadLocal;
+    sget-object v0, Lkotlinx/coroutines/ca;->bkN: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 Ek()V
+.method public static Ei()V
     .locals 2
 
-    sget-object v0, Lkotlinx/coroutines/ca;->bkS:Ljava/lang/ThreadLocal;
+    sget-object v0, Lkotlinx/coroutines/ca;->bkN: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;->bkS:Ljava/lang/ThreadLocal;
+    sget-object v0, Lkotlinx/coroutines/ca;->bkN: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 5ac026b81e..cac0481c8d 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 bkW:Lkotlinx/coroutines/cb;
+.field final synthetic bkR:Lkotlinx/coroutines/cb;
 
 
 # direct methods
 .method constructor <init>(Lkotlinx/coroutines/cb;)V
     .locals 0
 
-    iput-object p1, p0, Lkotlinx/coroutines/cb$a;->bkW:Lkotlinx/coroutines/cb;
+    iput-object p1, p0, Lkotlinx/coroutines/cb$a;->bkR: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;->bkW:Lkotlinx/coroutines/cb;
+    iget-object v1, p0, Lkotlinx/coroutines/cb$a;->bkR: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;->bkW:Lkotlinx/coroutines/cb;
+    iget-object v2, p0, Lkotlinx/coroutines/cb$a;->bkR: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;->bkW:Lkotlinx/coroutines/cb;
+    iget-object v2, p0, Lkotlinx/coroutines/cb$a;->bkR: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;->bkW:Lkotlinx/coroutines/cb;
+    iget-object v3, p0, Lkotlinx/coroutines/cb$a;->bkR: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;->bkW:Lkotlinx/coroutines/cb;
+    iget-object v3, p0, Lkotlinx/coroutines/cb$a;->bkR: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 97ea21297a..7c4582c8d5 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 bkU:Ljava/util/concurrent/atomic/AtomicInteger;
+.field private final bkP:Ljava/util/concurrent/atomic/AtomicInteger;
 
-.field private final bkV:I
+.field private final bkQ:I
 
 .field private final executor:Ljava/util/concurrent/Executor;
 
@@ -25,7 +25,7 @@
 
     const/4 p1, 0x1
 
-    iput p1, p0, Lkotlinx/coroutines/cb;->bkV:I
+    iput p1, p0, Lkotlinx/coroutines/cb;->bkQ: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;->bkU:Ljava/util/concurrent/atomic/AtomicInteger;
+    iput-object p1, p0, Lkotlinx/coroutines/cb;->bkP:Ljava/util/concurrent/atomic/AtomicInteger;
 
-    iget p1, p0, Lkotlinx/coroutines/cb;->bkV:I
+    iget p1, p0, Lkotlinx/coroutines/cb;->bkQ: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;->DU()V
+    invoke-virtual {p0}, Lkotlinx/coroutines/cb;->DS()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;->bkV:I
+    iget p0, p0, Lkotlinx/coroutines/cb;->bkQ: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;->bkU:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object p0, p0, Lkotlinx/coroutines/cb;->bkP: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;->bkV:I
+    iget v1, p0, Lkotlinx/coroutines/cb;->bkQ: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 25a95a99b1..be2c091dfe 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 ns()J
+.method public abstract nq()J
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/cd.smali b/com.discord/smali_classes2/kotlinx/coroutines/cd.smali
index d3d6b133ce..3eb93b69e2 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 bkX:Lkotlinx/coroutines/cc;
+.field private static bkS:Lkotlinx/coroutines/cc;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    sget-object v0, Lkotlinx/coroutines/am;->bjY:Lkotlinx/coroutines/am;
+    sget-object v0, Lkotlinx/coroutines/am;->bjT:Lkotlinx/coroutines/am;
 
     check-cast v0, Lkotlinx/coroutines/cc;
 
-    sput-object v0, Lkotlinx/coroutines/cd;->bkX:Lkotlinx/coroutines/cc;
+    sput-object v0, Lkotlinx/coroutines/cd;->bkS:Lkotlinx/coroutines/cc;
 
     return-void
 .end method
 
-.method public static final El()Lkotlinx/coroutines/cc;
+.method public static final Ej()Lkotlinx/coroutines/cc;
     .locals 1
 
-    sget-object v0, Lkotlinx/coroutines/cd;->bkX:Lkotlinx/coroutines/cc;
+    sget-object v0, Lkotlinx/coroutines/cd;->bkS: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 c30fc0fe2b..537b9defd0 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 bkY:Lkotlinx/coroutines/ce;
+.field public static final bkT:Lkotlinx/coroutines/ce;
 
 
 # direct methods
@@ -15,7 +15,7 @@
 
     invoke-direct {v0}, Lkotlinx/coroutines/ce;-><init>()V
 
-    sput-object v0, Lkotlinx/coroutines/ce;->bkY:Lkotlinx/coroutines/ce;
+    sput-object v0, Lkotlinx/coroutines/ce;->bkT: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 933872bd5a..f21023267e 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 Dg()I
+.method public final De()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 c786e81133..155860e9f3 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 Dk()Ljava/lang/Thread;
+.method protected final Di()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 0ab48eac94..0155197672 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;->bha:Lkotlin/coroutines/c$b;
+    sget-object v1, Lkotlin/coroutines/c;->bgV: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;->bkT:Lkotlinx/coroutines/ca;
+    sget-object v1, Lkotlinx/coroutines/ca;->bkO:Lkotlinx/coroutines/ca;
 
-    invoke-static {}, Lkotlinx/coroutines/ca;->Ei()Lkotlinx/coroutines/aw;
+    invoke-static {}, Lkotlinx/coroutines/ca;->Eg()Lkotlinx/coroutines/aw;
 
     move-result-object v1
 
-    sget-object v2, Lkotlinx/coroutines/bb;->bkx:Lkotlinx/coroutines/bb;
+    sget-object v2, Lkotlinx/coroutines/bb;->bks:Lkotlinx/coroutines/bb;
 
     check-cast v2, Lkotlinx/coroutines/CoroutineScope;
 
@@ -77,13 +77,13 @@
     goto :goto_0
 
     :cond_0
-    sget-object v1, Lkotlinx/coroutines/ca;->bkT:Lkotlinx/coroutines/ca;
+    sget-object v1, Lkotlinx/coroutines/ca;->bkO:Lkotlinx/coroutines/ca;
 
-    invoke-static {}, Lkotlinx/coroutines/ca;->Ej()Lkotlinx/coroutines/aw;
+    invoke-static {}, Lkotlinx/coroutines/ca;->Eh()Lkotlinx/coroutines/aw;
 
     move-result-object v1
 
-    sget-object v2, Lkotlinx/coroutines/bb;->bkx:Lkotlinx/coroutines/bb;
+    sget-object v2, Lkotlinx/coroutines/bb;->bks: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;->bjP:Lkotlinx/coroutines/ag;
+    sget-object p0, Lkotlinx/coroutines/ag;->bjK: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;->Dj()Ljava/lang/Object;
+    invoke-virtual {v2}, Lkotlinx/coroutines/c;->Dh()Ljava/lang/Object;
 
     move-result-object p0
 
@@ -169,7 +169,7 @@
 
     check-cast p1, Lkotlinx/coroutines/ag;
 
-    sget-object v0, Lkotlinx/coroutines/ag;->bjQ:Lkotlinx/coroutines/ag;
+    sget-object v0, Lkotlinx/coroutines/ag;->bjL: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 f327e105f3..ed407ed2f2 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;->bhd:Lkotlin/coroutines/e;
+    sget-object p0, Lkotlin/coroutines/e;->bgY: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 d2ce3a51b4..b95066231e 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;->bkC:Lkotlinx/coroutines/Job$b;
+    sget-object v1, Lkotlinx/coroutines/Job;->bkx: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;->DV()Ljava/util/concurrent/CancellationException;
+    invoke-interface {v1}, Lkotlinx/coroutines/Job;->DT()Ljava/util/concurrent/CancellationException;
 
     move-result-object p0
 
@@ -86,7 +86,7 @@
     goto/16 :goto_2
 
     :cond_2
-    sget-object v1, Lkotlin/coroutines/c;->bha:Lkotlin/coroutines/c$b;
+    sget-object v1, Lkotlin/coroutines/c;->bgV: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;->bha:Lkotlin/coroutines/c$b;
+    sget-object v2, Lkotlin/coroutines/c;->bgV: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;->De()V
+    invoke-virtual {v0}, Lkotlinx/coroutines/ap;->Dc()V
 
     move-object p0, v0
 
@@ -192,7 +192,7 @@
     throw p0
 
     :cond_6
-    sget-object p0, Lkotlinx/coroutines/ap;->bjw:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sget-object p0, Lkotlinx/coroutines/ap;->bjr: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;->DZ()Ljava/lang/Object;
+    invoke-virtual {v0}, Lkotlinx/coroutines/ap;->DX()Ljava/lang/Object;
 
     move-result-object p0
 
@@ -255,7 +255,7 @@
 
     if-eqz v0, :cond_0
 
-    sget-object p1, Lkotlin/coroutines/e;->bhd:Lkotlin/coroutines/e;
+    sget-object p1, Lkotlin/coroutines/e;->bgY:Lkotlin/coroutines/e;
 
     check-cast p1, Lkotlin/coroutines/CoroutineContext;
 
@@ -264,7 +264,7 @@
 
     if-eqz p4, :cond_1
 
-    sget-object p2, Lkotlinx/coroutines/ag;->bjP:Lkotlinx/coroutines/ag;
+    sget-object p2, Lkotlinx/coroutines/ag;->bjK: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 fa5852b44c..90f1216c71 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 bjv:Ljava/util/concurrent/Future;
+.field private final bjq: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;->bjv:Ljava/util/concurrent/Future;
+    iput-object p1, p0, Lkotlinx/coroutines/h;->bjq: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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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;->bjv:Ljava/util/concurrent/Future;
+    iget-object p1, p0, Lkotlinx/coroutines/h;->bjq: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;->bjv:Ljava/util/concurrent/Future;
+    iget-object v1, p0, Lkotlinx/coroutines/h;->bjq: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 8052c8bb06..414d7420d9 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 blW:[Lkotlinx/coroutines/internal/ab;
+.field public blR:[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;->blW:[Lkotlinx/coroutines/internal/ab;
+    iget-object v1, p0, Lkotlinx/coroutines/internal/aa;->blR:[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;->blW:[Lkotlinx/coroutines/internal/ab;
+    iget-object v0, p0, Lkotlinx/coroutines/internal/aa;->blR:[Lkotlinx/coroutines/internal/ab;
 
     if-nez v0, :cond_0
 
@@ -159,7 +159,7 @@
 
 
 # virtual methods
-.method public final declared-synchronized EC()Lkotlinx/coroutines/internal/ab;
+.method public final declared-synchronized EA()Lkotlinx/coroutines/internal/ab;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -170,7 +170,7 @@
     monitor-enter p0
 
     :try_start_0
-    invoke-virtual {p0}, Lkotlinx/coroutines/internal/aa;->EE()Lkotlinx/coroutines/internal/ab;
+    invoke-virtual {p0}, Lkotlinx/coroutines/internal/aa;->EC()Lkotlinx/coroutines/internal/ab;
 
     move-result-object v0
     :try_end_0
@@ -188,7 +188,7 @@
     throw v0
 .end method
 
-.method public final declared-synchronized ED()Lkotlinx/coroutines/internal/ab;
+.method public final declared-synchronized EB()Lkotlinx/coroutines/internal/ab;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -230,7 +230,7 @@
     throw v0
 .end method
 
-.method public final EE()Lkotlinx/coroutines/internal/ab;
+.method public final EC()Lkotlinx/coroutines/internal/ab;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -238,7 +238,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lkotlinx/coroutines/internal/aa;->blW:[Lkotlinx/coroutines/internal/ab;
+    iget-object v0, p0, Lkotlinx/coroutines/internal/aa;->blR:[Lkotlinx/coroutines/internal/ab;
 
     if-eqz v0, :cond_0
 
@@ -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;->DQ()Lkotlinx/coroutines/internal/aa;
+    invoke-interface {p1}, Lkotlinx/coroutines/internal/ab;->DO()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;->blW:[Lkotlinx/coroutines/internal/ab;
+    iget-object v0, p0, Lkotlinx/coroutines/internal/aa;->blR:[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;->DQ()Lkotlinx/coroutines/internal/aa;
+    invoke-interface {p1}, Lkotlinx/coroutines/internal/ab;->DO()Lkotlinx/coroutines/internal/aa;
 
     move-result-object v4
 
@@ -494,7 +494,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lkotlinx/coroutines/internal/aa;->blW:[Lkotlinx/coroutines/internal/ab;
+    iget-object v0, p0, Lkotlinx/coroutines/internal/aa;->blR:[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 5af9121fc6..722ccb842c 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 DQ()Lkotlinx/coroutines/internal/aa;
+.method public abstract DO()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 632dcbc193..266102e413 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 bjq:Lkotlin/coroutines/CoroutineContext;
+.field final bjl:Lkotlin/coroutines/CoroutineContext;
 
-.field blX:[Ljava/lang/Object;
+.field blS:[Ljava/lang/Object;
 
-.field blY:I
+.field blT:I
 
 
 # direct methods
@@ -21,11 +21,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lkotlinx/coroutines/internal/ac;->bjq:Lkotlin/coroutines/CoroutineContext;
+    iput-object p1, p0, Lkotlinx/coroutines/internal/ac;->bjl:Lkotlin/coroutines/CoroutineContext;
 
     new-array p1, p2, [Ljava/lang/Object;
 
-    iput-object p1, p0, Lkotlinx/coroutines/internal/ac;->blX:[Ljava/lang/Object;
+    iput-object p1, p0, Lkotlinx/coroutines/internal/ac;->blS:[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 8682b7e8bc..919da483be 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 bld:[Ljava/lang/Object;
+.field private bkY:[Ljava/lang/Object;
 
-.field private ble:I
+.field private bkZ:I
 
-.field private blf:I
+.field private bla:I
 
 
 # direct methods
@@ -32,15 +32,15 @@
 
     new-array v0, v0, [Ljava/lang/Object;
 
-    iput-object v0, p0, Lkotlinx/coroutines/internal/b;->bld:[Ljava/lang/Object;
+    iput-object v0, p0, Lkotlinx/coroutines/internal/b;->bkY:[Ljava/lang/Object;
 
     return-void
 .end method
 
-.method private final En()V
+.method private final El()V
     .locals 6
 
-    iget-object v0, p0, Lkotlinx/coroutines/internal/b;->bld:[Ljava/lang/Object;
+    iget-object v0, p0, Lkotlinx/coroutines/internal/b;->bkY:[Ljava/lang/Object;
 
     array-length v1, v0
 
@@ -50,7 +50,7 @@
 
     array-length v3, v0
 
-    iget v4, p0, Lkotlinx/coroutines/internal/b;->ble:I
+    iget v4, p0, Lkotlinx/coroutines/internal/b;->bkZ: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;->bld:[Ljava/lang/Object;
+    iget-object v0, p0, Lkotlinx/coroutines/internal/b;->bkY:[Ljava/lang/Object;
 
-    iget v4, p0, Lkotlinx/coroutines/internal/b;->ble:I
+    iget v4, p0, Lkotlinx/coroutines/internal/b;->bkZ: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;->bld:[Ljava/lang/Object;
+    iput-object v2, p0, Lkotlinx/coroutines/internal/b;->bkY:[Ljava/lang/Object;
 
-    iput v5, p0, Lkotlinx/coroutines/internal/b;->ble:I
+    iput v5, p0, Lkotlinx/coroutines/internal/b;->bkZ:I
 
-    iput v1, p0, Lkotlinx/coroutines/internal/b;->blf:I
+    iput v1, p0, Lkotlinx/coroutines/internal/b;->bla:I
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final Em()Ljava/lang/Object;
+.method public final Ek()Ljava/lang/Object;
     .locals 4
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -83,9 +83,9 @@
         }
     .end annotation
 
-    iget v0, p0, Lkotlinx/coroutines/internal/b;->ble:I
+    iget v0, p0, Lkotlinx/coroutines/internal/b;->bkZ:I
 
-    iget v1, p0, Lkotlinx/coroutines/internal/b;->blf:I
+    iget v1, p0, Lkotlinx/coroutines/internal/b;->bla:I
 
     const/4 v2, 0x0
 
@@ -94,7 +94,7 @@
     return-object v2
 
     :cond_0
-    iget-object v1, p0, Lkotlinx/coroutines/internal/b;->bld:[Ljava/lang/Object;
+    iget-object v1, p0, Lkotlinx/coroutines/internal/b;->bkY:[Ljava/lang/Object;
 
     aget-object v3, v1, v0
 
@@ -108,7 +108,7 @@
 
     and-int/2addr v0, v1
 
-    iput v0, p0, Lkotlinx/coroutines/internal/b;->ble:I
+    iput v0, p0, Lkotlinx/coroutines/internal/b;->bkZ: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;->bld:[Ljava/lang/Object;
+    iget-object v0, p0, Lkotlinx/coroutines/internal/b;->bkY:[Ljava/lang/Object;
 
-    iget v1, p0, Lkotlinx/coroutines/internal/b;->blf:I
+    iget v1, p0, Lkotlinx/coroutines/internal/b;->bla:I
 
     aput-object p1, v0, v1
 
@@ -150,15 +150,15 @@
 
     and-int/2addr p1, v1
 
-    iput p1, p0, Lkotlinx/coroutines/internal/b;->blf:I
+    iput p1, p0, Lkotlinx/coroutines/internal/b;->bla:I
 
-    iget p1, p0, Lkotlinx/coroutines/internal/b;->blf:I
+    iget p1, p0, Lkotlinx/coroutines/internal/b;->bla:I
 
-    iget v0, p0, Lkotlinx/coroutines/internal/b;->ble:I
+    iget v0, p0, Lkotlinx/coroutines/internal/b;->bkZ:I
 
     if-ne p1, v0, :cond_0
 
-    invoke-direct {p0}, Lkotlinx/coroutines/internal/b;->En()V
+    invoke-direct {p0}, Lkotlinx/coroutines/internal/b;->El()V
 
     :cond_0
     return-void
@@ -167,9 +167,9 @@
 .method public final isEmpty()Z
     .locals 2
 
-    iget v0, p0, Lkotlinx/coroutines/internal/b;->ble:I
+    iget v0, p0, Lkotlinx/coroutines/internal/b;->bkZ:I
 
-    iget v1, p0, Lkotlinx/coroutines/internal/b;->blf:I
+    iget v1, p0, Lkotlinx/coroutines/internal/b;->bla: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 bb8964c124..b2ae5d88b1 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 blg:Ljava/lang/Object;
+.field private static final blb: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;->blg:Ljava/lang/Object;
+    sput-object v0, Lkotlinx/coroutines/internal/c;->blb:Ljava/lang/Object;
 
     return-void
 .end method
 
-.method public static final synthetic Eo()Ljava/lang/Object;
+.method public static final synthetic Em()Ljava/lang/Object;
     .locals 1
 
-    sget-object v0, Lkotlinx/coroutines/internal/c;->blg:Ljava/lang/Object;
+    sget-object v0, Lkotlinx/coroutines/internal/c;->blb: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 7b11483bac..eb648086ed 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 blh:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+.field private static final blc:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
 
 # instance fields
@@ -36,7 +36,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lkotlinx/coroutines/internal/d;->blh:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sput-object v0, Lkotlinx/coroutines/internal/d;->blc: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;->Eo()Ljava/lang/Object;
+    invoke-static {}, Lkotlinx/coroutines/internal/c;->Em()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;->Eo()Ljava/lang/Object;
+    invoke-static {}, Lkotlinx/coroutines/internal/c;->Em()Ljava/lang/Object;
 
     move-result-object v1
 
@@ -81,7 +81,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lkotlinx/coroutines/internal/c;->Eo()Ljava/lang/Object;
+    invoke-static {}, Lkotlinx/coroutines/internal/c;->Em()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;->blh:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v1, Lkotlinx/coroutines/internal/d;->blc:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
-    invoke-static {}, Lkotlinx/coroutines/internal/c;->Eo()Ljava/lang/Object;
+    invoke-static {}, Lkotlinx/coroutines/internal/c;->Em()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 24fb73351a..6dbe2fe26d 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 bli:Ljava/lang/reflect/Method;
+.field private static final bld:Ljava/lang/reflect/Method;
 
 
 # direct methods
@@ -38,7 +38,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    sput-object v0, Lkotlinx/coroutines/internal/e;->bli:Ljava/lang/reflect/Method;
+    sput-object v0, Lkotlinx/coroutines/internal/e;->bld:Ljava/lang/reflect/Method;
 
     return-void
 .end method
@@ -69,7 +69,7 @@
     return v1
 
     :cond_1
-    sget-object v2, Lkotlinx/coroutines/internal/e;->bli:Ljava/lang/reflect/Method;
+    sget-object v2, Lkotlinx/coroutines/internal/e;->bld: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 989f832671..177e47ab42 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 blj:Lkotlin/coroutines/CoroutineContext;
+.field private final ble: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;->blj:Lkotlin/coroutines/CoroutineContext;
+    iput-object p1, p0, Lkotlinx/coroutines/internal/f;->ble:Lkotlin/coroutines/CoroutineContext;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final Dd()Lkotlin/coroutines/CoroutineContext;
+.method public final Db()Lkotlin/coroutines/CoroutineContext;
     .locals 1
 
-    iget-object v0, p0, Lkotlinx/coroutines/internal/f;->blj:Lkotlin/coroutines/CoroutineContext;
+    iget-object v0, p0, Lkotlinx/coroutines/internal/f;->ble: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 81e7b9761c..90a718d7a9 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;->bgv:Lkotlin/m$a;
+    sget-object v0, Lkotlin/m;->bgq: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;->bgv:Lkotlin/m$a;
+    sget-object v0, Lkotlin/m;->bgq: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 e6a1466ea0..c4fa009441 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;->bgv:Lkotlin/m$a;
+    sget-object v0, Lkotlin/m;->bgq: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;->bgv:Lkotlin/m$a;
+    sget-object v0, Lkotlin/m;->bgq: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 a115d82957..918f27f9e2 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;->bgv:Lkotlin/m$a;
+    sget-object v0, Lkotlin/m;->bgq: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;->bgv:Lkotlin/m$a;
+    sget-object v0, Lkotlin/m;->bgq: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 37e125188f..e40ce08959 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;->bgv:Lkotlin/m$a;
+    sget-object v0, Lkotlin/m;->bgq: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;->bgv:Lkotlin/m$a;
+    sget-object v0, Lkotlin/m;->bgq: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 10e0400bc6..c44a738247 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 bln:Lkotlinx/coroutines/internal/g$f;
+.field public static final bli: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;->bln:Lkotlinx/coroutines/internal/g$f;
+    sput-object v0, Lkotlinx/coroutines/internal/g$f;->bli: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 88b79cbcb6..58bd212e11 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 blo:Lkotlinx/coroutines/internal/g$g;
+.field public static final blj: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;->blo:Lkotlinx/coroutines/internal/g$g;
+    sput-object v0, Lkotlinx/coroutines/internal/g$g;->blj: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 53e34f4b83..8c11f0b81f 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 blk:I
+.field private static final blf:I
 
-.field private static final bll:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+.field private static final blg:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
 
-.field private static final blm:Ljava/util/WeakHashMap;
+.field private static final blh: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;->blk:I
+    sput v0, Lkotlinx/coroutines/internal/g;->blf: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;->bll:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+    sput-object v0, Lkotlinx/coroutines/internal/g;->blg: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;->blm:Ljava/util/WeakHashMap;
+    sput-object v0, Lkotlinx/coroutines/internal/g;->blh: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;->bgv:Lkotlin/m$a;
+    sget-object v0, Lkotlin/m;->bgq:Lkotlin/m$a;
 
     const/4 v0, 0x0
 
@@ -140,7 +140,7 @@
     :catchall_0
     move-exception p0
 
-    sget-object v0, Lkotlin/m;->bgv:Lkotlin/m$a;
+    sget-object v0, Lkotlin/m;->bgq: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;->bgv:Lkotlin/m$a;
+    sget-object v0, Lkotlin/m;->bgq:Lkotlin/m$a;
 
     check-cast p0, Lkotlinx/coroutines/z;
 
-    invoke-interface {p0}, Lkotlinx/coroutines/z;->Dx()Ljava/lang/Throwable;
+    invoke-interface {p0}, Lkotlinx/coroutines/z;->Dv()Ljava/lang/Throwable;
 
     move-result-object p0
 
@@ -213,7 +213,7 @@
     :catchall_0
     move-exception p0
 
-    sget-object v0, Lkotlin/m;->bgv:Lkotlin/m$a;
+    sget-object v0, Lkotlin/m;->bgq: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;->bll:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+    sget-object v0, Lkotlinx/coroutines/internal/g;->blg: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;->blm:Ljava/util/WeakHashMap;
+    sget-object v2, Lkotlinx/coroutines/internal/g;->blh: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;->blk:I
+    sget v0, Lkotlinx/coroutines/internal/g;->blf: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;->bll:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+    sget-object v0, Lkotlinx/coroutines/internal/g;->blg: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;->blm:Ljava/util/WeakHashMap;
+    sget-object v5, Lkotlinx/coroutines/internal/g;->blh: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;->bln:Lkotlinx/coroutines/internal/g$f;
+    sget-object v6, Lkotlinx/coroutines/internal/g$f;->bli: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;->bgy:Lkotlin/Unit;
+    sget-object p0, Lkotlin/Unit;->bgt: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;->bll:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+    sget-object v0, Lkotlinx/coroutines/internal/g;->blg: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;->blm:Ljava/util/WeakHashMap;
+    sget-object v6, Lkotlinx/coroutines/internal/g;->blh: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;->blo:Lkotlinx/coroutines/internal/g$g;
+    sget-object v8, Lkotlinx/coroutines/internal/g$g;->blj: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;->bgy:Lkotlin/Unit;
+    sget-object v6, Lkotlin/Unit;->bgt: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 d4686a9b19..e6e902d1f2 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 blp:Z
+.field private static final blk:Z
 
-.field public static final blq:Lkotlinx/coroutines/internal/h;
+.field public static final bll: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;->blq:Lkotlinx/coroutines/internal/h;
+    sput-object v0, Lkotlinx/coroutines/internal/h;->bll: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;->blp:Z
+    sput-boolean v0, Lkotlinx/coroutines/internal/h;->blk: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;->blp:Z
+    sget-boolean v2, Lkotlinx/coroutines/internal/h;->blk: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 d45f0bb5b5..eb1188a8d1 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 Ep()Z
+.method public final En()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 3db0e4fd9a..e0bb48b8ad 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 blr:Ljava/lang/Object;
+.field private static final blm:Ljava/lang/Object;
 
-.field private static final bls:Ljava/lang/Object;
+.field private static final bln:Ljava/lang/Object;
 
-.field private static final blt:Ljava/lang/Object;
+.field private static final blo:Ljava/lang/Object;
 
-.field private static final blu:Ljava/lang/Object;
+.field private static final blp: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;->blr:Ljava/lang/Object;
+    sput-object v0, Lkotlinx/coroutines/internal/j;->blm: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;->bls:Ljava/lang/Object;
+    sput-object v0, Lkotlinx/coroutines/internal/j;->bln: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;->blt:Ljava/lang/Object;
+    sput-object v0, Lkotlinx/coroutines/internal/j;->blo: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;->blu:Ljava/lang/Object;
+    sput-object v0, Lkotlinx/coroutines/internal/j;->blp:Ljava/lang/Object;
 
     return-void
 .end method
 
-.method public static final Eq()Ljava/lang/Object;
+.method public static final Eo()Ljava/lang/Object;
     .locals 1
 
-    sget-object v0, Lkotlinx/coroutines/internal/j;->blr:Ljava/lang/Object;
+    sget-object v0, Lkotlinx/coroutines/internal/j;->blm: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;->blJ:Lkotlinx/coroutines/internal/k;
+    iget-object v0, v0, Lkotlinx/coroutines/internal/s;->blE: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 2ec6024e74..373300665f 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 bly:Lkotlinx/coroutines/internal/k;
+.field public blt:Lkotlinx/coroutines/internal/k;
 
-.field public final blz:Lkotlinx/coroutines/internal/k;
+.field public final blu: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;->blz:Lkotlinx/coroutines/internal/k;
+    iput-object p1, p0, Lkotlinx/coroutines/internal/k$a;->blu: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;->blz:Lkotlinx/coroutines/internal/k;
+    iget-object v0, p0, Lkotlinx/coroutines/internal/k$a;->blu:Lkotlinx/coroutines/internal/k;
 
     goto :goto_1
 
     :cond_1
-    iget-object v0, p0, Lkotlinx/coroutines/internal/k$a;->bly:Lkotlinx/coroutines/internal/k;
+    iget-object v0, p0, Lkotlinx/coroutines/internal/k$a;->blt:Lkotlinx/coroutines/internal/k;
 
     :goto_1
     if-eqz v0, :cond_3
 
-    sget-object v1, Lkotlinx/coroutines/internal/k;->blv:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v1, Lkotlinx/coroutines/internal/k;->blq: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;->blz:Lkotlinx/coroutines/internal/k;
+    iget-object p1, p0, Lkotlinx/coroutines/internal/k$a;->blu:Lkotlinx/coroutines/internal/k;
 
-    iget-object p2, p0, Lkotlinx/coroutines/internal/k$a;->bly:Lkotlinx/coroutines/internal/k;
+    iget-object p2, p0, Lkotlinx/coroutines/internal/k$a;->blt: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 78049ce33f..7cc9847e71 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 blv:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+.field static final blq:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
-.field static final blw:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+.field static final blr:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
-.field private static final blx:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+.field private static final bls:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
 
 # instance fields
@@ -41,7 +41,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lkotlinx/coroutines/internal/k;->blv:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sput-object v1, Lkotlinx/coroutines/internal/k;->blq: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;->blw:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sput-object v1, Lkotlinx/coroutines/internal/k;->blr: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;->blx:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sput-object v0, Lkotlinx/coroutines/internal/k;->bls:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     return-void
 .end method
@@ -82,7 +82,7 @@
     return-void
 .end method
 
-.method private final Er()Lkotlinx/coroutines/internal/s;
+.method private final Ep()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;->blx:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v1, Lkotlinx/coroutines/internal/k;->bls: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 Ev()Lkotlinx/coroutines/internal/k;
+.method private final Et()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;->blJ:Lkotlinx/coroutines/internal/k;
+    iget-object v0, v0, Lkotlinx/coroutines/internal/s;->blE:Lkotlinx/coroutines/internal/k;
 
     return-object v0
 
@@ -126,7 +126,7 @@
 
     if-ne v0, v1, :cond_2
 
-    invoke-direct {p0}, Lkotlinx/coroutines/internal/k;->Ew()Lkotlinx/coroutines/internal/k;
+    invoke-direct {p0}, Lkotlinx/coroutines/internal/k;->Eu()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;->Er()Lkotlinx/coroutines/internal/s;
+    invoke-direct {v1}, Lkotlinx/coroutines/internal/k;->Ep()Lkotlinx/coroutines/internal/s;
 
     move-result-object v1
 
-    sget-object v2, Lkotlinx/coroutines/internal/k;->blw:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v2, Lkotlinx/coroutines/internal/k;->blr: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 Ew()Lkotlinx/coroutines/internal/k;
+.method private final Eu()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;->Es()Ljava/lang/Object;
+    invoke-virtual {v1}, Lkotlinx/coroutines/internal/k;->Eq()Ljava/lang/Object;
 
     move-result-object v1
 
@@ -251,7 +251,7 @@
 
     if-nez v1, :cond_3
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/internal/k;->Es()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/internal/k;->Eq()Ljava/lang/Object;
 
     move-result-object v1
 
@@ -260,7 +260,7 @@
     goto :goto_0
 
     :cond_1
-    sget-object v1, Lkotlinx/coroutines/internal/k;->blw:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v1, Lkotlinx/coroutines/internal/k;->blr: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;->Es()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/internal/k;->Eq()Ljava/lang/Object;
 
     move-result-object v1
 
@@ -332,13 +332,13 @@
 
     if-eqz v1, :cond_3
 
-    invoke-direct {p1}, Lkotlinx/coroutines/internal/k;->Ev()Lkotlinx/coroutines/internal/k;
+    invoke-direct {p1}, Lkotlinx/coroutines/internal/k;->Et()Lkotlinx/coroutines/internal/k;
 
-    sget-object v3, Lkotlinx/coroutines/internal/k;->blv:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v3, Lkotlinx/coroutines/internal/k;->blq:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     check-cast v2, Lkotlinx/coroutines/internal/s;
 
-    iget-object v2, v2, Lkotlinx/coroutines/internal/s;->blJ:Lkotlinx/coroutines/internal/k;
+    iget-object v2, v2, Lkotlinx/coroutines/internal/s;->blE: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;->blw:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v2, Lkotlinx/coroutines/internal/k;->blr: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 Ep()Z
+.method public En()Z
     .locals 10
 
     :cond_0
-    invoke-virtual {p0}, Lkotlinx/coroutines/internal/k;->Es()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/internal/k;->Eq()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;->Er()Lkotlinx/coroutines/internal/s;
+    invoke-direct {v3}, Lkotlinx/coroutines/internal/k;->Ep()Lkotlinx/coroutines/internal/s;
 
     move-result-object v4
 
-    sget-object v5, Lkotlinx/coroutines/internal/k;->blv:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v5, Lkotlinx/coroutines/internal/k;->blq: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;->Ev()Lkotlinx/coroutines/internal/k;
+    invoke-direct {p0}, Lkotlinx/coroutines/internal/k;->Et()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;->blJ:Lkotlinx/coroutines/internal/k;
+    iget-object v4, v4, Lkotlinx/coroutines/internal/s;->blE:Lkotlinx/coroutines/internal/k;
 
     :cond_3
     :goto_1
-    invoke-virtual {v4}, Lkotlinx/coroutines/internal/k;->Es()Ljava/lang/Object;
+    invoke-virtual {v4}, Lkotlinx/coroutines/internal/k;->Eq()Ljava/lang/Object;
 
     move-result-object v7
 
@@ -494,14 +494,14 @@
 
     if-eqz v8, :cond_4
 
-    invoke-direct {v4}, Lkotlinx/coroutines/internal/k;->Ev()Lkotlinx/coroutines/internal/k;
+    invoke-direct {v4}, Lkotlinx/coroutines/internal/k;->Et()Lkotlinx/coroutines/internal/k;
 
     move-object v4, v7
 
     goto :goto_0
 
     :cond_4
-    invoke-virtual {v6}, Lkotlinx/coroutines/internal/k;->Es()Ljava/lang/Object;
+    invoke-virtual {v6}, Lkotlinx/coroutines/internal/k;->Eq()Ljava/lang/Object;
 
     move-result-object v7
 
@@ -511,13 +511,13 @@
 
     if-eqz v0, :cond_5
 
-    invoke-direct {v6}, Lkotlinx/coroutines/internal/k;->Ev()Lkotlinx/coroutines/internal/k;
+    invoke-direct {v6}, Lkotlinx/coroutines/internal/k;->Et()Lkotlinx/coroutines/internal/k;
 
-    sget-object v8, Lkotlinx/coroutines/internal/k;->blv:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v8, Lkotlinx/coroutines/internal/k;->blq:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     check-cast v7, Lkotlinx/coroutines/internal/s;
 
-    iget-object v7, v7, Lkotlinx/coroutines/internal/s;->blJ:Lkotlinx/coroutines/internal/k;
+    iget-object v7, v7, Lkotlinx/coroutines/internal/s;->blE: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;->blv:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v7, Lkotlinx/coroutines/internal/k;->blq: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 Es()Ljava/lang/Object;
+.method public final Eq()Ljava/lang/Object;
     .locals 2
 
     :goto_0
@@ -627,10 +627,10 @@
     goto :goto_0
 .end method
 
-.method public final Et()Lkotlinx/coroutines/internal/k;
+.method public final Er()Lkotlinx/coroutines/internal/k;
     .locals 1
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/internal/k;->Es()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/internal/k;->Eq()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -641,7 +641,7 @@
     return-object v0
 .end method
 
-.method public final Eu()Ljava/lang/Object;
+.method public final Es()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;->Es()Ljava/lang/Object;
+    invoke-virtual {v1}, Lkotlinx/coroutines/internal/k;->Eq()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;->blw:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/internal/k;->blr: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;->blv:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/internal/k;->blq: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;->bly:Lkotlinx/coroutines/internal/k;
+    iput-object p2, p3, Lkotlinx/coroutines/internal/k$a;->blt:Lkotlinx/coroutines/internal/k;
 
-    sget-object p1, Lkotlinx/coroutines/internal/k;->blv:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object p1, Lkotlinx/coroutines/internal/k;->blq: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;->blw:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/internal/k;->blr: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;->blv:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/internal/k;->blq: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;->Es()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/internal/k;->Eq()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -778,7 +778,7 @@
     return p1
 
     :cond_1
-    sget-object v0, Lkotlinx/coroutines/internal/k;->blv:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/internal/k;->blq: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 96b65ab78a..fc0fa4b16b 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 blA:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+.field public static final synthetic blv:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
 
 # instance fields
@@ -36,7 +36,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lkotlinx/coroutines/internal/l;->blA:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sput-object v0, Lkotlinx/coroutines/internal/l;->blv:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     return-void
 .end method
@@ -61,7 +61,7 @@
 
 
 # virtual methods
-.method public final Em()Ljava/lang/Object;
+.method public final Ek()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;->blE:Lkotlinx/coroutines/internal/v;
+    sget-object v7, Lkotlinx/coroutines/internal/m;->blz:Lkotlinx/coroutines/internal/v;
 
     goto/16 :goto_2
 
     :cond_1
-    sget-object v1, Lkotlinx/coroutines/internal/m;->blF:Lkotlinx/coroutines/internal/m$a;
+    sget-object v1, Lkotlinx/coroutines/internal/m;->blA: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;->blB:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+    sget-object v1, Lkotlinx/coroutines/internal/m;->blw:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
 
-    sget-object v2, Lkotlinx/coroutines/internal/m;->blF:Lkotlinx/coroutines/internal/m$a;
+    sget-object v2, Lkotlinx/coroutines/internal/m;->blA: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;->blE:Lkotlinx/coroutines/internal/v;
+    sget-object v1, Lkotlinx/coroutines/internal/m;->blz:Lkotlinx/coroutines/internal/v;
 
     if-eq v7, v1, :cond_7
 
     return-object v7
 
     :cond_7
-    sget-object v1, Lkotlinx/coroutines/internal/l;->blA:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v1, Lkotlinx/coroutines/internal/l;->blv:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
-    invoke-virtual {v0}, Lkotlinx/coroutines/internal/m;->Ex()Lkotlinx/coroutines/internal/m;
+    invoke-virtual {v0}, Lkotlinx/coroutines/internal/m;->Ev()Lkotlinx/coroutines/internal/m;
 
     move-result-object v2
 
@@ -278,9 +278,9 @@
     return p1
 
     :cond_1
-    sget-object v1, Lkotlinx/coroutines/internal/l;->blA:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v1, Lkotlinx/coroutines/internal/l;->blv:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
-    invoke-virtual {v0}, Lkotlinx/coroutines/internal/m;->Ex()Lkotlinx/coroutines/internal/m;
+    invoke-virtual {v0}, Lkotlinx/coroutines/internal/m;->Ev()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;->gG()Z
+    invoke-virtual {v0}, Lkotlinx/coroutines/internal/m;->gE()Z
 
     move-result v1
 
@@ -309,9 +309,9 @@
     return-void
 
     :cond_0
-    sget-object v1, Lkotlinx/coroutines/internal/l;->blA:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v1, Lkotlinx/coroutines/internal/l;->blv:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
-    invoke-virtual {v0}, Lkotlinx/coroutines/internal/m;->Ex()Lkotlinx/coroutines/internal/m;
+    invoke-virtual {v0}, Lkotlinx/coroutines/internal/m;->Ev()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 1339dc24bd..21fa692d81 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 public static final synthetic blB:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+.field public static final blA:Lkotlinx/coroutines/internal/m$a;
 
-.field public static final blE:Lkotlinx/coroutines/internal/v;
+.field private static final blq:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
-.field public static final blF:Lkotlinx/coroutines/internal/m$a;
+.field public static final synthetic blw:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
 
-.field private static final blv:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+.field public static final blz:Lkotlinx/coroutines/internal/v;
 
 
 # instance fields
@@ -36,7 +36,7 @@
 
 .field public volatile synthetic _state$internal:J
 
-.field private final blC:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+.field private final blx: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 blD:Z
+.field private final bly: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;->blF:Lkotlinx/coroutines/internal/m$a;
+    sput-object v1, Lkotlinx/coroutines/internal/m;->blA: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;->blE:Lkotlinx/coroutines/internal/v;
+    sput-object v1, Lkotlinx/coroutines/internal/m;->blz: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;->blv:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sput-object v1, Lkotlinx/coroutines/internal/m;->blq: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;->blB:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+    sput-object v0, Lkotlinx/coroutines/internal/m;->blw: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;->blD:Z
+    iput-boolean p2, p0, Lkotlinx/coroutines/internal/m;->bly: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;->blC:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iput-object p2, p0, Lkotlinx/coroutines/internal/m;->blx: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 Ey()J
+.method private final Ew()J
     .locals 9
 
     :cond_0
@@ -210,7 +210,7 @@
     :cond_1
     or-long v6, v2, v0
 
-    sget-object v0, Lkotlinx/coroutines/internal/m;->blB:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/internal/m;->blw: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;->Ex()Lkotlinx/coroutines/internal/m;
+    invoke-virtual {p0}, Lkotlinx/coroutines/internal/m;->Ev()Lkotlinx/coroutines/internal/m;
 
     move-result-object p0
 
     return-object p0
 
     :cond_2
-    sget-object v0, Lkotlinx/coroutines/internal/m;->blB:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/internal/m;->blw: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;->blC:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object p1, p0, Lkotlinx/coroutines/internal/m;->blx: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;->blv:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/internal/m;->blq: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;->blD:Z
+    iget-boolean v2, p0, Lkotlinx/coroutines/internal/m;->bly: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;->blC:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v4, v0, Lkotlinx/coroutines/internal/m;->blx: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;->blC:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v6, p0, Lkotlinx/coroutines/internal/m;->blx: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;->blC:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object p0, p0, Lkotlinx/coroutines/internal/m;->blx: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;->blD:Z
+    iget-boolean p0, p0, Lkotlinx/coroutines/internal/m;->bly:Z
 
     return p0
 .end method
@@ -466,7 +466,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lkotlinx/coroutines/internal/m;->blC:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v0, p0, Lkotlinx/coroutines/internal/m;->blx: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;->blC:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v0, p0, Lkotlinx/coroutines/internal/m;->blx:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
     iget v1, p0, Lkotlinx/coroutines/internal/m;->mask:I
 
@@ -504,7 +504,7 @@
 
 
 # virtual methods
-.method public final Ex()Lkotlinx/coroutines/internal/m;
+.method public final Ev()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;->Ey()J
+    invoke-direct {p0}, Lkotlinx/coroutines/internal/m;->Ew()J
 
     move-result-wide v0
 
@@ -592,13 +592,13 @@
     return v6
 
     :cond_2
-    iget-boolean v2, p0, Lkotlinx/coroutines/internal/m;->blD:Z
+    iget-boolean v2, p0, Lkotlinx/coroutines/internal/m;->bly:Z
 
     const v5, 0x3fffffff    # 1.9999999f
 
     if-nez v2, :cond_4
 
-    iget-object v2, p0, Lkotlinx/coroutines/internal/m;->blC:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v2, p0, Lkotlinx/coroutines/internal/m;->blx: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;->blB:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+    sget-object v2, Lkotlinx/coroutines/internal/m;->blw: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;->blC:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v1, p0, Lkotlinx/coroutines/internal/m;->blx: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;->Ex()Lkotlinx/coroutines/internal/m;
+    invoke-virtual {v1}, Lkotlinx/coroutines/internal/m;->Ev()Lkotlinx/coroutines/internal/m;
 
     move-result-object v1
 
@@ -681,7 +681,7 @@
     return v9
 .end method
 
-.method public final gG()Z
+.method public final gE()Z
     .locals 10
 
     :cond_0
@@ -717,7 +717,7 @@
     :cond_2
     or-long v4, v2, v0
 
-    sget-object v0, Lkotlinx/coroutines/internal/m;->blB:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/internal/m;->blw: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 cb1a864eed..a2853ea12f 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 blG:Lkotlinx/coroutines/bq;
+.field public static final blB:Lkotlinx/coroutines/bq;
 
-.field public static final blH:Lkotlinx/coroutines/internal/n;
+.field public static final blC: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;->blH:Lkotlinx/coroutines/internal/n;
+    sput-object v0, Lkotlinx/coroutines/internal/n;->blC:Lkotlinx/coroutines/internal/n;
 
-    invoke-static {}, Lkotlinx/coroutines/internal/n;->Ez()Lkotlinx/coroutines/bq;
+    invoke-static {}, Lkotlinx/coroutines/internal/n;->Ex()Lkotlinx/coroutines/bq;
 
     move-result-object v0
 
-    sput-object v0, Lkotlinx/coroutines/internal/n;->blG:Lkotlinx/coroutines/bq;
+    sput-object v0, Lkotlinx/coroutines/internal/n;->blB:Lkotlinx/coroutines/bq;
 
     return-void
 .end method
@@ -36,13 +36,13 @@
     return-void
 .end method
 
-.method private static Ez()Lkotlinx/coroutines/bq;
+.method private static Ex()Lkotlinx/coroutines/bq;
     .locals 7
 
     :try_start_0
     const-class v0, Lkotlinx/coroutines/internal/MainDispatcherFactory;
 
-    sget-object v1, Lkotlinx/coroutines/internal/h;->blq:Lkotlinx/coroutines/internal/h;
+    sget-object v1, Lkotlinx/coroutines/internal/h;->bll: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 a990a48514..0043799f4c 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 blI:Ljava/lang/String;
+.field private final blD: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;->blI:Ljava/lang/String;
+    iput-object p2, p0, Lkotlinx/coroutines/internal/p;->blD:Ljava/lang/String;
 
     return-void
 .end method
 
-.method private final EA()Ljava/lang/Void;
+.method private final Ey()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;->blI:Ljava/lang/String;
+    iget-object v1, p0, Lkotlinx/coroutines/internal/p;->blD: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;->EA()Ljava/lang/Void;
+    invoke-direct {p0}, Lkotlinx/coroutines/internal/p;->Ey()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;->EA()Ljava/lang/Void;
+    invoke-direct {p0}, Lkotlinx/coroutines/internal/p;->Ey()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;->EA()Ljava/lang/Void;
+    invoke-direct {p0}, Lkotlinx/coroutines/internal/p;->Ey()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 b47478fc29..24ab26baf7 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 blJ:Lkotlinx/coroutines/internal/k;
+.field public final blE: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;->blJ:Lkotlinx/coroutines/internal/k;
+    iput-object p1, p0, Lkotlinx/coroutines/internal/s;->blE: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;->blJ:Lkotlinx/coroutines/internal/k;
+    iget-object v1, p0, Lkotlinx/coroutines/internal/s;->blE: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 80430f7a50..0ac03947c1 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 blK:Lkotlin/coroutines/Continuation;
+.field public final blF: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;->blK:Lkotlin/coroutines/Continuation;
+    iput-object p2, p0, Lkotlinx/coroutines/internal/t;->blF:Lkotlin/coroutines/Continuation;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public Dg()I
+.method public De()I
     .locals 1
 
     const/4 v0, 0x2
@@ -69,7 +69,7 @@
     return v0
 .end method
 
-.method public final Di()Z
+.method public final Dg()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;->blK:Lkotlin/coroutines/Continuation;
+    iget-object v0, p0, Lkotlinx/coroutines/internal/t;->blF: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;->blK:Lkotlin/coroutines/Continuation;
+    iget-object v0, p0, Lkotlinx/coroutines/internal/t;->blF: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;->blK:Lkotlin/coroutines/Continuation;
+    iget-object v0, p0, Lkotlinx/coroutines/internal/t;->blF:Lkotlin/coroutines/Continuation;
 
     const-string v7, "$this$resumeUninterceptedWithExceptionMode"
 
@@ -183,7 +183,7 @@
     move-result-object v1
 
     :try_start_0
-    sget-object v2, Lkotlin/m;->bgv:Lkotlin/m$a;
+    sget-object v2, Lkotlin/m;->bgq: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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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;->bgv:Lkotlin/m$a;
+    sget-object p2, Lkotlin/m;->bgq: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;->bgv:Lkotlin/m$a;
+    sget-object v0, Lkotlin/m;->bgq: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;->blK:Lkotlin/coroutines/Continuation;
+    iget-object v0, p0, Lkotlinx/coroutines/internal/t;->blF:Lkotlin/coroutines/Continuation;
 
     const-string v7, "$this$resumeUninterceptedMode"
 
@@ -303,7 +303,7 @@
     move-result-object v1
 
     :try_start_1
-    sget-object v2, Lkotlin/m;->bgv:Lkotlin/m$a;
+    sget-object v2, Lkotlin/m;->bgq: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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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;->bgv:Lkotlin/m$a;
+    sget-object p2, Lkotlin/m;->bgq: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;->bgv:Lkotlin/m$a;
+    sget-object v0, Lkotlin/m;->bgq: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 91396bc91c..be557401d8 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;->bjU:Z
+    sget-boolean v0, Lkotlinx/coroutines/aj;->bjP: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 94bdbb975f..3e8348eb8d 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 blL:Ljava/lang/String;
+.field private final blG: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;->blL:Ljava/lang/String;
+    iput-object p1, p0, Lkotlinx/coroutines/internal/v;->blG: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;->blL:Ljava/lang/String;
+    iget-object v0, p0, Lkotlinx/coroutines/internal/v;->blG: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 4e0abf9ee3..e51d25067c 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 blM:I
+.field private static final blH:I
 
 
 # direct methods
@@ -19,15 +19,15 @@
 
     move-result v0
 
-    sput v0, Lkotlinx/coroutines/internal/x;->blM:I
+    sput v0, Lkotlinx/coroutines/internal/x;->blH:I
 
     return-void
 .end method
 
-.method public static final EB()I
+.method public static final Ez()I
     .locals 1
 
-    sget v0, Lkotlinx/coroutines/internal/x;->blM:I
+    sget v0, Lkotlinx/coroutines/internal/x;->blH: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 543ed85852..a84719a58f 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 blS:Lkotlinx/coroutines/internal/z$a;
+.field public static final blN: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;->blS:Lkotlinx/coroutines/internal/z$a;
+    sput-object v0, Lkotlinx/coroutines/internal/z$a;->blN: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 c4a7e1792e..56ed034920 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 blT:Lkotlinx/coroutines/internal/z$b;
+.field public static final blO: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;->blT:Lkotlinx/coroutines/internal/z$b;
+    sput-object v0, Lkotlinx/coroutines/internal/z$b;->blO: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 3840593943..3029ec943e 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 blU:Lkotlinx/coroutines/internal/z$c;
+.field public static final blP: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;->blU:Lkotlinx/coroutines/internal/z$c;
+    sput-object v0, Lkotlinx/coroutines/internal/z$c;->blP: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;->bjq:Lkotlin/coroutines/CoroutineContext;
+    iget-object v0, p1, Lkotlinx/coroutines/internal/ac;->bjl:Lkotlin/coroutines/CoroutineContext;
 
-    iget-object v1, p1, Lkotlinx/coroutines/internal/ac;->blX:[Ljava/lang/Object;
+    iget-object v1, p1, Lkotlinx/coroutines/internal/ac;->blS:[Ljava/lang/Object;
 
-    iget v2, p1, Lkotlinx/coroutines/internal/ac;->blY:I
+    iget v2, p1, Lkotlinx/coroutines/internal/ac;->blT:I
 
     add-int/lit8 v3, v2, 0x1
 
-    iput v3, p1, Lkotlinx/coroutines/internal/ac;->blY:I
+    iput v3, p1, Lkotlinx/coroutines/internal/ac;->blT: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 9cee858f53..29d2d10359 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 blV:Lkotlinx/coroutines/internal/z$d;
+.field public static final blQ: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;->blV:Lkotlinx/coroutines/internal/z$d;
+    sput-object v0, Lkotlinx/coroutines/internal/z$d;->blQ: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;->bjq:Lkotlin/coroutines/CoroutineContext;
+    iget-object v0, p1, Lkotlinx/coroutines/internal/ac;->bjl: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;->blX:[Ljava/lang/Object;
+    iget-object v0, p1, Lkotlinx/coroutines/internal/ac;->blS:[Ljava/lang/Object;
 
-    iget v1, p1, Lkotlinx/coroutines/internal/ac;->blY:I
+    iget v1, p1, Lkotlinx/coroutines/internal/ac;->blT:I
 
     add-int/lit8 v2, v1, 0x1
 
-    iput v2, p1, Lkotlinx/coroutines/internal/ac;->blY:I
+    iput v2, p1, Lkotlinx/coroutines/internal/ac;->blT: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 6d0de0d41f..2f7cd92851 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 blN:Lkotlinx/coroutines/internal/v;
+.field private static final blI:Lkotlinx/coroutines/internal/v;
 
-.field private static final blO:Lkotlin/jvm/functions/Function2;
+.field private static final blJ: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 blP:Lkotlin/jvm/functions/Function2;
+.field private static final blK: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 blQ:Lkotlin/jvm/functions/Function2;
+.field private static final blL: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 blR:Lkotlin/jvm/functions/Function2;
+.field private static final blM: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;->blN:Lkotlinx/coroutines/internal/v;
+    sput-object v0, Lkotlinx/coroutines/internal/z;->blI:Lkotlinx/coroutines/internal/v;
 
-    sget-object v0, Lkotlinx/coroutines/internal/z$a;->blS:Lkotlinx/coroutines/internal/z$a;
+    sget-object v0, Lkotlinx/coroutines/internal/z$a;->blN:Lkotlinx/coroutines/internal/z$a;
 
     check-cast v0, Lkotlin/jvm/functions/Function2;
 
-    sput-object v0, Lkotlinx/coroutines/internal/z;->blO:Lkotlin/jvm/functions/Function2;
+    sput-object v0, Lkotlinx/coroutines/internal/z;->blJ:Lkotlin/jvm/functions/Function2;
 
-    sget-object v0, Lkotlinx/coroutines/internal/z$b;->blT:Lkotlinx/coroutines/internal/z$b;
+    sget-object v0, Lkotlinx/coroutines/internal/z$b;->blO:Lkotlinx/coroutines/internal/z$b;
 
     check-cast v0, Lkotlin/jvm/functions/Function2;
 
-    sput-object v0, Lkotlinx/coroutines/internal/z;->blP:Lkotlin/jvm/functions/Function2;
+    sput-object v0, Lkotlinx/coroutines/internal/z;->blK:Lkotlin/jvm/functions/Function2;
 
-    sget-object v0, Lkotlinx/coroutines/internal/z$d;->blV:Lkotlinx/coroutines/internal/z$d;
+    sget-object v0, Lkotlinx/coroutines/internal/z$d;->blQ:Lkotlinx/coroutines/internal/z$d;
 
     check-cast v0, Lkotlin/jvm/functions/Function2;
 
-    sput-object v0, Lkotlinx/coroutines/internal/z;->blQ:Lkotlin/jvm/functions/Function2;
+    sput-object v0, Lkotlinx/coroutines/internal/z;->blL:Lkotlin/jvm/functions/Function2;
 
-    sget-object v0, Lkotlinx/coroutines/internal/z$c;->blU:Lkotlinx/coroutines/internal/z$c;
+    sget-object v0, Lkotlinx/coroutines/internal/z$c;->blP:Lkotlinx/coroutines/internal/z$c;
 
     check-cast v0, Lkotlin/jvm/functions/Function2;
 
-    sput-object v0, Lkotlinx/coroutines/internal/z;->blR:Lkotlin/jvm/functions/Function2;
+    sput-object v0, Lkotlinx/coroutines/internal/z;->blM: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;->blN:Lkotlinx/coroutines/internal/v;
+    sget-object v0, Lkotlinx/coroutines/internal/z;->blI: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;->blY:I
+    iput v1, v0, Lkotlinx/coroutines/internal/ac;->blT:I
 
-    sget-object v0, Lkotlinx/coroutines/internal/z;->blR:Lkotlin/jvm/functions/Function2;
+    sget-object v0, Lkotlinx/coroutines/internal/z;->blM: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;->blP:Lkotlin/jvm/functions/Function2;
+    sget-object v1, Lkotlinx/coroutines/internal/z;->blK: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;->blN:Lkotlinx/coroutines/internal/v;
+    sget-object p0, Lkotlinx/coroutines/internal/z;->blI: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;->blQ:Lkotlin/jvm/functions/Function2;
+    sget-object p1, Lkotlinx/coroutines/internal/z;->blL: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;->blO:Lkotlin/jvm/functions/Function2;
+    sget-object v1, Lkotlinx/coroutines/internal/z;->blJ: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 2460b6f5eb..673818a292 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 bjw:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+.field private static final bjr:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
-.field private static final bjx:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+.field private static final bjs:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
 
 # instance fields
@@ -33,7 +33,7 @@
 
 .field private volatile _state:Ljava/lang/Object;
 
-.field private final bhe:Lkotlin/coroutines/Continuation;
+.field private final bgZ:Lkotlin/coroutines/Continuation;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/coroutines/Continuation<",
@@ -42,7 +42,7 @@
     .end annotation
 .end field
 
-.field private final bjq:Lkotlin/coroutines/CoroutineContext;
+.field private final bjl:Lkotlin/coroutines/CoroutineContext;
 
 .field private volatile parentHandle:Lkotlinx/coroutines/at;
 
@@ -59,7 +59,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lkotlinx/coroutines/l;->bjw:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sput-object v1, Lkotlinx/coroutines/l;->bjr: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;->bjx:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sput-object v0, Lkotlinx/coroutines/l;->bjs: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;->bhe:Lkotlin/coroutines/Continuation;
+    iput-object p1, p0, Lkotlinx/coroutines/l;->bgZ:Lkotlin/coroutines/Continuation;
 
-    iget-object p1, p0, Lkotlinx/coroutines/l;->bhe:Lkotlin/coroutines/Continuation;
+    iget-object p1, p0, Lkotlinx/coroutines/l;->bgZ:Lkotlin/coroutines/Continuation;
 
     invoke-interface {p1}, Lkotlin/coroutines/Continuation;->getContext()Lkotlin/coroutines/CoroutineContext;
 
     move-result-object p1
 
-    iput-object p1, p0, Lkotlinx/coroutines/l;->bjq:Lkotlin/coroutines/CoroutineContext;
+    iput-object p1, p0, Lkotlinx/coroutines/l;->bjl:Lkotlin/coroutines/CoroutineContext;
 
     const/4 p1, 0x0
 
     iput p1, p0, Lkotlinx/coroutines/l;->_decision:I
 
-    sget-object p1, Lkotlinx/coroutines/b;->bjs:Lkotlinx/coroutines/b;
+    sget-object p1, Lkotlinx/coroutines/b;->bjn:Lkotlinx/coroutines/b;
 
     iput-object p1, p0, Lkotlinx/coroutines/l;->_state:Ljava/lang/Object;
 
     return-void
 .end method
 
-.method private final Dl()V
+.method private final Dj()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;->bhe:Lkotlin/coroutines/Continuation;
+    iget-object v0, p0, Lkotlinx/coroutines/l;->bgZ:Lkotlin/coroutines/Continuation;
 
     invoke-interface {v0}, Lkotlin/coroutines/Continuation;->getContext()Lkotlin/coroutines/CoroutineContext;
 
     move-result-object v0
 
-    sget-object v1, Lkotlinx/coroutines/Job;->bkC:Lkotlinx/coroutines/Job$b;
+    sget-object v1, Lkotlinx/coroutines/Job;->bkx: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;->DW()Z
+    invoke-interface {v0}, Lkotlinx/coroutines/Job;->DU()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;->bkP:Lkotlinx/coroutines/bs;
+    sget-object v0, Lkotlinx/coroutines/bs;->bkK:Lkotlinx/coroutines/bs;
 
     check-cast v0, Lkotlinx/coroutines/at;
 
@@ -186,7 +186,7 @@
     return-void
 .end method
 
-.method private final Dn()Z
+.method private final Dl()Z
     .locals 3
 
     :cond_0
@@ -218,7 +218,7 @@
     throw v0
 
     :cond_2
-    sget-object v0, Lkotlinx/coroutines/l;->bjw:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/l;->bjr:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
     const/4 v2, 0x1
 
@@ -231,7 +231,7 @@
     return v2
 .end method
 
-.method private final Do()Z
+.method private final Dm()Z
     .locals 4
 
     :cond_0
@@ -263,7 +263,7 @@
     throw v0
 
     :cond_2
-    sget-object v0, Lkotlinx/coroutines/l;->bjw:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/l;->bjr:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
     const/4 v3, 0x2
 
@@ -276,7 +276,7 @@
     return v2
 .end method
 
-.method private final Dp()V
+.method private final Dn()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;->bkP:Lkotlinx/coroutines/bs;
+    sget-object v0, Lkotlinx/coroutines/bs;->bkK: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;->DV()Ljava/util/concurrent/CancellationException;
+    invoke-interface {p0}, Lkotlinx/coroutines/Job;->DT()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;->Do()Z
+    invoke-direct {p0}, Lkotlinx/coroutines/l;->Dm()Z
 
     move-result v0
 
@@ -411,7 +411,7 @@
 
     if-eqz v1, :cond_1
 
-    sget-object v1, Lkotlinx/coroutines/l;->bjx:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v1, Lkotlinx/coroutines/l;->bjs: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;->Dp()V
+    invoke-direct {p0}, Lkotlinx/coroutines/l;->Dn()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;->Dr()Z
+    invoke-virtual {v0}, Lkotlinx/coroutines/m;->Dp()Z
 
     move-result v1
 
@@ -469,7 +469,7 @@
 
 
 # virtual methods
-.method public final Dm()Ljava/lang/Object;
+.method public final Dk()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 Dq()Lkotlin/coroutines/Continuation;
+.method public final Do()Lkotlin/coroutines/Continuation;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -487,7 +487,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lkotlinx/coroutines/l;->bhe:Lkotlin/coroutines/Continuation;
+    iget-object v0, p0, Lkotlinx/coroutines/l;->bgZ: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;->bjH:Lkotlin/jvm/functions/Function1;
+    iget-object p1, p1, Lkotlinx/coroutines/w;->bjC: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;->bhe:Lkotlin/coroutines/Continuation;
+    iget-object v0, p0, Lkotlinx/coroutines/l;->bgZ: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;->bkb:Lkotlinx/coroutines/ab;
+    iget-object v2, v0, Lkotlinx/coroutines/ao;->bjW: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;->bke:I
+    iget p1, p0, Lkotlinx/coroutines/l;->bjZ: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;->bhe:Lkotlin/coroutines/Continuation;
+    iget-object v0, p0, Lkotlinx/coroutines/l;->bgZ: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;->bjq:Lkotlin/coroutines/CoroutineContext;
+    iget-object v0, p0, Lkotlinx/coroutines/l;->bjl:Lkotlin/coroutines/CoroutineContext;
 
     return-object v0
 .end method
@@ -708,7 +708,7 @@
 
     :cond_2
     :goto_1
-    sget-object v3, Lkotlinx/coroutines/l;->bjx:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v3, Lkotlinx/coroutines/l;->bjs: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;->Dw()Z
+    invoke-virtual {v1}, Lkotlinx/coroutines/m;->Du()Z
 
     move-result v1
 
@@ -798,9 +798,9 @@
 .method public final o()Ljava/lang/Object;
     .locals 3
 
-    invoke-direct {p0}, Lkotlinx/coroutines/l;->Dl()V
+    invoke-direct {p0}, Lkotlinx/coroutines/l;->Dj()V
 
-    invoke-direct {p0}, Lkotlinx/coroutines/l;->Dn()Z
+    invoke-direct {p0}, Lkotlinx/coroutines/l;->Dl()Z
 
     move-result v0
 
@@ -819,7 +819,7 @@
 
     if-nez v1, :cond_3
 
-    iget v1, p0, Lkotlinx/coroutines/l;->bke:I
+    iget v1, p0, Lkotlinx/coroutines/l;->bjZ:I
 
     const/4 v2, 0x1
 
@@ -829,7 +829,7 @@
 
     move-result-object v1
 
-    sget-object v2, Lkotlinx/coroutines/Job;->bkC:Lkotlinx/coroutines/Job$b;
+    sget-object v2, Lkotlinx/coroutines/Job;->bkx: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;->DV()Ljava/util/concurrent/CancellationException;
+    invoke-interface {v1}, Lkotlinx/coroutines/Job;->DT()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;->bjx:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v3, Lkotlinx/coroutines/l;->bjs: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;->Dp()V
+    invoke-direct {p0}, Lkotlinx/coroutines/l;->Dn()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;->bke:I
+    iget v0, p0, Lkotlinx/coroutines/l;->bjZ: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;->bhe:Lkotlin/coroutines/Continuation;
+    iget-object v1, p0, Lkotlinx/coroutines/l;->bgZ: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 0314a31988..88d4a3e826 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 bjy:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+.field private static final bjt:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
 
 # instance fields
@@ -23,7 +23,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lkotlinx/coroutines/m;->bjy:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sput-object v0, Lkotlinx/coroutines/m;->bjt:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
     return-void
 .end method
@@ -80,10 +80,10 @@
 
 
 # virtual methods
-.method public final Dr()Z
+.method public final Dp()Z
     .locals 3
 
-    sget-object v0, Lkotlinx/coroutines/m;->bjy:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/m;->bjt: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 d271453db1..bdfdff39c3 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 bjz:Lkotlinx/coroutines/l;
+.field public final bju: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;->bjz:Lkotlinx/coroutines/l;
+    iput-object p2, p0, Lkotlinx/coroutines/n;->bju: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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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;->bjz:Lkotlinx/coroutines/l;
+    iget-object p1, p0, Lkotlinx/coroutines/n;->bju: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;->bjz:Lkotlinx/coroutines/l;
+    iget-object v1, p0, Lkotlinx/coroutines/n;->bju: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 10414ab14f..96a3a8d1c1 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 bjA:Lkotlinx/coroutines/q;
+.field public final bjv: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;->bjA:Lkotlinx/coroutines/q;
+    iput-object p2, p0, Lkotlinx/coroutines/p;->bjv: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;->bgy:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgt: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;->bjA:Lkotlinx/coroutines/q;
+    iget-object p1, p0, Lkotlinx/coroutines/p;->bjv: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;->bjA:Lkotlinx/coroutines/q;
+    iget-object v1, p0, Lkotlinx/coroutines/p;->bjv: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 cf5ed4fe65..21210370db 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;->Du()Ljava/util/concurrent/ExecutorService;
+    value = Lkotlinx/coroutines/r;->Ds()Ljava/util/concurrent/ExecutorService;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic bjE:Ljava/util/concurrent/atomic/AtomicInteger;
+.field final synthetic bjz: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;->bjE:Ljava/util/concurrent/atomic/AtomicInteger;
+    iput-object p1, p0, Lkotlinx/coroutines/r$a;->bjz: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;->bjE:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v2, p0, Lkotlinx/coroutines/r$a;->bjz: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 5aa568ebb5..f5ea884f4a 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 bjF:Lkotlinx/coroutines/r$b;
+.field public static final bjA: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;->bjF:Lkotlinx/coroutines/r$b;
+    sput-object v0, Lkotlinx/coroutines/r$b;->bjA: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 d2dc0d52c6..98dd57b79e 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 bjB:I
+.field private static final bjw:I
 
-.field private static bjC:Z
+.field private static bjx:Z
 
-.field public static final bjD:Lkotlinx/coroutines/r;
+.field public static final bjy: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;->bjD:Lkotlinx/coroutines/r;
+    sput-object v0, Lkotlinx/coroutines/r;->bjy: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;->bjB:I
+    sput v0, Lkotlinx/coroutines/r;->bjw:I
 
     return-void
 
@@ -98,10 +98,10 @@
     return-void
 .end method
 
-.method private static Ds()I
+.method private static Dq()I
     .locals 3
 
-    sget v0, Lkotlinx/coroutines/r;->bjB:I
+    sget v0, Lkotlinx/coroutines/r;->bjw:I
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -161,7 +161,7 @@
     return v0
 .end method
 
-.method private final Dt()Ljava/util/concurrent/ExecutorService;
+.method private final Dr()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;->Du()Ljava/util/concurrent/ExecutorService;
+    invoke-static {}, Lkotlinx/coroutines/r;->Ds()Ljava/util/concurrent/ExecutorService;
 
     move-result-object v0
 
@@ -196,20 +196,20 @@
     :goto_0
     if-nez v1, :cond_1
 
-    invoke-static {}, Lkotlinx/coroutines/r;->Du()Ljava/util/concurrent/ExecutorService;
+    invoke-static {}, Lkotlinx/coroutines/r;->Ds()Ljava/util/concurrent/ExecutorService;
 
     move-result-object v0
 
     return-object v0
 
     :cond_1
-    sget-boolean v2, Lkotlinx/coroutines/r;->bjC:Z
+    sget-boolean v2, Lkotlinx/coroutines/r;->bjx:Z
 
     const/4 v3, 0x0
 
     if-nez v2, :cond_5
 
-    sget v2, Lkotlinx/coroutines/r;->bjB:I
+    sget v2, Lkotlinx/coroutines/r;->bjw:I
 
     if-gez v2, :cond_5
 
@@ -287,7 +287,7 @@
 
     new-array v2, v2, [Ljava/lang/Object;
 
-    invoke-static {}, Lkotlinx/coroutines/r;->Ds()I
+    invoke-static {}, Lkotlinx/coroutines/r;->Dq()I
 
     move-result v4
 
@@ -325,21 +325,21 @@
     return-object v0
 
     :cond_7
-    invoke-static {}, Lkotlinx/coroutines/r;->Du()Ljava/util/concurrent/ExecutorService;
+    invoke-static {}, Lkotlinx/coroutines/r;->Ds()Ljava/util/concurrent/ExecutorService;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method private static Du()Ljava/util/concurrent/ExecutorService;
+.method private static Ds()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;->Ds()I
+    invoke-static {}, Lkotlinx/coroutines/r;->Dq()I
 
     move-result v1
 
@@ -360,7 +360,7 @@
     return-object v0
 .end method
 
-.method private final declared-synchronized Dv()Ljava/util/concurrent/Executor;
+.method private final declared-synchronized Dt()Ljava/util/concurrent/Executor;
     .locals 2
 
     monitor-enter p0
@@ -370,7 +370,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-direct {p0}, Lkotlinx/coroutines/r;->Dt()Ljava/util/concurrent/ExecutorService;
+    invoke-direct {p0}, Lkotlinx/coroutines/r;->Dr()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;->bjF:Lkotlinx/coroutines/r$b;
+    sget-object v0, Lkotlinx/coroutines/r$b;->bjA: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;->Dv()Ljava/util/concurrent/Executor;
+    invoke-direct {p0}, Lkotlinx/coroutines/r;->Dt()Ljava/util/concurrent/Executor;
 
     move-result-object p1
 
     :cond_0
-    invoke-static {}, Lkotlinx/coroutines/cd;->El()Lkotlinx/coroutines/cc;
+    invoke-static {}, Lkotlinx/coroutines/cd;->Ej()Lkotlinx/coroutines/cc;
 
     move-result-object v0
 
@@ -513,9 +513,9 @@
     return-void
 
     :catch_0
-    invoke-static {}, Lkotlinx/coroutines/cd;->El()Lkotlinx/coroutines/cc;
+    invoke-static {}, Lkotlinx/coroutines/cd;->Ej()Lkotlinx/coroutines/cc;
 
-    sget-object p1, Lkotlinx/coroutines/ak;->bjW:Lkotlinx/coroutines/ak;
+    sget-object p1, Lkotlinx/coroutines/ak;->bjR: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;->Dv()Ljava/util/concurrent/Executor;
+    invoke-direct {p0}, Lkotlinx/coroutines/r;->Dt()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 d5223d975d..05837784d6 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 bjG:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+.field private static final bjB:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
 
 # instance fields
@@ -25,7 +25,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lkotlinx/coroutines/t;->bjG:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sput-object v0, Lkotlinx/coroutines/t;->bjB:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
     return-void
 .end method
@@ -58,10 +58,10 @@
 
 
 # virtual methods
-.method public final Dw()Z
+.method public final Du()Z
     .locals 3
 
-    sget-object v0, Lkotlinx/coroutines/t;->bjG:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/t;->bjB: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 cb7bc9e4ef..7b1755f78c 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 bjH:Lkotlin/jvm/functions/Function1;
+.field public final bjC: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 959eebf42e..fbe99847de 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 Dx()Ljava/lang/Throwable;
+.method public abstract Dv()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 648b1046a9..9c3f96a98f 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 bnb:Lkotterknife/a;
+.field public static final bmW:Lkotterknife/a;
 
 
 # direct methods
@@ -15,7 +15,7 @@
 
     invoke-direct {v0}, Lkotterknife/a;-><init>()V
 
-    sput-object v0, Lkotterknife/a;->bnb:Lkotterknife/a;
+    sput-object v0, Lkotterknife/a;->bmW: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;->bnj:Lkotterknife/d;
+    sget-object v0, Lkotterknife/d;->bne: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 12e5fef97e..834fd41299 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 bnc:Lkotterknife/b$d;
+.field public static final bmX:Lkotterknife/b$d;
 
 
 # direct methods
@@ -40,7 +40,7 @@
 
     invoke-direct {v0}, Lkotterknife/b$d;-><init>()V
 
-    sput-object v0, Lkotterknife/b$d;->bnc:Lkotterknife/b$d;
+    sput-object v0, Lkotterknife/b$d;->bmX: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 c15894754e..31ecb4ffc0 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 bnd:Lkotterknife/b$e;
+.field public static final bmY:Lkotterknife/b$e;
 
 
 # direct methods
@@ -40,7 +40,7 @@
 
     invoke-direct {v0}, Lkotterknife/b$e;-><init>()V
 
-    sput-object v0, Lkotterknife/b$e;->bnd:Lkotterknife/b$e;
+    sput-object v0, Lkotterknife/b$e;->bmY: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 369a3ceb84..5e55362ca0 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 bne:Lkotterknife/b$f;
+.field public static final bmZ:Lkotterknife/b$f;
 
 
 # direct methods
@@ -40,7 +40,7 @@
 
     invoke-direct {v0}, Lkotterknife/b$f;-><init>()V
 
-    sput-object v0, Lkotterknife/b$f;->bne:Lkotterknife/b$f;
+    sput-object v0, Lkotterknife/b$f;->bmZ: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 991e6d5383..3435d892f3 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 bnf:Lkotterknife/b$g;
+.field public static final bna:Lkotterknife/b$g;
 
 
 # direct methods
@@ -40,7 +40,7 @@
 
     invoke-direct {v0}, Lkotterknife/b$g;-><init>()V
 
-    sput-object v0, Lkotterknife/b$g;->bnf:Lkotterknife/b$g;
+    sput-object v0, Lkotterknife/b$g;->bna: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 3ad4761d0a..0c5f49fb9e 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;->bnd:Lkotterknife/b$e;
+    sget-object p0, Lkotterknife/b$e;->bmY: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;->bnd:Lkotterknife/b$e;
+    sget-object p0, Lkotterknife/b$e;->bmY: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;->bne:Lkotterknife/b$f;
+    sget-object p0, Lkotterknife/b$f;->bmZ: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;->bnf:Lkotterknife/b$g;
+    sget-object p0, Lkotterknife/b$g;->bna: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;->bnf:Lkotterknife/b$g;
+    sget-object p0, Lkotterknife/b$g;->bna: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;->bne:Lkotterknife/b$f;
+    sget-object p0, Lkotterknife/b$f;->bmZ: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;->bnc:Lkotterknife/b$d;
+    sget-object p0, Lkotterknife/b$d;->bmX: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;->bne:Lkotterknife/b$f;
+    sget-object p0, Lkotterknife/b$f;->bmZ: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 b211e46b31..6207b6c11e 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 bnh:Lkotterknife/c$a;
+.field public static final bnc:Lkotterknife/c$a;
 
 
 # direct methods
@@ -26,7 +26,7 @@
 
     invoke-direct {v0}, Lkotterknife/c$a;-><init>()V
 
-    sput-object v0, Lkotterknife/c$a;->bnh:Lkotterknife/c$a;
+    sput-object v0, Lkotterknife/c$a;->bnc: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 246baded30..2aa405abee 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 bng:Lkotlin/jvm/functions/Function2;
+.field private final bnb: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;->bng:Lkotlin/jvm/functions/Function2;
+    iput-object p1, p0, Lkotterknife/c;->bnb:Lkotlin/jvm/functions/Function2;
 
-    sget-object p1, Lkotterknife/c$a;->bnh:Lkotterknife/c$a;
+    sget-object p1, Lkotterknife/c$a;->bnc: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;->bnh:Lkotterknife/c$a;
+    sget-object v1, Lkotterknife/c$a;->bnc: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;->bng:Lkotlin/jvm/functions/Function2;
+    iget-object v0, p0, Lkotterknife/c;->bnb: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;->bnj:Lkotterknife/d;
+    sget-object p2, Lkotterknife/d;->bne: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 c1205f0795..0a742ea9b2 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 bni:Ljava/util/WeakHashMap;
+.field private static final bnd:Ljava/util/WeakHashMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/WeakHashMap<",
@@ -16,7 +16,7 @@
     .end annotation
 .end field
 
-.field public static final bnj:Lkotterknife/d;
+.field public static final bne:Lkotterknife/d;
 
 
 # direct methods
@@ -27,13 +27,13 @@
 
     invoke-direct {v0}, Lkotterknife/d;-><init>()V
 
-    sput-object v0, Lkotterknife/d;->bnj:Lkotterknife/d;
+    sput-object v0, Lkotterknife/d;->bne:Lkotterknife/d;
 
     new-instance v0, Ljava/util/WeakHashMap;
 
     invoke-direct {v0}, Ljava/util/WeakHashMap;-><init>()V
 
-    sput-object v0, Lkotterknife/d;->bni:Ljava/util/WeakHashMap;
+    sput-object v0, Lkotterknife/d;->bnd: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;->bni:Ljava/util/WeakHashMap;
+    sget-object v0, Lkotterknife/d;->bnd: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;->bni:Ljava/util/WeakHashMap;
+    sget-object v0, Lkotterknife/d;->bnd: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;->bnh:Lkotterknife/c$a;
+    sget-object v2, Lkotterknife/c$a;->bnc:Lkotterknife/c$a;
 
     iput-object v2, v1, Lkotterknife/c;->value:Ljava/lang/Object;
 
     goto :goto_0
 
     :cond_0
-    sget-object v0, Lkotterknife/d;->bni:Ljava/util/WeakHashMap;
+    sget-object v0, Lkotterknife/d;->bnd: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 aa9b95926e..76df80f5a6 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 brd:Ljava/util/List;
+.field final bqY: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;->brd:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/Headers$a;->bqY:Ljava/util/List;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final Fm()Lokhttp3/Headers;
+.method public final Fk()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;->brd:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/Headers$a;->bqY:Ljava/util/List;
 
     invoke-interface {v0, p1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object p1, p0, Lokhttp3/Headers$a;->brd:Ljava/util/List;
+    iget-object p1, p0, Lokhttp3/Headers$a;->bqY: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;->brd:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/Headers$a;->bqY: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;->brd:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/Headers$a;->bqY: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;->brd:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/Headers$a;->bqY:Ljava/util/List;
 
     invoke-interface {v1, v0}, Ljava/util/List;->remove(I)Ljava/lang/Object;
 
-    iget-object v1, p0, Lokhttp3/Headers$a;->brd:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/Headers$a;->bqY: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 49fc2a3bfc..a7c129133d 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 byv:I = 0x1
+.field public static final byq:I = 0x1
 
-.field public static final byw:I = 0x2
+.field public static final byr:I = 0x2
 
-.field public static final byx:I = 0x3
+.field public static final bys:I = 0x3
 
-.field public static final byy:I = 0x4
+.field public static final byt:I = 0x4
 
-.field private static final synthetic byz:[I
+.field private static final synthetic byu:[I
 
 
 # direct methods
@@ -42,31 +42,31 @@
 
     new-array v0, v0, [I
 
-    sget v1, Lokhttp3/a/a$a;->byv:I
+    sget v1, Lokhttp3/a/a$a;->byq:I
 
     const/4 v2, 0x0
 
     aput v1, v0, v2
 
-    sget v1, Lokhttp3/a/a$a;->byw:I
+    sget v1, Lokhttp3/a/a$a;->byr:I
 
     const/4 v2, 0x1
 
     aput v1, v0, v2
 
-    sget v1, Lokhttp3/a/a$a;->byx:I
+    sget v1, Lokhttp3/a/a$a;->bys:I
 
     const/4 v2, 0x2
 
     aput v1, v0, v2
 
-    sget v1, Lokhttp3/a/a$a;->byy:I
+    sget v1, Lokhttp3/a/a$a;->byt:I
 
     const/4 v2, 0x3
 
     aput v1, v0, v2
 
-    sput-object v0, Lokhttp3/a/a$a;->byz:[I
+    sput-object v0, Lokhttp3/a/a$a;->byu:[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 7f5e793a0f..32d2bb72a6 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;->GT()Lokhttp3/internal/g/f;
+    invoke-static {}, Lokhttp3/internal/g/f;->GR()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 7c77ca0f35..ba78dfe100 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 byA:Lokhttp3/a/a$b;
+.field public static final byv: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;->byA:Lokhttp3/a/a$b;
+    sput-object v0, Lokhttp3/a/a$b;->byv: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 4de86252be..6b9d40d885 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 byr:Ljava/nio/charset/Charset;
+.field private static final bym:Ljava/nio/charset/Charset;
 
 
 # instance fields
-.field private final bys:Lokhttp3/a/a$b;
+.field private final byn:Lokhttp3/a/a$b;
 
-.field private volatile byt:Ljava/util/Set;
+.field private volatile byo:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -32,7 +32,7 @@
     .end annotation
 .end field
 
-.field public volatile byu:I
+.field public volatile byp:I
 
 
 # direct methods
@@ -45,7 +45,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/a/a;->byr:Ljava/nio/charset/Charset;
+    sput-object v0, Lokhttp3/a/a;->bym: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;->byA:Lokhttp3/a/a$b;
+    sget-object v0, Lokhttp3/a/a$b;->byv: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;->byt:Ljava/util/Set;
+    iput-object v0, p0, Lokhttp3/a/a;->byo:Ljava/util/Set;
 
-    sget v0, Lokhttp3/a/a$a;->byv:I
+    sget v0, Lokhttp3/a/a$a;->byq:I
 
-    iput v0, p0, Lokhttp3/a/a;->byu:I
+    iput v0, p0, Lokhttp3/a/a;->byp:I
 
-    iput-object p1, p0, Lokhttp3/a/a;->bys:Lokhttp3/a/a$b;
+    iput-object p1, p0, Lokhttp3/a/a;->byn: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;->byt:Ljava/util/Set;
+    iget-object v0, p0, Lokhttp3/a/a;->byo: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;->bys:Lokhttp3/a/a$b;
+    iget-object v1, p0, Lokhttp3/a/a;->byn: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;->Hi()Z
+    invoke-virtual {v7}, Lokio/c;->Hg()Z
 
     move-result v1
 
@@ -454,13 +454,13 @@
 
     move-object/from16 v0, p1
 
-    iget v2, v1, Lokhttp3/a/a;->byu:I
+    iget v2, v1, Lokhttp3/a/a;->byp:I
 
-    invoke-interface/range {p1 .. p1}, Lokhttp3/Interceptor$Chain;->Fx()Lokhttp3/w;
+    invoke-interface/range {p1 .. p1}, Lokhttp3/Interceptor$Chain;->Fv()Lokhttp3/w;
 
     move-result-object v3
 
-    sget v4, Lokhttp3/a/a$a;->byv:I
+    sget v4, Lokhttp3/a/a$a;->byq:I
 
     if-ne v2, v4, :cond_0
 
@@ -471,7 +471,7 @@
     return-object v0
 
     :cond_0
-    sget v4, Lokhttp3/a/a$a;->byy:I
+    sget v4, Lokhttp3/a/a$a;->byt:I
 
     const/4 v5, 0x1
 
@@ -487,7 +487,7 @@
     :goto_0
     if-nez v4, :cond_3
 
-    sget v7, Lokhttp3/a/a$a;->byx:I
+    sget v7, Lokhttp3/a/a$a;->bys:I
 
     if-ne v2, v7, :cond_2
 
@@ -503,7 +503,7 @@
     const/4 v2, 0x1
 
     :goto_2
-    iget-object v7, v3, Lokhttp3/w;->brI:Lokhttp3/RequestBody;
+    iget-object v7, v3, Lokhttp3/w;->brD: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;->Fy()Lokhttp3/i;
+    invoke-interface/range {p1 .. p1}, Lokhttp3/Interceptor$Chain;->Fw()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;->bsq:Ljava/lang/String;
+    iget-object v10, v3, Lokhttp3/w;->bsl: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;->bnk:Lokhttp3/s;
+    iget-object v11, v3, Lokhttp3/w;->bnf: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;->Fe()Lokhttp3/u;
+    invoke-interface {v8}, Lokhttp3/i;->Fc()Lokhttp3/u;
 
     move-result-object v8
 
@@ -603,7 +603,7 @@
     move-object/from16 v16, v11
 
     :goto_5
-    iget-object v10, v1, Lokhttp3/a/a;->bys:Lokhttp3/a/a$b;
+    iget-object v10, v1, Lokhttp3/a/a;->byn: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;->bys:Lokhttp3/a/a$b;
+    iget-object v14, v1, Lokhttp3/a/a;->byn: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;->bys:Lokhttp3/a/a$b;
+    iget-object v6, v1, Lokhttp3/a/a;->byn: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;->brH:Lokhttp3/Headers;
+    iget-object v6, v3, Lokhttp3/w;->brC:Lokhttp3/Headers;
 
-    iget-object v10, v6, Lokhttp3/Headers;->brc:[Ljava/lang/String;
+    iget-object v10, v6, Lokhttp3/Headers;->bqX:[Ljava/lang/String;
 
     array-length v10, v10
 
@@ -721,7 +721,7 @@
     goto/16 :goto_7
 
     :cond_b
-    iget-object v5, v3, Lokhttp3/w;->brH:Lokhttp3/Headers;
+    iget-object v5, v3, Lokhttp3/w;->brC: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;->bys:Lokhttp3/a/a$b;
+    iget-object v5, v1, Lokhttp3/a/a;->byn: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;->bsq:Ljava/lang/String;
+    iget-object v6, v3, Lokhttp3/w;->bsl: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;->byr:Ljava/nio/charset/Charset;
+    sget-object v10, Lokhttp3/a/a;->bym: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;->byr:Ljava/nio/charset/Charset;
+    sget-object v10, Lokhttp3/a/a;->bym: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;->bys:Lokhttp3/a/a$b;
+    iget-object v11, v1, Lokhttp3/a/a;->byn: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;->bys:Lokhttp3/a/a$b;
+    iget-object v11, v1, Lokhttp3/a/a;->byn: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;->bys:Lokhttp3/a/a$b;
+    iget-object v5, v1, Lokhttp3/a/a;->byn: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;->bsq:Ljava/lang/String;
+    iget-object v6, v3, Lokhttp3/w;->bsl: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;->bys:Lokhttp3/a/a$b;
+    iget-object v5, v1, Lokhttp3/a/a;->byn: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;->bsq:Ljava/lang/String;
+    iget-object v6, v3, Lokhttp3/w;->bsl: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;->bys:Lokhttp3/a/a$b;
+    iget-object v5, v1, Lokhttp3/a/a;->byn: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;->bsq:Ljava/lang/String;
+    iget-object v6, v3, Lokhttp3/w;->bsl: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;->bsD:Lokhttp3/x;
+    iget-object v3, v0, Lokhttp3/Response;->bsy: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;->bys:Lokhttp3/a/a$b;
+    iget-object v14, v1, Lokhttp3/a/a;->byn: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;->bsA:Lokhttp3/w;
+    iget-object v9, v0, Lokhttp3/Response;->bsv:Lokhttp3/w;
 
-    iget-object v9, v9, Lokhttp3/w;->bnk:Lokhttp3/s;
+    iget-object v9, v9, Lokhttp3/w;->bnf: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;->brH:Lokhttp3/Headers;
+    iget-object v2, v0, Lokhttp3/Response;->brC:Lokhttp3/Headers;
 
-    iget-object v5, v2, Lokhttp3/Headers;->brc:[Ljava/lang/String;
+    iget-object v5, v2, Lokhttp3/Headers;->bqX:[Ljava/lang/String;
 
     array-length v5, v5
 
@@ -1060,7 +1060,7 @@
     goto/16 :goto_f
 
     :cond_15
-    iget-object v4, v0, Lokhttp3/Response;->brH:Lokhttp3/Headers;
+    iget-object v4, v0, Lokhttp3/Response;->brC: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;->bys:Lokhttp3/a/a$b;
+    iget-object v2, v1, Lokhttp3/a/a;->byn: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;->FQ()Lokio/d;
+    invoke-virtual {v3}, Lokhttp3/x;->FO()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;->Hf()Lokio/c;
+    invoke-interface {v4}, Lokio/d;->Hd()Lokio/c;
 
     move-result-object v4
 
@@ -1114,7 +1114,7 @@
     :try_start_1
     new-instance v6, Lokio/h;
 
-    invoke-virtual {v4}, Lokio/c;->Hr()Lokio/c;
+    invoke-virtual {v4}, Lokio/c;->Hp()Lokio/c;
 
     move-result-object v4
 
@@ -1157,7 +1157,7 @@
     move-object v2, v5
 
     :goto_e
-    sget-object v5, Lokhttp3/a/a;->byr:Ljava/nio/charset/Charset;
+    sget-object v5, Lokhttp3/a/a;->bym: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;->byr:Ljava/nio/charset/Charset;
+    sget-object v5, Lokhttp3/a/a;->bym: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;->bys:Lokhttp3/a/a$b;
+    iget-object v2, v1, Lokhttp3/a/a;->byn:Lokhttp3/a/a$b;
 
     invoke-interface {v2, v12}, Lokhttp3/a/a$b;->log(Ljava/lang/String;)V
 
-    iget-object v2, v1, Lokhttp3/a/a;->bys:Lokhttp3/a/a$b;
+    iget-object v2, v1, Lokhttp3/a/a;->byn: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;->bys:Lokhttp3/a/a$b;
+    iget-object v3, v1, Lokhttp3/a/a;->byn:Lokhttp3/a/a$b;
 
     invoke-interface {v3, v12}, Lokhttp3/a/a$b;->log(Ljava/lang/String;)V
 
-    iget-object v3, v1, Lokhttp3/a/a;->bys:Lokhttp3/a/a$b;
+    iget-object v3, v1, Lokhttp3/a/a;->byn:Lokhttp3/a/a$b;
 
-    invoke-virtual {v4}, Lokio/c;->Hr()Lokio/c;
+    invoke-virtual {v4}, Lokio/c;->Hp()Lokio/c;
 
     move-result-object v6
 
@@ -1232,7 +1232,7 @@
 
     if-eqz v2, :cond_1c
 
-    iget-object v5, v1, Lokhttp3/a/a;->bys:Lokhttp3/a/a$b;
+    iget-object v5, v1, Lokhttp3/a/a;->byn: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;->bys:Lokhttp3/a/a$b;
+    iget-object v2, v1, Lokhttp3/a/a;->byn: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;->bys:Lokhttp3/a/a$b;
+    iget-object v2, v1, Lokhttp3/a/a;->byn:Lokhttp3/a/a$b;
 
     const-string v3, "<-- END HTTP"
 
@@ -1300,7 +1300,7 @@
 
     move-object v2, v0
 
-    iget-object v0, v1, Lokhttp3/a/a;->bys:Lokhttp3/a/a$b;
+    iget-object v0, v1, Lokhttp3/a/a;->byn: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 6608c1e0e7..bed67a8a89 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 bnu:Lokhttp3/b;
+.field public static final bnp:Lokhttp3/b;
 
 
 # direct methods
@@ -15,7 +15,7 @@
 
     invoke-direct {v0}, Lokhttp3/b$1;-><init>()V
 
-    sput-object v0, Lokhttp3/b;->bnu:Lokhttp3/b;
+    sput-object v0, Lokhttp3/b;->bnp: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 e6a0faddf2..6cabbf107e 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 bnv:Lokhttp3/internal/a/e;
+.field final bnq:Lokhttp3/internal/a/e;
 
-.field final bnw:Lokhttp3/internal/a/d;
+.field final bnr:Lokhttp3/internal/a/d;
 
 
 # virtual methods
@@ -22,7 +22,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/c;->bnw:Lokhttp3/internal/a/d;
+    iget-object v0, p0, Lokhttp3/c;->bnr: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;->bnw:Lokhttp3/internal/a/d;
+    iget-object v0, p0, Lokhttp3/c;->bnr: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 e2cae7e6e5..95c5d904c7 100644
--- a/com.discord/smali_classes2/okhttp3/d$a.smali
+++ b/com.discord/smali_classes2/okhttp3/d$a.smali
@@ -15,19 +15,19 @@
 
 
 # instance fields
-.field bnA:Z
-
 .field bnB:I
 
-.field bnG:I
+.field bnC:I
 
-.field bnH:I
+.field bnD:Z
 
-.field bnI:Z
+.field bnE:Z
 
-.field bnJ:Z
+.field bnu:Z
 
-.field bnz:Z
+.field bnv:Z
+
+.field bnw:I
 
 .field immutable:Z
 
@@ -40,18 +40,18 @@
 
     const/4 v0, -0x1
 
+    iput v0, p0, Lokhttp3/d$a;->bnw:I
+
     iput v0, p0, Lokhttp3/d$a;->bnB:I
 
-    iput v0, p0, Lokhttp3/d$a;->bnG:I
-
-    iput v0, p0, Lokhttp3/d$a;->bnH:I
+    iput v0, p0, Lokhttp3/d$a;->bnC:I
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final Fc()Lokhttp3/d;
+.method public final Fa()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 f45ff446aa..dfde2e267c 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 beP:Ljava/util/List;
+.field final beK: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;->beP:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/g$a;->beK: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 f8a4177c45..824463e1d6 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 bnO:Ljava/lang/String;
+.field final bnJ:Ljava/lang/String;
 
-.field final bnP:Ljava/lang/String;
+.field final bnK:Ljava/lang/String;
 
-.field final bnQ:Lokio/ByteString;
+.field final bnL:Lokio/ByteString;
 
 .field final pattern:Ljava/lang/String;
 
@@ -44,9 +44,9 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/g$b;->bnP:Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/g$b;->bnK:Ljava/lang/String;
 
-    iget-object v1, p1, Lokhttp3/g$b;->bnP:Ljava/lang/String;
+    iget-object v1, p1, Lokhttp3/g$b;->bnK: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;->bnQ:Lokio/ByteString;
+    iget-object v0, p0, Lokhttp3/g$b;->bnL:Lokio/ByteString;
 
-    iget-object p1, p1, Lokhttp3/g$b;->bnQ:Lokio/ByteString;
+    iget-object p1, p1, Lokhttp3/g$b;->bnL: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;->bnP:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/g$b;->bnK: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;->bnQ:Lokio/ByteString;
+    iget-object v1, p0, Lokhttp3/g$b;->bnL: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;->bnP:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/g$b;->bnK:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lokhttp3/g$b;->bnQ:Lokio/ByteString;
+    iget-object v1, p0, Lokhttp3/g$b;->bnL:Lokio/ByteString;
 
-    invoke-virtual {v1}, Lokio/ByteString;->Hu()Ljava/lang/String;
+    invoke-virtual {v1}, Lokio/ByteString;->Hs()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 9c574b0b7a..7becdcc1e5 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 aPP:Ljava/util/Map;
+.field private static final aPL:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -15,7 +15,7 @@
     .end annotation
 .end field
 
-.field static final bnR:Ljava/util/Comparator;
+.field static final bnM:Ljava/util/Comparator;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Comparator<",
@@ -25,6 +25,16 @@
     .end annotation
 .end field
 
+.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;
@@ -253,16 +263,6 @@
 
 .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;->bnR:Ljava/util/Comparator;
+    sput-object v0, Lokhttp3/h;->bnM:Ljava/util/Comparator;
 
     new-instance v0, Ljava/util/LinkedHashMap;
 
     invoke-direct {v0}, Ljava/util/LinkedHashMap;-><init>()V
 
-    sput-object v0, Lokhttp3/h;->aPP:Ljava/util/Map;
+    sput-object v0, Lokhttp3/h;->aPL:Ljava/util/Map;
 
     const-string v0, "SSL_RSA_WITH_NULL_MD5"
 
@@ -290,7 +290,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bnS:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bnN:Lokhttp3/h;
 
     const-string v0, "SSL_RSA_WITH_NULL_SHA"
 
@@ -298,7 +298,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bnT:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bnO: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;->bnU:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bnP:Lokhttp3/h;
 
     const-string v0, "SSL_RSA_WITH_RC4_128_MD5"
 
@@ -314,7 +314,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bnV:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bnQ:Lokhttp3/h;
 
     const-string v0, "SSL_RSA_WITH_RC4_128_SHA"
 
@@ -322,7 +322,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bnW:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bnR: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;->bnX:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bnS:Lokhttp3/h;
 
     const-string v0, "SSL_RSA_WITH_DES_CBC_SHA"
 
@@ -338,7 +338,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bnY:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bnT: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;->bnZ:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bnU: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;->boa:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bnV: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;->bob:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bnW: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;->boc:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bnX: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;->bod:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bnY: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;->boe:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bnZ: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;->bof:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->boa: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;->bog:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bob: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;->boh:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->boc: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;->boi:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bod: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;->boj:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->boe: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;->bok:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bof:Lokhttp3/h;
 
     const-string v0, "TLS_KRB5_WITH_DES_CBC_SHA"
 
@@ -442,7 +442,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bol:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bog: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;->bom:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->boh:Lokhttp3/h;
 
     const-string v0, "TLS_KRB5_WITH_RC4_128_SHA"
 
@@ -458,7 +458,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bon:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->boi:Lokhttp3/h;
 
     const-string v0, "TLS_KRB5_WITH_DES_CBC_MD5"
 
@@ -466,7 +466,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->boo:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->boj: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;->bop:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bok:Lokhttp3/h;
 
     const-string v0, "TLS_KRB5_WITH_RC4_128_MD5"
 
@@ -482,7 +482,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->boq:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bol: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;->bor:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bom: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;->bos:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bon: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;->bou:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->boo: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;->bov:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bop: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;->bow:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->boq: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;->box:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bor: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;->boy:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bos: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;->boz:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bou: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;->boA:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bov: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;->boB:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bow: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;->boC:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->box: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;->boD:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->boy:Lokhttp3/h;
 
     const-string v0, "TLS_RSA_WITH_NULL_SHA256"
 
@@ -586,7 +586,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->boE:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->boz: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;->boF:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->boA: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;->boG:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->boB: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;->boH:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->boC: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;->boI:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->boD: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;->boJ:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->boE: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;->boK:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->boF: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;->boL:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->boG: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;->boM:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->boH: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;->boN:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->boI: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;->boO:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->boJ: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;->boP:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->boK: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;->boQ:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->boL: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;->boR:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->boM: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;->boS:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->boN:Lokhttp3/h;
 
     const-string v0, "TLS_PSK_WITH_RC4_128_SHA"
 
@@ -706,7 +706,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->boT:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->boO: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;->boU:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->boP: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;->boV:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->boQ: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;->boW:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->boR:Lokhttp3/h;
 
     const-string v0, "TLS_RSA_WITH_SEED_CBC_SHA"
 
@@ -738,7 +738,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->boX:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->boS: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;->boY:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->boT: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;->boZ:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->boU: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;->bpa:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->boV: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;->bpb:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->boW: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;->bpc:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->boX: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;->bpd:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->boY: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;->bpe:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->boZ: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;->bpf:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpa:Lokhttp3/h;
 
     const-string v0, "TLS_EMPTY_RENEGOTIATION_INFO_SCSV"
 
@@ -810,7 +810,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bpg:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpb:Lokhttp3/h;
 
     const-string v0, "TLS_FALLBACK_SCSV"
 
@@ -818,7 +818,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bph:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpc:Lokhttp3/h;
 
     const-string v0, "TLS_ECDH_ECDSA_WITH_NULL_SHA"
 
@@ -826,7 +826,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bpi:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpd: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;->bpj:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpe: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;->bpk:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpf: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;->bpl:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpg: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;->bpm:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bph:Lokhttp3/h;
 
     const-string v0, "TLS_ECDHE_ECDSA_WITH_NULL_SHA"
 
@@ -866,7 +866,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bpn:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpi: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;->bpo:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpj: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;->bpp:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpk: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;->bpq:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpl: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;->bpr:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpm:Lokhttp3/h;
 
     const-string v0, "TLS_ECDH_RSA_WITH_NULL_SHA"
 
@@ -906,7 +906,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bps:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpn: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;->bpt:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpo: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;->bpu:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpp: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;->bpv:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpq: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;->bpw:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpr:Lokhttp3/h;
 
     const-string v0, "TLS_ECDHE_RSA_WITH_NULL_SHA"
 
@@ -946,7 +946,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bpx:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bps: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;->bpy:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpt: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;->bpz:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpu: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;->bpA:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpv: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;->bpB:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpw:Lokhttp3/h;
 
     const-string v0, "TLS_ECDH_anon_WITH_NULL_SHA"
 
@@ -986,7 +986,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bpC:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpx: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;->bpD:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpy: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;->bpE:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpz: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;->bpF:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpA: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;->bpG:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpB: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;->bpH:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpC: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;->bpI:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpD: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;->bpJ:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpE: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;->bpK:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpF: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;->bpL:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpG: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;->bpM:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpH: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;->bpN:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpI: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;->bpO:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpJ: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;->bpP:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpK: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;->bpQ:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpL: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;->bpR:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpM: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;->bpS:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpN: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;->bpT:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpO: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;->bpU:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpP: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;->bpV:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpQ: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;->bpW:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpR: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;->bpX:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpS: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;->bpY:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpT: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;->bpZ:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpU: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;->bqa:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpV: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;->bqb:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpW: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;->bqc:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpX:Lokhttp3/h;
 
     const-string v0, "TLS_AES_128_GCM_SHA256"
 
@@ -1202,7 +1202,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bqd:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpY:Lokhttp3/h;
 
     const-string v0, "TLS_AES_256_GCM_SHA384"
 
@@ -1210,7 +1210,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bqe:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpZ:Lokhttp3/h;
 
     const-string v0, "TLS_CHACHA20_POLY1305_SHA256"
 
@@ -1218,7 +1218,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bqf:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bqa:Lokhttp3/h;
 
     const-string v0, "TLS_AES_128_CCM_SHA256"
 
@@ -1226,7 +1226,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bqg:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bqb:Lokhttp3/h;
 
     const-string v0, "TLS_AES_256_CCM_8_SHA256"
 
@@ -1234,7 +1234,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bqh:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bqc:Lokhttp3/h;
 
     return-void
 .end method
@@ -1312,7 +1312,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lokhttp3/h;->aPP:Ljava/util/Map;
+    sget-object v1, Lokhttp3/h;->aPL: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;->aPP:Ljava/util/Map;
+    sget-object v1, Lokhttp3/h;->aPL: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;->aPP:Ljava/util/Map;
+    sget-object v2, Lokhttp3/h;->aPL: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;->aPP:Ljava/util/Map;
+    sget-object v1, Lokhttp3/h;->aPL: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 7fd253a0ef..033c252db0 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 btn:Z
+.field bti:Z
 
-.field final synthetic bto:Lokio/d;
+.field final synthetic btj:Lokio/d;
 
-.field final synthetic btp:Lokhttp3/internal/a/b;
+.field final synthetic btk:Lokhttp3/internal/a/b;
 
-.field final synthetic btq:Lokio/BufferedSink;
+.field final synthetic btl:Lokio/BufferedSink;
 
-.field final synthetic btr:Lokhttp3/internal/a/a;
+.field final synthetic btm: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;->btr:Lokhttp3/internal/a/a;
+    iput-object p1, p0, Lokhttp3/internal/a/a$1;->btm:Lokhttp3/internal/a/a;
 
-    iput-object p2, p0, Lokhttp3/internal/a/a$1;->bto:Lokio/d;
+    iput-object p2, p0, Lokhttp3/internal/a/a$1;->btj:Lokio/d;
 
-    iput-object p3, p0, Lokhttp3/internal/a/a$1;->btp:Lokhttp3/internal/a/b;
+    iput-object p3, p0, Lokhttp3/internal/a/a$1;->btk:Lokhttp3/internal/a/b;
 
-    iput-object p4, p0, Lokhttp3/internal/a/a$1;->btq:Lokio/BufferedSink;
+    iput-object p4, p0, Lokhttp3/internal/a/a$1;->btl: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;->bto:Lokio/d;
+    iget-object v1, p0, Lokhttp3/internal/a/a$1;->btj: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;->btn:Z
+    iget-boolean p1, p0, Lokhttp3/internal/a/a$1;->bti:Z
 
     if-nez p1, :cond_0
 
-    iput-boolean v0, p0, Lokhttp3/internal/a/a$1;->btn:Z
+    iput-boolean v0, p0, Lokhttp3/internal/a/a$1;->bti:Z
 
-    iget-object p1, p0, Lokhttp3/internal/a/a$1;->btq:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/a/a$1;->btl: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;->btq:Lokio/BufferedSink;
+    iget-object v0, p0, Lokhttp3/internal/a/a$1;->btl:Lokio/BufferedSink;
 
-    invoke-interface {v0}, Lokio/BufferedSink;->Hf()Lokio/c;
+    invoke-interface {v0}, Lokio/BufferedSink;->Hd()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;->btq:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/a/a$1;->btl:Lokio/BufferedSink;
 
-    invoke-interface {p1}, Lokio/BufferedSink;->Hs()Lokio/BufferedSink;
+    invoke-interface {p1}, Lokio/BufferedSink;->Hq()Lokio/BufferedSink;
 
     return-wide p2
 
     :catch_0
     move-exception p1
 
-    iget-boolean p2, p0, Lokhttp3/internal/a/a$1;->btn:Z
+    iget-boolean p2, p0, Lokhttp3/internal/a/a$1;->bti:Z
 
     if-nez p2, :cond_2
 
-    iput-boolean v0, p0, Lokhttp3/internal/a/a$1;->btn:Z
+    iput-boolean v0, p0, Lokhttp3/internal/a/a$1;->bti:Z
 
     :cond_2
     throw p1
@@ -130,7 +130,7 @@
         }
     .end annotation
 
-    iget-boolean v0, p0, Lokhttp3/internal/a/a$1;->btn:Z
+    iget-boolean v0, p0, Lokhttp3/internal/a/a$1;->bti:Z
 
     if-nez v0, :cond_0
 
@@ -144,10 +144,10 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lokhttp3/internal/a/a$1;->btn:Z
+    iput-boolean v0, p0, Lokhttp3/internal/a/a$1;->bti:Z
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/internal/a/a$1;->bto:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/a/a$1;->btj: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;->bto:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/a/a$1;->btj: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 1a1a895a22..6a92409fbf 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 btm:Lokhttp3/internal/a/e;
+.field final bth: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;->btm:Lokhttp3/internal/a/e;
+    iput-object p1, p0, Lokhttp3/internal/a/a;->bth: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;->brc:[Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/Headers;->bqX:[Ljava/lang/String;
 
     array-length v1, v1
 
@@ -85,7 +85,7 @@
     if-nez v6, :cond_2
 
     :cond_1
-    sget-object v6, Lokhttp3/internal/a;->bsV:Lokhttp3/internal/a;
+    sget-object v6, Lokhttp3/internal/a;->bsQ: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;->brc:[Ljava/lang/String;
+    iget-object p0, p1, Lokhttp3/Headers;->bqX:[Ljava/lang/String;
 
     array-length p0, p0
 
@@ -120,7 +120,7 @@
 
     if-eqz v3, :cond_4
 
-    sget-object v3, Lokhttp3/internal/a;->bsV:Lokhttp3/internal/a;
+    sget-object v3, Lokhttp3/internal/a;->bsQ: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;->Fm()Lokhttp3/Headers;
+    invoke-virtual {v0}, Lokhttp3/Headers$a;->Fk()Lokhttp3/Headers;
 
     move-result-object p0
 
@@ -146,19 +146,19 @@
 
     if-eqz p0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/Response;->bsD:Lokhttp3/x;
+    iget-object v0, p0, Lokhttp3/Response;->bsy:Lokhttp3/x;
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {p0}, Lokhttp3/Response;->FO()Lokhttp3/Response$a;
+    invoke-virtual {p0}, Lokhttp3/Response;->FM()Lokhttp3/Response$a;
 
     move-result-object p0
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lokhttp3/Response$a;->bsD:Lokhttp3/x;
+    iput-object v0, p0, Lokhttp3/Response$a;->bsy:Lokhttp3/x;
 
-    invoke-virtual {p0}, Lokhttp3/Response$a;->FP()Lokhttp3/Response;
+    invoke-virtual {p0}, Lokhttp3/Response$a;->FN()Lokhttp3/Response;
 
     move-result-object p0
 
@@ -296,15 +296,15 @@
 
     move-object/from16 v1, p0
 
-    iget-object v0, v1, Lokhttp3/internal/a/a;->btm:Lokhttp3/internal/a/e;
+    iget-object v0, v1, Lokhttp3/internal/a/a;->bth:Lokhttp3/internal/a/e;
 
     const/4 v2, 0x0
 
     if-eqz v0, :cond_0
 
-    invoke-interface/range {p1 .. p1}, Lokhttp3/Interceptor$Chain;->Fx()Lokhttp3/w;
+    invoke-interface/range {p1 .. p1}, Lokhttp3/Interceptor$Chain;->Fv()Lokhttp3/w;
 
-    invoke-interface {v0}, Lokhttp3/internal/a/e;->FZ()Lokhttp3/Response;
+    invoke-interface {v0}, Lokhttp3/internal/a/e;->FX()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;->Fx()Lokhttp3/w;
+    invoke-interface/range {p1 .. p1}, Lokhttp3/Interceptor$Chain;->Fv()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;->bsF:Lokhttp3/Response;
+    iget-object v4, v0, Lokhttp3/internal/a/c$a;->bsA:Lokhttp3/Response;
 
     if-nez v4, :cond_1
 
     new-instance v4, Lokhttp3/internal/a/c;
 
-    iget-object v5, v0, Lokhttp3/internal/a/c$a;->bsA:Lokhttp3/w;
+    iget-object v5, v0, Lokhttp3/internal/a/c$a;->bsv: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;->bsA:Lokhttp3/w;
+    iget-object v4, v0, Lokhttp3/internal/a/c$a;->bsv:Lokhttp3/w;
 
-    iget-object v4, v4, Lokhttp3/w;->bnk:Lokhttp3/s;
+    iget-object v4, v4, Lokhttp3/w;->bnf:Lokhttp3/s;
 
-    invoke-virtual {v4}, Lokhttp3/s;->Fo()Z
+    invoke-virtual {v4}, Lokhttp3/s;->Fm()Z
 
     move-result v4
 
     if-eqz v4, :cond_2
 
-    iget-object v4, v0, Lokhttp3/internal/a/c$a;->bsF:Lokhttp3/Response;
+    iget-object v4, v0, Lokhttp3/internal/a/c$a;->bsA:Lokhttp3/Response;
 
-    iget-object v4, v4, Lokhttp3/Response;->bsC:Lokhttp3/r;
+    iget-object v4, v4, Lokhttp3/Response;->bsx:Lokhttp3/r;
 
     if-nez v4, :cond_2
 
     new-instance v4, Lokhttp3/internal/a/c;
 
-    iget-object v5, v0, Lokhttp3/internal/a/c$a;->bsA:Lokhttp3/w;
+    iget-object v5, v0, Lokhttp3/internal/a/c$a;->bsv: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;->bsF:Lokhttp3/Response;
+    iget-object v4, v0, Lokhttp3/internal/a/c$a;->bsA:Lokhttp3/Response;
 
-    iget-object v5, v0, Lokhttp3/internal/a/c$a;->bsA:Lokhttp3/w;
+    iget-object v5, v0, Lokhttp3/internal/a/c$a;->bsv: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;->bsA:Lokhttp3/w;
+    iget-object v5, v0, Lokhttp3/internal/a/c$a;->bsv: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;->bsA:Lokhttp3/w;
+    iget-object v4, v0, Lokhttp3/internal/a/c$a;->bsv:Lokhttp3/w;
 
-    invoke-virtual {v4}, Lokhttp3/w;->FM()Lokhttp3/d;
+    invoke-virtual {v4}, Lokhttp3/w;->FK()Lokhttp3/d;
 
     move-result-object v4
 
-    iget-boolean v5, v4, Lokhttp3/d;->bnz:Z
+    iget-boolean v5, v4, Lokhttp3/d;->bnu:Z
 
     if-nez v5, :cond_1b
 
-    iget-object v5, v0, Lokhttp3/internal/a/c$a;->bsA:Lokhttp3/w;
+    iget-object v5, v0, Lokhttp3/internal/a/c$a;->bsv: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;->bsF:Lokhttp3/Response;
+    iget-object v5, v0, Lokhttp3/internal/a/c$a;->bsA:Lokhttp3/Response;
 
-    invoke-virtual {v5}, Lokhttp3/Response;->FM()Lokhttp3/d;
+    invoke-virtual {v5}, Lokhttp3/Response;->FK()Lokhttp3/d;
 
     move-result-object v5
 
-    iget-object v7, v0, Lokhttp3/internal/a/c$a;->btu:Ljava/util/Date;
+    iget-object v7, v0, Lokhttp3/internal/a/c$a;->btp:Ljava/util/Date;
 
     const-wide/16 v11, 0x0
 
     if-eqz v7, :cond_7
 
-    iget-wide v13, v0, Lokhttp3/internal/a/c$a;->btA:J
+    iget-wide v13, v0, Lokhttp3/internal/a/c$a;->btv:J
 
-    iget-object v7, v0, Lokhttp3/internal/a/c$a;->btu:Ljava/util/Date;
+    iget-object v7, v0, Lokhttp3/internal/a/c$a;->btp: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;->btC:I
+    iget v7, v0, Lokhttp3/internal/a/c$a;->btx: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;->btC:I
+    iget v8, v0, Lokhttp3/internal/a/c$a;->btx: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;->btA:J
+    iget-wide v2, v0, Lokhttp3/internal/a/c$a;->btv:J
 
-    iget-wide v7, v0, Lokhttp3/internal/a/c$a;->btz:J
+    iget-wide v7, v0, Lokhttp3/internal/a/c$a;->btu:J
 
     sub-long/2addr v2, v7
 
-    iget-wide v7, v0, Lokhttp3/internal/a/c$a;->btt:J
+    iget-wide v7, v0, Lokhttp3/internal/a/c$a;->bto:J
 
-    iget-wide v10, v0, Lokhttp3/internal/a/c$a;->btA:J
+    iget-wide v10, v0, Lokhttp3/internal/a/c$a;->btv:J
 
     sub-long/2addr v7, v10
 
@@ -511,19 +511,19 @@
 
     add-long/2addr v13, v7
 
-    iget-object v2, v0, Lokhttp3/internal/a/c$a;->bsF:Lokhttp3/Response;
+    iget-object v2, v0, Lokhttp3/internal/a/c$a;->bsA:Lokhttp3/Response;
 
-    invoke-virtual {v2}, Lokhttp3/Response;->FM()Lokhttp3/d;
+    invoke-virtual {v2}, Lokhttp3/Response;->FK()Lokhttp3/d;
 
     move-result-object v2
 
-    iget v3, v2, Lokhttp3/d;->bnB:I
+    iget v3, v2, Lokhttp3/d;->bnw:I
 
     if-eq v3, v15, :cond_9
 
     sget-object v3, Ljava/util/concurrent/TimeUnit;->SECONDS:Ljava/util/concurrent/TimeUnit;
 
-    iget v2, v2, Lokhttp3/d;->bnB:I
+    iget v2, v2, Lokhttp3/d;->bnw:I
 
     int-to-long v7, v2
 
@@ -540,15 +540,15 @@
     goto :goto_b
 
     :cond_9
-    iget-object v2, v0, Lokhttp3/internal/a/c$a;->bty:Ljava/util/Date;
+    iget-object v2, v0, Lokhttp3/internal/a/c$a;->btt:Ljava/util/Date;
 
     if-eqz v2, :cond_c
 
-    iget-object v2, v0, Lokhttp3/internal/a/c$a;->btu:Ljava/util/Date;
+    iget-object v2, v0, Lokhttp3/internal/a/c$a;->btp:Ljava/util/Date;
 
     if-eqz v2, :cond_a
 
-    iget-object v2, v0, Lokhttp3/internal/a/c$a;->btu:Ljava/util/Date;
+    iget-object v2, v0, Lokhttp3/internal/a/c$a;->btp: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;->btA:J
+    iget-wide v2, v0, Lokhttp3/internal/a/c$a;->btv:J
 
     :goto_8
-    iget-object v7, v0, Lokhttp3/internal/a/c$a;->bty:Ljava/util/Date;
+    iget-object v7, v0, Lokhttp3/internal/a/c$a;->btt: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;->btw:Ljava/util/Date;
+    iget-object v2, v0, Lokhttp3/internal/a/c$a;->btr:Ljava/util/Date;
 
     if-eqz v2, :cond_f
 
-    iget-object v2, v0, Lokhttp3/internal/a/c$a;->bsF:Lokhttp3/Response;
+    iget-object v2, v0, Lokhttp3/internal/a/c$a;->bsA:Lokhttp3/Response;
 
-    iget-object v2, v2, Lokhttp3/Response;->bsA:Lokhttp3/w;
+    iget-object v2, v2, Lokhttp3/Response;->bsv:Lokhttp3/w;
 
-    iget-object v2, v2, Lokhttp3/w;->bnk:Lokhttp3/s;
+    iget-object v2, v2, Lokhttp3/w;->bnf:Lokhttp3/s;
 
-    iget-object v3, v2, Lokhttp3/s;->bri:Ljava/util/List;
+    iget-object v3, v2, Lokhttp3/s;->brd: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;->bri:Ljava/util/List;
+    iget-object v2, v2, Lokhttp3/s;->brd: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;->btu:Ljava/util/Date;
+    iget-object v2, v0, Lokhttp3/internal/a/c$a;->btp:Ljava/util/Date;
 
     if-eqz v2, :cond_e
 
-    iget-object v2, v0, Lokhttp3/internal/a/c$a;->btu:Ljava/util/Date;
+    iget-object v2, v0, Lokhttp3/internal/a/c$a;->btp: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;->btz:J
+    iget-wide v2, v0, Lokhttp3/internal/a/c$a;->btu:J
 
     :goto_a
-    iget-object v7, v0, Lokhttp3/internal/a/c$a;->btw:Ljava/util/Date;
+    iget-object v7, v0, Lokhttp3/internal/a/c$a;->btr: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;->bnB:I
+    iget v7, v4, Lokhttp3/d;->bnw:I
 
     if-eq v7, v15, :cond_11
 
     sget-object v7, Ljava/util/concurrent/TimeUnit;->SECONDS:Ljava/util/concurrent/TimeUnit;
 
-    iget v8, v4, Lokhttp3/d;->bnB:I
+    iget v8, v4, Lokhttp3/d;->bnw:I
 
     int-to-long v11, v8
 
@@ -678,13 +678,13 @@
     move-result-wide v2
 
     :cond_11
-    iget v7, v4, Lokhttp3/d;->bnH:I
+    iget v7, v4, Lokhttp3/d;->bnC:I
 
     if-eq v7, v15, :cond_12
 
     sget-object v7, Ljava/util/concurrent/TimeUnit;->SECONDS:Ljava/util/concurrent/TimeUnit;
 
-    iget v8, v4, Lokhttp3/d;->bnH:I
+    iget v8, v4, Lokhttp3/d;->bnC:I
 
     int-to-long v10, v8
 
@@ -698,17 +698,17 @@
     const-wide/16 v11, 0x0
 
     :goto_c
-    iget-boolean v7, v5, Lokhttp3/d;->bnF:Z
+    iget-boolean v7, v5, Lokhttp3/d;->bnA:Z
 
     if-nez v7, :cond_13
 
-    iget v7, v4, Lokhttp3/d;->bnG:I
+    iget v7, v4, Lokhttp3/d;->bnB:I
 
     if-eq v7, v15, :cond_13
 
     sget-object v7, Ljava/util/concurrent/TimeUnit;->SECONDS:Ljava/util/concurrent/TimeUnit;
 
-    iget v4, v4, Lokhttp3/d;->bnG:I
+    iget v4, v4, Lokhttp3/d;->bnB:I
 
     move-object v10, v9
 
@@ -728,7 +728,7 @@
     const-wide/16 v18, 0x0
 
     :goto_d
-    iget-boolean v4, v5, Lokhttp3/d;->bnz:Z
+    iget-boolean v4, v5, Lokhttp3/d;->bnu:Z
 
     if-nez v4, :cond_17
 
@@ -740,9 +740,9 @@
 
     if-gez v4, :cond_17
 
-    iget-object v4, v0, Lokhttp3/internal/a/c$a;->bsF:Lokhttp3/Response;
+    iget-object v4, v0, Lokhttp3/internal/a/c$a;->bsA:Lokhttp3/Response;
 
-    invoke-virtual {v4}, Lokhttp3/Response;->FO()Lokhttp3/Response$a;
+    invoke-virtual {v4}, Lokhttp3/Response;->FM()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;->bsF:Lokhttp3/Response;
+    iget-object v2, v0, Lokhttp3/internal/a/c$a;->bsA:Lokhttp3/Response;
 
-    invoke-virtual {v2}, Lokhttp3/Response;->FM()Lokhttp3/d;
+    invoke-virtual {v2}, Lokhttp3/Response;->FK()Lokhttp3/d;
 
     move-result-object v2
 
-    iget v2, v2, Lokhttp3/d;->bnB:I
+    iget v2, v2, Lokhttp3/d;->bnw:I
 
     if-ne v2, v15, :cond_15
 
-    iget-object v2, v0, Lokhttp3/internal/a/c$a;->bty:Ljava/util/Date;
+    iget-object v2, v0, Lokhttp3/internal/a/c$a;->btt: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;->FP()Lokhttp3/Response;
+    invoke-virtual {v4}, Lokhttp3/Response$a;->FN()Lokhttp3/Response;
 
     move-result-object v3
 
@@ -809,52 +809,52 @@
     goto :goto_11
 
     :cond_17
-    iget-object v2, v0, Lokhttp3/internal/a/c$a;->btB:Ljava/lang/String;
+    iget-object v2, v0, Lokhttp3/internal/a/c$a;->btw:Ljava/lang/String;
 
     if-eqz v2, :cond_18
 
-    iget-object v2, v0, Lokhttp3/internal/a/c$a;->btB:Ljava/lang/String;
+    iget-object v2, v0, Lokhttp3/internal/a/c$a;->btw:Ljava/lang/String;
 
     move-object v6, v10
 
     goto :goto_f
 
     :cond_18
-    iget-object v2, v0, Lokhttp3/internal/a/c$a;->btw:Ljava/util/Date;
+    iget-object v2, v0, Lokhttp3/internal/a/c$a;->btr:Ljava/util/Date;
 
     if-eqz v2, :cond_19
 
-    iget-object v2, v0, Lokhttp3/internal/a/c$a;->btx:Ljava/lang/String;
+    iget-object v2, v0, Lokhttp3/internal/a/c$a;->bts:Ljava/lang/String;
 
     goto :goto_f
 
     :cond_19
-    iget-object v2, v0, Lokhttp3/internal/a/c$a;->btu:Ljava/util/Date;
+    iget-object v2, v0, Lokhttp3/internal/a/c$a;->btp:Ljava/util/Date;
 
     if-eqz v2, :cond_1a
 
-    iget-object v2, v0, Lokhttp3/internal/a/c$a;->btv:Ljava/lang/String;
+    iget-object v2, v0, Lokhttp3/internal/a/c$a;->btq:Ljava/lang/String;
 
     :goto_f
-    iget-object v3, v0, Lokhttp3/internal/a/c$a;->bsA:Lokhttp3/w;
+    iget-object v3, v0, Lokhttp3/internal/a/c$a;->bsv:Lokhttp3/w;
 
-    iget-object v3, v3, Lokhttp3/w;->brH:Lokhttp3/Headers;
+    iget-object v3, v3, Lokhttp3/w;->brC:Lokhttp3/Headers;
 
-    invoke-virtual {v3}, Lokhttp3/Headers;->Fl()Lokhttp3/Headers$a;
+    invoke-virtual {v3}, Lokhttp3/Headers;->Fj()Lokhttp3/Headers$a;
 
     move-result-object v3
 
-    sget-object v4, Lokhttp3/internal/a;->bsV:Lokhttp3/internal/a;
+    sget-object v4, Lokhttp3/internal/a;->bsQ: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;->bsA:Lokhttp3/w;
+    iget-object v2, v0, Lokhttp3/internal/a/c$a;->bsv:Lokhttp3/w;
 
-    invoke-virtual {v2}, Lokhttp3/w;->FL()Lokhttp3/w$a;
+    invoke-virtual {v2}, Lokhttp3/w;->FJ()Lokhttp3/w$a;
 
     move-result-object v2
 
-    invoke-virtual {v3}, Lokhttp3/Headers$a;->Fm()Lokhttp3/Headers;
+    invoke-virtual {v3}, Lokhttp3/Headers$a;->Fk()Lokhttp3/Headers;
 
     move-result-object v3
 
@@ -862,13 +862,13 @@
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lokhttp3/w$a;->FN()Lokhttp3/w;
+    invoke-virtual {v2}, Lokhttp3/w$a;->FL()Lokhttp3/w;
 
     move-result-object v2
 
     new-instance v4, Lokhttp3/internal/a/c;
 
-    iget-object v3, v0, Lokhttp3/internal/a/c$a;->bsF:Lokhttp3/Response;
+    iget-object v3, v0, Lokhttp3/internal/a/c$a;->bsA: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;->bsA:Lokhttp3/w;
+    iget-object v2, v0, Lokhttp3/internal/a/c$a;->bsv: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;->bsA:Lokhttp3/w;
+    iget-object v2, v0, Lokhttp3/internal/a/c$a;->bsv: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;->bts:Lokhttp3/w;
+    iget-object v2, v4, Lokhttp3/internal/a/c;->btn:Lokhttp3/w;
 
     if-eqz v2, :cond_1c
 
-    iget-object v0, v0, Lokhttp3/internal/a/c$a;->bsA:Lokhttp3/w;
+    iget-object v0, v0, Lokhttp3/internal/a/c$a;->bsv:Lokhttp3/w;
 
-    invoke-virtual {v0}, Lokhttp3/w;->FM()Lokhttp3/d;
+    invoke-virtual {v0}, Lokhttp3/w;->FK()Lokhttp3/d;
 
     move-result-object v0
 
-    iget-boolean v0, v0, Lokhttp3/d;->bnI:Z
+    iget-boolean v0, v0, Lokhttp3/d;->bnD: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;->bts:Lokhttp3/w;
+    iget-object v0, v4, Lokhttp3/internal/a/c;->btn:Lokhttp3/w;
 
-    iget-object v2, v4, Lokhttp3/internal/a/c;->bsF:Lokhttp3/Response;
+    iget-object v2, v4, Lokhttp3/internal/a/c;->bsA:Lokhttp3/Response;
 
     if-eqz v17, :cond_1d
 
@@ -929,7 +929,7 @@
 
     move-object/from16 v3, v17
 
-    iget-object v4, v3, Lokhttp3/Response;->bsD:Lokhttp3/x;
+    iget-object v4, v3, Lokhttp3/Response;->bsy: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;->Fx()Lokhttp3/w;
+    invoke-interface/range {p1 .. p1}, Lokhttp3/Interceptor$Chain;->Fv()Lokhttp3/w;
 
     move-result-object v2
 
-    iput-object v2, v0, Lokhttp3/Response$a;->bsA:Lokhttp3/w;
+    iput-object v2, v0, Lokhttp3/Response$a;->bsv:Lokhttp3/w;
 
-    sget-object v2, Lokhttp3/u;->bsb:Lokhttp3/u;
+    sget-object v2, Lokhttp3/u;->brW:Lokhttp3/u;
 
-    iput-object v2, v0, Lokhttp3/Response$a;->bsB:Lokhttp3/u;
+    iput-object v2, v0, Lokhttp3/Response$a;->bsw: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;->bsX:Lokhttp3/x;
+    sget-object v2, Lokhttp3/internal/c;->bsS:Lokhttp3/x;
 
-    iput-object v2, v0, Lokhttp3/Response$a;->bsD:Lokhttp3/x;
+    iput-object v2, v0, Lokhttp3/Response$a;->bsy:Lokhttp3/x;
 
     const-wide/16 v2, -0x1
 
-    iput-wide v2, v0, Lokhttp3/Response$a;->bsH:J
+    iput-wide v2, v0, Lokhttp3/Response$a;->bsC:J
 
     invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
 
     move-result-wide v2
 
-    iput-wide v2, v0, Lokhttp3/Response$a;->bsI:J
+    iput-wide v2, v0, Lokhttp3/Response$a;->bsD:J
 
-    invoke-virtual {v0}, Lokhttp3/Response$a;->FP()Lokhttp3/Response;
+    invoke-virtual {v0}, Lokhttp3/Response$a;->FN()Lokhttp3/Response;
 
     move-result-object v0
 
@@ -988,7 +988,7 @@
     :cond_1e
     if-nez v0, :cond_1f
 
-    invoke-virtual {v2}, Lokhttp3/Response;->FO()Lokhttp3/Response$a;
+    invoke-virtual {v2}, Lokhttp3/Response;->FM()Lokhttp3/Response$a;
 
     move-result-object v0
 
@@ -1000,7 +1000,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokhttp3/Response$a;->FP()Lokhttp3/Response;
+    invoke-virtual {v0}, Lokhttp3/Response$a;->FN()Lokhttp3/Response;
 
     move-result-object v0
 
@@ -1020,7 +1020,7 @@
 
     if-eqz v3, :cond_20
 
-    iget-object v3, v3, Lokhttp3/Response;->bsD:Lokhttp3/x;
+    iget-object v3, v3, Lokhttp3/Response;->bsy: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;->FO()Lokhttp3/Response$a;
+    invoke-virtual {v2}, Lokhttp3/Response;->FM()Lokhttp3/Response$a;
 
     move-result-object v0
 
-    iget-object v3, v2, Lokhttp3/Response;->brH:Lokhttp3/Headers;
+    iget-object v3, v2, Lokhttp3/Response;->brC:Lokhttp3/Headers;
 
-    iget-object v5, v4, Lokhttp3/Response;->brH:Lokhttp3/Headers;
+    iget-object v5, v4, Lokhttp3/Response;->brC: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;->bsH:J
+    iget-wide v5, v4, Lokhttp3/Response;->bsC:J
 
-    iput-wide v5, v0, Lokhttp3/Response$a;->bsH:J
+    iput-wide v5, v0, Lokhttp3/Response$a;->bsC:J
 
-    iget-wide v5, v4, Lokhttp3/Response;->bsI:J
+    iget-wide v5, v4, Lokhttp3/Response;->bsD:J
 
-    iput-wide v5, v0, Lokhttp3/Response$a;->bsI:J
+    iput-wide v5, v0, Lokhttp3/Response$a;->bsD: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;->FP()Lokhttp3/Response;
+    invoke-virtual {v0}, Lokhttp3/Response$a;->FN()Lokhttp3/Response;
 
     move-result-object v0
 
-    iget-object v2, v4, Lokhttp3/Response;->bsD:Lokhttp3/x;
+    iget-object v2, v4, Lokhttp3/Response;->bsy:Lokhttp3/x;
 
     invoke-virtual {v2}, Lokhttp3/x;->close()V
 
     return-object v0
 
     :cond_21
-    iget-object v3, v2, Lokhttp3/Response;->bsD:Lokhttp3/x;
+    iget-object v3, v2, Lokhttp3/Response;->bsy:Lokhttp3/x;
 
     invoke-static {v3}, Lokhttp3/internal/c;->closeQuietly(Ljava/io/Closeable;)V
 
     :cond_22
-    invoke-virtual {v4}, Lokhttp3/Response;->FO()Lokhttp3/Response$a;
+    invoke-virtual {v4}, Lokhttp3/Response;->FM()Lokhttp3/Response$a;
 
     move-result-object v3
 
@@ -1109,11 +1109,11 @@
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lokhttp3/Response$a;->FP()Lokhttp3/Response;
+    invoke-virtual {v2}, Lokhttp3/Response$a;->FN()Lokhttp3/Response;
 
     move-result-object v2
 
-    iget-object v3, v1, Lokhttp3/internal/a/a;->btm:Lokhttp3/internal/a/e;
+    iget-object v3, v1, Lokhttp3/internal/a/a;->bth: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;->btm:Lokhttp3/internal/a/e;
+    iget-object v0, v1, Lokhttp3/internal/a/a;->bth:Lokhttp3/internal/a/e;
 
-    invoke-interface {v0}, Lokhttp3/internal/a/e;->Ga()Lokhttp3/internal/a/b;
+    invoke-interface {v0}, Lokhttp3/internal/a/e;->FY()Lokhttp3/internal/a/b;
 
     move-result-object v0
 
@@ -1140,7 +1140,7 @@
     return-object v2
 
     :cond_23
-    invoke-interface {v0}, Lokhttp3/internal/a/b;->FV()Lokio/q;
+    invoke-interface {v0}, Lokhttp3/internal/a/b;->FT()Lokio/q;
 
     move-result-object v3
 
@@ -1149,9 +1149,9 @@
     return-object v2
 
     :cond_24
-    iget-object v4, v2, Lokhttp3/Response;->bsD:Lokhttp3/x;
+    iget-object v4, v2, Lokhttp3/Response;->bsy:Lokhttp3/x;
 
-    invoke-virtual {v4}, Lokhttp3/x;->FQ()Lokio/d;
+    invoke-virtual {v4}, Lokhttp3/x;->FO()Lokio/d;
 
     move-result-object v4
 
@@ -1169,13 +1169,13 @@
 
     move-result-object v0
 
-    iget-object v3, v2, Lokhttp3/Response;->bsD:Lokhttp3/x;
+    iget-object v3, v2, Lokhttp3/Response;->bsy:Lokhttp3/x;
 
     invoke-virtual {v3}, Lokhttp3/x;->contentLength()J
 
     move-result-wide v3
 
-    invoke-virtual {v2}, Lokhttp3/Response;->FO()Lokhttp3/Response$a;
+    invoke-virtual {v2}, Lokhttp3/Response;->FM()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;->bsD:Lokhttp3/x;
+    iput-object v6, v2, Lokhttp3/Response$a;->bsy:Lokhttp3/x;
 
-    invoke-virtual {v2}, Lokhttp3/Response$a;->FP()Lokhttp3/Response;
+    invoke-virtual {v2}, Lokhttp3/Response$a;->FN()Lokhttp3/Response;
 
     move-result-object v0
 
     return-object v0
 
     :cond_25
-    iget-object v0, v0, Lokhttp3/w;->bsq:Ljava/lang/String;
+    iget-object v0, v0, Lokhttp3/w;->bsl:Ljava/lang/String;
 
     const-string v3, "POST"
 
@@ -1244,7 +1244,7 @@
 
     if-eqz v3, :cond_27
 
-    iget-object v0, v3, Lokhttp3/Response;->bsD:Lokhttp3/x;
+    iget-object v0, v3, Lokhttp3/Response;->bsy: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 15bf695897..287408e35e 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 FV()Lokio/q;
+.method public abstract FT()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 4f7e4d7415..942131dbf3 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 bsA:Lokhttp3/w;
+.field final bsA:Lokhttp3/Response;
 
-.field final bsF:Lokhttp3/Response;
+.field final bsv:Lokhttp3/w;
 
-.field btA:J
+.field final bto:J
 
-.field btB:Ljava/lang/String;
+.field btp:Ljava/util/Date;
 
-.field btC:I
+.field btq:Ljava/lang/String;
 
-.field final btt:J
+.field btr:Ljava/util/Date;
 
-.field btu:Ljava/util/Date;
+.field bts:Ljava/lang/String;
 
-.field btv:Ljava/lang/String;
+.field btt:Ljava/util/Date;
 
-.field btw:Ljava/util/Date;
+.field btu:J
 
-.field btx:Ljava/lang/String;
+.field btv:J
 
-.field bty:Ljava/util/Date;
+.field btw:Ljava/lang/String;
 
-.field btz:J
+.field btx:I
 
 
 # direct methods
@@ -48,29 +48,29 @@
 
     const/4 v0, -0x1
 
-    iput v0, p0, Lokhttp3/internal/a/c$a;->btC:I
+    iput v0, p0, Lokhttp3/internal/a/c$a;->btx:I
 
-    iput-wide p1, p0, Lokhttp3/internal/a/c$a;->btt:J
+    iput-wide p1, p0, Lokhttp3/internal/a/c$a;->bto:J
 
-    iput-object p3, p0, Lokhttp3/internal/a/c$a;->bsA:Lokhttp3/w;
+    iput-object p3, p0, Lokhttp3/internal/a/c$a;->bsv:Lokhttp3/w;
 
-    iput-object p4, p0, Lokhttp3/internal/a/c$a;->bsF:Lokhttp3/Response;
+    iput-object p4, p0, Lokhttp3/internal/a/c$a;->bsA:Lokhttp3/Response;
 
     if-eqz p4, :cond_5
 
-    iget-wide p1, p4, Lokhttp3/Response;->bsH:J
+    iget-wide p1, p4, Lokhttp3/Response;->bsC:J
 
-    iput-wide p1, p0, Lokhttp3/internal/a/c$a;->btz:J
+    iput-wide p1, p0, Lokhttp3/internal/a/c$a;->btu:J
 
-    iget-wide p1, p4, Lokhttp3/Response;->bsI:J
+    iget-wide p1, p4, Lokhttp3/Response;->bsD:J
 
-    iput-wide p1, p0, Lokhttp3/internal/a/c$a;->btA:J
+    iput-wide p1, p0, Lokhttp3/internal/a/c$a;->btv:J
 
-    iget-object p1, p4, Lokhttp3/Response;->brH:Lokhttp3/Headers;
+    iget-object p1, p4, Lokhttp3/Response;->brC:Lokhttp3/Headers;
 
     const/4 p2, 0x0
 
-    iget-object p3, p1, Lokhttp3/Headers;->brc:[Ljava/lang/String;
+    iget-object p3, p1, Lokhttp3/Headers;->bqX:[Ljava/lang/String;
 
     array-length p3, p3
 
@@ -99,9 +99,9 @@
 
     move-result-object p4
 
-    iput-object p4, p0, Lokhttp3/internal/a/c$a;->btu:Ljava/util/Date;
+    iput-object p4, p0, Lokhttp3/internal/a/c$a;->btp:Ljava/util/Date;
 
-    iput-object v1, p0, Lokhttp3/internal/a/c$a;->btv:Ljava/lang/String;
+    iput-object v1, p0, Lokhttp3/internal/a/c$a;->btq:Ljava/lang/String;
 
     goto :goto_1
 
@@ -118,7 +118,7 @@
 
     move-result-object p4
 
-    iput-object p4, p0, Lokhttp3/internal/a/c$a;->bty:Ljava/util/Date;
+    iput-object p4, p0, Lokhttp3/internal/a/c$a;->btt:Ljava/util/Date;
 
     goto :goto_1
 
@@ -135,9 +135,9 @@
 
     move-result-object p4
 
-    iput-object p4, p0, Lokhttp3/internal/a/c$a;->btw:Ljava/util/Date;
+    iput-object p4, p0, Lokhttp3/internal/a/c$a;->btr:Ljava/util/Date;
 
-    iput-object v1, p0, Lokhttp3/internal/a/c$a;->btx:Ljava/lang/String;
+    iput-object v1, p0, Lokhttp3/internal/a/c$a;->bts:Ljava/lang/String;
 
     goto :goto_1
 
@@ -150,7 +150,7 @@
 
     if-eqz v2, :cond_3
 
-    iput-object v1, p0, Lokhttp3/internal/a/c$a;->btB:Ljava/lang/String;
+    iput-object v1, p0, Lokhttp3/internal/a/c$a;->btw:Ljava/lang/String;
 
     goto :goto_1
 
@@ -167,7 +167,7 @@
 
     move-result p4
 
-    iput p4, p0, Lokhttp3/internal/a/c$a;->btC:I
+    iput p4, p0, Lokhttp3/internal/a/c$a;->btx: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 c6266c30c7..381a2b289c 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 btL:Lokhttp3/internal/a/d$b;
+.field final btG:Lokhttp3/internal/a/d$b;
 
-.field final synthetic btM:Lokhttp3/internal/a/d;
+.field final synthetic btH: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 ea1062cd63..15c4039444 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 btN:[J
+.field final btI:[J
 
-.field final btO:[Ljava/io/File;
+.field final btJ:[Ljava/io/File;
 
-.field final btP:[Ljava/io/File;
+.field final btK:[Ljava/io/File;
 
-.field btQ:Z
+.field btL:Z
 
-.field btR:Lokhttp3/internal/a/d$a;
+.field btM: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;->btN:[J
+    iget-object v0, p0, Lokhttp3/internal/a/d$b;->btI:[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 1720e65367..6ac5897f68 100644
--- a/com.discord/smali_classes2/okhttp3/internal/a/d.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/a/d.smali
@@ -19,21 +19,19 @@
 # static fields
 .field static final synthetic $assertionsDisabled:Z
 
-.field static final btD:Ljava/util/regex/Pattern;
+.field static final bty:Ljava/util/regex/Pattern;
 
 
 # instance fields
-.field private final bqk:Ljava/lang/Runnable;
+.field private final bqf:Ljava/lang/Runnable;
 
-.field final btE:Lokhttp3/internal/f/a;
+.field private btA:J
 
-.field private btF:J
+.field final btB:I
 
-.field final btG:I
+.field btC:Lokio/BufferedSink;
 
-.field btH:Lokio/BufferedSink;
-
-.field final btI:Ljava/util/LinkedHashMap;
+.field final btD:Ljava/util/LinkedHashMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/LinkedHashMap<",
@@ -44,9 +42,11 @@
     .end annotation
 .end field
 
-.field btJ:I
+.field btE:I
 
-.field btK:Z
+.field btF:Z
+
+.field final btz:Lokhttp3/internal/f/a;
 
 .field private final executor:Ljava/util/concurrent/Executor;
 
@@ -67,21 +67,21 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/internal/a/d;->btD:Ljava/util/regex/Pattern;
+    sput-object v0, Lokhttp3/internal/a/d;->bty:Ljava/util/regex/Pattern;
 
     return-void
 .end method
 
-.method private FW()Z
+.method private FU()Z
     .locals 2
 
-    iget v0, p0, Lokhttp3/internal/a/d;->btJ:I
+    iget v0, p0, Lokhttp3/internal/a/d;->btE:I
 
     const/16 v1, 0x7d0
 
     if-lt v0, v1, :cond_0
 
-    iget-object v1, p0, Lokhttp3/internal/a/d;->btI:Ljava/util/LinkedHashMap;
+    iget-object v1, p0, Lokhttp3/internal/a/d;->btD:Ljava/util/LinkedHashMap;
 
     invoke-virtual {v1}, Ljava/util/LinkedHashMap;->size()I
 
@@ -99,7 +99,7 @@
     return v0
 .end method
 
-.method private declared-synchronized FX()V
+.method private declared-synchronized FV()V
     .locals 2
 
     monitor-enter p0
@@ -137,7 +137,7 @@
     throw v0
 .end method
 
-.method private FY()V
+.method private FW()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;->btF:J
+    iget-wide v2, p0, Lokhttp3/internal/a/d;->btA:J
 
     cmp-long v4, v0, v2
 
     if-lez v4, :cond_0
 
-    iget-object v0, p0, Lokhttp3/internal/a/d;->btI:Ljava/util/LinkedHashMap;
+    iget-object v0, p0, Lokhttp3/internal/a/d;->btD: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;->btK:Z
+    iput-boolean v0, p0, Lokhttp3/internal/a/d;->btF:Z
 
     return-void
 .end method
@@ -193,9 +193,9 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p1, Lokhttp3/internal/a/d$a;->btL:Lokhttp3/internal/a/d$b;
+    iget-object v0, p1, Lokhttp3/internal/a/d$a;->btG:Lokhttp3/internal/a/d$b;
 
-    iget-object v1, v0, Lokhttp3/internal/a/d$b;->btR:Lokhttp3/internal/a/d$a;
+    iget-object v1, v0, Lokhttp3/internal/a/d$b;->btM: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;->btG:I
+    iget v2, p0, Lokhttp3/internal/a/d;->btB:I
 
     if-ge v1, v2, :cond_0
 
-    iget-object v2, v0, Lokhttp3/internal/a/d$b;->btP:[Ljava/io/File;
+    iget-object v2, v0, Lokhttp3/internal/a/d$b;->btK:[Ljava/io/File;
 
     aget-object v2, v2, v1
 
-    iget-object v3, p0, Lokhttp3/internal/a/d;->btE:Lokhttp3/internal/f/a;
+    iget-object v3, p0, Lokhttp3/internal/a/d;->btz: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;->btJ:I
+    iget v1, p0, Lokhttp3/internal/a/d;->btE:I
 
     const/4 v2, 0x1
 
     add-int/2addr v1, v2
 
-    iput v1, p0, Lokhttp3/internal/a/d;->btJ:I
+    iput v1, p0, Lokhttp3/internal/a/d;->btE:I
 
     const/4 v1, 0x0
 
-    iput-object v1, v0, Lokhttp3/internal/a/d$b;->btR:Lokhttp3/internal/a/d$a;
+    iput-object v1, v0, Lokhttp3/internal/a/d$b;->btM:Lokhttp3/internal/a/d$a;
 
-    iget-boolean v1, v0, Lokhttp3/internal/a/d$b;->btQ:Z
+    iget-boolean v1, v0, Lokhttp3/internal/a/d$b;->btL:Z
 
     or-int/2addr p1, v1
 
@@ -243,9 +243,9 @@
 
     if-eqz p1, :cond_1
 
-    iput-boolean v2, v0, Lokhttp3/internal/a/d$b;->btQ:Z
+    iput-boolean v2, v0, Lokhttp3/internal/a/d$b;->btL:Z
 
-    iget-object p1, p0, Lokhttp3/internal/a/d;->btH:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/a/d;->btC: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;->btH:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/a/d;->btC: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;->btH:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/a/d;->btC:Lokio/BufferedSink;
 
     invoke-virtual {v0, p1}, Lokhttp3/internal/a/d$b;->a(Lokio/BufferedSink;)V
 
-    iget-object p1, p0, Lokhttp3/internal/a/d;->btH:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/a/d;->btC: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;->btI:Ljava/util/LinkedHashMap;
+    iget-object p1, p0, Lokhttp3/internal/a/d;->btD: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;->btH:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/a/d;->btC: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;->btH:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/a/d;->btC: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;->btH:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/a/d;->btC:Lokio/BufferedSink;
 
     invoke-interface {p1, v1}, Lokio/BufferedSink;->dA(I)Lokio/BufferedSink;
 
     :goto_1
-    iget-object p1, p0, Lokhttp3/internal/a/d;->btH:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/a/d;->btC: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;->btF:J
+    iget-wide v2, p0, Lokhttp3/internal/a/d;->btA:J
 
     cmp-long p1, v0, v2
 
     if-gtz p1, :cond_2
 
-    invoke-direct {p0}, Lokhttp3/internal/a/d;->FW()Z
+    invoke-direct {p0}, Lokhttp3/internal/a/d;->FU()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;->bqk:Ljava/lang/Runnable;
+    iget-object v0, p0, Lokhttp3/internal/a/d;->bqf: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;->btR:Lokhttp3/internal/a/d$a;
+    iget-object v0, p1, Lokhttp3/internal/a/d$b;->btM:Lokhttp3/internal/a/d$a;
 
     const/4 v1, 0x0
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p1, Lokhttp3/internal/a/d$b;->btR:Lokhttp3/internal/a/d$a;
+    iget-object v0, p1, Lokhttp3/internal/a/d$b;->btM:Lokhttp3/internal/a/d$a;
 
-    iget-object v2, v0, Lokhttp3/internal/a/d$a;->btL:Lokhttp3/internal/a/d$b;
+    iget-object v2, v0, Lokhttp3/internal/a/d$a;->btG:Lokhttp3/internal/a/d$b;
 
-    iget-object v2, v2, Lokhttp3/internal/a/d$b;->btR:Lokhttp3/internal/a/d$a;
+    iget-object v2, v2, Lokhttp3/internal/a/d$b;->btM: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;->btM:Lokhttp3/internal/a/d;
+    iget-object v3, v0, Lokhttp3/internal/a/d$a;->btH:Lokhttp3/internal/a/d;
 
-    iget v3, v3, Lokhttp3/internal/a/d;->btG:I
+    iget v3, v3, Lokhttp3/internal/a/d;->btB:I
 
     if-ge v2, v3, :cond_0
 
     :try_start_0
-    iget-object v3, v0, Lokhttp3/internal/a/d$a;->btM:Lokhttp3/internal/a/d;
+    iget-object v3, v0, Lokhttp3/internal/a/d$a;->btH:Lokhttp3/internal/a/d;
 
-    iget-object v3, v3, Lokhttp3/internal/a/d;->btE:Lokhttp3/internal/f/a;
+    iget-object v3, v3, Lokhttp3/internal/a/d;->btz:Lokhttp3/internal/f/a;
 
-    iget-object v4, v0, Lokhttp3/internal/a/d$a;->btL:Lokhttp3/internal/a/d$b;
+    iget-object v4, v0, Lokhttp3/internal/a/d$a;->btG:Lokhttp3/internal/a/d$b;
 
-    iget-object v4, v4, Lokhttp3/internal/a/d$b;->btP:[Ljava/io/File;
+    iget-object v4, v4, Lokhttp3/internal/a/d$b;->btK:[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;->btL:Lokhttp3/internal/a/d$b;
+    iget-object v0, v0, Lokhttp3/internal/a/d$a;->btG:Lokhttp3/internal/a/d$b;
 
     const/4 v2, 0x0
 
-    iput-object v2, v0, Lokhttp3/internal/a/d$b;->btR:Lokhttp3/internal/a/d$a;
+    iput-object v2, v0, Lokhttp3/internal/a/d$b;->btM:Lokhttp3/internal/a/d$a;
 
     :cond_1
     :goto_1
-    iget v0, p0, Lokhttp3/internal/a/d;->btG:I
+    iget v0, p0, Lokhttp3/internal/a/d;->btB:I
 
     if-ge v1, v0, :cond_2
 
-    iget-object v0, p0, Lokhttp3/internal/a/d;->btE:Lokhttp3/internal/f/a;
+    iget-object v0, p0, Lokhttp3/internal/a/d;->btz:Lokhttp3/internal/f/a;
 
-    iget-object v2, p1, Lokhttp3/internal/a/d$b;->btO:[Ljava/io/File;
+    iget-object v2, p1, Lokhttp3/internal/a/d$b;->btJ:[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;->btN:[J
+    iget-object v0, p1, Lokhttp3/internal/a/d$b;->btI:[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;->btN:[J
+    iget-object v0, p1, Lokhttp3/internal/a/d$b;->btI:[J
 
     const-wide/16 v2, 0x0
 
@@ -448,15 +448,15 @@
     goto :goto_1
 
     :cond_2
-    iget v0, p0, Lokhttp3/internal/a/d;->btJ:I
+    iget v0, p0, Lokhttp3/internal/a/d;->btE:I
 
     const/4 v1, 0x1
 
     add-int/2addr v0, v1
 
-    iput v0, p0, Lokhttp3/internal/a/d;->btJ:I
+    iput v0, p0, Lokhttp3/internal/a/d;->btE:I
 
-    iget-object v0, p0, Lokhttp3/internal/a/d;->btH:Lokio/BufferedSink;
+    iget-object v0, p0, Lokhttp3/internal/a/d;->btC: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;->btI:Ljava/util/LinkedHashMap;
+    iget-object v0, p0, Lokhttp3/internal/a/d;->btD: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;->FW()Z
+    invoke-direct {p0}, Lokhttp3/internal/a/d;->FU()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;->bqk:Ljava/lang/Runnable;
+    iget-object v0, p0, Lokhttp3/internal/a/d;->bqf: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;->btI:Ljava/util/LinkedHashMap;
+    iget-object v0, p0, Lokhttp3/internal/a/d;->btD: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;->btI:Ljava/util/LinkedHashMap;
+    iget-object v2, p0, Lokhttp3/internal/a/d;->btD: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;->btR:Lokhttp3/internal/a/d$a;
+    iget-object v5, v4, Lokhttp3/internal/a/d$b;->btM:Lokhttp3/internal/a/d$a;
 
     if-eqz v5, :cond_3
 
-    iget-object v4, v4, Lokhttp3/internal/a/d$b;->btR:Lokhttp3/internal/a/d$a;
+    iget-object v4, v4, Lokhttp3/internal/a/d$b;->btM:Lokhttp3/internal/a/d$a;
 
-    iget-object v5, v4, Lokhttp3/internal/a/d$a;->btM:Lokhttp3/internal/a/d;
+    iget-object v5, v4, Lokhttp3/internal/a/d$a;->btH: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;->btL:Lokhttp3/internal/a/d$b;
+    iget-object v6, v4, Lokhttp3/internal/a/d$a;->btG:Lokhttp3/internal/a/d$b;
 
-    iget-object v6, v6, Lokhttp3/internal/a/d$b;->btR:Lokhttp3/internal/a/d$a;
+    iget-object v6, v6, Lokhttp3/internal/a/d$b;->btM:Lokhttp3/internal/a/d$a;
 
     if-ne v6, v4, :cond_1
 
-    iget-object v6, v4, Lokhttp3/internal/a/d$a;->btM:Lokhttp3/internal/a/d;
+    iget-object v6, v4, Lokhttp3/internal/a/d$a;->btH: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;->FY()V
+    invoke-direct {p0}, Lokhttp3/internal/a/d;->FW()V
 
-    iget-object v0, p0, Lokhttp3/internal/a/d;->btH:Lokio/BufferedSink;
+    iget-object v0, p0, Lokhttp3/internal/a/d;->btC:Lokio/BufferedSink;
 
     invoke-interface {v0}, Lokio/BufferedSink;->close()V
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lokhttp3/internal/a/d;->btH:Lokio/BufferedSink;
+    iput-object v0, p0, Lokhttp3/internal/a/d;->btC: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;->FX()V
+    invoke-direct {p0}, Lokhttp3/internal/a/d;->FV()V
 
-    invoke-direct {p0}, Lokhttp3/internal/a/d;->FY()V
+    invoke-direct {p0}, Lokhttp3/internal/a/d;->FW()V
 
-    iget-object v0, p0, Lokhttp3/internal/a/d;->btH:Lokio/BufferedSink;
+    iget-object v0, p0, Lokhttp3/internal/a/d;->btC: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 7e8795228f..8c8e3ecec0 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 FZ()Lokhttp3/Response;
+.method public abstract FX()Lokhttp3/Response;
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -12,7 +12,7 @@
     .end annotation
 .end method
 
-.method public abstract Ga()Lokhttp3/internal/a/b;
+.method public abstract FY()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 a754f7e3a7..999d397136 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 bsh:Lokhttp3/t;
+.field public final bsc:Lokhttp3/t;
 
 
 # direct methods
@@ -16,7 +16,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/internal/b/a;->bsh:Lokhttp3/t;
+    iput-object p1, p0, Lokhttp3/internal/b/a;->bsc: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;->bsA:Lokhttp3/w;
+    iget-object v1, v0, Lokhttp3/internal/c/g;->bsv:Lokhttp3/w;
 
-    iget-object v2, v0, Lokhttp3/internal/c/g;->buD:Lokhttp3/internal/b/g;
+    iget-object v2, v0, Lokhttp3/internal/c/g;->buy:Lokhttp3/internal/b/g;
 
-    iget-object v3, v1, Lokhttp3/w;->bsq:Ljava/lang/String;
+    iget-object v3, v1, Lokhttp3/w;->bsl: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;->bsh:Lokhttp3/t;
+    iget-object v4, p0, Lokhttp3/internal/b/a;->bsc: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;->Gg()Lokhttp3/internal/b/c;
+    invoke-virtual {v2}, Lokhttp3/internal/b/g;->Ge()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 0f3d9b1bf7..d352dec80f 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 bnp:Ljava/util/List;
+.field private final bnk:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -14,11 +14,11 @@
     .end annotation
 .end field
 
-.field private btS:I
+.field private btN:I
 
-.field btT:Z
+.field btO:Z
 
-.field btU:Z
+.field btP:Z
 
 
 # direct methods
@@ -37,9 +37,9 @@
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lokhttp3/internal/b/b;->btS:I
+    iput v0, p0, Lokhttp3/internal/b/b;->btN:I
 
-    iput-object p1, p0, Lokhttp3/internal/b/b;->bnp:Ljava/util/List;
+    iput-object p1, p0, Lokhttp3/internal/b/b;->bnk: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;->btS:I
+    iget v0, p0, Lokhttp3/internal/b/b;->btN:I
 
     :goto_0
-    iget-object v1, p0, Lokhttp3/internal/b/b;->bnp:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/internal/b/b;->bnk: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;->bnp:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/internal/b/b;->bnk: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;->btS:I
+    iget v0, p0, Lokhttp3/internal/b/b;->btN:I
 
-    iget-object v1, p0, Lokhttp3/internal/b/b;->bnp:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/internal/b/b;->bnk: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;->bnp:Ljava/util/List;
+    iget-object v2, p0, Lokhttp3/internal/b/b;->bnk: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;->btS:I
+    iput v0, p0, Lokhttp3/internal/b/b;->btN:I
 
     goto :goto_1
 
@@ -143,11 +143,11 @@
 
     move-result v0
 
-    iput-boolean v0, p0, Lokhttp3/internal/b/b;->btT:Z
+    iput-boolean v0, p0, Lokhttp3/internal/b/b;->btO:Z
 
-    sget-object v0, Lokhttp3/internal/a;->bsV:Lokhttp3/internal/a;
+    sget-object v0, Lokhttp3/internal/a;->bsQ:Lokhttp3/internal/a;
 
-    iget-boolean v1, p0, Lokhttp3/internal/b/b;->btU:Z
+    iget-boolean v1, p0, Lokhttp3/internal/b/b;->btP: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;->btU:Z
+    iget-boolean v2, p0, Lokhttp3/internal/b/b;->btP: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;->bnp:Ljava/util/List;
+    iget-object v2, p0, Lokhttp3/internal/b/b;->bnk: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 e71e6318cf..0900c216c3 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 buf:Lokhttp3/internal/b/g;
+.field final synthetic bua:Lokhttp3/internal/b/g;
 
-.field final synthetic bug:Lokhttp3/internal/b/c;
+.field final synthetic bub: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;->bug:Lokhttp3/internal/b/c;
+    iput-object p1, p0, Lokhttp3/internal/b/c$1;->bub:Lokhttp3/internal/b/c;
 
-    iput-object p4, p0, Lokhttp3/internal/b/c$1;->buf:Lokhttp3/internal/b/g;
+    iput-object p4, p0, Lokhttp3/internal/b/c$1;->bua:Lokhttp3/internal/b/g;
 
     const/4 p1, 0x1
 
@@ -45,9 +45,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/b/c$1;->buf:Lokhttp3/internal/b/g;
+    iget-object v0, p0, Lokhttp3/internal/b/c$1;->bua:Lokhttp3/internal/b/g;
 
-    invoke-virtual {v0}, Lokhttp3/internal/b/g;->Ge()Lokhttp3/internal/c/c;
+    invoke-virtual {v0}, Lokhttp3/internal/b/g;->Gc()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 04e6cc11e2..24e557b9b6 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 buh:Ljava/util/Set;
+.field private final buc: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;->buh:Ljava/util/Set;
+    iput-object v0, p0, Lokhttp3/internal/b/d;->buc: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;->buh:Ljava/util/Set;
+    iget-object v0, p0, Lokhttp3/internal/b/d;->buc: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;->buh:Ljava/util/Set;
+    iget-object v0, p0, Lokhttp3/internal/b/d;->buc: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;->buh:Ljava/util/Set;
+    iget-object v0, p0, Lokhttp3/internal/b/d;->buc: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 4c160a071f..2bf29536c3 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 bun:Ljava/util/List;
+.field final bui:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -25,7 +25,7 @@
     .end annotation
 .end field
 
-.field buo:I
+.field buj:I
 
 
 # direct methods
@@ -44,9 +44,9 @@
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lokhttp3/internal/b/f$a;->buo:I
+    iput v0, p0, Lokhttp3/internal/b/f$a;->buj:I
 
-    iput-object p1, p0, Lokhttp3/internal/b/f$a;->bun:Ljava/util/List;
+    iput-object p1, p0, Lokhttp3/internal/b/f$a;->bui: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;->buo:I
+    iget v0, p0, Lokhttp3/internal/b/f$a;->buj:I
 
-    iget-object v1, p0, Lokhttp3/internal/b/f$a;->bun:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/internal/b/f$a;->bui: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 2214e551dc..4be987b667 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 bqm:Lokhttp3/internal/b/d;
+.field final bqh:Lokhttp3/internal/b/d;
 
-.field final bsN:Lokhttp3/a;
+.field final bsI:Lokhttp3/a;
 
-.field private final bsk:Lokhttp3/p;
+.field private final bsf:Lokhttp3/p;
 
-.field private final bui:Lokhttp3/e;
+.field private final bud:Lokhttp3/e;
 
-.field private buj:Ljava/util/List;
+.field private bue:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -30,9 +30,9 @@
     .end annotation
 .end field
 
-.field private buk:I
+.field private buf:I
 
-.field private bul:Ljava/util/List;
+.field private bug:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -42,7 +42,7 @@
     .end annotation
 .end field
 
-.field private final bum:Ljava/util/List;
+.field private final buh: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;->buj:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/internal/b/f;->bue:Ljava/util/List;
 
     invoke-static {}, Ljava/util/Collections;->emptyList()Ljava/util/List;
 
     move-result-object v0
 
-    iput-object v0, p0, Lokhttp3/internal/b/f;->bul:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/internal/b/f;->bug: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;->bum:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/internal/b/f;->buh:Ljava/util/List;
 
-    iput-object p1, p0, Lokhttp3/internal/b/f;->bsN:Lokhttp3/a;
+    iput-object p1, p0, Lokhttp3/internal/b/f;->bsI:Lokhttp3/a;
 
-    iput-object p2, p0, Lokhttp3/internal/b/f;->bqm:Lokhttp3/internal/b/d;
+    iput-object p2, p0, Lokhttp3/internal/b/f;->bqh:Lokhttp3/internal/b/d;
 
-    iput-object p3, p0, Lokhttp3/internal/b/f;->bui:Lokhttp3/e;
+    iput-object p3, p0, Lokhttp3/internal/b/f;->bud:Lokhttp3/e;
 
-    iput-object p4, p0, Lokhttp3/internal/b/f;->bsk:Lokhttp3/p;
+    iput-object p4, p0, Lokhttp3/internal/b/f;->bsf:Lokhttp3/p;
 
-    iget-object p2, p1, Lokhttp3/a;->bnk:Lokhttp3/s;
+    iget-object p2, p1, Lokhttp3/a;->bnf:Lokhttp3/s;
 
-    iget-object p1, p1, Lokhttp3/a;->bnr:Ljava/net/Proxy;
+    iget-object p1, p1, Lokhttp3/a;->bnm:Ljava/net/Proxy;
 
     const/4 p3, 0x0
 
@@ -100,11 +100,11 @@
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lokhttp3/internal/b/f;->bsN:Lokhttp3/a;
+    iget-object p1, p0, Lokhttp3/internal/b/f;->bsI:Lokhttp3/a;
 
-    iget-object p1, p1, Lokhttp3/a;->bnq:Ljava/net/ProxySelector;
+    iget-object p1, p1, Lokhttp3/a;->bnl:Ljava/net/ProxySelector;
 
-    invoke-virtual {p2}, Lokhttp3/s;->Fn()Ljava/net/URI;
+    invoke-virtual {p2}, Lokhttp3/s;->Fl()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;->buj:Ljava/util/List;
+    iput-object p1, p0, Lokhttp3/internal/b/f;->bue:Ljava/util/List;
 
-    iput p3, p0, Lokhttp3/internal/b/f;->buk:I
+    iput p3, p0, Lokhttp3/internal/b/f;->buf:I
 
     return-void
 .end method
 
-.method private Gd()Z
+.method private Gb()Z
     .locals 2
 
-    iget v0, p0, Lokhttp3/internal/b/f;->buk:I
+    iget v0, p0, Lokhttp3/internal/b/f;->buf:I
 
-    iget-object v1, p0, Lokhttp3/internal/b/f;->buj:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/internal/b/f;->bue: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;->bul:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/internal/b/f;->bug: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;->bsN:Lokhttp3/a;
+    iget-object v0, p0, Lokhttp3/internal/b/f;->bsI:Lokhttp3/a;
 
-    iget-object v0, v0, Lokhttp3/a;->bnk:Lokhttp3/s;
+    iget-object v0, v0, Lokhttp3/a;->bnf:Lokhttp3/s;
 
-    iget-object v1, v0, Lokhttp3/s;->brg:Ljava/lang/String;
+    iget-object v1, v0, Lokhttp3/s;->brb:Ljava/lang/String;
 
-    iget-object v0, p0, Lokhttp3/internal/b/f;->bsN:Lokhttp3/a;
+    iget-object v0, p0, Lokhttp3/internal/b/f;->bsI:Lokhttp3/a;
 
-    iget-object v0, v0, Lokhttp3/a;->bnk:Lokhttp3/s;
+    iget-object v0, v0, Lokhttp3/a;->bnf: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;->bul:Ljava/util/List;
+    iget-object p1, p0, Lokhttp3/internal/b/f;->bug: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;->bsN:Lokhttp3/a;
+    iget-object p1, p0, Lokhttp3/internal/b/f;->bsI:Lokhttp3/a;
 
-    iget-object p1, p1, Lokhttp3/a;->bnl:Lokhttp3/o;
+    iget-object p1, p1, Lokhttp3/a;->bng: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;->bul:Ljava/util/List;
+    iget-object v4, p0, Lokhttp3/internal/b/f;->bug: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;->bsN:Lokhttp3/a;
+    iget-object v2, p0, Lokhttp3/internal/b/f;->bsI:Lokhttp3/a;
 
-    iget-object v2, v2, Lokhttp3/a;->bnl:Lokhttp3/o;
+    iget-object v2, v2, Lokhttp3/a;->bng: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 Gc()Lokhttp3/internal/b/f$a;
+.method public final Ga()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;->Gd()Z
+    invoke-direct {p0}, Lokhttp3/internal/b/f;->Gb()Z
 
     move-result v1
 
     if-eqz v1, :cond_4
 
-    invoke-direct {p0}, Lokhttp3/internal/b/f;->Gd()Z
+    invoke-direct {p0}, Lokhttp3/internal/b/f;->Gb()Z
 
     move-result v1
 
     if-eqz v1, :cond_3
 
-    iget-object v1, p0, Lokhttp3/internal/b/f;->buj:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/internal/b/f;->bue:Ljava/util/List;
 
-    iget v2, p0, Lokhttp3/internal/b/f;->buk:I
+    iget v2, p0, Lokhttp3/internal/b/f;->buf:I
 
     add-int/lit8 v3, v2, 0x1
 
-    iput v3, p0, Lokhttp3/internal/b/f;->buk:I
+    iput v3, p0, Lokhttp3/internal/b/f;->buf: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;->bul:Ljava/util/List;
+    iget-object v3, p0, Lokhttp3/internal/b/f;->bug: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;->bsN:Lokhttp3/a;
+    iget-object v5, p0, Lokhttp3/internal/b/f;->bsI:Lokhttp3/a;
 
-    iget-object v6, p0, Lokhttp3/internal/b/f;->bul:Ljava/util/List;
+    iget-object v6, p0, Lokhttp3/internal/b/f;->bug: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;->bqm:Lokhttp3/internal/b/d;
+    iget-object v5, p0, Lokhttp3/internal/b/f;->bqh: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;->bum:Ljava/util/List;
+    iget-object v5, p0, Lokhttp3/internal/b/f;->buh: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;->bsN:Lokhttp3/a;
+    iget-object v2, p0, Lokhttp3/internal/b/f;->bsI:Lokhttp3/a;
 
-    iget-object v2, v2, Lokhttp3/a;->bnk:Lokhttp3/s;
+    iget-object v2, v2, Lokhttp3/a;->bnf:Lokhttp3/s;
 
-    iget-object v2, v2, Lokhttp3/s;->brg:Ljava/lang/String;
+    iget-object v2, v2, Lokhttp3/s;->brb: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;->buj:Ljava/util/List;
+    iget-object v2, p0, Lokhttp3/internal/b/f;->bue: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;->bum:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/internal/b/f;->buh:Ljava/util/List;
 
     invoke-interface {v0, v1}, Ljava/util/List;->addAll(Ljava/util/Collection;)Z
 
-    iget-object v1, p0, Lokhttp3/internal/b/f;->bum:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/internal/b/f;->buh: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;->Gd()Z
+    invoke-direct {p0}, Lokhttp3/internal/b/f;->Gb()Z
 
     move-result v0
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lokhttp3/internal/b/f;->bum:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/internal/b/f;->buh: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 1d69d91a0b..95df44e386 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 buq:Ljava/lang/Object;
+.field public final bul: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;->buq:Ljava/lang/Object;
+    iput-object p2, p0, Lokhttp3/internal/b/g$a;->bul: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 34ffa9c728..0661b18df0 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 brR:Lokhttp3/j;
+.field public final brM:Lokhttp3/j;
 
-.field public final bsN:Lokhttp3/a;
+.field public final bsI:Lokhttp3/a;
 
-.field public final bsk:Lokhttp3/p;
+.field public final bsf:Lokhttp3/p;
 
-.field public btV:Lokhttp3/y;
+.field public btQ:Lokhttp3/y;
 
-.field public final bui:Lokhttp3/e;
+.field public final bud:Lokhttp3/e;
 
-.field private bup:Lokhttp3/internal/b/f$a;
+.field private buk:Lokhttp3/internal/b/f$a;
 
-.field private final buq:Ljava/lang/Object;
+.field private final bul:Ljava/lang/Object;
 
-.field private final bur:Lokhttp3/internal/b/f;
+.field private final bum:Lokhttp3/internal/b/f;
 
-.field private bus:I
+.field private bun:I
 
-.field public but:Lokhttp3/internal/b/c;
+.field public buo:Lokhttp3/internal/b/c;
 
-.field private buu:Z
+.field private bup:Z
 
-.field private buv:Z
+.field private buq:Z
 
-.field public buw:Lokhttp3/internal/c/c;
+.field public bur: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;->brR:Lokhttp3/j;
+    iput-object p1, p0, Lokhttp3/internal/b/g;->brM:Lokhttp3/j;
 
-    iput-object p2, p0, Lokhttp3/internal/b/g;->bsN:Lokhttp3/a;
+    iput-object p2, p0, Lokhttp3/internal/b/g;->bsI:Lokhttp3/a;
 
-    iput-object p3, p0, Lokhttp3/internal/b/g;->bui:Lokhttp3/e;
+    iput-object p3, p0, Lokhttp3/internal/b/g;->bud:Lokhttp3/e;
 
-    iput-object p4, p0, Lokhttp3/internal/b/g;->bsk:Lokhttp3/p;
+    iput-object p4, p0, Lokhttp3/internal/b/g;->bsf:Lokhttp3/p;
 
     new-instance p1, Lokhttp3/internal/b/f;
 
-    invoke-direct {p0}, Lokhttp3/internal/b/g;->Gf()Lokhttp3/internal/b/d;
+    invoke-direct {p0}, Lokhttp3/internal/b/g;->Gd()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;->bur:Lokhttp3/internal/b/f;
+    iput-object p1, p0, Lokhttp3/internal/b/g;->bum:Lokhttp3/internal/b/f;
 
-    iput-object p5, p0, Lokhttp3/internal/b/g;->buq:Ljava/lang/Object;
+    iput-object p5, p0, Lokhttp3/internal/b/g;->bul:Ljava/lang/Object;
 
     return-void
 .end method
 
-.method private Gf()Lokhttp3/internal/b/d;
+.method private Gd()Lokhttp3/internal/b/d;
     .locals 2
 
-    sget-object v0, Lokhttp3/internal/a;->bsV:Lokhttp3/internal/a;
+    sget-object v0, Lokhttp3/internal/a;->bsQ:Lokhttp3/internal/a;
 
-    iget-object v1, p0, Lokhttp3/internal/b/g;->brR:Lokhttp3/j;
+    iget-object v1, p0, Lokhttp3/internal/b/g;->brM: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;->brR:Lokhttp3/j;
+    iget-object v2, v1, Lokhttp3/internal/b/g;->brM:Lokhttp3/j;
 
     monitor-enter v2
 
@@ -113,15 +113,15 @@
 
     if-nez v0, :cond_11
 
-    iget-object v0, v1, Lokhttp3/internal/b/g;->buw:Lokhttp3/internal/c/c;
+    iget-object v0, v1, Lokhttp3/internal/b/g;->bur:Lokhttp3/internal/c/c;
 
     if-nez v0, :cond_10
 
-    iget-boolean v0, v1, Lokhttp3/internal/b/g;->buv:Z
+    iget-boolean v0, v1, Lokhttp3/internal/b/g;->buq:Z
 
     if-nez v0, :cond_f
 
-    iget-object v0, v1, Lokhttp3/internal/b/g;->but:Lokhttp3/internal/b/c;
+    iget-object v0, v1, Lokhttp3/internal/b/g;->buo: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;->bua:Z
+    iget-boolean v0, v0, Lokhttp3/internal/b/c;->btV:Z
 
     if-eqz v0, :cond_0
 
@@ -145,11 +145,11 @@
     move-object v0, v3
 
     :goto_0
-    iget-object v6, v1, Lokhttp3/internal/b/g;->but:Lokhttp3/internal/b/c;
+    iget-object v6, v1, Lokhttp3/internal/b/g;->buo:Lokhttp3/internal/b/c;
 
     if-eqz v6, :cond_1
 
-    iget-object v6, v1, Lokhttp3/internal/b/g;->but:Lokhttp3/internal/b/c;
+    iget-object v6, v1, Lokhttp3/internal/b/g;->buo:Lokhttp3/internal/b/c;
 
     goto :goto_1
 
@@ -159,19 +159,19 @@
     :goto_1
     if-nez v6, :cond_3
 
-    sget-object v7, Lokhttp3/internal/a;->bsV:Lokhttp3/internal/a;
+    sget-object v7, Lokhttp3/internal/a;->bsQ:Lokhttp3/internal/a;
 
-    iget-object v8, v1, Lokhttp3/internal/b/g;->brR:Lokhttp3/j;
+    iget-object v8, v1, Lokhttp3/internal/b/g;->brM:Lokhttp3/j;
 
-    iget-object v9, v1, Lokhttp3/internal/b/g;->bsN:Lokhttp3/a;
+    iget-object v9, v1, Lokhttp3/internal/b/g;->bsI: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;->but:Lokhttp3/internal/b/c;
+    iget-object v7, v1, Lokhttp3/internal/b/g;->buo:Lokhttp3/internal/b/c;
 
     if-eqz v7, :cond_2
 
-    iget-object v6, v1, Lokhttp3/internal/b/g;->but:Lokhttp3/internal/b/c;
+    iget-object v6, v1, Lokhttp3/internal/b/g;->buo: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;->btV:Lokhttp3/y;
+    iget-object v7, v1, Lokhttp3/internal/b/g;->btQ:Lokhttp3/y;
 
     goto :goto_2
 
@@ -204,7 +204,7 @@
     :cond_4
     if-nez v7, :cond_6
 
-    iget-object v0, v1, Lokhttp3/internal/b/g;->bup:Lokhttp3/internal/b/f$a;
+    iget-object v0, v1, Lokhttp3/internal/b/g;->buk: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;->bur:Lokhttp3/internal/b/f;
+    iget-object v0, v1, Lokhttp3/internal/b/g;->bum:Lokhttp3/internal/b/f;
 
-    invoke-virtual {v0}, Lokhttp3/internal/b/f;->Gc()Lokhttp3/internal/b/f$a;
+    invoke-virtual {v0}, Lokhttp3/internal/b/f;->Ga()Lokhttp3/internal/b/f$a;
 
     move-result-object v0
 
-    iput-object v0, v1, Lokhttp3/internal/b/g;->bup:Lokhttp3/internal/b/f$a;
+    iput-object v0, v1, Lokhttp3/internal/b/g;->buk: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;->brR:Lokhttp3/j;
+    iget-object v9, v1, Lokhttp3/internal/b/g;->brM:Lokhttp3/j;
 
     monitor-enter v9
 
     :try_start_1
-    iget-boolean v2, v1, Lokhttp3/internal/b/g;->buv:Z
+    iget-boolean v2, v1, Lokhttp3/internal/b/g;->buq:Z
 
     if-nez v2, :cond_e
 
     if-eqz v0, :cond_8
 
-    iget-object v0, v1, Lokhttp3/internal/b/g;->bup:Lokhttp3/internal/b/f$a;
+    iget-object v0, v1, Lokhttp3/internal/b/g;->buk:Lokhttp3/internal/b/f$a;
 
     new-instance v2, Ljava/util/ArrayList;
 
-    iget-object v0, v0, Lokhttp3/internal/b/f$a;->bun:Ljava/util/List;
+    iget-object v0, v0, Lokhttp3/internal/b/f$a;->bui: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;->bsV:Lokhttp3/internal/a;
+    sget-object v12, Lokhttp3/internal/a;->bsQ:Lokhttp3/internal/a;
 
-    iget-object v13, v1, Lokhttp3/internal/b/g;->brR:Lokhttp3/j;
+    iget-object v13, v1, Lokhttp3/internal/b/g;->brM:Lokhttp3/j;
 
-    iget-object v14, v1, Lokhttp3/internal/b/g;->bsN:Lokhttp3/a;
+    iget-object v14, v1, Lokhttp3/internal/b/g;->bsI: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;->but:Lokhttp3/internal/b/c;
+    iget-object v12, v1, Lokhttp3/internal/b/g;->buo:Lokhttp3/internal/b/c;
 
     if-eqz v12, :cond_7
 
-    iget-object v6, v1, Lokhttp3/internal/b/g;->but:Lokhttp3/internal/b/c;
+    iget-object v6, v1, Lokhttp3/internal/b/g;->buo:Lokhttp3/internal/b/c;
 
-    iput-object v11, v1, Lokhttp3/internal/b/g;->btV:Lokhttp3/y;
+    iput-object v11, v1, Lokhttp3/internal/b/g;->btQ:Lokhttp3/y;
 
     const/4 v8, 0x1
 
@@ -296,7 +296,7 @@
 
     if-nez v7, :cond_a
 
-    iget-object v0, v1, Lokhttp3/internal/b/g;->bup:Lokhttp3/internal/b/f$a;
+    iget-object v0, v1, Lokhttp3/internal/b/g;->buk: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;->bun:Ljava/util/List;
+    iget-object v2, v0, Lokhttp3/internal/b/f$a;->bui:Ljava/util/List;
 
-    iget v6, v0, Lokhttp3/internal/b/f$a;->buo:I
+    iget v6, v0, Lokhttp3/internal/b/f$a;->buj:I
 
     add-int/lit8 v7, v6, 0x1
 
-    iput v7, v0, Lokhttp3/internal/b/f$a;->buo:I
+    iput v7, v0, Lokhttp3/internal/b/f$a;->buj: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;->btV:Lokhttp3/y;
+    iput-object v7, v1, Lokhttp3/internal/b/g;->btQ:Lokhttp3/y;
 
-    iput v5, v1, Lokhttp3/internal/b/g;->bus:I
+    iput v5, v1, Lokhttp3/internal/b/g;->bun:I
 
     new-instance v6, Lokhttp3/internal/b/c;
 
-    iget-object v0, v1, Lokhttp3/internal/b/g;->brR:Lokhttp3/j;
+    iget-object v0, v1, Lokhttp3/internal/b/g;->brM: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;->bui:Lokhttp3/e;
+    iget-object v0, v1, Lokhttp3/internal/b/g;->bud:Lokhttp3/e;
 
-    iget-object v2, v1, Lokhttp3/internal/b/g;->bsk:Lokhttp3/p;
+    iget-object v2, v1, Lokhttp3/internal/b/g;->bsf: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;->Gf()Lokhttp3/internal/b/d;
+    invoke-direct/range {p0 .. p0}, Lokhttp3/internal/b/g;->Gd()Lokhttp3/internal/b/d;
 
     move-result-object v0
 
-    iget-object v2, v6, Lokhttp3/internal/b/c;->btV:Lokhttp3/y;
+    iget-object v2, v6, Lokhttp3/internal/b/c;->btQ:Lokhttp3/y;
 
     invoke-virtual {v0, v2}, Lokhttp3/internal/b/d;->b(Lokhttp3/y;)V
 
-    iget-object v2, v1, Lokhttp3/internal/b/g;->brR:Lokhttp3/j;
+    iget-object v2, v1, Lokhttp3/internal/b/g;->brM:Lokhttp3/j;
 
     monitor-enter v2
 
     :try_start_2
-    iput-boolean v4, v1, Lokhttp3/internal/b/g;->buu:Z
+    iput-boolean v4, v1, Lokhttp3/internal/b/g;->bup:Z
 
-    sget-object v0, Lokhttp3/internal/a;->bsV:Lokhttp3/internal/a;
+    sget-object v0, Lokhttp3/internal/a;->bsQ:Lokhttp3/internal/a;
 
-    iget-object v4, v1, Lokhttp3/internal/b/g;->brR:Lokhttp3/j;
+    iget-object v4, v1, Lokhttp3/internal/b/g;->brM: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;->Gb()Z
+    invoke-virtual {v6}, Lokhttp3/internal/b/c;->FZ()Z
 
     move-result v0
 
     if-eqz v0, :cond_d
 
-    sget-object v0, Lokhttp3/internal/a;->bsV:Lokhttp3/internal/a;
+    sget-object v0, Lokhttp3/internal/a;->bsQ:Lokhttp3/internal/a;
 
-    iget-object v3, v1, Lokhttp3/internal/b/g;->brR:Lokhttp3/j;
+    iget-object v3, v1, Lokhttp3/internal/b/g;->brM:Lokhttp3/j;
 
-    iget-object v4, v1, Lokhttp3/internal/b/g;->bsN:Lokhttp3/a;
+    iget-object v4, v1, Lokhttp3/internal/b/g;->bsI: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;->but:Lokhttp3/internal/b/c;
+    iget-object v6, v1, Lokhttp3/internal/b/g;->buo: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;->brR:Lokhttp3/j;
+    iget-object v1, p0, Lokhttp3/internal/b/g;->brM:Lokhttp3/j;
 
     monitor-enter v1
 
     :try_start_0
-    iget v2, v0, Lokhttp3/internal/b/c;->bub:I
+    iget v2, v0, Lokhttp3/internal/b/c;->btW:I
 
     if-nez v2, :cond_0
 
@@ -533,7 +533,7 @@
 
     if-nez v1, :cond_1
 
-    invoke-virtual {p0}, Lokhttp3/internal/b/g;->Gh()V
+    invoke-virtual {p0}, Lokhttp3/internal/b/g;->Gf()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;->bud:Ljava/util/List;
+    iget-object v0, p1, Lokhttp3/internal/b/c;->btY: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;->bud:Ljava/util/List;
+    iget-object v2, p1, Lokhttp3/internal/b/c;->btY: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;->bud:Ljava/util/List;
+    iget-object p1, p1, Lokhttp3/internal/b/c;->btY:Ljava/util/List;
 
     invoke-interface {p1, v1}, Ljava/util/List;->remove(I)Ljava/lang/Object;
 
@@ -612,15 +612,15 @@
 
 
 # virtual methods
-.method public final Ge()Lokhttp3/internal/c/c;
+.method public final Gc()Lokhttp3/internal/c/c;
     .locals 2
 
-    iget-object v0, p0, Lokhttp3/internal/b/g;->brR:Lokhttp3/j;
+    iget-object v0, p0, Lokhttp3/internal/b/g;->brM:Lokhttp3/j;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lokhttp3/internal/b/g;->buw:Lokhttp3/internal/c/c;
+    iget-object v1, p0, Lokhttp3/internal/b/g;->bur:Lokhttp3/internal/c/c;
 
     monitor-exit v0
 
@@ -636,13 +636,13 @@
     throw v1
 .end method
 
-.method public final declared-synchronized Gg()Lokhttp3/internal/b/c;
+.method public final declared-synchronized Ge()Lokhttp3/internal/b/c;
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lokhttp3/internal/b/g;->but:Lokhttp3/internal/b/c;
+    iget-object v0, p0, Lokhttp3/internal/b/g;->buo: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 Gh()V
+.method public final Gf()V
     .locals 3
 
-    iget-object v0, p0, Lokhttp3/internal/b/g;->brR:Lokhttp3/j;
+    iget-object v0, p0, Lokhttp3/internal/b/g;->brM:Lokhttp3/j;
 
     monitor-enter v0
 
@@ -693,14 +693,14 @@
     throw v1
 .end method
 
-.method public final Gi()Z
+.method public final Gg()Z
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/internal/b/g;->btV:Lokhttp3/y;
+    iget-object v0, p0, Lokhttp3/internal/b/g;->btQ:Lokhttp3/y;
 
     if-nez v0, :cond_2
 
-    iget-object v0, p0, Lokhttp3/internal/b/g;->bup:Lokhttp3/internal/b/f$a;
+    iget-object v0, p0, Lokhttp3/internal/b/g;->buk: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;->bur:Lokhttp3/internal/b/f;
+    iget-object v0, p0, Lokhttp3/internal/b/g;->bum: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;->Fz()I
+    invoke-interface {p2}, Lokhttp3/Interceptor$Chain;->Fx()I
 
     move-result v1
 
-    invoke-interface {p2}, Lokhttp3/Interceptor$Chain;->FA()I
+    invoke-interface {p2}, Lokhttp3/Interceptor$Chain;->Fy()I
 
     move-result v2
 
-    invoke-interface {p2}, Lokhttp3/Interceptor$Chain;->FB()I
+    invoke-interface {p2}, Lokhttp3/Interceptor$Chain;->Fz()I
 
     move-result v3
 
-    iget v4, p1, Lokhttp3/t;->brZ:I
+    iget v4, p1, Lokhttp3/t;->brU:I
 
-    iget-boolean v5, p1, Lokhttp3/t;->brU:Z
+    iget-boolean v5, p1, Lokhttp3/t;->brP:Z
 
     move-object v0, p0
 
@@ -761,34 +761,34 @@
 
     move-result-object p3
 
-    iget-object v0, p3, Lokhttp3/internal/b/c;->btY:Lokhttp3/internal/e/g;
+    iget-object v0, p3, Lokhttp3/internal/b/c;->btT:Lokhttp3/internal/e/g;
 
     if-eqz v0, :cond_0
 
     new-instance v0, Lokhttp3/internal/e/f;
 
-    iget-object p3, p3, Lokhttp3/internal/b/c;->btY:Lokhttp3/internal/e/g;
+    iget-object p3, p3, Lokhttp3/internal/b/c;->btT: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;->btX:Ljava/net/Socket;
+    iget-object v0, p3, Lokhttp3/internal/b/c;->btS:Ljava/net/Socket;
 
-    invoke-interface {p2}, Lokhttp3/Interceptor$Chain;->FA()I
+    invoke-interface {p2}, Lokhttp3/Interceptor$Chain;->Fy()I
 
     move-result v1
 
     invoke-virtual {v0, v1}, Ljava/net/Socket;->setSoTimeout(I)V
 
-    iget-object v0, p3, Lokhttp3/internal/b/c;->lY:Lokio/d;
+    iget-object v0, p3, Lokhttp3/internal/b/c;->lZ:Lokio/d;
 
     invoke-interface {v0}, Lokio/d;->timeout()Lokio/s;
 
     move-result-object v0
 
-    invoke-interface {p2}, Lokhttp3/Interceptor$Chain;->FA()I
+    invoke-interface {p2}, Lokhttp3/Interceptor$Chain;->Fy()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;->btZ:Lokio/BufferedSink;
+    iget-object v0, p3, Lokhttp3/internal/b/c;->btU:Lokio/BufferedSink;
 
     invoke-interface {v0}, Lokio/BufferedSink;->timeout()Lokio/s;
 
     move-result-object v0
 
-    invoke-interface {p2}, Lokhttp3/Interceptor$Chain;->FB()I
+    invoke-interface {p2}, Lokhttp3/Interceptor$Chain;->Fz()I
 
     move-result p2
 
@@ -816,21 +816,21 @@
 
     new-instance v0, Lokhttp3/internal/d/a;
 
-    iget-object p2, p3, Lokhttp3/internal/b/c;->lY:Lokio/d;
+    iget-object p2, p3, Lokhttp3/internal/b/c;->lZ:Lokio/d;
 
-    iget-object p3, p3, Lokhttp3/internal/b/c;->btZ:Lokio/BufferedSink;
+    iget-object p3, p3, Lokhttp3/internal/b/c;->btU: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;->brR:Lokhttp3/j;
+    iget-object p1, p0, Lokhttp3/internal/b/g;->brM: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;->buw:Lokhttp3/internal/c/c;
+    iput-object v0, p0, Lokhttp3/internal/b/g;->bur: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;->but:Lokhttp3/internal/b/c;
+    iget-object v0, p0, Lokhttp3/internal/b/g;->buo:Lokhttp3/internal/b/c;
 
     if-nez v0, :cond_0
 
-    iput-object p1, p0, Lokhttp3/internal/b/g;->but:Lokhttp3/internal/b/c;
+    iput-object p1, p0, Lokhttp3/internal/b/g;->buo:Lokhttp3/internal/b/c;
 
-    iput-boolean p2, p0, Lokhttp3/internal/b/g;->buu:Z
+    iput-boolean p2, p0, Lokhttp3/internal/b/g;->bup:Z
 
-    iget-object p1, p1, Lokhttp3/internal/b/c;->bud:Ljava/util/List;
+    iget-object p1, p1, Lokhttp3/internal/b/c;->btY:Ljava/util/List;
 
     new-instance p2, Lokhttp3/internal/b/g$a;
 
-    iget-object v0, p0, Lokhttp3/internal/b/g;->buq:Ljava/lang/Object;
+    iget-object v0, p0, Lokhttp3/internal/b/g;->bul: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;->brR:Lokhttp3/j;
+    iget-object v0, p0, Lokhttp3/internal/b/g;->brM:Lokhttp3/j;
 
     monitor-enter v0
 
     if-eqz p2, :cond_3
 
     :try_start_0
-    iget-object v1, p0, Lokhttp3/internal/b/g;->buw:Lokhttp3/internal/c/c;
+    iget-object v1, p0, Lokhttp3/internal/b/g;->bur: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;->but:Lokhttp3/internal/b/c;
+    iget-object v1, p0, Lokhttp3/internal/b/g;->buo:Lokhttp3/internal/b/c;
 
-    iget v2, v1, Lokhttp3/internal/b/c;->bub:I
+    iget v2, v1, Lokhttp3/internal/b/c;->btW:I
 
     add-int/2addr v2, p2
 
-    iput v2, v1, Lokhttp3/internal/b/c;->bub:I
+    iput v2, v1, Lokhttp3/internal/b/c;->btW:I
 
     :cond_0
     const/4 v1, 0x0
@@ -932,9 +932,9 @@
 
     if-eqz p3, :cond_1
 
-    sget-object p1, Lokhttp3/internal/a;->bsV:Lokhttp3/internal/a;
+    sget-object p1, Lokhttp3/internal/a;->bsQ:Lokhttp3/internal/a;
 
-    iget-object p2, p0, Lokhttp3/internal/b/g;->bui:Lokhttp3/e;
+    iget-object p2, p0, Lokhttp3/internal/b/g;->bud: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;->bsV:Lokhttp3/internal/a;
+    sget-object p1, Lokhttp3/internal/a;->bsQ:Lokhttp3/internal/a;
 
-    iget-object p2, p0, Lokhttp3/internal/b/g;->bui:Lokhttp3/e;
+    iget-object p2, p0, Lokhttp3/internal/b/g;->bud: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;->buw:Lokhttp3/internal/c/c;
+    iget-object v1, p0, Lokhttp3/internal/b/g;->bur: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;->buw:Lokhttp3/internal/c/c;
+    iput-object v0, p0, Lokhttp3/internal/b/g;->bur: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;->but:Lokhttp3/internal/b/c;
+    iget-object p2, p0, Lokhttp3/internal/b/g;->buo:Lokhttp3/internal/b/c;
 
     if-eqz p2, :cond_5
 
     if-eqz p1, :cond_2
 
-    iput-boolean p3, p2, Lokhttp3/internal/b/c;->bua:Z
+    iput-boolean p3, p2, Lokhttp3/internal/b/c;->btV:Z
 
     :cond_2
-    iget-object p1, p0, Lokhttp3/internal/b/g;->buw:Lokhttp3/internal/c/c;
+    iget-object p1, p0, Lokhttp3/internal/b/g;->bur: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;->but:Lokhttp3/internal/b/c;
+    iget-object p1, p0, Lokhttp3/internal/b/g;->buo:Lokhttp3/internal/b/c;
 
-    iget-boolean p1, p1, Lokhttp3/internal/b/c;->bua:Z
+    iget-boolean p1, p1, Lokhttp3/internal/b/c;->btV:Z
 
     if-eqz p1, :cond_5
 
     :cond_3
-    iget-object p1, p0, Lokhttp3/internal/b/g;->but:Lokhttp3/internal/b/c;
+    iget-object p1, p0, Lokhttp3/internal/b/g;->buo: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;->but:Lokhttp3/internal/b/c;
+    iget-object p1, p0, Lokhttp3/internal/b/g;->buo:Lokhttp3/internal/b/c;
 
-    iget-object p1, p1, Lokhttp3/internal/b/c;->bud:Ljava/util/List;
+    iget-object p1, p1, Lokhttp3/internal/b/c;->btY: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;->but:Lokhttp3/internal/b/c;
+    iget-object p1, p0, Lokhttp3/internal/b/g;->buo:Lokhttp3/internal/b/c;
 
     invoke-static {}, Ljava/lang/System;->nanoTime()J
 
     move-result-wide p2
 
-    iput-wide p2, p1, Lokhttp3/internal/b/c;->bue:J
+    iput-wide p2, p1, Lokhttp3/internal/b/c;->btZ:J
 
-    sget-object p1, Lokhttp3/internal/a;->bsV:Lokhttp3/internal/a;
+    sget-object p1, Lokhttp3/internal/a;->bsQ:Lokhttp3/internal/a;
 
-    iget-object p2, p0, Lokhttp3/internal/b/g;->brR:Lokhttp3/j;
+    iget-object p2, p0, Lokhttp3/internal/b/g;->brM:Lokhttp3/j;
 
-    iget-object p3, p0, Lokhttp3/internal/b/g;->but:Lokhttp3/internal/b/c;
+    iget-object p3, p0, Lokhttp3/internal/b/g;->buo: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;->but:Lokhttp3/internal/b/c;
+    iget-object p1, p0, Lokhttp3/internal/b/g;->buo:Lokhttp3/internal/b/c;
 
-    iget-object p1, p1, Lokhttp3/internal/b/c;->btX:Ljava/net/Socket;
+    iget-object p1, p1, Lokhttp3/internal/b/c;->btS:Ljava/net/Socket;
 
     goto :goto_0
 
@@ -1077,7 +1077,7 @@
     move-object p1, v0
 
     :goto_0
-    iput-object v0, p0, Lokhttp3/internal/b/g;->but:Lokhttp3/internal/b/c;
+    iput-object v0, p0, Lokhttp3/internal/b/g;->buo: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;->brR:Lokhttp3/j;
+    iget-object v0, p0, Lokhttp3/internal/b/g;->brM: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;->buT:Lokhttp3/internal/e/b;
+    sget-object v1, Lokhttp3/internal/e/b;->buO:Lokhttp3/internal/e/b;
 
     if-ne p1, v1, :cond_0
 
-    iget p1, p0, Lokhttp3/internal/b/g;->bus:I
+    iget p1, p0, Lokhttp3/internal/b/g;->bun:I
 
     add-int/2addr p1, v4
 
-    iput p1, p0, Lokhttp3/internal/b/g;->bus:I
+    iput p1, p0, Lokhttp3/internal/b/g;->bun:I
 
-    iget p1, p0, Lokhttp3/internal/b/g;->bus:I
+    iget p1, p0, Lokhttp3/internal/b/g;->bun:I
 
     if-le p1, v4, :cond_6
 
     goto :goto_0
 
     :cond_0
-    sget-object v1, Lokhttp3/internal/e/b;->buU:Lokhttp3/internal/e/b;
+    sget-object v1, Lokhttp3/internal/e/b;->buP:Lokhttp3/internal/e/b;
 
     if-eq p1, v1, :cond_6
 
-    iput-object v2, p0, Lokhttp3/internal/b/g;->btV:Lokhttp3/y;
+    iput-object v2, p0, Lokhttp3/internal/b/g;->btQ:Lokhttp3/y;
 
     goto :goto_1
 
     :cond_1
-    iget-object v1, p0, Lokhttp3/internal/b/g;->but:Lokhttp3/internal/b/c;
+    iget-object v1, p0, Lokhttp3/internal/b/g;->buo:Lokhttp3/internal/b/c;
 
     if-eqz v1, :cond_6
 
-    iget-object v1, p0, Lokhttp3/internal/b/g;->but:Lokhttp3/internal/b/c;
+    iget-object v1, p0, Lokhttp3/internal/b/g;->buo:Lokhttp3/internal/b/c;
 
-    invoke-virtual {v1}, Lokhttp3/internal/b/c;->Gb()Z
+    invoke-virtual {v1}, Lokhttp3/internal/b/c;->FZ()Z
 
     move-result v1
 
@@ -1153,23 +1153,23 @@
     if-eqz v1, :cond_6
 
     :cond_2
-    iget-object v1, p0, Lokhttp3/internal/b/g;->but:Lokhttp3/internal/b/c;
+    iget-object v1, p0, Lokhttp3/internal/b/g;->buo:Lokhttp3/internal/b/c;
 
-    iget v1, v1, Lokhttp3/internal/b/c;->bub:I
+    iget v1, v1, Lokhttp3/internal/b/c;->btW:I
 
     if-nez v1, :cond_5
 
-    iget-object v1, p0, Lokhttp3/internal/b/g;->btV:Lokhttp3/y;
+    iget-object v1, p0, Lokhttp3/internal/b/g;->btQ:Lokhttp3/y;
 
     if-eqz v1, :cond_4
 
     if-eqz p1, :cond_4
 
-    iget-object v1, p0, Lokhttp3/internal/b/g;->bur:Lokhttp3/internal/b/f;
+    iget-object v1, p0, Lokhttp3/internal/b/g;->bum:Lokhttp3/internal/b/f;
 
-    iget-object v5, p0, Lokhttp3/internal/b/g;->btV:Lokhttp3/y;
+    iget-object v5, p0, Lokhttp3/internal/b/g;->btQ:Lokhttp3/y;
 
-    iget-object v6, v5, Lokhttp3/y;->bnr:Ljava/net/Proxy;
+    iget-object v6, v5, Lokhttp3/y;->bnm: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;->bsN:Lokhttp3/a;
+    iget-object v6, v1, Lokhttp3/internal/b/f;->bsI:Lokhttp3/a;
 
-    iget-object v6, v6, Lokhttp3/a;->bnq:Ljava/net/ProxySelector;
+    iget-object v6, v6, Lokhttp3/a;->bnl:Ljava/net/ProxySelector;
 
     if-eqz v6, :cond_3
 
-    iget-object v6, v1, Lokhttp3/internal/b/f;->bsN:Lokhttp3/a;
+    iget-object v6, v1, Lokhttp3/internal/b/f;->bsI:Lokhttp3/a;
 
-    iget-object v6, v6, Lokhttp3/a;->bnq:Ljava/net/ProxySelector;
+    iget-object v6, v6, Lokhttp3/a;->bnl:Ljava/net/ProxySelector;
 
-    iget-object v7, v1, Lokhttp3/internal/b/f;->bsN:Lokhttp3/a;
+    iget-object v7, v1, Lokhttp3/internal/b/f;->bsI:Lokhttp3/a;
 
-    iget-object v7, v7, Lokhttp3/a;->bnk:Lokhttp3/s;
+    iget-object v7, v7, Lokhttp3/a;->bnf:Lokhttp3/s;
 
-    invoke-virtual {v7}, Lokhttp3/s;->Fn()Ljava/net/URI;
+    invoke-virtual {v7}, Lokhttp3/s;->Fl()Ljava/net/URI;
 
     move-result-object v7
 
-    iget-object v8, v5, Lokhttp3/y;->bnr:Ljava/net/Proxy;
+    iget-object v8, v5, Lokhttp3/y;->bnm: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;->bqm:Lokhttp3/internal/b/d;
+    iget-object p1, v1, Lokhttp3/internal/b/f;->bqh: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;->btV:Lokhttp3/y;
+    iput-object v2, p0, Lokhttp3/internal/b/g;->btQ: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;->brR:Lokhttp3/j;
+    iget-object v0, p0, Lokhttp3/internal/b/g;->brM:Lokhttp3/j;
 
     monitor-enter v0
 
     const/4 v1, 0x1
 
     :try_start_0
-    iput-boolean v1, p0, Lokhttp3/internal/b/g;->buv:Z
+    iput-boolean v1, p0, Lokhttp3/internal/b/g;->buq:Z
 
-    iget-object v1, p0, Lokhttp3/internal/b/g;->buw:Lokhttp3/internal/c/c;
+    iget-object v1, p0, Lokhttp3/internal/b/g;->bur:Lokhttp3/internal/c/c;
 
-    iget-object v2, p0, Lokhttp3/internal/b/g;->but:Lokhttp3/internal/b/c;
+    iget-object v2, p0, Lokhttp3/internal/b/g;->buo: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;->btW:Ljava/net/Socket;
+    iget-object v0, v2, Lokhttp3/internal/b/c;->btR: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;->brR:Lokhttp3/j;
+    iget-object v0, p0, Lokhttp3/internal/b/g;->brM:Lokhttp3/j;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lokhttp3/internal/b/g;->but:Lokhttp3/internal/b/c;
+    iget-object v1, p0, Lokhttp3/internal/b/g;->buo:Lokhttp3/internal/b/c;
 
     const/4 v2, 0x1
 
@@ -1312,7 +1312,7 @@
 
     move-result-object v2
 
-    iget-object v3, p0, Lokhttp3/internal/b/g;->but:Lokhttp3/internal/b/c;
+    iget-object v3, p0, Lokhttp3/internal/b/g;->buo:Lokhttp3/internal/b/c;
 
     const/4 v4, 0x0
 
@@ -1329,9 +1329,9 @@
 
     if-eqz v1, :cond_1
 
-    sget-object v0, Lokhttp3/internal/a;->bsV:Lokhttp3/internal/a;
+    sget-object v0, Lokhttp3/internal/a;->bsQ:Lokhttp3/internal/a;
 
-    iget-object v1, p0, Lokhttp3/internal/b/g;->bui:Lokhttp3/e;
+    iget-object v1, p0, Lokhttp3/internal/b/g;->bud: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;->Gg()Lokhttp3/internal/b/c;
+    invoke-virtual {p0}, Lokhttp3/internal/b/g;->Ge()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;->bsN:Lokhttp3/a;
+    iget-object v0, p0, Lokhttp3/internal/b/g;->bsI: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 e04614954b..d8899715f1 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 btl:Z
+.field final synthetic btg: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;->btl:Z
+    iput-boolean p2, p0, Lokhttp3/internal/c$2;->btg: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;->btl:Z
+    iget-boolean p1, p0, Lokhttp3/internal/c$2;->btg: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 d3963decea..f946490167 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;->Fx()Lokhttp3/w;
+    invoke-interface {p1}, Lokhttp3/Interceptor$Chain;->Fv()Lokhttp3/w;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokhttp3/w;->FL()Lokhttp3/w$a;
+    invoke-virtual {v0}, Lokhttp3/w;->FJ()Lokhttp3/w$a;
 
     move-result-object v1
 
-    iget-object v2, v0, Lokhttp3/w;->brI:Lokhttp3/RequestBody;
+    iget-object v2, v0, Lokhttp3/w;->brD:Lokhttp3/RequestBody;
 
     const-string v3, "Content-Type"
 
@@ -101,7 +101,7 @@
 
     if-nez v7, :cond_3
 
-    iget-object v7, v0, Lokhttp3/w;->bnk:Lokhttp3/s;
+    iget-object v7, v0, Lokhttp3/w;->bnf: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;->bnk:Lokhttp3/s;
+    iget-object v10, v0, Lokhttp3/w;->bnf: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;->FN()Lokhttp3/w;
+    invoke-virtual {v1}, Lokhttp3/w$a;->FL()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;->bnk:Lokhttp3/s;
+    iget-object v7, v0, Lokhttp3/w;->bnf:Lokhttp3/s;
 
-    iget-object v8, p1, Lokhttp3/Response;->brH:Lokhttp3/Headers;
+    iget-object v8, p1, Lokhttp3/Response;->brC:Lokhttp3/Headers;
 
     invoke-static {v1, v7, v8}, Lokhttp3/internal/c/e;->a(Lokhttp3/m;Lokhttp3/s;Lokhttp3/Headers;)V
 
-    invoke-virtual {p1}, Lokhttp3/Response;->FO()Lokhttp3/Response$a;
+    invoke-virtual {p1}, Lokhttp3/Response;->FM()Lokhttp3/Response$a;
 
     move-result-object v1
 
-    iput-object v0, v1, Lokhttp3/Response$a;->bsA:Lokhttp3/w;
+    iput-object v0, v1, Lokhttp3/Response$a;->bsv:Lokhttp3/w;
 
     if-eqz v2, :cond_a
 
@@ -272,17 +272,17 @@
 
     new-instance v2, Lokio/h;
 
-    iget-object v7, p1, Lokhttp3/Response;->bsD:Lokhttp3/x;
+    iget-object v7, p1, Lokhttp3/Response;->bsy:Lokhttp3/x;
 
-    invoke-virtual {v7}, Lokhttp3/x;->FQ()Lokio/d;
+    invoke-virtual {v7}, Lokhttp3/x;->FO()Lokio/d;
 
     move-result-object v7
 
     invoke-direct {v2, v7}, Lokio/h;-><init>(Lokio/r;)V
 
-    iget-object v7, p1, Lokhttp3/Response;->brH:Lokhttp3/Headers;
+    iget-object v7, p1, Lokhttp3/Response;->brC:Lokhttp3/Headers;
 
-    invoke-virtual {v7}, Lokhttp3/Headers;->Fl()Lokhttp3/Headers$a;
+    invoke-virtual {v7}, Lokhttp3/Headers;->Fj()Lokhttp3/Headers$a;
 
     move-result-object v7
 
@@ -294,7 +294,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokhttp3/Headers$a;->Fm()Lokhttp3/Headers;
+    invoke-virtual {v0}, Lokhttp3/Headers$a;->Fk()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;->bsD:Lokhttp3/x;
+    iput-object v0, v1, Lokhttp3/Response$a;->bsy:Lokhttp3/x;
 
     :cond_a
-    invoke-virtual {v1}, Lokhttp3/Response$a;->FP()Lokhttp3/Response;
+    invoke-virtual {v1}, Lokhttp3/Response$a;->FN()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 4370fdb7cf..dc49a83ff0 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 bux:J
+.field bus: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;->bux:J
+    iget-wide v0, p0, Lokhttp3/internal/c/b$a;->bus:J
 
     add-long/2addr v0, p2
 
-    iput-wide v0, p0, Lokhttp3/internal/c/b$a;->bux:J
+    iput-wide v0, p0, Lokhttp3/internal/c/b$a;->bus: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 e34666243c..9b0bb10468 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 bsm:Z
+.field private final bsh:Z
 
 
 # direct methods
@@ -24,7 +24,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-boolean p1, p0, Lokhttp3/internal/c/b;->bsm:Z
+    iput-boolean p1, p0, Lokhttp3/internal/c/b;->bsh:Z
 
     return-void
 .end method
@@ -41,15 +41,15 @@
 
     check-cast p1, Lokhttp3/internal/c/g;
 
-    iget-object v0, p1, Lokhttp3/internal/c/g;->buE:Lokhttp3/internal/c/c;
+    iget-object v0, p1, Lokhttp3/internal/c/g;->buz:Lokhttp3/internal/c/c;
 
-    iget-object v1, p1, Lokhttp3/internal/c/g;->buD:Lokhttp3/internal/b/g;
+    iget-object v1, p1, Lokhttp3/internal/c/g;->buy:Lokhttp3/internal/b/g;
 
-    iget-object v2, p1, Lokhttp3/internal/c/g;->but:Lokhttp3/internal/b/c;
+    iget-object v2, p1, Lokhttp3/internal/c/g;->buo:Lokhttp3/internal/b/c;
 
     check-cast v2, Lokhttp3/internal/b/c;
 
-    iget-object p1, p1, Lokhttp3/internal/c/g;->bsA:Lokhttp3/w;
+    iget-object p1, p1, Lokhttp3/internal/c/g;->bsv: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;->bsq:Ljava/lang/String;
+    iget-object v5, p1, Lokhttp3/w;->bsl: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;->brI:Lokhttp3/RequestBody;
+    iget-object v5, p1, Lokhttp3/w;->brD:Lokhttp3/RequestBody;
 
     if-eqz v5, :cond_2
 
@@ -85,7 +85,7 @@
 
     if-eqz v5, :cond_0
 
-    invoke-interface {v0}, Lokhttp3/internal/c/c;->Gj()V
+    invoke-interface {v0}, Lokhttp3/internal/c/c;->Gh()V
 
     const/4 v5, 0x1
 
@@ -96,7 +96,7 @@
     :cond_0
     if-nez v6, :cond_1
 
-    iget-object v2, p1, Lokhttp3/w;->brI:Lokhttp3/RequestBody;
+    iget-object v2, p1, Lokhttp3/w;->brD:Lokhttp3/RequestBody;
 
     invoke-virtual {v2}, Lokhttp3/RequestBody;->contentLength()J
 
@@ -114,7 +114,7 @@
 
     move-result-object v2
 
-    iget-object v5, p1, Lokhttp3/w;->brI:Lokhttp3/RequestBody;
+    iget-object v5, p1, Lokhttp3/w;->brD: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;->Gb()Z
+    invoke-virtual {v2}, Lokhttp3/internal/b/c;->FZ()Z
 
     move-result v2
 
     if-nez v2, :cond_2
 
-    invoke-virtual {v1}, Lokhttp3/internal/b/g;->Gh()V
+    invoke-virtual {v1}, Lokhttp3/internal/b/g;->Gf()V
 
     :cond_2
     :goto_0
-    invoke-interface {v0}, Lokhttp3/internal/c/c;->Gk()V
+    invoke-interface {v0}, Lokhttp3/internal/c/c;->Gi()V
 
     const/4 v2, 0x0
 
@@ -144,25 +144,25 @@
     move-result-object v6
 
     :cond_3
-    iput-object p1, v6, Lokhttp3/Response$a;->bsA:Lokhttp3/w;
+    iput-object p1, v6, Lokhttp3/Response$a;->bsv:Lokhttp3/w;
 
-    invoke-virtual {v1}, Lokhttp3/internal/b/g;->Gg()Lokhttp3/internal/b/c;
+    invoke-virtual {v1}, Lokhttp3/internal/b/g;->Ge()Lokhttp3/internal/b/c;
 
     move-result-object v5
 
-    iget-object v5, v5, Lokhttp3/internal/b/c;->bsC:Lokhttp3/r;
+    iget-object v5, v5, Lokhttp3/internal/b/c;->bsx:Lokhttp3/r;
 
-    iput-object v5, v6, Lokhttp3/Response$a;->bsC:Lokhttp3/r;
+    iput-object v5, v6, Lokhttp3/Response$a;->bsx:Lokhttp3/r;
 
-    iput-wide v3, v6, Lokhttp3/Response$a;->bsH:J
+    iput-wide v3, v6, Lokhttp3/Response$a;->bsC:J
 
     invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
 
     move-result-wide v7
 
-    iput-wide v7, v6, Lokhttp3/Response$a;->bsI:J
+    iput-wide v7, v6, Lokhttp3/Response$a;->bsD:J
 
-    invoke-virtual {v6}, Lokhttp3/Response$a;->FP()Lokhttp3/Response;
+    invoke-virtual {v6}, Lokhttp3/Response$a;->FN()Lokhttp3/Response;
 
     move-result-object v5
 
@@ -176,32 +176,32 @@
 
     move-result-object v2
 
-    iput-object p1, v2, Lokhttp3/Response$a;->bsA:Lokhttp3/w;
+    iput-object p1, v2, Lokhttp3/Response$a;->bsv:Lokhttp3/w;
 
-    invoke-virtual {v1}, Lokhttp3/internal/b/g;->Gg()Lokhttp3/internal/b/c;
+    invoke-virtual {v1}, Lokhttp3/internal/b/g;->Ge()Lokhttp3/internal/b/c;
 
     move-result-object p1
 
-    iget-object p1, p1, Lokhttp3/internal/b/c;->bsC:Lokhttp3/r;
+    iget-object p1, p1, Lokhttp3/internal/b/c;->bsx:Lokhttp3/r;
 
-    iput-object p1, v2, Lokhttp3/Response$a;->bsC:Lokhttp3/r;
+    iput-object p1, v2, Lokhttp3/Response$a;->bsx:Lokhttp3/r;
 
-    iput-wide v3, v2, Lokhttp3/Response$a;->bsH:J
+    iput-wide v3, v2, Lokhttp3/Response$a;->bsC:J
 
     invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
 
     move-result-wide v3
 
-    iput-wide v3, v2, Lokhttp3/Response$a;->bsI:J
+    iput-wide v3, v2, Lokhttp3/Response$a;->bsD:J
 
-    invoke-virtual {v2}, Lokhttp3/Response$a;->FP()Lokhttp3/Response;
+    invoke-virtual {v2}, Lokhttp3/Response$a;->FN()Lokhttp3/Response;
 
     move-result-object v5
 
     iget v6, v5, Lokhttp3/Response;->code:I
 
     :cond_4
-    iget-boolean p1, p0, Lokhttp3/internal/c/b;->bsm:Z
+    iget-boolean p1, p0, Lokhttp3/internal/c/b;->bsh:Z
 
     if-eqz p1, :cond_5
 
@@ -209,22 +209,22 @@
 
     if-ne v6, p1, :cond_5
 
-    invoke-virtual {v5}, Lokhttp3/Response;->FO()Lokhttp3/Response$a;
+    invoke-virtual {v5}, Lokhttp3/Response;->FM()Lokhttp3/Response$a;
 
     move-result-object p1
 
-    sget-object v0, Lokhttp3/internal/c;->bsX:Lokhttp3/x;
+    sget-object v0, Lokhttp3/internal/c;->bsS:Lokhttp3/x;
 
-    iput-object v0, p1, Lokhttp3/Response$a;->bsD:Lokhttp3/x;
+    iput-object v0, p1, Lokhttp3/Response$a;->bsy:Lokhttp3/x;
 
-    invoke-virtual {p1}, Lokhttp3/Response$a;->FP()Lokhttp3/Response;
+    invoke-virtual {p1}, Lokhttp3/Response$a;->FN()Lokhttp3/Response;
 
     move-result-object p1
 
     goto :goto_1
 
     :cond_5
-    invoke-virtual {v5}, Lokhttp3/Response;->FO()Lokhttp3/Response$a;
+    invoke-virtual {v5}, Lokhttp3/Response;->FM()Lokhttp3/Response$a;
 
     move-result-object p1
 
@@ -232,14 +232,14 @@
 
     move-result-object v0
 
-    iput-object v0, p1, Lokhttp3/Response$a;->bsD:Lokhttp3/x;
+    iput-object v0, p1, Lokhttp3/Response$a;->bsy:Lokhttp3/x;
 
-    invoke-virtual {p1}, Lokhttp3/Response$a;->FP()Lokhttp3/Response;
+    invoke-virtual {p1}, Lokhttp3/Response$a;->FN()Lokhttp3/Response;
 
     move-result-object p1
 
     :goto_1
-    iget-object v0, p1, Lokhttp3/Response;->bsA:Lokhttp3/w;
+    iget-object v0, p1, Lokhttp3/Response;->bsv:Lokhttp3/w;
 
     const-string v2, "Connection"
 
@@ -266,7 +266,7 @@
     if-eqz v0, :cond_7
 
     :cond_6
-    invoke-virtual {v1}, Lokhttp3/internal/b/g;->Gh()V
+    invoke-virtual {v1}, Lokhttp3/internal/b/g;->Gf()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;->bsD:Lokhttp3/x;
+    iget-object v0, p1, Lokhttp3/Response;->bsy: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;->bsD:Lokhttp3/x;
+    iget-object p1, p1, Lokhttp3/Response;->bsy: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 f5c71d9147..494ad20bb9 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 Gj()V
+.method public abstract Gh()V
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -12,7 +12,7 @@
     .end annotation
 .end method
 
-.method public abstract Gk()V
+.method public abstract Gi()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 7383c99dd8..dd7e317cbf 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;->bti:Ljava/util/TimeZone;
+    sget-object v1, Lokhttp3/internal/c;->btd: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 68885967ed..fb7b402455 100644
--- a/com.discord/smali_classes2/okhttp3/internal/c/d.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/c/d.smali
@@ -4,9 +4,7 @@
 
 
 # static fields
-.field private static final buA:[Ljava/text/DateFormat;
-
-.field private static final buy:Ljava/lang/ThreadLocal;
+.field private static final but:Ljava/lang/ThreadLocal;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/ThreadLocal<",
@@ -16,7 +14,9 @@
     .end annotation
 .end field
 
-.field private static final buz:[Ljava/lang/String;
+.field private static final buu:[Ljava/lang/String;
+
+.field private static final buv:[Ljava/text/DateFormat;
 
 
 # direct methods
@@ -27,7 +27,7 @@
 
     invoke-direct {v0}, Lokhttp3/internal/c/d$1;-><init>()V
 
-    sput-object v0, Lokhttp3/internal/c/d;->buy:Ljava/lang/ThreadLocal;
+    sput-object v0, Lokhttp3/internal/c/d;->but:Ljava/lang/ThreadLocal;
 
     const/16 v0, 0xf
 
@@ -123,11 +123,11 @@
 
     aput-object v3, v1, v2
 
-    sput-object v1, Lokhttp3/internal/c/d;->buz:[Ljava/lang/String;
+    sput-object v1, Lokhttp3/internal/c/d;->buu:[Ljava/lang/String;
 
     new-array v0, v0, [Ljava/text/DateFormat;
 
-    sput-object v0, Lokhttp3/internal/c/d;->buA:[Ljava/text/DateFormat;
+    sput-object v0, Lokhttp3/internal/c/d;->buv:[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;->buy:Ljava/lang/ThreadLocal;
+    sget-object v0, Lokhttp3/internal/c/d;->but: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;->buy:Ljava/lang/ThreadLocal;
+    sget-object v3, Lokhttp3/internal/c/d;->but: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;->buz:[Ljava/lang/String;
+    sget-object v3, Lokhttp3/internal/c/d;->buu:[Ljava/lang/String;
 
     monitor-enter v3
 
     :try_start_0
-    sget-object v4, Lokhttp3/internal/c/d;->buz:[Ljava/lang/String;
+    sget-object v4, Lokhttp3/internal/c/d;->buu:[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;->buA:[Ljava/text/DateFormat;
+    sget-object v6, Lokhttp3/internal/c/d;->buv:[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;->buz:[Ljava/lang/String;
+    sget-object v7, Lokhttp3/internal/c/d;->buu:[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;->bti:Ljava/util/TimeZone;
+    sget-object v7, Lokhttp3/internal/c;->btd:Ljava/util/TimeZone;
 
     invoke-virtual {v6, v7}, Ljava/text/DateFormat;->setTimeZone(Ljava/util/TimeZone;)V
 
-    sget-object v7, Lokhttp3/internal/c/d;->buA:[Ljava/text/DateFormat;
+    sget-object v7, Lokhttp3/internal/c/d;->buv:[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 243f498d70..76333e6de7 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 buB:Lokio/ByteString;
+.field private static final buw:Lokio/ByteString;
 
-.field private static final buC:Lokio/ByteString;
+.field private static final bux:Lokio/ByteString;
 
 
 # direct methods
@@ -19,7 +19,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/internal/c/e;->buB:Lokio/ByteString;
+    sput-object v0, Lokhttp3/internal/c/e;->buw:Lokio/ByteString;
 
     const-string v0, "\t ,="
 
@@ -27,7 +27,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/internal/c/e;->buC:Lokio/ByteString;
+    sput-object v0, Lokhttp3/internal/c/e;->bux: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;->bqJ:Lokhttp3/m;
+    sget-object v0, Lokhttp3/m;->bqE: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;->brH:Lokhttp3/Headers;
+    iget-object p0, p0, Lokhttp3/Response;->brC: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;->bsA:Lokhttp3/w;
+    iget-object v0, p0, Lokhttp3/Response;->bsv:Lokhttp3/w;
 
-    iget-object v0, v0, Lokhttp3/w;->bsq:Ljava/lang/String;
+    iget-object v0, v0, Lokhttp3/w;->bsl: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 dedba8c9df..f78e3a6604 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 brM:Ljava/util/List;
+.field private final brH:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -17,25 +17,25 @@
     .end annotation
 .end field
 
-.field private final brW:I
+.field private final brR:I
 
-.field private final brX:I
+.field private final brS:I
 
-.field private final brY:I
+.field private final brT:I
 
-.field public final bsA:Lokhttp3/w;
+.field final bsf:Lokhttp3/p;
 
-.field final bsk:Lokhttp3/p;
+.field public final bsv:Lokhttp3/w;
 
-.field public final buD:Lokhttp3/internal/b/g;
+.field private buA:I
 
-.field final buE:Lokhttp3/internal/c/c;
+.field final bud:Lokhttp3/e;
 
-.field private buF:I
+.field final buo:Lokhttp3/internal/b/c;
 
-.field final bui:Lokhttp3/e;
+.field public final buy:Lokhttp3/internal/b/g;
 
-.field final but:Lokhttp3/internal/b/c;
+.field final buz:Lokhttp3/internal/c/c;
 
 .field private final index:I
 
@@ -62,69 +62,69 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/internal/c/g;->brM:Ljava/util/List;
+    iput-object p1, p0, Lokhttp3/internal/c/g;->brH:Ljava/util/List;
 
-    iput-object p4, p0, Lokhttp3/internal/c/g;->but:Lokhttp3/internal/b/c;
+    iput-object p4, p0, Lokhttp3/internal/c/g;->buo:Lokhttp3/internal/b/c;
 
-    iput-object p2, p0, Lokhttp3/internal/c/g;->buD:Lokhttp3/internal/b/g;
+    iput-object p2, p0, Lokhttp3/internal/c/g;->buy:Lokhttp3/internal/b/g;
 
-    iput-object p3, p0, Lokhttp3/internal/c/g;->buE:Lokhttp3/internal/c/c;
+    iput-object p3, p0, Lokhttp3/internal/c/g;->buz:Lokhttp3/internal/c/c;
 
     iput p5, p0, Lokhttp3/internal/c/g;->index:I
 
-    iput-object p6, p0, Lokhttp3/internal/c/g;->bsA:Lokhttp3/w;
+    iput-object p6, p0, Lokhttp3/internal/c/g;->bsv:Lokhttp3/w;
 
-    iput-object p7, p0, Lokhttp3/internal/c/g;->bui:Lokhttp3/e;
+    iput-object p7, p0, Lokhttp3/internal/c/g;->bud:Lokhttp3/e;
 
-    iput-object p8, p0, Lokhttp3/internal/c/g;->bsk:Lokhttp3/p;
+    iput-object p8, p0, Lokhttp3/internal/c/g;->bsf:Lokhttp3/p;
 
-    iput p9, p0, Lokhttp3/internal/c/g;->brW:I
+    iput p9, p0, Lokhttp3/internal/c/g;->brR:I
 
-    iput p10, p0, Lokhttp3/internal/c/g;->brX:I
+    iput p10, p0, Lokhttp3/internal/c/g;->brS:I
 
-    iput p11, p0, Lokhttp3/internal/c/g;->brY:I
+    iput p11, p0, Lokhttp3/internal/c/g;->brT:I
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final FA()I
+.method public final Fv()Lokhttp3/w;
     .locals 1
 
-    iget v0, p0, Lokhttp3/internal/c/g;->brX:I
-
-    return v0
-.end method
-
-.method public final FB()I
-    .locals 1
-
-    iget v0, p0, Lokhttp3/internal/c/g;->brY:I
-
-    return v0
-.end method
-
-.method public final Fx()Lokhttp3/w;
-    .locals 1
-
-    iget-object v0, p0, Lokhttp3/internal/c/g;->bsA:Lokhttp3/w;
+    iget-object v0, p0, Lokhttp3/internal/c/g;->bsv:Lokhttp3/w;
 
     return-object v0
 .end method
 
-.method public final Fy()Lokhttp3/i;
+.method public final Fw()Lokhttp3/i;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/internal/c/g;->but:Lokhttp3/internal/b/c;
+    iget-object v0, p0, Lokhttp3/internal/c/g;->buo:Lokhttp3/internal/b/c;
 
     return-object v0
 .end method
 
+.method public final Fx()I
+    .locals 1
+
+    iget v0, p0, Lokhttp3/internal/c/g;->brR:I
+
+    return v0
+.end method
+
+.method public final Fy()I
+    .locals 1
+
+    iget v0, p0, Lokhttp3/internal/c/g;->brS:I
+
+    return v0
+.end method
+
 .method public final Fz()I
     .locals 1
 
-    iget v0, p0, Lokhttp3/internal/c/g;->brW:I
+    iget v0, p0, Lokhttp3/internal/c/g;->brT: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;->brM:Ljava/util/List;
+    iget-object v2, v0, Lokhttp3/internal/c/g;->brH: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;->buF:I
+    iget v1, v0, Lokhttp3/internal/c/g;->buA:I
 
     const/4 v2, 0x1
 
     add-int/2addr v1, v2
 
-    iput v1, v0, Lokhttp3/internal/c/g;->buF:I
+    iput v1, v0, Lokhttp3/internal/c/g;->buA:I
 
-    iget-object v1, v0, Lokhttp3/internal/c/g;->buE:Lokhttp3/internal/c/c;
+    iget-object v1, v0, Lokhttp3/internal/c/g;->buz:Lokhttp3/internal/c/c;
 
     const-string v3, "network interceptor "
 
     if-eqz v1, :cond_1
 
-    iget-object v1, v0, Lokhttp3/internal/c/g;->but:Lokhttp3/internal/b/c;
+    iget-object v1, v0, Lokhttp3/internal/c/g;->buo:Lokhttp3/internal/b/c;
 
     move-object/from16 v10, p1
 
-    iget-object v4, v10, Lokhttp3/w;->bnk:Lokhttp3/s;
+    iget-object v4, v10, Lokhttp3/w;->bnf: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;->brM:Ljava/util/List;
+    iget-object v3, v0, Lokhttp3/internal/c/g;->brH: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;->buE:Lokhttp3/internal/c/c;
+    iget-object v1, v0, Lokhttp3/internal/c/g;->buz:Lokhttp3/internal/c/c;
 
     const-string v15, " must call proceed() exactly once"
 
     if-eqz v1, :cond_3
 
-    iget v1, v0, Lokhttp3/internal/c/g;->buF:I
+    iget v1, v0, Lokhttp3/internal/c/g;->buA: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;->brM:Ljava/util/List;
+    iget-object v3, v0, Lokhttp3/internal/c/g;->brH: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;->brM:Ljava/util/List;
+    iget-object v5, v0, Lokhttp3/internal/c/g;->brH: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;->bui:Lokhttp3/e;
+    iget-object v11, v0, Lokhttp3/internal/c/g;->bud:Lokhttp3/e;
 
-    iget-object v12, v0, Lokhttp3/internal/c/g;->bsk:Lokhttp3/p;
+    iget-object v12, v0, Lokhttp3/internal/c/g;->bsf:Lokhttp3/p;
 
-    iget v13, v0, Lokhttp3/internal/c/g;->brW:I
+    iget v13, v0, Lokhttp3/internal/c/g;->brR:I
 
-    iget v14, v0, Lokhttp3/internal/c/g;->brX:I
+    iget v14, v0, Lokhttp3/internal/c/g;->brS:I
 
-    iget v8, v0, Lokhttp3/internal/c/g;->brY:I
+    iget v8, v0, Lokhttp3/internal/c/g;->brT: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;->brM:Ljava/util/List;
+    iget-object v4, v0, Lokhttp3/internal/c/g;->brH: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;->brM:Ljava/util/List;
+    iget-object v7, v0, Lokhttp3/internal/c/g;->brH: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;->buF:I
+    iget v1, v1, Lokhttp3/internal/c/g;->buA:I
 
     if-ne v1, v2, :cond_4
 
@@ -352,7 +352,7 @@
 
     if-eqz v5, :cond_7
 
-    iget-object v2, v5, Lokhttp3/Response;->bsD:Lokhttp3/x;
+    iget-object v2, v5, Lokhttp3/Response;->bsy:Lokhttp3/x;
 
     if-eqz v2, :cond_6
 
@@ -416,11 +416,11 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/c/g;->buD:Lokhttp3/internal/b/g;
+    iget-object v0, p0, Lokhttp3/internal/c/g;->buy:Lokhttp3/internal/b/g;
 
-    iget-object v1, p0, Lokhttp3/internal/c/g;->buE:Lokhttp3/internal/c/c;
+    iget-object v1, p0, Lokhttp3/internal/c/g;->buz:Lokhttp3/internal/c/c;
 
-    iget-object v2, p0, Lokhttp3/internal/c/g;->but:Lokhttp3/internal/b/c;
+    iget-object v2, p0, Lokhttp3/internal/c/g;->buo: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 a300bd7361..0a6dff59f4 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;->Fr()Ljava/lang/String;
+    invoke-virtual {p0}, Lokhttp3/s;->Fp()Ljava/lang/String;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lokhttp3/s;->Ft()Ljava/lang/String;
+    invoke-virtual {p0}, Lokhttp3/s;->Fr()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 c121efa0d1..298a572664 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 bsh:Lokhttp3/t;
+.field private final bsc:Lokhttp3/t;
 
-.field private final bsm:Z
+.field private final bsh:Z
 
-.field public volatile buD:Lokhttp3/internal/b/g;
+.field public bul:Ljava/lang/Object;
 
-.field public buq:Ljava/lang/Object;
+.field public volatile buq:Z
 
-.field public volatile buv:Z
+.field public volatile buy:Lokhttp3/internal/b/g;
 
 
 # direct methods
@@ -24,9 +24,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/internal/c/j;->bsh:Lokhttp3/t;
+    iput-object p1, p0, Lokhttp3/internal/c/j;->bsc:Lokhttp3/t;
 
-    iput-boolean p2, p0, Lokhttp3/internal/c/j;->bsm:Z
+    iput-boolean p2, p0, Lokhttp3/internal/c/j;->bsh: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;->bsh:Lokhttp3/t;
+    iget-object v0, p0, Lokhttp3/internal/c/j;->bsc:Lokhttp3/t;
 
-    iget-boolean v0, v0, Lokhttp3/t;->brU:Z
+    iget-boolean v0, v0, Lokhttp3/t;->brP:Z
 
     const/4 v1, 0x0
 
@@ -87,7 +87,7 @@
     :cond_0
     if-eqz p3, :cond_1
 
-    iget-object p4, p4, Lokhttp3/w;->brI:Lokhttp3/RequestBody;
+    iget-object p4, p4, Lokhttp3/w;->brD: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;->Gi()Z
+    invoke-virtual {p2}, Lokhttp3/internal/b/g;->Gg()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;->bsA:Lokhttp3/w;
+    iget-object p0, p0, Lokhttp3/Response;->bsv:Lokhttp3/w;
 
-    iget-object p0, p0, Lokhttp3/w;->bnk:Lokhttp3/s;
+    iget-object p0, p0, Lokhttp3/w;->bnf:Lokhttp3/s;
 
-    iget-object v0, p0, Lokhttp3/s;->brg:Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/s;->brb:Ljava/lang/String;
 
-    iget-object v1, p1, Lokhttp3/s;->brg:Ljava/lang/String;
+    iget-object v1, p1, Lokhttp3/s;->brb: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;->brf:Ljava/lang/String;
+    iget-object p0, p0, Lokhttp3/s;->bra:Ljava/lang/String;
 
-    iget-object p1, p1, Lokhttp3/s;->brf:Ljava/lang/String;
+    iget-object p1, p1, Lokhttp3/s;->bra: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;->Fo()Z
+    invoke-virtual/range {p1 .. p1}, Lokhttp3/s;->Fm()Z
 
     move-result v2
 
@@ -232,17 +232,17 @@
 
     if-eqz v2, :cond_0
 
-    iget-object v2, v0, Lokhttp3/internal/c/j;->bsh:Lokhttp3/t;
+    iget-object v2, v0, Lokhttp3/internal/c/j;->bsc:Lokhttp3/t;
 
     iget-object v3, v2, Lokhttp3/t;->sslSocketFactory:Ljavax/net/ssl/SSLSocketFactory;
 
-    iget-object v2, v0, Lokhttp3/internal/c/j;->bsh:Lokhttp3/t;
+    iget-object v2, v0, Lokhttp3/internal/c/j;->bsc:Lokhttp3/t;
 
-    iget-object v2, v2, Lokhttp3/t;->bns:Ljavax/net/ssl/HostnameVerifier;
+    iget-object v2, v2, Lokhttp3/t;->bnn:Ljavax/net/ssl/HostnameVerifier;
 
-    iget-object v4, v0, Lokhttp3/internal/c/j;->bsh:Lokhttp3/t;
+    iget-object v4, v0, Lokhttp3/internal/c/j;->bsc:Lokhttp3/t;
 
-    iget-object v4, v4, Lokhttp3/t;->bnt:Lokhttp3/g;
+    iget-object v4, v4, Lokhttp3/t;->bno:Lokhttp3/g;
 
     move-object v11, v2
 
@@ -262,37 +262,37 @@
     :goto_0
     new-instance v2, Lokhttp3/a;
 
-    iget-object v6, v1, Lokhttp3/s;->brg:Ljava/lang/String;
+    iget-object v6, v1, Lokhttp3/s;->brb:Ljava/lang/String;
 
     iget v7, v1, Lokhttp3/s;->port:I
 
-    iget-object v1, v0, Lokhttp3/internal/c/j;->bsh:Lokhttp3/t;
+    iget-object v1, v0, Lokhttp3/internal/c/j;->bsc:Lokhttp3/t;
 
-    iget-object v8, v1, Lokhttp3/t;->bnl:Lokhttp3/o;
+    iget-object v8, v1, Lokhttp3/t;->bng:Lokhttp3/o;
 
-    iget-object v1, v0, Lokhttp3/internal/c/j;->bsh:Lokhttp3/t;
+    iget-object v1, v0, Lokhttp3/internal/c/j;->bsc:Lokhttp3/t;
 
-    iget-object v9, v1, Lokhttp3/t;->bnm:Ljavax/net/SocketFactory;
+    iget-object v9, v1, Lokhttp3/t;->bnh:Ljavax/net/SocketFactory;
 
-    iget-object v1, v0, Lokhttp3/internal/c/j;->bsh:Lokhttp3/t;
+    iget-object v1, v0, Lokhttp3/internal/c/j;->bsc:Lokhttp3/t;
 
-    iget-object v13, v1, Lokhttp3/t;->bnn:Lokhttp3/b;
+    iget-object v13, v1, Lokhttp3/t;->bni:Lokhttp3/b;
 
-    iget-object v1, v0, Lokhttp3/internal/c/j;->bsh:Lokhttp3/t;
+    iget-object v1, v0, Lokhttp3/internal/c/j;->bsc:Lokhttp3/t;
 
-    iget-object v14, v1, Lokhttp3/t;->bnr:Ljava/net/Proxy;
+    iget-object v14, v1, Lokhttp3/t;->bnm:Ljava/net/Proxy;
 
-    iget-object v1, v0, Lokhttp3/internal/c/j;->bsh:Lokhttp3/t;
+    iget-object v1, v0, Lokhttp3/internal/c/j;->bsc:Lokhttp3/t;
 
-    iget-object v15, v1, Lokhttp3/t;->bno:Ljava/util/List;
+    iget-object v15, v1, Lokhttp3/t;->bnj:Ljava/util/List;
 
-    iget-object v1, v0, Lokhttp3/internal/c/j;->bsh:Lokhttp3/t;
+    iget-object v1, v0, Lokhttp3/internal/c/j;->bsc:Lokhttp3/t;
 
-    iget-object v1, v1, Lokhttp3/t;->bnp:Ljava/util/List;
+    iget-object v1, v1, Lokhttp3/t;->bnk:Ljava/util/List;
 
-    iget-object v3, v0, Lokhttp3/internal/c/j;->bsh:Lokhttp3/t;
+    iget-object v3, v0, Lokhttp3/internal/c/j;->bsc:Lokhttp3/t;
 
-    iget-object v3, v3, Lokhttp3/t;->bnq:Ljava/net/ProxySelector;
+    iget-object v3, v3, Lokhttp3/t;->bnl:Ljava/net/ProxySelector;
 
     move-object v5, v2
 
@@ -312,9 +312,9 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lokhttp3/internal/c/j;->buv:Z
+    iput-boolean v0, p0, Lokhttp3/internal/c/j;->buq:Z
 
-    iget-object v0, p0, Lokhttp3/internal/c/j;->buD:Lokhttp3/internal/b/g;
+    iget-object v0, p0, Lokhttp3/internal/c/j;->buy: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;->Fx()Lokhttp3/w;
+    invoke-interface/range {p1 .. p1}, Lokhttp3/Interceptor$Chain;->Fv()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;->bui:Lokhttp3/e;
+    iget-object v10, v3, Lokhttp3/internal/c/g;->bud:Lokhttp3/e;
 
-    iget-object v11, v3, Lokhttp3/internal/c/g;->bsk:Lokhttp3/p;
+    iget-object v11, v3, Lokhttp3/internal/c/g;->bsf:Lokhttp3/p;
 
     new-instance v12, Lokhttp3/internal/b/g;
 
-    iget-object v4, v1, Lokhttp3/internal/c/j;->bsh:Lokhttp3/t;
+    iget-object v4, v1, Lokhttp3/internal/c/j;->bsc:Lokhttp3/t;
 
-    iget-object v5, v4, Lokhttp3/t;->brR:Lokhttp3/j;
+    iget-object v5, v4, Lokhttp3/t;->brM:Lokhttp3/j;
 
-    iget-object v4, v0, Lokhttp3/w;->bnk:Lokhttp3/s;
+    iget-object v4, v0, Lokhttp3/w;->bnf: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;->buq:Ljava/lang/Object;
+    iget-object v9, v1, Lokhttp3/internal/c/j;->bul: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;->buD:Lokhttp3/internal/b/g;
+    iput-object v12, v1, Lokhttp3/internal/c/j;->buy: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;->buv:Z
+    iget-boolean v0, v1, Lokhttp3/internal/c/j;->buq:Z
 
     if-nez v0, :cond_1a
 
@@ -400,27 +400,27 @@
 
     if-eqz v5, :cond_1
 
-    invoke-virtual {v0}, Lokhttp3/Response;->FO()Lokhttp3/Response$a;
+    invoke-virtual {v0}, Lokhttp3/Response;->FM()Lokhttp3/Response$a;
 
     move-result-object v0
 
-    invoke-virtual {v5}, Lokhttp3/Response;->FO()Lokhttp3/Response$a;
+    invoke-virtual {v5}, Lokhttp3/Response;->FM()Lokhttp3/Response$a;
 
     move-result-object v4
 
-    iput-object v14, v4, Lokhttp3/Response$a;->bsD:Lokhttp3/x;
+    iput-object v14, v4, Lokhttp3/Response$a;->bsy:Lokhttp3/x;
 
-    invoke-virtual {v4}, Lokhttp3/Response$a;->FP()Lokhttp3/Response;
+    invoke-virtual {v4}, Lokhttp3/Response$a;->FN()Lokhttp3/Response;
 
     move-result-object v4
 
-    iget-object v5, v4, Lokhttp3/Response;->bsD:Lokhttp3/x;
+    iget-object v5, v4, Lokhttp3/Response;->bsy:Lokhttp3/x;
 
     if-nez v5, :cond_0
 
-    iput-object v4, v0, Lokhttp3/Response$a;->bsG:Lokhttp3/Response;
+    iput-object v4, v0, Lokhttp3/Response$a;->bsB:Lokhttp3/Response;
 
-    invoke-virtual {v0}, Lokhttp3/Response$a;->FP()Lokhttp3/Response;
+    invoke-virtual {v0}, Lokhttp3/Response$a;->FN()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;->btV:Lokhttp3/y;
+    iget-object v4, v12, Lokhttp3/internal/b/g;->btQ:Lokhttp3/y;
 
     if-eqz v0, :cond_16
 
     iget v5, v0, Lokhttp3/Response;->code:I
 
-    iget-object v8, v0, Lokhttp3/Response;->bsA:Lokhttp3/w;
+    iget-object v8, v0, Lokhttp3/Response;->bsv:Lokhttp3/w;
 
-    iget-object v8, v8, Lokhttp3/w;->bsq:Ljava/lang/String;
+    iget-object v8, v8, Lokhttp3/w;->bsl: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;->bsh:Lokhttp3/t;
+    iget-object v5, v1, Lokhttp3/internal/c/j;->bsc:Lokhttp3/t;
 
-    iget-boolean v5, v5, Lokhttp3/t;->brU:Z
+    iget-boolean v5, v5, Lokhttp3/t;->brP:Z
 
     if-eqz v5, :cond_10
 
-    iget-object v5, v0, Lokhttp3/Response;->bsA:Lokhttp3/w;
+    iget-object v5, v0, Lokhttp3/Response;->bsv:Lokhttp3/w;
 
-    iget-object v5, v5, Lokhttp3/w;->brI:Lokhttp3/RequestBody;
+    iget-object v5, v5, Lokhttp3/w;->brD:Lokhttp3/RequestBody;
 
     instance-of v5, v5, Lokhttp3/internal/c/l;
 
     if-nez v5, :cond_10
 
-    iget-object v5, v0, Lokhttp3/Response;->bsG:Lokhttp3/Response;
+    iget-object v5, v0, Lokhttp3/Response;->bsB:Lokhttp3/Response;
 
     if-eqz v5, :cond_3
 
-    iget-object v5, v0, Lokhttp3/Response;->bsG:Lokhttp3/Response;
+    iget-object v5, v0, Lokhttp3/Response;->bsB:Lokhttp3/Response;
 
     iget v5, v5, Lokhttp3/Response;->code:I
 
@@ -513,21 +513,21 @@
 
     if-gtz v4, :cond_10
 
-    iget-object v4, v0, Lokhttp3/Response;->bsA:Lokhttp3/w;
+    iget-object v4, v0, Lokhttp3/Response;->bsv:Lokhttp3/w;
 
     goto :goto_3
 
     :cond_4
     if-eqz v4, :cond_5
 
-    iget-object v4, v4, Lokhttp3/y;->bnr:Ljava/net/Proxy;
+    iget-object v4, v4, Lokhttp3/y;->bnm:Ljava/net/Proxy;
 
     goto :goto_2
 
     :cond_5
-    iget-object v4, v1, Lokhttp3/internal/c/j;->bsh:Lokhttp3/t;
+    iget-object v4, v1, Lokhttp3/internal/c/j;->bsc:Lokhttp3/t;
 
-    iget-object v4, v4, Lokhttp3/t;->bnr:Ljava/net/Proxy;
+    iget-object v4, v4, Lokhttp3/t;->bnm: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;->bsG:Lokhttp3/Response;
+    iget-object v4, v0, Lokhttp3/Response;->bsB:Lokhttp3/Response;
 
     if-eqz v4, :cond_8
 
-    iget-object v4, v0, Lokhttp3/Response;->bsG:Lokhttp3/Response;
+    iget-object v4, v0, Lokhttp3/Response;->bsB:Lokhttp3/Response;
 
     iget v4, v4, Lokhttp3/Response;->code:I
 
@@ -569,7 +569,7 @@
 
     if-nez v4, :cond_10
 
-    iget-object v4, v0, Lokhttp3/Response;->bsA:Lokhttp3/w;
+    iget-object v4, v0, Lokhttp3/Response;->bsv:Lokhttp3/w;
 
     :goto_3
     move-object v15, v4
@@ -593,9 +593,9 @@
 
     :cond_a
     :pswitch_0
-    iget-object v4, v1, Lokhttp3/internal/c/j;->bsh:Lokhttp3/t;
+    iget-object v4, v1, Lokhttp3/internal/c/j;->bsc:Lokhttp3/t;
 
-    iget-boolean v4, v4, Lokhttp3/t;->brT:Z
+    iget-boolean v4, v4, Lokhttp3/t;->brO:Z
 
     if-eqz v4, :cond_10
 
@@ -607,9 +607,9 @@
 
     if-eqz v4, :cond_10
 
-    iget-object v5, v0, Lokhttp3/Response;->bsA:Lokhttp3/w;
+    iget-object v5, v0, Lokhttp3/Response;->bsv:Lokhttp3/w;
 
-    iget-object v5, v5, Lokhttp3/w;->bnk:Lokhttp3/s;
+    iget-object v5, v5, Lokhttp3/w;->bnf: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;->brf:Ljava/lang/String;
+    iget-object v5, v4, Lokhttp3/s;->bra:Ljava/lang/String;
 
-    iget-object v9, v0, Lokhttp3/Response;->bsA:Lokhttp3/w;
+    iget-object v9, v0, Lokhttp3/Response;->bsv:Lokhttp3/w;
 
-    iget-object v9, v9, Lokhttp3/w;->bnk:Lokhttp3/s;
+    iget-object v9, v9, Lokhttp3/w;->bnf:Lokhttp3/s;
 
-    iget-object v9, v9, Lokhttp3/s;->brf:Ljava/lang/String;
+    iget-object v9, v9, Lokhttp3/s;->bra: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;->bsh:Lokhttp3/t;
+    iget-object v5, v1, Lokhttp3/internal/c/j;->bsc:Lokhttp3/t;
 
-    iget-boolean v5, v5, Lokhttp3/t;->brS:Z
+    iget-boolean v5, v5, Lokhttp3/t;->brN:Z
 
     if-eqz v5, :cond_10
 
     :cond_b
-    iget-object v5, v0, Lokhttp3/Response;->bsA:Lokhttp3/w;
+    iget-object v5, v0, Lokhttp3/Response;->bsv:Lokhttp3/w;
 
-    invoke-virtual {v5}, Lokhttp3/w;->FL()Lokhttp3/w$a;
+    invoke-virtual {v5}, Lokhttp3/w;->FJ()Lokhttp3/w$a;
 
     move-result-object v5
 
@@ -669,9 +669,9 @@
     :cond_c
     if-eqz v9, :cond_d
 
-    iget-object v7, v0, Lokhttp3/Response;->bsA:Lokhttp3/w;
+    iget-object v7, v0, Lokhttp3/Response;->bsv:Lokhttp3/w;
 
-    iget-object v7, v7, Lokhttp3/w;->brI:Lokhttp3/RequestBody;
+    iget-object v7, v7, Lokhttp3/w;->brD:Lokhttp3/RequestBody;
 
     goto :goto_4
 
@@ -712,7 +712,7 @@
 
     move-result-object v4
 
-    invoke-virtual {v4}, Lokhttp3/w$a;->FN()Lokhttp3/w;
+    invoke-virtual {v4}, Lokhttp3/w$a;->FL()Lokhttp3/w;
 
     move-result-object v4
     :try_end_2
@@ -732,7 +732,7 @@
     return-object v0
 
     :cond_11
-    iget-object v4, v0, Lokhttp3/Response;->bsD:Lokhttp3/x;
+    iget-object v4, v0, Lokhttp3/Response;->bsy: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;->brI:Lokhttp3/RequestBody;
+    iget-object v4, v15, Lokhttp3/w;->brD:Lokhttp3/RequestBody;
 
     instance-of v4, v4, Lokhttp3/internal/c/l;
 
     if-nez v4, :cond_14
 
-    iget-object v4, v15, Lokhttp3/w;->bnk:Lokhttp3/s;
+    iget-object v4, v15, Lokhttp3/w;->bnf: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;->bsh:Lokhttp3/t;
+    iget-object v4, v1, Lokhttp3/internal/c/j;->bsc:Lokhttp3/t;
 
-    iget-object v5, v4, Lokhttp3/t;->brR:Lokhttp3/j;
+    iget-object v5, v4, Lokhttp3/t;->brM:Lokhttp3/j;
 
-    iget-object v4, v15, Lokhttp3/w;->bnk:Lokhttp3/s;
+    iget-object v4, v15, Lokhttp3/w;->bnf: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;->buq:Ljava/lang/Object;
+    iget-object v8, v1, Lokhttp3/internal/c/j;->bul: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;->buD:Lokhttp3/internal/b/g;
+    iput-object v12, v1, Lokhttp3/internal/c/j;->buy:Lokhttp3/internal/b/g;
 
     goto :goto_8
 
     :cond_12
     move/from16 v17, v9
 
-    invoke-virtual {v12}, Lokhttp3/internal/b/g;->Ge()Lokhttp3/internal/c/c;
+    invoke-virtual {v12}, Lokhttp3/internal/b/g;->Gc()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 278b5aa5b3..265292cade 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 bsB:Lokhttp3/u;
+.field public final bsw: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;->bsB:Lokhttp3/u;
+    iput-object p1, p0, Lokhttp3/internal/c/k;->bsw: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;->bsa:Lokhttp3/u;
+    sget-object v0, Lokhttp3/u;->brV:Lokhttp3/u;
 
     goto :goto_0
 
@@ -83,7 +83,7 @@
 
     if-ne v0, v5, :cond_1
 
-    sget-object v0, Lokhttp3/u;->bsb:Lokhttp3/u;
+    sget-object v0, Lokhttp3/u;->brW:Lokhttp3/u;
 
     goto :goto_0
 
@@ -126,7 +126,7 @@
 
     if-eqz v0, :cond_7
 
-    sget-object v0, Lokhttp3/u;->bsa:Lokhttp3/u;
+    sget-object v0, Lokhttp3/u;->brV: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;->bsB:Lokhttp3/u;
+    iget-object v1, p0, Lokhttp3/internal/c/k;->bsw:Lokhttp3/u;
 
-    sget-object v2, Lokhttp3/u;->bsa:Lokhttp3/u;
+    sget-object v2, Lokhttp3/u;->brV: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 6bba73f186..c4dc43d075 100644
--- a/com.discord/smali_classes2/okhttp3/internal/d/a$a.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/d/a$a.smali
@@ -18,11 +18,11 @@
 
 
 # instance fields
-.field protected final buI:Lokio/g;
+.field protected final buD:Lokio/g;
 
-.field protected buJ:J
+.field protected buE:J
 
-.field final synthetic buK:Lokhttp3/internal/d/a;
+.field final synthetic buF: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;->buK:Lokhttp3/internal/d/a;
+    iput-object p1, p0, Lokhttp3/internal/d/a$a;->buF: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;->buK:Lokhttp3/internal/d/a;
+    iget-object v0, p0, Lokhttp3/internal/d/a$a;->buF:Lokhttp3/internal/d/a;
 
-    iget-object v0, v0, Lokhttp3/internal/d/a;->lY:Lokio/d;
+    iget-object v0, v0, Lokhttp3/internal/d/a;->lZ: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;->buI:Lokio/g;
+    iput-object p1, p0, Lokhttp3/internal/d/a$a;->buD:Lokio/g;
 
     const-wide/16 v0, 0x0
 
-    iput-wide v0, p0, Lokhttp3/internal/d/a$a;->buJ:J
+    iput-wide v0, p0, Lokhttp3/internal/d/a$a;->buE:J
 
     return-void
 .end method
@@ -75,9 +75,9 @@
     .end annotation
 
     :try_start_0
-    iget-object v0, p0, Lokhttp3/internal/d/a$a;->buK:Lokhttp3/internal/d/a;
+    iget-object v0, p0, Lokhttp3/internal/d/a$a;->buF:Lokhttp3/internal/d/a;
 
-    iget-object v0, v0, Lokhttp3/internal/d/a;->lY:Lokio/d;
+    iget-object v0, v0, Lokhttp3/internal/d/a;->lZ: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;->buJ:J
+    iget-wide v0, p0, Lokhttp3/internal/d/a$a;->buE:J
 
     add-long/2addr v0, p1
 
-    iput-wide v0, p0, Lokhttp3/internal/d/a$a;->buJ:J
+    iput-wide v0, p0, Lokhttp3/internal/d/a$a;->buE: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;->buK:Lokhttp3/internal/d/a;
+    iget-object v0, p0, Lokhttp3/internal/d/a$a;->buF: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;->buK:Lokhttp3/internal/d/a;
+    iget-object v0, p0, Lokhttp3/internal/d/a$a;->buF: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;->buI:Lokio/g;
+    iget-object v0, p0, Lokhttp3/internal/d/a$a;->buD:Lokio/g;
 
     invoke-static {v0}, Lokhttp3/internal/d/a;->a(Lokio/g;)V
 
-    iget-object v0, p0, Lokhttp3/internal/d/a$a;->buK:Lokhttp3/internal/d/a;
+    iget-object v0, p0, Lokhttp3/internal/d/a$a;->buF:Lokhttp3/internal/d/a;
 
     iput v1, v0, Lokhttp3/internal/d/a;->state:I
 
-    iget-object v0, v0, Lokhttp3/internal/d/a;->buD:Lokhttp3/internal/b/g;
+    iget-object v0, v0, Lokhttp3/internal/d/a;->buy:Lokhttp3/internal/b/g;
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lokhttp3/internal/d/a$a;->buK:Lokhttp3/internal/d/a;
+    iget-object v0, p0, Lokhttp3/internal/d/a$a;->buF:Lokhttp3/internal/d/a;
 
-    iget-object v0, v0, Lokhttp3/internal/d/a;->buD:Lokhttp3/internal/b/g;
+    iget-object v0, v0, Lokhttp3/internal/d/a;->buy:Lokhttp3/internal/b/g;
 
     xor-int/lit8 p1, p1, 0x1
 
-    iget-object v1, p0, Lokhttp3/internal/d/a$a;->buK:Lokhttp3/internal/d/a;
+    iget-object v1, p0, Lokhttp3/internal/d/a$a;->buF: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;->buK:Lokhttp3/internal/d/a;
+    iget-object v0, p0, Lokhttp3/internal/d/a$a;->buF: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;->buI:Lokio/g;
+    iget-object v0, p0, Lokhttp3/internal/d/a$a;->buD: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 45be91b732..86b9dbcf22 100644
--- a/com.discord/smali_classes2/okhttp3/internal/d/a$b.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/d/a$b.smali
@@ -18,9 +18,9 @@
 
 
 # instance fields
-.field private final buI:Lokio/g;
+.field private final buD:Lokio/g;
 
-.field final synthetic buK:Lokhttp3/internal/d/a;
+.field final synthetic buF: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;->buK:Lokhttp3/internal/d/a;
+    iput-object p1, p0, Lokhttp3/internal/d/a$b;->buF: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;->buK:Lokhttp3/internal/d/a;
+    iget-object v0, p0, Lokhttp3/internal/d/a$b;->buF:Lokhttp3/internal/d/a;
 
-    iget-object v0, v0, Lokhttp3/internal/d/a;->btZ:Lokio/BufferedSink;
+    iget-object v0, v0, Lokhttp3/internal/d/a;->btU: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;->buI:Lokio/g;
+    iput-object p1, p0, Lokhttp3/internal/d/a$b;->buD: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;->buK:Lokhttp3/internal/d/a;
+    iget-object v0, p0, Lokhttp3/internal/d/a$b;->buF:Lokhttp3/internal/d/a;
 
-    iget-object v0, v0, Lokhttp3/internal/d/a;->btZ:Lokio/BufferedSink;
+    iget-object v0, v0, Lokhttp3/internal/d/a;->btU: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;->buI:Lokio/g;
+    iget-object v0, p0, Lokhttp3/internal/d/a$b;->buD:Lokio/g;
 
     invoke-static {v0}, Lokhttp3/internal/d/a;->a(Lokio/g;)V
 
-    iget-object v0, p0, Lokhttp3/internal/d/a$b;->buK:Lokhttp3/internal/d/a;
+    iget-object v0, p0, Lokhttp3/internal/d/a$b;->buF: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;->buK:Lokhttp3/internal/d/a;
+    iget-object v0, p0, Lokhttp3/internal/d/a$b;->buF:Lokhttp3/internal/d/a;
 
-    iget-object v0, v0, Lokhttp3/internal/d/a;->btZ:Lokio/BufferedSink;
+    iget-object v0, v0, Lokhttp3/internal/d/a;->btU: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;->buI:Lokio/g;
+    iget-object v0, p0, Lokhttp3/internal/d/a$b;->buD:Lokio/g;
 
     return-object v0
 .end method
@@ -183,29 +183,29 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/internal/d/a$b;->buK:Lokhttp3/internal/d/a;
+    iget-object v0, p0, Lokhttp3/internal/d/a$b;->buF:Lokhttp3/internal/d/a;
 
-    iget-object v0, v0, Lokhttp3/internal/d/a;->btZ:Lokio/BufferedSink;
+    iget-object v0, v0, Lokhttp3/internal/d/a;->btU:Lokio/BufferedSink;
 
     invoke-interface {v0, p2, p3}, Lokio/BufferedSink;->aE(J)Lokio/BufferedSink;
 
-    iget-object v0, p0, Lokhttp3/internal/d/a$b;->buK:Lokhttp3/internal/d/a;
+    iget-object v0, p0, Lokhttp3/internal/d/a$b;->buF:Lokhttp3/internal/d/a;
 
-    iget-object v0, v0, Lokhttp3/internal/d/a;->btZ:Lokio/BufferedSink;
+    iget-object v0, v0, Lokhttp3/internal/d/a;->btU: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;->buK:Lokhttp3/internal/d/a;
+    iget-object v0, p0, Lokhttp3/internal/d/a$b;->buF:Lokhttp3/internal/d/a;
 
-    iget-object v0, v0, Lokhttp3/internal/d/a;->btZ:Lokio/BufferedSink;
+    iget-object v0, v0, Lokhttp3/internal/d/a;->btU:Lokio/BufferedSink;
 
     invoke-interface {v0, p1, p2, p3}, Lokio/BufferedSink;->write(Lokio/c;J)V
 
-    iget-object p1, p0, Lokhttp3/internal/d/a$b;->buK:Lokhttp3/internal/d/a;
+    iget-object p1, p0, Lokhttp3/internal/d/a$b;->buF:Lokhttp3/internal/d/a;
 
-    iget-object p1, p1, Lokhttp3/internal/d/a;->btZ:Lokio/BufferedSink;
+    iget-object p1, p1, Lokhttp3/internal/d/a;->btU: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 7ced78cdf5..9403a0bb6f 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 bnk:Lokhttp3/s;
+.field private final bnf:Lokhttp3/s;
 
-.field final synthetic buK:Lokhttp3/internal/d/a;
+.field final synthetic buF:Lokhttp3/internal/d/a;
 
-.field private buL:J
+.field private buG:J
 
-.field private buM:Z
+.field private buH:Z
 
 
 # direct methods
 .method constructor <init>(Lokhttp3/internal/d/a;Lokhttp3/s;)V
     .locals 2
 
-    iput-object p1, p0, Lokhttp3/internal/d/a$c;->buK:Lokhttp3/internal/d/a;
+    iput-object p1, p0, Lokhttp3/internal/d/a$c;->buF: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;->buL:J
+    iput-wide v0, p0, Lokhttp3/internal/d/a$c;->buG:J
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lokhttp3/internal/d/a$c;->buM:Z
+    iput-boolean p1, p0, Lokhttp3/internal/d/a$c;->buH:Z
 
-    iput-object p2, p0, Lokhttp3/internal/d/a$c;->bnk:Lokhttp3/s;
+    iput-object p2, p0, Lokhttp3/internal/d/a$c;->bnf:Lokhttp3/s;
 
     return-void
 .end method
@@ -67,7 +67,7 @@
 
     if-nez v2, :cond_8
 
-    iget-boolean v2, p0, Lokhttp3/internal/d/a$c;->buM:Z
+    iget-boolean v2, p0, Lokhttp3/internal/d/a$c;->buH:Z
 
     const-wide/16 v3, -0x1
 
@@ -76,7 +76,7 @@
     return-wide v3
 
     :cond_0
-    iget-wide v5, p0, Lokhttp3/internal/d/a$c;->buL:J
+    iget-wide v5, p0, Lokhttp3/internal/d/a$c;->buG: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;->buL:J
+    iget-wide v5, p0, Lokhttp3/internal/d/a$c;->buG:J
 
     cmp-long v7, v5, v3
 
     if-eqz v7, :cond_2
 
-    iget-object v5, p0, Lokhttp3/internal/d/a$c;->buK:Lokhttp3/internal/d/a;
+    iget-object v5, p0, Lokhttp3/internal/d/a$c;->buF:Lokhttp3/internal/d/a;
 
-    iget-object v5, v5, Lokhttp3/internal/d/a;->lY:Lokio/d;
+    iget-object v5, v5, Lokhttp3/internal/d/a;->lZ:Lokio/d;
 
-    invoke-interface {v5}, Lokio/d;->Hp()Ljava/lang/String;
+    invoke-interface {v5}, Lokio/d;->Hn()Ljava/lang/String;
 
     :cond_2
     :try_start_0
-    iget-object v5, p0, Lokhttp3/internal/d/a$c;->buK:Lokhttp3/internal/d/a;
+    iget-object v5, p0, Lokhttp3/internal/d/a$c;->buF:Lokhttp3/internal/d/a;
 
-    iget-object v5, v5, Lokhttp3/internal/d/a;->lY:Lokio/d;
+    iget-object v5, v5, Lokhttp3/internal/d/a;->lZ:Lokio/d;
 
-    invoke-interface {v5}, Lokio/d;->Hn()J
+    invoke-interface {v5}, Lokio/d;->Hl()J
 
     move-result-wide v5
 
-    iput-wide v5, p0, Lokhttp3/internal/d/a$c;->buL:J
+    iput-wide v5, p0, Lokhttp3/internal/d/a$c;->buG:J
 
-    iget-object v5, p0, Lokhttp3/internal/d/a$c;->buK:Lokhttp3/internal/d/a;
+    iget-object v5, p0, Lokhttp3/internal/d/a$c;->buF:Lokhttp3/internal/d/a;
 
-    iget-object v5, v5, Lokhttp3/internal/d/a;->lY:Lokio/d;
+    iget-object v5, v5, Lokhttp3/internal/d/a;->lZ:Lokio/d;
 
-    invoke-interface {v5}, Lokio/d;->Hp()Ljava/lang/String;
+    invoke-interface {v5}, Lokio/d;->Hn()Ljava/lang/String;
 
     move-result-object v5
 
@@ -125,7 +125,7 @@
 
     move-result-object v5
 
-    iget-wide v6, p0, Lokhttp3/internal/d/a$c;->buL:J
+    iget-wide v6, p0, Lokhttp3/internal/d/a$c;->buG: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;->buL:J
+    iget-wide v5, p0, Lokhttp3/internal/d/a$c;->buG:J
 
     cmp-long v7, v5, v0
 
     if-nez v7, :cond_4
 
-    iput-boolean v2, p0, Lokhttp3/internal/d/a$c;->buM:Z
+    iput-boolean v2, p0, Lokhttp3/internal/d/a$c;->buH:Z
 
-    iget-object v0, p0, Lokhttp3/internal/d/a$c;->buK:Lokhttp3/internal/d/a;
+    iget-object v0, p0, Lokhttp3/internal/d/a$c;->buF:Lokhttp3/internal/d/a;
 
-    iget-object v0, v0, Lokhttp3/internal/d/a;->bsh:Lokhttp3/t;
+    iget-object v0, v0, Lokhttp3/internal/d/a;->bsc:Lokhttp3/t;
 
     iget-object v0, v0, Lokhttp3/t;->cookieJar:Lokhttp3/m;
 
-    iget-object v1, p0, Lokhttp3/internal/d/a$c;->bnk:Lokhttp3/s;
+    iget-object v1, p0, Lokhttp3/internal/d/a$c;->bnf:Lokhttp3/s;
 
-    iget-object v5, p0, Lokhttp3/internal/d/a$c;->buK:Lokhttp3/internal/d/a;
+    iget-object v5, p0, Lokhttp3/internal/d/a$c;->buF:Lokhttp3/internal/d/a;
 
-    invoke-virtual {v5}, Lokhttp3/internal/d/a;->Gm()Lokhttp3/Headers;
+    invoke-virtual {v5}, Lokhttp3/internal/d/a;->Gk()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;->buM:Z
+    iget-boolean v0, p0, Lokhttp3/internal/d/a$c;->buH:Z
 
     if-nez v0, :cond_5
 
     return-wide v3
 
     :cond_5
-    iget-wide v0, p0, Lokhttp3/internal/d/a$c;->buL:J
+    iget-wide v0, p0, Lokhttp3/internal/d/a$c;->buG: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;->buL:J
+    iget-wide v0, p0, Lokhttp3/internal/d/a$c;->buG:J
 
     sub-long/2addr v0, p1
 
-    iput-wide v0, p0, Lokhttp3/internal/d/a$c;->buL:J
+    iput-wide v0, p0, Lokhttp3/internal/d/a$c;->buG: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;->buL:J
+    iget-wide v0, p0, Lokhttp3/internal/d/a$c;->buG: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;->buM:Z
+    iget-boolean v0, p0, Lokhttp3/internal/d/a$c;->buH: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 602ac1d38a..84de2f8e06 100644
--- a/com.discord/smali_classes2/okhttp3/internal/d/a$d.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/d/a$d.smali
@@ -18,11 +18,11 @@
 
 
 # instance fields
-.field private final buI:Lokio/g;
+.field private final buD:Lokio/g;
 
-.field final synthetic buK:Lokhttp3/internal/d/a;
+.field final synthetic buF:Lokhttp3/internal/d/a;
 
-.field private buN:J
+.field private buI: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;->buK:Lokhttp3/internal/d/a;
+    iput-object p1, p0, Lokhttp3/internal/d/a$d;->buF: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;->buK:Lokhttp3/internal/d/a;
+    iget-object v0, p0, Lokhttp3/internal/d/a$d;->buF:Lokhttp3/internal/d/a;
 
-    iget-object v0, v0, Lokhttp3/internal/d/a;->btZ:Lokio/BufferedSink;
+    iget-object v0, v0, Lokhttp3/internal/d/a;->btU: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;->buI:Lokio/g;
+    iput-object p1, p0, Lokhttp3/internal/d/a$d;->buD:Lokio/g;
 
-    iput-wide p2, p0, Lokhttp3/internal/d/a$d;->buN:J
+    iput-wide p2, p0, Lokhttp3/internal/d/a$d;->buI: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;->buN:J
+    iget-wide v0, p0, Lokhttp3/internal/d/a$d;->buI:J
 
     const-wide/16 v2, 0x0
 
@@ -83,11 +83,11 @@
 
     if-gtz v4, :cond_1
 
-    iget-object v0, p0, Lokhttp3/internal/d/a$d;->buI:Lokio/g;
+    iget-object v0, p0, Lokhttp3/internal/d/a$d;->buD:Lokio/g;
 
     invoke-static {v0}, Lokhttp3/internal/d/a;->a(Lokio/g;)V
 
-    iget-object v0, p0, Lokhttp3/internal/d/a$d;->buK:Lokhttp3/internal/d/a;
+    iget-object v0, p0, Lokhttp3/internal/d/a$d;->buF: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;->buK:Lokhttp3/internal/d/a;
+    iget-object v0, p0, Lokhttp3/internal/d/a$d;->buF:Lokhttp3/internal/d/a;
 
-    iget-object v0, v0, Lokhttp3/internal/d/a;->btZ:Lokio/BufferedSink;
+    iget-object v0, v0, Lokhttp3/internal/d/a;->btU: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;->buI:Lokio/g;
+    iget-object v0, p0, Lokhttp3/internal/d/a$d;->buD: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;->buN:J
+    iget-wide v0, p0, Lokhttp3/internal/d/a$d;->buI:J
 
     cmp-long v2, p2, v0
 
     if-gtz v2, :cond_0
 
-    iget-object v0, p0, Lokhttp3/internal/d/a$d;->buK:Lokhttp3/internal/d/a;
+    iget-object v0, p0, Lokhttp3/internal/d/a$d;->buF:Lokhttp3/internal/d/a;
 
-    iget-object v0, v0, Lokhttp3/internal/d/a;->btZ:Lokio/BufferedSink;
+    iget-object v0, v0, Lokhttp3/internal/d/a;->btU:Lokio/BufferedSink;
 
     invoke-interface {v0, p1, p2, p3}, Lokio/BufferedSink;->write(Lokio/c;J)V
 
-    iget-wide v0, p0, Lokhttp3/internal/d/a$d;->buN:J
+    iget-wide v0, p0, Lokhttp3/internal/d/a$d;->buI:J
 
     sub-long/2addr v0, p2
 
-    iput-wide v0, p0, Lokhttp3/internal/d/a$d;->buN:J
+    iput-wide v0, p0, Lokhttp3/internal/d/a$d;->buI: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;->buN:J
+    iget-wide v1, p0, Lokhttp3/internal/d/a$d;->buI: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 46da952c89..deb5815051 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 buK:Lokhttp3/internal/d/a;
+.field final synthetic buF:Lokhttp3/internal/d/a;
 
-.field private buN:J
+.field private buI:J
 
 
 # direct methods
@@ -29,15 +29,15 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lokhttp3/internal/d/a$e;->buK:Lokhttp3/internal/d/a;
+    iput-object p1, p0, Lokhttp3/internal/d/a$e;->buF: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;->buN:J
+    iput-wide p2, p0, Lokhttp3/internal/d/a$e;->buI:J
 
-    iget-wide p1, p0, Lokhttp3/internal/d/a$e;->buN:J
+    iget-wide p1, p0, Lokhttp3/internal/d/a$e;->buI:J
 
     const-wide/16 v0, 0x0
 
@@ -75,7 +75,7 @@
 
     if-nez v2, :cond_3
 
-    iget-wide v2, p0, Lokhttp3/internal/d/a$e;->buN:J
+    iget-wide v2, p0, Lokhttp3/internal/d/a$e;->buI:J
 
     const-wide/16 v4, -0x1
 
@@ -98,13 +98,13 @@
 
     if-eqz p3, :cond_2
 
-    iget-wide v2, p0, Lokhttp3/internal/d/a$e;->buN:J
+    iget-wide v2, p0, Lokhttp3/internal/d/a$e;->buI:J
 
     sub-long/2addr v2, p1
 
-    iput-wide v2, p0, Lokhttp3/internal/d/a$e;->buN:J
+    iput-wide v2, p0, Lokhttp3/internal/d/a$e;->buI:J
 
-    iget-wide v2, p0, Lokhttp3/internal/d/a$e;->buN:J
+    iget-wide v2, p0, Lokhttp3/internal/d/a$e;->buI:J
 
     cmp-long p3, v2, v0
 
@@ -174,7 +174,7 @@
     return-void
 
     :cond_0
-    iget-wide v0, p0, Lokhttp3/internal/d/a$e;->buN:J
+    iget-wide v0, p0, Lokhttp3/internal/d/a$e;->buI: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 60bc5ae82c..42343937e6 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 buK:Lokhttp3/internal/d/a;
+.field final synthetic buF:Lokhttp3/internal/d/a;
 
-.field private buO:Z
+.field private buJ:Z
 
 
 # direct methods
 .method constructor <init>(Lokhttp3/internal/d/a;)V
     .locals 1
 
-    iput-object p1, p0, Lokhttp3/internal/d/a$f;->buK:Lokhttp3/internal/d/a;
+    iput-object p1, p0, Lokhttp3/internal/d/a$f;->buF: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;->buO:Z
+    iget-boolean v0, p0, Lokhttp3/internal/d/a$f;->buJ:Z
 
     const-wide/16 v1, -0x1
 
@@ -72,7 +72,7 @@
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lokhttp3/internal/d/a$f;->buO:Z
+    iput-boolean p1, p0, Lokhttp3/internal/d/a$f;->buJ:Z
 
     const/4 p2, 0x0
 
@@ -125,7 +125,7 @@
     return-void
 
     :cond_0
-    iget-boolean v0, p0, Lokhttp3/internal/d/a$f;->buO:Z
+    iget-boolean v0, p0, Lokhttp3/internal/d/a$f;->buJ: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 5c746dcfac..076f37ae13 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 bsh:Lokhttp3/t;
+.field final bsc:Lokhttp3/t;
 
-.field final btZ:Lokio/BufferedSink;
+.field final btU:Lokio/BufferedSink;
 
-.field final buD:Lokhttp3/internal/b/g;
+.field private buC:J
 
-.field private buH:J
+.field final buy:Lokhttp3/internal/b/g;
 
-.field final lY:Lokio/d;
+.field final lZ:Lokio/d;
 
 .field state:I
 
@@ -45,20 +45,20 @@
 
     const-wide/32 v0, 0x40000
 
-    iput-wide v0, p0, Lokhttp3/internal/d/a;->buH:J
+    iput-wide v0, p0, Lokhttp3/internal/d/a;->buC:J
 
-    iput-object p1, p0, Lokhttp3/internal/d/a;->bsh:Lokhttp3/t;
+    iput-object p1, p0, Lokhttp3/internal/d/a;->bsc:Lokhttp3/t;
 
-    iput-object p2, p0, Lokhttp3/internal/d/a;->buD:Lokhttp3/internal/b/g;
+    iput-object p2, p0, Lokhttp3/internal/d/a;->buy:Lokhttp3/internal/b/g;
 
-    iput-object p3, p0, Lokhttp3/internal/d/a;->lY:Lokio/d;
+    iput-object p3, p0, Lokhttp3/internal/d/a;->lZ:Lokio/d;
 
-    iput-object p4, p0, Lokhttp3/internal/d/a;->btZ:Lokio/BufferedSink;
+    iput-object p4, p0, Lokhttp3/internal/d/a;->btU:Lokio/BufferedSink;
 
     return-void
 .end method
 
-.method private Gl()Ljava/lang/String;
+.method private Gj()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;->lY:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/d/a;->lZ:Lokio/d;
 
-    iget-wide v1, p0, Lokhttp3/internal/d/a;->buH:J
+    iget-wide v1, p0, Lokhttp3/internal/d/a;->buC: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;->buH:J
+    iget-wide v1, p0, Lokhttp3/internal/d/a;->buC: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;->buH:J
+    iput-wide v1, p0, Lokhttp3/internal/d/a;->buC:J
 
     return-object v0
 .end method
@@ -92,17 +92,17 @@
 .method static a(Lokio/g;)V
     .locals 2
 
-    iget-object v0, p0, Lokio/g;->byU:Lokio/s;
+    iget-object v0, p0, Lokio/g;->byP:Lokio/s;
 
-    sget-object v1, Lokio/s;->bzn:Lokio/s;
+    sget-object v1, Lokio/s;->bzi:Lokio/s;
 
     if-eqz v1, :cond_0
 
-    iput-object v1, p0, Lokio/g;->byU:Lokio/s;
+    iput-object v1, p0, Lokio/g;->byP:Lokio/s;
 
-    invoke-virtual {v0}, Lokio/s;->HG()Lokio/s;
+    invoke-virtual {v0}, Lokio/s;->HE()Lokio/s;
 
-    invoke-virtual {v0}, Lokio/s;->HF()Lokio/s;
+    invoke-virtual {v0}, Lokio/s;->HD()Lokio/s;
 
     return-void
 
@@ -118,7 +118,7 @@
 
 
 # virtual methods
-.method public final Gj()V
+.method public final Gh()V
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -126,14 +126,14 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/d/a;->btZ:Lokio/BufferedSink;
+    iget-object v0, p0, Lokhttp3/internal/d/a;->btU:Lokio/BufferedSink;
 
     invoke-interface {v0}, Lokio/BufferedSink;->flush()V
 
     return-void
 .end method
 
-.method public final Gk()V
+.method public final Gi()V
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -141,14 +141,14 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/d/a;->btZ:Lokio/BufferedSink;
+    iget-object v0, p0, Lokhttp3/internal/d/a;->btU:Lokio/BufferedSink;
 
     invoke-interface {v0}, Lokio/BufferedSink;->flush()V
 
     return-void
 .end method
 
-.method public final Gm()Lokhttp3/Headers;
+.method public final Gk()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;->Gl()Ljava/lang/String;
+    invoke-direct {p0}, Lokhttp3/internal/d/a;->Gj()Ljava/lang/String;
 
     move-result-object v1
 
@@ -171,14 +171,14 @@
 
     if-eqz v2, :cond_0
 
-    sget-object v2, Lokhttp3/internal/a;->bsV:Lokhttp3/internal/a;
+    sget-object v2, Lokhttp3/internal/a;->bsQ: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;->Fm()Lokhttp3/Headers;
+    invoke-virtual {v0}, Lokhttp3/Headers$a;->Fk()Lokhttp3/Headers;
 
     move-result-object v0
 
@@ -229,7 +229,7 @@
     :cond_1
     :goto_0
     :try_start_0
-    invoke-direct {p0}, Lokhttp3/internal/d/a;->Gl()Ljava/lang/String;
+    invoke-direct {p0}, Lokhttp3/internal/d/a;->Gj()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;->bsB:Lokhttp3/u;
+    iget-object v3, v0, Lokhttp3/internal/c/k;->bsw:Lokhttp3/u;
 
-    iput-object v3, v2, Lokhttp3/Response$a;->bsB:Lokhttp3/u;
+    iput-object v3, v2, Lokhttp3/Response$a;->bsw: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;->Gm()Lokhttp3/Headers;
+    invoke-virtual {p0}, Lokhttp3/internal/d/a;->Gk()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;->buD:Lokhttp3/internal/b/g;
+    iget-object v2, p0, Lokhttp3/internal/d/a;->buy: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;->btZ:Lokio/BufferedSink;
+    iget-object v0, p0, Lokhttp3/internal/d/a;->btU: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;->brc:[Ljava/lang/String;
+    iget-object v1, p1, Lokhttp3/Headers;->bqX:[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;->btZ:Lokio/BufferedSink;
+    iget-object v2, p0, Lokhttp3/internal/d/a;->btU: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;->btZ:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/d/a;->btU: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;->buD:Lokhttp3/internal/b/g;
+    iget-object v0, p0, Lokhttp3/internal/d/a;->buy:Lokhttp3/internal/b/g;
 
-    invoke-virtual {v0}, Lokhttp3/internal/b/g;->Gg()Lokhttp3/internal/b/c;
+    invoke-virtual {v0}, Lokhttp3/internal/b/g;->Ge()Lokhttp3/internal/b/c;
 
     move-result-object v0
 
-    iget-object v0, v0, Lokhttp3/internal/b/c;->btV:Lokhttp3/y;
+    iget-object v0, v0, Lokhttp3/internal/b/c;->btQ:Lokhttp3/y;
 
-    iget-object v0, v0, Lokhttp3/y;->bnr:Ljava/net/Proxy;
+    iget-object v0, v0, Lokhttp3/y;->bnm: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;->bsq:Ljava/lang/String;
+    iget-object v2, p1, Lokhttp3/w;->bsl: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;->bnk:Lokhttp3/s;
+    iget-object v2, p1, Lokhttp3/w;->bnf:Lokhttp3/s;
 
-    invoke-virtual {v2}, Lokhttp3/s;->Fo()Z
+    invoke-virtual {v2}, Lokhttp3/s;->Fm()Z
 
     move-result v2
 
@@ -623,14 +623,14 @@
     :goto_0
     if-eqz v0, :cond_1
 
-    iget-object v0, p1, Lokhttp3/w;->bnk:Lokhttp3/s;
+    iget-object v0, p1, Lokhttp3/w;->bnf: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;->bnk:Lokhttp3/s;
+    iget-object v0, p1, Lokhttp3/w;->bnf: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;->brH:Lokhttp3/Headers;
+    iget-object p1, p1, Lokhttp3/w;->brC: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;->buD:Lokhttp3/internal/b/g;
+    iget-object v0, p0, Lokhttp3/internal/d/a;->buy:Lokhttp3/internal/b/g;
 
-    invoke-virtual {v0}, Lokhttp3/internal/b/g;->Gg()Lokhttp3/internal/b/c;
+    invoke-virtual {v0}, Lokhttp3/internal/b/g;->Ge()Lokhttp3/internal/b/c;
 
     move-result-object v0
 
     if-eqz v0, :cond_0
 
-    iget-object v0, v0, Lokhttp3/internal/b/c;->btW:Ljava/net/Socket;
+    iget-object v0, v0, Lokhttp3/internal/b/c;->btR: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;->bsA:Lokhttp3/w;
+    iget-object p1, p1, Lokhttp3/Response;->bsv:Lokhttp3/w;
 
-    iget-object p1, p1, Lokhttp3/w;->bnk:Lokhttp3/s;
+    iget-object p1, p1, Lokhttp3/w;->bnf: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;->buD:Lokhttp3/internal/b/g;
+    iget-object v1, p0, Lokhttp3/internal/d/a;->buy: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;->Gh()V
+    invoke-virtual {v1}, Lokhttp3/internal/b/g;->Gf()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 e796e0fe14..815f1afbe9 100644
--- a/com.discord/smali_classes2/okhttp3/internal/e/b.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/e/b.smali
@@ -14,6 +14,16 @@
 
 
 # static fields
+.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 public static final enum buQ:Lokhttp3/internal/e/b;
@@ -26,17 +36,7 @@
 
 .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;
+.field private static final synthetic buV:[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;->buP:Lokhttp3/internal/e/b;
+    sput-object v0, Lokhttp3/internal/e/b;->buK: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;->buQ:Lokhttp3/internal/e/b;
+    sput-object v0, Lokhttp3/internal/e/b;->buL: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;->buR:Lokhttp3/internal/e/b;
+    sput-object v0, Lokhttp3/internal/e/b;->buM: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;->buS:Lokhttp3/internal/e/b;
+    sput-object v0, Lokhttp3/internal/e/b;->buN: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;->buT:Lokhttp3/internal/e/b;
+    sput-object v0, Lokhttp3/internal/e/b;->buO: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;->buU:Lokhttp3/internal/e/b;
+    sput-object v0, Lokhttp3/internal/e/b;->buP: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;->buV:Lokhttp3/internal/e/b;
+    sput-object v0, Lokhttp3/internal/e/b;->buQ: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;->buW:Lokhttp3/internal/e/b;
+    sput-object v0, Lokhttp3/internal/e/b;->buR: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;->buX:Lokhttp3/internal/e/b;
+    sput-object v0, Lokhttp3/internal/e/b;->buS: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;->buY:Lokhttp3/internal/e/b;
+    sput-object v0, Lokhttp3/internal/e/b;->buT: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;->buZ:Lokhttp3/internal/e/b;
+    sput-object v0, Lokhttp3/internal/e/b;->buU:Lokhttp3/internal/e/b;
 
     new-array v0, v12, [Lokhttp3/internal/e/b;
 
-    sget-object v12, Lokhttp3/internal/e/b;->buP:Lokhttp3/internal/e/b;
+    sget-object v12, Lokhttp3/internal/e/b;->buK:Lokhttp3/internal/e/b;
 
     aput-object v12, v0, v1
 
-    sget-object v1, Lokhttp3/internal/e/b;->buQ:Lokhttp3/internal/e/b;
+    sget-object v1, Lokhttp3/internal/e/b;->buL:Lokhttp3/internal/e/b;
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lokhttp3/internal/e/b;->buR:Lokhttp3/internal/e/b;
+    sget-object v1, Lokhttp3/internal/e/b;->buM:Lokhttp3/internal/e/b;
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lokhttp3/internal/e/b;->buS:Lokhttp3/internal/e/b;
+    sget-object v1, Lokhttp3/internal/e/b;->buN:Lokhttp3/internal/e/b;
 
     aput-object v1, v0, v4
 
-    sget-object v1, Lokhttp3/internal/e/b;->buT:Lokhttp3/internal/e/b;
+    sget-object v1, Lokhttp3/internal/e/b;->buO:Lokhttp3/internal/e/b;
 
     aput-object v1, v0, v5
 
-    sget-object v1, Lokhttp3/internal/e/b;->buU:Lokhttp3/internal/e/b;
+    sget-object v1, Lokhttp3/internal/e/b;->buP:Lokhttp3/internal/e/b;
 
     aput-object v1, v0, v7
 
-    sget-object v1, Lokhttp3/internal/e/b;->buV:Lokhttp3/internal/e/b;
+    sget-object v1, Lokhttp3/internal/e/b;->buQ:Lokhttp3/internal/e/b;
 
     aput-object v1, v0, v9
 
-    sget-object v1, Lokhttp3/internal/e/b;->buW:Lokhttp3/internal/e/b;
+    sget-object v1, Lokhttp3/internal/e/b;->buR:Lokhttp3/internal/e/b;
 
     aput-object v1, v0, v6
 
-    sget-object v1, Lokhttp3/internal/e/b;->buX:Lokhttp3/internal/e/b;
+    sget-object v1, Lokhttp3/internal/e/b;->buS:Lokhttp3/internal/e/b;
 
     aput-object v1, v0, v8
 
-    sget-object v1, Lokhttp3/internal/e/b;->buY:Lokhttp3/internal/e/b;
+    sget-object v1, Lokhttp3/internal/e/b;->buT:Lokhttp3/internal/e/b;
 
     aput-object v1, v0, v10
 
-    sget-object v1, Lokhttp3/internal/e/b;->buZ:Lokhttp3/internal/e/b;
+    sget-object v1, Lokhttp3/internal/e/b;->buU:Lokhttp3/internal/e/b;
 
     aput-object v1, v0, v11
 
-    sput-object v0, Lokhttp3/internal/e/b;->bva:[Lokhttp3/internal/e/b;
+    sput-object v0, Lokhttp3/internal/e/b;->buV:[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;->bva:[Lokhttp3/internal/e/b;
+    sget-object v0, Lokhttp3/internal/e/b;->buV:[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 53fa61e2b8..38fe5d9d51 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 buW:Lokio/ByteString;
+
+.field public static final buX:Lokio/ByteString;
+
+.field public static final buY:Lokio/ByteString;
+
+.field public static final buZ:Lokio/ByteString;
+
+.field public static final bva:Lokio/ByteString;
+
 .field public static final bvb:Lokio/ByteString;
 
-.field public static final bvc:Lokio/ByteString;
-
-.field public static final bvd:Lokio/ByteString;
-
-.field public static final bve:Lokio/ByteString;
-
-.field public static final bvf:Lokio/ByteString;
-
-.field public static final bvg:Lokio/ByteString;
-
 
 # instance fields
-.field public final bvh:Lokio/ByteString;
+.field public final bvc:Lokio/ByteString;
 
-.field public final bvi:Lokio/ByteString;
+.field public final bvd:Lokio/ByteString;
 
-.field final bvj:I
+.field final bve:I
 
 
 # direct methods
@@ -43,7 +43,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/internal/e/c;->bvb:Lokio/ByteString;
+    sput-object v0, Lokhttp3/internal/e/c;->buW:Lokio/ByteString;
 
     const-string v0, ":status"
 
@@ -51,7 +51,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/internal/e/c;->bvc:Lokio/ByteString;
+    sput-object v0, Lokhttp3/internal/e/c;->buX:Lokio/ByteString;
 
     const-string v0, ":method"
 
@@ -59,7 +59,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/internal/e/c;->bvd:Lokio/ByteString;
+    sput-object v0, Lokhttp3/internal/e/c;->buY:Lokio/ByteString;
 
     const-string v0, ":path"
 
@@ -67,7 +67,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/internal/e/c;->bve:Lokio/ByteString;
+    sput-object v0, Lokhttp3/internal/e/c;->buZ:Lokio/ByteString;
 
     const-string v0, ":scheme"
 
@@ -75,7 +75,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/internal/e/c;->bvf:Lokio/ByteString;
+    sput-object v0, Lokhttp3/internal/e/c;->bva:Lokio/ByteString;
 
     const-string v0, ":authority"
 
@@ -83,7 +83,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/internal/e/c;->bvg:Lokio/ByteString;
+    sput-object v0, Lokhttp3/internal/e/c;->bvb: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;->bvh:Lokio/ByteString;
+    iput-object p1, p0, Lokhttp3/internal/e/c;->bvc:Lokio/ByteString;
 
-    iput-object p2, p0, Lokhttp3/internal/e/c;->bvi:Lokio/ByteString;
+    iput-object p2, p0, Lokhttp3/internal/e/c;->bvd: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;->bvj:I
+    iput p1, p0, Lokhttp3/internal/e/c;->bve:I
 
     return-void
 .end method
@@ -155,9 +155,9 @@
 
     check-cast p1, Lokhttp3/internal/e/c;
 
-    iget-object v0, p0, Lokhttp3/internal/e/c;->bvh:Lokio/ByteString;
+    iget-object v0, p0, Lokhttp3/internal/e/c;->bvc:Lokio/ByteString;
 
-    iget-object v2, p1, Lokhttp3/internal/e/c;->bvh:Lokio/ByteString;
+    iget-object v2, p1, Lokhttp3/internal/e/c;->bvc: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;->bvi:Lokio/ByteString;
+    iget-object v0, p0, Lokhttp3/internal/e/c;->bvd:Lokio/ByteString;
 
-    iget-object p1, p1, Lokhttp3/internal/e/c;->bvi:Lokio/ByteString;
+    iget-object p1, p1, Lokhttp3/internal/e/c;->bvd: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;->bvh:Lokio/ByteString;
+    iget-object v0, p0, Lokhttp3/internal/e/c;->bvc: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;->bvi:Lokio/ByteString;
+    iget-object v1, p0, Lokhttp3/internal/e/c;->bvd: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;->bvh:Lokio/ByteString;
+    iget-object v1, p0, Lokhttp3/internal/e/c;->bvc:Lokio/ByteString;
 
-    invoke-virtual {v1}, Lokio/ByteString;->Ht()Ljava/lang/String;
+    invoke-virtual {v1}, Lokio/ByteString;->Hr()Ljava/lang/String;
 
     move-result-object v1
 
@@ -224,9 +224,9 @@
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lokhttp3/internal/e/c;->bvi:Lokio/ByteString;
+    iget-object v1, p0, Lokhttp3/internal/e/c;->bvd:Lokio/ByteString;
 
-    invoke-virtual {v1}, Lokio/ByteString;->Ht()Ljava/lang/String;
+    invoke-virtual {v1}, Lokio/ByteString;->Hr()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 5ee3f25b3a..35095c30b1 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 bvm:Ljava/util/List;
+.field private final bvh:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -25,19 +25,19 @@
     .end annotation
 .end field
 
-.field private final bvn:I
+.field private final bvi:I
 
-.field private bvo:I
+.field private bvj:I
 
-.field bvp:[Lokhttp3/internal/e/c;
+.field bvk:[Lokhttp3/internal/e/c;
 
-.field bvq:I
+.field bvl:I
 
-.field bvr:I
+.field bvm:I
 
-.field bvs:I
+.field bvn:I
 
-.field private final lY:Lokio/d;
+.field private final lZ: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;->bvm:Ljava/util/List;
+    iput-object p1, p0, Lokhttp3/internal/e/d$a;->bvh:Ljava/util/List;
 
     const/16 p1, 0x8
 
     new-array p1, p1, [Lokhttp3/internal/e/c;
 
-    iput-object p1, p0, Lokhttp3/internal/e/d$a;->bvp:[Lokhttp3/internal/e/c;
+    iput-object p1, p0, Lokhttp3/internal/e/d$a;->bvk:[Lokhttp3/internal/e/c;
 
-    iget-object p1, p0, Lokhttp3/internal/e/d$a;->bvp:[Lokhttp3/internal/e/c;
+    iget-object p1, p0, Lokhttp3/internal/e/d$a;->bvk:[Lokhttp3/internal/e/c;
 
     array-length p1, p1
 
     add-int/lit8 p1, p1, -0x1
 
-    iput p1, p0, Lokhttp3/internal/e/d$a;->bvq:I
+    iput p1, p0, Lokhttp3/internal/e/d$a;->bvl:I
 
     const/4 p1, 0x0
 
-    iput p1, p0, Lokhttp3/internal/e/d$a;->bvr:I
-
-    iput p1, p0, Lokhttp3/internal/e/d$a;->bvs:I
-
-    const/16 p1, 0x1000
+    iput p1, p0, Lokhttp3/internal/e/d$a;->bvm:I
 
     iput p1, p0, Lokhttp3/internal/e/d$a;->bvn:I
 
-    iput p1, p0, Lokhttp3/internal/e/d$a;->bvo:I
+    const/16 p1, 0x1000
+
+    iput p1, p0, Lokhttp3/internal/e/d$a;->bvi:I
+
+    iput p1, p0, Lokhttp3/internal/e/d$a;->bvj:I
 
     invoke-static {p3}, Lokio/j;->b(Lokio/r;)Lokio/d;
 
     move-result-object p1
 
-    iput-object p1, p0, Lokhttp3/internal/e/d$a;->lY:Lokio/d;
+    iput-object p1, p0, Lokhttp3/internal/e/d$a;->lZ:Lokio/d;
 
     return-void
 .end method
@@ -97,18 +97,18 @@
     return-void
 .end method
 
-.method private Gn()V
+.method private Gl()V
     .locals 2
 
-    iget v0, p0, Lokhttp3/internal/e/d$a;->bvo:I
+    iget v0, p0, Lokhttp3/internal/e/d$a;->bvj:I
 
-    iget v1, p0, Lokhttp3/internal/e/d$a;->bvs:I
+    iget v1, p0, Lokhttp3/internal/e/d$a;->bvn:I
 
     if-ge v0, v1, :cond_1
 
     if-nez v0, :cond_0
 
-    invoke-direct {p0}, Lokhttp3/internal/e/d$a;->Go()V
+    invoke-direct {p0}, Lokhttp3/internal/e/d$a;->Gm()V
 
     return-void
 
@@ -121,33 +121,33 @@
     return-void
 .end method
 
-.method private Go()V
+.method private Gm()V
     .locals 2
 
-    iget-object v0, p0, Lokhttp3/internal/e/d$a;->bvp:[Lokhttp3/internal/e/c;
+    iget-object v0, p0, Lokhttp3/internal/e/d$a;->bvk:[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;->bvp:[Lokhttp3/internal/e/c;
+    iget-object v0, p0, Lokhttp3/internal/e/d$a;->bvk:[Lokhttp3/internal/e/c;
 
     array-length v0, v0
 
     add-int/lit8 v0, v0, -0x1
 
-    iput v0, p0, Lokhttp3/internal/e/d$a;->bvq:I
+    iput v0, p0, Lokhttp3/internal/e/d$a;->bvl:I
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lokhttp3/internal/e/d$a;->bvr:I
+    iput v0, p0, Lokhttp3/internal/e/d$a;->bvm:I
 
-    iput v0, p0, Lokhttp3/internal/e/d$a;->bvs:I
+    iput v0, p0, Lokhttp3/internal/e/d$a;->bvn:I
 
     return-void
 .end method
 
-.method private Gr()I
+.method private Gp()I
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -155,7 +155,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/e/d$a;->lY:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/e/d$a;->lZ:Lokio/d;
 
     invoke-interface {v0}, Lokio/d;->readByte()B
 
@@ -166,7 +166,7 @@
     return v0
 .end method
 
-.method private Gs()Lokio/ByteString;
+.method private Gq()Lokio/ByteString;
     .locals 5
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -174,7 +174,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lokhttp3/internal/e/d$a;->Gr()I
+    invoke-direct {p0}, Lokhttp3/internal/e/d$a;->Gp()I
 
     move-result v0
 
@@ -200,11 +200,11 @@
 
     if-eqz v1, :cond_1
 
-    invoke-static {}, Lokhttp3/internal/e/k;->GI()Lokhttp3/internal/e/k;
+    invoke-static {}, Lokhttp3/internal/e/k;->GG()Lokhttp3/internal/e/k;
 
     move-result-object v1
 
-    iget-object v2, p0, Lokhttp3/internal/e/d$a;->lY:Lokio/d;
+    iget-object v2, p0, Lokhttp3/internal/e/d$a;->lZ: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;->lY:Lokio/d;
+    iget-object v1, p0, Lokhttp3/internal/e/d$a;->lZ: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;->bvm:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/internal/e/d$a;->bvh:Ljava/util/List;
 
     invoke-interface {v0, p1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget v0, p1, Lokhttp3/internal/e/c;->bvj:I
+    iget v0, p1, Lokhttp3/internal/e/c;->bve:I
 
-    iget v1, p0, Lokhttp3/internal/e/d$a;->bvo:I
+    iget v1, p0, Lokhttp3/internal/e/d$a;->bvj:I
 
     if-le v0, v1, :cond_0
 
-    invoke-direct {p0}, Lokhttp3/internal/e/d$a;->Go()V
+    invoke-direct {p0}, Lokhttp3/internal/e/d$a;->Gm()V
 
     return-void
 
     :cond_0
-    iget v2, p0, Lokhttp3/internal/e/d$a;->bvs:I
+    iget v2, p0, Lokhttp3/internal/e/d$a;->bvn: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;->bvr:I
+    iget v1, p0, Lokhttp3/internal/e/d$a;->bvm:I
 
     add-int/lit8 v1, v1, 0x1
 
-    iget-object v2, p0, Lokhttp3/internal/e/d$a;->bvp:[Lokhttp3/internal/e/c;
+    iget-object v2, p0, Lokhttp3/internal/e/d$a;->bvk:[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;->bvp:[Lokhttp3/internal/e/c;
+    iget-object v2, p0, Lokhttp3/internal/e/d$a;->bvk:[Lokhttp3/internal/e/c;
 
     array-length v2, v2
 
     add-int/lit8 v2, v2, -0x1
 
-    iput v2, p0, Lokhttp3/internal/e/d$a;->bvq:I
+    iput v2, p0, Lokhttp3/internal/e/d$a;->bvl:I
 
-    iput-object v1, p0, Lokhttp3/internal/e/d$a;->bvp:[Lokhttp3/internal/e/c;
+    iput-object v1, p0, Lokhttp3/internal/e/d$a;->bvk:[Lokhttp3/internal/e/c;
 
     :cond_1
-    iget v1, p0, Lokhttp3/internal/e/d$a;->bvq:I
+    iget v1, p0, Lokhttp3/internal/e/d$a;->bvl:I
 
     add-int/lit8 v2, v1, -0x1
 
-    iput v2, p0, Lokhttp3/internal/e/d$a;->bvq:I
+    iput v2, p0, Lokhttp3/internal/e/d$a;->bvl:I
 
-    iget-object v2, p0, Lokhttp3/internal/e/d$a;->bvp:[Lokhttp3/internal/e/c;
+    iget-object v2, p0, Lokhttp3/internal/e/d$a;->bvk:[Lokhttp3/internal/e/c;
 
     aput-object p1, v2, v1
 
-    iget p1, p0, Lokhttp3/internal/e/d$a;->bvr:I
+    iget p1, p0, Lokhttp3/internal/e/d$a;->bvm:I
 
     add-int/lit8 p1, p1, 0x1
 
-    iput p1, p0, Lokhttp3/internal/e/d$a;->bvr:I
+    iput p1, p0, Lokhttp3/internal/e/d$a;->bvm:I
 
-    iget p1, p0, Lokhttp3/internal/e/d$a;->bvs:I
+    iget p1, p0, Lokhttp3/internal/e/d$a;->bvn:I
 
     add-int/2addr p1, v0
 
-    iput p1, p0, Lokhttp3/internal/e/d$a;->bvs:I
+    iput p1, p0, Lokhttp3/internal/e/d$a;->bvn:I
 
     return-void
 .end method
@@ -327,44 +327,44 @@
 
     if-lez p1, :cond_1
 
-    iget-object v1, p0, Lokhttp3/internal/e/d$a;->bvp:[Lokhttp3/internal/e/c;
+    iget-object v1, p0, Lokhttp3/internal/e/d$a;->bvk:[Lokhttp3/internal/e/c;
 
     array-length v1, v1
 
     add-int/lit8 v1, v1, -0x1
 
     :goto_0
-    iget v2, p0, Lokhttp3/internal/e/d$a;->bvq:I
+    iget v2, p0, Lokhttp3/internal/e/d$a;->bvl:I
 
     if-lt v1, v2, :cond_0
 
     if-lez p1, :cond_0
 
-    iget-object v2, p0, Lokhttp3/internal/e/d$a;->bvp:[Lokhttp3/internal/e/c;
+    iget-object v2, p0, Lokhttp3/internal/e/d$a;->bvk:[Lokhttp3/internal/e/c;
 
     aget-object v2, v2, v1
 
-    iget v2, v2, Lokhttp3/internal/e/c;->bvj:I
+    iget v2, v2, Lokhttp3/internal/e/c;->bve:I
 
     sub-int/2addr p1, v2
 
-    iget v2, p0, Lokhttp3/internal/e/d$a;->bvs:I
+    iget v2, p0, Lokhttp3/internal/e/d$a;->bvn:I
 
-    iget-object v3, p0, Lokhttp3/internal/e/d$a;->bvp:[Lokhttp3/internal/e/c;
+    iget-object v3, p0, Lokhttp3/internal/e/d$a;->bvk:[Lokhttp3/internal/e/c;
 
     aget-object v3, v3, v1
 
-    iget v3, v3, Lokhttp3/internal/e/c;->bvj:I
+    iget v3, v3, Lokhttp3/internal/e/c;->bve:I
 
     sub-int/2addr v2, v3
 
-    iput v2, p0, Lokhttp3/internal/e/d$a;->bvs:I
+    iput v2, p0, Lokhttp3/internal/e/d$a;->bvn:I
 
-    iget v2, p0, Lokhttp3/internal/e/d$a;->bvr:I
+    iget v2, p0, Lokhttp3/internal/e/d$a;->bvm:I
 
     add-int/lit8 v2, v2, -0x1
 
-    iput v2, p0, Lokhttp3/internal/e/d$a;->bvr:I
+    iput v2, p0, Lokhttp3/internal/e/d$a;->bvm: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;->bvp:[Lokhttp3/internal/e/c;
+    iget-object p1, p0, Lokhttp3/internal/e/d$a;->bvk:[Lokhttp3/internal/e/c;
 
-    iget v1, p0, Lokhttp3/internal/e/d$a;->bvq:I
+    iget v1, p0, Lokhttp3/internal/e/d$a;->bvl:I
 
     add-int/lit8 v2, v1, 0x1
 
@@ -383,15 +383,15 @@
 
     add-int/2addr v1, v0
 
-    iget v3, p0, Lokhttp3/internal/e/d$a;->bvr:I
+    iget v3, p0, Lokhttp3/internal/e/d$a;->bvm: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;->bvq:I
+    iget p1, p0, Lokhttp3/internal/e/d$a;->bvl:I
 
     add-int/2addr p1, v0
 
-    iput p1, p0, Lokhttp3/internal/e/d$a;->bvq:I
+    iput p1, p0, Lokhttp3/internal/e/d$a;->bvl:I
 
     :cond_1
     return v0
@@ -400,7 +400,7 @@
 .method private dj(I)I
     .locals 1
 
-    iget v0, p0, Lokhttp3/internal/e/d$a;->bvq:I
+    iget v0, p0, Lokhttp3/internal/e/d$a;->bvl:I
 
     add-int/lit8 v0, v0, 0x1
 
@@ -423,16 +423,16 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lokhttp3/internal/e/d;->bvk:[Lokhttp3/internal/e/c;
+    sget-object v0, Lokhttp3/internal/e/d;->bvf:[Lokhttp3/internal/e/c;
 
     aget-object p1, v0, p1
 
-    iget-object p1, p1, Lokhttp3/internal/e/c;->bvh:Lokio/ByteString;
+    iget-object p1, p1, Lokhttp3/internal/e/c;->bvc:Lokio/ByteString;
 
     return-object p1
 
     :cond_0
-    sget-object v0, Lokhttp3/internal/e/d;->bvk:[Lokhttp3/internal/e/c;
+    sget-object v0, Lokhttp3/internal/e/d;->bvf:[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;->bvp:[Lokhttp3/internal/e/c;
+    iget-object v1, p0, Lokhttp3/internal/e/d$a;->bvk:[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;->bvh:Lokio/ByteString;
+    iget-object p1, p1, Lokhttp3/internal/e/c;->bvc:Lokio/ByteString;
 
     return-object p1
 
@@ -483,7 +483,7 @@
 
     if-ltz p0, :cond_0
 
-    sget-object v0, Lokhttp3/internal/e/d;->bvk:[Lokhttp3/internal/e/c;
+    sget-object v0, Lokhttp3/internal/e/d;->bvf:[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;->Gr()I
+    invoke-direct {p0}, Lokhttp3/internal/e/d$a;->Gp()I
 
     move-result v0
 
@@ -547,7 +547,7 @@
 
 
 # virtual methods
-.method final Gp()V
+.method final Gn()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;->lY:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/e/d$a;->lZ:Lokio/d;
 
-    invoke-interface {v0}, Lokio/d;->Hi()Z
+    invoke-interface {v0}, Lokio/d;->Hg()Z
 
     move-result v0
 
     if-nez v0, :cond_a
 
-    iget-object v0, p0, Lokhttp3/internal/e/d$a;->lY:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/e/d$a;->lZ: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;->bvk:[Lokhttp3/internal/e/c;
+    sget-object v1, Lokhttp3/internal/e/d;->bvf:[Lokhttp3/internal/e/c;
 
     aget-object v0, v1, v0
 
-    iget-object v1, p0, Lokhttp3/internal/e/d$a;->bvm:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/internal/e/d$a;->bvh: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;->bvk:[Lokhttp3/internal/e/c;
+    sget-object v1, Lokhttp3/internal/e/d;->bvf:[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;->bvp:[Lokhttp3/internal/e/c;
+    iget-object v2, p0, Lokhttp3/internal/e/d$a;->bvk:[Lokhttp3/internal/e/c;
 
     array-length v3, v2
 
     if-ge v1, v3, :cond_1
 
-    iget-object v0, p0, Lokhttp3/internal/e/d$a;->bvm:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/internal/e/d$a;->bvh: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;->Gs()Lokio/ByteString;
+    invoke-direct {p0}, Lokhttp3/internal/e/d$a;->Gq()Lokio/ByteString;
 
     move-result-object v0
 
@@ -665,7 +665,7 @@
 
     move-result-object v0
 
-    invoke-direct {p0}, Lokhttp3/internal/e/d$a;->Gs()Lokio/ByteString;
+    invoke-direct {p0}, Lokhttp3/internal/e/d$a;->Gq()Lokio/ByteString;
 
     move-result-object v1
 
@@ -694,7 +694,7 @@
 
     move-result-object v0
 
-    invoke-direct {p0}, Lokhttp3/internal/e/d$a;->Gs()Lokio/ByteString;
+    invoke-direct {p0}, Lokhttp3/internal/e/d$a;->Gq()Lokio/ByteString;
 
     move-result-object v1
 
@@ -719,17 +719,17 @@
 
     move-result v0
 
-    iput v0, p0, Lokhttp3/internal/e/d$a;->bvo:I
+    iput v0, p0, Lokhttp3/internal/e/d$a;->bvj:I
 
-    iget v0, p0, Lokhttp3/internal/e/d$a;->bvo:I
+    iget v0, p0, Lokhttp3/internal/e/d$a;->bvj:I
 
     if-ltz v0, :cond_5
 
-    iget v1, p0, Lokhttp3/internal/e/d$a;->bvn:I
+    iget v1, p0, Lokhttp3/internal/e/d$a;->bvi:I
 
     if-gt v0, v1, :cond_5
 
-    invoke-direct {p0}, Lokhttp3/internal/e/d$a;->Gn()V
+    invoke-direct {p0}, Lokhttp3/internal/e/d$a;->Gl()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;->bvo:I
+    iget v2, p0, Lokhttp3/internal/e/d$a;->bvj: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;->Gs()Lokio/ByteString;
+    invoke-direct {p0}, Lokhttp3/internal/e/d$a;->Gq()Lokio/ByteString;
 
     move-result-object v1
 
-    iget-object v2, p0, Lokhttp3/internal/e/d$a;->bvm:Ljava/util/List;
+    iget-object v2, p0, Lokhttp3/internal/e/d$a;->bvh: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;->Gs()Lokio/ByteString;
+    invoke-direct {p0}, Lokhttp3/internal/e/d$a;->Gq()Lokio/ByteString;
 
     move-result-object v0
 
@@ -800,11 +800,11 @@
 
     move-result-object v0
 
-    invoke-direct {p0}, Lokhttp3/internal/e/d$a;->Gs()Lokio/ByteString;
+    invoke-direct {p0}, Lokhttp3/internal/e/d$a;->Gq()Lokio/ByteString;
 
     move-result-object v1
 
-    iget-object v2, p0, Lokhttp3/internal/e/d$a;->bvm:Ljava/util/List;
+    iget-object v2, p0, Lokhttp3/internal/e/d$a;->bvh:Ljava/util/List;
 
     new-instance v3, Lokhttp3/internal/e/c;
 
@@ -827,7 +827,7 @@
     return-void
 .end method
 
-.method public final Gq()Ljava/util/List;
+.method public final Go()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;->bvm:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/internal/e/d$a;->bvh:Ljava/util/List;
 
     invoke-direct {v0, v1}, Ljava/util/ArrayList;-><init>(Ljava/util/Collection;)V
 
-    iget-object v1, p0, Lokhttp3/internal/e/d$a;->bvm:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/internal/e/d$a;->bvh: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 746554fb4e..7ce5bd5a71 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 bvi:I
+
+.field bvj:I
+
+.field bvk:[Lokhttp3/internal/e/c;
+
+.field bvl:I
+
+.field bvm:I
+
 .field bvn:I
 
-.field bvo:I
+.field private final bvo:Lokio/c;
 
-.field bvp:[Lokhttp3/internal/e/c;
+.field private final bvp:Z
 
-.field bvq:I
+.field private bvq:I
 
-.field bvr:I
-
-.field bvs:I
-
-.field private final bvt:Lokio/c;
-
-.field private final bvu:Z
-
-.field private bvv:I
-
-.field private bvw:Z
+.field private bvr:Z
 
 
 # direct methods
@@ -54,15 +54,15 @@
 
     const p2, 0x7fffffff
 
-    iput p2, p0, Lokhttp3/internal/e/d$b;->bvv:I
+    iput p2, p0, Lokhttp3/internal/e/d$b;->bvq:I
 
     const/16 p2, 0x8
 
     new-array p2, p2, [Lokhttp3/internal/e/c;
 
-    iput-object p2, p0, Lokhttp3/internal/e/d$b;->bvp:[Lokhttp3/internal/e/c;
+    iput-object p2, p0, Lokhttp3/internal/e/d$b;->bvk:[Lokhttp3/internal/e/c;
 
-    iget-object p2, p0, Lokhttp3/internal/e/d$b;->bvp:[Lokhttp3/internal/e/c;
+    iget-object p2, p0, Lokhttp3/internal/e/d$b;->bvk:[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;->bvq:I
+    iput p2, p0, Lokhttp3/internal/e/d$b;->bvl:I
 
     const/4 p2, 0x0
 
-    iput p2, p0, Lokhttp3/internal/e/d$b;->bvr:I
-
-    iput p2, p0, Lokhttp3/internal/e/d$b;->bvs:I
-
-    const/16 p2, 0x1000
+    iput p2, p0, Lokhttp3/internal/e/d$b;->bvm:I
 
     iput p2, p0, Lokhttp3/internal/e/d$b;->bvn:I
 
-    iput p2, p0, Lokhttp3/internal/e/d$b;->bvo:I
+    const/16 p2, 0x1000
 
-    iput-boolean v0, p0, Lokhttp3/internal/e/d$b;->bvu:Z
+    iput p2, p0, Lokhttp3/internal/e/d$b;->bvi:I
 
-    iput-object p1, p0, Lokhttp3/internal/e/d$b;->bvt:Lokio/c;
+    iput p2, p0, Lokhttp3/internal/e/d$b;->bvj:I
+
+    iput-boolean v0, p0, Lokhttp3/internal/e/d$b;->bvp:Z
+
+    iput-object p1, p0, Lokhttp3/internal/e/d$b;->bvo:Lokio/c;
 
     return-void
 .end method
 
-.method private Go()V
+.method private Gm()V
     .locals 2
 
-    iget-object v0, p0, Lokhttp3/internal/e/d$b;->bvp:[Lokhttp3/internal/e/c;
+    iget-object v0, p0, Lokhttp3/internal/e/d$b;->bvk:[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;->bvp:[Lokhttp3/internal/e/c;
+    iget-object v0, p0, Lokhttp3/internal/e/d$b;->bvk:[Lokhttp3/internal/e/c;
 
     array-length v0, v0
 
     add-int/lit8 v0, v0, -0x1
 
-    iput v0, p0, Lokhttp3/internal/e/d$b;->bvq:I
+    iput v0, p0, Lokhttp3/internal/e/d$b;->bvl:I
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lokhttp3/internal/e/d$b;->bvr:I
+    iput v0, p0, Lokhttp3/internal/e/d$b;->bvm:I
 
-    iput v0, p0, Lokhttp3/internal/e/d$b;->bvs:I
+    iput v0, p0, Lokhttp3/internal/e/d$b;->bvn: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;->bvj:I
+    iget v0, p1, Lokhttp3/internal/e/c;->bve:I
 
-    iget v1, p0, Lokhttp3/internal/e/d$b;->bvo:I
+    iget v1, p0, Lokhttp3/internal/e/d$b;->bvj:I
 
     if-le v0, v1, :cond_0
 
-    invoke-direct {p0}, Lokhttp3/internal/e/d$b;->Go()V
+    invoke-direct {p0}, Lokhttp3/internal/e/d$b;->Gm()V
 
     return-void
 
     :cond_0
-    iget v2, p0, Lokhttp3/internal/e/d$b;->bvs:I
+    iget v2, p0, Lokhttp3/internal/e/d$b;->bvn: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;->bvr:I
+    iget v1, p0, Lokhttp3/internal/e/d$b;->bvm:I
 
     add-int/lit8 v1, v1, 0x1
 
-    iget-object v2, p0, Lokhttp3/internal/e/d$b;->bvp:[Lokhttp3/internal/e/c;
+    iget-object v2, p0, Lokhttp3/internal/e/d$b;->bvk:[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;->bvp:[Lokhttp3/internal/e/c;
+    iget-object v2, p0, Lokhttp3/internal/e/d$b;->bvk:[Lokhttp3/internal/e/c;
 
     array-length v2, v2
 
     add-int/lit8 v2, v2, -0x1
 
-    iput v2, p0, Lokhttp3/internal/e/d$b;->bvq:I
+    iput v2, p0, Lokhttp3/internal/e/d$b;->bvl:I
 
-    iput-object v1, p0, Lokhttp3/internal/e/d$b;->bvp:[Lokhttp3/internal/e/c;
+    iput-object v1, p0, Lokhttp3/internal/e/d$b;->bvk:[Lokhttp3/internal/e/c;
 
     :cond_1
-    iget v1, p0, Lokhttp3/internal/e/d$b;->bvq:I
+    iget v1, p0, Lokhttp3/internal/e/d$b;->bvl:I
 
     add-int/lit8 v2, v1, -0x1
 
-    iput v2, p0, Lokhttp3/internal/e/d$b;->bvq:I
+    iput v2, p0, Lokhttp3/internal/e/d$b;->bvl:I
 
-    iget-object v2, p0, Lokhttp3/internal/e/d$b;->bvp:[Lokhttp3/internal/e/c;
+    iget-object v2, p0, Lokhttp3/internal/e/d$b;->bvk:[Lokhttp3/internal/e/c;
 
     aput-object p1, v2, v1
 
-    iget p1, p0, Lokhttp3/internal/e/d$b;->bvr:I
+    iget p1, p0, Lokhttp3/internal/e/d$b;->bvm:I
 
     add-int/lit8 p1, p1, 0x1
 
-    iput p1, p0, Lokhttp3/internal/e/d$b;->bvr:I
+    iput p1, p0, Lokhttp3/internal/e/d$b;->bvm:I
 
-    iget p1, p0, Lokhttp3/internal/e/d$b;->bvs:I
+    iget p1, p0, Lokhttp3/internal/e/d$b;->bvn:I
 
     add-int/2addr p1, v0
 
-    iput p1, p0, Lokhttp3/internal/e/d$b;->bvs:I
+    iput p1, p0, Lokhttp3/internal/e/d$b;->bvn:I
 
     return-void
 .end method
@@ -207,13 +207,13 @@
         }
     .end annotation
 
-    iget-boolean v0, p0, Lokhttp3/internal/e/d$b;->bvu:Z
+    iget-boolean v0, p0, Lokhttp3/internal/e/d$b;->bvp:Z
 
     const/16 v1, 0x7f
 
     if-eqz v0, :cond_0
 
-    invoke-static {}, Lokhttp3/internal/e/k;->GI()Lokhttp3/internal/e/k;
+    invoke-static {}, Lokhttp3/internal/e/k;->GG()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;->GI()Lokhttp3/internal/e/k;
+    invoke-static {}, Lokhttp3/internal/e/k;->GG()Lokhttp3/internal/e/k;
 
     invoke-static {p1, v0}, Lokhttp3/internal/e/k;->a(Lokio/ByteString;Lokio/BufferedSink;)V
 
-    invoke-virtual {v0}, Lokio/c;->Gs()Lokio/ByteString;
+    invoke-virtual {v0}, Lokio/c;->Gq()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;->bvt:Lokio/c;
+    iget-object v0, p0, Lokhttp3/internal/e/d$b;->bvo: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;->bvt:Lokio/c;
+    iget-object v0, p0, Lokhttp3/internal/e/d$b;->bvo: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;->bvp:[Lokhttp3/internal/e/c;
+    iget-object v1, p0, Lokhttp3/internal/e/d$b;->bvk:[Lokhttp3/internal/e/c;
 
     array-length v1, v1
 
     add-int/lit8 v1, v1, -0x1
 
     :goto_0
-    iget v2, p0, Lokhttp3/internal/e/d$b;->bvq:I
+    iget v2, p0, Lokhttp3/internal/e/d$b;->bvl:I
 
     if-lt v1, v2, :cond_0
 
     if-lez p1, :cond_0
 
-    iget-object v2, p0, Lokhttp3/internal/e/d$b;->bvp:[Lokhttp3/internal/e/c;
+    iget-object v2, p0, Lokhttp3/internal/e/d$b;->bvk:[Lokhttp3/internal/e/c;
 
     aget-object v2, v2, v1
 
-    iget v2, v2, Lokhttp3/internal/e/c;->bvj:I
+    iget v2, v2, Lokhttp3/internal/e/c;->bve:I
 
     sub-int/2addr p1, v2
 
-    iget v2, p0, Lokhttp3/internal/e/d$b;->bvs:I
+    iget v2, p0, Lokhttp3/internal/e/d$b;->bvn:I
 
-    iget-object v3, p0, Lokhttp3/internal/e/d$b;->bvp:[Lokhttp3/internal/e/c;
+    iget-object v3, p0, Lokhttp3/internal/e/d$b;->bvk:[Lokhttp3/internal/e/c;
 
     aget-object v3, v3, v1
 
-    iget v3, v3, Lokhttp3/internal/e/c;->bvj:I
+    iget v3, v3, Lokhttp3/internal/e/c;->bve:I
 
     sub-int/2addr v2, v3
 
-    iput v2, p0, Lokhttp3/internal/e/d$b;->bvs:I
+    iput v2, p0, Lokhttp3/internal/e/d$b;->bvn:I
 
-    iget v2, p0, Lokhttp3/internal/e/d$b;->bvr:I
+    iget v2, p0, Lokhttp3/internal/e/d$b;->bvm:I
 
     add-int/lit8 v2, v2, -0x1
 
-    iput v2, p0, Lokhttp3/internal/e/d$b;->bvr:I
+    iput v2, p0, Lokhttp3/internal/e/d$b;->bvm: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;->bvp:[Lokhttp3/internal/e/c;
+    iget-object p1, p0, Lokhttp3/internal/e/d$b;->bvk:[Lokhttp3/internal/e/c;
 
-    iget v1, p0, Lokhttp3/internal/e/d$b;->bvq:I
+    iget v1, p0, Lokhttp3/internal/e/d$b;->bvl:I
 
     add-int/lit8 v2, v1, 0x1
 
@@ -330,13 +330,13 @@
 
     add-int/2addr v1, v0
 
-    iget v3, p0, Lokhttp3/internal/e/d$b;->bvr:I
+    iget v3, p0, Lokhttp3/internal/e/d$b;->bvm: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;->bvp:[Lokhttp3/internal/e/c;
+    iget-object p1, p0, Lokhttp3/internal/e/d$b;->bvk:[Lokhttp3/internal/e/c;
 
-    iget v1, p0, Lokhttp3/internal/e/d$b;->bvq:I
+    iget v1, p0, Lokhttp3/internal/e/d$b;->bvl: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;->bvq:I
+    iget p1, p0, Lokhttp3/internal/e/d$b;->bvl:I
 
     add-int/2addr p1, v0
 
-    iput p1, p0, Lokhttp3/internal/e/d$b;->bvq:I
+    iput p1, p0, Lokhttp3/internal/e/d$b;->bvl:I
 
     :cond_1
     return v0
@@ -363,7 +363,7 @@
 
     if-ge p1, p2, :cond_0
 
-    iget-object p2, p0, Lokhttp3/internal/e/d$b;->bvt:Lokio/c;
+    iget-object p2, p0, Lokhttp3/internal/e/d$b;->bvo:Lokio/c;
 
     or-int/2addr p1, p3
 
@@ -372,7 +372,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/internal/e/d$b;->bvt:Lokio/c;
+    iget-object v0, p0, Lokhttp3/internal/e/d$b;->bvo: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;->bvt:Lokio/c;
+    iget-object v0, p0, Lokhttp3/internal/e/d$b;->bvo: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;->bvt:Lokio/c;
+    iget-object p2, p0, Lokhttp3/internal/e/d$b;->bvo: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;->bvw:Z
+    iget-boolean v0, p0, Lokhttp3/internal/e/d$b;->bvr:Z
 
     const/4 v1, 0x0
 
     if-eqz v0, :cond_1
 
-    iget v0, p0, Lokhttp3/internal/e/d$b;->bvv:I
+    iget v0, p0, Lokhttp3/internal/e/d$b;->bvq:I
 
-    iget v2, p0, Lokhttp3/internal/e/d$b;->bvo:I
+    iget v2, p0, Lokhttp3/internal/e/d$b;->bvj: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;->bvw:Z
+    iput-boolean v1, p0, Lokhttp3/internal/e/d$b;->bvr:Z
 
     const v0, 0x7fffffff
 
-    iput v0, p0, Lokhttp3/internal/e/d$b;->bvv:I
+    iput v0, p0, Lokhttp3/internal/e/d$b;->bvq:I
 
-    iget v0, p0, Lokhttp3/internal/e/d$b;->bvo:I
+    iget v0, p0, Lokhttp3/internal/e/d$b;->bvj: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;->bvh:Lokio/ByteString;
+    iget-object v4, v3, Lokhttp3/internal/e/c;->bvc:Lokio/ByteString;
 
-    invoke-virtual {v4}, Lokio/ByteString;->Hy()Lokio/ByteString;
+    invoke-virtual {v4}, Lokio/ByteString;->Hw()Lokio/ByteString;
 
     move-result-object v4
 
-    iget-object v5, v3, Lokhttp3/internal/e/c;->bvi:Lokio/ByteString;
+    iget-object v5, v3, Lokhttp3/internal/e/c;->bvd:Lokio/ByteString;
 
-    sget-object v6, Lokhttp3/internal/e/d;->bvl:Ljava/util/Map;
+    sget-object v6, Lokhttp3/internal/e/d;->bvg: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;->bvk:[Lokhttp3/internal/e/c;
+    sget-object v9, Lokhttp3/internal/e/d;->bvf:[Lokhttp3/internal/e/c;
 
     add-int/lit8 v10, v6, -0x1
 
     aget-object v9, v9, v10
 
-    iget-object v9, v9, Lokhttp3/internal/e/c;->bvi:Lokio/ByteString;
+    iget-object v9, v9, Lokhttp3/internal/e/c;->bvd: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;->bvk:[Lokhttp3/internal/e/c;
+    sget-object v9, Lokhttp3/internal/e/d;->bvf:[Lokhttp3/internal/e/c;
 
     aget-object v9, v9, v6
 
-    iget-object v9, v9, Lokhttp3/internal/e/c;->bvi:Lokio/ByteString;
+    iget-object v9, v9, Lokhttp3/internal/e/c;->bvd: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;->bvq:I
+    iget v10, p0, Lokhttp3/internal/e/d$b;->bvl:I
 
     add-int/2addr v10, v8
 
-    iget-object v8, p0, Lokhttp3/internal/e/d$b;->bvp:[Lokhttp3/internal/e/c;
+    iget-object v8, p0, Lokhttp3/internal/e/d$b;->bvk:[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;->bvp:[Lokhttp3/internal/e/c;
+    iget-object v11, p0, Lokhttp3/internal/e/d$b;->bvk:[Lokhttp3/internal/e/c;
 
     aget-object v11, v11, v10
 
-    iget-object v11, v11, Lokhttp3/internal/e/c;->bvh:Lokio/ByteString;
+    iget-object v11, v11, Lokhttp3/internal/e/c;->bvc: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;->bvp:[Lokhttp3/internal/e/c;
+    iget-object v11, p0, Lokhttp3/internal/e/d$b;->bvk:[Lokhttp3/internal/e/c;
 
     aget-object v11, v11, v10
 
-    iget-object v11, v11, Lokhttp3/internal/e/c;->bvi:Lokio/ByteString;
+    iget-object v11, v11, Lokhttp3/internal/e/c;->bvd: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;->bvq:I
+    iget v6, p0, Lokhttp3/internal/e/d$b;->bvl:I
 
     sub-int/2addr v10, v6
 
-    sget-object v6, Lokhttp3/internal/e/d;->bvk:[Lokhttp3/internal/e/c;
+    sget-object v6, Lokhttp3/internal/e/d;->bvf:[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;->bvq:I
+    iget v9, p0, Lokhttp3/internal/e/d$b;->bvl:I
 
     sub-int v9, v10, v9
 
-    sget-object v11, Lokhttp3/internal/e/d;->bvk:[Lokhttp3/internal/e/c;
+    sget-object v11, Lokhttp3/internal/e/d;->bvf:[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;->bvt:Lokio/c;
+    iget-object v7, p0, Lokhttp3/internal/e/d$b;->bvo: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;->bvb:Lokio/ByteString;
+    sget-object v7, Lokhttp3/internal/e/c;->buW: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;->bvg:Lokio/ByteString;
+    sget-object v7, Lokhttp3/internal/e/c;->bvb: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;->bvn:I
+    iput p1, p0, Lokhttp3/internal/e/d$b;->bvi:I
 
     const/16 v0, 0x4000
 
@@ -707,7 +707,7 @@
 
     move-result p1
 
-    iget v0, p0, Lokhttp3/internal/e/d$b;->bvo:I
+    iget v0, p0, Lokhttp3/internal/e/d$b;->bvj: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;->bvv:I
+    iget v0, p0, Lokhttp3/internal/e/d$b;->bvq:I
 
     invoke-static {v0, p1}, Ljava/lang/Math;->min(II)I
 
     move-result v0
 
-    iput v0, p0, Lokhttp3/internal/e/d$b;->bvv:I
+    iput v0, p0, Lokhttp3/internal/e/d$b;->bvq:I
 
     :cond_1
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lokhttp3/internal/e/d$b;->bvw:Z
+    iput-boolean v0, p0, Lokhttp3/internal/e/d$b;->bvr:Z
 
-    iput p1, p0, Lokhttp3/internal/e/d$b;->bvo:I
+    iput p1, p0, Lokhttp3/internal/e/d$b;->bvj:I
 
-    iget p1, p0, Lokhttp3/internal/e/d$b;->bvo:I
+    iget p1, p0, Lokhttp3/internal/e/d$b;->bvj:I
 
-    iget v0, p0, Lokhttp3/internal/e/d$b;->bvs:I
+    iget v0, p0, Lokhttp3/internal/e/d$b;->bvn:I
 
     if-ge p1, v0, :cond_3
 
     if-nez p1, :cond_2
 
-    invoke-direct {p0}, Lokhttp3/internal/e/d$b;->Go()V
+    invoke-direct {p0}, Lokhttp3/internal/e/d$b;->Gm()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 0d14b502db..aa9d329fd9 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 bvk:[Lokhttp3/internal/e/c;
+.field static final bvf:[Lokhttp3/internal/e/c;
 
-.field static final bvl:Ljava/util/Map;
+.field static final bvg: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;->bvg:Lokio/ByteString;
+    sget-object v2, Lokhttp3/internal/e/c;->bvb:Lokio/ByteString;
 
     const-string v3, ""
 
@@ -49,7 +49,7 @@
 
     new-instance v1, Lokhttp3/internal/e/c;
 
-    sget-object v4, Lokhttp3/internal/e/c;->bvd:Lokio/ByteString;
+    sget-object v4, Lokhttp3/internal/e/c;->buY:Lokio/ByteString;
 
     const-string v5, "GET"
 
@@ -61,7 +61,7 @@
 
     new-instance v1, Lokhttp3/internal/e/c;
 
-    sget-object v4, Lokhttp3/internal/e/c;->bvd:Lokio/ByteString;
+    sget-object v4, Lokhttp3/internal/e/c;->buY:Lokio/ByteString;
 
     const-string v5, "POST"
 
@@ -73,7 +73,7 @@
 
     new-instance v1, Lokhttp3/internal/e/c;
 
-    sget-object v4, Lokhttp3/internal/e/c;->bve:Lokio/ByteString;
+    sget-object v4, Lokhttp3/internal/e/c;->buZ:Lokio/ByteString;
 
     const-string v5, "/"
 
@@ -85,7 +85,7 @@
 
     new-instance v1, Lokhttp3/internal/e/c;
 
-    sget-object v4, Lokhttp3/internal/e/c;->bve:Lokio/ByteString;
+    sget-object v4, Lokhttp3/internal/e/c;->buZ: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;->bvf:Lokio/ByteString;
+    sget-object v4, Lokhttp3/internal/e/c;->bva:Lokio/ByteString;
 
     const-string v5, "http"
 
@@ -109,7 +109,7 @@
 
     new-instance v1, Lokhttp3/internal/e/c;
 
-    sget-object v4, Lokhttp3/internal/e/c;->bvf:Lokio/ByteString;
+    sget-object v4, Lokhttp3/internal/e/c;->bva:Lokio/ByteString;
 
     const-string v5, "https"
 
@@ -121,7 +121,7 @@
 
     new-instance v1, Lokhttp3/internal/e/c;
 
-    sget-object v4, Lokhttp3/internal/e/c;->bvc:Lokio/ByteString;
+    sget-object v4, Lokhttp3/internal/e/c;->buX:Lokio/ByteString;
 
     const-string v5, "200"
 
@@ -133,7 +133,7 @@
 
     new-instance v1, Lokhttp3/internal/e/c;
 
-    sget-object v4, Lokhttp3/internal/e/c;->bvc:Lokio/ByteString;
+    sget-object v4, Lokhttp3/internal/e/c;->buX:Lokio/ByteString;
 
     const-string v5, "204"
 
@@ -145,7 +145,7 @@
 
     new-instance v1, Lokhttp3/internal/e/c;
 
-    sget-object v4, Lokhttp3/internal/e/c;->bvc:Lokio/ByteString;
+    sget-object v4, Lokhttp3/internal/e/c;->buX:Lokio/ByteString;
 
     const-string v5, "206"
 
@@ -157,7 +157,7 @@
 
     new-instance v1, Lokhttp3/internal/e/c;
 
-    sget-object v4, Lokhttp3/internal/e/c;->bvc:Lokio/ByteString;
+    sget-object v4, Lokhttp3/internal/e/c;->buX:Lokio/ByteString;
 
     const-string v5, "304"
 
@@ -169,7 +169,7 @@
 
     new-instance v1, Lokhttp3/internal/e/c;
 
-    sget-object v4, Lokhttp3/internal/e/c;->bvc:Lokio/ByteString;
+    sget-object v4, Lokhttp3/internal/e/c;->buX:Lokio/ByteString;
 
     const-string v5, "400"
 
@@ -181,7 +181,7 @@
 
     new-instance v1, Lokhttp3/internal/e/c;
 
-    sget-object v4, Lokhttp3/internal/e/c;->bvc:Lokio/ByteString;
+    sget-object v4, Lokhttp3/internal/e/c;->buX:Lokio/ByteString;
 
     const-string v5, "404"
 
@@ -193,7 +193,7 @@
 
     new-instance v1, Lokhttp3/internal/e/c;
 
-    sget-object v4, Lokhttp3/internal/e/c;->bvc:Lokio/ByteString;
+    sget-object v4, Lokhttp3/internal/e/c;->buX:Lokio/ByteString;
 
     const-string v5, "500"
 
@@ -675,18 +675,18 @@
 
     aput-object v1, v0, v3
 
-    sput-object v0, Lokhttp3/internal/e/d;->bvk:[Lokhttp3/internal/e/c;
+    sput-object v0, Lokhttp3/internal/e/d;->bvf:[Lokhttp3/internal/e/c;
 
     new-instance v0, Ljava/util/LinkedHashMap;
 
-    sget-object v1, Lokhttp3/internal/e/d;->bvk:[Lokhttp3/internal/e/c;
+    sget-object v1, Lokhttp3/internal/e/d;->bvf:[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;->bvk:[Lokhttp3/internal/e/c;
+    sget-object v1, Lokhttp3/internal/e/d;->bvf:[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;->bvh:Lokio/ByteString;
+    iget-object v1, v1, Lokhttp3/internal/e/c;->bvc: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;->bvk:[Lokhttp3/internal/e/c;
+    sget-object v1, Lokhttp3/internal/e/d;->bvf:[Lokhttp3/internal/e/c;
 
     aget-object v1, v1, v2
 
-    iget-object v1, v1, Lokhttp3/internal/e/c;->bvh:Lokio/ByteString;
+    iget-object v1, v1, Lokhttp3/internal/e/c;->bvc: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;->bvl:Ljava/util/Map;
+    sput-object v0, Lokhttp3/internal/e/d;->bvg: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;->Ht()Ljava/lang/String;
+    invoke-virtual {p0}, Lokio/ByteString;->Hr()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 bbdde1379a..1ebda64e4b 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 bvA:[Ljava/lang/String;
+.field static final bvs:Lokio/ByteString;
 
-.field static final bvx:Lokio/ByteString;
+.field private static final bvt:[Ljava/lang/String;
 
-.field private static final bvy:[Ljava/lang/String;
+.field static final bvu:[Ljava/lang/String;
 
-.field static final bvz:[Ljava/lang/String;
+.field static final bvv:[Ljava/lang/String;
 
 
 # direct methods
@@ -23,7 +23,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/internal/e/e;->bvx:Lokio/ByteString;
+    sput-object v0, Lokhttp3/internal/e/e;->bvs:Lokio/ByteString;
 
     const/16 v0, 0xa
 
@@ -89,24 +89,24 @@
 
     aput-object v8, v0, v7
 
-    sput-object v0, Lokhttp3/internal/e/e;->bvy:[Ljava/lang/String;
+    sput-object v0, Lokhttp3/internal/e/e;->bvt:[Ljava/lang/String;
 
     const/16 v0, 0x40
 
     new-array v0, v0, [Ljava/lang/String;
 
-    sput-object v0, Lokhttp3/internal/e/e;->bvz:[Ljava/lang/String;
+    sput-object v0, Lokhttp3/internal/e/e;->bvu:[Ljava/lang/String;
 
     const/16 v0, 0x100
 
     new-array v0, v0, [Ljava/lang/String;
 
-    sput-object v0, Lokhttp3/internal/e/e;->bvA:[Ljava/lang/String;
+    sput-object v0, Lokhttp3/internal/e/e;->bvv:[Ljava/lang/String;
 
     const/4 v0, 0x0
 
     :goto_0
-    sget-object v7, Lokhttp3/internal/e/e;->bvA:[Ljava/lang/String;
+    sget-object v7, Lokhttp3/internal/e/e;->bvv:[Ljava/lang/String;
 
     array-length v8, v7
 
@@ -141,7 +141,7 @@
     goto :goto_0
 
     :cond_0
-    sget-object v0, Lokhttp3/internal/e/e;->bvz:[Ljava/lang/String;
+    sget-object v0, Lokhttp3/internal/e/e;->bvu:[Ljava/lang/String;
 
     const-string v7, ""
 
@@ -168,7 +168,7 @@
 
     aget v8, v7, v0
 
-    sget-object v10, Lokhttp3/internal/e/e;->bvz:[Ljava/lang/String;
+    sget-object v10, Lokhttp3/internal/e/e;->bvu:[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;->bvz:[Ljava/lang/String;
+    sget-object v13, Lokhttp3/internal/e/e;->bvu:[Ljava/lang/String;
 
     aget-object v8, v13, v8
 
@@ -195,7 +195,7 @@
     goto :goto_1
 
     :cond_1
-    sget-object v0, Lokhttp3/internal/e/e;->bvz:[Ljava/lang/String;
+    sget-object v0, Lokhttp3/internal/e/e;->bvu:[Ljava/lang/String;
 
     const-string v8, "END_HEADERS"
 
@@ -227,7 +227,7 @@
 
     aget v9, v7, v8
 
-    sget-object v10, Lokhttp3/internal/e/e;->bvz:[Ljava/lang/String;
+    sget-object v10, Lokhttp3/internal/e/e;->bvu:[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;->bvz:[Ljava/lang/String;
+    sget-object v13, Lokhttp3/internal/e/e;->bvu:[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;->bvz:[Ljava/lang/String;
+    sget-object v14, Lokhttp3/internal/e/e;->bvu:[Ljava/lang/String;
 
     aget-object v14, v14, v5
 
@@ -257,7 +257,7 @@
 
     aput-object v12, v10, v11
 
-    sget-object v10, Lokhttp3/internal/e/e;->bvz:[Ljava/lang/String;
+    sget-object v10, Lokhttp3/internal/e/e;->bvu:[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;->bvz:[Ljava/lang/String;
+    sget-object v14, Lokhttp3/internal/e/e;->bvu:[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;->bvz:[Ljava/lang/String;
+    sget-object v9, Lokhttp3/internal/e/e;->bvu:[Ljava/lang/String;
 
     aget-object v9, v9, v5
 
@@ -298,7 +298,7 @@
 
     :cond_3
     :goto_4
-    sget-object v0, Lokhttp3/internal/e/e;->bvz:[Ljava/lang/String;
+    sget-object v0, Lokhttp3/internal/e/e;->bvu:[Ljava/lang/String;
 
     array-length v2, v0
 
@@ -308,7 +308,7 @@
 
     if-nez v2, :cond_4
 
-    sget-object v2, Lokhttp3/internal/e/e;->bvA:[Ljava/lang/String;
+    sget-object v2, Lokhttp3/internal/e/e;->bvv:[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;->bvy:[Ljava/lang/String;
+    sget-object v0, Lokhttp3/internal/e/e;->bvt:[Ljava/lang/String;
 
     array-length v1, v0
 
@@ -404,7 +404,7 @@
 
     if-eq p3, v7, :cond_7
 
-    sget-object v7, Lokhttp3/internal/e/e;->bvz:[Ljava/lang/String;
+    sget-object v7, Lokhttp3/internal/e/e;->bvu:[Ljava/lang/String;
 
     array-length v8, v7
 
@@ -415,7 +415,7 @@
     goto :goto_1
 
     :cond_2
-    sget-object v7, Lokhttp3/internal/e/e;->bvA:[Ljava/lang/String;
+    sget-object v7, Lokhttp3/internal/e/e;->bvv:[Ljava/lang/String;
 
     aget-object v7, v7, p4
 
@@ -466,14 +466,14 @@
     goto :goto_2
 
     :cond_6
-    sget-object p3, Lokhttp3/internal/e/e;->bvA:[Ljava/lang/String;
+    sget-object p3, Lokhttp3/internal/e/e;->bvv:[Ljava/lang/String;
 
     aget-object p3, p3, p4
 
     goto :goto_2
 
     :cond_7
-    sget-object p3, Lokhttp3/internal/e/e;->bvA:[Ljava/lang/String;
+    sget-object p3, Lokhttp3/internal/e/e;->bvv:[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 44a3e39010..63a8317a82 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 buJ:J
+.field buE:J
 
-.field bvG:Z
+.field bvB:Z
 
-.field final synthetic bvH:Lokhttp3/internal/e/f;
+.field final synthetic bvC: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;->bvH:Lokhttp3/internal/e/f;
+    iput-object p1, p0, Lokhttp3/internal/e/f$a;->bvC: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;->bvG:Z
+    iput-boolean p1, p0, Lokhttp3/internal/e/f$a;->bvB:Z
 
     const-wide/16 p1, 0x0
 
-    iput-wide p1, p0, Lokhttp3/internal/e/f$a;->buJ:J
+    iput-wide p1, p0, Lokhttp3/internal/e/f$a;->buE: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;->bvG:Z
+    iget-boolean v0, p0, Lokhttp3/internal/e/f$a;->bvB: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;->bvG:Z
+    iput-boolean v0, p0, Lokhttp3/internal/e/f$a;->bvB:Z
 
-    iget-object v0, p0, Lokhttp3/internal/e/f$a;->bvH:Lokhttp3/internal/e/f;
+    iget-object v0, p0, Lokhttp3/internal/e/f$a;->bvC:Lokhttp3/internal/e/f;
 
-    iget-object v0, v0, Lokhttp3/internal/e/f;->buD:Lokhttp3/internal/b/g;
+    iget-object v0, v0, Lokhttp3/internal/e/f;->buy:Lokhttp3/internal/b/g;
 
     const/4 v1, 0x0
 
-    iget-object v2, p0, Lokhttp3/internal/e/f$a;->bvH:Lokhttp3/internal/e/f;
+    iget-object v2, p0, Lokhttp3/internal/e/f$a;->bvC: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;->HB()Lokio/r;
+    invoke-virtual {p0}, Lokhttp3/internal/e/f$a;->Hz()Lokio/r;
 
     move-result-object v0
 
@@ -93,11 +93,11 @@
 
     if-lez p3, :cond_0
 
-    iget-wide v0, p0, Lokhttp3/internal/e/f$a;->buJ:J
+    iget-wide v0, p0, Lokhttp3/internal/e/f$a;->buE:J
 
     add-long/2addr v0, p1
 
-    iput-wide v0, p0, Lokhttp3/internal/e/f$a;->buJ:J
+    iput-wide v0, p0, Lokhttp3/internal/e/f$a;->buE: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 16504ccedf..7f4468f37e 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 bvB:Ljava/util/List;
+.field private static final bvw:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -25,7 +25,7 @@
     .end annotation
 .end field
 
-.field private static final bvC:Ljava/util/List;
+.field private static final bvx:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -37,15 +37,15 @@
 
 
 # instance fields
-.field private final bsB:Lokhttp3/u;
+.field private final bsw:Lokhttp3/u;
 
-.field final buD:Lokhttp3/internal/b/g;
+.field final buy:Lokhttp3/internal/b/g;
 
-.field private final bvD:Lokhttp3/Interceptor$Chain;
+.field private bvA:Lokhttp3/internal/e/i;
 
-.field private final bvE:Lokhttp3/internal/e/g;
+.field private final bvy:Lokhttp3/Interceptor$Chain;
 
-.field private bvF:Lokhttp3/internal/e/i;
+.field private final bvz:Lokhttp3/internal/e/g;
 
 
 # direct methods
@@ -132,7 +132,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/internal/e/f;->bvB:Ljava/util/List;
+    sput-object v0, Lokhttp3/internal/e/f;->bvw:Ljava/util/List;
 
     const/16 v0, 0x8
 
@@ -160,7 +160,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/internal/e/f;->bvC:Ljava/util/List;
+    sput-object v0, Lokhttp3/internal/e/f;->bvx: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;->bvD:Lokhttp3/Interceptor$Chain;
+    iput-object p2, p0, Lokhttp3/internal/e/f;->bvy:Lokhttp3/Interceptor$Chain;
 
-    iput-object p3, p0, Lokhttp3/internal/e/f;->buD:Lokhttp3/internal/b/g;
+    iput-object p3, p0, Lokhttp3/internal/e/f;->buy:Lokhttp3/internal/b/g;
 
-    iput-object p4, p0, Lokhttp3/internal/e/f;->bvE:Lokhttp3/internal/e/g;
+    iput-object p4, p0, Lokhttp3/internal/e/f;->bvz:Lokhttp3/internal/e/g;
 
-    iget-object p1, p1, Lokhttp3/t;->bno:Ljava/util/List;
+    iget-object p1, p1, Lokhttp3/t;->bnj:Ljava/util/List;
 
-    sget-object p2, Lokhttp3/u;->bse:Lokhttp3/u;
+    sget-object p2, Lokhttp3/u;->brZ: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;->bse:Lokhttp3/u;
+    sget-object p1, Lokhttp3/u;->brZ:Lokhttp3/u;
 
     goto :goto_0
 
     :cond_0
-    sget-object p1, Lokhttp3/u;->bsd:Lokhttp3/u;
+    sget-object p1, Lokhttp3/u;->brY:Lokhttp3/u;
 
     :goto_0
-    iput-object p1, p0, Lokhttp3/internal/e/f;->bsB:Lokhttp3/u;
+    iput-object p1, p0, Lokhttp3/internal/e/f;->bsw:Lokhttp3/u;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final Gj()V
+.method public final Gh()V
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -209,16 +209,16 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/e/f;->bvE:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/f;->bvz:Lokhttp3/internal/e/g;
 
-    iget-object v0, v0, Lokhttp3/internal/e/g;->bvX:Lokhttp3/internal/e/j;
+    iget-object v0, v0, Lokhttp3/internal/e/g;->bvS:Lokhttp3/internal/e/j;
 
     invoke-virtual {v0}, Lokhttp3/internal/e/j;->flush()V
 
     return-void
 .end method
 
-.method public final Gk()V
+.method public final Gi()V
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -226,9 +226,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/e/f;->bvF:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/f;->bvA:Lokhttp3/internal/e/i;
 
-    invoke-virtual {v0}, Lokhttp3/internal/e/i;->GB()Lokio/q;
+    invoke-virtual {v0}, Lokhttp3/internal/e/i;->Gz()Lokio/q;
 
     move-result-object v0
 
@@ -245,19 +245,19 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/e/f;->bvF:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/f;->bvA:Lokhttp3/internal/e/i;
 
-    invoke-virtual {v0}, Lokhttp3/internal/e/i;->GA()Lokhttp3/Headers;
+    invoke-virtual {v0}, Lokhttp3/internal/e/i;->Gy()Lokhttp3/Headers;
 
     move-result-object v0
 
-    iget-object v1, p0, Lokhttp3/internal/e/f;->bsB:Lokhttp3/u;
+    iget-object v1, p0, Lokhttp3/internal/e/f;->bsw:Lokhttp3/u;
 
     new-instance v2, Lokhttp3/Headers$a;
 
     invoke-direct {v2}, Lokhttp3/Headers$a;-><init>()V
 
-    iget-object v3, v0, Lokhttp3/Headers;->brc:[Ljava/lang/String;
+    iget-object v3, v0, Lokhttp3/Headers;->bqX:[Ljava/lang/String;
 
     array-length v3, v3
 
@@ -305,7 +305,7 @@
     goto :goto_1
 
     :cond_0
-    sget-object v9, Lokhttp3/internal/e/f;->bvC:Ljava/util/List;
+    sget-object v9, Lokhttp3/internal/e/f;->bvx: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;->bsV:Lokhttp3/internal/a;
+    sget-object v9, Lokhttp3/internal/a;->bsQ: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;->bsB:Lokhttp3/u;
+    iput-object v1, v0, Lokhttp3/Response$a;->bsw: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;->Fm()Lokhttp3/Headers;
+    invoke-virtual {v2}, Lokhttp3/Headers$a;->Fk()Lokhttp3/Headers;
 
     move-result-object v1
 
@@ -350,7 +350,7 @@
 
     if-eqz p1, :cond_3
 
-    sget-object p1, Lokhttp3/internal/a;->bsV:Lokhttp3/internal/a;
+    sget-object p1, Lokhttp3/internal/a;->bsQ: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;->bvF:Lokhttp3/internal/e/i;
+    iget-object p1, p0, Lokhttp3/internal/e/f;->bvA:Lokhttp3/internal/e/i;
 
-    invoke-virtual {p1}, Lokhttp3/internal/e/i;->GB()Lokio/q;
+    invoke-virtual {p1}, Lokhttp3/internal/e/i;->Gz()Lokio/q;
 
     move-result-object p1
 
@@ -401,14 +401,14 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/e/f;->bvF:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/f;->bvA:Lokhttp3/internal/e/i;
 
     if-eqz v0, :cond_0
 
     return-void
 
     :cond_0
-    iget-object v0, p1, Lokhttp3/w;->brI:Lokhttp3/RequestBody;
+    iget-object v0, p1, Lokhttp3/w;->brD:Lokhttp3/RequestBody;
 
     const/4 v1, 0x0
 
@@ -422,11 +422,11 @@
     const/4 v0, 0x0
 
     :goto_0
-    iget-object v2, p1, Lokhttp3/w;->brH:Lokhttp3/Headers;
+    iget-object v2, p1, Lokhttp3/w;->brC:Lokhttp3/Headers;
 
     new-instance v3, Ljava/util/ArrayList;
 
-    iget-object v4, v2, Lokhttp3/Headers;->brc:[Ljava/lang/String;
+    iget-object v4, v2, Lokhttp3/Headers;->bqX:[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;->bvd:Lokio/ByteString;
+    sget-object v5, Lokhttp3/internal/e/c;->buY:Lokio/ByteString;
 
-    iget-object v6, p1, Lokhttp3/w;->bsq:Ljava/lang/String;
+    iget-object v6, p1, Lokhttp3/w;->bsl: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;->bve:Lokio/ByteString;
+    sget-object v5, Lokhttp3/internal/e/c;->buZ:Lokio/ByteString;
 
-    iget-object v6, p1, Lokhttp3/w;->bnk:Lokhttp3/s;
+    iget-object v6, p1, Lokhttp3/w;->bnf: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;->bvg:Lokio/ByteString;
+    sget-object v6, Lokhttp3/internal/e/c;->bvb: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;->bvf:Lokio/ByteString;
+    sget-object v5, Lokhttp3/internal/e/c;->bva:Lokio/ByteString;
 
-    iget-object p1, p1, Lokhttp3/w;->bnk:Lokhttp3/s;
+    iget-object p1, p1, Lokhttp3/w;->bnf:Lokhttp3/s;
 
-    iget-object p1, p1, Lokhttp3/s;->brf:Ljava/lang/String;
+    iget-object p1, p1, Lokhttp3/s;->bra: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;->brc:[Ljava/lang/String;
+    iget-object p1, v2, Lokhttp3/Headers;->bqX:[Ljava/lang/String;
 
     array-length p1, p1
 
@@ -512,9 +512,9 @@
 
     move-result-object v4
 
-    sget-object v5, Lokhttp3/internal/e/f;->bvB:Ljava/util/List;
+    sget-object v5, Lokhttp3/internal/e/f;->bvw:Ljava/util/List;
 
-    invoke-virtual {v4}, Lokio/ByteString;->Ht()Ljava/lang/String;
+    invoke-virtual {v4}, Lokio/ByteString;->Hr()Ljava/lang/String;
 
     move-result-object v6
 
@@ -540,21 +540,21 @@
     goto :goto_1
 
     :cond_4
-    iget-object p1, p0, Lokhttp3/internal/e/f;->bvE:Lokhttp3/internal/e/g;
+    iget-object p1, p0, Lokhttp3/internal/e/f;->bvz: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;->bvF:Lokhttp3/internal/e/i;
+    iput-object p1, p0, Lokhttp3/internal/e/f;->bvA:Lokhttp3/internal/e/i;
 
-    iget-object p1, p0, Lokhttp3/internal/e/f;->bvF:Lokhttp3/internal/e/i;
+    iget-object p1, p0, Lokhttp3/internal/e/f;->bvA:Lokhttp3/internal/e/i;
 
-    iget-object p1, p1, Lokhttp3/internal/e/i;->bwA:Lokhttp3/internal/e/i$c;
+    iget-object p1, p1, Lokhttp3/internal/e/i;->bwv:Lokhttp3/internal/e/i$c;
 
-    iget-object v0, p0, Lokhttp3/internal/e/f;->bvD:Lokhttp3/Interceptor$Chain;
+    iget-object v0, p0, Lokhttp3/internal/e/f;->bvy:Lokhttp3/Interceptor$Chain;
 
-    invoke-interface {v0}, Lokhttp3/Interceptor$Chain;->FA()I
+    invoke-interface {v0}, Lokhttp3/Interceptor$Chain;->Fy()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;->bvF:Lokhttp3/internal/e/i;
+    iget-object p1, p0, Lokhttp3/internal/e/f;->bvA:Lokhttp3/internal/e/i;
 
-    iget-object p1, p1, Lokhttp3/internal/e/i;->bwB:Lokhttp3/internal/e/i$c;
+    iget-object p1, p1, Lokhttp3/internal/e/i;->bww:Lokhttp3/internal/e/i$c;
 
-    iget-object v0, p0, Lokhttp3/internal/e/f;->bvD:Lokhttp3/Interceptor$Chain;
+    iget-object v0, p0, Lokhttp3/internal/e/f;->bvy:Lokhttp3/Interceptor$Chain;
 
-    invoke-interface {v0}, Lokhttp3/Interceptor$Chain;->FB()I
+    invoke-interface {v0}, Lokhttp3/Interceptor$Chain;->Fz()I
 
     move-result v0
 
@@ -586,11 +586,11 @@
 .method public final cancel()V
     .locals 2
 
-    iget-object v0, p0, Lokhttp3/internal/e/f;->bvF:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/f;->bvA:Lokhttp3/internal/e/i;
 
     if-eqz v0, :cond_0
 
-    sget-object v1, Lokhttp3/internal/e/b;->buU:Lokhttp3/internal/e/b;
+    sget-object v1, Lokhttp3/internal/e/b;->buP: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;->bvF:Lokhttp3/internal/e/i;
+    iget-object v3, p0, Lokhttp3/internal/e/f;->bvA:Lokhttp3/internal/e/i;
 
-    iget-object v3, v3, Lokhttp3/internal/e/i;->bwy:Lokhttp3/internal/e/i$b;
+    iget-object v3, v3, Lokhttp3/internal/e/i;->bwt: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 0b882f8523..3ea3ef3362 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 bwa:I
+.field final synthetic bvV:I
 
-.field final synthetic bwb:Lokhttp3/internal/e/b;
+.field final synthetic bvW:Lokhttp3/internal/e/b;
 
-.field final synthetic bwc:Lokhttp3/internal/e/g;
+.field final synthetic bvX: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;->bwc:Lokhttp3/internal/e/g;
+    iput-object p1, p0, Lokhttp3/internal/e/g$1;->bvX:Lokhttp3/internal/e/g;
 
-    iput p4, p0, Lokhttp3/internal/e/g$1;->bwa:I
+    iput p4, p0, Lokhttp3/internal/e/g$1;->bvV:I
 
-    iput-object p5, p0, Lokhttp3/internal/e/g$1;->bwb:Lokhttp3/internal/e/b;
+    iput-object p5, p0, Lokhttp3/internal/e/g$1;->bvW: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;->bwc:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$1;->bvX:Lokhttp3/internal/e/g;
 
-    iget v1, p0, Lokhttp3/internal/e/g$1;->bwa:I
+    iget v1, p0, Lokhttp3/internal/e/g$1;->bvV:I
 
-    iget-object v2, p0, Lokhttp3/internal/e/g$1;->bwb:Lokhttp3/internal/e/b;
+    iget-object v2, p0, Lokhttp3/internal/e/g$1;->bvW: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;->bwc:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$1;->bvX: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 b68a3cb6d4..64df73e071 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 bwa:I
+.field final synthetic bvV:I
 
-.field final synthetic bwc:Lokhttp3/internal/e/g;
+.field final synthetic bvX:Lokhttp3/internal/e/g;
 
-.field final synthetic bwd:J
+.field final synthetic bvY: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;->bwc:Lokhttp3/internal/e/g;
+    iput-object p1, p0, Lokhttp3/internal/e/g$2;->bvX:Lokhttp3/internal/e/g;
 
-    iput p4, p0, Lokhttp3/internal/e/g$2;->bwa:I
+    iput p4, p0, Lokhttp3/internal/e/g$2;->bvV:I
 
-    iput-wide p5, p0, Lokhttp3/internal/e/g$2;->bwd:J
+    iput-wide p5, p0, Lokhttp3/internal/e/g$2;->bvY: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;->bwc:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$2;->bvX:Lokhttp3/internal/e/g;
 
-    iget-object v0, v0, Lokhttp3/internal/e/g;->bvX:Lokhttp3/internal/e/j;
+    iget-object v0, v0, Lokhttp3/internal/e/g;->bvS:Lokhttp3/internal/e/j;
 
-    iget v1, p0, Lokhttp3/internal/e/g$2;->bwa:I
+    iget v1, p0, Lokhttp3/internal/e/g$2;->bvV:I
 
-    iget-wide v2, p0, Lokhttp3/internal/e/g$2;->bwd:J
+    iget-wide v2, p0, Lokhttp3/internal/e/g$2;->bvY: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;->bwc:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$2;->bvX: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 5bc791655e..c28aefe0da 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 bwa:I
+.field final synthetic bvV:I
 
-.field final synthetic bwc:Lokhttp3/internal/e/g;
+.field final synthetic bvX:Lokhttp3/internal/e/g;
 
-.field final synthetic bwe:Ljava/util/List;
+.field final synthetic bvZ: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;->bwc:Lokhttp3/internal/e/g;
+    iput-object p1, p0, Lokhttp3/internal/e/g$3;->bvX:Lokhttp3/internal/e/g;
 
-    iput p4, p0, Lokhttp3/internal/e/g$3;->bwa:I
+    iput p4, p0, Lokhttp3/internal/e/g$3;->bvV:I
 
-    iput-object p5, p0, Lokhttp3/internal/e/g$3;->bwe:Ljava/util/List;
+    iput-object p5, p0, Lokhttp3/internal/e/g$3;->bvZ: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;->bwc:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$3;->bvX:Lokhttp3/internal/e/g;
 
-    iget-object v0, v0, Lokhttp3/internal/e/g;->bvX:Lokhttp3/internal/e/j;
+    iget-object v0, v0, Lokhttp3/internal/e/g;->bvS:Lokhttp3/internal/e/j;
 
-    iget v1, p0, Lokhttp3/internal/e/g$3;->bwa:I
+    iget v1, p0, Lokhttp3/internal/e/g$3;->bvV:I
 
-    sget-object v2, Lokhttp3/internal/e/b;->buU:Lokhttp3/internal/e/b;
+    sget-object v2, Lokhttp3/internal/e/b;->buP: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;->bwc:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$3;->bvX: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;->bwc:Lokhttp3/internal/e/g;
+    iget-object v1, p0, Lokhttp3/internal/e/g$3;->bvX:Lokhttp3/internal/e/g;
 
-    iget-object v1, v1, Lokhttp3/internal/e/g;->bvZ:Ljava/util/Set;
+    iget-object v1, v1, Lokhttp3/internal/e/g;->bvU:Ljava/util/Set;
 
-    iget v2, p0, Lokhttp3/internal/e/g$3;->bwa:I
+    iget v2, p0, Lokhttp3/internal/e/g$3;->bvV: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 1cd319c9e9..656022d6e8 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 bwa:I
+.field final synthetic bvV:I
 
-.field final synthetic bwc:Lokhttp3/internal/e/g;
+.field final synthetic bvX:Lokhttp3/internal/e/g;
 
-.field final synthetic bwe:Ljava/util/List;
+.field final synthetic bvZ:Ljava/util/List;
 
-.field final synthetic bwf:Z
+.field final synthetic bwa: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;->bwc:Lokhttp3/internal/e/g;
+    iput-object p1, p0, Lokhttp3/internal/e/g$4;->bvX:Lokhttp3/internal/e/g;
 
-    iput p4, p0, Lokhttp3/internal/e/g$4;->bwa:I
+    iput p4, p0, Lokhttp3/internal/e/g$4;->bvV:I
 
-    iput-object p5, p0, Lokhttp3/internal/e/g$4;->bwe:Ljava/util/List;
+    iput-object p5, p0, Lokhttp3/internal/e/g$4;->bvZ:Ljava/util/List;
 
-    iput-boolean p6, p0, Lokhttp3/internal/e/g$4;->bwf:Z
+    iput-boolean p6, p0, Lokhttp3/internal/e/g$4;->bwa: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;->bwc:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$4;->bvX:Lokhttp3/internal/e/g;
 
-    iget-object v0, v0, Lokhttp3/internal/e/g;->bvX:Lokhttp3/internal/e/j;
+    iget-object v0, v0, Lokhttp3/internal/e/g;->bvS:Lokhttp3/internal/e/j;
 
-    iget v1, p0, Lokhttp3/internal/e/g$4;->bwa:I
+    iget v1, p0, Lokhttp3/internal/e/g$4;->bvV:I
 
-    sget-object v2, Lokhttp3/internal/e/b;->buU:Lokhttp3/internal/e/b;
+    sget-object v2, Lokhttp3/internal/e/b;->buP: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;->bwc:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$4;->bvX: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;->bwc:Lokhttp3/internal/e/g;
+    iget-object v1, p0, Lokhttp3/internal/e/g$4;->bvX:Lokhttp3/internal/e/g;
 
-    iget-object v1, v1, Lokhttp3/internal/e/g;->bvZ:Ljava/util/Set;
+    iget-object v1, v1, Lokhttp3/internal/e/g;->bvU:Ljava/util/Set;
 
-    iget v2, p0, Lokhttp3/internal/e/g$4;->bwa:I
+    iget v2, p0, Lokhttp3/internal/e/g$4;->bvV: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 5bdf9ffc49..3fb18f037b 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 bsw:I
+.field final synthetic bsr:I
 
-.field final synthetic bwa:I
+.field final synthetic bvV:I
 
-.field final synthetic bwc:Lokhttp3/internal/e/g;
+.field final synthetic bvX:Lokhttp3/internal/e/g;
 
-.field final synthetic bwf:Z
+.field final synthetic bwa:Z
 
-.field final synthetic bwg:Lokio/c;
+.field final synthetic bwb: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;->bwc:Lokhttp3/internal/e/g;
+    iput-object p1, p0, Lokhttp3/internal/e/g$5;->bvX:Lokhttp3/internal/e/g;
 
-    iput p4, p0, Lokhttp3/internal/e/g$5;->bwa:I
+    iput p4, p0, Lokhttp3/internal/e/g$5;->bvV:I
 
-    iput-object p5, p0, Lokhttp3/internal/e/g$5;->bwg:Lokio/c;
+    iput-object p5, p0, Lokhttp3/internal/e/g$5;->bwb:Lokio/c;
 
-    iput p6, p0, Lokhttp3/internal/e/g$5;->bsw:I
+    iput p6, p0, Lokhttp3/internal/e/g$5;->bsr:I
 
-    iput-boolean p7, p0, Lokhttp3/internal/e/g$5;->bwf:Z
+    iput-boolean p7, p0, Lokhttp3/internal/e/g$5;->bwa: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;->bwc:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$5;->bvX:Lokhttp3/internal/e/g;
 
-    iget-object v0, v0, Lokhttp3/internal/e/g;->bvQ:Lokhttp3/internal/e/l;
+    iget-object v0, v0, Lokhttp3/internal/e/g;->bvL:Lokhttp3/internal/e/l;
 
-    iget-object v1, p0, Lokhttp3/internal/e/g$5;->bwg:Lokio/c;
+    iget-object v1, p0, Lokhttp3/internal/e/g$5;->bwb:Lokio/c;
 
-    iget v2, p0, Lokhttp3/internal/e/g$5;->bsw:I
+    iget v2, p0, Lokhttp3/internal/e/g$5;->bsr:I
 
     invoke-interface {v0, v1, v2}, Lokhttp3/internal/e/l;->a(Lokio/d;I)Z
 
-    iget-object v0, p0, Lokhttp3/internal/e/g$5;->bwc:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$5;->bvX:Lokhttp3/internal/e/g;
 
-    iget-object v0, v0, Lokhttp3/internal/e/g;->bvX:Lokhttp3/internal/e/j;
+    iget-object v0, v0, Lokhttp3/internal/e/g;->bvS:Lokhttp3/internal/e/j;
 
-    iget v1, p0, Lokhttp3/internal/e/g$5;->bwa:I
+    iget v1, p0, Lokhttp3/internal/e/g$5;->bvV:I
 
-    sget-object v2, Lokhttp3/internal/e/b;->buU:Lokhttp3/internal/e/b;
+    sget-object v2, Lokhttp3/internal/e/b;->buP: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;->bwc:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$5;->bvX: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;->bwc:Lokhttp3/internal/e/g;
+    iget-object v1, p0, Lokhttp3/internal/e/g$5;->bvX:Lokhttp3/internal/e/g;
 
-    iget-object v1, v1, Lokhttp3/internal/e/g;->bvZ:Ljava/util/Set;
+    iget-object v1, v1, Lokhttp3/internal/e/g;->bvU:Ljava/util/Set;
 
-    iget v2, p0, Lokhttp3/internal/e/g$5;->bwa:I
+    iget v2, p0, Lokhttp3/internal/e/g$5;->bvV: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 daea8ddd38..8c4eb9d0cf 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 bwa:I
+.field final synthetic bvV:I
 
-.field final synthetic bwb:Lokhttp3/internal/e/b;
+.field final synthetic bvW:Lokhttp3/internal/e/b;
 
-.field final synthetic bwc:Lokhttp3/internal/e/g;
+.field final synthetic bvX: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;->bwc:Lokhttp3/internal/e/g;
+    iput-object p1, p0, Lokhttp3/internal/e/g$6;->bvX:Lokhttp3/internal/e/g;
 
-    iput p4, p0, Lokhttp3/internal/e/g$6;->bwa:I
+    iput p4, p0, Lokhttp3/internal/e/g$6;->bvV:I
 
-    iput-object p5, p0, Lokhttp3/internal/e/g$6;->bwb:Lokhttp3/internal/e/b;
+    iput-object p5, p0, Lokhttp3/internal/e/g$6;->bvW: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;->bwc:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$6;->bvX:Lokhttp3/internal/e/g;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lokhttp3/internal/e/g$6;->bwc:Lokhttp3/internal/e/g;
+    iget-object v1, p0, Lokhttp3/internal/e/g$6;->bvX:Lokhttp3/internal/e/g;
 
-    iget-object v1, v1, Lokhttp3/internal/e/g;->bvZ:Ljava/util/Set;
+    iget-object v1, v1, Lokhttp3/internal/e/g;->bvU:Ljava/util/Set;
 
-    iget v2, p0, Lokhttp3/internal/e/g$6;->bwa:I
+    iget v2, p0, Lokhttp3/internal/e/g$6;->bvV: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 e696812c5d..656a77ac6d 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 btX:Ljava/net/Socket;
+.field btS:Ljava/net/Socket;
 
-.field btZ:Lokio/BufferedSink;
+.field btU:Lokio/BufferedSink;
 
-.field bvJ:Z
+.field bvE:Z
 
-.field public bvK:Lokhttp3/internal/e/g$b;
+.field public bvF:Lokhttp3/internal/e/g$b;
 
-.field bvQ:Lokhttp3/internal/e/l;
+.field bvL:Lokhttp3/internal/e/l;
 
-.field public bwh:I
+.field public bwc:I
 
 .field hostname:Ljava/lang/String;
 
-.field lY:Lokio/d;
+.field lZ:Lokio/d;
 
 
 # direct methods
@@ -38,24 +38,24 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    sget-object v0, Lokhttp3/internal/e/g$b;->bwi:Lokhttp3/internal/e/g$b;
+    sget-object v0, Lokhttp3/internal/e/g$b;->bwd:Lokhttp3/internal/e/g$b;
 
-    iput-object v0, p0, Lokhttp3/internal/e/g$a;->bvK:Lokhttp3/internal/e/g$b;
+    iput-object v0, p0, Lokhttp3/internal/e/g$a;->bvF:Lokhttp3/internal/e/g$b;
 
-    sget-object v0, Lokhttp3/internal/e/l;->bwS:Lokhttp3/internal/e/l;
+    sget-object v0, Lokhttp3/internal/e/l;->bwN:Lokhttp3/internal/e/l;
 
-    iput-object v0, p0, Lokhttp3/internal/e/g$a;->bvQ:Lokhttp3/internal/e/l;
+    iput-object v0, p0, Lokhttp3/internal/e/g$a;->bvL:Lokhttp3/internal/e/l;
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lokhttp3/internal/e/g$a;->bvJ:Z
+    iput-boolean v0, p0, Lokhttp3/internal/e/g$a;->bvE:Z
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final Gx()Lokhttp3/internal/e/g;
+.method public final Gv()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;->btX:Ljava/net/Socket;
+    iput-object p1, p0, Lokhttp3/internal/e/g$a;->btS: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;->lY:Lokio/d;
+    iput-object p3, p0, Lokhttp3/internal/e/g$a;->lZ:Lokio/d;
 
-    iput-object p4, p0, Lokhttp3/internal/e/g$a;->btZ:Lokio/BufferedSink;
+    iput-object p4, p0, Lokhttp3/internal/e/g$a;->btU: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 8d3dee7bcb..2b4b1274b5 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;->buT:Lokhttp3/internal/e/b;
+    sget-object v0, Lokhttp3/internal/e/b;->buO: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 3d89173ed5..01ffe969ce 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 bwc:Lokhttp3/internal/e/g;
+.field final synthetic bvX:Lokhttp3/internal/e/g;
 
-.field final bwj:Z
+.field final bwe:Z
 
-.field final bwk:I
+.field final bwf:I
 
-.field final bwl:I
+.field final bwg:I
 
 
 # direct methods
 .method constructor <init>(Lokhttp3/internal/e/g;ZII)V
     .locals 2
 
-    iput-object p1, p0, Lokhttp3/internal/e/g$c;->bwc:Lokhttp3/internal/e/g;
+    iput-object p1, p0, Lokhttp3/internal/e/g$c;->bvX: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;->bwj:Z
+    iput-boolean p2, p0, Lokhttp3/internal/e/g$c;->bwe:Z
 
-    iput p3, p0, Lokhttp3/internal/e/g$c;->bwk:I
+    iput p3, p0, Lokhttp3/internal/e/g$c;->bwf:I
 
-    iput p4, p0, Lokhttp3/internal/e/g$c;->bwl:I
+    iput p4, p0, Lokhttp3/internal/e/g$c;->bwg: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;->bwc:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$c;->bvX:Lokhttp3/internal/e/g;
 
-    iget-boolean v1, p0, Lokhttp3/internal/e/g$c;->bwj:Z
+    iget-boolean v1, p0, Lokhttp3/internal/e/g$c;->bwe:Z
 
-    iget v2, p0, Lokhttp3/internal/e/g$c;->bwk:I
+    iget v2, p0, Lokhttp3/internal/e/g$c;->bwf:I
 
-    iget v3, p0, Lokhttp3/internal/e/g$c;->bwl:I
+    iget v3, p0, Lokhttp3/internal/e/g$c;->bwg:I
 
     if-nez v1, :cond_0
 
     monitor-enter v0
 
     :try_start_0
-    iget-boolean v4, v0, Lokhttp3/internal/e/g;->bvR:Z
+    iget-boolean v4, v0, Lokhttp3/internal/e/g;->bvM:Z
 
     const/4 v5, 0x1
 
-    iput-boolean v5, v0, Lokhttp3/internal/e/g;->bvR:Z
+    iput-boolean v5, v0, Lokhttp3/internal/e/g;->bvM:Z
 
     monitor-exit v0
     :try_end_0
@@ -99,7 +99,7 @@
 
     if-eqz v4, :cond_0
 
-    invoke-virtual {v0}, Lokhttp3/internal/e/g;->Gu()V
+    invoke-virtual {v0}, Lokhttp3/internal/e/g;->Gs()V
 
     return-void
 
@@ -115,7 +115,7 @@
 
     :cond_0
     :try_start_2
-    iget-object v4, v0, Lokhttp3/internal/e/g;->bvX:Lokhttp3/internal/e/j;
+    iget-object v4, v0, Lokhttp3/internal/e/g;->bvS: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;->Gu()V
+    invoke-virtual {v0}, Lokhttp3/internal/e/g;->Gs()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 7a8ad3603c..fea6cf4b5c 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 bwn:Lokhttp3/internal/e/i;
+.field final synthetic bwi:Lokhttp3/internal/e/i;
 
-.field final synthetic bwo:Lokhttp3/internal/e/g$d;
+.field final synthetic bwj: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;->bwo:Lokhttp3/internal/e/g$d;
+    iput-object p1, p0, Lokhttp3/internal/e/g$d$1;->bwj:Lokhttp3/internal/e/g$d;
 
-    iput-object p4, p0, Lokhttp3/internal/e/g$d$1;->bwn:Lokhttp3/internal/e/i;
+    iput-object p4, p0, Lokhttp3/internal/e/g$d$1;->bwi: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;->bwo:Lokhttp3/internal/e/g$d;
+    iget-object v0, p0, Lokhttp3/internal/e/g$d$1;->bwj:Lokhttp3/internal/e/g$d;
 
-    iget-object v0, v0, Lokhttp3/internal/e/g$d;->bwc:Lokhttp3/internal/e/g;
+    iget-object v0, v0, Lokhttp3/internal/e/g$d;->bvX:Lokhttp3/internal/e/g;
 
-    iget-object v0, v0, Lokhttp3/internal/e/g;->bvK:Lokhttp3/internal/e/g$b;
+    iget-object v0, v0, Lokhttp3/internal/e/g;->bvF:Lokhttp3/internal/e/g$b;
 
-    iget-object v1, p0, Lokhttp3/internal/e/g$d$1;->bwn:Lokhttp3/internal/e/i;
+    iget-object v1, p0, Lokhttp3/internal/e/g$d$1;->bwi: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;->GT()Lokhttp3/internal/g/f;
+    invoke-static {}, Lokhttp3/internal/g/f;->GR()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;->bwo:Lokhttp3/internal/e/g$d;
+    iget-object v4, p0, Lokhttp3/internal/e/g$d$1;->bwj:Lokhttp3/internal/e/g$d;
 
-    iget-object v4, v4, Lokhttp3/internal/e/g$d;->bwc:Lokhttp3/internal/e/g;
+    iget-object v4, v4, Lokhttp3/internal/e/g$d;->bvX: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;->bwn:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/g$d$1;->bwi:Lokhttp3/internal/e/i;
 
-    sget-object v1, Lokhttp3/internal/e/b;->buQ:Lokhttp3/internal/e/b;
+    sget-object v1, Lokhttp3/internal/e/b;->buL: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 6c3dddb10c..0b20c52d8c 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 bwo:Lokhttp3/internal/e/g$d;
+.field final synthetic bwj: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;->bwo:Lokhttp3/internal/e/g$d;
+    iput-object p1, p0, Lokhttp3/internal/e/g$d$2;->bwj: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;->bwo:Lokhttp3/internal/e/g$d;
+    iget-object v0, p0, Lokhttp3/internal/e/g$d$2;->bwj:Lokhttp3/internal/e/g$d;
 
-    iget-object v0, v0, Lokhttp3/internal/e/g$d;->bwc:Lokhttp3/internal/e/g;
+    iget-object v0, v0, Lokhttp3/internal/e/g$d;->bvX:Lokhttp3/internal/e/g;
 
-    iget-object v0, v0, Lokhttp3/internal/e/g;->bvK:Lokhttp3/internal/e/g$b;
+    iget-object v0, v0, Lokhttp3/internal/e/g;->bvF:Lokhttp3/internal/e/g$b;
 
-    iget-object v1, p0, Lokhttp3/internal/e/g$d$2;->bwo:Lokhttp3/internal/e/g$d;
+    iget-object v1, p0, Lokhttp3/internal/e/g$d$2;->bwj:Lokhttp3/internal/e/g$d;
 
-    iget-object v1, v1, Lokhttp3/internal/e/g$d;->bwc:Lokhttp3/internal/e/g;
+    iget-object v1, v1, Lokhttp3/internal/e/g$d;->bvX: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 26ff9cc1e8..f2a9eab1f6 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 bwo:Lokhttp3/internal/e/g$d;
+.field final synthetic bwj:Lokhttp3/internal/e/g$d;
 
-.field final synthetic bwp:Lokhttp3/internal/e/m;
+.field final synthetic bwk: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;->bwo:Lokhttp3/internal/e/g$d;
+    iput-object p1, p0, Lokhttp3/internal/e/g$d$3;->bwj:Lokhttp3/internal/e/g$d;
 
-    iput-object p4, p0, Lokhttp3/internal/e/g$d$3;->bwp:Lokhttp3/internal/e/m;
+    iput-object p4, p0, Lokhttp3/internal/e/g$d$3;->bwk: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;->bwo:Lokhttp3/internal/e/g$d;
+    iget-object v0, p0, Lokhttp3/internal/e/g$d$3;->bwj:Lokhttp3/internal/e/g$d;
 
-    iget-object v0, v0, Lokhttp3/internal/e/g$d;->bwc:Lokhttp3/internal/e/g;
+    iget-object v0, v0, Lokhttp3/internal/e/g$d;->bvX:Lokhttp3/internal/e/g;
 
-    iget-object v0, v0, Lokhttp3/internal/e/g;->bvX:Lokhttp3/internal/e/j;
+    iget-object v0, v0, Lokhttp3/internal/e/g;->bvS:Lokhttp3/internal/e/j;
 
-    iget-object v1, p0, Lokhttp3/internal/e/g$d$3;->bwp:Lokhttp3/internal/e/m;
+    iget-object v1, p0, Lokhttp3/internal/e/g$d$3;->bwk: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;->bwo:Lokhttp3/internal/e/g$d;
+    iget-object v0, p0, Lokhttp3/internal/e/g$d$3;->bwj:Lokhttp3/internal/e/g$d;
 
-    iget-object v0, v0, Lokhttp3/internal/e/g$d;->bwc:Lokhttp3/internal/e/g;
+    iget-object v0, v0, Lokhttp3/internal/e/g$d;->bvX: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 609c9f551c..2279e4be11 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 bwc:Lokhttp3/internal/e/g;
+.field final synthetic bvX:Lokhttp3/internal/e/g;
 
-.field final bwm:Lokhttp3/internal/e/h;
+.field final bwh: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;->bwc:Lokhttp3/internal/e/g;
+    iput-object p1, p0, Lokhttp3/internal/e/g$d;->bvX: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;->bwm:Lokhttp3/internal/e/h;
+    iput-object p2, p0, Lokhttp3/internal/e/g$d;->bwh: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;->bwc:Lokhttp3/internal/e/g;
+    iget-object p2, p0, Lokhttp3/internal/e/g$d;->bvX:Lokhttp3/internal/e/g;
 
     monitor-enter p2
 
     :try_start_0
-    iget-object v0, p0, Lokhttp3/internal/e/g$d;->bwc:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$d;->bvX: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;->bwc:Lokhttp3/internal/e/g;
+    iget-object v1, p0, Lokhttp3/internal/e/g$d;->bvX: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;->bwc:Lokhttp3/internal/e/g;
+    iget-object v1, p0, Lokhttp3/internal/e/g$d;->bvX:Lokhttp3/internal/e/g;
 
     const/4 v2, 0x1
 
-    iput-boolean v2, v1, Lokhttp3/internal/e/g;->bvN:Z
+    iput-boolean v2, v1, Lokhttp3/internal/e/g;->bvI:Z
 
     monitor-exit p2
     :try_end_0
@@ -107,17 +107,17 @@
 
     if-le v3, p1, :cond_0
 
-    invoke-virtual {v2}, Lokhttp3/internal/e/i;->Gz()Z
+    invoke-virtual {v2}, Lokhttp3/internal/e/i;->Gx()Z
 
     move-result v3
 
     if-eqz v3, :cond_0
 
-    sget-object v3, Lokhttp3/internal/e/b;->buT:Lokhttp3/internal/e/b;
+    sget-object v3, Lokhttp3/internal/e/b;->buO: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;->bwc:Lokhttp3/internal/e/g;
+    iget-object v3, p0, Lokhttp3/internal/e/g$d;->bvX: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;->bwc:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$d;->bvX:Lokhttp3/internal/e/g;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lokhttp3/internal/e/g$d;->bwc:Lokhttp3/internal/e/g;
+    iget-object v1, p0, Lokhttp3/internal/e/g$d;->bvX:Lokhttp3/internal/e/g;
 
-    iget-object v1, v1, Lokhttp3/internal/e/g;->bvV:Lokhttp3/internal/e/m;
+    iget-object v1, v1, Lokhttp3/internal/e/g;->bvQ:Lokhttp3/internal/e/m;
 
-    invoke-virtual {v1}, Lokhttp3/internal/e/m;->GL()I
+    invoke-virtual {v1}, Lokhttp3/internal/e/m;->GJ()I
 
     move-result v1
 
-    iget-object v2, p0, Lokhttp3/internal/e/g$d;->bwc:Lokhttp3/internal/e/g;
+    iget-object v2, p0, Lokhttp3/internal/e/g$d;->bvX:Lokhttp3/internal/e/g;
 
-    iget-object v2, v2, Lokhttp3/internal/e/g;->bvV:Lokhttp3/internal/e/m;
+    iget-object v2, v2, Lokhttp3/internal/e/g;->bvQ: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;->bwU:[I
+    iget-object v5, p1, Lokhttp3/internal/e/m;->bwP:[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;->bwc:Lokhttp3/internal/e/g;
+    iget-object v4, p0, Lokhttp3/internal/e/g$d;->bvX: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;->bwc:Lokhttp3/internal/e/g;
+    iget-object v8, p0, Lokhttp3/internal/e/g$d;->bvX: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;->bwc:Lokhttp3/internal/e/g;
+    iget-object p1, p0, Lokhttp3/internal/e/g$d;->bvX:Lokhttp3/internal/e/g;
 
-    iget-object p1, p1, Lokhttp3/internal/e/g;->bvV:Lokhttp3/internal/e/m;
+    iget-object p1, p1, Lokhttp3/internal/e/g;->bvQ:Lokhttp3/internal/e/m;
 
-    invoke-virtual {p1}, Lokhttp3/internal/e/m;->GL()I
+    invoke-virtual {p1}, Lokhttp3/internal/e/m;->GJ()I
 
     move-result p1
 
@@ -249,18 +249,18 @@
 
     int-to-long v8, p1
 
-    iget-object p1, p0, Lokhttp3/internal/e/g$d;->bwc:Lokhttp3/internal/e/g;
+    iget-object p1, p0, Lokhttp3/internal/e/g$d;->bvX:Lokhttp3/internal/e/g;
 
-    iget-boolean p1, p1, Lokhttp3/internal/e/g;->bvW:Z
+    iget-boolean p1, p1, Lokhttp3/internal/e/g;->bvR:Z
 
     if-nez p1, :cond_2
 
-    iget-object p1, p0, Lokhttp3/internal/e/g$d;->bwc:Lokhttp3/internal/e/g;
+    iget-object p1, p0, Lokhttp3/internal/e/g$d;->bvX:Lokhttp3/internal/e/g;
 
-    iput-boolean v2, p1, Lokhttp3/internal/e/g;->bvW:Z
+    iput-boolean v2, p1, Lokhttp3/internal/e/g;->bvR:Z
 
     :cond_2
-    iget-object p1, p0, Lokhttp3/internal/e/g$d;->bwc:Lokhttp3/internal/e/g;
+    iget-object p1, p0, Lokhttp3/internal/e/g$d;->bvX: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;->bwc:Lokhttp3/internal/e/g;
+    iget-object p1, p0, Lokhttp3/internal/e/g$d;->bvX: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;->bwc:Lokhttp3/internal/e/g;
+    iget-object v1, p0, Lokhttp3/internal/e/g$d;->bvX: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;->Gw()Ljava/util/concurrent/ExecutorService;
+    invoke-static {}, Lokhttp3/internal/e/g;->Gu()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;->bwc:Lokhttp3/internal/e/g;
+    iget-object v10, p0, Lokhttp3/internal/e/g$d;->bvX: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;->bwc:Lokhttp3/internal/e/g;
+    iget-object p1, p0, Lokhttp3/internal/e/g$d;->bvX:Lokhttp3/internal/e/g;
 
     monitor-enter p1
 
     :try_start_0
-    iget-object p2, p0, Lokhttp3/internal/e/g$d;->bwc:Lokhttp3/internal/e/g;
+    iget-object p2, p0, Lokhttp3/internal/e/g$d;->bvX: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;->bwc:Lokhttp3/internal/e/g;
+    iget-object p2, p0, Lokhttp3/internal/e/g$d;->bvX: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;->bwc:Lokhttp3/internal/e/g;
+    iget-object p1, p0, Lokhttp3/internal/e/g$d;->bvX: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;->bwc:Lokhttp3/internal/e/g;
+    iget-object v1, p0, Lokhttp3/internal/e/g$d;->bvX: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;->bwc:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$d;->bvX: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;->bwc:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$d;->bvX:Lokhttp3/internal/e/g;
 
     monitor-enter v0
 
     :try_start_1
-    iget-object v4, p0, Lokhttp3/internal/e/g$d;->bwc:Lokhttp3/internal/e/g;
+    iget-object v4, p0, Lokhttp3/internal/e/g$d;->bvX: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;->bwc:Lokhttp3/internal/e/g;
+    iget-object v4, p0, Lokhttp3/internal/e/g$d;->bvX:Lokhttp3/internal/e/g;
 
-    iget-boolean v4, v4, Lokhttp3/internal/e/g;->bvN:Z
+    iget-boolean v4, v4, Lokhttp3/internal/e/g;->bvI:Z
 
     if-eqz v4, :cond_1
 
@@ -521,9 +521,9 @@
     return-void
 
     :cond_1
-    iget-object v4, p0, Lokhttp3/internal/e/g$d;->bwc:Lokhttp3/internal/e/g;
+    iget-object v4, p0, Lokhttp3/internal/e/g$d;->bvX:Lokhttp3/internal/e/g;
 
-    iget v4, v4, Lokhttp3/internal/e/g;->bvL:I
+    iget v4, v4, Lokhttp3/internal/e/g;->bvG: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;->bwc:Lokhttp3/internal/e/g;
+    iget-object v5, p0, Lokhttp3/internal/e/g$d;->bvX:Lokhttp3/internal/e/g;
 
-    iget v5, v5, Lokhttp3/internal/e/g;->bvM:I
+    iget v5, v5, Lokhttp3/internal/e/g;->bvH: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;->bwc:Lokhttp3/internal/e/g;
+    iget-object v6, p0, Lokhttp3/internal/e/g$d;->bvX: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;->bwc:Lokhttp3/internal/e/g;
+    iget-object p1, p0, Lokhttp3/internal/e/g$d;->bvX:Lokhttp3/internal/e/g;
 
-    iput p2, p1, Lokhttp3/internal/e/g;->bvL:I
+    iput p2, p1, Lokhttp3/internal/e/g;->bvG:I
 
-    iget-object p1, p0, Lokhttp3/internal/e/g$d;->bwc:Lokhttp3/internal/e/g;
+    iget-object p1, p0, Lokhttp3/internal/e/g$d;->bvX: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;->Gw()Ljava/util/concurrent/ExecutorService;
+    invoke-static {}, Lokhttp3/internal/e/g;->Gu()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;->bwc:Lokhttp3/internal/e/g;
+    iget-object v6, p0, Lokhttp3/internal/e/g$d;->bvX: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;->bwx:Z
+    iput-boolean v2, v4, Lokhttp3/internal/e/i;->bws:Z
 
-    iget-object p2, v4, Lokhttp3/internal/e/i;->bwv:Ljava/util/Deque;
+    iget-object p2, v4, Lokhttp3/internal/e/i;->bwq: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;->bvE:Lokhttp3/internal/e/g;
+    iget-object p2, v4, Lokhttp3/internal/e/i;->bvz: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;->GC()V
+    invoke-virtual {v4}, Lokhttp3/internal/e/i;->GA()V
 
     :cond_8
     return-void
@@ -709,7 +709,7 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lokhttp3/internal/e/g$d;->bwc:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$d;->bvX: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;->bwc:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$d;->bvX: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;->bwc:Lokhttp3/internal/e/g;
+    iget-object p1, p0, Lokhttp3/internal/e/g$d;->bvX:Lokhttp3/internal/e/g;
 
-    sget-object v0, Lokhttp3/internal/e/b;->buQ:Lokhttp3/internal/e/b;
+    sget-object v0, Lokhttp3/internal/e/b;->buL: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;->bwc:Lokhttp3/internal/e/g;
+    iget-object p1, p0, Lokhttp3/internal/e/g$d;->bvX: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;->bwy:Lokhttp3/internal/e/i$b;
+    iget-object p2, v0, Lokhttp3/internal/e/i;->bwt: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;->GC()V
+    invoke-virtual {v0}, Lokhttp3/internal/e/i;->GA()V
 
     :cond_5
     return-void
@@ -860,7 +860,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/internal/e/g$d;->bwc:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$d;->bvX: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;->bwc:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$d;->bvX: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;->buR:Lokhttp3/internal/e/b;
+    sget-object v0, Lokhttp3/internal/e/b;->buM:Lokhttp3/internal/e/b;
 
-    sget-object v1, Lokhttp3/internal/e/b;->buR:Lokhttp3/internal/e/b;
+    sget-object v1, Lokhttp3/internal/e/b;->buM:Lokhttp3/internal/e/b;
 
     :try_start_0
-    iget-object v2, p0, Lokhttp3/internal/e/g$d;->bwm:Lokhttp3/internal/e/h;
+    iget-object v2, p0, Lokhttp3/internal/e/g$d;->bwh:Lokhttp3/internal/e/h;
 
-    iget-boolean v3, v2, Lokhttp3/internal/e/h;->bvJ:Z
+    iget-boolean v3, v2, Lokhttp3/internal/e/h;->bvE:Z
 
     const/4 v4, 0x1
 
@@ -951,9 +951,9 @@
     throw v2
 
     :cond_1
-    iget-object v2, v2, Lokhttp3/internal/e/h;->lY:Lokio/d;
+    iget-object v2, v2, Lokhttp3/internal/e/h;->lZ:Lokio/d;
 
-    sget-object v3, Lokhttp3/internal/e/e;->bvx:Lokio/ByteString;
+    sget-object v3, Lokhttp3/internal/e/e;->bvs:Lokio/ByteString;
 
     invoke-virtual {v3}, Lokio/ByteString;->size()I
 
@@ -965,7 +965,7 @@
 
     move-result-object v2
 
-    sget-object v3, Lokhttp3/internal/e/h;->HZ:Ljava/util/logging/Logger;
+    sget-object v3, Lokhttp3/internal/e/h;->HV: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;->HZ:Ljava/util/logging/Logger;
+    sget-object v3, Lokhttp3/internal/e/h;->HV:Ljava/util/logging/Logger;
 
     const-string v6, "<< CONNECTION %s"
 
     new-array v7, v4, [Ljava/lang/Object;
 
-    invoke-virtual {v2}, Lokio/ByteString;->Hx()Ljava/lang/String;
+    invoke-virtual {v2}, Lokio/ByteString;->Hv()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;->bvx:Lokio/ByteString;
+    sget-object v3, Lokhttp3/internal/e/e;->bvs: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;->bwm:Lokhttp3/internal/e/h;
+    iget-object v2, p0, Lokhttp3/internal/e/g$d;->bwh: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;->buP:Lokhttp3/internal/e/b;
+    sget-object v0, Lokhttp3/internal/e/b;->buK:Lokhttp3/internal/e/b;
 
-    sget-object v1, Lokhttp3/internal/e/b;->buU:Lokhttp3/internal/e/b;
+    sget-object v1, Lokhttp3/internal/e/b;->buP: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;->bwc:Lokhttp3/internal/e/g;
+    iget-object v2, p0, Lokhttp3/internal/e/g$d;->bvX: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;->bwm:Lokhttp3/internal/e/h;
+    iget-object v0, p0, Lokhttp3/internal/e/g$d;->bwh: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;->Ht()Ljava/lang/String;
+    invoke-virtual {v2}, Lokio/ByteString;->Hr()Ljava/lang/String;
 
     move-result-object v2
 
@@ -1062,14 +1062,14 @@
 
     :catch_1
     :try_start_3
-    sget-object v0, Lokhttp3/internal/e/b;->buQ:Lokhttp3/internal/e/b;
+    sget-object v0, Lokhttp3/internal/e/b;->buL:Lokhttp3/internal/e/b;
 
-    sget-object v1, Lokhttp3/internal/e/b;->buQ:Lokhttp3/internal/e/b;
+    sget-object v1, Lokhttp3/internal/e/b;->buL: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;->bwc:Lokhttp3/internal/e/g;
+    iget-object v2, p0, Lokhttp3/internal/e/g$d;->bvX: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;->bwc:Lokhttp3/internal/e/g;
+    iget-object v3, p0, Lokhttp3/internal/e/g$d;->bvX: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;->bwm:Lokhttp3/internal/e/h;
+    iget-object v0, p0, Lokhttp3/internal/e/g$d;->bwh: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;->bwc:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$d;->bvX:Lokhttp3/internal/e/g;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object p1, p0, Lokhttp3/internal/e/g$d;->bwc:Lokhttp3/internal/e/g;
+    iget-object p1, p0, Lokhttp3/internal/e/g$d;->bvX:Lokhttp3/internal/e/g;
 
-    iget-wide v1, p1, Lokhttp3/internal/e/g;->bvT:J
+    iget-wide v1, p1, Lokhttp3/internal/e/g;->bvO:J
 
     add-long/2addr v1, p2
 
-    iput-wide v1, p1, Lokhttp3/internal/e/g;->bvT:J
+    iput-wide v1, p1, Lokhttp3/internal/e/g;->bvO:J
 
-    iget-object p1, p0, Lokhttp3/internal/e/g$d;->bwc:Lokhttp3/internal/e/g;
+    iget-object p1, p0, Lokhttp3/internal/e/g$d;->bvX: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;->bwc:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$d;->bvX: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;->bwc:Lokhttp3/internal/e/g;
+    iget-object v6, p0, Lokhttp3/internal/e/g$d;->bvX:Lokhttp3/internal/e/g;
 
     monitor-enter v6
 
     :try_start_0
-    iget-object v0, v6, Lokhttp3/internal/e/g;->bvZ:Ljava/util/Set;
+    iget-object v0, v6, Lokhttp3/internal/e/g;->bvU: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;->buQ:Lokhttp3/internal/e/b;
+    sget-object p2, Lokhttp3/internal/e/b;->buL: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;->bvZ:Ljava/util/Set;
+    iget-object v0, v6, Lokhttp3/internal/e/g;->bvU: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 60409b7d40..1a62cc34d6 100644
--- a/com.discord/smali_classes2/okhttp3/internal/e/g.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/e/g.smali
@@ -20,45 +20,45 @@
 # static fields
 .field static final synthetic $assertionsDisabled:Z
 
-.field private static final bvI:Ljava/util/concurrent/ExecutorService;
+.field private static final bvD:Ljava/util/concurrent/ExecutorService;
 
 
 # instance fields
-.field final btX:Ljava/net/Socket;
+.field final btS:Ljava/net/Socket;
 
-.field final bvJ:Z
+.field final bvE:Z
 
-.field final bvK:Lokhttp3/internal/e/g$b;
+.field final bvF:Lokhttp3/internal/e/g$b;
 
-.field bvL:I
+.field bvG:I
 
-.field bvM:I
+.field bvH:I
 
-.field bvN:Z
+.field bvI:Z
 
-.field private final bvO:Ljava/util/concurrent/ScheduledExecutorService;
+.field private final bvJ:Ljava/util/concurrent/ScheduledExecutorService;
 
-.field private final bvP:Ljava/util/concurrent/ExecutorService;
+.field private final bvK:Ljava/util/concurrent/ExecutorService;
 
-.field final bvQ:Lokhttp3/internal/e/l;
+.field final bvL:Lokhttp3/internal/e/l;
+
+.field bvM:Z
+
+.field bvN:J
+
+.field bvO:J
+
+.field bvP:Lokhttp3/internal/e/m;
+
+.field final bvQ:Lokhttp3/internal/e/m;
 
 .field bvR:Z
 
-.field bvS:J
+.field final bvS:Lokhttp3/internal/e/j;
 
-.field bvT:J
+.field final bvT:Lokhttp3/internal/e/g$d;
 
-.field bvU:Lokhttp3/internal/e/m;
-
-.field final bvV:Lokhttp3/internal/e/m;
-
-.field bvW:Z
-
-.field final bvX:Lokhttp3/internal/e/j;
-
-.field final bvY:Lokhttp3/internal/e/g$d;
-
-.field final bvZ:Ljava/util/Set;
+.field final bvU:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -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;->bvI:Ljava/util/concurrent/ExecutorService;
+    sput-object v8, Lokhttp3/internal/e/g;->bvD: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;->bvS:J
+    iput-wide v2, v0, Lokhttp3/internal/e/g;->bvN: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;->bvU:Lokhttp3/internal/e/m;
+    iput-object v2, v0, Lokhttp3/internal/e/g;->bvP: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;->bvV:Lokhttp3/internal/e/m;
+    iput-object v2, v0, Lokhttp3/internal/e/g;->bvQ:Lokhttp3/internal/e/m;
 
     const/4 v2, 0x0
 
-    iput-boolean v2, v0, Lokhttp3/internal/e/g;->bvW:Z
+    iput-boolean v2, v0, Lokhttp3/internal/e/g;->bvR:Z
 
     new-instance v3, Ljava/util/LinkedHashSet;
 
     invoke-direct {v3}, Ljava/util/LinkedHashSet;-><init>()V
 
-    iput-object v3, v0, Lokhttp3/internal/e/g;->bvZ:Ljava/util/Set;
+    iput-object v3, v0, Lokhttp3/internal/e/g;->bvU:Ljava/util/Set;
 
-    iget-object v3, v1, Lokhttp3/internal/e/g$a;->bvQ:Lokhttp3/internal/e/l;
+    iget-object v3, v1, Lokhttp3/internal/e/g$a;->bvL:Lokhttp3/internal/e/l;
 
-    iput-object v3, v0, Lokhttp3/internal/e/g;->bvQ:Lokhttp3/internal/e/l;
+    iput-object v3, v0, Lokhttp3/internal/e/g;->bvL:Lokhttp3/internal/e/l;
 
-    iget-boolean v3, v1, Lokhttp3/internal/e/g$a;->bvJ:Z
+    iget-boolean v3, v1, Lokhttp3/internal/e/g$a;->bvE:Z
 
-    iput-boolean v3, v0, Lokhttp3/internal/e/g;->bvJ:Z
+    iput-boolean v3, v0, Lokhttp3/internal/e/g;->bvE:Z
 
-    iget-object v3, v1, Lokhttp3/internal/e/g$a;->bvK:Lokhttp3/internal/e/g$b;
+    iget-object v3, v1, Lokhttp3/internal/e/g$a;->bvF:Lokhttp3/internal/e/g$b;
 
-    iput-object v3, v0, Lokhttp3/internal/e/g;->bvK:Lokhttp3/internal/e/g$b;
+    iput-object v3, v0, Lokhttp3/internal/e/g;->bvF:Lokhttp3/internal/e/g$b;
 
-    iget-boolean v3, v1, Lokhttp3/internal/e/g$a;->bvJ:Z
+    iget-boolean v3, v1, Lokhttp3/internal/e/g$a;->bvE:Z
 
     const/4 v4, 0x2
 
@@ -186,26 +186,26 @@
     const/4 v3, 0x2
 
     :goto_0
-    iput v3, v0, Lokhttp3/internal/e/g;->bvM:I
+    iput v3, v0, Lokhttp3/internal/e/g;->bvH:I
 
-    iget-boolean v3, v1, Lokhttp3/internal/e/g$a;->bvJ:Z
+    iget-boolean v3, v1, Lokhttp3/internal/e/g$a;->bvE:Z
 
     if-eqz v3, :cond_1
 
-    iget v3, v0, Lokhttp3/internal/e/g;->bvM:I
+    iget v3, v0, Lokhttp3/internal/e/g;->bvH:I
 
     add-int/2addr v3, v4
 
-    iput v3, v0, Lokhttp3/internal/e/g;->bvM:I
+    iput v3, v0, Lokhttp3/internal/e/g;->bvH:I
 
     :cond_1
-    iget-boolean v3, v1, Lokhttp3/internal/e/g$a;->bvJ:Z
+    iget-boolean v3, v1, Lokhttp3/internal/e/g$a;->bvE:Z
 
     const/4 v4, 0x7
 
     if-eqz v3, :cond_2
 
-    iget-object v3, v0, Lokhttp3/internal/e/g;->bvU:Lokhttp3/internal/e/m;
+    iget-object v3, v0, Lokhttp3/internal/e/g;->bvP: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;->bvO:Ljava/util/concurrent/ScheduledExecutorService;
+    iput-object v3, v0, Lokhttp3/internal/e/g;->bvJ:Ljava/util/concurrent/ScheduledExecutorService;
 
-    iget v3, v1, Lokhttp3/internal/e/g$a;->bwh:I
+    iget v3, v1, Lokhttp3/internal/e/g$a;->bwc:I
 
     if-eqz v3, :cond_3
 
-    iget-object v6, v0, Lokhttp3/internal/e/g;->bvO:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object v6, v0, Lokhttp3/internal/e/g;->bvJ: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;->bwh:I
+    iget v3, v1, Lokhttp3/internal/e/g$a;->bwc:I
 
     int-to-long v8, v3
 
-    iget v3, v1, Lokhttp3/internal/e/g$a;->bwh:I
+    iget v3, v1, Lokhttp3/internal/e/g$a;->bwc: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;->bvP:Ljava/util/concurrent/ExecutorService;
+    iput-object v3, v0, Lokhttp3/internal/e/g;->bvK:Ljava/util/concurrent/ExecutorService;
 
-    iget-object v2, v0, Lokhttp3/internal/e/g;->bvV:Lokhttp3/internal/e/m;
+    iget-object v2, v0, Lokhttp3/internal/e/g;->bvQ: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;->bvV:Lokhttp3/internal/e/m;
+    iget-object v2, v0, Lokhttp3/internal/e/g;->bvQ: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;->bvV:Lokhttp3/internal/e/m;
+    iget-object v2, v0, Lokhttp3/internal/e/g;->bvQ:Lokhttp3/internal/e/m;
 
-    invoke-virtual {v2}, Lokhttp3/internal/e/m;->GL()I
+    invoke-virtual {v2}, Lokhttp3/internal/e/m;->GJ()I
 
     move-result v2
 
     int-to-long v2, v2
 
-    iput-wide v2, v0, Lokhttp3/internal/e/g;->bvT:J
+    iput-wide v2, v0, Lokhttp3/internal/e/g;->bvO:J
 
-    iget-object v2, v1, Lokhttp3/internal/e/g$a;->btX:Ljava/net/Socket;
+    iget-object v2, v1, Lokhttp3/internal/e/g$a;->btS:Ljava/net/Socket;
 
-    iput-object v2, v0, Lokhttp3/internal/e/g;->btX:Ljava/net/Socket;
+    iput-object v2, v0, Lokhttp3/internal/e/g;->btS:Ljava/net/Socket;
 
     new-instance v2, Lokhttp3/internal/e/j;
 
-    iget-object v3, v1, Lokhttp3/internal/e/g$a;->btZ:Lokio/BufferedSink;
+    iget-object v3, v1, Lokhttp3/internal/e/g$a;->btU:Lokio/BufferedSink;
 
-    iget-boolean v4, v0, Lokhttp3/internal/e/g;->bvJ:Z
+    iget-boolean v4, v0, Lokhttp3/internal/e/g;->bvE:Z
 
     invoke-direct {v2, v3, v4}, Lokhttp3/internal/e/j;-><init>(Lokio/BufferedSink;Z)V
 
-    iput-object v2, v0, Lokhttp3/internal/e/g;->bvX:Lokhttp3/internal/e/j;
+    iput-object v2, v0, Lokhttp3/internal/e/g;->bvS: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;->lY:Lokio/d;
+    iget-object v1, v1, Lokhttp3/internal/e/g$a;->lZ:Lokio/d;
 
-    iget-boolean v4, v0, Lokhttp3/internal/e/g;->bvJ:Z
+    iget-boolean v4, v0, Lokhttp3/internal/e/g;->bvE: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;->bvY:Lokhttp3/internal/e/g$d;
+    iput-object v2, v0, Lokhttp3/internal/e/g;->bvT:Lokhttp3/internal/e/g$d;
 
     return-void
 .end method
 
-.method static synthetic Gw()Ljava/util/concurrent/ExecutorService;
+.method static synthetic Gu()Ljava/util/concurrent/ExecutorService;
     .locals 1
 
-    sget-object v0, Lokhttp3/internal/e/g;->bvI:Ljava/util/concurrent/ExecutorService;
+    sget-object v0, Lokhttp3/internal/e/g;->bvD:Ljava/util/concurrent/ExecutorService;
 
     return-object v0
 .end method
@@ -368,7 +368,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/e/g;->bvX:Lokhttp3/internal/e/j;
+    iget-object v0, p0, Lokhttp3/internal/e/g;->bvS: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;->bvN:Z
+    iget-boolean v1, p0, Lokhttp3/internal/e/g;->bvI: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;->bvN:Z
+    iput-boolean v1, p0, Lokhttp3/internal/e/g;->bvI:Z
 
-    iget v1, p0, Lokhttp3/internal/e/g;->bvL:I
+    iget v1, p0, Lokhttp3/internal/e/g;->bvG: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;->bvX:Lokhttp3/internal/e/j;
+    iget-object v2, p0, Lokhttp3/internal/e/g;->bvS:Lokhttp3/internal/e/j;
 
-    sget-object v3, Lokhttp3/internal/c;->bsW:[B
+    sget-object v3, Lokhttp3/internal/c;->bsR:[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;->Gu()V
+    invoke-virtual {p0}, Lokhttp3/internal/e/g;->Gs()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;->bvO:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object p0, p0, Lokhttp3/internal/e/g;->bvJ: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;->bvR:Z
+    iput-boolean v0, p0, Lokhttp3/internal/e/g;->bvM:Z
 
     return v0
 .end method
@@ -486,21 +486,21 @@
 
 
 # virtual methods
-.method public final declared-synchronized Gt()I
+.method public final declared-synchronized Gr()I
     .locals 2
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lokhttp3/internal/e/g;->bvV:Lokhttp3/internal/e/m;
+    iget-object v0, p0, Lokhttp3/internal/e/g;->bvQ:Lokhttp3/internal/e/m;
 
-    iget v1, v0, Lokhttp3/internal/e/m;->bwT:I
+    iget v1, v0, Lokhttp3/internal/e/m;->bwO:I
 
     and-int/lit8 v1, v1, 0x10
 
     if-eqz v1, :cond_0
 
-    iget-object v0, v0, Lokhttp3/internal/e/m;->bwU:[I
+    iget-object v0, v0, Lokhttp3/internal/e/m;->bwP:[I
 
     const/4 v1, 0x4
 
@@ -527,11 +527,11 @@
     throw v0
 .end method
 
-.method final Gu()V
+.method final Gs()V
     .locals 1
 
     :try_start_0
-    sget-object v0, Lokhttp3/internal/e/b;->buQ:Lokhttp3/internal/e/b;
+    sget-object v0, Lokhttp3/internal/e/b;->buL: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 Gv()V
+.method public final Gt()V
     .locals 4
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -549,19 +549,19 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/e/g;->bvX:Lokhttp3/internal/e/j;
+    iget-object v0, p0, Lokhttp3/internal/e/g;->bvS:Lokhttp3/internal/e/j;
 
-    invoke-virtual {v0}, Lokhttp3/internal/e/j;->GH()V
+    invoke-virtual {v0}, Lokhttp3/internal/e/j;->GF()V
 
-    iget-object v0, p0, Lokhttp3/internal/e/g;->bvX:Lokhttp3/internal/e/j;
+    iget-object v0, p0, Lokhttp3/internal/e/g;->bvS:Lokhttp3/internal/e/j;
 
-    iget-object v1, p0, Lokhttp3/internal/e/g;->bvU:Lokhttp3/internal/e/m;
+    iget-object v1, p0, Lokhttp3/internal/e/g;->bvP: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;->bvU:Lokhttp3/internal/e/m;
+    iget-object v0, p0, Lokhttp3/internal/e/g;->bvP:Lokhttp3/internal/e/m;
 
-    invoke-virtual {v0}, Lokhttp3/internal/e/m;->GL()I
+    invoke-virtual {v0}, Lokhttp3/internal/e/m;->GJ()I
 
     move-result v0
 
@@ -569,7 +569,7 @@
 
     if-eq v0, v1, :cond_0
 
-    iget-object v2, p0, Lokhttp3/internal/e/g;->bvX:Lokhttp3/internal/e/j;
+    iget-object v2, p0, Lokhttp3/internal/e/g;->bvS: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;->bvY:Lokhttp3/internal/e/g$d;
+    iget-object v1, p0, Lokhttp3/internal/e/g;->bvT: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;->bvO:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object v0, p0, Lokhttp3/internal/e/g;->bvJ: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;->bvX:Lokhttp3/internal/e/j;
+    iget-object p4, p0, Lokhttp3/internal/e/g;->bvS: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;->bvT:J
+    iget-wide v3, p0, Lokhttp3/internal/e/g;->bvO:J
 
     cmp-long v5, v3, v1
 
@@ -705,7 +705,7 @@
 
     :cond_2
     :try_start_1
-    iget-wide v3, p0, Lokhttp3/internal/e/g;->bvT:J
+    iget-wide v3, p0, Lokhttp3/internal/e/g;->bvO: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;->bvX:Lokhttp3/internal/e/j;
+    iget-object v3, p0, Lokhttp3/internal/e/g;->bvS:Lokhttp3/internal/e/j;
 
-    iget v3, v3, Lokhttp3/internal/e/j;->bwJ:I
+    iget v3, v3, Lokhttp3/internal/e/j;->bwE:I
 
     invoke-static {v4, v3}, Ljava/lang/Math;->min(II)I
 
     move-result v3
 
-    iget-wide v4, p0, Lokhttp3/internal/e/g;->bvT:J
+    iget-wide v4, p0, Lokhttp3/internal/e/g;->bvO:J
 
     int-to-long v6, v3
 
     sub-long/2addr v4, v6
 
-    iput-wide v4, p0, Lokhttp3/internal/e/g;->bvT:J
+    iput-wide v4, p0, Lokhttp3/internal/e/g;->bvO:J
 
     monitor-exit p0
     :try_end_1
@@ -735,7 +735,7 @@
 
     sub-long/2addr p4, v6
 
-    iget-object v4, p0, Lokhttp3/internal/e/g;->bvX:Lokhttp3/internal/e/j;
+    iget-object v4, p0, Lokhttp3/internal/e/g;->bvS: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;->bvP:Ljava/util/concurrent/ExecutorService;
+    iget-object v0, p0, Lokhttp3/internal/e/g;->bvK: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;->bvX:Lokhttp3/internal/e/j;
+    iget-object p2, p0, Lokhttp3/internal/e/g;->bvS: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;->btX:Ljava/net/Socket;
+    iget-object p2, p0, Lokhttp3/internal/e/g;->btS: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;->bvO:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object p2, p0, Lokhttp3/internal/e/g;->bvJ:Ljava/util/concurrent/ScheduledExecutorService;
 
     invoke-interface {p2}, Ljava/util/concurrent/ScheduledExecutorService;->shutdown()V
 
-    iget-object p2, p0, Lokhttp3/internal/e/g;->bvP:Ljava/util/concurrent/ExecutorService;
+    iget-object p2, p0, Lokhttp3/internal/e/g;->bvK: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;->bvS:J
+    iget-wide v0, p0, Lokhttp3/internal/e/g;->bvN:J
 
     add-long/2addr v0, p1
 
-    iput-wide v0, p0, Lokhttp3/internal/e/g;->bvS:J
+    iput-wide v0, p0, Lokhttp3/internal/e/g;->bvN:J
 
-    iget-wide p1, p0, Lokhttp3/internal/e/g;->bvS:J
+    iget-wide p1, p0, Lokhttp3/internal/e/g;->bvN:J
 
-    iget-object v0, p0, Lokhttp3/internal/e/g;->bvU:Lokhttp3/internal/e/m;
+    iget-object v0, p0, Lokhttp3/internal/e/g;->bvP:Lokhttp3/internal/e/m;
 
-    invoke-virtual {v0}, Lokhttp3/internal/e/m;->GL()I
+    invoke-virtual {v0}, Lokhttp3/internal/e/m;->GJ()I
 
     move-result v0
 
@@ -1004,13 +1004,13 @@
 
     const/4 p1, 0x0
 
-    iget-wide v0, p0, Lokhttp3/internal/e/g;->bvS:J
+    iget-wide v0, p0, Lokhttp3/internal/e/g;->bvN: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;->bvS:J
+    iput-wide p1, p0, Lokhttp3/internal/e/g;->bvN: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;->bvX:Lokhttp3/internal/e/j;
+    iget-object v0, p0, Lokhttp3/internal/e/g;->bvS: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;->bvX:Lokhttp3/internal/e/j;
+    iget-object v7, p0, Lokhttp3/internal/e/g;->bvS: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;->bvM:I
+    iget v0, p0, Lokhttp3/internal/e/g;->bvH:I
 
     const v1, 0x3fffffff    # 1.9999999f
 
     if-le v0, v1, :cond_0
 
-    sget-object v0, Lokhttp3/internal/e/b;->buT:Lokhttp3/internal/e/b;
+    sget-object v0, Lokhttp3/internal/e/b;->buO: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;->bvN:Z
+    iget-boolean v0, p0, Lokhttp3/internal/e/g;->bvI:Z
 
     if-nez v0, :cond_5
 
-    iget v8, p0, Lokhttp3/internal/e/g;->bvM:I
+    iget v8, p0, Lokhttp3/internal/e/g;->bvH:I
 
-    iget v0, p0, Lokhttp3/internal/e/g;->bvM:I
+    iget v0, p0, Lokhttp3/internal/e/g;->bvH:I
 
     add-int/lit8 v0, v0, 0x2
 
-    iput v0, p0, Lokhttp3/internal/e/g;->bvM:I
+    iput v0, p0, Lokhttp3/internal/e/g;->bvH: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;->bvT:J
+    iget-wide v0, p0, Lokhttp3/internal/e/g;->bvO:J
 
     const-wide/16 v2, 0x0
 
@@ -1121,7 +1121,7 @@
 
     if-eqz p2, :cond_2
 
-    iget-wide v0, v9, Lokhttp3/internal/e/i;->bvT:J
+    iget-wide v0, v9, Lokhttp3/internal/e/i;->bvO: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;->bvX:Lokhttp3/internal/e/j;
+    iget-object v0, p0, Lokhttp3/internal/e/g;->bvS: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;->bvX:Lokhttp3/internal/e/j;
+    iget-object p1, p0, Lokhttp3/internal/e/g;->bvS: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;->buP:Lokhttp3/internal/e/b;
+    sget-object v0, Lokhttp3/internal/e/b;->buK:Lokhttp3/internal/e/b;
 
-    sget-object v1, Lokhttp3/internal/e/b;->buU:Lokhttp3/internal/e/b;
+    sget-object v1, Lokhttp3/internal/e/b;->buP: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;->bvN:Z
+    iget-boolean v0, p0, Lokhttp3/internal/e/g;->bvI: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;->bvO:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object v0, p0, Lokhttp3/internal/e/g;->bvJ: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 c2a547199f..531b4bc107 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 bws:B
+.field bwn:B
 
-.field bwt:I
+.field bwo:I
 
-.field bwu:S
+.field bwp:S
 
-.field private final lY:Lokio/d;
+.field private final lZ: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;->lY:Lokio/d;
+    iput-object p1, p0, Lokhttp3/internal/e/h$a;->lZ:Lokio/d;
 
     return-void
 .end method
@@ -59,9 +59,9 @@
 
     if-nez v0, :cond_4
 
-    iget-object v0, p0, Lokhttp3/internal/e/h$a;->lY:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/e/h$a;->lZ:Lokio/d;
 
-    iget-short v3, p0, Lokhttp3/internal/e/h$a;->bwu:S
+    iget-short v3, p0, Lokhttp3/internal/e/h$a;->bwp:S
 
     int-to-long v3, v3
 
@@ -69,9 +69,9 @@
 
     const/4 v0, 0x0
 
-    iput-short v0, p0, Lokhttp3/internal/e/h$a;->bwu:S
+    iput-short v0, p0, Lokhttp3/internal/e/h$a;->bwp:S
 
-    iget-byte v3, p0, Lokhttp3/internal/e/h$a;->bws:B
+    iget-byte v3, p0, Lokhttp3/internal/e/h$a;->bwn:B
 
     and-int/lit8 v3, v3, 0x4
 
@@ -80,9 +80,9 @@
     return-wide v1
 
     :cond_0
-    iget v1, p0, Lokhttp3/internal/e/h$a;->bwt:I
+    iget v1, p0, Lokhttp3/internal/e/h$a;->bwo:I
 
-    iget-object v2, p0, Lokhttp3/internal/e/h$a;->lY:Lokio/d;
+    iget-object v2, p0, Lokhttp3/internal/e/h$a;->lZ: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;->lY:Lokio/d;
+    iget-object v2, p0, Lokhttp3/internal/e/h$a;->lZ: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;->lY:Lokio/d;
+    iget-object v3, p0, Lokhttp3/internal/e/h$a;->lZ: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;->bws:B
+    iput-byte v3, p0, Lokhttp3/internal/e/h$a;->bwn:B
 
-    sget-object v3, Lokhttp3/internal/e/h;->HZ:Ljava/util/logging/Logger;
+    sget-object v3, Lokhttp3/internal/e/h;->HV: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;->HZ:Ljava/util/logging/Logger;
+    sget-object v3, Lokhttp3/internal/e/h;->HV:Ljava/util/logging/Logger;
 
-    iget v5, p0, Lokhttp3/internal/e/h$a;->bwt:I
+    iget v5, p0, Lokhttp3/internal/e/h$a;->bwo:I
 
     iget v6, p0, Lokhttp3/internal/e/h$a;->length:I
 
-    iget-byte v7, p0, Lokhttp3/internal/e/h$a;->bws:B
+    iget-byte v7, p0, Lokhttp3/internal/e/h$a;->bwn: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;->lY:Lokio/d;
+    iget-object v3, p0, Lokhttp3/internal/e/h$a;->lZ: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;->bwt:I
+    iput v3, p0, Lokhttp3/internal/e/h$a;->bwo:I
 
     const/16 v3, 0x9
 
     if-ne v2, v3, :cond_3
 
-    iget v2, p0, Lokhttp3/internal/e/h$a;->bwt:I
+    iget v2, p0, Lokhttp3/internal/e/h$a;->bwo:I
 
     if-ne v2, v1, :cond_2
 
@@ -192,7 +192,7 @@
     throw p1
 
     :cond_4
-    iget-object v3, p0, Lokhttp3/internal/e/h$a;->lY:Lokio/d;
+    iget-object v3, p0, Lokhttp3/internal/e/h$a;->lZ: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;->lY:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/e/h$a;->lZ: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 6f5a8f5c0d..51f6780dda 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 HZ:Ljava/util/logging/Logger;
+.field static final HV:Ljava/util/logging/Logger;
 
 
 # instance fields
-.field final bvJ:Z
+.field final bvE:Z
 
-.field private final bwq:Lokhttp3/internal/e/h$a;
+.field private final bwl:Lokhttp3/internal/e/h$a;
 
-.field final bwr:Lokhttp3/internal/e/d$a;
+.field final bwm:Lokhttp3/internal/e/d$a;
 
-.field final lY:Lokio/d;
+.field final lZ:Lokio/d;
 
 
 # direct methods
@@ -43,7 +43,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/internal/e/h;->HZ:Ljava/util/logging/Logger;
+    sput-object v0, Lokhttp3/internal/e/h;->HV: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;->lY:Lokio/d;
+    iput-object p1, p0, Lokhttp3/internal/e/h;->lZ:Lokio/d;
 
-    iput-boolean p2, p0, Lokhttp3/internal/e/h;->bvJ:Z
+    iput-boolean p2, p0, Lokhttp3/internal/e/h;->bvE:Z
 
     new-instance p1, Lokhttp3/internal/e/h$a;
 
-    iget-object p2, p0, Lokhttp3/internal/e/h;->lY:Lokio/d;
+    iget-object p2, p0, Lokhttp3/internal/e/h;->lZ:Lokio/d;
 
     invoke-direct {p1, p2}, Lokhttp3/internal/e/h$a;-><init>(Lokio/d;)V
 
-    iput-object p1, p0, Lokhttp3/internal/e/h;->bwq:Lokhttp3/internal/e/h$a;
+    iput-object p1, p0, Lokhttp3/internal/e/h;->bwl:Lokhttp3/internal/e/h$a;
 
     new-instance p1, Lokhttp3/internal/e/d$a;
 
-    iget-object p2, p0, Lokhttp3/internal/e/h;->bwq:Lokhttp3/internal/e/h$a;
+    iget-object p2, p0, Lokhttp3/internal/e/h;->bwl: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;->bwr:Lokhttp3/internal/e/d$a;
+    iput-object p1, p0, Lokhttp3/internal/e/h;->bwm:Lokhttp3/internal/e/d$a;
 
     return-void
 .end method
 
-.method private Gy()V
+.method private Gw()V
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -84,11 +84,11 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/e/h;->lY:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/e/h;->lZ:Lokio/d;
 
     invoke-interface {v0}, Lokio/d;->readInt()I
 
-    iget-object v0, p0, Lokhttp3/internal/e/h;->lY:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/e/h;->lZ:Lokio/d;
 
     invoke-interface {v0}, Lokio/d;->readByte()B
 
@@ -165,25 +165,25 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/e/h;->bwq:Lokhttp3/internal/e/h$a;
+    iget-object v0, p0, Lokhttp3/internal/e/h;->bwl: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;->bwu:S
+    iput-short p2, v0, Lokhttp3/internal/e/h$a;->bwp:S
 
-    iput-byte p3, v0, Lokhttp3/internal/e/h$a;->bws:B
+    iput-byte p3, v0, Lokhttp3/internal/e/h$a;->bwn:B
 
-    iput p4, v0, Lokhttp3/internal/e/h$a;->bwt:I
+    iput p4, v0, Lokhttp3/internal/e/h$a;->bwo:I
 
-    iget-object p1, p0, Lokhttp3/internal/e/h;->bwr:Lokhttp3/internal/e/d$a;
+    iget-object p1, p0, Lokhttp3/internal/e/h;->bwm:Lokhttp3/internal/e/d$a;
 
-    invoke-virtual {p1}, Lokhttp3/internal/e/d$a;->Gp()V
+    invoke-virtual {p1}, Lokhttp3/internal/e/d$a;->Gn()V
 
-    iget-object p1, p0, Lokhttp3/internal/e/h;->bwr:Lokhttp3/internal/e/d$a;
+    iget-object p1, p0, Lokhttp3/internal/e/h;->bwm:Lokhttp3/internal/e/d$a;
 
-    invoke-virtual {p1}, Lokhttp3/internal/e/d$a;->Gq()Ljava/util/List;
+    invoke-virtual {p1}, Lokhttp3/internal/e/d$a;->Go()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;->lY:Lokio/d;
+    iget-object v1, p0, Lokhttp3/internal/e/h;->lZ: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;->lY:Lokio/d;
+    iget-object v1, p0, Lokhttp3/internal/e/h;->lZ: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;->lY:Lokio/d;
+    iget-object v4, p0, Lokhttp3/internal/e/h;->lZ: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;->lY:Lokio/d;
+    iget-object p1, p0, Lokhttp3/internal/e/h;->lZ: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;->lY:Lokio/d;
+    iget-object v6, p0, Lokhttp3/internal/e/h;->lZ: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;->HZ:Ljava/util/logging/Logger;
+    sget-object v8, Lokhttp3/internal/e/h;->HV: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;->HZ:Ljava/util/logging/Logger;
+    sget-object v8, Lokhttp3/internal/e/h;->HV: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;->lY:Lokio/d;
+    iget-object p1, p0, Lokhttp3/internal/e/h;->lZ: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;->lY:Lokio/d;
+    iget-object p1, p0, Lokhttp3/internal/e/h;->lZ: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;->lY:Lokio/d;
+    iget-object p1, p0, Lokhttp3/internal/e/h;->lZ:Lokio/d;
 
     invoke-interface {p1}, Lokio/d;->readInt()I
 
     move-result p1
 
-    iget-object v3, p0, Lokhttp3/internal/e/h;->lY:Lokio/d;
+    iget-object v3, p0, Lokhttp3/internal/e/h;->lZ:Lokio/d;
 
     invoke-interface {v3}, Lokio/d;->readInt()I
 
@@ -436,11 +436,11 @@
 
     if-eqz v4, :cond_6
 
-    sget-object v0, Lokio/ByteString;->byR:Lokio/ByteString;
+    sget-object v0, Lokio/ByteString;->byM:Lokio/ByteString;
 
     if-lez v1, :cond_5
 
-    iget-object v0, p0, Lokhttp3/internal/e/h;->lY:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/e/h;->lZ:Lokio/d;
 
     int-to-long v3, v1
 
@@ -503,13 +503,13 @@
 
     if-nez v6, :cond_a
 
-    iget-object v1, p0, Lokhttp3/internal/e/h;->lY:Lokio/d;
+    iget-object v1, p0, Lokhttp3/internal/e/h;->lZ:Lokio/d;
 
     invoke-interface {v1}, Lokio/d;->readInt()I
 
     move-result v1
 
-    iget-object v3, p0, Lokhttp3/internal/e/h;->lY:Lokio/d;
+    iget-object v3, p0, Lokhttp3/internal/e/h;->lZ: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;->lY:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/e/h;->lZ: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;->lY:Lokio/d;
+    iget-object v3, p0, Lokhttp3/internal/e/h;->lZ: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;->lY:Lokio/d;
+    iget-object v6, p0, Lokhttp3/internal/e/h;->lZ: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;->lY:Lokio/d;
+    iget-object v7, p0, Lokhttp3/internal/e/h;->lZ: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;->lY:Lokio/d;
+    iget-object p1, p0, Lokhttp3/internal/e/h;->lZ: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;->Gy()V
+    invoke-direct {p0}, Lokhttp3/internal/e/h;->Gw()V
 
     goto/16 :goto_6
 
@@ -903,7 +903,7 @@
 
     if-eqz v4, :cond_21
 
-    iget-object v0, p0, Lokhttp3/internal/e/h;->lY:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/e/h;->lZ: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;->Gy()V
+    invoke-direct {p0}, Lokhttp3/internal/e/h;->Gw()V
 
     add-int/lit8 v1, v1, -0x5
 
@@ -979,7 +979,7 @@
 
     if-eqz v4, :cond_26
 
-    iget-object v0, p0, Lokhttp3/internal/e/h;->lY:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/e/h;->lZ:Lokio/d;
 
     invoke-interface {v0}, Lokio/d;->readByte()B
 
@@ -994,11 +994,11 @@
 
     move-result p1
 
-    iget-object v1, p0, Lokhttp3/internal/e/h;->lY:Lokio/d;
+    iget-object v1, p0, Lokhttp3/internal/e/h;->lZ: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;->lY:Lokio/d;
+    iget-object p1, p0, Lokhttp3/internal/e/h;->lZ:Lokio/d;
 
     int-to-long v0, v0
 
@@ -1075,7 +1075,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/e/h;->lY:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/e/h;->lZ: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 e4e63dcae5..a9fed40d67 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 bwC:Lokio/c;
+.field private final bwx:Lokio/c;
 
-.field bwD:Z
+.field bwy:Z
 
-.field final synthetic bwE:Lokhttp3/internal/e/i;
+.field final synthetic bwz: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;->bwE:Lokhttp3/internal/e/i;
+    iput-object p1, p0, Lokhttp3/internal/e/i$a;->bwz: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;->bwC:Lokio/c;
+    iput-object p1, p0, Lokhttp3/internal/e/i$a;->bwx:Lokio/c;
 
     return-void
 .end method
@@ -64,14 +64,14 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bwE:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bwz:Lokhttp3/internal/e/i;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lokhttp3/internal/e/i$a;->bwE:Lokhttp3/internal/e/i;
+    iget-object v1, p0, Lokhttp3/internal/e/i$a;->bwz:Lokhttp3/internal/e/i;
 
-    iget-object v1, v1, Lokhttp3/internal/e/i;->bwB:Lokhttp3/internal/e/i$c;
+    iget-object v1, v1, Lokhttp3/internal/e/i;->bww: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;->bwE:Lokhttp3/internal/e/i;
+    iget-object v1, p0, Lokhttp3/internal/e/i$a;->bwz:Lokhttp3/internal/e/i;
 
-    iget-wide v1, v1, Lokhttp3/internal/e/i;->bvT:J
+    iget-wide v1, v1, Lokhttp3/internal/e/i;->bvO:J
 
     const-wide/16 v3, 0x0
 
@@ -89,7 +89,7 @@
 
     if-gtz v5, :cond_0
 
-    iget-boolean v1, p0, Lokhttp3/internal/e/i$a;->bwD:Z
+    iget-boolean v1, p0, Lokhttp3/internal/e/i$a;->bwy:Z
 
     if-nez v1, :cond_0
 
@@ -97,15 +97,15 @@
 
     if-nez v1, :cond_0
 
-    iget-object v1, p0, Lokhttp3/internal/e/i$a;->bwE:Lokhttp3/internal/e/i;
+    iget-object v1, p0, Lokhttp3/internal/e/i$a;->bwz: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;->bwE:Lokhttp3/internal/e/i;
+    iget-object v1, p0, Lokhttp3/internal/e/i$a;->bwz:Lokhttp3/internal/e/i;
 
-    invoke-virtual {v1}, Lokhttp3/internal/e/i;->GF()V
+    invoke-virtual {v1}, Lokhttp3/internal/e/i;->GD()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;->bwE:Lokhttp3/internal/e/i;
+    iget-object v1, p0, Lokhttp3/internal/e/i$a;->bwz:Lokhttp3/internal/e/i;
 
-    iget-object v1, v1, Lokhttp3/internal/e/i;->bwB:Lokhttp3/internal/e/i$c;
+    iget-object v1, v1, Lokhttp3/internal/e/i;->bww:Lokhttp3/internal/e/i$c;
 
-    invoke-virtual {v1}, Lokhttp3/internal/e/i$c;->GG()V
+    invoke-virtual {v1}, Lokhttp3/internal/e/i$c;->GE()V
 
-    iget-object v1, p0, Lokhttp3/internal/e/i$a;->bwE:Lokhttp3/internal/e/i;
+    iget-object v1, p0, Lokhttp3/internal/e/i$a;->bwz:Lokhttp3/internal/e/i;
 
-    invoke-virtual {v1}, Lokhttp3/internal/e/i;->GE()V
+    invoke-virtual {v1}, Lokhttp3/internal/e/i;->GC()V
 
-    iget-object v1, p0, Lokhttp3/internal/e/i$a;->bwE:Lokhttp3/internal/e/i;
+    iget-object v1, p0, Lokhttp3/internal/e/i$a;->bwz:Lokhttp3/internal/e/i;
 
-    iget-wide v1, v1, Lokhttp3/internal/e/i;->bvT:J
+    iget-wide v1, v1, Lokhttp3/internal/e/i;->bvO:J
 
-    iget-object v3, p0, Lokhttp3/internal/e/i$a;->bwC:Lokio/c;
+    iget-object v3, p0, Lokhttp3/internal/e/i$a;->bwx: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;->bwE:Lokhttp3/internal/e/i;
+    iget-object v1, p0, Lokhttp3/internal/e/i$a;->bwz:Lokhttp3/internal/e/i;
 
-    iget-wide v2, v1, Lokhttp3/internal/e/i;->bvT:J
+    iget-wide v2, v1, Lokhttp3/internal/e/i;->bvO:J
 
     sub-long/2addr v2, v9
 
-    iput-wide v2, v1, Lokhttp3/internal/e/i;->bvT:J
+    iput-wide v2, v1, Lokhttp3/internal/e/i;->bvO: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;->bwE:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bwz:Lokhttp3/internal/e/i;
 
-    iget-object v0, v0, Lokhttp3/internal/e/i;->bwB:Lokhttp3/internal/e/i$c;
+    iget-object v0, v0, Lokhttp3/internal/e/i;->bww: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;->bwE:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bwz:Lokhttp3/internal/e/i;
 
-    iget-object v5, v0, Lokhttp3/internal/e/i;->bvE:Lokhttp3/internal/e/g;
+    iget-object v5, v0, Lokhttp3/internal/e/i;->bvz:Lokhttp3/internal/e/g;
 
-    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bwE:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bwz: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;->bwC:Lokio/c;
+    iget-object p1, p0, Lokhttp3/internal/e/i$a;->bwx: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;->bwC:Lokio/c;
+    iget-object v8, p0, Lokhttp3/internal/e/i$a;->bwx: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;->bwE:Lokhttp3/internal/e/i;
+    iget-object p1, p0, Lokhttp3/internal/e/i$a;->bwz:Lokhttp3/internal/e/i;
 
-    iget-object p1, p1, Lokhttp3/internal/e/i;->bwB:Lokhttp3/internal/e/i$c;
+    iget-object p1, p1, Lokhttp3/internal/e/i;->bww:Lokhttp3/internal/e/i$c;
 
-    invoke-virtual {p1}, Lokhttp3/internal/e/i$c;->GG()V
+    invoke-virtual {p1}, Lokhttp3/internal/e/i$c;->GE()V
 
     return-void
 
     :catchall_0
     move-exception p1
 
-    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bwE:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bwz:Lokhttp3/internal/e/i;
 
-    iget-object v0, v0, Lokhttp3/internal/e/i;->bwB:Lokhttp3/internal/e/i$c;
+    iget-object v0, v0, Lokhttp3/internal/e/i;->bww:Lokhttp3/internal/e/i$c;
 
-    invoke-virtual {v0}, Lokhttp3/internal/e/i$c;->GG()V
+    invoke-virtual {v0}, Lokhttp3/internal/e/i$c;->GE()V
 
     throw p1
 
@@ -213,11 +213,11 @@
     move-exception p1
 
     :try_start_4
-    iget-object v1, p0, Lokhttp3/internal/e/i$a;->bwE:Lokhttp3/internal/e/i;
+    iget-object v1, p0, Lokhttp3/internal/e/i$a;->bwz:Lokhttp3/internal/e/i;
 
-    iget-object v1, v1, Lokhttp3/internal/e/i;->bwB:Lokhttp3/internal/e/i$c;
+    iget-object v1, v1, Lokhttp3/internal/e/i;->bww:Lokhttp3/internal/e/i$c;
 
-    invoke-virtual {v1}, Lokhttp3/internal/e/i$c;->GG()V
+    invoke-virtual {v1}, Lokhttp3/internal/e/i$c;->GE()V
 
     throw p1
 
@@ -247,7 +247,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bwE:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bwz: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;->bwE:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bwz:Lokhttp3/internal/e/i;
 
-    iget-object v0, v0, Lokhttp3/internal/e/i;->bwz:Lokhttp3/internal/e/i$a;
+    iget-object v0, v0, Lokhttp3/internal/e/i;->bwu:Lokhttp3/internal/e/i$a;
 
-    iget-boolean v0, v0, Lokhttp3/internal/e/i$a;->bwD:Z
+    iget-boolean v0, v0, Lokhttp3/internal/e/i$a;->bwy:Z
 
     const/4 v1, 0x1
 
     if-nez v0, :cond_2
 
-    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bwC:Lokio/c;
+    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bwx: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;->bwC:Lokio/c;
+    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bwx: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;->bwE:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bwz:Lokhttp3/internal/e/i;
 
-    iget-object v2, v0, Lokhttp3/internal/e/i;->bvE:Lokhttp3/internal/e/g;
+    iget-object v2, v0, Lokhttp3/internal/e/i;->bvz:Lokhttp3/internal/e/g;
 
-    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bwE:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bwz: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;->bwE:Lokhttp3/internal/e/i;
+    iget-object v2, p0, Lokhttp3/internal/e/i$a;->bwz: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;->bwE:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bwz:Lokhttp3/internal/e/i;
 
-    iget-object v0, v0, Lokhttp3/internal/e/i;->bvE:Lokhttp3/internal/e/g;
+    iget-object v0, v0, Lokhttp3/internal/e/i;->bvz:Lokhttp3/internal/e/g;
 
-    iget-object v0, v0, Lokhttp3/internal/e/g;->bvX:Lokhttp3/internal/e/j;
+    iget-object v0, v0, Lokhttp3/internal/e/g;->bvS:Lokhttp3/internal/e/j;
 
     invoke-virtual {v0}, Lokhttp3/internal/e/j;->flush()V
 
-    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bwE:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bwz:Lokhttp3/internal/e/i;
 
-    invoke-virtual {v0}, Lokhttp3/internal/e/i;->GD()V
+    invoke-virtual {v0}, Lokhttp3/internal/e/i;->GB()V
 
     return-void
 
@@ -376,21 +376,21 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bwE:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bwz:Lokhttp3/internal/e/i;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lokhttp3/internal/e/i$a;->bwE:Lokhttp3/internal/e/i;
+    iget-object v1, p0, Lokhttp3/internal/e/i$a;->bwz:Lokhttp3/internal/e/i;
 
-    invoke-virtual {v1}, Lokhttp3/internal/e/i;->GE()V
+    invoke-virtual {v1}, Lokhttp3/internal/e/i;->GC()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;->bwC:Lokio/c;
+    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bwx: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;->bwE:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bwz:Lokhttp3/internal/e/i;
 
-    iget-object v0, v0, Lokhttp3/internal/e/i;->bvE:Lokhttp3/internal/e/g;
+    iget-object v0, v0, Lokhttp3/internal/e/i;->bvz:Lokhttp3/internal/e/g;
 
-    iget-object v0, v0, Lokhttp3/internal/e/g;->bvX:Lokhttp3/internal/e/j;
+    iget-object v0, v0, Lokhttp3/internal/e/g;->bvS: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;->bwE:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bwz:Lokhttp3/internal/e/i;
 
-    iget-object v0, v0, Lokhttp3/internal/e/i;->bwB:Lokhttp3/internal/e/i$c;
+    iget-object v0, v0, Lokhttp3/internal/e/i;->bww: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;->bwC:Lokio/c;
+    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bwx: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;->bwC:Lokio/c;
+    iget-object p1, p0, Lokhttp3/internal/e/i$a;->bwx: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 4779a8c80a..9f2ae76d2a 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 bwD:Z
+.field private final bwA:Lokio/c;
 
-.field final synthetic bwE:Lokhttp3/internal/e/i;
+.field private final bwB:Lokio/c;
 
-.field private final bwF:Lokio/c;
+.field private final bwC:J
 
-.field private final bwG:Lokio/c;
+.field bwy:Z
 
-.field private final bwH:J
+.field final synthetic bwz:Lokhttp3/internal/e/i;
 
 .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;->bwE:Lokhttp3/internal/e/i;
+    iput-object p1, p0, Lokhttp3/internal/e/i$b;->bwz: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;->bwF:Lokio/c;
+    iput-object p1, p0, Lokhttp3/internal/e/i$b;->bwA:Lokio/c;
 
     new-instance p1, Lokio/c;
 
     invoke-direct {p1}, Lokio/c;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/internal/e/i$b;->bwG:Lokio/c;
+    iput-object p1, p0, Lokhttp3/internal/e/i$b;->bwB:Lokio/c;
 
-    iput-wide p2, p0, Lokhttp3/internal/e/i$b;->bwH:J
+    iput-wide p2, p0, Lokhttp3/internal/e/i$b;->bwC: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;->bwE:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$b;->bwz:Lokhttp3/internal/e/i;
 
-    iget-object v0, v0, Lokhttp3/internal/e/i;->bvE:Lokhttp3/internal/e/g;
+    iget-object v0, v0, Lokhttp3/internal/e/i;->bvz: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;->bwE:Lokhttp3/internal/e/i;
+    iget-object v6, v1, Lokhttp3/internal/e/i$b;->bwz:Lokhttp3/internal/e/i;
 
     monitor-enter v6
 
     :try_start_0
-    iget-object v0, v1, Lokhttp3/internal/e/i$b;->bwE:Lokhttp3/internal/e/i;
+    iget-object v0, v1, Lokhttp3/internal/e/i$b;->bwz:Lokhttp3/internal/e/i;
 
-    iget-object v0, v0, Lokhttp3/internal/e/i;->bwA:Lokhttp3/internal/e/i$c;
+    iget-object v0, v0, Lokhttp3/internal/e/i;->bwv: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;->bwE:Lokhttp3/internal/e/i;
+    iget-object v0, v1, Lokhttp3/internal/e/i$b;->bwz: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;->bwE:Lokhttp3/internal/e/i;
+    iget-object v0, v1, Lokhttp3/internal/e/i$b;->bwz: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;->bwE:Lokhttp3/internal/e/i;
+    iget-object v8, v1, Lokhttp3/internal/e/i$b;->bwz: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;->bwE:Lokhttp3/internal/e/i;
+    iget-object v8, v1, Lokhttp3/internal/e/i$b;->bwz: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;->bwE:Lokhttp3/internal/e/i;
+    iget-object v7, v1, Lokhttp3/internal/e/i$b;->bwz: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;->bwE:Lokhttp3/internal/e/i;
+    iget-object v8, v1, Lokhttp3/internal/e/i$b;->bwz: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;->bwG:Lokio/c;
+    iget-object v8, v1, Lokhttp3/internal/e/i$b;->bwB: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;->bwG:Lokio/c;
+    iget-object v8, v1, Lokhttp3/internal/e/i$b;->bwB:Lokio/c;
 
-    iget-object v11, v1, Lokhttp3/internal/e/i$b;->bwG:Lokio/c;
+    iget-object v11, v1, Lokhttp3/internal/e/i$b;->bwB: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;->bwE:Lokhttp3/internal/e/i;
+    iget-object v8, v1, Lokhttp3/internal/e/i$b;->bwz:Lokhttp3/internal/e/i;
 
-    iget-wide v14, v8, Lokhttp3/internal/e/i;->bvS:J
+    iget-wide v14, v8, Lokhttp3/internal/e/i;->bvN:J
 
     add-long/2addr v14, v11
 
-    iput-wide v14, v8, Lokhttp3/internal/e/i;->bvS:J
+    iput-wide v14, v8, Lokhttp3/internal/e/i;->bvN:J
 
     if-nez v0, :cond_5
 
-    iget-object v8, v1, Lokhttp3/internal/e/i$b;->bwE:Lokhttp3/internal/e/i;
+    iget-object v8, v1, Lokhttp3/internal/e/i$b;->bwz:Lokhttp3/internal/e/i;
 
-    iget-wide v14, v8, Lokhttp3/internal/e/i;->bvS:J
+    iget-wide v14, v8, Lokhttp3/internal/e/i;->bvN:J
 
-    iget-object v8, v1, Lokhttp3/internal/e/i$b;->bwE:Lokhttp3/internal/e/i;
+    iget-object v8, v1, Lokhttp3/internal/e/i$b;->bwz:Lokhttp3/internal/e/i;
 
-    iget-object v8, v8, Lokhttp3/internal/e/i;->bvE:Lokhttp3/internal/e/g;
+    iget-object v8, v8, Lokhttp3/internal/e/i;->bvz:Lokhttp3/internal/e/g;
 
-    iget-object v8, v8, Lokhttp3/internal/e/g;->bvU:Lokhttp3/internal/e/m;
+    iget-object v8, v8, Lokhttp3/internal/e/g;->bvP:Lokhttp3/internal/e/m;
 
-    invoke-virtual {v8}, Lokhttp3/internal/e/m;->GL()I
+    invoke-virtual {v8}, Lokhttp3/internal/e/m;->GJ()I
 
     move-result v8
 
@@ -241,47 +241,47 @@
 
     if-ltz v17, :cond_5
 
-    iget-object v7, v1, Lokhttp3/internal/e/i$b;->bwE:Lokhttp3/internal/e/i;
+    iget-object v7, v1, Lokhttp3/internal/e/i$b;->bwz:Lokhttp3/internal/e/i;
 
-    iget-object v7, v7, Lokhttp3/internal/e/i;->bvE:Lokhttp3/internal/e/g;
+    iget-object v7, v7, Lokhttp3/internal/e/i;->bvz:Lokhttp3/internal/e/g;
 
-    iget-object v8, v1, Lokhttp3/internal/e/i$b;->bwE:Lokhttp3/internal/e/i;
+    iget-object v8, v1, Lokhttp3/internal/e/i$b;->bwz:Lokhttp3/internal/e/i;
 
     iget v8, v8, Lokhttp3/internal/e/i;->id:I
 
-    iget-object v14, v1, Lokhttp3/internal/e/i$b;->bwE:Lokhttp3/internal/e/i;
+    iget-object v14, v1, Lokhttp3/internal/e/i$b;->bwz:Lokhttp3/internal/e/i;
 
-    iget-wide v14, v14, Lokhttp3/internal/e/i;->bvS:J
+    iget-wide v14, v14, Lokhttp3/internal/e/i;->bvN:J
 
     invoke-virtual {v7, v8, v14, v15}, Lokhttp3/internal/e/g;->k(IJ)V
 
-    iget-object v7, v1, Lokhttp3/internal/e/i$b;->bwE:Lokhttp3/internal/e/i;
+    iget-object v7, v1, Lokhttp3/internal/e/i$b;->bwz:Lokhttp3/internal/e/i;
 
-    iput-wide v4, v7, Lokhttp3/internal/e/i;->bvS:J
+    iput-wide v4, v7, Lokhttp3/internal/e/i;->bvN:J
 
     goto :goto_2
 
     :cond_3
     move-object/from16 v13, p1
 
-    iget-boolean v7, v1, Lokhttp3/internal/e/i$b;->bwD:Z
+    iget-boolean v7, v1, Lokhttp3/internal/e/i$b;->bwy:Z
 
     if-nez v7, :cond_4
 
     if-nez v0, :cond_4
 
-    iget-object v0, v1, Lokhttp3/internal/e/i$b;->bwE:Lokhttp3/internal/e/i;
+    iget-object v0, v1, Lokhttp3/internal/e/i$b;->bwz:Lokhttp3/internal/e/i;
 
-    invoke-virtual {v0}, Lokhttp3/internal/e/i;->GF()V
+    invoke-virtual {v0}, Lokhttp3/internal/e/i;->GD()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;->bwE:Lokhttp3/internal/e/i;
+    iget-object v0, v1, Lokhttp3/internal/e/i$b;->bwz:Lokhttp3/internal/e/i;
 
-    iget-object v0, v0, Lokhttp3/internal/e/i;->bwA:Lokhttp3/internal/e/i$c;
+    iget-object v0, v0, Lokhttp3/internal/e/i;->bwv:Lokhttp3/internal/e/i$c;
 
-    invoke-virtual {v0}, Lokhttp3/internal/e/i$c;->GG()V
+    invoke-virtual {v0}, Lokhttp3/internal/e/i$c;->GE()V
 
     monitor-exit v6
 
@@ -297,11 +297,11 @@
     const/16 v16, 0x0
 
     :goto_3
-    iget-object v7, v1, Lokhttp3/internal/e/i$b;->bwE:Lokhttp3/internal/e/i;
+    iget-object v7, v1, Lokhttp3/internal/e/i$b;->bwz:Lokhttp3/internal/e/i;
 
-    iget-object v7, v7, Lokhttp3/internal/e/i;->bwA:Lokhttp3/internal/e/i$c;
+    iget-object v7, v7, Lokhttp3/internal/e/i;->bwv:Lokhttp3/internal/e/i$c;
 
-    invoke-virtual {v7}, Lokhttp3/internal/e/i$c;->GG()V
+    invoke-virtual {v7}, Lokhttp3/internal/e/i$c;->GE()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;->bwE:Lokhttp3/internal/e/i;
+    iget-object v2, v1, Lokhttp3/internal/e/i$b;->bwz:Lokhttp3/internal/e/i;
 
-    iget-object v2, v2, Lokhttp3/internal/e/i;->bwA:Lokhttp3/internal/e/i$c;
+    iget-object v2, v2, Lokhttp3/internal/e/i;->bwv:Lokhttp3/internal/e/i$c;
 
-    invoke-virtual {v2}, Lokhttp3/internal/e/i$c;->GG()V
+    invoke-virtual {v2}, Lokhttp3/internal/e/i$c;->GE()V
 
     throw v0
 
@@ -404,20 +404,20 @@
 
     if-lez v2, :cond_6
 
-    iget-object v2, p0, Lokhttp3/internal/e/i$b;->bwE:Lokhttp3/internal/e/i;
+    iget-object v2, p0, Lokhttp3/internal/e/i$b;->bwz:Lokhttp3/internal/e/i;
 
     monitor-enter v2
 
     :try_start_0
-    iget-boolean v3, p0, Lokhttp3/internal/e/i$b;->bwD:Z
+    iget-boolean v3, p0, Lokhttp3/internal/e/i$b;->bwy:Z
 
-    iget-object v4, p0, Lokhttp3/internal/e/i$b;->bwG:Lokio/c;
+    iget-object v4, p0, Lokhttp3/internal/e/i$b;->bwB:Lokio/c;
 
     iget-wide v4, v4, Lokio/c;->size:J
 
     add-long/2addr v4, p2
 
-    iget-wide v6, p0, Lokhttp3/internal/e/i$b;->bwH:J
+    iget-wide v6, p0, Lokhttp3/internal/e/i$b;->bwC: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;->bwE:Lokhttp3/internal/e/i;
+    iget-object p1, p0, Lokhttp3/internal/e/i$b;->bwz:Lokhttp3/internal/e/i;
 
-    sget-object p2, Lokhttp3/internal/e/b;->buS:Lokhttp3/internal/e/b;
+    sget-object p2, Lokhttp3/internal/e/b;->buN: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;->bwF:Lokio/c;
+    iget-object v2, p0, Lokhttp3/internal/e/i$b;->bwA: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;->bwE:Lokhttp3/internal/e/i;
+    iget-object v2, p0, Lokhttp3/internal/e/i$b;->bwz:Lokhttp3/internal/e/i;
 
     monitor-enter v2
 
     :try_start_1
-    iget-object v3, p0, Lokhttp3/internal/e/i$b;->bwG:Lokio/c;
+    iget-object v3, p0, Lokhttp3/internal/e/i$b;->bwB: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;->bwG:Lokio/c;
+    iget-object v0, p0, Lokhttp3/internal/e/i$b;->bwB:Lokio/c;
 
-    iget-object v1, p0, Lokhttp3/internal/e/i$b;->bwF:Lokio/c;
+    iget-object v1, p0, Lokhttp3/internal/e/i$b;->bwA: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;->bwE:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$b;->bwz: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;->bwE:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$b;->bwz: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;->bwG:Lokio/c;
+    iget-object v1, p0, Lokhttp3/internal/e/i$b;->bwB:Lokio/c;
 
     iget-wide v1, v1, Lokio/c;->size:J
 
-    iget-object v3, p0, Lokhttp3/internal/e/i$b;->bwG:Lokio/c;
+    iget-object v3, p0, Lokhttp3/internal/e/i$b;->bwB:Lokio/c;
 
     invoke-virtual {v3}, Lokio/c;->clear()V
 
-    iget-object v3, p0, Lokhttp3/internal/e/i$b;->bwE:Lokhttp3/internal/e/i;
+    iget-object v3, p0, Lokhttp3/internal/e/i$b;->bwz: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;->bwE:Lokhttp3/internal/e/i;
+    iget-object v3, p0, Lokhttp3/internal/e/i$b;->bwz: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;->bwE:Lokhttp3/internal/e/i;
+    iget-object v3, p0, Lokhttp3/internal/e/i$b;->bwz: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;->bwE:Lokhttp3/internal/e/i;
+    iget-object v3, p0, Lokhttp3/internal/e/i$b;->bwz: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;->bwE:Lokhttp3/internal/e/i;
+    iget-object v3, p0, Lokhttp3/internal/e/i$b;->bwz: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;->bwE:Lokhttp3/internal/e/i;
+    iget-object v5, p0, Lokhttp3/internal/e/i$b;->bwz: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;->bwE:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$b;->bwz:Lokhttp3/internal/e/i;
 
-    invoke-virtual {v0}, Lokhttp3/internal/e/i;->GD()V
+    invoke-virtual {v0}, Lokhttp3/internal/e/i;->GB()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;->bwE:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$b;->bwz:Lokhttp3/internal/e/i;
 
-    iget-object v0, v0, Lokhttp3/internal/e/i;->bwA:Lokhttp3/internal/e/i$c;
+    iget-object v0, v0, Lokhttp3/internal/e/i;->bwv: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 34a375e446..5427eb2ec5 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 bwE:Lokhttp3/internal/e/i;
+.field final synthetic bwz: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;->bwE:Lokhttp3/internal/e/i;
+    iput-object p1, p0, Lokhttp3/internal/e/i$c;->bwz:Lokhttp3/internal/e/i;
 
     invoke-direct {p0}, Lokio/a;-><init>()V
 
@@ -31,19 +31,19 @@
 
 
 # virtual methods
-.method public final FH()V
+.method public final FF()V
     .locals 2
 
-    iget-object v0, p0, Lokhttp3/internal/e/i$c;->bwE:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$c;->bwz:Lokhttp3/internal/e/i;
 
-    sget-object v1, Lokhttp3/internal/e/b;->buU:Lokhttp3/internal/e/b;
+    sget-object v1, Lokhttp3/internal/e/b;->buP: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 GG()V
+.method public final GE()V
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -51,7 +51,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lokhttp3/internal/e/i$c;->Hd()Z
+    invoke-virtual {p0}, Lokhttp3/internal/e/i$c;->Hb()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 7c1d71e6ac..1ec1b98c98 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 HZ:Ljava/util/logging/Logger;
+.field private static final HV:Ljava/util/logging/Logger;
 
 
 # instance fields
-.field private final btZ:Lokio/BufferedSink;
+.field private final btU:Lokio/BufferedSink;
 
-.field private final bvJ:Z
+.field private final bvE:Z
 
-.field private final bwI:Lokio/c;
+.field private final bwD:Lokio/c;
 
-.field bwJ:I
+.field bwE:I
 
-.field final bwK:Lokhttp3/internal/e/d$b;
+.field final bwF:Lokhttp3/internal/e/d$b;
 
 .field private w:Z
 
@@ -38,7 +38,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/internal/e/j;->HZ:Ljava/util/logging/Logger;
+    sput-object v0, Lokhttp3/internal/e/j;->HV: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;->btZ:Lokio/BufferedSink;
+    iput-object p1, p0, Lokhttp3/internal/e/j;->btU:Lokio/BufferedSink;
 
-    iput-boolean p2, p0, Lokhttp3/internal/e/j;->bvJ:Z
+    iput-boolean p2, p0, Lokhttp3/internal/e/j;->bvE:Z
 
     new-instance p1, Lokio/c;
 
     invoke-direct {p1}, Lokio/c;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/internal/e/j;->bwI:Lokio/c;
+    iput-object p1, p0, Lokhttp3/internal/e/j;->bwD:Lokio/c;
 
     new-instance p1, Lokhttp3/internal/e/d$b;
 
-    iget-object p2, p0, Lokhttp3/internal/e/j;->bwI:Lokio/c;
+    iget-object p2, p0, Lokhttp3/internal/e/j;->bwD:Lokio/c;
 
     invoke-direct {p1, p2}, Lokhttp3/internal/e/d$b;-><init>(Lokio/c;)V
 
-    iput-object p1, p0, Lokhttp3/internal/e/j;->bwK:Lokhttp3/internal/e/d$b;
+    iput-object p1, p0, Lokhttp3/internal/e/j;->bwF:Lokhttp3/internal/e/d$b;
 
     const/16 p1, 0x4000
 
-    iput p1, p0, Lokhttp3/internal/e/j;->bwJ:I
+    iput p1, p0, Lokhttp3/internal/e/j;->bwE:I
 
     return-void
 .end method
@@ -81,7 +81,7 @@
         }
     .end annotation
 
-    sget-object v0, Lokhttp3/internal/e/j;->HZ:Ljava/util/logging/Logger;
+    sget-object v0, Lokhttp3/internal/e/j;->HV: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;->HZ:Ljava/util/logging/Logger;
+    sget-object v0, Lokhttp3/internal/e/j;->HV: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;->bwJ:I
+    iget v0, p0, Lokhttp3/internal/e/j;->bwE:I
 
     const/4 v2, 0x1
 
@@ -114,23 +114,23 @@
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lokhttp3/internal/e/j;->btZ:Lokio/BufferedSink;
+    iget-object v0, p0, Lokhttp3/internal/e/j;->btU:Lokio/BufferedSink;
 
     invoke-static {v0, p2}, Lokhttp3/internal/e/j;->a(Lokio/BufferedSink;I)V
 
-    iget-object p2, p0, Lokhttp3/internal/e/j;->btZ:Lokio/BufferedSink;
+    iget-object p2, p0, Lokhttp3/internal/e/j;->btU: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;->btZ:Lokio/BufferedSink;
+    iget-object p2, p0, Lokhttp3/internal/e/j;->btU: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;->btZ:Lokio/BufferedSink;
+    iget-object p2, p0, Lokhttp3/internal/e/j;->btU:Lokio/BufferedSink;
 
     const p3, 0x7fffffff
 
@@ -225,7 +225,7 @@
 
     if-lez v2, :cond_1
 
-    iget v2, p0, Lokhttp3/internal/e/j;->bwJ:I
+    iget v2, p0, Lokhttp3/internal/e/j;->bwE: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;->btZ:Lokio/BufferedSink;
+    iget-object v0, p0, Lokhttp3/internal/e/j;->btU:Lokio/BufferedSink;
 
-    iget-object v1, p0, Lokhttp3/internal/e/j;->bwI:Lokio/c;
+    iget-object v1, p0, Lokhttp3/internal/e/j;->bwD: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 GH()V
+.method public final declared-synchronized GF()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;->bvJ:Z
+    iget-boolean v0, p0, Lokhttp3/internal/e/j;->bvE: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;->HZ:Ljava/util/logging/Logger;
+    sget-object v0, Lokhttp3/internal/e/j;->HV: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;->HZ:Ljava/util/logging/Logger;
+    sget-object v0, Lokhttp3/internal/e/j;->HV:Ljava/util/logging/Logger;
 
     const-string v1, ">> CONNECTION %s"
 
@@ -316,9 +316,9 @@
 
     const/4 v3, 0x0
 
-    sget-object v4, Lokhttp3/internal/e/e;->bvx:Lokio/ByteString;
+    sget-object v4, Lokhttp3/internal/e/e;->bvs:Lokio/ByteString;
 
-    invoke-virtual {v4}, Lokio/ByteString;->Hx()Ljava/lang/String;
+    invoke-virtual {v4}, Lokio/ByteString;->Hv()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;->btZ:Lokio/BufferedSink;
+    iget-object v0, p0, Lokhttp3/internal/e/j;->btU:Lokio/BufferedSink;
 
-    sget-object v1, Lokhttp3/internal/e/e;->bvx:Lokio/ByteString;
+    sget-object v1, Lokhttp3/internal/e/e;->bvs:Lokio/ByteString;
 
-    invoke-virtual {v1}, Lokio/ByteString;->Hz()[B
+    invoke-virtual {v1}, Lokio/ByteString;->Hx()[B
 
     move-result-object v1
 
     invoke-interface {v0, v1}, Lokio/BufferedSink;->E([B)Lokio/BufferedSink;
 
-    iget-object v0, p0, Lokhttp3/internal/e/j;->btZ:Lokio/BufferedSink;
+    iget-object v0, p0, Lokhttp3/internal/e/j;->btU: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;->btZ:Lokio/BufferedSink;
+    iget-object v0, p0, Lokhttp3/internal/e/j;->btU:Lokio/BufferedSink;
 
     invoke-interface {v0, p1}, Lokio/BufferedSink;->dy(I)Lokio/BufferedSink;
 
-    iget-object p1, p0, Lokhttp3/internal/e/j;->btZ:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/e/j;->btU: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;->btZ:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/e/j;->btU:Lokio/BufferedSink;
 
     invoke-interface {p1, p3}, Lokio/BufferedSink;->E([B)Lokio/BufferedSink;
 
     :cond_0
-    iget-object p1, p0, Lokhttp3/internal/e/j;->btZ:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/e/j;->btU: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;->btZ:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/e/j;->btU:Lokio/BufferedSink;
 
     invoke-interface {p1, p2}, Lokio/BufferedSink;->dy(I)Lokio/BufferedSink;
 
-    iget-object p1, p0, Lokhttp3/internal/e/j;->btZ:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/e/j;->btU:Lokio/BufferedSink;
 
     invoke-interface {p1, p3}, Lokio/BufferedSink;->dy(I)Lokio/BufferedSink;
 
-    iget-object p1, p0, Lokhttp3/internal/e/j;->btZ:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/e/j;->btU: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;->btZ:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/e/j;->btU:Lokio/BufferedSink;
 
     int-to-long v0, p4
 
@@ -602,24 +602,24 @@
 
     if-nez v0, :cond_2
 
-    iget v0, p0, Lokhttp3/internal/e/j;->bwJ:I
+    iget v0, p0, Lokhttp3/internal/e/j;->bwE:I
 
-    iget v1, p1, Lokhttp3/internal/e/m;->bwT:I
+    iget v1, p1, Lokhttp3/internal/e/m;->bwO:I
 
     and-int/lit8 v1, v1, 0x20
 
     if-eqz v1, :cond_0
 
-    iget-object v0, p1, Lokhttp3/internal/e/m;->bwU:[I
+    iget-object v0, p1, Lokhttp3/internal/e/m;->bwP:[I
 
     const/4 v1, 0x5
 
     aget v0, v0, v1
 
     :cond_0
-    iput v0, p0, Lokhttp3/internal/e/j;->bwJ:I
+    iput v0, p0, Lokhttp3/internal/e/j;->bwE:I
 
-    invoke-virtual {p1}, Lokhttp3/internal/e/m;->GK()I
+    invoke-virtual {p1}, Lokhttp3/internal/e/m;->GI()I
 
     move-result v0
 
@@ -627,9 +627,9 @@
 
     if-eq v0, v1, :cond_1
 
-    iget-object v0, p0, Lokhttp3/internal/e/j;->bwK:Lokhttp3/internal/e/d$b;
+    iget-object v0, p0, Lokhttp3/internal/e/j;->bwF:Lokhttp3/internal/e/d$b;
 
-    invoke-virtual {p1}, Lokhttp3/internal/e/m;->GK()I
+    invoke-virtual {p1}, Lokhttp3/internal/e/m;->GI()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;->btZ:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/e/j;->btU: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;->bwK:Lokhttp3/internal/e/d$b;
+    iget-object v0, p0, Lokhttp3/internal/e/j;->bwF: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;->bwI:Lokio/c;
+    iget-object p3, p0, Lokhttp3/internal/e/j;->bwD:Lokio/c;
 
     iget-wide v0, p3, Lokio/c;->size:J
 
-    iget p3, p0, Lokhttp3/internal/e/j;->bwJ:I
+    iget p3, p0, Lokhttp3/internal/e/j;->bwE: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;->btZ:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/e/j;->btU:Lokio/BufferedSink;
 
-    iget-object p3, p0, Lokhttp3/internal/e/j;->bwI:Lokio/c;
+    iget-object p3, p0, Lokhttp3/internal/e/j;->bwD: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;->btZ:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/e/j;->btU: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;->btZ:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/e/j;->btU: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;->bwT:I
+    iget v0, p1, Lokhttp3/internal/e/m;->bwO: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;->btZ:Lokio/BufferedSink;
+    iget-object v3, p0, Lokhttp3/internal/e/j;->btU:Lokio/BufferedSink;
 
     invoke-interface {v3, v0}, Lokio/BufferedSink;->dz(I)Lokio/BufferedSink;
 
-    iget-object v0, p0, Lokhttp3/internal/e/j;->btZ:Lokio/BufferedSink;
+    iget-object v0, p0, Lokhttp3/internal/e/j;->btU:Lokio/BufferedSink;
 
-    iget-object v3, p1, Lokhttp3/internal/e/m;->bwU:[I
+    iget-object v3, p1, Lokhttp3/internal/e/m;->bwP:[I
 
     aget v3, v3, v2
 
@@ -944,7 +944,7 @@
     goto :goto_0
 
     :cond_3
-    iget-object p1, p0, Lokhttp3/internal/e/j;->btZ:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/e/j;->btU: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;->btZ:Lokio/BufferedSink;
+    iget-object v0, p0, Lokhttp3/internal/e/j;->btU: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;->btZ:Lokio/BufferedSink;
+    iget-object v0, p0, Lokhttp3/internal/e/j;->btU: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;->btZ:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/e/j;->btU: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;->btZ:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/e/j;->btU: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 ba9f4f4a19..e9d873032e 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 bwP:[Lokhttp3/internal/e/k$a;
+.field final bwK:[Lokhttp3/internal/e/k$a;
 
-.field final bwQ:I
+.field final bwL:I
 
-.field final bwR:I
+.field final bwM: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;->bwP:[Lokhttp3/internal/e/k$a;
+    iput-object v0, p0, Lokhttp3/internal/e/k$a;->bwK:[Lokhttp3/internal/e/k$a;
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lokhttp3/internal/e/k$a;->bwQ:I
+    iput v0, p0, Lokhttp3/internal/e/k$a;->bwL:I
 
-    iput v0, p0, Lokhttp3/internal/e/k$a;->bwR:I
+    iput v0, p0, Lokhttp3/internal/e/k$a;->bwM:I
 
     return-void
 .end method
@@ -50,9 +50,9 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lokhttp3/internal/e/k$a;->bwP:[Lokhttp3/internal/e/k$a;
+    iput-object v0, p0, Lokhttp3/internal/e/k$a;->bwK:[Lokhttp3/internal/e/k$a;
 
-    iput p1, p0, Lokhttp3/internal/e/k$a;->bwQ:I
+    iput p1, p0, Lokhttp3/internal/e/k$a;->bwL: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;->bwR:I
+    iput p1, p0, Lokhttp3/internal/e/k$a;->bwM: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 e2e504aaa1..536d805bb2 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 bwL:[I
+.field private static final bwG:[I
 
-.field private static final bwM:[B
+.field private static final bwH:[B
 
-.field private static final bwN:Lokhttp3/internal/e/k;
+.field private static final bwI:Lokhttp3/internal/e/k;
 
 
 # instance fields
-.field private final bwO:Lokhttp3/internal/e/k$a;
+.field private final bwJ:Lokhttp3/internal/e/k$a;
 
 
 # direct methods
@@ -33,19 +33,19 @@
 
     fill-array-data v1, :array_0
 
-    sput-object v1, Lokhttp3/internal/e/k;->bwL:[I
+    sput-object v1, Lokhttp3/internal/e/k;->bwG:[I
 
     new-array v0, v0, [B
 
     fill-array-data v0, :array_1
 
-    sput-object v0, Lokhttp3/internal/e/k;->bwM:[B
+    sput-object v0, Lokhttp3/internal/e/k;->bwH:[B
 
     new-instance v0, Lokhttp3/internal/e/k;
 
     invoke-direct {v0}, Lokhttp3/internal/e/k;-><init>()V
 
-    sput-object v0, Lokhttp3/internal/e/k;->bwN:Lokhttp3/internal/e/k;
+    sput-object v0, Lokhttp3/internal/e/k;->bwI: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;->bwO:Lokhttp3/internal/e/k$a;
+    iput-object v0, p0, Lokhttp3/internal/e/k;->bwJ:Lokhttp3/internal/e/k$a;
 
-    invoke-direct {p0}, Lokhttp3/internal/e/k;->GJ()V
+    invoke-direct {p0}, Lokhttp3/internal/e/k;->GH()V
 
     return-void
 .end method
 
-.method public static GI()Lokhttp3/internal/e/k;
+.method public static GG()Lokhttp3/internal/e/k;
     .locals 1
 
-    sget-object v0, Lokhttp3/internal/e/k;->bwN:Lokhttp3/internal/e/k;
+    sget-object v0, Lokhttp3/internal/e/k;->bwI:Lokhttp3/internal/e/k;
 
     return-object v0
 .end method
 
-.method private GJ()V
+.method private GH()V
     .locals 8
 
     const/4 v0, 0x0
 
     :goto_0
-    sget-object v1, Lokhttp3/internal/e/k;->bwM:[B
+    sget-object v1, Lokhttp3/internal/e/k;->bwH:[B
 
     array-length v2, v1
 
     if-ge v0, v2, :cond_4
 
-    sget-object v2, Lokhttp3/internal/e/k;->bwL:[I
+    sget-object v2, Lokhttp3/internal/e/k;->bwG:[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;->bwO:Lokhttp3/internal/e/k$a;
+    iget-object v4, p0, Lokhttp3/internal/e/k;->bwJ: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;->bwP:[Lokhttp3/internal/e/k$a;
+    iget-object v6, v4, Lokhttp3/internal/e/k$a;->bwK:[Lokhttp3/internal/e/k$a;
 
     if-eqz v6, :cond_1
 
-    iget-object v6, v4, Lokhttp3/internal/e/k$a;->bwP:[Lokhttp3/internal/e/k$a;
+    iget-object v6, v4, Lokhttp3/internal/e/k$a;->bwK:[Lokhttp3/internal/e/k$a;
 
     aget-object v6, v6, v5
 
     if-nez v6, :cond_0
 
-    iget-object v6, v4, Lokhttp3/internal/e/k$a;->bwP:[Lokhttp3/internal/e/k$a;
+    iget-object v6, v4, Lokhttp3/internal/e/k$a;->bwK:[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;->bwP:[Lokhttp3/internal/e/k$a;
+    iget-object v4, v4, Lokhttp3/internal/e/k$a;->bwK:[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;->bwP:[Lokhttp3/internal/e/k$a;
+    iget-object v6, v4, Lokhttp3/internal/e/k$a;->bwK:[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;->bwL:[I
+    sget-object v6, Lokhttp3/internal/e/k;->bwG:[I
 
     aget v6, v6, v4
 
-    sget-object v7, Lokhttp3/internal/e/k;->bwM:[B
+    sget-object v7, Lokhttp3/internal/e/k;->bwH:[B
 
     aget-byte v4, v7, v4
 
@@ -808,7 +808,7 @@
 
     and-int/lit16 v3, v3, 0xff
 
-    sget-object v4, Lokhttp3/internal/e/k;->bwM:[B
+    sget-object v4, Lokhttp3/internal/e/k;->bwH:[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;->bwO:Lokhttp3/internal/e/k$a;
+    iget-object v1, p0, Lokhttp3/internal/e/k;->bwJ: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;->bwP:[Lokhttp3/internal/e/k$a;
+    iget-object v4, v4, Lokhttp3/internal/e/k$a;->bwK:[Lokhttp3/internal/e/k$a;
 
     aget-object v4, v4, v5
 
-    iget-object v5, v4, Lokhttp3/internal/e/k$a;->bwP:[Lokhttp3/internal/e/k$a;
+    iget-object v5, v4, Lokhttp3/internal/e/k$a;->bwK:[Lokhttp3/internal/e/k$a;
 
     if-nez v5, :cond_0
 
-    iget v5, v4, Lokhttp3/internal/e/k$a;->bwQ:I
+    iget v5, v4, Lokhttp3/internal/e/k$a;->bwL:I
 
     invoke-virtual {v0, v5}, Ljava/io/ByteArrayOutputStream;->write(I)V
 
-    iget v4, v4, Lokhttp3/internal/e/k$a;->bwR:I
+    iget v4, v4, Lokhttp3/internal/e/k$a;->bwM:I
 
     sub-int/2addr v3, v4
 
-    iget-object v4, p0, Lokhttp3/internal/e/k;->bwO:Lokhttp3/internal/e/k$a;
+    iget-object v4, p0, Lokhttp3/internal/e/k;->bwJ: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;->bwP:[Lokhttp3/internal/e/k$a;
+    iget-object v2, v4, Lokhttp3/internal/e/k$a;->bwK:[Lokhttp3/internal/e/k$a;
 
     aget-object p1, v2, p1
 
-    iget-object v2, p1, Lokhttp3/internal/e/k$a;->bwP:[Lokhttp3/internal/e/k$a;
+    iget-object v2, p1, Lokhttp3/internal/e/k$a;->bwK:[Lokhttp3/internal/e/k$a;
 
     if-nez v2, :cond_3
 
-    iget v2, p1, Lokhttp3/internal/e/k$a;->bwR:I
+    iget v2, p1, Lokhttp3/internal/e/k$a;->bwM:I
 
     if-gt v2, v3, :cond_3
 
-    iget v2, p1, Lokhttp3/internal/e/k$a;->bwQ:I
+    iget v2, p1, Lokhttp3/internal/e/k$a;->bwL:I
 
     invoke-virtual {v0, v2}, Ljava/io/ByteArrayOutputStream;->write(I)V
 
-    iget p1, p1, Lokhttp3/internal/e/k$a;->bwR:I
+    iget p1, p1, Lokhttp3/internal/e/k$a;->bwM:I
 
     sub-int/2addr v3, p1
 
-    iget-object v4, p0, Lokhttp3/internal/e/k;->bwO:Lokhttp3/internal/e/k$a;
+    iget-object v4, p0, Lokhttp3/internal/e/k;->bwJ: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 216d203b5b..70b967ed82 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 bwS:Lokhttp3/internal/e/l;
+.field public static final bwN: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;->bwS:Lokhttp3/internal/e/l;
+    sput-object v0, Lokhttp3/internal/e/l;->bwN: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 553e79bd05..7a08e3b5ed 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 bwT:I
+.field bwO:I
 
-.field final bwU:[I
+.field final bwP:[I
 
 
 # direct methods
@@ -19,23 +19,23 @@
 
     new-array v0, v0, [I
 
-    iput-object v0, p0, Lokhttp3/internal/e/m;->bwU:[I
+    iput-object v0, p0, Lokhttp3/internal/e/m;->bwP:[I
 
     return-void
 .end method
 
 
 # virtual methods
-.method final GK()I
+.method final GI()I
     .locals 2
 
-    iget v0, p0, Lokhttp3/internal/e/m;->bwT:I
+    iget v0, p0, Lokhttp3/internal/e/m;->bwO:I
 
     and-int/lit8 v0, v0, 0x2
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/internal/e/m;->bwU:[I
+    iget-object v0, p0, Lokhttp3/internal/e/m;->bwP:[I
 
     const/4 v1, 0x1
 
@@ -49,16 +49,16 @@
     return v0
 .end method
 
-.method final GL()I
+.method final GJ()I
     .locals 2
 
-    iget v0, p0, Lokhttp3/internal/e/m;->bwT:I
+    iget v0, p0, Lokhttp3/internal/e/m;->bwO:I
 
     and-int/lit16 v0, v0, 0x80
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/internal/e/m;->bwU:[I
+    iget-object v0, p0, Lokhttp3/internal/e/m;->bwP:[I
 
     const/4 v1, 0x7
 
@@ -77,7 +77,7 @@
 
     if-ltz p1, :cond_1
 
-    iget-object v0, p0, Lokhttp3/internal/e/m;->bwU:[I
+    iget-object v0, p0, Lokhttp3/internal/e/m;->bwP:[I
 
     array-length v1, v0
 
@@ -90,11 +90,11 @@
 
     shl-int/2addr v1, p1
 
-    iget v2, p0, Lokhttp3/internal/e/m;->bwT:I
+    iget v2, p0, Lokhttp3/internal/e/m;->bwO:I
 
     or-int/2addr v1, v2
 
-    iput v1, p0, Lokhttp3/internal/e/m;->bwT:I
+    iput v1, p0, Lokhttp3/internal/e/m;->bwO:I
 
     aput p2, v0, p1
 
@@ -110,7 +110,7 @@
 
     shl-int p1, v0, p1
 
-    iget v1, p0, Lokhttp3/internal/e/m;->bwT:I
+    iget v1, p0, Lokhttp3/internal/e/m;->bwO: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 9d4ef22075..aec3230db3 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 bwV:Lokhttp3/internal/f/a;
+.field public static final bwQ: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;->bwV:Lokhttp3/internal/f/a;
+    sput-object v0, Lokhttp3/internal/f/a;->bwQ: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 826bcb5014..867df504ad 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 bxc:Ljava/lang/Object;
+.field private final bwX:Ljava/lang/Object;
 
-.field private final bxd:Ljava/lang/reflect/Method;
+.field private final bwY: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;->bxc:Ljava/lang/Object;
+    iput-object p1, p0, Lokhttp3/internal/g/a$a;->bwX:Ljava/lang/Object;
 
-    iput-object p2, p0, Lokhttp3/internal/g/a$a;->bxd:Ljava/lang/reflect/Method;
+    iput-object p2, p0, Lokhttp3/internal/g/a$a;->bwY: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;->bxd:Ljava/lang/reflect/Method;
+    iget-object v0, p0, Lokhttp3/internal/g/a$a;->bwY:Ljava/lang/reflect/Method;
 
-    iget-object v1, p0, Lokhttp3/internal/g/a$a;->bxc:Ljava/lang/Object;
+    iget-object v1, p0, Lokhttp3/internal/g/a$a;->bwX: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 e6bd96539e..f5a89be94b 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 bxe:Ljavax/net/ssl/X509TrustManager;
+.field private final bwZ:Ljavax/net/ssl/X509TrustManager;
 
-.field private final bxf:Ljava/lang/reflect/Method;
+.field private final bxa: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;->bxf:Ljava/lang/reflect/Method;
+    iput-object p2, p0, Lokhttp3/internal/g/a$b;->bxa:Ljava/lang/reflect/Method;
 
-    iput-object p1, p0, Lokhttp3/internal/g/a$b;->bxe:Ljavax/net/ssl/X509TrustManager;
+    iput-object p1, p0, Lokhttp3/internal/g/a$b;->bwZ: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;->bxf:Ljava/lang/reflect/Method;
+    iget-object v1, p0, Lokhttp3/internal/g/a$b;->bxa:Ljava/lang/reflect/Method;
 
-    iget-object v2, p0, Lokhttp3/internal/g/a$b;->bxe:Ljavax/net/ssl/X509TrustManager;
+    iget-object v2, p0, Lokhttp3/internal/g/a$b;->bwZ: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;->bxe:Ljavax/net/ssl/X509TrustManager;
+    iget-object v1, p0, Lokhttp3/internal/g/a$b;->bwZ:Ljavax/net/ssl/X509TrustManager;
 
-    iget-object v3, p1, Lokhttp3/internal/g/a$b;->bxe:Ljavax/net/ssl/X509TrustManager;
+    iget-object v3, p1, Lokhttp3/internal/g/a$b;->bwZ: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;->bxf:Ljava/lang/reflect/Method;
+    iget-object v1, p0, Lokhttp3/internal/g/a$b;->bxa:Ljava/lang/reflect/Method;
 
-    iget-object p1, p1, Lokhttp3/internal/g/a$b;->bxf:Ljava/lang/reflect/Method;
+    iget-object p1, p1, Lokhttp3/internal/g/a$b;->bxa: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;->bxe:Ljavax/net/ssl/X509TrustManager;
+    iget-object v0, p0, Lokhttp3/internal/g/a$b;->bwZ:Ljavax/net/ssl/X509TrustManager;
 
     invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
 
     move-result v0
 
-    iget-object v1, p0, Lokhttp3/internal/g/a$b;->bxf:Ljava/lang/reflect/Method;
+    iget-object v1, p0, Lokhttp3/internal/g/a$b;->bxa: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 40a56d29f2..c340b3e073 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 bxg:Ljava/lang/reflect/Method;
+.field private final bxb:Ljava/lang/reflect/Method;
 
-.field private final bxh:Ljava/lang/reflect/Method;
+.field private final bxc: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;->bxg:Ljava/lang/reflect/Method;
+    iput-object p2, p0, Lokhttp3/internal/g/a$c;->bxb:Ljava/lang/reflect/Method;
 
-    iput-object p3, p0, Lokhttp3/internal/g/a$c;->bxh:Ljava/lang/reflect/Method;
+    iput-object p3, p0, Lokhttp3/internal/g/a$c;->bxc:Ljava/lang/reflect/Method;
 
     return-void
 .end method
 
-.method static GP()Lokhttp3/internal/g/a$c;
+.method static GN()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;->bxh:Ljava/lang/reflect/Method;
+    iget-object v1, p0, Lokhttp3/internal/g/a$c;->bxc: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;->bxg:Ljava/lang/reflect/Method;
+    iget-object v3, p0, Lokhttp3/internal/g/a$c;->bxb: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 37dddbe5bc..3faf19431b 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 bno:Ljava/util/List;
+.field private final bnj:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -28,9 +28,9 @@
     .end annotation
 .end field
 
-.field bxo:Z
+.field bxj:Z
 
-.field bxp:Ljava/lang/String;
+.field bxk: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;->bno:Ljava/util/List;
+    iput-object p1, p0, Lokhttp3/internal/g/d$a;->bnj: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;->bxo:Z
+    iput-boolean v3, p0, Lokhttp3/internal/g/d$a;->bxj:Z
 
     return-object v2
 
@@ -125,7 +125,7 @@
 
     if-nez v1, :cond_3
 
-    iget-object p1, p0, Lokhttp3/internal/g/d$a;->bno:Ljava/util/List;
+    iget-object p1, p0, Lokhttp3/internal/g/d$a;->bnj: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;->bno:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/internal/g/d$a;->bnj: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;->bxp:Ljava/lang/String;
+    iput-object p1, p0, Lokhttp3/internal/g/d$a;->bxk:Ljava/lang/String;
 
     return-object p1
 
@@ -204,7 +204,7 @@
     goto :goto_0
 
     :cond_6
-    iget-object p1, p0, Lokhttp3/internal/g/d$a;->bno:Ljava/util/List;
+    iget-object p1, p0, Lokhttp3/internal/g/d$a;->bnj: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;->bxp:Ljava/lang/String;
+    iput-object p1, p0, Lokhttp3/internal/g/d$a;->bxk: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;->bxp:Ljava/lang/String;
+    iput-object p1, p0, Lokhttp3/internal/g/d$a;->bxk: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 9e92cb6a77..18806f74c5 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 bxq:Ljava/lang/Class;
+.field private final bxl:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -24,7 +24,7 @@
     .end annotation
 .end field
 
-.field private final bxr:[Ljava/lang/Class;
+.field private final bxm:[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;->bxq:Ljava/lang/Class;
+    iput-object p1, p0, Lokhttp3/internal/g/e;->bxl:Ljava/lang/Class;
 
     iput-object p2, p0, Lokhttp3/internal/g/e;->methodName:Ljava/lang/String;
 
-    iput-object p3, p0, Lokhttp3/internal/g/e;->bxr:[Ljava/lang/Class;
+    iput-object p3, p0, Lokhttp3/internal/g/e;->bxm:[Ljava/lang/Class;
 
     return-void
 .end method
@@ -72,7 +72,7 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v2, p0, Lokhttp3/internal/g/e;->bxr:[Ljava/lang/Class;
+    iget-object v2, p0, Lokhttp3/internal/g/e;->bxm:[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;->bxq:Ljava/lang/Class;
+    iget-object v0, p0, Lokhttp3/internal/g/e;->bxl: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 8584470631..d1a224bdec 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 bxB:Lokhttp3/internal/i/e;
+.field private final bxw: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;->bxB:Lokhttp3/internal/i/e;
+    iput-object p1, p0, Lokhttp3/internal/i/a;->bxw: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;->bxB:Lokhttp3/internal/i/e;
+    iget-object v4, p0, Lokhttp3/internal/i/a;->bxw: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;->bxB:Lokhttp3/internal/i/e;
+    iget-object p1, p1, Lokhttp3/internal/i/a;->bxw:Lokhttp3/internal/i/e;
 
-    iget-object v1, p0, Lokhttp3/internal/i/a;->bxB:Lokhttp3/internal/i/e;
+    iget-object v1, p0, Lokhttp3/internal/i/a;->bxw: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;->bxB:Lokhttp3/internal/i/e;
+    iget-object v0, p0, Lokhttp3/internal/i/a;->bxw: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 ec76ebd031..96bf72fe06 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 bxC:Ljava/util/Map;
+.field private final bxx: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;->bxC:Ljava/util/Map;
+    iput-object v0, p0, Lokhttp3/internal/i/b;->bxx:Ljava/util/Map;
 
     array-length v0, p1
 
@@ -45,7 +45,7 @@
 
     move-result-object v3
 
-    iget-object v4, p0, Lokhttp3/internal/i/b;->bxC:Ljava/util/Map;
+    iget-object v4, p0, Lokhttp3/internal/i/b;->bxx: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;->bxC:Ljava/util/Map;
+    iget-object v5, p0, Lokhttp3/internal/i/b;->bxx: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;->bxC:Ljava/util/Map;
+    iget-object v1, p0, Lokhttp3/internal/i/b;->bxx: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;->bxC:Ljava/util/Map;
+    iget-object p1, p1, Lokhttp3/internal/i/b;->bxx:Ljava/util/Map;
 
-    iget-object v1, p0, Lokhttp3/internal/i/b;->bxC:Ljava/util/Map;
+    iget-object v1, p0, Lokhttp3/internal/i/b;->bxx: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;->bxC:Ljava/util/Map;
+    iget-object v0, p0, Lokhttp3/internal/i/b;->bxx: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 6d2dfea6fc..a9a7d84b09 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 bxD:Lokhttp3/internal/i/d;
+.field public static final bxy: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;->bxD:Lokhttp3/internal/i/d;
+    sput-object v0, Lokhttp3/internal/i/d;->bxy: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 002fda311c..f7f33e6c72 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 bxW:Lokhttp3/internal/j/a;
+.field final synthetic bxR: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;->bxW:Lokhttp3/internal/j/a;
+    iput-object p1, p0, Lokhttp3/internal/j/a$1;->bxR: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;->bxW:Lokhttp3/internal/j/a;
+    iget-object v0, p0, Lokhttp3/internal/j/a$1;->bxR:Lokhttp3/internal/j/a;
 
-    invoke-virtual {v0}, Lokhttp3/internal/j/a;->GY()Z
+    invoke-virtual {v0}, Lokhttp3/internal/j/a;->GW()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;->bxW:Lokhttp3/internal/j/a;
+    iget-object v1, p0, Lokhttp3/internal/j/a$1;->bxR: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 0c7222c6c0..c75d8067de 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 bxW:Lokhttp3/internal/j/a;
+.field final synthetic bxR:Lokhttp3/internal/j/a;
 
-.field final synthetic bxX:Lokhttp3/w;
+.field final synthetic bxS: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;->bxW:Lokhttp3/internal/j/a;
+    iput-object p1, p0, Lokhttp3/internal/j/a$2;->bxR:Lokhttp3/internal/j/a;
 
-    iput-object p2, p0, Lokhttp3/internal/j/a$2;->bxX:Lokhttp3/w;
+    iput-object p2, p0, Lokhttp3/internal/j/a$2;->bxS: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;->bxW:Lokhttp3/internal/j/a;
+    iget-object v0, p0, Lokhttp3/internal/j/a$2;->bxR: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;->bxW:Lokhttp3/internal/j/a;
+    iget-object v1, p0, Lokhttp3/internal/j/a$2;->bxR: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;->Hv()Lokio/ByteString;
+    invoke-virtual {v1}, Lokio/ByteString;->Ht()Lokio/ByteString;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lokio/ByteString;->Hu()Ljava/lang/String;
+    invoke-virtual {v1}, Lokio/ByteString;->Hs()Ljava/lang/String;
 
     move-result-object v1
 
@@ -135,32 +135,32 @@
 
     if-eqz v2, :cond_0
 
-    sget-object v0, Lokhttp3/internal/a;->bsV:Lokhttp3/internal/a;
+    sget-object v0, Lokhttp3/internal/a;->bsQ: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;->Gh()V
+    invoke-virtual {p1}, Lokhttp3/internal/b/g;->Gf()V
 
-    invoke-virtual {p1}, Lokhttp3/internal/b/g;->Gg()Lokhttp3/internal/b/c;
+    invoke-virtual {p1}, Lokhttp3/internal/b/g;->Ge()Lokhttp3/internal/b/c;
 
     move-result-object v0
 
     new-instance v1, Lokhttp3/internal/b/c$1;
 
-    iget-object v2, v0, Lokhttp3/internal/b/c;->lY:Lokio/d;
+    iget-object v2, v0, Lokhttp3/internal/b/c;->lZ:Lokio/d;
 
-    iget-object v3, v0, Lokhttp3/internal/b/c;->btZ:Lokio/BufferedSink;
+    iget-object v3, v0, Lokhttp3/internal/b/c;->btU: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;->bxW:Lokhttp3/internal/j/a;
+    iget-object v0, p0, Lokhttp3/internal/j/a$2;->bxR:Lokhttp3/internal/j/a;
 
-    iget-object v0, v0, Lokhttp3/internal/j/a;->bxF:Lokhttp3/WebSocketListener;
+    iget-object v0, v0, Lokhttp3/internal/j/a;->bxA:Lokhttp3/WebSocketListener;
 
-    iget-object v2, p0, Lokhttp3/internal/j/a$2;->bxW:Lokhttp3/internal/j/a;
+    iget-object v2, p0, Lokhttp3/internal/j/a$2;->bxR: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;->bxX:Lokhttp3/w;
+    iget-object v0, p0, Lokhttp3/internal/j/a$2;->bxS:Lokhttp3/w;
 
-    iget-object v0, v0, Lokhttp3/w;->bnk:Lokhttp3/s;
+    iget-object v0, v0, Lokhttp3/w;->bnf:Lokhttp3/s;
 
-    invoke-virtual {v0}, Lokhttp3/s;->Fu()Ljava/lang/String;
+    invoke-virtual {v0}, Lokhttp3/s;->Fs()Ljava/lang/String;
 
     move-result-object v0
 
@@ -184,23 +184,23 @@
 
     move-result-object p2
 
-    iget-object v0, p0, Lokhttp3/internal/j/a$2;->bxW:Lokhttp3/internal/j/a;
+    iget-object v0, p0, Lokhttp3/internal/j/a$2;->bxR: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;->Gg()Lokhttp3/internal/b/c;
+    invoke-virtual {p1}, Lokhttp3/internal/b/g;->Ge()Lokhttp3/internal/b/c;
 
     move-result-object p1
 
-    iget-object p1, p1, Lokhttp3/internal/b/c;->btX:Ljava/net/Socket;
+    iget-object p1, p1, Lokhttp3/internal/b/c;->btS: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;->bxW:Lokhttp3/internal/j/a;
+    iget-object p1, p0, Lokhttp3/internal/j/a$2;->bxR:Lokhttp3/internal/j/a;
 
-    invoke-virtual {p1}, Lokhttp3/internal/j/a;->GV()V
+    invoke-virtual {p1}, Lokhttp3/internal/j/a;->GT()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;->bxW:Lokhttp3/internal/j/a;
+    iget-object p2, p0, Lokhttp3/internal/j/a$2;->bxR: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;->bxW:Lokhttp3/internal/j/a;
+    iget-object v0, p0, Lokhttp3/internal/j/a$2;->bxR: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 c7fe365401..10cafbd62b 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 bxW:Lokhttp3/internal/j/a;
+.field final synthetic bxR: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;->bxW:Lokhttp3/internal/j/a;
+    iput-object p1, p0, Lokhttp3/internal/j/a$a;->bxR: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;->bxW:Lokhttp3/internal/j/a;
+    iget-object v0, p0, Lokhttp3/internal/j/a$a;->bxR: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 79a18ea82a..02af5d1162 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 bxY:Lokio/ByteString;
+.field final bxT:Lokio/ByteString;
 
-.field final bxZ:J
+.field final bxU: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;->bxY:Lokio/ByteString;
+    iput-object p2, p0, Lokhttp3/internal/j/a$b;->bxT:Lokio/ByteString;
 
     const-wide/32 p1, 0xea60
 
-    iput-wide p1, p0, Lokhttp3/internal/j/a$b;->bxZ:J
+    iput-wide p1, p0, Lokhttp3/internal/j/a$b;->bxU: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 54eed58454..d1060b68c9 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 bya:I
+.field final bxV:I
 
-.field final byb:Lokio/ByteString;
+.field final bxW:Lokio/ByteString;
 
 
 # direct methods
@@ -28,9 +28,9 @@
 
     const/4 p1, 0x1
 
-    iput p1, p0, Lokhttp3/internal/j/a$c;->bya:I
+    iput p1, p0, Lokhttp3/internal/j/a$c;->bxV:I
 
-    iput-object p2, p0, Lokhttp3/internal/j/a$c;->byb:Lokio/ByteString;
+    iput-object p2, p0, Lokhttp3/internal/j/a$c;->bxW: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 18ee3877cf..bfd2a44e1d 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 bxW:Lokhttp3/internal/j/a;
+.field final synthetic bxR: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;->bxW:Lokhttp3/internal/j/a;
+    iput-object p1, p0, Lokhttp3/internal/j/a$d;->bxR: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;->bxW:Lokhttp3/internal/j/a;
+    iget-object v0, p0, Lokhttp3/internal/j/a$d;->bxR:Lokhttp3/internal/j/a;
 
     monitor-enter v0
 
     :try_start_0
-    iget-boolean v1, v0, Lokhttp3/internal/j/a;->bxS:Z
+    iget-boolean v1, v0, Lokhttp3/internal/j/a;->bxN:Z
 
     if-eqz v1, :cond_0
 
@@ -51,15 +51,15 @@
     return-void
 
     :cond_0
-    iget-object v1, v0, Lokhttp3/internal/j/a;->bxJ:Lokhttp3/internal/j/d;
+    iget-object v1, v0, Lokhttp3/internal/j/a;->bxE:Lokhttp3/internal/j/d;
 
-    iget-boolean v2, v0, Lokhttp3/internal/j/a;->bvR:Z
+    iget-boolean v2, v0, Lokhttp3/internal/j/a;->bvM:Z
 
     const/4 v3, -0x1
 
     if-eqz v2, :cond_1
 
-    iget v2, v0, Lokhttp3/internal/j/a;->bxT:I
+    iget v2, v0, Lokhttp3/internal/j/a;->bxO:I
 
     goto :goto_0
 
@@ -67,15 +67,15 @@
     const/4 v2, -0x1
 
     :goto_0
-    iget v4, v0, Lokhttp3/internal/j/a;->bxT:I
+    iget v4, v0, Lokhttp3/internal/j/a;->bxO:I
 
     const/4 v5, 0x1
 
     add-int/2addr v4, v5
 
-    iput v4, v0, Lokhttp3/internal/j/a;->bxT:I
+    iput v4, v0, Lokhttp3/internal/j/a;->bxO:I
 
-    iput-boolean v5, v0, Lokhttp3/internal/j/a;->bvR:Z
+    iput-boolean v5, v0, Lokhttp3/internal/j/a;->bvM: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;->bxG:J
+    iget-wide v6, v0, Lokhttp3/internal/j/a;->bxB: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;->byR:Lokio/ByteString;
+    sget-object v2, Lokio/ByteString;->byM: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 3c947ec929..e43e7ffb70 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 btZ:Lokio/BufferedSink;
+.field public final btU:Lokio/BufferedSink;
 
-.field public final bvJ:Z
+.field public final bvE:Z
 
-.field public final lY:Lokio/d;
+.field public final lZ:Lokio/d;
 
 
 # direct methods
@@ -33,11 +33,11 @@
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lokhttp3/internal/j/a$e;->bvJ:Z
+    iput-boolean p1, p0, Lokhttp3/internal/j/a$e;->bvE:Z
 
-    iput-object p2, p0, Lokhttp3/internal/j/a$e;->lY:Lokio/d;
+    iput-object p2, p0, Lokhttp3/internal/j/a$e;->lZ:Lokio/d;
 
-    iput-object p3, p0, Lokhttp3/internal/j/a$e;->btZ:Lokio/BufferedSink;
+    iput-object p3, p0, Lokhttp3/internal/j/a$e;->btU: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 276ba9dd4f..48253c023d 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;->lZ:Lokio/c;
+    iget-object v4, p0, Lokio/c$a;->ma: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 fb11f79390..5bcfee42ae 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 byc:Z
+.field final bxX:Z
 
-.field final byd:Lokhttp3/internal/j/c$a;
+.field final bxY:Lokhttp3/internal/j/c$a;
 
-.field bye:J
+.field bxZ:J
 
-.field byf:Z
+.field bya:Z
 
-.field byg:Z
+.field byb:Z
 
-.field private final byh:Lokio/c;
+.field private final byc:Lokio/c;
 
-.field final byi:Lokio/c;
+.field final byd:Lokio/c;
 
-.field private final byj:[B
+.field private final bye:[B
 
-.field private final byk:Lokio/c$a;
+.field private final byf:Lokio/c$a;
 
-.field final lY:Lokio/d;
+.field final lZ:Lokio/d;
 
 .field opcode:I
 
@@ -47,21 +47,21 @@
 
     invoke-direct {v0}, Lokio/c;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/internal/j/c;->byh:Lokio/c;
+    iput-object v0, p0, Lokhttp3/internal/j/c;->byc:Lokio/c;
 
     new-instance v0, Lokio/c;
 
     invoke-direct {v0}, Lokio/c;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/internal/j/c;->byi:Lokio/c;
+    iput-object v0, p0, Lokhttp3/internal/j/c;->byd:Lokio/c;
 
     if-eqz p2, :cond_2
 
-    iput-boolean p1, p0, Lokhttp3/internal/j/c;->byc:Z
+    iput-boolean p1, p0, Lokhttp3/internal/j/c;->bxX:Z
 
-    iput-object p2, p0, Lokhttp3/internal/j/c;->lY:Lokio/d;
+    iput-object p2, p0, Lokhttp3/internal/j/c;->lZ:Lokio/d;
 
-    iput-object p3, p0, Lokhttp3/internal/j/c;->byd:Lokhttp3/internal/j/c$a;
+    iput-object p3, p0, Lokhttp3/internal/j/c;->bxY: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;->byj:[B
+    iput-object p3, p0, Lokhttp3/internal/j/c;->bye:[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;->byk:Lokio/c$a;
+    iput-object p2, p0, Lokhttp3/internal/j/c;->byf:Lokio/c$a;
 
     return-void
 
@@ -103,7 +103,7 @@
     throw p1
 .end method
 
-.method private Hb()V
+.method private GZ()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;->GZ()V
+    invoke-virtual {p0}, Lokhttp3/internal/j/c;->GX()V
 
-    iget-boolean v0, p0, Lokhttp3/internal/j/c;->byg:Z
+    iget-boolean v0, p0, Lokhttp3/internal/j/c;->byb:Z
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {p0}, Lokhttp3/internal/j/c;->Ha()V
+    invoke-virtual {p0}, Lokhttp3/internal/j/c;->GY()V
 
     goto :goto_0
 
@@ -132,7 +132,7 @@
 
 
 # virtual methods
-.method final GZ()V
+.method final GX()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;->lY:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/j/c;->lZ:Lokio/d;
 
     invoke-interface {v0}, Lokio/d;->timeout()Lokio/s;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokio/s;->HC()J
+    invoke-virtual {v0}, Lokio/s;->HA()J
 
     move-result-wide v0
 
-    iget-object v2, p0, Lokhttp3/internal/j/c;->lY:Lokio/d;
+    iget-object v2, p0, Lokhttp3/internal/j/c;->lZ:Lokio/d;
 
     invoke-interface {v2}, Lokio/d;->timeout()Lokio/s;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lokio/s;->HF()Lokio/s;
+    invoke-virtual {v2}, Lokio/s;->HD()Lokio/s;
 
     :try_start_0
-    iget-object v2, p0, Lokhttp3/internal/j/c;->lY:Lokio/d;
+    iget-object v2, p0, Lokhttp3/internal/j/c;->lZ: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;->lY:Lokio/d;
+    iget-object v3, p0, Lokhttp3/internal/j/c;->lZ: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;->byf:Z
+    iput-boolean v0, p0, Lokhttp3/internal/j/c;->bya: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;->byg:Z
+    iput-boolean v0, p0, Lokhttp3/internal/j/c;->byb:Z
 
-    iget-boolean v0, p0, Lokhttp3/internal/j/c;->byg:Z
+    iget-boolean v0, p0, Lokhttp3/internal/j/c;->byb:Z
 
     if-eqz v0, :cond_3
 
-    iget-boolean v0, p0, Lokhttp3/internal/j/c;->byf:Z
+    iget-boolean v0, p0, Lokhttp3/internal/j/c;->bya:Z
 
     if-eqz v0, :cond_2
 
@@ -282,7 +282,7 @@
 
     if-nez v2, :cond_10
 
-    iget-object v0, p0, Lokhttp3/internal/j/c;->lY:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/j/c;->lZ: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;->byc:Z
+    iget-boolean v2, p0, Lokhttp3/internal/j/c;->bxX:Z
 
     if-ne v1, v2, :cond_9
 
@@ -325,9 +325,9 @@
 
     int-to-long v2, v0
 
-    iput-wide v2, p0, Lokhttp3/internal/j/c;->bye:J
+    iput-wide v2, p0, Lokhttp3/internal/j/c;->bxZ:J
 
-    iget-wide v2, p0, Lokhttp3/internal/j/c;->bye:J
+    iget-wide v2, p0, Lokhttp3/internal/j/c;->bxZ:J
 
     const-wide/16 v4, 0x7e
 
@@ -335,7 +335,7 @@
 
     if-nez v0, :cond_a
 
-    iget-object v0, p0, Lokhttp3/internal/j/c;->lY:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/j/c;->lZ: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;->bye:J
+    iput-wide v2, p0, Lokhttp3/internal/j/c;->bxZ:J
 
     goto :goto_8
 
@@ -358,15 +358,15 @@
 
     if-nez v0, :cond_c
 
-    iget-object v0, p0, Lokhttp3/internal/j/c;->lY:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/j/c;->lZ:Lokio/d;
 
     invoke-interface {v0}, Lokio/d;->readLong()J
 
     move-result-wide v2
 
-    iput-wide v2, p0, Lokhttp3/internal/j/c;->bye:J
+    iput-wide v2, p0, Lokhttp3/internal/j/c;->bxZ:J
 
-    iget-wide v2, p0, Lokhttp3/internal/j/c;->bye:J
+    iget-wide v2, p0, Lokhttp3/internal/j/c;->bxZ: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;->bye:J
+    iget-wide v2, p0, Lokhttp3/internal/j/c;->bxZ: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;->byg:Z
+    iget-boolean v0, p0, Lokhttp3/internal/j/c;->byb:Z
 
     if-eqz v0, :cond_e
 
-    iget-wide v2, p0, Lokhttp3/internal/j/c;->bye:J
+    iget-wide v2, p0, Lokhttp3/internal/j/c;->bxZ: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;->lY:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/j/c;->lZ:Lokio/d;
 
-    iget-object v1, p0, Lokhttp3/internal/j/c;->byj:[B
+    iget-object v1, p0, Lokhttp3/internal/j/c;->bye:[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;->lY:Lokio/d;
+    iget-object v3, p0, Lokhttp3/internal/j/c;->lZ:Lokio/d;
 
     invoke-interface {v3}, Lokio/d;->timeout()Lokio/s;
 
@@ -477,7 +477,7 @@
     throw v0
 .end method
 
-.method final Ha()V
+.method final GY()V
     .locals 8
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -485,7 +485,7 @@
         }
     .end annotation
 
-    iget-wide v0, p0, Lokhttp3/internal/j/c;->bye:J
+    iget-wide v0, p0, Lokhttp3/internal/j/c;->bxZ:J
 
     const-wide/16 v2, 0x0
 
@@ -493,33 +493,33 @@
 
     if-lez v4, :cond_0
 
-    iget-object v4, p0, Lokhttp3/internal/j/c;->lY:Lokio/d;
+    iget-object v4, p0, Lokhttp3/internal/j/c;->lZ:Lokio/d;
 
-    iget-object v5, p0, Lokhttp3/internal/j/c;->byh:Lokio/c;
+    iget-object v5, p0, Lokhttp3/internal/j/c;->byc:Lokio/c;
 
     invoke-interface {v4, v5, v0, v1}, Lokio/d;->b(Lokio/c;J)V
 
-    iget-boolean v0, p0, Lokhttp3/internal/j/c;->byc:Z
+    iget-boolean v0, p0, Lokhttp3/internal/j/c;->bxX:Z
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/internal/j/c;->byh:Lokio/c;
+    iget-object v0, p0, Lokhttp3/internal/j/c;->byc:Lokio/c;
 
-    iget-object v1, p0, Lokhttp3/internal/j/c;->byk:Lokio/c$a;
+    iget-object v1, p0, Lokhttp3/internal/j/c;->byf:Lokio/c$a;
 
     invoke-virtual {v0, v1}, Lokio/c;->a(Lokio/c$a;)Lokio/c$a;
 
-    iget-object v0, p0, Lokhttp3/internal/j/c;->byk:Lokio/c$a;
+    iget-object v0, p0, Lokhttp3/internal/j/c;->byf:Lokio/c$a;
 
     invoke-virtual {v0, v2, v3}, Lokio/c$a;->aG(J)I
 
-    iget-object v0, p0, Lokhttp3/internal/j/c;->byk:Lokio/c$a;
+    iget-object v0, p0, Lokhttp3/internal/j/c;->byf:Lokio/c$a;
 
-    iget-object v1, p0, Lokhttp3/internal/j/c;->byj:[B
+    iget-object v1, p0, Lokhttp3/internal/j/c;->bye:[B
 
     invoke-static {v0, v1}, Lokhttp3/internal/j/b;->a(Lokio/c$a;[B)V
 
-    iget-object v0, p0, Lokhttp3/internal/j/c;->byk:Lokio/c$a;
+    iget-object v0, p0, Lokhttp3/internal/j/c;->byf: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;->byd:Lokhttp3/internal/j/c$a;
+    iget-object v0, p0, Lokhttp3/internal/j/c;->bxY:Lokhttp3/internal/j/c$a;
 
-    iget-object v1, p0, Lokhttp3/internal/j/c;->byh:Lokio/c;
+    iget-object v1, p0, Lokhttp3/internal/j/c;->byc:Lokio/c;
 
-    invoke-virtual {v1}, Lokio/c;->Gs()Lokio/ByteString;
+    invoke-virtual {v1}, Lokio/c;->Gq()Lokio/ByteString;
 
-    invoke-interface {v0}, Lokhttp3/internal/j/c$a;->GW()V
+    invoke-interface {v0}, Lokhttp3/internal/j/c$a;->GU()V
 
     return-void
 
     :pswitch_1
-    iget-object v0, p0, Lokhttp3/internal/j/c;->byd:Lokhttp3/internal/j/c$a;
+    iget-object v0, p0, Lokhttp3/internal/j/c;->bxY:Lokhttp3/internal/j/c$a;
 
-    iget-object v1, p0, Lokhttp3/internal/j/c;->byh:Lokio/c;
+    iget-object v1, p0, Lokhttp3/internal/j/c;->byc:Lokio/c;
 
-    invoke-virtual {v1}, Lokio/c;->Gs()Lokio/ByteString;
+    invoke-virtual {v1}, Lokio/c;->Gq()Lokio/ByteString;
 
     move-result-object v1
 
@@ -579,7 +579,7 @@
     :pswitch_2
     const/16 v0, 0x3ed
 
-    iget-object v1, p0, Lokhttp3/internal/j/c;->byh:Lokio/c;
+    iget-object v1, p0, Lokhttp3/internal/j/c;->byc: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;->byh:Lokio/c;
+    iget-object v0, p0, Lokhttp3/internal/j/c;->byc:Lokio/c;
 
     invoke-virtual {v0}, Lokio/c;->readShort()S
 
     move-result v0
 
-    iget-object v1, p0, Lokhttp3/internal/j/c;->byh:Lokio/c;
+    iget-object v1, p0, Lokhttp3/internal/j/c;->byc:Lokio/c;
 
-    invoke-virtual {v1}, Lokio/c;->Ho()Ljava/lang/String;
+    invoke-virtual {v1}, Lokio/c;->Hm()Ljava/lang/String;
 
     move-result-object v1
 
@@ -624,7 +624,7 @@
     const-string v1, ""
 
     :goto_0
-    iget-object v2, p0, Lokhttp3/internal/j/c;->byd:Lokhttp3/internal/j/c$a;
+    iget-object v2, p0, Lokhttp3/internal/j/c;->bxY: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 Hc()V
+.method final Ha()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;->bye:J
+    iget-wide v0, p0, Lokhttp3/internal/j/c;->bxZ:J
 
     const-wide/16 v2, 0x0
 
@@ -674,50 +674,50 @@
 
     if-lez v4, :cond_0
 
-    iget-object v2, p0, Lokhttp3/internal/j/c;->lY:Lokio/d;
+    iget-object v2, p0, Lokhttp3/internal/j/c;->lZ:Lokio/d;
 
-    iget-object v3, p0, Lokhttp3/internal/j/c;->byi:Lokio/c;
+    iget-object v3, p0, Lokhttp3/internal/j/c;->byd:Lokio/c;
 
     invoke-interface {v2, v3, v0, v1}, Lokio/d;->b(Lokio/c;J)V
 
-    iget-boolean v0, p0, Lokhttp3/internal/j/c;->byc:Z
+    iget-boolean v0, p0, Lokhttp3/internal/j/c;->bxX:Z
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/internal/j/c;->byi:Lokio/c;
+    iget-object v0, p0, Lokhttp3/internal/j/c;->byd:Lokio/c;
 
-    iget-object v1, p0, Lokhttp3/internal/j/c;->byk:Lokio/c$a;
+    iget-object v1, p0, Lokhttp3/internal/j/c;->byf:Lokio/c$a;
 
     invoke-virtual {v0, v1}, Lokio/c;->a(Lokio/c$a;)Lokio/c$a;
 
-    iget-object v0, p0, Lokhttp3/internal/j/c;->byk:Lokio/c$a;
+    iget-object v0, p0, Lokhttp3/internal/j/c;->byf:Lokio/c$a;
 
-    iget-object v1, p0, Lokhttp3/internal/j/c;->byi:Lokio/c;
+    iget-object v1, p0, Lokhttp3/internal/j/c;->byd:Lokio/c;
 
     iget-wide v1, v1, Lokio/c;->size:J
 
-    iget-wide v3, p0, Lokhttp3/internal/j/c;->bye:J
+    iget-wide v3, p0, Lokhttp3/internal/j/c;->bxZ: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;->byk:Lokio/c$a;
+    iget-object v0, p0, Lokhttp3/internal/j/c;->byf:Lokio/c$a;
 
-    iget-object v1, p0, Lokhttp3/internal/j/c;->byj:[B
+    iget-object v1, p0, Lokhttp3/internal/j/c;->bye:[B
 
     invoke-static {v0, v1}, Lokhttp3/internal/j/b;->a(Lokio/c$a;[B)V
 
-    iget-object v0, p0, Lokhttp3/internal/j/c;->byk:Lokio/c$a;
+    iget-object v0, p0, Lokhttp3/internal/j/c;->byf:Lokio/c$a;
 
     invoke-virtual {v0}, Lokio/c$a;->close()V
 
     :cond_0
-    iget-boolean v0, p0, Lokhttp3/internal/j/c;->byf:Z
+    iget-boolean v0, p0, Lokhttp3/internal/j/c;->bya:Z
 
     if-nez v0, :cond_2
 
-    invoke-direct {p0}, Lokhttp3/internal/j/c;->Hb()V
+    invoke-direct {p0}, Lokhttp3/internal/j/c;->GZ()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 f93eb4a842..48958dd27d 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 bya:I
+.field bxV:I
 
-.field byp:Z
+.field byk:Z
 
-.field final synthetic byq:Lokhttp3/internal/j/d;
+.field final synthetic byl: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;->byq:Lokhttp3/internal/j/d;
+    iput-object p1, p0, Lokhttp3/internal/j/d$a;->byl: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;->byq:Lokhttp3/internal/j/d;
+    iget-object v1, p0, Lokhttp3/internal/j/d$a;->byl:Lokhttp3/internal/j/d;
 
-    iget v2, p0, Lokhttp3/internal/j/d$a;->bya:I
+    iget v2, p0, Lokhttp3/internal/j/d$a;->bxV:I
 
-    iget-object v0, v1, Lokhttp3/internal/j/d;->lZ:Lokio/c;
+    iget-object v0, v1, Lokhttp3/internal/j/d;->ma:Lokio/c;
 
     iget-wide v3, v0, Lokio/c;->size:J
 
-    iget-boolean v5, p0, Lokhttp3/internal/j/d$a;->byp:Z
+    iget-boolean v5, p0, Lokhttp3/internal/j/d$a;->byk: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;->byq:Lokhttp3/internal/j/d;
+    iget-object v0, p0, Lokhttp3/internal/j/d$a;->byl:Lokhttp3/internal/j/d;
 
     const/4 v1, 0x0
 
-    iput-boolean v1, v0, Lokhttp3/internal/j/d;->byo:Z
+    iput-boolean v1, v0, Lokhttp3/internal/j/d;->byj:Z
 
     return-void
 
@@ -102,15 +102,15 @@
 
     if-nez v0, :cond_0
 
-    iget-object v1, p0, Lokhttp3/internal/j/d$a;->byq:Lokhttp3/internal/j/d;
+    iget-object v1, p0, Lokhttp3/internal/j/d$a;->byl:Lokhttp3/internal/j/d;
 
-    iget v2, p0, Lokhttp3/internal/j/d$a;->bya:I
+    iget v2, p0, Lokhttp3/internal/j/d$a;->bxV:I
 
-    iget-object v0, v1, Lokhttp3/internal/j/d;->lZ:Lokio/c;
+    iget-object v0, v1, Lokhttp3/internal/j/d;->ma:Lokio/c;
 
     iget-wide v3, v0, Lokio/c;->size:J
 
-    iget-boolean v5, p0, Lokhttp3/internal/j/d$a;->byp:Z
+    iget-boolean v5, p0, Lokhttp3/internal/j/d$a;->byk:Z
 
     const/4 v6, 0x0
 
@@ -118,7 +118,7 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lokhttp3/internal/j/d$a;->byp:Z
+    iput-boolean v0, p0, Lokhttp3/internal/j/d$a;->byk:Z
 
     return-void
 
@@ -135,9 +135,9 @@
 .method public final timeout()Lokio/s;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/internal/j/d$a;->byq:Lokhttp3/internal/j/d;
+    iget-object v0, p0, Lokhttp3/internal/j/d$a;->byl:Lokhttp3/internal/j/d;
 
-    iget-object v0, v0, Lokhttp3/internal/j/d;->btZ:Lokio/BufferedSink;
+    iget-object v0, v0, Lokhttp3/internal/j/d;->btU: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;->byq:Lokhttp3/internal/j/d;
+    iget-object v0, p0, Lokhttp3/internal/j/d$a;->byl:Lokhttp3/internal/j/d;
 
-    iget-object v0, v0, Lokhttp3/internal/j/d;->lZ:Lokio/c;
+    iget-object v0, v0, Lokhttp3/internal/j/d;->ma:Lokio/c;
 
     invoke-virtual {v0, p1, p2, p3}, Lokio/c;->write(Lokio/c;J)V
 
-    iget-boolean p1, p0, Lokhttp3/internal/j/d$a;->byp:Z
+    iget-boolean p1, p0, Lokhttp3/internal/j/d$a;->byk:Z
 
     const/4 p2, 0x0
 
@@ -178,9 +178,9 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lokhttp3/internal/j/d$a;->byq:Lokhttp3/internal/j/d;
+    iget-object p1, p0, Lokhttp3/internal/j/d$a;->byl:Lokhttp3/internal/j/d;
 
-    iget-object p1, p1, Lokhttp3/internal/j/d;->lZ:Lokio/c;
+    iget-object p1, p1, Lokhttp3/internal/j/d;->ma: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;->byq:Lokhttp3/internal/j/d;
+    iget-object p3, p0, Lokhttp3/internal/j/d$a;->byl:Lokhttp3/internal/j/d;
 
-    iget-object p3, p3, Lokhttp3/internal/j/d;->lZ:Lokio/c;
+    iget-object p3, p3, Lokhttp3/internal/j/d;->ma:Lokio/c;
 
-    invoke-virtual {p3}, Lokio/c;->Hk()J
+    invoke-virtual {p3}, Lokio/c;->Hi()J
 
     move-result-wide v2
 
@@ -218,17 +218,17 @@
 
     if-nez p1, :cond_1
 
-    iget-object v0, p0, Lokhttp3/internal/j/d$a;->byq:Lokhttp3/internal/j/d;
+    iget-object v0, p0, Lokhttp3/internal/j/d$a;->byl:Lokhttp3/internal/j/d;
 
-    iget v1, p0, Lokhttp3/internal/j/d$a;->bya:I
+    iget v1, p0, Lokhttp3/internal/j/d$a;->bxV:I
 
-    iget-boolean v4, p0, Lokhttp3/internal/j/d$a;->byp:Z
+    iget-boolean v4, p0, Lokhttp3/internal/j/d$a;->byk: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;->byp:Z
+    iput-boolean p2, p0, Lokhttp3/internal/j/d$a;->byk: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 a7b947bd7a..9f9faaa4d8 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 btZ:Lokio/BufferedSink;
+.field final btU:Lokio/BufferedSink;
 
-.field final byc:Z
+.field final bxX:Z
 
-.field private final byj:[B
+.field private final bye:[B
 
-.field private final byk:Lokio/c$a;
+.field private final byf:Lokio/c$a;
 
-.field final byl:Lokio/c;
+.field final byg:Lokio/c;
 
-.field bym:Z
+.field byh:Z
 
-.field final byn:Lokhttp3/internal/j/d$a;
+.field final byi:Lokhttp3/internal/j/d$a;
 
-.field byo:Z
+.field byj:Z
 
-.field final lZ:Lokio/c;
+.field final ma: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;->lZ:Lokio/c;
+    iput-object v0, p0, Lokhttp3/internal/j/d;->ma: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;->byn:Lokhttp3/internal/j/d$a;
+    iput-object v0, p0, Lokhttp3/internal/j/d;->byi:Lokhttp3/internal/j/d$a;
 
     if-eqz p2, :cond_3
 
     if-eqz p3, :cond_2
 
-    iput-boolean p1, p0, Lokhttp3/internal/j/d;->byc:Z
+    iput-boolean p1, p0, Lokhttp3/internal/j/d;->bxX:Z
 
-    iput-object p2, p0, Lokhttp3/internal/j/d;->btZ:Lokio/BufferedSink;
+    iput-object p2, p0, Lokhttp3/internal/j/d;->btU:Lokio/BufferedSink;
 
-    invoke-interface {p2}, Lokio/BufferedSink;->Hf()Lokio/c;
+    invoke-interface {p2}, Lokio/BufferedSink;->Hd()Lokio/c;
 
     move-result-object p2
 
-    iput-object p2, p0, Lokhttp3/internal/j/d;->byl:Lokio/c;
+    iput-object p2, p0, Lokhttp3/internal/j/d;->byg: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;->byj:[B
+    iput-object p3, p0, Lokhttp3/internal/j/d;->bye:[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;->byk:Lokio/c$a;
+    iput-object p2, p0, Lokhttp3/internal/j/d;->byf:Lokio/c$a;
 
     return-void
 
@@ -123,7 +123,7 @@
         }
     .end annotation
 
-    iget-boolean v0, p0, Lokhttp3/internal/j/d;->bym:Z
+    iget-boolean v0, p0, Lokhttp3/internal/j/d;->byh: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;->byl:Lokio/c;
+    iget-object p4, p0, Lokhttp3/internal/j/d;->byg:Lokio/c;
 
     invoke-virtual {p4, p1}, Lokio/c;->du(I)Lokio/c;
 
-    iget-boolean p1, p0, Lokhttp3/internal/j/d;->byc:Z
+    iget-boolean p1, p0, Lokhttp3/internal/j/d;->bxX:Z
 
     if-eqz p1, :cond_2
 
@@ -163,7 +163,7 @@
 
     or-int/2addr p1, v0
 
-    iget-object p4, p0, Lokhttp3/internal/j/d;->byl:Lokio/c;
+    iget-object p4, p0, Lokhttp3/internal/j/d;->byg: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;->byl:Lokio/c;
+    iget-object p4, p0, Lokhttp3/internal/j/d;->byg:Lokio/c;
 
     invoke-virtual {p4, p1}, Lokio/c;->du(I)Lokio/c;
 
-    iget-object p1, p0, Lokhttp3/internal/j/d;->byl:Lokio/c;
+    iget-object p1, p0, Lokhttp3/internal/j/d;->byg: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;->byl:Lokio/c;
+    iget-object p4, p0, Lokhttp3/internal/j/d;->byg:Lokio/c;
 
     invoke-virtual {p4, p1}, Lokio/c;->du(I)Lokio/c;
 
-    iget-object p1, p0, Lokhttp3/internal/j/d;->byl:Lokio/c;
+    iget-object p1, p0, Lokhttp3/internal/j/d;->byg: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;->byc:Z
+    iget-boolean p1, p0, Lokhttp3/internal/j/d;->bxX: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;->byj:[B
+    iget-object p4, p0, Lokhttp3/internal/j/d;->bye:[B
 
     invoke-virtual {p1, p4}, Ljava/util/Random;->nextBytes([B)V
 
-    iget-object p1, p0, Lokhttp3/internal/j/d;->byl:Lokio/c;
+    iget-object p1, p0, Lokhttp3/internal/j/d;->byg:Lokio/c;
 
-    iget-object p4, p0, Lokhttp3/internal/j/d;->byj:[B
+    iget-object p4, p0, Lokhttp3/internal/j/d;->bye:[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;->byl:Lokio/c;
+    iget-object p1, p0, Lokhttp3/internal/j/d;->byg:Lokio/c;
 
     iget-wide p4, p1, Lokio/c;->size:J
 
-    iget-object p1, p0, Lokhttp3/internal/j/d;->byl:Lokio/c;
+    iget-object p1, p0, Lokhttp3/internal/j/d;->byg:Lokio/c;
 
-    iget-object v0, p0, Lokhttp3/internal/j/d;->lZ:Lokio/c;
+    iget-object v0, p0, Lokhttp3/internal/j/d;->ma:Lokio/c;
 
     invoke-virtual {p1, v0, p2, p3}, Lokio/c;->write(Lokio/c;J)V
 
-    iget-object p1, p0, Lokhttp3/internal/j/d;->byl:Lokio/c;
+    iget-object p1, p0, Lokhttp3/internal/j/d;->byg:Lokio/c;
 
-    iget-object p2, p0, Lokhttp3/internal/j/d;->byk:Lokio/c$a;
+    iget-object p2, p0, Lokhttp3/internal/j/d;->byf:Lokio/c$a;
 
     invoke-virtual {p1, p2}, Lokio/c;->a(Lokio/c$a;)Lokio/c$a;
 
-    iget-object p1, p0, Lokhttp3/internal/j/d;->byk:Lokio/c$a;
+    iget-object p1, p0, Lokhttp3/internal/j/d;->byf:Lokio/c$a;
 
     invoke-virtual {p1, p4, p5}, Lokio/c$a;->aG(J)I
 
-    iget-object p1, p0, Lokhttp3/internal/j/d;->byk:Lokio/c$a;
+    iget-object p1, p0, Lokhttp3/internal/j/d;->byf:Lokio/c$a;
 
-    iget-object p2, p0, Lokhttp3/internal/j/d;->byj:[B
+    iget-object p2, p0, Lokhttp3/internal/j/d;->bye:[B
 
     invoke-static {p1, p2}, Lokhttp3/internal/j/b;->a(Lokio/c$a;[B)V
 
-    iget-object p1, p0, Lokhttp3/internal/j/d;->byk:Lokio/c$a;
+    iget-object p1, p0, Lokhttp3/internal/j/d;->byf:Lokio/c$a;
 
     invoke-virtual {p1}, Lokio/c$a;->close()V
 
     goto :goto_2
 
     :cond_5
-    iget-object p1, p0, Lokhttp3/internal/j/d;->byl:Lokio/c;
+    iget-object p1, p0, Lokhttp3/internal/j/d;->byg:Lokio/c;
 
-    iget-object p4, p0, Lokhttp3/internal/j/d;->lZ:Lokio/c;
+    iget-object p4, p0, Lokhttp3/internal/j/d;->ma: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;->btZ:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/j/d;->btU:Lokio/BufferedSink;
 
-    invoke-interface {p1}, Lokio/BufferedSink;->Hh()Lokio/BufferedSink;
+    invoke-interface {p1}, Lokio/BufferedSink;->Hf()Lokio/BufferedSink;
 
     return-void
 
@@ -415,7 +415,7 @@
         }
     .end annotation
 
-    iget-boolean v0, p0, Lokhttp3/internal/j/d;->bym:Z
+    iget-boolean v0, p0, Lokhttp3/internal/j/d;->byh:Z
 
     if-nez v0, :cond_3
 
@@ -433,76 +433,76 @@
 
     or-int/lit16 p1, p1, 0x80
 
-    iget-object v1, p0, Lokhttp3/internal/j/d;->byl:Lokio/c;
+    iget-object v1, p0, Lokhttp3/internal/j/d;->byg:Lokio/c;
 
     invoke-virtual {v1, p1}, Lokio/c;->du(I)Lokio/c;
 
-    iget-boolean p1, p0, Lokhttp3/internal/j/d;->byc:Z
+    iget-boolean p1, p0, Lokhttp3/internal/j/d;->bxX:Z
 
     if-eqz p1, :cond_0
 
     or-int/lit16 p1, v0, 0x80
 
-    iget-object v1, p0, Lokhttp3/internal/j/d;->byl:Lokio/c;
+    iget-object v1, p0, Lokhttp3/internal/j/d;->byg: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;->byj:[B
+    iget-object v1, p0, Lokhttp3/internal/j/d;->bye:[B
 
     invoke-virtual {p1, v1}, Ljava/util/Random;->nextBytes([B)V
 
-    iget-object p1, p0, Lokhttp3/internal/j/d;->byl:Lokio/c;
+    iget-object p1, p0, Lokhttp3/internal/j/d;->byg:Lokio/c;
 
-    iget-object v1, p0, Lokhttp3/internal/j/d;->byj:[B
+    iget-object v1, p0, Lokhttp3/internal/j/d;->bye:[B
 
     invoke-virtual {p1, v1}, Lokio/c;->D([B)Lokio/c;
 
     if-lez v0, :cond_1
 
-    iget-object p1, p0, Lokhttp3/internal/j/d;->byl:Lokio/c;
+    iget-object p1, p0, Lokhttp3/internal/j/d;->byg:Lokio/c;
 
     iget-wide v0, p1, Lokio/c;->size:J
 
-    iget-object p1, p0, Lokhttp3/internal/j/d;->byl:Lokio/c;
+    iget-object p1, p0, Lokhttp3/internal/j/d;->byg:Lokio/c;
 
     invoke-virtual {p1, p2}, Lokio/c;->i(Lokio/ByteString;)Lokio/c;
 
-    iget-object p1, p0, Lokhttp3/internal/j/d;->byl:Lokio/c;
+    iget-object p1, p0, Lokhttp3/internal/j/d;->byg:Lokio/c;
 
-    iget-object p2, p0, Lokhttp3/internal/j/d;->byk:Lokio/c$a;
+    iget-object p2, p0, Lokhttp3/internal/j/d;->byf:Lokio/c$a;
 
     invoke-virtual {p1, p2}, Lokio/c;->a(Lokio/c$a;)Lokio/c$a;
 
-    iget-object p1, p0, Lokhttp3/internal/j/d;->byk:Lokio/c$a;
+    iget-object p1, p0, Lokhttp3/internal/j/d;->byf:Lokio/c$a;
 
     invoke-virtual {p1, v0, v1}, Lokio/c$a;->aG(J)I
 
-    iget-object p1, p0, Lokhttp3/internal/j/d;->byk:Lokio/c$a;
+    iget-object p1, p0, Lokhttp3/internal/j/d;->byf:Lokio/c$a;
 
-    iget-object p2, p0, Lokhttp3/internal/j/d;->byj:[B
+    iget-object p2, p0, Lokhttp3/internal/j/d;->bye:[B
 
     invoke-static {p1, p2}, Lokhttp3/internal/j/b;->a(Lokio/c$a;[B)V
 
-    iget-object p1, p0, Lokhttp3/internal/j/d;->byk:Lokio/c$a;
+    iget-object p1, p0, Lokhttp3/internal/j/d;->byf:Lokio/c$a;
 
     invoke-virtual {p1}, Lokio/c$a;->close()V
 
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lokhttp3/internal/j/d;->byl:Lokio/c;
+    iget-object p1, p0, Lokhttp3/internal/j/d;->byg:Lokio/c;
 
     invoke-virtual {p1, v0}, Lokio/c;->du(I)Lokio/c;
 
-    iget-object p1, p0, Lokhttp3/internal/j/d;->byl:Lokio/c;
+    iget-object p1, p0, Lokhttp3/internal/j/d;->byg: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;->btZ:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/j/d;->btU: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 e098084452..7466350a82 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 bxt:[B
+.field private static final bxo:[B
 
-.field private static final bxu:[Ljava/lang/String;
+.field private static final bxp:[Ljava/lang/String;
 
-.field private static final bxv:[Ljava/lang/String;
+.field private static final bxq:[Ljava/lang/String;
 
-.field private static final bxw:Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;
+.field private static final bxr:Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;
 
 
 # instance fields
-.field private bxA:[B
+.field private final bxs:Ljava/util/concurrent/atomic/AtomicBoolean;
 
-.field private final bxx:Ljava/util/concurrent/atomic/AtomicBoolean;
+.field private final bxt:Ljava/util/concurrent/CountDownLatch;
 
-.field private final bxy:Ljava/util/concurrent/CountDownLatch;
+.field private bxu:[B
 
-.field private bxz:[B
+.field private bxv:[B
 
 
 # direct methods
@@ -37,11 +37,11 @@
 
     aput-byte v3, v1, v2
 
-    sput-object v1, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bxt:[B
+    sput-object v1, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bxo:[B
 
     new-array v1, v2, [Ljava/lang/String;
 
-    sput-object v1, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bxu:[Ljava/lang/String;
+    sput-object v1, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bxp:[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;->bxv:[Ljava/lang/String;
+    sput-object v0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bxq:[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;->bxw:Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;
+    sput-object v0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bxr: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;->bxx:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iput-object v0, p0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bxs: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;->bxy:Ljava/util/concurrent/CountDownLatch;
+    iput-object v0, p0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bxt:Ljava/util/concurrent/CountDownLatch;
 
     return-void
 .end method
 
-.method public static GU()Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;
+.method public static GS()Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;
     .locals 1
 
-    sget-object v0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bxw:Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;
+    sget-object v0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bxr: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;->tw:Ljava/nio/charset/Charset;
+    sget-object v2, Lokhttp3/internal/c;->tx: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;->bxx:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v0, p0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bxs: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;->bxx:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v0, p0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bxs: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;->bxz:[B
+    iput-object v4, p0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bxu:[B
 
-    iput-object v5, p0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bxA:[B
+    iput-object v5, p0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bxv:[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;->bxy:Ljava/util/concurrent/CountDownLatch;
+    iget-object v3, p0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bxt: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;->GT()Lokhttp3/internal/g/f;
+    invoke-static {}, Lokhttp3/internal/g/f;->GR()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;->bxy:Ljava/util/concurrent/CountDownLatch;
+    iget-object v0, p0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bxt: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;->bxz:[B
+    iget-object v0, p0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bxu:[B
 
     if-eqz v0, :cond_10
 
@@ -503,7 +503,7 @@
 
     aget-object v4, p1, v3
 
-    sget-object v5, Lokhttp3/internal/c;->tw:Ljava/nio/charset/Charset;
+    sget-object v5, Lokhttp3/internal/c;->tx: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;->bxz:[B
+    iget-object v3, p0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bxu:[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;->bxt:[B
+    sget-object v6, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bxo:[B
 
     aput-object v6, p1, v5
 
-    iget-object v6, p0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bxz:[B
+    iget-object v6, p0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bxu:[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;->bxA:[B
+    iget-object p1, p0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bxv:[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;->bxv:[Ljava/lang/String;
+    sget-object p1, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bxq:[Ljava/lang/String;
 
     return-object p1
 
@@ -655,7 +655,7 @@
     goto :goto_c
 
     :cond_d
-    sget-object p1, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bxu:[Ljava/lang/String;
+    sget-object p1, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bxp:[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;->bxu:[Ljava/lang/String;
+    sget-object v0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bxp:[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 fc5f2bef6b..38e66143b7 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 bqo:Lokhttp3/j;
+.field final synthetic bqj:Lokhttp3/j;
 
 
 # direct methods
 .method constructor <init>(Lokhttp3/j;)V
     .locals 0
 
-    iput-object p1, p0, Lokhttp3/j$1;->bqo:Lokhttp3/j;
+    iput-object p1, p0, Lokhttp3/j$1;->bqj: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;->bqo:Lokhttp3/j;
+    iget-object v0, p0, Lokhttp3/j$1;->bqj: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;->bqo:Lokhttp3/j;
+    iget-object v2, p0, Lokhttp3/j$1;->bqj:Lokhttp3/j;
 
     monitor-enter v2
 
     :try_start_0
-    iget-object v3, p0, Lokhttp3/j$1;->bqo:Lokhttp3/j;
+    iget-object v3, p0, Lokhttp3/j$1;->bqj: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 c5c898fa79..0cdbea5cca 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 bqi:I
+.field final bqd:I
 
-.field private final bqj:J
+.field private final bqe:J
 
-.field final bqk:Ljava/lang/Runnable;
+.field final bqf:Ljava/lang/Runnable;
 
-.field final bql:Ljava/util/Deque;
+.field final bqg:Ljava/util/Deque;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Deque<",
@@ -26,9 +26,9 @@
     .end annotation
 .end field
 
-.field final bqm:Lokhttp3/internal/b/d;
+.field final bqh:Lokhttp3/internal/b/d;
 
-.field bqn:Z
+.field bqi:Z
 
 
 # direct methods
@@ -85,23 +85,23 @@
 
     invoke-direct {v0, p0}, Lokhttp3/j$1;-><init>(Lokhttp3/j;)V
 
-    iput-object v0, p0, Lokhttp3/j;->bqk:Ljava/lang/Runnable;
+    iput-object v0, p0, Lokhttp3/j;->bqf:Ljava/lang/Runnable;
 
     new-instance v0, Ljava/util/ArrayDeque;
 
     invoke-direct {v0}, Ljava/util/ArrayDeque;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/j;->bql:Ljava/util/Deque;
+    iput-object v0, p0, Lokhttp3/j;->bqg: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;->bqm:Lokhttp3/internal/b/d;
+    iput-object v0, p0, Lokhttp3/j;->bqh:Lokhttp3/internal/b/d;
 
     const/4 v0, 0x5
 
-    iput v0, p0, Lokhttp3/j;->bqi:I
+    iput v0, p0, Lokhttp3/j;->bqd:I
 
     const-wide/16 v0, 0x5
 
@@ -109,7 +109,7 @@
 
     move-result-wide v0
 
-    iput-wide v0, p0, Lokhttp3/j;->bqj:J
+    iput-wide v0, p0, Lokhttp3/j;->bqe:J
 
     return-void
 .end method
@@ -122,7 +122,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lokhttp3/j;->bql:Ljava/util/Deque;
+    iget-object v0, p0, Lokhttp3/j;->bqg: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;->bud:Ljava/util/List;
+    iget-object v8, v7, Lokhttp3/internal/b/c;->btY: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;->btV:Lokhttp3/y;
+    iget-object v12, v7, Lokhttp3/internal/b/c;->btQ:Lokhttp3/y;
 
-    iget-object v12, v12, Lokhttp3/y;->bsN:Lokhttp3/a;
+    iget-object v12, v12, Lokhttp3/y;->bsI:Lokhttp3/a;
 
-    iget-object v12, v12, Lokhttp3/a;->bnk:Lokhttp3/s;
+    iget-object v12, v12, Lokhttp3/a;->bnf: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;->GT()Lokhttp3/internal/g/f;
+    invoke-static {}, Lokhttp3/internal/g/f;->GR()Lokhttp3/internal/g/f;
 
     move-result-object v12
 
-    iget-object v10, v10, Lokhttp3/internal/b/g$a;->buq:Ljava/lang/Object;
+    iget-object v10, v10, Lokhttp3/internal/b/g$a;->bul: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;->bua:Z
+    iput-boolean v10, v7, Lokhttp3/internal/b/c;->btV:Z
 
     invoke-interface {v8}, Ljava/util/List;->isEmpty()Z
 
@@ -227,11 +227,11 @@
 
     if-eqz v10, :cond_1
 
-    iget-wide v8, p0, Lokhttp3/j;->bqj:J
+    iget-wide v8, p0, Lokhttp3/j;->bqe:J
 
     sub-long v8, p1, v8
 
-    iput-wide v8, v7, Lokhttp3/internal/b/c;->bue:J
+    iput-wide v8, v7, Lokhttp3/internal/b/c;->btZ: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;->bue:J
+    iget-wide v8, v7, Lokhttp3/internal/b/c;->btZ:J
 
     sub-long v8, p1, v8
 
@@ -267,13 +267,13 @@
     goto :goto_0
 
     :cond_5
-    iget-wide p1, p0, Lokhttp3/j;->bqj:J
+    iget-wide p1, p0, Lokhttp3/j;->bqe:J
 
     cmp-long v0, v3, p1
 
     if-gez v0, :cond_9
 
-    iget p1, p0, Lokhttp3/j;->bqi:I
+    iget p1, p0, Lokhttp3/j;->bqd:I
 
     if-le v2, p1, :cond_6
 
@@ -282,7 +282,7 @@
     :cond_6
     if-lez v2, :cond_7
 
-    iget-wide p1, p0, Lokhttp3/j;->bqj:J
+    iget-wide p1, p0, Lokhttp3/j;->bqe:J
 
     sub-long/2addr p1, v3
 
@@ -293,14 +293,14 @@
     :cond_7
     if-lez v6, :cond_8
 
-    iget-wide p1, p0, Lokhttp3/j;->bqj:J
+    iget-wide p1, p0, Lokhttp3/j;->bqe:J
 
     monitor-exit p0
 
     return-wide p1
 
     :cond_8
-    iput-boolean v1, p0, Lokhttp3/j;->bqn:Z
+    iput-boolean v1, p0, Lokhttp3/j;->bqi:Z
 
     const-wide/16 p1, -0x1
 
@@ -310,7 +310,7 @@
 
     :cond_9
     :goto_3
-    iget-object p1, p0, Lokhttp3/j;->bql:Ljava/util/Deque;
+    iget-object p1, p0, Lokhttp3/j;->bqg: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;->btX:Ljava/net/Socket;
+    iget-object p1, v5, Lokhttp3/internal/b/c;->btS: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 19c7b1d6b7..fa3a3992ca 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 bqJ:Lokhttp3/m;
+.field public static final bqE:Lokhttp3/m;
 
 
 # direct methods
@@ -15,7 +15,7 @@
 
     invoke-direct {v0}, Lokhttp3/m$1;-><init>()V
 
-    sput-object v0, Lokhttp3/m;->bqJ:Lokhttp3/m;
+    sput-object v0, Lokhttp3/m;->bqE: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 dcb6944bbf..6464452eda 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 bqQ:Lokhttp3/o;
+.field public static final bqL:Lokhttp3/o;
 
 
 # direct methods
@@ -15,7 +15,7 @@
 
     invoke-direct {v0}, Lokhttp3/o$1;-><init>()V
 
-    sput-object v0, Lokhttp3/o;->bqQ:Lokhttp3/o;
+    sput-object v0, Lokhttp3/o;->bqL: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 f059ccd7bd..811afd5419 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 bqS:Lokhttp3/p;
+.field final synthetic bqN:Lokhttp3/p;
 
 
 # direct methods
 .method constructor <init>(Lokhttp3/p;)V
     .locals 0
 
-    iput-object p1, p0, Lokhttp3/p$2;->bqS:Lokhttp3/p;
+    iput-object p1, p0, Lokhttp3/p$2;->bqN:Lokhttp3/p;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -34,10 +34,10 @@
 
 
 # virtual methods
-.method public final Fk()Lokhttp3/p;
+.method public final Fi()Lokhttp3/p;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/p$2;->bqS:Lokhttp3/p;
+    iget-object v0, p0, Lokhttp3/p$2;->bqN: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 06eb9c013e..4c14b8979c 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 Fk()Lokhttp3/p;
+.method public abstract Fi()Lokhttp3/p;
 .end method
diff --git a/com.discord/smali_classes2/okhttp3/p.smali b/com.discord/smali_classes2/okhttp3/p.smali
index 25e8244eb1..65c990899e 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 bqR:Lokhttp3/p;
+.field public static final bqM:Lokhttp3/p;
 
 
 # direct methods
@@ -23,7 +23,7 @@
 
     invoke-direct {v0}, Lokhttp3/p$1;-><init>()V
 
-    sput-object v0, Lokhttp3/p;->bqR:Lokhttp3/p;
+    sput-object v0, Lokhttp3/p;->bqM: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 492160c9cb..30822c980c 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 bqW:Ljava/util/List;
+.field public final bqR:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -25,7 +25,7 @@
     .end annotation
 .end field
 
-.field private final bqX:Ljava/nio/charset/Charset;
+.field private final bqS: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;->bqW:Ljava/util/List;
+    iput-object p1, p0, Lokhttp3/q$a;->bqR:Ljava/util/List;
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lokhttp3/q$a;->bqX:Ljava/nio/charset/Charset;
+    iput-object p1, p0, Lokhttp3/q$a;->bqS: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;->bqX:Ljava/nio/charset/Charset;
+    iget-object v1, p0, Lokhttp3/q$a;->bqS: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;->bqW:Ljava/util/List;
+    iget-object p1, p0, Lokhttp3/q$a;->bqR:Ljava/util/List;
 
-    iget-object v0, p0, Lokhttp3/q$a;->bqX:Ljava/nio/charset/Charset;
+    iget-object v0, p0, Lokhttp3/q$a;->bqS: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;->bqX:Ljava/nio/charset/Charset;
+    iget-object v1, p0, Lokhttp3/q$a;->bqS: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;->bqW:Ljava/util/List;
+    iget-object p1, p0, Lokhttp3/q$a;->bqR:Ljava/util/List;
 
-    iget-object v0, p0, Lokhttp3/q$a;->bqX:Ljava/nio/charset/Charset;
+    iget-object v0, p0, Lokhttp3/q$a;->bqS: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 91d3d90664..3b4f8a0e0f 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 brV:Lokhttp3/u;
+
+.field public static final enum brW:Lokhttp3/u;
+
+.field public static final enum brX:Lokhttp3/u;
+
+.field public static final enum brY:Lokhttp3/u;
+
+.field public static final enum brZ:Lokhttp3/u;
+
 .field public static final enum bsa:Lokhttp3/u;
 
-.field public static final enum bsb:Lokhttp3/u;
-
-.field public static final enum bsc:Lokhttp3/u;
-
-.field public static final enum bsd:Lokhttp3/u;
-
-.field public static final enum bse:Lokhttp3/u;
-
-.field public static final enum bsf:Lokhttp3/u;
-
-.field private static final synthetic bsg:[Lokhttp3/u;
+.field private static final synthetic bsb:[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;->bsa:Lokhttp3/u;
+    sput-object v0, Lokhttp3/u;->brV: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;->bsb:Lokhttp3/u;
+    sput-object v0, Lokhttp3/u;->brW: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;->bsc:Lokhttp3/u;
+    sput-object v0, Lokhttp3/u;->brX: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;->bsd:Lokhttp3/u;
+    sput-object v0, Lokhttp3/u;->brY: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;->bse:Lokhttp3/u;
+    sput-object v0, Lokhttp3/u;->brZ: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;->bsf:Lokhttp3/u;
+    sput-object v0, Lokhttp3/u;->bsa:Lokhttp3/u;
 
     const/4 v0, 0x6
 
     new-array v0, v0, [Lokhttp3/u;
 
-    sget-object v7, Lokhttp3/u;->bsa:Lokhttp3/u;
+    sget-object v7, Lokhttp3/u;->brV:Lokhttp3/u;
 
     aput-object v7, v0, v1
 
-    sget-object v1, Lokhttp3/u;->bsb:Lokhttp3/u;
+    sget-object v1, Lokhttp3/u;->brW:Lokhttp3/u;
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lokhttp3/u;->bsc:Lokhttp3/u;
+    sget-object v1, Lokhttp3/u;->brX:Lokhttp3/u;
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lokhttp3/u;->bsd:Lokhttp3/u;
+    sget-object v1, Lokhttp3/u;->brY:Lokhttp3/u;
 
     aput-object v1, v0, v4
 
-    sget-object v1, Lokhttp3/u;->bse:Lokhttp3/u;
+    sget-object v1, Lokhttp3/u;->brZ:Lokhttp3/u;
 
     aput-object v1, v0, v5
 
-    sget-object v1, Lokhttp3/u;->bsf:Lokhttp3/u;
+    sget-object v1, Lokhttp3/u;->bsa:Lokhttp3/u;
 
     aput-object v1, v0, v6
 
-    sput-object v0, Lokhttp3/u;->bsg:[Lokhttp3/u;
+    sput-object v0, Lokhttp3/u;->bsb:[Lokhttp3/u;
 
     return-void
 .end method
@@ -167,7 +167,7 @@
         }
     .end annotation
 
-    sget-object v0, Lokhttp3/u;->bsa:Lokhttp3/u;
+    sget-object v0, Lokhttp3/u;->brV: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;->bsa:Lokhttp3/u;
+    sget-object p0, Lokhttp3/u;->brV:Lokhttp3/u;
 
     return-object p0
 
     :cond_0
-    sget-object v0, Lokhttp3/u;->bsb:Lokhttp3/u;
+    sget-object v0, Lokhttp3/u;->brW: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;->bsb:Lokhttp3/u;
+    sget-object p0, Lokhttp3/u;->brW:Lokhttp3/u;
 
     return-object p0
 
     :cond_1
-    sget-object v0, Lokhttp3/u;->bse:Lokhttp3/u;
+    sget-object v0, Lokhttp3/u;->brZ: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;->bse:Lokhttp3/u;
+    sget-object p0, Lokhttp3/u;->brZ:Lokhttp3/u;
 
     return-object p0
 
     :cond_2
-    sget-object v0, Lokhttp3/u;->bsd:Lokhttp3/u;
+    sget-object v0, Lokhttp3/u;->brY: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;->bsd:Lokhttp3/u;
+    sget-object p0, Lokhttp3/u;->brY:Lokhttp3/u;
 
     return-object p0
 
     :cond_3
-    sget-object v0, Lokhttp3/u;->bsc:Lokhttp3/u;
+    sget-object v0, Lokhttp3/u;->brX: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;->bsc:Lokhttp3/u;
+    sget-object p0, Lokhttp3/u;->brX:Lokhttp3/u;
 
     return-object p0
 
     :cond_4
-    sget-object v0, Lokhttp3/u;->bsf:Lokhttp3/u;
+    sget-object v0, Lokhttp3/u;->bsa: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;->bsf:Lokhttp3/u;
+    sget-object p0, Lokhttp3/u;->bsa:Lokhttp3/u;
 
     return-object p0
 
@@ -291,7 +291,7 @@
 .method public static values()[Lokhttp3/u;
     .locals 1
 
-    sget-object v0, Lokhttp3/u;->bsg:[Lokhttp3/u;
+    sget-object v0, Lokhttp3/u;->bsb:[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 304715c6ee..455be42fe1 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 bso:Lokhttp3/v;
+.field final synthetic bsj:Lokhttp3/v;
 
 
 # direct methods
 .method constructor <init>(Lokhttp3/v;)V
     .locals 0
 
-    iput-object p1, p0, Lokhttp3/v$1;->bso:Lokhttp3/v;
+    iput-object p1, p0, Lokhttp3/v$1;->bsj:Lokhttp3/v;
 
     invoke-direct {p0}, Lokio/a;-><init>()V
 
@@ -31,12 +31,12 @@
 
 
 # virtual methods
-.method public final FH()V
+.method public final FF()V
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/v$1;->bso:Lokhttp3/v;
+    iget-object v0, p0, Lokhttp3/v$1;->bsj:Lokhttp3/v;
 
-    iget-object v0, v0, Lokhttp3/v;->bsi:Lokhttp3/internal/c/j;
+    iget-object v0, v0, Lokhttp3/v;->bsd: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 e0459b0cbc..0ebadfb8a3 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 bso:Lokhttp3/v;
+.field final synthetic bsj:Lokhttp3/v;
 
-.field final bsp:Lokhttp3/f;
+.field final bsk: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;->bso:Lokhttp3/v;
+    iput-object p1, p0, Lokhttp3/v$a;->bsj:Lokhttp3/v;
 
     const/4 v0, 0x1
 
     new-array v0, v0, [Ljava/lang/Object;
 
-    invoke-virtual {p1}, Lokhttp3/v;->FF()Ljava/lang/String;
+    invoke-virtual {p1}, Lokhttp3/v;->FD()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;->bsp:Lokhttp3/f;
+    iput-object p2, p0, Lokhttp3/v$a;->bsk:Lokhttp3/f;
 
     return-void
 .end method
 
 
 # virtual methods
-.method final FI()Ljava/lang/String;
+.method final FG()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/v$a;->bso:Lokhttp3/v;
+    iget-object v0, p0, Lokhttp3/v$a;->bsj:Lokhttp3/v;
 
-    iget-object v0, v0, Lokhttp3/v;->bsl:Lokhttp3/w;
+    iget-object v0, v0, Lokhttp3/v;->bsg:Lokhttp3/w;
 
-    iget-object v0, v0, Lokhttp3/w;->bnk:Lokhttp3/s;
+    iget-object v0, v0, Lokhttp3/w;->bnf:Lokhttp3/s;
 
-    iget-object v0, v0, Lokhttp3/s;->brg:Ljava/lang/String;
+    iget-object v0, v0, Lokhttp3/s;->brb: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;->bso:Lokhttp3/v;
+    iget-object v0, p0, Lokhttp3/v$a;->bsj:Lokhttp3/v;
 
-    iget-object v0, v0, Lokhttp3/v;->bsj:Lokio/a;
+    iget-object v0, v0, Lokhttp3/v;->bse: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;->bso:Lokhttp3/v;
+    iget-object v2, p0, Lokhttp3/v$a;->bsj:Lokhttp3/v;
 
-    invoke-virtual {v2}, Lokhttp3/v;->FG()Lokhttp3/Response;
+    invoke-virtual {v2}, Lokhttp3/v;->FE()Lokhttp3/Response;
 
     move-result-object v2
 
-    iget-object v3, p0, Lokhttp3/v$a;->bso:Lokhttp3/v;
+    iget-object v3, p0, Lokhttp3/v$a;->bsj:Lokhttp3/v;
 
-    iget-object v3, v3, Lokhttp3/v;->bsi:Lokhttp3/internal/c/j;
+    iget-object v3, v3, Lokhttp3/v;->bsd:Lokhttp3/internal/c/j;
 
-    iget-boolean v1, v3, Lokhttp3/internal/c/j;->buv:Z
+    iget-boolean v1, v3, Lokhttp3/internal/c/j;->buq: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;->bsp:Lokhttp3/f;
+    iget-object v1, p0, Lokhttp3/v$a;->bsk:Lokhttp3/f;
 
     new-instance v2, Ljava/io/IOException;
 
@@ -120,9 +120,9 @@
     goto :goto_0
 
     :cond_0
-    iget-object v1, p0, Lokhttp3/v$a;->bsp:Lokhttp3/f;
+    iget-object v1, p0, Lokhttp3/v$a;->bsk:Lokhttp3/f;
 
-    iget-object v3, p0, Lokhttp3/v$a;->bso:Lokhttp3/v;
+    iget-object v3, p0, Lokhttp3/v$a;->bsj: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;->bso:Lokhttp3/v;
+    iget-object v0, p0, Lokhttp3/v$a;->bsj:Lokhttp3/v;
 
-    iget-object v0, v0, Lokhttp3/v;->bsh:Lokhttp3/t;
+    iget-object v0, v0, Lokhttp3/v;->bsc:Lokhttp3/t;
 
-    iget-object v0, v0, Lokhttp3/t;->brL:Lokhttp3/n;
+    iget-object v0, v0, Lokhttp3/t;->brG: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;->bso:Lokhttp3/v;
+    iget-object v2, p0, Lokhttp3/v$a;->bsj: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;->GT()Lokhttp3/internal/g/f;
+    invoke-static {}, Lokhttp3/internal/g/f;->GR()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;->bso:Lokhttp3/v;
+    iget-object v4, p0, Lokhttp3/v$a;->bsj:Lokhttp3/v;
 
     new-instance v5, Ljava/lang/StringBuilder;
 
     invoke-direct {v5}, Ljava/lang/StringBuilder;-><init>()V
 
-    iget-object v6, v4, Lokhttp3/v;->bsi:Lokhttp3/internal/c/j;
+    iget-object v6, v4, Lokhttp3/v;->bsd:Lokhttp3/internal/c/j;
 
-    iget-boolean v6, v6, Lokhttp3/internal/c/j;->buv:Z
+    iget-boolean v6, v6, Lokhttp3/internal/c/j;->buq: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;->bsm:Z
+    iget-boolean v6, v4, Lokhttp3/v;->bsh: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;->FF()Ljava/lang/String;
+    invoke-virtual {v4}, Lokhttp3/v;->FD()Ljava/lang/String;
 
     move-result-object v4
 
@@ -241,31 +241,31 @@
     goto :goto_5
 
     :cond_3
-    iget-object v0, p0, Lokhttp3/v$a;->bso:Lokhttp3/v;
+    iget-object v0, p0, Lokhttp3/v$a;->bsj:Lokhttp3/v;
 
     invoke-static {v0}, Lokhttp3/v;->c(Lokhttp3/v;)Lokhttp3/p;
 
-    iget-object v0, p0, Lokhttp3/v$a;->bsp:Lokhttp3/f;
+    iget-object v0, p0, Lokhttp3/v$a;->bsk: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;->bso:Lokhttp3/v;
+    iget-object v0, p0, Lokhttp3/v$a;->bsj:Lokhttp3/v;
 
-    iget-object v0, v0, Lokhttp3/v;->bsh:Lokhttp3/t;
+    iget-object v0, v0, Lokhttp3/v;->bsc:Lokhttp3/t;
 
-    iget-object v0, v0, Lokhttp3/t;->brL:Lokhttp3/n;
+    iget-object v0, v0, Lokhttp3/t;->brG:Lokhttp3/n;
 
     goto :goto_1
 
     :goto_6
-    iget-object v1, p0, Lokhttp3/v$a;->bso:Lokhttp3/v;
+    iget-object v1, p0, Lokhttp3/v$a;->bsj:Lokhttp3/v;
 
-    iget-object v1, v1, Lokhttp3/v;->bsh:Lokhttp3/t;
+    iget-object v1, v1, Lokhttp3/v;->bsc:Lokhttp3/t;
 
-    iget-object v1, v1, Lokhttp3/t;->brL:Lokhttp3/n;
+    iget-object v1, v1, Lokhttp3/t;->brG: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 2a6b3811df..a9a64adda7 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 bsP:Lokhttp3/z;
+.field public static final enum bsK:Lokhttp3/z;
 
-.field public static final enum bsQ:Lokhttp3/z;
+.field public static final enum bsL:Lokhttp3/z;
 
-.field public static final enum bsR:Lokhttp3/z;
+.field public static final enum bsM:Lokhttp3/z;
 
-.field public static final enum bsS:Lokhttp3/z;
+.field public static final enum bsN:Lokhttp3/z;
 
-.field public static final enum bsT:Lokhttp3/z;
+.field public static final enum bsO:Lokhttp3/z;
 
-.field private static final synthetic bsU:[Lokhttp3/z;
+.field private static final synthetic bsP:[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;->bsP:Lokhttp3/z;
+    sput-object v0, Lokhttp3/z;->bsK: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;->bsQ:Lokhttp3/z;
+    sput-object v0, Lokhttp3/z;->bsL: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;->bsR:Lokhttp3/z;
+    sput-object v0, Lokhttp3/z;->bsM: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;->bsS:Lokhttp3/z;
+    sput-object v0, Lokhttp3/z;->bsN: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;->bsT:Lokhttp3/z;
+    sput-object v0, Lokhttp3/z;->bsO:Lokhttp3/z;
 
     const/4 v0, 0x5
 
     new-array v0, v0, [Lokhttp3/z;
 
-    sget-object v6, Lokhttp3/z;->bsP:Lokhttp3/z;
+    sget-object v6, Lokhttp3/z;->bsK:Lokhttp3/z;
 
     aput-object v6, v0, v1
 
-    sget-object v1, Lokhttp3/z;->bsQ:Lokhttp3/z;
+    sget-object v1, Lokhttp3/z;->bsL:Lokhttp3/z;
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lokhttp3/z;->bsR:Lokhttp3/z;
+    sget-object v1, Lokhttp3/z;->bsM:Lokhttp3/z;
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lokhttp3/z;->bsS:Lokhttp3/z;
+    sget-object v1, Lokhttp3/z;->bsN:Lokhttp3/z;
 
     aput-object v1, v0, v4
 
-    sget-object v1, Lokhttp3/z;->bsT:Lokhttp3/z;
+    sget-object v1, Lokhttp3/z;->bsO:Lokhttp3/z;
 
     aput-object v1, v0, v5
 
-    sput-object v0, Lokhttp3/z;->bsU:[Lokhttp3/z;
+    sput-object v0, Lokhttp3/z;->bsP:[Lokhttp3/z;
 
     return-void
 .end method
@@ -294,7 +294,7 @@
 
     if-ne v0, v2, :cond_3
 
-    sget-object p0, Lokhttp3/z;->bsT:Lokhttp3/z;
+    sget-object p0, Lokhttp3/z;->bsO:Lokhttp3/z;
 
     return-object p0
 
@@ -316,22 +316,22 @@
     throw v0
 
     :cond_4
-    sget-object p0, Lokhttp3/z;->bsS:Lokhttp3/z;
+    sget-object p0, Lokhttp3/z;->bsN:Lokhttp3/z;
 
     return-object p0
 
     :cond_5
-    sget-object p0, Lokhttp3/z;->bsR:Lokhttp3/z;
+    sget-object p0, Lokhttp3/z;->bsM:Lokhttp3/z;
 
     return-object p0
 
     :cond_6
-    sget-object p0, Lokhttp3/z;->bsQ:Lokhttp3/z;
+    sget-object p0, Lokhttp3/z;->bsL:Lokhttp3/z;
 
     return-object p0
 
     :cond_7
-    sget-object p0, Lokhttp3/z;->bsP:Lokhttp3/z;
+    sget-object p0, Lokhttp3/z;->bsK:Lokhttp3/z;
 
     return-object p0
 
@@ -360,7 +360,7 @@
 .method public static values()[Lokhttp3/z;
     .locals 1
 
-    sget-object v0, Lokhttp3/z;->bsU:[Lokhttp3/z;
+    sget-object v0, Lokhttp3/z;->bsP:[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 c6998e48f9..26cdc18a96 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 bre:[C
+.field static final bqZ:[C
 
-.field public static final byR:Lokio/ByteString;
+.field public static final byM:Lokio/ByteString;
 
 .field private static final serialVersionUID:J = 0x1L
 
@@ -30,7 +30,7 @@
 # instance fields
 .field transient aW:I
 
-.field transient byS:Ljava/lang/String;
+.field transient byN:Ljava/lang/String;
 
 .field final data:[B
 
@@ -45,7 +45,7 @@
 
     fill-array-data v0, :array_0
 
-    sput-object v0, Lokio/ByteString;->bre:[C
+    sput-object v0, Lokio/ByteString;->bqZ:[C
 
     const/4 v0, 0x0
 
@@ -55,7 +55,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokio/ByteString;->byR:Lokio/ByteString;
+    sput-object v0, Lokio/ByteString;->byM:Lokio/ByteString;
 
     return-void
 
@@ -192,7 +192,7 @@
 
     new-instance v0, Lokio/ByteString;
 
-    sget-object v1, Lokio/t;->tw:Ljava/nio/charset/Charset;
+    sget-object v1, Lokio/t;->tx: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;->byS:Ljava/lang/String;
+    iput-object p0, v0, Lokio/ByteString;->byN:Ljava/lang/String;
 
     return-object v0
 
@@ -476,18 +476,10 @@
 
 
 # virtual methods
-.method HA()[B
-    .locals 1
-
-    iget-object v0, p0, Lokio/ByteString;->data:[B
-
-    return-object v0
-.end method
-
-.method public Ht()Ljava/lang/String;
+.method public Hr()Ljava/lang/String;
     .locals 3
 
-    iget-object v0, p0, Lokio/ByteString;->byS:Ljava/lang/String;
+    iget-object v0, p0, Lokio/ByteString;->byN:Ljava/lang/String;
 
     if-eqz v0, :cond_0
 
@@ -498,16 +490,16 @@
 
     iget-object v1, p0, Lokio/ByteString;->data:[B
 
-    sget-object v2, Lokio/t;->tw:Ljava/nio/charset/Charset;
+    sget-object v2, Lokio/t;->tx:Ljava/nio/charset/Charset;
 
     invoke-direct {v0, v1, v2}, Ljava/lang/String;-><init>([BLjava/nio/charset/Charset;)V
 
-    iput-object v0, p0, Lokio/ByteString;->byS:Ljava/lang/String;
+    iput-object v0, p0, Lokio/ByteString;->byN:Ljava/lang/String;
 
     return-object v0
 .end method
 
-.method public Hu()Ljava/lang/String;
+.method public Hs()Ljava/lang/String;
     .locals 1
 
     iget-object v0, p0, Lokio/ByteString;->data:[B
@@ -519,7 +511,7 @@
     return-object v0
 .end method
 
-.method public Hv()Lokio/ByteString;
+.method public Ht()Lokio/ByteString;
     .locals 1
 
     const-string v0, "SHA-1"
@@ -531,7 +523,7 @@
     return-object v0
 .end method
 
-.method public Hw()Lokio/ByteString;
+.method public Hu()Lokio/ByteString;
     .locals 1
 
     const-string v0, "SHA-256"
@@ -543,7 +535,7 @@
     return-object v0
 .end method
 
-.method public Hx()Ljava/lang/String;
+.method public Hv()Ljava/lang/String;
     .locals 9
 
     iget-object v0, p0, Lokio/ByteString;->data:[B
@@ -567,7 +559,7 @@
 
     add-int/lit8 v6, v4, 0x1
 
-    sget-object v7, Lokio/ByteString;->bre:[C
+    sget-object v7, Lokio/ByteString;->bqZ:[C
 
     shr-int/lit8 v8, v5, 0x4
 
@@ -597,7 +589,7 @@
     return-object v0
 .end method
 
-.method public Hy()Lokio/ByteString;
+.method public Hw()Lokio/ByteString;
     .locals 6
 
     const/4 v0, 0x0
@@ -671,7 +663,7 @@
     return-object p0
 .end method
 
-.method public Hz()[B
+.method public Hx()[B
     .locals 1
 
     iget-object v0, p0, Lokio/ByteString;->data:[B
@@ -685,6 +677,14 @@
     return-object v0
 .end method
 
+.method Hy()[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;->Ht()Ljava/lang/String;
+    invoke-virtual {p0}, Lokio/ByteString;->Hr()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;->Hx()Ljava/lang/String;
+    invoke-virtual {p0}, Lokio/ByteString;->Hv()Ljava/lang/String;
 
     move-result-object v1
 
@@ -1154,7 +1154,7 @@
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lokio/ByteString;->Hx()Ljava/lang/String;
+    invoke-virtual {v2}, Lokio/ByteString;->Hv()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 231df37fa1..2b594461bc 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 byH:Lokio/q;
+.field final synthetic byC:Lokio/q;
 
-.field final synthetic byI:Lokio/a;
+.field final synthetic byD:Lokio/a;
 
 
 # direct methods
 .method constructor <init>(Lokio/a;Lokio/q;)V
     .locals 0
 
-    iput-object p1, p0, Lokio/a$1;->byI:Lokio/a;
+    iput-object p1, p0, Lokio/a$1;->byD:Lokio/a;
 
-    iput-object p2, p0, Lokio/a$1;->byH:Lokio/q;
+    iput-object p2, p0, Lokio/a$1;->byC:Lokio/q;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -46,19 +46,19 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokio/a$1;->byI:Lokio/a;
+    iget-object v0, p0, Lokio/a$1;->byD:Lokio/a;
 
     invoke-virtual {v0}, Lokio/a;->enter()V
 
     :try_start_0
-    iget-object v0, p0, Lokio/a$1;->byH:Lokio/q;
+    iget-object v0, p0, Lokio/a$1;->byC: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;->byI:Lokio/a;
+    iget-object v0, p0, Lokio/a$1;->byD:Lokio/a;
 
     const/4 v1, 0x1
 
@@ -75,7 +75,7 @@
     move-exception v0
 
     :try_start_1
-    iget-object v1, p0, Lokio/a$1;->byI:Lokio/a;
+    iget-object v1, p0, Lokio/a$1;->byD: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;->byI:Lokio/a;
+    iget-object v1, p0, Lokio/a$1;->byD:Lokio/a;
 
     const/4 v2, 0x0
 
@@ -103,19 +103,19 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokio/a$1;->byI:Lokio/a;
+    iget-object v0, p0, Lokio/a$1;->byD:Lokio/a;
 
     invoke-virtual {v0}, Lokio/a;->enter()V
 
     :try_start_0
-    iget-object v0, p0, Lokio/a$1;->byH:Lokio/q;
+    iget-object v0, p0, Lokio/a$1;->byC: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;->byI:Lokio/a;
+    iget-object v0, p0, Lokio/a$1;->byD:Lokio/a;
 
     const/4 v1, 0x1
 
@@ -132,7 +132,7 @@
     move-exception v0
 
     :try_start_1
-    iget-object v1, p0, Lokio/a$1;->byI:Lokio/a;
+    iget-object v1, p0, Lokio/a$1;->byD: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;->byI:Lokio/a;
+    iget-object v1, p0, Lokio/a$1;->byD: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;->byI:Lokio/a;
+    iget-object v0, p0, Lokio/a$1;->byD: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;->byH:Lokio/q;
+    iget-object v1, p0, Lokio/a$1;->byC: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;->byN:Lokio/n;
+    iget-object v2, p1, Lokio/c;->byI:Lokio/n;
 
     :goto_1
     const-wide/32 v3, 0x10000
@@ -235,18 +235,18 @@
     goto :goto_2
 
     :cond_0
-    iget-object v2, v2, Lokio/n;->bzi:Lokio/n;
+    iget-object v2, v2, Lokio/n;->bzd:Lokio/n;
 
     goto :goto_1
 
     :cond_1
     :goto_2
-    iget-object v2, p0, Lokio/a$1;->byI:Lokio/a;
+    iget-object v2, p0, Lokio/a$1;->byD:Lokio/a;
 
     invoke-virtual {v2}, Lokio/a;->enter()V
 
     :try_start_0
-    iget-object v2, p0, Lokio/a$1;->byH:Lokio/q;
+    iget-object v2, p0, Lokio/a$1;->byC: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;->byI:Lokio/a;
+    iget-object v0, p0, Lokio/a$1;->byD:Lokio/a;
 
     const/4 v1, 0x1
 
@@ -272,7 +272,7 @@
     move-exception p1
 
     :try_start_1
-    iget-object p2, p0, Lokio/a$1;->byI:Lokio/a;
+    iget-object p2, p0, Lokio/a$1;->byD: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;->byI:Lokio/a;
+    iget-object p2, p0, Lokio/a$1;->byD: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 8898e9937a..63bffdfdcc 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 byI:Lokio/a;
+.field final synthetic byD:Lokio/a;
 
-.field final synthetic byJ:Lokio/r;
+.field final synthetic byE:Lokio/r;
 
 
 # direct methods
 .method constructor <init>(Lokio/a;Lokio/r;)V
     .locals 0
 
-    iput-object p1, p0, Lokio/a$2;->byI:Lokio/a;
+    iput-object p1, p0, Lokio/a$2;->byD:Lokio/a;
 
-    iput-object p2, p0, Lokio/a$2;->byJ:Lokio/r;
+    iput-object p2, p0, Lokio/a$2;->byE:Lokio/r;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -46,12 +46,12 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokio/a$2;->byI:Lokio/a;
+    iget-object v0, p0, Lokio/a$2;->byD:Lokio/a;
 
     invoke-virtual {v0}, Lokio/a;->enter()V
 
     :try_start_0
-    iget-object v0, p0, Lokio/a$2;->byJ:Lokio/r;
+    iget-object v0, p0, Lokio/a$2;->byE: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;->byI:Lokio/a;
+    iget-object p3, p0, Lokio/a$2;->byD:Lokio/a;
 
     const/4 v0, 0x1
 
@@ -77,7 +77,7 @@
     move-exception p1
 
     :try_start_1
-    iget-object p2, p0, Lokio/a$2;->byI:Lokio/a;
+    iget-object p2, p0, Lokio/a$2;->byD: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;->byI:Lokio/a;
+    iget-object p2, p0, Lokio/a$2;->byD:Lokio/a;
 
     const/4 p3, 0x0
 
@@ -105,19 +105,19 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokio/a$2;->byI:Lokio/a;
+    iget-object v0, p0, Lokio/a$2;->byD:Lokio/a;
 
     invoke-virtual {v0}, Lokio/a;->enter()V
 
     :try_start_0
-    iget-object v0, p0, Lokio/a$2;->byJ:Lokio/r;
+    iget-object v0, p0, Lokio/a$2;->byE: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;->byI:Lokio/a;
+    iget-object v0, p0, Lokio/a$2;->byD:Lokio/a;
 
     const/4 v1, 0x1
 
@@ -134,7 +134,7 @@
     move-exception v0
 
     :try_start_1
-    iget-object v1, p0, Lokio/a$2;->byI:Lokio/a;
+    iget-object v1, p0, Lokio/a$2;->byD: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;->byI:Lokio/a;
+    iget-object v1, p0, Lokio/a$2;->byD: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;->byI:Lokio/a;
+    iget-object v0, p0, Lokio/a$2;->byD: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;->byJ:Lokio/r;
+    iget-object v1, p0, Lokio/a$2;->byE: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 7395b9c712..808e8a9047 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;->He()Lokio/a;
+    invoke-static {}, Lokio/a;->Hc()Lokio/a;
 
     move-result-object v1
 
@@ -55,13 +55,13 @@
     goto :goto_0
 
     :cond_0
-    sget-object v2, Lokio/a;->byD:Lokio/a;
+    sget-object v2, Lokio/a;->byy:Lokio/a;
 
     if-ne v1, v2, :cond_1
 
     const/4 v1, 0x0
 
-    sput-object v1, Lokio/a;->byD:Lokio/a;
+    sput-object v1, Lokio/a;->byy: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;->FH()V
+    invoke-virtual {v1}, Lokio/a;->FF()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 6feda7cf33..70182c3a52 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 byK:[B
+.field private static final byF:[B
 
-.field private static final byL:[B
+.field private static final byG:[B
 
 
 # direct methods
@@ -19,13 +19,13 @@
 
     fill-array-data v1, :array_0
 
-    sput-object v1, Lokio/b;->byK:[B
+    sput-object v1, Lokio/b;->byF:[B
 
     new-array v0, v0, [B
 
     fill-array-data v0, :array_1
 
-    sput-object v0, Lokio/b;->byL:[B
+    sput-object v0, Lokio/b;->byG:[B
 
     return-void
 
@@ -171,7 +171,7 @@
 .method public static C([B)Ljava/lang/String;
     .locals 1
 
-    sget-object v0, Lokio/b;->byK:[B
+    sget-object v0, Lokio/b;->byF:[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 4e5559740c..9ccf23bb1d 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 byO:Lokio/c;
+.field final synthetic byJ:Lokio/c;
 
 
 # direct methods
 .method public constructor <init>(Lokio/c;)V
     .locals 0
 
-    iput-object p1, p0, Lokio/c$1;->byO:Lokio/c;
+    iput-object p1, p0, Lokio/c$1;->byJ: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;->byO:Lokio/c;
+    iget-object v1, p0, Lokio/c$1;->byJ: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;->byO:Lokio/c;
+    iget-object v0, p0, Lokio/c$1;->byJ: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;->byO:Lokio/c;
+    iget-object v0, p0, Lokio/c$1;->byJ: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 f01d962d89..fa0ac55cc2 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;->Hj()Ljava/io/InputStream;
+    value = Lokio/c;->Hh()Ljava/io/InputStream;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -15,14 +15,14 @@
 
 
 # instance fields
-.field final synthetic byO:Lokio/c;
+.field final synthetic byJ:Lokio/c;
 
 
 # direct methods
 .method constructor <init>(Lokio/c;)V
     .locals 0
 
-    iput-object p1, p0, Lokio/c$2;->byO:Lokio/c;
+    iput-object p1, p0, Lokio/c$2;->byJ: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;->byO:Lokio/c;
+    iget-object v0, p0, Lokio/c$2;->byJ: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;->byO:Lokio/c;
+    iget-object v0, p0, Lokio/c$2;->byJ: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;->byO:Lokio/c;
+    iget-object v0, p0, Lokio/c$2;->byJ: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;->byO:Lokio/c;
+    iget-object v0, p0, Lokio/c$2;->byJ: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;->byO:Lokio/c;
+    iget-object v1, p0, Lokio/c$2;->byJ: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 82ce43f86d..7b9a7e3caf 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 byP:Z
+.field public byK:Z
 
-.field private byQ:Lokio/n;
+.field private byL:Lokio/n;
 
 .field public data:[B
 
 .field public end:I
 
-.field public lZ:Lokio/c;
+.field public ma:Lokio/c;
 
 .field public offset:J
 
@@ -63,7 +63,7 @@
 
     if-ltz v2, :cond_8
 
-    iget-object v2, p0, Lokio/c$a;->lZ:Lokio/c;
+    iget-object v2, p0, Lokio/c$a;->ma: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;->lZ:Lokio/c;
+    iget-object v0, p0, Lokio/c$a;->ma: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;->lZ:Lokio/c;
+    iget-object v2, p0, Lokio/c$a;->ma:Lokio/c;
 
     iget-wide v2, v2, Lokio/c;->size:J
 
-    iget-object v4, p0, Lokio/c$a;->lZ:Lokio/c;
+    iget-object v4, p0, Lokio/c$a;->ma:Lokio/c;
 
-    iget-object v4, v4, Lokio/c;->byN:Lokio/n;
+    iget-object v4, v4, Lokio/c;->byI:Lokio/n;
 
-    iget-object v5, p0, Lokio/c$a;->lZ:Lokio/c;
+    iget-object v5, p0, Lokio/c$a;->ma:Lokio/c;
 
-    iget-object v5, v5, Lokio/c;->byN:Lokio/n;
+    iget-object v5, v5, Lokio/c;->byI:Lokio/n;
 
-    iget-object v6, p0, Lokio/c$a;->byQ:Lokio/n;
+    iget-object v6, p0, Lokio/c$a;->byL:Lokio/n;
 
     if-eqz v6, :cond_2
 
@@ -120,14 +120,14 @@
 
     if-lez v6, :cond_1
 
-    iget-object v5, p0, Lokio/c$a;->byQ:Lokio/n;
+    iget-object v5, p0, Lokio/c$a;->byL:Lokio/n;
 
     move-wide v2, v7
 
     goto :goto_0
 
     :cond_1
-    iget-object v4, p0, Lokio/c$a;->byQ:Lokio/n;
+    iget-object v4, p0, Lokio/c$a;->byL:Lokio/n;
 
     move-wide v0, v7
 
@@ -166,7 +166,7 @@
 
     add-long/2addr v0, v2
 
-    iget-object v4, v4, Lokio/n;->bzi:Lokio/n;
+    iget-object v4, v4, Lokio/n;->bzd:Lokio/n;
 
     goto :goto_1
 
@@ -180,7 +180,7 @@
 
     if-lez v2, :cond_4
 
-    iget-object v4, v4, Lokio/n;->bzj:Lokio/n;
+    iget-object v4, v4, Lokio/n;->bze: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;->byP:Z
+    iget-boolean v2, p0, Lokio/c$a;->byK:Z
 
     if-eqz v2, :cond_6
 
-    iget-boolean v2, v4, Lokio/n;->bkm:Z
+    iget-boolean v2, v4, Lokio/n;->bkh:Z
 
     if-eqz v2, :cond_6
 
-    invoke-virtual {v4}, Lokio/n;->HK()Lokio/n;
+    invoke-virtual {v4}, Lokio/n;->HI()Lokio/n;
 
     move-result-object v2
 
-    iget-object v3, p0, Lokio/c$a;->lZ:Lokio/c;
+    iget-object v3, p0, Lokio/c$a;->ma:Lokio/c;
 
-    iget-object v3, v3, Lokio/c;->byN:Lokio/n;
+    iget-object v3, v3, Lokio/c;->byI:Lokio/n;
 
     if-ne v3, v4, :cond_5
 
-    iget-object v3, p0, Lokio/c$a;->lZ:Lokio/c;
+    iget-object v3, p0, Lokio/c$a;->ma:Lokio/c;
 
-    iput-object v2, v3, Lokio/c;->byN:Lokio/n;
+    iput-object v2, v3, Lokio/c;->byI: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;->bzj:Lokio/n;
+    iget-object v2, v4, Lokio/n;->bze:Lokio/n;
 
-    invoke-virtual {v2}, Lokio/n;->HL()Lokio/n;
+    invoke-virtual {v2}, Lokio/n;->HJ()Lokio/n;
 
     :cond_6
-    iput-object v4, p0, Lokio/c$a;->byQ:Lokio/n;
+    iput-object v4, p0, Lokio/c$a;->byL: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;->byQ:Lokio/n;
+    iput-object v0, p0, Lokio/c$a;->byL: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;->lZ:Lokio/c;
+    iget-object p2, p0, Lokio/c$a;->ma: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;->lZ:Lokio/c;
+    iget-object v0, p0, Lokio/c$a;->ma:Lokio/c;
 
     if-eqz v0, :cond_0
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lokio/c$a;->lZ:Lokio/c;
+    iput-object v0, p0, Lokio/c$a;->ma:Lokio/c;
 
-    iput-object v0, p0, Lokio/c$a;->byQ:Lokio/n;
+    iput-object v0, p0, Lokio/c$a;->byL: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 5b018f60e8..8c807ed5d5 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 byT:Lokio/r;
+.field private final byO:Lokio/r;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     if-eqz p1, :cond_0
 
-    iput-object p1, p0, Lokio/f;->byT:Lokio/r;
+    iput-object p1, p0, Lokio/f;->byO:Lokio/r;
 
     return-void
 
@@ -34,10 +34,10 @@
 
 
 # virtual methods
-.method public final HB()Lokio/r;
+.method public final Hz()Lokio/r;
     .locals 1
 
-    iget-object v0, p0, Lokio/f;->byT:Lokio/r;
+    iget-object v0, p0, Lokio/f;->byO:Lokio/r;
 
     return-object v0
 .end method
@@ -50,7 +50,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokio/f;->byT:Lokio/r;
+    iget-object v0, p0, Lokio/f;->byO: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;->byT:Lokio/r;
+    iget-object v0, p0, Lokio/f;->byO: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;->byT:Lokio/r;
+    iget-object v0, p0, Lokio/f;->byO: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;->byT:Lokio/r;
+    iget-object v1, p0, Lokio/f;->byO: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 1b7bf2796c..07067752c6 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 byU:Lokio/s;
+.field public byP:Lokio/s;
 
 
 # direct methods
@@ -15,7 +15,7 @@
 
     if-eqz p1, :cond_0
 
-    iput-object p1, p0, Lokio/g;->byU:Lokio/s;
+    iput-object p1, p0, Lokio/g;->byP:Lokio/s;
 
     return-void
 
@@ -31,10 +31,34 @@
 
 
 # virtual methods
+.method public final HA()J
+    .locals 2
+
+    iget-object v0, p0, Lokio/g;->byP:Lokio/s;
+
+    invoke-virtual {v0}, Lokio/s;->HA()J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
+
+.method public final HB()Z
+    .locals 1
+
+    iget-object v0, p0, Lokio/g;->byP:Lokio/s;
+
+    invoke-virtual {v0}, Lokio/s;->HB()Z
+
+    move-result v0
+
+    return v0
+.end method
+
 .method public final HC()J
     .locals 2
 
-    iget-object v0, p0, Lokio/g;->byU:Lokio/s;
+    iget-object v0, p0, Lokio/g;->byP:Lokio/s;
 
     invoke-virtual {v0}, Lokio/s;->HC()J
 
@@ -43,55 +67,31 @@
     return-wide v0
 .end method
 
-.method public final HD()Z
+.method public final HD()Lokio/s;
     .locals 1
 
-    iget-object v0, p0, Lokio/g;->byU:Lokio/s;
+    iget-object v0, p0, Lokio/g;->byP: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;
+    invoke-virtual {v0}, Lokio/s;->HD()Lokio/s;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final HG()Lokio/s;
+.method public final HE()Lokio/s;
     .locals 1
 
-    iget-object v0, p0, Lokio/g;->byU:Lokio/s;
+    iget-object v0, p0, Lokio/g;->byP:Lokio/s;
 
-    invoke-virtual {v0}, Lokio/s;->HG()Lokio/s;
+    invoke-virtual {v0}, Lokio/s;->HE()Lokio/s;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final HH()V
+.method public final HF()V
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -99,9 +99,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokio/g;->byU:Lokio/s;
+    iget-object v0, p0, Lokio/g;->byP:Lokio/s;
 
-    invoke-virtual {v0}, Lokio/s;->HH()V
+    invoke-virtual {v0}, Lokio/s;->HF()V
 
     return-void
 .end method
@@ -109,7 +109,7 @@
 .method public final aH(J)Lokio/s;
     .locals 1
 
-    iget-object v0, p0, Lokio/g;->byU:Lokio/s;
+    iget-object v0, p0, Lokio/g;->byP: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;->byU:Lokio/s;
+    iget-object v0, p0, Lokio/g;->byP: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 2618c6823e..d5b3bbf4dc 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 byV:I
+.field private byQ:I
 
-.field private final byW:Lokio/i;
+.field private final byR:Lokio/i;
 
-.field private final byX:Ljava/util/zip/CRC32;
+.field private final byS:Ljava/util/zip/CRC32;
 
 .field private final inflater:Ljava/util/zip/Inflater;
 
-.field private final lY:Lokio/d;
+.field private final lZ:Lokio/d;
 
 
 # direct methods
@@ -26,13 +26,13 @@
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lokio/h;->byV:I
+    iput v0, p0, Lokio/h;->byQ:I
 
     new-instance v0, Ljava/util/zip/CRC32;
 
     invoke-direct {v0}, Ljava/util/zip/CRC32;-><init>()V
 
-    iput-object v0, p0, Lokio/h;->byX:Ljava/util/zip/CRC32;
+    iput-object v0, p0, Lokio/h;->byS:Ljava/util/zip/CRC32;
 
     if-eqz p1, :cond_0
 
@@ -48,17 +48,17 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lokio/h;->lY:Lokio/d;
+    iput-object p1, p0, Lokio/h;->lZ:Lokio/d;
 
     new-instance p1, Lokio/i;
 
-    iget-object v0, p0, Lokio/h;->lY:Lokio/d;
+    iget-object v0, p0, Lokio/h;->lZ: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;->byW:Lokio/i;
+    iput-object p1, p0, Lokio/h;->byR:Lokio/i;
 
     return-void
 
@@ -75,7 +75,7 @@
 .method private b(Lokio/c;JJ)V
     .locals 4
 
-    iget-object p1, p1, Lokio/c;->byN:Lokio/n;
+    iget-object p1, p1, Lokio/c;->byI: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;->bzi:Lokio/n;
+    iget-object p1, p1, Lokio/n;->bzd:Lokio/n;
 
     goto :goto_0
 
@@ -132,7 +132,7 @@
 
     long-to-int p3, v2
 
-    iget-object v2, p0, Lokio/h;->byX:Ljava/util/zip/CRC32;
+    iget-object v2, p0, Lokio/h;->byS: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;->bzi:Lokio/n;
+    iget-object p1, p1, Lokio/n;->bzd:Lokio/n;
 
     move-wide p2, v0
 
@@ -231,7 +231,7 @@
     return-wide v0
 
     :cond_0
-    iget v0, v6, Lokio/h;->byV:I
+    iget v0, v6, Lokio/h;->byQ:I
 
     const-wide/16 v10, -0x1
 
@@ -239,15 +239,15 @@
 
     if-nez v0, :cond_d
 
-    iget-object v0, v6, Lokio/h;->lY:Lokio/d;
+    iget-object v0, v6, Lokio/h;->lZ:Lokio/d;
 
     const-wide/16 v1, 0xa
 
     invoke-interface {v0, v1, v2}, Lokio/d;->au(J)V
 
-    iget-object v0, v6, Lokio/h;->lY:Lokio/d;
+    iget-object v0, v6, Lokio/h;->lZ:Lokio/d;
 
-    invoke-interface {v0}, Lokio/d;->Hf()Lokio/c;
+    invoke-interface {v0}, Lokio/d;->Hd()Lokio/c;
 
     move-result-object v0
 
@@ -275,9 +275,9 @@
     :goto_0
     if-eqz v14, :cond_2
 
-    iget-object v0, v6, Lokio/h;->lY:Lokio/d;
+    iget-object v0, v6, Lokio/h;->lZ:Lokio/d;
 
-    invoke-interface {v0}, Lokio/d;->Hf()Lokio/c;
+    invoke-interface {v0}, Lokio/d;->Hd()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;->lY:Lokio/d;
+    iget-object v0, v6, Lokio/h;->lZ: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;->lY:Lokio/d;
+    iget-object v0, v6, Lokio/h;->lZ:Lokio/d;
 
     const-wide/16 v1, 0x8
 
@@ -314,7 +314,7 @@
 
     if-ne v0, v12, :cond_5
 
-    iget-object v0, v6, Lokio/h;->lY:Lokio/d;
+    iget-object v0, v6, Lokio/h;->lZ:Lokio/d;
 
     const-wide/16 v1, 0x2
 
@@ -322,9 +322,9 @@
 
     if-eqz v14, :cond_3
 
-    iget-object v0, v6, Lokio/h;->lY:Lokio/d;
+    iget-object v0, v6, Lokio/h;->lZ:Lokio/d;
 
-    invoke-interface {v0}, Lokio/d;->Hf()Lokio/c;
+    invoke-interface {v0}, Lokio/d;->Hd()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;->lY:Lokio/d;
+    iget-object v0, v6, Lokio/h;->lZ:Lokio/d;
 
-    invoke-interface {v0}, Lokio/d;->Hf()Lokio/c;
+    invoke-interface {v0}, Lokio/d;->Hd()Lokio/c;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokio/c;->Hl()S
+    invoke-virtual {v0}, Lokio/c;->Hj()S
 
     move-result v0
 
-    iget-object v1, v6, Lokio/h;->lY:Lokio/d;
+    iget-object v1, v6, Lokio/h;->lZ:Lokio/d;
 
     int-to-long v4, v0
 
@@ -355,9 +355,9 @@
 
     if-eqz v14, :cond_4
 
-    iget-object v0, v6, Lokio/h;->lY:Lokio/d;
+    iget-object v0, v6, Lokio/h;->lZ:Lokio/d;
 
-    invoke-interface {v0}, Lokio/d;->Hf()Lokio/c;
+    invoke-interface {v0}, Lokio/d;->Hd()Lokio/c;
 
     move-result-object v1
 
@@ -375,7 +375,7 @@
     move-wide v15, v4
 
     :goto_1
-    iget-object v0, v6, Lokio/h;->lY:Lokio/d;
+    iget-object v0, v6, Lokio/h;->lZ:Lokio/d;
 
     move-wide v1, v15
 
@@ -390,9 +390,9 @@
 
     if-ne v0, v12, :cond_8
 
-    iget-object v0, v6, Lokio/h;->lY:Lokio/d;
+    iget-object v0, v6, Lokio/h;->lZ:Lokio/d;
 
-    invoke-interface {v0}, Lokio/d;->Hq()J
+    invoke-interface {v0}, Lokio/d;->Ho()J
 
     move-result-wide v17
 
@@ -402,9 +402,9 @@
 
     if-eqz v14, :cond_6
 
-    iget-object v0, v6, Lokio/h;->lY:Lokio/d;
+    iget-object v0, v6, Lokio/h;->lZ:Lokio/d;
 
-    invoke-interface {v0}, Lokio/d;->Hf()Lokio/c;
+    invoke-interface {v0}, Lokio/d;->Hd()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;->lY:Lokio/d;
+    iget-object v0, v6, Lokio/h;->lZ:Lokio/d;
 
     add-long v1, v17, v15
 
@@ -440,9 +440,9 @@
 
     if-ne v0, v12, :cond_b
 
-    iget-object v0, v6, Lokio/h;->lY:Lokio/d;
+    iget-object v0, v6, Lokio/h;->lZ:Lokio/d;
 
-    invoke-interface {v0}, Lokio/d;->Hq()J
+    invoke-interface {v0}, Lokio/d;->Ho()J
 
     move-result-wide v17
 
@@ -452,9 +452,9 @@
 
     if-eqz v14, :cond_9
 
-    iget-object v0, v6, Lokio/h;->lY:Lokio/d;
+    iget-object v0, v6, Lokio/h;->lZ:Lokio/d;
 
-    invoke-interface {v0}, Lokio/d;->Hf()Lokio/c;
+    invoke-interface {v0}, Lokio/d;->Hd()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;->lY:Lokio/d;
+    iget-object v0, v6, Lokio/h;->lZ:Lokio/d;
 
     add-long v1, v17, v15
 
@@ -486,13 +486,13 @@
     :goto_3
     if-eqz v14, :cond_c
 
-    iget-object v0, v6, Lokio/h;->lY:Lokio/d;
+    iget-object v0, v6, Lokio/h;->lZ:Lokio/d;
 
-    invoke-interface {v0}, Lokio/d;->Hl()S
+    invoke-interface {v0}, Lokio/d;->Hj()S
 
     move-result v0
 
-    iget-object v1, v6, Lokio/h;->byX:Ljava/util/zip/CRC32;
+    iget-object v1, v6, Lokio/h;->byS: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;->byX:Ljava/util/zip/CRC32;
+    iget-object v0, v6, Lokio/h;->byS:Ljava/util/zip/CRC32;
 
     invoke-virtual {v0}, Ljava/util/zip/CRC32;->reset()V
 
     :cond_c
-    iput v12, v6, Lokio/h;->byV:I
+    iput v12, v6, Lokio/h;->byQ:I
 
     :cond_d
-    iget v0, v6, Lokio/h;->byV:I
+    iget v0, v6, Lokio/h;->byQ:I
 
     const/4 v1, 0x2
 
@@ -522,7 +522,7 @@
 
     iget-wide v2, v7, Lokio/c;->size:J
 
-    iget-object v0, v6, Lokio/h;->byW:Lokio/i;
+    iget-object v0, v6, Lokio/h;->byR: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;->byV:I
+    iput v1, v6, Lokio/h;->byQ:I
 
     :cond_f
-    iget v0, v6, Lokio/h;->byV:I
+    iget v0, v6, Lokio/h;->byQ:I
 
     if-ne v0, v1, :cond_11
 
-    iget-object v0, v6, Lokio/h;->lY:Lokio/d;
+    iget-object v0, v6, Lokio/h;->lZ:Lokio/d;
 
-    invoke-interface {v0}, Lokio/d;->Hm()I
+    invoke-interface {v0}, Lokio/d;->Hk()I
 
     move-result v0
 
-    iget-object v1, v6, Lokio/h;->byX:Ljava/util/zip/CRC32;
+    iget-object v1, v6, Lokio/h;->byS: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;->lY:Lokio/d;
+    iget-object v0, v6, Lokio/h;->lZ:Lokio/d;
 
-    invoke-interface {v0}, Lokio/d;->Hm()I
+    invoke-interface {v0}, Lokio/d;->Hk()I
 
     move-result v0
 
@@ -588,11 +588,11 @@
 
     const/4 v0, 0x3
 
-    iput v0, v6, Lokio/h;->byV:I
+    iput v0, v6, Lokio/h;->byQ:I
 
-    iget-object v0, v6, Lokio/h;->lY:Lokio/d;
+    iget-object v0, v6, Lokio/h;->lZ:Lokio/d;
 
-    invoke-interface {v0}, Lokio/d;->Hi()Z
+    invoke-interface {v0}, Lokio/d;->Hg()Z
 
     move-result v0
 
@@ -639,7 +639,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokio/h;->byW:Lokio/i;
+    iget-object v0, p0, Lokio/h;->byR: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;->lY:Lokio/d;
+    iget-object v0, p0, Lokio/h;->lZ: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 ea91463df3..5400c86730 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 byY:I
+.field private byT:I
 
 .field private final inflater:Ljava/util/zip/Inflater;
 
-.field private final lY:Lokio/d;
+.field private final lZ:Lokio/d;
 
 .field private w:Z
 
@@ -26,7 +26,7 @@
 
     if-eqz p2, :cond_0
 
-    iput-object p1, p0, Lokio/i;->lY:Lokio/d;
+    iput-object p1, p0, Lokio/i;->lZ:Lokio/d;
 
     iput-object p2, p0, Lokio/i;->inflater:Ljava/util/zip/Inflater;
 
@@ -51,7 +51,7 @@
     throw p1
 .end method
 
-.method private HI()V
+.method private HG()V
     .locals 4
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -59,7 +59,7 @@
         }
     .end annotation
 
-    iget v0, p0, Lokio/i;->byY:I
+    iget v0, p0, Lokio/i;->byT:I
 
     if-nez v0, :cond_0
 
@@ -74,13 +74,13 @@
 
     sub-int/2addr v0, v1
 
-    iget v1, p0, Lokio/i;->byY:I
+    iget v1, p0, Lokio/i;->byT:I
 
     sub-int/2addr v1, v0
 
-    iput v1, p0, Lokio/i;->byY:I
+    iput v1, p0, Lokio/i;->byT:I
 
-    iget-object v1, p0, Lokio/i;->lY:Lokio/d;
+    iget-object v1, p0, Lokio/i;->lZ:Lokio/d;
 
     int-to-long v2, v0
 
@@ -132,7 +132,7 @@
     goto :goto_1
 
     :cond_1
-    invoke-direct {p0}, Lokio/i;->HI()V
+    invoke-direct {p0}, Lokio/i;->HG()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;->lY:Lokio/d;
+    iget-object v0, p0, Lokio/i;->lZ:Lokio/d;
 
-    invoke-interface {v0}, Lokio/d;->Hi()Z
+    invoke-interface {v0}, Lokio/d;->Hg()Z
 
     move-result v0
 
@@ -155,13 +155,13 @@
     goto :goto_1
 
     :cond_2
-    iget-object v0, p0, Lokio/i;->lY:Lokio/d;
+    iget-object v0, p0, Lokio/i;->lZ:Lokio/d;
 
-    invoke-interface {v0}, Lokio/d;->Hf()Lokio/c;
+    invoke-interface {v0}, Lokio/d;->Hd()Lokio/c;
 
     move-result-object v0
 
-    iget-object v0, v0, Lokio/c;->byN:Lokio/n;
+    iget-object v0, v0, Lokio/c;->byI:Lokio/n;
 
     iget v3, v0, Lokio/n;->limit:I
 
@@ -169,7 +169,7 @@
 
     sub-int/2addr v3, v4
 
-    iput v3, p0, Lokio/i;->byY:I
+    iput v3, p0, Lokio/i;->byT: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;->byY:I
+    iget v5, p0, Lokio/i;->byT: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;->HI()V
+    invoke-direct {p0}, Lokio/i;->HG()V
 
     iget p2, v0, Lokio/n;->pos:I
 
@@ -270,11 +270,11 @@
 
     if-ne p2, p3, :cond_7
 
-    invoke-virtual {v0}, Lokio/n;->HL()Lokio/n;
+    invoke-virtual {v0}, Lokio/n;->HJ()Lokio/n;
 
     move-result-object p2
 
-    iput-object p2, p1, Lokio/c;->byN:Lokio/n;
+    iput-object p2, p1, Lokio/c;->byI: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;->lY:Lokio/d;
+    iget-object v0, p0, Lokio/i;->lZ: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;->lY:Lokio/d;
+    iget-object v0, p0, Lokio/i;->lZ: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 6ed581552d..1f6e7ae9c3 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 byZ:Lokio/s;
+.field final synthetic byU:Lokio/s;
 
-.field final synthetic bza:Ljava/io/OutputStream;
+.field final synthetic byV:Ljava/io/OutputStream;
 
 
 # direct methods
 .method constructor <init>(Lokio/s;Ljava/io/OutputStream;)V
     .locals 0
 
-    iput-object p1, p0, Lokio/j$1;->byZ:Lokio/s;
+    iput-object p1, p0, Lokio/j$1;->byU:Lokio/s;
 
-    iput-object p2, p0, Lokio/j$1;->bza:Ljava/io/OutputStream;
+    iput-object p2, p0, Lokio/j$1;->byV:Ljava/io/OutputStream;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -46,7 +46,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokio/j$1;->bza:Ljava/io/OutputStream;
+    iget-object v0, p0, Lokio/j$1;->byV:Ljava/io/OutputStream;
 
     invoke-virtual {v0}, Ljava/io/OutputStream;->close()V
 
@@ -61,7 +61,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokio/j$1;->bza:Ljava/io/OutputStream;
+    iget-object v0, p0, Lokio/j$1;->byV: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;->byZ:Lokio/s;
+    iget-object v0, p0, Lokio/j$1;->byU: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;->bza:Ljava/io/OutputStream;
+    iget-object v1, p0, Lokio/j$1;->byV: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;->byZ:Lokio/s;
+    iget-object v0, p0, Lokio/j$1;->byU:Lokio/s;
 
-    invoke-virtual {v0}, Lokio/s;->HH()V
+    invoke-virtual {v0}, Lokio/s;->HF()V
 
-    iget-object v0, p1, Lokio/c;->byN:Lokio/n;
+    iget-object v0, p1, Lokio/c;->byI: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;->bza:Ljava/io/OutputStream;
+    iget-object v1, p0, Lokio/j$1;->byV: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;->HL()Lokio/n;
+    invoke-virtual {v0}, Lokio/n;->HJ()Lokio/n;
 
     move-result-object v1
 
-    iput-object v1, p1, Lokio/c;->byN:Lokio/n;
+    iput-object v1, p1, Lokio/c;->byI: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 ecb0d7c74e..87c6c9cc3e 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 byZ:Lokio/s;
+.field final synthetic byU:Lokio/s;
 
-.field final synthetic bzb:Ljava/io/InputStream;
+.field final synthetic byW:Ljava/io/InputStream;
 
 
 # direct methods
 .method constructor <init>(Lokio/s;Ljava/io/InputStream;)V
     .locals 0
 
-    iput-object p1, p0, Lokio/j$2;->byZ:Lokio/s;
+    iput-object p1, p0, Lokio/j$2;->byU:Lokio/s;
 
-    iput-object p2, p0, Lokio/j$2;->bzb:Ljava/io/InputStream;
+    iput-object p2, p0, Lokio/j$2;->byW: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;->byZ:Lokio/s;
+    iget-object v0, p0, Lokio/j$2;->byU:Lokio/s;
 
-    invoke-virtual {v0}, Lokio/s;->HH()V
+    invoke-virtual {v0}, Lokio/s;->HF()V
 
     const/4 v0, 0x1
 
@@ -82,7 +82,7 @@
 
     long-to-int p3, p2
 
-    iget-object p2, p0, Lokio/j$2;->bzb:Ljava/io/InputStream;
+    iget-object p2, p0, Lokio/j$2;->byW:Ljava/io/InputStream;
 
     iget-object v1, v0, Lokio/n;->data:[B
 
@@ -163,7 +163,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokio/j$2;->bzb:Ljava/io/InputStream;
+    iget-object v0, p0, Lokio/j$2;->byW: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;->byZ:Lokio/s;
+    iget-object v0, p0, Lokio/j$2;->byU: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;->bzb:Ljava/io/InputStream;
+    iget-object v1, p0, Lokio/j$2;->byW: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 33fe6b48ec..c324771e44 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 HZ:Ljava/util/logging/Logger;
+.field static final HV:Ljava/util/logging/Logger;
 
 
 # direct methods
@@ -21,7 +21,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokio/j;->HZ:Ljava/util/logging/Logger;
+    sput-object v0, Lokio/j;->HV: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 9e9f7cf3d7..4da8bc1cda 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 bzd:[Lokio/ByteString;
+.field final byY:[Lokio/ByteString;
 
-.field final bze:[I
+.field final byZ:[I
 
 
 # direct methods
@@ -29,9 +29,9 @@
 
     invoke-direct {p0}, Ljava/util/AbstractList;-><init>()V
 
-    iput-object p1, p0, Lokio/k;->bzd:[Lokio/ByteString;
+    iput-object p1, p0, Lokio/k;->byY:[Lokio/ByteString;
 
-    iput-object p2, p0, Lokio/k;->bze:[I
+    iput-object p2, p0, Lokio/k;->byZ:[I
 
     return-void
 .end method
@@ -278,7 +278,7 @@
     goto :goto_4
 
     :cond_7
-    invoke-virtual {v0}, Lokio/c;->Hi()Z
+    invoke-virtual {v0}, Lokio/c;->Hg()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;->bzd:[Lokio/ByteString;
+    iget-object v0, p0, Lokio/k;->byY:[Lokio/ByteString;
 
     aget-object p1, v0, p1
 
@@ -878,7 +878,7 @@
 .method public final size()I
     .locals 1
 
-    iget-object v0, p0, Lokio/k;->bzd:[Lokio/ByteString;
+    iget-object v0, p0, Lokio/k;->byY:[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 14ce022b12..a51dd18d00 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 bzf:Lokio/q;
+.field public final bza:Lokio/q;
 
-.field public final lZ:Lokio/c;
+.field public final ma:Lokio/c;
 
 .field w:Z
 
@@ -24,11 +24,11 @@
 
     invoke-direct {v0}, Lokio/c;-><init>()V
 
-    iput-object v0, p0, Lokio/l;->lZ:Lokio/c;
+    iput-object v0, p0, Lokio/l;->ma:Lokio/c;
 
     if-eqz p1, :cond_0
 
-    iput-object p1, p0, Lokio/l;->bzf:Lokio/q;
+    iput-object p1, p0, Lokio/l;->bza:Lokio/q;
 
     return-void
 
@@ -56,11 +56,11 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lokio/l;->lZ:Lokio/c;
+    iget-object v0, p0, Lokio/l;->ma:Lokio/c;
 
     invoke-virtual {v0, p1}, Lokio/c;->D([B)Lokio/c;
 
-    invoke-virtual {p0}, Lokio/l;->Hs()Lokio/BufferedSink;
+    invoke-virtual {p0}, Lokio/l;->Hq()Lokio/BufferedSink;
 
     move-result-object p1
 
@@ -76,15 +76,15 @@
     throw p1
 .end method
 
-.method public final Hf()Lokio/c;
+.method public final Hd()Lokio/c;
     .locals 1
 
-    iget-object v0, p0, Lokio/l;->lZ:Lokio/c;
+    iget-object v0, p0, Lokio/l;->ma:Lokio/c;
 
     return-object v0
 .end method
 
-.method public final Hh()Lokio/BufferedSink;
+.method public final Hf()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;->lZ:Lokio/c;
+    iget-object v0, p0, Lokio/l;->ma: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;->bzf:Lokio/q;
+    iget-object v2, p0, Lokio/l;->bza:Lokio/q;
 
-    iget-object v3, p0, Lokio/l;->lZ:Lokio/c;
+    iget-object v3, p0, Lokio/l;->ma: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 Hs()Lokio/BufferedSink;
+.method public final Hq()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;->lZ:Lokio/c;
+    iget-object v0, p0, Lokio/l;->ma:Lokio/c;
 
-    invoke-virtual {v0}, Lokio/c;->Hk()J
+    invoke-virtual {v0}, Lokio/c;->Hi()J
 
     move-result-wide v0
 
@@ -149,9 +149,9 @@
 
     if-lez v4, :cond_0
 
-    iget-object v2, p0, Lokio/l;->bzf:Lokio/q;
+    iget-object v2, p0, Lokio/l;->bza:Lokio/q;
 
-    iget-object v3, p0, Lokio/l;->lZ:Lokio/c;
+    iget-object v3, p0, Lokio/l;->ma: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;->lZ:Lokio/c;
+    iget-object v2, p0, Lokio/l;->ma:Lokio/c;
 
     const-wide/16 v3, 0x2000
 
@@ -197,7 +197,7 @@
 
     add-long/2addr v0, v2
 
-    invoke-virtual {p0}, Lokio/l;->Hs()Lokio/BufferedSink;
+    invoke-virtual {p0}, Lokio/l;->Hq()Lokio/BufferedSink;
 
     goto :goto_0
 
@@ -232,11 +232,11 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lokio/l;->lZ:Lokio/c;
+    iget-object v0, p0, Lokio/l;->ma:Lokio/c;
 
     invoke-virtual {v0, p1, p2}, Lokio/c;->aD(J)Lokio/c;
 
-    invoke-virtual {p0}, Lokio/l;->Hs()Lokio/BufferedSink;
+    invoke-virtual {p0}, Lokio/l;->Hq()Lokio/BufferedSink;
 
     move-result-object p1
 
@@ -264,11 +264,11 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lokio/l;->lZ:Lokio/c;
+    iget-object v0, p0, Lokio/l;->ma:Lokio/c;
 
     invoke-virtual {v0, p1, p2}, Lokio/c;->aC(J)Lokio/c;
 
-    invoke-virtual {p0}, Lokio/l;->Hs()Lokio/BufferedSink;
+    invoke-virtual {p0}, Lokio/l;->Hq()Lokio/BufferedSink;
 
     move-result-object p1
 
@@ -302,7 +302,7 @@
     const/4 v0, 0x0
 
     :try_start_0
-    iget-object v1, p0, Lokio/l;->lZ:Lokio/c;
+    iget-object v1, p0, Lokio/l;->ma: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;->bzf:Lokio/q;
+    iget-object v1, p0, Lokio/l;->bza:Lokio/q;
 
-    iget-object v2, p0, Lokio/l;->lZ:Lokio/c;
+    iget-object v2, p0, Lokio/l;->ma:Lokio/c;
 
-    iget-object v3, p0, Lokio/l;->lZ:Lokio/c;
+    iget-object v3, p0, Lokio/l;->ma: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;->bzf:Lokio/q;
+    iget-object v1, p0, Lokio/l;->bza: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;->lZ:Lokio/c;
+    iget-object v0, p0, Lokio/l;->ma:Lokio/c;
 
     invoke-virtual {v0, p1}, Lokio/c;->du(I)Lokio/c;
 
-    invoke-virtual {p0}, Lokio/l;->Hs()Lokio/BufferedSink;
+    invoke-virtual {p0}, Lokio/l;->Hq()Lokio/BufferedSink;
 
     move-result-object p1
 
@@ -405,11 +405,11 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lokio/l;->lZ:Lokio/c;
+    iget-object v0, p0, Lokio/l;->ma:Lokio/c;
 
     invoke-virtual {v0, p1}, Lokio/c;->dw(I)Lokio/c;
 
-    invoke-virtual {p0}, Lokio/l;->Hs()Lokio/BufferedSink;
+    invoke-virtual {p0}, Lokio/l;->Hq()Lokio/BufferedSink;
 
     move-result-object p1
 
@@ -437,11 +437,11 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lokio/l;->lZ:Lokio/c;
+    iget-object v0, p0, Lokio/l;->ma:Lokio/c;
 
     invoke-virtual {v0, p1}, Lokio/c;->dv(I)Lokio/c;
 
-    invoke-virtual {p0}, Lokio/l;->Hs()Lokio/BufferedSink;
+    invoke-virtual {p0}, Lokio/l;->Hq()Lokio/BufferedSink;
 
     move-result-object p1
 
@@ -469,11 +469,11 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lokio/l;->lZ:Lokio/c;
+    iget-object v0, p0, Lokio/l;->ma:Lokio/c;
 
     invoke-virtual {v0, p1}, Lokio/c;->ei(Ljava/lang/String;)Lokio/c;
 
-    invoke-virtual {p0}, Lokio/l;->Hs()Lokio/BufferedSink;
+    invoke-virtual {p0}, Lokio/l;->Hq()Lokio/BufferedSink;
 
     move-result-object p1
 
@@ -501,7 +501,7 @@
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lokio/l;->lZ:Lokio/c;
+    iget-object v0, p0, Lokio/l;->ma: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;->bzf:Lokio/q;
+    iget-object v0, p0, Lokio/l;->bza:Lokio/q;
 
-    iget-object v1, p0, Lokio/l;->lZ:Lokio/c;
+    iget-object v1, p0, Lokio/l;->ma: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;->bzf:Lokio/q;
+    iget-object v0, p0, Lokio/l;->bza:Lokio/q;
 
     invoke-interface {v0}, Lokio/q;->flush()V
 
@@ -565,11 +565,11 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lokio/l;->lZ:Lokio/c;
+    iget-object v0, p0, Lokio/l;->ma:Lokio/c;
 
     invoke-virtual {v0, p1, p2, p3}, Lokio/c;->k([BII)Lokio/c;
 
-    invoke-virtual {p0}, Lokio/l;->Hs()Lokio/BufferedSink;
+    invoke-virtual {p0}, Lokio/l;->Hq()Lokio/BufferedSink;
 
     move-result-object p1
 
@@ -597,11 +597,11 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lokio/l;->lZ:Lokio/c;
+    iget-object v0, p0, Lokio/l;->ma:Lokio/c;
 
     invoke-virtual {v0, p1}, Lokio/c;->i(Lokio/ByteString;)Lokio/c;
 
-    invoke-virtual {p0}, Lokio/l;->Hs()Lokio/BufferedSink;
+    invoke-virtual {p0}, Lokio/l;->Hq()Lokio/BufferedSink;
 
     move-result-object p1
 
@@ -629,11 +629,11 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lokio/l;->lZ:Lokio/c;
+    iget-object v0, p0, Lokio/l;->ma:Lokio/c;
 
     invoke-virtual {v0, p1, p2, p3}, Lokio/c;->o(Ljava/lang/String;II)Lokio/c;
 
-    invoke-virtual {p0}, Lokio/l;->Hs()Lokio/BufferedSink;
+    invoke-virtual {p0}, Lokio/l;->Hq()Lokio/BufferedSink;
 
     move-result-object p1
 
@@ -652,7 +652,7 @@
 .method public final timeout()Lokio/s;
     .locals 1
 
-    iget-object v0, p0, Lokio/l;->bzf:Lokio/q;
+    iget-object v0, p0, Lokio/l;->bza: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;->bzf:Lokio/q;
+    iget-object v1, p0, Lokio/l;->bza: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;->lZ:Lokio/c;
+    iget-object v0, p0, Lokio/l;->ma:Lokio/c;
 
     invoke-virtual {v0, p1}, Lokio/c;->write(Ljava/nio/ByteBuffer;)I
 
     move-result p1
 
-    invoke-virtual {p0}, Lokio/l;->Hs()Lokio/BufferedSink;
+    invoke-virtual {p0}, Lokio/l;->Hq()Lokio/BufferedSink;
 
     return p1
 
@@ -729,11 +729,11 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lokio/l;->lZ:Lokio/c;
+    iget-object v0, p0, Lokio/l;->ma:Lokio/c;
 
     invoke-virtual {v0, p1, p2, p3}, Lokio/c;->write(Lokio/c;J)V
 
-    invoke-virtual {p0}, Lokio/l;->Hs()Lokio/BufferedSink;
+    invoke-virtual {p0}, Lokio/l;->Hq()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 6126c08a14..e4be2d0006 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;->Hj()Ljava/io/InputStream;
+    value = Lokio/m;->Hh()Ljava/io/InputStream;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -15,14 +15,14 @@
 
 
 # instance fields
-.field final synthetic bzh:Lokio/m;
+.field final synthetic bzc:Lokio/m;
 
 
 # direct methods
 .method constructor <init>(Lokio/m;)V
     .locals 0
 
-    iput-object p1, p0, Lokio/m$1;->bzh:Lokio/m;
+    iput-object p1, p0, Lokio/m$1;->bzc:Lokio/m;
 
     invoke-direct {p0}, Ljava/io/InputStream;-><init>()V
 
@@ -39,15 +39,15 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokio/m$1;->bzh:Lokio/m;
+    iget-object v0, p0, Lokio/m$1;->bzc:Lokio/m;
 
     iget-boolean v0, v0, Lokio/m;->w:Z
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lokio/m$1;->bzh:Lokio/m;
+    iget-object v0, p0, Lokio/m$1;->bzc:Lokio/m;
 
-    iget-object v0, v0, Lokio/m;->lZ:Lokio/c;
+    iget-object v0, v0, Lokio/m;->ma:Lokio/c;
 
     iget-wide v0, v0, Lokio/c;->size:J
 
@@ -79,7 +79,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokio/m$1;->bzh:Lokio/m;
+    iget-object v0, p0, Lokio/m$1;->bzc:Lokio/m;
 
     invoke-virtual {v0}, Lokio/m;->close()V
 
@@ -94,15 +94,15 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokio/m$1;->bzh:Lokio/m;
+    iget-object v0, p0, Lokio/m$1;->bzc:Lokio/m;
 
     iget-boolean v0, v0, Lokio/m;->w:Z
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lokio/m$1;->bzh:Lokio/m;
+    iget-object v0, p0, Lokio/m$1;->bzc:Lokio/m;
 
-    iget-object v0, v0, Lokio/m;->lZ:Lokio/c;
+    iget-object v0, v0, Lokio/m;->ma: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;->bzh:Lokio/m;
+    iget-object v0, p0, Lokio/m$1;->bzc:Lokio/m;
 
-    iget-object v0, v0, Lokio/m;->bzg:Lokio/r;
+    iget-object v0, v0, Lokio/m;->bzb:Lokio/r;
 
-    iget-object v1, p0, Lokio/m$1;->bzh:Lokio/m;
+    iget-object v1, p0, Lokio/m$1;->bzc:Lokio/m;
 
-    iget-object v1, v1, Lokio/m;->lZ:Lokio/c;
+    iget-object v1, v1, Lokio/m;->ma:Lokio/c;
 
     const-wide/16 v2, 0x2000
 
@@ -137,9 +137,9 @@
     return v0
 
     :cond_0
-    iget-object v0, p0, Lokio/m$1;->bzh:Lokio/m;
+    iget-object v0, p0, Lokio/m$1;->bzc:Lokio/m;
 
-    iget-object v0, v0, Lokio/m;->lZ:Lokio/c;
+    iget-object v0, v0, Lokio/m;->ma:Lokio/c;
 
     invoke-virtual {v0}, Lokio/c;->readByte()B
 
@@ -167,7 +167,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokio/m$1;->bzh:Lokio/m;
+    iget-object v0, p0, Lokio/m$1;->bzc: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;->bzh:Lokio/m;
+    iget-object v0, p0, Lokio/m$1;->bzc:Lokio/m;
 
-    iget-object v0, v0, Lokio/m;->lZ:Lokio/c;
+    iget-object v0, v0, Lokio/m;->ma: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;->bzh:Lokio/m;
+    iget-object v0, p0, Lokio/m$1;->bzc:Lokio/m;
 
-    iget-object v0, v0, Lokio/m;->bzg:Lokio/r;
+    iget-object v0, v0, Lokio/m;->bzb:Lokio/r;
 
-    iget-object v1, p0, Lokio/m$1;->bzh:Lokio/m;
+    iget-object v1, p0, Lokio/m$1;->bzc:Lokio/m;
 
-    iget-object v1, v1, Lokio/m;->lZ:Lokio/c;
+    iget-object v1, v1, Lokio/m;->ma:Lokio/c;
 
     const-wide/16 v2, 0x2000
 
@@ -220,9 +220,9 @@
     return p1
 
     :cond_0
-    iget-object v0, p0, Lokio/m$1;->bzh:Lokio/m;
+    iget-object v0, p0, Lokio/m$1;->bzc:Lokio/m;
 
-    iget-object v0, v0, Lokio/m;->lZ:Lokio/c;
+    iget-object v0, v0, Lokio/m;->ma: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;->bzh:Lokio/m;
+    iget-object v1, p0, Lokio/m$1;->bzc: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 7f21ea6a02..5a8c8069ff 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 bzg:Lokio/r;
+.field public final bzb:Lokio/r;
 
-.field public final lZ:Lokio/c;
+.field public final ma:Lokio/c;
 
 .field w:Z
 
@@ -24,11 +24,11 @@
 
     invoke-direct {v0}, Lokio/c;-><init>()V
 
-    iput-object v0, p0, Lokio/m;->lZ:Lokio/c;
+    iput-object v0, p0, Lokio/m;->ma:Lokio/c;
 
     if-eqz p1, :cond_0
 
-    iput-object p1, p0, Lokio/m;->bzg:Lokio/r;
+    iput-object p1, p0, Lokio/m;->bzb:Lokio/r;
 
     return-void
 
@@ -67,7 +67,7 @@
 
     if-gez v2, :cond_2
 
-    iget-object v3, p0, Lokio/m;->lZ:Lokio/c;
+    iget-object v3, p0, Lokio/m;->ma:Lokio/c;
 
     move v4, p1
 
@@ -86,7 +86,7 @@
     return-wide v2
 
     :cond_0
-    iget-object v2, p0, Lokio/m;->lZ:Lokio/c;
+    iget-object v2, p0, Lokio/m;->ma: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;->bzg:Lokio/r;
+    iget-object v4, p0, Lokio/m;->bzb:Lokio/r;
 
-    iget-object v5, p0, Lokio/m;->lZ:Lokio/c;
+    iget-object v5, p0, Lokio/m;->ma:Lokio/c;
 
     const-wide/16 v6, 0x2000
 
@@ -172,23 +172,23 @@
 
 
 # virtual methods
-.method public final Hf()Lokio/c;
+.method public final Hd()Lokio/c;
     .locals 1
 
-    iget-object v0, p0, Lokio/m;->lZ:Lokio/c;
+    iget-object v0, p0, Lokio/m;->ma:Lokio/c;
 
     return-object v0
 .end method
 
-.method public final Hg()Lokio/c;
+.method public final He()Lokio/c;
     .locals 1
 
-    iget-object v0, p0, Lokio/m;->lZ:Lokio/c;
+    iget-object v0, p0, Lokio/m;->ma:Lokio/c;
 
     return-object v0
 .end method
 
-.method public final Hi()Z
+.method public final Hg()Z
     .locals 5
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -200,17 +200,17 @@
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lokio/m;->lZ:Lokio/c;
+    iget-object v0, p0, Lokio/m;->ma:Lokio/c;
 
-    invoke-virtual {v0}, Lokio/c;->Hi()Z
+    invoke-virtual {v0}, Lokio/c;->Hg()Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lokio/m;->bzg:Lokio/r;
+    iget-object v0, p0, Lokio/m;->bzb:Lokio/r;
 
-    iget-object v1, p0, Lokio/m;->lZ:Lokio/c;
+    iget-object v1, p0, Lokio/m;->ma:Lokio/c;
 
     const-wide/16 v2, 0x2000
 
@@ -243,7 +243,7 @@
     throw v0
 .end method
 
-.method public final Hj()Ljava/io/InputStream;
+.method public final Hh()Ljava/io/InputStream;
     .locals 1
 
     new-instance v0, Lokio/m$1;
@@ -253,7 +253,7 @@
     return-object v0
 .end method
 
-.method public final Hl()S
+.method public final Hj()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;->lZ:Lokio/c;
+    iget-object v0, p0, Lokio/m;->ma:Lokio/c;
 
     invoke-virtual {v0}, Lokio/c;->readShort()S
 
@@ -278,7 +278,7 @@
     return v0
 .end method
 
-.method public final Hm()I
+.method public final Hk()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;->lZ:Lokio/c;
+    iget-object v0, p0, Lokio/m;->ma:Lokio/c;
 
     invoke-virtual {v0}, Lokio/c;->readInt()I
 
@@ -303,7 +303,7 @@
     return v0
 .end method
 
-.method public final Hn()J
+.method public final Hl()J
     .locals 6
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -330,7 +330,7 @@
 
     if-eqz v3, :cond_5
 
-    iget-object v3, p0, Lokio/m;->lZ:Lokio/c;
+    iget-object v3, p0, Lokio/m;->ma:Lokio/c;
 
     int-to-long v4, v1
 
@@ -402,16 +402,16 @@
 
     :cond_5
     :goto_2
-    iget-object v0, p0, Lokio/m;->lZ:Lokio/c;
+    iget-object v0, p0, Lokio/m;->ma:Lokio/c;
 
-    invoke-virtual {v0}, Lokio/c;->Hn()J
+    invoke-virtual {v0}, Lokio/c;->Hl()J
 
     move-result-wide v0
 
     return-wide v0
 .end method
 
-.method public final Hp()Ljava/lang/String;
+.method public final Hn()Ljava/lang/String;
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -428,7 +428,7 @@
     return-object v0
 .end method
 
-.method public final Hq()J
+.method public final Ho()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;->lZ:Lokio/c;
+    iget-object v0, p0, Lokio/m;->ma:Lokio/c;
 
     const/4 v1, 0x1
 
@@ -483,9 +483,9 @@
 
     if-ne v0, v2, :cond_2
 
-    iget-object v0, p0, Lokio/m;->bzg:Lokio/r;
+    iget-object v0, p0, Lokio/m;->bzb:Lokio/r;
 
-    iget-object v2, p0, Lokio/m;->lZ:Lokio/c;
+    iget-object v2, p0, Lokio/m;->ma:Lokio/c;
 
     const-wide/16 v3, 0x2000
 
@@ -502,7 +502,7 @@
     return v1
 
     :cond_2
-    iget-object p1, p1, Lokio/k;->bzd:[Lokio/ByteString;
+    iget-object p1, p1, Lokio/k;->byY:[Lokio/ByteString;
 
     aget-object p1, p1, v0
 
@@ -510,7 +510,7 @@
 
     move-result p1
 
-    iget-object v1, p0, Lokio/m;->lZ:Lokio/c;
+    iget-object v1, p0, Lokio/m;->ma:Lokio/c;
 
     int-to-long v2, p1
 
@@ -554,7 +554,7 @@
 
     if-nez v2, :cond_1
 
-    iget-object v2, p0, Lokio/m;->lZ:Lokio/c;
+    iget-object v2, p0, Lokio/m;->ma: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;->bzg:Lokio/r;
+    iget-object v0, p0, Lokio/m;->bzb:Lokio/r;
 
-    iget-object v1, p0, Lokio/m;->lZ:Lokio/c;
+    iget-object v1, p0, Lokio/m;->ma:Lokio/c;
 
     const-wide/16 v2, 0x2000
 
@@ -581,7 +581,7 @@
     return-wide v2
 
     :cond_0
-    iget-object v0, p0, Lokio/m;->lZ:Lokio/c;
+    iget-object v0, p0, Lokio/m;->ma:Lokio/c;
 
     iget-wide v0, v0, Lokio/c;->size:J
 
@@ -589,7 +589,7 @@
 
     move-result-wide p2
 
-    iget-object v0, p0, Lokio/m;->lZ:Lokio/c;
+    iget-object v0, p0, Lokio/m;->ma: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;->bzg:Lokio/r;
+    iget-object v4, p0, Lokio/m;->bzb:Lokio/r;
 
-    iget-object v5, p0, Lokio/m;->lZ:Lokio/c;
+    iget-object v5, p0, Lokio/m;->ma:Lokio/c;
 
     const-wide/16 v6, 0x2000
 
@@ -665,9 +665,9 @@
 
     if-eqz v8, :cond_1
 
-    iget-object v4, p0, Lokio/m;->lZ:Lokio/c;
+    iget-object v4, p0, Lokio/m;->ma:Lokio/c;
 
-    invoke-virtual {v4}, Lokio/c;->Hk()J
+    invoke-virtual {v4}, Lokio/c;->Hi()J
 
     move-result-wide v4
 
@@ -677,14 +677,14 @@
 
     add-long/2addr v2, v4
 
-    iget-object v6, p0, Lokio/m;->lZ:Lokio/c;
+    iget-object v6, p0, Lokio/m;->ma: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;->lZ:Lokio/c;
+    iget-object v4, p0, Lokio/m;->ma: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;->lZ:Lokio/c;
+    iget-object v0, p0, Lokio/m;->ma:Lokio/c;
 
     iget-wide v0, v0, Lokio/c;->size:J
 
     add-long/2addr v2, v0
 
-    iget-object v0, p0, Lokio/m;->lZ:Lokio/c;
+    iget-object v0, p0, Lokio/m;->ma: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;->lZ:Lokio/c;
+    iget-object v0, p0, Lokio/m;->ma: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;->lZ:Lokio/c;
+    iget-object v2, p0, Lokio/m;->ma: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;->bzg:Lokio/r;
+    iget-object v0, p0, Lokio/m;->bzb:Lokio/r;
 
-    iget-object v1, p0, Lokio/m;->lZ:Lokio/c;
+    iget-object v1, p0, Lokio/m;->ma:Lokio/c;
 
     const-wide/16 v2, 0x2000
 
@@ -796,7 +796,7 @@
 
     :cond_1
     :goto_1
-    iget-object v0, p0, Lokio/m;->lZ:Lokio/c;
+    iget-object v0, p0, Lokio/m;->ma:Lokio/c;
 
     iget-wide v0, v0, Lokio/c;->size:J
 
@@ -804,7 +804,7 @@
 
     move-result-wide v0
 
-    iget-object v2, p0, Lokio/m;->lZ:Lokio/c;
+    iget-object v2, p0, Lokio/m;->ma: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;->lZ:Lokio/c;
+    iget-object v0, p0, Lokio/m;->ma: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;->lZ:Lokio/c;
+    iget-object p1, p0, Lokio/m;->ma: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;->lZ:Lokio/c;
+    iget-object v2, p0, Lokio/m;->ma:Lokio/c;
 
     sub-long v6, v4, v0
 
@@ -961,7 +961,7 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lokio/m;->lZ:Lokio/c;
+    iget-object v0, p0, Lokio/m;->ma: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;->lZ:Lokio/c;
+    iget-object p1, p0, Lokio/m;->ma: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;->lZ:Lokio/c;
+    iget-object v0, p0, Lokio/m;->ma: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;->lZ:Lokio/c;
+    iget-object v2, p0, Lokio/m;->ma: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;->Gs()Lokio/ByteString;
+    invoke-virtual {v6}, Lokio/c;->Gq()Lokio/ByteString;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lokio/ByteString;->Hx()Ljava/lang/String;
+    invoke-virtual {p1}, Lokio/ByteString;->Hv()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;->lZ:Lokio/c;
+    iget-object v0, p0, Lokio/m;->ma: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;->lZ:Lokio/c;
+    iget-object p3, p0, Lokio/m;->ma: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;->lZ:Lokio/c;
+    iget-object v0, p0, Lokio/m;->ma:Lokio/c;
 
-    iget-object v1, p0, Lokio/m;->bzg:Lokio/r;
+    iget-object v1, p0, Lokio/m;->bzb:Lokio/r;
 
     invoke-virtual {v0, v1}, Lokio/c;->a(Lokio/r;)J
 
-    iget-object v0, p0, Lokio/m;->lZ:Lokio/c;
+    iget-object v0, p0, Lokio/m;->ma: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;->bzg:Lokio/r;
+    iget-object v0, p0, Lokio/m;->bzb:Lokio/r;
 
     invoke-interface {v0}, Lokio/r;->close()V
 
-    iget-object v0, p0, Lokio/m;->lZ:Lokio/c;
+    iget-object v0, p0, Lokio/m;->ma: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;->lZ:Lokio/c;
+    iget-object v2, p0, Lokio/m;->ma: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;->lZ:Lokio/c;
+    iget-object v2, p0, Lokio/m;->ma:Lokio/c;
 
     iget-wide v2, v2, Lokio/c;->size:J
 
-    iget-object v6, p0, Lokio/m;->bzg:Lokio/r;
+    iget-object v6, p0, Lokio/m;->bzb:Lokio/r;
 
-    iget-object v7, p0, Lokio/m;->lZ:Lokio/c;
+    iget-object v7, p0, Lokio/m;->ma:Lokio/c;
 
     const-wide/16 v8, 0x2000
 
@@ -1272,7 +1272,7 @@
     const-wide/16 v0, 0x0
 
     :goto_0
-    iget-object v2, p0, Lokio/m;->lZ:Lokio/c;
+    iget-object v2, p0, Lokio/m;->ma: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;->lZ:Lokio/c;
+    iget-object v2, p0, Lokio/m;->ma:Lokio/c;
 
     iget-wide v2, v2, Lokio/c;->size:J
 
-    iget-object v6, p0, Lokio/m;->bzg:Lokio/r;
+    iget-object v6, p0, Lokio/m;->bzb:Lokio/r;
 
-    iget-object v7, p0, Lokio/m;->lZ:Lokio/c;
+    iget-object v7, p0, Lokio/m;->ma:Lokio/c;
 
     const-wide/16 v8, 0x2000
 
@@ -1385,7 +1385,7 @@
     return v1
 
     :cond_1
-    iget-object v3, p0, Lokio/m;->lZ:Lokio/c;
+    iget-object v3, p0, Lokio/m;->ma:Lokio/c;
 
     invoke-virtual {v3, v5, v6}, Lokio/c;->av(J)B
 
@@ -1439,7 +1439,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokio/m;->lZ:Lokio/c;
+    iget-object v0, p0, Lokio/m;->ma: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;->bzg:Lokio/r;
+    iget-object v0, p0, Lokio/m;->bzb:Lokio/r;
 
-    iget-object v1, p0, Lokio/m;->lZ:Lokio/c;
+    iget-object v1, p0, Lokio/m;->ma:Lokio/c;
 
     const-wide/16 v2, 0x2000
 
@@ -1470,7 +1470,7 @@
     return p1
 
     :cond_0
-    iget-object v0, p0, Lokio/m;->lZ:Lokio/c;
+    iget-object v0, p0, Lokio/m;->ma: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;->lZ:Lokio/c;
+    iget-object v0, p0, Lokio/m;->ma: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;->lZ:Lokio/c;
+    iget-object v0, p0, Lokio/m;->ma: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;->lZ:Lokio/c;
+    iget-object v2, p0, Lokio/m;->ma: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;->lZ:Lokio/c;
+    iget-object v2, p0, Lokio/m;->ma: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;->lZ:Lokio/c;
+    iget-object v0, p0, Lokio/m;->ma: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;->lZ:Lokio/c;
+    iget-object v0, p0, Lokio/m;->ma: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;->lZ:Lokio/c;
+    iget-object v0, p0, Lokio/m;->ma: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;->lZ:Lokio/c;
+    iget-object v0, p0, Lokio/m;->ma: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;->bzg:Lokio/r;
+    iget-object v0, p0, Lokio/m;->bzb:Lokio/r;
 
-    iget-object v1, p0, Lokio/m;->lZ:Lokio/c;
+    iget-object v1, p0, Lokio/m;->ma: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;->bzg:Lokio/r;
+    iget-object v0, p0, Lokio/m;->bzb: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;->bzg:Lokio/r;
+    iget-object v1, p0, Lokio/m;->bzb: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 fe30923e8f..a6413d0f06 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 bzl:[[B
+.field final transient bzg:[[B
 
-.field final transient bzm:[I
+.field final transient bzh:[I
 
 
 # direct methods
@@ -25,7 +25,7 @@
 
     invoke-static/range {v1 .. v6}, Lokio/t;->a(JJJ)V
 
-    iget-object v0, p1, Lokio/c;->byN:Lokio/n;
+    iget-object v0, p1, Lokio/c;->byI:Lokio/n;
 
     const/4 v1, 0x0
 
@@ -54,7 +54,7 @@
 
     add-int/lit8 v2, v2, 0x1
 
-    iget-object v3, v3, Lokio/n;->bzi:Lokio/n;
+    iget-object v3, v3, Lokio/n;->bzd:Lokio/n;
 
     goto :goto_0
 
@@ -70,15 +70,15 @@
     :cond_1
     new-array v0, v2, [[B
 
-    iput-object v0, p0, Lokio/p;->bzl:[[B
+    iput-object v0, p0, Lokio/p;->bzg:[[B
 
     mul-int/lit8 v2, v2, 0x2
 
     new-array v0, v2, [I
 
-    iput-object v0, p0, Lokio/p;->bzm:[I
+    iput-object v0, p0, Lokio/p;->bzh:[I
 
-    iget-object p1, p1, Lokio/c;->byN:Lokio/n;
+    iget-object p1, p1, Lokio/c;->byI:Lokio/n;
 
     move-object v0, p1
 
@@ -87,7 +87,7 @@
     :goto_1
     if-ge v1, p2, :cond_3
 
-    iget-object v2, p0, Lokio/p;->bzl:[[B
+    iget-object v2, p0, Lokio/p;->bzg:[[B
 
     iget-object v3, v0, Lokio/n;->data:[B
 
@@ -106,11 +106,11 @@
     move v1, p2
 
     :cond_2
-    iget-object v2, p0, Lokio/p;->bzm:[I
+    iget-object v2, p0, Lokio/p;->bzh:[I
 
     aput v1, v2, p1
 
-    iget-object v3, p0, Lokio/p;->bzl:[[B
+    iget-object v3, p0, Lokio/p;->bzg:[[B
 
     array-length v3, v3
 
@@ -122,11 +122,11 @@
 
     const/4 v2, 0x1
 
-    iput-boolean v2, v0, Lokio/n;->bkm:Z
+    iput-boolean v2, v0, Lokio/n;->bkh:Z
 
     add-int/lit8 p1, p1, 0x1
 
-    iget-object v0, v0, Lokio/n;->bzi:Lokio/n;
+    iget-object v0, v0, Lokio/n;->bzd:Lokio/n;
 
     goto :goto_1
 
@@ -134,12 +134,12 @@
     return-void
 .end method
 
-.method private HN()Lokio/ByteString;
+.method private HL()Lokio/ByteString;
     .locals 2
 
     new-instance v0, Lokio/ByteString;
 
-    invoke-virtual {p0}, Lokio/p;->Hz()[B
+    invoke-virtual {p0}, Lokio/p;->Hx()[B
 
     move-result-object v1
 
@@ -151,9 +151,9 @@
 .method private dC(I)I
     .locals 3
 
-    iget-object v0, p0, Lokio/p;->bzm:[I
+    iget-object v0, p0, Lokio/p;->bzh:[I
 
-    iget-object v1, p0, Lokio/p;->bzl:[[B
+    iget-object v1, p0, Lokio/p;->bzg:[[B
 
     array-length v1, v1
 
@@ -178,7 +178,7 @@
 .method private writeReplace()Ljava/lang/Object;
     .locals 1
 
-    invoke-direct {p0}, Lokio/p;->HN()Lokio/ByteString;
+    invoke-direct {p0}, Lokio/p;->HL()Lokio/ByteString;
 
     move-result-object v0
 
@@ -187,52 +187,70 @@
 
 
 # virtual methods
-.method final HA()[B
+.method public final Hr()Ljava/lang/String;
     .locals 1
 
-    invoke-virtual {p0}, Lokio/p;->Hz()[B
+    invoke-direct {p0}, Lokio/p;->HL()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 Ht()Ljava/lang/String;
+.method public final Hs()Ljava/lang/String;
     .locals 1
 
-    invoke-direct {p0}, Lokio/p;->HN()Lokio/ByteString;
+    invoke-direct {p0}, Lokio/p;->HL()Lokio/ByteString;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokio/ByteString;->Ht()Ljava/lang/String;
+    invoke-virtual {v0}, Lokio/ByteString;->Hs()Ljava/lang/String;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final Hu()Ljava/lang/String;
+.method public final Ht()Lokio/ByteString;
     .locals 1
 
-    invoke-direct {p0}, Lokio/p;->HN()Lokio/ByteString;
+    invoke-direct {p0}, Lokio/p;->HL()Lokio/ByteString;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokio/ByteString;->Hu()Ljava/lang/String;
+    invoke-virtual {v0}, Lokio/ByteString;->Ht()Lokio/ByteString;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final Hv()Lokio/ByteString;
+.method public final Hu()Lokio/ByteString;
     .locals 1
 
-    invoke-direct {p0}, Lokio/p;->HN()Lokio/ByteString;
+    invoke-direct {p0}, Lokio/p;->HL()Lokio/ByteString;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokio/ByteString;->Hv()Lokio/ByteString;
+    invoke-virtual {v0}, Lokio/ByteString;->Hu()Lokio/ByteString;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final Hv()Ljava/lang/String;
+    .locals 1
+
+    invoke-direct {p0}, Lokio/p;->HL()Lokio/ByteString;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lokio/ByteString;->Hv()Ljava/lang/String;
 
     move-result-object v0
 
@@ -242,7 +260,7 @@
 .method public final Hw()Lokio/ByteString;
     .locals 1
 
-    invoke-direct {p0}, Lokio/p;->HN()Lokio/ByteString;
+    invoke-direct {p0}, Lokio/p;->HL()Lokio/ByteString;
 
     move-result-object v0
 
@@ -253,40 +271,12 @@
     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
+.method public final Hx()[B
     .locals 8
 
-    iget-object v0, p0, Lokio/p;->bzm:[I
+    iget-object v0, p0, Lokio/p;->bzh:[I
 
-    iget-object v1, p0, Lokio/p;->bzl:[[B
+    iget-object v1, p0, Lokio/p;->bzg:[[B
 
     array-length v2, v1
 
@@ -305,7 +295,7 @@
     :goto_0
     if-ge v2, v1, :cond_0
 
-    iget-object v4, p0, Lokio/p;->bzm:[I
+    iget-object v4, p0, Lokio/p;->bzh:[I
 
     add-int v5, v1, v2
 
@@ -313,7 +303,7 @@
 
     aget v4, v4, v2
 
-    iget-object v6, p0, Lokio/p;->bzl:[[B
+    iget-object v6, p0, Lokio/p;->bzg:[[B
 
     aget-object v6, v6, v2
 
@@ -331,10 +321,20 @@
     return-object v0
 .end method
 
+.method final Hy()[B
+    .locals 1
+
+    invoke-virtual {p0}, Lokio/p;->Hx()[B
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
 .method public final T(II)Lokio/ByteString;
     .locals 1
 
-    invoke-direct {p0}, Lokio/p;->HN()Lokio/ByteString;
+    invoke-direct {p0}, Lokio/p;->HL()Lokio/ByteString;
 
     move-result-object v0
 
@@ -375,14 +375,14 @@
     goto :goto_1
 
     :cond_1
-    iget-object v2, p0, Lokio/p;->bzm:[I
+    iget-object v2, p0, Lokio/p;->bzh:[I
 
     add-int/lit8 v3, v0, -0x1
 
     aget v2, v2, v3
 
     :goto_1
-    iget-object v3, p0, Lokio/p;->bzm:[I
+    iget-object v3, p0, Lokio/p;->bzh:[I
 
     aget v3, v3, v0
 
@@ -396,9 +396,9 @@
 
     move-result v3
 
-    iget-object v4, p0, Lokio/p;->bzm:[I
+    iget-object v4, p0, Lokio/p;->bzh:[I
 
-    iget-object v5, p0, Lokio/p;->bzl:[[B
+    iget-object v5, p0, Lokio/p;->bzg:[[B
 
     array-length v6, v5
 
@@ -445,7 +445,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokio/p;->bzl:[[B
+    iget-object v0, p0, Lokio/p;->bzg:[[B
 
     array-length v0, v0
 
@@ -456,7 +456,7 @@
     :goto_0
     if-ge v1, v0, :cond_0
 
-    iget-object v3, p0, Lokio/p;->bzm:[I
+    iget-object v3, p0, Lokio/p;->bzh:[I
 
     add-int v4, v0, v1
 
@@ -464,7 +464,7 @@
 
     aget v3, v3, v1
 
-    iget-object v5, p0, Lokio/p;->bzl:[[B
+    iget-object v5, p0, Lokio/p;->bzg:[[B
 
     aget-object v5, v5, v1
 
@@ -485,7 +485,7 @@
 .method final b(Lokio/c;)V
     .locals 11
 
-    iget-object v0, p0, Lokio/p;->bzl:[[B
+    iget-object v0, p0, Lokio/p;->bzg:[[B
 
     array-length v0, v0
 
@@ -496,7 +496,7 @@
     :goto_0
     if-ge v1, v0, :cond_1
 
-    iget-object v3, p0, Lokio/p;->bzm:[I
+    iget-object v3, p0, Lokio/p;->bzh:[I
 
     add-int v4, v0, v1
 
@@ -506,7 +506,7 @@
 
     new-instance v4, Lokio/n;
 
-    iget-object v5, p0, Lokio/p;->bzl:[[B
+    iget-object v5, p0, Lokio/p;->bzg:[[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;->byN:Lokio/n;
+    iget-object v2, p1, Lokio/c;->byI:Lokio/n;
 
     if-nez v2, :cond_0
 
-    iput-object v4, v4, Lokio/n;->bzj:Lokio/n;
+    iput-object v4, v4, Lokio/n;->bze:Lokio/n;
 
-    iput-object v4, v4, Lokio/n;->bzi:Lokio/n;
+    iput-object v4, v4, Lokio/n;->bzd:Lokio/n;
 
-    iput-object v4, p1, Lokio/c;->byN:Lokio/n;
+    iput-object v4, p1, Lokio/c;->byI:Lokio/n;
 
     goto :goto_1
 
     :cond_0
-    iget-object v2, p1, Lokio/c;->byN:Lokio/n;
+    iget-object v2, p1, Lokio/c;->byI:Lokio/n;
 
-    iget-object v2, v2, Lokio/n;->bzj:Lokio/n;
+    iget-object v2, v2, Lokio/n;->bze: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;->bzm:[I
+    iget-object v0, p0, Lokio/p;->bzh:[I
 
-    iget-object v1, p0, Lokio/p;->bzl:[[B
+    iget-object v1, p0, Lokio/p;->bzg:[[B
 
     array-length v1, v1
 
@@ -592,16 +592,16 @@
     goto :goto_0
 
     :cond_0
-    iget-object v1, p0, Lokio/p;->bzm:[I
+    iget-object v1, p0, Lokio/p;->bzh:[I
 
     add-int/lit8 v2, v0, -0x1
 
     aget v1, v1, v2
 
     :goto_0
-    iget-object v2, p0, Lokio/p;->bzm:[I
+    iget-object v2, p0, Lokio/p;->bzh:[I
 
-    iget-object v3, p0, Lokio/p;->bzl:[[B
+    iget-object v3, p0, Lokio/p;->bzg:[[B
 
     array-length v4, v3
 
@@ -704,14 +704,14 @@
     goto :goto_1
 
     :cond_1
-    iget-object v2, p0, Lokio/p;->bzm:[I
+    iget-object v2, p0, Lokio/p;->bzh:[I
 
     add-int/lit8 v3, v1, -0x1
 
     aget v2, v2, v3
 
     :goto_1
-    iget-object v3, p0, Lokio/p;->bzm:[I
+    iget-object v3, p0, Lokio/p;->bzh:[I
 
     aget v3, v3, v1
 
@@ -725,9 +725,9 @@
 
     move-result v3
 
-    iget-object v4, p0, Lokio/p;->bzm:[I
+    iget-object v4, p0, Lokio/p;->bzh:[I
 
-    iget-object v5, p0, Lokio/p;->bzl:[[B
+    iget-object v5, p0, Lokio/p;->bzg:[[B
 
     array-length v6, v5
 
@@ -780,7 +780,7 @@
     return v0
 
     :cond_0
-    iget-object v0, p0, Lokio/p;->bzl:[[B
+    iget-object v0, p0, Lokio/p;->bzg:[[B
 
     array-length v0, v0
 
@@ -793,11 +793,11 @@
     :goto_0
     if-ge v1, v0, :cond_2
 
-    iget-object v4, p0, Lokio/p;->bzl:[[B
+    iget-object v4, p0, Lokio/p;->bzg:[[B
 
     aget-object v4, v4, v1
 
-    iget-object v5, p0, Lokio/p;->bzm:[I
+    iget-object v5, p0, Lokio/p;->bzh:[I
 
     add-int v6, v0, v1
 
@@ -838,9 +838,9 @@
 .method public final size()I
     .locals 2
 
-    iget-object v0, p0, Lokio/p;->bzm:[I
+    iget-object v0, p0, Lokio/p;->bzh:[I
 
-    iget-object v1, p0, Lokio/p;->bzl:[[B
+    iget-object v1, p0, Lokio/p;->bzg:[[B
 
     array-length v1, v1
 
@@ -854,7 +854,7 @@
 .method public final toString()Ljava/lang/String;
     .locals 1
 
-    invoke-direct {p0}, Lokio/p;->HN()Lokio/ByteString;
+    invoke-direct {p0}, Lokio/p;->HL()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 dcb4c8a062..608d1cc7df 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 HH()V
+.method public final HF()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 0ab525153e..b8caaa233c 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 tw:Ljava/nio/charset/Charset;
+.field public static final tx:Ljava/nio/charset/Charset;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokio/t;->tw:Ljava/nio/charset/Charset;
+    sput-object v0, Lokio/t;->tx: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 818914e642..aaa8a30f46 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 bzM:I
+.field protected final bzH:I
 
-.field protected bzN:Lorg/a/a/a;
+.field protected bzI:Lorg/a/a/a;
 
 
 # direct methods
@@ -27,25 +27,25 @@
 
     const/high16 p1, 0x70000
 
-    iput p1, p0, Lorg/a/a/a;->bzM:I
+    iput p1, p0, Lorg/a/a/a;->bzH:I
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lorg/a/a/a;->bzN:Lorg/a/a/a;
+    iput-object p1, p0, Lorg/a/a/a;->bzI:Lorg/a/a/a;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public HO()V
+.method public HM()V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/a;->bzN:Lorg/a/a/a;
+    iget-object v0, p0, Lorg/a/a/a;->bzI:Lorg/a/a/a;
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v0}, Lorg/a/a/a;->HO()V
+    invoke-virtual {v0}, Lorg/a/a/a;->HM()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;->bzN:Lorg/a/a/a;
+    iget-object v0, p0, Lorg/a/a/a;->bzI: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;->bzN:Lorg/a/a/a;
+    iget-object v0, p0, Lorg/a/a/a;->bzI: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;->bzN:Lorg/a/a/a;
+    iget-object v0, p0, Lorg/a/a/a;->bzI: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;->bzN:Lorg/a/a/a;
+    iget-object v0, p0, Lorg/a/a/a;->bzI: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 4eb0187159..3dfe8182fd 100644
--- a/com.discord/smali_classes2/org/a/a/aa.smali
+++ b/com.discord/smali_classes2/org/a/a/aa.smali
@@ -4,6 +4,16 @@
 
 
 # static fields
+.field public static final bDf:Lorg/a/a/aa;
+
+.field public static final bDg:Lorg/a/a/aa;
+
+.field public static final bDh:Lorg/a/a/aa;
+
+.field public static final bDi:Lorg/a/a/aa;
+
+.field public static final bDj:Lorg/a/a/aa;
+
 .field public static final bDk:Lorg/a/a/aa;
 
 .field public static final bDl:Lorg/a/a/aa;
@@ -12,25 +22,15 @@
 
 .field public static final bDn:Lorg/a/a/aa;
 
-.field public static final bDo:Lorg/a/a/aa;
-
-.field public static final bDp:Lorg/a/a/aa;
-
-.field public static final bDq:Lorg/a/a/aa;
-
-.field public static final bDr:Lorg/a/a/aa;
-
-.field public static final bDs:Lorg/a/a/aa;
-
 
 # instance fields
-.field private final bDt:I
+.field private final bDo:I
 
-.field private final bDu:Ljava/lang/String;
+.field private final bDp:Ljava/lang/String;
 
-.field private final bDv:I
+.field private final bDq:I
 
-.field private final bDw:I
+.field private final bDr: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;->bDk:Lorg/a/a/aa;
+    sput-object v0, Lorg/a/a/aa;->bDf: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;->bDl:Lorg/a/a/aa;
+    sput-object v0, Lorg/a/a/aa;->bDg: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;->bDm:Lorg/a/a/aa;
+    sput-object v0, Lorg/a/a/aa;->bDh: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;->bDn:Lorg/a/a/aa;
+    sput-object v0, Lorg/a/a/aa;->bDi: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;->bDo:Lorg/a/a/aa;
+    sput-object v0, Lorg/a/a/aa;->bDj: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;->bDp:Lorg/a/a/aa;
+    sput-object v0, Lorg/a/a/aa;->bDk: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;->bDq:Lorg/a/a/aa;
+    sput-object v0, Lorg/a/a/aa;->bDl: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;->bDr:Lorg/a/a/aa;
+    sput-object v0, Lorg/a/a/aa;->bDm: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;->bDs:Lorg/a/a/aa;
+    sput-object v0, Lorg/a/a/aa;->bDn: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;->bDt:I
+    iput p1, p0, Lorg/a/a/aa;->bDo:I
 
-    iput-object p2, p0, Lorg/a/a/aa;->bDu:Ljava/lang/String;
+    iput-object p2, p0, Lorg/a/a/aa;->bDp:Ljava/lang/String;
 
-    iput p3, p0, Lorg/a/a/aa;->bDv:I
+    iput p3, p0, Lorg/a/a/aa;->bDq:I
 
-    iput p4, p0, Lorg/a/a/aa;->bDw:I
+    iput p4, p0, Lorg/a/a/aa;->bDr:I
 
     return-void
 .end method
 
-.method private HZ()Lorg/a/a/aa;
+.method private HX()Lorg/a/a/aa;
     .locals 3
 
-    invoke-direct {p0}, Lorg/a/a/aa;->Ie()I
+    invoke-direct {p0}, Lorg/a/a/aa;->Ic()I
 
     move-result v0
 
-    iget-object v1, p0, Lorg/a/a/aa;->bDu:Ljava/lang/String;
+    iget-object v1, p0, Lorg/a/a/aa;->bDp:Ljava/lang/String;
 
-    iget v2, p0, Lorg/a/a/aa;->bDv:I
+    iget v2, p0, Lorg/a/a/aa;->bDq:I
 
     add-int/2addr v2, v0
 
-    iget v0, p0, Lorg/a/a/aa;->bDw:I
+    iget v0, p0, Lorg/a/a/aa;->bDr: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 Ie()I
+.method private Ic()I
     .locals 3
 
     const/4 v0, 0x1
 
     :goto_0
-    iget-object v1, p0, Lorg/a/a/aa;->bDu:Ljava/lang/String;
+    iget-object v1, p0, Lorg/a/a/aa;->bDp:Ljava/lang/String;
 
-    iget v2, p0, Lorg/a/a/aa;->bDv:I
+    iget v2, p0, Lorg/a/a/aa;->bDq:I
 
     add-int/2addr v2, v0
 
@@ -203,7 +203,7 @@
 
     if-ne p0, v0, :cond_0
 
-    sget-object p0, Lorg/a/a/aa;->bDp:Lorg/a/a/aa;
+    sget-object p0, Lorg/a/a/aa;->bDk:Lorg/a/a/aa;
 
     return-object p0
 
@@ -212,7 +212,7 @@
 
     if-ne p0, v0, :cond_1
 
-    sget-object p0, Lorg/a/a/aa;->bDk:Lorg/a/a/aa;
+    sget-object p0, Lorg/a/a/aa;->bDf:Lorg/a/a/aa;
 
     return-object p0
 
@@ -221,7 +221,7 @@
 
     if-ne p0, v0, :cond_2
 
-    sget-object p0, Lorg/a/a/aa;->bDl:Lorg/a/a/aa;
+    sget-object p0, Lorg/a/a/aa;->bDg:Lorg/a/a/aa;
 
     return-object p0
 
@@ -230,7 +230,7 @@
 
     if-ne p0, v0, :cond_3
 
-    sget-object p0, Lorg/a/a/aa;->bDn:Lorg/a/a/aa;
+    sget-object p0, Lorg/a/a/aa;->bDi:Lorg/a/a/aa;
 
     return-object p0
 
@@ -239,7 +239,7 @@
 
     if-ne p0, v0, :cond_4
 
-    sget-object p0, Lorg/a/a/aa;->bDm:Lorg/a/a/aa;
+    sget-object p0, Lorg/a/a/aa;->bDh:Lorg/a/a/aa;
 
     return-object p0
 
@@ -248,7 +248,7 @@
 
     if-ne p0, v0, :cond_5
 
-    sget-object p0, Lorg/a/a/aa;->bDo:Lorg/a/a/aa;
+    sget-object p0, Lorg/a/a/aa;->bDj:Lorg/a/a/aa;
 
     return-object p0
 
@@ -257,7 +257,7 @@
 
     if-ne p0, v0, :cond_6
 
-    sget-object p0, Lorg/a/a/aa;->bDs:Lorg/a/a/aa;
+    sget-object p0, Lorg/a/a/aa;->bDn:Lorg/a/a/aa;
 
     return-object p0
 
@@ -266,7 +266,7 @@
 
     if-ne p0, v0, :cond_7
 
-    sget-object p0, Lorg/a/a/aa;->bDq:Lorg/a/a/aa;
+    sget-object p0, Lorg/a/a/aa;->bDl:Lorg/a/a/aa;
 
     return-object p0
 
@@ -275,7 +275,7 @@
 
     if-ne p0, v0, :cond_8
 
-    sget-object p0, Lorg/a/a/aa;->bDr:Lorg/a/a/aa;
+    sget-object p0, Lorg/a/a/aa;->bDm:Lorg/a/a/aa;
 
     return-object p0
 
@@ -851,17 +851,17 @@
     throw p0
 
     :pswitch_0
-    sget-object p0, Lorg/a/a/aa;->bDs:Lorg/a/a/aa;
+    sget-object p0, Lorg/a/a/aa;->bDn:Lorg/a/a/aa;
 
     return-object p0
 
     :pswitch_1
-    sget-object p0, Lorg/a/a/aa;->bDm:Lorg/a/a/aa;
+    sget-object p0, Lorg/a/a/aa;->bDh:Lorg/a/a/aa;
 
     return-object p0
 
     :pswitch_2
-    sget-object p0, Lorg/a/a/aa;->bDn:Lorg/a/a/aa;
+    sget-object p0, Lorg/a/a/aa;->bDi:Lorg/a/a/aa;
 
     return-object p0
 
@@ -875,27 +875,27 @@
     return-object v0
 
     :cond_1
-    sget-object p0, Lorg/a/a/aa;->bDl:Lorg/a/a/aa;
+    sget-object p0, Lorg/a/a/aa;->bDg:Lorg/a/a/aa;
 
     return-object p0
 
     :cond_2
-    sget-object p0, Lorg/a/a/aa;->bDr:Lorg/a/a/aa;
+    sget-object p0, Lorg/a/a/aa;->bDm:Lorg/a/a/aa;
 
     return-object p0
 
     :cond_3
-    sget-object p0, Lorg/a/a/aa;->bDp:Lorg/a/a/aa;
-
-    return-object p0
-
-    :cond_4
     sget-object p0, Lorg/a/a/aa;->bDk:Lorg/a/a/aa;
 
     return-object p0
 
+    :cond_4
+    sget-object p0, Lorg/a/a/aa;->bDf:Lorg/a/a/aa;
+
+    return-object p0
+
     :cond_5
-    sget-object p0, Lorg/a/a/aa;->bDo:Lorg/a/a/aa;
+    sget-object p0, Lorg/a/a/aa;->bDj:Lorg/a/a/aa;
 
     return-object p0
 
@@ -913,7 +913,7 @@
     return-object v0
 
     :cond_7
-    sget-object p0, Lorg/a/a/aa;->bDq:Lorg/a/a/aa;
+    sget-object p0, Lorg/a/a/aa;->bDl:Lorg/a/a/aa;
 
     return-object p0
 
@@ -936,10 +936,10 @@
 
 
 # virtual methods
-.method public final Ia()Ljava/lang/String;
+.method public final HY()Ljava/lang/String;
     .locals 3
 
-    iget v0, p0, Lorg/a/a/aa;->bDt:I
+    iget v0, p0, Lorg/a/a/aa;->bDo:I
 
     packed-switch v0, :pswitch_data_0
 
@@ -951,11 +951,11 @@
     throw v0
 
     :pswitch_1
-    iget-object v0, p0, Lorg/a/a/aa;->bDu:Ljava/lang/String;
+    iget-object v0, p0, Lorg/a/a/aa;->bDp:Ljava/lang/String;
 
-    iget v1, p0, Lorg/a/a/aa;->bDv:I
+    iget v1, p0, Lorg/a/a/aa;->bDq:I
 
-    iget v2, p0, Lorg/a/a/aa;->bDw:I
+    iget v2, p0, Lorg/a/a/aa;->bDr: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;->HZ()Lorg/a/a/aa;
+    invoke-direct {p0}, Lorg/a/a/aa;->HX()Lorg/a/a/aa;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lorg/a/a/aa;->Ia()Ljava/lang/String;
+    invoke-virtual {v1}, Lorg/a/a/aa;->HY()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;->Ie()I
+    invoke-direct {p0}, Lorg/a/a/aa;->Ic()I
 
     move-result v1
 
@@ -1071,14 +1071,14 @@
     .end packed-switch
 .end method
 
-.method public final Ib()Ljava/lang/String;
+.method public final HZ()Ljava/lang/String;
     .locals 3
 
-    iget-object v0, p0, Lorg/a/a/aa;->bDu:Ljava/lang/String;
+    iget-object v0, p0, Lorg/a/a/aa;->bDp:Ljava/lang/String;
 
-    iget v1, p0, Lorg/a/a/aa;->bDv:I
+    iget v1, p0, Lorg/a/a/aa;->bDq:I
 
-    iget v2, p0, Lorg/a/a/aa;->bDw:I
+    iget v2, p0, Lorg/a/a/aa;->bDr: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 Ic()Ljava/lang/String;
+.method public final Ia()Ljava/lang/String;
     .locals 4
 
-    iget v0, p0, Lorg/a/a/aa;->bDt:I
+    iget v0, p0, Lorg/a/a/aa;->bDo:I
 
     const/16 v1, 0xa
 
     if-ne v0, v1, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/aa;->bDu:Ljava/lang/String;
+    iget-object v0, p0, Lorg/a/a/aa;->bDp:Ljava/lang/String;
 
-    iget v1, p0, Lorg/a/a/aa;->bDv:I
+    iget v1, p0, Lorg/a/a/aa;->bDq:I
 
     add-int/lit8 v1, v1, -0x1
 
-    iget v2, p0, Lorg/a/a/aa;->bDw:I
+    iget v2, p0, Lorg/a/a/aa;->bDr: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;->bDu:Ljava/lang/String;
+    iget-object v1, p0, Lorg/a/a/aa;->bDp:Ljava/lang/String;
 
-    iget v2, p0, Lorg/a/a/aa;->bDv:I
+    iget v2, p0, Lorg/a/a/aa;->bDq:I
 
-    iget v3, p0, Lorg/a/a/aa;->bDw:I
+    iget v3, p0, Lorg/a/a/aa;->bDr: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;->bDu:Ljava/lang/String;
+    iget-object v0, p0, Lorg/a/a/aa;->bDp:Ljava/lang/String;
 
-    iget v1, p0, Lorg/a/a/aa;->bDv:I
+    iget v1, p0, Lorg/a/a/aa;->bDq:I
 
-    iget v2, p0, Lorg/a/a/aa;->bDw:I
+    iget v2, p0, Lorg/a/a/aa;->bDr: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 Id()I
+.method public final Ib()I
     .locals 2
 
-    iget v0, p0, Lorg/a/a/aa;->bDt:I
+    iget v0, p0, Lorg/a/a/aa;->bDo: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;->bDt:I
+    iget v1, p0, Lorg/a/a/aa;->bDo:I
 
     const/16 v3, 0xa
 
@@ -1202,7 +1202,7 @@
     const/16 v1, 0xa
 
     :cond_2
-    iget v5, p1, Lorg/a/a/aa;->bDt:I
+    iget v5, p1, Lorg/a/a/aa;->bDo:I
 
     if-ne v5, v4, :cond_3
 
@@ -1217,13 +1217,13 @@
     return v2
 
     :cond_4
-    iget v1, p0, Lorg/a/a/aa;->bDv:I
+    iget v1, p0, Lorg/a/a/aa;->bDq:I
 
-    iget v3, p0, Lorg/a/a/aa;->bDw:I
+    iget v3, p0, Lorg/a/a/aa;->bDr:I
 
-    iget v4, p1, Lorg/a/a/aa;->bDv:I
+    iget v4, p1, Lorg/a/a/aa;->bDq:I
 
-    iget v5, p1, Lorg/a/a/aa;->bDw:I
+    iget v5, p1, Lorg/a/a/aa;->bDr: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;->bDu:Ljava/lang/String;
+    iget-object v5, p0, Lorg/a/a/aa;->bDp:Ljava/lang/String;
 
     invoke-virtual {v5, v1}, Ljava/lang/String;->charAt(I)C
 
     move-result v5
 
-    iget-object v6, p1, Lorg/a/a/aa;->bDu:Ljava/lang/String;
+    iget-object v6, p1, Lorg/a/a/aa;->bDp: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;->bDt:I
+    iget v0, p0, Lorg/a/a/aa;->bDo:I
 
     const/16 v1, 0xc
 
@@ -1278,20 +1278,20 @@
     :cond_0
     mul-int/lit8 v0, v0, 0xd
 
-    iget v1, p0, Lorg/a/a/aa;->bDt:I
+    iget v1, p0, Lorg/a/a/aa;->bDo:I
 
     const/16 v2, 0x9
 
     if-lt v1, v2, :cond_1
 
-    iget v1, p0, Lorg/a/a/aa;->bDv:I
+    iget v1, p0, Lorg/a/a/aa;->bDq:I
 
-    iget v2, p0, Lorg/a/a/aa;->bDw:I
+    iget v2, p0, Lorg/a/a/aa;->bDr:I
 
     :goto_0
     if-ge v1, v2, :cond_1
 
-    iget-object v3, p0, Lorg/a/a/aa;->bDu:Ljava/lang/String;
+    iget-object v3, p0, Lorg/a/a/aa;->bDp: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;->Ic()Ljava/lang/String;
+    invoke-virtual {p0}, Lorg/a/a/aa;->Ia()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 8579d7ef57..3b7fe5b8b3 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 bDx:[B
+.field private final bDs:[B
 
-.field private final bDy:I
+.field private final bDt:I
 
 
 # direct methods
@@ -15,9 +15,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lorg/a/a/ab;->bDx:[B
+    iput-object p1, p0, Lorg/a/a/ab;->bDs:[B
 
-    iput p2, p0, Lorg/a/a/ab;->bDy:I
+    iput p2, p0, Lorg/a/a/ab;->bDt:I
 
     return-void
 .end method
@@ -34,9 +34,9 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lorg/a/a/ab;->bDx:[B
+    iget-object v0, p0, Lorg/a/a/ab;->bDs:[B
 
-    iget p0, p0, Lorg/a/a/ab;->bDy:I
+    iget p0, p0, Lorg/a/a/ab;->bDt: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;->bDx:[B
+    iget-object v0, p0, Lorg/a/a/ab;->bDs:[B
 
-    iget v1, p0, Lorg/a/a/ab;->bDy:I
+    iget v1, p0, Lorg/a/a/ab;->bDt: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;->bDx:[B
+    iget-object v3, p0, Lorg/a/a/ab;->bDs:[B
 
-    iget v4, p0, Lorg/a/a/ab;->bDy:I
+    iget v4, p0, Lorg/a/a/ab;->bDt: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 803d9a482d..836bce267e 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 bzO:Lorg/a/a/z;
+.field private final bzJ:Lorg/a/a/z;
 
-.field private final bzP:Z
+.field private final bzK:Z
 
-.field private final bzQ:Lorg/a/a/d;
+.field private final bzL:Lorg/a/a/d;
 
-.field private final bzR:I
+.field private final bzM:I
 
-.field private bzS:I
+.field private bzN:I
 
-.field private final bzT:Lorg/a/a/b;
+.field private final bzO:Lorg/a/a/b;
 
-.field private bzU:Lorg/a/a/b;
+.field private bzP: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;->bzO:Lorg/a/a/z;
+    iput-object p1, p0, Lorg/a/a/b;->bzJ:Lorg/a/a/z;
 
-    iput-boolean p2, p0, Lorg/a/a/b;->bzP:Z
+    iput-boolean p2, p0, Lorg/a/a/b;->bzK:Z
 
-    iput-object p3, p0, Lorg/a/a/b;->bzQ:Lorg/a/a/d;
+    iput-object p3, p0, Lorg/a/a/b;->bzL: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;->bzR:I
+    iput p1, p0, Lorg/a/a/b;->bzM:I
 
-    iput-object p4, p0, Lorg/a/a/b;->bzT:Lorg/a/a/b;
+    iput-object p4, p0, Lorg/a/a/b;->bzO:Lorg/a/a/b;
 
     if-eqz p4, :cond_1
 
-    iput-object p0, p4, Lorg/a/a/b;->bzU:Lorg/a/a/b;
+    iput-object p0, p4, Lorg/a/a/b;->bzP: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;->HO()V
+    invoke-virtual {v0}, Lorg/a/a/b;->HM()V
 
     add-int/lit8 v2, v2, 0x1
 
-    iget-object v4, v0, Lorg/a/a/b;->bzT:Lorg/a/a/b;
+    iget-object v4, v0, Lorg/a/a/b;->bzO: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;->bzQ:Lorg/a/a/d;
+    iget-object v0, v4, Lorg/a/a/b;->bzL:Lorg/a/a/d;
 
     iget-object v0, v0, Lorg/a/a/d;->data:[B
 
-    iget-object v2, v4, Lorg/a/a/b;->bzQ:Lorg/a/a/d;
+    iget-object v2, v4, Lorg/a/a/b;->bzL: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;->bzU:Lorg/a/a/b;
+    iget-object v4, v4, Lorg/a/a/b;->bzP:Lorg/a/a/b;
 
     goto :goto_4
 
@@ -215,22 +215,22 @@
 
 
 # virtual methods
-.method public final HO()V
+.method public final HM()V
     .locals 4
 
-    iget v0, p0, Lorg/a/a/b;->bzR:I
+    iget v0, p0, Lorg/a/a/b;->bzM:I
 
     const/4 v1, -0x1
 
     if-eq v0, v1, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/b;->bzQ:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/b;->bzL:Lorg/a/a/d;
 
     iget-object v0, v0, Lorg/a/a/d;->data:[B
 
-    iget v1, p0, Lorg/a/a/b;->bzR:I
+    iget v1, p0, Lorg/a/a/b;->bzM:I
 
-    iget v2, p0, Lorg/a/a/b;->bzS:I
+    iget v2, p0, Lorg/a/a/b;->bzN: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;->HO()V
+    invoke-virtual {v2}, Lorg/a/a/b;->HM()V
 
-    iget-object v4, v2, Lorg/a/a/b;->bzQ:Lorg/a/a/d;
+    iget-object v4, v2, Lorg/a/a/b;->bzL: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;->bzT:Lorg/a/a/b;
+    iget-object v4, v2, Lorg/a/a/b;->bzO: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;->bzQ:Lorg/a/a/d;
+    iget-object p1, v4, Lorg/a/a/b;->bzL:Lorg/a/a/d;
 
     iget-object p1, p1, Lorg/a/a/d;->data:[B
 
-    iget-object v1, v4, Lorg/a/a/b;->bzQ:Lorg/a/a/d;
+    iget-object v1, v4, Lorg/a/a/b;->bzL: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;->bzU:Lorg/a/a/b;
+    iget-object v4, v4, Lorg/a/a/b;->bzP: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;->bzS:I
+    iget v0, p0, Lorg/a/a/b;->bzN:I
 
     add-int/lit8 v0, v0, 0x1
 
-    iput v0, p0, Lorg/a/a/b;->bzS:I
+    iput v0, p0, Lorg/a/a/b;->bzN:I
 
-    iget-boolean v0, p0, Lorg/a/a/b;->bzP:Z
+    iget-boolean v0, p0, Lorg/a/a/b;->bzK:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/b;->bzQ:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/b;->bzL:Lorg/a/a/d;
 
-    iget-object v1, p0, Lorg/a/a/b;->bzO:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/b;->bzJ: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;->bzQ:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/b;->bzL:Lorg/a/a/d;
 
     const/16 v0, 0x40
 
-    iget-object v1, p0, Lorg/a/a/b;->bzO:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/b;->bzJ: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;->bzO:Lorg/a/a/z;
+    iget-object p2, p0, Lorg/a/a/b;->bzJ:Lorg/a/a/z;
 
-    iget-object v0, p0, Lorg/a/a/b;->bzQ:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/b;->bzL: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;->bzS:I
+    iget v0, p0, Lorg/a/a/b;->bzN:I
 
     add-int/lit8 v0, v0, 0x1
 
-    iput v0, p0, Lorg/a/a/b;->bzS:I
+    iput v0, p0, Lorg/a/a/b;->bzN:I
 
-    iget-boolean v0, p0, Lorg/a/a/b;->bzP:Z
+    iget-boolean v0, p0, Lorg/a/a/b;->bzK:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/b;->bzQ:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/b;->bzL:Lorg/a/a/d;
 
-    iget-object v1, p0, Lorg/a/a/b;->bzO:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/b;->bzJ: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;->bzQ:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/b;->bzL: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;->bzO:Lorg/a/a/z;
+    iget-object v0, p0, Lorg/a/a/b;->bzJ:Lorg/a/a/z;
 
-    iget-object v2, p0, Lorg/a/a/b;->bzQ:Lorg/a/a/d;
+    iget-object v2, p0, Lorg/a/a/b;->bzL: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;->bzO:Lorg/a/a/z;
+    iget-object v0, p0, Lorg/a/a/b;->bzJ: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;->bzQ:Lorg/a/a/d;
+    iget-object v1, p1, Lorg/a/a/b;->bzL: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;->bzT:Lorg/a/a/b;
+    iget-object p1, p1, Lorg/a/a/b;->bzO: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;->bzS:I
+    iget v0, p0, Lorg/a/a/b;->bzN:I
 
     add-int/lit8 v0, v0, 0x1
 
-    iput v0, p0, Lorg/a/a/b;->bzS:I
+    iput v0, p0, Lorg/a/a/b;->bzN:I
 
-    iget-boolean v0, p0, Lorg/a/a/b;->bzP:Z
+    iget-boolean v0, p0, Lorg/a/a/b;->bzK:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/b;->bzQ:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/b;->bzL:Lorg/a/a/d;
 
-    iget-object v1, p0, Lorg/a/a/b;->bzO:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/b;->bzJ: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;->bzQ:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/b;->bzL:Lorg/a/a/d;
 
     const/16 v0, 0x65
 
-    iget-object v1, p0, Lorg/a/a/b;->bzO:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/b;->bzJ: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;->bzO:Lorg/a/a/z;
+    iget-object p2, p0, Lorg/a/a/b;->bzJ: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;->bzS:I
+    iget v0, p0, Lorg/a/a/b;->bzN:I
 
     add-int/lit8 v0, v0, 0x1
 
-    iput v0, p0, Lorg/a/a/b;->bzS:I
+    iput v0, p0, Lorg/a/a/b;->bzN:I
 
-    iget-boolean v0, p0, Lorg/a/a/b;->bzP:Z
+    iget-boolean v0, p0, Lorg/a/a/b;->bzK:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/b;->bzQ:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/b;->bzL:Lorg/a/a/d;
 
-    iget-object v1, p0, Lorg/a/a/b;->bzO:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/b;->bzJ: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;->bzQ:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/b;->bzL:Lorg/a/a/d;
 
     const/16 v0, 0x73
 
-    iget-object v1, p0, Lorg/a/a/b;->bzO:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/b;->bzJ: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;->bzQ:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/b;->bzL:Lorg/a/a/d;
 
-    iget-object v2, p0, Lorg/a/a/b;->bzO:Lorg/a/a/z;
+    iget-object v2, p0, Lorg/a/a/b;->bzJ: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;->bzQ:Lorg/a/a/d;
+    iget-object p2, p0, Lorg/a/a/b;->bzL:Lorg/a/a/d;
 
-    iget-object v0, p0, Lorg/a/a/b;->bzO:Lorg/a/a/z;
+    iget-object v0, p0, Lorg/a/a/b;->bzJ: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;->bzQ:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/b;->bzL:Lorg/a/a/d;
 
-    iget-object v0, p0, Lorg/a/a/b;->bzO:Lorg/a/a/z;
+    iget-object v0, p0, Lorg/a/a/b;->bzJ: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;->bzQ:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/b;->bzL:Lorg/a/a/d;
 
-    iget-object v0, p0, Lorg/a/a/b;->bzO:Lorg/a/a/z;
+    iget-object v0, p0, Lorg/a/a/b;->bzJ: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;->bzQ:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/b;->bzL:Lorg/a/a/d;
 
     const/16 v0, 0x63
 
-    iget-object v1, p0, Lorg/a/a/b;->bzO:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/b;->bzJ:Lorg/a/a/z;
 
     check-cast p2, Lorg/a/a/aa;
 
-    invoke-virtual {p2}, Lorg/a/a/aa;->Ic()Ljava/lang/String;
+    invoke-virtual {p2}, Lorg/a/a/aa;->Ia()Ljava/lang/String;
 
     move-result-object p2
 
@@ -688,7 +688,7 @@
 
     check-cast p2, [B
 
-    iget-object p1, p0, Lorg/a/a/b;->bzQ:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/b;->bzL: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;->bzQ:Lorg/a/a/d;
+    iget-object v3, p0, Lorg/a/a/b;->bzL:Lorg/a/a/d;
 
-    iget-object v4, p0, Lorg/a/a/b;->bzO:Lorg/a/a/z;
+    iget-object v4, p0, Lorg/a/a/b;->bzJ: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;->bzQ:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/b;->bzL: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;->bzQ:Lorg/a/a/d;
+    iget-object v3, p0, Lorg/a/a/b;->bzL:Lorg/a/a/d;
 
-    iget-object v4, p0, Lorg/a/a/b;->bzO:Lorg/a/a/z;
+    iget-object v4, p0, Lorg/a/a/b;->bzJ: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;->bzQ:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/b;->bzL: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;->bzQ:Lorg/a/a/d;
+    iget-object v2, p0, Lorg/a/a/b;->bzL:Lorg/a/a/d;
 
-    iget-object v3, p0, Lorg/a/a/b;->bzO:Lorg/a/a/z;
+    iget-object v3, p0, Lorg/a/a/b;->bzJ: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;->bzQ:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/b;->bzL: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;->bzQ:Lorg/a/a/d;
+    iget-object v2, p0, Lorg/a/a/b;->bzL:Lorg/a/a/d;
 
-    iget-object v4, p0, Lorg/a/a/b;->bzO:Lorg/a/a/z;
+    iget-object v4, p0, Lorg/a/a/b;->bzJ: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;->bzQ:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/b;->bzL:Lorg/a/a/d;
 
     array-length v0, p2
 
@@ -865,11 +865,11 @@
 
     aget v0, p2, v5
 
-    iget-object v2, p0, Lorg/a/a/b;->bzQ:Lorg/a/a/d;
+    iget-object v2, p0, Lorg/a/a/b;->bzL:Lorg/a/a/d;
 
     const/16 v3, 0x49
 
-    iget-object v4, p0, Lorg/a/a/b;->bzO:Lorg/a/a/z;
+    iget-object v4, p0, Lorg/a/a/b;->bzJ: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;->bzQ:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/b;->bzL: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;->bzQ:Lorg/a/a/d;
+    iget-object v2, p0, Lorg/a/a/b;->bzL:Lorg/a/a/d;
 
     const/16 v3, 0x4a
 
-    iget-object v4, p0, Lorg/a/a/b;->bzO:Lorg/a/a/z;
+    iget-object v4, p0, Lorg/a/a/b;->bzJ:Lorg/a/a/z;
 
     const/4 v6, 0x5
 
@@ -940,7 +940,7 @@
 
     check-cast p2, [F
 
-    iget-object p1, p0, Lorg/a/a/b;->bzQ:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/b;->bzL:Lorg/a/a/d;
 
     array-length v0, p2
 
@@ -953,11 +953,11 @@
 
     aget v0, p2, v5
 
-    iget-object v1, p0, Lorg/a/a/b;->bzQ:Lorg/a/a/d;
+    iget-object v1, p0, Lorg/a/a/b;->bzL:Lorg/a/a/d;
 
     const/16 v2, 0x46
 
-    iget-object v3, p0, Lorg/a/a/b;->bzO:Lorg/a/a/z;
+    iget-object v3, p0, Lorg/a/a/b;->bzJ: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;->bzQ:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/b;->bzL: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;->bzQ:Lorg/a/a/d;
+    iget-object v2, p0, Lorg/a/a/b;->bzL:Lorg/a/a/d;
 
     const/16 v3, 0x44
 
-    iget-object v4, p0, Lorg/a/a/b;->bzO:Lorg/a/a/z;
+    iget-object v4, p0, Lorg/a/a/b;->bzJ: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;->bzO:Lorg/a/a/z;
+    iget-object p1, p0, Lorg/a/a/b;->bzJ: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;->bzQ:Lorg/a/a/d;
+    iget-object p2, p0, Lorg/a/a/b;->bzL:Lorg/a/a/d;
 
-    iget v0, p1, Lorg/a/a/y;->bBo:I
+    iget v0, p1, Lorg/a/a/y;->bBj: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 fbc88bb242..2b63a56b90 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 bzW:[Lorg/a/a/c;
+.field bzR:[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;->bzW:[Lorg/a/a/c;
+    iput-object v0, p0, Lorg/a/a/c$a;->bzR:[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;->bzW:[Lorg/a/a/c;
+    iget-object v2, p0, Lorg/a/a/c$a;->bzR:[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;->bzW:[Lorg/a/a/c;
+    iget-object v2, p0, Lorg/a/a/c$a;->bzR:[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;->bzW:[Lorg/a/a/c;
+    iput-object v3, p0, Lorg/a/a/c$a;->bzR:[Lorg/a/a/c;
 
     :cond_2
-    iget-object v0, p0, Lorg/a/a/c$a;->bzW:[Lorg/a/a/c;
+    iget-object v0, p0, Lorg/a/a/c$a;->bzR:[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;->bzV:Lorg/a/a/c;
+    iget-object p1, p1, Lorg/a/a/c;->bzQ: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 70f2f26753..c1e1c2f77a 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 aJu:[B
+.field private aJq:[B
 
-.field bzV:Lorg/a/a/c;
+.field bzQ:Lorg/a/a/c;
 
 .field public final type:Ljava/lang/String;
 
@@ -30,12 +30,12 @@
     return-void
 .end method
 
-.method private HP()Lorg/a/a/d;
+.method private HN()Lorg/a/a/d;
     .locals 2
 
     new-instance v0, Lorg/a/a/d;
 
-    iget-object v1, p0, Lorg/a/a/c;->aJu:[B
+    iget-object v1, p0, Lorg/a/a/c;->aJq:[B
 
     invoke-direct {v0, v1}, Lorg/a/a/d;-><init>([B)V
 
@@ -44,7 +44,7 @@
 
 
 # virtual methods
-.method final HQ()I
+.method final HO()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;->bzV:Lorg/a/a/c;
+    iget-object v0, v0, Lorg/a/a/c;->bzQ: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;->HP()Lorg/a/a/d;
+    invoke-direct {v0}, Lorg/a/a/c;->HN()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;->bzV:Lorg/a/a/c;
+    iget-object v0, v0, Lorg/a/a/c;->bzQ:Lorg/a/a/c;
 
     goto :goto_0
 
@@ -111,11 +111,11 @@
 
     new-array v1, p3, [B
 
-    iput-object v1, v0, Lorg/a/a/c;->aJu:[B
+    iput-object v1, v0, Lorg/a/a/c;->aJq:[B
 
-    iget-object p1, p1, Lorg/a/a/e;->bzX:[B
+    iget-object p1, p1, Lorg/a/a/e;->bzS:[B
 
-    iget-object v1, v0, Lorg/a/a/c;->aJu:[B
+    iget-object v1, v0, Lorg/a/a/c;->aJq:[B
 
     const/4 v2, 0x0
 
@@ -132,7 +132,7 @@
     :goto_0
     if-eqz v0, :cond_0
 
-    invoke-direct {v0}, Lorg/a/a/c;->HP()Lorg/a/a/d;
+    invoke-direct {v0}, Lorg/a/a/c;->HN()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;->bzV:Lorg/a/a/c;
+    iget-object v0, v0, Lorg/a/a/c;->bzQ: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 1d08223784..fae7be0ef5 100644
--- a/com.discord/smali_classes2/org/a/a/e.smali
+++ b/com.discord/smali_classes2/org/a/a/e.smali
@@ -4,19 +4,19 @@
 
 
 # instance fields
-.field private final bAa:[Lorg/a/a/i;
+.field public final bzS:[B
 
-.field private final bAb:[I
+.field final bzT:[I
 
-.field public final bAc:I
+.field private final bzU:[Ljava/lang/String;
 
-.field public final bzX:[B
+.field private final bzV:[Lorg/a/a/i;
 
-.field final bzY:[I
+.field private final bzW:[I
 
-.field private final bzZ:[Ljava/lang/String;
+.field public final bzX:I
 
-.field final pv:I
+.field final pw:I
 
 
 # direct methods
@@ -25,7 +25,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lorg/a/a/e;->bzX:[B
+    iput-object p1, p0, Lorg/a/a/e;->bzS:[B
 
     const/16 v0, 0x8
 
@@ -35,11 +35,11 @@
 
     new-array v1, v0, [I
 
-    iput-object v1, p0, Lorg/a/a/e;->bzY:[I
+    iput-object v1, p0, Lorg/a/a/e;->bzT:[I
 
     new-array v1, v0, [Ljava/lang/String;
 
-    iput-object v1, p0, Lorg/a/a/e;->bzZ:[Ljava/lang/String;
+    iput-object v1, p0, Lorg/a/a/e;->bzU:[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;->bzY:[I
+    iget-object v7, p0, Lorg/a/a/e;->bzT:[I
 
     add-int/lit8 v8, v1, 0x1
 
@@ -139,9 +139,9 @@
     goto :goto_0
 
     :cond_1
-    iput v3, p0, Lorg/a/a/e;->pv:I
+    iput v3, p0, Lorg/a/a/e;->pw:I
 
-    iput v4, p0, Lorg/a/a/e;->bAc:I
+    iput v4, p0, Lorg/a/a/e;->bzX:I
 
     const/4 p1, 0x0
 
@@ -155,7 +155,7 @@
     move-object v0, p1
 
     :goto_4
-    iput-object v0, p0, Lorg/a/a/e;->bAa:[Lorg/a/a/i;
+    iput-object v0, p0, Lorg/a/a/e;->bzV:[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;->bAb:[I
+    iput-object p1, p0, Lorg/a/a/e;->bzW:[I
 
     return-void
 
@@ -197,10 +197,10 @@
     .end packed-switch
 .end method
 
-.method private HR()I
+.method private HP()I
     .locals 4
 
-    iget v0, p0, Lorg/a/a/e;->bAc:I
+    iget v0, p0, Lorg/a/a/e;->bzX: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;->bAI:[C
+    iget-object v6, p4, Lorg/a/a/j;->bAD:[C
 
-    iget-object v7, p4, Lorg/a/a/j;->bAM:[Lorg/a/a/r;
+    iget-object v7, p4, Lorg/a/a/j;->bAH:[Lorg/a/a/r;
 
     const/16 v0, 0xff
 
     if-eqz p2, :cond_0
 
-    iget-object p2, p0, Lorg/a/a/e;->bzX:[B
+    iget-object p2, p0, Lorg/a/a/e;->bzS:[B
 
     add-int/lit8 v1, p1, 0x1
 
@@ -331,7 +331,7 @@
     :cond_0
     const/4 p2, -0x1
 
-    iput p2, p4, Lorg/a/a/j;->bAS:I
+    iput p2, p4, Lorg/a/a/j;->bAN:I
 
     move v1, p1
 
@@ -340,7 +340,7 @@
     :goto_0
     const/4 p2, 0x0
 
-    iput p2, p4, Lorg/a/a/j;->bAV:I
+    iput p2, p4, Lorg/a/a/j;->bAQ:I
 
     const/4 v2, 0x3
 
@@ -350,9 +350,9 @@
 
     if-ge p1, v3, :cond_1
 
-    iput v2, p4, Lorg/a/a/j;->bAT:I
+    iput v2, p4, Lorg/a/a/j;->bAO:I
 
-    iput p2, p4, Lorg/a/a/j;->bAX:I
+    iput p2, p4, Lorg/a/a/j;->bAS:I
 
     :goto_1
     move v10, p1
@@ -368,7 +368,7 @@
 
     add-int/lit8 p1, p1, -0x40
 
-    iget-object v2, p4, Lorg/a/a/j;->bAY:[Ljava/lang/Object;
+    iget-object v2, p4, Lorg/a/a/j;->bAT:[Ljava/lang/Object;
 
     const/4 v3, 0x0
 
@@ -382,9 +382,9 @@
 
     move-result v1
 
-    iput v9, p4, Lorg/a/a/j;->bAT:I
+    iput v9, p4, Lorg/a/a/j;->bAO:I
 
-    iput v8, p4, Lorg/a/a/j;->bAX:I
+    iput v8, p4, Lorg/a/a/j;->bAS:I
 
     goto :goto_1
 
@@ -401,7 +401,7 @@
 
     if-ne p1, v3, :cond_3
 
-    iget-object v2, p4, Lorg/a/a/j;->bAY:[Ljava/lang/Object;
+    iget-object v2, p4, Lorg/a/a/j;->bAT:[Ljava/lang/Object;
 
     const/4 v3, 0x0
 
@@ -415,9 +415,9 @@
 
     move-result v1
 
-    iput v9, p4, Lorg/a/a/j;->bAT:I
+    iput v9, p4, Lorg/a/a/j;->bAO:I
 
-    iput v8, p4, Lorg/a/a/j;->bAX:I
+    iput v8, p4, Lorg/a/a/j;->bAS:I
 
     goto/16 :goto_6
 
@@ -432,30 +432,30 @@
 
     if-ge p1, v4, :cond_4
 
-    iput v9, p4, Lorg/a/a/j;->bAT:I
+    iput v9, p4, Lorg/a/a/j;->bAO:I
 
     sub-int/2addr v4, p1
 
-    iput v4, p4, Lorg/a/a/j;->bAV:I
+    iput v4, p4, Lorg/a/a/j;->bAQ:I
 
-    iget p1, p4, Lorg/a/a/j;->bAU:I
+    iget p1, p4, Lorg/a/a/j;->bAP:I
 
-    iget p3, p4, Lorg/a/a/j;->bAV:I
+    iget p3, p4, Lorg/a/a/j;->bAQ:I
 
     sub-int/2addr p1, p3
 
-    iput p1, p4, Lorg/a/a/j;->bAU:I
+    iput p1, p4, Lorg/a/a/j;->bAP:I
 
-    iput p2, p4, Lorg/a/a/j;->bAX:I
+    iput p2, p4, Lorg/a/a/j;->bAS:I
 
     goto/16 :goto_6
 
     :cond_4
     if-ne p1, v4, :cond_5
 
-    iput v2, p4, Lorg/a/a/j;->bAT:I
+    iput v2, p4, Lorg/a/a/j;->bAO:I
 
-    iput p2, p4, Lorg/a/a/j;->bAX:I
+    iput p2, p4, Lorg/a/a/j;->bAS:I
 
     goto/16 :goto_6
 
@@ -464,7 +464,7 @@
 
     if-eqz p3, :cond_6
 
-    iget p3, p4, Lorg/a/a/j;->bAU:I
+    iget p3, p4, Lorg/a/a/j;->bAP:I
 
     goto :goto_2
 
@@ -481,7 +481,7 @@
     :goto_3
     if-lez p3, :cond_7
 
-    iget-object v2, p4, Lorg/a/a/j;->bAW:[Ljava/lang/Object;
+    iget-object v2, p4, Lorg/a/a/j;->bAR:[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;->bAT:I
+    iput v8, p4, Lorg/a/a/j;->bAO:I
 
-    iput p1, p4, Lorg/a/a/j;->bAV:I
+    iput p1, p4, Lorg/a/a/j;->bAQ:I
 
-    iget p1, p4, Lorg/a/a/j;->bAU:I
+    iget p1, p4, Lorg/a/a/j;->bAP:I
 
-    iget p3, p4, Lorg/a/a/j;->bAV:I
+    iget p3, p4, Lorg/a/a/j;->bAQ:I
 
     add-int/2addr p1, p3
 
-    iput p1, p4, Lorg/a/a/j;->bAU:I
+    iput p1, p4, Lorg/a/a/j;->bAP:I
 
-    iput p2, p4, Lorg/a/a/j;->bAX:I
+    iput p2, p4, Lorg/a/a/j;->bAS:I
 
     goto :goto_6
 
@@ -525,18 +525,18 @@
 
     add-int/lit8 v1, v1, 0x2
 
-    iput p2, p4, Lorg/a/a/j;->bAT:I
+    iput p2, p4, Lorg/a/a/j;->bAO:I
 
-    iput p1, p4, Lorg/a/a/j;->bAV:I
+    iput p1, p4, Lorg/a/a/j;->bAQ:I
 
-    iput p1, p4, Lorg/a/a/j;->bAU:I
+    iput p1, p4, Lorg/a/a/j;->bAP:I
 
     const/4 p3, 0x0
 
     :goto_4
     if-ge p3, p1, :cond_9
 
-    iget-object v2, p4, Lorg/a/a/j;->bAW:[Ljava/lang/Object;
+    iget-object v2, p4, Lorg/a/a/j;->bAR:[Ljava/lang/Object;
 
     move-object v0, p0
 
@@ -561,12 +561,12 @@
 
     add-int/2addr v1, v9
 
-    iput p1, p4, Lorg/a/a/j;->bAX:I
+    iput p1, p4, Lorg/a/a/j;->bAS:I
 
     :goto_5
     if-ge p2, p1, :cond_a
 
-    iget-object v2, p4, Lorg/a/a/j;->bAY:[Ljava/lang/Object;
+    iget-object v2, p4, Lorg/a/a/j;->bAT:[Ljava/lang/Object;
 
     move-object v0, p0
 
@@ -586,15 +586,15 @@
 
     :cond_a
     :goto_6
-    iget p1, p4, Lorg/a/a/j;->bAS:I
+    iget p1, p4, Lorg/a/a/j;->bAN:I
 
     add-int/2addr v10, v8
 
     add-int/2addr p1, v10
 
-    iput p1, p4, Lorg/a/a/j;->bAS:I
+    iput p1, p4, Lorg/a/a/j;->bAN:I
 
-    iget p1, p4, Lorg/a/a/j;->bAS:I
+    iget p1, p4, Lorg/a/a/j;->bAN: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;->bzX:[B
+    iget-object v0, p0, Lorg/a/a/e;->bzS:[B
 
     add-int/lit8 v1, p1, 0x1
 
@@ -659,52 +659,52 @@
     goto :goto_1
 
     :pswitch_2
-    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;->bCW:Ljava/lang/Integer;
-
-    aput-object p1, p2, p3
-
-    goto :goto_1
-
-    :pswitch_4
-    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;->bCU:Ljava/lang/Integer;
-
-    aput-object p1, p2, p3
-
-    goto :goto_1
-
-    :pswitch_6
-    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;->bCS:Ljava/lang/Integer;
 
     aput-object p1, p2, p3
 
     goto :goto_1
 
-    :pswitch_8
+    :pswitch_3
     sget-object p1, Lorg/a/a/x;->bCR:Ljava/lang/Integer;
 
     aput-object p1, p2, p3
 
+    goto :goto_1
+
+    :pswitch_4
+    sget-object p1, Lorg/a/a/x;->bCQ:Ljava/lang/Integer;
+
+    aput-object p1, p2, p3
+
+    goto :goto_1
+
+    :pswitch_5
+    sget-object p1, Lorg/a/a/x;->bCP:Ljava/lang/Integer;
+
+    aput-object p1, p2, p3
+
+    goto :goto_1
+
+    :pswitch_6
+    sget-object p1, Lorg/a/a/x;->bCO:Ljava/lang/Integer;
+
+    aput-object p1, p2, p3
+
+    goto :goto_1
+
+    :pswitch_7
+    sget-object p1, Lorg/a/a/x;->bCN:Ljava/lang/Integer;
+
+    aput-object p1, p2, p3
+
+    goto :goto_1
+
+    :pswitch_8
+    sget-object p1, Lorg/a/a/x;->bCM:Ljava/lang/Integer;
+
+    aput-object p1, p2, p3
+
     :goto_1
     return v1
 
@@ -737,7 +737,7 @@
 
     if-nez p1, :cond_3
 
-    iget-object p1, p0, Lorg/a/a/e;->bzX:[B
+    iget-object p1, p0, Lorg/a/a/e;->bzS:[B
 
     aget-byte p1, p1, p2
 
@@ -779,7 +779,7 @@
     return p1
 
     :cond_3
-    iget-object v5, p0, Lorg/a/a/e;->bzX:[B
+    iget-object v5, p0, Lorg/a/a/e;->bzS:[B
 
     add-int/lit8 v6, p2, 0x1
 
@@ -830,7 +830,7 @@
     throw p1
 
     :pswitch_0
-    iget-object p2, p0, Lorg/a/a/e;->bzY:[I
+    iget-object p2, p0, Lorg/a/a/e;->bzT:[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;->bzY:[I
+    iget-object p2, p0, Lorg/a/a/e;->bzT:[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;->bzX:[B
+    iget-object v0, p0, Lorg/a/a/e;->bzS:[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;->bzY:[I
+    iget-object v0, p0, Lorg/a/a/e;->bzT:[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;->bzY:[I
+    iget-object v0, p0, Lorg/a/a/e;->bzT:[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;->bzY:[I
+    iget-object v0, p0, Lorg/a/a/e;->bzT:[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;->bzY:[I
+    iget-object v0, p0, Lorg/a/a/e;->bzT:[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;->bzY:[I
+    iget-object v0, p0, Lorg/a/a/e;->bzT:[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;->bzY:[I
+    iget-object v1, p0, Lorg/a/a/e;->bzT:[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;->bzY:[I
+    iget-object v0, p0, Lorg/a/a/e;->bzT:[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;->bzY:[I
+    iget-object v0, p0, Lorg/a/a/e;->bzT:[I
 
     add-int/lit8 v1, v6, 0x1
 
@@ -1221,7 +1221,7 @@
     goto :goto_b
 
     :cond_14
-    iget-object p2, p0, Lorg/a/a/e;->bzY:[I
+    iget-object p2, p0, Lorg/a/a/e;->bzT:[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;->bzY:[I
+    iget-object p2, p0, Lorg/a/a/e;->bzT:[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;->HO()V
+    invoke-virtual {p1}, Lorg/a/a/a;->HM()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;->bAP:[Lorg/a/a/r;
+    iput-object v3, p1, Lorg/a/a/j;->bAK:[Lorg/a/a/r;
 
     new-array v3, v1, [Lorg/a/a/r;
 
-    iput-object v3, p1, Lorg/a/a/j;->bAQ:[Lorg/a/a/r;
+    iput-object v3, p1, Lorg/a/a/j;->bAL:[Lorg/a/a/r;
 
     new-array v3, v1, [I
 
-    iput-object v3, p1, Lorg/a/a/j;->bAR:[I
+    iput-object v3, p1, Lorg/a/a/j;->bAM:[I
 
     const/4 v3, 0x0
 
@@ -1498,9 +1498,9 @@
 
     add-int/lit8 p2, p2, 0x6
 
-    iget-object v7, p1, Lorg/a/a/j;->bAP:[Lorg/a/a/r;
+    iget-object v7, p1, Lorg/a/a/j;->bAK:[Lorg/a/a/r;
 
-    iget-object v8, p1, Lorg/a/a/j;->bAM:[Lorg/a/a/r;
+    iget-object v8, p1, Lorg/a/a/j;->bAH:[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;->bAQ:[Lorg/a/a/r;
+    iget-object v7, p1, Lorg/a/a/j;->bAL:[Lorg/a/a/r;
 
     add-int/2addr v4, v5
 
-    iget-object v5, p1, Lorg/a/a/j;->bAM:[Lorg/a/a/r;
+    iget-object v5, p1, Lorg/a/a/j;->bAH:[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;->bAR:[I
+    iget-object v4, p1, Lorg/a/a/j;->bAM:[I
 
     aput v6, v4, v3
 
@@ -1553,7 +1553,7 @@
 
     :cond_1
     :goto_2
-    iput v0, p1, Lorg/a/a/j;->bAN:I
+    iput v0, p1, Lorg/a/a/j;->bAI: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;->bzX:[B
+    iget-object v3, p0, Lorg/a/a/e;->bzS:[B
 
     invoke-direct {v1, v3, p2}, Lorg/a/a/ab;-><init>([BI)V
 
     :goto_3
-    iput-object v1, p1, Lorg/a/a/j;->bAO:Lorg/a/a/ab;
+    iput-object v1, p1, Lorg/a/a/j;->bAJ: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;->bzX:[B
+    iget-object v0, p0, Lorg/a/a/e;->bzS:[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;->bAL:Ljava/lang/String;
+    iget-object v0, p1, Lorg/a/a/j;->bAG:Ljava/lang/String;
 
-    iget-object v1, p1, Lorg/a/a/j;->bAW:[Ljava/lang/Object;
+    iget-object v1, p1, Lorg/a/a/j;->bAR:[Ljava/lang/Object;
 
-    iget v2, p1, Lorg/a/a/j;->bAJ:I
+    iget v2, p1, Lorg/a/a/j;->bAE:I
 
     and-int/lit8 v2, v2, 0x8
 
@@ -1866,7 +1866,7 @@
 
     if-nez v2, :cond_1
 
-    iget-object v2, p1, Lorg/a/a/j;->bAK:Ljava/lang/String;
+    iget-object v2, p1, Lorg/a/a/j;->bAF:Ljava/lang/String;
 
     const-string v5, "<init>"
 
@@ -1876,18 +1876,18 @@
 
     if-eqz v2, :cond_0
 
-    sget-object v2, Lorg/a/a/x;->bCX:Ljava/lang/Integer;
+    sget-object v2, Lorg/a/a/x;->bCS:Ljava/lang/Integer;
 
     aput-object v2, v1, v3
 
     goto :goto_0
 
     :cond_0
-    iget v2, p0, Lorg/a/a/e;->bAc:I
+    iget v2, p0, Lorg/a/a/e;->bzX:I
 
     add-int/lit8 v2, v2, 0x2
 
-    iget-object v5, p1, Lorg/a/a/j;->bAI:[C
+    iget-object v5, p1, Lorg/a/a/j;->bAD:[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;->bAU:I
+    iput v3, p1, Lorg/a/a/j;->bAP:I
 
     return-void
 
     :pswitch_0
     add-int/lit8 v2, v3, 0x1
 
-    sget-object v6, Lorg/a/a/x;->bCU:Ljava/lang/Integer;
+    sget-object v6, Lorg/a/a/x;->bCP: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;->bCV:Ljava/lang/Integer;
+    sget-object v6, Lorg/a/a/x;->bCQ: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;->bCS:Ljava/lang/Integer;
+    sget-object v6, Lorg/a/a/x;->bCN: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;->bCT:Ljava/lang/Integer;
+    sget-object v6, Lorg/a/a/x;->bCO:Ljava/lang/Integer;
 
     aput-object v6, v1, v3
 
@@ -2083,9 +2083,9 @@
 
     move/from16 v1, p3
 
-    iget-object v7, v0, Lorg/a/a/e;->bzX:[B
+    iget-object v7, v0, Lorg/a/a/e;->bzS:[B
 
-    iget-object v11, v10, Lorg/a/a/j;->bAI:[C
+    iget-object v11, v10, Lorg/a/a/j;->bAD:[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;->bAM:[Lorg/a/a/r;
+    iput-object v5, v10, Lorg/a/a/j;->bAH:[Lorg/a/a/r;
 
     move v1, v15
 
@@ -2370,7 +2370,7 @@
 
     move/from16 v18, v3
 
-    iget-object v3, v0, Lorg/a/a/e;->bzY:[I
+    iget-object v3, v0, Lorg/a/a/e;->bzT:[I
 
     move/from16 v19, v6
 
@@ -2452,7 +2452,7 @@
 
     if-eqz v3, :cond_7
 
-    iget v2, v10, Lorg/a/a/j;->bAH:I
+    iget v2, v10, Lorg/a/a/j;->bAC:I
 
     and-int/lit8 v2, v2, 0x2
 
@@ -2535,7 +2535,7 @@
 
     if-eqz v3, :cond_a
 
-    iget v2, v10, Lorg/a/a/j;->bAH:I
+    iget v2, v10, Lorg/a/a/j;->bAC:I
 
     and-int/lit8 v2, v2, 0x2
 
@@ -2625,7 +2625,7 @@
 
     if-eqz v11, :cond_d
 
-    iget v2, v10, Lorg/a/a/j;->bAH:I
+    iget v2, v10, Lorg/a/a/j;->bAC:I
 
     and-int/lit8 v2, v2, 0x4
 
@@ -2650,7 +2650,7 @@
 
     if-eqz v11, :cond_e
 
-    iget v2, v10, Lorg/a/a/j;->bAH:I
+    iget v2, v10, Lorg/a/a/j;->bAC:I
 
     and-int/lit8 v2, v2, 0x4
 
@@ -2669,13 +2669,13 @@
     goto :goto_a
 
     :cond_e
-    iget-object v11, v10, Lorg/a/a/j;->bAG:[Lorg/a/a/c;
+    iget-object v11, v10, Lorg/a/a/j;->bAB:[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;->bzV:Lorg/a/a/c;
+    iput-object v4, v2, Lorg/a/a/c;->bzQ:Lorg/a/a/c;
 
     move-object v4, v2
 
@@ -2698,7 +2698,7 @@
 
     const/4 v3, 0x1
 
-    iget v1, v10, Lorg/a/a/j;->bAH:I
+    iget v1, v10, Lorg/a/a/j;->bAC:I
 
     const/16 v2, 0x8
 
@@ -2718,25 +2718,25 @@
 
     if-eqz v18, :cond_14
 
-    iput v6, v10, Lorg/a/a/j;->bAS:I
+    iput v6, v10, Lorg/a/a/j;->bAN:I
 
     const/4 v2, 0x0
 
-    iput v2, v10, Lorg/a/a/j;->bAT:I
+    iput v2, v10, Lorg/a/a/j;->bAO:I
 
-    iput v2, v10, Lorg/a/a/j;->bAU:I
+    iput v2, v10, Lorg/a/a/j;->bAP:I
 
-    iput v2, v10, Lorg/a/a/j;->bAV:I
+    iput v2, v10, Lorg/a/a/j;->bAQ:I
 
     new-array v1, v13, [Ljava/lang/Object;
 
-    iput-object v1, v10, Lorg/a/a/j;->bAW:[Ljava/lang/Object;
+    iput-object v1, v10, Lorg/a/a/j;->bAR:[Ljava/lang/Object;
 
-    iput v2, v10, Lorg/a/a/j;->bAX:I
+    iput v2, v10, Lorg/a/a/j;->bAS:I
 
     new-array v1, v12, [Ljava/lang/Object;
 
-    iput-object v1, v10, Lorg/a/a/j;->bAY:[Ljava/lang/Object;
+    iput-object v1, v10, Lorg/a/a/j;->bAT:[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;->bAH:I
+    iget v1, v10, Lorg/a/a/j;->bAC:I
 
     and-int/lit16 v1, v1, 0x100
 
@@ -2874,7 +2874,7 @@
 
     move-result v2
 
-    iget v3, v10, Lorg/a/a/j;->bAH:I
+    iget v3, v10, Lorg/a/a/j;->bAC:I
 
     and-int/lit16 v3, v3, 0x100
 
@@ -2911,7 +2911,7 @@
 
     if-eqz v2, :cond_18
 
-    iget v8, v10, Lorg/a/a/j;->bAH:I
+    iget v8, v10, Lorg/a/a/j;->bAC: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;->bAS:I
+    iget v2, v10, Lorg/a/a/j;->bAN:I
 
     if-eq v2, v3, :cond_1a
 
-    iget v2, v10, Lorg/a/a/j;->bAS:I
+    iget v2, v10, Lorg/a/a/j;->bAN:I
 
     move/from16 v18, v3
 
@@ -2968,7 +2968,7 @@
     const/4 v3, -0x1
 
     :goto_12
-    iget v2, v10, Lorg/a/a/j;->bAS:I
+    iget v2, v10, Lorg/a/a/j;->bAN:I
 
     if-eq v2, v3, :cond_1d
 
@@ -2981,21 +2981,21 @@
     goto :goto_13
 
     :cond_1b
-    iget v2, v10, Lorg/a/a/j;->bAT:I
+    iget v2, v10, Lorg/a/a/j;->bAO:I
 
-    iget v1, v10, Lorg/a/a/j;->bAV:I
+    iget v1, v10, Lorg/a/a/j;->bAQ:I
 
     move/from16 v21, v4
 
-    iget-object v4, v10, Lorg/a/a/j;->bAW:[Ljava/lang/Object;
+    iget-object v4, v10, Lorg/a/a/j;->bAR:[Ljava/lang/Object;
 
     move-object/from16 v33, v5
 
-    iget v5, v10, Lorg/a/a/j;->bAX:I
+    iget v5, v10, Lorg/a/a/j;->bAS:I
 
     move-object/from16 v34, v6
 
-    iget-object v6, v10, Lorg/a/a/j;->bAY:[Ljava/lang/Object;
+    iget-object v6, v10, Lorg/a/a/j;->bAT:[Ljava/lang/Object;
 
     move/from16 v35, v1
 
@@ -3037,13 +3037,13 @@
 
     const/4 v2, -0x1
 
-    iget v3, v10, Lorg/a/a/j;->bAU:I
+    iget v3, v10, Lorg/a/a/j;->bAP:I
 
-    iget-object v4, v10, Lorg/a/a/j;->bAW:[Ljava/lang/Object;
+    iget-object v4, v10, Lorg/a/a/j;->bAR:[Ljava/lang/Object;
 
-    iget v5, v10, Lorg/a/a/j;->bAX:I
+    iget v5, v10, Lorg/a/a/j;->bAS:I
 
-    iget-object v6, v10, Lorg/a/a/j;->bAY:[Ljava/lang/Object;
+    iget-object v6, v10, Lorg/a/a/j;->bAT:[Ljava/lang/Object;
 
     move-object/from16 v1, p1
 
@@ -3126,7 +3126,7 @@
 
     if-eqz v1, :cond_21
 
-    iget v1, v10, Lorg/a/a/j;->bAH:I
+    iget v1, v10, Lorg/a/a/j;->bAC:I
 
     const/16 v2, 0x8
 
@@ -3465,7 +3465,7 @@
 
     const/4 v5, 0x1
 
-    iget-object v1, v0, Lorg/a/a/e;->bzY:[I
+    iget-object v1, v0, Lorg/a/a/e;->bzT:[I
 
     add-int/lit8 v2, v21, 0x1
 
@@ -3475,7 +3475,7 @@
 
     aget v1, v1, v2
 
-    iget-object v2, v0, Lorg/a/a/e;->bzY:[I
+    iget-object v2, v0, Lorg/a/a/e;->bzT:[I
 
     add-int/lit8 v6, v1, 0x2
 
@@ -3495,7 +3495,7 @@
 
     move-result-object v2
 
-    iget-object v4, v0, Lorg/a/a/e;->bAb:[I
+    iget-object v4, v0, Lorg/a/a/e;->bzW:[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;->bzY:[I
+    iget-object v1, v0, Lorg/a/a/e;->bzT:[I
 
     add-int/lit8 v4, v21, 0x1
 
@@ -3576,7 +3576,7 @@
 
     aget v1, v1, v2
 
-    iget-object v2, v0, Lorg/a/a/e;->bzY:[I
+    iget-object v2, v0, Lorg/a/a/e;->bzT:[I
 
     add-int/lit8 v4, v1, 0x2
 
@@ -4180,9 +4180,9 @@
 
     add-int/lit8 v2, v2, 0x2
 
-    iget v6, v10, Lorg/a/a/j;->bAN:I
+    iget v6, v10, Lorg/a/a/j;->bAI:I
 
-    iget-object v8, v10, Lorg/a/a/j;->bAO:Lorg/a/a/ab;
+    iget-object v8, v10, Lorg/a/a/j;->bAJ: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;->bAN:I
+    iget v15, v10, Lorg/a/a/j;->bAI:I
 
     move/from16 v21, v1
 
-    iget-object v1, v10, Lorg/a/a/j;->bAO:Lorg/a/a/ab;
+    iget-object v1, v10, Lorg/a/a/j;->bAJ:Lorg/a/a/ab;
 
     move/from16 v28, v12
 
@@ -4332,7 +4332,7 @@
 
     if-eqz v6, :cond_37
 
-    iget v1, v10, Lorg/a/a/j;->bAH:I
+    iget v1, v10, Lorg/a/a/j;->bAC:I
 
     and-int/lit8 v1, v1, 0x2
 
@@ -4554,15 +4554,15 @@
 
     add-int/lit8 v6, v1, 0x2
 
-    iget v2, v10, Lorg/a/a/j;->bAN:I
+    iget v2, v10, Lorg/a/a/j;->bAI:I
 
-    iget-object v3, v10, Lorg/a/a/j;->bAO:Lorg/a/a/ab;
+    iget-object v3, v10, Lorg/a/a/j;->bAJ:Lorg/a/a/ab;
 
-    iget-object v4, v10, Lorg/a/a/j;->bAP:[Lorg/a/a/r;
+    iget-object v4, v10, Lorg/a/a/j;->bAK:[Lorg/a/a/r;
 
-    iget-object v5, v10, Lorg/a/a/j;->bAQ:[Lorg/a/a/r;
+    iget-object v5, v10, Lorg/a/a/j;->bAL:[Lorg/a/a/r;
 
-    iget-object v1, v10, Lorg/a/a/j;->bAR:[I
+    iget-object v1, v10, Lorg/a/a/j;->bAM:[I
 
     const/16 v17, 0x1
 
@@ -4648,15 +4648,15 @@
 
     add-int/lit8 v15, v1, 0x2
 
-    iget v2, v10, Lorg/a/a/j;->bAN:I
+    iget v2, v10, Lorg/a/a/j;->bAI:I
 
-    iget-object v3, v10, Lorg/a/a/j;->bAO:Lorg/a/a/ab;
+    iget-object v3, v10, Lorg/a/a/j;->bAJ:Lorg/a/a/ab;
 
-    iget-object v4, v10, Lorg/a/a/j;->bAP:[Lorg/a/a/r;
+    iget-object v4, v10, Lorg/a/a/j;->bAK:[Lorg/a/a/r;
 
-    iget-object v5, v10, Lorg/a/a/j;->bAQ:[Lorg/a/a/r;
+    iget-object v5, v10, Lorg/a/a/j;->bAL:[Lorg/a/a/r;
 
-    iget-object v6, v10, Lorg/a/a/j;->bAR:[I
+    iget-object v6, v10, Lorg/a/a/j;->bAM:[I
 
     const/4 v8, 0x0
 
@@ -4681,11 +4681,11 @@
     :goto_3c
     if-eqz v1, :cond_3e
 
-    iget-object v2, v1, Lorg/a/a/c;->bzV:Lorg/a/a/c;
+    iget-object v2, v1, Lorg/a/a/c;->bzQ:Lorg/a/a/c;
 
     const/4 v3, 0x0
 
-    iput-object v3, v1, Lorg/a/a/c;->bzV:Lorg/a/a/c;
+    iput-object v3, v1, Lorg/a/a/c;->bzQ: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;->bAI:[C
+    iget-object v0, p2, Lorg/a/a/j;->bAD:[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;->bAM:[Lorg/a/a/r;
+    iget-object v8, p2, Lorg/a/a/j;->bAH:[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;->bAM:[Lorg/a/a/r;
+    iget-object v7, p2, Lorg/a/a/j;->bAH:[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;->bzX:[B
+    iget-object v4, p0, Lorg/a/a/e;->bzS:[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;->bzZ:[Ljava/lang/String;
+    iget-object v0, p0, Lorg/a/a/e;->bzU:[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;->bzY:[I
+    iget-object v1, p0, Lorg/a/a/e;->bzT:[I
 
     aget v1, v1, p1
 
@@ -5395,13 +5395,13 @@
 
     move-result-object p0
 
-    iget-short p1, p0, Lorg/a/a/r;->bBy:S
+    iget-short p1, p0, Lorg/a/a/r;->bBt:S
 
     and-int/lit8 p1, p1, -0x2
 
     int-to-short p1, p1
 
-    iput-short p1, p0, Lorg/a/a/r;->bBy:S
+    iput-short p1, p0, Lorg/a/a/r;->bBt: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;->bzX:[B
+    iget-object v0, p0, Lorg/a/a/e;->bzS:[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;->bAI:[C
+    iget-object p2, p2, Lorg/a/a/j;->bAD:[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;->bzY:[I
+    iget-object v0, p0, Lorg/a/a/e;->bzT:[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;->bBy:S
+    iget-short p1, p0, Lorg/a/a/r;->bBt:S
 
     or-int/lit8 p1, p1, 0x1
 
     int-to-short p1, p1
 
-    iput-short p1, p0, Lorg/a/a/r;->bBy:S
+    iput-short p1, p0, Lorg/a/a/r;->bBt: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;->bAa:[Lorg/a/a/i;
+    iget-object v0, p0, Lorg/a/a/e;->bzV:[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;->bzY:[I
+    iget-object v0, p0, Lorg/a/a/e;->bzT:[I
 
     aget v1, v0, p1
 
@@ -5541,7 +5541,7 @@
 
     move-result-object v0
 
-    iget-object v3, p0, Lorg/a/a/e;->bAb:[I
+    iget-object v3, p0, Lorg/a/a/e;->bzW:[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;->bAa:[Lorg/a/a/i;
+    iget-object p2, p0, Lorg/a/a/e;->bzV:[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;->HR()I
+    invoke-direct {p0}, Lorg/a/a/e;->HP()I
 
     move-result v0
 
@@ -5694,7 +5694,7 @@
 .method private dJ(I)I
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/e;->bzX:[B
+    iget-object v0, p0, Lorg/a/a/e;->bzS:[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;->bzX:[B
+    iget-object v0, p0, Lorg/a/a/e;->bzS:[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;->bzX:[B
+    iget-object v0, p0, Lorg/a/a/e;->bzS:[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;->bzX:[B
+    iget-object v0, p0, Lorg/a/a/e;->bzS:[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;->bzY:[I
+    iget-object v0, p0, Lorg/a/a/e;->bzT:[I
 
     aget v0, v0, p1
 
-    iget-object v1, p0, Lorg/a/a/e;->bzX:[B
+    iget-object v1, p0, Lorg/a/a/e;->bzS:[B
 
     add-int/lit8 v2, v0, -0x1
 
@@ -5867,7 +5867,7 @@
 
     move-result v1
 
-    iget-object p1, p0, Lorg/a/a/e;->bzY:[I
+    iget-object p1, p0, Lorg/a/a/e;->bzT:[I
 
     const/4 v2, 0x1
 
@@ -5879,7 +5879,7 @@
 
     aget p1, p1, v0
 
-    iget-object v0, p0, Lorg/a/a/e;->bzY:[I
+    iget-object v0, p0, Lorg/a/a/e;->bzT:[I
 
     add-int/lit8 v3, p1, 0x2
 
@@ -5903,7 +5903,7 @@
 
     move-result-object p2
 
-    iget-object v0, p0, Lorg/a/a/e;->bzX:[B
+    iget-object v0, p0, Lorg/a/a/e;->bzS:[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;->bAG:[Lorg/a/a/c;
+    iput-object v1, v10, Lorg/a/a/j;->bAB:[Lorg/a/a/c;
 
-    iput v9, v10, Lorg/a/a/j;->bAH:I
+    iput v9, v10, Lorg/a/a/j;->bAC:I
 
-    iget v2, v0, Lorg/a/a/e;->pv:I
+    iget v2, v0, Lorg/a/a/e;->pw:I
 
     new-array v2, v2, [C
 
-    iput-object v2, v10, Lorg/a/a/j;->bAI:[C
+    iput-object v2, v10, Lorg/a/a/j;->bAD:[C
 
-    iget-object v11, v10, Lorg/a/a/j;->bAI:[C
+    iget-object v11, v10, Lorg/a/a/j;->bAD:[C
 
-    iget v2, v0, Lorg/a/a/e;->bAc:I
+    iget v2, v0, Lorg/a/a/e;->bzX: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;->HR()I
+    invoke-direct/range {p0 .. p0}, Lorg/a/a/e;->HP()I
 
     move-result v2
 
@@ -6430,7 +6430,7 @@
 
     move-result-object v4
 
-    iput-object v10, v4, Lorg/a/a/c;->bzV:Lorg/a/a/c;
+    iput-object v10, v4, Lorg/a/a/c;->bzQ: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;->bzY:[I
+    iget-object v1, v0, Lorg/a/a/e;->bzT:[I
 
     const/4 v15, 0x1
 
@@ -6517,7 +6517,7 @@
 
     move-object/from16 v6, v26
 
-    iget-object v1, v6, Lorg/a/a/j;->bAI:[C
+    iget-object v1, v6, Lorg/a/a/j;->bAD:[C
 
     move/from16 v2, v28
 
@@ -6900,7 +6900,7 @@
     goto :goto_11
 
     :cond_24
-    iget-object v3, v0, Lorg/a/a/e;->bzY:[I
+    iget-object v3, v0, Lorg/a/a/e;->bzT:[I
 
     aget v3, v3, v1
 
@@ -6916,7 +6916,7 @@
     goto :goto_12
 
     :cond_25
-    iget-object v4, v0, Lorg/a/a/e;->bzY:[I
+    iget-object v4, v0, Lorg/a/a/e;->bzT:[I
 
     aget v1, v4, v1
 
@@ -7035,9 +7035,9 @@
 
     add-int/lit8 v1, v1, 0x2
 
-    iget v4, v6, Lorg/a/a/j;->bAN:I
+    iget v4, v6, Lorg/a/a/j;->bAI:I
 
-    iget-object v5, v6, Lorg/a/a/j;->bAO:Lorg/a/a/ab;
+    iget-object v5, v6, Lorg/a/a/j;->bAJ: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;->bAN:I
+    iget v4, v6, Lorg/a/a/j;->bAI:I
 
-    iget-object v5, v6, Lorg/a/a/j;->bAO:Lorg/a/a/ab;
+    iget-object v5, v6, Lorg/a/a/j;->bAJ: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;->bzV:Lorg/a/a/c;
+    iget-object v2, v1, Lorg/a/a/c;->bzQ:Lorg/a/a/c;
 
     const/4 v3, 0x0
 
-    iput-object v3, v1, Lorg/a/a/c;->bzV:Lorg/a/a/c;
+    iput-object v3, v1, Lorg/a/a/c;->bzQ: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;->bAI:[C
+    iget-object v11, v6, Lorg/a/a/j;->bAD:[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;->bAG:[Lorg/a/a/c;
+    iget-object v9, v6, Lorg/a/a/j;->bAB:[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;->bzV:Lorg/a/a/c;
+    iput-object v10, v2, Lorg/a/a/c;->bzQ: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;->bAN:I
+    iget v5, v9, Lorg/a/a/j;->bAI:I
 
-    iget-object v6, v9, Lorg/a/a/j;->bAO:Lorg/a/a/ab;
+    iget-object v6, v9, Lorg/a/a/j;->bAJ: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;->bAN:I
+    iget v5, v9, Lorg/a/a/j;->bAI:I
 
-    iget-object v6, v9, Lorg/a/a/j;->bAO:Lorg/a/a/ab;
+    iget-object v6, v9, Lorg/a/a/j;->bAJ: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;->bzV:Lorg/a/a/c;
+    iget-object v2, v10, Lorg/a/a/c;->bzQ:Lorg/a/a/c;
 
     const/4 v3, 0x0
 
-    iput-object v3, v10, Lorg/a/a/c;->bzV:Lorg/a/a/c;
+    iput-object v3, v10, Lorg/a/a/c;->bzQ: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;->bAI:[C
+    iget-object v10, v9, Lorg/a/a/j;->bAD:[C
 
     invoke-direct {v0, v13}, Lorg/a/a/e;->dK(I)I
 
     move-result v1
 
-    iput v1, v9, Lorg/a/a/j;->bAJ:I
+    iput v1, v9, Lorg/a/a/j;->bAE:I
 
     add-int/lit8 v1, v13, 0x2
 
@@ -7691,7 +7691,7 @@
 
     move-result-object v1
 
-    iput-object v1, v9, Lorg/a/a/j;->bAK:Ljava/lang/String;
+    iput-object v1, v9, Lorg/a/a/j;->bAF: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;->bAL:Ljava/lang/String;
+    iput-object v1, v9, Lorg/a/a/j;->bAG: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;->bAH:I
+    iget v1, v9, Lorg/a/a/j;->bAC:I
 
     const/4 v3, 0x1
 
@@ -7862,11 +7862,11 @@
 
     if-eqz v3, :cond_43
 
-    iget v1, v9, Lorg/a/a/j;->bAJ:I
+    iget v1, v9, Lorg/a/a/j;->bAE:I
 
     or-int v1, v1, v32
 
-    iput v1, v9, Lorg/a/a/j;->bAJ:I
+    iput v1, v9, Lorg/a/a/j;->bAE:I
 
     :goto_27
     move-object/from16 v11, v20
@@ -7921,11 +7921,11 @@
 
     if-eqz v3, :cond_47
 
-    iget v1, v9, Lorg/a/a/j;->bAJ:I
+    iget v1, v9, Lorg/a/a/j;->bAE:I
 
     or-int/lit16 v1, v1, 0x1000
 
-    iput v1, v9, Lorg/a/a/j;->bAJ:I
+    iput v1, v9, Lorg/a/a/j;->bAE:I
 
     move-object/from16 v6, v26
 
@@ -8002,13 +8002,13 @@
     goto :goto_28
 
     :cond_4c
-    iget-object v3, v9, Lorg/a/a/j;->bAG:[Lorg/a/a/c;
+    iget-object v3, v9, Lorg/a/a/j;->bAB:[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;->bzV:Lorg/a/a/c;
+    iput-object v8, v1, Lorg/a/a/c;->bzQ:Lorg/a/a/c;
 
     move-object v8, v1
 
@@ -8044,11 +8044,11 @@
 
     move-object/from16 v6, v26
 
-    iget v2, v9, Lorg/a/a/j;->bAJ:I
+    iget v2, v9, Lorg/a/a/j;->bAE:I
 
-    iget-object v3, v9, Lorg/a/a/j;->bAK:Ljava/lang/String;
+    iget-object v3, v9, Lorg/a/a/j;->bAF:Ljava/lang/String;
 
-    iget-object v1, v9, Lorg/a/a/j;->bAL:Ljava/lang/String;
+    iget-object v1, v9, Lorg/a/a/j;->bAG:Ljava/lang/String;
 
     if-nez v5, :cond_4e
 
@@ -8112,7 +8112,7 @@
 
     sub-int v4, v23, v13
 
-    iget v3, v9, Lorg/a/a/j;->bAJ:I
+    iget v3, v9, Lorg/a/a/j;->bAE:I
 
     and-int v3, v3, v32
 
@@ -8132,21 +8132,21 @@
 
     move-result v5
 
-    iget-object v6, v2, Lorg/a/a/u;->bzO:Lorg/a/a/z;
+    iget-object v6, v2, Lorg/a/a/u;->bzJ:Lorg/a/a/z;
 
-    iget-object v6, v6, Lorg/a/a/z;->bDa:Lorg/a/a/e;
+    iget-object v6, v6, Lorg/a/a/z;->bCV:Lorg/a/a/e;
 
     if-ne v0, v6, :cond_57
 
-    iget v6, v2, Lorg/a/a/u;->bBd:I
+    iget v6, v2, Lorg/a/a/u;->bAY:I
 
     if-ne v5, v6, :cond_57
 
-    iget v5, v2, Lorg/a/a/u;->bAr:I
+    iget v5, v2, Lorg/a/a/u;->bAm:I
 
     if-ne v11, v5, :cond_57
 
-    iget v5, v2, Lorg/a/a/u;->bAe:I
+    iget v5, v2, Lorg/a/a/u;->bzZ:I
 
     and-int v5, v5, v32
 
@@ -8165,15 +8165,15 @@
     goto :goto_2f
 
     :cond_51
-    iget-object v3, v2, Lorg/a/a/u;->bzO:Lorg/a/a/z;
+    iget-object v3, v2, Lorg/a/a/u;->bzJ:Lorg/a/a/z;
 
-    iget v3, v3, Lorg/a/a/z;->bDb:I
+    iget v3, v3, Lorg/a/a/z;->bCW:I
 
     const/16 v5, 0x31
 
     if-ge v3, v5, :cond_52
 
-    iget v3, v2, Lorg/a/a/u;->bAe:I
+    iget v3, v2, Lorg/a/a/u;->bzZ: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;->bCd:I
+    iget v3, v2, Lorg/a/a/u;->bBY:I
 
     if-eqz v3, :cond_56
 
@@ -8205,7 +8205,7 @@
 
     move-result v3
 
-    iget v5, v2, Lorg/a/a/u;->bCd:I
+    iget v5, v2, Lorg/a/a/u;->bBY:I
 
     if-ne v3, v5, :cond_56
 
@@ -8216,7 +8216,7 @@
     const/4 v3, 0x0
 
     :goto_2e
-    iget v6, v2, Lorg/a/a/u;->bCd:I
+    iget v6, v2, Lorg/a/a/u;->bBY:I
 
     if-ge v3, v6, :cond_56
 
@@ -8224,7 +8224,7 @@
 
     move-result v6
 
-    iget-object v7, v2, Lorg/a/a/u;->bCe:[I
+    iget-object v7, v2, Lorg/a/a/u;->bBZ:[I
 
     aget v7, v7, v3
 
@@ -8240,11 +8240,11 @@
     goto :goto_2e
 
     :cond_56
-    iput v12, v2, Lorg/a/a/u;->bCy:I
+    iput v12, v2, Lorg/a/a/u;->bCt:I
 
     add-int/lit8 v4, v4, -0x6
 
-    iput v4, v2, Lorg/a/a/u;->bCz:I
+    iput v4, v2, Lorg/a/a/u;->bCu:I
 
     const/4 v2, 0x1
 
@@ -8296,7 +8296,7 @@
     :cond_59
     if-eqz v18, :cond_5a
 
-    invoke-virtual {v1}, Lorg/a/a/t;->HT()Lorg/a/a/a;
+    invoke-virtual {v1}, Lorg/a/a/t;->HR()Lorg/a/a/a;
 
     move-result-object v2
 
@@ -8308,7 +8308,7 @@
 
     if-eqz v2, :cond_5a
 
-    invoke-virtual {v2}, Lorg/a/a/a;->HO()V
+    invoke-virtual {v2}, Lorg/a/a/a;->HM()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;->bAN:I
+    iget v5, v9, Lorg/a/a/j;->bAI:I
 
-    iget-object v6, v9, Lorg/a/a/j;->bAO:Lorg/a/a/ab;
+    iget-object v6, v9, Lorg/a/a/j;->bAJ: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;->bAN:I
+    iget v5, v9, Lorg/a/a/j;->bAI:I
 
-    iget-object v6, v9, Lorg/a/a/j;->bAO:Lorg/a/a/ab;
+    iget-object v6, v9, Lorg/a/a/j;->bAJ: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;->bzV:Lorg/a/a/c;
+    iget-object v3, v2, Lorg/a/a/c;->bzQ:Lorg/a/a/c;
 
     const/4 v4, 0x0
 
-    iput-object v4, v2, Lorg/a/a/c;->bzV:Lorg/a/a/c;
+    iput-object v4, v2, Lorg/a/a/c;->bzQ: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 2622399dc1..29134fc22e 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 bAd:Lorg/a/a/g;
+.field protected final bzH:I
 
-.field protected final bzM:I
+.field protected bzY:Lorg/a/a/g;
 
 
 # direct methods
@@ -27,11 +27,11 @@
 
     const/high16 p1, 0x70000
 
-    iput p1, p0, Lorg/a/a/g;->bzM:I
+    iput p1, p0, Lorg/a/a/g;->bzH:I
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lorg/a/a/g;->bAd:Lorg/a/a/g;
+    iput-object p1, p0, Lorg/a/a/g;->bzY: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;->bzM:I
+    iget v0, p0, Lorg/a/a/g;->bzH:I
 
     const/high16 v1, 0x50000
 
     if-lt v0, v1, :cond_1
 
-    iget-object v0, p0, Lorg/a/a/g;->bAd:Lorg/a/a/g;
+    iget-object v0, p0, Lorg/a/a/g;->bzY: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;->bAd:Lorg/a/a/g;
+    iget-object v0, p0, Lorg/a/a/g;->bzY: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;->bAd:Lorg/a/a/g;
+    iget-object v0, p0, Lorg/a/a/g;->bzY: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;->bAd:Lorg/a/a/g;
+    iget-object v0, p0, Lorg/a/a/g;->bzY: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;->bAd:Lorg/a/a/g;
+    iget-object v0, p0, Lorg/a/a/g;->bzY: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;->bAd:Lorg/a/a/g;
+    iget-object v0, p0, Lorg/a/a/g;->bzY: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;->bAd:Lorg/a/a/g;
+    iget-object v0, p0, Lorg/a/a/g;->bzY: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;->bzM:I
+    iget v0, p0, Lorg/a/a/g;->bzH:I
 
     const/high16 v1, 0x60000
 
     if-lt v0, v1, :cond_1
 
-    iget-object v0, p0, Lorg/a/a/g;->bAd:Lorg/a/a/g;
+    iget-object v0, p0, Lorg/a/a/g;->bzY: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;->bzM:I
+    iget v0, p0, Lorg/a/a/g;->bzH:I
 
     const/high16 v1, 0x70000
 
     if-lt v0, v1, :cond_1
 
-    iget-object v0, p0, Lorg/a/a/g;->bAd:Lorg/a/a/g;
+    iget-object v0, p0, Lorg/a/a/g;->bzY: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;->bzM:I
+    iget v0, p0, Lorg/a/a/g;->bzH:I
 
     const/high16 v1, 0x70000
 
     if-lt v0, v1, :cond_1
 
-    iget-object v0, p0, Lorg/a/a/g;->bAd:Lorg/a/a/g;
+    iget-object v0, p0, Lorg/a/a/g;->bzY: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;->bAd:Lorg/a/a/g;
+    iget-object v0, p0, Lorg/a/a/g;->bzY: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;->bAd:Lorg/a/a/g;
+    iget-object v0, p0, Lorg/a/a/g;->bzY: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 08223d629d..c9a7e03acd 100644
--- a/com.discord/smali_classes2/org/a/a/h.smali
+++ b/com.discord/smali_classes2/org/a/a/h.smali
@@ -4,59 +4,59 @@
 
 
 # instance fields
-.field private bAA:I
+.field private bAa:I
 
-.field private bAB:Lorg/a/a/d;
+.field private bAb:I
 
-.field private bAC:Lorg/a/a/c;
+.field private bAc:I
 
-.field private bAD:I
+.field private bAd:[I
 
-.field private bAe:I
+.field private bAe:Lorg/a/a/n;
 
-.field private bAf:I
+.field private bAf:Lorg/a/a/n;
 
-.field private bAg:I
+.field private bAg:Lorg/a/a/u;
 
-.field private bAh:I
+.field private bAh:Lorg/a/a/u;
 
-.field private bAi:[I
+.field private bAi:I
 
-.field private bAj:Lorg/a/a/n;
+.field private bAj:Lorg/a/a/d;
 
-.field private bAk:Lorg/a/a/n;
+.field private bAk:I
 
-.field private bAl:Lorg/a/a/u;
+.field private bAl:I
 
-.field private bAm:Lorg/a/a/u;
+.field private bAm:I
 
 .field private bAn:I
 
 .field private bAo:Lorg/a/a/d;
 
-.field private bAp:I
+.field private bAp:Lorg/a/a/b;
 
-.field private bAq:I
+.field private bAq:Lorg/a/a/b;
 
-.field private bAr:I
+.field private bAr:Lorg/a/a/b;
 
-.field private bAs:I
+.field private bAs:Lorg/a/a/b;
 
-.field private bAt:Lorg/a/a/d;
+.field private bAt:Lorg/a/a/w;
 
-.field private bAu:Lorg/a/a/b;
+.field private bAu:I
 
-.field private bAv:Lorg/a/a/b;
+.field private bAv:I
 
-.field private bAw:Lorg/a/a/b;
+.field private bAw:Lorg/a/a/d;
 
-.field private bAx:Lorg/a/a/b;
+.field private bAx:Lorg/a/a/c;
 
-.field private bAy:Lorg/a/a/w;
+.field private bAy:I
 
-.field private bAz:I
+.field private final bzJ:Lorg/a/a/z;
 
-.field private final bzO:Lorg/a/a/z;
+.field private bzZ:I
 
 .field private version:I
 
@@ -81,7 +81,7 @@
 
     invoke-direct {p2, p0}, Lorg/a/a/z;-><init>(Lorg/a/a/h;)V
 
-    iput-object p2, p0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
+    iput-object p2, p0, Lorg/a/a/h;->bzJ: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;->bAD:I
+    iput p1, p0, Lorg/a/a/h;->bAy:I
 
     return-void
 
@@ -100,21 +100,21 @@
 
     if-eqz p1, :cond_1
 
-    iput p2, p0, Lorg/a/a/h;->bAD:I
+    iput p2, p0, Lorg/a/a/h;->bAy:I
 
     return-void
 
     :cond_1
     const/4 p1, 0x0
 
-    iput p1, p0, Lorg/a/a/h;->bAD:I
+    iput p1, p0, Lorg/a/a/h;->bAy:I
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final Hz()[B
+.method public final Hx()[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;->bAh:I
+    iget v1, v0, Lorg/a/a/h;->bAc:I
 
     const/4 v2, 0x2
 
@@ -134,7 +134,7 @@
 
     add-int/lit8 v1, v1, 0x18
 
-    iget-object v3, v0, Lorg/a/a/h;->bAj:Lorg/a/a/n;
+    iget-object v3, v0, Lorg/a/a/h;->bAe:Lorg/a/a/n;
 
     move v5, v1
 
@@ -165,11 +165,11 @@
 
     add-int/lit8 v1, v1, 0x1
 
-    iget v4, v3, Lorg/a/a/n;->bBe:I
+    iget v4, v3, Lorg/a/a/n;->bAZ:I
 
     if-eqz v4, :cond_0
 
-    iget-object v4, v3, Lorg/a/a/n;->bzO:Lorg/a/a/z;
+    iget-object v4, v3, Lorg/a/a/n;->bzJ: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;->bAe:I
+    iget v4, v3, Lorg/a/a/n;->bzZ:I
 
     and-int/2addr v4, v14
 
     if-eqz v4, :cond_1
 
-    iget-object v4, v3, Lorg/a/a/n;->bzO:Lorg/a/a/z;
+    iget-object v4, v3, Lorg/a/a/n;->bzJ:Lorg/a/a/z;
 
-    iget v4, v4, Lorg/a/a/z;->bDb:I
+    iget v4, v4, Lorg/a/a/z;->bCW:I
 
     if-ge v4, v10, :cond_1
 
-    iget-object v4, v3, Lorg/a/a/n;->bzO:Lorg/a/a/z;
+    iget-object v4, v3, Lorg/a/a/n;->bzJ: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;->bAr:I
+    iget v4, v3, Lorg/a/a/n;->bAm:I
 
     if-eqz v4, :cond_2
 
-    iget-object v4, v3, Lorg/a/a/n;->bzO:Lorg/a/a/z;
+    iget-object v4, v3, Lorg/a/a/n;->bzJ: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;->bAe:I
+    iget v4, v3, Lorg/a/a/n;->bzZ:I
 
     and-int/2addr v4, v11
 
     if-eqz v4, :cond_3
 
-    iget-object v4, v3, Lorg/a/a/n;->bzO:Lorg/a/a/z;
+    iget-object v4, v3, Lorg/a/a/n;->bzJ: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;->bAu:Lorg/a/a/b;
+    iget-object v4, v3, Lorg/a/a/n;->bAp:Lorg/a/a/b;
 
     if-eqz v4, :cond_4
 
-    iget-object v4, v3, Lorg/a/a/n;->bAu:Lorg/a/a/b;
+    iget-object v4, v3, Lorg/a/a/n;->bAp: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;->bAv:Lorg/a/a/b;
+    iget-object v4, v3, Lorg/a/a/n;->bAq:Lorg/a/a/b;
 
     if-eqz v4, :cond_5
 
-    iget-object v4, v3, Lorg/a/a/n;->bAv:Lorg/a/a/b;
+    iget-object v4, v3, Lorg/a/a/n;->bAq: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;->bAw:Lorg/a/a/b;
+    iget-object v4, v3, Lorg/a/a/n;->bAr:Lorg/a/a/b;
 
     if-eqz v4, :cond_6
 
-    iget-object v4, v3, Lorg/a/a/n;->bAw:Lorg/a/a/b;
+    iget-object v4, v3, Lorg/a/a/n;->bAr: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;->bAx:Lorg/a/a/b;
+    iget-object v4, v3, Lorg/a/a/n;->bAs:Lorg/a/a/b;
 
     if-eqz v4, :cond_7
 
-    iget-object v4, v3, Lorg/a/a/n;->bAx:Lorg/a/a/b;
+    iget-object v4, v3, Lorg/a/a/n;->bAs: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;->bAC:Lorg/a/a/c;
+    iget-object v4, v3, Lorg/a/a/n;->bAx:Lorg/a/a/c;
 
     if-eqz v4, :cond_8
 
-    iget-object v4, v3, Lorg/a/a/n;->bAC:Lorg/a/a/c;
+    iget-object v4, v3, Lorg/a/a/n;->bAx:Lorg/a/a/c;
 
-    iget-object v6, v3, Lorg/a/a/n;->bzO:Lorg/a/a/z;
+    iget-object v6, v3, Lorg/a/a/n;->bzJ: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;->bBb:Lorg/a/a/m;
+    iget-object v3, v3, Lorg/a/a/n;->bAW: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;->bAl:Lorg/a/a/u;
+    iget-object v3, v0, Lorg/a/a/h;->bAg: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;->bCy:I
+    iget v11, v3, Lorg/a/a/u;->bCt:I
 
     if-eqz v11, :cond_a
 
-    iget v11, v3, Lorg/a/a/u;->bCz:I
+    iget v11, v3, Lorg/a/a/u;->bCu:I
 
     add-int/lit8 v11, v11, 0x6
 
     goto/16 :goto_9
 
     :cond_a
-    iget-object v11, v3, Lorg/a/a/u;->bBP:Lorg/a/a/d;
+    iget-object v11, v3, Lorg/a/a/u;->bBK: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;->bBP:Lorg/a/a/d;
+    iget-object v11, v3, Lorg/a/a/u;->bBK: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;->bzO:Lorg/a/a/z;
+    iget-object v11, v3, Lorg/a/a/u;->bzJ: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;->bBP:Lorg/a/a/d;
+    iget-object v11, v3, Lorg/a/a/u;->bBK: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;->bBQ:Lorg/a/a/q;
+    iget-object v14, v3, Lorg/a/a/u;->bBL: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;->bBZ:Lorg/a/a/d;
+    iget-object v14, v3, Lorg/a/a/u;->bBU:Lorg/a/a/d;
 
     if-eqz v14, :cond_d
 
-    iget-object v14, v3, Lorg/a/a/u;->bzO:Lorg/a/a/z;
+    iget-object v14, v3, Lorg/a/a/u;->bzJ:Lorg/a/a/z;
 
-    iget v14, v14, Lorg/a/a/z;->bDb:I
+    iget v14, v14, Lorg/a/a/z;->bCW:I
 
     const/16 v10, 0x32
 
@@ -377,7 +377,7 @@
     const/4 v10, 0x0
 
     :goto_3
-    iget-object v14, v3, Lorg/a/a/u;->bzO:Lorg/a/a/z;
+    iget-object v14, v3, Lorg/a/a/u;->bzJ: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;->bBZ:Lorg/a/a/d;
+    iget-object v10, v3, Lorg/a/a/u;->bBU: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;->bBT:Lorg/a/a/d;
+    iget-object v10, v3, Lorg/a/a/u;->bBO:Lorg/a/a/d;
 
     if-eqz v10, :cond_e
 
-    iget-object v10, v3, Lorg/a/a/u;->bzO:Lorg/a/a/z;
+    iget-object v10, v3, Lorg/a/a/u;->bzJ: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;->bBT:Lorg/a/a/d;
+    iget-object v10, v3, Lorg/a/a/u;->bBO: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;->bBV:Lorg/a/a/d;
+    iget-object v10, v3, Lorg/a/a/u;->bBQ:Lorg/a/a/d;
 
     if-eqz v10, :cond_f
 
-    iget-object v10, v3, Lorg/a/a/u;->bzO:Lorg/a/a/z;
+    iget-object v10, v3, Lorg/a/a/u;->bzJ: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;->bBV:Lorg/a/a/d;
+    iget-object v10, v3, Lorg/a/a/u;->bBQ: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;->bBX:Lorg/a/a/d;
+    iget-object v10, v3, Lorg/a/a/u;->bBS:Lorg/a/a/d;
 
     if-eqz v10, :cond_10
 
-    iget-object v10, v3, Lorg/a/a/u;->bzO:Lorg/a/a/z;
+    iget-object v10, v3, Lorg/a/a/u;->bzJ: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;->bBX:Lorg/a/a/d;
+    iget-object v10, v3, Lorg/a/a/u;->bBS: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;->bCa:Lorg/a/a/b;
+    iget-object v10, v3, Lorg/a/a/u;->bBV:Lorg/a/a/b;
 
     if-eqz v10, :cond_11
 
-    iget-object v10, v3, Lorg/a/a/u;->bCa:Lorg/a/a/b;
+    iget-object v10, v3, Lorg/a/a/u;->bBV: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;->bCb:Lorg/a/a/b;
+    iget-object v10, v3, Lorg/a/a/u;->bBW:Lorg/a/a/b;
 
     if-eqz v10, :cond_12
 
-    iget-object v10, v3, Lorg/a/a/u;->bCb:Lorg/a/a/b;
+    iget-object v10, v3, Lorg/a/a/u;->bBW: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;->bCc:Lorg/a/a/c;
+    iget-object v10, v3, Lorg/a/a/u;->bBX:Lorg/a/a/c;
 
     if-eqz v10, :cond_13
 
-    iget-object v10, v3, Lorg/a/a/u;->bCc:Lorg/a/a/c;
+    iget-object v10, v3, Lorg/a/a/u;->bBX:Lorg/a/a/c;
 
-    iget-object v14, v3, Lorg/a/a/u;->bzO:Lorg/a/a/z;
+    iget-object v14, v3, Lorg/a/a/u;->bzJ: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;->bzO:Lorg/a/a/z;
+    iget-object v2, v3, Lorg/a/a/u;->bzJ: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;->bBP:Lorg/a/a/d;
+    iget-object v3, v3, Lorg/a/a/u;->bBK: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;->bCd:I
+    iget v11, v3, Lorg/a/a/u;->bBY:I
 
     if-lez v11, :cond_16
 
-    iget-object v11, v3, Lorg/a/a/u;->bzO:Lorg/a/a/z;
+    iget-object v11, v3, Lorg/a/a/u;->bzJ: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;->bCd:I
+    iget v11, v3, Lorg/a/a/u;->bBY: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;->bzO:Lorg/a/a/z;
+    iget-object v11, v3, Lorg/a/a/u;->bzJ:Lorg/a/a/z;
 
-    iget v11, v11, Lorg/a/a/z;->bDb:I
+    iget v11, v11, Lorg/a/a/z;->bCW:I
 
     const/16 v14, 0x31
 
@@ -560,7 +560,7 @@
     const/16 v16, 0x0
 
     :goto_6
-    iget v11, v3, Lorg/a/a/u;->bAe:I
+    iget v11, v3, Lorg/a/a/u;->bzZ:I
 
     const/16 v14, 0x1000
 
@@ -570,25 +570,25 @@
 
     if-eqz v16, :cond_18
 
-    iget-object v11, v3, Lorg/a/a/u;->bzO:Lorg/a/a/z;
+    iget-object v11, v3, Lorg/a/a/u;->bzJ: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;->bAr:I
+    iget v11, v3, Lorg/a/a/u;->bAm:I
 
     if-eqz v11, :cond_19
 
-    iget-object v11, v3, Lorg/a/a/u;->bzO:Lorg/a/a/z;
+    iget-object v11, v3, Lorg/a/a/u;->bzJ: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;->bAe:I
+    iget v11, v3, Lorg/a/a/u;->bzZ:I
 
     const/high16 v14, 0x20000
 
@@ -596,18 +596,18 @@
 
     if-eqz v11, :cond_1a
 
-    iget-object v11, v3, Lorg/a/a/u;->bzO:Lorg/a/a/z;
+    iget-object v11, v3, Lorg/a/a/u;->bzJ: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;->bAu:Lorg/a/a/b;
+    iget-object v11, v3, Lorg/a/a/u;->bAp:Lorg/a/a/b;
 
     if-eqz v11, :cond_1b
 
-    iget-object v11, v3, Lorg/a/a/u;->bAu:Lorg/a/a/b;
+    iget-object v11, v3, Lorg/a/a/u;->bAp: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;->bAv:Lorg/a/a/b;
+    iget-object v11, v3, Lorg/a/a/u;->bAq:Lorg/a/a/b;
 
     if-eqz v11, :cond_1c
 
-    iget-object v11, v3, Lorg/a/a/u;->bAv:Lorg/a/a/b;
+    iget-object v11, v3, Lorg/a/a/u;->bAq: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;->bCg:[Lorg/a/a/b;
+    iget-object v11, v3, Lorg/a/a/u;->bCb:[Lorg/a/a/b;
 
     if-eqz v11, :cond_1e
 
-    iget-object v11, v3, Lorg/a/a/u;->bCg:[Lorg/a/a/b;
+    iget-object v11, v3, Lorg/a/a/u;->bCb:[Lorg/a/a/b;
 
-    iget v14, v3, Lorg/a/a/u;->bCf:I
+    iget v14, v3, Lorg/a/a/u;->bCa:I
 
     if-nez v14, :cond_1d
 
-    iget-object v14, v3, Lorg/a/a/u;->bCg:[Lorg/a/a/b;
+    iget-object v14, v3, Lorg/a/a/u;->bCb:[Lorg/a/a/b;
 
     array-length v14, v14
 
     goto :goto_7
 
     :cond_1d
-    iget v14, v3, Lorg/a/a/u;->bCf:I
+    iget v14, v3, Lorg/a/a/u;->bCa: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;->bCi:[Lorg/a/a/b;
+    iget-object v2, v3, Lorg/a/a/u;->bCd:[Lorg/a/a/b;
 
     if-eqz v2, :cond_20
 
-    iget-object v2, v3, Lorg/a/a/u;->bCi:[Lorg/a/a/b;
+    iget-object v2, v3, Lorg/a/a/u;->bCd:[Lorg/a/a/b;
 
-    iget v11, v3, Lorg/a/a/u;->bCh:I
+    iget v11, v3, Lorg/a/a/u;->bCc:I
 
     if-nez v11, :cond_1f
 
-    iget-object v11, v3, Lorg/a/a/u;->bCi:[Lorg/a/a/b;
+    iget-object v11, v3, Lorg/a/a/u;->bCd:[Lorg/a/a/b;
 
     array-length v11, v11
 
     goto :goto_8
 
     :cond_1f
-    iget v11, v3, Lorg/a/a/u;->bCh:I
+    iget v11, v3, Lorg/a/a/u;->bCc: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;->bAw:Lorg/a/a/b;
+    iget-object v2, v3, Lorg/a/a/u;->bAr:Lorg/a/a/b;
 
     if-eqz v2, :cond_21
 
-    iget-object v2, v3, Lorg/a/a/u;->bAw:Lorg/a/a/b;
+    iget-object v2, v3, Lorg/a/a/u;->bAr: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;->bAx:Lorg/a/a/b;
+    iget-object v2, v3, Lorg/a/a/u;->bAs:Lorg/a/a/b;
 
     if-eqz v2, :cond_22
 
-    iget-object v2, v3, Lorg/a/a/u;->bAx:Lorg/a/a/b;
+    iget-object v2, v3, Lorg/a/a/u;->bAs: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;->bCj:Lorg/a/a/d;
+    iget-object v2, v3, Lorg/a/a/u;->bCe:Lorg/a/a/d;
 
     if-eqz v2, :cond_23
 
-    iget-object v2, v3, Lorg/a/a/u;->bzO:Lorg/a/a/z;
+    iget-object v2, v3, Lorg/a/a/u;->bzJ: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;->bCj:Lorg/a/a/d;
+    iget-object v2, v3, Lorg/a/a/u;->bCe: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;->bCl:Lorg/a/a/d;
+    iget-object v2, v3, Lorg/a/a/u;->bCg:Lorg/a/a/d;
 
     if-eqz v2, :cond_24
 
-    iget-object v2, v3, Lorg/a/a/u;->bzO:Lorg/a/a/z;
+    iget-object v2, v3, Lorg/a/a/u;->bzJ: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;->bCl:Lorg/a/a/d;
+    iget-object v2, v3, Lorg/a/a/u;->bCg: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;->bAC:Lorg/a/a/c;
+    iget-object v2, v3, Lorg/a/a/u;->bAx:Lorg/a/a/c;
 
     if-eqz v2, :cond_25
 
-    iget-object v2, v3, Lorg/a/a/u;->bAC:Lorg/a/a/c;
+    iget-object v2, v3, Lorg/a/a/u;->bAx:Lorg/a/a/c;
 
-    iget-object v11, v3, Lorg/a/a/u;->bzO:Lorg/a/a/z;
+    iget-object v11, v3, Lorg/a/a/u;->bzJ: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;->bBL:Lorg/a/a/t;
+    iget-object v2, v3, Lorg/a/a/u;->bBG: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;->bAo:Lorg/a/a/d;
+    iget-object v2, v0, Lorg/a/a/h;->bAj: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;->bzO:Lorg/a/a/z;
+    iget-object v2, v0, Lorg/a/a/h;->bzJ: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;->bAp:I
+    iget v3, v0, Lorg/a/a/h;->bAk:I
 
     if-eqz v3, :cond_28
 
@@ -822,14 +822,14 @@
 
     add-int/lit8 v5, v5, 0xa
 
-    iget-object v3, v0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
+    iget-object v3, v0, Lorg/a/a/h;->bzJ: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;->bAe:I
+    iget v3, v0, Lorg/a/a/h;->bzZ:I
 
     const/16 v10, 0x1000
 
@@ -851,12 +851,12 @@
 
     add-int/lit8 v5, v5, 0x6
 
-    iget-object v3, v0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
+    iget-object v3, v0, Lorg/a/a/h;->bzJ: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;->bAr:I
+    iget v3, v0, Lorg/a/a/h;->bAm:I
 
     if-eqz v3, :cond_2a
 
@@ -864,12 +864,12 @@
 
     add-int/lit8 v5, v5, 0x8
 
-    iget-object v3, v0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
+    iget-object v3, v0, Lorg/a/a/h;->bzJ: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;->bAs:I
+    iget v3, v0, Lorg/a/a/h;->bAn:I
 
     if-eqz v3, :cond_2b
 
@@ -877,14 +877,14 @@
 
     add-int/lit8 v5, v5, 0x8
 
-    iget-object v3, v0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
+    iget-object v3, v0, Lorg/a/a/h;->bzJ: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;->bAt:Lorg/a/a/d;
+    iget-object v3, v0, Lorg/a/a/h;->bAo: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;->bzO:Lorg/a/a/z;
+    iget-object v3, v0, Lorg/a/a/h;->bzJ: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;->bAe:I
+    iget v3, v0, Lorg/a/a/h;->bzZ:I
 
     const/high16 v10, 0x20000
 
@@ -915,12 +915,12 @@
 
     add-int/lit8 v5, v5, 0x6
 
-    iget-object v3, v0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
+    iget-object v3, v0, Lorg/a/a/h;->bzJ: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;->bAu:Lorg/a/a/b;
+    iget-object v3, v0, Lorg/a/a/h;->bAp: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;->bAv:Lorg/a/a/b;
+    iget-object v3, v0, Lorg/a/a/h;->bAq: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;->bAw:Lorg/a/a/b;
+    iget-object v3, v0, Lorg/a/a/h;->bAr: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;->bAx:Lorg/a/a/b;
+    iget-object v3, v0, Lorg/a/a/h;->bAs: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;->bzO:Lorg/a/a/z;
+    iget-object v3, v0, Lorg/a/a/h;->bzJ:Lorg/a/a/z;
 
-    invoke-virtual {v3}, Lorg/a/a/z;->HY()I
+    invoke-virtual {v3}, Lorg/a/a/z;->HW()I
 
     move-result v3
 
@@ -984,20 +984,20 @@
 
     add-int/lit8 v2, v2, 0x1
 
-    iget-object v3, v0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
+    iget-object v3, v0, Lorg/a/a/h;->bzJ:Lorg/a/a/z;
 
-    invoke-virtual {v3}, Lorg/a/a/z;->HY()I
+    invoke-virtual {v3}, Lorg/a/a/z;->HW()I
 
     move-result v3
 
     add-int/2addr v5, v3
 
     :cond_32
-    iget-object v3, v0, Lorg/a/a/h;->bAy:Lorg/a/a/w;
+    iget-object v3, v0, Lorg/a/a/h;->bAt:Lorg/a/a/w;
 
     if-eqz v3, :cond_37
 
-    iget v10, v3, Lorg/a/a/w;->bCO:I
+    iget v10, v3, Lorg/a/a/w;->bCJ: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;->bCQ:I
+    iget v3, v3, Lorg/a/a/w;->bCL:I
 
     if-lez v3, :cond_34
 
@@ -1027,55 +1027,55 @@
 
     add-int/2addr v2, v10
 
-    iget-object v3, v0, Lorg/a/a/h;->bAy:Lorg/a/a/w;
+    iget-object v3, v0, Lorg/a/a/h;->bAt:Lorg/a/a/w;
 
-    iget-object v10, v3, Lorg/a/a/w;->bzO:Lorg/a/a/z;
+    iget-object v10, v3, Lorg/a/a/w;->bzJ: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;->bCF:Lorg/a/a/d;
+    iget-object v10, v3, Lorg/a/a/w;->bCA: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;->bCH:Lorg/a/a/d;
+    iget-object v11, v3, Lorg/a/a/w;->bCC: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;->bCJ:Lorg/a/a/d;
+    iget-object v11, v3, Lorg/a/a/w;->bCE: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;->bCL:Lorg/a/a/d;
+    iget-object v11, v3, Lorg/a/a/w;->bCG: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;->bCN:Lorg/a/a/d;
+    iget-object v11, v3, Lorg/a/a/w;->bCI: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;->bCO:I
+    iget v11, v3, Lorg/a/a/w;->bCJ:I
 
     if-lez v11, :cond_35
 
-    iget-object v11, v3, Lorg/a/a/w;->bzO:Lorg/a/a/z;
+    iget-object v11, v3, Lorg/a/a/w;->bzJ: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;->bCP:Lorg/a/a/d;
+    iget-object v11, v3, Lorg/a/a/w;->bCK: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;->bCQ:I
+    iget v11, v3, Lorg/a/a/w;->bCL:I
 
     if-lez v11, :cond_36
 
-    iget-object v3, v3, Lorg/a/a/w;->bzO:Lorg/a/a/z;
+    iget-object v3, v3, Lorg/a/a/w;->bzJ: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;->bAz:I
+    iget v3, v0, Lorg/a/a/h;->bAu:I
 
     if-eqz v3, :cond_38
 
@@ -1108,14 +1108,14 @@
 
     add-int/lit8 v5, v5, 0x8
 
-    iget-object v3, v0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
+    iget-object v3, v0, Lorg/a/a/h;->bzJ: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;->bAB:Lorg/a/a/d;
+    iget-object v3, v0, Lorg/a/a/h;->bAw: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;->bzO:Lorg/a/a/z;
+    iget-object v3, v0, Lorg/a/a/h;->bzJ: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;->bAC:Lorg/a/a/c;
+    iget-object v3, v0, Lorg/a/a/h;->bAx:Lorg/a/a/c;
 
     if-eqz v3, :cond_3a
 
-    invoke-virtual {v3}, Lorg/a/a/c;->HQ()I
+    invoke-virtual {v3}, Lorg/a/a/c;->HO()I
 
     move-result v3
 
     add-int/2addr v2, v3
 
-    iget-object v3, v0, Lorg/a/a/h;->bAC:Lorg/a/a/c;
+    iget-object v3, v0, Lorg/a/a/h;->bAx:Lorg/a/a/c;
 
-    iget-object v10, v0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
+    iget-object v10, v0, Lorg/a/a/h;->bzJ: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;->bzO:Lorg/a/a/z;
+    iget-object v3, v0, Lorg/a/a/h;->bzJ:Lorg/a/a/z;
 
-    iget-object v3, v3, Lorg/a/a/z;->bDe:Lorg/a/a/d;
+    iget-object v3, v3, Lorg/a/a/z;->bCZ: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;->bzO:Lorg/a/a/z;
+    iget-object v3, v0, Lorg/a/a/h;->bzJ: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;->bzO:Lorg/a/a/z;
+    iget-object v5, v0, Lorg/a/a/h;->bzJ: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;->bDe:Lorg/a/a/d;
+    iget-object v11, v5, Lorg/a/a/z;->bCZ:Lorg/a/a/d;
 
     iget-object v11, v11, Lorg/a/a/d;->data:[B
 
-    iget-object v5, v5, Lorg/a/a/z;->bDe:Lorg/a/a/d;
+    iget-object v5, v5, Lorg/a/a/z;->bCZ: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;->bAe:I
+    iget v10, v0, Lorg/a/a/h;->bzZ:I
 
     xor-int/lit8 v5, v5, -0x1
 
@@ -1233,28 +1233,28 @@
 
     move-result-object v5
 
-    iget v10, v0, Lorg/a/a/h;->bAf:I
+    iget v10, v0, Lorg/a/a/h;->bAa: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;->bAg:I
+    iget v10, v0, Lorg/a/a/h;->bAb:I
 
     invoke-virtual {v5, v10}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
 
-    iget v5, v0, Lorg/a/a/h;->bAh:I
+    iget v5, v0, Lorg/a/a/h;->bAc: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;->bAh:I
+    iget v10, v0, Lorg/a/a/h;->bAc:I
 
     if-ge v5, v10, :cond_3c
 
-    iget-object v10, v0, Lorg/a/a/h;->bAi:[I
+    iget-object v10, v0, Lorg/a/a/h;->bAd:[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;->bAj:Lorg/a/a/n;
+    iget-object v1, v0, Lorg/a/a/h;->bAe:Lorg/a/a/n;
 
     :goto_f
     if-eqz v1, :cond_51
 
-    iget-object v5, v1, Lorg/a/a/n;->bzO:Lorg/a/a/z;
+    iget-object v5, v1, Lorg/a/a/n;->bzJ:Lorg/a/a/z;
 
-    iget v5, v5, Lorg/a/a/z;->bDb:I
+    iget v5, v5, Lorg/a/a/z;->bCW:I
 
     const/16 v10, 0x31
 
@@ -1298,7 +1298,7 @@
     const/4 v10, 0x0
 
     :goto_11
-    iget v11, v1, Lorg/a/a/n;->bAe:I
+    iget v11, v1, Lorg/a/a/n;->bzZ:I
 
     xor-int/lit8 v10, v10, -0x1
 
@@ -1308,17 +1308,17 @@
 
     move-result-object v10
 
-    iget v11, v1, Lorg/a/a/n;->bBc:I
+    iget v11, v1, Lorg/a/a/n;->bAX: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;->bBd:I
+    iget v11, v1, Lorg/a/a/n;->bAY:I
 
     invoke-virtual {v10, v11}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
 
-    iget v10, v1, Lorg/a/a/n;->bBe:I
+    iget v10, v1, Lorg/a/a/n;->bAZ:I
 
     if-eqz v10, :cond_3f
 
@@ -1330,7 +1330,7 @@
     const/4 v10, 0x0
 
     :goto_12
-    iget v11, v1, Lorg/a/a/n;->bAe:I
+    iget v11, v1, Lorg/a/a/n;->bzZ:I
 
     const/16 v14, 0x1000
 
@@ -1343,14 +1343,14 @@
     add-int/lit8 v10, v10, 0x1
 
     :cond_40
-    iget v11, v1, Lorg/a/a/n;->bAr:I
+    iget v11, v1, Lorg/a/a/n;->bAm:I
 
     if-eqz v11, :cond_41
 
     add-int/lit8 v10, v10, 0x1
 
     :cond_41
-    iget v11, v1, Lorg/a/a/n;->bAe:I
+    iget v11, v1, Lorg/a/a/n;->bzZ: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;->bAu:Lorg/a/a/b;
+    iget-object v11, v1, Lorg/a/a/n;->bAp: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;->bAv:Lorg/a/a/b;
+    iget-object v11, v1, Lorg/a/a/n;->bAq: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;->bAw:Lorg/a/a/b;
+    iget-object v11, v1, Lorg/a/a/n;->bAr: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;->bAx:Lorg/a/a/b;
+    iget-object v11, v1, Lorg/a/a/n;->bAs: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;->bAC:Lorg/a/a/c;
+    iget-object v11, v1, Lorg/a/a/n;->bAx:Lorg/a/a/c;
 
     if-eqz v11, :cond_47
 
-    iget-object v11, v1, Lorg/a/a/n;->bAC:Lorg/a/a/c;
+    iget-object v11, v1, Lorg/a/a/n;->bAx:Lorg/a/a/c;
 
-    invoke-virtual {v11}, Lorg/a/a/c;->HQ()I
+    invoke-virtual {v11}, Lorg/a/a/c;->HO()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;->bBe:I
+    iget v10, v1, Lorg/a/a/n;->bAZ:I
 
     if-eqz v10, :cond_48
 
-    iget-object v10, v1, Lorg/a/a/n;->bzO:Lorg/a/a/z;
+    iget-object v10, v1, Lorg/a/a/n;->bzJ:Lorg/a/a/z;
 
     const-string v11, "ConstantValue"
 
@@ -1426,12 +1426,12 @@
 
     move-result-object v10
 
-    iget v11, v1, Lorg/a/a/n;->bBe:I
+    iget v11, v1, Lorg/a/a/n;->bAZ:I
 
     invoke-virtual {v10, v11}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
 
     :cond_48
-    iget v10, v1, Lorg/a/a/n;->bAe:I
+    iget v10, v1, Lorg/a/a/n;->bzZ:I
 
     const/16 v11, 0x1000
 
@@ -1441,7 +1441,7 @@
 
     if-eqz v5, :cond_49
 
-    iget-object v5, v1, Lorg/a/a/n;->bzO:Lorg/a/a/z;
+    iget-object v5, v1, Lorg/a/a/n;->bzJ: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;->bAr:I
+    iget v5, v1, Lorg/a/a/n;->bAm:I
 
     if-eqz v5, :cond_4a
 
-    iget-object v5, v1, Lorg/a/a/n;->bzO:Lorg/a/a/z;
+    iget-object v5, v1, Lorg/a/a/n;->bzJ: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;->bAr:I
+    iget v10, v1, Lorg/a/a/n;->bAm:I
 
     invoke-virtual {v5, v10}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
 
     :cond_4a
-    iget v5, v1, Lorg/a/a/n;->bAe:I
+    iget v5, v1, Lorg/a/a/n;->bzZ:I
 
     const/high16 v10, 0x20000
 
@@ -1489,7 +1489,7 @@
 
     if-eqz v5, :cond_4b
 
-    iget-object v5, v1, Lorg/a/a/n;->bzO:Lorg/a/a/z;
+    iget-object v5, v1, Lorg/a/a/n;->bzJ: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;->bAu:Lorg/a/a/b;
+    iget-object v5, v1, Lorg/a/a/n;->bAp:Lorg/a/a/b;
 
     if-eqz v5, :cond_4c
 
-    iget-object v5, v1, Lorg/a/a/n;->bAu:Lorg/a/a/b;
+    iget-object v5, v1, Lorg/a/a/n;->bAp:Lorg/a/a/b;
 
-    iget-object v10, v1, Lorg/a/a/n;->bzO:Lorg/a/a/z;
+    iget-object v10, v1, Lorg/a/a/n;->bzJ: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;->bAv:Lorg/a/a/b;
+    iget-object v5, v1, Lorg/a/a/n;->bAq:Lorg/a/a/b;
 
     if-eqz v5, :cond_4d
 
-    iget-object v5, v1, Lorg/a/a/n;->bAv:Lorg/a/a/b;
+    iget-object v5, v1, Lorg/a/a/n;->bAq:Lorg/a/a/b;
 
-    iget-object v10, v1, Lorg/a/a/n;->bzO:Lorg/a/a/z;
+    iget-object v10, v1, Lorg/a/a/n;->bzJ: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;->bAw:Lorg/a/a/b;
+    iget-object v5, v1, Lorg/a/a/n;->bAr:Lorg/a/a/b;
 
     if-eqz v5, :cond_4e
 
-    iget-object v5, v1, Lorg/a/a/n;->bAw:Lorg/a/a/b;
+    iget-object v5, v1, Lorg/a/a/n;->bAr:Lorg/a/a/b;
 
-    iget-object v10, v1, Lorg/a/a/n;->bzO:Lorg/a/a/z;
+    iget-object v10, v1, Lorg/a/a/n;->bzJ: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;->bAx:Lorg/a/a/b;
+    iget-object v5, v1, Lorg/a/a/n;->bAs:Lorg/a/a/b;
 
     if-eqz v5, :cond_4f
 
-    iget-object v5, v1, Lorg/a/a/n;->bAx:Lorg/a/a/b;
+    iget-object v5, v1, Lorg/a/a/n;->bAs:Lorg/a/a/b;
 
-    iget-object v10, v1, Lorg/a/a/n;->bzO:Lorg/a/a/z;
+    iget-object v10, v1, Lorg/a/a/n;->bzJ: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;->bAC:Lorg/a/a/c;
+    iget-object v5, v1, Lorg/a/a/n;->bAx:Lorg/a/a/c;
 
     if-eqz v5, :cond_50
 
-    iget-object v5, v1, Lorg/a/a/n;->bAC:Lorg/a/a/c;
+    iget-object v5, v1, Lorg/a/a/n;->bAx:Lorg/a/a/c;
 
-    iget-object v10, v1, Lorg/a/a/n;->bzO:Lorg/a/a/z;
+    iget-object v10, v1, Lorg/a/a/n;->bzJ: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;->bBb:Lorg/a/a/m;
+    iget-object v1, v1, Lorg/a/a/n;->bAW: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;->bAl:Lorg/a/a/u;
+    iget-object v1, v0, Lorg/a/a/h;->bAg: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;->bBY:I
+    iget v10, v1, Lorg/a/a/u;->bBT: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;->bCw:Z
+    iget-boolean v10, v1, Lorg/a/a/u;->bCr:Z
 
     or-int/2addr v5, v10
 
-    iget-object v10, v1, Lorg/a/a/u;->bzO:Lorg/a/a/z;
+    iget-object v10, v1, Lorg/a/a/u;->bzJ:Lorg/a/a/z;
 
-    iget v10, v10, Lorg/a/a/z;->bDb:I
+    iget v10, v10, Lorg/a/a/z;->bCW:I
 
     const/16 v11, 0x31
 
@@ -1639,7 +1639,7 @@
     const/4 v11, 0x0
 
     :goto_16
-    iget v14, v1, Lorg/a/a/u;->bAe:I
+    iget v14, v1, Lorg/a/a/u;->bzZ:I
 
     xor-int/lit8 v11, v11, -0x1
 
@@ -1649,29 +1649,29 @@
 
     move-result-object v11
 
-    iget v14, v1, Lorg/a/a/u;->bBc:I
+    iget v14, v1, Lorg/a/a/u;->bAX: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;->bBd:I
+    iget v14, v1, Lorg/a/a/u;->bAY:I
 
     invoke-virtual {v11, v14}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
 
-    iget v11, v1, Lorg/a/a/u;->bCy:I
+    iget v11, v1, Lorg/a/a/u;->bCt:I
 
     if-eqz v11, :cond_55
 
-    iget-object v10, v1, Lorg/a/a/u;->bzO:Lorg/a/a/z;
+    iget-object v10, v1, Lorg/a/a/u;->bzJ:Lorg/a/a/z;
 
-    iget-object v10, v10, Lorg/a/a/z;->bDa:Lorg/a/a/e;
+    iget-object v10, v10, Lorg/a/a/z;->bCV:Lorg/a/a/e;
 
-    iget-object v10, v10, Lorg/a/a/e;->bzX:[B
+    iget-object v10, v10, Lorg/a/a/e;->bzS:[B
 
-    iget v11, v1, Lorg/a/a/u;->bCy:I
+    iget v11, v1, Lorg/a/a/u;->bCt:I
 
-    iget v14, v1, Lorg/a/a/u;->bCz:I
+    iget v14, v1, Lorg/a/a/u;->bCu: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;->bBP:Lorg/a/a/d;
+    iget-object v11, v1, Lorg/a/a/u;->bBK: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;->bCd:I
+    iget v14, v1, Lorg/a/a/u;->bBY:I
 
     if-lez v14, :cond_57
 
     add-int/lit8 v11, v11, 0x1
 
     :cond_57
-    iget v14, v1, Lorg/a/a/u;->bAe:I
+    iget v14, v1, Lorg/a/a/u;->bzZ:I
 
     const/16 v15, 0x1000
 
@@ -1718,14 +1718,14 @@
     add-int/lit8 v11, v11, 0x1
 
     :cond_58
-    iget v14, v1, Lorg/a/a/u;->bAr:I
+    iget v14, v1, Lorg/a/a/u;->bAm:I
 
     if-eqz v14, :cond_59
 
     add-int/lit8 v11, v11, 0x1
 
     :cond_59
-    iget v14, v1, Lorg/a/a/u;->bAe:I
+    iget v14, v1, Lorg/a/a/u;->bzZ: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;->bAu:Lorg/a/a/b;
+    iget-object v14, v1, Lorg/a/a/u;->bAp: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;->bAv:Lorg/a/a/b;
+    iget-object v14, v1, Lorg/a/a/u;->bAq: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;->bCg:[Lorg/a/a/b;
+    iget-object v14, v1, Lorg/a/a/u;->bCb:[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;->bCi:[Lorg/a/a/b;
+    iget-object v14, v1, Lorg/a/a/u;->bCd:[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;->bAw:Lorg/a/a/b;
+    iget-object v14, v1, Lorg/a/a/u;->bAr: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;->bAx:Lorg/a/a/b;
+    iget-object v14, v1, Lorg/a/a/u;->bAs: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;->bCj:Lorg/a/a/d;
+    iget-object v14, v1, Lorg/a/a/u;->bCe: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;->bCl:Lorg/a/a/d;
+    iget-object v14, v1, Lorg/a/a/u;->bCg: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;->bAC:Lorg/a/a/c;
+    iget-object v14, v1, Lorg/a/a/u;->bAx:Lorg/a/a/c;
 
     if-eqz v14, :cond_63
 
-    iget-object v14, v1, Lorg/a/a/u;->bAC:Lorg/a/a/c;
+    iget-object v14, v1, Lorg/a/a/u;->bAx:Lorg/a/a/c;
 
-    invoke-virtual {v14}, Lorg/a/a/c;->HQ()I
+    invoke-virtual {v14}, Lorg/a/a/c;->HO()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;->bBP:Lorg/a/a/d;
+    iget-object v11, v1, Lorg/a/a/u;->bBK: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;->bBP:Lorg/a/a/d;
+    iget-object v11, v1, Lorg/a/a/u;->bBK: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;->bBQ:Lorg/a/a/q;
+    iget-object v14, v1, Lorg/a/a/u;->bBL: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;->bBZ:Lorg/a/a/d;
+    iget-object v14, v1, Lorg/a/a/u;->bBU:Lorg/a/a/d;
 
     if-eqz v14, :cond_64
 
-    iget-object v14, v1, Lorg/a/a/u;->bBZ:Lorg/a/a/d;
+    iget-object v14, v1, Lorg/a/a/u;->bBU: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;->bBT:Lorg/a/a/d;
+    iget-object v15, v1, Lorg/a/a/u;->bBO:Lorg/a/a/d;
 
     if-eqz v15, :cond_65
 
-    iget-object v15, v1, Lorg/a/a/u;->bBT:Lorg/a/a/d;
+    iget-object v15, v1, Lorg/a/a/u;->bBO: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;->bBV:Lorg/a/a/d;
+    iget-object v15, v1, Lorg/a/a/u;->bBQ:Lorg/a/a/d;
 
     if-eqz v15, :cond_66
 
-    iget-object v15, v1, Lorg/a/a/u;->bBV:Lorg/a/a/d;
+    iget-object v15, v1, Lorg/a/a/u;->bBQ: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;->bBX:Lorg/a/a/d;
+    iget-object v15, v1, Lorg/a/a/u;->bBS:Lorg/a/a/d;
 
     if-eqz v15, :cond_67
 
-    iget-object v15, v1, Lorg/a/a/u;->bBX:Lorg/a/a/d;
+    iget-object v15, v1, Lorg/a/a/u;->bBS: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;->bCa:Lorg/a/a/b;
+    iget-object v15, v1, Lorg/a/a/u;->bBV:Lorg/a/a/b;
 
     if-eqz v15, :cond_68
 
-    iget-object v15, v1, Lorg/a/a/u;->bCa:Lorg/a/a/b;
+    iget-object v15, v1, Lorg/a/a/u;->bBV: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;->bCb:Lorg/a/a/b;
+    iget-object v15, v1, Lorg/a/a/u;->bBW:Lorg/a/a/b;
 
     if-eqz v15, :cond_69
 
-    iget-object v15, v1, Lorg/a/a/u;->bCb:Lorg/a/a/b;
+    iget-object v15, v1, Lorg/a/a/u;->bBW: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;->bCc:Lorg/a/a/c;
+    iget-object v15, v1, Lorg/a/a/u;->bBX:Lorg/a/a/c;
 
     if-eqz v15, :cond_6a
 
-    iget-object v15, v1, Lorg/a/a/u;->bCc:Lorg/a/a/c;
+    iget-object v15, v1, Lorg/a/a/u;->bBX:Lorg/a/a/c;
 
     move/from16 v18, v4
 
-    iget-object v4, v1, Lorg/a/a/u;->bzO:Lorg/a/a/z;
+    iget-object v4, v1, Lorg/a/a/u;->bzJ: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;->bCc:Lorg/a/a/c;
+    iget-object v4, v1, Lorg/a/a/u;->bBX:Lorg/a/a/c;
 
-    invoke-virtual {v4}, Lorg/a/a/c;->HQ()I
+    invoke-virtual {v4}, Lorg/a/a/c;->HO()I
 
     move-result v4
 
@@ -1961,7 +1961,7 @@
     move/from16 v18, v4
 
     :goto_1a
-    iget-object v4, v1, Lorg/a/a/u;->bzO:Lorg/a/a/z;
+    iget-object v4, v1, Lorg/a/a/u;->bzJ:Lorg/a/a/z;
 
     const-string v15, "Code"
 
@@ -1977,19 +1977,19 @@
 
     move-result-object v4
 
-    iget v11, v1, Lorg/a/a/u;->bBN:I
+    iget v11, v1, Lorg/a/a/u;->bBI: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;->bBO:I
+    iget v11, v1, Lorg/a/a/u;->bBJ: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;->bBP:Lorg/a/a/d;
+    iget-object v11, v1, Lorg/a/a/u;->bBK: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;->bBP:Lorg/a/a/d;
+    iget-object v11, v1, Lorg/a/a/u;->bBK:Lorg/a/a/d;
 
     iget-object v11, v11, Lorg/a/a/d;->data:[B
 
-    iget-object v15, v1, Lorg/a/a/u;->bBP:Lorg/a/a/d;
+    iget-object v15, v1, Lorg/a/a/u;->bBK: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;->bBQ:Lorg/a/a/q;
+    iget-object v4, v1, Lorg/a/a/u;->bBL: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;->bBr:Lorg/a/a/r;
+    iget-object v5, v4, Lorg/a/a/q;->bBm:Lorg/a/a/r;
 
-    iget v5, v5, Lorg/a/a/r;->bBB:I
+    iget v5, v5, Lorg/a/a/r;->bBw: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;->bBs:Lorg/a/a/r;
+    iget-object v11, v4, Lorg/a/a/q;->bBn:Lorg/a/a/r;
 
-    iget v11, v11, Lorg/a/a/r;->bBB:I
+    iget v11, v11, Lorg/a/a/r;->bBw: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;->bBt:Lorg/a/a/r;
+    iget-object v11, v4, Lorg/a/a/q;->bBo:Lorg/a/a/r;
 
-    iget v11, v11, Lorg/a/a/r;->bBB:I
+    iget v11, v11, Lorg/a/a/r;->bBw: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;->bBu:I
+    iget v11, v4, Lorg/a/a/q;->bBp:I
 
     invoke-virtual {v5, v11}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
 
-    iget-object v4, v4, Lorg/a/a/q;->bBw:Lorg/a/a/q;
+    iget-object v4, v4, Lorg/a/a/q;->bBr: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;->bBZ:Lorg/a/a/d;
+    iget-object v4, v1, Lorg/a/a/u;->bBU:Lorg/a/a/d;
 
     if-eqz v4, :cond_6e
 
-    iget-object v4, v1, Lorg/a/a/u;->bzO:Lorg/a/a/z;
+    iget-object v4, v1, Lorg/a/a/u;->bzJ:Lorg/a/a/z;
 
-    iget v4, v4, Lorg/a/a/z;->bDb:I
+    iget v4, v4, Lorg/a/a/z;->bCW:I
 
     const/16 v5, 0x32
 
@@ -2077,7 +2077,7 @@
     const/4 v4, 0x0
 
     :goto_1c
-    iget-object v5, v1, Lorg/a/a/u;->bzO:Lorg/a/a/z;
+    iget-object v5, v1, Lorg/a/a/u;->bzJ: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;->bBZ:Lorg/a/a/d;
+    iget-object v5, v1, Lorg/a/a/u;->bBU: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;->bBY:I
+    iget v5, v1, Lorg/a/a/u;->bBT: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;->bBZ:Lorg/a/a/d;
+    iget-object v5, v1, Lorg/a/a/u;->bBU:Lorg/a/a/d;
 
     iget-object v5, v5, Lorg/a/a/d;->data:[B
 
-    iget-object v11, v1, Lorg/a/a/u;->bBZ:Lorg/a/a/d;
+    iget-object v11, v1, Lorg/a/a/u;->bBU: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;->bBT:Lorg/a/a/d;
+    iget-object v4, v1, Lorg/a/a/u;->bBO:Lorg/a/a/d;
 
     if-eqz v4, :cond_6f
 
-    iget-object v4, v1, Lorg/a/a/u;->bzO:Lorg/a/a/z;
+    iget-object v4, v1, Lorg/a/a/u;->bzJ:Lorg/a/a/z;
 
     const-string v5, "LineNumberTable"
 
@@ -2144,7 +2144,7 @@
 
     move-result-object v4
 
-    iget-object v5, v1, Lorg/a/a/u;->bBT:Lorg/a/a/d;
+    iget-object v5, v1, Lorg/a/a/u;->bBO: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;->bBS:I
+    iget v5, v1, Lorg/a/a/u;->bBN: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;->bBT:Lorg/a/a/d;
+    iget-object v5, v1, Lorg/a/a/u;->bBO:Lorg/a/a/d;
 
     iget-object v5, v5, Lorg/a/a/d;->data:[B
 
-    iget-object v11, v1, Lorg/a/a/u;->bBT:Lorg/a/a/d;
+    iget-object v11, v1, Lorg/a/a/u;->bBO: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;->bBV:Lorg/a/a/d;
+    iget-object v4, v1, Lorg/a/a/u;->bBQ:Lorg/a/a/d;
 
     if-eqz v4, :cond_70
 
-    iget-object v4, v1, Lorg/a/a/u;->bzO:Lorg/a/a/z;
+    iget-object v4, v1, Lorg/a/a/u;->bzJ:Lorg/a/a/z;
 
     const-string v5, "LocalVariableTable"
 
@@ -2191,7 +2191,7 @@
 
     move-result-object v4
 
-    iget-object v5, v1, Lorg/a/a/u;->bBV:Lorg/a/a/d;
+    iget-object v5, v1, Lorg/a/a/u;->bBQ: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;->bBU:I
+    iget v5, v1, Lorg/a/a/u;->bBP: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;->bBV:Lorg/a/a/d;
+    iget-object v5, v1, Lorg/a/a/u;->bBQ:Lorg/a/a/d;
 
     iget-object v5, v5, Lorg/a/a/d;->data:[B
 
-    iget-object v11, v1, Lorg/a/a/u;->bBV:Lorg/a/a/d;
+    iget-object v11, v1, Lorg/a/a/u;->bBQ: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;->bBX:Lorg/a/a/d;
+    iget-object v4, v1, Lorg/a/a/u;->bBS:Lorg/a/a/d;
 
     if-eqz v4, :cond_71
 
-    iget-object v4, v1, Lorg/a/a/u;->bzO:Lorg/a/a/z;
+    iget-object v4, v1, Lorg/a/a/u;->bzJ:Lorg/a/a/z;
 
     const-string v5, "LocalVariableTypeTable"
 
@@ -2238,7 +2238,7 @@
 
     move-result-object v4
 
-    iget-object v5, v1, Lorg/a/a/u;->bBX:Lorg/a/a/d;
+    iget-object v5, v1, Lorg/a/a/u;->bBS: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;->bBW:I
+    iget v5, v1, Lorg/a/a/u;->bBR: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;->bBX:Lorg/a/a/d;
+    iget-object v5, v1, Lorg/a/a/u;->bBS:Lorg/a/a/d;
 
     iget-object v5, v5, Lorg/a/a/d;->data:[B
 
-    iget-object v11, v1, Lorg/a/a/u;->bBX:Lorg/a/a/d;
+    iget-object v11, v1, Lorg/a/a/u;->bBS: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;->bCa:Lorg/a/a/b;
+    iget-object v4, v1, Lorg/a/a/u;->bBV:Lorg/a/a/b;
 
     if-eqz v4, :cond_72
 
-    iget-object v4, v1, Lorg/a/a/u;->bCa:Lorg/a/a/b;
+    iget-object v4, v1, Lorg/a/a/u;->bBV:Lorg/a/a/b;
 
-    iget-object v5, v1, Lorg/a/a/u;->bzO:Lorg/a/a/z;
+    iget-object v5, v1, Lorg/a/a/u;->bzJ: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;->bCb:Lorg/a/a/b;
+    iget-object v4, v1, Lorg/a/a/u;->bBW:Lorg/a/a/b;
 
     if-eqz v4, :cond_73
 
-    iget-object v4, v1, Lorg/a/a/u;->bCb:Lorg/a/a/b;
+    iget-object v4, v1, Lorg/a/a/u;->bBW:Lorg/a/a/b;
 
-    iget-object v5, v1, Lorg/a/a/u;->bzO:Lorg/a/a/z;
+    iget-object v5, v1, Lorg/a/a/u;->bzJ: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;->bCc:Lorg/a/a/c;
+    iget-object v4, v1, Lorg/a/a/u;->bBX:Lorg/a/a/c;
 
     if-eqz v4, :cond_75
 
-    iget-object v4, v1, Lorg/a/a/u;->bCc:Lorg/a/a/c;
+    iget-object v4, v1, Lorg/a/a/u;->bBX:Lorg/a/a/c;
 
-    iget-object v5, v1, Lorg/a/a/u;->bzO:Lorg/a/a/z;
+    iget-object v5, v1, Lorg/a/a/u;->bzJ: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;->bCd:I
+    iget v4, v1, Lorg/a/a/u;->bBY:I
 
     if-lez v4, :cond_76
 
-    iget-object v4, v1, Lorg/a/a/u;->bzO:Lorg/a/a/z;
+    iget-object v4, v1, Lorg/a/a/u;->bzJ:Lorg/a/a/z;
 
     const-string v5, "Exceptions"
 
@@ -2336,7 +2336,7 @@
 
     move-result-object v4
 
-    iget v5, v1, Lorg/a/a/u;->bCd:I
+    iget v5, v1, Lorg/a/a/u;->bBY:I
 
     const/4 v11, 0x2
 
@@ -2348,11 +2348,11 @@
 
     move-result-object v4
 
-    iget v5, v1, Lorg/a/a/u;->bCd:I
+    iget v5, v1, Lorg/a/a/u;->bBY:I
 
     invoke-virtual {v4, v5}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
 
-    iget-object v4, v1, Lorg/a/a/u;->bCe:[I
+    iget-object v4, v1, Lorg/a/a/u;->bBZ:[I
 
     array-length v5, v4
 
@@ -2370,7 +2370,7 @@
     goto :goto_1f
 
     :cond_76
-    iget v4, v1, Lorg/a/a/u;->bAe:I
+    iget v4, v1, Lorg/a/a/u;->bzZ:I
 
     const/16 v5, 0x1000
 
@@ -2380,7 +2380,7 @@
 
     if-eqz v10, :cond_77
 
-    iget-object v4, v1, Lorg/a/a/u;->bzO:Lorg/a/a/z;
+    iget-object v4, v1, Lorg/a/a/u;->bzJ: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;->bAr:I
+    iget v4, v1, Lorg/a/a/u;->bAm:I
 
     if-eqz v4, :cond_78
 
-    iget-object v4, v1, Lorg/a/a/u;->bzO:Lorg/a/a/z;
+    iget-object v4, v1, Lorg/a/a/u;->bzJ: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;->bAr:I
+    iget v5, v1, Lorg/a/a/u;->bAm:I
 
     invoke-virtual {v4, v5}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
 
     :cond_78
-    iget v4, v1, Lorg/a/a/u;->bAe:I
+    iget v4, v1, Lorg/a/a/u;->bzZ:I
 
     const/high16 v5, 0x20000
 
@@ -2428,7 +2428,7 @@
 
     if-eqz v4, :cond_79
 
-    iget-object v4, v1, Lorg/a/a/u;->bzO:Lorg/a/a/z;
+    iget-object v4, v1, Lorg/a/a/u;->bzJ: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;->bAu:Lorg/a/a/b;
+    iget-object v4, v1, Lorg/a/a/u;->bAp:Lorg/a/a/b;
 
     if-eqz v4, :cond_7a
 
-    iget-object v4, v1, Lorg/a/a/u;->bAu:Lorg/a/a/b;
+    iget-object v4, v1, Lorg/a/a/u;->bAp:Lorg/a/a/b;
 
-    iget-object v5, v1, Lorg/a/a/u;->bzO:Lorg/a/a/z;
+    iget-object v5, v1, Lorg/a/a/u;->bzJ: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;->bAv:Lorg/a/a/b;
+    iget-object v4, v1, Lorg/a/a/u;->bAq:Lorg/a/a/b;
 
     if-eqz v4, :cond_7b
 
-    iget-object v4, v1, Lorg/a/a/u;->bAv:Lorg/a/a/b;
+    iget-object v4, v1, Lorg/a/a/u;->bAq:Lorg/a/a/b;
 
-    iget-object v5, v1, Lorg/a/a/u;->bzO:Lorg/a/a/z;
+    iget-object v5, v1, Lorg/a/a/u;->bzJ: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;->bCg:[Lorg/a/a/b;
+    iget-object v4, v1, Lorg/a/a/u;->bCb:[Lorg/a/a/b;
 
     if-eqz v4, :cond_7d
 
-    iget-object v4, v1, Lorg/a/a/u;->bzO:Lorg/a/a/z;
+    iget-object v4, v1, Lorg/a/a/u;->bzJ:Lorg/a/a/z;
 
     const-string v5, "RuntimeVisibleParameterAnnotations"
 
@@ -2487,30 +2487,30 @@
 
     move-result v4
 
-    iget-object v5, v1, Lorg/a/a/u;->bCg:[Lorg/a/a/b;
+    iget-object v5, v1, Lorg/a/a/u;->bCb:[Lorg/a/a/b;
 
-    iget v10, v1, Lorg/a/a/u;->bCf:I
+    iget v10, v1, Lorg/a/a/u;->bCa:I
 
     if-nez v10, :cond_7c
 
-    iget-object v10, v1, Lorg/a/a/u;->bCg:[Lorg/a/a/b;
+    iget-object v10, v1, Lorg/a/a/u;->bCb:[Lorg/a/a/b;
 
     array-length v10, v10
 
     goto :goto_20
 
     :cond_7c
-    iget v10, v1, Lorg/a/a/u;->bCf:I
+    iget v10, v1, Lorg/a/a/u;->bCa: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;->bCi:[Lorg/a/a/b;
+    iget-object v4, v1, Lorg/a/a/u;->bCd:[Lorg/a/a/b;
 
     if-eqz v4, :cond_7f
 
-    iget-object v4, v1, Lorg/a/a/u;->bzO:Lorg/a/a/z;
+    iget-object v4, v1, Lorg/a/a/u;->bzJ:Lorg/a/a/z;
 
     const-string v5, "RuntimeInvisibleParameterAnnotations"
 
@@ -2518,32 +2518,32 @@
 
     move-result v4
 
-    iget-object v5, v1, Lorg/a/a/u;->bCi:[Lorg/a/a/b;
+    iget-object v5, v1, Lorg/a/a/u;->bCd:[Lorg/a/a/b;
 
-    iget v10, v1, Lorg/a/a/u;->bCh:I
+    iget v10, v1, Lorg/a/a/u;->bCc:I
 
     if-nez v10, :cond_7e
 
-    iget-object v10, v1, Lorg/a/a/u;->bCi:[Lorg/a/a/b;
+    iget-object v10, v1, Lorg/a/a/u;->bCd:[Lorg/a/a/b;
 
     array-length v10, v10
 
     goto :goto_21
 
     :cond_7e
-    iget v10, v1, Lorg/a/a/u;->bCh:I
+    iget v10, v1, Lorg/a/a/u;->bCc: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;->bAw:Lorg/a/a/b;
+    iget-object v4, v1, Lorg/a/a/u;->bAr:Lorg/a/a/b;
 
     if-eqz v4, :cond_80
 
-    iget-object v4, v1, Lorg/a/a/u;->bAw:Lorg/a/a/b;
+    iget-object v4, v1, Lorg/a/a/u;->bAr:Lorg/a/a/b;
 
-    iget-object v5, v1, Lorg/a/a/u;->bzO:Lorg/a/a/z;
+    iget-object v5, v1, Lorg/a/a/u;->bzJ: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;->bAx:Lorg/a/a/b;
+    iget-object v4, v1, Lorg/a/a/u;->bAs:Lorg/a/a/b;
 
     if-eqz v4, :cond_81
 
-    iget-object v4, v1, Lorg/a/a/u;->bAx:Lorg/a/a/b;
+    iget-object v4, v1, Lorg/a/a/u;->bAs:Lorg/a/a/b;
 
-    iget-object v5, v1, Lorg/a/a/u;->bzO:Lorg/a/a/z;
+    iget-object v5, v1, Lorg/a/a/u;->bzJ: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;->bCj:Lorg/a/a/d;
+    iget-object v4, v1, Lorg/a/a/u;->bCe:Lorg/a/a/d;
 
     if-eqz v4, :cond_82
 
-    iget-object v4, v1, Lorg/a/a/u;->bzO:Lorg/a/a/z;
+    iget-object v4, v1, Lorg/a/a/u;->bzJ:Lorg/a/a/z;
 
     const-string v5, "AnnotationDefault"
 
@@ -2583,7 +2583,7 @@
 
     move-result-object v4
 
-    iget-object v5, v1, Lorg/a/a/u;->bCj:Lorg/a/a/d;
+    iget-object v5, v1, Lorg/a/a/u;->bCe: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;->bCj:Lorg/a/a/d;
+    iget-object v5, v1, Lorg/a/a/u;->bCe:Lorg/a/a/d;
 
     iget-object v5, v5, Lorg/a/a/d;->data:[B
 
-    iget-object v10, v1, Lorg/a/a/u;->bCj:Lorg/a/a/d;
+    iget-object v10, v1, Lorg/a/a/u;->bCe: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;->bCl:Lorg/a/a/d;
+    iget-object v4, v1, Lorg/a/a/u;->bCg:Lorg/a/a/d;
 
     if-eqz v4, :cond_83
 
-    iget-object v4, v1, Lorg/a/a/u;->bzO:Lorg/a/a/z;
+    iget-object v4, v1, Lorg/a/a/u;->bzJ:Lorg/a/a/z;
 
     const-string v5, "MethodParameters"
 
@@ -2620,7 +2620,7 @@
 
     move-result-object v4
 
-    iget-object v5, v1, Lorg/a/a/u;->bCl:Lorg/a/a/d;
+    iget-object v5, v1, Lorg/a/a/u;->bCg: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;->bCk:I
+    iget v5, v1, Lorg/a/a/u;->bCf: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;->bCl:Lorg/a/a/d;
+    iget-object v5, v1, Lorg/a/a/u;->bCg:Lorg/a/a/d;
 
     iget-object v5, v5, Lorg/a/a/d;->data:[B
 
-    iget-object v10, v1, Lorg/a/a/u;->bCl:Lorg/a/a/d;
+    iget-object v10, v1, Lorg/a/a/u;->bCg: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;->bAC:Lorg/a/a/c;
+    iget-object v4, v1, Lorg/a/a/u;->bAx:Lorg/a/a/c;
 
     if-eqz v4, :cond_84
 
-    iget-object v4, v1, Lorg/a/a/u;->bAC:Lorg/a/a/c;
+    iget-object v4, v1, Lorg/a/a/u;->bAx:Lorg/a/a/c;
 
-    iget-object v5, v1, Lorg/a/a/u;->bzO:Lorg/a/a/z;
+    iget-object v5, v1, Lorg/a/a/u;->bzJ: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;->bBL:Lorg/a/a/t;
+    iget-object v1, v1, Lorg/a/a/u;->bBG: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;->bAo:Lorg/a/a/d;
+    iget-object v1, v0, Lorg/a/a/h;->bAj:Lorg/a/a/d;
 
     if-eqz v1, :cond_86
 
-    iget-object v1, v0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
+    iget-object v1, v0, Lorg/a/a/h;->bzJ:Lorg/a/a/z;
 
     const-string v2, "InnerClasses"
 
@@ -2694,7 +2694,7 @@
 
     move-result-object v1
 
-    iget-object v2, v0, Lorg/a/a/h;->bAo:Lorg/a/a/d;
+    iget-object v2, v0, Lorg/a/a/h;->bAj: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;->bAn:I
+    iget v2, v0, Lorg/a/a/h;->bAi: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;->bAo:Lorg/a/a/d;
+    iget-object v2, v0, Lorg/a/a/h;->bAj:Lorg/a/a/d;
 
     iget-object v2, v2, Lorg/a/a/d;->data:[B
 
-    iget-object v10, v0, Lorg/a/a/h;->bAo:Lorg/a/a/d;
+    iget-object v10, v0, Lorg/a/a/h;->bAj: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;->bAp:I
+    iget v1, v0, Lorg/a/a/h;->bAk:I
 
     if-eqz v1, :cond_87
 
-    iget-object v1, v0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
+    iget-object v1, v0, Lorg/a/a/h;->bzJ:Lorg/a/a/z;
 
     const-string v2, "EnclosingMethod"
 
@@ -2747,18 +2747,18 @@
 
     move-result-object v1
 
-    iget v2, v0, Lorg/a/a/h;->bAp:I
+    iget v2, v0, Lorg/a/a/h;->bAk: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;->bAq:I
+    iget v2, v0, Lorg/a/a/h;->bAl:I
 
     invoke-virtual {v1, v2}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
 
     :cond_87
-    iget v1, v0, Lorg/a/a/h;->bAe:I
+    iget v1, v0, Lorg/a/a/h;->bzZ:I
 
     const/16 v2, 0x1000
 
@@ -2776,7 +2776,7 @@
 
     if-ge v1, v2, :cond_88
 
-    iget-object v1, v0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
+    iget-object v1, v0, Lorg/a/a/h;->bzJ: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;->bAr:I
+    iget v1, v0, Lorg/a/a/h;->bAm:I
 
     if-eqz v1, :cond_89
 
-    iget-object v1, v0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
+    iget-object v1, v0, Lorg/a/a/h;->bzJ: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;->bAr:I
+    iget v8, v0, Lorg/a/a/h;->bAm: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;->bAs:I
+    iget v1, v0, Lorg/a/a/h;->bAn:I
 
     if-eqz v1, :cond_8a
 
-    iget-object v1, v0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
+    iget-object v1, v0, Lorg/a/a/h;->bzJ:Lorg/a/a/z;
 
     const-string v8, "SourceFile"
 
@@ -2841,18 +2841,18 @@
 
     move-result-object v1
 
-    iget v2, v0, Lorg/a/a/h;->bAs:I
+    iget v2, v0, Lorg/a/a/h;->bAn: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;->bAt:Lorg/a/a/d;
+    iget-object v1, v0, Lorg/a/a/h;->bAo: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;->bzO:Lorg/a/a/z;
+    iget-object v2, v0, Lorg/a/a/h;->bzJ:Lorg/a/a/z;
 
     const-string v8, "SourceDebugExtension"
 
@@ -2868,7 +2868,7 @@
 
     move-result-object v2
 
-    iget-object v8, v0, Lorg/a/a/h;->bAt:Lorg/a/a/d;
+    iget-object v8, v0, Lorg/a/a/h;->bAo: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;->bAe:I
+    iget v1, v0, Lorg/a/a/h;->bzZ:I
 
     const/high16 v2, 0x20000
 
@@ -2890,7 +2890,7 @@
 
     if-eqz v1, :cond_8c
 
-    iget-object v1, v0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
+    iget-object v1, v0, Lorg/a/a/h;->bzJ: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;->bAu:Lorg/a/a/b;
+    iget-object v1, v0, Lorg/a/a/h;->bAp:Lorg/a/a/b;
 
     if-eqz v1, :cond_8d
 
-    iget-object v2, v0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
+    iget-object v2, v0, Lorg/a/a/h;->bzJ: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;->bAv:Lorg/a/a/b;
+    iget-object v1, v0, Lorg/a/a/h;->bAq:Lorg/a/a/b;
 
     if-eqz v1, :cond_8e
 
-    iget-object v2, v0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
+    iget-object v2, v0, Lorg/a/a/h;->bzJ: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;->bAw:Lorg/a/a/b;
+    iget-object v1, v0, Lorg/a/a/h;->bAr:Lorg/a/a/b;
 
     if-eqz v1, :cond_8f
 
-    iget-object v2, v0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
+    iget-object v2, v0, Lorg/a/a/h;->bzJ: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;->bAx:Lorg/a/a/b;
+    iget-object v1, v0, Lorg/a/a/h;->bAs:Lorg/a/a/b;
 
     if-eqz v1, :cond_90
 
-    iget-object v2, v0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
+    iget-object v2, v0, Lorg/a/a/h;->bzJ: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;->bzO:Lorg/a/a/z;
+    iget-object v1, v0, Lorg/a/a/h;->bzJ:Lorg/a/a/z;
 
-    iget-object v2, v1, Lorg/a/a/z;->bDg:Lorg/a/a/d;
+    iget-object v2, v1, Lorg/a/a/z;->bDb: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;->bDg:Lorg/a/a/d;
+    iget-object v6, v1, Lorg/a/a/z;->bDb: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;->bDf:I
+    iget v6, v1, Lorg/a/a/z;->bDa: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;->bDg:Lorg/a/a/d;
+    iget-object v6, v1, Lorg/a/a/z;->bDb:Lorg/a/a/d;
 
     iget-object v6, v6, Lorg/a/a/d;->data:[B
 
-    iget-object v1, v1, Lorg/a/a/z;->bDg:Lorg/a/a/d;
+    iget-object v1, v1, Lorg/a/a/z;->bDb: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;->bAy:Lorg/a/a/w;
+    iget-object v1, v0, Lorg/a/a/h;->bAt:Lorg/a/a/w;
 
     if-eqz v1, :cond_93
 
-    iget-object v2, v1, Lorg/a/a/w;->bCF:Lorg/a/a/d;
+    iget-object v2, v1, Lorg/a/a/w;->bCA: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;->bCH:Lorg/a/a/d;
+    iget-object v6, v1, Lorg/a/a/w;->bCC: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;->bCJ:Lorg/a/a/d;
+    iget-object v6, v1, Lorg/a/a/w;->bCE: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;->bCL:Lorg/a/a/d;
+    iget-object v6, v1, Lorg/a/a/w;->bCG:Lorg/a/a/d;
 
     iget v6, v6, Lorg/a/a/d;->length:I
 
     add-int/2addr v2, v6
 
-    iget-object v6, v1, Lorg/a/a/w;->bCN:Lorg/a/a/d;
+    iget-object v6, v1, Lorg/a/a/w;->bCI: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;->bzO:Lorg/a/a/z;
+    iget-object v6, v1, Lorg/a/a/w;->bzJ:Lorg/a/a/z;
 
     const-string v7, "Module"
 
@@ -3054,35 +3054,35 @@
 
     move-result-object v2
 
-    iget v6, v1, Lorg/a/a/w;->bCB:I
+    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 v6, v1, Lorg/a/a/w;->bCC:I
+    iget v6, v1, Lorg/a/a/w;->bCx: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;->bCD:I
+    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 v6, v1, Lorg/a/a/w;->bCE:I
+    iget v6, v1, Lorg/a/a/w;->bCz: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;->bCF:Lorg/a/a/d;
+    iget-object v6, v1, Lorg/a/a/w;->bCA:Lorg/a/a/d;
 
     iget-object v6, v6, Lorg/a/a/d;->data:[B
 
-    iget-object v7, v1, Lorg/a/a/w;->bCF:Lorg/a/a/d;
+    iget-object v7, v1, Lorg/a/a/w;->bCA:Lorg/a/a/d;
 
     iget v7, v7, Lorg/a/a/d;->length:I
 
@@ -3092,17 +3092,17 @@
 
     move-result-object v2
 
-    iget v6, v1, Lorg/a/a/w;->bCG: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-object v6, v1, Lorg/a/a/w;->bCH:Lorg/a/a/d;
+    iget-object v6, v1, Lorg/a/a/w;->bCC: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-object v7, v1, Lorg/a/a/w;->bCC:Lorg/a/a/d;
 
     iget v7, v7, Lorg/a/a/d;->length:I
 
@@ -3110,17 +3110,17 @@
 
     move-result-object v2
 
-    iget v6, v1, Lorg/a/a/w;->bCI:I
+    iget v6, v1, Lorg/a/a/w;->bCD: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, v1, Lorg/a/a/w;->bCE: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-object v7, v1, Lorg/a/a/w;->bCE:Lorg/a/a/d;
 
     iget v7, v7, Lorg/a/a/d;->length:I
 
@@ -3128,17 +3128,17 @@
 
     move-result-object v2
 
-    iget v6, v1, Lorg/a/a/w;->bCK:I
+    iget v6, v1, Lorg/a/a/w;->bCF: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, v1, Lorg/a/a/w;->bCG: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-object v7, v1, Lorg/a/a/w;->bCG:Lorg/a/a/d;
 
     iget v7, v7, Lorg/a/a/d;->length:I
 
@@ -3146,27 +3146,27 @@
 
     move-result-object v2
 
-    iget v6, v1, Lorg/a/a/w;->bCM:I
+    iget v6, v1, Lorg/a/a/w;->bCH: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, v1, Lorg/a/a/w;->bCI: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-object v7, v1, Lorg/a/a/w;->bCI: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
+    iget v2, v1, Lorg/a/a/w;->bCJ:I
 
     if-lez v2, :cond_92
 
-    iget-object v2, v1, Lorg/a/a/w;->bzO:Lorg/a/a/z;
+    iget-object v2, v1, Lorg/a/a/w;->bzJ:Lorg/a/a/z;
 
     const-string v6, "ModulePackages"
 
@@ -3178,7 +3178,7 @@
 
     move-result-object v2
 
-    iget-object v6, v1, Lorg/a/a/w;->bCP:Lorg/a/a/d;
+    iget-object v6, v1, Lorg/a/a/w;->bCK:Lorg/a/a/d;
 
     iget v6, v6, Lorg/a/a/d;->length:I
 
@@ -3190,17 +3190,17 @@
 
     move-result-object v2
 
-    iget v6, v1, Lorg/a/a/w;->bCO:I
+    iget v6, v1, Lorg/a/a/w;->bCJ: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, v1, Lorg/a/a/w;->bCK: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-object v7, v1, Lorg/a/a/w;->bCK:Lorg/a/a/d;
 
     iget v7, v7, Lorg/a/a/d;->length:I
 
@@ -3209,11 +3209,11 @@
     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;->bCQ:I
+    iget v2, v1, Lorg/a/a/w;->bCL:I
 
     if-lez v2, :cond_93
 
-    iget-object v2, v1, Lorg/a/a/w;->bzO:Lorg/a/a/z;
+    iget-object v2, v1, Lorg/a/a/w;->bzJ:Lorg/a/a/z;
 
     const-string v6, "ModuleMainClass"
 
@@ -3231,16 +3231,16 @@
 
     move-result-object v2
 
-    iget v1, v1, Lorg/a/a/w;->bCQ:I
+    iget v1, v1, Lorg/a/a/w;->bCL:I
 
     invoke-virtual {v2, v1}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
 
     :cond_93
-    iget v1, v0, Lorg/a/a/h;->bAz:I
+    iget v1, v0, Lorg/a/a/h;->bAu:I
 
     if-eqz v1, :cond_94
 
-    iget-object v1, v0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
+    iget-object v1, v0, Lorg/a/a/h;->bzJ:Lorg/a/a/z;
 
     const-string v2, "NestHost"
 
@@ -3258,16 +3258,16 @@
 
     move-result-object v1
 
-    iget v2, v0, Lorg/a/a/h;->bAz:I
+    iget v2, v0, Lorg/a/a/h;->bAu: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;->bAB:Lorg/a/a/d;
+    iget-object v1, v0, Lorg/a/a/h;->bAw:Lorg/a/a/d;
 
     if-eqz v1, :cond_95
 
-    iget-object v1, v0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
+    iget-object v1, v0, Lorg/a/a/h;->bzJ:Lorg/a/a/z;
 
     const-string v2, "NestMembers"
 
@@ -3279,7 +3279,7 @@
 
     move-result-object v1
 
-    iget-object v2, v0, Lorg/a/a/h;->bAB:Lorg/a/a/d;
+    iget-object v2, v0, Lorg/a/a/h;->bAw: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;->bAA:I
+    iget v2, v0, Lorg/a/a/h;->bAv: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;->bAB:Lorg/a/a/d;
+    iget-object v2, v0, Lorg/a/a/h;->bAw:Lorg/a/a/d;
 
     iget-object v2, v2, Lorg/a/a/d;->data:[B
 
-    iget-object v6, v0, Lorg/a/a/h;->bAB:Lorg/a/a/d;
+    iget-object v6, v0, Lorg/a/a/h;->bAw: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;->bAC:Lorg/a/a/c;
+    iget-object v1, v0, Lorg/a/a/h;->bAx:Lorg/a/a/c;
 
     if-eqz v1, :cond_96
 
-    iget-object v2, v0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
+    iget-object v2, v0, Lorg/a/a/h;->bzJ: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;->bAC:Lorg/a/a/c;
+    iget-object v3, v0, Lorg/a/a/h;->bAx: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;->bAj:Lorg/a/a/n;
+    iget-object v3, v0, Lorg/a/a/h;->bAe:Lorg/a/a/n;
 
     :goto_25
     if-eqz v3, :cond_97
 
-    iget-object v5, v3, Lorg/a/a/n;->bAC:Lorg/a/a/c;
+    iget-object v5, v3, Lorg/a/a/n;->bAx: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;->bBb:Lorg/a/a/m;
+    iget-object v3, v3, Lorg/a/a/n;->bAW:Lorg/a/a/m;
 
     check-cast v3, Lorg/a/a/n;
 
     goto :goto_25
 
     :cond_97
-    iget-object v3, v0, Lorg/a/a/h;->bAl:Lorg/a/a/u;
+    iget-object v3, v0, Lorg/a/a/h;->bAg:Lorg/a/a/u;
 
     :goto_26
     if-eqz v3, :cond_98
 
-    iget-object v5, v3, Lorg/a/a/u;->bAC:Lorg/a/a/c;
+    iget-object v5, v3, Lorg/a/a/u;->bAx: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;->bCc:Lorg/a/a/c;
+    iget-object v5, v3, Lorg/a/a/u;->bBX: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;->bBL:Lorg/a/a/t;
+    iget-object v3, v3, Lorg/a/a/u;->bBG: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;->bzW:[Lorg/a/a/c;
+    iget-object v5, v2, Lorg/a/a/c$a;->bzR:[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;->bAj:Lorg/a/a/n;
+    iput-object v2, v0, Lorg/a/a/h;->bAe: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;->bAf:Lorg/a/a/n;
 
-    iput-object v2, v0, Lorg/a/a/h;->bAl:Lorg/a/a/u;
+    iput-object v2, v0, Lorg/a/a/h;->bAg: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;->bAh:Lorg/a/a/u;
 
-    iput-object v2, v0, Lorg/a/a/h;->bAu:Lorg/a/a/b;
+    iput-object v2, v0, Lorg/a/a/h;->bAp: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;->bAq: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;->bAr: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;->bAs:Lorg/a/a/b;
 
-    iput-object v2, v0, Lorg/a/a/h;->bAy:Lorg/a/a/w;
+    iput-object v2, v0, Lorg/a/a/h;->bAt:Lorg/a/a/w;
 
-    iput v14, v0, Lorg/a/a/h;->bAz:I
+    iput v14, v0, Lorg/a/a/h;->bAu:I
 
-    iput v14, v0, Lorg/a/a/h;->bAA:I
+    iput v14, v0, Lorg/a/a/h;->bAv:I
 
-    iput-object v2, v0, Lorg/a/a/h;->bAB:Lorg/a/a/d;
+    iput-object v2, v0, Lorg/a/a/h;->bAw:Lorg/a/a/d;
 
-    iput-object v2, v0, Lorg/a/a/h;->bAC:Lorg/a/a/c;
+    iput-object v2, v0, Lorg/a/a/h;->bAx: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;->bAD:I
+    iput v2, v0, Lorg/a/a/h;->bAy: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;->bzO:Lorg/a/a/z;
+    iget-object v2, v0, Lorg/a/a/h;->bzJ: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;->bzO:Lorg/a/a/z;
+    iget-object p1, p0, Lorg/a/a/h;->bzJ: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;->bzO:Lorg/a/a/z;
+    iget-object p2, p0, Lorg/a/a/h;->bzJ:Lorg/a/a/z;
 
-    iget-object p3, p0, Lorg/a/a/h;->bAw:Lorg/a/a/b;
+    iget-object p3, p0, Lorg/a/a/h;->bAr: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;->bAw:Lorg/a/a/b;
+    iput-object p1, p0, Lorg/a/a/h;->bAr:Lorg/a/a/b;
 
     return-object p1
 
     :cond_0
     new-instance p1, Lorg/a/a/b;
 
-    iget-object p2, p0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
+    iget-object p2, p0, Lorg/a/a/h;->bzJ:Lorg/a/a/z;
 
-    iget-object p3, p0, Lorg/a/a/h;->bAx:Lorg/a/a/b;
+    iget-object p3, p0, Lorg/a/a/h;->bAs: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;->bAx:Lorg/a/a/b;
+    iput-object p1, p0, Lorg/a/a/h;->bAs: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;->bzO:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/h;->bzJ: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;->bAj:Lorg/a/a/n;
+    iget-object p1, p0, Lorg/a/a/h;->bAe:Lorg/a/a/n;
 
     if-nez p1, :cond_0
 
-    iput-object v7, p0, Lorg/a/a/h;->bAj:Lorg/a/a/n;
+    iput-object v7, p0, Lorg/a/a/h;->bAe:Lorg/a/a/n;
 
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lorg/a/a/h;->bAk:Lorg/a/a/n;
+    iget-object p1, p0, Lorg/a/a/h;->bAf:Lorg/a/a/n;
 
-    iput-object v7, p1, Lorg/a/a/n;->bBb:Lorg/a/a/m;
+    iput-object v7, p1, Lorg/a/a/n;->bAW:Lorg/a/a/m;
 
     :goto_0
-    iput-object v7, p0, Lorg/a/a/h;->bAk:Lorg/a/a/n;
+    iput-object v7, p0, Lorg/a/a/h;->bAf: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;->bzO:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/h;->bzJ:Lorg/a/a/z;
 
-    iget v7, p0, Lorg/a/a/h;->bAD:I
+    iget v7, p0, Lorg/a/a/h;->bAy: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;->bAl:Lorg/a/a/u;
+    iget-object p1, p0, Lorg/a/a/h;->bAg:Lorg/a/a/u;
 
     if-nez p1, :cond_0
 
-    iput-object v8, p0, Lorg/a/a/h;->bAl:Lorg/a/a/u;
+    iput-object v8, p0, Lorg/a/a/h;->bAg:Lorg/a/a/u;
 
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lorg/a/a/h;->bAm:Lorg/a/a/u;
+    iget-object p1, p0, Lorg/a/a/h;->bAh:Lorg/a/a/u;
 
-    iput-object v8, p1, Lorg/a/a/u;->bBL:Lorg/a/a/t;
+    iput-object v8, p1, Lorg/a/a/u;->bBG:Lorg/a/a/t;
 
     :goto_0
-    iput-object v8, p0, Lorg/a/a/h;->bAm:Lorg/a/a/u;
+    iput-object v8, p0, Lorg/a/a/h;->bAh: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;->bAe:I
+    iput p2, p0, Lorg/a/a/h;->bzZ:I
 
-    iget-object p2, p0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
+    iget-object p2, p0, Lorg/a/a/h;->bzJ:Lorg/a/a/z;
 
     const v0, 0xffff
 
     and-int/2addr p1, v0
 
-    iput p1, p2, Lorg/a/a/z;->bDb:I
+    iput p1, p2, Lorg/a/a/z;->bCW: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;->bAf:I
+    iput p2, p0, Lorg/a/a/h;->bAa:I
 
     if-eqz p4, :cond_0
 
-    iget-object p2, p0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
+    iget-object p2, p0, Lorg/a/a/h;->bzJ: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;->bAr:I
+    iput p2, p0, Lorg/a/a/h;->bAm:I
 
     :cond_0
     const/4 p2, 0x0
@@ -3639,7 +3639,7 @@
     goto :goto_0
 
     :cond_1
-    iget-object p3, p0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
+    iget-object p3, p0, Lorg/a/a/h;->bzJ: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;->bAg:I
+    iput p3, p0, Lorg/a/a/h;->bAb:I
 
     if-eqz p6, :cond_2
 
@@ -3658,22 +3658,22 @@
 
     array-length p3, p6
 
-    iput p3, p0, Lorg/a/a/h;->bAh:I
+    iput p3, p0, Lorg/a/a/h;->bAc:I
 
-    iget p3, p0, Lorg/a/a/h;->bAh:I
+    iget p3, p0, Lorg/a/a/h;->bAc:I
 
     new-array p3, p3, [I
 
-    iput-object p3, p0, Lorg/a/a/h;->bAi:[I
+    iput-object p3, p0, Lorg/a/a/h;->bAd:[I
 
     :goto_1
-    iget p3, p0, Lorg/a/a/h;->bAh:I
+    iget p3, p0, Lorg/a/a/h;->bAc:I
 
     if-ge p2, p3, :cond_2
 
-    iget-object p3, p0, Lorg/a/a/h;->bAi:[I
+    iget-object p3, p0, Lorg/a/a/h;->bAd:[I
 
-    iget-object p4, p0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
+    iget-object p4, p0, Lorg/a/a/h;->bzJ: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;->bAD:I
+    iget p2, p0, Lorg/a/a/h;->bAy:I
 
     const/4 p3, 0x1
 
@@ -3702,7 +3702,7 @@
 
     const/4 p1, 0x2
 
-    iput p1, p0, Lorg/a/a/h;->bAD:I
+    iput p1, p0, Lorg/a/a/h;->bAy: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;->bAo:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/h;->bAj: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;->bAo:Lorg/a/a/d;
+    iput-object v0, p0, Lorg/a/a/h;->bAj:Lorg/a/a/d;
 
     :cond_0
-    iget-object v0, p0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
+    iget-object v0, p0, Lorg/a/a/h;->bzJ:Lorg/a/a/z;
 
     const/4 v1, 0x7
 
@@ -3734,19 +3734,19 @@
 
     if-nez v0, :cond_3
 
-    iget v0, p0, Lorg/a/a/h;->bAn:I
+    iget v0, p0, Lorg/a/a/h;->bAi:I
 
     add-int/lit8 v0, v0, 0x1
 
-    iput v0, p0, Lorg/a/a/h;->bAn:I
+    iput v0, p0, Lorg/a/a/h;->bAi:I
 
-    iget-object v0, p0, Lorg/a/a/h;->bAo:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/h;->bAj: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;->bAo:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/h;->bAj: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;->bzO:Lorg/a/a/z;
+    iget-object v3, p0, Lorg/a/a/h;->bzJ: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;->bAo:Lorg/a/a/d;
+    iget-object p2, p0, Lorg/a/a/h;->bAj:Lorg/a/a/d;
 
     if-nez p3, :cond_2
 
     goto :goto_1
 
     :cond_2
-    iget-object v0, p0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
+    iget-object v0, p0, Lorg/a/a/h;->bzJ: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;->bAo:Lorg/a/a/d;
+    iget-object p2, p0, Lorg/a/a/h;->bAj: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;->bAn:I
+    iget p2, p0, Lorg/a/a/h;->bAi: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;->bzO:Lorg/a/a/z;
+    iget-object v0, p0, Lorg/a/a/h;->bzJ: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;->bAs:I
+    iput p1, p0, Lorg/a/a/h;->bAn:I
 
     :cond_0
     if-eqz p2, :cond_1
@@ -3824,7 +3824,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lorg/a/a/h;->bAt:Lorg/a/a/d;
+    iput-object p1, p0, Lorg/a/a/h;->bAo: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;->bAC:Lorg/a/a/c;
+    iget-object v0, p0, Lorg/a/a/h;->bAx:Lorg/a/a/c;
 
-    iput-object v0, p1, Lorg/a/a/c;->bzV:Lorg/a/a/c;
+    iput-object v0, p1, Lorg/a/a/c;->bzQ:Lorg/a/a/c;
 
-    iput-object p1, p0, Lorg/a/a/h;->bAC:Lorg/a/a/c;
+    iput-object p1, p0, Lorg/a/a/h;->bAx: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;->bzO:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/h;->bzJ: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;->bzO:Lorg/a/a/z;
+    iget-object v2, p0, Lorg/a/a/h;->bzJ: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;->bAy:Lorg/a/a/w;
+    iput-object v0, p0, Lorg/a/a/h;->bAt: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;->bzO:Lorg/a/a/z;
+    iget-object v0, p0, Lorg/a/a/h;->bzJ: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;->bAz:I
+    iput p1, p0, Lorg/a/a/h;->bAu: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;->bAB:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/h;->bAw: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;->bAB:Lorg/a/a/d;
+    iput-object v0, p0, Lorg/a/a/h;->bAw:Lorg/a/a/d;
 
     :cond_0
-    iget v0, p0, Lorg/a/a/h;->bAA:I
+    iget v0, p0, Lorg/a/a/h;->bAv:I
 
     add-int/lit8 v0, v0, 0x1
 
-    iput v0, p0, Lorg/a/a/h;->bAA:I
+    iput v0, p0, Lorg/a/a/h;->bAv:I
 
-    iget-object v0, p0, Lorg/a/a/h;->bAB:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/h;->bAw:Lorg/a/a/d;
 
-    iget-object v1, p0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/h;->bzJ: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;->bzO:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/h;->bzJ: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;->bzO:Lorg/a/a/z;
+    iget-object p2, p0, Lorg/a/a/h;->bzJ:Lorg/a/a/z;
 
-    iget-object v1, p0, Lorg/a/a/h;->bAu:Lorg/a/a/b;
+    iget-object v1, p0, Lorg/a/a/h;->bAp: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;->bAu:Lorg/a/a/b;
+    iput-object p1, p0, Lorg/a/a/h;->bAp:Lorg/a/a/b;
 
     return-object p1
 
     :cond_0
     new-instance p1, Lorg/a/a/b;
 
-    iget-object p2, p0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
+    iget-object p2, p0, Lorg/a/a/h;->bzJ:Lorg/a/a/z;
 
-    iget-object v1, p0, Lorg/a/a/h;->bAv:Lorg/a/a/b;
+    iget-object v1, p0, Lorg/a/a/h;->bAq: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;->bAv:Lorg/a/a/b;
+    iput-object p1, p0, Lorg/a/a/h;->bAq: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;->bzO:Lorg/a/a/z;
+    iget-object v0, p0, Lorg/a/a/h;->bzJ: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;->bAp:I
+    iput p1, p0, Lorg/a/a/h;->bAk:I
 
     if-eqz p2, :cond_0
 
     if-eqz p3, :cond_0
 
-    iget-object p1, p0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
+    iget-object p1, p0, Lorg/a/a/h;->bzJ: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;->bAq:I
+    iput p1, p0, Lorg/a/a/h;->bAl: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 90bb722d1a..0b0ce25c97 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 bAE:Lorg/a/a/p;
+.field final bAA:[Ljava/lang/Object;
 
-.field final bAF:[Ljava/lang/Object;
+.field final bAz:Lorg/a/a/p;
 
 .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;->bAE:Lorg/a/a/p;
+    iput-object p3, p0, Lorg/a/a/i;->bAz:Lorg/a/a/p;
 
-    iput-object p4, p0, Lorg/a/a/i;->bAF:[Ljava/lang/Object;
+    iput-object p4, p0, Lorg/a/a/i;->bAA:[Ljava/lang/Object;
 
     return-void
 .end method
@@ -73,9 +73,9 @@
 
     if-eqz v1, :cond_2
 
-    iget-object v1, p0, Lorg/a/a/i;->bAE:Lorg/a/a/p;
+    iget-object v1, p0, Lorg/a/a/i;->bAz:Lorg/a/a/p;
 
-    iget-object v3, p1, Lorg/a/a/i;->bAE:Lorg/a/a/p;
+    iget-object v3, p1, Lorg/a/a/i;->bAz: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;->bAF:[Ljava/lang/Object;
+    iget-object v1, p0, Lorg/a/a/i;->bAA:[Ljava/lang/Object;
 
-    iget-object p1, p1, Lorg/a/a/i;->bAF:[Ljava/lang/Object;
+    iget-object p1, p1, Lorg/a/a/i;->bAA:[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;->bAE:Lorg/a/a/p;
+    iget-object v1, p0, Lorg/a/a/i;->bAz: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;->bAF:[Ljava/lang/Object;
+    iget-object v1, p0, Lorg/a/a/i;->bAA:[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;->bAE:Lorg/a/a/p;
+    iget-object v2, p0, Lorg/a/a/i;->bAz: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;->bAF:[Ljava/lang/Object;
+    iget-object v1, p0, Lorg/a/a/i;->bAA:[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 1087cc28ff..487285b65c 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 bAG:[Lorg/a/a/c;
+.field bAB:[Lorg/a/a/c;
 
-.field bAH:I
+.field bAC:I
 
-.field bAI:[C
+.field bAD:[C
 
-.field bAJ:I
+.field bAE:I
 
-.field bAK:Ljava/lang/String;
+.field bAF:Ljava/lang/String;
 
-.field bAL:Ljava/lang/String;
+.field bAG:Ljava/lang/String;
 
-.field bAM:[Lorg/a/a/r;
+.field bAH:[Lorg/a/a/r;
+
+.field bAI:I
+
+.field bAJ:Lorg/a/a/ab;
+
+.field bAK:[Lorg/a/a/r;
+
+.field bAL:[Lorg/a/a/r;
+
+.field bAM:[I
 
 .field bAN:I
 
-.field bAO:Lorg/a/a/ab;
+.field bAO:I
 
-.field bAP:[Lorg/a/a/r;
+.field bAP:I
 
-.field bAQ:[Lorg/a/a/r;
+.field bAQ:I
 
-.field bAR:[I
+.field bAR:[Ljava/lang/Object;
 
 .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;
+.field bAT:[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 aad4df9e5d..426086ffa1 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 bAZ:Lorg/a/a/r;
+.field final bAU:Lorg/a/a/r;
 
-.field bBa:Lorg/a/a/l;
+.field bAV: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;->bAZ:Lorg/a/a/r;
+    iput-object p2, p0, Lorg/a/a/l;->bAU:Lorg/a/a/r;
 
-    iput-object p3, p0, Lorg/a/a/l;->bBa:Lorg/a/a/l;
+    iput-object p3, p0, Lorg/a/a/l;->bAV: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 5338e18ffe..f070e957d5 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 bBb:Lorg/a/a/m;
+.field protected bAW:Lorg/a/a/m;
 
-.field protected final bzM:I
+.field protected final bzH:I
 
 
 # direct methods
@@ -27,11 +27,11 @@
 
     const/high16 p1, 0x70000
 
-    iput p1, p0, Lorg/a/a/m;->bzM:I
+    iput p1, p0, Lorg/a/a/m;->bzH:I
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lorg/a/a/m;->bBb:Lorg/a/a/m;
+    iput-object p1, p0, Lorg/a/a/m;->bAW: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;->bzM:I
+    iget v0, p0, Lorg/a/a/m;->bzH:I
 
     const/high16 v1, 0x50000
 
     if-lt v0, v1, :cond_1
 
-    iget-object v0, p0, Lorg/a/a/m;->bBb:Lorg/a/a/m;
+    iget-object v0, p0, Lorg/a/a/m;->bAW: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;->bBb:Lorg/a/a/m;
+    iget-object v0, p0, Lorg/a/a/m;->bAW: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;->bBb:Lorg/a/a/m;
+    iget-object v0, p0, Lorg/a/a/m;->bAW: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 ea9d44ecdb..2c4a2709bb 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 bAC:Lorg/a/a/c;
+.field final bAX:I
 
-.field final bAe:I
+.field final bAY:I
 
-.field bAr:I
+.field bAZ:I
 
-.field bAu:Lorg/a/a/b;
+.field bAm:I
 
-.field bAv:Lorg/a/a/b;
+.field bAp:Lorg/a/a/b;
 
-.field bAw:Lorg/a/a/b;
+.field bAq:Lorg/a/a/b;
 
-.field bAx:Lorg/a/a/b;
+.field bAr:Lorg/a/a/b;
 
-.field final bBc:I
+.field bAs:Lorg/a/a/b;
 
-.field final bBd:I
+.field bAx:Lorg/a/a/c;
 
-.field bBe:I
+.field final bzJ:Lorg/a/a/z;
 
-.field final bzO:Lorg/a/a/z;
+.field final bzZ:I
 
 
 # direct methods
@@ -33,21 +33,21 @@
 
     invoke-direct {p0}, Lorg/a/a/m;-><init>()V
 
-    iput-object p1, p0, Lorg/a/a/n;->bzO:Lorg/a/a/z;
+    iput-object p1, p0, Lorg/a/a/n;->bzJ:Lorg/a/a/z;
 
-    iput p2, p0, Lorg/a/a/n;->bAe:I
+    iput p2, p0, Lorg/a/a/n;->bzZ:I
 
     invoke-virtual {p1, p3}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
 
     move-result p2
 
-    iput p2, p0, Lorg/a/a/n;->bBc:I
+    iput p2, p0, Lorg/a/a/n;->bAX:I
 
     invoke-virtual {p1, p4}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
 
     move-result p2
 
-    iput p2, p0, Lorg/a/a/n;->bBd:I
+    iput p2, p0, Lorg/a/a/n;->bAY:I
 
     if-eqz p5, :cond_0
 
@@ -55,7 +55,7 @@
 
     move-result p2
 
-    iput p2, p0, Lorg/a/a/n;->bAr:I
+    iput p2, p0, Lorg/a/a/n;->bAm: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;->bBe:I
+    iput p1, p0, Lorg/a/a/n;->bAZ: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;->bzO:Lorg/a/a/z;
+    iget-object p1, p0, Lorg/a/a/n;->bzJ: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;->bzO:Lorg/a/a/z;
+    iget-object p2, p0, Lorg/a/a/n;->bzJ:Lorg/a/a/z;
 
-    iget-object p3, p0, Lorg/a/a/n;->bAw:Lorg/a/a/b;
+    iget-object p3, p0, Lorg/a/a/n;->bAr: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;->bAw:Lorg/a/a/b;
+    iput-object p1, p0, Lorg/a/a/n;->bAr:Lorg/a/a/b;
 
     return-object p1
 
     :cond_0
     new-instance p1, Lorg/a/a/b;
 
-    iget-object p2, p0, Lorg/a/a/n;->bzO:Lorg/a/a/z;
+    iget-object p2, p0, Lorg/a/a/n;->bzJ:Lorg/a/a/z;
 
-    iget-object p3, p0, Lorg/a/a/n;->bAx:Lorg/a/a/b;
+    iget-object p3, p0, Lorg/a/a/n;->bAs: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;->bAx:Lorg/a/a/b;
+    iput-object p1, p0, Lorg/a/a/n;->bAs: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;->bAC:Lorg/a/a/c;
+    iget-object v0, p0, Lorg/a/a/n;->bAx:Lorg/a/a/c;
 
-    iput-object v0, p1, Lorg/a/a/c;->bzV:Lorg/a/a/c;
+    iput-object v0, p1, Lorg/a/a/c;->bzQ:Lorg/a/a/c;
 
-    iput-object p1, p0, Lorg/a/a/n;->bAC:Lorg/a/a/c;
+    iput-object p1, p0, Lorg/a/a/n;->bAx: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;->bzO:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/n;->bzJ: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;->bzO:Lorg/a/a/z;
+    iget-object p2, p0, Lorg/a/a/n;->bzJ:Lorg/a/a/z;
 
-    iget-object v1, p0, Lorg/a/a/n;->bAu:Lorg/a/a/b;
+    iget-object v1, p0, Lorg/a/a/n;->bAp: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;->bAu:Lorg/a/a/b;
+    iput-object p1, p0, Lorg/a/a/n;->bAp:Lorg/a/a/b;
 
     return-object p1
 
     :cond_0
     new-instance p1, Lorg/a/a/b;
 
-    iget-object p2, p0, Lorg/a/a/n;->bzO:Lorg/a/a/z;
+    iget-object p2, p0, Lorg/a/a/n;->bzJ:Lorg/a/a/z;
 
-    iget-object v1, p0, Lorg/a/a/n;->bAv:Lorg/a/a/b;
+    iget-object v1, p0, Lorg/a/a/n;->bAq: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;->bAv:Lorg/a/a/b;
+    iput-object p1, p0, Lorg/a/a/n;->bAq: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 f4a425ec36..b0458b5616 100644
--- a/com.discord/smali_classes2/org/a/a/o.smali
+++ b/com.discord/smali_classes2/org/a/a/o.smali
@@ -4,24 +4,24 @@
 
 
 # instance fields
-.field bBf:Lorg/a/a/r;
+.field bBa:Lorg/a/a/r;
 
-.field bBg:[I
+.field bBb:[I
 
-.field bBh:[I
+.field bBc:[I
+
+.field private bBd:[I
+
+.field private bBe:[I
+
+.field private bBf:S
+
+.field bBg:S
+
+.field bBh:I
 
 .field private bBi:[I
 
-.field private bBj:[I
-
-.field private bBk:S
-
-.field bBl:S
-
-.field bBm:I
-
-.field private bBn:[I
-
 
 # direct methods
 .method constructor <init>(Lorg/a/a/r;)V
@@ -29,7 +29,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lorg/a/a/o;->bBf:Lorg/a/a/r;
+    iput-object p1, p0, Lorg/a/a/o;->bBa: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;->bBi:[I
+    iget-object v0, p0, Lorg/a/a/o;->bBd:[I
 
     if-nez v0, :cond_0
 
@@ -45,10 +45,10 @@
 
     new-array v0, v0, [I
 
-    iput-object v0, p0, Lorg/a/a/o;->bBi:[I
+    iput-object v0, p0, Lorg/a/a/o;->bBd:[I
 
     :cond_0
-    iget-object v0, p0, Lorg/a/a/o;->bBi:[I
+    iget-object v0, p0, Lorg/a/a/o;->bBd:[I
 
     array-length v0, v0
 
@@ -64,16 +64,16 @@
 
     new-array v1, v1, [I
 
-    iget-object v2, p0, Lorg/a/a/o;->bBi:[I
+    iget-object v2, p0, Lorg/a/a/o;->bBd:[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;->bBi:[I
+    iput-object v1, p0, Lorg/a/a/o;->bBd:[I
 
     :cond_1
-    iget-object v0, p0, Lorg/a/a/o;->bBi:[I
+    iget-object v0, p0, Lorg/a/a/o;->bBd:[I
 
     aput p2, v0, p1
 
@@ -99,11 +99,11 @@
     const/4 v1, 0x0
 
     :goto_0
-    iget v2, p0, Lorg/a/a/o;->bBm:I
+    iget v2, p0, Lorg/a/a/o;->bBh:I
 
     if-ge v1, v2, :cond_5
 
-    iget-object v2, p0, Lorg/a/a/o;->bBn:[I
+    iget-object v2, p0, Lorg/a/a/o;->bBi:[I
 
     aget v2, v2, v1
 
@@ -123,7 +123,7 @@
 
     if-ne v4, v7, :cond_1
 
-    iget-object v2, p0, Lorg/a/a/o;->bBg:[I
+    iget-object v2, p0, Lorg/a/a/o;->bBb:[I
 
     aget v2, v2, v6
 
@@ -137,7 +137,7 @@
 
     if-ne v4, v7, :cond_2
 
-    iget-object v2, p0, Lorg/a/a/o;->bBh:[I
+    iget-object v2, p0, Lorg/a/a/o;->bBc:[I
 
     array-length v4, v2
 
@@ -169,7 +169,7 @@
     :cond_3
     and-int/2addr p2, v5
 
-    iget-object v0, p1, Lorg/a/a/z;->bDi:[Lorg/a/a/z$a;
+    iget-object v0, p1, Lorg/a/a/z;->bDd:[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;->Ic()Ljava/lang/String;
+    invoke-virtual {p1}, Lorg/a/a/aa;->Ia()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;->bBB:I
+    iget p1, p1, Lorg/a/a/r;->bBw:I
 
     const-string v1, ""
 
@@ -523,11 +523,11 @@
 
     move-result-object p1
 
-    iget-object p0, p0, Lorg/a/a/z;->bDi:[Lorg/a/a/z$a;
+    iget-object p0, p0, Lorg/a/a/z;->bDd:[Lorg/a/a/z$a;
 
     aget-object p0, p0, v0
 
-    iget-wide v0, p0, Lorg/a/a/y;->bCY:J
+    iget-wide v0, p0, Lorg/a/a/y;->bCT:J
 
     long-to-int p0, v0
 
@@ -547,7 +547,7 @@
 
     move-result-object p1
 
-    iget-object p2, p0, Lorg/a/a/z;->bDi:[Lorg/a/a/z$a;
+    iget-object p2, p0, Lorg/a/a/z;->bDd:[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;->bDi:[Lorg/a/a/z$a;
+    iget-object v0, p0, Lorg/a/a/z;->bDd:[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;->bBi:[I
+    iget-object v0, p0, Lorg/a/a/o;->bBd:[I
 
     const/high16 v1, 0x4000000
 
@@ -984,7 +984,7 @@
 .method private dP(I)V
     .locals 2
 
-    iget-short v0, p0, Lorg/a/a/o;->bBl:S
+    iget-short v0, p0, Lorg/a/a/o;->bBg:S
 
     if-lt v0, p1, :cond_0
 
@@ -992,12 +992,12 @@
 
     int-to-short p1, v0
 
-    iput-short p1, p0, Lorg/a/a/o;->bBl:S
+    iput-short p1, p0, Lorg/a/a/o;->bBg:S
 
     return-void
 
     :cond_0
-    iget-short v1, p0, Lorg/a/a/o;->bBk:S
+    iget-short v1, p0, Lorg/a/a/o;->bBf:S
 
     sub-int/2addr p1, v0
 
@@ -1005,11 +1005,11 @@
 
     int-to-short p1, v1
 
-    iput-short p1, p0, Lorg/a/a/o;->bBk:S
+    iput-short p1, p0, Lorg/a/a/o;->bBf:S
 
     const/4 p1, 0x0
 
-    iput-short p1, p0, Lorg/a/a/o;->bBl:S
+    iput-short p1, p0, Lorg/a/a/o;->bBg:S
 
     return-void
 .end method
@@ -1069,17 +1069,17 @@
 .method private pop()I
     .locals 2
 
-    iget-short v0, p0, Lorg/a/a/o;->bBl:S
+    iget-short v0, p0, Lorg/a/a/o;->bBg:S
 
     if-lez v0, :cond_0
 
-    iget-object v1, p0, Lorg/a/a/o;->bBj:[I
+    iget-object v1, p0, Lorg/a/a/o;->bBe:[I
 
     add-int/lit8 v0, v0, -0x1
 
     int-to-short v0, v0
 
-    iput-short v0, p0, Lorg/a/a/o;->bBl:S
+    iput-short v0, p0, Lorg/a/a/o;->bBg:S
 
     aget v0, v1, v0
 
@@ -1088,13 +1088,13 @@
     :cond_0
     const/high16 v0, 0x5000000
 
-    iget-short v1, p0, Lorg/a/a/o;->bBk:S
+    iget-short v1, p0, Lorg/a/a/o;->bBf:S
 
     add-int/lit8 v1, v1, -0x1
 
     int-to-short v1, v1
 
-    iput-short v1, p0, Lorg/a/a/o;->bBk:S
+    iput-short v1, p0, Lorg/a/a/o;->bBf:S
 
     neg-int v1, v1
 
@@ -1106,7 +1106,7 @@
 .method private push(I)V
     .locals 4
 
-    iget-object v0, p0, Lorg/a/a/o;->bBj:[I
+    iget-object v0, p0, Lorg/a/a/o;->bBe:[I
 
     if-nez v0, :cond_0
 
@@ -1114,14 +1114,14 @@
 
     new-array v0, v0, [I
 
-    iput-object v0, p0, Lorg/a/a/o;->bBj:[I
+    iput-object v0, p0, Lorg/a/a/o;->bBe:[I
 
     :cond_0
-    iget-object v0, p0, Lorg/a/a/o;->bBj:[I
+    iget-object v0, p0, Lorg/a/a/o;->bBe:[I
 
     array-length v0, v0
 
-    iget-short v1, p0, Lorg/a/a/o;->bBl:S
+    iget-short v1, p0, Lorg/a/a/o;->bBg:S
 
     if-lt v1, v0, :cond_1
 
@@ -1135,44 +1135,44 @@
 
     new-array v1, v1, [I
 
-    iget-object v2, p0, Lorg/a/a/o;->bBj:[I
+    iget-object v2, p0, Lorg/a/a/o;->bBe:[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;->bBj:[I
+    iput-object v1, p0, Lorg/a/a/o;->bBe:[I
 
     :cond_1
-    iget-object v0, p0, Lorg/a/a/o;->bBj:[I
+    iget-object v0, p0, Lorg/a/a/o;->bBe:[I
 
-    iget-short v1, p0, Lorg/a/a/o;->bBl:S
+    iget-short v1, p0, Lorg/a/a/o;->bBg:S
 
     add-int/lit8 v2, v1, 0x1
 
     int-to-short v2, v2
 
-    iput-short v2, p0, Lorg/a/a/o;->bBl:S
+    iput-short v2, p0, Lorg/a/a/o;->bBg:S
 
     aput p1, v0, v1
 
-    iget-short p1, p0, Lorg/a/a/o;->bBk:S
+    iget-short p1, p0, Lorg/a/a/o;->bBf:S
 
-    iget-short v0, p0, Lorg/a/a/o;->bBl:S
+    iget-short v0, p0, Lorg/a/a/o;->bBg:S
 
     add-int/2addr p1, v0
 
     int-to-short p1, p1
 
-    iget-object v0, p0, Lorg/a/a/o;->bBf:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/o;->bBa:Lorg/a/a/r;
 
-    iget-short v0, v0, Lorg/a/a/r;->bBF:S
+    iget-short v0, v0, Lorg/a/a/r;->bBA:S
 
     if-le p1, v0, :cond_2
 
-    iget-object v0, p0, Lorg/a/a/o;->bBf:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/o;->bBa:Lorg/a/a/r;
 
-    iput-short p1, v0, Lorg/a/a/r;->bBF:S
+    iput-short p1, v0, Lorg/a/a/r;->bBA:S
 
     :cond_2
     return-void
@@ -1430,20 +1430,20 @@
 
     if-ne v1, v5, :cond_4
 
-    iget-object v1, v0, Lorg/a/a/o;->bBn:[I
+    iget-object v1, v0, Lorg/a/a/o;->bBi:[I
 
     if-nez v1, :cond_2
 
     new-array v1, v14, [I
 
-    iput-object v1, v0, Lorg/a/a/o;->bBn:[I
+    iput-object v1, v0, Lorg/a/a/o;->bBi:[I
 
     :cond_2
-    iget-object v1, v0, Lorg/a/a/o;->bBn:[I
+    iget-object v1, v0, Lorg/a/a/o;->bBi:[I
 
     array-length v1, v1
 
-    iget v5, v0, Lorg/a/a/o;->bBm:I
+    iget v5, v0, Lorg/a/a/o;->bBh:I
 
     if-lt v5, v1, :cond_3
 
@@ -1457,20 +1457,20 @@
 
     new-array v5, v5, [I
 
-    iget-object v6, v0, Lorg/a/a/o;->bBn:[I
+    iget-object v6, v0, Lorg/a/a/o;->bBi:[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;->bBn:[I
+    iput-object v5, v0, Lorg/a/a/o;->bBi:[I
 
     :cond_3
-    iget-object v1, v0, Lorg/a/a/o;->bBn:[I
+    iget-object v1, v0, Lorg/a/a/o;->bBi:[I
 
-    iget v5, v0, Lorg/a/a/o;->bBm:I
+    iget v5, v0, Lorg/a/a/o;->bBh:I
 
     add-int/lit8 v6, v5, 0x1
 
-    iput v6, v0, Lorg/a/a/o;->bBm:I
+    iput v6, v0, Lorg/a/a/o;->bBh:I
 
     aput v2, v1, v5
 
@@ -1920,7 +1920,7 @@
     return-void
 
     :pswitch_30
-    iget v1, v3, Lorg/a/a/y;->bBo:I
+    iget v1, v3, Lorg/a/a/y;->bBj: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;->bBg:[I
+    iget-object v0, p1, Lorg/a/a/o;->bBb:[I
 
-    iput-object v0, p0, Lorg/a/a/o;->bBg:[I
+    iput-object v0, p0, Lorg/a/a/o;->bBb:[I
 
-    iget-object v0, p1, Lorg/a/a/o;->bBh:[I
+    iget-object v0, p1, Lorg/a/a/o;->bBc:[I
 
-    iput-object v0, p0, Lorg/a/a/o;->bBh:[I
+    iput-object v0, p0, Lorg/a/a/o;->bBc:[I
 
     const/4 v0, 0x0
 
-    iput-short v0, p0, Lorg/a/a/o;->bBk:S
+    iput-short v0, p0, Lorg/a/a/o;->bBf:S
 
-    iget-object v0, p1, Lorg/a/a/o;->bBi:[I
+    iget-object v0, p1, Lorg/a/a/o;->bBd:[I
 
-    iput-object v0, p0, Lorg/a/a/o;->bBi:[I
+    iput-object v0, p0, Lorg/a/a/o;->bBd:[I
 
-    iget-object v0, p1, Lorg/a/a/o;->bBj:[I
+    iget-object v0, p1, Lorg/a/a/o;->bBe:[I
 
-    iput-object v0, p0, Lorg/a/a/o;->bBj:[I
+    iput-object v0, p0, Lorg/a/a/o;->bBe:[I
 
-    iget-short v0, p1, Lorg/a/a/o;->bBl:S
+    iget-short v0, p1, Lorg/a/a/o;->bBg:S
 
-    iput-short v0, p0, Lorg/a/a/o;->bBl:S
+    iput-short v0, p0, Lorg/a/a/o;->bBg:S
 
-    iget v0, p1, Lorg/a/a/o;->bBm:I
+    iget v0, p1, Lorg/a/a/o;->bBh:I
 
-    iput v0, p0, Lorg/a/a/o;->bBm:I
+    iput v0, p0, Lorg/a/a/o;->bBh:I
 
-    iget-object p1, p1, Lorg/a/a/o;->bBn:[I
+    iget-object p1, p1, Lorg/a/a/o;->bBi:[I
 
-    iput-object p1, p0, Lorg/a/a/o;->bBn:[I
+    iput-object p1, p0, Lorg/a/a/o;->bBi:[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;->bBg:[I
+    iget-object v0, p0, Lorg/a/a/o;->bBb:[I
 
     const/4 v1, 0x0
 
@@ -2348,7 +2348,7 @@
     goto :goto_0
 
     :cond_3
-    iget-object v2, p0, Lorg/a/a/o;->bBh:[I
+    iget-object v2, p0, Lorg/a/a/o;->bBc:[I
 
     const/4 v4, 0x0
 
@@ -2384,9 +2384,9 @@
     goto :goto_3
 
     :cond_6
-    iget-object v4, p0, Lorg/a/a/o;->bBf:Lorg/a/a/r;
+    iget-object v4, p0, Lorg/a/a/o;->bBa:Lorg/a/a/r;
 
-    iget v4, v4, Lorg/a/a/r;->bBB:I
+    iget v4, v4, Lorg/a/a/r;->bBw: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;->bCu:[I
+    iget-object v13, p1, Lorg/a/a/u;->bCp:[I
 
     aput v3, v13, v10
 
@@ -2461,7 +2461,7 @@
 
     add-int/lit8 v4, v10, 0x1
 
-    iget-object v5, p1, Lorg/a/a/u;->bCu:[I
+    iget-object v5, p1, Lorg/a/a/u;->bCp:[I
 
     aput v3, v5, v10
 
@@ -2472,7 +2472,7 @@
     goto :goto_9
 
     :cond_c
-    invoke-virtual {p1}, Lorg/a/a/u;->HV()V
+    invoke-virtual {p1}, Lorg/a/a/u;->HT()V
 
     return-void
 .end method
@@ -2482,13 +2482,13 @@
 
     new-array v0, p4, [I
 
-    iput-object v0, p0, Lorg/a/a/o;->bBg:[I
+    iput-object v0, p0, Lorg/a/a/o;->bBb:[I
 
     const/4 v0, 0x0
 
     new-array v1, v0, [I
 
-    iput-object v1, p0, Lorg/a/a/o;->bBh:[I
+    iput-object v1, p0, Lorg/a/a/o;->bBc:[I
 
     and-int/lit8 v1, p2, 0x8
 
@@ -2502,7 +2502,7 @@
 
     if-nez p2, :cond_0
 
-    iget-object p2, p0, Lorg/a/a/o;->bBg:[I
+    iget-object p2, p0, Lorg/a/a/o;->bBb:[I
 
     const/high16 v1, 0x2000000
 
@@ -2519,7 +2519,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object p2, p0, Lorg/a/a/o;->bBg:[I
+    iget-object p2, p0, Lorg/a/a/o;->bBb:[I
 
     const v1, 0x1000006
 
@@ -2546,7 +2546,7 @@
 
     aget-object v4, p2, v1
 
-    invoke-virtual {v4}, Lorg/a/a/aa;->Ic()Ljava/lang/String;
+    invoke-virtual {v4}, Lorg/a/a/aa;->Ia()Ljava/lang/String;
 
     move-result-object v4
 
@@ -2554,7 +2554,7 @@
 
     move-result v4
 
-    iget-object v5, p0, Lorg/a/a/o;->bBg:[I
+    iget-object v5, p0, Lorg/a/a/o;->bBb:[I
 
     add-int/lit8 v6, v2, 0x1
 
@@ -2577,7 +2577,7 @@
 
     :cond_3
     :goto_2
-    iget-object v2, p0, Lorg/a/a/o;->bBg:[I
+    iget-object v2, p0, Lorg/a/a/o;->bBb:[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;->bBg:[I
+    iget-object p1, p0, Lorg/a/a/o;->bBb:[I
 
     add-int/lit8 p2, v2, 0x1
 
@@ -2619,21 +2619,21 @@
 
     move/from16 v3, p3
 
-    iget-object v4, v0, Lorg/a/a/o;->bBg:[I
+    iget-object v4, v0, Lorg/a/a/o;->bBb:[I
 
     array-length v4, v4
 
-    iget-object v5, v0, Lorg/a/a/o;->bBh:[I
+    iget-object v5, v0, Lorg/a/a/o;->bBc:[I
 
     array-length v5, v5
 
-    iget-object v6, v2, Lorg/a/a/o;->bBg:[I
+    iget-object v6, v2, Lorg/a/a/o;->bBb:[I
 
     if-nez v6, :cond_0
 
     new-array v6, v4, [I
 
-    iput-object v6, v2, Lorg/a/a/o;->bBg:[I
+    iput-object v6, v2, Lorg/a/a/o;->bBb:[I
 
     const/4 v6, 0x1
 
@@ -2666,7 +2666,7 @@
 
     if-ge v6, v4, :cond_7
 
-    iget-object v7, v0, Lorg/a/a/o;->bBi:[I
+    iget-object v7, v0, Lorg/a/a/o;->bBd:[I
 
     if-eqz v7, :cond_5
 
@@ -2684,7 +2684,7 @@
 
     if-ne v12, v11, :cond_3
 
-    iget-object v10, v0, Lorg/a/a/o;->bBg:[I
+    iget-object v10, v0, Lorg/a/a/o;->bBb:[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;->bBh:[I
+    iget-object v10, v0, Lorg/a/a/o;->bBc:[I
 
     and-int v11, v7, v17
 
@@ -2740,12 +2740,12 @@
     goto :goto_3
 
     :cond_5
-    iget-object v7, v0, Lorg/a/a/o;->bBg:[I
+    iget-object v7, v0, Lorg/a/a/o;->bBb:[I
 
     aget v15, v7, v6
 
     :goto_3
-    iget-object v7, v0, Lorg/a/a/o;->bBn:[I
+    iget-object v7, v0, Lorg/a/a/o;->bBi:[I
 
     if-eqz v7, :cond_6
 
@@ -2754,7 +2754,7 @@
     move-result v15
 
     :cond_6
-    iget-object v7, v2, Lorg/a/a/o;->bBg:[I
+    iget-object v7, v2, Lorg/a/a/o;->bBb:[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;->bBg:[I
+    iget-object v6, v0, Lorg/a/a/o;->bBb:[I
 
     aget v6, v6, v5
 
-    iget-object v7, v2, Lorg/a/a/o;->bBg:[I
+    iget-object v7, v2, Lorg/a/a/o;->bBb:[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;->bBh:[I
+    iget-object v4, v2, Lorg/a/a/o;->bBc:[I
 
     if-nez v4, :cond_9
 
@@ -2801,7 +2801,7 @@
 
     new-array v5, v4, [I
 
-    iput-object v5, v2, Lorg/a/a/o;->bBh:[I
+    iput-object v5, v2, Lorg/a/a/o;->bBc:[I
 
     goto :goto_5
 
@@ -2809,7 +2809,7 @@
     move v4, v8
 
     :goto_5
-    iget-object v2, v2, Lorg/a/a/o;->bBh:[I
+    iget-object v2, v2, Lorg/a/a/o;->bBc:[I
 
     const/4 v6, 0x0
 
@@ -2826,25 +2826,25 @@
 
     const/4 v6, 0x0
 
-    iget-object v3, v0, Lorg/a/a/o;->bBh:[I
+    iget-object v3, v0, Lorg/a/a/o;->bBc:[I
 
     array-length v3, v3
 
-    iget-short v7, v0, Lorg/a/a/o;->bBk:S
+    iget-short v7, v0, Lorg/a/a/o;->bBf:S
 
     add-int/2addr v3, v7
 
-    iget-object v7, v2, Lorg/a/a/o;->bBh:[I
+    iget-object v7, v2, Lorg/a/a/o;->bBc:[I
 
     if-nez v7, :cond_b
 
-    iget-short v7, v0, Lorg/a/a/o;->bBl:S
+    iget-short v7, v0, Lorg/a/a/o;->bBg:S
 
     add-int/2addr v7, v3
 
     new-array v7, v7, [I
 
-    iput-object v7, v2, Lorg/a/a/o;->bBh:[I
+    iput-object v7, v2, Lorg/a/a/o;->bBc:[I
 
     goto :goto_6
 
@@ -2859,11 +2859,11 @@
     :goto_7
     if-ge v4, v3, :cond_d
 
-    iget-object v8, v0, Lorg/a/a/o;->bBh:[I
+    iget-object v8, v0, Lorg/a/a/o;->bBc:[I
 
     aget v8, v8, v4
 
-    iget-object v9, v0, Lorg/a/a/o;->bBn:[I
+    iget-object v9, v0, Lorg/a/a/o;->bBi:[I
 
     if-eqz v9, :cond_c
 
@@ -2872,7 +2872,7 @@
     move-result v8
 
     :cond_c
-    iget-object v9, v2, Lorg/a/a/o;->bBh:[I
+    iget-object v9, v2, Lorg/a/a/o;->bBc:[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;->bBl:S
+    iget-short v4, v0, Lorg/a/a/o;->bBg:S
 
     if-ge v6, v4, :cond_13
 
-    iget-object v4, v0, Lorg/a/a/o;->bBj:[I
+    iget-object v4, v0, Lorg/a/a/o;->bBe:[I
 
     aget v4, v4, v6
 
@@ -2900,7 +2900,7 @@
 
     if-ne v9, v11, :cond_f
 
-    iget-object v9, v0, Lorg/a/a/o;->bBg:[I
+    iget-object v9, v0, Lorg/a/a/o;->bBb:[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;->bBh:[I
+    iget-object v9, v0, Lorg/a/a/o;->bBc:[I
 
     and-int v18, v4, v17
 
@@ -2950,7 +2950,7 @@
 
     :cond_11
     :goto_a
-    iget-object v4, v0, Lorg/a/a/o;->bBn:[I
+    iget-object v4, v0, Lorg/a/a/o;->bBi:[I
 
     if-eqz v4, :cond_12
 
@@ -2959,7 +2959,7 @@
     move-result v8
 
     :cond_12
-    iget-object v4, v2, Lorg/a/a/o;->bBh:[I
+    iget-object v4, v2, Lorg/a/a/o;->bBc:[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 878aebdc3d..e0df6ca6c3 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 bBo:I
+.field final bBj:I
 
-.field final bBp:Ljava/lang/String;
+.field final bBk:Ljava/lang/String;
 
-.field final bBq:Z
+.field final bBl: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;->bBo:I
+    iput p1, p0, Lorg/a/a/p;->bBj:I
 
-    iput-object p2, p0, Lorg/a/a/p;->bBp:Ljava/lang/String;
+    iput-object p2, p0, Lorg/a/a/p;->bBk: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;->bBq:Z
+    iput-boolean p5, p0, Lorg/a/a/p;->bBl: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;->bBo:I
+    iget v1, p0, Lorg/a/a/p;->bBj:I
 
-    iget v3, p1, Lorg/a/a/p;->bBo:I
+    iget v3, p1, Lorg/a/a/p;->bBj:I
 
     if-ne v1, v3, :cond_2
 
-    iget-boolean v1, p0, Lorg/a/a/p;->bBq:Z
+    iget-boolean v1, p0, Lorg/a/a/p;->bBl:Z
 
-    iget-boolean v3, p1, Lorg/a/a/p;->bBq:Z
+    iget-boolean v3, p1, Lorg/a/a/p;->bBl:Z
 
     if-ne v1, v3, :cond_2
 
-    iget-object v1, p0, Lorg/a/a/p;->bBp:Ljava/lang/String;
+    iget-object v1, p0, Lorg/a/a/p;->bBk:Ljava/lang/String;
 
-    iget-object v3, p1, Lorg/a/a/p;->bBp:Ljava/lang/String;
+    iget-object v3, p1, Lorg/a/a/p;->bBk: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;->bBo:I
+    iget v0, p0, Lorg/a/a/p;->bBj:I
 
-    iget-boolean v1, p0, Lorg/a/a/p;->bBq:Z
+    iget-boolean v1, p0, Lorg/a/a/p;->bBl: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;->bBp:Ljava/lang/String;
+    iget-object v1, p0, Lorg/a/a/p;->bBk: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;->bBp:Ljava/lang/String;
+    iget-object v1, p0, Lorg/a/a/p;->bBk: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;->bBo:I
+    iget v1, p0, Lorg/a/a/p;->bBj:I
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
-    iget-boolean v1, p0, Lorg/a/a/p;->bBq:Z
+    iget-boolean v1, p0, Lorg/a/a/p;->bBl: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 a1a21846d8..4dd10eb5ff 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 bBr:Lorg/a/a/r;
+.field final bBm:Lorg/a/a/r;
 
-.field final bBs:Lorg/a/a/r;
+.field final bBn:Lorg/a/a/r;
 
-.field final bBt:Lorg/a/a/r;
+.field final bBo:Lorg/a/a/r;
 
-.field final bBu:I
+.field final bBp:I
 
-.field final bBv:Ljava/lang/String;
+.field final bBq:Ljava/lang/String;
 
-.field bBw:Lorg/a/a/q;
+.field bBr: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;->bBt:Lorg/a/a/r;
+    iget-object v3, p1, Lorg/a/a/q;->bBo:Lorg/a/a/r;
 
-    iget v4, p1, Lorg/a/a/q;->bBu:I
+    iget v4, p1, Lorg/a/a/q;->bBp:I
 
-    iget-object v5, p1, Lorg/a/a/q;->bBv:Ljava/lang/String;
+    iget-object v5, p1, Lorg/a/a/q;->bBq: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;->bBw:Lorg/a/a/q;
+    iget-object p1, p1, Lorg/a/a/q;->bBr:Lorg/a/a/q;
 
-    iput-object p1, p0, Lorg/a/a/q;->bBw:Lorg/a/a/q;
+    iput-object p1, p0, Lorg/a/a/q;->bBr: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;->bBr:Lorg/a/a/r;
+    iput-object p1, p0, Lorg/a/a/q;->bBm:Lorg/a/a/r;
 
-    iput-object p2, p0, Lorg/a/a/q;->bBs:Lorg/a/a/r;
+    iput-object p2, p0, Lorg/a/a/q;->bBn:Lorg/a/a/r;
 
-    iput-object p3, p0, Lorg/a/a/q;->bBt:Lorg/a/a/r;
+    iput-object p3, p0, Lorg/a/a/q;->bBo:Lorg/a/a/r;
 
-    iput p4, p0, Lorg/a/a/q;->bBu:I
+    iput p4, p0, Lorg/a/a/q;->bBp:I
 
-    iput-object p5, p0, Lorg/a/a/q;->bBv:Ljava/lang/String;
+    iput-object p5, p0, Lorg/a/a/q;->bBq: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;->bBw:Lorg/a/a/q;
+    iget-object p0, p0, Lorg/a/a/q;->bBr:Lorg/a/a/q;
 
     goto :goto_0
 
@@ -88,23 +88,23 @@
     return-object p0
 
     :cond_0
-    iget-object v0, p0, Lorg/a/a/q;->bBw:Lorg/a/a/q;
+    iget-object v0, p0, Lorg/a/a/q;->bBr: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;->bBw:Lorg/a/a/q;
+    iput-object v0, p0, Lorg/a/a/q;->bBr:Lorg/a/a/q;
 
-    iget-object v0, p0, Lorg/a/a/q;->bBr:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/q;->bBm:Lorg/a/a/r;
 
-    iget v0, v0, Lorg/a/a/r;->bBB:I
+    iget v0, v0, Lorg/a/a/r;->bBw:I
 
-    iget-object v1, p0, Lorg/a/a/q;->bBs:Lorg/a/a/r;
+    iget-object v1, p0, Lorg/a/a/q;->bBn:Lorg/a/a/r;
 
-    iget v1, v1, Lorg/a/a/r;->bBB:I
+    iget v1, v1, Lorg/a/a/r;->bBw:I
 
-    iget v2, p1, Lorg/a/a/r;->bBB:I
+    iget v2, p1, Lorg/a/a/r;->bBw:I
 
     if-nez p2, :cond_1
 
@@ -113,7 +113,7 @@
     goto :goto_0
 
     :cond_1
-    iget v3, p2, Lorg/a/a/r;->bBB:I
+    iget v3, p2, Lorg/a/a/r;->bBw: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;->bBw:Lorg/a/a/q;
+    iget-object p0, p0, Lorg/a/a/q;->bBr:Lorg/a/a/q;
 
     return-object p0
 
     :cond_3
     new-instance p1, Lorg/a/a/q;
 
-    iget-object v0, p0, Lorg/a/a/q;->bBs:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/q;->bBn: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;->bBr:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/q;->bBm: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;->bBs:Lorg/a/a/r;
+    iget-object v1, p0, Lorg/a/a/q;->bBn: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;->bBw:Lorg/a/a/q;
+    iput-object v0, p0, Lorg/a/a/q;->bBr:Lorg/a/a/q;
 
     new-instance p2, Lorg/a/a/q;
 
-    iget-object v0, p0, Lorg/a/a/q;->bBr:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/q;->bBm: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 beeea95f37..60cf1dfa35 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 bBx:Lorg/a/a/r;
+.field static final bBs:Lorg/a/a/r;
 
 
 # instance fields
-.field private bBA:[I
+.field bBA:S
 
-.field bBB:I
+.field bBB:S
 
-.field private bBC:[I
+.field bBC:Lorg/a/a/o;
 
-.field bBD:S
+.field bBD:Lorg/a/a/r;
 
-.field bBE:S
+.field bBE:Lorg/a/a/l;
 
-.field bBF:S
+.field bBF:Lorg/a/a/r;
 
-.field bBG:S
+.field bBt:S
 
-.field bBH:Lorg/a/a/o;
+.field private bBu:S
 
-.field bBI:Lorg/a/a/r;
+.field private bBv:[I
 
-.field bBJ:Lorg/a/a/l;
+.field bBw:I
 
-.field bBK:Lorg/a/a/r;
+.field private bBx:[I
 
 .field bBy:S
 
-.field private bBz:S
+.field bBz:S
 
 
 # direct methods
@@ -43,7 +43,7 @@
 
     invoke-direct {v0}, Lorg/a/a/r;-><init>()V
 
-    sput-object v0, Lorg/a/a/r;->bBx:Lorg/a/a/r;
+    sput-object v0, Lorg/a/a/r;->bBs: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;->bBC:[I
+    iget-object v0, p0, Lorg/a/a/r;->bBx:[I
 
     const/4 v1, 0x6
 
@@ -67,10 +67,10 @@
 
     new-array v0, v1, [I
 
-    iput-object v0, p0, Lorg/a/a/r;->bBC:[I
+    iput-object v0, p0, Lorg/a/a/r;->bBx:[I
 
     :cond_0
-    iget-object v0, p0, Lorg/a/a/r;->bBC:[I
+    iget-object v0, p0, Lorg/a/a/r;->bBx:[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;->bBC:[I
+    iput-object v1, p0, Lorg/a/a/r;->bBx:[I
 
     :cond_1
-    iget-object v0, p0, Lorg/a/a/r;->bBC:[I
+    iget-object v0, p0, Lorg/a/a/r;->bBx:[I
 
     add-int/lit8 v3, v3, 0x1
 
@@ -114,17 +114,17 @@
 
 
 # virtual methods
-.method final HS()Lorg/a/a/r;
+.method final HQ()Lorg/a/a/r;
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/r;->bBH:Lorg/a/a/o;
+    iget-object v0, p0, Lorg/a/a/r;->bBC:Lorg/a/a/o;
 
     if-nez v0, :cond_0
 
     return-object p0
 
     :cond_0
-    iget-object v0, v0, Lorg/a/a/o;->bBf:Lorg/a/a/r;
+    iget-object v0, v0, Lorg/a/a/o;->bBa: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;->bBJ:Lorg/a/a/l;
+    iget-object v0, p0, Lorg/a/a/r;->bBE:Lorg/a/a/l;
 
     :goto_0
     if-eqz v0, :cond_2
 
-    iget-short v1, p0, Lorg/a/a/r;->bBy:S
+    iget-short v1, p0, Lorg/a/a/r;->bBt:S
 
     and-int/lit8 v1, v1, 0x10
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lorg/a/a/r;->bBJ:Lorg/a/a/l;
+    iget-object v1, p0, Lorg/a/a/r;->bBE:Lorg/a/a/l;
 
-    iget-object v1, v1, Lorg/a/a/l;->bBa:Lorg/a/a/l;
+    iget-object v1, v1, Lorg/a/a/l;->bAV: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;->bAZ:Lorg/a/a/r;
+    iget-object v1, v0, Lorg/a/a/l;->bAU:Lorg/a/a/r;
 
-    iget-object v1, v1, Lorg/a/a/r;->bBK:Lorg/a/a/r;
+    iget-object v1, v1, Lorg/a/a/r;->bBF:Lorg/a/a/r;
 
     if-nez v1, :cond_1
 
-    iget-object v1, v0, Lorg/a/a/l;->bAZ:Lorg/a/a/r;
+    iget-object v1, v0, Lorg/a/a/l;->bAU:Lorg/a/a/r;
 
-    iput-object p1, v1, Lorg/a/a/r;->bBK:Lorg/a/a/r;
+    iput-object p1, v1, Lorg/a/a/r;->bBF:Lorg/a/a/r;
 
-    iget-object p1, v0, Lorg/a/a/l;->bAZ:Lorg/a/a/r;
+    iget-object p1, v0, Lorg/a/a/l;->bAU:Lorg/a/a/r;
 
     :cond_1
-    iget-object v0, v0, Lorg/a/a/l;->bBa:Lorg/a/a/l;
+    iget-object v0, v0, Lorg/a/a/l;->bAV: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;->bBy:S
+    iget-short v0, p0, Lorg/a/a/r;->bBt: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;->bBB:I
+    iget p3, p0, Lorg/a/a/r;->bBw:I
 
     sub-int/2addr p3, p2
 
@@ -226,7 +226,7 @@
     return-void
 
     :cond_2
-    iget p3, p0, Lorg/a/a/r;->bBB:I
+    iget p3, p0, Lorg/a/a/r;->bBw:I
 
     sub-int/2addr p3, p2
 
@@ -242,7 +242,7 @@
 
     if-eqz p2, :cond_0
 
-    iget-short p2, p0, Lorg/a/a/r;->bBz:S
+    iget-short p2, p0, Lorg/a/a/r;->bBu: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;->bBA:[I
+    iget-object p2, p0, Lorg/a/a/r;->bBv:[I
 
     if-eqz p2, :cond_0
 
     const/4 p2, 0x1
 
     :goto_0
-    iget-object v0, p0, Lorg/a/a/r;->bBA:[I
+    iget-object v0, p0, Lorg/a/a/r;->bBv:[I
 
     const/4 v1, 0x0
 
@@ -282,28 +282,28 @@
 .method final b(S)V
     .locals 3
 
-    sget-object v0, Lorg/a/a/r;->bBx:Lorg/a/a/r;
+    sget-object v0, Lorg/a/a/r;->bBs:Lorg/a/a/r;
 
-    iput-object v0, p0, Lorg/a/a/r;->bBK:Lorg/a/a/r;
+    iput-object v0, p0, Lorg/a/a/r;->bBF:Lorg/a/a/r;
 
     move-object v0, p0
 
     :goto_0
-    sget-object v1, Lorg/a/a/r;->bBx:Lorg/a/a/r;
+    sget-object v1, Lorg/a/a/r;->bBs:Lorg/a/a/r;
 
     if-eq v0, v1, :cond_1
 
-    iget-object v1, v0, Lorg/a/a/r;->bBK:Lorg/a/a/r;
+    iget-object v1, v0, Lorg/a/a/r;->bBF:Lorg/a/a/r;
 
     const/4 v2, 0x0
 
-    iput-object v2, v0, Lorg/a/a/r;->bBK:Lorg/a/a/r;
+    iput-object v2, v0, Lorg/a/a/r;->bBF:Lorg/a/a/r;
 
-    iget-short v2, v0, Lorg/a/a/r;->bBG:S
+    iget-short v2, v0, Lorg/a/a/r;->bBB:S
 
     if-nez v2, :cond_0
 
-    iput-short p1, v0, Lorg/a/a/r;->bBG:S
+    iput-short p1, v0, Lorg/a/a/r;->bBB: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;->bBz:S
+    iget-short v0, p0, Lorg/a/a/r;->bBu:S
 
     if-nez v0, :cond_0
 
     int-to-short p1, p1
 
-    iput-short p1, p0, Lorg/a/a/r;->bBz:S
+    iput-short p1, p0, Lorg/a/a/r;->bBu:S
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Lorg/a/a/r;->bBA:[I
+    iget-object v0, p0, Lorg/a/a/r;->bBv:[I
 
     const/4 v1, 0x4
 
@@ -342,10 +342,10 @@
 
     new-array v0, v1, [I
 
-    iput-object v0, p0, Lorg/a/a/r;->bBA:[I
+    iput-object v0, p0, Lorg/a/a/r;->bBv:[I
 
     :cond_1
-    iget-object v0, p0, Lorg/a/a/r;->bBA:[I
+    iget-object v0, p0, Lorg/a/a/r;->bBv:[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;->bBA:[I
+    iput-object v1, p0, Lorg/a/a/r;->bBv:[I
 
     :cond_2
-    iget-object v0, p0, Lorg/a/a/r;->bBA:[I
+    iget-object v0, p0, Lorg/a/a/r;->bBv:[I
 
     aput p1, v0, v3
 
@@ -382,17 +382,17 @@
 .method final o([BI)Z
     .locals 7
 
-    iget-short v0, p0, Lorg/a/a/r;->bBy:S
+    iget-short v0, p0, Lorg/a/a/r;->bBt:S
 
     or-int/lit8 v0, v0, 0x4
 
     int-to-short v0, v0
 
-    iput-short v0, p0, Lorg/a/a/r;->bBy:S
+    iput-short v0, p0, Lorg/a/a/r;->bBt:S
 
-    iput p2, p0, Lorg/a/a/r;->bBB:I
+    iput p2, p0, Lorg/a/a/r;->bBw:I
 
-    iget-object v0, p0, Lorg/a/a/r;->bBC:[I
+    iget-object v0, p0, Lorg/a/a/r;->bBx:[I
 
     const/4 v1, 0x0
 
@@ -406,7 +406,7 @@
     :goto_0
     if-lez v0, :cond_5
 
-    iget-object v2, p0, Lorg/a/a/r;->bBC:[I
+    iget-object v2, p0, Lorg/a/a/r;->bBx:[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 3f07525e0d..b4333accdb 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 bBL:Lorg/a/a/t;
+.field protected bBG:Lorg/a/a/t;
 
-.field protected final bzM:I
+.field protected final bzH:I
 
 
 # direct methods
@@ -27,25 +27,25 @@
 
     const/high16 p1, 0x70000
 
-    iput p1, p0, Lorg/a/a/t;->bzM:I
+    iput p1, p0, Lorg/a/a/t;->bzH:I
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lorg/a/a/t;->bBL:Lorg/a/a/t;
+    iput-object p1, p0, Lorg/a/a/t;->bBG:Lorg/a/a/t;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public HT()Lorg/a/a/a;
+.method public HR()Lorg/a/a/a;
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/t;->bBL:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bBG:Lorg/a/a/t;
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v0}, Lorg/a/a/t;->HT()Lorg/a/a/a;
+    invoke-virtual {v0}, Lorg/a/a/t;->HR()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;->bBL:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bBG: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;->bBL:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bBG: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;->bBL:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bBG: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;->bzM:I
+    iget v0, p0, Lorg/a/a/t;->bzH:I
 
     const/high16 v1, 0x50000
 
     if-lt v0, v1, :cond_1
 
-    iget-object v0, p0, Lorg/a/a/t;->bBL:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bBG:Lorg/a/a/t;
 
     if-eqz v0, :cond_0
 
@@ -141,13 +141,13 @@
 
     move-object v0, p0
 
-    iget v1, v0, Lorg/a/a/t;->bzM:I
+    iget v1, v0, Lorg/a/a/t;->bzH:I
 
     const/high16 v2, 0x50000
 
     if-lt v1, v2, :cond_1
 
-    iget-object v3, v0, Lorg/a/a/t;->bBL:Lorg/a/a/t;
+    iget-object v3, v0, Lorg/a/a/t;->bBG: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;->bBL:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bBG: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;->bBL:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bBG: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;->bBL:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bBG: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;->bzM:I
+    iget v0, p0, Lorg/a/a/t;->bzH:I
 
     const/high16 v1, 0x50000
 
@@ -272,7 +272,7 @@
     throw p1
 
     :cond_2
-    iget-object v0, p0, Lorg/a/a/t;->bBL:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bBG: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;->bBL:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bBG: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;->bBL:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bBG: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;->bzM:I
+    iget v0, p0, Lorg/a/a/t;->bzH:I
 
     const/high16 v1, 0x50000
 
     if-lt v0, v1, :cond_1
 
-    iget-object v0, p0, Lorg/a/a/t;->bBL:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bBG: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;->bBL:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bBG: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;->bBL:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bBG: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;->bBL:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bBG: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;->bBL:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bBG: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;->bzM:I
+    iget v0, p0, Lorg/a/a/t;->bzH:I
 
     const/high16 v1, 0x50000
 
     if-lt v0, v1, :cond_1
 
-    iget-object v0, p0, Lorg/a/a/t;->bBL:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bBG: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;->bzM:I
+    iget v1, v0, Lorg/a/a/t;->bzH:I
 
     const/high16 v2, 0x50000
 
@@ -487,7 +487,7 @@
     return-void
 
     :cond_1
-    iget-object v0, v0, Lorg/a/a/t;->bBL:Lorg/a/a/t;
+    iget-object v0, v0, Lorg/a/a/t;->bBG: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;->bBL:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bBG: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;->bBL:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bBG: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;->bBL:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bBG: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;->bzM:I
+    iget v0, p0, Lorg/a/a/t;->bzH:I
 
     const/high16 v1, 0x50000
 
@@ -557,7 +557,7 @@
 
     check-cast v0, Lorg/a/a/aa;
 
-    invoke-virtual {v0}, Lorg/a/a/aa;->Id()I
+    invoke-virtual {v0}, Lorg/a/a/aa;->Ib()I
 
     move-result v0
 
@@ -578,7 +578,7 @@
 
     :cond_1
     :goto_0
-    iget v0, p0, Lorg/a/a/t;->bzM:I
+    iget v0, p0, Lorg/a/a/t;->bzH:I
 
     const/high16 v1, 0x70000
 
@@ -601,7 +601,7 @@
 
     :cond_3
     :goto_1
-    iget-object v0, p0, Lorg/a/a/t;->bBL:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bBG: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;->bzM:I
+    iget v0, p0, Lorg/a/a/t;->bzH:I
 
     const/high16 v1, 0x50000
 
     if-lt v0, v1, :cond_1
 
-    iget-object v0, p0, Lorg/a/a/t;->bBL:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bBG: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;->bBL:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bBG: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;->bBL:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bBG: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;->bBL:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bBG: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;->bBL:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bBG: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;->bzM:I
+    iget v0, p0, Lorg/a/a/t;->bzH:I
 
     const/high16 v1, 0x50000
 
     if-lt v0, v1, :cond_1
 
-    iget-object v0, p0, Lorg/a/a/t;->bBL:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bBG: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;->bBL:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bBG: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 c1d3f1c763..60255cc65e 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 bBM:[I
+.field private static final bBH:[I
 
 
 # instance fields
-.field bAC:Lorg/a/a/c;
+.field final bAX:I
 
-.field private final bAD:I
+.field final bAY:I
 
-.field final bAe:I
+.field final bAm:I
 
-.field final bAr:I
+.field bAp:Lorg/a/a/b;
 
-.field bAu:Lorg/a/a/b;
+.field bAq:Lorg/a/a/b;
 
-.field bAv:Lorg/a/a/b;
+.field bAr:Lorg/a/a/b;
 
-.field bAw:Lorg/a/a/b;
+.field bAs:Lorg/a/a/b;
 
-.field bAx:Lorg/a/a/b;
+.field bAx:Lorg/a/a/c;
+
+.field private final bAy:I
+
+.field bBI:I
+
+.field bBJ:I
+
+.field final bBK:Lorg/a/a/d;
+
+.field bBL:Lorg/a/a/q;
+
+.field private bBM:Lorg/a/a/q;
 
 .field bBN:I
 
-.field bBO:I
+.field bBO:Lorg/a/a/d;
 
-.field final bBP:Lorg/a/a/d;
+.field bBP:I
 
-.field bBQ:Lorg/a/a/q;
+.field bBQ:Lorg/a/a/d;
 
-.field private bBR:Lorg/a/a/q;
+.field bBR:I
 
-.field bBS:I
+.field bBS:Lorg/a/a/d;
 
-.field bBT:Lorg/a/a/d;
+.field bBT:I
 
-.field bBU:I
+.field bBU:Lorg/a/a/d;
 
-.field bBV:Lorg/a/a/d;
+.field bBV:Lorg/a/a/b;
 
-.field bBW:I
+.field bBW:Lorg/a/a/b;
 
-.field bBX:Lorg/a/a/d;
+.field bBX:Lorg/a/a/c;
 
-.field bBY:I
+.field final bBY:I
 
-.field bBZ:Lorg/a/a/d;
+.field final bBZ:[I
 
-.field final bBc:I
+.field bCa:I
 
-.field final bBd:I
+.field bCb:[Lorg/a/a/b;
 
-.field bCa:Lorg/a/a/b;
+.field bCc:I
 
-.field bCb:Lorg/a/a/b;
+.field bCd:[Lorg/a/a/b;
 
-.field bCc:Lorg/a/a/c;
-
-.field final bCd:I
-
-.field final bCe:[I
+.field bCe:Lorg/a/a/d;
 
 .field bCf:I
 
-.field bCg:[Lorg/a/a/b;
+.field bCg:Lorg/a/a/d;
 
-.field bCh:I
+.field private bCh:Lorg/a/a/r;
 
-.field bCi:[Lorg/a/a/b;
+.field private bCi:Lorg/a/a/r;
 
-.field bCj:Lorg/a/a/d;
+.field private bCj:Lorg/a/a/r;
 
-.field bCk:I
+.field private bCk:I
 
-.field bCl:Lorg/a/a/d;
+.field private bCl:I
 
-.field private bCm:Lorg/a/a/r;
+.field private bCm:I
 
-.field private bCn:Lorg/a/a/r;
+.field private bCn:I
 
-.field private bCo:Lorg/a/a/r;
+.field private bCo:[I
 
-.field private bCp:I
+.field bCp:[I
 
-.field private bCq:I
+.field private bCq:Z
 
-.field private bCr:I
+.field bCr:Z
 
 .field private bCs:I
 
-.field private bCt:[I
+.field bCt:I
 
-.field bCu:[I
+.field bCu:I
 
-.field private bCv:Z
+.field final bzJ:Lorg/a/a/z;
 
-.field bCw:Z
-
-.field private bCx:I
-
-.field bCy:I
-
-.field bCz:I
-
-.field final bzO:Lorg/a/a/z;
+.field final bzZ:I
 
 .field final descriptor:Ljava/lang/String;
 
@@ -123,7 +123,7 @@
 
     fill-array-data v0, :array_0
 
-    sput-object v0, Lorg/a/a/u;->bBM:[I
+    sput-object v0, Lorg/a/a/u;->bBH:[I
 
     return-void
 
@@ -343,9 +343,9 @@
 
     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;->bBK:Lorg/a/a/d;
 
-    iput-object p1, p0, Lorg/a/a/u;->bzO:Lorg/a/a/z;
+    iput-object p1, p0, Lorg/a/a/u;->bzJ:Lorg/a/a/z;
 
     const-string v0, "<init>"
 
@@ -365,13 +365,13 @@
     move v0, p2
 
     :goto_0
-    iput v0, p0, Lorg/a/a/u;->bAe:I
+    iput v0, p0, Lorg/a/a/u;->bzZ:I
 
     invoke-virtual {p1, p3}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
 
     move-result v0
 
-    iput v0, p0, Lorg/a/a/u;->bBc:I
+    iput v0, p0, Lorg/a/a/u;->bAX: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;->bBd:I
+    iput p3, p0, Lorg/a/a/u;->bAY: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;->bAr:I
+    iput p5, p0, Lorg/a/a/u;->bAm:I
 
     if-eqz p6, :cond_2
 
@@ -407,20 +407,20 @@
 
     array-length p5, p6
 
-    iput p5, p0, Lorg/a/a/u;->bCd:I
+    iput p5, p0, Lorg/a/a/u;->bBY:I
 
-    iget p5, p0, Lorg/a/a/u;->bCd:I
+    iget p5, p0, Lorg/a/a/u;->bBY:I
 
     new-array p5, p5, [I
 
-    iput-object p5, p0, Lorg/a/a/u;->bCe:[I
+    iput-object p5, p0, Lorg/a/a/u;->bBZ:[I
 
     :goto_2
-    iget p5, p0, Lorg/a/a/u;->bCd:I
+    iget p5, p0, Lorg/a/a/u;->bBY:I
 
     if-ge p3, p5, :cond_3
 
-    iget-object p5, p0, Lorg/a/a/u;->bCe:[I
+    iget-object p5, p0, Lorg/a/a/u;->bBZ:[I
 
     aget-object v0, p6, p3
 
@@ -439,14 +439,14 @@
     goto :goto_2
 
     :cond_2
-    iput p3, p0, Lorg/a/a/u;->bCd:I
+    iput p3, p0, Lorg/a/a/u;->bBY:I
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lorg/a/a/u;->bCe:[I
+    iput-object p1, p0, Lorg/a/a/u;->bBZ:[I
 
     :cond_3
-    iput p7, p0, Lorg/a/a/u;->bAD:I
+    iput p7, p0, Lorg/a/a/u;->bAy: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;->bBO:I
+    iput p1, p0, Lorg/a/a/u;->bBJ:I
 
-    iput p1, p0, Lorg/a/a/u;->bCr:I
+    iput p1, p0, Lorg/a/a/u;->bCm: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;->bCm:Lorg/a/a/r;
+    iput-object p1, p0, Lorg/a/a/u;->bCh:Lorg/a/a/r;
 
-    iget-object p1, p0, Lorg/a/a/u;->bCm:Lorg/a/a/r;
+    iget-object p1, p0, Lorg/a/a/u;->bCh: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 HU()V
+.method private HS()V
     .locals 4
 
-    iget v0, p0, Lorg/a/a/u;->bAD:I
+    iget v0, p0, Lorg/a/a/u;->bAy: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;->bBH:Lorg/a/a/o;
+    iput-object v2, v0, Lorg/a/a/r;->bBC:Lorg/a/a/o;
 
-    iget-object v2, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
+    iget-object v2, p0, Lorg/a/a/u;->bBK:Lorg/a/a/d;
 
     iget-object v2, v2, Lorg/a/a/d;->data:[B
 
-    iget-object v3, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
+    iget-object v3, p0, Lorg/a/a/u;->bBK: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;->bCn:Lorg/a/a/r;
+    iget-object v2, p0, Lorg/a/a/u;->bCi:Lorg/a/a/r;
 
-    iput-object v0, v2, Lorg/a/a/r;->bBI:Lorg/a/a/r;
+    iput-object v0, v2, Lorg/a/a/r;->bBD:Lorg/a/a/r;
 
-    iput-object v0, p0, Lorg/a/a/u;->bCn:Lorg/a/a/r;
+    iput-object v0, p0, Lorg/a/a/u;->bCi:Lorg/a/a/r;
 
-    iput-object v1, p0, Lorg/a/a/u;->bCo:Lorg/a/a/r;
+    iput-object v1, p0, Lorg/a/a/u;->bCj:Lorg/a/a/r;
 
     return-void
 
@@ -527,26 +527,26 @@
 
     if-ne v0, v2, :cond_1
 
-    iget-object v0, p0, Lorg/a/a/u;->bCo:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bCj:Lorg/a/a/r;
 
-    iget v2, p0, Lorg/a/a/u;->bCq:I
+    iget v2, p0, Lorg/a/a/u;->bCl:I
 
     int-to-short v2, v2
 
-    iput-short v2, v0, Lorg/a/a/r;->bBF:S
+    iput-short v2, v0, Lorg/a/a/r;->bBA:S
 
-    iput-object v1, p0, Lorg/a/a/u;->bCo:Lorg/a/a/r;
+    iput-object v1, p0, Lorg/a/a/u;->bCj:Lorg/a/a/r;
 
     :cond_1
     return-void
 .end method
 
-.method private HW()V
+.method private HU()V
     .locals 16
 
     move-object/from16 v0, p0
 
-    iget-object v1, v0, Lorg/a/a/u;->bCu:[I
+    iget-object v1, v0, Lorg/a/a/u;->bCp:[I
 
     const/4 v2, 0x1
 
@@ -556,9 +556,9 @@
 
     aget v1, v1, v4
 
-    iget-object v4, v0, Lorg/a/a/u;->bzO:Lorg/a/a/z;
+    iget-object v4, v0, Lorg/a/a/u;->bzJ:Lorg/a/a/z;
 
-    iget v4, v4, Lorg/a/a/z;->bDb:I
+    iget v4, v4, Lorg/a/a/z;->bCW:I
 
     const/4 v5, 0x0
 
@@ -568,9 +568,9 @@
 
     if-ge v4, v7, :cond_0
 
-    iget-object v2, v0, Lorg/a/a/u;->bBZ:Lorg/a/a/d;
+    iget-object v2, v0, Lorg/a/a/u;->bBU:Lorg/a/a/d;
 
-    iget-object v4, v0, Lorg/a/a/u;->bCu:[I
+    iget-object v4, v0, Lorg/a/a/u;->bCp:[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;->bBZ:Lorg/a/a/d;
+    iget-object v2, v0, Lorg/a/a/u;->bBU: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;->bBY:I
+    iget v4, v0, Lorg/a/a/u;->bBT:I
 
     if-nez v4, :cond_1
 
-    iget-object v4, v0, Lorg/a/a/u;->bCu:[I
+    iget-object v4, v0, Lorg/a/a/u;->bCp:[I
 
     aget v4, v4, v5
 
     goto :goto_0
 
     :cond_1
-    iget-object v4, v0, Lorg/a/a/u;->bCu:[I
+    iget-object v4, v0, Lorg/a/a/u;->bCp:[I
 
     aget v4, v4, v5
 
-    iget-object v7, v0, Lorg/a/a/u;->bCt:[I
+    iget-object v7, v0, Lorg/a/a/u;->bCo:[I
 
     aget v7, v7, v5
 
@@ -619,7 +619,7 @@
     sub-int/2addr v4, v2
 
     :goto_0
-    iget-object v7, v0, Lorg/a/a/u;->bCt:[I
+    iget-object v7, v0, Lorg/a/a/u;->bCo:[I
 
     aget v7, v7, v2
 
@@ -697,11 +697,11 @@
 
     if-ge v5, v3, :cond_7
 
-    iget-object v6, v0, Lorg/a/a/u;->bCu:[I
+    iget-object v6, v0, Lorg/a/a/u;->bCp:[I
 
     aget v6, v6, v15
 
-    iget-object v13, v0, Lorg/a/a/u;->bCt:[I
+    iget-object v13, v0, Lorg/a/a/u;->bCo:[I
 
     aget v13, v13, v15
 
@@ -736,7 +736,7 @@
 
     if-eq v2, v9, :cond_8
 
-    iget-object v2, v0, Lorg/a/a/u;->bBZ:Lorg/a/a/d;
+    iget-object v2, v0, Lorg/a/a/u;->bBU: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;->bBZ:Lorg/a/a/d;
+    iget-object v2, v0, Lorg/a/a/u;->bBU: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;->bBZ:Lorg/a/a/d;
+    iget-object v1, v0, Lorg/a/a/u;->bBU: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;->bBZ:Lorg/a/a/d;
+    iget-object v1, v0, Lorg/a/a/u;->bBU: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;->bBZ:Lorg/a/a/d;
+    iget-object v1, v0, Lorg/a/a/u;->bBU: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;->bBZ:Lorg/a/a/d;
+    iget-object v1, v0, Lorg/a/a/u;->bBU: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;->bBZ:Lorg/a/a/d;
+    iget-object v1, v0, Lorg/a/a/u;->bBU: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;->bBZ:Lorg/a/a/d;
+    iget-object v1, v0, Lorg/a/a/u;->bBU: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;->bCo:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bCj:Lorg/a/a/r;
 
     if-eqz v0, :cond_2
 
-    iget v1, p0, Lorg/a/a/u;->bAD:I
+    iget v1, p0, Lorg/a/a/u;->bAy:I
 
     const/4 v2, 0x4
 
@@ -877,7 +877,7 @@
 
     if-ne v1, v2, :cond_0
 
-    iget-object v0, v0, Lorg/a/a/r;->bBH:Lorg/a/a/o;
+    iget-object v0, v0, Lorg/a/a/r;->bBC: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;->HS()Lorg/a/a/r;
+    invoke-virtual {p1}, Lorg/a/a/r;->HQ()Lorg/a/a/r;
 
     move-result-object p1
 
-    iget-short v0, p1, Lorg/a/a/r;->bBy:S
+    iget-short v0, p1, Lorg/a/a/r;->bBt:S
 
     or-int/lit8 v0, v0, 0x2
 
     int-to-short v0, v0
 
-    iput-short v0, p1, Lorg/a/a/r;->bBy:S
+    iput-short v0, p1, Lorg/a/a/r;->bBt: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;->HS()Lorg/a/a/r;
+    invoke-virtual {v1}, Lorg/a/a/r;->HQ()Lorg/a/a/r;
 
     move-result-object v1
 
-    iget-short v2, v1, Lorg/a/a/r;->bBy:S
+    iget-short v2, v1, Lorg/a/a/r;->bBt:S
 
     or-int/lit8 v2, v2, 0x2
 
     int-to-short v2, v2
 
-    iput-short v2, v1, Lorg/a/a/r;->bBy:S
+    iput-short v2, v1, Lorg/a/a/r;->bBt:S
 
     add-int/lit8 v0, v0, 0x1
 
@@ -931,13 +931,13 @@
 
     if-ne v1, v0, :cond_1
 
-    iget v1, p0, Lorg/a/a/u;->bCp:I
+    iget v1, p0, Lorg/a/a/u;->bCk:I
 
     sub-int/2addr v1, v0
 
-    iput v1, p0, Lorg/a/a/u;->bCp:I
+    iput v1, p0, Lorg/a/a/u;->bCk:I
 
-    iget v0, p0, Lorg/a/a/u;->bCp:I
+    iget v0, p0, Lorg/a/a/u;->bCk: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;->bCp:I
+    iget v1, p0, Lorg/a/a/u;->bCk: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;->HU()V
+    invoke-direct {p0}, Lorg/a/a/u;->HS()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;->bzO:Lorg/a/a/z;
+    iget-object v0, p0, Lorg/a/a/u;->bzJ:Lorg/a/a/z;
 
-    iget-object v1, p0, Lorg/a/a/u;->bCu:[I
+    iget-object v1, p0, Lorg/a/a/u;->bCp:[I
 
     aget v1, v1, p1
 
-    iget-object v2, p0, Lorg/a/a/u;->bBZ:Lorg/a/a/d;
+    iget-object v2, p0, Lorg/a/a/u;->bBU: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;->bBZ:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bBU: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;->bBZ:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bBU:Lorg/a/a/d;
 
     const/4 v1, 0x7
 
@@ -1019,7 +1019,7 @@
 
     move-result-object v0
 
-    iget-object v2, p0, Lorg/a/a/u;->bzO:Lorg/a/a/z;
+    iget-object v2, p0, Lorg/a/a/u;->bzJ: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;->bBZ:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bBU: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;->bBB:I
+    iget p1, p1, Lorg/a/a/r;->bBw: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;->bCo:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bCj:Lorg/a/a/r;
 
     new-instance v1, Lorg/a/a/l;
 
-    iget-object v2, v0, Lorg/a/a/r;->bBJ:Lorg/a/a/l;
+    iget-object v2, v0, Lorg/a/a/r;->bBE: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;->bBJ:Lorg/a/a/l;
+    iput-object v1, v0, Lorg/a/a/r;->bBE:Lorg/a/a/l;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final HT()Lorg/a/a/a;
+.method public final HR()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;->bCj:Lorg/a/a/d;
+    iput-object v0, p0, Lorg/a/a/u;->bCe:Lorg/a/a/d;
 
     new-instance v0, Lorg/a/a/b;
 
-    iget-object v1, p0, Lorg/a/a/u;->bzO:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/u;->bzJ:Lorg/a/a/z;
 
-    iget-object v2, p0, Lorg/a/a/u;->bCj:Lorg/a/a/d;
+    iget-object v2, p0, Lorg/a/a/u;->bCe:Lorg/a/a/d;
 
     const/4 v3, 0x0
 
@@ -1093,14 +1093,14 @@
     return-object v0
 .end method
 
-.method final HV()V
+.method final HT()V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/u;->bCt:[I
+    iget-object v0, p0, Lorg/a/a/u;->bCo:[I
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lorg/a/a/u;->bBZ:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bBU: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;->bBZ:Lorg/a/a/d;
+    iput-object v0, p0, Lorg/a/a/u;->bBU:Lorg/a/a/d;
 
     :cond_0
-    invoke-direct {p0}, Lorg/a/a/u;->HW()V
+    invoke-direct {p0}, Lorg/a/a/u;->HU()V
 
-    iget v0, p0, Lorg/a/a/u;->bBY:I
+    iget v0, p0, Lorg/a/a/u;->bBT:I
 
     add-int/lit8 v0, v0, 0x1
 
-    iput v0, p0, Lorg/a/a/u;->bBY:I
+    iput v0, p0, Lorg/a/a/u;->bBT:I
 
     :cond_1
-    iget-object v0, p0, Lorg/a/a/u;->bCu:[I
+    iget-object v0, p0, Lorg/a/a/u;->bCp:[I
 
-    iput-object v0, p0, Lorg/a/a/u;->bCt:[I
+    iput-object v0, p0, Lorg/a/a/u;->bCo:[I
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lorg/a/a/u;->bCu:[I
+    iput-object v0, p0, Lorg/a/a/u;->bCp:[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;->bBP:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bBK:Lorg/a/a/d;
 
     iget v0, v0, Lorg/a/a/d;->length:I
 
-    iput v0, p0, Lorg/a/a/u;->bCx:I
+    iput v0, p0, Lorg/a/a/u;->bCs:I
 
     const/16 v0, 0x11
 
     if-ne p1, v0, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bBK: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;->bBP:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bBK: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;->bCo:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bCj:Lorg/a/a/r;
 
     if-eqz v0, :cond_4
 
-    iget v0, p0, Lorg/a/a/u;->bAD:I
+    iget v0, p0, Lorg/a/a/u;->bAy:I
 
     const/4 v1, 0x4
 
@@ -1177,26 +1177,26 @@
 
     if-eq p1, p2, :cond_4
 
-    iget p1, p0, Lorg/a/a/u;->bCp:I
+    iget p1, p0, Lorg/a/a/u;->bCk:I
 
     add-int/lit8 p1, p1, 0x1
 
-    iget p2, p0, Lorg/a/a/u;->bCq:I
+    iget p2, p0, Lorg/a/a/u;->bCl:I
 
     if-le p1, p2, :cond_2
 
-    iput p1, p0, Lorg/a/a/u;->bCq:I
+    iput p1, p0, Lorg/a/a/u;->bCl:I
 
     :cond_2
-    iput p1, p0, Lorg/a/a/u;->bCp:I
+    iput p1, p0, Lorg/a/a/u;->bCk:I
 
     goto :goto_2
 
     :cond_3
     :goto_1
-    iget-object v0, p0, Lorg/a/a/u;->bCo:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bCj:Lorg/a/a/r;
 
-    iget-object v0, v0, Lorg/a/a/r;->bBH:Lorg/a/a/o;
+    iget-object v0, v0, Lorg/a/a/r;->bBC: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;->bBP:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bBK:Lorg/a/a/d;
 
     iget v0, v0, Lorg/a/a/d;->length:I
 
-    iput v0, p0, Lorg/a/a/u;->bCx:I
+    iput v0, p0, Lorg/a/a/u;->bCs:I
 
     const/16 v0, 0xa9
 
@@ -1246,7 +1246,7 @@
     :goto_0
     add-int/2addr v3, p2
 
-    iget-object v4, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
+    iget-object v4, p0, Lorg/a/a/u;->bBK: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;->bBP:Lorg/a/a/d;
+    iget-object v3, p0, Lorg/a/a/u;->bBK: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;->bBP:Lorg/a/a/d;
+    iget-object v3, p0, Lorg/a/a/u;->bBK: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;->bCo:Lorg/a/a/r;
+    iget-object v3, p0, Lorg/a/a/u;->bCj:Lorg/a/a/r;
 
     if-eqz v3, :cond_7
 
-    iget v4, p0, Lorg/a/a/u;->bAD:I
+    iget v4, p0, Lorg/a/a/u;->bAy: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;->bBy:S
+    iget-short v0, v3, Lorg/a/a/r;->bBt:S
 
     or-int/lit8 v0, v0, 0x40
 
     int-to-short v0, v0
 
-    iput-short v0, v3, Lorg/a/a/r;->bBy:S
+    iput-short v0, v3, Lorg/a/a/r;->bBt:S
 
-    iget-object v0, p0, Lorg/a/a/u;->bCo:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bCj:Lorg/a/a/r;
 
-    iget v3, p0, Lorg/a/a/u;->bCp:I
+    iget v3, p0, Lorg/a/a/u;->bCk:I
 
     int-to-short v3, v3
 
-    iput-short v3, v0, Lorg/a/a/r;->bBE:S
+    iput-short v3, v0, Lorg/a/a/r;->bBz:S
 
-    invoke-direct {p0}, Lorg/a/a/u;->HU()V
+    invoke-direct {p0}, Lorg/a/a/u;->HS()V
 
     goto :goto_3
 
     :cond_4
-    iget v0, p0, Lorg/a/a/u;->bCp:I
+    iget v0, p0, Lorg/a/a/u;->bCk:I
 
-    sget-object v3, Lorg/a/a/u;->bBM:[I
+    sget-object v3, Lorg/a/a/u;->bBH:[I
 
     aget v3, v3, p1
 
     add-int/2addr v0, v3
 
-    iget v3, p0, Lorg/a/a/u;->bCq:I
+    iget v3, p0, Lorg/a/a/u;->bCl:I
 
     if-le v0, v3, :cond_5
 
-    iput v0, p0, Lorg/a/a/u;->bCq:I
+    iput v0, p0, Lorg/a/a/u;->bCl:I
 
     :cond_5
-    iput v0, p0, Lorg/a/a/u;->bCp:I
+    iput v0, p0, Lorg/a/a/u;->bCk:I
 
     goto :goto_3
 
     :cond_6
     :goto_2
-    iget-object v0, p0, Lorg/a/a/u;->bCo:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bCj:Lorg/a/a/r;
 
-    iget-object v0, v0, Lorg/a/a/r;->bBH:Lorg/a/a/o;
+    iget-object v0, v0, Lorg/a/a/r;->bBC:Lorg/a/a/o;
 
     const/4 v3, 0x0
 
@@ -1344,7 +1344,7 @@
 
     :cond_7
     :goto_3
-    iget v0, p0, Lorg/a/a/u;->bAD:I
+    iget v0, p0, Lorg/a/a/u;->bAy: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;->bBO:I
+    iget v0, p0, Lorg/a/a/u;->bBJ:I
 
     if-le p2, v0, :cond_a
 
-    iput p2, p0, Lorg/a/a/u;->bBO:I
+    iput p2, p0, Lorg/a/a/u;->bBJ:I
 
     :cond_a
     if-lt p1, v1, :cond_b
 
-    iget p1, p0, Lorg/a/a/u;->bAD:I
+    iget p1, p0, Lorg/a/a/u;->bAy:I
 
     if-ne p1, v2, :cond_b
 
-    iget-object p1, p0, Lorg/a/a/u;->bBQ:Lorg/a/a/q;
+    iget-object p1, p0, Lorg/a/a/u;->bBL: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;->bzO:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/u;->bzJ: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;->bCg:[Lorg/a/a/b;
+    iget-object p2, p0, Lorg/a/a/u;->bCb:[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;->bCg:[Lorg/a/a/b;
+    iput-object p2, p0, Lorg/a/a/u;->bCb:[Lorg/a/a/b;
 
     :cond_0
-    iget-object p2, p0, Lorg/a/a/u;->bCg:[Lorg/a/a/b;
+    iget-object p2, p0, Lorg/a/a/u;->bCb:[Lorg/a/a/b;
 
     new-instance p3, Lorg/a/a/b;
 
-    iget-object v1, p0, Lorg/a/a/u;->bzO:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/u;->bzJ: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;->bCi:[Lorg/a/a/b;
+    iget-object p2, p0, Lorg/a/a/u;->bCd:[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;->bCi:[Lorg/a/a/b;
+    iput-object p2, p0, Lorg/a/a/u;->bCd:[Lorg/a/a/b;
 
     :cond_2
-    iget-object p2, p0, Lorg/a/a/u;->bCi:[Lorg/a/a/b;
+    iget-object p2, p0, Lorg/a/a/u;->bCd:[Lorg/a/a/b;
 
     new-instance p3, Lorg/a/a/b;
 
-    iget-object v1, p0, Lorg/a/a/u;->bzO:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/u;->bzJ: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;->bzO:Lorg/a/a/z;
+    iget-object p1, p0, Lorg/a/a/u;->bzJ: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;->bzO:Lorg/a/a/z;
+    iget-object p2, p0, Lorg/a/a/u;->bzJ:Lorg/a/a/z;
 
-    iget-object p3, p0, Lorg/a/a/u;->bAw:Lorg/a/a/b;
+    iget-object p3, p0, Lorg/a/a/u;->bAr: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;->bAw:Lorg/a/a/b;
+    iput-object p1, p0, Lorg/a/a/u;->bAr:Lorg/a/a/b;
 
     return-object p1
 
     :cond_0
     new-instance p1, Lorg/a/a/b;
 
-    iget-object p2, p0, Lorg/a/a/u;->bzO:Lorg/a/a/z;
+    iget-object p2, p0, Lorg/a/a/u;->bzJ:Lorg/a/a/z;
 
-    iget-object p3, p0, Lorg/a/a/u;->bAx:Lorg/a/a/b;
+    iget-object p3, p0, Lorg/a/a/u;->bAs: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;->bAx:Lorg/a/a/b;
+    iput-object p1, p0, Lorg/a/a/u;->bAs: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;->bBB:I
+    iget v2, v2, Lorg/a/a/r;->bBw: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;->bBB:I
+    iget v3, v3, Lorg/a/a/r;->bBw:I
 
     aget-object v4, p3, v1
 
-    iget v4, v4, Lorg/a/a/r;->bBB:I
+    iget v4, v4, Lorg/a/a/r;->bBw: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;->bzO:Lorg/a/a/z;
+    iget-object p2, p0, Lorg/a/a/u;->bzJ: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;->bzO:Lorg/a/a/z;
+    iget-object p2, p0, Lorg/a/a/u;->bzJ:Lorg/a/a/z;
 
-    iget-object p3, p0, Lorg/a/a/u;->bCa:Lorg/a/a/b;
+    iget-object p3, p0, Lorg/a/a/u;->bBV: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;->bCa:Lorg/a/a/b;
+    iput-object p1, p0, Lorg/a/a/u;->bBV:Lorg/a/a/b;
 
     return-object p1
 
     :cond_1
     new-instance p1, Lorg/a/a/b;
 
-    iget-object p2, p0, Lorg/a/a/u;->bzO:Lorg/a/a/z;
+    iget-object p2, p0, Lorg/a/a/u;->bzJ:Lorg/a/a/z;
 
-    iget-object p3, p0, Lorg/a/a/u;->bCb:Lorg/a/a/b;
+    iget-object p3, p0, Lorg/a/a/u;->bBW: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;->bCb:Lorg/a/a/b;
+    iput-object p1, p0, Lorg/a/a/u;->bBW: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;->bBP:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bBK:Lorg/a/a/d;
 
     iget v0, v0, Lorg/a/a/d;->length:I
 
-    iput v0, p0, Lorg/a/a/u;->bCx:I
+    iput v0, p0, Lorg/a/a/u;->bCs:I
 
-    iget-object v0, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bBK:Lorg/a/a/d;
 
     const/16 v1, 0xaa
 
@@ -1659,7 +1659,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
+    iget-object v1, p0, Lorg/a/a/u;->bBK: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;->bBP:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bBK:Lorg/a/a/d;
 
-    iget v1, p0, Lorg/a/a/u;->bCx:I
+    iget v1, p0, Lorg/a/a/u;->bCs: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;->bBP:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bBK: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;->bBP:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bBK:Lorg/a/a/d;
 
-    iget v1, p0, Lorg/a/a/u;->bCx:I
+    iget v1, p0, Lorg/a/a/u;->bCs: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;->bAD:I
+    iget v0, p0, Lorg/a/a/u;->bAy:I
 
     const/4 v1, 0x4
 
@@ -1738,35 +1738,35 @@
 
     if-ne v0, v4, :cond_d
 
-    iget-object v0, p0, Lorg/a/a/u;->bCo:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bCj:Lorg/a/a/r;
 
-    iget-object v0, v0, Lorg/a/a/r;->bBH:Lorg/a/a/o;
+    iget-object v0, v0, Lorg/a/a/r;->bBC:Lorg/a/a/o;
 
     if-nez v0, :cond_1
 
-    iget-object p1, p0, Lorg/a/a/u;->bCo:Lorg/a/a/r;
+    iget-object p1, p0, Lorg/a/a/u;->bCj: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;->bBH:Lorg/a/a/o;
+    iput-object p3, p1, Lorg/a/a/r;->bBC:Lorg/a/a/o;
 
-    iget-object p1, p0, Lorg/a/a/u;->bCo:Lorg/a/a/r;
+    iget-object p1, p0, Lorg/a/a/u;->bCj:Lorg/a/a/r;
 
-    iget-object p1, p1, Lorg/a/a/r;->bBH:Lorg/a/a/o;
+    iget-object p1, p1, Lorg/a/a/r;->bBC:Lorg/a/a/o;
 
-    iget-object p3, p0, Lorg/a/a/u;->bzO:Lorg/a/a/z;
+    iget-object p3, p0, Lorg/a/a/u;->bzJ:Lorg/a/a/z;
 
-    iget v0, p0, Lorg/a/a/u;->bAe:I
+    iget v0, p0, Lorg/a/a/u;->bzZ: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;->bCo:Lorg/a/a/r;
+    iget-object p1, p0, Lorg/a/a/u;->bCj:Lorg/a/a/r;
 
-    iget-object p1, p1, Lorg/a/a/r;->bBH:Lorg/a/a/o;
+    iget-object p1, p1, Lorg/a/a/r;->bBC: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;->bCo:Lorg/a/a/r;
+    iget-object p1, p0, Lorg/a/a/u;->bCj:Lorg/a/a/r;
 
-    iget-object p1, p1, Lorg/a/a/r;->bBH:Lorg/a/a/o;
+    iget-object p1, p1, Lorg/a/a/r;->bBC:Lorg/a/a/o;
 
-    iget-object v0, p0, Lorg/a/a/u;->bzO:Lorg/a/a/z;
+    iget-object v0, p0, Lorg/a/a/u;->bzJ: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;->bBg:[I
+    iget-object v7, p1, Lorg/a/a/o;->bBb:[I
 
     add-int/lit8 v8, v2, 0x1
 
@@ -1804,13 +1804,13 @@
 
     aget-object v2, p3, v1
 
-    sget-object v7, Lorg/a/a/x;->bCV:Ljava/lang/Integer;
+    sget-object v7, Lorg/a/a/x;->bCQ:Ljava/lang/Integer;
 
     if-eq v2, v7, :cond_3
 
     aget-object v2, p3, v1
 
-    sget-object v7, Lorg/a/a/x;->bCU:Ljava/lang/Integer;
+    sget-object v7, Lorg/a/a/x;->bCP: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;->bBg:[I
+    iget-object v2, p1, Lorg/a/a/o;->bBb:[I
 
     add-int/lit8 v7, v8, 0x1
 
@@ -1838,13 +1838,13 @@
 
     :cond_4
     :goto_3
-    iget-object p2, p1, Lorg/a/a/o;->bBg:[I
+    iget-object p2, p1, Lorg/a/a/o;->bBb:[I
 
     array-length p2, p2
 
     if-ge v2, p2, :cond_5
 
-    iget-object p2, p1, Lorg/a/a/o;->bBg:[I
+    iget-object p2, p1, Lorg/a/a/o;->bBb:[I
 
     add-int/lit8 p3, v2, 0x1
 
@@ -1864,13 +1864,13 @@
 
     aget-object v1, p5, p2
 
-    sget-object v2, Lorg/a/a/x;->bCV:Ljava/lang/Integer;
+    sget-object v2, Lorg/a/a/x;->bCQ:Ljava/lang/Integer;
 
     if-eq v1, v2, :cond_6
 
     aget-object v1, p5, p2
 
-    sget-object v2, Lorg/a/a/x;->bCU:Ljava/lang/Integer;
+    sget-object v2, Lorg/a/a/x;->bCP: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;->bBh:[I
+    iput-object p2, p1, Lorg/a/a/o;->bBc:[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;->bBh:[I
+    iget-object v1, p1, Lorg/a/a/o;->bBc:[I
 
     add-int/lit8 v2, p3, 0x1
 
@@ -1910,13 +1910,13 @@
 
     aget-object p3, p5, p2
 
-    sget-object v1, Lorg/a/a/x;->bCV:Ljava/lang/Integer;
+    sget-object v1, Lorg/a/a/x;->bCQ:Ljava/lang/Integer;
 
     if-eq p3, v1, :cond_a
 
     aget-object p3, p5, p2
 
-    sget-object v1, Lorg/a/a/x;->bCU:Ljava/lang/Integer;
+    sget-object v1, Lorg/a/a/x;->bCP: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;->bBh:[I
+    iget-object p3, p1, Lorg/a/a/o;->bBc:[I
 
     add-int/lit8 v1, v2, 0x1
 
@@ -1943,14 +1943,14 @@
     goto :goto_5
 
     :cond_b
-    iput-short v5, p1, Lorg/a/a/o;->bBl:S
+    iput-short v5, p1, Lorg/a/a/o;->bBg:S
 
-    iput v5, p1, Lorg/a/a/o;->bBm:I
+    iput v5, p1, Lorg/a/a/o;->bBh:I
 
     :cond_c
-    iget-object p1, p0, Lorg/a/a/u;->bCo:Lorg/a/a/r;
+    iget-object p1, p0, Lorg/a/a/u;->bCj:Lorg/a/a/r;
 
-    iget-object p1, p1, Lorg/a/a/r;->bBH:Lorg/a/a/o;
+    iget-object p1, p1, Lorg/a/a/r;->bBC: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;->bCt:[I
+    iget-object p1, p0, Lorg/a/a/u;->bCo:[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;->bzO:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/u;->bzJ:Lorg/a/a/z;
 
-    iget v2, p0, Lorg/a/a/u;->bAe:I
+    iget v2, p0, Lorg/a/a/u;->bzZ: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;->bCr:I
+    iput p2, p0, Lorg/a/a/u;->bCm:I
 
-    iget-object p1, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/u;->bBK: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;->bCu:[I
+    iget-object v1, p0, Lorg/a/a/u;->bCp:[I
 
     add-int/lit8 v2, v0, 0x1
 
-    iget-object v4, p0, Lorg/a/a/u;->bzO:Lorg/a/a/z;
+    iget-object v4, p0, Lorg/a/a/u;->bzJ: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;->bCu:[I
+    iget-object p2, p0, Lorg/a/a/u;->bCp:[I
 
     add-int/lit8 p3, v0, 0x1
 
-    iget-object v1, p0, Lorg/a/a/u;->bzO:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/u;->bzJ: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;->HV()V
+    invoke-virtual {p0}, Lorg/a/a/u;->HT()V
 
     goto/16 :goto_10
 
     :cond_11
-    iget-object v0, p0, Lorg/a/a/u;->bBZ:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bBU: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;->bBZ:Lorg/a/a/d;
+    iput-object v0, p0, Lorg/a/a/u;->bBU:Lorg/a/a/d;
 
-    iget-object v0, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bBK: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;->bBP:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bBK:Lorg/a/a/d;
 
     iget v0, v0, Lorg/a/a/d;->length:I
 
-    iget v2, p0, Lorg/a/a/u;->bCs:I
+    iget v2, p0, Lorg/a/a/u;->bCn:I
 
     sub-int/2addr v0, v2
 
@@ -2117,7 +2117,7 @@
 
     if-ge v0, p2, :cond_15
 
-    iget-object p1, p0, Lorg/a/a/u;->bBZ:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/u;->bBU: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;->bBZ:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/u;->bBU: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;->bBZ:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/u;->bBU: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;->bBZ:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/u;->bBU: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;->bCr:I
+    iget p1, p0, Lorg/a/a/u;->bCm:I
 
     sub-int/2addr p1, p2
 
-    iput p1, p0, Lorg/a/a/u;->bCr:I
+    iput p1, p0, Lorg/a/a/u;->bCm:I
 
-    iget-object p1, p0, Lorg/a/a/u;->bBZ:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/u;->bBU: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;->bCr:I
+    iget p1, p0, Lorg/a/a/u;->bCm:I
 
     add-int/2addr p1, p2
 
-    iput p1, p0, Lorg/a/a/u;->bCr:I
+    iput p1, p0, Lorg/a/a/u;->bCm:I
 
-    iget-object p1, p0, Lorg/a/a/u;->bBZ:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/u;->bBU: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;->bCr:I
+    iput p2, p0, Lorg/a/a/u;->bCm:I
 
-    iget-object p1, p0, Lorg/a/a/u;->bBZ:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/u;->bBU: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;->bBZ:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/u;->bBU: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;->bBP:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/u;->bBK:Lorg/a/a/d;
 
     iget p1, p1, Lorg/a/a/d;->length:I
 
-    iput p1, p0, Lorg/a/a/u;->bCs:I
+    iput p1, p0, Lorg/a/a/u;->bCn:I
 
-    iget p1, p0, Lorg/a/a/u;->bBY:I
+    iget p1, p0, Lorg/a/a/u;->bBT:I
 
     add-int/2addr p1, v6
 
-    iput p1, p0, Lorg/a/a/u;->bBY:I
+    iput p1, p0, Lorg/a/a/u;->bBT:I
 
     :goto_10
-    iget p1, p0, Lorg/a/a/u;->bAD:I
+    iget p1, p0, Lorg/a/a/u;->bAy:I
 
     if-ne p1, v3, :cond_21
 
-    iput p4, p0, Lorg/a/a/u;->bCp:I
+    iput p4, p0, Lorg/a/a/u;->bCk:I
 
     :goto_11
     if-ge v5, p4, :cond_20
 
     aget-object p1, p5, v5
 
-    sget-object p2, Lorg/a/a/x;->bCV:Ljava/lang/Integer;
+    sget-object p2, Lorg/a/a/x;->bCQ:Ljava/lang/Integer;
 
     if-eq p1, p2, :cond_1e
 
     aget-object p1, p5, v5
 
-    sget-object p2, Lorg/a/a/x;->bCU:Ljava/lang/Integer;
+    sget-object p2, Lorg/a/a/x;->bCP:Ljava/lang/Integer;
 
     if-ne p1, p2, :cond_1f
 
     :cond_1e
-    iget p1, p0, Lorg/a/a/u;->bCp:I
+    iget p1, p0, Lorg/a/a/u;->bCk:I
 
     add-int/2addr p1, v6
 
-    iput p1, p0, Lorg/a/a/u;->bCp:I
+    iput p1, p0, Lorg/a/a/u;->bCk: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;->bCp:I
+    iget p1, p0, Lorg/a/a/u;->bCk:I
 
-    iget p2, p0, Lorg/a/a/u;->bCq:I
+    iget p2, p0, Lorg/a/a/u;->bCl:I
 
     if-le p1, p2, :cond_21
 
-    iput p1, p0, Lorg/a/a/u;->bCq:I
+    iput p1, p0, Lorg/a/a/u;->bCl:I
 
     :cond_21
-    iget p1, p0, Lorg/a/a/u;->bBN:I
+    iget p1, p0, Lorg/a/a/u;->bBI:I
 
     invoke-static {p1, p4}, Ljava/lang/Math;->max(II)I
 
     move-result p1
 
-    iput p1, p0, Lorg/a/a/u;->bBN:I
+    iput p1, p0, Lorg/a/a/u;->bBI:I
 
-    iget p1, p0, Lorg/a/a/u;->bBO:I
+    iget p1, p0, Lorg/a/a/u;->bBJ:I
 
-    iget p2, p0, Lorg/a/a/u;->bCr:I
+    iget p2, p0, Lorg/a/a/u;->bCm:I
 
     invoke-static {p1, p2}, Ljava/lang/Math;->max(II)I
 
     move-result p1
 
-    iput p1, p0, Lorg/a/a/u;->bBO:I
+    iput p1, p0, Lorg/a/a/u;->bBJ: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;->bBP:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bBK:Lorg/a/a/d;
 
     iget v0, v0, Lorg/a/a/d;->length:I
 
-    iput v0, p0, Lorg/a/a/u;->bCx:I
+    iput v0, p0, Lorg/a/a/u;->bCs:I
 
-    iget-object v0, p0, Lorg/a/a/u;->bzO:Lorg/a/a/z;
+    iget-object v0, p0, Lorg/a/a/u;->bzJ: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;->bBP:Lorg/a/a/d;
+    iget-object p3, p0, Lorg/a/a/u;->bBK: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;->bCo:Lorg/a/a/r;
+    iget-object p3, p0, Lorg/a/a/u;->bCj:Lorg/a/a/r;
 
     if-eqz p3, :cond_9
 
-    iget p3, p0, Lorg/a/a/u;->bAD:I
+    iget p3, p0, Lorg/a/a/u;->bAy:I
 
     const/4 v0, 0x4
 
@@ -2400,7 +2400,7 @@
 
     packed-switch p1, :pswitch_data_0
 
-    iget p1, p0, Lorg/a/a/u;->bCp:I
+    iget p1, p0, Lorg/a/a/u;->bCk:I
 
     if-eq p2, v2, :cond_5
 
@@ -2409,7 +2409,7 @@
     goto :goto_1
 
     :pswitch_0
-    iget p1, p0, Lorg/a/a/u;->bCp:I
+    iget p1, p0, Lorg/a/a/u;->bCk:I
 
     if-eq p2, v2, :cond_4
 
@@ -2423,7 +2423,7 @@
     goto :goto_0
 
     :pswitch_1
-    iget p1, p0, Lorg/a/a/u;->bCp:I
+    iget p1, p0, Lorg/a/a/u;->bCk:I
 
     if-eq p2, v2, :cond_6
 
@@ -2437,7 +2437,7 @@
     goto :goto_2
 
     :pswitch_2
-    iget p1, p0, Lorg/a/a/u;->bCp:I
+    iget p1, p0, Lorg/a/a/u;->bCk: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;->bCq:I
+    iget p2, p0, Lorg/a/a/u;->bCl:I
 
     if-le p1, p2, :cond_7
 
-    iput p1, p0, Lorg/a/a/u;->bCq:I
+    iput p1, p0, Lorg/a/a/u;->bCl:I
 
     :cond_7
-    iput p1, p0, Lorg/a/a/u;->bCp:I
+    iput p1, p0, Lorg/a/a/u;->bCk:I
 
     goto :goto_5
 
     :cond_8
     :goto_4
-    iget-object p3, p0, Lorg/a/a/u;->bCo:Lorg/a/a/r;
+    iget-object p3, p0, Lorg/a/a/u;->bCj:Lorg/a/a/r;
 
-    iget-object p3, p3, Lorg/a/a/r;->bBH:Lorg/a/a/o;
+    iget-object p3, p3, Lorg/a/a/r;->bBC:Lorg/a/a/o;
 
-    iget-object p4, p0, Lorg/a/a/u;->bzO:Lorg/a/a/z;
+    iget-object p4, p0, Lorg/a/a/u;->bzJ: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;->bBP:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bBK:Lorg/a/a/d;
 
     iget v0, v0, Lorg/a/a/d;->length:I
 
-    iput v0, p0, Lorg/a/a/u;->bCx:I
+    iput v0, p0, Lorg/a/a/u;->bCs:I
 
-    iget-object v0, p0, Lorg/a/a/u;->bzO:Lorg/a/a/z;
+    iget-object v0, p0, Lorg/a/a/u;->bzJ: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;->bBP:Lorg/a/a/d;
+    iget-object p5, p0, Lorg/a/a/u;->bBK: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;->HX()I
+    invoke-virtual {p2}, Lorg/a/a/y;->HV()I
 
     move-result p5
 
@@ -2536,18 +2536,18 @@
     goto :goto_0
 
     :cond_0
-    iget-object p4, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
+    iget-object p4, p0, Lorg/a/a/u;->bBK: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;->bCo:Lorg/a/a/r;
+    iget-object p4, p0, Lorg/a/a/u;->bCj:Lorg/a/a/r;
 
     if-eqz p4, :cond_5
 
-    iget p4, p0, Lorg/a/a/u;->bAD:I
+    iget p4, p0, Lorg/a/a/u;->bAy:I
 
     const/4 p5, 0x4
 
@@ -2560,7 +2560,7 @@
     goto :goto_2
 
     :cond_1
-    invoke-virtual {p2}, Lorg/a/a/y;->HX()I
+    invoke-virtual {p2}, Lorg/a/a/y;->HV()I
 
     move-result p2
 
@@ -2574,7 +2574,7 @@
 
     if-ne p1, p2, :cond_2
 
-    iget p1, p0, Lorg/a/a/u;->bCp:I
+    iget p1, p0, Lorg/a/a/u;->bCk:I
 
     add-int/2addr p1, p3
 
@@ -2583,29 +2583,29 @@
     goto :goto_1
 
     :cond_2
-    iget p1, p0, Lorg/a/a/u;->bCp:I
+    iget p1, p0, Lorg/a/a/u;->bCk:I
 
     add-int/2addr p1, p3
 
     :goto_1
-    iget p2, p0, Lorg/a/a/u;->bCq:I
+    iget p2, p0, Lorg/a/a/u;->bCl:I
 
     if-le p1, p2, :cond_3
 
-    iput p1, p0, Lorg/a/a/u;->bCq:I
+    iput p1, p0, Lorg/a/a/u;->bCl:I
 
     :cond_3
-    iput p1, p0, Lorg/a/a/u;->bCp:I
+    iput p1, p0, Lorg/a/a/u;->bCk:I
 
     goto :goto_3
 
     :cond_4
     :goto_2
-    iget-object p4, p0, Lorg/a/a/u;->bCo:Lorg/a/a/r;
+    iget-object p4, p0, Lorg/a/a/u;->bCj:Lorg/a/a/r;
 
-    iget-object p4, p4, Lorg/a/a/r;->bBH:Lorg/a/a/o;
+    iget-object p4, p4, Lorg/a/a/r;->bBC:Lorg/a/a/o;
 
-    iget-object p5, p0, Lorg/a/a/u;->bzO:Lorg/a/a/z;
+    iget-object p5, p0, Lorg/a/a/u;->bzJ: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;->bBP:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bBK:Lorg/a/a/d;
 
     iget v0, v0, Lorg/a/a/d;->length:I
 
-    iput v0, p0, Lorg/a/a/u;->bCx:I
+    iput v0, p0, Lorg/a/a/u;->bCs:I
 
     const/16 v0, 0xc8
 
@@ -2635,7 +2635,7 @@
     move v1, p1
 
     :goto_0
-    iget-short v2, p2, Lorg/a/a/r;->bBy:S
+    iget-short v2, p2, Lorg/a/a/r;->bBt:S
 
     const/4 v3, 0x4
 
@@ -2651,9 +2651,9 @@
 
     if-eqz v2, :cond_4
 
-    iget v2, p2, Lorg/a/a/r;->bBB:I
+    iget v2, p2, Lorg/a/a/r;->bBw:I
 
-    iget-object v8, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
+    iget-object v8, p0, Lorg/a/a/u;->bBK: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;->bBP:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/u;->bBK: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;->bBP:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/u;->bBK: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;->bBP:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/u;->bBK: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;->bBP:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/u;->bBK: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;->bBP:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/u;->bBK: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;->bCw:Z
+    iput-boolean v7, p0, Lorg/a/a/u;->bCr:Z
 
     const/4 p1, 0x1
 
     :goto_3
-    iget-object v0, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bBK: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;->bBP:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bBK: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;->bBP:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/u;->bBK: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;->bBP:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/u;->bBK: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;->bBP:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/u;->bBK: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;->bCo:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bCj:Lorg/a/a/r;
 
     if-eqz v0, :cond_e
 
-    iget v2, p0, Lorg/a/a/u;->bAD:I
+    iget v2, p0, Lorg/a/a/u;->bAy:I
 
     const/4 v8, 0x2
 
@@ -2779,21 +2779,21 @@
 
     if-ne v2, v3, :cond_6
 
-    iget-object v0, v0, Lorg/a/a/r;->bBH:Lorg/a/a/o;
+    iget-object v0, v0, Lorg/a/a/r;->bBC: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;->HS()Lorg/a/a/r;
+    invoke-virtual {p2}, Lorg/a/a/r;->HQ()Lorg/a/a/r;
 
     move-result-object v0
 
-    iget-short v2, v0, Lorg/a/a/r;->bBy:S
+    iget-short v2, v0, Lorg/a/a/r;->bBt:S
 
     or-int/2addr v2, v8
 
     int-to-short v2, v2
 
-    iput-short v2, v0, Lorg/a/a/r;->bBy:S
+    iput-short v2, v0, Lorg/a/a/r;->bBt: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;->bBH:Lorg/a/a/o;
+    iget-object p2, v0, Lorg/a/a/r;->bBC: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;->bCp:I
+    iget p2, p0, Lorg/a/a/u;->bCk:I
 
-    sget-object v0, Lorg/a/a/u;->bBM:[I
+    sget-object v0, Lorg/a/a/u;->bBH:[I
 
     aget v0, v0, v1
 
     add-int/2addr p2, v0
 
-    iput p2, p0, Lorg/a/a/u;->bCp:I
+    iput p2, p0, Lorg/a/a/u;->bCk:I
 
     goto :goto_6
 
     :cond_8
     if-ne v1, v4, :cond_a
 
-    iget-short v0, p2, Lorg/a/a/r;->bBy:S
+    iget-short v0, p2, Lorg/a/a/r;->bBt:S
 
     and-int/lit8 v0, v0, 0x20
 
     if-nez v0, :cond_9
 
-    iget-short v0, p2, Lorg/a/a/r;->bBy:S
+    iget-short v0, p2, Lorg/a/a/r;->bBt:S
 
     or-int/lit8 v0, v0, 0x20
 
     int-to-short v0, v0
 
-    iput-short v0, p2, Lorg/a/a/r;->bBy:S
+    iput-short v0, p2, Lorg/a/a/r;->bBt:S
 
-    iput-boolean v7, p0, Lorg/a/a/u;->bCv:Z
+    iput-boolean v7, p0, Lorg/a/a/u;->bCq:Z
 
     :cond_9
-    iget-object v0, p0, Lorg/a/a/u;->bCo:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bCj:Lorg/a/a/r;
 
-    iget-short v2, v0, Lorg/a/a/r;->bBy:S
+    iget-short v2, v0, Lorg/a/a/r;->bBt:S
 
     or-int/lit8 v2, v2, 0x10
 
     int-to-short v2, v2
 
-    iput-short v2, v0, Lorg/a/a/r;->bBy:S
+    iput-short v2, v0, Lorg/a/a/r;->bBt:S
 
-    iget v0, p0, Lorg/a/a/u;->bCp:I
+    iget v0, p0, Lorg/a/a/u;->bCk:I
 
     add-int/2addr v0, v7
 
@@ -2874,17 +2874,17 @@
     goto :goto_6
 
     :cond_a
-    iget v0, p0, Lorg/a/a/u;->bCp:I
+    iget v0, p0, Lorg/a/a/u;->bCk:I
 
-    sget-object v2, Lorg/a/a/u;->bBM:[I
+    sget-object v2, Lorg/a/a/u;->bBH:[I
 
     aget v2, v2, v1
 
     add-int/2addr v0, v2
 
-    iput v0, p0, Lorg/a/a/u;->bCp:I
+    iput v0, p0, Lorg/a/a/u;->bCk:I
 
-    iget v0, p0, Lorg/a/a/u;->bCp:I
+    iget v0, p0, Lorg/a/a/u;->bCk: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;->bBy:S
+    iget-short p1, v9, Lorg/a/a/r;->bBt:S
 
     or-int/2addr p1, v8
 
     int-to-short p1, p1
 
-    iput-short p1, v9, Lorg/a/a/r;->bBy:S
+    iput-short p1, v9, Lorg/a/a/r;->bBt: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;->HU()V
+    invoke-direct {p0}, Lorg/a/a/u;->HS()V
 
     :cond_e
     return-void
@@ -2921,7 +2921,7 @@
 
     if-eqz p3, :cond_1
 
-    iget-object v1, p0, Lorg/a/a/u;->bBX:Lorg/a/a/d;
+    iget-object v1, p0, Lorg/a/a/u;->bBS: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;->bBX:Lorg/a/a/d;
+    iput-object v1, p0, Lorg/a/a/u;->bBS:Lorg/a/a/d;
 
     :cond_0
-    iget v1, p0, Lorg/a/a/u;->bBW:I
+    iget v1, p0, Lorg/a/a/u;->bBR:I
 
     add-int/2addr v1, v0
 
-    iput v1, p0, Lorg/a/a/u;->bBW:I
+    iput v1, p0, Lorg/a/a/u;->bBR:I
 
-    iget-object v1, p0, Lorg/a/a/u;->bBX:Lorg/a/a/d;
+    iget-object v1, p0, Lorg/a/a/u;->bBS:Lorg/a/a/d;
 
-    iget v2, p4, Lorg/a/a/r;->bBB:I
+    iget v2, p4, Lorg/a/a/r;->bBw: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;->bBB:I
+    iget v2, p5, Lorg/a/a/r;->bBw:I
 
-    iget v3, p4, Lorg/a/a/r;->bBB:I
+    iget v3, p4, Lorg/a/a/r;->bBw:I
 
     sub-int/2addr v2, v3
 
@@ -2956,7 +2956,7 @@
 
     move-result-object v1
 
-    iget-object v2, p0, Lorg/a/a/u;->bzO:Lorg/a/a/z;
+    iget-object v2, p0, Lorg/a/a/u;->bzJ: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;->bzO:Lorg/a/a/z;
+    iget-object v2, p0, Lorg/a/a/u;->bzJ: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;->bBV:Lorg/a/a/d;
+    iget-object p3, p0, Lorg/a/a/u;->bBQ: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;->bBV:Lorg/a/a/d;
+    iput-object p3, p0, Lorg/a/a/u;->bBQ:Lorg/a/a/d;
 
     :cond_2
-    iget p3, p0, Lorg/a/a/u;->bBU:I
+    iget p3, p0, Lorg/a/a/u;->bBP:I
 
     add-int/2addr p3, v0
 
-    iput p3, p0, Lorg/a/a/u;->bBU:I
+    iput p3, p0, Lorg/a/a/u;->bBP:I
 
-    iget-object p3, p0, Lorg/a/a/u;->bBV:Lorg/a/a/d;
+    iget-object p3, p0, Lorg/a/a/u;->bBQ:Lorg/a/a/d;
 
-    iget v1, p4, Lorg/a/a/r;->bBB:I
+    iget v1, p4, Lorg/a/a/r;->bBw: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;->bBB:I
+    iget p5, p5, Lorg/a/a/r;->bBw:I
 
-    iget p4, p4, Lorg/a/a/r;->bBB:I
+    iget p4, p4, Lorg/a/a/r;->bBw:I
 
     sub-int/2addr p5, p4
 
@@ -3014,7 +3014,7 @@
 
     move-result-object p3
 
-    iget-object p4, p0, Lorg/a/a/u;->bzO:Lorg/a/a/z;
+    iget-object p4, p0, Lorg/a/a/u;->bzJ: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;->bzO:Lorg/a/a/z;
+    iget-object p3, p0, Lorg/a/a/u;->bzJ: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;->bAD:I
+    iget p1, p0, Lorg/a/a/u;->bAy:I
 
     if-eqz p1, :cond_5
 
@@ -3060,11 +3060,11 @@
     :cond_4
     add-int/2addr p6, v0
 
-    iget p1, p0, Lorg/a/a/u;->bBO:I
+    iget p1, p0, Lorg/a/a/u;->bBJ:I
 
     if-le p6, p1, :cond_5
 
-    iput p6, p0, Lorg/a/a/u;->bBO:I
+    iput p6, p0, Lorg/a/a/u;->bBJ: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;->bBP:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bBK:Lorg/a/a/d;
 
     iget v0, v0, Lorg/a/a/d;->length:I
 
-    iput v0, p0, Lorg/a/a/u;->bCx:I
+    iput v0, p0, Lorg/a/a/u;->bCs:I
 
-    iget-object v0, p0, Lorg/a/a/u;->bzO:Lorg/a/a/z;
+    iget-object v0, p0, Lorg/a/a/u;->bzJ: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;->bBP:Lorg/a/a/d;
+    iget-object p2, p0, Lorg/a/a/u;->bBK: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;->bBP:Lorg/a/a/d;
+    iget-object p2, p0, Lorg/a/a/u;->bBK: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;->bCo:Lorg/a/a/r;
+    iget-object p2, p0, Lorg/a/a/u;->bCj:Lorg/a/a/r;
 
     if-eqz p2, :cond_3
 
-    iget p2, p0, Lorg/a/a/u;->bAD:I
+    iget p2, p0, Lorg/a/a/u;->bAy:I
 
     const/4 v0, 0x4
 
@@ -3124,7 +3124,7 @@
     goto :goto_0
 
     :cond_0
-    invoke-virtual {p1}, Lorg/a/a/y;->HX()I
+    invoke-virtual {p1}, Lorg/a/a/y;->HV()I
 
     move-result p1
 
@@ -3136,28 +3136,28 @@
 
     add-int/lit8 p2, p2, 0x1
 
-    iget p1, p0, Lorg/a/a/u;->bCp:I
+    iget p1, p0, Lorg/a/a/u;->bCk:I
 
     add-int/2addr p1, p2
 
-    iget p2, p0, Lorg/a/a/u;->bCq:I
+    iget p2, p0, Lorg/a/a/u;->bCl:I
 
     if-le p1, p2, :cond_1
 
-    iput p1, p0, Lorg/a/a/u;->bCq:I
+    iput p1, p0, Lorg/a/a/u;->bCl:I
 
     :cond_1
-    iput p1, p0, Lorg/a/a/u;->bCp:I
+    iput p1, p0, Lorg/a/a/u;->bCk:I
 
     goto :goto_1
 
     :cond_2
     :goto_0
-    iget-object p2, p0, Lorg/a/a/u;->bCo:Lorg/a/a/r;
+    iget-object p2, p0, Lorg/a/a/u;->bCj:Lorg/a/a/r;
 
-    iget-object p2, p2, Lorg/a/a/r;->bBH:Lorg/a/a/o;
+    iget-object p2, p2, Lorg/a/a/r;->bBC:Lorg/a/a/o;
 
-    iget-object v0, p0, Lorg/a/a/u;->bzO:Lorg/a/a/z;
+    iget-object v0, p0, Lorg/a/a/u;->bzJ: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;->bzO:Lorg/a/a/z;
+    iget-object v0, p0, Lorg/a/a/u;->bzJ: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;->bBQ:Lorg/a/a/q;
+    iget-object p1, p0, Lorg/a/a/u;->bBL:Lorg/a/a/q;
 
     if-nez p1, :cond_1
 
-    iput-object v6, p0, Lorg/a/a/u;->bBQ:Lorg/a/a/q;
+    iput-object v6, p0, Lorg/a/a/u;->bBL:Lorg/a/a/q;
 
     goto :goto_1
 
     :cond_1
-    iget-object p1, p0, Lorg/a/a/u;->bBR:Lorg/a/a/q;
+    iget-object p1, p0, Lorg/a/a/u;->bBM:Lorg/a/a/q;
 
-    iput-object v6, p1, Lorg/a/a/q;->bBw:Lorg/a/a/q;
+    iput-object v6, p1, Lorg/a/a/q;->bBr:Lorg/a/a/q;
 
     :goto_1
-    iput-object v6, p0, Lorg/a/a/u;->bBR:Lorg/a/a/q;
+    iput-object v6, p0, Lorg/a/a/u;->bBM: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;->bBP:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bBK:Lorg/a/a/d;
 
     iget v0, v0, Lorg/a/a/d;->length:I
 
-    iput v0, p0, Lorg/a/a/u;->bCx:I
+    iput v0, p0, Lorg/a/a/u;->bCs:I
 
-    iget-object v0, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bBK:Lorg/a/a/d;
 
     const/16 v1, 0xab
 
@@ -3239,7 +3239,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
+    iget-object v1, p0, Lorg/a/a/u;->bBK: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;->bBP:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bBK:Lorg/a/a/d;
 
-    iget v1, p0, Lorg/a/a/u;->bCx:I
+    iget v1, p0, Lorg/a/a/u;->bCs: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;->bBP:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bBK: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;->bBP:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bBK: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;->bBP:Lorg/a/a/d;
+    iget-object v1, p0, Lorg/a/a/u;->bBK:Lorg/a/a/d;
 
-    iget v4, p0, Lorg/a/a/u;->bCx:I
+    iget v4, p0, Lorg/a/a/u;->bCs: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;->bBP:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bBK:Lorg/a/a/d;
 
     iget v0, v0, Lorg/a/a/d;->length:I
 
-    iput v0, p0, Lorg/a/a/u;->bCx:I
+    iput v0, p0, Lorg/a/a/u;->bCs:I
 
     const/16 v0, 0x84
 
@@ -3324,7 +3324,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object v1, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
+    iget-object v1, p0, Lorg/a/a/u;->bBK: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;->bBP:Lorg/a/a/d;
+    iget-object v1, p0, Lorg/a/a/u;->bBK: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;->bCo:Lorg/a/a/r;
+    iget-object p2, p0, Lorg/a/a/u;->bCj:Lorg/a/a/r;
 
     if-eqz p2, :cond_3
 
-    iget p2, p0, Lorg/a/a/u;->bAD:I
+    iget p2, p0, Lorg/a/a/u;->bAy: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;->bCo:Lorg/a/a/r;
+    iget-object p2, p0, Lorg/a/a/u;->bCj:Lorg/a/a/r;
 
-    iget-object p2, p2, Lorg/a/a/r;->bBH:Lorg/a/a/o;
+    iget-object p2, p2, Lorg/a/a/r;->bBC: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;->bAD:I
+    iget p2, p0, Lorg/a/a/u;->bAy:I
 
     if-eqz p2, :cond_4
 
     add-int/lit8 p1, p1, 0x1
 
-    iget p2, p0, Lorg/a/a/u;->bBO:I
+    iget p2, p0, Lorg/a/a/u;->bBJ:I
 
     if-le p1, p2, :cond_4
 
-    iput p1, p0, Lorg/a/a/u;->bBO:I
+    iput p1, p0, Lorg/a/a/u;->bBJ:I
 
     :cond_4
     return-void
@@ -3394,7 +3394,7 @@
 .method public final ab(II)V
     .locals 12
 
-    iget v0, p0, Lorg/a/a/u;->bAD:I
+    iget v0, p0, Lorg/a/a/u;->bAy:I
 
     const/4 v1, 0x0
 
@@ -3406,52 +3406,52 @@
 
     if-ne v0, v4, :cond_c
 
-    iget-object p1, p0, Lorg/a/a/u;->bBQ:Lorg/a/a/q;
+    iget-object p1, p0, Lorg/a/a/u;->bBL: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;->bBv:Ljava/lang/String;
+    iget-object v0, p1, Lorg/a/a/q;->bBq:Ljava/lang/String;
 
     if-nez v0, :cond_0
 
     goto :goto_1
 
     :cond_0
-    iget-object p2, p1, Lorg/a/a/q;->bBv:Ljava/lang/String;
+    iget-object p2, p1, Lorg/a/a/q;->bBq:Ljava/lang/String;
 
     :goto_1
-    iget-object v0, p0, Lorg/a/a/u;->bzO:Lorg/a/a/z;
+    iget-object v0, p0, Lorg/a/a/u;->bzJ: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;->bBt:Lorg/a/a/r;
+    iget-object v0, p1, Lorg/a/a/q;->bBo:Lorg/a/a/r;
 
-    invoke-virtual {v0}, Lorg/a/a/r;->HS()Lorg/a/a/r;
+    invoke-virtual {v0}, Lorg/a/a/r;->HQ()Lorg/a/a/r;
 
     move-result-object v0
 
-    iget-short v4, v0, Lorg/a/a/r;->bBy:S
+    iget-short v4, v0, Lorg/a/a/r;->bBt:S
 
     or-int/2addr v4, v2
 
     int-to-short v4, v4
 
-    iput-short v4, v0, Lorg/a/a/r;->bBy:S
+    iput-short v4, v0, Lorg/a/a/r;->bBt:S
 
-    iget-object v4, p1, Lorg/a/a/q;->bBr:Lorg/a/a/r;
+    iget-object v4, p1, Lorg/a/a/q;->bBm:Lorg/a/a/r;
 
-    invoke-virtual {v4}, Lorg/a/a/r;->HS()Lorg/a/a/r;
+    invoke-virtual {v4}, Lorg/a/a/r;->HQ()Lorg/a/a/r;
 
     move-result-object v4
 
-    iget-object v5, p1, Lorg/a/a/q;->bBs:Lorg/a/a/r;
+    iget-object v5, p1, Lorg/a/a/q;->bBn:Lorg/a/a/r;
 
-    invoke-virtual {v5}, Lorg/a/a/r;->HS()Lorg/a/a/r;
+    invoke-virtual {v5}, Lorg/a/a/r;->HQ()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;->bBJ:Lorg/a/a/l;
+    iget-object v7, v4, Lorg/a/a/r;->bBE: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;->bBJ:Lorg/a/a/l;
+    iput-object v6, v4, Lorg/a/a/r;->bBE:Lorg/a/a/l;
 
-    iget-object v4, v4, Lorg/a/a/r;->bBI:Lorg/a/a/r;
+    iget-object v4, v4, Lorg/a/a/r;->bBD:Lorg/a/a/r;
 
     goto :goto_2
 
     :cond_1
-    iget-object p1, p1, Lorg/a/a/q;->bBw:Lorg/a/a/q;
+    iget-object p1, p1, Lorg/a/a/q;->bBr:Lorg/a/a/q;
 
     goto :goto_0
 
     :cond_2
-    iget-object p1, p0, Lorg/a/a/u;->bCm:Lorg/a/a/r;
+    iget-object p1, p0, Lorg/a/a/u;->bCh:Lorg/a/a/r;
 
-    iget-object p1, p1, Lorg/a/a/r;->bBH:Lorg/a/a/o;
+    iget-object p1, p1, Lorg/a/a/r;->bBC:Lorg/a/a/o;
 
-    iget-object v0, p0, Lorg/a/a/u;->bzO:Lorg/a/a/z;
+    iget-object v0, p0, Lorg/a/a/u;->bzJ:Lorg/a/a/z;
 
-    iget v2, p0, Lorg/a/a/u;->bAe:I
+    iget v2, p0, Lorg/a/a/u;->bzZ:I
 
     iget-object v4, p0, Lorg/a/a/u;->descriptor:Ljava/lang/String;
 
-    iget v5, p0, Lorg/a/a/u;->bBO:I
+    iget v5, p0, Lorg/a/a/u;->bBJ: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;->bCm:Lorg/a/a/r;
+    iget-object p1, p0, Lorg/a/a/u;->bCh:Lorg/a/a/r;
 
-    sget-object v0, Lorg/a/a/r;->bBx:Lorg/a/a/r;
+    sget-object v0, Lorg/a/a/r;->bBs:Lorg/a/a/r;
 
-    iput-object v0, p1, Lorg/a/a/r;->bBK:Lorg/a/a/r;
+    iput-object v0, p1, Lorg/a/a/r;->bBF:Lorg/a/a/r;
 
     const/4 v0, 0x0
 
     const/4 v2, 0x0
 
     :goto_3
-    sget-object v4, Lorg/a/a/r;->bBx:Lorg/a/a/r;
+    sget-object v4, Lorg/a/a/r;->bBs:Lorg/a/a/r;
 
     if-eq p1, v4, :cond_6
 
-    iget-object v4, p1, Lorg/a/a/r;->bBK:Lorg/a/a/r;
+    iget-object v4, p1, Lorg/a/a/r;->bBF:Lorg/a/a/r;
 
-    iput-object v1, p1, Lorg/a/a/r;->bBK:Lorg/a/a/r;
+    iput-object v1, p1, Lorg/a/a/r;->bBF:Lorg/a/a/r;
 
-    iget-short v5, p1, Lorg/a/a/r;->bBy:S
+    iget-short v5, p1, Lorg/a/a/r;->bBt:S
 
     or-int/lit8 v5, v5, 0x8
 
     int-to-short v5, v5
 
-    iput-short v5, p1, Lorg/a/a/r;->bBy:S
+    iput-short v5, p1, Lorg/a/a/r;->bBt:S
 
-    iget-object v5, p1, Lorg/a/a/r;->bBH:Lorg/a/a/o;
+    iget-object v5, p1, Lorg/a/a/r;->bBC:Lorg/a/a/o;
 
-    iget-object v5, v5, Lorg/a/a/o;->bBh:[I
+    iget-object v5, v5, Lorg/a/a/o;->bBc:[I
 
     array-length v5, v5
 
-    iget-short v6, p1, Lorg/a/a/r;->bBF:S
+    iget-short v6, p1, Lorg/a/a/r;->bBA:S
 
     add-int/2addr v5, v6
 
@@ -3534,22 +3534,22 @@
     move v2, v5
 
     :cond_3
-    iget-object v5, p1, Lorg/a/a/r;->bBJ:Lorg/a/a/l;
+    iget-object v5, p1, Lorg/a/a/r;->bBE:Lorg/a/a/l;
 
     :goto_4
     if-eqz v5, :cond_5
 
-    iget-object v6, v5, Lorg/a/a/l;->bAZ:Lorg/a/a/r;
+    iget-object v6, v5, Lorg/a/a/l;->bAU:Lorg/a/a/r;
 
-    invoke-virtual {v6}, Lorg/a/a/r;->HS()Lorg/a/a/r;
+    invoke-virtual {v6}, Lorg/a/a/r;->HQ()Lorg/a/a/r;
 
     move-result-object v6
 
-    iget-object v7, p1, Lorg/a/a/r;->bBH:Lorg/a/a/o;
+    iget-object v7, p1, Lorg/a/a/r;->bBC:Lorg/a/a/o;
 
-    iget-object v8, p0, Lorg/a/a/u;->bzO:Lorg/a/a/z;
+    iget-object v8, p0, Lorg/a/a/u;->bzJ:Lorg/a/a/z;
 
-    iget-object v9, v6, Lorg/a/a/r;->bBH:Lorg/a/a/o;
+    iget-object v9, v6, Lorg/a/a/r;->bBC: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;->bBK:Lorg/a/a/r;
+    iget-object v7, v6, Lorg/a/a/r;->bBF:Lorg/a/a/r;
 
     if-nez v7, :cond_4
 
-    iput-object v4, v6, Lorg/a/a/r;->bBK:Lorg/a/a/r;
+    iput-object v4, v6, Lorg/a/a/r;->bBF:Lorg/a/a/r;
 
     move-object v4, v6
 
     :cond_4
-    iget-object v5, v5, Lorg/a/a/l;->bBa:Lorg/a/a/l;
+    iget-object v5, v5, Lorg/a/a/l;->bAV:Lorg/a/a/l;
 
     goto :goto_4
 
@@ -3578,12 +3578,12 @@
     goto :goto_3
 
     :cond_6
-    iget-object p1, p0, Lorg/a/a/u;->bCm:Lorg/a/a/r;
+    iget-object p1, p0, Lorg/a/a/u;->bCh:Lorg/a/a/r;
 
     :goto_5
     if-eqz p1, :cond_b
 
-    iget-short v1, p1, Lorg/a/a/r;->bBy:S
+    iget-short v1, p1, Lorg/a/a/r;->bBt:S
 
     const/16 v4, 0xa
 
@@ -3591,31 +3591,31 @@
 
     if-ne v1, v4, :cond_7
 
-    iget-object v1, p1, Lorg/a/a/r;->bBH:Lorg/a/a/o;
+    iget-object v1, p1, Lorg/a/a/r;->bBC: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;->bBy:S
+    iget-short v1, p1, Lorg/a/a/r;->bBt:S
 
     and-int/lit8 v1, v1, 0x8
 
     if-nez v1, :cond_a
 
-    iget-object v1, p1, Lorg/a/a/r;->bBI:Lorg/a/a/r;
+    iget-object v1, p1, Lorg/a/a/r;->bBD:Lorg/a/a/r;
 
-    iget v4, p1, Lorg/a/a/r;->bBB:I
+    iget v4, p1, Lorg/a/a/r;->bBw:I
 
     if-nez v1, :cond_8
 
-    iget-object v5, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
+    iget-object v5, p0, Lorg/a/a/u;->bBK: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;->bBB:I
+    iget v5, v1, Lorg/a/a/r;->bBw: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;->bBP:Lorg/a/a/d;
+    iget-object v7, p0, Lorg/a/a/u;->bBK: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;->bBP:Lorg/a/a/d;
+    iget-object v6, p0, Lorg/a/a/u;->bBK: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;->bCu:[I
+    iget-object v4, p0, Lorg/a/a/u;->bCp:[I
 
     const/4 v5, 0x3
 
-    iget-object v6, p0, Lorg/a/a/u;->bzO:Lorg/a/a/z;
+    iget-object v6, p0, Lorg/a/a/u;->bzJ: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;->HV()V
+    invoke-virtual {p0}, Lorg/a/a/u;->HT()V
 
-    iget-object v4, p0, Lorg/a/a/u;->bBQ:Lorg/a/a/q;
+    iget-object v4, p0, Lorg/a/a/u;->bBL: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;->bBQ:Lorg/a/a/q;
+    iput-object v1, p0, Lorg/a/a/u;->bBL: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;->bBI:Lorg/a/a/r;
+    iget-object p1, p1, Lorg/a/a/r;->bBD:Lorg/a/a/r;
 
     goto :goto_5
 
     :cond_b
-    iput v2, p0, Lorg/a/a/u;->bBN:I
+    iput v2, p0, Lorg/a/a/u;->bBI:I
 
     return-void
 
     :cond_c
     if-ne v0, v3, :cond_1d
 
-    iget-object p1, p0, Lorg/a/a/u;->bBQ:Lorg/a/a/q;
+    iget-object p1, p0, Lorg/a/a/u;->bBL:Lorg/a/a/q;
 
     :goto_8
     const p2, 0x7fffffff
 
     if-eqz p1, :cond_f
 
-    iget-object v0, p1, Lorg/a/a/q;->bBt:Lorg/a/a/r;
+    iget-object v0, p1, Lorg/a/a/q;->bBo:Lorg/a/a/r;
 
-    iget-object v2, p1, Lorg/a/a/q;->bBr:Lorg/a/a/r;
+    iget-object v2, p1, Lorg/a/a/q;->bBm:Lorg/a/a/r;
 
-    iget-object v4, p1, Lorg/a/a/q;->bBs:Lorg/a/a/r;
+    iget-object v4, p1, Lorg/a/a/q;->bBn:Lorg/a/a/r;
 
     :goto_9
     if-eq v2, v4, :cond_e
 
-    iget-short v5, v2, Lorg/a/a/r;->bBy:S
+    iget-short v5, v2, Lorg/a/a/r;->bBt: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;->bBJ:Lorg/a/a/l;
+    iget-object v6, v2, Lorg/a/a/r;->bBE: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;->bBJ:Lorg/a/a/l;
+    iput-object v5, v2, Lorg/a/a/r;->bBE:Lorg/a/a/l;
 
     goto :goto_a
 
     :cond_d
-    iget-object v5, v2, Lorg/a/a/r;->bBJ:Lorg/a/a/l;
+    iget-object v5, v2, Lorg/a/a/r;->bBE:Lorg/a/a/l;
 
-    iget-object v5, v5, Lorg/a/a/l;->bBa:Lorg/a/a/l;
+    iget-object v5, v5, Lorg/a/a/l;->bAV:Lorg/a/a/l;
 
     new-instance v6, Lorg/a/a/l;
 
-    iget-object v7, v2, Lorg/a/a/r;->bBJ:Lorg/a/a/l;
+    iget-object v7, v2, Lorg/a/a/r;->bBE: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;->bAV: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;->bAV: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;->bBa:Lorg/a/a/l;
+    iput-object v6, v5, Lorg/a/a/l;->bAV:Lorg/a/a/l;
 
     :goto_a
-    iget-object v2, v2, Lorg/a/a/r;->bBI:Lorg/a/a/r;
+    iget-object v2, v2, Lorg/a/a/r;->bBD:Lorg/a/a/r;
 
     goto :goto_9
 
     :cond_e
-    iget-object p1, p1, Lorg/a/a/q;->bBw:Lorg/a/a/q;
+    iget-object p1, p1, Lorg/a/a/q;->bBr:Lorg/a/a/q;
 
     goto :goto_8
 
     :cond_f
-    iget-boolean p1, p0, Lorg/a/a/u;->bCv:Z
+    iget-boolean p1, p0, Lorg/a/a/u;->bCq:Z
 
     if-eqz p1, :cond_16
 
-    iget-object p1, p0, Lorg/a/a/u;->bCm:Lorg/a/a/r;
+    iget-object p1, p0, Lorg/a/a/u;->bCh: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;->bCm:Lorg/a/a/r;
+    iget-object v2, p0, Lorg/a/a/u;->bCh:Lorg/a/a/r;
 
     :goto_c
     if-eqz v2, :cond_11
 
-    iget-short v4, v2, Lorg/a/a/r;->bBy:S
+    iget-short v4, v2, Lorg/a/a/r;->bBt:S
 
     and-int/lit8 v4, v4, 0x10
 
     if-eqz v4, :cond_10
 
-    iget-short v4, v2, Lorg/a/a/r;->bBG:S
+    iget-short v4, v2, Lorg/a/a/r;->bBB:S
 
     if-ne v4, p1, :cond_10
 
-    iget-object v4, v2, Lorg/a/a/r;->bBJ:Lorg/a/a/l;
+    iget-object v4, v2, Lorg/a/a/r;->bBE: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;->bAV:Lorg/a/a/l;
 
-    iget-object v4, v4, Lorg/a/a/l;->bAZ:Lorg/a/a/r;
+    iget-object v4, v4, Lorg/a/a/l;->bAU:Lorg/a/a/r;
 
-    iget-short v5, v4, Lorg/a/a/r;->bBG:S
+    iget-short v5, v4, Lorg/a/a/r;->bBB: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;->bBI:Lorg/a/a/r;
+    iget-object v2, v2, Lorg/a/a/r;->bBD:Lorg/a/a/r;
 
     goto :goto_c
 
@@ -3808,28 +3808,28 @@
     goto :goto_b
 
     :cond_12
-    iget-object p1, p0, Lorg/a/a/u;->bCm:Lorg/a/a/r;
+    iget-object p1, p0, Lorg/a/a/u;->bCh:Lorg/a/a/r;
 
     :goto_d
     if-eqz p1, :cond_16
 
-    iget-short v0, p1, Lorg/a/a/r;->bBy:S
+    iget-short v0, p1, Lorg/a/a/r;->bBt:S
 
     and-int/lit8 v0, v0, 0x10
 
     if-eqz v0, :cond_15
 
-    iget-object v0, p1, Lorg/a/a/r;->bBJ:Lorg/a/a/l;
+    iget-object v0, p1, Lorg/a/a/r;->bBE: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;->bAV:Lorg/a/a/l;
 
-    iget-object v0, v0, Lorg/a/a/l;->bAZ:Lorg/a/a/r;
+    iget-object v0, v0, Lorg/a/a/l;->bAU:Lorg/a/a/r;
 
-    sget-object v2, Lorg/a/a/r;->bBx:Lorg/a/a/r;
+    sget-object v2, Lorg/a/a/r;->bBs:Lorg/a/a/r;
 
-    sget-object v4, Lorg/a/a/r;->bBx:Lorg/a/a/r;
+    sget-object v4, Lorg/a/a/r;->bBs:Lorg/a/a/r;
 
-    iput-object v4, v0, Lorg/a/a/r;->bBK:Lorg/a/a/r;
+    iput-object v4, v0, Lorg/a/a/r;->bBF: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;->bBx:Lorg/a/a/r;
+    sget-object v4, Lorg/a/a/r;->bBs:Lorg/a/a/r;
 
     if-eq v2, v4, :cond_14
 
-    iget-object v4, v2, Lorg/a/a/r;->bBK:Lorg/a/a/r;
+    iget-object v4, v2, Lorg/a/a/r;->bBF:Lorg/a/a/r;
 
-    iput-object v0, v2, Lorg/a/a/r;->bBK:Lorg/a/a/r;
+    iput-object v0, v2, Lorg/a/a/r;->bBF:Lorg/a/a/r;
 
-    iget-short v0, v2, Lorg/a/a/r;->bBy:S
+    iget-short v0, v2, Lorg/a/a/r;->bBt:S
 
     and-int/lit8 v0, v0, 0x40
 
     if-eqz v0, :cond_13
 
-    iget-short v0, v2, Lorg/a/a/r;->bBG:S
+    iget-short v0, v2, Lorg/a/a/r;->bBB:S
 
-    iget-short v5, p1, Lorg/a/a/r;->bBG:S
+    iget-short v5, p1, Lorg/a/a/r;->bBB:S
 
     if-eq v0, v5, :cond_13
 
     new-instance v0, Lorg/a/a/l;
 
-    iget-short v5, v2, Lorg/a/a/r;->bBE:S
+    iget-short v5, v2, Lorg/a/a/r;->bBz:S
 
-    iget-object v6, p1, Lorg/a/a/r;->bBJ:Lorg/a/a/l;
+    iget-object v6, p1, Lorg/a/a/r;->bBE:Lorg/a/a/l;
 
-    iget-object v6, v6, Lorg/a/a/l;->bAZ:Lorg/a/a/r;
+    iget-object v6, v6, Lorg/a/a/l;->bAU:Lorg/a/a/r;
 
-    iget-object v7, v2, Lorg/a/a/r;->bBJ:Lorg/a/a/l;
+    iget-object v7, v2, Lorg/a/a/r;->bBE: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;->bBJ:Lorg/a/a/l;
+    iput-object v0, v2, Lorg/a/a/r;->bBE: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;->bBx:Lorg/a/a/r;
+    sget-object v2, Lorg/a/a/r;->bBs:Lorg/a/a/r;
 
     if-eq v0, v2, :cond_15
 
-    iget-object v2, v0, Lorg/a/a/r;->bBK:Lorg/a/a/r;
+    iget-object v2, v0, Lorg/a/a/r;->bBF:Lorg/a/a/r;
 
-    iput-object v1, v0, Lorg/a/a/r;->bBK:Lorg/a/a/r;
+    iput-object v1, v0, Lorg/a/a/r;->bBF:Lorg/a/a/r;
 
     move-object v0, v2
 
     goto :goto_f
 
     :cond_15
-    iget-object p1, p1, Lorg/a/a/r;->bBI:Lorg/a/a/r;
+    iget-object p1, p1, Lorg/a/a/r;->bBD:Lorg/a/a/r;
 
     goto :goto_d
 
     :cond_16
-    iget-object p1, p0, Lorg/a/a/u;->bCm:Lorg/a/a/r;
+    iget-object p1, p0, Lorg/a/a/u;->bCh:Lorg/a/a/r;
 
-    sget-object v0, Lorg/a/a/r;->bBx:Lorg/a/a/r;
+    sget-object v0, Lorg/a/a/r;->bBs:Lorg/a/a/r;
 
-    iput-object v0, p1, Lorg/a/a/r;->bBK:Lorg/a/a/r;
+    iput-object v0, p1, Lorg/a/a/r;->bBF:Lorg/a/a/r;
 
-    iget v0, p0, Lorg/a/a/u;->bBN:I
+    iget v0, p0, Lorg/a/a/u;->bBI:I
 
     :cond_17
-    sget-object v1, Lorg/a/a/r;->bBx:Lorg/a/a/r;
+    sget-object v1, Lorg/a/a/r;->bBs:Lorg/a/a/r;
 
     if-eq p1, v1, :cond_1c
 
-    iget-object v1, p1, Lorg/a/a/r;->bBK:Lorg/a/a/r;
+    iget-object v1, p1, Lorg/a/a/r;->bBF:Lorg/a/a/r;
 
-    iget-short v2, p1, Lorg/a/a/r;->bBD:S
+    iget-short v2, p1, Lorg/a/a/r;->bBy:S
 
-    iget-short v4, p1, Lorg/a/a/r;->bBF:S
+    iget-short v4, p1, Lorg/a/a/r;->bBA:S
 
     add-int/2addr v4, v2
 
@@ -3925,15 +3925,15 @@
     move v0, v4
 
     :cond_18
-    iget-object v4, p1, Lorg/a/a/r;->bBJ:Lorg/a/a/l;
+    iget-object v4, p1, Lorg/a/a/r;->bBE:Lorg/a/a/l;
 
-    iget-short p1, p1, Lorg/a/a/r;->bBy:S
+    iget-short p1, p1, Lorg/a/a/r;->bBt:S
 
     and-int/lit8 p1, p1, 0x10
 
     if-eqz p1, :cond_19
 
-    iget-object v4, v4, Lorg/a/a/l;->bBa:Lorg/a/a/l;
+    iget-object v4, v4, Lorg/a/a/l;->bAV: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;->bAZ:Lorg/a/a/r;
+    iget-object v1, v4, Lorg/a/a/l;->bAU:Lorg/a/a/r;
 
-    iget-object v5, v1, Lorg/a/a/r;->bBK:Lorg/a/a/r;
+    iget-object v5, v1, Lorg/a/a/r;->bBF: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;->bBD:S
+    iput-short v5, v1, Lorg/a/a/r;->bBy:S
 
-    iput-object p1, v1, Lorg/a/a/r;->bBK:Lorg/a/a/r;
+    iput-object p1, v1, Lorg/a/a/r;->bBF:Lorg/a/a/r;
 
     move-object p1, v1
 
     :cond_1b
-    iget-object v4, v4, Lorg/a/a/l;->bBa:Lorg/a/a/l;
+    iget-object v4, v4, Lorg/a/a/l;->bAV:Lorg/a/a/l;
 
     goto :goto_10
 
     :cond_1c
-    iput v0, p0, Lorg/a/a/u;->bBN:I
+    iput v0, p0, Lorg/a/a/u;->bBI:I
 
     return-void
 
     :cond_1d
     if-ne v0, v2, :cond_1e
 
-    iget p1, p0, Lorg/a/a/u;->bCq:I
+    iget p1, p0, Lorg/a/a/u;->bCl:I
 
-    iput p1, p0, Lorg/a/a/u;->bBN:I
+    iput p1, p0, Lorg/a/a/u;->bBI:I
 
     return-void
 
     :cond_1e
-    iput p1, p0, Lorg/a/a/u;->bBN:I
+    iput p1, p0, Lorg/a/a/u;->bBI:I
 
-    iput p2, p0, Lorg/a/a/u;->bBO:I
+    iput p2, p0, Lorg/a/a/u;->bBJ:I
 
     return-void
 .end method
@@ -4007,7 +4007,7 @@
 
     and-int/2addr p1, v1
 
-    iget v1, p0, Lorg/a/a/u;->bCx:I
+    iget v1, p0, Lorg/a/a/u;->bCs: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;->bzO:Lorg/a/a/z;
+    iget-object p1, p0, Lorg/a/a/u;->bzJ: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;->bzO:Lorg/a/a/z;
+    iget-object p2, p0, Lorg/a/a/u;->bzJ:Lorg/a/a/z;
 
-    iget-object p3, p0, Lorg/a/a/u;->bCa:Lorg/a/a/b;
+    iget-object p3, p0, Lorg/a/a/u;->bBV: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;->bCa:Lorg/a/a/b;
+    iput-object p1, p0, Lorg/a/a/u;->bBV:Lorg/a/a/b;
 
     return-object p1
 
     :cond_0
     new-instance p1, Lorg/a/a/b;
 
-    iget-object p2, p0, Lorg/a/a/u;->bzO:Lorg/a/a/z;
+    iget-object p2, p0, Lorg/a/a/u;->bzJ:Lorg/a/a/z;
 
-    iget-object p3, p0, Lorg/a/a/u;->bCb:Lorg/a/a/b;
+    iget-object p3, p0, Lorg/a/a/u;->bBW: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;->bCb:Lorg/a/a/b;
+    iput-object p1, p0, Lorg/a/a/u;->bBW: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;->bBT:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bBO: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;->bBT:Lorg/a/a/d;
+    iput-object v0, p0, Lorg/a/a/u;->bBO:Lorg/a/a/d;
 
     :cond_0
-    iget v0, p0, Lorg/a/a/u;->bBS:I
+    iget v0, p0, Lorg/a/a/u;->bBN:I
 
     add-int/lit8 v0, v0, 0x1
 
-    iput v0, p0, Lorg/a/a/u;->bBS:I
+    iput v0, p0, Lorg/a/a/u;->bBN:I
 
-    iget-object v0, p0, Lorg/a/a/u;->bBT:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bBO:Lorg/a/a/d;
 
-    iget p2, p2, Lorg/a/a/r;->bBB:I
+    iget p2, p2, Lorg/a/a/r;->bBw:I
 
     invoke-virtual {v0, p2}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
 
-    iget-object p2, p0, Lorg/a/a/u;->bBT:Lorg/a/a/d;
+    iget-object p2, p0, Lorg/a/a/u;->bBO: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;->bAC:Lorg/a/a/c;
+    iget-object v0, p0, Lorg/a/a/u;->bAx:Lorg/a/a/c;
 
-    iput-object v0, p1, Lorg/a/a/c;->bzV:Lorg/a/a/c;
+    iput-object v0, p1, Lorg/a/a/c;->bzQ:Lorg/a/a/c;
 
-    iput-object p1, p0, Lorg/a/a/u;->bAC:Lorg/a/a/c;
+    iput-object p1, p0, Lorg/a/a/u;->bAx: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;->bCw:Z
+    iget-boolean v0, p0, Lorg/a/a/u;->bCr:Z
 
-    iget-object v1, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
+    iget-object v1, p0, Lorg/a/a/u;->bBK:Lorg/a/a/d;
 
     iget-object v1, v1, Lorg/a/a/d;->data:[B
 
-    iget-object v2, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
+    iget-object v2, p0, Lorg/a/a/u;->bBK: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;->bCw:Z
+    iput-boolean v0, p0, Lorg/a/a/u;->bCr:Z
 
-    iget-short v0, p1, Lorg/a/a/r;->bBy:S
+    iget-short v0, p1, Lorg/a/a/r;->bBt:S
 
     const/4 v1, 0x1
 
@@ -4136,7 +4136,7 @@
     return-void
 
     :cond_0
-    iget v0, p0, Lorg/a/a/u;->bAD:I
+    iget v0, p0, Lorg/a/a/u;->bAy:I
 
     const/4 v2, 0x4
 
@@ -4146,23 +4146,23 @@
 
     if-ne v0, v2, :cond_5
 
-    iget-object v0, p0, Lorg/a/a/u;->bCo:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bCj:Lorg/a/a/r;
 
     if-eqz v0, :cond_2
 
-    iget v0, p1, Lorg/a/a/r;->bBB:I
+    iget v0, p1, Lorg/a/a/r;->bBw:I
 
-    iget-object v1, p0, Lorg/a/a/u;->bCo:Lorg/a/a/r;
+    iget-object v1, p0, Lorg/a/a/u;->bCj:Lorg/a/a/r;
 
-    iget v1, v1, Lorg/a/a/r;->bBB:I
+    iget v1, v1, Lorg/a/a/r;->bBw:I
 
     if-ne v0, v1, :cond_1
 
-    iget-object v0, p0, Lorg/a/a/u;->bCo:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bCj:Lorg/a/a/r;
 
-    iget-short v1, v0, Lorg/a/a/r;->bBy:S
+    iget-short v1, v0, Lorg/a/a/r;->bBt:S
 
-    iget-short v2, p1, Lorg/a/a/r;->bBy:S
+    iget-short v2, p1, Lorg/a/a/r;->bBt:S
 
     and-int/2addr v2, v4
 
@@ -4170,13 +4170,13 @@
 
     int-to-short v1, v1
 
-    iput-short v1, v0, Lorg/a/a/r;->bBy:S
+    iput-short v1, v0, Lorg/a/a/r;->bBt:S
 
-    iget-object v0, p0, Lorg/a/a/u;->bCo:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bCj:Lorg/a/a/r;
 
-    iget-object v0, v0, Lorg/a/a/r;->bBH:Lorg/a/a/o;
+    iget-object v0, v0, Lorg/a/a/r;->bBC:Lorg/a/a/o;
 
-    iput-object v0, p1, Lorg/a/a/r;->bBH:Lorg/a/a/o;
+    iput-object v0, p1, Lorg/a/a/r;->bBC: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;->bCn:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bCi:Lorg/a/a/r;
 
     if-eqz v0, :cond_4
 
-    iget v0, p1, Lorg/a/a/r;->bBB:I
+    iget v0, p1, Lorg/a/a/r;->bBw:I
 
-    iget-object v1, p0, Lorg/a/a/u;->bCn:Lorg/a/a/r;
+    iget-object v1, p0, Lorg/a/a/u;->bCi:Lorg/a/a/r;
 
-    iget v1, v1, Lorg/a/a/r;->bBB:I
+    iget v1, v1, Lorg/a/a/r;->bBw:I
 
     if-ne v0, v1, :cond_3
 
-    iget-object v0, p0, Lorg/a/a/u;->bCn:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bCi:Lorg/a/a/r;
 
-    iget-short v1, v0, Lorg/a/a/r;->bBy:S
+    iget-short v1, v0, Lorg/a/a/r;->bBt:S
 
-    iget-short v2, p1, Lorg/a/a/r;->bBy:S
+    iget-short v2, p1, Lorg/a/a/r;->bBt:S
 
     and-int/2addr v2, v4
 
@@ -4208,35 +4208,35 @@
 
     int-to-short v1, v1
 
-    iput-short v1, v0, Lorg/a/a/r;->bBy:S
+    iput-short v1, v0, Lorg/a/a/r;->bBt:S
 
-    iget-object v0, p0, Lorg/a/a/u;->bCn:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bCi:Lorg/a/a/r;
 
-    iget-object v0, v0, Lorg/a/a/r;->bBH:Lorg/a/a/o;
+    iget-object v0, v0, Lorg/a/a/r;->bBC:Lorg/a/a/o;
 
-    iput-object v0, p1, Lorg/a/a/r;->bBH:Lorg/a/a/o;
+    iput-object v0, p1, Lorg/a/a/r;->bBC:Lorg/a/a/o;
 
-    iget-object p1, p0, Lorg/a/a/u;->bCn:Lorg/a/a/r;
+    iget-object p1, p0, Lorg/a/a/u;->bCi:Lorg/a/a/r;
 
-    iput-object p1, p0, Lorg/a/a/u;->bCo:Lorg/a/a/r;
+    iput-object p1, p0, Lorg/a/a/u;->bCj:Lorg/a/a/r;
 
     return-void
 
     :cond_3
-    iget-object v0, p0, Lorg/a/a/u;->bCn:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bCi:Lorg/a/a/r;
 
-    iput-object p1, v0, Lorg/a/a/r;->bBI:Lorg/a/a/r;
+    iput-object p1, v0, Lorg/a/a/r;->bBD:Lorg/a/a/r;
 
     :cond_4
-    iput-object p1, p0, Lorg/a/a/u;->bCn:Lorg/a/a/r;
+    iput-object p1, p0, Lorg/a/a/u;->bCi:Lorg/a/a/r;
 
-    iput-object p1, p0, Lorg/a/a/u;->bCo:Lorg/a/a/r;
+    iput-object p1, p0, Lorg/a/a/u;->bCj: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;->bBH:Lorg/a/a/o;
+    iput-object v0, p1, Lorg/a/a/r;->bBC:Lorg/a/a/o;
 
     return-void
 
@@ -4245,64 +4245,64 @@
 
     if-ne v0, v2, :cond_7
 
-    iget-object v0, p0, Lorg/a/a/u;->bCo:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bCj:Lorg/a/a/r;
 
     if-nez v0, :cond_6
 
-    iput-object p1, p0, Lorg/a/a/u;->bCo:Lorg/a/a/r;
+    iput-object p1, p0, Lorg/a/a/u;->bCj:Lorg/a/a/r;
 
     return-void
 
     :cond_6
-    iget-object v0, v0, Lorg/a/a/r;->bBH:Lorg/a/a/o;
+    iget-object v0, v0, Lorg/a/a/r;->bBC:Lorg/a/a/o;
 
-    iput-object p1, v0, Lorg/a/a/o;->bBf:Lorg/a/a/r;
+    iput-object p1, v0, Lorg/a/a/o;->bBa:Lorg/a/a/r;
 
     return-void
 
     :cond_7
     if-ne v0, v1, :cond_a
 
-    iget-object v0, p0, Lorg/a/a/u;->bCo:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bCj:Lorg/a/a/r;
 
     if-eqz v0, :cond_8
 
-    iget v1, p0, Lorg/a/a/u;->bCq:I
+    iget v1, p0, Lorg/a/a/u;->bCl:I
 
     int-to-short v1, v1
 
-    iput-short v1, v0, Lorg/a/a/r;->bBF:S
+    iput-short v1, v0, Lorg/a/a/r;->bBA:S
 
-    iget v0, p0, Lorg/a/a/u;->bCp:I
+    iget v0, p0, Lorg/a/a/u;->bCk: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;->bCo:Lorg/a/a/r;
+    iput-object p1, p0, Lorg/a/a/u;->bCj:Lorg/a/a/r;
 
-    iput v3, p0, Lorg/a/a/u;->bCp:I
+    iput v3, p0, Lorg/a/a/u;->bCk:I
 
-    iput v3, p0, Lorg/a/a/u;->bCq:I
+    iput v3, p0, Lorg/a/a/u;->bCl:I
 
-    iget-object v0, p0, Lorg/a/a/u;->bCn:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bCi:Lorg/a/a/r;
 
     if-eqz v0, :cond_9
 
-    iput-object p1, v0, Lorg/a/a/r;->bBI:Lorg/a/a/r;
+    iput-object p1, v0, Lorg/a/a/r;->bBD:Lorg/a/a/r;
 
     :cond_9
-    iput-object p1, p0, Lorg/a/a/u;->bCn:Lorg/a/a/r;
+    iput-object p1, p0, Lorg/a/a/u;->bCi:Lorg/a/a/r;
 
     return-void
 
     :cond_a
     if-ne v0, v4, :cond_b
 
-    iget-object v0, p0, Lorg/a/a/u;->bCo:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bCj:Lorg/a/a/r;
 
     if-nez v0, :cond_b
 
-    iput-object p1, p0, Lorg/a/a/u;->bCo:Lorg/a/a/r;
+    iput-object p1, p0, Lorg/a/a/u;->bCj: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;->bBP:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bBK:Lorg/a/a/d;
 
     iget v0, v0, Lorg/a/a/d;->length:I
 
-    iput v0, p0, Lorg/a/a/u;->bCx:I
+    iput v0, p0, Lorg/a/a/u;->bCs:I
 
-    iget-object v0, p0, Lorg/a/a/u;->bzO:Lorg/a/a/z;
+    iget-object v0, p0, Lorg/a/a/u;->bzJ: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;->bBo:I
+    iget v1, p1, Lorg/a/a/y;->bBj:I
 
     const/4 v2, 0x1
 
@@ -4335,13 +4335,13 @@
 
     if-eq v1, v4, :cond_1
 
-    iget v1, p1, Lorg/a/a/y;->bBo:I
+    iget v1, p1, Lorg/a/a/y;->bBj:I
 
     const/4 v4, 0x6
 
     if-eq v1, v4, :cond_1
 
-    iget v1, p1, Lorg/a/a/y;->bBo:I
+    iget v1, p1, Lorg/a/a/y;->bBj:I
 
     const/16 v4, 0x11
 
@@ -4377,7 +4377,7 @@
 
     if-eqz v1, :cond_2
 
-    iget-object v5, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
+    iget-object v5, p0, Lorg/a/a/u;->bBK: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;->bBP:Lorg/a/a/d;
+    iget-object v5, p0, Lorg/a/a/u;->bBK: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;->bBP:Lorg/a/a/d;
+    iget-object v5, p0, Lorg/a/a/u;->bBK: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;->bCo:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bCj:Lorg/a/a/r;
 
     if-eqz v0, :cond_8
 
-    iget v0, p0, Lorg/a/a/u;->bAD:I
+    iget v0, p0, Lorg/a/a/u;->bAy:I
 
     const/4 v5, 0x4
 
@@ -4421,7 +4421,7 @@
     goto :goto_3
 
     :cond_4
-    iget p1, p0, Lorg/a/a/u;->bCp:I
+    iget p1, p0, Lorg/a/a/u;->bCk:I
 
     if-eqz v1, :cond_5
 
@@ -4430,24 +4430,24 @@
     :cond_5
     add-int/2addr p1, v2
 
-    iget v0, p0, Lorg/a/a/u;->bCq:I
+    iget v0, p0, Lorg/a/a/u;->bCl:I
 
     if-le p1, v0, :cond_6
 
-    iput p1, p0, Lorg/a/a/u;->bCq:I
+    iput p1, p0, Lorg/a/a/u;->bCl:I
 
     :cond_6
-    iput p1, p0, Lorg/a/a/u;->bCp:I
+    iput p1, p0, Lorg/a/a/u;->bCk:I
 
     goto :goto_4
 
     :cond_7
     :goto_3
-    iget-object v0, p0, Lorg/a/a/u;->bCo:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bCj:Lorg/a/a/r;
 
-    iget-object v0, v0, Lorg/a/a/r;->bBH:Lorg/a/a/o;
+    iget-object v0, v0, Lorg/a/a/r;->bBC:Lorg/a/a/o;
 
-    iget-object v1, p0, Lorg/a/a/u;->bzO:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/u;->bzJ: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;->bzO:Lorg/a/a/z;
+    iget-object p1, p0, Lorg/a/a/u;->bzJ: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;->bzO:Lorg/a/a/z;
+    iget-object p2, p0, Lorg/a/a/u;->bzJ:Lorg/a/a/z;
 
-    iget-object p3, p0, Lorg/a/a/u;->bCa:Lorg/a/a/b;
+    iget-object p3, p0, Lorg/a/a/u;->bBV: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;->bCa:Lorg/a/a/b;
+    iput-object p1, p0, Lorg/a/a/u;->bBV:Lorg/a/a/b;
 
     return-object p1
 
     :cond_0
     new-instance p1, Lorg/a/a/b;
 
-    iget-object p2, p0, Lorg/a/a/u;->bzO:Lorg/a/a/z;
+    iget-object p2, p0, Lorg/a/a/u;->bzJ:Lorg/a/a/z;
 
-    iget-object p3, p0, Lorg/a/a/u;->bCb:Lorg/a/a/b;
+    iget-object p3, p0, Lorg/a/a/u;->bBW: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;->bCb:Lorg/a/a/b;
+    iput-object p1, p0, Lorg/a/a/u;->bBW: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;->bBP:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bBK:Lorg/a/a/d;
 
     iget v0, v0, Lorg/a/a/d;->length:I
 
-    iput v0, p0, Lorg/a/a/u;->bCx:I
+    iput v0, p0, Lorg/a/a/u;->bCs:I
 
-    iget-object v0, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bBK: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;->bCo:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bCj:Lorg/a/a/r;
 
     if-eqz v0, :cond_5
 
-    iget v0, p0, Lorg/a/a/u;->bAD:I
+    iget v0, p0, Lorg/a/a/u;->bAy:I
 
     const/4 v1, 0x4
 
@@ -4539,30 +4539,30 @@
     goto :goto_0
 
     :cond_0
-    iget v0, p0, Lorg/a/a/u;->bCp:I
+    iget v0, p0, Lorg/a/a/u;->bCk:I
 
-    sget-object v1, Lorg/a/a/u;->bBM:[I
+    sget-object v1, Lorg/a/a/u;->bBH:[I
 
     aget v1, v1, p1
 
     add-int/2addr v0, v1
 
-    iget v1, p0, Lorg/a/a/u;->bCq:I
+    iget v1, p0, Lorg/a/a/u;->bCl:I
 
     if-le v0, v1, :cond_1
 
-    iput v0, p0, Lorg/a/a/u;->bCq:I
+    iput v0, p0, Lorg/a/a/u;->bCl:I
 
     :cond_1
-    iput v0, p0, Lorg/a/a/u;->bCp:I
+    iput v0, p0, Lorg/a/a/u;->bCk:I
 
     goto :goto_1
 
     :cond_2
     :goto_0
-    iget-object v0, p0, Lorg/a/a/u;->bCo:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bCj:Lorg/a/a/r;
 
-    iget-object v0, v0, Lorg/a/a/r;->bBH:Lorg/a/a/o;
+    iget-object v0, v0, Lorg/a/a/r;->bBC: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;->HU()V
+    invoke-direct {p0}, Lorg/a/a/u;->HS()V
 
     :cond_5
     return-void
@@ -4596,12 +4596,12 @@
 
     if-eqz p2, :cond_0
 
-    iput p1, p0, Lorg/a/a/u;->bCf:I
+    iput p1, p0, Lorg/a/a/u;->bCa:I
 
     return-void
 
     :cond_0
-    iput p1, p0, Lorg/a/a/u;->bCh:I
+    iput p1, p0, Lorg/a/a/u;->bCc: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;->bBP:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bBK:Lorg/a/a/d;
 
     iget v0, v0, Lorg/a/a/d;->length:I
 
-    iput v0, p0, Lorg/a/a/u;->bCx:I
+    iput v0, p0, Lorg/a/a/u;->bCs:I
 
-    iget-object v0, p0, Lorg/a/a/u;->bzO:Lorg/a/a/z;
+    iget-object v0, p0, Lorg/a/a/u;->bzJ:Lorg/a/a/z;
 
     const/4 v1, 0x7
 
@@ -4623,17 +4623,17 @@
 
     move-result-object p2
 
-    iget-object v0, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bBK: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;->bCo:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bCj:Lorg/a/a/r;
 
     if-eqz v0, :cond_3
 
-    iget v0, p0, Lorg/a/a/u;->bAD:I
+    iget v0, p0, Lorg/a/a/u;->bAy:I
 
     const/4 v1, 0x4
 
@@ -4650,30 +4650,30 @@
 
     if-ne p1, p2, :cond_3
 
-    iget p1, p0, Lorg/a/a/u;->bCp:I
+    iget p1, p0, Lorg/a/a/u;->bCk:I
 
     add-int/lit8 p1, p1, 0x1
 
-    iget p2, p0, Lorg/a/a/u;->bCq:I
+    iget p2, p0, Lorg/a/a/u;->bCl:I
 
     if-le p1, p2, :cond_1
 
-    iput p1, p0, Lorg/a/a/u;->bCq:I
+    iput p1, p0, Lorg/a/a/u;->bCl:I
 
     :cond_1
-    iput p1, p0, Lorg/a/a/u;->bCp:I
+    iput p1, p0, Lorg/a/a/u;->bCk:I
 
     goto :goto_1
 
     :cond_2
     :goto_0
-    iget-object v0, p0, Lorg/a/a/u;->bCo:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bCj:Lorg/a/a/r;
 
-    iget-object v0, v0, Lorg/a/a/r;->bBH:Lorg/a/a/o;
+    iget-object v0, v0, Lorg/a/a/r;->bBC:Lorg/a/a/o;
 
-    iget v1, p0, Lorg/a/a/u;->bCx:I
+    iget v1, p0, Lorg/a/a/u;->bCs:I
 
-    iget-object v2, p0, Lorg/a/a/u;->bzO:Lorg/a/a/z;
+    iget-object v2, p0, Lorg/a/a/u;->bzJ: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;->bzO:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/u;->bzJ: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;->bzO:Lorg/a/a/z;
+    iget-object p2, p0, Lorg/a/a/u;->bzJ:Lorg/a/a/z;
 
-    iget-object v1, p0, Lorg/a/a/u;->bAu:Lorg/a/a/b;
+    iget-object v1, p0, Lorg/a/a/u;->bAp: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;->bAu:Lorg/a/a/b;
+    iput-object p1, p0, Lorg/a/a/u;->bAp:Lorg/a/a/b;
 
     return-object p1
 
     :cond_0
     new-instance p1, Lorg/a/a/b;
 
-    iget-object p2, p0, Lorg/a/a/u;->bzO:Lorg/a/a/z;
+    iget-object p2, p0, Lorg/a/a/u;->bzJ:Lorg/a/a/z;
 
-    iget-object v1, p0, Lorg/a/a/u;->bAv:Lorg/a/a/b;
+    iget-object v1, p0, Lorg/a/a/u;->bAq: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;->bAv:Lorg/a/a/b;
+    iput-object p1, p0, Lorg/a/a/u;->bAq: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;->bCu:[I
+    iget-object v1, p0, Lorg/a/a/u;->bCp:[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;->bCu:[I
+    iput-object v0, p0, Lorg/a/a/u;->bCp:[I
 
     :cond_1
-    iget-object v0, p0, Lorg/a/a/u;->bCu:[I
+    iget-object v0, p0, Lorg/a/a/u;->bCp:[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;->bCl:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bCg: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;->bCl:Lorg/a/a/d;
+    iput-object v0, p0, Lorg/a/a/u;->bCg:Lorg/a/a/d;
 
     :cond_0
-    iget v0, p0, Lorg/a/a/u;->bCk:I
+    iget v0, p0, Lorg/a/a/u;->bCf:I
 
     add-int/lit8 v0, v0, 0x1
 
-    iput v0, p0, Lorg/a/a/u;->bCk:I
+    iput v0, p0, Lorg/a/a/u;->bCf:I
 
-    iget-object v0, p0, Lorg/a/a/u;->bCl:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bCg: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;->bzO:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/u;->bzJ: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;->bBP:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bBK:Lorg/a/a/d;
 
     iget v0, v0, Lorg/a/a/d;->length:I
 
-    iput v0, p0, Lorg/a/a/u;->bCx:I
+    iput v0, p0, Lorg/a/a/u;->bCs:I
 
-    iget-object v0, p0, Lorg/a/a/u;->bzO:Lorg/a/a/z;
+    iget-object v0, p0, Lorg/a/a/u;->bzJ:Lorg/a/a/z;
 
     const/4 v1, 0x7
 
@@ -4833,7 +4833,7 @@
 
     move-result-object p1
 
-    iget-object v0, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bBK: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;->bCo:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bCj:Lorg/a/a/r;
 
     if-eqz v0, :cond_2
 
-    iget v0, p0, Lorg/a/a/u;->bAD:I
+    iget v0, p0, Lorg/a/a/u;->bAy:I
 
     const/4 v1, 0x4
 
@@ -4862,23 +4862,23 @@
     goto :goto_0
 
     :cond_0
-    iget p1, p0, Lorg/a/a/u;->bCp:I
+    iget p1, p0, Lorg/a/a/u;->bCk:I
 
     rsub-int/lit8 p2, p2, 0x1
 
     add-int/2addr p1, p2
 
-    iput p1, p0, Lorg/a/a/u;->bCp:I
+    iput p1, p0, Lorg/a/a/u;->bCk:I
 
     goto :goto_1
 
     :cond_1
     :goto_0
-    iget-object v0, p0, Lorg/a/a/u;->bCo:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bCj:Lorg/a/a/r;
 
-    iget-object v0, v0, Lorg/a/a/r;->bBH:Lorg/a/a/o;
+    iget-object v0, v0, Lorg/a/a/r;->bBC:Lorg/a/a/o;
 
-    iget-object v1, p0, Lorg/a/a/u;->bzO:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/u;->bzJ: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 a4beafa587..66c0fa22fb 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 bCA:Lorg/a/a/v;
+.field protected bCv:Lorg/a/a/v;
 
-.field protected final bzM:I
+.field protected final bzH:I
 
 
 # direct methods
@@ -27,11 +27,11 @@
 
     const/high16 p1, 0x70000
 
-    iput p1, p0, Lorg/a/a/v;->bzM:I
+    iput p1, p0, Lorg/a/a/v;->bzH:I
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lorg/a/a/v;->bCA:Lorg/a/a/v;
+    iput-object p1, p0, Lorg/a/a/v;->bCv: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;->bCA:Lorg/a/a/v;
+    iget-object v0, p0, Lorg/a/a/v;->bCv: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;->bCA:Lorg/a/a/v;
+    iget-object v0, p0, Lorg/a/a/v;->bCv: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;->bCA:Lorg/a/a/v;
+    iget-object v0, p0, Lorg/a/a/v;->bCv: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;->bCA:Lorg/a/a/v;
+    iget-object v0, p0, Lorg/a/a/v;->bCv: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;->bCA:Lorg/a/a/v;
+    iget-object v0, p0, Lorg/a/a/v;->bCv: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;->bCA:Lorg/a/a/v;
+    iget-object v0, p0, Lorg/a/a/v;->bCv: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;->bCA:Lorg/a/a/v;
+    iget-object v0, p0, Lorg/a/a/v;->bCv: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 a0e2ad1fea..cbb380d7bc 100644
--- a/com.discord/smali_classes2/org/a/a/w.smali
+++ b/com.discord/smali_classes2/org/a/a/w.smali
@@ -4,39 +4,39 @@
 
 
 # instance fields
-.field final bCB:I
+.field final bCA:Lorg/a/a/d;
 
-.field final bCC:I
+.field bCB:I
 
-.field final bCD:I
+.field final bCC:Lorg/a/a/d;
 
-.field bCE:I
+.field bCD:I
 
-.field final bCF:Lorg/a/a/d;
+.field final bCE:Lorg/a/a/d;
 
-.field bCG:I
+.field bCF:I
 
-.field final bCH:Lorg/a/a/d;
+.field final bCG:Lorg/a/a/d;
 
-.field bCI:I
+.field bCH:I
 
-.field final bCJ:Lorg/a/a/d;
+.field final bCI:Lorg/a/a/d;
 
-.field bCK:I
+.field bCJ:I
 
-.field final bCL:Lorg/a/a/d;
+.field final bCK:Lorg/a/a/d;
 
-.field bCM:I
+.field bCL:I
 
-.field final bCN:Lorg/a/a/d;
+.field final bCw:I
 
-.field bCO:I
+.field final bCx:I
 
-.field final bCP:Lorg/a/a/d;
+.field final bCy:I
 
-.field bCQ:I
+.field bCz:I
 
-.field final bzO:Lorg/a/a/z;
+.field final bzJ:Lorg/a/a/z;
 
 
 # direct methods
@@ -45,49 +45,49 @@
 
     invoke-direct {p0}, Lorg/a/a/v;-><init>()V
 
-    iput-object p1, p0, Lorg/a/a/w;->bzO:Lorg/a/a/z;
+    iput-object p1, p0, Lorg/a/a/w;->bzJ:Lorg/a/a/z;
 
-    iput p2, p0, Lorg/a/a/w;->bCB:I
+    iput p2, p0, Lorg/a/a/w;->bCw:I
 
-    iput p3, p0, Lorg/a/a/w;->bCC:I
+    iput p3, p0, Lorg/a/a/w;->bCx:I
 
-    iput p4, p0, Lorg/a/a/w;->bCD:I
+    iput p4, p0, Lorg/a/a/w;->bCy: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;->bCF:Lorg/a/a/d;
+    iput-object p1, p0, Lorg/a/a/w;->bCA: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;
+    iput-object p1, p0, Lorg/a/a/w;->bCC: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;
+    iput-object p1, p0, Lorg/a/a/w;->bCE: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;
+    iput-object p1, p0, Lorg/a/a/w;->bCG: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;
+    iput-object p1, p0, Lorg/a/a/w;->bCI: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;
+    iput-object p1, p0, Lorg/a/a/w;->bCK: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;->bCH:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/w;->bCC:Lorg/a/a/d;
 
-    iget-object v1, p0, Lorg/a/a/w;->bzO:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/w;->bzJ: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;->bCH:Lorg/a/a/d;
+    iget-object p2, p0, Lorg/a/a/w;->bCC: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;->bCH:Lorg/a/a/d;
+    iget-object p2, p0, Lorg/a/a/w;->bCC: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;->bCH:Lorg/a/a/d;
+    iget-object v1, p0, Lorg/a/a/w;->bCC:Lorg/a/a/d;
 
-    iget-object v2, p0, Lorg/a/a/w;->bzO:Lorg/a/a/z;
+    iget-object v2, p0, Lorg/a/a/w;->bzJ:Lorg/a/a/z;
 
     const/16 v3, 0x13
 
@@ -159,11 +159,11 @@
 
     :cond_1
     :goto_1
-    iget p1, p0, Lorg/a/a/w;->bCG:I
+    iget p1, p0, Lorg/a/a/w;->bCB:I
 
     add-int/lit8 p1, p1, 0x1
 
-    iput p1, p0, Lorg/a/a/w;->bCG:I
+    iput p1, p0, Lorg/a/a/w;->bCB: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;->bCJ:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/w;->bCE:Lorg/a/a/d;
 
-    iget-object v1, p0, Lorg/a/a/w;->bzO:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/w;->bzJ: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;->bCJ:Lorg/a/a/d;
+    iget-object p2, p0, Lorg/a/a/w;->bCE: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;->bCJ:Lorg/a/a/d;
+    iget-object p2, p0, Lorg/a/a/w;->bCE: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;->bCJ:Lorg/a/a/d;
+    iget-object v1, p0, Lorg/a/a/w;->bCE:Lorg/a/a/d;
 
-    iget-object v2, p0, Lorg/a/a/w;->bzO:Lorg/a/a/z;
+    iget-object v2, p0, Lorg/a/a/w;->bzJ:Lorg/a/a/z;
 
     const/16 v3, 0x13
 
@@ -233,11 +233,11 @@
 
     :cond_1
     :goto_1
-    iget p1, p0, Lorg/a/a/w;->bCI:I
+    iget p1, p0, Lorg/a/a/w;->bCD:I
 
     add-int/lit8 p1, p1, 0x1
 
-    iput p1, p0, Lorg/a/a/w;->bCI:I
+    iput p1, p0, Lorg/a/a/w;->bCD: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;->bCN:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/w;->bCI:Lorg/a/a/d;
 
-    iget-object v1, p0, Lorg/a/a/w;->bzO:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/w;->bzJ: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;->bCN:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/w;->bCI: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;->bCN:Lorg/a/a/d;
+    iget-object v3, p0, Lorg/a/a/w;->bCI:Lorg/a/a/d;
 
-    iget-object v4, p0, Lorg/a/a/w;->bzO:Lorg/a/a/z;
+    iget-object v4, p0, Lorg/a/a/w;->bzJ: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;->bCM:I
+    iget p1, p0, Lorg/a/a/w;->bCH:I
 
     add-int/lit8 p1, p1, 0x1
 
-    iput p1, p0, Lorg/a/a/w;->bCM:I
+    iput p1, p0, Lorg/a/a/w;->bCH: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;->bCF:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/w;->bCA:Lorg/a/a/d;
 
-    iget-object v1, p0, Lorg/a/a/w;->bzO:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/w;->bzJ: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;->bzO:Lorg/a/a/z;
+    iget-object p2, p0, Lorg/a/a/w;->bzJ: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;->bCE:I
+    iget p1, p0, Lorg/a/a/w;->bCz:I
 
     add-int/lit8 p1, p1, 0x1
 
-    iput p1, p0, Lorg/a/a/w;->bCE:I
+    iput p1, p0, Lorg/a/a/w;->bCz: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;->bzO:Lorg/a/a/z;
+    iget-object v0, p0, Lorg/a/a/w;->bzJ: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;->bCQ:I
+    iput p1, p0, Lorg/a/a/w;->bCL: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;->bCP:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/w;->bCK:Lorg/a/a/d;
 
-    iget-object v1, p0, Lorg/a/a/w;->bzO:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/w;->bzJ: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;->bCO:I
+    iget p1, p0, Lorg/a/a/w;->bCJ:I
 
     add-int/lit8 p1, p1, 0x1
 
-    iput p1, p0, Lorg/a/a/w;->bCO:I
+    iput p1, p0, Lorg/a/a/w;->bCJ: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;->bCL:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/w;->bCG:Lorg/a/a/d;
 
-    iget-object v1, p0, Lorg/a/a/w;->bzO:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/w;->bzJ: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;->bCK:I
+    iget p1, p0, Lorg/a/a/w;->bCF:I
 
     add-int/lit8 p1, p1, 0x1
 
-    iput p1, p0, Lorg/a/a/w;->bCK:I
+    iput p1, p0, Lorg/a/a/w;->bCF: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 c2cc86e71d..0dd4bda1f1 100644
--- a/com.discord/smali_classes2/org/a/a/x.smali
+++ b/com.discord/smali_classes2/org/a/a/x.smali
@@ -4,20 +4,20 @@
 
 
 # static fields
+.field public static final bCM:Ljava/lang/Integer;
+
+.field public static final bCN:Ljava/lang/Integer;
+
+.field public static final bCO:Ljava/lang/Integer;
+
+.field public static final bCP:Ljava/lang/Integer;
+
+.field public static final bCQ:Ljava/lang/Integer;
+
 .field public static final bCR:Ljava/lang/Integer;
 
 .field public static final bCS:Ljava/lang/Integer;
 
-.field public static final bCT:Ljava/lang/Integer;
-
-.field public static final bCU:Ljava/lang/Integer;
-
-.field public static final bCV:Ljava/lang/Integer;
-
-.field public static final bCW:Ljava/lang/Integer;
-
-.field public static final bCX:Ljava/lang/Integer;
-
 
 # direct methods
 .method static constructor <clinit>()V
@@ -29,7 +29,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lorg/a/a/x;->bCR:Ljava/lang/Integer;
+    sput-object v0, Lorg/a/a/x;->bCM:Ljava/lang/Integer;
 
     const/4 v0, 0x1
 
@@ -37,7 +37,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lorg/a/a/x;->bCS:Ljava/lang/Integer;
+    sput-object v0, Lorg/a/a/x;->bCN:Ljava/lang/Integer;
 
     const/4 v0, 0x2
 
@@ -45,7 +45,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lorg/a/a/x;->bCT:Ljava/lang/Integer;
+    sput-object v0, Lorg/a/a/x;->bCO:Ljava/lang/Integer;
 
     const/4 v0, 0x3
 
@@ -53,7 +53,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lorg/a/a/x;->bCU:Ljava/lang/Integer;
+    sput-object v0, Lorg/a/a/x;->bCP:Ljava/lang/Integer;
 
     const/4 v0, 0x4
 
@@ -61,7 +61,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lorg/a/a/x;->bCV:Ljava/lang/Integer;
+    sput-object v0, Lorg/a/a/x;->bCQ:Ljava/lang/Integer;
 
     const/4 v0, 0x5
 
@@ -69,7 +69,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lorg/a/a/x;->bCW:Ljava/lang/Integer;
+    sput-object v0, Lorg/a/a/x;->bCR:Ljava/lang/Integer;
 
     const/4 v0, 0x6
 
@@ -77,7 +77,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lorg/a/a/x;->bCX:Ljava/lang/Integer;
+    sput-object v0, Lorg/a/a/x;->bCS: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 546b7c3d7e..2cd02ba2dd 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 bBo:I
+.field final bBj:I
 
-.field final bBp:Ljava/lang/String;
+.field final bBk:Ljava/lang/String;
 
-.field final bCY:J
+.field final bCT: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;->bBo:I
+    iput p2, p0, Lorg/a/a/y;->bBj:I
 
-    iput-object p3, p0, Lorg/a/a/y;->bBp:Ljava/lang/String;
+    iput-object p3, p0, Lorg/a/a/y;->bBk: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;->bCY:J
+    iput-wide p6, p0, Lorg/a/a/y;->bCT:J
 
     return-void
 .end method
 
 
 # virtual methods
-.method final HX()I
+.method final HV()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 1bfa6847e7..9d6419105d 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 bDj:Lorg/a/a/z$a;
+.field bDe: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 baa5a316b1..097301c83c 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 bCZ:Lorg/a/a/h;
+.field final bCU:Lorg/a/a/h;
 
-.field final bDa:Lorg/a/a/e;
+.field final bCV:Lorg/a/a/e;
 
-.field bDb:I
+.field bCW:I
+
+.field private bCX:I
+
+.field private bCY:[Lorg/a/a/z$a;
+
+.field bCZ:Lorg/a/a/d;
+
+.field bDa:I
+
+.field bDb:Lorg/a/a/d;
 
 .field private bDc:I
 
-.field private bDd:[Lorg/a/a/z$a;
-
-.field bDe:Lorg/a/a/d;
-
-.field bDf:I
-
-.field bDg:Lorg/a/a/d;
-
-.field private bDh:I
-
-.field bDi:[Lorg/a/a/z$a;
+.field bDd:[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;->bCZ:Lorg/a/a/h;
+    iput-object p1, p0, Lorg/a/a/z;->bCU:Lorg/a/a/h;
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lorg/a/a/z;->bDa:Lorg/a/a/e;
+    iput-object p1, p0, Lorg/a/a/z;->bCV: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;->bDd:[Lorg/a/a/z$a;
+    iput-object p1, p0, Lorg/a/a/z;->bCY:[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;->bDe:Lorg/a/a/d;
+    iput-object p1, p0, Lorg/a/a/z;->bCZ: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;->bDc:I
+    iget v0, p0, Lorg/a/a/z;->bCX:I
 
-    iget-object v1, p0, Lorg/a/a/z;->bDd:[Lorg/a/a/z$a;
+    iget-object v1, p0, Lorg/a/a/z;->bCY:[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;->bDd:[Lorg/a/a/z$a;
+    iget-object v3, p0, Lorg/a/a/z;->bCY:[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;->bDj:Lorg/a/a/z$a;
+    iget-object v5, v3, Lorg/a/a/z$a;->bDe:Lorg/a/a/z$a;
 
     aget-object v6, v2, v4
 
-    iput-object v6, v3, Lorg/a/a/z$a;->bDj:Lorg/a/a/z$a;
+    iput-object v6, v3, Lorg/a/a/z$a;->bDe: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;->bDd:[Lorg/a/a/z$a;
+    iput-object v2, p0, Lorg/a/a/z;->bCY:[Lorg/a/a/z$a;
 
     :cond_2
-    iget v0, p0, Lorg/a/a/z;->bDc:I
+    iget v0, p0, Lorg/a/a/z;->bCX:I
 
     add-int/lit8 v0, v0, 0x1
 
-    iput v0, p0, Lorg/a/a/z;->bDc:I
+    iput v0, p0, Lorg/a/a/z;->bCX:I
 
     iget v0, p1, Lorg/a/a/z$a;->aW:I
 
-    iget-object v1, p0, Lorg/a/a/z;->bDd:[Lorg/a/a/z$a;
+    iget-object v1, p0, Lorg/a/a/z;->bCY:[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;->bDj:Lorg/a/a/z$a;
+    iput-object v2, p1, Lorg/a/a/z$a;->bDe: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;->bDi:[Lorg/a/a/z$a;
+    iget-object v0, p0, Lorg/a/a/z;->bDd:[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;->bDi:[Lorg/a/a/z$a;
+    iput-object v0, p0, Lorg/a/a/z;->bDd:[Lorg/a/a/z$a;
 
     :cond_0
-    iget v0, p0, Lorg/a/a/z;->bDh:I
+    iget v0, p0, Lorg/a/a/z;->bDc:I
 
-    iget-object v1, p0, Lorg/a/a/z;->bDi:[Lorg/a/a/z$a;
+    iget-object v1, p0, Lorg/a/a/z;->bDd:[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;->bDi:[Lorg/a/a/z$a;
+    iput-object v0, p0, Lorg/a/a/z;->bDd:[Lorg/a/a/z$a;
 
     :cond_1
-    iget-object v0, p0, Lorg/a/a/z;->bDi:[Lorg/a/a/z$a;
+    iget-object v0, p0, Lorg/a/a/z;->bDd:[Lorg/a/a/z$a;
 
-    iget v1, p0, Lorg/a/a/z;->bDh:I
+    iget v1, p0, Lorg/a/a/z;->bDc:I
 
     add-int/lit8 v2, v1, 0x1
 
-    iput v2, p0, Lorg/a/a/z;->bDh:I
+    iput v2, p0, Lorg/a/a/z;->bDc: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;->bBo:I
+    iget v1, v0, Lorg/a/a/z$a;->bBj:I
 
     const/16 v2, 0xf
 
@@ -283,7 +283,7 @@
 
     if-ne v1, v8, :cond_0
 
-    iget-wide v1, v0, Lorg/a/a/z$a;->bCY:J
+    iget-wide v1, v0, Lorg/a/a/z$a;->bCT:J
 
     int-to-long v3, p1
 
@@ -291,7 +291,7 @@
 
     if-nez v5, :cond_0
 
-    iget-object v1, v0, Lorg/a/a/z$a;->bBp:Ljava/lang/String;
+    iget-object v1, v0, Lorg/a/a/z$a;->bBk: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;->bDj:Lorg/a/a/z$a;
+    iget-object v0, v0, Lorg/a/a/z$a;->bDe: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;->bDe:Lorg/a/a/d;
+    iget-object p5, p0, Lorg/a/a/z;->bCZ: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;->bDe:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/z;->bCZ: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;->bBo:I
+    iget v1, v0, Lorg/a/a/z$a;->bBj: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;->bBp:Ljava/lang/String;
+    iget-object v1, v0, Lorg/a/a/z$a;->bBk: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;->bDj:Lorg/a/a/z$a;
+    iget-object v0, v0, Lorg/a/a/z$a;->bDe:Lorg/a/a/z$a;
 
     goto :goto_0
 
     :cond_1
-    iget-object v0, p0, Lorg/a/a/z;->bDe:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/z;->bCZ: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;->bDd:[Lorg/a/a/z$a;
+    iget-object v0, p0, Lorg/a/a/z;->bCY:[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;->bDg:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/z;->bDb: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;->bBo:I
+    iget v2, v1, Lorg/a/a/z$a;->bBj:I
 
     const/16 v3, 0x40
 
@@ -627,7 +627,7 @@
 
     if-ne v2, p3, :cond_2
 
-    iget-wide v2, v1, Lorg/a/a/z$a;->bCY:J
+    iget-wide v2, v1, Lorg/a/a/z$a;->bCT: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;->bDg:Lorg/a/a/d;
+    iget-object p2, p0, Lorg/a/a/z;->bDb: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;->bDj:Lorg/a/a/z$a;
+    iget-object v1, v1, Lorg/a/a/z$a;->bDe: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;->bDf:I
+    iget v3, p0, Lorg/a/a/z;->bDa:I
 
     add-int/lit8 v0, v3, 0x1
 
-    iput v0, p0, Lorg/a/a/z;->bDf:I
+    iput v0, p0, Lorg/a/a/z;->bDa:I
 
     const/16 v4, 0x40
 
@@ -734,10 +734,10 @@
     return-object p1
 .end method
 
-.method final HY()I
+.method final HW()I
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/z;->bDg:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/z;->bDb: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;->bDg:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/z;->bDb: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;->bDg:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/z;->bDb: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;->bDg:Lorg/a/a/d;
+    iput-object v0, p0, Lorg/a/a/z;->bDb: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;->bBo:I
+    iget v4, p1, Lorg/a/a/p;->bBj:I
 
-    iget-object v5, p1, Lorg/a/a/p;->bBp:Ljava/lang/String;
+    iget-object v5, p1, Lorg/a/a/p;->bBk: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;->bBq:Z
+    iget-boolean v8, p1, Lorg/a/a/p;->bBl:Z
 
     move-object v3, p0
 
@@ -892,7 +892,7 @@
     :goto_0
     if-eqz v0, :cond_1
 
-    iget v1, v0, Lorg/a/a/z$a;->bBo:I
+    iget v1, v0, Lorg/a/a/z$a;->bBj: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;->bCY:J
+    iget-wide v1, v0, Lorg/a/a/z$a;->bCT:J
 
     int-to-long v3, p2
 
@@ -911,12 +911,12 @@
     return-object v0
 
     :cond_0
-    iget-object v0, v0, Lorg/a/a/z$a;->bDj:Lorg/a/a/z$a;
+    iget-object v0, v0, Lorg/a/a/z$a;->bDe:Lorg/a/a/z$a;
 
     goto :goto_0
 
     :cond_1
-    iget-object v0, p0, Lorg/a/a/z;->bDe:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/z;->bCZ: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;->bBo:I
+    iget v2, v0, Lorg/a/a/z$a;->bBj: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;->bCY:J
+    iget-wide v2, v0, Lorg/a/a/z$a;->bCT:J
 
     cmp-long v4, v2, v7
 
@@ -996,24 +996,24 @@
     return p1
 
     :cond_0
-    iget-object v0, v0, Lorg/a/a/z$a;->bDj:Lorg/a/a/z$a;
+    iget-object v0, v0, Lorg/a/a/z$a;->bDe:Lorg/a/a/z$a;
 
     goto :goto_0
 
     :cond_1
-    iget-object v0, p0, Lorg/a/a/z;->bDi:[Lorg/a/a/z$a;
+    iget-object v0, p0, Lorg/a/a/z;->bDd:[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;->bDi:[Lorg/a/a/z$a;
+    iget-object v0, p0, Lorg/a/a/z;->bDd:[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;->bCZ:Lorg/a/a/h;
+    iget-object v0, p0, Lorg/a/a/z;->bCU: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;->bDh:I
+    iget v5, p0, Lorg/a/a/z;->bDc:I
 
     const/16 v6, 0x82
 
@@ -1058,7 +1058,7 @@
 
     if-eqz v1, :cond_1
 
-    iget v3, v1, Lorg/a/a/z$a;->bBo:I
+    iget v3, v1, Lorg/a/a/z$a;->bBj:I
 
     if-ne v3, v2, :cond_0
 
@@ -1087,12 +1087,12 @@
     return p1
 
     :cond_0
-    iget-object v1, v1, Lorg/a/a/z$a;->bDj:Lorg/a/a/z$a;
+    iget-object v1, v1, Lorg/a/a/z$a;->bDe:Lorg/a/a/z$a;
 
     goto :goto_0
 
     :cond_1
-    iget-object v1, p0, Lorg/a/a/z;->bDe:Lorg/a/a/d;
+    iget-object v1, p0, Lorg/a/a/z;->bCZ: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;->Id()I
+    invoke-virtual {p1}, Lorg/a/a/aa;->Ib()I
 
     move-result v0
 
@@ -1297,7 +1297,7 @@
 
     if-ne v0, v1, :cond_9
 
-    invoke-virtual {p1}, Lorg/a/a/aa;->Ib()Ljava/lang/String;
+    invoke-virtual {p1}, Lorg/a/a/aa;->HZ()Ljava/lang/String;
 
     move-result-object p1
 
@@ -1312,7 +1312,7 @@
 
     if-ne v0, v1, :cond_a
 
-    invoke-virtual {p1}, Lorg/a/a/aa;->Ic()Ljava/lang/String;
+    invoke-virtual {p1}, Lorg/a/a/aa;->Ia()Ljava/lang/String;
 
     move-result-object p1
 
@@ -1325,7 +1325,7 @@
     return-object p1
 
     :cond_a
-    invoke-virtual {p1}, Lorg/a/a/aa;->Ic()Ljava/lang/String;
+    invoke-virtual {p1}, Lorg/a/a/aa;->Ia()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;->bBo:I
+    iget v1, p1, Lorg/a/a/p;->bBj:I
 
-    iget-object v2, p1, Lorg/a/a/p;->bBp:Ljava/lang/String;
+    iget-object v2, p1, Lorg/a/a/p;->bBk: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;->bBq:Z
+    iget-boolean v5, p1, Lorg/a/a/p;->bBl: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;->bAE:Lorg/a/a/p;
+    iget-object v2, p1, Lorg/a/a/i;->bAz:Lorg/a/a/p;
 
-    iget-object p1, p1, Lorg/a/a/i;->bAF:[Ljava/lang/Object;
+    iget-object p1, p1, Lorg/a/a/i;->bAA:[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;->bBo:I
+    iget v1, v0, Lorg/a/a/z$a;->bBj: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;->bCY:J
+    iget-wide v1, v0, Lorg/a/a/z$a;->bCT:J
 
     int-to-long v3, p4
 
@@ -1448,12 +1448,12 @@
     return-object v0
 
     :cond_0
-    iget-object v0, v0, Lorg/a/a/z$a;->bDj:Lorg/a/a/z$a;
+    iget-object v0, v0, Lorg/a/a/z$a;->bDe:Lorg/a/a/z$a;
 
     goto :goto_0
 
     :cond_1
-    iget-object v0, p0, Lorg/a/a/z;->bDe:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/z;->bCZ: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;->bBo:I
+    iget v3, v2, Lorg/a/a/z$a;->bBj:I
 
     if-ne v3, v0, :cond_0
 
@@ -1559,12 +1559,12 @@
     return p1
 
     :cond_0
-    iget-object v2, v2, Lorg/a/a/z$a;->bDj:Lorg/a/a/z$a;
+    iget-object v2, v2, Lorg/a/a/z$a;->bDe:Lorg/a/a/z$a;
 
     goto :goto_0
 
     :cond_1
-    iget-object v2, p0, Lorg/a/a/z;->bDe:Lorg/a/a/d;
+    iget-object v2, p0, Lorg/a/a/z;->bCZ: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;->bBo:I
+    iget v3, v2, Lorg/a/a/z$a;->bBj:I
 
     if-ne v3, v0, :cond_0
 
@@ -1628,14 +1628,14 @@
     return p1
 
     :cond_0
-    iget-object v2, v2, Lorg/a/a/z$a;->bDj:Lorg/a/a/z$a;
+    iget-object v2, v2, Lorg/a/a/z$a;->bDe: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;->bDh:I
+    iget v3, p0, Lorg/a/a/z;->bDc: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;->bBo:I
+    iget v2, v1, Lorg/a/a/z$a;->bBj: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;->bDj:Lorg/a/a/z$a;
+    iget-object v1, v1, Lorg/a/a/z$a;->bDe:Lorg/a/a/z$a;
 
     goto :goto_0
 
     :cond_1
-    iget-object v1, p0, Lorg/a/a/z;->bDe:Lorg/a/a/d;
+    iget-object v1, p0, Lorg/a/a/z;->bCZ: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;->bBo:I
+    iget v1, v0, Lorg/a/a/z$a;->bBj: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;->bCY:J
+    iget-wide v1, v0, Lorg/a/a/z$a;->bCT:J
 
     cmp-long v3, v1, p2
 
@@ -1768,14 +1768,14 @@
     return-object v0
 
     :cond_0
-    iget-object v0, v0, Lorg/a/a/z$a;->bDj:Lorg/a/a/z$a;
+    iget-object v0, v0, Lorg/a/a/z$a;->bDe: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;->bDe:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/z;->bCZ: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;->bBo:I
+    iget v1, v0, Lorg/a/a/z$a;->bBj:I
 
     const/16 v2, 0x81
 
@@ -1830,7 +1830,7 @@
 
     if-ne v1, v5, :cond_0
 
-    iget-wide v1, v0, Lorg/a/a/z$a;->bCY:J
+    iget-wide v1, v0, Lorg/a/a/z$a;->bCT:J
 
     int-to-long v3, p2
 
@@ -1851,14 +1851,14 @@
     return p1
 
     :cond_0
-    iget-object v0, v0, Lorg/a/a/z$a;->bDj:Lorg/a/a/z$a;
+    iget-object v0, v0, Lorg/a/a/z$a;->bDe: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;->bDh:I
+    iget v1, p0, Lorg/a/a/z;->bDc: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 705e918244..093df9ee31 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 biP:Ljava/nio/charset/Charset;
+.field public static final biK:Ljava/nio/charset/Charset;
 
-.field public static final biQ:Ljava/nio/charset/Charset;
+.field public static final biL:Ljava/nio/charset/Charset;
 
-.field public static final biR:Ljava/nio/charset/Charset;
+.field public static final biM:Ljava/nio/charset/Charset;
 
-.field public static final biS:Ljava/nio/charset/Charset;
+.field public static final biN:Ljava/nio/charset/Charset;
 
-.field public static final tw:Ljava/nio/charset/Charset;
+.field public static final tx:Ljava/nio/charset/Charset;
 
 
 # direct methods
@@ -27,7 +27,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lorg/apache/commons/a/a;->biS:Ljava/nio/charset/Charset;
+    sput-object v0, Lorg/apache/commons/a/a;->biN: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;->biR:Ljava/nio/charset/Charset;
+    sput-object v0, Lorg/apache/commons/a/a;->biM: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;->biP:Ljava/nio/charset/Charset;
+    sput-object v0, Lorg/apache/commons/a/a;->biK: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;->biQ:Ljava/nio/charset/Charset;
+    sput-object v0, Lorg/apache/commons/a/a;->biL: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;->tw:Ljava/nio/charset/Charset;
+    sput-object v0, Lorg/apache/commons/a/a;->tx: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 151e13cb98..5a1badbd76 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 bzr:[B
+.field private static final bzm:[B
 
-.field private static final bzs:[B
+.field private static final bzn:[B
 
-.field private static final bzt:[B
+.field private static final bzo:[B
 
-.field private static final bzu:[B
+.field private static final bzp:[B
 
-.field private static final bzv:[B
+.field private static final bzq:[B
 
 
 # instance fields
-.field private final bzA:[B
+.field private final bzr:I
 
-.field private final bzw:I
+.field private final bzs:[B
 
-.field private final bzx:[B
+.field private final bzt:I
 
-.field private final bzy:I
+.field private final bzu:[B
 
-.field private final bzz:[B
+.field private final bzv:[B
 
 
 # direct methods
@@ -37,7 +37,7 @@
 
     fill-array-data v0, :array_0
 
-    sput-object v0, Lorg/apache/commons/a/a/a;->bzr:[B
+    sput-object v0, Lorg/apache/commons/a/a/a;->bzm:[B
 
     const/16 v0, 0x5b
 
@@ -45,7 +45,7 @@
 
     fill-array-data v0, :array_1
 
-    sput-object v0, Lorg/apache/commons/a/a/a;->bzs:[B
+    sput-object v0, Lorg/apache/commons/a/a/a;->bzn:[B
 
     const/16 v0, 0x20
 
@@ -53,7 +53,7 @@
 
     fill-array-data v1, :array_2
 
-    sput-object v1, Lorg/apache/commons/a/a/a;->bzt:[B
+    sput-object v1, Lorg/apache/commons/a/a/a;->bzo:[B
 
     const/16 v1, 0x58
 
@@ -61,13 +61,13 @@
 
     fill-array-data v1, :array_3
 
-    sput-object v1, Lorg/apache/commons/a/a/a;->bzu:[B
+    sput-object v1, Lorg/apache/commons/a/a/a;->bzp:[B
 
     new-array v0, v0, [B
 
     fill-array-data v0, :array_4
 
-    sput-object v0, Lorg/apache/commons/a/a/a;->bzv:[B
+    sput-object v0, Lorg/apache/commons/a/a/a;->bzq:[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;->bzt:[B
+    sget-object p1, Lorg/apache/commons/a/a/a;->bzo:[B
 
-    iput-object p1, p0, Lorg/apache/commons/a/a/a;->bzz:[B
+    iput-object p1, p0, Lorg/apache/commons/a/a/a;->bzu:[B
 
-    sget-object p1, Lorg/apache/commons/a/a/a;->bzs:[B
+    sget-object p1, Lorg/apache/commons/a/a/a;->bzn:[B
 
-    iput-object p1, p0, Lorg/apache/commons/a/a/a;->bzx:[B
+    iput-object p1, p0, Lorg/apache/commons/a/a/a;->bzs:[B
 
     const/16 p1, 0x8
 
-    iput p1, p0, Lorg/apache/commons/a/a/a;->bzy:I
+    iput p1, p0, Lorg/apache/commons/a/a/a;->bzt:I
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lorg/apache/commons/a/a/a;->bzA:[B
+    iput-object p1, p0, Lorg/apache/commons/a/a/a;->bzv:[B
 
-    iget p1, p0, Lorg/apache/commons/a/a/a;->bzy:I
+    iget p1, p0, Lorg/apache/commons/a/a/a;->bzt:I
 
     add-int/lit8 p1, p1, -0x1
 
-    iput p1, p0, Lorg/apache/commons/a/a/a;->bzw:I
+    iput p1, p0, Lorg/apache/commons/a/a/a;->bzr: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;->bzJ:Z
+    iget-boolean v0, p4, Lorg/apache/commons/a/a/b$a;->bzE: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;->bzJ:Z
+    iput-boolean v1, p4, Lorg/apache/commons/a/a/b$a;->bzE:Z
 
-    iget p1, p4, Lorg/apache/commons/a/a/b$a;->bzL:I
+    iget p1, p4, Lorg/apache/commons/a/a/b$a;->bzG:I
 
     if-nez p1, :cond_1
 
-    iget p1, p0, Lorg/apache/commons/a/a/a;->bzE:I
+    iget p1, p0, Lorg/apache/commons/a/a/a;->bzz:I
 
     if-nez p1, :cond_1
 
     return-void
 
     :cond_1
-    iget p1, p0, Lorg/apache/commons/a/a/a;->bzy:I
+    iget p1, p0, Lorg/apache/commons/a/a/a;->bzt: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;->bzL:I
+    iget p3, p4, Lorg/apache/commons/a/a/b$a;->bzG: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;->bzz:[B
+    iget-object v1, p0, Lorg/apache/commons/a/a/a;->bzu:[B
 
-    iget-wide v5, p4, Lorg/apache/commons/a/a/b$a;->bzH:J
+    iget-wide v5, p4, Lorg/apache/commons/a/a/b$a;->bzC: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;->bzz:[B
+    iget-object v1, p0, Lorg/apache/commons/a/a/a;->bzu:[B
 
-    iget-wide v5, p4, Lorg/apache/commons/a/a/b$a;->bzH:J
+    iget-wide v5, p4, Lorg/apache/commons/a/a/b$a;->bzC: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;->bzz:[B
+    iget-object v1, p0, Lorg/apache/commons/a/a/a;->bzu:[B
 
-    iget-wide v5, p4, Lorg/apache/commons/a/a/b$a;->bzH:J
+    iget-wide v5, p4, Lorg/apache/commons/a/a/b$a;->bzC: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;->bzz:[B
+    iget-object v1, p0, Lorg/apache/commons/a/a/a;->bzu:[B
 
-    iget-wide v5, p4, Lorg/apache/commons/a/a/b$a;->bzH:J
+    iget-wide v5, p4, Lorg/apache/commons/a/a/b$a;->bzC: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;->bzz:[B
+    iget-object v1, p0, Lorg/apache/commons/a/a/a;->bzu:[B
 
-    iget-wide v5, p4, Lorg/apache/commons/a/a/b$a;->bzH:J
+    iget-wide v5, p4, Lorg/apache/commons/a/a/b$a;->bzC: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;->bzz:[B
+    iget-object v1, p0, Lorg/apache/commons/a/a/a;->bzu:[B
 
-    iget-wide v5, p4, Lorg/apache/commons/a/a/b$a;->bzH:J
+    iget-wide v5, p4, Lorg/apache/commons/a/a/b$a;->bzC: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;->bzz:[B
+    iget-object v1, p0, Lorg/apache/commons/a/a/a;->bzu:[B
 
-    iget-wide v5, p4, Lorg/apache/commons/a/a/b$a;->bzH:J
+    iget-wide v5, p4, Lorg/apache/commons/a/a/b$a;->bzC: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;->bzL:I
+    iget p3, p4, Lorg/apache/commons/a/a/b$a;->bzG: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;->bzz:[B
+    iget-object v2, p0, Lorg/apache/commons/a/a/a;->bzu:[B
 
-    iget-wide v6, p4, Lorg/apache/commons/a/a/b$a;->bzH:J
+    iget-wide v6, p4, Lorg/apache/commons/a/a/b$a;->bzC: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;->bzz:[B
+    iget-object v2, p0, Lorg/apache/commons/a/a/a;->bzu:[B
 
-    iget-wide v6, p4, Lorg/apache/commons/a/a/b$a;->bzH:J
+    iget-wide v6, p4, Lorg/apache/commons/a/a/b$a;->bzC: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;->bzz:[B
+    iget-object v2, p0, Lorg/apache/commons/a/a/a;->bzu:[B
 
-    iget-wide v6, p4, Lorg/apache/commons/a/a/b$a;->bzH:J
+    iget-wide v6, p4, Lorg/apache/commons/a/a/b$a;->bzC: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;->bzz:[B
+    iget-object v2, p0, Lorg/apache/commons/a/a/a;->bzu:[B
 
-    iget-wide v6, p4, Lorg/apache/commons/a/a/b$a;->bzH:J
+    iget-wide v6, p4, Lorg/apache/commons/a/a/b$a;->bzC: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;->bzz:[B
+    iget-object v2, p0, Lorg/apache/commons/a/a/a;->bzu:[B
 
-    iget-wide v5, p4, Lorg/apache/commons/a/a/b$a;->bzH:J
+    iget-wide v5, p4, Lorg/apache/commons/a/a/b$a;->bzC: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;->bzz:[B
+    iget-object v2, p0, Lorg/apache/commons/a/a/a;->bzu:[B
 
-    iget-wide v6, p4, Lorg/apache/commons/a/a/b$a;->bzH:J
+    iget-wide v6, p4, Lorg/apache/commons/a/a/b$a;->bzC: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;->bzz:[B
+    iget-object v2, p0, Lorg/apache/commons/a/a/a;->bzu:[B
 
-    iget-wide v6, p4, Lorg/apache/commons/a/a/b$a;->bzH:J
+    iget-wide v6, p4, Lorg/apache/commons/a/a/b$a;->bzC: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;->bzz:[B
+    iget-object v2, p0, Lorg/apache/commons/a/a/a;->bzu:[B
 
-    iget-wide v6, p4, Lorg/apache/commons/a/a/b$a;->bzH:J
+    iget-wide v6, p4, Lorg/apache/commons/a/a/b$a;->bzC: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;->bzz:[B
+    iget-object v1, p0, Lorg/apache/commons/a/a/a;->bzu:[B
 
-    iget-wide v2, p4, Lorg/apache/commons/a/a/b$a;->bzH:J
+    iget-wide v2, p4, Lorg/apache/commons/a/a/b$a;->bzC: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;->bzz:[B
+    iget-object v1, p0, Lorg/apache/commons/a/a/a;->bzu:[B
 
-    iget-wide v5, p4, Lorg/apache/commons/a/a/b$a;->bzH:J
+    iget-wide v5, p4, Lorg/apache/commons/a/a/b$a;->bzC: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;->bzz:[B
+    iget-object v1, p0, Lorg/apache/commons/a/a/a;->bzu:[B
 
-    iget-wide v5, p4, Lorg/apache/commons/a/a/b$a;->bzH:J
+    iget-wide v5, p4, Lorg/apache/commons/a/a/b$a;->bzC:J
 
     shl-long v2, v5, v3
 
@@ -976,7 +976,7 @@
 
     :cond_6
     :goto_0
-    iget p3, p4, Lorg/apache/commons/a/a/b$a;->bzK:I
+    iget p3, p4, Lorg/apache/commons/a/a/b$a;->bzF: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;->bzK:I
+    iput p3, p4, Lorg/apache/commons/a/a/b$a;->bzF:I
 
-    iget p2, p0, Lorg/apache/commons/a/a/a;->bzE:I
+    iget p2, p0, Lorg/apache/commons/a/a/a;->bzz:I
 
     if-lez p2, :cond_7
 
-    iget p2, p4, Lorg/apache/commons/a/a/b$a;->bzK:I
+    iget p2, p4, Lorg/apache/commons/a/a/b$a;->bzF:I
 
     if-lez p2, :cond_7
 
-    iget-object p2, p0, Lorg/apache/commons/a/a/a;->bzA:[B
+    iget-object p2, p0, Lorg/apache/commons/a/a/a;->bzv:[B
 
     iget p3, p4, Lorg/apache/commons/a/a/b$a;->pos:I
 
-    iget-object v1, p0, Lorg/apache/commons/a/a/a;->bzA:[B
+    iget-object v1, p0, Lorg/apache/commons/a/a/a;->bzv:[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;->bzA:[B
+    iget-object p2, p0, Lorg/apache/commons/a/a/a;->bzv:[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;->bzy:I
+    iget v3, p0, Lorg/apache/commons/a/a/a;->bzt: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;->bzL:I
+    iget v4, p4, Lorg/apache/commons/a/a/b$a;->bzG: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;->bzL:I
+    iput v4, p4, Lorg/apache/commons/a/a/b$a;->bzG: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;->bzH:J
+    iget-wide v6, p4, Lorg/apache/commons/a/a/b$a;->bzC: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;->bzH:J
+    iput-wide v6, p4, Lorg/apache/commons/a/a/b$a;->bzC:J
 
-    iget v2, p4, Lorg/apache/commons/a/a/b$a;->bzL:I
+    iget v2, p4, Lorg/apache/commons/a/a/b$a;->bzG: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;->bzz:[B
+    iget-object v6, p0, Lorg/apache/commons/a/a/a;->bzu:[B
 
-    iget-wide v9, p4, Lorg/apache/commons/a/a/b$a;->bzH:J
+    iget-wide v9, p4, Lorg/apache/commons/a/a/b$a;->bzC: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;->bzz:[B
+    iget-object v6, p0, Lorg/apache/commons/a/a/a;->bzu:[B
 
-    iget-wide v9, p4, Lorg/apache/commons/a/a/b$a;->bzH:J
+    iget-wide v9, p4, Lorg/apache/commons/a/a/b$a;->bzC: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;->bzz:[B
+    iget-object v6, p0, Lorg/apache/commons/a/a/a;->bzu:[B
 
-    iget-wide v9, p4, Lorg/apache/commons/a/a/b$a;->bzH:J
+    iget-wide v9, p4, Lorg/apache/commons/a/a/b$a;->bzC: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;->bzz:[B
+    iget-object v6, p0, Lorg/apache/commons/a/a/a;->bzu:[B
 
-    iget-wide v9, p4, Lorg/apache/commons/a/a/b$a;->bzH:J
+    iget-wide v9, p4, Lorg/apache/commons/a/a/b$a;->bzC: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;->bzz:[B
+    iget-object v6, p0, Lorg/apache/commons/a/a/a;->bzu:[B
 
-    iget-wide v9, p4, Lorg/apache/commons/a/a/b$a;->bzH:J
+    iget-wide v9, p4, Lorg/apache/commons/a/a/b$a;->bzC: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;->bzz:[B
+    iget-object v6, p0, Lorg/apache/commons/a/a/a;->bzu:[B
 
-    iget-wide v9, p4, Lorg/apache/commons/a/a/b$a;->bzH:J
+    iget-wide v9, p4, Lorg/apache/commons/a/a/b$a;->bzC: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;->bzz:[B
+    iget-object v6, p0, Lorg/apache/commons/a/a/a;->bzu:[B
 
-    iget-wide v9, p4, Lorg/apache/commons/a/a/b$a;->bzH:J
+    iget-wide v9, p4, Lorg/apache/commons/a/a/b$a;->bzC: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;->bzz:[B
+    iget-object v5, p0, Lorg/apache/commons/a/a/a;->bzu:[B
 
-    iget-wide v6, p4, Lorg/apache/commons/a/a/b$a;->bzH:J
+    iget-wide v6, p4, Lorg/apache/commons/a/a/b$a;->bzC: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;->bzK:I
+    iget v2, p4, Lorg/apache/commons/a/a/b$a;->bzF:I
 
     add-int/2addr v2, v8
 
-    iput v2, p4, Lorg/apache/commons/a/a/b$a;->bzK:I
+    iput v2, p4, Lorg/apache/commons/a/a/b$a;->bzF:I
 
-    iget v2, p0, Lorg/apache/commons/a/a/a;->bzE:I
+    iget v2, p0, Lorg/apache/commons/a/a/a;->bzz:I
 
     if-lez v2, :cond_a
 
-    iget v2, p0, Lorg/apache/commons/a/a/a;->bzE:I
+    iget v2, p0, Lorg/apache/commons/a/a/a;->bzz:I
 
-    iget v5, p4, Lorg/apache/commons/a/a/b$a;->bzK:I
+    iget v5, p4, Lorg/apache/commons/a/a/b$a;->bzF:I
 
     if-gt v2, v5, :cond_a
 
-    iget-object v2, p0, Lorg/apache/commons/a/a/a;->bzA:[B
+    iget-object v2, p0, Lorg/apache/commons/a/a/a;->bzv:[B
 
     iget v5, p4, Lorg/apache/commons/a/a/b$a;->pos:I
 
-    iget-object v6, p0, Lorg/apache/commons/a/a/a;->bzA:[B
+    iget-object v6, p0, Lorg/apache/commons/a/a/a;->bzv:[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;->bzA:[B
+    iget-object v3, p0, Lorg/apache/commons/a/a/a;->bzv:[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;->bzK:I
+    iput v0, p4, Lorg/apache/commons/a/a/b$a;->bzF: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 71cca2ff1e..06c23046af 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,18 +17,18 @@
 # instance fields
 .field public buffer:[B
 
+.field bzB:I
+
+.field bzC:J
+
+.field public bzD:I
+
+.field public bzE:Z
+
+.field bzF:I
+
 .field bzG:I
 
-.field bzH:J
-
-.field public bzI:I
-
-.field public bzJ:Z
-
-.field bzK:I
-
-.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;->bzK:I
+    iget v1, p0, Lorg/apache/commons/a/a/b$a;->bzF: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;->bzJ:Z
+    iget-boolean v1, p0, Lorg/apache/commons/a/a/b$a;->bzE: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;->bzG:I
+    iget v1, p0, Lorg/apache/commons/a/a/b$a;->bzB: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;->bzH:J
+    iget-wide v1, p0, Lorg/apache/commons/a/a/b$a;->bzC: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;->bzL:I
+    iget v1, p0, Lorg/apache/commons/a/a/b$a;->bzG: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;->bzI:I
+    iget v1, p0, Lorg/apache/commons/a/a/b$a;->bzD: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 aaad4d63bc..53c8e38383 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 bzB:B
+.field private final bzA:I
 
-.field private final bzC:I
+.field protected final bzw:B
 
-.field private final bzD:I
+.field private final bzx:I
 
-.field protected final bzE:I
+.field private final bzy:I
 
-.field private final bzF:I
+.field protected final bzz:I
 
 
 # direct methods
@@ -31,21 +31,21 @@
 
     const/16 p1, 0x3d
 
-    iput-byte p1, p0, Lorg/apache/commons/a/a/b;->bzB:B
+    iput-byte p1, p0, Lorg/apache/commons/a/a/b;->bzw:B
 
     const/4 p1, 0x5
 
-    iput p1, p0, Lorg/apache/commons/a/a/b;->bzC:I
+    iput p1, p0, Lorg/apache/commons/a/a/b;->bzx:I
 
     const/16 p1, 0x8
 
-    iput p1, p0, Lorg/apache/commons/a/a/b;->bzD:I
+    iput p1, p0, Lorg/apache/commons/a/a/b;->bzy:I
 
     const/4 p1, 0x0
 
-    iput p1, p0, Lorg/apache/commons/a/a/b;->bzE:I
+    iput p1, p0, Lorg/apache/commons/a/a/b;->bzz:I
 
-    iput p1, p0, Lorg/apache/commons/a/a/b;->bzF:I
+    iput p1, p0, Lorg/apache/commons/a/a/b;->bzA: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;->bzI:I
+    iput v0, p2, Lorg/apache/commons/a/a/b$a;->bzD: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 c394c86e29..98c87a2dfa 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 bDz:Ljava/lang/reflect/Method;
+.field private final bDu: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;->If()Ljava/lang/reflect/Method;
+    invoke-static {}, Lorg/b/a/a/a;->Id()Ljava/lang/reflect/Method;
 
     move-result-object p1
 
-    iput-object p1, p0, Lorg/b/a/a/a;->bDz:Ljava/lang/reflect/Method;
+    iput-object p1, p0, Lorg/b/a/a/a;->bDu:Ljava/lang/reflect/Method;
 
     return-void
 .end method
 
-.method private static If()Ljava/lang/reflect/Method;
+.method private static Id()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;->bDz:Ljava/lang/reflect/Method;
+    iget-object v1, p0, Lorg/b/a/a/a;->bDu: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 f9fd47e559..5a615946b3 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 bDA:Ljava/lang/reflect/Method;
+.field private final bDv:Ljava/lang/reflect/Method;
 
-.field private final bDB:Ljava/lang/Integer;
+.field private final bDw: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;->Ig()Ljava/lang/reflect/Method;
+    invoke-static {}, Lorg/b/a/a/b;->Ie()Ljava/lang/reflect/Method;
 
     move-result-object p1
 
-    iput-object p1, p0, Lorg/b/a/a/b;->bDA:Ljava/lang/reflect/Method;
+    iput-object p1, p0, Lorg/b/a/a/b;->bDv:Ljava/lang/reflect/Method;
 
-    invoke-static {}, Lorg/b/a/a/b;->Ih()Ljava/lang/Integer;
+    invoke-static {}, Lorg/b/a/a/b;->If()Ljava/lang/Integer;
 
     move-result-object p1
 
-    iput-object p1, p0, Lorg/b/a/a/b;->bDB:Ljava/lang/Integer;
+    iput-object p1, p0, Lorg/b/a/a/b;->bDw:Ljava/lang/Integer;
 
     return-void
 .end method
 
-.method private static Ig()Ljava/lang/reflect/Method;
+.method private static Ie()Ljava/lang/reflect/Method;
     .locals 5
 
     :try_start_0
@@ -118,7 +118,7 @@
     throw v1
 .end method
 
-.method private static Ih()Ljava/lang/Integer;
+.method private static If()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;->bDA:Ljava/lang/reflect/Method;
+    iget-object v1, p0, Lorg/b/a/a/b;->bDv: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;->bDB:Ljava/lang/Integer;
+    iget-object v5, p0, Lorg/b/a/a/b;->bDw: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 58916599d6..662eafd686 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 bDA:Ljava/lang/reflect/Method;
+.field private final bDv:Ljava/lang/reflect/Method;
 
-.field private final bDC:Ljava/lang/Long;
+.field private final bDx: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;->Ig()Ljava/lang/reflect/Method;
+    invoke-static {}, Lorg/b/a/a/c;->Ie()Ljava/lang/reflect/Method;
 
     move-result-object p1
 
-    iput-object p1, p0, Lorg/b/a/a/c;->bDA:Ljava/lang/reflect/Method;
+    iput-object p1, p0, Lorg/b/a/a/c;->bDv:Ljava/lang/reflect/Method;
 
-    invoke-static {}, Lorg/b/a/a/c;->Ii()Ljava/lang/Long;
+    invoke-static {}, Lorg/b/a/a/c;->Ig()Ljava/lang/Long;
 
     move-result-object p1
 
-    iput-object p1, p0, Lorg/b/a/a/c;->bDC:Ljava/lang/Long;
+    iput-object p1, p0, Lorg/b/a/a/c;->bDx:Ljava/lang/Long;
 
     return-void
 .end method
 
-.method private static Ig()Ljava/lang/reflect/Method;
+.method private static Ie()Ljava/lang/reflect/Method;
     .locals 5
 
     :try_start_0
@@ -118,7 +118,7 @@
     throw v1
 .end method
 
-.method private static Ii()Ljava/lang/Long;
+.method private static Ig()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;->bDA:Ljava/lang/reflect/Method;
+    iget-object v1, p0, Lorg/b/a/a/c;->bDv: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;->bDC:Ljava/lang/Long;
+    iget-object v5, p0, Lorg/b/a/a/c;->bDx: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 6582ab3d2a..c7ef2f4582 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;->bDD:Ljava/lang/reflect/Constructor;
+    iget-object p1, p0, Lorg/b/a/b/a;->bDy:Ljava/lang/reflect/Constructor;
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lorg/b/a/b/a;->bDD:Ljava/lang/reflect/Constructor;
+    iget-object p1, p0, Lorg/b/a/b/a;->bDy: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 309172b09d..d74f70f659 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 bDD:Ljava/lang/reflect/Constructor;
+.field protected bDy: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;->bDD:Ljava/lang/reflect/Constructor;
+    iput-object p1, p0, Lorg/b/a/b/b;->bDy: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;->bDD:Ljava/lang/reflect/Constructor;
+    iget-object v0, p0, Lorg/b/a/b/b;->bDy: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 756cc7479d..0537c9ea7e 100644
--- a/com.discord/smali_classes2/org/b/a/b/c$a.smali
+++ b/com.discord/smali_classes2/org/b/a/b/c$a.smali
@@ -15,21 +15,21 @@
 
 
 # static fields
-.field private static final bDH:[I
+.field private static final bDC:[I
 
-.field private static bDK:[B
+.field private static bDF:[B
 
-.field private static bDL:[B
+.field private static bDG:[B
 
 
 # instance fields
-.field private bDF:I
+.field private bDA:I
 
-.field private bDG:I
+.field private bDB:I
 
-.field private bDI:[[B
+.field private bDD:[[B
 
-.field private final bDJ:[B
+.field private final bDE:[B
 
 .field private data:[B
 
@@ -44,7 +44,7 @@
 
     fill-array-data v0, :array_0
 
-    sput-object v0, Lorg/b/a/b/c$a;->bDH:[I
+    sput-object v0, Lorg/b/a/b/c$a;->bDC:[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;->bDK:[B
+    sput-object v0, Lorg/b/a/b/c$a;->bDF:[B
 
     new-instance v0, Ljava/io/ByteArrayOutputStream;
 
@@ -93,7 +93,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lorg/b/a/b/c$a;->bDL:[B
+    sput-object v0, Lorg/b/a/b/c$a;->bDG:[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;->bDF:I
+    iput v0, p0, Lorg/b/a/b/c$a;->bDA:I
 
-    iput v0, p0, Lorg/b/a/b/c$a;->bDG:I
+    iput v0, p0, Lorg/b/a/b/c$a;->bDB:I
 
-    sget-object v1, Lorg/b/a/b/c$a;->bDK:[B
+    sget-object v1, Lorg/b/a/b/c$a;->bDF:[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;->bDJ:[B
+    iput-object v1, p0, Lorg/b/a/b/c$a;->bDE:[B
 
     const/4 v1, 0x3
 
     new-array v1, v1, [[B
 
-    sget-object v2, Lorg/b/a/b/c$a;->bDK:[B
+    sget-object v2, Lorg/b/a/b/c$a;->bDF:[B
 
     aput-object v2, v1, v0
 
     const/4 v0, 0x1
 
-    iget-object v2, p0, Lorg/b/a/b/c$a;->bDJ:[B
+    iget-object v2, p0, Lorg/b/a/b/c$a;->bDE:[B
 
     aput-object v2, v1, v0
 
-    sget-object v0, Lorg/b/a/b/c$a;->bDL:[B
+    sget-object v0, Lorg/b/a/b/c$a;->bDG:[B
 
     aput-object v0, v1, p1
 
-    iput-object v1, p0, Lorg/b/a/b/c$a;->bDI:[[B
+    iput-object v1, p0, Lorg/b/a/b/c$a;->bDD:[[B
 
     return-void
 
@@ -257,24 +257,24 @@
     throw v0
 .end method
 
-.method private Ij()V
+.method private Ih()V
     .locals 2
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lorg/b/a/b/c$a;->bDF:I
+    iput v0, p0, Lorg/b/a/b/c$a;->bDA:I
 
-    sget-object v0, Lorg/b/a/b/c$a;->bDH:[I
+    sget-object v0, Lorg/b/a/b/c$a;->bDC:[I
 
-    iget v1, p0, Lorg/b/a/b/c$a;->bDG:I
+    iget v1, p0, Lorg/b/a/b/c$a;->bDB:I
 
     aget v0, v0, v1
 
-    iput v0, p0, Lorg/b/a/b/c$a;->bDG:I
+    iput v0, p0, Lorg/b/a/b/c$a;->bDB:I
 
-    iget-object v0, p0, Lorg/b/a/b/c$a;->bDI:[[B
+    iget-object v0, p0, Lorg/b/a/b/c$a;->bDD:[[B
 
-    iget v1, p0, Lorg/b/a/b/c$a;->bDG:I
+    iget v1, p0, Lorg/b/a/b/c$a;->bDB: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;->bDF:I
+    iget v1, p0, Lorg/b/a/b/c$a;->bDA:I
 
     add-int/lit8 v2, v1, 0x1
 
-    iput v2, p0, Lorg/b/a/b/c$a;->bDF:I
+    iput v2, p0, Lorg/b/a/b/c$a;->bDA:I
 
     aget-byte v1, v0, v1
 
-    iget v2, p0, Lorg/b/a/b/c$a;->bDF:I
+    iget v2, p0, Lorg/b/a/b/c$a;->bDA:I
 
     array-length v0, v0
 
     if-lt v2, v0, :cond_0
 
-    invoke-direct {p0}, Lorg/b/a/b/c$a;->Ij()V
+    invoke-direct {p0}, Lorg/b/a/b/c$a;->Ih()V
 
     :cond_0
     return v1
@@ -340,7 +340,7 @@
 
     array-length v0, v0
 
-    iget v1, p0, Lorg/b/a/b/c$a;->bDF:I
+    iget v1, p0, Lorg/b/a/b/c$a;->bDA: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;->bDF:I
+    iget v3, p0, Lorg/b/a/b/c$a;->bDA: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;->Ij()V
+    invoke-direct {p0}, Lorg/b/a/b/c$a;->Ih()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;->bDF:I
+    iget v2, p0, Lorg/b/a/b/c$a;->bDA: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;->bDF:I
+    iget v2, p0, Lorg/b/a/b/c$a;->bDA: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;->bDF:I
+    iget p1, p0, Lorg/b/a/b/c$a;->bDA:I
 
     add-int/2addr p1, p2
 
-    iput p1, p0, Lorg/b/a/b/c$a;->bDF:I
+    iput p1, p0, Lorg/b/a/b/c$a;->bDA: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 cd17b9e89d..d124a8189b 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 bDE:Ljava/io/ObjectInputStream;
+.field private bDz: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;->bDE:Ljava/io/ObjectInputStream;
+    iput-object v0, p0, Lorg/b/a/b/c;->bDz: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;->bDE:Ljava/io/ObjectInputStream;
+    iget-object v0, p0, Lorg/b/a/b/c;->bDz: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 0ec984b6b9..b0169388a4 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;->bDM:Ljava/lang/reflect/Method;
+    sget-object v1, Lorg/b/a/c/a;->bDH:Ljava/lang/reflect/Method;
 
-    sget-object v2, Lorg/b/a/c/a;->bDN:Ljava/io/ObjectInputStream;
+    sget-object v2, Lorg/b/a/c/a;->bDI: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 9d50b3921d..0b8bccbb5c 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 bDM:Ljava/lang/reflect/Method;
+.field static bDH:Ljava/lang/reflect/Method;
 
-.field static bDN:Ljava/io/ObjectInputStream;
+.field static bDI: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;->bDM:Ljava/lang/reflect/Method;
+    sget-object p1, Lorg/b/a/c/b;->bDH: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;->bDM:Ljava/lang/reflect/Method;
+    sput-object p1, Lorg/b/a/c/b;->bDH: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;->bDN:Ljava/io/ObjectInputStream;
+    sput-object p1, Lorg/b/a/c/b;->bDI: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 4c482c1c7b..09c757e44b 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 bDA:Ljava/lang/reflect/Method;
+.field private final bDJ:[Ljava/lang/Object;
 
-.field private final bDO:[Ljava/lang/Object;
+.field private final bDv:Ljava/lang/reflect/Method;
 
 
 # direct methods
@@ -54,9 +54,9 @@
 
     aput-object v3, v1, v4
 
-    iput-object v1, p0, Lorg/b/a/d/a;->bDO:[Ljava/lang/Object;
+    iput-object v1, p0, Lorg/b/a/d/a;->bDJ:[Ljava/lang/Object;
 
-    iget-object v1, p0, Lorg/b/a/d/a;->bDO:[Ljava/lang/Object;
+    iget-object v1, p0, Lorg/b/a/d/a;->bDJ:[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;->bDA:Ljava/lang/reflect/Method;
+    iput-object p1, p0, Lorg/b/a/d/a;->bDv:Ljava/lang/reflect/Method;
 
-    iget-object p1, p0, Lorg/b/a/d/a;->bDA:Ljava/lang/reflect/Method;
+    iget-object p1, p0, Lorg/b/a/d/a;->bDv: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;->bDA:Ljava/lang/reflect/Method;
+    iget-object v0, p0, Lorg/b/a/d/a;->bDv:Ljava/lang/reflect/Method;
 
     const/4 v1, 0x0
 
-    iget-object v2, p0, Lorg/b/a/d/a;->bDO:[Ljava/lang/Object;
+    iget-object v2, p0, Lorg/b/a/d/a;->bDJ:[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 9237b48aaf..b5559821c9 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 Ik()Ljava/lang/Class;
+.method private static Ii()Ljava/lang/Class;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -173,7 +173,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lorg/b/a/e/a;->Ik()Ljava/lang/Class;
+    invoke-static {}, Lorg/b/a/e/a;->Ii()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 c4f1c17e8b..5950828c3c 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 bDP:Ljava/lang/reflect/Constructor;
+.field private final bDK: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;->Il()Ljava/lang/reflect/Constructor;
+    invoke-static {}, Lorg/b/a/e/b;->Ij()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;->bDP:Ljava/lang/reflect/Constructor;
+    iput-object p1, p0, Lorg/b/a/e/b;->bDK:Ljava/lang/reflect/Constructor;
 
-    iget-object p1, p0, Lorg/b/a/e/b;->bDP:Ljava/lang/reflect/Constructor;
+    iget-object p1, p0, Lorg/b/a/e/b;->bDK:Ljava/lang/reflect/Constructor;
 
     const/4 v0, 0x1
 
@@ -62,7 +62,7 @@
     return-void
 .end method
 
-.method private static Il()Ljava/lang/reflect/Constructor;
+.method private static Ij()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;->bDP:Ljava/lang/reflect/Constructor;
+    iget-object v0, p0, Lorg/b/a/e/b;->bDK: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 34be03752c..0e8cb8c208 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 bDQ:Lsun/misc/Unsafe;
+.field private static bDL: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;->bDQ:Lsun/misc/Unsafe;
+    sget-object v0, Lorg/b/a/e/c;->bDL: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;->bDQ:Lsun/misc/Unsafe;
+    sput-object v0, Lorg/b/a/e/c;->bDL: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;->bDQ:Lsun/misc/Unsafe;
+    sget-object v1, Lorg/b/a/e/c;->bDL: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 972df9c525..8e524d19f4 100644
--- a/com.discord/smali_classes2/org/b/b/c.smali
+++ b/com.discord/smali_classes2/org/b/b/c.smali
@@ -4,24 +4,24 @@
 
 
 # static fields
+.field public static final bDM:Ljava/lang/String;
+
+.field public static final bDN:Ljava/lang/String;
+
+.field public static final bDO:Ljava/lang/String;
+
+.field public static final bDP:Ljava/lang/String;
+
+.field public static final bDQ:Ljava/lang/String;
+
 .field public static final bDR:Ljava/lang/String;
 
-.field public static final bDS:Ljava/lang/String;
+.field public static final bDS:I
 
-.field public static final bDT:Ljava/lang/String;
+.field public static final bDT:Z
 
 .field public static final bDU:Ljava/lang/String;
 
-.field public static final bDV:Ljava/lang/String;
-
-.field public static final bDW:Ljava/lang/String;
-
-.field public static final bDX:I
-
-.field public static final bDY:Z
-
-.field public static final bDZ:Ljava/lang/String;
-
 
 # direct methods
 .method static constructor <clinit>()V
@@ -33,7 +33,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lorg/b/b/c;->bDR:Ljava/lang/String;
+    sput-object v0, Lorg/b/b/c;->bDM:Ljava/lang/String;
 
     const-string v0, "java.runtime.version"
 
@@ -41,7 +41,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lorg/b/b/c;->bDS:Ljava/lang/String;
+    sput-object v0, Lorg/b/b/c;->bDN:Ljava/lang/String;
 
     const-string v0, "java.vm.info"
 
@@ -49,7 +49,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lorg/b/b/c;->bDT:Ljava/lang/String;
+    sput-object v0, Lorg/b/b/c;->bDO:Ljava/lang/String;
 
     const-string v0, "java.vm.version"
 
@@ -57,7 +57,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lorg/b/b/c;->bDU:Ljava/lang/String;
+    sput-object v0, Lorg/b/b/c;->bDP:Ljava/lang/String;
 
     const-string v0, "java.vm.vendor"
 
@@ -65,7 +65,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lorg/b/b/c;->bDV:Ljava/lang/String;
+    sput-object v0, Lorg/b/b/c;->bDQ:Ljava/lang/String;
 
     const-string v0, "java.vm.name"
 
@@ -73,15 +73,15 @@
 
     move-result-object v0
 
-    sput-object v0, Lorg/b/b/c;->bDW:Ljava/lang/String;
+    sput-object v0, Lorg/b/b/c;->bDR:Ljava/lang/String;
 
-    invoke-static {}, Lorg/b/b/c;->Io()I
+    invoke-static {}, Lorg/b/b/c;->Im()I
 
     move-result v0
 
-    sput v0, Lorg/b/b/c;->bDX:I
+    sput v0, Lorg/b/b/c;->bDS:I
 
-    invoke-static {}, Lorg/b/b/c;->Io()I
+    invoke-static {}, Lorg/b/b/c;->Im()I
 
     move-result v0
 
@@ -115,7 +115,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    sput-boolean v0, Lorg/b/b/c;->bDY:Z
+    sput-boolean v0, Lorg/b/b/c;->bDT:Z
 
     const-string v0, "com.google.appengine.runtime.version"
 
@@ -123,23 +123,23 @@
 
     move-result-object v0
 
-    sput-object v0, Lorg/b/b/c;->bDZ:Ljava/lang/String;
+    sput-object v0, Lorg/b/b/c;->bDU:Ljava/lang/String;
 
     return-void
 .end method
 
-.method public static Im()Z
+.method public static Ik()Z
     .locals 1
 
-    sget-boolean v0, Lorg/b/b/c;->bDY:Z
+    sget-boolean v0, Lorg/b/b/c;->bDT:Z
 
     return v0
 .end method
 
-.method public static In()Z
+.method public static Il()Z
     .locals 1
 
-    sget-object v0, Lorg/b/b/c;->bDZ:Ljava/lang/String;
+    sget-object v0, Lorg/b/b/c;->bDU:Ljava/lang/String;
 
     if-eqz v0, :cond_0
 
@@ -153,10 +153,10 @@
     return v0
 .end method
 
-.method private static Io()I
+.method private static Im()I
     .locals 2
 
-    sget-object v0, Lorg/b/b/c;->bDW:Ljava/lang/String;
+    sget-object v0, Lorg/b/b/c;->bDR:Ljava/lang/String;
 
     const-string v1, "Dalvik"
 
@@ -171,14 +171,14 @@
     return v0
 
     :cond_0
-    invoke-static {}, Lorg/b/b/c;->Ip()I
+    invoke-static {}, Lorg/b/b/c;->In()I
 
     move-result v0
 
     return v0
 .end method
 
-.method private static Ip()I
+.method private static In()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;->bDW:Ljava/lang/String;
+    sget-object v0, Lorg/b/b/c;->bDR: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 ae04e2c12f..50ff4151f3 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;->Im()Z
+    invoke-static {}, Lorg/b/b/c;->Ik()Z
 
     move-result v0
 
@@ -68,7 +68,7 @@
     return-object v0
 
     :cond_1
-    sget v0, Lorg/b/b/c;->bDX:I
+    sget v0, Lorg/b/b/c;->bDS:I
 
     const/16 v1, 0xa
 
@@ -81,7 +81,7 @@
     return-object v0
 
     :cond_2
-    sget v0, Lorg/b/b/c;->bDX:I
+    sget v0, Lorg/b/b/c;->bDS:I
 
     const/16 v1, 0x11
 
@@ -154,7 +154,7 @@
 
     :cond_8
     :goto_0
-    invoke-static {}, Lorg/b/b/c;->In()Z
+    invoke-static {}, Lorg/b/b/c;->Il()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 dcb2d252a0..f69d95ab73 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 bEa:Ljava/util/Map;
+.field private static final bDV: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;->bEa:Ljava/util/Map;
+    sput-object v0, Lproguard/optimize/gson/b;->bDV:Ljava/util/Map;
 
     return-void
 .end method
@@ -774,7 +774,7 @@
 
     move-result-object p1
 
-    sget-object v0, Lproguard/optimize/gson/b;->bEa:Ljava/util/Map;
+    sget-object v0, Lproguard/optimize/gson/b;->bDV: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 575d25704d..cc254262c5 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 bEb:[Ljava/lang/String;
+.field private static final bDW:[Ljava/lang/String;
 
 
 # direct methods
@@ -450,7 +450,7 @@
 
     aput-object v2, v0, v1
 
-    sput-object v0, Lproguard/optimize/gson/c;->bEb:[Ljava/lang/String;
+    sput-object v0, Lproguard/optimize/gson/c;->bDW:[Ljava/lang/String;
 
     return-void
 .end method
@@ -473,7 +473,7 @@
         }
     .end annotation
 
-    sget-object v0, Lproguard/optimize/gson/c;->bEb:[Ljava/lang/String;
+    sget-object v0, Lproguard/optimize/gson/c;->bDW:[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 0809352b8e..9bff545003 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 bEc:Lproguard/optimize/gson/b;
+.field private static final bDX:Lproguard/optimize/gson/b;
 
-.field private static final bEd:Lproguard/optimize/gson/c;
+.field private static final bDY: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;->bEc:Lproguard/optimize/gson/b;
+    sput-object v0, Lproguard/optimize/gson/e;->bDX: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;->bEd:Lproguard/optimize/gson/c;
+    sput-object v0, Lproguard/optimize/gson/e;->bDY:Lproguard/optimize/gson/c;
 
     return-void
 .end method
@@ -56,13 +56,13 @@
         }
     .end annotation
 
-    iget-object v0, p1, Lcom/google/gson/Gson;->aTb:Lcom/google/gson/e;
+    iget-object v0, p1, Lcom/google/gson/Gson;->aSX:Lcom/google/gson/e;
 
-    sget-object v1, Lcom/google/gson/d;->aSP:Lcom/google/gson/d;
+    sget-object v1, Lcom/google/gson/d;->aSL:Lcom/google/gson/d;
 
     if-ne v0, v1, :cond_f
 
-    iget-object v0, p2, Lcom/google/gson/reflect/TypeToken;->aWi:Ljava/lang/Class;
+    iget-object v0, p2, Lcom/google/gson/reflect/TypeToken;->aWe: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;->bEc:Lproguard/optimize/gson/b;
+    sget-object v0, Lproguard/optimize/gson/e;->bDX:Lproguard/optimize/gson/b;
 
-    sget-object v1, Lproguard/optimize/gson/e;->bEd:Lproguard/optimize/gson/c;
+    sget-object v1, Lproguard/optimize/gson/e;->bDY: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;->aWi:Ljava/lang/Class;
+    iget-object v0, p2, Lcom/google/gson/reflect/TypeToken;->aWe: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;->bEc:Lproguard/optimize/gson/b;
+    sget-object v0, Lproguard/optimize/gson/e;->bDX:Lproguard/optimize/gson/b;
 
-    sget-object v1, Lproguard/optimize/gson/e;->bEd:Lproguard/optimize/gson/c;
+    sget-object v1, Lproguard/optimize/gson/e;->bDY: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;->aWi:Ljava/lang/Class;
+    iget-object v0, p2, Lcom/google/gson/reflect/TypeToken;->aWe: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;->bEc:Lproguard/optimize/gson/b;
+    sget-object v0, Lproguard/optimize/gson/e;->bDX:Lproguard/optimize/gson/b;
 
-    sget-object v1, Lproguard/optimize/gson/e;->bEd:Lproguard/optimize/gson/c;
+    sget-object v1, Lproguard/optimize/gson/e;->bDY: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;->aWi:Ljava/lang/Class;
+    iget-object v0, p2, Lcom/google/gson/reflect/TypeToken;->aWe: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;->bEc:Lproguard/optimize/gson/b;
+    sget-object v0, Lproguard/optimize/gson/e;->bDX:Lproguard/optimize/gson/b;
 
-    sget-object v1, Lproguard/optimize/gson/e;->bEd:Lproguard/optimize/gson/c;
+    sget-object v1, Lproguard/optimize/gson/e;->bDY: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;->aWi:Ljava/lang/Class;
+    iget-object v0, p2, Lcom/google/gson/reflect/TypeToken;->aWe: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;->bEc:Lproguard/optimize/gson/b;
+    sget-object v0, Lproguard/optimize/gson/e;->bDX:Lproguard/optimize/gson/b;
 
-    sget-object v1, Lproguard/optimize/gson/e;->bEd:Lproguard/optimize/gson/c;
+    sget-object v1, Lproguard/optimize/gson/e;->bDY: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;->aWi:Ljava/lang/Class;
+    iget-object v0, p2, Lcom/google/gson/reflect/TypeToken;->aWe: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;->bEc:Lproguard/optimize/gson/b;
+    sget-object v0, Lproguard/optimize/gson/e;->bDX:Lproguard/optimize/gson/b;
 
-    sget-object v1, Lproguard/optimize/gson/e;->bEd:Lproguard/optimize/gson/c;
+    sget-object v1, Lproguard/optimize/gson/e;->bDY: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;->aWi:Ljava/lang/Class;
+    iget-object v0, p2, Lcom/google/gson/reflect/TypeToken;->aWe: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;->bEc:Lproguard/optimize/gson/b;
+    sget-object v0, Lproguard/optimize/gson/e;->bDX:Lproguard/optimize/gson/b;
 
-    sget-object v1, Lproguard/optimize/gson/e;->bEd:Lproguard/optimize/gson/c;
+    sget-object v1, Lproguard/optimize/gson/e;->bDY: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;->aWi:Ljava/lang/Class;
+    iget-object v0, p2, Lcom/google/gson/reflect/TypeToken;->aWe: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;->bEc:Lproguard/optimize/gson/b;
+    sget-object v0, Lproguard/optimize/gson/e;->bDX:Lproguard/optimize/gson/b;
 
-    sget-object v1, Lproguard/optimize/gson/e;->bEd:Lproguard/optimize/gson/c;
+    sget-object v1, Lproguard/optimize/gson/e;->bDY: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;->aWi:Ljava/lang/Class;
+    iget-object v0, p2, Lcom/google/gson/reflect/TypeToken;->aWe: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;->bEc:Lproguard/optimize/gson/b;
+    sget-object v0, Lproguard/optimize/gson/e;->bDX:Lproguard/optimize/gson/b;
 
-    sget-object v1, Lproguard/optimize/gson/e;->bEd:Lproguard/optimize/gson/c;
+    sget-object v1, Lproguard/optimize/gson/e;->bDY: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;->aWi:Ljava/lang/Class;
+    iget-object v0, p2, Lcom/google/gson/reflect/TypeToken;->aWe: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;->bEc:Lproguard/optimize/gson/b;
+    sget-object v0, Lproguard/optimize/gson/e;->bDX:Lproguard/optimize/gson/b;
 
-    sget-object v1, Lproguard/optimize/gson/e;->bEd:Lproguard/optimize/gson/c;
+    sget-object v1, Lproguard/optimize/gson/e;->bDY: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;->aWi:Ljava/lang/Class;
+    iget-object v0, p2, Lcom/google/gson/reflect/TypeToken;->aWe: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;->bEc:Lproguard/optimize/gson/b;
+    sget-object v0, Lproguard/optimize/gson/e;->bDX:Lproguard/optimize/gson/b;
 
-    sget-object v1, Lproguard/optimize/gson/e;->bEd:Lproguard/optimize/gson/c;
+    sget-object v1, Lproguard/optimize/gson/e;->bDY: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;->aWi:Ljava/lang/Class;
+    iget-object v0, p2, Lcom/google/gson/reflect/TypeToken;->aWe: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;->bEc:Lproguard/optimize/gson/b;
+    sget-object v0, Lproguard/optimize/gson/e;->bDX:Lproguard/optimize/gson/b;
 
-    sget-object v1, Lproguard/optimize/gson/e;->bEd:Lproguard/optimize/gson/c;
+    sget-object v1, Lproguard/optimize/gson/e;->bDY: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;->aWi:Ljava/lang/Class;
+    iget-object v0, p2, Lcom/google/gson/reflect/TypeToken;->aWe: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;->bEc:Lproguard/optimize/gson/b;
+    sget-object v0, Lproguard/optimize/gson/e;->bDX:Lproguard/optimize/gson/b;
 
-    sget-object v1, Lproguard/optimize/gson/e;->bEd:Lproguard/optimize/gson/c;
+    sget-object v1, Lproguard/optimize/gson/e;->bDY: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;->aWi:Ljava/lang/Class;
+    iget-object v0, p2, Lcom/google/gson/reflect/TypeToken;->aWe: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;->bEc:Lproguard/optimize/gson/b;
+    sget-object v0, Lproguard/optimize/gson/e;->bDX:Lproguard/optimize/gson/b;
 
-    sget-object v1, Lproguard/optimize/gson/e;->bEd:Lproguard/optimize/gson/c;
+    sget-object v1, Lproguard/optimize/gson/e;->bDY: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;->aWi:Ljava/lang/Class;
+    iget-object v0, p2, Lcom/google/gson/reflect/TypeToken;->aWe: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;->bEc:Lproguard/optimize/gson/b;
+    sget-object v0, Lproguard/optimize/gson/e;->bDX:Lproguard/optimize/gson/b;
 
-    sget-object v1, Lproguard/optimize/gson/e;->bEd:Lproguard/optimize/gson/c;
+    sget-object v1, Lproguard/optimize/gson/e;->bDY: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;->aWi:Ljava/lang/Class;
+    iget-object p2, p2, Lcom/google/gson/reflect/TypeToken;->aWe: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;->bEc:Lproguard/optimize/gson/b;
+    sget-object v0, Lproguard/optimize/gson/e;->bDX:Lproguard/optimize/gson/b;
 
-    sget-object v1, Lproguard/optimize/gson/e;->bEd:Lproguard/optimize/gson/c;
+    sget-object v1, Lproguard/optimize/gson/e;->bDY: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 a8ed61035f..6c08c5e484 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 bGf:Lrx/Emitter$a;
+.field public static final enum bGa:Lrx/Emitter$a;
 
-.field public static final enum bGg:Lrx/Emitter$a;
+.field public static final enum bGb:Lrx/Emitter$a;
 
-.field public static final enum bGh:Lrx/Emitter$a;
+.field public static final enum bGc:Lrx/Emitter$a;
 
-.field public static final enum bGi:Lrx/Emitter$a;
+.field public static final enum bGd:Lrx/Emitter$a;
 
-.field public static final enum bGj:Lrx/Emitter$a;
+.field public static final enum bGe:Lrx/Emitter$a;
 
-.field private static final synthetic bGk:[Lrx/Emitter$a;
+.field private static final synthetic bGf:[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;->bGf:Lrx/Emitter$a;
+    sput-object v0, Lrx/Emitter$a;->bGa: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;->bGg:Lrx/Emitter$a;
+    sput-object v0, Lrx/Emitter$a;->bGb: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;->bGh:Lrx/Emitter$a;
+    sput-object v0, Lrx/Emitter$a;->bGc: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;->bGi:Lrx/Emitter$a;
+    sput-object v0, Lrx/Emitter$a;->bGd: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;->bGj:Lrx/Emitter$a;
+    sput-object v0, Lrx/Emitter$a;->bGe:Lrx/Emitter$a;
 
     const/4 v0, 0x5
 
     new-array v0, v0, [Lrx/Emitter$a;
 
-    sget-object v6, Lrx/Emitter$a;->bGf:Lrx/Emitter$a;
+    sget-object v6, Lrx/Emitter$a;->bGa:Lrx/Emitter$a;
 
     aput-object v6, v0, v1
 
-    sget-object v1, Lrx/Emitter$a;->bGg:Lrx/Emitter$a;
+    sget-object v1, Lrx/Emitter$a;->bGb:Lrx/Emitter$a;
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lrx/Emitter$a;->bGh:Lrx/Emitter$a;
+    sget-object v1, Lrx/Emitter$a;->bGc:Lrx/Emitter$a;
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lrx/Emitter$a;->bGi:Lrx/Emitter$a;
+    sget-object v1, Lrx/Emitter$a;->bGd:Lrx/Emitter$a;
 
     aput-object v1, v0, v4
 
-    sget-object v1, Lrx/Emitter$a;->bGj:Lrx/Emitter$a;
+    sget-object v1, Lrx/Emitter$a;->bGe:Lrx/Emitter$a;
 
     aput-object v1, v0, v5
 
-    sput-object v0, Lrx/Emitter$a;->bGk:[Lrx/Emitter$a;
+    sput-object v0, Lrx/Emitter$a;->bGf:[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;->bGk:[Lrx/Emitter$a;
+    sget-object v0, Lrx/Emitter$a;->bGf:[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 cef8e24cf0..38aff12a15 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 IY()Lrx/Scheduler$Worker;
+.method public abstract IW()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 37396e6eaa..37577c1d3d 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 bFW:Lrx/a$a;
+.field static final bFR:Lrx/a$a;
 
 
 # direct methods
@@ -29,7 +29,7 @@
 
     invoke-direct {v0}, Lrx/a$a;-><init>()V
 
-    sput-object v0, Lrx/a$a;->bFW:Lrx/a$a;
+    sput-object v0, Lrx/a$a;->bFR:Lrx/a$a;
 
     return-void
 .end method
@@ -44,7 +44,7 @@
 
 
 # virtual methods
-.method public final IL()Z
+.method public final IJ()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 0e09a78587..2d3158f715 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 bFX:Lrx/a$b;
+.field static final bFS:Lrx/a$b;
 
 
 # direct methods
@@ -29,7 +29,7 @@
 
     invoke-direct {v0}, Lrx/a$b;-><init>()V
 
-    sput-object v0, Lrx/a$b;->bFX:Lrx/a$b;
+    sput-object v0, Lrx/a$b;->bFS:Lrx/a$b;
 
     return-void
 .end method
@@ -44,7 +44,7 @@
 
 
 # virtual methods
-.method public final IL()Z
+.method public final IJ()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 73e31dedf7..b92a5f5da1 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 bFY:Lrx/a$c;
+.field static final bFT:Lrx/a$c;
 
 
 # direct methods
@@ -29,7 +29,7 @@
 
     invoke-direct {v0}, Lrx/a$c;-><init>()V
 
-    sput-object v0, Lrx/a$c;->bFY:Lrx/a$c;
+    sput-object v0, Lrx/a$c;->bFT:Lrx/a$c;
 
     return-void
 .end method
@@ -44,7 +44,7 @@
 
 
 # virtual methods
-.method public final IL()Z
+.method public final IJ()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 878cbcad9a..5e1def6c78 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 IL()Z
+.method public abstract IJ()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 e38d38057f..84da72af92 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 bFS:Lrx/a$d;
+.field public static final bFN:Lrx/a$d;
 
-.field public static final bFT:Lrx/a$d;
+.field public static final bFO:Lrx/a$d;
 
-.field public static final bFU:Lrx/a$d;
+.field public static final bFP:Lrx/a$d;
 
-.field public static final bFV:Lrx/a$d;
+.field public static final bFQ:Lrx/a$d;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    sget-object v0, Lrx/a$c;->bFY:Lrx/a$c;
+    sget-object v0, Lrx/a$c;->bFT:Lrx/a$c;
 
-    sput-object v0, Lrx/a;->bFS:Lrx/a$d;
+    sput-object v0, Lrx/a;->bFN:Lrx/a$d;
 
-    sput-object v0, Lrx/a;->bFT:Lrx/a$d;
+    sput-object v0, Lrx/a;->bFO:Lrx/a$d;
 
-    sget-object v0, Lrx/a$b;->bFX:Lrx/a$b;
+    sget-object v0, Lrx/a$b;->bFS:Lrx/a$b;
 
-    sput-object v0, Lrx/a;->bFU:Lrx/a$d;
+    sput-object v0, Lrx/a;->bFP:Lrx/a$d;
 
-    sget-object v0, Lrx/a$a;->bFW:Lrx/a$a;
+    sget-object v0, Lrx/a$a;->bFR:Lrx/a$a;
 
-    sput-object v0, Lrx/a;->bFV:Lrx/a$d;
+    sput-object v0, Lrx/a;->bFQ: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 d497645ff0..a8dbc1e580 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 Jd()Ljava/lang/Object;
+.method abstract Jb()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 e2832b39a3..f3928f13ad 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 bGA:Ljava/io/PrintStream;
+.field private final bGv: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;->bGA:Ljava/io/PrintStream;
+    iput-object p1, p0, Lrx/a/a$c;->bGv:Ljava/io/PrintStream;
 
     return-void
 .end method
 
 
 # virtual methods
-.method final Jd()Ljava/lang/Object;
+.method final Jb()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lrx/a/a$c;->bGA:Ljava/io/PrintStream;
+    iget-object v0, p0, Lrx/a/a$c;->bGv: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;->bGA:Ljava/io/PrintStream;
+    iget-object v0, p0, Lrx/a/a$c;->bGv: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 8b0b06b06a..44d42a288d 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 bGB:Ljava/io/PrintWriter;
+.field private final bGw: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;->bGB:Ljava/io/PrintWriter;
+    iput-object p1, p0, Lrx/a/a$d;->bGw:Ljava/io/PrintWriter;
 
     return-void
 .end method
 
 
 # virtual methods
-.method final Jd()Ljava/lang/Object;
+.method final Jb()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lrx/a/a$d;->bGB:Ljava/io/PrintWriter;
+    iget-object v0, p0, Lrx/a/a$d;->bGw: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;->bGB:Ljava/io/PrintWriter;
+    iget-object v0, p0, Lrx/a/a$d;->bGw: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 9ddcb9d9d4..78e116239b 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;->Jd()Ljava/lang/Object;
+    invoke-virtual {p1}, Lrx/a/a$b;->Jb()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 0d6fea7af1..71d8180ac3 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 bGC:Ljava/util/Set;
+.field static final bGx: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;->bGC:Ljava/util/Set;
+    sput-object v0, Lrx/a/g$a$a;->bGx: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 dd17a653a9..68e1566de3 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;->bGC:Ljava/util/Set;
+    sget-object v1, Lrx/a/g$a$a;->bGx: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;->Kj()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Kh()Lrx/c/f;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lrx/c/f;->Kk()Lrx/c/b;
+    invoke-virtual {v1}, Lrx/c/f;->Ki()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 1049bf10a8..e6f221a97f 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 bGu:Lrx/android/a/a;
+.field private static final bGp:Lrx/android/a/a;
 
 
 # instance fields
-.field private final bGv:Ljava/util/concurrent/atomic/AtomicReference;
+.field private final bGq: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;->bGu:Lrx/android/a/a;
+    sput-object v0, Lrx/android/a/a;->bGp: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;->bGv:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object v0, p0, Lrx/android/a/a;->bGq:Ljava/util/concurrent/atomic/AtomicReference;
 
     return-void
 .end method
 
-.method public static IZ()Lrx/android/a/a;
+.method public static IX()Lrx/android/a/a;
     .locals 1
 
-    sget-object v0, Lrx/android/a/a;->bGu:Lrx/android/a/a;
+    sget-object v0, Lrx/android/a/a;->bGp:Lrx/android/a/a;
 
     return-object v0
 .end method
 
 
 # virtual methods
-.method public final Ja()Lrx/android/a/b;
+.method public final IY()Lrx/android/a/b;
     .locals 3
 
-    iget-object v0, p0, Lrx/android/a/a;->bGv:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/android/a/a;->bGq: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;->bGv:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/android/a/a;->bGq:Ljava/util/concurrent/atomic/AtomicReference;
 
     const/4 v1, 0x0
 
-    invoke-static {}, Lrx/android/a/b;->Jb()Lrx/android/a/b;
+    invoke-static {}, Lrx/android/a/b;->IZ()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;->bGv:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/android/a/a;->bGq: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 8b88b9cafb..a24e5fdedd 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 bGw:Lrx/android/a/b;
+.field private static final bGr: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;->bGw:Lrx/android/a/b;
+    sput-object v0, Lrx/android/a/b;->bGr:Lrx/android/a/b;
 
     return-void
 .end method
@@ -28,10 +28,10 @@
     return-void
 .end method
 
-.method public static Jb()Lrx/android/a/b;
+.method public static IZ()Lrx/android/a/b;
     .locals 1
 
-    sget-object v0, Lrx/android/a/b;->bGw:Lrx/android/a/b;
+    sget-object v0, Lrx/android/a/b;->bGr: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 924a3886cf..485386cc9c 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 aPZ:Ljava/util/concurrent/atomic/AtomicReference;
+.field private static final aPV: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 bGx:Lrx/Scheduler;
+.field private final bGs: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;->aPZ:Ljava/util/concurrent/atomic/AtomicReference;
+    sput-object v0, Lrx/android/b/a;->aPV: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;->IZ()Lrx/android/a/a;
+    invoke-static {}, Lrx/android/a/a;->IX()Lrx/android/a/a;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/android/a/a;->Ja()Lrx/android/a/b;
+    invoke-virtual {v0}, Lrx/android/a/a;->IY()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;->bGx:Lrx/Scheduler;
+    iput-object v0, p0, Lrx/android/b/a;->bGs:Lrx/Scheduler;
 
     return-void
 .end method
 
-.method public static Jc()Lrx/Scheduler;
+.method public static Ja()Lrx/Scheduler;
     .locals 3
 
     :cond_0
-    sget-object v0, Lrx/android/b/a;->aPZ:Ljava/util/concurrent/atomic/AtomicReference;
+    sget-object v0, Lrx/android/b/a;->aPV: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;->aPZ:Ljava/util/concurrent/atomic/AtomicReference;
+    sget-object v1, Lrx/android/b/a;->aPV: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;->bGx:Lrx/Scheduler;
+    iget-object v0, v0, Lrx/android/b/a;->bGs: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 a9c0ea8dec..21016dfea0 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 bGy:Lrx/android/a/b;
+.field private final bGt:Lrx/android/a/b;
 
-.field private volatile bGz:Z
+.field private volatile bGu: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;->IZ()Lrx/android/a/a;
+    invoke-static {}, Lrx/android/a/a;->IX()Lrx/android/a/a;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/android/a/a;->Ja()Lrx/android/a/b;
+    invoke-virtual {p1}, Lrx/android/a/a;->IY()Lrx/android/a/b;
 
     move-result-object p1
 
-    iput-object p1, p0, Lrx/android/b/b$a;->bGy:Lrx/android/a/b;
+    iput-object p1, p0, Lrx/android/b/b$a;->bGt: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;->bGz:Z
+    iget-boolean v0, p0, Lrx/android/b/b$a;->bGu:Z
 
     if-eqz v0, :cond_0
 
-    invoke-static {}, Lrx/subscriptions/c;->KC()Lrx/Subscription;
+    invoke-static {}, Lrx/subscriptions/c;->KA()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;->bGz:Z
+    iget-boolean p1, p0, Lrx/android/b/b$a;->bGu: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;->KC()Lrx/Subscription;
+    invoke-static {}, Lrx/subscriptions/c;->KA()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;->bGz:Z
+    iget-boolean v0, p0, Lrx/android/b/b$a;->bGu:Z
 
     return v0
 .end method
@@ -130,7 +130,7 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lrx/android/b/b$a;->bGz:Z
+    iput-boolean v0, p0, Lrx/android/b/b$a;->bGu: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 01098838b3..79db344ee5 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 bGz:Z
+.field private volatile bGu: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;->bGz:Z
+    iget-boolean v0, p0, Lrx/android/b/b$b;->bGu: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;->Kj()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Kh()Lrx/c/f;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/c/f;->Kk()Lrx/c/b;
+    invoke-virtual {v0}, Lrx/c/f;->Ki()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;->bGz:Z
+    iput-boolean v0, p0, Lrx/android/b/b$b;->bGu: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 a7c44db581..c73383866b 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 IY()Lrx/Scheduler$Worker;
+.method public final IW()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 a6336606a6..1a166bd356 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;->KC()Lrx/Subscription;
+    invoke-static {}, Lrx/subscriptions/c;->KA()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 617acd1471..d5f63fff76 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 bGd:Lrx/c;
+.field final synthetic bFY:Lrx/c;
 
-.field final synthetic bGe:Lrx/b$2;
+.field final synthetic bFZ:Lrx/b$2;
 
 
 # direct methods
 .method constructor <init>(Lrx/b$2;Lrx/c;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/b$2$1;->bGe:Lrx/b$2;
+    iput-object p1, p0, Lrx/b$2$1;->bFZ:Lrx/b$2;
 
-    iput-object p2, p0, Lrx/b$2$1;->bGd:Lrx/c;
+    iput-object p2, p0, Lrx/b$2$1;->bFY: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 a0d58f6d15..981edfbac2 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 bGc:Lrx/Observable;
+.field final synthetic bFX:Lrx/Observable;
 
 
 # direct methods
 .method constructor <init>(Lrx/Observable;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/b$2;->bGc:Lrx/Observable;
+    iput-object p1, p0, Lrx/b$2;->bFX: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;->bGc:Lrx/Observable;
+    iget-object p1, p0, Lrx/b$2;->bFX: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 38a9a74813..a96e806c97 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;->KC()Lrx/Subscription;
+    invoke-static {}, Lrx/subscriptions/c;->KA()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 ce389dc221..8cd0be977c 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 bGa:Lrx/b;
+.field static final bFV:Lrx/b;
 
-.field static final bGb:Lrx/b;
+.field static final bFW:Lrx/b;
 
 
 # instance fields
-.field private final bFZ:Lrx/b$a;
+.field private final bFU: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;->bGa:Lrx/b;
+    sput-object v0, Lrx/b;->bFV: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;->bGb:Lrx/b;
+    sput-object v0, Lrx/b;->bFW:Lrx/b;
 
     return-void
 .end method
@@ -60,7 +60,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lrx/b;->bFZ:Lrx/b$a;
+    iput-object p1, p0, Lrx/b;->bFU: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;->bFZ:Lrx/b$a;
+    iput-object p1, p0, Lrx/b;->bFU: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 4415c11387..10998f9fc9 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 bOa:Ljava/util/concurrent/atomic/AtomicReference;
+.field final synthetic bNV:Ljava/util/concurrent/atomic/AtomicReference;
 
-.field final synthetic bOb:Ljava/util/concurrent/atomic/AtomicReference;
+.field final synthetic bNW:Ljava/util/concurrent/atomic/AtomicReference;
 
-.field final synthetic bOc:Lrx/b/a;
+.field final synthetic bNX: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;->bOc:Lrx/b/a;
+    iput-object p1, p0, Lrx/b/a$1;->bNX: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;->bOa:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object p3, p0, Lrx/b/a$1;->bNV:Ljava/util/concurrent/atomic/AtomicReference;
 
-    iput-object p4, p0, Lrx/b/a$1;->bOb:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object p4, p0, Lrx/b/a$1;->bNW: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;->bOa:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/b/a$1;->bNV: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;->bOb:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/b/a$1;->bNW: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 c38e55985e..2b9f78b11f 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 bNX:Ljava/lang/Object;
+.field static final bNS:Ljava/lang/Object;
 
-.field static final bNY:Ljava/lang/Object;
+.field static final bNT:Ljava/lang/Object;
 
-.field static final bNZ:Ljava/lang/Object;
+.field static final bNU:Ljava/lang/Object;
 
 
 # instance fields
-.field public final bNW:Lrx/Observable;
+.field public final bNR: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;->bNX:Ljava/lang/Object;
+    sput-object v0, Lrx/b/a;->bNS:Ljava/lang/Object;
 
     new-instance v0, Ljava/lang/Object;
 
     invoke-direct {v0}, Ljava/lang/Object;-><init>()V
 
-    sput-object v0, Lrx/b/a;->bNY:Ljava/lang/Object;
+    sput-object v0, Lrx/b/a;->bNT:Ljava/lang/Object;
 
     new-instance v0, Ljava/lang/Object;
 
     invoke-direct {v0}, Ljava/lang/Object;-><init>()V
 
-    sput-object v0, Lrx/b/a;->bNZ:Ljava/lang/Object;
+    sput-object v0, Lrx/b/a;->bNU: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;->bNW:Lrx/Observable;
+    iput-object p1, p0, Lrx/b/a;->bNR:Lrx/Observable;
 
     return-void
 .end method
@@ -154,7 +154,7 @@
 
 
 # virtual methods
-.method public final Ke()Ljava/lang/Object;
+.method public final Kc()Ljava/lang/Object;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -162,9 +162,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/b/a;->bNW:Lrx/Observable;
+    iget-object v0, p0, Lrx/b/a;->bNR:Lrx/Observable;
 
-    invoke-static {}, Lrx/internal/a/aq;->JG()Lrx/internal/a/aq;
+    invoke-static {}, Lrx/internal/a/aq;->JE()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 857985ed4a..b5c9359952 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 Kf()Lrx/Observable;
+.method public final Kd()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 abfc62ba6e..3bf9767485 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;->Kj()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Kh()Lrx/c/f;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/c/f;->Kk()Lrx/c/b;
+    invoke-virtual {p1}, Lrx/c/f;->Ki()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 252edf2f4e..827b350881 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;->Kj()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Kh()Lrx/c/f;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/c/f;->Kl()Lrx/c/d;
+    invoke-virtual {v0}, Lrx/c/f;->Kj()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 1120e04a1a..ef45d69579 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;->Kj()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Kh()Lrx/c/f;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/c/f;->Km()Lrx/c/h;
+    invoke-virtual {p1}, Lrx/c/f;->Kk()Lrx/c/h;
 
     move-result-object p1
 
-    invoke-static {}, Lrx/c/i;->Kt()Lrx/c/h;
+    invoke-static {}, Lrx/c/i;->Kr()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 1304a66b20..e9a008ab8e 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;->Kj()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Kh()Lrx/c/f;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/c/f;->Km()Lrx/c/h;
+    invoke-virtual {v0}, Lrx/c/f;->Kk()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 1d645da90d..00451341db 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;->Kj()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Kh()Lrx/c/f;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/c/f;->Kn()Lrx/c/a;
+    invoke-virtual {p1}, Lrx/c/f;->Kl()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 42eadc3ef8..75b9afe370 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;->Kj()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Kh()Lrx/c/f;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/c/f;->Ko()Lrx/c/g;
+    invoke-virtual {v0}, Lrx/c/f;->Km()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 f477455516..d50809f0e3 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;->Kj()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Kh()Lrx/c/f;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/c/f;->Kl()Lrx/c/d;
+    invoke-virtual {v0}, Lrx/c/f;->Kj()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 52d0c35c5e..e30568c92c 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;->Kj()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Kh()Lrx/c/f;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/c/f;->Kl()Lrx/c/d;
+    invoke-virtual {v0}, Lrx/c/f;->Kj()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 48ad5675b0..f852244373 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;->Kj()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Kh()Lrx/c/f;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/c/f;->Km()Lrx/c/h;
+    invoke-virtual {v0}, Lrx/c/f;->Kk()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 9b3e83f021..12e457d9cb 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;->Kj()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Kh()Lrx/c/f;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/c/f;->Km()Lrx/c/h;
+    invoke-virtual {v0}, Lrx/c/f;->Kk()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 4039bb7e9e..45d36c93bf 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;->Kj()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Kh()Lrx/c/f;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/c/f;->Kn()Lrx/c/a;
+    invoke-virtual {v0}, Lrx/c/f;->Kl()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 cf81fdd140..ff43bd8c3d 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;->Kj()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Kh()Lrx/c/f;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/c/f;->Kn()Lrx/c/a;
+    invoke-virtual {v0}, Lrx/c/f;->Kl()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 93cd6f9b8d..7d172daf55 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;->Kj()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Kh()Lrx/c/f;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/c/f;->Kl()Lrx/c/d;
+    invoke-virtual {v0}, Lrx/c/f;->Kj()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 d2c14d18e1..b0afe456d5 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;->Kj()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Kh()Lrx/c/f;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/c/f;->Km()Lrx/c/h;
+    invoke-virtual {v0}, Lrx/c/f;->Kk()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 ada95c669c..1bc16b4436 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;->Kj()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Kh()Lrx/c/f;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/c/f;->Kn()Lrx/c/a;
+    invoke-virtual {v0}, Lrx/c/f;->Kl()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 48563d3422..b28808fef7 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;->Kj()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Kh()Lrx/c/f;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/c/f;->Kl()Lrx/c/d;
+    invoke-virtual {p1}, Lrx/c/f;->Kj()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 b6decf2318..d959488cef 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 bMO:Lrx/functions/Action1;
+.field static volatile bMJ:Lrx/functions/Action1;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/Action1<",
@@ -14,7 +14,7 @@
     .end annotation
 .end field
 
-.field static volatile bOi:Lrx/functions/b;
+.field static volatile bOd:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -25,7 +25,7 @@
     .end annotation
 .end field
 
-.field static volatile bOj:Lrx/functions/b;
+.field static volatile bOe:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -36,7 +36,7 @@
     .end annotation
 .end field
 
-.field static volatile bOk:Lrx/functions/b;
+.field static volatile bOf:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -47,7 +47,7 @@
     .end annotation
 .end field
 
-.field static volatile bOl:Lrx/functions/Func2;
+.field static volatile bOg:Lrx/functions/Func2;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/Func2<",
@@ -59,7 +59,7 @@
     .end annotation
 .end field
 
-.field static volatile bOm:Lrx/functions/Func2;
+.field static volatile bOh:Lrx/functions/Func2;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/Func2<",
@@ -71,7 +71,7 @@
     .end annotation
 .end field
 
-.field static volatile bOn:Lrx/functions/Func2;
+.field static volatile bOi:Lrx/functions/Func2;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/Func2<",
@@ -83,7 +83,7 @@
     .end annotation
 .end field
 
-.field static volatile bOo:Lrx/functions/b;
+.field static volatile bOj:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -94,7 +94,7 @@
     .end annotation
 .end field
 
-.field static volatile bOp:Lrx/functions/b;
+.field static volatile bOk:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -105,7 +105,7 @@
     .end annotation
 .end field
 
-.field static volatile bOq:Lrx/functions/b;
+.field static volatile bOl:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -116,7 +116,7 @@
     .end annotation
 .end field
 
-.field static volatile bOr:Lrx/functions/b;
+.field static volatile bOm:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -127,7 +127,7 @@
     .end annotation
 .end field
 
-.field static volatile bOs:Lrx/functions/b;
+.field static volatile bOn:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -138,7 +138,7 @@
     .end annotation
 .end field
 
-.field static volatile bOt:Lrx/functions/Func0;
+.field static volatile bOo:Lrx/functions/Func0;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/Func0<",
@@ -149,62 +149,62 @@
     .end annotation
 .end field
 
+.field static volatile bOp:Lrx/functions/b;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/functions/b<",
+            "Ljava/lang/Throwable;",
+            "Ljava/lang/Throwable;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field static volatile bOq:Lrx/functions/b;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/functions/b<",
+            "Ljava/lang/Throwable;",
+            "Ljava/lang/Throwable;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field static volatile bOr:Lrx/functions/b;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/functions/b<",
+            "Ljava/lang/Throwable;",
+            "Ljava/lang/Throwable;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field static volatile bOs:Lrx/functions/b;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/functions/b<",
+            "Lrx/Observable$b;",
+            "Lrx/Observable$b;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field static volatile bOt:Lrx/functions/b;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/functions/b<",
+            "Lrx/Observable$b;",
+            "Lrx/Observable$b;",
+            ">;"
+        }
+    .end annotation
+.end field
+
 .field static volatile bOu:Lrx/functions/b;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/functions/b<",
-            "Ljava/lang/Throwable;",
-            "Ljava/lang/Throwable;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field static volatile bOv:Lrx/functions/b;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/functions/b<",
-            "Ljava/lang/Throwable;",
-            "Ljava/lang/Throwable;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field static volatile bOw:Lrx/functions/b;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/functions/b<",
-            "Ljava/lang/Throwable;",
-            "Ljava/lang/Throwable;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field static volatile bOx:Lrx/functions/b;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/functions/b<",
-            "Lrx/Observable$b;",
-            "Lrx/Observable$b;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field static volatile bOy:Lrx/functions/b;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/functions/b<",
-            "Lrx/Observable$b;",
-            "Lrx/Observable$b;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.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;->bMO:Lrx/functions/Action1;
+    sput-object v0, Lrx/c/c;->bMJ: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;->bOl:Lrx/functions/Func2;
+    sput-object v0, Lrx/c/c;->bOg: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;->bOr:Lrx/functions/b;
+    sput-object v0, Lrx/c/c;->bOm: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;->bOm:Lrx/functions/Func2;
+    sput-object v0, Lrx/c/c;->bOh: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;->bOs:Lrx/functions/b;
+    sput-object v0, Lrx/c/c;->bOn: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;->bOn:Lrx/functions/Func2;
+    sput-object v0, Lrx/c/c;->bOi: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;->bOq:Lrx/functions/b;
+    sput-object v0, Lrx/c/c;->bOl: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;->bOu:Lrx/functions/b;
+    sput-object v0, Lrx/c/c;->bOp: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;->bOx:Lrx/functions/b;
+    sput-object v0, Lrx/c/c;->bOs: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;->bOv:Lrx/functions/b;
+    sput-object v0, Lrx/c/c;->bOq: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;->bOy:Lrx/functions/b;
+    sput-object v0, Lrx/c/c;->bOt: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;->bOw:Lrx/functions/b;
+    sput-object v0, Lrx/c/c;->bOr: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;->bOz:Lrx/functions/b;
+    sput-object v0, Lrx/c/c;->bOu: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;->bOi:Lrx/functions/b;
+    sput-object v0, Lrx/c/c;->bOd: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;->bOj:Lrx/functions/b;
+    sput-object v0, Lrx/c/c;->bOe: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;->bOk:Lrx/functions/b;
+    sput-object v0, Lrx/c/c;->bOf:Lrx/functions/b;
 
     return-void
 .end method
 
-.method public static Kh()Lrx/functions/Func0;
+.method public static Kf()Lrx/functions/Func0;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -331,7 +331,7 @@
         }
     .end annotation
 
-    sget-object v0, Lrx/c/c;->bOt:Lrx/functions/Func0;
+    sget-object v0, Lrx/c/c;->bOo: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;->bOu:Lrx/functions/b;
+    sget-object v0, Lrx/c/c;->bOp:Lrx/functions/b;
 
     if-eqz v0, :cond_0
 
@@ -385,7 +385,7 @@
         }
     .end annotation
 
-    sget-object v0, Lrx/c/c;->bOl:Lrx/functions/Func2;
+    sget-object v0, Lrx/c/c;->bOg:Lrx/functions/Func2;
 
     if-eqz v0, :cond_0
 
@@ -415,7 +415,7 @@
         }
     .end annotation
 
-    sget-object v0, Lrx/c/c;->bOj:Lrx/functions/b;
+    sget-object v0, Lrx/c/c;->bOe:Lrx/functions/b;
 
     if-eqz v0, :cond_0
 
@@ -445,7 +445,7 @@
         }
     .end annotation
 
-    sget-object v0, Lrx/c/c;->bOx:Lrx/functions/b;
+    sget-object v0, Lrx/c/c;->bOs: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;->bOk:Lrx/functions/b;
+    sget-object v0, Lrx/c/c;->bOf:Lrx/functions/b;
 
     if-eqz v0, :cond_0
 
@@ -490,7 +490,7 @@
         }
     .end annotation
 
-    sget-object v0, Lrx/c/c;->bOi:Lrx/functions/b;
+    sget-object v0, Lrx/c/c;->bOd:Lrx/functions/b;
 
     if-eqz v0, :cond_0
 
@@ -520,7 +520,7 @@
         }
     .end annotation
 
-    sget-object v0, Lrx/c/c;->bOy:Lrx/functions/b;
+    sget-object v0, Lrx/c/c;->bOt: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;->bOr:Lrx/functions/b;
+    sget-object v0, Lrx/c/c;->bOm: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;->bOo:Lrx/functions/b;
+    sget-object v0, Lrx/c/c;->bOj: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;->bOp:Lrx/functions/b;
+    sget-object v0, Lrx/c/c;->bOk: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;->bOq:Lrx/functions/b;
+    sget-object v0, Lrx/c/c;->bOl: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;->bMO:Lrx/functions/Action1;
+    sget-object v0, Lrx/c/c;->bMJ: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 66f3698f5f..2f901dd9d9 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 bOA:Lrx/c/e;
+.field private static final bOv:Lrx/c/e;
 
 
 # direct methods
@@ -15,7 +15,7 @@
 
     invoke-direct {v0}, Lrx/c/e;-><init>()V
 
-    sput-object v0, Lrx/c/e;->bOA:Lrx/c/e;
+    sput-object v0, Lrx/c/e;->bOv:Lrx/c/e;
 
     return-void
 .end method
@@ -28,10 +28,10 @@
     return-void
 .end method
 
-.method public static Ki()Lrx/c/d;
+.method public static Kg()Lrx/c/d;
     .locals 1
 
-    sget-object v0, Lrx/c/e;->bOA:Lrx/c/e;
+    sget-object v0, Lrx/c/e;->bOv: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 60774e9d96..a842c79528 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;->Kn()Lrx/c/a;
+    value = Lrx/c/f;->Kl()Lrx/c/a;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -15,14 +15,14 @@
 
 
 # instance fields
-.field final synthetic bOH:Lrx/c/f;
+.field final synthetic bOC:Lrx/c/f;
 
 
 # direct methods
 .method constructor <init>(Lrx/c/f;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/c/f$2;->bOH:Lrx/c/f;
+    iput-object p1, p0, Lrx/c/f$2;->bOC: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 981f5bc41e..2131631286 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 bOB:Lrx/c/f;
+.field static final bOB:Lrx/c/b;
 
-.field static final bOG:Lrx/c/b;
+.field private static final bOw:Lrx/c/f;
 
 
 # instance fields
-.field private final bGv:Ljava/util/concurrent/atomic/AtomicReference;
+.field private final bGq:Ljava/util/concurrent/atomic/AtomicReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReference<",
@@ -20,7 +20,17 @@
     .end annotation
 .end field
 
-.field private final bOC:Ljava/util/concurrent/atomic/AtomicReference;
+.field private final bOA:Ljava/util/concurrent/atomic/AtomicReference;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/concurrent/atomic/AtomicReference<",
+            "Lrx/c/a;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private final bOx:Ljava/util/concurrent/atomic/AtomicReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReference<",
@@ -30,7 +40,7 @@
     .end annotation
 .end field
 
-.field private final bOD:Ljava/util/concurrent/atomic/AtomicReference;
+.field private final bOy:Ljava/util/concurrent/atomic/AtomicReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReference<",
@@ -40,7 +50,7 @@
     .end annotation
 .end field
 
-.field private final bOE:Ljava/util/concurrent/atomic/AtomicReference;
+.field private final bOz:Ljava/util/concurrent/atomic/AtomicReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReference<",
@@ -50,16 +60,6 @@
     .end annotation
 .end field
 
-.field private final bOF:Ljava/util/concurrent/atomic/AtomicReference;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/concurrent/atomic/AtomicReference<",
-            "Lrx/c/a;",
-            ">;"
-        }
-    .end annotation
-.end field
-
 
 # direct methods
 .method static constructor <clinit>()V
@@ -69,13 +69,13 @@
 
     invoke-direct {v0}, Lrx/c/f;-><init>()V
 
-    sput-object v0, Lrx/c/f;->bOB:Lrx/c/f;
+    sput-object v0, Lrx/c/f;->bOw: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;->bOG:Lrx/c/b;
+    sput-object v0, Lrx/c/f;->bOB: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;->bOC:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object v0, p0, Lrx/c/f;->bOx: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;->bOD:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object v0, p0, Lrx/c/f;->bOy: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;->bOE:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object v0, p0, Lrx/c/f;->bOz: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;->bOF:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object v0, p0, Lrx/c/f;->bOA: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;->bGv:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object v0, p0, Lrx/c/f;->bGq:Ljava/util/concurrent/atomic/AtomicReference;
 
     return-void
 .end method
 
-.method public static Kj()Lrx/c/f;
+.method public static Kh()Lrx/c/f;
     .locals 1
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 
-    sget-object v0, Lrx/c/f;->bOB:Lrx/c/f;
+    sget-object v0, Lrx/c/f;->bOw:Lrx/c/f;
 
     return-object v0
 .end method
@@ -439,10 +439,10 @@
 
 
 # virtual methods
-.method public final Kk()Lrx/c/b;
+.method public final Ki()Lrx/c/b;
     .locals 3
 
-    iget-object v0, p0, Lrx/c/f;->bOC:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/c/f;->bOx: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;->bOC:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/c/f;->bOx:Ljava/util/concurrent/atomic/AtomicReference;
 
-    sget-object v2, Lrx/c/f;->bOG:Lrx/c/b;
+    sget-object v2, Lrx/c/f;->bOB: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;->bOC:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lrx/c/f;->bOx: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;->bOC:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/c/f;->bOx: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 Kl()Lrx/c/d;
+.method public final Kj()Lrx/c/d;
     .locals 3
 
-    iget-object v0, p0, Lrx/c/f;->bOD:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/c/f;->bOy: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;->bOD:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/c/f;->bOy:Ljava/util/concurrent/atomic/AtomicReference;
 
-    invoke-static {}, Lrx/c/e;->Ki()Lrx/c/d;
+    invoke-static {}, Lrx/c/e;->Kg()Lrx/c/d;
 
     move-result-object v2
 
@@ -528,7 +528,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object v2, p0, Lrx/c/f;->bOD:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lrx/c/f;->bOy: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;->bOD:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/c/f;->bOy: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 Km()Lrx/c/h;
+.method public final Kk()Lrx/c/h;
     .locals 3
 
-    iget-object v0, p0, Lrx/c/f;->bOE:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/c/f;->bOz: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;->bOE:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/c/f;->bOz:Ljava/util/concurrent/atomic/AtomicReference;
 
-    invoke-static {}, Lrx/c/i;->Kt()Lrx/c/h;
+    invoke-static {}, Lrx/c/i;->Kr()Lrx/c/h;
 
     move-result-object v2
 
@@ -583,7 +583,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object v2, p0, Lrx/c/f;->bOE:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lrx/c/f;->bOz: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;->bOE:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/c/f;->bOz: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 Kn()Lrx/c/a;
+.method public final Kl()Lrx/c/a;
     .locals 3
 
-    iget-object v0, p0, Lrx/c/f;->bOF:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/c/f;->bOA: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;->bOF:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/c/f;->bOA: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;->bOF:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lrx/c/f;->bOA: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;->bOF:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/c/f;->bOA: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 Ko()Lrx/c/g;
+.method public final Km()Lrx/c/g;
     .locals 3
 
-    iget-object v0, p0, Lrx/c/f;->bGv:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/c/f;->bGq: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;->bGv:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/c/f;->bGq:Ljava/util/concurrent/atomic/AtomicReference;
 
-    invoke-static {}, Lrx/c/g;->Ks()Lrx/c/g;
+    invoke-static {}, Lrx/c/g;->Kq()Lrx/c/g;
 
     move-result-object v2
 
@@ -693,7 +693,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object v2, p0, Lrx/c/f;->bGv:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lrx/c/f;->bGq: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;->bGv:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/c/f;->bGq: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 7377399b88..be7a591b38 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 bOI:Lrx/c/g;
+.field private static final bOD:Lrx/c/g;
 
 
 # direct methods
@@ -15,7 +15,7 @@
 
     invoke-direct {v0}, Lrx/c/g;-><init>()V
 
-    sput-object v0, Lrx/c/g;->bOI:Lrx/c/g;
+    sput-object v0, Lrx/c/g;->bOD:Lrx/c/g;
 
     return-void
 .end method
@@ -28,7 +28,7 @@
     return-void
 .end method
 
-.method public static Kp()Lrx/Scheduler;
+.method public static Kn()Lrx/Scheduler;
     .locals 2
 
     new-instance v0, Lrx/internal/util/j;
@@ -44,7 +44,7 @@
     return-object v1
 .end method
 
-.method public static Kq()Lrx/Scheduler;
+.method public static Ko()Lrx/Scheduler;
     .locals 2
 
     new-instance v0, Lrx/internal/util/j;
@@ -60,7 +60,7 @@
     return-object v1
 .end method
 
-.method public static Kr()Lrx/Scheduler;
+.method public static Kp()Lrx/Scheduler;
     .locals 2
 
     new-instance v0, Lrx/internal/util/j;
@@ -76,10 +76,10 @@
     return-object v1
 .end method
 
-.method public static Ks()Lrx/c/g;
+.method public static Kq()Lrx/c/g;
     .locals 1
 
-    sget-object v0, Lrx/c/g;->bOI:Lrx/c/g;
+    sget-object v0, Lrx/c/g;->bOD: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 0bbc6c2a51..95b345acdc 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 bOJ:Lrx/c/i;
+.field private static final bOE:Lrx/c/i;
 
 
 # direct methods
@@ -15,7 +15,7 @@
 
     invoke-direct {v0}, Lrx/c/i;-><init>()V
 
-    sput-object v0, Lrx/c/i;->bOJ:Lrx/c/i;
+    sput-object v0, Lrx/c/i;->bOE:Lrx/c/i;
 
     return-void
 .end method
@@ -28,10 +28,10 @@
     return-void
 .end method
 
-.method public static Kt()Lrx/c/h;
+.method public static Kr()Lrx/c/h;
     .locals 1
 
-    sget-object v0, Lrx/c/i;->bOJ:Lrx/c/i;
+    sget-object v0, Lrx/c/i;->bOE: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 a923e08fb1..f435535757 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 bGn:Lrx/d$a;
+.field public static final enum bGi:Lrx/d$a;
 
-.field public static final enum bGo:Lrx/d$a;
+.field public static final enum bGj:Lrx/d$a;
 
-.field public static final enum bGp:Lrx/d$a;
+.field public static final enum bGk:Lrx/d$a;
 
-.field private static final synthetic bGq:[Lrx/d$a;
+.field private static final synthetic bGl:[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;->bGn:Lrx/d$a;
+    sput-object v0, Lrx/d$a;->bGi: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;->bGo:Lrx/d$a;
+    sput-object v0, Lrx/d$a;->bGj: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;->bGp:Lrx/d$a;
+    sput-object v0, Lrx/d$a;->bGk:Lrx/d$a;
 
     const/4 v0, 0x3
 
     new-array v0, v0, [Lrx/d$a;
 
-    sget-object v4, Lrx/d$a;->bGn:Lrx/d$a;
+    sget-object v4, Lrx/d$a;->bGi:Lrx/d$a;
 
     aput-object v4, v0, v1
 
-    sget-object v1, Lrx/d$a;->bGo:Lrx/d$a;
+    sget-object v1, Lrx/d$a;->bGj:Lrx/d$a;
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lrx/d$a;->bGp:Lrx/d$a;
+    sget-object v1, Lrx/d$a;->bGk:Lrx/d$a;
 
     aput-object v1, v0, v3
 
-    sput-object v0, Lrx/d$a;->bGq:[Lrx/d$a;
+    sput-object v0, Lrx/d$a;->bGl:[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;->bGq:[Lrx/d$a;
+    sget-object v0, Lrx/d$a;->bGl:[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 16ceb5548d..8646feb311 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 bGm:Lrx/d;
+.field private static final bGh:Lrx/d;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/d<",
@@ -33,7 +33,7 @@
 
 
 # instance fields
-.field public final bGl:Lrx/d$a;
+.field public final bGg: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;->bGp:Lrx/d$a;
+    sget-object v1, Lrx/d$a;->bGk: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;->bGm:Lrx/d;
+    sput-object v0, Lrx/d;->bGh: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;->bGl:Lrx/d$a;
+    iput-object p1, p0, Lrx/d;->bGg:Lrx/d$a;
 
     return-void
 .end method
@@ -104,7 +104,7 @@
 
     new-instance v0, Lrx/d;
 
-    sget-object v1, Lrx/d$a;->bGo:Lrx/d$a;
+    sget-object v1, Lrx/d$a;->bGj:Lrx/d$a;
 
     const/4 v2, 0x0
 
@@ -113,7 +113,7 @@
     return-object v0
 .end method
 
-.method public static IM()Lrx/d;
+.method public static IK()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;->bGn:Lrx/d$a;
+    sget-object v1, Lrx/d$a;->bGi:Lrx/d$a;
 
     const/4 v2, 0x0
 
@@ -136,7 +136,7 @@
     return-object v0
 .end method
 
-.method public static IN()Lrx/d;
+.method public static IL()Lrx/d;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -148,17 +148,17 @@
         }
     .end annotation
 
-    sget-object v0, Lrx/d;->bGm:Lrx/d;
+    sget-object v0, Lrx/d;->bGh:Lrx/d;
 
     return-object v0
 .end method
 
-.method private IO()Z
+.method private IM()Z
     .locals 4
 
-    iget-object v0, p0, Lrx/d;->bGl:Lrx/d$a;
+    iget-object v0, p0, Lrx/d;->bGg:Lrx/d$a;
 
-    sget-object v1, Lrx/d$a;->bGn:Lrx/d$a;
+    sget-object v1, Lrx/d$a;->bGi:Lrx/d$a;
 
     const/4 v2, 0x1
 
@@ -186,10 +186,10 @@
     return v3
 .end method
 
-.method private IP()Z
+.method private IN()Z
     .locals 1
 
-    invoke-virtual {p0}, Lrx/d;->IQ()Z
+    invoke-virtual {p0}, Lrx/d;->IO()Z
 
     move-result v0
 
@@ -211,12 +211,12 @@
 
 
 # virtual methods
-.method public final IQ()Z
+.method public final IO()Z
     .locals 2
 
-    iget-object v0, p0, Lrx/d;->bGl:Lrx/d$a;
+    iget-object v0, p0, Lrx/d;->bGg:Lrx/d$a;
 
-    sget-object v1, Lrx/d$a;->bGo:Lrx/d$a;
+    sget-object v1, Lrx/d$a;->bGj: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;->bGl:Lrx/d$a;
+    iget-object v2, p1, Lrx/d;->bGg:Lrx/d$a;
 
-    iget-object v3, p0, Lrx/d;->bGl:Lrx/d$a;
+    iget-object v3, p0, Lrx/d;->bGg: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;->bGl:Lrx/d$a;
+    iget-object v0, p0, Lrx/d;->bGg:Lrx/d$a;
 
     invoke-virtual {v0}, Lrx/d$a;->hashCode()I
 
     move-result v0
 
-    invoke-direct {p0}, Lrx/d;->IO()Z
+    invoke-direct {p0}, Lrx/d;->IM()Z
 
     move-result v1
 
@@ -330,7 +330,7 @@
     add-int/2addr v0, v1
 
     :cond_0
-    invoke-direct {p0}, Lrx/d;->IP()Z
+    invoke-direct {p0}, Lrx/d;->IN()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;->bGl:Lrx/d$a;
+    iget-object v2, p0, Lrx/d;->bGg:Lrx/d$a;
 
     invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
-    invoke-direct {p0}, Lrx/d;->IO()Z
+    invoke-direct {p0}, Lrx/d;->IM()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;->IP()Z
+    invoke-direct {p0}, Lrx/d;->IN()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 5200421757..92e740ca06 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 aPZ:Ljava/util/concurrent/atomic/AtomicReference;
+.field private static final aPV: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 bOK:Lrx/Scheduler;
+.field private final bOF:Lrx/Scheduler;
 
-.field private final bOL:Lrx/Scheduler;
+.field private final bOG:Lrx/Scheduler;
 
-.field private final bOM:Lrx/Scheduler;
+.field private final bOH:Lrx/Scheduler;
 
 
 # direct methods
@@ -31,7 +31,7 @@
 
     invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
 
-    sput-object v0, Lrx/d/a;->aPZ:Ljava/util/concurrent/atomic/AtomicReference;
+    sput-object v0, Lrx/d/a;->aPV: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;->Kj()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Kh()Lrx/c/f;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/c/f;->Ko()Lrx/c/g;
+    invoke-virtual {v0}, Lrx/c/f;->Km()Lrx/c/g;
+
+    invoke-static {}, Lrx/c/g;->Kn()Lrx/Scheduler;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lrx/d/a;->bOF:Lrx/Scheduler;
+
+    invoke-static {}, Lrx/c/g;->Ko()Lrx/Scheduler;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lrx/d/a;->bOG:Lrx/Scheduler;
 
     invoke-static {}, Lrx/c/g;->Kp()Lrx/Scheduler;
 
     move-result-object v0
 
-    iput-object v0, p0, Lrx/d/a;->bOK:Lrx/Scheduler;
-
-    invoke-static {}, Lrx/c/g;->Kq()Lrx/Scheduler;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lrx/d/a;->bOL:Lrx/Scheduler;
-
-    invoke-static {}, Lrx/c/g;->Kr()Lrx/Scheduler;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lrx/d/a;->bOM:Lrx/Scheduler;
+    iput-object v0, p0, Lrx/d/a;->bOH:Lrx/Scheduler;
 
     return-void
 .end method
 
-.method private static Ku()Lrx/d/a;
+.method private static Ks()Lrx/d/a;
     .locals 3
 
     :goto_0
-    sget-object v0, Lrx/d/a;->aPZ:Ljava/util/concurrent/atomic/AtomicReference;
+    sget-object v0, Lrx/d/a;->aPV: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;->aPZ:Ljava/util/concurrent/atomic/AtomicReference;
+    sget-object v1, Lrx/d/a;->aPV:Ljava/util/concurrent/atomic/AtomicReference;
 
     const/4 v2, 0x0
 
@@ -102,27 +102,27 @@
     return-object v0
 
     :cond_1
-    invoke-direct {v0}, Lrx/d/a;->Ky()V
+    invoke-direct {v0}, Lrx/d/a;->Kw()V
 
     goto :goto_0
 .end method
 
-.method public static Kv()Lrx/Scheduler;
+.method public static Kt()Lrx/Scheduler;
     .locals 1
 
-    sget-object v0, Lrx/internal/c/m;->bMF:Lrx/internal/c/m;
+    sget-object v0, Lrx/internal/c/m;->bMA:Lrx/internal/c/m;
 
     return-object v0
 .end method
 
-.method public static Kw()Lrx/Scheduler;
+.method public static Ku()Lrx/Scheduler;
     .locals 1
 
-    invoke-static {}, Lrx/d/a;->Ku()Lrx/d/a;
+    invoke-static {}, Lrx/d/a;->Ks()Lrx/d/a;
 
     move-result-object v0
 
-    iget-object v0, v0, Lrx/d/a;->bOK:Lrx/Scheduler;
+    iget-object v0, v0, Lrx/d/a;->bOF: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 Kx()Lrx/Scheduler;
+.method public static Kv()Lrx/Scheduler;
     .locals 1
 
-    invoke-static {}, Lrx/d/a;->Ku()Lrx/d/a;
+    invoke-static {}, Lrx/d/a;->Ks()Lrx/d/a;
 
     move-result-object v0
 
-    iget-object v0, v0, Lrx/d/a;->bOL:Lrx/Scheduler;
+    iget-object v0, v0, Lrx/d/a;->bOG: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 Ky()V
+.method private declared-synchronized Kw()V
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lrx/d/a;->bOK:Lrx/Scheduler;
+    iget-object v0, p0, Lrx/d/a;->bOF:Lrx/Scheduler;
 
     instance-of v0, v0, Lrx/internal/c/k;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lrx/d/a;->bOK:Lrx/Scheduler;
+    iget-object v0, p0, Lrx/d/a;->bOF: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;->bOL:Lrx/Scheduler;
+    iget-object v0, p0, Lrx/d/a;->bOG:Lrx/Scheduler;
 
     instance-of v0, v0, Lrx/internal/c/k;
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lrx/d/a;->bOL:Lrx/Scheduler;
+    iget-object v0, p0, Lrx/d/a;->bOG: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;->bOM:Lrx/Scheduler;
+    iget-object v0, p0, Lrx/d/a;->bOH:Lrx/Scheduler;
 
     instance-of v0, v0, Lrx/internal/c/k;
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lrx/d/a;->bOM:Lrx/Scheduler;
+    iget-object v0, p0, Lrx/d/a;->bOH: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 4ae7363a26..43f94e5529 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 bGs:Lrx/f$a;
+.field final bGn: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;->bGs:Lrx/f$a;
+    iput-object p1, p0, Lrx/f;->bGn: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 1b3cb204fe..bc23435688 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 bGD:Lrx/functions/a$b;
+.field private static final bGy: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;->bGD:Lrx/functions/a$b;
+    sput-object v0, Lrx/functions/a;->bGy:Lrx/functions/a$b;
 
     return-void
 .end method
 
-.method public static Je()Lrx/functions/a$b;
+.method public static Jc()Lrx/functions/a$b;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -57,7 +57,7 @@
         }
     .end annotation
 
-    sget-object v0, Lrx/functions/a;->bGD:Lrx/functions/a$b;
+    sget-object v0, Lrx/functions/a;->bGy: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 735319e324..bcdf0a1b6d 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 bGE:Lrx/functions/Func9;
+.field final synthetic bGz:Lrx/functions/Func9;
 
 
 # direct methods
 .method constructor <init>(Lrx/functions/Func9;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/functions/c$1;->bGE:Lrx/functions/Func9;
+    iput-object p1, p0, Lrx/functions/c$1;->bGz: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;->bGE:Lrx/functions/Func9;
+    iget-object v2, p0, Lrx/functions/c$1;->bGz: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 96164d9218..181e05844a 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 bGF:Lrx/functions/Func2;
+.field final synthetic bGA:Lrx/functions/Func2;
 
 
 # direct methods
 .method constructor <init>(Lrx/functions/Func2;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/functions/c$2;->bGF:Lrx/functions/Func2;
+    iput-object p1, p0, Lrx/functions/c$2;->bGA: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;->bGF:Lrx/functions/Func2;
+    iget-object v0, p0, Lrx/functions/c$2;->bGA: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 aad188c4f2..787cd11c8c 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 bGG:Lrx/functions/Func3;
+.field final synthetic bGB:Lrx/functions/Func3;
 
 
 # direct methods
 .method constructor <init>(Lrx/functions/Func3;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/functions/c$3;->bGG:Lrx/functions/Func3;
+    iput-object p1, p0, Lrx/functions/c$3;->bGB: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;->bGG:Lrx/functions/Func3;
+    iget-object v0, p0, Lrx/functions/c$3;->bGB: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 70173791f3..42b0cd351a 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 bGH:Lrx/functions/Func4;
+.field final synthetic bGC:Lrx/functions/Func4;
 
 
 # direct methods
 .method constructor <init>(Lrx/functions/Func4;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/functions/c$4;->bGH:Lrx/functions/Func4;
+    iput-object p1, p0, Lrx/functions/c$4;->bGC: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;->bGH:Lrx/functions/Func4;
+    iget-object v0, p0, Lrx/functions/c$4;->bGC: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 11f69bc86a..ef7e08211d 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 bGI:Lrx/functions/Func5;
+.field final synthetic bGD:Lrx/functions/Func5;
 
 
 # direct methods
 .method constructor <init>(Lrx/functions/Func5;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/functions/c$5;->bGI:Lrx/functions/Func5;
+    iput-object p1, p0, Lrx/functions/c$5;->bGD: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;->bGI:Lrx/functions/Func5;
+    iget-object v2, p0, Lrx/functions/c$5;->bGD: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 cd4ff1c7cc..2736b66466 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 bGJ:Lrx/functions/Func6;
+.field final synthetic bGE:Lrx/functions/Func6;
 
 
 # direct methods
 .method constructor <init>(Lrx/functions/Func6;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/functions/c$6;->bGJ:Lrx/functions/Func6;
+    iput-object p1, p0, Lrx/functions/c$6;->bGE: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;->bGJ:Lrx/functions/Func6;
+    iget-object v2, p0, Lrx/functions/c$6;->bGE: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 2074c3f191..b2a9f9ab3c 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 bGK:Lrx/functions/Func7;
+.field final synthetic bGF:Lrx/functions/Func7;
 
 
 # direct methods
 .method constructor <init>(Lrx/functions/Func7;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/functions/c$7;->bGK:Lrx/functions/Func7;
+    iput-object p1, p0, Lrx/functions/c$7;->bGF: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;->bGK:Lrx/functions/Func7;
+    iget-object v2, p0, Lrx/functions/c$7;->bGF: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 bdbf44e03d..61bd03bb2e 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 bGL:Lrx/functions/Func8;
+.field final synthetic bGG:Lrx/functions/Func8;
 
 
 # direct methods
 .method constructor <init>(Lrx/functions/Func8;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/functions/c$8;->bGL:Lrx/functions/Func8;
+    iput-object p1, p0, Lrx/functions/c$8;->bGG: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;->bGL:Lrx/functions/Func8;
+    iget-object v2, p0, Lrx/functions/c$8;->bGG: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 b7a6e59a29..e4b72535b6 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 bGt:Lrx/internal/util/SubscriptionList;
+.field private final bGo: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;->bGt:Lrx/internal/util/SubscriptionList;
+    iput-object v0, p0, Lrx/g;->bGo: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;->bGt:Lrx/internal/util/SubscriptionList;
+    iget-object v0, p0, Lrx/g;->bGo: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;->bGt:Lrx/internal/util/SubscriptionList;
+    iget-object v0, p0, Lrx/g;->bGo: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;->bGt:Lrx/internal/util/SubscriptionList;
+    iget-object v0, p0, Lrx/g;->bGo: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 71fa91e92b..69b749fa4e 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 bHH:Lrx/Subscriber;
+.field final synthetic bHC:Lrx/Subscriber;
 
-.field final synthetic bIA:Lrx/internal/a/aa;
+.field bIt:Z
 
-.field bIy:Z
+.field final synthetic bIu:Lrx/internal/b/b;
 
-.field final synthetic bIz:Lrx/internal/b/b;
+.field final synthetic bIv:Lrx/internal/a/aa;
 
 .field done:Z
 
@@ -37,11 +37,11 @@
 .method constructor <init>(Lrx/internal/a/aa;Lrx/internal/b/b;Lrx/Subscriber;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/a/aa$1;->bIA:Lrx/internal/a/aa;
+    iput-object p1, p0, Lrx/internal/a/aa$1;->bIv:Lrx/internal/a/aa;
 
-    iput-object p2, p0, Lrx/internal/a/aa$1;->bIz:Lrx/internal/b/b;
+    iput-object p2, p0, Lrx/internal/a/aa$1;->bIu:Lrx/internal/b/b;
 
-    iput-object p3, p0, Lrx/internal/a/aa$1;->bHH:Lrx/Subscriber;
+    iput-object p3, p0, Lrx/internal/a/aa$1;->bHC: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;->bIy:Z
+    iget-boolean v0, p0, Lrx/internal/a/aa$1;->bIt:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lrx/internal/a/aa$1;->bIz:Lrx/internal/b/b;
+    iget-object v0, p0, Lrx/internal/a/aa$1;->bIu: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;->bIz:Lrx/internal/b/b;
+    iget-object v0, p0, Lrx/internal/a/aa$1;->bIu:Lrx/internal/b/b;
 
-    iget-object v1, p0, Lrx/internal/a/aa$1;->bIA:Lrx/internal/a/aa;
+    iget-object v1, p0, Lrx/internal/a/aa$1;->bIv:Lrx/internal/a/aa;
 
-    iget-boolean v1, v1, Lrx/internal/a/aa;->bIx:Z
+    iget-boolean v1, v1, Lrx/internal/a/aa;->bIs: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;->bHH:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/aa$1;->bHC: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;->bIy:Z
+    iput-boolean v0, p0, Lrx/internal/a/aa$1;->bIt:Z
 
     :try_start_0
-    iget-object v1, p0, Lrx/internal/a/aa$1;->bIA:Lrx/internal/a/aa;
+    iget-object v1, p0, Lrx/internal/a/aa$1;->bIv:Lrx/internal/a/aa;
 
-    iget-object v1, v1, Lrx/internal/a/aa;->bHt:Lrx/functions/b;
+    iget-object v1, v1, Lrx/internal/a/aa;->bHo: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;->bIz:Lrx/internal/b/b;
+    iget-object p1, p0, Lrx/internal/a/aa$1;->bIu:Lrx/internal/b/b;
 
-    iget-object v1, p0, Lrx/internal/a/aa$1;->bIA:Lrx/internal/a/aa;
+    iget-object v1, p0, Lrx/internal/a/aa$1;->bIv:Lrx/internal/a/aa;
 
-    iget-boolean v1, v1, Lrx/internal/a/aa;->bIx:Z
+    iget-boolean v1, v1, Lrx/internal/a/aa;->bIs: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 662a3a928a..ebe576479e 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 bHt:Lrx/functions/b;
+.field final bHo:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -32,7 +32,7 @@
     .end annotation
 .end field
 
-.field final bIx:Z
+.field final bIs:Z
 
 
 # direct methods
@@ -50,11 +50,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/aa;->bHt:Lrx/functions/b;
+    iput-object p1, p0, Lrx/internal/a/aa;->bHo:Lrx/functions/b;
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lrx/internal/a/aa;->bIx:Z
+    iput-boolean p1, p0, Lrx/internal/a/aa;->bIs: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 6942c4b4cc..524c37f0dd 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 bIF:Lrx/internal/a/ab$a;
+.field final synthetic bIA: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;->bIF:Lrx/internal/a/ab$a;
+    iput-object p1, p0, Lrx/internal/a/ab$a$1;->bIA: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;->bIF:Lrx/internal/a/ab$a;
+    iget-object v0, p0, Lrx/internal/a/ab$a$1;->bIA: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;->bID:Ljava/util/List;
+    iget-object v1, v0, Lrx/internal/a/ab$a;->bIy: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;->bID:Ljava/util/List;
+    iput-object v2, v0, Lrx/internal/a/ab$a;->bIy: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 2367898212..a2410242ba 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 bID:Ljava/util/List;
+.field bIy:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -31,7 +31,7 @@
     .end annotation
 .end field
 
-.field final synthetic bIE:Lrx/internal/a/ab;
+.field final synthetic bIz: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;->bIE:Lrx/internal/a/ab;
+    iput-object p1, p0, Lrx/internal/a/ab$a;->bIz: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;->bID:Ljava/util/List;
+    iput-object p1, p0, Lrx/internal/a/ab$a;->bIy: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;->bID:Ljava/util/List;
+    iget-object v0, p0, Lrx/internal/a/ab$a;->bIy:Ljava/util/List;
 
     const/4 v1, 0x0
 
-    iput-object v1, p0, Lrx/internal/a/ab$a;->bID:Ljava/util/List;
+    iput-object v1, p0, Lrx/internal/a/ab$a;->bIy: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;->bID:Ljava/util/List;
+    iput-object v0, p0, Lrx/internal/a/ab$a;->bIy: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;->bID:Ljava/util/List;
+    iget-object v0, p0, Lrx/internal/a/ab$a;->bIy:Ljava/util/List;
 
     invoke-interface {v0, p1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object p1, p0, Lrx/internal/a/ab$a;->bID:Ljava/util/List;
+    iget-object p1, p0, Lrx/internal/a/ab$a;->bIy:Ljava/util/List;
 
     invoke-interface {p1}, Ljava/util/List;->size()I
 
     move-result p1
 
-    iget-object v0, p0, Lrx/internal/a/ab$a;->bIE:Lrx/internal/a/ab;
+    iget-object v0, p0, Lrx/internal/a/ab$a;->bIz: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;->bID:Ljava/util/List;
+    iget-object p1, p0, Lrx/internal/a/ab$a;->bIy: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;->bID:Ljava/util/List;
+    iput-object v0, p0, Lrx/internal/a/ab$a;->bIy: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 db59b2c539..5299818bc4 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 bIG:Lrx/internal/a/ab$b;
+.field final synthetic bIB: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;->bIG:Lrx/internal/a/ab$b;
+    iput-object p1, p0, Lrx/internal/a/ab$b$1;->bIB: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;->bIG:Lrx/internal/a/ab$b;
+    iget-object v0, p0, Lrx/internal/a/ab$b$1;->bIB:Lrx/internal/a/ab$b;
 
-    invoke-virtual {v0}, Lrx/internal/a/ab$b;->Jn()V
+    invoke-virtual {v0}, Lrx/internal/a/ab$b;->Jl()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 49e3b40c7c..89a189fbb8 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;->Jn()V
+    value = Lrx/internal/a/ab$b;->Jl()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic bIG:Lrx/internal/a/ab$b;
+.field final synthetic bIB:Lrx/internal/a/ab$b;
 
-.field final synthetic bIH:Ljava/util/List;
+.field final synthetic bIC: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;->bIG:Lrx/internal/a/ab$b;
+    iput-object p1, p0, Lrx/internal/a/ab$b$2;->bIB:Lrx/internal/a/ab$b;
 
-    iput-object p2, p0, Lrx/internal/a/ab$b$2;->bIH:Ljava/util/List;
+    iput-object p2, p0, Lrx/internal/a/ab$b$2;->bIC: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;->bIG:Lrx/internal/a/ab$b;
+    iget-object v0, p0, Lrx/internal/a/ab$b$2;->bIB:Lrx/internal/a/ab$b;
 
-    iget-object v1, p0, Lrx/internal/a/ab$b$2;->bIH:Ljava/util/List;
+    iget-object v1, p0, Lrx/internal/a/ab$b$2;->bIC: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 694f1b8f68..53d3a218cb 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 bIE:Lrx/internal/a/ab;
+.field final synthetic bIz: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;->bIE:Lrx/internal/a/ab;
+    iput-object p1, p0, Lrx/internal/a/ab$b;->bIz:Lrx/internal/a/ab;
 
     invoke-direct {p0}, Lrx/Subscriber;-><init>()V
 
@@ -84,7 +84,7 @@
 
 
 # virtual methods
-.method final Jn()V
+.method final Jl()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;->bIE:Lrx/internal/a/ab;
+    iget-object v0, p0, Lrx/internal/a/ab$b;->bIz:Lrx/internal/a/ab;
 
-    iget-wide v3, v0, Lrx/internal/a/ab;->bIB:J
+    iget-wide v3, v0, Lrx/internal/a/ab;->bIw:J
 
-    iget-object v0, p0, Lrx/internal/a/ab$b;->bIE:Lrx/internal/a/ab;
+    iget-object v0, p0, Lrx/internal/a/ab$b;->bIz: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;->bIE:Lrx/internal/a/ab;
+    iget-object v4, p0, Lrx/internal/a/ab$b;->bIz: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 cf63c9351f..173a6ae9dd 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 bIB:J
+.field final bIw:J
 
-.field final bIC:J
+.field final bIx: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;->bIB:J
+    iput-wide p1, p0, Lrx/internal/a/ab;->bIw:J
 
-    iput-wide p3, p0, Lrx/internal/a/ab;->bIC:J
+    iput-wide p3, p0, Lrx/internal/a/ab;->bIx: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;->IY()Lrx/Scheduler$Worker;
+    invoke-virtual {v0}, Lrx/Scheduler;->IW()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;->bIB:J
+    iget-wide v2, p0, Lrx/internal/a/ab;->bIw:J
 
-    iget-wide v4, p0, Lrx/internal/a/ab;->bIC:J
+    iget-wide v4, p0, Lrx/internal/a/ab;->bIx: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;->bIE:Lrx/internal/a/ab;
+    iget-object p1, v2, Lrx/internal/a/ab$a;->bIz:Lrx/internal/a/ab;
 
-    iget-wide v5, p1, Lrx/internal/a/ab;->bIB:J
+    iget-wide v5, p1, Lrx/internal/a/ab;->bIw:J
 
-    iget-object p1, v2, Lrx/internal/a/ab$a;->bIE:Lrx/internal/a/ab;
+    iget-object p1, v2, Lrx/internal/a/ab$a;->bIz:Lrx/internal/a/ab;
 
-    iget-wide v7, p1, Lrx/internal/a/ab;->bIB:J
+    iget-wide v7, p1, Lrx/internal/a/ab;->bIw:J
 
-    iget-object p1, v2, Lrx/internal/a/ab$a;->bIE:Lrx/internal/a/ab;
+    iget-object p1, v2, Lrx/internal/a/ab$a;->bIz: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;->Jn()V
+    invoke-virtual {v2}, Lrx/internal/a/ab$b;->Jl()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;->bIE:Lrx/internal/a/ab;
+    iget-object p1, v2, Lrx/internal/a/ab$b;->bIz:Lrx/internal/a/ab;
 
-    iget-wide v5, p1, Lrx/internal/a/ab;->bIC:J
+    iget-wide v5, p1, Lrx/internal/a/ab;->bIx:J
 
-    iget-object p1, v2, Lrx/internal/a/ab$b;->bIE:Lrx/internal/a/ab;
+    iget-object p1, v2, Lrx/internal/a/ab$b;->bIz:Lrx/internal/a/ab;
 
-    iget-wide v7, p1, Lrx/internal/a/ab;->bIC:J
+    iget-wide v7, p1, Lrx/internal/a/ab;->bIx:J
 
-    iget-object p1, v2, Lrx/internal/a/ab$b;->bIE:Lrx/internal/a/ab;
+    iget-object p1, v2, Lrx/internal/a/ab$b;->bIz: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 132df2b0f3..392399cb32 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 bIK:Lrx/internal/a/ac$1;
+.field final synthetic bIF: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;->bIK:Lrx/internal/a/ac$1;
+    iput-object p1, p0, Lrx/internal/a/ac$1$1;->bIF: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;->bIK:Lrx/internal/a/ac$1;
+    iget-object v0, p0, Lrx/internal/a/ac$1$1;->bIF:Lrx/internal/a/ac$1;
 
-    iget-object v0, v0, Lrx/internal/a/ac$1;->bII:Lrx/internal/a/ac$a;
+    iget-object v0, v0, Lrx/internal/a/ac$1;->bID: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;->bIK:Lrx/internal/a/ac$1;
+    iget-object v2, p0, Lrx/internal/a/ac$1$1;->bIF: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;->bIK:Lrx/internal/a/ac$1;
+    iget-object v3, p0, Lrx/internal/a/ac$1$1;->bIF: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 c4995334b1..87e2d883fb 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 bII:Lrx/internal/a/ac$a;
+.field final bID: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 bIJ:Lrx/internal/a/ac;
+.field final synthetic bIE: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;->bIJ:Lrx/internal/a/ac;
+    iput-object p1, p0, Lrx/internal/a/ac$1;->bIE: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;->bII:Lrx/internal/a/ac$a;
+    iput-object p1, p0, Lrx/internal/a/ac$1;->bID: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;->bII:Lrx/internal/a/ac$a;
+    iget-object v0, p0, Lrx/internal/a/ac$1;->bID: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;->bII:Lrx/internal/a/ac$a;
+    iget-object p1, p0, Lrx/internal/a/ac$1;->bID: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;->bII:Lrx/internal/a/ac$a;
+    iget-object v0, p0, Lrx/internal/a/ac$1;->bID: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;->bIJ:Lrx/internal/a/ac;
+    iget-object p1, p0, Lrx/internal/a/ac$1;->bIE:Lrx/internal/a/ac;
 
     iget-wide v3, p1, Lrx/internal/a/ac;->timeout:J
 
-    iget-object p1, p0, Lrx/internal/a/ac$1;->bIJ:Lrx/internal/a/ac;
+    iget-object p1, p0, Lrx/internal/a/ac$1;->bIE: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 c695538c71..dbb63a21e9 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;->IY()Lrx/Scheduler$Worker;
+    invoke-virtual {p1}, Lrx/Scheduler;->IW()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 2a5b060af5..07858368f8 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 bIM:Lrx/internal/a/ad$1;
+.field final synthetic bIH: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;->bIM:Lrx/internal/a/ad$1;
+    iput-object p1, p0, Lrx/internal/a/ad$1$1;->bIH: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;->bIM:Lrx/internal/a/ad$1;
+    iget-object v0, p0, Lrx/internal/a/ad$1$1;->bIH: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;->bIM:Lrx/internal/a/ad$1;
+    iget-object v0, p0, Lrx/internal/a/ad$1$1;->bIH: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;->bHH:Lrx/Subscriber;
+    iget-object v0, v0, Lrx/internal/a/ad$1;->bHC: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 d64470936a..3da5b82150 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 bIM:Lrx/internal/a/ad$1;
+.field final synthetic bIH:Lrx/internal/a/ad$1;
 
-.field final synthetic bIN:Ljava/lang/Throwable;
+.field final synthetic bII: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;->bIM:Lrx/internal/a/ad$1;
+    iput-object p1, p0, Lrx/internal/a/ad$1$2;->bIH:Lrx/internal/a/ad$1;
 
-    iput-object p2, p0, Lrx/internal/a/ad$1$2;->bIN:Ljava/lang/Throwable;
+    iput-object p2, p0, Lrx/internal/a/ad$1$2;->bII: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;->bIM:Lrx/internal/a/ad$1;
+    iget-object v0, p0, Lrx/internal/a/ad$1$2;->bIH: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;->bIM:Lrx/internal/a/ad$1;
+    iget-object v0, p0, Lrx/internal/a/ad$1$2;->bIH: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;->bHH:Lrx/Subscriber;
+    iget-object v0, v0, Lrx/internal/a/ad$1;->bHC:Lrx/Subscriber;
 
-    iget-object v1, p0, Lrx/internal/a/ad$1$2;->bIN:Ljava/lang/Throwable;
+    iget-object v1, p0, Lrx/internal/a/ad$1$2;->bII:Ljava/lang/Throwable;
 
     invoke-virtual {v0, v1}, Lrx/Subscriber;->onError(Ljava/lang/Throwable;)V
 
-    iget-object v0, p0, Lrx/internal/a/ad$1$2;->bIM:Lrx/internal/a/ad$1;
+    iget-object v0, p0, Lrx/internal/a/ad$1$2;->bIH: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 fa28421622..54d9e0e42f 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 bIM:Lrx/internal/a/ad$1;
+.field final synthetic bIH:Lrx/internal/a/ad$1;
 
-.field final synthetic bIO:Ljava/lang/Object;
+.field final synthetic bIJ: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;->bIM:Lrx/internal/a/ad$1;
+    iput-object p1, p0, Lrx/internal/a/ad$1$3;->bIH:Lrx/internal/a/ad$1;
 
-    iput-object p2, p0, Lrx/internal/a/ad$1$3;->bIO:Ljava/lang/Object;
+    iput-object p2, p0, Lrx/internal/a/ad$1$3;->bIJ: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;->bIM:Lrx/internal/a/ad$1;
+    iget-object v0, p0, Lrx/internal/a/ad$1$3;->bIH: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;->bIM:Lrx/internal/a/ad$1;
+    iget-object v0, p0, Lrx/internal/a/ad$1$3;->bIH:Lrx/internal/a/ad$1;
 
-    iget-object v0, v0, Lrx/internal/a/ad$1;->bHH:Lrx/Subscriber;
+    iget-object v0, v0, Lrx/internal/a/ad$1;->bHC:Lrx/Subscriber;
 
-    iget-object v1, p0, Lrx/internal/a/ad$1$3;->bIO:Ljava/lang/Object;
+    iget-object v1, p0, Lrx/internal/a/ad$1$3;->bIJ: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 46a86d22a8..911a8c04f2 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 bHH:Lrx/Subscriber;
+.field final synthetic bHC:Lrx/Subscriber;
 
-.field final synthetic bIL:Lrx/internal/a/ad;
+.field final synthetic bIG: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;->bIL:Lrx/internal/a/ad;
+    iput-object p1, p0, Lrx/internal/a/ad$1;->bIG: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;->bHH:Lrx/Subscriber;
+    iput-object p4, p0, Lrx/internal/a/ad$1;->bHC: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;->bIL:Lrx/internal/a/ad;
+    iget-object v2, p0, Lrx/internal/a/ad$1;->bIG:Lrx/internal/a/ad;
 
     iget-wide v2, v2, Lrx/internal/a/ad;->delay:J
 
-    iget-object v4, p0, Lrx/internal/a/ad$1;->bIL:Lrx/internal/a/ad;
+    iget-object v4, p0, Lrx/internal/a/ad$1;->bIG: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;->bIL:Lrx/internal/a/ad;
+    iget-object p1, p0, Lrx/internal/a/ad$1;->bIG:Lrx/internal/a/ad;
 
     iget-wide v2, p1, Lrx/internal/a/ad;->delay:J
 
-    iget-object p1, p0, Lrx/internal/a/ad$1;->bIL:Lrx/internal/a/ad;
+    iget-object p1, p0, Lrx/internal/a/ad$1;->bIG: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 67d4dd72b1..6237814df2 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;->IY()Lrx/Scheduler$Worker;
+    invoke-virtual {v0}, Lrx/Scheduler;->IW()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 fe947bbebf..3caded1ee3 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 bHH:Lrx/Subscriber;
+.field final synthetic bHC:Lrx/Subscriber;
 
-.field bIQ:Ljava/lang/Object;
+.field bIL:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TU;"
@@ -32,18 +32,18 @@
     .end annotation
 .end field
 
-.field bIR:Z
+.field bIM:Z
 
-.field final synthetic bIS:Lrx/internal/a/ae;
+.field final synthetic bIN: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;->bIS:Lrx/internal/a/ae;
+    iput-object p1, p0, Lrx/internal/a/ae$1;->bIN:Lrx/internal/a/ae;
 
-    iput-object p3, p0, Lrx/internal/a/ae$1;->bHH:Lrx/Subscriber;
+    iput-object p3, p0, Lrx/internal/a/ae$1;->bHC: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;->bHH:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/ae$1;->bHC: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;->bHH:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/ae$1;->bHC: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;->bIS:Lrx/internal/a/ae;
+    iget-object v0, p0, Lrx/internal/a/ae$1;->bIN:Lrx/internal/a/ae;
 
-    iget-object v0, v0, Lrx/internal/a/ae;->bIu:Lrx/functions/b;
+    iget-object v0, v0, Lrx/internal/a/ae;->bIp: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;->bIQ:Ljava/lang/Object;
+    iget-object v1, p0, Lrx/internal/a/ae$1;->bIL:Ljava/lang/Object;
 
-    iput-object v0, p0, Lrx/internal/a/ae$1;->bIQ:Ljava/lang/Object;
+    iput-object v0, p0, Lrx/internal/a/ae$1;->bIL:Ljava/lang/Object;
 
-    iget-boolean v2, p0, Lrx/internal/a/ae$1;->bIR:Z
+    iget-boolean v2, p0, Lrx/internal/a/ae$1;->bIM:Z
 
     if-eqz v2, :cond_1
 
     :try_start_1
-    iget-object v2, p0, Lrx/internal/a/ae$1;->bIS:Lrx/internal/a/ae;
+    iget-object v2, p0, Lrx/internal/a/ae$1;->bIN:Lrx/internal/a/ae;
 
-    iget-object v2, v2, Lrx/internal/a/ae;->bIP:Lrx/functions/Func2;
+    iget-object v2, v2, Lrx/internal/a/ae;->bIK: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;->bHH:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/ae$1;->bHC: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;->bHH:Lrx/Subscriber;
+    iget-object v1, p0, Lrx/internal/a/ae$1;->bHC: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;->bIR:Z
+    iput-boolean v0, p0, Lrx/internal/a/ae$1;->bIM:Z
 
-    iget-object v0, p0, Lrx/internal/a/ae$1;->bHH:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/ae$1;->bHC: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;->bHH:Lrx/Subscriber;
+    iget-object v1, p0, Lrx/internal/a/ae$1;->bHC: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 e7483f9fae..6b57bf7b62 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 bIT:Lrx/internal/a/ae;
+.field static final bIO: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;->bNs:Lrx/internal/util/l$b;
+    sget-object v1, Lrx/internal/util/l$b;->bNn: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;->bIT:Lrx/internal/a/ae;
+    sput-object v0, Lrx/internal/a/ae$a;->bIO: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 07877ee4c0..3091e4f369 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 bIU:Lrx/functions/Action0;
+.field private final bIP: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;->bIU:Lrx/functions/Action0;
+    iput-object p1, p0, Lrx/internal/a/af;->bIP:Lrx/functions/Action0;
 
     return-void
 .end method
@@ -41,7 +41,7 @@
 
     check-cast p1, Lrx/Subscriber;
 
-    iget-object v0, p0, Lrx/internal/a/af;->bIU:Lrx/functions/Action0;
+    iget-object v0, p0, Lrx/internal/a/af;->bIP: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 21d03a8ff7..973bd64c3e 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 bIV:Lrx/functions/Action0;
+.field private final bIQ: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;->bIV:Lrx/functions/Action0;
+    iput-object p1, p0, Lrx/internal/a/ag;->bIQ:Lrx/functions/Action0;
 
     return-void
 .end method
@@ -41,7 +41,7 @@
 
     check-cast p1, Lrx/Subscriber;
 
-    iget-object v0, p0, Lrx/internal/a/ag;->bIV:Lrx/functions/Action0;
+    iget-object v0, p0, Lrx/internal/a/ag;->bIQ: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 142cba74e0..be4144016a 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 bIY:Lrx/internal/a/ah;
+.field static final bIT: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;->bIY:Lrx/internal/a/ah;
+    sput-object v0, Lrx/internal/a/ah$a;->bIT: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 40de417a28..9391f215d9 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 bJc:I
+.field static final bIX:I
 
 
 # instance fields
-.field final bIZ:Lrx/internal/a/ah$d;
+.field final bIU: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 bJa:Lrx/internal/util/i;
+.field volatile bIV:Lrx/internal/util/i;
 
-.field bJb:I
+.field bIW:I
 
 .field volatile done:Z
 
@@ -51,11 +51,11 @@
 .method static constructor <clinit>()V
     .locals 1
 
-    sget v0, Lrx/internal/util/i;->bNf:I
+    sget v0, Lrx/internal/util/i;->bNa:I
 
     div-int/lit8 v0, v0, 0x4
 
-    sput v0, Lrx/internal/a/ah$b;->bJc:I
+    sput v0, Lrx/internal/a/ah$b;->bIX: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;->bIZ:Lrx/internal/a/ah$d;
+    iput-object p1, p0, Lrx/internal/a/ah$b;->bIU: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;->bJb:I
+    iget v0, p0, Lrx/internal/a/ah$b;->bIW:I
 
     long-to-int p2, p1
 
     sub-int/2addr v0, p2
 
-    sget p1, Lrx/internal/a/ah$b;->bJc:I
+    sget p1, Lrx/internal/a/ah$b;->bIX:I
 
     if-le v0, p1, :cond_0
 
-    iput v0, p0, Lrx/internal/a/ah$b;->bJb:I
+    iput v0, p0, Lrx/internal/a/ah$b;->bIW:I
 
     return-void
 
     :cond_0
-    sget p1, Lrx/internal/util/i;->bNf:I
+    sget p1, Lrx/internal/util/i;->bNa:I
 
-    iput p1, p0, Lrx/internal/a/ah$b;->bJb:I
+    iput p1, p0, Lrx/internal/a/ah$b;->bIW:I
 
-    sget p1, Lrx/internal/util/i;->bNf:I
+    sget p1, Lrx/internal/util/i;->bNa: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;->bIZ:Lrx/internal/a/ah$d;
+    iget-object v0, p0, Lrx/internal/a/ah$b;->bIU:Lrx/internal/a/ah$d;
 
-    invoke-virtual {v0}, Lrx/internal/a/ah$d;->Jt()V
+    invoke-virtual {v0}, Lrx/internal/a/ah$d;->Jr()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;->bIZ:Lrx/internal/a/ah$d;
+    iget-object v0, p0, Lrx/internal/a/ah$b;->bIU:Lrx/internal/a/ah$d;
 
-    invoke-virtual {v0}, Lrx/internal/a/ah$d;->Jq()Ljava/util/Queue;
+    invoke-virtual {v0}, Lrx/internal/a/ah$d;->Jo()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;->bIZ:Lrx/internal/a/ah$d;
+    iget-object p1, p0, Lrx/internal/a/ah$b;->bIU:Lrx/internal/a/ah$d;
 
-    invoke-virtual {p1}, Lrx/internal/a/ah$d;->Jt()V
+    invoke-virtual {p1}, Lrx/internal/a/ah$d;->Jr()V
 
     return-void
 .end method
@@ -161,9 +161,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/internal/a/ah$b;->bIZ:Lrx/internal/a/ah$d;
+    iget-object v0, p0, Lrx/internal/a/ah$b;->bIU:Lrx/internal/a/ah$d;
 
-    iget-object v1, v0, Lrx/internal/a/ah$d;->bJd:Lrx/internal/a/ah$c;
+    iget-object v1, v0, Lrx/internal/a/ah$d;->bIY: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;->bJd:Lrx/internal/a/ah$c;
+    iget-object v1, v0, Lrx/internal/a/ah$d;->bIY: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;->bJa:Lrx/internal/util/i;
+    iget-object v3, p0, Lrx/internal/a/ah$b;->bIV: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;->Ju()V
+    invoke-virtual {v0}, Lrx/internal/a/ah$d;->Js()V
 
     return-void
 
@@ -261,7 +261,7 @@
     move-exception p1
 
     :try_start_2
-    iget-boolean v3, v0, Lrx/internal/a/ah$d;->bIW:Z
+    iget-boolean v3, v0, Lrx/internal/a/ah$d;->bIR:Z
 
     if-nez v3, :cond_4
 
@@ -285,7 +285,7 @@
 
     :cond_4
     :try_start_4
-    invoke-virtual {v0}, Lrx/internal/a/ah$d;->Jq()Ljava/util/Queue;
+    invoke-virtual {v0}, Lrx/internal/a/ah$d;->Jo()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;->bJd:Lrx/internal/a/ah$c;
+    iget-object p1, v0, Lrx/internal/a/ah$d;->bIY: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;->Ju()V
+    invoke-virtual {v0}, Lrx/internal/a/ah$d;->Js()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;->Jt()V
+    invoke-virtual {v0}, Lrx/internal/a/ah$d;->Jr()V
 
     :goto_6
     return-void
@@ -390,11 +390,11 @@
 .method public final onStart()V
     .locals 2
 
-    sget v0, Lrx/internal/util/i;->bNf:I
+    sget v0, Lrx/internal/util/i;->bNa:I
 
-    iput v0, p0, Lrx/internal/a/ah$b;->bJb:I
+    iput v0, p0, Lrx/internal/a/ah$b;->bIW:I
 
-    sget v0, Lrx/internal/util/i;->bNf:I
+    sget v0, Lrx/internal/util/i;->bNa: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 26d13b389b..ad25c6ff97 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;->Jt()V
+    invoke-virtual {p1}, Lrx/internal/a/ah$d;->Jr()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 0a0c3a82b3..6fe36ed5a8 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 bJk:[Lrx/internal/a/ah$b;
+.field static final bJf:[Lrx/internal/a/ah$b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "[",
@@ -38,11 +38,11 @@
 
 
 # instance fields
-.field final bIW:Z
+.field final bIR:Z
 
-.field final bIX:I
+.field final bIS:I
 
-.field bJd:Lrx/internal/a/ah$c;
+.field bIY: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 bJe:Ljava/util/concurrent/ConcurrentLinkedQueue;
+.field volatile bIZ:Ljava/util/concurrent/ConcurrentLinkedQueue;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/ConcurrentLinkedQueue<",
@@ -61,9 +61,9 @@
     .end annotation
 .end field
 
-.field final bJf:Ljava/lang/Object;
+.field final bJa:Ljava/lang/Object;
 
-.field volatile bJg:[Lrx/internal/a/ah$b;
+.field volatile bJb:[Lrx/internal/a/ah$b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "[",
@@ -73,15 +73,15 @@
     .end annotation
 .end field
 
-.field bJh:J
+.field bJc:J
 
-.field bJi:J
+.field bJd:J
 
-.field bJj:I
+.field bJe:I
 
-.field final bJl:I
+.field final bJg:I
 
-.field bJm:I
+.field bJh: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;->bJk:[Lrx/internal/a/ah$b;
+    sput-object v0, Lrx/internal/a/ah$d;->bJf:[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;->bIW:Z
+    iput-boolean p2, p0, Lrx/internal/a/ah$d;->bIR:Z
 
-    iput p3, p0, Lrx/internal/a/ah$d;->bIX:I
+    iput p3, p0, Lrx/internal/a/ah$d;->bIS:I
 
     new-instance p1, Ljava/lang/Object;
 
     invoke-direct {p1}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/ah$d;->bJf:Ljava/lang/Object;
+    iput-object p1, p0, Lrx/internal/a/ah$d;->bJa:Ljava/lang/Object;
 
-    sget-object p1, Lrx/internal/a/ah$d;->bJk:[Lrx/internal/a/ah$b;
+    sget-object p1, Lrx/internal/a/ah$d;->bJf:[Lrx/internal/a/ah$b;
 
-    iput-object p1, p0, Lrx/internal/a/ah$d;->bJg:[Lrx/internal/a/ah$b;
+    iput-object p1, p0, Lrx/internal/a/ah$d;->bJb:[Lrx/internal/a/ah$b;
 
     const p1, 0x7fffffff
 
     if-ne p3, p1, :cond_0
 
-    iput p1, p0, Lrx/internal/a/ah$d;->bJl:I
+    iput p1, p0, Lrx/internal/a/ah$d;->bJg:I
 
     const-wide p1, 0x7fffffffffffffffL
 
@@ -173,7 +173,7 @@
 
     move-result p1
 
-    iput p1, p0, Lrx/internal/a/ah$d;->bJl:I
+    iput p1, p0, Lrx/internal/a/ah$d;->bJg:I
 
     int-to-long p1, p3
 
@@ -182,7 +182,7 @@
     return-void
 .end method
 
-.method private Jr()Lrx/subscriptions/CompositeSubscription;
+.method private Jp()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 Js()V
+.method private Jq()V
     .locals 4
 
     new-instance v0, Ljava/util/ArrayList;
 
-    iget-object v1, p0, Lrx/internal/a/ah$d;->bJe:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v1, p0, Lrx/internal/a/ah$d;->bIZ: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 Jv()Z
+.method private Jt()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;->bJe:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v0, p0, Lrx/internal/a/ah$d;->bIZ:Ljava/util/concurrent/ConcurrentLinkedQueue;
 
-    iget-boolean v2, p0, Lrx/internal/a/ah$d;->bIW:Z
+    iget-boolean v2, p0, Lrx/internal/a/ah$d;->bIR: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;->Js()V
+    invoke-direct {p0}, Lrx/internal/a/ah$d;->Jq()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;->bJa:Lrx/internal/util/i;
+    iget-object v0, p1, Lrx/internal/a/ah$b;->bIV: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;->bJf:Ljava/lang/Object;
+    iget-object v0, p0, Lrx/internal/a/ah$d;->bJa:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lrx/internal/a/ah$d;->bJg:[Lrx/internal/a/ah$b;
+    iget-object v1, p0, Lrx/internal/a/ah$d;->bJb:[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;->bJk:[Lrx/internal/a/ah$b;
+    sget-object p1, Lrx/internal/a/ah$d;->bJf:[Lrx/internal/a/ah$b;
 
-    iput-object p1, p0, Lrx/internal/a/ah$d;->bJg:[Lrx/internal/a/ah$b;
+    iput-object p1, p0, Lrx/internal/a/ah$d;->bJb:[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;->bJg:[Lrx/internal/a/ah$b;
+    iput-object v5, p0, Lrx/internal/a/ah$d;->bJb:[Lrx/internal/a/ah$b;
 
     monitor-exit v0
 
@@ -453,17 +453,17 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/internal/a/ah$b;->bJa:Lrx/internal/util/i;
+    iget-object v0, p0, Lrx/internal/a/ah$b;->bIV:Lrx/internal/util/i;
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lrx/internal/util/i;->JT()Lrx/internal/util/i;
+    invoke-static {}, Lrx/internal/util/i;->JR()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;->bJa:Lrx/internal/util/i;
+    iput-object v0, p0, Lrx/internal/a/ah$b;->bIV: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;->bIX:I
+    iget v0, p0, Lrx/internal/a/ah$d;->bIS:I
 
     const v1, 0x7fffffff
 
@@ -524,7 +524,7 @@
 
     new-instance v0, Lrx/internal/util/a/h;
 
-    sget v1, Lrx/internal/util/i;->bNf:I
+    sget v1, Lrx/internal/util/i;->bNa: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;->Kd()Z
+    invoke-static {}, Lrx/internal/util/b/ae;->Kb()Z
 
     move-result v1
 
@@ -606,7 +606,7 @@
 
 
 # virtual methods
-.method final Jq()Ljava/util/Queue;
+.method final Jo()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;->bJe:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v0, p0, Lrx/internal/a/ah$d;->bIZ:Ljava/util/concurrent/ConcurrentLinkedQueue;
 
     if-nez v0, :cond_1
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lrx/internal/a/ah$d;->bJe:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v0, p0, Lrx/internal/a/ah$d;->bIZ: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;->bJe:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iput-object v0, p0, Lrx/internal/a/ah$d;->bIZ:Ljava/util/concurrent/ConcurrentLinkedQueue;
 
     :cond_0
     monitor-exit p0
@@ -653,7 +653,7 @@
     return-object v0
 .end method
 
-.method final Jt()V
+.method final Jr()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;->Ju()V
+    invoke-virtual {p0}, Lrx/internal/a/ah$d;->Js()V
 
     return-void
 
@@ -693,7 +693,7 @@
     throw v0
 .end method
 
-.method Ju()V
+.method Js()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;->Jv()Z
+    invoke-direct/range {p0 .. p0}, Lrx/internal/a/ah$d;->Jt()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;->bJd:Lrx/internal/a/ah$c;
+    iget-object v0, v1, Lrx/internal/a/ah$d;->bIY: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;->Jv()Z
+    invoke-direct/range {p0 .. p0}, Lrx/internal/a/ah$d;->Jt()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;->bIW:Z
+    iget-boolean v0, v1, Lrx/internal/a/ah$d;->bIR: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;->Jq()Ljava/util/Queue;
+    invoke-virtual/range {p0 .. p0}, Lrx/internal/a/ah$d;->Jo()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;->bJd:Lrx/internal/a/ah$c;
+    iget-object v6, v1, Lrx/internal/a/ah$d;->bIY: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;->bJg:[Lrx/internal/a/ah$b;
+    iget-object v5, v1, Lrx/internal/a/ah$d;->bJb:[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;->bJe:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v0, v1, Lrx/internal/a/ah$d;->bIZ: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;->Js()V
+    invoke-direct/range {p0 .. p0}, Lrx/internal/a/ah$d;->Jq()V
 
     return-void
 
@@ -928,9 +928,9 @@
     :cond_e
     if-lez v8, :cond_21
 
-    iget-wide v11, v1, Lrx/internal/a/ah$d;->bJi:J
+    iget-wide v11, v1, Lrx/internal/a/ah$d;->bJd:J
 
-    iget v0, v1, Lrx/internal/a/ah$d;->bJj:I
+    iget v0, v1, Lrx/internal/a/ah$d;->bJe:I
 
     if-le v8, v0, :cond_f
 
@@ -987,13 +987,13 @@
     goto :goto_9
 
     :cond_12
-    iput v2, v1, Lrx/internal/a/ah$d;->bJj:I
+    iput v2, v1, Lrx/internal/a/ah$d;->bJe: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;->bJi:J
+    iput-wide v3, v1, Lrx/internal/a/ah$d;->bJd: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;->Jv()Z
+    invoke-direct/range {p0 .. p0}, Lrx/internal/a/ah$d;->Jt()Z
 
     move-result v4
 
@@ -1032,7 +1032,7 @@
 
     if-lez v21, :cond_16
 
-    invoke-direct/range {p0 .. p0}, Lrx/internal/a/ah$d;->Jv()Z
+    invoke-direct/range {p0 .. p0}, Lrx/internal/a/ah$d;->Jt()Z
 
     move-result v21
 
@@ -1041,7 +1041,7 @@
     return-void
 
     :cond_15
-    iget-object v9, v4, Lrx/internal/a/ah$b;->bJa:Lrx/internal/util/i;
+    iget-object v9, v4, Lrx/internal/a/ah$b;->bIV: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;->bJd:Lrx/internal/a/ah$c;
+    iget-object v9, v1, Lrx/internal/a/ah$d;->bIY: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;->bJa:Lrx/internal/util/i;
+    iget-object v7, v4, Lrx/internal/a/ah$b;->bIV: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;->Jv()Z
+    invoke-direct/range {p0 .. p0}, Lrx/internal/a/ah$d;->Jt()Z
 
     move-result v3
 
@@ -1215,13 +1215,13 @@
     move-object/from16 v13, v17
 
     :cond_20
-    iput v2, v1, Lrx/internal/a/ah$d;->bJj:I
+    iput v2, v1, Lrx/internal/a/ah$d;->bJe: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;->bJi:J
+    iput-wide v4, v1, Lrx/internal/a/ah$d;->bJd: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;->Jt()V
+    invoke-virtual {p0}, Lrx/internal/a/ah$d;->Jr()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;->Jq()Ljava/util/Queue;
+    invoke-virtual {p0}, Lrx/internal/a/ah$d;->Jo()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;->Jt()V
+    invoke-virtual {p0}, Lrx/internal/a/ah$d;->Jr()V
 
     return-void
 .end method
@@ -1395,7 +1395,7 @@
 
     if-eqz p1, :cond_d
 
-    invoke-static {}, Lrx/Observable;->IS()Lrx/Observable;
+    invoke-static {}, Lrx/Observable;->IQ()Lrx/Observable;
 
     move-result-object v0
 
@@ -1405,15 +1405,15 @@
 
     if-ne p1, v0, :cond_1
 
-    iget p1, p0, Lrx/internal/a/ah$d;->bJm:I
+    iget p1, p0, Lrx/internal/a/ah$d;->bJh:I
 
     add-int/2addr p1, v1
 
-    iget v0, p0, Lrx/internal/a/ah$d;->bJl:I
+    iget v0, p0, Lrx/internal/a/ah$d;->bJg:I
 
     if-ne p1, v0, :cond_0
 
-    iput v2, p0, Lrx/internal/a/ah$d;->bJm:I
+    iput v2, p0, Lrx/internal/a/ah$d;->bJh:I
 
     int-to-long v0, p1
 
@@ -1422,7 +1422,7 @@
     return-void
 
     :cond_0
-    iput p1, p0, Lrx/internal/a/ah$d;->bJm:I
+    iput p1, p0, Lrx/internal/a/ah$d;->bJh:I
 
     return-void
 
@@ -1433,9 +1433,9 @@
 
     check-cast p1, Lrx/internal/util/k;
 
-    iget-object p1, p1, Lrx/internal/util/k;->bNh:Ljava/lang/Object;
+    iget-object p1, p1, Lrx/internal/util/k;->bNc:Ljava/lang/Object;
 
-    iget-object v0, p0, Lrx/internal/a/ah$d;->bJd:Lrx/internal/a/ah$c;
+    iget-object v0, p0, Lrx/internal/a/ah$d;->bIY: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;->bJd:Lrx/internal/a/ah$c;
+    iget-object v0, p0, Lrx/internal/a/ah$d;->bIY: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;->Ju()V
+    invoke-virtual {p0}, Lrx/internal/a/ah$d;->Js()V
 
     return-void
 
@@ -1529,7 +1529,7 @@
     move-exception p1
 
     :try_start_2
-    iget-boolean v0, p0, Lrx/internal/a/ah$d;->bIW:Z
+    iget-boolean v0, p0, Lrx/internal/a/ah$d;->bIR:Z
 
     if-nez v0, :cond_6
 
@@ -1553,7 +1553,7 @@
 
     :cond_6
     :try_start_4
-    invoke-virtual {p0}, Lrx/internal/a/ah$d;->Jq()Ljava/util/Queue;
+    invoke-virtual {p0}, Lrx/internal/a/ah$d;->Jo()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;->bJd:Lrx/internal/a/ah$c;
+    iget-object p1, p0, Lrx/internal/a/ah$d;->bIY: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;->bJm:I
+    iget p1, p0, Lrx/internal/a/ah$d;->bJh:I
 
     add-int/2addr p1, v1
 
-    iget v0, p0, Lrx/internal/a/ah$d;->bJl:I
+    iget v0, p0, Lrx/internal/a/ah$d;->bJg:I
 
     if-ne p1, v0, :cond_8
 
-    iput v2, p0, Lrx/internal/a/ah$d;->bJm:I
+    iput v2, p0, Lrx/internal/a/ah$d;->bJh:I
 
     int-to-long v3, p1
 
@@ -1590,7 +1590,7 @@
     goto :goto_4
 
     :cond_8
-    iput p1, p0, Lrx/internal/a/ah$d;->bJm:I
+    iput p1, p0, Lrx/internal/a/ah$d;->bJh: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;->Ju()V
+    invoke-virtual {p0}, Lrx/internal/a/ah$d;->Js()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;->Jt()V
+    invoke-virtual {p0}, Lrx/internal/a/ah$d;->Jr()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;->bJh:J
+    iget-wide v3, p0, Lrx/internal/a/ah$d;->bJc:J
 
     const-wide/16 v5, 0x1
 
     add-long/2addr v5, v3
 
-    iput-wide v5, p0, Lrx/internal/a/ah$d;->bJh:J
+    iput-wide v5, p0, Lrx/internal/a/ah$d;->bJc: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;->Jr()Lrx/subscriptions/CompositeSubscription;
+    invoke-direct {p0}, Lrx/internal/a/ah$d;->Jp()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;->bJf:Ljava/lang/Object;
+    iget-object v1, p0, Lrx/internal/a/ah$d;->bJa:Ljava/lang/Object;
 
     monitor-enter v1
 
     :try_start_9
-    iget-object v3, p0, Lrx/internal/a/ah$d;->bJg:[Lrx/internal/a/ah$b;
+    iget-object v3, p0, Lrx/internal/a/ah$d;->bJb:[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;->bJg:[Lrx/internal/a/ah$b;
+    iput-object v5, p0, Lrx/internal/a/ah$d;->bJb:[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;->Jt()V
+    invoke-virtual {p0}, Lrx/internal/a/ah$d;->Jr()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 0845ed8879..15383d16cd 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 bIW:Z
+.field final bIR:Z
 
-.field final bIX:I
+.field final bIS:I
 
 
 # direct methods
@@ -44,16 +44,16 @@
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lrx/internal/a/ah;->bIW:Z
+    iput-boolean p1, p0, Lrx/internal/a/ah;->bIR:Z
 
     const p1, 0x7fffffff
 
-    iput p1, p0, Lrx/internal/a/ah;->bIX:I
+    iput p1, p0, Lrx/internal/a/ah;->bIS:I
 
     return-void
 .end method
 
-.method public static Jp()Lrx/internal/a/ah;
+.method public static Jn()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;->bIY:Lrx/internal/a/ah;
+    sget-object v0, Lrx/internal/a/ah$a;->bIT: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;->bIW:Z
+    iget-boolean v1, p0, Lrx/internal/a/ah;->bIR:Z
 
-    iget v2, p0, Lrx/internal/a/ah;->bIX:I
+    iget v2, p0, Lrx/internal/a/ah;->bIS: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;->bJd:Lrx/internal/a/ah$c;
+    iput-object v1, v0, Lrx/internal/a/ah$d;->bIY: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 f54ac37c75..c5c2b92337 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 bJq:Lrx/internal/a/ai$a;
+.field final synthetic bJl: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;->bJq:Lrx/internal/a/ai$a;
+    iput-object p1, p0, Lrx/internal/a/ai$a$1;->bJl: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;->bJq:Lrx/internal/a/ai$a;
+    iget-object v0, p0, Lrx/internal/a/ai$a$1;->bJl: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;->bJq:Lrx/internal/a/ai$a;
+    iget-object p1, p0, Lrx/internal/a/ai$a$1;->bJl:Lrx/internal/a/ai$a;
 
-    invoke-virtual {p1}, Lrx/internal/a/ai$a;->Jw()V
+    invoke-virtual {p1}, Lrx/internal/a/ai$a;->Ju()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 c6187c0bd7..ab2f011378 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 bJn:Lrx/Scheduler$Worker;
+.field final bJi:Lrx/Scheduler$Worker;
 
-.field final bJo:Ljava/util/concurrent/atomic/AtomicLong;
+.field final bJj:Ljava/util/concurrent/atomic/AtomicLong;
 
-.field bJp:J
+.field bJk:J
 
-.field volatile bwD:Z
+.field volatile bwy: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;->bJo:Ljava/util/concurrent/atomic/AtomicLong;
+    iput-object v0, p0, Lrx/internal/a/ai$a;->bJj:Ljava/util/concurrent/atomic/AtomicLong;
 
     iput-object p2, p0, Lrx/internal/a/ai$a;->child:Lrx/Subscriber;
 
-    invoke-virtual {p1}, Lrx/Scheduler;->IY()Lrx/Scheduler$Worker;
+    invoke-virtual {p1}, Lrx/Scheduler;->IW()Lrx/Scheduler$Worker;
 
     move-result-object p1
 
-    iput-object p1, p0, Lrx/internal/a/ai$a;->bJn:Lrx/Scheduler$Worker;
+    iput-object p1, p0, Lrx/internal/a/ai$a;->bJi: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;->bNf:I
+    sget p4, Lrx/internal/util/i;->bNa: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;->Kd()Z
+    invoke-static {}, Lrx/internal/util/b/ae;->Kb()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;->bJn:Lrx/Scheduler$Worker;
+    iget-object p1, p0, Lrx/internal/a/ai$a;->bJi: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;->bJn:Lrx/Scheduler$Worker;
+    iget-object p2, p0, Lrx/internal/a/ai$a;->bJi: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;->bJn:Lrx/Scheduler$Worker;
+    iget-object p1, p0, Lrx/internal/a/ai$a;->bJi: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;->bJn:Lrx/Scheduler$Worker;
+    iget-object p2, p0, Lrx/internal/a/ai$a;->bJi: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;->bJn:Lrx/Scheduler$Worker;
+    iget-object p1, p0, Lrx/internal/a/ai$a;->bJi: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;->bJn:Lrx/Scheduler$Worker;
+    iget-object p2, p0, Lrx/internal/a/ai$a;->bJi:Lrx/Scheduler$Worker;
 
     invoke-virtual {p2}, Lrx/Scheduler$Worker;->unsubscribe()V
 
@@ -267,10 +267,10 @@
 
 
 # virtual methods
-.method protected final Jw()V
+.method protected final Ju()V
     .locals 5
 
-    iget-object v0, p0, Lrx/internal/a/ai$a;->bJo:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v0, p0, Lrx/internal/a/ai$a;->bJj: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;->bJn:Lrx/Scheduler$Worker;
+    iget-object v0, p0, Lrx/internal/a/ai$a;->bJi: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;->bJp:J
+    iget-wide v0, p0, Lrx/internal/a/ai$a;->bJk: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;->bwD:Z
+    iget-boolean v12, p0, Lrx/internal/a/ai$a;->bwy: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;->bwD:Z
+    iget-boolean v8, p0, Lrx/internal/a/ai$a;->bwy: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;->bJp:J
+    iput-wide v6, p0, Lrx/internal/a/ai$a;->bJk:J
 
-    iget-object v8, p0, Lrx/internal/a/ai$a;->bJo:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v8, p0, Lrx/internal/a/ai$a;->bJj: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;->bwD:Z
+    iget-boolean v0, p0, Lrx/internal/a/ai$a;->bwy: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;->bwD:Z
+    iput-boolean v0, p0, Lrx/internal/a/ai$a;->bwy:Z
 
-    invoke-virtual {p0}, Lrx/internal/a/ai$a;->Jw()V
+    invoke-virtual {p0}, Lrx/internal/a/ai$a;->Ju()V
 
     :cond_1
     :goto_0
@@ -448,7 +448,7 @@
 
     if-nez v0, :cond_1
 
-    iget-boolean v0, p0, Lrx/internal/a/ai$a;->bwD:Z
+    iget-boolean v0, p0, Lrx/internal/a/ai$a;->bwy:Z
 
     if-eqz v0, :cond_0
 
@@ -459,9 +459,9 @@
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lrx/internal/a/ai$a;->bwD:Z
+    iput-boolean p1, p0, Lrx/internal/a/ai$a;->bwy:Z
 
-    invoke-virtual {p0}, Lrx/internal/a/ai$a;->Jw()V
+    invoke-virtual {p0}, Lrx/internal/a/ai$a;->Ju()V
 
     return-void
 
@@ -486,7 +486,7 @@
 
     if-nez v0, :cond_2
 
-    iget-boolean v0, p0, Lrx/internal/a/ai$a;->bwD:Z
+    iget-boolean v0, p0, Lrx/internal/a/ai$a;->bwy:Z
 
     if-eqz v0, :cond_0
 
@@ -514,7 +514,7 @@
     return-void
 
     :cond_1
-    invoke-virtual {p0}, Lrx/internal/a/ai$a;->Jw()V
+    invoke-virtual {p0}, Lrx/internal/a/ai$a;->Ju()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 b18984a0ad..64252787e1 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;->bNf:I
+    sget p3, Lrx/internal/util/i;->bNa: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;->bJn:Lrx/Scheduler$Worker;
+    iget-object v0, v1, Lrx/internal/a/ai$a;->bJi: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 3f32d6059d..0ef73ac15a 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 bJs:Lrx/functions/Action0;
+.field private final bJn:Lrx/functions/Action0;
 
-.field private final bJt:Lrx/a$d;
+.field private final bJo:Lrx/a$d;
 
-.field private final bJu:Ljava/util/concurrent/atomic/AtomicLong;
+.field private final bJp:Ljava/util/concurrent/atomic/AtomicLong;
 
-.field private final bJv:Ljava/util/concurrent/atomic/AtomicBoolean;
+.field private final bJq:Ljava/util/concurrent/atomic/AtomicBoolean;
 
-.field final bJw:Lrx/internal/util/c;
+.field final bJr:Lrx/internal/util/c;
 
-.field private final bmF:Ljava/util/concurrent/ConcurrentLinkedQueue;
+.field private final bmA: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;->bmF:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iput-object v0, p0, Lrx/internal/a/aj$a;->bmA: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;->bJv:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iput-object v0, p0, Lrx/internal/a/aj$a;->bJq: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;->bJu:Ljava/util/concurrent/atomic/AtomicLong;
+    iput-object p1, p0, Lrx/internal/a/aj$a;->bJp:Ljava/util/concurrent/atomic/AtomicLong;
 
-    iput-object p3, p0, Lrx/internal/a/aj$a;->bJs:Lrx/functions/Action0;
+    iput-object p3, p0, Lrx/internal/a/aj$a;->bJn: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;->bJw:Lrx/internal/util/c;
+    iput-object p1, p0, Lrx/internal/a/aj$a;->bJr:Lrx/internal/util/c;
 
-    iput-object p4, p0, Lrx/internal/a/aj$a;->bJt:Lrx/a$d;
+    iput-object p4, p0, Lrx/internal/a/aj$a;->bJo:Lrx/a$d;
 
     return-void
 .end method
 
-.method private Jy()Z
+.method private Jw()Z
     .locals 6
 
-    iget-object v0, p0, Lrx/internal/a/aj$a;->bJu:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v0, p0, Lrx/internal/a/aj$a;->bJp: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;->bJu:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v0, p0, Lrx/internal/a/aj$a;->bJp: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;->bJt:Lrx/a$d;
+    iget-object v4, p0, Lrx/internal/a/aj$a;->bJo:Lrx/a$d;
 
-    invoke-interface {v4}, Lrx/a$d;->IL()Z
+    invoke-interface {v4}, Lrx/a$d;->IJ()Z
 
     move-result v4
 
@@ -173,7 +173,7 @@
     :catch_0
     move-exception v4
 
-    iget-object v5, p0, Lrx/internal/a/aj$a;->bJv:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v5, p0, Lrx/internal/a/aj$a;->bJq: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;->bJs:Lrx/functions/Action0;
+    iget-object v5, p0, Lrx/internal/a/aj$a;->bJn: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;->bJw:Lrx/internal/util/c;
+    iget-object v2, p0, Lrx/internal/a/aj$a;->bJr: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;->bJu:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v0, p0, Lrx/internal/a/aj$a;->bJp: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;->bJv:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v0, p0, Lrx/internal/a/aj$a;->bJq: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;->bJw:Lrx/internal/util/c;
+    iget-object v0, p0, Lrx/internal/a/aj$a;->bJr: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;->Ji()V
+    invoke-virtual {v0}, Lrx/internal/util/c;->Jg()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;->bJv:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v0, p0, Lrx/internal/a/aj$a;->bJq: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;->bJw:Lrx/internal/util/c;
+    iget-object v0, p0, Lrx/internal/a/aj$a;->bJr: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;->Jy()Z
+    invoke-direct {p0}, Lrx/internal/a/aj$a;->Jw()Z
 
     move-result v0
 
@@ -327,7 +327,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lrx/internal/a/aj$a;->bmF:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v0, p0, Lrx/internal/a/aj$a;->bmA: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;->bJw:Lrx/internal/util/c;
+    iget-object p1, p0, Lrx/internal/a/aj$a;->bJr:Lrx/internal/util/c;
 
-    invoke-virtual {p1}, Lrx/internal/util/c;->Ji()V
+    invoke-virtual {p1}, Lrx/internal/util/c;->Jg()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;->bmF:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v0, p0, Lrx/internal/a/aj$a;->bmA: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;->bmF:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v0, p0, Lrx/internal/a/aj$a;->bmA: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;->bJu:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v1, p0, Lrx/internal/a/aj$a;->bJp: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 d56942cb79..5f20710105 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 bJx:Lrx/internal/a/aj;
+.field static final bJs: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;->bJx:Lrx/internal/a/aj;
+    sput-object v0, Lrx/internal/a/aj$b;->bJs: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 c87f539bd3..04566b742a 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 bJr:Ljava/lang/Long;
+.field private final bJm:Ljava/lang/Long;
 
-.field private final bJs:Lrx/functions/Action0;
+.field private final bJn:Lrx/functions/Action0;
 
-.field private final bJt:Lrx/a$d;
+.field private final bJo:Lrx/a$d;
 
 
 # direct methods
@@ -42,18 +42,18 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lrx/internal/a/aj;->bJr:Ljava/lang/Long;
+    iput-object v0, p0, Lrx/internal/a/aj;->bJm:Ljava/lang/Long;
 
-    iput-object v0, p0, Lrx/internal/a/aj;->bJs:Lrx/functions/Action0;
+    iput-object v0, p0, Lrx/internal/a/aj;->bJn:Lrx/functions/Action0;
 
-    sget-object v0, Lrx/a;->bFT:Lrx/a$d;
+    sget-object v0, Lrx/a;->bFO:Lrx/a$d;
 
-    iput-object v0, p0, Lrx/internal/a/aj;->bJt:Lrx/a$d;
+    iput-object v0, p0, Lrx/internal/a/aj;->bJo:Lrx/a$d;
 
     return-void
 .end method
 
-.method public static Jx()Lrx/internal/a/aj;
+.method public static Jv()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;->bJx:Lrx/internal/a/aj;
+    sget-object v0, Lrx/internal/a/aj$b;->bJs: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;->bJr:Ljava/lang/Long;
+    iget-object v1, p0, Lrx/internal/a/aj;->bJm:Ljava/lang/Long;
 
-    iget-object v2, p0, Lrx/internal/a/aj;->bJs:Lrx/functions/Action0;
+    iget-object v2, p0, Lrx/internal/a/aj;->bJn:Lrx/functions/Action0;
 
-    iget-object v3, p0, Lrx/internal/a/aj;->bJt:Lrx/a$d;
+    iget-object v3, p0, Lrx/internal/a/aj;->bJo: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;->bJw:Lrx/internal/util/c;
+    iget-object v1, v0, Lrx/internal/a/aj$a;->bJr: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 184e16eada..61c1ed7c89 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 bJy:Lrx/internal/a/ak;
+.field static final bJt: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;->bJy:Lrx/internal/a/ak;
+    sput-object v0, Lrx/internal/a/ak$a;->bJt: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 648e933f77..f1005b3338 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 bJz:Ljava/lang/Object;
+.field static final bJu: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;->bJz:Ljava/lang/Object;
+    sput-object v0, Lrx/internal/a/ak$b;->bJu: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;->bJz:Ljava/lang/Object;
+    sget-object v0, Lrx/internal/a/ak$b;->bJu:Ljava/lang/Object;
 
     invoke-direct {p1, v0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>(Ljava/lang/Object;)V
 
@@ -118,37 +118,7 @@
     return-void
 .end method
 
-.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
+.method private Jr()V
     .locals 9
 
     monitor-enter p0
@@ -204,7 +174,7 @@
 
     if-lez v7, :cond_2
 
-    sget-object v2, Lrx/internal/a/ak$b;->bJz:Ljava/lang/Object;
+    sget-object v2, Lrx/internal/a/ak$b;->bJu:Ljava/lang/Object;
 
     if-eq v4, v2, :cond_2
 
@@ -214,16 +184,16 @@
 
     iget-object v2, p0, Lrx/internal/a/ak$b;->value:Ljava/util/concurrent/atomic/AtomicReference;
 
-    sget-object v3, Lrx/internal/a/ak$b;->bJz:Ljava/lang/Object;
+    sget-object v3, Lrx/internal/a/ak$b;->bJu: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;->JA()J
+    invoke-direct {p0}, Lrx/internal/a/ak$b;->Jy()J
 
-    sget-object v4, Lrx/internal/a/ak$b;->bJz:Ljava/lang/Object;
+    sget-object v4, Lrx/internal/a/ak$b;->bJu:Ljava/lang/Object;
 
     :cond_2
-    sget-object v2, Lrx/internal/a/ak$b;->bJz:Ljava/lang/Object;
+    sget-object v2, Lrx/internal/a/ak$b;->bJu:Ljava/lang/Object;
 
     if-ne v4, v2, :cond_4
 
@@ -357,6 +327,36 @@
     goto :goto_5
 .end method
 
+.method private Jy()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;->Jt()V
+    invoke-direct {p0}, Lrx/internal/a/ak$b;->Jr()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;->Jt()V
+    invoke-direct {p0}, Lrx/internal/a/ak$b;->Jr()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;->Jt()V
+    invoke-direct {p0}, Lrx/internal/a/ak$b;->Jr()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;->Jh()V
+    invoke-virtual {p1}, Lrx/internal/a/ak$c;->Jf()V
 
     :cond_4
-    invoke-direct {p0}, Lrx/internal/a/ak$b;->Jt()V
+    invoke-direct {p0}, Lrx/internal/a/ak$b;->Jr()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 e4ab7b3cdb..4fef526ad6 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 bJA:Lrx/internal/a/ak$b;
+.field private final bJv: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;->bJA:Lrx/internal/a/ak$b;
+    iput-object p1, p0, Lrx/internal/a/ak$c;->bJv:Lrx/internal/a/ak$b;
 
     return-void
 .end method
 
 
 # virtual methods
-.method final Jh()V
+.method final Jf()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;->bJA:Lrx/internal/a/ak$b;
+    iget-object v0, p0, Lrx/internal/a/ak$c;->bJv: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;->bJA:Lrx/internal/a/ak$b;
+    iget-object v0, p0, Lrx/internal/a/ak$c;->bJv: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;->bJA:Lrx/internal/a/ak$b;
+    iget-object v0, p0, Lrx/internal/a/ak$c;->bJv: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 be714764ab..172191f1cd 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 Jz()Lrx/internal/a/ak;
+.method public static Jx()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;->bJy:Lrx/internal/a/ak;
+    sget-object v0, Lrx/internal/a/ak$a;->bJt: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 42ce4f5928..5a2bc3c369 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 bJC:Lrx/functions/b;
+.field final synthetic bJx:Lrx/functions/b;
 
 
 # direct methods
 .method constructor <init>(Lrx/functions/b;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/a/al$1;->bJC:Lrx/functions/b;
+    iput-object p1, p0, Lrx/internal/a/al$1;->bJx: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;->bJC:Lrx/functions/b;
+    iget-object v0, p0, Lrx/internal/a/al$1;->bJx: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 a2bad417b0..11d7c0c62e 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 bJF:Lrx/internal/a/al$2;
+.field final synthetic bJA: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;->bJF:Lrx/internal/a/al$2;
+    iput-object p1, p0, Lrx/internal/a/al$2$1;->bJA: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;->bJF:Lrx/internal/a/al$2;
+    iget-object v0, p0, Lrx/internal/a/al$2$1;->bJA:Lrx/internal/a/al$2;
 
-    iget-object v0, v0, Lrx/internal/a/al$2;->bHH:Lrx/Subscriber;
+    iget-object v0, v0, Lrx/internal/a/al$2;->bHC: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;->bJF:Lrx/internal/a/al$2;
+    iget-object v0, p0, Lrx/internal/a/al$2$1;->bJA:Lrx/internal/a/al$2;
 
-    iget-object v0, v0, Lrx/internal/a/al$2;->bHH:Lrx/Subscriber;
+    iget-object v0, v0, Lrx/internal/a/al$2;->bHC: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;->bJF:Lrx/internal/a/al$2;
+    iget-object v0, p0, Lrx/internal/a/al$2$1;->bJA:Lrx/internal/a/al$2;
 
-    iget-object v0, v0, Lrx/internal/a/al$2;->bHH:Lrx/Subscriber;
+    iget-object v0, v0, Lrx/internal/a/al$2;->bHC: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;->bJF:Lrx/internal/a/al$2;
+    iget-object v0, p0, Lrx/internal/a/al$2$1;->bJA:Lrx/internal/a/al$2;
 
-    iget-object v0, v0, Lrx/internal/a/al$2;->bJD:Lrx/internal/b/a;
+    iget-object v0, v0, Lrx/internal/a/al$2;->bJy: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 b6cddf1304..2b2c784c89 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 bHH:Lrx/Subscriber;
+.field final synthetic bHC:Lrx/Subscriber;
 
-.field final synthetic bJD:Lrx/internal/b/a;
+.field final synthetic bJy:Lrx/internal/b/a;
 
-.field final synthetic bJE:Lrx/internal/a/al;
+.field final synthetic bJz: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;->bJE:Lrx/internal/a/al;
+    iput-object p1, p0, Lrx/internal/a/al$2;->bJz:Lrx/internal/a/al;
 
-    iput-object p2, p0, Lrx/internal/a/al$2;->bHH:Lrx/Subscriber;
+    iput-object p2, p0, Lrx/internal/a/al$2;->bHC:Lrx/Subscriber;
 
-    iput-object p3, p0, Lrx/internal/a/al$2;->bJD:Lrx/internal/b/a;
+    iput-object p3, p0, Lrx/internal/a/al$2;->bJy: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;->bHH:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/al$2;->bHC: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;->bJD:Lrx/internal/b/a;
+    iget-object v3, p0, Lrx/internal/a/al$2;->bJy: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;->bJE:Lrx/internal/a/al;
+    iget-object v1, p0, Lrx/internal/a/al$2;->bJz:Lrx/internal/a/al;
 
-    iget-object v1, v1, Lrx/internal/a/al;->bJB:Lrx/functions/b;
+    iget-object v1, v1, Lrx/internal/a/al;->bJw: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;->bHH:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/al$2;->bHC: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;->bHH:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/al$2;->bHC: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;->bJD:Lrx/internal/b/a;
+    iget-object v0, p0, Lrx/internal/a/al$2;->bJy: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 51611b5319..a93da706f3 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 bJB:Lrx/functions/b;
+.field final bJw: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;->bJB:Lrx/functions/b;
+    iput-object p1, p0, Lrx/internal/a/al;->bJw: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 c136cfe1c8..510ceefcc3 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 bJH:Ljava/util/concurrent/atomic/AtomicReference;
+.field final synthetic bJC: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;->bJH:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object p1, p0, Lrx/internal/a/am$1;->bJC: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;->bJH:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/internal/a/am$1;->bJC: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;->bJH:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lrx/internal/a/am$1;->bJC: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;->bJH:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lrx/internal/a/am$1;->bJC: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;->bJL:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, v0, Lrx/internal/a/am$b;->bJG: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;->bJK:[Lrx/internal/a/am$a;
+    sget-object v3, Lrx/internal/a/am$b;->bJF:[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;->bJL:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v3, v0, Lrx/internal/a/am$b;->bJG: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 55e55f921c..ede1bcff77 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 JA()J
+.method public final Jy()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;->JB()V
+    invoke-virtual {p1}, Lrx/internal/a/am$b;->Jz()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;->bJL:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, v0, Lrx/internal/a/am$b;->bJG: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;->bJJ:[Lrx/internal/a/am$a;
+    sget-object v2, Lrx/internal/a/am$b;->bJE:[Lrx/internal/a/am$a;
 
     if-eq v1, v2, :cond_5
 
-    sget-object v2, Lrx/internal/a/am$b;->bJK:[Lrx/internal/a/am$a;
+    sget-object v2, Lrx/internal/a/am$b;->bJF:[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;->bJJ:[Lrx/internal/a/am$a;
+    sget-object v2, Lrx/internal/a/am$b;->bJE:[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;->bJL:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v3, v0, Lrx/internal/a/am$b;->bJG: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;->JB()V
+    invoke-virtual {v0}, Lrx/internal/a/am$b;->Jz()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 fd95de6949..6d74435b8b 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 bJN:Lrx/internal/a/am$b;
+.field final synthetic bJI: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;->bJN:Lrx/internal/a/am$b;
+    iput-object p1, p0, Lrx/internal/a/am$b$1;->bJI: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;->bJN:Lrx/internal/a/am$b;
-
-    iget-object v0, v0, Lrx/internal/a/am$b;->bJL:Ljava/util/concurrent/atomic/AtomicReference;
-
-    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;->bJN:Lrx/internal/a/am$b;
+    iget-object v0, p0, Lrx/internal/a/am$b$1;->bJI:Lrx/internal/a/am$b;
 
     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;->bJN:Lrx/internal/a/am$b;
+    sget-object v1, Lrx/internal/a/am$b;->bJF:[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;->bJI:Lrx/internal/a/am$b;
+
+    iget-object v0, v0, Lrx/internal/a/am$b;->bJB:Ljava/util/concurrent/atomic/AtomicReference;
+
+    iget-object v1, p0, Lrx/internal/a/am$b$1;->bJI: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 6e4ea5cee6..d3ed87e934 100644
--- a/com.discord/smali_classes2/rx/internal/a/am$b.smali
+++ b/com.discord/smali_classes2/rx/internal/a/am$b.smali
@@ -29,13 +29,13 @@
 
 
 # static fields
-.field static final bJJ:[Lrx/internal/a/am$a;
+.field static final bJE:[Lrx/internal/a/am$a;
 
-.field static final bJK:[Lrx/internal/a/am$a;
+.field static final bJF:[Lrx/internal/a/am$a;
 
 
 # instance fields
-.field final bJG:Ljava/util/concurrent/atomic/AtomicReference;
+.field final bJB:Ljava/util/concurrent/atomic/AtomicReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReference<",
@@ -45,9 +45,9 @@
     .end annotation
 .end field
 
-.field volatile bJI:Ljava/lang/Object;
+.field volatile bJD:Ljava/lang/Object;
 
-.field final bJL:Ljava/util/concurrent/atomic/AtomicReference;
+.field final bJG:Ljava/util/concurrent/atomic/AtomicReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReference<",
@@ -58,7 +58,7 @@
     .end annotation
 .end field
 
-.field final bJM:Ljava/util/concurrent/atomic/AtomicBoolean;
+.field final bJH: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;->bJJ:[Lrx/internal/a/am$a;
+    sput-object v1, Lrx/internal/a/am$b;->bJE:[Lrx/internal/a/am$a;
 
     new-array v0, v0, [Lrx/internal/a/am$a;
 
-    sput-object v0, Lrx/internal/a/am$b;->bJK:[Lrx/internal/a/am$a;
+    sput-object v0, Lrx/internal/a/am$b;->bJF:[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;->Kd()Z
+    invoke-static {}, Lrx/internal/util/b/ae;->Kb()Z
 
     move-result v0
 
@@ -113,7 +113,7 @@
 
     new-instance v0, Lrx/internal/util/b/q;
 
-    sget v1, Lrx/internal/util/i;->bNf:I
+    sget v1, Lrx/internal/util/i;->bNa: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;->bNf:I
+    sget v1, Lrx/internal/util/i;->bNa: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;->bJJ:[Lrx/internal/a/am$a;
+    sget-object v1, Lrx/internal/a/am$b;->bJE:[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;->bJL:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object v0, p0, Lrx/internal/a/am$b;->bJG:Ljava/util/concurrent/atomic/AtomicReference;
 
-    iput-object p1, p0, Lrx/internal/a/am$b;->bJG:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object p1, p0, Lrx/internal/a/am$b;->bJB: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;->bJM:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iput-object p1, p0, Lrx/internal/a/am$b;->bJH: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;->bJG:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object p1, p0, Lrx/internal/a/am$b;->bJB: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;->bJL:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object p1, p0, Lrx/internal/a/am$b;->bJG:Ljava/util/concurrent/atomic/AtomicReference;
 
-    sget-object p2, Lrx/internal/a/am$b;->bJK:[Lrx/internal/a/am$a;
+    sget-object p2, Lrx/internal/a/am$b;->bJF:[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;->bJG:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object p2, p0, Lrx/internal/a/am$b;->bJB: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;->bJL:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object p2, p0, Lrx/internal/a/am$b;->bJG:Ljava/util/concurrent/atomic/AtomicReference;
 
-    sget-object v1, Lrx/internal/a/am$b;->bJK:[Lrx/internal/a/am$a;
+    sget-object v1, Lrx/internal/a/am$b;->bJF:[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 JB()V
+.method final Jz()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;->bJI:Ljava/lang/Object;
+    iget-object v0, v1, Lrx/internal/a/am$b;->bJD: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;->bJL:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, v1, Lrx/internal/a/am$b;->bJG: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;->bJI:Ljava/lang/Object;
+    iget-object v0, v1, Lrx/internal/a/am$b;->bJD: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;->bJI:Ljava/lang/Object;
+    iget-object v0, v1, Lrx/internal/a/am$b;->bJD: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;->JA()J
+    invoke-virtual {v14}, Lrx/internal/a/am$a;->Jy()J
 
     goto :goto_7
 
@@ -649,17 +649,17 @@
 .method public final onCompleted()V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/am$b;->bJI:Ljava/lang/Object;
+    iget-object v0, p0, Lrx/internal/a/am$b;->bJD:Ljava/lang/Object;
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lrx/internal/a/g;->Jg()Ljava/lang/Object;
+    invoke-static {}, Lrx/internal/a/g;->Je()Ljava/lang/Object;
 
     move-result-object v0
 
-    iput-object v0, p0, Lrx/internal/a/am$b;->bJI:Ljava/lang/Object;
+    iput-object v0, p0, Lrx/internal/a/am$b;->bJD:Ljava/lang/Object;
 
-    invoke-virtual {p0}, Lrx/internal/a/am$b;->JB()V
+    invoke-virtual {p0}, Lrx/internal/a/am$b;->Jz()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;->bJI:Ljava/lang/Object;
+    iget-object v0, p0, Lrx/internal/a/am$b;->bJD: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;->bJI:Ljava/lang/Object;
+    iput-object p1, p0, Lrx/internal/a/am$b;->bJD:Ljava/lang/Object;
 
-    invoke-virtual {p0}, Lrx/internal/a/am$b;->JB()V
+    invoke-virtual {p0}, Lrx/internal/a/am$b;->Jz()V
 
     :cond_0
     return-void
@@ -713,7 +713,7 @@
     return-void
 
     :cond_0
-    invoke-virtual {p0}, Lrx/internal/a/am$b;->JB()V
+    invoke-virtual {p0}, Lrx/internal/a/am$b;->Jz()V
 
     return-void
 .end method
@@ -721,7 +721,7 @@
 .method public final onStart()V
     .locals 2
 
-    sget v0, Lrx/internal/util/i;->bNf:I
+    sget v0, Lrx/internal/util/i;->bNa: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 ab0a2d8e21..cca8969302 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 bHe:Lrx/Observable;
+.field final bGZ:Lrx/Observable;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/Observable<",
@@ -32,7 +32,7 @@
     .end annotation
 .end field
 
-.field final bJG:Ljava/util/concurrent/atomic/AtomicReference;
+.field final bJB: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;->bHe:Lrx/Observable;
+    iput-object p2, p0, Lrx/internal/a/am;->bGZ:Lrx/Observable;
 
-    iput-object p3, p0, Lrx/internal/a/am;->bJG:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object p3, p0, Lrx/internal/a/am;->bJB: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;->bJG:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/internal/a/am;->bJB: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;->bJG:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lrx/internal/a/am;->bJB: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;->bJG:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lrx/internal/a/am;->bJB: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;->bJM:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v1, v0, Lrx/internal/a/am$b;->bJH: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;->bJM:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v1, v0, Lrx/internal/a/am$b;->bJH: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;->bHe:Lrx/Observable;
+    iget-object p1, p0, Lrx/internal/a/am;->bGZ: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 1e4f77da14..e9f8cdb94d 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 bJQ:I
+.field final synthetic bJL:I
 
 
 # direct methods
 .method constructor <init>(I)V
     .locals 0
 
-    iput p1, p0, Lrx/internal/a/an$2;->bJQ:I
+    iput p1, p0, Lrx/internal/a/an$2;->bJL: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;->bJQ:I
+    iget v1, p0, Lrx/internal/a/an$2;->bJL: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 cddd323fbf..111298e5ce 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:Ljava/util/concurrent/atomic/AtomicReference;
+.field final synthetic bJC:Ljava/util/concurrent/atomic/AtomicReference;
 
-.field final synthetic bJR:Lrx/functions/Func0;
+.field final synthetic bJM: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;->bJH:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object p1, p0, Lrx/internal/a/an$3;->bJC:Ljava/util/concurrent/atomic/AtomicReference;
 
-    iput-object p2, p0, Lrx/internal/a/an$3;->bJR:Lrx/functions/Func0;
+    iput-object p2, p0, Lrx/internal/a/an$3;->bJM: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;->bJH:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/internal/a/an$3;->bJC: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;->bJR:Lrx/functions/Func0;
+    iget-object v2, p0, Lrx/internal/a/an$3;->bJM: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;->bJH:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lrx/internal/a/an$3;->bJC: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;->bJS:Lrx/internal/a/an$d;
+    iget-object v0, v0, Lrx/internal/a/an$e;->bJN: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 aee982cc1b..3d772a5121 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 JC()V
+.method JA()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;->JC()V
+    invoke-virtual {p0}, Lrx/internal/a/an$a;->JA()V
 
     return-void
 .end method
@@ -378,7 +378,7 @@
 .method public final complete()V
     .locals 6
 
-    invoke-static {}, Lrx/internal/a/g;->Jg()Ljava/lang/Object;
+    invoke-static {}, Lrx/internal/a/g;->Je()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 15eef427c7..08956c09e2 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;->bJS:Lrx/internal/a/an$d;
+    iget-object p1, p1, Lrx/internal/a/an$e;->bJN: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;->bJV:Lrx/internal/util/g;
+    iget-object v1, v0, Lrx/internal/a/an$e;->bJQ: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;->bJV:Lrx/internal/util/g;
+    iget-object v2, v0, Lrx/internal/a/an$e;->bJQ:Lrx/internal/util/g;
 
-    iget-object v3, v2, Lrx/internal/util/g;->bNc:[Ljava/lang/Object;
+    iget-object v3, v2, Lrx/internal/util/g;->bMX:[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;->bJV:Lrx/internal/util/g;
+    iget-object v2, v0, Lrx/internal/a/an$e;->bJQ: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;->bJT:[Lrx/internal/a/an$b;
+    sget-object v2, Lrx/internal/a/an$e;->bJO:[Lrx/internal/a/an$b;
 
-    iput-object v2, v0, Lrx/internal/a/an$e;->bJW:[Lrx/internal/a/an$b;
+    iput-object v2, v0, Lrx/internal/a/an$e;->bJR:[Lrx/internal/a/an$b;
 
     :cond_4
-    iget-wide v2, v0, Lrx/internal/a/an$e;->bJX:J
+    iget-wide v2, v0, Lrx/internal/a/an$e;->bJS:J
 
     const-wide/16 v4, 0x1
 
     add-long/2addr v2, v4
 
-    iput-wide v2, v0, Lrx/internal/a/an$e;->bJX:J
+    iput-wide v2, v0, Lrx/internal/a/an$e;->bJS: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 1dfc5b49cf..c6cb4719a4 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 bKd:Lrx/internal/a/an$e;
+.field final synthetic bJY: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;->bKd:Lrx/internal/a/an$e;
+    iput-object p1, p0, Lrx/internal/a/an$e$1;->bJY: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;->bKd:Lrx/internal/a/an$e;
+    iget-object v0, p0, Lrx/internal/a/an$e$1;->bJY: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;->bKd:Lrx/internal/a/an$e;
+    iget-object v0, p0, Lrx/internal/a/an$e$1;->bJY:Lrx/internal/a/an$e;
 
-    iget-object v0, v0, Lrx/internal/a/an$e;->bJV:Lrx/internal/util/g;
+    iget-object v0, v0, Lrx/internal/a/an$e;->bJQ:Lrx/internal/util/g;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lrx/internal/a/an$e$1;->bKd:Lrx/internal/a/an$e;
+    iget-object v1, p0, Lrx/internal/a/an$e$1;->bJY: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;->bKd:Lrx/internal/a/an$e;
+    iget-object v1, p0, Lrx/internal/a/an$e$1;->bJY:Lrx/internal/a/an$e;
 
-    iget-object v1, v1, Lrx/internal/a/an$e;->bJV:Lrx/internal/util/g;
+    iget-object v1, v1, Lrx/internal/a/an$e;->bJQ: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;->bNc:[Ljava/lang/Object;
+    iput-object v2, v1, Lrx/internal/util/g;->bMX:[Ljava/lang/Object;
 
-    iget-object v1, p0, Lrx/internal/a/an$e$1;->bKd:Lrx/internal/a/an$e;
+    iget-object v1, p0, Lrx/internal/a/an$e$1;->bJY:Lrx/internal/a/an$e;
 
-    iget-wide v2, v1, Lrx/internal/a/an$e;->bJX:J
+    iget-wide v2, v1, Lrx/internal/a/an$e;->bJS:J
 
     const-wide/16 v4, 0x1
 
     add-long/2addr v2, v4
 
-    iput-wide v2, v1, Lrx/internal/a/an$e;->bJX:J
+    iput-wide v2, v1, Lrx/internal/a/an$e;->bJS:J
 
-    iget-object v1, p0, Lrx/internal/a/an$e$1;->bKd:Lrx/internal/a/an$e;
+    iget-object v1, p0, Lrx/internal/a/an$e$1;->bJY: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 845459ef56..3ae08faa5f 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 bJT:[Lrx/internal/a/an$b;
+.field static final bJO:[Lrx/internal/a/an$b;
 
-.field static final bJU:[Lrx/internal/a/an$b;
+.field static final bJP:[Lrx/internal/a/an$b;
 
 
 # instance fields
-.field final bJM:Ljava/util/concurrent/atomic/AtomicBoolean;
+.field final bJH:Ljava/util/concurrent/atomic/AtomicBoolean;
 
-.field final bJS:Lrx/internal/a/an$d;
+.field final bJN: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 bJV:Lrx/internal/util/g;
+.field final bJQ:Lrx/internal/util/g;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/internal/util/g<",
@@ -56,7 +56,7 @@
     .end annotation
 .end field
 
-.field bJW:[Lrx/internal/a/an$b;
+.field bJR:[Lrx/internal/a/an$b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "[",
@@ -66,15 +66,15 @@
     .end annotation
 .end field
 
-.field volatile bJX:J
+.field volatile bJS:J
 
-.field bJY:J
+.field bJT:J
 
-.field bJZ:J
+.field bJU:J
 
-.field bKa:J
+.field bJV:J
 
-.field bKb:Ljava/util/List;
+.field bJW:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -84,7 +84,7 @@
     .end annotation
 .end field
 
-.field bKc:Z
+.field bJX: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;->bJT:[Lrx/internal/a/an$b;
+    sput-object v1, Lrx/internal/a/an$e;->bJO:[Lrx/internal/a/an$b;
 
     new-array v0, v0, [Lrx/internal/a/an$b;
 
-    sput-object v0, Lrx/internal/a/an$e;->bJU:[Lrx/internal/a/an$b;
+    sput-object v0, Lrx/internal/a/an$e;->bJP:[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;->bJS:Lrx/internal/a/an$d;
+    iput-object p1, p0, Lrx/internal/a/an$e;->bJN: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;->bJV:Lrx/internal/util/g;
+    iput-object p1, p0, Lrx/internal/a/an$e;->bJQ:Lrx/internal/util/g;
 
-    sget-object p1, Lrx/internal/a/an$e;->bJT:[Lrx/internal/a/an$b;
+    sget-object p1, Lrx/internal/a/an$e;->bJO:[Lrx/internal/a/an$b;
 
-    iput-object p1, p0, Lrx/internal/a/an$e;->bJW:[Lrx/internal/a/an$b;
+    iput-object p1, p0, Lrx/internal/a/an$e;->bJR:[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;->bJM:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iput-object p1, p0, Lrx/internal/a/an$e;->bJH:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     const-wide/16 v0, 0x0
 
@@ -151,7 +151,7 @@
     return-void
 .end method
 
-.method private JD()[Lrx/internal/a/an$b;
+.method private JB()[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;->bJV:Lrx/internal/util/g;
+    iget-object v0, p0, Lrx/internal/a/an$e;->bJQ:Lrx/internal/util/g;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lrx/internal/a/an$e;->bJV:Lrx/internal/util/g;
+    iget-object v1, p0, Lrx/internal/a/an$e;->bJQ:Lrx/internal/util/g;
 
-    iget-object v1, v1, Lrx/internal/util/g;->bNc:[Ljava/lang/Object;
+    iget-object v1, v1, Lrx/internal/util/g;->bMX:[Ljava/lang/Object;
 
     array-length v2, v1
 
@@ -192,14 +192,14 @@
     throw v1
 .end method
 
-.method private JE()V
+.method private JC()V
     .locals 7
 
-    iget-object v0, p0, Lrx/internal/a/an$e;->bJW:[Lrx/internal/a/an$b;
+    iget-object v0, p0, Lrx/internal/a/an$e;->bJR:[Lrx/internal/a/an$b;
 
-    iget-wide v1, p0, Lrx/internal/a/an$e;->bJY:J
+    iget-wide v1, p0, Lrx/internal/a/an$e;->bJT:J
 
-    iget-wide v3, p0, Lrx/internal/a/an$e;->bJX:J
+    iget-wide v3, p0, Lrx/internal/a/an$e;->bJS:J
 
     const/4 v5, 0x0
 
@@ -207,16 +207,16 @@
 
     if-eqz v6, :cond_1
 
-    iget-object v1, p0, Lrx/internal/a/an$e;->bJV:Lrx/internal/util/g;
+    iget-object v1, p0, Lrx/internal/a/an$e;->bJQ:Lrx/internal/util/g;
 
     monitor-enter v1
 
     :try_start_0
-    iget-object v0, p0, Lrx/internal/a/an$e;->bJW:[Lrx/internal/a/an$b;
+    iget-object v0, p0, Lrx/internal/a/an$e;->bJR:[Lrx/internal/a/an$b;
 
-    iget-object v2, p0, Lrx/internal/a/an$e;->bJV:Lrx/internal/util/g;
+    iget-object v2, p0, Lrx/internal/a/an$e;->bJQ:Lrx/internal/util/g;
 
-    iget-object v2, v2, Lrx/internal/util/g;->bNc:[Ljava/lang/Object;
+    iget-object v2, v2, Lrx/internal/util/g;->bMX:[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;->bJW:[Lrx/internal/a/an$b;
+    iput-object v0, p0, Lrx/internal/a/an$e;->bJR:[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;->bJX:J
+    iget-wide v2, p0, Lrx/internal/a/an$e;->bJS:J
 
-    iput-wide v2, p0, Lrx/internal/a/an$e;->bJY:J
+    iput-wide v2, p0, Lrx/internal/a/an$e;->bJT:J
 
     monitor-exit v1
 
@@ -250,7 +250,7 @@
 
     :cond_1
     :goto_0
-    iget-object v1, p0, Lrx/internal/a/an$e;->bJS:Lrx/internal/a/an$d;
+    iget-object v1, p0, Lrx/internal/a/an$e;->bJN: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;->bKa:J
+    iget-wide v0, p0, Lrx/internal/a/an$e;->bJV: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;->bJZ:J
+    iput-wide p1, p0, Lrx/internal/a/an$e;->bJU:J
 
     if-eqz v2, :cond_1
 
@@ -295,7 +295,7 @@
 
     if-eqz p1, :cond_0
 
-    iput-wide v3, p0, Lrx/internal/a/an$e;->bKa:J
+    iput-wide v3, p0, Lrx/internal/a/an$e;->bJV: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;->bKa:J
+    iput-wide v0, p0, Lrx/internal/a/an$e;->bJV:J
 
     return-void
 
@@ -329,7 +329,7 @@
 
     if-eqz v2, :cond_4
 
-    iput-wide v3, p0, Lrx/internal/a/an$e;->bKa:J
+    iput-wide v3, p0, Lrx/internal/a/an$e;->bJV: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;->bJV:Lrx/internal/util/g;
+    iget-object v0, p0, Lrx/internal/a/an$e;->bJQ:Lrx/internal/util/g;
 
     monitor-enter v0
 
@@ -372,9 +372,9 @@
     return v1
 
     :cond_1
-    iget-object v1, p0, Lrx/internal/a/an$e;->bJV:Lrx/internal/util/g;
+    iget-object v1, p0, Lrx/internal/a/an$e;->bJQ:Lrx/internal/util/g;
 
-    iget-object v2, v1, Lrx/internal/util/g;->bNc:[Ljava/lang/Object;
+    iget-object v2, v1, Lrx/internal/util/g;->bMX:[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;->bNc:[Ljava/lang/Object;
+    iget-object p1, v1, Lrx/internal/util/g;->bMX:[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;->bNc:[Ljava/lang/Object;
+    iput-object v5, v1, Lrx/internal/util/g;->bMX:[Ljava/lang/Object;
 
     :cond_8
     :goto_1
-    iget-wide v1, p0, Lrx/internal/a/an$e;->bJX:J
+    iget-wide v1, p0, Lrx/internal/a/an$e;->bJS:J
 
     const-wide/16 v3, 0x1
 
     add-long/2addr v1, v3
 
-    iput-wide v1, p0, Lrx/internal/a/an$e;->bJX:J
+    iput-wide v1, p0, Lrx/internal/a/an$e;->bJS:J
 
     monitor-exit v0
 
@@ -565,7 +565,7 @@
 
     if-eqz p1, :cond_2
 
-    iget-object v0, p0, Lrx/internal/a/an$e;->bKb:Ljava/util/List;
+    iget-object v0, p0, Lrx/internal/a/an$e;->bJW: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;->bKb:Ljava/util/List;
+    iput-object v0, p0, Lrx/internal/a/an$e;->bJW: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;->bKc:Z
+    iput-boolean v1, p0, Lrx/internal/a/an$e;->bJX: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;->bJZ:J
+    iget-wide v0, p0, Lrx/internal/a/an$e;->bJU:J
 
     const/4 v2, 0x0
 
@@ -616,7 +616,7 @@
     goto :goto_2
 
     :cond_4
-    invoke-direct {p0}, Lrx/internal/a/an$e;->JD()[Lrx/internal/a/an$b;
+    invoke-direct {p0}, Lrx/internal/a/an$e;->JB()[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;->bKb:Ljava/util/List;
+    iget-object p1, p0, Lrx/internal/a/an$e;->bJW:Ljava/util/List;
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lrx/internal/a/an$e;->bKb:Ljava/util/List;
+    iput-object v0, p0, Lrx/internal/a/an$e;->bJW:Ljava/util/List;
 
-    iget-boolean v0, p0, Lrx/internal/a/an$e;->bKc:Z
+    iget-boolean v0, p0, Lrx/internal/a/an$e;->bJX:Z
 
-    iput-boolean v2, p0, Lrx/internal/a/an$e;->bKc:Z
+    iput-boolean v2, p0, Lrx/internal/a/an$e;->bJX: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;->bJZ:J
+    iget-wide v3, p0, Lrx/internal/a/an$e;->bJU: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;->JD()[Lrx/internal/a/an$b;
+    invoke-direct {p0}, Lrx/internal/a/an$e;->JB()[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;->bJS:Lrx/internal/a/an$d;
+    iget-object v0, p0, Lrx/internal/a/an$e;->bJN:Lrx/internal/a/an$d;
 
     invoke-interface {v0}, Lrx/internal/a/an$d;->complete()V
 
-    invoke-direct {p0}, Lrx/internal/a/an$e;->JE()V
+    invoke-direct {p0}, Lrx/internal/a/an$e;->JC()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;->bJS:Lrx/internal/a/an$d;
+    iget-object v0, p0, Lrx/internal/a/an$e;->bJN: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;->JE()V
+    invoke-direct {p0}, Lrx/internal/a/an$e;->JC()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;->bJS:Lrx/internal/a/an$d;
+    iget-object v0, p0, Lrx/internal/a/an$e;->bJN: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;->JE()V
+    invoke-direct {p0}, Lrx/internal/a/an$e;->JC()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;->JE()V
+    invoke-direct {p0}, Lrx/internal/a/an$e;->JC()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 ac63971ff9..68b7c7a34b 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 JC()V
+.method final JA()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 321645a7fd..6613e0ebf0 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;->Jg()Ljava/lang/Object;
+    invoke-static {}, Lrx/internal/a/g;->Je()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 c76e236f11..49877fa83b 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 bJP:Lrx/functions/Func0;
+.field static final bJK:Lrx/functions/Func0;
 
 
 # instance fields
-.field final bHe:Lrx/Observable;
+.field final bGZ:Lrx/Observable;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/Observable<",
@@ -45,7 +45,7 @@
     .end annotation
 .end field
 
-.field final bJG:Ljava/util/concurrent/atomic/AtomicReference;
+.field final bJB:Ljava/util/concurrent/atomic/AtomicReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReference<",
@@ -55,7 +55,7 @@
     .end annotation
 .end field
 
-.field final bJO:Lrx/functions/Func0;
+.field final bJJ:Lrx/functions/Func0;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/Func0<",
@@ -75,7 +75,7 @@
 
     invoke-direct {v0}, Lrx/internal/a/an$1;-><init>()V
 
-    sput-object v0, Lrx/internal/a/an;->bJP:Lrx/functions/Func0;
+    sput-object v0, Lrx/internal/a/an;->bJK: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;->bHe:Lrx/Observable;
+    iput-object p2, p0, Lrx/internal/a/an;->bGZ:Lrx/Observable;
 
-    iput-object p3, p0, Lrx/internal/a/an;->bJG:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object p3, p0, Lrx/internal/a/an;->bJB:Ljava/util/concurrent/atomic/AtomicReference;
 
-    iput-object p4, p0, Lrx/internal/a/an;->bJO:Lrx/functions/Func0;
+    iput-object p4, p0, Lrx/internal/a/an;->bJJ:Lrx/functions/Func0;
 
     return-void
 .end method
@@ -160,7 +160,7 @@
     .end annotation
 
     :cond_0
-    iget-object v0, p0, Lrx/internal/a/an;->bJG:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/internal/a/an;->bJB: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;->bJO:Lrx/functions/Func0;
+    iget-object v2, p0, Lrx/internal/a/an;->bJJ: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;->bJG:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lrx/internal/a/an;->bJB: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;->bJM:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v1, v0, Lrx/internal/a/an$e;->bJH: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;->bJM:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v1, v0, Lrx/internal/a/an$e;->bJH: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;->bHe:Lrx/Observable;
+    iget-object p1, p0, Lrx/internal/a/an;->bGZ: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;->bJG:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/internal/a/an;->bJB: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;->bJG:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/internal/a/an;->bJB: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 378477a0ad..26aa472838 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 bKe:Ljava/lang/Object;
+.field private static final bJZ: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;->bKe:Ljava/lang/Object;
+    sput-object v0, Lrx/internal/a/ao$a;->bJZ: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;->bKe:Ljava/lang/Object;
+    sget-object v1, Lrx/internal/a/ao$a;->bJZ: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 JF()V
+.method private JD()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;->bKe:Ljava/lang/Object;
+    sget-object v1, Lrx/internal/a/ao$a;->bJZ: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;->bKe:Ljava/lang/Object;
+    sget-object v1, Lrx/internal/a/ao$a;->bJZ: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;->JF()V
+    invoke-direct {p0}, Lrx/internal/a/ao$a;->JD()V
 
     return-void
 .end method
@@ -137,7 +137,7 @@
 .method public final onCompleted()V
     .locals 1
 
-    invoke-direct {p0}, Lrx/internal/a/ao$a;->JF()V
+    invoke-direct {p0}, Lrx/internal/a/ao$a;->JD()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 6c9439464d..6d9d6f4771 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;->IY()Lrx/Scheduler$Worker;
+    invoke-virtual {v1}, Lrx/Scheduler;->IW()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 ec8c192ce4..e4a89b9fab 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 bGM:Ljava/lang/Object;
+.field final synthetic bGH:Ljava/lang/Object;
 
 
 # direct methods
 .method constructor <init>(Ljava/lang/Object;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/a/ap$1;->bGM:Ljava/lang/Object;
+    iput-object p1, p0, Lrx/internal/a/ap$1;->bGH: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;->bGM:Ljava/lang/Object;
+    iget-object v0, p0, Lrx/internal/a/ap$1;->bGH: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 2891b12201..cc84b83f04 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 final synthetic bHH:Lrx/Subscriber;
+.field final synthetic bHC:Lrx/Subscriber;
 
-.field bHl:Z
+.field bHg:Z
 
-.field final synthetic bKi:Lrx/internal/a/ap;
+.field final synthetic bKd: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;->bKi:Lrx/internal/a/ap;
+    iput-object p1, p0, Lrx/internal/a/ap$2;->bKd:Lrx/internal/a/ap;
 
-    iput-object p3, p0, Lrx/internal/a/ap$2;->bHH:Lrx/Subscriber;
+    iput-object p3, p0, Lrx/internal/a/ap$2;->bHC: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;->bHH:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/ap$2;->bHC: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;->bHH:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/ap$2;->bHC: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;->bHl:Z
+    iget-boolean v0, p0, Lrx/internal/a/ap$2;->bHg:Z
 
     if-nez v0, :cond_0
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lrx/internal/a/ap$2;->bHl:Z
+    iput-boolean v0, p0, Lrx/internal/a/ap$2;->bHg: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;->bKi:Lrx/internal/a/ap;
+    iget-object v1, p0, Lrx/internal/a/ap$2;->bKd:Lrx/internal/a/ap;
 
-    iget-object v1, v1, Lrx/internal/a/ap;->bKg:Lrx/functions/Func2;
+    iget-object v1, v1, Lrx/internal/a/ap;->bKb: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;->bHH:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/ap$2;->bHC: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;->bHH:Lrx/Subscriber;
+    iget-object v1, p0, Lrx/internal/a/ap$2;->bHC: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 fc4280ae61..f03f60d8d2 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 bGM:Ljava/lang/Object;
+.field final synthetic bGH:Ljava/lang/Object;
 
-.field final synthetic bKi:Lrx/internal/a/ap;
+.field final synthetic bKd:Lrx/internal/a/ap;
 
-.field final synthetic bKj:Lrx/internal/a/ap$a;
+.field final synthetic bKe: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;->bKi:Lrx/internal/a/ap;
+    iput-object p1, p0, Lrx/internal/a/ap$3;->bKd:Lrx/internal/a/ap;
 
-    iput-object p2, p0, Lrx/internal/a/ap$3;->bGM:Ljava/lang/Object;
+    iput-object p2, p0, Lrx/internal/a/ap$3;->bGH:Ljava/lang/Object;
 
-    iput-object p3, p0, Lrx/internal/a/ap$3;->bKj:Lrx/internal/a/ap$a;
+    iput-object p3, p0, Lrx/internal/a/ap$3;->bKe:Lrx/internal/a/ap$a;
 
     invoke-direct {p0}, Lrx/Subscriber;-><init>()V
 
-    iget-object p1, p0, Lrx/internal/a/ap$3;->bGM:Ljava/lang/Object;
+    iget-object p1, p0, Lrx/internal/a/ap$3;->bGH: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;->bKj:Lrx/internal/a/ap$a;
+    iget-object v0, p0, Lrx/internal/a/ap$3;->bKe: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;->bKj:Lrx/internal/a/ap$a;
+    iget-object v0, p0, Lrx/internal/a/ap$3;->bKe: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;->bKi:Lrx/internal/a/ap;
+    iget-object v1, p0, Lrx/internal/a/ap$3;->bKd:Lrx/internal/a/ap;
 
-    iget-object v1, v1, Lrx/internal/a/ap;->bKg:Lrx/functions/Func2;
+    iget-object v1, v1, Lrx/internal/a/ap;->bKb: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;->bKj:Lrx/internal/a/ap$a;
+    iget-object v0, p0, Lrx/internal/a/ap$3;->bKe: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;->bKj:Lrx/internal/a/ap$a;
+    iget-object v0, p0, Lrx/internal/a/ap$3;->bKe: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;->bKk:J
+    iget-wide v2, v0, Lrx/internal/a/ap$a;->bKf: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;->bKk:J
+    iput-wide v4, v0, Lrx/internal/a/ap$a;->bKf: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;->Jt()V
+    invoke-virtual {v0}, Lrx/internal/a/ap$a;->Jr()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 2efca17d2d..7ffe53648b 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 bKk:J
+.field bKf: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;->Kd()Z
+    invoke-static {}, Lrx/internal/util/b/ae;->Kb()Z
 
     move-result p2
 
@@ -115,7 +115,7 @@
     return-void
 .end method
 
-.method private Ju()V
+.method private Js()V
     .locals 13
 
     iget-object v0, p0, Lrx/internal/a/ap$a;->child:Lrx/Subscriber;
@@ -302,7 +302,7 @@
 
 
 # virtual methods
-.method final Jt()V
+.method final Jr()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;->Ju()V
+    invoke-direct {p0}, Lrx/internal/a/ap$a;->Js()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;->Jt()V
+    invoke-virtual {p0}, Lrx/internal/a/ap$a;->Jr()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;->Jt()V
+    invoke-virtual {p0}, Lrx/internal/a/ap$a;->Jr()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;->Jt()V
+    invoke-virtual {p0}, Lrx/internal/a/ap$a;->Jr()V
 
     return-void
 .end method
@@ -419,13 +419,13 @@
 
     if-nez v0, :cond_0
 
-    iget-wide v2, p0, Lrx/internal/a/ap$a;->bKk:J
+    iget-wide v2, p0, Lrx/internal/a/ap$a;->bKf: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;->bKk:J
+    iput-wide v2, p0, Lrx/internal/a/ap$a;->bKf: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;->Jt()V
+    invoke-virtual {p0}, Lrx/internal/a/ap$a;->Jr()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 50e32ee908..bc8ed6609e 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 bKh:Ljava/lang/Object;
+.field private static final bKc:Ljava/lang/Object;
 
 
 # instance fields
-.field private final bKf:Lrx/functions/Func0;
+.field private final bKa:Lrx/functions/Func0;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/Func0<",
@@ -41,7 +41,7 @@
     .end annotation
 .end field
 
-.field final bKg:Lrx/functions/Func2;
+.field final bKb: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;->bKh:Ljava/lang/Object;
+    sput-object v0, Lrx/internal/a/ap;->bKc: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;->bKf:Lrx/functions/Func0;
+    iput-object p1, p0, Lrx/internal/a/ap;->bKa:Lrx/functions/Func0;
 
-    iput-object p2, p0, Lrx/internal/a/ap;->bKg:Lrx/functions/Func2;
+    iput-object p2, p0, Lrx/internal/a/ap;->bKb:Lrx/functions/Func2;
 
     return-void
 .end method
@@ -111,13 +111,13 @@
 
     check-cast p1, Lrx/Subscriber;
 
-    iget-object v0, p0, Lrx/internal/a/ap;->bKf:Lrx/functions/Func0;
+    iget-object v0, p0, Lrx/internal/a/ap;->bKa:Lrx/functions/Func0;
 
     invoke-interface {v0}, Lrx/functions/Func0;->call()Ljava/lang/Object;
 
     move-result-object v0
 
-    sget-object v1, Lrx/internal/a/ap;->bKh:Ljava/lang/Object;
+    sget-object v1, Lrx/internal/a/ap;->bKc: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 43982eebd0..2c11637cd5 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 bKm:Lrx/internal/a/aq;
+.field static final bKh: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;->bKm:Lrx/internal/a/aq;
+    sput-object v0, Lrx/internal/a/aq$a;->bKh: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 ca3241c011..b18e558274 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 bKl:Z
+.field private final bKg:Z
 
-.field private bKn:Z
+.field private bKi:Z
 
-.field private bKo:Z
+.field private bKj: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;->bKl:Z
+    iput-boolean p2, p0, Lrx/internal/a/aq$b;->bKg: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;->bKo:Z
+    iget-boolean v0, p0, Lrx/internal/a/aq$b;->bKj:Z
 
     if-nez v0, :cond_2
 
-    iget-boolean v0, p0, Lrx/internal/a/aq$b;->bKn:Z
+    iget-boolean v0, p0, Lrx/internal/a/aq$b;->bKi:Z
 
     if-eqz v0, :cond_0
 
@@ -109,7 +109,7 @@
     return-void
 
     :cond_0
-    iget-boolean v0, p0, Lrx/internal/a/aq$b;->bKl:Z
+    iget-boolean v0, p0, Lrx/internal/a/aq$b;->bKg: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;->bKo:Z
+    iget-boolean v0, p0, Lrx/internal/a/aq$b;->bKj:Z
 
     if-eqz v0, :cond_0
 
@@ -167,17 +167,17 @@
         }
     .end annotation
 
-    iget-boolean v0, p0, Lrx/internal/a/aq$b;->bKo:Z
+    iget-boolean v0, p0, Lrx/internal/a/aq$b;->bKj:Z
 
     if-nez v0, :cond_1
 
-    iget-boolean v0, p0, Lrx/internal/a/aq$b;->bKn:Z
+    iget-boolean v0, p0, Lrx/internal/a/aq$b;->bKi:Z
 
     const/4 v1, 0x1
 
     if-eqz v0, :cond_0
 
-    iput-boolean v1, p0, Lrx/internal/a/aq$b;->bKo:Z
+    iput-boolean v1, p0, Lrx/internal/a/aq$b;->bKj: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;->bKn:Z
+    iput-boolean v1, p0, Lrx/internal/a/aq$b;->bKi: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 9d43848ff8..61059d440a 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 bKl:Z
+.field private final bKg: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;->bKl:Z
+    iput-boolean p1, p0, Lrx/internal/a/aq;->bKg:Z
 
     const/4 p1, 0x0
 
@@ -70,7 +70,7 @@
     return-void
 .end method
 
-.method public static JG()Lrx/internal/a/aq;
+.method public static JE()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;->bKm:Lrx/internal/a/aq;
+    sget-object v0, Lrx/internal/a/aq$a;->bKh: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;->bKl:Z
+    iget-boolean v1, p0, Lrx/internal/a/aq;->bKg: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 bd0d84fa04..918ba13131 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 bHH:Lrx/Subscriber;
+.field final synthetic bHC:Lrx/Subscriber;
 
-.field bKq:I
+.field bKl:I
 
-.field final synthetic bKr:Lrx/internal/a/ar;
+.field final synthetic bKm: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;->bKr:Lrx/internal/a/ar;
+    iput-object p1, p0, Lrx/internal/a/ar$1;->bKm:Lrx/internal/a/ar;
 
-    iput-object p3, p0, Lrx/internal/a/ar$1;->bHH:Lrx/Subscriber;
+    iput-object p3, p0, Lrx/internal/a/ar$1;->bHC: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;->bHH:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/ar$1;->bHC: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;->bHH:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/ar$1;->bHC: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;->bKq:I
+    iget v0, p0, Lrx/internal/a/ar$1;->bKl:I
 
-    iget-object v1, p0, Lrx/internal/a/ar$1;->bKr:Lrx/internal/a/ar;
+    iget-object v1, p0, Lrx/internal/a/ar$1;->bKm:Lrx/internal/a/ar;
 
-    iget v1, v1, Lrx/internal/a/ar;->bKp:I
+    iget v1, v1, Lrx/internal/a/ar;->bKk:I
 
     if-lt v0, v1, :cond_0
 
-    iget-object v0, p0, Lrx/internal/a/ar$1;->bHH:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/ar$1;->bHC: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;->bKq:I
+    iget p1, p0, Lrx/internal/a/ar$1;->bKl:I
 
     add-int/lit8 p1, p1, 0x1
 
-    iput p1, p0, Lrx/internal/a/ar$1;->bKq:I
+    iput p1, p0, Lrx/internal/a/ar$1;->bKl: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;->bHH:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/ar$1;->bHC:Lrx/Subscriber;
 
     invoke-virtual {v0, p1}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
 
-    iget-object v0, p0, Lrx/internal/a/ar$1;->bKr:Lrx/internal/a/ar;
+    iget-object v0, p0, Lrx/internal/a/ar$1;->bKm:Lrx/internal/a/ar;
 
-    iget v0, v0, Lrx/internal/a/ar;->bKp:I
+    iget v0, v0, Lrx/internal/a/ar;->bKk: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 ee51884e72..18ea121584 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 bKp:I
+.field final bKk:I
 
 
 # direct methods
@@ -31,7 +31,7 @@
 
     const/4 p1, 0x1
 
-    iput p1, p0, Lrx/internal/a/ar;->bKp:I
+    iput p1, p0, Lrx/internal/a/ar;->bKk: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 4b44ed46d2..453ba08e6c 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 bHH:Lrx/Subscriber;
+.field final synthetic bHC:Lrx/Subscriber;
 
-.field bKt:Z
+.field bKo:Z
 
-.field final synthetic bKu:Lrx/internal/a/as;
+.field final synthetic bKp: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;->bKu:Lrx/internal/a/as;
+    iput-object p1, p0, Lrx/internal/a/as$1;->bKp:Lrx/internal/a/as;
 
-    iput-object p3, p0, Lrx/internal/a/as$1;->bHH:Lrx/Subscriber;
+    iput-object p3, p0, Lrx/internal/a/as$1;->bHC: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;->bKt:Z
+    iput-boolean p1, p0, Lrx/internal/a/as$1;->bKo: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;->bHH:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/as$1;->bHC: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;->bHH:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/as$1;->bHC: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;->bKt:Z
+    iget-boolean v0, p0, Lrx/internal/a/as$1;->bKo:Z
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lrx/internal/a/as$1;->bHH:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/as$1;->bHC: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;->bKu:Lrx/internal/a/as;
+    iget-object v0, p0, Lrx/internal/a/as$1;->bKp:Lrx/internal/a/as;
 
-    iget-object v0, v0, Lrx/internal/a/as;->bKs:Lrx/functions/Func2;
+    iget-object v0, v0, Lrx/internal/a/as;->bKn: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;->bKt:Z
+    iput-boolean v0, p0, Lrx/internal/a/as$1;->bKo:Z
 
-    iget-object v0, p0, Lrx/internal/a/as$1;->bHH:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/as$1;->bHC: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;->bHH:Lrx/Subscriber;
+    iget-object v1, p0, Lrx/internal/a/as$1;->bHC: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 2a50154d48..7b9b383a9a 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 bKv:Lrx/functions/b;
+.field final synthetic bKq:Lrx/functions/b;
 
 
 # direct methods
 .method constructor <init>(Lrx/functions/b;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/a/as$2;->bKv:Lrx/functions/b;
+    iput-object p1, p0, Lrx/internal/a/as$2;->bKq: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;->bKv:Lrx/functions/b;
+    iget-object p2, p0, Lrx/internal/a/as$2;->bKq: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 722fd0dc28..bd8c585165 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 bKs:Lrx/functions/Func2;
+.field final bKn: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;->bKs:Lrx/functions/Func2;
+    iput-object p1, p0, Lrx/internal/a/as;->bKn: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 52099768d4..e153301e38 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 bKA:J
+.field final synthetic bKv:J
 
-.field final synthetic bKB:Lrx/internal/a/at$a$1;
+.field final synthetic bKw: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;->bKB:Lrx/internal/a/at$a$1;
+    iput-object p1, p0, Lrx/internal/a/at$a$1$1;->bKw:Lrx/internal/a/at$a$1;
 
-    iput-wide p2, p0, Lrx/internal/a/at$a$1$1;->bKA:J
+    iput-wide p2, p0, Lrx/internal/a/at$a$1$1;->bKv: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;->bKB:Lrx/internal/a/at$a$1;
+    iget-object v0, p0, Lrx/internal/a/at$a$1$1;->bKw:Lrx/internal/a/at$a$1;
 
-    iget-object v0, v0, Lrx/internal/a/at$a$1;->bKy:Lrx/Producer;
+    iget-object v0, v0, Lrx/internal/a/at$a$1;->bKt:Lrx/Producer;
 
-    iget-wide v1, p0, Lrx/internal/a/at$a$1$1;->bKA:J
+    iget-wide v1, p0, Lrx/internal/a/at$a$1$1;->bKv: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 1e58663654..d1d460f601 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 bKy:Lrx/Producer;
+.field final synthetic bKt:Lrx/Producer;
 
-.field final synthetic bKz:Lrx/internal/a/at$a;
+.field final synthetic bKu: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;->bKz:Lrx/internal/a/at$a;
+    iput-object p1, p0, Lrx/internal/a/at$a$1;->bKu:Lrx/internal/a/at$a;
 
-    iput-object p2, p0, Lrx/internal/a/at$a$1;->bKy:Lrx/Producer;
+    iput-object p2, p0, Lrx/internal/a/at$a$1;->bKt: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;->bKz:Lrx/internal/a/at$a;
+    iget-object v0, p0, Lrx/internal/a/at$a$1;->bKu:Lrx/internal/a/at$a;
 
-    iget-object v0, v0, Lrx/internal/a/at$a;->bKx:Ljava/lang/Thread;
+    iget-object v0, v0, Lrx/internal/a/at$a;->bKs: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;->bKz:Lrx/internal/a/at$a;
+    iget-object v0, p0, Lrx/internal/a/at$a$1;->bKu:Lrx/internal/a/at$a;
 
-    iget-boolean v0, v0, Lrx/internal/a/at$a;->bKw:Z
+    iget-boolean v0, v0, Lrx/internal/a/at$a;->bKr:Z
 
     if-nez v0, :cond_0
 
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lrx/internal/a/at$a$1;->bKz:Lrx/internal/a/at$a;
+    iget-object v0, p0, Lrx/internal/a/at$a$1;->bKu:Lrx/internal/a/at$a;
 
-    iget-object v0, v0, Lrx/internal/a/at$a;->bIj:Lrx/Scheduler$Worker;
+    iget-object v0, v0, Lrx/internal/a/at$a;->bIe: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;->bKy:Lrx/Producer;
+    iget-object v0, p0, Lrx/internal/a/at$a$1;->bKt: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 e34ca16697..715462d0c0 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 bHe:Lrx/Observable;
+.field bGZ:Lrx/Observable;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/Observable<",
@@ -47,11 +47,11 @@
     .end annotation
 .end field
 
-.field final bIj:Lrx/Scheduler$Worker;
+.field final bIe:Lrx/Scheduler$Worker;
 
-.field final bKw:Z
+.field final bKr:Z
 
-.field bKx:Ljava/lang/Thread;
+.field bKs: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;->bKw:Z
+    iput-boolean p2, p0, Lrx/internal/a/at$a;->bKr:Z
 
-    iput-object p3, p0, Lrx/internal/a/at$a;->bIj:Lrx/Scheduler$Worker;
+    iput-object p3, p0, Lrx/internal/a/at$a;->bIe:Lrx/Scheduler$Worker;
 
-    iput-object p4, p0, Lrx/internal/a/at$a;->bHe:Lrx/Observable;
+    iput-object p4, p0, Lrx/internal/a/at$a;->bGZ: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;->bHe:Lrx/Observable;
+    iget-object v0, p0, Lrx/internal/a/at$a;->bGZ:Lrx/Observable;
 
     const/4 v1, 0x0
 
-    iput-object v1, p0, Lrx/internal/a/at$a;->bHe:Lrx/Observable;
+    iput-object v1, p0, Lrx/internal/a/at$a;->bGZ:Lrx/Observable;
 
     invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
 
     move-result-object v1
 
-    iput-object v1, p0, Lrx/internal/a/at$a;->bKx:Ljava/lang/Thread;
+    iput-object v1, p0, Lrx/internal/a/at$a;->bKs: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;->bIj:Lrx/Scheduler$Worker;
+    iget-object v0, p0, Lrx/internal/a/at$a;->bIe: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;->bIj:Lrx/Scheduler$Worker;
+    iget-object v1, p0, Lrx/internal/a/at$a;->bIe: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;->bIj:Lrx/Scheduler$Worker;
+    iget-object p1, p0, Lrx/internal/a/at$a;->bIe: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;->bIj:Lrx/Scheduler$Worker;
+    iget-object v0, p0, Lrx/internal/a/at$a;->bIe: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 3006559053..8a12cf2ba1 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 bHe:Lrx/Observable;
+.field final bGZ:Lrx/Observable;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/Observable<",
@@ -35,7 +35,7 @@
     .end annotation
 .end field
 
-.field final bKw:Z
+.field final bKr: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;->bHe:Lrx/Observable;
+    iput-object p1, p0, Lrx/internal/a/at;->bGZ:Lrx/Observable;
 
-    iput-boolean p3, p0, Lrx/internal/a/at;->bKw:Z
+    iput-boolean p3, p0, Lrx/internal/a/at;->bKr: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;->IY()Lrx/Scheduler$Worker;
+    invoke-virtual {v0}, Lrx/Scheduler;->IW()Lrx/Scheduler$Worker;
 
     move-result-object v0
 
     new-instance v1, Lrx/internal/a/at$a;
 
-    iget-boolean v2, p0, Lrx/internal/a/at;->bKw:Z
+    iget-boolean v2, p0, Lrx/internal/a/at;->bKr:Z
 
-    iget-object v3, p0, Lrx/internal/a/at;->bHe:Lrx/Observable;
+    iget-object v3, p0, Lrx/internal/a/at;->bGZ: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 35954e366d..48a44ecd8d 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 bKC:Lrx/internal/a/au;
+.field static final bKx: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;->bKC:Lrx/internal/a/au;
+    sput-object v0, Lrx/internal/a/au$a;->bKx: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 2155db3814..2aad9be2a7 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 bKD:Lrx/internal/a/au$c;
+.field private final bKy: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;->bKD:Lrx/internal/a/au$c;
+    iput-object p3, p0, Lrx/internal/a/au$b;->bKy: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;->bKD:Lrx/internal/a/au$c;
+    iget-object v0, p0, Lrx/internal/a/au$b;->bKy: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;->bIk:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v3, v0, Lrx/internal/a/au$c;->bIf: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;->bKF:Z
+    iput-boolean v1, v0, Lrx/internal/a/au$c;->bKA: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;->Ji()V
+    invoke-virtual {v0}, Lrx/internal/a/au$c;->Jg()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;->bKD:Lrx/internal/a/au$c;
+    iget-object v0, p0, Lrx/internal/a/au$b;->bKy: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;->bIk:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v3, v0, Lrx/internal/a/au$c;->bIf: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;->bKF:Z
+    iput-boolean v2, v0, Lrx/internal/a/au$c;->bKA:Z
 
     const/4 v2, 0x0
 
@@ -155,7 +155,7 @@
 
     if-eqz v1, :cond_1
 
-    invoke-virtual {v0}, Lrx/internal/a/au$c;->Ji()V
+    invoke-virtual {v0}, Lrx/internal/a/au$c;->Jg()V
 
     return-void
 
@@ -183,12 +183,12 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/internal/a/au$b;->bKD:Lrx/internal/a/au$c;
+    iget-object v0, p0, Lrx/internal/a/au$b;->bKy:Lrx/internal/a/au$c;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, v0, Lrx/internal/a/au$c;->bIk:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v1, v0, Lrx/internal/a/au$c;->bIf: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;->Ji()V
+    invoke-virtual {v0}, Lrx/internal/a/au$c;->Jg()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;->bKD:Lrx/internal/a/au$c;
+    iget-object v0, p0, Lrx/internal/a/au$b;->bKy: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;->bIk:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v3, v0, Lrx/internal/a/au$c;->bIf: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 adf604bf14..6f0167e7d5 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 bKH:Lrx/internal/a/au$c;
+.field final synthetic bKC: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;->bKH:Lrx/internal/a/au$c;
+    iput-object p1, p0, Lrx/internal/a/au$c$1;->bKC: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;->bKH:Lrx/internal/a/au$c;
+    iget-object v0, p0, Lrx/internal/a/au$c$1;->bKC: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 cfab2d8f74..fc77772cd1 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 bKH:Lrx/internal/a/au$c;
+.field final synthetic bKC: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;->bKH:Lrx/internal/a/au$c;
+    iput-object p1, p0, Lrx/internal/a/au$c$2;->bKC: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;->bKH:Lrx/internal/a/au$c;
+    iget-object v2, p0, Lrx/internal/a/au$c$2;->bKC: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;->Ji()V
+    invoke-virtual {v2}, Lrx/internal/a/au$c;->Jg()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 3f8cfbd696..fb5429a73d 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 bKG:Ljava/lang/Throwable;
+.field static final bKB:Ljava/lang/Throwable;
 
 
 # instance fields
-.field final bIk:Ljava/util/concurrent/atomic/AtomicLong;
+.field final bIf:Ljava/util/concurrent/atomic/AtomicLong;
 
-.field volatile bKE:Z
+.field bKA:Z
 
-.field bKF:Z
+.field volatile bKz: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;->bKG:Ljava/lang/Throwable;
+    sput-object v0, Lrx/internal/a/au$c;->bKB: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;->bIk:Ljava/util/concurrent/atomic/AtomicLong;
+    iput-object p1, p0, Lrx/internal/a/au$c;->bIf:Ljava/util/concurrent/atomic/AtomicLong;
 
     new-instance p1, Lrx/internal/util/a/f;
 
-    sget p2, Lrx/internal/util/i;->bNf:I
+    sget p2, Lrx/internal/util/i;->bNa:I
 
     invoke-direct {p1, p2}, Lrx/internal/util/a/f;-><init>(I)V
 
@@ -198,7 +198,7 @@
 
 
 # virtual methods
-.method final Ji()V
+.method final Jg()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;->bKF:Z
+    iget-boolean v0, v8, Lrx/internal/a/au$c;->bKA: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;->bKG:Ljava/lang/Throwable;
+    sget-object v4, Lrx/internal/a/au$c;->bKB: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;->bKG:Ljava/lang/Throwable;
+    sget-object v4, Lrx/internal/a/au$c;->bKB: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;->bIk:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v10, v8, Lrx/internal/a/au$c;->bIf: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;->bKE:Z
+    iget-boolean v4, v8, Lrx/internal/a/au$c;->bKz:Z
 
     move-wide v12, v1
 
@@ -355,7 +355,7 @@
     return-void
 
     :cond_6
-    iget-boolean v2, v8, Lrx/internal/a/au$c;->bKE:Z
+    iget-boolean v2, v8, Lrx/internal/a/au$c;->bKz: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;->bKE:Z
+    iget-boolean v15, v8, Lrx/internal/a/au$c;->bKz:Z
 
-    iget-boolean v0, v8, Lrx/internal/a/au$c;->bKF:Z
+    iget-boolean v0, v8, Lrx/internal/a/au$c;->bKA: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;->bKG:Ljava/lang/Throwable;
+    sget-object v1, Lrx/internal/a/au$c;->bKB: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;->bKG:Ljava/lang/Throwable;
+    sget-object v1, Lrx/internal/a/au$c;->bKB: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;->bKG:Ljava/lang/Throwable;
+    sget-object v1, Lrx/internal/a/au$c;->bKB:Ljava/lang/Throwable;
 
     const/4 v2, 0x0
 
@@ -533,9 +533,9 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lrx/internal/a/au$c;->bKE:Z
+    iput-boolean v0, p0, Lrx/internal/a/au$c;->bKz:Z
 
-    invoke-virtual {p0}, Lrx/internal/a/au$c;->Ji()V
+    invoke-virtual {p0}, Lrx/internal/a/au$c;->Jg()V
 
     return-void
 .end method
@@ -558,9 +558,9 @@
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lrx/internal/a/au$c;->bKE:Z
+    iput-boolean p1, p0, Lrx/internal/a/au$c;->bKz:Z
 
-    invoke-virtual {p0}, Lrx/internal/a/au$c;->Ji()V
+    invoke-virtual {p0}, Lrx/internal/a/au$c;->Jg()V
 
     return-void
 
@@ -585,7 +585,7 @@
 
     check-cast p1, Lrx/Observable;
 
-    iget-object v0, p0, Lrx/internal/a/au$c;->bIk:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v0, p0, Lrx/internal/a/au$c;->bIf: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;->bPl:Lrx/internal/d/a;
+    iget-object v2, v2, Lrx/subscriptions/SerialSubscription;->bPg:Lrx/internal/d/a;
 
-    invoke-virtual {v2}, Lrx/internal/d/a;->JP()Lrx/Subscription;
+    invoke-virtual {v2}, Lrx/internal/d/a;->JN()Lrx/Subscription;
 
     move-result-object v2
 
@@ -613,7 +613,7 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lrx/internal/a/au$c;->bKF:Z
+    iput-boolean v0, p0, Lrx/internal/a/au$c;->bKA: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 df107f4020..e5ad751921 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 JH()Lrx/internal/a/au;
+.method public static JF()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;->bKC:Lrx/internal/a/au;
+    sget-object v0, Lrx/internal/a/au$a;->bKx: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 f474a2d007..ed736607fb 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 bKJ:Lrx/Producer;
+.field final synthetic bKE:Lrx/Producer;
 
-.field final synthetic bKK:Lrx/internal/a/av$1;
+.field final synthetic bKF: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;->bKK:Lrx/internal/a/av$1;
+    iput-object p1, p0, Lrx/internal/a/av$1$1;->bKF:Lrx/internal/a/av$1;
 
-    iput-object p2, p0, Lrx/internal/a/av$1$1;->bKJ:Lrx/Producer;
+    iput-object p2, p0, Lrx/internal/a/av$1$1;->bKE: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;->bKK:Lrx/internal/a/av$1;
+    iget-object v2, p0, Lrx/internal/a/av$1$1;->bKF:Lrx/internal/a/av$1;
 
-    iget-boolean v2, v2, Lrx/internal/a/av$1;->bvG:Z
+    iget-boolean v2, v2, Lrx/internal/a/av$1;->bvB:Z
 
     if-nez v2, :cond_1
 
@@ -70,9 +70,9 @@
 
     move-result-wide v2
 
-    iget-object v4, p0, Lrx/internal/a/av$1$1;->bKK:Lrx/internal/a/av$1;
+    iget-object v4, p0, Lrx/internal/a/av$1$1;->bKF:Lrx/internal/a/av$1;
 
-    iget-object v4, v4, Lrx/internal/a/av$1;->bKI:Lrx/internal/a/av;
+    iget-object v4, v4, Lrx/internal/a/av$1;->bKD: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;->bKJ:Lrx/Producer;
+    iget-object p1, p0, Lrx/internal/a/av$1$1;->bKE: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 d9c4e16f7e..f3c3744443 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 bHH:Lrx/Subscriber;
+.field final synthetic bHC:Lrx/Subscriber;
 
-.field final synthetic bKI:Lrx/internal/a/av;
+.field final synthetic bKD:Lrx/internal/a/av;
 
-.field bvG:Z
+.field bvB: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;->bKI:Lrx/internal/a/av;
+    iput-object p1, p0, Lrx/internal/a/av$1;->bKD:Lrx/internal/a/av;
 
-    iput-object p2, p0, Lrx/internal/a/av$1;->bHH:Lrx/Subscriber;
+    iput-object p2, p0, Lrx/internal/a/av$1;->bHC: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;->bvG:Z
+    iget-boolean v0, p0, Lrx/internal/a/av$1;->bvB:Z
 
     if-nez v0, :cond_0
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lrx/internal/a/av$1;->bvG:Z
+    iput-boolean v0, p0, Lrx/internal/a/av$1;->bvB:Z
 
-    iget-object v0, p0, Lrx/internal/a/av$1;->bHH:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/av$1;->bHC: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;->bvG:Z
+    iget-boolean v0, p0, Lrx/internal/a/av$1;->bvB:Z
 
     if-nez v0, :cond_0
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lrx/internal/a/av$1;->bvG:Z
+    iput-boolean v0, p0, Lrx/internal/a/av$1;->bvB:Z
 
     :try_start_0
-    iget-object v0, p0, Lrx/internal/a/av$1;->bHH:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/av$1;->bHC: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;->bKI:Lrx/internal/a/av;
+    iget-object v1, p0, Lrx/internal/a/av$1;->bKD: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;->bKI:Lrx/internal/a/av;
+    iget-object v1, p0, Lrx/internal/a/av$1;->bKD: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;->bHH:Lrx/Subscriber;
+    iget-object v1, p0, Lrx/internal/a/av$1;->bHC: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;->bvG:Z
+    iget-boolean p1, p0, Lrx/internal/a/av$1;->bvB:Z
 
     if-nez p1, :cond_1
 
-    iput-boolean v2, p0, Lrx/internal/a/av$1;->bvG:Z
+    iput-boolean v2, p0, Lrx/internal/a/av$1;->bvB:Z
 
     :try_start_0
-    iget-object p1, p0, Lrx/internal/a/av$1;->bHH:Lrx/Subscriber;
+    iget-object p1, p0, Lrx/internal/a/av$1;->bHC: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;->bHH:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/av$1;->bHC: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 190dfaa7ef..5c29e6978c 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 bKM:Lrx/Subscriber;
+.field final synthetic bKH:Lrx/Subscriber;
 
-.field final synthetic bKN:Lrx/internal/a/aw;
+.field final synthetic bKI: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;->bKN:Lrx/internal/a/aw;
+    iput-object p1, p0, Lrx/internal/a/aw$1;->bKI:Lrx/internal/a/aw;
 
-    iput-object p3, p0, Lrx/internal/a/aw$1;->bKM:Lrx/Subscriber;
+    iput-object p3, p0, Lrx/internal/a/aw$1;->bKH:Lrx/Subscriber;
 
     const/4 p1, 0x0
 
@@ -48,13 +48,13 @@
     .locals 2
 
     :try_start_0
-    iget-object v0, p0, Lrx/internal/a/aw$1;->bKM:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/aw$1;->bKH: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;->bKM:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/aw$1;->bKH: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;->bKM:Lrx/Subscriber;
+    iget-object v1, p0, Lrx/internal/a/aw$1;->bKH: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;->bKM:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/aw$1;->bKH: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;->bKM:Lrx/Subscriber;
+    iget-object p1, p0, Lrx/internal/a/aw$1;->bKH: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;->bKM:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/aw$1;->bKH:Lrx/Subscriber;
 
     invoke-virtual {v0}, Lrx/Subscriber;->unsubscribe()V
 
@@ -104,7 +104,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/internal/a/aw$1;->bKM:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/aw$1;->bKH: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 9620078414..c6ebe66552 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 bKN:Lrx/internal/a/aw;
+.field final synthetic bKI:Lrx/internal/a/aw;
 
-.field final synthetic bKO:Lrx/Subscriber;
+.field final synthetic bKJ: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;->bKN:Lrx/internal/a/aw;
+    iput-object p1, p0, Lrx/internal/a/aw$2;->bKI:Lrx/internal/a/aw;
 
-    iput-object p2, p0, Lrx/internal/a/aw$2;->bKO:Lrx/Subscriber;
+    iput-object p2, p0, Lrx/internal/a/aw$2;->bKJ: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;->bKO:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/aw$2;->bKJ: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;->bKO:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/aw$2;->bKJ: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 f932cf1205..0b78de2402 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 bKL:Lrx/Observable;
+.field private final bKG: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;->bKL:Lrx/Observable;
+    iput-object p1, p0, Lrx/internal/a/aw;->bKG: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;->bKL:Lrx/Observable;
+    iget-object p1, p0, Lrx/internal/a/aw;->bKG: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 1dd7a67c44..4c2a8011f6 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 bKQ:Lrx/internal/a/ax$a;
+.field final synthetic bKL:Lrx/internal/a/ax$a;
 
-.field final synthetic bKR:Lrx/internal/a/ax;
+.field final synthetic bKM: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;->bKR:Lrx/internal/a/ax;
+    iput-object p1, p0, Lrx/internal/a/ax$1;->bKM:Lrx/internal/a/ax;
 
-    iput-object p2, p0, Lrx/internal/a/ax$1;->bKQ:Lrx/internal/a/ax$a;
+    iput-object p2, p0, Lrx/internal/a/ax$1;->bKL: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;->bKQ:Lrx/internal/a/ax$a;
+    iget-object v0, p0, Lrx/internal/a/ax$1;->bKL: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 954611333f..f9cb499f44 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 bKR:Lrx/internal/a/ax;
+.field final synthetic bKM: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;->bKR:Lrx/internal/a/ax;
+    iput-object p1, p0, Lrx/internal/a/ax$a;->bKM: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;->bKR:Lrx/internal/a/ax;
+    iget-object v1, p0, Lrx/internal/a/ax$a;->bKM:Lrx/internal/a/ax;
 
-    iget-object v1, v1, Lrx/internal/a/ax;->bKP:Lrx/functions/b;
+    iget-object v1, v1, Lrx/internal/a/ax;->bKK: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 0ad804850d..a108886f9c 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 bKP:Lrx/functions/b;
+.field final bKK: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;->bKP:Lrx/functions/b;
+    iput-object p1, p0, Lrx/internal/a/ax;->bKK: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 80b39e6bef..0baddb25de 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 bKS:Lrx/functions/b;
+.field final synthetic bKN:Lrx/functions/b;
 
 
 # direct methods
 .method constructor <init>(Lrx/functions/b;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/a/ay$1;->bKS:Lrx/functions/b;
+    iput-object p1, p0, Lrx/internal/a/ay$1;->bKN: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;->bKS:Lrx/functions/b;
+    iget-object p2, p0, Lrx/internal/a/ay$1;->bKN: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 be9a76607a..8897ccc7e5 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 bHX:Lrx/Subscriber;
+.field final synthetic bHS:Lrx/Subscriber;
 
-.field final synthetic bKT:Lrx/internal/a/ay;
+.field final synthetic bKO:Lrx/internal/a/ay;
 
-.field private biZ:I
+.field private biU: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;->bKT:Lrx/internal/a/ay;
+    iput-object p1, p0, Lrx/internal/a/ay$2;->bKO:Lrx/internal/a/ay;
 
-    iput-object p3, p0, Lrx/internal/a/ay$2;->bHX:Lrx/Subscriber;
+    iput-object p3, p0, Lrx/internal/a/ay$2;->bHS:Lrx/Subscriber;
 
     const/4 p1, 0x0
 
@@ -55,7 +55,7 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lrx/internal/a/ay$2;->bHX:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/ay$2;->bHS: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;->bHX:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/ay$2;->bHS: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;->bKT:Lrx/internal/a/ay;
+    iget-object v1, p0, Lrx/internal/a/ay$2;->bKO:Lrx/internal/a/ay;
 
-    iget-object v1, v1, Lrx/internal/a/ay;->bKs:Lrx/functions/Func2;
+    iget-object v1, v1, Lrx/internal/a/ay;->bKn:Lrx/functions/Func2;
 
-    iget v2, p0, Lrx/internal/a/ay$2;->biZ:I
+    iget v2, p0, Lrx/internal/a/ay$2;->biU:I
 
     add-int/lit8 v3, v2, 0x1
 
-    iput v3, p0, Lrx/internal/a/ay$2;->biZ:I
+    iput v3, p0, Lrx/internal/a/ay$2;->biU: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;->bHX:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/ay$2;->bHS: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;->bHX:Lrx/Subscriber;
+    iget-object p1, p0, Lrx/internal/a/ay$2;->bHS: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;->bHX:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/ay$2;->bHS: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 440f841101..79f0251333 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 bKs:Lrx/functions/Func2;
+.field final bKn: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;->bKs:Lrx/functions/Func2;
+    iput-object p1, p0, Lrx/internal/a/ay;->bKn: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 b0821385fc..ac52a3aa31 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 bHX:Lrx/Subscriber;
+.field final synthetic bHS:Lrx/Subscriber;
 
-.field final synthetic bKU:Lrx/internal/a/az;
+.field final synthetic bKP: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;->bKU:Lrx/internal/a/az;
+    iput-object p1, p0, Lrx/internal/a/az$1;->bKP:Lrx/internal/a/az;
 
-    iput-object p3, p0, Lrx/internal/a/az$1;->bHX:Lrx/Subscriber;
+    iput-object p3, p0, Lrx/internal/a/az$1;->bHS: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;->bHX:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/az$1;->bHS: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;->bHX:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/az$1;->bHS: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;->bKU:Lrx/internal/a/az;
+    iget-object v4, p0, Lrx/internal/a/az$1;->bKP: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;->bHX:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/az$1;->bHS: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 7e8c1acb13..6ad1ff46c4 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 bGM:Ljava/lang/Object;
+.field final synthetic bGH:Ljava/lang/Object;
 
-.field final synthetic bGN:Lrx/Observable;
+.field final synthetic bGI: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;->bGM:Ljava/lang/Object;
+    iput-object p1, p0, Lrx/internal/a/b$1;->bGH:Ljava/lang/Object;
 
-    iput-object p2, p0, Lrx/internal/a/b$1;->bGN:Lrx/Observable;
+    iput-object p2, p0, Lrx/internal/a/b$1;->bGI: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;->bGM:Ljava/lang/Object;
+    iget-object v1, p0, Lrx/internal/a/b$1;->bGH: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;->bGN:Lrx/Observable;
+    iget-object v1, p0, Lrx/internal/a/b$1;->bGI: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 bc5068a38f..8e800787fe 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 bGO:Ljava/lang/Object;
+.field private bGJ:Ljava/lang/Object;
 
-.field final synthetic bGP:Lrx/internal/a/b$a;
+.field final synthetic bGK: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;->bGP:Lrx/internal/a/b$a;
+    iput-object p1, p0, Lrx/internal/a/b$a$1;->bGK: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;->bGP:Lrx/internal/a/b$a;
+    iget-object v0, p0, Lrx/internal/a/b$a$1;->bGK: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;->bGO:Ljava/lang/Object;
+    iput-object v0, p0, Lrx/internal/a/b$a$1;->bGJ:Ljava/lang/Object;
 
-    iget-object v0, p0, Lrx/internal/a/b$a$1;->bGO:Ljava/lang/Object;
+    iget-object v0, p0, Lrx/internal/a/b$a$1;->bGJ: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;->bGO:Ljava/lang/Object;
+    iget-object v1, p0, Lrx/internal/a/b$a$1;->bGJ:Ljava/lang/Object;
 
     if-nez v1, :cond_0
 
-    iget-object v1, p0, Lrx/internal/a/b$a$1;->bGP:Lrx/internal/a/b$a;
+    iget-object v1, p0, Lrx/internal/a/b$a$1;->bGK: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;->bGO:Ljava/lang/Object;
+    iput-object v1, p0, Lrx/internal/a/b$a$1;->bGJ:Ljava/lang/Object;
 
     :cond_0
-    iget-object v1, p0, Lrx/internal/a/b$a$1;->bGO:Ljava/lang/Object;
+    iget-object v1, p0, Lrx/internal/a/b$a$1;->bGJ: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;->bGO:Ljava/lang/Object;
+    iget-object v1, p0, Lrx/internal/a/b$a$1;->bGJ: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;->bGO:Ljava/lang/Object;
+    iget-object v1, p0, Lrx/internal/a/b$a$1;->bGJ: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;->bGO:Ljava/lang/Object;
+    iput-object v0, p0, Lrx/internal/a/b$a$1;->bGJ:Ljava/lang/Object;
 
     return-object v1
 
     :cond_1
     :try_start_1
-    iget-object v1, p0, Lrx/internal/a/b$a$1;->bGO:Ljava/lang/Object;
+    iget-object v1, p0, Lrx/internal/a/b$a$1;->bGJ: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;->bGO:Ljava/lang/Object;
+    iput-object v0, p0, Lrx/internal/a/b$a$1;->bGJ: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 3a3cfc3376..9af5bba224 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;->Jg()Ljava/lang/Object;
+    invoke-static {}, Lrx/internal/a/g;->Je()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 46a77d98ed..63dbebe5b2 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 bIz:Lrx/internal/b/b;
+.field final synthetic bIu:Lrx/internal/b/b;
 
-.field final synthetic bKV:Lrx/Subscriber;
+.field final synthetic bKQ:Lrx/Subscriber;
 
-.field final synthetic bKW:Lrx/internal/a/ba;
+.field final synthetic bKR:Lrx/internal/a/ba;
 
-.field bvG:Z
+.field bvB: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;->bKW:Lrx/internal/a/ba;
+    iput-object p1, p0, Lrx/internal/a/ba$1;->bKR:Lrx/internal/a/ba;
 
-    iput-object p2, p0, Lrx/internal/a/ba$1;->bIz:Lrx/internal/b/b;
+    iput-object p2, p0, Lrx/internal/a/ba$1;->bIu:Lrx/internal/b/b;
 
-    iput-object p3, p0, Lrx/internal/a/ba$1;->bKV:Lrx/Subscriber;
+    iput-object p3, p0, Lrx/internal/a/ba$1;->bKQ: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;->bvG:Z
+    iget-boolean v0, p0, Lrx/internal/a/ba$1;->bvB:Z
 
     if-nez v0, :cond_0
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lrx/internal/a/ba$1;->bvG:Z
+    iput-boolean v0, p0, Lrx/internal/a/ba$1;->bvB: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;->bIz:Lrx/internal/b/b;
+    iget-object v1, p0, Lrx/internal/a/ba$1;->bIu: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;->bKV:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/ba$1;->bKQ: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;->bvG:Z
+    iget-boolean v0, p0, Lrx/internal/a/ba$1;->bvB: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 918a62f85e..a2a0234179 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 bKX:Lrx/internal/a/ba;
+.field public static final bKS: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;->bKX:Lrx/internal/a/ba;
+    sput-object v0, Lrx/internal/a/ba$a;->bKS: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 0c772898bc..850455fc46 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 JI()Lrx/internal/a/ba;
+.method public static JG()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;->bKX:Lrx/internal/a/ba;
+    sget-object v0, Lrx/internal/a/ba$a;->bKS: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 d041dbda0d..4b66a04c78 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 bLb:Lrx/functions/Func2;
+.field final synthetic bKW:Lrx/functions/Func2;
 
-.field final synthetic bLc:Lrx/internal/a/bb;
+.field final synthetic bKX: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;->bLc:Lrx/internal/a/bb;
+    iput-object p1, p0, Lrx/internal/a/bb$1;->bKX:Lrx/internal/a/bb;
 
-    iput-object p2, p0, Lrx/internal/a/bb$1;->bLb:Lrx/functions/Func2;
+    iput-object p2, p0, Lrx/internal/a/bb$1;->bKW: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;->bLb:Lrx/functions/Func2;
+    iget-object v0, p0, Lrx/internal/a/bb$1;->bKW: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 b57917af8a..73d344b07e 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 bHH:Lrx/Subscriber;
+.field final synthetic bHC:Lrx/Subscriber;
 
-.field final synthetic bIz:Lrx/internal/b/b;
+.field final synthetic bIu:Lrx/internal/b/b;
 
-.field final synthetic bLc:Lrx/internal/a/bb;
+.field final synthetic bKX:Lrx/internal/a/bb;
 
-.field bvG:Z
+.field bvB: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;->bLc:Lrx/internal/a/bb;
+    iput-object p1, p0, Lrx/internal/a/bb$2;->bKX:Lrx/internal/a/bb;
 
-    iput-object p2, p0, Lrx/internal/a/bb$2;->bIz:Lrx/internal/b/b;
+    iput-object p2, p0, Lrx/internal/a/bb$2;->bIu:Lrx/internal/b/b;
 
-    iput-object p3, p0, Lrx/internal/a/bb$2;->bHH:Lrx/Subscriber;
+    iput-object p3, p0, Lrx/internal/a/bb$2;->bHC:Lrx/Subscriber;
 
     invoke-direct {p0}, Lrx/Subscriber;-><init>()V
 
     new-instance p1, Ljava/util/ArrayList;
 
-    iget-object p2, p0, Lrx/internal/a/bb$2;->bLc:Lrx/internal/a/bb;
+    iget-object p2, p0, Lrx/internal/a/bb$2;->bKX:Lrx/internal/a/bb;
 
-    iget p2, p2, Lrx/internal/a/bb;->bKZ:I
+    iget p2, p2, Lrx/internal/a/bb;->bKU: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;->bvG:Z
+    iget-boolean v0, p0, Lrx/internal/a/bb$2;->bvB:Z
 
     if-nez v0, :cond_0
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lrx/internal/a/bb$2;->bvG:Z
+    iput-boolean v0, p0, Lrx/internal/a/bb$2;->bvB: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;->bLc:Lrx/internal/a/bb;
+    iget-object v1, p0, Lrx/internal/a/bb$2;->bKX:Lrx/internal/a/bb;
 
-    iget-object v1, v1, Lrx/internal/a/bb;->bKY:Ljava/util/Comparator;
+    iget-object v1, v1, Lrx/internal/a/bb;->bKT: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;->bIz:Lrx/internal/b/b;
+    iget-object v1, p0, Lrx/internal/a/bb$2;->bIu: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;->bHH:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/bb$2;->bHC: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;->bvG:Z
+    iget-boolean v0, p0, Lrx/internal/a/bb$2;->bvB: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 f3acc190fc..47cdefdbac 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 bLa:Ljava/util/Comparator;
+.field private static final bKV:Ljava/util/Comparator;
 
 
 # instance fields
-.field final bKY:Ljava/util/Comparator;
+.field final bKT:Ljava/util/Comparator;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Comparator<",
@@ -40,7 +40,7 @@
     .end annotation
 .end field
 
-.field final bKZ:I
+.field final bKU:I
 
 
 # direct methods
@@ -51,7 +51,7 @@
 
     invoke-direct {v0}, Lrx/internal/a/bb$a;-><init>()V
 
-    sput-object v0, Lrx/internal/a/bb;->bLa:Ljava/util/Comparator;
+    sput-object v0, Lrx/internal/a/bb;->bKV: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;->bLa:Ljava/util/Comparator;
+    sget-object v0, Lrx/internal/a/bb;->bKV:Ljava/util/Comparator;
 
-    iput-object v0, p0, Lrx/internal/a/bb;->bKY:Ljava/util/Comparator;
+    iput-object v0, p0, Lrx/internal/a/bb;->bKT:Ljava/util/Comparator;
 
     const/16 v0, 0xa
 
-    iput v0, p0, Lrx/internal/a/bb;->bKZ:I
+    iput v0, p0, Lrx/internal/a/bb;->bKU:I
 
     return-void
 .end method
@@ -88,13 +88,13 @@
 
     const/16 v0, 0xa
 
-    iput v0, p0, Lrx/internal/a/bb;->bKZ:I
+    iput v0, p0, Lrx/internal/a/bb;->bKU: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;->bKY:Ljava/util/Comparator;
+    iput-object v0, p0, Lrx/internal/a/bb;->bKT: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 1dd5a86207..6a8f501631 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 bLe:Lrx/internal/util/i;
+.field final bKZ:Lrx/internal/util/i;
 
-.field final synthetic bLf:Lrx/internal/a/bc$a;
+.field final synthetic bLa: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;->bLf:Lrx/internal/a/bc$a;
+    iput-object p1, p0, Lrx/internal/a/bc$a$a;->bLa:Lrx/internal/a/bc$a;
 
     invoke-direct {p0}, Lrx/Subscriber;-><init>()V
 
-    invoke-static {}, Lrx/internal/util/i;->JU()Lrx/internal/util/i;
+    invoke-static {}, Lrx/internal/util/i;->JS()Lrx/internal/util/i;
 
     move-result-object p1
 
-    iput-object p1, p0, Lrx/internal/a/bc$a$a;->bLe:Lrx/internal/util/i;
+    iput-object p1, p0, Lrx/internal/a/bc$a$a;->bKZ: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;->bLe:Lrx/internal/util/i;
+    iget-object v0, p0, Lrx/internal/a/bc$a$a;->bKZ:Lrx/internal/util/i;
 
-    iget-object v1, v0, Lrx/internal/util/i;->bNe:Ljava/lang/Object;
+    iget-object v1, v0, Lrx/internal/util/i;->bMZ:Ljava/lang/Object;
 
     if-nez v1, :cond_0
 
-    invoke-static {}, Lrx/internal/a/g;->Jg()Ljava/lang/Object;
+    invoke-static {}, Lrx/internal/a/g;->Je()Ljava/lang/Object;
 
     move-result-object v1
 
-    iput-object v1, v0, Lrx/internal/util/i;->bNe:Ljava/lang/Object;
+    iput-object v1, v0, Lrx/internal/util/i;->bMZ:Ljava/lang/Object;
 
     :cond_0
-    iget-object v0, p0, Lrx/internal/a/bc$a$a;->bLf:Lrx/internal/a/bc$a;
+    iget-object v0, p0, Lrx/internal/a/bc$a$a;->bLa: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;->bLf:Lrx/internal/a/bc$a;
+    iget-object v0, p0, Lrx/internal/a/bc$a$a;->bLa: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;->bLe:Lrx/internal/util/i;
+    iget-object v0, p0, Lrx/internal/a/bc$a$a;->bKZ: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;->bLf:Lrx/internal/a/bc$a;
+    iget-object p1, p0, Lrx/internal/a/bc$a$a;->bLa: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;->bNf:I
+    sget v0, Lrx/internal/util/i;->bNa: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 9801f5985c..e9b07dc324 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 bLd:I
+.field static final bKY: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;->bNf:I
+    sget v0, Lrx/internal/util/i;->bNa:I
 
     int-to-double v0, v0
 
@@ -79,7 +79,7 @@
 
     double-to-int v0, v0
 
-    sput v0, Lrx/internal/a/bc$a;->bLd:I
+    sput v0, Lrx/internal/a/bc$a;->bKY: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;->bLe:Lrx/internal/util/i;
+    iget-object v11, v11, Lrx/internal/a/bc$a$a;->bKZ: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;->bLe:Lrx/internal/util/i;
+    iget-object v9, v9, Lrx/internal/a/bc$a$a;->bKZ: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;->bLd:I
+    sget v8, Lrx/internal/a/bc$a;->bKY: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 40fad97391..ad67bcbaef 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 aoZ:Z
+.field aoV:Z
 
-.field final bLg:Lrx/internal/a/bc$b;
+.field final bLb: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 bLh:Lrx/internal/a/bc;
+.field final synthetic bLc: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;->bLh:Lrx/internal/a/bc;
+    iput-object p1, p0, Lrx/internal/a/bc$c;->bLc: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;->bLg:Lrx/internal/a/bc$b;
+    iput-object p4, p0, Lrx/internal/a/bc$c;->bLb: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;->aoZ:Z
+    iget-boolean v0, p0, Lrx/internal/a/bc$c;->aoV: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;->aoZ:Z
+    iput-boolean v0, p0, Lrx/internal/a/bc$c;->aoV: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;->bLg:Lrx/internal/a/bc$b;
+    iget-object v1, p0, Lrx/internal/a/bc$c;->bLb: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 af31b8d6b6..13bbd643da 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 bLj:Lrx/g;
+.field final bLe: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;->bLj:Lrx/g;
+    iput-object p1, p0, Lrx/internal/a/bd$a;->bLe:Lrx/g;
 
     return-void
 .end method
@@ -72,7 +72,7 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lrx/internal/a/bd$a;->bLj:Lrx/g;
+    iget-object v0, p0, Lrx/internal/a/bd$a;->bLe: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;->bLj:Lrx/g;
+    iget-object v1, p0, Lrx/internal/a/bd$a;->bLe: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;->bLj:Lrx/g;
+    iget-object v0, p0, Lrx/internal/a/bd$a;->bLe: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;->bLj:Lrx/g;
+    iget-object p1, p0, Lrx/internal/a/bd$a;->bLe: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 66ce33df6d..2666d670fd 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 bLi:Lrx/Observable$a;
+.field final bLd: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;->bLi:Lrx/Observable$a;
+    iput-object p1, p0, Lrx/internal/a/bd;->bLd: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;->bLi:Lrx/Observable$a;
+    iget-object p1, p0, Lrx/internal/a/bd;->bLd: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 23740dafa5..a8dc588799 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 bLk:Lrx/f$a;
+.field final bLf:Lrx/f$a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/f$a<",
@@ -37,7 +37,7 @@
     .end annotation
 .end field
 
-.field final bLl:Lrx/Observable$b;
+.field final bLg: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;->bLl:Lrx/Observable$b;
+    iget-object v1, p0, Lrx/internal/a/be;->bLg: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;->bLk:Lrx/f$a;
+    iget-object v0, p0, Lrx/internal/a/be;->bLf: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 e71b354571..95d4e59f03 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 bLk:Lrx/f$a;
+.field final bLf: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;->bLk:Lrx/f$a;
+    iput-object p1, p0, Lrx/internal/a/bf;->bLf: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;->bLk:Lrx/f$a;
+    iget-object p1, p0, Lrx/internal/a/bf;->bLf: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 5138406369..259d816231 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 bGR:Lrx/internal/a/c;
+.field final bGM: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;->bGR:Lrx/internal/a/c;
+    iput-object p1, p0, Lrx/internal/a/c$a;->bGM: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;->bGR:Lrx/internal/a/c;
+    iget-object v0, p0, Lrx/internal/a/c$a;->bGM: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 56bedb406d..9ee93929e0 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 bGQ:Ljava/util/concurrent/atomic/AtomicInteger;
+.field final bGL: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;->bGQ:Ljava/util/concurrent/atomic/AtomicInteger;
+    iput-object p1, p0, Lrx/internal/a/c;->bGL: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;->bGQ:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object p2, p0, Lrx/internal/a/c;->bGL: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;->bGQ:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object p2, p0, Lrx/internal/a/c;->bGL: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;->bGQ:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object p2, p0, Lrx/internal/a/c;->bGL: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;->bGQ:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v2, p0, Lrx/internal/a/c;->bGL: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;->bGQ:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v0, p0, Lrx/internal/a/c;->bGL: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;->bGQ:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v2, p0, Lrx/internal/a/c;->bGL: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 a0e545624d..c19436b97a 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 bGS:Lrx/internal/a/e;
+.field public static final enum bGN:Lrx/internal/a/e;
 
-.field static final bGT:Lrx/Observable;
+.field static final bGO:Lrx/Observable;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/Observable<",
@@ -32,7 +32,7 @@
     .end annotation
 .end field
 
-.field private static final synthetic bGU:[Lrx/internal/a/e;
+.field private static final synthetic bGP:[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;->bGS:Lrx/internal/a/e;
+    sput-object v0, Lrx/internal/a/e;->bGN:Lrx/internal/a/e;
 
     const/4 v0, 0x1
 
     new-array v0, v0, [Lrx/internal/a/e;
 
-    sget-object v1, Lrx/internal/a/e;->bGS:Lrx/internal/a/e;
+    sget-object v1, Lrx/internal/a/e;->bGN:Lrx/internal/a/e;
 
     const/4 v2, 0x0
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lrx/internal/a/e;->bGU:[Lrx/internal/a/e;
+    sput-object v0, Lrx/internal/a/e;->bGP:[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;->bGT:Lrx/Observable;
+    sput-object v0, Lrx/internal/a/e;->bGO:Lrx/Observable;
 
     return-void
 .end method
@@ -83,7 +83,7 @@
     return-void
 .end method
 
-.method public static Jf()Lrx/Observable;
+.method public static Jd()Lrx/Observable;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -95,7 +95,7 @@
         }
     .end annotation
 
-    sget-object v0, Lrx/internal/a/e;->bGT:Lrx/Observable;
+    sget-object v0, Lrx/internal/a/e;->bGO: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;->bGU:[Lrx/internal/a/e;
+    sget-object v0, Lrx/internal/a/e;->bGP:[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 a20831c3ee..0432a38d75 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 bGV:Lrx/internal/a/f;
+.field public static final enum bGQ:Lrx/internal/a/f;
 
-.field static final bGW:Lrx/Observable;
+.field static final bGR:Lrx/Observable;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/Observable<",
@@ -32,7 +32,7 @@
     .end annotation
 .end field
 
-.field private static final synthetic bGX:[Lrx/internal/a/f;
+.field private static final synthetic bGS:[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;->bGV:Lrx/internal/a/f;
+    sput-object v0, Lrx/internal/a/f;->bGQ:Lrx/internal/a/f;
 
     const/4 v0, 0x1
 
     new-array v0, v0, [Lrx/internal/a/f;
 
-    sget-object v1, Lrx/internal/a/f;->bGV:Lrx/internal/a/f;
+    sget-object v1, Lrx/internal/a/f;->bGQ:Lrx/internal/a/f;
 
     const/4 v2, 0x0
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lrx/internal/a/f;->bGX:[Lrx/internal/a/f;
+    sput-object v0, Lrx/internal/a/f;->bGS:[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;->bGW:Lrx/Observable;
+    sput-object v0, Lrx/internal/a/f;->bGR:Lrx/Observable;
 
     return-void
 .end method
@@ -83,7 +83,7 @@
     return-void
 .end method
 
-.method public static Jf()Lrx/Observable;
+.method public static Jd()Lrx/Observable;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -95,7 +95,7 @@
         }
     .end annotation
 
-    sget-object v0, Lrx/internal/a/f;->bGW:Lrx/Observable;
+    sget-object v0, Lrx/internal/a/f;->bGR: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;->bGX:[Lrx/internal/a/f;
+    sget-object v0, Lrx/internal/a/f;->bGS:[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 6e3b7cc094..3f43713f3f 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 bGY:Ljava/lang/Object;
+.field private static final bGT:Ljava/lang/Object;
 
-.field private static final bGZ:Ljava/lang/Object;
+.field private static final bGU: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;->bGY:Ljava/lang/Object;
+    sput-object v0, Lrx/internal/a/g;->bGT: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;->bGZ:Ljava/lang/Object;
+    sput-object v0, Lrx/internal/a/g;->bGU:Ljava/lang/Object;
 
     return-void
 .end method
 
-.method public static Jg()Ljava/lang/Object;
+.method public static Je()Ljava/lang/Object;
     .locals 1
 
-    sget-object v0, Lrx/internal/a/g;->bGY:Ljava/lang/Object;
+    sget-object v0, Lrx/internal/a/g;->bGT:Ljava/lang/Object;
 
     return-object v0
 .end method
@@ -68,7 +68,7 @@
         }
     .end annotation
 
-    sget-object v0, Lrx/internal/a/g;->bGY:Ljava/lang/Object;
+    sget-object v0, Lrx/internal/a/g;->bGT:Ljava/lang/Object;
 
     const/4 v1, 0x1
 
@@ -79,7 +79,7 @@
     return v1
 
     :cond_0
-    sget-object v0, Lrx/internal/a/g;->bGZ:Ljava/lang/Object;
+    sget-object v0, Lrx/internal/a/g;->bGU:Ljava/lang/Object;
 
     const/4 v2, 0x0
 
@@ -138,7 +138,7 @@
 
     if-nez p0, :cond_0
 
-    sget-object p0, Lrx/internal/a/g;->bGZ:Ljava/lang/Object;
+    sget-object p0, Lrx/internal/a/g;->bGU: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;->bGY:Ljava/lang/Object;
+    sget-object v0, Lrx/internal/a/g;->bGT:Ljava/lang/Object;
 
     if-ne p0, v0, :cond_0
 
@@ -206,7 +206,7 @@
         }
     .end annotation
 
-    sget-object v0, Lrx/internal/a/g;->bGZ:Ljava/lang/Object;
+    sget-object v0, Lrx/internal/a/g;->bGU: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 1277155c1c..44efa8509f 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 bHc:Lrx/internal/a/h$b;
+.field final bGX: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;->bHc:Lrx/internal/a/h$b;
+    iput-object p1, p0, Lrx/internal/a/h$a;->bGX:Lrx/internal/a/h$b;
 
     iput p2, p0, Lrx/internal/a/h$a;->index:I
 
@@ -69,7 +69,7 @@
 
 
 # virtual methods
-.method public final Jh()V
+.method public final Jf()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;->bHc:Lrx/internal/a/h$b;
+    iget-object v0, p0, Lrx/internal/a/h$a;->bGX: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;->bHc:Lrx/internal/a/h$b;
+    iget-object v0, p0, Lrx/internal/a/h$a;->bGX: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;->bHc:Lrx/internal/a/h$b;
+    iget-object p1, p0, Lrx/internal/a/h$a;->bGX: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;->bHc:Lrx/internal/a/h$b;
+    iget-object v0, p0, Lrx/internal/a/h$a;->bGX: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 d664603315..39640040d2 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 bHd:Ljava/lang/Object;
+.field static final bGY: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;->bHd:Ljava/lang/Object;
+    sput-object v0, Lrx/internal/a/h$b;->bGY: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;->bHd:Ljava/lang/Object;
+    sget-object p2, Lrx/internal/a/h$b;->bGY: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 Ji()V
+.method private Jg()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;->Jh()V
+    invoke-virtual/range {v17 .. v17}, Lrx/internal/a/h$a;->Jf()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;->bHd:Ljava/lang/Object;
+    sget-object v4, Lrx/internal/a/h$b;->bGY: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;->bHd:Ljava/lang/Object;
+    sget-object v1, Lrx/internal/a/h$b;->bGY: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;->bHd:Ljava/lang/Object;
+    sget-object p2, Lrx/internal/a/h$b;->bGY: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;->Jh()V
+    invoke-virtual {v0}, Lrx/internal/a/h$a;->Jf()V
 
     return-void
 
     :cond_9
-    invoke-direct {p0}, Lrx/internal/a/h$b;->Ji()V
+    invoke-direct {p0}, Lrx/internal/a/h$b;->Jg()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;->Ji()V
+    invoke-direct {p0}, Lrx/internal/a/h$b;->Jg()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 b76225af70..3b6119e8c1 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 bHa:[Lrx/Observable;
+.field final bGV:[Lrx/Observable;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "[",
@@ -39,7 +39,7 @@
     .end annotation
 .end field
 
-.field final bHb:Ljava/lang/Iterable;
+.field final bGW:Ljava/lang/Iterable;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Iterable<",
@@ -79,7 +79,7 @@
         }
     .end annotation
 
-    sget v0, Lrx/internal/util/i;->bNf:I
+    sget v0, Lrx/internal/util/i;->bNa: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;->bHa:[Lrx/Observable;
+    iput-object v0, p0, Lrx/internal/a/h;->bGV:[Lrx/Observable;
 
-    iput-object p1, p0, Lrx/internal/a/h;->bHb:Ljava/lang/Iterable;
+    iput-object p1, p0, Lrx/internal/a/h;->bGW: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;->bHa:[Lrx/Observable;
+    iget-object p1, p0, Lrx/internal/a/h;->bGV:[Lrx/Observable;
 
     const/4 v6, 0x0
 
     if-nez p1, :cond_3
 
-    iget-object p1, p0, Lrx/internal/a/h;->bHb:Ljava/lang/Iterable;
+    iget-object p1, p0, Lrx/internal/a/h;->bGW: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 b742b80791..2a2e34613d 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 bHi:Lrx/internal/a/i$c;
+.field final synthetic bHd:Lrx/internal/a/i$c;
 
-.field final synthetic bHj:Lrx/internal/a/i;
+.field final synthetic bHe: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;->bHj:Lrx/internal/a/i;
+    iput-object p1, p0, Lrx/internal/a/i$1;->bHe:Lrx/internal/a/i;
 
-    iput-object p2, p0, Lrx/internal/a/i$1;->bHi:Lrx/internal/a/i$c;
+    iput-object p2, p0, Lrx/internal/a/i$1;->bHd: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;->bHi:Lrx/internal/a/i$c;
+    iget-object v0, p0, Lrx/internal/a/i$1;->bHd: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;->bHm:Lrx/internal/b/a;
+    iget-object v0, v0, Lrx/internal/a/i$c;->bHh: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 17a2b046d3..e6b13ee9e8 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 bHk:Lrx/internal/a/i$c;
+.field final bHf: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 bHl:Z
+.field bHg: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;->bHk:Lrx/internal/a/i$c;
+    iput-object p2, p0, Lrx/internal/a/i$a;->bHf: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;->bHl:Z
+    iget-boolean v0, p0, Lrx/internal/a/i$a;->bHg:Z
 
     if-nez v0, :cond_0
 
@@ -87,9 +87,9 @@
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lrx/internal/a/i$a;->bHl:Z
+    iput-boolean p1, p0, Lrx/internal/a/i$a;->bHg:Z
 
-    iget-object p1, p0, Lrx/internal/a/i$a;->bHk:Lrx/internal/a/i$c;
+    iget-object p1, p0, Lrx/internal/a/i$a;->bHf: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 c1a8a0c172..f83afa2dd3 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 bHk:Lrx/internal/a/i$c;
+.field final bHf: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;->bHk:Lrx/internal/a/i$c;
+    iput-object p1, p0, Lrx/internal/a/i$b;->bHf: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;->bHk:Lrx/internal/a/i$c;
+    iget-object v0, p0, Lrx/internal/a/i$b;->bHf: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;->bHk:Lrx/internal/a/i$c;
+    iget-object v0, p0, Lrx/internal/a/i$b;->bHf: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;->bHh:I
+    iget p1, v0, Lrx/internal/a/i$c;->bHc:I
 
     if-nez p1, :cond_2
 
@@ -123,7 +123,7 @@
 
     if-eqz p1, :cond_3
 
-    iget-object p1, v0, Lrx/internal/a/i$c;->bHm:Lrx/internal/b/a;
+    iget-object p1, v0, Lrx/internal/a/i$c;->bHh: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;->Ji()V
+    invoke-virtual {v0}, Lrx/internal/a/i$c;->Jg()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;->bHk:Lrx/internal/a/i$c;
+    iget-object v0, p0, Lrx/internal/a/i$b;->bHf: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;->bHk:Lrx/internal/a/i$c;
+    iget-object v0, p0, Lrx/internal/a/i$b;->bHf:Lrx/internal/a/i$c;
 
-    iget-object v0, v0, Lrx/internal/a/i$c;->bHm:Lrx/internal/b/a;
+    iget-object v0, v0, Lrx/internal/a/i$c;->bHh: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 6b204fe406..40614a6f36 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 bHf:Lrx/functions/b;
+.field final bHa:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -49,11 +49,11 @@
     .end annotation
 .end field
 
-.field final bHh:I
+.field final bHc:I
 
-.field final bHm:Lrx/internal/b/a;
+.field final bHh:Lrx/internal/b/a;
 
-.field final bHn:Lrx/subscriptions/SerialSubscription;
+.field final bHi: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;->bHf:Lrx/functions/b;
+    iput-object p2, p0, Lrx/internal/a/i$c;->bHa:Lrx/functions/b;
 
-    iput p4, p0, Lrx/internal/a/i$c;->bHh:I
+    iput p4, p0, Lrx/internal/a/i$c;->bHc: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;->bHm:Lrx/internal/b/a;
+    iput-object p1, p0, Lrx/internal/a/i$c;->bHh: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;->Kd()Z
+    invoke-static {}, Lrx/internal/util/b/ae;->Kb()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;->bHn:Lrx/subscriptions/SerialSubscription;
+    iput-object p1, p0, Lrx/internal/a/i$c;->bHi:Lrx/subscriptions/SerialSubscription;
 
     int-to-long p1, p3
 
@@ -194,7 +194,7 @@
 
 
 # virtual methods
-.method final Ji()V
+.method final Jg()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;->bHh:I
+    iget v0, p0, Lrx/internal/a/i$c;->bHc: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;->bHf:Lrx/functions/b;
+    iget-object v2, p0, Lrx/internal/a/i$c;->bHa: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;->IS()Lrx/Observable;
+    invoke-static {}, Lrx/Observable;->IQ()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;->bHm:Lrx/internal/b/a;
+    iget-object v1, p0, Lrx/internal/a/i$c;->bHh:Lrx/internal/b/a;
 
     new-instance v3, Lrx/internal/a/i$a;
 
-    iget-object v2, v2, Lrx/internal/util/k;->bNh:Ljava/lang/Object;
+    iget-object v2, v2, Lrx/internal/util/k;->bNc: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;->bHn:Lrx/subscriptions/SerialSubscription;
+    iget-object v6, p0, Lrx/internal/a/i$c;->bHi: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;->bHm:Lrx/internal/b/a;
+    iget-object v0, p0, Lrx/internal/a/i$c;->bHh: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;->Ji()V
+    invoke-virtual {p0}, Lrx/internal/a/i$c;->Jg()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;->Ji()V
+    invoke-virtual {p0}, Lrx/internal/a/i$c;->Jg()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;->bHh:I
+    iget p1, p0, Lrx/internal/a/i$c;->bHc: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;->bHn:Lrx/subscriptions/SerialSubscription;
+    iget-object p1, p0, Lrx/internal/a/i$c;->bHi:Lrx/subscriptions/SerialSubscription;
 
     invoke-virtual {p1}, Lrx/subscriptions/SerialSubscription;->unsubscribe()V
 
     return-void
 
     :cond_1
-    invoke-virtual {p0}, Lrx/internal/a/i$c;->Ji()V
+    invoke-virtual {p0}, Lrx/internal/a/i$c;->Jg()V
 
     return-void
 
@@ -556,7 +556,7 @@
     return-void
 
     :cond_0
-    invoke-virtual {p0}, Lrx/internal/a/i$c;->Ji()V
+    invoke-virtual {p0}, Lrx/internal/a/i$c;->Jg()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 54730633c2..eb82d46456 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 bHe:Lrx/Observable;
+.field final bGZ:Lrx/Observable;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/Observable<",
@@ -39,7 +39,7 @@
     .end annotation
 .end field
 
-.field final bHf:Lrx/functions/b;
+.field final bHa:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -50,9 +50,9 @@
     .end annotation
 .end field
 
-.field final bHg:I
+.field final bHb:I
 
-.field final bHh:I
+.field final bHc:I
 
 
 # direct methods
@@ -72,17 +72,17 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/i;->bHe:Lrx/Observable;
+    iput-object p1, p0, Lrx/internal/a/i;->bGZ:Lrx/Observable;
 
-    iput-object p2, p0, Lrx/internal/a/i;->bHf:Lrx/functions/b;
+    iput-object p2, p0, Lrx/internal/a/i;->bHa:Lrx/functions/b;
 
     const/4 p1, 0x2
 
-    iput p1, p0, Lrx/internal/a/i;->bHg:I
+    iput p1, p0, Lrx/internal/a/i;->bHb:I
 
     const/4 p1, 0x0
 
-    iput p1, p0, Lrx/internal/a/i;->bHh:I
+    iput p1, p0, Lrx/internal/a/i;->bHc:I
 
     return-void
 .end method
@@ -94,7 +94,7 @@
 
     check-cast p1, Lrx/Subscriber;
 
-    iget v0, p0, Lrx/internal/a/i;->bHh:I
+    iget v0, p0, Lrx/internal/a/i;->bHc: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;->bHf:Lrx/functions/b;
+    iget-object v2, p0, Lrx/internal/a/i;->bHa:Lrx/functions/b;
 
-    iget v3, p0, Lrx/internal/a/i;->bHg:I
+    iget v3, p0, Lrx/internal/a/i;->bHb:I
 
-    iget v4, p0, Lrx/internal/a/i;->bHh:I
+    iget v4, p0, Lrx/internal/a/i;->bHc: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;->bHn:Lrx/subscriptions/SerialSubscription;
+    iget-object v0, v1, Lrx/internal/a/i$c;->bHi: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;->bHe:Lrx/Observable;
+    iget-object p1, p0, Lrx/internal/a/i;->bGZ: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 cb3e4bb73f..e23ce47e0e 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 bHq:[I
+.field static final synthetic bHl:[I
 
 
 # direct methods
@@ -30,12 +30,12 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lrx/internal/a/j$1;->bHq:[I
+    sput-object v0, Lrx/internal/a/j$1;->bHl:[I
 
     :try_start_0
-    sget-object v0, Lrx/internal/a/j$1;->bHq:[I
+    sget-object v0, Lrx/internal/a/j$1;->bHl:[I
 
-    sget-object v1, Lrx/Emitter$a;->bGf:Lrx/Emitter$a;
+    sget-object v1, Lrx/Emitter$a;->bGa: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;->bHq:[I
+    sget-object v0, Lrx/internal/a/j$1;->bHl:[I
 
-    sget-object v1, Lrx/Emitter$a;->bGg:Lrx/Emitter$a;
+    sget-object v1, Lrx/Emitter$a;->bGb: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;->bHq:[I
+    sget-object v0, Lrx/internal/a/j$1;->bHl:[I
 
-    sget-object v1, Lrx/Emitter$a;->bGi:Lrx/Emitter$a;
+    sget-object v1, Lrx/Emitter$a;->bGd: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;->bHq:[I
+    sget-object v0, Lrx/internal/a/j$1;->bHl:[I
 
-    sget-object v1, Lrx/Emitter$a;->bGj:Lrx/Emitter$a;
+    sget-object v1, Lrx/Emitter$a;->bGe: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 bad04e8003..fc3fb9f70c 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 Jj()V
+.method Jh()V
     .locals 0
 
     return-void
 .end method
 
-.method Jk()V
+.method Ji()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;->Jk()V
+    invoke-virtual {p0}, Lrx/internal/a/j$a;->Ji()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;->Jj()V
+    invoke-virtual {p0}, Lrx/internal/a/j$a;->Jh()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 78a40bffed..b03ce4381e 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;->Kd()Z
+    invoke-static {}, Lrx/internal/util/b/ae;->Kb()Z
 
     move-result p1
 
@@ -88,7 +88,7 @@
     return-void
 .end method
 
-.method private Ji()V
+.method private Jg()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 Jj()V
+.method final Jh()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 Jk()V
+.method final Ji()V
     .locals 0
 
-    invoke-direct {p0}, Lrx/internal/a/j$b;->Ji()V
+    invoke-direct {p0}, Lrx/internal/a/j$b;->Jg()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;->Ji()V
+    invoke-direct {p0}, Lrx/internal/a/j$b;->Jg()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;->Ji()V
+    invoke-direct {p0}, Lrx/internal/a/j$b;->Jg()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;->Ji()V
+    invoke-direct {p0}, Lrx/internal/a/j$b;->Jg()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 db1dc73576..138ae67062 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 Jl()V
+.method final Jj()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 18c94df484..2e793219fc 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 Jl()V
+.method final Jj()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 fafbd87d1a..0796f93546 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 Ji()V
+.method private Jg()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 Jj()V
+.method final Jh()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 Jk()V
+.method final Ji()V
     .locals 0
 
-    invoke-direct {p0}, Lrx/internal/a/j$e;->Ji()V
+    invoke-direct {p0}, Lrx/internal/a/j$e;->Jg()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;->Ji()V
+    invoke-direct {p0}, Lrx/internal/a/j$e;->Jg()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;->Ji()V
+    invoke-direct {p0}, Lrx/internal/a/j$e;->Jg()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;->Ji()V
+    invoke-direct {p0}, Lrx/internal/a/j$e;->Jg()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 e11c7aadf7..45cb858173 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 Jl()V
+.method abstract Jj()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;->Jl()V
+    invoke-virtual {p0}, Lrx/internal/a/j$f;->Jj()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 6c8547a0e2..5393ecb4dc 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 bHo:Lrx/functions/Action1;
+.field final bHj:Lrx/functions/Action1;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/Action1<",
@@ -42,7 +42,7 @@
     .end annotation
 .end field
 
-.field final bHp:Lrx/Emitter$a;
+.field final bHk: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;->bHo:Lrx/functions/Action1;
+    iput-object p1, p0, Lrx/internal/a/j;->bHj:Lrx/functions/Action1;
 
-    iput-object p2, p0, Lrx/internal/a/j;->bHp:Lrx/Emitter$a;
+    iput-object p2, p0, Lrx/internal/a/j;->bHk:Lrx/Emitter$a;
 
     return-void
 .end method
@@ -75,9 +75,9 @@
 
     check-cast p1, Lrx/Subscriber;
 
-    sget-object v0, Lrx/internal/a/j$1;->bHq:[I
+    sget-object v0, Lrx/internal/a/j$1;->bHl:[I
 
-    iget-object v1, p0, Lrx/internal/a/j;->bHp:Lrx/Emitter$a;
+    iget-object v1, p0, Lrx/internal/a/j;->bHk: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;->bNf:I
+    sget v1, Lrx/internal/util/i;->bNa: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;->bHo:Lrx/functions/Action1;
+    iget-object p1, p0, Lrx/internal/a/j;->bHj: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 5292d6c878..a4fc7a6659 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 bHr:Lrx/functions/Func0;
+.field final bHm: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;->bHr:Lrx/functions/Func0;
+    iput-object p1, p0, Lrx/internal/a/k;->bHm: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;->bHr:Lrx/functions/Func0;
+    iget-object v0, p0, Lrx/internal/a/k;->bHm: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 44be654c61..b831a3c75e 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 bHs:Lrx/e;
+.field private final bHn: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;->bHs:Lrx/e;
+    iput-object p2, p0, Lrx/internal/a/l$a;->bHn:Lrx/e;
 
     return-void
 .end method
@@ -81,7 +81,7 @@
 
     :cond_0
     :try_start_0
-    iget-object v0, p0, Lrx/internal/a/l$a;->bHs:Lrx/e;
+    iget-object v0, p0, Lrx/internal/a/l$a;->bHn: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;->bHs:Lrx/e;
+    iget-object v1, p0, Lrx/internal/a/l$a;->bHn: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;->bHs:Lrx/e;
+    iget-object v0, p0, Lrx/internal/a/l$a;->bHn: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 4b429d99fd..d0e7d47b61 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 bHe:Lrx/Observable;
+.field private final bGZ:Lrx/Observable;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/Observable<",
@@ -35,7 +35,7 @@
     .end annotation
 .end field
 
-.field private final bHs:Lrx/e;
+.field private final bHn: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;->bHe:Lrx/Observable;
+    iput-object p1, p0, Lrx/internal/a/l;->bGZ:Lrx/Observable;
 
-    iput-object p2, p0, Lrx/internal/a/l;->bHs:Lrx/e;
+    iput-object p2, p0, Lrx/internal/a/l;->bHn:Lrx/e;
 
     return-void
 .end method
@@ -74,11 +74,11 @@
 
     check-cast p1, Lrx/Subscriber;
 
-    iget-object v0, p0, Lrx/internal/a/l;->bHe:Lrx/Observable;
+    iget-object v0, p0, Lrx/internal/a/l;->bGZ:Lrx/Observable;
 
     new-instance v1, Lrx/internal/a/l$a;
 
-    iget-object v2, p0, Lrx/internal/a/l;->bHs:Lrx/e;
+    iget-object v2, p0, Lrx/internal/a/l;->bHn: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 c0546e622f..76113720ba 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 bHt:Lrx/functions/b;
+.field final bHo: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;->bHt:Lrx/functions/b;
+    iput-object p2, p0, Lrx/internal/a/m$a;->bHo: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;->bHt:Lrx/functions/b;
+    iget-object v0, p0, Lrx/internal/a/m$a;->bHo: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 20221176cd..6954b18613 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 bHe:Lrx/Observable;
+.field final bGZ:Lrx/Observable;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/Observable<",
@@ -35,7 +35,7 @@
     .end annotation
 .end field
 
-.field final bHt:Lrx/functions/b;
+.field final bHo: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;->bHe:Lrx/Observable;
+    iput-object p1, p0, Lrx/internal/a/m;->bGZ:Lrx/Observable;
 
-    iput-object p2, p0, Lrx/internal/a/m;->bHt:Lrx/functions/b;
+    iput-object p2, p0, Lrx/internal/a/m;->bHo: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;->bHt:Lrx/functions/b;
+    iget-object v1, p0, Lrx/internal/a/m;->bHo: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;->bHe:Lrx/Observable;
+    iget-object p1, p0, Lrx/internal/a/m;->bGZ: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 7173763fc7..66548419c8 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 bHu:Lrx/internal/a/n$a;
+.field final synthetic bHp:Lrx/internal/a/n$a;
 
-.field final synthetic bHv:Lrx/internal/a/n;
+.field final synthetic bHq: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;->bHv:Lrx/internal/a/n;
+    iput-object p1, p0, Lrx/internal/a/n$1;->bHq:Lrx/internal/a/n;
 
-    iput-object p2, p0, Lrx/internal/a/n$1;->bHu:Lrx/internal/a/n$a;
+    iput-object p2, p0, Lrx/internal/a/n$1;->bHp: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;->bHu:Lrx/internal/a/n$a;
+    iget-object v0, p0, Lrx/internal/a/n$1;->bHp: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;->Ji()V
+    invoke-virtual {v0}, Lrx/internal/a/n$a;->Jg()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 80253c4b06..f7d0363a82 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 bHf:Lrx/functions/b;
+.field final bHa:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -47,9 +47,9 @@
     .end annotation
 .end field
 
-.field final bHw:J
+.field final bHr:J
 
-.field bHx:Ljava/util/Iterator;
+.field bHs: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;->bHf:Lrx/functions/b;
+    iput-object p2, p0, Lrx/internal/a/n$a;->bHa: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;->bHw:J
+    iput-wide p1, p0, Lrx/internal/a/n$a;->bHr:J
 
     new-instance p1, Lrx/internal/util/a/f;
 
-    sget p2, Lrx/internal/util/i;->bNf:I
+    sget p2, Lrx/internal/util/i;->bNa: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;->bHw:J
+    iput-wide p1, p0, Lrx/internal/a/n$a;->bHr:J
 
-    invoke-static {}, Lrx/internal/util/b/ae;->Kd()Z
+    invoke-static {}, Lrx/internal/util/b/ae;->Kb()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;->bHx:Ljava/util/Iterator;
+    iput-object v1, p0, Lrx/internal/a/n$a;->bHs: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;->bHx:Ljava/util/Iterator;
+    iput-object v1, p0, Lrx/internal/a/n$a;->bHs:Ljava/util/Iterator;
 
     invoke-virtual {p3, p1}, Lrx/Subscriber;->onError(Ljava/lang/Throwable;)V
 
@@ -254,7 +254,7 @@
 
 
 # virtual methods
-.method final Ji()V
+.method final Jg()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;->bHx:Ljava/util/Iterator;
+    iget-object v0, v1, Lrx/internal/a/n$a;->bHs:Ljava/util/Iterator;
 
     const-wide/16 v6, 0x1
 
@@ -321,7 +321,7 @@
 
     move v15, v5
 
-    iget-wide v4, v1, Lrx/internal/a/n$a;->bHw:J
+    iget-wide v4, v1, Lrx/internal/a/n$a;->bHr:J
 
     cmp-long v0, v13, v4
 
@@ -338,7 +338,7 @@
 
     :goto_2
     :try_start_0
-    iget-object v0, v1, Lrx/internal/a/n$a;->bHf:Lrx/functions/b;
+    iget-object v0, v1, Lrx/internal/a/n$a;->bHa: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;->bHx:Ljava/util/Iterator;
+    iput-object v0, v1, Lrx/internal/a/n$a;->bHs:Ljava/util/Iterator;
 
     goto :goto_3
 
@@ -438,7 +438,7 @@
 
     if-nez v11, :cond_6
 
-    iput-object v14, v1, Lrx/internal/a/n$a;->bHx:Ljava/util/Iterator;
+    iput-object v14, v1, Lrx/internal/a/n$a;->bHs: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;->bHx:Ljava/util/Iterator;
+    iput-object v14, v1, Lrx/internal/a/n$a;->bHs: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;->bHx:Ljava/util/Iterator;
+    iput-object v14, v1, Lrx/internal/a/n$a;->bHs: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;->Ji()V
+    invoke-virtual {p0}, Lrx/internal/a/n$a;->Jg()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;->Ji()V
+    invoke-virtual {p0}, Lrx/internal/a/n$a;->Jg()V
 
     return-void
 
@@ -600,7 +600,7 @@
     return-void
 
     :cond_0
-    invoke-virtual {p0}, Lrx/internal/a/n$a;->Ji()V
+    invoke-virtual {p0}, Lrx/internal/a/n$a;->Jg()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 de44e43e23..661600f0e4 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 bHf:Lrx/functions/b;
+.field final bHa: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;->bHf:Lrx/functions/b;
+    iput-object p2, p0, Lrx/internal/a/n$b;->bHa: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;->bHf:Lrx/functions/b;
+    iget-object v0, p0, Lrx/internal/a/n$b;->bHa: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 1eeb341e4d..6d659100a0 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 bHe:Lrx/Observable;
+.field final bGZ:Lrx/Observable;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/Observable<",
@@ -38,7 +38,7 @@
     .end annotation
 .end field
 
-.field final bHf:Lrx/functions/b;
+.field final bHa:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -49,7 +49,7 @@
     .end annotation
 .end field
 
-.field final bHg:I
+.field final bHb:I
 
 
 # direct methods
@@ -69,11 +69,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/n;->bHe:Lrx/Observable;
+    iput-object p1, p0, Lrx/internal/a/n;->bGZ:Lrx/Observable;
 
-    iput-object p2, p0, Lrx/internal/a/n;->bHf:Lrx/functions/b;
+    iput-object p2, p0, Lrx/internal/a/n;->bHa:Lrx/functions/b;
 
-    iput p3, p0, Lrx/internal/a/n;->bHg:I
+    iput p3, p0, Lrx/internal/a/n;->bHb:I
 
     return-void
 .end method
@@ -104,7 +104,7 @@
 
     check-cast p0, Lrx/internal/util/k;
 
-    iget-object p0, p0, Lrx/internal/util/k;->bNh:Ljava/lang/Object;
+    iget-object p0, p0, Lrx/internal/util/k;->bNc: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;->bHf:Lrx/functions/b;
+    iget-object v1, p0, Lrx/internal/a/n;->bHa:Lrx/functions/b;
 
-    iget v2, p0, Lrx/internal/a/n;->bHg:I
+    iget v2, p0, Lrx/internal/a/n;->bHb: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;->bHe:Lrx/Observable;
+    iget-object p1, p0, Lrx/internal/a/n;->bGZ: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 7158bdb3fc..cadbfc78d5 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 Jm()V
+.method private Jk()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;->Jm()V
+    invoke-direct {p0}, Lrx/internal/a/o$a;->Jk()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 13e79b9289..f50945087f 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 bHy:Ljava/lang/Iterable;
+.field final bHt: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;->bHy:Ljava/lang/Iterable;
+    iput-object p1, p0, Lrx/internal/a/p;->bHt: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;->bHy:Ljava/lang/Iterable;
+    iget-object v0, p0, Lrx/internal/a/p;->bHt: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 92efb4d13c..2d0ce5d7c2 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 bHA:Lrx/Observable$b;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/Observable$b<",
-            "+TR;-TT;>;"
-        }
-    .end annotation
-.end field
-
-.field final bHz:Lrx/Observable$a;
+.field final bHu:Lrx/Observable$a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/Observable$a<",
@@ -40,6 +31,15 @@
     .end annotation
 .end field
 
+.field final bHv:Lrx/Observable$b;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/Observable$b<",
+            "+TR;-TT;>;"
+        }
+    .end annotation
+.end field
+
 
 # direct methods
 .method public constructor <init>(Lrx/Observable$a;Lrx/Observable$b;)V
@@ -56,9 +56,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/q;->bHz:Lrx/Observable$a;
+    iput-object p1, p0, Lrx/internal/a/q;->bHu:Lrx/Observable$a;
 
-    iput-object p2, p0, Lrx/internal/a/q;->bHA:Lrx/Observable$b;
+    iput-object p2, p0, Lrx/internal/a/q;->bHv: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;->bHA:Lrx/Observable$b;
+    iget-object v0, p0, Lrx/internal/a/q;->bHv: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;->bHz:Lrx/Observable$a;
+    iget-object v1, p0, Lrx/internal/a/q;->bHu: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 c0385a26f2..27a2441b38 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 bHf:Lrx/functions/b;
+.field final bHa: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;->bHf:Lrx/functions/b;
+    iput-object p2, p0, Lrx/internal/a/r$a;->bHa: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;->bHf:Lrx/functions/b;
+    iget-object v0, p0, Lrx/internal/a/r$a;->bHa: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 2359f4165c..f591334f09 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 bHB:Lrx/functions/b;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/functions/b<",
-            "-TT;+TR;>;"
-        }
-    .end annotation
-.end field
-
-.field final bHe:Lrx/Observable;
+.field final bGZ:Lrx/Observable;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/Observable<",
@@ -46,6 +37,15 @@
     .end annotation
 .end field
 
+.field final bHw:Lrx/functions/b;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/functions/b<",
+            "-TT;+TR;>;"
+        }
+    .end annotation
+.end field
+
 
 # direct methods
 .method public constructor <init>(Lrx/Observable;Lrx/functions/b;)V
@@ -62,9 +62,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/r;->bHe:Lrx/Observable;
+    iput-object p1, p0, Lrx/internal/a/r;->bGZ:Lrx/Observable;
 
-    iput-object p2, p0, Lrx/internal/a/r;->bHB:Lrx/functions/b;
+    iput-object p2, p0, Lrx/internal/a/r;->bHw: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;->bHB:Lrx/functions/b;
+    iget-object v1, p0, Lrx/internal/a/r;->bHw: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;->bHe:Lrx/Observable;
+    iget-object p1, p0, Lrx/internal/a/r;->bGZ: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 0507b13128..300164184a 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 bHG:Lrx/internal/a/s$1;
+.field final synthetic bHB: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;->bHG:Lrx/internal/a/s$1;
+    iput-object p1, p0, Lrx/internal/a/s$1$1;->bHB: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;->IM()Lrx/d;
+    invoke-static {}, Lrx/d;->IK()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 591bf1f863..1aedb27c2b 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 bHN:Lrx/internal/a/s$2;
+.field final synthetic bHI: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;->bHN:Lrx/internal/a/s$2;
+    iput-object p1, p0, Lrx/internal/a/s$2$1;->bHI: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;->bHN:Lrx/internal/a/s$2;
+    iget-object v0, p0, Lrx/internal/a/s$2$1;->bHI:Lrx/internal/a/s$2;
 
-    iget-object v0, v0, Lrx/internal/a/s$2;->bHI:Lrx/subjects/Subject;
+    iget-object v0, v0, Lrx/internal/a/s$2;->bHD:Lrx/subjects/Subject;
 
-    invoke-static {}, Lrx/d;->IN()Lrx/d;
+    invoke-static {}, Lrx/d;->IL()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;->bHN:Lrx/internal/a/s$2;
+    iget-object v0, p0, Lrx/internal/a/s$2$1;->bHI:Lrx/internal/a/s$2;
 
-    iget-object v0, v0, Lrx/internal/a/s$2;->bHI:Lrx/subjects/Subject;
+    iget-object v0, v0, Lrx/internal/a/s$2;->bHD: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;->bHN:Lrx/internal/a/s$2;
+    iget-object v0, p0, Lrx/internal/a/s$2$1;->bHI:Lrx/internal/a/s$2;
 
-    iget-object v0, v0, Lrx/internal/a/s$2;->bHH:Lrx/Subscriber;
+    iget-object v0, v0, Lrx/internal/a/s$2;->bHC: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;->bHN:Lrx/internal/a/s$2;
+    iget-object p1, p0, Lrx/internal/a/s$2$1;->bHI:Lrx/internal/a/s$2;
 
-    iget-object p1, p1, Lrx/internal/a/s$2;->bHK:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object p1, p1, Lrx/internal/a/s$2;->bHF: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;->bHN:Lrx/internal/a/s$2;
+    iget-object p1, p0, Lrx/internal/a/s$2$1;->bHI:Lrx/internal/a/s$2;
 
-    iget-object p1, p1, Lrx/internal/a/s$2;->bHK:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object p1, p1, Lrx/internal/a/s$2;->bHF: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;->bHN:Lrx/internal/a/s$2;
+    iget-object p1, p0, Lrx/internal/a/s$2$1;->bHI:Lrx/internal/a/s$2;
 
-    iget-object p1, p1, Lrx/internal/a/s$2;->bHJ:Lrx/internal/b/a;
+    iget-object p1, p1, Lrx/internal/a/s$2;->bHE: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;->bHN:Lrx/internal/a/s$2;
+    iget-object v0, p0, Lrx/internal/a/s$2$1;->bHI:Lrx/internal/a/s$2;
 
-    iget-object v0, v0, Lrx/internal/a/s$2;->bHJ:Lrx/internal/b/a;
+    iget-object v0, v0, Lrx/internal/a/s$2;->bHE: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 72b0cdeb74..0f561f2d92 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 bHH:Lrx/Subscriber;
+.field final synthetic bHC:Lrx/Subscriber;
 
-.field final synthetic bHI:Lrx/subjects/Subject;
+.field final synthetic bHD:Lrx/subjects/Subject;
 
-.field final synthetic bHJ:Lrx/internal/b/a;
+.field final synthetic bHE:Lrx/internal/b/a;
 
-.field final synthetic bHK:Ljava/util/concurrent/atomic/AtomicLong;
+.field final synthetic bHF:Ljava/util/concurrent/atomic/AtomicLong;
 
-.field final synthetic bHL:Lrx/subscriptions/SerialSubscription;
+.field final synthetic bHG:Lrx/subscriptions/SerialSubscription;
 
-.field final synthetic bHM:Lrx/internal/a/s;
+.field final synthetic bHH: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;->bHM:Lrx/internal/a/s;
+    iput-object p1, p0, Lrx/internal/a/s$2;->bHH:Lrx/internal/a/s;
 
-    iput-object p2, p0, Lrx/internal/a/s$2;->bHH:Lrx/Subscriber;
+    iput-object p2, p0, Lrx/internal/a/s$2;->bHC:Lrx/Subscriber;
 
-    iput-object p3, p0, Lrx/internal/a/s$2;->bHI:Lrx/subjects/Subject;
+    iput-object p3, p0, Lrx/internal/a/s$2;->bHD:Lrx/subjects/Subject;
 
-    iput-object p4, p0, Lrx/internal/a/s$2;->bHJ:Lrx/internal/b/a;
+    iput-object p4, p0, Lrx/internal/a/s$2;->bHE:Lrx/internal/b/a;
 
-    iput-object p5, p0, Lrx/internal/a/s$2;->bHK:Ljava/util/concurrent/atomic/AtomicLong;
+    iput-object p5, p0, Lrx/internal/a/s$2;->bHF:Ljava/util/concurrent/atomic/AtomicLong;
 
-    iput-object p6, p0, Lrx/internal/a/s$2;->bHL:Lrx/subscriptions/SerialSubscription;
+    iput-object p6, p0, Lrx/internal/a/s$2;->bHG: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;->bHH:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/s$2;->bHC: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;->bHL:Lrx/subscriptions/SerialSubscription;
+    iget-object v1, p0, Lrx/internal/a/s$2;->bHG:Lrx/subscriptions/SerialSubscription;
 
     invoke-virtual {v1, v0}, Lrx/subscriptions/SerialSubscription;->f(Lrx/Subscription;)V
 
-    iget-object v1, p0, Lrx/internal/a/s$2;->bHM:Lrx/internal/a/s;
+    iget-object v1, p0, Lrx/internal/a/s$2;->bHH:Lrx/internal/a/s;
 
-    iget-object v1, v1, Lrx/internal/a/s;->bHe:Lrx/Observable;
+    iget-object v1, v1, Lrx/internal/a/s;->bGZ: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 a23bd77260..1865b8d27b 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 bHO:Lrx/Subscriber;
+.field final synthetic bHJ:Lrx/Subscriber;
 
-.field final synthetic bHP:Lrx/internal/a/s$3;
+.field final synthetic bHK: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;->bHP:Lrx/internal/a/s$3;
+    iput-object p1, p0, Lrx/internal/a/s$3$1;->bHK:Lrx/internal/a/s$3;
 
-    iput-object p3, p0, Lrx/internal/a/s$3$1;->bHO:Lrx/Subscriber;
+    iput-object p3, p0, Lrx/internal/a/s$3$1;->bHJ: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;->bHO:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/s$3$1;->bHJ: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;->bHO:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/s$3$1;->bHJ: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;->bGl:Lrx/d$a;
+    iget-object v0, p1, Lrx/d;->bGg:Lrx/d$a;
 
-    sget-object v1, Lrx/d$a;->bGp:Lrx/d$a;
+    sget-object v1, Lrx/d$a;->bGk: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;->bHP:Lrx/internal/a/s$3;
+    iget-object v0, p0, Lrx/internal/a/s$3$1;->bHK:Lrx/internal/a/s$3;
 
-    iget-object v0, v0, Lrx/internal/a/s$3;->bHM:Lrx/internal/a/s;
+    iget-object v0, v0, Lrx/internal/a/s$3;->bHH:Lrx/internal/a/s;
 
-    iget-boolean v0, v0, Lrx/internal/a/s;->bHD:Z
+    iget-boolean v0, v0, Lrx/internal/a/s;->bHy:Z
 
     if-eqz v0, :cond_1
 
-    iget-object p1, p0, Lrx/internal/a/s$3$1;->bHO:Lrx/Subscriber;
+    iget-object p1, p0, Lrx/internal/a/s$3$1;->bHJ:Lrx/Subscriber;
 
     invoke-virtual {p1}, Lrx/Subscriber;->onCompleted()V
 
     return-void
 
     :cond_1
-    invoke-virtual {p1}, Lrx/d;->IQ()Z
+    invoke-virtual {p1}, Lrx/d;->IO()Z
 
     move-result v0
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lrx/internal/a/s$3$1;->bHP:Lrx/internal/a/s$3;
+    iget-object v0, p0, Lrx/internal/a/s$3$1;->bHK:Lrx/internal/a/s$3;
 
-    iget-object v0, v0, Lrx/internal/a/s$3;->bHM:Lrx/internal/a/s;
+    iget-object v0, v0, Lrx/internal/a/s$3;->bHH:Lrx/internal/a/s;
 
-    iget-boolean v0, v0, Lrx/internal/a/s;->bHE:Z
+    iget-boolean v0, v0, Lrx/internal/a/s;->bHz:Z
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lrx/internal/a/s$3$1;->bHO:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/s$3$1;->bHJ: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;->bHO:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/s$3$1;->bHJ: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 8d78e15f6e..c40f4ca04b 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 bHM:Lrx/internal/a/s;
+.field final synthetic bHH: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;->bHM:Lrx/internal/a/s;
+    iput-object p1, p0, Lrx/internal/a/s$3;->bHH: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 3a3eccf22e..114c7df353 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 bHT:Lrx/internal/a/s$4;
+.field final synthetic bHO: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;->bHT:Lrx/internal/a/s$4;
+    iput-object p1, p0, Lrx/internal/a/s$4$1;->bHO: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;->bHT:Lrx/internal/a/s$4;
+    iget-object v0, p0, Lrx/internal/a/s$4$1;->bHO:Lrx/internal/a/s$4;
 
-    iget-object v0, v0, Lrx/internal/a/s$4;->bHH:Lrx/Subscriber;
+    iget-object v0, v0, Lrx/internal/a/s$4;->bHC: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;->bHT:Lrx/internal/a/s$4;
+    iget-object v0, p0, Lrx/internal/a/s$4$1;->bHO:Lrx/internal/a/s$4;
 
-    iget-object v0, v0, Lrx/internal/a/s$4;->bHH:Lrx/Subscriber;
+    iget-object v0, v0, Lrx/internal/a/s$4;->bHC: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;->bHT:Lrx/internal/a/s$4;
+    iget-object p1, p0, Lrx/internal/a/s$4$1;->bHO:Lrx/internal/a/s$4;
 
-    iget-object p1, p1, Lrx/internal/a/s$4;->bHH:Lrx/Subscriber;
+    iget-object p1, p1, Lrx/internal/a/s$4;->bHC: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;->bHT:Lrx/internal/a/s$4;
+    iget-object p1, p0, Lrx/internal/a/s$4$1;->bHO:Lrx/internal/a/s$4;
 
-    iget-object p1, p1, Lrx/internal/a/s$4;->bHK:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object p1, p1, Lrx/internal/a/s$4;->bHF: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;->bHT:Lrx/internal/a/s$4;
+    iget-object p1, p0, Lrx/internal/a/s$4$1;->bHO: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;->bHT:Lrx/internal/a/s$4;
+    iget-object v0, p0, Lrx/internal/a/s$4$1;->bHO:Lrx/internal/a/s$4;
 
-    iget-object v0, v0, Lrx/internal/a/s$4;->bHR:Lrx/functions/Action0;
+    iget-object v0, v0, Lrx/internal/a/s$4;->bHM: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;->bHT:Lrx/internal/a/s$4;
+    iget-object p1, p0, Lrx/internal/a/s$4$1;->bHO:Lrx/internal/a/s$4;
 
-    iget-object p1, p1, Lrx/internal/a/s$4;->bHS:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object p1, p1, Lrx/internal/a/s$4;->bHN: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 2be1596fab..5fca5bdbe1 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 bHH:Lrx/Subscriber;
+.field final synthetic bHC:Lrx/Subscriber;
 
-.field final synthetic bHK:Ljava/util/concurrent/atomic/AtomicLong;
+.field final synthetic bHF:Ljava/util/concurrent/atomic/AtomicLong;
 
-.field final synthetic bHM:Lrx/internal/a/s;
+.field final synthetic bHH:Lrx/internal/a/s;
 
-.field final synthetic bHQ:Lrx/Observable;
+.field final synthetic bHL:Lrx/Observable;
 
-.field final synthetic bHR:Lrx/functions/Action0;
+.field final synthetic bHM:Lrx/functions/Action0;
 
-.field final synthetic bHS:Ljava/util/concurrent/atomic/AtomicBoolean;
+.field final synthetic bHN: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;->bHM:Lrx/internal/a/s;
+    iput-object p1, p0, Lrx/internal/a/s$4;->bHH:Lrx/internal/a/s;
 
-    iput-object p2, p0, Lrx/internal/a/s$4;->bHQ:Lrx/Observable;
+    iput-object p2, p0, Lrx/internal/a/s$4;->bHL:Lrx/Observable;
 
-    iput-object p3, p0, Lrx/internal/a/s$4;->bHH:Lrx/Subscriber;
+    iput-object p3, p0, Lrx/internal/a/s$4;->bHC:Lrx/Subscriber;
 
-    iput-object p4, p0, Lrx/internal/a/s$4;->bHK:Ljava/util/concurrent/atomic/AtomicLong;
+    iput-object p4, p0, Lrx/internal/a/s$4;->bHF: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;->bHR:Lrx/functions/Action0;
+    iput-object p6, p0, Lrx/internal/a/s$4;->bHM:Lrx/functions/Action0;
 
-    iput-object p7, p0, Lrx/internal/a/s$4;->bHS:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iput-object p7, p0, Lrx/internal/a/s$4;->bHN: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;->bHQ:Lrx/Observable;
+    iget-object v0, p0, Lrx/internal/a/s$4;->bHL:Lrx/Observable;
 
     new-instance v1, Lrx/internal/a/s$4$1;
 
-    iget-object v2, p0, Lrx/internal/a/s$4;->bHH:Lrx/Subscriber;
+    iget-object v2, p0, Lrx/internal/a/s$4;->bHC: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 ba58b6c7d0..835ae3605c 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 bHJ:Lrx/internal/b/a;
+.field final synthetic bHE:Lrx/internal/b/a;
 
-.field final synthetic bHK:Ljava/util/concurrent/atomic/AtomicLong;
+.field final synthetic bHF:Ljava/util/concurrent/atomic/AtomicLong;
 
-.field final synthetic bHM:Lrx/internal/a/s;
+.field final synthetic bHH:Lrx/internal/a/s;
 
-.field final synthetic bHR:Lrx/functions/Action0;
+.field final synthetic bHM:Lrx/functions/Action0;
 
-.field final synthetic bHS:Ljava/util/concurrent/atomic/AtomicBoolean;
+.field final synthetic bHN: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;->bHM:Lrx/internal/a/s;
+    iput-object p1, p0, Lrx/internal/a/s$5;->bHH:Lrx/internal/a/s;
 
-    iput-object p2, p0, Lrx/internal/a/s$5;->bHK:Ljava/util/concurrent/atomic/AtomicLong;
+    iput-object p2, p0, Lrx/internal/a/s$5;->bHF:Ljava/util/concurrent/atomic/AtomicLong;
 
-    iput-object p3, p0, Lrx/internal/a/s$5;->bHJ:Lrx/internal/b/a;
+    iput-object p3, p0, Lrx/internal/a/s$5;->bHE:Lrx/internal/b/a;
 
-    iput-object p4, p0, Lrx/internal/a/s$5;->bHS:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iput-object p4, p0, Lrx/internal/a/s$5;->bHN: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;->bHR:Lrx/functions/Action0;
+    iput-object p6, p0, Lrx/internal/a/s$5;->bHM: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;->bHK:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v0, p0, Lrx/internal/a/s$5;->bHF: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;->bHJ:Lrx/internal/b/a;
+    iget-object v0, p0, Lrx/internal/a/s$5;->bHE: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;->bHS:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object p1, p0, Lrx/internal/a/s$5;->bHN: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;->bHR:Lrx/functions/Action0;
+    iget-object p2, p0, Lrx/internal/a/s$5;->bHM: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 53f3981062..272a491c5a 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 bHF:Lrx/functions/b;
+.field static final bHA:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -36,7 +36,16 @@
 
 
 # instance fields
-.field private final bHC:Lrx/functions/b;
+.field final bGZ:Lrx/Observable;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/Observable<",
+            "TT;>;"
+        }
+    .end annotation
+.end field
+
+.field private final bHx:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -51,18 +60,9 @@
     .end annotation
 .end field
 
-.field final bHD:Z
+.field final bHy:Z
 
-.field final bHE:Z
-
-.field final bHe:Lrx/Observable;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/Observable<",
-            "TT;>;"
-        }
-    .end annotation
-.end field
+.field final bHz:Z
 
 .field private final scheduler:Lrx/Scheduler;
 
@@ -75,7 +75,7 @@
 
     invoke-direct {v0}, Lrx/internal/a/s$1;-><init>()V
 
-    sput-object v0, Lrx/internal/a/s;->bHF:Lrx/functions/b;
+    sput-object v0, Lrx/internal/a/s;->bHA: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;->bHe:Lrx/Observable;
+    iput-object p1, p0, Lrx/internal/a/s;->bGZ:Lrx/Observable;
 
-    iput-object p2, p0, Lrx/internal/a/s;->bHC:Lrx/functions/b;
+    iput-object p2, p0, Lrx/internal/a/s;->bHx:Lrx/functions/b;
 
-    iput-boolean p3, p0, Lrx/internal/a/s;->bHD:Z
+    iput-boolean p3, p0, Lrx/internal/a/s;->bHy:Z
 
-    iput-boolean p4, p0, Lrx/internal/a/s;->bHE:Z
+    iput-boolean p4, p0, Lrx/internal/a/s;->bHz: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;->Kv()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Kt()Lrx/Scheduler;
 
     move-result-object v5
 
@@ -186,7 +186,7 @@
 
     new-instance v6, Lrx/internal/a/s;
 
-    invoke-static {}, Lrx/d/a;->Kv()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Kt()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;->IY()Lrx/Scheduler$Worker;
+    invoke-virtual {v0}, Lrx/Scheduler;->IW()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;->Kz()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kx()Lrx/subjects/BehaviorSubject;
 
     move-result-object v0
 
@@ -266,7 +266,7 @@
     move-object v7, v1
 
     :goto_0
-    invoke-static {}, Lrx/observers/a;->Kg()Lrx/e;
+    invoke-static {}, Lrx/observers/a;->Ke()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;->bHC:Lrx/functions/b;
+    iget-object v0, p0, Lrx/internal/a/s;->bHx: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 cc1f2a6297..3f7e33e7bf 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 bHX:Lrx/Subscriber;
+.field final synthetic bHS:Lrx/Subscriber;
 
-.field final synthetic bHY:Ljava/util/concurrent/atomic/AtomicBoolean;
+.field final synthetic bHT:Ljava/util/concurrent/atomic/AtomicBoolean;
 
-.field final synthetic bHZ:Lrx/internal/a/t;
+.field final synthetic bHU: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;->bHZ:Lrx/internal/a/t;
+    iput-object p1, p0, Lrx/internal/a/t$1;->bHU:Lrx/internal/a/t;
 
-    iput-object p2, p0, Lrx/internal/a/t$1;->bHX:Lrx/Subscriber;
+    iput-object p2, p0, Lrx/internal/a/t$1;->bHS:Lrx/Subscriber;
 
-    iput-object p3, p0, Lrx/internal/a/t$1;->bHY:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iput-object p3, p0, Lrx/internal/a/t$1;->bHT: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;->bHZ:Lrx/internal/a/t;
+    iget-object v1, p0, Lrx/internal/a/t$1;->bHU:Lrx/internal/a/t;
 
-    iget-object v1, v1, Lrx/internal/a/t;->bHV:Lrx/subscriptions/CompositeSubscription;
+    iget-object v1, v1, Lrx/internal/a/t;->bHQ:Lrx/subscriptions/CompositeSubscription;
 
     invoke-virtual {v1, p1}, Lrx/subscriptions/CompositeSubscription;->add(Lrx/Subscription;)V
 
-    iget-object p1, p0, Lrx/internal/a/t$1;->bHZ:Lrx/internal/a/t;
+    iget-object p1, p0, Lrx/internal/a/t$1;->bHU:Lrx/internal/a/t;
 
-    iget-object v1, p0, Lrx/internal/a/t$1;->bHX:Lrx/Subscriber;
+    iget-object v1, p0, Lrx/internal/a/t$1;->bHS:Lrx/Subscriber;
 
-    iget-object v2, p0, Lrx/internal/a/t$1;->bHZ:Lrx/internal/a/t;
+    iget-object v2, p0, Lrx/internal/a/t$1;->bHU:Lrx/internal/a/t;
 
-    iget-object v2, v2, Lrx/internal/a/t;->bHV:Lrx/subscriptions/CompositeSubscription;
+    iget-object v2, v2, Lrx/internal/a/t;->bHQ: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;->bHZ:Lrx/internal/a/t;
+    iget-object p1, p0, Lrx/internal/a/t$1;->bHU: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;->bHY:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object p1, p0, Lrx/internal/a/t$1;->bHT: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;->bHZ:Lrx/internal/a/t;
+    iget-object v1, p0, Lrx/internal/a/t$1;->bHU: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;->bHY:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v1, p0, Lrx/internal/a/t$1;->bHT: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 d80a83ff2c..be18703bab 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 bHX:Lrx/Subscriber;
+.field final synthetic bHS:Lrx/Subscriber;
 
-.field final synthetic bHZ:Lrx/internal/a/t;
+.field final synthetic bHU:Lrx/internal/a/t;
 
-.field final synthetic bIa:Lrx/subscriptions/CompositeSubscription;
+.field final synthetic bHV: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;->bHZ:Lrx/internal/a/t;
+    iput-object p1, p0, Lrx/internal/a/t$2;->bHU:Lrx/internal/a/t;
 
-    iput-object p3, p0, Lrx/internal/a/t$2;->bHX:Lrx/Subscriber;
+    iput-object p3, p0, Lrx/internal/a/t$2;->bHS:Lrx/Subscriber;
 
-    iput-object p4, p0, Lrx/internal/a/t$2;->bIa:Lrx/subscriptions/CompositeSubscription;
+    iput-object p4, p0, Lrx/internal/a/t$2;->bHV: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;->bHZ:Lrx/internal/a/t;
+    iget-object v0, p0, Lrx/internal/a/t$2;->bHU: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;->bHZ:Lrx/internal/a/t;
+    iget-object v0, p0, Lrx/internal/a/t$2;->bHU:Lrx/internal/a/t;
 
-    iget-object v0, v0, Lrx/internal/a/t;->bHV:Lrx/subscriptions/CompositeSubscription;
+    iget-object v0, v0, Lrx/internal/a/t;->bHQ:Lrx/subscriptions/CompositeSubscription;
 
-    iget-object v1, p0, Lrx/internal/a/t$2;->bIa:Lrx/subscriptions/CompositeSubscription;
+    iget-object v1, p0, Lrx/internal/a/t$2;->bHV:Lrx/subscriptions/CompositeSubscription;
 
     if-ne v0, v1, :cond_1
 
-    iget-object v0, p0, Lrx/internal/a/t$2;->bHZ:Lrx/internal/a/t;
+    iget-object v0, p0, Lrx/internal/a/t$2;->bHU: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;->bHZ:Lrx/internal/a/t;
+    iget-object v0, p0, Lrx/internal/a/t$2;->bHU: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;->bHZ:Lrx/internal/a/t;
+    iget-object v0, p0, Lrx/internal/a/t$2;->bHU:Lrx/internal/a/t;
 
-    iget-object v0, v0, Lrx/internal/a/t;->bHV:Lrx/subscriptions/CompositeSubscription;
+    iget-object v0, v0, Lrx/internal/a/t;->bHQ:Lrx/subscriptions/CompositeSubscription;
 
     invoke-virtual {v0}, Lrx/subscriptions/CompositeSubscription;->unsubscribe()V
 
-    iget-object v0, p0, Lrx/internal/a/t$2;->bHZ:Lrx/internal/a/t;
+    iget-object v0, p0, Lrx/internal/a/t$2;->bHU: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;->bHV:Lrx/subscriptions/CompositeSubscription;
+    iput-object v1, v0, Lrx/internal/a/t;->bHQ:Lrx/subscriptions/CompositeSubscription;
 
-    iget-object v0, p0, Lrx/internal/a/t$2;->bHZ:Lrx/internal/a/t;
+    iget-object v0, p0, Lrx/internal/a/t$2;->bHU:Lrx/internal/a/t;
 
-    iget-object v0, v0, Lrx/internal/a/t;->bHW:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v0, v0, Lrx/internal/a/t;->bHR: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;->bHZ:Lrx/internal/a/t;
+    iget-object v0, p0, Lrx/internal/a/t$2;->bHU: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;->bHZ:Lrx/internal/a/t;
+    iget-object v1, p0, Lrx/internal/a/t$2;->bHU: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;->bHX:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/t$2;->bHS: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;->bHX:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/t$2;->bHS: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;->bHX:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/t$2;->bHS: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 eabf7385ec..cd86cb6ecc 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 bHZ:Lrx/internal/a/t;
+.field final synthetic bHU:Lrx/internal/a/t;
 
-.field final synthetic bIb:Lrx/subscriptions/CompositeSubscription;
+.field final synthetic bHW: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;->bHZ:Lrx/internal/a/t;
+    iput-object p1, p0, Lrx/internal/a/t$3;->bHU:Lrx/internal/a/t;
 
-    iput-object p2, p0, Lrx/internal/a/t$3;->bIb:Lrx/subscriptions/CompositeSubscription;
+    iput-object p2, p0, Lrx/internal/a/t$3;->bHW: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;->bHZ:Lrx/internal/a/t;
+    iget-object v0, p0, Lrx/internal/a/t$3;->bHU: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;->bHZ:Lrx/internal/a/t;
+    iget-object v0, p0, Lrx/internal/a/t$3;->bHU:Lrx/internal/a/t;
 
-    iget-object v0, v0, Lrx/internal/a/t;->bHV:Lrx/subscriptions/CompositeSubscription;
+    iget-object v0, v0, Lrx/internal/a/t;->bHQ:Lrx/subscriptions/CompositeSubscription;
 
-    iget-object v1, p0, Lrx/internal/a/t$3;->bIb:Lrx/subscriptions/CompositeSubscription;
+    iget-object v1, p0, Lrx/internal/a/t$3;->bHW:Lrx/subscriptions/CompositeSubscription;
 
     if-ne v0, v1, :cond_1
 
-    iget-object v0, p0, Lrx/internal/a/t$3;->bHZ:Lrx/internal/a/t;
+    iget-object v0, p0, Lrx/internal/a/t$3;->bHU:Lrx/internal/a/t;
 
-    iget-object v0, v0, Lrx/internal/a/t;->bHW:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v0, v0, Lrx/internal/a/t;->bHR: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;->bHZ:Lrx/internal/a/t;
+    iget-object v0, p0, Lrx/internal/a/t$3;->bHU: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;->bHZ:Lrx/internal/a/t;
+    iget-object v0, p0, Lrx/internal/a/t$3;->bHU: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;->bHZ:Lrx/internal/a/t;
+    iget-object v0, p0, Lrx/internal/a/t$3;->bHU:Lrx/internal/a/t;
 
-    iget-object v0, v0, Lrx/internal/a/t;->bHV:Lrx/subscriptions/CompositeSubscription;
+    iget-object v0, v0, Lrx/internal/a/t;->bHQ:Lrx/subscriptions/CompositeSubscription;
 
     invoke-virtual {v0}, Lrx/subscriptions/CompositeSubscription;->unsubscribe()V
 
-    iget-object v0, p0, Lrx/internal/a/t$3;->bHZ:Lrx/internal/a/t;
+    iget-object v0, p0, Lrx/internal/a/t$3;->bHU: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;->bHV:Lrx/subscriptions/CompositeSubscription;
+    iput-object v1, v0, Lrx/internal/a/t;->bHQ: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;->bHZ:Lrx/internal/a/t;
+    iget-object v0, p0, Lrx/internal/a/t$3;->bHU: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;->bHZ:Lrx/internal/a/t;
+    iget-object v1, p0, Lrx/internal/a/t$3;->bHU: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 9ecc8692d8..85a4c359c5 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 bHU:Lrx/b/b;
+.field private final bHP:Lrx/b/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/b/b<",
@@ -29,9 +29,9 @@
     .end annotation
 .end field
 
-.field volatile bHV:Lrx/subscriptions/CompositeSubscription;
+.field volatile bHQ:Lrx/subscriptions/CompositeSubscription;
 
-.field final bHW:Ljava/util/concurrent/atomic/AtomicInteger;
+.field final bHR: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;->bHV:Lrx/subscriptions/CompositeSubscription;
+    iput-object v0, p0, Lrx/internal/a/t;->bHQ: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;->bHW:Ljava/util/concurrent/atomic/AtomicInteger;
+    iput-object v0, p0, Lrx/internal/a/t;->bHR: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;->bHU:Lrx/b/b;
+    iput-object p1, p0, Lrx/internal/a/t;->bHP: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;->bHU:Lrx/b/b;
+    iget-object p0, p0, Lrx/internal/a/t;->bHP: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;->bHU:Lrx/b/b;
+    iget-object v0, p0, Lrx/internal/a/t;->bHP: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;->bHW:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v0, p0, Lrx/internal/a/t;->bHR: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;->bHU:Lrx/b/b;
+    iget-object v1, p0, Lrx/internal/a/t;->bHP: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;->bHV:Lrx/subscriptions/CompositeSubscription;
+    iget-object v0, p0, Lrx/internal/a/t;->bHQ: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 5ec690820f..452bf45c56 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 bId:Z
+.field private bHY:Z
 
-.field private bIe:Z
+.field private bHZ:Z
 
-.field private bIf:Ljava/lang/Object;
+.field private bIa:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TT;"
@@ -34,18 +34,18 @@
     .end annotation
 .end field
 
-.field final synthetic bIg:Lrx/g;
+.field final synthetic bIb:Lrx/g;
 
-.field final synthetic bIh:Lrx/internal/a/u;
+.field final synthetic bIc: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;->bIh:Lrx/internal/a/u;
+    iput-object p1, p0, Lrx/internal/a/u$1;->bIc:Lrx/internal/a/u;
 
-    iput-object p2, p0, Lrx/internal/a/u$1;->bIg:Lrx/g;
+    iput-object p2, p0, Lrx/internal/a/u$1;->bIb: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;->bId:Z
+    iget-boolean v0, p0, Lrx/internal/a/u$1;->bHY:Z
 
     if-nez v0, :cond_1
 
-    iget-boolean v0, p0, Lrx/internal/a/u$1;->bIe:Z
+    iget-boolean v0, p0, Lrx/internal/a/u$1;->bHZ:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lrx/internal/a/u$1;->bIg:Lrx/g;
+    iget-object v0, p0, Lrx/internal/a/u$1;->bIb:Lrx/g;
 
-    iget-object v1, p0, Lrx/internal/a/u$1;->bIf:Ljava/lang/Object;
+    iget-object v1, p0, Lrx/internal/a/u$1;->bIa: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;->bIg:Lrx/g;
+    iget-object v0, p0, Lrx/internal/a/u$1;->bIb: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;->bIg:Lrx/g;
+    iget-object v0, p0, Lrx/internal/a/u$1;->bIb: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;->bIe:Z
+    iget-boolean v0, p0, Lrx/internal/a/u$1;->bHZ:Z
 
     const/4 v1, 0x1
 
     if-eqz v0, :cond_0
 
-    iput-boolean v1, p0, Lrx/internal/a/u$1;->bId:Z
+    iput-boolean v1, p0, Lrx/internal/a/u$1;->bHY:Z
 
-    iget-object p1, p0, Lrx/internal/a/u$1;->bIg:Lrx/g;
+    iget-object p1, p0, Lrx/internal/a/u$1;->bIb: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;->bIe:Z
+    iput-boolean v1, p0, Lrx/internal/a/u$1;->bHZ:Z
 
-    iput-object p1, p0, Lrx/internal/a/u$1;->bIf:Ljava/lang/Object;
+    iput-object p1, p0, Lrx/internal/a/u$1;->bIa: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 d85c076174..789b0376f4 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 bIc:Lrx/Observable;
+.field private final bHX: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;->bIc:Lrx/Observable;
+    iput-object p1, p0, Lrx/internal/a/u;->bHX: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;->bIc:Lrx/Observable;
+    iget-object p1, p0, Lrx/internal/a/u;->bHX: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 9874ce3360..f91362264f 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 bHm:Lrx/internal/b/a;
+.field final bHh: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;->bHm:Lrx/internal/b/a;
+    iput-object p2, p0, Lrx/internal/a/w$a;->bHh: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;->bHm:Lrx/internal/b/a;
+    iget-object v0, p0, Lrx/internal/a/w$a;->bHh: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 54b88a746a..6e424afe14 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 bIo:J
+.field final bIj:J
 
-.field final synthetic bIp:Lrx/internal/a/w$b;
+.field final synthetic bIk: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;->bIp:Lrx/internal/a/w$b;
+    iput-object p1, p0, Lrx/internal/a/w$b$a;->bIk:Lrx/internal/a/w$b;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-wide p2, p0, Lrx/internal/a/w$b$a;->bIo:J
+    iput-wide p2, p0, Lrx/internal/a/w$b$a;->bIj: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;->bIp:Lrx/internal/a/w$b;
+    iget-object v0, p0, Lrx/internal/a/w$b$a;->bIk:Lrx/internal/a/w$b;
 
-    iget-wide v1, p0, Lrx/internal/a/w$b$a;->bIo:J
+    iget-wide v1, p0, Lrx/internal/a/w$b$a;->bIj:J
 
-    iget-object v3, v0, Lrx/internal/a/w$b;->bIk:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v3, v0, Lrx/internal/a/w$b;->bIf: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;->bIi:Lrx/Observable;
+    iget-object v1, v0, Lrx/internal/a/w$b;->bId:Lrx/Observable;
 
     if-nez v1, :cond_0
 
@@ -72,7 +72,7 @@
     return-void
 
     :cond_0
-    iget-wide v1, v0, Lrx/internal/a/w$b;->bIn:J
+    iget-wide v1, v0, Lrx/internal/a/w$b;->bIi:J
 
     const-wide/16 v3, 0x0
 
@@ -80,7 +80,7 @@
 
     if-eqz v5, :cond_1
 
-    iget-object v3, v0, Lrx/internal/a/w$b;->bHm:Lrx/internal/b/a;
+    iget-object v3, v0, Lrx/internal/a/w$b;->bHh: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;->bHm:Lrx/internal/b/a;
+    iget-object v3, v0, Lrx/internal/a/w$b;->bHh: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;->bIm:Lrx/internal/d/a;
+    iget-object v2, v0, Lrx/internal/a/w$b;->bIh: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;->bIi:Lrx/Observable;
+    iget-object v0, v0, Lrx/internal/a/w$b;->bId: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 61af1183dd..169978df26 100644
--- a/com.discord/smali_classes2/rx/internal/a/w$b.smali
+++ b/com.discord/smali_classes2/rx/internal/a/w$b.smali
@@ -40,9 +40,9 @@
     .end annotation
 .end field
 
-.field final bHm:Lrx/internal/b/a;
+.field final bHh:Lrx/internal/b/a;
 
-.field final bIi:Lrx/Observable;
+.field final bId:Lrx/Observable;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/Observable<",
@@ -51,15 +51,15 @@
     .end annotation
 .end field
 
-.field final bIj:Lrx/Scheduler$Worker;
+.field final bIe:Lrx/Scheduler$Worker;
 
-.field final bIk:Ljava/util/concurrent/atomic/AtomicLong;
+.field final bIf:Ljava/util/concurrent/atomic/AtomicLong;
 
-.field final bIl:Lrx/internal/d/a;
+.field final bIg:Lrx/internal/d/a;
 
-.field final bIm:Lrx/internal/d/a;
+.field final bIh:Lrx/internal/d/a;
 
-.field bIn:J
+.field bIi: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;->bIj:Lrx/Scheduler$Worker;
+    iput-object p5, p0, Lrx/internal/a/w$b;->bIe:Lrx/Scheduler$Worker;
 
-    iput-object p6, p0, Lrx/internal/a/w$b;->bIi:Lrx/Observable;
+    iput-object p6, p0, Lrx/internal/a/w$b;->bId: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;->bHm:Lrx/internal/b/a;
+    iput-object p1, p0, Lrx/internal/a/w$b;->bHh: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;->bIk:Ljava/util/concurrent/atomic/AtomicLong;
+    iput-object p1, p0, Lrx/internal/a/w$b;->bIf: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;->bIl:Lrx/internal/d/a;
+    iput-object p1, p0, Lrx/internal/a/w$b;->bIg: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;->bIm:Lrx/internal/d/a;
+    iput-object p1, p0, Lrx/internal/a/w$b;->bIh: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;->bIl:Lrx/internal/d/a;
+    iget-object p1, p0, Lrx/internal/a/w$b;->bIg: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;->bIl:Lrx/internal/d/a;
+    iget-object v0, p0, Lrx/internal/a/w$b;->bIg:Lrx/internal/d/a;
 
-    iget-object v1, p0, Lrx/internal/a/w$b;->bIj:Lrx/Scheduler$Worker;
+    iget-object v1, p0, Lrx/internal/a/w$b;->bIe: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;->bIk:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v0, p0, Lrx/internal/a/w$b;->bIf: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;->bIl:Lrx/internal/d/a;
+    iget-object v0, p0, Lrx/internal/a/w$b;->bIg: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;->bIj:Lrx/Scheduler$Worker;
+    iget-object v0, p0, Lrx/internal/a/w$b;->bIe: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;->bIk:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v0, p0, Lrx/internal/a/w$b;->bIf: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;->bIl:Lrx/internal/d/a;
+    iget-object v0, p0, Lrx/internal/a/w$b;->bIg: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;->bIj:Lrx/Scheduler$Worker;
+    iget-object p1, p0, Lrx/internal/a/w$b;->bIe: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;->bIk:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v0, p0, Lrx/internal/a/w$b;->bIf: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;->bIk:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v2, p0, Lrx/internal/a/w$b;->bIf: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;->bIl:Lrx/internal/d/a;
+    iget-object v0, p0, Lrx/internal/a/w$b;->bIg: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;->bIn:J
+    iget-wide v0, p0, Lrx/internal/a/w$b;->bIi:J
 
     add-long/2addr v0, v3
 
-    iput-wide v0, p0, Lrx/internal/a/w$b;->bIn:J
+    iput-wide v0, p0, Lrx/internal/a/w$b;->bIi: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;->bHm:Lrx/internal/b/a;
+    iget-object v0, p0, Lrx/internal/a/w$b;->bHh: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 edcf618bf9..c976ee1dc6 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 bHe:Lrx/Observable;
+.field final bGZ:Lrx/Observable;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/Observable<",
@@ -36,7 +36,7 @@
     .end annotation
 .end field
 
-.field final bIi:Lrx/Observable;
+.field final bId: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;->bHe:Lrx/Observable;
+    iput-object p1, p0, Lrx/internal/a/w;->bGZ: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;->bIi:Lrx/Observable;
+    iput-object p1, p0, Lrx/internal/a/w;->bId: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;->IY()Lrx/Scheduler$Worker;
+    invoke-virtual {v0}, Lrx/Scheduler;->IW()Lrx/Scheduler$Worker;
 
     move-result-object v5
 
-    iget-object v6, p0, Lrx/internal/a/w;->bIi:Lrx/Observable;
+    iget-object v6, p0, Lrx/internal/a/w;->bId: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;->bIm:Lrx/internal/d/a;
+    iget-object v0, v7, Lrx/internal/a/w$b;->bIh:Lrx/internal/d/a;
 
     invoke-virtual {p1, v0}, Lrx/Subscriber;->add(Lrx/Subscription;)V
 
-    iget-object v0, v7, Lrx/internal/a/w$b;->bHm:Lrx/internal/b/a;
+    iget-object v0, v7, Lrx/internal/a/w$b;->bHh: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;->bHe:Lrx/Observable;
+    iget-object p1, p0, Lrx/internal/a/w;->bGZ: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 e55f8fa72c..9972708519 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 bHH:Lrx/Subscriber;
+.field final synthetic bHC:Lrx/Subscriber;
 
-.field final synthetic bIq:Lrx/internal/a/x;
+.field final synthetic bIl: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;->bIq:Lrx/internal/a/x;
+    iput-object p1, p0, Lrx/internal/a/x$1;->bIl:Lrx/internal/a/x;
 
-    iput-object p2, p0, Lrx/internal/a/x$1;->bHH:Lrx/Subscriber;
+    iput-object p2, p0, Lrx/internal/a/x$1;->bHC: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;->bHH:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/x$1;->bHC: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;->bHH:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/x$1;->bHC: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;->bHH:Lrx/Subscriber;
+    iget-object v1, p0, Lrx/internal/a/x$1;->bHC: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 b687cc0e76..123ab8d4d8 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;->IY()Lrx/Scheduler$Worker;
+    invoke-virtual {v0}, Lrx/Scheduler;->IW()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 85eb5efcc1..b36499fca9 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 bHH:Lrx/Subscriber;
+.field final synthetic bHC:Lrx/Subscriber;
 
-.field bIs:J
+.field bIn:J
 
-.field final synthetic bIt:Lrx/internal/a/y;
+.field final synthetic bIo: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;->bIt:Lrx/internal/a/y;
+    iput-object p1, p0, Lrx/internal/a/y$1;->bIo:Lrx/internal/a/y;
 
-    iput-object p2, p0, Lrx/internal/a/y$1;->bHH:Lrx/Subscriber;
+    iput-object p2, p0, Lrx/internal/a/y$1;->bHC: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;->bHH:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/y$1;->bHC:Lrx/Subscriber;
 
-    iget-wide v1, p0, Lrx/internal/a/y$1;->bIs:J
+    iget-wide v1, p0, Lrx/internal/a/y$1;->bIn:J
 
     const-wide/16 v3, 0x1
 
     add-long/2addr v3, v1
 
-    iput-wide v3, p0, Lrx/internal/a/y$1;->bIs:J
+    iput-wide v3, p0, Lrx/internal/a/y$1;->bIn: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;->bHH:Lrx/Subscriber;
+    iget-object v1, p0, Lrx/internal/a/y$1;->bHC: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;->bHH:Lrx/Subscriber;
+    iget-object v2, p0, Lrx/internal/a/y$1;->bHC: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 8818fbfee3..c7602c0084 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 bIr:J
+.field final bIm: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;->bIr:J
+    iput-wide p3, p0, Lrx/internal/a/y;->bIm: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;->IY()Lrx/Scheduler$Worker;
+    invoke-virtual {v0}, Lrx/Scheduler;->IW()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;->bIr:J
+    iget-wide v5, p0, Lrx/internal/a/y;->bIm: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 c4c2fa93c8..3262ace718 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 bIu:Lrx/functions/b;
+.field final bIp:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -40,7 +40,7 @@
     .end annotation
 .end field
 
-.field final bIv:Lrx/functions/b;
+.field final bIq: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;->bIu:Lrx/functions/b;
+    iput-object p3, p0, Lrx/internal/a/z$a;->bIp:Lrx/functions/b;
 
-    iput-object p4, p0, Lrx/internal/a/z$a;->bIv:Lrx/functions/b;
+    iput-object p4, p0, Lrx/internal/a/z$a;->bIq: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;->bIu:Lrx/functions/b;
+    iget-object v0, p0, Lrx/internal/a/z$a;->bIp: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;->bIv:Lrx/functions/b;
+    iget-object v1, p0, Lrx/internal/a/z$a;->bIq: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 062f1361f9..e7ed2c5dd5 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 bHe:Lrx/Observable;
+.field final bGZ:Lrx/Observable;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/Observable<",
@@ -44,7 +44,7 @@
     .end annotation
 .end field
 
-.field final bIu:Lrx/functions/b;
+.field final bIp:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -53,7 +53,7 @@
     .end annotation
 .end field
 
-.field final bIv:Lrx/functions/b;
+.field final bIq:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -62,7 +62,7 @@
     .end annotation
 .end field
 
-.field final bIw:Lrx/functions/Func0;
+.field final bIr: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;->bHe:Lrx/Observable;
+    iput-object p1, p0, Lrx/internal/a/z;->bGZ:Lrx/Observable;
 
-    iput-object p2, p0, Lrx/internal/a/z;->bIu:Lrx/functions/b;
+    iput-object p2, p0, Lrx/internal/a/z;->bIp:Lrx/functions/b;
 
-    iput-object p3, p0, Lrx/internal/a/z;->bIv:Lrx/functions/b;
+    iput-object p3, p0, Lrx/internal/a/z;->bIq:Lrx/functions/b;
 
-    iput-object p0, p0, Lrx/internal/a/z;->bIw:Lrx/functions/Func0;
+    iput-object p0, p0, Lrx/internal/a/z;->bIr: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;->bIw:Lrx/functions/Func0;
+    iget-object v0, p0, Lrx/internal/a/z;->bIr: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;->bIu:Lrx/functions/b;
+    iget-object v2, p0, Lrx/internal/a/z;->bIp:Lrx/functions/b;
 
-    iget-object v3, p0, Lrx/internal/a/z;->bIv:Lrx/functions/b;
+    iget-object v3, p0, Lrx/internal/a/z;->bIq: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;->bHe:Lrx/Observable;
+    iget-object p1, p0, Lrx/internal/a/z;->bGZ: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 82be2ed1e9..8a9d71a77c 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 bLp:Lrx/Producer;
+.field static final bLk:Lrx/Producer;
 
 
 # instance fields
-.field bKk:J
+.field bKf:J
 
-.field bLm:Lrx/Producer;
+.field bLh:Lrx/Producer;
 
-.field bLn:J
+.field bLi:J
 
-.field bLo:Lrx/Producer;
+.field bLj: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;->bLp:Lrx/Producer;
+    sput-object v0, Lrx/internal/b/a;->bLk:Lrx/Producer;
 
     return-void
 .end method
@@ -45,7 +45,7 @@
     return-void
 .end method
 
-.method private Ju()V
+.method private Js()V
     .locals 13
 
     :cond_0
@@ -53,11 +53,11 @@
     monitor-enter p0
 
     :try_start_0
-    iget-wide v0, p0, Lrx/internal/b/a;->bKk:J
+    iget-wide v0, p0, Lrx/internal/b/a;->bKf:J
 
-    iget-wide v2, p0, Lrx/internal/b/a;->bLn:J
+    iget-wide v2, p0, Lrx/internal/b/a;->bLi:J
 
-    iget-object v4, p0, Lrx/internal/b/a;->bLo:Lrx/Producer;
+    iget-object v4, p0, Lrx/internal/b/a;->bLj:Lrx/Producer;
 
     const-wide/16 v5, 0x0
 
@@ -80,13 +80,13 @@
     return-void
 
     :cond_1
-    iput-wide v5, p0, Lrx/internal/b/a;->bKk:J
+    iput-wide v5, p0, Lrx/internal/b/a;->bKf:J
 
-    iput-wide v5, p0, Lrx/internal/b/a;->bLn:J
+    iput-wide v5, p0, Lrx/internal/b/a;->bLi:J
 
     const/4 v7, 0x0
 
-    iput-object v7, p0, Lrx/internal/b/a;->bLo:Lrx/Producer;
+    iput-object v7, p0, Lrx/internal/b/a;->bLj: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;->bLp:Lrx/Producer;
+    sget-object v0, Lrx/internal/b/a;->bLk:Lrx/Producer;
 
     if-ne v4, v0, :cond_6
 
-    iput-object v7, p0, Lrx/internal/b/a;->bLm:Lrx/Producer;
+    iput-object v7, p0, Lrx/internal/b/a;->bLh:Lrx/Producer;
 
     goto :goto_0
 
     :cond_6
-    iput-object v4, p0, Lrx/internal/b/a;->bLm:Lrx/Producer;
+    iput-object v4, p0, Lrx/internal/b/a;->bLh: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;->bLm:Lrx/Producer;
+    iget-object v2, p0, Lrx/internal/b/a;->bLh:Lrx/Producer;
 
     if-eqz v2, :cond_0
 
@@ -205,11 +205,11 @@
 
     if-eqz v2, :cond_0
 
-    iget-wide v0, p0, Lrx/internal/b/a;->bLn:J
+    iget-wide v0, p0, Lrx/internal/b/a;->bLi:J
 
     add-long/2addr v0, p1
 
-    iput-wide v0, p0, Lrx/internal/b/a;->bLn:J
+    iput-wide v0, p0, Lrx/internal/b/a;->bLi:J
 
     monitor-exit p0
 
@@ -254,7 +254,7 @@
 
     :cond_2
     :goto_0
-    invoke-direct {p0}, Lrx/internal/b/a;->Ju()V
+    invoke-direct {p0}, Lrx/internal/b/a;->Js()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;->bKk:J
+    iget-wide v0, p0, Lrx/internal/b/a;->bKf:J
 
     add-long/2addr v0, p1
 
-    iput-wide v0, p0, Lrx/internal/b/a;->bKk:J
+    iput-wide v0, p0, Lrx/internal/b/a;->bKf: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;->bLm:Lrx/Producer;
+    iget-object v0, p0, Lrx/internal/b/a;->bLh: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;->Ju()V
+    invoke-direct {p0}, Lrx/internal/b/a;->Js()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;->bLp:Lrx/Producer;
+    sget-object p1, Lrx/internal/b/a;->bLk:Lrx/Producer;
 
     :cond_0
-    iput-object p1, p0, Lrx/internal/b/a;->bLo:Lrx/Producer;
+    iput-object p1, p0, Lrx/internal/b/a;->bLj: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;->bLm:Lrx/Producer;
+    iput-object p1, p0, Lrx/internal/b/a;->bLh: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;->Ju()V
+    invoke-direct {p0}, Lrx/internal/b/a;->Js()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 93a0042fb2..ec570d4241 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 bLA:Ljava/util/concurrent/ThreadFactory;
+.field final synthetic bLv:Ljava/util/concurrent/ThreadFactory;
 
-.field final synthetic bLB:Lrx/internal/c/a$a;
+.field final synthetic bLw: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;->bLB:Lrx/internal/c/a$a;
+    iput-object p1, p0, Lrx/internal/c/a$a$1;->bLw:Lrx/internal/c/a$a;
 
-    iput-object p2, p0, Lrx/internal/c/a$a$1;->bLA:Ljava/util/concurrent/ThreadFactory;
+    iput-object p2, p0, Lrx/internal/c/a$a$1;->bLv: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;->bLA:Ljava/util/concurrent/ThreadFactory;
+    iget-object v0, p0, Lrx/internal/c/a$a$1;->bLv: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 38ad2b42dc..da4ab14490 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 bLB:Lrx/internal/c/a$a;
+.field final synthetic bLw: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;->bLB:Lrx/internal/c/a$a;
+    iput-object p1, p0, Lrx/internal/c/a$a$2;->bLw: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;->bLB:Lrx/internal/c/a$a;
+    iget-object v0, p0, Lrx/internal/c/a$a$2;->bLw:Lrx/internal/c/a$a;
 
-    iget-object v1, v0, Lrx/internal/c/a$a;->bLw:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v1, v0, Lrx/internal/c/a$a;->bLr: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;->bLw:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v3, v0, Lrx/internal/c/a$a;->bLr: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;->bLI:J
+    iget-wide v5, v4, Lrx/internal/c/a$c;->bLD:J
 
     cmp-long v7, v5, v1
 
     if-gtz v7, :cond_1
 
-    iget-object v5, v0, Lrx/internal/c/a$a;->bLw:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v5, v0, Lrx/internal/c/a$a;->bLr: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;->bLx:Lrx/subscriptions/CompositeSubscription;
+    iget-object v5, v0, Lrx/internal/c/a$a;->bLs: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 34cf985b83..76d2fefc88 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 bLv:J
+.field final bLq:J
 
-.field final bLw:Ljava/util/concurrent/ConcurrentLinkedQueue;
+.field final bLr:Ljava/util/concurrent/ConcurrentLinkedQueue;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/ConcurrentLinkedQueue<",
@@ -27,11 +27,11 @@
     .end annotation
 .end field
 
-.field final bLx:Lrx/subscriptions/CompositeSubscription;
+.field final bLs:Lrx/subscriptions/CompositeSubscription;
 
-.field private final bLy:Ljava/util/concurrent/ScheduledExecutorService;
+.field private final bLt:Ljava/util/concurrent/ScheduledExecutorService;
 
-.field private final bLz:Ljava/util/concurrent/Future;
+.field private final bLu: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 bdm:Ljava/util/concurrent/ThreadFactory;
+.field private final bdh: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;->bdm:Ljava/util/concurrent/ThreadFactory;
+    iput-object p1, p0, Lrx/internal/c/a$a;->bdh: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;->bLv:J
+    iput-wide p2, p0, Lrx/internal/c/a$a;->bLq: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;->bLw:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iput-object p2, p0, Lrx/internal/c/a$a;->bLr: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;->bLx:Lrx/subscriptions/CompositeSubscription;
+    iput-object p2, p0, Lrx/internal/c/a$a;->bLs: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;->bLv:J
+    iget-wide v4, p0, Lrx/internal/c/a$a;->bLq: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;->bLy:Ljava/util/concurrent/ScheduledExecutorService;
+    iput-object p1, p0, Lrx/internal/c/a$a;->bLt:Ljava/util/concurrent/ScheduledExecutorService;
 
-    iput-object p2, p0, Lrx/internal/c/a$a;->bLz:Ljava/util/concurrent/Future;
+    iput-object p2, p0, Lrx/internal/c/a$a;->bLu:Ljava/util/concurrent/Future;
 
     return-void
 .end method
 
 
 # virtual methods
-.method final JJ()Lrx/internal/c/a$c;
+.method final JH()Lrx/internal/c/a$c;
     .locals 2
 
-    iget-object v0, p0, Lrx/internal/c/a$a;->bLx:Lrx/subscriptions/CompositeSubscription;
+    iget-object v0, p0, Lrx/internal/c/a$a;->bLs: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;->bLs:Lrx/internal/c/a$c;
+    sget-object v0, Lrx/internal/c/a;->bLn:Lrx/internal/c/a$c;
 
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Lrx/internal/c/a$a;->bLw:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v0, p0, Lrx/internal/c/a$a;->bLr: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;->bLw:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v0, p0, Lrx/internal/c/a$a;->bLr: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;->bdm:Ljava/util/concurrent/ThreadFactory;
+    iget-object v1, p0, Lrx/internal/c/a$a;->bdh: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;->bLx:Lrx/subscriptions/CompositeSubscription;
+    iget-object v1, p0, Lrx/internal/c/a$a;->bLs: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;->bLz:Ljava/util/concurrent/Future;
+    iget-object v0, p0, Lrx/internal/c/a$a;->bLu:Ljava/util/concurrent/Future;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lrx/internal/c/a$a;->bLz:Ljava/util/concurrent/Future;
+    iget-object v0, p0, Lrx/internal/c/a$a;->bLu: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;->bLy:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object v0, p0, Lrx/internal/c/a$a;->bLt:Ljava/util/concurrent/ScheduledExecutorService;
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lrx/internal/c/a$a;->bLy:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object v0, p0, Lrx/internal/c/a$a;->bLt: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;->bLx:Lrx/subscriptions/CompositeSubscription;
+    iget-object v0, p0, Lrx/internal/c/a$a;->bLs: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;->bLx:Lrx/subscriptions/CompositeSubscription;
+    iget-object v1, p0, Lrx/internal/c/a$a;->bLs: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 d8b0a01aa3..82de507ea9 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 bLG:Lrx/functions/Action0;
+.field final synthetic bLB:Lrx/functions/Action0;
 
-.field final synthetic bLH:Lrx/internal/c/a$b;
+.field final synthetic bLC: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;->bLH:Lrx/internal/c/a$b;
+    iput-object p1, p0, Lrx/internal/c/a$b$1;->bLC:Lrx/internal/c/a$b;
 
-    iput-object p2, p0, Lrx/internal/c/a$b$1;->bLG:Lrx/functions/Action0;
+    iput-object p2, p0, Lrx/internal/c/a$b$1;->bLB: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;->bLH:Lrx/internal/c/a$b;
+    iget-object v0, p0, Lrx/internal/c/a$b$1;->bLC: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;->bLG:Lrx/functions/Action0;
+    iget-object v0, p0, Lrx/internal/c/a$b$1;->bLB: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 ca5fd810e4..c20c46fb7e 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 bLC:Lrx/subscriptions/CompositeSubscription;
+.field final bLA:Ljava/util/concurrent/atomic/AtomicBoolean;
 
-.field private final bLD:Lrx/internal/c/a$a;
+.field private final bLx:Lrx/subscriptions/CompositeSubscription;
 
-.field private final bLE:Lrx/internal/c/a$c;
+.field private final bLy:Lrx/internal/c/a$a;
 
-.field final bLF:Ljava/util/concurrent/atomic/AtomicBoolean;
+.field private final bLz:Lrx/internal/c/a$c;
 
 
 # direct methods
@@ -37,21 +37,21 @@
 
     invoke-direct {v0}, Lrx/subscriptions/CompositeSubscription;-><init>()V
 
-    iput-object v0, p0, Lrx/internal/c/a$b;->bLC:Lrx/subscriptions/CompositeSubscription;
+    iput-object v0, p0, Lrx/internal/c/a$b;->bLx:Lrx/subscriptions/CompositeSubscription;
 
-    iput-object p1, p0, Lrx/internal/c/a$b;->bLD:Lrx/internal/c/a$a;
+    iput-object p1, p0, Lrx/internal/c/a$b;->bLy: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;->bLF:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iput-object v0, p0, Lrx/internal/c/a$b;->bLA:Ljava/util/concurrent/atomic/AtomicBoolean;
 
-    invoke-virtual {p1}, Lrx/internal/c/a$a;->JJ()Lrx/internal/c/a$c;
+    invoke-virtual {p1}, Lrx/internal/c/a$a;->JH()Lrx/internal/c/a$c;
 
     move-result-object p1
 
-    iput-object p1, p0, Lrx/internal/c/a$b;->bLE:Lrx/internal/c/a$c;
+    iput-object p1, p0, Lrx/internal/c/a$b;->bLz: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;->bLC:Lrx/subscriptions/CompositeSubscription;
+    iget-object v0, p0, Lrx/internal/c/a$b;->bLx: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;->KC()Lrx/Subscription;
+    invoke-static {}, Lrx/subscriptions/c;->KA()Lrx/Subscription;
 
     move-result-object p1
 
     return-object p1
 
     :cond_0
-    iget-object v0, p0, Lrx/internal/c/a$b;->bLE:Lrx/internal/c/a$c;
+    iget-object v0, p0, Lrx/internal/c/a$b;->bLz: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;->bLC:Lrx/subscriptions/CompositeSubscription;
+    iget-object p2, p0, Lrx/internal/c/a$b;->bLx:Lrx/subscriptions/CompositeSubscription;
 
     invoke-virtual {p2, p1}, Lrx/subscriptions/CompositeSubscription;->add(Lrx/Subscription;)V
 
-    iget-object p2, p0, Lrx/internal/c/a$b;->bLC:Lrx/subscriptions/CompositeSubscription;
+    iget-object p2, p0, Lrx/internal/c/a$b;->bLx: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;->bLD:Lrx/internal/c/a$a;
+    iget-object v0, p0, Lrx/internal/c/a$b;->bLy:Lrx/internal/c/a$a;
 
-    iget-object v1, p0, Lrx/internal/c/a$b;->bLE:Lrx/internal/c/a$c;
+    iget-object v1, p0, Lrx/internal/c/a$b;->bLz: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;->bLv:J
+    iget-wide v4, v0, Lrx/internal/c/a$a;->bLq:J
 
     add-long/2addr v2, v4
 
-    iput-wide v2, v1, Lrx/internal/c/a$c;->bLI:J
+    iput-wide v2, v1, Lrx/internal/c/a$c;->bLD:J
 
-    iget-object v0, v0, Lrx/internal/c/a$a;->bLw:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v0, v0, Lrx/internal/c/a$a;->bLr: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;->bLC:Lrx/subscriptions/CompositeSubscription;
+    iget-object v0, p0, Lrx/internal/c/a$b;->bLx: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;->bLF:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v0, p0, Lrx/internal/c/a$b;->bLA: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;->bLE:Lrx/internal/c/a$c;
+    iget-object v0, p0, Lrx/internal/c/a$b;->bLz: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;->bLC:Lrx/subscriptions/CompositeSubscription;
+    iget-object v0, p0, Lrx/internal/c/a$b;->bLx: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 1e545a544a..9234d72b68 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 bLI:J
+.field bLD:J
 
 
 # direct methods
@@ -26,7 +26,7 @@
 
     const-wide/16 v0, 0x0
 
-    iput-wide v0, p0, Lrx/internal/c/a$c;->bLI:J
+    iput-wide v0, p0, Lrx/internal/c/a$c;->bLD: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 d31934a753..be86a8021f 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 bLq:J
+.field private static final bLl:J
 
-.field private static final bLr:Ljava/util/concurrent/TimeUnit;
+.field private static final bLm:Ljava/util/concurrent/TimeUnit;
 
-.field static final bLs:Lrx/internal/c/a$c;
+.field static final bLn:Lrx/internal/c/a$c;
 
-.field static final bLt:Lrx/internal/c/a$a;
+.field static final bLo:Lrx/internal/c/a$a;
 
 
 # instance fields
-.field final bLu:Ljava/util/concurrent/atomic/AtomicReference;
+.field final bLp: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 bdm:Ljava/util/concurrent/ThreadFactory;
+.field final bdh: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;->bLr:Ljava/util/concurrent/TimeUnit;
+    sput-object v0, Lrx/internal/c/a;->bLm:Ljava/util/concurrent/TimeUnit;
 
     new-instance v0, Lrx/internal/c/a$c;
 
-    sget-object v1, Lrx/internal/util/j;->bNg:Ljava/util/concurrent/ThreadFactory;
+    sget-object v1, Lrx/internal/util/j;->bNb: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;->bLs:Lrx/internal/c/a$c;
+    sput-object v0, Lrx/internal/c/a;->bLn: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;->bLt:Lrx/internal/c/a$a;
+    sput-object v0, Lrx/internal/c/a;->bLo: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;->bLq:J
+    sput-wide v0, Lrx/internal/c/a;->bLl:J
 
     return-void
 .end method
@@ -94,29 +94,29 @@
 
     invoke-direct {p0}, Lrx/Scheduler;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/c/a;->bdm:Ljava/util/concurrent/ThreadFactory;
+    iput-object p1, p0, Lrx/internal/c/a;->bdh:Ljava/util/concurrent/ThreadFactory;
 
     new-instance p1, Ljava/util/concurrent/atomic/AtomicReference;
 
-    sget-object v0, Lrx/internal/c/a;->bLt:Lrx/internal/c/a$a;
+    sget-object v0, Lrx/internal/c/a;->bLo: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;->bLu:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object p1, p0, Lrx/internal/c/a;->bLp:Ljava/util/concurrent/atomic/AtomicReference;
 
     new-instance p1, Lrx/internal/c/a$a;
 
-    iget-object v0, p0, Lrx/internal/c/a;->bdm:Ljava/util/concurrent/ThreadFactory;
+    iget-object v0, p0, Lrx/internal/c/a;->bdh:Ljava/util/concurrent/ThreadFactory;
 
-    sget-wide v1, Lrx/internal/c/a;->bLq:J
+    sget-wide v1, Lrx/internal/c/a;->bLl:J
 
-    sget-object v3, Lrx/internal/c/a;->bLr:Ljava/util/concurrent/TimeUnit;
+    sget-object v3, Lrx/internal/c/a;->bLm: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;->bLu:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/internal/c/a;->bLp:Ljava/util/concurrent/atomic/AtomicReference;
 
-    sget-object v1, Lrx/internal/c/a;->bLt:Lrx/internal/c/a$a;
+    sget-object v1, Lrx/internal/c/a;->bLo: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 IY()Lrx/Scheduler$Worker;
+.method public final IW()Lrx/Scheduler$Worker;
     .locals 2
 
     new-instance v0, Lrx/internal/c/a$b;
 
-    iget-object v1, p0, Lrx/internal/c/a;->bLu:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lrx/internal/c/a;->bLp: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;->bLu:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/internal/c/a;->bLp: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;->bLt:Lrx/internal/c/a$a;
+    sget-object v1, Lrx/internal/c/a;->bLo:Lrx/internal/c/a$a;
 
     if-ne v0, v1, :cond_1
 
     return-void
 
     :cond_1
-    iget-object v2, p0, Lrx/internal/c/a;->bLu:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lrx/internal/c/a;->bLp: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 f1b1803893..106d9586f5 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/functions/Action0;
+.field final synthetic bLB:Lrx/functions/Action0;
 
-.field final synthetic bLQ:Lrx/internal/c/b$a;
+.field final synthetic bLL: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;->bLQ:Lrx/internal/c/b$a;
+    iput-object p1, p0, Lrx/internal/c/b$a$1;->bLL:Lrx/internal/c/b$a;
 
-    iput-object p2, p0, Lrx/internal/c/b$a$1;->bLG:Lrx/functions/Action0;
+    iput-object p2, p0, Lrx/internal/c/b$a$1;->bLB: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;->bLQ:Lrx/internal/c/b$a;
+    iget-object v0, p0, Lrx/internal/c/b$a$1;->bLL: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;->bLG:Lrx/functions/Action0;
+    iget-object v0, p0, Lrx/internal/c/b$a$1;->bLB: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 512fa46db7..ffaf9a62bb 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/functions/Action0;
+.field final synthetic bLB:Lrx/functions/Action0;
 
-.field final synthetic bLQ:Lrx/internal/c/b$a;
+.field final synthetic bLL: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;->bLQ:Lrx/internal/c/b$a;
+    iput-object p1, p0, Lrx/internal/c/b$a$2;->bLL:Lrx/internal/c/b$a;
 
-    iput-object p2, p0, Lrx/internal/c/b$a$2;->bLG:Lrx/functions/Action0;
+    iput-object p2, p0, Lrx/internal/c/b$a$2;->bLB: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;->bLQ:Lrx/internal/c/b$a;
+    iget-object v0, p0, Lrx/internal/c/b$a$2;->bLL: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;->bLG:Lrx/functions/Action0;
+    iget-object v0, p0, Lrx/internal/c/b$a$2;->bLB: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 b016c94104..19e5686d84 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 bLM:Lrx/internal/util/SubscriptionList;
+.field private final bLH:Lrx/internal/util/SubscriptionList;
 
-.field private final bLN:Lrx/subscriptions/CompositeSubscription;
+.field private final bLI:Lrx/subscriptions/CompositeSubscription;
 
-.field private final bLO:Lrx/internal/util/SubscriptionList;
+.field private final bLJ:Lrx/internal/util/SubscriptionList;
 
-.field private final bLP:Lrx/internal/c/b$c;
+.field private final bLK: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;->bLM:Lrx/internal/util/SubscriptionList;
+    iput-object v0, p0, Lrx/internal/c/b$a;->bLH: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;->bLN:Lrx/subscriptions/CompositeSubscription;
+    iput-object v0, p0, Lrx/internal/c/b$a;->bLI: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;->bLM:Lrx/internal/util/SubscriptionList;
+    iget-object v2, p0, Lrx/internal/c/b$a;->bLH:Lrx/internal/util/SubscriptionList;
 
     const/4 v3, 0x0
 
     aput-object v2, v1, v3
 
-    iget-object v2, p0, Lrx/internal/c/b$a;->bLN:Lrx/subscriptions/CompositeSubscription;
+    iget-object v2, p0, Lrx/internal/c/b$a;->bLI: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;->bLO:Lrx/internal/util/SubscriptionList;
+    iput-object v0, p0, Lrx/internal/c/b$a;->bLJ:Lrx/internal/util/SubscriptionList;
 
-    iput-object p1, p0, Lrx/internal/c/b$a;->bLP:Lrx/internal/c/b$c;
+    iput-object p1, p0, Lrx/internal/c/b$a;->bLK:Lrx/internal/c/b$c;
 
     return-void
 .end method
@@ -80,20 +80,20 @@
 
     if-eqz v0, :cond_0
 
-    invoke-static {}, Lrx/subscriptions/c;->KC()Lrx/Subscription;
+    invoke-static {}, Lrx/subscriptions/c;->KA()Lrx/Subscription;
 
     move-result-object p1
 
     return-object p1
 
     :cond_0
-    iget-object v0, p0, Lrx/internal/c/b$a;->bLP:Lrx/internal/c/b$c;
+    iget-object v0, p0, Lrx/internal/c/b$a;->bLK: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;->bLN:Lrx/subscriptions/CompositeSubscription;
+    iget-object p1, p0, Lrx/internal/c/b$a;->bLI: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;->pC:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object p1, v0, Lrx/internal/c/h;->pD: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;->pC:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object p1, v0, Lrx/internal/c/h;->pD: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;->KC()Lrx/Subscription;
+    invoke-static {}, Lrx/subscriptions/c;->KA()Lrx/Subscription;
 
     move-result-object p1
 
     return-object p1
 
     :cond_0
-    iget-object v0, p0, Lrx/internal/c/b$a;->bLP:Lrx/internal/c/b$c;
+    iget-object v0, p0, Lrx/internal/c/b$a;->bLK: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;->bLM:Lrx/internal/util/SubscriptionList;
+    iget-object p1, p0, Lrx/internal/c/b$a;->bLH: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;->pC:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object p1, v0, Lrx/internal/c/h;->pD: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;->bLO:Lrx/internal/util/SubscriptionList;
+    iget-object v0, p0, Lrx/internal/c/b$a;->bLJ: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;->bLO:Lrx/internal/util/SubscriptionList;
+    iget-object v0, p0, Lrx/internal/c/b$a;->bLJ: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 48176c228c..d4bcc00e13 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 bLR:I
+.field final bLM:I
 
-.field final bLS:[Lrx/internal/c/b$c;
+.field final bLN:[Lrx/internal/c/b$c;
 
-.field bLT:J
+.field bLO:J
 
 
 # direct methods
@@ -28,18 +28,18 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput p2, p0, Lrx/internal/c/b$b;->bLR:I
+    iput p2, p0, Lrx/internal/c/b$b;->bLM:I
 
     new-array v0, p2, [Lrx/internal/c/b$c;
 
-    iput-object v0, p0, Lrx/internal/c/b$b;->bLS:[Lrx/internal/c/b$c;
+    iput-object v0, p0, Lrx/internal/c/b$b;->bLN:[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;->bLS:[Lrx/internal/c/b$c;
+    iget-object v1, p0, Lrx/internal/c/b$b;->bLN:[Lrx/internal/c/b$c;
 
     new-instance v2, Lrx/internal/c/b$c;
 
@@ -57,27 +57,27 @@
 
 
 # virtual methods
-.method public final JK()Lrx/internal/c/b$c;
+.method public final JI()Lrx/internal/c/b$c;
     .locals 6
 
-    iget v0, p0, Lrx/internal/c/b$b;->bLR:I
+    iget v0, p0, Lrx/internal/c/b$b;->bLM:I
 
     if-nez v0, :cond_0
 
-    sget-object v0, Lrx/internal/c/b;->bLK:Lrx/internal/c/b$c;
+    sget-object v0, Lrx/internal/c/b;->bLF:Lrx/internal/c/b$c;
 
     return-object v0
 
     :cond_0
-    iget-object v1, p0, Lrx/internal/c/b$b;->bLS:[Lrx/internal/c/b$c;
+    iget-object v1, p0, Lrx/internal/c/b$b;->bLN:[Lrx/internal/c/b$c;
 
-    iget-wide v2, p0, Lrx/internal/c/b$b;->bLT:J
+    iget-wide v2, p0, Lrx/internal/c/b$b;->bLO:J
 
     const-wide/16 v4, 0x1
 
     add-long/2addr v4, v2
 
-    iput-wide v4, p0, Lrx/internal/c/b$b;->bLT:J
+    iput-wide v4, p0, Lrx/internal/c/b$b;->bLO: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;->bLS:[Lrx/internal/c/b$c;
+    iget-object v0, p0, Lrx/internal/c/b$b;->bLN:[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 4b74ea0695..f235161879 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 bLJ:I
+.field static final bLE:I
 
-.field static final bLK:Lrx/internal/c/b$c;
+.field static final bLF:Lrx/internal/c/b$c;
 
-.field static final bLL:Lrx/internal/c/b$b;
+.field static final bLG:Lrx/internal/c/b$b;
 
 
 # instance fields
-.field public final bLu:Ljava/util/concurrent/atomic/AtomicReference;
+.field public final bLp: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 bdm:Ljava/util/concurrent/ThreadFactory;
+.field final bdh:Ljava/util/concurrent/ThreadFactory;
 
 
 # direct methods
@@ -70,15 +70,15 @@
     move v1, v2
 
     :cond_1
-    sput v1, Lrx/internal/c/b;->bLJ:I
+    sput v1, Lrx/internal/c/b;->bLE:I
 
     new-instance v1, Lrx/internal/c/b$c;
 
-    sget-object v2, Lrx/internal/util/j;->bNg:Ljava/util/concurrent/ThreadFactory;
+    sget-object v2, Lrx/internal/util/j;->bNb: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;->bLK:Lrx/internal/c/b$c;
+    sput-object v1, Lrx/internal/c/b;->bLF: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;->bLL:Lrx/internal/c/b$b;
+    sput-object v1, Lrx/internal/c/b;->bLG: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;->bdm:Ljava/util/concurrent/ThreadFactory;
+    iput-object p1, p0, Lrx/internal/c/b;->bdh:Ljava/util/concurrent/ThreadFactory;
 
     new-instance p1, Ljava/util/concurrent/atomic/AtomicReference;
 
-    sget-object v0, Lrx/internal/c/b;->bLL:Lrx/internal/c/b$b;
+    sget-object v0, Lrx/internal/c/b;->bLG: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;->bLu:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object p1, p0, Lrx/internal/c/b;->bLp:Ljava/util/concurrent/atomic/AtomicReference;
 
     new-instance p1, Lrx/internal/c/b$b;
 
-    iget-object v0, p0, Lrx/internal/c/b;->bdm:Ljava/util/concurrent/ThreadFactory;
+    iget-object v0, p0, Lrx/internal/c/b;->bdh:Ljava/util/concurrent/ThreadFactory;
 
-    sget v1, Lrx/internal/c/b;->bLJ:I
+    sget v1, Lrx/internal/c/b;->bLE: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;->bLu:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/internal/c/b;->bLp:Ljava/util/concurrent/atomic/AtomicReference;
 
-    sget-object v1, Lrx/internal/c/b;->bLL:Lrx/internal/c/b$b;
+    sget-object v1, Lrx/internal/c/b;->bLG: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 IY()Lrx/Scheduler$Worker;
+.method public final IW()Lrx/Scheduler$Worker;
     .locals 2
 
     new-instance v0, Lrx/internal/c/b$a;
 
-    iget-object v1, p0, Lrx/internal/c/b;->bLu:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lrx/internal/c/b;->bLp: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;->JK()Lrx/internal/c/b$c;
+    invoke-virtual {v1}, Lrx/internal/c/b$b;->JI()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;->bLu:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/internal/c/b;->bLp: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;->bLL:Lrx/internal/c/b$b;
+    sget-object v1, Lrx/internal/c/b;->bLG:Lrx/internal/c/b$b;
 
     if-ne v0, v1, :cond_1
 
     return-void
 
     :cond_1
-    iget-object v2, p0, Lrx/internal/c/b;->bLu:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lrx/internal/c/b;->bLp: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 a2a67efa09..eb7301cbba 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 bLW:Lrx/subscriptions/b;
+.field final synthetic bLR:Lrx/subscriptions/b;
 
-.field final synthetic bLX:Lrx/internal/c/c$a;
+.field final synthetic bLS: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;->bLX:Lrx/internal/c/c$a;
+    iput-object p1, p0, Lrx/internal/c/c$a$1;->bLS:Lrx/internal/c/c$a;
 
-    iput-object p2, p0, Lrx/internal/c/c$a$1;->bLW:Lrx/subscriptions/b;
+    iput-object p2, p0, Lrx/internal/c/c$a$1;->bLR: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;->bLX:Lrx/internal/c/c$a;
+    iget-object v0, p0, Lrx/internal/c/c$a$1;->bLS:Lrx/internal/c/c$a;
 
-    iget-object v0, v0, Lrx/internal/c/c$a;->bLU:Lrx/subscriptions/CompositeSubscription;
+    iget-object v0, v0, Lrx/internal/c/c$a;->bLP:Lrx/subscriptions/CompositeSubscription;
 
-    iget-object v1, p0, Lrx/internal/c/c$a$1;->bLW:Lrx/subscriptions/b;
+    iget-object v1, p0, Lrx/internal/c/c$a$1;->bLR: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 e53790d4df..a46b94fc75 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 bLW:Lrx/subscriptions/b;
+.field final synthetic bLR:Lrx/subscriptions/b;
 
-.field final synthetic bLX:Lrx/internal/c/c$a;
+.field final synthetic bLS:Lrx/internal/c/c$a;
 
-.field final synthetic bLY:Lrx/functions/Action0;
+.field final synthetic bLT:Lrx/functions/Action0;
 
-.field final synthetic bLZ:Lrx/Subscription;
+.field final synthetic bLU: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;->bLX:Lrx/internal/c/c$a;
+    iput-object p1, p0, Lrx/internal/c/c$a$2;->bLS:Lrx/internal/c/c$a;
 
-    iput-object p2, p0, Lrx/internal/c/c$a$2;->bLW:Lrx/subscriptions/b;
+    iput-object p2, p0, Lrx/internal/c/c$a$2;->bLR:Lrx/subscriptions/b;
 
-    iput-object p3, p0, Lrx/internal/c/c$a$2;->bLY:Lrx/functions/Action0;
+    iput-object p3, p0, Lrx/internal/c/c$a$2;->bLT:Lrx/functions/Action0;
 
-    iput-object p4, p0, Lrx/internal/c/c$a$2;->bLZ:Lrx/Subscription;
+    iput-object p4, p0, Lrx/internal/c/c$a$2;->bLU: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;->bLW:Lrx/subscriptions/b;
+    iget-object v0, p0, Lrx/internal/c/c$a$2;->bLR: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;->bLX:Lrx/internal/c/c$a;
+    iget-object v0, p0, Lrx/internal/c/c$a$2;->bLS:Lrx/internal/c/c$a;
 
-    iget-object v1, p0, Lrx/internal/c/c$a$2;->bLY:Lrx/functions/Action0;
+    iget-object v1, p0, Lrx/internal/c/c$a$2;->bLT: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;->bLW:Lrx/subscriptions/b;
+    iget-object v1, p0, Lrx/internal/c/c$a$2;->bLR: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;->bLZ:Lrx/Subscription;
+    iget-object v1, p0, Lrx/internal/c/c$a$2;->bLU: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 56830cfcce..1eb4197d95 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 bLU:Lrx/subscriptions/CompositeSubscription;
+.field final bLP:Lrx/subscriptions/CompositeSubscription;
 
-.field final bLV:Ljava/util/concurrent/ScheduledExecutorService;
+.field final bLQ:Ljava/util/concurrent/ScheduledExecutorService;
 
-.field final bmF:Ljava/util/concurrent/ConcurrentLinkedQueue;
+.field final bmA: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;->bmF:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iput-object p1, p0, Lrx/internal/c/c$a;->bmA: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;->bLU:Lrx/subscriptions/CompositeSubscription;
+    iput-object p1, p0, Lrx/internal/c/c$a;->bLP:Lrx/subscriptions/CompositeSubscription;
 
-    invoke-static {}, Lrx/internal/c/d;->JL()Ljava/util/concurrent/ScheduledExecutorService;
+    invoke-static {}, Lrx/internal/c/d;->JJ()Ljava/util/concurrent/ScheduledExecutorService;
 
     move-result-object p1
 
-    iput-object p1, p0, Lrx/internal/c/c$a;->bLV:Ljava/util/concurrent/ScheduledExecutorService;
+    iput-object p1, p0, Lrx/internal/c/c$a;->bLQ:Ljava/util/concurrent/ScheduledExecutorService;
 
     return-void
 .end method
@@ -96,7 +96,7 @@
 
     if-eqz v0, :cond_1
 
-    invoke-static {}, Lrx/subscriptions/c;->KC()Lrx/Subscription;
+    invoke-static {}, Lrx/subscriptions/c;->KA()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;->bLU:Lrx/subscriptions/CompositeSubscription;
+    iget-object v2, p0, Lrx/internal/c/c$a;->bLP: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;->bLV:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object p1, p0, Lrx/internal/c/c$a;->bLQ: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;->KC()Lrx/Subscription;
+    invoke-static {}, Lrx/subscriptions/c;->KA()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;->bLU:Lrx/subscriptions/CompositeSubscription;
+    iget-object v1, p0, Lrx/internal/c/c$a;->bLP: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;->bLU:Lrx/subscriptions/CompositeSubscription;
+    iget-object p1, p0, Lrx/internal/c/c$a;->bLP:Lrx/subscriptions/CompositeSubscription;
 
     invoke-virtual {p1, v0}, Lrx/subscriptions/CompositeSubscription;->add(Lrx/Subscription;)V
 
-    iget-object p1, p0, Lrx/internal/c/c$a;->bmF:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object p1, p0, Lrx/internal/c/c$a;->bmA: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;->bLU:Lrx/subscriptions/CompositeSubscription;
+    iget-object v1, p0, Lrx/internal/c/c$a;->bLP: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;->bLU:Lrx/subscriptions/CompositeSubscription;
+    iget-object v0, p0, Lrx/internal/c/c$a;->bLP: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;->bLU:Lrx/subscriptions/CompositeSubscription;
+    iget-object v0, p0, Lrx/internal/c/c$a;->bLP: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;->bmF:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v0, p0, Lrx/internal/c/c$a;->bmA: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;->bmF:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v0, p0, Lrx/internal/c/c$a;->bmA: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;->bLU:Lrx/subscriptions/CompositeSubscription;
+    iget-object v1, p0, Lrx/internal/c/c$a;->bLP: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;->bmF:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v0, p0, Lrx/internal/c/c$a;->bmA: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;->bLU:Lrx/subscriptions/CompositeSubscription;
+    iget-object v0, p0, Lrx/internal/c/c$a;->bLP:Lrx/subscriptions/CompositeSubscription;
 
     invoke-virtual {v0}, Lrx/subscriptions/CompositeSubscription;->unsubscribe()V
 
-    iget-object v0, p0, Lrx/internal/c/c$a;->bmF:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v0, p0, Lrx/internal/c/c$a;->bmA: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 aa0a5d7adf..c485c66af8 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 IY()Lrx/Scheduler$Worker;
+.method public final IW()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 6ab8b015cb..c297174bb8 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 bMa:[Ljava/util/concurrent/ScheduledExecutorService;
+.field private static final bLV:[Ljava/util/concurrent/ScheduledExecutorService;
 
-.field private static final bMb:Ljava/util/concurrent/ScheduledExecutorService;
+.field private static final bLW:Ljava/util/concurrent/ScheduledExecutorService;
 
-.field public static final bMc:Lrx/internal/c/d;
+.field public static final bLX:Lrx/internal/c/d;
 
-.field private static bMe:I
+.field private static bLZ:I
 
 
 # instance fields
-.field private final bMd:Ljava/util/concurrent/atomic/AtomicReference;
+.field private final bLY: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;->bMa:[Ljava/util/concurrent/ScheduledExecutorService;
+    sput-object v1, Lrx/internal/c/d;->bLV:[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;->bMb:Ljava/util/concurrent/ScheduledExecutorService;
+    sput-object v0, Lrx/internal/c/d;->bLW: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;->bMc:Lrx/internal/c/d;
+    sput-object v0, Lrx/internal/c/d;->bLX: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;->bMa:[Ljava/util/concurrent/ScheduledExecutorService;
+    sget-object v1, Lrx/internal/c/d;->bLV:[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;->bMd:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object v0, p0, Lrx/internal/c/d;->bLY:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-direct {p0}, Lrx/internal/c/d;->start()V
 
     return-void
 .end method
 
-.method public static JL()Ljava/util/concurrent/ScheduledExecutorService;
+.method public static JJ()Ljava/util/concurrent/ScheduledExecutorService;
     .locals 3
 
-    sget-object v0, Lrx/internal/c/d;->bMc:Lrx/internal/c/d;
+    sget-object v0, Lrx/internal/c/d;->bLX:Lrx/internal/c/d;
 
-    iget-object v0, v0, Lrx/internal/c/d;->bMd:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, v0, Lrx/internal/c/d;->bLY: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;->bMa:[Ljava/util/concurrent/ScheduledExecutorService;
+    sget-object v1, Lrx/internal/c/d;->bLV:[Ljava/util/concurrent/ScheduledExecutorService;
 
     if-ne v0, v1, :cond_0
 
-    sget-object v0, Lrx/internal/c/d;->bMb:Ljava/util/concurrent/ScheduledExecutorService;
+    sget-object v0, Lrx/internal/c/d;->bLW:Ljava/util/concurrent/ScheduledExecutorService;
 
     return-object v0
 
     :cond_0
-    sget v1, Lrx/internal/c/d;->bMe:I
+    sget v1, Lrx/internal/c/d;->bLZ:I
 
     add-int/lit8 v1, v1, 0x1
 
@@ -107,7 +107,7 @@
     const/4 v1, 0x0
 
     :cond_1
-    sput v1, Lrx/internal/c/d;->bMe:I
+    sput v1, Lrx/internal/c/d;->bLZ:I
 
     aget-object v0, v0, v1
 
@@ -148,7 +148,7 @@
     :goto_0
     if-ge v3, v0, :cond_2
 
-    invoke-static {}, Lrx/internal/c/e;->JM()Ljava/util/concurrent/ScheduledExecutorService;
+    invoke-static {}, Lrx/internal/c/e;->JK()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;->bMd:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/internal/c/d;->bLY:Ljava/util/concurrent/atomic/AtomicReference;
 
-    sget-object v3, Lrx/internal/c/d;->bMa:[Ljava/util/concurrent/ScheduledExecutorService;
+    sget-object v3, Lrx/internal/c/d;->bLV:[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;->bMd:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/internal/c/d;->bLY: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;->bMa:[Ljava/util/concurrent/ScheduledExecutorService;
+    sget-object v1, Lrx/internal/c/d;->bLV:[Ljava/util/concurrent/ScheduledExecutorService;
 
     if-ne v0, v1, :cond_1
 
     return-void
 
     :cond_1
-    iget-object v2, p0, Lrx/internal/c/d;->bMd:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lrx/internal/c/d;->bLY: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 d195a0f8f0..a12eae0498 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 bMf:Lrx/internal/util/j;
+.field static final bMa:Lrx/internal/util/j;
 
-.field private static final synthetic bMg:[Lrx/internal/c/e;
+.field private static final synthetic bMb:[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;->bMg:[Lrx/internal/c/e;
+    sput-object v0, Lrx/internal/c/e;->bMb:[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;->bMf:Lrx/internal/util/j;
+    sput-object v0, Lrx/internal/c/e;->bMa:Lrx/internal/util/j;
 
     return-void
 .end method
 
-.method public static JM()Ljava/util/concurrent/ScheduledExecutorService;
+.method public static JK()Ljava/util/concurrent/ScheduledExecutorService;
     .locals 2
 
-    invoke-static {}, Lrx/c/c;->Kh()Lrx/functions/Func0;
+    invoke-static {}, Lrx/c/c;->Kf()Lrx/functions/Func0;
 
     move-result-object v0
 
@@ -51,7 +51,7 @@
 
     const/4 v0, 0x1
 
-    sget-object v1, Lrx/internal/c/e;->bMf:Lrx/internal/util/j;
+    sget-object v1, Lrx/internal/c/e;->bMa: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;->bMg:[Lrx/internal/c/e;
+    sget-object v0, Lrx/internal/c/e;->bMb:[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 404b80d1e4..b5548b4895 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 bMi:Lrx/subscriptions/a;
+.field final bMd:Lrx/subscriptions/a;
 
-.field final synthetic bMj:Lrx/internal/c/f;
+.field final synthetic bMe: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;->bMj:Lrx/internal/c/f;
+    iput-object p1, p0, Lrx/internal/c/f$a;->bMe: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;->bMi:Lrx/subscriptions/a;
+    iput-object p1, p0, Lrx/internal/c/f$a;->bMd:Lrx/subscriptions/a;
 
     return-void
 .end method
@@ -71,7 +71,7 @@
 
     invoke-interface {p1}, Lrx/functions/Action0;->call()V
 
-    invoke-static {}, Lrx/subscriptions/c;->KC()Lrx/Subscription;
+    invoke-static {}, Lrx/subscriptions/c;->KA()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;->bMi:Lrx/subscriptions/a;
+    iget-object v0, p0, Lrx/internal/c/f$a;->bMd: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;->bMi:Lrx/subscriptions/a;
+    iget-object v0, p0, Lrx/internal/c/f$a;->bMd: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 b1890f36c1..cb313ef4ee 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 bMh:Lrx/internal/c/f;
+.field public static final bMc: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;->bMh:Lrx/internal/c/f;
+    sput-object v0, Lrx/internal/c/f;->bMc:Lrx/internal/c/f;
 
     return-void
 .end method
@@ -38,7 +38,7 @@
 
 
 # virtual methods
-.method public final IY()Lrx/Scheduler$Worker;
+.method public final IW()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 ff30865277..73d3059a58 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 bdm:Ljava/util/concurrent/ThreadFactory;
+.field private final bdh: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;->bdm:Ljava/util/concurrent/ThreadFactory;
+    iput-object p1, p0, Lrx/internal/c/g;->bdh:Ljava/util/concurrent/ThreadFactory;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final IY()Lrx/Scheduler$Worker;
+.method public final IW()Lrx/Scheduler$Worker;
     .locals 2
 
     new-instance v0, Lrx/internal/c/h;
 
-    iget-object v1, p0, Lrx/internal/c/g;->bdm:Ljava/util/concurrent/ThreadFactory;
+    iget-object v1, p0, Lrx/internal/c/g;->bdh: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 0b77c6ba4b..072b43b7ee 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;->JN()V
+    invoke-static {}, Lrx/internal/c/h;->JL()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 caa5518156..e2bc65a8d0 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 bMl:Z
+.field private static final bMg:Z
 
-.field public static final bMm:I
+.field public static final bMh:I
 
-.field private static final bMn:Ljava/util/concurrent/ConcurrentHashMap;
+.field private static final bMi: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 bMo:Ljava/util/concurrent/atomic/AtomicReference;
+.field private static final bMj: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 bMp:Ljava/lang/Object;
+.field private static volatile bMk:Ljava/lang/Object;
 
-.field private static final bMq:Ljava/lang/Object;
+.field private static final bMl:Ljava/lang/Object;
 
 
 # instance fields
-.field volatile bMk:Z
+.field volatile bMf:Z
 
-.field final pC:Ljava/util/concurrent/ScheduledExecutorService;
+.field final pD: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;->bMq:Ljava/lang/Object;
+    sput-object v0, Lrx/internal/c/h;->bMl: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;->bMn:Ljava/util/concurrent/ConcurrentHashMap;
+    sput-object v0, Lrx/internal/c/h;->bMi: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;->bMo:Ljava/util/concurrent/atomic/AtomicReference;
+    sput-object v0, Lrx/internal/c/h;->bMj: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;->bMm:I
+    sput v0, Lrx/internal/c/h;->bMh:I
 
     const-string v0, "rx.scheduler.jdk6.purge-force"
 
@@ -85,7 +85,7 @@
 
     move-result v0
 
-    invoke-static {}, Lrx/internal/util/h;->JR()I
+    invoke-static {}, Lrx/internal/util/h;->JP()I
 
     move-result v1
 
@@ -106,7 +106,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    sput-boolean v0, Lrx/internal/c/h;->bMl:Z
+    sput-boolean v0, Lrx/internal/c/h;->bMg: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;->pC:Ljava/util/concurrent/ScheduledExecutorService;
+    iput-object p1, p0, Lrx/internal/c/h;->pD:Ljava/util/concurrent/ScheduledExecutorService;
 
     return-void
 .end method
 
-.method static JN()V
+.method static JL()V
     .locals 3
 
     :try_start_0
-    sget-object v0, Lrx/internal/c/h;->bMn:Ljava/util/concurrent/ConcurrentHashMap;
+    sget-object v0, Lrx/internal/c/h;->bMi: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;->bMn:Ljava/util/concurrent/ConcurrentHashMap;
+    sget-object v0, Lrx/internal/c/h;->bMi: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;->bMo:Ljava/util/concurrent/atomic/AtomicReference;
+    sget-object v0, Lrx/internal/c/h;->bMj: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;->bMo:Ljava/util/concurrent/atomic/AtomicReference;
+    sget-object v0, Lrx/internal/c/h;->bMj: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;->bMm:I
+    sget v0, Lrx/internal/c/h;->bMh:I
 
     int-to-long v5, v0
 
@@ -270,7 +270,7 @@
 
     :cond_1
     :goto_1
-    sget-object v0, Lrx/internal/c/h;->bMn:Ljava/util/concurrent/ConcurrentHashMap;
+    sget-object v0, Lrx/internal/c/h;->bMi: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;->bMl:Z
+    sget-boolean v0, Lrx/internal/c/h;->bMg:Z
 
     const/4 v1, 0x0
 
@@ -290,9 +290,9 @@
 
     if-eqz v0, :cond_3
 
-    sget-object v0, Lrx/internal/c/h;->bMp:Ljava/lang/Object;
+    sget-object v0, Lrx/internal/c/h;->bMk:Ljava/lang/Object;
 
-    sget-object v2, Lrx/internal/c/h;->bMq:Ljava/lang/Object;
+    sget-object v2, Lrx/internal/c/h;->bMl: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;->bMq:Ljava/lang/Object;
+    sget-object v2, Lrx/internal/c/h;->bMl:Ljava/lang/Object;
 
     :goto_0
-    sput-object v2, Lrx/internal/c/h;->bMp:Ljava/lang/Object;
+    sput-object v2, Lrx/internal/c/h;->bMk: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;->bMk:Z
+    iget-boolean v0, p0, Lrx/internal/c/h;->bMf:Z
 
     if-eqz v0, :cond_0
 
-    invoke-static {}, Lrx/subscriptions/c;->KC()Lrx/Subscription;
+    invoke-static {}, Lrx/subscriptions/c;->KA()Lrx/Subscription;
 
     move-result-object p1
 
@@ -490,7 +490,7 @@
 
     if-gtz p1, :cond_0
 
-    iget-object p1, p0, Lrx/internal/c/h;->pC:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object p1, p0, Lrx/internal/c/h;->pD: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;->pC:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object p1, p0, Lrx/internal/c/h;->pD: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;->bMk:Z
+    iget-boolean v0, p0, Lrx/internal/c/h;->bMf:Z
 
     return v0
 .end method
@@ -524,13 +524,13 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lrx/internal/c/h;->bMk:Z
+    iput-boolean v0, p0, Lrx/internal/c/h;->bMf:Z
 
-    iget-object v0, p0, Lrx/internal/c/h;->pC:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object v0, p0, Lrx/internal/c/h;->pD:Ljava/util/concurrent/ScheduledExecutorService;
 
     invoke-interface {v0}, Ljava/util/concurrent/ScheduledExecutorService;->shutdownNow()Ljava/util/List;
 
-    iget-object v0, p0, Lrx/internal/c/h;->pC:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object v0, p0, Lrx/internal/c/h;->pD: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 b20502afe6..4ca1385b21 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 bLG:Lrx/functions/Action0;
+.field final synthetic bLB:Lrx/functions/Action0;
 
-.field bMs:J
+.field bMn:J
 
-.field bMt:J
+.field bMo:J
 
-.field bMu:J
+.field bMp:J
 
-.field final synthetic bMv:J
+.field final synthetic bMq:J
 
-.field final synthetic bMw:J
+.field final synthetic bMr:J
 
-.field final synthetic bMx:Lrx/internal/d/a;
+.field final synthetic bMs:Lrx/internal/d/a;
 
-.field final synthetic bMy:Lrx/internal/c/i$a;
+.field final synthetic bMt:Lrx/internal/c/i$a;
 
-.field final synthetic bMz:J
+.field final synthetic bMu: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;->bMv:J
+    iput-wide p1, p0, Lrx/internal/c/i$1;->bMq:J
 
-    iput-wide p3, p0, Lrx/internal/c/i$1;->bMw:J
+    iput-wide p3, p0, Lrx/internal/c/i$1;->bMr:J
 
-    iput-object p5, p0, Lrx/internal/c/i$1;->bLG:Lrx/functions/Action0;
+    iput-object p5, p0, Lrx/internal/c/i$1;->bLB:Lrx/functions/Action0;
 
-    iput-object p6, p0, Lrx/internal/c/i$1;->bMx:Lrx/internal/d/a;
+    iput-object p6, p0, Lrx/internal/c/i$1;->bMs:Lrx/internal/d/a;
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lrx/internal/c/i$1;->bMy:Lrx/internal/c/i$a;
+    iput-object p1, p0, Lrx/internal/c/i$1;->bMt: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;->bMz:J
+    iput-wide p9, p0, Lrx/internal/c/i$1;->bMu:J
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iget-wide p1, p0, Lrx/internal/c/i$1;->bMv:J
+    iget-wide p1, p0, Lrx/internal/c/i$1;->bMq:J
 
-    iput-wide p1, p0, Lrx/internal/c/i$1;->bMt:J
+    iput-wide p1, p0, Lrx/internal/c/i$1;->bMo:J
 
-    iget-wide p1, p0, Lrx/internal/c/i$1;->bMw:J
+    iget-wide p1, p0, Lrx/internal/c/i$1;->bMr:J
 
-    iput-wide p1, p0, Lrx/internal/c/i$1;->bMu:J
+    iput-wide p1, p0, Lrx/internal/c/i$1;->bMp: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;->bLG:Lrx/functions/Action0;
+    iget-object v0, p0, Lrx/internal/c/i$1;->bLB:Lrx/functions/Action0;
 
     invoke-interface {v0}, Lrx/functions/Action0;->call()V
 
-    iget-object v0, p0, Lrx/internal/c/i$1;->bMx:Lrx/internal/d/a;
+    iget-object v0, p0, Lrx/internal/c/i$1;->bMs: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;->bMy:Lrx/internal/c/i$a;
+    iget-object v0, p0, Lrx/internal/c/i$1;->bMt:Lrx/internal/c/i$a;
 
     if-eqz v0, :cond_0
 
-    invoke-interface {v0}, Lrx/internal/c/i$a;->JO()J
+    invoke-interface {v0}, Lrx/internal/c/i$a;->JM()J
 
     move-result-wide v0
 
@@ -111,11 +111,11 @@
     move-result-wide v0
 
     :goto_0
-    sget-wide v2, Lrx/internal/c/i;->bMr:J
+    sget-wide v2, Lrx/internal/c/i;->bMm:J
 
     add-long/2addr v2, v0
 
-    iget-wide v4, p0, Lrx/internal/c/i$1;->bMt:J
+    iget-wide v4, p0, Lrx/internal/c/i$1;->bMo:J
 
     const-wide/16 v6, 0x1
 
@@ -123,11 +123,11 @@
 
     if-ltz v8, :cond_2
 
-    iget-wide v2, p0, Lrx/internal/c/i$1;->bMz:J
+    iget-wide v2, p0, Lrx/internal/c/i$1;->bMu:J
 
     add-long/2addr v4, v2
 
-    sget-wide v2, Lrx/internal/c/i;->bMr:J
+    sget-wide v2, Lrx/internal/c/i;->bMm:J
 
     add-long/2addr v4, v2
 
@@ -138,15 +138,15 @@
     goto :goto_1
 
     :cond_1
-    iget-wide v2, p0, Lrx/internal/c/i$1;->bMu:J
+    iget-wide v2, p0, Lrx/internal/c/i$1;->bMp:J
 
-    iget-wide v4, p0, Lrx/internal/c/i$1;->bMs:J
+    iget-wide v4, p0, Lrx/internal/c/i$1;->bMn:J
 
     add-long/2addr v4, v6
 
-    iput-wide v4, p0, Lrx/internal/c/i$1;->bMs:J
+    iput-wide v4, p0, Lrx/internal/c/i$1;->bMn:J
 
-    iget-wide v6, p0, Lrx/internal/c/i$1;->bMz:J
+    iget-wide v6, p0, Lrx/internal/c/i$1;->bMu:J
 
     mul-long v4, v4, v6
 
@@ -156,30 +156,30 @@
 
     :cond_2
     :goto_1
-    iget-wide v2, p0, Lrx/internal/c/i$1;->bMz:J
+    iget-wide v2, p0, Lrx/internal/c/i$1;->bMu:J
 
     add-long v4, v0, v2
 
-    iget-wide v8, p0, Lrx/internal/c/i$1;->bMs:J
+    iget-wide v8, p0, Lrx/internal/c/i$1;->bMn:J
 
     add-long/2addr v8, v6
 
-    iput-wide v8, p0, Lrx/internal/c/i$1;->bMs:J
+    iput-wide v8, p0, Lrx/internal/c/i$1;->bMn:J
 
     mul-long v2, v2, v8
 
     sub-long v2, v4, v2
 
-    iput-wide v2, p0, Lrx/internal/c/i$1;->bMu:J
+    iput-wide v2, p0, Lrx/internal/c/i$1;->bMp:J
 
     move-wide v2, v4
 
     :goto_2
-    iput-wide v0, p0, Lrx/internal/c/i$1;->bMt:J
+    iput-wide v0, p0, Lrx/internal/c/i$1;->bMo:J
 
     sub-long/2addr v2, v0
 
-    iget-object v0, p0, Lrx/internal/c/i$1;->bMx:Lrx/internal/d/a;
+    iget-object v0, p0, Lrx/internal/c/i$1;->bMs: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 a6b5341c04..cb2019fd6c 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 JO()J
+.method public abstract JM()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 25ef1490ce..cea8116f1d 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 bMr:J
+.field public static final bMm:J
 
 
 # direct methods
@@ -37,7 +37,7 @@
 
     move-result-wide v0
 
-    sput-wide v0, Lrx/internal/c/i;->bMr:J
+    sput-wide v0, Lrx/internal/c/i;->bMm: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 43b3f999df..ad7f850fd8 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 bMA:Ljava/util/concurrent/Future;
+.field private final bMv: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 bMB:Lrx/internal/c/j;
+.field final synthetic bMw:Lrx/internal/c/j;
 
 
 # direct methods
@@ -41,11 +41,11 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lrx/internal/c/j$a;->bMB:Lrx/internal/c/j;
+    iput-object p1, p0, Lrx/internal/c/j$a;->bMw:Lrx/internal/c/j;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p2, p0, Lrx/internal/c/j$a;->bMA:Ljava/util/concurrent/Future;
+    iput-object p2, p0, Lrx/internal/c/j$a;->bMv: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;->bMA:Ljava/util/concurrent/Future;
+    iget-object v0, p0, Lrx/internal/c/j$a;->bMv: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;->bMB:Lrx/internal/c/j;
+    iget-object v0, p0, Lrx/internal/c/j$a;->bMw: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;->bMA:Ljava/util/concurrent/Future;
+    iget-object v0, p0, Lrx/internal/c/j$a;->bMv: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;->bMA:Ljava/util/concurrent/Future;
+    iget-object v0, p0, Lrx/internal/c/j$a;->bMv: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 a4f799853d..c7d32dc93b 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;->bGz:Z
+    iget-boolean v2, v0, Lrx/internal/util/SubscriptionList;->bGu: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;->bGz:Z
+    iget-boolean v3, v0, Lrx/internal/util/SubscriptionList;->bGu: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 e5368d9266..b65d53f0ac 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 bMC:Lrx/functions/Action0;
+.field private final bMx:Lrx/functions/Action0;
 
-.field private final bMD:Lrx/Scheduler$Worker;
+.field private final bMy:Lrx/Scheduler$Worker;
 
-.field private final bME:J
+.field private final bMz:J
 
 
 # direct methods
@@ -20,11 +20,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/c/l;->bMC:Lrx/functions/Action0;
+    iput-object p1, p0, Lrx/internal/c/l;->bMx:Lrx/functions/Action0;
 
-    iput-object p2, p0, Lrx/internal/c/l;->bMD:Lrx/Scheduler$Worker;
+    iput-object p2, p0, Lrx/internal/c/l;->bMy:Lrx/Scheduler$Worker;
 
-    iput-wide p3, p0, Lrx/internal/c/l;->bME:J
+    iput-wide p3, p0, Lrx/internal/c/l;->bMz:J
 
     return-void
 .end method
@@ -34,7 +34,7 @@
 .method public final call()V
     .locals 5
 
-    iget-object v0, p0, Lrx/internal/c/l;->bMD:Lrx/Scheduler$Worker;
+    iget-object v0, p0, Lrx/internal/c/l;->bMy: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;->bME:J
+    iget-wide v0, p0, Lrx/internal/c/l;->bMz:J
 
     invoke-static {}, Lrx/Scheduler$Worker;->now()J
 
@@ -79,7 +79,7 @@
 
     :cond_1
     :goto_0
-    iget-object v0, p0, Lrx/internal/c/l;->bMD:Lrx/Scheduler$Worker;
+    iget-object v0, p0, Lrx/internal/c/l;->bMy: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;->bMC:Lrx/functions/Action0;
+    iget-object v0, p0, Lrx/internal/c/l;->bMx: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 a7070a31e6..45c0243f34 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 bMI:Lrx/internal/c/m$b;
+.field final synthetic bMD:Lrx/internal/c/m$b;
 
-.field final synthetic bMJ:Lrx/internal/c/m$a;
+.field final synthetic bME: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;->bMJ:Lrx/internal/c/m$a;
+    iput-object p1, p0, Lrx/internal/c/m$a$1;->bME:Lrx/internal/c/m$a;
 
-    iput-object p2, p0, Lrx/internal/c/m$a$1;->bMI:Lrx/internal/c/m$b;
+    iput-object p2, p0, Lrx/internal/c/m$a$1;->bMD: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;->bMJ:Lrx/internal/c/m$a;
+    iget-object v0, p0, Lrx/internal/c/m$a$1;->bME:Lrx/internal/c/m$a;
 
-    iget-object v0, v0, Lrx/internal/c/m$a;->bMH:Ljava/util/concurrent/PriorityBlockingQueue;
+    iget-object v0, v0, Lrx/internal/c/m$a;->bMC:Ljava/util/concurrent/PriorityBlockingQueue;
 
-    iget-object v1, p0, Lrx/internal/c/m$a$1;->bMI:Lrx/internal/c/m$b;
+    iget-object v1, p0, Lrx/internal/c/m$a$1;->bMD: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 5b9a05be55..beeea3b73c 100644
--- a/com.discord/smali_classes2/rx/internal/c/m$a.smali
+++ b/com.discord/smali_classes2/rx/internal/c/m$a.smali
@@ -18,9 +18,9 @@
 
 
 # instance fields
-.field final bMG:Ljava/util/concurrent/atomic/AtomicInteger;
+.field final bMB:Ljava/util/concurrent/atomic/AtomicInteger;
 
-.field final bMH:Ljava/util/concurrent/PriorityBlockingQueue;
+.field final bMC:Ljava/util/concurrent/PriorityBlockingQueue;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/PriorityBlockingQueue<",
@@ -30,7 +30,7 @@
     .end annotation
 .end field
 
-.field private final bMi:Lrx/subscriptions/a;
+.field private final bMd: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;->bMG:Ljava/util/concurrent/atomic/AtomicInteger;
+    iput-object v0, p0, Lrx/internal/c/m$a;->bMB: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;->bMH:Ljava/util/concurrent/PriorityBlockingQueue;
+    iput-object v0, p0, Lrx/internal/c/m$a;->bMC: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;->bMi:Lrx/subscriptions/a;
+    iput-object v0, p0, Lrx/internal/c/m$a;->bMd: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;->bMi:Lrx/subscriptions/a;
+    iget-object v0, p0, Lrx/internal/c/m$a;->bMd: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;->KC()Lrx/Subscription;
+    invoke-static {}, Lrx/subscriptions/c;->KA()Lrx/Subscription;
 
     move-result-object p1
 
@@ -92,7 +92,7 @@
 
     move-result-object p2
 
-    iget-object p3, p0, Lrx/internal/c/m$a;->bMG:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object p3, p0, Lrx/internal/c/m$a;->bMB: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;->bMH:Ljava/util/concurrent/PriorityBlockingQueue;
+    iget-object p1, p0, Lrx/internal/c/m$a;->bMC: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;->bMH:Ljava/util/concurrent/PriorityBlockingQueue;
+    iget-object p1, p0, Lrx/internal/c/m$a;->bMC: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;->KC()Lrx/Subscription;
+    invoke-static {}, Lrx/subscriptions/c;->KA()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;->bMi:Lrx/subscriptions/a;
+    iget-object v0, p0, Lrx/internal/c/m$a;->bMd: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;->bMi:Lrx/subscriptions/a;
+    iget-object v0, p0, Lrx/internal/c/m$a;->bMd: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 4499c040cb..7d69f9f46a 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 bMK:Ljava/lang/Long;
+.field final bMF: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;->bMK:Ljava/lang/Long;
+    iput-object p2, p0, Lrx/internal/c/m$b;->bMF: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;->bMK:Ljava/lang/Long;
+    iget-object v0, p0, Lrx/internal/c/m$b;->bMF:Ljava/lang/Long;
 
-    iget-object v1, p1, Lrx/internal/c/m$b;->bMK:Ljava/lang/Long;
+    iget-object v1, p1, Lrx/internal/c/m$b;->bMF: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 c4794e3c1c..496fb125d6 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 bMF:Lrx/internal/c/m;
+.field public static final bMA: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;->bMF:Lrx/internal/c/m;
+    sput-object v0, Lrx/internal/c/m;->bMA:Lrx/internal/c/m;
 
     return-void
 .end method
@@ -61,7 +61,7 @@
 
 
 # virtual methods
-.method public final IY()Lrx/Scheduler$Worker;
+.method public final IW()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 0080249330..8377c17ff8 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 JP()Lrx/Subscription;
+.method public final JN()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;->bML:Lrx/internal/d/b;
+    sget-object v1, Lrx/internal/d/b;->bMG:Lrx/internal/d/b;
 
     if-ne v0, v1, :cond_0
 
-    invoke-static {}, Lrx/subscriptions/c;->KC()Lrx/Subscription;
+    invoke-static {}, Lrx/subscriptions/c;->KA()Lrx/Subscription;
 
     move-result-object v0
 
@@ -73,7 +73,7 @@
 
     check-cast v0, Lrx/Subscription;
 
-    sget-object v1, Lrx/internal/d/b;->bML:Lrx/internal/d/b;
+    sget-object v1, Lrx/internal/d/b;->bMG: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;->bML:Lrx/internal/d/b;
+    sget-object v1, Lrx/internal/d/b;->bMG: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;->bML:Lrx/internal/d/b;
+    sget-object v1, Lrx/internal/d/b;->bMG: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;->bML:Lrx/internal/d/b;
+    sget-object v1, Lrx/internal/d/b;->bMG:Lrx/internal/d/b;
 
     if-eq v0, v1, :cond_0
 
-    sget-object v0, Lrx/internal/d/b;->bML:Lrx/internal/d/b;
+    sget-object v0, Lrx/internal/d/b;->bMG: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;->bML:Lrx/internal/d/b;
+    sget-object v1, Lrx/internal/d/b;->bMG: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 f9562cf223..faa1cd78c4 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 bML:Lrx/internal/d/b;
+.field public static final enum bMG:Lrx/internal/d/b;
 
-.field private static final synthetic bMM:[Lrx/internal/d/b;
+.field private static final synthetic bMH:[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;->bML:Lrx/internal/d/b;
+    sput-object v0, Lrx/internal/d/b;->bMG:Lrx/internal/d/b;
 
     const/4 v0, 0x1
 
     new-array v0, v0, [Lrx/internal/d/b;
 
-    sget-object v1, Lrx/internal/d/b;->bML:Lrx/internal/d/b;
+    sget-object v1, Lrx/internal/d/b;->bMG:Lrx/internal/d/b;
 
     const/4 v2, 0x0
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lrx/internal/d/b;->bMM:[Lrx/internal/d/b;
+    sput-object v0, Lrx/internal/d/b;->bMH:[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;->bMM:[Lrx/internal/d/b;
+    sget-object v0, Lrx/internal/d/b;->bMH:[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 87ea32c2e3..556f99e44a 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 bGz:Z
+.field public volatile bGu: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;->bGz:Z
+    iget-boolean v0, p0, Lrx/internal/util/SubscriptionList;->bGu:Z
 
     if-nez v0, :cond_3
 
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lrx/internal/util/SubscriptionList;->bGz:Z
+    iget-boolean v0, p0, Lrx/internal/util/SubscriptionList;->bGu: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;->bGz:Z
+    iget-boolean v0, p0, Lrx/internal/util/SubscriptionList;->bGu:Z
 
     return v0
 .end method
@@ -139,14 +139,14 @@
 .method public final unsubscribe()V
     .locals 3
 
-    iget-boolean v0, p0, Lrx/internal/util/SubscriptionList;->bGz:Z
+    iget-boolean v0, p0, Lrx/internal/util/SubscriptionList;->bGu:Z
 
     if-nez v0, :cond_3
 
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lrx/internal/util/SubscriptionList;->bGz:Z
+    iget-boolean v0, p0, Lrx/internal/util/SubscriptionList;->bGu:Z
 
     if-eqz v0, :cond_0
 
@@ -157,7 +157,7 @@
     :cond_0
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lrx/internal/util/SubscriptionList;->bGz:Z
+    iput-boolean v0, p0, Lrx/internal/util/SubscriptionList;->bGu: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 501aaa29fa..e948cedfff 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 bMN:Lrx/functions/Action1;
+.field final bMI:Lrx/functions/Action1;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/Action1<",
@@ -29,7 +29,7 @@
     .end annotation
 .end field
 
-.field final bMO:Lrx/functions/Action1;
+.field final bMJ:Lrx/functions/Action1;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/Action1<",
@@ -40,7 +40,7 @@
     .end annotation
 .end field
 
-.field final bMP:Lrx/functions/Action0;
+.field final bMK: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;->bMN:Lrx/functions/Action1;
+    iput-object p1, p0, Lrx/internal/util/a;->bMI:Lrx/functions/Action1;
 
-    iput-object p2, p0, Lrx/internal/util/a;->bMO:Lrx/functions/Action1;
+    iput-object p2, p0, Lrx/internal/util/a;->bMJ:Lrx/functions/Action1;
 
-    iput-object p3, p0, Lrx/internal/util/a;->bMP:Lrx/functions/Action0;
+    iput-object p3, p0, Lrx/internal/util/a;->bMK: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;->bMP:Lrx/functions/Action0;
+    iget-object v0, p0, Lrx/internal/util/a;->bMK: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;->bMO:Lrx/functions/Action1;
+    iget-object v0, p0, Lrx/internal/util/a;->bMJ: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;->bMN:Lrx/functions/Action1;
+    iget-object v0, p0, Lrx/internal/util/a;->bMI: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 8f2f474001..3858a15b53 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 bmX:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+.field protected final bmS: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;->bmX:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iput-object v0, p0, Lrx/internal/util/a/a;->bmS:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
     return-void
 .end method
@@ -92,7 +92,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/internal/util/a/a;->bmX:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v0, p0, Lrx/internal/util/a/a;->bmS: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 9bea0586cc..e15c559a29 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 bNu:Ljava/util/concurrent/atomic/AtomicReference;
+.field private final bNp: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 bNv:Ljava/util/concurrent/atomic/AtomicReference;
+.field private final bNq:Ljava/util/concurrent/atomic/AtomicReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReference<",
@@ -47,17 +47,38 @@
 
     invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
 
-    iput-object v0, p0, Lrx/internal/util/a/b;->bNu:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object v0, p0, Lrx/internal/util/a/b;->bNp: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;->bNv:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object v0, p0, Lrx/internal/util/a/b;->bNq:Ljava/util/concurrent/atomic/AtomicReference;
 
     return-void
 .end method
 
+.method private JT()Lrx/internal/util/a/c;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Lrx/internal/util/a/c<",
+            "TE;>;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lrx/internal/util/a/b;->bNp:Ljava/util/concurrent/atomic/AtomicReference;
+
+    invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lrx/internal/util/a/c;
+
+    return-object v0
+.end method
+
 .method private JV()Lrx/internal/util/a/c;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
@@ -68,28 +89,7 @@
         }
     .end annotation
 
-    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;
-
-    move-result-object v0
-
-    check-cast v0, Lrx/internal/util/a/c;
-
-    return-object v0
-.end method
-
-.method private JX()Lrx/internal/util/a/c;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Lrx/internal/util/a/c<",
-            "TE;>;"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lrx/internal/util/a/b;->bNv:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/internal/util/a/b;->bNq: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 JW()Lrx/internal/util/a/c;
+.method protected final JU()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;->bNu:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/internal/util/a/b;->bNp: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 JY()Lrx/internal/util/a/c;
+.method protected final JW()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;->bNv:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/internal/util/a/b;->bNq: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;->bNu:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/internal/util/a/b;->bNp: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;->bNv:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/internal/util/a/b;->bNq: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;->JX()Lrx/internal/util/a/c;
+    invoke-direct {p0}, Lrx/internal/util/a/b;->JV()Lrx/internal/util/a/c;
 
     move-result-object v0
 
-    invoke-direct {p0}, Lrx/internal/util/a/b;->JV()Lrx/internal/util/a/c;
+    invoke-direct {p0}, Lrx/internal/util/a/b;->JT()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;->JX()Lrx/internal/util/a/c;
+    invoke-direct {p0}, Lrx/internal/util/a/b;->JV()Lrx/internal/util/a/c;
 
     move-result-object v0
 
-    invoke-direct {p0}, Lrx/internal/util/a/b;->JV()Lrx/internal/util/a/c;
+    invoke-direct {p0}, Lrx/internal/util/a/b;->JT()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 66bbab7184..0a47d7b32e 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 JZ()Ljava/lang/Object;
+.method public final JX()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 9ea0eac233..04e0a17da5 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 bNw:Ljava/lang/Integer;
+.field private static final bNr:Ljava/lang/Integer;
 
 
 # instance fields
-.field bNx:J
+.field bNs:J
 
-.field final bNy:I
+.field final bNt: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;->bNw:Ljava/lang/Integer;
+    sput-object v0, Lrx/internal/util/a/d;->bNr: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;->bNw:Ljava/lang/Integer;
+    sget-object v0, Lrx/internal/util/a/d;->bNr: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;->bNy:I
+    iput p1, p0, Lrx/internal/util/a/d;->bNt:I
 
     return-void
 .end method
@@ -139,7 +139,7 @@
 
     if-eqz p1, :cond_2
 
-    iget-object v0, p0, Lrx/internal/util/a/d;->bmX:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v0, p0, Lrx/internal/util/a/d;->bmS: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;->bNx:J
+    iget-wide v5, p0, Lrx/internal/util/a/d;->bNs:J
 
     cmp-long v7, v2, v5
 
     if-ltz v7, :cond_1
 
-    iget v5, p0, Lrx/internal/util/a/d;->bNy:I
+    iget v5, p0, Lrx/internal/util/a/d;->bNt:I
 
     int-to-long v5, v5
 
@@ -175,7 +175,7 @@
 
     if-nez v1, :cond_0
 
-    iput-wide v5, p0, Lrx/internal/util/a/d;->bNx:J
+    iput-wide v5, p0, Lrx/internal/util/a/d;->bNs:J
 
     goto :goto_0
 
@@ -259,7 +259,7 @@
 
     move-result v2
 
-    iget-object v3, p0, Lrx/internal/util/a/d;->bmX:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v3, p0, Lrx/internal/util/a/d;->bmS: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 126fedc805..aecb7316d0 100644
--- a/com.discord/smali_classes2/rx/internal/util/a/f.smali
+++ b/com.discord/smali_classes2/rx/internal/util/a/f.smali
@@ -20,17 +20,19 @@
 
 
 # static fields
-.field private static final bNF:Ljava/lang/Object;
+.field private static final bNA:Ljava/lang/Object;
 
-.field static final bNz:I
+.field static final bNu:I
 
 
 # instance fields
-.field bNA:I
+.field bNs:J
 
-.field bNB:I
+.field bNv:I
 
-.field bNC:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+.field bNw:I
+
+.field bNx:Ljava/util/concurrent/atomic/AtomicReferenceArray;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReferenceArray<",
@@ -40,9 +42,9 @@
     .end annotation
 .end field
 
-.field bND:I
+.field bNy:I
 
-.field bNE:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+.field bNz:Ljava/util/concurrent/atomic/AtomicReferenceArray;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReferenceArray<",
@@ -52,8 +54,6 @@
     .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;->bNz:I
+    sput v0, Lrx/internal/util/a/f;->bNu:I
 
     new-instance v0, Ljava/lang/Object;
 
     invoke-direct {v0}, Ljava/lang/Object;-><init>()V
 
-    sput-object v0, Lrx/internal/util/a/f;->bNF:Ljava/lang/Object;
+    sput-object v0, Lrx/internal/util/a/f;->bNA: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;->bNC:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iput-object v1, p0, Lrx/internal/util/a/f;->bNx:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
-    iput v0, p0, Lrx/internal/util/a/f;->bNB:I
+    iput v0, p0, Lrx/internal/util/a/f;->bNw:I
 
     div-int/lit8 p1, p1, 0x4
 
-    sget v2, Lrx/internal/util/a/f;->bNz:I
+    sget v2, Lrx/internal/util/a/f;->bNu:I
 
     invoke-static {p1, v2}, Ljava/lang/Math;->min(II)I
 
     move-result p1
 
-    iput p1, p0, Lrx/internal/util/a/f;->bNA:I
+    iput p1, p0, Lrx/internal/util/a/f;->bNv:I
 
-    iput-object v1, p0, Lrx/internal/util/a/f;->bNE:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iput-object v1, p0, Lrx/internal/util/a/f;->bNz:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
-    iput v0, p0, Lrx/internal/util/a/f;->bND:I
+    iput v0, p0, Lrx/internal/util/a/f;->bNy:I
 
     add-int/lit8 v0, v0, -0x1
 
     int-to-long v0, v0
 
-    iput-wide v0, p0, Lrx/internal/util/a/f;->bNx:J
+    iput-wide v0, p0, Lrx/internal/util/a/f;->bNs:J
 
     new-instance p1, Ljava/util/concurrent/atomic/AtomicLong;
 
@@ -389,7 +389,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/internal/util/a/f;->bNC:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v0, p0, Lrx/internal/util/a/f;->bNx: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;->bNB:I
+    iget v3, p0, Lrx/internal/util/a/f;->bNw: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;->bNC:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iput-object v7, p0, Lrx/internal/util/a/f;->bNx: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;->bNF:Ljava/lang/Object;
+    sget-object p1, Lrx/internal/util/a/f;->bNA: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;->bNC:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v1, p0, Lrx/internal/util/a/f;->bNx: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;->bNB:I
+    iget v0, p0, Lrx/internal/util/a/f;->bNw:I
 
     long-to-int v2, v3
 
     and-int v5, v2, v0
 
-    iget-wide v6, p0, Lrx/internal/util/a/f;->bNx:J
+    iget-wide v6, p0, Lrx/internal/util/a/f;->bNs:J
 
     cmp-long v2, v3, v6
 
@@ -501,7 +501,7 @@
     return p1
 
     :cond_0
-    iget v2, p0, Lrx/internal/util/a/f;->bNA:I
+    iget v2, p0, Lrx/internal/util/a/f;->bNv:I
 
     int-to-long v6, v2
 
@@ -521,7 +521,7 @@
 
     sub-long/2addr v6, v8
 
-    iput-wide v6, p0, Lrx/internal/util/a/f;->bNx:J
+    iput-wide v6, p0, Lrx/internal/util/a/f;->bNs: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;->bNC:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iput-object v2, p0, Lrx/internal/util/a/f;->bNx:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
     add-long/2addr v3, v10
 
     sub-long/2addr v3, v8
 
-    iput-wide v3, p0, Lrx/internal/util/a/f;->bNx:J
+    iput-wide v3, p0, Lrx/internal/util/a/f;->bNs: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;->bNF:Ljava/lang/Object;
+    sget-object p1, Lrx/internal/util/a/f;->bNA: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;->bNE:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v0, p0, Lrx/internal/util/a/f;->bNz: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;->bND:I
+    iget v3, p0, Lrx/internal/util/a/f;->bNy:I
 
     long-to-int v2, v1
 
@@ -616,7 +616,7 @@
 
     move-result-object v2
 
-    sget-object v3, Lrx/internal/util/a/f;->bNF:Ljava/lang/Object;
+    sget-object v3, Lrx/internal/util/a/f;->bNA: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;->bNE:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iput-object v0, p0, Lrx/internal/util/a/f;->bNz: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;->bNE:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v0, p0, Lrx/internal/util/a/f;->bNz: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;->bND:I
+    iget v3, p0, Lrx/internal/util/a/f;->bNy:I
 
     long-to-int v4, v1
 
@@ -662,7 +662,7 @@
 
     move-result-object v4
 
-    sget-object v5, Lrx/internal/util/a/f;->bNF:Ljava/lang/Object;
+    sget-object v5, Lrx/internal/util/a/f;->bNA: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;->bNE:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iput-object v0, p0, Lrx/internal/util/a/f;->bNz: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 2311c879ab..6207b15fc4 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;->JW()Lrx/internal/util/a/c;
+    invoke-virtual {p0}, Lrx/internal/util/a/g;->JU()Lrx/internal/util/a/c;
 
     move-result-object p1
 
@@ -82,7 +82,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lrx/internal/util/a/g;->JY()Lrx/internal/util/a/c;
+    invoke-virtual {p0}, Lrx/internal/util/a/g;->JW()Lrx/internal/util/a/c;
 
     move-result-object v0
 
@@ -112,7 +112,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lrx/internal/util/a/g;->JY()Lrx/internal/util/a/c;
+    invoke-virtual {p0}, Lrx/internal/util/a/g;->JW()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;->JZ()Ljava/lang/Object;
+    invoke-virtual {v0}, Lrx/internal/util/a/c;->JX()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 cc7cbee240..ce90408a43 100644
--- a/com.discord/smali_classes2/rx/internal/util/a/h.smali
+++ b/com.discord/smali_classes2/rx/internal/util/a/h.smali
@@ -20,17 +20,19 @@
 
 
 # static fields
-.field private static final bNF:Ljava/lang/Object;
+.field private static final bNA:Ljava/lang/Object;
 
-.field static final bNz:I
+.field static final bNu:I
 
 
 # instance fields
-.field bNA:I
+.field bNs:J
 
-.field bNB:I
+.field bNv:I
 
-.field bNC:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+.field bNw:I
+
+.field bNx:Ljava/util/concurrent/atomic/AtomicReferenceArray;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReferenceArray<",
@@ -40,9 +42,9 @@
     .end annotation
 .end field
 
-.field bND:I
+.field bNy:I
 
-.field bNE:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+.field bNz:Ljava/util/concurrent/atomic/AtomicReferenceArray;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReferenceArray<",
@@ -52,8 +54,6 @@
     .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;->bNz:I
+    sput v0, Lrx/internal/util/a/h;->bNu:I
 
     new-instance v0, Ljava/lang/Object;
 
     invoke-direct {v0}, Ljava/lang/Object;-><init>()V
 
-    sput-object v0, Lrx/internal/util/a/h;->bNF:Ljava/lang/Object;
+    sput-object v0, Lrx/internal/util/a/h;->bNA: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;->bNC:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iput-object v1, p0, Lrx/internal/util/a/h;->bNx:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
-    iput v0, p0, Lrx/internal/util/a/h;->bNB:I
+    iput v0, p0, Lrx/internal/util/a/h;->bNw:I
 
     div-int/lit8 p1, p1, 0x4
 
-    sget v2, Lrx/internal/util/a/h;->bNz:I
+    sget v2, Lrx/internal/util/a/h;->bNu:I
 
     invoke-static {p1, v2}, Ljava/lang/Math;->min(II)I
 
     move-result p1
 
-    iput p1, p0, Lrx/internal/util/a/h;->bNA:I
+    iput p1, p0, Lrx/internal/util/a/h;->bNv:I
 
-    iput-object v1, p0, Lrx/internal/util/a/h;->bNE:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iput-object v1, p0, Lrx/internal/util/a/h;->bNz:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
-    iput v0, p0, Lrx/internal/util/a/h;->bND:I
+    iput v0, p0, Lrx/internal/util/a/h;->bNy:I
 
     add-int/lit8 v0, v0, -0x1
 
     int-to-long v0, v0
 
-    iput-wide v0, p0, Lrx/internal/util/a/h;->bNx:J
+    iput-wide v0, p0, Lrx/internal/util/a/h;->bNs:J
 
     const-wide/16 v0, 0x0
 
@@ -376,7 +376,7 @@
 
     if-eqz p1, :cond_3
 
-    iget-object v1, p0, Lrx/internal/util/a/h;->bNC:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v1, p0, Lrx/internal/util/a/h;->bNx: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;->bNB:I
+    iget v0, p0, Lrx/internal/util/a/h;->bNw:I
 
     long-to-int v2, v3
 
     and-int v5, v2, v0
 
-    iget-wide v6, p0, Lrx/internal/util/a/h;->bNx:J
+    iget-wide v6, p0, Lrx/internal/util/a/h;->bNs:J
 
     cmp-long v2, v3, v6
 
@@ -407,7 +407,7 @@
     return p1
 
     :cond_0
-    iget v2, p0, Lrx/internal/util/a/h;->bNA:I
+    iget v2, p0, Lrx/internal/util/a/h;->bNv:I
 
     int-to-long v6, v2
 
@@ -427,7 +427,7 @@
 
     sub-long/2addr v6, v8
 
-    iput-wide v6, p0, Lrx/internal/util/a/h;->bNx:J
+    iput-wide v6, p0, Lrx/internal/util/a/h;->bNs: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;->bNC:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iput-object v2, p0, Lrx/internal/util/a/h;->bNx:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
     add-long/2addr v3, v10
 
     sub-long/2addr v3, v8
 
-    iput-wide v3, p0, Lrx/internal/util/a/h;->bNx:J
+    iput-wide v3, p0, Lrx/internal/util/a/h;->bNs: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;->bNF:Ljava/lang/Object;
+    sget-object p1, Lrx/internal/util/a/h;->bNA: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;->bNE:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v0, p0, Lrx/internal/util/a/h;->bNz: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;->bND:I
+    iget v3, p0, Lrx/internal/util/a/h;->bNy:I
 
     long-to-int v2, v1
 
@@ -535,7 +535,7 @@
 
     move-result-object v2
 
-    sget-object v3, Lrx/internal/util/a/h;->bNF:Ljava/lang/Object;
+    sget-object v3, Lrx/internal/util/a/h;->bNA: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;->bNE:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iput-object v0, p0, Lrx/internal/util/a/h;->bNz: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;->bNE:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v0, p0, Lrx/internal/util/a/h;->bNz: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;->bND:I
+    iget v3, p0, Lrx/internal/util/a/h;->bNy:I
 
     long-to-int v4, v1
 
@@ -581,7 +581,7 @@
 
     move-result-object v4
 
-    sget-object v5, Lrx/internal/util/a/h;->bNF:Ljava/lang/Object;
+    sget-object v5, Lrx/internal/util/a/h;->bNA: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;->bNE:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iput-object v0, p0, Lrx/internal/util/a/h;->bNz: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 565f380bb2..03acd75cef 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 bMN:Lrx/functions/Action1;
+.field final bMI:Lrx/functions/Action1;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/Action1<",
@@ -25,7 +25,7 @@
     .end annotation
 .end field
 
-.field final bMO:Lrx/functions/Action1;
+.field final bMJ:Lrx/functions/Action1;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/Action1<",
@@ -35,7 +35,7 @@
     .end annotation
 .end field
 
-.field final bMP:Lrx/functions/Action0;
+.field final bMK:Lrx/functions/Action0;
 
 
 # direct methods
@@ -56,11 +56,11 @@
 
     invoke-direct {p0}, Lrx/Subscriber;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/util/b;->bMN:Lrx/functions/Action1;
+    iput-object p1, p0, Lrx/internal/util/b;->bMI:Lrx/functions/Action1;
 
-    iput-object p2, p0, Lrx/internal/util/b;->bMO:Lrx/functions/Action1;
+    iput-object p2, p0, Lrx/internal/util/b;->bMJ:Lrx/functions/Action1;
 
-    iput-object p3, p0, Lrx/internal/util/b;->bMP:Lrx/functions/Action0;
+    iput-object p3, p0, Lrx/internal/util/b;->bMK: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;->bMP:Lrx/functions/Action0;
+    iget-object v0, p0, Lrx/internal/util/b;->bMK: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;->bMO:Lrx/functions/Action1;
+    iget-object v0, p0, Lrx/internal/util/b;->bMJ: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;->bMN:Lrx/functions/Action1;
+    iget-object v0, p0, Lrx/internal/util/b;->bMI: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 dd445a4b95..0160342667 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;->JX()Lrx/internal/util/a/c;
+    invoke-virtual {p0}, Lrx/internal/util/b/a;->JV()Lrx/internal/util/a/c;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lrx/internal/util/b/a;->JV()Lrx/internal/util/a/c;
+    invoke-virtual {p0}, Lrx/internal/util/b/a;->JT()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;->JX()Lrx/internal/util/a/c;
+    invoke-virtual {p0}, Lrx/internal/util/b/a;->JV()Lrx/internal/util/a/c;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lrx/internal/util/b/a;->JV()Lrx/internal/util/a/c;
+    invoke-virtual {p0}, Lrx/internal/util/b/a;->JT()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 25f1b7a093..74538dbb81 100644
--- a/com.discord/smali_classes2/rx/internal/util/b/ac.smali
+++ b/com.discord/smali_classes2/rx/internal/util/b/ac.smali
@@ -16,11 +16,9 @@
 
 
 # instance fields
-.field protected bNA:I
+.field protected bNN:J
 
-.field protected bNS:J
-
-.field protected bNT:[Ljava/lang/Object;
+.field protected bNO:[Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "[TE;"
@@ -28,7 +26,9 @@
     .end annotation
 .end field
 
-.field protected bNx:J
+.field protected bNs:J
+
+.field protected bNv:I
 
 
 # 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 5e5e2a0a98..8e3b52a3bb 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 bNU:Lsun/misc/Unsafe;
+.field public static final bNP:Lsun/misc/Unsafe;
 
-.field private static final bNV:Z
+.field private static final bNQ:Z
 
 
 # direct methods
@@ -31,7 +31,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    sput-boolean v0, Lrx/internal/util/b/ae;->bNV:Z
+    sput-boolean v0, Lrx/internal/util/b/ae;->bNQ:Z
 
     const/4 v0, 0x0
 
@@ -57,19 +57,19 @@
     move-object v0, v1
 
     :catchall_0
-    sput-object v0, Lrx/internal/util/b/ae;->bNU:Lsun/misc/Unsafe;
+    sput-object v0, Lrx/internal/util/b/ae;->bNP:Lsun/misc/Unsafe;
 
     return-void
 .end method
 
-.method public static Kd()Z
+.method public static Kb()Z
     .locals 1
 
-    sget-object v0, Lrx/internal/util/b/ae;->bNU:Lsun/misc/Unsafe;
+    sget-object v0, Lrx/internal/util/b/ae;->bNP:Lsun/misc/Unsafe;
 
     if-eqz v0, :cond_0
 
-    sget-boolean v0, Lrx/internal/util/b/ae;->bNV:Z
+    sget-boolean v0, Lrx/internal/util/b/ae;->bNQ:Z
 
     if-nez v0, :cond_0
 
@@ -100,7 +100,7 @@
 
     move-result-object p0
 
-    sget-object p1, Lrx/internal/util/b/ae;->bNU:Lsun/misc/Unsafe;
+    sget-object p1, Lrx/internal/util/b/ae;->bNP: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 b4c944fa32..ffe35f0557 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 bNG:J
+.field protected static final bNB:J
 
 
 # instance fields
@@ -42,7 +42,7 @@
 
     move-result-wide v0
 
-    sput-wide v0, Lrx/internal/util/b/b;->bNG:J
+    sput-wide v0, Lrx/internal/util/b/b;->bNB:J
 
     return-void
 .end method
@@ -57,7 +57,7 @@
 
 
 # virtual methods
-.method protected final JX()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;->bNU:Lsun/misc/Unsafe;
+    sget-object v0, Lrx/internal/util/b/ae;->bNP:Lsun/misc/Unsafe;
 
-    sget-wide v1, Lrx/internal/util/b/b;->bNG:J
+    sget-wide v1, Lrx/internal/util/b/b;->bNB: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 d1ed6cda43..20b93c0315 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 bNH:J
+.field protected static final bNC:J
 
 
 # instance fields
@@ -42,7 +42,7 @@
 
     move-result-wide v0
 
-    sput-wide v0, Lrx/internal/util/b/e;->bNH:J
+    sput-wide v0, Lrx/internal/util/b/e;->bNC:J
 
     return-void
 .end method
@@ -57,7 +57,7 @@
 
 
 # virtual methods
-.method protected final JV()Lrx/internal/util/a/c;
+.method protected final JT()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;->bNU:Lsun/misc/Unsafe;
+    sget-object v0, Lrx/internal/util/b/ae;->bNP:Lsun/misc/Unsafe;
 
-    sget-wide v1, Lrx/internal/util/b/e;->bNH:J
+    sget-wide v1, Lrx/internal/util/b/e;->bNC: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 3efbc337c9..fd5d651728 100644
--- a/com.discord/smali_classes2/rx/internal/util/b/f.smali
+++ b/com.discord/smali_classes2/rx/internal/util/b/f.smali
@@ -16,17 +16,17 @@
 
 
 # static fields
-.field protected static final bNI:I
+.field protected static final bND:I
 
-.field private static final bNJ:J
+.field private static final bNE:J
 
-.field private static final bNK:I
+.field private static final bNF:I
 
 
 # instance fields
-.field protected final bNL:J
+.field protected final bNG:J
 
-.field protected final bNM:[Ljava/lang/Object;
+.field protected final bNH:[Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "[TE;"
@@ -51,9 +51,9 @@
 
     move-result v0
 
-    sput v0, Lrx/internal/util/b/f;->bNI:I
+    sput v0, Lrx/internal/util/b/f;->bND:I
 
-    sget-object v0, Lrx/internal/util/b/ae;->bNU:Lsun/misc/Unsafe;
+    sget-object v0, Lrx/internal/util/b/ae;->bNP: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;->bNI:I
+    sget v0, Lrx/internal/util/b/f;->bND:I
 
     add-int/lit8 v0, v0, 0x2
 
-    sput v0, Lrx/internal/util/b/f;->bNK:I
+    sput v0, Lrx/internal/util/b/f;->bNF:I
 
     goto :goto_0
 
@@ -78,14 +78,14 @@
 
     if-ne v1, v0, :cond_1
 
-    sget v0, Lrx/internal/util/b/f;->bNI:I
+    sget v0, Lrx/internal/util/b/f;->bND:I
 
     add-int/lit8 v0, v0, 0x3
 
-    sput v0, Lrx/internal/util/b/f;->bNK:I
+    sput v0, Lrx/internal/util/b/f;->bNF:I
 
     :goto_0
-    sget-object v0, Lrx/internal/util/b/ae;->bNU:Lsun/misc/Unsafe;
+    sget-object v0, Lrx/internal/util/b/ae;->bNP:Lsun/misc/Unsafe;
 
     const-class v1, [Ljava/lang/Object;
 
@@ -95,9 +95,9 @@
 
     const/16 v1, 0x20
 
-    sget v2, Lrx/internal/util/b/f;->bNK:I
+    sget v2, Lrx/internal/util/b/f;->bNF:I
 
-    sget v3, Lrx/internal/util/b/f;->bNI:I
+    sget v3, Lrx/internal/util/b/f;->bND:I
 
     sub-int/2addr v2, v3
 
@@ -107,7 +107,7 @@
 
     int-to-long v0, v0
 
-    sput-wide v0, Lrx/internal/util/b/f;->bNJ:J
+    sput-wide v0, Lrx/internal/util/b/f;->bNE:J
 
     return-void
 
@@ -134,9 +134,9 @@
 
     int-to-long v0, v0
 
-    iput-wide v0, p0, Lrx/internal/util/b/f;->bNL:J
+    iput-wide v0, p0, Lrx/internal/util/b/f;->bNG:J
 
-    sget v0, Lrx/internal/util/b/f;->bNI:I
+    sget v0, Lrx/internal/util/b/f;->bND: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;->bNM:[Ljava/lang/Object;
+    iput-object p1, p0, Lrx/internal/util/b/f;->bNH:[Ljava/lang/Object;
 
     return-void
 .end method
@@ -159,7 +159,7 @@
         }
     .end annotation
 
-    sget-object v0, Lrx/internal/util/b/ae;->bNU:Lsun/misc/Unsafe;
+    sget-object v0, Lrx/internal/util/b/ae;->bNP: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;->bNU:Lsun/misc/Unsafe;
+    sget-object v0, Lrx/internal/util/b/ae;->bNP: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;->bNL:J
+    iget-wide v0, p0, Lrx/internal/util/b/f;->bNG:J
 
-    sget-wide v2, Lrx/internal/util/b/f;->bNJ:J
+    sget-wide v2, Lrx/internal/util/b/f;->bNE:J
 
     and-long/2addr p1, v0
 
-    sget v0, Lrx/internal/util/b/f;->bNK:I
+    sget v0, Lrx/internal/util/b/f;->bNF:I
 
     shl-long/2addr p1, v0
 
@@ -211,7 +211,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/internal/util/b/f;->bNM:[Ljava/lang/Object;
+    iget-object v0, p0, Lrx/internal/util/b/f;->bNH:[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 31c151f80b..6b968e1c70 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;->Ka()J
+    invoke-virtual {p0}, Lrx/internal/util/b/i;->JY()J
 
     move-result-wide v0
 
-    invoke-virtual {p0}, Lrx/internal/util/b/i;->Kb()J
+    invoke-virtual {p0}, Lrx/internal/util/b/i;->JZ()J
 
     move-result-wide v2
 
@@ -61,11 +61,11 @@
 
     if-eqz p1, :cond_2
 
-    iget-object v0, p0, Lrx/internal/util/b/i;->bNM:[Ljava/lang/Object;
+    iget-object v0, p0, Lrx/internal/util/b/i;->bNH:[Ljava/lang/Object;
 
-    iget-wide v1, p0, Lrx/internal/util/b/i;->bNL:J
+    iget-wide v1, p0, Lrx/internal/util/b/i;->bNG:J
 
-    invoke-virtual {p0}, Lrx/internal/util/b/i;->Kb()J
+    invoke-virtual {p0}, Lrx/internal/util/b/i;->JZ()J
 
     move-result-wide v3
 
@@ -79,7 +79,7 @@
 
     if-eqz v7, :cond_1
 
-    invoke-virtual {p0}, Lrx/internal/util/b/i;->Ka()J
+    invoke-virtual {p0}, Lrx/internal/util/b/i;->JY()J
 
     move-result-wide v7
 
@@ -101,7 +101,7 @@
     if-nez v1, :cond_0
 
     :cond_1
-    sget-object v1, Lrx/internal/util/b/ae;->bNU:Lsun/misc/Unsafe;
+    sget-object v1, Lrx/internal/util/b/ae;->bNP: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;->Kc()J
+    invoke-virtual {p0}, Lrx/internal/util/b/i;->Ka()J
 
     move-result-wide v0
 
     :cond_0
-    invoke-virtual {p0}, Lrx/internal/util/b/i;->Ka()J
+    invoke-virtual {p0}, Lrx/internal/util/b/i;->JY()J
 
     move-result-wide v2
 
@@ -152,7 +152,7 @@
 
     if-ltz v4, :cond_2
 
-    invoke-virtual {p0}, Lrx/internal/util/b/i;->Kb()J
+    invoke-virtual {p0}, Lrx/internal/util/b/i;->JZ()J
 
     move-result-wide v4
 
@@ -189,12 +189,12 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lrx/internal/util/b/i;->Kc()J
+    invoke-virtual {p0}, Lrx/internal/util/b/i;->Ka()J
 
     move-result-wide v0
 
     :cond_0
-    invoke-virtual {p0}, Lrx/internal/util/b/i;->Ka()J
+    invoke-virtual {p0}, Lrx/internal/util/b/i;->JY()J
 
     move-result-wide v2
 
@@ -204,7 +204,7 @@
 
     if-ltz v5, :cond_2
 
-    invoke-virtual {p0}, Lrx/internal/util/b/i;->Kb()J
+    invoke-virtual {p0}, Lrx/internal/util/b/i;->JZ()J
 
     move-result-wide v5
 
@@ -232,9 +232,9 @@
 
     move-result-wide v0
 
-    iget-object v2, p0, Lrx/internal/util/b/i;->bNM:[Ljava/lang/Object;
+    iget-object v2, p0, Lrx/internal/util/b/i;->bNH:[Ljava/lang/Object;
 
-    sget-object v3, Lrx/internal/util/b/ae;->bNU:Lsun/misc/Unsafe;
+    sget-object v3, Lrx/internal/util/b/ae;->bNP: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;->Ka()J
+    invoke-virtual {p0}, Lrx/internal/util/b/i;->JY()J
 
     move-result-wide v0
 
     :goto_0
-    invoke-virtual {p0}, Lrx/internal/util/b/i;->Kb()J
+    invoke-virtual {p0}, Lrx/internal/util/b/i;->JZ()J
 
     move-result-wide v2
 
-    invoke-virtual {p0}, Lrx/internal/util/b/i;->Ka()J
+    invoke-virtual {p0}, Lrx/internal/util/b/i;->JY()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 21a5a65dec..c12823a533 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 bNN:J
+.field protected static final bNI:J
 
 
 # instance fields
@@ -35,7 +35,7 @@
 
     move-result-wide v0
 
-    sput-wide v0, Lrx/internal/util/b/j;->bNN:J
+    sput-wide v0, Lrx/internal/util/b/j;->bNI:J
 
     return-void
 .end method
@@ -50,7 +50,7 @@
 
 
 # virtual methods
-.method protected final Ka()J
+.method protected final JY()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;->bNU:Lsun/misc/Unsafe;
+    sget-object v0, Lrx/internal/util/b/ae;->bNP:Lsun/misc/Unsafe;
 
-    sget-wide v2, Lrx/internal/util/b/j;->bNN:J
+    sget-wide v2, Lrx/internal/util/b/j;->bNI: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 6248233921..fe4ea6fd34 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 bNO:J
+.field protected static final bNJ:J
 
 
 # instance fields
@@ -35,7 +35,7 @@
 
     move-result-wide v0
 
-    sput-wide v0, Lrx/internal/util/b/o;->bNO:J
+    sput-wide v0, Lrx/internal/util/b/o;->bNJ:J
 
     return-void
 .end method
@@ -50,7 +50,7 @@
 
 
 # virtual methods
-.method protected final Kb()J
+.method protected final JZ()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;->bNU:Lsun/misc/Unsafe;
+    sget-object v0, Lrx/internal/util/b/ae;->bNP:Lsun/misc/Unsafe;
 
-    sget-wide v2, Lrx/internal/util/b/o;->bNO:J
+    sget-wide v2, Lrx/internal/util/b/o;->bNJ: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 c9e84142a8..274c2a5930 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 bNP:J
+.field private volatile bNK:J
 
 
 # direct methods
@@ -30,10 +30,10 @@
 
 
 # virtual methods
-.method protected final Kc()J
+.method protected final Ka()J
     .locals 2
 
-    iget-wide v0, p0, Lrx/internal/util/b/p;->bNP:J
+    iget-wide v0, p0, Lrx/internal/util/b/p;->bNK: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;->bNP:J
+    iput-wide p1, p0, Lrx/internal/util/b/p;->bNK: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 e91d639f17..c4b6c27104 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 Ka()J
+.method private JY()J
     .locals 3
 
-    sget-object v0, Lrx/internal/util/b/ae;->bNU:Lsun/misc/Unsafe;
+    sget-object v0, Lrx/internal/util/b/ae;->bNP:Lsun/misc/Unsafe;
 
-    sget-wide v1, Lrx/internal/util/b/q;->bNN:J
+    sget-wide v1, Lrx/internal/util/b/q;->bNI: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 Kb()J
+.method private JZ()J
     .locals 3
 
-    sget-object v0, Lrx/internal/util/b/ae;->bNU:Lsun/misc/Unsafe;
+    sget-object v0, Lrx/internal/util/b/ae;->bNP:Lsun/misc/Unsafe;
 
-    sget-wide v1, Lrx/internal/util/b/q;->bNO:J
+    sget-wide v1, Lrx/internal/util/b/q;->bNJ: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;->Kb()J
+    invoke-direct {p0}, Lrx/internal/util/b/q;->JZ()J
 
     move-result-wide v0
 
-    invoke-direct {p0}, Lrx/internal/util/b/q;->Ka()J
+    invoke-direct {p0}, Lrx/internal/util/b/q;->JY()J
 
     move-result-wide v2
 
@@ -89,7 +89,7 @@
 
     if-eqz p1, :cond_1
 
-    iget-object v0, p0, Lrx/internal/util/b/q;->bNM:[Ljava/lang/Object;
+    iget-object v0, p0, Lrx/internal/util/b/q;->bNH:[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;->bNU:Lsun/misc/Unsafe;
+    sget-object v5, Lrx/internal/util/b/ae;->bNP:Lsun/misc/Unsafe;
 
-    sget-wide v7, Lrx/internal/util/b/q;->bNO:J
+    sget-wide v7, Lrx/internal/util/b/q;->bNJ:J
 
     move-object v6, p0
 
@@ -171,7 +171,7 @@
 
     move-result-wide v2
 
-    iget-object v4, p0, Lrx/internal/util/b/q;->bNM:[Ljava/lang/Object;
+    iget-object v4, p0, Lrx/internal/util/b/q;->bNH:[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;->bNU:Lsun/misc/Unsafe;
+    sget-object v6, Lrx/internal/util/b/ae;->bNP:Lsun/misc/Unsafe;
 
-    sget-wide v8, Lrx/internal/util/b/q;->bNN:J
+    sget-wide v8, Lrx/internal/util/b/q;->bNI:J
 
     move-object v7, p0
 
@@ -204,16 +204,16 @@
 .method public final size()I
     .locals 7
 
-    invoke-direct {p0}, Lrx/internal/util/b/q;->Ka()J
+    invoke-direct {p0}, Lrx/internal/util/b/q;->JY()J
 
     move-result-wide v0
 
     :goto_0
-    invoke-direct {p0}, Lrx/internal/util/b/q;->Kb()J
+    invoke-direct {p0}, Lrx/internal/util/b/q;->JZ()J
 
     move-result-wide v2
 
-    invoke-direct {p0}, Lrx/internal/util/b/q;->Ka()J
+    invoke-direct {p0}, Lrx/internal/util/b/q;->JY()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 37a38a946f..675066d9f2 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 bNw:Ljava/lang/Integer;
+.field private static final bNr:Ljava/lang/Integer;
 
 
 # instance fields
-.field protected final bNy:I
+.field protected final bNt:I
 
 
 # direct methods
@@ -35,7 +35,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lrx/internal/util/b/r;->bNw:Ljava/lang/Integer;
+    sput-object v0, Lrx/internal/util/b/r;->bNr: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;->bNw:Ljava/lang/Integer;
+    sget-object v0, Lrx/internal/util/b/r;->bNr: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;->bNy:I
+    iput p1, p0, Lrx/internal/util/b/r;->bNt: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 52c6db0474..69da54d6b3 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 bNN:J
+.field protected static final bNI:J
 
 
 # instance fields
@@ -35,7 +35,7 @@
 
     move-result-wide v0
 
-    sput-wide v0, Lrx/internal/util/b/s;->bNN:J
+    sput-wide v0, Lrx/internal/util/b/s;->bNI: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 1fee694eb3..6a333fc99f 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 bNO:J
+.field protected static final bNJ:J
 
 
 # instance fields
@@ -35,7 +35,7 @@
 
     move-result-wide v0
 
-    sput-wide v0, Lrx/internal/util/b/w;->bNO:J
+    sput-wide v0, Lrx/internal/util/b/w;->bNJ: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 a52a222f7a..cc18680788 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;->JZ()Ljava/lang/Object;
+    invoke-virtual {v0}, Lrx/internal/util/a/c;->JX()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 013928d199..fe63257060 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 bNF:Ljava/lang/Object;
+.field private static final bNA:Ljava/lang/Object;
+
+.field private static final bNE:J
+
+.field private static final bNF:I
+
+.field private static final bNI:J
 
 .field private static final bNJ:J
 
-.field private static final bNK:I
-
-.field private static final bNN:J
-
-.field private static final bNO:J
-
-.field static final bNz:I
+.field static final bNu:I
 
 
 # direct methods
@@ -45,15 +45,15 @@
 
     move-result v0
 
-    sput v0, Lrx/internal/util/b/y;->bNz:I
+    sput v0, Lrx/internal/util/b/y;->bNu:I
 
     new-instance v0, Ljava/lang/Object;
 
     invoke-direct {v0}, Ljava/lang/Object;-><init>()V
 
-    sput-object v0, Lrx/internal/util/b/y;->bNF:Ljava/lang/Object;
+    sput-object v0, Lrx/internal/util/b/y;->bNA:Ljava/lang/Object;
 
-    sget-object v0, Lrx/internal/util/b/ae;->bNU:Lsun/misc/Unsafe;
+    sget-object v0, Lrx/internal/util/b/ae;->bNP:Lsun/misc/Unsafe;
 
     const-class v1, [Ljava/lang/Object;
 
@@ -67,7 +67,7 @@
 
     const/4 v0, 0x2
 
-    sput v0, Lrx/internal/util/b/y;->bNK:I
+    sput v0, Lrx/internal/util/b/y;->bNF:I
 
     goto :goto_0
 
@@ -78,10 +78,10 @@
 
     const/4 v0, 0x3
 
-    sput v0, Lrx/internal/util/b/y;->bNK:I
+    sput v0, Lrx/internal/util/b/y;->bNF:I
 
     :goto_0
-    sget-object v0, Lrx/internal/util/b/ae;->bNU:Lsun/misc/Unsafe;
+    sget-object v0, Lrx/internal/util/b/ae;->bNP: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;->bNJ:J
+    sput-wide v0, Lrx/internal/util/b/y;->bNE: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;->bNU:Lsun/misc/Unsafe;
+    sget-object v1, Lrx/internal/util/b/ae;->bNP: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;->bNO:J
+    sput-wide v0, Lrx/internal/util/b/y;->bNJ: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;->bNU:Lsun/misc/Unsafe;
+    sget-object v1, Lrx/internal/util/b/ae;->bNP: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;->bNN:J
+    sput-wide v0, Lrx/internal/util/b/y;->bNI: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;->bNT:[Ljava/lang/Object;
+    iput-object v2, p0, Lrx/internal/util/b/y;->bNO:[Ljava/lang/Object;
 
-    iput-wide v0, p0, Lrx/internal/util/b/y;->bNS:J
+    iput-wide v0, p0, Lrx/internal/util/b/y;->bNN:J
 
     div-int/lit8 p1, p1, 0x4
 
-    sget v3, Lrx/internal/util/b/y;->bNz:I
+    sget v3, Lrx/internal/util/b/y;->bNu:I
 
     invoke-static {p1, v3}, Ljava/lang/Math;->min(II)I
 
     move-result p1
 
-    iput p1, p0, Lrx/internal/util/b/y;->bNA:I
+    iput p1, p0, Lrx/internal/util/b/y;->bNv:I
 
-    iput-object v2, p0, Lrx/internal/util/b/y;->bNR:[Ljava/lang/Object;
+    iput-object v2, p0, Lrx/internal/util/b/y;->bNM:[Ljava/lang/Object;
 
-    iput-wide v0, p0, Lrx/internal/util/b/y;->bNQ:J
+    iput-wide v0, p0, Lrx/internal/util/b/y;->bNL:J
 
     const-wide/16 v2, 0x1
 
     sub-long/2addr v0, v2
 
-    iput-wide v0, p0, Lrx/internal/util/b/y;->bNx:J
+    iput-wide v0, p0, Lrx/internal/util/b/y;->bNs:J
 
     const-wide/16 v0, 0x0
 
@@ -215,12 +215,12 @@
     return-void
 .end method
 
-.method private Ka()J
+.method private JY()J
     .locals 3
 
-    sget-object v0, Lrx/internal/util/b/ae;->bNU:Lsun/misc/Unsafe;
+    sget-object v0, Lrx/internal/util/b/ae;->bNP:Lsun/misc/Unsafe;
 
-    sget-wide v1, Lrx/internal/util/b/y;->bNN:J
+    sget-wide v1, Lrx/internal/util/b/y;->bNI: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;->bNU:Lsun/misc/Unsafe;
+    sget-object v0, Lrx/internal/util/b/ae;->bNP: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;->bNU:Lsun/misc/Unsafe;
+    sget-object v0, Lrx/internal/util/b/ae;->bNP: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;->bNU:Lsun/misc/Unsafe;
+    sget-object v0, Lrx/internal/util/b/ae;->bNP:Lsun/misc/Unsafe;
 
-    sget-wide v2, Lrx/internal/util/b/y;->bNO:J
+    sget-wide v2, Lrx/internal/util/b/y;->bNJ:J
 
     move-object v1, p0
 
@@ -299,9 +299,9 @@
 .method private aU(J)V
     .locals 6
 
-    sget-object v0, Lrx/internal/util/b/ae;->bNU:Lsun/misc/Unsafe;
+    sget-object v0, Lrx/internal/util/b/ae;->bNP:Lsun/misc/Unsafe;
 
-    sget-wide v2, Lrx/internal/util/b/y;->bNN:J
+    sget-wide v2, Lrx/internal/util/b/y;->bNI: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;->bNJ:J
+    sget-wide v0, Lrx/internal/util/b/y;->bNE:J
 
-    sget v2, Lrx/internal/util/b/y;->bNK:I
+    sget v2, Lrx/internal/util/b/y;->bNF:I
 
     shl-long/2addr p0, v2
 
@@ -388,11 +388,11 @@
 
     if-eqz v2, :cond_3
 
-    iget-object v1, v7, Lrx/internal/util/b/y;->bNT:[Ljava/lang/Object;
+    iget-object v1, v7, Lrx/internal/util/b/y;->bNO:[Ljava/lang/Object;
 
     iget-wide v3, v7, Lrx/internal/util/b/y;->producerIndex:J
 
-    iget-wide v5, v7, Lrx/internal/util/b/y;->bNS:J
+    iget-wide v5, v7, Lrx/internal/util/b/y;->bNN:J
 
     and-long v8, v3, v5
 
@@ -400,7 +400,7 @@
 
     move-result-wide v8
 
-    iget-wide v10, v7, Lrx/internal/util/b/y;->bNx:J
+    iget-wide v10, v7, Lrx/internal/util/b/y;->bNs:J
 
     cmp-long v0, v3, v10
 
@@ -419,7 +419,7 @@
     return v0
 
     :cond_0
-    iget v0, v7, Lrx/internal/util/b/y;->bNA:I
+    iget v0, v7, Lrx/internal/util/b/y;->bNv:I
 
     int-to-long v10, v0
 
@@ -441,7 +441,7 @@
 
     sub-long/2addr v10, v12
 
-    iput-wide v10, v7, Lrx/internal/util/b/y;->bNx:J
+    iput-wide v10, v7, Lrx/internal/util/b/y;->bNs: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;->bNT:[Ljava/lang/Object;
+    iput-object v0, v7, Lrx/internal/util/b/y;->bNO:[Ljava/lang/Object;
 
     add-long/2addr v3, v5
 
     sub-long/2addr v3, v12
 
-    iput-wide v3, v7, Lrx/internal/util/b/y;->bNx:J
+    iput-wide v3, v7, Lrx/internal/util/b/y;->bNs: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;->bNF:Ljava/lang/Object;
+    sget-object v0, Lrx/internal/util/b/y;->bNA: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;->bNR:[Ljava/lang/Object;
+    iget-object v0, p0, Lrx/internal/util/b/y;->bNM:[Ljava/lang/Object;
 
     iget-wide v1, p0, Lrx/internal/util/b/y;->consumerIndex:J
 
-    iget-wide v3, p0, Lrx/internal/util/b/y;->bNQ:J
+    iget-wide v3, p0, Lrx/internal/util/b/y;->bNL:J
 
     and-long/2addr v1, v3
 
@@ -555,7 +555,7 @@
 
     move-result-object v3
 
-    sget-object v4, Lrx/internal/util/b/y;->bNF:Ljava/lang/Object;
+    sget-object v4, Lrx/internal/util/b/y;->bNA: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;->bNR:[Ljava/lang/Object;
+    iput-object v0, p0, Lrx/internal/util/b/y;->bNM:[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;->bNR:[Ljava/lang/Object;
+    iget-object v0, p0, Lrx/internal/util/b/y;->bNM:[Ljava/lang/Object;
 
     iget-wide v1, p0, Lrx/internal/util/b/y;->consumerIndex:J
 
-    iget-wide v3, p0, Lrx/internal/util/b/y;->bNQ:J
+    iget-wide v3, p0, Lrx/internal/util/b/y;->bNL:J
 
     and-long/2addr v3, v1
 
@@ -603,7 +603,7 @@
 
     move-result-object v7
 
-    sget-object v8, Lrx/internal/util/b/y;->bNF:Ljava/lang/Object;
+    sget-object v8, Lrx/internal/util/b/y;->bNA: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;->bNR:[Ljava/lang/Object;
+    iput-object v0, p0, Lrx/internal/util/b/y;->bNM:[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;->Ka()J
+    invoke-direct {p0}, Lrx/internal/util/b/y;->JY()J
 
     move-result-wide v0
 
     :goto_0
-    sget-object v2, Lrx/internal/util/b/ae;->bNU:Lsun/misc/Unsafe;
+    sget-object v2, Lrx/internal/util/b/ae;->bNP:Lsun/misc/Unsafe;
 
-    sget-wide v3, Lrx/internal/util/b/y;->bNO:J
+    sget-wide v3, Lrx/internal/util/b/y;->bNJ: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;->Ka()J
+    invoke-direct {p0}, Lrx/internal/util/b/y;->JY()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 788ff0bd7b..074ffeb1b1 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 bNQ:J
+.field protected bNL:J
 
-.field protected bNR:[Ljava/lang/Object;
+.field protected bNM:[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 4800b4e741..949c9e045f 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 Ji()V
+.method public final Jg()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;->Ji()V
+    invoke-virtual {p0}, Lrx/internal/util/c;->Jg()V
 
     :cond_0
     return-void
@@ -390,7 +390,7 @@
     :cond_4
     if-eqz v5, :cond_5
 
-    invoke-virtual {p0}, Lrx/internal/util/c;->Ji()V
+    invoke-virtual {p0}, Lrx/internal/util/c;->Jg()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 30d0ca0de2..2b3d2fea3e 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 bMQ:Ljava/lang/Throwable;
+.field private static final bML:Ljava/lang/Throwable;
 
-.field private static final synthetic bMR:[Lrx/internal/util/e;
+.field private static final synthetic bMM:[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;->bMR:[Lrx/internal/util/e;
+    sput-object v0, Lrx/internal/util/e;->bMM:[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;->bMQ:Ljava/lang/Throwable;
+    sput-object v0, Lrx/internal/util/e;->bML: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;->bMQ:Ljava/lang/Throwable;
+    sget-object v0, Lrx/internal/util/e;->bML: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;->bMQ:Ljava/lang/Throwable;
+    sget-object v1, Lrx/internal/util/e;->bML:Ljava/lang/Throwable;
 
     const/4 v2, 0x0
 
@@ -160,7 +160,7 @@
 
     check-cast v0, Ljava/lang/Throwable;
 
-    sget-object v1, Lrx/internal/util/e;->bMQ:Ljava/lang/Throwable;
+    sget-object v1, Lrx/internal/util/e;->bML: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;->bMR:[Lrx/internal/util/e;
+    sget-object v0, Lrx/internal/util/e;->bMM:[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 865db96fe5..4f66553790 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 bNb:Lrx/functions/b;
+.field final bMW: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;->bNb:Lrx/functions/b;
+    iput-object p1, p0, Lrx/internal/util/f$f;->bMW: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;->bNb:Lrx/functions/b;
+    iget-object v0, p0, Lrx/internal/util/f$f;->bMW:Lrx/functions/b;
 
-    sget-object v1, Lrx/internal/util/f;->bMV:Lrx/internal/util/f$h;
+    sget-object v1, Lrx/internal/util/f;->bMQ: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 e89db08db3..93ad29ab2a 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 bNb:Lrx/functions/b;
+.field final bMW: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;->bNb:Lrx/functions/b;
+    iput-object p1, p0, Lrx/internal/util/f$g;->bMW: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;->bNb:Lrx/functions/b;
+    iget-object v0, p0, Lrx/internal/util/f$g;->bMW:Lrx/functions/b;
 
-    sget-object v1, Lrx/internal/util/f;->bMX:Lrx/internal/util/f$b;
+    sget-object v1, Lrx/internal/util/f;->bMS: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 27ef0507e5..b9ff057525 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 bMS:Lrx/internal/util/f$e;
+.field public static final bMN:Lrx/internal/util/f$e;
 
-.field public static final bMT:Lrx/internal/util/f$c;
+.field public static final bMO:Lrx/internal/util/f$c;
 
-.field public static final bMU:Lrx/internal/util/f$i;
+.field public static final bMP:Lrx/internal/util/f$i;
 
-.field static final bMV:Lrx/internal/util/f$h;
+.field static final bMQ:Lrx/internal/util/f$h;
 
-.field public static final bMW:Lrx/internal/util/f$d;
+.field public static final bMR:Lrx/internal/util/f$d;
 
-.field static final bMX:Lrx/internal/util/f$b;
+.field static final bMS:Lrx/internal/util/f$b;
 
-.field public static final bMY:Lrx/functions/Action1;
+.field public static final bMT:Lrx/functions/Action1;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/Action1<",
@@ -50,7 +50,7 @@
     .end annotation
 .end field
 
-.field public static final bMZ:Lrx/Observable$b;
+.field public static final bMU: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 bNa:[Lrx/internal/util/f;
+.field private static final synthetic bMV:[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;->bNa:[Lrx/internal/util/f;
+    sput-object v0, Lrx/internal/util/f;->bMV:[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;->bMS:Lrx/internal/util/f$e;
+    sput-object v0, Lrx/internal/util/f;->bMN: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;->bMT:Lrx/internal/util/f$c;
+    sput-object v0, Lrx/internal/util/f;->bMO: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;->bMU:Lrx/internal/util/f$i;
+    sput-object v0, Lrx/internal/util/f;->bMP: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;->bMV:Lrx/internal/util/f$h;
+    sput-object v0, Lrx/internal/util/f;->bMQ: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;->bMW:Lrx/internal/util/f$d;
+    sput-object v0, Lrx/internal/util/f;->bMR: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;->bMX:Lrx/internal/util/f$b;
+    sput-object v0, Lrx/internal/util/f;->bMS: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;->bMY:Lrx/functions/Action1;
+    sput-object v0, Lrx/internal/util/f;->bMT:Lrx/functions/Action1;
 
     new-instance v0, Lrx/internal/a/aa;
 
-    sget-object v1, Lrx/internal/util/l$a;->bNq:Lrx/internal/util/l$a;
+    sget-object v1, Lrx/internal/util/l$a;->bNl: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;->bMZ:Lrx/Observable$b;
+    sput-object v0, Lrx/internal/util/f;->bMU: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;->bNa:[Lrx/internal/util/f;
+    sget-object v0, Lrx/internal/util/f;->bMV:[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 422c006fcb..872dea6d9b 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 bNc:[Ljava/lang/Object;
+.field public bMX:[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;->bNc:[Ljava/lang/Object;
+    iput-object p1, p0, Lrx/internal/util/g;->bMX:[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 32b09a27d3..d460e99f79 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 bNd:I
+.field private static final bMY:I
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    invoke-static {}, Lrx/internal/util/h;->JS()I
+    invoke-static {}, Lrx/internal/util/h;->JQ()I
 
     move-result v0
 
-    sput v0, Lrx/internal/util/h;->bNd:I
+    sput v0, Lrx/internal/util/h;->bMY:I
 
     if-eqz v0, :cond_0
 
@@ -34,7 +34,7 @@
     return-void
 .end method
 
-.method public static JQ()Z
+.method public static JO()Z
     .locals 1
 
     sget-boolean v0, Lrx/internal/util/h;->IS_ANDROID:Z
@@ -42,15 +42,15 @@
     return v0
 .end method
 
-.method public static JR()I
+.method public static JP()I
     .locals 1
 
-    sget v0, Lrx/internal/util/h;->bNd:I
+    sget v0, Lrx/internal/util/h;->bMY:I
 
     return v0
 .end method
 
-.method private static JS()I
+.method private static JQ()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 1a3f42b245..03b0c3590a 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 bNf:I
+.field public static final bNa:I
 
 
 # instance fields
-.field public volatile bNe:Ljava/lang/Object;
+.field public volatile bMZ: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;->JQ()Z
+    invoke-static {}, Lrx/internal/util/h;->JO()Z
 
     move-result v0
 
@@ -92,7 +92,7 @@
 
     :cond_1
     :goto_1
-    sput v0, Lrx/internal/util/i;->bNf:I
+    sput v0, Lrx/internal/util/i;->bNa:I
 
     return-void
 .end method
@@ -102,11 +102,11 @@
 
     new-instance v0, Lrx/internal/util/a/d;
 
-    sget v1, Lrx/internal/util/i;->bNf:I
+    sget v1, Lrx/internal/util/i;->bNa:I
 
     invoke-direct {v0, v1}, Lrx/internal/util/a/d;-><init>(I)V
 
-    sget v1, Lrx/internal/util/i;->bNf:I
+    sget v1, Lrx/internal/util/i;->bNa: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 JT()Lrx/internal/util/i;
+.method public static JR()Lrx/internal/util/i;
     .locals 3
 
-    invoke-static {}, Lrx/internal/util/b/ae;->Kd()Z
+    invoke-static {}, Lrx/internal/util/b/ae;->Kb()Z
 
     move-result v0
 
@@ -172,7 +172,7 @@
 
     const/4 v1, 0x0
 
-    sget v2, Lrx/internal/util/i;->bNf:I
+    sget v2, Lrx/internal/util/i;->bNa: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 JU()Lrx/internal/util/i;
+.method public static JS()Lrx/internal/util/i;
     .locals 3
 
-    invoke-static {}, Lrx/internal/util/b/ae;->Kd()Z
+    invoke-static {}, Lrx/internal/util/b/ae;->Kb()Z
 
     move-result v0
 
@@ -199,7 +199,7 @@
 
     const/4 v1, 0x1
 
-    sget v2, Lrx/internal/util/i;->bNf:I
+    sget v2, Lrx/internal/util/i;->bNa: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;->bNe:Ljava/lang/Object;
+    iget-object v2, p0, Lrx/internal/util/i;->bMZ:Ljava/lang/Object;
 
     if-nez v1, :cond_1
 
@@ -424,7 +424,7 @@
 
     move-result-object v2
 
-    iget-object v3, p0, Lrx/internal/util/i;->bNe:Ljava/lang/Object;
+    iget-object v3, p0, Lrx/internal/util/i;->bMZ: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;->bNe:Ljava/lang/Object;
+    iput-object v1, p0, Lrx/internal/util/i;->bMZ: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 c94fc6341c..d9a1ad83b7 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 bNg:Ljava/util/concurrent/ThreadFactory;
+.field public static final bNb: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;->bNg:Ljava/util/concurrent/ThreadFactory;
+    sput-object v0, Lrx/internal/util/j;->bNb: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 300f033d2b..0c406163ea 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 bNj:Lrx/internal/c/b;
+.field final synthetic bNe:Lrx/internal/c/b;
 
-.field final synthetic bNk:Lrx/internal/util/k;
+.field final synthetic bNf: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;->bNk:Lrx/internal/util/k;
+    iput-object p1, p0, Lrx/internal/util/k$1;->bNf:Lrx/internal/util/k;
 
-    iput-object p2, p0, Lrx/internal/util/k$1;->bNj:Lrx/internal/c/b;
+    iput-object p2, p0, Lrx/internal/util/k$1;->bNe: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;->bNj:Lrx/internal/c/b;
+    iget-object v0, p0, Lrx/internal/util/k$1;->bNe:Lrx/internal/c/b;
 
-    iget-object v0, v0, Lrx/internal/c/b;->bLu:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, v0, Lrx/internal/c/b;->bLp: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;->JK()Lrx/internal/c/b$c;
+    invoke-virtual {v0}, Lrx/internal/c/b$b;->JI()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 21b8a678da..967b80ba07 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 bNm:Lrx/functions/Action0;
+.field final synthetic bNh:Lrx/functions/Action0;
 
-.field final synthetic bNn:Lrx/Scheduler$Worker;
+.field final synthetic bNi:Lrx/Scheduler$Worker;
 
-.field final synthetic bNo:Lrx/internal/util/k$2;
+.field final synthetic bNj: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;->bNo:Lrx/internal/util/k$2;
+    iput-object p1, p0, Lrx/internal/util/k$2$1;->bNj:Lrx/internal/util/k$2;
 
-    iput-object p2, p0, Lrx/internal/util/k$2$1;->bNm:Lrx/functions/Action0;
+    iput-object p2, p0, Lrx/internal/util/k$2$1;->bNh:Lrx/functions/Action0;
 
-    iput-object p3, p0, Lrx/internal/util/k$2$1;->bNn:Lrx/Scheduler$Worker;
+    iput-object p3, p0, Lrx/internal/util/k$2$1;->bNi: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;->bNm:Lrx/functions/Action0;
+    iget-object v0, p0, Lrx/internal/util/k$2$1;->bNh: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;->bNn:Lrx/Scheduler$Worker;
+    iget-object v0, p0, Lrx/internal/util/k$2$1;->bNi: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;->bNn:Lrx/Scheduler$Worker;
+    iget-object v1, p0, Lrx/internal/util/k$2$1;->bNi: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 a6e8df27a2..764607f4a7 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 bNk:Lrx/internal/util/k;
+.field final synthetic bNf:Lrx/internal/util/k;
 
-.field final synthetic bNl:Lrx/Scheduler;
+.field final synthetic bNg: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;->bNk:Lrx/internal/util/k;
+    iput-object p1, p0, Lrx/internal/util/k$2;->bNf:Lrx/internal/util/k;
 
-    iput-object p2, p0, Lrx/internal/util/k$2;->bNl:Lrx/Scheduler;
+    iput-object p2, p0, Lrx/internal/util/k$2;->bNg: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;->bNl:Lrx/Scheduler;
+    iget-object v0, p0, Lrx/internal/util/k$2;->bNg:Lrx/Scheduler;
 
-    invoke-virtual {v0}, Lrx/Scheduler;->IY()Lrx/Scheduler$Worker;
+    invoke-virtual {v0}, Lrx/Scheduler;->IW()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 8b21247834..f504c641b5 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 bNk:Lrx/internal/util/k;
+.field final synthetic bNf:Lrx/internal/util/k;
 
-.field final synthetic bNp:Lrx/functions/b;
+.field final synthetic bNk: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;->bNk:Lrx/internal/util/k;
+    iput-object p1, p0, Lrx/internal/util/k$3;->bNf:Lrx/internal/util/k;
 
-    iput-object p2, p0, Lrx/internal/util/k$3;->bNp:Lrx/functions/b;
+    iput-object p2, p0, Lrx/internal/util/k$3;->bNk: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;->bNp:Lrx/functions/b;
+    iget-object v0, p0, Lrx/internal/util/k$3;->bNk:Lrx/functions/b;
 
-    iget-object v1, p0, Lrx/internal/util/k$3;->bNk:Lrx/internal/util/k;
+    iget-object v1, p0, Lrx/internal/util/k$3;->bNf:Lrx/internal/util/k;
 
-    iget-object v1, v1, Lrx/internal/util/k;->bNh:Ljava/lang/Object;
+    iget-object v1, v1, Lrx/internal/util/k;->bNc: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;->bNh:Ljava/lang/Object;
+    iget-object v0, v0, Lrx/internal/util/k;->bNc: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 c9dc4db38a..c5bdce83e8 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 bHl:Z
+.field bHg: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;->bHl:Z
+    iget-boolean v0, p0, Lrx/internal/util/k$d;->bHg: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;->bHl:Z
+    iput-boolean p1, p0, Lrx/internal/util/k$d;->bHg: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 0037994f9b..40ed3acccf 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 bNi:Z
+.field static final bNd:Z
 
 
 # instance fields
-.field public final bNh:Ljava/lang/Object;
+.field public final bNc:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TT;"
@@ -58,7 +58,7 @@
 
     move-result v0
 
-    sput-boolean v0, Lrx/internal/util/k;->bNi:Z
+    sput-boolean v0, Lrx/internal/util/k;->bNd: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;->bNh:Ljava/lang/Object;
+    iput-object p1, p0, Lrx/internal/util/k;->bNc:Ljava/lang/Object;
 
     return-void
 .end method
@@ -99,7 +99,7 @@
         }
     .end annotation
 
-    sget-boolean v0, Lrx/internal/util/k;->bNi:Z
+    sget-boolean v0, Lrx/internal/util/k;->bNd: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;->bNh:Ljava/lang/Object;
+    iget-object v1, p0, Lrx/internal/util/k;->bNc: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 2c27ead9aa..2b8b332e2c 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 bNq:Lrx/internal/util/l$a;
+.field public static final enum bNl:Lrx/internal/util/l$a;
 
-.field private static final synthetic bNr:[Lrx/internal/util/l$a;
+.field private static final synthetic bNm:[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;->bNq:Lrx/internal/util/l$a;
+    sput-object v0, Lrx/internal/util/l$a;->bNl: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;->bNq:Lrx/internal/util/l$a;
+    sget-object v1, Lrx/internal/util/l$a;->bNl:Lrx/internal/util/l$a;
 
     const/4 v2, 0x0
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lrx/internal/util/l$a;->bNr:[Lrx/internal/util/l$a;
+    sput-object v0, Lrx/internal/util/l$a;->bNm:[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;->bNr:[Lrx/internal/util/l$a;
+    sget-object v0, Lrx/internal/util/l$a;->bNm:[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 1ca972ffc5..b6b286baa8 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 bNs:Lrx/internal/util/l$b;
+.field public static final enum bNn:Lrx/internal/util/l$b;
 
-.field private static final synthetic bNt:[Lrx/internal/util/l$b;
+.field private static final synthetic bNo:[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;->bNs:Lrx/internal/util/l$b;
+    sput-object v0, Lrx/internal/util/l$b;->bNn: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;->bNs:Lrx/internal/util/l$b;
+    sget-object v1, Lrx/internal/util/l$b;->bNn:Lrx/internal/util/l$b;
 
     const/4 v2, 0x0
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lrx/internal/util/l$b;->bNt:[Lrx/internal/util/l$b;
+    sput-object v0, Lrx/internal/util/l$b;->bNo:[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;->bNt:[Lrx/internal/util/l$b;
+    sget-object v0, Lrx/internal/util/l$b;->bNo:[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 d44dcc15df..6b5e5fa9ac 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 bOg:Lrx/e;
+.field private final bOb: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;->bOg:Lrx/e;
+    iput-object p2, p0, Lrx/observers/SerializedSubscriber;->bOb:Lrx/e;
 
     return-void
 .end method
@@ -70,7 +70,7 @@
 .method public onCompleted()V
     .locals 1
 
-    iget-object v0, p0, Lrx/observers/SerializedSubscriber;->bOg:Lrx/e;
+    iget-object v0, p0, Lrx/observers/SerializedSubscriber;->bOb: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;->bOg:Lrx/e;
+    iget-object v0, p0, Lrx/observers/SerializedSubscriber;->bOb: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;->bOg:Lrx/e;
+    iget-object v0, p0, Lrx/observers/SerializedSubscriber;->bOb: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 5e92edbac2..8db55e6967 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 bOd:Lrx/e;
+.field private static final bNY: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;->bOd:Lrx/e;
+    sput-object v0, Lrx/observers/a;->bNY:Lrx/e;
 
     return-void
 .end method
 
-.method public static Kg()Lrx/e;
+.method public static Ke()Lrx/e;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -40,7 +40,7 @@
         }
     .end annotation
 
-    sget-object v0, Lrx/observers/a;->bOd:Lrx/e;
+    sget-object v0, Lrx/observers/a;->bNY: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 5a395722f1..f63d87aa75 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;->Kj()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Kh()Lrx/c/f;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lrx/c/f;->Kk()Lrx/c/b;
+    invoke-virtual {v1}, Lrx/c/f;->Ki()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 6c8cf4a7ab..d96d6f26c0 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 bOe:Lrx/e;
+.field private final bNZ:Lrx/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/e<",
@@ -35,7 +35,7 @@
     .end annotation
 .end field
 
-.field private bOf:Lrx/observers/c$a;
+.field private bOa: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;->bOe:Lrx/e;
+    iput-object p1, p0, Lrx/observers/c;->bNZ:Lrx/e;
 
     return-void
 .end method
@@ -92,7 +92,7 @@
 
     if-eqz v1, :cond_3
 
-    iget-object v0, p0, Lrx/observers/c;->bOf:Lrx/observers/c$a;
+    iget-object v0, p0, Lrx/observers/c;->bOa: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;->bOf:Lrx/observers/c$a;
+    iput-object v0, p0, Lrx/observers/c;->bOa:Lrx/observers/c$a;
 
     :cond_2
-    invoke-static {}, Lrx/internal/a/g;->Jg()Ljava/lang/Object;
+    invoke-static {}, Lrx/internal/a/g;->Je()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;->bOe:Lrx/e;
+    iget-object v0, p0, Lrx/observers/c;->bNZ: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;->bOf:Lrx/observers/c$a;
+    iget-object v0, p0, Lrx/observers/c;->bOa: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;->bOf:Lrx/observers/c$a;
+    iput-object v0, p0, Lrx/observers/c;->bOa: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;->bOe:Lrx/e;
+    iget-object v0, p0, Lrx/observers/c;->bNZ: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;->bOf:Lrx/observers/c$a;
+    iget-object v0, p0, Lrx/observers/c;->bOa: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;->bOf:Lrx/observers/c$a;
+    iput-object v0, p0, Lrx/observers/c;->bOa: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;->bOe:Lrx/e;
+    iget-object v1, p0, Lrx/observers/c;->bNZ: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;->bOf:Lrx/observers/c$a;
+    iget-object v1, p0, Lrx/observers/c;->bOa: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;->bOf:Lrx/observers/c$a;
+    iput-object v3, p0, Lrx/observers/c;->bOa: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;->bOe:Lrx/e;
+    iget-object v5, p0, Lrx/observers/c;->bNZ: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;->bOe:Lrx/e;
+    iget-object v0, p0, Lrx/observers/c;->bNZ: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;->bOe:Lrx/e;
+    iget-object v0, p0, Lrx/observers/c;->bNZ: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 39a194d968..3605bb548a 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 bOh:Lrx/e;
+.field final synthetic bOc:Lrx/e;
 
 
 # direct methods
 .method public constructor <init>(Lrx/e;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/observers/d$1;->bOh:Lrx/e;
+    iput-object p1, p0, Lrx/observers/d$1;->bOc: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;->bOh:Lrx/e;
+    iget-object v0, p0, Lrx/observers/d$1;->bOc: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;->bOh:Lrx/e;
+    iget-object v0, p0, Lrx/observers/d$1;->bOc: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;->bOh:Lrx/e;
+    iget-object v0, p0, Lrx/observers/d$1;->bOc: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 a3d8efec60..dff8265fc4 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 bHX:Lrx/Subscriber;
+.field final synthetic bHS:Lrx/Subscriber;
 
 
 # direct methods
 .method constructor <init>(Lrx/Subscriber;Lrx/Subscriber;)V
     .locals 0
 
-    iput-object p2, p0, Lrx/observers/d$2;->bHX:Lrx/Subscriber;
+    iput-object p2, p0, Lrx/observers/d$2;->bHS: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;->bHX:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/observers/d$2;->bHS: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;->bHX:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/observers/d$2;->bHS: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;->bHX:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/observers/d$2;->bHS: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 6056647f11..99b345515e 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 bOP:Lrx/subjects/b;
+.field final synthetic bOK:Lrx/subjects/b;
 
 
 # direct methods
 .method constructor <init>(Lrx/subjects/b;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/subjects/BehaviorSubject$1;->bOP:Lrx/subjects/b;
+    iput-object p1, p0, Lrx/subjects/BehaviorSubject$1;->bOK: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;->bOP:Lrx/subjects/b;
+    iget-object v0, p0, Lrx/subjects/BehaviorSubject$1;->bOK: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;->bdh:Z
+    iget-boolean v1, p1, Lrx/subjects/b$b;->bdd:Z
 
     if-eqz v1, :cond_7
 
@@ -68,7 +68,7 @@
     :cond_0
     const/4 v1, 0x0
 
-    iput-boolean v1, p1, Lrx/subjects/b$b;->bdh:Z
+    iput-boolean v1, p1, Lrx/subjects/b$b;->bdd: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;->bPg:Ljava/util/List;
+    iget-object v4, p1, Lrx/subjects/b$b;->bPb:Ljava/util/List;
 
-    iput-object v3, p1, Lrx/subjects/b$b;->bPg:Ljava/util/List;
+    iput-object v3, p1, Lrx/subjects/b$b;->bPb: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 e1dce3346d..3cc57efd33 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 bON:[Ljava/lang/Object;
+.field private static final bOI:[Ljava/lang/Object;
 
 
 # instance fields
-.field private final bOO:Lrx/subjects/b;
+.field private final bOJ: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;->bON:[Ljava/lang/Object;
+    sput-object v0, Lrx/subjects/BehaviorSubject;->bOI:[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;->bOO:Lrx/subjects/b;
+    iput-object p2, p0, Lrx/subjects/BehaviorSubject;->bOJ:Lrx/subjects/b;
 
     return-void
 .end method
 
-.method public static Kz()Lrx/subjects/BehaviorSubject;
+.method public static Kx()Lrx/subjects/BehaviorSubject;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -158,7 +158,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/subjects/BehaviorSubject;->bOO:Lrx/subjects/b;
+    iget-object v0, p0, Lrx/subjects/BehaviorSubject;->bOJ: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;->bOO:Lrx/subjects/b;
+    iget-object v0, p0, Lrx/subjects/BehaviorSubject;->bOJ: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;->bOO:Lrx/subjects/b;
+    iget-object v0, p0, Lrx/subjects/BehaviorSubject;->bOJ: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;->Jg()Ljava/lang/Object;
+    invoke-static {}, Lrx/internal/a/g;->Je()Ljava/lang/Object;
 
     move-result-object v0
 
-    iget-object v1, p0, Lrx/subjects/BehaviorSubject;->bOO:Lrx/subjects/b;
+    iget-object v1, p0, Lrx/subjects/BehaviorSubject;->bOJ: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;->bOO:Lrx/subjects/b;
+    iget-object v0, p0, Lrx/subjects/BehaviorSubject;->bOJ: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;->bOO:Lrx/subjects/b;
+    iget-object v0, p0, Lrx/subjects/BehaviorSubject;->bOJ: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;->bOO:Lrx/subjects/b;
+    iget-object v1, p0, Lrx/subjects/BehaviorSubject;->bOJ: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;->bOO:Lrx/subjects/b;
+    iget-object v0, p0, Lrx/subjects/BehaviorSubject;->bOJ: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;->bOO:Lrx/subjects/b;
+    iget-object v0, p0, Lrx/subjects/BehaviorSubject;->bOJ: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;->bOO:Lrx/subjects/b;
+    iget-object v0, p0, Lrx/subjects/BehaviorSubject;->bOJ: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;->bPc:[Lrx/subjects/b$b;
+    iget-object v0, v0, Lrx/subjects/b$a;->bOX:[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 de02c7702f..af4b7f0ad9 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 bOR:[Lrx/subjects/PublishSubject$a;
+.field static final bOM:[Lrx/subjects/PublishSubject$a;
 
-.field static final bOS:[Lrx/subjects/PublishSubject$a;
+.field static final bON:[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;->bOR:[Lrx/subjects/PublishSubject$a;
+    sput-object v1, Lrx/subjects/PublishSubject$b;->bOM:[Lrx/subjects/PublishSubject$a;
 
     new-array v0, v0, [Lrx/subjects/PublishSubject$a;
 
-    sput-object v0, Lrx/subjects/PublishSubject$b;->bOS:[Lrx/subjects/PublishSubject$a;
+    sput-object v0, Lrx/subjects/PublishSubject$b;->bON:[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;->bOR:[Lrx/subjects/PublishSubject$a;
+    sget-object v0, Lrx/subjects/PublishSubject$b;->bOM:[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;->bOS:[Lrx/subjects/PublishSubject$a;
+    sget-object v1, Lrx/subjects/PublishSubject$b;->bON:[Lrx/subjects/PublishSubject$a;
 
     if-eq v0, v1, :cond_6
 
-    sget-object v1, Lrx/subjects/PublishSubject$b;->bOR:[Lrx/subjects/PublishSubject$a;
+    sget-object v1, Lrx/subjects/PublishSubject$b;->bOM:[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;->bOR:[Lrx/subjects/PublishSubject$a;
+    sget-object v1, Lrx/subjects/PublishSubject$b;->bOM:[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;->bOS:[Lrx/subjects/PublishSubject$a;
+    sget-object v2, Lrx/subjects/PublishSubject$b;->bON:[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;->bOS:[Lrx/subjects/PublishSubject$a;
+    sget-object v0, Lrx/subjects/PublishSubject$b;->bON:[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;->bOS:[Lrx/subjects/PublishSubject$a;
+    sget-object v0, Lrx/subjects/PublishSubject$b;->bON:[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 55853a72a7..a04e2c2754 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 bOQ:Lrx/subjects/PublishSubject$b;
+.field final bOL: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;->bOQ:Lrx/subjects/PublishSubject$b;
+    iput-object p1, p0, Lrx/subjects/PublishSubject;->bOL:Lrx/subjects/PublishSubject$b;
 
     return-void
 .end method
 
-.method public static KA()Lrx/subjects/PublishSubject;
+.method public static Ky()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;->bOQ:Lrx/subjects/PublishSubject$b;
+    iget-object v0, p0, Lrx/subjects/PublishSubject;->bOL: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;->bOQ:Lrx/subjects/PublishSubject$b;
+    iget-object v0, p0, Lrx/subjects/PublishSubject;->bOL: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;->bOQ:Lrx/subjects/PublishSubject$b;
+    iget-object v0, p0, Lrx/subjects/PublishSubject;->bOL: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 34b5b71a00..048e0c12a9 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 bOZ:Lrx/subjects/Subject;
+.field final synthetic bOU:Lrx/subjects/Subject;
 
 
 # direct methods
 .method constructor <init>(Lrx/subjects/Subject;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/subjects/SerializedSubject$1;->bOZ:Lrx/subjects/Subject;
+    iput-object p1, p0, Lrx/subjects/SerializedSubject$1;->bOU: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;->bOZ:Lrx/subjects/Subject;
+    iget-object v0, p0, Lrx/subjects/SerializedSubject$1;->bOU: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 43fd64e2bf..80489a8416 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 bOX:Lrx/observers/c;
+.field private final bOS:Lrx/observers/c;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/observers/c<",
@@ -27,7 +27,7 @@
     .end annotation
 .end field
 
-.field private final bOY:Lrx/subjects/Subject;
+.field private final bOT: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;->bOY:Lrx/subjects/Subject;
+    iput-object p1, p0, Lrx/subjects/SerializedSubject;->bOT: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;->bOX:Lrx/observers/c;
+    iput-object v0, p0, Lrx/subjects/SerializedSubject;->bOS:Lrx/observers/c;
 
     return-void
 .end method
@@ -70,7 +70,7 @@
 .method public onCompleted()V
     .locals 1
 
-    iget-object v0, p0, Lrx/subjects/SerializedSubject;->bOX:Lrx/observers/c;
+    iget-object v0, p0, Lrx/subjects/SerializedSubject;->bOS: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;->bOX:Lrx/observers/c;
+    iget-object v0, p0, Lrx/subjects/SerializedSubject;->bOS: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;->bOX:Lrx/observers/c;
+    iget-object v0, p0, Lrx/subjects/SerializedSubject;->bOS: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 7f441e0390..fff4ce3d5f 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 bOT:[Lrx/subjects/a$b;
+.field static final bOO:[Lrx/subjects/a$b;
 
-.field static final bOU:[Lrx/subjects/a$b;
+.field static final bOP:[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;->bOT:[Lrx/subjects/a$b;
+    sput-object v1, Lrx/subjects/a$c;->bOO:[Lrx/subjects/a$b;
 
     new-array v0, v0, [Lrx/subjects/a$b;
 
-    sput-object v0, Lrx/subjects/a$c;->bOU:[Lrx/subjects/a$b;
+    sput-object v0, Lrx/subjects/a$c;->bOP:[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;->bOT:[Lrx/subjects/a$b;
+    sget-object p1, Lrx/subjects/a$c;->bOO:[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;->bOU:[Lrx/subjects/a$b;
+    sget-object v1, Lrx/subjects/a$c;->bOP:[Lrx/subjects/a$b;
 
     if-eq v0, v1, :cond_6
 
-    sget-object v1, Lrx/subjects/a$c;->bOT:[Lrx/subjects/a$b;
+    sget-object v1, Lrx/subjects/a$c;->bOO:[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;->bOT:[Lrx/subjects/a$b;
+    sget-object v1, Lrx/subjects/a$c;->bOO:[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;->bOU:[Lrx/subjects/a$b;
+    sget-object v1, Lrx/subjects/a$c;->bOP:[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;->bOU:[Lrx/subjects/a$b;
+    sget-object v1, Lrx/subjects/a$c;->bOP:[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;->bOU:[Lrx/subjects/a$b;
+    sget-object p1, Lrx/subjects/a$c;->bOP:[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 c7d256d80b..930635a96f 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 bOV:[Ljava/lang/Object;
+.field final bOQ:[Ljava/lang/Object;
 
-.field bOW:[Ljava/lang/Object;
+.field bOR:[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;->bOV:[Ljava/lang/Object;
+    iput-object p1, p0, Lrx/subjects/a$d;->bOQ:[Ljava/lang/Object;
 
-    iput-object p1, p0, Lrx/subjects/a$d;->bOW:[Ljava/lang/Object;
+    iput-object p1, p0, Lrx/subjects/a$d;->bOR:[Ljava/lang/Object;
 
     return-void
 .end method
@@ -134,7 +134,7 @@
 
     if-nez v8, :cond_2
 
-    iget-object v8, v0, Lrx/subjects/a$d;->bOV:[Ljava/lang/Object;
+    iget-object v8, v0, Lrx/subjects/a$d;->bOQ:[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;->bOW:[Ljava/lang/Object;
+    iget-object v1, p0, Lrx/subjects/a$d;->bOR:[Ljava/lang/Object;
 
     array-length v2, v1
 
@@ -356,7 +356,7 @@
 
     aput-object v2, v1, v0
 
-    iput-object v2, p0, Lrx/subjects/a$d;->bOW:[Ljava/lang/Object;
+    iput-object v2, p0, Lrx/subjects/a$d;->bOR:[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 2d97a98b42..2b951535a3 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 bON:[Ljava/lang/Object;
+.field private static final bOI:[Ljava/lang/Object;
 
 
 # instance fields
@@ -47,7 +47,7 @@
 
     new-array v0, v0, [Ljava/lang/Object;
 
-    sput-object v0, Lrx/subjects/a;->bON:[Ljava/lang/Object;
+    sput-object v0, Lrx/subjects/a;->bOI:[Ljava/lang/Object;
 
     return-void
 .end method
@@ -69,7 +69,7 @@
     return-void
 .end method
 
-.method public static KB()Lrx/subjects/a;
+.method public static Kz()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 52b44d43ca..124e118e97 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 bPa:Lrx/subjects/b$b;
+.field final synthetic bOV:Lrx/subjects/b$b;
 
-.field final synthetic bPb:Lrx/subjects/b;
+.field final synthetic bOW: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;->bPb:Lrx/subjects/b;
+    iput-object p1, p0, Lrx/subjects/b$1;->bOW:Lrx/subjects/b;
 
-    iput-object p2, p0, Lrx/subjects/b$1;->bPa:Lrx/subjects/b$b;
+    iput-object p2, p0, Lrx/subjects/b$1;->bOV: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;->bPb:Lrx/subjects/b;
+    iget-object v0, p0, Lrx/subjects/b$1;->bOW:Lrx/subjects/b;
 
-    iget-object v1, p0, Lrx/subjects/b$1;->bPa:Lrx/subjects/b$b;
+    iget-object v1, p0, Lrx/subjects/b$1;->bOV: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 dea3373abe..08a6f32753 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 bPd:[Lrx/subjects/b$b;
+.field static final bOY:[Lrx/subjects/b$b;
 
-.field static final bPe:Lrx/subjects/b$a;
+.field static final bOZ:Lrx/subjects/b$a;
 
-.field static final bPf:Lrx/subjects/b$a;
+.field static final bPa:Lrx/subjects/b$a;
 
 
 # instance fields
-.field final bPc:[Lrx/subjects/b$b;
+.field final bOX:[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;->bPd:[Lrx/subjects/b$b;
+    sput-object v1, Lrx/subjects/b$a;->bOY:[Lrx/subjects/b$b;
 
     new-instance v1, Lrx/subjects/b$a;
 
-    sget-object v2, Lrx/subjects/b$a;->bPd:[Lrx/subjects/b$b;
+    sget-object v2, Lrx/subjects/b$a;->bOY:[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;->bPe:Lrx/subjects/b$a;
+    sput-object v1, Lrx/subjects/b$a;->bOZ:Lrx/subjects/b$a;
 
     new-instance v1, Lrx/subjects/b$a;
 
-    sget-object v2, Lrx/subjects/b$a;->bPd:[Lrx/subjects/b$b;
+    sget-object v2, Lrx/subjects/b$a;->bOY:[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;->bPf:Lrx/subjects/b$a;
+    sput-object v1, Lrx/subjects/b$a;->bPa: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;->bPc:[Lrx/subjects/b$b;
+    iput-object p2, p0, Lrx/subjects/b$a;->bOX:[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 ead3335d75..d066b6cbf5 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 bPg:Ljava/util/List;
+.field bPb:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -48,9 +48,9 @@
     .end annotation
 .end field
 
-.field bPh:Z
+.field bPc:Z
 
-.field bdh:Z
+.field bdd:Z
 
 .field emitting:Z
 
@@ -70,7 +70,7 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lrx/subjects/b$b;->bdh:Z
+    iput-boolean v0, p0, Lrx/subjects/b$b;->bdd: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;->bPh:Z
+    iget-boolean v0, p0, Lrx/subjects/b$b;->bPc: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;->bdh:Z
+    iput-boolean v0, p0, Lrx/subjects/b$b;->bdd:Z
 
     iget-boolean v0, p0, Lrx/subjects/b$b;->emitting:Z
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lrx/subjects/b$b;->bPg:Ljava/util/List;
+    iget-object v0, p0, Lrx/subjects/b$b;->bPb: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;->bPg:Ljava/util/List;
+    iput-object v0, p0, Lrx/subjects/b$b;->bPb:Ljava/util/List;
 
     :cond_0
-    iget-object v0, p0, Lrx/subjects/b$b;->bPg:Ljava/util/List;
+    iget-object v0, p0, Lrx/subjects/b$b;->bPb: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;->bPh:Z
+    iput-boolean v0, p0, Lrx/subjects/b$b;->bPc: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 0317cf5d86..4855555198 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;->bPf:Lrx/subjects/b$a;
+    sget-object v0, Lrx/subjects/b$a;->bPa: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;->Je()Lrx/functions/a$b;
+    invoke-static {}, Lrx/functions/a;->Jc()Lrx/functions/a$b;
 
     move-result-object v0
 
     iput-object v0, p0, Lrx/subjects/b;->onStart:Lrx/functions/Action1;
 
-    invoke-static {}, Lrx/functions/a;->Je()Lrx/functions/a$b;
+    invoke-static {}, Lrx/functions/a;->Jc()Lrx/functions/a$b;
 
     move-result-object v0
 
     iput-object v0, p0, Lrx/subjects/b;->onAdded:Lrx/functions/Action1;
 
-    invoke-static {}, Lrx/functions/a;->Je()Lrx/functions/a$b;
+    invoke-static {}, Lrx/functions/a;->Jc()Lrx/functions/a$b;
 
     move-result-object v0
 
@@ -127,7 +127,7 @@
     return-void
 
     :cond_1
-    iget-object v1, v0, Lrx/subjects/b$a;->bPc:[Lrx/subjects/b$b;
+    iget-object v1, v0, Lrx/subjects/b$a;->bOX:[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;->bPf:Lrx/subjects/b$a;
+    sget-object v1, Lrx/subjects/b$a;->bPa: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;->bPf:Lrx/subjects/b$a;
+    sget-object v1, Lrx/subjects/b$a;->bPa:Lrx/subjects/b$a;
 
     goto :goto_3
 
@@ -254,12 +254,12 @@
 
     if-eqz p1, :cond_0
 
-    sget-object p1, Lrx/subjects/b$a;->bPd:[Lrx/subjects/b$b;
+    sget-object p1, Lrx/subjects/b$a;->bOY:[Lrx/subjects/b$b;
 
     return-object p1
 
     :cond_0
-    sget-object p1, Lrx/subjects/b$a;->bPe:Lrx/subjects/b$a;
+    sget-object p1, Lrx/subjects/b$a;->bOZ: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;->bPc:[Lrx/subjects/b$b;
+    iget-object p1, p1, Lrx/subjects/b$a;->bOX:[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;->bPc:[Lrx/subjects/b$b;
+    iget-object v2, v1, Lrx/subjects/b$a;->bOX:[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;->bPc:[Lrx/subjects/b$b;
+    iget-object v5, v1, Lrx/subjects/b$a;->bOX:[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 0754c703e8..fa8de4ee63 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 bGz:Z
+.field private volatile bGu:Z
 
-.field private bPk:Ljava/util/Set;
+.field private bPf: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;->bPk:Ljava/util/Set;
+    iput-object v0, p0, Lrx/subscriptions/CompositeSubscription;->bPf:Ljava/util/Set;
 
     return-void
 .end method
@@ -123,18 +123,18 @@
     return-void
 
     :cond_0
-    iget-boolean v0, p0, Lrx/subscriptions/CompositeSubscription;->bGz:Z
+    iget-boolean v0, p0, Lrx/subscriptions/CompositeSubscription;->bGu:Z
 
     if-nez v0, :cond_3
 
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lrx/subscriptions/CompositeSubscription;->bGz:Z
+    iget-boolean v0, p0, Lrx/subscriptions/CompositeSubscription;->bGu:Z
 
     if-nez v0, :cond_2
 
-    iget-object v0, p0, Lrx/subscriptions/CompositeSubscription;->bPk:Ljava/util/Set;
+    iget-object v0, p0, Lrx/subscriptions/CompositeSubscription;->bPf: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;->bPk:Ljava/util/Set;
+    iput-object v0, p0, Lrx/subscriptions/CompositeSubscription;->bPf:Ljava/util/Set;
 
     :cond_1
-    iget-object v0, p0, Lrx/subscriptions/CompositeSubscription;->bPk:Ljava/util/Set;
+    iget-object v0, p0, Lrx/subscriptions/CompositeSubscription;->bPf: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;->bGz:Z
+    iget-boolean v0, p0, Lrx/subscriptions/CompositeSubscription;->bGu:Z
 
     if-nez v0, :cond_2
 
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lrx/subscriptions/CompositeSubscription;->bGz:Z
+    iget-boolean v0, p0, Lrx/subscriptions/CompositeSubscription;->bGu:Z
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lrx/subscriptions/CompositeSubscription;->bPk:Ljava/util/Set;
+    iget-object v0, p0, Lrx/subscriptions/CompositeSubscription;->bPf:Ljava/util/Set;
 
     if-nez v0, :cond_0
 
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lrx/subscriptions/CompositeSubscription;->bPk:Ljava/util/Set;
+    iget-object v0, p0, Lrx/subscriptions/CompositeSubscription;->bPf:Ljava/util/Set;
 
     const/4 v1, 0x0
 
-    iput-object v1, p0, Lrx/subscriptions/CompositeSubscription;->bPk:Ljava/util/Set;
+    iput-object v1, p0, Lrx/subscriptions/CompositeSubscription;->bPf: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;->bGz:Z
+    iget-boolean v0, p0, Lrx/subscriptions/CompositeSubscription;->bGu:Z
 
     if-nez v0, :cond_2
 
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lrx/subscriptions/CompositeSubscription;->bGz:Z
+    iget-boolean v0, p0, Lrx/subscriptions/CompositeSubscription;->bGu:Z
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lrx/subscriptions/CompositeSubscription;->bPk:Ljava/util/Set;
+    iget-object v0, p0, Lrx/subscriptions/CompositeSubscription;->bPf:Ljava/util/Set;
 
     if-nez v0, :cond_0
 
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lrx/subscriptions/CompositeSubscription;->bPk:Ljava/util/Set;
+    iget-object v0, p0, Lrx/subscriptions/CompositeSubscription;->bPf: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;->bGz:Z
+    iget-boolean v0, p0, Lrx/subscriptions/CompositeSubscription;->bGu:Z
 
     return v0
 .end method
@@ -301,14 +301,14 @@
 .method public final unsubscribe()V
     .locals 2
 
-    iget-boolean v0, p0, Lrx/subscriptions/CompositeSubscription;->bGz:Z
+    iget-boolean v0, p0, Lrx/subscriptions/CompositeSubscription;->bGu:Z
 
     if-nez v0, :cond_1
 
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lrx/subscriptions/CompositeSubscription;->bGz:Z
+    iget-boolean v0, p0, Lrx/subscriptions/CompositeSubscription;->bGu:Z
 
     if-eqz v0, :cond_0
 
@@ -319,13 +319,13 @@
     :cond_0
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lrx/subscriptions/CompositeSubscription;->bGz:Z
+    iput-boolean v0, p0, Lrx/subscriptions/CompositeSubscription;->bGu:Z
 
-    iget-object v0, p0, Lrx/subscriptions/CompositeSubscription;->bPk:Ljava/util/Set;
+    iget-object v0, p0, Lrx/subscriptions/CompositeSubscription;->bPf:Ljava/util/Set;
 
     const/4 v1, 0x0
 
-    iput-object v1, p0, Lrx/subscriptions/CompositeSubscription;->bPk:Ljava/util/Set;
+    iput-object v1, p0, Lrx/subscriptions/CompositeSubscription;->bPf: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 0acbfecbe4..976221b1c6 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 bPl:Lrx/internal/d/a;
+.field public final bPg: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;->bPl:Lrx/internal/d/a;
+    iput-object v0, p0, Lrx/subscriptions/SerialSubscription;->bPg:Lrx/internal/d/a;
 
     return-void
 .end method
@@ -32,7 +32,7 @@
 
     if-eqz p1, :cond_0
 
-    iget-object v0, p0, Lrx/subscriptions/SerialSubscription;->bPl:Lrx/internal/d/a;
+    iget-object v0, p0, Lrx/subscriptions/SerialSubscription;->bPg: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;->bPl:Lrx/internal/d/a;
+    iget-object v0, p0, Lrx/subscriptions/SerialSubscription;->bPg: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;->bPl:Lrx/internal/d/a;
+    iget-object v0, p0, Lrx/subscriptions/SerialSubscription;->bPg: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 015435b9d3..d5de9dbd7e 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 bPj:Lrx/functions/Action0;
+.field static final bPe:Lrx/functions/Action0;
 
 
 # instance fields
-.field final bPi:Ljava/util/concurrent/atomic/AtomicReference;
+.field final bPd: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;->bPj:Lrx/functions/Action0;
+    sput-object v0, Lrx/subscriptions/a;->bPe: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;->bPi:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object v0, p0, Lrx/subscriptions/a;->bPd: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;->bPi:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object v0, p0, Lrx/subscriptions/a;->bPd: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;->bPi:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/subscriptions/a;->bPd: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;->bPj:Lrx/functions/Action0;
+    sget-object v1, Lrx/subscriptions/a;->bPe: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;->bPi:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/subscriptions/a;->bPd: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;->bPj:Lrx/functions/Action0;
+    sget-object v1, Lrx/subscriptions/a;->bPe:Lrx/functions/Action0;
 
     if-eq v0, v1, :cond_0
 
-    iget-object v0, p0, Lrx/subscriptions/a;->bPi:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/subscriptions/a;->bPd: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;->bPj:Lrx/functions/Action0;
+    sget-object v1, Lrx/subscriptions/a;->bPe: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 306b1c71a0..b8d768cc97 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 bPl:Lrx/internal/d/a;
+.field final bPg: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;->bPl:Lrx/internal/d/a;
+    iput-object v0, p0, Lrx/subscriptions/b;->bPg:Lrx/internal/d/a;
 
     return-void
 .end method
@@ -32,7 +32,7 @@
 
     if-eqz p1, :cond_0
 
-    iget-object v0, p0, Lrx/subscriptions/b;->bPl:Lrx/internal/d/a;
+    iget-object v0, p0, Lrx/subscriptions/b;->bPg: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;->bPl:Lrx/internal/d/a;
+    iget-object v0, p0, Lrx/subscriptions/b;->bPg: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;->bPl:Lrx/internal/d/a;
+    iget-object v0, p0, Lrx/subscriptions/b;->bPg: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 7395683e81..ed48eedeac 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 bPm:Lrx/subscriptions/c$a;
+.field private static final bPh: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;->bPm:Lrx/subscriptions/c$a;
+    sput-object v0, Lrx/subscriptions/c;->bPh:Lrx/subscriptions/c$a;
 
     return-void
 .end method
 
-.method public static KC()Lrx/Subscription;
+.method public static KA()Lrx/Subscription;
     .locals 1
 
-    sget-object v0, Lrx/subscriptions/c;->bPm:Lrx/subscriptions/c$a;
+    sget-object v0, Lrx/subscriptions/c;->bPh:Lrx/subscriptions/c$a;
 
     return-object v0
 .end method